shithub: pokecrystal

Download patch

ref: e937d6f25c18ce91072e96441265537adff5e53f
parent: 36b8a0061e267c7daffae3e4d2dbf063572ffac0
author: yenatch <[email protected]>
date: Sat Dec 28 15:32:05 EST 2013 

audio: note duration from 0-15 to 1-16 to match pokered


--- a/audio/music/aftertherivalfight.asm
+++ b/audio/music/aftertherivalfight.asm
@@ -15,14 +15,14 @@
 	stereopanning $f0
 	notetype $c, $b2
 	octave 2
-	note G#, 3
-	note G#, 3
+	note G#, 4
+	note G#, 4
 	intensity $82
 	octave 3
-	note G#, 1
-	note G#, 1
-	note G#, 1
-	note G#, 1
+	note G#, 2
+	note G#, 2
+	note G#, 2
+	note G#, 2
 	loopchannel 0, Music_AfterTheRivalFight_branch_f4fb1
 
 Music_AfterTheRivalFight_Ch2: ; f5153
@@ -31,26 +31,26 @@
 	stereopanning $f
 	notetype $c, $c2
 	octave 4
-	note G#, 3
-	note G#, 3
+	note G#, 4
+	note G#, 4
 	intensity $a2
-	note G#, 1
-	note G#, 1
-	note G#, 1
-	note G#, 1
+	note G#, 2
+	note G#, 2
+	note G#, 2
+	note G#, 2
 	loopchannel 0, Music_AfterTheRivalFight_branch_f502e
 
 Music_AfterTheRivalFight_Ch3: ; f516a
 	notetype $c, $28
 	octave 3
-	note D#, 1
-	note __, 1
-	note D#, 1
-	note __, 1
-	note G#, 1
-	note F#, 1
-	note F_, 1
-	note D#, 1
+	note D#, 2
+	note __, 2
+	note D#, 2
+	note __, 2
+	note G#, 2
+	note F#, 2
+	note F_, 2
+	note D#, 2
 	loopchannel 0, Music_AfterTheRivalFight_branch_f509d
 
 Music_AfterTheRivalFight_Ch4: ; f517a
@@ -57,11 +57,11 @@
 	togglenoise $3
 	stereopanning $f
 	notetype $c
-	note D_, 3
-	note D_, 3
-	note D#, 1
-	note D_, 1
-	note D_, 1
-	note D_, 1
+	note D_, 4
+	note D_, 4
+	note D#, 2
+	note D_, 2
+	note D_, 2
+	note D_, 2
 	loopchannel 0, Music_AfterTheRivalFight_branch_f5118
 ; f518a
--- a/audio/music/azaleatown.asm
+++ b/audio/music/azaleatown.asm
@@ -12,22 +12,22 @@
 	dutycycle $2
 	stereopanning $f
 	notetype $c, $a1
-	note __, 1
+	note __, 2
 
 Music_AzaleaTown_branch_f5801: ; f5801
 	intensity $a1
 	octave 3
-	note F_, 1
+	note F_, 2
 	intensity $61
-	note F_, 1
-	note F_, 1
+	note F_, 2
+	note F_, 2
 	intensity $a1
-	note F_, 1
+	note F_, 2
 	intensity $61
-	note F_, 1
-	note F_, 1
-	note F_, 1
-	note F_, 1
+	note F_, 2
+	note F_, 2
+	note F_, 2
+	note F_, 2
 	loopchannel 2, Music_AzaleaTown_branch_f5801
 
 Music_AzaleaTown_branch_f5816: ; f5816
@@ -34,93 +34,93 @@
 	callchannel Music_AzaleaTown_branch_f588c
 	stereopanning $f0
 	intensity $a4
-	note G#, 1
-	note A#, 0
-	note __, 2
+	note G#, 2
+	note A#, 1
+	note __, 3
 	octave 4
-	note C_, 3
+	note C_, 4
 	notetype $6, $a4
-	note G_, 0
-	note G#, 2
-	note F#, 3
-	note D#, 1
-	note __, 1
+	note G_, 1
+	note G#, 3
+	note F#, 4
+	note D#, 2
+	note __, 2
 	stereopanning $f
 	callchannel Music_AzaleaTown_branch_f588c
 	stereopanning $f0
 	notetype $6, $a4
-	note D#, 3
-	note C_, 3
-	note __, 2
-	note B_, 0
+	note D#, 4
+	note C_, 4
+	note __, 3
+	note B_, 1
 	octave 4
-	note C_, 11
+	note C_, 12
 	octave 3
-	note A#, 3
-	note F#, 3
+	note A#, 4
+	note F#, 4
 	stereopanning $f
 	callchannel Music_AzaleaTown_branch_f5912
 	intensity $a3
-	note A#, 3
+	note A#, 4
 	octave 4
-	note C#, 1
-	note __, 1
-	note C_, 1
-	note __, 1
+	note C#, 2
+	note __, 2
+	note C_, 2
+	note __, 2
 	intensity $a1
 	octave 3
-	note C#, 3
-	note A_, 1
-	note __, 13
+	note C#, 4
+	note A_, 2
+	note __, 14
 	callchannel Music_AzaleaTown_branch_f5912
 	intensity $a3
 	octave 4
-	note C_, 0
+	note C_, 1
+	note C#, 3
+	note F_, 2
+	note __, 2
 	note C#, 2
-	note F_, 1
-	note __, 1
-	note C#, 1
-	note __, 1
+	note __, 2
 	intensity $a1
 	octave 3
-	note G_, 3
-	note A#, 3
-	note G_, 7
+	note G_, 4
+	note A#, 4
+	note G_, 8
 	intensity $a2
-	note A#, 3
+	note A#, 4
 	octave 4
-	note C#, 3
+	note C#, 4
 	octave 3
-	note A#, 3
-	note F#, 3
-	note C#, 7
-	note F#, 3
-	note __, 3
-	note A#, 3
+	note A#, 4
+	note F#, 4
+	note C#, 8
+	note F#, 4
+	note __, 4
+	note A#, 4
 	octave 4
-	note C#, 3
+	note C#, 4
 	octave 3
-	note A#, 3
-	note G_, 3
-	note C#, 3
-	note __, 3
-	note G_, 3
-	note __, 3
+	note A#, 4
+	note G_, 4
+	note C#, 4
+	note __, 4
+	note G_, 4
+	note __, 4
 	octave 4
-	note C#, 3
-	note D#, 3
-	note C#, 3
+	note C#, 4
+	note D#, 4
+	note C#, 4
 	octave 3
-	note G#, 3
-	note D#, 3
-	note C#, 3
+	note G#, 4
+	note D#, 4
+	note C#, 4
 	octave 2
-	note G#, 3
-	note __, 7
+	note G#, 4
+	note __, 8
 	notetype $c, $2f
 	octave 3
-	note G#, 13
-	note __, 1
+	note G#, 14
+	note __, 2
 	loopchannel 0, Music_AzaleaTown_branch_f5816
 ; f588c
 
@@ -127,111 +127,111 @@
 Music_AzaleaTown_branch_f588c: ; f588c
 	notetype $c, $a1
 	octave 4
-	note F_, 1
+	note F_, 2
 	intensity $61
-	note F_, 1
-	note F_, 1
+	note F_, 2
+	note F_, 2
 	intensity $a1
-	note D#, 1
+	note D#, 2
 	intensity $61
-	note D#, 1
-	note D#, 1
+	note D#, 2
+	note D#, 2
 	intensity $a1
-	note F_, 1
+	note F_, 2
 	intensity $61
-	note F_, 1
+	note F_, 2
 	intensity $a1
-	note A#, 1
+	note A#, 2
 	intensity $61
-	note A#, 1
-	note A#, 1
+	note A#, 2
+	note A#, 2
 	intensity $a1
-	note G#, 1
+	note G#, 2
 	intensity $61
-	note G#, 1
-	note G#, 1
+	note G#, 2
+	note G#, 2
 	intensity $a1
-	note A_, 1
+	note A_, 2
 	intensity $61
-	note A_, 1
+	note A_, 2
 	intensity $a1
-	note C_, 1
+	note C_, 2
 	intensity $61
-	note C_, 1
-	note C_, 1
+	note C_, 2
+	note C_, 2
 	intensity $a1
-	note C#, 1
+	note C#, 2
 	intensity $61
-	note C#, 1
-	note C#, 1
-	note C#, 1
-	note C#, 1
+	note C#, 2
+	note C#, 2
+	note C#, 2
+	note C#, 2
 	intensity $a1
-	note D#, 1
+	note D#, 2
 	intensity $61
-	note D#, 1
-	note D#, 1
+	note D#, 2
+	note D#, 2
 	intensity $a1
-	note C#, 1
+	note C#, 2
 	intensity $61
-	note C#, 1
-	note C#, 1
-	note C#, 1
-	note __, 1
+	note C#, 2
+	note C#, 2
+	note C#, 2
+	note __, 2
 	intensity $a1
 	octave 3
-	note F_, 1
+	note F_, 2
 	intensity $61
-	note F_, 1
-	note F_, 1
+	note F_, 2
+	note F_, 2
 	intensity $a1
-	note F#, 1
+	note F#, 2
 	intensity $61
-	note F#, 1
-	note F#, 1
-	note F#, 1
-	note F#, 1
+	note F#, 2
+	note F#, 2
+	note F#, 2
+	note F#, 2
 	intensity $a1
-	note F_, 1
+	note F_, 2
 	intensity $61
-	note F_, 1
-	note F_, 1
+	note F_, 2
+	note F_, 2
 	intensity $a1
-	note D#, 1
+	note D#, 2
 	intensity $61
-	note D#, 1
-	note D#, 1
+	note D#, 2
+	note D#, 2
 	intensity $a1
-	note C#, 1
+	note C#, 2
 	intensity $61
-	note C#, 1
+	note C#, 2
 	intensity $a1
-	note C_, 1
+	note C_, 2
 	intensity $61
-	note C_, 1
-	note C_, 1
+	note C_, 2
+	note C_, 2
 	intensity $a1
 	octave 2
-	note A#, 1
+	note A#, 2
 	intensity $61
-	note A#, 1
-	note A#, 1
+	note A#, 2
+	note A#, 2
 	intensity $a1
 	octave 3
-	note C#, 1
+	note C#, 2
 	intensity $61
-	note C#, 1
+	note C#, 2
 	endchannel
 ; f5912
 
 Music_AzaleaTown_branch_f5912: ; f5912
 	intensity $61
-	note G#, 7
-	note G#, 7
+	note G#, 8
+	note G#, 8
 	intensity $81
-	note A_, 7
+	note A_, 8
 	intensity $a1
-	note A_, 7
+	note A_, 8
 	endchannel
 
 Music_AzaleaTown_Ch2: ; f591d
@@ -239,188 +239,188 @@
 	dutycycle $2
 	stereopanning $f0
 	notetype $c, $62
-	note __, 0
+	note __, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	intensity $b1
-	note D#, 1
+	note D#, 2
 	intensity $71
-	note D#, 1
-	note D#, 1
+	note D#, 2
+	note D#, 2
 	intensity $b1
-	note C#, 1
+	note C#, 2
 	intensity $71
-	note C#, 1
-	note C#, 1
+	note C#, 2
+	note C#, 2
 	intensity $51
-	note C#, 1
-	note C#, 1
+	note C#, 2
+	note C#, 2
 	intensity $b1
-	note C_, 1
+	note C_, 2
 	intensity $71
-	note C_, 1
-	note C_, 1
+	note C_, 2
+	note C_, 2
 	intensity $b1
-	note C#, 1
+	note C#, 2
 	intensity $71
-	note C#, 1
-	note C#, 1
+	note C#, 2
+	note C#, 2
 	notetype $6, $b4
-	note F_, 6
+	note F_, 7
 	dutycycle $1
 	octave 5
-	note C_, 0
+	note C_, 1
 
 Music_AzaleaTown_branch_f5952: ; f5952
 	callchannel Music_AzaleaTown_branch_f59c7
-	note C#, 3
-	note C_, 1
-	note C#, 0
-	note __, 2
+	note C#, 4
+	note C_, 2
+	note C#, 1
+	note __, 3
 	notetype $6, $b4
-	note D#, 10
-	note __, 7
+	note D#, 11
+	note __, 8
 	dutycycle $1
 	octave 5
-	note C_, 0
-	callchannel Music_AzaleaTown_branch_f59c7
-	note __, 1
-	note C#, 1
 	note C_, 1
+	callchannel Music_AzaleaTown_branch_f59c7
+	note __, 2
+	note C#, 2
+	note C_, 2
 	octave 3
-	note G#, 1
+	note G#, 2
 	notetype $6, $b4
-	note __, 2
+	note __, 3
 	octave 4
-	note G_, 0
-	note G#, 11
-	note F#, 3
-	note F_, 3
+	note G_, 1
+	note G#, 12
+	note F#, 4
+	note F_, 4
 	dutycycle $0
-	note D_, 0
-	note D#, 2
-	note C#, 3
-	note C_, 1
-	note __, 1
-	note G#, 3
-	note __, 3
-	note F#, 3
-	note __, 3
-	note F_, 3
+	note D_, 1
 	note D#, 3
-	note F_, 1
-	note __, 1
-	note D#, 1
-	note __, 1
-	note C#, 7
-	note __, 11
-	note D_, 0
+	note C#, 4
+	note C_, 2
+	note __, 2
+	note G#, 4
+	note __, 4
+	note F#, 4
+	note __, 4
+	note F_, 4
+	note D#, 4
+	note F_, 2
+	note __, 2
 	note D#, 2
-	note C#, 3
-	note C_, 1
-	note __, 1
-	note G#, 3
-	note __, 3
-	note A_, 3
-	note __, 3
+	note __, 2
+	note C#, 8
+	note __, 12
+	note D_, 1
+	note D#, 3
+	note C#, 4
+	note C_, 2
+	note __, 2
+	note G#, 4
+	note __, 4
+	note A_, 4
+	note __, 4
 	octave 5
-	note C_, 3
+	note C_, 4
 	octave 4
-	note B_, 0
+	note B_, 1
 	octave 5
+	note C_, 3
+	note C#, 2
+	note __, 2
 	note C_, 2
-	note C#, 1
-	note __, 1
-	note C_, 1
-	note __, 1
+	note __, 2
 	octave 4
-	note F_, 3
-	note __, 3
-	note D#, 3
-	note __, 3
-	note C#, 3
+	note F_, 4
+	note __, 4
+	note D#, 4
+	note __, 4
+	note C#, 4
 	dutycycle $2
-	note F_, 3
-	note D#, 3
-	note C#, 3
-	note F_, 3
-	note __, 3
-	note D#, 3
-	note __, 3
-	note C#, 3
-	note F_, 3
-	note D#, 3
-	note C#, 3
-	note F_, 3
-	note __, 3
-	note A#, 3
-	note __, 3
+	note F_, 4
+	note D#, 4
+	note C#, 4
+	note F_, 4
+	note __, 4
+	note D#, 4
+	note __, 4
+	note C#, 4
+	note F_, 4
+	note D#, 4
+	note C#, 4
+	note F_, 4
+	note __, 4
+	note A#, 4
+	note __, 4
 	octave 5
-	note C_, 3
+	note C_, 4
 	notetype $c, $b7
 	octave 4
-	note G#, 11
-	note D#, 3
+	note G#, 12
+	note D#, 4
 	intensity $1f
-	note C_, 13
+	note C_, 14
 	notetype $6, $b4
 	dutycycle $1
-	note G#, 1
+	note G#, 2
 	octave 5
-	note C_, 1
+	note C_, 2
 	loopchannel 0, Music_AzaleaTown_branch_f5952
 ; f59c7
 
 Music_AzaleaTown_branch_f59c7: ; f59c7
-	note C#, 3
+	note C#, 4
 	octave 4
-	note G#, 1
-	note __, 1
+	note G#, 2
+	note __, 2
 	octave 5
-	note C_, 1
+	note C_, 2
+	note __, 2
+	note C#, 8
+	note D#, 8
+	note F_, 2
 	note __, 1
-	note C#, 7
-	note D#, 7
-	note F_, 1
-	note __, 0
-	note G_, 0
-	note G#, 11
-	note F_, 1
-	note __, 5
-	note D#, 7
-	note F_, 1
-	note __, 0
-	note C_, 0
+	note G_, 1
+	note G#, 12
+	note F_, 2
+	note __, 6
+	note D#, 8
+	note F_, 2
+	note __, 1
+	note C_, 1
 	notetype $c, $a8
 	vibrato $0, $0
-	note C#, 7
+	note C#, 8
 	intensity $a7
 	vibrato $12, $23
-	note C#, 15
-	note __, 3
+	note C#, 16
+	note __, 4
 	intensity $b4
 	dutycycle $2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C#, 0
-	note __, 0
-	note F#, 7
+	note C#, 1
 	note __, 1
-	note F#, 1
-	note F_, 1
-	note D#, 0
-	note __, 0
-	note C#, 5
-	note C_, 1
+	note F#, 8
+	note __, 2
+	note F#, 2
+	note F_, 2
+	note D#, 1
 	note __, 1
-	note C_, 3
-	note C#, 0
+	note C#, 6
+	note C_, 2
+	note __, 2
+	note C_, 4
+	note C#, 1
 	notetype $6, $b4
-	note __, 0
-	note D_, 0
+	note __, 1
+	note D_, 1
 	notetype $c, $b7
-	note D#, 11
+	note D#, 12
 	intensity $b4
 	endchannel
 
@@ -429,187 +429,187 @@
 	vibrato $6, $26
 	notetype $c, $25
 	octave 2
-	note G#, 0
+	note G#, 1
 	octave 3
-	note C_, 0
-	note C#, 0
-	note __, 4
-	note C#, 0
-	note __, 2
-	note C#, 0
-	note __, 0
+	note C_, 1
+	note C#, 1
+	note __, 5
+	note C#, 1
+	note __, 3
+	note C#, 1
+	note __, 1
 	octave 2
-	note G#, 3
+	note G#, 4
 	octave 3
-	note C#, 0
-	note __, 4
-	note C#, 0
-	note __, 2
-	note C#, 0
-	note __, 0
-	note G#, 3
+	note C#, 1
+	note __, 5
+	note C#, 1
+	note __, 3
+	note C#, 1
+	note __, 1
+	note G#, 4
 
 Music_AzaleaTown_branch_f5a24: ; f5a24
 	callchannel Music_AzaleaTown_branch_f5a86
-	note G#, 3
-	note D#, 1
+	note G#, 4
+	note D#, 2
 	callchannel Music_AzaleaTown_branch_f5a86
-	note G#, 1
-	note __, 1
-	note F#, 1
+	note G#, 2
+	note __, 2
+	note F#, 2
 	callchannel Music_AzaleaTown_branch_f5acf
-	note A#, 0
-	note __, 0
+	note A#, 1
+	note __, 1
 	octave 4
-	note C#, 0
-	note __, 0
-	note F_, 1
+	note C#, 1
+	note __, 1
+	note F_, 2
 	octave 3
-	note A_, 3
+	note A_, 4
 	octave 4
-	note C#, 0
-	note __, 2
-	note F_, 0
-	note __, 0
+	note C#, 1
+	note __, 3
+	note F_, 1
+	note __, 1
 	callchannel Music_AzaleaTown_branch_f5acf
 	octave 2
+	note A#, 2
+	octave 3
+	note F_, 1
+	note __, 1
 	note A#, 1
+	note __, 1
+	note D#, 2
+	octave 2
+	note A#, 2
 	octave 3
-	note F_, 0
-	note __, 0
-	note A#, 0
-	note __, 0
 	note D#, 1
+	note __, 3
+	note G_, 2
 	octave 2
-	note A#, 1
+	note F#, 1
+	note __, 5
+	note F#, 1
+	note F#, 1
+	note F#, 1
+	note __, 1
 	octave 3
-	note D#, 0
+	note C#, 2
 	note __, 2
-	note G_, 1
 	octave 2
-	note F#, 0
-	note __, 4
-	note F#, 0
-	note F#, 0
-	note F#, 0
-	note __, 0
-	octave 3
-	note C#, 1
+	note F_, 1
+	note F#, 1
+	note G_, 1
+	note __, 5
+	note G_, 1
+	note G_, 1
+	note G_, 1
 	note __, 1
-	octave 2
-	note F_, 0
-	note F#, 0
-	note G_, 0
-	note __, 4
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note __, 0
 	octave 3
-	note C#, 1
-	note __, 1
+	note C#, 2
+	note __, 2
 	octave 2
-	note F#, 0
-	note G_, 0
-	note G#, 0
-	note __, 4
-	note G#, 0
-	note G#, 0
-	note G#, 0
-	note __, 0
-	octave 3
-	note D#, 1
+	note F#, 1
+	note G_, 1
+	note G#, 1
+	note __, 5
+	note G#, 1
+	note G#, 1
+	note G#, 1
 	note __, 1
-	octave 2
-	note F#, 0
-	note G_, 0
-	note G#, 0
-	note __, 4
-	note G#, 0
-	note G#, 0
-	note G#, 0
-	note __, 0
 	octave 3
-	note D#, 1
+	note D#, 2
+	note __, 2
+	octave 2
+	note F#, 1
+	note G_, 1
+	note G#, 1
+	note __, 5
+	note G#, 1
+	note G#, 1
+	note G#, 1
 	note __, 1
+	octave 3
+	note D#, 2
+	note __, 2
 	octave 2
-	note B_, 0
+	note B_, 1
 	octave 3
-	note C_, 0
+	note C_, 1
 	loopchannel 0, Music_AzaleaTown_branch_f5a24
 ; f5a86
 
 Music_AzaleaTown_branch_f5a86: ; f5a86
-	note C#, 0
-	note __, 4
-	note C#, 0
-	note __, 2
-	note C#, 0
-	note __, 0
+	note C#, 1
+	note __, 5
+	note C#, 1
+	note __, 3
+	note C#, 1
+	note __, 1
 	octave 2
-	note G#, 3
+	note G#, 4
 	octave 3
-	note F_, 0
-	note __, 4
-	note F_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note F_, 3
-	note A_, 1
+	note F_, 1
+	note __, 5
+	note F_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note F_, 4
+	note A_, 2
 	intensity $15
-	note A#, 0
-	note __, 0
+	note A#, 1
+	note __, 1
 	intensity $25
 	octave 4
-	note C#, 0
-	note __, 0
-	note F_, 0
-	note __, 0
+	note C#, 1
+	note __, 1
+	note F_, 1
+	note __, 1
 	octave 3
-	note A_, 3
+	note A_, 4
 	octave 4
-	note C#, 0
-	note __, 0
-	note F_, 0
-	note __, 0
+	note C#, 1
+	note __, 1
+	note F_, 1
+	note __, 1
 	octave 3
-	note G#, 3
-	note A#, 0
-	note __, 0
-	note G#, 0
-	note __, 0
-	note G_, 5
-	note __, 3
-	note F#, 0
+	note G#, 4
+	note A#, 1
+	note __, 1
+	note G#, 1
+	note __, 1
+	note G_, 6
 	note __, 4
-	note F#, 0
-	note __, 2
-	note F#, 0
-	note __, 0
-	note C#, 3
-	note G_, 0
-	note __, 4
-	note G_, 0
-	note __, 2
-	note C#, 3
-	note G_, 0
-	note __, 0
-	note G#, 0
-	note __, 4
-	note G#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note C#, 3
-	note G#, 0
-	note __, 0
-	note G#, 0
-	note __, 4
-	note G#, 0
-	note __, 0
-	note C_, 0
-	note __, 0
+	note F#, 1
+	note __, 5
+	note F#, 1
+	note __, 3
+	note F#, 1
+	note __, 1
+	note C#, 4
+	note G_, 1
+	note __, 5
+	note G_, 1
+	note __, 3
+	note C#, 4
+	note G_, 1
+	note __, 1
+	note G#, 1
+	note __, 5
+	note G#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note C#, 4
+	note G#, 1
+	note __, 1
+	note G#, 1
+	note __, 5
+	note G#, 1
+	note __, 1
+	note C_, 1
+	note __, 1
 	endchannel
 ; f5acf
 
@@ -616,51 +616,51 @@
 Music_AzaleaTown_branch_f5acf: ; f5acf
 	intensity $35
 	octave 3
-	note F_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
+	note F_, 1
+	note __, 1
+	note F_, 1
+	note __, 1
+	note F_, 1
+	note __, 1
 	intensity $25
-	note F_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
+	note F_, 1
+	note __, 1
+	note F_, 1
+	note __, 1
+	note F_, 1
+	note __, 1
 	endchannel
 
 Music_AzaleaTown_Ch4: ; f5ae5
 	togglenoise $3
 	notetype $c
-	note F_, 1
+	note F_, 2
 
 Music_AzaleaTown_branch_f5aea: ; f5aea
+	note D#, 2
+	note F#, 2
+	note D_, 2
 	note D#, 1
-	note F#, 1
-	note D_, 1
-	note D#, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note D#, 2
+	note D_, 2
+	note G_, 1
+	note G_, 1
+	note D#, 2
+	note F#, 2
+	note D_, 2
 	note D#, 1
-	note D_, 1
-	note G_, 0
-	note G_, 0
-	note D#, 1
-	note F#, 1
-	note D_, 1
-	note D#, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note D#, 1
-	note D_, 1
-	note F#, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note D#, 2
+	note D_, 2
+	note F#, 2
 	loopchannel 0, Music_AzaleaTown_branch_f5aea
 ; f5b03
--- a/audio/music/battletowerlobby.asm
+++ b/audio/music/battletowerlobby.asm
@@ -18,105 +18,105 @@
 Music_BattleTowerLobby_branch_1794a9: ; 1794a9
 	notetype $c, $72
 	octave 3
-	note G#, 1
+	note G#, 2
 	notetype $c, $73
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note E_, 1
-	note G#, 1
-	note E_, 1
+	note E_, 2
+	note G#, 2
+	note E_, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note E_, 1
-	note G#, 1
+	note E_, 2
+	note G#, 2
 	notetype $c, $72
-	note F#, 1
+	note F#, 2
 	notetype $c, $73
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note F#, 1
-	note E_, 1
-	note D#, 1
+	note F#, 2
+	note E_, 2
+	note D#, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note D#, 1
-	note F#, 1
+	note D#, 2
+	note F#, 2
 	notetype $c, $72
-	note G#, 1
+	note G#, 2
 	notetype $c, $73
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note E_, 1
-	note G#, 1
+	note E_, 2
+	note G#, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note E_, 1
-	note B_, 1
+	note E_, 2
+	note B_, 2
 	octave 4
-	note E_, 1
+	note E_, 2
 	notetype $c, $72
-	note F#, 2
+	note F#, 3
 	notetype $c, $73
-	note D_, 0
-	note E_, 1
+	note D_, 1
+	note E_, 2
 	octave 3
-	note B_, 1
-	note G#, 1
-	note E_, 1
-	note G#, 1
-	note B_, 1
+	note B_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note B_, 2
 	notetype $c, $72
-	note C#, 1
+	note C#, 2
 	notetype $c, $73
-	note D#, 1
-	note E_, 1
-	note C#, 0
+	note D#, 2
+	note E_, 2
+	note C#, 1
 	octave 2
-	note B_, 0
-	note A_, 3
+	note B_, 1
+	note A_, 4
 	notetype $c, $62
-	note A_, 3
+	note A_, 4
 	notetype $c, $72
-	note B_, 1
+	note B_, 2
 	notetype $c, $73
 	octave 3
-	note C#, 1
-	note D#, 1
-	note E_, 0
-	note F#, 0
-	note G#, 3
+	note C#, 2
+	note D#, 2
+	note E_, 1
+	note F#, 1
+	note G#, 4
 	notetype $c, $62
 	octave 2
-	note G#, 3
+	note G#, 4
 	notetype $c, $72
-	note A_, 1
+	note A_, 2
 	notetype $c, $73
-	note B_, 1
+	note B_, 2
 	octave 3
-	note C#, 1
-	note D_, 0
-	note E_, 0
+	note C#, 2
 	note D_, 1
 	note E_, 1
-	note F#, 1
-	note A_, 1
+	note D_, 2
+	note E_, 2
+	note F#, 2
+	note A_, 2
 	notetype $c, $72
-	note B_, 1
+	note B_, 2
 	notetype $c, $73
-	note B_, 3
-	note A_, 0
-	note G#, 0
+	note B_, 4
+	note A_, 1
+	note G#, 1
 	notetype $c, $72
-	note F#, 3
+	note F#, 4
 	notetype $c, $75
 	octave 2
-	note B_, 3
+	note B_, 4
 	loopchannel 0, Music_BattleTowerLobby_branch_1794a9
 
 Music_BattleTowerLobby_Ch2: ; 17953a
@@ -128,80 +128,80 @@
 Music_BattleTowerLobby_branch_179544: ; 179544
 	notetype $c, $82
 	octave 4
-	note E_, 1
-	note E_, 3
+	note E_, 2
+	note E_, 4
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note E_, 0
-	note B_, 3
-	note A_, 1
-	note G#, 1
+	note E_, 1
+	note B_, 4
 	note A_, 2
-	note E_, 0
+	note G#, 2
+	note A_, 3
+	note E_, 1
 	octave 3
-	note B_, 3
+	note B_, 4
 	notetype $c, $65
-	note F#, 3
+	note F#, 4
 	octave 2
-	note B_, 3
+	note B_, 4
 	notetype $c, $82
 	octave 4
-	note E_, 1
-	note E_, 3
+	note E_, 2
+	note E_, 4
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note E_, 0
-	note B_, 3
-	note A_, 1
-	note G#, 1
+	note E_, 1
+	note B_, 4
 	note A_, 2
-	note F#, 0
+	note G#, 2
+	note A_, 3
+	note F#, 1
 	notetype $c, $87
-	note G#, 11
+	note G#, 12
 	notetype $c, $82
 	octave 3
-	note A_, 1
+	note A_, 2
 	notetype $c, $84
-	note A_, 3
-	note F#, 0
-	note G#, 0
-	note A_, 3
+	note A_, 4
+	note F#, 1
+	note G#, 1
+	note A_, 4
 	notetype $c, $82
-	note C#, 3
+	note C#, 4
 	octave 4
-	note G#, 1
+	note G#, 2
 	notetype $c, $84
-	note G#, 3
-	note F#, 0
-	note G#, 0
-	note E_, 3
+	note G#, 4
+	note F#, 1
+	note G#, 1
+	note E_, 4
 	notetype $c, $82
 	octave 3
-	note E_, 3
+	note E_, 4
 	octave 4
-	note F#, 1
+	note F#, 2
 	notetype $c, $84
-	note F#, 3
-	note A_, 0
-	note G#, 0
-	note A_, 3
-	note D_, 3
+	note F#, 4
+	note A_, 1
+	note G#, 1
+	note A_, 4
+	note D_, 4
 	notetype $c, $82
-	note E_, 1
+	note E_, 2
 	notetype $c, $84
-	note E_, 3
-	note F#, 0
-	note E_, 0
-	note D#, 3
+	note E_, 4
+	note F#, 1
+	note E_, 1
+	note D#, 4
 	notetype $c, $73
 	octave 3
-	note D#, 0
-	note F#, 0
-	note B_, 0
+	note D#, 1
+	note F#, 1
+	note B_, 1
 	octave 4
-	note D#, 0
+	note D#, 1
 	loopchannel 0, Music_BattleTowerLobby_branch_179544
 
 Music_BattleTowerLobby_Ch3: ; 1795ae
@@ -209,96 +209,96 @@
 
 Music_BattleTowerLobby_branch_1795b1: ; 1795b1
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note E_, 1
-	note __, 1
-	note E_, 1
-	note __, 1
-	note E_, 1
-	note __, 1
-	note E_, 1
+	note E_, 2
+	note __, 2
+	note E_, 2
+	note __, 2
+	note E_, 2
+	note __, 2
+	note E_, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note E_, 1
-	note __, 1
-	note E_, 1
-	note __, 1
-	note D#, 1
-	note __, 1
-	note D#, 1
+	note E_, 2
+	note __, 2
+	note E_, 2
+	note __, 2
+	note D#, 2
+	note __, 2
+	note D#, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note E_, 1
-	note __, 1
-	note E_, 1
-	note __, 1
-	note E_, 1
-	note __, 1
-	note E_, 1
+	note E_, 2
+	note __, 2
+	note E_, 2
+	note __, 2
+	note E_, 2
+	note __, 2
+	note E_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note D_, 1
-	note __, 1
+	note D_, 2
+	note __, 2
 	octave 2
-	note A_, 1
-	note B_, 1
+	note A_, 2
+	note B_, 2
 	octave 3
-	note E_, 1
-	note __, 1
-	note E_, 1
+	note E_, 2
+	note __, 2
+	note E_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note C#, 1
+	note C#, 2
 	octave 2
-	note E_, 1
+	note E_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note C#, 1
-	note E_, 1
-	note __, 1
+	note C#, 2
+	note E_, 2
+	note __, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note E_, 1
+	note E_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note G#, 1
-	note B_, 1
+	note G#, 2
+	note B_, 2
 	octave 3
-	note E_, 1
-	note __, 1
-	note D_, 1
+	note E_, 2
+	note __, 2
+	note D_, 2
 	octave 2
-	note F#, 1
-	note A_, 1
+	note F#, 2
+	note A_, 2
 	octave 3
-	note F#, 1
+	note F#, 2
 	octave 2
-	note F#, 1
-	note A_, 1
+	note F#, 2
+	note A_, 2
 	octave 3
-	note D_, 1
-	note F#, 1
-	note E_, 1
+	note D_, 2
+	note F#, 2
+	note E_, 2
 	octave 2
-	note B_, 1
-	note E_, 1
-	note B_, 1
-	note F#, 1
-	note E_, 1
-	note D#, 1
-	note F#, 1
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note F#, 2
 	loopchannel 0, Music_BattleTowerLobby_branch_1795b1
 
 Music_BattleTowerLobby_Ch4: ; 179610
@@ -306,10 +306,10 @@
 
 Music_BattleTowerLobby_branch_179612: ; 179612
 	notetype $c
-	note __, 1
-	note F_, 3
-	note F_, 3
-	note F_, 1
-	note F_, 3
+	note __, 2
+	note F_, 4
+	note F_, 4
+	note F_, 2
+	note F_, 4
 	loopchannel 0, Music_BattleTowerLobby_branch_179612
 ; 17961d
--- a/audio/music/battletowertheme.asm
+++ b/audio/music/battletowertheme.asm
@@ -15,194 +15,194 @@
 	notetype $6, $94
 
 Music_BattleTowerTheme_branch_1788a5: ; 1788a5
-	note __, 15
-	note __, 15
-	note __, 11
-	note __, 11
+	note __, 16
+	note __, 16
+	note __, 12
+	note __, 12
 	dutycycle $2
 	octave 3
-	note C_, 1
-	note E_, 1
-	note G_, 3
+	note C_, 2
+	note E_, 2
+	note G_, 4
 	callchannel Music_BattleTowerTheme_branch_17895e
-	note G_, 1
-	note __, 1
-	note C_, 3
-	note __, 3
+	note G_, 2
+	note __, 2
+	note C_, 4
+	note __, 4
 	intensity $92
-	note G_, 1
-	note F_, 1
-	note C_, 1
-	note E_, 1
-	note G_, 1
+	note G_, 2
+	note F_, 2
+	note C_, 2
+	note E_, 2
+	note G_, 2
 	octave 4
-	note E_, 1
-	note G_, 1
-	note E_, 1
+	note E_, 2
+	note G_, 2
+	note E_, 2
 	octave 3
-	note G_, 1
-	note E_, 1
+	note G_, 2
+	note E_, 2
 	callchannel Music_BattleTowerTheme_branch_17895e
-	note G_, 1
-	note __, 1
+	note G_, 2
+	note __, 2
 	octave 2
-	note A#, 3
-	note __, 3
+	note A#, 4
+	note __, 4
 	intensity $92
 	octave 3
-	note G_, 1
-	note D#, 1
-	note C_, 1
-	note F_, 1
-	note A_, 1
+	note G_, 2
+	note D#, 2
+	note C_, 2
+	note F_, 2
+	note A_, 2
 	octave 4
-	note C_, 1
-	note F_, 1
-	note C_, 1
+	note C_, 2
+	note F_, 2
+	note C_, 2
 	octave 3
-	note A_, 1
-	note F_, 1
+	note A_, 2
+	note F_, 2
 	intensity $93
-	note D_, 1
-	note __, 1
-	note E_, 3
-	note F_, 3
-	note G_, 1
-	note A_, 1
-	note A#, 7
+	note D_, 2
+	note __, 2
+	note E_, 4
+	note F_, 4
+	note G_, 2
+	note A_, 2
+	note A#, 8
 	octave 2
-	note A#, 7
+	note A#, 8
 	octave 3
-	note C_, 1
-	note __, 1
-	note D_, 3
-	note E_, 3
-	note F_, 1
-	note G_, 1
-	note A_, 7
+	note C_, 2
+	note __, 2
+	note D_, 4
+	note E_, 4
+	note F_, 2
+	note G_, 2
+	note A_, 8
 	octave 2
-	note A_, 7
-	note A#, 1
-	note __, 1
+	note A_, 8
+	note A#, 2
+	note __, 2
 	octave 3
-	note C_, 3
-	note D_, 3
-	note D#, 1
-	note F_, 1
-	note D#, 3
-	note F_, 3
-	note G_, 3
-	note A#, 3
+	note C_, 4
+	note D_, 4
+	note D#, 2
+	note F_, 2
+	note D#, 4
+	note F_, 4
+	note G_, 4
+	note A#, 4
 	octave 4
-	note C_, 1
-	note __, 1
+	note C_, 2
+	note __, 2
 	octave 3
-	note F_, 3
-	note __, 3
+	note F_, 4
+	note __, 4
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note C_, 1
-	note E_, 3
-	note __, 3
+	note C_, 2
+	note E_, 4
+	note __, 4
 	dutycycle $3
-	note C_, 1
-	note E_, 1
-	note G_, 3
-	note A_, 3
-	note F_, 7
-	note F_, 1
-	note G_, 1
-	note A_, 7
-	note G_, 3
-	note F_, 3
-	note D_, 7
-	note A#, 1
-	note D_, 1
-	note E_, 1
-	note F_, 1
-	note G_, 1
-	note A_, 1
-	note A#, 1
+	note C_, 2
+	note E_, 2
+	note G_, 4
+	note A_, 4
+	note F_, 8
+	note F_, 2
+	note G_, 2
+	note A_, 8
+	note G_, 4
+	note F_, 4
+	note D_, 8
+	note A#, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	note G_, 2
+	note A_, 2
+	note A#, 2
 	octave 4
-	note C_, 1
-	note D_, 1
-	note C_, 1
-	note D_, 1
-	note D#, 1
-	note F_, 3
+	note C_, 2
+	note D_, 2
+	note C_, 2
+	note D_, 2
+	note D#, 2
+	note F_, 4
 	octave 3
-	note F_, 7
-	note C#, 1
-	note D#, 1
-	note F_, 7
-	note G_, 3
-	note F_, 3
-	note F_, 3
-	note C_, 7
-	note G_, 1
-	note F_, 1
-	note E_, 7
+	note F_, 8
+	note C#, 2
+	note D#, 2
+	note F_, 8
+	note G_, 4
+	note F_, 4
+	note F_, 4
+	note C_, 8
+	note G_, 2
+	note F_, 2
+	note E_, 8
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note A#, 1
-	note G_, 1
-	note E_, 1
-	note C_, 3
-	note F_, 7
-	note C_, 1
-	note F_, 1
-	note A_, 7
-	note A#, 3
+	note A#, 2
+	note G_, 2
+	note E_, 2
+	note C_, 4
+	note F_, 8
+	note C_, 2
+	note F_, 2
+	note A_, 8
+	note A#, 4
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note A#, 3
-	note F_, 7
-	note A#, 3
+	note A#, 4
+	note F_, 8
+	note A#, 4
 	octave 4
-	note D_, 7
+	note D_, 8
 	octave 3
-	note A#, 1
-	note A_, 1
-	note F_, 3
-	note G#, 3
-	note F_, 7
-	note G#, 3
-	note F_, 3
-	note D#, 3
-	note C#, 3
-	note F_, 3
+	note A#, 2
+	note A_, 2
+	note F_, 4
+	note G#, 4
+	note F_, 8
+	note G#, 4
+	note F_, 4
+	note D#, 4
+	note C#, 4
+	note F_, 4
 	intensity $94
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note E_, 5
+	note E_, 6
+	note __, 2
+	note E_, 1
 	note __, 1
-	note E_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note E_, 3
-	note __, 11
+	note E_, 1
+	note __, 1
+	note E_, 4
+	note __, 12
 	loopchannel 0, Music_BattleTowerTheme_branch_1788a5
 ; 17895e
 
 Music_BattleTowerTheme_branch_17895e: ; 17895e
 	intensity $94
+	note A_, 2
+	note __, 2
+	note C_, 4
+	note __, 4
 	note A_, 1
 	note __, 1
-	note C_, 3
-	note __, 3
-	note A_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note C_, 3
-	note F_, 3
-	note __, 3
-	note A_, 3
+	note A_, 1
+	note __, 1
+	note C_, 4
+	note F_, 4
+	note __, 4
+	note A_, 4
 	endchannel
 
 Music_BattleTowerTheme_Ch2: ; 17896d
@@ -212,154 +212,154 @@
 	dutycycle $3
 	notetype $6, $b8
 	octave 3
+	note F_, 2
+	note __, 2
+	octave 2
+	note A_, 4
+	note __, 4
+	octave 3
 	note F_, 1
 	note __, 1
+	note F_, 1
+	note __, 1
 	octave 2
-	note A_, 3
-	note __, 3
+	note A_, 4
 	octave 3
-	note F_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
+	note F_, 4
+	note __, 4
 	octave 2
-	note A_, 3
+	note A_, 2
+	note __, 2
 	octave 3
-	note F_, 3
-	note __, 3
+	note F_, 2
+	note __, 2
 	octave 2
+	note A_, 4
+	note __, 4
+	tone $0001
 	note A_, 1
 	note __, 1
 	octave 3
-	note F_, 1
+	note C_, 1
 	note __, 1
-	octave 2
-	note A_, 3
-	note __, 3
-	tone $0001
-	note A_, 0
-	note __, 0
-	octave 3
-	note C_, 0
-	note __, 0
-	note F_, 3
-	note __, 3
+	note F_, 4
+	note __, 4
 	tone $0000
 	intensity $b7
-	note G_, 1
+	note G_, 2
 	octave 4
-	note C_, 1
-	note E_, 3
+	note C_, 2
+	note E_, 4
 	callchannel Music_BattleTowerTheme_branch_178a15
-	note A#, 3
-	note __, 1
-	note F_, 1
+	note A#, 4
+	note __, 2
+	note F_, 2
 	notetype $c, $b7
-	note C_, 11
+	note C_, 12
 	notetype $6, $b7
 	callchannel Music_BattleTowerTheme_branch_178a15
 	notetype $c, $b7
+	note A#, 2
+	note __, 1
+	note G_, 1
+	note A_, 12
 	note A#, 1
-	note __, 0
-	note G_, 0
-	note A_, 11
-	note A#, 0
-	note __, 0
-	note A#, 3
-	note G_, 0
-	note A_, 0
-	note A#, 3
-	note D_, 3
-	note A_, 0
-	note __, 0
-	note A_, 3
-	note G_, 0
-	note A_, 0
-	note F_, 7
-	note G_, 0
-	note __, 0
-	note G_, 3
-	note A#, 0
-	note A_, 0
-	note A#, 3
-	note D#, 3
-	note F_, 0
-	note __, 0
-	note F_, 3
-	note G_, 0
-	note F_, 0
-	note E_, 7
+	note __, 1
+	note A#, 4
+	note G_, 1
+	note A_, 1
+	note A#, 4
+	note D_, 4
+	note A_, 1
+	note __, 1
+	note A_, 4
+	note G_, 1
+	note A_, 1
+	note F_, 8
+	note G_, 1
+	note __, 1
+	note G_, 4
+	note A#, 1
+	note A_, 1
+	note A#, 4
+	note D#, 4
+	note F_, 1
+	note __, 1
+	note F_, 4
+	note G_, 1
+	note F_, 1
+	note E_, 8
 	stereopanning $f0
 	dutycycle $2
-	note F_, 5
-	note A_, 0
-	note A#, 0
+	note F_, 6
+	note A_, 1
+	note A#, 1
 	octave 5
-	note C_, 3
+	note C_, 4
 	octave 4
-	note A#, 1
+	note A#, 2
+	note A_, 2
+	note A#, 16
+	note A#, 6
+	note G_, 1
 	note A_, 1
-	note A#, 15
-	note A#, 5
-	note G_, 0
-	note A_, 0
-	note A#, 3
+	note A#, 4
 	octave 5
-	note C_, 1
+	note C_, 2
 	octave 4
+	note A#, 2
+	note A_, 6
 	note A#, 1
-	note A_, 5
-	note A#, 0
-	note A_, 0
-	note G_, 7
-	note A_, 5
-	note F_, 0
-	note A_, 0
+	note A_, 1
+	note G_, 8
+	note A_, 6
+	note F_, 1
+	note A_, 1
 	octave 5
-	note C_, 3
-	note D_, 1
-	note D#, 1
-	note D_, 5
-	note C_, 1
+	note C_, 4
+	note D_, 2
+	note D#, 2
+	note D_, 6
+	note C_, 2
 	octave 4
-	note A#, 7
+	note A#, 8
 	octave 5
-	note C#, 5
-	note C_, 1
+	note C#, 6
+	note C_, 2
 	octave 4
-	note A#, 1
-	note G#, 1
-	note F_, 1
-	note G#, 1
-	note G_, 4
-	note __, 0
+	note A#, 2
+	note G#, 2
+	note F_, 2
+	note G#, 2
+	note G_, 5
+	note __, 1
 	notetype $6, $b7
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note G_, 3
-	note __, 3
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note G_, 4
+	note __, 4
 	stereopanning $ff
 	dutycycle $3
 	octave 3
-	note C_, 1
-	note D_, 1
-	note E_, 3
+	note C_, 2
+	note D_, 2
+	note E_, 4
 	loopchannel 0, Music_BattleTowerTheme_branch_178970
 ; 178a15
 
 Music_BattleTowerTheme_branch_178a15: ; 178a15
-	note F_, 1
-	note __, 1
-	note F_, 7
-	note C_, 1
-	note F_, 1
+	note F_, 2
+	note __, 2
+	note F_, 8
+	note C_, 2
+	note F_, 2
 	octave 5
-	note C_, 7
+	note C_, 8
 	octave 4
-	note A#, 3
-	note A_, 3
+	note A#, 4
+	note A_, 4
 	endchannel
 
 Music_BattleTowerTheme_Ch3: ; 178a20
@@ -369,225 +369,225 @@
 Music_BattleTowerTheme_branch_178a26: ; 178a26
 	stereopanning $ff
 	callchannel Music_BattleTowerTheme_branch_178afe
-	note C_, 1
-	note __, 1
-	note F_, 3
-	note __, 3
+	note C_, 2
+	note __, 2
+	note F_, 4
+	note __, 4
 	octave 2
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
 	octave 3
-	note C_, 0
-	note __, 0
-	note F_, 3
-	note __, 3
+	note C_, 1
+	note __, 1
+	note F_, 4
+	note __, 4
 	stereopanning $f0
-	note C_, 7
+	note C_, 8
 	callchannel Music_BattleTowerTheme_branch_178afe
+	note C_, 2
+	note __, 2
+	note F_, 4
+	note __, 4
 	note C_, 1
 	note __, 1
-	note F_, 3
-	note __, 3
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note E_, 3
-	note C_, 3
-	note __, 3
 	note C_, 1
 	note __, 1
+	note E_, 4
+	note C_, 4
+	note __, 4
+	note C_, 2
+	note __, 2
 	callchannel Music_BattleTowerTheme_branch_178afe
 	octave 2
-	note A#, 1
-	note __, 1
+	note A#, 2
+	note __, 2
 	octave 3
-	note D#, 3
-	note __, 3
+	note D#, 4
+	note __, 4
 	octave 2
-	note A#, 0
-	note __, 0
-	note A#, 0
-	note __, 0
-	octave 3
-	note C_, 3
-	note F_, 3
-	note __, 3
-	note C_, 0
-	note __, 0
-	note C_, 1
-	octave 2
 	note A#, 1
 	note __, 1
-	note A#, 3
-	note F_, 3
-	octave 3
-	note F_, 0
-	note __, 0
-	note F_, 1
-	octave 2
 	note A#, 1
 	note __, 1
 	octave 3
-	note D_, 1
-	note __, 1
-	note F_, 7
+	note C_, 4
+	note F_, 4
+	note __, 4
 	note C_, 1
 	note __, 1
-	note C_, 3
+	note C_, 2
 	octave 2
-	note F_, 3
+	note A#, 2
+	note __, 2
+	note A#, 4
+	note F_, 4
 	octave 3
-	note F_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
-	octave 2
-	note A_, 1
+	note F_, 1
 	note __, 1
+	note F_, 2
+	octave 2
+	note A#, 2
+	note __, 2
 	octave 3
-	note C_, 1
+	note D_, 2
+	note __, 2
+	note F_, 8
+	note C_, 2
+	note __, 2
+	note C_, 4
+	octave 2
+	note F_, 4
+	octave 3
+	note F_, 1
 	note __, 1
-	note F_, 7
-	note D#, 1
+	note F_, 1
 	note __, 1
-	note D#, 3
 	octave 2
-	note G_, 3
+	note A_, 2
+	note __, 2
 	octave 3
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
+	note C_, 2
+	note __, 2
+	note F_, 8
+	note D#, 2
+	note __, 2
+	note D#, 4
 	octave 2
+	note G_, 4
+	octave 3
 	note G_, 1
 	note __, 1
-	note A#, 1
+	note G_, 1
 	note __, 1
+	octave 2
+	note G_, 2
+	note __, 2
+	note A#, 2
+	note __, 2
 	octave 3
-	note D#, 7
+	note D#, 8
+	note F_, 2
+	note __, 2
+	note C_, 4
+	note __, 4
+	note C_, 2
+	octave 2
+	note F_, 2
+	note G_, 4
+	note __, 4
+	stereopanning $ff
+	note G_, 2
+	octave 3
+	note C_, 2
+	note E_, 4
+	note F_, 4
+	note C_, 8
 	note F_, 1
 	note __, 1
-	note C_, 3
-	note __, 3
+	note F_, 1
+	note __, 1
+	note A_, 4
+	note C_, 6
+	note __, 2
 	note C_, 1
-	octave 2
+	note __, 1
+	note C_, 1
+	note __, 1
+	note F_, 4
+	note D_, 8
 	note F_, 1
-	note G_, 3
-	note __, 3
-	stereopanning $ff
-	note G_, 1
-	octave 3
+	note __, 1
+	note F_, 1
+	note __, 1
+	note A#, 4
+	note A_, 4
+	note F_, 4
+	note D_, 4
+	note F_, 4
+	note C#, 8
+	note F_, 1
+	note __, 1
+	note F_, 1
+	note __, 1
+	note A#, 4
+	note F_, 8
+	note C#, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	note C_, 4
+	note F_, 8
 	note C_, 1
-	note E_, 3
-	note F_, 3
-	note C_, 7
-	note F_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
-	note A_, 3
-	note C_, 5
 	note __, 1
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note F_, 3
-	note D_, 7
-	note F_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
-	note A#, 3
-	note A_, 3
-	note F_, 3
-	note D_, 3
-	note F_, 3
-	note C#, 7
-	note F_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
-	note A#, 3
-	note F_, 7
-	note C#, 0
-	note __, 0
-	note C#, 0
-	note __, 0
-	note C_, 3
-	note F_, 7
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note G_, 3
-	note C_, 3
-	note D_, 3
-	note E_, 3
-	note F_, 3
-	note C_, 7
-	note F_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
-	note A_, 3
-	note C_, 7
+	note C_, 1
+	note __, 1
+	note G_, 4
+	note C_, 4
+	note D_, 4
+	note E_, 4
+	note F_, 4
+	note C_, 8
 	note F_, 1
 	note __, 1
-	note F_, 3
+	note F_, 1
+	note __, 1
+	note A_, 4
+	note C_, 8
+	note F_, 2
+	note __, 2
+	note F_, 4
 	octave 2
-	note A#, 7
+	note A#, 8
 	octave 3
-	note F_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
-	note A#, 3
+	note F_, 1
+	note __, 1
+	note F_, 1
+	note __, 1
+	note A#, 4
 	octave 2
-	note A#, 3
+	note A#, 4
 	octave 3
-	note D_, 3
-	note E_, 3
-	note F_, 3
+	note D_, 4
+	note E_, 4
+	note F_, 4
 	octave 2
-	note G#, 7
+	note G#, 8
 	octave 3
-	note C#, 0
-	note __, 0
-	note C#, 0
-	note __, 0
-	note G#, 3
+	note C#, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	note G#, 4
 	octave 2
-	note G#, 7
+	note G#, 8
 	octave 3
-	note C#, 3
-	note C_, 3
-	note G_, 7
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note G_, 3
-	note __, 11
+	note C#, 4
+	note C_, 4
+	note G_, 8
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note G_, 4
+	note __, 12
 	loopchannel 0, Music_BattleTowerTheme_branch_178a26
 ; 178afe
 
 Music_BattleTowerTheme_branch_178afe: ; 178afe
 	octave 3
+	note C_, 2
+	note __, 2
+	note F_, 4
+	note __, 4
 	note C_, 1
 	note __, 1
-	note F_, 3
-	note __, 3
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note F_, 3
-	note C_, 3
-	note __, 3
 	note C_, 1
 	note __, 1
+	note F_, 4
+	note C_, 4
+	note __, 4
+	note C_, 2
+	note __, 2
 	endchannel
 
 Music_BattleTowerTheme_Ch4: ; 178b0d
@@ -596,15 +596,15 @@
 
 Music_BattleTowerTheme_branch_178b11: ; 178b11
 	callchannel Music_BattleTowerTheme_branch_178b58
+	note D_, 2
+	note D_, 4
 	note D_, 1
-	note D_, 3
-	note D_, 0
-	note D_, 0
-	note D_, 3
-	note D_, 0
-	note C#, 0
-	note D_, 0
-	note C#, 0
+	note D_, 1
+	note D_, 4
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note C#, 1
 
 Music_BattleTowerTheme_branch_178b1d: ; 178b1d
 	callchannel Music_BattleTowerTheme_branch_178b58
@@ -613,89 +613,89 @@
 	callchannel Music_BattleTowerTheme_branch_178b6c
 	callchannel Music_BattleTowerTheme_branch_178b61
 	callchannel Music_BattleTowerTheme_branch_178b6c
+	note D_, 2
+	note D_, 4
 	note D_, 1
-	note D_, 3
-	note D_, 0
-	note D_, 0
-	note D_, 7
+	note D_, 1
+	note D_, 8
 
 Music_BattleTowerTheme_branch_178b35: ; 178b35
 	callchannel Music_BattleTowerTheme_branch_178b76
+	note D_, 2
+	note D_, 2
+	note D_, 2
 	note D_, 1
 	note D_, 1
+	note D_, 2
+	note D_, 2
 	note D_, 1
-	note D_, 0
-	note D_, 0
+	note C#, 1
 	note D_, 1
-	note D_, 1
-	note D_, 0
-	note C#, 0
-	note D_, 0
-	note C#, 0
+	note C#, 1
 	loopchannel 3, Music_BattleTowerTheme_branch_178b35
 	callchannel Music_BattleTowerTheme_branch_178b76
+	note D_, 2
+	note D_, 2
+	note D_, 2
 	note D_, 1
 	note D_, 1
+	note D_, 4
 	note D_, 1
-	note D_, 0
-	note D_, 0
-	note D_, 3
-	note D_, 0
-	note C#, 0
-	note D_, 0
-	note C#, 0
+	note C#, 1
+	note D_, 1
+	note C#, 1
 	loopchannel 0, Music_BattleTowerTheme_branch_178b11
 ; 178b58
 
 Music_BattleTowerTheme_branch_178b58: ; 178b58
+	note D_, 2
+	note D_, 4
 	note D_, 1
-	note D_, 3
-	note D_, 0
-	note D_, 0
 	note D_, 1
-	note D_, 3
-	note D_, 0
-	note D_, 0
+	note D_, 2
+	note D_, 4
+	note D_, 1
+	note D_, 1
 	endchannel
 ; 178b61
 
 Music_BattleTowerTheme_branch_178b61: ; 178b61
+	note D_, 2
+	note D_, 4
 	note D_, 1
-	note D_, 3
-	note D_, 0
-	note D_, 0
 	note D_, 1
+	note D_, 2
+	note D_, 2
 	note D_, 1
-	note D_, 0
-	note C#, 0
-	note D_, 0
-	note C#, 0
+	note C#, 1
+	note D_, 1
+	note C#, 1
 	endchannel
 ; 178b6c
 
 Music_BattleTowerTheme_branch_178b6c: ; 178b6c
+	note D_, 2
+	note D_, 4
 	note D_, 1
-	note D_, 3
-	note D_, 0
-	note D_, 0
 	note D_, 1
+	note D_, 2
+	note D_, 2
+	note D_, 2
 	note D_, 1
 	note D_, 1
-	note D_, 0
-	note D_, 0
 	endchannel
 ; 178b76
 
 Music_BattleTowerTheme_branch_178b76: ; 178b76
+	note D_, 2
+	note C#, 2
+	note D_, 2
 	note D_, 1
 	note C#, 1
+	note D_, 2
+	note C#, 2
+	note D_, 2
 	note D_, 1
-	note D_, 0
-	note C#, 0
-	note D_, 1
 	note C#, 1
-	note D_, 1
-	note D_, 0
-	note C#, 0
 	endchannel
 ; 178b81
--- a/audio/music/bicycle.asm
+++ b/audio/music/bicycle.asm
@@ -15,161 +15,161 @@
 	vibrato $8, $15
 	notetype $c, $b4
 	octave 3
-	note B_, 5
-	note A_, 5
-	note G_, 3
+	note B_, 6
+	note A_, 6
+	note G_, 4
 	intensity $b0
-	note A_, 5
+	note A_, 6
 	intensity $b6
-	note A_, 7
+	note A_, 8
 	intensity $b2
-	note F#, 1
+	note F#, 2
 
 Music_Bicycle_branch_ee144: ; ee144
 	stereopanning $f
 	intensity $b2
-	note G_, 1
-	note G_, 1
+	note G_, 2
+	note G_, 2
+	note E_, 2
+	note E_, 2
+	note F#, 1
 	note E_, 1
-	note E_, 1
-	note F#, 0
-	note E_, 0
-	note D#, 1
-	note D_, 1
-	note D_, 1
-	note E_, 1
-	note E_, 1
-	note C_, 1
-	note C_, 1
+	note D#, 2
+	note D_, 2
+	note D_, 2
+	note E_, 2
+	note E_, 2
+	note C_, 2
+	note C_, 2
 	octave 2
-	note B_, 1
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	note B_, 2
+	note G_, 2
+	note A_, 2
+	note B_, 2
 	octave 3
-	note C_, 1
-	note C_, 1
-	note E_, 1
-	note E_, 1
-	note C#, 1
-	note E_, 1
+	note C_, 2
+	note C_, 2
+	note E_, 2
+	note E_, 2
+	note C#, 2
+	note E_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note D_, 2
+	note C#, 2
+	note D_, 2
+	note D_, 2
+	note C#, 2
+	note D_, 2
+	note G_, 2
+	note G_, 2
+	note E_, 2
+	note E_, 2
 	note F#, 1
 	note E_, 1
-	note D_, 1
-	note E_, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note G_, 1
-	note G_, 1
-	note E_, 1
-	note E_, 1
-	note F#, 0
-	note E_, 0
-	note D#, 1
-	note D_, 1
-	note D_, 1
-	note E_, 1
-	note E_, 1
-	note C_, 1
-	note C_, 1
+	note D#, 2
+	note D_, 2
+	note D_, 2
+	note E_, 2
+	note E_, 2
+	note C_, 2
+	note C_, 2
 	octave 2
-	note B_, 1
-	note B_, 1
-	note A#, 1
-	note B_, 1
+	note B_, 2
+	note B_, 2
+	note A#, 2
+	note B_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note C_, 1
-	note E_, 1
-	note C_, 1
-	note E_, 1
-	note F#, 1
-	note G_, 1
-	note F#, 1
+	note C_, 2
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note F#, 2
 	intensity $82
-	note F#, 1
+	note F#, 2
 	intensity $b2
-	note A_, 1
-	note G_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note A_, 1
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note G_, 2
+	note G#, 2
+	note A_, 2
 	stereopanning $f0
 	intensity $b6
-	note B_, 3
-	note G_, 3
+	note B_, 4
+	note G_, 4
 	octave 4
-	note D_, 3
+	note D_, 4
 	octave 3
-	note G_, 3
-	note A_, 3
-	note F#, 3
+	note G_, 4
+	note A_, 4
+	note F#, 4
 	octave 4
-	note D_, 3
+	note D_, 4
 	octave 3
-	note F#, 3
-	note G_, 3
-	note E_, 3
+	note F#, 4
+	note G_, 4
+	note E_, 4
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note E_, 3
-	note F#, 3
-	note D_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note A_, 3
+	note E_, 4
+	note F#, 4
+	note D_, 2
+	note F#, 2
+	note G_, 2
+	note G#, 2
+	note A_, 4
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note B_, 1
-	note G_, 1
-	note B_, 1
+	note B_, 2
+	note G_, 2
+	note B_, 2
 	octave 4
-	note D_, 1
-	note G_, 1
-	note D_, 1
+	note D_, 2
+	note G_, 2
+	note D_, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note A_, 1
-	note F#, 1
-	note A_, 1
+	note A_, 2
+	note F#, 2
+	note A_, 2
 	octave 4
-	note C_, 1
-	note F#, 1
-	note C_, 1
+	note C_, 2
+	note F#, 2
+	note C_, 2
 	octave 3
-	note A_, 1
-	note G_, 1
-	note E_, 1
-	note C_, 1
-	note E_, 1
-	note G_, 1
-	note G#, 1
-	note A_, 1
-	note B_, 1
+	note A_, 2
+	note G_, 2
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note G_, 2
+	note G#, 2
+	note A_, 2
+	note B_, 2
 	octave 4
-	note C_, 1
-	note C_, 1
+	note C_, 2
+	note C_, 2
 	octave 3
-	note A_, 1
-	note G_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note A_, 1
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note G_, 2
+	note G#, 2
+	note A_, 2
 	loopchannel 0, Music_Bicycle_branch_ee144
 
 Music_Bicycle_Ch2: ; ee1de
@@ -178,24 +178,24 @@
 	stereopanning $f0
 	notetype $c, $c6
 	octave 4
-	note D_, 5
-	note C_, 5
+	note D_, 6
+	note C_, 6
 	octave 3
-	note B_, 3
+	note B_, 4
 	intensity $c2
 	octave 4
+	note D_, 2
 	note D_, 1
-	note D_, 0
-	note E_, 0
+	note E_, 1
+	note D_, 2
 	note D_, 1
-	note D_, 0
-	note E_, 0
-	note D_, 1
+	note E_, 1
+	note D_, 2
 	intensity $c3
-	note C_, 1
+	note C_, 2
 	octave 3
-	note B_, 1
-	note A_, 1
+	note B_, 2
+	note A_, 2
 
 Music_Bicycle_branch_ee1fd: ; ee1fd
 	stereopanning $ff
@@ -202,282 +202,282 @@
 	dutycycle $2
 	intensity $c3
 	octave 3
-	note B_, 3
-	note G_, 3
-	note A_, 3
-	note F#, 3
+	note B_, 4
+	note G_, 4
+	note A_, 4
+	note F#, 4
 	intensity $c2
-	note G_, 1
-	note F#, 1
-	note E_, 1
-	note F#, 1
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
 	intensity $c5
-	note D_, 7
+	note D_, 8
 	intensity $c4
-	note E_, 3
-	note G_, 3
+	note E_, 4
+	note G_, 4
 	intensity $c2
-	note E_, 1
-	note B_, 1
-	note A_, 1
-	note G_, 1
-	note F#, 1
-	note G_, 1
-	note A_, 1
-	note G_, 1
+	note E_, 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note G_, 2
 	intensity $c5
-	note F#, 7
+	note F#, 8
 	intensity $c3
-	note B_, 3
-	note G_, 3
-	note A_, 3
-	note F#, 3
+	note B_, 4
+	note G_, 4
+	note A_, 4
+	note F#, 4
 	intensity $c2
-	note G_, 1
-	note F#, 1
-	note E_, 1
-	note F#, 1
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
 	intensity $c5
-	note D_, 7
+	note D_, 8
 	intensity $c4
-	note E_, 3
-	note G_, 3
+	note E_, 4
+	note G_, 4
 	intensity $c2
-	note E_, 1
+	note E_, 2
 	octave 4
-	note E_, 1
-	note D_, 1
-	note C_, 1
+	note E_, 2
+	note D_, 2
+	note C_, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note C_, 1
-	note D_, 1
-	note E_, 1
+	note C_, 2
+	note D_, 2
+	note E_, 2
 	intensity $c7
-	note F#, 7
+	note F#, 8
 	stereopanning $f
 	callchannel Music_Bicycle_branch_ee263
-	note F#, 3
+	note F#, 4
 	intensity $c3
-	note A_, 1
-	note D_, 1
-	note E_, 1
-	note F_, 1
-	note F#, 3
+	note A_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	note F#, 4
 	intensity $c7
 	callchannel Music_Bicycle_branch_ee263
-	note F#, 3
+	note F#, 4
 	intensity $c3
-	note A_, 1
-	note B_, 1
-	note A_, 1
-	note G_, 1
-	note F#, 3
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 4
 	loopchannel 0, Music_Bicycle_branch_ee1fd
 ; ee263
 
 Music_Bicycle_branch_ee263: ; ee263
-	note G_, 5
-	note B_, 5
-	note G_, 3
-	note F#, 5
-	note A_, 5
-	note F#, 3
-	note E_, 5
-	note G_, 5
-	note E_, 3
+	note G_, 6
+	note B_, 6
+	note G_, 4
+	note F#, 6
+	note A_, 6
+	note F#, 4
+	note E_, 6
+	note G_, 6
+	note E_, 4
 	endchannel
 
 Music_Bicycle_Ch3: ; ee26d
 	notetype $c, $14
-	note __, 15
+	note __, 16
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note D_, 1
-	note C_, 1
-	note E_, 1
-	note D_, 1
+	note D_, 2
+	note C_, 2
+	note E_, 2
+	note D_, 2
 	octave 3
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
 
 Music_Bicycle_branch_ee27f: ; ee27f
 	callchannel Music_Bicycle_branch_ee333
-	note E_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
+	note E_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
 	octave 2
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 3
-	note C_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
+	note C_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
 	callchannel Music_Bicycle_branch_ee333
-	note E_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note F_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note E_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note F_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
 	octave 4
-	note D_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
 	octave 3
-	note B_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
 
 Music_Bicycle_branch_ee2e9: ; ee2e9
-	note G_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
+	note G_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
 	octave 4
-	note C_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
 	octave 3
-	note B_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
 	loopchannel 2, Music_Bicycle_branch_ee2e9
 	loopchannel 0, Music_Bicycle_branch_ee27f
 ; ee333
@@ -484,42 +484,42 @@
 
 Music_Bicycle_branch_ee333: ; ee333
 	octave 3
-	note G_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
 	endchannel
 
 Music_Bicycle_Ch4: ; ee345
 	togglenoise $0
 	notetype $c
-	note __, 15
-	note __, 15
+	note __, 16
+	note __, 16
 
 Music_Bicycle_branch_ee34b: ; ee34b
-	note __, 1
+	note __, 2
 
 Music_Bicycle_branch_ee34c: ; ee34c
 	stereopanning $f0
-	note F_, 3
+	note F_, 4
 	loopchannel 12, Music_Bicycle_branch_ee34c
-	note F_, 3
-	note F_, 3
+	note F_, 4
+	note F_, 4
 	stereopanning $ff
-	note F_, 1
-	note F_, 1
-	note F_, 1
+	note F_, 2
+	note F_, 2
+	note F_, 2
 	loopchannel 0, Music_Bicycle_branch_ee34b
 ; ee35e
--- a/audio/music/buenaspassword.asm
+++ b/audio/music/buenaspassword.asm
@@ -11,34 +11,34 @@
 	volume $77
 	tone $0001
 	notetype $c, $b3
-	note __, 7
+	note __, 8
 
 Music_BuenasPassword_branch_17816b: ; 17816b
 	stereopanning $ff
-	note __, 15
-	note __, 15
+	note __, 16
+	note __, 16
 	dutycycle $3
 	notetype $6, $97
 	stereopanning $f
 	octave 4
-	note G#, 0
-	note __, 0
-	note G#, 0
-	note __, 0
-	note F#, 1
 	note G#, 1
-	note __, 9
-	note __, 9
+	note __, 1
+	note G#, 1
+	note __, 1
+	note F#, 2
+	note G#, 2
+	note __, 10
+	note __, 10
 	stereopanning $f0
-	note C#, 1
-	note F_, 1
-	note G#, 0
-	note __, 0
-	note G#, 0
-	note __, 0
-	note F#, 1
+	note C#, 2
+	note F_, 2
 	note G#, 1
-	note __, 11
+	note __, 1
+	note G#, 1
+	note __, 1
+	note F#, 2
+	note G#, 2
+	note __, 12
 	dutycycle $2
 	callchannel Music_BuenasPassword_branch_178204
 	stereopanning $ff
@@ -50,95 +50,95 @@
 	callchannel Music_BuenasPassword_branch_178222
 	callchannel Music_BuenasPassword_branch_178204
 	dutycycle $1
-	note C#, 1
+	note C#, 2
+	note __, 2
+	note D#, 2
+	note __, 2
+	note F#, 2
 	note __, 1
-	note D#, 1
+	note G#, 2
 	note __, 1
-	note F#, 1
-	note __, 0
-	note G#, 1
-	note __, 0
-	note A#, 1
-	note B_, 0
-	note __, 0
-	octave 4
-	note C#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	octave 3
+	note A#, 2
 	note B_, 1
 	note __, 1
-	note B_, 1
-	note G#, 1
-	note B_, 1
-	note A#, 1
-	note G#, 1
-	note G_, 0
-	note D#, 2
+	octave 4
 	note C#, 1
-	octave 2
-	note B_, 1
-	note A#, 0
+	note __, 1
+	note D#, 1
+	note __, 1
+	octave 3
+	note B_, 2
+	note __, 2
+	note B_, 2
 	note G#, 2
-	note A#, 1
+	note B_, 2
+	note A#, 2
+	note G#, 2
 	note G_, 1
-	note A#, 0
+	note D#, 3
+	note C#, 2
+	octave 2
+	note B_, 2
+	note A#, 1
+	note G#, 3
+	note A#, 2
+	note G_, 2
+	note A#, 1
 	octave 3
+	note C#, 3
+	note D#, 2
 	note C#, 2
 	note D#, 1
+	note G_, 3
+	note B_, 2
+	note __, 2
+	note A#, 2
+	note __, 2
+	note G#, 2
+	note __, 1
+	note F#, 2
+	note __, 1
+	note D#, 2
 	note C#, 1
-	note D#, 0
-	note G_, 2
-	note B_, 1
 	note __, 1
-	note A#, 1
+	note D#, 1
 	note __, 1
+	note F_, 1
+	note __, 1
+	note C#, 2
+	note __, 2
+	note G#, 2
+	octave 4
+	note C#, 2
+	note F_, 2
 	note G#, 1
-	note __, 0
-	note F#, 1
-	note __, 0
+	note __, 1
 	note D#, 1
-	note C#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note F_, 0
-	note __, 0
-	note C#, 1
 	note __, 1
 	note G#, 1
-	octave 4
-	note C#, 1
+	note F#, 3
 	note F_, 1
-	note G#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note G#, 0
-	note F#, 2
-	note F_, 0
-	note __, 0
-	note D#, 0
-	note __, 0
+	note __, 1
+	note D#, 1
+	note __, 1
 	octave 3
-	note B_, 0
-	note G#, 2
-	note F#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note G#, 0
+	note B_, 1
+	note G#, 3
+	note F#, 1
+	note __, 1
 	note D#, 1
-	note F#, 0
-	note G#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note G_, 0
-	note __, 0
+	note __, 1
+	note G#, 1
+	note D#, 2
+	note F#, 1
+	note G#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note G_, 1
+	note __, 1
 	loopchannel 0, Music_BuenasPassword_branch_17816b
 ; 178204
 
@@ -146,22 +146,22 @@
 	stereopanning $f
 	notetype $6, $84
 	octave 4
-	note D#, 1
+	note D#, 2
 	intensity $71
-	note C#, 0
-	note C_, 0
+	note C#, 1
+	note C_, 1
 	intensity $51
 	octave 3
-	note A#, 0
-	note G#, 0
+	note A#, 1
+	note G#, 1
 	intensity $31
-	note G_, 0
-	note F_, 0
+	note G_, 1
+	note F_, 1
 	intensity $11
-	note D#, 0
-	note C#, 0
-	note C_, 0
-	note __, 0
+	note D#, 1
+	note C#, 1
+	note C_, 1
+	note __, 1
 	notetype $c, $84
 	endchannel
 ; 178222
@@ -168,19 +168,19 @@
 
 Music_BuenasPassword_branch_178222: ; 178222
 	octave 3
-	note D#, 0
-	note __, 0
+	note D#, 1
+	note __, 1
 	octave 2
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
 	octave 3
-	note D#, 0
+	note D#, 1
 	octave 2
-	note G#, 0
-	note __, 0
-	octave 3
-	note D#, 0
+	note G#, 1
 	note __, 1
+	octave 3
+	note D#, 1
+	note __, 2
 	endchannel
 ; 178231
 
@@ -188,9 +188,9 @@
 	vibrato $12, $34
 	dutycycle $2
 	notetype $c, $a5
-	note __, 6
+	note __, 7
 	octave 3
-	note F#, 0
+	note F#, 1
 
 Music_BuenasPassword_branch_17823c: ; 17823c
 	stereopanning $ff
@@ -199,82 +199,82 @@
 	stereopanning $ff
 	callchannel Music_BuenasPassword_branch_1782cc
 	octave 3
-	note B_, 1
-	note A#, 1
-	note B_, 1
-	note G#, 15
+	note B_, 2
+	note A#, 2
+	note B_, 2
+	note G#, 16
 	callchannel Music_BuenasPassword_branch_1782a4
 	stereopanning $ff
 	callchannel Music_BuenasPassword_branch_1782cc
-	note B_, 1
-	note A#, 1
-	note B_, 1
-	note G#, 15
+	note B_, 2
+	note A#, 2
+	note B_, 2
+	note G#, 16
 	callchannel Music_BuenasPassword_branch_1782a4
-	note F#, 1
+	note F#, 2
+	note __, 2
+	note G#, 2
+	note __, 2
+	note A#, 2
 	note __, 1
-	note G#, 1
+	note B_, 2
 	note __, 1
-	note A#, 1
-	note __, 0
-	note B_, 1
-	note __, 0
 	octave 4
-	note C#, 1
-	note D#, 0
-	note __, 0
-	note F_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
+	note C#, 2
 	note D#, 1
 	note __, 1
-	note G#, 1
+	note F_, 1
+	note __, 1
 	note F#, 1
-	note G#, 1
-	note D#, 13
-	note C#, 0
-	note D#, 0
-	note C#, 5
+	note __, 1
+	note D#, 2
+	note __, 2
+	note G#, 2
+	note F#, 2
+	note G#, 2
+	note D#, 14
+	note C#, 1
+	note D#, 1
+	note C#, 6
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note C#, 0
-	note D#, 7
-	note F#, 1
+	note C#, 1
+	note D#, 8
+	note F#, 2
+	note __, 2
+	note F_, 2
+	note __, 2
+	note D#, 2
 	note __, 1
-	note F_, 1
+	note C#, 2
 	note __, 1
-	note D#, 1
-	note __, 0
-	note C#, 1
-	note __, 0
 	octave 3
-	note B_, 1
-	note G#, 0
-	note __, 0
-	note A#, 0
-	note __, 0
-	note B_, 0
-	note __, 0
+	note B_, 2
 	note G#, 1
 	note __, 1
+	note A#, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note G#, 2
+	note __, 2
 	octave 4
-	note C#, 1
-	note F_, 1
-	note G#, 1
-	note B_, 13
-	note A#, 0
-	note B_, 0
-	note G#, 9
+	note C#, 2
+	note F_, 2
+	note G#, 2
+	note B_, 14
+	note A#, 1
+	note B_, 1
+	note G#, 10
 	intensity $84
 	octave 2
-	note D#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note G_, 0
-	note __, 0
+	note D#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note G_, 1
+	note __, 1
 	intensity $a5
 	loopchannel 0, Music_BuenasPassword_branch_17823c
 ; 1782a4
@@ -281,34 +281,34 @@
 
 Music_BuenasPassword_branch_1782a4: ; 1782a4
 	octave 3
-	note G#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note F#, 0
-	note D#, 0
-	note __, 0
-	note F#, 0
+	note G#, 1
 	note __, 1
+	note D#, 1
+	note __, 1
+	note F#, 1
+	note D#, 1
+	note __, 1
+	note F#, 1
+	note __, 2
 	stereopanning $f0
 	octave 4
-	note G#, 0
+	note G#, 1
 	notetype $6, $81
-	note G_, 0
-	note F_, 0
+	note G_, 1
+	note F_, 1
 	intensity $71
-	note D#, 0
-	note C#, 0
+	note D#, 1
+	note C#, 1
 	intensity $61
-	note C_, 0
+	note C_, 1
 	octave 3
-	note A#, 0
+	note A#, 1
 	intensity $41
-	note G#, 0
+	note G#, 1
 	intensity $21
-	note G_, 0
-	note F_, 0
-	note __, 0
+	note G_, 1
+	note F_, 1
+	note __, 1
 	notetype $c, $a5
 	endchannel
 ; 1782cc
@@ -315,81 +315,81 @@
 
 Music_BuenasPassword_branch_1782cc: ; 1782cc
 	octave 4
-	note G#, 1
+	note G#, 2
+	note __, 2
+	note F#, 2
+	note __, 2
+	note F_, 2
 	note __, 1
-	note F#, 1
+	note D#, 2
 	note __, 1
-	note F_, 1
-	note __, 0
+	note C#, 2
 	note D#, 1
-	note __, 0
-	note C#, 1
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note C#, 0
-	note __, 0
+	note __, 1
 	note D#, 1
 	note __, 1
+	note C#, 1
+	note __, 1
+	note D#, 2
+	note __, 2
 	endchannel
 ; 1782df
 
 Music_BuenasPassword_branch_1782df: ; 1782df
 	octave 3
-	note G#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note F#, 0
-	note D#, 0
-	note __, 0
-	note F#, 0
-	note F_, 0
-	note __, 0
-	note C#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note F#, 1
+	note D#, 1
+	note __, 1
+	note F#, 1
+	note F_, 1
+	note __, 1
+	note C#, 1
+	note __, 1
 	octave 2
-	note B_, 0
-	note G#, 2
+	note B_, 1
+	note G#, 3
 	octave 3
-	note G#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note F#, 0
-	note D#, 0
-	note __, 0
-	note F#, 0
-	note F_, 0
-	note __, 0
-	note C#, 0
-	note __, 0
-	octave 2
-	note B_, 0
 	note G#, 1
-	octave 3
-	note F#, 0
-	note G#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note F#, 0
-	note D#, 0
-	note __, 0
-	note F#, 0
-	note F_, 0
-	note __, 0
-	note C#, 0
-	note __, 0
+	note __, 1
+	note D#, 1
+	note __, 1
+	note F#, 1
+	note D#, 1
+	note __, 1
+	note F#, 1
+	note F_, 1
+	note __, 1
+	note C#, 1
+	note __, 1
 	octave 2
-	note B_, 0
+	note B_, 1
 	note G#, 2
+	octave 3
+	note F#, 1
+	note G#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note F#, 1
+	note D#, 1
+	note __, 1
+	note F#, 1
+	note F_, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	octave 2
+	note B_, 1
+	note G#, 3
 	endchannel
 
 Music_BuenasPassword_Ch3: ; 178311
 	notetype $c, $14
-	note __, 7
+	note __, 8
 
 Music_BuenasPassword_branch_178315: ; 178315
 	callchannel Music_BuenasPassword_branch_1783a7
@@ -396,188 +396,188 @@
 	callchannel Music_BuenasPassword_branch_1783a7
 	callchannel Music_BuenasPassword_branch_1783a7
 	octave 2
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
 	octave 3
-	note F#, 0
-	note __, 0
+	note F#, 1
+	note __, 1
 	octave 2
-	note G#, 0
+	note G#, 1
 	octave 3
-	note D#, 1
+	note D#, 2
 	octave 2
-	note G#, 0
+	note G#, 1
+	note __, 2
+	note B_, 1
 	note __, 1
-	note B_, 0
-	note __, 0
-	note G#, 3
+	note G#, 4
 	loopchannel 3, Music_BuenasPassword_branch_178315
-	note F#, 0
-	note __, 0
-	note A#, 0
-	note __, 0
-	octave 3
-	note C#, 0
-	octave 2
-	note F#, 0
-	note __, 0
-	octave 3
-	note C#, 0
-	octave 2
-	note F#, 0
-	note __, 0
+	note F#, 1
+	note __, 1
 	note A#, 1
+	note __, 1
 	octave 3
-	note C#, 0
-	note __, 0
+	note C#, 1
 	octave 2
 	note F#, 1
-	note G#, 0
-	note __, 0
-	note G#, 0
-	note __, 0
-	note B_, 0
-	note G#, 0
-	note __, 0
+	note __, 1
 	octave 3
-	note D#, 0
+	note C#, 1
 	octave 2
-	note G#, 0
-	note __, 0
+	note F#, 1
+	note __, 1
+	note A#, 2
 	octave 3
-	note G#, 1
+	note C#, 1
+	note __, 1
 	octave 2
-	note G#, 0
-	note __, 0
+	note F#, 2
+	note G#, 1
+	note __, 1
+	note G#, 1
+	note __, 1
+	note B_, 1
+	note G#, 1
+	note __, 1
 	octave 3
 	note D#, 1
 	octave 2
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note G#, 0
-	note D#, 0
-	note __, 0
-	note A#, 0
-	note D#, 0
-	note __, 0
 	note G#, 1
-	note A#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note G_, 0
-	note D#, 0
-	note __, 0
-	note A#, 0
-	note D#, 0
-	note __, 0
+	note __, 1
 	octave 3
-	note D#, 1
+	note G#, 2
 	octave 2
-	note D#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
+	octave 3
+	note D#, 2
+	octave 2
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note G#, 1
+	note D#, 1
+	note __, 1
+	note A#, 1
+	note D#, 1
+	note __, 1
+	note G#, 2
+	note A#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
 	note G_, 1
-	callchannel Music_BuenasPassword_branch_1783bc
+	note D#, 1
+	note __, 1
+	note A#, 1
+	note D#, 1
+	note __, 1
 	octave 3
-	note C#, 0
-	note __, 0
-	note C#, 0
-	note __, 0
-	note F_, 0
-	note C#, 0
-	note __, 0
-	note G#, 0
+	note D#, 2
 	octave 2
-	note G#, 0
-	note __, 0
+	note D#, 1
+	note __, 1
+	note G_, 2
+	callchannel Music_BuenasPassword_branch_1783bc
 	octave 3
+	note C#, 1
+	note __, 1
+	note C#, 1
+	note __, 1
 	note F_, 1
+	note C#, 1
+	note __, 1
+	note G#, 1
 	octave 2
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
 	octave 3
-	note C#, 1
+	note F_, 2
+	octave 2
+	note G#, 1
+	note __, 1
+	octave 3
+	note C#, 2
 	callchannel Music_BuenasPassword_branch_1783bc
-	note G#, 0
-	note __, 0
-	note G#, 0
-	note __, 0
-	note B_, 0
 	note G#, 1
+	note __, 1
+	note G#, 1
+	note __, 1
+	note B_, 1
+	note G#, 2
 	octave 3
-	note D#, 0
+	note D#, 1
 	octave 2
-	note G#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note G_, 0
-	note __, 0
+	note G#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note G_, 1
+	note __, 1
 	loopchannel 0, Music_BuenasPassword_branch_178315
 ; 1783a7
 
 Music_BuenasPassword_branch_1783a7: ; 1783a7
 	octave 2
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
 	octave 3
-	note F#, 0
-	note __, 0
+	note F#, 1
+	note __, 1
 	octave 2
-	note G#, 0
+	note G#, 1
 	octave 3
-	note D#, 1
+	note D#, 2
 	octave 2
-	note G#, 0
+	note G#, 1
 	octave 3
-	note C#, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note C#, 0
-	note F_, 1
-	note C#, 0
+	note C#, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note C#, 1
+	note F_, 2
+	note C#, 1
 	endchannel
 ; 1783bc
 
 Music_BuenasPassword_branch_1783bc: ; 1783bc
 	octave 2
-	note G#, 0
-	note __, 0
-	note G#, 0
-	note __, 0
-	note B_, 0
-	note G#, 0
-	note __, 0
-	octave 3
-	note D#, 0
-	octave 2
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
+	note G#, 1
+	note __, 1
 	note B_, 1
+	note G#, 1
+	note __, 1
 	octave 3
-	note D#, 0
-	note __, 0
+	note D#, 1
 	octave 2
 	note G#, 1
+	note __, 1
+	note B_, 2
+	octave 3
+	note D#, 1
+	note __, 1
+	octave 2
+	note G#, 2
 	endchannel
 
 Music_BuenasPassword_Ch4: ; 1783d0
 	togglenoise $3
 	notetype $c
-	note D#, 1
+	note D#, 2
+	note D_, 2
+	note D_, 2
 	note D_, 1
 	note D_, 1
-	note D_, 0
-	note D_, 0
 
 Music_BuenasPassword_branch_1783d9: ; 1783d9
 	callchannel Music_BuenasPassword_branch_17840c
@@ -589,60 +589,60 @@
 	callchannel Music_BuenasPassword_branch_17840c
 	callchannel Music_BuenasPassword_branch_17840c
 	stereopanning $ff
-	note D#, 1
+	note D#, 2
 	stereopanning $f0
-	note G_, 1
+	note G_, 2
 	stereopanning $ff
-	note D_, 1
+	note D_, 2
 	stereopanning $f
-	note G_, 0
-	note G_, 0
-	stereopanning $f0
 	note G_, 1
+	note G_, 1
+	stereopanning $f0
+	note G_, 2
 	stereopanning $ff
+	note D_, 2
+	note D_, 2
 	note D_, 1
 	note D_, 1
-	note D_, 0
-	note D_, 0
 	loopchannel 0, Music_BuenasPassword_branch_1783d9
 ; 17840c
 
 Music_BuenasPassword_branch_17840c: ; 17840c
 	stereopanning $ff
-	note D#, 1
+	note D#, 2
 	stereopanning $f0
-	note G_, 1
+	note G_, 2
 	stereopanning $ff
-	note D_, 1
+	note D_, 2
 	stereopanning $f
-	note G_, 0
-	note G_, 0
-	stereopanning $f0
 	note G_, 1
+	note G_, 1
+	stereopanning $f0
+	note G_, 2
 	stereopanning $ff
-	note D#, 1
-	note D_, 1
+	note D#, 2
+	note D_, 2
 	stereopanning $f
-	note G_, 1
+	note G_, 2
 	endchannel
 ; 178424
 
 Music_BuenasPassword_branch_178424: ; 178424
 	stereopanning $ff
-	note D#, 1
+	note D#, 2
 	stereopanning $f0
-	note G_, 1
+	note G_, 2
 	stereopanning $ff
-	note D_, 1
+	note D_, 2
 	stereopanning $f
-	note G_, 0
-	note G_, 0
-	stereopanning $f0
 	note G_, 1
+	note G_, 1
+	stereopanning $f0
+	note G_, 2
 	stereopanning $ff
-	note D#, 1
+	note D#, 2
+	note D_, 2
 	note D_, 1
-	note D_, 0
-	note D_, 0
+	note D_, 1
 	endchannel
 ; 17843b
--- a/audio/music/bugcatchingcontest.asm
+++ b/audio/music/bugcatchingcontest.asm
@@ -13,185 +13,185 @@
 	vibrato $8, $24
 	dutycycle $2
 	notetype $c, $b7
-	note __, 7
+	note __, 8
 	octave 4
-	note C#, 0
-	note __, 0
-	note C#, 2
-	note __, 0
-	note C#, 0
-	note C#, 0
-	note D_, 0
-	note __, 0
-	note D_, 2
-	note __, 0
-	note D_, 0
-	note D_, 0
-	note D#, 0
-	note __, 0
-	note D#, 2
-	note __, 0
-	note D#, 0
-	note D#, 0
-	note E_, 0
-	note __, 0
-	note E_, 2
-	note __, 0
-	note E_, 0
-	note E_, 0
+	note C#, 1
+	note __, 1
+	note C#, 3
+	note __, 1
+	note C#, 1
+	note C#, 1
+	note D_, 1
+	note __, 1
+	note D_, 3
+	note __, 1
+	note D_, 1
+	note D_, 1
+	note D#, 1
+	note __, 1
+	note D#, 3
+	note __, 1
+	note D#, 1
+	note D#, 1
+	note E_, 1
+	note __, 1
+	note E_, 3
+	note __, 1
+	note E_, 1
+	note E_, 1
 
 Music_BugCatchingContest_branch_f7c4b: ; f7c4b
 	notetype $c, $b1
 
 Music_BugCatchingContest_branch_f7c4e: ; f7c4e
-	note __, 1
+	note __, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	loopchannel 4, Music_BugCatchingContest_branch_f7c4e
 
 Music_BugCatchingContest_branch_f7c55: ; f7c55
-	note __, 1
-	note B_, 1
+	note __, 2
+	note B_, 2
 	loopchannel 8, Music_BugCatchingContest_branch_f7c55
 	intensity $b4
 	dutycycle $1
 	octave 3
-	note B_, 5
-	note A_, 0
-	note B_, 0
-	note A_, 5
+	note B_, 6
+	note A_, 1
+	note B_, 1
+	note A_, 6
 	octave 4
-	note D_, 0
-	note E_, 0
+	note D_, 1
+	note E_, 1
 	intensity $b1
 	dutycycle $2
 
 Music_BugCatchingContest_branch_f7c6b: ; f7c6b
-	note __, 1
+	note __, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	loopchannel 4, Music_BugCatchingContest_branch_f7c6b
-	note __, 1
-	note B_, 1
-	note __, 1
-	note B_, 1
+	note __, 2
+	note B_, 2
+	note __, 2
+	note B_, 2
 	notetype $6, $b7
 	octave 4
-	note E_, 3
-	note __, 0
+	note E_, 4
+	note __, 1
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note E_, 0
-	note G_, 0
-	note B_, 7
+	note E_, 1
+	note G_, 1
+	note B_, 8
 	octave 5
-	note E_, 7
+	note E_, 8
 	intensity $b1
-	note __, 3
+	note __, 4
 	octave 2
-	note B_, 3
-	note __, 3
+	note B_, 4
+	note __, 4
 	octave 3
-	note E_, 3
-	note __, 3
-	note E_, 3
+	note E_, 4
+	note __, 4
+	note E_, 4
 
 Music_BugCatchingContest_branch_f7c8e: ; f7c8e
-	note __, 3
+	note __, 4
 	octave 2
-	note A_, 3
+	note A_, 4
 	loopchannel 3, Music_BugCatchingContest_branch_f7c8e
 	intensity $a7
 	octave 4
-	note F#, 3
-	note A_, 3
-	note __, 3
+	note F#, 4
+	note A_, 4
+	note __, 4
 	octave 3
-	note G_, 1
-	note B_, 1
+	note G_, 2
+	note B_, 2
 	octave 4
-	note D_, 1
-	note __, 1
+	note D_, 2
+	note __, 2
 	octave 3
-	note B_, 1
-	note G_, 1
+	note B_, 2
+	note G_, 2
 	octave 4
-	note G_, 0
-	note A_, 0
-	note G_, 0
-	note A_, 0
-	note G_, 0
-	note A_, 0
-	note G_, 0
-	note A_, 0
-	note G_, 7
-	note __, 3
-	octave 3
-	note F#, 1
+	note G_, 1
 	note A_, 1
-	octave 4
-	note D_, 1
-	note __, 1
-	octave 3
+	note G_, 1
 	note A_, 1
-	note F#, 1
+	note G_, 1
+	note A_, 1
+	note G_, 1
+	note A_, 1
+	note G_, 8
+	note __, 4
+	octave 3
+	note F#, 2
+	note A_, 2
 	octave 4
-	note F#, 0
-	note G_, 0
-	note F#, 0
-	note G_, 0
-	note F#, 0
-	note G_, 0
-	note F#, 0
-	note G_, 0
-	note F#, 7
-	note D_, 1
-	note __, 1
+	note D_, 2
+	note __, 2
 	octave 3
-	note B_, 1
-	note G_, 1
+	note A_, 2
+	note F#, 2
 	octave 4
+	note F#, 1
 	note G_, 1
-	note __, 1
-	note D_, 1
+	note F#, 1
+	note G_, 1
+	note F#, 1
+	note G_, 1
+	note F#, 1
+	note G_, 1
+	note F#, 8
+	note D_, 2
+	note __, 2
 	octave 3
-	note B_, 1
+	note B_, 2
+	note G_, 2
 	octave 4
-	note B_, 1
-	note __, 1
-	note G#, 1
-	note D_, 1
+	note G_, 2
+	note __, 2
+	note D_, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note D_, 1
-	note G#, 1
-	note B_, 1
-	note C#, 1
-	note __, 1
-	note C#, 5
-	note __, 1
-	note C#, 1
-	note C#, 1
-	note D_, 1
-	note __, 1
-	note D_, 5
-	note __, 1
-	note D_, 1
-	note D_, 1
-	note D#, 1
-	note __, 1
-	note D#, 5
-	note __, 1
-	note D#, 1
-	note D#, 1
-	note E_, 1
-	note __, 1
-	note E_, 5
-	note __, 1
-	note E_, 1
-	note E_, 1
+	note B_, 2
+	note __, 2
+	note G#, 2
+	note D_, 2
+	octave 3
+	note B_, 2
+	octave 4
+	note D_, 2
+	note G#, 2
+	note B_, 2
+	note C#, 2
+	note __, 2
+	note C#, 6
+	note __, 2
+	note C#, 2
+	note C#, 2
+	note D_, 2
+	note __, 2
+	note D_, 6
+	note __, 2
+	note D_, 2
+	note D_, 2
+	note D#, 2
+	note __, 2
+	note D#, 6
+	note __, 2
+	note D#, 2
+	note D#, 2
+	note E_, 2
+	note __, 2
+	note E_, 6
+	note __, 2
+	note E_, 2
+	note E_, 2
 	loopchannel 0, Music_BugCatchingContest_branch_f7c4b
 
 Music_BugCatchingContest_Ch2: ; f7cf4
@@ -199,16 +199,16 @@
 	vibrato $8, $23
 	dutycycle $1
 	notetype $c, $c7
-	note __, 7
+	note __, 8
 
 Music_BugCatchingContest_branch_f7cff: ; f7cff
 	octave 4
-	note A_, 0
-	note __, 0
-	note A_, 2
-	note __, 0
-	note A_, 0
-	note A_, 0
+	note A_, 1
+	note __, 1
+	note A_, 3
+	note __, 1
+	note A_, 1
+	note A_, 1
 	loopchannel 4, Music_BugCatchingContest_branch_f7cff
 
 Music_BugCatchingContest_branch_f7d0a: ; f7d0a
@@ -215,169 +215,169 @@
 	dutycycle $0
 	callchannel Music_BugCatchingContest_branch_f7d8e
 	octave 2
-	note E_, 1
+	note E_, 2
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 2
-	note E_, 1
+	note E_, 2
 	octave 3
-	note G_, 0
-	note __, 0
-	octave 2
 	note G_, 1
+	note __, 1
+	octave 2
+	note G_, 2
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
 	octave 2
-	note G#, 1
+	note G#, 2
 	octave 3
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
 	octave 2
-	note G_, 1
+	note G_, 2
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 2
-	note E_, 1
+	note E_, 2
 	octave 3
-	note E_, 0
-	note __, 0
+	note E_, 1
+	note __, 1
 	callchannel Music_BugCatchingContest_branch_f7d8e
 	octave 2
-	note E_, 1
+	note E_, 2
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 4
-	note C#, 0
-	note __, 0
+	note C#, 1
+	note __, 1
 	octave 2
-	note E_, 1
+	note E_, 2
 	octave 4
-	note C#, 0
-	note __, 0
+	note C#, 1
+	note __, 1
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 3
-	note F#, 0
-	note __, 0
+	note F#, 1
+	note __, 1
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 3
-	note F#, 0
-	note __, 0
+	note F#, 1
+	note __, 1
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 3
-	note F#, 0
-	note __, 0
+	note F#, 1
+	note __, 1
 	octave 2
-	note D#, 1
+	note D#, 2
 	octave 3
-	note A_, 0
-	note __, 0
-	dutycycle $0
+	note A_, 1
 	note __, 1
+	dutycycle $0
+	note __, 2
 	octave 5
-	note D_, 0
-	note __, 0
-	note C#, 1
-	note D_, 0
-	note __, 0
-	octave 4
-	note B_, 7
+	note D_, 1
 	note __, 1
-	octave 5
-	note D_, 0
-	note __, 0
-	note C#, 1
-	note D_, 0
-	note __, 0
+	note C#, 2
+	note D_, 1
+	note __, 1
 	octave 4
-	note A_, 7
+	note B_, 8
+	note __, 2
+	octave 5
+	note D_, 1
 	note __, 1
+	note C#, 2
+	note D_, 1
+	note __, 1
+	octave 4
+	note A_, 8
+	note __, 2
 	octave 5
-	note D_, 3
-	note F#, 1
+	note D_, 4
+	note F#, 2
+	note E_, 2
+	note D_, 1
+	note __, 1
+	note C#, 2
+	note D_, 1
+	note __, 1
 	note E_, 1
-	note D_, 0
-	note __, 0
-	note C#, 1
-	note D_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note E_, 0
-	note __, 2
-	note E_, 9
-	note A_, 0
-	note __, 0
-	note A_, 0
-	note __, 2
-	note A_, 9
+	note __, 1
+	note E_, 1
+	note __, 3
+	note E_, 10
+	note A_, 1
+	note __, 1
+	note A_, 1
+	note __, 3
+	note A_, 10
 	loopchannel 0, Music_BugCatchingContest_branch_f7d0a
 ; f7d8e
 
 Music_BugCatchingContest_branch_f7d8e: ; f7d8e
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 3
-	note F#, 0
-	note __, 0
+	note F#, 1
+	note __, 1
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 3
-	note F#, 0
-	note __, 0
+	note F#, 1
+	note __, 1
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 3
-	note F#, 0
-	note __, 0
+	note F#, 1
+	note __, 1
 	octave 2
-	note C#, 1
+	note C#, 2
 	octave 3
-	note F#, 0
-	note __, 0
+	note F#, 1
+	note __, 1
 	octave 2
-	note E_, 1
+	note E_, 2
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 2
-	note C#, 1
+	note C#, 2
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 2
-	note D#, 1
+	note D#, 2
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	endchannel
 
 Music_BugCatchingContest_Ch3: ; f7db7
@@ -384,298 +384,298 @@
 	stereopanning $ff
 	vibrato $10, $23
 	notetype $c, $14
-	note __, 7
+	note __, 8
 	octave 3
-	note A_, 0
-	note __, 0
-	note A_, 2
-	note __, 0
-	note A_, 0
-	note A_, 0
-	note B_, 0
-	note __, 0
-	note B_, 2
-	note __, 0
-	note B_, 0
-	note B_, 0
+	note A_, 1
+	note __, 1
+	note A_, 3
+	note __, 1
+	note A_, 1
+	note A_, 1
+	note B_, 1
+	note __, 1
+	note B_, 3
+	note __, 1
+	note B_, 1
+	note B_, 1
 	octave 4
-	note C_, 0
-	note __, 0
-	note C_, 2
-	note __, 0
-	note C_, 0
-	note C_, 0
-	note C#, 0
-	note __, 0
-	note C#, 2
-	note __, 0
-	note C#, 0
-	note C#, 0
+	note C_, 1
+	note __, 1
+	note C_, 3
+	note __, 1
+	note C_, 1
+	note C_, 1
+	note C#, 1
+	note __, 1
+	note C#, 3
+	note __, 1
+	note C#, 1
+	note C#, 1
 
 Music_BugCatchingContest_branch_f7dda: ; f7dda
 	notetype $c, $14
-	note F#, 4
-	note __, 0
-	note F#, 0
-	note G_, 0
-	note A_, 3
-	octave 5
-	note D_, 3
-	note C#, 1
-	intensity $10
-	note E_, 0
-	note G_, 0
-	note B_, 0
-	note __, 0
-	note G_, 0
-	note E_, 0
-	notetype $6, $20
-	octave 6
-	note E_, 0
-	note F#, 0
-	note E_, 0
-	note F#, 0
-	note E_, 0
-	note F#, 0
-	note E_, 0
-	note F#, 0
-	note E_, 7
-	intensity $14
-	octave 4
-	note E_, 9
+	note F#, 5
 	note __, 1
-	note E_, 1
 	note F#, 1
-	note G_, 7
+	note G_, 1
+	note A_, 4
 	octave 5
-	note C#, 7
-	note __, 3
+	note D_, 4
+	note C#, 2
 	intensity $10
 	note E_, 1
 	note G_, 1
-	note A_, 1
+	note B_, 1
 	note __, 1
+	note G_, 1
 	note E_, 1
-	note C_, 1
+	notetype $6, $20
 	octave 6
-	note C#, 0
-	note D_, 0
-	note C#, 0
-	note D_, 0
-	note C#, 0
-	note D_, 0
-	note C#, 0
-	note D_, 0
-	note C#, 7
-	intensity $15
+	note E_, 1
+	note F#, 1
+	note E_, 1
+	note F#, 1
+	note E_, 1
+	note F#, 1
+	note E_, 1
+	note F#, 1
+	note E_, 8
+	intensity $14
+	octave 4
+	note E_, 10
+	note __, 2
+	note E_, 2
+	note F#, 2
+	note G_, 8
 	octave 5
-	note F#, 3
-	note __, 3
-	note G_, 3
-	note __, 3
-	note A_, 3
-	note __, 3
+	note C#, 8
+	note __, 4
+	intensity $10
+	note E_, 2
+	note G_, 2
+	note A_, 2
+	note __, 2
+	note E_, 2
+	note C_, 2
 	octave 6
-	note D_, 3
-	note __, 3
-	note C#, 11
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note C#, 8
+	intensity $15
 	octave 5
-	note B_, 1
+	note F#, 4
+	note __, 4
+	note G_, 4
+	note __, 4
+	note A_, 4
+	note __, 4
 	octave 6
-	note C#, 1
+	note D_, 4
+	note __, 4
+	note C#, 12
 	octave 5
-	note B_, 3
-	note __, 3
+	note B_, 2
 	octave 6
-	note G_, 3
-	note F#, 3
-	note __, 3
+	note C#, 2
 	octave 5
-	note G_, 3
-	note A_, 3
-	note B_, 3
+	note B_, 4
+	note __, 4
 	octave 6
-	note E_, 3
-	note D_, 3
-	note C#, 3
+	note G_, 4
+	note F#, 4
+	note __, 4
 	octave 5
-	note B_, 1
+	note G_, 4
+	note A_, 4
+	note B_, 4
 	octave 6
-	note C#, 1
-	note D_, 3
-	note __, 7
+	note E_, 4
+	note D_, 4
+	note C#, 4
 	octave 5
-	note B_, 3
-	note A_, 3
-	note __, 0
-	note D#, 0
-	note F#, 0
-	note A_, 0
+	note B_, 2
 	octave 6
-	note C_, 7
-	octave 3
-	note G_, 1
+	note C#, 2
+	note D_, 4
+	note __, 8
+	octave 5
+	note B_, 4
+	note A_, 4
 	note __, 1
-	note B_, 1
-	note __, 1
-	note D_, 1
-	note __, 1
-	note B_, 1
-	note __, 1
-	note E_, 1
-	note __, 1
-	note B_, 1
-	note __, 1
-	note G_, 1
-	note __, 1
-	note B_, 1
-	note __, 1
-	note D_, 1
-	note __, 1
+	note D#, 1
 	note F#, 1
-	note __, 1
-	octave 2
 	note A_, 1
-	note __, 1
+	octave 6
+	note C_, 8
 	octave 3
-	note F#, 1
-	note __, 1
-	note D#, 1
-	note __, 1
+	note G_, 2
+	note __, 2
+	note B_, 2
+	note __, 2
+	note D_, 2
+	note __, 2
+	note B_, 2
+	note __, 2
+	note E_, 2
+	note __, 2
+	note B_, 2
+	note __, 2
+	note G_, 2
+	note __, 2
+	note B_, 2
+	note __, 2
+	note D_, 2
+	note __, 2
+	note F#, 2
+	note __, 2
+	octave 2
+	note A_, 2
+	note __, 2
+	octave 3
+	note F#, 2
+	note __, 2
+	note D#, 2
+	note __, 2
 	octave 4
-	note C_, 1
-	note __, 1
+	note C_, 2
+	note __, 2
 	octave 3
-	note A_, 1
-	note __, 1
+	note A_, 2
+	note __, 2
 	octave 4
-	note C_, 1
-	note __, 1
+	note C_, 2
+	note __, 2
 	octave 3
-	note G_, 1
-	note __, 1
-	note B_, 1
-	note __, 1
-	note D_, 1
-	note __, 1
-	note B_, 1
-	note __, 1
-	note G#, 1
-	note __, 1
-	note B_, 1
-	note __, 1
-	note E_, 1
-	note __, 1
-	note B_, 1
-	note __, 1
-	note A_, 1
-	note __, 1
-	note A_, 5
-	note __, 1
-	note A_, 1
-	note A_, 1
-	note B_, 1
-	note __, 1
-	note B_, 5
-	note __, 1
-	note B_, 1
-	note B_, 1
+	note G_, 2
+	note __, 2
+	note B_, 2
+	note __, 2
+	note D_, 2
+	note __, 2
+	note B_, 2
+	note __, 2
+	note G#, 2
+	note __, 2
+	note B_, 2
+	note __, 2
+	note E_, 2
+	note __, 2
+	note B_, 2
+	note __, 2
+	note A_, 2
+	note __, 2
+	note A_, 6
+	note __, 2
+	note A_, 2
+	note A_, 2
+	note B_, 2
+	note __, 2
+	note B_, 6
+	note __, 2
+	note B_, 2
+	note B_, 2
 	octave 4
-	note C_, 1
-	note __, 1
-	note C_, 5
-	note __, 1
-	note C_, 1
-	note C_, 1
-	note C#, 1
-	note __, 1
-	note C#, 5
-	note __, 1
-	note C#, 1
-	note C#, 1
+	note C_, 2
+	note __, 2
+	note C_, 6
+	note __, 2
+	note C_, 2
+	note C_, 2
+	note C#, 2
+	note __, 2
+	note C#, 6
+	note __, 2
+	note C#, 2
+	note C#, 2
 	loopchannel 0, Music_BugCatchingContest_branch_f7dda
 
 Music_BugCatchingContest_Ch4: ; f7e9a
 	togglenoise $4
 	notetype $6
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note E_, 1
-	note E_, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note E_, 2
+	note E_, 2
 	callchannel Music_BugCatchingContest_branch_f7ee2
 
 Music_BugCatchingContest_branch_f7eaf: ; f7eaf
-	note D_, 3
-	note D_, 3
-	note D_, 1
+	note D_, 4
+	note D_, 4
+	note D_, 2
+	note C#, 2
+	note D_, 2
+	note C#, 2
+	note D_, 4
+	note D_, 4
+	note D_, 2
+	note C#, 2
+	note D_, 2
+	note C#, 2
+	note D_, 4
+	note D_, 4
+	note D_, 2
+	note C#, 2
+	note D_, 2
+	note C#, 2
+	note D_, 4
+	note D_, 4
 	note C#, 1
-	note D_, 1
 	note C#, 1
-	note D_, 3
-	note D_, 3
-	note D_, 1
 	note C#, 1
-	note D_, 1
 	note C#, 1
-	note D_, 3
-	note D_, 3
-	note D_, 1
 	note C#, 1
-	note D_, 1
 	note C#, 1
-	note D_, 3
-	note D_, 3
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
+	note C#, 1
+	note C#, 1
 	loopchannel 5, Music_BugCatchingContest_branch_f7eaf
-	note D_, 3
-	note D_, 3
-	note D_, 1
-	note D_, 1
-	note D_, 1
-	note D_, 1
-	note D_, 3
-	note D_, 3
-	note D_, 1
-	note D_, 1
-	note D_, 1
-	note D_, 1
+	note D_, 4
+	note D_, 4
+	note D_, 2
+	note D_, 2
+	note D_, 2
+	note D_, 2
+	note D_, 4
+	note D_, 4
+	note D_, 2
+	note D_, 2
+	note D_, 2
+	note D_, 2
 	callchannel Music_BugCatchingContest_branch_f7ee2
 	loopchannel 0, Music_BugCatchingContest_branch_f7eaf
 ; f7ee2
 
 Music_BugCatchingContest_branch_f7ee2: ; f7ee2
-	note D_, 3
-	note B_, 7
-	note D_, 1
-	note D_, 1
-	note D_, 3
-	note B_, 7
-	note D_, 1
-	note D_, 1
-	note D_, 3
-	note B_, 7
-	note D_, 1
-	note D_, 1
-	note D_, 3
-	note B_, 7
-	note D_, 1
-	note D_, 1
+	note D_, 4
+	note B_, 8
+	note D_, 2
+	note D_, 2
+	note D_, 4
+	note B_, 8
+	note D_, 2
+	note D_, 2
+	note D_, 4
+	note B_, 8
+	note D_, 2
+	note D_, 2
+	note D_, 4
+	note B_, 8
+	note D_, 2
+	note D_, 2
 	endchannel
 ; f7ef3
--- a/audio/music/burnedtower.asm
+++ b/audio/music/burnedtower.asm
@@ -14,29 +14,29 @@
 	vibrato $8, $45
 	stereopanning $f0
 	notetype $c, $91
-	note __, 1
+	note __, 2
 	octave 2
-	note A_, 3
-	note A_, 3
-	note A_, 1
+	note A_, 4
+	note A_, 4
+	note A_, 2
 	intensity $80
 	octave 3
-	note D#, 5
+	note D#, 6
 	intensity $91
-	note D_, 3
-	note D_, 3
-	note D_, 1
+	note D_, 4
+	note D_, 4
+	note D_, 2
 	intensity $80
-	note C#, 5
+	note C#, 6
 
 Music_BurnedTower_branch_f6ac8: ; f6ac8
 	intensity $91
 	octave 2
-	note A_, 3
-	note A_, 3
-	note A_, 1
+	note A_, 4
+	note A_, 4
+	note A_, 2
 	intensity $80
-	note A#, 5
+	note A#, 6
 	loopchannel 2, Music_BurnedTower_branch_f6ac8
 	tempo 150
 
@@ -43,63 +43,63 @@
 Music_BurnedTower_branch_f6ad8: ; f6ad8
 	intensity $b1
 	octave 2
-	note A_, 3
-	note A_, 3
-	note A_, 1
+	note A_, 4
+	note A_, 4
+	note A_, 2
 	intensity $a0
 	octave 3
-	note D#, 5
+	note D#, 6
 	intensity $b1
-	note D_, 3
-	note D_, 3
-	note D_, 1
+	note D_, 4
+	note D_, 4
+	note D_, 2
 	intensity $a0
-	note C#, 5
+	note C#, 6
 	intensity $b1
 	octave 2
-	note A_, 3
-	note A_, 3
-	note A_, 1
+	note A_, 4
+	note A_, 4
+	note A_, 2
 	intensity $a0
-	note A#, 5
+	note A#, 6
 	intensity $b1
-	note A_, 3
-	note A_, 3
-	note A_, 1
+	note A_, 4
+	note A_, 4
+	note A_, 2
 	intensity $b3
-	note A#, 15
-	note A#, 15
-	note A#, 15
-	note G#, 5
+	note A#, 16
+	note A#, 16
+	note A#, 16
+	note G#, 6
 	intensity $b1
-	note A_, 3
-	note A_, 3
-	note A_, 1
+	note A_, 4
+	note A_, 4
+	note A_, 2
 	intensity $a0
-	note A#, 5
+	note A#, 6
 	intensity $b1
-	note B_, 3
-	note B_, 3
-	note B_, 1
+	note B_, 4
+	note B_, 4
+	note B_, 2
 	intensity $a0
 	octave 3
-	note F_, 5
+	note F_, 6
 	intensity $b1
-	note E_, 3
-	note E_, 3
-	note E_, 1
+	note E_, 4
+	note E_, 4
+	note E_, 2
 	intensity $a0
-	note D#, 5
+	note D#, 6
 
 Music_BurnedTower_branch_f6b17: ; f6b17
 	intensity $b1
 	octave 2
-	note B_, 3
-	note B_, 3
-	note B_, 1
+	note B_, 4
+	note B_, 4
+	note B_, 2
 	intensity $a0
 	octave 3
-	note C_, 5
+	note C_, 6
 	loopchannel 2, Music_BurnedTower_branch_f6b17
 	loopchannel 0, Music_BurnedTower_branch_f6ad8
 
@@ -115,139 +115,139 @@
 	callchannel Music_BurnedTower_branch_f6b8e
 	intensity $c1
 	dutycycle $3
-	note __, 1
+	note __, 2
 	octave 2
-	note A_, 3
-	note A_, 3
-	note A_, 1
+	note A_, 4
+	note A_, 4
+	note A_, 2
 	intensity $b0
 	octave 3
-	note D#, 5
+	note D#, 6
 	intensity $c1
-	note D_, 3
-	note D_, 3
-	note D_, 1
+	note D_, 4
+	note D_, 4
+	note D_, 2
 	intensity $b0
-	note C#, 5
+	note C#, 6
 	intensity $c1
 	octave 2
-	note A_, 3
-	note A_, 3
-	note A_, 1
+	note A_, 4
+	note A_, 4
+	note A_, 2
 	intensity $b0
-	note A#, 3
+	note A#, 4
 	intensity $c1
 	intensity $c2
 	octave 3
-	note A_, 0
-	note G_, 0
-	note A_, 0
+	note A_, 1
+	note G_, 1
+	note A_, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	vibrato $0, $0
 	intensity $3d
-	note E_, 7
+	note E_, 8
 	vibrato $20, $83
 	intensity $b0
 	octave 2
-	note G_, 3
+	note G_, 4
 	dutycycle $2
 	intensity $b0
 	octave 3
-	note F#, 3
-	note E_, 1
-	note F#, 1
-	note G_, 3
-	note B_, 3
+	note F#, 4
+	note E_, 2
+	note F#, 2
+	note G_, 4
+	note B_, 4
 	octave 4
-	note C#, 3
-	note D_, 1
-	note C#, 1
+	note C#, 4
+	note D_, 2
+	note C#, 2
 	octave 3
-	note B_, 3
-	note G_, 3
-	note F#, 3
-	note E_, 1
-	note F#, 1
-	note G_, 3
-	note E_, 3
+	note B_, 4
+	note G_, 4
+	note F#, 4
+	note E_, 2
+	note F#, 2
+	note G_, 4
+	note E_, 4
 	intensity $b7
-	note F#, 15
+	note F#, 16
 	loopchannel 0, Music_BurnedTower_branch_f6b39
 ; f6b8e
 
 Music_BurnedTower_branch_f6b8e: ; f6b8e
 	octave 3
-	note E_, 3
-	note D_, 1
-	note E_, 1
-	note F_, 3
-	note A_, 3
-	note B_, 3
+	note E_, 4
+	note D_, 2
+	note E_, 2
+	note F_, 4
+	note A_, 4
+	note B_, 4
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note B_, 1
-	note A_, 3
-	note F_, 3
-	note E_, 3
-	note D_, 1
-	note E_, 1
-	note F_, 3
-	note D_, 3
-	note E_, 15
+	note B_, 2
+	note A_, 4
+	note F_, 4
+	note E_, 4
+	note D_, 2
+	note E_, 2
+	note F_, 4
+	note D_, 4
+	note E_, 16
 	endchannel
 
 Music_BurnedTower_Ch3: ; f6ba2
 	stereopanning $f
 	notetype $c, $14
-	note __, 15
-	note __, 15
-	note __, 15
-	note __, 11
+	note __, 16
+	note __, 16
+	note __, 16
+	note __, 12
 	octave 3
-	note D#, 3
+	note D#, 4
 
 Music_BurnedTower_branch_f6bad: ; f6bad
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
-	note __, 1
-	note E_, 1
-	note __, 1
-	note E_, 1
-	note F_, 3
+	note E_, 2
+	note __, 2
+	note E_, 2
+	note __, 2
+	note E_, 2
+	note F_, 4
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
-	note __, 1
-	note E_, 1
-	note __, 1
-	note E_, 1
-	note D#, 3
+	note E_, 2
+	note __, 2
+	note E_, 2
+	note __, 2
+	note E_, 2
+	note D#, 4
 	loopchannel 4, Music_BurnedTower_branch_f6bad
 
 Music_BurnedTower_branch_f6bc3: ; f6bc3
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note F#, 1
-	note __, 1
-	note F#, 1
-	note __, 1
-	note F#, 1
-	note G_, 3
+	note F#, 2
+	note __, 2
+	note F#, 2
+	note __, 2
+	note F#, 2
+	note G_, 4
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note F#, 1
-	note __, 1
-	note F#, 1
-	note __, 1
-	note F#, 1
-	note F_, 3
+	note F#, 2
+	note __, 2
+	note F#, 2
+	note __, 2
+	note F#, 2
+	note F_, 4
 	loopchannel 2, Music_BurnedTower_branch_f6bc3
 	loopchannel 0, Music_BurnedTower_branch_f6bad
 
@@ -256,16 +256,16 @@
 	notetype $c
 
 Music_BurnedTower_branch_f6be1: ; f6be1
-	note __, 15
+	note __, 16
 	loopchannel 4, Music_BurnedTower_branch_f6be1
-	note __, 1
+	note __, 2
 
 Music_BurnedTower_branch_f6be7: ; f6be7
 	stereopanning $f0
-	note G_, 1
-	note G#, 1
-	note G_, 3
-	note G#, 1
-	note G_, 3
+	note G_, 2
+	note G#, 2
+	note G_, 4
+	note G#, 2
+	note G_, 4
 	loopchannel 0, Music_BurnedTower_branch_f6be7
 ; f6bf2
--- a/audio/music/celadoncity.asm
+++ b/audio/music/celadoncity.asm
@@ -14,135 +14,135 @@
 	stereopanning $f
 	notetype $c, $a6
 	octave 3
-	note A_, 6
+	note A_, 7
 	intensity $a1
-	note G#, 0
-	note A_, 0
-	note D_, 2
-	note E_, 1
-	note F#, 1
+	note G#, 1
+	note A_, 1
+	note D_, 3
+	note E_, 2
+	note F#, 2
 	callchannel Music_CeladonCity_branch_f43cc
 
 Music_CeladonCity_branch_f437d: ; f437d
+	note D_, 2
+	note F#, 1
+	note A_, 1
 	note D_, 1
-	note F#, 0
-	note A_, 0
-	note D_, 0
-	note F#, 0
-	note A_, 0
-	note F#, 0
+	note F#, 1
+	note A_, 1
+	note F#, 1
 	loopchannel 3, Music_CeladonCity_branch_f437d
-	note D_, 1
-	note G_, 0
-	note B_, 0
+	note D_, 2
+	note G_, 1
+	note B_, 1
 	octave 4
-	note D_, 0
-	note C_, 0
+	note D_, 1
+	note C_, 1
 	octave 3
-	note B_, 0
-	note G_, 0
-	callchannel Music_CeladonCity_branch_f43cc
-	note D_, 0
-	note C#, 0
-	note D_, 0
-	note E_, 0
-	note F#, 0
-	note G_, 0
-	note A_, 0
-	note B_, 0
-	note A_, 1
+	note B_, 1
 	note G_, 1
-	note F#, 1
+	callchannel Music_CeladonCity_branch_f43cc
+	note D_, 1
+	note C#, 1
+	note D_, 1
 	note E_, 1
-	note F#, 15
+	note F#, 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note F#, 16
 	callchannel Music_CeladonCity_branch_f43e1
 	callchannel Music_CeladonCity_branch_f43fe
 	octave 2
+	note B_, 2
+	note A#, 1
 	note B_, 1
-	note A#, 0
-	note B_, 0
 	octave 3
-	note D_, 0
-	note G_, 0
-	note A_, 0
-	note G_, 0
-	note F#, 0
-	note G_, 0
-	note A_, 0
-	note G#, 0
-	note A_, 0
+	note D_, 1
+	note G_, 1
+	note A_, 1
+	note G_, 1
+	note F#, 1
+	note G_, 1
+	note A_, 1
+	note G#, 1
+	note A_, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	octave 3
-	note B_, 0
-	note A_, 0
+	note B_, 1
+	note A_, 1
 	callchannel Music_CeladonCity_branch_f43e1
 	callchannel Music_CeladonCity_branch_f43fe
+	note D_, 2
+	note C#, 1
 	note D_, 1
-	note C#, 0
-	note D_, 0
-	note F#, 0
-	note G_, 0
-	note A_, 0
-	note G_, 0
-	note A_, 7
+	note F#, 1
+	note G_, 1
+	note A_, 1
+	note G_, 1
+	note A_, 8
 	loopchannel 0, Music_CeladonCity_branch_f436c
 ; f43cc
 
 Music_CeladonCity_branch_f43cc: ; f43cc
+	note D_, 2
+	note G_, 1
+	note B_, 1
 	note D_, 1
-	note G_, 0
-	note B_, 0
-	note D_, 0
-	note G_, 0
-	note B_, 0
-	note G_, 0
+	note G_, 1
+	note B_, 1
+	note G_, 1
 	loopchannel 3, Music_CeladonCity_branch_f43cc
-	note D_, 1
-	note F#, 0
-	note A_, 0
+	note D_, 2
+	note F#, 1
+	note A_, 1
 	octave 4
-	note D_, 0
-	note C#, 0
-	note D_, 0
+	note D_, 1
+	note C#, 1
+	note D_, 1
 	octave 3
-	note A_, 0
+	note A_, 1
 	endchannel
 ; f43e1
 
 Music_CeladonCity_branch_f43e1: ; f43e1
 	octave 2
-	note G_, 1
-	note B_, 0
+	note G_, 2
+	note B_, 1
 	octave 3
-	note D_, 0
+	note D_, 1
 	loopchannel 4, Music_CeladonCity_branch_f43e1
-	note C_, 1
+	note C_, 2
 	octave 2
-	note B_, 0
+	note B_, 1
 	octave 3
-	note C_, 0
-	note D_, 0
-	note E_, 0
-	note F#, 0
-	note A_, 0
-	note G_, 0
-	note A_, 0
-	note B_, 0
+	note C_, 1
+	note D_, 1
+	note E_, 1
+	note F#, 1
+	note A_, 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
 	octave 4
-	note C_, 0
-	note D_, 0
-	note C#, 0
-	note D_, 0
+	note C_, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
 	octave 3
-	note B_, 0
+	note B_, 1
 	endchannel
 ; f43fe
 
 Music_CeladonCity_branch_f43fe: ; f43fe
-	note D_, 1
-	note F#, 0
-	note A_, 0
+	note D_, 2
+	note F#, 1
+	note A_, 1
 	loopchannel 4, Music_CeladonCity_branch_f43fe
 	endchannel
 
@@ -152,74 +152,74 @@
 	stereopanning $f0
 	notetype $c, $b7
 	octave 4
-	note D_, 0
-	note C#, 0
-	note D_, 0
-	note E_, 0
-	note F#, 0
-	note E_, 0
-	note F#, 0
-	note G_, 0
-	note A_, 7
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note E_, 1
+	note F#, 1
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	note A_, 8
 
 Music_CeladonCity_branch_f441a: ; f441a
 	callchannel Music_CeladonCity_branch_f4463
-	note A_, 3
-	note F#, 3
+	note A_, 4
+	note F#, 4
+	note A_, 2
+	note F#, 6
 	note A_, 1
-	note F#, 5
-	note A_, 0
-	note G_, 0
-	note F#, 0
-	note G_, 0
-	note A_, 1
-	note B_, 1
-	note G_, 3
-	note B_, 3
-	callchannel Music_CeladonCity_branch_f4463
-	intensity $c1
-	note A_, 1
 	note G_, 1
 	note F#, 1
 	note G_, 1
-	note F#, 1
-	note E_, 1
+	note A_, 2
+	note B_, 2
+	note G_, 4
+	note B_, 4
+	callchannel Music_CeladonCity_branch_f4463
+	intensity $c1
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note C#, 2
+	note D_, 4
 	note D_, 1
-	note C#, 1
-	note D_, 3
-	note D_, 0
-	note E_, 0
-	note F#, 0
-	note A_, 0
+	note E_, 1
+	note F#, 1
+	note A_, 1
 	intensity $b3
 	octave 5
-	note D_, 5
+	note D_, 6
 	intensity $a2
 	octave 1
-	note F#, 1
+	note F#, 2
 	callchannel Music_CeladonCity_branch_f4474
 	octave 1
-	note G_, 2
-	note B_, 0
-	note A_, 1
+	note G_, 3
+	note B_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note A_, 5
-	note F#, 1
+	note A_, 6
+	note F#, 2
 	callchannel Music_CeladonCity_branch_f4474
 	octave 1
-	note A_, 2
-	octave 2
-	note D_, 0
 	note A_, 3
-	note D_, 5
+	octave 2
+	note D_, 1
+	note A_, 4
+	note D_, 6
 	intensity $97
 	octave 4
-	note F#, 0
-	note A_, 0
+	note F#, 1
+	note A_, 1
 	octave 5
-	note D_, 15
+	note D_, 16
 	loopchannel 0, Music_CeladonCity_branch_f441a
 ; f4463
 
@@ -226,52 +226,52 @@
 Music_CeladonCity_branch_f4463: ; f4463
 	intensity $b2
 	octave 4
-	note B_, 3
-	note G_, 3
+	note B_, 4
+	note G_, 4
+	note B_, 2
+	note G_, 6
 	note B_, 1
-	note G_, 5
-	note B_, 0
-	note G_, 0
-	note A_, 0
-	note B_, 0
+	note G_, 1
+	note A_, 1
+	note B_, 1
 	octave 5
-	note C_, 1
+	note C_, 2
 	octave 4
-	note B_, 1
-	note A_, 7
+	note B_, 2
+	note A_, 8
 	endchannel
 ; f4474
 
 Music_CeladonCity_branch_f4474: ; f4474
-	note G_, 2
-	note B_, 0
-	octave 2
-	note D_, 3
-	octave 1
-	note G_, 1
+	note G_, 3
 	note B_, 1
 	octave 2
-	note D_, 3
+	note D_, 4
 	octave 1
 	note G_, 2
+	note B_, 2
 	octave 2
-	note C_, 0
-	note D_, 3
+	note D_, 4
 	octave 1
-	note G_, 1
-	note B_, 1
+	note G_, 3
 	octave 2
-	note D_, 3
+	note C_, 1
+	note D_, 4
 	octave 1
-	note A_, 2
+	note G_, 2
+	note B_, 2
 	octave 2
-	note D_, 0
-	note F#, 3
+	note D_, 4
 	octave 1
-	note A_, 1
+	note A_, 3
 	octave 2
 	note D_, 1
-	note F#, 3
+	note F#, 4
+	octave 1
+	note A_, 2
+	octave 2
+	note D_, 2
+	note F#, 4
 	endchannel
 
 Music_CeladonCity_Ch3: ; f4492
@@ -280,121 +280,121 @@
 Music_CeladonCity_branch_f4495: ; f4495
 	notetype $c, $25
 	octave 3
-	note A_, 1
-	note __, 1
-	note F#, 1
-	note __, 1
-	note D_, 7
+	note A_, 2
+	note __, 2
+	note F#, 2
+	note __, 2
+	note D_, 8
 	callchannel Music_CeladonCity_branch_f44fd
 
 Music_CeladonCity_branch_f44a1: ; f44a1
 	octave 2
-	note A_, 1
-	note __, 1
+	note A_, 2
+	note __, 2
 	octave 3
-	note D_, 3
+	note D_, 4
 	loopchannel 3, Music_CeladonCity_branch_f44a1
 	octave 2
-	note G_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
 	octave 3
-	note D_, 2
+	note D_, 3
 	octave 2
-	note F#, 0
+	note F#, 1
 	callchannel Music_CeladonCity_branch_f44fd
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
 	octave 3
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
 	octave 3
-	note F#, 2
+	note F#, 3
 	octave 2
-	note G#, 0
-	note A_, 0
-	note __, 0
+	note G#, 1
+	note A_, 1
+	note __, 1
 	octave 3
-	note C#, 0
-	note __, 0
-	note E_, 1
 	note C#, 1
-	note D_, 1
-	note __, 5
+	note __, 1
+	note E_, 2
+	note C#, 2
+	note D_, 2
+	note __, 6
 	octave 2
-	note A_, 1
-	note __, 5
+	note A_, 2
+	note __, 6
 	intensity $10
 	callchannel Music_CeladonCity_branch_f4510
 	octave 5
-	note E_, 1
-	note __, 1
-	note F#, 1
-	note __, 1
-	note D_, 3
-	note __, 3
-	note C_, 7
+	note E_, 2
+	note __, 2
+	note F#, 2
+	note __, 2
+	note D_, 4
+	note __, 4
+	note C_, 8
 	octave 4
-	note A_, 1
-	note B_, 1
+	note A_, 2
+	note B_, 2
 	octave 5
-	note C_, 1
-	note D_, 1
-	note E_, 1
-	note __, 1
-	note D_, 1
-	note E_, 1
-	note D_, 3
-	note __, 3
+	note C_, 2
+	note D_, 2
+	note E_, 2
+	note __, 2
+	note D_, 2
+	note E_, 2
+	note D_, 4
+	note __, 4
 	callchannel Music_CeladonCity_branch_f4510
 	octave 5
-	note E_, 1
-	note __, 1
-	note D_, 1
-	note E_, 1
-	note D_, 3
-	note __, 3
-	note C_, 7
-	note A_, 1
-	note G_, 1
-	note F#, 1
-	note E_, 1
-	note F#, 1
-	note E_, 1
-	note D_, 1
-	note E_, 1
-	note D_, 1
-	note __, 5
+	note E_, 2
+	note __, 2
+	note D_, 2
+	note E_, 2
+	note D_, 4
+	note __, 4
+	note C_, 8
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note D_, 2
+	note __, 6
 	loopchannel 0, Music_CeladonCity_branch_f4495
 ; f44fd
 
 Music_CeladonCity_branch_f44fd: ; f44fd
 	octave 2
-	note G_, 1
-	note __, 1
+	note G_, 2
+	note __, 2
 	octave 3
-	note D_, 3
+	note D_, 4
 	loopchannel 3, Music_CeladonCity_branch_f44fd
 	octave 2
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
 	octave 3
-	note D_, 0
-	note __, 0
-	note F#, 2
+	note D_, 1
+	note __, 1
+	note F#, 3
 	octave 2
-	note G#, 0
+	note G#, 1
 	endchannel
 ; f4510
 
 Music_CeladonCity_branch_f4510: ; f4510
 	octave 5
-	note D_, 7
-	note C_, 1
+	note D_, 8
+	note C_, 2
 	octave 4
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	note B_, 2
+	note A_, 2
+	note B_, 2
 	endchannel
 ; f4518
--- a/audio/music/championbattle.asm
+++ b/audio/music/championbattle.asm
@@ -13,21 +13,21 @@
 	vibrato $12, $15
 	notetype $c, $b2
 	octave 2
-	note A#, 7
-	note A#, 7
-	note A#, 7
-	note A#, 3
+	note A#, 8
+	note A#, 8
+	note A#, 8
+	note A#, 4
 	intensity $b7
-	note B_, 3
+	note B_, 4
 
 Music_ChampionBattle_branch_ea9e2: ; ea9e2
 	callchannel Music_ChampionBattle_branch_eaaee
 	octave 3
-	note D#, 3
+	note D#, 4
 	loopchannel 2, Music_ChampionBattle_branch_ea9e2
 	callchannel Music_ChampionBattle_branch_eaaee
 	octave 3
-	note E_, 3
+	note E_, 4
 
 Music_ChampionBattle_branch_ea9f0: ; ea9f0
 	callchannel Music_ChampionBattle_branch_eaafc
@@ -39,181 +39,181 @@
 	loopchannel 7, Music_ChampionBattle_branch_ea9fa
 	callchannel Music_ChampionBattle_branch_eab06
 	intensity $b2
-	note A#, 1
-	note A#, 1
+	note A#, 2
+	note A#, 2
 	intensity $b7
 	octave 3
-	note D#, 3
+	note D#, 4
 	intensity $b2
 	octave 2
-	note A#, 1
-	note A#, 1
+	note A#, 2
+	note A#, 2
 	intensity $b7
 	octave 3
-	note E_, 3
+	note E_, 4
 	intensity $b2
 	octave 2
-	note A#, 1
-	note A#, 1
+	note A#, 2
+	note A#, 2
 	intensity $b7
 	octave 3
-	note F#, 3
+	note F#, 4
 	intensity $b2
 	octave 2
-	note A#, 1
-	note A#, 1
+	note A#, 2
+	note A#, 2
 	intensity $b7
 	octave 3
-	note G#, 3
+	note G#, 4
 	intensity $a0
-	note A#, 7
+	note A#, 8
 	octave 2
-	note A#, 7
+	note A#, 8
 	octave 3
-	note B_, 11
+	note B_, 12
 	intensity $b2
-	note A#, 0
-	note B_, 0
+	note A#, 1
+	note B_, 1
 	octave 4
-	note C_, 0
-	note C#, 0
+	note C_, 1
+	note C#, 1
 
 Music_ChampionBattle_branch_eaa35: ; eaa35
 	callchannel Music_ChampionBattle_branch_eab0f
-	note E_, 1
-	note E_, 1
+	note E_, 2
+	note E_, 2
 	intensity $b7
-	note F#, 3
+	note F#, 4
 
 Music_ChampionBattle_branch_eaa3d: ; eaa3d
 	intensity $b2
-	note E_, 1
-	note E_, 1
+	note E_, 2
+	note E_, 2
 	intensity $b7
-	note G#, 3
+	note G#, 4
 	loopchannel 2, Music_ChampionBattle_branch_eaa3d
 	intensity $b2
-	note E_, 1
-	note E_, 1
+	note E_, 2
+	note E_, 2
 	intensity $b7
-	note B_, 3
+	note B_, 4
 	callchannel Music_ChampionBattle_branch_eab0f
-	note E_, 1
-	note E_, 1
+	note E_, 2
+	note E_, 2
 	intensity $b7
-	note F#, 3
+	note F#, 4
 	intensity $b2
-	note E_, 1
-	note E_, 1
+	note E_, 2
+	note E_, 2
 	intensity $b7
-	note G#, 3
+	note G#, 4
 	intensity $b2
-	note E_, 1
-	note E_, 1
+	note E_, 2
+	note E_, 2
 	intensity $b7
-	note B_, 3
+	note B_, 4
 	intensity $b2
-	note E_, 1
-	note E_, 1
+	note E_, 2
+	note E_, 2
 	intensity $b7
 	octave 4
-	note E_, 3
+	note E_, 4
 	callchannel Music_ChampionBattle_branch_eab24
-	note B_, 3
-	note G#, 3
+	note B_, 4
+	note G#, 4
 	callchannel Music_ChampionBattle_branch_eab24
 	octave 4
-	note D_, 3
-	note D_, 3
+	note D_, 4
+	note D_, 4
 	intensity $a0
 	octave 3
-	note A#, 7
+	note A#, 8
 	octave 2
-	note A#, 7
+	note A#, 8
 	octave 3
-	note F#, 7
+	note F#, 8
 	octave 2
-	note F#, 7
+	note F#, 8
 	intensity $60
-	note B_, 15
+	note B_, 16
 	intensity $70
-	note B_, 15
+	note B_, 16
 	intensity $80
 	octave 3
-	note C#, 15
+	note C#, 16
 	intensity $a0
-	note D#, 15
+	note D#, 16
 	intensity $b4
 	octave 4
-	note F#, 3
-	note F_, 3
-	note E_, 3
-	note D#, 3
-	note D_, 3
-	note C#, 3
-	note F#, 3
-	note F#, 3
-	note F#, 3
-	note F_, 3
-	note E_, 3
-	note D#, 3
-	note F#, 1
-	note G#, 1
-	note D#, 1
-	note E_, 1
-	note F#, 3
-	note F#, 3
-	note __, 15
+	note F#, 4
+	note F_, 4
+	note E_, 4
+	note D#, 4
+	note D_, 4
+	note C#, 4
+	note F#, 4
+	note F#, 4
+	note F#, 4
+	note F_, 4
+	note E_, 4
+	note D#, 4
+	note F#, 2
+	note G#, 2
+	note D#, 2
+	note E_, 2
+	note F#, 4
+	note F#, 4
+	note __, 16
 	intensity $90
 	octave 3
-	note F#, 7
+	note F#, 8
 	intensity $b4
-	note E_, 3
-	note E_, 3
+	note E_, 4
+	note E_, 4
 	intensity $90
-	note D#, 15
-	note C#, 15
+	note D#, 16
+	note C#, 16
 
 Music_ChampionBattle_branch_eaab1: ; eaab1
 	intensity $b2
 	octave 2
-	note A#, 1
-	note A#, 1
+	note A#, 2
+	note A#, 2
 	intensity $b7
 	octave 3
-	note D#, 3
+	note D#, 4
 	loopchannel 4, Music_ChampionBattle_branch_eaab1
 
 Music_ChampionBattle_branch_eaabe: ; eaabe
 	intensity $b2
-	note C_, 1
-	note C_, 1
+	note C_, 2
+	note C_, 2
 	intensity $b7
-	note D#, 3
+	note D#, 4
 	loopchannel 2, Music_ChampionBattle_branch_eaabe
 	intensity $b2
-	note C_, 1
-	note C_, 1
+	note C_, 2
+	note C_, 2
 	intensity $b7
-	note F#, 3
+	note F#, 4
 	intensity $b2
-	note C_, 1
-	note C_, 1
+	note C_, 2
+	note C_, 2
 	intensity $b7
-	note G#, 3
+	note G#, 4
 	callchannel Music_ChampionBattle_branch_eab31
 	octave 3
-	note D#, 1
-	note D#, 1
+	note D#, 2
+	note D#, 2
 	intensity $b7
-	note B_, 3
+	note B_, 4
 	callchannel Music_ChampionBattle_branch_eab31
 	octave 3
-	note D#, 1
-	note D#, 1
+	note D#, 2
+	note D#, 2
 	intensity $b7
 	octave 4
-	note D_, 3
+	note D_, 4
 	loopchannel 0, Music_ChampionBattle_branch_eaa35
 ; eaaee
 
@@ -220,14 +220,14 @@
 Music_ChampionBattle_branch_eaaee: ; eaaee
 	intensity $b2
 	octave 2
-	note A#, 1
-	note A#, 5
-	note A#, 1
-	note A#, 5
-	note A#, 1
-	note A#, 5
-	note A#, 1
-	note A#, 1
+	note A#, 2
+	note A#, 6
+	note A#, 2
+	note A#, 6
+	note A#, 2
+	note A#, 6
+	note A#, 2
+	note A#, 2
 	intensity $b7
 	endchannel
 ; eaafc
@@ -235,11 +235,11 @@
 Music_ChampionBattle_branch_eaafc: ; eaafc
 	intensity $b2
 	octave 2
-	note A#, 1
-	note A#, 1
+	note A#, 2
+	note A#, 2
 	intensity $b7
 	octave 3
-	note D#, 3
+	note D#, 4
 	endchannel
 ; eab06
 
@@ -246,10 +246,10 @@
 Music_ChampionBattle_branch_eab06: ; eab06
 	intensity $b2
 	octave 2
-	note A#, 1
-	note A#, 1
+	note A#, 2
+	note A#, 2
 	intensity $b7
-	note B_, 3
+	note B_, 4
 	endchannel
 ; eab0f
 
@@ -256,21 +256,21 @@
 Music_ChampionBattle_branch_eab0f: ; eab0f
 	intensity $b5
 	octave 3
-	note D#, 1
-	note A#, 1
-	note D#, 1
-	note F#, 3
-	note F_, 1
-	note E_, 1
-	note B_, 1
-	note F#, 1
-	note A#, 1
-	note F_, 1
-	note A_, 1
-	note E_, 1
-	note G#, 1
-	note D#, 1
-	note G_, 1
+	note D#, 2
+	note A#, 2
+	note D#, 2
+	note F#, 4
+	note F_, 2
+	note E_, 2
+	note B_, 2
+	note F#, 2
+	note A#, 2
+	note F_, 2
+	note A_, 2
+	note E_, 2
+	note G#, 2
+	note D#, 2
+	note G_, 2
 	intensity $b2
 	endchannel
 ; eab24
@@ -278,13 +278,13 @@
 Music_ChampionBattle_branch_eab24: ; eab24
 	intensity $b2
 	octave 3
-	note A#, 1
-	note A#, 3
-	note A#, 3
-	note A#, 3
-	note A#, 3
-	note A#, 3
-	note A#, 1
+	note A#, 2
+	note A#, 4
+	note A#, 4
+	note A#, 4
+	note A#, 4
+	note A#, 4
+	note A#, 2
 	intensity $b7
 	endchannel
 ; eab31
@@ -291,21 +291,21 @@
 
 Music_ChampionBattle_branch_eab31: ; eab31
 	intensity $b2
-	note D#, 1
-	note D#, 1
+	note D#, 2
+	note D#, 2
 	intensity $b7
-	note A#, 3
+	note A#, 4
 	intensity $b2
-	note D#, 1
-	note D#, 1
+	note D#, 2
+	note D#, 2
 	intensity $b7
-	note B_, 3
+	note B_, 4
 	intensity $b2
-	note D#, 1
-	note D#, 1
+	note D#, 2
+	note D#, 2
 	intensity $b7
 	octave 4
-	note C#, 3
+	note C#, 4
 	intensity $b2
 	endchannel
 
@@ -315,210 +315,210 @@
 	tone $0001
 	notetype $c, $c2
 	octave 3
-	note D#, 7
-	note D#, 7
-	note D#, 7
-	note D#, 3
+	note D#, 8
+	note D#, 8
+	note D#, 8
+	note D#, 4
 	intensity $c7
-	note D_, 3
+	note D_, 4
 	callchannel Music_ChampionBattle_branch_eac4f
-	note A#, 3
+	note A#, 4
 	callchannel Music_ChampionBattle_branch_eac4f
-	note B_, 3
+	note B_, 4
 	callchannel Music_ChampionBattle_branch_eac4f
 	octave 4
-	note C#, 3
+	note C#, 4
 	callchannel Music_ChampionBattle_branch_eac5c
-	note D_, 3
+	note D_, 4
 	callchannel Music_ChampionBattle_branch_eac5c
-	note F_, 3
+	note F_, 4
 	callchannel Music_ChampionBattle_branch_eac5c
-	note D_, 3
+	note D_, 4
 	intensity $c2
-	note D#, 1
-	note D#, 1
+	note D#, 2
+	note D#, 2
 	intensity $c7
-	note A#, 3
+	note A#, 4
 	intensity $c2
-	note D#, 1
-	note D#, 1
+	note D#, 2
+	note D#, 2
 	intensity $c7
-	note B_, 3
+	note B_, 4
 	intensity $c2
-	note D#, 1
-	note D#, 1
+	note D#, 2
+	note D#, 2
 	intensity $c7
 	octave 4
-	note C_, 3
+	note C_, 4
 	intensity $c2
 	octave 3
-	note D#, 1
-	note D#, 1
+	note D#, 2
+	note D#, 2
 	intensity $c7
 	octave 4
-	note C#, 3
-	note D#, 7
+	note C#, 4
+	note D#, 8
 	octave 3
-	note D#, 7
+	note D#, 8
 	octave 4
-	note E_, 7
+	note E_, 8
 	intensity $3c
-	note E_, 7
+	note E_, 8
 
 Music_ChampionBattle_branch_eab9d: ; eab9d
 	intensity $c5
-	note D#, 5
+	note D#, 6
 	octave 3
-	note A#, 5
+	note A#, 6
 	octave 4
-	note D#, 1
-	note D_, 1
-	note C#, 3
-	note C_, 3
+	note D#, 2
+	note D_, 2
+	note C#, 4
+	note C_, 4
 	octave 3
-	note B_, 3
-	note A#, 3
+	note B_, 4
+	note A#, 4
 	intensity $c7
-	note B_, 7
+	note B_, 8
 	octave 4
-	note E_, 7
+	note E_, 8
 	intensity $c2
 	octave 3
-	note G#, 1
-	note G#, 1
+	note G#, 2
+	note G#, 2
 	intensity $c7
-	note B_, 3
+	note B_, 4
 	intensity $c2
-	note G#, 1
-	note G#, 1
+	note G#, 2
+	note G#, 2
 	intensity $c7
 	octave 4
-	note C#, 3
+	note C#, 4
 	intensity $c5
-	note D#, 5
+	note D#, 6
 	octave 3
-	note A#, 5
+	note A#, 6
 	octave 4
-	note D#, 1
-	note D_, 1
-	note C#, 3
-	note C_, 3
+	note D#, 2
+	note D_, 2
+	note C#, 4
+	note C_, 4
 	octave 3
-	note B_, 3
-	note A#, 1
-	note B_, 1
+	note B_, 4
+	note A#, 2
+	note B_, 2
 	intensity $c7
 	octave 4
-	note E_, 7
-	note G#, 7
-	note E_, 7
-	note B_, 7
+	note E_, 8
+	note G#, 8
+	note E_, 8
+	note B_, 8
 	callchannel Music_ChampionBattle_branch_eac79
-	note E_, 3
-	note E_, 3
+	note E_, 4
+	note E_, 4
 	callchannel Music_ChampionBattle_branch_eac79
-	note F#, 3
-	note F#, 3
+	note F#, 4
+	note F#, 4
 	intensity $c7
-	note D#, 7
+	note D#, 8
 	octave 3
-	note D#, 7
+	note D#, 8
 	octave 4
-	note C#, 7
+	note C#, 8
 	octave 3
-	note C#, 7
+	note C#, 8
 	intensity $b0
-	note D#, 15
-	note D#, 15
-	note F_, 15
-	note F#, 15
+	note D#, 16
+	note D#, 16
+	note F_, 16
+	note F#, 16
 	intensity $c4
 
 Music_ChampionBattle_branch_eabef: ; eabef
 	octave 5
-	note D#, 3
-	note D_, 3
-	note C#, 3
-	note C_, 3
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
+	note D#, 4
+	note D_, 4
+	note C#, 4
+	note C_, 4
+	note D#, 2
+	note D_, 2
+	note C#, 2
+	note C_, 2
 	octave 4
-	note B_, 3
-	note B_, 3
+	note B_, 4
+	note B_, 4
 	loopchannel 2, Music_ChampionBattle_branch_eabef
 	intensity $b0
 	octave 3
-	note D#, 15
-	note B_, 15
-	note A#, 15
-	note G#, 15
+	note D#, 16
+	note B_, 16
+	note A#, 16
+	note G#, 16
 	intensity $c2
-	note D#, 1
-	note D#, 1
+	note D#, 2
+	note D#, 2
 	intensity $c7
-	note A#, 3
+	note A#, 4
 	intensity $c2
-	note D#, 1
-	note D#, 1
+	note D#, 2
+	note D#, 2
 	intensity $c7
-	note B_, 3
+	note B_, 4
 	intensity $c2
-	note D#, 1
-	note D#, 1
+	note D#, 2
+	note D#, 2
 	intensity $c7
-	note A#, 3
+	note A#, 4
 	intensity $c2
-	note D#, 1
-	note D#, 1
+	note D#, 2
+	note D#, 2
 	intensity $c7
-	note A_, 3
+	note A_, 4
 	intensity $c2
-	note D#, 1
-	note D#, 1
+	note D#, 2
+	note D#, 2
 	intensity $c7
-	note A#, 3
+	note A#, 4
 	intensity $c2
-	note D#, 1
-	note D#, 1
+	note D#, 2
+	note D#, 2
 	intensity $c7
-	note B_, 3
+	note B_, 4
 	intensity $c2
-	note D#, 1
-	note D#, 1
+	note D#, 2
+	note D#, 2
 	intensity $c7
 	octave 4
-	note C#, 3
+	note C#, 4
 	intensity $c2
 	octave 3
-	note D#, 1
-	note D#, 1
+	note D#, 2
+	note D#, 2
 	intensity $c7
 	octave 4
-	note D_, 3
+	note D_, 4
 	intensity $b0
-	note D#, 7
-	note E_, 7
-	note F#, 7
-	note E_, 7
-	note D#, 7
-	note E_, 7
-	note F#, 7
-	note G#, 7
+	note D#, 8
+	note E_, 8
+	note F#, 8
+	note E_, 8
+	note D#, 8
+	note E_, 8
+	note F#, 8
+	note G#, 8
 	loopchannel 0, Music_ChampionBattle_branch_eab9d
 ; eac4f
 
 Music_ChampionBattle_branch_eac4f: ; eac4f
 	intensity $c2
-	note D#, 1
-	note D#, 5
-	note D#, 1
-	note D#, 5
-	note D#, 1
-	note D#, 5
-	note D#, 1
-	note D#, 1
+	note D#, 2
+	note D#, 6
+	note D#, 2
+	note D#, 6
+	note D#, 2
+	note D#, 6
+	note D#, 2
+	note D#, 2
 	intensity $c7
 	endchannel
 ; eac5c
@@ -526,23 +526,23 @@
 Music_ChampionBattle_branch_eac5c: ; eac5c
 	intensity $c2
 	octave 3
-	note D#, 1
-	note D#, 1
+	note D#, 2
+	note D#, 2
 	intensity $c7
-	note A#, 3
+	note A#, 4
 	intensity $c2
-	note D#, 1
-	note D#, 1
+	note D#, 2
+	note D#, 2
 	intensity $c7
-	note B_, 3
+	note B_, 4
 	intensity $c2
-	note D#, 1
-	note D#, 1
+	note D#, 2
+	note D#, 2
 	intensity $c7
-	note A#, 3
+	note A#, 4
 	intensity $c2
-	note D#, 1
-	note D#, 1
+	note D#, 2
+	note D#, 2
 	intensity $c7
 	endchannel
 ; eac79
@@ -549,13 +549,13 @@
 
 Music_ChampionBattle_branch_eac79: ; eac79
 	intensity $c1
-	note D#, 1
-	note D#, 3
-	note D#, 3
-	note D#, 3
-	note D#, 3
-	note D#, 3
-	note D#, 1
+	note D#, 2
+	note D#, 4
+	note D#, 4
+	note D#, 4
+	note D#, 4
+	note D#, 4
+	note D#, 2
 	intensity $c5
 	endchannel
 
@@ -564,248 +564,248 @@
 
 Music_ChampionBattle_branch_eac88: ; eac88
 	octave 3
-	note D#, 0
-	note __, 6
+	note D#, 1
+	note __, 7
 	loopchannel 3, Music_ChampionBattle_branch_eac88
-	note D#, 0
-	note __, 2
-	note E_, 3
+	note D#, 1
+	note __, 3
+	note E_, 4
 	callchannel Music_ChampionBattle_branch_ead61
 	callchannel Music_ChampionBattle_branch_ead61
 	callchannel Music_ChampionBattle_branch_ead61
 	callchannel Music_ChampionBattle_branch_ead6f
-	note D_, 3
+	note D_, 4
 	callchannel Music_ChampionBattle_branch_ead6f
-	note A_, 3
+	note A_, 4
 	callchannel Music_ChampionBattle_branch_ead6f
-	note D_, 3
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note A#, 3
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note A#, 3
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note B_, 3
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
+	note D_, 4
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note A#, 4
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note A#, 4
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note B_, 4
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
 	octave 4
-	note C#, 3
-	note D#, 7
+	note C#, 4
+	note D#, 8
 	octave 3
-	note D#, 7
-	note B_, 3
-	note G_, 1
-	note B_, 1
-	note F#, 1
-	note A#, 1
-	note F_, 1
-	note A_, 1
+	note D#, 8
+	note B_, 4
+	note G_, 2
+	note B_, 2
+	note F#, 2
+	note A#, 2
+	note F_, 2
+	note A_, 2
 
 Music_ChampionBattle_branch_eacc6: ; eacc6
-	note D#, 1
-	note A#, 1
+	note D#, 2
+	note A#, 2
 	loopchannel 8, Music_ChampionBattle_branch_eacc6
 
 Music_ChampionBattle_branch_eaccc: ; eaccc
-	note E_, 1
-	note B_, 1
+	note E_, 2
+	note B_, 2
 	loopchannel 5, Music_ChampionBattle_branch_eaccc
-	note E_, 1
+	note E_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note A_, 1
-	note B_, 1
-	note G_, 1
-	note A_, 1
+	note A_, 2
+	note B_, 2
+	note G_, 2
+	note A_, 2
 
 Music_ChampionBattle_branch_eacda: ; eacda
-	note D#, 1
-	note A#, 1
+	note D#, 2
+	note A#, 2
 	loopchannel 8, Music_ChampionBattle_branch_eacda
 
 Music_ChampionBattle_branch_eace0: ; eace0
-	note E_, 1
-	note B_, 1
+	note E_, 2
+	note B_, 2
 	loopchannel 8, Music_ChampionBattle_branch_eace0
 	callchannel Music_ChampionBattle_branch_ead83
 	octave 3
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
+	note D#, 2
+	note E_, 2
+	note D#, 2
+	note E_, 2
+	note D#, 2
 	octave 4
-	note D_, 1
-	note C#, 1
-	note C_, 1
+	note D_, 2
+	note C#, 2
+	note C_, 2
 	callchannel Music_ChampionBattle_branch_ead83
 	octave 3
-	note D#, 1
-	note A#, 1
-	note D#, 1
-	note A#, 1
-	note D#, 1
+	note D#, 2
+	note A#, 2
+	note D#, 2
+	note A#, 2
+	note D#, 2
 	octave 4
-	note D_, 1
-	note C#, 1
-	note C_, 1
+	note D_, 2
+	note C#, 2
+	note C_, 2
 	octave 3
-	note A#, 7
-	note D#, 7
-	note B_, 7
-	note D#, 7
+	note A#, 8
+	note D#, 8
+	note B_, 8
+	note D#, 8
 
 Music_ChampionBattle_branch_ead05: ; ead05
-	note D#, 1
-	note F#, 1
+	note D#, 2
+	note F#, 2
 	loopchannel 16, Music_ChampionBattle_branch_ead05
 	callchannel Music_ChampionBattle_branch_ead8e
 	octave 3
-	note E_, 1
-	note B_, 1
+	note E_, 2
+	note B_, 2
 	octave 4
-	note D#, 1
-	note E_, 1
-	note F#, 1
+	note D#, 2
+	note E_, 2
+	note F#, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note D#, 1
-	note E_, 1
+	note D#, 2
+	note E_, 2
 	callchannel Music_ChampionBattle_branch_ead8e
 
 Music_ChampionBattle_branch_ead1d: ; ead1d
 	octave 3
-	note E_, 1
-	note B_, 1
+	note E_, 2
+	note B_, 2
 	loopchannel 4, Music_ChampionBattle_branch_ead1d
 
 Music_ChampionBattle_branch_ead24: ; ead24
-	note D#, 1
-	note A#, 1
+	note D#, 2
+	note A#, 2
 	loopchannel 5, Music_ChampionBattle_branch_ead24
-	note B_, 1
+	note B_, 2
 	octave 4
-	note D#, 1
+	note D#, 2
 	octave 3
-	note D#, 1
-	note __, 1
-	note D#, 1
-	note __, 1
+	note D#, 2
+	note __, 2
+	note D#, 2
+	note __, 2
 
 Music_ChampionBattle_branch_ead32: ; ead32
-	note E_, 1
-	note B_, 1
+	note E_, 2
+	note B_, 2
 	loopchannel 5, Music_ChampionBattle_branch_ead32
 	octave 4
-	note C#, 1
-	note E_, 1
+	note C#, 2
+	note E_, 2
 	octave 3
-	note E_, 1
-	note __, 1
-	note E_, 1
-	note __, 1
+	note E_, 2
+	note __, 2
+	note E_, 2
+	note __, 2
 
 Music_ChampionBattle_branch_ead40: ; ead40
-	note D#, 1
-	note G#, 1
+	note D#, 2
+	note G#, 2
 	loopchannel 8, Music_ChampionBattle_branch_ead40
 
 Music_ChampionBattle_branch_ead46: ; ead46
-	note D#, 1
-	note A#, 1
+	note D#, 2
+	note A#, 2
 	loopchannel 7, Music_ChampionBattle_branch_ead46
-	note B_, 1
-	note A#, 1
+	note B_, 2
+	note A#, 2
 
 Music_ChampionBattle_branch_ead4e: ; ead4e
 	octave 3
-	note D#, 1
-	note A#, 1
+	note D#, 2
+	note A#, 2
 	octave 4
-	note D_, 1
-	note D#, 1
+	note D_, 2
+	note D#, 2
 	loopchannel 7, Music_ChampionBattle_branch_ead4e
-	note C#, 1
+	note C#, 2
 	octave 3
-	note B_, 1
-	note A#, 1
-	note G#, 1
+	note B_, 2
+	note A#, 2
+	note G#, 2
 	loopchannel 0, Music_ChampionBattle_branch_eacc6
 ; ead61
 
 Music_ChampionBattle_branch_ead61: ; ead61
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note __, 4
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 5
 	loopchannel 3, Music_ChampionBattle_branch_ead61
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note B_, 3
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note B_, 4
 	endchannel
 ; ead6f
 
 Music_ChampionBattle_branch_ead6f: ; ead6f
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note A#, 3
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note B_, 3
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note A#, 3
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note A#, 4
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note B_, 4
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note A#, 4
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
 	endchannel
 ; ead83
 
 Music_ChampionBattle_branch_ead83: ; ead83
 	octave 3
-	note D#, 1
-	note F#, 1
-	note D#, 1
-	note F#, 1
-	note D#, 1
+	note D#, 2
+	note F#, 2
+	note D#, 2
+	note F#, 2
+	note D#, 2
 	octave 4
-	note D_, 1
-	note C#, 1
-	note C_, 1
+	note D_, 2
+	note C#, 2
+	note C_, 2
 	endchannel
 ; ead8e
 
 Music_ChampionBattle_branch_ead8e: ; ead8e
 	octave 3
-	note E_, 1
-	note B_, 1
-	note E_, 1
-	note B_, 1
-	note E_, 1
-	note B_, 1
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
 	octave 4
-	note D#, 1
-	note E_, 1
+	note D#, 2
+	note E_, 2
 	endchannel
 ; ead99
--- a/audio/music/cherrygrovecity.asm
+++ b/audio/music/cherrygrovecity.asm
@@ -14,85 +14,85 @@
 	vibrato $8, $15
 	stereopanning $f0
 	notetype $c, $b5
-	note __, 9
+	note __, 10
 	octave 3
-	note C_, 1
-	note D_, 1
-	note E_, 1
+	note C_, 2
+	note D_, 2
+	note E_, 2
 
 Music_CherrygroveCity_branch_f5b26: ; f5b26
-	note A_, 3
-	note G#, 1
-	note A_, 1
-	note A#, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
-	note A_, 5
-	note F_, 1
-	note C_, 1
+	note A_, 4
+	note G#, 2
+	note A_, 2
+	note A#, 2
+	note A_, 2
+	note G_, 2
+	note F_, 2
+	note A_, 6
+	note F_, 2
+	note C_, 2
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note C_, 1
-	note E_, 1
-	note G_, 3
-	note F#, 1
-	note G_, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
-	note E_, 1
-	note G_, 5
-	note E_, 1
-	note C_, 1
+	note C_, 2
+	note E_, 2
+	note G_, 4
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note G_, 6
+	note E_, 2
+	note C_, 2
 	octave 2
-	note A#, 1
-	note A_, 1
+	note A#, 2
+	note A_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	intensity $b7
 	octave 2
-	note A#, 5
+	note A#, 6
 	octave 3
-	note D_, 5
-	note A#, 3
-	note A_, 5
-	note F_, 1
-	note C_, 7
+	note D_, 6
+	note A#, 4
+	note A_, 6
+	note F_, 2
+	note C_, 8
 	octave 2
-	note A#, 5
+	note A#, 6
 	octave 3
-	note D_, 5
+	note D_, 6
 	intensity $b5
-	note A_, 3
-	note G_, 3
-	note E_, 3
-	note D_, 3
-	note E_, 3
+	note A_, 4
+	note G_, 4
+	note E_, 4
+	note D_, 4
+	note E_, 4
 	octave 2
-	note A#, 5
+	note A#, 6
 	octave 3
-	note D_, 5
-	note A#, 3
-	note A_, 5
-	note F_, 1
-	note C_, 3
+	note D_, 6
+	note A#, 4
+	note A_, 6
+	note F_, 2
+	note C_, 4
 	octave 2
-	note B_, 3
-	note A#, 5
+	note B_, 4
+	note A#, 6
 	octave 3
-	note C#, 1
+	note C#, 2
 	octave 2
-	note A#, 3
-	note G_, 3
-	note A_, 3
+	note A#, 4
+	note G_, 4
+	note A_, 4
 	octave 3
-	note C_, 3
+	note C_, 4
 	octave 2
-	note A_, 3
+	note A_, 4
 	octave 3
-	note C_, 3
+	note C_, 4
 	loopchannel 0, Music_CherrygroveCity_branch_f5b26
 
 Music_CherrygroveCity_Ch2: ; f5b74
@@ -101,212 +101,212 @@
 	stereopanning $f
 	notetype $c, $c3
 	octave 3
-	note C_, 1
-	note D_, 1
-	note E_, 1
-	note D_, 1
-	note E_, 1
-	note G_, 1
-	note A_, 1
-	note A#, 1
+	note C_, 2
+	note D_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note G_, 2
+	note A_, 2
+	note A#, 2
 
 Music_CherrygroveCity_branch_f5b87: ; f5b87
 	intensity $c6
 	octave 4
-	note C_, 5
-	note D_, 3
+	note C_, 6
+	note D_, 4
 	intensity $b3
-	note D_, 1
-	note C_, 1
+	note D_, 2
+	note C_, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	intensity $c7
 	octave 4
-	note C_, 5
+	note C_, 6
 	octave 3
-	note A_, 1
-	note F_, 7
+	note A_, 2
+	note F_, 8
 	intensity $c6
-	note A#, 5
+	note A#, 6
 	octave 4
-	note C_, 3
+	note C_, 4
 	intensity $b3
-	note C_, 1
+	note C_, 2
 	octave 3
-	note A#, 1
-	note A_, 1
+	note A#, 2
+	note A_, 2
 	intensity $c7
-	note A#, 5
-	note G_, 1
-	note E_, 7
+	note A#, 6
+	note G_, 2
+	note E_, 8
 	intensity $a0
-	note D_, 5
-	note F_, 5
+	note D_, 6
+	note F_, 6
 	octave 4
-	note D_, 3
-	note C_, 5
+	note D_, 4
+	note C_, 6
 	intensity $a5
 	octave 3
-	note A_, 1
+	note A_, 2
 	intensity $c7
-	note F_, 7
+	note F_, 8
 	intensity $a0
-	note D_, 5
-	note F_, 5
+	note D_, 6
+	note F_, 6
 	octave 4
-	note D_, 3
+	note D_, 4
 	intensity $c7
-	note C_, 15
+	note C_, 16
 	intensity $b5
 	octave 3
-	note D_, 5
-	note F_, 5
+	note D_, 6
+	note F_, 6
 	octave 4
-	note D_, 3
-	note C_, 5
+	note D_, 4
+	note C_, 6
 	octave 3
-	note A_, 1
-	note F_, 7
-	note C#, 5
-	note F_, 5
-	note G_, 3
+	note A_, 2
+	note F_, 8
+	note C#, 6
+	note F_, 6
+	note G_, 4
 	intensity $a0
-	note F_, 7
+	note F_, 8
 	intensity $a7
-	note F_, 7
+	note F_, 8
 	loopchannel 0, Music_CherrygroveCity_branch_f5b87
 
 Music_CherrygroveCity_Ch3: ; f5bd8
 	notetype $c, $16
-	note __, 3
+	note __, 4
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note A#, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
-	note E_, 1
+	note A#, 2
+	note A_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
 
 Music_CherrygroveCity_branch_f5be4: ; f5be4
-	note A_, 1
-	note F_, 1
-	note A_, 1
+	note A_, 2
+	note F_, 2
+	note A_, 2
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note F_, 1
-	note G_, 1
-	note A_, 1
-	note A_, 1
-	note F_, 1
-	note A_, 1
+	note F_, 2
+	note G_, 2
+	note A_, 2
+	note A_, 2
+	note F_, 2
+	note A_, 2
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note F_, 1
-	note G_, 1
-	note A_, 1
-	note A#, 1
-	note G_, 1
-	note A#, 1
+	note F_, 2
+	note G_, 2
+	note A_, 2
+	note A#, 2
+	note G_, 2
+	note A#, 2
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note F_, 1
-	note G_, 1
-	note A_, 1
-	note A#, 3
+	note F_, 2
+	note G_, 2
+	note A_, 2
+	note A#, 4
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note A#, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
-	note E_, 1
-	note D_, 1
-	note F_, 3
-	note A#, 1
-	note F_, 1
-	note A#, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
-	note A_, 3
-	note F_, 1
-	note A_, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note F_, 3
-	note A#, 1
-	note F_, 1
-	note A#, 1
-	note A_, 1
-	note G_, 1
-	note E_, 1
-	note G_, 1
-	note A#, 1
+	note A#, 2
+	note A_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note F_, 4
+	note A#, 2
+	note F_, 2
+	note A#, 2
+	note A_, 2
+	note G_, 2
+	note F_, 2
+	note A_, 4
+	note F_, 2
+	note A_, 2
+	note F_, 2
+	note E_, 2
+	note D#, 2
+	note D_, 2
+	note F_, 4
+	note A#, 2
+	note F_, 2
+	note A#, 2
+	note A_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note A#, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note A#, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
-	note D_, 1
-	note F_, 3
-	note A#, 1
-	note F_, 1
-	note A#, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
-	note A_, 3
-	note F_, 1
-	note A_, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note C#, 1
-	note F_, 3
-	note A#, 1
-	note F_, 1
-	note A#, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
-	note A_, 1
-	note F_, 1
-	note A_, 1
-	note F_, 1
-	note A_, 1
-	note F_, 1
-	note A_, 1
+	note A#, 2
+	note A_, 2
+	note G_, 2
+	note F_, 2
+	note D_, 2
+	note F_, 4
+	note A#, 2
+	note F_, 2
+	note A#, 2
+	note A_, 2
+	note G_, 2
+	note F_, 2
+	note A_, 4
+	note F_, 2
+	note A_, 2
+	note F_, 2
+	note E_, 2
+	note D#, 2
+	note C#, 2
+	note F_, 4
+	note A#, 2
+	note F_, 2
+	note A#, 2
+	note A_, 2
+	note G_, 2
+	note F_, 2
+	note A_, 2
+	note F_, 2
+	note A_, 2
+	note F_, 2
+	note A_, 2
+	note F_, 2
+	note A_, 2
 	loopchannel 0, Music_CherrygroveCity_branch_f5be4
 
 Music_CherrygroveCity_Ch4: ; f5c48
 	togglenoise $3
 	notetype $c
-	note __, 15
+	note __, 16
 
 Music_CherrygroveCity_branch_f5c4d: ; f5c4d
+	note C#, 2
+	note __, 2
+	note G_, 2
+	note C#, 2
+	note C#, 2
+	note F#, 2
+	note C#, 4
+	note C#, 2
+	note __, 2
+	note G_, 2
 	note C#, 1
-	note __, 1
-	note G_, 1
 	note C#, 1
-	note C#, 1
-	note F#, 1
-	note C#, 3
-	note C#, 1
-	note __, 1
-	note G_, 1
-	note C#, 0
-	note C#, 0
-	note F#, 3
-	note C#, 1
-	note G_, 1
+	note F#, 4
+	note C#, 2
+	note G_, 2
 	loopchannel 0, Music_CherrygroveCity_branch_f5c4d
 ; f5c60
--- a/audio/music/clair.asm
+++ b/audio/music/clair.asm
@@ -17,86 +17,86 @@
 
 Music_Clair_branch_1faab: ; 1faab
 	octave 4
-	note F_, 0
-	note F#, 0
-	note F_, 0
-	note __, 0
-	note C#, 0
-	note __, 0
+	note F_, 1
+	note F#, 1
+	note F_, 1
+	note __, 1
+	note C#, 1
+	note __, 1
 	loopchannel 2, Music_Clair_branch_1faab
 	octave 3
-	note B_, 0
-	note __, 0
-	note G#, 0
+	note B_, 1
+	note __, 1
+	note G#, 1
 	dutycycle $2
 	intensity $92
 	octave 5
-	note F_, 0
-	note G_, 3
+	note F_, 1
+	note G_, 4
 	intensity $a7
 	dutycycle $3
 	octave 3
-	note D#, 3
-	note F_, 3
-	note G_, 3
+	note D#, 4
+	note F_, 4
+	note G_, 4
 
 Music_Clair_branch_1fac9: ; 1fac9
 	intensity $93
 	callchannel Music_Clair_branch_1fb12
 	octave 2
-	note B_, 0
+	note B_, 1
 	octave 3
-	note C#, 0
-	note D#, 1
+	note C#, 1
+	note D#, 2
 	octave 2
-	note G_, 0
-	note A#, 0
+	note G_, 1
+	note A#, 1
 	octave 3
-	note C#, 1
+	note C#, 2
 	octave 2
-	note A#, 0
-	note G_, 0
+	note A#, 1
+	note G_, 1
 	callchannel Music_Clair_branch_1fb12
-	note D#, 0
-	note C#, 0
 	note D#, 1
+	note C#, 1
+	note D#, 2
 	octave 4
-	note A#, 0
-	note G#, 0
-	note G_, 0
-	note G#, 0
-	note A#, 0
+	note A#, 1
+	note G#, 1
+	note G_, 1
+	note G#, 1
+	note A#, 1
 	octave 5
-	note D#, 0
+	note D#, 1
 	callchannel Music_Clair_branch_1fb2e
 	dutycycle $3
-	note G#, 2
-	note F_, 1
-	note __, 0
-	note A#, 3
+	note G#, 3
+	note F_, 2
+	note __, 1
+	note A#, 4
 	dutycycle $2
-	note D#, 0
-	note C#, 0
-	note D#, 0
-	note G_, 0
-	note A#, 0
+	note D#, 1
+	note C#, 1
+	note D#, 1
+	note G_, 1
+	note A#, 1
 	octave 5
-	note D#, 0
+	note D#, 1
 	callchannel Music_Clair_branch_1fb2e
 	dutycycle $3
-	note D#, 2
-	note C#, 1
-	note __, 0
+	note D#, 3
+	note C#, 2
+	note __, 1
 	octave 3
-	note B_, 3
+	note B_, 4
 	dutycycle $2
-	note G#, 0
-	note C#, 0
-	note D#, 0
-	note G#, 0
-	note B_, 0
+	note G#, 1
+	note C#, 1
+	note D#, 1
+	note G#, 1
+	note B_, 1
 	octave 4
-	note D#, 0
+	note D#, 1
 	loopchannel 0, Music_Clair_branch_1fac9
 ; 1fb12
 
@@ -104,48 +104,48 @@
 	dutycycle $3
 	stereopanning $ff
 	octave 3
-	note B_, 0
-	note __, 1
-	note G#, 4
+	note B_, 1
+	note __, 2
+	note G#, 5
 	dutycycle $2
 	stereopanning $f
 	octave 2
+	note B_, 2
+	note G#, 1
 	note B_, 1
-	note G#, 0
-	note B_, 0
 	octave 3
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note F#, 0
-	note F_, 0
-	note C#, 0
-	note __, 0
-	note F_, 0
-	note C#, 0
-	note __, 0
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note F#, 1
+	note F_, 1
+	note C#, 1
+	note __, 1
+	note F_, 1
+	note C#, 1
+	note __, 1
 	endchannel
 ; 1fb2e
 
 Music_Clair_branch_1fb2e: ; 1fb2e
 	octave 4
-	note F#, 0
-	note D#, 0
-	note __, 0
-	note F#, 0
-	note D#, 0
-	note __, 0
+	note F#, 1
+	note D#, 1
+	note __, 1
+	note F#, 1
+	note D#, 1
+	note __, 1
 	octave 3
-	note D#, 0
-	note G#, 0
+	note D#, 1
+	note G#, 1
+	note B_, 2
+	note G#, 1
 	note B_, 1
-	note G#, 0
-	note B_, 0
 	octave 4
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note F#, 0
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note F#, 1
 	endchannel
 
 Music_Clair_Ch2: ; 1fb41
@@ -155,104 +155,104 @@
 
 Music_Clair_branch_1fb49: ; 1fb49
 	octave 3
-	note A#, 1
-	note B_, 1
-	note A#, 1
-	note __, 1
-	note G#, 1
-	note __, 1
+	note A#, 2
+	note B_, 2
+	note A#, 2
+	note __, 2
+	note G#, 2
+	note __, 2
 	loopchannel 2, Music_Clair_branch_1fb49
-	note F_, 1
-	note __, 1
-	note C#, 1
-	note __, 1
+	note F_, 2
+	note __, 2
+	note C#, 2
+	note __, 2
 	intensity $82
-	note D#, 1
-	note A#, 1
+	note D#, 2
+	note A#, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	intensity $92
-	note G_, 1
+	note G_, 2
 	octave 4
-	note C#, 1
-	note D#, 1
+	note C#, 2
+	note D#, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	intensity $b2
 	octave 4
-	note C#, 1
-	note D#, 1
-	note G_, 1
-	note D#, 1
+	note C#, 2
+	note D#, 2
+	note G_, 2
+	note D#, 2
 	intensity $c2
-	note C#, 1
-	note D#, 1
-	note G_, 1
-	note A#, 1
+	note C#, 2
+	note D#, 2
+	note G_, 2
+	note A#, 2
 	intensity $b7
 
 Music_Clair_branch_1fb77: ; 1fb77
 	callchannel Music_Clair_branch_1fba6
-	note F#, 1
-	note __, 3
-	note D#, 11
-	note __, 1
-	note D#, 3
-	note C#, 3
+	note F#, 2
+	note __, 4
+	note D#, 12
+	note __, 2
+	note D#, 4
+	note C#, 4
 	octave 3
-	note B_, 2
-	note A#, 0
-	note B_, 5
+	note B_, 3
+	note A#, 1
+	note B_, 6
 	octave 4
-	note C#, 3
-	note __, 1
+	note C#, 4
+	note __, 2
 	octave 3
-	note A#, 15
-	note __, 3
+	note A#, 16
+	note __, 4
 	forceoctave $c
 	callchannel Music_Clair_branch_1fba6
 	forceoctave $0
 	octave 5
-	note F#, 1
-	note __, 3
-	note D#, 11
-	note __, 1
+	note F#, 2
+	note __, 4
+	note D#, 12
+	note __, 2
 	octave 4
-	note G#, 3
-	note A#, 3
-	note B_, 2
+	note G#, 4
+	note A#, 4
+	note B_, 3
 	octave 5
-	note C_, 0
-	note C#, 5
+	note C_, 1
+	note C#, 6
 	octave 4
-	note A#, 3
-	note __, 1
-	note G#, 15
-	note __, 3
+	note A#, 4
+	note __, 2
+	note G#, 16
+	note __, 4
 	loopchannel 0, Music_Clair_branch_1fb77
 ; 1fba6
 
 Music_Clair_branch_1fba6: ; 1fba6
 	octave 4
-	note F#, 1
-	note __, 3
-	note D#, 11
-	note __, 1
+	note F#, 2
+	note __, 4
+	note D#, 12
+	note __, 2
 	octave 3
-	note G#, 3
-	note A#, 3
-	note B_, 2
+	note G#, 4
+	note A#, 4
+	note B_, 3
 	octave 4
-	note C_, 0
-	note C#, 5
+	note C_, 1
+	note C#, 6
 	octave 3
-	note B_, 3
-	note __, 1
+	note B_, 4
+	note __, 2
 	octave 4
-	note D#, 15
-	note __, 3
+	note D#, 16
+	note __, 4
 	endchannel
 
 Music_Clair_Ch3: ; 1fbb9
@@ -259,143 +259,143 @@
 	notetype $c, $14
 	forceoctave $c
 	octave 3
-	note C#, 1
-	note __, 3
+	note C#, 2
+	note __, 4
 	octave 2
-	note G#, 0
-	note B_, 0
+	note G#, 1
+	note B_, 1
 	octave 3
-	note C#, 1
-	note __, 3
+	note C#, 2
+	note __, 4
 	octave 2
-	note G#, 0
-	note B_, 0
+	note G#, 1
+	note B_, 1
 	octave 3
-	note D#, 1
-	note __, 1
+	note D#, 2
+	note __, 2
 	octave 2
-	note A#, 3
-	note G#, 3
-	note G_, 3
+	note A#, 4
+	note G#, 4
+	note G_, 4
 
 Music_Clair_branch_1fbd1: ; 1fbd1
 	callchannel Music_Clair_branch_1fc3c
 	octave 2
-	note C#, 1
-	note __, 0
-	note G#, 1
-	note __, 0
-	note C#, 1
+	note C#, 2
 	note __, 1
-	note D#, 1
-	note A#, 1
-	note D#, 1
+	note G#, 2
+	note __, 1
+	note C#, 2
+	note __, 2
+	note D#, 2
+	note A#, 2
+	note D#, 2
 	callchannel Music_Clair_branch_1fc3c
 	octave 2
-	note G#, 1
-	note __, 0
+	note G#, 2
+	note __, 1
+	note C#, 2
+	note __, 1
+	note D#, 2
+	note __, 2
+	note D#, 1
 	note C#, 1
-	note __, 0
 	note D#, 1
-	note __, 1
-	note D#, 0
-	note C#, 0
-	note D#, 0
-	note F_, 0
-	note G_, 0
-	note A#, 0
+	note F_, 1
+	note G_, 1
+	note A#, 1
 	octave 1
-	note G#, 1
-	note __, 0
+	note G#, 2
+	note __, 1
 	octave 2
-	note D#, 1
-	note __, 0
+	note D#, 2
+	note __, 1
 	octave 1
-	note G#, 1
+	note G#, 2
 	octave 3
-	note F#, 0
-	note __, 0
+	note F#, 1
+	note __, 1
 	octave 1
-	note G#, 0
+	note G#, 1
 	octave 3
-	note D#, 0
-	octave 2
 	note D#, 1
+	octave 2
+	note D#, 2
 	octave 1
-	note G#, 1
+	note G#, 2
 	octave 2
-	note C#, 1
-	note __, 0
-	note G#, 1
-	note __, 0
-	note C#, 1
+	note C#, 2
+	note __, 1
+	note G#, 2
+	note __, 1
+	note C#, 2
 	octave 3
-	note D#, 0
-	note __, 0
+	note D#, 1
+	note __, 1
 	octave 2
-	note D#, 0
+	note D#, 1
 	octave 3
-	note A#, 0
-	octave 2
 	note A#, 1
+	octave 2
+	note A#, 2
 	octave 3
-	note G_, 0
+	note G_, 1
 	octave 2
-	note D#, 0
+	note D#, 1
 	octave 1
-	note G#, 1
-	note __, 0
+	note G#, 2
+	note __, 1
 	octave 2
-	note D#, 1
-	note __, 0
+	note D#, 2
+	note __, 1
 	octave 1
-	note G#, 1
+	note G#, 2
 	octave 3
-	note F#, 0
-	note __, 0
+	note F#, 1
+	note __, 1
 	octave 1
-	note G#, 0
+	note G#, 1
 	octave 3
-	note D#, 0
-	octave 2
 	note D#, 1
+	octave 2
+	note D#, 2
 	octave 1
-	note G#, 1
+	note G#, 2
 	octave 2
-	note D#, 1
-	note __, 0
-	note G_, 1
-	note __, 0
-	note G#, 1
+	note D#, 2
+	note __, 1
+	note G_, 2
+	note __, 1
+	note G#, 2
 	octave 2
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 1
-	note G#, 0
+	note G#, 1
 	octave 2
-	note A#, 0
-	note D#, 1
-	note G#, 0
+	note A#, 1
+	note D#, 2
+	note G#, 1
 	octave 1
-	note G#, 0
+	note G#, 1
 	loopchannel 0, Music_Clair_branch_1fbd1
 ; 1fc3c
 
 Music_Clair_branch_1fc3c: ; 1fc3c
 	octave 1
-	note G#, 1
-	note __, 0
+	note G#, 2
+	note __, 1
 	octave 2
-	note D#, 1
-	note __, 0
-	octave 1
-	note G#, 1
+	note D#, 2
 	note __, 1
-	note G#, 1
+	octave 1
+	note G#, 2
+	note __, 2
+	note G#, 2
 	octave 2
-	note D#, 1
+	note D#, 2
 	octave 1
-	note G#, 1
+	note G#, 2
 	endchannel
 
 Music_Clair_Ch4: ; 1fc4b
@@ -402,46 +402,46 @@
 	togglenoise $3
 	notetype $c
 	stereopanning $f0
-	note B_, 7
-	note B_, 7
-	note B_, 5
+	note B_, 8
+	note B_, 8
+	note B_, 6
 	stereopanning $ff
-	note D#, 0
-	note D#, 0
+	note D#, 1
+	note D#, 1
+	note D_, 2
+	note D#, 1
+	note D#, 1
+	note D_, 2
 	note D_, 1
-	note D#, 0
-	note D#, 0
 	note D_, 1
-	note D_, 0
-	note D_, 0
 
 Music_Clair_branch_1fc5e: ; 1fc5e
 	stereopanning $ff
 	callchannel Music_Clair_branch_1fc6e
-	note G_, 0
+	note G_, 1
 	stereopanning $ff
 	callchannel Music_Clair_branch_1fc6e
-	note F#, 0
+	note F#, 1
 	loopchannel 0, Music_Clair_branch_1fc5e
 ; 1fc6e
 
 Music_Clair_branch_1fc6e: ; 1fc6e
-	note D#, 1
+	note D#, 2
 	stereopanning $f0
-	note G_, 1
+	note G_, 2
 	stereopanning $ff
-	note D_, 1
+	note D_, 2
 	stereopanning $f0
-	note G_, 0
-	note G_, 0
 	note G_, 1
+	note G_, 1
+	note G_, 2
 	stereopanning $ff
-	note D#, 0
+	note D#, 1
 	stereopanning $f0
-	note G_, 0
+	note G_, 1
 	stereopanning $ff
-	note D_, 1
+	note D_, 2
 	stereopanning $f0
-	note G_, 0
+	note G_, 1
 	endchannel
 ; 1fc87
--- a/audio/music/contestresults.asm
+++ b/audio/music/contestresults.asm
@@ -12,43 +12,43 @@
 	notetype $c, $51
 
 Music_ContestResults_branch_efb52: ; efb52
-	note __, 1
-	octave 2
-	note G_, 0
 	note __, 2
-	note G_, 0
-	note __, 2
-	note G_, 0
-	note __, 2
-	note G_, 0
-	note __, 0
+	octave 2
+	note G_, 1
+	note __, 3
+	note G_, 1
+	note __, 3
+	note G_, 1
+	note __, 3
+	note G_, 1
 	note __, 1
-	note A_, 0
 	note __, 2
-	note A_, 0
-	note __, 2
-	note A_, 0
-	note __, 2
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 3
+	note A_, 1
+	note __, 3
+	note A_, 1
+	note __, 3
+	note A_, 1
 	note __, 1
-	note A_, 0
 	note __, 2
-	note A_, 0
-	note __, 2
-	note A_, 0
-	note __, 2
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 3
+	note A_, 1
+	note __, 3
+	note A_, 1
+	note __, 3
+	note A_, 1
 	note __, 1
-	note B_, 0
 	note __, 2
-	note A#, 0
-	note __, 2
-	note A_, 0
-	note __, 2
-	note G_, 0
-	note __, 0
+	note B_, 1
+	note __, 3
+	note A#, 1
+	note __, 3
+	note A_, 1
+	note __, 3
+	note G_, 1
+	note __, 1
 	loopchannel 0, Music_ContestResults_branch_efb52
 
 Music_ContestResults_Ch2: ; efb7b
@@ -56,78 +56,78 @@
 
 Music_ContestResults_branch_efb7e: ; efb7e
 	octave 2
-	note C_, 1
+	note C_, 2
 	octave 3
-	note E_, 0
-	note __, 0
+	note E_, 1
+	note __, 1
 	octave 1
-	note G_, 1
+	note G_, 2
 	octave 3
-	note E_, 0
-	note __, 0
+	note E_, 1
+	note __, 1
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 0
-	note __, 0
+	note E_, 1
+	note __, 1
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 3
-	note E_, 0
-	note __, 0
+	note E_, 1
+	note __, 1
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 3
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 3
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 3
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
 	octave 2
-	note C#, 1
+	note C#, 2
 	octave 3
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
 
 Music_ContestResults_branch_efba6: ; efba6
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 3
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 3
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
 	loopchannel 2, Music_ContestResults_branch_efba6
 	octave 2
-	note G_, 1
+	note G_, 2
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 3
-	note F#, 0
-	note __, 0
+	note F#, 1
+	note __, 1
 	octave 2
-	note G_, 1
+	note G_, 2
 	octave 3
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 3
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
 	loopchannel 0, Music_ContestResults_branch_efb7e
 
 Music_ContestResults_Ch3: ; efbcc
@@ -136,24 +136,24 @@
 
 Music_ContestResults_branch_efbd2: ; efbd2
 	octave 4
-	note E_, 4
-	note __, 0
-	note E_, 0
-	note F_, 0
-	note G_, 3
+	note E_, 5
+	note __, 1
+	note E_, 1
+	note F_, 1
+	note G_, 4
 	octave 5
-	note C_, 3
+	note C_, 4
 	octave 4
-	note B_, 7
-	note A_, 7
-	note D_, 4
-	note __, 0
-	note D_, 0
-	note E_, 0
-	note F_, 3
-	note B_, 3
-	note A_, 7
-	note G_, 7
+	note B_, 8
+	note A_, 8
+	note D_, 5
+	note __, 1
+	note D_, 1
+	note E_, 1
+	note F_, 4
+	note B_, 4
+	note A_, 8
+	note G_, 8
 	loopchannel 0, Music_ContestResults_branch_efbd2
 
 Music_ContestResults_Ch4: ; efbe9
@@ -161,21 +161,21 @@
 	notetype $6
 
 Music_ContestResults_branch_efbed: ; efbed
-	note C#, 3
-	note C#, 3
-	note C#, 1
-	note C#, 1
-	note C#, 1
-	note C#, 1
-	note C#, 3
-	note C#, 3
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
+	note C#, 4
+	note C#, 4
+	note C#, 2
+	note C#, 2
+	note C#, 2
+	note C#, 2
+	note C#, 4
+	note C#, 4
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
 	loopchannel 0, Music_ContestResults_branch_efbed
 ; efc01
--- a/audio/music/credits.asm
+++ b/audio/music/credits.asm
@@ -13,46 +13,46 @@
 	dutycycle $3
 	notetype $c, $2f
 	octave 2
-	note G_, 15
+	note G_, 16
 	notetype $6, $a7
 	octave 3
-	note B_, 11
-	note A#, 1
-	note A_, 1
-	note B_, 0
+	note B_, 12
+	note A#, 2
+	note A_, 2
+	note B_, 1
 	octave 4
-	note C_, 6
-	note D_, 7
+	note C_, 7
+	note D_, 8
 	callchannel Music_Credits_branch_1f483
-	note __, 3
+	note __, 4
 	octave 3
-	note B_, 1
-	note __, 1
-	note A_, 1
-	note B_, 1
-	note __, 1
-	note A_, 1
-	note B_, 1
+	note B_, 2
+	note __, 2
+	note A_, 2
+	note B_, 2
+	note __, 2
+	note A_, 2
+	note B_, 2
 	intensity $96
-	note A_, 0
-	note G_, 0
+	note A_, 1
+	note G_, 1
 	octave 3
-	note D_, 0
-	note C_, 0
+	note D_, 1
+	note C_, 1
 	octave 2
-	note B_, 0
-	note A_, 0
+	note B_, 1
+	note A_, 1
 	intensity $94
-	note G_, 0
-	note F_, 0
-	note E_, 0
-	note D_, 0
-	note C_, 0
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note C_, 1
 	octave 1
-	note B_, 0
-	note A_, 0
+	note B_, 1
+	note A_, 1
 	octave 3
-	note __, 0
+	note __, 1
 	intensity $a7
 	callchannel Music_Credits_branch_1f483
 	callchannel Music_Credits_branch_1f4ed
@@ -59,90 +59,90 @@
 	intensity $97
 	callchannel Music_Credits_branch_1f4f8
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note G_, 1
-	note D_, 1
-	note G_, 1
-	note F_, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note F_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note G_, 1
-	note D_, 1
-	note G_, 1
+	note G_, 2
+	note D_, 2
+	note G_, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note G_, 1
-	note D_, 1
-	note G_, 1
+	note G_, 2
+	note D_, 2
+	note G_, 2
 	octave 3
-	note G_, 1
+	note G_, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note D_, 1
-	note E_, 1
-	note D_, 1
+	note D_, 2
+	note E_, 2
+	note D_, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note D_, 1
-	note B_, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
-	note B_, 1
-	note G_, 1
-	note A_, 1
-	note E_, 1
-	note C_, 1
-	note E_, 1
-	note G#, 1
-	note E_, 1
-	note C_, 1
-	note E_, 1
-	note G_, 1
-	note E_, 1
-	note C_, 1
-	note E_, 1
-	note F#, 1
-	note E_, 1
-	note C_, 1
+	note D_, 2
+	note B_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note A_, 2
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note F#, 2
+	note E_, 2
+	note C_, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	callchannel Music_Credits_branch_1f4f8
 	callchannel Music_Credits_branch_1f559
-	note B_, 0
+	note B_, 1
 	octave 4
-	note C_, 6
-	note D_, 7
+	note C_, 7
+	note D_, 8
 	intensity $a7
 	octave 5
-	note E_, 1
-	note C#, 1
+	note E_, 2
+	note C#, 2
 	octave 4
-	note A_, 1
-	note E_, 1
+	note A_, 2
+	note E_, 2
 	octave 5
-	note C#, 1
+	note C#, 2
 	octave 4
-	note A_, 1
-	note E_, 1
+	note A_, 2
+	note E_, 2
+	note C#, 2
 	note C#, 1
-	note C#, 0
-	note D_, 6
-	note E_, 6
+	note D_, 7
+	note E_, 7
 	octave 3
-	note __, 0
+	note __, 1
 	forceoctave $2
 	callchannel Music_Credits_branch_1f483
 	callchannel Music_Credits_branch_1f4ed
@@ -150,418 +150,418 @@
 	callchannel Music_Credits_branch_1f559
 	forceoctave $0
 	octave 3
-	note A_, 11
+	note A_, 12
 	notetype $8, $a7
-	note D_, 0
-	note D_, 0
-	note D_, 0
+	note D_, 1
+	note D_, 1
+	note D_, 1
 	callchannel Music_Credits_branch_1f582
 	octave 3
-	note B_, 5
-	note A_, 5
-	note A_, 5
-	note G_, 5
-	note A#, 5
-	note A#, 5
-	note A_, 5
+	note B_, 6
+	note A_, 6
+	note A_, 6
+	note G_, 6
+	note A#, 6
+	note A#, 6
+	note A_, 6
 	octave 4
-	note C#, 5
+	note C#, 6
 	callchannel Music_Credits_branch_1f582
 	tempo 143
 	octave 4
-	note D_, 5
+	note D_, 6
 	octave 3
-	note B_, 5
-	note G_, 5
+	note B_, 6
+	note G_, 6
 	octave 4
-	note D_, 5
+	note D_, 6
 	tempo 146
-	note E_, 5
-	note F#, 5
-	note A_, 5
+	note E_, 6
+	note F#, 6
+	note A_, 6
 	octave 5
-	note C#, 5
+	note C#, 6
 	notetype $c, $a7
 
 Music_Credits_branch_1f407: ; 1f407
 	octave 3
-	note A_, 0
+	note A_, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	loopchannel 6, Music_Credits_branch_1f407
 	notetype $8, $a7
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note G#, 0
-	note __, 0
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note G#, 1
+	note __, 1
 	tempo 153
 	notetype $c, $a7
 	octave 3
-	note C_, 0
-	note E_, 0
-	note G_, 0
+	note C_, 1
+	note E_, 1
+	note G_, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	octave 3
-	note E_, 0
-	note G_, 0
+	note E_, 1
+	note G_, 1
 	octave 4
-	note C_, 0
-	note E_, 0
+	note C_, 1
+	note E_, 1
 	octave 3
-	note G_, 0
+	note G_, 1
 	octave 4
-	note C_, 0
-	note E_, 0
-	note G_, 0
+	note C_, 1
+	note E_, 1
+	note G_, 1
 	notetype $8, $a7
-	note C_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
 	notetype $c, $a7
 	octave 3
-	note D_, 0
-	note F#, 0
-	note A_, 0
+	note D_, 1
+	note F#, 1
+	note A_, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	octave 3
-	note F#, 0
-	note A_, 0
+	note F#, 1
+	note A_, 1
 	octave 4
-	note D_, 0
-	note E_, 0
-	note F#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
+	note D_, 1
+	note E_, 1
+	note F#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
 	notetype $8, $a7
-	note A_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
 	tempo 160
 	notetype $c, $a7
 	octave 2
-	note G_, 0
-	note __, 2
-	note E_, 0
-	note __, 2
+	note G_, 1
+	note __, 3
+	note E_, 1
+	note __, 3
 	notetype $8, $a7
 	octave 1
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
 	octave 2
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note C#, 0
-	note __, 0
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note C#, 1
+	note __, 1
 	notetype $c, $a7
 	octave 2
-	note D_, 0
-	note __, 6
+	note D_, 1
+	note __, 7
 	intensity $c7
 	octave 2
-	note D_, 15
+	note D_, 16
 	intensity $b8
 	intensity $b7
-	note __, 15
-	note __, 15
-	note __, 15
+	note __, 16
+	note __, 16
+	note __, 16
 	endchannel
 ; 1f483
 
 Music_Credits_branch_1f483: ; 1f483
-	note C_, 15
-	note F#, 0
-	note G_, 2
-	note E_, 3
-	note D_, 3
-	note E_, 3
-	note D_, 3
-	octave 3
-	note B_, 1
-	note __, 1
-	note A#, 1
-	note B_, 1
-	note __, 1
-	note A#, 1
-	note B_, 3
+	note C_, 16
+	note F#, 1
 	note G_, 3
-	note __, 3
+	note E_, 4
+	note D_, 4
+	note E_, 4
+	note D_, 4
+	octave 3
+	note B_, 2
+	note __, 2
+	note A#, 2
+	note B_, 2
+	note __, 2
+	note A#, 2
+	note B_, 4
+	note G_, 4
+	note __, 4
 	octave 4
-	note D_, 3
-	note __, 3
-	note E_, 3
+	note D_, 4
+	note __, 4
+	note E_, 4
 	octave 3
-	note A#, 3
-	note G_, 3
-	note E_, 3
-	note G_, 3
+	note A#, 4
+	note G_, 4
+	note E_, 4
+	note G_, 4
 	octave 4
-	note G_, 3
-	note C_, 3
-	note D_, 3
-	note C_, 1
-	note __, 1
+	note G_, 4
+	note C_, 4
+	note D_, 4
+	note C_, 2
+	note __, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note C_, 1
-	note __, 1
+	note C_, 2
+	note __, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note A_, 3
-	note __, 3
+	note A_, 4
+	note __, 4
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note G#, 7
-	note F_, 3
-	note C_, 6
-	note G#, 0
-	note A_, 0
-	note A#, 6
-	note G#, 3
-	note __, 3
+	note G#, 8
+	note F_, 4
+	note C_, 7
+	note G#, 1
+	note A_, 1
+	note A#, 7
+	note G#, 4
+	note __, 4
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note G_, 3
-	note E_, 3
-	note C_, 3
-	note E_, 3
-	note G_, 3
+	note G_, 4
+	note E_, 4
+	note C_, 4
+	note E_, 4
+	note G_, 4
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 5
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
 	octave 4
-	note A_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
 	octave 5
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
 	octave 4
-	note A_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
 	octave 5
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
 	octave 4
-	note A_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
 	octave 5
-	note D_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
 	octave 6
-	note C_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
 	endchannel
 ; 1f4ed
 
 Music_Credits_branch_1f4ed: ; 1f4ed
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note D_, 3
-	note G_, 3
-	note B_, 7
+	note D_, 4
+	note G_, 4
+	note B_, 8
 	octave 4
-	note D_, 3
-	note C_, 3
-	note D#, 3
+	note D_, 4
+	note C_, 4
+	note D#, 4
 	endchannel
 ; 1f4f8
 
 Music_Credits_branch_1f4f8: ; 1f4f8
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note E_, 1
-	note C_, 1
-	note E_, 1
-	note D_, 1
-	note E_, 1
-	note C_, 1
-	note E_, 1
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note C_, 2
+	note E_, 2
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note E_, 1
-	note D_, 1
-	note E_, 1
-	note A_, 3
-	note B_, 1
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note A_, 4
+	note B_, 2
 	octave 5
-	note C_, 1
+	note C_, 2
 	octave 4
-	note B_, 1
-	note G_, 1
-	note F_, 1
-	note D_, 1
-	note G_, 1
-	note F_, 1
-	note D_, 1
+	note B_, 2
+	note G_, 2
+	note F_, 2
+	note D_, 2
+	note G_, 2
+	note F_, 2
+	note D_, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note F_, 1
-	note D_, 1
+	note F_, 2
+	note D_, 2
 	octave 3
-	note B_, 1
-	note G_, 1
-	note B_, 1
+	note B_, 2
+	note G_, 2
+	note B_, 2
 	octave 4
-	note D_, 1
-	note F_, 1
-	note F#, 1
+	note D_, 2
+	note F_, 2
+	note F#, 2
 	octave 3
-	note G_, 1
+	note G_, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note D_, 1
-	note C_, 1
-	note D_, 1
+	note D_, 2
+	note C_, 2
+	note D_, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note G_, 1
+	note G_, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note D_, 1
-	note G_, 3
-	note A_, 1
-	note B_, 1
+	note D_, 2
+	note G_, 4
+	note A_, 2
+	note B_, 2
 	octave 3
-	note A_, 3
+	note A_, 4
 	octave 4
-	note C_, 3
-	note E_, 3
+	note C_, 4
+	note E_, 4
 	octave 3
-	note G#, 7
+	note G#, 8
 	octave 4
-	note C_, 7
-	note E_, 3
+	note C_, 8
+	note E_, 4
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note F_, 1
-	note C_, 1
-	note F_, 1
-	note D_, 1
-	note F_, 1
-	note C_, 1
-	note F_, 1
+	note F_, 2
+	note C_, 2
+	note F_, 2
+	note D_, 2
+	note F_, 2
+	note C_, 2
+	note F_, 2
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note F_, 1
-	note C_, 1
-	note F_, 1
-	note E_, 1
-	note F_, 1
-	note C_, 1
-	note F_, 1
+	note F_, 2
+	note C_, 2
+	note F_, 2
+	note E_, 2
+	note F_, 2
+	note C_, 2
+	note F_, 2
 	endchannel
 ; 1f559
 
 Music_Credits_branch_1f559: ; 1f559
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note F#, 1
-	note C_, 1
-	note F#, 1
-	note D_, 1
-	note F#, 1
-	note C_, 1
-	note F#, 1
-	note E_, 1
-	note F#, 1
-	note C_, 1
-	note F#, 1
+	note F#, 2
+	note C_, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
+	note C_, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note C_, 2
+	note F#, 2
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note F#, 1
-	note C_, 1
-	note F#, 1
-	note C_, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
-	note F_, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
-	note F_, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
-	note C_, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
+	note F#, 2
+	note C_, 2
+	note F#, 2
+	note C_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note F_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note F_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
 	octave 3
-	note B_, 11
-	note A#, 1
-	note A_, 1
+	note B_, 12
+	note A#, 2
+	note A_, 2
 	endchannel
 ; 1f582
 
 Music_Credits_branch_1f582: ; 1f582
-	note __, 5
+	note __, 6
 	octave 3
-	note D_, 5
-	note E_, 5
-	note F_, 5
-	note F#, 5
-	note A_, 5
+	note D_, 6
+	note E_, 6
+	note F_, 6
+	note F#, 6
+	note A_, 6
 	octave 4
-	note F#, 5
-	note C#, 5
+	note F#, 6
+	note C#, 6
 	endchannel
 
 Music_Credits_Ch2: ; 1f58d
@@ -570,100 +570,100 @@
 	notetype $c, $2f
 	stereopanning $f0
 	octave 4
-	note G_, 15
+	note G_, 16
 	intensity $c7
 	octave 5
-	note G_, 7
+	note G_, 8
 	octave 3
-	note G_, 3
-	note F_, 3
+	note G_, 4
+	note F_, 4
 	notetype $6, $c7
 	callchannel Music_Credits_branch_1f6cb
 	octave 1
-	note G_, 1
-	note __, 1
+	note G_, 2
+	note __, 2
 	octave 2
-	note G_, 1
-	note __, 1
-	note F#, 1
-	note G_, 1
-	note __, 1
+	note G_, 2
+	note __, 2
+	note F#, 2
+	note G_, 2
+	note __, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note G_, 1
-	note __, 1
-	note G_, 1
-	note __, 1
-	note G_, 1
+	note G_, 2
+	note __, 2
+	note G_, 2
+	note __, 2
+	note G_, 2
 	intensity $97
-	note F#, 0
-	note F_, 0
-	note E_, 0
-	note D#, 0
-	note D_, 0
-	note C#, 0
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
 	intensity $c7
 	callchannel Music_Credits_branch_1f6cb
 	callchannel Music_Credits_branch_1f73f
 	callchannel Music_Credits_branch_1f748
 	octave 4
-	note B_, 0
+	note B_, 1
 	octave 5
-	note C_, 10
+	note C_, 11
 	octave 4
-	note B_, 7
-	note A_, 7
-	note B_, 3
-	note F#, 0
-	note G_, 14
+	note B_, 8
+	note A_, 8
+	note B_, 4
+	note F#, 1
+	note G_, 15
 	notetype $c, $c7
 	octave 5
-	note E_, 14
+	note E_, 15
 	notetype $6, $c7
-	note G_, 0
-	note G#, 0
-	note A_, 1
-	note E_, 1
-	note C_, 1
+	note G_, 1
+	note G#, 1
+	note A_, 2
+	note E_, 2
+	note C_, 2
 	octave 4
-	note A_, 1
+	note A_, 2
 	octave 5
-	note E_, 1
-	note C_, 1
+	note E_, 2
+	note C_, 2
 	octave 4
-	note A_, 1
-	note E_, 1
+	note A_, 2
+	note E_, 2
 	callchannel Music_Credits_branch_1f748
 	octave 4
-	note B_, 0
+	note B_, 1
 	octave 5
-	note C_, 10
+	note C_, 11
 	octave 4
-	note B_, 7
+	note B_, 8
 	octave 5
-	note C_, 11
+	note C_, 12
 	notetype $c, $c7
-	note D_, 15
-	note G_, 7
+	note D_, 16
+	note G_, 8
 	octave 3
-	note G_, 3
-	note F_, 3
+	note G_, 4
+	note F_, 4
 	octave 5
-	note A_, 0
-	note E_, 0
-	note C#, 0
+	note A_, 1
+	note E_, 1
+	note C#, 1
 	octave 4
-	note A_, 0
+	note A_, 1
 	octave 5
-	note E_, 0
-	note C#, 0
+	note E_, 1
+	note C#, 1
 	octave 4
-	note A_, 0
-	note E_, 0
+	note A_, 1
+	note E_, 1
 	octave 3
-	note A_, 3
-	note G_, 3
+	note A_, 4
+	note G_, 4
 	notetype $6, $c7
 	forceoctave $2
 	callchannel Music_Credits_branch_1f6cb
@@ -671,316 +671,316 @@
 	callchannel Music_Credits_branch_1f748
 	forceoctave $0
 	octave 5
-	note C#, 0
-	note D_, 10
-	note C#, 7
+	note C#, 1
 	note D_, 11
+	note C#, 8
+	note D_, 12
 	notetype $c, $c7
-	note E_, 15
-	note A_, 13
+	note E_, 16
+	note A_, 14
 	notetype $8, $c7
 	octave 2
-	note D_, 0
-	note D_, 0
-	note D_, 0
-	note D_, 5
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	note D_, 6
 	octave 3
-	note F#, 5
-	note G_, 5
-	note G#, 5
-	note A_, 5
+	note F#, 6
+	note G_, 6
+	note G#, 6
+	note A_, 6
 	octave 4
-	note C#, 5
-	note A_, 5
-	note G_, 5
-	note G_, 5
-	note F#, 5
-	note F#, 5
-	note E_, 5
-	note E_, 5
-	note D_, 5
-	note C#, 5
-	note E_, 5
+	note C#, 6
+	note A_, 6
+	note G_, 6
+	note G_, 6
+	note F#, 6
+	note F#, 6
+	note E_, 6
+	note E_, 6
+	note D_, 6
+	note C#, 6
+	note E_, 6
 	octave 1
-	note D_, 2
-	note __, 2
-	note D_, 2
-	note __, 2
-	note D_, 2
-	note __, 2
-	note D_, 2
-	note __, 2
-	note F#, 2
-	note __, 2
-	note F#, 2
-	note __, 2
-	note F#, 2
+	note D_, 3
+	note __, 3
+	note D_, 3
+	note __, 3
+	note D_, 3
+	note __, 3
+	note D_, 3
+	note __, 3
+	note F#, 3
+	note __, 3
+	note F#, 3
+	note __, 3
+	note F#, 3
 	notetype $c, $c7
 	octave 2
-	note F#, 0
-	note __, 0
-	octave 1
 	note F#, 1
+	note __, 1
+	octave 1
+	note F#, 2
 	octave 2
-	note F#, 0
-	note __, 0
+	note F#, 1
+	note __, 1
 
 Music_Credits_branch_1f657: ; 1f657
 	octave 1
-	note G_, 1
+	note G_, 2
 	octave 2
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	loopchannel 4, Music_Credits_branch_1f657
 	octave 1
-	note A_, 0
+	note A_, 1
 	octave 2
-	note A_, 0
-	note E_, 0
-	note A_, 0
+	note A_, 1
+	note E_, 1
+	note A_, 1
 	octave 1
-	note A_, 0
+	note A_, 1
 	octave 2
-	note A_, 0
-	note E_, 0
-	note A_, 0
+	note A_, 1
+	note E_, 1
+	note A_, 1
 	octave 1
-	note A_, 0
+	note A_, 1
 	octave 3
-	note C#, 0
-	note E_, 0
-	note G_, 0
-	note E_, 0
-	note G_, 0
-	note A_, 0
+	note C#, 1
+	note E_, 1
+	note G_, 1
+	note E_, 1
+	note G_, 1
+	note A_, 1
 	octave 4
-	note C#, 0
+	note C#, 1
 	octave 5
-	note D_, 11
+	note D_, 12
 	notetype $8, $c7
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note C#, 0
-	note __, 0
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note C#, 1
+	note __, 1
 	notetype $c, $c7
-	note D_, 11
+	note D_, 12
 	notetype $8, $c7
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note C#, 0
-	note __, 0
-	note D_, 8
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	note D_, 9
 	notetype $c, $c7
 	octave 4
-	note F#, 0
-	note A_, 0
+	note F#, 1
+	note A_, 1
 	octave 5
-	note D_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
 	notetype $8, $c7
-	note D_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
 	notetype $c, $c7
-	note C_, 0
-	note __, 2
-	note C_, 0
-	note __, 2
+	note C_, 1
+	note __, 3
+	note C_, 1
+	note __, 3
 	notetype $8, $c7
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note C#, 0
-	note __, 0
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note C#, 1
+	note __, 1
 	notetype $c, $c7
-	note D_, 0
-	note __, 6
+	note D_, 1
+	note __, 7
 	intensity $c8
 	intensity $c7
 	octave 1
-	note D_, 15
+	note D_, 16
 	intensity $c7
-	note __, 15
-	note __, 15
-	note __, 15
+	note __, 16
+	note __, 16
+	note __, 16
 	endchannel
 ; 1f6cb
 
 Music_Credits_branch_1f6cb: ; 1f6cb
 	octave 2
-	note C_, 3
+	note C_, 4
 	intensity $b1
 	octave 5
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
 	note G_, 1
 	note __, 1
+	note G_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note G_, 2
+	note __, 2
 	intensity $c7
 	octave 2
-	note C_, 0
-	note __, 0
-	note C_, 3
-	note __, 11
+	note C_, 1
+	note __, 1
+	note C_, 4
+	note __, 12
 	octave 1
-	note B_, 3
-	note __, 9
-	note B_, 0
-	note __, 0
+	note B_, 4
+	note __, 10
 	note B_, 1
 	note __, 1
-	note B_, 1
-	note __, 1
+	note B_, 2
+	note __, 2
+	note B_, 2
+	note __, 2
 	octave 2
-	note G_, 1
+	note G_, 2
 	octave 1
-	note B_, 5
-	note A#, 3
+	note B_, 6
+	note A#, 4
 	intensity $b1
 	octave 5
-	note E_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note D#, 0
-	note __, 0
 	note E_, 1
 	note __, 1
+	note E_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note E_, 2
+	note __, 2
 	intensity $c7
 	octave 1
-	note A#, 0
-	note __, 0
-	note A#, 3
-	note __, 11
-	note A_, 3
-	note __, 9
-	note A_, 0
-	note __, 0
-	note A_, 1
+	note A#, 1
 	note __, 1
+	note A#, 4
+	note __, 12
+	note A_, 4
+	note __, 10
 	note A_, 1
 	note __, 1
+	note A_, 2
+	note __, 2
+	note A_, 2
+	note __, 2
 	octave 2
-	note F_, 1
+	note F_, 2
 	octave 1
-	note A_, 5
-	note G#, 3
+	note A_, 6
+	note G#, 4
 	intensity $b1
 	octave 5
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	octave 4
-	note B_, 0
-	note __, 0
-	octave 5
 	note C_, 1
 	note __, 1
+	note C_, 1
+	note __, 1
+	octave 4
+	note B_, 1
+	note __, 1
+	octave 5
+	note C_, 2
+	note __, 2
 	intensity $c7
 	octave 1
-	note G#, 0
-	note __, 0
-	note G#, 3
-	note __, 11
-	note G_, 3
-	note __, 9
-	note G_, 0
-	note __, 0
-	note G_, 1
+	note G#, 1
 	note __, 1
+	note G#, 4
+	note __, 12
+	note G_, 4
+	note __, 10
 	note G_, 1
 	note __, 1
+	note G_, 2
+	note __, 2
+	note G_, 2
+	note __, 2
 	octave 2
-	note E_, 1
+	note E_, 2
 	octave 1
-	note G_, 5
-	note F#, 3
-	note __, 1
-	note F#, 1
-	note F#, 1
+	note G_, 6
+	note F#, 4
+	note __, 2
+	note F#, 2
+	note F#, 2
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note F#, 3
-	note A_, 1
+	note F#, 4
+	note A_, 2
 	octave 2
-	note D_, 1
-	note F#, 1
-	note A_, 1
-	note D_, 1
-	note F#, 1
-	note A_, 1
+	note D_, 2
+	note F#, 2
+	note A_, 2
+	note D_, 2
+	note F#, 2
+	note A_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	endchannel
 ; 1f73f
 
 Music_Credits_branch_1f73f: ; 1f73f
 	octave 1
-	note G_, 3
-	note __, 3
-	note G_, 1
-	note __, 1
+	note G_, 4
+	note __, 4
+	note G_, 2
+	note __, 2
 	octave 2
-	note G_, 11
-	note F#, 7
+	note G_, 12
+	note F#, 8
 	endchannel
 ; 1f748
 
 Music_Credits_branch_1f748: ; 1f748
 	octave 4
-	note A_, 7
-	note B_, 7
+	note A_, 8
+	note B_, 8
 	octave 5
-	note C_, 7
-	note E_, 7
+	note C_, 8
+	note E_, 8
 	notetype $c, $c7
-	note D_, 15
+	note D_, 16
 	octave 4
-	note G_, 3
-	note A_, 3
-	note B_, 3
+	note G_, 4
+	note A_, 4
+	note B_, 4
 	octave 5
-	note D_, 3
-	note C_, 9
+	note D_, 4
+	note C_, 10
 	notetype $6, $c7
 	octave 4
-	note B_, 0
+	note B_, 1
 	octave 5
-	note C_, 2
+	note C_, 3
 	octave 4
-	note B_, 3
+	note B_, 4
 	octave 5
-	note C_, 3
+	note C_, 4
 	notetype $c, $c7
 	octave 4
-	note A_, 9
+	note A_, 10
 	notetype $6, $c7
-	note G#, 0
-	note A_, 2
-	note B_, 3
+	note G#, 1
+	note A_, 3
+	note B_, 4
 	octave 5
-	note C_, 3
+	note C_, 4
 	endchannel
 
 Music_Credits_Ch3: ; 1f772
@@ -988,158 +988,158 @@
 	notetype $c, $34
 	stereopanning $ff
 	octave 6
-	note G_, 0
-	note D_, 0
-	note C_, 0
+	note G_, 1
+	note D_, 1
+	note C_, 1
 	octave 5
-	note G_, 0
+	note G_, 1
 	octave 6
-	note G_, 0
-	note D_, 0
-	note C_, 0
+	note G_, 1
+	note D_, 1
+	note C_, 1
 	octave 5
-	note G_, 0
+	note G_, 1
 	intensity $24
 	octave 6
-	note G_, 0
-	note D_, 0
-	note C_, 0
+	note G_, 1
+	note D_, 1
+	note C_, 1
 	octave 5
-	note G_, 0
+	note G_, 1
 	intensity $14
 	octave 6
-	note G_, 0
-	note D_, 0
-	note C_, 0
+	note G_, 1
+	note D_, 1
+	note C_, 1
 	octave 5
-	note G_, 0
+	note G_, 1
 	octave 6
-	note G_, 0
-	note D_, 0
+	note G_, 1
+	note D_, 1
 	octave 5
-	note B_, 0
-	note G_, 0
+	note B_, 1
+	note G_, 1
 	octave 6
-	note D_, 0
+	note D_, 1
 	octave 5
-	note B_, 0
-	note G_, 0
-	note D_, 0
+	note B_, 1
+	note G_, 1
+	note D_, 1
 	notetype $6, $14
-	note D#, 0
-	note E_, 6
-	note F_, 7
+	note D#, 1
+	note E_, 7
+	note F_, 8
 	callchannel Music_Credits_branch_1f8aa
 	octave 4
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 5
-	note G_, 0
-	note __, 0
-	note F#, 0
-	note G_, 0
-	note __, 0
-	note F#, 0
-	note G_, 0
+	note G_, 1
+	note __, 1
+	note F#, 1
+	note G_, 1
+	note __, 1
+	note F#, 1
+	note G_, 1
 	notetype $6, $14
 	intensity $24
-	note F_, 0
-	note E_, 0
+	note F_, 1
+	note E_, 1
 	intensity $14
-	note E_, 3
-	note __, 3
-	note F_, 3
+	note E_, 4
+	note __, 4
+	note F_, 4
 	callchannel Music_Credits_branch_1f8aa
 	callchannel Music_Credits_branch_1f8db
 	callchannel Music_Credits_branch_1f8e7
 	callchannel Music_Credits_branch_1f934
 	octave 2
-	note G_, 3
-	note __, 1
-	note G_, 0
-	note __, 0
+	note G_, 4
+	note __, 2
 	note G_, 1
-	octave 3
-	note G_, 1
 	note __, 1
+	note G_, 2
+	octave 3
+	note G_, 2
+	note __, 2
 	octave 2
-	note G_, 0
-	note __, 0
 	note G_, 1
+	note __, 1
+	note G_, 2
 	octave 3
-	note G_, 1
+	note G_, 2
 	octave 2
-	note G_, 3
-	note B_, 1
+	note G_, 4
+	note B_, 2
 	octave 3
-	note D_, 1
-	note F#, 1
-	note G_, 1
+	note D_, 2
+	note F#, 2
+	note G_, 2
 	octave 2
-	note E_, 3
-	note __, 1
-	note E_, 0
-	note __, 0
+	note E_, 4
+	note __, 2
 	note E_, 1
-	octave 3
-	note E_, 1
 	note __, 1
+	note E_, 2
+	octave 3
+	note E_, 2
+	note __, 2
 	octave 2
-	note E_, 0
-	note __, 0
 	note E_, 1
+	note __, 1
+	note E_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note E_, 3
-	note G#, 1
-	note B_, 1
+	note E_, 4
+	note G#, 2
+	note B_, 2
 	octave 3
-	note D#, 1
-	note E_, 1
+	note D#, 2
+	note E_, 2
 	octave 2
-	note A_, 3
+	note A_, 4
 	octave 3
-	note E_, 1
-	note __, 1
+	note E_, 2
+	note __, 2
 	octave 2
-	note G#, 1
+	note G#, 2
 	octave 3
-	note E_, 1
-	note __, 1
+	note E_, 2
+	note __, 2
 	octave 2
-	note G#, 1
-	note G_, 1
+	note G#, 2
+	note G_, 2
 	octave 3
-	note E_, 1
-	note __, 1
+	note E_, 2
+	note __, 2
 	octave 2
-	note G_, 1
-	note F#, 3
+	note G_, 2
+	note F#, 4
 	octave 3
-	note E_, 3
+	note E_, 4
 	callchannel Music_Credits_branch_1f8e7
 	callchannel Music_Credits_branch_1f934
 	callchannel Music_Credits_branch_1f94b
 	octave 5
-	note D#, 0
-	note E_, 6
-	note F_, 7
+	note D#, 1
+	note E_, 7
+	note F_, 8
 	octave 2
-	note A_, 1
-	note __, 1
+	note A_, 2
+	note __, 2
 	octave 3
-	note E_, 1
-	note __, 1
-	note A_, 1
-	note __, 1
+	note E_, 2
+	note __, 2
+	note A_, 2
+	note __, 2
 	octave 4
-	note C#, 1
-	note __, 1
+	note C#, 2
+	note __, 2
 	octave 5
-	note F_, 0
-	note F#, 6
-	note G_, 7
+	note F_, 1
+	note F#, 7
+	note G_, 8
 	forceoctave $2
 	callchannel Music_Credits_branch_1f8aa
 	callchannel Music_Credits_branch_1f8db
@@ -1150,328 +1150,328 @@
 	callchannel Music_Credits_branch_1f94b
 	forceoctave $0
 	octave 6
-	note C#, 1
+	note C#, 2
 	octave 5
-	note A_, 1
-	note E_, 1
-	note C#, 1
-	note A_, 1
-	note E_, 1
+	note A_, 2
+	note E_, 2
+	note C#, 2
+	note A_, 2
+	note E_, 2
 	notetype $8, $14
 	octave 2
-	note D_, 0
-	note D_, 0
-	note D_, 0
+	note D_, 1
+	note D_, 1
+	note D_, 1
 	notetype $c, $14
-	note D_, 15
-	note F#, 15
-	note G_, 15
-	note G_, 7
-	note A_, 7
-	note __, 3
+	note D_, 16
+	note F#, 16
+	note G_, 16
+	note G_, 8
+	note A_, 8
+	note __, 4
 	octave 4
-	note F#, 3
-	note G_, 3
-	note G#, 3
-	note A_, 3
+	note F#, 4
+	note G_, 4
+	note G#, 4
+	note A_, 4
 	octave 5
-	note C#, 3
-	note A_, 3
-	note G_, 3
-	note G_, 3
-	note F#, 3
-	note E_, 3
-	note G_, 3
-	note A_, 3
-	note B_, 3
+	note C#, 4
+	note A_, 4
+	note G_, 4
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note G_, 4
+	note A_, 4
+	note B_, 4
 	octave 6
-	note C#, 3
-	note E_, 3
+	note C#, 4
+	note E_, 4
 	intensity $15
 	octave 4
-	note D_, 5
-	note F#, 1
-	note A_, 7
-	note E_, 5
-	note G_, 1
+	note D_, 6
+	note F#, 2
+	note A_, 8
+	note E_, 6
+	note G_, 2
 	octave 5
-	note C_, 5
+	note C_, 6
 	octave 4
-	note B_, 0
-	note A#, 0
-	note A_, 7
+	note B_, 1
+	note A#, 1
+	note A_, 8
 	intensity $14
 	octave 2
-	note A_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
 	notetype $8, $14
 	octave 3
-	note F#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
+	note F#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
 	notetype $c, $14
 	octave 5
-	note G_, 0
-	note __, 2
-	note E_, 0
-	note __, 2
+	note G_, 1
+	note __, 3
+	note E_, 1
+	note __, 3
 	notetype $8, $14
-	note E_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note G#, 0
-	note __, 0
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note G#, 1
+	note __, 1
 	notetype $c, $14
-	note A_, 0
-	note __, 15
-	note __, 15
-	note __, 15
+	note A_, 1
+	note __, 16
+	note __, 16
+	note __, 16
 	endchannel
 ; 1f8aa
 
 Music_Credits_branch_1f8aa: ; 1f8aa
-	note G_, 15
+	note G_, 16
 	octave 6
-	note C#, 0
-	note D_, 2
-	note C_, 3
+	note C#, 1
+	note D_, 3
+	note C_, 4
 	octave 5
-	note B_, 3
+	note B_, 4
 	octave 6
-	note C_, 3
+	note C_, 4
 	notetype $c, $14
 	octave 5
-	note G_, 9
-	note E_, 1
-	note __, 1
-	note F_, 1
-	note G_, 9
+	note G_, 10
+	note E_, 2
+	note __, 2
+	note F_, 2
+	note G_, 10
 	notetype $6, $14
-	note G#, 0
-	note A_, 6
-	note E_, 3
-	note G_, 11
-	note F_, 7
-	note D_, 3
-	note __, 3
-	note E_, 3
+	note G#, 1
+	note A_, 7
+	note E_, 4
+	note G_, 12
+	note F_, 8
+	note D_, 4
+	note __, 4
+	note E_, 4
 	notetype $c, $14
-	note F_, 9
+	note F_, 10
 	notetype $6, $14
-	note F#, 0
-	note G_, 6
-	note F_, 3
-	note E_, 3
-	note D#, 3
-	note E_, 3
-	note B_, 11
-	note A_, 7
+	note F#, 1
+	note G_, 7
+	note F_, 4
+	note E_, 4
+	note D#, 4
+	note E_, 4
+	note B_, 12
+	note A_, 8
 	notetype $c, $14
-	note D_, 15
+	note D_, 16
 	endchannel
 ; 1f8db
 
 Music_Credits_branch_1f8db: ; 1f8db
 	notetype $6, $14
-	note F#, 0
-	note G_, 2
-	octave 4
+	note F#, 1
 	note G_, 3
+	octave 4
+	note G_, 4
 	octave 5
-	note D_, 3
-	note G_, 11
-	note G#, 7
+	note D_, 4
+	note G_, 12
+	note G#, 8
 	endchannel
 ; 1f8e7
 
 Music_Credits_branch_1f8e7: ; 1f8e7
 	octave 3
-	note F_, 3
-	note __, 1
-	note F_, 1
-	note __, 1
+	note F_, 4
+	note __, 2
+	note F_, 2
+	note __, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note A_, 1
-	note F_, 1
+	note A_, 2
+	note F_, 2
 	octave 4
-	note C_, 1
-	note __, 1
-	note C_, 1
-	note __, 1
+	note C_, 2
+	note __, 2
+	note C_, 2
+	note __, 2
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note F_, 3
-	note G_, 3
-	note __, 1
-	note G_, 1
-	note __, 1
+	note F_, 4
+	note G_, 4
+	note __, 2
+	note G_, 2
+	note __, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note B_, 1
-	note G_, 1
+	note B_, 2
+	note G_, 2
 	octave 4
-	note D_, 1
-	note __, 1
-	note D_, 1
-	note __, 1
+	note D_, 2
+	note __, 2
+	note D_, 2
+	note __, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note G_, 3
-	note E_, 3
-	note __, 1
-	note E_, 1
-	note __, 1
-	note B_, 1
-	note G_, 1
-	note E_, 1
-	note B_, 1
-	note __, 1
-	note B_, 1
-	note __, 1
-	note G_, 1
-	note B_, 1
-	note E_, 3
-	note A_, 3
-	note __, 1
-	note A_, 1
-	note __, 1
+	note G_, 4
+	note E_, 4
+	note __, 2
+	note E_, 2
+	note __, 2
+	note B_, 2
+	note G_, 2
+	note E_, 2
+	note B_, 2
+	note __, 2
+	note B_, 2
+	note __, 2
+	note G_, 2
+	note B_, 2
+	note E_, 4
+	note A_, 4
+	note __, 2
+	note A_, 2
+	note __, 2
 	octave 4
-	note E_, 1
-	note C_, 1
+	note E_, 2
+	note C_, 2
 	octave 3
-	note G#, 1
+	note G#, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G#, 1
-	note __, 1
-	note G#, 1
+	note G#, 2
+	note __, 2
+	note G#, 2
 	octave 4
-	note C_, 1
-	note E_, 1
-	note C_, 1
+	note C_, 2
+	note E_, 2
+	note C_, 2
 	octave 3
-	note G#, 1
+	note G#, 2
 	endchannel
 ; 1f934
 
 Music_Credits_branch_1f934: ; 1f934
 	octave 2
-	note F_, 3
-	note __, 1
-	note F_, 0
-	note __, 0
+	note F_, 4
+	note __, 2
 	note F_, 1
-	octave 3
-	note F_, 1
 	note __, 1
+	note F_, 2
+	octave 3
+	note F_, 2
+	note __, 2
 	octave 2
-	note F_, 0
-	note __, 0
 	note F_, 1
+	note __, 1
+	note F_, 2
 	octave 3
-	note F_, 1
+	note F_, 2
 	octave 2
-	note F_, 3
-	note A_, 1
+	note F_, 4
+	note A_, 2
 	octave 3
-	note C_, 1
-	note E_, 1
-	note F_, 1
+	note C_, 2
+	note E_, 2
+	note F_, 2
 	endchannel
 ; 1f94b
 
 Music_Credits_branch_1f94b: ; 1f94b
 	octave 2
-	note F#, 3
-	note __, 1
-	note F#, 0
-	note __, 0
+	note F#, 4
+	note __, 2
 	note F#, 1
-	octave 3
-	note F#, 1
 	note __, 1
+	note F#, 2
+	octave 3
+	note F#, 2
+	note __, 2
 	octave 2
-	note F#, 0
-	note __, 0
 	note F#, 1
+	note __, 1
+	note F#, 2
 	octave 3
-	note F#, 1
+	note F#, 2
 	octave 2
-	note F#, 3
-	note A_, 1
+	note F#, 4
+	note A_, 2
 	octave 3
-	note C_, 1
-	note F_, 1
-	note F#, 1
-	note G_, 7
+	note C_, 2
+	note F_, 2
+	note F#, 2
+	note G_, 8
 	octave 4
-	note C_, 7
-	note D_, 7
-	note F_, 7
+	note C_, 8
+	note D_, 8
+	note F_, 8
 	octave 6
-	note G_, 1
-	note D_, 1
+	note G_, 2
+	note D_, 2
 	octave 5
-	note B_, 1
-	note G_, 1
+	note B_, 2
+	note G_, 2
 	octave 6
-	note D_, 1
+	note D_, 2
 	octave 5
-	note B_, 1
-	note G_, 1
-	note D_, 1
+	note B_, 2
+	note G_, 2
+	note D_, 2
 	endchannel
 
 Music_Credits_Ch4: ; 1f973
 	togglenoise $3
 	notetype $c
-	note G#, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G#, 0
-	note G_, 0
-	note B_, 1
-	note G#, 0
-	note G_, 0
-	note G#, 0
-	note G_, 0
-	note A#, 3
-	note A#, 3
+	note G#, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G#, 1
+	note G_, 1
+	note B_, 2
+	note G#, 1
+	note G_, 1
+	note G#, 1
+	note G_, 1
+	note A#, 4
+	note A#, 4
 	callchannel Music_Credits_branch_1fa4d
 	callchannel Music_Credits_branch_1fa4d
 	callchannel Music_Credits_branch_1fa4d
@@ -1482,64 +1482,64 @@
 	callchannel Music_Credits_branch_1fa6d
 
 Music_Credits_branch_1f9a8: ; 1f9a8
-	note A#, 1
-	note G_, 0
-	note G_, 0
+	note A#, 2
+	note G_, 1
+	note G_, 1
+	note D_, 2
+	note G_, 1
+	note G_, 1
+	note A#, 2
+	note G_, 1
+	note G_, 1
+	note D_, 2
+	note F#, 2
+	loopchannel 7, Music_Credits_branch_1f9a8
+	note G#, 1
+	note G_, 1
 	note D_, 1
-	note G_, 0
-	note G_, 0
-	note A#, 1
-	note G_, 0
-	note G_, 0
+	note G_, 1
+	note G_, 1
 	note D_, 1
-	note F#, 1
-	loopchannel 7, Music_Credits_branch_1f9a8
-	note G#, 0
-	note G_, 0
-	note D_, 0
-	note G_, 0
-	note G_, 0
-	note D_, 0
-	note F#, 1
-	note D_, 0
-	note G_, 0
-	note D_, 0
-	note G_, 0
-	note C#, 0
-	note C#, 0
-	note D_, 0
-	note D_, 0
-
-Music_Credits_branch_1f9c6: ; 1f9c6
-	note A#, 1
-	note G_, 0
-	note G_, 0
+	note F#, 2
 	note D_, 1
-	note G_, 0
-	note G_, 0
-	note A#, 1
-	note G_, 0
-	note G_, 0
+	note G_, 1
 	note D_, 1
-	note F#, 1
+	note G_, 1
+	note C#, 1
+	note C#, 1
+	note D_, 1
+	note D_, 1
+
+Music_Credits_branch_1f9c6: ; 1f9c6
+	note A#, 2
+	note G_, 1
+	note G_, 1
+	note D_, 2
+	note G_, 1
+	note G_, 1
+	note A#, 2
+	note G_, 1
+	note G_, 1
+	note D_, 2
+	note F#, 2
 	loopchannel 7, Music_Credits_branch_1f9c6
-	note G#, 0
-	note G_, 0
-	note F#, 1
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note A#, 3
-	note C#, 3
-	note G#, 0
-	note G_, 0
-	note B_, 1
-	note G#, 0
-	note G_, 0
-	note B_, 1
-	note A#, 3
-	note A#, 3
+	note G#, 1
+	note G_, 1
+	note F#, 2
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note A#, 4
+	note C#, 4
+	note G#, 1
+	note G_, 1
+	note B_, 2
+	note G#, 1
+	note G_, 1
+	note B_, 2
+	note A#, 4
+	note A#, 4
 	callchannel Music_Credits_branch_1fa4d
 	callchannel Music_Credits_branch_1fa4d
 	callchannel Music_Credits_branch_1fa4d
@@ -1546,152 +1546,152 @@
 	callchannel Music_Credits_branch_1fa6d
 
 Music_Credits_branch_1f9f2: ; 1f9f2
-	note A#, 1
-	note G_, 0
-	note G_, 0
-	note D_, 1
-	note G_, 0
-	note G_, 0
-	note A#, 1
-	note G_, 0
-	note G_, 0
-	note D_, 1
-	note F#, 1
+	note A#, 2
+	note G_, 1
+	note G_, 1
+	note D_, 2
+	note G_, 1
+	note G_, 1
+	note A#, 2
+	note G_, 1
+	note G_, 1
+	note D_, 2
+	note F#, 2
 	loopchannel 7, Music_Credits_branch_1f9f2
-	note G#, 0
-	note G_, 0
-	note F#, 1
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 6
+	note G#, 1
+	note G_, 1
+	note F#, 2
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 7
 	notetype $8
-	note A#, 0
-	note A#, 0
-	note A#, 0
+	note A#, 1
+	note A#, 1
+	note A#, 1
 	notetype $c
+	note B_, 16
+	note __, 16
 	note B_, 15
-	note __, 15
-	note B_, 14
-	note __, 0
-	note B_, 7
-	note B_, 7
-	note B_, 15
-	note __, 15
-	note B_, 15
-	note B_, 7
-	note B_, 5
-	note D_, 0
-	note D_, 0
-	note B_, 11
-	notetype $8
+	note __, 1
+	note B_, 8
+	note B_, 8
+	note B_, 16
+	note __, 16
+	note B_, 16
+	note B_, 8
+	note B_, 6
 	note D_, 1
 	note D_, 1
-	note D_, 1
+	note B_, 12
+	notetype $8
+	note D_, 2
+	note D_, 2
+	note D_, 2
 	notetype $c
-	note B_, 11
+	note B_, 12
 	notetype $8
+	note D_, 2
+	note D_, 2
+	note D_, 2
+	note B_, 12
+	notetype $c
 	note D_, 1
+	note __, 1
 	note D_, 1
-	note D_, 1
-	note B_, 11
-	notetype $c
-	note D_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
+	note __, 1
 	notetype $8
-	note C#, 1
-	note C#, 1
-	note D_, 1
+	note C#, 2
+	note C#, 2
+	note D_, 2
 	notetype $c
-	note D_, 0
-	note __, 2
-	note D_, 0
-	note __, 2
-	notetype $8
-	note C#, 1
-	note C#, 1
-	note C#, 1
 	note D_, 1
+	note __, 3
 	note D_, 1
-	note D_, 1
+	note __, 3
+	notetype $8
+	note C#, 2
+	note C#, 2
+	note C#, 2
+	note D_, 2
+	note D_, 2
+	note D_, 2
 	notetype $c
-	note D_, 0
-	note __, 6
-	note A#, 7
-	note __, 15
-	note __, 15
-	note __, 15
+	note D_, 1
+	note __, 7
+	note A#, 8
+	note __, 16
+	note __, 16
+	note __, 16
 	endchannel
 ; 1fa4d
 
 Music_Credits_branch_1fa4d: ; 1fa4d
-	note G#, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note D_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G#, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note D_, 0
-	note G_, 0
-	note F#, 1
+	note G#, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G#, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note F#, 2
 	endchannel
 ; 1fa6d
 
 Music_Credits_branch_1fa6d: ; 1fa6d
-	note G#, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note D_, 0
-	note G_, 0
-	note D_, 0
-	note G_, 0
-	note G#, 0
-	note G_, 0
-	note D_, 0
-	note G_, 0
-	note G#, 0
-	note D_, 0
-	note F#, 1
-	note D_, 0
-	note G_, 0
-	note D_, 0
-	note G_, 0
-	note D_, 0
-	note D_, 0
-	note A#, 0
-	note D_, 0
+	note G#, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note G#, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note G#, 1
+	note D_, 1
+	note F#, 2
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note D_, 1
+	note A#, 1
+	note D_, 1
 	endchannel
 ; 1fa8d
--- a/audio/music/crystalopening.asm
+++ b/audio/music/crystalopening.asm
@@ -15,112 +15,112 @@
 	stereopanning $f0
 	notetype $c, $92
 	octave 2
-	note F#, 1
-	note F#, 3
-	note F#, 1
-	note F#, 1
-	note F#, 3
-	note F#, 1
-	note F#, 1
-	note F#, 3
-	note F#, 1
-	note F#, 1
-	note F#, 5
+	note F#, 2
+	note F#, 4
+	note F#, 2
+	note F#, 2
+	note F#, 4
+	note F#, 2
+	note F#, 2
+	note F#, 4
+	note F#, 2
+	note F#, 2
+	note F#, 6
 	notetype $c, $b4
 	octave 2
-	note B_, 1
-	note F#, 1
-	note E_, 1
-	note B_, 1
+	note B_, 2
+	note F#, 2
+	note E_, 2
+	note B_, 2
 	octave 3
-	note C#, 1
+	note C#, 2
 	octave 2
-	note G#, 1
-	note F#, 1
+	note G#, 2
+	note F#, 2
 	octave 3
-	note C#, 1
+	note C#, 2
 	octave 2
-	note F#, 1
-	note C#, 1
+	note F#, 2
+	note C#, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note F#, 1
+	note F#, 2
 	octave 3
-	note F#, 1
+	note F#, 2
 	octave 2
-	note F#, 1
-	note B_, 1
+	note F#, 2
+	note B_, 2
 	octave 3
-	note E_, 1
-	note F#, 1
-	note E_, 1
+	note E_, 2
+	note F#, 2
+	note E_, 2
 	octave 2
-	note B_, 1
-	note F#, 1
-	note B_, 1
+	note B_, 2
+	note F#, 2
+	note B_, 2
 	octave 3
-	note E_, 1
-	note F#, 1
-	note E_, 1
+	note E_, 2
+	note F#, 2
+	note E_, 2
 	octave 2
-	note B_, 1
-	note F#, 1
-	note B_, 1
+	note B_, 2
+	note F#, 2
+	note B_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note D_, 7
+	note D_, 8
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note A_, 1
-	note G_, 1
+	note A_, 2
+	note G_, 2
 	octave 3
-	note D_, 1
-	note E_, 1
+	note D_, 2
+	note E_, 2
 	octave 2
-	note B_, 1
-	note A_, 1
+	note B_, 2
+	note A_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note A_, 1
-	note E_, 1
-	note D_, 1
-	note A_, 1
+	note A_, 2
+	note E_, 2
+	note D_, 2
+	note A_, 2
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note D_, 1
-	note E_, 1
-	note A_, 1
-	note E_, 1
-	note D_, 1
+	note D_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note D_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note D_, 1
-	note E_, 1
-	note A_, 1
-	note E_, 1
+	note D_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G_, 1
-	note F#, 1
+	note G_, 2
+	note F#, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	notetype $c, $a0
-	note D_, 7
-	note D_, 7
+	note D_, 8
+	note D_, 8
 	notetype $c, $a7
-	note D_, 7
+	note D_, 8
 	notetype $c, $b2
 	octave 2
-	note D_, 15
+	note D_, 16
 	endchannel
 
 Music_CrystalOpening_Ch2: ; 17877a
@@ -128,118 +128,118 @@
 	dutycycle $3
 	vibrato $8, $44
 	octave 2
-	note B_, 1
-	note B_, 3
-	note B_, 1
-	note B_, 1
-	note B_, 3
-	note B_, 1
-	note B_, 1
-	note B_, 3
-	note B_, 1
-	note B_, 1
-	note B_, 1
+	note B_, 2
+	note B_, 4
+	note B_, 2
+	note B_, 2
+	note B_, 4
+	note B_, 2
+	note B_, 2
+	note B_, 4
+	note B_, 2
+	note B_, 2
+	note B_, 2
 	notetype $c, $a2
 	octave 2
-	note E_, 0
-	note B_, 0
+	note E_, 1
+	note B_, 1
 	octave 3
-	note E_, 0
-	note F#, 0
+	note E_, 1
+	note F#, 1
 	notetype $c, $c7
-	note E_, 7
-	note F#, 7
+	note E_, 8
+	note F#, 8
 	octave 2
-	note B_, 7
+	note B_, 8
 	notetype $c, $b0
 	octave 3
-	note B_, 7
+	note B_, 8
 	notetype $c, $c7
-	note B_, 15
-	note __, 15
-	note G_, 7
-	note A_, 7
-	note D_, 7
+	note B_, 16
+	note __, 16
+	note G_, 8
+	note A_, 8
+	note D_, 8
 	notetype $c, $c7
 	octave 4
-	note D_, 7
+	note D_, 8
 	notetype $c, $7c
-	note D_, 7
+	note D_, 8
 	notetype $c, $c7
-	note D_, 7
-	note G_, 7
+	note D_, 8
+	note G_, 8
 	notetype $c, $b0
-	note F#, 7
-	note F#, 7
+	note F#, 8
+	note F#, 8
 	notetype $c, $c7
-	note F#, 7
+	note F#, 8
 	notetype $c, $c2
 	octave 3
-	note D_, 15
+	note D_, 16
 	endchannel
 
 Music_CrystalOpening_Ch3: ; 1787c8
 	notetype $c, $16
 	octave 1
-	note B_, 3
+	note B_, 4
 	notetype $6, $16
-	note B_, 0
-	note A#, 0
-	note A_, 0
-	note G#, 0
-	note G_, 0
-	note F#, 0
-	note F_, 0
-	note E_, 0
+	note B_, 1
+	note A#, 1
+	note A_, 1
+	note G#, 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
 	notetype $c, $16
-	note B_, 3
-	note B_, 3
-	note B_, 3
+	note B_, 4
+	note B_, 4
+	note B_, 4
 	notetype $6, $16
-	note B_, 0
-	note A#, 0
-	note A_, 0
-	note G#, 0
-	note G_, 0
-	note F#, 0
-	note F_, 0
-	note E_, 0
+	note B_, 1
+	note A#, 1
+	note A_, 1
+	note G#, 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
 	notetype $c, $16
-	note B_, 3
-	note B_, 3
+	note B_, 4
+	note B_, 4
 	octave 2
-	note B_, 7
-	note F#, 7
-	note D#, 7
-	note B_, 3
-	note F#, 3
-	note B_, 3
+	note B_, 8
+	note F#, 8
+	note D#, 8
+	note B_, 4
+	note F#, 4
+	note B_, 4
 	octave 3
-	note E_, 3
-	note F#, 3
-	note E_, 3
-	note D_, 3
-	note C#, 3
+	note E_, 4
+	note F#, 4
+	note E_, 4
+	note D_, 4
+	note C#, 4
 	octave 2
-	note A_, 7
+	note A_, 8
 	octave 3
-	note D_, 7
+	note D_, 8
 	octave 2
-	note A_, 7
-	note F#, 7
+	note A_, 8
+	note F#, 8
 	octave 3
-	note D_, 3
-	note E_, 3
-	note F#, 3
-	note E_, 3
-	note D_, 3
-	note C#, 3
-	note C_, 7
-	note D_, 7
-	note D_, 15
+	note D_, 4
+	note E_, 4
+	note F#, 4
+	note E_, 4
+	note D_, 4
+	note C#, 4
+	note C_, 8
+	note D_, 8
+	note D_, 16
 	octave 2
-	note D_, 0
-	note __, 14
+	note D_, 1
+	note __, 15
 	endchannel
 
 Music_CrystalOpening_Ch4: ; 178810
@@ -246,117 +246,117 @@
 	stereopanning $f
 	togglenoise $3
 	notetype $c
-	note __, 15
-	note __, 11
+	note __, 16
+	note __, 12
 	octave 2
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note D_, 3
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note D_, 4
 	notetype $8
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note D_, 5
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note D_, 2
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note D_, 6
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note D_, 3
 	notetype $c
-	note C#, 0
-	note C#, 0
-	note G_, 0
-	note G_, 0
-	note C#, 0
-	note C#, 0
 	note C#, 1
-	note C#, 0
-	note C#, 0
+	note C#, 1
 	note G_, 1
-	note D_, 0
-	note C#, 0
-	note A_, 0
-	note G_, 0
-	note D_, 0
-	note D_, 0
-	note G_, 0
-	note __, 0
-	note C#, 0
-	note C#, 0
-	note A_, 0
-	note G_, 0
-	note C#, 0
-	note D_, 0
-	note G_, 0
-	note G_, 0
-	note D_, 0
-	note D_, 0
+	note G_, 1
+	note C#, 1
+	note C#, 1
+	note C#, 2
+	note C#, 1
+	note C#, 1
+	note G_, 2
+	note D_, 1
+	note C#, 1
 	note A_, 1
+	note G_, 1
+	note D_, 1
+	note D_, 1
+	note G_, 1
+	note __, 1
 	note C#, 1
 	note C#, 1
+	note A_, 1
+	note G_, 1
 	note C#, 1
+	note D_, 1
+	note G_, 1
+	note G_, 1
+	note D_, 1
+	note D_, 1
+	note A_, 2
+	note C#, 2
+	note C#, 2
+	note C#, 2
+	note A_, 2
+	note D_, 2
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note D_, 4
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note D_, 4
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
 	note A_, 1
+	note G_, 1
 	note D_, 1
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note D_, 3
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note D_, 3
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note A_, 0
-	note G_, 0
-	note D_, 0
-	note C#, 0
-	note G_, 0
-	note G_, 0
-	note C#, 0
-	note C#, 0
-	note A_, 0
-	note G_, 0
-	note D_, 0
-	note C#, 0
-	note G_, 0
-	note G_, 0
-	note D_, 0
-	note C#, 0
-	note A_, 0
-	note G_, 0
-	note C#, 0
-	note C#, 0
-	note D_, 0
-	note C#, 0
-	note C#, 0
-	note D_, 0
-	note A_, 0
-	note G_, 0
-	note D_, 0
-	note C#, 0
-	note C#, 0
-	note G_, 0
-	note D_, 0
-	note C#, 0
 	note C#, 1
+	note G_, 1
+	note G_, 1
+	note C#, 1
+	note C#, 1
+	note A_, 1
+	note G_, 1
 	note D_, 1
-	note __, 1
+	note C#, 1
+	note G_, 1
+	note G_, 1
 	note D_, 1
+	note C#, 1
+	note A_, 1
+	note G_, 1
+	note C#, 1
+	note C#, 1
 	note D_, 1
-	note __, 5
-	note __, 15
-	note __, 15
+	note C#, 1
+	note C#, 1
+	note D_, 1
+	note A_, 1
+	note G_, 1
+	note D_, 1
+	note C#, 1
+	note C#, 1
+	note G_, 1
+	note D_, 1
+	note C#, 1
+	note C#, 2
+	note D_, 2
+	note __, 2
+	note D_, 2
+	note D_, 2
+	note __, 6
+	note __, 16
+	note __, 16
 	endchannel
 ; 178889
--- a/audio/music/dancinghall.asm
+++ b/audio/music/dancinghall.asm
@@ -11,83 +11,83 @@
 	volume $77
 	stereopanning $f
 	notetype $6, $b7
-	note __, 2
+	note __, 3
 	dutycycle $0
 
 Music_DancingHall_branch_ef9d3: ; ef9d3
 	notetype $c, $b7
 	callchannel Music_DancingHall_branch_efa17
-	note __, 15
+	note __, 16
 	callchannel Music_DancingHall_branch_efa17
-	note __, 15
-	note __, 15
-	note __, 15
+	note __, 16
+	note __, 16
+	note __, 16
 	intensity $b1
 	octave 2
-	note B_, 0
+	note B_, 1
 	octave 3
-	note D_, 0
-	note F_, 0
-	note A_, 0
-	note B_, 0
-	note A_, 0
-	note B_, 0
-	octave 4
-	note D_, 0
+	note D_, 1
 	note F_, 1
+	note A_, 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
+	octave 4
+	note D_, 1
+	note F_, 2
 	notetype $8, $b1
-	note D_, 0
-	note E_, 0
-	note D_, 0
+	note D_, 1
+	note E_, 1
+	note D_, 1
 	octave 3
-	note B_, 2
-	note A_, 2
+	note B_, 3
+	note A_, 3
 	notetype $c, $b1
-	note B_, 0
-	note A_, 0
-	note D_, 0
-	note E_, 0
+	note B_, 1
+	note A_, 1
+	note D_, 1
+	note E_, 1
 	octave 4
-	note F_, 1
+	note F_, 2
 	notetype $8, $b1
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	octave 3
-	note B_, 0
+	note B_, 1
 	notetype $c, $b5
-	note A_, 0
-	note __, 0
-	note B_, 0
-	note B_, 0
-	note A_, 0
-	note __, 0
-	note F_, 1
+	note A_, 1
+	note __, 1
+	note B_, 1
+	note B_, 1
+	note A_, 1
+	note __, 1
+	note F_, 2
 	loopchannel 0, Music_DancingHall_branch_ef9d3
 ; efa17
 
 Music_DancingHall_branch_efa17: ; efa17
 	octave 3
-	note B_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
 	octave 4
-	note E_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
+	note E_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
 	octave 3
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 4
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
 	endchannel
 
 Music_DancingHall_Ch2: ; efa2c
@@ -95,7 +95,7 @@
 	notetype $6, $a1
 	dutycycle $0
 	vibrato $10, $24
-	note __, 2
+	note __, 3
 
 Music_DancingHall_branch_efa37: ; efa37
 	notetype $6, $a2
@@ -103,47 +103,47 @@
 	callchannel Music_DancingHall_branch_efa7a
 	intensity $a7
 	octave 2
-	note D_, 15
-	note F_, 15
+	note D_, 16
+	note F_, 16
 	notetype $c, $a7
-	note E_, 15
+	note E_, 16
 	octave 3
-	note F_, 0
-	note A_, 0
-	note B_, 0
-	octave 4
-	note D_, 0
-	note E_, 0
-	note D_, 0
-	note E_, 0
-	note A_, 0
+	note F_, 1
+	note A_, 1
 	note B_, 1
+	octave 4
+	note D_, 1
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note A_, 1
+	note B_, 2
 	notetype $8, $a7
-	note A_, 0
-	note B_, 0
-	note A_, 0
-	note F_, 2
-	note D_, 2
+	note A_, 1
+	note B_, 1
+	note A_, 1
+	note F_, 3
+	note D_, 3
 	notetype $c, $a7
-	note E_, 0
-	note D_, 0
+	note E_, 1
+	note D_, 1
 	octave 3
-	note A_, 0
-	note B_, 0
-	octave 4
 	note A_, 1
+	note B_, 1
+	octave 4
+	note A_, 2
 	notetype $8, $a7
-	note F_, 0
-	note A_, 0
-	note F_, 0
+	note F_, 1
+	note A_, 1
+	note F_, 1
 	notetype $c, $a7
-	note E_, 0
-	note __, 0
-	note F_, 0
-	note F_, 0
-	note E_, 0
-	note __, 0
-	note D_, 1
+	note E_, 1
+	note __, 1
+	note F_, 1
+	note F_, 1
+	note E_, 1
+	note __, 1
+	note D_, 2
 	loopchannel 0, Music_DancingHall_branch_efa37
 ; efa7a
 
@@ -150,78 +150,78 @@
 Music_DancingHall_branch_efa7a: ; efa7a
 	intensity $a1
 	octave 4
-	note E_, 3
+	note E_, 4
 	octave 2
-	note E_, 3
+	note E_, 4
 	octave 4
-	note E_, 3
+	note E_, 4
 	octave 2
-	note E_, 3
+	note E_, 4
 	octave 4
-	note B_, 3
-	note A_, 3
-	note F_, 3
-	note A_, 3
+	note B_, 4
+	note A_, 4
+	note F_, 4
+	note A_, 4
 	intensity $33
-	note D_, 0
-	note F_, 0
+	note D_, 1
+	note F_, 1
 	intensity $63
-	note D_, 0
-	note F_, 0
+	note D_, 1
+	note F_, 1
 	intensity $93
-	note D_, 0
-	note F_, 0
+	note D_, 1
+	note F_, 1
 	intensity $c3
-	note D_, 0
-	note F_, 0
+	note D_, 1
+	note F_, 1
 	intensity $e3
-	note D_, 0
-	note F_, 0
+	note D_, 1
+	note F_, 1
 	intensity $a3
-	note D_, 0
-	note F_, 0
+	note D_, 1
+	note F_, 1
 	intensity $83
-	note D_, 0
-	note F_, 0
+	note D_, 1
+	note F_, 1
 	intensity $53
-	note D_, 0
-	note F_, 0
+	note D_, 1
+	note F_, 1
 	intensity $73
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note E_, 0
+	note E_, 1
 	intensity $a3
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note E_, 0
+	note E_, 1
 	intensity $b3
 	octave 3
-	note A_, 0
+	note A_, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	intensity $c3
 	octave 3
-	note A_, 0
+	note A_, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	intensity $d3
 	octave 3
-	note E_, 0
-	note B_, 0
+	note E_, 1
+	note B_, 1
 	intensity $e3
-	note E_, 0
-	note B_, 0
+	note E_, 1
+	note B_, 1
 	intensity $f3
-	note A_, 0
+	note A_, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	intensity $f3
 	octave 3
-	note A_, 0
+	note A_, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	endchannel
 
 Music_DancingHall_Ch3: ; efad6
@@ -229,84 +229,84 @@
 	vibrato $16, $24
 	notetype $6, $10
 	octave 5
-	note A_, 0
-	note B_, 0
+	note A_, 1
+	note B_, 1
 	octave 6
-	note D_, 0
+	note D_, 1
 
 Music_DancingHall_branch_efae3: ; efae3
-	note E_, 12
-	note D_, 0
-	note E_, 0
-	note A_, 0
-	note B_, 15
+	note E_, 13
+	note D_, 1
+	note E_, 1
+	note A_, 1
+	note B_, 16
 	intensity $14
 	octave 3
-	note F_, 15
-	note E_, 13
+	note F_, 16
+	note E_, 14
 	intensity $10
 	octave 6
-	note E_, 0
-	note F_, 0
-	note E_, 12
-	note D_, 0
-	note E_, 0
-	note A_, 0
-	note B_, 15
+	note E_, 1
+	note F_, 1
+	note E_, 13
+	note D_, 1
+	note E_, 1
+	note A_, 1
+	note B_, 16
 	intensity $14
 	octave 3
-	note F_, 15
-	note E_, 15
+	note F_, 16
+	note E_, 16
 	intensity $13
 	octave 4
-	note F_, 1
+	note F_, 2
+	note A_, 2
+	note B_, 2
+	octave 5
+	note D_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note A_, 2
+	note A#, 1
+	note B_, 3
+	notetype $8, $13
 	note A_, 1
 	note B_, 1
-	octave 5
-	note D_, 1
-	note E_, 1
-	note D_, 1
-	note E_, 1
 	note A_, 1
-	note A#, 0
-	note B_, 2
-	notetype $8, $13
-	note A_, 0
-	note B_, 0
-	note A_, 0
-	note F_, 2
-	note D_, 2
+	note F_, 3
+	note D_, 3
 	notetype $c, $13
-	note E_, 0
-	note D_, 0
+	note E_, 1
+	note D_, 1
 	octave 4
-	note A_, 0
-	note B_, 0
-	octave 5
 	note A_, 1
+	note B_, 1
+	octave 5
+	note A_, 2
 	notetype $8, $13
-	note F_, 0
-	note A_, 0
-	note F_, 0
+	note F_, 1
+	note A_, 1
+	note F_, 1
 	notetype $6, $13
-	note D#, 0
-	note E_, 2
-	note D_, 3
+	note D#, 1
+	note E_, 3
+	note D_, 4
 	octave 4
-	note B_, 3
+	note B_, 4
 	octave 5
-	note D_, 3
+	note D_, 4
 	intensity $14
 	octave 3
-	note D_, 15
-	note F_, 15
-	note E_, 15
-	note E_, 12
+	note D_, 16
+	note F_, 16
+	note E_, 16
+	note E_, 13
 	intensity $10
 	octave 5
-	note A_, 0
-	note B_, 0
+	note A_, 1
+	note B_, 1
 	octave 6
-	note D_, 0
+	note D_, 1
 	loopchannel 0, Music_DancingHall_branch_efae3
 ; efb3e
--- a/audio/music/darkcave.asm
+++ b/audio/music/darkcave.asm
@@ -16,13 +16,13 @@
 	notetype $c, $a7
 
 Music_DarkCave_branch_ea2dc: ; ea2dc
-	note __, 15
+	note __, 16
 	loopchannel 4, Music_DarkCave_branch_ea2dc
 	octave 3
-	note D#, 15
-	note D_, 15
-	note C#, 15
-	note C_, 15
+	note D#, 16
+	note D_, 16
+	note C#, 16
+	note C_, 16
 	intensity $a3
 
 Music_DarkCave_branch_ea2e8: ; ea2e8
@@ -29,54 +29,54 @@
 	callchannel Music_DarkCave_branch_ea333
 	loopchannel 3, Music_DarkCave_branch_ea2e8
 	intensity $b7
-	note G#, 7
-	note D#, 7
-	note G_, 7
-	note D_, 7
-	note F_, 7
-	note C#, 7
-	note D#, 7
-	note G_, 7
-	note G#, 7
-	note D#, 7
-	note G_, 7
-	note D_, 7
-	note F_, 7
-	note C#, 7
-	note D#, 7
-	note C_, 7
+	note G#, 8
+	note D#, 8
+	note G_, 8
+	note D_, 8
+	note F_, 8
+	note C#, 8
+	note D#, 8
+	note G_, 8
+	note G#, 8
+	note D#, 8
+	note G_, 8
+	note D_, 8
+	note F_, 8
+	note C#, 8
+	note D#, 8
+	note C_, 8
 	intensity $a3
 
 Music_DarkCave_branch_ea303: ; ea303
 	callchannel Music_DarkCave_branch_ea333
 	loopchannel 2, Music_DarkCave_branch_ea303
-	note __, 15
-	note __, 7
+	note __, 16
+	note __, 8
 	intensity $b7
 	octave 2
-	note F_, 1
-	note G_, 1
-	note G#, 3
+	note F_, 2
+	note G_, 2
+	note G#, 4
 	octave 3
-	note D#, 15
-	note __, 7
+	note D#, 16
+	note __, 8
 	octave 2
-	note G#, 1
-	note G_, 1
-	note G#, 3
+	note G#, 2
+	note G_, 2
+	note G#, 4
 	octave 3
-	note D#, 15
-	note G_, 1
-	note __, 5
-	note F_, 1
-	note G_, 1
-	note G#, 3
-	note G_, 15
-	note F_, 1
-	note __, 5
-	note G#, 1
-	note G_, 1
-	note G#, 3
+	note D#, 16
+	note G_, 2
+	note __, 6
+	note F_, 2
+	note G_, 2
+	note G#, 4
+	note G_, 16
+	note F_, 2
+	note __, 6
+	note G#, 2
+	note G_, 2
+	note G#, 4
 	intensity $a3
 
 Music_DarkCave_branch_ea328: ; ea328
@@ -87,59 +87,59 @@
 
 Music_DarkCave_branch_ea333: ; ea333
 	octave 4
-	note D#, 1
+	note D#, 2
 	octave 3
-	note G#, 1
+	note G#, 2
 	octave 4
-	note C_, 1
-	note D#, 1
+	note C_, 2
+	note D#, 2
 	octave 3
-	note G#, 1
+	note G#, 2
 	octave 4
-	note C_, 1
-	note D#, 1
-	note C_, 1
-	note D_, 1
+	note C_, 2
+	note D#, 2
+	note C_, 2
+	note D_, 2
 	octave 3
-	note G_, 1
-	note A#, 1
+	note G_, 2
+	note A#, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note G_, 1
-	note A#, 1
+	note G_, 2
+	note A#, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note F_, 1
-	note A#, 1
+	note F_, 2
+	note A#, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note F_, 1
-	note A#, 1
+	note F_, 2
+	note A#, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G_, 1
-	note A#, 1
+	note G_, 2
+	note A#, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G_, 1
-	note A#, 1
+	note G_, 2
+	note A#, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	endchannel
 
 Music_DarkCave_Ch2: ; ea36a
@@ -149,209 +149,209 @@
 	notetype $c, $a7
 
 Music_DarkCave_branch_ea374: ; ea374
-	note __, 15
+	note __, 16
 	loopchannel 4, Music_DarkCave_branch_ea374
 	octave 3
-	note G_, 15
-	note A#, 15
-	note F_, 15
-	note G_, 15
+	note G_, 16
+	note A#, 16
+	note F_, 16
+	note G_, 16
 
 Music_DarkCave_branch_ea37e: ; ea37e
-	note __, 15
+	note __, 16
 	loopchannel 4, Music_DarkCave_branch_ea37e
-	note __, 7
+	note __, 8
 	stereopanning $ff
 	intensity $c7
 	octave 5
-	note C_, 7
+	note C_, 8
 	intensity $c4
-	note D_, 1
-	note C_, 1
+	note D_, 2
+	note C_, 2
 	octave 4
-	note A#, 1
-	note G_, 3
-	note A#, 1
+	note A#, 2
+	note G_, 4
+	note A#, 2
 	octave 5
-	note D_, 3
+	note D_, 4
 	intensity $b0
-	note C#, 3
+	note C#, 4
 	intensity $b7
-	note C#, 11
+	note C#, 12
 	intensity $59
-	note C_, 7
+	note C_, 8
 	intensity $c7
-	note C_, 7
-	note __, 7
+	note C_, 8
+	note __, 8
 	intensity $c7
-	note C_, 7
+	note C_, 8
 	intensity $c4
-	note D_, 1
-	note C_, 1
+	note D_, 2
+	note C_, 2
 	octave 4
-	note A#, 1
-	note G_, 1
-	note G_, 1
-	note A#, 1
+	note A#, 2
+	note G_, 2
+	note G_, 2
+	note A#, 2
 	octave 5
-	note D_, 3
+	note D_, 4
 	intensity $c7
-	note C#, 11
+	note C#, 12
 	intensity $c3
-	note C_, 1
-	note C#, 1
+	note C_, 2
+	note C#, 2
 	intensity $b0
-	note D#, 9
+	note D#, 10
 	intensity $b7
-	note D#, 5
+	note D#, 6
 	stereopanning $f
 	intensity $c4
 	octave 4
-	note F_, 3
-	note D#, 1
-	note D_, 1
-	note D#, 3
-	note D_, 1
-	note C_, 1
-	note D_, 1
-	note C_, 1
+	note F_, 4
+	note D#, 2
+	note D_, 2
+	note D#, 4
+	note D_, 2
+	note C_, 2
+	note D_, 2
+	note C_, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C_, 1
-	note D_, 3
-	note C_, 1
+	note C_, 2
+	note D_, 4
+	note C_, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C#, 7
+	note C#, 8
 	octave 3
-	note A#, 7
+	note A#, 8
 	intensity $b0
 	octave 4
-	note D#, 1
-	note D_, 1
-	note C_, 1
+	note D#, 2
+	note D_, 2
+	note C_, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C_, 7
-	note F_, 3
-	note D#, 1
-	note D_, 1
-	note D#, 3
-	note D_, 1
-	note C_, 1
-	note D_, 1
-	note C_, 1
+	note C_, 8
+	note F_, 4
+	note D#, 2
+	note D_, 2
+	note D#, 4
+	note D_, 2
+	note C_, 2
+	note D_, 2
+	note C_, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C_, 1
-	note D_, 3
-	note C_, 1
+	note C_, 2
+	note D_, 4
+	note C_, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C#, 3
-	note C_, 1
-	note C#, 1
-	note C_, 1
-	note C#, 1
+	note C#, 4
+	note C_, 2
+	note C#, 2
+	note C_, 2
+	note C#, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	intensity $b0
-	note C_, 7
+	note C_, 8
 	intensity $b7
-	note C_, 7
+	note C_, 8
 	intensity $c7
 	stereopanning $ff
-	note __, 7
+	note __, 8
 	octave 5
-	note C_, 7
+	note C_, 8
 	intensity $c4
-	note D_, 1
-	note C_, 1
+	note D_, 2
+	note C_, 2
 	octave 4
-	note A#, 1
-	note G_, 3
-	note A#, 1
+	note A#, 2
+	note G_, 4
+	note A#, 2
 	octave 5
-	note D_, 3
+	note D_, 4
 	intensity $49
-	note C#, 7
+	note C#, 8
 	intensity $c7
-	note C#, 7
+	note C#, 8
 	intensity $b0
-	note C_, 7
+	note C_, 8
 	intensity $b7
-	note C_, 7
-	note __, 7
+	note C_, 8
+	note __, 8
 	intensity $c7
-	note C_, 7
+	note C_, 8
 	intensity $c4
-	note D_, 1
-	note C_, 1
+	note D_, 2
+	note C_, 2
 	octave 4
-	note A#, 1
-	note G_, 1
-	note G_, 1
-	note A#, 1
+	note A#, 2
+	note G_, 2
+	note G_, 2
+	note A#, 2
 	octave 5
-	note D_, 3
+	note D_, 4
 	intensity $b0
-	note C#, 7
+	note C#, 8
 	intensity $b7
-	note C#, 7
+	note C#, 8
 	intensity $b0
-	note C_, 7
+	note C_, 8
 	intensity $b7
-	note C_, 7
+	note C_, 8
 	intensity $c7
-	note __, 15
+	note __, 16
 	stereopanning $f
-	note __, 7
+	note __, 8
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C_, 1
-	note C#, 3
-	note C_, 15
-	note __, 7
-	note C#, 1
-	note C_, 1
-	note C#, 3
-	note C_, 15
+	note C_, 2
+	note C#, 4
+	note C_, 16
+	note __, 8
+	note C#, 2
+	note C_, 2
+	note C#, 4
+	note C_, 16
 	intensity $c2
-	note D#, 7
+	note D#, 8
 	intensity $c7
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C_, 1
-	note C#, 3
-	note C_, 15
+	note C_, 2
+	note C#, 4
+	note C_, 16
 	intensity $c2
 	octave 3
-	note A#, 7
+	note A#, 8
 	intensity $c7
 	octave 4
-	note C#, 1
-	note C_, 1
+	note C#, 2
+	note C_, 2
 	intensity $c4
-	note C#, 15
-	note __, 3
-	note __, 15
-	note __, 15
-	note __, 15
+	note C#, 16
+	note __, 4
+	note __, 16
+	note __, 16
+	note __, 16
 	intensity $b7
 	octave 5
-	note D#, 15
-	note D_, 15
-	note F_, 15
-	note D#, 15
+	note D#, 16
+	note D_, 16
+	note F_, 16
+	note D#, 16
 	loopchannel 0, Music_DarkCave_branch_ea37e
 
 Music_DarkCave_Ch3: ; ea46e
@@ -366,30 +366,30 @@
 	loopchannel 7, Music_DarkCave_branch_ea478
 	callchannel Music_DarkCave_branch_ea4c3
 	octave 3
-	note C_, 3
-	note G_, 1
-	note D#, 3
-	note G_, 1
-	note D#, 3
-	note F_, 1
-	note __, 1
+	note C_, 4
+	note G_, 2
+	note D#, 4
+	note G_, 2
+	note D#, 4
+	note F_, 2
+	note __, 2
 	octave 2
-	note A#, 11
+	note A#, 12
 	callchannel Music_DarkCave_branch_ea4c3
 	octave 3
-	note C_, 3
-	note G_, 1
-	note D#, 3
-	note G_, 1
-	note D#, 3
-	note F_, 1
-	note __, 1
+	note C_, 4
+	note G_, 2
+	note D#, 4
+	note G_, 2
+	note D#, 4
+	note F_, 2
+	note __, 2
 	octave 2
-	note A#, 3
+	note A#, 4
 	octave 3
-	note C#, 1
-	note C_, 1
-	note C#, 3
+	note C#, 2
+	note C_, 2
+	note C#, 4
 	callchannel Music_DarkCave_branch_ea4a7
 	callchannel Music_DarkCave_branch_ea4a7
 	loopchannel 0, Music_DarkCave_branch_ea478
@@ -397,77 +397,77 @@
 
 Music_DarkCave_branch_ea4a7: ; ea4a7
 	octave 3
-	note C_, 3
-	note G_, 1
-	note D#, 3
-	note G_, 1
-	note F_, 3
-	note D#, 1
-	note __, 1
+	note C_, 4
+	note G_, 2
+	note D#, 4
+	note G_, 2
+	note F_, 4
+	note D#, 2
+	note __, 2
 	octave 2
-	note A#, 3
-	note A#, 1
+	note A#, 4
+	note A#, 2
 	octave 3
-	note C_, 1
-	note C#, 3
-	note C_, 3
-	note G_, 1
-	note D#, 3
-	note G_, 1
-	note D#, 3
-	note F_, 1
-	note __, 1
+	note C_, 2
+	note C#, 4
+	note C_, 4
+	note G_, 2
+	note D#, 4
+	note G_, 2
+	note D#, 4
+	note F_, 2
+	note __, 2
 	octave 2
-	note A#, 3
+	note A#, 4
 	octave 3
-	note C#, 1
-	note C_, 1
-	note C#, 3
+	note C#, 2
+	note C_, 2
+	note C#, 4
 	endchannel
 ; ea4c3
 
 Music_DarkCave_branch_ea4c3: ; ea4c3
 	octave 3
-	note C_, 3
-	note G_, 1
-	note D#, 3
-	note G_, 1
-	note F_, 3
-	note D#, 1
-	note __, 1
+	note C_, 4
+	note G_, 2
+	note D#, 4
+	note G_, 2
+	note F_, 4
+	note D#, 2
+	note __, 2
 	octave 2
-	note A#, 11
+	note A#, 12
 	endchannel
 ; ea4ce
 
 Music_DarkCave_branch_ea4ce: ; ea4ce
 	octave 2
-	note C_, 3
-	note G_, 1
-	note D#, 3
-	note G_, 1
-	note F_, 3
-	note D#, 1
-	note __, 1
+	note C_, 4
+	note G_, 2
+	note D#, 4
+	note G_, 2
+	note F_, 4
+	note D#, 2
+	note __, 2
 	octave 1
-	note A#, 3
-	note A#, 1
+	note A#, 4
+	note A#, 2
 	octave 2
-	note C_, 1
-	note C#, 3
-	note C_, 3
-	note G_, 1
-	note D#, 3
-	note G_, 1
-	note D#, 3
-	note F_, 1
-	note __, 1
+	note C_, 2
+	note C#, 4
+	note C_, 4
+	note G_, 2
+	note D#, 4
+	note G_, 2
+	note D#, 4
+	note F_, 2
+	note __, 2
 	octave 1
-	note A#, 3
+	note A#, 4
 	octave 2
-	note C#, 1
-	note C_, 1
-	note C#, 3
+	note C#, 2
+	note C_, 2
+	note C#, 4
 	endchannel
 
 Music_DarkCave_Ch4: ; ea4ea
@@ -476,24 +476,24 @@
 
 Music_DarkCave_branch_ea4ee: ; ea4ee
 	stereopanning $ff
-	note D#, 7
-	note D#, 7
-	note D#, 3
+	note D#, 8
+	note D#, 8
+	note D#, 4
 	stereopanning $f0
-	note C#, 3
+	note C#, 4
 	stereopanning $f
-	note C#, 1
-	note C#, 1
+	note C#, 2
+	note C#, 2
 	stereopanning $f0
-	note C#, 3
+	note C#, 4
 	stereopanning $ff
-	note D#, 7
-	note D#, 7
-	note D#, 3
+	note D#, 8
+	note D#, 8
+	note D#, 4
 	stereopanning $f
-	note C#, 7
+	note C#, 8
 	stereopanning $f0
-	note C#, 1
-	note C#, 1
+	note C#, 2
+	note C#, 2
 	loopchannel 0, Music_DarkCave_branch_ea4ee
 ; ea50d
--- a/audio/music/dragonsden.asm
+++ b/audio/music/dragonsden.asm
@@ -16,15 +16,15 @@
 
 Music_DragonsDen_branch_eed03: ; eed03
 	callchannel Music_DragonsDen_branch_eed1e
-	note __, 15
+	note __, 16
 	callchannel Music_DragonsDen_branch_eed2d
-	note __, 1
+	note __, 2
 	callchannel Music_DragonsDen_branch_eed2d
-	note __, 1
+	note __, 2
 	callchannel Music_DragonsDen_branch_eed2d
-	note __, 1
+	note __, 2
 	callchannel Music_DragonsDen_branch_eed2d
-	note __, 9
+	note __, 10
 	notetype $c, $b7
 	loopchannel 0, Music_DragonsDen_branch_eed03
 ; eed1e
@@ -31,36 +31,36 @@
 
 Music_DragonsDen_branch_eed1e: ; eed1e
 	octave 3
-	note A#, 11
-	note A_, 3
-	note A#, 11
-	note A_, 3
-	note A#, 5
+	note A#, 12
+	note A_, 4
+	note A#, 12
+	note A_, 4
+	note A#, 6
 	octave 4
-	note C_, 3
-	note C#, 5
-	note E_, 15
-	note D#, 11
-	note D_, 3
+	note C_, 4
+	note C#, 6
+	note E_, 16
+	note D#, 12
+	note D_, 4
 	octave 3
-	note G#, 15
+	note G#, 16
 	endchannel
 ; eed2d
 
 Music_DragonsDen_branch_eed2d: ; eed2d
 	intensity $b1
-	note __, 1
+	note __, 2
 	octave 4
-	note C#, 2
-	note C#, 2
-	note C#, 2
-	note C#, 2
 	note C#, 3
+	note C#, 3
+	note C#, 3
+	note C#, 3
+	note C#, 4
+	note C#, 3
+	note C#, 3
+	note C#, 4
 	note C#, 2
 	note C#, 2
-	note C#, 3
-	note C#, 1
-	note C#, 1
 	endchannel
 
 Music_DragonsDen_Ch2: ; eed3c
@@ -71,12 +71,12 @@
 
 Music_DragonsDen_branch_eed46: ; eed46
 	callchannel Music_DragonsDen_branch_eed5e
-	note __, 15
+	note __, 16
 	callchannel Music_DragonsDen_branch_eed6b
 	callchannel Music_DragonsDen_branch_eed6b
 	callchannel Music_DragonsDen_branch_eed6b
 	callchannel Music_DragonsDen_branch_eed6b
-	note __, 15
+	note __, 16
 	notetype $c, $c7
 	loopchannel 0, Music_DragonsDen_branch_eed46
 ; eed5e
@@ -83,17 +83,17 @@
 
 Music_DragonsDen_branch_eed5e: ; eed5e
 	octave 4
-	note D#, 11
-	note D_, 3
-	note D#, 11
-	note D_, 3
-	note D#, 5
-	note F_, 3
-	note F#, 5
-	note A_, 15
-	note G#, 11
-	note G_, 3
-	note C#, 15
+	note D#, 12
+	note D_, 4
+	note D#, 12
+	note D_, 4
+	note D#, 6
+	note F_, 4
+	note F#, 6
+	note A_, 16
+	note G#, 12
+	note G_, 4
+	note C#, 16
 	endchannel
 ; eed6b
 
@@ -102,11 +102,11 @@
 
 Music_DragonsDen_branch_eed6d: ; eed6d
 	octave 5
-	note C#, 3
+	note C#, 4
 	octave 4
-	note G#, 3
-	note G#, 3
-	note G#, 3
+	note G#, 4
+	note G#, 4
+	note G#, 4
 	loopchannel 2, Music_DragonsDen_branch_eed6d
 	endchannel
 
@@ -115,54 +115,54 @@
 Music_DragonsDen_branch_eed78: ; eed78
 	notetype $c, $14
 	octave 4
+	note C#, 2
+	octave 3
+	note G#, 1
+	octave 4
 	note C#, 1
 	octave 3
-	note G#, 0
+	note G#, 2
 	octave 4
-	note C#, 0
+	note C#, 2
 	octave 3
 	note G#, 1
 	octave 4
 	note C#, 1
 	octave 3
-	note G#, 0
+	note G#, 2
 	octave 4
-	note C#, 0
+	note C#, 2
 	octave 3
 	note G#, 1
 	octave 4
 	note C#, 1
-	octave 3
-	note G#, 0
-	octave 4
-	note C#, 0
 	loopchannel 15, Music_DragonsDen_branch_eed78
-	note __, 15
+	note __, 16
 	notetype $6, $27
 
 Music_DragonsDen_branch_eed99: ; eed99
 	octave 3
-	note C#, 3
+	note C#, 4
 	octave 2
-	note G#, 1
+	note G#, 2
 	octave 3
-	note C#, 1
+	note C#, 2
 	octave 2
-	note G#, 3
+	note G#, 4
 	octave 3
-	note C#, 3
+	note C#, 4
 	octave 2
-	note G#, 1
+	note G#, 2
 	octave 3
-	note C#, 1
+	note C#, 2
 	octave 2
-	note G#, 3
+	note G#, 4
 	octave 3
-	note C#, 3
+	note C#, 4
 	octave 2
-	note G#, 1
+	note G#, 2
 	octave 3
-	note C#, 1
+	note C#, 2
 	loopchannel 16, Music_DragonsDen_branch_eed99
 	loopchannel 0, Music_DragonsDen_branch_eed78
 
@@ -169,16 +169,16 @@
 Music_DragonsDen_Ch4: ; eedb7
 	togglenoise $0
 	notetype $c
-	note __, 15
-	note __, 15
+	note __, 16
+	note __, 16
 
 Music_DragonsDen_branch_eedbd: ; eedbd
 	stereopanning $f0
-	note F_, 3
+	note F_, 4
 	stereopanning $f
-	note F#, 3
-	note F#, 3
+	note F#, 4
+	note F#, 4
 	stereopanning $f0
-	note F#, 3
+	note F#, 4
 	loopchannel 0, Music_DragonsDen_branch_eedbd
 ; eedcb
--- a/audio/music/ecruteakcity.asm
+++ b/audio/music/ecruteakcity.asm
@@ -14,137 +14,137 @@
 
 Music_EcruteakCity_branch_ef2e5: ; ef2e5
 	notetype $c, $57
-	note __, 9
+	note __, 10
 	octave 4
-	note C_, 5
-	note __, 9
-	note C_, 5
-	note __, 15
+	note C_, 6
+	note __, 10
+	note C_, 6
+	note __, 16
 	octave 3
-	note B_, 3
+	note B_, 4
 	octave 4
-	note C_, 3
-	note D_, 3
+	note C_, 4
+	note D_, 4
 	intensity $60
-	note __, 3
-	note __, 15
-	note __, 9
-	note G_, 1
-	note A_, 1
-	note A#, 1
-	note __, 7
-	note G#, 1
-	note G_, 1
-	note F_, 1
+	note __, 4
+	note __, 16
+	note __, 10
+	note G_, 2
+	note A_, 2
+	note A#, 2
+	note __, 8
+	note G#, 2
+	note G_, 2
+	note F_, 2
 	octave 5
-	note C_, 5
+	note C_, 6
 	notetype $6, $67
-	note C#, 3
-	note D_, 9
-	note __, 1
+	note C#, 4
+	note D_, 10
+	note __, 2
 	stereopanning $ff
 	octave 4
-	note B_, 7
+	note B_, 8
 	stereopanning $f
 	octave 3
-	note A#, 0
-	note B_, 10
+	note A#, 1
+	note B_, 11
 	octave 4
-	note C_, 3
-	note E_, 3
-	note G_, 11
-	note A#, 11
-	note G_, 3
-	note __, 3
-	note A#, 3
+	note C_, 4
+	note E_, 4
+	note G_, 12
+	note A#, 12
+	note G_, 4
+	note __, 4
+	note A#, 4
 	octave 5
-	note C#, 3
-	note E_, 1
-	note __, 1
+	note C#, 4
+	note E_, 2
+	note __, 2
 	octave 3
-	note A_, 7
+	note A_, 8
 	octave 4
-	note C_, 7
-	note F_, 3
-	note __, 11
-	note E_, 0
-	note F_, 10
-	note G_, 1
-	note __, 1
-	note A_, 3
-	note G_, 3
-	note __, 7
+	note C_, 8
+	note F_, 4
+	note __, 12
+	note E_, 1
+	note F_, 11
+	note G_, 2
+	note __, 2
+	note A_, 4
+	note G_, 4
+	note __, 8
 	intensity $52
 	callchannel Music_EcruteakCity_branch_ef37f
-	note D_, 1
+	note D_, 2
 	octave 4
-	note B_, 1
-	note A_, 1
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	note B_, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note B_, 2
 	octave 5
-	note D_, 1
+	note D_, 2
 	octave 4
-	note B_, 1
+	note B_, 2
 	octave 5
-	note D_, 1
+	note D_, 2
 	octave 4
-	note B_, 1
-	note A_, 1
-	note B_, 1
-	note A_, 1
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	note B_, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note B_, 2
 	callchannel Music_EcruteakCity_branch_ef391
 	intensity $52
-	note A#, 1
-	note G_, 1
-	note E_, 1
-	note C#, 1
-	note G_, 1
-	note E_, 1
-	note C#, 1
+	note A#, 2
+	note G_, 2
+	note E_, 2
+	note C#, 2
+	note G_, 2
+	note E_, 2
+	note C#, 2
 	octave 4
-	note A#, 1
+	note A#, 2
 	octave 5
-	note E_, 1
-	note C#, 1
+	note E_, 2
+	note C#, 2
 	octave 4
-	note A#, 1
-	note G_, 1
-	note A#, 1
-	note G_, 1
-	note E_, 1
-	note C#, 1
+	note A#, 2
+	note G_, 2
+	note A#, 2
+	note G_, 2
+	note E_, 2
+	note C#, 2
 	callchannel Music_EcruteakCity_branch_ef37f
-	note D_, 1
-	note C_, 1
+	note D_, 2
+	note C_, 2
 	octave 4
-	note G#, 1
+	note G#, 2
 	octave 5
-	note C_, 1
+	note C_, 2
 	octave 4
-	note G#, 1
+	note G#, 2
 	octave 5
-	note C_, 1
-	note D_, 1
-	note C_, 1
-	note D_, 1
-	note C_, 1
+	note C_, 2
+	note D_, 2
+	note C_, 2
+	note D_, 2
+	note C_, 2
 	octave 4
-	note G#, 1
+	note G#, 2
 	octave 5
-	note C_, 1
+	note C_, 2
 	octave 4
-	note G#, 1
+	note G#, 2
 	octave 5
-	note C_, 1
+	note C_, 2
 	octave 4
-	note G#, 1
+	note G#, 2
 	octave 5
-	note C_, 1
+	note C_, 2
 	callchannel Music_EcruteakCity_branch_ef391
 	loopchannel 0, Music_EcruteakCity_branch_ef2e5
 ; ef37f
@@ -151,18 +151,18 @@
 
 Music_EcruteakCity_branch_ef37f: ; ef37f
 	octave 5
-	note E_, 1
-	note C_, 1
+	note E_, 2
+	note C_, 2
 	octave 4
-	note A_, 1
+	note A_, 2
 	octave 5
-	note C_, 1
+	note C_, 2
 	octave 4
-	note A_, 1
+	note A_, 2
 	octave 5
-	note C_, 1
-	note E_, 1
-	note C_, 1
+	note C_, 2
+	note E_, 2
+	note C_, 2
 	loopchannel 2, Music_EcruteakCity_branch_ef37f
 	endchannel
 ; ef391
@@ -169,88 +169,88 @@
 
 Music_EcruteakCity_branch_ef391: ; ef391
 	octave 5
-	note D_, 1
+	note D_, 2
 	octave 4
-	note B_, 1
-	note G_, 1
-	note B_, 1
-	note G_, 1
-	note B_, 1
+	note B_, 2
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note B_, 2
 	octave 5
-	note D_, 1
+	note D_, 2
 	octave 4
-	note B_, 1
+	note B_, 2
 	octave 5
-	note D_, 1
+	note D_, 2
 	octave 4
-	note B_, 1
-	note G_, 1
-	note B_, 1
-	note G_, 1
-	note B_, 1
+	note B_, 2
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note B_, 2
 	octave 5
-	note D_, 1
-	note F_, 1
-	note A_, 1
-	note E_, 1
-	note C_, 1
+	note D_, 2
+	note F_, 2
+	note A_, 2
+	note E_, 2
+	note C_, 2
 	octave 4
-	note A_, 1
+	note A_, 2
 	octave 5
-	note E_, 1
-	note C_, 1
+	note E_, 2
+	note C_, 2
 	octave 4
-	note A_, 1
-	note E_, 1
+	note A_, 2
+	note E_, 2
 	octave 5
-	note C_, 1
+	note C_, 2
 	octave 4
-	note A_, 1
-	note E_, 1
-	note C_, 1
-	note A_, 1
-	note E_, 1
-	note C_, 1
+	note A_, 2
+	note E_, 2
+	note C_, 2
+	note A_, 2
+	note E_, 2
+	note C_, 2
 	octave 3
-	note A_, 1
+	note A_, 2
 
 Music_EcruteakCity_branch_ef3be: ; ef3be
 	octave 4
-	note F_, 1
-	note A_, 1
+	note F_, 2
+	note A_, 2
 	octave 5
-	note C_, 1
+	note C_, 2
 	octave 4
-	note A_, 1
+	note A_, 2
 	octave 5
-	note C_, 1
+	note C_, 2
 	octave 4
-	note A_, 1
+	note A_, 2
 	octave 5
-	note C_, 1
-	note F_, 1
+	note C_, 2
+	note F_, 2
 	loopchannel 2, Music_EcruteakCity_branch_ef3be
 
 Music_EcruteakCity_branch_ef3d0: ; ef3d0
 	octave 4
-	note G_, 1
-	note B_, 1
+	note G_, 2
+	note B_, 2
 	octave 5
-	note D_, 1
+	note D_, 2
 	octave 4
-	note B_, 1
+	note B_, 2
 	octave 5
-	note D_, 1
+	note D_, 2
 	octave 4
-	note B_, 1
+	note B_, 2
 	octave 5
-	note D_, 1
-	note G_, 1
+	note D_, 2
+	note G_, 2
 	loopchannel 2, Music_EcruteakCity_branch_ef3d0
 	intensity $50
 	dutycycle $0
-	note E_, 15
-	note G_, 15
+	note E_, 16
+	note G_, 16
 	dutycycle $2
 	endchannel
 
@@ -261,220 +261,220 @@
 
 Music_EcruteakCity_branch_ef3f2: ; ef3f2
 	notetype $6, $67
-	note __, 15
-	note __, 4
+	note __, 16
+	note __, 5
 	octave 4
-	note G_, 0
+	note G_, 1
 	octave 5
-	note D_, 0
-	note E_, 8
-	note __, 15
-	note __, 4
+	note D_, 1
+	note E_, 9
+	note __, 16
+	note __, 5
 	octave 4
-	note A_, 0
+	note A_, 1
 	octave 5
-	note E_, 0
-	note F_, 8
+	note E_, 1
+	note F_, 9
 	notetype $c, $77
-	note __, 9
-	note D_, 1
-	note C_, 1
+	note __, 10
+	note D_, 2
+	note C_, 2
 	octave 4
-	note G#, 1
-	note G_, 3
-	note A_, 3
-	note B_, 3
+	note G#, 2
+	note G_, 4
+	note A_, 4
+	note B_, 4
 	notetype $6, $93
 	intensity $97
 	dutycycle $2
 	octave 3
-	note G_, 6
+	note G_, 7
 	octave 4
-	note C#, 0
-	note D_, 10
-	note __, 0
-	note C_, 1
+	note C#, 1
+	note D_, 11
 	note __, 1
-	note C_, 15
-	note F_, 7
-	note __, 3
-	note E_, 3
-	note __, 3
-	note E_, 3
-	note F_, 3
-	note G_, 3
-	note E_, 3
-	note C_, 1
-	note __, 1
-	note C_, 3
+	note C_, 2
+	note __, 2
+	note C_, 16
+	note F_, 8
+	note __, 4
+	note E_, 4
+	note __, 4
+	note E_, 4
+	note F_, 4
+	note G_, 4
+	note E_, 4
+	note C_, 2
+	note __, 2
+	note C_, 4
 	octave 3
+	note A_, 2
+	note F_, 1
 	note A_, 1
-	note F_, 0
-	note A_, 0
 	octave 4
-	note C_, 15
-	note E_, 3
-	note G_, 1
+	note C_, 16
+	note E_, 4
+	note G_, 2
+	note __, 2
+	note E_, 4
+	note D_, 10
 	note __, 1
-	note E_, 3
-	note D_, 9
-	note __, 0
 	stereopanning $ff
-	note D#, 8
+	note D#, 9
 	stereopanning $f0
 	dutycycle $0
 	octave 5
-	note C#, 0
-	note D_, 10
-	note C_, 1
-	note __, 1
-	note C_, 15
-	note F_, 11
-	note E_, 3
-	note __, 3
-	note E_, 3
-	note F_, 3
-	note G_, 1
+	note C#, 1
+	note D_, 11
+	note C_, 2
+	note __, 2
+	note C_, 16
+	note F_, 12
+	note E_, 4
+	note __, 4
+	note E_, 4
+	note F_, 4
+	note G_, 2
 	octave 4
-	note A_, 0
+	note A_, 1
 	octave 5
-	note C_, 0
-	note E_, 0
-	note A_, 2
-	note E_, 1
-	note __, 1
-	note E_, 3
 	note C_, 1
-	note __, 1
-	note C_, 3
+	note E_, 1
+	note A_, 3
+	note E_, 2
+	note __, 2
+	note E_, 4
+	note C_, 2
+	note __, 2
+	note C_, 4
 	octave 4
-	note A_, 1
-	note __, 1
-	note B_, 3
+	note A_, 2
+	note __, 2
+	note B_, 4
 	octave 5
-	note C_, 1
+	note C_, 2
 	octave 4
-	note G_, 0
-	note B_, 0
+	note G_, 1
+	note B_, 1
 	octave 5
-	note D#, 0
-	note E_, 10
-	note D_, 1
-	note __, 1
-	note D_, 7
+	note D#, 1
+	note E_, 11
+	note D_, 2
+	note __, 2
+	note D_, 8
 	dutycycle $1
 	octave 4
-	note E_, 3
-	note G_, 2
-	note G#, 0
-	note A_, 15
+	note E_, 4
+	note G_, 3
+	note G#, 1
+	note A_, 16
 	octave 3
-	note A_, 3
+	note A_, 4
 	octave 4
-	note C_, 1
-	note __, 1
-	note E_, 3
-	note D_, 11
-	note C_, 3
-	note __, 3
+	note C_, 2
+	note __, 2
+	note E_, 4
+	note D_, 12
+	note C_, 4
+	note __, 4
 	octave 3
-	note B_, 3
-	note __, 3
+	note B_, 4
+	note __, 4
 	octave 4
-	note F_, 7
-	note G_, 11
-	note F_, 7
-	note __, 3
-	note E_, 7
-	note D_, 3
-	note C_, 1
-	note __, 1
+	note F_, 8
+	note G_, 12
+	note F_, 8
+	note __, 4
+	note E_, 8
+	note D_, 4
+	note C_, 2
+	note __, 2
 	octave 3
-	note B_, 3
+	note B_, 4
 	octave 4
-	note C_, 1
-	note __, 5
+	note C_, 2
+	note __, 6
 	octave 3
-	note B_, 3
-	note __, 3
+	note B_, 4
+	note __, 4
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note A_, 15
-	note __, 3
+	note A_, 16
+	note __, 4
 	octave 4
-	note F_, 3
-	note E_, 3
-	note D_, 3
-	note C_, 11
+	note F_, 4
+	note E_, 4
+	note D_, 4
+	note C_, 12
 	octave 3
-	note B_, 3
-	note __, 3
+	note B_, 4
+	note __, 4
 	octave 4
-	note C_, 3
-	note D_, 3
-	note D#, 3
+	note C_, 4
+	note D_, 4
+	note D#, 4
 	notetype $c, $83
-	note E_, 15
+	note E_, 16
 	intensity $80
-	note D_, 3
-	note C#, 3
-	note F_, 3
+	note D_, 4
+	note C#, 4
+	note F_, 4
 	notetype $6, $80
-	note G_, 6
-	note G#, 0
+	note G_, 7
+	note G#, 1
 	intensity $87
-	note A_, 11
-	note E_, 1
-	note __, 1
-	note E_, 1
-	note __, 1
+	note A_, 12
 	note E_, 2
-	note G#, 0
-	note A_, 3
-	note E_, 1
-	note __, 1
+	note __, 2
+	note E_, 2
+	note __, 2
 	note E_, 3
-	note D_, 1
-	note __, 1
-	note C#, 3
-	note D_, 11
+	note G#, 1
+	note A_, 4
+	note E_, 2
+	note __, 2
+	note E_, 4
+	note D_, 2
+	note __, 2
+	note C#, 4
+	note D_, 12
 	octave 3
-	note B_, 3
+	note B_, 4
 	octave 4
-	note F_, 3
-	note G_, 11
-	note D_, 1
+	note F_, 4
+	note G_, 12
+	note D_, 2
+	note __, 2
+	note D_, 2
+	note __, 2
+	note D_, 4
+	note G_, 4
+	note D_, 2
 	note __, 1
-	note D_, 1
-	note __, 1
-	note D_, 3
-	note G_, 3
-	note D_, 1
-	note __, 0
-	note A#, 0
-	note B_, 11
+	note A#, 1
+	note B_, 12
 	octave 5
-	note C_, 3
+	note C_, 4
 	octave 4
-	note A_, 7
+	note A_, 8
 	octave 3
-	note A_, 3
+	note A_, 4
 	octave 4
-	note C_, 3
+	note C_, 4
 	notetype $c, $87
-	note F_, 9
-	note G_, 1
-	note F_, 1
-	note E_, 1
-	note D_, 7
-	note __, 1
+	note F_, 10
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 8
+	note __, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note C_, 1
-	note D_, 1
-	note E_, 15
+	note C_, 2
+	note D_, 2
+	note E_, 16
 	loopchannel 0, Music_EcruteakCity_branch_ef3f2
 
 Music_EcruteakCity_Ch3: ; ef4e1
@@ -484,195 +484,195 @@
 	vibrato $12, $25
 	notetype $c, $25
 	octave 3
-	note C_, 1
-	note G_, 1
+	note C_, 2
+	note G_, 2
 	octave 4
-	note D_, 1
-	note E_, 9
+	note D_, 2
+	note E_, 10
 	octave 3
-	note C_, 1
-	note A_, 1
+	note C_, 2
+	note A_, 2
 	octave 4
-	note E_, 1
-	note F_, 9
+	note E_, 2
+	note F_, 10
 	octave 3
-	note C_, 1
-	note G_, 1
+	note C_, 2
+	note G_, 2
 	octave 4
-	note D_, 1
-	note E_, 9
-	note G_, 3
-	note F#, 3
-	note F_, 3
+	note D_, 2
+	note E_, 10
+	note G_, 4
+	note F#, 4
+	note F_, 4
 	octave 3
-	note B_, 1
-	note G_, 1
-	note C_, 1
-	note G_, 1
+	note B_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
 	octave 4
-	note D_, 1
-	note E_, 9
+	note D_, 2
+	note E_, 10
 	octave 3
-	note C#, 1
-	note G_, 1
-	note A#, 1
+	note C#, 2
+	note G_, 2
+	note A#, 2
 	octave 4
-	note D_, 1
-	note __, 1
-	note C#, 1
-	note D_, 1
-	note E_, 1
+	note D_, 2
+	note __, 2
+	note C#, 2
+	note D_, 2
+	note E_, 2
 	octave 3
-	note D_, 1
-	note A_, 0
-	note __, 0
+	note D_, 2
+	note A_, 1
+	note __, 1
 	octave 4
-	note E_, 1
-	note F_, 0
-	note __, 0
-	note G#, 7
-	octave 3
-	note G_, 1
-	octave 4
-	note D_, 1
+	note E_, 2
 	note F_, 1
-	note G#, 1
-	note B_, 1
-	note G_, 0
-	note G#, 4
+	note __, 1
+	note G#, 8
 	octave 3
-	note C_, 1
-	note G_, 1
+	note G_, 2
 	octave 4
-	note D_, 1
-	note E_, 1
+	note D_, 2
+	note F_, 2
+	note G#, 2
+	note B_, 2
 	note G_, 1
+	note G#, 5
+	octave 3
+	note C_, 2
+	note G_, 2
+	octave 4
+	note D_, 2
+	note E_, 2
+	note G_, 2
 	octave 5
-	note C_, 1
-	note D_, 1
-	note E_, 1
+	note C_, 2
+	note D_, 2
+	note E_, 2
 	octave 3
-	note C#, 1
-	note A#, 1
+	note C#, 2
+	note A#, 2
 	octave 4
-	note D_, 1
-	note C#, 1
-	note E_, 1
-	note D_, 1
-	note F_, 1
-	note G_, 0
-	note __, 0
+	note D_, 2
+	note C#, 2
+	note E_, 2
+	note D_, 2
+	note F_, 2
+	note G_, 1
+	note __, 1
 	octave 3
-	note F_, 7
+	note F_, 8
 	octave 4
-	note A_, 1
+	note A_, 2
 	octave 5
-	note C_, 0
-	note __, 0
-	note D_, 1
-	note E_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
+	note D_, 2
+	note E_, 1
+	note __, 1
 	octave 2
-	note G_, 1
+	note G_, 2
 	octave 3
-	note D_, 1
-	note G_, 1
-	note F#, 1
-	note A_, 1
-	note G_, 1
-	note B_, 1
+	note D_, 2
+	note G_, 2
+	note F#, 2
+	note A_, 2
+	note G_, 2
+	note B_, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	callchannel Music_EcruteakCity_branch_ef569
 	octave 4
-	note C_, 7
-	note E_, 7
-	note G_, 7
-	note B_, 7
-	note A#, 7
-	note G_, 7
-	note E_, 7
-	note C#, 7
+	note C_, 8
+	note E_, 8
+	note G_, 8
+	note B_, 8
+	note A#, 8
+	note G_, 8
+	note E_, 8
+	note C#, 8
 	notetype $c, $25
 	callchannel Music_EcruteakCity_branch_ef569
 	octave 4
-	note C_, 7
+	note C_, 8
 	octave 3
-	note G_, 7
-	note E_, 7
-	note D_, 7
+	note G_, 8
+	note E_, 8
+	note D_, 8
 	loopchannel 0, Music_EcruteakCity_branch_ef4e3
 ; ef569
 
 Music_EcruteakCity_branch_ef569: ; ef569
 	octave 3
-	note F_, 3
+	note F_, 4
+	note __, 2
+	note F_, 1
 	note __, 1
-	note F_, 0
-	note __, 0
-	note F_, 3
+	note F_, 4
+	note __, 2
+	note C_, 1
 	note __, 1
-	note C_, 0
-	note __, 0
-	note F_, 3
+	note F_, 4
+	note __, 2
+	note F_, 1
 	note __, 1
-	note F_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
 	note F_, 1
 	note __, 1
-	note F_, 0
-	note __, 0
-	note E_, 3
+	note F_, 2
+	note __, 2
+	note F_, 1
 	note __, 1
-	note B_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
+	note E_, 4
+	note __, 2
+	note B_, 1
+	note __, 1
 	note E_, 1
 	note __, 1
-	note B_, 0
-	note __, 0
-	note A_, 3
+	note E_, 2
+	note __, 2
+	note B_, 1
 	note __, 1
-	note A_, 0
-	note __, 0
-	note G#, 0
-	note __, 0
-	note G#, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note D_, 3
+	note A_, 4
+	note __, 2
+	note A_, 1
 	note __, 1
-	note A_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
-	note G_, 3
+	note G#, 1
 	note __, 1
+	note G#, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note D_, 4
+	note __, 2
+	note A_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note F_, 1
+	note __, 1
+	note G_, 4
+	note __, 2
 	octave 4
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
 	octave 3
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note A#, 0
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note A#, 1
 	notetype $6, $25
-	note __, 0
-	note B_, 0
+	note __, 1
+	note B_, 1
 	endchannel
 ; ef5b1
--- a/audio/music/elmslab.asm
+++ b/audio/music/elmslab.asm
@@ -15,174 +15,174 @@
 	stereopanning $f0
 	notetype $c, $b2
 	octave 2
-	note F_, 1
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	note F_, 2
+	note G_, 2
+	note A_, 2
+	note B_, 2
 	intensity $b6
 	octave 3
-	note C_, 7
+	note C_, 8
 	intensity $b2
 	octave 2
-	note A#, 1
-	note A_, 1
-	note G_, 1
+	note A#, 2
+	note A_, 2
+	note G_, 2
 	octave 3
-	note C_, 7
-	note F_, 3
-	note F_, 3
-	note F_, 7
-	note A_, 3
-	note A_, 3
-	note A_, 1
+	note C_, 8
+	note F_, 4
+	note F_, 4
+	note F_, 8
+	note A_, 4
+	note A_, 4
+	note A_, 2
 
 Music_ElmsLab_branch_ea075: ; ea075
-	note __, 1
-	note A_, 1
-	note G#, 1
-	note A_, 1
+	note __, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
 	intensity $b7
 	octave 4
-	note C_, 3
+	note C_, 4
 	intensity $b5
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	intensity $b4
-	note F_, 7
+	note F_, 8
 	intensity $b5
 	octave 3
-	note A_, 1
-	note G#, 1
-	note A_, 1
-	note F_, 1
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note F_, 2
 	intensity $b7
-	note F_, 7
+	note F_, 8
 	intensity $b5
-	note A_, 1
-	note G_, 1
-	note F_, 1
+	note A_, 2
+	note G_, 2
+	note F_, 2
 	intensity $b2
-	note G_, 3
+	note G_, 4
 	intensity $b5
-	note A_, 1
-	note G#, 1
-	note A_, 1
+	note A_, 2
+	note G#, 2
+	note A_, 2
 	intensity $b7
-	note F_, 3
+	note F_, 4
 	intensity $b5
-	note C_, 3
+	note C_, 4
 	intensity $b7
-	note D_, 7
+	note D_, 8
 	intensity $b4
-	note F_, 1
-	note E_, 1
-	note D_, 1
-	note F_, 1
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note F_, 2
 	intensity $b7
-	note E_, 7
+	note E_, 8
 	intensity $b4
-	note G_, 1
-	note F_, 1
-	note E_, 1
-	note G_, 1
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note G_, 2
 	intensity $b7
-	note F_, 7
+	note F_, 8
 	intensity $b4
-	note G_, 1
-	note A_, 1
-	note A#, 1
-	note A_, 1
+	note G_, 2
+	note A_, 2
+	note A#, 2
+	note A_, 2
 	intensity $b2
-	note G_, 3
+	note G_, 4
 	intensity $b4
-	note F_, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
-	note E_, 1
+	note F_, 2
+	note A_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
 	intensity $b2
-	note G_, 5
+	note G_, 6
 	intensity $b7
-	note F_, 3
+	note F_, 4
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note F_, 3
-	note D_, 1
-	note A#, 3
-	note A_, 3
+	note F_, 4
+	note D_, 2
+	note A#, 4
+	note A_, 4
 	intensity $b4
-	note G_, 1
-	note F_, 1
-	note G_, 1
+	note G_, 2
+	note F_, 2
+	note G_, 2
 	intensity $b2
-	note A_, 5
+	note A_, 6
 	intensity $b7
-	note E_, 3
-	note A#, 1
-	note E_, 5
+	note E_, 4
+	note A#, 2
+	note E_, 6
 	intensity $b3
-	note F_, 1
-	note E_, 1
-	note F_, 1
-	note G_, 1
-	note A_, 1
-	note A_, 1
-	note G_, 1
+	note F_, 2
+	note E_, 2
+	note F_, 2
+	note G_, 2
+	note A_, 2
+	note A_, 2
+	note G_, 2
 	intensity $b2
-	note E_, 5
+	note E_, 6
 	intensity $b4
-	note F_, 3
+	note F_, 4
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note F_, 1
+	note F_, 2
 	octave 4
-	note C_, 1
-	note D_, 1
-	note C_, 1
+	note C_, 2
+	note D_, 2
+	note C_, 2
 	octave 3
-	note A#, 1
-	note A_, 1
+	note A#, 2
+	note A_, 2
 	intensity $b7
-	note A#, 7
+	note A#, 8
 	octave 4
-	note E_, 3
-	note D_, 3
-	note C_, 3
+	note E_, 4
+	note D_, 4
+	note C_, 4
 	octave 3
-	note A#, 3
+	note A#, 4
 	octave 4
-	note C_, 3
-	note D_, 3
-	note D#, 3
-	note E_, 3
+	note C_, 4
+	note D_, 4
+	note D#, 4
+	note E_, 4
 	intensity $b4
 	octave 3
-	note A_, 1
-	note F_, 1
+	note A_, 2
+	note F_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note F_, 1
-	note A_, 1
-	note F_, 1
+	note F_, 2
+	note A_, 2
+	note F_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note F_, 1
-	note A_, 1
-	note F_, 1
+	note F_, 2
+	note A_, 2
+	note F_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note F_, 1
-	note A_, 1
+	note F_, 2
+	note A_, 2
 	intensity $b2
-	note F_, 1
-	note F_, 3
+	note F_, 2
+	note F_, 4
 	loopchannel 0, Music_ElmsLab_branch_ea075
 
 Music_ElmsLab_Ch2: ; ea128
@@ -191,344 +191,344 @@
 	stereopanning $f
 	notetype $c, $c3
 	octave 4
-	note F_, 1
-	note E_, 1
-	note D_, 1
+	note F_, 2
+	note E_, 2
+	note D_, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	intensity $c5
 	octave 4
-	note C_, 7
+	note C_, 8
 	intensity $c3
 	octave 3
-	note A#, 1
-	note A_, 1
-	note G_, 1
-	note E_, 1
+	note A#, 2
+	note A_, 2
+	note G_, 2
+	note E_, 2
 	intensity $c2
-	note F_, 5
+	note F_, 6
 	octave 4
-	note C_, 3
-	note C_, 3
-	note C_, 7
-	note C_, 3
-	note C_, 3
-	note C_, 1
+	note C_, 4
+	note C_, 4
+	note C_, 8
+	note C_, 4
+	note C_, 4
+	note C_, 2
 	stereopanning $ff
 
 Music_ElmsLab_branch_ea14f: ; ea14f
 	intensity $c6
 	octave 4
-	note F_, 5
+	note F_, 6
 	intensity $c2
-	note E_, 1
-	note F_, 1
-	note E_, 1
-	note F_, 1
-	note G_, 1
+	note E_, 2
+	note F_, 2
+	note E_, 2
+	note F_, 2
+	note G_, 2
 	intensity $c7
-	note A_, 5
+	note A_, 6
 	intensity $c2
-	note F_, 1
+	note F_, 2
 	intensity $c7
-	note C_, 7
+	note C_, 8
 	intensity $c7
-	note D_, 5
+	note D_, 6
 	intensity $c3
-	note C#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note E_, 1
+	note C#, 2
+	note D_, 2
+	note C#, 2
+	note D_, 2
+	note E_, 2
 	intensity $c7
-	note F_, 5
+	note F_, 6
 	intensity $c3
-	note C_, 1
+	note C_, 2
 	intensity $c7
 	octave 3
-	note A_, 9
+	note A_, 10
 	intensity $c3
-	note A#, 1
-	note A#, 1
+	note A#, 2
+	note A#, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	intensity $c5
-	note C_, 3
+	note C_, 4
 	octave 3
-	note A#, 5
+	note A#, 6
 	intensity $c3
 	octave 4
-	note C_, 1
-	note C_, 1
-	note E_, 1
+	note C_, 2
+	note C_, 2
+	note E_, 2
 	intensity $c4
-	note D_, 3
-	note C_, 5
+	note D_, 4
+	note C_, 6
 	intensity $c2
-	note D_, 1
-	note D_, 1
-	note F_, 1
-	note G_, 1
-	note F_, 1
-	note E_, 1
-	note F_, 1
+	note D_, 2
+	note D_, 2
+	note F_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note F_, 2
 	intensity $c2
-	note G_, 3
+	note G_, 4
 	intensity $c6
-	note C_, 3
-	note D_, 3
+	note C_, 4
+	note D_, 4
 	intensity $c4
-	note E_, 5
+	note E_, 6
 	intensity $c3
-	note F_, 1
-	note F_, 1
-	note G_, 1
+	note F_, 2
+	note F_, 2
+	note G_, 2
 	intensity $c7
-	note A_, 3
+	note A_, 4
 	intensity $c3
+	note G_, 2
+	note F#, 2
+	note G_, 2
+	note F#, 2
 	note G_, 1
-	note F#, 1
-	note G_, 1
-	note F#, 1
-	note G_, 0
-	note F_, 1
+	note F_, 2
 	intensity $c7
-	note D_, 10
+	note D_, 11
 	intensity $c3
-	note E_, 1
-	note E_, 1
-	note F_, 1
+	note E_, 2
+	note E_, 2
+	note F_, 2
 	intensity $c7
-	note G_, 3
+	note G_, 4
 	intensity $c3
+	note F_, 2
+	note E_, 2
+	note F_, 2
+	note G_, 2
 	note F_, 1
-	note E_, 1
-	note F_, 1
-	note G_, 1
-	note F_, 0
-	note D_, 1
+	note D_, 2
 	intensity $c7
-	note C_, 10
+	note C_, 11
 	intensity $c4
-	note F_, 1
-	note F_, 1
-	note G_, 1
+	note F_, 2
+	note F_, 2
+	note G_, 2
 	intensity $c7
-	note A_, 3
+	note A_, 4
 	intensity $c4
-	note G_, 1
-	note F_, 1
+	note G_, 2
+	note F_, 2
+	note A#, 2
+	note A_, 2
 	note A#, 1
-	note A_, 1
-	note A#, 0
 	octave 5
-	note C_, 1
-	note D_, 4
+	note C_, 2
+	note D_, 5
 	intensity $c3
-	note E_, 1
-	note D_, 1
+	note E_, 2
+	note D_, 2
 	intensity $c7
-	note C_, 3
+	note C_, 4
 	octave 4
-	note A#, 3
-	note A_, 3
-	note G_, 3
+	note A#, 4
+	note A_, 4
+	note G_, 4
 	octave 5
-	note C_, 3
+	note C_, 4
 	octave 4
-	note A#, 3
-	note A_, 3
-	note G_, 3
+	note A#, 4
+	note A_, 4
+	note G_, 4
 	intensity $b0
-	note F_, 7
+	note F_, 8
 	intensity $a0
-	note F_, 7
+	note F_, 8
 	intensity $a7
-	note F_, 9
+	note F_, 10
 	intensity $c2
-	note C_, 1
-	note F_, 1
+	note C_, 2
+	note F_, 2
 	intensity $c4
 	octave 3
-	note E_, 1
+	note E_, 2
 	loopchannel 0, Music_ElmsLab_branch_ea14f
 
 Music_ElmsLab_Ch3: ; ea1fd
 	stereopanning $f
 	notetype $c, $25
-	note __, 7
-	note __, 13
+	note __, 8
+	note __, 14
 	octave 3
-	note C_, 1
-	note F_, 1
-	note A_, 1
-	note C_, 1
-	note A_, 1
-	note F_, 1
-	note A_, 1
-	note C_, 1
-	note A_, 1
-	note F_, 1
-	note A_, 1
-	note C_, 1
-	note A_, 1
-	note F_, 1
-	note C_, 1
-	note D_, 1
-	note E_, 1
+	note C_, 2
+	note F_, 2
+	note A_, 2
+	note C_, 2
+	note A_, 2
+	note F_, 2
+	note A_, 2
+	note C_, 2
+	note A_, 2
+	note F_, 2
+	note A_, 2
+	note C_, 2
+	note A_, 2
+	note F_, 2
+	note C_, 2
+	note D_, 2
+	note E_, 2
 
 Music_ElmsLab_branch_ea216: ; ea216
-	note F_, 1
-	note A_, 1
-	note C_, 1
-	note A_, 1
-	note F_, 1
-	note A_, 1
-	note C_, 1
-	note A_, 1
-	note F_, 1
-	note A_, 1
-	note C_, 1
-	note A_, 1
-	note F_, 1
-	note A_, 1
-	note E_, 1
+	note F_, 2
+	note A_, 2
+	note C_, 2
+	note A_, 2
+	note F_, 2
+	note A_, 2
+	note C_, 2
+	note A_, 2
+	note F_, 2
+	note A_, 2
+	note C_, 2
+	note A_, 2
+	note F_, 2
+	note A_, 2
+	note E_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note D_, 1
-	note A_, 1
+	note D_, 2
+	note A_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note A_, 1
-	note D_, 1
-	note A_, 1
-	note D_, 1
-	note E_, 1
-	note F_, 1
-	note A_, 1
-	note C_, 1
-	note A_, 1
-	note F_, 1
-	note C_, 1
-	note D_, 1
-	note E_, 1
-	note F_, 1
-	note A#, 1
-	note D_, 1
-	note A#, 1
-	note F_, 1
-	note A#, 1
-	note D_, 1
-	note A#, 1
-	note G_, 1
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	note A_, 2
+	note C_, 2
+	note A_, 2
+	note F_, 2
+	note C_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	note A#, 2
+	note D_, 2
+	note A#, 2
+	note F_, 2
+	note A#, 2
+	note D_, 2
+	note A#, 2
+	note G_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G_, 1
+	note G_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note E_, 1
-	note A_, 1
-	note A#, 1
+	note E_, 2
+	note A_, 2
+	note A#, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note F_, 1
+	note F_, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note F_, 1
-	note B_, 1
+	note F_, 2
+	note B_, 2
 	octave 4
-	note C_, 1
-	note __, 1
-	note C_, 3
+	note C_, 2
+	note __, 2
+	note C_, 4
 	octave 3
-	note A#, 3
-	note G_, 3
-	note F_, 1
-	note A_, 1
-	note C_, 1
-	note A_, 1
-	note F_, 1
-	note A_, 1
-	note C_, 1
-	note A_, 1
-	note G_, 1
-	note A#, 1
-	note D_, 1
-	note A#, 1
-	note G_, 1
-	note A#, 1
-	note D_, 1
-	note A_, 1
-	note E_, 1
-	note G_, 1
-	note C_, 1
-	note G_, 1
-	note E_, 1
-	note G_, 1
-	note C_, 1
-	note G_, 1
-	note F_, 1
-	note A_, 1
-	note C_, 1
-	note A_, 1
-	note F_, 1
-	note A_, 1
-	note G_, 1
-	note E_, 1
-	note F_, 1
-	note A_, 1
-	note C_, 1
-	note A_, 1
-	note F_, 1
-	note A_, 1
-	note C_, 1
-	note A_, 1
-	note G_, 1
-	note A#, 1
-	note D_, 1
-	note A#, 1
-	note G_, 1
-	note A#, 1
-	note A_, 1
-	note G_, 1
-	note C_, 3
-	note D_, 3
-	note E_, 3
-	note G_, 3
-	note E_, 3
-	note F_, 3
-	note F#, 3
-	note G_, 3
-	note F_, 1
-	note A_, 1
-	note C_, 1
-	note A_, 1
-	note F_, 1
-	note A_, 1
-	note C_, 1
-	note A_, 1
-	note F_, 1
-	note A_, 1
-	note C_, 1
-	note A_, 1
-	note F_, 1
-	note C_, 1
-	note F_, 1
-	note A_, 1
+	note A#, 4
+	note G_, 4
+	note F_, 2
+	note A_, 2
+	note C_, 2
+	note A_, 2
+	note F_, 2
+	note A_, 2
+	note C_, 2
+	note A_, 2
+	note G_, 2
+	note A#, 2
+	note D_, 2
+	note A#, 2
+	note G_, 2
+	note A#, 2
+	note D_, 2
+	note A_, 2
+	note E_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note F_, 2
+	note A_, 2
+	note C_, 2
+	note A_, 2
+	note F_, 2
+	note A_, 2
+	note G_, 2
+	note E_, 2
+	note F_, 2
+	note A_, 2
+	note C_, 2
+	note A_, 2
+	note F_, 2
+	note A_, 2
+	note C_, 2
+	note A_, 2
+	note G_, 2
+	note A#, 2
+	note D_, 2
+	note A#, 2
+	note G_, 2
+	note A#, 2
+	note A_, 2
+	note G_, 2
+	note C_, 4
+	note D_, 4
+	note E_, 4
+	note G_, 4
+	note E_, 4
+	note F_, 4
+	note F#, 4
+	note G_, 4
+	note F_, 2
+	note A_, 2
+	note C_, 2
+	note A_, 2
+	note F_, 2
+	note A_, 2
+	note C_, 2
+	note A_, 2
+	note F_, 2
+	note A_, 2
+	note C_, 2
+	note A_, 2
+	note F_, 2
+	note C_, 2
+	note F_, 2
+	note A_, 2
 	loopchannel 0, Music_ElmsLab_branch_ea216
 
 Music_ElmsLab_Ch4: ; ea2b1
@@ -535,10 +535,10 @@
 	stereopanning $f0
 	togglenoise $0
 	notetype $c
-	note __, 15
-	note __, 1
+	note __, 16
+	note __, 2
 
 Music_ElmsLab_branch_ea2b9: ; ea2b9
-	note G_, 3
+	note G_, 4
 	loopchannel 0, Music_ElmsLab_branch_ea2b9
 ; ea2be
--- a/audio/music/evolution.asm
+++ b/audio/music/evolution.asm
@@ -15,14 +15,14 @@
 	notetype $c, $92
 	octave 3
 	unknownmusic0xe0 $0, $4a
-	note C_, 0
+	note C_, 1
 	unknownmusic0xe0 $0, $4a
-	note G_, 0
+	note G_, 1
 	unknownmusic0xe0 $0, $4a
-	note C_, 0
+	note C_, 1
 	unknownmusic0xe0 $0, $4a
-	note G_, 0
-	note __, 3
+	note G_, 1
+	note __, 4
 	dutycycle $3
 	stereopanning $f
 
@@ -29,17 +29,17 @@
 Music_Evolution_branch_f0713: ; f0713
 	callchannel Music_Evolution_branch_f0737
 	notetype $c, $a4
-	note F#, 3
+	note F#, 4
 	callchannel Music_Evolution_branch_f0737
 	notetype $c, $a4
-	note F#, 3
+	note F#, 4
 	loopchannel 2, Music_Evolution_branch_f0713
 	callchannel Music_Evolution_branch_f0743
 	notetype $c, $a4
-	note G#, 3
+	note G#, 4
 	callchannel Music_Evolution_branch_f0743
 	notetype $c, $a4
-	note G#, 3
+	note G#, 4
 	loopchannel 0, Music_Evolution_branch_f0713
 ; f0737
 
@@ -46,13 +46,13 @@
 Music_Evolution_branch_f0737: ; f0737
 	notetype $c, $a2
 	octave 3
-	note C_, 3
-	note G_, 3
-	note C_, 3
-	note G_, 3
-	note C_, 3
-	note G_, 3
-	note C_, 3
+	note C_, 4
+	note G_, 4
+	note C_, 4
+	note G_, 4
+	note C_, 4
+	note G_, 4
+	note C_, 4
 	endchannel
 ; f0743
 
@@ -59,13 +59,13 @@
 Music_Evolution_branch_f0743: ; f0743
 	notetype $c, $a2
 	octave 3
-	note D_, 3
-	note A_, 3
-	note D_, 3
-	note A_, 3
-	note D_, 3
-	note A_, 3
-	note D_, 3
+	note D_, 4
+	note A_, 4
+	note D_, 4
+	note A_, 4
+	note D_, 4
+	note A_, 4
+	note D_, 4
 	endchannel
 
 Music_Evolution_Ch2: ; f074f
@@ -73,11 +73,11 @@
 	vibrato $8, $25
 	notetype $c, $a2
 	octave 4
-	note G_, 0
-	note D_, 0
-	note G_, 0
-	note D_, 0
-	note __, 3
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note __, 4
 	dutycycle $3
 	stereopanning $f0
 
@@ -84,18 +84,18 @@
 Music_Evolution_branch_f0761: ; f0761
 	callchannel Music_Evolution_branch_f0787
 	notetype $c, $b5
-	note A_, 3
+	note A_, 4
 	callchannel Music_Evolution_branch_f0787
 	notetype $c, $b5
-	note B_, 3
+	note B_, 4
 	loopchannel 2, Music_Evolution_branch_f0761
 	callchannel Music_Evolution_branch_f0793
 	notetype $c, $b5
-	note B_, 3
+	note B_, 4
 	callchannel Music_Evolution_branch_f0793
 	notetype $c, $b5
 	octave 4
-	note C#, 3
+	note C#, 4
 	octave 3
 	loopchannel 0, Music_Evolution_branch_f0761
 ; f0787
@@ -103,13 +103,13 @@
 Music_Evolution_branch_f0787: ; f0787
 	notetype $c, $b2
 	octave 3
-	note G_, 3
-	note D_, 3
-	note G_, 3
-	note D_, 3
-	note G_, 3
-	note D_, 3
-	note G_, 3
+	note G_, 4
+	note D_, 4
+	note G_, 4
+	note D_, 4
+	note G_, 4
+	note D_, 4
+	note G_, 4
 	endchannel
 ; f0793
 
@@ -116,97 +116,97 @@
 Music_Evolution_branch_f0793: ; f0793
 	notetype $c, $b2
 	octave 3
-	note A_, 3
-	note E_, 3
-	note A_, 3
-	note E_, 3
-	note A_, 3
-	note E_, 3
-	note A_, 3
+	note A_, 4
+	note E_, 4
+	note A_, 4
+	note E_, 4
+	note A_, 4
+	note E_, 4
+	note A_, 4
 	endchannel
 
 Music_Evolution_Ch3: ; f079f
 	notetype $c, $16
-	note __, 7
+	note __, 8
 
 Music_Evolution_branch_f07a3: ; f07a3
 	callchannel Music_Evolution_branch_f07bf
 	octave 3
-	note A_, 3
+	note A_, 4
 	callchannel Music_Evolution_branch_f07bf
 	octave 3
-	note B_, 3
+	note B_, 4
 	loopchannel 2, Music_Evolution_branch_f07a3
 	callchannel Music_Evolution_branch_f07d5
 	octave 3
-	note B_, 3
+	note B_, 4
 	callchannel Music_Evolution_branch_f07d5
 	octave 4
-	note C#, 3
+	note C#, 4
 	loopchannel 0, Music_Evolution_branch_f07a3
 ; f07bf
 
 Music_Evolution_branch_f07bf: ; f07bf
 	octave 2
-	note A_, 1
-	note __, 1
+	note A_, 2
+	note __, 2
 	octave 3
-	note D_, 1
-	note __, 1
+	note D_, 2
+	note __, 2
 	octave 2
-	note A_, 1
-	note __, 1
+	note A_, 2
+	note __, 2
 	octave 3
-	note D_, 1
-	note __, 1
+	note D_, 2
+	note __, 2
 	octave 2
-	note A_, 1
-	note __, 1
+	note A_, 2
+	note __, 2
 	octave 3
-	note D_, 1
-	note __, 1
+	note D_, 2
+	note __, 2
 	octave 2
-	note A_, 1
-	note __, 1
+	note A_, 2
+	note __, 2
 	endchannel
 ; f07d5
 
 Music_Evolution_branch_f07d5: ; f07d5
 	octave 2
-	note B_, 1
-	note __, 1
+	note B_, 2
+	note __, 2
 	octave 3
-	note E_, 1
-	note __, 1
+	note E_, 2
+	note __, 2
 	octave 2
-	note B_, 1
-	note __, 1
+	note B_, 2
+	note __, 2
 	octave 3
-	note E_, 1
-	note __, 1
+	note E_, 2
+	note __, 2
 	octave 2
-	note B_, 1
-	note __, 1
+	note B_, 2
+	note __, 2
 	octave 3
-	note E_, 1
-	note __, 1
+	note E_, 2
+	note __, 2
 	octave 2
-	note A_, 1
-	note __, 1
+	note A_, 2
+	note __, 2
 	endchannel
 
 Music_Evolution_Ch4: ; f07eb
 	togglenoise $5
 	notetype $c
-	note __, 7
+	note __, 8
 
 Music_Evolution_branch_f07f0: ; f07f0
 	stereopanning $f0
-	note A#, 5
-	note A#, 3
+	note A#, 6
+	note A#, 4
 	stereopanning $f
-	note E_, 1
-	note E_, 1
-	note E_, 1
+	note E_, 2
+	note E_, 2
+	note E_, 2
 	loopchannel 0, Music_Evolution_branch_f07f0
 ; f07fd
--- a/audio/music/gamecorner.asm
+++ b/audio/music/gamecorner.asm
@@ -11,138 +11,138 @@
 	volume $77
 	stereopanning $f
 	notetype $c, $91
-	note __, 7
+	note __, 8
 
 Music_GameCorner_branch_edd84: ; edd84
 	intensity $91
-	note __, 15
-	note __, 15
-	note __, 15
-	note __, 15
+	note __, 16
+	note __, 16
+	note __, 16
+	note __, 16
 	callchannel Music_GameCorner_branch_ede03
 	callchannel Music_GameCorner_branch_ede03
 	callchannel Music_GameCorner_branch_ede03
 	callchannel Music_GameCorner_branch_ede13
-	note __, 15
-	note __, 15
-	note __, 15
-	note __, 15
-	note __, 15
+	note __, 16
+	note __, 16
+	note __, 16
+	note __, 16
+	note __, 16
 	callchannel Music_GameCorner_branch_ede03
 	callchannel Music_GameCorner_branch_ede03
 	callchannel Music_GameCorner_branch_ede03
 	callchannel Music_GameCorner_branch_ede13
 	octave 3
-	note __, 1
+	note __, 2
+	note G#, 3
+	note G#, 3
+	note A#, 2
+	note A#, 2
 	note G#, 2
-	note G#, 2
-	note A#, 1
-	note A#, 1
-	note G#, 1
-	note G_, 1
+	note G_, 2
 	intensity $71
 
 Music_GameCorner_branch_eddb1: ; eddb1
 	octave 4
-	note G#, 0
+	note G#, 1
 	octave 5
-	note C_, 0
-	note F_, 0
-	note C_, 0
+	note C_, 1
+	note F_, 1
+	note C_, 1
 	loopchannel 4, Music_GameCorner_branch_eddb1
 
 Music_GameCorner_branch_eddbb: ; eddbb
 	octave 4
-	note A#, 0
+	note A#, 1
 	octave 5
-	note D_, 0
-	note G_, 0
-	note D_, 0
+	note D_, 1
+	note G_, 1
+	note D_, 1
 	loopchannel 4, Music_GameCorner_branch_eddbb
 
 Music_GameCorner_branch_eddc5: ; eddc5
 	octave 4
-	note D#, 0
-	note G_, 0
+	note D#, 1
+	note G_, 1
 	octave 5
-	note C_, 0
+	note C_, 1
 	octave 4
-	note G_, 0
+	note G_, 1
 	loopchannel 4, Music_GameCorner_branch_eddc5
 
 Music_GameCorner_branch_eddd0: ; eddd0
 	octave 4
-	note F_, 0
-	note A_, 0
+	note F_, 1
+	note A_, 1
 	octave 5
-	note C_, 0
+	note C_, 1
 	octave 4
-	note A_, 0
+	note A_, 1
 	loopchannel 4, Music_GameCorner_branch_eddd0
 
 Music_GameCorner_branch_edddb: ; edddb
 	octave 4
-	note G#, 0
+	note G#, 1
 	octave 5
-	note C_, 0
-	note F_, 0
-	note C_, 0
+	note C_, 1
+	note F_, 1
+	note C_, 1
 	loopchannel 4, Music_GameCorner_branch_edddb
 
 Music_GameCorner_branch_edde5: ; edde5
 	octave 4
-	note A#, 0
+	note A#, 1
 	octave 5
-	note D_, 0
-	note G_, 0
-	note D_, 0
+	note D_, 1
+	note G_, 1
+	note D_, 1
 	loopchannel 4, Music_GameCorner_branch_edde5
 
 Music_GameCorner_branch_eddef: ; eddef
 	octave 4
-	note B_, 0
+	note B_, 1
 	octave 5
-	note D_, 0
-	note G_, 0
-	note D_, 0
+	note D_, 1
+	note G_, 1
+	note D_, 1
 	loopchannel 4, Music_GameCorner_branch_eddef
 	octave 3
-	note D_, 0
-	note D_, 0
-	note D_, 2
-	note F_, 1
-	note F_, 8
+	note D_, 1
+	note D_, 1
+	note D_, 3
+	note F_, 2
+	note F_, 9
 	loopchannel 0, Music_GameCorner_branch_edd84
 ; ede03
 
 Music_GameCorner_branch_ede03: ; ede03
-	note __, 1
+	note __, 2
 	octave 4
-	note A#, 2
-	note G_, 2
-	note D#, 2
+	note A#, 3
+	note G_, 3
+	note D#, 3
 	octave 3
+	note F_, 3
 	note F_, 2
-	note F_, 1
-	note __, 1
-	note G#, 2
-	note G#, 2
-	note A#, 1
-	note A#, 1
-	note G#, 0
+	note __, 2
+	note G#, 3
+	note G#, 3
 	note A#, 2
+	note A#, 2
+	note G#, 1
+	note A#, 3
 	endchannel
 ; ede13
 
 Music_GameCorner_branch_ede13: ; ede13
-	note __, 1
+	note __, 2
 	octave 4
-	note A#, 2
-	note G_, 2
-	note D#, 2
+	note A#, 3
+	note G_, 3
+	note D#, 3
 	octave 3
+	note F_, 3
 	note F_, 2
-	note F_, 1
 	endchannel
 
 Music_GameCorner_Ch2: ; ede1c
@@ -149,7 +149,7 @@
 	stereopanning $ff
 	vibrato $8, $24
 	notetype $c, $a1
-	note __, 7
+	note __, 8
 
 Music_GameCorner_branch_ede25: ; ede25
 	intensity $92
@@ -156,64 +156,64 @@
 	dutycycle $1
 	callchannel Music_GameCorner_branch_ede75
 	octave 1
-	note F_, 1
+	note F_, 2
 	octave 3
-	note G#, 1
+	note G#, 2
 	octave 1
-	note F_, 0
+	note F_, 1
 	octave 3
-	note G#, 1
-	intensity $a4
 	note G#, 2
+	intensity $a4
+	note G#, 3
 	intensity $92
-	note G_, 1
-	note A#, 0
+	note G_, 2
+	note A#, 1
 	octave 4
-	note C_, 2
+	note C_, 3
 	callchannel Music_GameCorner_branch_ede75
 	octave 4
+	note F_, 2
+	note D#, 2
 	note F_, 1
-	note D#, 1
-	note F_, 0
-	note D#, 1
+	note D#, 2
 	intensity $a4
-	note G_, 2
-	note F_, 3
+	note G_, 3
+	note F_, 4
 	dutycycle $2
 	intensity $c7
 	octave 3
-	note D#, 0
-	note F_, 0
-	note G_, 5
-	note F_, 5
-	note C_, 3
-	note D_, 5
-	note D#, 5
-	note F_, 3
-	note D_, 5
-	note C_, 5
+	note D#, 1
+	note F_, 1
+	note G_, 6
+	note F_, 6
+	note C_, 4
+	note D_, 6
+	note D#, 6
+	note F_, 4
+	note D_, 6
+	note C_, 6
 	octave 2
-	note A#, 3
-	note A_, 3
-	note __, 9
+	note A#, 4
+	note A_, 4
+	note __, 10
 	octave 3
-	note D#, 0
-	note F_, 0
-	note G_, 5
-	note F_, 5
-	note C_, 3
-	note D_, 5
-	note D#, 5
+	note D#, 1
 	note F_, 1
-	note D#, 0
-	note F_, 0
-	note G_, 15
+	note G_, 6
+	note F_, 6
+	note C_, 4
+	note D_, 6
+	note D#, 6
+	note F_, 2
+	note D#, 1
+	note F_, 1
+	note G_, 16
 	intensity $92
-	note G_, 0
-	note G_, 0
-	note G_, 2
-	note A#, 1
-	note A#, 8
+	note G_, 1
+	note G_, 1
+	note G_, 3
+	note A#, 2
+	note A#, 9
 	intensity $a4
 	loopchannel 0, Music_GameCorner_branch_ede25
 ; ede75
@@ -220,119 +220,119 @@
 
 Music_GameCorner_branch_ede75: ; ede75
 	octave 1
-	note C_, 1
+	note C_, 2
 	octave 3
-	note D#, 2
-	note D#, 2
-	note D#, 2
+	note D#, 3
+	note D#, 3
+	note D#, 3
+	note F_, 3
 	note F_, 2
-	note F_, 1
 	octave 1
-	note C_, 1
+	note C_, 2
 	octave 3
-	note D#, 2
-	note D#, 2
-	note F_, 1
-	note F_, 1
-	note D#, 0
+	note D#, 3
+	note D#, 3
 	note F_, 2
+	note F_, 2
+	note D#, 1
+	note F_, 3
 	octave 1
-	note C_, 1
+	note C_, 2
 	octave 3
-	note D#, 2
-	note D#, 2
-	note D#, 2
+	note D#, 3
+	note D#, 3
+	note D#, 3
+	note F_, 3
 	note F_, 2
-	note F_, 1
 	octave 1
-	note C_, 1
+	note C_, 2
 	octave 3
-	note D#, 2
-	note D#, 2
-	note F_, 1
-	note C_, 1
-	note D#, 0
+	note D#, 3
+	note D#, 3
 	note F_, 2
+	note C_, 2
+	note D#, 1
+	note F_, 3
 	octave 1
-	note C_, 1
+	note C_, 2
 	octave 5
-	note D_, 2
+	note D_, 3
 	octave 4
-	note A#, 2
-	note G_, 1
-	note C_, 1
-	note D_, 1
-	note D#, 1
+	note A#, 3
+	note G_, 2
+	note C_, 2
+	note D_, 2
+	note D#, 2
+	note F_, 2
+	note D#, 2
 	note F_, 1
-	note D#, 1
-	note F_, 0
-	note D#, 1
+	note D#, 2
 	intensity $a4
-	note F_, 2
-	note G_, 3
+	note F_, 3
+	note G_, 4
 	intensity $92
-	note F#, 0
-	note F_, 0
+	note F#, 1
+	note F_, 1
 	octave 1
-	note C_, 1
+	note C_, 2
 	octave 5
-	note D_, 2
+	note D_, 3
 	octave 4
-	note A#, 2
-	note G_, 1
-	note C_, 1
-	note D_, 1
-	note D#, 1
+	note A#, 3
+	note G_, 2
+	note C_, 2
+	note D_, 2
+	note D#, 2
 	octave 1
-	note F_, 0
+	note F_, 1
 	octave 4
-	note F_, 0
-	note D#, 1
-	note G_, 0
-	note D#, 1
+	note F_, 1
+	note D#, 2
+	note G_, 1
+	note D#, 2
 	intensity $a4
-	note A#, 2
-	note A_, 1
+	note A#, 3
+	note A_, 2
 	intensity $92
-	note A#, 0
+	note A#, 1
 	octave 5
-	note C_, 2
+	note C_, 3
 	octave 1
-	note C_, 1
+	note C_, 2
 	octave 5
-	note D_, 2
+	note D_, 3
 	octave 4
-	note A#, 2
-	note G_, 1
-	note C_, 1
-	note D_, 1
-	note D#, 1
+	note A#, 3
+	note G_, 2
+	note C_, 2
+	note D_, 2
+	note D#, 2
+	note F_, 2
+	note D#, 2
 	note F_, 1
-	note D#, 1
-	note F_, 0
-	note D#, 1
+	note D#, 2
 	intensity $a4
-	note F_, 2
-	note G_, 3
+	note F_, 3
+	note G_, 4
 	intensity $92
-	note F#, 0
-	note F_, 0
+	note F#, 1
+	note F_, 1
 	octave 1
-	note C_, 1
+	note C_, 2
 	octave 5
-	note D_, 2
+	note D_, 3
 	octave 4
-	note A#, 2
-	note G_, 1
-	note C_, 1
-	note D_, 1
-	note D#, 1
+	note A#, 3
+	note G_, 2
+	note C_, 2
+	note D_, 2
+	note D#, 2
 	endchannel
 
 Music_GameCorner_Ch3: ; edee8
 	vibrato $8, $22
 	notetype $c, $14
-	note __, 7
+	note __, 8
 
 Music_GameCorner_branch_edeef: ; edeef
 	stereopanning $ff
@@ -340,14 +340,14 @@
 	callchannel Music_GameCorner_branch_edfdd
 	callchannel Music_GameCorner_branch_edff8
 	octave 4
-	note G_, 0
-	note A_, 2
+	note G_, 1
+	note A_, 3
 	callchannel Music_GameCorner_branch_edfdd
 	callchannel Music_GameCorner_branch_edff8
 	octave 4
-	note A#, 0
+	note A#, 1
 	octave 5
-	note C_, 2
+	note C_, 3
 	stereopanning $f0
 	callchannel Music_GameCorner_branch_edfdd
 	callchannel Music_GameCorner_branch_ee00c
@@ -358,37 +358,37 @@
 	callchannel Music_GameCorner_branch_edfdd
 	stereopanning $ff
 	octave 2
-	note F_, 0
+	note F_, 1
 	octave 3
-	note F_, 0
+	note F_, 1
 	octave 5
-	note C_, 0
+	note C_, 1
 	octave 4
-	note F_, 0
+	note F_, 1
 	octave 2
-	note F_, 0
+	note F_, 1
 	octave 5
-	note C_, 0
+	note C_, 1
 	octave 3
-	note F_, 0
+	note F_, 1
 	octave 5
-	note D#, 2
-	note D_, 0
-	note __, 0
-	note D#, 0
-	note F_, 0
+	note D#, 3
+	note D_, 1
 	note __, 1
+	note D#, 1
+	note F_, 1
+	note __, 2
 	callchannel Music_GameCorner_branch_edfdd
 	callchannel Music_GameCorner_branch_edff8
 	octave 4
-	note G_, 0
-	note A_, 2
+	note G_, 1
+	note A_, 3
 	callchannel Music_GameCorner_branch_edfdd
 	callchannel Music_GameCorner_branch_edff8
 	octave 4
-	note A#, 0
+	note A#, 1
 	octave 5
-	note C_, 2
+	note C_, 3
 	stereopanning $f0
 	callchannel Music_GameCorner_branch_edfdd
 	callchannel Music_GameCorner_branch_ee00c
@@ -398,281 +398,281 @@
 	callchannel Music_GameCorner_branch_ee00c
 	callchannel Music_GameCorner_branch_edfdd
 	octave 2
-	note F_, 0
+	note F_, 1
 	octave 3
-	note F_, 0
+	note F_, 1
 	octave 5
-	note C_, 0
+	note C_, 1
 	octave 4
-	note F_, 0
+	note F_, 1
 	octave 3
-	note F_, 0
+	note F_, 1
 	octave 5
-	note C_, 0
+	note C_, 1
 	octave 4
-	note F_, 0
+	note F_, 1
 	octave 3
-	note F_, 0
+	note F_, 1
 	octave 5
-	note D#, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
+	note D#, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
 	octave 4
-	note A#, 0
-	note __, 0
+	note A#, 1
+	note __, 1
 	intensity $15
 	callchannel Music_GameCorner_branch_ee03f
 	octave 2
+	note C_, 2
+	note __, 1
 	note C_, 1
-	note __, 0
-	note C_, 0
 	octave 3
-	note C_, 0
+	note C_, 1
 	octave 2
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note C_, 0
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note C_, 1
 	octave 3
-	note C_, 0
+	note C_, 1
 	octave 2
+	note C_, 2
+	octave 3
 	note C_, 1
+	octave 2
+	note C_, 1
+	note __, 1
 	octave 3
-	note C_, 0
+	note C_, 1
 	octave 2
-	note C_, 0
-	note __, 0
+	note F_, 2
+	note __, 1
+	note F_, 1
 	octave 3
-	note C_, 0
+	note F_, 1
 	octave 2
 	note F_, 1
-	note __, 0
-	note F_, 0
+	note __, 1
+	note F_, 1
+	note F_, 1
 	octave 3
-	note F_, 0
+	note F_, 1
 	octave 2
-	note F_, 0
-	note __, 0
-	note F_, 0
-	note F_, 0
+	note F_, 2
 	octave 3
-	note F_, 0
+	note F_, 1
 	octave 2
 	note F_, 1
+	note __, 1
 	octave 3
-	note F_, 0
+	note F_, 1
+	callchannel Music_GameCorner_branch_ee03f
 	octave 2
-	note F_, 0
-	note __, 0
+	note G_, 2
+	note __, 1
+	note G_, 1
 	octave 3
-	note F_, 0
-	callchannel Music_GameCorner_branch_ee03f
+	note G_, 1
 	octave 2
 	note G_, 1
-	note __, 0
-	note G_, 0
+	note __, 1
+	note G_, 1
+	note G_, 1
 	octave 3
-	note G_, 0
+	note G_, 1
 	octave 2
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note G_, 0
+	note G_, 2
 	octave 3
-	note G_, 0
+	note G_, 1
 	octave 2
 	note G_, 1
+	note __, 1
 	octave 3
-	note G_, 0
+	note G_, 1
 	octave 2
-	note G_, 0
-	note __, 0
-	octave 3
-	note G_, 0
-	octave 2
-	note B_, 0
-	note B_, 0
-	note B_, 0
+	note B_, 1
+	note B_, 1
+	note B_, 1
+	note __, 2
+	note B_, 1
 	note __, 1
-	note B_, 0
-	note __, 0
-	note B_, 0
-	note __, 3
+	note B_, 1
+	note __, 4
 	notetype $6, $15
 	octave 3
-	note D_, 0
-	note C_, 0
+	note D_, 1
+	note C_, 1
 	octave 2
-	note B_, 0
-	note A_, 0
-	note G_, 0
-	note F_, 0
-	note E_, 0
-	note D_, 0
+	note B_, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 1
 	loopchannel 0, Music_GameCorner_branch_edeef
 ; edfdd
 
 Music_GameCorner_branch_edfdd: ; edfdd
 	octave 2
-	note C_, 0
+	note C_, 1
 	octave 3
-	note C_, 0
+	note C_, 1
 	octave 4
-	note G_, 0
-	note C_, 0
+	note G_, 1
+	note C_, 1
 	octave 3
-	note C_, 0
+	note C_, 1
 	octave 4
-	note G_, 0
-	note C_, 0
+	note G_, 1
+	note C_, 1
 	octave 3
-	note C_, 0
+	note C_, 1
 	octave 4
-	note G_, 0
-	note C_, 0
+	note G_, 1
+	note C_, 1
 	octave 3
-	note C_, 0
+	note C_, 1
 	octave 4
-	note A_, 0
-	note C_, 0
+	note A_, 1
+	note C_, 1
 	octave 3
-	note C_, 0
+	note C_, 1
 	octave 4
-	note A_, 1
+	note A_, 2
 	endchannel
 ; edff8
 
 Music_GameCorner_branch_edff8: ; edff8
 	octave 2
-	note C_, 0
+	note C_, 1
 	octave 3
-	note C_, 0
+	note C_, 1
 	octave 4
-	note G_, 0
-	note C_, 0
+	note G_, 1
+	note C_, 1
 	octave 3
-	note C_, 0
+	note C_, 1
 	octave 4
-	note G_, 0
-	note C_, 0
+	note G_, 1
+	note C_, 1
 	octave 3
-	note C_, 0
+	note C_, 1
 	octave 4
-	note A#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note A#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
 	endchannel
 ; ee00c
 
 Music_GameCorner_branch_ee00c: ; ee00c
 	octave 2
-	note F_, 0
+	note F_, 1
 	octave 3
-	note F_, 0
+	note F_, 1
 	octave 5
-	note C_, 0
+	note C_, 1
 	octave 4
-	note F_, 0
+	note F_, 1
 	octave 3
-	note F_, 0
+	note F_, 1
 	octave 5
-	note C_, 0
+	note C_, 1
 	octave 4
-	note F_, 0
+	note F_, 1
 	octave 3
-	note F_, 0
+	note F_, 1
 	octave 5
-	note D#, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note C_, 0
-	note D_, 2
+	note D#, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note C_, 1
+	note D_, 3
 	endchannel
 ; ee024
 
 Music_GameCorner_branch_ee024: ; ee024
 	octave 2
-	note F_, 0
+	note F_, 1
 	octave 3
-	note F_, 0
+	note F_, 1
 	octave 5
-	note C_, 0
+	note C_, 1
 	octave 4
-	note F_, 0
+	note F_, 1
 	octave 3
-	note F_, 0
+	note F_, 1
 	octave 5
-	note C_, 0
+	note C_, 1
 	octave 4
-	note F_, 0
+	note F_, 1
 	octave 3
-	note F_, 0
+	note F_, 1
 	octave 5
-	note D#, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note C_, 0
-	note D_, 0
+	note D#, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note C_, 1
+	note D_, 1
 	octave 3
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
 	endchannel
 ; ee03f
 
 Music_GameCorner_branch_ee03f: ; ee03f
 	octave 2
+	note F_, 2
+	note __, 1
 	note F_, 1
-	note __, 0
-	note F_, 0
 	octave 3
-	note F_, 0
+	note F_, 1
 	octave 2
-	note F_, 0
-	note __, 0
-	note F_, 0
-	note F_, 0
+	note F_, 1
+	note __, 1
+	note F_, 1
+	note F_, 1
 	octave 3
-	note F_, 0
-	octave 2
 	note F_, 1
+	octave 2
+	note F_, 2
 	octave 3
-	note F_, 0
+	note F_, 1
 	octave 2
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
 	octave 3
-	note F_, 0
+	note F_, 1
 	octave 2
+	note G_, 2
+	note __, 1
 	note G_, 1
-	note __, 0
-	note G_, 0
 	octave 3
-	note G_, 0
+	note G_, 1
 	octave 2
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note G_, 0
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note G_, 1
 	octave 3
-	note G_, 0
+	note G_, 1
 	octave 2
-	note F_, 0
+	note F_, 1
 	octave 3
-	note F_, 0
+	note F_, 1
 	octave 2
-	note D#, 0
+	note D#, 1
 	octave 3
-	note D#, 0
+	note D#, 1
 	octave 2
-	note D_, 0
+	note D_, 1
 	octave 3
-	note D_, 0
+	note D_, 1
 	endchannel
 
 Music_GameCorner_Ch4: ; ee06f
@@ -679,158 +679,158 @@
 	togglenoise $3
 	notetype $c
 	notetype $8
-	note D_, 0
-	note D_, 0
-	note D_, 0
+	note D_, 1
+	note D_, 1
+	note D_, 1
 	notetype $c
-	note D_, 0
-	note D_, 0
 	note D_, 1
-	note D_, 0
-	note D_, 0
+	note D_, 1
+	note D_, 2
+	note D_, 1
+	note D_, 1
 
 Music_GameCorner_branch_ee07f: ; ee07f
 	callchannel Music_GameCorner_branch_ee106
 
 Music_GameCorner_branch_ee082: ; ee082
-	note A#, 1
-	note F#, 1
-	note D_, 1
-	note F#, 1
-	note A#, 1
-	note F#, 1
-	note D_, 1
-	note F#, 1
+	note A#, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
+	note A#, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
 	loopchannel 6, Music_GameCorner_branch_ee082
 	callchannel Music_GameCorner_branch_ee10f
 
 Music_GameCorner_branch_ee091: ; ee091
-	note A#, 1
-	note F#, 1
+	note A#, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
+	note A#, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
+	loopchannel 3, Music_GameCorner_branch_ee091
+	note __, 12
 	note D_, 1
-	note F#, 1
-	note A#, 1
-	note F#, 1
 	note D_, 1
-	note F#, 1
-	loopchannel 3, Music_GameCorner_branch_ee091
-	note __, 11
-	note D_, 0
-	note D_, 0
-	note F#, 1
+	note F#, 2
 	callchannel Music_GameCorner_branch_ee106
 
 Music_GameCorner_branch_ee0a4: ; ee0a4
-	note A#, 1
-	note F#, 1
-	note D_, 1
-	note F#, 1
-	note A#, 1
-	note F#, 1
-	note D_, 1
-	note F#, 1
+	note A#, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
+	note A#, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
 	loopchannel 6, Music_GameCorner_branch_ee0a4
 	callchannel Music_GameCorner_branch_ee10f
 
 Music_GameCorner_branch_ee0b3: ; ee0b3
-	note A#, 1
+	note A#, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
+	note A#, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
+	loopchannel 3, Music_GameCorner_branch_ee0b3
+	note A#, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
+	note D#, 2
+	note F#, 2
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
+
+Music_GameCorner_branch_ee0c9: ; ee0c9
+	note A#, 2
 	note F#, 1
+	note D#, 1
 	note D_, 1
+	note D#, 1
 	note F#, 1
-	note A#, 1
-	note F#, 1
+	note D#, 1
+	note D#, 1
 	note D_, 1
 	note F#, 1
-	loopchannel 3, Music_GameCorner_branch_ee0b3
-	note A#, 1
+	note D#, 1
+	note D_, 2
+	note F#, 2
+	loopchannel 3, Music_GameCorner_branch_ee0c9
+	note A#, 2
 	note F#, 1
+	note D#, 1
 	note D_, 1
-	note F#, 1
 	note D#, 1
 	note F#, 1
-	note D_, 0
-	note D_, 0
-	note D_, 0
-	note D_, 0
-
-Music_GameCorner_branch_ee0c9: ; ee0c9
-	note A#, 1
-	note F#, 0
-	note D#, 0
-	note D_, 0
-	note D#, 0
-	note F#, 0
-	note D#, 0
-	note D#, 0
-	note D_, 0
-	note F#, 0
-	note D#, 0
+	note D#, 1
+	note D#, 1
 	note D_, 1
 	note F#, 1
-	loopchannel 3, Music_GameCorner_branch_ee0c9
-	note A#, 1
-	note F#, 0
-	note D#, 0
-	note D_, 0
-	note D#, 0
-	note F#, 0
-	note D#, 0
-	note D#, 0
-	note D_, 0
-	note F#, 0
-	note D#, 0
+	note D#, 1
+	note D_, 2
 	note D_, 1
-	note D_, 0
-	note D_, 0
+	note D_, 1
 
 Music_GameCorner_branch_ee0e8: ; ee0e8
-	note A#, 1
-	note F#, 0
-	note D#, 0
-	note D_, 0
-	note D#, 0
-	note F#, 0
-	note D#, 0
-	note D#, 0
-	note D_, 0
-	note F#, 0
-	note D#, 0
+	note A#, 2
+	note F#, 1
+	note D#, 1
 	note D_, 1
+	note D#, 1
 	note F#, 1
-	loopchannel 3, Music_GameCorner_branch_ee0e8
-	note D_, 0
-	note D_, 0
+	note D#, 1
+	note D#, 1
 	note D_, 1
-	note A#, 0
 	note F#, 1
-	note F#, 4
-	note D_, 0
-	note D_, 0
 	note D#, 1
+	note D_, 2
+	note F#, 2
+	loopchannel 3, Music_GameCorner_branch_ee0e8
+	note D_, 1
+	note D_, 1
+	note D_, 2
+	note A#, 1
+	note F#, 2
+	note F#, 5
+	note D_, 1
+	note D_, 1
+	note D#, 2
 	loopchannel 0, Music_GameCorner_branch_ee07f
 ; ee106
 
 Music_GameCorner_branch_ee106: ; ee106
-	note C_, 1
-	note F#, 1
-	note D_, 1
-	note F#, 1
-	note A#, 1
-	note F#, 1
-	note D_, 1
-	note F#, 1
+	note C_, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
+	note A#, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
 	endchannel
 ; ee10f
 
 Music_GameCorner_branch_ee10f: ; ee10f
-	note A#, 1
-	note F#, 1
+	note A#, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
+	note A#, 2
+	note F#, 2
 	note D_, 1
-	note F#, 1
-	note A#, 1
-	note F#, 1
-	note D_, 0
-	note D_, 0
-	note F#, 1
+	note D_, 1
+	note F#, 2
 	endchannel
 ; ee119
--- a/audio/music/goldenrodcity.asm
+++ b/audio/music/goldenrodcity.asm
@@ -11,170 +11,170 @@
 	tempo 176
 	volume $77
 	notetype $c, $97
-	note __, 15
-	note __, 15
-	note __, 15
-	note __, 15
+	note __, 16
+	note __, 16
+	note __, 16
+	note __, 16
 
 Music_GoldenrodCity_branch_eb46d: ; eb46d
 	dutycycle $0
 	callchannel Music_GoldenrodCity_branch_eb4a9
 	octave 3
-	note G#, 0
+	note G#, 1
 	octave 4
-	note C_, 0
-	note D#, 0
-	note F#, 0
-	note D#, 0
-	note F#, 0
-	note G#, 0
+	note C_, 1
+	note D#, 1
+	note F#, 1
+	note D#, 1
+	note F#, 1
+	note G#, 1
 	octave 5
-	note C_, 0
+	note C_, 1
 	intensity $71
 	dutycycle $0
 	callchannel Music_GoldenrodCity_branch_eb4d1
 	intensity $77
-	note D#, 1
-	note F_, 1
-	note F#, 1
-	note G#, 3
+	note D#, 2
+	note F_, 2
+	note F#, 2
+	note G#, 4
 	intensity $71
 	callchannel Music_GoldenrodCity_branch_eb4d1
-	note D#, 0
-	note F#, 0
+	note D#, 1
+	note F#, 1
 	intensity $77
 	octave 5
-	note C_, 1
+	note C_, 2
 	octave 4
-	note G#, 1
-	note F#, 1
-	note D#, 1
+	note G#, 2
+	note F#, 2
+	note D#, 2
 	dutycycle $2
 	intensity $97
 	callchannel Music_GoldenrodCity_branch_eb4a9
-	note C_, 3
+	note C_, 4
 	octave 3
-	note G#, 1
+	note G#, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	loopchannel 0, Music_GoldenrodCity_branch_eb46d
 ; eb4a9
 
 Music_GoldenrodCity_branch_eb4a9: ; eb4a9
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note G#, 0
-	note __, 2
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 3
+	note G#, 1
+	note __, 1
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G#, 0
-	note __, 2
-	note G#, 0
-	note __, 0
-	note A#, 1
-	note F_, 0
-	note __, 0
+	note G#, 1
+	note __, 3
+	note G#, 1
+	note __, 1
+	note A#, 2
+	note F_, 1
+	note __, 1
+	note C#, 2
+	note F_, 1
+	note __, 1
+	note D#, 2
+	note C_, 2
+	note C#, 2
+	note D#, 2
+	note F#, 2
 	note C#, 1
-	note F_, 0
-	note __, 0
-	note D#, 1
-	note C_, 1
+	note __, 3
 	note C#, 1
-	note D#, 1
-	note F#, 1
-	note C#, 0
-	note __, 2
-	note C#, 0
-	note __, 0
-	note F#, 1
-	note C#, 0
-	note __, 0
-	note F#, 1
-	note A#, 1
+	note __, 1
+	note F#, 2
 	note C#, 1
-	note D#, 1
-	note G#, 1
+	note __, 1
+	note F#, 2
+	note A#, 2
+	note C#, 2
+	note D#, 2
+	note G#, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	endchannel
 ; eb4d1
 
 Music_GoldenrodCity_branch_eb4d1: ; eb4d1
 	octave 4
-	note F_, 0
-	note C#, 0
+	note F_, 1
+	note C#, 1
 	octave 3
-	note G#, 0
+	note G#, 1
 	octave 4
-	note C#, 0
-	note F_, 0
-	note G#, 0
-	note F_, 0
-	note G#, 0
-	note C#, 0
+	note C#, 1
+	note F_, 1
+	note G#, 1
+	note F_, 1
+	note G#, 1
+	note C#, 1
 	octave 3
-	note G#, 0
-	note F_, 0
-	note G#, 0
+	note G#, 1
+	note F_, 1
+	note G#, 1
 	octave 4
-	note C#, 0
-	note F_, 0
-	note C#, 0
-	note F_, 0
-	note D#, 0
-	note C_, 0
+	note C#, 1
+	note F_, 1
+	note C#, 1
+	note F_, 1
+	note D#, 1
+	note C_, 1
 	octave 3
-	note G#, 0
+	note G#, 1
 	octave 4
-	note C_, 0
-	note D#, 0
-	note F#, 0
-	note D#, 0
-	note F#, 0
-	note C_, 0
+	note C_, 1
+	note D#, 1
+	note F#, 1
+	note D#, 1
+	note F#, 1
+	note C_, 1
 	octave 3
-	note G#, 0
-	note F#, 0
-	note G#, 0
+	note G#, 1
+	note F#, 1
+	note G#, 1
 	octave 4
-	note C_, 0
-	note D#, 0
-	note C_, 0
-	note D#, 0
-	note C#, 0
+	note C_, 1
+	note D#, 1
+	note C_, 1
+	note D#, 1
+	note C#, 1
 	octave 3
-	note A#, 0
-	note F#, 0
-	note A#, 0
+	note A#, 1
+	note F#, 1
+	note A#, 1
 	octave 4
-	note C#, 0
-	note F_, 0
-	note C#, 0
-	note F_, 0
+	note C#, 1
+	note F_, 1
+	note C#, 1
+	note F_, 1
 	octave 3
-	note A#, 0
-	note F#, 0
-	note C#, 0
-	note F#, 0
-	note A#, 0
+	note A#, 1
+	note F#, 1
+	note C#, 1
+	note F#, 1
+	note A#, 1
 	octave 4
-	note C#, 0
+	note C#, 1
 	octave 3
-	note A#, 0
+	note A#, 1
 	octave 4
-	note C#, 0
-	note D#, 0
-	note C_, 0
+	note C#, 1
+	note D#, 1
+	note C_, 1
 	octave 3
-	note G#, 0
+	note G#, 1
 	octave 4
-	note C_, 0
-	note D#, 0
-	note F#, 0
+	note C_, 1
+	note D#, 1
+	note F#, 1
 	endchannel
 
 Music_GoldenrodCity_Ch2: ; eb519
@@ -187,88 +187,88 @@
 	intensity $97
 	callchannel Music_GoldenrodCity_branch_eb555
 	octave 4
-	note F_, 1
-	note F#, 1
-	note G#, 1
-	note F_, 1
-	note D#, 7
+	note F_, 2
+	note F#, 2
+	note G#, 2
+	note F_, 2
+	note D#, 8
 	callchannel Music_GoldenrodCity_branch_eb555
-	note G#, 1
-	note A#, 1
+	note G#, 2
+	note A#, 2
 	octave 5
-	note C_, 1
-	note C#, 1
-	note D#, 7
+	note C_, 2
+	note C#, 2
+	note D#, 8
 	dutycycle $2
 	intensity $77
 	callchannel Music_GoldenrodCity_branch_eb572
 	octave 4
-	note G#, 1
-	note A#, 1
-	note B_, 1
+	note G#, 2
+	note A#, 2
+	note B_, 2
 	octave 5
-	note C_, 3
+	note C_, 4
 	dutycycle $3
 	intensity $77
 	callchannel Music_GoldenrodCity_branch_eb572
-	note F_, 1
-	note D#, 1
-	note C#, 1
-	note C_, 1
+	note F_, 2
+	note D#, 2
+	note C#, 2
+	note C_, 2
 	octave 4
-	note G#, 1
+	note G#, 2
 	loopchannel 0, Music_GoldenrodCity_branch_eb523
 ; eb555
 
 Music_GoldenrodCity_branch_eb555: ; eb555
 	octave 4
-	note F_, 3
-	note C#, 3
-	note D#, 3
-	note C_, 3
-	note C#, 1
-	note C_, 1
+	note F_, 4
+	note C#, 4
+	note D#, 4
+	note C_, 4
+	note C#, 2
+	note C_, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G#, 5
+	note G#, 6
 	octave 3
-	note G#, 0
+	note G#, 1
 	octave 3
-	note A_, 0
-	note A#, 3
+	note A_, 1
+	note A#, 4
 	octave 4
-	note C#, 3
+	note C#, 4
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note A#, 1
-	note G#, 1
-	note F#, 1
+	note A#, 2
+	note G#, 2
+	note F#, 2
 	dutycycle $1
 	endchannel
 ; eb572
 
 Music_GoldenrodCity_branch_eb572: ; eb572
-	note C#, 5
-	note F_, 5
-	note C#, 3
-	note C_, 5
-	note D#, 5
-	note C_, 1
+	note C#, 6
+	note F_, 6
+	note C#, 4
+	note C_, 6
+	note D#, 6
+	note C_, 2
 	octave 4
-	note G#, 0
-	note A_, 0
-	note A#, 5
+	note G#, 1
+	note A_, 1
+	note A#, 6
 	octave 5
-	note C#, 5
+	note C#, 6
 	octave 4
-	note A#, 3
+	note A#, 4
 	octave 5
-	note C_, 3
-	note D#, 1
+	note C_, 4
+	note D#, 2
 	endchannel
 
 Music_GoldenrodCity_Ch3: ; eb584
@@ -280,185 +280,185 @@
 	callchannel Music_GoldenrodCity_branch_eb5aa
 	callchannel Music_GoldenrodCity_branch_eb5aa
 	callchannel Music_GoldenrodCity_branch_eb5d2
-	note __, 2
+	note __, 3
 	octave 3
-	note C_, 0
-	note D#, 0
-	note G_, 0
-	note G#, 0
+	note C_, 1
 	note D#, 1
+	note G_, 1
+	note G#, 1
+	note D#, 2
 	callchannel Music_GoldenrodCity_branch_eb5d2
-	note __, 0
+	note __, 1
 	octave 3
-	note G#, 1
-	note F#, 1
-	note D#, 1
+	note G#, 2
+	note F#, 2
+	note D#, 2
 	octave 2
-	note G#, 1
+	note G#, 2
 	loopchannel 0, Music_GoldenrodCity_branch_eb58c
 ; eb5aa
 
 Music_GoldenrodCity_branch_eb5aa: ; eb5aa
 	octave 3
-	note C#, 3
+	note C#, 4
+	note __, 2
+	note C#, 1
 	note __, 1
-	note C#, 0
-	note __, 0
-	note C_, 3
+	note C_, 4
+	note __, 2
+	note C_, 1
 	note __, 1
-	note C_, 0
-	note __, 0
 	octave 2
-	note A#, 3
+	note A#, 4
+	note __, 2
+	note A#, 1
 	note __, 1
-	note A#, 0
-	note __, 0
-	note G#, 3
+	note G#, 4
+	note __, 2
+	note G#, 1
 	note __, 1
-	note G#, 0
-	note __, 0
-	note F#, 3
+	note F#, 4
+	note __, 2
+	note F#, 1
 	note __, 1
-	note F#, 0
-	note __, 0
 	octave 3
-	note D#, 3
+	note D#, 4
+	note __, 2
+	note D#, 1
 	note __, 1
-	note D#, 0
-	note __, 0
-	note G#, 3
+	note G#, 4
+	note __, 2
+	note G#, 1
 	note __, 1
-	note G#, 0
-	note __, 0
 	octave 2
-	note G#, 0
-	note __, 0
-	note G#, 2
-	note __, 0
+	note G#, 1
+	note __, 1
+	note G#, 3
+	note __, 1
 	octave 3
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
 	endchannel
 ; eb5d2
 
 Music_GoldenrodCity_branch_eb5d2: ; eb5d2
-	note C#, 0
-	note __, 0
-	octave 4
-	note C#, 0
-	octave 3
-	note C#, 0
+	note C#, 1
 	note __, 1
-	note C#, 0
-	note __, 4
 	octave 4
-	note C_, 0
-	note C#, 0
+	note C#, 1
 	octave 3
-	note G#, 1
-	note C_, 0
-	note __, 0
+	note C#, 1
+	note __, 2
+	note C#, 1
+	note __, 5
 	octave 4
-	note C_, 0
+	note C_, 1
+	note C#, 1
 	octave 3
-	note C_, 0
+	note G#, 2
+	note C_, 1
 	note __, 1
-	note C_, 0
-	note __, 4
-	note B_, 0
 	octave 4
-	note C_, 0
+	note C_, 1
 	octave 3
-	note G#, 1
-	octave 2
-	note A#, 0
-	note __, 0
+	note C_, 1
+	note __, 2
+	note C_, 1
+	note __, 5
+	note B_, 1
+	octave 4
+	note C_, 1
 	octave 3
-	note A#, 0
+	note G#, 2
 	octave 2
-	note A#, 0
+	note A#, 1
 	note __, 1
-	note A#, 0
-	note __, 4
 	octave 3
-	note A_, 0
-	note A#, 0
-	note F#, 1
+	note A#, 1
 	octave 2
-	note G#, 0
-	note __, 0
+	note A#, 1
+	note __, 2
+	note A#, 1
+	note __, 5
 	octave 3
-	note G#, 0
+	note A_, 1
+	note A#, 1
+	note F#, 2
 	octave 2
-	note G#, 0
+	note G#, 1
 	note __, 1
-	note G#, 0
+	octave 3
+	note G#, 1
+	octave 2
+	note G#, 1
+	note __, 2
+	note G#, 1
 	endchannel
 
 Music_GoldenrodCity_Ch4: ; eb606
 	togglenoise $3
 	notetype $c
-	note __, 15
-	note __, 15
-	note __, 15
-	note __, 7
+	note __, 16
+	note __, 16
+	note __, 16
+	note __, 8
+	note D_, 2
+	note F#, 2
 	note D_, 1
-	note F#, 1
-	note D_, 0
-	note D_, 0
-	note F#, 1
+	note D_, 1
+	note F#, 2
 
 Music_GoldenrodCity_branch_eb613: ; eb613
-	note D#, 1
-	note F#, 1
-	note D_, 1
-	note F#, 1
-	note D#, 1
-	note F#, 1
-	note D_, 1
-	note F#, 1
+	note D#, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
+	note D#, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
 	loopchannel 3, Music_GoldenrodCity_branch_eb613
 	callchannel Music_GoldenrodCity_branch_eb663
 	callchannel Music_GoldenrodCity_branch_eb66d
-	note G_, 0
-	note G_, 0
-	note F#, 1
+	note G_, 1
+	note G_, 1
+	note F#, 2
 	callchannel Music_GoldenrodCity_branch_eb66d
+	note D_, 2
+	note F#, 2
+	callchannel Music_GoldenrodCity_branch_eb66d
 	note D_, 1
-	note F#, 1
+	note D_, 1
+	note F#, 2
 	callchannel Music_GoldenrodCity_branch_eb66d
-	note D_, 0
-	note D_, 0
-	note F#, 1
-	callchannel Music_GoldenrodCity_branch_eb66d
+	note D_, 2
 	note D_, 1
-	note D_, 0
-	note D_, 0
+	note D_, 1
 	callchannel Music_GoldenrodCity_branch_eb66d
-	note G_, 0
-	note G_, 0
-	note F#, 1
+	note G_, 1
+	note G_, 1
+	note F#, 2
 	callchannel Music_GoldenrodCity_branch_eb66d
+	note D_, 2
+	note F#, 2
+	callchannel Music_GoldenrodCity_branch_eb66d
 	note D_, 1
-	note F#, 1
+	note D_, 1
+	note F#, 2
 	callchannel Music_GoldenrodCity_branch_eb66d
-	note D_, 0
-	note D_, 0
-	note F#, 1
-	callchannel Music_GoldenrodCity_branch_eb66d
+	note D_, 2
 	note D_, 1
-	note D_, 0
-	note D_, 0
+	note D_, 1
 
 Music_GoldenrodCity_branch_eb650: ; eb650
-	note D#, 1
-	note F#, 1
-	note D_, 1
-	note F#, 1
-	note D#, 1
-	note F#, 1
-	note D_, 1
-	note F#, 1
+	note D#, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
+	note D#, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
 	loopchannel 3, Music_GoldenrodCity_branch_eb650
 	callchannel Music_GoldenrodCity_branch_eb663
 	loopchannel 0, Music_GoldenrodCity_branch_eb613
@@ -465,26 +465,26 @@
 ; eb663
 
 Music_GoldenrodCity_branch_eb663: ; eb663
-	note D#, 1
-	note F#, 1
+	note D#, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
+	note D#, 2
+	note F#, 2
 	note D_, 1
-	note F#, 1
-	note D#, 1
-	note F#, 1
-	note D_, 0
-	note D_, 0
-	note F#, 1
+	note D_, 1
+	note F#, 2
 	endchannel
 ; eb66d
 
 Music_GoldenrodCity_branch_eb66d: ; eb66d
-	note D#, 1
-	note D_, 0
 	note D#, 2
-	note D#, 1
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
+	note D_, 1
+	note D#, 3
+	note D#, 2
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
 	endchannel
 ; eb676
--- a/audio/music/goldsilveropening.asm
+++ b/audio/music/goldsilveropening.asm
@@ -13,121 +13,121 @@
 	stereopanning $f0
 	notetype $c, $b7
 	octave 1
-	note G#, 15
-	note G#, 15
+	note G#, 16
+	note G#, 16
 	tempo 168
 	dutycycle $3
 	notetype $6, $c7
 	octave 3
-	note F_, 11
-	note A_, 3
+	note F_, 12
+	note A_, 4
 	octave 4
-	note C_, 11
+	note C_, 12
 	octave 3
-	note B_, 1
-	note A#, 1
-	note G_, 11
-	note A#, 3
+	note B_, 2
+	note A#, 2
+	note G_, 12
+	note A#, 4
 	octave 4
-	note D#, 11
-	note D_, 1
-	note C#, 1
+	note D#, 12
+	note D_, 2
+	note C#, 2
 	notetype $6, $b5
-	note C_, 7
+	note C_, 8
 	octave 3
-	note F_, 7
-	note A_, 7
-	note B_, 3
+	note F_, 8
+	note A_, 8
+	note B_, 4
 	octave 4
-	note C_, 3
+	note C_, 4
 	notetype $6, $b3
 	octave 3
-	note A#, 7
-	note C#, 7
+	note A#, 8
+	note C#, 8
 	octave 2
-	note F#, 7
+	note F#, 8
 	octave 1
-	note B_, 7
+	note B_, 8
 	notetype $6, $b2
-	note __, 3
+	note __, 4
 	octave 3
-	note A#, 3
-	note A#, 7
-	note G#, 3
-	note G#, 7
-	note G_, 3
-	note G_, 7
-	note F#, 3
-	note F#, 7
+	note A#, 4
+	note A#, 8
+	note G#, 4
+	note G#, 8
+	note G_, 4
+	note G_, 8
+	note F#, 4
+	note F#, 8
 	octave 2
-	note A_, 3
-	note A_, 7
-	note G#, 3
-	note G#, 7
-	note G_, 3
-	note G_, 7
-	note F#, 3
-	note A_, 7
-	note A_, 3
-	note A_, 7
-	note G#, 5
-	note G#, 5
-	note F#, 3
-	note G_, 3
-	note F_, 3
+	note A_, 4
+	note A_, 8
+	note G#, 4
+	note G#, 8
+	note G_, 4
+	note G_, 8
+	note F#, 4
+	note A_, 8
+	note A_, 4
+	note A_, 8
+	note G#, 6
+	note G#, 6
+	note F#, 4
+	note G_, 4
+	note F_, 4
 	notetype $8, $b3
 	octave 4
-	note F_, 0
-	note G_, 0
-	note A_, 0
-	note A#, 0
-	note B_, 0
+	note F_, 1
+	note G_, 1
+	note A_, 1
+	note A#, 1
+	note B_, 1
 	octave 5
-	note C_, 0
+	note C_, 1
 	dutycycle $2
 	notetype $c, $b3
-	note D_, 0
-	note C#, 0
-	note D_, 3
-	note A_, 0
-	note G#, 0
-	note A_, 3
+	note D_, 1
+	note C#, 1
+	note D_, 4
+	note A_, 1
+	note G#, 1
+	note A_, 4
 	octave 4
-	note A#, 1
+	note A#, 2
 	octave 5
-	note D_, 1
+	note D_, 2
+	note F_, 2
+	note G_, 6
+	note D#, 2
+	note D_, 2
+	note C_, 2
+	note D#, 4
+	note F#, 2
+	dutycycle $3
+	notetype $8, $92
+	note A_, 1
 	note F_, 1
-	note G_, 5
 	note D#, 1
-	note D_, 1
 	note C_, 1
-	note D#, 3
-	note F#, 1
-	dutycycle $3
-	notetype $8, $92
-	note A_, 0
-	note F_, 0
-	note D#, 0
-	note C_, 0
 	octave 4
-	note A_, 0
-	note G_, 0
-	note F_, 0
-	note D#, 0
-	note C_, 0
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note D#, 1
+	note C_, 1
 	octave 3
-	note A_, 2
+	note A_, 3
 	notetype $c, $b2
-	note A#, 1
-	note B_, 1
+	note A#, 2
+	note B_, 2
 	octave 4
-	note C_, 1
-	note D_, 1
-	note D#, 1
+	note C_, 2
+	note D_, 2
+	note D#, 2
 	intensity $c2
-	note F_, 1
-	note G_, 1
-	note A_, 15
+	note F_, 2
+	note G_, 2
+	note A_, 16
 	endchannel
 
 Music_GoldSilverOpening_Ch2: ; f70f8
@@ -136,483 +136,483 @@
 	notetype $c, $b7
 	dutycycle $2
 	octave 2
-	note C_, 15
-	note C_, 15
+	note C_, 16
+	note C_, 16
 	dutycycle $3
 	notetype $c, $b2
-	note __, 1
+	note __, 2
 	notetype $6, $62
 	octave 1
-	note F_, 1
-	note A_, 1
+	note F_, 2
+	note A_, 2
 	octave 2
-	note C_, 1
-	note E_, 1
-	note F_, 1
-	note A_, 1
+	note C_, 2
+	note E_, 2
+	note F_, 2
+	note A_, 2
 	octave 3
-	note C_, 1
-	note E_, 1
-	note F_, 1
-	note A_, 1
+	note C_, 2
+	note E_, 2
+	note F_, 2
+	note A_, 2
 	octave 4
-	note C_, 1
-	note E_, 1
-	note F_, 1
-	note A_, 1
+	note C_, 2
+	note E_, 2
+	note F_, 2
+	note A_, 2
 	octave 5
-	note C_, 1
-	note E_, 1
+	note C_, 2
+	note E_, 2
 	octave 1
-	note D#, 1
-	note G_, 1
-	note A#, 1
+	note D#, 2
+	note G_, 2
+	note A#, 2
 	octave 2
-	note D_, 1
-	note D#, 1
-	note G_, 1
-	note A#, 1
+	note D_, 2
+	note D#, 2
+	note G_, 2
+	note A#, 2
 	octave 3
-	note D_, 1
-	note D#, 1
-	note G_, 1
-	note A#, 1
+	note D_, 2
+	note D#, 2
+	note G_, 2
+	note A#, 2
 	octave 4
-	note D_, 1
-	note D#, 1
-	note G_, 1
+	note D_, 2
+	note D#, 2
+	note G_, 2
 	notetype $c, $b7
 	octave 1
-	note F_, 15
+	note F_, 16
 	intensity $83
 	octave 4
-	note F_, 1
+	note F_, 2
 	intensity $81
-	note D_, 1
+	note D_, 2
 	intensity $93
-	note G#, 1
+	note G#, 2
 	intensity $91
-	note F_, 1
+	note F_, 2
 	intensity $a3
 	octave 5
-	note C#, 1
+	note C#, 2
 	intensity $a1
 	octave 4
-	note A#, 1
+	note A#, 2
 	intensity $b3
 	octave 5
-	note F#, 1
+	note F#, 2
 	intensity $c1
-	note D#, 1
+	note D#, 2
 	intensity $b3
 	octave 1
-	note A#, 1
+	note A#, 2
 	notetype $6, $b2
 	octave 4
-	note D_, 3
-	note D_, 3
+	note D_, 4
+	note D_, 4
 	octave 1
-	note F_, 3
+	note F_, 4
 	octave 4
-	note D_, 3
-	note D_, 3
+	note D_, 4
+	note D_, 4
 	octave 2
-	note C_, 3
+	note C_, 4
 	octave 4
-	note D#, 3
-	note D#, 3
+	note D#, 4
+	note D#, 4
 	octave 1
-	note F_, 3
+	note F_, 4
 	octave 4
-	note D#, 3
-	note D#, 3
+	note D#, 4
+	note D#, 4
 	octave 1
-	note A#, 3
+	note A#, 4
 	octave 3
-	note D_, 3
-	note D_, 3
+	note D_, 4
+	note D_, 4
 	octave 1
-	note B_, 3
+	note B_, 4
 	octave 3
-	note D_, 3
-	note D_, 3
+	note D_, 4
+	note D_, 4
 	octave 2
-	note C_, 3
+	note C_, 4
 	octave 3
-	note D#, 3
-	note D#, 3
+	note D#, 4
+	note D#, 4
 	octave 1
-	note B_, 3
+	note B_, 4
 	octave 3
-	note D#, 3
-	note F#, 3
+	note D#, 4
+	note F#, 4
 	octave 1
-	note A#, 3
+	note A#, 4
 	octave 3
-	note D_, 3
-	note D_, 3
+	note D_, 4
+	note D_, 4
 	octave 1
-	note B_, 3
+	note B_, 4
 	octave 3
-	note D_, 5
-	note D_, 1
+	note D_, 6
+	note D_, 2
 	octave 2
-	note C_, 3
+	note C_, 4
 	octave 3
-	note D#, 3
-	note D#, 15
+	note D#, 4
+	note D#, 16
 	octave 2
-	note D#, 1
+	note D#, 2
 	octave 3
-	note G_, 3
-	note G_, 3
-	note G_, 1
+	note G_, 4
+	note G_, 4
+	note G_, 2
 	octave 2
-	note D#, 3
+	note D#, 4
 	octave 3
-	note F#, 3
-	note F#, 3
+	note F#, 4
+	note F#, 4
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 3
-	note F_, 3
-	note F_, 3
-	note F_, 1
+	note F_, 4
+	note F_, 4
+	note F_, 2
 	octave 2
-	note G_, 3
+	note G_, 4
 	octave 3
-	note B_, 3
-	note B_, 3
+	note B_, 4
+	note B_, 4
 	octave 2
-	note C_, 3
+	note C_, 4
 	octave 3
-	note D#, 3
-	note D#, 3
+	note D#, 4
+	note D#, 4
 	octave 2
-	note C_, 3
+	note C_, 4
 	octave 3
-	note D#, 3
-	note D#, 15
+	note D#, 4
+	note D#, 16
 	notetype $6, $a2
-	note F_, 3
-	note G_, 3
-	note G#, 3
+	note F_, 4
+	note G_, 4
+	note G#, 4
 	notetype $6, $c2
-	note A_, 3
-	note A#, 3
+	note A_, 4
+	note A#, 4
 	octave 4
-	note C_, 3
+	note C_, 4
 	notetype $6, $d2
 	octave 3
-	note A_, 3
+	note A_, 4
 	octave 4
-	note C_, 3
-	note D#, 15
+	note C_, 4
+	note D#, 16
 	endchannel
 
 Music_GoldSilverOpening_Ch3: ; f71c8
 	notetype $6, $10
 	octave 2
-	note D_, 3
+	note D_, 4
 	notetype $6, $20
-	note D_, 3
+	note D_, 4
 	notetype $6, $30
-	note D_, 3
-	note __, 11
-	note __, 7
+	note D_, 4
+	note __, 12
+	note __, 8
 	notetype $6, $10
 	octave 2
-	note D#, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note A#, 0
-	note __, 0
+	note D#, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note A#, 1
+	note __, 1
 	octave 3
-	note D_, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note A#, 0
-	note __, 0
+	note D_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note A#, 1
+	note __, 1
 	octave 4
-	note D_, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note A#, 0
-	note __, 0
+	note D_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note A#, 1
+	note __, 1
 	octave 5
-	note D_, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note A#, 0
-	note __, 0
+	note D_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note A#, 1
+	note __, 1
 	octave 6
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
 	octave 2
-	note F_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
 	octave 3
-	note C_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note F_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
 	octave 4
-	note C_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note F_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
 	octave 5
-	note C_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note F_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
 	octave 6
-	note C_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
 	octave 2
-	note D#, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note A#, 0
-	note __, 0
+	note D#, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note A#, 1
+	note __, 1
 	octave 3
-	note D_, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note A#, 0
-	note __, 0
+	note D_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note A#, 1
+	note __, 1
 	octave 4
-	note D_, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note A#, 0
-	note __, 0
+	note D_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note A#, 1
+	note __, 1
 	octave 5
-	note D_, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note A#, 0
-	note __, 0
+	note D_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note A#, 1
+	note __, 1
 	octave 6
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
 	notetype $8, $10
-	note F_, 0
+	note F_, 1
 	octave 5
-	note B_, 0
-	note A_, 0
-	note B_, 0
-	note A_, 0
-	note F_, 0
-	note A_, 0
-	note F_, 0
+	note B_, 1
+	note A_, 1
+	note B_, 1
+	note A_, 1
+	note F_, 1
+	note A_, 1
+	note F_, 1
 	octave 4
-	note B_, 0
+	note B_, 1
 	octave 5
-	note F_, 0
+	note F_, 1
 	octave 4
-	note B_, 0
-	note A_, 0
-	note B_, 0
-	note A_, 0
-	note F_, 0
-	note A_, 0
-	note F_, 0
+	note B_, 1
+	note A_, 1
+	note B_, 1
+	note A_, 1
+	note F_, 1
+	note A_, 1
+	note F_, 1
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note F_, 0
+	note F_, 1
 	octave 3
-	note B_, 0
-	note A_, 0
-	note B_, 0
-	note A_, 0
-	note F_, 0
+	note B_, 1
+	note A_, 1
+	note B_, 1
+	note A_, 1
+	note F_, 1
 	octave 5
-	note A_, 2
+	note A_, 3
 	notetype $c, $10
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 6
-	note C_, 1
+	note C_, 2
 	octave 5
-	note A#, 0
-	note __, 0
-	octave 6
-	note F_, 1
-	note D#, 0
-	note __, 0
 	note A#, 1
-	note G#, 0
-	note __, 0
-	note __, 15
-	note __, 3
+	note __, 1
+	octave 6
+	note F_, 2
+	note D#, 1
+	note __, 1
+	note A#, 2
+	note G#, 1
+	note __, 1
+	note __, 16
+	note __, 4
 	notetype $6, $10
 	octave 2
-	note G_, 0
+	note G_, 1
+	note __, 3
+	note A_, 2
 	note __, 2
-	note A_, 1
-	note __, 1
 	octave 5
-	note F_, 11
-	note D_, 3
-	note D_, 5
-	note F_, 1
-	note D#, 11
-	note G#, 1
+	note F_, 12
+	note D_, 4
+	note D_, 6
+	note F_, 2
+	note D#, 12
+	note G#, 2
+	note __, 2
+	note F#, 6
+	note D#, 2
+	note F_, 12
+	note D_, 2
+	note __, 2
+	note D#, 6
+	note F_, 2
+	note G_, 2
+	note __, 2
+	note F#, 2
+	note __, 2
+	note G_, 2
+	note __, 2
+	note A_, 4
+	note D#, 4
+	note F_, 2
+	note __, 2
+	octave 4
+	note A#, 1
 	note __, 1
-	note F#, 5
-	note D#, 1
-	note F_, 11
+	octave 5
 	note D_, 1
 	note __, 1
-	note D#, 5
-	note F_, 1
-	note G_, 1
+	octave 4
+	note A#, 1
 	note __, 1
-	note F#, 1
+	octave 5
+	note D_, 1
 	note __, 1
-	note G_, 1
+	octave 4
+	note A#, 1
 	note __, 1
-	note A_, 3
-	note D#, 3
-	note F_, 1
+	octave 5
+	note D_, 1
 	note __, 1
 	octave 4
-	note A#, 0
-	note __, 0
+	note A#, 1
+	note __, 1
 	octave 5
-	note D_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
 	octave 4
-	note A#, 0
-	note __, 0
+	note A#, 1
+	note __, 1
 	octave 5
-	note D_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
 	octave 4
-	note A#, 0
-	note __, 0
+	note A#, 1
+	note __, 1
 	octave 5
-	note D_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
 	octave 4
-	note A#, 0
-	note __, 0
+	note A#, 1
+	note __, 1
 	octave 5
-	note C_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
 	octave 4
-	note A#, 0
-	note __, 0
+	note A#, 1
+	note __, 1
 	octave 5
-	note C_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
 	octave 4
-	note A#, 0
-	note __, 0
+	note A#, 1
+	note __, 1
 	octave 5
-	note C_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
 	octave 4
-	note A#, 0
-	note __, 0
+	note A#, 1
+	note __, 1
 	octave 5
-	note D_, 0
-	note __, 0
-	octave 4
-	note A#, 0
-	note __, 0
-	octave 5
-	note D_, 0
-	note __, 0
-	octave 4
-	note A#, 0
-	note __, 0
-	octave 5
-	note D_, 0
-	note __, 0
-	octave 4
-	note A#, 0
-	note __, 0
-	octave 5
-	note C_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note A#, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note A#, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note A#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note A#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note A#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note A#, 0
-	note __, 8
+	note C_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note F_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note F_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note A#, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note A#, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note A#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note A#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note A#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note A#, 1
+	note __, 9
 	notetype $c, $10
-	note __, 13
+	note __, 14
 	octave 3
-	note F_, 1
-	note D#, 0
-	note __, 0
-	note C_, 0
-	note __, 12
+	note F_, 2
+	note D#, 1
+	note __, 1
+	note C_, 1
+	note __, 13
 	endchannel
 ; f7308
--- a/audio/music/goldsilveropening2.asm
+++ b/audio/music/goldsilveropening2.asm
@@ -14,45 +14,45 @@
 	stereopanning $f
 	notetype $c, $3d
 	octave 3
-	note D#, 7
+	note D#, 8
 
 Music_GoldSilverOpening2_branch_f7325: ; f7325
 	notetype $c, $c1
 	octave 3
-	note D_, 1
-	note D_, 1
-	note D_, 1
+	note D_, 2
+	note D_, 2
+	note D_, 2
 	intensity $b7
-	note D#, 9
+	note D#, 10
 	intensity $c1
-	note D_, 1
-	note D_, 1
-	note D_, 1
+	note D_, 2
+	note D_, 2
+	note D_, 2
 	intensity $b7
-	note F_, 3
-	note D#, 3
-	note C_, 1
+	note F_, 4
+	note D#, 4
+	note C_, 2
 	loopchannel 2, Music_GoldSilverOpening2_branch_f7325
 	intensity $c1
-	note D_, 1
-	note D_, 1
-	note D_, 1
+	note D_, 2
+	note D_, 2
+	note D_, 2
 	intensity $b7
-	note D#, 9
+	note D#, 10
 	intensity $c1
-	note D_, 1
-	note D_, 1
-	note D_, 1
+	note D_, 2
+	note D_, 2
+	note D_, 2
 	intensity $b7
-	note F_, 3
-	note G_, 3
-	note A#, 1
+	note F_, 4
+	note G_, 4
+	note A#, 2
 	intensity $b0
-	note A_, 15
-	note A_, 15
+	note A_, 16
+	note A_, 16
 	intensity $b2
 	octave 4
-	note D_, 15
+	note D_, 16
 	endchannel
 
 Music_GoldSilverOpening2_Ch2: ; f7358
@@ -61,162 +61,162 @@
 	stereopanning $f0
 	notetype $c, $3f
 	octave 3
-	note A#, 7
+	note A#, 8
 	notetype $c, $d1
 	octave 3
-	note A_, 1
-	note A_, 1
-	note A_, 1
+	note A_, 2
+	note A_, 2
+	note A_, 2
 	intensity $c7
-	note A#, 9
+	note A#, 10
 	intensity $d1
-	note A_, 1
-	note A_, 1
-	note A_, 1
+	note A_, 2
+	note A_, 2
+	note A_, 2
 	intensity $c7
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note A#, 3
-	note G_, 1
+	note A#, 4
+	note G_, 2
 	intensity $d1
-	note A_, 1
-	note A_, 1
-	note A_, 1
+	note A_, 2
+	note A_, 2
+	note A_, 2
 	intensity $c7
-	note A#, 9
+	note A#, 10
 	intensity $d1
-	note A_, 1
-	note A_, 1
-	note A_, 1
+	note A_, 2
+	note A_, 2
+	note A_, 2
 	intensity $c7
 	octave 4
-	note C_, 3
-	note C#, 3
-	note D#, 1
+	note C_, 4
+	note C#, 4
+	note D#, 2
 	intensity $c7
-	note D_, 7
-	note D#, 7
-	note F_, 7
-	note A#, 7
+	note D_, 8
+	note D#, 8
+	note F_, 8
+	note A#, 8
 	intensity $b0
 	octave 5
-	note D_, 15
-	note D_, 15
+	note D_, 16
+	note D_, 16
 	intensity $c2
-	note D_, 15
+	note D_, 16
 	endchannel
 
 Music_GoldSilverOpening2_Ch3: ; f739c
 	notetype $c, $17
-	note __, 7
+	note __, 8
 	octave 2
-	note A_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note A#, 7
+	note A_, 1
 	note __, 1
-	note A_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note D_, 3
-	note F_, 3
 	note A_, 1
-	note D_, 1
+	note __, 1
 	note A_, 1
-	note D_, 1
+	note __, 1
+	note A#, 8
+	note __, 2
 	note A_, 1
-	note G#, 1
-	note E_, 1
-	note G_, 1
-	note F_, 1
-	note D_, 1
+	note __, 1
 	note A_, 1
-	note G#, 1
-	note E_, 1
-	note G_, 1
-	note F_, 1
-	note C_, 1
-	note D#, 1
-	note D_, 1
+	note __, 1
 	note A_, 1
-	note D_, 1
-	note A_, 1
-	note G#, 1
-	note E_, 1
-	note G_, 1
-	note F_, 1
-	note D_, 1
-	note A_, 1
-	note G#, 1
-	note E_, 1
-	note G_, 1
-	note F_, 1
-	note C_, 1
-	note D#, 1
-	note D_, 1
-	note F#, 1
-	note A#, 1
+	note __, 1
+	note D_, 4
+	note F_, 4
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note G#, 2
+	note E_, 2
+	note G_, 2
+	note F_, 2
+	note D_, 2
+	note A_, 2
+	note G#, 2
+	note E_, 2
+	note G_, 2
+	note F_, 2
+	note C_, 2
+	note D#, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note G#, 2
+	note E_, 2
+	note G_, 2
+	note F_, 2
+	note D_, 2
+	note A_, 2
+	note G#, 2
+	note E_, 2
+	note G_, 2
+	note F_, 2
+	note C_, 2
+	note D#, 2
+	note D_, 2
+	note F#, 2
+	note A#, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note A#, 1
-	note A_, 1
-	note F#, 1
-	note D#, 1
-	note D_, 1
-	note F#, 1
-	note A#, 1
+	note A#, 2
+	note A_, 2
+	note F#, 2
+	note D#, 2
+	note D_, 2
+	note F#, 2
+	note A#, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note A#, 1
-	note F#, 1
-	note A#, 1
+	note A#, 2
+	note F#, 2
+	note A#, 2
 	octave 3
-	note C#, 1
-	note D_, 1
-	note __, 13
+	note C#, 2
+	note D_, 2
+	note __, 14
 	endchannel
 
 Music_GoldSilverOpening2_Ch4: ; f73ea
 	togglenoise $0
 	notetype $6
-	note D#, 1
-	note D#, 1
-	note D#, 1
-	note D#, 1
-	note D#, 1
-	note D_, 1
-	note D_, 1
-	note D_, 1
+	note D#, 2
+	note D#, 2
+	note D#, 2
+	note D#, 2
+	note D#, 2
+	note D_, 2
+	note D_, 2
+	note D_, 2
 	notetype $c
 
 Music_GoldSilverOpening2_branch_f73f8: ; f73f8
-	note D_, 1
-	note D_, 1
-	note D_, 1
-	note C#, 3
-	note D#, 1
-	note D#, 1
-	note D#, 1
-	note D_, 1
-	note D_, 1
-	note D_, 1
-	note C#, 5
+	note D_, 2
+	note D_, 2
+	note D_, 2
+	note C#, 4
+	note D#, 2
+	note D#, 2
+	note D#, 2
+	note D_, 2
+	note D_, 2
+	note D_, 2
+	note C#, 6
 	notetype $6
-	note D#, 1
-	note D#, 1
-	note D#, 1
-	note D#, 1
+	note D#, 2
+	note D#, 2
+	note D#, 2
+	note D#, 2
 	notetype $c
 	loopchannel 4, Music_GoldSilverOpening2_branch_f73f8
-	note C_, 15
+	note C_, 16
 	endchannel
 ; f7411
--- a/audio/music/gym.asm
+++ b/audio/music/gym.asm
@@ -16,180 +16,180 @@
 
 Music_Gym_branch_f48c9: ; f48c9
 	octave 4
-	note F#, 1
+	note F#, 2
 	octave 2
-	note A_, 0
-	note A_, 0
-	note A_, 0
-	note __, 2
+	note A_, 1
+	note A_, 1
+	note A_, 1
+	note __, 3
 	octave 4
-	note E_, 1
+	note E_, 2
 	octave 2
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note __, 2
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note __, 3
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 2
-	note D_, 0
-	note D_, 0
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	note __, 1
 	octave 3
-	note D_, 0
-	note D_, 0
-	note B_, 0
-	note G_, 0
-	note D_, 0
-	note B_, 0
+	note D_, 1
+	note D_, 1
+	note B_, 1
+	note G_, 1
+	note D_, 1
+	note B_, 1
 	octave 4
-	note C#, 0
+	note C#, 1
 	octave 3
-	note A_, 0
-	note E_, 0
+	note A_, 1
+	note E_, 1
 	octave 4
-	note E_, 0
+	note E_, 1
 	octave 3
-	note A_, 11
-	note F#, 1
-	note A_, 1
-	note G_, 0
+	note A_, 12
+	note F#, 2
+	note A_, 2
+	note G_, 1
+	note __, 2
+	note E_, 1
+	note E_, 2
+	note C_, 2
+	octave 4
+	note C_, 2
+	octave 3
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 8
+	note A_, 4
+	note F#, 2
+	note A_, 2
+	note E_, 1
 	note __, 1
-	note E_, 0
 	note E_, 1
-	note C_, 1
+	note F#, 1
+	note G_, 4
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
+	note B_, 2
+	note A_, 2
+	octave 4
+	note C_, 2
+	note D_, 6
+	octave 3
+	note A_, 2
+	note F#, 2
+	note E_, 2
+	note G_, 2
+	note A_, 2
 	note B_, 1
-	note A_, 1
+	note __, 2
 	note G_, 1
-	note F#, 7
-	note A_, 3
-	note F#, 1
-	note A_, 1
-	note E_, 0
-	note __, 0
-	note E_, 0
-	note F#, 0
-	note G_, 3
+	note G_, 4
 	octave 4
+	note E_, 1
+	note __, 2
 	note C_, 1
+	note C_, 2
 	octave 3
 	note B_, 1
-	note A_, 1
+	note A#, 1
+	note A_, 12
+	note F#, 2
+	note A_, 2
 	octave 4
+	note C_, 2
+	octave 3
+	note G_, 1
+	octave 4
 	note C_, 1
-	note D_, 5
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note C_, 1
+	note E_, 1
+	note G_, 4
+	note D_, 6
 	octave 3
 	note A_, 1
-	note F#, 1
-	note E_, 1
-	note G_, 1
+	note __, 3
 	note A_, 1
-	note B_, 0
 	note __, 1
-	note G_, 0
-	note G_, 3
+	note A_, 1
 	octave 4
-	note E_, 0
+	note F#, 3
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note C_, 4
+	note D_, 1
 	note __, 1
-	note C_, 0
-	note C_, 1
+	note D_, 1
+	note E_, 1
+	note __, 2
 	octave 3
-	note B_, 0
-	note A#, 0
-	note A_, 11
-	note F#, 1
+	note B_, 4
+	note F#, 2
+	note D_, 2
+	note F#, 2
+	note A#, 1
 	note A_, 1
+	note G_, 1
+	note F_, 1
 	octave 4
+	note D_, 4
 	note C_, 1
 	octave 3
-	note G_, 0
+	note A#, 1
+	note A_, 1
+	note G_, 1
 	octave 4
-	note C_, 0
-	note E_, 1
-	note C_, 1
-	note E_, 1
-	note C_, 0
-	note E_, 0
-	note G_, 3
-	note D_, 5
+	note E_, 4
+	note F#, 6
 	octave 3
-	note A_, 0
-	note __, 2
-	note A_, 0
-	note __, 0
-	note A_, 0
+	note A_, 1
+	note __, 3
+	note A_, 1
+	note __, 1
+	note A_, 1
 	octave 4
-	note F#, 2
-	note G_, 3
 	note F#, 3
-	note E_, 3
-	note C_, 3
-	note D_, 0
-	note __, 0
-	note D_, 0
-	note E_, 0
-	note __, 1
+	note A_, 4
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note D_, 1
 	octave 3
-	note B_, 3
+	note B_, 1
 	note F#, 1
-	note D_, 1
-	note F#, 1
-	note A#, 0
-	note A_, 0
-	note G_, 0
-	note F_, 0
 	octave 4
-	note D_, 3
-	note C_, 0
+	note E_, 1
+	note F#, 4
+	note E_, 1
+	note C_, 1
 	octave 3
-	note A#, 0
-	note A_, 0
-	note G_, 0
+	note G_, 1
 	octave 4
-	note E_, 3
-	note F#, 5
-	octave 3
-	note A_, 0
-	note __, 2
-	note A_, 0
-	note __, 0
-	note A_, 0
-	octave 4
-	note F#, 2
-	note A_, 3
-	note G_, 3
-	note F#, 3
-	note E_, 3
-	note D_, 0
-	octave 3
-	note B_, 0
-	note F#, 0
-	octave 4
-	note E_, 0
-	note F#, 3
-	note E_, 0
-	note C_, 0
-	octave 3
-	note G_, 0
-	octave 4
-	note F#, 0
-	note G_, 3
-	note A_, 0
-	note G_, 0
-	note F#, 0
-	note E_, 0
-	note A_, 3
+	note F#, 1
+	note G_, 4
+	note A_, 1
+	note G_, 1
+	note F#, 1
+	note E_, 1
+	note A_, 4
 	octave 5
-	note D_, 3
+	note D_, 4
 	octave 4
-	note A_, 0
-	note G_, 0
-	note F#, 0
-	note E_, 0
+	note A_, 1
+	note G_, 1
+	note F#, 1
+	note E_, 1
 	loopchannel 0, Music_Gym_branch_f48c9
 
 Music_Gym_Ch2: ; f497c
@@ -199,178 +199,178 @@
 Music_Gym_branch_f4980: ; f4980
 	notetype $c, $c3
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note D_, 0
-	note D_, 0
 	note D_, 1
-	note A_, 0
+	note D_, 1
+	note D_, 2
+	note A_, 1
 	octave 2
-	note F#, 0
-	note C_, 1
+	note F#, 1
+	note C_, 2
 	octave 1
-	note C_, 0
-	note C_, 0
 	note C_, 1
+	note C_, 1
+	note C_, 2
 	octave 2
-	note G_, 0
-	note E_, 0
-	octave 1
 	note G_, 1
+	note E_, 1
 	octave 1
-	note G_, 0
-	note G_, 0
+	note G_, 2
+	octave 1
 	note G_, 1
+	note G_, 1
+	note G_, 2
 	octave 1
-	note G_, 0
-	note G_, 0
-	note A_, 3
+	note G_, 1
+	note G_, 1
+	note A_, 4
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note C_, 0
-	note C#, 0
+	note C_, 1
+	note C#, 1
 	callchannel Music_Gym_branch_f49e9
 	octave 3
-	note E_, 1
-	note C_, 0
-	note C#, 0
+	note E_, 2
+	note C_, 1
+	note C#, 1
 	callchannel Music_Gym_branch_f49e9
 	octave 3
-	note C_, 0
-	note E_, 0
-	note G_, 0
+	note C_, 1
+	note E_, 1
+	note G_, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	intensity $d2
 	callchannel Music_Gym_branch_f4a15
 	octave 1
-	note F#, 0
-	note B_, 0
 	note F#, 1
-	octave 2
-	note F#, 1
-	octave 1
 	note B_, 1
-	note A#, 3
-	note A#, 1
-	note F_, 0
-	note F_, 0
-	note G_, 0
+	note F#, 2
 	octave 2
-	note C_, 0
+	note F#, 2
 	octave 1
+	note B_, 2
+	note A#, 4
+	note A#, 2
+	note F_, 1
+	note F_, 1
 	note G_, 1
 	octave 2
-	note G_, 1
-	note E_, 1
-	callchannel Music_Gym_branch_f4a15
+	note C_, 1
 	octave 1
-	note G_, 0
+	note G_, 2
 	octave 2
-	note C_, 0
+	note G_, 2
+	note E_, 2
+	callchannel Music_Gym_branch_f4a15
 	octave 1
 	note G_, 1
 	octave 2
-	note E_, 1
 	note C_, 1
-	note D_, 3
-	note D_, 1
 	octave 1
-	note A_, 0
-	note A_, 0
-	note A_, 0
+	note G_, 2
 	octave 2
-	note D_, 0
+	note E_, 2
+	note C_, 2
+	note D_, 4
+	note D_, 2
 	octave 1
 	note A_, 1
+	note A_, 1
+	note A_, 1
 	octave 2
-	note F#, 1
 	note D_, 1
+	octave 1
+	note A_, 2
+	octave 2
+	note F#, 2
+	note D_, 2
 	loopchannel 0, Music_Gym_branch_f4980
 ; f49e9
 
 Music_Gym_branch_f49e9: ; f49e9
 	octave 3
-	note D_, 2
+	note D_, 3
 	octave 2
+	note D_, 3
 	note D_, 2
 	note D_, 1
-	note D_, 0
-	note D_, 0
 	note D_, 1
+	note D_, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note C_, 2
+	note C_, 3
 	octave 2
+	note C_, 3
 	note C_, 2
 	note C_, 1
-	note C_, 0
-	note C_, 0
 	note C_, 1
+	note C_, 2
 	octave 3
-	note E_, 1
-	note C_, 0
-	note C#, 0
-	note D_, 2
+	note E_, 2
+	note C_, 1
+	note C#, 1
+	note D_, 3
 	octave 2
+	note D_, 3
 	note D_, 2
 	note D_, 1
-	note D_, 0
-	note D_, 0
 	note D_, 1
+	note D_, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note C_, 2
+	note C_, 3
 	octave 2
+	note C_, 3
 	note C_, 2
 	note C_, 1
-	note C_, 0
-	note C_, 0
 	note C_, 1
+	note C_, 2
 	endchannel
 ; f4a15
 
 Music_Gym_branch_f4a15: ; f4a15
 	octave 2
-	note D_, 3
-	note D_, 1
+	note D_, 4
+	note D_, 2
 	octave 1
-	note A_, 0
-	note A_, 0
-	note A_, 0
-	octave 2
-	note D_, 0
-	octave 1
 	note A_, 1
-	octave 2
 	note A_, 1
+	note A_, 1
+	octave 2
 	note D_, 1
-	note C_, 3
-	note C_, 1
 	octave 1
-	note G_, 0
-	note G_, 0
-	note G_, 0
+	note A_, 2
 	octave 2
-	note C_, 0
+	note A_, 2
+	note D_, 2
+	note C_, 4
+	note C_, 2
 	octave 1
 	note G_, 1
-	octave 2
 	note G_, 1
+	note G_, 1
+	octave 2
 	note C_, 1
 	octave 1
-	note B_, 1
-	note __, 1
-	note B_, 1
-	note F#, 0
-	note F#, 0
+	note G_, 2
+	octave 2
+	note G_, 2
+	note C_, 2
+	octave 1
+	note B_, 2
+	note __, 2
+	note B_, 2
+	note F#, 1
+	note F#, 1
 	endchannel
 
 Music_Gym_Ch3: ; f4a37
@@ -380,133 +380,133 @@
 Music_Gym_branch_f4a3c: ; f4a3c
 	notetype $c, $14
 	octave 6
-	note D_, 1
+	note D_, 2
 	octave 4
-	note D_, 0
-	note D_, 0
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	note __, 1
 	octave 5
-	note A_, 0
+	note A_, 1
 	octave 6
-	note D_, 0
-	note C_, 1
+	note D_, 1
+	note C_, 2
 	octave 4
-	note C_, 0
-	note C_, 0
-	note C_, 0
-	note __, 0
+	note C_, 1
+	note C_, 1
+	note C_, 1
+	note __, 1
 	octave 5
-	note A_, 0
+	note A_, 1
 	octave 6
-	note C_, 0
+	note C_, 1
 	octave 5
-	note B_, 1
+	note B_, 2
 	octave 3
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note __, 1
 	octave 5
-	note B_, 0
-	note B_, 0
-	note B_, 3
+	note B_, 1
+	note B_, 1
+	note B_, 4
 	octave 6
-	note C#, 3
+	note C#, 4
 	octave 5
-	note D_, 11
+	note D_, 12
 	octave 4
-	note A_, 1
+	note A_, 2
 	octave 5
-	note D_, 1
-	note E_, 0
-	note __, 1
-	note C_, 0
-	note C_, 3
-	note G_, 3
-	note E_, 3
-	note D_, 11
+	note D_, 2
+	note E_, 1
+	note __, 2
+	note C_, 1
+	note C_, 4
+	note G_, 4
+	note E_, 4
+	note D_, 12
 	octave 4
-	note A_, 1
+	note A_, 2
 	octave 5
+	note D_, 2
+	note C_, 1
+	note __, 1
+	note C_, 1
 	note D_, 1
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note D_, 0
-	note E_, 7
-	note __, 3
-	note F#, 11
+	note E_, 8
+	note __, 4
+	note F#, 12
+	note E_, 2
+	note F#, 2
+	note G_, 1
+	note __, 2
 	note E_, 1
-	note F#, 1
-	note G_, 0
-	note __, 1
-	note E_, 0
-	note E_, 3
+	note E_, 4
 	octave 6
-	note C_, 0
-	note __, 1
+	note C_, 1
+	note __, 2
 	octave 5
-	note G_, 0
-	note G_, 3
-	note F#, 11
+	note G_, 1
+	note G_, 4
+	note F#, 12
+	note E_, 2
+	note F#, 2
+	note G_, 2
 	note E_, 1
-	note F#, 1
 	note G_, 1
-	note E_, 0
-	note G_, 0
 	octave 6
-	note C_, 7
+	note C_, 8
 	octave 5
-	note B_, 3
+	note B_, 4
 	intensity $13
 	callchannel Music_Gym_branch_f4ab3
-	note __, 1
-	note A_, 1
+	note __, 2
+	note A_, 2
 	octave 6
-	note D_, 1
+	note D_, 2
 	octave 5
-	note A_, 1
+	note A_, 2
 	octave 6
-	note C_, 3
+	note C_, 4
 	octave 5
-	note A#, 3
-	note A_, 3
-	note G_, 3
+	note A#, 4
+	note A_, 4
+	note G_, 4
 	callchannel Music_Gym_branch_f4ab3
-	note A_, 0
-	note __, 0
-	note A_, 0
-	note B_, 0
+	note A_, 1
+	note __, 1
+	note A_, 1
+	note B_, 1
 	octave 6
-	note C_, 3
-	note D_, 0
-	note __, 0
-	note D_, 0
-	note E_, 0
-	note F#, 7
-	note E_, 3
+	note C_, 4
+	note D_, 1
+	note __, 1
+	note D_, 1
+	note E_, 1
+	note F#, 8
+	note E_, 4
 	loopchannel 0, Music_Gym_branch_f4a3c
 ; f4ab3
 
 Music_Gym_branch_f4ab3: ; f4ab3
 	octave 5
-	note A_, 5
+	note A_, 6
 	octave 6
-	note D_, 5
+	note D_, 6
 	octave 5
-	note A_, 3
+	note A_, 4
 	octave 6
-	note C_, 3
+	note C_, 4
 	octave 5
-	note B_, 3
-	note A_, 3
-	note G_, 3
-	note F#, 0
-	note __, 0
-	note F#, 0
-	note G_, 0
-	note A_, 3
+	note B_, 4
+	note A_, 4
+	note G_, 4
+	note F#, 1
+	note __, 1
+	note F#, 1
+	note G_, 1
+	note A_, 4
 	endchannel
 
 Music_Gym_Ch4: ; f4ac5
@@ -514,65 +514,65 @@
 
 Music_Gym_branch_f4ac7: ; f4ac7
 	notetype $c
+	note D_, 2
+	note C#, 1
+	note C#, 1
+	note B_, 4
+	note D_, 2
+	note C#, 1
+	note C#, 1
+	note B_, 4
+	note D_, 2
+	note C#, 1
+	note C#, 1
+	note D_, 2
+	note C#, 1
+	note C#, 1
+	note A#, 1
+	note D#, 1
+	note D#, 1
+	note D#, 1
+	note C#, 1
+	note C#, 1
 	note D_, 1
-	note C#, 0
-	note C#, 0
-	note B_, 3
 	note D_, 1
-	note C#, 0
-	note C#, 0
-	note B_, 3
-	note D_, 1
-	note C#, 0
-	note C#, 0
-	note D_, 1
-	note C#, 0
-	note C#, 0
-	note A#, 0
-	note D#, 0
-	note D#, 0
-	note D#, 0
-	note C#, 0
-	note C#, 0
-	note D_, 0
-	note D_, 0
 	notetype $6
 
 Music_Gym_branch_f4ae1: ; f4ae1
-	note D_, 5
-	note D_, 5
-	note D_, 3
-	note D_, 1
-	note D_, 1
-	note D_, 3
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note D_, 5
-	note D_, 5
-	note D_, 3
-	note D_, 1
-	note D_, 1
-	note D_, 3
-	note B_, 7
+	note D_, 6
+	note D_, 6
+	note D_, 4
+	note D_, 2
+	note D_, 2
+	note D_, 4
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note D_, 6
+	note D_, 6
+	note D_, 4
+	note D_, 2
+	note D_, 2
+	note D_, 4
+	note B_, 8
 	loopchannel 4, Music_Gym_branch_f4ae1
 
 Music_Gym_branch_f4afa: ; f4afa
-	note D#, 3
-	note F#, 3
-	note D_, 3
-	note D#, 1
-	note D_, 1
-	note D#, 1
-	note D_, 1
-	note D#, 3
-	note D_, 3
-	note F#, 3
+	note D#, 4
+	note F#, 4
+	note D_, 4
+	note D#, 2
+	note D_, 2
+	note D#, 2
+	note D_, 2
+	note D#, 4
+	note D_, 4
+	note F#, 4
 	loopchannel 8, Music_Gym_branch_f4afa
 	loopchannel 0, Music_Gym_branch_f4ac7
 ; f4b0c
--- a/audio/music/gymleadervictory.asm
+++ b/audio/music/gymleadervictory.asm
@@ -14,19 +14,19 @@
 	tone $0001
 	notetype $c, $b7
 	octave 4
-	note D_, 5
+	note D_, 6
 	octave 3
-	note A_, 0
+	note A_, 1
 	octave 4
-	note D_, 0
-	note F#, 5
-	note D_, 0
-	note F#, 0
-	note A_, 5
-	note F#, 0
-	note A_, 0
+	note D_, 1
+	note F#, 6
+	note D_, 1
+	note F#, 1
+	note A_, 6
+	note F#, 1
+	note A_, 1
 	octave 5
-	note D_, 7
+	note D_, 8
 	stereopanning $f
 
 Music_GymLeaderVictory_branch_f4658: ; f4658
@@ -33,33 +33,33 @@
 	dutycycle $1
 	callchannel Music_GymLeaderVictory_branch_f4689
 	octave 4
-	note C#, 3
-	note E_, 3
+	note C#, 4
+	note E_, 4
 	callchannel Music_GymLeaderVictory_branch_f4689
-	note F#, 7
+	note F#, 8
 	loopchannel 2, Music_GymLeaderVictory_branch_f4658
 	dutycycle $2
 	callchannel Music_GymLeaderVictory_branch_f46a0
-	note A_, 3
-	note G_, 3
-	note F#, 5
-	note D_, 0
-	note E_, 0
-	note F#, 5
+	note A_, 4
+	note G_, 4
+	note F#, 6
+	note D_, 1
 	note E_, 1
-	note D_, 7
-	note C#, 7
+	note F#, 6
+	note E_, 2
+	note D_, 8
+	note C#, 8
 	dutycycle $3
 	callchannel Music_GymLeaderVictory_branch_f46a0
-	note C#, 3
-	note E_, 3
-	note G_, 5
-	note A_, 0
-	note G_, 0
-	note A_, 5
+	note C#, 4
+	note E_, 4
+	note G_, 6
+	note A_, 1
 	note G_, 1
+	note A_, 6
+	note G_, 2
 	intensity $87
-	note F#, 15
+	note F#, 16
 	loopchannel 0, Music_GymLeaderVictory_branch_f4658
 ; f4689
 
@@ -66,25 +66,25 @@
 Music_GymLeaderVictory_branch_f4689: ; f4689
 	intensity $91
 	octave 3
-	note F#, 1
-	note A_, 1
+	note F#, 2
+	note A_, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note A_, 0
-	note F#, 0
-	note E_, 1
 	note A_, 1
+	note F#, 1
+	note E_, 2
+	note A_, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note A_, 0
-	note E_, 0
-	note D_, 1
+	note A_, 1
+	note E_, 1
+	note D_, 2
+	note G_, 2
+	note B_, 2
 	note G_, 1
-	note B_, 1
-	note G_, 0
-	note D_, 0
+	note D_, 1
 	endchannel
 ; f46a0
 
@@ -91,31 +91,31 @@
 Music_GymLeaderVictory_branch_f46a0: ; f46a0
 	intensity $87
 	octave 3
-	note F#, 13
-	note D_, 0
-	note F#, 0
-	note A_, 7
-	note F#, 3
-	note A_, 0
-	note G#, 0
-	note F#, 0
-	note A_, 0
-	note G#, 13
-	note E_, 0
-	note G#, 0
-	note B_, 7
+	note F#, 14
+	note D_, 1
+	note F#, 1
+	note A_, 8
+	note F#, 4
+	note A_, 1
+	note G#, 1
+	note F#, 1
+	note A_, 1
+	note G#, 14
+	note E_, 1
+	note G#, 1
+	note B_, 8
 	octave 4
-	note D_, 3
-	note E_, 0
-	note D_, 0
-	note E_, 0
-	note D_, 0
-	note C#, 13
+	note D_, 4
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note D_, 1
+	note C#, 14
 	octave 3
-	note A_, 0
+	note A_, 1
 	octave 4
-	note C#, 0
-	note E_, 7
+	note C#, 1
+	note E_, 8
 	endchannel
 
 Music_GymLeaderVictory_Ch2: ; f46bd
@@ -123,311 +123,311 @@
 	dutycycle $3
 	notetype $c, $d7
 	octave 4
-	note A_, 5
-	note F#, 0
-	note A_, 0
+	note A_, 6
+	note F#, 1
+	note A_, 1
 	octave 5
-	note D_, 5
+	note D_, 6
 	octave 4
-	note A_, 0
+	note A_, 1
 	octave 5
-	note D_, 0
-	note F#, 15
+	note D_, 1
+	note F#, 16
 
 Music_GymLeaderVictory_branch_f46d0: ; f46d0
 	dutycycle $3
 	intensity $a1
 	callchannel Music_GymLeaderVictory_branch_f4711
-	note A_, 3
-	note A_, 3
+	note A_, 4
+	note A_, 4
 	callchannel Music_GymLeaderVictory_branch_f4711
-	note D_, 5
+	note D_, 6
 	dutycycle $2
-	note B_, 0
+	note B_, 1
 	octave 5
-	note C#, 0
+	note C#, 1
 	callchannel Music_GymLeaderVictory_branch_f4711
-	note A_, 3
-	note A_, 3
+	note A_, 4
+	note A_, 4
 	callchannel Music_GymLeaderVictory_branch_f4711
-	note D_, 7
+	note D_, 8
 	dutycycle $3
 	callchannel Music_GymLeaderVictory_branch_f4720
-	note F#, 3
-	note E_, 3
-	note D_, 13
+	note F#, 4
+	note E_, 4
+	note D_, 14
 	octave 4
-	note B_, 1
+	note B_, 2
 	intensity $a7
-	note A_, 15
+	note A_, 16
 	dutycycle $2
 	callchannel Music_GymLeaderVictory_branch_f4720
 	octave 4
-	note A_, 3
+	note A_, 4
 	octave 5
-	note C#, 3
-	note D_, 13
-	note E_, 1
+	note C#, 4
+	note D_, 14
+	note E_, 2
 	intensity $a6
-	note D_, 11
-	note __, 1
+	note D_, 12
+	note __, 2
 	dutycycle $3
 	octave 4
-	note B_, 0
+	note B_, 1
 	octave 5
-	note C#, 0
+	note C#, 1
 	loopchannel 0, Music_GymLeaderVictory_branch_f46d0
 ; f4711
 
 Music_GymLeaderVictory_branch_f4711: ; f4711
 	octave 5
-	note D_, 1
-	note C#, 1
+	note D_, 2
+	note C#, 2
 	octave 4
-	note B_, 3
+	note B_, 4
 	octave 5
-	note C#, 1
+	note C#, 2
 	octave 4
-	note B_, 1
-	note A_, 3
-	note B_, 1
-	note A_, 1
-	note G_, 1
-	note F#, 1
+	note B_, 2
+	note A_, 4
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
 	endchannel
 ; f4720
 
 Music_GymLeaderVictory_branch_f4720: ; f4720
 	intensity $98
-	note A_, 5
-	note F#, 0
-	note A_, 0
+	note A_, 6
+	note F#, 1
+	note A_, 1
 	octave 5
-	note D_, 7
-	note D_, 15
+	note D_, 8
+	note D_, 16
 	octave 4
-	note B_, 5
-	note G#, 0
-	note B_, 0
+	note B_, 6
+	note G#, 1
+	note B_, 1
 	octave 5
-	note E_, 7
-	note E_, 15
+	note E_, 8
+	note E_, 16
 	octave 4
-	note G_, 5
-	note E_, 0
-	note G_, 0
+	note G_, 6
+	note E_, 1
+	note G_, 1
 	octave 5
-	note C#, 7
-	note C#, 7
+	note C#, 8
+	note C#, 8
 	endchannel
 
 Music_GymLeaderVictory_Ch3: ; f4737
 	notetype $c, $25
 	octave 3
-	note F#, 15
-	note D_, 9
+	note F#, 16
+	note D_, 10
 	octave 2
-	note A_, 1
-	note B_, 1
+	note A_, 2
+	note B_, 2
 	octave 3
-	note C#, 1
+	note C#, 2
 	stereopanning $f0
 
 Music_GymLeaderVictory_branch_f4744: ; f4744
-	note D_, 1
-	note __, 3
+	note D_, 2
+	note __, 4
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note C#, 1
-	note __, 3
+	note C#, 2
+	note __, 4
 	octave 2
-	note A_, 1
-	note B_, 1
-	note __, 3
-	note G_, 1
-	note A_, 1
-	note __, 1
+	note A_, 2
+	note B_, 2
+	note __, 4
+	note G_, 2
+	note A_, 2
+	note __, 2
 	octave 3
-	note C#, 3
-	note D_, 1
-	note __, 3
+	note C#, 4
+	note D_, 2
+	note __, 4
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note C#, 1
-	note __, 3
+	note C#, 2
+	note __, 4
 	octave 2
-	note A_, 1
-	note B_, 1
-	note __, 3
-	note G_, 1
+	note A_, 2
+	note B_, 2
+	note __, 4
+	note G_, 2
 	octave 3
-	note D_, 1
-	note __, 5
+	note D_, 2
+	note __, 6
 	loopchannel 2, Music_GymLeaderVictory_branch_f4744
 	callchannel Music_GymLeaderVictory_branch_f479e
 	octave 3
-	note D_, 1
-	note __, 1
-	note D_, 1
+	note D_, 2
+	note __, 2
+	note D_, 2
 	octave 4
-	note D_, 1
-	note __, 1
+	note D_, 2
+	note __, 2
 	octave 3
-	note D_, 1
-	note F#, 1
-	note D_, 1
-	note A_, 1
-	note __, 1
+	note D_, 2
+	note F#, 2
+	note D_, 2
+	note A_, 2
+	note __, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
-	note __, 1
+	note E_, 2
+	note __, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note C#, 1
+	note C#, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	callchannel Music_GymLeaderVictory_branch_f479e
 	octave 3
-	note D_, 1
-	note __, 1
-	note G_, 1
+	note D_, 2
+	note __, 2
+	note G_, 2
 	octave 4
-	note D_, 1
-	note __, 1
+	note D_, 2
+	note __, 2
 	octave 3
-	note D_, 1
-	note G_, 1
-	note E_, 1
-	note D_, 1
-	note __, 1
-	note D_, 1
-	note A_, 1
-	note __, 1
+	note D_, 2
+	note G_, 2
+	note E_, 2
+	note D_, 2
+	note __, 2
+	note D_, 2
+	note A_, 2
+	note __, 2
 	octave 2
-	note A_, 1
-	note B_, 1
+	note A_, 2
+	note B_, 2
 	octave 3
-	note C#, 1
+	note C#, 2
 	loopchannel 0, Music_GymLeaderVictory_branch_f4744
 ; f479e
 
 Music_GymLeaderVictory_branch_f479e: ; f479e
 	octave 3
-	note D_, 1
-	note __, 1
-	note D_, 1
+	note D_, 2
+	note __, 2
+	note D_, 2
 	octave 4
-	note D_, 1
-	note __, 1
+	note D_, 2
+	note __, 2
 	octave 3
-	note D_, 1
-	note F#, 1
-	note D_, 1
-	note A_, 1
-	note __, 1
-	note D_, 1
-	note F#, 1
-	note __, 1
+	note D_, 2
+	note F#, 2
+	note D_, 2
+	note A_, 2
+	note __, 2
+	note D_, 2
+	note F#, 2
+	note __, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
-	note __, 1
-	note E_, 1
+	note E_, 2
+	note __, 2
+	note E_, 2
 	octave 4
-	note E_, 1
-	note __, 1
+	note E_, 2
+	note __, 2
 	octave 3
-	note E_, 1
-	note G#, 1
-	note E_, 1
-	note B_, 1
-	note __, 1
-	note E_, 1
-	note G#, 1
-	note __, 1
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note B_, 2
+	note __, 2
+	note E_, 2
+	note G#, 2
+	note __, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note B_, 1
-	note A_, 1
-	note __, 1
-	note A_, 1
+	note B_, 2
+	note A_, 2
+	note __, 2
+	note A_, 2
 	octave 3
-	note A_, 1
-	note __, 1
+	note A_, 2
+	note __, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note C#, 1
+	note C#, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note A_, 1
-	note __, 1
+	note A_, 2
+	note __, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
-	note __, 1
+	note E_, 2
+	note __, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note C#, 1
+	note C#, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	endchannel
 
 Music_GymLeaderVictory_Ch4: ; f47e5
 	togglenoise $4
 	notetype $c
-	note B_, 15
-	note B_, 15
+	note B_, 16
+	note B_, 16
 
 Music_GymLeaderVictory_branch_f47eb: ; f47eb
 	callchannel Music_GymLeaderVictory_branch_f480b
-	note D#, 5
-	note D#, 1
-	note D#, 7
+	note D#, 6
+	note D#, 2
+	note D#, 8
 	callchannel Music_GymLeaderVictory_branch_f480b
-	note D#, 5
-	note D#, 1
-	note D#, 3
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
+	note D#, 6
+	note D#, 2
+	note D#, 4
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
 
 Music_GymLeaderVictory_branch_f47fb: ; f47fb
-	note D#, 1
-	note G_, 1
-	note D_, 1
-	note D#, 1
-	note G_, 1
-	note D#, 1
-	note D_, 1
-	note G_, 1
+	note D#, 2
+	note G_, 2
+	note D_, 2
+	note D#, 2
+	note G_, 2
+	note D#, 2
+	note D_, 2
+	note G_, 2
 	loopchannel 16, Music_GymLeaderVictory_branch_f47fb
 	loopchannel 0, Music_GymLeaderVictory_branch_f47eb
 ; f480b
 
 Music_GymLeaderVictory_branch_f480b: ; f480b
-	note D#, 5
-	note D#, 1
-	note D#, 3
-	note D_, 1
-	note D#, 1
+	note D#, 6
+	note D#, 2
+	note D#, 4
+	note D_, 2
+	note D#, 2
 	loopchannel 3, Music_GymLeaderVictory_branch_f480b
 	endchannel
 ; f4815
--- a/audio/music/halloffame.asm
+++ b/audio/music/halloffame.asm
@@ -14,39 +14,39 @@
 	tone $0001
 	stereopanning $f0
 	notetype $c, $93
-	note __, 15
-	note __, 15
-	note __, 15
-	note __, 11
+	note __, 16
+	note __, 16
+	note __, 16
+	note __, 12
 	octave 3
-	note D_, 0
-	note E_, 0
-	note F_, 0
-	note F#, 0
+	note D_, 1
+	note E_, 1
+	note F_, 1
+	note F#, 1
 
 Music_HallOfFame_branch_f05e6: ; f05e6
 	intensity $97
 	octave 4
-	note C_, 7
+	note C_, 8
 	intensity $77
-	note C_, 7
+	note C_, 8
 	intensity $97
-	note E_, 7
+	note E_, 8
 	intensity $77
-	note E_, 7
+	note E_, 8
 	intensity $97
-	note F#, 7
+	note F#, 8
 	intensity $77
-	note F#, 7
+	note F#, 8
 	intensity $77
-	note F_, 7
+	note F_, 8
 	intensity $57
-	note F_, 7
+	note F_, 8
 	loopchannel 3, Music_HallOfFame_branch_f05e6
-	note __, 15
-	note __, 15
-	note __, 15
-	note __, 15
+	note __, 16
+	note __, 16
+	note __, 16
+	note __, 16
 	loopchannel 0, Music_HallOfFame_branch_f05e6
 
 Music_HallOfFame_Ch2: ; f060b
@@ -56,125 +56,125 @@
 Music_HallOfFame_branch_f0610: ; f0610
 	notetype $c, $c4
 	octave 3
-	note G_, 1
-	note D_, 1
-	note G_, 1
-	note A_, 9
-	note G_, 1
-	note D_, 1
-	note G_, 1
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note A_, 10
+	note G_, 2
+	note D_, 2
+	note G_, 2
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note B_, 3
-	note A_, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
-	note A_, 9
-	note F_, 1
-	note C_, 1
-	note F_, 1
-	note A#, 3
-	note A_, 3
-	note F_, 1
+	note B_, 4
+	note A_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note A_, 10
+	note F_, 2
+	note C_, 2
+	note F_, 2
+	note A#, 4
+	note A_, 4
+	note F_, 2
 	loopchannel 0, Music_HallOfFame_branch_f0610
 
-Music_HallOfFame_branch_f062e: ; f062e
-
 Music_HallOfFame_Ch3: ; f062e
+
+Music_HallOfFame_branch_f062e: ; f062e
 	notetype $c, $28
 
 Music_HallOfFame_branch_f0631: ; f0631
 	octave 3
-	note D_, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
 	octave 3
-	note D_, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
 	octave 3
-	note D_, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
 	octave 3
-	note C_, 1
-	note F_, 1
-	note C_, 1
-	note F_, 1
-	note C_, 1
-	note F_, 1
-	note C_, 1
-	note F_, 1
+	note C_, 2
+	note F_, 2
+	note C_, 2
+	note F_, 2
+	note C_, 2
+	note F_, 2
+	note C_, 2
+	note F_, 2
 	loopchannel 3, Music_HallOfFame_branch_f0631
-	note D_, 3
-	note G_, 3
-	note D_, 3
-	note G_, 3
-	note E_, 3
-	note G_, 3
-	note E_, 3
-	note G_, 3
-	note F#, 3
-	note A_, 3
-	note F#, 3
-	note A_, 3
-	note E_, 3
-	note G_, 3
-	note E_, 3
-	note G_, 3
+	note D_, 4
+	note G_, 4
+	note D_, 4
+	note G_, 4
+	note E_, 4
+	note G_, 4
+	note E_, 4
+	note G_, 4
+	note F#, 4
+	note A_, 4
+	note F#, 4
+	note A_, 4
+	note E_, 4
+	note G_, 4
+	note E_, 4
+	note G_, 4
 	loopchannel 0, Music_HallOfFame_branch_f062e
 
 Music_HallOfFame_Ch4: ; f066d
 	togglenoise $5
 	notetype $c
-	note __, 15
-	note __, 15
-	note __, 15
-	note __, 15
+	note __, 16
+	note __, 16
+	note __, 16
+	note __, 16
 	notetype $6
 
 Music_HallOfFame_branch_f0677: ; f0677
 	stereopanning $f
-	note A#, 3
-	note A#, 7
-	note A#, 3
-	note A#, 3
-	note A#, 3
+	note A#, 4
+	note A#, 8
+	note A#, 4
+	note A#, 4
+	note A#, 4
 	stereopanning $f0
+	note A_, 2
+	note A_, 2
+	note A#, 2
+	note A#, 2
+	note A#, 4
+	note A#, 4
+	note A#, 8
+	note A#, 4
+	note A#, 4
+	stereopanning $f
+	note A#, 1
+	note A#, 1
 	note A_, 1
 	note A_, 1
 	note A#, 1
 	note A#, 1
-	note A#, 3
-	note A#, 3
-	note A#, 7
-	note A#, 3
-	note A#, 3
-	stereopanning $f
-	note A#, 0
-	note A#, 0
-	note A_, 0
-	note A_, 0
-	note A#, 0
-	note A#, 0
-	note A#, 0
-	note A#, 0
+	note A#, 1
+	note A#, 1
 	loopchannel 0, Music_HallOfFame_branch_f0677
 ; f0697
--- a/audio/music/healpokemon.asm
+++ b/audio/music/healpokemon.asm
@@ -11,18 +11,18 @@
 	dutycycle $2
 	tone $0001
 	notetype $c, $81
-	note __, 1
+	note __, 2
 	unknownmusic0xe0 $0, $40
-	note B_, 1
+	note B_, 2
 	unknownmusic0xe0 $0, $55
-	note B_, 1
+	note B_, 2
 	unknownmusic0xe0 $0, $45
-	note E_, 1
-	note __, 3
+	note E_, 2
+	note __, 4
 	unknownmusic0xe0 $0, $30
-	note E_, 3
+	note E_, 4
 	unknownmusic0xe0 $0, $40
-	note B_, 3
+	note B_, 4
 	endchannel
 
 Music_HealPokemon_Ch2: ; f06c4
@@ -29,25 +29,25 @@
 	dutycycle $2
 	notetype $c, $c3
 	octave 4
-	note B_, 3
-	note B_, 3
-	note B_, 1
-	note G#, 1
+	note B_, 4
+	note B_, 4
+	note B_, 2
+	note G#, 2
 	notetype $c, $c4
 	octave 5
-	note E_, 7
+	note E_, 8
 	endchannel
 
 Music_HealPokemon_Ch3: ; f06d4
 	notetype $c, $10
 	octave 4
-	note E_, 1
-	note __, 1
-	note E_, 1
-	note __, 1
-	note E_, 1
-	note G#, 1
-	note E_, 5
-	note __, 1
+	note E_, 2
+	note __, 2
+	note E_, 2
+	note __, 2
+	note E_, 2
+	note G#, 2
+	note E_, 6
+	note __, 2
 	endchannel
 ; f06e1
--- a/audio/music/indigoplateau.asm
+++ b/audio/music/indigoplateau.asm
@@ -16,15 +16,15 @@
 Music_IndigoPlateau_branch_ee86a: ; ee86a
 	callchannel Music_IndigoPlateau_branch_ee881
 	octave 3
-	note D_, 3
+	note D_, 4
 	callchannel Music_IndigoPlateau_branch_ee881
 	octave 3
-	note D#, 3
+	note D#, 4
 	callchannel Music_IndigoPlateau_branch_ee881
 	octave 3
-	note D#, 3
+	note D#, 4
 	callchannel Music_IndigoPlateau_branch_ee881
-	note A#, 3
+	note A#, 4
 	loopchannel 0, Music_IndigoPlateau_branch_ee86a
 ; ee881
 
@@ -31,15 +31,15 @@
 Music_IndigoPlateau_branch_ee881: ; ee881
 	notetype $c, $b6
 	octave 2
-	note A_, 3
+	note A_, 4
 	intensity $b2
-	note A_, 1
-	note A_, 1
-	note A_, 1
-	note A_, 1
-	note A_, 3
-	note A_, 1
-	note A_, 1
+	note A_, 2
+	note A_, 2
+	note A_, 2
+	note A_, 2
+	note A_, 4
+	note A_, 2
+	note A_, 2
 	intensity $a0
 	endchannel
 
@@ -50,57 +50,57 @@
 
 Music_IndigoPlateau_branch_ee899: ; ee899
 	callchannel Music_IndigoPlateau_branch_ee8e9
-	note A_, 3
+	note A_, 4
 	callchannel Music_IndigoPlateau_branch_ee8e9
-	note A#, 3
+	note A#, 4
 	callchannel Music_IndigoPlateau_branch_ee8e9
-	note A_, 3
+	note A_, 4
 	callchannel Music_IndigoPlateau_branch_ee8e9
-	note C#, 3
+	note C#, 4
 	intensity $c7
-	note A_, 5
-	note D_, 1
-	note G_, 1
-	note A#, 1
-	note A_, 7
+	note A_, 6
+	note D_, 2
+	note G_, 2
+	note A#, 2
+	note A_, 8
 	intensity $b0
-	note A_, 3
+	note A_, 4
 	callchannel Music_IndigoPlateau_branch_ee8e9
-	note A#, 3
+	note A#, 4
 	intensity $c7
 	octave 4
-	note D_, 5
-	note D#, 1
-	note C_, 3
-	note D_, 7
+	note D_, 6
+	note D#, 2
+	note C_, 4
+	note D_, 8
 	intensity $b0
 	octave 3
-	note A_, 3
+	note A_, 4
 	callchannel Music_IndigoPlateau_branch_ee8e9
-	note C#, 3
+	note C#, 4
 	intensity $c7
 	octave 4
-	note C_, 5
+	note C_, 6
 	octave 3
-	note A#, 1
-	note A_, 1
-	note G_, 1
-	note F#, 7
+	note A#, 2
+	note A_, 2
+	note G_, 2
+	note F#, 8
 	intensity $b0
-	note A_, 3
+	note A_, 4
 	callchannel Music_IndigoPlateau_branch_ee8e9
-	note A#, 3
+	note A#, 4
 	intensity $c7
 	octave 4
-	note D_, 5
-	note D#, 1
-	note F_, 3
-	note F#, 7
+	note D_, 6
+	note D#, 2
+	note F_, 4
+	note F#, 8
 	intensity $b0
 	octave 3
-	note A_, 3
+	note A_, 4
 	callchannel Music_IndigoPlateau_branch_ee8e9
-	note C#, 3
+	note C#, 4
 	loopchannel 0, Music_IndigoPlateau_branch_ee899
 ; ee8e9
 
@@ -107,15 +107,15 @@
 Music_IndigoPlateau_branch_ee8e9: ; ee8e9
 	notetype $c, $c6
 	octave 3
-	note D_, 3
+	note D_, 4
 	intensity $c2
-	note D_, 1
-	note D_, 1
-	note D_, 1
-	note D_, 1
-	note D_, 3
-	note D_, 1
-	note D_, 1
+	note D_, 2
+	note D_, 2
+	note D_, 2
+	note D_, 2
+	note D_, 4
+	note D_, 2
+	note D_, 2
 	intensity $b0
 	endchannel
 
@@ -125,34 +125,34 @@
 Music_IndigoPlateau_branch_ee8fd: ; ee8fd
 	callchannel Music_IndigoPlateau_branch_ee915
 	octave 3
-	note A_, 3
+	note A_, 4
 	callchannel Music_IndigoPlateau_branch_ee915
 	octave 3
-	note A_, 3
+	note A_, 4
 	callchannel Music_IndigoPlateau_branch_ee915
 	octave 3
-	note A_, 3
+	note A_, 4
 	callchannel Music_IndigoPlateau_branch_ee915
 	octave 3
-	note F#, 3
+	note F#, 4
 	loopchannel 0, Music_IndigoPlateau_branch_ee8fd
 ; ee915
 
 Music_IndigoPlateau_branch_ee915: ; ee915
 	octave 3
-	note D_, 0
-	note __, 2
+	note D_, 1
+	note __, 3
 	octave 2
-	note A_, 0
-	note __, 2
+	note A_, 1
+	note __, 3
 	octave 3
-	note C_, 0
-	note __, 2
-	note D_, 0
-	note __, 2
+	note C_, 1
+	note __, 3
+	note D_, 1
+	note __, 3
 	octave 2
-	note A_, 0
-	note __, 2
+	note A_, 1
+	note __, 3
 	endchannel
 
 Music_IndigoPlateau_Ch4: ; ee924
@@ -161,32 +161,32 @@
 	notetype $c
 
 Music_IndigoPlateau_branch_ee92a: ; ee92a
-	note D#, 3
+	note D#, 4
+	note D_, 2
+	note D#, 2
+	note D#, 2
+	note D#, 2
+	note D_, 4
+	note D_, 2
+	note D_, 2
+	notetype $6
 	note D_, 1
+	note D_, 1
 	note D#, 1
 	note D#, 1
 	note D#, 1
-	note D_, 3
-	note D_, 1
-	note D_, 1
-	notetype $6
-	note D_, 0
-	note D_, 0
-	note D#, 0
-	note D#, 0
-	note D#, 0
-	note D#, 0
-	note D_, 0
-	note D_, 0
-	notetype $c
-	note D#, 3
-	note D_, 1
 	note D#, 1
-	note D#, 1
 	note D_, 1
-	note C#, 3
 	note D_, 1
-	note D_, 1
-	note C#, 3
+	notetype $c
+	note D#, 4
+	note D_, 2
+	note D#, 2
+	note D#, 2
+	note D_, 2
+	note C#, 4
+	note D_, 2
+	note D_, 2
+	note C#, 4
 	loopchannel 0, Music_IndigoPlateau_branch_ee92a
 ; ee94b
--- a/audio/music/johtogymbattle.asm
+++ b/audio/music/johtogymbattle.asm
@@ -15,280 +15,280 @@
 
 Music_JohtoGymBattle_branch_ea526: ; ea526
 	octave 3
-	note A#, 0
-	note A_, 0
-	note G#, 0
-	note A_, 0
+	note A#, 1
+	note A_, 1
+	note G#, 1
+	note A_, 1
 	loopchannel 4, Music_JohtoGymBattle_branch_ea526
 
 Music_JohtoGymBattle_branch_ea52f: ; ea52f
-	note C#, 0
-	note C_, 0
+	note C#, 1
+	note C_, 1
 	octave 2
-	note A#, 0
+	note A#, 1
 	octave 3
-	note C_, 0
+	note C_, 1
 	loopchannel 3, Music_JohtoGymBattle_branch_ea52f
 	intensity $4b
-	note C#, 3
+	note C#, 4
 	intensity $b2
-	note D_, 5
-	note D#, 5
-	note C_, 3
-	note F_, 5
-	note D_, 5
-	note D#, 3
-	note D_, 5
-	note D#, 5
-	note C_, 3
-	note F_, 5
-	note G_, 5
+	note D_, 6
+	note D#, 6
+	note C_, 4
+	note F_, 6
+	note D_, 6
+	note D#, 4
+	note D_, 6
+	note D#, 6
+	note C_, 4
+	note F_, 6
+	note G_, 6
 	intensity $b7
-	note C_, 3
+	note C_, 4
 	intensity $b2
-	note G_, 5
-	note G#, 5
-	note F_, 3
-	note G#, 5
-	note F_, 5
-	note G#, 3
-	note G_, 5
-	note G#, 5
-	note F_, 3
-	note G#, 5
+	note G_, 6
+	note G#, 6
+	note F_, 4
+	note G#, 6
+	note F_, 6
+	note G#, 4
+	note G_, 6
+	note G#, 6
+	note F_, 4
+	note G#, 6
 	octave 4
-	note C_, 5
+	note C_, 6
 	octave 3
-	note G#, 1
-	note F_, 1
+	note G#, 2
+	note F_, 2
 
 Music_JohtoGymBattle_branch_ea55d: ; ea55d
 	intensity $b5
-	note D_, 5
-	note G_, 5
-	note F_, 1
-	note G_, 1
-	note G#, 3
-	note G_, 3
-	note F_, 3
-	note G_, 3
+	note D_, 6
+	note G_, 6
+	note F_, 2
+	note G_, 2
+	note G#, 4
+	note G_, 4
+	note F_, 4
+	note G_, 4
 	intensity $b7
-	note G#, 11
+	note G#, 12
 	intensity $b2
-	note G_, 3
+	note G_, 4
 	intensity $b7
 	octave 4
-	note C#, 11
+	note C#, 12
 	intensity $b2
-	note C_, 3
+	note C_, 4
 	intensity $b5
 	octave 3
-	note D_, 5
-	note G_, 5
-	note F_, 1
-	note G_, 1
-	note G#, 3
-	note G_, 3
-	note F_, 3
-	note G_, 3
+	note D_, 6
+	note G_, 6
+	note F_, 2
+	note G_, 2
+	note G#, 4
+	note G_, 4
+	note F_, 4
+	note G_, 4
 	intensity $b7
-	note G#, 7
-	note G_, 7
-	note F_, 7
-	note D#, 7
+	note G#, 8
+	note G_, 8
+	note F_, 8
+	note D#, 8
 	intensity $70
-	note C_, 7
+	note C_, 8
 	intensity $77
-	note C_, 7
+	note C_, 8
 	intensity $b4
-	note D#, 1
-	note E_, 1
-	note F_, 5
-	note G_, 1
-	note D#, 3
+	note D#, 2
+	note E_, 2
+	note F_, 6
+	note G_, 2
+	note D#, 4
 	intensity $77
 	octave 2
-	note A#, 7
-	note A#, 7
+	note A#, 8
+	note A#, 8
 	intensity $c5
 	octave 3
-	note G_, 1
-	note G#, 1
-	note A#, 5
-	note A#, 1
-	note G#, 3
+	note G_, 2
+	note G#, 2
+	note A#, 6
+	note A#, 2
+	note G#, 4
 	intensity $c7
-	note G_, 7
-	note F_, 3
-	note E_, 1
-	note C#, 1
+	note G_, 8
+	note F_, 4
+	note E_, 2
+	note C#, 2
 	intensity $a0
-	note C_, 7
+	note C_, 8
 	intensity $a7
-	note C_, 7
+	note C_, 8
 	intensity $b2
-	note F_, 5
-	note F_, 3
-	note E_, 1
-	note F_, 3
-	note F_, 5
-	note F_, 5
-	note F_, 1
-	note G#, 1
-	note E_, 5
-	note E_, 3
-	note F_, 1
-	note E_, 1
-	note C#, 1
-	note C_, 5
-	note C_, 5
-	note C_, 3
-	note F_, 5
-	note F_, 1
-	note G#, 1
-	note E_, 1
-	note F_, 1
-	note G#, 1
-	note F_, 1
-	note C_, 3
-	note F_, 5
-	note E_, 1
-	note G#, 1
-	note E_, 1
-	note G_, 3
-	note E_, 3
-	note F_, 1
-	note E_, 1
-	note F_, 1
-	note G_, 5
-	note G_, 3
+	note F_, 6
+	note F_, 4
+	note E_, 2
+	note F_, 4
+	note F_, 6
+	note F_, 6
+	note F_, 2
+	note G#, 2
+	note E_, 6
+	note E_, 4
+	note F_, 2
+	note E_, 2
+	note C#, 2
+	note C_, 6
+	note C_, 6
+	note C_, 4
+	note F_, 6
+	note F_, 2
+	note G#, 2
+	note E_, 2
+	note F_, 2
+	note G#, 2
+	note F_, 2
+	note C_, 4
+	note F_, 6
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G_, 4
+	note E_, 4
+	note F_, 2
+	note E_, 2
+	note F_, 2
+	note G_, 6
+	note G_, 4
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G_, 1
-	note C_, 1
-	note C_, 5
-	note C_, 5
-	note C_, 3
-	note C#, 5
-	note C#, 5
-	note C#, 3
-	note D_, 5
-	note D_, 5
-	note D_, 3
-	note D#, 5
-	note D#, 5
-	note D#, 3
+	note G_, 2
+	note C_, 2
+	note C_, 6
+	note C_, 6
+	note C_, 4
+	note C#, 6
+	note C#, 6
+	note C#, 4
+	note D_, 6
+	note D_, 6
+	note D_, 4
+	note D#, 6
+	note D#, 6
+	note D#, 4
 	intensity $80
-	note G_, 15
+	note G_, 16
 	intensity $90
-	note G#, 15
+	note G#, 16
 	intensity $a0
-	note A_, 7
-	note A#, 1
-	note A_, 1
-	note G#, 1
-	note A_, 1
+	note A_, 8
+	note A#, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
 	intensity $b0
-	note A#, 7
-	note B_, 1
-	note A#, 1
-	note A_, 1
+	note A#, 8
+	note B_, 2
+	note A#, 2
+	note A_, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	intensity $b7
-	note C_, 7
-	note C#, 3
-	note C_, 3
+	note C_, 8
+	note C#, 4
+	note C_, 4
 	octave 3
-	note G#, 1
+	note G#, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G#, 1
+	note G#, 2
 	octave 4
-	note D#, 1
+	note D#, 2
 	octave 3
-	note G#, 1
+	note G#, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note G#, 1
+	note G#, 2
 	octave 4
-	note C_, 1
-	note G#, 3
-	note D#, 3
-	note G#, 3
-	note D#, 3
-	note D#, 3
+	note C_, 2
+	note G#, 4
+	note D#, 4
+	note G#, 4
+	note D#, 4
+	note D#, 4
 	octave 3
-	note G#, 3
+	note G#, 4
 	octave 4
-	note D#, 3
+	note D#, 4
 	octave 3
-	note G#, 3
-	note G#, 7
-	note A_, 3
-	note G#, 3
-	note D#, 1
-	note G#, 1
-	note D#, 1
+	note G#, 4
+	note G#, 8
+	note A_, 4
+	note G#, 4
+	note D#, 2
+	note G#, 2
+	note D#, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note D#, 1
-	note A_, 1
-	note D#, 1
-	note G_, 1
+	note D#, 2
+	note A_, 2
+	note D#, 2
+	note G_, 2
 	octave 4
-	note C#, 3
+	note C#, 4
 	octave 3
-	note G#, 3
+	note G#, 4
 	octave 4
-	note C#, 3
+	note C#, 4
 	octave 3
-	note G#, 3
-	note G#, 3
-	note C#, 3
-	note G#, 3
-	note C#, 3
-	note B_, 7
-	note A_, 7
-	note G#, 7
-	note F#, 7
+	note G#, 4
+	note G#, 4
+	note C#, 4
+	note G#, 4
+	note C#, 4
+	note B_, 8
+	note A_, 8
+	note G#, 8
+	note F#, 8
 	intensity $b4
-	note A_, 3
+	note A_, 4
 	octave 4
-	note C#, 3
+	note C#, 4
 	octave 3
-	note B_, 3
+	note B_, 4
 	octave 4
-	note E_, 3
+	note E_, 4
 	intensity $92
-	note D#, 1
-	note D#, 1
-	note D#, 1
-	note D#, 1
+	note D#, 2
+	note D#, 2
+	note D#, 2
+	note D#, 2
 	intensity $b2
-	note D#, 1
-	note D#, 1
-	note D#, 1
-	note D#, 1
+	note D#, 2
+	note D#, 2
+	note D#, 2
+	note D#, 2
 	intensity $c2
-	note D#, 15
+	note D#, 16
 	intensity $50
 	octave 3
-	note C_, 15
-	note F_, 15
-	note E_, 15
+	note C_, 16
+	note F_, 16
+	note E_, 16
 	intensity $97
-	note D#, 9
+	note D#, 10
 	intensity $b4
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note D#, 1
-	note F#, 1
+	note D#, 2
+	note F#, 2
 	loopchannel 0, Music_JohtoGymBattle_branch_ea55d
 
 Music_JohtoGymBattle_Ch2: ; ea65f
@@ -299,652 +299,652 @@
 
 Music_JohtoGymBattle_branch_ea66a: ; ea66a
 	octave 4
-	note F#, 0
-	note F_, 0
-	note E_, 0
-	note A#, 0
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note A#, 1
 	loopchannel 4, Music_JohtoGymBattle_branch_ea66a
 
 Music_JohtoGymBattle_branch_ea673: ; ea673
-	note F#, 0
-	note F_, 0
-	note F#, 0
-	note A#, 0
+	note F#, 1
+	note F_, 1
+	note F#, 1
+	note A#, 1
 	loopchannel 4, Music_JohtoGymBattle_branch_ea673
-	note A_, 5
+	note A_, 6
 	octave 3
-	note A#, 5
-	note G_, 3
+	note A#, 6
+	note G_, 4
 	octave 4
-	note D_, 5
+	note D_, 6
 	octave 3
-	note A_, 5
-	note A#, 3
-	note A_, 5
-	note A#, 5
-	note G_, 3
+	note A_, 6
+	note A#, 4
+	note A_, 6
+	note A#, 6
+	note G_, 4
 	octave 4
-	note D_, 5
-	note D#, 5
+	note D_, 6
+	note D#, 6
 	intensity $b0
 	octave 3
-	note D#, 3
+	note D#, 4
 	intensity $c2
 	octave 4
-	note D_, 1
+	note D_, 2
 	intensity $92
 	octave 3
-	note D_, 1
-	note D_, 1
+	note D_, 2
+	note D_, 2
 	intensity $c2
 	octave 4
-	note D#, 3
+	note D#, 4
 	intensity $92
 	octave 3
-	note D_, 1
+	note D_, 2
 	intensity $c2
 	octave 4
-	note C_, 3
-	note G_, 1
+	note C_, 4
+	note G_, 2
 	notetype $c, $92
 	octave 3
-	note D_, 1
-	note D_, 1
+	note D_, 2
+	note D_, 2
 	intensity $c2
 	octave 4
-	note D_, 3
+	note D_, 4
 	intensity $92
 	octave 3
-	note D_, 1
+	note D_, 2
 	intensity $c2
 	octave 4
-	note D#, 1
+	note D#, 2
 	intensity $92
 	octave 3
-	note D#, 1
+	note D#, 2
 	intensity $c2
 	octave 4
-	note D_, 1
+	note D_, 2
 	intensity $92
 	octave 3
-	note D_, 1
-	note D_, 1
+	note D_, 2
+	note D_, 2
 	intensity $c2
 	octave 4
-	note D#, 3
+	note D#, 4
 	intensity $92
 	octave 3
-	note D_, 1
+	note D_, 2
 	intensity $c2
 	octave 4
-	note C_, 1
+	note C_, 2
 	intensity $92
 	octave 3
-	note D#, 1
+	note D#, 2
 	intensity $c2
 	octave 4
-	note G_, 1
+	note G_, 2
 	intensity $92
 	octave 3
-	note F_, 1
-	note F_, 1
+	note F_, 2
+	note F_, 2
 	intensity $c2
 	octave 4
-	note G#, 1
+	note G#, 2
 	intensity $92
 	octave 3
-	note F_, 1
-	note F_, 1
+	note F_, 2
+	note F_, 2
 	intensity $c2
 	octave 4
-	note F#, 1
+	note F#, 2
 	intensity $b2
 	octave 3
-	note G#, 0
-	note A_, 0
+	note G#, 1
+	note A_, 1
 
 Music_JohtoGymBattle_branch_ea6ee: ; ea6ee
 	intensity $c7
-	note A#, 7
+	note A#, 8
 	intensity $c4
 	octave 4
-	note D_, 1
-	note C_, 1
+	note D_, 2
+	note C_, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	intensity $c7
-	note C#, 7
+	note C#, 8
 	intensity $c4
-	note F_, 1
-	note D#, 1
-	note C#, 1
-	note D#, 1
+	note F_, 2
+	note D#, 2
+	note C#, 2
+	note D#, 2
 	intensity $b0
-	note F_, 5
+	note F_, 6
 	intensity $b7
-	note F_, 5
+	note F_, 6
 	intensity $c2
-	note D#, 3
+	note D#, 4
 	intensity $b0
-	note G#, 5
+	note G#, 6
 	intensity $b7
-	note G#, 5
+	note G#, 6
 	intensity $c2
-	note F_, 3
+	note F_, 4
 	intensity $c7
 	octave 3
-	note A#, 7
+	note A#, 8
 	intensity $c4
 	octave 4
-	note D_, 1
-	note C_, 1
+	note D_, 2
+	note C_, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	intensity $c7
-	note C#, 7
+	note C#, 8
 	intensity $c4
-	note F_, 1
-	note D#, 1
-	note C#, 1
-	note D#, 1
+	note F_, 2
+	note D#, 2
+	note C#, 2
+	note D#, 2
 	intensity $b0
-	note C#, 15
+	note C#, 16
 	intensity $b7
-	note C#, 15
+	note C#, 16
 	intensity $a4
 	octave 3
-	note F_, 5
-	note D#, 5
-	note F_, 3
+	note F_, 6
+	note D#, 6
+	note F_, 4
 	intensity $c6
 	octave 4
-	note C_, 5
+	note C_, 6
 	octave 3
-	note A#, 5
+	note A#, 6
 	octave 4
-	note C_, 3
+	note C_, 4
 	intensity $a4
 	octave 3
-	note C#, 5
-	note C_, 5
-	note C#, 3
+	note C#, 6
+	note C_, 6
+	note C#, 4
 	intensity $c6
 	octave 4
-	note C#, 5
-	note C_, 5
-	note C#, 3
+	note C#, 6
+	note C_, 6
+	note C#, 4
 	intensity $3c
-	note C_, 9
+	note C_, 10
 	intensity $b7
-	note C_, 5
+	note C_, 6
 	intensity $b0
-	note E_, 7
+	note E_, 8
 	intensity $b7
-	note E_, 7
+	note E_, 8
 	intensity $b0
 	octave 3
-	note C#, 15
+	note C#, 16
 	octave 2
-	note A#, 7
+	note A#, 8
 	octave 3
-	note C#, 5
-	note D#, 1
-	note C_, 15
-	note E_, 15
+	note C#, 6
+	note D#, 2
+	note C_, 16
+	note E_, 16
 	intensity $a0
 	octave 5
-	note C#, 3
+	note C#, 4
 	intensity $a7
 	octave 5
-	note C#, 11
+	note C#, 12
 	intensity $b7
 	octave 4
-	note A#, 7
+	note A#, 8
 	octave 5
-	note C#, 5
-	note D#, 1
+	note C#, 6
+	note D#, 2
 	intensity $a0
-	note C_, 7
+	note C_, 8
 	intensity $a7
-	note C_, 7
+	note C_, 8
 	intensity $3e
-	note E_, 5
+	note E_, 6
 	intensity $a6
-	note E_, 9
+	note E_, 10
 	intensity $c2
 	octave 3
-	note F_, 5
-	note F_, 5
-	note F_, 3
-	note F#, 5
-	note F#, 5
-	note F#, 3
-	note G_, 5
-	note G_, 5
-	note G_, 3
-	note G#, 5
-	note G#, 5
-	note G#, 3
+	note F_, 6
+	note F_, 6
+	note F_, 4
+	note F#, 6
+	note F#, 6
+	note F#, 4
+	note G_, 6
+	note G_, 6
+	note G_, 4
+	note G#, 6
+	note G#, 6
+	note G#, 4
 	intensity $90
 	octave 4
-	note C_, 15
+	note C_, 16
 	intensity $a0
-	note C#, 15
+	note C#, 16
 	intensity $b0
-	note D_, 15
+	note D_, 16
 	intensity $b7
-	note D#, 7
+	note D#, 8
 	intensity $4c
-	note D#, 5
+	note D#, 6
 	intensity $c2
-	note F#, 0
-	note G_, 0
-	intensity $c7
-	note G#, 7
-	note A_, 1
-	note G#, 1
 	note F#, 1
-	note A_, 1
-	note G#, 3
+	note G_, 1
+	intensity $c7
+	note G#, 8
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note A_, 2
+	note G#, 4
 	octave 5
-	note C_, 3
+	note C_, 4
 	octave 4
-	note A_, 3
-	note G#, 3
+	note A_, 4
+	note G#, 4
 	octave 5
-	note D#, 3
+	note D#, 4
 	octave 4
-	note G#, 3
+	note G#, 4
 	octave 5
-	note D#, 3
+	note D#, 4
 	octave 4
-	note G#, 3
+	note G#, 4
 	octave 5
-	note D#, 1
-	note C#, 1
-	note C_, 1
-	note C#, 1
-	note C_, 1
+	note D#, 2
+	note C#, 2
+	note C_, 2
+	note C#, 2
+	note C_, 2
 	octave 4
-	note A_, 1
-	note G#, 1
-	note A_, 1
-	note D#, 7
-	note E_, 1
-	note D#, 1
-	note C#, 1
-	note E_, 1
-	note D#, 3
-	note G#, 3
-	note E_, 3
-	note C#, 3
-	note G#, 3
-	note C#, 3
-	note G#, 3
-	note C#, 3
-	note A_, 1
-	note G#, 1
-	note F#, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note C#, 1
-	note D#, 7
-	note C#, 7
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note D#, 8
+	note E_, 2
+	note D#, 2
+	note C#, 2
+	note E_, 2
+	note D#, 4
+	note G#, 4
+	note E_, 4
+	note C#, 4
+	note G#, 4
+	note C#, 4
+	note G#, 4
+	note C#, 4
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note E_, 2
+	note D#, 2
+	note C#, 2
+	note D#, 8
+	note C#, 8
 	octave 3
-	note B_, 7
-	note A_, 7
+	note B_, 8
+	note A_, 8
 	octave 4
-	note D#, 3
-	note G#, 3
-	note E_, 3
-	note A_, 3
+	note D#, 4
+	note G#, 4
+	note E_, 4
+	note A_, 4
 	intensity $c0
-	note G#, 7
+	note G#, 8
 	intensity $c7
-	note G#, 7
+	note G#, 8
 	intensity $c2
-	note G#, 15
+	note G#, 16
 	intensity $80
 	octave 3
-	note F_, 15
+	note F_, 16
 	octave 4
-	note C_, 15
+	note C_, 16
 	octave 3
-	note B_, 15
-	note G_, 15
+	note B_, 16
+	note G_, 16
 	loopchannel 0, Music_JohtoGymBattle_branch_ea6ee
 
 Music_JohtoGymBattle_Ch3: ; ea7f4
 	notetype $c, $19
 	octave 4
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
 	octave 3
-	note G#, 1
+	note G#, 2
 	octave 4
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
 	octave 3
-	note G_, 1
+	note G_, 2
 	octave 4
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
 	octave 3
-	note F#, 1
+	note F#, 2
 	octave 4
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
 	octave 3
-	note F_, 1
+	note F_, 2
 	octave 4
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
 	octave 3
-	note E_, 1
-	note F_, 1
-	note G_, 1
-	note G#, 3
+	note E_, 2
+	note F_, 2
+	note G_, 2
+	note G#, 4
 	callchannel Music_JohtoGymBattle_branch_ea952
-	note G_, 1
-	note D_, 1
-	note F_, 1
-	note G_, 1
-	note G#, 1
-	note G#, 1
-	note G_, 1
-	note F_, 1
-	note G_, 1
-	note D_, 1
-	note F_, 1
-	note G_, 1
-	note G#, 1
-	note D#, 1
-	note F#, 3
+	note G_, 2
+	note D_, 2
+	note F_, 2
+	note G_, 2
+	note G#, 2
+	note G#, 2
+	note G_, 2
+	note F_, 2
+	note G_, 2
+	note D_, 2
+	note F_, 2
+	note G_, 2
+	note G#, 2
+	note D#, 2
+	note F#, 4
 	callchannel Music_JohtoGymBattle_branch_ea952
-	note G_, 1
-	note D_, 1
-	note F_, 1
-	note G_, 1
-	note G#, 1
-	note G#, 1
-	note G_, 1
-	note F_, 1
-	note G_, 1
-	note D_, 1
-	note F_, 1
-	note G_, 1
-	note G#, 1
+	note G_, 2
+	note D_, 2
+	note F_, 2
+	note G_, 2
+	note G#, 2
+	note G#, 2
+	note G_, 2
+	note F_, 2
+	note G_, 2
+	note D_, 2
+	note F_, 2
+	note G_, 2
+	note G#, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note A#, 1
-	note G#, 1
+	note A#, 2
+	note G#, 2
 
 Music_JohtoGymBattle_branch_ea83f: ; ea83f
 	callchannel Music_JohtoGymBattle_branch_ea963
 	callchannel Music_JohtoGymBattle_branch_ea963
 	callchannel Music_JohtoGymBattle_branch_ea96a
-	note C#, 1
-	note G#, 1
-	note C#, 1
-	note G#, 1
-	note C#, 1
-	note A#, 1
-	note A_, 1
-	note G#, 1
+	note C#, 2
+	note G#, 2
+	note C#, 2
+	note G#, 2
+	note C#, 2
+	note A#, 2
+	note A_, 2
+	note G#, 2
 	callchannel Music_JohtoGymBattle_branch_ea963
-	note D_, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
-	note G#, 1
-	note G_, 1
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note G#, 2
+	note G_, 2
 	callchannel Music_JohtoGymBattle_branch_ea96a
 	callchannel Music_JohtoGymBattle_branch_ea96a
-	note C_, 1
-	note G_, 1
-	note A#, 1
-	note C_, 1
-	note D#, 1
-	note F_, 1
-	note G_, 1
-	note A#, 1
+	note C_, 2
+	note G_, 2
+	note A#, 2
+	note C_, 2
+	note D#, 2
+	note F_, 2
+	note G_, 2
+	note A#, 2
 	callchannel Music_JohtoGymBattle_branch_ea971
 	callchannel Music_JohtoGymBattle_branch_ea96a
 	callchannel Music_JohtoGymBattle_branch_ea978
 	octave 3
-	note G_, 1
-	note G#, 1
-	note F_, 1
+	note G_, 2
+	note G#, 2
+	note F_, 2
 	callchannel Music_JohtoGymBattle_branch_ea971
-	note C_, 1
-	note G_, 1
-	note C_, 1
-	note G_, 1
-	note C_, 1
-	note E_, 1
-	note F_, 1
-	note G_, 1
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note E_, 2
+	note F_, 2
+	note G_, 2
 	callchannel Music_JohtoGymBattle_branch_ea96a
 	callchannel Music_JohtoGymBattle_branch_ea978
 	octave 3
-	note C_, 1
-	note C#, 1
-	note G#, 1
+	note C_, 2
+	note C#, 2
+	note G#, 2
 	callchannel Music_JohtoGymBattle_branch_ea971
-	note C_, 1
-	note G_, 1
-	note C_, 1
-	note G_, 1
-	note F_, 1
-	note E_, 1
-	note F_, 1
-	note G_, 1
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note F_, 2
+	note G_, 2
 	callchannel Music_JohtoGymBattle_branch_ea96a
 	callchannel Music_JohtoGymBattle_branch_ea978
 	octave 3
-	note F_, 1
+	note F_, 2
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note G#, 1
+	note G#, 2
 	callchannel Music_JohtoGymBattle_branch_ea971
-	note C_, 1
-	note G_, 1
-	note C_, 1
+	note C_, 2
+	note G_, 2
+	note C_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note A#, 1
-	note G_, 1
-	note F_, 1
-	note G_, 1
+	note A#, 2
+	note G_, 2
+	note F_, 2
+	note G_, 2
 	callchannel Music_JohtoGymBattle_branch_ea983
-	note __, 1
+	note __, 2
 	callchannel Music_JohtoGymBattle_branch_ea990
 	octave 4
-	note C#, 1
+	note C#, 2
 	callchannel Music_JohtoGymBattle_branch_ea99c
-	note __, 1
-	note D#, 1
-	note A#, 1
+	note __, 2
+	note D#, 2
+	note A#, 2
 	octave 4
-	note D#, 1
+	note D#, 2
 	octave 3
-	note D#, 1
-	note A#, 1
+	note D#, 2
+	note A#, 2
 	octave 4
-	note D#, 1
+	note D#, 2
 	octave 3
-	note D#, 1
+	note D#, 2
 	octave 4
-	note D#, 1
+	note D#, 2
 	callchannel Music_JohtoGymBattle_branch_ea983
-	note G_, 1
+	note G_, 2
 	callchannel Music_JohtoGymBattle_branch_ea990
-	note G#, 1
+	note G#, 2
 	callchannel Music_JohtoGymBattle_branch_ea99c
-	note A_, 1
+	note A_, 2
 	octave 4
-	note D#, 1
+	note D#, 2
 	octave 3
-	note A#, 1
-	note D#, 1
+	note A#, 2
+	note D#, 2
 	octave 4
-	note D#, 1
+	note D#, 2
 	octave 3
-	note D#, 1
+	note D#, 2
 	octave 4
-	note D#, 1
-	note D_, 3
+	note D#, 2
+	note D_, 4
 	callchannel Music_JohtoGymBattle_branch_ea9a9
-	note D#, 1
-	note G#, 1
-	note D#, 1
+	note D#, 2
+	note G#, 2
+	note D#, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note D#, 1
-	note A_, 1
-	note D#, 1
-	note G#, 1
+	note D#, 2
+	note A_, 2
+	note D#, 2
+	note G#, 2
 	callchannel Music_JohtoGymBattle_branch_ea9a9
-	note D#, 1
-	note G#, 1
-	note D#, 1
-	note G#, 1
-	note D#, 1
-	note A_, 1
-	note G#, 1
-	note F#, 1
+	note D#, 2
+	note G#, 2
+	note D#, 2
+	note G#, 2
+	note D#, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
 	callchannel Music_JohtoGymBattle_branch_ea9b1
-	note C#, 1
-	note F#, 1
-	note C#, 1
+	note C#, 2
+	note F#, 2
+	note C#, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note C#, 1
-	note A_, 1
-	note C#, 1
-	note G_, 1
+	note C#, 2
+	note A_, 2
+	note C#, 2
+	note G_, 2
 	callchannel Music_JohtoGymBattle_branch_ea9b1
-	note C#, 1
-	note F#, 1
-	note C#, 1
-	note F#, 1
-	note C#, 1
-	note D#, 1
-	note E_, 1
-	note A_, 1
+	note C#, 2
+	note F#, 2
+	note C#, 2
+	note F#, 2
+	note C#, 2
+	note D#, 2
+	note E_, 2
+	note A_, 2
 	callchannel Music_JohtoGymBattle_branch_ea9a9
-	note D#, 1
-	note G#, 1
-	note D#, 1
-	note G#, 1
-	note D#, 1
-	note G#, 1
-	note A_, 1
+	note D#, 2
+	note G#, 2
+	note D#, 2
+	note G#, 2
+	note D#, 2
+	note G#, 2
+	note A_, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note D#, 1
-	note G#, 1
-	note D#, 1
-	note A_, 1
-	note D#, 1
-	note B_, 1
-	note D#, 1
+	note D#, 2
+	note G#, 2
+	note D#, 2
+	note A_, 2
+	note D#, 2
+	note B_, 2
+	note D#, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note G#, 1
-	note D#, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
-	note A_, 1
-	note G#, 1
-	note F#, 1
-	note G#, 1
-	note D#, 1
-	note F#, 1
-	note G#, 1
-	note F#, 1
-	note F#, 1
-	note E_, 1
-	note F#, 1
+	note G#, 2
+	note D#, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note G#, 2
+	note D#, 2
+	note F#, 2
+	note G#, 2
+	note F#, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
 	callchannel Music_JohtoGymBattle_branch_ea9b8
-	note F_, 1
-	note C_, 1
-	note D#, 1
-	note F_, 1
-	note D#, 1
-	note D#, 1
-	note C#, 1
-	note D#, 1
+	note F_, 2
+	note C_, 2
+	note D#, 2
+	note F_, 2
+	note D#, 2
+	note D#, 2
+	note C#, 2
+	note D#, 2
 	callchannel Music_JohtoGymBattle_branch_ea9b8
-	note F_, 1
-	note C_, 1
-	note D#, 1
-	note F_, 1
-	note D#, 1
-	note F#, 1
-	note F_, 1
-	note D#, 1
+	note F_, 2
+	note C_, 2
+	note D#, 2
+	note F_, 2
+	note D#, 2
+	note F#, 2
+	note F_, 2
+	note D#, 2
 	loopchannel 0, Music_JohtoGymBattle_branch_ea83f
 ; ea952
 
 Music_JohtoGymBattle_branch_ea952: ; ea952
-	note G_, 1
-	note D_, 1
-	note F_, 1
-	note G_, 1
-	note G#, 1
-	note G#, 1
-	note G_, 1
-	note F_, 1
-	note G_, 1
-	note D_, 1
-	note F_, 1
-	note G_, 1
-	note F_, 1
-	note F_, 1
-	note D#, 1
-	note F_, 1
+	note G_, 2
+	note D_, 2
+	note F_, 2
+	note G_, 2
+	note G#, 2
+	note G#, 2
+	note G_, 2
+	note F_, 2
+	note G_, 2
+	note D_, 2
+	note F_, 2
+	note G_, 2
+	note F_, 2
+	note F_, 2
+	note D#, 2
+	note F_, 2
 	endchannel
 ; ea963
 
 Music_JohtoGymBattle_branch_ea963: ; ea963
-	note D_, 1
-	note G_, 1
+	note D_, 2
+	note G_, 2
 	loopchannel 4, Music_JohtoGymBattle_branch_ea963
 	endchannel
 ; ea96a
 
 Music_JohtoGymBattle_branch_ea96a: ; ea96a
-	note C#, 1
-	note G#, 1
+	note C#, 2
+	note G#, 2
 	loopchannel 4, Music_JohtoGymBattle_branch_ea96a
 	endchannel
 ; ea971
 
 Music_JohtoGymBattle_branch_ea971: ; ea971
-	note C_, 1
-	note G_, 1
+	note C_, 2
+	note G_, 2
 	loopchannel 4, Music_JohtoGymBattle_branch_ea971
 	endchannel
 ; ea978
@@ -951,88 +951,88 @@
 
 Music_JohtoGymBattle_branch_ea978: ; ea978
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note F_, 1
+	note F_, 2
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note F_, 1
+	note F_, 2
 	octave 2
-	note A#, 1
+	note A#, 2
 	endchannel
 ; ea983
 
 Music_JohtoGymBattle_branch_ea983: ; ea983
 	octave 3
-	note C_, 1
-	note G_, 1
+	note C_, 2
+	note G_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note C_, 1
-	note G_, 1
+	note C_, 2
+	note G_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	endchannel
 ; ea990
 
 Music_JohtoGymBattle_branch_ea990: ; ea990
-	note C#, 1
-	note G#, 1
+	note C#, 2
+	note G#, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note C#, 1
-	note G#, 1
+	note C#, 2
+	note G#, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note C#, 1
+	note C#, 2
 	endchannel
 ; ea99c
 
 Music_JohtoGymBattle_branch_ea99c: ; ea99c
 	octave 3
-	note D_, 1
-	note A_, 1
+	note D_, 2
+	note A_, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note D_, 1
-	note A_, 1
+	note D_, 2
+	note A_, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	endchannel
 ; ea9a9
 
 Music_JohtoGymBattle_branch_ea9a9: ; ea9a9
 	octave 3
-	note D#, 1
-	note G#, 1
+	note D#, 2
+	note G#, 2
 	loopchannel 4, Music_JohtoGymBattle_branch_ea9a9
 	endchannel
 ; ea9b1
 
 Music_JohtoGymBattle_branch_ea9b1: ; ea9b1
-	note C#, 1
-	note F#, 1
+	note C#, 2
+	note F#, 2
 	loopchannel 4, Music_JohtoGymBattle_branch_ea9b1
 	endchannel
 ; ea9b8
 
 Music_JohtoGymBattle_branch_ea9b8: ; ea9b8
-	note F_, 1
-	note C_, 1
-	note D#, 1
-	note F_, 1
-	note F#, 1
-	note F#, 1
-	note F_, 1
-	note D#, 1
+	note F_, 2
+	note C_, 2
+	note D#, 2
+	note F_, 2
+	note F#, 2
+	note F#, 2
+	note F_, 2
+	note D#, 2
 	endchannel
 ; ea9c1
--- a/audio/music/johtotrainerbattle.asm
+++ b/audio/music/johtotrainerbattle.asm
@@ -12,447 +12,447 @@
 	tone $0002
 	vibrato $12, $15
 	notetype $c, $92
-	note __, 7
+	note __, 8
 	octave 3
-	note A_, 0
-	note G#, 0
-	note G_, 0
-	note G#, 0
+	note A_, 1
+	note G#, 1
+	note G_, 1
+	note G#, 1
 	intensity $b2
-	note C_, 0
+	note C_, 1
 	octave 2
-	note B_, 0
-	note A#, 0
-	note B_, 0
+	note B_, 1
+	note A#, 1
+	note B_, 1
 	octave 3
-	note C#, 0
-	note C_, 0
+	note C#, 1
+	note C_, 1
 	octave 2
-	note B_, 0
+	note B_, 1
 	octave 3
-	note C_, 0
-	note D_, 0
-	note C#, 0
-	note C_, 0
-	note C#, 0
-	note D#, 0
-	note D_, 0
-	note C#, 0
-	note D_, 0
-	note E_, 0
-	note D#, 0
-	note D_, 0
-	note D#, 0
-	note E_, 5
-	note E_, 5
-	note E_, 3
-	note E_, 1
+	note C_, 1
 	note D_, 1
+	note C#, 1
+	note C_, 1
+	note C#, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
 	note E_, 1
-	note F_, 5
+	note D#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 6
+	note E_, 6
+	note E_, 4
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 6
 	intensity $b7
-	note D_, 3
+	note D_, 4
 	intensity $b2
-	note E_, 5
-	note D_, 5
-	note E_, 3
-	note E_, 1
-	note D_, 1
-	note E_, 1
-	note F_, 5
+	note E_, 6
+	note D_, 6
+	note E_, 4
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 6
 	intensity $b7
-	note F_, 3
+	note F_, 4
 	intensity $b2
 	octave 4
-	note E_, 5
-	note E_, 5
-	note E_, 3
-	note E_, 1
-	note D_, 1
-	note E_, 1
-	note F_, 1
+	note E_, 6
+	note E_, 6
+	note E_, 4
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
 	octave 3
-	note A_, 1
-	note A#, 1
+	note A_, 2
+	note A#, 2
 	intensity $b7
-	note B_, 3
+	note B_, 4
 	intensity $b2
 	octave 4
-	note E_, 5
-	note E_, 5
-	note E_, 3
-	note E_, 1
-	note D_, 1
-	note E_, 1
-	note F_, 5
+	note E_, 6
+	note E_, 6
+	note E_, 4
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 6
 	intensity $b7
-	note G_, 3
+	note G_, 4
 
 Music_JohtoTrainerBattle_branch_f6102: ; f6102
 	intensity $b4
 	callchannel Music_JohtoTrainerBattle_branch_f629f
 	intensity $b7
-	note A#, 3
+	note A#, 4
 	intensity $b3
-	note G_, 0
-	note F_, 0
-	note E_, 0
-	note G_, 0
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note G_, 1
 	intensity $b7
 	octave 4
-	note C_, 3
+	note C_, 4
 	intensity $b3
 	octave 3
-	note A_, 0
-	note G_, 0
-	note F_, 0
-	note A_, 0
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note A_, 1
 	intensity $b7
 	octave 4
-	note D_, 3
+	note D_, 4
 	intensity $b3
-	note C_, 0
+	note C_, 1
 	octave 3
-	note A#, 0
-	note A_, 0
+	note A#, 1
+	note A_, 1
 	octave 4
-	note C_, 0
-	intensity $b5
-	note F_, 1
-	note E_, 1
-	note D_, 1
 	note C_, 1
+	intensity $b5
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
 	callchannel Music_JohtoTrainerBattle_branch_f629f
 	intensity $b7
-	note F_, 3
-	note E_, 1
-	note F_, 1
+	note F_, 4
+	note E_, 2
+	note F_, 2
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	intensity $a0
 	octave 3
-	note F_, 7
+	note F_, 8
 	intensity $a7
-	note F_, 7
+	note F_, 8
 	intensity $b7
-	note A_, 5
-	note E_, 5
-	note A#, 3
+	note A_, 6
+	note E_, 6
+	note A#, 4
 	octave 4
-	note C#, 5
-	note F_, 3
-	note E_, 1
-	note D_, 1
-	note F_, 1
-	note E_, 1
-	note F_, 1
-	note E_, 1
-	note D_, 1
-	note C#, 1
+	note C#, 6
+	note F_, 4
+	note E_, 2
+	note D_, 2
+	note F_, 2
+	note E_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note C#, 2
 	octave 3
-	note A#, 1
-	note A_, 1
-	note A#, 1
+	note A#, 2
+	note A_, 2
+	note A#, 2
 	intensity $a0
-	note A_, 7
+	note A_, 8
 	intensity $a7
-	note A_, 7
+	note A_, 8
 	intensity $b7
-	note E_, 7
-	note D_, 7
-	note E_, 7
-	note F_, 7
-	note E_, 7
-	note D_, 7
-	note G_, 7
-	note F_, 7
-	note D_, 7
-	note C_, 7
-	note D_, 7
-	note D#, 7
-	note D_, 7
-	note C_, 7
-	note D_, 7
-	note D#, 7
-	note D_, 7
-	note D#, 7
-	note E_, 7
-	note F_, 7
+	note E_, 8
+	note D_, 8
+	note E_, 8
+	note F_, 8
+	note E_, 8
+	note D_, 8
+	note G_, 8
+	note F_, 8
+	note D_, 8
+	note C_, 8
+	note D_, 8
+	note D#, 8
+	note D_, 8
+	note C_, 8
+	note D_, 8
+	note D#, 8
+	note D_, 8
+	note D#, 8
+	note E_, 8
+	note F_, 8
 	intensity $b4
-	note G_, 1
+	note G_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note A#, 1
-	note G#, 1
-	note G_, 1
-	note F_, 1
-	note D#, 1
-	note F_, 1
-	note G_, 1
+	note A#, 2
+	note G#, 2
+	note G_, 2
+	note F_, 2
+	note D#, 2
+	note F_, 2
+	note G_, 2
 	octave 4
-	note C#, 1
-	note C_, 1
-	note C#, 1
-	note D#, 1
-	note C#, 1
-	note C_, 1
+	note C#, 2
+	note C_, 2
+	note C#, 2
+	note D#, 2
+	note C#, 2
+	note C_, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	intensity $b5
-	note D#, 1
-	note D_, 1
+	note D#, 2
+	note D_, 2
 	intensity $b2
-	note D#, 3
+	note D#, 4
 	intensity $b7
-	note C_, 7
-	note D#, 3
-	note C#, 3
-	note C_, 3
-	note D#, 3
+	note C_, 8
+	note D#, 4
+	note C#, 4
+	note C_, 4
+	note D#, 4
 	intensity $b5
-	note E_, 1
-	note D#, 1
+	note E_, 2
+	note D#, 2
 	intensity $b2
-	note E_, 3
+	note E_, 4
 	intensity $b7
-	note C#, 7
-	note F_, 3
-	note D#, 3
-	note C#, 3
-	note F_, 3
+	note C#, 8
+	note F_, 4
+	note D#, 4
+	note C#, 4
+	note F_, 4
 	intensity $b5
-	note F#, 1
-	note F_, 1
+	note F#, 2
+	note F_, 2
 	intensity $b2
-	note F#, 3
+	note F#, 4
 	intensity $b7
-	note D_, 7
-	note F#, 3
-	note E_, 3
-	note D_, 3
-	note F#, 3
-	note G_, 7
-	note D#, 7
-	note A#, 7
-	note G_, 7
+	note D_, 8
+	note F#, 4
+	note E_, 4
+	note D_, 4
+	note F#, 4
+	note G_, 8
+	note D#, 8
+	note A#, 8
+	note G_, 8
 	intensity $a0
-	note D#, 3
+	note D#, 4
 	intensity $a7
-	note D#, 11
-	note __, 15
+	note D#, 12
+	note __, 16
 
 Music_JohtoTrainerBattle_branch_f61bd: ; f61bd
 	intensity $b7
-	note F_, 7
+	note F_, 8
 	intensity $b4
-	note G_, 3
-	note D#, 3
-	note F_, 3
-	note G_, 1
-	note D#, 1
-	note F_, 3
+	note G_, 4
+	note D#, 4
+	note F_, 4
+	note G_, 2
+	note D#, 2
+	note F_, 4
 	octave 2
-	note A#, 3
+	note A#, 4
 	intensity $b7
 	octave 3
-	note F_, 7
+	note F_, 8
 	intensity $b4
-	note G_, 3
-	note D#, 3
-	note F_, 3
-	note G_, 1
-	note D#, 1
-	note F_, 3
-	note F_, 3
+	note G_, 4
+	note D#, 4
+	note F_, 4
+	note G_, 2
+	note D#, 2
+	note F_, 4
+	note F_, 4
 	loopchannel 2, Music_JohtoTrainerBattle_branch_f61bd
 	intensity $b7
-	note F_, 7
+	note F_, 8
 	intensity $b4
-	note G_, 3
-	note D#, 3
-	note F_, 3
-	note G#, 1
-	note G_, 1
+	note G_, 4
+	note D#, 4
+	note F_, 4
+	note G#, 2
+	note G_, 2
 	intensity $b7
-	note F_, 7
-	note F_, 7
+	note F_, 8
+	note F_, 8
 	intensity $b5
-	note G_, 3
-	note D#, 3
-	note F_, 3
-	note G_, 1
-	note D#, 1
+	note G_, 4
+	note D#, 4
+	note F_, 4
+	note G_, 2
+	note D#, 2
 	intensity $b7
-	note F_, 7
-	note F_, 7
+	note F_, 8
+	note F_, 8
 	intensity $b5
-	note G_, 3
-	note D#, 3
-	note F_, 3
-	note G_, 1
-	note D#, 1
+	note G_, 4
+	note D#, 4
+	note F_, 4
+	note G_, 2
+	note D#, 2
 	intensity $3f
-	note G#, 7
+	note G#, 8
 	intensity $b7
-	note G#, 7
+	note G#, 8
 	intensity $a0
 	octave 4
-	note C_, 7
+	note C_, 8
 	intensity $a7
-	note C_, 7
+	note C_, 8
 	intensity $b2
 	octave 3
-	note D#, 5
-	note D#, 5
-	note D#, 3
-	note D#, 5
-	note D#, 5
+	note D#, 6
+	note D#, 6
+	note D#, 4
+	note D#, 6
+	note D#, 6
 	intensity $b7
-	note F_, 3
+	note F_, 4
 	intensity $b2
-	note D#, 5
-	note D#, 5
-	note D#, 3
-	note D#, 5
-	note D#, 5
+	note D#, 6
+	note D#, 6
+	note D#, 4
+	note D#, 6
+	note D#, 6
 	intensity $4c
-	note F_, 3
+	note F_, 4
 	intensity $b7
-	note G#, 5
-	note G_, 5
-	note F_, 3
-	note D#, 3
-	note F_, 3
-	note G_, 3
-	note D#, 3
-	note F_, 3
+	note G#, 6
+	note G_, 6
+	note F_, 4
+	note D#, 4
+	note F_, 4
+	note G_, 4
+	note D#, 4
+	note F_, 4
 	octave 4
-	note C#, 1
-	note C_, 1
+	note C#, 2
+	note C_, 2
 	octave 3
-	note F_, 3
+	note F_, 4
 	octave 4
-	note C#, 1
-	note C_, 1
+	note C#, 2
+	note C_, 2
 	octave 3
-	note F_, 1
-	note G_, 1
-	note G#, 1
+	note F_, 2
+	note G_, 2
+	note G#, 2
 	octave 4
-	note C_, 1
-	note C#, 1
-	note C_, 1
+	note C_, 2
+	note C#, 2
+	note C_, 2
 	octave 3
-	note A#, 1
-	note G#, 1
-	note G_, 5
-	note D#, 5
-	note G_, 3
+	note A#, 2
+	note G#, 2
+	note G_, 6
+	note D#, 6
+	note G_, 4
 	octave 4
-	note C#, 3
-	note C_, 3
+	note C#, 4
+	note C_, 4
 	octave 3
-	note A#, 3
-	note G#, 3
-	note F_, 3
-	note C#, 1
-	note D#, 1
-	note F_, 3
-	note C#, 1
-	note D#, 1
-	note A#, 3
-	note G#, 3
-	note G_, 3
-	note F_, 3
+	note A#, 4
+	note G#, 4
+	note F_, 4
+	note C#, 2
+	note D#, 2
+	note F_, 4
+	note C#, 2
+	note D#, 2
+	note A#, 4
+	note G#, 4
+	note G_, 4
+	note F_, 4
 	intensity $90
 	octave 2
-	note A#, 7
+	note A#, 8
 	octave 3
-	note D#, 7
+	note D#, 8
 	octave 2
-	note A#, 7
+	note A#, 8
 	octave 3
-	note G_, 7
+	note G_, 8
 	intensity $a0
-	note D#, 7
-	note A#, 7
-	note G_, 7
+	note D#, 8
+	note A#, 8
+	note G_, 8
 	octave 4
-	note D#, 7
+	note D#, 8
 	intensity $a0
 	octave 3
-	note A#, 7
+	note A#, 8
 	intensity $a7
-	note A#, 7
+	note A#, 8
 	intensity $b7
-	note G_, 5
-	note A#, 5
-	note G#, 1
-	note G_, 1
+	note G_, 6
+	note A#, 6
+	note G#, 2
+	note G_, 2
 	intensity $a0
-	note D#, 7
+	note D#, 8
 	intensity $a7
-	note D#, 7
+	note D#, 8
 	intensity $b4
-	note A#, 5
-	note G_, 3
-	note G_, 1
-	note A#, 11
-	note __, 15
-	note __, 7
+	note A#, 6
+	note G_, 4
+	note G_, 2
+	note A#, 12
+	note __, 16
+	note __, 8
 	intensity $a0
 	octave 4
-	note D_, 3
+	note D_, 4
 	intensity $a7
-	note D_, 11
+	note D_, 12
 	intensity $a0
-	note F_, 7
+	note F_, 8
 	intensity $a7
-	note F_, 7
+	note F_, 8
 	intensity $b3
 	callchannel Music_JohtoTrainerBattle_branch_f629f
-	note F_, 3
-	note E_, 1
-	note F_, 1
+	note F_, 4
+	note E_, 2
+	note F_, 2
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	intensity $a0
 	octave 3
-	note F_, 9
+	note F_, 10
 	intensity $a7
-	note F_, 5
+	note F_, 6
 	loopchannel 0, Music_JohtoTrainerBattle_branch_f6102
 ; f629f
 
 Music_JohtoTrainerBattle_branch_f629f: ; f629f
 	octave 3
-	note E_, 1
-	note D_, 1
-	note E_, 1
-	note A_, 1
-	note B_, 1
-	note A_, 1
-	note G_, 1
-	note A_, 1
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note A_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note A_, 1
-	note B_, 1
-	note G_, 1
-	note A_, 1
-	note E_, 1
-	note F_, 1
-	note D_, 1
+	note A_, 2
+	note B_, 2
+	note G_, 2
+	note A_, 2
+	note E_, 2
+	note F_, 2
+	note D_, 2
 	endchannel
 
 Music_JohtoTrainerBattle_Ch2: ; f62b3
@@ -461,227 +461,227 @@
 	tone $0001
 	notetype $c, $c2
 	octave 4
-	note G#, 0
-	note G_, 0
-	note F#, 0
-	note F_, 0
-	note G#, 0
-	note D_, 0
-	note D#, 0
-	note E_, 0
-	note G#, 0
-	note D#, 0
-	note D_, 0
-	note D#, 0
-	note G#, 0
-	note D_, 0
-	note C#, 0
-	note D_, 0
-	note G#, 0
-	note C#, 0
-	note C_, 0
-	note C#, 0
-	note G#, 0
+	note G#, 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
+	note G#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note G#, 1
+	note D#, 1
+	note D_, 1
+	note D#, 1
+	note G#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note G#, 1
+	note C#, 1
+	note C_, 1
+	note C#, 1
+	note G#, 1
 	octave 3
-	note A#, 0
-	note B_, 0
+	note A#, 1
+	note B_, 1
 	octave 4
-	note C_, 0
-	note G#, 0
+	note C_, 1
+	note G#, 1
 	octave 3
-	note B_, 0
-	note A#, 0
-	note B_, 0
+	note B_, 1
+	note A#, 1
+	note B_, 1
 	octave 4
-	note G#, 0
+	note G#, 1
 	octave 3
-	note A#, 0
-	note A_, 0
-	note A#, 0
+	note A#, 1
+	note A_, 1
+	note A#, 1
 	intensity $c2
 	octave 4
-	note A_, 5
+	note A_, 6
 	callchannel Music_JohtoTrainerBattle_branch_f649a
 	intensity $c2
-	note A_, 5
+	note A_, 6
 	callchannel Music_JohtoTrainerBattle_branch_f649a
 	intensity $c2
 	octave 5
-	note C_, 5
-	note C_, 5
-	note C_, 3
-	note C_, 5
-	note C_, 5
+	note C_, 6
+	note C_, 6
+	note C_, 4
+	note C_, 6
+	note C_, 6
 	intensity $c7
-	note C#, 3
+	note C#, 4
 	intensity $c2
-	note C_, 1
+	note C_, 2
 	intensity $a4
 	octave 3
-	note E_, 1
-	note A_, 1
+	note E_, 2
+	note A_, 2
 	intensity $c2
 	octave 5
-	note C_, 1
+	note C_, 2
 	intensity $a4
 	octave 3
-	note E_, 1
-	note A_, 1
+	note E_, 2
+	note A_, 2
 	intensity $c2
 	octave 5
-	note C_, 1
+	note C_, 2
 	intensity $a4
 	octave 3
-	note E_, 1
+	note E_, 2
 	intensity $c2
 	octave 5
-	note C_, 1
+	note C_, 2
 	intensity $a4
 	octave 3
-	note E_, 1
-	note B_, 1
+	note E_, 2
+	note B_, 2
 	intensity $c2
 	octave 5
-	note C_, 1
+	note C_, 2
 	intensity $a4
 	octave 4
-	note C_, 1
-	note E_, 1
+	note C_, 2
+	note E_, 2
 	intensity $c7
-	note B_, 3
+	note B_, 4
 
 Music_JohtoTrainerBattle_branch_f632a: ; f632a
 	callchannel Music_JohtoTrainerBattle_branch_f64a3
 	intensity $3e
-	note A#, 7
+	note A#, 8
 	intensity $c7
-	note A#, 7
+	note A#, 8
 	callchannel Music_JohtoTrainerBattle_branch_f64a3
 	intensity $c4
-	note D_, 3
+	note D_, 4
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note D_, 1
-	note F_, 1
-	note E_, 1
-	note D_, 1
-	note F_, 1
-	note E_, 1
-	note D_, 1
-	note E_, 1
-	note F_, 1
-	note A#, 1
-	note A_, 1
-	note A#, 1
+	note D_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	note A#, 2
+	note A_, 2
+	note A#, 2
 	octave 5
-	note D_, 1
+	note D_, 2
 	intensity $b0
-	note C#, 7
+	note C#, 8
 	intensity $b7
-	note C#, 3
+	note C#, 4
 	intensity $c7
 	octave 4
-	note A#, 3
+	note A#, 4
 	intensity $b0
-	note A_, 15
+	note A_, 16
 	intensity $b7
-	note A_, 15
+	note A_, 16
 
 Music_JohtoTrainerBattle_branch_f635a: ; f635a
 	intensity $c3
 	octave 3
-	note A_, 1
-	note G_, 1
-	note A_, 1
+	note A_, 2
+	note G_, 2
+	note A_, 2
 	intensity $c7
-	note A#, 3
+	note A#, 4
 	intensity $c3
-	note A_, 1
-	note G_, 1
-	note A#, 1
+	note A_, 2
+	note G_, 2
+	note A#, 2
 	loopchannel 3, Music_JohtoTrainerBattle_branch_f635a
-	note A_, 1
+	note A_, 2
 	octave 4
-	note D_, 1
-	note C_, 1
+	note D_, 2
+	note C_, 2
 	octave 3
-	note A#, 1
-	note A_, 1
-	note G_, 1
-	note A_, 1
-	note A#, 1
+	note A#, 2
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	note A#, 2
 
 Music_JohtoTrainerBattle_branch_f6376: ; f6376
-	note G_, 1
-	note F_, 1
-	note G_, 1
+	note G_, 2
+	note F_, 2
+	note G_, 2
 	intensity $c7
-	note G#, 3
+	note G#, 4
 	intensity $c3
-	note G_, 1
-	note F_, 1
-	note G#, 1
+	note G_, 2
+	note F_, 2
+	note G#, 2
 	loopchannel 3, Music_JohtoTrainerBattle_branch_f6376
-	note F_, 1
+	note F_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note A#, 1
-	note G#, 1
-	note G_, 1
-	note F_, 1
-	note G_, 1
-	note G#, 1
+	note A#, 2
+	note G#, 2
+	note G_, 2
+	note F_, 2
+	note G_, 2
+	note G#, 2
 	intensity $c7
-	note G_, 5
+	note G_, 6
 	octave 4
-	note D_, 5
-	note C_, 1
-	note D_, 1
-	note F_, 3
-	note E_, 3
-	note D_, 3
-	note C_, 3
+	note D_, 6
+	note C_, 2
+	note D_, 2
+	note F_, 4
+	note E_, 4
+	note D_, 4
+	note C_, 4
 	intensity $b0
-	note D#, 9
+	note D#, 10
 	intensity $b7
-	note D#, 5
+	note D#, 6
 	intensity $90
-	note G_, 7
+	note G_, 8
 	intensity $97
-	note G_, 7
+	note G_, 8
 	intensity $c7
 	octave 3
-	note F_, 7
-	note D#, 3
-	note F_, 3
-	note G_, 3
-	note F_, 3
-	note D#, 3
-	note G_, 3
-	note G#, 7
-	note F_, 3
-	note G_, 3
-	note G#, 3
-	note G_, 3
-	note F_, 3
-	note G#, 3
-	note A_, 7
-	note F#, 3
-	note G#, 3
-	note A_, 3
-	note G#, 3
-	note F#, 3
-	note A_, 3
+	note F_, 8
+	note D#, 4
+	note F_, 4
+	note G_, 4
+	note F_, 4
+	note D#, 4
+	note G_, 4
+	note G#, 8
+	note F_, 4
+	note G_, 4
+	note G#, 4
+	note G_, 4
+	note F_, 4
+	note G#, 4
+	note A_, 8
+	note F#, 4
+	note G#, 4
+	note A_, 4
+	note G#, 4
+	note F#, 4
+	note A_, 4
 	intensity $b0
-	note A#, 7
-	note A#, 7
+	note A#, 8
+	note A#, 8
 	intensity $b0
 	octave 4
-	note D#, 7
+	note D#, 8
 	intensity $b7
-	note D#, 7
+	note D#, 8
 	intensity $62
 	callchannel Music_JohtoTrainerBattle_branch_f64b6
 	intensity $82
@@ -693,158 +693,158 @@
 
 Music_JohtoTrainerBattle_branch_f63dd: ; f63dd
 	octave 4
-	note D#, 1
+	note D#, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note G_, 1
+	note G_, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note D#, 1
+	note D#, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note G_, 1
+	note G_, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	loopchannel 8, Music_JohtoTrainerBattle_branch_f63dd
 	callchannel Music_JohtoTrainerBattle_branch_f64be
 	octave 3
-	note A#, 1
+	note A#, 2
 	intensity $c7
 	octave 4
-	note C_, 7
+	note C_, 8
 	callchannel Music_JohtoTrainerBattle_branch_f64be
-	note G_, 1
+	note G_, 2
 	intensity $c7
-	note F_, 7
+	note F_, 8
 	callchannel Music_JohtoTrainerBattle_branch_f64be
 	octave 3
-	note A#, 1
+	note A#, 2
 	intensity $b0
 	octave 4
-	note C_, 7
+	note C_, 8
 	intensity $b7
-	note C_, 7
+	note C_, 8
 	intensity $1f
-	note D#, 11
+	note D#, 12
 	intensity $c7
-	note D#, 3
+	note D#, 4
 	intensity $c2
 	octave 3
-	note G_, 3
-	note D#, 1
-	note G_, 5
-	note G_, 3
-	note G_, 1
-	note F_, 1
-	note D#, 1
-	note G_, 5
+	note G_, 4
+	note D#, 2
+	note G_, 6
+	note G_, 4
+	note G_, 2
+	note F_, 2
+	note D#, 2
+	note G_, 6
 	intensity $c7
-	note G#, 3
+	note G#, 4
 	intensity $c2
-	note G_, 3
-	note D#, 1
-	note G_, 5
-	note G_, 3
-	note G_, 5
-	note G_, 5
+	note G_, 4
+	note D#, 2
+	note G_, 6
+	note G_, 4
+	note G_, 6
+	note G_, 6
 	intensity $4c
-	note G#, 3
+	note G#, 4
 	callchannel Music_JohtoTrainerBattle_branch_f64d2
 	intensity $b0
-	note F_, 7
+	note F_, 8
 	intensity $b7
-	note F_, 7
+	note F_, 8
 	intensity $b0
-	note G#, 7
+	note G#, 8
 	intensity $b7
-	note G#, 7
+	note G#, 8
 	callchannel Music_JohtoTrainerBattle_branch_f64d2
 	intensity $b0
-	note C#, 7
+	note C#, 8
 	intensity $b7
-	note C#, 7
+	note C#, 8
 	intensity $c7
-	note C#, 3
-	note C_, 3
+	note C#, 4
+	note C_, 4
 	octave 3
-	note A#, 3
-	note G#, 3
-	note G_, 5
-	note D#, 1
-	note A#, 7
-	note A#, 5
-	note G_, 1
+	note A#, 4
+	note G#, 4
+	note G_, 6
+	note D#, 2
+	note A#, 8
+	note A#, 6
+	note G_, 2
 	octave 4
-	note D#, 7
-	note D#, 5
+	note D#, 8
+	note D#, 6
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note G_, 7
-	note G_, 5
-	note D#, 1
-	note A#, 7
-	note G_, 5
-	note A#, 5
-	note G#, 1
-	note G_, 1
+	note G_, 8
+	note G_, 6
+	note D#, 2
+	note A#, 8
+	note G_, 6
+	note A#, 6
+	note G#, 2
+	note G_, 2
 	intensity $b0
-	note D#, 7
+	note D#, 8
 	intensity $b7
-	note D#, 7
+	note D#, 8
 	intensity $c7
-	note D#, 5
-	note A#, 5
-	note G#, 1
-	note G_, 1
+	note D#, 6
+	note A#, 6
+	note G#, 2
+	note G_, 2
 	intensity $b0
-	note D#, 7
+	note D#, 8
 	intensity $b7
-	note D#, 7
+	note D#, 8
 	intensity $c7
 	octave 3
-	note A_, 5
+	note A_, 6
 	octave 4
-	note E_, 5
-	note D_, 1
-	note E_, 1
-	note G_, 3
-	note F#, 3
-	note E_, 3
-	note D_, 3
+	note E_, 6
+	note D_, 2
+	note E_, 2
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note D_, 4
 	intensity $b0
-	note F_, 7
+	note F_, 8
 	intensity $b7
-	note F_, 7
+	note F_, 8
 	intensity $b0
-	note A#, 7
+	note A#, 8
 	intensity $b7
-	note A#, 7
+	note A#, 8
 	callchannel Music_JohtoTrainerBattle_branch_f64a3
 	intensity $c7
-	note D_, 3
+	note D_, 4
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note D_, 1
-	note F_, 1
-	note E_, 1
-	note D_, 1
-	note F_, 1
+	note D_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note F_, 2
 	loopchannel 0, Music_JohtoTrainerBattle_branch_f632a
 ; f649a
 
 Music_JohtoTrainerBattle_branch_f649a: ; f649a
 	octave 3
-	note A_, 5
-	note A_, 3
-	note A_, 5
-	note A_, 5
+	note A_, 6
+	note A_, 4
+	note A_, 6
+	note A_, 6
 	intensity $c7
-	note A#, 3
+	note A#, 4
 	endchannel
 ; f64a3
 
@@ -851,30 +851,30 @@
 Music_JohtoTrainerBattle_branch_f64a3: ; f64a3
 	intensity $c7
 	octave 3
-	note A_, 5
+	note A_, 6
 	octave 4
-	note E_, 5
-	note D_, 1
-	note E_, 1
-	note G_, 3
-	note F#, 3
-	note E_, 3
-	note D_, 3
+	note E_, 6
+	note D_, 2
+	note E_, 2
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note D_, 4
 	intensity $b0
-	note F_, 7
+	note F_, 8
 	intensity $b7
-	note F_, 7
+	note F_, 8
 	endchannel
 ; f64b6
 
 Music_JohtoTrainerBattle_branch_f64b6: ; f64b6
 	octave 3
-	note A#, 1
-	note D#, 1
+	note A#, 2
+	note D#, 2
 	octave 4
-	note D#, 1
+	note D#, 2
 	octave 3
-	note D#, 1
+	note D#, 2
 	endchannel
 ; f64be
 
@@ -881,21 +881,21 @@
 Music_JohtoTrainerBattle_branch_f64be: ; f64be
 	intensity $c7
 	octave 4
-	note F_, 3
+	note F_, 4
 	intensity $c4
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note F_, 1
-	note G#, 1
-	note G_, 1
-	note F_, 1
+	note F_, 2
+	note G#, 2
+	note G_, 2
+	note F_, 2
+	note D#, 2
+	note D_, 1
 	note D#, 1
-	note D_, 0
-	note D#, 0
-	note D_, 0
-	note D#, 0
-	note F_, 1
+	note D_, 1
+	note D#, 1
+	note F_, 2
 	endchannel
 ; f64d2
 
@@ -902,438 +902,438 @@
 Music_JohtoTrainerBattle_branch_f64d2: ; f64d2
 	intensity $c7
 	octave 4
-	note D#, 5
-	note A#, 5
-	note G#, 1
-	note G_, 1
-	note G#, 3
-	note G_, 3
-	note F_, 3
-	note D#, 3
+	note D#, 6
+	note A#, 6
+	note G#, 2
+	note G_, 2
+	note G#, 4
+	note G_, 4
+	note F_, 4
+	note D#, 4
 	endchannel
 
 Music_JohtoTrainerBattle_Ch3: ; f64de
 	notetype $c, $19
 	octave 4
-	note E_, 0
-	note D#, 0
-	note D_, 0
-	note C#, 0
-	note D_, 0
-	note C#, 0
-	note C_, 0
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	octave 3
-	note B_, 0
-	note A#, 0
-	note A_, 0
-	note A#, 0
-	note A_, 0
-	note G#, 0
-	note G_, 0
-	note G#, 0
-	note G_, 0
-	note F#, 0
-	note F_, 0
-	note F#, 0
-	note F_, 0
-	note E_, 0
-	note D#, 0
-	note E_, 1
+	note B_, 1
 	note A#, 1
 	note A_, 1
-	note G#, 1
-
-Music_JohtoTrainerBattle_branch_f6501: ; f6501
+	note A#, 1
 	note A_, 1
-	note E_, 1
-	note F#, 1
+	note G#, 1
 	note G_, 1
-	note E_, 1
-	note F#, 1
+	note G#, 1
 	note G_, 1
-	note E_, 1
-	loopchannel 3, Music_JohtoTrainerBattle_branch_f6501
-	note A_, 1
-	note E_, 1
 	note F#, 1
-	note G_, 1
-	note E_, 1
+	note F_, 1
 	note F#, 1
-	note G_, 1
-	note G#, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note E_, 2
+	note A#, 2
+	note A_, 2
+	note G#, 2
+
+Music_JohtoTrainerBattle_branch_f6501: ; f6501
+	note A_, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note E_, 2
+	loopchannel 3, Music_JohtoTrainerBattle_branch_f6501
+	note A_, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note G#, 2
 	callchannel Music_JohtoTrainerBattle_branch_f6676
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G_, 1
-	note A_, 1
-	note A#, 1
+	note G_, 2
+	note A_, 2
+	note A#, 2
 	octave 4
-	note C_, 1
-	note C#, 1
-	note C_, 1
+	note C_, 2
+	note C#, 2
+	note C_, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	callchannel Music_JohtoTrainerBattle_branch_f6676
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G_, 1
-	note A_, 1
-	note A#, 1
-	note G_, 1
-	note A_, 1
-	note A#, 1
-	note G_, 1
+	note G_, 2
+	note A_, 2
+	note A#, 2
+	note G_, 2
+	note A_, 2
+	note A#, 2
+	note G_, 2
 
 Music_JohtoTrainerBattle_branch_f6531: ; f6531
 	callchannel Music_JohtoTrainerBattle_branch_f6681
-	note E_, 1
+	note E_, 2
 	callchannel Music_JohtoTrainerBattle_branch_f6692
 	callchannel Music_JohtoTrainerBattle_branch_f6692
 	callchannel Music_JohtoTrainerBattle_branch_f6681
-	note A_, 1
+	note A_, 2
 	callchannel Music_JohtoTrainerBattle_branch_f6692
 	callchannel Music_JohtoTrainerBattle_branch_f6692
 	callchannel Music_JohtoTrainerBattle_branch_f669d
-	note E_, 1
-	note A_, 1
-	note E_, 1
-	note A_, 1
-	note E_, 1
-	note D_, 1
-	note E_, 1
-	note F_, 1
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
 	callchannel Music_JohtoTrainerBattle_branch_f669d
-	note E_, 1
+	note E_, 2
 	octave 4
-	note F_, 1
-	note E_, 1
-	note D_, 1
+	note F_, 2
+	note E_, 2
+	note D_, 2
 	octave 3
-	note A_, 1
-	note G#, 1
-	note A_, 1
-	note A#, 1
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note A#, 2
 	callchannel Music_JohtoTrainerBattle_branch_f66a5
-	note D_, 1
-	note A_, 1
-	note D_, 1
-	note A_, 1
-	note D_, 1
-	note A_, 1
-	note G_, 1
-	note A_, 1
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note G_, 2
+	note A_, 2
 	callchannel Music_JohtoTrainerBattle_branch_f66a5
-	note D_, 1
+	note D_, 2
 	octave 4
-	note D_, 1
-	note C_, 1
+	note D_, 2
+	note C_, 2
 	octave 3
-	note A#, 1
-	note A_, 1
-	note G_, 1
-	note A_, 1
-	note A#, 1
+	note A#, 2
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	note A#, 2
 	callchannel Music_JohtoTrainerBattle_branch_f66ac
-	note C_, 1
-	note G_, 1
-	note C_, 1
-	note G_, 1
-	note C_, 1
-	note G_, 1
-	note F_, 1
-	note G_, 1
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note F_, 2
+	note G_, 2
 	callchannel Music_JohtoTrainerBattle_branch_f66ac
-	note C_, 1
+	note C_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note A#, 1
-	note G#, 1
-	note G_, 1
-	note F_, 1
-	note D#, 1
-	note D_, 1
-	note G_, 7
-	note F_, 7
-	note E_, 7
-	note D#, 7
+	note A#, 2
+	note G#, 2
+	note G_, 2
+	note F_, 2
+	note D#, 2
+	note D_, 2
+	note G_, 8
+	note F_, 8
+	note E_, 8
+	note D#, 8
 
 Music_JohtoTrainerBattle_branch_f6591: ; f6591
 	octave 3
-	note D#, 1
-	note A#, 1
-	note D#, 1
-	note A#, 1
-	note D#, 1
-	note A#, 1
-	note A_, 1
+	note D#, 2
+	note A#, 2
+	note D#, 2
+	note A#, 2
+	note D#, 2
+	note A#, 2
+	note A_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	loopchannel 2, Music_JohtoTrainerBattle_branch_f6591
 	callchannel Music_JohtoTrainerBattle_branch_f66ac
-	note C_, 1
+	note C_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note A#, 1
-	note G#, 1
-	note G_, 1
-	note F_, 1
-	note D#, 1
-	note G_, 1
+	note A#, 2
+	note G#, 2
+	note G_, 2
+	note F_, 2
+	note D#, 2
+	note G_, 2
 
 Music_JohtoTrainerBattle_branch_f65ac: ; f65ac
-	note C#, 1
-	note G#, 1
+	note C#, 2
+	note G#, 2
 	loopchannel 7, Music_JohtoTrainerBattle_branch_f65ac
-	note B_, 1
-	note A_, 1
+	note B_, 2
+	note A_, 2
 
 Music_JohtoTrainerBattle_branch_f65b4: ; f65b4
-	note D_, 1
-	note A_, 1
+	note D_, 2
+	note A_, 2
 	loopchannel 5, Music_JohtoTrainerBattle_branch_f65b4
-	note B_, 1
-	note A_, 1
-	note G#, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
 
 Music_JohtoTrainerBattle_branch_f65c0: ; f65c0
-	note A#, 3
-	note D#, 3
+	note A#, 4
+	note D#, 4
 	loopchannel 4, Music_JohtoTrainerBattle_branch_f65c0
 
 Music_JohtoTrainerBattle_branch_f65c6: ; f65c6
 	octave 4
-	note G_, 3
+	note G_, 4
 	octave 3
-	note A#, 3
+	note A#, 4
 	loopchannel 4, Music_JohtoTrainerBattle_branch_f65c6
 
 Music_JohtoTrainerBattle_branch_f65ce: ; f65ce
 	callchannel Music_JohtoTrainerBattle_branch_f66b4
-	note D#, 1
-	note F_, 7
+	note D#, 2
+	note F_, 8
 	callchannel Music_JohtoTrainerBattle_branch_f66b4
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note A#, 7
+	note A#, 8
 	loopchannel 2, Music_JohtoTrainerBattle_branch_f65ce
 	octave 4
-	note C#, 7
-	note C_, 7
+	note C#, 8
+	note C_, 8
 	octave 3
-	note A#, 7
-	note G#, 7
-	note F_, 7
-	note G_, 7
-	note G#, 7
-	note A#, 7
-	note F_, 7
-	note G_, 7
-	note G#, 3
-	note D#, 1
-	note G#, 1
+	note A#, 8
+	note G#, 8
+	note F_, 8
+	note G_, 8
+	note G#, 8
+	note A#, 8
+	note F_, 8
+	note G_, 8
+	note G#, 4
+	note D#, 2
+	note G#, 2
 	octave 4
-	note C_, 7
-	note C_, 7
-	note D#, 7
+	note C_, 8
+	note C_, 8
+	note D#, 8
 	octave 3
-	note A#, 1
-	note G#, 1
-	note G_, 1
-	note F_, 1
-	note D#, 1
-	note A#, 1
-	note D#, 1
-	note A#, 1
-	note D#, 1
-	note A#, 1
+	note A#, 2
+	note G#, 2
+	note G_, 2
+	note F_, 2
+	note D#, 2
+	note A#, 2
+	note D#, 2
+	note A#, 2
+	note D#, 2
+	note A#, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note A#, 1
-	note D#, 1
-	note A#, 1
+	note A#, 2
+	note D#, 2
+	note A#, 2
 	octave 4
-	note C#, 1
-	note C_, 1
+	note C#, 2
+	note C_, 2
 	octave 3
-	note A#, 1
-	note G#, 1
-	note G_, 1
-	note G#, 1
-	note D#, 1
-	note A#, 1
-	note D#, 1
-	note A#, 1
-	note D#, 1
-	note A#, 1
+	note A#, 2
+	note G#, 2
+	note G_, 2
+	note G#, 2
+	note D#, 2
+	note A#, 2
+	note D#, 2
+	note A#, 2
+	note D#, 2
+	note A#, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note A#, 1
-	note D#, 1
-	note A#, 1
+	note A#, 2
+	note D#, 2
+	note A#, 2
 	octave 4
-	note C_, 1
-	note C#, 1
-	note D#, 1
-	note C#, 1
-	note C_, 1
+	note C_, 2
+	note C#, 2
+	note D#, 2
+	note C#, 2
+	note C_, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 
 Music_JohtoTrainerBattle_branch_f661e: ; f661e
-	note D#, 1
-	note A#, 1
+	note D#, 2
+	note A#, 2
 	loopchannel 8, Music_JohtoTrainerBattle_branch_f661e
 
 Music_JohtoTrainerBattle_branch_f6624: ; f6624
-	note C#, 1
-	note G#, 1
+	note C#, 2
+	note G#, 2
 	loopchannel 6, Music_JohtoTrainerBattle_branch_f6624
-	note C#, 1
+	note C#, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note A#, 1
-	note G#, 1
+	note A#, 2
+	note G#, 2
 
 Music_JohtoTrainerBattle_branch_f6630: ; f6630
-	note D#, 1
-	note A#, 1
+	note D#, 2
+	note A#, 2
 	loopchannel 8, Music_JohtoTrainerBattle_branch_f6630
 
 Music_JohtoTrainerBattle_branch_f6636: ; f6636
-	note C#, 1
-	note G#, 1
+	note C#, 2
+	note G#, 2
 	loopchannel 4, Music_JohtoTrainerBattle_branch_f6636
-	note C#, 1
+	note C#, 2
 	octave 4
-	note C#, 1
-	note C_, 1
+	note C#, 2
+	note C_, 2
 	octave 3
-	note A#, 1
-	note G_, 1
-	note G#, 1
-	note A#, 1
+	note A#, 2
+	note G_, 2
+	note G#, 2
+	note A#, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note D#, 7
-	note C#, 7
-	note C_, 7
+	note D#, 8
+	note C#, 8
+	note C_, 8
 	octave 2
-	note A#, 7
+	note A#, 8
 	octave 3
-	note A#, 7
-	note G#, 7
-	note G_, 7
-	note F_, 7
+	note A#, 8
+	note G#, 8
+	note G_, 8
+	note F_, 8
 	octave 4
-	note D#, 7
-	note D#, 7
+	note D#, 8
+	note D#, 8
 	octave 3
-	note A#, 7
-	note A#, 7
-	note G_, 7
-	note G_, 7
-	note D#, 7
-	note D#, 3
-	note A#, 3
-	note A_, 15
+	note A#, 8
+	note A#, 8
+	note G_, 8
+	note G_, 8
+	note D#, 8
+	note D#, 4
+	note A#, 4
+	note A_, 16
 	octave 4
-	note C_, 15
+	note C_, 16
 	octave 3
-	note A#, 15
+	note A#, 16
 	octave 4
-	note D_, 15
+	note D_, 16
 	octave 3
-	note A_, 15
+	note A_, 16
 	octave 4
-	note C_, 15
+	note C_, 16
 	octave 3
-	note A#, 15
+	note A#, 16
 	octave 4
-	note D_, 7
-	note __, 1
+	note D_, 8
+	note __, 2
 	octave 3
-	note A_, 1
-	note A#, 1
+	note A_, 2
+	note A#, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	loopchannel 0, Music_JohtoTrainerBattle_branch_f6531
 ; f6676
 
 Music_JohtoTrainerBattle_branch_f6676: ; f6676
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G_, 1
-	note A_, 1
-	note A#, 1
-	note G_, 1
-	note A_, 1
-	note A#, 1
-	note G_, 1
+	note G_, 2
+	note A_, 2
+	note A#, 2
+	note G_, 2
+	note A_, 2
+	note A#, 2
+	note G_, 2
 	endchannel
 ; f6681
 
 Music_JohtoTrainerBattle_branch_f6681: ; f6681
 	octave 3
-	note E_, 1
-	note A_, 1
-	note E_, 1
-	note A_, 1
-	note E_, 1
-	note F#, 1
-	note G_, 1
-	note A_, 1
-	note E_, 1
-	note A_, 1
-	note E_, 1
-	note A_, 1
-	note E_, 1
-	note F#, 1
-	note G_, 1
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
 	endchannel
 ; f6692
 
 Music_JohtoTrainerBattle_branch_f6692: ; f6692
 	octave 3
-	note F_, 1
-	note A#, 1
-	note F_, 1
-	note A#, 1
-	note F_, 1
-	note A_, 1
-	note A#, 1
+	note F_, 2
+	note A#, 2
+	note F_, 2
+	note A#, 2
+	note F_, 2
+	note A_, 2
+	note A#, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	endchannel
 ; f669d
 
 Music_JohtoTrainerBattle_branch_f669d: ; f669d
 	octave 3
-	note E_, 1
-	note A_, 1
+	note E_, 2
+	note A_, 2
 	loopchannel 4, Music_JohtoTrainerBattle_branch_f669d
 	endchannel
 ; f66a5
 
 Music_JohtoTrainerBattle_branch_f66a5: ; f66a5
-	note D_, 1
-	note A_, 1
+	note D_, 2
+	note A_, 2
 	loopchannel 4, Music_JohtoTrainerBattle_branch_f66a5
 	endchannel
 ; f66ac
@@ -1340,26 +1340,26 @@
 
 Music_JohtoTrainerBattle_branch_f66ac: ; f66ac
 	octave 3
-	note C_, 1
-	note G_, 1
+	note C_, 2
+	note G_, 2
 	loopchannel 4, Music_JohtoTrainerBattle_branch_f66ac
 	endchannel
 ; f66b4
 
 Music_JohtoTrainerBattle_branch_f66b4: ; f66b4
-	note A#, 3
-	note D#, 1
-	note A#, 1
+	note A#, 4
+	note D#, 2
+	note A#, 2
 	octave 4
-	note C#, 1
-	note C_, 1
+	note C#, 2
+	note C_, 2
 	octave 3
-	note A#, 1
+	note A#, 2
+	note G#, 2
+	note G_, 1
 	note G#, 1
-	note G_, 0
-	note G#, 0
-	note G_, 0
-	note G#, 0
-	note A#, 1
+	note G_, 1
+	note G#, 1
+	note A#, 2
 	endchannel
 ; f66c3
--- a/audio/music/johtowildbattle.asm
+++ b/audio/music/johtowildbattle.asm
@@ -15,193 +15,193 @@
 Music_JohtoWildBattleNight_branch_f5ddb: ; f5ddb
 	notetype $c, $b2
 	octave 4
-	note C_, 0
+	note C_, 1
 	octave 3
-	note B_, 0
-	note A#, 0
-	note A_, 0
-	note A#, 0
-	note A_, 0
-	note G#, 0
-	note G_, 0
-	note G#, 0
-	note G_, 0
-	note F#, 0
-	note F_, 0
-	note F#, 0
-	note F_, 0
-	note E_, 0
-	note D#, 0
-	note E_, 0
-	note D#, 0
-	note D_, 0
-	note C#, 0
-	note D_, 0
-	note C#, 0
-	note C_, 0
+	note B_, 1
+	note A#, 1
+	note A_, 1
+	note A#, 1
+	note A_, 1
+	note G#, 1
+	note G_, 1
+	note G#, 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
 	octave 2
-	note B_, 0
+	note B_, 1
 	octave 3
-	note C_, 0
+	note C_, 1
 	octave 2
-	note B_, 0
-	note A#, 0
-	note A_, 0
-	note A#, 0
-	note B_, 0
+	note B_, 1
+	note A#, 1
+	note A_, 1
+	note A#, 1
+	note B_, 1
 	octave 3
-	note C_, 0
-	note C#, 0
+	note C_, 1
+	note C#, 1
 	intensity $b2
-	note G_, 5
+	note G_, 6
 	octave 2
-	note A#, 5
+	note A#, 6
 	octave 3
-	note D_, 3
-	note C_, 3
-	note C#, 3
-	note D_, 7
-	note D#, 5
+	note D_, 4
+	note C_, 4
+	note C#, 4
+	note D_, 8
+	note D#, 6
 	octave 2
-	note A#, 5
+	note A#, 6
 	octave 3
-	note D#, 3
-	note C_, 3
-	note D_, 3
+	note D#, 4
+	note C_, 4
+	note D_, 4
 	intensity $b5
-	note D#, 7
+	note D#, 8
 	intensity $b2
 	octave 4
-	note D_, 5
+	note D_, 6
 	octave 3
-	note A#, 5
+	note A#, 6
 	octave 4
-	note D_, 3
-	note C_, 3
-	note C#, 3
-	note D_, 7
-	note D#, 5
+	note D_, 4
+	note C_, 4
+	note C#, 4
+	note D_, 8
+	note D#, 6
 	octave 3
-	note A#, 5
+	note A#, 6
 	octave 4
-	note D#, 3
-	note C_, 3
-	note D_, 3
+	note D#, 4
+	note C_, 4
+	note D_, 4
 	intensity $6f
-	note D#, 7
+	note D#, 8
 
 Music_JohtoWildBattle_branch_f5e2d: ; f5e2d
 	intensity $b6
 	octave 3
-	note D_, 5
+	note D_, 6
 	octave 2
-	note B_, 5
-	note B_, 3
+	note B_, 6
+	note B_, 4
 	octave 3
-	note F_, 5
-	note E_, 5
-	note C_, 3
-	note G#, 7
-	note A#, 0
-	note A_, 0
-	note G_, 0
-	note F#, 0
-	note G_, 0
-	note G#, 0
-	note A_, 0
-	note A#, 0
+	note F_, 6
+	note E_, 6
+	note C_, 4
+	note G#, 8
+	note A#, 1
+	note A_, 1
+	note G_, 1
+	note F#, 1
+	note G_, 1
+	note G#, 1
+	note A_, 1
+	note A#, 1
 	octave 4
-	note C_, 7
+	note C_, 8
 	octave 3
-	note B_, 0
-	note A#, 0
-	note G#, 0
-	note G_, 0
-	note G#, 0
-	note A_, 0
-	note A#, 0
-	note B_, 0
-	note D_, 5
+	note B_, 1
+	note A#, 1
+	note G#, 1
+	note G_, 1
+	note G#, 1
+	note A_, 1
+	note A#, 1
+	note B_, 1
+	note D_, 6
 	octave 2
-	note B_, 5
-	note B_, 3
+	note B_, 6
+	note B_, 4
 	octave 3
-	note F_, 5
-	note E_, 5
-	note D_, 3
-	note E_, 7
-	note D_, 7
-	note C_, 7
-	note F_, 7
-	note D#, 5
-	note C_, 5
-	note C_, 3
-	note F#, 5
-	note F_, 5
-	note C#, 3
-	note A_, 7
-	note B_, 0
-	note A#, 0
-	note G#, 0
-	note G_, 0
-	note G#, 0
-	note A_, 0
-	note A#, 0
-	note B_, 0
+	note F_, 6
+	note E_, 6
+	note D_, 4
+	note E_, 8
+	note D_, 8
+	note C_, 8
+	note F_, 8
+	note D#, 6
+	note C_, 6
+	note C_, 4
+	note F#, 6
+	note F_, 6
+	note C#, 4
+	note A_, 8
+	note B_, 1
+	note A#, 1
+	note G#, 1
+	note G_, 1
+	note G#, 1
+	note A_, 1
+	note A#, 1
+	note B_, 1
 	octave 4
-	note C#, 7
-	note C_, 0
+	note C#, 8
+	note C_, 1
 	octave 3
-	note B_, 0
-	note A_, 0
-	note G#, 0
-	note A_, 0
-	note A#, 0
-	note B_, 0
+	note B_, 1
+	note A_, 1
+	note G#, 1
+	note A_, 1
+	note A#, 1
+	note B_, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	octave 3
-	note D#, 5
-	note C_, 5
-	note C_, 3
-	note F#, 5
-	note F_, 5
-	note C#, 3
-	note F_, 7
-	note D#, 7
-	note C#, 7
-	note F#, 7
+	note D#, 6
+	note C_, 6
+	note C_, 4
+	note F#, 6
+	note F_, 6
+	note C#, 4
+	note F_, 8
+	note D#, 8
+	note C#, 8
+	note F#, 8
 	intensity $b7
-	note E_, 5
-	note D_, 5
-	note E_, 3
-	note F_, 5
-	note E_, 5
-	note C_, 3
-	note F_, 7
-	note C_, 7
-	note E_, 5
-	note D_, 5
-	note F_, 3
-	note G_, 15
+	note E_, 6
+	note D_, 6
+	note E_, 4
+	note F_, 6
+	note E_, 6
+	note C_, 4
+	note F_, 8
+	note C_, 8
+	note E_, 6
+	note D_, 6
+	note F_, 4
+	note G_, 16
 	octave 4
-	note D_, 7
-	note G_, 7
-	note G_, 15
-	note D_, 15
+	note D_, 8
+	note G_, 8
+	note G_, 16
+	note D_, 16
 	octave 3
-	note C_, 3
-	note D_, 3
-	note C_, 3
+	note C_, 4
+	note D_, 4
+	note C_, 4
 	octave 2
-	note B_, 3
+	note B_, 4
 	octave 3
-	note C_, 15
-	note D_, 3
-	note E_, 3
-	note D_, 3
-	note F#, 3
-	note G_, 15
+	note C_, 16
+	note D_, 4
+	note E_, 4
+	note D_, 4
+	note F#, 4
+	note G_, 16
 	loopchannel 0, Music_JohtoWildBattle_branch_f5e2d
 
 Music_JohtoWildBattle_Ch2: ; f5ea2
@@ -211,216 +211,216 @@
 	callchannel Music_JohtoWildBattle_branch_f5f5d
 	notetype $c, $c2
 	octave 4
-	note G_, 5
+	note G_, 6
 
 Music_JohtoWildBattleNight_branch_f5eb2: ; f5eb2
 	octave 3
-	note D_, 5
-	note G_, 3
-	note F_, 3
-	note F#, 3
-	note G_, 7
-	note G#, 5
-	note D_, 5
-	note G#, 3
-	note F_, 3
-	note G_, 3
+	note D_, 6
+	note G_, 4
+	note F_, 4
+	note F#, 4
+	note G_, 8
+	note G#, 6
+	note D_, 6
+	note G#, 4
+	note F_, 4
+	note G_, 4
 	intensity $c7
-	note G#, 7
+	note G#, 8
 	intensity $c2
 	octave 4
-	note G_, 5
-	note D_, 5
-	note G_, 3
-	note F_, 3
-	note F#, 3
-	note G_, 7
-	note G#, 5
-	note D_, 5
-	note G#, 3
-	note F_, 3
-	note G_, 3
+	note G_, 6
+	note D_, 6
+	note G_, 4
+	note F_, 4
+	note F#, 4
+	note G_, 8
+	note G#, 6
+	note D_, 6
+	note G#, 4
+	note F_, 4
+	note G_, 4
 	intensity $6f
-	note G#, 7
+	note G#, 8
 
 Music_JohtoWildBattle_branch_f5ed1: ; f5ed1
 	intensity $c4
 	octave 3
-	note G_, 5
-	note D_, 5
-	note D_, 1
-	note G_, 1
+	note G_, 6
+	note D_, 6
+	note D_, 2
+	note G_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note B_, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
-	note G_, 1
-	note A_, 1
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F_, 2
+	note G_, 2
+	note A_, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	intensity $b0
-	note D#, 15
+	note D#, 16
 	intensity $b7
-	note D#, 15
+	note D#, 16
 	intensity $c4
 	octave 3
-	note G_, 5
-	note D_, 5
-	note D_, 1
-	note G_, 1
+	note G_, 6
+	note D_, 6
+	note D_, 2
+	note G_, 2
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note B_, 3
-	note A_, 3
-	note B_, 3
+	note B_, 4
+	note A_, 4
+	note B_, 4
 	intensity $b0
-	note A_, 15
+	note A_, 16
 	intensity $b6
-	note A_, 15
+	note A_, 16
 	intensity $c4
-	note G#, 5
-	note D#, 5
-	note D#, 1
-	note G#, 1
+	note G#, 6
+	note D#, 6
+	note D#, 2
+	note G#, 2
 	octave 4
-	note C#, 1
-	note C_, 1
+	note C#, 2
+	note C_, 2
 	octave 3
-	note A#, 1
-	note G#, 1
-	note F#, 1
-	note G#, 1
-	note A#, 1
+	note A#, 2
+	note G#, 2
+	note F#, 2
+	note G#, 2
+	note A#, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	intensity $b0
-	note E_, 15
+	note E_, 16
 	intensity $b7
-	note E_, 15
+	note E_, 16
 	intensity $c4
 	octave 3
-	note G#, 5
-	note D#, 5
-	note D#, 1
-	note G#, 1
+	note G#, 6
+	note D#, 6
+	note D#, 2
+	note G#, 2
 	octave 4
-	note C#, 3
-	note C_, 3
+	note C#, 4
+	note C_, 4
 	octave 3
-	note A#, 3
-	note G#, 3
+	note A#, 4
+	note G#, 4
 	intensity $b0
-	note A#, 15
+	note A#, 16
 	intensity $b5
-	note A#, 15
+	note A#, 16
 	intensity $c6
 	octave 4
-	note B_, 11
-	note G_, 1
-	note B_, 1
+	note B_, 12
+	note G_, 2
+	note B_, 2
 	octave 5
-	note D_, 1
-	note C_, 1
+	note D_, 2
+	note C_, 2
 	octave 4
-	note B_, 1
-	note A_, 1
-	note G_, 1
-	note A_, 1
-	note B_, 1
-	note G_, 1
-	note A_, 11
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	note B_, 2
+	note G_, 2
+	note A_, 12
 	octave 3
-	note F_, 1
-	note A_, 1
+	note F_, 2
+	note A_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note B_, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
-	note G_, 1
-	note A_, 1
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F_, 2
+	note G_, 2
+	note A_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	intensity $c7
-	note D_, 15
-	note G_, 7
+	note D_, 16
+	note G_, 8
 	octave 5
-	note C_, 7
+	note C_, 8
 	octave 4
-	note B_, 15
-	note G_, 15
+	note B_, 16
+	note G_, 16
 	octave 3
-	note E_, 3
-	note F#, 3
-	note E_, 3
-	note D_, 3
-	note E_, 15
-	note G_, 3
-	note A_, 3
-	note G_, 3
-	note A#, 3
-	note B_, 15
+	note E_, 4
+	note F#, 4
+	note E_, 4
+	note D_, 4
+	note E_, 16
+	note G_, 4
+	note A_, 4
+	note G_, 4
+	note A#, 4
+	note B_, 16
 	loopchannel 0, Music_JohtoWildBattle_branch_f5ed1
 ; f5f5d
 
-Music_JohtoWildBattle_branch_f5f5d: ; f5f5d
-
 Music_JohtoWildBattleNight_branch_f5f5d: ; f5f5d
+
+Music_JohtoWildBattle_branch_f5f5d: ; f5f5d
 	notetype $c, $c2
 	octave 4
-	note F_, 0
-	note F#, 0
-	note G_, 0
+	note F_, 1
+	note F#, 1
+	note G_, 1
 	octave 5
-	note G_, 0
+	note G_, 1
 	octave 4
-	note F_, 0
-	note F#, 0
-	note G_, 0
+	note F_, 1
+	note F#, 1
+	note G_, 1
 	octave 5
-	note G_, 0
+	note G_, 1
 	octave 4
-	note F_, 0
-	note F#, 0
-	note G_, 0
+	note F_, 1
+	note F#, 1
+	note G_, 1
 	octave 5
-	note G_, 0
+	note G_, 1
 	octave 4
-	note F_, 0
-	note F#, 0
-	note G_, 0
+	note F_, 1
+	note F#, 1
+	note G_, 1
 	octave 5
-	note G_, 0
+	note G_, 1
 	octave 4
-	note F_, 0
-	note F#, 0
-	note G_, 0
+	note F_, 1
+	note F#, 1
+	note G_, 1
 	octave 5
-	note G_, 0
+	note G_, 1
 	octave 4
-	note F_, 0
-	note F#, 0
-	note G_, 0
+	note F_, 1
+	note F#, 1
+	note G_, 1
 	octave 5
-	note G_, 0
+	note G_, 1
 	octave 4
-	note F_, 0
-	note F#, 0
-	note G_, 0
+	note F_, 1
+	note F#, 1
+	note G_, 1
 	octave 5
-	note G_, 0
+	note G_, 1
 	octave 4
-	note F_, 0
-	note F#, 0
-	note G_, 0
+	note F_, 1
+	note F#, 1
+	note G_, 1
 	octave 5
-	note G_, 0
+	note G_, 1
 	endchannel
 
 Music_JohtoWildBattle_Ch3: ; f5f91
@@ -428,178 +428,178 @@
 
 Music_JohtoWildBattleNight_branch_f5f94: ; f5f94
 	octave 4
-	note G_, 1
+	note G_, 2
 	octave 5
-	note D_, 1
+	note D_, 2
 	octave 4
-	note G_, 1
+	note G_, 2
 	octave 5
-	note C#, 1
+	note C#, 2
 	octave 4
-	note F#, 1
+	note F#, 2
 	octave 5
-	note C_, 1
+	note C_, 2
 	octave 4
-	note F#, 1
-	note B_, 1
-	note F_, 1
-	note A#, 1
-	note F_, 1
-	note A_, 1
-	note F_, 1
-	note D_, 1
-	note G_, 1
-	note F_, 1
-	note D_, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
-	note D_, 1
-	note E_, 1
-	note F_, 1
-	note G_, 1
+	note F#, 2
+	note B_, 2
+	note F_, 2
+	note A#, 2
+	note F_, 2
+	note A_, 2
+	note F_, 2
+	note D_, 2
+	note G_, 2
+	note F_, 2
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	note G_, 2
 	callchannel Music_JohtoWildBattle_branch_f6055
-	note D#, 1
-	note G#, 1
-	note D#, 1
-	note G#, 1
-	note D#, 1
-	note D#, 1
-	note G_, 1
-	note F_, 1
+	note D#, 2
+	note G#, 2
+	note D#, 2
+	note G#, 2
+	note D#, 2
+	note D#, 2
+	note G_, 2
+	note F_, 2
 
 Music_JohtoWildBattle_branch_f5fc6: ; f5fc6
-	note D_, 1
-	note G_, 1
+	note D_, 2
+	note G_, 2
 	loopchannel 6, Music_JohtoWildBattle_branch_f5fc6
-	note D_, 1
-	note E_, 1
-	note F_, 1
-	note G_, 1
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	note G_, 2
 	callchannel Music_JohtoWildBattle_branch_f6055
-	note F_, 1
-	note F_, 1
-	note G_, 1
-	note G_, 1
-	note G#, 1
-	note G_, 1
-	note F_, 1
-	note D#, 1
+	note F_, 2
+	note F_, 2
+	note G_, 2
+	note G_, 2
+	note G#, 2
+	note G_, 2
+	note F_, 2
+	note D#, 2
 
 Music_JohtoWildBattle_branch_f5fdb: ; f5fdb
-	note D_, 1
-	note G_, 1
+	note D_, 2
+	note G_, 2
 	loopchannel 7, Music_JohtoWildBattle_branch_f5fdb
-	note F#, 3
+	note F#, 4
 	callchannel Music_JohtoWildBattle_branch_f6055
 	callchannel Music_JohtoWildBattle_branch_f6055
 
 Music_JohtoWildBattle_branch_f5fe8: ; f5fe8
-	note D_, 1
-	note G_, 1
+	note D_, 2
+	note G_, 2
 	loopchannel 7, Music_JohtoWildBattle_branch_f5fe8
-	note D_, 1
-	note A_, 1
+	note D_, 2
+	note A_, 2
 
 Music_JohtoWildBattle_branch_f5ff0: ; f5ff0
-	note C_, 1
-	note F_, 1
+	note C_, 2
+	note F_, 2
 	loopchannel 5, Music_JohtoWildBattle_branch_f5ff0
-	note E_, 1
-	note D_, 1
-	note C_, 1
-	note D_, 1
-	note E_, 1
-	note F_, 1
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
 	callchannel Music_JohtoWildBattle_branch_f6055
-	note D#, 1
-	note G#, 1
-	note D#, 1
-	note G#, 1
-	note D#, 1
-	note G#, 1
-	note G_, 3
+	note D#, 2
+	note G#, 2
+	note D#, 2
+	note G#, 2
+	note D#, 2
+	note G#, 2
+	note G_, 4
 
 Music_JohtoWildBattle_branch_f6006: ; f6006
-	note E_, 1
-	note A_, 1
+	note E_, 2
+	note A_, 2
 	loopchannel 8, Music_JohtoWildBattle_branch_f6006
 	callchannel Music_JohtoWildBattle_branch_f6055
-	note D#, 1
-	note G#, 1
-	note D#, 1
-	note G#, 1
-	note D#, 1
-	note G#, 1
-	note D#, 1
-	note A#, 1
-	note C#, 1
-	note F#, 1
-	note C#, 1
-	note F#, 1
-	note C#, 1
-	note F#, 1
-	note C#, 1
-	note F#, 1
-	note C#, 1
-	note F#, 1
-	note F_, 1
-	note F#, 1
-	note G#, 1
-	note F#, 1
-	note F_, 1
-	note D#, 1
+	note D#, 2
+	note G#, 2
+	note D#, 2
+	note G#, 2
+	note D#, 2
+	note G#, 2
+	note D#, 2
+	note A#, 2
+	note C#, 2
+	note F#, 2
+	note C#, 2
+	note F#, 2
+	note C#, 2
+	note F#, 2
+	note C#, 2
+	note F#, 2
+	note C#, 2
+	note F#, 2
+	note F_, 2
+	note F#, 2
+	note G#, 2
+	note F#, 2
+	note F_, 2
+	note D#, 2
 
 Music_JohtoWildBattle_branch_f6027: ; f6027
-	note D_, 1
-	note G_, 1
+	note D_, 2
+	note G_, 2
 	loopchannel 8, Music_JohtoWildBattle_branch_f6027
 
 Music_JohtoWildBattle_branch_f602d: ; f602d
-	note C_, 1
-	note F_, 1
+	note C_, 2
+	note F_, 2
 	loopchannel 7, Music_JohtoWildBattle_branch_f602d
-	note E_, 1
-	note C_, 1
-	note D_, 3
-	note G_, 3
-	note D_, 3
-	note G_, 3
+	note E_, 2
+	note C_, 2
+	note D_, 4
+	note G_, 4
+	note D_, 4
+	note G_, 4
 
 Music_JohtoWildBattle_branch_f6039: ; f6039
-	note D_, 1
-	note G_, 1
+	note D_, 2
+	note G_, 2
 	loopchannel 12, Music_JohtoWildBattle_branch_f6039
 
 Music_JohtoWildBattle_branch_f603f: ; f603f
-	note C_, 1
-	note E_, 1
+	note C_, 2
+	note E_, 2
 	loopchannel 7, Music_JohtoWildBattle_branch_f603f
-	note F_, 1
-	note F#, 1
+	note F_, 2
+	note F#, 2
 
 Music_JohtoWildBattle_branch_f6047: ; f6047
-	note D_, 1
-	note G_, 1
+	note D_, 2
+	note G_, 2
 	loopchannel 6, Music_JohtoWildBattle_branch_f6047
-	note A_, 1
-	note G_, 1
-	note F#, 1
-	note E_, 1
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
 	loopchannel 0, Music_JohtoWildBattle_branch_f5fdb
 ; f6055
 
 Music_JohtoWildBattle_branch_f6055: ; f6055
-	note D#, 1
-	note G#, 1
+	note D#, 2
+	note G#, 2
 	loopchannel 4, Music_JohtoWildBattle_branch_f6055
 	endchannel
 ; f605c
--- a/audio/music/johtowildbattlenight.asm
+++ b/audio/music/johtowildbattlenight.asm
@@ -20,7 +20,7 @@
 	callchannel Music_JohtoWildBattleNight_branch_f5f5d
 	notetype $c, $c2
 	octave 4
-	note G_, 5
+	note G_, 6
 	tone $0001
 	dutycycle $2
 	loopchannel 0, Music_JohtoWildBattleNight_branch_f5eb2
--- a/audio/music/kantogymbattle.asm
+++ b/audio/music/kantogymbattle.asm
@@ -13,246 +13,246 @@
 	vibrato $12, $15
 	notetype $c, $b2
 	octave 3
-	note A#, 0
-	note A_, 0
-	note G#, 0
-	note G_, 0
-	note G#, 0
-	note G_, 0
-	note F#, 0
-	note G_, 0
-	note F#, 0
-	note F_, 0
-	note F#, 0
-	note F_, 0
-	note E_, 0
-	note F_, 0
-	note E_, 0
-	note D#, 0
-	note E_, 0
-	note D#, 0
-	note D_, 0
-	note D#, 0
-	note D_, 0
-	note C#, 0
-	note D_, 0
-	note C#, 0
-	note C_, 0
-	note C#, 0
-	note C_, 0
+	note A#, 1
+	note A_, 1
+	note G#, 1
+	note G_, 1
+	note G#, 1
+	note G_, 1
+	note F#, 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
+	note C#, 1
+	note C_, 1
 	octave 2
-	note B_, 0
+	note B_, 1
 	octave 3
-	note C_, 0
+	note C_, 1
 	octave 2
-	note B_, 0
-	note A#, 0
-	note B_, 0
+	note B_, 1
 	note A#, 1
-	note A#, 5
-	note A#, 1
-	note A#, 5
-	note A#, 1
-	note A#, 7
-	intensity $b7
 	note B_, 1
+	note A#, 2
+	note A#, 6
+	note A#, 2
+	note A#, 6
+	note A#, 2
+	note A#, 8
+	intensity $b7
+	note B_, 2
 	intensity $b2
-	note A#, 1
-	note A#, 5
-	note A#, 1
-	note A#, 5
-	note A#, 1
-	note A#, 7
+	note A#, 2
+	note A#, 6
+	note A#, 2
+	note A#, 6
+	note A#, 2
+	note A#, 8
 	intensity $b7
 	octave 3
-	note E_, 1
+	note E_, 2
 	intensity $b2
 	octave 2
-	note A#, 1
-	note A#, 5
-	note A#, 1
-	note A#, 5
-	note A#, 1
-	note A#, 7
+	note A#, 2
+	note A#, 6
+	note A#, 2
+	note A#, 6
+	note A#, 2
+	note A#, 8
 	intensity $b7
-	note B_, 1
+	note B_, 2
 	intensity $b2
-	note A#, 1
-	note A#, 5
-	note A#, 1
-	note A#, 5
-	note A#, 1
+	note A#, 2
+	note A#, 6
+	note A#, 2
+	note A#, 6
+	note A#, 2
 	intensity $b4
 	octave 3
-	note E_, 3
-	note E_, 3
-	note E_, 1
+	note E_, 4
+	note E_, 4
+	note E_, 2
 
 Music_KantoGymBattle_branch_ec78b: ; ec78b
 	callchannel Music_KantoGymBattle_branch_ec832
 	octave 2
-	note A#, 1
+	note A#, 2
 	intensity $b7
-	note G#, 7
-	note B_, 7
+	note G#, 8
+	note B_, 8
 	octave 3
-	note D#, 9
-	note E_, 5
+	note D#, 10
+	note E_, 6
 	callchannel Music_KantoGymBattle_branch_ec832
-	note D#, 1
+	note D#, 2
 	intensity $b7
-	note C#, 7
+	note C#, 8
 	octave 2
-	note B_, 7
-	note G#, 9
+	note B_, 8
+	note G#, 10
 	octave 3
-	note E_, 5
+	note E_, 6
 	intensity $b2
-	note D#, 1
-	note D#, 1
-	note G_, 0
-	note E_, 0
-	note D#, 0
-	note G_, 0
-	note D#, 1
-	note D#, 1
-	note A#, 0
-	note G#, 0
-	note E_, 0
-	note A#, 0
-	note D#, 1
-	note D#, 1
-	note B_, 0
-	note A#, 0
-	note G#, 0
-	note B_, 0
-	note D#, 1
-	intensity $b7
+	note D#, 2
+	note D#, 2
+	note G_, 1
 	note E_, 1
-	intensity $b2
 	note D#, 1
-	note D#, 1
-	note G_, 0
-	note E_, 0
-	note D#, 0
-	note G_, 0
-	note D#, 1
-	note D#, 1
-	note A#, 0
-	note G#, 0
-	note E_, 0
-	note A#, 0
-	note D#, 1
-	note D#, 1
-	note B_, 0
-	note A#, 0
-	note G#, 0
-	note B_, 0
+	note G_, 1
+	note D#, 2
+	note D#, 2
+	note A#, 1
 	note G#, 1
-	intensity $b5
+	note E_, 1
+	note A#, 1
+	note D#, 2
+	note D#, 2
 	note B_, 1
-	note D#, 1
-	note C#, 1
-	octave 2
-	note A#, 3
-	note D#, 1
+	note A#, 1
 	note G#, 1
 	note B_, 1
-	octave 3
+	note D#, 2
+	intensity $b7
+	note E_, 2
+	intensity $b2
+	note D#, 2
+	note D#, 2
+	note G_, 1
 	note E_, 1
-	note D#, 3
-	note C#, 1
-	octave 2
+	note D#, 1
+	note G_, 1
+	note D#, 2
+	note D#, 2
 	note A#, 1
+	note G#, 1
+	note E_, 1
 	note A#, 1
-	note D#, 1
+	note D#, 2
+	note D#, 2
+	note B_, 1
 	note A#, 1
+	note G#, 1
+	note B_, 1
+	note G#, 2
+	intensity $b5
+	note B_, 2
+	note D#, 2
+	note C#, 2
+	octave 2
+	note A#, 4
+	note D#, 2
+	note G#, 2
+	note B_, 2
 	octave 3
-	note C#, 1
+	note E_, 2
+	note D#, 4
+	note C#, 2
+	octave 2
+	note A#, 2
+	note A#, 2
+	note D#, 2
+	note A#, 2
+	octave 3
+	note C#, 2
 	intensity $b7
 	octave 2
-	note B_, 7
-	note A#, 7
-	note G#, 9
-	note B_, 5
+	note B_, 8
+	note A#, 8
+	note G#, 10
+	note B_, 6
 	intensity $b5
 	octave 3
-	note D#, 1
-	note C#, 1
+	note D#, 2
+	note C#, 2
 	octave 2
-	note A#, 3
-	note D#, 1
-	note G#, 1
-	note B_, 1
+	note A#, 4
+	note D#, 2
+	note G#, 2
+	note B_, 2
 	octave 3
-	note E_, 1
-	note D#, 3
-	note C#, 1
+	note E_, 2
+	note D#, 4
+	note C#, 2
 	octave 2
-	note A#, 1
-	note A#, 1
-	note G#, 1
-	note A#, 1
+	note A#, 2
+	note A#, 2
+	note G#, 2
+	note A#, 2
 	octave 3
-	note C#, 1
+	note C#, 2
 	intensity $b7
-	note E_, 7
-	note F#, 7
-	note G_, 15
+	note E_, 8
+	note F#, 8
+	note G_, 16
 	intensity $b2
 	octave 2
-	note G#, 1
-	note G#, 1
+	note G#, 2
+	note G#, 2
 	intensity $b7
 	octave 3
-	note C#, 11
+	note C#, 12
 	intensity $b2
-	note G#, 1
-	note F_, 3
+	note G#, 2
+	note F_, 4
 	intensity $b5
 	octave 2
-	note F_, 3
-	note G_, 1
-	note G#, 1
-	note A#, 1
+	note F_, 4
+	note G_, 2
+	note G#, 2
+	note A#, 2
 	intensity $b2
-	note A#, 1
-	note A#, 1
+	note A#, 2
+	note A#, 2
 	intensity $b7
 	octave 3
-	note D#, 11
+	note D#, 12
 	intensity $b2
-	note A#, 1
-	note G_, 3
+	note A#, 2
+	note G_, 4
 	intensity $b7
 	octave 4
-	note D#, 5
+	note D#, 6
 	intensity $4c
 	octave 3
-	note D_, 3
+	note D_, 4
 	loopchannel 0, Music_KantoGymBattle_branch_ec78b
 ; ec832
 
 Music_KantoGymBattle_branch_ec832: ; ec832
 	intensity $b5
-	note D#, 1
+	note D#, 2
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note D#, 1
-	note E_, 3
-	note D#, 1
-	note C#, 1
+	note D#, 2
+	note E_, 4
+	note D#, 2
+	note C#, 2
 	octave 2
-	note A#, 1
-	note D#, 1
-	note G#, 1
-	note A#, 1
+	note A#, 2
+	note D#, 2
+	note G#, 2
+	note A#, 2
 	octave 3
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note C#, 1
+	note D#, 2
+	note E_, 2
+	note D#, 2
+	note C#, 2
 	endchannel
 
 Music_KantoGymBattle_Ch2: ; ec847
@@ -263,59 +263,59 @@
 
 Music_KantoGymBattle_branch_ec852: ; ec852
 	octave 4
-	note A#, 0
-	note G#, 0
-	note A#, 0
+	note A#, 1
+	note G#, 1
+	note A#, 1
 	octave 5
-	note D#, 0
+	note D#, 1
 	loopchannel 8, Music_KantoGymBattle_branch_ec852
 	octave 3
 
 Music_KantoGymBattle_branch_ec85d: ; ec85d
 	intensity $c2
+	note D#, 2
+	note D#, 2
+	note F#, 1
+	note E_, 1
 	note D#, 1
-	note D#, 1
-	note F#, 0
-	note E_, 0
-	note D#, 0
-	note F#, 0
-	note D#, 1
-	note D#, 1
-	note A#, 0
-	note G#, 0
-	note F#, 0
-	note A#, 0
-	note D#, 1
-	note D#, 1
-	note B_, 0
-	note A#, 0
-	note G#, 0
-	note B_, 0
-	note D_, 1
+	note F#, 1
+	note D#, 2
+	note D#, 2
+	note A#, 1
+	note G#, 1
+	note F#, 1
+	note A#, 1
+	note D#, 2
+	note D#, 2
+	note B_, 1
+	note A#, 1
+	note G#, 1
+	note B_, 1
+	note D_, 2
 	intensity $c7
-	note E_, 1
+	note E_, 2
 	intensity $c2
+	note D#, 2
+	note D#, 2
+	note F#, 1
+	note E_, 1
 	note D#, 1
-	note D#, 1
-	note F#, 0
-	note E_, 0
-	note D#, 0
-	note F#, 0
-	note D#, 1
-	note D#, 1
-	note A#, 0
-	note G#, 0
-	note F#, 0
-	note A#, 0
-	note D#, 1
-	note D#, 1
-	note B_, 0
-	note A#, 0
-	note G#, 0
-	note B_, 0
+	note F#, 1
+	note D#, 2
+	note D#, 2
+	note A#, 1
 	note G#, 1
-	intensity $c7
+	note F#, 1
+	note A#, 1
+	note D#, 2
+	note D#, 2
 	note B_, 1
+	note A#, 1
+	note G#, 1
+	note B_, 1
+	note G#, 2
+	intensity $c7
+	note B_, 2
 	intensity $c2
 	octave 4
 	loopchannel 2, Music_KantoGymBattle_branch_ec85d
@@ -322,92 +322,92 @@
 
 Music_KantoGymBattle_branch_ec894: ; ec894
 	callchannel Music_KantoGymBattle_branch_ec907
-	note E_, 7
-	note G#, 7
-	note B_, 9
-	note G#, 5
+	note E_, 8
+	note G#, 8
+	note B_, 10
+	note G#, 6
 	callchannel Music_KantoGymBattle_branch_ec907
-	note E_, 7
-	note G#, 7
-	note B_, 9
+	note E_, 8
+	note G#, 8
+	note B_, 10
 	octave 4
-	note E_, 5
-	note D#, 7
+	note E_, 6
+	note D#, 8
 	intensity $b7
-	note D#, 7
+	note D#, 8
 	intensity $a2
-	note __, 5
+	note __, 6
 	octave 5
-	note E_, 3
-	note E_, 3
-	note E_, 1
+	note E_, 4
+	note E_, 4
+	note E_, 2
 	intensity $a0
-	note D#, 7
+	note D#, 8
 	intensity $a7
-	note D#, 7
-	note __, 11
+	note D#, 8
+	note __, 12
 	intensity $c5
 	octave 3
-	note A#, 3
-	note B_, 3
-	note G#, 3
-	note A#, 3
-	note B_, 3
-	note G#, 3
-	note E_, 3
+	note A#, 4
+	note B_, 4
+	note G#, 4
+	note A#, 4
+	note B_, 4
+	note G#, 4
+	note E_, 4
 	intensity $b0
-	note D#, 7
-	note D#, 15
+	note D#, 8
+	note D#, 16
 	intensity $b7
-	note D#, 11
+	note D#, 12
 	intensity $c5
-	note A#, 3
-	note B_, 3
-	note G#, 3
-	note A#, 3
-	note B_, 3
-	note G#, 3
-	note B_, 3
+	note A#, 4
+	note B_, 4
+	note G#, 4
+	note A#, 4
+	note B_, 4
+	note G#, 4
+	note B_, 4
 	intensity $b0
-	note A#, 7
+	note A#, 8
 	intensity $b7
-	note A#, 7
+	note A#, 8
 	intensity $b0
 	octave 4
-	note D#, 7
+	note D#, 8
 	intensity $b7
-	note D#, 7
+	note D#, 8
 	intensity $c2
 	octave 3
-	note C#, 1
-	note C#, 1
+	note C#, 2
+	note C#, 2
 	intensity $c7
-	note F_, 7
+	note F_, 8
 	intensity $c2
 	octave 4
-	note C#, 3
-	note F_, 1
-	note C#, 3
+	note C#, 4
+	note F_, 2
+	note C#, 4
 	intensity $c7
-	note G#, 3
-	note G_, 1
-	note F_, 1
-	note D#, 1
+	note G#, 4
+	note G_, 2
+	note F_, 2
+	note D#, 2
 	intensity $c2
 	octave 3
-	note D#, 1
-	note D#, 1
+	note D#, 2
+	note D#, 2
 	intensity $c7
-	note G_, 7
+	note G_, 8
 	intensity $c2
 	octave 4
-	note D#, 3
-	note G_, 1
-	note D#, 3
+	note D#, 4
+	note G_, 2
+	note D#, 4
 	intensity $c7
-	note A#, 5
+	note A#, 6
 	octave 3
-	note A_, 3
+	note A_, 4
 	loopchannel 0, Music_KantoGymBattle_branch_ec894
 ; ec907
 
@@ -415,29 +415,29 @@
 	dutycycle $2
 	intensity $d1
 	octave 3
-	note A#, 1
+	note A#, 2
 	intensity $a2
-	note A#, 1
+	note A#, 2
 	intensity $d1
-	note G#, 1
+	note G#, 2
 	intensity $a2
-	note G#, 1
+	note G#, 2
 	intensity $d1
-	note A#, 1
+	note A#, 2
 	intensity $a2
-	note A#, 1
+	note A#, 2
 	intensity $c5
-	note B_, 1
+	note B_, 2
 	octave 4
-	note C#, 1
-	note C#, 1
+	note C#, 2
+	note C#, 2
 	octave 3
-	note B_, 3
-	note A#, 1
-	note G#, 1
-	note F#, 1
-	note G#, 1
-	note A#, 1
+	note B_, 4
+	note A#, 2
+	note G#, 2
+	note F#, 2
+	note G#, 2
+	note A#, 2
 	dutycycle $3
 	intensity $b0
 	endchannel
@@ -445,188 +445,188 @@
 Music_KantoGymBattle_Ch3: ; ec92e
 	notetype $c, $19
 	octave 2
-	note E_, 0
-	note __, 0
+	note E_, 1
+	note __, 1
 
 Music_KantoGymBattle_branch_ec934: ; ec934
-	note B_, 2
-	note __, 0
+	note B_, 3
+	note __, 1
 	loopchannel 6, Music_KantoGymBattle_branch_ec934
-	note B_, 1
-	note G#, 1
-	note B_, 1
+	note B_, 2
+	note G#, 2
+	note B_, 2
 
 Music_KantoGymBattle_branch_ec93d: ; ec93d
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note F#, 3
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note A#, 3
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note B_, 3
-	note D_, 0
-	note __, 0
-	note F_, 1
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note F#, 3
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note A#, 3
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note B_, 3
-	note D#, 0
-	note __, 0
-	note E_, 1
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note F#, 4
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note A#, 4
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note B_, 4
+	note D_, 1
+	note __, 1
+	note F_, 2
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note F#, 4
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note A#, 4
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note B_, 4
+	note D#, 1
+	note __, 1
+	note E_, 2
 	loopchannel 2, Music_KantoGymBattle_branch_ec93d
 
 Music_KantoGymBattle_branch_ec965: ; ec965
 	octave 2
-	note D#, 1
-	note A#, 1
+	note D#, 2
+	note A#, 2
 	loopchannel 8, Music_KantoGymBattle_branch_ec965
 
 Music_KantoGymBattle_branch_ec96c: ; ec96c
-	note E_, 1
-	note B_, 1
+	note E_, 2
+	note B_, 2
 	loopchannel 4, Music_KantoGymBattle_branch_ec96c
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note E_, 1
+	note E_, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note E_, 3
-	note B_, 1
+	note E_, 4
+	note B_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 
 Music_KantoGymBattle_branch_ec97f: ; ec97f
 	octave 2
-	note F#, 1
+	note F#, 2
 	octave 3
-	note C#, 1
+	note C#, 2
 	loopchannel 8, Music_KantoGymBattle_branch_ec97f
 
 Music_KantoGymBattle_branch_ec987: ; ec987
 	octave 2
-	note E_, 1
-	note B_, 1
+	note E_, 2
+	note B_, 2
 	loopchannel 7, Music_KantoGymBattle_branch_ec987
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 
 Music_KantoGymBattle_branch_ec992: ; ec992
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note A#, 3
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note B_, 3
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note A#, 3
-	note D#, 0
-	note __, 0
-	note E_, 1
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note A#, 4
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note B_, 4
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note A#, 4
+	note D#, 1
+	note __, 1
+	note E_, 2
 	loopchannel 2, Music_KantoGymBattle_branch_ec992
 
 Music_KantoGymBattle_branch_ec9a8: ; ec9a8
-	note D#, 1
-	note A#, 1
+	note D#, 2
+	note A#, 2
 	loopchannel 7, Music_KantoGymBattle_branch_ec9a8
 	octave 3
-	note C#, 1
+	note C#, 2
 	octave 2
-	note A#, 1
-	note E_, 1
-	note B_, 1
+	note A#, 2
+	note E_, 2
+	note B_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note E_, 1
-	note B_, 1
+	note E_, 2
+	note B_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 
 Music_KantoGymBattle_branch_ec9bb: ; ec9bb
 	octave 2
-	note E_, 1
-	note B_, 1
+	note E_, 2
+	note B_, 2
 	loopchannel 5, Music_KantoGymBattle_branch_ec9bb
 
 Music_KantoGymBattle_branch_ec9c2: ; ec9c2
 	octave 2
-	note F#, 1
+	note F#, 2
 	octave 3
-	note C#, 1
+	note C#, 2
 	loopchannel 7, Music_KantoGymBattle_branch_ec9c2
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note C#, 1
+	note C#, 2
 	octave 2
-	note E_, 1
-	note A#, 1
+	note E_, 2
+	note A#, 2
 	octave 3
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note C#, 2
 
 Music_KantoGymBattle_branch_ec9d8: ; ec9d8
 	octave 2
-	note D#, 1
-	note A#, 1
+	note D#, 2
+	note A#, 2
 	loopchannel 4, Music_KantoGymBattle_branch_ec9d8
 
 Music_KantoGymBattle_branch_ec9df: ; ec9df
-	note C#, 1
-	note G#, 1
+	note C#, 2
+	note G#, 2
 	loopchannel 8, Music_KantoGymBattle_branch_ec9df
 
 Music_KantoGymBattle_branch_ec9e5: ; ec9e5
-	note D#, 1
-	note A#, 1
+	note D#, 2
+	note A#, 2
 	loopchannel 4, Music_KantoGymBattle_branch_ec9e5
 	octave 3
-	note D#, 1
+	note D#, 2
 	octave 2
-	note A#, 1
-	note D#, 1
-	note D_, 1
-	note D_, 1
-	note A#, 1
+	note A#, 2
+	note D#, 2
+	note D_, 2
+	note D_, 2
+	note A#, 2
 	octave 3
-	note D#, 1
-	note F_, 1
+	note D#, 2
+	note F_, 2
 	loopchannel 0, Music_KantoGymBattle_branch_ec965
 ; ec9fa
--- a/audio/music/kantotrainerbattle.asm
+++ b/audio/music/kantotrainerbattle.asm
@@ -13,457 +13,457 @@
 	notetype $c, $b3
 	vibrato $12, $24
 	dutycycle $1
-	note __, 0
+	note __, 1
 	octave 4
-	note A_, 0
-	note G#, 0
-	note G_, 0
-	note G#, 0
-	note G_, 0
-	note F#, 0
-	note F_, 0
-	note F#, 0
-	note F_, 0
-	note E_, 0
-	note D#, 0
-	note E_, 0
-	note D#, 0
-	note D_, 0
-	note C#, 0
-	note D_, 0
-	note C#, 0
-	note C_, 0
+	note A_, 1
+	note G#, 1
+	note G_, 1
+	note G#, 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	octave 3
-	note B_, 0
-	note A#, 0
-	note A_, 0
-	note A#, 0
-	note A_, 0
-	note G#, 0
-	note G_, 0
-	note G#, 0
-	note G_, 0
-	note F#, 0
-	note G_, 0
+	note B_, 1
+	note A#, 1
+	note A_, 1
+	note A#, 1
+	note A_, 1
+	note G#, 1
+	note G_, 1
+	note G#, 1
+	note G_, 1
+	note F#, 1
+	note G_, 1
 	dutycycle $2
 	intensity $b1
 	octave 4
-	note D#, 1
+	note D#, 2
 	octave 2
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	octave 4
 	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	octave 4
+	note C_, 2
 	octave 2
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
 	octave 4
+	note D#, 2
+	note __, 2
+	octave 3
+	note A#, 2
+	octave 4
+	note C_, 2
+	note __, 2
+	note D#, 2
+	note __, 2
+	octave 3
 	note D#, 1
 	note __, 1
-	octave 3
-	note A#, 1
+	note F_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
 	octave 4
+	note C_, 2
+	octave 2
 	note C_, 1
 	note __, 1
-	note D#, 1
+	note C_, 1
 	note __, 1
-	octave 3
-	note D#, 0
-	note __, 0
-	note F_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 2
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	octave 4
 	note C_, 1
-	octave 2
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	octave 4
-	note D#, 1
 	note __, 1
-	octave 3
-	note A#, 1
-	octave 4
 	note C_, 1
 	note __, 1
+	octave 4
+	note D#, 2
+	note __, 2
+	octave 3
+	note A#, 2
+	octave 4
+	note C_, 2
+	note __, 2
+	note D#, 2
+	note __, 2
 	note D#, 1
 	note __, 1
-	note D#, 0
-	note __, 0
-	note F_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	intensity $b3
-	note D#, 1
-	note __, 3
 	note F_, 1
-	note __, 3
-	note F#, 1
 	note __, 1
-	note D#, 1
-	note F_, 1
+	note G_, 1
 	note __, 1
-	note F#, 1
-	note __, 1
-	note D#, 1
-	note F_, 1
-	note F#, 1
+	intensity $b3
+	note D#, 2
+	note __, 4
+	note F_, 2
+	note __, 4
+	note F#, 2
+	note __, 2
+	note D#, 2
+	note F_, 2
+	note __, 2
+	note F#, 2
+	note __, 2
+	note D#, 2
+	note F_, 2
+	note F#, 2
 
 Music_KantoTrainerBattle_branch_eca88: ; eca88
 	notetype $c, $b7
-	note D#, 3
-	note __, 1
-	note C_, 9
-	note __, 3
-	note D#, 1
-	note C_, 1
+	note D#, 4
+	note __, 2
+	note C_, 10
+	note __, 4
+	note D#, 2
+	note C_, 2
 	octave 3
-	note G_, 0
+	note G_, 1
 	octave 4
-	note C_, 0
-	note D#, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note C#, 7
-	note F_, 7
-	note G#, 7
-	octave 5
-	note C#, 3
-	note C#, 0
-	octave 4
-	note G#, 0
-	note F_, 0
-	note C#, 0
-	note D#, 3
-	note __, 1
-	note C_, 9
-	note __, 3
+	note C_, 1
 	note D#, 1
+	note __, 1
 	note C_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note C#, 8
+	note F_, 8
+	note G#, 8
+	octave 5
+	note C#, 4
+	note C#, 1
+	octave 4
+	note G#, 1
+	note F_, 1
+	note C#, 1
+	note D#, 4
+	note __, 2
+	note C_, 10
+	note __, 4
+	note D#, 2
+	note C_, 2
 	octave 3
-	note G_, 0
+	note G_, 1
 	octave 4
-	note C_, 0
-	note D#, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
-	note D#, 5
-	note D_, 5
 	note C_, 1
+	note D#, 1
 	note __, 1
-	note __, 1
 	note D_, 1
-	note __, 3
+	note __, 1
 	note F_, 1
 	note __, 1
-	note G#, 1
-	note G_, 0
-	note F#, 0
+	note D#, 6
+	note D_, 6
+	note C_, 2
+	note __, 2
+	note __, 2
+	note D_, 2
+	note __, 4
+	note F_, 2
+	note __, 2
+	note G#, 2
+	note G_, 1
+	note F#, 1
 	octave 3
-	note G#, 0
-	note F_, 0
-	note C_, 0
-	note G#, 0
+	note G#, 1
+	note F_, 1
+	note C_, 1
+	note G#, 1
 	octave 4
-	note C_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
-	note C_, 0
+	note C_, 1
+	note __, 1
+	note F_, 1
+	note __, 1
+	note C_, 1
 	octave 3
-	note G#, 0
-	note F_, 0
-	note __, 4
+	note G#, 1
+	note F_, 1
+	note __, 5
 	octave 4
-	note D#, 7
-	note D_, 3
+	note D#, 8
+	note D_, 4
 	octave 3
-	note F_, 0
-	note A_, 0
+	note F_, 1
+	note A_, 1
 	octave 4
-	note C_, 0
-	note D#, 0
-	note D_, 3
+	note C_, 1
+	note D#, 1
+	note D_, 4
 	octave 3
-	note D_, 3
+	note D_, 4
 	octave 4
-	note F_, 3
+	note F_, 4
 	octave 3
-	note D_, 3
-	note __, 3
-	note D_, 3
-	note __, 3
-	note D_, 3
-	note G#, 0
-	note F_, 0
-	note C_, 0
-	note G#, 0
-	octave 4
-	note C_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
-	note C_, 0
-	octave 3
-	note G#, 0
-	note F_, 0
+	note D_, 4
 	note __, 4
+	note D_, 4
+	note __, 4
+	note D_, 4
+	note G#, 1
+	note F_, 1
+	note C_, 1
+	note G#, 1
 	octave 4
-	note D#, 7
-	note D_, 3
+	note C_, 1
+	note __, 1
+	note F_, 1
+	note __, 1
+	note C_, 1
 	octave 3
-	note F_, 0
-	note A_, 0
+	note G#, 1
+	note F_, 1
+	note __, 5
 	octave 4
-	note C_, 0
-	note D#, 0
-	note D_, 3
+	note D#, 8
+	note D_, 4
 	octave 3
-	note D_, 3
-	note __, 3
-	note D_, 3
-	note A#, 0
+	note F_, 1
+	note A_, 1
 	octave 4
-	note D_, 0
-	note F_, 0
-	note __, 0
+	note C_, 1
+	note D#, 1
+	note D_, 4
 	octave 3
-	note D_, 1
+	note D_, 4
+	note __, 4
+	note D_, 4
+	note A#, 1
 	octave 4
-	note F_, 1
 	note D_, 1
+	note F_, 1
+	note __, 1
 	octave 3
-	note A#, 1
-	note D_, 1
+	note D_, 2
 	octave 4
-	note D_, 1
-	intensity $67
-	note C_, 0
-	note C#, 0
-	note D_, 0
-	note D#, 0
-	note E_, 0
-	note D#, 0
-	note D_, 0
-	note C#, 0
-	note C_, 0
-	note __, 2
-	note D#, 3
-	notetype $6, $67
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note __, 6
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
+	note F_, 2
+	note D_, 2
 	octave 3
-	note G_, 0
-	note __, 2
-	note G_, 0
-	note __, 2
+	note A#, 2
+	note D_, 2
 	octave 4
-	note C_, 7
-	intensity $77
+	note D_, 2
+	intensity $67
+	note C_, 1
 	note C#, 1
 	note D_, 1
 	note D#, 1
 	note E_, 1
-	note F_, 1
-	note E_, 1
 	note D#, 1
 	note D_, 1
 	note C#, 1
-	note __, 5
-	note E_, 7
-	note E_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note E_, 0
+	note C_, 1
+	note __, 3
+	note D#, 4
+	notetype $6, $67
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 7
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	octave 3
+	note G_, 1
+	note __, 3
+	note G_, 1
+	note __, 3
+	octave 4
+	note C_, 8
+	intensity $77
+	note C#, 2
+	note D_, 2
+	note D#, 2
+	note E_, 2
+	note F_, 2
+	note E_, 2
+	note D#, 2
+	note D_, 2
+	note C#, 2
 	note __, 6
-	note E_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
+	note E_, 8
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 7
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
 	octave 3
-	note G#, 0
-	note __, 2
-	note G#, 0
-	note __, 2
+	note G#, 1
+	note __, 3
+	note G#, 1
+	note __, 3
 	octave 4
-	note C#, 7
+	note C#, 8
 	intensity $87
-	note D_, 1
-	note D#, 1
-	note E_, 1
+	note D_, 2
+	note D#, 2
+	note E_, 2
+	note F_, 2
+	note F#, 2
+	note F_, 2
+	note E_, 2
+	note D#, 2
+	note D_, 2
+	note __, 6
+	note F_, 8
 	note F_, 1
-	note F#, 1
+	note __, 1
 	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note __, 5
-	note F_, 7
-	note F_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
-	note F_, 0
-	note __, 6
-	note F_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
+	note __, 1
+	note F_, 1
+	note __, 7
+	note F_, 1
+	note __, 1
+	note F_, 1
+	note __, 1
 	octave 3
-	note A_, 0
-	note __, 2
-	note A_, 0
-	note __, 2
+	note A_, 1
+	note __, 3
+	note A_, 1
+	note __, 3
 	octave 4
-	note D_, 7
+	note D_, 8
 	intensity $97
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note __, 5
-	note F#, 7
+	note D#, 2
+	note E_, 2
+	note F_, 2
+	note F#, 2
+	note G_, 2
+	note F#, 2
+	note F_, 2
+	note E_, 2
+	note D#, 2
+	note __, 6
+	note F#, 8
 	intensity $a7
-	note G#, 7
-	note A#, 7
+	note G#, 8
+	note A#, 8
 	intensity $b7
 	octave 5
-	note D_, 7
-	note D_, 1
-	note __, 5
+	note D_, 8
+	note D_, 2
+	note __, 6
 	octave 4
-	note A#, 1
-	note F#, 1
-	note D#, 1
+	note A#, 2
+	note F#, 2
+	note D#, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note F#, 1
-	note D#, 1
+	note F#, 2
+	note D#, 2
 	octave 3
-	note A#, 1
-	note F#, 1
+	note A#, 2
+	note F#, 2
 	octave 4
-	note G#, 1
-	note __, 1
-	note D#, 11
+	note G#, 2
+	note __, 2
+	note D#, 12
 	intensity $b1
 	octave 6
-	note C_, 1
-	note C_, 1
-	note C_, 7
-	note C_, 1
-	note C_, 1
-	note C_, 3
-	note C_, 3
-	note C_, 3
-	note C_, 3
+	note C_, 2
+	note C_, 2
+	note C_, 8
+	note C_, 2
+	note C_, 2
+	note C_, 4
+	note C_, 4
+	note C_, 4
+	note C_, 4
 	intensity $b7
 	octave 4
-	note A#, 1
-	note F#, 1
-	note D#, 1
+	note A#, 2
+	note F#, 2
+	note D#, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note F#, 1
-	note D#, 1
+	note F#, 2
+	note D#, 2
 	octave 3
-	note A#, 1
-	note F#, 1
+	note A#, 2
+	note F#, 2
 	octave 4
-	note F#, 1
-	note __, 1
-	note B_, 3
-	note A#, 3
-	note G#, 3
-	note F#, 3
-	note F_, 3
-	note D#, 3
-	note D_, 3
-	note D#, 7
-	note F#, 7
+	note F#, 2
+	note __, 2
+	note B_, 4
+	note A#, 4
+	note G#, 4
+	note F#, 4
+	note F_, 4
+	note D#, 4
+	note D_, 4
+	note D#, 8
+	note F#, 8
 	octave 5
-	note C_, 7
-	note D#, 7
+	note C_, 8
+	note D#, 8
 	octave 4
-	note C#, 15
-	note C#, 1
-	note __, 1
-	note D#, 1
-	note __, 1
-	note F_, 1
-	note __, 1
+	note C#, 16
+	note C#, 2
+	note __, 2
+	note D#, 2
+	note __, 2
+	note F_, 2
+	note __, 2
 	octave 3
-	note G#, 1
-	note __, 1
+	note G#, 2
+	note __, 2
 	octave 4
-	note F_, 1
-	note F#, 1
-	note F_, 1
-	note D#, 1
-	note F_, 1
+	note F_, 2
+	note F#, 2
+	note F_, 2
+	note D#, 2
+	note F_, 2
 	intensity $67
-	note E_, 0
-	note D_, 0
-	note C_, 0
+	note E_, 1
+	note D_, 1
+	note C_, 1
 	octave 3
-	note B_, 0
-	note A_, 0
-	note G_, 0
+	note B_, 1
+	note A_, 1
+	note G_, 1
 	intensity $a1
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 2
-	note G_, 1
-	note G_, 1
+	note G_, 2
+	note G_, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 2
-	note G_, 1
-	note G_, 1
+	note G_, 2
+	note G_, 2
 	intensity $b7
 	octave 4
-	note D_, 3
+	note D_, 4
 	loopchannel 0, Music_KantoTrainerBattle_branch_eca88
 
 Music_KantoTrainerBattle_Ch2: ; ecbea
@@ -472,452 +472,452 @@
 	dutycycle $1
 	notetype $c, $d1
 	octave 4
-	note A#, 3
-	note A#, 3
-	note A#, 3
-	note A#, 3
-	note A#, 3
-	note A#, 3
-	note A#, 3
-	note G_, 0
-	note G#, 0
-	note G_, 0
-	note F#, 0
+	note A#, 4
+	note A#, 4
+	note A#, 4
+	note A#, 4
+	note A#, 4
+	note A#, 4
+	note A#, 4
+	note G_, 1
+	note G#, 1
+	note G_, 1
+	note F#, 1
 	dutycycle $3
 	intensity $62
 
 Music_KantoTrainerBattle_branch_ecc04: ; ecc04
 	octave 3
-	note G_, 0
-	note G#, 0
-	note G_, 0
-	note F#, 0
+	note G_, 1
+	note G#, 1
+	note G_, 1
+	note F#, 1
 	loopchannel 14, Music_KantoTrainerBattle_branch_ecc04
-	note G_, 0
-	note G#, 0
-	note G_, 0
-	note F_, 0
-	note D#, 0
-	note D_, 0
-	note C_, 0
+	note G_, 1
+	note G#, 1
+	note G_, 1
+	note F_, 1
+	note D#, 1
+	note D_, 1
+	note C_, 1
 	octave 2
-	note B_, 0
+	note B_, 1
 	intensity $d7
 	dutycycle $2
-	note C_, 1
+	note C_, 2
 	octave 3
-	note C_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
 	octave 2
-	note C_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
 	octave 1
+	note A#, 2
+	octave 2
 	note A#, 1
+	note __, 1
+	octave 1
+	note A#, 1
+	note __, 1
+	note A_, 2
 	octave 2
-	note A#, 0
-	note __, 0
+	note A_, 1
+	note __, 1
 	octave 1
-	note A#, 0
-	note __, 0
 	note A_, 1
+	note __, 1
+	note G#, 2
 	octave 2
-	note A_, 0
-	note __, 0
+	note G#, 1
+	note __, 1
 	octave 1
-	note A_, 0
-	note __, 0
 	note G#, 1
+	note __, 1
+	note G_, 1
+	note B_, 1
 	octave 2
-	note G#, 0
-	note __, 0
-	octave 1
-	note G#, 0
-	note __, 0
-	note G_, 0
-	note B_, 0
-	octave 2
-	note D_, 0
-	note F_, 0
-	note G_, 0
-	note B_, 0
+	note D_, 1
+	note F_, 1
+	note G_, 1
+	note B_, 1
 	octave 3
-	note D_, 0
-	note F_, 0
+	note D_, 1
+	note F_, 1
 
 Music_KantoTrainerBattle_branch_ecc41: ; ecc41
 	notetype $c, $d7
 	octave 2
-	note C_, 0
-	note C_, 0
-	octave 3
-	note C_, 0
-	note __, 0
-	octave 2
-	note G_, 0
-	note __, 0
-	octave 3
-	note C_, 0
-	note __, 0
-	octave 2
 	note C_, 1
-	note B_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
 	note C_, 1
-	note A#, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note A#, 0
-	note __, 0
-	note C_, 1
-	note A_, 0
-	note __, 0
-	note G#, 0
-	note __, 0
 	octave 3
-	note C_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
 	octave 2
-	note C#, 0
-	note C#, 0
-	note G#, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 3
-	note C#, 1
+	note C_, 1
+	note __, 1
 	octave 2
-	note C#, 1
-	note G#, 0
-	note __, 0
+	note C_, 2
+	note B_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note C_, 2
+	note A#, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note A#, 1
+	note __, 1
+	note C_, 2
+	note A_, 1
+	note __, 1
+	note G#, 1
+	note __, 1
 	octave 3
 	note C_, 1
+	note __, 1
 	octave 2
 	note C#, 1
-	note G#, 0
-	note __, 0
-	note A#, 1
-	note C#, 0
-	note C#, 0
-	note F_, 0
-	note __, 0
+	note C#, 1
 	note G#, 1
+	note __, 1
 	octave 3
-	note C#, 0
-	note __, 0
-	note F_, 1
-	note G#, 0
-	note __, 0
-	note A#, 1
+	note C#, 2
 	octave 2
-	note C_, 0
-	note C_, 0
+	note C#, 2
+	note G#, 1
+	note __, 1
 	octave 3
-	note C_, 0
-	note __, 0
+	note C_, 2
 	octave 2
-	note G_, 0
-	note __, 0
+	note C#, 2
+	note G#, 1
+	note __, 1
+	note A#, 2
+	note C#, 1
+	note C#, 1
+	note F_, 1
+	note __, 1
+	note G#, 2
 	octave 3
-	note C_, 0
-	note __, 0
+	note C#, 1
+	note __, 1
+	note F_, 2
+	note G#, 1
+	note __, 1
+	note A#, 2
 	octave 2
 	note C_, 1
-	note B_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
 	note C_, 1
-	note A#, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note A#, 0
-	note __, 0
+	octave 3
 	note C_, 1
-	note A_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	octave 1
-	note A#, 0
-	note A#, 0
+	note __, 1
 	octave 2
-	note F_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
+	octave 3
+	note C_, 1
+	note __, 1
+	octave 2
+	note C_, 2
+	note B_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note C_, 2
 	note A#, 1
-	octave 1
+	note __, 1
+	note G_, 1
+	note __, 1
 	note A#, 1
-	octave 2
-	note F_, 0
-	note __, 0
+	note __, 1
+	note C_, 2
 	note A_, 1
+	note __, 1
+	note F_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
 	octave 1
 	note A#, 1
+	note A#, 1
 	octave 2
-	note F_, 0
-	note __, 0
-	note G#, 1
+	note F_, 1
+	note __, 1
+	note A#, 2
 	octave 1
-	note A#, 0
-	note A#, 0
+	note A#, 2
 	octave 2
-	note F_, 0
-	note __, 0
-	note G_, 1
-	note A#, 0
-	note __, 0
-	octave 3
-	note D_, 1
-	note F_, 0
-	note __, 0
-	note A#, 1
+	note F_, 1
+	note __, 1
+	note A_, 2
 	octave 1
+	note A#, 2
+	octave 2
 	note F_, 1
+	note __, 1
+	note G#, 2
+	octave 1
+	note A#, 1
+	note A#, 1
 	octave 2
-	note F_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
+	note G_, 2
+	note A#, 1
+	note __, 1
+	octave 3
+	note D_, 2
+	note F_, 1
+	note __, 1
+	note A#, 2
 	octave 1
+	note F_, 2
+	octave 2
 	note F_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note F_, 1
+	note __, 1
+	octave 1
+	note F_, 2
 	octave 2
-	note E_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
+	note E_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
 	octave 1
-	note F_, 1
+	note F_, 2
 	octave 2
-	note D#, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note D#, 0
-	note __, 0
+	note D#, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
 	octave 1
-	note F_, 1
+	note F_, 2
 	octave 2
-	note D_, 0
-	note __, 0
-	note D#, 0
-	note C_, 0
+	note D_, 1
+	note __, 1
+	note D#, 1
+	note C_, 1
 	octave 1
-	note A#, 0
-	note A_, 0
-	note A#, 0
-	note __, 0
-	note A#, 0
-	note __, 0
+	note A#, 1
+	note A_, 1
+	note A#, 1
+	note __, 1
+	note A#, 1
+	note __, 1
 	octave 3
-	note F_, 3
+	note F_, 4
 	octave 1
-	note A#, 0
-	note __, 0
-	note A#, 0
-	note __, 0
+	note A#, 1
+	note __, 1
+	note A#, 1
+	note __, 1
 	octave 3
-	note F#, 3
+	note F#, 4
 	octave 1
-	note A#, 0
-	note __, 0
-	note A#, 0
-	note __, 0
+	note A#, 1
+	note __, 1
+	note A#, 1
+	note __, 1
 	octave 3
-	note G_, 3
+	note G_, 4
 	octave 1
-	note A#, 0
-	note __, 0
-	note A#, 0
-	note __, 0
+	note A#, 1
+	note __, 1
+	note A#, 1
+	note __, 1
 	octave 3
-	note G#, 3
+	note G#, 4
 	octave 1
-	note F_, 1
+	note F_, 2
 	octave 2
-	note F_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
-	octave 1
 	note F_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note F_, 1
+	note __, 1
+	octave 1
+	note F_, 2
 	octave 2
-	note E_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
+	note E_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
 	octave 1
-	note F_, 1
+	note F_, 2
 	octave 2
-	note D#, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note D#, 0
-	note __, 0
+	note D#, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
 	octave 1
-	note F_, 1
+	note F_, 2
 	octave 2
-	note D_, 0
-	note __, 0
-	note D#, 0
-	note C_, 0
+	note D_, 1
+	note __, 1
+	note D#, 1
+	note C_, 1
 	octave 1
-	note A#, 0
-	note A_, 0
-	note A#, 0
-	note __, 0
-	note A#, 0
-	note __, 0
+	note A#, 1
+	note A_, 1
+	note A#, 1
+	note __, 1
+	note A#, 1
+	note __, 1
 	octave 3
-	note F_, 3
+	note F_, 4
 	octave 1
-	note A#, 0
-	note __, 0
-	note A#, 0
-	note __, 0
+	note A#, 1
+	note __, 1
+	note A#, 1
+	note __, 1
 	octave 3
-	note F#, 3
+	note F#, 4
 	octave 1
-	note A#, 0
-	note __, 0
-	note A#, 0
-	note __, 0
+	note A#, 1
+	note __, 1
+	note A#, 1
+	note __, 1
 	octave 3
-	note G_, 3
+	note G_, 4
 	octave 1
-	note A#, 0
-	note __, 0
-	note A#, 0
-	note __, 0
+	note A#, 1
+	note __, 1
+	note A#, 1
+	note __, 1
 	octave 3
-	note G#, 3
+	note G#, 4
 	vibrato $12, $24
 	notetype $c, $78
 	octave 4
-	note G_, 15
+	note G_, 16
 	intensity $77
-	note G_, 15
+	note G_, 16
 	notetype $6, $88
-	note G#, 15
+	note G#, 16
 	intensity $87
-	note G#, 14
-	note G_, 0
-	note G#, 6
-	note A_, 0
-	note A#, 2
-	note A_, 0
+	note G#, 15
+	note G_, 1
 	note G#, 7
-	note G_, 3
-	note F_, 5
-	note __, 1
+	note A_, 1
+	note A#, 3
+	note A_, 1
+	note G#, 8
+	note G_, 4
+	note F_, 6
+	note __, 2
 	notetype $c, $98
-	note A_, 15
+	note A_, 16
 	intensity $97
-	note A_, 15
+	note A_, 16
 	intensity $a7
-	note A#, 15
+	note A#, 16
 	intensity $d7
 	octave 5
-	note D_, 7
-	note F_, 7
+	note D_, 8
+	note F_, 8
 	vibrato $4, $36
 	octave 2
-	note A#, 3
-	note D#, 3
-	note C_, 0
-	note __, 0
+	note A#, 4
+	note D#, 4
+	note C_, 1
+	note __, 1
 	intensity $d8
-	note G#, 5
+	note G#, 6
 	intensity $d7
-	note G#, 15
-	note A#, 3
-	note D#, 3
-	note D#, 0
-	note __, 0
+	note G#, 16
+	note A#, 4
+	note D#, 4
+	note D#, 1
+	note __, 1
 	octave 3
-	note D#, 13
+	note D#, 14
 	octave 2
-	note C_, 0
-	note __, 0
-	octave 3
-	note D#, 1
+	note C_, 1
 	note __, 1
+	octave 3
+	note D#, 2
+	note __, 2
 	notetype $6, $d7
 	octave 2
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
 	note C_, 1
 	note __, 1
 	note C_, 1
 	note __, 1
+	note C_, 2
+	note __, 2
+	note C_, 2
+	note __, 2
 	octave 3
-	note G#, 7
+	note G#, 8
 	octave 4
-	note F_, 1
-	note F#, 1
-	note F_, 1
-	note D#, 1
-	note F_, 1
-	note __, 1
-	note D#, 1
-	note __, 1
+	note F_, 2
+	note F#, 2
+	note F_, 2
+	note D#, 2
+	note F_, 2
+	note __, 2
+	note D#, 2
+	note __, 2
 	octave 3
-	note F_, 1
-	note __, 1
-	note F#, 1
-	note __, 1
-	note G#, 1
-	note __, 1
-	note C#, 1
-	note __, 1
-	note G#, 1
-	note A#, 1
-	note G#, 1
-	note F#, 1
-	note G#, 1
+	note F_, 2
+	note __, 2
+	note F#, 2
+	note __, 2
+	note G#, 2
+	note __, 2
+	note C#, 2
+	note __, 2
+	note G#, 2
+	note A#, 2
+	note G#, 2
+	note F#, 2
+	note G#, 2
 	intensity $72
-	note G_, 0
-	note F_, 0
-	note E_, 0
-	note D_, 0
-	note C_, 0
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note C_, 1
 	octave 2
-	note B_, 0
+	note B_, 1
 	intensity $c1
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 1
-	note F#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
+	note F#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 1
-	note F#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
+	note F#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
 	intensity $d7
 	octave 3
-	note B_, 3
+	note B_, 4
 	loopchannel 0, Music_KantoTrainerBattle_branch_ecc41
 
 Music_KantoTrainerBattle_Ch3: ; ecdd2
@@ -925,618 +925,618 @@
 	vibrato $12, $23
 	notetype $c, $15
 	octave 2
-	note A#, 0
+	note A#, 1
 	octave 4
-	note A#, 0
-	octave 3
 	note A#, 1
+	octave 3
+	note A#, 2
 	octave 2
-	note A_, 0
+	note A_, 1
 	octave 4
-	note A_, 0
-	octave 3
 	note A_, 1
+	octave 3
+	note A_, 2
 	octave 2
-	note G#, 0
+	note G#, 1
 	octave 4
-	note G#, 0
-	octave 3
 	note G#, 1
+	octave 3
+	note G#, 2
 	octave 2
-	note G_, 0
+	note G_, 1
 	octave 4
-	note G_, 0
-	octave 3
 	note G_, 1
+	octave 3
+	note G_, 2
 	octave 2
-	note F#, 0
+	note F#, 1
 	octave 4
-	note F#, 0
-	octave 3
 	note F#, 1
+	octave 3
+	note F#, 2
 	octave 2
-	note F_, 0
+	note F_, 1
 	octave 4
-	note F_, 0
-	octave 3
 	note F_, 1
+	octave 3
+	note F_, 2
 	octave 2
-	note E_, 0
+	note E_, 1
 	octave 4
-	note E_, 0
-	octave 3
 	note E_, 1
-	note D_, 0
-	note F_, 0
-	note B_, 0
+	octave 3
+	note E_, 2
+	note D_, 1
+	note F_, 1
+	note B_, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	intensity $18
 	octave 6
-	note C_, 1
+	note C_, 2
 	octave 3
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
 	octave 5
-	note F_, 1
+	note F_, 2
 	octave 3
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	octave 5
-	note F#, 1
-	octave 4
-	note C_, 0
-	note D#, 0
-	octave 5
-	note D#, 1
-	note F_, 1
+	note C_, 1
 	note __, 1
-	note F#, 1
+	note C_, 1
 	note __, 1
-	octave 4
-	note G_, 0
-	note __, 0
-	note A#, 0
-	note __, 0
-	note B_, 0
-	note __, 0
 	octave 5
+	note F#, 2
+	octave 4
+	note C_, 1
 	note D#, 1
-	octave 3
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
 	octave 5
-	note F_, 1
-	octave 3
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	octave 5
-	note F#, 1
+	note D#, 2
+	note F_, 2
+	note __, 2
+	note F#, 2
+	note __, 2
 	octave 4
-	note C_, 0
-	note D#, 0
+	note G_, 1
+	note __, 1
+	note A#, 1
+	note __, 1
+	note B_, 1
+	note __, 1
 	octave 5
-	note D#, 1
-	note F_, 1
+	note D#, 2
+	octave 3
+	note C_, 1
 	note __, 1
-	note F#, 1
+	note C_, 1
 	note __, 1
-	note G_, 0
-	note __, 0
-	note A#, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	octave 6
+	octave 5
+	note F_, 2
+	octave 3
 	note C_, 1
-	note __, 3
-	note D_, 1
-	note __, 3
-	note D#, 1
 	note __, 1
 	note C_, 1
-	note D_, 1
 	note __, 1
+	octave 5
+	note F#, 2
+	octave 4
+	note C_, 1
 	note D#, 1
-	note __, 1
 	octave 5
+	note D#, 2
+	note F_, 2
+	note __, 2
+	note F#, 2
+	note __, 2
 	note G_, 1
+	note __, 1
 	note A#, 1
+	note __, 1
 	note B_, 1
+	note __, 1
+	octave 6
+	note C_, 2
+	note __, 4
+	note D_, 2
+	note __, 4
+	note D#, 2
+	note __, 2
+	note C_, 2
+	note D_, 2
+	note __, 2
+	note D#, 2
+	note __, 2
+	octave 5
+	note G_, 2
+	note A#, 2
+	note B_, 2
 
 Music_KantoTrainerBattle_branch_ece5a: ; ece5a
 	notetype $c, $14
 	octave 6
-	note C_, 3
+	note C_, 4
 	notetype $6, $14
 	octave 5
-	note B_, 0
-	note A#, 0
-	note A_, 0
-	note G#, 0
+	note B_, 1
+	note A#, 1
+	note A_, 1
+	note G#, 1
 	notetype $c, $14
-	note G_, 9
-	note __, 1
+	note G_, 10
+	note __, 2
 	notetype $6, $14
-	note G_, 0
-	note G#, 0
-	note A_, 0
-	note A#, 0
+	note G_, 1
+	note G#, 1
+	note A_, 1
+	note A#, 1
 	octave 6
-	note C_, 5
+	note C_, 6
 	octave 5
-	note A_, 0
-	note G#, 0
-	note G_, 7
+	note A_, 1
+	note G#, 1
+	note G_, 8
 	octave 6
-	note C_, 6
+	note C_, 7
 	octave 5
-	note B_, 0
+	note B_, 1
 	notetype $c, $14
 	octave 6
-	note C#, 15
-	note C#, 7
-	note F_, 3
-	note G#, 0
-	note F_, 0
-	note C#, 0
+	note C#, 16
+	note C#, 8
+	note F_, 4
+	note G#, 1
+	note F_, 1
+	note C#, 1
 	octave 5
-	note G#, 0
+	note G#, 1
 	octave 6
-	note C_, 3
+	note C_, 4
 	notetype $6, $14
 	octave 5
-	note B_, 0
-	note A#, 0
-	note A_, 0
-	note G#, 0
+	note B_, 1
+	note A#, 1
+	note A_, 1
+	note G#, 1
 	notetype $c, $14
-	note G_, 9
-	note __, 1
+	note G_, 10
+	note __, 2
 	notetype $6, $14
-	note G_, 0
-	note G#, 0
-	note A_, 0
-	note A#, 0
+	note G_, 1
+	note G#, 1
+	note A_, 1
+	note A#, 1
 	octave 6
-	note C_, 5
+	note C_, 6
 	octave 5
-	note A_, 0
-	note G#, 0
-	note G_, 7
+	note A_, 1
+	note G#, 1
+	note G_, 8
 	octave 6
-	note C_, 6
+	note C_, 7
 	octave 5
-	note B_, 0
-	note A#, 15
-	note A#, 15
-	note A#, 12
-	note B_, 0
+	note B_, 1
+	note A#, 16
+	note A#, 16
+	note A#, 13
+	note B_, 1
 	octave 6
-	note C_, 0
-	note C#, 0
-	note D_, 7
-	note F_, 1
-	note D_, 1
+	note C_, 1
+	note C#, 1
+	note D_, 8
+	note F_, 2
+	note D_, 2
 	octave 5
-	note A#, 1
-	note A_, 1
+	note A#, 2
+	note A_, 2
 	notetype $c, $10
-	note G#, 10
+	note G#, 11
 	intensity $14
-	note C_, 0
-	note F_, 0
-	note __, 0
-	note G#, 0
-	note __, 0
+	note C_, 1
+	note F_, 1
+	note __, 1
+	note G#, 1
+	note __, 1
 	intensity $10
 	octave 6
-	note C_, 5
+	note C_, 6
 	notetype $6, $10
 	octave 5
-	note B_, 0
-	note A#, 0
-	note A_, 0
-	note G#, 0
-	note G#, 15
+	note B_, 1
+	note A#, 1
+	note A_, 1
+	note G#, 1
+	note G#, 16
 	notetype $c, $10
-	note A#, 15
+	note A#, 16
 	intensity $25
-	note D_, 0
+	note D_, 1
 	octave 4
-	note A#, 0
-	note F_, 0
-	note A#, 0
+	note A#, 1
+	note F_, 1
+	note A#, 1
 	octave 5
-	note F_, 0
-	note D_, 0
+	note F_, 1
+	note D_, 1
 	octave 4
-	note A#, 0
+	note A#, 1
 	octave 5
-	note D_, 0
-	note A#, 0
-	note F_, 0
-	note D_, 0
-	note F_, 0
-	octave 6
 	note D_, 1
-	note C#, 0
-	note C_, 0
+	note A#, 1
+	note F_, 1
+	note D_, 1
+	note F_, 1
+	octave 6
+	note D_, 2
+	note C#, 1
+	note C_, 1
 	intensity $10
 	octave 5
-	note G#, 10
+	note G#, 11
 	intensity $14
-	note C_, 0
-	note F_, 0
-	note __, 0
-	note G#, 0
-	note __, 0
+	note C_, 1
+	note F_, 1
+	note __, 1
+	note G#, 1
+	note __, 1
 	intensity $10
 	octave 6
-	note C_, 6
+	note C_, 7
 	notetype $6, $10
-	note C#, 0
-	note D_, 0
+	note C#, 1
+	note D_, 1
 	notetype $c, $10
-	note D#, 7
-	note D_, 11
-	note G#, 0
-	note F_, 0
+	note D#, 8
+	note D_, 12
+	note G#, 1
+	note F_, 1
 	intensity $25
 	octave 5
-	note A#, 0
-	note F_, 0
-	note G#, 0
-	note G#, 0
-	note G#, 0
-	note __, 0
-	note A#, 0
-	note __, 0
-	note G#, 1
-	note G_, 1
+	note A#, 1
 	note F_, 1
-	note D#, 1
-	note F_, 1
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	note __, 1
+	note A#, 1
+	note __, 1
+	note G#, 2
+	note G_, 2
+	note F_, 2
+	note D#, 2
+	note F_, 2
 	intensity $24
 	octave 3
-	note G_, 0
+	note G_, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	octave 3
-	note D#, 0
+	note D#, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	octave 3
-	note G_, 0
+	note G_, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	octave 3
-	note D#, 0
+	note D#, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	octave 3
-	note G_, 0
+	note G_, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	octave 3
-	note D#, 0
+	note D#, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	octave 3
-	note G_, 0
+	note G_, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	octave 3
-	note D#, 0
+	note D#, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	octave 3
-	note G_, 0
+	note G_, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	octave 3
-	note D#, 0
+	note D#, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	octave 3
-	note G_, 0
+	note G_, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	octave 3
-	note D#, 0
+	note D#, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	octave 3
-	note G_, 0
+	note G_, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	octave 3
-	note D#, 0
+	note D#, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	octave 3
-	note G_, 0
+	note G_, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	octave 3
-	note D#, 0
+	note D#, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	octave 3
-	note G#, 0
+	note G#, 1
 	octave 4
-	note C#, 0
+	note C#, 1
 	octave 3
-	note E_, 0
+	note E_, 1
 	octave 4
-	note C#, 0
+	note C#, 1
 	octave 3
-	note G#, 0
+	note G#, 1
 	octave 4
-	note C#, 0
+	note C#, 1
 	octave 3
-	note E_, 0
+	note E_, 1
 	octave 4
-	note C#, 0
+	note C#, 1
 	octave 3
-	note G#, 0
+	note G#, 1
 	octave 4
-	note C#, 0
+	note C#, 1
 	octave 3
-	note E_, 0
+	note E_, 1
 	octave 4
-	note C#, 0
+	note C#, 1
 	octave 3
-	note G#, 0
+	note G#, 1
 	octave 4
-	note C#, 0
+	note C#, 1
 	octave 3
-	note E_, 0
+	note E_, 1
 	octave 4
-	note C#, 0
+	note C#, 1
 	octave 3
-	note G#, 0
+	note G#, 1
 	octave 4
-	note C#, 0
+	note C#, 1
 	octave 3
-	note E_, 0
+	note E_, 1
 	octave 4
-	note C#, 0
+	note C#, 1
 	octave 3
-	note G#, 0
+	note G#, 1
 	octave 4
-	note C#, 0
+	note C#, 1
 	octave 3
-	note E_, 0
+	note E_, 1
 	octave 4
-	note C#, 0
+	note C#, 1
 	octave 3
-	note G#, 0
+	note G#, 1
 	octave 4
-	note C#, 0
+	note C#, 1
 	octave 3
-	note E_, 0
+	note E_, 1
 	octave 4
-	note C#, 0
+	note C#, 1
 	octave 3
-	note G#, 0
+	note G#, 1
 	octave 4
-	note C#, 0
+	note C#, 1
 	octave 3
-	note E_, 0
+	note E_, 1
 	octave 4
-	note C#, 0
+	note C#, 1
 	intensity $14
 	octave 3
-	note A_, 0
+	note A_, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	octave 3
-	note F_, 0
+	note F_, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	octave 3
-	note A_, 0
+	note A_, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	octave 3
-	note F_, 0
+	note F_, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	octave 3
-	note A_, 0
+	note A_, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	octave 3
-	note F_, 0
+	note F_, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	octave 3
-	note A_, 0
+	note A_, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	octave 3
-	note F_, 0
+	note F_, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	intensity $15
 	octave 3
-	note A_, 0
+	note A_, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	octave 3
-	note F_, 0
+	note F_, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	octave 3
-	note A_, 0
+	note A_, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	octave 3
-	note F_, 0
+	note F_, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	octave 3
-	note A_, 0
+	note A_, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	octave 3
-	note F_, 0
+	note F_, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	octave 3
-	note A_, 0
+	note A_, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	octave 3
-	note F_, 0
+	note F_, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	intensity $15
 	octave 3
-	note A#, 0
+	note A#, 1
 	octave 4
-	note D#, 0
+	note D#, 1
 	octave 3
-	note F#, 0
+	note F#, 1
 	octave 4
-	note D#, 0
+	note D#, 1
 	octave 3
-	note A#, 0
+	note A#, 1
 	octave 4
-	note D#, 0
+	note D#, 1
 	octave 3
-	note F#, 0
+	note F#, 1
 	octave 4
-	note D#, 0
+	note D#, 1
 	octave 3
-	note A#, 0
+	note A#, 1
 	octave 4
-	note D#, 0
+	note D#, 1
 	octave 3
-	note F#, 0
+	note F#, 1
 	octave 4
-	note D#, 0
+	note D#, 1
 	octave 3
-	note A#, 0
+	note A#, 1
 	octave 4
-	note D#, 0
+	note D#, 1
 	octave 3
-	note F#, 0
+	note F#, 1
 	octave 4
-	note D#, 0
+	note D#, 1
 	intensity $14
 	octave 3
-	note F_, 0
-	note G#, 0
-	note B_, 0
+	note F_, 1
+	note G#, 1
+	note B_, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	octave 3
-	note G#, 0
-	note B_, 0
+	note G#, 1
+	note B_, 1
 	octave 4
-	note D_, 0
-	note F_, 0
+	note D_, 1
+	note F_, 1
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note D_, 0
-	note F_, 0
-	note G#, 0
-	note D_, 0
-	note F_, 0
-	note G#, 0
+	note D_, 1
+	note F_, 1
+	note G#, 1
+	note D_, 1
+	note F_, 1
+	note G#, 1
 	octave 5
-	note D_, 0
+	note D_, 1
 	octave 6
-	note D#, 3
+	note D#, 4
 	octave 5
-	note A#, 3
+	note A#, 4
 	octave 6
-	note C#, 0
-	note __, 0
-	note C_, 5
+	note C#, 1
+	note __, 1
+	note C_, 6
 	octave 4
-	note C_, 0
-	note D#, 0
-	note G#, 0
+	note C_, 1
+	note D#, 1
+	note G#, 1
 	octave 5
-	note C_, 0
-	note D#, 0
-	note G#, 0
+	note C_, 1
+	note D#, 1
+	note G#, 1
 	octave 6
-	note C_, 0
-	note D#, 0
-	note G#, 0
-	note D#, 0
-	note C_, 0
+	note C_, 1
+	note D#, 1
+	note G#, 1
+	note D#, 1
+	note C_, 1
 	octave 5
-	note G#, 0
-	note D#, 0
-	note C_, 0
+	note G#, 1
+	note D#, 1
+	note C_, 1
 	octave 4
-	note G#, 0
-	note D#, 0
+	note G#, 1
+	note D#, 1
 	octave 6
-	note D#, 3
+	note D#, 4
 	octave 5
-	note A#, 3
-	note B_, 0
-	note __, 0
+	note A#, 4
+	note B_, 1
+	note __, 1
 	octave 6
-	note F#, 11
-	note F_, 0
-	note F#, 0
-	note G#, 15
-	note F_, 7
-	note C#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note F_, 0
-	note __, 0
+	note F#, 12
+	note F_, 1
+	note F#, 1
+	note G#, 16
+	note F_, 8
+	note C#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note F_, 1
+	note __, 1
 	octave 5
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
 	octave 6
-	note F_, 0
-	note F#, 0
-	note F_, 0
-	note D#, 0
-	note F_, 0
+	note F_, 1
+	note F#, 1
+	note F_, 1
+	note D#, 1
+	note F_, 1
 	notetype $6, $24
-	note E_, 0
-	note D_, 0
-	note C_, 0
+	note E_, 1
+	note D_, 1
+	note C_, 1
 	octave 5
-	note B_, 0
-	note A_, 0
-	note G_, 0
-	intensity $14
+	note B_, 1
+	note A_, 1
 	note G_, 1
+	intensity $14
+	note G_, 2
 	octave 3
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	octave 5
 	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	octave 5
+	note G_, 2
 	octave 3
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
 	intensity $14
 	octave 5
-	note G_, 3
+	note G_, 4
 	loopchannel 0, Music_KantoTrainerBattle_branch_ece5a
 ; ed06d
--- a/audio/music/kantowildbattle.asm
+++ b/audio/music/kantowildbattle.asm
@@ -12,239 +12,239 @@
 	vibrato $12, $23
 	dutycycle $2
 	notetype $c, $b7
-	note __, 15
+	note __, 16
 	octave 4
-	note A#, 5
-	note A_, 0
-	note G#, 0
-	note A_, 0
-	note G#, 0
-	note G_, 0
-	note F#, 0
-	note G#, 0
-	note G_, 0
-	note F#, 0
-	note F_, 0
+	note A#, 6
+	note A_, 1
+	note G#, 1
+	note A_, 1
+	note G#, 1
+	note G_, 1
+	note F#, 1
+	note G#, 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
 
 Music_KantoWildBattle_branch_ed091: ; ed091
 	notetype $c, $b7
 	callchannel Music_KantoWildBattle_branch_ed18a
 	octave 4
-	note F_, 3
-	note C#, 3
+	note F_, 4
+	note C#, 4
 	octave 3
-	note B_, 7
+	note B_, 8
 	callchannel Music_KantoWildBattle_branch_ed18a
-	note __, 7
-	note G_, 0
-	note B_, 0
+	note __, 8
+	note G_, 1
+	note B_, 1
 	octave 4
-	note C#, 0
+	note C#, 1
 	octave 3
-	note B_, 0
-	note G_, 0
-	note B_, 0
+	note B_, 1
+	note G_, 1
+	note B_, 1
 	octave 4
-	note D_, 0
-	note D#, 0
+	note D_, 1
+	note D#, 1
 	intensity $b1
-	note E_, 5
-	note C_, 5
+	note E_, 6
+	note C_, 6
 	octave 3
-	note G_, 3
+	note G_, 4
 	octave 4
-	note E_, 5
-	note C_, 5
-	note E_, 3
+	note E_, 6
+	note C_, 6
+	note E_, 4
 	intensity $b7
-	note F_, 0
-	note C#, 0
+	note F_, 1
+	note C#, 1
 	octave 3
-	note G#, 0
+	note G#, 1
 	octave 4
-	note C_, 0
-	note C#, 0
+	note C_, 1
+	note C#, 1
 	octave 3
-	note G#, 0
-	note F_, 0
-	note G_, 0
-	note G#, 3
-	note F#, 0
-	note G_, 0
-	note G#, 0
+	note G#, 1
+	note F_, 1
+	note G_, 1
+	note G#, 4
+	note F#, 1
+	note G_, 1
+	note G#, 1
 	octave 4
-	note C_, 0
-	note C#, 3
+	note C_, 1
+	note C#, 4
 	octave 3
-	note F_, 0
-	note G#, 0
+	note F_, 1
+	note G#, 1
 	octave 4
-	note C#, 0
-	note E_, 0
-	note F_, 2
-	note G_, 0
-	note G#, 3
+	note C#, 1
+	note E_, 1
+	note F_, 3
+	note G_, 1
+	note G#, 4
 	intensity $b1
 	octave 3
-	note G_, 5
-	note F_, 5
-	note E_, 3
-	note G#, 5
-	note G_, 5
-	note F_, 3
+	note G_, 6
+	note F_, 6
+	note E_, 4
+	note G#, 6
+	note G_, 6
+	note F_, 4
 	octave 4
-	note C_, 5
+	note C_, 6
 	octave 3
-	note A#, 5
-	note G_, 3
+	note A#, 6
+	note G_, 4
 	notetype $8, $b7
 	octave 2
-	note G_, 1
+	note G_, 2
 	octave 3
-	note C_, 1
-	note E_, 1
-	note C_, 1
-	note E_, 1
-	note G_, 1
-	note E_, 1
-	note G_, 1
+	note C_, 2
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G_, 1
+	note G_, 2
 	octave 4
-	note C_, 1
-	note E_, 1
-	note F_, 1
-	note C#, 1
+	note C_, 2
+	note E_, 2
+	note F_, 2
+	note C#, 2
 	octave 3
-	note G#, 1
+	note G#, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note G#, 1
-	note F_, 1
-	note G#, 1
-	note F_, 1
-	note C#, 1
-	note F_, 1
-	note C#, 1
+	note G#, 2
+	note F_, 2
+	note G#, 2
+	note F_, 2
+	note C#, 2
+	note F_, 2
+	note C#, 2
 	octave 2
-	note G#, 1
+	note G#, 2
 	notetype $c, $b7
 	octave 3
-	note G#, 3
+	note G#, 4
 	octave 4
-	note C#, 3
+	note C#, 4
 	intensity $71
-	note F_, 0
-	note F_, 0
+	note F_, 1
+	note F_, 1
 	intensity $91
-	note F_, 0
-	note F_, 0
+	note F_, 1
+	note F_, 1
 	intensity $b1
-	note G#, 0
-	note G#, 0
+	note G#, 1
+	note G#, 1
 	intensity $d1
-	note G#, 0
-	note G#, 0
+	note G#, 1
+	note G#, 1
 	intensity $c7
-	note E_, 0
-	note D_, 0
-	note C#, 0
-	note D_, 0
-	note E_, 11
-	note E_, 7
+	note E_, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note E_, 12
+	note E_, 8
 	intensity $b1
-	note E_, 0
-	note D_, 0
-	note C_, 0
+	note E_, 1
+	note D_, 1
+	note C_, 1
 	octave 3
-	note A#, 0
-	note A_, 0
-	note G_, 0
-	note F_, 0
-	note E_, 0
+	note A#, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note E_, 1
 	intensity $b7
-	note D_, 7
-	note F_, 7
-	note A#, 7
+	note D_, 8
+	note F_, 8
+	note A#, 8
 	octave 4
-	note D_, 7
+	note D_, 8
 	octave 3
-	note G_, 7
+	note G_, 8
 	octave 4
-	note C_, 7
-	note E_, 7
-	note G_, 7
-	note __, 7
+	note C_, 8
+	note E_, 8
+	note G_, 8
+	note __, 8
 	octave 3
-	note D#, 7
-	note G#, 7
+	note D#, 8
+	note G#, 8
 	octave 4
-	note C_, 7
+	note C_, 8
 	octave 3
-	note A#, 7
-	note __, 7
+	note A#, 8
+	note __, 8
 	octave 4
-	note D_, 7
+	note D_, 8
 	octave 3
-	note G#, 1
-	note F_, 1
-	note D_, 1
-	note F_, 1
+	note G#, 2
+	note F_, 2
+	note D_, 2
+	note F_, 2
 	octave 4
-	note C_, 3
+	note C_, 4
+	note __, 6
+	note C_, 1
 	note __, 5
-	note C_, 0
-	note __, 4
+	note C#, 2
+	note C_, 1
+	note __, 13
+	note C#, 4
+	note __, 6
 	note C#, 1
-	note C_, 0
-	note __, 12
-	note C#, 3
 	note __, 5
-	note C#, 0
-	note __, 4
-	note F_, 1
-	note D#, 0
-	note __, 4
-	note C#, 7
+	note F_, 2
+	note D#, 1
+	note __, 5
+	note C#, 8
 
 Music_KantoWildBattle_branch_ed15b: ; ed15b
 	intensity $b1
 	octave 3
-	note C_, 0
-	note D#, 0
-	note D_, 0
-	note C#, 0
+	note C_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
 	loopchannel 8, Music_KantoWildBattle_branch_ed15b
 
 Music_KantoWildBattle_branch_ed166: ; ed166
-	note C#, 0
-	note F_, 0
-	note E_, 0
-	note D#, 0
+	note C#, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
 	loopchannel 8, Music_KantoWildBattle_branch_ed166
 
 Music_KantoWildBattle_branch_ed16e: ; ed16e
-	note C_, 0
-	note D#, 0
-	note D_, 0
-	note C#, 0
+	note C_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
 	loopchannel 16, Music_KantoWildBattle_branch_ed16e
 
 Music_KantoWildBattle_branch_ed176: ; ed176
-	note C#, 0
-	note E_, 0
-	note D#, 0
-	note D_, 0
+	note C#, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
 	loopchannel 8, Music_KantoWildBattle_branch_ed176
 
 Music_KantoWildBattle_branch_ed17e: ; ed17e
-	note C_, 0
-	note D#, 0
-	note D_, 0
-	note C#, 0
+	note C_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
 	loopchannel 8, Music_KantoWildBattle_branch_ed17e
 	loopchannel 0, Music_KantoWildBattle_branch_ed091
 ; ed18a
@@ -251,25 +251,25 @@
 
 Music_KantoWildBattle_branch_ed18a: ; ed18a
 	octave 4
-	note C_, 0
-	note __, 4
+	note C_, 1
+	note __, 5
 	octave 3
-	note B_, 0
-	note __, 4
-	note A#, 0
-	note __, 2
-	note __, 9
+	note B_, 1
+	note __, 5
+	note A#, 1
+	note __, 3
+	note __, 10
 	octave 4
+	note C_, 2
+	note __, 2
+	note D#, 2
+	note C#, 1
+	note __, 5
 	note C_, 1
-	note __, 1
-	note D#, 1
-	note C#, 0
-	note __, 4
-	note C_, 0
-	note __, 4
+	note __, 5
 	octave 3
-	note B_, 0
-	note __, 2
+	note B_, 1
+	note __, 3
 	endchannel
 
 Music_KantoWildBattle_Ch2: ; ed19f
@@ -277,59 +277,59 @@
 	vibrato $12, $23
 	notetype $c, $b1
 	octave 4
-	note G_, 0
-	note F#, 0
-	note F_, 0
-	note E_, 0
-	note G_, 0
-	note F#, 0
-	note F_, 0
-	note E_, 0
-	note G_, 0
-	note F#, 0
-	note F_, 0
-	note E_, 0
-	note G_, 0
-	note F#, 0
-	note F_, 0
-	note E_, 0
-	note G_, 0
-	note F#, 0
-	note F_, 0
-	note E_, 0
-	note F#, 0
-	note F_, 0
-	note E_, 0
-	note D#, 0
-	note F_, 0
-	note E_, 0
-	note D#, 0
-	note D_, 0
-	note E_, 0
-	note D#, 0
-	note D_, 0
-	note C#, 0
+	note G_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
 
 Music_KantoWildBattle_branch_ed1c8: ; ed1c8
 	notetype $c, $b7
 	callchannel Music_KantoWildBattle_branch_ed2c6
 	octave 2
-	note F_, 1
+	note F_, 2
 	octave 1
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 2
-	note G_, 1
+	note G_, 2
 	callchannel Music_KantoWildBattle_branch_ed2c6
 	octave 2
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 1
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 2
-	note F_, 0
-	note F#, 0
+	note F_, 1
+	note F#, 1
 	notetype $6, $b7
 	callchannel Music_KantoWildBattle_branch_ed307
 	callchannel Music_KantoWildBattle_branch_ed307
@@ -347,48 +347,48 @@
 	forceoctave $0
 	callchannel Music_KantoWildBattle_branch_ed307
 	callchannel Music_KantoWildBattle_branch_ed307
-	note __, 15
+	note __, 16
 	octave 3
-	note A#, 15
+	note A#, 16
 	octave 4
-	note D_, 15
-	note F_, 15
+	note D_, 16
+	note F_, 16
 	notetype $c, $b7
-	note E_, 15
-	note G_, 7
+	note E_, 16
+	note G_, 8
 	octave 5
-	note C_, 7
-	note __, 7
+	note C_, 8
+	note __, 8
 	octave 3
-	note G#, 7
+	note G#, 8
 	octave 4
-	note C_, 7
-	note D#, 7
-	note F_, 7
-	note F_, 0
+	note C_, 8
+	note D#, 8
+	note F_, 8
+	note F_, 1
 	octave 3
-	note A#, 0
-	note G#, 0
-	note A#, 0
+	note A#, 1
+	note G#, 1
+	note A#, 1
 	octave 4
-	note F_, 0
+	note F_, 1
 	octave 3
-	note A#, 0
-	note G#, 0
-	note A#, 0
+	note A#, 1
+	note G#, 1
+	note A#, 1
 	octave 4
-	note G#, 7
-	note G#, 0
-	note F_, 0
-	note D_, 0
+	note G#, 8
+	note G#, 1
+	note F_, 1
+	note D_, 1
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note F_, 0
-	note D_, 0
+	note F_, 1
+	note D_, 1
 	octave 3
-	note B_, 0
-	note G#, 0
+	note B_, 1
+	note G#, 1
 	notetype $6, $b7
 	callchannel Music_KantoWildBattle_branch_ed31b
 	forceoctave $1
@@ -396,63 +396,63 @@
 	forceoctave $0
 	callchannel Music_KantoWildBattle_branch_ed340
 	octave 2
-	note C_, 1
-	note __, 1
+	note C_, 2
+	note __, 2
 	octave 3
-	note G_, 3
+	note G_, 4
 	octave 2
-	note C_, 1
-	note __, 1
-	note C_, 1
-	note __, 1
+	note C_, 2
+	note __, 2
+	note C_, 2
+	note __, 2
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 2
-	note C_, 1
-	note __, 1
+	note C_, 2
+	note __, 2
 	octave 4
-	note D#, 3
+	note D#, 4
 	octave 2
-	note C_, 1
-	note __, 1
+	note C_, 2
+	note __, 2
 	octave 4
-	note C#, 3
+	note C#, 4
 	octave 2
-	note C#, 1
-	note __, 1
-	note C#, 1
-	note __, 1
+	note C#, 2
+	note __, 2
+	note C#, 2
+	note __, 2
 	octave 4
-	note C#, 3
+	note C#, 4
 	octave 2
-	note C#, 1
-	note __, 1
-	note C#, 1
-	note __, 1
+	note C#, 2
+	note __, 2
+	note C#, 2
+	note __, 2
 	octave 4
-	note C#, 3
+	note C#, 4
 	octave 2
-	note C#, 1
-	note __, 1
-	note C#, 1
-	note __, 1
+	note C#, 2
+	note __, 2
+	note C#, 2
+	note __, 2
 	octave 4
-	note C#, 3
+	note C#, 4
 	octave 2
-	note C#, 1
-	note __, 1
-	note C#, 1
-	note __, 1
+	note C#, 2
+	note __, 2
+	note C#, 2
+	note __, 2
 	octave 4
-	note C#, 3
+	note C#, 4
 	octave 2
-	note C#, 1
-	note __, 1
+	note C#, 2
+	note __, 2
 	octave 4
-	note F_, 3
+	note F_, 4
 	octave 2
-	note C#, 1
-	note __, 1
+	note C#, 2
+	note __, 2
 	callchannel Music_KantoWildBattle_branch_ed340
 	callchannel Music_KantoWildBattle_branch_ed354
 	callchannel Music_KantoWildBattle_branch_ed340
@@ -460,222 +460,222 @@
 	forceoctave $1
 	callchannel Music_KantoWildBattle_branch_ed340
 	forceoctave $0
-	note C#, 1
-	note __, 1
+	note C#, 2
+	note __, 2
 	octave 3
-	note G#, 3
+	note G#, 4
 	octave 2
-	note C#, 1
-	note __, 1
-	note C#, 1
-	note __, 1
+	note C#, 2
+	note __, 2
+	note C#, 2
+	note __, 2
 	octave 4
-	note C#, 3
+	note C#, 4
 	octave 2
-	note C#, 1
-	note __, 1
+	note C#, 2
+	note __, 2
 	octave 3
-	note A#, 3
+	note A#, 4
 	octave 2
-	note C#, 1
-	note __, 1
+	note C#, 2
+	note __, 2
 	callchannel Music_KantoWildBattle_branch_ed340
-	note C_, 1
-	note __, 1
+	note C_, 2
+	note __, 2
 	octave 3
-	note G_, 3
+	note G_, 4
 	octave 2
-	note C_, 1
-	note __, 1
-	note C_, 1
-	note __, 1
+	note C_, 2
+	note __, 2
+	note C_, 2
+	note __, 2
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 2
-	note C_, 1
-	note __, 1
+	note C_, 2
+	note __, 2
 	octave 3
-	note A#, 3
+	note A#, 4
 	octave 2
-	note C_, 1
-	note __, 1
+	note C_, 2
+	note __, 2
 	loopchannel 0, Music_KantoWildBattle_branch_ed1c8
 ; ed2c6
 
 Music_KantoWildBattle_branch_ed2c6: ; ed2c6
 	octave 2
-	note C_, 0
-	note __, 1
-	note C_, 0
-	octave 1
-	note G_, 0
-	note __, 0
-	octave 2
-	note C_, 0
-	note __, 0
-	octave 3
 	note C_, 1
-	octave 2
-	note C_, 0
-	note __, 0
+	note __, 2
+	note C_, 1
 	octave 1
-	note G_, 0
+	note G_, 1
 	note __, 1
-	note G_, 0
 	octave 2
+	note C_, 1
+	note __, 1
+	octave 3
 	note C_, 2
-	note C_, 0
+	octave 2
+	note C_, 1
+	note __, 1
 	octave 1
 	note G_, 1
+	note __, 2
+	note G_, 1
 	octave 2
+	note C_, 3
 	note C_, 1
 	octave 1
-	note G_, 1
+	note G_, 2
 	octave 2
-	note F#, 1
+	note C_, 2
 	octave 1
-	note G_, 1
+	note G_, 2
 	octave 2
-	note G_, 1
-	note C#, 0
-	note __, 1
-	note C#, 0
+	note F#, 2
 	octave 1
-	note G#, 0
-	note __, 0
+	note G_, 2
 	octave 2
-	note C#, 0
-	note __, 0
-	octave 3
-	note C#, 0
-	note __, 0
-	octave 2
+	note G_, 2
 	note C#, 1
+	note __, 2
+	note C#, 1
 	octave 1
-	note G#, 0
+	note G#, 1
 	note __, 1
-	note G#, 0
 	octave 2
-	note C#, 0
+	note C#, 1
 	note __, 1
-	note C#, 0
+	octave 3
+	note C#, 1
+	note __, 1
+	octave 2
+	note C#, 2
 	octave 1
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 2
+	note G#, 1
 	octave 2
-	note C#, 0
-	note __, 0
+	note C#, 1
+	note __, 2
+	note C#, 1
 	octave 1
-	note G_, 1
+	note G#, 1
+	note __, 1
+	octave 2
+	note C#, 1
+	note __, 1
+	octave 1
+	note G_, 2
 	endchannel
 ; ed307
 
 Music_KantoWildBattle_branch_ed307: ; ed307
 	octave 2
+	note C_, 2
+	note __, 4
 	note C_, 1
-	note __, 3
-	note C_, 0
-	note __, 0
-	note C_, 1
+	note __, 1
+	note C_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note C_, 3
-	note __, 1
-	note C_, 1
-	note __, 1
-	note C_, 1
+	note C_, 4
+	note __, 2
+	note C_, 2
+	note __, 2
+	note C_, 2
 	octave 3
-	note C_, 1
-	note __, 1
+	note C_, 2
+	note __, 2
 	octave 2
-	note C_, 3
+	note C_, 4
 	endchannel
 ; ed31b
 
 Music_KantoWildBattle_branch_ed31b: ; ed31b
 	octave 2
-	note C_, 1
-	note __, 3
-	note C_, 1
-	note __, 3
+	note C_, 2
+	note __, 4
+	note C_, 2
+	note __, 4
 	octave 1
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	octave 2
-	note E_, 1
+	note G_, 1
 	note __, 1
-	note E_, 1
+	note G_, 1
 	note __, 1
-	note E_, 1
-	note C_, 5
-	note C_, 1
-	note __, 3
-	note C_, 1
+	octave 2
+	note E_, 2
+	note __, 2
+	note E_, 2
+	note __, 2
+	note E_, 2
+	note C_, 6
+	note C_, 2
+	note __, 4
+	note C_, 2
 	octave 1
-	note G_, 1
+	note G_, 2
 	octave 2
-	note E_, 1
-	note C_, 1
+	note E_, 2
+	note C_, 2
 	octave 1
-	note G_, 1
+	note G_, 2
 	octave 2
-	note C_, 1
-	note __, 3
-	note C_, 1
-	note E_, 1
-	note G_, 1
-	note B_, 1
+	note C_, 2
+	note __, 4
+	note C_, 2
+	note E_, 2
+	note G_, 2
+	note B_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	endchannel
 ; ed340
 
 Music_KantoWildBattle_branch_ed340: ; ed340
 	octave 3
-	note G_, 3
+	note G_, 4
 	octave 2
-	note C_, 1
-	note __, 1
-	note C_, 1
-	note __, 1
+	note C_, 2
+	note __, 2
+	note C_, 2
+	note __, 2
 	octave 3
-	note G_, 3
+	note G_, 4
 	octave 2
-	note C_, 1
-	note __, 1
-	note C_, 1
-	note __, 1
+	note C_, 2
+	note __, 2
+	note C_, 2
+	note __, 2
 	octave 3
-	note G_, 3
+	note G_, 4
 	octave 2
-	note C_, 1
-	note __, 1
+	note C_, 2
+	note __, 2
 	endchannel
 ; ed354
 
 Music_KantoWildBattle_branch_ed354: ; ed354
-	note C_, 1
-	note __, 1
+	note C_, 2
+	note __, 2
 	octave 3
-	note G_, 3
+	note G_, 4
 	octave 2
-	note C_, 1
-	note __, 1
-	note C_, 1
-	note __, 1
+	note C_, 2
+	note __, 2
+	note C_, 2
+	note __, 2
 	octave 3
-	note G_, 3
+	note G_, 4
 	octave 2
-	note C_, 1
-	note __, 1
+	note C_, 2
+	note __, 2
 	octave 3
-	note G_, 3
+	note G_, 4
 	octave 2
-	note C_, 1
-	note __, 1
+	note C_, 2
+	note __, 2
 	endchannel
 
 Music_KantoWildBattle_Ch3: ; ed368
@@ -682,551 +682,551 @@
 	vibrato $14, $23
 	notetype $c, $14
 	octave 3
-	note C_, 0
-	note __, 0
-	note C_, 0
+	note C_, 1
+	note __, 1
+	note C_, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	octave 3
-	note C#, 0
-	note __, 0
-	note C#, 0
+	note C#, 1
+	note __, 1
+	note C#, 1
 	octave 4
-	note C#, 0
+	note C#, 1
 	octave 3
-	note D_, 0
-	note __, 0
-	note D_, 0
+	note D_, 1
+	note __, 1
+	note D_, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	octave 3
-	note D#, 0
-	note __, 0
-	note D#, 0
+	note D#, 1
+	note __, 1
+	note D#, 1
 	octave 4
-	note D#, 0
+	note D#, 1
 	octave 3
-	note E_, 0
-	note __, 0
-	note E_, 0
+	note E_, 1
+	note __, 1
+	note E_, 1
 	octave 4
-	note E_, 0
+	note E_, 1
 	octave 3
-	note F_, 0
-	note __, 0
-	note F_, 0
+	note F_, 1
+	note __, 1
+	note F_, 1
 	octave 4
-	note F_, 0
+	note F_, 1
 	octave 3
-	note F#, 0
-	note __, 0
-	note F#, 0
+	note F#, 1
+	note __, 1
+	note F#, 1
 	octave 4
-	note F#, 0
+	note F#, 1
 	octave 3
-	note G_, 0
-	note __, 0
-	note G_, 0
+	note G_, 1
+	note __, 1
+	note G_, 1
 	octave 4
-	note G_, 0
+	note G_, 1
 
 Music_KantoWildBattle_branch_ed39e: ; ed39e
 	notetype $c, $14
 	octave 5
-	note G_, 0
-	note __, 1
+	note G_, 1
+	note __, 2
 	octave 4
-	note G_, 0
+	note G_, 1
+	note __, 2
+	octave 5
+	note G_, 1
+	note __, 3
+	octave 4
+	note G_, 1
 	note __, 1
 	octave 5
-	note G_, 0
+	note G_, 1
 	note __, 2
 	octave 4
-	note G_, 0
-	note __, 0
-	octave 5
-	note G_, 0
-	note __, 1
-	octave 4
-	note G_, 0
+	note G_, 1
 	octave 3
-	note G_, 0
-	note B_, 0
-	octave 4
-	note C_, 0
-	note D_, 0
-	note D#, 5
-	octave 5
-	note D#, 1
-	note __, 1
 	note G_, 1
-	note G#, 0
-	note __, 1
+	note B_, 1
 	octave 4
-	note G#, 0
-	note __, 1
+	note C_, 1
+	note D_, 1
+	note D#, 6
 	octave 5
-	note G#, 0
+	note D#, 2
 	note __, 2
+	note G_, 2
+	note G#, 1
+	note __, 2
 	octave 4
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 2
 	octave 5
-	note G#, 0
+	note G#, 1
+	note __, 3
+	octave 4
+	note G#, 1
 	note __, 1
+	octave 5
+	note G#, 1
+	note __, 2
 	octave 4
-	note G#, 0
+	note G#, 1
 	octave 6
-	note C#, 5
+	note C#, 6
 	octave 5
-	note G#, 0
-	note F_, 0
-	note B_, 0
-	note G_, 0
-	note F_, 0
-	note D_, 0
-	note G_, 0
-	note F_, 0
-	note D_, 0
+	note G#, 1
+	note F_, 1
+	note B_, 1
+	note G_, 1
+	note F_, 1
+	note D_, 1
+	note G_, 1
+	note F_, 1
+	note D_, 1
 	octave 4
-	note B_, 0
+	note B_, 1
 	octave 5
-	note G_, 0
-	note __, 1
-	octave 4
-	note G_, 0
-	note __, 1
-	octave 5
-	note G_, 0
+	note G_, 1
 	note __, 2
 	octave 4
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 2
 	octave 5
-	note G_, 0
-	note __, 1
+	note G_, 1
+	note __, 3
 	octave 4
-	note G_, 0
-	note C_, 0
-	note D_, 0
-	note D#, 0
-	note F_, 0
-	note G_, 5
-	octave 5
-	note D#, 1
-	note __, 1
 	note G_, 1
-	note G#, 0
 	note __, 1
+	octave 5
+	note G_, 1
+	note __, 2
 	octave 4
-	note G_, 0
-	note __, 1
+	note G_, 1
+	note C_, 1
+	note D_, 1
+	note D#, 1
+	note F_, 1
+	note G_, 6
 	octave 5
-	note G#, 0
+	note D#, 2
 	note __, 2
+	note G_, 2
+	note G#, 1
+	note __, 2
 	octave 4
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 2
 	octave 5
-	note G#, 0
-	note __, 1
+	note G#, 1
+	note __, 3
 	octave 4
-	note G_, 0
-	note C#, 3
-	note G#, 3
+	note G_, 1
+	note __, 1
 	octave 5
-	note F_, 6
-	note F#, 0
+	note G#, 1
+	note __, 2
+	octave 4
 	note G_, 1
+	note C#, 4
+	note G#, 4
+	octave 5
+	note F_, 7
+	note F#, 1
+	note G_, 2
 	intensity $24
-	note C_, 0
+	note C_, 1
 	octave 4
-	note G_, 0
+	note G_, 1
 	octave 5
-	note C_, 0
+	note C_, 1
 	octave 4
-	note G_, 0
+	note G_, 1
 	intensity $14
 	octave 5
-	note F#, 1
+	note F#, 2
 	intensity $24
-	note C_, 0
+	note C_, 1
 	octave 4
-	note G_, 0
+	note G_, 1
 	octave 5
-	note C_, 0
+	note C_, 1
 	octave 4
-	note G_, 0
+	note G_, 1
 	intensity $14
 	octave 5
-	note E_, 1
+	note E_, 2
 	intensity $24
-	note C_, 0
+	note C_, 1
 	octave 4
-	note G_, 0
+	note G_, 1
 	intensity $14
 	octave 5
-	note G_, 1
+	note G_, 2
 	intensity $24
-	note C_, 0
+	note C_, 1
 	octave 4
-	note G_, 0
+	note G_, 1
 	octave 5
-	note C_, 0
+	note C_, 1
 	octave 4
-	note G_, 0
+	note G_, 1
 	intensity $14
 	octave 5
-	note A_, 1
+	note A_, 2
 	intensity $24
-	note C_, 0
+	note C_, 1
 	octave 4
-	note G_, 0
+	note G_, 1
 	octave 5
-	note C_, 0
+	note C_, 1
 	octave 4
-	note G_, 0
+	note G_, 1
 	intensity $14
 	octave 5
-	note G_, 1
+	note G_, 2
 	intensity $24
-	note C_, 0
+	note C_, 1
 	octave 4
-	note G#, 0
+	note G#, 1
 	intensity $14
 	octave 5
-	note G#, 11
-	note G_, 1
+	note G#, 12
+	note G_, 2
+	note F_, 2
+	note G#, 2
+	note G_, 2
+	note C#, 1
 	note F_, 1
 	note G#, 1
-	note G_, 1
-	note C#, 0
-	note F_, 0
-	note G#, 0
 	octave 6
-	note C_, 0
-	note C#, 7
-	octave 5
 	note C_, 1
+	note C#, 8
+	octave 5
+	note C_, 2
 	intensity $24
 	octave 4
-	note E_, 0
-	note G_, 0
-	note E_, 0
-	note G_, 0
+	note E_, 1
+	note G_, 1
+	note E_, 1
+	note G_, 1
 	intensity $14
-	note A#, 1
+	note A#, 2
 	intensity $24
-	note E_, 0
-	note G_, 0
-	note E_, 0
-	note G_, 0
+	note E_, 1
+	note G_, 1
+	note E_, 1
+	note G_, 1
 	intensity $14
-	note G#, 1
+	note G#, 2
 	intensity $24
-	note E_, 0
-	note G_, 0
+	note E_, 1
+	note G_, 1
 	intensity $14
 	octave 5
-	note C#, 1
+	note C#, 2
 	intensity $24
 	octave 4
-	note E_, 0
-	note G_, 0
-	note E_, 0
-	note G_, 0
+	note E_, 1
+	note G_, 1
+	note E_, 1
+	note G_, 1
 	intensity $14
 	octave 5
-	note C_, 1
+	note C_, 2
 	intensity $24
 	octave 4
-	note E_, 0
-	note G_, 0
-	note E_, 0
-	note G_, 0
+	note E_, 1
+	note G_, 1
+	note E_, 1
+	note G_, 1
 	intensity $14
-	note A#, 1
+	note A#, 2
 	intensity $24
-	note E_, 0
-	note G_, 0
+	note E_, 1
+	note G_, 1
 	intensity $14
 	octave 5
-	note F_, 1
+	note F_, 2
 	intensity $24
 	octave 4
-	note G_, 0
+	note G_, 1
 	octave 5
-	note C_, 0
+	note C_, 1
 	octave 4
-	note G_, 0
+	note G_, 1
 	octave 5
-	note C_, 0
+	note C_, 1
 	intensity $14
-	note E_, 1
+	note E_, 2
 	intensity $24
 	octave 4
-	note G_, 0
+	note G_, 1
 	octave 5
-	note C_, 0
+	note C_, 1
 	octave 4
-	note G_, 0
+	note G_, 1
 	octave 5
-	note C_, 0
+	note C_, 1
 	intensity $14
-	note D_, 1
+	note D_, 2
 	intensity $24
 	octave 4
-	note G_, 0
+	note G_, 1
 	octave 5
-	note C_, 0
+	note C_, 1
 	intensity $14
 	octave 4
-	note A#, 3
+	note A#, 4
 	octave 5
-	note C_, 3
-	note D_, 3
-	note F_, 3
-	note G#, 15
+	note C_, 4
+	note D_, 4
+	note F_, 4
+	note G#, 16
 	notetype $6, $14
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
 	intensity $24
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
 	intensity $34
-	note G#, 0
-	note __, 0
-	note G#, 0
-	note __, 0
-	note G#, 0
-	note __, 0
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
+	note G#, 1
+	note __, 1
+	note G#, 1
+	note __, 1
+	note G#, 1
+	note __, 1
 	intensity $24
-	note G#, 0
-	note __, 0
-	note G#, 0
-	note __, 0
-	note G#, 0
-	note __, 0
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
+	note G#, 1
+	note __, 1
+	note G#, 1
+	note __, 1
+	note G#, 1
+	note __, 1
 	intensity $14
-	note G#, 0
-	note __, 0
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
+	note G#, 1
+	note __, 1
 	octave 6
-	note C#, 0
-	note __, 0
-	note C#, 0
-	note __, 0
-	note C#, 0
-	note __, 0
-	note C#, 0
-	note __, 0
+	note C#, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	note C#, 1
+	note __, 1
 	octave 5
-	note G_, 1
-	note F_, 1
-	note E_, 1
-	note F_, 1
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note F_, 2
 	notetype $c, $15
-	note G_, 11
-	note G_, 7
+	note G_, 12
+	note G_, 8
 	notetype $6, $15
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
 	intensity $24
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	intensity $14
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	notetype $c, $14
-	octave 2
-	note A#, 15
-	note A#, 0
+	note G_, 1
 	note __, 1
-	note A#, 0
+	note G_, 1
 	note __, 1
-	note A#, 0
-	note __, 0
-	octave 3
-	note A#, 0
+	intensity $14
+	note G_, 1
 	note __, 1
-	note A#, 0
+	note G_, 1
 	note __, 1
-	note A#, 0
-	note __, 0
-	note C_, 0
+	notetype $c, $14
+	octave 2
+	note A#, 16
+	note A#, 1
+	note __, 2
+	note A#, 1
+	note __, 2
+	note A#, 1
 	note __, 1
-	notetype $6, $15
-	note C_, 0
-	note __, 0
-	note C_, 1
-	octave 4
-	note C_, 1
 	octave 3
-	note C_, 3
+	note A#, 1
+	note __, 2
+	note A#, 1
+	note __, 2
+	note A#, 1
 	note __, 1
 	note C_, 1
-	note __, 1
+	note __, 2
+	notetype $6, $15
 	note C_, 1
-	octave 4
-	note C_, 1
 	note __, 1
+	note C_, 2
+	octave 4
+	note C_, 2
 	octave 3
-	note C_, 3
-	note C_, 1
-	note __, 3
-	note C_, 0
-	note __, 0
-	note C_, 1
+	note C_, 4
+	note __, 2
+	note C_, 2
+	note __, 2
+	note C_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
+	note __, 2
 	octave 3
-	note C_, 3
-	note __, 1
+	note C_, 4
+	note C_, 2
+	note __, 4
 	note C_, 1
 	note __, 1
-	note C_, 1
+	note C_, 2
+	octave 4
+	note C_, 2
+	octave 3
+	note C_, 4
+	note __, 2
+	note C_, 2
+	note __, 2
+	note C_, 2
 	octave 2
+	note A#, 2
+	note __, 2
+	note A#, 2
+	note __, 2
+	notetype $c, $14
+	note G#, 16
+	note G#, 16
+	note A#, 2
+	note __, 2
 	note A#, 1
+	note __, 3
+	note A#, 1
 	note __, 1
+	octave 3
 	note A#, 1
 	note __, 1
-	notetype $c, $14
-	note G#, 15
-	note G#, 15
+	octave 2
 	note A#, 1
 	note __, 1
-	note A#, 0
-	note __, 2
-	note A#, 0
-	note __, 0
 	octave 3
-	note A#, 0
-	note __, 0
-	octave 2
-	note A#, 0
-	note __, 0
-	octave 3
-	note A#, 0
-	note __, 0
-	note D_, 1
+	note A#, 1
 	note __, 1
-	note D_, 0
+	note D_, 2
 	note __, 2
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note __, 3
+	note D_, 1
+	note __, 1
 	octave 4
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
 	octave 2
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 3
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 5
-	note E_, 3
+	note E_, 4
 	octave 4
-	note C_, 0
-	note E_, 0
-	note G_, 0
-	note B_, 0
+	note C_, 1
+	note E_, 1
+	note G_, 1
+	note B_, 1
 	octave 5
-	note C_, 0
-	note __, 0
-	note E_, 0
-	note __, 4
-	note F_, 1
-	note E_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
+	note E_, 1
+	note __, 5
+	note F_, 2
+	note E_, 1
+	note __, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	octave 3
-	note G_, 0
+	note G_, 1
 	octave 4
-	note C_, 0
-	note E_, 0
-	note G_, 0
-	note E_, 0
-	note C_, 0
-	note E_, 0
-	note G_, 0
-	octave 5
-	note C_, 0
-	note E_, 0
-	note G_, 0
-	note F_, 3
-	octave 4
-	note C#, 0
-	note F_, 0
-	note G#, 0
-	octave 5
-	note C_, 0
-	note C#, 0
-	note __, 0
-	note F_, 0
-	note __, 4
-	note G#, 1
-	note G_, 0
-	note __, 4
-	note F_, 7
-	intensity $13
-	note G_, 5
-	note F#, 5
+	note C_, 1
 	note E_, 1
-	note __, 1
-	note G_, 5
-	note A_, 5
 	note G_, 1
-	note __, 1
-	note G#, 11
+	note E_, 1
+	note C_, 1
+	note E_, 1
 	note G_, 1
+	octave 5
+	note C_, 1
+	note E_, 1
+	note G_, 1
+	note F_, 4
+	octave 4
+	note C#, 1
 	note F_, 1
 	note G#, 1
+	octave 5
+	note C_, 1
+	note C#, 1
+	note __, 1
+	note F_, 1
+	note __, 5
+	note G#, 2
 	note G_, 1
-	note __, 3
+	note __, 5
+	note F_, 8
+	intensity $13
+	note G_, 6
+	note F#, 6
+	note E_, 2
+	note __, 2
+	note G_, 6
+	note A_, 6
+	note G_, 2
+	note __, 2
+	note G#, 12
+	note G_, 2
+	note F_, 2
+	note G#, 2
+	note G_, 2
+	note __, 4
 	octave 6
-	note C#, 7
+	note C#, 8
 	octave 5
-	note C_, 5
+	note C_, 6
 	octave 4
-	note A#, 5
-	note G#, 1
-	note __, 1
+	note A#, 6
+	note G#, 2
+	note __, 2
 	octave 5
-	note C#, 5
-	note C_, 5
+	note C#, 6
+	note C_, 6
 	octave 4
-	note A#, 1
-	note __, 1
+	note A#, 2
+	note __, 2
 	octave 5
-	note F_, 5
-	note E_, 5
-	note D_, 1
-	note __, 1
+	note F_, 6
+	note E_, 6
+	note D_, 2
+	note __, 2
 	octave 4
-	note A#, 3
+	note A#, 4
 	octave 5
-	note C_, 3
-	note D_, 3
-	note F_, 3
-	note G#, 15
-	note G#, 15
-	note G_, 15
-	note G_, 15
+	note C_, 4
+	note D_, 4
+	note F_, 4
+	note G#, 16
+	note G#, 16
+	note G_, 16
+	note G_, 16
 	loopchannel 0, Music_KantoWildBattle_branch_ed39e
 ; ed5c6
--- a/audio/music/lakeofrage.asm
+++ b/audio/music/lakeofrage.asm
@@ -15,85 +15,85 @@
 	stereopanning $f0
 	notetype $c, $b4
 	octave 3
-	note D_, 5
-	note D_, 9
-	note D_, 5
-	note D_, 5
-	note E_, 3
+	note D_, 6
+	note D_, 10
+	note D_, 6
+	note D_, 6
+	note E_, 4
 
 Music_LakeOfRage_branch_ee6e9: ; ee6e9
 	intensity $b5
-	note F#, 5
-	note E_, 5
-	note D_, 3
+	note F#, 6
+	note E_, 6
+	note D_, 4
 	octave 4
-	note D_, 5
-	note C_, 3
-	note E_, 1
-	note D_, 3
+	note D_, 6
+	note C_, 4
+	note E_, 2
+	note D_, 4
 	octave 3
-	note B_, 5
-	note G_, 1
+	note B_, 6
+	note G_, 2
 	notetype $8, $b5
-	note D_, 3
-	note G_, 3
-	note B_, 3
+	note D_, 4
+	note G_, 4
+	note B_, 4
 	notetype $c, $b4
-	note D_, 2
-	note F#, 0
+	note D_, 3
+	note F#, 1
 	intensity $b7
-	note A_, 7
-	note F#, 3
-	note A_, 2
+	note A_, 8
+	note F#, 4
+	note A_, 3
 	octave 4
-	note C#, 0
-	note D_, 11
+	note C#, 1
+	note D_, 12
 	notetype $8, $b4
 	octave 3
-	note C_, 3
+	note C_, 4
 	octave 2
-	note B_, 3
-	note A_, 3
+	note B_, 4
+	note A_, 4
 	notetype $8, $b7
-	note A_, 11
+	note A_, 12
 	notetype $c, $b7
 	octave 3
-	note C_, 11
+	note C_, 12
 	intensity $b4
-	note E_, 3
-	note D_, 1
+	note E_, 4
+	note D_, 2
 	intensity $b7
 	octave 2
-	note A_, 9
+	note A_, 10
 	intensity $b4
 	octave 3
-	note E_, 3
-	note D_, 2
-	note E_, 0
+	note E_, 4
+	note D_, 3
+	note E_, 1
 	intensity $b7
-	note F#, 7
-	note D_, 5
-	note C_, 0
-	note E_, 0
-	note C_, 7
-	note E_, 5
-	note E_, 0
-	note G_, 0
-	note E_, 7
-	note G_, 5
-	note F#, 0
-	note G_, 0
+	note F#, 8
+	note D_, 6
+	note C_, 1
+	note E_, 1
+	note C_, 8
+	note E_, 6
+	note E_, 1
+	note G_, 1
+	note E_, 8
+	note G_, 6
+	note F#, 1
+	note G_, 1
 	intensity $a0
-	note A_, 6
+	note A_, 7
 	intensity $a7
-	note A_, 6
-	note A_, 0
+	note A_, 7
+	note A_, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	intensity $a0
-	note D_, 5
+	note D_, 6
 	intensity $a7
-	note D_, 5
+	note D_, 6
 	loopchannel 0, Music_LakeOfRage_branch_ee6e9
 
 Music_LakeOfRage_Ch2: ; ee749
@@ -102,88 +102,88 @@
 	stereopanning $ff
 	notetype $c, $90
 	octave 3
-	note G_, 7
+	note G_, 8
 	intensity $97
-	note G_, 7
+	note G_, 8
 	intensity $a0
-	note A_, 7
+	note A_, 8
 	intensity $a7
-	note A_, 7
+	note A_, 8
 
 Music_LakeOfRage_branch_ee75e: ; ee75e
 	notetype $8, $c7
 	octave 4
-	note D_, 15
+	note D_, 16
 	octave 3
-	note A_, 3
+	note A_, 4
 	octave 4
-	note D_, 3
-	note A_, 15
+	note D_, 4
+	note A_, 16
 	octave 5
-	note C_, 3
+	note C_, 4
 	octave 4
-	note B_, 3
+	note B_, 4
 	notetype $c, $c7
-	note G_, 11
-	note B_, 3
-	note A_, 2
-	note G_, 0
+	note G_, 12
+	note B_, 4
+	note A_, 3
+	note G_, 1
 	intensity $b0
-	note F#, 11
+	note F#, 12
 	intensity $b7
-	note F#, 15
+	note F#, 16
 	notetype $8, $c3
 	octave 3
-	note G_, 3
-	note F#, 3
-	note E_, 3
-	note C_, 14
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note C_, 15
 	notetype $c, $c3
 	octave 4
-	note C_, 0
-	note E_, 0
-	note G_, 0
-	note __, 0
-	note E_, 0
-	note G_, 0
+	note C_, 1
+	note E_, 1
+	note G_, 1
+	note __, 1
+	note E_, 1
+	note G_, 1
 	intensity $c5
 	octave 5
-	note C_, 9
+	note C_, 10
 	intensity $c3
 	octave 4
-	note A_, 3
-	note G_, 3
-	note F#, 3
-	note E_, 1
+	note A_, 4
+	note G_, 4
+	note F#, 4
+	note E_, 2
 	notetype $8, $c3
-	note D_, 3
-	note E_, 3
-	note F#, 3
+	note D_, 4
+	note E_, 4
+	note F#, 4
 	notetype $8, $c7
-	note A_, 11
+	note A_, 12
 	notetype $8, $c3
 	octave 3
-	note G_, 3
-	note F#, 3
-	note E_, 3
+	note G_, 4
+	note F#, 4
+	note E_, 4
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note B_, 3
-	note A_, 3
+	note B_, 4
+	note A_, 4
 	octave 4
-	note E_, 3
-	note D_, 3
-	note C_, 3
-	note G_, 3
-	note F#, 3
-	note E_, 3
+	note E_, 4
+	note D_, 4
+	note C_, 4
+	note G_, 4
+	note F#, 4
+	note E_, 4
 	notetype $8, $c7
-	note F#, 15
-	note D_, 3
-	note F#, 3
+	note F#, 16
+	note D_, 4
+	note F#, 4
 	notetype $c, $c7
-	note A_, 15
+	note A_, 16
 	loopchannel 0, Music_LakeOfRage_branch_ee75e
 
 Music_LakeOfRage_Ch3: ; ee7c1
@@ -190,114 +190,114 @@
 	stereopanning $f
 	notetype $c, $16
 	octave 3
-	note G_, 3
-	note __, 1
-	note G_, 3
-	note __, 5
-	note F#, 3
-	note __, 1
-	note F#, 3
-	note __, 1
-	note E_, 3
+	note G_, 4
+	note __, 2
+	note G_, 4
+	note __, 6
+	note F#, 4
+	note __, 2
+	note F#, 4
+	note __, 2
+	note E_, 4
 
 Music_LakeOfRage_branch_ee7d0: ; ee7d0
 	octave 3
-	note D_, 3
+	note D_, 4
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note D_, 3
+	note D_, 4
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note D_, 1
-	note E_, 1
-	note F_, 3
-	note C_, 1
-	note F_, 3
-	note C_, 1
-	note F_, 1
-	note F#, 1
-	note G_, 3
-	note D_, 1
-	note G_, 3
-	note D_, 1
-	note G_, 1
-	note B_, 1
-	note A_, 1
-	note D_, 1
-	note F#, 1
-	note A_, 3
-	note D_, 1
-	note E_, 1
-	note F#, 1
-	note A_, 1
-	note F#, 1
-	note A_, 1
+	note D_, 2
+	note E_, 2
+	note F_, 4
+	note C_, 2
+	note F_, 4
+	note C_, 2
+	note F_, 2
+	note F#, 2
+	note G_, 4
+	note D_, 2
+	note G_, 4
+	note D_, 2
+	note G_, 2
+	note B_, 2
+	note A_, 2
+	note D_, 2
+	note F#, 2
+	note A_, 4
+	note D_, 2
+	note E_, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
 	octave 4
-	note D_, 3
+	note D_, 4
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note D_, 1
-	note F#, 1
+	note D_, 2
+	note F#, 2
 	octave 3
-	note E_, 3
-	note C_, 1
-	note E_, 3
-	note C_, 1
-	note E_, 1
-	note C_, 1
-	note G_, 3
-	note C_, 1
-	note G_, 3
-	note C_, 1
-	note G_, 1
-	note C_, 1
-	note F#, 3
-	note D_, 1
-	note F#, 3
-	note D_, 1
-	note F#, 1
-	note D_, 1
-	note A_, 1
-	note D_, 1
-	note F#, 1
+	note E_, 4
+	note C_, 2
+	note E_, 4
+	note C_, 2
+	note E_, 2
+	note C_, 2
+	note G_, 4
+	note C_, 2
+	note G_, 4
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note F#, 4
+	note D_, 2
+	note F#, 4
+	note D_, 2
+	note F#, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note F#, 2
 	octave 4
-	note D_, 3
+	note D_, 4
 	octave 3
-	note D_, 1
-	note E_, 1
-	note F#, 1
-	note G_, 3
-	note C_, 1
-	note G_, 3
-	note C_, 1
-	note G_, 1
-	note C_, 1
-	note G_, 3
-	note C_, 1
-	note G_, 3
-	note C_, 1
-	note G_, 1
-	note C_, 1
-	note F#, 3
-	note D_, 1
-	note F#, 3
-	note D_, 1
-	note F#, 1
-	note D_, 1
-	note D_, 3
+	note D_, 2
+	note E_, 2
+	note F#, 2
+	note G_, 4
+	note C_, 2
+	note G_, 4
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 4
+	note C_, 2
+	note G_, 4
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note F#, 4
+	note D_, 2
+	note F#, 4
+	note D_, 2
+	note F#, 2
+	note D_, 2
+	note D_, 4
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note D_, 3
+	note D_, 4
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	loopchannel 0, Music_LakeOfRage_branch_ee7d0
 
 Music_LakeOfRage_Ch4: ; ee835
@@ -306,24 +306,24 @@
 	notetype $c
 
 Music_LakeOfRage_branch_ee83b: ; ee83b
+	note D_, 2
 	note D_, 1
-	note D_, 0
-	note D_, 0
-	note G_, 1
 	note D_, 1
-	note D_, 0
-	note D_, 0
-	note F#, 5
+	note G_, 2
+	note D_, 2
 	note D_, 1
-	note D_, 0
-	note D_, 0
-	note G_, 1
 	note D_, 1
-	note D_, 0
-	note D_, 0
-	note F#, 2
-	note D_, 0
-	note D_, 0
-	note D_, 0
+	note F#, 6
+	note D_, 2
+	note D_, 1
+	note D_, 1
+	note G_, 2
+	note D_, 2
+	note D_, 1
+	note D_, 1
+	note F#, 3
+	note D_, 1
+	note D_, 1
+	note D_, 1
 	loopchannel 0, Music_LakeOfRage_branch_ee83b
 ; ee852
--- a/audio/music/lakeofragerocketradio.asm
+++ b/audio/music/lakeofragerocketradio.asm
@@ -16,11 +16,11 @@
 Music_LakeOfRageRocketRadio_branch_ef5c9: ; ef5c9
 	notetype $c, $a7
 	octave 7
-	note G_, 3
-	note F#, 3
-	note G_, 3
-	note F#, 3
-	note __, 15
+	note G_, 4
+	note F#, 4
+	note G_, 4
+	note F#, 4
+	note __, 16
 	loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9
 
 Music_LakeOfRageRocketRadio_Ch2: ; ef5d6
@@ -27,7 +27,7 @@
 	dutycycle $1
 	vibrato $13, $e8
 	notetype $c, $a7
-	note __, 1
+	note __, 2
 	stereopanning $f
 	loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9
 
@@ -34,6 +34,6 @@
 Music_LakeOfRageRocketRadio_Ch3: ; ef5e5
 	notetype $c, $26
 	vibrato $10, $44
-	note __, 3
+	note __, 4
 	loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9
 ; ef5f0
--- a/audio/music/lavendertown.asm
+++ b/audio/music/lavendertown.asm
@@ -13,143 +13,143 @@
 	vibrato $6, $24
 	dutycycle $0
 	notetype $c, $b3
-	note __, 15
-	note __, 15
-	note __, 15
-	note __, 15
+	note __, 16
+	note __, 16
+	note __, 16
+	note __, 16
 
 Music_LavenderTown_branch_ef74c: ; ef74c
 	callchannel Music_LavenderTown_branch_ef7fd
 	intensity $93
 	octave 5
-	note D_, 1
+	note D_, 2
 	intensity $43
-	note D_, 1
+	note D_, 2
 	intensity $93
-	note F#, 1
+	note F#, 2
 	intensity $43
-	note F#, 1
+	note F#, 2
 	intensity $93
-	note B_, 1
+	note B_, 2
 	intensity $43
-	note B_, 1
+	note B_, 2
 	intensity $93
-	note A_, 1
+	note A_, 2
 	intensity $43
-	note A_, 1
+	note A_, 2
 	callchannel Music_LavenderTown_branch_ef87f
 	intensity $93
 	intensity $93
-	note F_, 1
+	note F_, 2
 	intensity $83
-	note F_, 1
+	note F_, 2
 	intensity $93
-	note D_, 1
+	note D_, 2
 	intensity $43
-	note D_, 1
+	note D_, 2
 	intensity $93
 	octave 4
-	note B_, 1
+	note B_, 2
 	intensity $43
-	note B_, 1
+	note B_, 2
 	intensity $93
-	note G_, 1
+	note G_, 2
 	intensity $43
-	note G_, 1
+	note G_, 2
 	callchannel Music_LavenderTown_branch_ef7fd
 	intensity $93
 	octave 5
-	note D_, 1
+	note D_, 2
 	intensity $43
-	note D_, 1
+	note D_, 2
 	intensity $93
-	note G_, 1
+	note G_, 2
 	intensity $43
-	note G_, 1
+	note G_, 2
 	intensity $93
-	note B_, 1
+	note B_, 2
 	intensity $43
-	note B_, 1
+	note B_, 2
 	intensity $93
-	note G_, 1
+	note G_, 2
 	intensity $43
-	note G_, 1
+	note G_, 2
 	callchannel Music_LavenderTown_branch_ef87f
 	intensity $93
 	octave 6
-	note C_, 1
+	note C_, 2
 	intensity $43
-	note C_, 1
+	note C_, 2
 	intensity $93
 	octave 5
-	note G_, 1
+	note G_, 2
 	intensity $43
-	note G_, 1
+	note G_, 2
 	intensity $93
-	note E_, 1
+	note E_, 2
 	intensity $43
-	note E_, 1
+	note E_, 2
 	intensity $93
-	note C_, 1
+	note C_, 2
 	intensity $43
-	note C_, 1
+	note C_, 2
 	octave 3
-	note F_, 1
-	note A_, 1
+	note F_, 2
+	note A_, 2
 	octave 4
-	note C_, 1
-	note E_, 1
-	note F_, 1
-	note C_, 1
+	note C_, 2
+	note E_, 2
+	note F_, 2
+	note C_, 2
 	octave 3
-	note A_, 1
-	note F_, 1
+	note A_, 2
+	note F_, 2
 
 Music_LavenderTown_branch_ef7ca: ; ef7ca
 	octave 3
-	note C_, 1
-	note E_, 1
-	note G_, 1
-	note B_, 1
+	note C_, 2
+	note E_, 2
+	note G_, 2
+	note B_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G_, 1
-	note E_, 1
-	note C_, 1
-	note F_, 1
-	note A_, 1
+	note G_, 2
+	note E_, 2
+	note C_, 2
+	note F_, 2
+	note A_, 2
 	octave 4
-	note C_, 1
-	note E_, 1
-	note F_, 1
-	note C_, 1
+	note C_, 2
+	note E_, 2
+	note F_, 2
+	note C_, 2
 	octave 3
-	note A_, 1
-	note F_, 1
+	note A_, 2
+	note F_, 2
 	loopchannel 2, Music_LavenderTown_branch_ef7ca
-	note F#, 1
-	note A_, 1
+	note F#, 2
+	note A_, 2
 	octave 4
-	note C_, 1
-	note F#, 1
-	note A_, 1
-	note C_, 1
+	note C_, 2
+	note F#, 2
+	note A_, 2
+	note C_, 2
 	octave 3
-	note A_, 1
-	note F#, 1
-	note G_, 1
+	note A_, 2
+	note F#, 2
+	note G_, 2
 	octave 4
-	note C_, 1
-	note D_, 1
-	note F_, 1
-	note G_, 1
-	note F_, 1
-	note D_, 1
-	note C_, 1
+	note C_, 2
+	note D_, 2
+	note F_, 2
+	note G_, 2
+	note F_, 2
+	note D_, 2
+	note C_, 2
 	octave 3
-	note B_, 7
-	note B_, 7
+	note B_, 8
+	note B_, 8
 	loopchannel 0, Music_LavenderTown_branch_ef74c
 ; ef7fd
 
@@ -156,93 +156,93 @@
 Music_LavenderTown_branch_ef7fd: ; ef7fd
 	intensity $83
 	octave 5
-	note C_, 1
+	note C_, 2
 	intensity $43
-	note C_, 1
+	note C_, 2
 	intensity $83
-	note G_, 1
+	note G_, 2
 	intensity $43
-	note G_, 1
+	note G_, 2
 	intensity $83
 	octave 6
-	note C_, 1
+	note C_, 2
 	intensity $43
-	note C_, 1
+	note C_, 2
 	intensity $83
 	octave 5
-	note G_, 1
+	note G_, 2
 	intensity $43
-	note G_, 1
+	note G_, 2
 	intensity $83
-	note D_, 1
+	note D_, 2
 	intensity $43
-	note D_, 1
+	note D_, 2
 	intensity $83
-	note A_, 1
+	note A_, 2
 	intensity $43
-	note A_, 1
+	note A_, 2
 	intensity $83
 	octave 6
-	note D_, 1
+	note D_, 2
 	intensity $43
-	note D_, 1
+	note D_, 2
 	intensity $83
 	octave 5
-	note A_, 1
+	note A_, 2
 	intensity $43
-	note A_, 1
+	note A_, 2
 	intensity $83
-	note E_, 1
+	note E_, 2
 	intensity $43
-	note E_, 1
+	note E_, 2
 	intensity $83
-	note B_, 1
+	note B_, 2
 	intensity $43
-	note B_, 1
+	note B_, 2
 	intensity $83
 	octave 6
-	note E_, 1
+	note E_, 2
 	intensity $43
-	note E_, 1
+	note E_, 2
 	intensity $83
 	octave 5
-	note B_, 1
+	note B_, 2
 	intensity $43
-	note B_, 1
+	note B_, 2
 	intensity $83
-	note C#, 1
+	note C#, 2
 	intensity $43
-	note C#, 1
+	note C#, 2
 	intensity $83
-	note G_, 1
+	note G_, 2
 	intensity $43
-	note G_, 1
+	note G_, 2
 	intensity $83
-	note A#, 1
+	note A#, 2
 	intensity $43
-	note A#, 1
+	note A#, 2
 	intensity $83
-	note G_, 1
+	note G_, 2
 	intensity $43
-	note G_, 1
+	note G_, 2
 	intensity $83
-	note C_, 1
+	note C_, 2
 	intensity $43
-	note C_, 1
+	note C_, 2
 	intensity $83
-	note F_, 1
+	note F_, 2
 	intensity $43
-	note F_, 1
+	note F_, 2
 	intensity $83
 	octave 6
-	note C_, 1
+	note C_, 2
 	intensity $43
-	note C_, 1
+	note C_, 2
 	intensity $83
 	octave 5
-	note F_, 1
+	note F_, 2
 	intensity $43
-	note F_, 1
+	note F_, 2
 	endchannel
 ; ef87f
 
@@ -249,21 +249,21 @@
 Music_LavenderTown_branch_ef87f: ; ef87f
 	intensity $93
 	octave 5
-	note G_, 1
+	note G_, 2
 	intensity $83
-	note G_, 1
+	note G_, 2
 	intensity $83
-	note F_, 1
+	note F_, 2
 	intensity $43
-	note F_, 1
+	note F_, 2
 	intensity $83
-	note D_, 1
+	note D_, 2
 	intensity $43
-	note D_, 1
+	note D_, 2
 	intensity $83
-	note G_, 1
+	note G_, 2
 	intensity $43
-	note G_, 1
+	note G_, 2
 	endchannel
 
 Music_LavenderTown_Ch2: ; ef899
@@ -274,124 +274,124 @@
 Music_LavenderTown_branch_ef8a0: ; ef8a0
 	notetype $c, $a3
 	octave 5
-	note C_, 1
+	note C_, 2
 	intensity $63
-	note C_, 1
+	note C_, 2
 	intensity $a3
-	note G_, 1
+	note G_, 2
 	intensity $63
-	note G_, 1
+	note G_, 2
 	intensity $a3
-	note B_, 1
+	note B_, 2
 	intensity $63
-	note B_, 1
+	note B_, 2
 	intensity $a3
-	note F#, 1
+	note F#, 2
 	intensity $63
-	note F#, 1
+	note F#, 2
 	loopchannel 3, Music_LavenderTown_branch_ef8a0
 	intensity $a3
-	note C_, 1
+	note C_, 2
 	intensity $63
-	note C_, 1
+	note C_, 2
 	intensity $a3
-	note G_, 1
+	note G_, 2
 	intensity $63
-	note G_, 1
+	note G_, 2
 	intensity $a3
-	note B_, 1
+	note B_, 2
 	intensity $63
-	note B_, 1
+	note B_, 2
 	intensity $a3
 	octave 6
-	note D_, 1
+	note D_, 2
 	intensity $63
-	note D_, 1
+	note D_, 2
 
 Music_LavenderTown_branch_ef8d7: ; ef8d7
 	intensity $b5
 	callchannel Music_LavenderTown_branch_ef915
 	octave 2
-	note F#, 3
+	note F#, 4
 	octave 3
-	note C_, 3
-	note F#, 3
-	note A_, 3
+	note C_, 4
+	note F#, 4
+	note A_, 4
 	octave 2
-	note G_, 3
+	note G_, 4
 	octave 3
-	note C_, 3
-	note D_, 3
-	note G_, 3
-	note F_, 3
-	note D_, 3
+	note C_, 4
+	note D_, 4
+	note G_, 4
+	note F_, 4
+	note D_, 4
 	octave 2
-	note B_, 3
-	note G_, 3
+	note B_, 4
+	note G_, 4
 	callchannel Music_LavenderTown_branch_ef915
 	octave 2
-	note G_, 3
+	note G_, 4
 	octave 3
-	note C_, 3
-	note F_, 3
-	note G_, 3
-	note C_, 3
-	note F_, 3
-	note G_, 3
-	note F_, 3
-	note C_, 3
-	note E_, 3
-	note G_, 3
+	note C_, 4
+	note F_, 4
+	note G_, 4
+	note C_, 4
+	note F_, 4
+	note G_, 4
+	note F_, 4
+	note C_, 4
+	note E_, 4
+	note G_, 4
 	octave 4
-	note C_, 3
+	note C_, 4
 	intensity $b7
 	octave 2
-	note F_, 15
-	note C_, 15
-	note F_, 15
-	note C_, 15
-	note F_, 15
-	note F#, 15
-	note G_, 15
+	note F_, 16
+	note C_, 16
+	note F_, 16
+	note C_, 16
+	note F_, 16
+	note F#, 16
+	note G_, 16
 	octave 1
-	note G_, 7
+	note G_, 8
 	intensity $57
 	octave 5
-	note D_, 0
-	note F_, 0
-	note G_, 5
+	note D_, 1
+	note F_, 1
+	note G_, 6
 	loopchannel 0, Music_LavenderTown_branch_ef8d7
 ; ef915
 
 Music_LavenderTown_branch_ef915: ; ef915
 	octave 2
-	note C_, 3
-	note G_, 3
+	note C_, 4
+	note G_, 4
 	octave 3
-	note E_, 3
+	note E_, 4
 	octave 2
-	note G_, 3
-	note D_, 3
-	note A_, 3
+	note G_, 4
+	note D_, 4
+	note A_, 4
 	octave 3
-	note F_, 3
+	note F_, 4
 	octave 2
-	note A_, 3
-	note E_, 3
-	note B_, 3
+	note A_, 4
+	note E_, 4
+	note B_, 4
 	octave 3
-	note G_, 3
-	note F_, 3
-	note E_, 3
-	note C#, 3
+	note G_, 4
+	note F_, 4
+	note E_, 4
+	note C#, 4
 	octave 2
-	note A#, 3
-	note G_, 3
-	note F_, 3
+	note A#, 4
+	note G_, 4
+	note F_, 4
 	octave 3
-	note C_, 3
-	note A_, 3
-	note C_, 3
+	note C_, 4
+	note A_, 4
+	note C_, 4
 	endchannel
 
 Music_LavenderTown_Ch3: ; ef932
@@ -398,127 +398,127 @@
 	vibrato $12, $24
 	notetype $c, $13
 	stereopanning $f0
-	note __, 15
-	note __, 15
-	note __, 15
-	note __, 7
+	note __, 16
+	note __, 16
+	note __, 16
+	note __, 8
 	octave 5
-	note E_, 3
-	note F_, 3
+	note E_, 4
+	note F_, 4
 
 Music_LavenderTown_branch_ef941: ; ef941
 	intensity $12
 	octave 5
-	note G_, 3
-	note __, 3
-	note G_, 3
-	note __, 3
-	note E_, 3
-	note __, 3
-	note E_, 3
-	note F_, 3
-	note G_, 3
-	note F_, 3
-	note E_, 3
-	note B_, 3
-	note C#, 7
-	note __, 1
-	note C#, 1
-	note D_, 1
-	note E_, 1
-	note F_, 9
-	note G_, 1
-	note F_, 1
-	note E_, 1
-	note D_, 7
+	note G_, 4
+	note __, 4
+	note G_, 4
+	note __, 4
+	note E_, 4
+	note __, 4
+	note E_, 4
+	note F_, 4
+	note G_, 4
+	note F_, 4
+	note E_, 4
+	note B_, 4
+	note C#, 8
+	note __, 2
+	note C#, 2
+	note D_, 2
+	note E_, 2
+	note F_, 10
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 8
 	octave 4
-	note A_, 3
+	note A_, 4
 	octave 5
-	note D_, 3
-	note E_, 11
-	note F_, 1
-	note E_, 1
-	note D_, 11
-	note E_, 1
-	note F_, 1
-	note G_, 3
-	note __, 3
-	note G_, 3
-	note __, 3
-	note E_, 3
-	note __, 3
-	note E_, 3
-	note F_, 3
-	note G_, 3
-	note F_, 3
-	note E_, 3
-	note B_, 3
-	note C#, 7
-	note __, 1
-	note C#, 1
-	note D_, 1
-	note E_, 1
-	note F_, 9
-	note G_, 1
-	note F_, 1
-	note E_, 1
-	note D_, 11
-	note C_, 1
-	note D_, 1
-	note C_, 15
-	note C_, 11
-	note __, 3
+	note D_, 4
+	note E_, 12
+	note F_, 2
+	note E_, 2
+	note D_, 12
+	note E_, 2
+	note F_, 2
+	note G_, 4
+	note __, 4
+	note G_, 4
+	note __, 4
+	note E_, 4
+	note __, 4
+	note E_, 4
+	note F_, 4
+	note G_, 4
+	note F_, 4
+	note E_, 4
+	note B_, 4
+	note C#, 8
+	note __, 2
+	note C#, 2
+	note D_, 2
+	note E_, 2
+	note F_, 10
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 12
+	note C_, 2
+	note D_, 2
+	note C_, 16
+	note C_, 12
+	note __, 4
 	intensity $24
-	note A_, 1
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	note B_, 2
 	octave 6
-	note C_, 3
+	note C_, 4
 	octave 5
-	note G_, 3
-	note F_, 3
-	note E_, 3
-	note D_, 3
-	note C_, 3
-	note A_, 1
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	note G_, 4
+	note F_, 4
+	note E_, 4
+	note D_, 4
+	note C_, 4
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	note B_, 2
 	octave 6
-	note C_, 3
+	note C_, 4
 	octave 5
-	note G_, 3
+	note G_, 4
 	octave 6
-	note F_, 3
+	note F_, 4
 	notetype $8, $24
-	note E_, 1
-	note F_, 1
-	note E_, 1
+	note E_, 2
+	note F_, 2
+	note E_, 2
 	notetype $c, $24
-	note D_, 3
-	note C_, 3
+	note D_, 4
+	note C_, 4
 	octave 5
-	note A_, 1
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	note B_, 2
 	octave 6
-	note C_, 3
+	note C_, 4
 	octave 5
-	note G_, 3
-	note A_, 1
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	note G_, 4
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	note B_, 2
 	octave 6
-	note C_, 3
-	note C#, 3
-	note D_, 11
-	note C_, 3
+	note C_, 4
+	note C#, 4
+	note D_, 12
+	note C_, 4
 	octave 5
-	note B_, 11
-	note E_, 1
-	note F_, 1
+	note B_, 12
+	note E_, 2
+	note F_, 2
 	loopchannel 0, Music_LavenderTown_branch_ef941
 ; ef9bc
--- a/audio/music/lighthouse.asm
+++ b/audio/music/lighthouse.asm
@@ -17,118 +17,118 @@
 Music_Lighthouse_branch_ee584: ; ee584
 	notetype $c, $b3
 	octave 3
-	note C#, 7
+	note C#, 8
 	octave 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note B_, 2
+	octave 3
+	note C#, 4
+	octave 2
+	note B_, 4
+	note A_, 4
+	note B_, 4
+	note G#, 1
+	note __, 7
+	octave 3
+	note C_, 4
+	octave 2
+	note G#, 1
+	note __, 1
+	note G#, 1
+	note __, 1
+	note G#, 1
+	note __, 1
+	note C_, 2
+	note D#, 1
+	note __, 1
 	note F#, 1
+	note __, 1
 	note G#, 1
+	note __, 1
 	note A_, 1
-	note B_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
 	octave 3
-	note C#, 3
+	note C#, 8
 	octave 2
-	note B_, 3
-	note A_, 3
-	note B_, 3
-	note G#, 0
-	note __, 6
+	note C#, 2
+	note F#, 2
+	note G#, 2
 	octave 3
-	note C_, 3
+	note C_, 2
+	note D_, 2
+	note C#, 2
 	octave 2
-	note G#, 0
-	note __, 0
-	note G#, 0
-	note __, 0
-	note G#, 0
-	note __, 0
-	note C_, 1
-	note D#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note G#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	octave 3
-	note C#, 7
-	octave 2
-	note C#, 1
-	note F#, 1
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note A_, 2
 	note G#, 1
+	note __, 7
 	octave 3
-	note C_, 1
-	note D_, 1
-	note C#, 1
+	note C_, 12
 	octave 2
-	note A_, 1
 	note G#, 1
-	note A_, 1
+	note __, 1
 	note G#, 1
-	note F#, 1
-	note A_, 1
-	note G#, 0
-	note __, 6
+	note __, 1
+	note G#, 1
+	note __, 3
 	octave 3
-	note C_, 11
+	note C_, 1
+	note __, 3
 	octave 2
-	note G#, 0
-	note __, 0
-	note G#, 0
-	note __, 0
-	note G#, 0
-	note __, 2
+	note A_, 4
 	octave 3
-	note C_, 0
-	note __, 2
+	note A_, 4
+	note G#, 4
+	note F#, 4
+	note E_, 4
+	note D#, 4
+	note C#, 4
+	note E_, 4
+	note F#, 2
+	note E_, 2
+	note D#, 12
 	octave 2
-	note A_, 3
+	note B_, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G#, 8
+	note A_, 4
 	octave 3
-	note A_, 3
-	note G#, 3
-	note F#, 3
-	note E_, 3
-	note D#, 3
-	note C#, 3
-	note E_, 3
-	note F#, 1
-	note E_, 1
-	note D#, 11
+	note A_, 4
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note C#, 2
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
-	note A_, 1
-	note G#, 7
-	note A_, 3
+	note B_, 2
+	note A_, 2
+	note B_, 2
 	octave 3
-	note A_, 3
-	note G#, 1
-	note F#, 1
-	note E_, 1
-	note F#, 1
-	note E_, 1
-	note D#, 1
-	note C#, 1
+	note C#, 2
+	note D#, 2
+	note E_, 2
+	note F#, 2
+	note G#, 12
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
-	octave 3
-	note C#, 1
-	note D#, 1
-	note E_, 1
-	note F#, 1
-	note G#, 11
-	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
-	note A_, 1
-	note G#, 7
+	note B_, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G#, 8
 	loopchannel 0, Music_Lighthouse_branch_ee584
 
 Music_Lighthouse_Ch2: ; ee5fc
@@ -139,79 +139,79 @@
 Music_Lighthouse_branch_ee604: ; ee604
 	notetype $c, $c5
 	octave 3
-	note G#, 11
-	note F#, 1
-	note G#, 1
-	note A_, 7
+	note G#, 12
+	note F#, 2
+	note G#, 2
+	note A_, 8
 	octave 4
-	note C#, 7
-	note C_, 0
-	note __, 6
+	note C#, 8
+	note C_, 1
+	note __, 7
 	octave 3
-	note G#, 15
+	note G#, 16
 	intensity $c5
-	note C#, 0
-	note __, 0
-	note C#, 0
-	note __, 0
-	note C#, 0
-	note __, 0
-	note C#, 0
-	note __, 0
-	note G#, 11
-	note F#, 1
-	note G#, 1
-	note A_, 7
+	note C#, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	note G#, 12
+	note F#, 2
+	note G#, 2
+	note A_, 8
 	octave 4
-	note C#, 7
-	note C_, 0
-	note __, 6
-	note D#, 11
+	note C#, 8
+	note C_, 1
+	note __, 7
+	note D#, 12
 	octave 3
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note __, 2
-	note D#, 0
-	note __, 2
-	octave 4
-	note E_, 11
 	note D#, 1
-	note C#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 3
+	note D#, 1
+	note __, 3
+	octave 4
+	note E_, 12
+	note D#, 2
+	note C#, 2
 	octave 3
-	note G#, 11
-	note A#, 3
-	note B_, 1
+	note G#, 12
+	note A#, 4
+	note B_, 2
 	octave 4
-	note C#, 1
-	note D#, 11
+	note C#, 2
+	note D#, 12
 	octave 3
-	note D#, 1
-	note C#, 1
-	note D#, 1
-	note C#, 1
-	note C_, 7
+	note D#, 2
+	note C#, 2
+	note D#, 2
+	note C#, 2
+	note C_, 8
 	octave 4
-	note E_, 11
-	note D#, 1
-	note C#, 1
+	note E_, 12
+	note D#, 2
+	note C#, 2
 	octave 3
-	note G#, 11
+	note G#, 12
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note C_, 1
-	note D#, 11
+	note C_, 2
+	note D#, 12
 	octave 3
-	note D#, 1
-	note C#, 1
-	note D#, 1
-	note C#, 1
-	note C_, 7
+	note D#, 2
+	note C#, 2
+	note D#, 2
+	note C#, 2
+	note C_, 8
 	loopchannel 0, Music_Lighthouse_branch_ee604
 
 Music_Lighthouse_Ch3: ; ee656
@@ -220,79 +220,79 @@
 
 Music_Lighthouse_branch_ee65b: ; ee65b
 	octave 2
-	note G#, 1
-	note __, 1
-	note D#, 1
-	note __, 1
-	note F#, 1
-	note __, 1
-	note G_, 1
-	note __, 1
+	note G#, 2
+	note __, 2
+	note D#, 2
+	note __, 2
+	note F#, 2
+	note __, 2
+	note G_, 2
+	note __, 2
 
 Music_Lighthouse_branch_ee664: ; ee664
-	note G#, 1
-	note __, 1
-	note D#, 1
-	note __, 1
-	note F#, 1
-	note __, 1
-	note A_, 1
-	note __, 1
+	note G#, 2
+	note __, 2
+	note D#, 2
+	note __, 2
+	note F#, 2
+	note __, 2
+	note A_, 2
+	note __, 2
 	loopchannel 2, Music_Lighthouse_branch_ee664
-	note G#, 1
-	note __, 1
-	note D#, 1
-	note __, 1
-	note F#, 1
-	note __, 1
-	note A_, 1
+	note G#, 2
+	note __, 2
+	note D#, 2
+	note __, 2
+	note F#, 2
+	note __, 2
+	note A_, 2
 	octave 3
-	note C_, 1
-	note C#, 1
-	note __, 1
+	note C_, 2
+	note C#, 2
+	note __, 2
 	octave 2
-	note G#, 1
-	note __, 1
-	note A_, 1
-	note __, 1
+	note G#, 2
+	note __, 2
+	note A_, 2
+	note __, 2
 	octave 3
-	note C_, 1
-	note __, 1
+	note C_, 2
+	note __, 2
 
 Music_Lighthouse_branch_ee683: ; ee683
-	note C#, 1
-	note __, 1
+	note C#, 2
+	note __, 2
 	octave 2
-	note G#, 1
-	note __, 1
-	note A_, 1
-	note __, 1
+	note G#, 2
+	note __, 2
+	note A_, 2
+	note __, 2
 	octave 3
-	note D_, 1
-	note __, 1
+	note D_, 2
+	note __, 2
 	loopchannel 2, Music_Lighthouse_branch_ee683
-	note C#, 1
-	note __, 1
+	note C#, 2
+	note __, 2
 	octave 2
-	note G#, 1
-	note __, 1
-	note A_, 1
-	note __, 1
+	note G#, 2
+	note __, 2
+	note A_, 2
+	note __, 2
 	octave 3
-	note D#, 1
-	note F#, 1
+	note D#, 2
+	note F#, 2
 
 Music_Lighthouse_branch_ee69b: ; ee69b
-	note E_, 1
-	note __, 1
+	note E_, 2
+	note __, 2
 	octave 2
-	note B_, 1
-	note __, 1
+	note B_, 2
+	note __, 2
 	octave 3
-	note C_, 1
-	note __, 1
-	note F_, 1
-	note __, 1
+	note C_, 2
+	note __, 2
+	note F_, 2
+	note __, 2
 	loopchannel 8, Music_Lighthouse_branch_ee69b
 	loopchannel 0, Music_Lighthouse_branch_ee65b
 
@@ -302,18 +302,18 @@
 
 Music_Lighthouse_branch_ee6b1: ; ee6b1
 	stereopanning $f
-	note G#, 3
-	note F_, 1
-	note G#, 3
-	note F_, 1
-	note A_, 1
-	note A#, 1
+	note G#, 4
+	note F_, 2
+	note G#, 4
+	note F_, 2
+	note A_, 2
+	note A#, 2
 	stereopanning $ff
-	note G#, 1
-	note F_, 3
-	note G#, 1
-	note F_, 3
-	note G#, 1
-	note A_, 1
+	note G#, 2
+	note F_, 4
+	note G#, 2
+	note F_, 4
+	note G#, 2
+	note A_, 2
 	loopchannel 0, Music_Lighthouse_branch_ee6b1
 ; ee6c5
--- a/audio/music/lookbeauty.asm
+++ b/audio/music/lookbeauty.asm
@@ -13,70 +13,70 @@
 	tempo 128
 	volume $77
 	notetype $c, $a3
-	note __, 15
-	note __, 7
+	note __, 16
+	note __, 8
 	octave 4
-	note C_, 7
+	note C_, 8
 	dutycycle $3
 
 Music_LookBeauty_branch_eee5f: ; eee5f
-	note __, 3
-	octave 3
-	note D_, 0
 	note __, 4
-	note D_, 0
-	note __, 4
-	note __, 1
-	note D_, 0
+	octave 3
+	note D_, 1
+	note __, 5
+	note D_, 1
+	note __, 5
 	note __, 2
-	note D_, 0
-	note __, 4
-	note D_, 3
+	note D_, 1
 	note __, 3
-	note D_, 0
+	note D_, 1
+	note __, 5
+	note D_, 4
 	note __, 4
-	note D_, 0
-	note __, 4
-	note __, 1
-	note D_, 0
+	note D_, 1
+	note __, 5
+	note D_, 1
+	note __, 5
 	note __, 2
-	note D_, 0
-	note __, 2
 	note D_, 1
-	note __, 1
+	note __, 3
 	note D_, 1
 	note __, 3
-	note E_, 0
+	note D_, 2
+	note __, 2
+	note D_, 2
 	note __, 4
-	note E_, 0
-	note __, 4
-	note __, 1
-	note E_, 0
+	note E_, 1
+	note __, 5
+	note E_, 1
+	note __, 5
 	note __, 2
-	note E_, 0
-	note __, 0
-	note E_, 0
-	note __, 2
-	note E_, 3
+	note E_, 1
 	note __, 3
-	note F#, 0
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 3
+	note E_, 4
 	note __, 4
-	note F#, 0
-	note __, 2
+	note F#, 1
+	note __, 5
+	note F#, 1
+	note __, 3
+	note D_, 2
 	note D_, 1
-	note D_, 0
-	note __, 6
+	note __, 7
 	octave 2
-	note A_, 0
+	note A_, 1
 	octave 3
-	note C_, 0
-	note D#, 0
-	note F#, 0
-	note D#, 0
-	note F#, 0
-	note A_, 0
+	note C_, 1
+	note D#, 1
+	note F#, 1
+	note D#, 1
+	note F#, 1
+	note A_, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	loopchannel 0, Music_LookBeauty_branch_eee5f
 
 Music_LookBeauty_Ch2: ; eee9c
@@ -85,76 +85,76 @@
 	dutycycle $2
 	notetype $c, $c7
 	octave 3
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
 	octave 5
-	note D_, 5
-	note C_, 0
-	note __, 0
+	note D_, 6
+	note C_, 1
+	note __, 1
 	octave 4
-	note B_, 0
-	note __, 0
-	note A#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note G#, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note F_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
+	note A#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note G#, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note F_, 1
+	note __, 1
+	note E_, 2
+	note D_, 1
+	note __, 1
 	note E_, 1
-	note D_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
+	note __, 1
+	note F#, 1
+	note __, 1
 	dutycycle $3
 
 Music_LookBeauty_branch_eeec5: ; eeec5
 	notetype $c, $c7
-	note G_, 15
-	note A_, 7
-	note B_, 7
-	note A_, 9
-	note G#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note G_, 16
+	note A_, 8
+	note B_, 8
+	note A_, 10
 	note G#, 1
-	note G#, 7
 	note __, 1
-	note F_, 1
+	note A_, 1
 	note __, 1
-	note E_, 1
+	note G#, 2
+	note G#, 8
+	note __, 2
+	note F_, 2
+	note __, 2
+	note E_, 2
 	intensity $b7
 	vibrato $10, $24
 	octave 5
-	note C_, 14
+	note C_, 15
 	notetype $6, $c7
 	intensity $c5
 	vibrato $10, $23
-	note __, 0
-	note C#, 0
-	note D_, 15
-	note C_, 15
+	note __, 1
+	note C#, 1
+	note D_, 16
+	note C_, 16
 	octave 4
-	note B_, 15
-	note __, 3
+	note B_, 16
+	note __, 4
 	octave 5
-	note D_, 1
-	note __, 1
+	note D_, 2
+	note __, 2
 	octave 4
-	note B_, 1
-	note __, 1
-	note A_, 5
-	note __, 13
-	note F#, 7
-	note A_, 7
+	note B_, 2
+	note __, 2
+	note A_, 6
+	note __, 14
+	note F#, 8
+	note A_, 8
 	loopchannel 0, Music_LookBeauty_branch_eeec5
 
 Music_LookBeauty_Ch3: ; eeefa
@@ -161,148 +161,148 @@
 	stereopanning $ff
 	vibrato $8, $12
 	notetype $c, $15
-	note __, 15
+	note __, 16
 	octave 5
-	note E_, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note C#, 0
-	note __, 0
+	note E_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note C#, 1
+	note __, 1
 	octave 3
-	note D_, 6
-	note F#, 0
+	note D_, 7
+	note F#, 1
 
 Music_LookBeauty_branch_eef0f: ; eef0f
-	note G_, 3
+	note G_, 4
 	octave 4
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 3
-	note G_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
 	octave 4
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 3
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
+	note G_, 2
 	note G_, 1
-	note G_, 0
 	octave 4
-	note A#, 0
-	note B_, 0
-	note __, 0
+	note A#, 1
+	note B_, 1
+	note __, 1
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 4
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 3
-	note D_, 0
-	note __, 2
+	note D_, 1
+	note __, 3
 	octave 4
-	note B_, 3
+	note B_, 4
 	octave 3
-	note E_, 3
+	note E_, 4
 	octave 4
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 3
-	note E_, 0
-	note __, 0
+	note E_, 1
+	note __, 1
 	octave 2
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 4
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
 	octave 2
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 3
+	note E_, 2
 	note E_, 1
-	note E_, 0
 	octave 4
-	note G_, 0
-	note G#, 0
-	note __, 0
+	note G_, 1
+	note G#, 1
+	note __, 1
 	octave 3
-	note E_, 0
-	note __, 0
+	note E_, 1
+	note __, 1
 	octave 4
-	note F#, 0
+	note F#, 1
+	note __, 3
+	note G#, 2
 	note __, 2
-	note G#, 1
-	note __, 1
-	note B_, 1
+	note B_, 2
 	octave 3
-	note A_, 3
+	note A_, 4
 	octave 5
-	note C_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
 	octave 3
-	note A_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
 	octave 5
-	note C_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
 	octave 3
-	note E_, 0
-	note __, 0
+	note E_, 1
+	note __, 1
+	note A_, 2
 	note A_, 1
-	note A_, 0
 	octave 4
-	note B_, 0
+	note B_, 1
 	octave 5
-	note C_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
 	octave 3
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
 	octave 5
-	note C_, 0
-	note __, 0
-	note D_, 0
-	note __, 2
-	note C_, 3
+	note C_, 1
+	note __, 1
+	note D_, 1
+	note __, 3
+	note C_, 4
 	octave 3
-	note D_, 3
+	note D_, 4
 	octave 4
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 3
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
 	octave 2
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
 	octave 4
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
 	octave 2
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
 	octave 4
+	note A_, 2
 	note A_, 1
-	note A_, 0
-	note __, 6
+	note __, 7
 	octave 3
-	note D_, 7
+	note D_, 8
 	loopchannel 0, Music_LookBeauty_branch_eef0f
 
 Music_LookBeauty_Ch4: ; eef8b
 	togglenoise $3
 	notetype $c
-	note __, 15
-	note __, 15
+	note __, 16
+	note __, 16
 
 Music_LookBeauty_branch_eef91: ; eef91
 	callchannel Music_LookBeauty_branch_eefa1
@@ -313,21 +313,21 @@
 ; eefa1
 
 Music_LookBeauty_branch_eefa1: ; eefa1
-	note F#, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
-	note G_, 1
-	note F#, 1
-	note D_, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
+	note F#, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note G_, 2
+	note F#, 2
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
 	endchannel
 ; eefb2
--- a/audio/music/lookhiker.asm
+++ b/audio/music/lookhiker.asm
@@ -15,60 +15,60 @@
 	stereopanning $f
 	notetype $c, $68
 	octave 3
-	note F#, 1
-	note F_, 1
-	note F#, 7
+	note F#, 2
+	note F_, 2
+	note F#, 8
 
 Music_LookHiker_branch_f7433: ; f7433
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note __, 3
-	note F#, 1
-	note __, 3
-	note F#, 1
-	note __, 1
-	note F#, 1
-	note __, 5
+	note D_, 2
+	note D#, 2
+	note E_, 2
+	note F_, 2
+	note F#, 2
+	note __, 4
+	note F#, 2
+	note __, 4
+	note F#, 2
+	note __, 2
+	note F#, 2
+	note __, 6
 	loopchannel 0, Music_LookHiker_branch_f7433
 
 Music_LookHiker_Ch2: ; f7443
 	dutycycle $0
 	notetype $c, $a1
-	note __, 3
+	note __, 4
 	octave 1
-	note B_, 0
-	note B_, 4
+	note B_, 1
+	note B_, 5
 	octave 2
-	note F#, 0
-	note F#, 4
+	note F#, 1
+	note F#, 5
 	octave 1
-	note B_, 0
+	note B_, 1
 	octave 2
-	note D_, 0
-	note F#, 0
-	note D_, 0
+	note D_, 1
+	note F#, 1
+	note D_, 1
 	intensity $a1
 
 Music_LookHiker_branch_f7457: ; f7457
 	octave 1
-	note B_, 0
 	note B_, 1
+	note B_, 2
 	octave 2
-	note D_, 0
 	note D_, 1
-	note F#, 0
+	note D_, 2
 	note F#, 1
-	note A#, 0
+	note F#, 2
 	note A#, 1
+	note A#, 2
 	octave 1
-	note B_, 0
+	note B_, 1
 	octave 2
-	note D_, 0
-	note F#, 0
-	note D_, 0
+	note D_, 1
+	note F#, 1
+	note D_, 1
 	loopchannel 0, Music_LookHiker_branch_f7457
 
 Music_LookHiker_Ch3: ; f746b
@@ -76,21 +76,21 @@
 	stereopanning $f0
 	notetype $c, $14
 	octave 4
-	note B_, 1
-	note A#, 1
-	note B_, 7
+	note B_, 2
+	note A#, 2
+	note B_, 8
 
 Music_LookHiker_branch_f7477: ; f7477
 	octave 5
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
+	note D#, 2
+	note D_, 2
+	note C#, 2
+	note C_, 2
 	callchannel Music_LookHiker_branch_f748a
-	note G_, 1
-	note G#, 1
-	note A_, 1
-	note A#, 1
+	note G_, 2
+	note G#, 2
+	note A_, 2
+	note A#, 2
 	callchannel Music_LookHiker_branch_f748a
 	loopchannel 0, Music_LookHiker_branch_f7477
 ; f748a
@@ -97,26 +97,26 @@
 
 Music_LookHiker_branch_f748a: ; f748a
 	octave 4
-	note B_, 1
-	note __, 3
-	note B_, 1
-	note __, 3
-	note B_, 1
-	note __, 1
-	note B_, 1
-	note __, 5
+	note B_, 2
+	note __, 4
+	note B_, 2
+	note __, 4
+	note B_, 2
+	note __, 2
+	note B_, 2
+	note __, 6
 	endchannel
 
 Music_LookHiker_Ch4: ; f7494
 	togglenoise $3
 	notetype $c
-	note F_, 3
-	note __, 15
+	note F_, 4
+	note __, 16
 
 Music_LookHiker_branch_f749a: ; f749a
-	note D#, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
+	note D#, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
 	loopchannel 0, Music_LookHiker_branch_f749a
 ; f74a2
--- a/audio/music/lookkimonogirl.asm
+++ b/audio/music/lookkimonogirl.asm
@@ -27,28 +27,28 @@
 	callchannel Music_LookKimonoGirl_branch_f7a34
 	intensity $b4
 	octave 3
-	note E_, 0
+	note E_, 1
 	intensity $54
 	octave 4
-	note E_, 0
+	note E_, 1
 	intensity $b4
 	octave 3
-	note D_, 0
+	note D_, 1
 	intensity $54
 	octave 4
-	note D_, 0
+	note D_, 1
 	intensity $b4
 	octave 2
-	note B_, 0
+	note B_, 1
 	intensity $54
 	octave 3
-	note B_, 0
+	note B_, 1
 	intensity $b4
 	octave 2
-	note A_, 0
+	note A_, 1
 	intensity $54
 	octave 3
-	note A_, 0
+	note A_, 1
 	loopchannel 0, Music_LookKimonoGirl_branch_f79d7
 ; f7a13
 
@@ -55,28 +55,28 @@
 Music_LookKimonoGirl_branch_f7a13: ; f7a13
 	intensity $b4
 	octave 2
-	note F_, 0
+	note F_, 1
 	intensity $74
 	octave 3
-	note F_, 0
+	note F_, 1
 	intensity $b4
 	octave 2
-	note A_, 0
+	note A_, 1
 	intensity $74
 	octave 3
-	note A_, 0
+	note A_, 1
 	intensity $b4
 	octave 2
-	note B_, 0
+	note B_, 1
 	intensity $74
 	octave 3
-	note B_, 0
+	note B_, 1
 	intensity $b4
 	octave 3
-	note D_, 0
+	note D_, 1
 	intensity $74
 	octave 4
-	note D_, 0
+	note D_, 1
 	endchannel
 ; f7a34
 
@@ -83,28 +83,28 @@
 Music_LookKimonoGirl_branch_f7a34: ; f7a34
 	intensity $b4
 	octave 2
-	note E_, 0
+	note E_, 1
 	intensity $74
 	octave 3
-	note E_, 0
+	note E_, 1
 	intensity $b4
 	octave 2
-	note A_, 0
+	note A_, 1
 	intensity $74
 	octave 3
-	note A_, 0
+	note A_, 1
 	intensity $b4
 	octave 2
-	note B_, 0
+	note B_, 1
 	intensity $74
 	octave 3
-	note B_, 0
+	note B_, 1
 	intensity $b4
 	octave 3
-	note D_, 0
+	note D_, 1
 	intensity $74
 	octave 4
-	note D_, 0
+	note D_, 1
 	endchannel
 ; f7a55
 
@@ -118,44 +118,44 @@
 	dutycycle $3
 	notetype $c, $91
 	octave 5
-	note E_, 0
-	note D_, 0
+	note E_, 1
+	note D_, 1
 	octave 4
-	note B_, 0
-	note A_, 0
-	note B_, 0
-	note A_, 0
-	note E_, 0
-	note D_, 0
-	note E_, 0
-	note D_, 0
+	note B_, 1
+	note A_, 1
+	note B_, 1
+	note A_, 1
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note D_, 1
 	octave 3
-	note B_, 0
-	note A_, 0
-	note B_, 0
-	note A_, 0
-	note E_, 0
-	note D_, 0
+	note B_, 1
+	note A_, 1
+	note B_, 1
+	note A_, 1
+	note E_, 1
+	note D_, 1
 	callchannel Music_LookKimonoGirl_branch_f7a94
 	octave 5
-	note F_, 0
-	note D_, 0
+	note F_, 1
+	note D_, 1
 	octave 4
-	note B_, 0
-	note A_, 0
-	note B_, 0
-	note A_, 0
-	note F_, 0
-	note D_, 0
-	note F_, 0
-	note D_, 0
+	note B_, 1
+	note A_, 1
+	note B_, 1
+	note A_, 1
+	note F_, 1
+	note D_, 1
+	note F_, 1
+	note D_, 1
 	octave 3
-	note B_, 0
-	note A_, 0
-	note B_, 0
-	note A_, 0
-	note E_, 0
-	note D_, 0
+	note B_, 1
+	note A_, 1
+	note B_, 1
+	note A_, 1
+	note E_, 1
+	note D_, 1
 	callchannel Music_LookKimonoGirl_branch_f7a94
 	loopchannel 0, Music_LookKimonoGirl_branch_f7a5f
 ; f7a94
@@ -162,60 +162,60 @@
 
 Music_LookKimonoGirl_branch_f7a94: ; f7a94
 	octave 5
-	note B_, 0
-	note A_, 0
-	note E_, 0
-	note D_, 0
-	note E_, 0
-	note D_, 0
+	note B_, 1
+	note A_, 1
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note D_, 1
 	octave 4
-	note B_, 0
-	note A_, 0
-	note B_, 0
-	note A_, 0
-	note E_, 0
-	note D_, 0
-	note E_, 0
-	note D_, 0
+	note B_, 1
+	note A_, 1
+	note B_, 1
+	note A_, 1
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note D_, 1
 	octave 3
-	note B_, 0
-	note E_, 0
+	note B_, 1
+	note E_, 1
 	endchannel
 ; f7aa8
 
 Music_LookKimonoGirl_branch_f7aa8: ; f7aa8
 	octave 4
-	note E_, 0
-	octave 5
-	note E_, 15
-	note __, 0
 	note E_, 1
+	octave 5
+	note E_, 16
+	note __, 1
+	note E_, 2
+	note __, 3
+	intensity $b7
+	note E_, 2
 	note __, 2
 	intensity $b7
-	note E_, 1
+	note E_, 2
 	note __, 1
-	intensity $b7
-	note E_, 1
-	note __, 0
 	intensity $a7
-	note E_, 1
-	note __, 0
+	note E_, 2
+	note __, 1
 	notetype $6, $65
-	note E_, 1
-	note __, 0
+	note E_, 2
+	note __, 1
 	intensity $54
-	note E_, 1
-	note __, 0
+	note E_, 2
+	note __, 1
 	intensity $63
-	note E_, 1
-	note E_, 1
+	note E_, 2
+	note E_, 2
 	intensity $91
-	note E_, 1
+	note E_, 2
 	intensity $a1
-	note E_, 0
+	note E_, 1
 	notetype $8, $b1
-	note E_, 0
-	note E_, 0
+	note E_, 1
+	note E_, 1
 	endchannel
 
 Music_LookKimonoGirl_Ch3: ; f7ad4
@@ -222,54 +222,54 @@
 	stereopanning $ff
 	vibrato $12, $24
 	notetype $6, $13
-	note __, 0
-	note __, 15
+	note __, 1
+	note __, 16
 	octave 5
-	note E_, 0
-	note F_, 0
 	note E_, 1
+	note F_, 1
+	note E_, 2
 	notetype $c, $13
-	note E_, 11
+	note E_, 12
 	notetype $6, $13
 	octave 5
-	note D_, 1
-	note E_, 1
+	note D_, 2
+	note E_, 2
 
 Music_LookKimonoGirl_branch_f7aec: ; f7aec
 	octave 5
-	note D_, 3
-	note E_, 3
-	note F_, 3
-	note A_, 3
-	note B_, 3
-	note A_, 3
-	note B_, 3
+	note D_, 4
+	note E_, 4
+	note F_, 4
+	note A_, 4
+	note B_, 4
+	note A_, 4
+	note B_, 4
 	octave 6
-	note D_, 3
-	note E_, 7
-	note F_, 0
-	note F#, 0
+	note D_, 4
+	note E_, 8
 	note F_, 1
-	note D_, 3
-	note E_, 7
-	note D_, 3
-	note E_, 3
-	note F_, 7
-	note A_, 7
-	note B_, 0
+	note F#, 1
+	note F_, 2
+	note D_, 4
+	note E_, 8
+	note D_, 4
+	note E_, 4
+	note F_, 8
+	note A_, 8
+	note B_, 1
 	octave 7
-	note C_, 0
+	note C_, 1
 	octave 6
-	note B_, 1
-	note A_, 3
-	note F_, 3
-	note D_, 3
-	note E_, 0
-	note F_, 0
-	note E_, 9
-	note F_, 1
+	note B_, 2
+	note A_, 4
+	note F_, 4
+	note D_, 4
 	note E_, 1
-	note D_, 7
-	note E_, 7
+	note F_, 1
+	note E_, 10
+	note F_, 2
+	note E_, 2
+	note D_, 8
+	note E_, 8
 	loopchannel 0, Music_LookKimonoGirl_branch_f7aec
 ; f7b13
--- a/audio/music/looklass.asm
+++ b/audio/music/looklass.asm
@@ -13,10 +13,10 @@
 	dutycycle $2
 	notetype $c, $c7
 	octave 3
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 4
-	note B_, 13
+	note B_, 14
 	stereopanning $f
 	dutycycle $0
 
@@ -23,13 +23,13 @@
 Music_LookLass_branch_ed7bd: ; ed7bd
 	intensity $a2
 	octave 3
-	note E_, 3
+	note E_, 4
 	intensity $a1
-	note E_, 3
-	note E_, 3
-	note E_, 1
+	note E_, 4
+	note E_, 4
+	note E_, 2
 	intensity $a3
-	note B_, 1
+	note B_, 2
 	loopchannel 0, Music_LookLass_branch_ed7bd
 
 Music_LookLass_Ch2: ; ed7cd
@@ -36,86 +36,86 @@
 	stereopanning $f0
 	dutycycle $0
 	notetype $c, $83
-	note __, 15
+	note __, 16
 
 Music_LookLass_branch_ed7d5: ; ed7d5
 	intensity $92
 	octave 2
-	note B_, 3
+	note B_, 4
 	intensity $91
-	note B_, 3
-	note B_, 3
-	note B_, 1
+	note B_, 4
+	note B_, 4
+	note B_, 2
 	intensity $93
 	octave 3
-	note G#, 1
+	note G#, 2
 	loopchannel 0, Music_LookLass_branch_ed7d5
 
 Music_LookLass_Ch3: ; ed7e6
 	notetype $c, $10
-	note __, 7
+	note __, 8
 	octave 6
-	note E_, 1
-	note D#, 1
-	note C#, 1
-	note C_, 1
+	note E_, 2
+	note D#, 2
+	note C#, 2
+	note C_, 2
 
 Music_LookLass_branch_ed7ef: ; ed7ef
 	octave 5
-	note B_, 1
-	note __, 1
+	note B_, 2
+	note __, 2
 	octave 6
-	note D#, 1
-	note __, 1
-	note E_, 1
-	note __, 1
-	note D#, 1
-	note __, 1
-	note C#, 1
-	note C_, 1
+	note D#, 2
+	note __, 2
+	note E_, 2
+	note __, 2
+	note D#, 2
+	note __, 2
+	note C#, 2
+	note C_, 2
 	octave 5
-	note B_, 1
-	note A_, 1
-	note G#, 1
-	note A_, 1
-	note A#, 1
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note A#, 2
 	octave 6
-	note C#, 1
+	note C#, 2
 	octave 5
-	note B_, 1
-	note __, 1
+	note B_, 2
+	note __, 2
 	octave 6
-	note C#, 1
-	note __, 1
+	note C#, 2
+	note __, 2
 	octave 5
-	note B_, 1
-	note __, 1
-	note A_, 1
-	note __, 1
-	note G#, 1
-	note F#, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
+	note B_, 2
+	note __, 2
+	note A_, 2
+	note __, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
 	loopchannel 0, Music_LookLass_branch_ed7ef
 
 Music_LookLass_Ch4: ; ed81a
 	togglenoise $4
 	notetype $c
-	note C_, 15
+	note C_, 16
 
 Music_LookLass_branch_ed81f: ; ed81f
 	notetype $6
-	note D_, 7
-	note C#, 7
-	note C#, 7
-	note C#, 3
-	note D_, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
+	note D_, 8
+	note C#, 8
+	note C#, 8
+	note C#, 4
+	note D_, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
 	loopchannel 0, Music_LookLass_branch_ed81f
 ; ed82d
--- a/audio/music/lookmysticalman.asm
+++ b/audio/music/lookmysticalman.asm
@@ -13,188 +13,188 @@
 	tone $0001
 	stereopanning $f
 	notetype $c, $b3
-	note __, 7
+	note __, 8
 
 Music_LookMysticalMan_branch_178458: ; 178458
 	dutycycle $3
 	notetype $6, $96
 	octave 3
-	note F#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note E_, 1
 	note F#, 1
-	note __, 3
+	note __, 1
 	note F#, 1
-	note __, 8
-	note __, 8
-	note E_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note D_, 1
+	note __, 1
+	note E_, 2
+	note F#, 2
+	note __, 4
+	note F#, 2
+	note __, 9
+	note __, 9
 	note E_, 1
-	note __, 3
+	note __, 1
 	note E_, 1
-	note __, 8
-	note __, 8
-	note E_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note C#, 1
+	note __, 1
+	note D_, 2
+	note E_, 2
+	note __, 4
+	note E_, 2
+	note __, 9
+	note __, 9
 	note E_, 1
-	note __, 3
+	note __, 1
 	note E_, 1
-	note __, 8
-	note __, 8
-	note E_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note C#, 1
+	note __, 1
+	note C#, 2
+	note E_, 2
+	note __, 4
+	note E_, 2
+	note __, 9
+	note __, 9
 	note E_, 1
-	note __, 2
-	note F_, 0
-	note F#, 3
+	note __, 1
+	note E_, 1
+	note __, 1
+	note C#, 2
+	note E_, 2
 	note __, 3
-	note E_, 3
-	note __, 3
-	note C#, 3
+	note F_, 1
+	note F#, 4
+	note __, 4
+	note E_, 4
+	note __, 4
+	note C#, 4
 	dutycycle $2
 	callchannel Music_LookMysticalMan_branch_1784f9
 	octave 4
-	note C#, 1
-	note __, 1
+	note C#, 2
+	note __, 2
 	octave 3
-	note B_, 1
-	note __, 1
-	note A#, 1
+	note B_, 2
+	note __, 2
+	note A#, 2
 	octave 4
-	note C#, 5
-	note __, 3
+	note C#, 6
+	note __, 4
 	octave 3
-	note F#, 3
-	note __, 3
-	note E_, 3
+	note F#, 4
+	note __, 4
+	note E_, 4
 	callchannel Music_LookMysticalMan_branch_1784f9
 	octave 4
-	note C#, 1
-	note __, 1
-	note C#, 1
-	note __, 1
+	note C#, 2
+	note __, 2
+	note C#, 2
+	note __, 2
 	octave 3
-	note A#, 1
-	note B_, 5
-	note A#, 3
-	note F#, 3
+	note A#, 2
+	note B_, 6
+	note A#, 4
+	note F#, 4
 	intensity $a5
 	dutycycle $0
 	octave 4
-	note F#, 1
-	note A#, 5
+	note F#, 2
+	note A#, 6
 	dutycycle $2
 	intensity $72
 
 Music_LookMysticalMan_branch_1784b4: ; 1784b4
 	octave 5
-	note D_, 1
+	note D_, 2
 	octave 4
-	note B_, 1
-	note F#, 1
-	note D_, 1
+	note B_, 2
+	note F#, 2
+	note D_, 2
 	loopchannel 4, Music_LookMysticalMan_branch_1784b4
 	octave 5
-	note D_, 1
+	note D_, 2
 	octave 4
-	note B_, 1
-	note F#, 1
-	note D_, 1
+	note B_, 2
+	note F#, 2
+	note D_, 2
 	octave 3
-	note A_, 1
-	note F#, 1
-	note D_, 1
+	note A_, 2
+	note F#, 2
+	note D_, 2
 	octave 2
-	note A_, 1
-	note B_, 1
+	note A_, 2
+	note B_, 2
 	octave 3
-	note D_, 1
-	note F#, 1
-	note A_, 1
-	note B_, 1
+	note D_, 2
+	note F#, 2
+	note A_, 2
+	note B_, 2
 	octave 4
-	note D_, 1
-	note F#, 1
-	note B_, 1
+	note D_, 2
+	note F#, 2
+	note B_, 2
 
 Music_LookMysticalMan_branch_1784d4: ; 1784d4
 	octave 5
-	note D_, 1
+	note D_, 2
 	octave 4
-	note G#, 1
-	note E_, 1
+	note G#, 2
+	note E_, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	loopchannel 4, Music_LookMysticalMan_branch_1784d4
 	octave 5
-	note C#, 1
+	note C#, 2
 	octave 4
-	note A#, 1
-	note F#, 1
-	note C#, 1
+	note A#, 2
+	note F#, 2
+	note C#, 2
 	octave 3
-	note A#, 1
-	note F#, 1
-	note C#, 1
+	note A#, 2
+	note F#, 2
+	note C#, 2
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note C#, 1
-	note E_, 1
-	note F#, 1
-	note A#, 1
+	note C#, 2
+	note E_, 2
+	note F#, 2
+	note A#, 2
 	octave 4
-	note C#, 1
-	note E_, 1
-	note F#, 1
-	note A#, 1
+	note C#, 2
+	note E_, 2
+	note F#, 2
+	note A#, 2
 	loopchannel 0, Music_LookMysticalMan_branch_178458
 ; 1784f9
 
 Music_LookMysticalMan_branch_1784f9: ; 1784f9
-	note D_, 15
+	note D_, 16
 	octave 4
-	note D_, 1
-	note __, 1
-	note E_, 1
-	note __, 1
-	note F#, 1
-	note D_, 5
+	note D_, 2
+	note __, 2
+	note E_, 2
+	note __, 2
+	note F#, 2
+	note D_, 6
 	octave 3
-	note E_, 15
-	note B_, 1
-	note __, 1
+	note E_, 16
+	note B_, 2
+	note __, 2
 	octave 4
-	note C#, 1
-	note __, 1
-	note D_, 1
+	note C#, 2
+	note __, 2
+	note D_, 2
 	octave 3
-	note B_, 5
+	note B_, 6
 	octave 4
-	note E_, 1
-	note __, 1
-	note E_, 1
-	note __, 1
-	note D_, 1
-	note C#, 5
-	note C#, 1
-	note __, 1
-	note C#, 1
-	note __, 1
+	note E_, 2
+	note __, 2
+	note E_, 2
+	note __, 2
+	note D_, 2
+	note C#, 6
+	note C#, 2
+	note __, 2
+	note C#, 2
+	note __, 2
 	octave 3
-	note B_, 1
-	note A_, 5
+	note B_, 2
+	note A_, 6
 	endchannel
 
 Music_LookMysticalMan_Ch2: ; 17851a
@@ -201,356 +201,356 @@
 	dutycycle $3
 	vibrato $a, $34
 	notetype $c, $b3
-	note __, 7
+	note __, 8
 
 Music_LookMysticalMan_branch_178523: ; 178523
 	stereopanning $f0
 	notetype $6, $b8
 	octave 3
-	note B_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note A_, 1
 	note B_, 1
-	note __, 3
+	note __, 1
 	note B_, 1
-	note __, 5
+	note __, 1
+	note A_, 2
+	note B_, 2
+	note __, 4
+	note B_, 2
+	note __, 6
 	stereopanning $ff
-	note B_, 7
-	note A_, 3
+	note B_, 8
+	note A_, 4
 	stereopanning $f0
-	note G#, 0
-	note __, 0
-	note G#, 0
-	note __, 0
-	note F#, 1
 	note G#, 1
-	note __, 3
+	note __, 1
 	note G#, 1
-	note __, 5
+	note __, 1
+	note F#, 2
+	note G#, 2
+	note __, 4
+	note G#, 2
+	note __, 6
 	stereopanning $ff
-	note F#, 7
-	note G#, 3
+	note F#, 8
+	note G#, 4
 	stereopanning $f0
-	note A_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note G_, 1
 	note A_, 1
-	note __, 3
+	note __, 1
 	note A_, 1
-	note __, 5
+	note __, 1
+	note G_, 2
+	note A_, 2
+	note __, 4
+	note A_, 2
+	note __, 6
 	stereopanning $ff
-	note A_, 7
-	note G_, 3
+	note A_, 8
+	note G_, 4
 	stereopanning $f0
-	note F#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note E_, 1
 	note F#, 1
-	note __, 2
-	note A_, 0
-	note A#, 3
-	note __, 3
-	note F#, 3
-	note __, 3
-	note E_, 3
-	callchannel Music_LookMysticalMan_branch_17859a
+	note __, 1
 	note F#, 1
 	note __, 1
-	note E_, 1
-	note __, 1
-	note D_, 1
-	note E_, 5
+	note E_, 2
+	note F#, 2
+	note __, 3
+	note A_, 1
+	note A#, 4
+	note __, 4
+	note F#, 4
+	note __, 4
+	note E_, 4
+	callchannel Music_LookMysticalMan_branch_17859a
+	note F#, 2
+	note __, 2
+	note E_, 2
+	note __, 2
+	note D_, 2
+	note E_, 6
 	callchannel Music_LookMysticalMan_branch_1785c8
 	callchannel Music_LookMysticalMan_branch_17859a
-	note F#, 1
-	note __, 1
-	note F#, 1
-	note __, 1
-	note E_, 1
-	note D_, 5
+	note F#, 2
+	note __, 2
+	note F#, 2
+	note __, 2
+	note E_, 2
+	note D_, 6
 	callchannel Music_LookMysticalMan_branch_1785c8
 	notetype $c, $b7
-	note B_, 1
-	note __, 1
-	note B_, 1
-	note __, 1
+	note B_, 2
+	note __, 2
+	note B_, 2
+	note __, 2
 	octave 4
-	note D_, 1
-	note __, 0
-	note C#, 1
-	note __, 0
-	octave 3
-	note B_, 15
+	note D_, 2
 	note __, 1
-	note B_, 1
+	note C#, 2
 	note __, 1
+	octave 3
+	note B_, 16
+	note __, 2
+	note B_, 2
+	note __, 2
 	octave 4
-	note D_, 1
+	note D_, 2
+	note __, 2
+	note C#, 2
 	note __, 1
-	note C#, 1
-	note __, 0
 	octave 3
-	note B_, 1
-	note __, 0
-	note A#, 15
+	note B_, 2
 	note __, 1
+	note A#, 16
+	note __, 2
 	loopchannel 0, Music_LookMysticalMan_branch_178523
 ; 17859a
 
 Music_LookMysticalMan_branch_17859a: ; 17859a
-	note B_, 1
-	note __, 1
+	note B_, 2
+	note __, 2
 	octave 4
-	note D_, 1
-	note __, 1
-	note F#, 1
-	note A_, 5
-	note B_, 7
-	note __, 1
-	note A_, 1
-	note B_, 1
+	note D_, 2
+	note __, 2
+	note F#, 2
+	note A_, 6
+	note B_, 8
+	note __, 2
+	note A_, 2
+	note B_, 2
 	octave 5
-	note C#, 1
-	note D_, 1
-	note __, 1
-	note C#, 1
-	note __, 1
-	note D_, 1
-	note C#, 5
+	note C#, 2
+	note D_, 2
+	note __, 2
+	note C#, 2
+	note __, 2
+	note D_, 2
+	note C#, 6
 	octave 4
-	note B_, 11
+	note B_, 12
 	intensity $88
-	note A#, 0
-	note A_, 0
+	note A#, 1
+	note A_, 1
 	intensity $68
-	note G#, 0
-	note F#, 0
+	note G#, 1
+	note F#, 1
 	intensity $b8
 	octave 5
-	note C#, 1
-	note __, 1
-	note C#, 1
-	note __, 1
+	note C#, 2
+	note __, 2
+	note C#, 2
+	note __, 2
 	octave 4
-	note B_, 1
-	note A_, 5
-	note G_, 1
-	note __, 1
-	note G_, 1
-	note __, 1
-	note F#, 1
-	note E_, 5
+	note B_, 2
+	note A_, 6
+	note G_, 2
+	note __, 2
+	note G_, 2
+	note __, 2
+	note F#, 2
+	note E_, 6
 	endchannel
 ; 1785c8
 
 Music_LookMysticalMan_branch_1785c8: ; 1785c8
-	note C#, 7
+	note C#, 8
 	intensity $88
-	note C_, 0
+	note C_, 1
 	octave 3
-	note B_, 0
-	note A#, 0
+	note B_, 1
+	note A#, 1
 	intensity $68
-	note G#, 0
-	note F#, 0
+	note G#, 1
+	note F#, 1
 	intensity $48
-	note E_, 0
-	note C#, 0
-	note __, 0
+	note E_, 1
+	note C#, 1
+	note __, 1
 	intensity $b8
 	endchannel
 
 Music_LookMysticalMan_Ch3: ; 1785db
 	notetype $6, $16
-	note __, 15
+	note __, 16
 
 Music_LookMysticalMan_branch_1785df: ; 1785df
 	octave 2
-	note B_, 3
+	note B_, 4
 	octave 3
-	note A_, 1
-	note __, 1
-	note F#, 3
+	note A_, 2
+	note __, 2
+	note F#, 4
 	octave 2
-	note B_, 0
-	note __, 0
-	note B_, 3
-	note A_, 1
 	note B_, 1
+	note __, 1
+	note B_, 4
+	note A_, 2
+	note B_, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note F#, 1
-	note E_, 3
-	note G#, 1
+	note F#, 2
+	note E_, 4
+	note G#, 2
+	note __, 2
+	note B_, 4
+	note E_, 1
 	note __, 1
-	note B_, 3
-	note E_, 0
-	note __, 0
-	note E_, 5
+	note E_, 6
 	octave 2
-	note A#, 1
-	note B_, 5
-	note G#, 3
-	note A_, 3
+	note A#, 2
+	note B_, 6
+	note G#, 4
+	note A_, 4
 	octave 3
-	note G_, 1
-	note __, 1
-	note E_, 3
+	note G_, 2
+	note __, 2
+	note E_, 4
 	octave 2
-	note A_, 0
-	note __, 0
-	note A_, 3
-	note G_, 1
 	note A_, 1
+	note __, 1
+	note A_, 4
+	note G_, 2
+	note A_, 2
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note G_, 1
+	note G_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 
 Music_LookMysticalMan_branch_178615: ; 178615
 	octave 2
-	note F#, 3
-	note A#, 1
-	note __, 1
+	note F#, 4
+	note A#, 2
+	note __, 2
 	octave 3
-	note C#, 3
+	note C#, 4
 	octave 2
-	note F#, 0
-	note __, 0
-	note F#, 5
-	note G#, 3
-	note __, 3
-	note A#, 3
-	note B_, 3
-	octave 3
-	note A_, 1
-	note __, 1
-	note F#, 3
-	octave 2
-	note B_, 0
-	note __, 0
-	note B_, 5
-	octave 3
-	note D_, 1
-	note __, 1
 	note F#, 1
-	note D_, 5
-	note E_, 3
-	note G#, 1
 	note __, 1
-	note B_, 3
-	note E_, 0
-	note __, 0
-	note E_, 5
-	note D_, 1
-	note __, 1
+	note F#, 6
+	note G#, 4
+	note __, 4
+	note A#, 4
+	note B_, 4
+	octave 3
+	note A_, 2
+	note __, 2
+	note F#, 4
 	octave 2
 	note B_, 1
-	note G#, 5
-	note A_, 3
+	note __, 1
+	note B_, 6
 	octave 3
-	note C#, 1
+	note D_, 2
+	note __, 2
+	note F#, 2
+	note D_, 6
+	note E_, 4
+	note G#, 2
+	note __, 2
+	note B_, 4
+	note E_, 1
 	note __, 1
-	note E_, 3
+	note E_, 6
+	note D_, 2
+	note __, 2
 	octave 2
-	note A_, 0
-	note __, 0
-	note A_, 5
+	note B_, 2
+	note G#, 6
+	note A_, 4
 	octave 3
-	note E_, 3
-	note C#, 1
+	note C#, 2
+	note __, 2
+	note E_, 4
 	octave 2
-	note E_, 5
-	loopchannel 2, Music_LookMysticalMan_branch_178615
-	note F#, 3
-	note A#, 1
+	note A_, 1
 	note __, 1
+	note A_, 6
 	octave 3
-	note C#, 1
-	note F#, 5
+	note E_, 4
+	note C#, 2
 	octave 2
-	note F#, 1
-	note __, 1
+	note E_, 6
+	loopchannel 2, Music_LookMysticalMan_branch_178615
+	note F#, 4
+	note A#, 2
+	note __, 2
 	octave 3
-	note C#, 3
+	note C#, 2
+	note F#, 6
 	octave 2
-	note A#, 1
+	note F#, 2
+	note __, 2
 	octave 3
-	note F#, 5
+	note C#, 4
 	octave 2
-	note B_, 3
+	note A#, 2
 	octave 3
-	note B_, 3
+	note F#, 6
 	octave 2
-	note B_, 3
+	note B_, 4
 	octave 3
-	note F#, 1
-	note A_, 5
+	note B_, 4
 	octave 2
-	note B_, 3
+	note B_, 4
 	octave 3
-	note F#, 3
+	note F#, 2
+	note A_, 6
 	octave 2
-	note B_, 3
-	note A_, 3
-	note __, 1
-	note A#, 3
-	note __, 1
-	note B_, 5
-	note __, 1
-	note B_, 3
-	note A_, 3
-	note F#, 3
-	note E_, 3
+	note B_, 4
 	octave 3
-	note E_, 3
+	note F#, 4
 	octave 2
-	note E_, 3
-	note G#, 1
+	note B_, 4
+	note A_, 4
+	note __, 2
+	note A#, 4
+	note __, 2
+	note B_, 6
+	note __, 2
+	note B_, 4
+	note A_, 4
+	note F#, 4
+	note E_, 4
 	octave 3
-	note D_, 5
+	note E_, 4
 	octave 2
-	note E_, 3
-	note B_, 3
+	note E_, 4
+	note G#, 2
 	octave 3
-	note E_, 3
-	note F#, 3
-	note __, 1
-	note E_, 3
-	note __, 1
-	note C#, 7
+	note D_, 6
 	octave 2
-	note B_, 7
-	note A#, 3
+	note E_, 4
+	note B_, 4
+	octave 3
+	note E_, 4
+	note F#, 4
+	note __, 2
+	note E_, 4
+	note __, 2
+	note C#, 8
+	octave 2
+	note B_, 8
+	note A#, 4
 	loopchannel 0, Music_LookMysticalMan_branch_1785df
 
 Music_LookMysticalMan_Ch4: ; 17868e
 	togglenoise $3
 	notetype $c
-	note D#, 1
-	note D#, 1
+	note D#, 2
+	note D#, 2
+	note D_, 2
 	note D_, 1
-	note D_, 0
-	note D_, 0
+	note D_, 1
 
 Music_LookMysticalMan_branch_178697: ; 178697
 	callchannel Music_LookMysticalMan_branch_1786d3
@@ -561,65 +561,65 @@
 	callchannel Music_LookMysticalMan_branch_1786d3
 	callchannel Music_LookMysticalMan_branch_1786d9
 	callchannel Music_LookMysticalMan_branch_1786d3
-	note D_, 1
+	note D_, 2
+	note D#, 2
+	note D_, 2
 	note D#, 1
 	note D_, 1
-	note D#, 0
-	note D_, 0
+	note D_, 2
+	note D#, 2
+	note D_, 2
 	note D_, 1
-	note D#, 1
 	note D_, 1
-	note D_, 0
-	note D_, 0
 
 Music_LookMysticalMan_branch_1786ba: ; 1786ba
-	note D_, 1
-	note D#, 1
 	note D_, 2
-	note D#, 0
+	note D#, 2
+	note D_, 3
 	note D#, 1
-	note D#, 1
-	note D_, 1
-	note D#, 1
-	note D_, 1
-	note D#, 1
+	note D#, 2
+	note D#, 2
 	note D_, 2
-	note D#, 0
+	note D#, 2
+	note D_, 2
+	note D#, 2
+	note D_, 3
 	note D#, 1
+	note D#, 2
+	note D_, 2
+	note D_, 2
 	note D_, 1
 	note D_, 1
-	note D_, 0
-	note D_, 0
 	loopchannel 2, Music_LookMysticalMan_branch_1786ba
 	loopchannel 0, Music_LookMysticalMan_branch_178697
 ; 1786d3
 
 Music_LookMysticalMan_branch_1786d3: ; 1786d3
+	note D#, 4
+	note D_, 3
 	note D#, 3
-	note D_, 2
 	note D#, 2
-	note D#, 1
-	note D_, 3
+	note D_, 4
 	endchannel
 ; 1786d9
 
 Music_LookMysticalMan_branch_1786d9: ; 1786d9
-	note D#, 3
-	note D_, 2
-	note D_, 2
-	note D#, 1
+	note D#, 4
 	note D_, 3
+	note D_, 3
+	note D#, 2
+	note D_, 4
 	endchannel
 ; 1786df
 
 Music_LookMysticalMan_branch_1786df: ; 1786df
-	note D#, 3
-	note D_, 1
-	note D#, 0
+	note D#, 4
 	note D_, 2
-	note D_, 1
 	note D#, 1
-	note D_, 0
-	note D_, 0
+	note D_, 3
+	note D_, 2
+	note D#, 2
+	note D_, 1
+	note D_, 1
 	endchannel
 ; 1786e8
--- a/audio/music/lookofficer.asm
+++ b/audio/music/lookofficer.asm
@@ -14,27 +14,27 @@
 	dutycycle $3
 	notetype $c, $a7
 	octave 4
-	note C#, 0
-	note D_, 0
-	note D#, 0
-	note E_, 0
-	note F_, 11
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 12
 	intensity $2f
 	octave 3
-	note B_, 15
+	note B_, 16
 
 Music_LookOfficer_branch_ed852: ; ed852
 	intensity $82
-	note __, 3
-	note B_, 5
-	note G#, 3
-	note B_, 5
-	note B_, 5
-	note G#, 3
-	note B_, 1
+	note __, 4
+	note B_, 6
+	note G#, 4
+	note B_, 6
+	note B_, 6
+	note G#, 4
+	note B_, 2
 	intensity $2f
-	note A#, 15
-	note A_, 15
+	note A#, 16
+	note A_, 16
 	loopchannel 0, Music_LookOfficer_branch_ed852
 
 Music_LookOfficer_Ch2: ; ed863
@@ -42,38 +42,38 @@
 	dutycycle $3
 	notetype $c, $b7
 	octave 5
-	note D#, 0
-	note D_, 0
-	note C#, 0
-	note C_, 0
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
 	octave 4
-	note B_, 11
+	note B_, 12
 	dutycycle $3
 	intensity $a2
 	octave 1
-	note B_, 3
+	note B_, 4
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 1
-	note B_, 3
+	note B_, 4
 	octave 2
-	note F_, 1
+	note F_, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note D#, 1
+	note D#, 2
 
 Music_LookOfficer_branch_ed882: ; ed882
-	note E_, 1
-	note G#, 1
+	note E_, 2
+	note G#, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note E_, 1
-	note G#, 1
-	note B_, 1
-	note E_, 1
-	note G#, 1
+	note E_, 2
+	note G#, 2
+	note B_, 2
+	note E_, 2
+	note G#, 2
 	loopchannel 2, Music_LookOfficer_branch_ed882
 	forceoctave $1
 	callchannel Music_LookOfficer_branch_ed89e
@@ -84,19 +84,19 @@
 
 Music_LookOfficer_branch_ed89e: ; ed89e
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note C#, 1
-	note A_, 1
+	note C#, 2
+	note A_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note C#, 1
-	note E_, 1
+	note C#, 2
+	note E_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note C#, 1
+	note C#, 2
 	endchannel
 
 Music_LookOfficer_Ch3: ; ed8ad
@@ -103,42 +103,42 @@
 	vibrato $14, $14
 	stereopanning $f0
 	notetype $c, $14
-	note __, 9
+	note __, 10
 	octave 3
-	note B_, 1
-	note __, 1
-	note B_, 1
+	note B_, 2
+	note __, 2
+	note B_, 2
 	intensity $12
 	octave 5
-	note D#, 1
-	note __, 0
-	note F_, 1
-	note __, 0
-	note A_, 1
-	note B_, 1
-	note __, 0
+	note D#, 2
+	note __, 1
+	note F_, 2
+	note __, 1
+	note A_, 2
+	note B_, 2
+	note __, 1
 	octave 6
-	note C#, 1
-	note __, 0
-	note D#, 1
+	note C#, 2
+	note __, 1
+	note D#, 2
 
 Music_LookOfficer_branch_ed8c8: ; ed8c8
-	note E_, 5
-	note D#, 5
-	note C#, 3
+	note E_, 6
+	note D#, 6
+	note C#, 4
 	octave 5
-	note B_, 1
-	note A_, 1
-	note G#, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
-	note B_, 1
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note B_, 2
 	octave 6
-	note C#, 1
-	note F_, 7
-	note D_, 7
-	note E_, 7
-	note C#, 7
+	note C#, 2
+	note F_, 8
+	note D_, 8
+	note E_, 8
+	note C#, 8
 	loopchannel 0, Music_LookOfficer_branch_ed8c8
 ; ed8dd
--- a/audio/music/lookpokemaniac.asm
+++ b/audio/music/lookpokemaniac.asm
@@ -12,21 +12,21 @@
 	vibrato $2, $33
 	tone $0002
 	notetype $c, $b3
-	note __, 7
+	note __, 8
 
 Music_LookPokemaniac_branch_ebdfb: ; ebdfb
-	note __, 3
+	note __, 4
 	octave 3
-	note A#, 0
-	note __, 2
-	note A#, 0
-	note __, 2
+	note A#, 1
+	note __, 3
+	note A#, 1
+	note __, 3
 	loopchannel 4, Music_LookPokemaniac_branch_ebdfb
+	note __, 4
+	note G_, 1
 	note __, 3
-	note G_, 0
-	note __, 2
-	note G_, 0
-	note __, 2
+	note G_, 1
+	note __, 3
 	loopchannel 4, Music_LookPokemaniac_branch_ebdfb
 	loopchannel 0, Music_LookPokemaniac_branch_ebdfb
 
@@ -36,50 +36,50 @@
 	tone $0001
 	notetype $c, $b3
 	octave 2
-	note A_, 0
-	note F#, 0
-	note D#, 0
-	note C_, 0
+	note A_, 1
+	note F#, 1
+	note D#, 1
+	note C_, 1
 	octave 1
-	note A_, 3
+	note A_, 4
 
 Music_LookPokemaniac_branch_ebe24: ; ebe24
 	octave 2
-	note C_, 1
-	note __, 1
-	octave 3
-	note F#, 0
+	note C_, 2
 	note __, 2
-	note A_, 0
-	note __, 2
-	octave 1
-	note G_, 1
-	note __, 1
 	octave 3
-	note C_, 0
+	note F#, 1
+	note __, 3
+	note A_, 1
+	note __, 3
+	octave 1
+	note G_, 2
 	note __, 2
-	note D#, 0
-	note __, 2
+	octave 3
+	note C_, 1
+	note __, 3
+	note D#, 1
+	note __, 3
 	loopchannel 2, Music_LookPokemaniac_branch_ebe24
 
 Music_LookPokemaniac_branch_ebe38: ; ebe38
 	octave 1
-	note A_, 1
-	note __, 1
-	octave 3
-	note D#, 0
+	note A_, 2
 	note __, 2
-	note F#, 0
-	note __, 2
+	octave 3
+	note D#, 1
+	note __, 3
+	note F#, 1
+	note __, 3
 	octave 1
-	note E_, 1
-	note __, 1
-	octave 2
-	note A_, 0
+	note E_, 2
 	note __, 2
+	octave 2
+	note A_, 1
+	note __, 3
 	octave 3
-	note C_, 0
-	note __, 2
+	note C_, 1
+	note __, 3
 	loopchannel 2, Music_LookPokemaniac_branch_ebe38
 	loopchannel 0, Music_LookPokemaniac_branch_ebe24
 
@@ -88,12 +88,12 @@
 	vibrato $6, $33
 	notetype $c, $15
 	octave 4
-	note C_, 0
-	note D#, 0
-	note F#, 0
-	note A_, 0
+	note C_, 1
+	note D#, 1
+	note F#, 1
+	note A_, 1
 	octave 5
-	note C_, 3
+	note C_, 4
 	intensity $10
 
 Music_LookPokemaniac_branch_ebe62: ; ebe62
@@ -105,63 +105,63 @@
 ; ebe70
 
 Music_LookPokemaniac_branch_ebe70: ; ebe70
-	note A#, 5
-	note A_, 1
-	note G#, 1
-	note G_, 1
-	note F#, 5
-	note F_, 1
-	note F#, 1
-	note A_, 1
+	note A#, 6
+	note A_, 2
+	note G#, 2
+	note G_, 2
+	note F#, 6
+	note F_, 2
+	note F#, 2
+	note A_, 2
 	octave 4
-	note D#, 3
-	note C_, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note D#, 0
-	note __, 0
+	note D#, 4
+	note C_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
 	octave 5
-	note F#, 3
-	note C_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note G_, 5
+	note F#, 4
+	note C_, 1
+	note __, 1
 	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 5
-	note D_, 1
-	note D#, 1
+	note __, 1
+	note C_, 1
+	note __, 1
 	note F#, 1
-	note C_, 3
+	note __, 1
+	note G_, 6
+	note F#, 2
+	note F_, 2
+	note E_, 2
+	note D#, 6
+	note D_, 2
+	note D#, 2
+	note F#, 2
+	note C_, 4
 	octave 4
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
 	octave 5
-	note C_, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note D#, 3
+	note C_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note D#, 4
 	octave 4
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
 	octave 5
-	note D#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note C_, 0
-	note __, 0
+	note D#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note C_, 1
+	note __, 1
 	endchannel
 ; ebeab
--- a/audio/music/lookrival.asm
+++ b/audio/music/lookrival.asm
@@ -15,109 +15,109 @@
 	stereopanning $f
 	notetype $c, $b2
 	octave 4
-	note C_, 0
+	note C_, 1
 	octave 3
-	note A#, 0
+	note A#, 1
+	note G#, 2
+	note A#, 1
 	note G#, 1
-	note A#, 0
-	note G#, 0
-	note F#, 1
-	note F_, 5
+	note F#, 2
+	note F_, 6
 	intensity $b7
-	note G#, 5
+	note G#, 6
 	intensity $b2
-	note A#, 3
-	note F_, 1
-	note G#, 3
+	note A#, 4
+	note F_, 2
+	note G#, 4
 	intensity $a0
-	note G#, 9
+	note G#, 10
 	intensity $a5
-	note G#, 7
+	note G#, 8
 	intensity $a6
-	note F#, 7
+	note F#, 8
 
 Music_AfterTheRivalFight_branch_f4fb1: ; f4fb1
 
 Music_LookRival_branch_f4fb1: ; f4fb1
 	intensity $b5
-	note F_, 3
-	note D#, 1
-	note F_, 5
-	note F_, 1
-	note G_, 1
-	note G#, 3
-	note A#, 3
-	note G#, 1
-	note G_, 3
+	note F_, 4
+	note D#, 2
+	note F_, 6
+	note F_, 2
+	note G_, 2
+	note G#, 4
+	note A#, 4
+	note G#, 2
+	note G_, 4
 	intensity $a0
-	note F_, 1
+	note F_, 2
 	intensity $a7
-	note F_, 15
+	note F_, 16
 	intensity $66
-	note __, 1
-	note F_, 1
-	note G_, 3
+	note __, 2
+	note F_, 2
+	note G_, 4
 	intensity $b6
-	note G#, 3
+	note G#, 4
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note A#, 3
-	note G#, 1
-	note A#, 5
+	note A#, 4
+	note G#, 2
+	note A#, 6
 	intensity $b4
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C_, 1
-	note C#, 1
-	note C#, 1
-	note D#, 1
-	note D#, 1
-	note C#, 1
-	note C_, 5
+	note C_, 2
+	note C#, 2
+	note C#, 2
+	note D#, 2
+	note D#, 2
+	note C#, 2
+	note C_, 6
 	intensity $b7
 	octave 3
-	note A#, 11
-	note G#, 1
-	note G_, 1
-	note G#, 1
-	note A#, 9
-	note B_, 3
+	note A#, 12
+	note G#, 2
+	note G_, 2
+	note G#, 2
+	note A#, 10
+	note B_, 4
 	octave 4
-	note C_, 5
+	note C_, 6
 	octave 3
-	note A#, 5
+	note A#, 6
 	octave 4
-	note D_, 1
-	note C_, 1
+	note D_, 2
+	note C_, 2
 	octave 3
-	note A#, 5
-	note G_, 9
-	note A#, 5
-	note G#, 5
+	note A#, 6
+	note G_, 10
+	note A#, 6
+	note G#, 6
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note A#, 1
-	note G#, 7
-	note F_, 5
-	note C_, 1
+	note A#, 2
+	note G#, 8
+	note F_, 6
+	note C_, 2
 
 Music_LookRival_branch_f4ff7: ; f4ff7
 	intensity $b2
-	note F_, 5
+	note F_, 6
 	intensity $b7
-	note G#, 3
-	note F#, 1
-	note F_, 1
-	note D#, 1
+	note G#, 4
+	note F#, 2
+	note F_, 2
+	note D#, 2
 	loopchannel 3, Music_LookRival_branch_f4ff7
 	intensity $b2
-	note F_, 1
-	note G#, 3
+	note F_, 2
+	note G#, 4
 	intensity $b7
-	note G#, 5
-	note F#, 3
+	note G#, 6
+	note F#, 4
 	loopchannel 0, Music_LookRival_branch_f4fb1
 
 Music_LookRival_Ch2: ; f5010
@@ -126,211 +126,211 @@
 	stereopanning $f0
 	notetype $c, $c2
 	octave 4
-	note F#, 1
-	note F_, 1
-	note D#, 1
-	note C#, 1
-	note C_, 5
+	note F#, 2
+	note F_, 2
+	note D#, 2
+	note C#, 2
+	note C_, 6
 	intensity $c7
-	note D#, 5
+	note D#, 6
 	intensity $c2
-	note F_, 3
-	note C_, 1
-	note D#, 3
+	note F_, 4
+	note C_, 2
+	note D#, 4
 	intensity $b0
-	note D#, 9
+	note D#, 10
 	intensity $b7
-	note D#, 15
+	note D#, 16
 
-Music_LookRival_branch_f502e: ; f502e
-
 Music_AfterTheRivalFight_branch_f502e: ; f502e
+
+Music_LookRival_branch_f502e: ; f502e
 	intensity $c7
-	note C_, 11
+	note C_, 12
 	intensity $c4
-	note C_, 1
-	note D_, 1
-	note D#, 3
-	note D_, 3
-	note C_, 1
-	note D_, 3
+	note C_, 2
+	note D_, 2
+	note D#, 4
+	note D_, 4
+	note C_, 2
+	note D_, 4
 	intensity $b0
-	note C_, 5
+	note C_, 6
 	intensity $b7
-	note C_, 7
+	note C_, 8
 	intensity $b4
 	octave 3
-	note A_, 1
-	note G_, 1
-	note A_, 1
+	note A_, 2
+	note G_, 2
+	note A_, 2
 	intensity $c6
 	octave 4
-	note C_, 5
+	note C_, 6
 	intensity $c7
-	note D#, 7
-	note F_, 11
+	note D#, 8
+	note F_, 12
 	intensity $c4
-	note F_, 1
-	note G_, 1
-	note G#, 1
-	note G#, 1
-	note G_, 1
-	note G_, 1
-	note F_, 1
+	note F_, 2
+	note G_, 2
+	note G#, 2
+	note G#, 2
+	note G_, 2
+	note G_, 2
+	note F_, 2
 	intensity $c4
-	note G_, 5
+	note G_, 6
 	intensity $b0
-	note F_, 15
+	note F_, 16
 	intensity $b7
-	note F_, 15
+	note F_, 16
 	intensity $b0
-	note G_, 11
-	note F_, 3
-	note E_, 15
-	note F_, 11
-	note D#, 3
+	note G_, 12
+	note F_, 4
+	note E_, 16
+	note F_, 12
+	note D#, 4
 	intensity $c7
-	note D_, 7
+	note D_, 8
 	intensity $c4
-	note C_, 1
-	note D_, 1
-	note D#, 0
-	note D_, 0
+	note C_, 2
+	note D_, 2
 	note D#, 1
+	note D_, 1
+	note D#, 2
 
 Music_LookRival_branch_f5070: ; f5070
 	intensity $c2
-	note C_, 5
+	note C_, 6
 	intensity $c7
-	note D#, 5
+	note D#, 6
 	intensity $c2
-	note F_, 3
+	note F_, 4
 	loopchannel 3, Music_LookRival_branch_f5070
-	note C_, 1
-	note D#, 3
+	note C_, 2
+	note D#, 4
 	intensity $c7
-	note D#, 9
+	note D#, 10
 	loopchannel 0, Music_LookRival_branch_f502e
 
 Music_LookRival_Ch3: ; f5086
 	notetype $c, $28
-	note __, 1
+	note __, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G#, 1
-	note F#, 1
-	note F_, 3
-	note G#, 1
-	note D#, 3
-	note C_, 1
-	note D_, 1
-	note D#, 1
-	note G#, 1
-	note F#, 1
-	note F_, 1
-	note D#, 9
-	note D#, 9
-	note C_, 1
-	note D#, 1
-	note F#, 1
+	note G#, 2
+	note F#, 2
+	note F_, 4
+	note G#, 2
+	note D#, 4
+	note C_, 2
+	note D_, 2
+	note D#, 2
+	note G#, 2
+	note F#, 2
+	note F_, 2
+	note D#, 10
+	note D#, 10
+	note C_, 2
+	note D#, 2
+	note F#, 2
 
-Music_LookRival_branch_f509d: ; f509d
-
 Music_AfterTheRivalFight_branch_f509d: ; f509d
+
+Music_LookRival_branch_f509d: ; f509d
 	callchannel Music_LookRival_branch_f50ef
 	loopchannel 3, Music_LookRival_branch_f509d
-	note F_, 3
-	note C_, 1
-	note D#, 3
-	note G#, 1
-	note G_, 1
-	note F#, 1
+	note F_, 4
+	note C_, 2
+	note D#, 4
+	note G#, 2
+	note G_, 2
+	note F#, 2
 	callchannel Music_LookRival_branch_f50f7
-	note A#, 1
-	note F_, 1
-	note G_, 1
-	note G#, 3
-	note F_, 1
-	note G_, 1
-	note G#, 0
-	note A_, 0
+	note A#, 2
+	note F_, 2
+	note G_, 2
+	note G#, 4
+	note F_, 2
+	note G_, 2
+	note G#, 1
+	note A_, 1
 	callchannel Music_LookRival_branch_f50ff
-	note A#, 1
-	note F_, 1
-	note G_, 1
-	note G#, 3
-	note F_, 1
-	note A#, 1
-	note B_, 1
+	note A#, 2
+	note F_, 2
+	note G_, 2
+	note G#, 4
+	note F_, 2
+	note A#, 2
+	note B_, 2
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note G_, 1
-	note A#, 3
-	note G_, 1
-	note A_, 1
-	note A#, 1
+	note G_, 2
+	note A#, 4
+	note G_, 2
+	note A_, 2
+	note A#, 2
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note G_, 1
-	note A#, 3
-	note G_, 1
+	note G_, 2
+	note A#, 4
+	note G_, 2
+	note A_, 2
+	note A#, 1
 	note A_, 1
-	note A#, 0
-	note A_, 0
 	callchannel Music_LookRival_branch_f50f7
 	callchannel Music_LookRival_branch_f50ff
 	callchannel Music_LookRival_branch_f50ef
 	callchannel Music_LookRival_branch_f50ef
-	note F_, 1
-	note C_, 1
-	note D_, 1
-	note D#, 3
-	note C_, 1
-	note D_, 1
-	note D#, 0
-	note E_, 0
-	note F_, 1
-	note C_, 1
-	note D_, 1
-	note D#, 3
-	note C_, 1
-	note F#, 1
+	note F_, 2
+	note C_, 2
+	note D_, 2
+	note D#, 4
+	note C_, 2
+	note D_, 2
+	note D#, 1
 	note E_, 1
+	note F_, 2
+	note C_, 2
+	note D_, 2
+	note D#, 4
+	note C_, 2
+	note F#, 2
+	note E_, 2
 	loopchannel 0, Music_LookRival_branch_f509d
 ; f50ef
 
 Music_LookRival_branch_f50ef: ; f50ef
-	note F_, 1
-	note C_, 1
-	note D_, 1
-	note D#, 3
-	note C_, 1
-	note D_, 1
-	note D#, 1
+	note F_, 2
+	note C_, 2
+	note D_, 2
+	note D#, 4
+	note C_, 2
+	note D_, 2
+	note D#, 2
 	endchannel
 ; f50f7
 
 Music_LookRival_branch_f50f7: ; f50f7
-	note A#, 1
-	note F_, 1
-	note G_, 1
-	note G#, 3
-	note F_, 1
-	note G_, 1
-	note G#, 1
+	note A#, 2
+	note F_, 2
+	note G_, 2
+	note G#, 4
+	note F_, 2
+	note G_, 2
+	note G#, 2
 	endchannel
 ; f50ff
 
 Music_LookRival_branch_f50ff: ; f50ff
-	note A#, 3
-	note F_, 1
-	note G#, 3
-	note F_, 1
-	note G_, 1
-	note G#, 1
+	note A#, 4
+	note F_, 2
+	note G#, 4
+	note F_, 2
+	note G_, 2
+	note G#, 2
 	endchannel
 
 Music_LookRival_Ch4: ; f5106
@@ -337,32 +337,32 @@
 	stereopanning $f0
 	togglenoise $3
 	notetype $c
-	note __, 7
-	note __, 15
-	note D#, 1
-	note D_, 3
-	note D_, 5
-	note D_, 3
-	note D#, 3
-	note D#, 3
-	note D_, 1
-	note D_, 1
-	note D_, 1
-	note D_, 1
+	note __, 8
+	note __, 16
+	note D#, 2
+	note D_, 4
+	note D_, 6
+	note D_, 4
+	note D#, 4
+	note D#, 4
+	note D_, 2
+	note D_, 2
+	note D_, 2
+	note D_, 2
 
 Music_AfterTheRivalFight_branch_f5118: ; f5118
 
 Music_LookRival_branch_f5118: ; f5118
-	note D#, 3
-	note D_, 1
-	note D#, 3
-	note D#, 1
-	note D_, 3
-	note D#, 3
-	note D_, 1
-	note D#, 3
-	note D#, 1
-	note D_, 1
-	note D_, 1
+	note D#, 4
+	note D_, 2
+	note D#, 4
+	note D#, 2
+	note D_, 4
+	note D#, 4
+	note D_, 2
+	note D#, 4
+	note D#, 2
+	note D_, 2
+	note D_, 2
 	loopchannel 0, Music_LookRival_branch_f5118
 ; f5127
--- a/audio/music/lookrocket.asm
+++ b/audio/music/lookrocket.asm
@@ -15,8 +15,8 @@
 	vibrato $5, $64
 	notetype $c, $a8
 	octave 4
-	note C_, 0
-	note D_, 0
+	note C_, 1
+	note D_, 1
 	callchannel Music_LookRocket_branch_f74e6
 	dutycycle $1
 
@@ -25,8 +25,8 @@
 	callchannel Music_LookRocket_branch_f74f7
 	callchannel Music_LookRocket_branch_f758a
 	octave 4
-	note F#, 0
-	note __, 0
+	note F#, 1
+	note __, 1
 	intensity $53
 	callchannel Music_LookRocket_branch_f750c
 	intensity $c3
@@ -33,55 +33,55 @@
 	callchannel Music_LookRocket_branch_f750c
 	intensity $e3
 	callchannel Music_LookRocket_branch_f750c
-	note __, 15
+	note __, 16
 	loopchannel 0, Music_LookRocket_branch_f74c7
 ; f74e6
 
-Music_RocketTheme_branch_f74e6: ; f74e6
-
 Music_LookRocket_branch_f74e6: ; f74e6
-	note D#, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note C#, 0
-	note __, 0
-	note C_, 0
-	note __, 2
+
+Music_RocketTheme_branch_f74e6: ; f74e6
+	note D#, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	note C_, 1
+	note __, 3
 	octave 2
-	note F_, 0
-	note G#, 0
-	note B_, 0
+	note F_, 1
+	note G#, 1
+	note B_, 1
 	octave 3
-	note D_, 0
-	note F_, 0
-	note G#, 0
+	note D_, 1
+	note F_, 1
+	note G#, 1
 	endchannel
 ; f74f7
 
-Music_RocketTheme_branch_f74f7: ; f74f7
-
 Music_LookRocket_branch_f74f7: ; f74f7
-	note __, 1
+
+Music_RocketTheme_branch_f74f7: ; f74f7
+	note __, 2
 	octave 3
-	note D#, 0
-	note __, 4
-	note D#, 3
+	note D#, 1
+	note __, 5
+	note D#, 4
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note D#, 0
-	note F_, 0
-	note F#, 5
-	note D#, 0
-	note __, 2
-	note F#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
+	note D#, 1
+	note F_, 1
+	note F#, 6
+	note D#, 1
+	note __, 3
+	note F#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
 	octave 4
-	note F#, 0
-	note __, 0
+	note F#, 1
+	note __, 1
 	endchannel
 ; f750c
 
@@ -88,13 +88,13 @@
 Music_LookRocket_branch_f750c: ; f750c
 
 Music_RocketTheme_branch_f750c: ; f750c
-	note __, 1
+	note __, 2
 	octave 2
-	note B_, 0
-	note __, 6
+	note B_, 1
+	note __, 7
 	octave 3
-	note C_, 0
-	note __, 4
+	note C_, 1
+	note __, 5
 	endchannel
 ; f7514
 
@@ -105,8 +105,8 @@
 	notetype $c, $b7
 	stereopanning $ff
 	octave 5
-	note C_, 0
-	note D_, 0
+	note C_, 1
+	note D_, 1
 	callchannel Music_LookRocket_branch_f7547
 
 Music_LookRocket_branch_f7526: ; f7526
@@ -113,8 +113,8 @@
 	intensity $b7
 	callchannel Music_LookRocket_branch_f758a
 	octave 5
-	note C_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
 	callchannel Music_LookRocket_branch_f7554
 	intensity $53
 	callchannel Music_LookRocket_branch_f7568
@@ -129,16 +129,16 @@
 Music_LookRocket_branch_f7547: ; f7547
 
 Music_RocketTheme_branch_f7547: ; f7547
-	note D#, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note C#, 0
-	note __, 0
-	note C_, 0
-	note __, 2
+	note D#, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	note C_, 1
+	note __, 3
 	octave 3
-	note B_, 5
+	note B_, 6
 	dutycycle $0
 	endchannel
 ; f7554
@@ -146,25 +146,25 @@
 Music_LookRocket_branch_f7554: ; f7554
 
 Music_RocketTheme_branch_f7554: ; f7554
-	note __, 1
-	octave 4
-	note D#, 0
-	note __, 4
-	note F_, 3
-	note C_, 0
-	note D_, 0
-	note D#, 0
-	note F_, 0
-	note F#, 5
-	note D#, 0
 	note __, 2
-	note F#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
+	octave 4
+	note D#, 1
+	note __, 5
+	note F_, 4
+	note C_, 1
+	note D_, 1
+	note D#, 1
+	note F_, 1
+	note F#, 6
+	note D#, 1
+	note __, 3
+	note F#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
 	octave 5
-	note D#, 0
-	note __, 0
+	note D#, 1
+	note __, 1
 	endchannel
 ; f7568
 
@@ -171,12 +171,12 @@
 Music_LookRocket_branch_f7568: ; f7568
 
 Music_RocketTheme_branch_f7568: ; f7568
-	note __, 1
+	note __, 2
 	octave 3
-	note F_, 0
-	note __, 6
-	note F#, 0
-	note __, 4
+	note F_, 1
+	note __, 7
+	note F#, 1
+	note __, 5
 	endchannel
 ; f756f
 
@@ -184,45 +184,45 @@
 
 Music_RocketTheme_branch_f756f: ; f756f
 	intensity $63
-	note G#, 0
-	note F_, 0
-	note D_, 0
+	note G#, 1
+	note F_, 1
+	note D_, 1
 	octave 2
-	note B_, 0
+	note B_, 1
 	intensity $a3
 	octave 3
-	note A_, 0
-	note F#, 0
-	note D#, 0
-	note C_, 0
+	note A_, 1
+	note F#, 1
+	note D#, 1
+	note C_, 1
 	intensity $c3
-	note A#, 0
-	note G_, 0
-	note E_, 0
-	note C#, 0
+	note A#, 1
+	note G_, 1
+	note E_, 1
+	note C#, 1
 	intensity $f3
-	note B_, 0
-	note G#, 0
-	note F_, 0
-	note D_, 0
+	note B_, 1
+	note G#, 1
+	note F_, 1
+	note D_, 1
 	endchannel
 ; f758a
 
-Music_RocketTheme_branch_f758a: ; f758a
-
 Music_LookRocket_branch_f758a: ; f758a
+
+Music_RocketTheme_branch_f758a: ; f758a
 	octave 3
-	note __, 1
-	note G_, 0
-	note __, 4
-	note A_, 7
-	note A#, 5
-	note A_, 0
 	note __, 2
-	note A#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note G_, 1
+	note __, 5
+	note A_, 8
+	note A#, 6
+	note A_, 1
+	note __, 3
+	note A#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
 	endchannel
 
 Music_LookRocket_Ch3: ; f7597
@@ -230,7 +230,7 @@
 	vibrato $4, $22
 	notetype $c, $14
 	stereopanning $f0
-	note __, 1
+	note __, 2
 	callchannel Music_LookRocket_branch_f75bf
 
 Music_LookRocket_branch_f75a5: ; f75a5
@@ -245,79 +245,79 @@
 	loopchannel 0, Music_LookRocket_branch_f75a5
 ; f75bf
 
-Music_RocketTheme_branch_f75bf: ; f75bf
-
 Music_LookRocket_branch_f75bf: ; f75bf
+
+Music_RocketTheme_branch_f75bf: ; f75bf
 	octave 3
-	note F_, 0
-	note __, 0
-	note G#, 0
-	note __, 0
+	note F_, 1
+	note __, 1
+	note G#, 1
+	note __, 1
 	octave 4
-	note C_, 0
-	note __, 0
-	note D_, 0
-	note __, 2
+	note C_, 1
+	note __, 1
+	note D_, 1
+	note __, 3
 	octave 3
-	note D_, 5
+	note D_, 6
 	endchannel
 ; f75cc
 
-Music_RocketTheme_branch_f75cc: ; f75cc
-
 Music_LookRocket_branch_f75cc: ; f75cc
+
+Music_RocketTheme_branch_f75cc: ; f75cc
 	octave 2
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
 	octave 3
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
 	octave 2
-	note G#, 0
-	note __, 0
-	note G#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note G#, 1
+	note __, 1
+	note G#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
 	octave 3
-	note A_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
+	note A_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
 	endchannel
 ; f75e1
 
-Music_RocketTheme_branch_f75e1: ; f75e1
-
 Music_LookRocket_branch_f75e1: ; f75e1
+
+Music_RocketTheme_branch_f75e1: ; f75e1
 	intensity $24
 	octave 2
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
 	octave 3
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
 	octave 2
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
 	octave 3
-	note F#, 0
-	note __, 0
+	note F#, 1
+	note __, 1
 	intensity $14
 	octave 2
-	note A#, 0
-	note __, 0
+	note A#, 1
+	note __, 1
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 2
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 3
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
 	endchannel
 ; f75fe
 
@@ -324,74 +324,74 @@
 Music_LookRocket_branch_f75fe: ; f75fe
 
 Music_RocketTheme_branch_f75fe: ; f75fe
-	note C_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
 	octave 4
-	note C_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
 	octave 3
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
 	octave 4
-	note C_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
 	octave 3
-	note C_, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
 	endchannel
 ; f7623
 
-Music_RocketTheme_branch_f7623: ; f7623
-
 Music_LookRocket_branch_f7623: ; f7623
+
+Music_RocketTheme_branch_f7623: ; f7623
 	octave 2
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
 	octave 3
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
 	octave 2
-	note G#, 0
-	note __, 0
-	note G#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note G#, 1
+	note __, 1
+	note G#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
 	octave 3
-	note A_, 0
-	note __, 0
-	note G#, 0
-	note F#, 0
-	note D#, 0
-	note C_, 0
+	note A_, 1
+	note __, 1
+	note G#, 1
+	note F#, 1
+	note D#, 1
+	note C_, 1
 	endchannel
 
 Music_LookRocket_Ch4: ; f7638
 	togglenoise $3
 	notetype $c
-	note __, 1
+	note __, 2
 	callchannel Music_LookRocket_branch_f765c
 
 Music_LookRocket_branch_f7640: ; f7640
@@ -409,13 +409,13 @@
 Music_LookRocket_branch_f765c: ; f765c
 
 Music_RocketTheme_branch_f765c: ; f765c
-	note C_, 7
+	note C_, 8
+	note D_, 2
+	note D#, 2
+	note C#, 1
+	note C#, 1
 	note D_, 1
-	note D#, 1
-	note C#, 0
-	note C#, 0
-	note D_, 0
-	note D_, 0
+	note D_, 1
 	endchannel
 ; f7664
 
@@ -422,13 +422,13 @@
 Music_LookRocket_branch_f7664: ; f7664
 
 Music_RocketTheme_branch_f7664: ; f7664
-	note D#, 1
-	note F#, 1
-	note D_, 1
-	note F#, 1
-	note D#, 1
-	note F#, 1
-	note D_, 1
-	note F#, 1
+	note D#, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
+	note D#, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
 	endchannel
 ; f766d
--- a/audio/music/looksage.asm
+++ b/audio/music/looksage.asm
@@ -10,97 +10,97 @@
 	volume $77
 	dutycycle $3
 	notetype $c, $b3
-	note __, 1
-	note __, 15
+	note __, 2
+	note __, 16
 	callchannel Music_LookSage_branch_ee3fa
 	intensity $b3
 	octave 3
-	note D_, 1
+	note D_, 2
 	intensity $93
-	note D_, 1
+	note D_, 2
 	intensity $b3
-	note E_, 1
+	note E_, 2
 	intensity $93
-	note E_, 1
+	note E_, 2
 	intensity $b3
-	note A_, 1
+	note A_, 2
 	intensity $93
-	note A_, 1
+	note A_, 2
 	intensity $b3
-	note F_, 1
+	note F_, 2
 	intensity $93
-	note F_, 1
+	note F_, 2
 
 Music_LookSage_branch_ee38e: ; ee38e
 	intensity $b3
-	note D_, 1
+	note D_, 2
 	intensity $93
-	note D_, 1
+	note D_, 2
 	intensity $b3
 	octave 2
-	note B_, 1
+	note B_, 2
 	intensity $93
-	note B_, 1
+	note B_, 2
 	intensity $b3
-	note A_, 1
+	note A_, 2
 	intensity $93
-	note A_, 1
+	note A_, 2
 	intensity $b3
-	note B_, 1
+	note B_, 2
 	intensity $93
-	note B_, 1
+	note B_, 2
 	intensity $b3
 	octave 3
-	note D_, 1
+	note D_, 2
 	intensity $93
-	note D_, 1
+	note D_, 2
 	intensity $b3
 	octave 2
-	note B_, 1
+	note B_, 2
 	intensity $93
-	note B_, 1
+	note B_, 2
 	intensity $b3
 	octave 3
-	note D_, 1
+	note D_, 2
 	intensity $93
-	note D_, 1
+	note D_, 2
 	intensity $b3
-	note E_, 1
+	note E_, 2
 	intensity $93
-	note E_, 1
+	note E_, 2
 	intensity $b3
-	note F_, 1
+	note F_, 2
 	intensity $93
-	note F_, 1
+	note F_, 2
 	intensity $b3
-	note D_, 1
+	note D_, 2
 	intensity $93
-	note D_, 1
+	note D_, 2
 	intensity $b3
-	note E_, 1
+	note E_, 2
 	intensity $93
-	note E_, 1
+	note E_, 2
 	intensity $b3
-	note A_, 1
+	note A_, 2
 	intensity $93
-	note A_, 1
+	note A_, 2
 	intensity $b3
-	note D_, 1
+	note D_, 2
 	intensity $93
-	note D_, 1
+	note D_, 2
 	intensity $b3
 	octave 2
-	note B_, 1
+	note B_, 2
 	intensity $93
-	note B_, 1
+	note B_, 2
 	intensity $b3
-	note A_, 1
+	note A_, 2
 	intensity $93
-	note A_, 1
+	note A_, 2
 	intensity $b3
-	note B_, 1
+	note B_, 2
 	intensity $93
-	note B_, 1
+	note B_, 2
 	callchannel Music_LookSage_branch_ee3fa
 	loopchannel 0, Music_LookSage_branch_ee38e
 ; ee3fa
@@ -108,21 +108,21 @@
 Music_LookSage_branch_ee3fa: ; ee3fa
 	intensity $b3
 	octave 2
-	note E_, 1
+	note E_, 2
 	intensity $93
-	note E_, 1
+	note E_, 2
 	intensity $b3
-	note A_, 1
+	note A_, 2
 	intensity $93
-	note A_, 1
+	note A_, 2
 	intensity $b3
-	note B_, 1
+	note B_, 2
 	intensity $93
-	note B_, 1
+	note B_, 2
 	intensity $b3
-	note A_, 1
+	note A_, 2
 	intensity $93
-	note A_, 1
+	note A_, 2
 	endchannel
 
 Music_LookSage_Ch3: ; ee414
@@ -130,55 +130,55 @@
 	vibrato $16, $23
 	notetype $c, $10
 	octave 5
-	note B_, 0
+	note B_, 1
 	octave 6
-	note C_, 0
+	note C_, 1
 	octave 5
-	note B_, 15
+	note B_, 16
 	vibrato $7, $23
-	note B_, 7
+	note B_, 8
 	vibrato $14, $23
 	octave 6
-	note D_, 5
-	note E_, 0
-	note F_, 0
-	note E_, 13
-	note G_, 0
-	note G#, 0
+	note D_, 6
+	note E_, 1
+	note F_, 1
+	note E_, 14
+	note G_, 1
+	note G#, 1
 
 Music_LookSage_branch_ee430: ; ee430
-	note A_, 11
-	note B_, 3
-	note D_, 8
-	note E_, 0
-	note F_, 0
-	note D_, 0
+	note A_, 12
+	note B_, 4
+	note D_, 9
+	note E_, 1
+	note F_, 1
+	note D_, 1
 	vibrato $0, $0
-	note E_, 3
+	note E_, 4
 	vibrato $7, $23
-	note E_, 7
+	note E_, 8
 	vibrato $14, $23
 	octave 5
-	note B_, 7
+	note B_, 8
 	octave 6
-	note F_, 7
+	note F_, 8
 	notetype $6, $10
-	note E_, 0
-	note D#, 0
-	note D_, 0
-	note C#, 0
-	note C_, 0
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
 	octave 5
-	note B_, 0
-	note A#, 0
-	note A_, 0
-	note __, 3
+	note B_, 1
+	note A#, 1
+	note A_, 1
+	note __, 4
 	octave 6
-	note E_, 1
-	note F_, 1
+	note E_, 2
+	note F_, 2
 	notetype $c, $10
-	note E_, 13
-	note G_, 0
-	note G#, 0
+	note E_, 14
+	note G_, 1
+	note G#, 1
 	loopchannel 0, Music_LookSage_branch_ee430
 ; ee45f
--- a/audio/music/lookyoungster.asm
+++ b/audio/music/lookyoungster.asm
@@ -12,54 +12,54 @@
 	dutycycle $3
 	notetype $c, $a3
 	octave 3
-	note G_, 0
-	note G#, 0
-	note A_, 0
-	note A#, 0
+	note G_, 1
+	note G#, 1
+	note A_, 1
+	note A#, 1
 	intensity $3e
-	note B_, 15
+	note B_, 16
 	intensity $c3
 	octave 4
-	note C_, 0
+	note C_, 1
+	note __, 3
+	note C_, 4
 	note __, 2
-	note C_, 3
-	note __, 1
-	note C_, 5
+	note C_, 6
 	intensity $b3
 
 Music_LookYoungster_branch_f66ea: ; f66ea
-	note __, 1
+	note __, 2
 	octave 3
-	note G_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
 	octave 4
-	note D_, 0
-	note __, 0
-	note C_, 0
-	note __, 2
-	note C_, 0
-	note __, 0
-	note __, 15
+	note D_, 1
 	note __, 1
+	note C_, 1
+	note __, 3
+	note C_, 1
+	note __, 1
+	note __, 16
+	note __, 2
 	octave 3
-	note G_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
 	octave 4
-	note D_, 0
-	note __, 0
-	note C_, 0
-	note __, 2
-	note C_, 0
-	note __, 0
-	note __, 15
+	note D_, 1
+	note __, 1
+	note C_, 1
+	note __, 3
+	note C_, 1
+	note __, 1
+	note __, 16
 	loopchannel 0, Music_LookYoungster_branch_f66ea
 INCBIN "baserom.gbc", $f670e, $f670f - $f670e
 
@@ -69,95 +69,95 @@
 	dutycycle $1
 	notetype $c, $a3
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note C_, 0
-	note C#, 0
-	note D_, 0
+	note C_, 1
+	note C#, 1
+	note D_, 1
 	intensity $3e
 	notetype $c, $2e
-	note G_, 15
+	note G_, 16
 	notetype $c, $b3
 	intensity $c3
-	note F_, 0
+	note F_, 1
+	note __, 3
+	note F_, 4
 	note __, 2
-	note F_, 3
-	note __, 1
-	note F#, 5
+	note F#, 6
 
 Music_LookYoungster_branch_f672f: ; f672f
 	dutycycle $3
 	intensity $b3
-	note __, 1
+	note __, 2
 	octave 3
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 4
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
 	octave 3
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 4
-	note G_, 0
-	note __, 0
-	note F_, 0
-	note __, 2
-	note F_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
+	note F_, 1
+	note __, 3
+	note F_, 1
+	note __, 1
 	intensity $97
 	dutycycle $2
-	note D#, 0
-	note F_, 0
-	note D#, 0
-	note D_, 0
-	note C_, 0
-	note __, 0
+	note D#, 1
+	note F_, 1
+	note D#, 1
+	note D_, 1
+	note C_, 1
+	note __, 1
 	octave 3
-	note G#, 0
-	note __, 2
-	note F_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 3
+	note F_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note G#, 1
+	note __, 1
 	dutycycle $3
 	intensity $b3
+	note __, 2
+	note B_, 1
 	note __, 1
-	note B_, 0
-	note __, 0
 	octave 4
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
 	octave 3
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 4
-	note G_, 0
-	note __, 0
-	note F_, 0
-	note __, 2
-	note F_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
+	note F_, 1
+	note __, 3
+	note F_, 1
+	note __, 1
 	dutycycle $2
 	intensity $97
-	note G#, 0
-	note A#, 0
-	note G#, 0
-	note G_, 0
-	note F_, 0
-	note __, 0
-	note C_, 0
-	note __, 2
+	note G#, 1
+	note A#, 1
+	note G#, 1
+	note G_, 1
+	note F_, 1
+	note __, 1
+	note C_, 1
+	note __, 3
 	octave 3
-	note G#, 0
-	note __, 0
-	note A#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
+	note A#, 1
+	note __, 1
 	octave 4
-	note C_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
 	loopchannel 0, Music_LookYoungster_branch_f672f
 INCBIN "baserom.gbc", $f6783, $f6784 - $f6783
 
@@ -165,134 +165,134 @@
 	stereopanning $ff
 	vibrato $2, $24
 	notetype $c, $25
-	note __, 3
+	note __, 4
 	octave 2
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 2
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 2
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	intensity $15
 	octave 2
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 3
-	note G_, 0
-	note __, 0
-	note D_, 0
-	note __, 2
-	note D_, 3
+	note G_, 1
 	note __, 1
-	note G#, 5
+	note D_, 1
+	note __, 3
+	note D_, 4
+	note __, 2
+	note G#, 6
 	intensity $25
 
 Music_LookYoungster_branch_f67ae: ; f67ae
 	octave 2
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 2
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 2
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 2
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 2
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
 	octave 3
-	note D#, 0
-	note __, 0
+	note D#, 1
+	note __, 1
 	octave 2
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
 	octave 3
-	note D#, 0
-	note __, 0
+	note D#, 1
+	note __, 1
 	octave 2
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
 	octave 3
-	note D#, 0
-	note __, 0
+	note D#, 1
+	note __, 1
 	octave 2
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
 	octave 3
-	note D#, 0
-	note __, 0
+	note D#, 1
+	note __, 1
 	octave 2
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 2
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 2
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 2
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 2
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
 	octave 3
-	note D#, 0
-	note __, 0
+	note D#, 1
+	note __, 1
 	octave 2
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
 	octave 3
-	note D#, 0
-	note __, 0
+	note D#, 1
+	note __, 1
 	octave 2
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
 	octave 3
-	note D#, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note G#, 0
-	note __, 0
+	note D#, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note G#, 1
+	note __, 1
 	loopchannel 0, Music_LookYoungster_branch_f67ae
 ; f6810
 
--- a/audio/music/magnettrain.asm
+++ b/audio/music/magnettrain.asm
@@ -13,61 +13,61 @@
 	vibrato $14, $23
 	dutycycle $2
 	notetype $c, $b2
-	note __, 15
-	note __, 15
+	note __, 16
+	note __, 16
 	intensity $b7
 	octave 4
-	note D_, 0
-	note C_, 0
+	note D_, 1
+	note C_, 1
 	octave 3
-	note G_, 0
+	note G_, 1
 	octave 4
-	note C_, 0
-	note D_, 0
-	note C_, 0
+	note C_, 1
+	note D_, 1
+	note C_, 1
 	octave 3
-	note G_, 0
+	note G_, 1
 	octave 4
-	note C_, 0
-	note D_, 0
-	note C_, 0
+	note C_, 1
+	note D_, 1
+	note C_, 1
 	octave 3
-	note G_, 0
+	note G_, 1
 	octave 4
-	note C_, 0
-	note D_, 0
-	note C_, 0
+	note C_, 1
+	note D_, 1
+	note C_, 1
 	octave 3
-	note G_, 0
+	note G_, 1
 	octave 4
-	note C_, 0
-	note E_, 0
-	note C_, 0
+	note C_, 1
+	note E_, 1
+	note C_, 1
 	octave 3
-	note A_, 0
+	note A_, 1
 	octave 4
-	note C_, 0
-	note E_, 0
-	note C_, 0
+	note C_, 1
+	note E_, 1
+	note C_, 1
 	octave 3
-	note A_, 0
+	note A_, 1
 	octave 4
-	note C_, 0
-	note E_, 0
-	note C_, 0
+	note C_, 1
+	note E_, 1
+	note C_, 1
 	octave 3
-	note A_, 0
+	note A_, 1
 	octave 4
-	note C_, 0
-	note E_, 0
-	note C_, 0
+	note C_, 1
+	note E_, 1
+	note C_, 1
 	notetype $6, $b7
-	note F#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
+	note F#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
 	notetype $c, $b7
-	note D_, 15
+	note D_, 16
 	endchannel
 
 Music_MagnetTrain_Ch2: ; ef648
@@ -77,35 +77,35 @@
 	stereopanning $f0
 	notetype $c, $d8
 	octave 1
-	note F_, 11
-	note __, 1
+	note F_, 12
+	note __, 2
 	notetype $6, $d7
-	note F_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
+	note F_, 1
+	note __, 1
 	octave 2
-	note F_, 3
-	note __, 3
-	note F_, 3
-	note __, 3
-	note F_, 3
-	note __, 3
-	note F_, 3
-	note __, 3
+	note F_, 4
+	note __, 4
+	note F_, 4
+	note __, 4
+	note F_, 4
+	note __, 4
+	note F_, 4
+	note __, 4
 	dutycycle $3
 	notetype $c, $d7
 	octave 4
-	note G_, 15
-	note A_, 12
-	note __, 0
+	note G_, 16
+	note A_, 13
+	note __, 1
 	notetype $6, $d7
-	note A_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
 	notetype $c, $d7
-	note A_, 15
+	note A_, 16
 	endchannel
 
 Music_MagnetTrain_Ch3: ; ef67d
@@ -113,171 +113,171 @@
 	vibrato $10, $23
 	notetype $c, $15
 	octave 6
-	note C_, 0
+	note C_, 1
 	octave 5
-	note G_, 0
-	note D#, 0
-	note C_, 0
-	note G_, 0
-	note D#, 0
-	note C_, 0
+	note G_, 1
+	note D#, 1
+	note C_, 1
+	note G_, 1
+	note D#, 1
+	note C_, 1
 	octave 4
-	note G_, 0
+	note G_, 1
 	octave 5
-	note D#, 0
-	note C_, 0
+	note D#, 1
+	note C_, 1
 	octave 4
-	note G_, 0
-	note D#, 0
+	note G_, 1
+	note D#, 1
 	octave 5
-	note C_, 0
+	note C_, 1
 	octave 4
-	note G_, 0
-	note D#, 0
-	note C_, 0
-	note G_, 0
-	note D#, 0
-	note C_, 0
+	note G_, 1
+	note D#, 1
+	note C_, 1
+	note G_, 1
+	note D#, 1
+	note C_, 1
 	octave 3
-	note G_, 0
+	note G_, 1
 	octave 4
-	note C_, 0
-	note D#, 0
-	note G_, 0
-	note C_, 0
-	note D#, 0
-	note G_, 0
+	note C_, 1
+	note D#, 1
+	note G_, 1
+	note C_, 1
+	note D#, 1
+	note G_, 1
 	octave 5
-	note C_, 0
+	note C_, 1
 	octave 4
-	note G_, 0
+	note G_, 1
 	octave 5
-	note C_, 0
-	note D#, 0
-	note G_, 0
-	note C_, 0
+	note C_, 1
+	note D#, 1
+	note G_, 1
+	note C_, 1
 	octave 2
-	note D_, 0
+	note D_, 1
 	octave 3
-	note D_, 0
+	note D_, 1
 	octave 2
-	note D_, 0
+	note D_, 1
 	octave 3
-	note D_, 0
+	note D_, 1
 	octave 2
-	note D_, 0
+	note D_, 1
 	octave 3
-	note D_, 0
+	note D_, 1
 	octave 2
-	note D_, 0
+	note D_, 1
 	octave 3
-	note D_, 0
+	note D_, 1
 	octave 2
-	note D_, 0
+	note D_, 1
 	octave 3
-	note D_, 0
+	note D_, 1
 	octave 2
-	note D_, 0
+	note D_, 1
 	octave 3
-	note D_, 0
+	note D_, 1
 	octave 2
-	note D_, 0
+	note D_, 1
 	octave 3
-	note D_, 0
+	note D_, 1
 	octave 2
-	note D_, 0
+	note D_, 1
 	octave 3
-	note D_, 0
+	note D_, 1
 	octave 2
-	note D_, 0
+	note D_, 1
 	octave 3
-	note D_, 0
+	note D_, 1
 	octave 2
-	note D_, 0
+	note D_, 1
 	octave 3
-	note D_, 0
+	note D_, 1
 	octave 2
-	note D_, 0
+	note D_, 1
 	octave 3
-	note D_, 0
+	note D_, 1
 	octave 2
-	note D_, 0
+	note D_, 1
 	octave 3
-	note D_, 0
+	note D_, 1
 	octave 2
-	note D_, 0
+	note D_, 1
 	octave 3
-	note D_, 0
+	note D_, 1
 	octave 2
-	note D_, 0
+	note D_, 1
 	octave 3
-	note D_, 0
+	note D_, 1
 	octave 2
-	note D_, 0
+	note D_, 1
 	octave 3
-	note D_, 0
+	note D_, 1
 	octave 2
-	note D_, 0
+	note D_, 1
 	octave 3
-	note D_, 0
+	note D_, 1
 	octave 2
-	note D_, 15
+	note D_, 16
 	endchannel
 
 Music_MagnetTrain_Ch4: ; ef6f4
 	togglenoise $3
 	notetype $c
-	note B_, 11
-	note D_, 1
-	note A#, 0
-	note A#, 0
+	note B_, 12
+	note D_, 2
+	note A#, 1
+	note A#, 1
 	notetype $6
-	note D#, 3
-	note F#, 3
-	note D#, 3
-	note F#, 3
-	note A#, 3
-	note F#, 3
-	note A#, 3
-	note D_, 1
-	note D_, 1
+	note D#, 4
+	note F#, 4
+	note D#, 4
+	note F#, 4
+	note A#, 4
+	note F#, 4
+	note A#, 4
+	note D_, 2
+	note D_, 2
 	callchannel Music_MagnetTrain_branch_ef71e
 	callchannel Music_MagnetTrain_branch_ef71e
 	notetype $c
-	note B_, 15
+	note B_, 16
 	endchannel
 ; ef711
-	note G#, 0
-	note G_, 0
-	note G_, 0
-	note G#, 0
-	note G_, 0
-	note G_, 0
-	note G#, 0
-	note G_, 0
-	note G_, 0
-	note G#, 0
-	note G_, 0
-	note G_, 0
-	endchannel
-; ef71e
-
-Music_MagnetTrain_branch_ef71e: ; ef71e
 	note G#, 1
 	note G_, 1
 	note G_, 1
-	note G_, 1
 	note G#, 1
 	note G_, 1
 	note G_, 1
-	note G_, 1
 	note G#, 1
 	note G_, 1
 	note G_, 1
-	note G_, 1
 	note G#, 1
 	note G_, 1
 	note G_, 1
-	note G_, 1
+	endchannel
+; ef71e
+
+Music_MagnetTrain_branch_ef71e: ; ef71e
+	note G#, 2
+	note G_, 2
+	note G_, 2
+	note G_, 2
+	note G#, 2
+	note G_, 2
+	note G_, 2
+	note G_, 2
+	note G#, 2
+	note G_, 2
+	note G_, 2
+	note G_, 2
+	note G#, 2
+	note G_, 2
+	note G_, 2
+	note G_, 2
 	endchannel
 ; ef72f
--- a/audio/music/mainmenu.asm
+++ b/audio/music/mainmenu.asm
@@ -15,33 +15,33 @@
 	stereopanning $f0
 	notetype $c, $f
 	octave 3
-	note D_, 7
+	note D_, 8
 
 Music_MainMenu_branch_f791d: ; f791d
 	notetype $c, $92
 	octave 3
-	note C#, 5
-	note C#, 0
-	note C#, 0
+	note C#, 6
 	note C#, 1
 	note C#, 1
-	note C#, 3
+	note C#, 2
+	note C#, 2
+	note C#, 4
 	loopchannel 2, Music_MainMenu_branch_f791d
-	note D#, 5
-	note D#, 0
-	note D#, 0
+	note D#, 6
 	note D#, 1
 	note D#, 1
-	note D#, 3
+	note D#, 2
+	note D#, 2
+	note D#, 4
 	octave 2
-	note B_, 5
-	note B_, 0
-	note B_, 0
+	note B_, 6
 	note B_, 1
 	note B_, 1
+	note B_, 2
+	note B_, 2
 	notetype $c, $94
 	octave 3
-	note C_, 3
+	note C_, 4
 	loopchannel 0, Music_MainMenu_branch_f791d
 
 Music_MainMenu_Ch2: ; f7940
@@ -49,70 +49,70 @@
 	stereopanning $f
 	notetype $c, $f
 	octave 3
-	note G_, 7
+	note G_, 8
 
 Music_MainMenu_branch_f7949: ; f7949
 	notetype $c, $a2
-	note F#, 5
-	note F#, 0
-	note F#, 0
+	note F#, 6
 	note F#, 1
 	note F#, 1
-	note F#, 3
+	note F#, 2
+	note F#, 2
+	note F#, 4
 	loopchannel 2, Music_MainMenu_branch_f7949
-	note G#, 5
-	note G#, 0
-	note G#, 0
+	note G#, 6
 	note G#, 1
 	note G#, 1
-	note G#, 3
-	note E_, 5
-	note E_, 0
-	note E_, 0
+	note G#, 2
+	note G#, 2
+	note G#, 4
+	note E_, 6
 	note E_, 1
 	note E_, 1
+	note E_, 2
+	note E_, 2
 	notetype $c, $a4
-	note F_, 3
+	note F_, 4
 	loopchannel 0, Music_MainMenu_branch_f7949
 
 Music_MainMenu_Ch3: ; f7969
 	stereopanning $f0
 	notetype $c, $25
-	note __, 7
+	note __, 8
 
 Music_MainMenu_branch_f796f: ; f796f
 	octave 2
-	note F#, 0
-	note __, 4
-	note F#, 0
-	note F#, 0
-	note F#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note F#, 0
-	note __, 2
+	note F#, 1
+	note __, 5
+	note F#, 1
+	note F#, 1
+	note F#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note F#, 1
+	note __, 3
 	loopchannel 2, Music_MainMenu_branch_f796f
-	note G#, 0
-	note __, 4
-	note G#, 0
-	note G#, 0
-	note G#, 0
-	note __, 0
-	note G#, 0
-	note __, 0
-	note G#, 0
-	note __, 2
-	note E_, 0
-	note __, 4
-	note E_, 0
-	note E_, 0
-	note E_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note F_, 0
-	note __, 2
+	note G#, 1
+	note __, 5
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	note __, 1
+	note G#, 1
+	note __, 1
+	note G#, 1
+	note __, 3
+	note E_, 1
+	note __, 5
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note F_, 1
+	note __, 3
 	loopchannel 0, Music_MainMenu_branch_f796f
 
 Music_MainMenu_Ch4: ; f7996
@@ -119,31 +119,31 @@
 	stereopanning $f
 	togglenoise $3
 	notetype $c
-	note __, 7
-	note __, 15
-	note __, 15
-	note __, 15
-	note __, 11
-	note D_, 0
-	note D_, 0
-	note D_, 0
-	note D_, 0
+	note __, 8
+	note __, 16
+	note __, 16
+	note __, 16
+	note __, 12
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
 
 Music_MainMenu_branch_f79a5: ; f79a5
-	note D_, 5
-	note D_, 0
-	note D_, 0
+	note D_, 6
 	note D_, 1
 	note D_, 1
-	note D_, 3
-	note D_, 5
-	note D_, 0
-	note D_, 0
+	note D_, 2
+	note D_, 2
+	note D_, 4
+	note D_, 6
 	note D_, 1
 	note D_, 1
-	note D#, 0
-	note D#, 0
-	note D_, 0
-	note D_, 0
+	note D_, 2
+	note D_, 2
+	note D#, 1
+	note D#, 1
+	note D_, 1
+	note D_, 1
 	loopchannel 0, Music_MainMenu_branch_f79a5
 ; f79b8
--- a/audio/music/mobileadapter.asm
+++ b/audio/music/mobileadapter.asm
@@ -13,139 +13,139 @@
 	stereopanning $f
 	dutycycle $2
 	notetype $c, $84
-	note __, 1
-	note __, 5
+	note __, 2
+	note __, 6
 	octave 3
-	note G_, 0
+	note G_, 1
 	octave 4
-	note D_, 0
-	note E_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note C#, 3
+	note D_, 1
+	note E_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note C#, 4
 
 Music_MobileAdapter_branch_1fcad: ; 1fcad
 	callchannel Music_MobileAdapter_branch_1fd39
-	note D_, 0
-	note C#, 0
 	note D_, 1
+	note C#, 1
+	note D_, 2
 	octave 3
-	note A_, 0
-	note G_, 0
 	note A_, 1
-	note F#, 0
-	note E_, 0
+	note G_, 1
+	note A_, 2
 	note F#, 1
-	note D_, 0
-	note C#, 0
+	note E_, 1
+	note F#, 2
 	note D_, 1
+	note C#, 1
+	note D_, 2
 	callchannel Music_MobileAdapter_branch_1fd39
-	note D_, 0
-	note C#, 0
+	note D_, 1
+	note C#, 1
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note D_, 0
-	note F#, 0
-	note E_, 0
-	note D_, 0
-	note C#, 0
-	intensity $94
 	note D_, 1
+	note F#, 1
+	note E_, 1
+	note D_, 1
+	note C#, 1
+	intensity $94
+	note D_, 2
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note D_, 3
+	note D_, 4
 	octave 5
-	note C#, 0
-	note __, 0
-	note C#, 0
-	note __, 0
-	note C#, 0
-	note __, 0
+	note C#, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	note C#, 1
+	note __, 1
 	octave 4
-	note C#, 7
+	note C#, 8
 	intensity $92
-	note F#, 0
-	note G_, 0
-	note A_, 1
-	note G#, 1
-	note A_, 1
-	intensity $94
-	note E_, 2
-	octave 3
+	note F#, 1
+	note G_, 1
 	note A_, 2
+	note G#, 2
+	note A_, 2
+	intensity $94
 	note E_, 3
+	octave 3
+	note A_, 3
+	note E_, 4
 	octave 4
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
 	octave 3
-	note B_, 7
+	note B_, 8
 	intensity $92
 	octave 4
-	note B_, 0
-	octave 5
-	note C_, 0
-	note C#, 1
-	octave 4
 	note B_, 1
-	note A_, 1
 	octave 5
+	note C_, 1
 	note C#, 2
+	octave 4
+	note B_, 2
+	note A_, 2
+	octave 5
+	note C#, 3
 	intensity $94
 	octave 4
-	note C#, 2
+	note C#, 3
 	octave 3
-	note A_, 3
+	note A_, 4
 	octave 4
-	note F#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
+	note F#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
 	octave 3
-	note F#, 9
+	note F#, 10
 	octave 4
-	note D_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
 	octave 3
-	note D_, 9
+	note D_, 10
 	octave 4
-	note A_, 7
+	note A_, 8
 	intensity $a1
 	octave 3
-	note C#, 0
-	note D_, 0
-	note E_, 0
-	note F#, 0
-	note G_, 0
-	note A_, 0
-	note B_, 0
+	note C#, 1
+	note D_, 1
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
 	octave 4
-	note C#, 0
-	note D_, 0
-	note C#, 0
+	note C#, 1
 	note D_, 1
+	note C#, 1
+	note D_, 2
 	octave 3
-	note A_, 0
-	note G_, 0
 	note A_, 1
+	note G_, 1
+	note A_, 2
 	intensity $94
-	note F#, 1
+	note F#, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note D_, 3
+	note D_, 4
 	intensity $77
 	callchannel Music_MobileAdapter_branch_1ff09
 	loopchannel 0, Music_MobileAdapter_branch_1fcad
@@ -154,43 +154,43 @@
 Music_MobileAdapter_branch_1fd39: ; 1fd39
 	intensity $94
 	octave 4
-	note F#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
 	note F#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note F#, 2
 	octave 3
-	note F#, 9
+	note F#, 10
 	octave 4
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
 	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note G_, 2
 	octave 3
-	note G_, 7
+	note G_, 8
 	intensity $a1
-	note B_, 0
+	note B_, 1
 	octave 4
-	note D_, 0
-	note E_, 0
-	note D_, 0
-	note C#, 0
-	note E_, 0
-	note D_, 0
-	note C#, 0
+	note D_, 1
+	note E_, 1
+	note D_, 1
+	note C#, 1
+	note E_, 1
+	note D_, 1
+	note C#, 1
 	octave 3
-	note B_, 0
-	note A_, 0
-	note E_, 0
-	note F#, 0
-	note G_, 0
-	note F#, 0
-	note E_, 0
-	note A_, 0
-	note B_, 0
+	note B_, 1
+	note A_, 1
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	note F#, 1
+	note E_, 1
+	note A_, 1
+	note B_, 1
 	octave 4
-	note C#, 0
+	note C#, 1
 	endchannel
 ; 1fd63
 
@@ -199,325 +199,325 @@
 	vibrato $10, $23
 	dutycycle $2
 	octave 3
-	note G_, 0
-	note B_, 0
+	note G_, 1
+	note B_, 1
 	octave 4
-	note D_, 0
-	note C#, 0
 	note D_, 1
+	note C#, 1
+	note D_, 2
 	octave 3
-	note B_, 0
-	note A#, 0
 	note B_, 1
+	note A#, 1
+	note B_, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note B_, 1
-	note A_, 1
+	note B_, 2
+	note A_, 2
 	intensity $b4
 	octave 4
-	note D_, 0
-	note F#, 0
+	note D_, 1
+	note F#, 1
 
 Music_MobileAdapter_branch_1fd80: ; 1fd80
 	callchannel Music_MobileAdapter_branch_1fdfe
-	note A_, 3
-	note G_, 3
-	note A_, 3
-	note E_, 3
-	note F#, 11
-	note __, 1
-	note D_, 0
-	note F#, 0
+	note A_, 4
+	note G_, 4
+	note A_, 4
+	note E_, 4
+	note F#, 12
+	note __, 2
+	note D_, 1
+	note F#, 1
 	callchannel Music_MobileAdapter_branch_1fdfe
 	octave 5
-	note C#, 3
+	note C#, 4
 	octave 4
-	note A_, 3
+	note A_, 4
 	octave 5
-	note F#, 3
-	note E_, 3
-	note D_, 11
+	note F#, 4
+	note E_, 4
+	note D_, 12
+	note __, 2
+	note C#, 1
+	note D_, 1
+	note E_, 1
 	note __, 1
-	note C#, 0
-	note D_, 0
-	note E_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note G_, 3
-	note F#, 1
 	note E_, 1
-	note D_, 1
-	note C#, 8
+	note __, 1
+	note E_, 1
+	note __, 1
+	note G_, 4
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note C#, 9
 	intensity $a2
 	octave 3
-	note E_, 2
-	note C#, 1
+	note E_, 3
+	note C#, 2
 	intensity $b4
 	octave 5
-	note D_, 0
-	note C#, 0
+	note D_, 1
+	note C#, 1
 	octave 4
-	note B_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
 	octave 5
-	note C#, 3
-	note D_, 1
-	note E_, 1
-	note F#, 1
-	note E_, 8
+	note C#, 4
+	note D_, 2
+	note E_, 2
+	note F#, 2
+	note E_, 9
 	intensity $a2
 	octave 3
-	note A_, 2
-	note E_, 1
+	note A_, 3
+	note E_, 2
 	intensity $b4
 	octave 5
-	note F#, 0
-	note G_, 0
-	note A_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note G_, 3
 	note F#, 1
-	note E_, 1
-	note D_, 0
-	note C#, 0
+	note G_, 1
+	note A_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note G_, 4
+	note F#, 2
+	note E_, 2
+	note D_, 1
+	note C#, 1
 	octave 4
-	note B_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
 	octave 5
-	note G_, 3
-	note F#, 1
-	note D_, 1
+	note G_, 4
+	note F#, 2
+	note D_, 2
 	octave 4
-	note A#, 0
-	note B_, 0
+	note A#, 1
+	note B_, 1
 	octave 5
-	note C#, 11
-	note E_, 3
-	note D_, 15
+	note C#, 12
+	note E_, 4
+	note D_, 16
 	dutycycle $1
 	intensity $71
 	callchannel Music_MobileAdapter_branch_1fe16
 	octave 4
-	note E_, 0
-	note A_, 0
+	note E_, 1
+	note A_, 1
 	octave 5
-	note C#, 0
-	note E_, 0
+	note C#, 1
+	note E_, 1
 	callchannel Music_MobileAdapter_branch_1fe16
-	note __, 1
+	note __, 2
 	dutycycle $2
 	intensity $b4
 	octave 4
-	note D_, 0
-	note F#, 0
+	note D_, 1
+	note F#, 1
 	loopchannel 0, Music_MobileAdapter_branch_1fd80
 ; 1fdfe
 
 Music_MobileAdapter_branch_1fdfe: ; 1fdfe
-	note A_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
 	note A_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note A_, 2
 	octave 5
-	note D_, 3
-	note C#, 1
+	note D_, 4
+	note C#, 2
 	octave 4
+	note B_, 2
+	note G_, 1
+	note A_, 1
 	note B_, 1
-	note G_, 0
-	note A_, 0
-	note B_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
+	note __, 1
 	note B_, 1
+	note __, 1
+	note B_, 2
 	octave 5
-	note E_, 3
-	note D_, 1
-	note C#, 1
+	note E_, 4
+	note D_, 2
+	note C#, 2
 	octave 4
-	note B_, 1
+	note B_, 2
 	endchannel
 ; 1fe16
 
 Music_MobileAdapter_branch_1fe16: ; 1fe16
 	octave 5
-	note F#, 0
-	note D_, 0
+	note F#, 1
+	note D_, 1
 	octave 4
-	note A_, 0
-	note F#, 0
+	note A_, 1
+	note F#, 1
 	octave 5
-	note F#, 0
-	note D_, 0
+	note F#, 1
+	note D_, 1
 	octave 4
-	note A_, 0
-	note F#, 0
+	note A_, 1
+	note F#, 1
 	octave 5
-	note F#, 0
-	note D_, 0
+	note F#, 1
+	note D_, 1
 	octave 4
-	note A#, 0
-	note F#, 0
+	note A#, 1
+	note F#, 1
 	octave 5
-	note F#, 0
-	note D_, 0
+	note F#, 1
+	note D_, 1
 	octave 4
-	note A#, 0
-	note F#, 0
+	note A#, 1
+	note F#, 1
 	octave 5
-	note G_, 0
-	note D_, 0
+	note G_, 1
+	note D_, 1
 	octave 4
-	note B_, 0
-	note G_, 0
+	note B_, 1
+	note G_, 1
 	octave 5
-	note G_, 0
-	note D_, 0
+	note G_, 1
+	note D_, 1
 	octave 4
-	note B_, 0
-	note G_, 0
+	note B_, 1
+	note G_, 1
 	octave 5
-	note C#, 3
+	note C#, 4
 	endchannel
 ; 1fe3d
 
 Music_MobileAdapter_Ch3: ; 1fe3d
 	notetype $c, $14
-	note __, 1
+	note __, 2
 	octave 3
-	note G_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note B_, 0
-	note G_, 0
-	note A_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note A_, 3
+	note G_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note B_, 1
+	note G_, 1
+	note A_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note A_, 4
 
 Music_MobileAdapter_branch_1fe4f: ; 1fe4f
 	callchannel Music_MobileAdapter_branch_1fecf
 	callchannel Music_MobileAdapter_branch_1fee3
 	callchannel Music_MobileAdapter_branch_1feee
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
 	octave 2
-	note A_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
 	octave 3
-	note C#, 0
-	note __, 0
+	note C#, 1
+	note __, 1
 	callchannel Music_MobileAdapter_branch_1fecf
 	callchannel Music_MobileAdapter_branch_1fee3
 	callchannel Music_MobileAdapter_branch_1feee
-	note D_, 1
+	note D_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note D_, 3
+	note D_, 4
 	callchannel Music_MobileAdapter_branch_1fee3
 	callchannel Music_MobileAdapter_branch_1fef7
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 2
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 3
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
 	octave 2
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 3
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
 	octave 2
-	note G_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
 	callchannel Music_MobileAdapter_branch_1fef7
 	octave 3
-	note D_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note C#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note C#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
 	octave 2
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 2
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 2
-	note A#, 0
-	note __, 0
+	note A#, 1
+	note __, 1
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 2
-	note A#, 0
-	note __, 0
+	note A#, 1
+	note __, 1
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	callchannel Music_MobileAdapter_branch_1fee3
-	note D_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note F#, 1
-	octave 2
+	note D_, 1
+	note __, 1
 	note A_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note F#, 2
+	octave 2
+	note A_, 2
 	octave 3
-	note D_, 3
+	note D_, 4
 	callchannel Music_MobileAdapter_branch_1ff09
 	loopchannel 0, Music_MobileAdapter_branch_1fe4f
 ; 1fecf
@@ -524,19 +524,19 @@
 
 Music_MobileAdapter_branch_1fecf: ; 1fecf
 	octave 3
-	note D_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
 	loopchannel 4, Music_MobileAdapter_branch_1fecf
 
 Music_MobileAdapter_branch_1fed8: ; 1fed8
 	octave 2
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 3
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
 	loopchannel 4, Music_MobileAdapter_branch_1fed8
 	endchannel
 ; 1fee3
@@ -543,79 +543,79 @@
 
 Music_MobileAdapter_branch_1fee3: ; 1fee3
 	octave 2
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
 	octave 3
-	note E_, 0
-	note __, 0
+	note E_, 1
+	note __, 1
 	loopchannel 4, Music_MobileAdapter_branch_1fee3
 	endchannel
 ; 1feee
 
 Music_MobileAdapter_branch_1feee: ; 1feee
-	note D_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
 	endchannel
 ; 1fef7
 
 Music_MobileAdapter_branch_1fef7: ; 1fef7
 	octave 2
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
 	octave 3
-	note C#, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note C#, 0
-	note __, 0
+	note C#, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note C#, 1
+	note __, 1
 	octave 2
-	note A_, 0
+	note A_, 1
 	octave 3
-	note E_, 1
-	note __, 0
+	note E_, 2
+	note __, 1
 	octave 2
-	note A_, 3
+	note A_, 4
 	endchannel
 ; 1ff09
 
 Music_MobileAdapter_branch_1ff09: ; 1ff09
 	octave 2
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
 	octave 3
-	note D_, 1
-	octave 2
-	note A_, 0
-	octave 3
 	note D_, 2
 	octave 2
-	note A#, 0
-	note __, 0
+	note A_, 1
 	octave 3
-	note D_, 1
+	note D_, 3
 	octave 2
-	note A#, 0
+	note A#, 1
+	note __, 1
 	octave 3
 	note D_, 2
 	octave 2
-	note B_, 0
-	note __, 0
+	note A#, 1
 	octave 3
-	note D_, 1
+	note D_, 3
 	octave 2
-	note B_, 0
+	note B_, 1
+	note __, 1
 	octave 3
 	note D_, 2
 	octave 2
-	note A_, 1
-	note __, 5
+	note B_, 1
+	octave 3
+	note D_, 3
+	octave 2
+	note A_, 2
+	note __, 6
 	loopchannel 2, Music_MobileAdapter_branch_1ff09
 	endchannel
 
@@ -623,12 +623,12 @@
 	togglenoise $3
 	stereopanning $f0
 	notetype $c
-	note __, 1
-	note __, 9
+	note __, 2
+	note __, 10
+	note D_, 2
+	note D_, 2
 	note D_, 1
 	note D_, 1
-	note D_, 0
-	note D_, 0
 
 Music_MobileAdapter_branch_1ff38: ; 1ff38
 	callchannel Music_MobileAdapter_branch_1ff60
@@ -635,43 +635,43 @@
 	callchannel Music_MobileAdapter_branch_1ff60
 
 Music_MobileAdapter_branch_1ff3e: ; 1ff3e
-	note __, 3
-	note D_, 7
-	note D_, 7
+	note __, 4
+	note D_, 8
+	note D_, 8
+	note D_, 4
+	note D_, 1
 	note D_, 3
-	note D_, 0
-	note D_, 2
-	note D_, 3
+	note D_, 4
 	loopchannel 2, Music_MobileAdapter_branch_1ff3e
 
 Music_MobileAdapter_branch_1ff49: ; 1ff49
-	note __, 3
-	note D_, 3
+	note __, 4
+	note D_, 4
 	loopchannel 11, Music_MobileAdapter_branch_1ff49
-	note __, 1
+	note __, 2
+	note D_, 2
+	note D_, 2
 	note D_, 1
 	note D_, 1
-	note D_, 0
-	note D_, 0
-	note __, 3
-	note D_, 7
-	note D_, 7
-	note D_, 5
+	note __, 4
+	note D_, 8
+	note D_, 8
+	note D_, 6
+	note D_, 2
+	note D_, 2
 	note D_, 1
 	note D_, 1
-	note D_, 0
-	note D_, 0
 	loopchannel 0, Music_MobileAdapter_branch_1ff38
 ; 1ff60
 
 Music_MobileAdapter_branch_1ff60: ; 1ff60
-	note __, 3
-	note D_, 3
+	note __, 4
+	note D_, 4
 	loopchannel 7, Music_MobileAdapter_branch_1ff60
-	note __, 1
+	note __, 2
+	note D_, 2
+	note D_, 2
 	note D_, 1
 	note D_, 1
-	note D_, 0
-	note D_, 0
 	endchannel
 ; 1ff6c
--- a/audio/music/mobileadaptermenu.asm
+++ b/audio/music/mobileadaptermenu.asm
@@ -12,27 +12,27 @@
 	stereopanning $f
 	dutycycle $2
 	notetype $c, $66
-	note __, 1
+	note __, 2
 
 Music_MobileAdapterMenu_branch_178038: ; 178038
 	callchannel Music_MobileAdapterMenu_branch_178057
 	callchannel Music_MobileAdapterMenu_branch_178076
 	octave 3
-	note F#, 3
-	note B_, 3
-	note F#, 1
-	note B_, 0
-	note __, 0
-	note D#, 3
+	note F#, 4
+	note B_, 4
+	note F#, 2
+	note B_, 1
+	note __, 1
+	note D#, 4
 	callchannel Music_MobileAdapterMenu_branch_178076
 	octave 3
-	note F#, 1
+	note F#, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note D#, 2
-	note E_, 0
-	note D#, 7
+	note D#, 3
+	note E_, 1
+	note D#, 8
 	callchannel Music_MobileAdapterMenu_branch_178057
 	loopchannel 0, Music_MobileAdapterMenu_branch_178038
 ; 178057
@@ -39,52 +39,52 @@
 
 Music_MobileAdapterMenu_branch_178057: ; 178057
 	octave 3
-	note G#, 6
+	note G#, 7
 	octave 4
-	note E_, 0
-	note D#, 0
-	note __, 0
+	note E_, 1
+	note D#, 1
+	note __, 1
 	octave 3
-	note B_, 0
-	note __, 0
-	note F#, 3
-	note E_, 7
-	note D#, 0
-	note __, 0
-	note C#, 0
-	note __, 0
-	note D#, 3
-	note G#, 6
+	note B_, 1
+	note __, 1
+	note F#, 4
+	note E_, 8
+	note D#, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	note D#, 4
+	note G#, 7
 	octave 4
-	note E_, 0
-	note D#, 0
-	note __, 0
-	octave 3
-	note B_, 0
-	note __, 0
-	note F#, 3
-	note A_, 1
 	note E_, 1
+	note D#, 1
+	note __, 1
+	octave 3
+	note B_, 1
+	note __, 1
+	note F#, 4
 	note A_, 2
-	note A_, 0
-	note G#, 7
+	note E_, 2
+	note A_, 3
+	note A_, 1
+	note G#, 8
 	endchannel
 ; 178076
 
 Music_MobileAdapterMenu_branch_178076: ; 178076
-	note E_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	octave 4
-	note C#, 2
-	octave 3
-	note B_, 0
+	note E_, 1
+	note __, 1
 	note A_, 1
+	note __, 1
 	octave 4
-	note E_, 0
-	note __, 0
 	note C#, 3
+	octave 3
+	note B_, 1
+	note A_, 2
+	octave 4
+	note E_, 1
+	note __, 1
+	note C#, 4
 	endchannel
 
 Music_MobileAdapterMenu_Ch2: ; 178084
@@ -92,193 +92,193 @@
 	notetype $c, $84
 	dutycycle $2
 	octave 4
-	note E_, 0
-	note G#, 0
+	note E_, 1
+	note G#, 1
 
 Music_MobileAdapterMenu_branch_17808e: ; 17808e
 	callchannel Music_MobileAdapterMenu_branch_1780ae
-	note E_, 7
+	note E_, 8
 	callchannel Music_MobileAdapterMenu_branch_1780d7
-	note D#, 1
-	note C#, 1
 	note D#, 2
-	note E_, 0
-	note F#, 7
+	note C#, 2
+	note D#, 3
+	note E_, 1
+	note F#, 8
 	callchannel Music_MobileAdapterMenu_branch_1780d7
-	note D#, 1
+	note D#, 2
+	note E_, 2
+	note F#, 3
+	note G#, 1
+	note F#, 6
 	note E_, 1
-	note F#, 2
-	note G#, 0
-	note F#, 5
-	note E_, 0
-	note G#, 0
+	note G#, 1
 	callchannel Music_MobileAdapterMenu_branch_1780ae
-	note E_, 5
-	note E_, 0
-	note G#, 0
+	note E_, 6
+	note E_, 1
+	note G#, 1
 	loopchannel 0, Music_MobileAdapterMenu_branch_17808e
 ; 1780ae
 
 Music_MobileAdapterMenu_branch_1780ae: ; 1780ae
 	octave 4
-	note B_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note A_, 2
-	note G#, 0
-	note F#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
+	note B_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note A_, 3
+	note G#, 1
+	note F#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
 	octave 3
-	note B_, 3
+	note B_, 4
 	octave 4
-	note C#, 1
+	note C#, 2
+	note D#, 2
+	note E_, 3
+	note G#, 1
+	note F#, 6
+	note E_, 1
+	note G#, 1
+	note B_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note A_, 3
+	note G#, 1
+	note F#, 1
+	note __, 1
 	note D#, 1
-	note E_, 2
-	note G#, 0
-	note F#, 5
-	note E_, 0
-	note G#, 0
-	note B_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note A_, 2
-	note G#, 0
-	note F#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
+	note __, 1
 	octave 3
-	note B_, 3
+	note B_, 4
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note C#, 2
-	note D#, 0
+	note C#, 3
+	note D#, 1
 	endchannel
 ; 1780d7
 
 Music_MobileAdapterMenu_branch_1780d7: ; 1780d7
-	note A_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note G#, 2
-	note F#, 0
-	note E_, 1
-	note A_, 0
-	note __, 0
-	note E_, 3
+	note A_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note G#, 3
+	note F#, 1
+	note E_, 2
+	note A_, 1
+	note __, 1
+	note E_, 4
 	endchannel
 
 Music_MobileAdapterMenu_Ch3: ; 1780e2
 	vibrato $8, $34
 	notetype $c, $25
-	note __, 1
+	note __, 2
 
 Music_MobileAdapterMenu_branch_1780e9: ; 1780e9
 	callchannel Music_MobileAdapterMenu_branch_178119
 	octave 2
-	note B_, 0
-	note G#, 0
+	note B_, 1
+	note G#, 1
 	callchannel Music_MobileAdapterMenu_branch_178146
 	octave 2
-	note B_, 1
-	note __, 1
+	note B_, 2
+	note __, 2
 	octave 3
-	note F#, 1
-	note __, 0
-	note D#, 0
-	note F#, 1
-	note D#, 0
-	note __, 0
+	note F#, 2
+	note __, 1
+	note D#, 1
+	note F#, 2
+	note D#, 1
+	note __, 1
 	octave 2
-	note B_, 1
-	note F#, 0
-	note G#, 0
+	note B_, 2
+	note F#, 1
+	note G#, 1
 	callchannel Music_MobileAdapterMenu_branch_178146
 	octave 2
+	note B_, 2
+	note __, 2
+	octave 3
+	note F#, 2
+	note __, 1
+	note D#, 1
+	octave 2
 	note B_, 1
 	note __, 1
 	octave 3
-	note F#, 1
-	note __, 0
-	note D#, 0
-	octave 2
-	note B_, 0
-	note __, 0
-	octave 3
-	note D#, 0
-	note __, 0
-	note F#, 3
-	callchannel Music_MobileAdapterMenu_branch_178119
+	note D#, 1
 	note __, 1
+	note F#, 4
+	callchannel Music_MobileAdapterMenu_branch_178119
+	note __, 2
 	loopchannel 0, Music_MobileAdapterMenu_branch_1780e9
 ; 178119
 
 Music_MobileAdapterMenu_branch_178119: ; 178119
 	octave 3
-	note E_, 1
+	note E_, 2
+	note __, 2
+	note B_, 2
 	note __, 1
+	note G#, 1
+	note D#, 1
+	note __, 1
 	note B_, 1
-	note __, 0
-	note G#, 0
-	note D#, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note D#, 3
-	note C#, 1
 	note __, 1
-	note A_, 1
-	note __, 0
-	note F#, 0
+	note D#, 4
+	note C#, 2
+	note __, 2
+	note A_, 2
+	note __, 1
+	note F#, 1
 	octave 2
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 3
-	note D#, 0
-	note __, 0
-	note F#, 3
-	note E_, 1
+	note D#, 1
 	note __, 1
+	note F#, 4
+	note E_, 2
+	note __, 2
+	note B_, 2
+	note __, 1
+	note G#, 1
+	note D#, 1
+	note __, 1
 	note B_, 1
-	note __, 0
-	note G#, 0
-	note D#, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note D#, 3
-	note C#, 1
 	note __, 1
-	note A_, 1
-	note __, 0
-	note C#, 0
-	note E_, 2
+	note D#, 4
+	note C#, 2
+	note __, 2
+	note A_, 2
+	note __, 1
+	note C#, 1
+	note E_, 3
 	intensity $35
-	note E_, 2
+	note E_, 3
 	intensity $25
 	endchannel
 ; 178146
 
 Music_MobileAdapterMenu_branch_178146: ; 178146
-	note A_, 1
-	note __, 1
+	note A_, 2
+	note __, 2
 	octave 3
-	note A_, 1
-	note __, 0
-	note C#, 0
-	note A_, 1
+	note A_, 2
+	note __, 1
+	note C#, 1
+	note A_, 2
 	octave 4
-	note C#, 0
-	note __, 0
+	note C#, 1
+	note __, 1
 	octave 3
-	note A_, 3
+	note A_, 4
 	endchannel
 ; 178153
--- a/audio/music/mobilecenter.asm
+++ b/audio/music/mobilecenter.asm
@@ -15,317 +15,317 @@
 	stereopanning $f0
 	notetype $c, $a2
 	octave 3
-	note E_, 1
-	note F_, 1
-	note G_, 3
-	note G_, 1
-	note A_, 1
-	note B_, 3
+	note E_, 2
+	note F_, 2
+	note G_, 4
+	note G_, 2
+	note A_, 2
+	note B_, 4
 
 Music_MobileCenter_branch_179642: ; 179642
 	octave 3
-	note E_, 1
-	note C_, 1
-	note E_, 1
+	note E_, 2
+	note C_, 2
+	note E_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G_, 1
-	note B_, 1
-	note A_, 1
-	note G_, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
-	note E_, 1
-	note D_, 1
-	note E_, 1
-	note F_, 1
-	note G_, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
-	note B_, 1
-	note G_, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
-	note E_, 1
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	note G_, 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	note G_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note A_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note G_, 2
+	note A_, 2
+	note B_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note B_, 1
-	note A_, 1
-	note G_, 1
-	note E_, 1
-	note C_, 1
-	note E_, 1
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note E_, 2
+	note C_, 2
+	note E_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G_, 1
-	note B_, 1
-	note A_, 1
-	note G_, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
-	note E_, 1
-	note D_, 1
-	note E_, 1
-	note F_, 1
-	note G_, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
-	note B_, 3
-	note A_, 1
-	note G_, 1
-	note F_, 1
-	note E_, 1
-	note D_, 1
-	note C_, 1
-	note D_, 1
-	note E_, 1
-	note F_, 1
-	note G_, 1
-	note A_, 1
-	note E_, 1
-	note D_, 1
-	note C_, 3
-	note D_, 1
-	note E_, 1
-	note F_, 1
-	note G_, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
-	note E_, 1
-	note D_, 1
-	note E_, 1
-	note F_, 1
-	note G_, 1
-	note F_, 1
-	note E_, 1
-	note D_, 3
+	note G_, 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	note G_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note B_, 4
+	note A_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	note G_, 2
+	note A_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 4
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	note G_, 2
+	note A_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 4
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note C_, 1
-	note D_, 1
-	note F_, 1
-	note E_, 1
-	note F_, 1
-	note G_, 1
-	note A_, 1
-	note G_, 7
+	note C_, 2
+	note D_, 2
+	note F_, 2
+	note E_, 2
+	note F_, 2
+	note G_, 2
+	note A_, 2
+	note G_, 8
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note B_, 1
-	note A_, 3
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	note B_, 2
+	note A_, 4
+	note G_, 2
+	note A_, 2
+	note B_, 2
 	octave 4
-	note C_, 1
-	note D_, 1
-	note C_, 1
+	note C_, 2
+	note D_, 2
+	note C_, 2
 	octave 3
-	note B_, 3
-	note A_, 1
-	note B_, 1
+	note B_, 4
+	note A_, 2
+	note B_, 2
 	octave 4
-	note C_, 1
-	note D_, 1
+	note C_, 2
+	note D_, 2
 	octave 3
-	note B_, 1
-	note A_, 1
-	note G_, 3
-	note F_, 1
-	note G_, 1
-	note A_, 1
-	note F_, 1
-	note G_, 1
-	note F_, 1
-	note E_, 1
-	note D_, 1
-	note C_, 1
-	note D_, 1
-	note E_, 1
-	note F_, 1
+	note B_, 2
+	note A_, 2
+	note G_, 4
+	note F_, 2
+	note G_, 2
+	note A_, 2
+	note F_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
 	loopchannel 0, Music_MobileCenter_branch_179642
 
 Music_MobileCenter_Ch2: ; 1796cc
 	notetype $c, $c2
 	dutycycle $3
-	note __, 9
+	note __, 10
 	octave 1
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	note G_, 2
+	note A_, 2
+	note B_, 2
 
 Music_MobileCenter_branch_1796d6: ; 1796d6
 	octave 2
-	note C_, 1
-	note E_, 1
+	note C_, 2
+	note E_, 2
 	octave 1
-	note G_, 1
+	note G_, 2
 	octave 2
-	note E_, 1
-	note C_, 1
-	note E_, 1
-	note F_, 1
-	note E_, 1
-	note D_, 1
-	note G_, 1
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note G_, 2
 	octave 1
-	note G_, 1
+	note G_, 2
 	octave 2
-	note G_, 1
-	note D_, 1
-	note G_, 1
+	note G_, 2
+	note D_, 2
+	note G_, 2
 	octave 1
-	note G_, 1
+	note G_, 2
 	octave 2
-	note G_, 1
-	note D_, 1
-	note G_, 1
+	note G_, 2
+	note D_, 2
+	note G_, 2
 	octave 1
-	note G_, 1
+	note G_, 2
 	octave 2
-	note G_, 1
-	note D_, 1
-	note G_, 1
-	note F_, 1
-	note G_, 1
-	note E_, 1
-	note G_, 1
-	note E_, 1
-	note G_, 1
-	note E_, 1
-	note G_, 1
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note F_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
 	octave 1
-	note G_, 1
+	note G_, 2
 	octave 2
-	note G_, 1
-	note C_, 1
-	note E_, 1
+	note G_, 2
+	note C_, 2
+	note E_, 2
 	octave 1
-	note G_, 1
+	note G_, 2
 	octave 2
-	note E_, 1
-	note C_, 1
-	note E_, 1
-	note F_, 1
-	note E_, 1
-	note D_, 1
-	note G_, 1
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note G_, 2
 	octave 1
-	note G_, 1
+	note G_, 2
 	octave 2
-	note G_, 1
-	note D_, 1
-	note G_, 1
+	note G_, 2
+	note D_, 2
+	note G_, 2
 	octave 1
-	note G_, 1
+	note G_, 2
 	octave 2
-	note G_, 1
-	note D_, 1
-	note G_, 1
+	note G_, 2
+	note D_, 2
+	note G_, 2
 	octave 1
-	note G_, 1
+	note G_, 2
 	octave 2
-	note G_, 1
-	note D_, 1
-	note G_, 1
-	note F_, 1
-	note G_, 1
-	note C_, 1
-	note E_, 1
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note F_, 2
+	note G_, 2
+	note C_, 2
+	note E_, 2
 	octave 1
-	note G_, 1
+	note G_, 2
 	octave 2
-	note E_, 1
-	note C_, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
-	note E_, 1
-	note G_, 1
-	note C_, 1
-	note G_, 1
-	note E_, 1
-	note G_, 1
-	note C_, 1
-	note G_, 1
-	note F_, 1
-	note A_, 1
-	note C_, 1
-	note A_, 1
-	note F_, 1
-	note A_, 1
-	note C_, 1
-	note A_, 1
-	note D_, 1
-	note F_, 1
+	note E_, 2
+	note C_, 2
+	note A_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note F_, 2
+	note A_, 2
+	note C_, 2
+	note A_, 2
+	note F_, 2
+	note A_, 2
+	note C_, 2
+	note A_, 2
+	note D_, 2
+	note F_, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note F_, 1
-	note D_, 1
-	note F_, 1
+	note F_, 2
+	note D_, 2
+	note F_, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note F_, 1
-	note E_, 1
-	note G_, 1
-	note C_, 1
-	note G_, 1
-	note E_, 1
-	note G_, 1
-	note C_, 1
-	note G_, 1
-	note E_, 1
-	note G_, 1
-	note C_, 1
-	note G_, 1
-	note E_, 1
-	note G_, 1
-	note C_, 1
-	note G_, 1
-	note F_, 1
-	note A_, 1
-	note C_, 1
-	note A_, 1
-	note F_, 1
-	note A_, 1
-	note C_, 1
-	note A_, 1
-	note D_, 1
-	note F_, 1
+	note F_, 2
+	note E_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note F_, 2
+	note A_, 2
+	note C_, 2
+	note A_, 2
+	note F_, 2
+	note A_, 2
+	note C_, 2
+	note A_, 2
+	note D_, 2
+	note F_, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note F_, 1
-	note D_, 1
-	note F_, 1
+	note F_, 2
+	note D_, 2
+	note F_, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note F_, 1
-	note E_, 1
-	note G_, 1
-	note C_, 1
-	note G_, 1
-	note E_, 1
-	note F_, 1
-	note E_, 1
-	note D_, 1
+	note F_, 2
+	note E_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note E_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
 	loopchannel 0, Music_MobileCenter_branch_1796d6
 
 Music_MobileCenter_Ch3: ; 179777
@@ -332,126 +332,126 @@
 	notetype $c, $24
 	vibrato $10, $34
 	octave 4
-	note G_, 1
-	note A_, 1
-	note B_, 3
-	note B_, 1
+	note G_, 2
+	note A_, 2
+	note B_, 4
+	note B_, 2
 	octave 5
-	note C_, 1
-	note D_, 3
+	note C_, 2
+	note D_, 4
 	notetype $c, $25
 
 Music_MobileCenter_branch_179788: ; 179788
-	note C_, 1
+	note C_, 2
 	octave 4
-	note G_, 1
+	note G_, 2
 	octave 5
-	note C_, 1
-	note G_, 3
-	note F_, 3
-	note E_, 1
-	note D_, 1
+	note C_, 2
+	note G_, 4
+	note F_, 4
+	note E_, 2
+	note D_, 2
 	octave 4
-	note B_, 5
+	note B_, 6
 	notetype $c, $10
 	octave 6
-	note G_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
 	octave 7
-	note D_, 0
-	note __, 2
+	note D_, 1
+	note __, 3
 	notetype $c, $25
 	octave 4
-	note B_, 1
-	note G_, 1
-	note B_, 1
+	note B_, 2
+	note G_, 2
+	note B_, 2
 	octave 5
-	note E_, 3
-	note D_, 3
+	note E_, 4
+	note D_, 4
 	octave 4
-	note B_, 1
+	note B_, 2
 	octave 5
-	note C_, 1
-	note E_, 5
+	note C_, 2
+	note E_, 6
 	octave 4
-	note E_, 1
-	note F_, 1
-	note D_, 1
-	note E_, 1
+	note E_, 2
+	note F_, 2
+	note D_, 2
+	note E_, 2
 	octave 5
-	note C_, 1
+	note C_, 2
 	octave 4
-	note G_, 1
+	note G_, 2
 	octave 5
-	note C_, 1
-	note G_, 3
-	note F_, 3
-	note E_, 1
-	note D_, 1
+	note C_, 2
+	note G_, 4
+	note F_, 4
+	note E_, 2
+	note D_, 2
 	octave 4
-	note B_, 5
+	note B_, 6
 	notetype $c, $10
 	octave 6
-	note G_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
 	octave 7
-	note D_, 0
-	note __, 2
+	note D_, 1
+	note __, 3
 	notetype $c, $25
 	octave 4
-	note B_, 1
-	note G_, 1
-	note B_, 1
+	note B_, 2
+	note G_, 2
+	note B_, 2
 	octave 5
-	note E_, 3
-	note D_, 3
+	note E_, 4
+	note D_, 4
 	octave 4
-	note B_, 1
+	note B_, 2
 	octave 5
-	note C_, 7
+	note C_, 8
 	octave 4
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	note G_, 2
+	note A_, 2
+	note B_, 2
 	octave 5
-	note D_, 1
+	note D_, 2
 	vibrato $18, $44
-	note E_, 7
-	note G_, 7
-	note F_, 1
-	note G_, 1
-	note F_, 1
-	note E_, 1
-	note D_, 7
+	note E_, 8
+	note G_, 8
+	note F_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 8
 	octave 4
-	note B_, 7
+	note B_, 8
 	octave 5
-	note D_, 7
-	note E_, 1
-	note F_, 1
-	note E_, 1
-	note D_, 1
-	note C_, 7
-	note E_, 7
-	note G_, 7
-	note F_, 1
-	note E_, 1
-	note F_, 1
-	note G_, 1
-	note A_, 7
-	note G_, 3
-	note F_, 1
-	note E_, 1
-	note F_, 7
-	note E_, 1
-	note F_, 1
-	note E_, 1
-	note D_, 1
-	note C_, 7
+	note D_, 8
+	note E_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 8
+	note E_, 8
+	note G_, 8
+	note F_, 2
+	note E_, 2
+	note F_, 2
+	note G_, 2
+	note A_, 8
+	note G_, 4
+	note F_, 2
+	note E_, 2
+	note F_, 8
+	note E_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 8
 	vibrato $10, $34
 	loopchannel 0, Music_MobileCenter_branch_179788
 
@@ -459,32 +459,32 @@
 	togglenoise $3
 	stereopanning $f
 	notetype $c
-	note A_, 7
-	note A_, 3
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-
-Music_MobileCenter_branch_179813: ; 179813
-	note A_, 1
+	note A_, 8
+	note A_, 4
 	note C#, 1
 	note C#, 1
 	note C#, 1
-	note A_, 1
 	note C#, 1
-	note D_, 1
-	note C#, 1
+
+Music_MobileCenter_branch_179813: ; 179813
+	note A_, 2
+	note C#, 2
+	note C#, 2
+	note C#, 2
+	note A_, 2
+	note C#, 2
+	note D_, 2
+	note C#, 2
 	loopchannel 3, Music_MobileCenter_branch_179813
-	note A_, 1
+	note A_, 2
+	note C#, 2
+	note C#, 2
+	note C#, 2
+	note A_, 2
+	note D_, 2
 	note C#, 1
 	note C#, 1
 	note C#, 1
-	note A_, 1
-	note D_, 1
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
+	note C#, 1
 	loopchannel 0, Music_MobileCenter_branch_179813
 ; 17982d
--- a/audio/music/mom.asm
+++ b/audio/music/mom.asm
@@ -12,26 +12,26 @@
 	dutycycle $2
 	notetype $6, $b3
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note E_, 0
-	note G#, 0
-	note A_, 0
-	note B_, 7
+	note E_, 1
+	note G#, 1
+	note A_, 1
+	note B_, 8
 
 Music_Mom_branch_f6c0e: ; f6c0e
 	notetype $c, $b1
-	note __, 3
+	note __, 4
 	octave 3
-	note C#, 5
-	note D_, 3
-	note C_, 1
-	note __, 1
-	note C#, 5
+	note C#, 6
+	note D_, 4
+	note C_, 2
+	note __, 2
+	note C#, 6
 	octave 2
-	note E_, 3
-	note A#, 1
-	note B_, 1
+	note E_, 4
+	note A#, 2
+	note B_, 2
 	loopchannel 0, Music_Mom_branch_f6c0e
 
 Music_Mom_Ch3: ; f6c20
@@ -38,77 +38,77 @@
 	stereopanning $f0
 	notetype $6, $25
 	octave 3
-	note E_, 0
-	note D_, 0
+	note E_, 1
+	note D_, 1
 	octave 2
-	note B_, 0
-	note G#, 0
-	note E_, 7
+	note B_, 1
+	note G#, 1
+	note E_, 8
 	intensity $23
 
 Music_Mom_branch_f6c2e: ; f6c2e
 	octave 2
-	note A_, 1
-	note __, 5
+	note A_, 2
+	note __, 6
 	octave 4
-	note E_, 1
-	note __, 1
+	note E_, 2
+	note __, 2
 	octave 2
-	note A_, 1
-	note __, 1
+	note A_, 2
+	note __, 2
 	octave 3
-	note D_, 1
-	note __, 1
+	note D_, 2
+	note __, 2
 	octave 4
-	note F#, 7
-	note D#, 1
-	note __, 1
+	note F#, 8
+	note D#, 2
+	note __, 2
 	octave 2
-	note A_, 1
-	note __, 1
+	note A_, 2
+	note __, 2
 	octave 4
-	note E_, 1
-	note __, 5
+	note E_, 2
+	note __, 6
 	octave 2
-	note A_, 1
-	note __, 1
+	note A_, 2
+	note __, 2
 	octave 4
-	note D_, 1
-	note __, 5
-	note C#, 3
-	note D_, 1
-	note __, 1
+	note D_, 2
+	note __, 6
+	note C#, 4
+	note D_, 2
+	note __, 2
 	loopchannel 0, Music_Mom_branch_f6c2e
 
 Music_Mom_Ch4: ; f6c51
 	togglenoise $3
 	notetype $c
-	note __, 5
+	note __, 6
 
 Music_Mom_branch_f6c56: ; f6c56
-	note D#, 0
-	note __, 0
-	note F#, 1
-	note D_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note F#, 3
-	note D_, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note F#, 3
-	note D_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
+	note D#, 1
+	note __, 1
+	note F#, 2
 	note D_, 1
-	note D#, 0
-	note __, 0
+	note __, 1
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note F#, 4
+	note D_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note F#, 4
+	note D_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note D_, 2
+	note D#, 1
+	note __, 1
 	loopchannel 0, Music_Mom_branch_f6c56
 ; f6c72
--- a/audio/music/mtmoon.asm
+++ b/audio/music/mtmoon.asm
@@ -14,7 +14,7 @@
 	vibrato $8, $14
 	stereopanning $f0
 	notetype $c, $45
-	note __, 1
+	note __, 2
 	loopchannel 0, Music_MtMoon_branch_edb56
 ; edb4c
 
@@ -26,53 +26,53 @@
 
 Music_MtMoon_branch_edb56: ; edb56
 	octave 4
-	note D#, 5
-	note C#, 5
+	note D#, 6
+	note C#, 6
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note C#, 1
-	note D#, 1
-	note G_, 1
-	note D#, 1
-	note C#, 5
+	note C#, 2
+	note D#, 2
+	note G_, 2
+	note D#, 2
+	note C#, 6
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note C#, 1
-	note D#, 1
-	note G_, 1
-	note D#, 1
-	note C#, 5
+	note C#, 2
+	note D#, 2
+	note G_, 2
+	note D#, 2
+	note C#, 6
 	octave 3
-	note B_, 1
-	note A#, 1
-	note B_, 5
+	note B_, 2
+	note A#, 2
+	note B_, 6
 	octave 4
-	note C#, 9
-	note G#, 5
-	note F#, 5
-	note E_, 1
-	note F#, 1
-	note G#, 1
+	note C#, 10
+	note G#, 6
+	note F#, 6
+	note E_, 2
+	note F#, 2
+	note G#, 2
 	octave 5
-	note C_, 1
+	note C_, 2
 	octave 4
-	note G#, 1
-	note F#, 5
-	note E_, 1
-	note F#, 1
-	note G#, 1
+	note G#, 2
+	note F#, 6
+	note E_, 2
+	note F#, 2
+	note G#, 2
 	octave 5
-	note C_, 1
+	note C_, 2
 	octave 4
-	note G#, 1
-	note F#, 5
-	note E_, 1
-	note D#, 1
-	note E_, 5
-	note F#, 5
-	note E_, 3
+	note G#, 2
+	note F#, 6
+	note E_, 2
+	note D#, 2
+	note E_, 6
+	note F#, 6
+	note E_, 4
 	loopchannel 0, Music_MtMoon_branch_edb56
 
 Music_MtMoon_Ch3: ; edb8a
@@ -82,46 +82,46 @@
 
 Music_MtMoon_branch_edb8d: ; edb8d
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note D#, 1
-	note G_, 1
+	note D#, 2
+	note G_, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note D#, 1
-	note G_, 1
+	note D#, 2
+	note G_, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note D#, 1
+	note D#, 2
 	loopchannel 3, Music_MtMoon_branch_edb8d
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note D#, 1
-	note G_, 1
+	note D#, 2
+	note G_, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note D#, 1
-	note G_, 1
-	note D#, 1
-	note E_, 1
+	note D#, 2
+	note G_, 2
+	note D#, 2
+	note E_, 2
 
 Music_MtMoon_branch_edbab: ; edbab
-	note E_, 1
-	note G#, 1
+	note E_, 2
+	note G#, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note E_, 1
-	note G#, 1
+	note E_, 2
+	note G#, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note E_, 1
-	note G#, 1
+	note E_, 2
+	note G#, 2
 	loopchannel 4, Music_MtMoon_branch_edbab
 	loopchannel 0, Music_MtMoon_branch_edb8a
 
@@ -131,17 +131,17 @@
 
 Music_MtMoon_branch_edbc3: ; edbc3
 	stereopanning $f
-	note A#, 3
-	note A#, 7
-	note A#, 3
+	note A#, 4
+	note A#, 8
+	note A#, 4
 	stereopanning $f0
-	note A#, 3
-	note A#, 3
-	note A#, 3
+	note A#, 4
+	note A#, 4
+	note A#, 4
 	stereopanning $f
-	note A#, 3
-	note A#, 3
+	note A#, 4
+	note A#, 4
 	stereopanning $f0
-	note A#, 7
+	note A#, 8
 	loopchannel 0, Music_MtMoon_branch_edbc3
 ; edbd8
--- a/audio/music/mtmoonsquare.asm
+++ b/audio/music/mtmoonsquare.asm
@@ -9,7 +9,7 @@
 	volume $77
 	dutycycle $2
 	tone $0001
-	note __, 0
+	note __, 1
 
 Music_MtMoonSquare_branch_f4826: ; f4826
 	notetype $c, $44
@@ -16,46 +16,46 @@
 
 Music_MtMoonSquare_branch_f4829: ; f4829
 	octave 4
-	note D_, 1
-	note E_, 1
-	note F#, 3
-	note F#, 1
-	note A_, 1
+	note D_, 2
+	note E_, 2
+	note F#, 4
+	note F#, 2
+	note A_, 2
 	octave 5
-	note D_, 3
+	note D_, 4
 	loopchannel 2, Music_MtMoonSquare_branch_f4829
 
 Music_MtMoonSquare_branch_f4835: ; f4835
 	octave 4
-	note E_, 1
-	note F#, 1
-	note G#, 3
-	note G#, 1
-	note B_, 1
+	note E_, 2
+	note F#, 2
+	note G#, 4
+	note G#, 2
+	note B_, 2
 	octave 5
-	note E_, 3
+	note E_, 4
 	loopchannel 2, Music_MtMoonSquare_branch_f4835
 
 Music_MtMoonSquare_branch_f4841: ; f4841
 	octave 4
-	note C#, 1
-	note D_, 1
-	note E_, 3
-	note E_, 1
-	note G_, 1
+	note C#, 2
+	note D_, 2
+	note E_, 4
+	note E_, 2
+	note G_, 2
 	octave 5
-	note C#, 3
+	note C#, 4
 	loopchannel 2, Music_MtMoonSquare_branch_f4841
 
 Music_MtMoonSquare_branch_f484d: ; f484d
 	octave 4
-	note D_, 1
-	note E_, 1
-	note F#, 3
-	note F#, 1
-	note A_, 1
+	note D_, 2
+	note E_, 2
+	note F#, 4
+	note F#, 2
+	note A_, 2
 	octave 5
-	note D_, 3
+	note D_, 4
 	loopchannel 2, Music_MtMoonSquare_branch_f484d
 	loopchannel 0, Music_MtMoonSquare_branch_f4826
 
@@ -68,13 +68,13 @@
 
 Music_MtMoonSquare_branch_f4865: ; f4865
 	octave 4
-	note D_, 1
-	note E_, 1
-	note F#, 3
-	note F#, 1
-	note A_, 1
+	note D_, 2
+	note E_, 2
+	note F#, 4
+	note F#, 2
+	note A_, 2
 	octave 5
-	note D_, 3
+	note D_, 4
 	notetype $c, $62
 	loopchannel 2, Music_MtMoonSquare_branch_f4865
 	notetype $c, $82
@@ -81,13 +81,13 @@
 
 Music_MtMoonSquare_branch_f4877: ; f4877
 	octave 4
-	note E_, 1
-	note F#, 1
-	note G#, 3
-	note G#, 1
-	note B_, 1
+	note E_, 2
+	note F#, 2
+	note G#, 4
+	note G#, 2
+	note B_, 2
 	octave 5
-	note E_, 3
+	note E_, 4
 	notetype $c, $62
 	loopchannel 2, Music_MtMoonSquare_branch_f4877
 	notetype $c, $82
@@ -94,13 +94,13 @@
 
 Music_MtMoonSquare_branch_f4889: ; f4889
 	octave 4
-	note C#, 1
-	note D_, 1
-	note E_, 3
-	note E_, 1
-	note G_, 1
+	note C#, 2
+	note D_, 2
+	note E_, 4
+	note E_, 2
+	note G_, 2
 	octave 5
-	note C#, 3
+	note C#, 4
 	notetype $c, $62
 	loopchannel 2, Music_MtMoonSquare_branch_f4889
 	notetype $c, $82
@@ -107,13 +107,13 @@
 
 Music_MtMoonSquare_branch_f489b: ; f489b
 	octave 4
-	note D_, 1
-	note E_, 1
-	note F#, 3
-	note F#, 1
-	note A_, 1
+	note D_, 2
+	note E_, 2
+	note F#, 4
+	note F#, 2
+	note A_, 2
 	octave 5
-	note D_, 3
+	note D_, 4
 	notetype $c, $62
 	loopchannel 2, Music_MtMoonSquare_branch_f489b
 	loopchannel 0, Music_MtMoonSquare_branch_f4862
--- a/audio/music/nationalpark.asm
+++ b/audio/music/nationalpark.asm
@@ -13,7 +13,7 @@
 	vibrato $18, $24
 	dutycycle $1
 	notetype $c, $77
-	note __, 1
+	note __, 2
 
 Music_NationalPark_branch_f5504: ; f5504
 	callchannel Music_NationalPark_branch_f554a
@@ -21,283 +21,283 @@
 	notetype $6, $67
 	callchannel Music_NationalPark_branch_f563a
 	notetype $c, $77
-	note __, 15
+	note __, 16
 	octave 2
-	note A#, 0
+	note A#, 1
 	octave 3
-	note D_, 0
-	note F_, 0
-	note G#, 0
-	note D_, 0
-	note F_, 0
-	note A#, 0
+	note D_, 1
+	note F_, 1
+	note G#, 1
+	note D_, 1
+	note F_, 1
+	note A#, 1
 	notetype $6, $67
 	octave 4
-	note D_, 0
-	note C#, 0
-	note D_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note C#, 0
-	note __, 0
-	note D_, 0
-	note __, 2
-	note D_, 0
-	note __, 2
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	note D_, 1
+	note __, 3
+	note D_, 1
+	note __, 3
+	note D_, 1
+	note __, 1
 	callchannel Music_NationalPark_branch_f563a
 	intensity $77
 	octave 3
-	note E_, 0
-	note F_, 4
-	note D#, 3
-	note __, 1
-	note C_, 11
-	note F_, 7
-	note C#, 0
+	note E_, 1
+	note F_, 5
+	note D#, 4
+	note __, 2
+	note C_, 12
+	note F_, 8
+	note C#, 1
 	intensity $98
-	note D_, 15
+	note D_, 16
 	intensity $77
-	note D_, 6
+	note D_, 7
 	notetype $c, $77
-	note __, 3
+	note __, 4
 	loopchannel 0, Music_NationalPark_branch_f5504
 ; f554a
 
 Music_NationalPark_branch_f554a: ; f554a
 	octave 2
-	note G#, 5
+	note G#, 6
 	octave 3
-	note F_, 1
+	note F_, 2
 	intensity $47
-	note F_, 0
-	note G#, 0
+	note F_, 1
+	note G#, 1
 	intensity $57
-	note F_, 0
-	note G#, 0
+	note F_, 1
+	note G#, 1
 	intensity $77
-	note F_, 0
-	note G#, 0
+	note F_, 1
+	note G#, 1
 	intensity $97
-	note F_, 0
-	note G#, 0
+	note F_, 1
+	note G#, 1
 	intensity $77
 	octave 2
-	note A_, 5
+	note A_, 6
 	octave 3
-	note F#, 1
+	note F#, 2
 	intensity $47
-	note F#, 0
-	note A_, 0
+	note F#, 1
+	note A_, 1
 	intensity $57
-	note F#, 0
-	note A_, 0
+	note F#, 1
+	note A_, 1
 	intensity $77
-	note F#, 0
-	note A_, 0
+	note F#, 1
+	note A_, 1
 	intensity $97
-	note F#, 0
-	note A_, 0
+	note F#, 1
+	note A_, 1
 	intensity $77
 	octave 2
-	note G#, 5
+	note G#, 6
 	octave 3
-	note F_, 1
+	note F_, 2
 	intensity $47
 	octave 4
-	note C_, 0
-	note C#, 0
+	note C_, 1
+	note C#, 1
 	intensity $57
-	note C_, 0
-	note C#, 0
+	note C_, 1
+	note C#, 1
 	intensity $77
-	note C_, 0
-	note C#, 0
+	note C_, 1
+	note C#, 1
 	intensity $97
-	note C_, 0
-	note C#, 0
+	note C_, 1
+	note C#, 1
 	intensity $77
 	octave 2
-	note A_, 5
+	note A_, 6
 	octave 3
-	note C#, 1
+	note C#, 2
 	intensity $47
 	octave 4
-	note C#, 0
-	note D#, 0
+	note C#, 1
+	note D#, 1
 	intensity $57
-	note C#, 0
-	note D#, 0
+	note C#, 1
+	note D#, 1
 	intensity $77
-	note C#, 0
-	note D#, 0
+	note C#, 1
+	note D#, 1
 	intensity $97
-	note C#, 0
-	note D#, 0
-	intensity $77
 	note C#, 1
+	note D#, 1
+	intensity $77
+	note C#, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note A_, 1
+	note A_, 2
 	intensity $47
 	octave 4
-	note C#, 0
-	note D#, 0
+	note C#, 1
+	note D#, 1
 	intensity $57
-	note C#, 0
-	note D#, 0
+	note C#, 1
+	note D#, 1
 	intensity $77
-	note C#, 0
-	note D#, 0
+	note C#, 1
+	note D#, 1
 	intensity $97
-	note C#, 0
-	note D#, 0
+	note C#, 1
+	note D#, 1
 	intensity $77
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G#, 1
+	note G#, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G#, 1
+	note G#, 2
 	octave 4
-	note D#, 1
-	note C_, 1
-	note D#, 1
-	note C_, 1
-	note D_, 1
+	note D#, 2
+	note C_, 2
+	note D#, 2
+	note C_, 2
+	note D_, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	intensity $57
 	octave 4
-	note F_, 0
-	note D#, 0
+	note F_, 1
+	note D#, 1
 	intensity $67
-	note D_, 0
-	note D#, 0
+	note D_, 1
+	note D#, 1
 	intensity $77
-	note F_, 0
-	note F#, 0
+	note F_, 1
+	note F#, 1
 	intensity $97
-	note G#, 0
-	note A#, 0
+	note G#, 1
+	note A#, 1
 	intensity $77
-	note C#, 1
+	note C#, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note A_, 1
+	note A_, 2
 	intensity $47
 	octave 4
-	note C#, 0
-	note D#, 0
+	note C#, 1
+	note D#, 1
 	intensity $57
-	note C#, 0
-	note D#, 0
+	note C#, 1
+	note D#, 1
 	intensity $77
-	note C#, 0
-	note D#, 0
+	note C#, 1
+	note D#, 1
 	intensity $97
-	note C#, 0
-	note D#, 0
+	note C#, 1
+	note D#, 1
 	intensity $77
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G#, 1
+	note G#, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G#, 1
+	note G#, 2
 	octave 4
-	note D#, 1
-	note C_, 1
-	note D#, 1
-	note C_, 1
-	note D_, 1
+	note D#, 2
+	note C_, 2
+	note D#, 2
+	note C_, 2
+	note D_, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	endchannel
 ; f563a
 
 Music_NationalPark_branch_f563a: ; f563a
-	note __, 15
-	note __, 2
+	note __, 16
+	note __, 3
 	octave 4
-	note A#, 0
-	note A#, 0
-	note __, 0
-	note A#, 0
-	note __, 0
-	note A#, 0
-	note __, 0
 	note A#, 1
+	note A#, 1
+	note __, 1
+	note A#, 1
+	note __, 1
+	note A#, 1
+	note __, 1
+	note A#, 2
+	note __, 4
+	note __, 16
 	note __, 3
-	note __, 15
-	note __, 2
-	note A_, 0
-	note A_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
 	note A_, 1
-	note __, 3
+	note A_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note A_, 2
+	note __, 4
 	endchannel
 
 Music_NationalPark_Ch2: ; f5652
@@ -304,7 +304,7 @@
 	vibrato $14, $24
 	dutycycle $1
 	notetype $c, $a7
-	note __, 1
+	note __, 2
 	stereopanning $f0
 
 Music_NationalPark_branch_f565d: ; f565d
@@ -311,178 +311,178 @@
 	notetype $c, $a7
 	callchannel Music_NationalPark_branch_f56b8
 	octave 3
-	note D_, 7
+	note D_, 8
 	callchannel Music_NationalPark_branch_f56b8
-	note __, 1
+	note __, 2
 	intensity $a7
 	octave 4
-	note G#, 1
-	note F#, 1
-	note F_, 1
+	note G#, 2
+	note F#, 2
+	note F_, 2
 	notetype $6, $a7
 	callchannel Music_NationalPark_branch_f56f5
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note C_, 4
+	note C_, 5
 	octave 3
-	note G#, 3
-	note __, 1
+	note G#, 4
+	note __, 2
 	octave 4
-	note A#, 7
+	note A#, 8
+	note G#, 2
+	note __, 2
+	note F#, 2
+	note __, 2
+	note G#, 4
+	note E_, 1
+	note F_, 14
+	intensity $87
+	note G_, 1
 	note G#, 1
 	note __, 1
-	note F#, 1
+	note G#, 1
 	note __, 1
-	note G#, 3
-	note E_, 0
-	note F_, 13
-	intensity $87
-	note G_, 0
-	note G#, 0
-	note __, 0
-	note G#, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note G#, 0
-	note __, 2
-	note G#, 0
-	note __, 2
-	note G#, 0
-	note __, 0
+	note G_, 1
+	note __, 1
+	note G#, 1
+	note __, 3
+	note G#, 1
+	note __, 3
+	note G#, 1
+	note __, 1
 	intensity $a7
 	callchannel Music_NationalPark_branch_f56f5
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note C_, 4
+	note C_, 5
 	octave 3
-	note G#, 3
-	note __, 1
-	note A#, 11
+	note G#, 4
+	note __, 2
+	note A#, 12
 	octave 4
-	note C_, 7
+	note C_, 8
 	octave 3
-	note A_, 0
+	note A_, 1
 	vibrato $0, $0
 	intensity $b8
-	note A#, 15
+	note A#, 16
 	vibrato $14, $24
 	intensity $b7
-	note A#, 10
+	note A#, 11
 	octave 2
-	note D#, 1
-	note D_, 1
+	note D#, 2
+	note D_, 2
 	loopchannel 0, Music_NationalPark_branch_f565d
 ; f56b8
 
 Music_NationalPark_branch_f56b8: ; f56b8
 	octave 2
-	note C#, 5
-	note G#, 1
+	note C#, 6
+	note G#, 2
 	octave 3
-	note C#, 7
+	note C#, 8
 	octave 2
-	note C#, 5
-	note A_, 1
+	note C#, 6
+	note A_, 2
 	octave 3
-	note C#, 7
+	note C#, 8
 	octave 2
-	note C#, 5
-	note G#, 1
+	note C#, 6
+	note G#, 2
 	octave 3
-	note C#, 7
+	note C#, 8
 	octave 2
-	note C#, 5
-	note A_, 1
+	note C#, 6
+	note A_, 2
 	octave 3
-	note F#, 7
+	note F#, 8
 	octave 1
-	note F#, 5
+	note F#, 6
 	octave 2
-	note C#, 1
-	note A#, 7
+	note C#, 2
+	note A#, 8
 	octave 1
-	note F#, 5
+	note F#, 6
 	octave 2
-	note C#, 1
-	note A_, 7
+	note C#, 2
+	note A_, 8
 	octave 1
-	note F_, 5
+	note F_, 6
 	octave 2
-	note C_, 1
-	note G#, 7
+	note C_, 2
+	note G#, 8
 	octave 1
-	note A#, 5
+	note A#, 6
 	octave 2
-	note F_, 1
+	note F_, 2
 	octave 3
-	note D_, 7
+	note D_, 8
 	octave 1
-	note F#, 5
+	note F#, 6
 	octave 2
-	note C#, 1
-	note A#, 7
+	note C#, 2
+	note A#, 8
 	octave 1
-	note F#, 5
+	note F#, 6
 	octave 2
-	note C#, 1
-	note A_, 7
+	note C#, 2
+	note A_, 8
 	octave 1
-	note F_, 5
+	note F_, 6
 	octave 2
-	note C_, 1
-	note G#, 7
+	note C_, 2
+	note G#, 8
 	octave 1
-	note A#, 5
+	note A#, 6
 	octave 2
-	note F_, 1
+	note F_, 2
 	endchannel
 ; f56f5
 
 Music_NationalPark_branch_f56f5: ; f56f5
 	octave 4
-	note E_, 0
-	note F_, 4
-	note F#, 3
-	note __, 1
-	note C#, 6
+	note E_, 1
+	note F_, 5
+	note F#, 4
+	note __, 2
+	note C#, 7
 	intensity $87
 	octave 5
-	note E_, 0
-	note F_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
+	note E_, 1
 	note F_, 1
+	note __, 1
+	note F_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note F_, 2
 	intensity $a7
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 4
-	note E_, 0
-	note F_, 4
-	note F#, 3
-	note __, 1
-	note D#, 6
+	note E_, 1
+	note F_, 5
+	note F#, 4
+	note __, 2
+	note D#, 7
 	intensity $87
 	octave 5
-	note D_, 0
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note D_, 0
-	note __, 0
+	note D_, 1
 	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note D#, 2
 	intensity $a7
 	octave 4
-	note D_, 1
-	note C#, 1
+	note D_, 2
+	note C#, 2
 	endchannel
 
 Music_NationalPark_Ch3: ; f5723
@@ -489,183 +489,183 @@
 	vibrato $16, $24
 	notetype $c, $11
 	octave 4
-	note G#, 0
-	note A#, 0
+	note G#, 1
+	note A#, 1
 	stereopanning $ff
 
 Music_NationalPark_branch_f572e: ; f572e
 	callchannel Music_NationalPark_branch_f5756
 	octave 5
-	note A#, 13
+	note A#, 14
 	octave 4
-	note G#, 0
-	note A#, 0
+	note G#, 1
+	note A#, 1
 	callchannel Music_NationalPark_branch_f5756
 	octave 5
-	note A#, 7
+	note A#, 8
 	octave 4
-	note D_, 7
+	note D_, 8
 	intensity $15
 	callchannel Music_NationalPark_branch_f578f
 	octave 4
-	note D_, 0
+	note D_, 1
 	octave 3
-	note F_, 2
+	note F_, 3
 	callchannel Music_NationalPark_branch_f578f
 	octave 4
-	note D_, 0
+	note D_, 1
 	octave 3
-	note F_, 0
+	note F_, 1
 	intensity $11
 	octave 4
-	note G#, 0
-	note A#, 0
+	note G#, 1
+	note A#, 1
 	loopchannel 0, Music_NationalPark_branch_f572e
 ; f5756
 
 Music_NationalPark_branch_f5756: ; f5756
 	octave 5
-	note C_, 15
-	note C#, 13
-	note G#, 0
-	note A#, 0
+	note C_, 16
+	note C#, 14
+	note G#, 1
+	note A#, 1
 	octave 6
-	note C_, 15
-	note C#, 9
-	note C_, 1
-	note C#, 1
-	note D#, 1
-	note F_, 1
-	note D#, 1
-	note C#, 1
+	note C_, 16
+	note C#, 10
+	note C_, 2
+	note C#, 2
+	note D#, 2
+	note F_, 2
+	note D#, 2
+	note C#, 2
 	octave 5
-	note A#, 9
+	note A#, 10
 	octave 6
-	note F_, 1
-	note D#, 1
-	note C#, 1
+	note F_, 2
+	note D#, 2
+	note C#, 2
 	octave 5
-	note A_, 8
+	note A_, 9
 	octave 6
-	note D_, 0
+	note D_, 1
 	octave 6
-	note D#, 1
-	note C#, 1
-	note C_, 1
+	note D#, 2
+	note C#, 2
+	note C_, 2
 	octave 5
-	note G#, 3
+	note G#, 4
 	octave 6
-	note G#, 3
+	note G#, 4
+	note D#, 2
+	note F_, 14
+	note D_, 1
 	note D#, 1
-	note F_, 13
-	note D_, 0
-	note D#, 0
-	note F_, 1
-	note D#, 1
-	note C#, 1
+	note F_, 2
+	note D#, 2
+	note C#, 2
 	octave 5
-	note A#, 9
+	note A#, 10
 	octave 6
-	note F_, 1
-	note D#, 1
-	note C#, 1
+	note F_, 2
+	note D#, 2
+	note C#, 2
 	octave 5
-	note A_, 9
+	note A_, 10
 	octave 6
-	note D#, 1
-	note C#, 1
-	note C_, 1
+	note D#, 2
+	note C#, 2
+	note C_, 2
 	octave 5
-	note G#, 3
-	note A#, 3
+	note G#, 4
+	note A#, 4
 	octave 6
-	note C_, 1
+	note C_, 2
 	endchannel
 ; f578f
 
 Music_NationalPark_branch_f578f: ; f578f
 	octave 2
-	note F#, 2
+	note F#, 3
 	octave 3
-	note C#, 1
-	note __, 0
-	note A#, 3
-	note C#, 0
-	note __, 0
-	note A#, 0
 	note C#, 2
+	note __, 1
+	note A#, 4
+	note C#, 1
+	note __, 1
+	note A#, 1
+	note C#, 3
 	octave 2
-	note F#, 2
+	note F#, 3
 	octave 3
-	note C#, 1
-	note __, 0
-	note A_, 3
-	note C#, 0
-	note __, 0
-	note A_, 0
 	note C#, 2
+	note __, 1
+	note A_, 4
+	note C#, 1
+	note __, 1
+	note A_, 1
+	note C#, 3
 	octave 2
-	note F_, 2
+	note F_, 3
 	octave 3
-	note C_, 1
-	note __, 0
-	note G#, 3
-	note C_, 0
-	note __, 0
-	note G#, 0
 	note C_, 2
+	note __, 1
+	note G#, 4
+	note C_, 1
+	note __, 1
+	note G#, 1
+	note C_, 3
 	octave 2
-	note A#, 2
+	note A#, 3
 	octave 3
-	note F_, 1
-	note __, 0
+	note F_, 2
+	note __, 1
 	octave 4
-	note D_, 3
+	note D_, 4
 	octave 3
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
 	endchannel
 
 Music_NationalPark_Ch4: ; f57b8
 	togglenoise $3
 	notetype $c
-	note __, 1
+	note __, 2
 
 Music_NationalPark_branch_f57bd: ; f57bd
-	note __, 15
+	note __, 16
 	loopchannel 23, Music_NationalPark_branch_f57bd
-	note __, 7
+	note __, 8
+	note A#, 2
+	note D_, 2
 	note A#, 1
 	note D_, 1
-	note A#, 0
-	note D_, 0
-	note B_, 1
+	note B_, 2
 
 Music_NationalPark_branch_f57c8: ; f57c8
-	note A#, 1
-	note G_, 0
-	note G_, 0
+	note A#, 2
+	note G_, 1
+	note G_, 1
+	note D_, 2
+	note G_, 1
+	note G_, 1
+	note A#, 2
+	note G_, 1
+	note G_, 1
+	note D_, 2
+	note B_, 2
+	loopchannel 7, Music_NationalPark_branch_f57c8
+	note A#, 2
+	note G_, 1
+	note G_, 1
+	note D_, 2
+	note G_, 1
+	note G_, 1
+	note A#, 2
+	note D#, 1
+	note D#, 1
 	note D_, 1
-	note G_, 0
-	note G_, 0
-	note A#, 1
-	note G_, 0
-	note G_, 0
 	note D_, 1
-	note B_, 1
-	loopchannel 7, Music_NationalPark_branch_f57c8
 	note A#, 1
-	note G_, 0
-	note G_, 0
-	note D_, 1
-	note G_, 0
-	note G_, 0
-	note A#, 1
-	note D#, 0
-	note D#, 0
-	note D_, 0
-	note D_, 0
-	note A#, 0
-	note D#, 0
+	note D#, 1
 	loopchannel 0, Music_NationalPark_branch_f57bd
 ; f57e8
--- a/audio/music/newbarktown.asm
+++ b/audio/music/newbarktown.asm
@@ -12,57 +12,57 @@
 	stereopanning $f
 	vibrato $12, $23
 	notetype $c, $87
-	note __, 3
+	note __, 4
 
 Music_NewBarkTown_branch_eb2eb: ; eb2eb
 	dutycycle $0
 	callchannel Music_NewBarkTown_branch_eb349
 	octave 3
-	note C#, 0
-	note __, 0
+	note C#, 1
+	note __, 1
 	octave 2
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
 	octave 3
-	note G_, 1
-	note F#, 1
+	note G_, 2
+	note F#, 2
 	dutycycle $2
 	intensity $82
-	note E_, 0
-	note F#, 0
-	note E_, 0
-	note D_, 0
-	note C#, 0
+	note E_, 1
+	note F#, 1
+	note E_, 1
+	note D_, 1
+	note C#, 1
 	octave 2
-	note B_, 0
-	note A_, 0
-	note G_, 0
+	note B_, 1
+	note A_, 1
+	note G_, 1
 	dutycycle $0
 	intensity $87
 	callchannel Music_NewBarkTown_branch_eb349
 	octave 3
-	note C#, 0
-	note __, 0
+	note C#, 1
+	note __, 1
 	octave 2
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
 	octave 3
-	note E_, 1
+	note E_, 2
 	dutycycle $2
 	intensity $82
-	note C#, 0
-	note __, 0
+	note C#, 1
+	note __, 1
 	octave 2
-	note A_, 0
+	note A_, 1
 	octave 3
-	note C#, 0
-	note E_, 0
-	note G_, 0
-	note A_, 0
+	note C#, 1
+	note E_, 1
+	note G_, 1
+	note A_, 1
 	octave 4
-	note C#, 0
-	note E_, 0
-	note A_, 0
+	note C#, 1
+	note E_, 1
+	note A_, 1
 	dutycycle $1
 	intensity $5e
 	callchannel Music_NewBarkTown_branch_eb37c
@@ -69,21 +69,21 @@
 	callchannel Music_NewBarkTown_branch_eb37c
 	callchannel Music_NewBarkTown_branch_eb37c
 	octave 2
-	note G_, 1
-	note B_, 1
+	note G_, 2
+	note B_, 2
 	octave 3
-	note D_, 1
-	note F#, 3
-	note G_, 3
-	note D_, 1
+	note D_, 2
+	note F#, 4
+	note G_, 4
+	note D_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note C#, 1
-	note E_, 1
-	note G_, 3
-	note A_, 3
-	note B_, 1
+	note C#, 2
+	note E_, 2
+	note G_, 4
+	note A_, 4
+	note B_, 2
 	intensity $87
 	loopchannel 0, Music_NewBarkTown_branch_eb2eb
 ; eb349
@@ -90,75 +90,75 @@
 
 Music_NewBarkTown_branch_eb349: ; eb349
 	octave 3
-	note F#, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note A_, 1
-	note D_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note A#, 1
-	note D_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note B_, 1
-	note F#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note D_, 0
-	note __, 0
+	note F#, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note A_, 2
+	note D_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note A#, 2
+	note D_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note B_, 2
+	note F#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note D_, 1
+	note __, 1
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
 	octave 2
-	note B_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	octave 3
+	note B_, 1
+	note __, 1
 	note G_, 1
+	note __, 1
+	octave 3
+	note G_, 2
 	octave 2
-	note B_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note G#, 0
-	note __, 0
+	note B_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note G#, 1
+	note __, 1
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	endchannel
 ; eb37c
 
 Music_NewBarkTown_branch_eb37c: ; eb37c
 	octave 2
-	note G_, 1
-	note B_, 1
+	note G_, 2
+	note B_, 2
 	octave 3
-	note D_, 1
-	note F#, 3
-	note G_, 3
-	note D_, 1
+	note D_, 2
+	note F#, 4
+	note G_, 4
+	note D_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note C#, 1
-	note E_, 1
-	note G_, 3
-	note A_, 3
-	note E_, 1
+	note C#, 2
+	note E_, 2
+	note G_, 4
+	note A_, 4
+	note E_, 2
 	endchannel
 
 Music_NewBarkTown_Ch2: ; eb38d
@@ -165,7 +165,7 @@
 	stereopanning $ff
 	vibrato $12, $23
 	notetype $6, $a7
-	note __, 7
+	note __, 8
 
 Music_NewBarkTown_branch_eb396: ; eb396
 	dutycycle $2
@@ -175,75 +175,75 @@
 	callchannel Music_NewBarkTown_branch_eb3f2
 	intensity $87
 	octave 5
-	note B_, 5
-	note A_, 5
+	note B_, 6
+	note A_, 6
 	intensity $77
 	octave 6
-	note D_, 3
-	note C#, 15
+	note D_, 4
+	note C#, 16
 	callchannel Music_NewBarkTown_branch_eb3f2
 	intensity $87
 	octave 5
-	note B_, 5
-	note A_, 5
+	note B_, 6
+	note A_, 6
 	intensity $77
 	octave 6
-	note D_, 3
-	note E_, 15
+	note D_, 4
+	note E_, 16
 	loopchannel 0, Music_NewBarkTown_branch_eb396
 ; eb3bf
 
 Music_NewBarkTown_branch_eb3bf: ; eb3bf
 	octave 2
-	note D_, 3
-	note __, 7
-	note D_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
+	note D_, 4
+	note __, 8
 	note D_, 1
 	note __, 1
-	note D_, 7
-	note A#, 1
+	note D_, 1
 	note __, 1
-	note D_, 3
-	note __, 7
-	note D_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
+	note D_, 2
+	note __, 2
+	note D_, 8
+	note A#, 2
+	note __, 2
+	note D_, 4
+	note __, 8
 	note D_, 1
 	note __, 1
-	note D_, 7
-	octave 3
-	note C_, 1
+	note D_, 1
 	note __, 1
+	note D_, 2
+	note __, 2
+	note D_, 8
+	octave 3
+	note C_, 2
+	note __, 2
 	octave 2
-	note G_, 3
-	note __, 7
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	octave 1
-	note G#, 1
+	note G_, 4
+	note __, 8
+	note G_, 1
 	note __, 1
-	note G#, 7
-	octave 2
-	note D_, 1
+	note G_, 1
 	note __, 1
-	note A_, 3
-	note __, 7
-	note A_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
 	octave 1
+	note G#, 2
+	note __, 2
+	note G#, 8
+	octave 2
+	note D_, 2
+	note __, 2
+	note A_, 4
+	note __, 8
 	note A_, 1
 	note __, 1
-	note A_, 7
+	note A_, 1
+	note __, 1
+	octave 1
+	note A_, 2
+	note __, 2
+	note A_, 8
 	octave 2
-	note C#, 3
+	note C#, 4
 	endchannel
 ; eb3f2
 
@@ -251,11 +251,11 @@
 	notetype $6, $97
 	dutycycle $2
 	octave 4
-	note B_, 11
-	note A_, 11
-	note G_, 7
+	note B_, 12
+	note A_, 12
+	note G_, 8
 	notetype $c, $97
-	note E_, 15
+	note E_, 16
 	endchannel
 
 Music_NewBarkTown_Ch3: ; eb400
@@ -262,72 +262,72 @@
 	stereopanning $f0
 	notetype $c, $10
 	octave 5
-	note D_, 1
-	note E_, 1
+	note D_, 2
+	note E_, 2
 
 Music_NewBarkTown_branch_eb408: ; eb408
 	vibrato $16, $23
-	note F#, 3
-	note A_, 3
+	note F#, 4
+	note A_, 4
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note G_, 2
+	note F#, 6
+	note D_, 2
+	octave 4
+	note A_, 6
 	note G_, 1
-	note F#, 1
-	note E_, 1
-	note G_, 1
-	note F#, 5
+	note A_, 1
+	note B_, 4
+	octave 5
+	note D_, 4
+	note E_, 2
+	note D_, 2
+	note C#, 2
+	note D_, 2
+	note E_, 6
+	note F#, 2
+	note E_, 4
+	note __, 2
 	note D_, 1
-	octave 4
-	note A_, 5
-	note G_, 0
-	note A_, 0
-	note B_, 3
+	note E_, 1
+	note F#, 4
+	note A_, 4
+	note A#, 2
+	note A_, 2
+	note G_, 2
+	note A#, 2
+	note A_, 6
+	octave 6
+	note C#, 2
+	note D_, 6
 	octave 5
-	note D_, 3
 	note E_, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note E_, 5
 	note F#, 1
-	note E_, 3
-	note __, 1
-	note D_, 0
-	note E_, 0
-	note F#, 3
-	note A_, 3
-	note A#, 1
-	note A_, 1
+	note G_, 6
+	note A_, 2
+	note B_, 8
+	note A_, 6
 	note G_, 1
-	note A#, 1
-	note A_, 5
-	octave 6
-	note C#, 1
-	note D_, 5
-	octave 5
-	note E_, 0
-	note F#, 0
-	note G_, 5
-	note A_, 1
-	note B_, 7
-	note A_, 5
-	note G_, 0
-	note F#, 0
-	note E_, 3
-	note __, 3
+	note F#, 1
+	note E_, 4
+	note __, 4
 	intensity $25
 	vibrato $12, $53
 	octave 2
-	note G_, 15
-	note A_, 15
-	note G_, 15
-	note A_, 15
-	note G_, 15
-	note A_, 15
-	note G_, 15
-	note A_, 13
+	note G_, 16
+	note A_, 16
+	note G_, 16
+	note A_, 16
+	note G_, 16
+	note A_, 16
+	note G_, 16
+	note A_, 14
 	intensity $10
 	vibrato $16, $23
 	octave 5
-	note D_, 0
-	note E_, 0
+	note D_, 1
+	note E_, 1
 	loopchannel 0, Music_NewBarkTown_branch_eb408
 ; eb453
--- a/audio/music/nothing.asm
+++ b/audio/music/nothing.asm
@@ -6,11 +6,11 @@
 ; e91af
 
 
-Music_Nothing_Ch3: ; e91af
-
 Music_Nothing_Ch1: ; e91af
 
 Music_Nothing_Ch2: ; e91af
+
+Music_Nothing_Ch3: ; e91af
 
 Music_Nothing_Ch4: ; e91af
 	endchannel
--- a/audio/music/pallettown.asm
+++ b/audio/music/pallettown.asm
@@ -16,110 +16,110 @@
 	dutycycle $2
 	notetype $c, $78
 	octave 3
-	note B_, 11
-	note A_, 0
-	note D_, 0
-	note F#, 0
-	note A_, 0
-	note B_, 11
-	note D#, 0
-	note G_, 0
-	note B_, 0
+	note B_, 12
+	note A_, 1
+	note D_, 1
+	note F#, 1
+	note A_, 1
+	note B_, 12
+	note D#, 1
+	note G_, 1
+	note B_, 1
 	octave 4
-	note D#, 0
-	note E_, 3
-	note D_, 3
-	note C_, 3
+	note D#, 1
+	note E_, 4
+	note D_, 4
+	note C_, 4
 	octave 3
-	note A_, 3
+	note A_, 4
 	intensity $77
-	note G_, 7
+	note G_, 8
 	intensity $78
-	note F#, 3
-	note A_, 3
-	note B_, 11
-	note A_, 0
-	note D_, 0
-	note F#, 0
-	note A_, 0
-	note G_, 1
-	note B_, 1
-	octave 4
-	note E_, 1
-	note G_, 3
-	note F#, 1
-	note G_, 1
+	note F#, 4
+	note A_, 4
+	note B_, 12
 	note A_, 1
-	note E_, 1
 	note D_, 1
-	note C_, 1
-	note E_, 1
 	note F#, 1
-	note E_, 1
-	note D_, 1
-	note C_, 1
+	note A_, 1
+	note G_, 2
+	note B_, 2
+	octave 4
+	note E_, 2
+	note G_, 4
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note E_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
 	octave 3
-	note B_, 7
+	note B_, 8
 	intensity $77
-	note B_, 7
+	note B_, 8
 
 Music_PalletTown_branch_f4b59: ; f4b59
 	dutycycle $3
 	intensity $92
-	note G_, 1
-	note E_, 1
-	note G_, 1
-	note E_, 1
-	note G_, 1
-	note D#, 1
-	note G_, 1
-	note D#, 1
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note D#, 2
+	note G_, 2
+	note D#, 2
 	intensity $5f
-	note G_, 0
-	note A_, 0
-	note B_, 0
+	note G_, 1
+	note A_, 1
+	note B_, 1
 	octave 4
-	note C_, 0
-	note D_, 1
-	note G_, 3
-	note D_, 1
 	note C_, 1
+	note D_, 2
+	note G_, 4
+	note D_, 2
+	note C_, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	loopchannel 2, Music_PalletTown_branch_f4b59
 	intensity $3f
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note B_, 3
-	note A_, 3
-	note G_, 3
-	note F#, 3
-	note D_, 3
-	note E_, 3
+	note B_, 4
+	note A_, 4
+	note G_, 4
+	note F#, 4
+	note D_, 4
+	note E_, 4
 	intensity $72
-	note C_, 0
-	note E_, 0
-	note G_, 0
+	note C_, 1
+	note E_, 1
+	note G_, 1
 	octave 4
-	note C_, 0
-	note D_, 0
-	note A_, 0
-	octave 5
+	note C_, 1
 	note D_, 1
+	note A_, 1
+	octave 5
+	note D_, 2
 	intensity $62
-	note D_, 1
+	note D_, 2
 	intensity $22
-	note D_, 1
+	note D_, 2
 	intensity $2f
 	octave 3
-	note D_, 3
-	note E_, 3
-	note G_, 5
-	note A_, 0
-	note G_, 0
+	note D_, 4
+	note E_, 4
+	note G_, 6
+	note A_, 1
+	note G_, 1
 	intensity $1f
-	note F#, 7
+	note F#, 8
 	loopchannel 0, Music_PalletTown_branch_f4b22
 
 Music_PalletTown_Ch2: ; f4ba1
@@ -130,123 +130,123 @@
 Music_PalletTown_branch_f4ba8: ; f4ba8
 	notetype $c, $88
 	octave 1
-	note G_, 1
-	note B_, 1
+	note G_, 2
+	note B_, 2
 	octave 2
-	note D_, 1
-	note G_, 5
-	note F#, 3
+	note D_, 2
+	note G_, 6
+	note F#, 4
 	octave 1
-	note G_, 1
-	note B_, 1
+	note G_, 2
+	note B_, 2
 	octave 2
-	note D_, 1
-	note G_, 5
+	note D_, 2
+	note G_, 6
 	octave 1
-	note B_, 3
+	note B_, 4
 	octave 2
-	note C_, 1
+	note C_, 2
 	octave 1
-	note G_, 1
-	note B_, 1
+	note G_, 2
+	note B_, 2
 	octave 2
-	note C_, 3
-	note D_, 1
-	note E_, 1
-	note F#, 1
-	note G_, 1
-	note D_, 1
-	note __, 3
-	note D_, 3
-	note F#, 3
+	note C_, 4
+	note D_, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note D_, 2
+	note __, 4
+	note D_, 4
+	note F#, 4
 	octave 1
-	note G_, 1
-	note B_, 1
+	note G_, 2
+	note B_, 2
 	octave 2
-	note D_, 1
-	note G_, 5
-	note F#, 3
-	note E_, 1
-	note D_, 1
-	note E_, 1
+	note D_, 2
+	note G_, 6
+	note F#, 4
+	note E_, 2
+	note D_, 2
+	note E_, 2
 	octave 1
-	note B_, 3
+	note B_, 4
 	octave 2
-	note D_, 1
-	note E_, 1
-	note F#, 1
-	note G_, 7
-	note A_, 7
-	note G_, 1
-	note D_, 1
-	note G_, 1
+	note D_, 2
+	note E_, 2
+	note F#, 2
+	note G_, 8
+	note A_, 8
+	note G_, 2
+	note D_, 2
+	note G_, 2
 	octave 3
-	note D_, 3
+	note D_, 4
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note C_, 1
-	note D_, 1
+	note C_, 2
+	note D_, 2
 
 Music_PalletTown_branch_f4be5: ; f4be5
 	intensity $a2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note C_, 1
+	note C_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note C_, 1
+	note C_, 2
 	octave 3
-	note D#, 1
+	note D#, 2
 	octave 2
-	note C_, 1
+	note C_, 2
 	octave 3
-	note D#, 1
+	note D#, 2
 	octave 2
-	note C_, 1
+	note C_, 2
 	intensity $93
-	note G_, 5
-	note G_, 0
-	note G_, 2
-	note D_, 1
+	note G_, 6
+	note G_, 1
 	note G_, 3
+	note D_, 2
+	note G_, 4
 	loopchannel 2, Music_PalletTown_branch_f4be5
-	note C_, 1
+	note C_, 2
 	octave 3
-	note E_, 3
+	note E_, 4
 	octave 2
-	note C_, 0
+	note C_, 1
 	octave 3
-	note C_, 2
+	note C_, 3
 	octave 2
-	note C_, 1
-	note E_, 1
-	note C_, 1
-	note D_, 1
+	note C_, 2
+	note E_, 2
+	note C_, 2
+	note D_, 2
 	octave 3
-	note D_, 3
+	note D_, 4
 	octave 2
-	note D_, 0
+	note D_, 1
+	note G_, 3
+	note E_, 2
 	note G_, 2
-	note E_, 1
-	note G_, 1
-	note E_, 1
+	note E_, 2
 	intensity $1f
-	note F#, 3
+	note F#, 4
 	intensity $88
-	note F#, 3
-	note B_, 3
-	note G_, 3
-	note A_, 1
-	note D_, 1
-	note G_, 1
-	note D_, 3
-	note C_, 1
+	note F#, 4
+	note B_, 4
+	note G_, 4
+	note A_, 2
+	note D_, 2
+	note G_, 2
+	note D_, 4
+	note C_, 2
 	octave 1
-	note B_, 1
-	note A_, 1
+	note B_, 2
+	note A_, 2
 	loopchannel 0, Music_PalletTown_branch_f4ba8
 
 Music_PalletTown_Ch3: ; f4c2a
@@ -255,111 +255,111 @@
 Music_PalletTown_branch_f4c2d: ; f4c2d
 	notetype $c, $10
 	octave 6
-	note D_, 1
-	note C_, 1
+	note D_, 2
+	note C_, 2
 	octave 5
-	note B_, 1
-	note A_, 1
+	note B_, 2
+	note A_, 2
 	octave 6
-	note G_, 1
-	note E_, 1
-	note F#, 1
-	note E_, 1
-	note D_, 5
+	note G_, 2
+	note E_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 6
 	octave 5
-	note B_, 1
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	octave 6
-	note C_, 7
+	note B_, 2
+	note G_, 1
 	note __, 1
-	octave 5
-	note F#, 1
 	note G_, 1
+	note __, 1
 	note A_, 1
-	note B_, 5
+	note __, 1
+	note B_, 1
+	note __, 1
 	octave 6
-	note C_, 0
+	note C_, 8
+	note __, 2
 	octave 5
-	note B_, 0
-	note A_, 7
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note B_, 6
 	octave 6
-	note D_, 1
 	note C_, 1
 	octave 5
 	note B_, 1
+	note A_, 8
 	octave 6
-	note D_, 1
-	note G_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note E_, 5
-	note D_, 0
-	note __, 0
-	note D_, 7
-	note C_, 1
+	note D_, 2
+	note C_, 2
 	octave 5
-	note B_, 1
-	note A_, 1
-	note G_, 1
+	note B_, 2
 	octave 6
-	note D_, 1
-	note C_, 1
-	octave 5
-	note B_, 1
-	note A_, 1
-	note G_, 7
+	note D_, 2
+	note G_, 1
 	note __, 1
+	note F#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
 	note G_, 1
-	note A_, 1
-	note B_, 1
+	note __, 1
+	note E_, 6
+	note D_, 1
+	note __, 1
+	note D_, 8
+	note C_, 2
+	octave 5
+	note B_, 2
+	note A_, 2
+	note G_, 2
 	octave 6
-	note C_, 7
-	note D_, 5
-	note C_, 1
+	note D_, 2
+	note C_, 2
 	octave 5
-	note B_, 7
-	note __, 1
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	note B_, 2
+	note A_, 2
+	note G_, 8
+	note __, 2
+	note G_, 2
+	note A_, 2
+	note B_, 2
 	octave 6
+	note C_, 8
+	note D_, 6
+	note C_, 2
+	octave 5
+	note B_, 8
+	note __, 2
+	note G_, 2
+	note A_, 2
+	note B_, 2
+	octave 6
+	note C_, 2
+	note __, 2
+	note C_, 4
+	note D_, 6
 	note C_, 1
-	note __, 1
-	note C_, 3
-	note D_, 5
-	note C_, 0
-	note D_, 0
+	note D_, 1
 	octave 5
-	note B_, 7
+	note B_, 8
+	note __, 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note A_, 8
+	note E_, 4
+	note B_, 4
+	note A_, 8
+	note G_, 4
+	note E_, 4
+	note F#, 7
 	note __, 1
-	note B_, 1
-	note A_, 1
-	note G_, 1
-	note A_, 7
-	note E_, 3
-	note B_, 3
-	note A_, 7
 	note G_, 3
-	note E_, 3
-	note F#, 6
-	note __, 0
-	note G_, 2
-	note __, 0
-	note B_, 2
-	note __, 0
-	note B_, 7
-	note A_, 7
+	note __, 1
+	note B_, 3
+	note __, 1
+	note B_, 8
+	note A_, 8
 	loopchannel 0, Music_PalletTown_branch_f4c2d
 ; f4c9f
--- a/audio/music/pokeflutechannel.asm
+++ b/audio/music/pokeflutechannel.asm
@@ -12,63 +12,63 @@
 	dutycycle $3
 	tone $0002
 	notetype $c, $b4
-	note __, 3
+	note __, 4
 	octave 3
-	note E_, 7
-	note E_, 7
+	note E_, 8
+	note E_, 8
 	notetype $c, $b3
-	note F_, 1
-	note E_, 1
-	note D_, 1
-	note C_, 1
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note B_, 1
-	note A_, 1
-	note B_, 15
-	note __, 1
+	note B_, 2
+	note A_, 2
+	note B_, 16
+	note __, 2
 	octave 2
-	note G_, 3
-	note A_, 7
+	note G_, 4
+	note A_, 8
 
 Music_PokeFluteChannel_branch_f7b40: ; f7b40
 	octave 3
-	note E_, 1
-	note G_, 1
-	note F_, 3
+	note E_, 2
+	note G_, 2
+	note F_, 4
 	octave 2
-	note F_, 7
+	note F_, 8
 	octave 3
-	note G_, 1
-	note A_, 1
-	note G_, 3
+	note G_, 2
+	note A_, 2
+	note G_, 4
 	octave 2
-	note E_, 3
+	note E_, 4
 	octave 3
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	note G_, 2
+	note A_, 2
+	note B_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note B_, 7
-	note A_, 7
-	note G_, 7
+	note B_, 8
+	note A_, 8
+	note G_, 8
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note B_, 3
-	note G_, 7
+	note B_, 4
+	note G_, 8
 	octave 3
-	note C_, 3
-	note E_, 1
-	note D_, 1
+	note C_, 4
+	note E_, 2
+	note D_, 2
 	octave 2
-	note G_, 3
-	note A_, 7
+	note G_, 4
+	note A_, 8
 	loopchannel 0, Music_PokeFluteChannel_branch_f7b40
 
 Music_PokeFluteChannel_Ch2: ; f7b68
@@ -76,101 +76,101 @@
 	dutycycle $3
 	tone $0001
 	notetype $c, $c4
-	note __, 3
+	note __, 4
 	octave 3
-	note C_, 7
+	note C_, 8
 	octave 2
-	note G_, 7
-	note A_, 7
+	note G_, 8
+	note A_, 8
 	octave 3
-	note E_, 7
+	note E_, 8
 	notetype $c, $c3
 	octave 2
-	note E_, 1
-	note G_, 1
+	note E_, 2
+	note G_, 2
 	octave 3
-	note C_, 1
-	note E_, 1
+	note C_, 2
+	note E_, 2
 	octave 2
-	note G_, 1
+	note G_, 2
 	octave 3
-	note C_, 1
-	note E_, 1
-	note D_, 1
+	note C_, 2
+	note E_, 2
+	note D_, 2
 	octave 2
-	note E_, 1
+	note E_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note F_, 1
+	note F_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note E_, 1
-	note G_, 1
+	note E_, 2
+	note G_, 2
 
 Music_PokeFluteChannel_branch_f7b94: ; f7b94
 	octave 3
-	note C_, 1
-	note E_, 1
+	note C_, 2
+	note E_, 2
 	octave 2
-	note A_, 3
-	note C_, 3
+	note A_, 4
+	note C_, 4
 	octave 3
-	note G_, 1
-	note F_, 1
-	note E_, 1
-	note D_, 1
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
 	octave 2
-	note G_, 3
-	note C_, 3
-	note G_, 1
-	note E_, 1
+	note G_, 4
+	note C_, 4
+	note G_, 2
+	note E_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note A_, 1
-	note D_, 1
-	note G_, 1
-	note B_, 1
+	note A_, 2
+	note D_, 2
+	note G_, 2
+	note B_, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note D_, 1
-	note F#, 1
-	note A_, 1
+	note D_, 2
+	note F#, 2
+	note A_, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note G_, 1
+	note G_, 2
 	octave 3
-	note D_, 1
-	note G_, 1
-	note D_, 1
+	note D_, 2
+	note G_, 2
+	note D_, 2
 	octave 2
-	note D_, 3
-	note G_, 3
-	note E_, 1
+	note D_, 4
+	note G_, 4
+	note E_, 2
 	octave 3
-	note C_, 1
-	note C_, 3
+	note C_, 2
+	note C_, 4
 	octave 2
-	note G_, 1
+	note G_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note G_, 1
-	note B_, 1
-	note E_, 1
+	note G_, 2
+	note B_, 2
+	note E_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note F_, 1
+	note F_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note E_, 1
-	note G_, 1
+	note E_, 2
+	note G_, 2
 	loopchannel 0, Music_PokeFluteChannel_branch_f7b94
 
 Music_PokeFluteChannel_Ch3: ; f7bd5
@@ -180,35 +180,35 @@
 	callchannel Music_PokeFluteChannel_branch_f7c05
 
 Music_PokeFluteChannel_branch_f7be1: ; f7be1
-	note __, 3
+	note __, 4
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 5
-	note F_, 1
-	note E_, 1
-	note F_, 1
+	note F_, 2
+	note E_, 2
+	note F_, 2
 	octave 6
-	note C_, 3
-	note __, 3
+	note C_, 4
+	note __, 4
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 5
-	note G_, 1
-	note F#, 1
-	note G_, 1
+	note G_, 2
+	note F#, 2
+	note G_, 2
 	octave 6
-	note C_, 3
+	note C_, 4
 	octave 5
-	note B_, 1
-	note A_, 1
-	note B_, 3
-	note A_, 1
-	note G_, 1
-	note A_, 3
-	note G_, 1
-	note F#, 1
-	note G_, 7
-	note __, 3
+	note B_, 2
+	note A_, 2
+	note B_, 4
+	note A_, 2
+	note G_, 2
+	note A_, 4
+	note G_, 2
+	note F#, 2
+	note G_, 8
+	note __, 4
 	callchannel Music_PokeFluteChannel_branch_f7c05
 	loopchannel 0, Music_PokeFluteChannel_branch_f7be1
 ; f7c05
@@ -215,20 +215,20 @@
 
 Music_PokeFluteChannel_branch_f7c05: ; f7c05
 	octave 5
-	note E_, 1
-	note F_, 1
-	note G_, 3
-	note A_, 1
-	note G_, 1
+	note E_, 2
+	note F_, 2
+	note G_, 4
+	note A_, 2
+	note G_, 2
 	octave 6
-	note C_, 3
-	note C_, 1
-	note D_, 1
-	note C_, 1
+	note C_, 4
+	note C_, 2
+	note D_, 2
+	note C_, 2
 	octave 5
-	note G_, 1
-	note A_, 1
-	note F_, 1
-	note G_, 3
+	note G_, 2
+	note A_, 2
+	note F_, 2
+	note G_, 4
 	endchannel
 ; f7c16
--- a/audio/music/pokemoncenter.asm
+++ b/audio/music/pokemoncenter.asm
@@ -17,139 +17,139 @@
 	stereopanning $f
 	notetype $c, $83
 	octave 3
-	note F#, 1
-	note F_, 1
-	note F#, 1
+	note F#, 2
+	note F_, 2
+	note F#, 2
 	octave 4
-	note D_, 3
-	note C#, 1
+	note D_, 4
+	note C#, 2
 	octave 3
-	note B_, 1
-	note A_, 1
-	note B_, 1
-	note A_, 1
-	note G_, 1
-	note F#, 1
-	note E_, 1
-	note F#, 1
-	note G_, 1
-	note A_, 1
-	note A_, 1
-	note E_, 1
-	note A_, 1
+	note B_, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
 	octave 4
-	note C#, 3
+	note C#, 4
 	octave 3
-	note B_, 1
-	note A_, 1
-	note G_, 1
-	note F#, 1
-	note A_, 1
-	note B_, 1
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note A_, 2
+	note B_, 2
 	octave 4
-	note C#, 1
-	note D_, 1
-	note C#, 1
+	note C#, 2
+	note D_, 2
+	note C#, 2
 	octave 3
-	note B_, 1
-	note A_, 1
-	note F#, 1
-	note F_, 1
-	note F#, 1
+	note B_, 2
+	note A_, 2
+	note F#, 2
+	note F_, 2
+	note F#, 2
 	octave 4
-	note D_, 3
-	note C#, 1
+	note D_, 4
+	note C#, 2
 	octave 3
-	note B_, 1
-	note A_, 1
-	note B_, 1
-	note A_, 1
-	note G_, 1
-	note F#, 1
-	note E_, 1
-	note F#, 1
-	note G_, 1
-	note A_, 1
-	note A_, 1
-	note E_, 1
-	note A_, 1
+	note B_, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
 	octave 4
-	note C#, 3
+	note C#, 4
 	octave 3
-	note B_, 1
-	note A_, 1
-	note G_, 1
+	note B_, 2
+	note A_, 2
+	note G_, 2
 	notetype $c, $b4
-	note F#, 1
-	note E_, 1
-	note D_, 1
-	note E_, 1
-	note F#, 1
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note B_, 2
 	stereopanning $f0
-	note F#, 1
-	note E_, 1
-	note D_, 3
-	note E_, 1
-	note F#, 1
-	note G_, 1
-	note A_, 1
-	note B_, 1
-	note A_, 1
-	note G_, 3
-	note E_, 1
-	note F#, 1
-	note G_, 1
-	note A_, 1
-	note G_, 1
-	note F#, 1
-	note E_, 3
-	note C#, 1
-	note D_, 1
-	note E_, 1
-	note G_, 1
-	note F#, 1
-	note G_, 1
-	note A_, 1
-	note B_, 1
-	note A_, 7
+	note F#, 2
+	note E_, 2
+	note D_, 4
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G_, 4
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 4
+	note C#, 2
+	note D_, 2
+	note E_, 2
+	note G_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note B_, 2
+	note A_, 8
 	octave 4
-	note D_, 1
-	note C#, 1
+	note D_, 2
+	note C#, 2
 	octave 3
-	note B_, 3
-	note A_, 1
-	note B_, 1
+	note B_, 4
+	note A_, 2
+	note B_, 2
 	octave 4
-	note C#, 1
-	note D_, 1
-	note E_, 1
-	note D_, 1
-	note C#, 3
+	note C#, 2
+	note D_, 2
+	note E_, 2
+	note D_, 2
+	note C#, 4
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note C#, 1
-	note D_, 1
-	note E_, 1
-	note C#, 1
+	note C#, 2
+	note D_, 2
+	note E_, 2
+	note C#, 2
 	octave 3
-	note B_, 1
-	note A_, 3
-	note G_, 1
-	note A_, 1
-	note B_, 1
-	note G_, 1
-	note A_, 1
-	note G_, 1
-	note F#, 1
-	note E_, 1
-	note D_, 1
-	note E_, 1
-	note F#, 1
-	note G_, 1
+	note B_, 2
+	note A_, 4
+	note G_, 2
+	note A_, 2
+	note B_, 2
+	note G_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
 	loopchannel 0, Music_PokemonCenter_branch_ed5df
 
 Music_PokemonCenter_Ch2: ; ed671
@@ -161,64 +161,64 @@
 	stereopanning $f
 	notetype $c, $a5
 	octave 3
-	note A_, 3
-	note E_, 3
+	note A_, 4
+	note E_, 4
 	stereopanning $ff
 	callchannel Music_PokemonCenter_branch_ed6e4
-	note D_, 1
-	note F#, 5
+	note D_, 2
+	note F#, 6
 	stereopanning $f
 	notetype $c, $a5
 	octave 3
-	note A_, 3
-	note E_, 3
+	note A_, 4
+	note E_, 4
 	stereopanning $ff
 	callchannel Music_PokemonCenter_branch_ed6d1
 	stereopanning $f
 	notetype $c, $a5
 	octave 3
-	note A_, 3
-	note E_, 3
+	note A_, 4
+	note E_, 4
 	stereopanning $ff
 	callchannel Music_PokemonCenter_branch_ed6e4
-	note D_, 7
+	note D_, 8
 	stereopanning $f
 	notetype $c, $a5
 	octave 3
-	note D_, 3
-	note E_, 3
+	note D_, 4
+	note E_, 4
 	notetype $c, $c6
 	octave 4
-	note F#, 7
-	note A_, 7
-	note G_, 1
-	note A_, 1
-	note G_, 1
-	note F#, 1
-	note E_, 7
-	note C#, 7
-	note E_, 7
-	note F#, 1
-	note G_, 1
-	note F#, 1
-	note E_, 1
-	note D_, 7
-	note F#, 7
-	note A_, 7
-	note G_, 1
-	note F#, 1
-	note G_, 1
-	note A_, 1
-	note B_, 7
-	note A_, 3
-	note G_, 1
-	note F#, 1
-	note G_, 7
-	note F#, 1
-	note G_, 1
-	note F#, 1
-	note E_, 1
-	note D_, 7
+	note F#, 8
+	note A_, 8
+	note G_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 8
+	note C#, 8
+	note E_, 8
+	note F#, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 8
+	note F#, 8
+	note A_, 8
+	note G_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note B_, 8
+	note A_, 4
+	note G_, 2
+	note F#, 2
+	note G_, 8
+	note F#, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 8
 	loopchannel 0, Music_PokemonCenter_branch_ed674
 ; ed6d1
 
@@ -226,17 +226,17 @@
 	dutycycle $2
 	notetype $c, $c2
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	intensity $c3
-	note A_, 3
-	note G_, 3
-	note F#, 1
-	note E_, 1
-	note C#, 5
+	note A_, 4
+	note G_, 4
+	note F#, 2
+	note E_, 2
+	note C#, 6
 	endchannel
 ; ed6e4
 
@@ -243,15 +243,15 @@
 Music_PokemonCenter_branch_ed6e4: ; ed6e4
 	notetype $c, $c2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	intensity $c3
-	note F#, 3
-	note E_, 3
-	note C#, 1
+	note F#, 4
+	note E_, 4
+	note C#, 2
 	endchannel
 
 Music_PokemonCenter_Ch3: ; ed6f3
@@ -260,145 +260,145 @@
 Music_PokemonCenter_branch_ed6f6: ; ed6f6
 	stereopanning $f0
 	octave 3
-	note D_, 0
-	note __, 4
-	note F#, 0
-	note __, 2
-	note F#, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
+	note D_, 1
+	note __, 5
+	note F#, 1
+	note __, 3
+	note F#, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
 	callchannel Music_PokemonCenter_branch_ed76f
 	callchannel Music_PokemonCenter_branch_ed778
-	note F#, 0
-	note __, 4
-	note A_, 0
-	note __, 2
-	note A_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note D_, 0
-	note __, 4
-	note F#, 0
-	note __, 2
-	note F#, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
+	note F#, 1
+	note __, 5
+	note A_, 1
+	note __, 3
+	note A_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note D_, 1
+	note __, 5
+	note F#, 1
+	note __, 3
+	note F#, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
 	callchannel Music_PokemonCenter_branch_ed76f
 	callchannel Music_PokemonCenter_branch_ed778
-	note D_, 0
-	note __, 4
-	note F#, 0
-	note __, 2
-	note F#, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
+	note D_, 1
+	note __, 5
+	note F#, 1
+	note __, 3
+	note F#, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
 	stereopanning $ff
 	callchannel Music_PokemonCenter_branch_ed783
-	note G_, 0
-	note __, 4
-	note B_, 0
-	note __, 2
-	note B_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note E_, 0
-	note __, 4
-	note G_, 0
-	note __, 2
-	note G_, 0
-	note __, 2
-	note G_, 0
-	note __, 0
-	note F#, 0
-	note __, 4
-	note A_, 0
-	note __, 2
-	note A_, 0
-	note __, 0
-	note G#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note G_, 1
+	note __, 5
+	note B_, 1
+	note __, 3
+	note B_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note E_, 1
+	note __, 5
+	note G_, 1
+	note __, 3
+	note G_, 1
+	note __, 3
+	note G_, 1
+	note __, 1
+	note F#, 1
+	note __, 5
+	note A_, 1
+	note __, 3
+	note A_, 1
+	note __, 1
+	note G#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
 	callchannel Music_PokemonCenter_branch_ed783
-	note G_, 0
-	note __, 4
-	note B_, 0
-	note __, 2
-	note B_, 0
-	note __, 2
-	note B_, 0
-	note __, 0
-	note E_, 0
-	note __, 4
-	note G_, 0
-	note __, 2
-	note G_, 0
-	note __, 2
-	note G_, 0
-	note __, 0
-	note F#, 0
-	note __, 4
-	note A_, 0
-	note __, 2
-	note A_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
+	note G_, 1
+	note __, 5
+	note B_, 1
+	note __, 3
+	note B_, 1
+	note __, 3
+	note B_, 1
+	note __, 1
+	note E_, 1
+	note __, 5
+	note G_, 1
+	note __, 3
+	note G_, 1
+	note __, 3
+	note G_, 1
+	note __, 1
+	note F#, 1
+	note __, 5
+	note A_, 1
+	note __, 3
+	note A_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
 	loopchannel 0, Music_PokemonCenter_branch_ed6f6
 ; ed76f
 
 Music_PokemonCenter_branch_ed76f: ; ed76f
-	note E_, 0
-	note __, 4
-	note A_, 0
-	note __, 2
-	note A_, 0
-	note __, 2
-	note A_, 0
-	note __, 0
+	note E_, 1
+	note __, 5
+	note A_, 1
+	note __, 3
+	note A_, 1
+	note __, 3
+	note A_, 1
+	note __, 1
 	endchannel
 ; ed778
 
 Music_PokemonCenter_branch_ed778: ; ed778
-	note E_, 0
-	note __, 4
-	note A_, 0
-	note __, 2
-	note A_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note E_, 1
+	note __, 5
+	note A_, 1
+	note __, 3
+	note A_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
 	endchannel
 ; ed783
 
 Music_PokemonCenter_branch_ed783: ; ed783
-	note F#, 0
-	note __, 4
-	note A_, 0
-	note __, 2
-	note A_, 0
-	note __, 2
-	note A_, 0
-	note __, 0
+	note F#, 1
+	note __, 5
+	note A_, 1
+	note __, 3
+	note A_, 1
+	note __, 3
+	note A_, 1
+	note __, 1
 	endchannel
 
 Music_PokemonCenter_Ch4: ; ed78c
@@ -407,10 +407,10 @@
 	stereopanning $ff
 
 Music_PokemonCenter_branch_ed792: ; ed792
-	note G_, 5
-	note G_, 3
-	note G_, 1
-	note G_, 1
-	note G_, 1
+	note G_, 6
+	note G_, 4
+	note G_, 2
+	note G_, 2
+	note G_, 2
 	loopchannel 0, Music_PokemonCenter_branch_ed792
 ; ed79b
--- a/audio/music/pokemonchannel.asm
+++ b/audio/music/pokemonchannel.asm
@@ -14,66 +14,66 @@
 	stereopanning $f
 	notetype $c, $b3
 	octave 2
-	note B_, 0
+	note B_, 1
+	note __, 2
+	note F#, 1
+	note B_, 1
 	note __, 1
-	note F#, 0
-	note B_, 0
-	note __, 0
 	octave 3
-	note F#, 3
+	note F#, 4
 	dutycycle $0
 	octave 2
-	note B_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
 	notetype $6, $b3
-	note G_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	dutycycle $1
-	octave 3
-	note C_, 1
-	note __, 3
 	note G_, 1
-	note C_, 1
 	note __, 1
-	note B_, 7
+	note B_, 1
+	note __, 1
+	dutycycle $1
+	octave 3
+	note C_, 2
+	note __, 4
+	note G_, 2
+	note C_, 2
+	note __, 2
+	note B_, 8
 	dutycycle $0
-	note C_, 3
-	note C_, 3
+	note C_, 4
+	note C_, 4
 	octave 2
-	note G_, 1
-	note __, 1
+	note G_, 2
+	note __, 2
 	dutycycle $3
 	octave 4
-	note D_, 1
-	note __, 1
-	note D_, 1
-	note __, 1
+	note D_, 2
+	note __, 2
+	note D_, 2
+	note __, 2
 	octave 3
-	note G_, 1
-	note B_, 1
+	note G_, 2
+	note B_, 2
 	octave 4
-	note D_, 1
-	note F#, 1
-	note G_, 1
-	note __, 1
-	note D#, 1
-	note __, 1
-	note C_, 1
-	note __, 1
-	note D#, 1
-	note __, 1
-	note __, 7
+	note D_, 2
+	note F#, 2
+	note G_, 2
+	note __, 2
+	note D#, 2
+	note __, 2
+	note C_, 2
+	note __, 2
+	note D#, 2
+	note __, 2
+	note __, 8
 	octave 3
-	note G_, 1
-	note __, 5
-	note B_, 1
-	note __, 5
-	note D_, 1
-	note __, 5
+	note G_, 2
+	note __, 6
+	note B_, 2
+	note __, 6
+	note D_, 2
+	note __, 6
 	endchannel
 
 Music_PokemonChannel_Ch2: ; ee4be
@@ -82,68 +82,68 @@
 	stereopanning $ff
 	notetype $c, $b3
 	octave 3
-	note G_, 2
-	note A_, 0
-	note B_, 0
-	note __, 0
+	note G_, 3
+	note A_, 1
+	note B_, 1
+	note __, 1
 	octave 4
-	note D_, 3
+	note D_, 4
 	dutycycle $0
 	octave 3
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
 	notetype $6, $b3
-	note D_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	dutycycle $1
-	octave 4
-	note C_, 5
 	note D_, 1
-	note E_, 1
 	note __, 1
-	note G_, 7
+	note G_, 1
+	note __, 1
+	dutycycle $1
+	octave 4
+	note C_, 6
+	note D_, 2
+	note E_, 2
+	note __, 2
+	note G_, 8
 	dutycycle $0
 	octave 3
-	note G_, 3
-	note F#, 3
-	note E_, 1
-	note __, 1
+	note G_, 4
+	note F#, 4
+	note E_, 2
+	note __, 2
 	dutycycle $3
 	octave 4
-	note B_, 1
-	note __, 1
-	note A#, 1
-	note __, 1
-	note B_, 7
+	note B_, 2
+	note __, 2
+	note A#, 2
+	note __, 2
+	note B_, 8
 	octave 5
-	note C_, 1
-	note __, 1
-	note C_, 1
-	note __, 1
+	note C_, 2
+	note __, 2
+	note C_, 2
+	note __, 2
 	octave 4
-	note A#, 1
+	note A#, 2
+	note __, 2
+	note G#, 2
+	note __, 2
+	note __, 8
+	note D_, 2
+	octave 3
+	note B_, 1
 	note __, 1
-	note G#, 1
+	note G_, 1
 	note __, 1
-	note __, 7
 	note D_, 1
-	octave 3
-	note B_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
+	note __, 1
 	octave 4
-	note G_, 1
-	note __, 5
+	note G_, 2
+	note __, 6
 	octave 3
-	note G_, 1
-	note __, 5
+	note G_, 2
+	note __, 6
 	endchannel
 
 Music_PokemonChannel_Ch3: ; ee50e
@@ -151,55 +151,55 @@
 	notetype $c, $25
 	stereopanning $f0
 	octave 2
-	note G_, 0
-	note __, 1
-	note B_, 0
+	note G_, 1
+	note __, 2
+	note B_, 1
 	octave 3
-	note D_, 0
-	note __, 0
-	note G_, 5
-	note __, 3
-	note C_, 0
+	note D_, 1
 	note __, 1
+	note G_, 6
+	note __, 4
+	note C_, 1
+	note __, 2
 	octave 2
-	note G_, 0
+	note G_, 1
 	octave 3
-	note C_, 0
-	note __, 0
-	note E_, 5
-	note __, 3
+	note C_, 1
+	note __, 1
+	note E_, 6
+	note __, 4
 	octave 4
-	note G_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
 	octave 3
-	note G_, 3
-	note G#, 0
-	note __, 0
+	note G_, 4
+	note G#, 1
+	note __, 1
 	octave 4
-	note C_, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note G#, 0
-	note __, 0
-	note D_, 0
+	note C_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note G#, 1
+	note __, 1
+	note D_, 1
 	octave 3
-	note B_, 0
-	note G_, 0
-	note B_, 0
-	note G_, 0
-	note D_, 0
+	note B_, 1
+	note G_, 1
+	note B_, 1
+	note G_, 1
+	note D_, 1
 	octave 2
-	note B_, 0
+	note B_, 1
 	octave 3
-	note D_, 0
+	note D_, 1
 	octave 2
-	note G_, 0
-	note __, 2
-	note G_, 0
-	note __, 2
+	note G_, 1
+	note __, 3
+	note G_, 1
+	note __, 3
 	endchannel
 
 Music_PokemonChannel_Ch4: ; ee549
@@ -207,29 +207,29 @@
 	notetype $c
 
 Music_PokemonChannel_branch_ee54d: ; ee54d
-	note A#, 2
-	note A#, 0
+	note A#, 3
+	note A#, 1
+	note D_, 2
+	note C_, 4
+	note D_, 2
+	note D_, 2
+	note A#, 1
 	note D_, 1
-	note C_, 3
-	note D_, 1
-	note D_, 1
-	note A#, 0
-	note D_, 0
 	loopchannel 2, Music_PokemonChannel_branch_ee54d
+	note G#, 2
+	note A#, 2
 	note G#, 1
-	note A#, 1
-	note G#, 0
-	note G#, 0
-	note G#, 0
-	note G#, 0
-	note C_, 3
-	note G#, 0
-	note G#, 0
-	note G#, 0
-	note G#, 0
-	note B_, 3
-	note D_, 3
-	note A#, 3
-	note A#, 3
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	note C_, 4
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	note B_, 4
+	note D_, 4
+	note A#, 4
+	note A#, 4
 	endchannel
 ; ee569
--- a/audio/music/pokemonlullaby.asm
+++ b/audio/music/pokemonlullaby.asm
@@ -14,46 +14,46 @@
 Music_PokemonLullaby_branch_f6d8c: ; f6d8c
 	notetype $c, $a7
 	octave 3
-	note G_, 15
+	note G_, 16
 	octave 4
-	note C_, 15
+	note C_, 16
 	stereopanning $f0
 	octave 3
-	note G_, 15
+	note G_, 16
 	stereopanning $f
 	octave 4
-	note C_, 7
+	note C_, 8
 	stereopanning $f0
 	octave 3
-	note B_, 7
+	note B_, 8
 	stereopanning $f
-	note G_, 15
+	note G_, 16
 	stereopanning $f0
 	octave 4
-	note C_, 7
+	note C_, 8
 	stereopanning $f
 	octave 3
-	note B_, 7
+	note B_, 8
 	stereopanning $f0
-	note G_, 7
+	note G_, 8
 	stereopanning $ff
-	note __, 1
-	note G_, 1
-	note G_, 1
-	note B_, 1
+	note __, 2
+	note G_, 2
+	note G_, 2
+	note B_, 2
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note B_, 3
+	note B_, 4
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note B_, 3
-	note G_, 15
+	note B_, 4
+	note G_, 16
 	octave 4
-	note C_, 7
+	note C_, 8
 	octave 3
-	note B_, 7
+	note B_, 8
 	loopchannel 0, Music_PokemonLullaby_branch_f6d8c
 
 Music_PokemonLullaby_Ch2: ; f6dc4
@@ -62,49 +62,49 @@
 	notetype $c, $b4
 
 Music_PokemonLullaby_branch_f6dcc: ; f6dcc
-	note __, 15
-	note __, 9
+	note __, 16
+	note __, 10
 	octave 4
-	note G_, 1
-	note F#, 1
-	note G_, 1
+	note G_, 2
+	note F#, 2
+	note G_, 2
 	intensity $b7
-	note E_, 11
-	note D_, 1
-	note E_, 1
-	note F_, 3
-	note G_, 3
-	note F_, 1
-	note E_, 1
-	note D_, 1
-	note F_, 1
-	note E_, 9
+	note E_, 12
+	note D_, 2
+	note E_, 2
+	note F_, 4
+	note G_, 4
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note F_, 2
+	note E_, 10
 	intensity $b5
-	note D_, 1
-	note D_, 1
+	note D_, 2
+	note D_, 2
 	intensity $c7
-	note E_, 1
-	note F_, 3
-	note E_, 3
-	note F_, 3
+	note E_, 2
+	note F_, 4
+	note E_, 4
+	note F_, 4
 	intensity $b5
-	note G_, 1
-	note G_, 1
-	note D#, 1
+	note G_, 2
+	note G_, 2
+	note D#, 2
 	intensity $b7
-	note E_, 13
+	note E_, 14
 	intensity $87
 	octave 3
-	note F_, 7
-	note G_, 3
+	note F_, 8
+	note G_, 4
 	intensity $b5
 	octave 4
-	note G_, 1
-	note G_, 1
+	note G_, 2
+	note G_, 2
 	intensity $b7
-	note D#, 1
-	note E_, 15
-	note __, 13
+	note D#, 2
+	note E_, 16
+	note __, 14
 	loopchannel 0, Music_PokemonLullaby_branch_f6dcc
 
 Music_PokemonLullaby_Ch3: ; f6e03
@@ -113,26 +113,26 @@
 Music_PokemonLullaby_branch_f6e06: ; f6e06
 	stereopanning $f0
 	octave 4
-	note C_, 1
-	note E_, 1
-	note G_, 1
-	note B_, 1
+	note C_, 2
+	note E_, 2
+	note G_, 2
+	note B_, 2
 	octave 5
-	note C_, 1
+	note C_, 2
 	octave 4
-	note B_, 1
-	note A_, 1
-	note G_, 1
+	note B_, 2
+	note A_, 2
+	note G_, 2
 	stereopanning $f
-	note D_, 1
-	note F_, 1
-	note A_, 1
+	note D_, 2
+	note F_, 2
+	note A_, 2
 	octave 5
-	note C_, 1
-	note D_, 1
-	note C_, 1
+	note C_, 2
+	note D_, 2
+	note C_, 2
 	octave 4
-	note B_, 1
-	note A_, 1
+	note B_, 2
+	note A_, 2
 	loopchannel 0, Music_PokemonLullaby_branch_f6e06
 ; f6e23
--- a/audio/music/pokemonmarch.asm
+++ b/audio/music/pokemonmarch.asm
@@ -14,115 +14,115 @@
 	tone $0001
 	notetype $c, $42
 	octave 3
-	note D_, 3
+	note D_, 4
 	intensity $62
-	note D_, 3
+	note D_, 4
 	intensity $82
-	note D_, 3
+	note D_, 4
 	intensity $a2
-	note D_, 3
+	note D_, 4
 	notetype $8, $a2
 
 Music_PokemonMarch_branch_f6e4c: ; f6e4c
 	callchannel Music_PokemonMarch_branch_f6eae
-	note D#, 1
-	note C_, 1
-	note D#, 1
-	note C_, 1
+	note D#, 2
+	note C_, 2
+	note D#, 2
+	note C_, 2
 	callchannel Music_PokemonMarch_branch_f6eae
-	note D#, 1
-	note C_, 1
-	note D#, 1
-	note G_, 1
+	note D#, 2
+	note C_, 2
+	note D#, 2
+	note G_, 2
 	callchannel Music_PokemonMarch_branch_f6eae
-	note C_, 1
-	note C_, 1
-	note D#, 1
-	note C_, 1
+	note C_, 2
+	note C_, 2
+	note D#, 2
+	note C_, 2
 	callchannel Music_PokemonMarch_branch_f6eae
-	note D#, 1
-	note C_, 1
-	note C#, 1
-	note D#, 1
+	note D#, 2
+	note C_, 2
+	note C#, 2
+	note D#, 2
 	callchannel Music_PokemonMarch_branch_f6eb8
-	note F_, 1
-	note D_, 1
-	note F_, 1
-	note D_, 1
+	note F_, 2
+	note D_, 2
+	note F_, 2
+	note D_, 2
 	callchannel Music_PokemonMarch_branch_f6eb8
-	note F_, 1
-	note D_, 1
-	note F_, 1
-	note A_, 1
+	note F_, 2
+	note D_, 2
+	note F_, 2
+	note A_, 2
 	callchannel Music_PokemonMarch_branch_f6eb8
-	note D_, 1
-	note D_, 1
-	note F_, 1
-	note D_, 1
+	note D_, 2
+	note D_, 2
+	note F_, 2
+	note D_, 2
 	callchannel Music_PokemonMarch_branch_f6eb8
-	note F_, 1
-	note D_, 1
-	note F_, 1
-	note G_, 1
+	note F_, 2
+	note D_, 2
+	note F_, 2
+	note G_, 2
 	callchannel Music_PokemonMarch_branch_f6eb8
-	note F_, 1
-	note D_, 1
-	note F_, 1
-	note D_, 1
+	note F_, 2
+	note D_, 2
+	note F_, 2
+	note D_, 2
 	callchannel Music_PokemonMarch_branch_f6eae
-	note D#, 1
-	note C_, 1
-	note D#, 1
-	note C_, 1
+	note D#, 2
+	note C_, 2
+	note D#, 2
+	note C_, 2
 	octave 2
-	note A#, 1
-	note A#, 1
+	note A#, 2
+	note A#, 2
 	octave 3
-	note C_, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
+	note C_, 2
+	note D_, 2
+	note C#, 2
+	note C_, 2
 	octave 2
-	note A#, 1
-	note __, 3
-	note D#, 1
-	note __, 3
+	note A#, 2
+	note __, 4
+	note D#, 2
+	note __, 4
 	octave 3
-	note D#, 1
-	note D#, 1
-	note F_, 1
-	note G_, 1
-	note F#, 1
-	note F_, 1
-	note D#, 3
-	note F_, 1
-	note G_, 3
-	note A#, 1
+	note D#, 2
+	note D#, 2
+	note F_, 2
+	note G_, 2
+	note F#, 2
+	note F_, 2
+	note D#, 4
+	note F_, 2
+	note G_, 4
+	note A#, 2
 	loopchannel 0, Music_PokemonMarch_branch_f6e4c
 ; f6eae
 
 Music_PokemonMarch_branch_f6eae: ; f6eae
-	note __, 3
+	note __, 4
 	octave 3
-	note D#, 0
-	note D_, 0
 	note D#, 1
-	note __, 1
-	note D#, 1
-	note D#, 1
-	note __, 1
+	note D_, 1
+	note D#, 2
+	note __, 2
+	note D#, 2
+	note D#, 2
+	note __, 2
 	endchannel
 ; f6eb8
 
 Music_PokemonMarch_branch_f6eb8: ; f6eb8
-	note __, 3
-	note F_, 0
-	note E_, 0
+	note __, 4
 	note F_, 1
-	note __, 1
-	note F_, 1
-	note F_, 1
-	note __, 1
+	note E_, 1
+	note F_, 2
+	note __, 2
+	note F_, 2
+	note F_, 2
+	note __, 2
 	endchannel
 
 Music_PokemonMarch_Ch2: ; f6ec1
@@ -130,276 +130,276 @@
 	vibrato $10, $22
 	notetype $c, $b2
 	octave 3
-	note G_, 3
-	note G_, 3
-	note G_, 3
-	note G_, 3
+	note G_, 4
+	note G_, 4
+	note G_, 4
+	note G_, 4
 
 Music_PokemonMarch_branch_f6ece: ; f6ece
 	notetype $c, $b7
 	octave 3
-	note G#, 11
+	note G#, 12
 	notetype $8, $b3
-	note D#, 1
-	note G#, 1
-	note A#, 1
+	note D#, 2
+	note G#, 2
+	note A#, 2
 	octave 4
-	note C_, 1
-	note __, 15
-	note __, 5
+	note C_, 2
+	note __, 16
+	note __, 6
 	notetype $8, $b7
 	octave 3
-	note G#, 15
+	note G#, 16
 	notetype $8, $b3
-	note D#, 1
-	note G#, 3
-	note A#, 1
+	note D#, 2
+	note G#, 4
+	note A#, 2
 	octave 4
-	note C_, 3
-	note C#, 1
-	note C_, 3
-	note C#, 1
-	note C_, 3
-	note C#, 1
-	note C_, 1
+	note C_, 4
+	note C#, 2
+	note C_, 4
+	note C#, 2
+	note C_, 4
+	note C#, 2
+	note C_, 2
 	octave 3
-	note A#, 1
-	note G#, 1
+	note A#, 2
+	note G#, 2
 	notetype $8, $b7
-	note A#, 15
+	note A#, 16
 	notetype $8, $b3
-	note A#, 1
-	note F_, 1
-	note A#, 1
+	note A#, 2
+	note F_, 2
+	note A#, 2
 	octave 4
-	note C_, 1
-	note D_, 1
-	note __, 15
-	note __, 5
+	note C_, 2
+	note D_, 2
+	note __, 16
+	note __, 6
 	notetype $8, $b7
 	octave 3
-	note A#, 15
+	note A#, 16
 	notetype $8, $b3
-	note F_, 1
-	note A#, 3
+	note F_, 2
+	note A#, 4
 	octave 4
-	note C_, 1
-	note D_, 3
-	note D#, 1
-	note D_, 3
-	note D#, 1
-	note D_, 3
-	note D#, 1
-	note D_, 1
-	note C_, 1
+	note C_, 2
+	note D_, 4
+	note D#, 2
+	note D_, 4
+	note D#, 2
+	note D_, 4
+	note D#, 2
+	note D_, 2
+	note C_, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	notetype $8, $b7
-	note A#, 15
+	note A#, 16
 	notetype $8, $b3
-	note A_, 1
-	note A#, 3
+	note A_, 2
+	note A#, 4
 	octave 4
-	note C_, 1
+	note C_, 2
 	notetype $8, $b7
 	octave 3
-	note G#, 15
+	note G#, 16
 	notetype $8, $b3
-	note A#, 1
-	note G#, 3
-	note F_, 1
+	note A#, 2
+	note G#, 4
+	note F_, 2
+	note D#, 2
+	note D#, 2
+	note F_, 2
+	note G_, 2
+	note F#, 2
+	note F_, 2
+	note D#, 2
+	note __, 2
+	octave 4
 	note D#, 1
+	note D_, 1
 	note D#, 1
-	note F_, 1
+	note __, 5
+	octave 3
+	note G_, 2
+	note G_, 2
+	note G#, 2
+	note A#, 2
+	note A_, 2
+	note G#, 2
+	note G_, 2
+	note __, 2
+	octave 4
 	note G_, 1
 	note F#, 1
-	note F_, 1
-	note D#, 1
-	note __, 1
-	octave 4
-	note D#, 0
-	note D_, 0
-	note D#, 0
-	note __, 4
-	octave 3
 	note G_, 1
-	note G_, 1
-	note G#, 1
-	note A#, 1
-	note A_, 1
-	note G#, 1
-	note G_, 1
-	note __, 1
-	octave 4
-	note G_, 0
-	note F#, 0
-	note G_, 0
-	note __, 4
+	note __, 5
 	loopchannel 0, Music_PokemonMarch_branch_f6ece
 
 Music_PokemonMarch_Ch3: ; f6f4d
 	stereopanning $f
 	notetype $c, $16
-	note __, 15
+	note __, 16
 	notetype $8, $16
 
 Music_PokemonMarch_branch_f6f56: ; f6f56
 	callchannel Music_PokemonMarch_branch_f6fe8
-	note __, 1
+	note __, 2
 	octave 4
-	note D#, 1
+	note D#, 2
 	callchannel Music_PokemonMarch_branch_f6fe8
 	octave 4
-	note G#, 1
-	note D#, 1
+	note G#, 2
+	note D#, 2
 	callchannel Music_PokemonMarch_branch_f6fe8
-	note __, 1
+	note __, 2
 	octave 4
-	note D#, 1
+	note D#, 2
 	octave 3
-	note G#, 1
-	note __, 1
+	note G#, 2
+	note __, 2
 	octave 4
-	note D#, 1
+	note D#, 2
 	octave 3
-	note D#, 1
-	note __, 1
+	note D#, 2
+	note __, 2
 	octave 4
-	note D#, 1
+	note D#, 2
 	octave 3
-	note G#, 1
-	note __, 1
+	note G#, 2
+	note __, 2
 	octave 4
-	note D#, 1
+	note D#, 2
 	octave 3
-	note D#, 1
-	note G_, 1
-	note G#, 1
+	note D#, 2
+	note G_, 2
+	note G#, 2
 
 Music_PokemonMarch_branch_f6f7b: ; f6f7b
 	octave 3
-	note A#, 1
-	note __, 1
+	note A#, 2
+	note __, 2
 	octave 4
-	note F_, 1
+	note F_, 2
 	octave 3
-	note F_, 1
-	note __, 1
+	note F_, 2
+	note __, 2
 	octave 4
-	note F_, 1
+	note F_, 2
 	octave 3
-	note G_, 1
-	note __, 1
+	note G_, 2
+	note __, 2
 	octave 4
-	note F_, 1
+	note F_, 2
 	octave 3
-	note A_, 1
-	note __, 0
+	note A_, 2
+	note __, 1
 	octave 4
-	note F_, 1
-	note __, 0
+	note F_, 2
+	note __, 1
 	loopchannel 3, Music_PokemonMarch_branch_f6f7b
 	octave 3
-	note A#, 1
-	note __, 1
+	note A#, 2
+	note __, 2
 	octave 4
-	note F_, 1
+	note F_, 2
 	octave 3
-	note F_, 1
-	note __, 1
+	note F_, 2
+	note __, 2
 	octave 4
-	note F_, 1
+	note F_, 2
 	octave 3
-	note A#, 1
-	note __, 1
+	note A#, 2
+	note __, 2
 	octave 4
-	note F_, 1
-	note D_, 1
-	note C_, 1
+	note F_, 2
+	note D_, 2
+	note C_, 2
 	octave 3
-	note B_, 1
-	note A#, 1
-	note __, 1
+	note B_, 2
+	note A#, 2
+	note __, 2
 	octave 4
-	note F_, 1
+	note F_, 2
 	octave 3
-	note F_, 1
-	note __, 1
+	note F_, 2
+	note __, 2
 	octave 4
-	note F_, 1
+	note F_, 2
 	octave 3
-	note G_, 1
-	note __, 1
+	note G_, 2
+	note __, 2
 	octave 4
-	note F_, 1
+	note F_, 2
 	octave 3
-	note F_, 1
-	note G_, 1
-	note A#, 1
-	note G#, 1
-	note __, 1
+	note F_, 2
+	note G_, 2
+	note A#, 2
+	note G#, 2
+	note __, 2
 	octave 4
-	note D#, 1
+	note D#, 2
 	octave 3
-	note D#, 1
-	note __, 1
+	note D#, 2
+	note __, 2
 	octave 4
-	note D#, 1
+	note D#, 2
 	octave 3
-	note F_, 1
-	note __, 1
+	note F_, 2
+	note __, 2
 	octave 4
-	note D#, 1
+	note D#, 2
 	octave 3
-	note G#, 1
-	note __, 1
+	note G#, 2
+	note __, 2
 	octave 4
-	note C_, 1
-	note D#, 1
-	note D#, 1
-	note F_, 1
-	note G_, 1
-	note F#, 1
-	note F_, 1
-	note D#, 1
-	note __, 3
+	note C_, 2
+	note D#, 2
+	note D#, 2
+	note F_, 2
+	note G_, 2
+	note F#, 2
+	note F_, 2
+	note D#, 2
+	note __, 4
 	octave 3
-	note D#, 1
-	note __, 3
+	note D#, 2
+	note __, 4
 	octave 4
-	note G_, 1
-	note G_, 1
-	note G#, 1
-	note A#, 1
-	note A_, 1
-	note G#, 1
-	note G_, 1
-	note __, 1
-	note D#, 1
-	note F_, 1
-	note __, 1
-	note G#, 1
+	note G_, 2
+	note G_, 2
+	note G#, 2
+	note A#, 2
+	note A_, 2
+	note G#, 2
+	note G_, 2
+	note __, 2
+	note D#, 2
+	note F_, 2
+	note __, 2
+	note G#, 2
 	loopchannel 0, Music_PokemonMarch_branch_f6f56
 ; f6fe8
 
 Music_PokemonMarch_branch_f6fe8: ; f6fe8
 	octave 3
-	note G#, 1
-	note __, 1
+	note G#, 2
+	note __, 2
 	octave 4
-	note D#, 1
+	note D#, 2
 	octave 3
-	note D#, 1
-	note __, 1
+	note D#, 2
+	note __, 2
 	octave 4
-	note D#, 1
+	note D#, 2
 	octave 3
-	note F_, 1
-	note __, 1
+	note F_, 2
+	note __, 2
 	octave 4
-	note D#, 1
+	note D#, 2
 	octave 3
-	note G_, 1
+	note G_, 2
 	endchannel
 
 Music_PokemonMarch_Ch4: ; f6ffa
@@ -410,17 +410,17 @@
 
 Music_PokemonMarch_branch_f7003: ; f7003
 	callchannel Music_PokemonMarch_branch_f7042
-	note C_, 3
-	note C_, 1
-	note C_, 3
-	note C_, 1
-	note C_, 3
 	note C_, 4
+	note C_, 2
+	note C_, 4
+	note C_, 2
+	note C_, 4
+	note C_, 5
 	notetype $6
-	note D_, 0
-	note D_, 0
-	note C#, 0
-	note C#, 0
+	note D_, 1
+	note D_, 1
+	note C#, 1
+	note C#, 1
 	notetype $8
 	callchannel Music_PokemonMarch_branch_f7042
 	callchannel Music_PokemonMarch_branch_f704c
@@ -430,17 +430,17 @@
 	callchannel Music_PokemonMarch_branch_f704c
 	callchannel Music_PokemonMarch_branch_f7042
 	callchannel Music_PokemonMarch_branch_f704c
-	note C#, 3
-	note C#, 1
-	note C#, 3
-	note C#, 1
-	note C#, 5
-	note C_, 1
+	note C#, 4
+	note C#, 2
+	note C#, 4
+	note C#, 2
+	note C#, 6
+	note C_, 2
 	notetype $4
-	note __, 4
+	note __, 5
 	notetype $6
-	note D_, 0
-	note D_, 0
+	note D_, 1
+	note D_, 1
 	notetype $8
 	callchannel Music_PokemonMarch_branch_f704c
 	loopchannel 0, Music_PokemonMarch_branch_f7003
@@ -447,26 +447,26 @@
 ; f7042
 
 Music_PokemonMarch_branch_f7042: ; f7042
-	note C_, 3
-	note C_, 1
-	note C_, 3
-	note C_, 1
-	note C_, 3
-	note D_, 1
-	note D_, 1
-	note C#, 1
-	note C#, 1
+	note C_, 4
+	note C_, 2
+	note C_, 4
+	note C_, 2
+	note C_, 4
+	note D_, 2
+	note D_, 2
+	note C#, 2
+	note C#, 2
 	endchannel
 ; f704c
 
 Music_PokemonMarch_branch_f704c: ; f704c
-	note C_, 3
-	note C_, 1
-	note C_, 3
-	note C_, 3
-	note C_, 3
-	note C#, 1
-	note D_, 1
-	note C#, 1
+	note C_, 4
+	note C_, 2
+	note C_, 4
+	note C_, 4
+	note C_, 4
+	note C#, 2
+	note D_, 2
+	note C#, 2
 	endchannel
 ; f7055
--- a/audio/music/postcredits.asm
+++ b/audio/music/postcredits.asm
@@ -11,125 +11,125 @@
 	forceoctave $3
 	dutycycle $2
 	notetype $c, $93
-	note __, 7
+	note __, 8
 
 Music_PostCredits_branch_cfdb2: ; cfdb2
 	octave 3
-	note C_, 1
-	note E_, 1
-	note G_, 1
+	note C_, 2
+	note E_, 2
+	note G_, 2
 	octave 4
-	note C_, 1
-	note E_, 1
+	note C_, 2
+	note E_, 2
 	intensity $73
-	note E_, 1
+	note E_, 2
 	intensity $53
-	note E_, 1
+	note E_, 2
 	intensity $43
-	note E_, 1
+	note E_, 2
 	intensity $93
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note D_, 1
-	note G_, 1
-	note B_, 1
+	note D_, 2
+	note G_, 2
+	note B_, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	intensity $73
-	note D_, 1
+	note D_, 2
 	intensity $53
-	note D_, 1
+	note D_, 2
 	intensity $43
-	note D_, 1
+	note D_, 2
 	intensity $93
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note D_, 1
-	note G_, 1
-	note A#, 1
+	note D_, 2
+	note G_, 2
+	note A#, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	intensity $73
-	note D_, 1
+	note D_, 2
 	intensity $53
-	note D_, 1
+	note D_, 2
 	intensity $43
-	note D_, 1
+	note D_, 2
 	intensity $93
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note C_, 1
-	note F_, 1
-	note A_, 1
+	note C_, 2
+	note F_, 2
+	note A_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	intensity $73
-	note C_, 1
+	note C_, 2
 	intensity $53
-	note C_, 1
+	note C_, 2
 	intensity $43
-	note C_, 1
+	note C_, 2
 	intensity $93
 	octave 2
-	note G#, 1
+	note G#, 2
 	octave 3
-	note C_, 1
-	note F_, 1
-	note G#, 1
+	note C_, 2
+	note F_, 2
+	note G#, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	intensity $73
-	note C_, 1
+	note C_, 2
 	intensity $53
-	note C_, 1
+	note C_, 2
 	intensity $43
-	note C_, 1
+	note C_, 2
 	intensity $93
 	octave 2
-	note G_, 1
+	note G_, 2
 	octave 3
-	note C_, 1
-	note E_, 1
-	note G_, 1
+	note C_, 2
+	note E_, 2
+	note G_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	intensity $73
-	note C_, 1
+	note C_, 2
 	intensity $63
-	note C_, 1
+	note C_, 2
 	intensity $43
-	note C_, 1
+	note C_, 2
 	intensity $93
 	octave 2
-	note F#, 1
-	note A_, 1
+	note F#, 2
+	note A_, 2
 	octave 3
-	note D_, 1
-	note F#, 1
-	note A_, 1
+	note D_, 2
+	note F#, 2
+	note A_, 2
 	intensity $73
-	note A_, 1
+	note A_, 2
 	intensity $63
-	note A_, 1
+	note A_, 2
 	intensity $43
-	note A_, 1
+	note A_, 2
 	intensity $93
 	octave 2
-	note G_, 1
+	note G_, 2
 	octave 3
-	note C_, 1
-	note D_, 1
-	note G_, 1
-	note G_, 1
+	note C_, 2
+	note D_, 2
+	note G_, 2
+	note G_, 2
 	intensity $73
-	note G_, 1
+	note G_, 2
 	intensity $93
-	note D_, 1
+	note D_, 2
 	octave 2
-	note G_, 1
+	note G_, 2
 	loopchannel 0, Music_PostCredits_branch_cfdb2
 
 Music_PostCredits_Ch2: ; cfe48
@@ -137,132 +137,132 @@
 	dutycycle $2
 	notetype $c, $a3
 	octave 5
-	note E_, 1
+	note E_, 2
 	intensity $73
-	note E_, 1
+	note E_, 2
 	intensity $a3
-	note F_, 1
+	note F_, 2
 	intensity $73
-	note F_, 1
+	note F_, 2
 
 Music_PostCredits_branch_cfe5a: ; cfe5a
 	intensity $a3
-	note G_, 1
+	note G_, 2
 	intensity $73
-	note G_, 1
+	note G_, 2
 	intensity $53
-	note G_, 1
+	note G_, 2
 	intensity $43
-	note G_, 1
+	note G_, 2
 	intensity $93
 	octave 6
-	note D_, 1
-	note C_, 1
+	note D_, 2
+	note C_, 2
 	octave 5
-	note B_, 1
+	note B_, 2
 	octave 6
-	note C_, 1
+	note C_, 2
 	octave 5
-	note G_, 1
+	note G_, 2
 	intensity $73
-	note G_, 1
+	note G_, 2
 	intensity $53
-	note G_, 1
+	note G_, 2
 	intensity $43
-	note G_, 1
+	note G_, 2
 	intensity $33
-	note G_, 1
+	note G_, 2
 	intensity $a3
-	note E_, 1
+	note E_, 2
 	intensity $73
-	note E_, 1
+	note E_, 2
 	intensity $a3
-	note F_, 1
-	note G_, 1
+	note F_, 2
+	note G_, 2
 	intensity $73
-	note G_, 1
+	note G_, 2
 	intensity $53
-	note G_, 1
+	note G_, 2
 	intensity $43
-	note G_, 1
+	note G_, 2
 	intensity $33
-	note G_, 1
+	note G_, 2
 	intensity $a3
-	note A_, 1
+	note A_, 2
 	intensity $73
-	note A_, 1
+	note A_, 2
 	intensity $a3
-	note E_, 1
-	note G_, 1
+	note E_, 2
+	note G_, 2
 	intensity $73
-	note G_, 1
+	note G_, 2
 	intensity $53
-	note G_, 1
+	note G_, 2
 	intensity $a3
-	note F_, 1
+	note F_, 2
 	intensity $73
-	note F_, 1
+	note F_, 2
 	intensity $53
-	note F_, 1
+	note F_, 2
 	intensity $a3
-	note D_, 1
-	note E_, 1
-	note F_, 1
+	note D_, 2
+	note E_, 2
+	note F_, 2
 	intensity $73
-	note F_, 1
+	note F_, 2
 	intensity $53
-	note F_, 1
+	note F_, 2
 	intensity $43
-	note F_, 1
+	note F_, 2
 	intensity $33
-	note F_, 1
+	note F_, 2
 	intensity $a3
-	note G_, 1
+	note G_, 2
 	intensity $73
-	note G_, 1
+	note G_, 2
 	intensity $a3
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note B_, 1
+	note F_, 2
+	note E_, 2
+	note D#, 2
+	note E_, 2
+	note B_, 2
 	intensity $73
-	note B_, 1
+	note B_, 2
 	intensity $53
-	note B_, 1
+	note B_, 2
 	intensity $a3
-	note A_, 1
+	note A_, 2
 	intensity $73
-	note A_, 1
+	note A_, 2
 	intensity $a3
-	note D_, 1
+	note D_, 2
 	intensity $73
-	note D_, 1
+	note D_, 2
 	intensity $53
-	note D_, 1
+	note D_, 2
 	intensity $43
-	note D_, 1
+	note D_, 2
 	intensity $33
-	note D_, 1
-	note D_, 1
+	note D_, 2
+	note D_, 2
 	intensity $23
-	note D_, 1
-	note D_, 1
+	note D_, 2
+	note D_, 2
 	intensity $a3
-	note G_, 1
+	note G_, 2
 	intensity $73
 	octave 4
-	note G_, 1
+	note G_, 2
 	intensity $a3
 	octave 5
-	note D_, 1
-	note G_, 1
+	note D_, 2
+	note G_, 2
 	intensity $73
-	note G_, 1
+	note G_, 2
 	intensity $53
-	note G_, 1
+	note G_, 2
 	intensity $a3
-	note E_, 1
-	note F_, 1
+	note E_, 2
+	note F_, 2
 	loopchannel 0, Music_PostCredits_branch_cfe5a
 ; cff04
--- a/audio/music/printer.asm
+++ b/audio/music/printer.asm
@@ -7,317 +7,317 @@
 	tempo 256
 	notetype $c, $20
 	octave 4
-	note B_, 5
+	note B_, 6
 	octave 5
-	note C#, 0
-	note __, 0
+	note C#, 1
+	note __, 1
 	octave 4
-	note B_, 5
+	note B_, 6
 	octave 5
-	note C#, 0
-	note __, 0
+	note C#, 1
+	note __, 1
 	octave 4
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 5
-	note E_, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note C#, 0
-	note __, 0
+	note E_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note C#, 1
+	note __, 1
 	octave 4
-	note B_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note G#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
+	note B_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note G#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
 
 Music_Printer_branch_f0823: ; f0823
-	note E_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
+	note E_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
 	octave 5
-	note C#, 0
-	note C_, 0
-	note C#, 0
-	note __, 0
+	note C#, 1
+	note C_, 1
+	note C#, 1
+	note __, 1
 	octave 4
-	note F#, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note G#, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note G#, 0
-	note __, 0
-	note E_, 0
-	note __, 0
+	note F#, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note G#, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note G#, 1
+	note __, 1
+	note E_, 1
+	note __, 1
 	octave 5
-	note E_, 0
-	note D#, 0
-	note E_, 0
-	note __, 0
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note __, 1
 	octave 4
-	note D#, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note G#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
+	note D#, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note G#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
 	octave 3
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 4
-	note C#, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
+	note C#, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
 	octave 3
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 4
-	note F#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
+	note F#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
 	octave 3
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 4
-	note F#, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note G#, 0
-	note __, 0
+	note F#, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note G#, 1
+	note __, 1
 	octave 3
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 4
-	note G#, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note G#, 1
+	note __, 1
 	octave 3
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 4
-	note G#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note C#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note C#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note B_, 0
-	note A#, 0
-	note B_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note B_, 1
+	note A#, 1
+	note B_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note G#, 1
+	note __, 1
 	octave 3
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 4
-	note C#, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
+	note C#, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
 	octave 3
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 4
-	note F#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
+	note F#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
 	octave 3
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 4
-	note F#, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note G#, 0
-	note __, 0
+	note F#, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note G#, 1
+	note __, 1
 	octave 3
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 4
-	note G#, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note G#, 1
+	note __, 1
 	octave 3
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 4
-	note G#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note C#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note G#, 1
+	note __, 1
 	octave 3
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 4
-	note C#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
+	note C#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
 	loopchannel 0, Music_Printer_branch_f0823
 ; f0941
--- a/audio/music/profoak.asm
+++ b/audio/music/profoak.asm
@@ -14,15 +14,15 @@
 	dutycycle $3
 	notetype $c, $98
 	octave 2
-	note F#, 0
-	note B_, 0
+	note F#, 1
+	note B_, 1
 	octave 3
-	note D#, 0
-	note F#, 0
-	note A_, 15
-	note G#, 7
+	note D#, 1
+	note F#, 1
+	note A_, 16
+	note G#, 8
 	intensity $97
-	note G#, 7
+	note G#, 8
 
 Music_ProfOak_branch_f4e10: ; f4e10
 	intensity $91
@@ -48,47 +48,47 @@
 
 Music_ProfOak_branch_f4e42: ; f4e42
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note E_, 1
-	note G#, 1
-	note E_, 1
-	note B_, 1
-	note E_, 1
-	note G#, 1
-	note E_, 1
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
 	endchannel
 ; f4e4d
 
 Music_ProfOak_branch_f4e4d: ; f4e4d
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note D#, 1
-	note F#, 1
-	note D#, 1
-	note B_, 1
-	note D#, 1
-	note F#, 1
-	note D#, 1
+	note D#, 2
+	note F#, 2
+	note D#, 2
+	note B_, 2
+	note D#, 2
+	note F#, 2
+	note D#, 2
 	endchannel
 ; f4e58
 
 Music_ProfOak_branch_f4e58: ; f4e58
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
+	note C#, 2
+	note E_, 2
 	note C#, 1
 	note E_, 1
-	note C#, 0
-	note E_, 0
-	note C#, 1
+	note C#, 2
 	intensity $92
-	note A_, 1
+	note A_, 2
 	intensity $91
-	note C#, 1
+	note C#, 2
 	intensity $92
-	note E_, 1
+	note E_, 2
 	intensity $91
 	endchannel
 ; f4e6c
@@ -95,17 +95,17 @@
 
 Music_ProfOak_branch_f4e6c: ; f4e6c
 	octave 2
-	note B_, 0
+	note B_, 1
 	octave 3
-	note E_, 0
+	note E_, 1
 	intensity $92
-	note G#, 3
-	note E_, 3
+	note G#, 4
+	note E_, 4
 	intensity $91
-	note E_, 0
-	note G#, 0
+	note E_, 1
+	note G#, 1
 	intensity $92
-	note B_, 3
+	note B_, 4
 	intensity $91
 	endchannel
 
@@ -114,124 +114,124 @@
 	dutycycle $3
 	notetype $c, $a8
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note D#, 0
-	note F#, 0
-	note A#, 0
-	note B_, 15
+	note D#, 1
+	note F#, 1
+	note A#, 1
+	note B_, 16
 	intensity $a7
-	note B_, 9
+	note B_, 10
 	dutycycle $2
 
 Music_ProfOak_branch_f4e92: ; f4e92
 	intensity $b2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note C#, 1
-	note D#, 1
-	note E_, 3
-	note D#, 1
-	note C#, 3
+	note C#, 2
+	note D#, 2
+	note E_, 4
+	note D#, 2
+	note C#, 4
 	intensity $91
-	note B_, 1
+	note B_, 2
 	octave 5
-	note C#, 1
-	note D#, 1
-	note E_, 3
-	note D#, 1
-	note C#, 3
+	note C#, 2
+	note D#, 2
+	note E_, 4
+	note D#, 2
+	note C#, 4
 	intensity $b2
 	octave 3
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 4
 	note B_, 1
-	note A_, 1
-	note G#, 1
-	note A_, 3
-	note B_, 0
-	note __, 0
-	note B_, 3
+	note __, 1
+	note B_, 4
 	intensity $91
 	octave 4
-	note B_, 1
-	note A_, 1
-	note G#, 1
-	note A_, 3
-	note B_, 1
-	note B_, 3
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 4
+	note B_, 2
+	note B_, 4
 	loopchannel 2, Music_ProfOak_branch_f4e92
-	note __, 5
+	note __, 6
 	intensity $b4
 
 Music_ProfOak_branch_f4ebf: ; f4ebf
-	note C#, 5
+	note C#, 6
 	octave 3
-	note A_, 0
+	note A_, 1
 	octave 4
-	note C#, 0
-	note E_, 5
-	note C#, 0
-	note E_, 0
-	note F#, 3
-	note E_, 3
-	note D#, 3
-	note C#, 3
+	note C#, 1
+	note E_, 6
+	note C#, 1
+	note E_, 1
+	note F#, 4
+	note E_, 4
+	note D#, 4
+	note C#, 4
 	octave 3
-	note B_, 5
-	note G#, 0
-	note B_, 0
+	note B_, 6
+	note G#, 1
+	note B_, 1
 	octave 4
-	note E_, 7
+	note E_, 8
 	intensity $82
-	note B_, 5
-	note G#, 0
-	note B_, 0
+	note B_, 6
+	note G#, 1
+	note B_, 1
 	intensity $83
 	octave 5
-	note E_, 7
+	note E_, 8
 	intensity $b4
 	octave 3
-	note A_, 5
-	note F#, 0
-	note A_, 0
+	note A_, 6
+	note F#, 1
+	note A_, 1
 	octave 4
-	note D#, 7
-	note E_, 3
-	note D#, 3
-	note C#, 3
-	note C_, 3
+	note D#, 8
+	note E_, 4
+	note D#, 4
+	note C#, 4
+	note C_, 4
 	octave 3
-	note B_, 5
-	note G#, 0
-	note B_, 0
+	note B_, 6
+	note G#, 1
+	note B_, 1
 	octave 4
-	note E_, 5
+	note E_, 6
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note E_, 0
-	note G#, 15
+	note E_, 1
+	note G#, 16
 	loopchannel 0, Music_ProfOak_branch_f4ebf
 
 Music_ProfOak_Ch3: ; f4ef5
 	stereopanning $f
 	notetype $c, $14
-	note __, 3
+	note __, 4
 	octave 3
+	note E_, 2
+	note __, 2
+	octave 4
 	note E_, 1
 	note __, 1
-	octave 4
-	note E_, 0
-	note __, 0
 	octave 3
-	note A_, 1
-	note __, 1
+	note A_, 2
+	note __, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note B_, 0
-	note __, 0
-	note E_, 1
+	note B_, 1
+	note __, 1
+	note E_, 2
 	callchannel Music_ProfOak_branch_f4f3d
 
 Music_ProfOak_branch_f4f0d: ; f4f0d
@@ -256,73 +256,73 @@
 ; f4f3d
 
 Music_ProfOak_branch_f4f3d: ; f4f3d
+	note E_, 2
+	note __, 2
+	octave 4
 	note E_, 1
 	note __, 1
-	octave 4
-	note E_, 0
-	note __, 0
 	octave 3
-	note G#, 1
-	note __, 1
+	note G#, 2
+	note __, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note B_, 0
-	note __, 0
-	note E_, 1
+	note B_, 1
+	note __, 1
+	note E_, 2
 	endchannel
 ; f4f4c
 
 Music_ProfOak_branch_f4f4c: ; f4f4c
 	octave 2
-	note B_, 1
-	note __, 1
+	note B_, 2
+	note __, 2
 	octave 4
-	note D#, 0
-	note __, 0
-	octave 3
 	note D#, 1
 	note __, 1
-	note F#, 1
-	note B_, 0
-	note __, 0
-	note D#, 1
+	octave 3
+	note D#, 2
+	note __, 2
+	note F#, 2
+	note B_, 1
+	note __, 1
+	note D#, 2
 	endchannel
 ; f4f5a
 
 Music_ProfOak_branch_f4f5a: ; f4f5a
 	octave 2
+	note A_, 2
+	note __, 2
+	octave 3
 	note A_, 1
 	note __, 1
-	octave 3
-	note A_, 0
-	note __, 0
 	octave 2
+	note A_, 2
+	note __, 2
+	octave 3
+	note E_, 2
 	note A_, 1
 	note __, 1
-	octave 3
-	note E_, 1
-	note A_, 0
-	note __, 0
-	note C#, 1
+	note C#, 2
 	endchannel
 ; f4f69
 
 Music_ProfOak_branch_f4f69: ; f4f69
 	octave 2
+	note G#, 2
+	note __, 2
+	octave 3
 	note G#, 1
 	note __, 1
-	octave 3
-	note G#, 0
-	note __, 0
 	octave 2
+	note G#, 2
+	note __, 2
+	octave 3
+	note E_, 2
 	note G#, 1
 	note __, 1
-	octave 3
-	note E_, 1
-	note G#, 0
-	note __, 0
 	octave 2
-	note B_, 1
+	note B_, 2
 	endchannel
 ; f4f79
--- a/audio/music/profoakspokemontalk.asm
+++ b/audio/music/profoakspokemontalk.asm
@@ -13,125 +13,125 @@
 	vibrato $6, $25
 	dutycycle $1
 	notetype $c, $94
-	note __, 7
+	note __, 8
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note C#, 0
-	note D#, 0
-	note E_, 0
-	note C#, 0
-	note D#, 0
-	note E_, 0
-	note F#, 0
+	note C#, 1
+	note D#, 1
+	note E_, 1
+	note C#, 1
+	note D#, 1
+	note E_, 1
+	note F#, 1
 
 Music_ProfOaksPokemonTalk_branch_f4cc3: ; f4cc3
-	note D#, 5
-	note C#, 0
+	note D#, 6
+	note C#, 1
 	octave 3
-	note B_, 0
-	note F#, 0
-	note G#, 0
-	note F#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note A_, 0
-	note A#, 0
 	note B_, 1
-	note F#, 0
-	note G#, 0
-	note F#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note F#, 0
-	note G#, 0
-	note F#, 0
-	note __, 0
-	note A#, 3
+	note F#, 1
+	note G#, 1
+	note F#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note A_, 1
+	note A#, 1
+	note B_, 2
+	note F#, 1
+	note G#, 1
+	note F#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note F#, 1
+	note G#, 1
+	note F#, 1
+	note __, 1
+	note A#, 4
 	octave 4
-	note D#, 5
-	note C#, 0
+	note D#, 6
+	note C#, 1
 	octave 3
-	note B_, 0
-	note G#, 0
-	note B_, 0
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note A#, 0
-	note B_, 0
-	note F#, 0
-	note A#, 0
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note F#, 0
-	note A#, 0
-	note D#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note A#, 3
-	note E_, 1
+	note B_, 1
+	note G#, 1
+	note B_, 1
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note A#, 1
+	note B_, 1
+	note F#, 1
+	note A#, 1
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note F#, 1
+	note A#, 1
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note A#, 4
+	note E_, 2
 	octave 2
-	note B_, 0
+	note B_, 1
 	octave 3
-	note E_, 0
+	note E_, 1
+	note G#, 2
+	note E_, 1
 	note G#, 1
-	note E_, 0
-	note G#, 0
-	note B_, 0
+	note B_, 1
 	octave 4
-	note C#, 0
+	note C#, 1
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note C#, 0
+	note C#, 1
 	octave 3
-	note B_, 3
+	note B_, 4
+	note F#, 2
+	note D#, 1
 	note F#, 1
-	note D#, 0
-	note F#, 0
+	note B_, 2
+	note F#, 1
 	note B_, 1
-	note F#, 0
-	note B_, 0
 	octave 4
-	note D#, 0
-	note E_, 0
-	note D#, 0
-	note E_, 0
-	note D#, 3
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 4
 	octave 3
+	note A#, 2
+	octave 4
+	note C#, 2
+	note E_, 2
+	note F#, 2
+	note C#, 2
+	note E_, 2
+	note F#, 2
+	note E_, 2
+	note C#, 2
+	octave 3
 	note A#, 1
+	note __, 1
+	note B_, 1
+	note __, 1
 	octave 4
 	note C#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
 	note E_, 1
+	note __, 1
+	note F_, 1
+	note __, 1
 	note F#, 1
-	note C#, 1
-	note E_, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	octave 3
-	note A#, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	octave 4
-	note C#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
+	note __, 1
 	loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4cc3
 
 Music_ProfOaksPokemonTalk_Ch2: ; f4d31
@@ -140,74 +140,74 @@
 	notetype $c, $a7
 	stereopanning $ff
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note C#, 0
-	note D#, 0
-	note E_, 0
-	note C#, 0
-	note D#, 0
-	note E_, 0
-	note F#, 0
-	note D#, 0
-	note E_, 0
-	note F#, 0
-	note G#, 0
-	note E_, 0
-	note F#, 0
-	note G#, 0
-	note A#, 0
+	note C#, 1
+	note D#, 1
+	note E_, 1
+	note C#, 1
+	note D#, 1
+	note E_, 1
+	note F#, 1
+	note D#, 1
+	note E_, 1
+	note F#, 1
+	note G#, 1
+	note E_, 1
+	note F#, 1
+	note G#, 1
+	note A#, 1
 
 Music_ProfOaksPokemonTalk_branch_f4d4d: ; f4d4d
-	note B_, 5
-	note A#, 0
-	note G#, 0
-	note F#, 5
-	note F_, 0
-	note F#, 0
-	note G#, 3
-	note F#, 7
-	note F#, 3
-	note G#, 5
-	note F#, 0
-	note E_, 0
-	note D#, 5
-	note D_, 0
-	note D#, 0
-	note E_, 3
-	note D#, 7
-	note D#, 3
-	note E_, 5
-	octave 3
-	note B_, 0
-	octave 4
-	note E_, 0
-	note G#, 7
-	note F#, 5
-	note D#, 0
-	note F#, 0
-	note B_, 7
-	note A#, 3
-	note B_, 1
+	note B_, 6
 	note A#, 1
-	note G#, 3
-	note A#, 1
 	note G#, 1
+	note F#, 6
+	note F_, 1
 	note F#, 1
-	note C#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note G#, 0
-	note __, 0
-	note A#, 0
-	note __, 0
+	note G#, 4
+	note F#, 8
+	note F#, 4
+	note G#, 6
+	note F#, 1
+	note E_, 1
+	note D#, 6
+	note D_, 1
+	note D#, 1
+	note E_, 4
+	note D#, 8
+	note D#, 4
+	note E_, 6
+	octave 3
+	note B_, 1
+	octave 4
+	note E_, 1
+	note G#, 8
+	note F#, 6
+	note D#, 1
+	note F#, 1
+	note B_, 8
+	note A#, 4
+	note B_, 2
+	note A#, 2
+	note G#, 4
+	note A#, 2
+	note G#, 2
+	note F#, 2
+	note C#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note G#, 1
+	note __, 1
+	note A#, 1
+	note __, 1
 	loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4d4d
 
 Music_ProfOaksPokemonTalk_Ch3: ; f4d82
@@ -214,99 +214,99 @@
 	vibrato $6, $38
 	notetype $c, $25
 	stereopanning $f0
-	note __, 7
+	note __, 8
 	octave 3
-	note F#, 0
-	note E_, 0
-	note D#, 0
-	note C#, 0
-	note E_, 0
-	note D#, 0
-	note C#, 0
+	note F#, 1
+	note E_, 1
+	note D#, 1
+	note C#, 1
+	note E_, 1
+	note D#, 1
+	note C#, 1
 	octave 2
-	note A#, 0
+	note A#, 1
 
 Music_ProfOaksPokemonTalk_branch_f4d95: ; f4d95
-	note B_, 5
+	note B_, 6
 	octave 3
-	note D#, 0
-	note F#, 0
-	note B_, 5
-	note D#, 0
-	note C#, 0
+	note D#, 1
+	note F#, 1
+	note B_, 6
+	note D#, 1
+	note C#, 1
 	octave 2
-	note B_, 3
+	note B_, 4
 	octave 3
-	note B_, 7
+	note B_, 8
 	octave 4
-	note D#, 3
+	note D#, 4
 	octave 3
-	note G#, 5
-	note D#, 0
-	note G#, 0
+	note G#, 6
+	note D#, 1
+	note G#, 1
 	octave 2
-	note G#, 5
+	note G#, 6
 	octave 3
-	note D#, 0
-	note G#, 0
-	note D#, 5
-	note F#, 1
-	note A#, 1
-	note G#, 1
-	note F#, 1
 	note D#, 1
+	note G#, 1
+	note D#, 6
+	note F#, 2
+	note A#, 2
+	note G#, 2
+	note F#, 2
+	note D#, 2
+	note E_, 2
+	note __, 4
 	note E_, 1
-	note __, 3
-	note E_, 0
-	note E_, 0
-	note E_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note B_, 3
+	note E_, 1
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note B_, 4
+	note F#, 2
+	note __, 4
 	note F#, 1
-	note __, 3
-	note F#, 0
-	note F#, 0
+	note F#, 1
 	octave 2
-	note B_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
 	octave 3
-	note B_, 3
-	note F#, 1
+	note B_, 4
+	note F#, 2
 	octave 4
-	note F#, 1
+	note F#, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 4
-	note E_, 1
+	note E_, 2
 	octave 3
-	note C#, 1
+	note C#, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 2
-	note F#, 1
+	note F#, 2
 	octave 3
-	note A#, 0
-	note __, 0
-	note G#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note C#, 0
-	note __, 0
+	note A#, 1
+	note __, 1
+	note G#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note C#, 1
+	note __, 1
 	octave 2
-	note A#, 0
-	note __, 0
+	note A#, 1
+	note __, 1
 	loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4d95
 ; f4dea
--- a/audio/music/rivalbattle.asm
+++ b/audio/music/rivalbattle.asm
@@ -13,282 +13,282 @@
 	vibrato $8, $15
 	notetype $c, $b2
 	octave 3
-	note F#, 1
-	note A#, 3
+	note F#, 2
+	note A#, 4
 	intensity $b7
-	note A#, 9
+	note A#, 10
 	intensity $b2
-	note F#, 1
+	note F#, 2
 	octave 4
-	note C#, 3
+	note C#, 4
 	intensity $b7
-	note C#, 5
-	note E_, 3
+	note C#, 6
+	note E_, 4
 
 Music_RivalBattle_branch_e9777: ; e9777
 	intensity $b2
 	octave 2
-	note A#, 5
+	note A#, 6
 	intensity $b7
 	octave 3
-	note C#, 5
+	note C#, 6
 	intensity $b2
-	note D#, 3
+	note D#, 4
 	loopchannel 3, Music_RivalBattle_branch_e9777
 	intensity $b2
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note C#, 3
+	note C#, 4
 	intensity $b7
-	note C#, 9
+	note C#, 10
 
 Music_RivalBattle_branch_e978f: ; e978f
 	intensity $b2
 	octave 3
-	note G#, 5
+	note G#, 6
 	intensity $b7
-	note B_, 5
+	note B_, 6
 	intensity $b2
 	octave 4
-	note C#, 3
+	note C#, 4
 	loopchannel 3, Music_RivalBattle_branch_e978f
 	intensity $b2
 	octave 3
-	note G#, 1
-	note B_, 3
+	note G#, 2
+	note B_, 4
 	intensity $4d
-	note B_, 9
+	note B_, 10
 
 Music_RivalBattle_branch_e97a6: ; e97a6
 	intensity $b7
-	note A#, 5
-	note F#, 5
-	note D#, 3
-	note F_, 3
-	note F#, 3
-	note G#, 1
-	note A#, 5
+	note A#, 6
+	note F#, 6
+	note D#, 4
+	note F_, 4
+	note F#, 4
+	note G#, 2
+	note A#, 6
 	intensity $b2
-	note F_, 0
-	note D#, 0
-	note C#, 0
-	note D#, 0
+	note F_, 1
+	note D#, 1
+	note C#, 1
+	note D#, 1
 	intensity $b7
-	note F_, 3
+	note F_, 4
 	intensity $b2
-	note G#, 0
-	note F#, 0
-	note F_, 0
-	note F#, 0
+	note G#, 1
+	note F#, 1
+	note F_, 1
+	note F#, 1
 	intensity $b7
-	note G#, 3
+	note G#, 4
 	intensity $b6
-	note G#, 1
-	note A#, 1
-	note B_, 1
-	note A#, 1
-	note B_, 1
+	note G#, 2
+	note A#, 2
+	note B_, 2
+	note A#, 2
+	note B_, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note E_, 1
+	note E_, 2
 	intensity $b7
 	octave 3
-	note A#, 5
-	note F#, 5
-	note A#, 3
+	note A#, 6
+	note F#, 6
+	note A#, 4
 	octave 4
-	note C#, 3
+	note C#, 4
 	octave 3
-	note B_, 3
-	note A#, 1
-	note G#, 5
-	note F_, 5
+	note B_, 4
+	note A#, 2
+	note G#, 6
+	note F_, 6
 	octave 4
-	note C#, 5
+	note C#, 6
 	octave 3
-	note G#, 3
+	note G#, 4
 	intensity $b5
-	note C#, 1
-	note F_, 1
-	note G#, 1
+	note C#, 2
+	note F_, 2
+	note G#, 2
 	octave 4
-	note C_, 1
-	note C#, 1
+	note C_, 2
+	note C#, 2
 	octave 3
-	note G#, 1
-	note F_, 1
-	note G#, 1
+	note G#, 2
+	note F_, 2
+	note G#, 2
 	intensity $b7
-	note F#, 9
+	note F#, 10
 	intensity $b4
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note D#, 1
-	note F#, 1
+	note D#, 2
+	note F#, 2
 	intensity $b7
-	note F_, 3
-	note D#, 3
-	note C#, 1
-	note D#, 5
+	note F_, 4
+	note D#, 4
+	note C#, 2
+	note D#, 6
 	intensity $a0
-	note F_, 7
+	note F_, 8
 	intensity $a7
-	note F_, 7
+	note F_, 8
 	intensity $a0
 	octave 2
-	note A#, 7
+	note A#, 8
 	intensity $a7
-	note A#, 7
+	note A#, 8
 	intensity $b7
 	octave 3
-	note F#, 9
+	note F#, 10
 	intensity $b5
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note D#, 1
-	note F#, 1
-	note F_, 1
-	note D#, 1
-	note C#, 1
-	note D#, 1
-	note G#, 1
-	note F#, 1
-	note F_, 1
-	note G#, 1
+	note D#, 2
+	note F#, 2
+	note F_, 2
+	note D#, 2
+	note C#, 2
+	note D#, 2
+	note G#, 2
+	note F#, 2
+	note F_, 2
+	note G#, 2
 	intensity $a0
-	note A#, 15
+	note A#, 16
 	intensity $a7
-	note A#, 15
+	note A#, 16
 	intensity $a0
-	note B_, 7
+	note B_, 8
 	intensity $a7
-	note B_, 3
+	note B_, 4
 	intensity $b7
-	note G#, 3
+	note G#, 4
 	intensity $b5
 	octave 4
-	note E_, 1
-	note D#, 1
-	note C#, 1
+	note E_, 2
+	note D#, 2
+	note C#, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note F#, 1
-	note E_, 1
-	note D#, 1
-	note C#, 1
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note C#, 2
 
 Music_RivalBattle_branch_e9837: ; e9837
 	octave 3
-	note A#, 1
-	note E_, 1
-	note A#, 1
+	note A#, 2
+	note E_, 2
+	note A#, 2
 	octave 4
-	note D#, 1
-	note E_, 1
-	note D#, 1
+	note D#, 2
+	note E_, 2
+	note D#, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note D#, 1
+	note D#, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note D#, 1
-	note E_, 1
-	note D#, 1
+	note D#, 2
+	note E_, 2
+	note D#, 2
 	octave 3
-	note A#, 1
-	note D#, 1
-	note A#, 1
+	note A#, 2
+	note D#, 2
+	note A#, 2
 	octave 4
-	note D#, 1
+	note D#, 2
 	loopchannel 2, Music_RivalBattle_branch_e9837
 	intensity $94
 	octave 3
-	note D#, 7
+	note D#, 8
 	octave 2
-	note A#, 7
+	note A#, 8
 	octave 3
-	note G_, 7
-	note F_, 7
+	note G_, 8
+	note F_, 8
 	intensity $96
 	octave 2
-	note G#, 7
-	note A#, 7
-	note B_, 7
+	note G#, 8
+	note A#, 8
+	note B_, 8
 	octave 3
-	note C#, 7
+	note C#, 8
 	intensity $b7
 	octave 4
-	note D#, 7
+	note D#, 8
 	octave 3
-	note A#, 7
+	note A#, 8
 	octave 4
-	note G_, 7
-	note F_, 7
+	note G_, 8
+	note F_, 8
 	octave 3
-	note G#, 7
-	note A#, 7
-	note B_, 7
+	note G#, 8
+	note A#, 8
+	note B_, 8
 	octave 4
-	note C#, 7
+	note C#, 8
 	intensity $a0
-	note D#, 7
+	note D#, 8
 	intensity $a7
-	note D#, 7
+	note D#, 8
 	intensity $a0
 	octave 3
-	note G_, 7
+	note G_, 8
 	intensity $a7
-	note G_, 7
+	note G_, 8
 	intensity $b7
-	note D#, 7
-	note C#, 7
-	note D#, 3
-	note C#, 3
+	note D#, 8
+	note C#, 8
+	note D#, 4
+	note C#, 4
 	octave 2
-	note B_, 3
+	note B_, 4
 	octave 3
-	note C#, 3
+	note C#, 4
 	intensity $c7
 	octave 2
-	note A#, 5
+	note A#, 6
 	octave 3
-	note C#, 5
-	note D#, 3
-	note E_, 5
-	note D#, 5
-	note C#, 3
-	note G#, 5
-	note E_, 5
-	note D#, 3
-	note C#, 5
-	note D#, 5
-	note D_, 3
+	note C#, 6
+	note D#, 4
+	note E_, 6
+	note D#, 6
+	note C#, 4
+	note G#, 6
+	note E_, 6
+	note D#, 4
+	note C#, 6
+	note D#, 6
+	note D_, 4
 	octave 2
-	note G#, 5
-	note B_, 5
+	note G#, 6
+	note B_, 6
 	octave 3
-	note C#, 3
-	note D_, 5
-	note C#, 5
+	note C#, 4
+	note D_, 6
+	note C#, 6
 	octave 2
-	note B_, 3
+	note B_, 4
 	octave 3
-	note F#, 5
-	note D_, 5
-	note C#, 3
+	note F#, 6
+	note D_, 6
+	note C#, 4
 	octave 2
-	note B_, 5
+	note B_, 6
 	octave 3
-	note C#, 9
+	note C#, 10
 	loopchannel 0, Music_RivalBattle_branch_e97a6
 
 Music_RivalBattle_Ch2: ; e98af
@@ -297,586 +297,586 @@
 	tone $0001
 	notetype $c, $c2
 	octave 4
-	note E_, 0
-	note D#, 0
-	note D_, 0
-	note C#, 0
-	note D_, 0
-	note C#, 0
-	note C_, 0
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	octave 3
-	note B_, 0
-	note A#, 0
-	note A_, 0
-	note A#, 0
-	note A_, 0
-	note G#, 0
-	note G_, 0
-	note G#, 0
-	note G_, 0
-	note F#, 0
-	note F_, 0
-	note F#, 0
-	note F_, 0
-	note E_, 0
-	note D#, 0
-	note E_, 0
-	note D#, 0
-	note D_, 0
-	note C#, 0
-	note D_, 0
-	note C#, 0
-	note C_, 0
+	note B_, 1
+	note A#, 1
+	note A_, 1
+	note A#, 1
+	note A_, 1
+	note G#, 1
+	note G_, 1
+	note G#, 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
 	octave 2
-	note B_, 0
+	note B_, 1
 	intensity $c2
 	octave 4
-	note D#, 5
+	note D#, 6
 	intensity $c7
 	octave 3
-	note F#, 5
+	note F#, 6
 	intensity $c2
-	note G#, 3
+	note G#, 4
 
 Music_RivalBattle_branch_e98ea: ; e98ea
 	intensity $c2
-	note D#, 5
+	note D#, 6
 	intensity $c7
-	note F#, 5
+	note F#, 6
 	intensity $c2
-	note G#, 3
+	note G#, 4
 	loopchannel 2, Music_RivalBattle_branch_e98ea
 	intensity $c2
-	note D#, 1
-	note F#, 3
+	note D#, 2
+	note F#, 4
 	intensity $c7
-	note F#, 7
+	note F#, 8
 	intensity $a2
-	note B_, 0
+	note B_, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 
 Music_RivalBattle_branch_e9903: ; e9903
 	intensity $c2
-	note C#, 5
+	note C#, 6
 	intensity $c7
-	note E_, 5
+	note E_, 6
 	intensity $c2
-	note F#, 3
+	note F#, 4
 	loopchannel 3, Music_RivalBattle_branch_e9903
 	intensity $c2
-	note C#, 1
-	note E_, 3
+	note C#, 2
+	note E_, 4
 	intensity $b0
-	note E_, 3
+	note E_, 4
 	intensity $b7
-	note E_, 5
+	note E_, 6
 
 Music_RivalBattle_branch_e991a: ; e991a
 	callchannel Music_RivalBattle_branch_e99e0
 	intensity $b0
-	note G#, 7
+	note G#, 8
 	intensity $b7
-	note G#, 7
+	note G#, 8
 	callchannel Music_RivalBattle_branch_e99e0
 	intensity $4e
-	note G#, 7
+	note G#, 8
 	intensity $b7
-	note G#, 7
+	note G#, 8
 	intensity $b0
 	octave 3
-	note B_, 9
+	note B_, 10
 	intensity $b7
-	note B_, 5
+	note B_, 6
 	intensity $b0
 	octave 4
-	note C#, 7
+	note C#, 8
 	octave 3
-	note B_, 7
+	note B_, 8
 	intensity $b0
-	note A#, 9
+	note A#, 10
 	intensity $b7
-	note A#, 5
+	note A#, 6
 	intensity $2f
-	note D#, 9
+	note D#, 10
 	intensity $b7
-	note D#, 5
+	note D#, 6
 	intensity $b0
-	note B_, 9
+	note B_, 10
 	intensity $b7
-	note B_, 5
+	note B_, 6
 	intensity $c7
 	octave 4
-	note C#, 7
+	note C#, 8
 	octave 3
-	note B_, 7
+	note B_, 8
 	intensity $b0
 	octave 4
-	note D#, 15
+	note D#, 16
 	intensity $b7
-	note D#, 15
+	note D#, 16
 	intensity $b0
-	note E_, 3
+	note E_, 4
 	intensity $b7
-	note E_, 5
+	note E_, 6
 	intensity $c7
-	note E_, 1
-	note G#, 1
-	note B_, 1
+	note E_, 2
+	note G#, 2
+	note B_, 2
 	octave 5
-	note C#, 7
+	note C#, 8
 	octave 4
-	note B_, 7
+	note B_, 8
 	intensity $b0
-	note A#, 9
+	note A#, 10
 	intensity $b7
-	note A#, 5
+	note A#, 6
 	intensity $b0
-	note A_, 9
+	note A_, 10
 	intensity $b7
-	note A_, 5
+	note A_, 6
 	intensity $b0
-	note G#, 9
+	note G#, 10
 	intensity $b7
-	note G#, 5
+	note G#, 6
 	intensity $b0
-	note G_, 9
+	note G_, 10
 	intensity $b7
-	note G_, 5
+	note G_, 6
 	intensity $a4
 	octave 3
-	note G_, 7
-	note D#, 7
-	note A#, 7
-	note G#, 7
+	note G_, 8
+	note D#, 8
+	note A#, 8
+	note G#, 8
 	intensity $a6
 	octave 2
-	note B_, 7
+	note B_, 8
 	octave 3
-	note C#, 7
-	note D#, 7
-	note F_, 7
+	note C#, 8
+	note D#, 8
+	note F_, 8
 	intensity $c7
 	octave 4
-	note G_, 7
-	note D#, 7
-	note A#, 7
-	note G#, 7
+	note G_, 8
+	note D#, 8
+	note A#, 8
+	note G#, 8
 	octave 3
-	note B_, 7
+	note B_, 8
 	octave 4
-	note C#, 7
-	note D#, 7
-	note F_, 7
+	note C#, 8
+	note D#, 8
+	note F_, 8
 	intensity $b0
-	note G_, 15
-	note D#, 15
+	note G_, 16
+	note D#, 16
 	octave 3
-	note B_, 7
-	note A#, 7
-	note G#, 7
+	note B_, 8
+	note A#, 8
+	note G#, 8
 	intensity $c7
-	note F_, 7
+	note F_, 8
 
 Music_RivalBattle_branch_e99a6: ; e99a6
 	intensity $c2
 	octave 3
-	note A#, 5
+	note A#, 6
 	intensity $c7
 	octave 4
-	note C#, 5
+	note C#, 6
 	intensity $c2
-	note D#, 3
+	note D#, 4
 	loopchannel 3, Music_RivalBattle_branch_e99a6
 	intensity $c2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C#, 3
+	note C#, 4
 	intensity $b7
-	note C#, 5
+	note C#, 6
 	intensity $9a
-	note C#, 3
+	note C#, 4
 
 Music_RivalBattle_branch_e99c1: ; e99c1
 	intensity $c2
 	octave 3
-	note G#, 5
+	note G#, 6
 	intensity $c7
-	note B_, 5
+	note B_, 6
 	intensity $c2
 	octave 4
-	note C#, 3
+	note C#, 4
 	loopchannel 3, Music_RivalBattle_branch_e99c1
 	intensity $c2
 	octave 3
-	note G#, 1
-	note B_, 3
+	note G#, 2
+	note B_, 4
 	intensity $c7
-	note B_, 5
+	note B_, 6
 	intensity $6a
 	octave 4
-	note D_, 3
+	note D_, 4
 	loopchannel 0, Music_RivalBattle_branch_e991a
 ; e99e0
 
 Music_RivalBattle_branch_e99e0: ; e99e0
 	intensity $c7
-	note D#, 9
+	note D#, 10
 	intensity $c4
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note D#, 1
-	note F#, 1
+	note D#, 2
+	note F#, 2
 	intensity $c5
-	note F_, 3
-	note D#, 3
+	note F_, 4
+	note D#, 4
 	intensity $c2
-	note C#, 1
+	note C#, 2
 	intensity $c7
-	note D#, 5
+	note D#, 6
 	intensity $b0
-	note F_, 7
+	note F_, 8
 	intensity $b7
-	note F_, 7
+	note F_, 8
 	endchannel
 
 Music_RivalBattle_Ch3: ; e99fb
 	notetype $c, $19
 	octave 3
-	note F#, 1
-	note A#, 1
-	note __, 1
-	note A#, 9
+	note F#, 2
+	note A#, 2
+	note __, 2
+	note A#, 10
 	octave 3
-	note F#, 1
+	note F#, 2
 	octave 4
-	note C#, 1
-	note __, 1
-	note C#, 5
+	note C#, 2
+	note __, 2
+	note C#, 6
 	octave 3
-	note C#, 1
-	note D_, 1
+	note C#, 2
+	note D_, 2
 
 Music_RivalBattle_branch_e9a0c: ; e9a0c
-	note D#, 1
-	note C#, 1
-	note D#, 1
-	note F#, 3
-	note E_, 1
-	note D#, 1
-	note C#, 1
+	note D#, 2
+	note C#, 2
+	note D#, 2
+	note F#, 4
+	note E_, 2
+	note D#, 2
+	note C#, 2
 	loopchannel 4, Music_RivalBattle_branch_e9a0c
 
 Music_RivalBattle_branch_e9a17: ; e9a17
 	octave 3
-	note C#, 1
+	note C#, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note C#, 1
-	note E_, 3
-	note D_, 1
-	note C#, 1
+	note C#, 2
+	note E_, 4
+	note D_, 2
+	note C#, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	loopchannel 3, Music_RivalBattle_branch_e9a17
 	octave 3
-	note C#, 1
-	note E_, 1
-	note C#, 1
+	note C#, 2
+	note E_, 2
+	note C#, 2
 	octave 2
-	note B_, 3
+	note B_, 4
 	octave 3
-	note C_, 1
-	note C#, 1
-	note D_, 1
+	note C_, 2
+	note C#, 2
+	note D_, 2
 
 Music_RivalBattle_branch_e9a30: ; e9a30
 	callchannel Music_RivalBattle_branch_e9b47
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note G#, 1
+	note G#, 2
 	callchannel Music_RivalBattle_branch_e9b50
-	note C#, 1
-	note G#, 1
+	note C#, 2
+	note G#, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note G#, 3
-	note C#, 1
-	note C_, 1
+	note G#, 4
+	note C#, 2
+	note C_, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	callchannel Music_RivalBattle_branch_e9b47
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note G#, 1
+	note G#, 2
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note F#, 1
+	note F#, 2
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note F_, 1
+	note F_, 2
 	callchannel Music_RivalBattle_branch_e9b50
 
 Music_RivalBattle_branch_e9a66: ; e9a66
-	note C#, 1
-	note G#, 1
+	note C#, 2
+	note G#, 2
 	loopchannel 4, Music_RivalBattle_branch_e9a66
 	callchannel Music_RivalBattle_branch_e9b5c
-	note G#, 1
-	note F#, 1
+	note G#, 2
+	note F#, 2
 
 Music_RivalBattle_branch_e9a71: ; e9a71
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note F_, 1
+	note F_, 2
 	loopchannel 4, Music_RivalBattle_branch_e9a71
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note F#, 1
+	note F#, 2
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note F#, 1
+	note F#, 2
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note F#, 1
-	note F_, 1
-	note D#, 1
+	note F#, 2
+	note F_, 2
+	note D#, 2
 	callchannel Music_RivalBattle_branch_e9b5c
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	callchannel Music_RivalBattle_branch_e9b65
 	octave 3
-	note D#, 1
+	note D#, 2
 	octave 4
-	note D#, 1
+	note D#, 2
 	callchannel Music_RivalBattle_branch_e9b65
 	octave 3
-	note D#, 1
-	note A#, 1
-	note E_, 1
-	note B_, 1
+	note D#, 2
+	note A#, 2
+	note E_, 2
+	note B_, 2
 	octave 4
-	note E_, 1
+	note E_, 2
 	octave 3
-	note E_, 1
-	note B_, 1
+	note E_, 2
+	note B_, 2
 	octave 4
-	note E_, 1
+	note E_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 4
-	note E_, 1
+	note E_, 2
 	octave 3
-	note E_, 1
-	note B_, 1
+	note E_, 2
+	note B_, 2
 	octave 4
-	note E_, 1
+	note E_, 2
 	octave 3
-	note E_, 1
-	note E_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
+	note E_, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note G#, 2
 
 Music_RivalBattle_branch_e9ab3: ; e9ab3
-	note D#, 1
-	note A#, 1
+	note D#, 2
+	note A#, 2
 	loopchannel 4, Music_RivalBattle_branch_e9ab3
 
 Music_RivalBattle_branch_e9ab9: ; e9ab9
-	note D#, 1
-	note A_, 1
+	note D#, 2
+	note A_, 2
 	loopchannel 4, Music_RivalBattle_branch_e9ab9
 
 Music_RivalBattle_branch_e9abf: ; e9abf
-	note D#, 1
-	note G#, 1
+	note D#, 2
+	note G#, 2
 	loopchannel 4, Music_RivalBattle_branch_e9abf
 
 Music_RivalBattle_branch_e9ac5: ; e9ac5
-	note D#, 1
-	note G_, 1
+	note D#, 2
+	note G_, 2
 	loopchannel 12, Music_RivalBattle_branch_e9ac5
 
 Music_RivalBattle_branch_e9acb: ; e9acb
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note D#, 1
+	note D#, 2
 	loopchannel 4, Music_RivalBattle_branch_e9acb
 
 Music_RivalBattle_branch_e9ad3: ; e9ad3
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note F#, 1
+	note F#, 2
 	loopchannel 4, Music_RivalBattle_branch_e9ad3
-	note D#, 1
-	note G_, 1
-	note A#, 1
-	note D#, 1
-	note G_, 1
-	note A#, 1
-	note D#, 1
-	note A#, 1
-	note D#, 1
-	note G_, 1
-	note A#, 1
-	note D#, 1
-	note G_, 1
-	note A#, 1
-	note D#, 1
-	note A#, 1
+	note D#, 2
+	note G_, 2
+	note A#, 2
+	note D#, 2
+	note G_, 2
+	note A#, 2
+	note D#, 2
+	note A#, 2
+	note D#, 2
+	note G_, 2
+	note A#, 2
+	note D#, 2
+	note G_, 2
+	note A#, 2
+	note D#, 2
+	note A#, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note G_, 1
-	note B_, 1
+	note G_, 2
+	note B_, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note G_, 1
-	note B_, 1
+	note G_, 2
+	note B_, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note G#, 1
-	note B_, 1
+	note G#, 2
+	note B_, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 4
-	note D#, 1
-	note C#, 1
+	note D#, 2
+	note C#, 2
 	octave 3
-	note B_, 1
-	note G#, 1
-	note G_, 7
-	note D#, 7
-	note A#, 7
-	note G_, 7
+	note B_, 2
+	note G#, 2
+	note G_, 8
+	note D#, 8
+	note A#, 8
+	note G_, 8
 	octave 2
-	note B_, 7
+	note B_, 8
 	octave 3
-	note C#, 7
-	note D#, 7
-	note F_, 7
+	note C#, 8
+	note D#, 8
+	note F_, 8
 
 Music_RivalBattle_branch_e9b10: ; e9b10
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note D#, 1
+	note D#, 2
 	loopchannel 7, Music_RivalBattle_branch_e9b10
-	note E_, 1
-	note D#, 1
+	note E_, 2
+	note D#, 2
 
 Music_RivalBattle_branch_e9b1a: ; e9b1a
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note D#, 1
+	note D#, 2
 	loopchannel 6, Music_RivalBattle_branch_e9b1a
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note F#, 1
-	note F_, 1
-	note E_, 1
+	note F#, 2
+	note F_, 2
+	note E_, 2
 
 Music_RivalBattle_branch_e9b28: ; e9b28
 	octave 2
-	note G#, 1
+	note G#, 2
 	octave 3
-	note C#, 1
+	note C#, 2
 	loopchannel 7, Music_RivalBattle_branch_e9b28
-	note D_, 1
-	note C#, 1
+	note D_, 2
+	note C#, 2
 
 Music_RivalBattle_branch_e9b32: ; e9b32
 	octave 2
-	note G#, 1
+	note G#, 2
 	octave 3
-	note C#, 1
+	note C#, 2
 	loopchannel 4, Music_RivalBattle_branch_e9b32
 	octave 2
-	note B_, 1
-	note G#, 1
-	note B_, 1
+	note B_, 2
+	note G#, 2
+	note B_, 2
 	octave 3
-	note F_, 3
-	note E_, 1
-	note D#, 1
-	note D_, 1
+	note F_, 4
+	note E_, 2
+	note D#, 2
+	note D_, 2
 	loopchannel 0, Music_RivalBattle_branch_e9a30
 ; e9b47
 
 Music_RivalBattle_branch_e9b47: ; e9b47
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note D#, 1
+	note D#, 2
 	loopchannel 4, Music_RivalBattle_branch_e9b47
 	endchannel
 ; e9b50
 
 Music_RivalBattle_branch_e9b50: ; e9b50
-	note C#, 1
-	note G#, 1
+	note C#, 2
+	note G#, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note G#, 3
+	note G#, 4
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note C#, 1
-	note G#, 1
+	note C#, 2
+	note G#, 2
 	endchannel
 ; e9b5c
 
 Music_RivalBattle_branch_e9b5c: ; e9b5c
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note F#, 1
+	note F#, 2
 	loopchannel 7, Music_RivalBattle_branch_e9b5c
 	endchannel
 ; e9b65
@@ -883,10 +883,10 @@
 
 Music_RivalBattle_branch_e9b65: ; e9b65
 	octave 3
-	note D#, 1
-	note A#, 1
+	note D#, 2
+	note A#, 2
 	octave 4
-	note D#, 1
+	note D#, 2
 	loopchannel 2, Music_RivalBattle_branch_e9b65
 	endchannel
 ; e9b6f
--- a/audio/music/rocketbattle.asm
+++ b/audio/music/rocketbattle.asm
@@ -13,386 +13,386 @@
 	vibrato $10, $15
 	notetype $c, $b2
 	octave 4
-	note E_, 0
-	note D#, 0
-	note D_, 0
-	note C#, 0
-	note D_, 0
-	note C#, 0
-	note C_, 0
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	octave 3
-	note B_, 0
-	note A#, 0
-	note A_, 0
-	note A#, 0
-	note A_, 0
-	note G#, 0
-	note G_, 0
-	note G#, 0
-	note G_, 0
-	note F#, 0
-	note F_, 0
-	note F#, 0
-	note F_, 0
-	note E_, 0
-	note D#, 0
-	note E_, 0
-	note D#, 0
-	note D_, 0
-	note C#, 0
-	note D_, 0
-	note C#, 0
-	note C_, 0
+	note B_, 1
+	note A#, 1
+	note A_, 1
+	note A#, 1
+	note A_, 1
+	note G#, 1
+	note G_, 1
+	note G#, 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
 	octave 2
-	note B_, 0
+	note B_, 1
 
 Music_RocketBattle_branch_e9bad: ; e9bad
 	intensity $b2
 	octave 3
-	note C_, 5
-	note C_, 3
-	note E_, 1
+	note C_, 6
+	note C_, 4
+	note E_, 2
 	intensity $b7
-	note D_, 3
+	note D_, 4
 	loopchannel 3, Music_RocketBattle_branch_e9bad
 	intensity $b2
-	note C_, 5
-	note C_, 5
+	note C_, 6
+	note C_, 6
 	intensity $b7
-	note D_, 3
+	note D_, 4
 
 Music_RocketBattle_branch_e9bc1: ; e9bc1
 	intensity $b2
 	octave 4
-	note E_, 5
-	note E_, 3
-	note G_, 1
+	note E_, 6
+	note E_, 4
+	note G_, 2
 	intensity $b7
-	note F_, 3
+	note F_, 4
 	loopchannel 3, Music_RocketBattle_branch_e9bc1
 	intensity $b2
-	note E_, 5
-	note E_, 3
+	note E_, 6
+	note E_, 4
 	intensity $b7
-	note D_, 1
-	note D#, 3
+	note D_, 2
+	note D#, 4
 	intensity $b3
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note E_, 1
-	note E_, 1
-	note A#, 1
-	note F_, 1
-	note F_, 1
-	note A_, 1
-	note D_, 1
-	note D_, 1
+	note E_, 2
+	note E_, 2
+	note A#, 2
+	note F_, 2
+	note F_, 2
+	note A_, 2
+	note D_, 2
+	note D_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note E_, 1
-	note E_, 1
-	note A_, 1
-	note E_, 1
-	note D_, 1
-	note E_, 1
-	note F_, 1
-	note E_, 1
-	note F_, 1
+	note E_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	note E_, 2
+	note F_, 2
 	intensity $b5
-	note G_, 3
+	note G_, 4
 	intensity $b3
-	note G_, 1
-	note F_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
+	note G_, 2
+	note F_, 2
+	note D#, 2
+	note D_, 2
+	note C#, 2
+	note D_, 2
 	intensity $b5
-	note D#, 3
+	note D#, 4
 	intensity $b3
-	note D#, 1
-	note D_, 1
-	note F_, 1
+	note D#, 2
+	note D_, 2
+	note F_, 2
 
 Music_RocketBattle_branch_e9c02: ; e9c02
 	octave 4
-	note E_, 1
+	note E_, 2
 	octave 3
-	note E_, 1
-	note E_, 1
+	note E_, 2
+	note E_, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note F_, 1
-	note F_, 1
+	note F_, 2
+	note F_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note D_, 1
-	note D_, 1
+	note D_, 2
+	note D_, 2
 	octave 4
-	note E_, 1
+	note E_, 2
 	octave 3
-	note E_, 1
-	note E_, 1
+	note E_, 2
+	note E_, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note E_, 1
-	note D_, 1
-	note E_, 1
-	note F_, 1
-	note E_, 1
-	note F_, 1
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	note E_, 2
+	note F_, 2
 	intensity $b5
-	note G_, 3
+	note G_, 4
 	intensity $b3
-	note G_, 1
-	note F_, 1
+	note G_, 2
+	note F_, 2
 	octave 4
-	note C_, 1
-	note D_, 1
-	note C_, 1
-	note D_, 1
+	note C_, 2
+	note D_, 2
+	note C_, 2
+	note D_, 2
 	intensity $b5
-	note F_, 3
+	note F_, 4
 	intensity $b2
 	octave 3
-	note F_, 1
-	note G_, 1
-	note G#, 3
+	note F_, 2
+	note G_, 2
+	note G#, 4
 	intensity $b5
-	note D_, 3
-	note C_, 3
-	note D_, 3
-	note E_, 1
+	note D_, 4
+	note C_, 4
+	note D_, 4
+	note E_, 2
 	intensity $b2
-	note F_, 1
-	note A_, 3
+	note F_, 2
+	note A_, 4
 	intensity $b7
-	note A_, 3
+	note A_, 4
 	intensity $b5
-	note A_, 1
-	note G_, 1
-	note F_, 3
-	note D_, 3
-	note C_, 3
-	note D_, 3
-	note E_, 1
-	note F_, 1
-	note E_, 1
-	note D_, 1
-	note C_, 1
-	note A#, 1
-	note G_, 1
-	note A_, 1
-	note A#, 1
+	note A_, 2
+	note G_, 2
+	note F_, 4
+	note D_, 4
+	note C_, 4
+	note D_, 4
+	note E_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note A#, 2
+	note G_, 2
+	note A_, 2
+	note A#, 2
 	intensity $b7
 	octave 4
-	note E_, 5
-	note D_, 3
+	note E_, 6
+	note D_, 4
 	octave 3
-	note G_, 1
-	note A#, 3
-	note A_, 5
-	note G_, 3
-	note E_, 1
-	note F_, 3
-	note E_, 5
-	note D_, 5
-	note D#, 3
+	note G_, 2
+	note A#, 4
+	note A_, 6
+	note G_, 4
+	note E_, 2
+	note F_, 4
+	note E_, 6
+	note D_, 6
+	note D#, 4
 	intensity $a0
-	note E_, 7
+	note E_, 8
 	intensity $a7
-	note E_, 7
+	note E_, 8
 	intensity $b7
 	octave 2
-	note A_, 7
-	note G_, 7
-	note A_, 7
-	note A#, 7
-	note A_, 7
-	note G_, 7
-	note A_, 7
+	note A_, 8
+	note G_, 8
+	note A_, 8
+	note A#, 8
+	note A_, 8
+	note G_, 8
+	note A_, 8
 	octave 3
-	note C#, 7
-	note D_, 7
-	note C#, 7
+	note C#, 8
+	note D_, 8
+	note C#, 8
 	octave 2
-	note A#, 7
-	note A_, 7
+	note A#, 8
+	note A_, 8
 	octave 3
-	note D_, 7
-	note C#, 7
-	note D_, 7
-	note E_, 7
+	note D_, 8
+	note C#, 8
+	note D_, 8
+	note E_, 8
 	octave 2
-	note A#, 5
+	note A#, 6
 	octave 3
-	note D_, 5
-	note C_, 3
+	note D_, 6
+	note C_, 4
 	intensity $b5
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note C_, 1
-	note D_, 1
-	note E_, 1
-	note F_, 1
-	note G_, 1
-	note A_, 1
-	note A#, 1
-	note A_, 1
-	note E_, 1
-	note A_, 1
-	note A#, 1
-	note A_, 1
-	note E_, 1
-	note D_, 1
-	note E_, 1
-	note A_, 1
-	note E_, 1
-	note A_, 1
+	note C_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	note G_, 2
+	note A_, 2
+	note A#, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note A#, 2
+	note A_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
 	octave 4
-	note C#, 1
-	note D_, 1
-	note C#, 1
+	note C#, 2
+	note D_, 2
+	note C#, 2
 	octave 3
-	note A#, 1
-	note G_, 1
+	note A#, 2
+	note G_, 2
 	intensity $b2
-	note E_, 5
-	note E_, 5
-	note E_, 3
-	note E_, 5
-	note E_, 3
+	note E_, 6
+	note E_, 6
+	note E_, 4
+	note E_, 6
+	note E_, 4
 	intensity $b7
-	note G_, 1
-	note F_, 3
+	note G_, 2
+	note F_, 4
 	intensity $b2
-	note E_, 5
-	note E_, 3
+	note E_, 6
+	note E_, 4
 	intensity $b7
-	note G_, 1
-	note F_, 3
+	note G_, 2
+	note F_, 4
 	intensity $b2
-	note E_, 5
+	note E_, 6
 	octave 4
-	note D_, 0
-	note D#, 0
+	note D_, 1
+	note D#, 1
 	intensity $a0
-	note E_, 7
+	note E_, 8
 	intensity $b2
 	octave 3
-	note F_, 5
-	note F_, 3
+	note F_, 6
+	note F_, 4
 	intensity $b7
-	note A#, 1
-	note G_, 3
+	note A#, 2
+	note G_, 4
 
 Music_RocketBattle_branch_e9cc5: ; e9cc5
 	intensity $b2
-	note F_, 5
-	note F_, 3
+	note F_, 6
+	note F_, 4
 	intensity $b7
-	note A_, 1
-	note G_, 3
+	note A_, 2
+	note G_, 4
 	loopchannel 2, Music_RocketBattle_branch_e9cc5
 	intensity $b2
-	note F_, 5
+	note F_, 6
 	octave 4
-	note D_, 0
-	note E_, 0
+	note D_, 1
+	note E_, 1
 	intensity $a0
-	note F_, 7
+	note F_, 8
 	intensity $b3
-	note D_, 1
+	note D_, 2
 	octave 3
-	note A_, 1
-	note E_, 1
-	note A_, 3
-	note A_, 1
+	note A_, 2
+	note E_, 2
+	note A_, 4
+	note A_, 2
 	intensity $b7
 	octave 4
-	note D_, 3
+	note D_, 4
 	intensity $b3
-	note D#, 1
+	note D#, 2
 	octave 3
-	note A#, 1
-	note G_, 1
-	note A#, 3
-	note A#, 1
+	note A#, 2
+	note G_, 2
+	note A#, 4
+	note A#, 2
 	intensity $b7
 	octave 4
-	note D_, 3
+	note D_, 4
 	intensity $b3
-	note E_, 1
-	note C_, 1
+	note E_, 2
+	note C_, 2
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note C_, 3
-	note C_, 1
+	note C_, 4
+	note C_, 2
 	intensity $b7
-	note D#, 3
+	note D#, 4
 	intensity $a0
-	note E_, 3
+	note E_, 4
 	intensity $a7
-	note E_, 5
+	note E_, 6
 	intensity $a0
 	octave 3
-	note G#, 5
+	note G#, 6
 	intensity $b3
-	note C_, 1
-	note E_, 1
-	note E_, 1
+	note C_, 2
+	note E_, 2
+	note E_, 2
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note F_, 1
-	note F_, 1
+	note F_, 2
+	note F_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note D_, 1
-	note D_, 1
-	note C_, 1
-	note E_, 1
-	note E_, 1
+	note D_, 2
+	note D_, 2
+	note C_, 2
+	note E_, 2
+	note E_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
-	note D_, 1
-	note C_, 1
-	note C_, 1
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note C_, 2
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	intensity $b5
-	note D_, 3
+	note D_, 4
 	intensity $b3
-	note D_, 1
-	note C_, 1
+	note D_, 2
+	note C_, 2
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note D_, 1
-	note C#, 1
-	note D_, 1
+	note D_, 2
+	note C#, 2
+	note D_, 2
 	intensity $b5
-	note D#, 3
+	note D#, 4
 	intensity $b3
-	note D#, 1
-	note D_, 1
-	note F_, 1
+	note D#, 2
+	note D_, 2
+	note F_, 2
 	loopchannel 0, Music_RocketBattle_branch_e9c02
 
 Music_RocketBattle_Ch2: ; e9d3e
@@ -401,269 +401,269 @@
 	tone $0001
 	notetype $c, $b2
 	octave 4
-	note A_, 3
-	note A#, 3
-	note B_, 3
+	note A_, 4
+	note A#, 4
+	note B_, 4
 	octave 5
-	note C_, 0
+	note C_, 1
 	intensity $82
 	octave 4
-	note G#, 0
-	note A_, 0
-	note G#, 0
+	note G#, 1
+	note A_, 1
+	note G#, 1
 	intensity $c2
 	octave 5
-	note C#, 0
+	note C#, 1
 	intensity $92
 	octave 4
-	note G#, 0
-	note A_, 0
-	note G#, 0
+	note G#, 1
+	note A_, 1
+	note G#, 1
 	intensity $c2
 	octave 5
-	note D_, 0
+	note D_, 1
 	intensity $a2
 	octave 4
-	note G#, 0
-	note A_, 0
-	note G#, 0
+	note G#, 1
+	note A_, 1
+	note G#, 1
 	intensity $c2
 	octave 5
-	note D#, 0
+	note D#, 1
 	intensity $b2
 	octave 4
-	note G#, 0
-	note A_, 0
-	note G#, 0
+	note G#, 1
+	note A_, 1
+	note G#, 1
 	intensity $c2
 	octave 5
-	note E_, 0
+	note E_, 1
 	octave 4
-	note G#, 0
-	note A_, 0
-	note G#, 0
+	note G#, 1
+	note A_, 1
+	note G#, 1
 
 Music_RocketBattle_branch_e9d7b: ; e9d7b
 	intensity $c2
 	octave 3
-	note A_, 5
-	note A_, 3
+	note A_, 6
+	note A_, 4
 	octave 4
-	note C_, 1
+	note C_, 2
 	intensity $c7
 	octave 3
-	note A#, 3
+	note A#, 4
 	loopchannel 3, Music_RocketBattle_branch_e9d7b
 	intensity $c2
-	note A_, 5
-	note A_, 5
+	note A_, 6
+	note A_, 6
 	intensity $4a
-	note G#, 3
+	note G#, 4
 
 Music_RocketBattle_branch_e9d91: ; e9d91
 	intensity $c2
 	octave 4
-	note A_, 5
-	note A_, 3
+	note A_, 6
+	note A_, 4
 	octave 5
-	note C_, 1
+	note C_, 2
 	intensity $c7
 	octave 4
-	note A#, 3
+	note A#, 4
 	loopchannel 3, Music_RocketBattle_branch_e9d91
 	intensity $c2
-	note A_, 5
-	note A_, 3
+	note A_, 6
+	note A_, 4
 	intensity $c7
-	note G_, 1
-	note G#, 3
+	note G_, 2
+	note G#, 4
 	callchannel Music_RocketBattle_branch_e9ea0
 	intensity $b0
-	note F_, 15
+	note F_, 16
 	intensity $b7
-	note F_, 15
+	note F_, 16
 
 Music_RocketBattle_branch_e9db1: ; e9db1
 	callchannel Music_RocketBattle_branch_e9ea0
 	intensity $b0
-	note F_, 7
+	note F_, 8
 	intensity $b7
-	note F_, 7
+	note F_, 8
 	intensity $b0
-	note A#, 7
+	note A#, 8
 	intensity $b7
-	note A#, 7
+	note A#, 8
 	intensity $c4
 	octave 3
-	note A_, 1
-	note G_, 1
-	note A_, 1
+	note A_, 2
+	note G_, 2
+	note A_, 2
 	intensity $c7
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note A#, 1
-	note A_, 1
-	note G_, 1
+	note A#, 2
+	note A_, 2
+	note G_, 2
 	intensity $c2
-	note A_, 1
+	note A_, 2
 	octave 4
-	note C_, 3
+	note C_, 4
 	intensity $b0
-	note C_, 5
+	note C_, 6
 	intensity $b7
-	note C_, 3
+	note C_, 4
 	intensity $c4
 	octave 3
-	note A#, 1
-	note A_, 1
-	note A#, 1
+	note A#, 2
+	note A_, 2
+	note A#, 2
 	intensity $c7
 	octave 4
-	note D_, 3
-	note C_, 1
+	note D_, 4
+	note C_, 2
 	octave 3
-	note A#, 1
-	note A_, 1
+	note A#, 2
+	note A_, 2
 	intensity $c2
-	note A#, 1
+	note A#, 2
 	octave 4
-	note D_, 3
+	note D_, 4
 	intensity $b0
-	note D_, 3
+	note D_, 4
 	intensity $b7
-	note D_, 5
+	note D_, 6
 	intensity $4f
-	note A_, 5
+	note A_, 6
 	intensity $a0
-	note G_, 5
-	note F_, 3
-	note E_, 5
-	note F_, 5
-	note G_, 3
-	note A_, 5
-	note A#, 5
-	note G#, 3
-	note A_, 5
+	note G_, 6
+	note F_, 4
+	note E_, 6
+	note F_, 6
+	note G_, 4
+	note A_, 6
+	note A#, 6
+	note G#, 4
+	note A_, 6
 	intensity $a7
-	note A_, 9
+	note A_, 10
 	intensity $3f
 	octave 3
-	note D_, 7
+	note D_, 8
 	intensity $b7
-	note D_, 7
+	note D_, 8
 	intensity $3f
-	note C#, 7
+	note C#, 8
 	intensity $b7
-	note C#, 7
+	note C#, 8
 	intensity $3f
-	note D_, 7
+	note D_, 8
 	intensity $b7
-	note D_, 7
+	note D_, 8
 	intensity $3f
-	note E_, 7
+	note E_, 8
 	intensity $b7
-	note E_, 7
+	note E_, 8
 	intensity $4e
-	note F_, 7
+	note F_, 8
 	intensity $a0
-	note F_, 7
-	note E_, 15
-	note F_, 15
-	note A_, 15
+	note F_, 8
+	note E_, 16
+	note F_, 16
+	note A_, 16
 	intensity $3f
-	note F_, 15
+	note F_, 16
 	intensity $c7
 	octave 4
-	note D_, 7
-	note C#, 7
+	note D_, 8
+	note C#, 8
 	intensity $b0
-	note E_, 7
+	note E_, 8
 	intensity $b7
-	note E_, 7
+	note E_, 8
 	intensity $3c
-	note A_, 5
+	note A_, 6
 	intensity $c7
-	note A_, 9
+	note A_, 10
 	intensity $c2
 	octave 3
-	note A_, 5
-	note A_, 5
-	note A_, 3
-	note A_, 5
-	note A_, 3
+	note A_, 6
+	note A_, 6
+	note A_, 4
+	note A_, 6
+	note A_, 4
 	intensity $c7
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note A#, 3
+	note A#, 4
 	intensity $c2
-	note A_, 5
-	note A_, 3
+	note A_, 6
+	note A_, 4
 	intensity $c7
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note A#, 3
+	note A#, 4
 	intensity $c2
-	note A_, 5
+	note A_, 6
 	intensity $c7
 	octave 4
-	note G_, 0
-	note G#, 0
-	note A_, 7
+	note G_, 1
+	note G#, 1
+	note A_, 8
 
 Music_RocketBattle_branch_e9e5a: ; e9e5a
 	intensity $c2
 	octave 3
-	note A#, 5
-	note A#, 3
+	note A#, 6
+	note A#, 4
 	intensity $c7
 	octave 4
-	note D_, 1
-	note C_, 3
+	note D_, 2
+	note C_, 4
 	loopchannel 3, Music_RocketBattle_branch_e9e5a
 	intensity $c2
 	octave 3
-	note A#, 5
+	note A#, 6
 	intensity $c7
 	octave 4
-	note G_, 0
-	note A_, 0
-	note A#, 7
+	note G_, 1
+	note A_, 1
+	note A#, 8
 	intensity $c7
-	note A_, 5
-	note G_, 5
-	note A_, 3
-	note A#, 5
+	note A_, 6
+	note G_, 6
+	note A_, 4
+	note A#, 6
 	octave 5
-	note D_, 5
+	note D_, 6
 	octave 4
-	note A#, 3
-	note A_, 5
-	note G_, 5
+	note A#, 4
+	note A_, 6
+	note G_, 6
 	intensity $c5
-	note A_, 3
+	note A_, 4
 	intensity $b0
-	note A_, 7
+	note A_, 8
 	intensity $b7
-	note A_, 7
+	note A_, 8
 	intensity $c6
 	octave 3
-	note A_, 5
-	note G#, 5
-	note E_, 3
-	note A_, 5
-	note G#, 5
-	note E_, 3
+	note A_, 6
+	note G#, 6
+	note E_, 4
+	note A_, 6
+	note G#, 6
+	note E_, 4
 	intensity $b0
-	note F_, 7
+	note F_, 8
 	intensity $b7
-	note F_, 7
+	note F_, 8
 	intensity $3d
-	note A#, 7
+	note A#, 8
 	intensity $c7
-	note A#, 7
+	note A#, 8
 	loopchannel 0, Music_RocketBattle_branch_e9db1
 ; e9ea0
 
@@ -670,84 +670,84 @@
 Music_RocketBattle_branch_e9ea0: ; e9ea0
 	intensity $c6
 	octave 4
-	note A_, 5
-	note G#, 5
-	note E_, 3
-	note A_, 5
-	note G#, 5
-	note E_, 3
+	note A_, 6
+	note G#, 6
+	note E_, 4
+	note A_, 6
+	note G#, 6
+	note E_, 4
 	endchannel
 
 Music_RocketBattle_Ch3: ; e9eaa
 	notetype $c, $19
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note E_, 1
+	note E_, 2
 	octave 3
-	note G#, 1
+	note G#, 2
 	octave 4
-	note E_, 1
+	note E_, 2
 	octave 3
-	note G_, 1
+	note G_, 2
 	octave 4
-	note E_, 1
+	note E_, 2
 	octave 3
-	note F#, 1
+	note F#, 2
 	octave 4
-	note E_, 1
+	note E_, 2
 	octave 3
-	note F_, 1
+	note F_, 2
 	octave 4
-	note E_, 1
+	note E_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 4
-	note E_, 1
+	note E_, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note B_, 1
-	note A#, 1
+	note B_, 2
+	note A#, 2
 
 Music_RocketBattle_branch_e9ecc: ; e9ecc
 	callchannel Music_RocketBattle_branch_e9fe6
 	loopchannel 3, Music_RocketBattle_branch_e9ecc
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
-	note D_, 1
+	note E_, 2
+	note D_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note G_, 1
-	note F_, 1
-	note E_, 1
-	note D_, 1
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
 
 Music_RocketBattle_branch_e9edf: ; e9edf
 	callchannel Music_RocketBattle_branch_e9fe6
 	loopchannel 3, Music_RocketBattle_branch_e9edf
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
-	note D_, 1
+	note E_, 2
+	note D_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note G_, 1
+	note G_, 2
 	octave 2
-	note G_, 1
-	note A_, 1
-	note A#, 1
+	note G_, 2
+	note A_, 2
+	note A#, 2
 	callchannel Music_RocketBattle_branch_e9ff3
 	callchannel Music_RocketBattle_branch_ea010
 	octave 3
-	note F_, 1
+	note F_, 2
 	callchannel Music_RocketBattle_branch_ea01d
 
 Music_RocketBattle_branch_e9efe: ; e9efe
@@ -754,199 +754,199 @@
 	callchannel Music_RocketBattle_branch_e9ff3
 	callchannel Music_RocketBattle_branch_ea010
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note F_, 1
+	note F_, 2
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note F_, 1
+	note F_, 2
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note F_, 1
-	note E_, 1
-	note D_, 1
+	note F_, 2
+	note E_, 2
+	note D_, 2
 	callchannel Music_RocketBattle_branch_ea02a
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
-	note A_, 1
+	note E_, 2
+	note A_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
-	note A_, 1
+	note E_, 2
+	note A_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 
 Music_RocketBattle_branch_e9f25: ; e9f25
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note F_, 1
+	note F_, 2
 	loopchannel 5, Music_RocketBattle_branch_e9f25
-	note A#, 1
+	note A#, 2
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note F_, 1
-	note A#, 1
+	note F_, 2
+	note A#, 2
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	callchannel Music_RocketBattle_branch_ea02a
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note F_, 1
-	note E_, 1
-	note D_, 1
+	note F_, 2
+	note E_, 2
+	note D_, 2
 	callchannel Music_RocketBattle_branch_ea02a
 	callchannel Music_RocketBattle_branch_ea02a
 
 Music_RocketBattle_branch_e9f4e: ; e9f4e
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
-	note D_, 1
+	note E_, 2
+	note D_, 2
 	octave 2
-	note A#, 1
-	note A_, 1
+	note A#, 2
+	note A_, 2
 	octave 3
-	note D_, 1
-	note G_, 1
-	note F_, 1
+	note D_, 2
+	note G_, 2
+	note F_, 2
 	loopchannel 7, Music_RocketBattle_branch_e9f4e
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
-	note D_, 1
+	note E_, 2
+	note D_, 2
 	octave 2
-	note A#, 1
-	note A_, 1
+	note A#, 2
+	note A_, 2
 	octave 3
-	note A_, 1
-	note G_, 1
-	note F_, 1
+	note A_, 2
+	note G_, 2
+	note F_, 2
 
 Music_RocketBattle_branch_e9f6a: ; e9f6a
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note F_, 1
+	note F_, 2
 	loopchannel 4, Music_RocketBattle_branch_e9f6a
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note F_, 1
-	note G_, 1
-	note F_, 1
-	note E_, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
+	note F_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note C#, 2
+	note D_, 2
 
 Music_RocketBattle_branch_e9f7c: ; e9f7c
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	loopchannel 13, Music_RocketBattle_branch_e9f7c
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 3
-	note D_, 1
-	note C_, 1
+	note E_, 4
+	note D_, 2
+	note C_, 2
 	octave 2
-	note A#, 1
+	note A#, 2
 
 Music_RocketBattle_branch_e9f8c: ; e9f8c
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	loopchannel 4, Music_RocketBattle_branch_e9f8c
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note A_, 1
-	note A#, 3
-	note A_, 1
-	note G_, 1
-	note A#, 1
+	note A_, 2
+	note A#, 4
+	note A_, 2
+	note G_, 2
+	note A#, 2
 
 Music_RocketBattle_branch_e9f9e: ; e9f9e
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note F_, 1
+	note F_, 2
 	loopchannel 7, Music_RocketBattle_branch_e9f9e
-	note E_, 1
-	note F_, 1
+	note E_, 2
+	note F_, 2
 
 Music_RocketBattle_branch_e9fa8: ; e9fa8
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note F_, 1
+	note F_, 2
 	loopchannel 5, Music_RocketBattle_branch_e9fa8
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note D_, 3
-	note C_, 1
+	note D_, 4
+	note C_, 2
 	octave 3
-	note A#, 1
-	note G_, 1
+	note A#, 2
+	note G_, 2
 	callchannel Music_RocketBattle_branch_ea033
 	octave 3
-	note E_, 1
+	note E_, 2
 	callchannel Music_RocketBattle_branch_ea010
 	octave 3
-	note F_, 1
+	note F_, 2
 	callchannel Music_RocketBattle_branch_ea033
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	callchannel Music_RocketBattle_branch_e9ff3
 	callchannel Music_RocketBattle_branch_ea010
 	octave 3
-	note F_, 1
+	note F_, 2
 	callchannel Music_RocketBattle_branch_ea01d
 	loopchannel 0, Music_RocketBattle_branch_e9efe
 ; e9fe6
@@ -953,89 +953,89 @@
 
 Music_RocketBattle_branch_e9fe6: ; e9fe6
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
-	note D_, 1
+	note E_, 2
+	note D_, 2
 	octave 2
-	note A_, 1
-	note A#, 1
+	note A_, 2
+	note A#, 2
 	octave 3
-	note E_, 1
-	note G_, 1
-	note F_, 1
+	note E_, 2
+	note G_, 2
+	note F_, 2
 	endchannel
 ; e9ff3
 
 Music_RocketBattle_branch_e9ff3: ; e9ff3
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
-	note D#, 1
-	note E_, 1
+	note E_, 2
+	note D#, 2
+	note E_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
-	note D#, 1
-	note D_, 1
+	note E_, 2
+	note D#, 2
+	note D_, 2
 	endchannel
 ; ea010
 
 Music_RocketBattle_branch_ea010: ; ea010
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note F_, 1
-	note A#, 1
+	note F_, 2
+	note A#, 2
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note F_, 1
-	note A#, 1
+	note F_, 2
+	note A#, 2
 	octave 2
-	note A#, 1
+	note A#, 2
 	endchannel
 ; ea01d
 
 Music_RocketBattle_branch_ea01d: ; ea01d
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note F_, 1
-	note A#, 1
-	note F_, 1
-	note A#, 1
-	note F_, 1
+	note F_, 2
+	note A#, 2
+	note F_, 2
+	note A#, 2
+	note F_, 2
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note F_, 1
+	note F_, 2
 	endchannel
 ; ea02a
 
 Music_RocketBattle_branch_ea02a: ; ea02a
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	loopchannel 4, Music_RocketBattle_branch_ea02a
 	endchannel
 ; ea033
@@ -1042,16 +1042,16 @@
 
 Music_RocketBattle_branch_ea033: ; ea033
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
-	note A_, 1
+	note E_, 2
+	note A_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
-	note A_, 1
+	note E_, 2
+	note A_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	endchannel
 ; ea040
--- a/audio/music/rockethideout.asm
+++ b/audio/music/rockethideout.asm
@@ -16,110 +16,110 @@
 	stereopanning $f0
 
 Music_RocketHideout_branch_eeb93: ; eeb93
-	note __, 15
+	note __, 16
 	loopchannel 4, Music_RocketHideout_branch_eeb93
 
 Music_RocketHideout_branch_eeb98: ; eeb98
 	octave 2
-	note D#, 1
-	note __, 1
-	note A#, 3
-	note A_, 1
-	note __, 5
-	note D#, 1
-	note A#, 3
-	note A_, 1
-	note __, 7
+	note D#, 2
+	note __, 2
+	note A#, 4
+	note A_, 2
+	note __, 6
+	note D#, 2
+	note A#, 4
+	note A_, 2
+	note __, 8
 	loopchannel 2, Music_RocketHideout_branch_eeb98
 	octave 3
-	note A#, 1
-	note A_, 1
-	note F_, 1
-	note F#, 1
+	note A#, 2
+	note A_, 2
+	note F_, 2
+	note F#, 2
 	octave 4
-	note C#, 1
-	note C_, 1
-	note C#, 1
-	note C_, 1
+	note C#, 2
+	note C_, 2
+	note C#, 2
+	note C_, 2
 	octave 3
-	note A#, 1
-	note A_, 1
-	note F_, 1
-	note F#, 1
+	note A#, 2
+	note A_, 2
+	note F_, 2
+	note F#, 2
 	octave 4
-	note C#, 1
-	note C_, 1
+	note C#, 2
+	note C_, 2
 	octave 3
-	note A#, 1
-	note A_, 1
-	note F#, 1
-	note F_, 1
-	note D#, 1
-	note F_, 1
-	note F#, 1
-	note A#, 1
-	note F#, 1
-	note F_, 1
-	note D#, 1
-	note F_, 1
-	note F#, 1
-	note A_, 1
+	note A#, 2
+	note A_, 2
+	note F#, 2
+	note F_, 2
+	note D#, 2
+	note F_, 2
+	note F#, 2
+	note A#, 2
+	note F#, 2
+	note F_, 2
+	note D#, 2
+	note F_, 2
+	note F#, 2
+	note A_, 2
 	octave 2
-	note A#, 1
-	note B_, 1
+	note A#, 2
+	note B_, 2
 	octave 3
-	note D#, 1
-	note F_, 1
+	note D#, 2
+	note F_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note B_, 1
-	note G_, 1
-	note G#, 1
+	note B_, 2
+	note G_, 2
+	note G#, 2
 	octave 4
-	note D#, 1
-	note D_, 1
-	note D#, 1
-	note D_, 1
-	note C_, 1
+	note D#, 2
+	note D_, 2
+	note D#, 2
+	note D_, 2
+	note C_, 2
 	octave 3
-	note B_, 1
-	note G_, 1
-	note G#, 1
+	note B_, 2
+	note G_, 2
+	note G#, 2
 	octave 4
-	note D#, 1
-	note D_, 1
-	note C_, 1
+	note D#, 2
+	note D_, 2
+	note C_, 2
 	octave 3
-	note B_, 1
-	note G#, 1
-	note G_, 1
-	note F_, 1
-	note G_, 1
-	note G#, 1
+	note B_, 2
+	note G#, 2
+	note G_, 2
+	note F_, 2
+	note G_, 2
+	note G#, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G#, 1
-	note G_, 1
-	note F_, 1
-	note G_, 1
-	note G#, 1
-	note B_, 1
-	note C_, 1
-	note C#, 1
-	note F_, 1
-	note G_, 1
-	note __, 15
+	note G#, 2
+	note G_, 2
+	note F_, 2
+	note G_, 2
+	note G#, 2
+	note B_, 2
+	note C_, 2
+	note C#, 2
+	note F_, 2
+	note G_, 2
+	note __, 16
 	intensity $b7
 	octave 2
-	note G#, 15
-	note __, 15
-	note A_, 15
+	note G#, 16
+	note __, 16
+	note A_, 16
 	intensity $b3
 
 Music_RocketHideout_branch_eebfe: ; eebfe
-	note __, 15
+	note __, 16
 	loopchannel 4, Music_RocketHideout_branch_eebfe
 	loopchannel 0, Music_RocketHideout_branch_eeb93
 
@@ -132,98 +132,98 @@
 
 Music_RocketHideout_branch_eec14: ; eec14
 	octave 2
-	note D#, 1
-	note __, 1
-	note A#, 3
-	note A_, 1
-	note __, 5
-	note D#, 1
-	note A#, 3
-	note A_, 1
-	note __, 7
-	note D#, 1
-	note __, 1
-	note A#, 3
-	note A_, 1
-	note __, 5
-	note D#, 1
-	note A#, 3
-	note A_, 1
-	note __, 7
+	note D#, 2
+	note __, 2
+	note A#, 4
+	note A_, 2
+	note __, 6
+	note D#, 2
+	note A#, 4
+	note A_, 2
+	note __, 8
+	note D#, 2
+	note __, 2
+	note A#, 4
+	note A_, 2
+	note __, 6
+	note D#, 2
+	note A#, 4
+	note A_, 2
+	note __, 8
 	octave 3
-	note D#, 11
-	note A#, 1
-	note A_, 1
+	note D#, 12
+	note A#, 2
+	note A_, 2
 	octave 4
-	note C#, 7
-	note C_, 7
+	note C#, 8
+	note C_, 8
 	octave 3
-	note A#, 11
-	note A_, 3
-	note F#, 7
-	note F_, 7
+	note A#, 12
+	note A_, 4
+	note F#, 8
+	note F_, 8
 	octave 4
-	note D#, 11
-	note A#, 1
-	note A_, 1
-	note F#, 7
-	note F_, 7
-	note D#, 11
-	note D_, 3
+	note D#, 12
+	note A#, 2
+	note A_, 2
+	note F#, 8
+	note F_, 8
+	note D#, 12
+	note D_, 4
 	octave 3
-	note B_, 7
-	note A#, 7
+	note B_, 8
+	note A#, 8
 	octave 4
-	note F_, 11
+	note F_, 12
 	octave 5
-	note C_, 1
+	note C_, 2
 	octave 4
-	note B_, 1
-	note G#, 7
-	note G_, 7
-	note F_, 11
-	note E_, 3
-	note C#, 7
-	note C_, 7
+	note B_, 2
+	note G#, 8
+	note G_, 8
+	note F_, 12
+	note E_, 4
+	note C#, 8
+	note C_, 8
 	octave 2
-	note C#, 1
-	note __, 1
-	note G#, 3
-	note G_, 1
-	note __, 5
+	note C#, 2
+	note __, 2
+	note G#, 4
+	note G_, 2
+	note __, 6
 	intensity $c7
 	octave 3
-	note C#, 15
+	note C#, 16
 	intensity $c4
 	octave 2
-	note C#, 1
-	note __, 1
-	note G#, 3
-	note G_, 1
-	note __, 5
+	note C#, 2
+	note __, 2
+	note G#, 4
+	note G_, 2
+	note __, 6
 	intensity $c7
 	octave 3
-	note C#, 15
+	note C#, 16
 	intensity $c4
 	octave 2
-	note C#, 1
-	note __, 1
-	note G#, 3
-	note G_, 1
-	note __, 5
-	note C#, 1
-	note G#, 3
-	note G_, 1
-	note __, 7
-	note C#, 1
-	note __, 1
-	note G#, 3
-	note G_, 1
-	note __, 5
-	note C#, 1
-	note G#, 3
-	note G_, 1
-	note __, 7
+	note C#, 2
+	note __, 2
+	note G#, 4
+	note G_, 2
+	note __, 6
+	note C#, 2
+	note G#, 4
+	note G_, 2
+	note __, 8
+	note C#, 2
+	note __, 2
+	note G#, 4
+	note G_, 2
+	note __, 6
+	note C#, 2
+	note G#, 4
+	note G_, 2
+	note __, 8
 	loopchannel 0, Music_RocketHideout_branch_eec14
 
 Music_RocketHideout_Ch3: ; eec79
@@ -231,54 +231,54 @@
 
 Music_RocketHideout_branch_eec7c: ; eec7c
 	octave 2
-	note D#, 1
-	note __, 1
-	note A#, 3
-	note A_, 1
-	note __, 5
-	note D#, 1
-	note A#, 3
-	note A_, 1
-	note __, 7
+	note D#, 2
+	note __, 2
+	note A#, 4
+	note A_, 2
+	note __, 6
+	note D#, 2
+	note A#, 4
+	note A_, 2
+	note __, 8
 	loopchannel 6, Music_RocketHideout_branch_eec7c
 
 Music_RocketHideout_branch_eec8a: ; eec8a
-	note F_, 1
-	note __, 1
+	note F_, 2
+	note __, 2
 	octave 3
-	note C_, 3
+	note C_, 4
 	octave 2
-	note B_, 1
-	note __, 5
-	note F_, 1
+	note B_, 2
+	note __, 6
+	note F_, 2
 	octave 3
-	note C_, 3
+	note C_, 4
 	octave 2
-	note B_, 1
-	note __, 7
+	note B_, 2
+	note __, 8
 	loopchannel 2, Music_RocketHideout_branch_eec8a
 
 Music_RocketHideout_branch_eec9b: ; eec9b
-	note C#, 1
-	note __, 1
-	note G#, 3
-	note G_, 1
-	note __, 5
+	note C#, 2
+	note __, 2
+	note G#, 4
+	note G_, 2
+	note __, 6
 	octave 3
-	note C#, 15
+	note C#, 16
 	loopchannel 2, Music_RocketHideout_branch_eec9b
 
 Music_RocketHideout_branch_eeca6: ; eeca6
 	octave 2
-	note C#, 1
-	note __, 1
-	note G#, 3
-	note G_, 1
-	note __, 5
-	note C#, 1
-	note G#, 3
-	note G_, 1
-	note __, 7
+	note C#, 2
+	note __, 2
+	note G#, 4
+	note G_, 2
+	note __, 6
+	note C#, 2
+	note G#, 4
+	note G_, 2
+	note __, 8
 	loopchannel 2, Music_RocketHideout_branch_eeca6
 	loopchannel 0, Music_RocketHideout_branch_eec7c
 
@@ -286,35 +286,35 @@
 	togglenoise $0
 	notetype $c
 	stereopanning $f
-	note __, 15
-	note __, 15
-	note D_, 0
-	note D_, 0
-	note D#, 0
-	note D#, 0
+	note __, 16
+	note __, 16
+	note D_, 1
+	note D_, 1
+	note D#, 1
+	note D#, 1
 	callchannel Music_RocketHideout_branch_eecdb
 
 Music_RocketHideout_branch_eecc7: ; eecc7
 	callchannel Music_RocketHideout_branch_eecdb
-	note E_, 3
+	note E_, 4
 	callchannel Music_RocketHideout_branch_eecdb
-	note F_, 3
+	note F_, 4
 	callchannel Music_RocketHideout_branch_eecdb
-	note A#, 3
+	note A#, 4
 	callchannel Music_RocketHideout_branch_eecdb
-	note F#, 3
+	note F#, 4
 	loopchannel 0, Music_RocketHideout_branch_eecc7
 ; eecdb
 
 Music_RocketHideout_branch_eecdb: ; eecdb
 	stereopanning $f0
-	note D#, 0
-	note D#, 0
+	note D#, 1
+	note D#, 1
 	stereopanning $f
-	note A_, 3
-	note D#, 0
-	note D#, 0
+	note A_, 4
+	note D#, 1
+	note D#, 1
 	stereopanning $f0
-	note A_, 3
+	note A_, 4
 	endchannel
 ; eece8
--- a/audio/music/rockettheme.asm
+++ b/audio/music/rockettheme.asm
@@ -14,8 +14,8 @@
 	vibrato $5, $64
 	notetype $c, $a8
 	octave 4
-	note C_, 0
-	note D_, 0
+	note C_, 1
+	note D_, 1
 
 Music_RocketTheme_branch_f768b: ; f768b
 	dutycycle $3
@@ -26,8 +26,8 @@
 	callchannel Music_RocketTheme_branch_f74f7
 	callchannel Music_RocketTheme_branch_f758a
 	octave 4
-	note F#, 0
-	note __, 0
+	note F#, 1
+	note __, 1
 	intensity $53
 	callchannel Music_RocketTheme_branch_f750c
 	intensity $c3
@@ -34,132 +34,132 @@
 	callchannel Music_RocketTheme_branch_f750c
 	intensity $e3
 	callchannel Music_RocketTheme_branch_f750c
-	note __, 15
+	note __, 16
 	dutycycle $0
 	notetype $6, $b3
 	vibrato $6, $64
 	callchannel Music_RocketTheme_branch_f7727
 	octave 4
-	note F_, 0
-	note F#, 2
 	note F_, 1
-	note __, 1
-	note D#, 1
-	note __, 1
-	note C_, 1
-	note D_, 1
-	note D#, 1
-	note C_, 1
+	note F#, 3
+	note F_, 2
+	note __, 2
+	note D#, 2
+	note __, 2
+	note C_, 2
+	note D_, 2
+	note D#, 2
+	note C_, 2
 	octave 3
-	note A#, 1
-	note G_, 1
-	note A#, 1
+	note A#, 2
+	note G_, 2
+	note A#, 2
 	octave 4
-	note C_, 1
-	note __, 3
-	note D_, 3
-	note __, 3
-	note D#, 3
-	note __, 3
-	note D#, 1
-	note F#, 1
+	note C_, 2
+	note __, 4
+	note D_, 4
+	note __, 4
+	note D#, 4
+	note __, 4
+	note D#, 2
+	note F#, 2
 	callchannel Music_RocketTheme_branch_f7727
 	octave 3
-	note F#, 0
-	note G_, 2
-	note F_, 1
-	note __, 1
-	note D#, 1
-	note __, 1
-	note C_, 1
-	note D_, 1
-	note D#, 1
-	note C_, 1
+	note F#, 1
+	note G_, 3
+	note F_, 2
+	note __, 2
+	note D#, 2
+	note __, 2
+	note C_, 2
+	note D_, 2
+	note D#, 2
+	note C_, 2
 	octave 2
-	note A#, 1
-	note G_, 1
-	note A#, 1
+	note A#, 2
+	note G_, 2
+	note A#, 2
 	octave 3
-	note C_, 1
-	note __, 3
-	note D_, 3
-	note __, 3
-	note D#, 3
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
+	note C_, 2
+	note __, 4
+	note D_, 4
+	note __, 4
+	note D#, 4
+	note F_, 2
+	note E_, 2
+	note D#, 2
+	note D_, 2
 
 Music_RocketTheme_branch_f76ef: ; f76ef
-	note __, 3
-	note F_, 1
-	note __, 13
-	note F#, 1
-	note __, 9
+	note __, 4
+	note F_, 2
+	note __, 14
+	note F#, 2
+	note __, 10
 	loopchannel 3, Music_RocketTheme_branch_f76ef
-	note __, 3
-	note F_, 1
-	note __, 13
-	note F#, 1
-	note __, 1
-	note F#, 1
-	note __, 1
-	note D#, 1
-	note C_, 1
+	note __, 4
+	note F_, 2
+	note __, 14
+	note F#, 2
+	note __, 2
+	note F#, 2
+	note __, 2
+	note D#, 2
+	note C_, 2
 
 Music_RocketTheme_branch_f7701: ; f7701
-	note F#, 1
-	note A_, 1
+	note F#, 2
+	note A_, 2
 	loopchannel 4, Music_RocketTheme_branch_f7701
 
 Music_RocketTheme_branch_f7707: ; f7707
-	note G_, 1
-	note A#, 1
+	note G_, 2
+	note A#, 2
 	loopchannel 4, Music_RocketTheme_branch_f7707
 
 Music_RocketTheme_branch_f770d: ; f770d
-	note G#, 1
-	note B_, 1
+	note G#, 2
+	note B_, 2
 	loopchannel 4, Music_RocketTheme_branch_f770d
 
 Music_RocketTheme_branch_f7713: ; f7713
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	loopchannel 4, Music_RocketTheme_branch_f7713
 	notetype $c, $b3
-	note __, 15
-	note __, 11
-	note F_, 1
-	note C_, 0
-	note D_, 0
+	note __, 16
+	note __, 12
+	note F_, 2
+	note C_, 1
+	note D_, 1
 	loopchannel 0, Music_RocketTheme_branch_f768b
 ; f7727
 
 Music_RocketTheme_branch_f7727: ; f7727
-	note __, 6
-	note B_, 0
+	note __, 7
+	note B_, 1
 	octave 4
-	note C_, 1
-	note __, 5
-	note C_, 1
-	note __, 1
+	note C_, 2
+	note __, 6
+	note C_, 2
+	note __, 2
 	octave 3
-	note G_, 1
-	note __, 5
+	note G_, 2
+	note __, 6
 	octave 4
-	note D#, 11
-	note D_, 7
+	note D#, 12
+	note D_, 8
 	octave 3
-	note A#, 1
-	note __, 5
-	note G_, 1
-	note __, 1
-	note A_, 1
-	note __, 1
-	note A#, 1
-	note __, 9
+	note A#, 2
+	note __, 6
+	note G_, 2
+	note __, 2
+	note A_, 2
+	note __, 2
+	note A#, 2
+	note __, 10
 	endchannel
 
 Music_RocketTheme_Ch2: ; f773e
@@ -168,8 +168,8 @@
 	dutycycle $3
 	notetype $c, $b7
 	octave 5
-	note C_, 0
-	note D_, 0
+	note C_, 1
+	note D_, 1
 
 Music_RocketTheme_branch_f774b: ; f774b
 	notetype $c, $b7
@@ -177,8 +177,8 @@
 	intensity $b7
 	callchannel Music_RocketTheme_branch_f758a
 	octave 5
-	note C_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
 	callchannel Music_RocketTheme_branch_f7554
 	intensity $53
 	callchannel Music_RocketTheme_branch_f7568
@@ -190,155 +190,155 @@
 	vibrato $6, $64
 	callchannel Music_RocketTheme_branch_f7800
 	octave 4
-	note A_, 0
+	note A_, 1
 	vibrato $0, $0
 	intensity $b8
-	note A#, 13
+	note A#, 14
 	vibrato $5, $22
 	intensity $b7
-	note A#, 4
+	note A#, 5
 	vibrato $6, $64
 	notetype $c, $b7
-	note A#, 11
-	note __, 1
+	note A#, 12
+	note __, 2
 	octave 5
-	note C_, 0
-	note D_, 0
+	note C_, 1
+	note D_, 1
 	callchannel Music_RocketTheme_branch_f7800
-	note B_, 0
+	note B_, 1
 	vibrato $0, $0
 	intensity $b8
 	octave 4
-	note C_, 13
+	note C_, 14
 	vibrato $5, $22
 	intensity $b7
-	note C_, 4
+	note C_, 5
 	vibrato $6, $64
 	notetype $c, $b7
-	note C_, 11
+	note C_, 12
 	octave 3
-	note A#, 0
-	note A_, 0
-	note G#, 0
-	note G_, 0
+	note A#, 1
+	note A_, 1
+	note G#, 1
+	note G_, 1
 	notetype $6, $b7
 	callchannel Music_RocketTheme_branch_f781c
 	octave 4
-	note D_, 0
-	note D#, 8
-	note D_, 0
-	note C#, 0
-	note C_, 11
-	note F_, 1
-	note __, 1
-	note F#, 1
-	note __, 1
+	note D_, 1
+	note D#, 9
+	note D_, 1
+	note C#, 1
+	note C_, 12
+	note F_, 2
+	note __, 2
+	note F#, 2
+	note __, 2
 	callchannel Music_RocketTheme_branch_f781c
 	octave 3
-	note B_, 1
-	note __, 1
+	note B_, 2
+	note __, 2
 	octave 4
-	note C_, 1
-	note __, 1
-	note D_, 1
-	note __, 1
-	note D#, 7
-	note __, 3
-	note D_, 1
-	note __, 1
-	note C_, 1
+	note C_, 2
+	note __, 2
+	note D_, 2
+	note __, 2
+	note D#, 8
+	note __, 4
+	note D_, 2
+	note __, 2
+	note C_, 2
 	octave 3
-	note G_, 1
-	note B_, 0
+	note G_, 2
+	note B_, 1
 	octave 4
-	note C_, 14
-	note C#, 15
-	note D_, 15
-	note D#, 15
-	note E_, 1
-	note C#, 1
+	note C_, 15
+	note C#, 16
+	note D_, 16
+	note D#, 16
+	note E_, 2
+	note C#, 2
 	octave 3
-	note A#, 1
-	note G_, 1
+	note A#, 2
+	note G_, 2
 	octave 4
-	note F_, 1
-	note D_, 1
+	note F_, 2
+	note D_, 2
 	octave 3
-	note B_, 1
-	note G#, 1
+	note B_, 2
+	note G#, 2
 	octave 4
-	note F#, 1
-	note D#, 1
-	note C_, 1
+	note F#, 2
+	note D#, 2
+	note C_, 2
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note G_, 1
-	note E_, 1
-	note C#, 1
+	note G_, 2
+	note E_, 2
+	note C#, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note G#, 1
-	note F_, 1
-	note D_, 1
+	note G#, 2
+	note F_, 2
+	note D_, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note A_, 1
-	note F#, 1
-	note D#, 1
-	note C_, 1
-	note A#, 1
-	note G_, 1
-	note E_, 1
-	note C#, 1
-	note B_, 3
+	note A_, 2
+	note F#, 2
+	note D#, 2
+	note C_, 2
+	note A#, 2
+	note G_, 2
+	note E_, 2
+	note C#, 2
+	note B_, 4
 	octave 5
-	note C_, 1
-	note D_, 1
+	note C_, 2
+	note D_, 2
 	loopchannel 0, Music_RocketTheme_branch_f774b
 ; f7800
 
 Music_RocketTheme_branch_f7800: ; f7800
 	notetype $6, $b7
-	note __, 6
+	note __, 7
 	octave 4
-	note D_, 0
-	note D#, 1
-	note __, 5
-	note D#, 1
-	note __, 1
-	note C_, 1
-	note __, 5
-	note F#, 11
-	note F_, 7
-	note D#, 1
-	note __, 5
-	note C_, 1
-	note __, 1
 	note D_, 1
-	note __, 1
-	note D#, 1
-	note __, 1
+	note D#, 2
+	note __, 6
+	note D#, 2
+	note __, 2
+	note C_, 2
+	note __, 6
+	note F#, 12
+	note F_, 8
+	note D#, 2
+	note __, 6
+	note C_, 2
+	note __, 2
+	note D_, 2
+	note __, 2
+	note D#, 2
+	note __, 2
 	octave 3
-	note D#, 1
-	note __, 1
-	note D#, 1
-	note __, 1
+	note D#, 2
+	note __, 2
+	note D#, 2
+	note __, 2
 	endchannel
 ; f781c
 
 Music_RocketTheme_branch_f781c: ; f781c
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note C_, 2
-	note D#, 3
 	note C_, 3
-	note F#, 7
-	note F_, 7
-	note C_, 3
+	note D#, 4
+	note C_, 4
+	note F#, 8
+	note F_, 8
+	note C_, 4
 	endchannel
 
 Music_RocketTheme_Ch3: ; f7826
@@ -345,7 +345,7 @@
 	stereopanning $f0
 	vibrato $4, $22
 	notetype $c, $14
-	note __, 1
+	note __, 2
 
 Music_RocketTheme_branch_f782f: ; f782f
 	notetype $c, $14
@@ -367,98 +367,98 @@
 	callchannel Music_RocketTheme_branch_f7623
 	callchannel Music_RocketTheme_branch_f75cc
 	octave 3
-	note C_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
 	octave 4
-	note C_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
 	octave 3
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note C#, 0
-	note __, 0
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note C#, 1
+	note __, 1
 	octave 4
-	note C#, 0
-	note __, 0
+	note C#, 1
+	note __, 1
 	octave 3
-	note A#, 0
-	note G_, 0
-	note E_, 0
-	note C#, 0
-	note D_, 0
-	note __, 0
+	note A#, 1
+	note G_, 1
+	note E_, 1
+	note C#, 1
+	note D_, 1
+	note __, 1
 	octave 4
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
 	octave 3
-	note D_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note D#, 0
-	note __, 0
+	note D_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
 	octave 4
-	note D#, 0
-	note __, 0
-	note C_, 0
+	note D#, 1
+	note __, 1
+	note C_, 1
 	octave 3
-	note A_, 0
-	note F#, 0
-	note D#, 0
-	note E_, 0
-	note __, 0
+	note A_, 1
+	note F#, 1
+	note D#, 1
+	note E_, 1
+	note __, 1
 	octave 4
-	note C#, 0
-	note __, 0
+	note C#, 1
+	note __, 1
 	octave 3
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
 	octave 4
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
 	octave 3
-	note F#, 0
-	note __, 0
+	note F#, 1
+	note __, 1
 	octave 4
-	note D#, 0
-	note __, 0
+	note D#, 1
+	note __, 1
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 4
-	note E_, 0
-	note __, 0
+	note E_, 1
+	note __, 1
 	octave 3
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
 	octave 4
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
 	octave 3
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
 	octave 4
-	note F#, 0
-	note __, 0
+	note F#, 1
+	note __, 1
 	octave 3
-	note A#, 0
-	note __, 0
+	note A#, 1
+	note __, 1
 	octave 4
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
 	loopchannel 0, Music_RocketTheme_branch_f782f
 
 Music_RocketTheme_Ch4: ; f78be
 	togglenoise $3
 	notetype $c
-	note __, 1
+	note __, 2
 
 Music_RocketTheme_branch_f78c3: ; f78c3
 	callchannel Music_RocketTheme_branch_f765c
@@ -472,14 +472,14 @@
 	callchannel Music_RocketTheme_branch_f765c
 
 Music_RocketTheme_branch_f78de: ; f78de
-	note A#, 1
-	note F#, 1
-	note D_, 1
-	note F#, 1
-	note A#, 1
-	note F#, 1
-	note D_, 1
-	note F#, 1
+	note A#, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
+	note A#, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
 	loopchannel 11, Music_RocketTheme_branch_f78de
 	callchannel Music_RocketTheme_branch_f7664
 	callchannel Music_RocketTheme_branch_f7664
--- a/audio/music/route1.asm
+++ b/audio/music/route1.asm
@@ -14,195 +14,195 @@
 	dutycycle $3
 	notetype $c, $83
 	octave 4
-	note D_, 0
-	note E_, 0
-	note F#, 1
-	note F#, 1
 	note D_, 1
+	note E_, 1
+	note F#, 2
+	note F#, 2
+	note D_, 2
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note B_, 1
-	note A_, 1
-	note G_, 1
-	note F#, 1
-	note D_, 1
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note D_, 2
 	octave 3
+	note A_, 2
+	note F#, 2
+	note G_, 1
 	note A_, 1
-	note F#, 1
-	note G_, 0
-	note A_, 0
+	note G_, 2
+	note E_, 2
 	note G_, 1
 	note E_, 1
-	note G_, 0
-	note E_, 0
 	octave 4
-	note D_, 0
-	note E_, 0
-	note F#, 1
-	note F#, 1
 	note D_, 1
+	note E_, 1
+	note F#, 2
+	note F#, 2
+	note D_, 2
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note B_, 1
-	note A_, 1
-	note G_, 2
-	note E_, 0
+	note B_, 2
+	note A_, 2
+	note G_, 3
 	note E_, 1
-	note G_, 1
-	note A_, 1
-	note G_, 1
-	note F#, 1
+	note E_, 2
+	note G_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
 	intensity $81
 	octave 5
-	note D_, 1
-	note D_, 1
+	note D_, 2
+	note D_, 2
 	intensity $83
-	note __, 1
+	note __, 2
 
 Music_Route1_branch_ec04a: ; ec04a
 	intensity $83
-	note __, 1
+	note __, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note A_, 1
-	note __, 3
+	note A_, 2
+	note __, 4
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note A_, 1
-	note __, 1
-	note __, 1
+	note A_, 2
+	note __, 2
+	note __, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note A_, 2
+	note A_, 3
 	octave 4
-	note D_, 0
+	note D_, 1
 	octave 3
-	note E_, 1
+	note E_, 2
 	intensity $81
-	note G_, 1
-	note G_, 1
+	note G_, 2
+	note G_, 2
 	intensity $83
-	note __, 1
-	note __, 1
+	note __, 2
+	note __, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note A_, 1
-	note __, 3
+	note A_, 2
+	note __, 4
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note A_, 1
-	note __, 1
-	note __, 1
+	note A_, 2
+	note __, 2
+	note __, 2
 	octave 4
+	note C#, 2
 	note C#, 1
-	note C#, 0
 	octave 3
-	note B_, 0
-	note A_, 0
-	note G_, 0
-	note F#, 1
+	note B_, 1
 	note A_, 1
+	note G_, 1
+	note F#, 2
+	note A_, 2
 	octave 4
-	note D_, 1
-	note __, 1
-	note __, 1
+	note D_, 2
+	note __, 2
+	note __, 2
 	octave 3
-	note F#, 0
-	note G_, 0
-	note A_, 3
-	note __, 1
-	note D_, 0
-	note E_, 0
 	note F#, 1
-	note F#, 0
-	note G_, 0
+	note G_, 1
+	note A_, 4
+	note __, 2
+	note D_, 1
+	note E_, 1
+	note F#, 2
+	note F#, 1
+	note G_, 1
+	note A_, 2
 	note A_, 1
-	note A_, 0
-	note B_, 0
+	note B_, 1
+	note A_, 2
 	note A_, 1
-	note A_, 0
-	note B_, 0
-	note A_, 1
+	note B_, 1
+	note A_, 2
 	intensity $81
 	octave 4
-	note G_, 1
-	note G_, 1
+	note G_, 2
+	note G_, 2
 	intensity $83
 	octave 3
-	note F#, 0
-	note E_, 0
-	note __, 1
-	note E_, 0
-	note F#, 0
-	note G_, 5
-	note E_, 0
+	note F#, 1
+	note E_, 1
+	note __, 2
+	note E_, 1
+	note F#, 1
+	note G_, 6
+	note E_, 1
 	octave 2
-	note B_, 0
+	note B_, 1
 	octave 3
-	note C#, 1
-	note E_, 0
-	note F#, 0
-	note G_, 3
+	note C#, 2
+	note E_, 1
+	note F#, 1
+	note G_, 4
 	notetype $8, $83
-	note A_, 0
-	note B_, 0
-	note A_, 0
+	note A_, 1
+	note B_, 1
+	note A_, 1
 	notetype $c, $83
-	note G_, 0
-	note E_, 0
-	note F#, 1
+	note G_, 1
+	note E_, 1
+	note F#, 2
 	intensity $81
 	octave 4
-	note A_, 1
-	note A_, 1
+	note A_, 2
+	note A_, 2
 	intensity $83
 	octave 3
-	note A_, 0
-	note G_, 0
+	note A_, 1
+	note G_, 1
 	intensity $77
 	intensity $1d
-	note F#, 3
+	note F#, 4
+	note A_, 4
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note G_, 2
+	note F#, 4
 	note A_, 3
-	note G_, 1
 	note F#, 1
-	note E_, 1
-	note G_, 1
-	note F#, 3
+	note E_, 2
 	note A_, 2
-	note F#, 0
-	note E_, 1
-	note A_, 1
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note A_, 0
-	note G_, 0
+	note A_, 1
+	note G_, 1
 	dutycycle $2
 	intensity $87
 	octave 6
-	note F#, 3
-	note A_, 3
+	note F#, 4
+	note A_, 4
+	note G_, 2
+	note F#, 2
+	note E_, 3
 	note G_, 1
-	note F#, 1
+	note F#, 2
+	note D_, 2
 	note E_, 2
-	note G_, 0
-	note F#, 1
-	note D_, 1
-	note E_, 1
-	note C#, 1
-	note D_, 1
+	note C#, 2
+	note D_, 2
 	intensity $81
 	octave 5
-	note D_, 1
-	note D_, 1
-	note __, 1
+	note D_, 2
+	note D_, 2
+	note __, 2
 	loopchannel 0, Music_Route1_branch_ec04a
 
 Music_Route1_Ch2: ; ec0eb
@@ -211,26 +211,26 @@
 	dutycycle $2
 	notetype $c, $92
 	octave 4
-	note F#, 0
-	note G_, 0
+	note F#, 1
+	note G_, 1
 	callchannel Music_Route1_branch_ec198
 	octave 3
-	note A_, 1
-	note A_, 1
+	note A_, 2
+	note A_, 2
 	octave 4
-	note F#, 0
-	note G_, 0
+	note F#, 1
+	note G_, 1
 	callchannel Music_Route1_branch_ec1aa
-	note C#, 1
-	note E_, 1
-	note D_, 1
+	note C#, 2
+	note E_, 2
+	note D_, 2
 	intensity $81
-	note F#, 1
-	note F#, 1
+	note F#, 2
+	note F#, 2
 	intensity $82
 	octave 4
-	note D_, 0
-	note E_, 0
+	note D_, 1
+	note E_, 1
 	dutycycle $2
 
 Music_Route1_branch_ec112: ; ec112
@@ -238,148 +238,148 @@
 	callchannel Music_Route1_branch_ec188
 	intensity $81
 	octave 3
-	note A_, 1
-	note A_, 1
+	note A_, 2
+	note A_, 2
 	intensity $82
 	octave 4
-	note C#, 0
-	note D_, 0
+	note C#, 1
+	note D_, 1
+	note E_, 2
+	note E_, 2
+	note E_, 2
+	note C#, 1
+	note D_, 1
+	note E_, 2
+	note E_, 2
+	note E_, 2
+	note C#, 1
+	note D_, 1
+	note E_, 2
+	note E_, 2
+	note F#, 1
 	note E_, 1
 	note E_, 1
-	note E_, 1
-	note C#, 0
-	note D_, 0
-	note E_, 1
-	note E_, 1
-	note E_, 1
-	note C#, 0
-	note D_, 0
-	note E_, 1
-	note E_, 1
-	note F#, 0
-	note E_, 0
-	note E_, 0
-	note F#, 0
-	note D_, 1
-	note __, 1
 	note F#, 1
-	note D_, 0
-	note E_, 0
+	note D_, 2
+	note __, 2
+	note F#, 2
+	note D_, 1
+	note E_, 1
 	callchannel Music_Route1_branch_ec188
 	intensity $81
-	note A_, 1
-	note A_, 1
+	note A_, 2
+	note A_, 2
 	intensity $82
-	note C#, 0
-	note D_, 0
-	note E_, 1
-	note G_, 1
-	note F#, 1
-	note E_, 1
-	note D_, 1
 	note C#, 1
+	note D_, 1
+	note E_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note C#, 2
 	octave 3
-	note B_, 1
-	note A_, 1
+	note B_, 2
+	note A_, 2
 	octave 4
-	note B_, 3
+	note B_, 4
 	notetype $8, $92
-	note C#, 0
-	note D_, 0
-	note C#, 0
+	note C#, 1
+	note D_, 1
+	note C#, 1
 	notetype $c, $92
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note C#, 0
-	note D_, 1
+	note C#, 1
+	note D_, 2
 	intensity $81
 	octave 5
-	note D_, 1
-	note D_, 1
+	note D_, 2
+	note D_, 2
 	intensity $82
 	octave 4
-	note F#, 0
-	note G_, 0
+	note F#, 1
+	note G_, 1
 	callchannel Music_Route1_branch_ec198
-	note __, 3
-	note F#, 0
-	note G_, 0
+	note __, 4
+	note F#, 1
+	note G_, 1
 	callchannel Music_Route1_branch_ec1aa
 	notetype $8, $92
-	note C#, 0
-	note D_, 0
-	note C#, 0
+	note C#, 1
+	note D_, 1
+	note C#, 1
 	notetype $c, $92
 	octave 4
-	note B_, 0
+	note B_, 1
 	octave 5
-	note C#, 0
-	note D_, 1
+	note C#, 1
+	note D_, 2
 	intensity $81
-	note F#, 1
-	note F#, 1
+	note F#, 2
+	note F#, 2
 	intensity $82
 	octave 4
-	note D_, 0
-	note E_, 0
+	note D_, 1
+	note E_, 1
 	loopchannel 0, Music_Route1_branch_ec112
 ; ec188
 
 Music_Route1_branch_ec188: ; ec188
-	note F#, 1
-	note F#, 1
-	note F#, 1
-	note D_, 0
-	note E_, 0
-	note F#, 1
-	note F#, 1
-	note F#, 1
-	note D_, 0
-	note E_, 0
-	note F#, 1
-	note F#, 1
-	note G_, 2
-	note F#, 0
+	note F#, 2
+	note F#, 2
+	note F#, 2
+	note D_, 1
 	note E_, 1
+	note F#, 2
+	note F#, 2
+	note F#, 2
+	note D_, 1
+	note E_, 1
+	note F#, 2
+	note F#, 2
+	note G_, 3
+	note F#, 1
+	note E_, 2
 	endchannel
 ; ec198
 
 Music_Route1_branch_ec198: ; ec198
-	note A_, 1
-	note A_, 1
-	note F#, 1
-	note D_, 1
+	note A_, 2
+	note A_, 2
+	note F#, 2
+	note D_, 2
 	octave 5
-	note D_, 1
-	note C#, 1
+	note D_, 2
+	note C#, 2
 	octave 4
-	note B_, 1
+	note B_, 2
 	octave 5
-	note D_, 1
+	note D_, 2
 	octave 4
-	note A_, 1
+	note A_, 2
+	note F#, 2
+	note D_, 3
 	note F#, 1
-	note D_, 2
-	note F#, 0
-	note E_, 1
+	note E_, 2
 	endchannel
 ; ec1aa
 
 Music_Route1_branch_ec1aa: ; ec1aa
-	note A_, 1
-	note A_, 1
-	note F#, 1
-	note D_, 1
+	note A_, 2
+	note A_, 2
+	note F#, 2
+	note D_, 2
 	octave 5
-	note D_, 1
-	note C#, 1
+	note D_, 2
+	note C#, 2
 	octave 4
-	note B_, 2
-	note G_, 0
-	note A_, 1
+	note B_, 3
+	note G_, 1
+	note A_, 2
 	octave 5
-	note D_, 1
+	note D_, 2
 	endchannel
 
 Music_Route1_Ch3: ; ec1b8
@@ -386,269 +386,269 @@
 	stereopanning $ff
 	vibrato $10, $23
 	notetype $c, $25
-	note __, 1
+	note __, 2
 	octave 3
-	note D_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
 	octave 4
-	note F#, 0
-	note __, 2
+	note F#, 1
+	note __, 3
 	octave 3
-	note D_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
 	octave 4
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 3
-	note B_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
 	octave 4
-	note D_, 0
-	note __, 2
+	note D_, 1
+	note __, 3
 	octave 3
-	note C#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note C#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
 	octave 4
-	note C#, 0
-	note __, 0
-	note C#, 0
+	note C#, 1
+	note __, 1
+	note C#, 1
 	octave 3
-	note A_, 0
-	note D_, 0
+	note A_, 1
+	note D_, 1
 	octave 2
-	note A_, 0
+	note A_, 1
 	octave 3
-	note D_, 0
-	note F#, 0
+	note D_, 1
+	note F#, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	octave 3
-	note A_, 0
-	note F#, 0
-	note A_, 0
-	note G_, 0
-	note D_, 0
-	note G_, 0
-	note B_, 0
+	note A_, 1
+	note F#, 1
+	note A_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note B_, 1
 	octave 4
-	note G_, 0
-	note D_, 0
+	note G_, 1
+	note D_, 1
 	octave 3
-	note B_, 0
-	note G_, 0
+	note B_, 1
+	note G_, 1
 	octave 2
-	note A_, 0
+	note A_, 1
 	octave 3
-	note C#, 0
-	note E_, 0
-	note G_, 0
-	note E_, 0
-	note A_, 0
+	note C#, 1
+	note E_, 1
+	note G_, 1
+	note E_, 1
+	note A_, 1
 	octave 4
-	note C#, 0
-	note G_, 0
-	note F#, 1
-	note A_, 0
-	note __, 0
-	note A_, 0
-	note __, 2
+	note C#, 1
+	note G_, 1
+	note F#, 2
+	note A_, 1
+	note __, 1
+	note A_, 1
+	note __, 3
 
 Music_Route1_branch_ec20c: ; ec20c
 	octave 3
-	note D_, 0
-	note __, 0
-	octave 4
 	note D_, 1
-	octave 3
-	note C#, 0
-	note __, 0
+	note __, 1
 	octave 4
+	note D_, 2
+	octave 3
 	note C#, 1
+	note __, 1
+	octave 4
+	note C#, 2
 	octave 2
-	note B_, 0
-	note __, 0
-	octave 3
 	note B_, 1
-	octave 2
-	note A_, 0
-	note __, 0
+	note __, 1
 	octave 3
+	note B_, 2
+	octave 2
 	note A_, 1
-	note D_, 0
-	note __, 0
-	octave 4
+	note __, 1
+	octave 3
+	note A_, 2
 	note D_, 1
+	note __, 1
+	octave 4
+	note D_, 2
 	octave 2
-	note A_, 0
-	note __, 0
-	octave 3
 	note A_, 1
-	octave 2
-	note B_, 0
-	note __, 0
+	note __, 1
 	octave 3
-	note B_, 1
+	note A_, 2
 	octave 2
-	note A_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 3
+	note B_, 2
+	octave 2
 	note A_, 1
-	note C#, 0
-	note __, 0
-	octave 4
+	note __, 1
+	octave 3
+	note A_, 2
 	note C#, 1
+	note __, 1
+	octave 4
+	note C#, 2
 	octave 2
-	note A_, 0
-	note __, 0
-	octave 3
 	note A_, 1
-	octave 2
-	note B_, 0
-	note __, 0
+	note __, 1
 	octave 3
+	note A_, 2
+	octave 2
 	note B_, 1
-	note C_, 0
-	note __, 0
-	octave 4
-	note C_, 1
+	note __, 1
 	octave 3
-	note C#, 0
-	note __, 0
+	note B_, 2
+	note C_, 1
+	note __, 1
 	octave 4
+	note C_, 2
+	octave 3
 	note C#, 1
+	note __, 1
+	octave 4
+	note C#, 2
 	octave 2
-	note A_, 0
-	note __, 0
-	octave 3
 	note A_, 1
+	note __, 1
+	octave 3
+	note A_, 2
 	octave 4
-	note D_, 1
-	note C#, 0
+	note D_, 2
+	note C#, 1
 	octave 3
-	note B_, 0
-	note A_, 1
-	note G_, 0
-	note E_, 0
+	note B_, 1
+	note A_, 2
+	note G_, 1
+	note E_, 1
 	octave 2
-	note D_, 0
-	note __, 0
-	octave 3
 	note D_, 1
-	octave 2
-	note E_, 0
-	note __, 0
+	note __, 1
 	octave 3
-	note E_, 1
+	note D_, 2
 	octave 2
-	note F#, 0
-	note __, 0
+	note E_, 1
+	note __, 1
 	octave 3
-	note F#, 1
+	note E_, 2
 	octave 2
-	note A_, 0
-	note __, 0
+	note F#, 1
+	note __, 1
 	octave 3
+	note F#, 2
+	octave 2
 	note A_, 1
-	octave 4
-	note D_, 1
+	note __, 1
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note D_, 1
-	note F#, 1
-	note E_, 1
+	note D_, 2
 	octave 3
-	note E_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
+	note A_, 2
 	octave 4
-	note E_, 1
+	note D_, 2
+	note F#, 2
+	note E_, 2
 	octave 3
-	note C#, 0
-	note __, 0
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
 	octave 4
+	note E_, 2
+	octave 3
 	note C#, 1
+	note __, 1
+	octave 4
+	note C#, 2
 	octave 2
-	note B_, 0
-	note __, 0
-	octave 3
 	note B_, 1
-	octave 2
-	note A_, 0
-	note __, 0
+	note __, 1
 	octave 3
+	note B_, 2
+	octave 2
 	note A_, 1
+	note __, 1
+	octave 3
+	note A_, 2
 	octave 2
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 3
-	note G_, 0
-	note B_, 0
+	note G_, 1
+	note B_, 1
 	octave 4
+	note C#, 2
+	note E_, 1
 	note C#, 1
-	note E_, 0
-	note C#, 0
 	octave 3
-	note A_, 0
-	note G_, 0
-	note E_, 0
-	note C#, 0
-	note D_, 1
-	octave 4
-	note F#, 0
-	note __, 0
-	note F#, 0
-	note __, 2
-	octave 3
-	note D_, 3
-	note F#, 3
-	note G_, 1
 	note A_, 1
-	note B_, 2
-	note G_, 0
+	note G_, 1
+	note E_, 1
+	note C#, 1
+	note D_, 2
+	octave 4
 	note F#, 1
-	note D_, 1
-	octave 2
-	note A_, 2
+	note __, 1
+	note F#, 1
+	note __, 3
 	octave 3
-	note D_, 0
-	note A_, 0
-	note B_, 0
-	note A_, 0
-	note B_, 0
+	note D_, 4
+	note F#, 4
+	note G_, 2
 	note A_, 2
-	note G_, 0
-	note F#, 1
-	note D_, 1
+	note B_, 3
+	note G_, 1
+	note F#, 2
+	note D_, 2
 	octave 2
-	note A_, 1
+	note A_, 3
 	octave 3
 	note D_, 1
-	note G_, 1
-	note F#, 1
-	note E_, 2
-	note C#, 0
-	note D_, 1
-	note F#, 1
 	note A_, 1
-	octave 4
+	note B_, 1
+	note A_, 1
+	note B_, 1
+	note A_, 3
+	note G_, 1
+	note F#, 2
+	note D_, 2
+	octave 2
+	note A_, 2
+	octave 3
+	note D_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 3
 	note C#, 1
-	note D_, 1
+	note D_, 2
+	note F#, 2
+	note A_, 2
+	octave 4
+	note C#, 2
+	note D_, 2
 	octave 5
-	note A_, 0
-	note __, 0
-	note A_, 0
-	note __, 2
+	note A_, 1
+	note __, 1
+	note A_, 1
+	note __, 3
 	loopchannel 0, Music_Route1_branch_ec20c
 ; ec2ca
--- a/audio/music/route12.asm
+++ b/audio/music/route12.asm
@@ -15,21 +15,21 @@
 	dutycycle $3
 	notetype $c, $98
 	octave 3
-	note G#, 0
-	note __, 1
-	note A_, 0
-	note G#, 7
+	note G#, 1
+	note __, 2
+	note A_, 1
+	note G#, 8
 	octave 2
-	note B_, 0
+	note B_, 1
 	octave 3
-	note E_, 0
-	note F#, 0
-	note G#, 0
-	note F#, 0
-	note __, 1
-	note E_, 0
+	note E_, 1
+	note F#, 1
+	note G#, 1
+	note F#, 1
+	note __, 2
+	note E_, 1
 	intensity $97
-	note D#, 11
+	note D#, 12
 
 Music_Route12_branch_ec535: ; ec535
 	dutycycle $2
@@ -37,101 +37,101 @@
 	callchannel Music_Route12_branch_ec5b1
 	callchannel Music_Route12_branch_ec5bf
 	callchannel Music_Route12_branch_ec5b1
-	note E_, 0
-	note __, 1
-	note F#, 0
-	note E_, 3
-	note B_, 3
+	note E_, 1
+	note __, 2
+	note F#, 1
+	note E_, 4
+	note B_, 4
 	octave 4
-	note D#, 3
+	note D#, 4
 	callchannel Music_Route12_branch_ec5b1
 	callchannel Music_Route12_branch_ec5bf
 	callchannel Music_Route12_branch_ec5b1
 	intensity $92
 	octave 4
-	note E_, 0
+	note E_, 1
 	octave 3
-	note B_, 0
-	note G#, 0
-	note E_, 0
+	note B_, 1
+	note G#, 1
+	note E_, 1
 	octave 4
-	note D#, 0
+	note D#, 1
 	octave 3
-	note B_, 0
-	note G#, 0
-	note D#, 0
+	note B_, 1
+	note G#, 1
+	note D#, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	octave 3
-	note B_, 0
-	note G#, 0
-	note D_, 0
-	note C#, 0
-	note F_, 0
-	note G#, 0
-	note B_, 0
+	note B_, 1
+	note G#, 1
+	note D_, 1
+	note C#, 1
+	note F_, 1
+	note G#, 1
+	note B_, 1
 	dutycycle $3
 	intensity $7f
 	octave 4
+	note C#, 3
+	octave 3
+	note B_, 3
+	note A_, 1
+	note __, 1
+	note A_, 4
+	octave 4
 	note C#, 2
 	octave 3
 	note B_, 2
-	note A_, 0
-	note __, 0
-	note A_, 3
 	octave 4
 	note C#, 1
 	octave 3
 	note B_, 1
+	note A_, 4
+	note G#, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
 	octave 4
-	note C#, 0
+	note C_, 2
 	octave 3
-	note B_, 0
+	note B_, 3
 	note A_, 3
 	note G#, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
-	octave 4
-	note C_, 1
-	octave 3
+	note __, 1
+	note G#, 4
 	note B_, 2
 	note A_, 2
-	note G#, 0
-	note __, 0
-	note G#, 3
 	note B_, 1
 	note A_, 1
-	note B_, 0
-	note A_, 0
-	note G#, 3
-	note F#, 1
-	note E_, 1
-	note F#, 1
-	note G_, 1
-	note E_, 1
-	note D#, 2
+	note G#, 4
 	note F#, 2
-	note D#, 1
-	note E_, 7
-	note F#, 7
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note E_, 2
 	note D#, 3
 	note F#, 3
+	note D#, 2
+	note E_, 8
+	note F#, 8
+	note D#, 4
+	note F#, 4
 
 Music_Route12_branch_ec59b: ; ec59b
 	intensity $97
-	note G#, 0
-	note A_, 0
-	note B_, 3
+	note G#, 1
+	note A_, 1
+	note B_, 4
 	octave 2
-	note B_, 0
+	note B_, 1
 	octave 3
-	note D#, 0
-	note E_, 0
-	note __, 0
-	note E_, 0
-	note F#, 0
-	note G#, 3
+	note D#, 1
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note F#, 1
+	note G#, 4
 	loopchannel 2, Music_Route12_branch_ec59b
 	loopchannel 0, Music_Route12_branch_ec535
 ; ec5b1
@@ -138,32 +138,32 @@
 
 Music_Route12_branch_ec5b1: ; ec5b1
 	octave 3
-	note G#, 0
-	note __, 0
-	note E_, 0
-	note __, 0
+	note G#, 1
+	note __, 1
+	note E_, 1
+	note __, 1
 	octave 2
-	note B_, 0
-	note __, 0
-	note B_, 0
+	note B_, 1
+	note __, 1
+	note B_, 1
 	octave 3
-	note D#, 0
-	note E_, 3
-	note G#, 3
+	note D#, 1
+	note E_, 4
+	note G#, 4
 	endchannel
 ; ec5bf
 
 Music_Route12_branch_ec5bf: ; ec5bf
-	note A_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note F#, 0
-	note G#, 0
-	note A_, 3
-	note F#, 3
+	note A_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note F#, 1
+	note G#, 1
+	note A_, 4
+	note F#, 4
 	endchannel
 
 Music_Route12_Ch2: ; ec5ca
@@ -171,118 +171,118 @@
 	vibrato $12, $34
 	notetype $c, $b8
 	octave 4
-	note E_, 0
-	note __, 1
-	note F#, 0
-	note E_, 11
+	note E_, 1
+	note __, 2
+	note F#, 1
+	note E_, 12
 	octave 3
-	note B_, 0
-	note __, 1
+	note B_, 1
+	note __, 2
 	octave 4
-	note C_, 0
+	note C_, 1
 	intensity $b7
 	octave 3
-	note B_, 7
-	note D#, 0
-	note F#, 0
-	note B_, 0
+	note B_, 8
+	note D#, 1
+	note F#, 1
+	note B_, 1
 	octave 4
-	note D#, 0
+	note D#, 1
 
 Music_Route12_branch_ec5e5: ; ec5e5
 	dutycycle $3
 	intensity $b7
 	callchannel Music_Route12_branch_ec647
-	note F#, 0
-	note A_, 0
-	note G#, 0
-	note F#, 0
+	note F#, 1
+	note A_, 1
 	note G#, 1
-	note __, 0
-	note E_, 0
+	note F#, 1
+	note G#, 2
+	note __, 1
+	note E_, 1
 	octave 3
-	note B_, 11
+	note B_, 12
 	dutycycle $2
 	octave 2
-	note B_, 0
-	note __, 1
+	note B_, 1
+	note __, 2
 	octave 3
-	note C_, 0
+	note C_, 1
 	octave 2
-	note B_, 3
+	note B_, 4
 	octave 3
-	note D#, 3
-	note F#, 3
+	note D#, 4
+	note F#, 4
 	dutycycle $3
 	callchannel Music_Route12_branch_ec647
-	note A_, 0
+	note A_, 1
 	octave 5
-	note C#, 0
+	note C#, 1
 	octave 4
-	note B_, 0
-	note A_, 0
 	note B_, 1
-	note __, 0
-	note A_, 0
+	note A_, 1
+	note B_, 2
+	note __, 1
+	note A_, 1
 	intensity $b8
-	note G#, 5
+	note G#, 6
 	intensity $b7
-	note G#, 5
+	note G#, 6
 	intensity $6f
-	note G#, 15
+	note G#, 16
 	dutycycle $2
 	intensity $a8
-	note A_, 2
-	note G#, 2
-	note F#, 0
-	note __, 0
-	note F#, 7
-	intensity $a7
-	note F#, 9
+	note A_, 3
+	note G#, 3
+	note F#, 1
 	note __, 1
-	note F#, 3
-	intensity $a8
-	note G#, 2
-	note F#, 2
-	note E_, 0
-	note __, 0
-	note E_, 7
+	note F#, 8
 	intensity $a7
-	note E_, 9
+	note F#, 10
+	note __, 2
+	note F#, 4
+	intensity $a8
+	note G#, 3
+	note F#, 3
+	note E_, 1
 	note __, 1
-	note E_, 3
-	note F#, 2
-	note D#, 2
+	note E_, 8
+	intensity $a7
+	note E_, 10
+	note __, 2
+	note E_, 4
+	note F#, 3
+	note D#, 3
 	octave 3
-	note B_, 1
+	note B_, 2
 	intensity $a8
 	octave 4
-	note B_, 7
-	note B_, 7
-	note A_, 7
-	note G#, 0
-	note F#, 0
-	note E_, 13
-	note E_, 9
+	note B_, 8
+	note B_, 8
+	note A_, 8
+	note G#, 1
+	note F#, 1
+	note E_, 14
+	note E_, 10
 	intensity $a4
-	note E_, 5
+	note E_, 6
 	loopchannel 0, Music_Route12_branch_ec5e5
 ; ec647
 
 Music_Route12_branch_ec647: ; ec647
 	octave 4
-	note E_, 5
+	note E_, 6
 	intensity $b1
 	octave 3
-	note B_, 0
-	note B_, 0
+	note B_, 1
+	note B_, 1
 	intensity $b7
-	note B_, 3
+	note B_, 4
 	octave 4
-	note B_, 3
-	note A_, 3
-	note G#, 3
-	note F#, 3
+	note B_, 4
+	note A_, 4
+	note G#, 4
+	note F#, 4
 	endchannel
 
 Music_Route12_Ch3: ; ec657
@@ -289,84 +289,84 @@
 	vibrato $12, $54
 	notetype $c, $16
 	octave 3
+	note G#, 2
+	note __, 4
 	note G#, 1
-	note __, 3
-	note G#, 0
-	note A_, 0
-	note B_, 1
-	note __, 1
-	note E_, 3
+	note A_, 1
+	note B_, 2
+	note __, 2
+	note E_, 4
+	note D#, 2
+	note __, 4
 	note D#, 1
-	note __, 3
-	note D#, 0
-	note E_, 0
-	note F#, 1
-	note __, 1
-	note D#, 3
+	note E_, 1
+	note F#, 2
+	note __, 2
+	note D#, 4
 
 Music_Route12_branch_ec66c: ; ec66c
 	callchannel Music_Route12_branch_ec6b4
-	note F#, 0
-	note __, 0
-	note E_, 0
-	note __, 2
-	note D#, 0
-	note E_, 0
-	note F#, 3
+	note F#, 1
+	note __, 1
+	note E_, 1
+	note __, 3
+	note D#, 1
+	note E_, 1
+	note F#, 4
 	octave 2
-	note B_, 3
+	note B_, 4
 	callchannel Music_Route12_branch_ec6b4
-	note E_, 0
-	note __, 0
-	note B_, 0
-	note __, 2
+	note E_, 1
+	note __, 1
+	note B_, 1
+	note __, 3
 	octave 2
-	note B_, 0
+	note B_, 1
 	octave 3
-	note C#, 0
-	note D_, 3
-	note F_, 3
-	note F#, 12
-	note __, 0
-	note F#, 0
-	note G#, 0
-	note A_, 4
-	note __, 0
-	note A_, 0
-	note B_, 0
+	note C#, 1
+	note D_, 4
+	note F_, 4
+	note F#, 13
+	note __, 1
+	note F#, 1
+	note G#, 1
+	note A_, 5
+	note __, 1
+	note A_, 1
+	note B_, 1
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note F#, 3
-	note E_, 13
-	note G#, 0
-	note A_, 0
-	note B_, 5
-	note E_, 0
-	note F#, 0
-	note G_, 3
-	note E_, 3
+	note F#, 4
+	note E_, 14
+	note G#, 1
+	note A_, 1
+	note B_, 6
+	note E_, 1
+	note F#, 1
+	note G_, 4
+	note E_, 4
 	octave 2
-	note B_, 4
-	note __, 0
-	note B_, 0
+	note B_, 5
+	note __, 1
+	note B_, 1
 	octave 3
-	note D#, 0
-	note F#, 7
-	note E_, 7
-	note F#, 3
-	note D#, 3
+	note D#, 1
+	note F#, 8
+	note E_, 8
+	note F#, 4
+	note D#, 4
 
 Music_Route12_branch_ec6a3: ; ec6a3
-	note E_, 0
-	note __, 0
-	note E_, 0
-	note __, 2
-	note E_, 0
-	note F#, 0
-	note G#, 3
-	note E_, 2
-	note __, 0
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 3
+	note E_, 1
+	note F#, 1
+	note G#, 4
+	note E_, 3
+	note __, 1
 	loopchannel 2, Music_Route12_branch_ec6a3
 	loopchannel 0, Music_Route12_branch_ec66c
 ; ec6b4
@@ -373,30 +373,30 @@
 
 Music_Route12_branch_ec6b4: ; ec6b4
 	octave 3
-	note E_, 0
-	note __, 0
-	note E_, 0
-	note __, 2
-	note E_, 0
-	note F#, 0
-	note G#, 3
-	note E_, 3
-	note D_, 0
-	note __, 0
-	note D_, 0
-	note __, 2
-	note D_, 0
-	note E_, 0
-	note F#, 3
-	note D_, 3
-	note E_, 0
-	note __, 0
-	note E_, 0
-	note __, 2
-	note E_, 0
-	note F#, 0
-	note G#, 3
-	note E_, 3
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 3
+	note E_, 1
+	note F#, 1
+	note G#, 4
+	note E_, 4
+	note D_, 1
+	note __, 1
+	note D_, 1
+	note __, 3
+	note D_, 1
+	note E_, 1
+	note F#, 4
+	note D_, 4
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 3
+	note E_, 1
+	note F#, 1
+	note G#, 4
+	note E_, 4
 	endchannel
 
 Music_Route12_Ch4: ; ec6ce
@@ -403,51 +403,51 @@
 	togglenoise $4
 	stereopanning $f0
 	notetype $c
-	note B_, 9
-	note C#, 0
-	note C#, 0
-	note D_, 3
-	note B_, 5
-	note C#, 0
-	note C#, 0
-	note D_, 3
+	note B_, 10
+	note C#, 1
+	note C#, 1
+	note D_, 4
+	note B_, 6
+	note C#, 1
+	note C#, 1
+	note D_, 4
 	notetype $6
 	callchannel Music_Route12_branch_ec717
 
 Music_Route12_branch_ec6e1: ; ec6e1
-	note D_, 3
-	note D_, 7
-	note C#, 1
-	note C#, 1
-	note D_, 7
+	note D_, 4
+	note D_, 8
+	note C#, 2
+	note C#, 2
+	note D_, 8
 	callchannel Music_Route12_branch_ec717
 	loopchannel 8, Music_Route12_branch_ec6e1
 
 Music_Route12_branch_ec6ed: ; ec6ed
 	notetype $c
-	note B_, 9
-	note D_, 0
-	note D_, 0
-	note D_, 5
-	note C#, 0
-	note C#, 0
-	note D_, 5
-	note C#, 0
-	note C#, 0
-	note D_, 3
+	note B_, 10
+	note D_, 1
+	note D_, 1
+	note D_, 6
+	note C#, 1
+	note C#, 1
+	note D_, 6
+	note C#, 1
+	note C#, 1
+	note D_, 4
 	loopchannel 2, Music_Route12_branch_ec6ed
-	note B_, 15
+	note B_, 16
 	notetype $6
 	callchannel Music_Route12_branch_ec717
 	callchannel Music_Route12_branch_ec717
-	note B_, 15
+	note B_, 16
 
 Music_Route12_branch_ec707: ; ec707
-	note D_, 3
-	note D_, 7
-	note C#, 1
-	note C#, 1
-	note D_, 7
+	note D_, 4
+	note D_, 8
+	note C#, 2
+	note C#, 2
+	note D_, 8
 	callchannel Music_Route12_branch_ec717
 	loopchannel 2, Music_Route12_branch_ec707
 	loopchannel 0, Music_Route12_branch_ec6e1
@@ -454,13 +454,13 @@
 ; ec717
 
 Music_Route12_branch_ec717: ; ec717
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
 	endchannel
 ; ec720
--- a/audio/music/route2.asm
+++ b/audio/music/route2.asm
@@ -12,65 +12,65 @@
 	stereopanning $f
 	vibrato $6, $23
 	notetype $c, $b1
-	note __, 15
-	note __, 15
+	note __, 16
+	note __, 16
 	callchannel Music_Route2_branch_ed931
 
 Music_Route2_branch_ed8fb: ; ed8fb
 	intensity $b1
 	octave 3
-	note B_, 3
-	note B_, 3
-	note B_, 3
-	note B_, 3
+	note B_, 4
+	note B_, 4
+	note B_, 4
+	note B_, 4
 	octave 4
-	note E_, 3
-	note E_, 3
-	note E_, 3
-	note E_, 3
+	note E_, 4
+	note E_, 4
+	note E_, 4
+	note E_, 4
 	callchannel Music_Route2_branch_ed931
 	callchannel Music_Route2_branch_ed940
 	callchannel Music_Route2_branch_ed940
 	callchannel Music_Route2_branch_ed971
 	octave 3
-	note G_, 1
+	note G_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G_, 1
+	note G_, 2
 	octave 4
-	note C_, 1
-	note F_, 1
-	note D_, 1
+	note C_, 2
+	note F_, 2
+	note D_, 2
 	octave 3
-	note B_, 1
-	note G_, 1
+	note B_, 2
+	note G_, 2
 	callchannel Music_Route2_branch_ed971
-	note G_, 1
+	note G_, 2
 	octave 4
-	note C_, 1
-	note D_, 1
-	note G_, 1
-	note F_, 1
-	note D_, 1
+	note C_, 2
+	note D_, 2
+	note G_, 2
+	note F_, 2
+	note D_, 2
 	octave 3
-	note B_, 1
-	note G_, 1
+	note B_, 2
+	note G_, 2
 	loopchannel 0, Music_Route2_branch_ed8fb
 ; ed931
 
 Music_Route2_branch_ed931: ; ed931
 	octave 4
-	note C_, 3
-	note C_, 3
-	note C_, 3
-	note C_, 3
-	note C_, 3
-	note C_, 3
+	note C_, 4
+	note C_, 4
+	note C_, 4
+	note C_, 4
+	note C_, 4
+	note C_, 4
 	intensity $b7
-	note C_, 3
+	note C_, 4
 	octave 3
-	note B_, 3
+	note B_, 4
 	intensity $b1
 	endchannel
 ; ed940
@@ -77,91 +77,91 @@
 
 Music_Route2_branch_ed940: ; ed940
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note E_, 1
-	note E_, 1
-	note A#, 1
-	note E_, 1
-	note A#, 1
-	note E_, 1
-	note A#, 1
-	note E_, 1
-	note A#, 1
-	note C_, 1
-	note A_, 1
-	note C_, 1
-	note A_, 1
-	note C_, 1
-	note A_, 1
-	note C_, 1
-	note A_, 1
-	note C_, 1
-	note G#, 1
-	note C_, 1
-	note G#, 1
+	note E_, 2
+	note E_, 2
+	note A#, 2
+	note E_, 2
+	note A#, 2
+	note E_, 2
+	note A#, 2
+	note E_, 2
+	note A#, 2
+	note C_, 2
+	note A_, 2
+	note C_, 2
+	note A_, 2
+	note C_, 2
+	note A_, 2
+	note C_, 2
+	note A_, 2
+	note C_, 2
+	note G#, 2
+	note C_, 2
+	note G#, 2
 	intensity $b7
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note G#, 1
+	note G#, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note G_, 1
+	note G_, 2
 	intensity $b1
 	endchannel
 ; ed971
 
 Music_Route2_branch_ed971: ; ed971
-	note B_, 1
-	note G_, 1
-	note B_, 1
-	note G_, 1
-	note B_, 1
-	note G#, 1
-	note B_, 1
-	note G#, 1
+	note B_, 2
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note B_, 2
+	note G#, 2
+	note B_, 2
+	note G#, 2
 	octave 4
-	note E_, 1
-	note C_, 1
-	note E_, 1
-	note C_, 1
-	note D_, 1
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note C_, 2
+	note D_, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note A_, 1
+	note A_, 2
 	endchannel
 
 Music_Route2_Ch2: ; ed996
@@ -184,35 +184,35 @@
 
 Music_Route2_branch_ed9ba: ; ed9ba
 	octave 4
-	note E_, 3
-	note E_, 3
-	note E_, 1
+	note E_, 4
+	note E_, 4
+	note E_, 2
 	octave 2
-	note C_, 1
+	note C_, 2
 	octave 4
-	note E_, 1
+	note E_, 2
 	octave 2
-	note C_, 1
+	note C_, 2
 	octave 4
-	note A#, 3
-	note A#, 3
-	note A#, 1
+	note A#, 4
+	note A#, 4
+	note A#, 2
 	octave 2
-	note G_, 1
+	note G_, 2
 	octave 4
-	note A#, 1
+	note A#, 2
 	octave 2
-	note G_, 1
+	note G_, 2
 	octave 4
-	note A_, 3
-	note A_, 3
-	note A_, 3
-	note A_, 3
-	note G#, 3
-	note G#, 3
+	note A_, 4
+	note A_, 4
+	note A_, 4
+	note A_, 4
+	note G#, 4
+	note G#, 4
 	intensity $b7
-	note G#, 3
-	note G_, 3
+	note G#, 4
+	note G_, 4
 	intensity $b2
 	endchannel
 ; ed9dc
@@ -219,87 +219,87 @@
 
 Music_Route2_branch_ed9dc: ; ed9dc
 	octave 2
-	note C_, 3
+	note C_, 4
+	note __, 2
+	note C_, 1
 	note __, 1
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
 	note C_, 1
 	note __, 1
-	note C_, 0
-	note __, 0
-	note G_, 3
+	note C_, 2
+	note __, 2
+	note C_, 1
 	note __, 1
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
+	note G_, 4
+	note __, 2
 	note G_, 1
 	note __, 1
-	note G_, 0
-	note __, 0
-	note F_, 3
+	note G_, 1
 	note __, 1
-	note F_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
+	note G_, 2
+	note __, 2
+	note G_, 1
+	note __, 1
+	note F_, 4
+	note __, 2
 	note F_, 1
 	note __, 1
-	note F_, 0
-	note __, 0
-	note F_, 3
+	note F_, 1
 	note __, 1
-	note F_, 0
-	note __, 0
-	note F_, 3
-	note D_, 3
+	note F_, 2
+	note __, 2
+	note F_, 1
+	note __, 1
+	note F_, 4
+	note __, 2
+	note F_, 1
+	note __, 1
+	note F_, 4
+	note D_, 4
 	endchannel
 ; eda02
 
 Music_Route2_branch_eda02: ; eda02
 	octave 2
-	note E_, 3
+	note E_, 4
+	note __, 2
+	note E_, 1
 	note __, 1
-	note E_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
 	note E_, 1
 	note __, 1
-	note E_, 0
-	note __, 0
-	note A_, 3
+	note E_, 2
+	note __, 2
+	note E_, 1
 	note __, 1
-	note A_, 0
-	note __, 0
-	note G#, 0
-	note __, 0
+	note A_, 4
+	note __, 2
+	note A_, 1
+	note __, 1
 	note G#, 1
 	note __, 1
-	note G#, 0
-	note __, 0
-	note F_, 3
+	note G#, 2
+	note __, 2
+	note G#, 1
 	note __, 1
-	note F_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
+	note F_, 4
+	note __, 2
+	note F_, 1
+	note __, 1
 	note F#, 1
 	note __, 1
-	note F#, 0
-	note __, 0
-	note G_, 3
+	note F#, 2
+	note __, 2
+	note F#, 1
 	note __, 1
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
+	note G_, 4
+	note __, 2
 	note G_, 1
 	note __, 1
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
+	note G_, 2
+	note __, 2
+	note G_, 1
+	note __, 1
 	endchannel
 
 Music_Route2_Ch3: ; eda2c
@@ -307,160 +307,160 @@
 	vibrato $16, $15
 	notetype $c, $14
 	octave 4
-	note B_, 0
-	note __, 2
-	note B_, 0
-	note __, 2
-	note B_, 0
-	note __, 2
-	note B_, 0
-	note __, 2
+	note B_, 1
+	note __, 3
+	note B_, 1
+	note __, 3
+	note B_, 1
+	note __, 3
+	note B_, 1
+	note __, 3
 	octave 5
-	note E_, 0
-	note __, 2
-	note E_, 0
-	note __, 2
-	note E_, 0
-	note __, 2
-	note E_, 0
-	note __, 2
+	note E_, 1
+	note __, 3
+	note E_, 1
+	note __, 3
+	note E_, 1
+	note __, 3
+	note E_, 1
+	note __, 3
 	callchannel Music_Route2_branch_eda9e
 	octave 3
-	note D_, 3
+	note D_, 4
 
 Music_Route2_branch_eda4b: ; eda4b
 	notetype $c, $15
 	octave 3
-	note C_, 3
+	note C_, 4
+	note __, 2
+	note C_, 1
 	note __, 1
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
 	note C_, 1
 	note __, 1
-	note C_, 0
-	note __, 0
-	note G_, 3
+	note C_, 2
+	note __, 2
+	note C_, 1
 	note __, 1
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
+	note G_, 4
+	note __, 2
 	note G_, 1
 	note __, 1
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
+	note G_, 2
+	note __, 2
+	note G_, 1
+	note __, 1
 	callchannel Music_Route2_branch_eda9e
 	octave 3
-	note D_, 1
+	note D_, 2
 	intensity $10
 	octave 6
-	note C_, 0
-	note D_, 0
+	note C_, 1
+	note D_, 1
 	callchannel Music_Route2_branch_edaaf
-	note __, 3
-	note G_, 7
-	note F_, 1
-	note G_, 1
+	note __, 4
+	note G_, 8
+	note F_, 2
+	note G_, 2
 	notetype $c, $10
 	callchannel Music_Route2_branch_edaaf
-	note __, 15
+	note __, 16
 	intensity $25
 	callchannel Music_Route2_branch_edacb
-	note __, 3
-	note D#, 0
-	note E_, 6
-	note D_, 3
+	note __, 4
+	note D#, 1
+	note E_, 7
+	note D_, 4
 	octave 5
-	note B_, 0
+	note B_, 1
 	octave 6
-	note C_, 2
+	note C_, 3
 	octave 5
-	note B_, 3
-	note A_, 3
-	note B_, 7
-	note G_, 3
+	note B_, 4
+	note A_, 4
+	note B_, 8
+	note G_, 4
 	octave 6
-	note A_, 3
-	note G_, 3
+	note A_, 4
+	note G_, 4
 	callchannel Music_Route2_branch_edacb
-	note __, 3
-	note G#, 0
-	note A_, 6
-	note B_, 3
-	note F#, 0
+	note __, 4
+	note G#, 1
+	note A_, 7
+	note B_, 4
+	note F#, 1
+	note G_, 16
 	note G_, 15
-	note G_, 14
 	loopchannel 0, Music_Route2_branch_eda4b
 ; eda9e
 
 Music_Route2_branch_eda9e: ; eda9e
 	octave 3
-	note F_, 3
+	note F_, 4
+	note __, 2
+	note F_, 1
 	note __, 1
-	note F_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
 	note F_, 1
 	note __, 1
-	note F_, 0
-	note __, 0
-	note F_, 3
+	note F_, 2
+	note __, 2
+	note F_, 1
 	note __, 1
-	note F_, 0
-	note __, 0
-	note F_, 3
+	note F_, 4
+	note __, 2
+	note F_, 1
+	note __, 1
+	note F_, 4
 	endchannel
 ; edaaf
 
 Music_Route2_branch_edaaf: ; edaaf
 	octave 6
-	note E_, 9
-	note D_, 1
-	note __, 1
-	note C_, 1
+	note E_, 10
+	note D_, 2
+	note __, 2
+	note C_, 2
 	notetype $6, $10
 	octave 5
-	note F#, 0
-	note G_, 14
-	note A_, 3
-	note A#, 3
-	note __, 3
+	note F#, 1
+	note G_, 15
+	note A_, 4
+	note A#, 4
+	note __, 4
 	octave 6
-	note C_, 1
-	note D_, 1
-	note D#, 0
-	note E_, 15
-	note E_, 6
-	note F_, 3
+	note C_, 2
+	note D_, 2
+	note D#, 1
+	note E_, 16
+	note E_, 7
+	note F_, 4
+	note E_, 4
+	note D#, 1
 	note E_, 3
-	note D#, 0
-	note E_, 2
-	note D_, 3
-	note C_, 3
-	note D_, 3
+	note D_, 4
+	note C_, 4
+	note D_, 4
 	endchannel
 ; edacb
 
 Music_Route2_branch_edacb: ; edacb
 	octave 5
-	note B_, 15
-	note __, 3
+	note B_, 16
+	note __, 4
 	octave 6
-	note C#, 0
-	note D_, 6
-	note E_, 3
+	note C#, 1
+	note D_, 7
+	note E_, 4
 	octave 5
-	note B_, 0
+	note B_, 1
 	octave 6
-	note C_, 15
-	note C_, 2
-	note D_, 3
-	note __, 3
-	note E_, 3
-	note F_, 15
+	note C_, 16
+	note C_, 3
+	note D_, 4
+	note __, 4
+	note E_, 4
+	note F_, 16
 	endchannel
 
 Music_Route2_Ch4: ; edadc
@@ -468,67 +468,67 @@
 	notetype $c
 
 Music_Route2_branch_edae0: ; edae0
-	note A_, 3
-	note A_, 3
-	note A_, 1
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	note A_, 4
+	note A_, 4
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note B_, 2
 	loopchannel 3, Music_Route2_branch_edae0
-	note A_, 3
-	note A_, 3
-	note A_, 1
-	note A_, 1
-	note D#, 3
+	note A_, 4
+	note A_, 4
+	note A_, 2
+	note A_, 2
+	note D#, 4
 
 Music_Route2_branch_edaef: ; edaef
-	note A_, 3
-	note A_, 3
-	note A_, 1
-	note A_, 1
-	note B_, 1
-	note A_, 1
+	note A_, 4
+	note A_, 4
+	note A_, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
 	loopchannel 4, Music_Route2_branch_edaef
 
 Music_Route2_branch_edaf9: ; edaf9
-	note B_, 3
-	note A_, 1
-	note B_, 1
-	note A_, 1
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	note B_, 4
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note B_, 2
 	loopchannel 7, Music_Route2_branch_edaf9
-	note B_, 3
-	note A_, 3
-	note A_, 1
-	note A_, 1
-	note D#, 3
+	note B_, 4
+	note A_, 4
+	note A_, 2
+	note A_, 2
+	note D#, 4
 
 Music_Route2_branch_edb09: ; edb09
-	note B_, 3
-	note C_, 3
-	note B_, 1
-	note B_, 1
-	note C_, 3
+	note B_, 4
+	note C_, 4
+	note B_, 2
+	note B_, 2
+	note C_, 4
 	loopchannel 3, Music_Route2_branch_edb09
-	note B_, 3
-	note C_, 3
-	note C#, 1
-	note C_, 1
-	note C#, 3
+	note B_, 4
+	note C_, 4
+	note C#, 2
+	note C_, 2
+	note C#, 4
 
 Music_Route2_branch_edb17: ; edb17
-	note B_, 3
-	note C_, 3
-	note B_, 1
-	note B_, 1
-	note C_, 3
+	note B_, 4
+	note C_, 4
+	note B_, 2
+	note B_, 2
+	note C_, 4
 	loopchannel 3, Music_Route2_branch_edb17
-	note B_, 3
-	note C_, 3
-	note D_, 1
-	note D_, 1
-	note D#, 3
+	note B_, 4
+	note C_, 4
+	note D_, 2
+	note D_, 2
+	note D#, 4
 	loopchannel 0, Music_Route2_branch_edaef
 ; edb29
--- a/audio/music/route26.asm
+++ b/audio/music/route26.asm
@@ -15,186 +15,186 @@
 	dutycycle $0
 	notetype $c, $a7
 	octave 3
-	note D_, 3
-	note __, 3
-	note D#, 3
-	note __, 3
-	note F#, 3
-	note __, 3
-	note G#, 11
+	note D_, 4
+	note __, 4
+	note D#, 4
+	note __, 4
+	note F#, 4
+	note __, 4
+	note G#, 12
 	notetype $8, $a7
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G#, 1
-	note F#, 1
+	note G#, 2
+	note F#, 2
 
 Music_Route26_branch_eefe0: ; eefe0
 	dutycycle $0
 	notetype $c, $a7
 	octave 3
-	note F_, 0
+	note F_, 1
+	note __, 2
+	note C#, 1
+	note F_, 3
+	note G_, 1
+	note G#, 1
+	note __, 2
+	note F_, 1
+	octave 4
+	note C#, 4
+	note D#, 4
+	octave 3
+	note B_, 4
+	note A_, 4
+	note F#, 4
+	note F_, 1
 	note __, 1
-	note C#, 0
-	note F_, 2
-	note G_, 0
-	note G#, 0
+	note C#, 1
+	note F_, 1
+	note G#, 3
+	note G_, 1
+	note G#, 1
 	note __, 1
-	note F_, 0
+	note F_, 1
+	note G#, 1
 	octave 4
-	note C#, 3
-	note D#, 3
+	note C#, 4
+	note E_, 4
+	note D#, 4
 	octave 3
-	note B_, 3
-	note A_, 3
-	note F#, 3
-	note F_, 0
-	note __, 0
-	note C#, 0
-	note F_, 0
-	note G#, 2
-	note G_, 0
-	note G#, 0
-	note __, 0
-	note F_, 0
-	note G#, 0
+	note A_, 4
+	note B_, 4
+	note A#, 1
+	note __, 1
+	note F_, 1
+	note A#, 1
 	octave 4
-	note C#, 3
-	note E_, 3
-	note D#, 3
+	note C#, 1
+	note __, 1
 	octave 3
-	note A_, 3
-	note B_, 3
-	note A#, 0
-	note __, 0
-	note F_, 0
-	note A#, 0
+	note A#, 1
 	octave 4
-	note C#, 0
-	note __, 0
+	note C#, 1
+	note F_, 4
+	note C#, 1
+	note __, 1
 	octave 3
-	note A#, 0
-	octave 4
-	note C#, 0
-	note F_, 3
-	note C#, 0
-	note __, 0
-	octave 3
-	note A_, 0
-	note __, 0
-	note A#, 3
+	note A_, 1
 	note __, 1
+	note A#, 4
+	note __, 2
 	notetype $6, $a7
-	note A#, 0
-	note __, 0
-	note A#, 0
-	note __, 0
 	note A#, 1
 	note __, 1
 	note A#, 1
 	note __, 1
-	note G_, 1
-	note __, 1
-	note G_, 1
-	note __, 1
+	note A#, 2
+	note __, 2
+	note A#, 2
+	note __, 2
+	note G_, 2
+	note __, 2
+	note G_, 2
+	note __, 2
 	notetype $8, $a5
-	note G#, 1
+	note G#, 2
 	octave 4
-	note C#, 1
-	note D#, 1
-	note G#, 5
-	note F#, 5
-	note D#, 5
-	note C#, 5
+	note C#, 2
+	note D#, 2
+	note G#, 6
+	note F#, 6
+	note D#, 6
+	note C#, 6
 	octave 3
-	note A#, 5
+	note A#, 6
 	octave 4
-	note C_, 5
+	note C_, 6
 	octave 3
-	note G#, 5
+	note G#, 6
 	dutycycle $2
 	notetype $c, $a5
+	note A_, 3
+	note G#, 3
+	note F#, 4
+	note C#, 2
+	note D#, 2
+	note E_, 2
+	note F#, 2
+	note B_, 4
 	note A_, 2
 	note G#, 2
-	note F#, 3
-	note C#, 1
-	note D#, 1
-	note E_, 1
-	note F#, 1
-	note B_, 3
-	note A_, 1
-	note G#, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
-	note G#, 3
-	note F#, 3
-	note E_, 3
-	note D#, 3
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note G#, 4
+	note F#, 4
+	note E_, 4
+	note D#, 4
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note B_, 1
-	note G#, 1
-	note F_, 3
-	note F#, 1
+	note B_, 2
+	note G#, 2
+	note F_, 4
+	note F#, 2
 	notetype $6, $a5
-	note G#, 6
+	note G#, 7
 	octave 4
-	note C_, 0
-	note C#, 7
+	note C_, 1
+	note C#, 8
 	notetype $8, $a5
 	octave 3
-	note C#, 0
-	note __, 0
-	note C#, 0
-	note __, 0
-	note C#, 0
-	note __, 0
-	note C#, 5
+	note C#, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	note C#, 6
 	notetype $6, $a5
-	note __, 6
+	note __, 7
 	octave 4
-	note D#, 0
-	note E_, 7
+	note D#, 1
+	note E_, 8
 	notetype $8, $a5
 	octave 3
-	note E_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note E_, 5
-	note __, 5
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note E_, 6
+	note __, 6
 	notetype $c, $a5
 	octave 2
-	note B_, 0
-	note F#, 0
-	note B_, 0
+	note B_, 1
+	note F#, 1
+	note B_, 1
 	octave 3
-	note E_, 0
-	note F#, 0
-	note E_, 0
-	note F#, 0
-	note B_, 0
+	note E_, 1
+	note F#, 1
+	note E_, 1
+	note F#, 1
+	note B_, 1
 	octave 4
-	note E_, 0
+	note E_, 1
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note E_, 0
-	note F#, 0
-	note B_, 0
-	note F#, 0
-	note E_, 0
+	note E_, 1
+	note F#, 1
+	note B_, 1
+	note F#, 1
+	note E_, 1
 	octave 3
-	note B_, 0
-	note F#, 3
-	note D#, 3
+	note B_, 1
+	note F#, 4
+	note D#, 4
 	octave 2
-	note B_, 3
-	note __, 3
+	note B_, 4
+	note __, 4
 	loopchannel 0, Music_Route26_branch_eefe0
 
 Music_Route26_Ch2: ; ef09d
@@ -203,159 +203,159 @@
 	dutycycle $2
 	notetype $c, $c7
 	octave 1
-	note A#, 3
-	note __, 1
+	note A#, 4
+	note __, 2
 	notetype $6, $c7
-	note A#, 0
-	note __, 0
+	note A#, 1
+	note __, 1
 	octave 2
-	note A#, 0
-	note __, 0
+	note A#, 1
+	note __, 1
 	octave 1
-	note G#, 7
-	note __, 3
-	note G#, 0
-	note __, 0
+	note G#, 8
+	note __, 4
+	note G#, 1
+	note __, 1
 	octave 2
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
 	octave 1
-	note F#, 7
-	note __, 3
-	note F#, 0
-	note __, 0
+	note F#, 8
+	note __, 4
+	note F#, 1
+	note __, 1
 	octave 2
-	note F#, 0
-	note __, 0
+	note F#, 1
+	note __, 1
 	notetype $c, $c7
 	octave 1
-	note G#, 11
+	note G#, 12
 	notetype $8, $c7
-	note G#, 1
+	note G#, 2
 	octave 2
-	note C_, 1
-	note D#, 1
+	note C_, 2
+	note D#, 2
 
 Music_Route26_branch_ef0ce: ; ef0ce
 	dutycycle $2
 	notetype $c, $c2
 	octave 2
-	note C#, 5
-	note C#, 0
-	note G#, 0
+	note C#, 6
 	note C#, 1
-	note C#, 1
 	note G#, 1
-	note C#, 1
+	note C#, 2
+	note C#, 2
+	note G#, 2
+	note C#, 2
 	octave 1
-	note B_, 5
-	note B_, 0
+	note B_, 6
+	note B_, 1
 	octave 2
-	note A_, 0
+	note A_, 1
 	octave 1
-	note B_, 1
-	note B_, 1
-	note B_, 1
-	note B_, 1
+	note B_, 2
+	note B_, 2
+	note B_, 2
+	note B_, 2
 	callchannel Music_Route26_branch_ef14e
-	note A_, 5
-	note A_, 0
+	note A_, 6
+	note A_, 1
 	octave 2
-	note B_, 0
+	note B_, 1
 	notetype $8, $c2
 	octave 1
-	note B_, 1
-	note B_, 1
-	note B_, 1
+	note B_, 2
+	note B_, 2
+	note B_, 2
 	octave 2
-	note B_, 1
-	note B_, 1
-	note B_, 1
+	note B_, 2
+	note B_, 2
+	note B_, 2
 	notetype $c, $c2
 	callchannel Music_Route26_branch_ef14e
 	intensity $c7
 	octave 2
-	note F#, 3
-	note __, 1
+	note F#, 4
+	note __, 2
 	notetype $6, $c2
-	note F#, 1
-	note F#, 1
-	note F#, 3
-	note F#, 3
-	note D#, 3
-	note D#, 3
+	note F#, 2
+	note F#, 2
+	note F#, 4
+	note F#, 4
+	note D#, 4
+	note D#, 4
 	notetype $8, $c2
 
 Music_Route26_branch_ef10e: ; ef10e
 	octave 2
-	note G#, 1
-	note G#, 1
-	note G#, 1
+	note G#, 2
+	note G#, 2
+	note G#, 2
 	octave 1
-	note G#, 5
+	note G#, 6
 	loopchannel 3, Music_Route26_branch_ef10e
 	octave 2
-	note G#, 1
-	note G#, 1
-	note G#, 1
+	note G#, 2
+	note G#, 2
+	note G#, 2
 	notetype $c, $c7
-	note F#, 0
-	note D#, 0
-	note C_, 0
+	note F#, 1
+	note D#, 1
+	note C_, 1
 	octave 1
-	note G#, 0
+	note G#, 1
 	dutycycle $3
 	octave 4
-	note C#, 5
-	note D#, 5
-	note E_, 3
-	note F#, 5
-	note B_, 3
-	note A_, 1
-	note G#, 1
-	note A_, 1
-	note G#, 5
+	note C#, 6
+	note D#, 6
+	note E_, 4
+	note F#, 6
+	note B_, 4
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note G#, 6
+	note D#, 2
+	note __, 2
+	note D#, 2
+	note G#, 2
+	note D#, 2
+	note F_, 2
+	note __, 2
+	note F_, 2
+	note F#, 6
+	note G#, 4
+	note A_, 8
+	note __, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note A_, 8
+	note __, 4
+	note G#, 2
+	note A_, 2
+	note B_, 12
+	note __, 4
+	note D#, 12
 	note D#, 1
-	note __, 1
+	note C#, 1
+	note C_, 1
 	note D#, 1
-	note G#, 1
-	note D#, 1
-	note F_, 1
-	note __, 1
-	note F_, 1
-	note F#, 5
-	note G#, 3
-	note A_, 7
-	note __, 1
-	note A_, 1
-	note G#, 1
-	note F#, 1
-	note A_, 7
-	note __, 3
-	note G#, 1
-	note A_, 1
-	note B_, 11
-	note __, 3
-	note D#, 11
-	note D#, 0
-	note C#, 0
-	note C_, 0
-	note D#, 0
 	loopchannel 0, Music_Route26_branch_ef0ce
 ; ef14e
 
 Music_Route26_branch_ef14e: ; ef14e
-	note A#, 5
-	note A#, 0
-	octave 2
-	note A#, 0
-	octave 1
+	note A#, 6
 	note A#, 1
-	note A#, 1
 	octave 2
 	note A#, 1
 	octave 1
-	note A#, 1
+	note A#, 2
+	note A#, 2
+	octave 2
+	note A#, 2
+	octave 1
+	note A#, 2
 	endchannel
 
 Music_Route26_Ch3: ; ef15a
@@ -364,194 +364,194 @@
 	notetype $c, $14
 	vibrato $18, $23
 	octave 4
-	note A#, 3
-	note __, 1
+	note A#, 4
+	note __, 2
 	notetype $6, $14
-	note F_, 0
-	note __, 0
-	note A#, 0
-	note __, 0
+	note F_, 1
+	note __, 1
+	note A#, 1
+	note __, 1
 	octave 5
-	note C_, 7
-	note __, 3
+	note C_, 8
+	note __, 4
 	octave 4
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
 	octave 5
-	note C_, 0
-	note __, 0
-	note C#, 7
-	note __, 3
+	note C_, 1
+	note __, 1
+	note C#, 8
+	note __, 4
 	octave 4
-	note A#, 0
-	note __, 0
+	note A#, 1
+	note __, 1
 	octave 5
-	note C#, 0
-	note __, 0
+	note C#, 1
+	note __, 1
 	notetype $c, $14
-	note D#, 11
+	note D#, 12
 	notetype $8, $14
-	note F#, 1
-	note F_, 1
-	note D#, 1
+	note F#, 2
+	note F_, 2
+	note D#, 2
 
 Music_Route26_branch_ef18a: ; ef18a
 	vibrato $18, $23
 	notetype $c, $14
 	octave 5
-	note C#, 0
-	note __, 1
+	note C#, 1
+	note __, 2
 	octave 4
-	note G#, 0
+	note G#, 1
 	callchannel Music_Route26_branch_ef22f
 	vibrato $25, $13
-	note C#, 0
-	note __, 0
+	note C#, 1
+	note __, 1
 	octave 4
-	note G#, 0
+	note G#, 1
 	octave 5
-	note C#, 0
+	note C#, 1
 	callchannel Music_Route26_branch_ef22f
-	note F_, 0
-	note __, 0
-	note C#, 0
-	note F_, 0
-	note A#, 7
-	note A#, 0
-	note __, 0
+	note F_, 1
+	note __, 1
+	note C#, 1
+	note F_, 1
+	note A#, 8
+	note A#, 1
+	note __, 1
 	octave 6
-	note C_, 0
-	note __, 0
-	note C#, 11
-	note D#, 3
-	note C#, 7
-	note C_, 7
+	note C_, 1
+	note __, 1
+	note C#, 12
+	note D#, 4
+	note C#, 8
+	note C_, 8
 	octave 5
-	note A#, 7
+	note A#, 8
 	octave 6
-	note C_, 3
-	note G#, 0
-	note D#, 0
-	note C_, 0
+	note C_, 4
+	note G#, 1
+	note D#, 1
+	note C_, 1
 	octave 5
-	note G#, 0
+	note G#, 1
 	intensity $15
 	octave 2
-	note A_, 0
-	note __, 0
-	note A_, 0
-	note __, 2
-	notetype $6, $15
-	note A_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
 	note A_, 1
 	note __, 1
 	note A_, 1
+	note __, 3
+	notetype $6, $15
+	note A_, 1
 	note __, 1
-	octave 3
 	note A_, 1
 	note __, 1
+	note A_, 2
+	note __, 2
+	note A_, 2
+	note __, 2
+	octave 3
+	note A_, 2
+	note __, 2
 	octave 2
-	note A_, 3
+	note A_, 4
+	note B_, 2
+	note __, 2
+	note B_, 2
+	note __, 6
 	note B_, 1
 	note __, 1
 	note B_, 1
-	note __, 5
-	note B_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note B_, 1
 	note __, 1
-	note B_, 1
-	note __, 1
+	note B_, 2
+	note __, 2
+	note B_, 2
+	note __, 2
 	octave 3
-	note B_, 1
-	note __, 1
-	note A_, 3
-	note G#, 1
-	note __, 1
+	note B_, 2
+	note __, 2
+	note A_, 4
+	note G#, 2
+	note __, 2
 	octave 2
+	note G#, 2
+	note __, 6
 	note G#, 1
-	note __, 5
-	note G#, 0
-	note __, 0
-	note G#, 0
-	note __, 0
-	note G#, 1
 	note __, 1
 	note G#, 1
 	note __, 1
+	note G#, 2
+	note __, 2
+	note G#, 2
+	note __, 2
 	octave 3
-	note G#, 1
-	note __, 1
+	note G#, 2
+	note __, 2
 	octave 2
-	note G#, 1
-	note __, 1
+	note G#, 2
+	note __, 2
 	octave 3
+	note C#, 2
+	note __, 10
 	note C#, 1
-	note __, 9
-	note C#, 0
-	note __, 0
-	note C#, 0
-	note __, 0
-	note C#, 1
 	note __, 1
 	note C#, 1
 	note __, 1
+	note C#, 2
+	note __, 2
+	note C#, 2
+	note __, 2
 	octave 4
-	note F_, 1
-	note __, 1
-	note C#, 3
+	note F_, 2
+	note __, 2
+	note C#, 4
 	octave 3
-	note F#, 7
+	note F#, 8
 	notetype $8, $15
 	octave 2
-	note F#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note F#, 5
-	note __, 5
+	note F#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note F#, 6
+	note __, 6
 	octave 4
-	note C_, 5
+	note C_, 6
 	octave 3
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	note C_, 5
-	note __, 5
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note C_, 6
+	note __, 6
 	notetype $c, $15
 	octave 2
-	note B_, 15
-	note B_, 7
+	note B_, 16
+	note B_, 8
 	octave 3
-	note F#, 3
-	note D#, 0
-	note __, 0
+	note F#, 4
+	note D#, 1
+	note __, 1
 	octave 2
-	note G#, 0
+	note G#, 1
 	octave 3
-	note C_, 0
+	note C_, 1
 	loopchannel 0, Music_Route26_branch_ef18a
 ; ef22f
 
 Music_Route26_branch_ef22f: ; ef22f
 	octave 5
-	note F_, 7
-	note C#, 1
-	note F_, 1
-	note G#, 3
-	note F#, 3
-	note C#, 3
-	note D#, 3
+	note F_, 8
+	note C#, 2
+	note F_, 2
+	note G#, 4
+	note F#, 4
+	note C#, 4
+	note D#, 4
 	endchannel
 
 Music_Route26_Ch4: ; ef238
@@ -559,9 +559,9 @@
 	notetype $c
 
 Music_Route26_branch_ef23c: ; ef23c
-	note B_, 5
-	note D_, 0
-	note D_, 0
+	note B_, 6
+	note D_, 1
+	note D_, 1
 	loopchannel 3, Music_Route26_branch_ef23c
 	callchannel Music_Route26_branch_ef2b0
 
@@ -570,16 +570,16 @@
 	callchannel Music_Route26_branch_ef29a
 	callchannel Music_Route26_branch_ef29a
 	callchannel Music_Route26_branch_ef2a8
-	note D_, 11
-	note D_, 1
-	note D_, 1
+	note D_, 12
+	note D_, 2
+	note D_, 2
 	notetype $8
-	note D_, 1
-	note C#, 1
-	note C#, 1
-	note D_, 1
-	note D_, 1
-	note E_, 1
+	note D_, 2
+	note C#, 2
+	note C#, 2
+	note D_, 2
+	note D_, 2
+	note E_, 2
 	notetype $6
 	callchannel Music_Route26_branch_ef29a
 	callchannel Music_Route26_branch_ef29a
@@ -586,10 +586,10 @@
 	notetype $8
 
 Music_Route26_branch_ef266: ; ef266
-	note D_, 1
-	note D_, 1
-	note D_, 1
-	note B_, 5
+	note D_, 2
+	note D_, 2
+	note D_, 2
+	note B_, 6
 	loopchannel 4, Music_Route26_branch_ef266
 	notetype $6
 	callchannel Music_Route26_branch_ef2a8
@@ -599,83 +599,83 @@
 
 Music_Route26_branch_ef27c: ; ef27c
 	notetype $6
-	note D_, 0
-	note D_, 0
-	note D_, 0
-	note D_, 0
-	note D_, 0
-	note D_, 0
-	note D_, 0
-	note D_, 0
-	notetype $8
 	note D_, 1
 	note D_, 1
 	note D_, 1
-	note B_, 11
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	notetype $8
+	note D_, 2
+	note D_, 2
+	note D_, 2
+	note B_, 12
 	loopchannel 2, Music_Route26_branch_ef27c
 	notetype $c
-	note B_, 15
+	note B_, 16
 	callchannel Music_Route26_branch_ef2b0
 	loopchannel 0, Music_Route26_branch_ef246
 ; ef29a
 
 Music_Route26_branch_ef29a: ; ef29a
-	note E_, 11
-	note D_, 1
-	note D_, 1
-	note D_, 3
-	note D_, 3
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
+	note E_, 12
+	note D_, 2
+	note D_, 2
+	note D_, 4
+	note D_, 4
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
 	endchannel
 ; ef2a8
 
 Music_Route26_branch_ef2a8: ; ef2a8
-	note E_, 11
-	note D_, 1
-	note D_, 1
-	note D_, 3
-	note D_, 3
-	note E_, 3
-	note D_, 3
+	note E_, 12
+	note D_, 2
+	note D_, 2
+	note D_, 4
+	note D_, 4
+	note E_, 4
+	note D_, 4
 	endchannel
 ; ef2b0
 
 Music_Route26_branch_ef2b0: ; ef2b0
 	notetype $6
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
 	notetype $8
-	note D_, 1
-	note D_, 1
-	note E_, 1
+	note D_, 2
+	note D_, 2
+	note E_, 2
 	endchannel
 ; ef2d0
--- a/audio/music/route29.asm
+++ b/audio/music/route29.asm
@@ -14,161 +14,161 @@
 	vibrato $10, $15
 	stereopanning $f
 	notetype $c, $b2
-	note __, 1
+	note __, 2
 
 Music_Route29_branch_f03a5: ; f03a5
-	note __, 1
+	note __, 2
 	octave 4
-	note C_, 1
-	note E_, 1
-	note C_, 3
+	note C_, 2
+	note E_, 2
+	note C_, 4
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G_, 3
-	note A_, 1
-	note F#, 1
-	note C_, 3
+	note G_, 4
+	note A_, 2
+	note F#, 2
+	note C_, 4
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note B_, 1
-	note D_, 3
+	note B_, 2
+	note D_, 4
 	octave 4
-	note C_, 1
-	note E_, 1
-	note C_, 3
+	note C_, 2
+	note E_, 2
+	note C_, 4
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note A_, 3
-	note A_, 1
-	note C_, 1
-	note D_, 1
-	note G_, 1
-	note C_, 1
-	note C_, 3
-	note G_, 1
+	note A_, 4
+	note A_, 2
+	note C_, 2
+	note D_, 2
+	note G_, 2
+	note C_, 2
+	note C_, 4
+	note G_, 2
 	octave 4
-	note C_, 1
-	note E_, 1
-	note C_, 1
+	note C_, 2
+	note E_, 2
+	note C_, 2
 	octave 3
-	note E_, 1
-	note A_, 1
+	note E_, 2
+	note A_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
+	note G_, 2
+	note F_, 1
 	note G_, 1
-	note F_, 0
-	note G_, 0
-	note A_, 1
-	note C_, 1
-	note F#, 1
-	note D_, 1
+	note A_, 2
+	note C_, 2
+	note F#, 2
+	note D_, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note B_, 3
-	note E_, 1
+	note B_, 4
+	note E_, 2
 	octave 4
-	note C_, 1
-	note E_, 1
-	note E_, 1
+	note C_, 2
+	note E_, 2
+	note E_, 2
 	octave 3
-	note E_, 1
-	note G_, 1
+	note E_, 2
+	note G_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
+	note G_, 2
+	note D_, 1
 	note G_, 1
-	note D_, 0
-	note G_, 0
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note B_, 1
-	note G_, 1
-	note E_, 0
-	note F_, 0
-	note G_, 1
-	note G_, 1
-	note F_, 7
+	note B_, 2
+	note G_, 2
+	note E_, 1
+	note F_, 1
+	note G_, 2
+	note G_, 2
+	note F_, 8
 	intensity $b4
-	note A_, 3
+	note A_, 4
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note A_, 9
-	note E_, 3
-	note G_, 1
-	note E_, 1
+	note A_, 10
+	note E_, 4
+	note G_, 2
+	note E_, 2
 	intensity $b2
-	note G_, 5
+	note G_, 6
 	intensity $b4
-	note F_, 3
-	note A_, 1
-	note G_, 1
-	note F_, 1
+	note F_, 4
+	note A_, 2
+	note G_, 2
+	note F_, 2
 	intensity $b2
-	note A_, 3
+	note A_, 4
 	intensity $b4
-	note C#, 3
-	note E_, 1
-	note G_, 3
+	note C#, 4
+	note E_, 2
+	note G_, 4
 	intensity $b3
-	note E_, 7
+	note E_, 8
 	intensity $b4
-	note A_, 1
-	note G_, 1
-	note A_, 1
+	note A_, 2
+	note G_, 2
+	note A_, 2
 	octave 4
-	note C_, 3
+	note C_, 4
 	intensity $b2
 	octave 3
-	note A_, 5
+	note A_, 6
 	intensity $b4
-	note G_, 1
-	note E_, 1
-	note G_, 1
+	note G_, 2
+	note E_, 2
+	note G_, 2
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note G_, 1
+	note G_, 2
 	octave 4
-	note D_, 1
-	note C_, 1
+	note D_, 2
+	note C_, 2
 	octave 3
-	note B_, 1
-	note A_, 1
+	note B_, 2
+	note A_, 2
 	intensity $b2
-	note G_, 3
-	note B_, 3
+	note G_, 4
+	note B_, 4
 	intensity $b4
-	note G_, 1
-	note E_, 1
+	note G_, 2
+	note E_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note E_, 3
-	note E_, 1
+	note E_, 4
+	note E_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note E_, 1
-	note G_, 3
+	note E_, 2
+	note G_, 4
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	intensity $b2
-	note C_, 1
-	note G_, 1
-	note G_, 3
+	note C_, 2
+	note G_, 2
+	note G_, 4
 	loopchannel 0, Music_Route29_branch_f03a5
 
 Music_Route29_Ch2: ; f044d
@@ -176,164 +176,164 @@
 	vibrato $12, $36
 	notetype $c, $c2
 	octave 4
-	note C_, 0
-	note D_, 0
+	note C_, 1
+	note D_, 1
 
 Music_Route29_branch_f0458: ; f0458
 	callchannel Music_Route29_branch_f04de
-	note F_, 0
-	note E_, 0
-	note D_, 1
-	note D_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 2
+	note D_, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note E_, 1
-	note E_, 1
+	note E_, 2
+	note E_, 2
 	octave 4
-	note C_, 0
-	note D_, 0
-	callchannel Music_Route29_branch_f04de
-	note F_, 0
-	note E_, 0
+	note C_, 1
 	note D_, 1
-	note D_, 1
+	callchannel Music_Route29_branch_f04de
+	note F_, 1
+	note E_, 1
+	note D_, 2
+	note D_, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	intensity $c4
 	octave 4
-	note C_, 7
+	note C_, 8
 	octave 3
-	note A_, 1
-	note A_, 1
+	note A_, 2
+	note A_, 2
 	octave 4
-	note C_, 1
-	note C_, 1
-	note F_, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
+	note C_, 2
+	note C_, 2
+	note F_, 2
+	note A_, 2
+	note G_, 2
+	note F_, 2
 	octave 3
-	note G_, 1
-	note G_, 1
+	note G_, 2
+	note G_, 2
 	octave 4
-	note C_, 1
-	note C_, 1
-	note E_, 1
-	note G_, 1
-	note F_, 1
-	note E_, 1
+	note C_, 2
+	note C_, 2
+	note E_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
 	octave 3
-	note F_, 1
-	note F_, 1
-	note A_, 1
-	note A_, 1
+	note F_, 2
+	note F_, 2
+	note A_, 2
+	note A_, 2
 	octave 4
-	note D_, 1
-	note F_, 1
-	note E_, 1
-	note D_, 1
-	note E_, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note C#, 1
+	note D_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note D_, 2
+	note C#, 2
+	note D_, 2
+	note C#, 2
 	octave 3
-	note A#, 1
-	note A_, 1
-	note G_, 1
-	note A_, 1
-	note A_, 1
+	note A#, 2
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	note A_, 2
 	octave 4
-	note C_, 1
-	note C_, 1
-	note F_, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
+	note C_, 2
+	note C_, 2
+	note F_, 2
+	note A_, 2
+	note G_, 2
+	note F_, 2
 	octave 3
-	note G_, 1
-	note G_, 1
+	note G_, 2
+	note G_, 2
 	octave 4
-	note C_, 1
-	note C_, 1
-	note E_, 1
-	note G_, 1
-	note F_, 1
-	note E_, 1
-	note F_, 1
-	note E_, 1
-	note D_, 1
-	note F_, 1
+	note C_, 2
+	note C_, 2
+	note E_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note F_, 2
 	intensity $c2
-	note E_, 3
-	note D_, 3
+	note E_, 4
+	note D_, 4
 	intensity $c4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G_, 1
+	note G_, 2
 	octave 4
-	note E_, 1
+	note E_, 2
 	octave 3
-	note G_, 1
+	note G_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G_, 1
+	note G_, 2
 	octave 4
-	note E_, 1
+	note E_, 2
 	octave 3
-	note G_, 1
+	note G_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G_, 1
+	note G_, 2
 	octave 4
-	note E_, 1
+	note E_, 2
 	octave 3
-	note G_, 1
+	note G_, 2
 	intensity $c2
 	octave 4
-	note C_, 1
-	note C_, 1
-	note C_, 1
+	note C_, 2
+	note C_, 2
+	note C_, 2
 	octave 4
-	note C_, 0
-	note D_, 0
+	note C_, 1
+	note D_, 1
 	loopchannel 0, Music_Route29_branch_f0458
 ; f04de
 
 Music_Route29_branch_f04de: ; f04de
+	note E_, 2
+	note E_, 2
+	note G_, 2
+	note G_, 2
+	note C_, 2
+	note D_, 2
+	note E_, 2
+	note C_, 2
+	note F_, 1
 	note E_, 1
-	note E_, 1
-	note G_, 1
-	note G_, 1
-	note C_, 1
-	note D_, 1
-	note E_, 1
-	note C_, 1
-	note F_, 0
-	note E_, 0
-	note D_, 1
+	note D_, 2
 	octave 3
-	note B_, 1
-	note A_, 1
-	note G_, 1
+	note B_, 2
+	note A_, 2
+	note G_, 2
 	octave 4
-	note A_, 1
-	note G_, 1
-	note C_, 0
-	note D_, 0
-	note E_, 1
-	note E_, 1
-	note G_, 1
-	note G_, 1
+	note A_, 2
+	note G_, 2
 	note C_, 1
 	note D_, 1
-	note E_, 1
-	note C_, 1
+	note E_, 2
+	note E_, 2
+	note G_, 2
+	note G_, 2
+	note C_, 2
+	note D_, 2
+	note E_, 2
+	note C_, 2
 	endchannel
 
 Music_Route29_Ch3: ; f04fb
@@ -340,170 +340,170 @@
 	stereopanning $f0
 	notetype $c, $25
 	vibrato $9, $27
-	note __, 1
+	note __, 2
 
 Music_Route29_branch_f0504: ; f0504
-	note __, 1
+	note __, 2
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 4
-	note C_, 0
-	note __, 0
-	note E_, 0
-	note __, 2
-	note E_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
+	note E_, 1
+	note __, 3
+	note E_, 1
+	note __, 1
 	octave 3
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
 	octave 4
-	note E_, 0
-	note __, 0
+	note E_, 1
+	note __, 1
 	octave 3
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
 	octave 4
-	note C_, 0
-	note __, 2
+	note C_, 1
+	note __, 3
 	octave 3
-	note A_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
 	octave 4
-	note C_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
 	octave 3
-	note B_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
 	octave 4
-	note C_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 4
-	note C_, 0
-	note __, 0
-	note E_, 0
-	note __, 2
-	note C_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
+	note E_, 1
+	note __, 3
+	note C_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
 	octave 3
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
 	octave 4
-	note C_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
 	octave 3
-	note G_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
 	octave 4
-	note E_, 0
-	note __, 0
+	note E_, 1
+	note __, 1
 	octave 3
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 2
-	note E_, 3
-	note G_, 3
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 3
+	note E_, 4
+	note G_, 4
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note G_, 3
-	note F_, 3
-	note F#, 3
+	note G_, 4
+	note F_, 4
+	note F#, 4
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note B_, 3
-	note E_, 3
-	note G_, 3
+	note B_, 4
+	note E_, 4
+	note G_, 4
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note G_, 1
-	note E_, 1
-	note G_, 1
+	note G_, 2
+	note E_, 2
+	note G_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note B_, 1
-	note G_, 1
+	note B_, 2
+	note G_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note C_, 1
-	note D_, 1
-	note C_, 5
+	note C_, 2
+	note D_, 2
+	note C_, 6
 	octave 3
-	note F_, 5
-	note A_, 3
+	note F_, 6
+	note A_, 4
 	octave 4
-	note C_, 5
+	note C_, 6
 	octave 3
-	note G_, 5
-	note A_, 1
-	note A#, 1
-	note B_, 5
-	note G_, 5
+	note G_, 6
+	note A_, 2
+	note A#, 2
+	note B_, 6
+	note G_, 6
 	octave 4
-	note D_, 1
-	note F_, 1
+	note D_, 2
+	note F_, 2
 	octave 3
-	note A_, 5
-	note E_, 1
+	note A_, 6
+	note E_, 2
 	octave 4
-	note E_, 1
-	note C#, 1
+	note E_, 2
+	note C#, 2
 	octave 3
-	note A_, 1
-	note G_, 1
-	note A_, 5
+	note A_, 2
+	note G_, 2
+	note A_, 6
 	octave 4
-	note C_, 5
+	note C_, 6
 	octave 3
-	note A_, 3
-	note G_, 5
+	note A_, 4
+	note G_, 6
 	octave 4
-	note C_, 5
-	note F_, 1
-	note E_, 1
-	note F_, 5
-	note F_, 1
-	note E_, 1
-	note __, 1
-	note D_, 1
+	note C_, 6
+	note F_, 2
+	note E_, 2
+	note F_, 6
+	note F_, 2
+	note E_, 2
+	note __, 2
+	note D_, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note C_, 5
+	note C_, 6
 	octave 3
-	note G_, 5
+	note G_, 6
 	octave 4
-	note C_, 3
-	note E_, 3
-	note C_, 3
+	note C_, 4
+	note E_, 4
+	note C_, 4
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 4
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 2
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 3
 	loopchannel 0, Music_Route29_branch_f0504
 
 Music_Route29_Ch4: ; f05a9
@@ -510,19 +510,19 @@
 	stereopanning $f
 	togglenoise $0
 	notetype $c
-	note __, 1
+	note __, 2
 
 Music_Route29_branch_f05b0: ; f05b0
-	note __, 1
-	note F_, 1
-	note F_, 5
-	note F_, 1
-	note F_, 1
-	note F_, 1
-	note __, 1
-	note F_, 3
-	note F_, 3
-	note F_, 1
-	note F_, 3
+	note __, 2
+	note F_, 2
+	note F_, 6
+	note F_, 2
+	note F_, 2
+	note F_, 2
+	note __, 2
+	note F_, 4
+	note F_, 4
+	note F_, 2
+	note F_, 4
 	loopchannel 0, Music_Route29_branch_f05b0
 ; f05bf
--- a/audio/music/route3.asm
+++ b/audio/music/route3.asm
@@ -11,233 +11,233 @@
 	tempo 160
 	volume $77
 	notetype $c, $91
-	note __, 9
+	note __, 10
 	dutycycle $0
 	vibrato $14, $6
 	octave 3
-	note C#, 0
-	note E_, 0
-	note C#, 0
-	note E_, 0
-	note A_, 0
-	note E_, 0
-	note C#, 0
-	note E_, 0
-	note A_, 0
-	note E_, 0
-	note C#, 0
-	note E_, 0
-	note C#, 0
-	note E_, 0
-	note C#, 0
-	note E_, 0
-	note A_, 0
-	note F_, 0
-	note D_, 0
-	note F_, 0
-	note D_, 0
-	note F_, 0
-	note D_, 0
-	note F_, 0
-	note C#, 0
-	note E_, 0
-	note A_, 0
-	note E_, 0
-	note C#, 0
-	note E_, 0
-	note F#, 0
-	note G#, 0
+	note C#, 1
+	note E_, 1
+	note C#, 1
+	note E_, 1
+	note A_, 1
+	note E_, 1
+	note C#, 1
+	note E_, 1
+	note A_, 1
+	note E_, 1
+	note C#, 1
+	note E_, 1
+	note C#, 1
+	note E_, 1
+	note C#, 1
+	note E_, 1
+	note A_, 1
+	note F_, 1
+	note D_, 1
+	note F_, 1
+	note D_, 1
+	note F_, 1
+	note D_, 1
+	note F_, 1
+	note C#, 1
+	note E_, 1
+	note A_, 1
+	note E_, 1
+	note C#, 1
+	note E_, 1
+	note F#, 1
+	note G#, 1
 
 Music_Route3_branch_ec307: ; ec307
 	callchannel Music_Route3_branch_ec3a4
-	note G_, 0
-	note D_, 0
+	note G_, 1
+	note D_, 1
 	octave 2
-	note B_, 0
+	note B_, 1
 	octave 3
-	note D_, 0
-	note G_, 0
-	note D_, 0
+	note D_, 1
+	note G_, 1
+	note D_, 1
 	octave 2
-	note B_, 0
+	note B_, 1
 	octave 3
-	note D_, 0
-	note G_, 0
-	note D_, 0
+	note D_, 1
+	note G_, 1
+	note D_, 1
 	octave 2
-	note B_, 0
+	note B_, 1
 	octave 3
-	note D_, 0
+	note D_, 1
 	octave 2
-	note B_, 0
+	note B_, 1
 	octave 3
-	note D_, 0
+	note D_, 1
 	octave 2
-	note B_, 0
+	note B_, 1
 	octave 3
-	note D_, 0
-	note A_, 0
-	note E_, 0
-	note C#, 0
-	note E_, 0
-	note A_, 0
-	note E_, 0
-	note C#, 0
-	note E_, 0
-	note A_, 0
-	note E_, 0
-	note C#, 0
-	note E_, 0
-	note C#, 0
-	note E_, 0
-	note C#, 0
-	note E_, 0
-	note A_, 0
-	note E_, 0
-	note C#, 0
-	note E_, 0
-	note A_, 0
-	note E_, 0
-	note C#, 0
-	note E_, 0
-	note A_, 0
-	note E_, 0
-	note C#, 0
-	note E_, 0
-	note C#, 0
-	note E_, 0
-	note C#, 0
-	note E_, 0
-	note G_, 0
-	note D_, 0
+	note D_, 1
+	note A_, 1
+	note E_, 1
+	note C#, 1
+	note E_, 1
+	note A_, 1
+	note E_, 1
+	note C#, 1
+	note E_, 1
+	note A_, 1
+	note E_, 1
+	note C#, 1
+	note E_, 1
+	note C#, 1
+	note E_, 1
+	note C#, 1
+	note E_, 1
+	note A_, 1
+	note E_, 1
+	note C#, 1
+	note E_, 1
+	note A_, 1
+	note E_, 1
+	note C#, 1
+	note E_, 1
+	note A_, 1
+	note E_, 1
+	note C#, 1
+	note E_, 1
+	note C#, 1
+	note E_, 1
+	note C#, 1
+	note E_, 1
+	note G_, 1
+	note D_, 1
 	octave 2
-	note B_, 0
+	note B_, 1
 	octave 3
-	note D_, 0
-	note G_, 0
-	note D_, 0
+	note D_, 1
+	note G_, 1
+	note D_, 1
 	octave 2
-	note B_, 0
+	note B_, 1
 	octave 3
-	note D_, 0
-	note G_, 0
-	note D_, 0
+	note D_, 1
+	note G_, 1
+	note D_, 1
 	octave 2
-	note B_, 0
+	note B_, 1
 	octave 3
-	note D_, 0
+	note D_, 1
 	octave 2
-	note B_, 0
+	note B_, 1
 	octave 3
-	note D_, 0
+	note D_, 1
 	octave 2
-	note B_, 0
+	note B_, 1
 	octave 3
-	note D_, 0
+	note D_, 1
 	intensity $6f
-	note G_, 0
-	note D_, 0
+	note G_, 1
+	note D_, 1
 	intensity $77
 	octave 2
-	note B_, 0
+	note B_, 1
 	octave 3
-	note D_, 0
-	note G_, 0
-	note D_, 0
-	note E_, 0
-	note G#, 0
-	note B_, 3
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note E_, 1
+	note G#, 1
+	note B_, 4
 	intensity $6f
 	octave 3
-	note G#, 1
+	note G#, 2
+	note E_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note E_, 8
+	note D#, 1
 	note E_, 1
+	note G#, 2
+	octave 2
+	note B_, 4
+	octave 3
+	note D_, 2
+	note E_, 2
+	note G#, 2
+	note B_, 2
 	note A_, 1
 	note G#, 1
-	note A_, 1
-	note E_, 7
-	note D#, 0
-	note E_, 0
-	note G#, 1
+	note F_, 3
+	note E_, 3
+	note D_, 2
 	octave 2
-	note B_, 3
+	note A_, 2
 	octave 3
-	note D_, 1
-	note E_, 1
-	note G#, 1
-	note B_, 1
-	note A_, 0
-	note G#, 0
-	note F_, 2
+	note D_, 2
 	note E_, 2
+	note F_, 2
+	intensity $91
+	note F#, 1
 	note D_, 1
 	octave 2
 	note A_, 1
 	octave 3
 	note D_, 1
+	note F#, 1
+	note A_, 1
+	note F#, 1
+	note A_, 1
+	note B_, 1
+	note G#, 1
 	note E_, 1
-	note F_, 1
-	intensity $91
-	note F#, 0
-	note D_, 0
-	octave 2
-	note A_, 0
-	octave 3
-	note D_, 0
-	note F#, 0
-	note A_, 0
-	note F#, 0
-	note A_, 0
-	note B_, 0
-	note G#, 0
-	note E_, 0
-	note G#, 0
-	note E_, 0
-	note G#, 0
-	note B_, 0
+	note G#, 1
+	note E_, 1
+	note G#, 1
+	note B_, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	loopchannel 0, Music_Route3_branch_ec307
 ; ec3a4
 
 Music_Route3_branch_ec3a4: ; ec3a4
 	octave 3
-	note A_, 0
-	note E_, 0
-	note C#, 0
-	note E_, 0
+	note A_, 1
+	note E_, 1
+	note C#, 1
+	note E_, 1
 	loopchannel 3, Music_Route3_branch_ec3a4
-	note C#, 0
-	note E_, 0
-	note C#, 0
-	note E_, 0
+	note C#, 1
+	note E_, 1
+	note C#, 1
+	note E_, 1
 
 Music_Route3_branch_ec3b1: ; ec3b1
-	note A_, 0
-	note E_, 0
-	note C#, 0
-	note E_, 0
+	note A_, 1
+	note E_, 1
+	note C#, 1
+	note E_, 1
 	loopchannel 3, Music_Route3_branch_ec3b1
-	note C#, 0
-	note E_, 0
-	note C#, 0
-	note E_, 0
+	note C#, 1
+	note E_, 1
+	note C#, 1
+	note E_, 1
 
 Music_Route3_branch_ec3bd: ; ec3bd
-	note G_, 0
-	note D_, 0
+	note G_, 1
+	note D_, 1
 	octave 2
-	note B_, 0
+	note B_, 1
 	octave 3
-	note D_, 0
+	note D_, 1
 	loopchannel 3, Music_Route3_branch_ec3bd
 	octave 2
-	note B_, 0
+	note B_, 1
 	octave 3
-	note D_, 0
+	note D_, 1
 	octave 2
-	note B_, 0
+	note B_, 1
 	octave 3
-	note D_, 0
+	note D_, 1
 	endchannel
 
 Music_Route3_Ch2: ; ec3d0
@@ -246,116 +246,116 @@
 	dutycycle $2
 	vibrato $6, $3
 	octave 4
-	note E_, 0
-	note G_, 0
-	note G#, 5
+	note E_, 1
+	note G_, 1
+	note G#, 6
 	intensity $87
-	note F#, 0
-	note G#, 0
-	note A_, 0
-	note __, 6
-	note C#, 3
-	note E_, 3
-	note D_, 3
+	note F#, 1
+	note G#, 1
+	note A_, 1
+	note __, 7
+	note C#, 4
+	note E_, 4
+	note D_, 4
 	octave 3
-	note B_, 3
+	note B_, 4
 	octave 4
-	note C#, 3
+	note C#, 4
 	intensity $a7
 	dutycycle $2
 	octave 3
-	note A_, 0
+	note A_, 1
 	octave 4
-	note C#, 0
-	note E_, 0
-	note G#, 0
+	note C#, 1
+	note E_, 1
+	note G#, 1
 
 Music_Route3_branch_ec3f5: ; ec3f5
 	intensity $7d
 	callchannel Music_Route3_branch_ec443
-	note G_, 0
-	note B_, 9
+	note G_, 1
+	note B_, 10
 	intensity $b7
-	note B_, 5
+	note B_, 6
 	intensity $7d
-	note __, 3
+	note __, 4
 	dutycycle $3
-	note G#, 3
+	note G#, 4
 	callchannel Music_Route3_branch_ec443
-	note B_, 0
+	note B_, 1
 	intensity $7d
 	octave 5
-	note D_, 4
+	note D_, 5
 	intensity $b7
 	octave 5
-	note D_, 4
+	note D_, 5
 	dutycycle $0
 	octave 3
-	note D_, 0
-	note G_, 0
-	note B_, 0
-	note __, 0
-	note G_, 0
-	note B_, 0
+	note D_, 1
+	note G_, 1
+	note B_, 1
+	note __, 1
+	note G_, 1
+	note B_, 1
 	octave 4
-	note D_, 3
+	note D_, 4
 	intensity $8f
 	dutycycle $2
 	octave 4
-	note E_, 1
-	note D_, 1
-	note C#, 1
+	note E_, 2
+	note D_, 2
+	note C#, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note A_, 7
-	note G#, 0
-	note A_, 0
-	note B_, 1
-	note E_, 3
+	note A_, 8
+	note G#, 1
+	note A_, 1
+	note B_, 2
+	note E_, 4
 	octave 4
-	note E_, 7
-	note D_, 0
-	note C#, 0
-	note D_, 2
-	note C#, 2
+	note E_, 8
+	note D_, 1
+	note C#, 1
+	note D_, 3
+	note C#, 3
 	octave 3
-	note A_, 9
+	note A_, 10
 	dutycycle $2
 	octave 4
-	note F#, 5
-	note E_, 0
-	note F#, 0
-	note G#, 5
-	note F#, 0
-	note G#, 0
+	note F#, 6
+	note E_, 1
+	note F#, 1
+	note G#, 6
+	note F#, 1
+	note G#, 1
 	loopchannel 0, Music_Route3_branch_ec3f5
 ; ec443
 
 Music_Route3_branch_ec443: ; ec443
-	note A_, 5
-	note E_, 0
-	note A_, 0
+	note A_, 6
+	note E_, 1
+	note A_, 1
 	octave 5
-	note C#, 6
+	note C#, 7
 	intensity $b7
 	octave 5
-	note C#, 2
+	note C#, 3
 	intensity $7d
 	octave 4
-	note E_, 1
-	note A_, 1
+	note E_, 2
+	note A_, 2
 	octave 5
-	note E_, 1
-	note D_, 1
-	note C#, 1
+	note E_, 2
+	note D_, 2
+	note C#, 2
 	octave 4
-	note B_, 1
-	note A_, 1
-	note G_, 5
-	note D_, 0
+	note B_, 2
+	note A_, 2
+	note G_, 6
+	note D_, 1
 	endchannel
 
 Music_Route3_Ch3: ; ec45b
@@ -363,29 +363,29 @@
 	vibrato $6, $3
 	notetype $c, $13
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note D_, 0
-	note E_, 5
-	note D_, 0
+	note D_, 1
+	note E_, 6
+	note D_, 1
 	octave 3
-	note B_, 0
+	note B_, 1
 	intensity $14
 	octave 3
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
 	octave 2
+	note A_, 2
+	note __, 2
 	note A_, 1
+	note A_, 1
+	note A_, 1
 	note __, 1
-	note A_, 0
-	note A_, 0
-	note A_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note G#, 1
+	note A_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note G#, 2
 	callchannel Music_Route3_branch_ec4bd
 
 Music_Route3_branch_ec47f: ; ec47f
@@ -396,119 +396,119 @@
 	callchannel Music_Route3_branch_ec4bd
 	callchannel Music_Route3_branch_ec4bd
 	callchannel Music_Route3_branch_ec4ce
-	note A_, 1
+	note A_, 2
 	octave 3
-	note C#, 1
-	note E_, 1
-	note A_, 5
-	note G#, 1
-	note F#, 1
-	note E_, 1
-	note D_, 1
+	note C#, 2
+	note E_, 2
+	note A_, 6
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
 	octave 2
-	note B_, 1
-	note G#, 1
-	note E_, 0
-	note __, 0
+	note B_, 2
+	note G#, 2
 	note E_, 1
-	note B_, 1
+	note __, 1
+	note E_, 2
+	note B_, 2
 	octave 3
-	note E_, 1
-	note F_, 5
-	note E_, 1
-	note D_, 1
+	note E_, 2
+	note F_, 6
+	note E_, 2
+	note D_, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note C_, 1
-	note C#, 1
-	note D_, 0
-	note __, 0
+	note C_, 2
+	note C#, 2
 	note D_, 1
 	note __, 1
-	note D_, 0
-	note D_, 0
-	note E_, 0
-	note __, 0
+	note D_, 2
+	note __, 2
+	note D_, 1
+	note D_, 1
 	note E_, 1
 	note __, 1
-	note F#, 0
-	note G#, 0
+	note E_, 2
+	note __, 2
+	note F#, 1
+	note G#, 1
 	loopchannel 0, Music_Route3_branch_ec47f
 ; ec4bd
 
 Music_Route3_branch_ec4bd: ; ec4bd
 	octave 3
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
 	octave 2
+	note A_, 2
+	note __, 2
 	note A_, 1
+	note A_, 1
+	note A_, 1
 	note __, 1
-	note A_, 0
-	note A_, 0
-	note A_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	octave 3
 	note A_, 1
+	note __, 1
+	octave 3
+	note A_, 2
 	octave 2
-	note G#, 1
+	note G#, 2
 	endchannel
 ; ec4ce
 
 Music_Route3_branch_ec4ce: ; ec4ce
 	octave 3
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 2
+	note A_, 2
+	note __, 2
 	note A_, 1
+	note A_, 1
+	note A_, 1
 	note __, 1
-	note A_, 0
-	note A_, 0
-	note A_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
 	octave 3
-	note D_, 1
+	note D_, 2
+	note G_, 2
 	note G_, 1
-	note G_, 0
-	note __, 0
+	note __, 1
 	octave 2
+	note G_, 2
+	note __, 2
 	note G_, 1
+	note G_, 1
+	note E_, 1
 	note __, 1
-	note G_, 0
-	note G_, 0
-	note E_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note G#, 1
-	note B_, 1
+	note E_, 1
+	note __, 1
+	note G#, 2
+	note B_, 2
 	endchannel
 
 Music_Route3_Ch4: ; ec4eb
 	togglenoise $4
 	notetype $c
-	note __, 9
+	note __, 10
 
 Music_Route3_branch_ec4f0: ; ec4f0
 	notetype $c
+	note D_, 2
+	note D_, 4
 	note D_, 1
-	note D_, 3
-	note D_, 0
-	note D_, 0
 	note D_, 1
-	note D_, 1
+	note D_, 2
+	note D_, 2
 	notetype $6
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
 	loopchannel 0, Music_Route3_branch_ec4f0
 ; ec506
--- a/audio/music/route30.asm
+++ b/audio/music/route30.asm
@@ -15,175 +15,175 @@
 	stereopanning $f0
 	notetype $c, $b2
 	octave 3
-	note D_, 5
-	note D_, 0
-	note D_, 0
+	note D_, 6
 	note D_, 1
 	note D_, 1
-	note D_, 3
-	note D_, 5
-	note D_, 0
-	note D_, 0
+	note D_, 2
+	note D_, 2
+	note D_, 4
+	note D_, 6
 	note D_, 1
 	note D_, 1
+	note D_, 2
+	note D_, 2
 	intensity $4e
-	note C_, 3
+	note C_, 4
 
 Music_Route30_branch_efc2e: ; efc2e
 	intensity $b6
-	note D_, 5
+	note D_, 6
 	intensity $b4
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note F_, 1
-	note E_, 1
-	note D_, 1
-	note E_, 1
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
 	intensity $b6
-	note F_, 5
+	note F_, 6
 	intensity $b4
-	note C_, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
-	note C_, 1
-	note D_, 1
-	note G_, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
-	note E_, 1
-	note D_, 1
-	note E_, 1
-	note B_, 0
+	note C_, 2
+	note A_, 2
+	note G_, 2
+	note F_, 2
+	note C_, 2
+	note D_, 2
+	note G_, 2
+	note A_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note B_, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	intensity $b7
 	octave 3
-	note B_, 11
+	note B_, 12
 	intensity $b5
-	note F_, 5
-	note C_, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
-	note C_, 1
+	note F_, 6
+	note C_, 2
+	note A_, 2
+	note G_, 2
+	note F_, 2
+	note C_, 2
 	octave 4
-	note D_, 1
-	note C_, 1
+	note D_, 2
+	note C_, 2
 	octave 3
-	note B_, 1
-	note A_, 1
+	note B_, 2
+	note A_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note B_, 1
-	note A_, 1
-	note G_, 1
-	note D_, 0
-	note E_, 0
-	note D_, 0
-	note E_, 0
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note D_, 1
+	note E_, 1
+	note D_, 1
+	note E_, 1
 	intensity $b6
-	note D_, 3
-	note G_, 3
-	note D_, 3
+	note D_, 4
+	note G_, 4
+	note D_, 4
 	intensity $b3
 	octave 2
-	note B_, 0
+	note B_, 1
 	octave 3
-	note C_, 0
+	note C_, 1
 	octave 2
-	note B_, 0
+	note B_, 1
 	octave 3
-	note C_, 0
+	note C_, 1
 	intensity $b6
 	octave 2
-	note B_, 3
+	note B_, 4
 	octave 3
-	note D_, 3
+	note D_, 4
 	octave 2
-	note B_, 3
+	note B_, 4
 	intensity $b4
 	octave 3
-	note F_, 1
-	note E_, 1
-	note D_, 1
-	note C_, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
-	note E_, 1
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note A_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
 	intensity $b6
-	note A_, 3
-	note B_, 3
+	note A_, 4
+	note B_, 4
 	octave 4
-	note C_, 3
-	note E_, 3
-	note D_, 1
+	note C_, 4
+	note E_, 4
+	note D_, 2
 	octave 3
-	note G_, 3
-	note A_, 3
-	note B_, 3
+	note G_, 4
+	note A_, 4
+	note B_, 4
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G_, 1
+	note G_, 2
 	intensity $b7
-	note D_, 13
+	note D_, 14
 	intensity $b6
-	note F_, 1
-	note E_, 1
-	note D_, 1
-	note C_, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
-	note G_, 1
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note A_, 2
+	note G_, 2
+	note F_, 2
+	note G_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	note B_, 2
+	note A_, 2
+	note B_, 2
 	octave 4
-	note C_, 1
-	note E_, 1
-	note F_, 1
-	note A_, 1
+	note C_, 2
+	note E_, 2
+	note F_, 2
+	note A_, 2
 	octave 3
-	note G_, 1
+	note G_, 2
 	octave 4
-	note C_, 1
-	note D_, 1
+	note C_, 2
+	note D_, 2
 	octave 3
-	note G_, 1
+	note G_, 2
 	octave 4
-	note C_, 1
-	note D_, 1
+	note C_, 2
+	note D_, 2
 	octave 3
-	note G_, 1
+	note G_, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	intensity $b5
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note D_, 3
+	note D_, 4
 	octave 3
-	note G_, 1
-	note B_, 1
+	note G_, 2
+	note B_, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	loopchannel 0, Music_Route30_branch_efc2e
 
 Music_Route30_Ch2: ; efcda
@@ -192,392 +192,392 @@
 	stereopanning $f
 	notetype $c, $c2
 	octave 3
-	note G_, 5
-	note G_, 0
-	note G_, 0
+	note G_, 6
 	note G_, 1
 	note G_, 1
-	note G_, 3
-	note G_, 5
-	note G_, 0
-	note G_, 0
+	note G_, 2
+	note G_, 2
+	note G_, 4
+	note G_, 6
 	note G_, 1
 	note G_, 1
+	note G_, 2
+	note G_, 2
 	intensity $c4
-	note D_, 0
-	note E_, 0
-	note F_, 0
-	note F#, 0
+	note D_, 1
+	note E_, 1
+	note F_, 1
+	note F#, 1
 
 Music_Route30_branch_efcf6: ; efcf6
 	intensity $c7
-	note G_, 9
+	note G_, 10
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note B_, 1
-	note G_, 1
+	note B_, 2
+	note G_, 2
 	octave 4
-	note F_, 9
+	note F_, 10
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note D_, 1
 	note E_, 1
 	note D_, 1
-	note C_, 1
-	note D_, 0
-	note E_, 0
-	note D_, 0
-	note E_, 0
+	note E_, 1
 	intensity $b0
-	note D_, 3
+	note D_, 4
 	intensity $b7
-	note D_, 7
+	note D_, 8
 	intensity $3f
-	note D_, 7
+	note D_, 8
 	intensity $b7
-	note D_, 7
+	note D_, 8
 	intensity $c7
-	note C_, 9
-	note C_, 1
+	note C_, 10
+	note C_, 2
 	octave 3
-	note A_, 1
-	note F_, 1
+	note A_, 2
+	note F_, 2
 	octave 4
-	note F_, 9
-	note E_, 1
-	note D_, 1
-	note C_, 1
+	note F_, 10
+	note E_, 2
+	note D_, 2
+	note C_, 2
 	octave 3
-	note B_, 5
-	note G_, 1
+	note B_, 6
+	note G_, 2
 	octave 4
-	note D_, 7
+	note D_, 8
 	octave 3
-	note G_, 5
-	note D_, 1
-	note B_, 7
-	note C_, 1
-	note A_, 3
-	note B_, 3
+	note G_, 6
+	note D_, 2
+	note B_, 8
+	note C_, 2
+	note A_, 4
+	note B_, 4
 	octave 4
-	note C_, 3
-	note D_, 1
-	note F_, 7
-	note A_, 7
-	note G_, 1
+	note C_, 4
+	note D_, 2
+	note F_, 8
+	note A_, 8
+	note G_, 2
 	intensity $b0
-	note D_, 3
+	note D_, 4
 	intensity $b7
-	note D_, 9
+	note D_, 10
 	intensity $c7
-	note C_, 3
+	note C_, 4
 	octave 3
-	note B_, 3
-	note A_, 3
-	note G_, 3
-	note A_, 3
-	note B_, 3
+	note B_, 4
+	note A_, 4
+	note G_, 4
+	note A_, 4
+	note B_, 4
 	octave 4
-	note C_, 3
-	note D_, 3
-	note F_, 7
+	note C_, 4
+	note D_, 4
+	note F_, 8
 	octave 5
-	note C_, 7
+	note C_, 8
 	octave 4
-	note B_, 1
+	note B_, 2
 	intensity $b0
-	note G_, 5
+	note G_, 6
 	intensity $b7
-	note G_, 7
+	note G_, 8
 	intensity $c7
-	note B_, 1
+	note B_, 2
 	intensity $b0
-	note G_, 3
+	note G_, 4
 	intensity $b7
-	note G_, 7
+	note G_, 8
 	intensity $a7
 	octave 3
-	note F#, 1
+	note F#, 2
 	loopchannel 0, Music_Route30_branch_efcf6
 
 Music_Route30_Ch3: ; efd5f
 	notetype $c, $27
 	octave 2
-	note G_, 0
-	note __, 4
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 2
-	note G_, 0
-	note __, 4
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 5
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 3
+	note G_, 1
+	note __, 5
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
 
 Music_Route30_branch_efd79: ; efd79
-	note G_, 0
-	note __, 0
-	note B_, 1
+	note G_, 1
 	note __, 1
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
+	note B_, 2
+	note __, 2
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note F_, 1
+	note __, 1
 	octave 3
-	note D_, 1
-	note A_, 1
+	note D_, 2
+	note A_, 2
 	octave 2
-	note F_, 0
-	note F_, 0
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note F_, 1
+	note F_, 1
+	note __, 1
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note F_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note B_, 1
+	note F_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note B_, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note __, 1
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
 	octave 3
-	note E_, 1
-	note D_, 1
+	note E_, 2
+	note D_, 2
 	octave 2
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note F_, 1
+	note __, 1
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note A_, 1
-	note F_, 0
-	note F_, 0
-	note F_, 0
-	note __, 0
+	note A_, 2
+	note F_, 1
+	note F_, 1
+	note F_, 1
+	note __, 1
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note F_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
-	note F_, 0
-	note __, 0
-	octave 3
-	note C_, 1
 	note F_, 1
-	octave 2
-	note F_, 0
-	note F_, 0
-	note F_, 0
-	note __, 0
+	note __, 1
+	note F_, 1
+	note __, 1
+	note F_, 1
+	note __, 1
 	octave 3
-	note E_, 1
+	note C_, 2
+	note F_, 2
 	octave 2
 	note F_, 1
-	note F#, 1
-	note G_, 0
-	note __, 0
-	note B_, 1
+	note F_, 1
+	note F_, 1
+	note __, 1
 	octave 3
+	note E_, 2
+	octave 2
+	note F_, 2
+	note F#, 2
 	note G_, 1
+	note __, 1
+	note B_, 2
+	octave 3
+	note G_, 2
 	octave 2
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note __, 0
-	note B_, 1
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note __, 1
+	note B_, 2
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 2
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note __, 0
-	octave 3
 	note G_, 1
-	octave 2
 	note G_, 1
-	note G#, 1
-	note A_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 3
-	note C_, 1
+	note G_, 2
 	octave 2
-	note B_, 1
-	note A_, 0
-	note A_, 0
-	note A_, 0
-	note __, 0
+	note G_, 2
+	note G#, 2
+	note A_, 1
+	note __, 1
 	octave 3
-	note D_, 1
+	note C_, 2
 	octave 2
-	note A_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	octave 3
-	note C_, 0
-	note __, 0
-	note F_, 1
-	note E_, 1
-	note C_, 0
-	note C_, 0
-	note C_, 0
-	note __, 0
+	note B_, 2
 	note A_, 1
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
-	octave 2
-	note B_, 0
-	note __, 0
+	note A_, 1
+	note A_, 1
+	note __, 1
 	octave 3
-	note E_, 1
-	note D_, 1
+	note D_, 2
 	octave 2
-	note B_, 0
-	note B_, 0
-	note B_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note B_, 1
 	note A_, 1
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note __, 0
+	note __, 1
 	note B_, 1
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note __, 1
 	octave 3
 	note C_, 1
+	note __, 1
+	note F_, 2
+	note E_, 2
+	note C_, 1
+	note C_, 1
+	note C_, 1
+	note __, 1
+	note A_, 2
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
 	octave 2
 	note B_, 1
-	note A_, 0
-	note A_, 0
-	note A_, 0
-	note __, 0
+	note __, 1
 	octave 3
-	note D_, 1
+	note E_, 2
+	note D_, 2
 	octave 2
-	note A_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note B_, 1
+	note B_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note B_, 2
+	note A_, 2
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note __, 1
+	note B_, 2
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
 	octave 3
-	note C_, 0
-	note __, 0
-	note F_, 1
-	note E_, 1
-	note C_, 0
-	note C_, 0
-	note C_, 0
-	note __, 0
+	note C_, 2
+	octave 2
+	note B_, 2
 	note A_, 1
-	note C_, 0
-	note __, 0
-	note C_, 0
-	note __, 0
+	note A_, 1
+	note A_, 1
+	note __, 1
+	octave 3
+	note D_, 2
 	octave 2
-	note G_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
 	octave 3
 	note C_, 1
-	note D_, 1
+	note __, 1
+	note F_, 2
+	note E_, 2
+	note C_, 1
+	note C_, 1
+	note C_, 1
+	note __, 1
+	note A_, 2
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
 	octave 2
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 3
-	note E_, 1
-	note D_, 1
+	note C_, 2
+	note D_, 2
 	octave 2
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
 	octave 3
-	note D_, 1
+	note E_, 2
+	note D_, 2
 	octave 2
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note __, 1
+	octave 3
+	note D_, 2
+	octave 2
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
 	loopchannel 0, Music_Route30_branch_efd79
 
 Music_Route30_Ch4: ; efe7a
@@ -607,75 +607,75 @@
 ; efeb8
 
 Music_Route30_branch_efeb8: ; efeb8
+	note D_, 2
+	note F#, 2
+	note F#, 2
 	note D_, 1
-	note F#, 1
-	note F#, 1
-	note D_, 0
-	note D_, 0
 	note D_, 1
-	note D_, 1
-	note D_, 3
+	note D_, 2
+	note D_, 2
+	note D_, 4
 	endchannel
 ; efec1
 
 Music_Route30_branch_efec1: ; efec1
+	note D_, 2
+	note F#, 2
+	note F#, 2
 	note D_, 1
-	note F#, 1
-	note F#, 1
-	note D_, 0
-	note D_, 0
 	note D_, 1
+	note D_, 2
+	note D_, 2
 	note D_, 1
-	note D_, 0
-	note D_, 0
-	note D_, 0
-	note D_, 0
+	note D_, 1
+	note D_, 1
+	note D_, 1
 	endchannel
 ; efecd
 
 Music_Route30_branch_efecd: ; efecd
+	note D_, 2
+	note F#, 2
+	note F#, 2
 	note D_, 1
-	note F#, 1
-	note F#, 1
-	note D_, 0
-	note D_, 0
 	note D_, 1
-	note D_, 1
-	note D_, 1
-	note D_, 1
+	note D_, 2
+	note D_, 2
+	note D_, 2
+	note D_, 2
 	endchannel
 ; efed7
 
 Music_Route30_branch_efed7: ; efed7
+	note D_, 2
+	note F#, 2
+	note F#, 2
 	note D_, 1
-	note F#, 1
-	note F#, 1
-	note D_, 0
-	note D_, 0
 	note D_, 1
-	note F#, 1
-	note D_, 1
-	note D_, 1
+	note D_, 2
+	note F#, 2
+	note D_, 2
+	note D_, 2
 	endchannel
 ; efee1
 
 Music_Route30_branch_efee1: ; efee1
+	note D_, 2
+	note F#, 2
+	note F#, 2
 	note D_, 1
-	note F#, 1
-	note F#, 1
-	note D_, 0
-	note D_, 0
 	note D_, 1
-	note D_, 1
+	note D_, 2
+	note D_, 2
 	notetype $6
-	note D_, 0
-	note D_, 0
-	note D_, 0
-	note D_, 0
-	note D_, 0
-	note D_, 0
-	note D_, 0
-	note D_, 0
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
 	notetype $c
 	endchannel
 ; efef5
--- a/audio/music/route36.asm
+++ b/audio/music/route36.asm
@@ -15,155 +15,155 @@
 	stereopanning $f
 	notetype $c, $b3
 	octave 3
-	note C_, 3
-	note C_, 5
-	note F_, 0
-	note E_, 0
+	note C_, 4
+	note C_, 6
+	note F_, 1
+	note E_, 1
 	intensity $b5
-	note F_, 7
+	note F_, 8
 	intensity $b3
-	note F_, 5
-	note A#, 0
-	note A_, 0
+	note F_, 6
+	note A#, 1
+	note A_, 1
 	intensity $5d
-	note A#, 3
+	note A#, 4
 
 Music_Route36_branch_e9517: ; e9517
 	intensity $b5
-	note F_, 3
-	note A_, 1
-	note G_, 1
-	note F_, 1
-	note E_, 1
-	note F_, 1
-	note A_, 1
-	note D#, 1
-	note A#, 3
-	note A_, 3
-	note G_, 1
-	note A#, 3
-	note F_, 3
-	note A_, 1
-	note G_, 1
-	note F_, 1
-	note E_, 1
-	note F_, 1
-	note A_, 1
-	note G_, 1
-	note A#, 3
-	note A_, 3
+	note F_, 4
+	note A_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note F_, 2
+	note A_, 2
+	note D#, 2
+	note A#, 4
+	note A_, 4
+	note G_, 2
+	note A#, 4
+	note F_, 4
+	note A_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note F_, 2
+	note A_, 2
+	note G_, 2
+	note A#, 4
+	note A_, 4
 	octave 4
-	note D#, 3
+	note D#, 4
 	octave 3
-	note A#, 1
+	note A#, 2
 	intensity $b6
 	octave 4
-	note F_, 9
+	note F_, 10
 	intensity $b5
-	note C_, 1
-	note F_, 1
-	note C_, 1
+	note C_, 2
+	note F_, 2
+	note C_, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note D#, 3
-	note D_, 3
-	note C_, 1
+	note D#, 4
+	note D_, 4
+	note C_, 2
 	octave 3
-	note A#, 3
+	note A#, 4
 	intensity $b4
-	note A_, 1
+	note A_, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note F#, 1
-	note A_, 1
+	note F#, 2
+	note A_, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note F#, 1
-	note A_, 1
+	note F#, 2
+	note A_, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	intensity $a4
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note D_, 1
-	note F#, 1
+	note D_, 2
+	note F#, 2
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note D_, 1
-	note F#, 1
+	note D_, 2
+	note F#, 2
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	stereopanning $f0
 	intensity $95
 	octave 3
-	note D_, 5
+	note D_, 6
 	octave 2
-	note A_, 5
+	note A_, 6
 	octave 3
-	note D_, 3
+	note D_, 4
 	octave 2
-	note A_, 5
+	note A_, 6
 	octave 3
-	note D_, 5
-	note E_, 3
+	note D_, 6
+	note E_, 4
 	intensity $b5
-	note D_, 5
-	note A_, 5
-	note G_, 3
+	note D_, 6
+	note A_, 6
+	note G_, 4
 	intensity $a5
 	octave 2
-	note A_, 5
+	note A_, 6
 	octave 3
-	note F#, 5
-	note E_, 3
-	note D_, 5
+	note F#, 6
+	note E_, 4
+	note D_, 6
 	octave 2
-	note A_, 5
+	note A_, 6
 	octave 3
-	note D_, 3
+	note D_, 4
 	intensity $b5
-	note F#, 5
-	note E_, 5
-	note C#, 3
-	note D_, 5
-	note A_, 5
-	note G_, 3
+	note F#, 6
+	note E_, 6
+	note C#, 4
+	note D_, 6
+	note A_, 6
+	note G_, 4
 	octave 2
-	note A_, 5
+	note A_, 6
 	octave 3
-	note F#, 5
-	note D_, 3
-	note C_, 5
-	note G_, 5
-	note C_, 1
-	note E_, 1
+	note F#, 6
+	note D_, 4
+	note C_, 6
+	note G_, 6
+	note C_, 2
+	note E_, 2
 	intensity $b7
-	note C_, 5
-	note G_, 3
-	note D_, 1
-	note E_, 1
-	note G_, 1
-	note A_, 1
-	note G#, 1
-	note A_, 1
+	note C_, 6
+	note G_, 4
+	note D_, 2
+	note E_, 2
+	note G_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
 	octave 4
-	note D_, 5
-	note C_, 1
+	note D_, 6
+	note C_, 2
 	octave 3
-	note B_, 1
-	note A_, 5
-	note D_, 5
+	note B_, 2
+	note A_, 6
+	note D_, 6
 	stereopanning $f
 	intensity $b5
-	note D#, 1
-	note E_, 1
+	note D#, 2
+	note E_, 2
 	loopchannel 0, Music_Route36_branch_e9517
 
 Music_Route36_Ch2: ; e95af
@@ -172,303 +172,303 @@
 	stereopanning $f0
 	notetype $c, $c2
 	octave 3
+	note F_, 2
+	note C_, 1
 	note F_, 1
-	note C_, 0
-	note F_, 0
 	intensity $c7
-	note A_, 7
-	note C_, 3
+	note A_, 8
+	note C_, 4
 	intensity $c3
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note A_, 0
+	note A_, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	intensity $c7
-	note F_, 7
+	note F_, 8
 	octave 3
-	note G_, 3
+	note G_, 4
 
 Music_Route36_branch_e95ce: ; e95ce
 	intensity $c7
 	octave 4
-	note C_, 9
+	note C_, 10
 	intensity $c4
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note C_, 1
-	note A_, 1
-	note G_, 2
+	note C_, 2
+	note A_, 2
+	note G_, 3
 	intensity $c2
-	note D#, 0
+	note D#, 1
 	intensity $c7
-	note D#, 11
-	note C_, 9
+	note D#, 12
+	note C_, 10
 	intensity $c4
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note C_, 1
-	note F_, 1
+	note C_, 2
+	note F_, 2
 	intensity $c2
+	note D#, 2
 	note D#, 1
-	note D#, 0
-	note F_, 0
+	note F_, 1
 	intensity $c7
-	note G_, 11
-	note A_, 9
+	note G_, 12
+	note A_, 10
 	intensity $c4
-	note F_, 1
-	note A_, 1
+	note F_, 2
+	note A_, 2
 	octave 5
-	note C_, 1
+	note C_, 2
 	octave 4
-	note A#, 2
-	note A_, 0
-	intensity $c7
-	note G_, 7
 	note A#, 3
+	note A_, 1
+	intensity $c7
+	note G_, 8
+	note A#, 4
 	intensity $b0
-	note A_, 15
+	note A_, 16
 	intensity $b7
-	note A_, 15
+	note A_, 16
 	stereopanning $f
 	intensity $a4
 	octave 3
-	note A_, 5
-	note G_, 5
-	note F#, 3
-	note E_, 5
-	note F#, 5
-	note G_, 3
+	note A_, 6
+	note G_, 6
+	note F#, 4
+	note E_, 6
+	note F#, 6
+	note G_, 4
 	intensity $b3
+	note A_, 2
+	note F#, 1
 	note A_, 1
-	note F#, 0
-	note A_, 0
 	intensity $b7
 	octave 4
-	note D_, 11
+	note D_, 12
 	intensity $a4
 	octave 3
+	note F#, 2
+	note D_, 1
 	note F#, 1
-	note D_, 0
-	note F#, 0
 	intensity $a7
-	note A_, 11
+	note A_, 12
 	intensity $c7
-	note A_, 5
-	note G_, 5
-	note F#, 3
-	note B_, 5
-	note A_, 5
-	note G_, 3
+	note A_, 6
+	note G_, 6
+	note F#, 4
+	note B_, 6
+	note A_, 6
+	note G_, 4
 	intensity $c3
+	note A_, 2
+	note F#, 1
 	note A_, 1
-	note F#, 0
-	note A_, 0
 	intensity $c7
 	octave 4
-	note D_, 11
+	note D_, 12
 	intensity $c3
 	octave 3
+	note F#, 2
+	note D_, 1
 	note F#, 1
-	note D_, 0
-	note F#, 0
 	intensity $c7
-	note A_, 11
+	note A_, 12
 	intensity $c2
+	note G_, 2
+	note E_, 1
 	note G_, 1
-	note E_, 0
-	note G_, 0
 	intensity $b0
 	octave 4
-	note C_, 1
+	note C_, 2
 	intensity $b7
-	note C_, 9
+	note C_, 10
 	intensity $c5
 	octave 3
+	note G_, 2
+	note E_, 1
 	note G_, 1
-	note E_, 0
-	note G_, 0
 	intensity $c7
 	octave 4
-	note C_, 7
-	note C#, 3
+	note C_, 8
+	note C#, 4
 	stereopanning $ff
-	note D_, 5
-	note A_, 5
-	note G_, 1
-	note F#, 1
+	note D_, 6
+	note A_, 6
+	note G_, 2
+	note F#, 2
 	intensity $b0
-	note D_, 3
+	note D_, 4
 	intensity $b7
-	note D_, 7
+	note D_, 8
 	stereopanning $f0
 	intensity $c4
 	octave 3
-	note F#, 0
-	note G_, 0
-	note A_, 0
-	note B_, 0
+	note F#, 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
 	loopchannel 0, Music_Route36_branch_e95ce
 
 Music_Route36_Ch3: ; e966b
 	notetype $c, $25
 	octave 3
-	note F_, 0
-	note __, 2
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 3
+	note F_, 1
+	note __, 1
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note C_, 1
-	note F_, 1
-	note C_, 1
-	note D#, 0
-	note __, 2
-	note D#, 0
-	note __, 0
+	note C_, 2
+	note F_, 2
+	note C_, 2
+	note D#, 1
+	note __, 3
+	note D#, 1
+	note __, 1
 	octave 4
-	note F_, 3
+	note F_, 4
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note D#, 1
-	note E_, 1
+	note D#, 2
+	note E_, 2
 
 Music_Route36_branch_e9684: ; e9684
-	note F_, 3
-	note C_, 1
-	note F_, 3
-	note C_, 1
-	note F_, 1
-	note C_, 1
-	note G_, 3
-	note D#, 1
-	note G_, 3
-	note D#, 1
-	note G_, 1
-	note D#, 1
-	note F_, 3
-	note C_, 1
-	note F_, 3
-	note C_, 1
-	note F_, 1
-	note C_, 1
-	note G_, 3
-	note D#, 1
-	note G_, 3
-	note D#, 1
-	note G_, 1
-	note D#, 1
-	note A_, 3
-	note F_, 1
-	note A_, 3
-	note F_, 1
-	note A_, 1
-	note F_, 1
-	note A#, 3
-	note G_, 1
-	note A#, 3
-	note G_, 1
-	note A#, 1
-	note G_, 1
-	note F#, 3
-	note D_, 1
-	note F#, 3
-	note D_, 1
-	note F#, 1
-	note D_, 1
-	note D_, 3
+	note F_, 4
+	note C_, 2
+	note F_, 4
+	note C_, 2
+	note F_, 2
+	note C_, 2
+	note G_, 4
+	note D#, 2
+	note G_, 4
+	note D#, 2
+	note G_, 2
+	note D#, 2
+	note F_, 4
+	note C_, 2
+	note F_, 4
+	note C_, 2
+	note F_, 2
+	note C_, 2
+	note G_, 4
+	note D#, 2
+	note G_, 4
+	note D#, 2
+	note G_, 2
+	note D#, 2
+	note A_, 4
+	note F_, 2
+	note A_, 4
+	note F_, 2
+	note A_, 2
+	note F_, 2
+	note A#, 4
+	note G_, 2
+	note A#, 4
+	note G_, 2
+	note A#, 2
+	note G_, 2
+	note F#, 4
+	note D_, 2
+	note F#, 4
+	note D_, 2
+	note F#, 2
+	note D_, 2
+	note D_, 4
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note D_, 3
+	note D_, 4
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note F#, 3
-	note D_, 1
-	note F#, 3
-	note D_, 1
-	note F#, 1
-	note D_, 1
-	note G_, 3
-	note E_, 1
-	note G_, 3
-	note E_, 1
-	note G_, 1
-	note E_, 1
-	note F#, 3
-	note D_, 1
-	note F#, 3
-	note D_, 1
-	note F#, 1
-	note D_, 1
-	note F#, 3
-	note D_, 1
-	note F#, 3
-	note D_, 1
-	note E_, 1
-	note A_, 1
-	note F#, 3
-	note D_, 1
-	note F#, 3
-	note D_, 1
-	note F#, 1
-	note D_, 1
-	note G_, 3
-	note E_, 1
-	note G_, 3
-	note E_, 1
-	note G_, 1
-	note E_, 1
-	note F#, 3
-	note D_, 1
-	note F#, 3
-	note D_, 1
-	note F#, 1
-	note D_, 1
-	note F#, 3
-	note D_, 1
-	note F#, 3
-	note D_, 1
-	note F#, 1
-	note D_, 1
-	note G_, 3
-	note C_, 1
-	note G_, 3
-	note C_, 1
-	note G_, 1
-	note C_, 1
-	note G_, 3
-	note C_, 1
-	note G_, 3
-	note C_, 1
-	note E_, 1
-	note G_, 1
-	note A_, 5
+	note F#, 4
+	note D_, 2
+	note F#, 4
+	note D_, 2
+	note F#, 2
+	note D_, 2
+	note G_, 4
+	note E_, 2
+	note G_, 4
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note F#, 4
+	note D_, 2
+	note F#, 4
+	note D_, 2
+	note F#, 2
+	note D_, 2
+	note F#, 4
+	note D_, 2
+	note F#, 4
+	note D_, 2
+	note E_, 2
+	note A_, 2
+	note F#, 4
+	note D_, 2
+	note F#, 4
+	note D_, 2
+	note F#, 2
+	note D_, 2
+	note G_, 4
+	note E_, 2
+	note G_, 4
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note F#, 4
+	note D_, 2
+	note F#, 4
+	note D_, 2
+	note F#, 2
+	note D_, 2
+	note F#, 4
+	note D_, 2
+	note F#, 4
+	note D_, 2
+	note F#, 2
+	note D_, 2
+	note G_, 4
+	note C_, 2
+	note G_, 4
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 4
+	note C_, 2
+	note G_, 4
+	note C_, 2
+	note E_, 2
+	note G_, 2
+	note A_, 6
 	octave 4
-	note F#, 3
+	note F#, 4
 	octave 3
-	note D_, 1
-	note A_, 1
+	note D_, 2
+	note A_, 2
 	octave 4
-	note D_, 1
-	note C_, 2
-	note E_, 0
-	note F#, 5
-	octave 3
-	note D_, 1
-	note D#, 1
+	note D_, 2
+	note C_, 3
 	note E_, 1
+	note F#, 6
+	octave 3
+	note D_, 2
+	note D#, 2
+	note E_, 2
 	loopchannel 0, Music_Route36_branch_e9684
 
 Music_Route36_Ch4: ; e9709
@@ -485,12 +485,12 @@
 	loopchannel 2, Music_Route36_branch_e9713
 
 Music_Route36_branch_e9723: ; e9723
-	note A#, 3
-	note A_, 1
-	note F_, 3
-	note B_, 0
-	note B_, 0
-	note A_, 3
+	note A#, 4
+	note A_, 2
+	note F_, 4
+	note B_, 1
+	note B_, 1
+	note A_, 4
 	loopchannel 11, Music_Route36_branch_e9723
 	callchannel Music_Route36_branch_e9741
 	loopchannel 0, Music_Route36_branch_e9713
@@ -497,35 +497,35 @@
 ; e9734
 
 Music_Route36_branch_e9734: ; e9734
-	note A_, 3
-	note A_, 5
-	note A#, 0
-	note A#, 0
-	note A_, 1
+	note A_, 4
+	note A_, 6
 	note A#, 1
+	note A#, 1
+	note A_, 2
+	note A#, 2
 	endchannel
 ; e973b
 
 Music_Route36_branch_e973b: ; e973b
-	note A_, 3
-	note A_, 5
-	note B_, 0
-	note A#, 0
-	note A_, 3
+	note A_, 4
+	note A_, 6
+	note B_, 1
+	note A#, 1
+	note A_, 4
 	endchannel
 ; e9741
 
 Music_Route36_branch_e9741: ; e9741
-	note A_, 3
-	note A_, 5
-	note A#, 0
-	note A#, 0
-	note A_, 1
+	note A_, 4
+	note A_, 6
+	note A#, 1
+	note A#, 1
+	note A_, 2
 	notetype $6
-	note A#, 0
-	note A#, 0
-	note A_, 0
-	note A_, 0
+	note A#, 1
+	note A#, 1
+	note A_, 1
+	note A_, 1
 	notetype $c
 	endchannel
 ; e974f
--- a/audio/music/route37.asm
+++ b/audio/music/route37.asm
@@ -13,92 +13,92 @@
 	tone $0002
 	vibrato $10, $22
 	notetype $c, $b3
-	note __, 15
-	note __, 15
+	note __, 16
+	note __, 16
 
 Music_Route37_branch_ee969: ; ee969
 	intensity $b3
-	note __, 1
+	note __, 2
 	octave 2
-	note F#, 1
-	note B_, 1
+	note F#, 2
+	note B_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	intensity $b7
-	note D#, 9
+	note D#, 10
 	intensity $b3
-	note E_, 3
-	note D#, 3
-	note C#, 3
+	note E_, 4
+	note D#, 4
+	note C#, 4
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note D#, 2
+	note D#, 3
 	octave 2
-	note B_, 0
+	note B_, 1
 	intensity $b7
-	note F#, 7
-	note B_, 7
+	note F#, 8
+	note B_, 8
 	octave 3
-	note B_, 11
+	note B_, 12
 	intensity $b3
-	note __, 1
+	note __, 2
 	octave 2
-	note F#, 1
-	note B_, 1
+	note F#, 2
+	note B_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	intensity $b7
-	note D#, 9
+	note D#, 10
 	octave 2
-	note A_, 3
+	note A_, 4
 	octave 3
-	note C#, 3
-	note E_, 3
+	note C#, 4
+	note E_, 4
+	note A_, 2
+	note F#, 3
 	note A_, 1
-	note F#, 2
-	note A_, 0
-	note B_, 5
+	note B_, 6
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note D#, 1
-	note F#, 1
-	note B_, 1
-	note A_, 3
-	note F#, 3
-	note E_, 1
-	note D#, 3
+	note D#, 2
+	note F#, 2
+	note B_, 2
+	note A_, 4
+	note F#, 4
+	note E_, 2
+	note D#, 4
 	stereopanning $f
 
 Music_Route37_branch_ee9a5: ; ee9a5
 	callchannel Music_Route37_branch_ee9da
 	octave 3
-	note C#, 3
+	note C#, 4
 	loopchannel 2, Music_Route37_branch_ee9a5
 	callchannel Music_Route37_branch_ee9e9
 	octave 3
-	note F#, 3
+	note F#, 4
 	callchannel Music_Route37_branch_ee9e9
 	octave 3
-	note F#, 3
+	note F#, 4
 	callchannel Music_Route37_branch_ee9da
 	octave 3
-	note E_, 3
+	note E_, 4
 	callchannel Music_Route37_branch_ee9da
 	octave 3
-	note G#, 3
+	note G#, 4
 	callchannel Music_Route37_branch_ee9e9
 	octave 4
-	note D#, 3
+	note D#, 4
 	callchannel Music_Route37_branch_ee9e9
 	octave 3
-	note F_, 3
+	note F_, 4
 	stereopanning $ff
 	callchannel Music_Route37_branch_ee9e9
-	note __, 3
+	note __, 4
 	callchannel Music_Route37_branch_ee9e9
-	note __, 3
+	note __, 4
 	loopchannel 0, Music_Route37_branch_ee969
 ; ee9da
 
@@ -105,15 +105,15 @@
 Music_Route37_branch_ee9da: ; ee9da
 	intensity $c2
 	octave 2
+	note A_, 2
 	note A_, 1
-	note A_, 0
-	note A_, 0
 	note A_, 1
-	note A_, 0
-	note A_, 0
-	note A_, 0
-	note A_, 0
+	note A_, 2
 	note A_, 1
+	note A_, 1
+	note A_, 1
+	note A_, 1
+	note A_, 2
 	intensity $b7
 	endchannel
 ; ee9e9
@@ -121,15 +121,15 @@
 Music_Route37_branch_ee9e9: ; ee9e9
 	intensity $c2
 	octave 2
+	note B_, 2
 	note B_, 1
-	note B_, 0
-	note B_, 0
 	note B_, 1
-	note B_, 0
-	note B_, 0
-	note B_, 0
-	note B_, 0
+	note B_, 2
 	note B_, 1
+	note B_, 1
+	note B_, 1
+	note B_, 1
+	note B_, 2
 	intensity $b7
 	endchannel
 
@@ -138,144 +138,144 @@
 	vibrato $1c, $12
 	notetype $c, $c2
 	octave 2
-	note B_, 1
+	note B_, 2
 	notetype $c, $c1
-	note B_, 0
-	note B_, 0
-	intensity $c2
 	note B_, 1
-	intensity $c1
-	note B_, 0
-	note B_, 0
-	note B_, 0
-	note B_, 0
-	intensity $c2
-	note B_, 5
 	note B_, 1
-	intensity $c1
-	note B_, 0
-	note B_, 0
 	intensity $c2
+	note B_, 2
+	intensity $c1
 	note B_, 1
+	note B_, 1
+	note B_, 1
+	note B_, 1
+	intensity $c2
+	note B_, 6
+	note B_, 2
 	intensity $c1
-	note B_, 0
-	note B_, 0
-	note B_, 0
-	note B_, 0
+	note B_, 1
+	note B_, 1
 	intensity $c2
+	note B_, 2
+	intensity $c1
 	note B_, 1
+	note B_, 1
+	note B_, 1
+	note B_, 1
+	intensity $c2
+	note B_, 2
 
 Music_Route37_branch_eea24: ; eea24
 	callchannel Music_Route37_branch_eeab7
 	intensity $c6
 	octave 4
-	note C#, 3
+	note C#, 4
 	octave 3
-	note B_, 3
-	note A_, 3
-	note E_, 3
+	note B_, 4
+	note A_, 4
+	note E_, 4
 	intensity $b0
-	note F#, 7
+	note F#, 8
 	intensity $b7
-	note F#, 7
+	note F#, 8
 	intensity $c7
-	note D#, 11
+	note D#, 12
 	callchannel Music_Route37_branch_eeab7
 	intensity $c7
 	octave 4
-	note C#, 3
+	note C#, 4
 	octave 3
-	note B_, 3
+	note B_, 4
 	octave 4
-	note C#, 3
-	note E_, 3
+	note C#, 4
+	note E_, 4
 	intensity $b0
-	note D#, 15
+	note D#, 16
 	intensity $b0
-	note D#, 7
+	note D#, 8
 	intensity $b7
-	note D#, 7
+	note D#, 8
 	intensity $c4
-	note __, 3
+	note __, 4
 	octave 3
-	note A_, 2
-	octave 4
-	note E_, 0
 	note A_, 3
-	note G#, 3
+	octave 4
+	note E_, 1
+	note A_, 4
+	note G#, 4
 	intensity $a0
-	note C#, 5
-	note D#, 5
-	note E_, 3
+	note C#, 6
+	note D#, 6
+	note E_, 4
 	intensity $c3
-	note F#, 2
-	note E_, 0
+	note F#, 3
+	note E_, 1
 	intensity $b0
-	note D#, 5
+	note D#, 6
 	intensity $b7
-	note D#, 5
+	note D#, 6
 	intensity $c3
 	octave 3
-	note B_, 2
-	note F#, 0
+	note B_, 3
+	note F#, 1
 	intensity $b0
 	octave 4
-	note D#, 5
+	note D#, 6
 	intensity $b7
 	octave 4
-	note D#, 5
+	note D#, 6
 	intensity $c4
-	note __, 3
+	note __, 4
 	octave 3
-	note A_, 2
-	octave 4
-	note E_, 0
 	note A_, 3
-	note G#, 3
+	octave 4
+	note E_, 1
+	note A_, 4
+	note G#, 4
 	intensity $b0
-	note C#, 5
-	note D#, 5
-	note E_, 3
+	note C#, 6
+	note D#, 6
+	note E_, 4
 	intensity $c3
-	note F#, 2
-	note D#, 0
+	note F#, 3
+	note D#, 1
 	intensity $b0
-	note B_, 5
+	note B_, 6
 	intensity $b7
-	note B_, 5
+	note B_, 6
 	intensity $c3
-	note B_, 2
-	note F#, 0
+	note B_, 3
+	note F#, 1
 	intensity $b0
 	octave 5
-	note D#, 5
+	note D#, 6
 	intensity $b7
 	octave 5
-	note D#, 5
+	note D#, 6
 	intensity $c2
 	octave 3
+	note F#, 2
 	note F#, 1
-	note F#, 0
-	note F#, 0
 	note F#, 1
+	note F#, 2
 	intensity $c1
-	note F#, 0
-	note F#, 0
-	note F#, 0
-	note F#, 0
+	note F#, 1
+	note F#, 1
+	note F#, 1
+	note F#, 1
 	intensity $c2
-	note F#, 5
+	note F#, 6
+	note F#, 2
 	note F#, 1
-	note F#, 0
-	note F#, 0
 	note F#, 1
+	note F#, 2
 	intensity $c1
-	note F#, 0
-	note F#, 0
-	note F#, 0
-	note F#, 0
-	intensity $c2
 	note F#, 1
+	note F#, 1
+	note F#, 1
+	note F#, 1
+	intensity $c2
+	note F#, 2
 	loopchannel 0, Music_Route37_branch_eea24
 ; eeab7
 
@@ -282,15 +282,15 @@
 Music_Route37_branch_eeab7: ; eeab7
 	intensity $c7
 	octave 3
-	note F#, 3
+	note F#, 4
 	intensity $b0
-	note B_, 4
+	note B_, 5
 	intensity $b7
-	note B_, 4
+	note B_, 5
 	intensity $c3
-	note F#, 1
-	note F#, 1
-	note B_, 1
+	note F#, 2
+	note F#, 2
+	note B_, 2
 	endchannel
 
 Music_Route37_Ch3: ; eeac7
@@ -299,81 +299,81 @@
 
 Music_Route37_branch_eeacc: ; eeacc
 	octave 2
-	note F#, 1
-	note __, 5
+	note F#, 2
+	note __, 6
 	loopchannel 4, Music_Route37_branch_eeacc
 
 Music_Route37_branch_eead3: ; eead3
 	callchannel Music_Route37_branch_eeb32
-	note A_, 1
+	note A_, 2
 	octave 3
-	note C#, 1
+	note C#, 2
 	octave 2
-	note G#, 1
-	note B_, 1
-	note F#, 1
-	note A_, 1
-	note F#, 1
-	note E_, 1
+	note G#, 2
+	note B_, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note E_, 2
 
 Music_Route37_branch_eeae0: ; eeae0
-	note D#, 1
-	note F#, 1
+	note D#, 2
+	note F#, 2
 	loopchannel 4, Music_Route37_branch_eeae0
 	callchannel Music_Route37_branch_eeb32
 	callchannel Music_Route37_branch_eeb32
-	note A_, 1
+	note A_, 2
 	octave 3
-	note C#, 1
+	note C#, 2
 	octave 2
-	note G#, 1
-	note B_, 1
-	note F#, 1
-	note A_, 1
+	note G#, 2
+	note B_, 2
+	note F#, 2
+	note A_, 2
 	octave 3
-	note C#, 1
+	note C#, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	callchannel Music_Route37_branch_eeb32
 
 Music_Route37_branch_eeafb: ; eeafb
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note D#, 1
+	note D#, 2
 	loopchannel 4, Music_Route37_branch_eeafb
 
 Music_Route37_branch_eeb03: ; eeb03
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note C#, 1
+	note C#, 2
 	loopchannel 7, Music_Route37_branch_eeb03
-	note E_, 1
-	note C#, 1
+	note E_, 2
+	note C#, 2
 	callchannel Music_Route37_branch_eeb3c
 
 Music_Route37_branch_eeb10: ; eeb10
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note F#, 1
+	note F#, 2
 	loopchannel 4, Music_Route37_branch_eeb10
 
 Music_Route37_branch_eeb18: ; eeb18
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note C#, 1
+	note C#, 2
 	loopchannel 7, Music_Route37_branch_eeb18
-	note E_, 1
-	note C#, 1
+	note E_, 2
+	note C#, 2
 	callchannel Music_Route37_branch_eeb3c
 	callchannel Music_Route37_branch_eeb32
 
 Music_Route37_branch_eeb28: ; eeb28
-	note F#, 1
-	note __, 5
+	note F#, 2
+	note __, 6
 	loopchannel 4, Music_Route37_branch_eeb28
 	loopchannel 0, Music_Route37_branch_eead3
 ; eeb32
@@ -380,34 +380,34 @@
 
 Music_Route37_branch_eeb32: ; eeb32
 	octave 2
-	note F#, 1
-	note B_, 1
-	note F#, 1
-	note B_, 1
-	note F#, 1
-	note B_, 1
-	note F#, 1
-	note B_, 1
+	note F#, 2
+	note B_, 2
+	note F#, 2
+	note B_, 2
+	note F#, 2
+	note B_, 2
+	note F#, 2
+	note B_, 2
 	endchannel
 ; eeb3c
 
 Music_Route37_branch_eeb3c: ; eeb3c
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note D#, 1
+	note D#, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note D#, 1
+	note D#, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note D#, 1
+	note D#, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note D#, 1
+	note D#, 2
 	endchannel
 
 Music_Route37_Ch4: ; eeb4d
@@ -417,32 +417,32 @@
 Music_Route37_branch_eeb51: ; eeb51
 	notetype $c
 	callchannel Music_Route37_branch_eeb6b
-	note D_, 0
-	note D#, 0
-	note D#, 0
-	note D_, 0
+	note D_, 1
+	note D#, 1
+	note D#, 1
+	note D_, 1
 	callchannel Music_Route37_branch_eeb6b
 	notetype $6
-	note D#, 0
-	note D#, 0
-	note D#, 0
-	note D#, 0
-	note D#, 0
-	note D_, 0
-	note D_, 0
-	note D_, 0
+	note D#, 1
+	note D#, 1
+	note D#, 1
+	note D#, 1
+	note D#, 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
 	loopchannel 0, Music_Route37_branch_eeb51
 ; eeb6b
 
 Music_Route37_branch_eeb6b: ; eeb6b
-	note D_, 1
-	note D#, 0
-	note D#, 0
-	note D_, 1
-	note D#, 0
-	note D#, 0
-	note D_, 1
-	note D#, 0
-	note D#, 0
+	note D_, 2
+	note D#, 1
+	note D#, 1
+	note D_, 2
+	note D#, 1
+	note D#, 1
+	note D_, 2
+	note D#, 1
+	note D#, 1
 	endchannel
 ; eeb75
--- a/audio/music/ruinsofalphinterior.asm
+++ b/audio/music/ruinsofalphinterior.asm
@@ -11,7 +11,7 @@
 	dutycycle $0
 	stereopanning $f0
 	notetype $c, $44
-	note __, 0
+	note __, 1
 	loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdc2
 ; ebdb8
 
@@ -23,19 +23,19 @@
 
 Music_RuinsOfAlphInterior_branch_ebdc2: ; ebdc2
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note A#, 3
+	note A#, 4
 	octave 4
-	note C#, 1
-	note D#, 1
-	note C_, 1
+	note C#, 2
+	note D#, 2
+	note C_, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note A#, 3
+	note A#, 4
 	loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdc2
 
 Music_RuinsOfAlphInterior_Ch3: ; ebdd4
@@ -43,10 +43,10 @@
 
 Music_RuinsOfAlphInterior_branch_ebdd7: ; ebdd7
 	octave 2
-	note G#, 1
+	note G#, 2
 	octave 3
-	note C#, 1
-	note E_, 1
-	note __, 9
+	note C#, 2
+	note E_, 2
+	note __, 10
 	loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdd7
 ; ebde1
--- a/audio/music/ruinsofalphradio.asm
+++ b/audio/music/ruinsofalphradio.asm
@@ -17,38 +17,38 @@
 	notetype $6, $71
 	callchannel Music_RuinsOfAlphRadio_branch_eee01
 	notetype $c, $a1
-	note __, 15
-	note __, 15
+	note __, 16
+	note __, 16
 	callchannel Music_RuinsOfAlphRadio_branch_eee08
 	notetype $c, $a1
-	note __, 15
-	note __, 15
+	note __, 16
+	note __, 16
 	callchannel Music_RuinsOfAlphRadio_branch_eee01
 	notetype $c, $a1
-	note __, 15
+	note __, 16
 	loopchannel 0, Music_RuinsOfAlphRadio_branch_eede3
 ; eee01
 
 Music_RuinsOfAlphRadio_branch_eee01: ; eee01
 	octave 4
-	note G_, 0
-	note F#, 0
-	note G_, 0
-	note F#, 0
-	note C_, 7
+	note G_, 1
+	note F#, 1
+	note G_, 1
+	note F#, 1
+	note C_, 8
 	endchannel
 ; eee08
 
 Music_RuinsOfAlphRadio_branch_eee08: ; eee08
 	octave 4
-	note G_, 0
-	note F#, 0
-	note G_, 0
-	note F#, 0
-	note C_, 3
-	note G_, 0
+	note G_, 1
+	note F#, 1
+	note G_, 1
+	note F#, 1
+	note C_, 4
+	note G_, 1
 	octave 5
-	note C_, 7
+	note C_, 8
 	endchannel
 
 Music_RuinsOfAlphRadio_Ch2: ; eee12
@@ -60,12 +60,12 @@
 	notetype $6, $81
 	callchannel Music_RuinsOfAlphRadio_branch_eee01
 	notetype $c, $a1
-	note __, 15
-	note __, 15
+	note __, 16
+	note __, 16
 	notetype $6, $81
 	callchannel Music_RuinsOfAlphRadio_branch_eee08
 	notetype $c, $a1
-	note __, 15
+	note __, 16
 	loopchannel 0, Music_RuinsOfAlphRadio_branch_eee17
 
 Music_RuinsOfAlphRadio_Ch3: ; eee32
@@ -73,9 +73,9 @@
 
 Music_RuinsOfAlphRadio_branch_eee35: ; eee35
 	octave 2
-	note C_, 0
-	note C#, 0
-	note C_, 0
-	note __, 15
+	note C_, 1
+	note C#, 1
+	note C_, 1
+	note __, 16
 	loopchannel 0, Music_RuinsOfAlphRadio_branch_eee35
 ; eee3e
--- a/audio/music/showmearound.asm
+++ b/audio/music/showmearound.asm
@@ -13,28 +13,28 @@
 	dutycycle $2
 	notetype $c, $b1
 	octave 4
-	note B_, 1
-	note A_, 1
-	note G#, 1
-	note A_, 1
-	note G#, 1
-	note F#, 1
-	note E_, 1
-	note D_, 1
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
 	octave 3
-	note B_, 3
-	note G#, 0
-	note B_, 0
+	note B_, 4
+	note G#, 1
+	note B_, 1
 	octave 4
-	note D_, 0
-	note E_, 0
-	note G#, 7
+	note D_, 1
+	note E_, 1
+	note G#, 8
 
 Music_ShowMeAround_branch_edc01: ; edc01
-	note __, 15
-	note __, 15
-	note __, 15
-	note __, 15
+	note __, 16
+	note __, 16
+	note __, 16
+	note __, 16
 	callchannel Music_ShowMeAround_branch_edc98
 	callchannel Music_ShowMeAround_branch_edc15
 	callchannel Music_ShowMeAround_branch_edc98
@@ -43,26 +43,26 @@
 ; edc15
 
 Music_ShowMeAround_branch_edc15: ; edc15
-	note __, 3
+	note __, 4
 	octave 3
-	note C#, 0
+	note C#, 1
+	note __, 5
+	note D_, 4
+	note C_, 1
+	note __, 1
 	note __, 4
-	note D_, 3
-	note C_, 0
-	note __, 0
-	note __, 3
 	octave 2
-	note E_, 0
-	note __, 0
-	note G#, 0
-	note __, 0
+	note E_, 1
+	note __, 1
+	note G#, 1
+	note __, 1
 	octave 4
-	note E_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note E_, 0
-	note __, 2
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 3
 	endchannel
 ; edc2a
 
@@ -71,22 +71,22 @@
 	dutycycle $2
 	notetype $c, $b1
 	octave 5
-	note E_, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note C#, 1
+	note E_, 2
+	note D_, 2
+	note C#, 2
+	note D_, 2
+	note C#, 2
 	octave 4
-	note B_, 1
-	note A_, 1
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note E_, 4
+	note E_, 1
 	note G#, 1
-	note E_, 3
-	note E_, 0
-	note G#, 0
-	note B_, 0
+	note B_, 1
 	octave 5
-	note D_, 0
-	note E_, 7
+	note D_, 1
+	note E_, 8
 	dutycycle $1
 
 Music_ShowMeAround_branch_edc44: ; edc44
@@ -93,97 +93,97 @@
 	callchannel Music_ShowMeAround_branch_edc98
 	callchannel Music_ShowMeAround_branch_edc98
 	callchannel Music_ShowMeAround_branch_edc86
-	note A_, 3
+	note A_, 4
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note C#, 1
-	note E_, 3
-	note D_, 1
-	note C#, 1
+	note C#, 2
+	note E_, 4
+	note D_, 2
+	note C#, 2
 	octave 3
-	note B_, 3
+	note B_, 4
 	callchannel Music_ShowMeAround_branch_edc86
-	note A_, 1
-	note A_, 1
-	note G#, 1
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
-	note A_, 1
-	note A_, 3
+	note A_, 2
+	note A_, 2
+	note G#, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note A_, 2
+	note A_, 4
 	callchannel Music_ShowMeAround_branch_edc8e
-	note A_, 3
+	note A_, 4
 	octave 5
-	note C#, 1
+	note C#, 2
 	octave 4
-	note A_, 1
-	note A_, 3
-	note G#, 0
-	note G_, 0
-	note F#, 0
-	note F_, 0
-	note E_, 0
-	note __, 0
-	note D#, 0
-	note E_, 0
+	note A_, 2
+	note A_, 4
+	note G#, 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note __, 1
+	note D#, 1
+	note E_, 1
 	callchannel Music_ShowMeAround_branch_edc8e
-	note A_, 1
+	note A_, 2
 	octave 5
-	note E_, 1
-	note D_, 1
+	note E_, 2
+	note D_, 2
 	octave 4
-	note B_, 1
-	note A_, 1
-	note G#, 1
-	note A_, 1
-	note A_, 1
-	note A_, 3
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note A_, 2
+	note A_, 4
 	loopchannel 0, Music_ShowMeAround_branch_edc44
 ; edc86
 
 Music_ShowMeAround_branch_edc86: ; edc86
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note C#, 1
-	note E_, 3
-	note D_, 1
-	note F#, 1
+	note C#, 2
+	note E_, 4
+	note D_, 2
+	note F#, 2
 	endchannel
 ; edc8e
 
 Music_ShowMeAround_branch_edc8e: ; edc8e
 	octave 5
-	note C#, 1
+	note C#, 2
 	octave 4
-	note A_, 1
-	note A_, 3
+	note A_, 2
+	note A_, 4
 	octave 5
-	note F#, 1
+	note F#, 2
 	octave 4
-	note A_, 1
+	note A_, 2
 	endchannel
 ; edc98
 
 Music_ShowMeAround_branch_edc98: ; edc98
-	note __, 3
-	octave 3
-	note C#, 0
 	note __, 4
-	note D_, 3
-	note C_, 0
-	note __, 0
+	octave 3
+	note C#, 1
+	note __, 5
+	note D_, 4
+	note C_, 1
 	note __, 1
-	note C#, 0
-	note __, 4
-	octave 2
-	note E_, 0
 	note __, 2
-	note A#, 1
-	note B_, 0
-	note __, 0
+	note C#, 1
+	note __, 5
+	octave 2
+	note E_, 1
+	note __, 3
+	note A#, 2
+	note B_, 1
+	note __, 1
 	endchannel
 
 Music_ShowMeAround_Ch3: ; edca9
@@ -191,42 +191,42 @@
 	vibrato $10, $22
 	notetype $6, $25
 	octave 2
-	note B_, 0
-	note __, 2
+	note B_, 1
+	note __, 3
 	octave 3
-	note D_, 0
-	note __, 2
-	note E_, 0
-	note __, 2
-	note G#, 0
-	note __, 2
-	note B_, 0
-	note __, 2
-	octave 4
-	note D_, 0
-	note __, 2
-	note E_, 0
-	note __, 2
-	note G#, 0
-	note __, 2
 	note D_, 1
-	note __, 5
-	note D_, 1
-	octave 3
-	note B_, 1
+	note __, 3
+	note E_, 1
+	note __, 3
 	note G#, 1
+	note __, 3
 	note B_, 1
+	note __, 3
+	octave 4
+	note D_, 1
+	note __, 3
 	note E_, 1
-	note __, 5
+	note __, 3
+	note G#, 1
+	note __, 3
+	note D_, 2
+	note __, 6
+	note D_, 2
+	octave 3
+	note B_, 2
+	note G#, 2
+	note B_, 2
+	note E_, 2
+	note __, 6
 	intensity $14
 	octave 2
-	note B_, 0
-	note A#, 0
-	note A_, 0
-	note G#, 0
-	note G_, 0
-	note F_, 0
-	note E_, 1
+	note B_, 1
+	note A#, 1
+	note A_, 1
+	note G#, 1
+	note G_, 1
+	note F_, 1
+	note E_, 2
 	intensity $14
 
 Music_ShowMeAround_branch_edcd9: ; edcd9
@@ -241,82 +241,82 @@
 
 Music_ShowMeAround_branch_edcef: ; edcef
 	octave 2
-	note A_, 1
-	note __, 5
+	note A_, 2
+	note __, 6
 	octave 4
-	note E_, 1
-	note __, 1
+	note E_, 2
+	note __, 2
 	octave 2
-	note A_, 1
-	note __, 1
+	note A_, 2
+	note __, 2
 	octave 3
-	note D_, 1
-	note __, 1
+	note D_, 2
+	note __, 2
 	octave 4
-	note F#, 7
-	note D#, 1
-	note __, 1
+	note F#, 8
+	note D#, 2
+	note __, 2
 	octave 2
-	note A_, 1
-	note __, 1
+	note A_, 2
+	note __, 2
 	octave 4
-	note E_, 1
-	note __, 5
+	note E_, 2
+	note __, 6
 	octave 2
-	note A_, 1
-	note __, 1
+	note A_, 2
+	note __, 2
 	octave 4
-	note D_, 1
-	note __, 5
-	note C#, 3
-	note D_, 1
-	note __, 1
+	note D_, 2
+	note __, 6
+	note C#, 4
+	note D_, 2
+	note __, 2
 	endchannel
 ; edd0f
 
 Music_ShowMeAround_branch_edd0f: ; edd0f
 	octave 2
-	note A_, 1
-	note __, 5
+	note A_, 2
+	note __, 6
 	octave 4
-	note E_, 1
-	note __, 1
+	note E_, 2
+	note __, 2
 	octave 2
-	note A_, 1
-	note __, 1
+	note A_, 2
+	note __, 2
 	octave 3
-	note D_, 1
-	note __, 1
+	note D_, 2
+	note __, 2
 	octave 4
-	note F#, 7
-	note D#, 1
-	note __, 1
+	note F#, 8
+	note D#, 2
+	note __, 2
 	octave 2
-	note G#, 1
-	note __, 5
+	note G#, 2
+	note __, 6
 	octave 4
-	note D_, 1
-	note __, 1
+	note D_, 2
+	note __, 2
 	octave 3
-	note B_, 1
-	note __, 1
-	note C#, 1
-	note __, 1
-	note E_, 1
-	note __, 1
+	note B_, 2
+	note __, 2
+	note C#, 2
+	note __, 2
+	note E_, 2
+	note __, 2
 	octave 2
-	note A_, 1
-	note __, 5
+	note A_, 2
+	note __, 6
 	endchannel
 
 Music_ShowMeAround_Ch4: ; edd30
 	togglenoise $3
 	notetype $c
-	note __, 15
-	note __, 7
-	note D_, 1
-	note D#, 1
-	note F#, 3
+	note __, 16
+	note __, 8
+	note D_, 2
+	note D#, 2
+	note F#, 4
 
 Music_ShowMeAround_branch_edd39: ; edd39
 	callchannel Music_ShowMeAround_branch_edd4f
@@ -329,37 +329,37 @@
 ; edd4f
 
 Music_ShowMeAround_branch_edd4f: ; edd4f
-	note D#, 1
-	note F#, 1
-	note D_, 1
-	note G_, 1
-	note G_, 1
-	note F#, 3
-	note D_, 1
-	note D#, 1
-	note F#, 3
-	note D_, 1
-	note G_, 1
-	note G_, 1
-	note D_, 1
-	note D#, 1
+	note D#, 2
+	note F#, 2
+	note D_, 2
+	note G_, 2
+	note G_, 2
+	note F#, 4
+	note D_, 2
+	note D#, 2
+	note F#, 4
+	note D_, 2
+	note G_, 2
+	note G_, 2
+	note D_, 2
+	note D#, 2
 	endchannel
 ; edd5e
 
 Music_ShowMeAround_branch_edd5e: ; edd5e
-	note D#, 1
-	note F#, 1
-	note D_, 1
-	note G_, 1
-	note G_, 1
-	note F#, 3
-	note D_, 1
-	note D#, 1
-	note F#, 3
-	note D_, 1
-	note D_, 1
-	note D_, 1
-	note D_, 1
-	note F#, 1
+	note D#, 2
+	note F#, 2
+	note D_, 2
+	note G_, 2
+	note G_, 2
+	note F#, 4
+	note D_, 2
+	note D#, 2
+	note F#, 4
+	note D_, 2
+	note D_, 2
+	note D_, 2
+	note D_, 2
+	note F#, 2
 	endchannel
 ; edd6d
--- a/audio/music/sprouttower.asm
+++ b/audio/music/sprouttower.asm
@@ -14,54 +14,54 @@
 	vibrato $8, $45
 	stereopanning $f
 	notetype $c, $a3
-	note __, 15
-	note __, 15
+	note __, 16
+	note __, 16
 
 Music_SproutTower_branch_f6994: ; f6994
-	note __, 5
+	note __, 6
 	octave 3
-	note F_, 1
-	note F#, 3
-	note F#, 3
-	note F_, 3
-	note C_, 3
-	note C#, 3
-	note D#, 3
-	note D#, 3
-	note D#, 3
-	note F#, 3
-	note F#, 3
-	note F_, 1
-	note F#, 1
-	note G#, 1
-	note F#, 1
-	note F_, 3
-	note F#, 1
-	note D#, 9
-	note F#, 1
-	note F_, 1
-	note D#, 1
-	note C#, 1
+	note F_, 2
+	note F#, 4
+	note F#, 4
+	note F_, 4
+	note C_, 4
+	note C#, 4
+	note D#, 4
+	note D#, 4
+	note D#, 4
+	note F#, 4
+	note F#, 4
+	note F_, 2
+	note F#, 2
+	note G#, 2
+	note F#, 2
+	note F_, 4
+	note F#, 2
+	note D#, 10
+	note F#, 2
+	note F_, 2
+	note D#, 2
+	note C#, 2
 	intensity $a5
-	note C_, 7
+	note C_, 8
 	intensity $a3
-	note C#, 1
-	note C_, 1
+	note C#, 2
+	note C_, 2
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note C#, 1
+	note C#, 2
 	intensity $a7
-	note C_, 15
+	note C_, 16
 	intensity $a3
-	note F_, 3
-	note F_, 3
-	note F#, 3
-	note F#, 3
-	note F_, 3
-	note F_, 3
-	note D#, 3
-	note D#, 3
+	note F_, 4
+	note F_, 4
+	note F#, 4
+	note F#, 4
+	note F_, 4
+	note F_, 4
+	note D#, 4
+	note D#, 4
 	loopchannel 0, Music_SproutTower_branch_f6994
 
 Music_SproutTower_Ch2: ; f69c8
@@ -70,76 +70,76 @@
 	vibrato $8, $48
 	notetype $c, $b2
 	octave 3
-	note F_, 3
-	note F_, 3
-	note F#, 3
-	note F#, 3
-	note F_, 3
-	note F_, 3
-	note D#, 3
-	note D#, 3
+	note F_, 4
+	note F_, 4
+	note F#, 4
+	note F#, 4
+	note F_, 4
+	note F_, 4
+	note D#, 4
+	note D#, 4
 
 Music_SproutTower_branch_f69dc: ; f69dc
 	intensity $b5
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note A#, 3
+	note A#, 4
 	octave 4
-	note C#, 3
-	note C_, 1
+	note C#, 4
+	note C_, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note A#, 1
-	note F#, 3
+	note A#, 2
+	note F#, 4
 	intensity $b7
-	note F_, 7
+	note F_, 8
 	intensity $b5
-	note F#, 3
-	note A#, 3
+	note F#, 4
+	note A#, 4
 	octave 4
-	note C_, 1
-	note C#, 1
-	note C_, 1
+	note C_, 2
+	note C#, 2
+	note C_, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C_, 1
-	note C#, 1
-	note D#, 1
-	note C#, 1
-	note C_, 7
+	note C_, 2
+	note C#, 2
+	note D#, 2
+	note C#, 2
+	note C_, 8
 	intensity $b5
-	note C#, 1
-	note C_, 1
+	note C#, 2
+	note C_, 2
 	octave 3
-	note A#, 1
-	note F#, 1
+	note A#, 2
+	note F#, 2
 	intensity $b7
-	note A#, 7
+	note A#, 8
 	intensity $b5
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note A#, 1
-	note F#, 1
-	note D#, 1
+	note A#, 2
+	note F#, 2
+	note D#, 2
 	intensity $b7
-	note F_, 7
+	note F_, 8
 	intensity $b3
-	note F_, 3
-	note F_, 3
-	note F#, 3
+	note F_, 4
+	note F_, 4
+	note F#, 4
+	note A#, 2
+	note F_, 1
 	note A#, 1
-	note F_, 0
-	note A#, 0
 	intensity $b7
 	octave 4
-	note C_, 15
-	note __, 15
+	note C_, 16
+	note __, 16
 	loopchannel 0, Music_SproutTower_branch_f69dc
 
 Music_SproutTower_Ch3: ; f6a25
@@ -146,104 +146,104 @@
 	vibrato $14, $e8
 	notetype $c, $14
 	octave 3
-	note F_, 1
-	note __, 1
-	note C_, 1
-	note F_, 1
-	note F#, 1
-	note D#, 1
-	note __, 1
-	note F#, 1
-	note F_, 1
-	note __, 1
-	note C_, 1
-	note F_, 1
-	note F#, 1
-	note D#, 1
-	note __, 1
-	note F#, 1
+	note F_, 2
+	note __, 2
+	note C_, 2
+	note F_, 2
+	note F#, 2
+	note D#, 2
+	note __, 2
+	note F#, 2
+	note F_, 2
+	note __, 2
+	note C_, 2
+	note F_, 2
+	note F#, 2
+	note D#, 2
+	note __, 2
+	note F#, 2
 	stereopanning $f0
 
 Music_SproutTower_branch_f6a3e: ; f6a3e
-	note __, 3
-	note C_, 1
-	note F_, 1
-	note F#, 1
-	note D#, 1
-	note __, 1
-	note F#, 1
-	note F_, 1
-	note __, 1
-	note C_, 1
-	note F_, 1
-	note F#, 1
-	note D#, 1
-	note __, 1
-	note F_, 1
-	note D#, 1
-	note __, 1
+	note __, 4
+	note C_, 2
+	note F_, 2
+	note F#, 2
+	note D#, 2
+	note __, 2
+	note F#, 2
+	note F_, 2
+	note __, 2
+	note C_, 2
+	note F_, 2
+	note F#, 2
+	note D#, 2
+	note __, 2
+	note F_, 2
+	note D#, 2
+	note __, 2
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note D#, 1
-	note F#, 1
-	note D#, 1
-	note __, 1
-	note F#, 1
-	note F_, 1
-	note __, 1
-	note C_, 1
-	note F_, 1
-	note F#, 1
-	note D#, 1
-	note __, 1
-	note F#, 1
-	note F_, 7
-	note F#, 3
-	note A#, 3
-	note D#, 7
-	note F_, 3
-	note F#, 3
-	note F_, 15
-	note F_, 1
-	note __, 1
-	note C_, 1
-	note F_, 1
-	note F#, 1
-	note D#, 1
-	note __, 1
-	note F_, 1
-	note F_, 1
-	note __, 1
-	note C_, 1
-	note F_, 1
-	note F#, 1
-	note D#, 1
-	note __, 1
-	note F_, 1
+	note D#, 2
+	note F#, 2
+	note D#, 2
+	note __, 2
+	note F#, 2
+	note F_, 2
+	note __, 2
+	note C_, 2
+	note F_, 2
+	note F#, 2
+	note D#, 2
+	note __, 2
+	note F#, 2
+	note F_, 8
+	note F#, 4
+	note A#, 4
+	note D#, 8
+	note F_, 4
+	note F#, 4
+	note F_, 16
+	note F_, 2
+	note __, 2
+	note C_, 2
+	note F_, 2
+	note F#, 2
+	note D#, 2
+	note __, 2
+	note F_, 2
+	note F_, 2
+	note __, 2
+	note C_, 2
+	note F_, 2
+	note F#, 2
+	note D#, 2
+	note __, 2
+	note F_, 2
 	loopchannel 0, Music_SproutTower_branch_f6a3e
 
 Music_SproutTower_Ch4: ; f6a7a
 	togglenoise $0
 	notetype $c
-	note __, 3
+	note __, 4
 
 Music_SproutTower_branch_f6a7f: ; f6a7f
-	note F#, 3
+	note F#, 4
 	stereopanning $f0
-	note D#, 3
-	note F#, 1
+	note D#, 4
+	note F#, 2
 	stereopanning $f
-	note D#, 1
+	note D#, 2
 	stereopanning $ff
-	note F#, 3
-	note F#, 3
+	note F#, 4
+	note F#, 4
 	stereopanning $f
-	note D#, 3
-	note F#, 1
+	note D#, 4
+	note F#, 2
 	stereopanning $f0
-	note D#, 1
+	note D#, 2
 	stereopanning $ff
-	note F#, 3
+	note F#, 4
 	loopchannel 0, Music_SproutTower_branch_f6a7f
 ; f6a99
--- a/audio/music/ssaqua.asm
+++ b/audio/music/ssaqua.asm
@@ -15,162 +15,190 @@
 	dutycycle $2
 	notetype $6, $97
 	octave 2
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
 
 Music_SSAqua_branch_eadbc: ; eadbc
 	octave 2
-	note G_, 15
-	note __, 7
-	note G_, 1
-	note __, 1
+	note G_, 16
+	note __, 8
+	note G_, 2
+	note __, 2
 	notetype $c, $97
-	note G_, 1
-	note G_, 9
-	note __, 3
+	note G_, 2
+	note G_, 10
+	note __, 4
 	notetype $6, $97
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note G_, 15
-	note __, 7
 	note G_, 1
 	note __, 1
-	notetype $c, $97
 	note G_, 1
-	note G_, 7
-	note __, 7
+	note __, 1
+	note G_, 16
+	note __, 8
+	note G_, 2
+	note __, 2
+	notetype $c, $97
+	note G_, 2
+	note G_, 8
+	note __, 8
 	dutycycle $1
 	intensity $61
 	callchannel Music_SSAqua_branch_eaff5
 	octave 5
-	note G_, 0
+	note G_, 1
 	octave 4
-	note B_, 0
-	note A_, 0
-	note G_, 0
+	note B_, 1
+	note A_, 1
+	note G_, 1
 	octave 5
-	note G_, 0
+	note G_, 1
 	octave 4
-	note B_, 0
-	note A_, 0
-	note G_, 0
+	note B_, 1
+	note A_, 1
+	note G_, 1
 	octave 5
-	note G_, 0
+	note G_, 1
 	octave 4
-	note B_, 0
-	note A_, 0
-	note G_, 0
+	note B_, 1
+	note A_, 1
+	note G_, 1
 	octave 5
-	note G_, 0
+	note G_, 1
 	octave 4
-	note B_, 0
-	note A_, 0
-	note G_, 0
+	note B_, 1
+	note A_, 1
+	note G_, 1
 	callchannel Music_SSAqua_branch_eaff5
 	callchannel Music_SSAqua_branch_eb03e
-	note __, 15
-	note __, 15
-	note __, 15
+	note __, 16
+	note __, 16
+	note __, 16
 	intensity $97
-	note __, 13
+	note __, 14
 	notetype $6, $97
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
 	octave 3
-	note A#, 0
-	note __, 0
+	note A#, 1
+	note __, 1
 	notetype $c, $97
-	note __, 15
-	note __, 15
+	note __, 16
+	note __, 16
 	intensity $95
-	note __, 1
+	note __, 2
 	octave 4
-	note C_, 0
-	note E_, 0
-	note G_, 0
-	note __, 0
-	note E_, 0
-	note C_, 0
+	note C_, 1
+	note E_, 1
+	note G_, 1
+	note __, 1
+	note E_, 1
+	note C_, 1
 	octave 3
-	note E_, 0
-	note C_, 0
-	note E_, 0
-	note G_, 0
+	note E_, 1
+	note C_, 1
+	note E_, 1
+	note G_, 1
 	octave 4
-	note C_, 0
-	note E_, 0
-	note G_, 0
+	note C_, 1
+	note E_, 1
+	note G_, 1
 	octave 5
-	note C_, 0
+	note C_, 1
 	octave 4
-	note E_, 5
+	note E_, 6
+	note D_, 2
+	note C_, 1
 	note D_, 1
-	note C_, 0
-	note D_, 0
-	note F#, 0
-	note A_, 0
+	note F#, 1
+	note A_, 1
 	octave 5
-	note C_, 0
-	note D_, 0
+	note C_, 1
+	note D_, 1
 	octave 4
-	note G_, 0
-	note F#, 0
+	note G_, 1
+	note F#, 1
 	dutycycle $2
 	intensity $97
-	note G_, 7
-	note F#, 7
-	note E_, 7
-	note D_, 7
+	note G_, 8
+	note F#, 8
+	note E_, 8
+	note D_, 8
 	octave 3
-	note B_, 7
-	note A#, 1
+	note B_, 8
+	note A#, 2
+	note __, 2
+	note B_, 1
 	note __, 1
-	note B_, 0
-	note __, 0
 	octave 4
-	note F#, 1
+	note F#, 2
 	intensity $75
 	octave 5
-	note A_, 3
-	note F#, 3
-	note D_, 3
+	note A_, 4
+	note F#, 4
+	note D_, 4
 	octave 4
-	note A#, 1
+	note A#, 2
 	notetype $6, $97
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
 	octave 3
-	note A#, 0
-	note __, 0
+	note A#, 1
+	note __, 1
 	intensity $97
-	note G_, 15
-	note A_, 15
-	note B_, 3
-	note __, 3
-	note B_, 3
-	note __, 3
+	note G_, 16
+	note A_, 16
+	note B_, 4
+	note __, 4
+	note B_, 4
+	note __, 4
 	octave 4
-	note E_, 7
-	note G_, 7
-	note F#, 0
+	note E_, 8
+	note G_, 8
+	note F#, 1
 	vibrato $0, $0
 	intensity $88
-	note G_, 9
+	note G_, 10
 	vibrato $2, $23
 	intensity $87
-	note G_, 8
+	note G_, 9
 	vibrato $8, $33
-	note C_, 3
-	note E_, 3
-	note C_, 3
-	note D_, 11
-	note F#, 11
+	note C_, 4
+	note E_, 4
+	note C_, 4
+	note D_, 12
+	note F#, 12
+	note __, 8
+	octave 2
+	note B_, 2
+	octave 3
+	note D_, 2
+	note F#, 2
+	note A_, 2
+	note D_, 2
+	note F#, 2
+	note A_, 2
+	octave 4
+	note D_, 2
+	note F#, 2
+	notetype $c, $97
 	note __, 7
+	note __, 16
+	note __, 16
+	note G_, 8
+	note F#, 1
+	note D_, 1
+	octave 3
+	note A_, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note A_, 1
+	note F#, 1
+	note D_, 1
 	octave 2
+	note A_, 1
 	note B_, 1
 	octave 3
 	note D_, 1
@@ -182,73 +210,45 @@
 	octave 4
 	note D_, 1
 	note F#, 1
-	notetype $c, $97
-	note __, 6
-	note __, 15
-	note __, 15
-	note G_, 7
-	note F#, 0
-	note D_, 0
-	octave 3
-	note A_, 0
-	octave 4
-	note D_, 0
-	octave 3
-	note A_, 0
-	note F#, 0
-	note D_, 0
-	octave 2
-	note A_, 0
-	note B_, 0
-	octave 3
-	note D_, 0
-	note F#, 0
-	note A_, 0
-	note D_, 0
-	note F#, 0
-	note A_, 0
-	octave 4
-	note D_, 0
-	note F#, 0
-	note __, 6
-	note __, 15
+	note __, 7
+	note __, 16
+	note __, 2
+	note E_, 2
+	note G_, 1
 	note __, 1
 	note E_, 1
-	note G_, 0
-	note __, 0
-	note E_, 0
 	notetype $6, $97
-	note __, 0
-	note C_, 0
-	note C#, 3
+	note __, 1
+	note C_, 1
+	note C#, 4
 	octave 3
-	note B_, 1
+	note B_, 2
+	note __, 2
+	note A_, 3
 	note __, 1
-	note A_, 2
-	note __, 0
-	note G_, 1
-	note __, 1
-	note F#, 1
-	note D_, 1
+	note G_, 2
+	note __, 2
+	note F#, 2
+	note D_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note D_, 1
-	note A_, 1
-	note F#, 1
-	note D_, 1
-	note A_, 1
+	note D_, 2
+	note A_, 2
+	note F#, 2
+	note D_, 2
+	note A_, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note A_, 1
-	note F#, 1
-	note A_, 1
+	note A_, 2
+	note F#, 2
+	note A_, 2
 	octave 4
-	note C_, 1
-	note D_, 1
-	note F#, 1
-	note A_, 1
+	note C_, 2
+	note D_, 2
+	note F#, 2
+	note A_, 2
 	loopchannel 0, Music_SSAqua_branch_eadbc
 ; eaeca
 
@@ -257,7 +257,7 @@
 	dutycycle $2
 	vibrato $8, $33
 	notetype $c, $b7
-	note __, 1
+	note __, 2
 
 Music_SSAqua_branch_eaed5: ; eaed5
 	notetype $c, $b7
@@ -268,347 +268,347 @@
 	dutycycle $2
 	intensity $d7
 	callchannel Music_SSAqua_branch_eafe0
-	note B_, 0
-	note __, 0
-	note G_, 0
-	note __, 2
+	note B_, 1
+	note __, 1
+	note G_, 1
+	note __, 3
 	octave 3
-	note G_, 5
-	note G_, 0
-	note B_, 0
+	note G_, 6
+	note G_, 1
+	note B_, 1
 	octave 4
-	note C#, 0
-	note E_, 0
+	note C#, 1
+	note E_, 1
 	forceoctave $c
 	callchannel Music_SSAqua_branch_eafe0
 	forceoctave $0
 	octave 3
-	note B_, 0
-	note __, 0
-	note G_, 0
-	note __, 2
-	octave 4
-	note G_, 5
+	note B_, 1
 	note __, 1
+	note G_, 1
+	note __, 3
+	octave 4
+	note G_, 6
+	note __, 2
 	dutycycle $3
 	intensity $b7
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	callchannel Music_SSAqua_branch_eaf88
-	note G_, 3
-	note __, 3
-	note G_, 7
-	note A_, 7
-	note B_, 7
+	note G_, 4
+	note __, 4
+	note G_, 8
+	note A_, 8
+	note B_, 8
 	notetype $c, $b7
 	octave 5
-	note C_, 9
-	note D_, 1
-	note C_, 1
+	note C_, 10
+	note D_, 2
+	note C_, 2
 	octave 4
-	note G_, 1
-	note B_, 5
-	note A_, 5
-	note __, 1
+	note G_, 2
+	note B_, 6
+	note A_, 6
+	note __, 2
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	callchannel Music_SSAqua_branch_eaf88
-	note G_, 3
-	note __, 3
-	note G_, 7
-	note A_, 7
-	note B_, 7
+	note G_, 4
+	note __, 4
+	note G_, 8
+	note A_, 8
+	note B_, 8
 	octave 5
-	note D#, 0
+	note D#, 1
 	vibrato $0, $0
 	intensity $98
-	note E_, 9
+	note E_, 10
 	vibrato $4, $23
 	intensity $97
-	note E_, 8
+	note E_, 9
 	vibrato $8, $23
-	note D_, 3
-	note C_, 3
+	note D_, 4
+	note C_, 4
 	octave 4
-	note G_, 3
-	note B_, 11
-	note A_, 11
-	note __, 3
+	note G_, 4
+	note B_, 12
+	note A_, 12
+	note __, 4
 	dutycycle $0
-	note B_, 1
-	note A_, 1
+	note B_, 2
+	note A_, 2
 	callchannel Music_SSAqua_branch_eafd5
 	notetype $6, $b7
-	note G#, 0
-	note A_, 10
-	note G_, 1
-	note F#, 1
-	note G_, 11
-	note __, 3
-	note __, 3
-	note E_, 1
-	note __, 1
-	note E_, 1
-	note __, 1
-	note G_, 1
-	note __, 1
-	note A_, 1
-	note __, 1
-	note E_, 1
-	note __, 1
-	note F#, 1
-	note __, 1
-	note G_, 1
-	note __, 1
-	note A_, 15
-	note A#, 11
-	note B_, 1
-	note A_, 1
+	note G#, 1
+	note A_, 11
+	note G_, 2
+	note F#, 2
+	note G_, 12
+	note __, 4
+	note __, 4
+	note E_, 2
+	note __, 2
+	note E_, 2
+	note __, 2
+	note G_, 2
+	note __, 2
+	note A_, 2
+	note __, 2
+	note E_, 2
+	note __, 2
+	note F#, 2
+	note __, 2
+	note G_, 2
+	note __, 2
+	note A_, 16
+	note A#, 12
+	note B_, 2
+	note A_, 2
 	callchannel Music_SSAqua_branch_eafd5
 	notetype $6, $b7
-	note G#, 0
-	note A_, 10
-	note B_, 3
-	note G_, 11
-	note __, 3
-	note __, 3
+	note G#, 1
+	note A_, 11
+	note B_, 4
+	note G_, 12
+	note __, 4
+	note __, 4
 	octave 5
-	note C_, 3
-	note D_, 1
+	note C_, 4
+	note D_, 2
+	note __, 2
+	note C_, 2
 	note __, 1
-	note C_, 1
-	note __, 0
 	octave 4
-	note A#, 0
-	note B_, 3
-	note A_, 1
-	note __, 1
-	note G_, 3
-	note E_, 1
-	note __, 1
-	note F#, 7
-	note G_, 7
-	note A_, 7
-	note __, 7
+	note A#, 1
+	note B_, 4
+	note A_, 2
+	note __, 2
+	note G_, 4
+	note E_, 2
+	note __, 2
+	note F#, 8
+	note G_, 8
+	note A_, 8
+	note __, 8
 	loopchannel 0, Music_SSAqua_branch_eaed5
 ; eaf88
 
 Music_SSAqua_branch_eaf88: ; eaf88
-	note D_, 5
+	note D_, 6
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note C_, 0
-	note D_, 1
+	note C_, 1
+	note D_, 2
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note C_, 0
-	note D_, 1
+	note C_, 1
+	note D_, 2
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note C_, 0
+	note C_, 1
+	note D_, 2
+	note __, 2
+	note G_, 2
+	note __, 2
+	note A_, 2
+	note __, 2
+	note A#, 2
+	note __, 2
+	note B_, 6
+	note F#, 6
+	note __, 4
+	dutycycle $1
+	notetype $6, $b7
+	octave 3
+	note A_, 1
+	note __, 1
+	octave 4
 	note D_, 1
 	note __, 1
-	note G_, 1
+	note F#, 1
 	note __, 1
 	note A_, 1
 	note __, 1
-	note A#, 1
+	note D_, 1
 	note __, 1
-	note B_, 5
-	note F#, 5
-	note __, 3
-	dutycycle $1
-	notetype $6, $b7
-	octave 3
-	note A_, 0
-	note __, 0
-	octave 4
-	note D_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note F#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
 	octave 5
-	note D_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note D_, 1
+	note __, 1
 	octave 4
-	note A#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note A#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	dutycycle $3
-	note E_, 1
+	note A#, 1
+	note __, 1
 	note F#, 1
-	note G_, 11
-	note E_, 1
+	note __, 1
+	note A#, 1
+	note __, 1
 	note F#, 1
-	note G_, 3
-	note E_, 1
-	note F#, 1
-	note G_, 3
-	note E_, 1
-	note F#, 1
+	note __, 1
+	dutycycle $3
+	note E_, 2
+	note F#, 2
+	note G_, 12
+	note E_, 2
+	note F#, 2
+	note G_, 4
+	note E_, 2
+	note F#, 2
+	note G_, 4
+	note E_, 2
+	note F#, 2
 	endchannel
 ; eafd5
 
 Music_SSAqua_branch_eafd5: ; eafd5
 	notetype $c, $b7
-	note B_, 9
-	note F#, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note F#, 0
-	note __, 0
+	note B_, 10
+	note F#, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
 	endchannel
 ; eafe0
 
 Music_SSAqua_branch_eafe0: ; eafe0
 	octave 3
-	note D_, 9
-	note E_, 0
-	note __, 2
-	note D_, 0
-	note __, 0
-	note C#, 11
-	octave 2
-	note A_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	octave 3
-	note C_, 7
+	note D_, 10
+	note E_, 1
+	note __, 3
+	note D_, 1
 	note __, 1
+	note C#, 12
 	octave 2
-	note B_, 0
+	note A_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	octave 3
+	note C_, 8
 	note __, 2
-	note A_, 0
-	note __, 0
+	octave 2
+	note B_, 1
+	note __, 3
+	note A_, 1
+	note __, 1
 	endchannel
 ; eaff5
 
 Music_SSAqua_branch_eaff5: ; eaff5
 	octave 5
-	note G_, 0
-	note D_, 0
+	note G_, 1
+	note D_, 1
 	octave 4
-	note B_, 0
-	note G_, 0
+	note B_, 1
+	note G_, 1
 	octave 5
-	note G_, 0
-	note D_, 0
+	note G_, 1
+	note D_, 1
 	octave 4
-	note B_, 0
-	note G_, 0
+	note B_, 1
+	note G_, 1
 	octave 5
-	note G_, 0
-	note D_, 0
+	note G_, 1
+	note D_, 1
 	octave 4
-	note B_, 0
-	note G_, 0
+	note B_, 1
+	note G_, 1
 	octave 5
-	note G_, 0
-	note D_, 0
+	note G_, 1
+	note D_, 1
 	octave 4
-	note B_, 0
-	note G_, 0
+	note B_, 1
+	note G_, 1
 	octave 5
-	note G_, 0
-	note C#, 0
+	note G_, 1
+	note C#, 1
 	octave 4
-	note A#, 0
-	note G_, 0
+	note A#, 1
+	note G_, 1
 	octave 5
-	note G_, 0
-	note C#, 0
+	note G_, 1
+	note C#, 1
 	octave 4
-	note A#, 0
-	note G_, 0
+	note A#, 1
+	note G_, 1
 	octave 5
-	note G_, 0
-	note C#, 0
+	note G_, 1
+	note C#, 1
 	octave 4
-	note A#, 0
-	note G_, 0
+	note A#, 1
+	note G_, 1
 	octave 5
-	note G_, 0
-	note C#, 0
+	note G_, 1
+	note C#, 1
 	octave 4
-	note A#, 0
-	note G_, 0
+	note A#, 1
+	note G_, 1
 	octave 5
-	note G_, 0
-	note C_, 0
+	note G_, 1
+	note C_, 1
 	octave 4
-	note A_, 0
-	note G_, 0
+	note A_, 1
+	note G_, 1
 	octave 5
-	note G_, 0
-	note C_, 0
+	note G_, 1
+	note C_, 1
 	octave 4
-	note A_, 0
-	note G_, 0
+	note A_, 1
+	note G_, 1
 	octave 5
-	note G_, 0
-	note C_, 0
+	note G_, 1
+	note C_, 1
 	octave 4
-	note A_, 0
-	note G_, 0
+	note A_, 1
+	note G_, 1
 	octave 5
-	note G_, 0
-	note C_, 0
+	note G_, 1
+	note C_, 1
 	octave 4
-	note A_, 0
-	note G_, 0
+	note A_, 1
+	note G_, 1
 	endchannel
 ; eb03e
 
 Music_SSAqua_branch_eb03e: ; eb03e
 	octave 5
-	note G_, 0
+	note G_, 1
 	octave 4
-	note B_, 0
-	note A_, 0
-	note G_, 0
+	note B_, 1
+	note A_, 1
+	note G_, 1
 	octave 5
-	note G_, 0
+	note G_, 1
 	octave 4
-	note B_, 0
-	note A_, 0
-	note G_, 0
+	note B_, 1
+	note A_, 1
+	note G_, 1
 	octave 5
-	note G_, 0
-	note D_, 0
+	note G_, 1
+	note D_, 1
 	octave 4
-	note B_, 0
-	note G_, 0
-	note B_, 0
-	note G_, 0
-	note C#, 0
+	note B_, 1
+	note G_, 1
+	note B_, 1
+	note G_, 1
+	note C#, 1
 	octave 3
-	note G_, 0
+	note G_, 1
 	endchannel
 
 Music_SSAqua_Ch3: ; eb056
@@ -616,223 +616,223 @@
 	vibrato $8, $34
 	notetype $6, $15
 	octave 2
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-
-Music_SSAqua_branch_eb063: ; eb063
-	note G_, 15
-	note __, 7
 	note G_, 1
 	note __, 1
-	notetype $c, $15
 	note G_, 1
-	note G_, 9
-	note __, 3
+	note __, 1
+
+Music_SSAqua_branch_eb063: ; eb063
+	note G_, 16
+	note __, 8
+	note G_, 2
+	note __, 2
+	notetype $c, $15
+	note G_, 2
+	note G_, 10
+	note __, 4
 	notetype $6, $15
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note G_, 15
-	note __, 7
 	note G_, 1
 	note __, 1
-	notetype $c, $15
 	note G_, 1
-	note G_, 7
-	note B_, 0
+	note __, 1
+	note G_, 16
+	note __, 8
+	note G_, 2
+	note __, 2
+	notetype $c, $15
+	note G_, 2
+	note G_, 8
+	note B_, 1
 	octave 3
-	note C#, 0
-	note D_, 0
-	note G_, 0
-	note D_, 0
-	note G_, 0
-	note B_, 0
+	note C#, 1
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note B_, 1
 	octave 4
-	note E_, 0
+	note E_, 1
 	callchannel Music_SSAqua_branch_eb14d
 	callchannel Music_SSAqua_branch_eb14d
 
 Music_SSAqua_branch_eb08d: ; eb08d
-	note G_, 1
-	note __, 1
-	octave 3
-	note G_, 0
+	note G_, 2
 	note __, 2
-	octave 2
+	octave 3
 	note G_, 1
-	note __, 1
+	note __, 3
+	octave 2
+	note G_, 2
+	note __, 2
 	octave 3
-	note G_, 0
+	note G_, 1
+	note __, 3
+	octave 2
+	note G_, 2
 	note __, 2
+	octave 3
+	note G_, 1
+	note __, 3
 	octave 2
+	note G_, 2
+	note __, 2
+	octave 3
 	note G_, 1
 	note __, 1
-	octave 3
-	note G_, 0
-	note __, 2
 	octave 2
 	note G_, 1
 	note __, 1
-	octave 3
-	note G_, 0
-	note __, 0
-	octave 2
-	note G_, 0
-	note __, 0
 	loopchannel 4, Music_SSAqua_branch_eb08d
 	callchannel Music_SSAqua_branch_eb172
 	callchannel Music_SSAqua_branch_eb172
 	callchannel Music_SSAqua_branch_eb230
 	octave 3
-	note E_, 1
-	note __, 1
-	octave 4
-	note E_, 0
+	note E_, 2
 	note __, 2
-	octave 3
-	note D#, 1
-	note __, 1
 	octave 4
-	note D#, 0
-	note __, 2
+	note E_, 1
+	note __, 3
 	octave 3
-	note D_, 1
-	note __, 1
-	octave 4
-	note D_, 0
+	note D#, 2
 	note __, 2
-	octave 3
-	note D#, 1
-	note __, 1
 	octave 4
-	note D#, 0
+	note D#, 1
+	note __, 3
+	octave 3
+	note D_, 2
 	note __, 2
-	octave 2
-	note A_, 1
-	note __, 1
 	octave 4
-	note C_, 0
+	note D_, 1
+	note __, 3
+	octave 3
+	note D#, 2
 	note __, 2
-	octave 2
-	note A_, 1
-	note __, 1
 	octave 4
-	note C_, 0
-	note __, 2
+	note D#, 1
+	note __, 3
 	octave 2
-	note A_, 1
-	note __, 1
-	octave 4
-	note C#, 0
+	note A_, 2
 	note __, 2
-	octave 2
-	note A_, 1
-	note __, 1
 	octave 4
-	note C#, 0
+	note C_, 1
+	note __, 3
+	octave 2
+	note A_, 2
 	note __, 2
-	octave 3
-	note D_, 1
-	note __, 1
 	octave 4
-	note G_, 0
+	note C_, 1
+	note __, 3
+	octave 2
+	note A_, 2
 	note __, 2
-	octave 3
-	note D_, 1
-	note __, 1
 	octave 4
-	note G_, 0
+	note C#, 1
+	note __, 3
+	octave 2
+	note A_, 2
 	note __, 2
+	octave 4
+	note C#, 1
+	note __, 3
 	octave 3
-	note D_, 1
-	note __, 1
+	note D_, 2
+	note __, 2
 	octave 4
-	note F#, 0
+	note G_, 1
+	note __, 3
+	octave 3
+	note D_, 2
 	note __, 2
+	octave 4
+	note G_, 1
+	note __, 3
 	octave 3
-	note D_, 1
-	note __, 1
+	note D_, 2
+	note __, 2
 	octave 4
-	note F#, 0
+	note F#, 1
+	note __, 3
+	octave 3
+	note D_, 2
 	note __, 2
+	octave 4
+	note F#, 1
+	note __, 3
 	callchannel Music_SSAqua_branch_eb230
 	octave 3
-	note E_, 1
-	note __, 1
-	octave 4
-	note E_, 0
+	note E_, 2
 	note __, 2
-	octave 3
-	note E_, 1
-	note __, 1
 	octave 4
-	note D#, 0
+	note E_, 1
+	note __, 3
+	octave 3
+	note E_, 2
 	note __, 2
-	octave 2
-	note A_, 1
-	note __, 1
 	octave 4
-	note C#, 0
-	note __, 2
+	note D#, 1
+	note __, 3
 	octave 2
-	note A_, 1
-	note __, 1
-	octave 4
-	note C#, 0
+	note A_, 2
 	note __, 2
-	octave 3
-	note C_, 1
-	note __, 1
 	octave 4
-	note G_, 0
+	note C#, 1
+	note __, 3
+	octave 2
+	note A_, 2
 	note __, 2
-	octave 3
-	note C_, 1
-	note __, 1
 	octave 4
-	note G_, 0
-	note __, 2
-	octave 3
 	note C#, 1
-	note __, 1
-	octave 4
-	note G_, 0
-	note __, 2
+	note __, 3
 	octave 3
-	note C#, 1
-	note __, 1
-	octave 4
-	note G_, 0
+	note C_, 2
 	note __, 2
+	octave 4
+	note G_, 1
+	note __, 3
 	octave 3
-	note D_, 1
-	note __, 1
+	note C_, 2
+	note __, 2
 	octave 4
-	note G_, 0
+	note G_, 1
+	note __, 3
+	octave 3
+	note C#, 2
 	note __, 2
+	octave 4
+	note G_, 1
+	note __, 3
 	octave 3
-	note D_, 1
-	note __, 1
+	note C#, 2
+	note __, 2
 	octave 4
-	note G_, 0
+	note G_, 1
+	note __, 3
+	octave 3
+	note D_, 2
 	note __, 2
+	octave 4
+	note G_, 1
+	note __, 3
 	octave 3
-	note D_, 1
-	note __, 1
+	note D_, 2
+	note __, 2
 	octave 4
-	note F#, 0
+	note G_, 1
+	note __, 3
+	octave 3
+	note D_, 2
 	note __, 2
+	octave 4
+	note F#, 1
+	note __, 3
 	octave 3
-	note D_, 1
-	note __, 1
+	note D_, 2
+	note __, 2
 	octave 2
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
 	loopchannel 0, Music_SSAqua_branch_eb063
 ; eb14d
 
@@ -839,283 +839,283 @@
 Music_SSAqua_branch_eb14d: ; eb14d
 	notetype $6, $15
 	octave 2
+	note G_, 2
+	note __, 6
+	note G_, 2
+	note __, 6
+	note G_, 2
+	note __, 2
+	octave 3
+	note G_, 2
+	note __, 2
+	octave 2
+	note G_, 2
+	note __, 4
 	note G_, 1
-	note __, 5
-	note G_, 1
-	note __, 5
-	note G_, 1
 	note __, 1
+	note G_, 2
+	note __, 6
+	note G_, 2
+	note __, 2
 	octave 3
 	note G_, 1
-	note __, 1
+	note __, 3
 	octave 2
+	note G_, 2
+	note __, 2
+	octave 3
 	note G_, 1
 	note __, 3
-	note G_, 0
-	note __, 0
-	note G_, 1
-	note __, 5
-	note G_, 1
-	note __, 1
-	octave 3
-	note G_, 0
-	note __, 2
 	octave 2
+	note G_, 2
+	note __, 4
 	note G_, 1
 	note __, 1
-	octave 3
-	note G_, 0
-	note __, 2
-	octave 2
-	note G_, 1
-	note __, 3
-	note G_, 0
-	note __, 0
 	endchannel
 ; eb172
 
 Music_SSAqua_branch_eb172: ; eb172
 	octave 2
-	note G_, 1
-	note __, 1
-	octave 4
-	note D_, 0
+	note G_, 2
 	note __, 2
-	octave 2
-	note G_, 1
-	note __, 1
 	octave 4
-	note D_, 0
-	note __, 2
+	note D_, 1
+	note __, 3
 	octave 2
-	note G_, 1
-	note __, 1
-	octave 4
-	note E_, 0
+	note G_, 2
 	note __, 2
-	octave 2
-	note G_, 1
-	note __, 1
 	octave 4
-	note E_, 0
-	note __, 0
+	note D_, 1
+	note __, 3
 	octave 2
-	note G_, 0
-	note __, 0
-	note G_, 1
-	note __, 1
-	octave 4
-	note F#, 0
+	note G_, 2
 	note __, 2
-	octave 2
-	note G_, 1
-	note __, 1
 	octave 4
-	note F#, 0
-	note __, 2
+	note E_, 1
+	note __, 3
 	octave 2
-	note G_, 1
-	note __, 1
+	note G_, 2
+	note __, 2
 	octave 4
-	note G_, 3
-	note F#, 3
 	note E_, 1
 	note __, 1
 	octave 2
-	note B_, 1
+	note G_, 1
 	note __, 1
+	note G_, 2
+	note __, 2
 	octave 4
-	note F#, 0
+	note F#, 1
+	note __, 3
+	octave 2
+	note G_, 2
 	note __, 2
+	octave 4
+	note F#, 1
+	note __, 3
 	octave 2
-	note B_, 1
-	note __, 1
+	note G_, 2
+	note __, 2
 	octave 4
-	note F#, 0
+	note G_, 4
+	note F#, 4
+	note E_, 2
 	note __, 2
 	octave 2
-	note A#, 1
-	note __, 1
-	octave 3
-	note A#, 0
+	note B_, 2
 	note __, 2
+	octave 4
+	note F#, 1
+	note __, 3
 	octave 2
-	note A#, 1
-	note __, 1
-	octave 3
-	note A#, 0
+	note B_, 2
 	note __, 2
+	octave 4
+	note F#, 1
+	note __, 3
 	octave 2
-	note A_, 1
-	note __, 1
-	octave 3
-	note A_, 0
+	note A#, 2
 	note __, 2
+	octave 3
+	note A#, 1
+	note __, 3
 	octave 2
-	note A_, 1
-	note __, 1
+	note A#, 2
+	note __, 2
 	octave 3
-	note A_, 0
+	note A#, 1
+	note __, 3
+	octave 2
+	note A_, 2
 	note __, 2
+	octave 3
+	note A_, 1
+	note __, 3
 	octave 2
-	note A#, 1
-	note __, 1
+	note A_, 2
+	note __, 2
 	octave 3
-	note A#, 0
+	note A_, 1
+	note __, 3
+	octave 2
+	note A#, 2
 	note __, 2
+	octave 3
+	note A#, 1
+	note __, 3
 	octave 2
+	note A#, 2
+	note __, 2
+	octave 3
 	note A#, 1
 	note __, 1
-	octave 3
-	note A#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note E_, 1
+	note D#, 1
 	note __, 1
-	octave 4
-	note E_, 0
+	note E_, 2
 	note __, 2
-	octave 3
-	note E_, 1
-	note __, 1
 	octave 4
-	note E_, 0
-	note __, 2
+	note E_, 1
+	note __, 3
 	octave 3
-	note D#, 1
-	note __, 1
+	note E_, 2
+	note __, 2
 	octave 4
-	note D#, 0
+	note E_, 1
+	note __, 3
+	octave 3
+	note D#, 2
 	note __, 2
+	octave 4
+	note D#, 1
+	note __, 3
 	octave 3
+	note D#, 2
+	note __, 2
+	octave 4
 	note D#, 1
 	note __, 1
-	octave 4
-	note D#, 0
-	note __, 0
 	octave 3
-	note C#, 0
-	note __, 0
-	note D_, 1
+	note C#, 1
 	note __, 1
-	octave 4
-	note D_, 0
+	note D_, 2
 	note __, 2
-	octave 3
-	note D_, 1
-	note __, 1
 	octave 4
-	note D_, 0
-	note __, 2
+	note D_, 1
+	note __, 3
 	octave 3
-	note C#, 1
-	note __, 1
+	note D_, 2
+	note __, 2
 	octave 4
-	note B_, 3
-	note G_, 3
-	note E_, 1
-	note __, 1
+	note D_, 1
+	note __, 3
 	octave 3
-	note C_, 1
-	note __, 1
+	note C#, 2
+	note __, 2
 	octave 4
-	note G_, 0
+	note B_, 4
+	note G_, 4
+	note E_, 2
 	note __, 2
 	octave 3
-	note C_, 1
-	note __, 1
-	octave 4
-	note G_, 0
+	note C_, 2
 	note __, 2
-	octave 2
-	note A_, 1
-	note __, 1
 	octave 4
-	note E_, 0
+	note G_, 1
+	note __, 3
+	octave 3
+	note C_, 2
 	note __, 2
-	octave 2
-	note A_, 1
-	note __, 1
 	octave 4
-	note E_, 0
+	note G_, 1
+	note __, 3
+	octave 2
+	note A_, 2
 	note __, 2
-	octave 3
-	note D_, 1
-	note __, 1
 	octave 4
-	note G_, 0
+	note E_, 1
+	note __, 3
+	octave 2
+	note A_, 2
 	note __, 2
-	octave 3
-	note D_, 1
-	note __, 1
 	octave 4
-	note G_, 0
-	note __, 2
+	note E_, 1
+	note __, 3
 	octave 3
-	note D_, 1
-	note __, 1
+	note D_, 2
+	note __, 2
 	octave 4
-	note F#, 0
+	note G_, 1
+	note __, 3
+	octave 3
+	note D_, 2
 	note __, 2
+	octave 4
+	note G_, 1
+	note __, 3
 	octave 3
-	note D_, 1
-	note __, 1
+	note D_, 2
+	note __, 2
 	octave 4
-	note F#, 0
+	note F#, 1
+	note __, 3
+	octave 3
+	note D_, 2
 	note __, 2
+	octave 4
+	note F#, 1
+	note __, 3
 	endchannel
 ; eb230
 
 Music_SSAqua_branch_eb230: ; eb230
 	octave 2
-	note B_, 1
-	note __, 1
-	octave 4
-	note F#, 0
+	note B_, 2
 	note __, 2
-	octave 2
-	note B_, 1
-	note __, 1
 	octave 4
-	note F#, 0
-	note __, 2
+	note F#, 1
+	note __, 3
 	octave 2
-	note B_, 1
-	note __, 1
-	octave 4
-	note D#, 0
+	note B_, 2
 	note __, 2
+	octave 4
+	note F#, 1
+	note __, 3
 	octave 2
-	note B_, 1
-	note __, 1
+	note B_, 2
+	note __, 2
 	octave 4
-	note D#, 0
+	note D#, 1
+	note __, 3
+	octave 2
+	note B_, 2
 	note __, 2
+	octave 4
+	note D#, 1
+	note __, 3
 	endchannel
 
 Music_SSAqua_Ch4: ; eb249
 	togglenoise $3
 	notetype $c
-	note __, 1
+	note __, 2
 
 Music_SSAqua_branch_eb24e: ; eb24e
-	note G#, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G#, 0
-	note G_, 0
+	note G#, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G#, 1
+	note G_, 1
 	loopchannel 12, Music_SSAqua_branch_eb24e
 	callchannel Music_SSAqua_branch_eb2ae
 	callchannel Music_SSAqua_branch_eb2ae
@@ -1145,47 +1145,47 @@
 ; eb2ae
 
 Music_SSAqua_branch_eb2ae: ; eb2ae
-	note A#, 1
-	note G_, 0
-	note G_, 0
-	note D_, 1
-	note G_, 0
-	note G_, 0
-	note A#, 1
-	note G_, 0
-	note G_, 0
-	note D_, 1
-	note G_, 0
-	note G_, 0
+	note A#, 2
+	note G_, 1
+	note G_, 1
+	note D_, 2
+	note G_, 1
+	note G_, 1
+	note A#, 2
+	note G_, 1
+	note G_, 1
+	note D_, 2
+	note G_, 1
+	note G_, 1
 	endchannel
 ; eb2bb
 
 Music_SSAqua_branch_eb2bb: ; eb2bb
-	note A#, 1
-	note G_, 0
-	note G_, 0
-	note D_, 1
-	note G_, 0
-	note G_, 0
-	note A#, 1
-	note G_, 0
-	note G_, 0
-	note D_, 1
-	note F#, 1
+	note A#, 2
+	note G_, 1
+	note G_, 1
+	note D_, 2
+	note G_, 1
+	note G_, 1
+	note A#, 2
+	note G_, 1
+	note G_, 1
+	note D_, 2
+	note F#, 2
 	endchannel
 ; eb2c7
 
 Music_SSAqua_branch_eb2c7: ; eb2c7
-	note A#, 1
-	note G_, 0
-	note G_, 0
+	note A#, 2
+	note G_, 1
+	note G_, 1
+	note D_, 2
+	note G_, 1
+	note G_, 1
 	note D_, 1
-	note G_, 0
-	note G_, 0
-	note D_, 0
-	note D_, 0
 	note D_, 1
-	note D_, 1
-	note C_, 1
+	note D_, 2
+	note D_, 2
+	note C_, 2
 	endchannel
 ; eb2d3
--- a/audio/music/suicunebattle.asm
+++ b/audio/music/suicunebattle.asm
@@ -13,503 +13,503 @@
 	vibrato $12, $15
 	notetype $c, $b7
 	octave 4
-	note A_, 0
-	note G#, 0
-	note G_, 3
-	note E_, 1
-	note D#, 0
-	note D_, 0
-	note C#, 3
+	note A_, 1
+	note G#, 1
+	note G_, 4
+	note E_, 2
+	note D#, 1
+	note D_, 1
+	note C#, 4
 	octave 3
-	note A#, 1
-	note A_, 0
-	note G#, 0
-	note G_, 3
-	note E_, 1
-	note D#, 0
-	note D_, 0
-	note C#, 3
+	note A#, 2
+	note A_, 1
+	note G#, 1
+	note G_, 4
+	note E_, 2
+	note D#, 1
+	note D_, 1
+	note C#, 4
 	octave 2
-	note A#, 1
+	note A#, 2
 	notetype $c, $b2
-	note A_, 1
-	note A_, 3
-	note A_, 1
-	note A_, 1
-	note A_, 3
-	note A_, 1
-	note A_, 1
-	note A_, 3
-	note A_, 1
-	note A_, 1
-	note A_, 1
+	note A_, 2
+	note A_, 4
+	note A_, 2
+	note A_, 2
+	note A_, 4
+	note A_, 2
+	note A_, 2
+	note A_, 4
+	note A_, 2
+	note A_, 2
+	note A_, 2
 	notetype $c, $b3
 	octave 4
-	note F_, 3
-	note E_, 1
+	note F_, 4
+	note E_, 2
 	notetype $c, $b2
 	octave 2
-	note A_, 3
-	note A_, 1
-	note A_, 1
-	note A_, 3
-	note A_, 1
-	note A_, 1
-	note A_, 3
-	note A_, 1
-	note A_, 1
-	note A_, 1
+	note A_, 4
+	note A_, 2
+	note A_, 2
+	note A_, 4
+	note A_, 2
+	note A_, 2
+	note A_, 4
+	note A_, 2
+	note A_, 2
+	note A_, 2
 	notetype $c, $b3
 	octave 4
-	note F_, 3
-	note E_, 1
+	note F_, 4
+	note E_, 2
 	notetype $c, $b2
 	octave 2
-	note A_, 3
-	note A_, 1
-	note A_, 1
-	note A_, 3
-	note A_, 1
-	note A_, 1
-	note A_, 3
-	note A_, 1
-	note A_, 1
-	note A_, 1
+	note A_, 4
+	note A_, 2
+	note A_, 2
+	note A_, 4
+	note A_, 2
+	note A_, 2
+	note A_, 4
+	note A_, 2
+	note A_, 2
+	note A_, 2
 	notetype $c, $b3
 	octave 4
-	note F_, 3
-	note E_, 1
+	note F_, 4
+	note E_, 2
 	notetype $c, $b2
 	octave 2
-	note A_, 3
+	note A_, 4
+	note A_, 2
+	note A_, 2
+	note A_, 4
+	note A_, 2
+	note A_, 2
+	note A_, 4
+	note A_, 2
+	note A_, 2
+	note A_, 2
 	note A_, 1
-	note A_, 1
-	note A_, 3
-	note A_, 1
-	note A_, 1
-	note A_, 3
-	note A_, 1
-	note A_, 1
-	note A_, 1
-	note A_, 0
-	note B_, 0
+	note B_, 1
 	octave 3
-	note E_, 0
-	note G#, 0
+	note E_, 1
+	note G#, 1
 
 Music_SuicuneBattle_branch_178bfc: ; 178bfc
 	notetype $c, $b4
 	octave 2
-	note A_, 1
-	note B_, 1
-	note E_, 1
+	note A_, 2
+	note B_, 2
+	note E_, 2
 	octave 3
-	note E_, 3
+	note E_, 4
 	octave 2
-	note B_, 1
-	note A_, 1
-	note E_, 1
-	note D_, 1
-	note E_, 1
-	note D_, 1
-	note A_, 3
-	note E_, 1
-	note D_, 1
-	note E_, 1
+	note B_, 2
+	note A_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note D_, 2
+	note A_, 4
+	note E_, 2
+	note D_, 2
+	note E_, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note D_, 1
-	note E_, 1
-	note A_, 1
-	note E_, 1
-	note D_, 1
+	note D_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note D_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note D_, 1
-	note E_, 1
-	note A_, 1
-	note E_, 1
-	note D_, 1
+	note D_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note D_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note D_, 1
-	note E_, 1
-	note C_, 1
-	note D_, 1
+	note D_, 2
+	note E_, 2
+	note C_, 2
+	note D_, 2
 	octave 2
-	note G_, 1
+	note G_, 2
 	octave 3
-	note G_, 3
-	note D_, 1
-	note C_, 1
+	note G_, 4
+	note D_, 2
+	note C_, 2
 	octave 2
-	note G_, 1
+	note G_, 2
 	octave 3
-	note C_, 1
-	note D_, 1
+	note C_, 2
+	note D_, 2
 	octave 2
-	note G_, 1
+	note G_, 2
 	octave 3
-	note F_, 3
-	note E_, 1
-	note D_, 1
-	note F_, 1
-	note G_, 1
-	note E_, 1
+	note F_, 4
+	note E_, 2
+	note D_, 2
+	note F_, 2
+	note G_, 2
+	note E_, 2
 	octave 2
-	note G_, 1
+	note G_, 2
 	octave 3
-	note E_, 1
-	note G_, 1
-	note A_, 5
-	note G_, 3
-	note F_, 3
-	note E_, 1
-	note D_, 5
+	note E_, 2
+	note G_, 2
+	note A_, 6
+	note G_, 4
+	note F_, 4
+	note E_, 2
+	note D_, 6
 	octave 2
-	note A_, 1
-	note B_, 1
-	note E_, 1
+	note A_, 2
+	note B_, 2
+	note E_, 2
 	octave 3
-	note E_, 3
+	note E_, 4
 	octave 2
-	note B_, 1
-	note A_, 1
-	note E_, 1
-	note D_, 1
-	note E_, 1
-	note D_, 1
-	note A_, 3
-	note E_, 1
-	note D_, 1
-	note E_, 1
+	note B_, 2
+	note A_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note D_, 2
+	note A_, 4
+	note E_, 2
+	note D_, 2
+	note E_, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note D_, 1
-	note E_, 1
-	note A_, 1
-	note E_, 1
-	note D_, 1
+	note D_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note D_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note D_, 1
-	note E_, 1
-	note A_, 1
-	note E_, 1
-	note D_, 1
+	note D_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note D_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note D_, 1
-	note E_, 1
-	note C_, 1
-	note D_, 1
+	note D_, 2
+	note E_, 2
+	note C_, 2
+	note D_, 2
 	octave 2
-	note G_, 1
+	note G_, 2
 	octave 3
-	note G_, 3
-	note D_, 1
-	note C_, 1
+	note G_, 4
+	note D_, 2
+	note C_, 2
 	octave 2
-	note G_, 1
+	note G_, 2
 	octave 3
-	note C_, 1
-	note D_, 1
+	note C_, 2
+	note D_, 2
 	octave 2
-	note G_, 1
+	note G_, 2
 	octave 3
-	note F_, 3
-	note E_, 1
-	note D_, 1
-	note F_, 1
+	note F_, 4
+	note E_, 2
+	note D_, 2
+	note F_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G_, 1
-	note C_, 1
-	note A_, 3
-	note G_, 1
-	note F_, 1
-	note A_, 1
-	note G_, 1
-	note A_, 1
-	note C_, 1
+	note G_, 2
+	note C_, 2
+	note A_, 4
+	note G_, 2
+	note F_, 2
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	note C_, 2
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note A_, 1
-	note G_, 1
-	note C_, 1
+	note A_, 2
+	note G_, 2
+	note C_, 2
 	notetype $c, $b3
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note C_, 1
-	note __, 1
-	note E_, 3
-	note D_, 1
-	note C_, 1
+	note C_, 2
+	note __, 2
+	note E_, 4
+	note D_, 2
+	note C_, 2
 	octave 2
-	note B_, 1
-	note B_, 1
+	note B_, 2
+	note B_, 2
 	octave 3
-	note C_, 1
-	note E_, 1
-	note D_, 1
-	note C_, 1
+	note C_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	note B_, 2
+	note A_, 2
+	note B_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note G_, 1
-	note __, 1
+	note G_, 2
+	note __, 2
 	notetype $c, $b6
 	octave 3
-	note G_, 9
+	note G_, 10
 	notetype $c, $b3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note G_, 1
-	note __, 1
+	note G_, 2
+	note __, 2
 	notetype $c, $b7
 	octave 3
-	note G_, 9
+	note G_, 10
 	notetype $c, $b3
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note C_, 1
-	note __, 1
-	note E_, 3
-	note D_, 1
-	note C_, 1
+	note C_, 2
+	note __, 2
+	note E_, 4
+	note D_, 2
+	note C_, 2
 	octave 2
-	note B_, 1
-	note B_, 1
+	note B_, 2
+	note B_, 2
 	octave 3
-	note C_, 1
-	note E_, 1
-	note D_, 1
-	note C_, 1
+	note C_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	note B_, 2
+	note A_, 2
+	note B_, 2
 	octave 3
-	note G_, 1
-	note C_, 1
+	note G_, 2
+	note C_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G_, 1
-	note F#, 1
+	note G_, 2
+	note F#, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note B_, 1
-	note F#, 1
-	note E_, 1
+	note B_, 2
+	note F#, 2
+	note E_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note A_, 1
-	note E_, 1
-	note C_, 1
-	note G_, 1
+	note A_, 2
+	note E_, 2
+	note C_, 2
+	note G_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G_, 1
+	note G_, 2
 	notetype $c, $b2
 	octave 2
-	note B_, 1
-	note B_, 5
-	note B_, 1
-	note B_, 5
-	note B_, 1
-	note B_, 5
-	note B_, 1
+	note B_, 2
+	note B_, 6
+	note B_, 2
+	note B_, 6
+	note B_, 2
+	note B_, 6
+	note B_, 2
 	notetype $c, $b4
 	octave 3
-	note C_, 5
+	note C_, 6
 	notetype $c, $b2
 	octave 2
-	note B_, 1
-	note B_, 1
+	note B_, 2
+	note B_, 2
 	notetype $c, $b5
 	octave 1
-	note F#, 3
+	note F#, 4
 	notetype $c, $b2
 	octave 2
-	note B_, 1
-	note B_, 1
+	note B_, 2
+	note B_, 2
 	notetype $c, $b5
 	octave 1
-	note F#, 3
+	note F#, 4
 	notetype $c, $b2
 	octave 2
-	note B_, 1
-	note B_, 1
+	note B_, 2
+	note B_, 2
 	notetype $c, $b5
 	octave 1
-	note F#, 3
+	note F#, 4
 	notetype $c, $b2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note B_, 0
+	note B_, 1
 	octave 3
-	note F#, 0
-	note A_, 0
+	note F#, 1
+	note A_, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	notetype $c, $b2
 	octave 3
-	note B_, 1
-	note B_, 1
+	note B_, 2
+	note B_, 2
 	notetype $c, $b5
 	octave 1
-	note F#, 3
+	note F#, 4
 	notetype $c, $b2
 	octave 3
-	note B_, 1
-	note B_, 1
+	note B_, 2
+	note B_, 2
 	notetype $c, $b5
 	octave 1
-	note F#, 3
+	note F#, 4
 	notetype $c, $b2
 	octave 3
-	note B_, 1
-	note B_, 1
+	note B_, 2
+	note B_, 2
 	notetype $c, $b5
 	octave 1
-	note F#, 3
+	note F#, 4
 	notetype $c, $b2
 	octave 3
-	note B_, 1
+	note B_, 2
 	notetype $c, $b5
 	octave 4
-	note C_, 5
+	note C_, 6
 	notetype $c, $b2
 	octave 3
-	note B_, 1
-	note B_, 1
+	note B_, 2
+	note B_, 2
 	notetype $c, $b4
 	octave 1
-	note F#, 3
+	note F#, 4
 	notetype $c, $b2
 	octave 3
-	note B_, 1
-	note B_, 1
+	note B_, 2
+	note B_, 2
 	notetype $c, $b4
 	octave 1
-	note F#, 3
+	note F#, 4
 	notetype $c, $b2
 	octave 3
-	note B_, 1
-	note B_, 1
+	note B_, 2
+	note B_, 2
 	notetype $c, $b4
 	octave 1
-	note F#, 3
+	note F#, 4
 	notetype $c, $b2
 	octave 3
-	note B_, 1
+	note B_, 2
 	notetype $c, $b5
 	octave 4
-	note C_, 5
+	note C_, 6
 	notetype $c, $b7
 	octave 2
-	note B_, 7
-	note E_, 7
+	note B_, 8
+	note E_, 8
 	octave 3
-	note C_, 7
+	note C_, 8
 	octave 2
-	note A_, 7
-	note B_, 7
-	note E_, 7
-	note F_, 9
-	note C_, 1
-	note D_, 1
-	note C_, 1
+	note A_, 8
+	note B_, 8
+	note E_, 8
+	note F_, 10
+	note C_, 2
+	note D_, 2
+	note C_, 2
 	notetype $c, $a0
 	octave 1
-	note F#, 7
-	note B_, 7
-	note G_, 7
+	note F#, 8
+	note B_, 8
+	note G_, 8
 	octave 2
-	note C_, 7
+	note C_, 8
 	octave 1
-	note B_, 7
-	note E_, 7
-	note F_, 7
+	note B_, 8
+	note E_, 8
+	note F_, 8
 	notetype $c, $a7
-	note F_, 7
-	note __, 15
-	note __, 15
-	note __, 15
-	note __, 15
-	note __, 15
-	note __, 15
-	note __, 15
-	note __, 15
-	note __, 15
-	note __, 15
-	note __, 15
-	note __, 15
+	note F_, 8
+	note __, 16
+	note __, 16
+	note __, 16
+	note __, 16
+	note __, 16
+	note __, 16
+	note __, 16
+	note __, 16
+	note __, 16
+	note __, 16
+	note __, 16
+	note __, 16
 	notetype $c, $b2
-	note __, 3
+	note __, 4
 	octave 3
-	note D_, 7
-	note D_, 7
-	note D_, 7
-	note D_, 7
-	note D_, 7
-	note D_, 7
-	note D_, 7
-	note D_, 7
-	note F_, 7
-	note F_, 7
-	note F_, 7
-	note F_, 7
-	note F_, 7
-	note F_, 7
-	note F_, 7
-	note F_, 3
-	note E_, 7
-	note __, 15
-	note __, 15
-	note __, 15
-	note __, 15
-	note __, 15
-	note __, 15
-	note __, 15
-	note __, 15
-	note __, 15
-	note __, 15
+	note D_, 8
+	note D_, 8
+	note D_, 8
+	note D_, 8
+	note D_, 8
+	note D_, 8
+	note D_, 8
+	note D_, 8
+	note F_, 8
+	note F_, 8
+	note F_, 8
+	note F_, 8
+	note F_, 8
+	note F_, 8
+	note F_, 8
+	note F_, 4
+	note E_, 8
+	note __, 16
+	note __, 16
+	note __, 16
+	note __, 16
+	note __, 16
+	note __, 16
+	note __, 16
+	note __, 16
+	note __, 16
+	note __, 16
 	vibrato $8, $24
 	dutycycle $2
 	notetype $c, $96
 	octave 4
-	note E_, 5
-	note F#, 5
+	note E_, 6
+	note F#, 6
 	octave 3
-	note A_, 3
+	note A_, 4
 	octave 4
-	note A_, 15
+	note A_, 16
 	vibrato $12, $15
 	dutycycle $3
 	loopchannel 0, Music_SuicuneBattle_branch_178bfc
@@ -520,1543 +520,1543 @@
 	tone $0001
 	notetype $c, $c3
 	octave 5
-	note E_, 0
+	note E_, 1
 	octave 4
-	note E_, 0
-	note A_, 1
+	note E_, 1
+	note A_, 2
 	octave 5
-	note E_, 0
+	note E_, 1
 	octave 4
-	note E_, 0
-	note A_, 1
+	note E_, 1
+	note A_, 2
 	octave 5
-	note E_, 0
+	note E_, 1
 	octave 4
-	note E_, 0
-	note A_, 1
+	note E_, 1
+	note A_, 2
 	octave 5
-	note E_, 0
+	note E_, 1
 	octave 4
-	note E_, 0
-	note A_, 1
+	note E_, 1
+	note A_, 2
 	octave 5
-	note E_, 0
+	note E_, 1
 	octave 4
-	note E_, 0
-	note A_, 1
+	note E_, 1
+	note A_, 2
 	octave 5
-	note E_, 0
+	note E_, 1
 	octave 4
-	note E_, 0
-	note A_, 1
+	note E_, 1
+	note A_, 2
 	octave 5
-	note E_, 0
+	note E_, 1
 	octave 4
-	note E_, 0
-	note A_, 1
+	note E_, 1
+	note A_, 2
 	octave 5
-	note E_, 0
+	note E_, 1
 	octave 4
-	note E_, 0
-	note A_, 5
+	note E_, 1
+	note A_, 6
 	notetype $c, $c2
 	octave 2
-	note E_, 7
-	note E_, 7
-	note E_, 7
+	note E_, 8
+	note E_, 8
+	note E_, 8
 	notetype $c, $c3
 	octave 4
-	note A#, 3
+	note A#, 4
 	notetype $c, $c2
-	note A_, 3
+	note A_, 4
 	octave 2
-	note E_, 7
-	note E_, 7
-	note E_, 7
+	note E_, 8
+	note E_, 8
+	note E_, 8
 	notetype $c, $c3
 	octave 4
-	note A#, 3
+	note A#, 4
 	notetype $c, $c2
-	note A_, 3
+	note A_, 4
 	octave 4
-	note E_, 7
-	note E_, 7
-	note E_, 7
+	note E_, 8
+	note E_, 8
+	note E_, 8
 	notetype $c, $c3
 	octave 4
-	note A#, 3
+	note A#, 4
 	notetype $c, $c2
-	note A_, 3
+	note A_, 4
 	octave 4
-	note E_, 7
-	note E_, 7
-	note E_, 7
-	note E_, 3
+	note E_, 8
+	note E_, 8
+	note E_, 8
+	note E_, 4
 
 Music_SuicuneBattle_branch_178e4e: ; 178e4e
 	notetype $c, $c7
 	octave 3
-	note A_, 7
-	note B_, 7
-	note D_, 7
+	note A_, 8
+	note B_, 8
+	note D_, 8
 	notetype $c, $b0
 	octave 4
-	note D_, 7
+	note D_, 8
 	notetype $c, $b6
-	note D_, 7
+	note D_, 8
 	vibrato $10, $24
 	dutycycle $2
 	notetype $c, $a4
 	octave 5
-	note A_, 5
-	note B_, 5
-	note D_, 3
+	note A_, 6
+	note B_, 6
+	note D_, 4
 	octave 6
-	note D_, 7
+	note D_, 8
 	vibrato $14, $34
 	dutycycle $3
 	notetype $c, $c7
 	octave 4
-	note C_, 7
-	note D_, 7
+	note C_, 8
+	note D_, 8
 	octave 3
-	note G_, 7
+	note G_, 8
 	octave 4
-	note F_, 7
+	note F_, 8
 	notetype $c, $b0
-	note E_, 9
+	note E_, 10
 	notetype $c, $b7
-	note E_, 5
+	note E_, 6
 	notetype $c, $a5
 	octave 2
-	note G_, 3
-	note A_, 3
-	note G_, 3
-	note B_, 3
+	note G_, 4
+	note A_, 4
+	note G_, 4
+	note B_, 4
 	notetype $c, $c7
 	octave 3
-	note A_, 7
-	note B_, 7
-	note D_, 7
+	note A_, 8
+	note B_, 8
+	note D_, 8
 	notetype $c, $c7
 	octave 4
-	note D_, 7
+	note D_, 8
 	notetype $c, $4c
-	note D_, 3
+	note D_, 4
 	notetype $c, $c6
-	note D_, 3
+	note D_, 4
 	notetype $c, $a4
 	vibrato $8, $24
 	dutycycle $2
 	octave 5
-	note A_, 5
-	note B_, 5
-	note D_, 3
+	note A_, 6
+	note B_, 6
+	note D_, 4
 	octave 6
-	note D_, 7
+	note D_, 8
 	vibrato $14, $34
 	notetype $c, $c7
 	dutycycle $3
 	octave 4
-	note C_, 7
-	note D_, 7
+	note C_, 8
+	note D_, 8
 	octave 3
-	note G_, 7
+	note G_, 8
 	octave 4
-	note F_, 7
+	note F_, 8
 	notetype $c, $4c
-	note E_, 7
+	note E_, 8
 	notetype $c, $c7
-	note E_, 7
+	note E_, 8
 	notetype $c, $c6
-	note C_, 7
-	note G_, 7
+	note C_, 8
+	note G_, 8
 	notetype $c, $c2
 	octave 3
-	note F#, 1
-	note G_, 1
-	note __, 1
-	note B_, 3
-	note A_, 1
-	note G_, 1
-	note F#, 1
-	note F#, 1
-	note G_, 1
-	note B_, 1
-	note A_, 1
-	note G_, 1
-	note F#, 1
-	note E_, 1
-	note F#, 1
-	note G_, 1
-	note C_, 1
-	note __, 1
+	note F#, 2
+	note G_, 2
+	note __, 2
+	note B_, 4
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note F#, 2
+	note G_, 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note C_, 2
+	note __, 2
 	notetype $c, $c7
 	octave 4
-	note C_, 9
+	note C_, 10
 	notetype $c, $c3
 	octave 4
-	note G_, 1
-	note C_, 1
-	note __, 1
+	note G_, 2
+	note C_, 2
+	note __, 2
 	notetype $c, $c7
 	octave 5
-	note C_, 9
+	note C_, 10
 	notetype $c, $c3
 	octave 4
-	note F#, 1
-	note G_, 1
-	note __, 1
-	note B_, 3
-	note A_, 1
-	note G_, 1
-	note F#, 1
-	note F#, 1
-	note G_, 1
-	note B_, 1
-	note A_, 1
-	note G_, 1
-	note F#, 1
-	note E_, 1
-	note F#, 1
+	note F#, 2
+	note G_, 2
+	note __, 2
+	note B_, 4
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note F#, 2
+	note G_, 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
 	notetype $c, $c7
-	note G_, 7
-	note F#, 7
-	note E_, 7
-	note G_, 7
+	note G_, 8
+	note F#, 8
+	note E_, 8
+	note G_, 8
 	notetype $c, $c2
 	octave 3
-	note F#, 1
-	note F#, 5
-	note F#, 1
-	note F#, 5
-	note F#, 1
-	note F#, 5
-	note F#, 1
+	note F#, 2
+	note F#, 6
+	note F#, 2
+	note F#, 6
+	note F#, 2
+	note F#, 6
+	note F#, 2
 	notetype $c, $b7
-	note G_, 5
+	note G_, 6
 	notetype $c, $c2
-	note F#, 1
-	note F#, 1
+	note F#, 2
+	note F#, 2
 	notetype $c, $c7
 	octave 1
-	note B_, 3
+	note B_, 4
 	notetype $c, $c2
 	octave 3
-	note F#, 1
-	note F#, 1
+	note F#, 2
+	note F#, 2
 	notetype $c, $c7
 	octave 1
-	note B_, 3
+	note B_, 4
 	notetype $c, $c2
 	octave 3
-	note F#, 1
-	note F#, 1
+	note F#, 2
+	note F#, 2
 	notetype $c, $c7
 	octave 1
-	note B_, 3
+	note B_, 4
 	notetype $c, $c2
 	octave 3
-	note F#, 1
+	note F#, 2
 	notetype $c, $c7
-	note G_, 5
+	note G_, 6
 	notetype $c, $c2
 	octave 4
-	note F#, 1
-	note F#, 1
+	note F#, 2
+	note F#, 2
 	notetype $c, $c7
 	octave 1
-	note B_, 3
+	note B_, 4
 	notetype $c, $c2
 	octave 4
-	note F#, 1
-	note F#, 1
+	note F#, 2
+	note F#, 2
 	notetype $c, $c7
 	octave 1
-	note B_, 3
+	note B_, 4
 	notetype $c, $c2
 	octave 4
-	note F#, 1
-	note F#, 1
+	note F#, 2
+	note F#, 2
 	notetype $c, $c7
 	octave 1
-	note B_, 3
+	note B_, 4
 	notetype $c, $c2
 	octave 4
-	note F#, 1
+	note F#, 2
 	notetype $c, $c7
-	note G_, 5
+	note G_, 6
 	notetype $c, $c2
-	note F#, 1
-	note F#, 1
+	note F#, 2
+	note F#, 2
 	notetype $c, $c7
 	octave 1
-	note B_, 3
+	note B_, 4
 	notetype $c, $c2
 	octave 4
-	note F#, 1
-	note F#, 1
+	note F#, 2
+	note F#, 2
 	notetype $c, $c7
 	octave 1
-	note B_, 3
+	note B_, 4
 	notetype $c, $c2
 	octave 4
-	note F#, 1
-	note F#, 1
+	note F#, 2
+	note F#, 2
 	notetype $c, $c7
 	octave 1
-	note B_, 3
+	note B_, 4
 	notetype $c, $c2
 	octave 4
-	note F#, 1
+	note F#, 2
 	notetype $c, $c7
-	note G_, 5
+	note G_, 6
 	notetype $c, $b0
 	octave 3
-	note F#, 7
+	note F#, 8
 	octave 2
-	note B_, 7
+	note B_, 8
 	octave 3
-	note G_, 7
-	note E_, 7
-	note F#, 7
+	note G_, 8
+	note E_, 8
+	note F#, 8
 	octave 2
-	note B_, 7
+	note B_, 8
 	octave 3
-	note C_, 7
+	note C_, 8
 	notetype $c, $b7
 	octave 3
-	note C_, 7
+	note C_, 8
 	notetype $c, $c7
 	octave 1
-	note B_, 7
+	note B_, 8
 	octave 2
-	note E_, 7
-	note C_, 7
-	note F_, 7
-	note E_, 7
+	note E_, 8
+	note C_, 8
+	note F_, 8
+	note E_, 8
 	octave 1
-	note B_, 7
+	note B_, 8
 	notetype $c, $b0
 	octave 2
-	note C_, 9
+	note C_, 10
 	notetype $c, $b7
 	octave 2
-	note C_, 5
+	note C_, 6
 	notetype $c, $c3
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note E_, 1
+	note E_, 2
 	octave 1
-	note F_, 1
+	note F_, 2
 	octave 2
-	note F_, 3
-	note E_, 1
+	note F_, 4
+	note E_, 2
 	octave 1
-	note B_, 1
-	note F_, 1
-	note B_, 1
+	note B_, 2
+	note F_, 2
+	note B_, 2
 	octave 2
-	note E_, 1
-	note F_, 1
-	note E_, 1
+	note E_, 2
+	note F_, 2
+	note E_, 2
 	octave 1
-	note B_, 1
-	note F_, 1
-	note B_, 1
+	note B_, 2
+	note F_, 2
+	note B_, 2
 	octave 2
-	note E_, 1
+	note E_, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note E_, 1
+	note E_, 2
 	octave 1
-	note F_, 1
+	note F_, 2
 	octave 2
-	note F_, 3
-	note E_, 1
+	note F_, 4
+	note E_, 2
 	octave 1
-	note B_, 1
-	note F_, 1
-	note B_, 1
+	note B_, 2
+	note F_, 2
+	note B_, 2
 	octave 2
-	note E_, 1
-	note F_, 1
-	note E_, 1
+	note E_, 2
+	note F_, 2
+	note E_, 2
 	octave 1
-	note B_, 1
-	note F_, 1
-	note B_, 1
+	note B_, 2
+	note F_, 2
+	note B_, 2
 	octave 2
-	note E_, 1
-	note B_, 1
+	note E_, 2
+	note B_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note F_, 1
+	note F_, 2
 	octave 3
-	note F_, 3
-	note E_, 1
+	note F_, 4
+	note E_, 2
 	octave 2
-	note B_, 1
-	note F_, 1
-	note B_, 1
+	note B_, 2
+	note F_, 2
+	note B_, 2
 	octave 3
-	note E_, 1
-	note F_, 1
-	note E_, 1
+	note E_, 2
+	note F_, 2
+	note E_, 2
 	octave 2
-	note B_, 1
-	note F_, 1
-	note B_, 1
+	note B_, 2
+	note F_, 2
+	note B_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note F_, 1
+	note F_, 2
 	octave 3
-	note F_, 3
-	note E_, 1
+	note F_, 4
+	note E_, 2
 	octave 2
-	note B_, 1
-	note F_, 1
-	note B_, 1
+	note B_, 2
+	note F_, 2
+	note B_, 2
 	octave 3
-	note E_, 1
-	note F_, 1
-	note E_, 1
+	note E_, 2
+	note F_, 2
+	note E_, 2
 	octave 2
-	note B_, 1
-	note F_, 1
-	note B_, 1
+	note B_, 2
+	note F_, 2
+	note B_, 2
 	octave 3
-	note E_, 1
-	note D_, 1
-	note G_, 1
+	note E_, 2
+	note D_, 2
+	note G_, 2
 	octave 2
-	note G#, 1
+	note G#, 2
 	octave 3
-	note G#, 3
-	note G_, 1
-	note D_, 1
+	note G#, 4
+	note G_, 2
+	note D_, 2
 	octave 2
-	note G#, 1
+	note G#, 2
 	octave 3
-	note D_, 1
-	note G_, 1
-	note G#, 1
-	note G_, 1
-	note D_, 1
+	note D_, 2
+	note G_, 2
+	note G#, 2
+	note G_, 2
+	note D_, 2
 	octave 2
-	note G#, 1
+	note G#, 2
 	octave 3
-	note D_, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
 	octave 2
-	note G#, 1
+	note G#, 2
 	octave 3
-	note G#, 3
-	note G_, 1
-	note D_, 1
+	note G#, 4
+	note G_, 2
+	note D_, 2
 	octave 2
-	note G#, 1
+	note G#, 2
 	octave 3
-	note D_, 1
-	note G_, 1
-	note G#, 1
-	note G_, 1
-	note D_, 1
+	note D_, 2
+	note G_, 2
+	note G#, 2
+	note G_, 2
+	note D_, 2
 	octave 2
-	note G#, 1
+	note G#, 2
 	octave 3
-	note D_, 1
-	note G_, 1
-	note B_, 1
+	note D_, 2
+	note G_, 2
+	note B_, 2
 	octave 4
-	note E_, 1
+	note E_, 2
 	octave 3
-	note F_, 1
+	note F_, 2
 	octave 4
-	note F_, 3
-	note E_, 1
+	note F_, 4
+	note E_, 2
 	octave 3
-	note B_, 1
-	note F_, 1
-	note B_, 1
+	note B_, 2
+	note F_, 2
+	note B_, 2
 	octave 4
-	note E_, 1
-	note F_, 1
-	note E_, 1
+	note E_, 2
+	note F_, 2
+	note E_, 2
 	octave 3
-	note B_, 1
-	note F_, 1
-	note B_, 1
+	note B_, 2
+	note F_, 2
+	note B_, 2
 	octave 4
-	note E_, 1
+	note E_, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note E_, 1
+	note E_, 2
 	octave 3
-	note F_, 1
+	note F_, 2
 	octave 4
-	note F_, 3
-	note E_, 1
+	note F_, 4
+	note E_, 2
 	octave 3
-	note B_, 1
-	note F_, 1
-	note B_, 1
+	note B_, 2
+	note F_, 2
+	note B_, 2
 	octave 4
-	note E_, 1
-	note F_, 1
-	note E_, 1
+	note E_, 2
+	note F_, 2
+	note E_, 2
 	octave 3
-	note B_, 1
-	note F_, 1
-	note B_, 1
+	note B_, 2
+	note F_, 2
+	note B_, 2
 	octave 4
-	note E_, 1
-	note D_, 1
-	note G_, 1
+	note E_, 2
+	note D_, 2
+	note G_, 2
 	octave 3
-	note G#, 1
+	note G#, 2
 	octave 4
-	note G#, 3
-	note G_, 1
-	note D_, 1
+	note G#, 4
+	note G_, 2
+	note D_, 2
 	octave 3
-	note G#, 1
+	note G#, 2
 	octave 4
-	note D_, 1
-	note G_, 1
-	note G#, 1
-	note G_, 1
-	note D_, 1
+	note D_, 2
+	note G_, 2
+	note G#, 2
+	note G_, 2
+	note D_, 2
 	octave 3
-	note G#, 1
+	note G#, 2
 	octave 4
-	note D_, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
 	octave 3
-	note G#, 1
+	note G#, 2
 	octave 4
-	note G#, 3
-	note G_, 1
-	note D_, 1
+	note G#, 4
+	note G_, 2
+	note D_, 2
 	octave 3
-	note G#, 1
+	note G#, 2
 	octave 4
-	note D_, 1
-	note G_, 1
-	note G#, 1
-	note G_, 1
-	note D_, 1
+	note D_, 2
+	note G_, 2
+	note G#, 2
+	note G_, 2
+	note D_, 2
 	octave 3
-	note G#, 1
+	note G#, 2
 	octave 4
-	note D_, 1
-	note G_, 1
+	note D_, 2
+	note G_, 2
 	notetype $c, $c2
-	note A_, 7
+	note A_, 8
 	notetype $c, $c3
 	octave 2
-	note A_, 1
-	note B_, 1
-	note E_, 1
+	note A_, 2
+	note B_, 2
+	note E_, 2
 	octave 3
-	note E_, 3
+	note E_, 4
 	octave 2
-	note B_, 1
-	note A_, 1
-	note E_, 1
-	note A_, 1
-	note B_, 1
+	note B_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note B_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note B_, 1
-	note A_, 1
-	note E_, 1
-	note A_, 1
-	note B_, 1
-	note A_, 1
-	note B_, 1
-	note E_, 1
+	note B_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note B_, 2
+	note E_, 2
 	octave 3
-	note E_, 3
+	note E_, 4
 	octave 2
-	note B_, 1
-	note A_, 1
-	note E_, 1
-	note A_, 1
-	note B_, 1
+	note B_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note B_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note B_, 1
-	note A_, 1
-	note E_, 1
-	note A_, 1
-	note B_, 1
+	note B_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note B_, 2
 	octave 3
-	note C_, 1
-	note D_, 1
+	note C_, 2
+	note D_, 2
 	octave 2
-	note G_, 1
+	note G_, 2
 	octave 3
-	note G_, 3
-	note D_, 1
-	note C_, 1
+	note G_, 4
+	note D_, 2
+	note C_, 2
 	octave 2
-	note G_, 1
+	note G_, 2
 	octave 3
-	note C_, 1
-	note D_, 1
-	note G_, 1
-	note D_, 1
-	note C_, 1
+	note C_, 2
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note C_, 2
 	octave 2
-	note G_, 1
+	note G_, 2
 	octave 3
-	note C_, 1
-	note D_, 1
-	note C_, 1
-	note D_, 1
+	note C_, 2
+	note D_, 2
+	note C_, 2
+	note D_, 2
 	octave 2
-	note G_, 1
+	note G_, 2
 	octave 3
-	note G_, 3
-	note D_, 1
-	note C_, 1
+	note G_, 4
+	note D_, 2
+	note C_, 2
 	octave 2
-	note G_, 1
+	note G_, 2
 	octave 3
-	note C_, 1
-	note D_, 1
-	note G_, 1
-	note D_, 1
-	note C_, 1
+	note C_, 2
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note C_, 2
 	octave 2
-	note G_, 1
+	note G_, 2
 	octave 3
-	note C_, 1
-	note D_, 1
+	note C_, 2
+	note D_, 2
 	octave 2
-	note A_, 1
-	note B_, 1
-	note E_, 1
+	note A_, 2
+	note B_, 2
+	note E_, 2
 	octave 3
-	note E_, 3
+	note E_, 4
 	octave 2
-	note B_, 1
-	note A_, 1
-	note E_, 1
-	note A_, 1
-	note B_, 1
+	note B_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note B_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note B_, 1
-	note A_, 1
-	note E_, 1
-	note A_, 1
-	note B_, 1
-	note A_, 1
-	note B_, 1
-	note E_, 1
+	note B_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note B_, 2
+	note E_, 2
 	octave 3
-	note E_, 3
+	note E_, 4
 	octave 2
-	note B_, 1
-	note A_, 1
-	note E_, 1
-	note A_, 1
-	note B_, 1
+	note B_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note B_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note B_, 1
-	note A_, 1
-	note E_, 1
-	note A_, 1
-	note B_, 1
+	note B_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note B_, 2
 	loopchannel 0, Music_SuicuneBattle_branch_178e4e
 
 Music_SuicuneBattle_Ch3: ; 179122
 	notetype $c, $18
-	note __, 15
-	note __, 3
+	note __, 16
+	note __, 4
 	octave 2
-	note A_, 3
-	note D_, 1
-	note E_, 1
-	note A#, 1
-	note G_, 1
-	note D_, 1
-	note E_, 1
+	note A_, 4
+	note D_, 2
+	note E_, 2
+	note A#, 2
+	note G_, 2
+	note D_, 2
+	note E_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note A_, 3
-	note E_, 1
-	note D_, 1
+	note A_, 4
+	note E_, 2
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
-	note E_, 1
-	note A_, 1
-	note E_, 1
-	note D_, 1
+	note D_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
-	note E_, 1
-	note D_, 1
-	note E_, 1
+	note D_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note A_, 3
-	note E_, 1
-	note D_, 1
+	note A_, 4
+	note E_, 2
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
-	note E_, 1
-	note A_, 3
-	note E_, 1
+	note D_, 2
+	note E_, 2
+	note A_, 4
+	note E_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
-	note E_, 1
-	note D_, 1
-	note E_, 1
+	note D_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note A_, 3
-	note E_, 1
-	note D_, 1
+	note A_, 4
+	note E_, 2
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
-	note E_, 1
-	note A_, 1
-	note E_, 1
-	note D_, 1
+	note D_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
-	note E_, 1
-	note D_, 1
-	note E_, 1
+	note D_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note A_, 3
-	note E_, 1
-	note D_, 1
+	note A_, 4
+	note E_, 2
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
-	note E_, 1
-	note A_, 3
-	note E_, 1
+	note D_, 2
+	note E_, 2
+	note A_, 4
+	note E_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
-	note E_, 1
+	note D_, 2
+	note E_, 2
 	notetype $c, $16
 
 Music_SuicuneBattle_branch_179182: ; 179182
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
-	note A_, 1
-	note D_, 1
+	note D_, 2
+	note A_, 2
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note A_, 1
-	note D_, 1
-	note A_, 1
-	note C_, 1
-	note G_, 1
-	note C_, 1
-	note G_, 1
-	note C_, 1
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note C_, 1
-	note G_, 1
-	note C_, 1
-	note G_, 1
-	note C_, 1
-	note G_, 1
-	note C_, 1
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note C_, 1
-	note G_, 1
-	note C_, 1
-	note G_, 1
-	note C_, 1
-	note G_, 1
-	note C_, 1
-	note G_, 1
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note G_, 1
-	note C_, 1
-	note G_, 1
-	note C_, 1
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
 	octave 3
-	note C_, 3
+	note C_, 4
 	octave 2
-	note G_, 1
-	note F_, 1
-	note D_, 1
+	note G_, 2
+	note F_, 2
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
-	note A_, 1
-	note D_, 1
+	note D_, 2
+	note A_, 2
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note A_, 1
-	note D_, 1
-	note A_, 1
-	note C_, 1
-	note G_, 1
-	note C_, 1
-	note G_, 1
-	note C_, 1
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note C_, 1
-	note G_, 1
-	note C_, 1
-	note G_, 1
-	note C_, 1
-	note G_, 1
-	note C_, 1
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note G_, 1
+	note G_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note G_, 1
+	note G_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note G_, 1
+	note G_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note G_, 1
+	note G_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note G_, 1
+	note G_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note C_, 1
-	note G_, 1
-	note C_, 1
+	note C_, 2
+	note G_, 2
+	note C_, 2
 	octave 3
-	note C_, 3
+	note C_, 4
 	octave 2
-	note G_, 1
-	note C_, 1
-	note G_, 1
+	note G_, 2
+	note C_, 2
+	note G_, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note F#, 1
-	note B_, 1
-	note F#, 1
+	note F#, 2
+	note B_, 2
+	note F#, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note F#, 1
+	note F#, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note F#, 1
+	note F#, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note F#, 1
-	note B_, 1
-	note F#, 1
+	note F#, 2
+	note B_, 2
+	note F#, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note F#, 1
+	note F#, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note F#, 1
-	note C_, 1
-	note G_, 1
+	note F#, 2
+	note C_, 2
+	note G_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note G_, 1
-	note C_, 1
-	note G_, 1
-	note C_, 1
-	note G_, 1
-	note C_, 1
-	note G_, 1
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note G_, 3
-	note C_, 1
+	note G_, 4
+	note C_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note G_, 1
-	note D_, 1
-	note A_, 1
+	note G_, 2
+	note D_, 2
+	note A_, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note A_, 1
-	note D_, 1
-	note A_, 1
-	note D_, 1
-	note A_, 1
-	note D_, 1
-	note A_, 1
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note A_, 1
-	note D_, 1
-	note A_, 1
-	note D_, 1
-	note A_, 1
-	note C_, 1
-	note G_, 1
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note C_, 2
+	note G_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note G_, 1
+	note G_, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note F#, 1
+	note F#, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note F#, 1
+	note F#, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note E_, 1
-	note A_, 1
-	note E_, 1
-	note C_, 1
-	note G_, 1
-	note C_, 1
-	note G_, 1
-	note F#, 1
-	note F#, 1
-	note __, 3
-	note F#, 1
-	note F#, 1
-	note __, 3
-	note F#, 1
-	note F#, 1
-	note __, 3
-	note F#, 1
-	note G_, 5
-	note F#, 1
-	note F#, 1
-	note __, 3
-	note F#, 1
-	note F#, 1
-	note __, 3
-	note F#, 1
-	note F#, 1
-	note __, 3
-	note F#, 1
-	note G_, 5
-	note B_, 1
-	note B_, 1
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note F#, 2
+	note F#, 2
+	note __, 4
+	note F#, 2
+	note F#, 2
+	note __, 4
+	note F#, 2
+	note F#, 2
+	note __, 4
+	note F#, 2
+	note G_, 6
+	note F#, 2
+	note F#, 2
+	note __, 4
+	note F#, 2
+	note F#, 2
+	note __, 4
+	note F#, 2
+	note F#, 2
+	note __, 4
+	note F#, 2
+	note G_, 6
+	note B_, 2
+	note B_, 2
 	octave 1
-	note B_, 3
+	note B_, 4
 	octave 2
-	note B_, 1
-	note B_, 1
+	note B_, 2
+	note B_, 2
 	octave 1
-	note B_, 3
+	note B_, 4
 	octave 2
-	note B_, 1
-	note B_, 1
+	note B_, 2
+	note B_, 2
 	octave 1
-	note B_, 3
+	note B_, 4
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note C_, 5
-	note F#, 1
-	note F#, 1
+	note C_, 6
+	note F#, 2
+	note F#, 2
 	octave 1
-	note B_, 3
+	note B_, 4
 	octave 3
-	note F#, 1
-	note F#, 1
+	note F#, 2
+	note F#, 2
 	octave 1
-	note B_, 3
+	note B_, 4
 	octave 3
-	note F#, 1
-	note F#, 1
+	note F#, 2
+	note F#, 2
 	octave 1
-	note B_, 3
+	note B_, 4
 	octave 3
-	note F#, 1
-	note G_, 5
+	note F#, 2
+	note G_, 6
 	octave 2
-	note F#, 7
+	note F#, 8
 	octave 1
-	note B_, 7
+	note B_, 8
 	octave 2
-	note G_, 7
-	note E_, 7
-	note F#, 7
+	note G_, 8
+	note E_, 8
+	note F#, 8
 	octave 1
-	note B_, 7
+	note B_, 8
 	octave 2
-	note C_, 9
-	note C_, 1
-	note D_, 1
-	note C_, 1
+	note C_, 10
+	note C_, 2
+	note D_, 2
+	note C_, 2
 	octave 1
-	note B_, 7
+	note B_, 8
 	octave 2
-	note E_, 7
-	note C_, 7
-	note F_, 7
-	note E_, 7
+	note E_, 8
+	note C_, 8
+	note F_, 8
+	note E_, 8
 	octave 1
-	note B_, 7
+	note B_, 8
 	octave 2
-	note C_, 15
-	note __, 3
+	note C_, 16
+	note __, 4
 	octave 1
-	note B_, 1
-	note __, 5
-	note B_, 1
-	note __, 1
-	note __, 3
-	note B_, 1
-	note __, 5
-	note B_, 1
-	note __, 1
-	note __, 3
-	note B_, 1
-	note __, 5
-	note B_, 1
-	note __, 1
-	note __, 3
-	note B_, 1
-	note __, 5
-	note B_, 1
-	note __, 1
-	note B_, 1
+	note B_, 2
+	note __, 6
+	note B_, 2
+	note __, 2
+	note __, 4
+	note B_, 2
+	note __, 6
+	note B_, 2
+	note __, 2
+	note __, 4
+	note B_, 2
+	note __, 6
+	note B_, 2
+	note __, 2
+	note __, 4
+	note B_, 2
+	note __, 6
+	note B_, 2
+	note __, 2
+	note B_, 2
 	octave 2
-	note F_, 1
-	note B_, 1
+	note F_, 2
+	note B_, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note F_, 1
-	note B_, 1
+	note F_, 2
+	note B_, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note F_, 1
+	note F_, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note F_, 1
-	note B_, 1
+	note F_, 2
+	note B_, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note F_, 1
-	note B_, 1
+	note F_, 2
+	note B_, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note F_, 1
+	note F_, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note F_, 1
-	note B_, 1
+	note F_, 2
+	note B_, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note F_, 1
-	note B_, 1
+	note F_, 2
+	note B_, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note F_, 1
+	note F_, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note F_, 1
-	note B_, 1
-	note F_, 1
-	note B_, 1
-	note F_, 1
+	note F_, 2
+	note B_, 2
+	note F_, 2
+	note B_, 2
+	note F_, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note F_, 1
-	note D_, 1
-	note G#, 1
+	note F_, 2
+	note D_, 2
+	note G#, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note D_, 1
-	note G#, 1
+	note D_, 2
+	note G#, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note D_, 1
-	note G#, 1
-	note D_, 1
-	note G#, 1
+	note D_, 2
+	note G#, 2
+	note D_, 2
+	note G#, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note D_, 1
-	note G#, 1
+	note D_, 2
+	note G#, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note D_, 1
-	note G#, 1
-	note D_, 1
-	note G#, 1
+	note D_, 2
+	note G#, 2
+	note D_, 2
+	note G#, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note D_, 1
-	note G#, 1
+	note D_, 2
+	note G#, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note D_, 1
-	note G#, 1
-	note D_, 1
-	note G#, 1
+	note D_, 2
+	note G#, 2
+	note D_, 2
+	note G#, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note G#, 1
+	note G#, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note G#, 1
-	note D_, 1
-	note G#, 1
-	note B_, 1
-	note F_, 1
+	note G#, 2
+	note D_, 2
+	note G#, 2
+	note B_, 2
+	note F_, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note B_, 1
-	note F_, 1
+	note B_, 2
+	note F_, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note B_, 1
-	note F_, 1
-	note B_, 1
-	note F_, 1
+	note B_, 2
+	note F_, 2
+	note B_, 2
+	note F_, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note B_, 1
-	note F_, 1
+	note B_, 2
+	note F_, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note B_, 1
-	note F_, 1
+	note B_, 2
+	note F_, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note F_, 1
-	note B_, 1
+	note F_, 2
+	note B_, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note F_, 1
-	note B_, 1
+	note F_, 2
+	note B_, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note F_, 1
+	note F_, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note F_, 1
-	note B_, 1
+	note F_, 2
+	note B_, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note F_, 1
-	note B_, 1
+	note F_, 2
+	note B_, 2
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 2
-	note F_, 1
+	note F_, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note G#, 1
-	note D_, 1
+	note G#, 2
+	note D_, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note G#, 1
-	note D_, 1
+	note G#, 2
+	note D_, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note G#, 1
+	note G#, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note G#, 1
-	note D_, 1
+	note G#, 2
+	note D_, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note G#, 1
-	note D_, 1
+	note G#, 2
+	note D_, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note G#, 1
-	note D_, 1
-	note G#, 1
+	note G#, 2
+	note D_, 2
+	note G#, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note D_, 1
-	note G#, 1
+	note D_, 2
+	note G#, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note D_, 1
-	note G#, 1
-	note D_, 1
-	note G#, 1
+	note D_, 2
+	note G#, 2
+	note D_, 2
+	note G#, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note G#, 1
+	note G#, 2
 	octave 3
-	note D_, 1
+	note D_, 2
 	octave 2
-	note G#, 1
-	note D_, 1
-	note G#, 1
-	note A_, 3
-	note __, 3
+	note G#, 2
+	note D_, 2
+	note G#, 2
+	note A_, 4
+	note __, 4
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
-	note A_, 1
-	note D_, 1
+	note D_, 2
+	note A_, 2
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note D_, 1
-	note C_, 1
-	note G_, 1
+	note D_, 2
+	note C_, 2
+	note G_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note C_, 1
-	note G_, 1
+	note C_, 2
+	note G_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note C_, 1
-	note G_, 1
-	note C_, 1
-	note G_, 1
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note C_, 1
-	note G_, 1
+	note C_, 2
+	note G_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note C_, 1
-	note G_, 1
-	note C_, 1
-	note G_, 1
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note C_, 1
-	note G_, 1
+	note C_, 2
+	note G_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note C_, 1
-	note G_, 1
-	note C_, 1
-	note G_, 1
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note C_, 1
-	note G_, 1
+	note C_, 2
+	note G_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note C_, 1
-	note G_, 1
+	note C_, 2
+	note G_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note E_, 1
-	note A_, 1
+	note E_, 2
+	note A_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note E_, 1
-	note A_, 1
+	note E_, 2
+	note A_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note E_, 1
+	note E_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note E_, 1
-	note A_, 1
+	note E_, 2
+	note A_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note E_, 1
-	note A_, 1
+	note E_, 2
+	note A_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note E_, 1
+	note E_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note E_, 1
-	note A_, 1
+	note E_, 2
+	note A_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note E_, 1
-	note A_, 1
+	note E_, 2
+	note A_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note E_, 1
+	note E_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note E_, 1
+	note E_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 2
-	note A_, 3
-	note E_, 1
-	note D_, 1
-	note E_, 1
+	note A_, 4
+	note E_, 2
+	note D_, 2
+	note E_, 2
 	loopchannel 0, Music_SuicuneBattle_branch_179182
 ; 17948b
--- a/audio/music/surf.asm
+++ b/audio/music/surf.asm
@@ -17,58 +17,58 @@
 	vibrato $10, $24
 	intensity $73
 	octave 3
-	note F_, 0
-	note __, 0
-	note D#, 0
-	note __, 0
+	note F_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
 	intensity $73
-	note F_, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note G#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
+	note F_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note G#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
 	intensity $73
-	note F_, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note F_, 0
-	note __, 0
-	note D#, 0
+	note F_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note F_, 1
+	note __, 1
+	note D#, 1
 	intensity $93
-	note __, 0
-	note G#, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	intensity $a7
-	note F_, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note F_, 0
-	note __, 0
-	note D#, 0
-	intensity $b7
-	note __, 0
-	note A#, 1
+	note __, 1
 	note G#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	intensity $a7
 	note F_, 1
-	note D_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note F_, 1
+	note __, 1
+	note D#, 1
+	intensity $b7
+	note __, 1
+	note A#, 2
+	note G#, 2
+	note F_, 2
+	note D_, 2
 	notetype $8, $c7
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note D_, 1
-	note F_, 1
+	note D_, 2
+	note F_, 2
 	intensity $f7
-	note G#, 1
-	note A#, 1
+	note G#, 2
+	note A#, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	dutycycle $0
 	callchannel Music_Surf_branch_f5233
 	dutycycle $1
@@ -76,49 +76,49 @@
 	callchannel Music_Surf_branch_f5233
 	callchannel Music_Surf_branch_f5293
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G_, 1
-	note D#, 1
-	note C_, 1
-	note D#, 1
-	note G_, 1
+	note G_, 2
+	note D#, 2
+	note C_, 2
+	note D#, 2
+	note G_, 2
 	octave 4
-	note C_, 1
-	note D#, 1
-	note G_, 1
+	note C_, 2
+	note D#, 2
+	note G_, 2
 	dutycycle $1
 	notetype $6, $97
 	callchannel Music_Surf_branch_f5293
 	intensity $a8
-	note G#, 5
-	note A_, 5
-	note A#, 2
+	note G#, 6
+	note A_, 6
+	note A#, 3
 	octave 4
-	note D_, 2
+	note D_, 3
 	intensity $a8
 	dutycycle $1
 	callchannel Music_Surf_branch_f52d9
 	octave 3
-	note D#, 7
-	note G#, 7
-	note D#, 7
+	note D#, 8
+	note G#, 8
+	note D#, 8
 	dutycycle $3
 	notetype $8, $98
 	callchannel Music_Surf_branch_f52d9
 	notetype $c, $a7
 	octave 3
-	note D#, 11
+	note D#, 12
 	octave 2
-	note F_, 3
-	note D#, 3
-	note F_, 3
-	note G#, 3
-	note D#, 1
-	note G#, 1
-	note B_, 1
+	note F_, 4
+	note D#, 4
+	note F_, 4
+	note G#, 4
+	note D#, 2
+	note G#, 2
+	note B_, 2
 	octave 3
-	note D#, 1
+	note D#, 2
 	loopchannel 0, Music_Surf_branch_f519e
 ; f5233
 
@@ -125,222 +125,222 @@
 Music_Surf_branch_f5233: ; f5233
 	notetype $c, $a7
 	octave 3
-	note D#, 3
-	note A#, 0
-	note __, 0
+	note D#, 4
+	note A#, 1
+	note __, 1
 	octave 4
-	note D#, 0
-	note __, 0
+	note D#, 1
+	note __, 1
 	octave 3
-	note A#, 0
-	note __, 0
+	note A#, 1
+	note __, 1
 	octave 4
-	note D#, 0
-	note __, 0
+	note D#, 1
+	note __, 1
 	octave 3
-	note D#, 3
-	note A#, 0
-	note __, 0
+	note D#, 4
+	note A#, 1
+	note __, 1
 	octave 4
-	note D#, 0
-	note __, 0
+	note D#, 1
+	note __, 1
 	octave 3
-	note A#, 0
-	note __, 0
+	note A#, 1
+	note __, 1
 	octave 4
-	note D#, 0
-	note __, 0
+	note D#, 1
+	note __, 1
 	octave 3
-	note C#, 3
-	note A#, 0
-	note __, 0
+	note C#, 4
+	note A#, 1
+	note __, 1
 	octave 4
-	note C#, 0
-	note __, 0
+	note C#, 1
+	note __, 1
 	octave 3
-	note A#, 0
-	note __, 0
+	note A#, 1
+	note __, 1
 	octave 4
-	note C#, 0
-	note __, 0
+	note C#, 1
+	note __, 1
 	octave 3
-	note C#, 3
-	note A#, 0
-	note __, 0
+	note C#, 4
+	note A#, 1
+	note __, 1
 	octave 4
-	note C#, 0
-	note __, 0
+	note C#, 1
+	note __, 1
 	octave 3
-	note A#, 0
-	note __, 0
+	note A#, 1
+	note __, 1
 	octave 4
-	note C#, 0
-	note __, 0
+	note C#, 1
+	note __, 1
 	octave 3
-	note C_, 3
-	note G#, 0
-	note __, 0
+	note C_, 4
+	note G#, 1
+	note __, 1
 	octave 4
-	note C_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
 	octave 3
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
 	octave 4
-	note C_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
 	octave 3
-	note C_, 3
-	note G#, 0
-	note __, 0
+	note C_, 4
+	note G#, 1
+	note __, 1
 	octave 4
-	note C_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
 	octave 3
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
 	octave 4
-	note C_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
 	notetype $6, $a7
 	octave 3
-	note A#, 0
-	note B_, 14
+	note A#, 1
+	note B_, 15
 	octave 4
-	note D#, 3
+	note D#, 4
 	octave 3
-	note B_, 3
-	note G#, 7
-	note F_, 7
-	note C#, 3
-	note D_, 3
+	note B_, 4
+	note G#, 8
+	note F_, 8
+	note C#, 4
+	note D_, 4
 	endchannel
 ; f5293
 
 Music_Surf_branch_f5293: ; f5293
 	octave 4
-	note G#, 15
-	note D#, 3
-	note C_, 3
+	note G#, 16
+	note D#, 4
+	note C_, 4
 	octave 3
-	note G#, 3
+	note G#, 4
 	octave 4
-	note C_, 3
-	note D_, 3
-	note D#, 3
-	note G_, 3
-	note G#, 3
+	note C_, 4
+	note D_, 4
+	note D#, 4
+	note G_, 4
+	note G#, 4
 	notetype $8, $92
-	note A#, 1
-	note F_, 1
-	note D_, 1
-	note F_, 1
-	note D_, 1
+	note A#, 2
+	note F_, 2
+	note D_, 2
+	note F_, 2
+	note D_, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note A#, 1
-	note F_, 1
-	note A#, 1
-	note F_, 1
-	note D_, 1
+	note A#, 2
+	note F_, 2
+	note A#, 2
+	note F_, 2
+	note D_, 2
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note D_, 1
-	note F_, 1
-	note G#, 1
-	note A#, 1
+	note D_, 2
+	note F_, 2
+	note G#, 2
+	note A#, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	notetype $6, $97
-	note C#, 0
-	note D_, 14
-	note G_, 3
-	note D_, 3
+	note C#, 1
+	note D_, 15
+	note G_, 4
+	note D_, 4
 	octave 3
-	note A#, 3
+	note A#, 4
 	octave 4
-	note D_, 3
-	note F_, 3
-	note G_, 3
-	note A_, 3
-	note A#, 3
+	note D_, 4
+	note F_, 4
+	note G_, 4
+	note A_, 4
+	note A#, 4
 	notetype $8, $92
 	octave 5
-	note C_, 1
+	note C_, 2
 	octave 4
-	note G_, 1
-	note D#, 1
-	note G_, 1
-	note D#, 1
-	note C_, 1
-	note D#, 1
-	note C_, 1
+	note G_, 2
+	note D#, 2
+	note G_, 2
+	note D#, 2
+	note C_, 2
+	note D#, 2
+	note C_, 2
 	octave 3
-	note G_, 1
+	note G_, 2
 	endchannel
 ; f52d9
 
 Music_Surf_branch_f52d9: ; f52d9
 	octave 3
-	note A#, 2
-	note G_, 2
-	note A#, 2
+	note A#, 3
+	note G_, 3
+	note A#, 3
 	octave 4
-	note D#, 8
+	note D#, 9
 	notetype $6, $58
-	note D_, 0
-	note C#, 0
-	note C_, 0
+	note D_, 1
+	note C#, 1
+	note C_, 1
 	octave 3
-	note B_, 0
-	note A#, 0
-	note A_, 0
-	note G#, 0
-	note G_, 0
+	note B_, 1
+	note A#, 1
+	note A_, 1
+	note G#, 1
+	note G_, 1
 	intensity $a8
-	note D#, 3
-	note D_, 3
-	note D#, 3
-	note G_, 3
-	note A_, 3
-	note G#, 3
-	note G_, 3
-	note F#, 3
-	note F_, 3
-	note E_, 3
-	note G_, 7
-	note C#, 7
-	note A#, 7
-	note A_, 0
-	note A#, 2
-	note G#, 3
+	note D#, 4
+	note D_, 4
+	note D#, 4
+	note G_, 4
+	note A_, 4
+	note G#, 4
+	note G_, 4
+	note F#, 4
+	note F_, 4
+	note E_, 4
+	note G_, 8
+	note C#, 8
+	note A#, 8
+	note A_, 1
+	note A#, 3
+	note G#, 4
 	octave 4
-	note C_, 3
-	note F_, 11
+	note C_, 4
+	note F_, 12
 	intensity $58
-	note D#, 0
-	note D_, 0
-	note C#, 0
-	note C_, 0
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
 	octave 3
-	note B_, 0
-	note A#, 0
-	note A_, 0
-	note G_, 0
+	note B_, 1
+	note A#, 1
+	note A_, 1
+	note G_, 1
 	intensity $a8
-	note G#, 7
+	note G#, 8
 	octave 4
-	note D#, 3
+	note D#, 4
 	octave 3
-	note B_, 3
-	note G#, 7
-	note D#, 7
+	note B_, 4
+	note G#, 8
+	note D#, 8
 	octave 2
-	note B_, 7
+	note B_, 8
 	endchannel
 
 Music_Surf_Ch2: ; f5317
@@ -353,67 +353,67 @@
 
 Music_Surf_branch_f5321: ; f5321
 	octave 1
-	note A#, 3
+	note A#, 4
 	octave 2
-	note A#, 0
-	note __, 2
-	note A#, 0
-	note __, 2
+	note A#, 1
+	note __, 3
+	note A#, 1
+	note __, 3
 	loopchannel 3, Music_Surf_branch_f5321
 	octave 1
-	note A#, 3
+	note A#, 4
 	octave 2
-	note F_, 0
-	note __, 2
-	note A#, 0
-	note __, 2
+	note F_, 1
+	note __, 3
+	note A#, 1
+	note __, 3
 
 Music_Surf_branch_f5333: ; f5333
-	note D#, 3
-	note G_, 1
-	note G#, 1
-	note A#, 3
-	note D#, 3
-	note G_, 1
-	note G#, 1
-	note A#, 3
-	note C#, 3
-	note G_, 1
-	note G#, 1
-	note A#, 3
-	note C#, 3
-	note G_, 1
-	note G#, 1
-	note A#, 3
-	note C_, 3
-	note F_, 1
-	note G_, 1
-	note G#, 3
-	note C_, 3
-	note F_, 1
-	note G_, 1
-	note G#, 3
+	note D#, 4
+	note G_, 2
+	note G#, 2
+	note A#, 4
+	note D#, 4
+	note G_, 2
+	note G#, 2
+	note A#, 4
+	note C#, 4
+	note G_, 2
+	note G#, 2
+	note A#, 4
+	note C#, 4
+	note G_, 2
+	note G#, 2
+	note A#, 4
+	note C_, 4
+	note F_, 2
+	note G_, 2
+	note G#, 4
+	note C_, 4
+	note F_, 2
+	note G_, 2
+	note G#, 4
 	octave 1
-	note B_, 3
+	note B_, 4
 	octave 2
-	note F_, 1
-	note G_, 1
-	note G#, 1
-	note A#, 1
-	note B_, 3
-	note A#, 3
-	note G#, 3
+	note F_, 2
+	note G_, 2
+	note G#, 2
+	note A#, 2
+	note B_, 4
+	note A#, 4
+	note G#, 4
 	loopchannel 2, Music_Surf_branch_f5333
 	intensity $c7
 	callchannel Music_Surf_branch_f53b2
-	note D#, 3
-	note D_, 3
-	note C#, 3
+	note D#, 4
+	note D_, 4
+	note C#, 4
 	callchannel Music_Surf_branch_f53b2
-	note D_, 3
-	note D#, 3
+	note D_, 4
+	note D#, 4
 	octave 1
-	note A#, 3
+	note A#, 4
 	notetype $6, $b8
 	callchannel Music_Surf_branch_f53d6
 	dutycycle $1
@@ -425,9 +425,9 @@
 	intensity $b8
 	callchannel Music_Surf_branch_f5404
 	octave 3
-	note B_, 15
+	note B_, 16
 	octave 4
-	note C#, 7
+	note C#, 8
 	forceoctave $c
 	dutycycle $3
 	callchannel Music_Surf_branch_f53d6
@@ -442,297 +442,297 @@
 	forceoctave $0
 	notetype $c, $b8
 	octave 4
-	note B_, 11
+	note B_, 12
 	dutycycle $2
-	note A#, 3
-	note G#, 3
-	note D#, 3
-	note G#, 3
-	note A#, 3
-	note B_, 3
+	note A#, 4
+	note G#, 4
+	note D#, 4
+	note G#, 4
+	note A#, 4
+	note B_, 4
 	loopchannel 0, Music_Surf_branch_f5317
 ; f53b2
 
 Music_Surf_branch_f53b2: ; f53b2
 	octave 1
-	note G#, 3
+	note G#, 4
 	octave 3
-	note F_, 3
-	note D#, 3
+	note F_, 4
+	note D#, 4
 	octave 1
-	note G#, 3
+	note G#, 4
 	octave 3
-	note D#, 3
-	note D_, 3
+	note D#, 4
+	note D_, 4
 	octave 1
-	note A#, 3
+	note A#, 4
 	octave 3
-	note C_, 3
+	note C_, 4
 	octave 2
-	note A#, 3
+	note A#, 4
 	octave 1
-	note A#, 3
+	note A#, 4
 	octave 2
-	note G#, 3
-	note A#, 3
+	note G#, 4
+	note A#, 4
 	octave 1
-	note G_, 3
+	note G_, 4
 	octave 3
-	note D_, 3
-	note C_, 3
+	note D_, 4
+	note C_, 4
 	octave 1
-	note G_, 3
+	note G_, 4
 	octave 2
-	note A#, 3
-	note G_, 3
-	note C_, 3
+	note A#, 4
+	note G_, 4
+	note C_, 4
 	octave 3
-	note F_, 3
-	note G_, 3
+	note F_, 4
+	note G_, 4
 	endchannel
 ; f53d6
 
 Music_Surf_branch_f53d6: ; f53d6
 	octave 4
-	note F_, 3
-	note D#, 3
-	note F_, 3
-	note G_, 11
+	note F_, 4
+	note D#, 4
+	note F_, 4
+	note G_, 12
 	intensity $58
-	note F#, 0
-	note F_, 0
-	note E_, 0
-	note D#, 0
-	note D_, 0
-	note C#, 0
-	note C_, 0
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
 	octave 3
-	note B_, 0
-	note A_, 0
+	note B_, 1
+	note A_, 1
 	endchannel
 ; f53e8
 
 Music_Surf_branch_f53e8: ; f53e8
-	note A#, 6
+	note A#, 7
 	octave 4
-	note C_, 7
-	note C#, 15
-	note C_, 3
+	note C_, 8
+	note C#, 16
+	note C_, 4
 	octave 3
-	note B_, 3
+	note B_, 4
 	octave 4
-	note C_, 15
-	note G_, 7
+	note C_, 16
+	note G_, 8
 	endchannel
 ; f53f3
 
 Music_Surf_branch_f53f3: ; f53f3
-	note F#, 0
-	note G_, 2
-	note F_, 3
+	note F#, 1
 	note G_, 3
-	note G#, 11
+	note F_, 4
+	note G_, 4
+	note G#, 12
 	intensity $58
-	note G_, 0
-	note F#, 0
-	note F_, 0
-	note E_, 0
-	note D#, 0
-	note D_, 0
-	note C#, 0
+	note G_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
 	octave 3
-	note B_, 0
+	note B_, 1
 	endchannel
 ; f5404
 
 Music_Surf_branch_f5404: ; f5404
 	octave 4
-	note C_, 7
-	note G_, 3
-	note G#, 3
-	note A#, 7
-	note G#, 7
-	note D#, 7
+	note C_, 8
+	note G_, 4
+	note G#, 4
+	note A#, 8
+	note G#, 8
+	note D#, 8
 	endchannel
 
-Music_Surf_branch_f540c: ; f540c
-
 Music_Surf_Ch3: ; f540c
+
+Music_Surf_branch_f540c: ; f540c
 	stereopanning $ff
 	notetype $c, $15
 	vibrato $16, $23
 	octave 4
-	note A#, 11
+	note A#, 12
 	octave 5
-	note C_, 11
-	note D_, 7
-	note D#, 3
-	note F_, 3
-	note G_, 3
-	note G#, 3
+	note C_, 12
+	note D_, 8
+	note D#, 4
+	note F_, 4
+	note G_, 4
+	note G#, 4
 	intensity $12
-	note A#, 11
-	note __, 3
-	note G#, 3
-	note G_, 3
+	note A#, 12
+	note __, 4
+	note G#, 4
+	note G_, 4
 	notetype $6, $12
-	note F#, 0
-	note G_, 14
-	note G#, 3
-	note G_, 3
-	note F_, 15
+	note F#, 1
+	note G_, 15
+	note G#, 4
+	note G_, 4
+	note F_, 16
 	octave 4
-	note A#, 7
+	note A#, 8
 	notetype $c, $12
 	octave 5
-	note G#, 15
-	note G_, 3
-	note F_, 3
+	note G#, 16
+	note G_, 4
+	note F_, 4
 	notetype $6, $12
-	note E_, 0
-	note F_, 14
-	note G_, 3
-	note F_, 3
-	note D#, 15
-	note F_, 7
+	note E_, 1
+	note F_, 15
+	note G_, 4
+	note F_, 4
+	note D#, 16
+	note F_, 8
 	notetype $c, $14
-	note A#, 11
-	note __, 3
-	note G#, 3
-	note G_, 3
+	note A#, 12
+	note __, 4
+	note G#, 4
+	note G_, 4
 	notetype $6, $14
-	note F#, 0
-	note G_, 14
-	note G#, 3
-	note G_, 3
-	note F_, 15
+	note F#, 1
+	note G_, 15
+	note G#, 4
+	note G_, 4
+	note F_, 16
 	octave 4
-	note A#, 7
+	note A#, 8
 	notetype $c, $14
 	octave 5
-	note G#, 15
-	note G_, 3
-	note F_, 3
+	note G#, 16
+	note G_, 4
+	note F_, 4
 	notetype $6, $14
-	note E_, 0
-	note F_, 14
-	note G_, 3
-	note F_, 3
-	note D#, 15
+	note E_, 1
+	note F_, 15
+	note G_, 4
+	note F_, 4
+	note D#, 16
 	octave 6
-	note D#, 7
+	note D#, 8
 	notetype $c, $13
-	note C_, 15
-	note D_, 3
-	note D#, 3
+	note C_, 16
+	note D_, 4
+	note D#, 4
 	notetype $6, $13
-	note D_, 0
-	note D#, 14
-	note D_, 3
-	note C_, 3
+	note D_, 1
+	note D#, 15
+	note D_, 4
+	note C_, 4
 	octave 5
-	note D_, 15
+	note D_, 16
 	octave 6
-	note D_, 7
+	note D_, 8
 	notetype $c, $13
 	octave 5
-	note A#, 11
+	note A#, 12
 	notetype $6, $13
-	note A_, 0
-	note A#, 6
+	note A_, 1
+	note A#, 7
 	octave 6
-	note C_, 7
-	note D_, 7
-	note F_, 15
-	note D#, 3
-	note D_, 3
-	note D#, 15
-	note D_, 7
+	note C_, 8
+	note D_, 8
+	note F_, 16
+	note D#, 4
+	note D_, 4
+	note D#, 16
+	note D_, 8
 	notetype $c, $14
-	note C_, 11
-	note C_, 3
-	note D_, 3
-	note D#, 3
+	note C_, 12
+	note C_, 4
+	note D_, 4
+	note D#, 4
 	notetype $6, $14
-	note D_, 0
-	note D#, 14
-	note D_, 3
-	note C_, 3
+	note D_, 1
+	note D#, 15
+	note D_, 4
+	note C_, 4
 	octave 5
-	note D_, 15
+	note D_, 16
 	octave 6
-	note D_, 7
+	note D_, 8
 	notetype $c, $14
 	octave 5
-	note A#, 11
+	note A#, 12
 	notetype $6, $14
-	note A_, 0
-	note A#, 6
+	note A_, 1
+	note A#, 7
 	octave 6
-	note C_, 7
-	note D_, 7
+	note C_, 8
+	note D_, 8
 	notetype $c, $14
-	note F_, 11
-	note G_, 7
+	note F_, 12
+	note G_, 8
 	octave 5
-	note A#, 3
+	note A#, 4
 	intensity $15
 	callchannel Music_Surf_branch_f54c8
 	octave 2
-	note B_, 3
+	note B_, 4
 	octave 3
-	note D#, 3
-	note F_, 3
-	note G#, 3
-	note A#, 3
-	note B_, 3
+	note D#, 4
+	note F_, 4
+	note G#, 4
+	note A#, 4
+	note B_, 4
 	callchannel Music_Surf_branch_f54c8
 	octave 2
-	note B_, 3
+	note B_, 4
 	octave 3
-	note D#, 3
-	note G#, 3
-	note B_, 11
+	note D#, 4
+	note G#, 4
+	note B_, 12
 	octave 2
-	note B_, 11
+	note B_, 12
 	octave 3
-	note D#, 7
+	note D#, 8
 	octave 2
-	note B_, 3
+	note B_, 4
 	loopchannel 0, Music_Surf_branch_f540c
 ; f54c8
 
 Music_Surf_branch_f54c8: ; f54c8
 	octave 3
-	note D#, 3
-	note G_, 0
-	note __, 2
-	note A#, 0
-	note __, 2
-	note D#, 3
-	note G_, 0
-	note __, 2
-	note A#, 0
-	note __, 2
-	note C#, 3
-	note G_, 0
-	note __, 2
-	note A#, 0
-	note __, 2
-	note C#, 3
-	note G_, 0
-	note __, 2
-	note A#, 0
-	note __, 2
-	note C_, 3
-	note F_, 0
-	note __, 2
-	note G#, 0
-	note __, 2
-	note C_, 3
-	note F_, 0
-	note __, 2
-	note G#, 0
-	note __, 2
+	note D#, 4
+	note G_, 1
+	note __, 3
+	note A#, 1
+	note __, 3
+	note D#, 4
+	note G_, 1
+	note __, 3
+	note A#, 1
+	note __, 3
+	note C#, 4
+	note G_, 1
+	note __, 3
+	note A#, 1
+	note __, 3
+	note C#, 4
+	note G_, 1
+	note __, 3
+	note A#, 1
+	note __, 3
+	note C_, 4
+	note F_, 1
+	note __, 3
+	note G#, 1
+	note __, 3
+	note C_, 4
+	note F_, 1
+	note __, 3
+	note G#, 1
+	note __, 3
 	endchannel
 ; f54e8
--- a/audio/music/tintower.asm
+++ b/audio/music/tintower.asm
@@ -17,85 +17,85 @@
 	stereopanning $f0
 	notetype $c, $a5
 	octave 3
-	note G_, 3
-	note C_, 3
-	note G#, 7
-	note G_, 3
-	note C_, 3
+	note G_, 4
+	note C_, 4
+	note G#, 8
+	note G_, 4
+	note C_, 4
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note C_, 1
-	note C#, 1
+	note C_, 2
+	note C#, 2
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note G_, 3
-	note C_, 3
-	note G#, 3
-	note F_, 3
-	note G_, 3
+	note G_, 4
+	note C_, 4
+	note G#, 4
+	note F_, 4
+	note G_, 4
 	octave 2
-	note G_, 3
+	note G_, 4
 	octave 3
-	note G_, 5
-	note A#, 1
-	note G_, 1
-	note F_, 1
-	note C#, 1
-	note G_, 1
-	note G#, 7
-	note G_, 3
+	note G_, 6
+	note A#, 2
+	note G_, 2
+	note F_, 2
+	note C#, 2
+	note G_, 2
+	note G#, 8
+	note G_, 4
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note G#, 1
-	note G_, 1
-	note F_, 1
-	note G#, 1
-	note G_, 1
-	note C#, 1
+	note G#, 2
+	note G_, 2
+	note F_, 2
+	note G#, 2
+	note G_, 2
+	note C#, 2
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note G_, 1
-	note G#, 3
-	note F_, 3
-	note G_, 3
+	note G_, 2
+	note G#, 4
+	note F_, 4
+	note G_, 4
 	octave 2
-	note G_, 3
+	note G_, 4
 	octave 3
-	note G_, 7
+	note G_, 8
 	intensity $a2
 	octave 2
-	note G_, 3
-	note G_, 11
-	note G_, 3
-	note G_, 7
+	note G_, 4
+	note G_, 12
+	note G_, 4
+	note G_, 8
 	intensity $a7
-	note G_, 3
+	note G_, 4
 	intensity $a2
-	note G#, 3
-	note G#, 7
+	note G#, 4
+	note G#, 8
 	intensity $a7
-	note G_, 3
+	note G_, 4
 	intensity $a2
-	note G#, 3
-	note G#, 7
+	note G#, 4
+	note G#, 8
 	intensity $a7
-	note A#, 3
+	note A#, 4
 	intensity $a2
-	note G_, 3
-	note G_, 11
-	note G_, 3
-	note G_, 11
-	note G_, 3
-	note G_, 11
-	note G_, 3
-	note G_, 7
+	note G_, 4
+	note G_, 12
+	note G_, 4
+	note G_, 12
+	note G_, 4
+	note G_, 12
+	note G_, 4
+	note G_, 8
 	intensity $a5
 	octave 3
-	note A#, 3
+	note A#, 4
 	loopchannel 0, Music_TinTower_branch_f682a
 
 Music_TinTower_Ch2: ; f688b
@@ -109,84 +109,84 @@
 Music_TinTower_branch_f6895: ; f6895
 	notetype $c, $b5
 	octave 4
-	note C_, 3
-	note C_, 3
-	note C#, 1
-	note C_, 1
+	note C_, 4
+	note C_, 4
+	note C#, 2
+	note C_, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C#, 1
-	note C_, 3
-	note F_, 3
-	note C#, 3
+	note C#, 2
+	note C_, 4
+	note F_, 4
+	note C#, 4
 	octave 3
-	note A#, 3
+	note A#, 4
 	octave 4
-	note C_, 3
-	note C_, 3
-	note C#, 1
-	note C_, 1
+	note C_, 4
+	note C_, 4
+	note C#, 2
+	note C_, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C#, 1
-	note C_, 3
+	note C#, 2
+	note C_, 4
 	octave 3
-	note C_, 3
+	note C_, 4
 	octave 4
-	note C_, 7
+	note C_, 8
 	stereopanning $f
 	loopchannel 2, Music_TinTower_branch_f6895
 	intensity $b2
 	octave 3
-	note C_, 3
-	note C_, 11
-	note C_, 3
-	note C_, 7
+	note C_, 4
+	note C_, 12
+	note C_, 4
+	note C_, 8
 	intensity $b7
-	note C_, 3
+	note C_, 4
 	intensity $b2
-	note C#, 3
-	note C#, 7
+	note C#, 4
+	note C#, 8
 	intensity $b7
-	note C_, 3
+	note C_, 4
 	intensity $b2
-	note C#, 3
-	note C#, 7
+	note C#, 4
+	note C#, 8
 	intensity $b7
-	note D#, 3
+	note D#, 4
 	intensity $90
 	stereopanning $ff
-	note G_, 3
+	note G_, 4
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note A#, 1
-	note G#, 1
-	note G_, 1
-	note G#, 1
-	note G_, 3
-	note C_, 3
-	note G_, 7
-	note G_, 3
+	note A#, 2
+	note G#, 2
+	note G_, 2
+	note G#, 2
+	note G_, 4
+	note C_, 4
+	note G_, 8
+	note G_, 4
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C_, 1
-	note C#, 1
+	note C_, 2
+	note C#, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note C_, 3
+	note C_, 4
 	octave 4
-	note C_, 5
+	note C_, 6
 	intensity $95
-	note C#, 1
+	note C#, 2
 	loopchannel 0, Music_TinTower_branch_f6893
 
 Music_TinTower_Ch3: ; f68f8
@@ -193,74 +193,74 @@
 	notetype $c, $14
 
 Music_TinTower_branch_f68fb: ; f68fb
-	note __, 15
-	note __, 15
-	note __, 15
-	note __, 9
+	note __, 16
+	note __, 16
+	note __, 16
+	note __, 10
 	octave 2
-	note G_, 1
-	note G#, 1
-	note A#, 1
+	note G_, 2
+	note G#, 2
+	note A#, 2
 	octave 3
-	note C_, 7
-	note C#, 7
-	note E_, 7
+	note C_, 8
+	note C#, 8
+	note E_, 8
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note C_, 1
-	note C#, 1
-	note D#, 1
-	note C_, 7
-	note C#, 7
-	note E_, 7
+	note C_, 2
+	note C#, 2
+	note D#, 2
+	note C_, 8
+	note C#, 8
+	note E_, 8
 	octave 4
-	note C_, 7
+	note C_, 8
 	octave 3
-	note C_, 0
-	note __, 2
-	note C_, 0
-	note __, 10
-	note C_, 0
-	note __, 2
-	note C_, 0
-	note __, 6
-	note C_, 3
-	note C#, 0
-	note __, 2
-	note C#, 0
-	note __, 6
-	note C_, 3
-	note C#, 0
-	note __, 2
-	note C#, 0
-	note __, 6
-	note D#, 3
+	note C_, 1
+	note __, 3
+	note C_, 1
+	note __, 11
+	note C_, 1
+	note __, 3
+	note C_, 1
+	note __, 7
+	note C_, 4
+	note C#, 1
+	note __, 3
+	note C#, 1
+	note __, 7
+	note C_, 4
+	note C#, 1
+	note __, 3
+	note C#, 1
+	note __, 7
+	note D#, 4
 	stereopanning $f
-	note C_, 0
-	note __, 2
-	note C_, 0
-	note __, 10
-	note C_, 0
-	note __, 2
-	note C_, 0
-	note __, 2
+	note C_, 1
+	note __, 3
+	note C_, 1
+	note __, 11
+	note C_, 1
+	note __, 3
+	note C_, 1
+	note __, 3
 	stereopanning $ff
 	octave 2
-	note A#, 1
+	note A#, 2
 	octave 3
-	note C_, 1
-	note C#, 1
-	note D#, 1
+	note C_, 2
+	note C#, 2
+	note D#, 2
 	stereopanning $f
-	note C_, 0
-	note __, 2
-	note C_, 0
-	note __, 10
-	note C_, 0
-	note __, 2
-	note C_, 0
-	note __, 10
+	note C_, 1
+	note __, 3
+	note C_, 1
+	note __, 11
+	note C_, 1
+	note __, 3
+	note C_, 1
+	note __, 11
 	stereopanning $ff
 	loopchannel 0, Music_TinTower_branch_f68fb
 
@@ -270,30 +270,30 @@
 
 Music_TinTower_branch_f694c: ; f694c
 	stereopanning $f
+	note G_, 2
+	stereopanning $f0
 	note G_, 1
+	note G_, 1
+	stereopanning $f
+	note G_, 2
 	stereopanning $f0
-	note G_, 0
-	note G_, 0
+	note F_, 4
 	stereopanning $f
-	note G_, 1
+	note G_, 2
+	note G_, 2
+	note F_, 2
 	stereopanning $f0
-	note F_, 3
+	note G_, 2
 	stereopanning $f
 	note G_, 1
 	note G_, 1
-	note F_, 1
 	stereopanning $f0
-	note G_, 1
+	note G_, 2
 	stereopanning $f
-	note G_, 0
-	note G_, 0
+	note F_, 4
 	stereopanning $f0
-	note G_, 1
-	stereopanning $f
-	note F_, 3
-	stereopanning $f0
-	note G_, 1
-	note G_, 1
-	note F_, 1
+	note G_, 2
+	note G_, 2
+	note F_, 2
 	loopchannel 0, Music_TinTower_branch_f694c
 ; f6974
--- a/audio/music/titlescreen.asm
+++ b/audio/music/titlescreen.asm
@@ -16,282 +16,282 @@
 	notetype $c, $a7
 	intensity $a0
 	octave 3
-	note __, 3
+	note __, 4
 	intensity $a7
 	octave 2
-	note G_, 0
-	note __, 1
-	note A_, 0
-	note B_, 7
-	note G_, 3
+	note G_, 1
+	note __, 2
+	note A_, 1
+	note B_, 8
+	note G_, 4
 	octave 3
-	note C_, 0
-	note __, 1
-	note D_, 0
-	note E_, 7
-	note C_, 3
+	note C_, 1
+	note __, 2
+	note D_, 1
+	note E_, 8
+	note C_, 4
 	octave 2
-	note B_, 0
-	note __, 1
+	note B_, 1
+	note __, 2
 	octave 3
-	note C_, 0
+	note C_, 1
 	octave 2
-	note B_, 7
-	note A_, 3
-	note A_, 0
-	note __, 1
-	note B_, 0
+	note B_, 8
+	note A_, 4
+	note A_, 1
+	note __, 2
+	note B_, 1
 	octave 3
-	note C_, 5
-	note E_, 3
-	note F#, 1
+	note C_, 6
+	note E_, 4
+	note F#, 2
 	stereopanning $ff
 	octave 4
-	note G_, 0
+	note G_, 1
 	stereopanning $f0
 	octave 3
-	note D_, 4
+	note D_, 5
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note D_, 3
+	note D_, 4
 	octave 2
-	note B_, 3
+	note B_, 4
 	octave 3
-	note C_, 5
-	note F_, 5
-	note C_, 3
-	note D_, 5
+	note C_, 6
+	note F_, 6
+	note C_, 4
+	note D_, 6
 	intensity $b7
-	note D#, 0
-	note E_, 0
-	note F_, 5
-	note E_, 0
-	note D#, 0
-	note D_, 7
+	note D#, 1
+	note E_, 1
+	note F_, 6
+	note E_, 1
+	note D#, 1
+	note D_, 8
 	notetype $8, $a7
-	note C_, 3
+	note C_, 4
 	octave 2
-	note B_, 3
+	note B_, 4
 	octave 3
-	note C_, 3
-	note D_, 8
+	note C_, 4
+	note D_, 9
 	octave 2
-	note B_, 2
+	note B_, 3
 	octave 3
-	note D_, 5
+	note D_, 6
 	octave 2
-	note B_, 5
+	note B_, 6
 	octave 3
-	note C_, 2
-	note D_, 5
-	note E_, 2
-	note E_, 3
-	note E_, 3
 	note C_, 3
+	note D_, 6
+	note E_, 3
+	note E_, 4
+	note E_, 4
+	note C_, 4
 	notetype $8, $a0
 	octave 2
-	note B_, 5
+	note B_, 6
 	notetype $8, $a7
-	note B_, 5
+	note B_, 6
 	notetype $8, $a7
 	octave 3
-	note F_, 3
-	note E_, 3
-	note C_, 3
+	note F_, 4
+	note E_, 4
+	note C_, 4
 	notetype $8, $a0
-	note D_, 5
+	note D_, 6
 	notetype $8, $a7
-	note D_, 5
+	note D_, 6
 	notetype $8, $a7
-	note __, 2
+	note __, 3
 	octave 2
-	note B_, 2
+	note B_, 3
 	octave 3
-	note C_, 2
-	note D_, 2
-	note D_, 8
+	note C_, 3
+	note D_, 3
+	note D_, 9
 	octave 2
-	note B_, 2
+	note B_, 3
 	octave 3
-	note D_, 5
+	note D_, 6
 	octave 2
-	note B_, 5
+	note B_, 6
 	octave 3
-	note C_, 8
-	note F_, 8
-	note C_, 5
-	note D_, 8
+	note C_, 9
+	note F_, 9
+	note C_, 6
+	note D_, 9
 	notetype $c, $b7
-	note D#, 0
-	note E_, 0
-	note F_, 5
-	note E_, 0
-	note D#, 0
-	note D_, 7
+	note D#, 1
+	note E_, 1
+	note F_, 6
+	note E_, 1
+	note D#, 1
+	note D_, 8
 	notetype $8, $a7
-	note C_, 3
+	note C_, 4
 	octave 2
-	note B_, 3
+	note B_, 4
 	octave 3
-	note C_, 3
-	note D_, 8
+	note C_, 4
+	note D_, 9
 	octave 2
-	note B_, 2
+	note B_, 3
 	octave 3
-	note D_, 8
+	note D_, 9
 	notetype $8, $b7
-	note G_, 2
-	note A_, 3
 	note G_, 3
+	note A_, 4
+	note G_, 4
+	note F_, 4
+	note F_, 6
+	note E_, 6
+	note D_, 9
 	note F_, 3
-	note F_, 5
-	note E_, 5
-	note D_, 8
-	note F_, 2
-	note G_, 2
-	note D_, 5
-	note G_, 2
+	note G_, 3
+	note D_, 6
+	note G_, 3
 	notetype $8, $54
 	octave 2
-	note G_, 2
-	note B_, 2
+	note G_, 3
+	note B_, 3
 	notetype $8, $94
 	octave 3
-	note D_, 2
-	note G_, 2
+	note D_, 3
+	note G_, 3
 	tempo 136
 	notetype $8, $b4
-	note F_, 2
-	note A_, 2
+	note F_, 3
+	note A_, 3
 	notetype $8, $d4
 	octave 4
-	note C_, 2
-	note F_, 2
+	note C_, 3
+	note F_, 3
 	tempo 138
 	notetype $8, $b4
-	note D_, 8
-	note C_, 8
+	note D_, 9
+	note C_, 9
 	octave 3
-	note A#, 5
+	note A#, 6
 	notetype $c, $b7
-	note F_, 0
-	note E_, 0
-	note D_, 0
-	note E_, 0
-	note F_, 3
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note F_, 4
 	octave 4
-	note D_, 3
-	note F_, 3
-	note E_, 5
+	note D_, 4
+	note F_, 4
+	note E_, 6
 	octave 3
-	note G_, 1
+	note G_, 2
 	notetype $8, $b7
-	note A_, 3
-	note G_, 3
-	note F_, 3
-	note G_, 11
+	note A_, 4
+	note G_, 4
+	note F_, 4
+	note G_, 12
 	octave 4
-	note C_, 5
+	note C_, 6
 	tempo 136
-	note C#, 5
+	note C#, 6
 	tempo 134
 	callchannel Music_TitleScreen_branch_eb96d
 	octave 4
-	note C_, 3
-	note C_, 3
-	note C#, 3
+	note C_, 4
+	note C_, 4
+	note C#, 4
 	callchannel Music_TitleScreen_branch_eb96d
 	octave 4
-	note C_, 3
-	note C_, 3
-	note C#, 3
+	note C_, 4
+	note C_, 4
+	note C#, 4
 	callchannel Music_TitleScreen_branch_eb96d
 	octave 3
-	note E_, 3
-	note E_, 3
-	note C_, 3
+	note E_, 4
+	note E_, 4
+	note C_, 4
 	notetype $c, $a0
-	note D_, 5
+	note D_, 6
 	notetype $c, $a7
-	note D_, 9
+	note D_, 10
 	intensity $a0
-	note C_, 7
+	note C_, 8
 	intensity $a7
-	note C_, 7
+	note C_, 8
 	intensity $a0
 	octave 2
-	note B_, 7
+	note B_, 8
 	intensity $a7
-	note B_, 7
+	note B_, 8
 	octave 3
-	note C_, 7
+	note C_, 8
 	octave 2
-	note B_, 7
+	note B_, 8
 	octave 3
-	note D_, 7
+	note D_, 8
 	octave 2
-	note B_, 7
+	note B_, 8
 	octave 3
-	note C_, 7
-	note F_, 7
-	note A_, 7
-	note G_, 5
-	note G_, 0
-	note F#, 0
-	note F_, 7
-	note E_, 7
+	note C_, 8
+	note F_, 8
+	note A_, 8
+	note G_, 6
+	note G_, 1
+	note F#, 1
+	note F_, 8
+	note E_, 8
 	intensity $a0
-	note D_, 15
+	note D_, 16
 	intensity $a7
-	note D_, 15
+	note D_, 16
 	intensity $a3
 	octave 2
-	note G_, 0
-	note __, 2
-	note G_, 0
-	note __, 4
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note __, 2
-	note G_, 0
-	note __, 2
-	note G_, 0
-	note __, 2
+	note G_, 1
+	note __, 3
+	note G_, 1
+	note __, 5
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note __, 3
+	note G_, 1
+	note __, 3
+	note G_, 1
+	note __, 3
 	notetype $8, $b2
-	note A_, 1
-	note A_, 1
-	note A_, 1
-	note A_, 1
-	note A_, 1
-	note F#, 1
+	note A_, 2
+	note A_, 2
+	note A_, 2
+	note A_, 2
+	note A_, 2
+	note F#, 2
 	notetype $c, $b7
-	note G_, 0
-	note __, 2
+	note G_, 1
+	note __, 3
 	octave 1
-	note G_, 0
-	note __, 10
+	note G_, 1
+	note __, 11
 	endchannel
 ; eb96d
 
 Music_TitleScreen_branch_eb96d: ; eb96d
 	notetype $c, $c3
-	note D_, 0
+	note D_, 1
 
 Music_TitleScreen_branch_eb971: ; eb971
-	note __, 0
+	note __, 1
 	octave 2
-	note D_, 0
+	note D_, 1
 	octave 1
-	note A_, 0
+	note A_, 1
 	octave 2
-	note D_, 0
+	note D_, 1
 	loopchannel 5, Music_TitleScreen_branch_eb971
-	note __, 0
-	note D_, 0
+	note __, 1
+	note D_, 1
 	octave 1
-	note A_, 0
+	note A_, 1
 	notetype $8, $b7
 	endchannel
 
@@ -301,285 +301,285 @@
 	notetype $c, $c7
 	intensity $a4
 	octave 1
-	note G_, 0
+	note G_, 1
 	octave 2
-	note D_, 0
-	note G_, 0
+	note D_, 1
+	note G_, 1
 	octave 3
-	note C_, 0
+	note C_, 1
 	intensity $c2
 	octave 3
-	note B_, 0
-	note __, 1
-	note A_, 0
+	note B_, 1
+	note __, 2
+	note A_, 1
 	intensity $b0
-	note G_, 5
+	note G_, 6
 	intensity $b7
-	note G_, 5
-	note __, 15
-	note __, 15
+	note G_, 6
+	note __, 16
+	note __, 16
 	intensity $c7
 	octave 4
-	note C_, 0
-	note __, 1
-	note D_, 0
-	note E_, 7
+	note C_, 1
+	note __, 2
+	note D_, 1
+	note E_, 8
+	note F#, 2
+	note E_, 1
 	note F#, 1
-	note E_, 0
-	note F#, 0
 	octave 3
-	note G_, 5
-	note B_, 1
+	note G_, 6
+	note B_, 2
 	octave 4
-	note D_, 7
+	note D_, 8
 	stereopanning $f0
 	intensity $97
 	octave 2
-	note A_, 3
-	note F_, 3
+	note A_, 4
+	note F_, 4
 	stereopanning $ff
 	intensity $c7
 	octave 4
-	note F_, 5
-	note E_, 0
-	note D#, 0
-	note D_, 7
+	note F_, 6
+	note E_, 1
+	note D#, 1
+	note D_, 8
 	stereopanning $f0
 	intensity $97
 	octave 2
-	note A_, 5
+	note A_, 6
 	octave 3
-	note C_, 1
+	note C_, 2
 	stereopanning $f
 	intensity $a3
 	octave 4
-	note D_, 3
-	note D_, 1
-	note C_, 3
-	note C_, 1
+	note D_, 4
+	note D_, 2
+	note C_, 4
+	note C_, 2
 	octave 3
-	note B_, 3
+	note B_, 4
 	stereopanning $ff
 	intensity $c7
 	octave 3
-	note G_, 5
-	note B_, 1
+	note G_, 6
+	note B_, 2
 	octave 4
-	note D_, 7
+	note D_, 8
 	stereopanning $f0
 	intensity $97
 	octave 2
-	note A_, 1
-	note F_, 3
-	note A_, 1
+	note A_, 2
+	note F_, 4
+	note A_, 2
 	stereopanning $ff
 	notetype $8, $c7
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note B_, 3
+	note B_, 4
 	octave 4
-	note C_, 3
-	note D_, 11
+	note C_, 4
+	note D_, 12
 	stereopanning $f0
 	notetype $8, $b7
 	octave 2
-	note A_, 8
+	note A_, 9
 	stereopanning $f
 	notetype $c, $c7
-	note G_, 0
-	note A_, 0
-	note B_, 5
-	note E_, 0
-	note F#, 0
-	note G_, 3
+	note G_, 1
+	note A_, 1
+	note B_, 6
+	note E_, 1
+	note F#, 1
+	note G_, 4
 	notetype $c, $4b
-	note A_, 3
+	note A_, 4
 	stereopanning $ff
 	notetype $c, $c7
 	octave 3
-	note G_, 5
-	note B_, 1
+	note G_, 6
+	note B_, 2
 	octave 4
-	note D_, 7
+	note D_, 8
 	stereopanning $f0
 	intensity $97
 	octave 2
-	note A_, 1
-	note F_, 5
+	note A_, 2
+	note F_, 6
 	stereopanning $ff
 	intensity $c7
 	octave 4
-	note F_, 5
-	note E_, 0
-	note D#, 0
-	note D_, 7
+	note F_, 6
+	note E_, 1
+	note D#, 1
+	note D_, 8
 	stereopanning $f0
 	intensity $97
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note A_, 5
-	note B_, 5
-	note G_, 1
+	note A_, 6
+	note B_, 6
+	note G_, 2
 	notetype $8, $c7
-	note F_, 3
-	note G_, 3
-	note F_, 3
+	note F_, 4
+	note G_, 4
+	note F_, 4
 	stereopanning $ff
 	octave 3
-	note G_, 8
-	note B_, 2
+	note G_, 9
+	note B_, 3
 	octave 4
-	note D_, 11
+	note D_, 12
 	stereopanning $f0
 	notetype $8, $a7
 	octave 3
-	note D_, 3
-	note C_, 3
-	note D_, 3
+	note D_, 4
+	note C_, 4
+	note D_, 4
 	stereopanning $ff
 	notetype $8, $c7
 	octave 4
-	note F_, 3
-	note E_, 3
-	note F_, 3
-	note G_, 8
-	note A#, 2
+	note F_, 4
+	note E_, 4
+	note F_, 4
+	note G_, 9
+	note A#, 3
 	notetype $c, $b0
-	note G_, 7
+	note G_, 8
 	notetype $c, $b7
-	note G_, 7
+	note G_, 8
 	intensity $c6
-	note A_, 3
+	note A_, 4
 	intensity $5d
-	note A_, 3
+	note A_, 4
 	intensity $c7
-	note A#, 5
+	note A#, 6
 	intensity $c3
-	note F_, 1
+	note F_, 2
 	intensity $c7
-	note F_, 7
+	note F_, 8
 	intensity $a7
 	octave 3
-	note A#, 7
+	note A#, 8
 	intensity $c7
 	octave 4
-	note A#, 3
-	note B_, 3
+	note A#, 4
+	note B_, 4
 	octave 5
-	note C_, 5
+	note C_, 6
 	intensity $c3
 	octave 4
-	note G_, 1
+	note G_, 2
 	intensity $c7
-	note G_, 7
+	note G_, 8
 	intensity $a7
 	octave 3
-	note E_, 7
+	note E_, 8
 	intensity $c7
 	octave 5
-	note C_, 3
-	note C#, 3
+	note C_, 4
+	note C#, 4
 	tone $0001
 	stereopanning $f
 	callchannel Music_TitleScreen_branch_ebae7
-	note C#, 3
+	note C#, 4
 	callchannel Music_TitleScreen_branch_ebae7
-	note C#, 3
+	note C#, 4
 	callchannel Music_TitleScreen_branch_ebae7
 	octave 4
-	note A_, 3
+	note A_, 4
 	stereopanning $ff
 	tone $0000
 	notetype $c, $b0
 	octave 3
-	note B_, 5
+	note B_, 6
 	notetype $c, $b7
-	note B_, 9
+	note B_, 10
 	intensity $c7
-	note A_, 7
-	note F_, 5
-	note E_, 0
-	note D#, 0
-	note D_, 7
-	note G_, 7
-	note F_, 7
-	note A_, 7
+	note A_, 8
+	note F_, 6
+	note E_, 1
+	note D#, 1
+	note D_, 8
+	note G_, 8
+	note F_, 8
+	note A_, 8
 	intensity $b0
-	note G_, 7
+	note G_, 8
 	intensity $b7
-	note G_, 7
+	note G_, 8
 	intensity $c7
-	note F_, 7
+	note F_, 8
 	octave 4
-	note F_, 5
-	note E_, 0
-	note D#, 0
-	note D_, 7
+	note F_, 6
+	note E_, 1
+	note D#, 1
+	note D_, 8
 	octave 2
-	note B_, 7
+	note B_, 8
 	octave 3
-	note C_, 7
-	note A_, 5
-	note F_, 0
-	note A_, 0
+	note C_, 8
+	note A_, 6
+	note F_, 1
+	note A_, 1
 	intensity $b0
-	note G_, 15
+	note G_, 16
 	intensity $b7
-	note G_, 15
+	note G_, 16
 	intensity $c2
 	octave 4
-	note G_, 0
-	note __, 2
-	note G_, 0
-	note __, 4
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note __, 2
-	note G_, 0
-	note __, 2
+	note G_, 1
+	note __, 3
+	note G_, 1
+	note __, 5
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note __, 3
+	note G_, 1
+	note __, 3
 	intensity $90
-	note G_, 3
+	note G_, 4
 	notetype $8, $c2
 	octave 3
-	note F_, 1
-	note F_, 1
-	note F_, 1
-	note F_, 1
-	note F_, 1
-	note F#, 1
+	note F_, 2
+	note F_, 2
+	note F_, 2
+	note F_, 2
+	note F_, 2
+	note F#, 2
 	notetype $c, $c7
-	note G_, 0
-	note __, 2
+	note G_, 1
+	note __, 3
 	octave 2
-	note G_, 0
-	note __, 10
+	note G_, 1
+	note __, 11
 	endchannel
 ; ebae7
 
 Music_TitleScreen_branch_ebae7: ; ebae7
 	notetype $c, $b2
-	note D_, 0
+	note D_, 1
 
 Music_TitleScreen_branch_ebaeb: ; ebaeb
 	octave 3
-	note A_, 0
+	note A_, 1
 	octave 4
-	note D_, 0
-	note A_, 0
-	note D_, 0
+	note D_, 1
+	note A_, 1
+	note D_, 1
 	loopchannel 5, Music_TitleScreen_branch_ebaeb
 	octave 3
-	note A_, 0
+	note A_, 1
 	octave 4
-	note D_, 0
-	note A_, 0
+	note D_, 1
+	note A_, 1
 	notetype $8, $b7
 	octave 5
-	note C_, 3
-	note C_, 3
+	note C_, 4
+	note C_, 4
 	endchannel
 
 Music_TitleScreen_Ch3: ; ebb01
@@ -589,313 +589,313 @@
 	notetype $c, $16
 	octave 3
 	octave 3
-	note __, 3
+	note __, 4
 	octave 2
-	note G_, 1
-	note D_, 0
-	note C#, 0
-	note D_, 0
-	note __, 0
-	note G_, 1
-	note D_, 0
-	note __, 0
+	note G_, 2
 	note D_, 1
-	note G_, 1
+	note C#, 1
 	note D_, 1
-	note F_, 1
-	note C_, 0
+	note __, 1
+	note G_, 2
+	note D_, 1
+	note __, 1
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note F_, 2
+	note C_, 1
 	octave 1
-	note B_, 0
+	note B_, 1
 	octave 2
-	note C_, 0
-	note __, 0
-	note F_, 1
-	note C_, 0
-	note __, 0
 	note C_, 1
-	note F_, 1
+	note __, 1
+	note F_, 2
 	note C_, 1
-	note G_, 1
-	note D_, 0
-	note C#, 0
-	note D_, 0
-	note __, 0
-	note G_, 1
-	note D_, 0
-	note __, 0
+	note __, 1
+	note C_, 2
+	note F_, 2
+	note C_, 2
+	note G_, 2
 	note D_, 1
-	note G_, 1
+	note C#, 1
 	note D_, 1
-	note A_, 1
-	note F_, 0
-	note E_, 0
-	note F_, 0
-	note __, 0
-	note A_, 1
-	note F_, 1
-	note A_, 3
-	octave 3
-	note C_, 1
-	octave 2
-	note G_, 3
+	note __, 1
+	note G_, 2
 	note D_, 1
-	note G_, 3
-	note D_, 1
-	note G_, 1
-	note D_, 1
-	note A_, 3
+	note __, 1
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note A_, 2
 	note F_, 1
-	note A_, 3
+	note E_, 1
 	note F_, 1
-	note A_, 1
+	note __, 1
+	note A_, 2
+	note F_, 2
+	note A_, 4
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note B_, 3
-	note G_, 1
-	note B_, 3
-	note G_, 1
-	note B_, 1
-	note G_, 1
-	note G_, 3
-	note B_, 1
-	note A_, 3
-	note B_, 1
+	note G_, 4
+	note D_, 2
+	note G_, 4
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note A_, 4
+	note F_, 2
+	note A_, 4
+	note F_, 2
+	note A_, 2
 	octave 3
-	note C_, 3
+	note C_, 2
 	octave 2
-	note G_, 3
-	note D_, 1
-	note G_, 3
-	note D_, 1
-	note G_, 1
-	note D_, 1
-	note A_, 3
-	note F_, 1
-	note A_, 3
-	note F_, 1
-	note A_, 1
+	note B_, 4
+	note G_, 2
+	note B_, 4
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note G_, 4
+	note B_, 2
+	note A_, 4
+	note B_, 2
 	octave 3
-	note C_, 1
+	note C_, 4
 	octave 2
-	note B_, 3
-	note G_, 1
-	note B_, 3
-	note G_, 1
-	note B_, 1
+	note G_, 4
+	note D_, 2
+	note G_, 4
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note A_, 4
+	note F_, 2
+	note A_, 4
+	note F_, 2
+	note A_, 2
 	octave 3
-	note C_, 1
+	note C_, 2
 	octave 2
-	note B_, 3
-	note G_, 1
-	note B_, 3
-	note G_, 1
+	note B_, 4
+	note G_, 2
+	note B_, 4
+	note G_, 2
+	note B_, 2
 	octave 3
-	note D_, 3
+	note C_, 2
 	octave 2
-	note G_, 3
-	note D_, 1
-	note G_, 3
-	note D_, 1
-	note G_, 1
-	note D_, 1
-	note A_, 3
-	note F_, 1
-	note A_, 3
-	note F_, 1
-	note A_, 1
+	note B_, 4
+	note G_, 2
+	note B_, 4
+	note G_, 2
 	octave 3
-	note C_, 1
+	note D_, 4
 	octave 2
-	note B_, 3
-	note G_, 1
-	note B_, 3
-	note G_, 1
-	note B_, 1
-	note G_, 1
+	note G_, 4
+	note D_, 2
+	note G_, 4
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note A_, 4
+	note F_, 2
+	note A_, 4
+	note F_, 2
+	note A_, 2
 	octave 3
-	note D_, 3
+	note C_, 2
 	octave 2
-	note G_, 1
+	note B_, 4
+	note G_, 2
+	note B_, 4
+	note G_, 2
+	note B_, 2
+	note G_, 2
 	octave 3
-	note D_, 3
+	note D_, 4
 	octave 2
-	note G_, 1
+	note G_, 2
 	octave 3
-	note D_, 1
+	note D_, 4
 	octave 2
-	note A_, 1
-	note G_, 3
-	note D_, 1
-	note G_, 3
-	note D_, 1
-	note G_, 1
-	note D_, 1
-	note A_, 3
-	note F_, 1
-	note A_, 3
-	note F_, 1
-	note A_, 1
+	note G_, 2
 	octave 3
-	note C_, 1
+	note D_, 2
 	octave 2
-	note B_, 3
-	note G_, 1
-	note B_, 3
-	note G_, 1
+	note A_, 2
+	note G_, 4
+	note D_, 2
+	note G_, 4
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note A_, 4
+	note F_, 2
+	note A_, 4
+	note F_, 2
+	note A_, 2
 	octave 3
-	note D_, 1
+	note C_, 2
 	octave 2
-	note G_, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
-	note A_, 1
-	note A_, 1
-	note F_, 1
-	note A_, 1
+	note B_, 4
+	note G_, 2
+	note B_, 4
+	note G_, 2
 	octave 3
-	note C_, 1
-	note D_, 5
+	note D_, 2
 	octave 2
-	note A#, 5
+	note G_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note A_, 2
+	note A_, 2
+	note F_, 2
+	note A_, 2
 	octave 3
-	note F_, 3
-	note A#, 5
-	note F_, 5
-	note D_, 3
-	note E_, 5
-	note C_, 5
-	note E_, 3
+	note C_, 2
+	note D_, 6
+	octave 2
+	note A#, 6
+	octave 3
+	note F_, 4
+	note A#, 6
+	note F_, 6
+	note D_, 4
+	note E_, 6
+	note C_, 6
+	note E_, 4
 	octave 4
-	note C_, 5
+	note C_, 6
 	octave 3
-	note G_, 5
-	note E_, 3
-	note D_, 0
-	note __, 0
+	note G_, 6
+	note E_, 4
+	note D_, 1
+	note __, 1
 	stereopanning $ff
 	notetype $c, $16
 	tone $0000
 	octave 4
-	note A_, 1
+	note A_, 2
 	octave 5
+	note D_, 2
+	note A_, 6
+	note G_, 2
+	note F#, 2
 	note D_, 1
-	note A_, 5
-	note G_, 1
-	note F#, 1
-	note D_, 0
-	note __, 1
-	note E_, 0
-	note F#, 3
+	note __, 2
+	note E_, 1
+	note F#, 4
 	notetype $8, $16
 	octave 3
-	note C_, 3
-	note C_, 3
-	note C#, 3
+	note C_, 4
+	note C_, 4
+	note C#, 4
 	notetype $c, $16
-	note D_, 0
-	note __, 0
-	octave 4
-	note A_, 1
-	octave 5
 	note D_, 1
-	note A_, 5
-	note G_, 1
-	note F#, 1
-	note B_, 0
 	note __, 1
-	note A_, 0
-	note A_, 3
+	octave 4
+	note A_, 2
+	octave 5
+	note D_, 2
+	note A_, 6
+	note G_, 2
+	note F#, 2
+	note B_, 1
+	note __, 2
+	note A_, 1
+	note A_, 4
 	notetype $8, $16
 	octave 3
-	note C_, 3
-	note C_, 3
-	note C#, 3
+	note C_, 4
+	note C_, 4
+	note C#, 4
 	notetype $c, $16
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
 	notetype $c, $16
 	octave 4
-	note A_, 1
+	note A_, 2
 	octave 5
-	note D_, 1
-	note G_, 5
+	note D_, 2
+	note G_, 6
+	note E_, 2
+	note G_, 2
+	note F#, 1
 	note E_, 1
-	note G_, 1
-	note F#, 0
-	note E_, 0
-	note D_, 5
+	note D_, 6
 	tone $0001
 	notetype $8, $16
 	octave 3
-	note C_, 3
-	note C_, 3
-	note E_, 1
-	note F#, 1
+	note C_, 4
+	note C_, 4
+	note E_, 2
+	note F#, 2
 	stereopanning $f
 	notetype $c, $16
-	note G_, 15
-	note F_, 15
-	note G_, 7
-	note D_, 5
-	note D_, 0
-	note E_, 0
-	note F_, 1
-	note F_, 11
-	note E_, 0
-	note D#, 0
-	note D_, 7
-	note G_, 7
-	note F_, 7
-	note A_, 7
-	note G_, 7
-	note D_, 5
-	note D_, 0
-	note E_, 0
-	note F_, 15
-	note G_, 0
-	note __, 2
-	note G_, 0
-	note __, 4
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note __, 2
-	note G_, 0
-	note __, 2
-	note G_, 0
-	note __, 4
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note __, 2
+	note G_, 16
+	note F_, 16
+	note G_, 8
+	note D_, 6
+	note D_, 1
+	note E_, 1
+	note F_, 2
+	note F_, 12
+	note E_, 1
+	note D#, 1
+	note D_, 8
+	note G_, 8
+	note F_, 8
+	note A_, 8
+	note G_, 8
+	note D_, 6
+	note D_, 1
+	note E_, 1
+	note F_, 16
+	note G_, 1
+	note __, 3
+	note G_, 1
+	note __, 5
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note __, 3
+	note G_, 1
+	note __, 3
+	note G_, 1
+	note __, 5
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note __, 3
 	octave 2
-	note G_, 0
-	note __, 2
-	note G_, 0
-	note __, 4
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note __, 2
-	note G_, 0
-	note __, 2
-	note G_, 0
-	note __, 2
+	note G_, 1
+	note __, 3
+	note G_, 1
+	note __, 5
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note __, 3
+	note G_, 1
+	note __, 3
+	note G_, 1
+	note __, 3
 	notetype $8, $16
-	note F_, 1
-	note F_, 1
-	note F_, 1
-	note F_, 1
-	note F_, 1
-	note A_, 1
+	note F_, 2
+	note F_, 2
+	note F_, 2
+	note F_, 2
+	note F_, 2
+	note A_, 2
 	notetype $c, $16
-	note G_, 0
-	note __, 2
+	note G_, 1
+	note __, 3
 	octave 1
-	note G_, 0
-	note __, 10
+	note G_, 1
+	note __, 11
 	endchannel
 
 Music_TitleScreen_Ch4: ; ebc5c
@@ -902,279 +902,279 @@
 	togglenoise $5
 	stereopanning $f0
 	notetype $c
-	note __, 3
+	note __, 4
+	note C_, 2
 	note C_, 1
-	note C_, 0
-	note C_, 0
 	note C_, 1
-	note C_, 0
-	note C_, 0
-	note C_, 0
-	note C_, 0
-	note C_, 5
+	note C_, 2
 	note C_, 1
-	note C_, 0
-	note C_, 0
 	note C_, 1
-	note C_, 0
-	note C_, 0
-	note C_, 0
-	note C_, 0
+	note C_, 1
+	note C_, 1
+	note C_, 6
 	note C_, 2
-	note C_, 0
-	note C_, 0
-	note C_, 0
 	note C_, 1
-	note C_, 0
-	note C_, 0
 	note C_, 1
-	note C_, 0
-	note C_, 0
-	note C_, 0
-	note C_, 0
+	note C_, 2
+	note C_, 1
+	note C_, 1
+	note C_, 1
+	note C_, 1
 	note C_, 3
-	note D#, 1
 	note C_, 1
-	note C_, 0
-	note C_, 0
 	note C_, 1
-	note C_, 0
-	note C_, 0
-	note C_, 0
-	note C_, 0
 	note C_, 1
+	note C_, 2
+	note C_, 1
+	note C_, 1
+	note C_, 2
+	note C_, 1
+	note C_, 1
+	note C_, 1
+	note C_, 1
+	note C_, 4
+	note D#, 2
+	note C_, 2
+	note C_, 1
+	note C_, 1
+	note C_, 2
+	note C_, 1
+	note C_, 1
+	note C_, 1
+	note C_, 1
+	note C_, 2
 	notetype $6
-	note D_, 0
-	note D_, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C_, 0
-	note C_, 0
+	note D_, 1
+	note D_, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C_, 1
+	note C_, 1
 	notetype $c
 	callchannel Music_TitleScreen_branch_ebd77
 	callchannel Music_TitleScreen_branch_ebd81
 	callchannel Music_TitleScreen_branch_ebd81
+	note C_, 2
+	note D#, 2
+	note C_, 2
+	note D#, 2
+	note D#, 2
 	note C_, 1
-	note D#, 1
 	note C_, 1
-	note D#, 1
-	note D#, 1
-	note C_, 0
-	note C_, 0
-	note C_, 1
+	note C_, 2
 	notetype $6
-	note C#, 0
-	note C#, 0
-	note C_, 0
-	note C_, 0
+	note C#, 1
+	note C#, 1
+	note C_, 1
+	note C_, 1
 	notetype $c
 	callchannel Music_TitleScreen_branch_ebd77
+	note C_, 2
+	note D#, 2
+	note C_, 2
+	note F_, 2
+	note D#, 2
 	note C_, 1
-	note D#, 1
 	note C_, 1
-	note F_, 1
-	note D#, 1
-	note C_, 0
-	note C_, 0
-	note C_, 1
-	note C_, 1
+	note C_, 2
+	note C_, 2
 	callchannel Music_TitleScreen_branch_ebd81
+	note C_, 2
+	note D#, 2
+	note C_, 2
+	note D#, 2
+	note D#, 2
 	note C_, 1
-	note D#, 1
 	note C_, 1
-	note D#, 1
-	note D#, 1
-	note C_, 0
-	note C_, 0
+	note C_, 2
 	note C_, 1
-	note C_, 0
-	note C_, 0
+	note C_, 1
 	callchannel Music_TitleScreen_branch_ebd77
 	callchannel Music_TitleScreen_branch_ebd81
 	callchannel Music_TitleScreen_branch_ebd81
+	note C_, 2
+	note D#, 2
+	note C_, 2
+	note D#, 2
+	note D#, 2
 	note C_, 1
-	note D#, 1
 	note C_, 1
-	note D#, 1
-	note D#, 1
-	note C_, 0
-	note C_, 0
-	note C_, 1
+	note C_, 2
 	notetype $6
-	note C#, 0
-	note D_, 0
-	note D_, 0
-	note C#, 0
+	note C#, 1
+	note D_, 1
+	note D_, 1
+	note C#, 1
 	notetype $c
 	callchannel Music_TitleScreen_branch_ebd77
 	callchannel Music_TitleScreen_branch_ebd81
+	note C_, 2
+	note D#, 2
+	note C_, 2
+	note F_, 2
+	note D#, 2
 	note C_, 1
-	note D#, 1
 	note C_, 1
-	note F_, 1
-	note D#, 1
-	note C_, 0
-	note C_, 0
+	note C_, 2
 	note C_, 1
-	note C_, 0
-	note C_, 0
 	note C_, 1
-	note D#, 1
+	note C_, 2
+	note D#, 2
+	note C_, 2
+	note D#, 2
+	note D#, 2
 	note C_, 1
-	note D#, 1
-	note D#, 1
-	note C_, 0
-	note C_, 0
 	note C_, 1
+	note C_, 2
 	notetype $6
-	note D_, 0
-	note D_, 0
-	note C#, 0
-	note C#, 0
+	note D_, 1
+	note D_, 1
+	note C#, 1
+	note C#, 1
 	notetype $c
-	note A_, 1
-	note D#, 3
-	note A_, 3
-	note D#, 1
-	note A_, 3
-	note A_, 1
-	note D#, 3
-	note A_, 3
-	note D#, 1
-	note A_, 1
-	note A_, 1
-	note A_, 1
-	note D#, 3
-	note A_, 3
-	note D#, 1
-	note A_, 3
-	note A_, 3
-	note A_, 3
-	note A_, 1
-	note D_, 0
-	note D_, 0
-	note C#, 0
-	note C#, 0
-	note C_, 0
-	note C_, 0
+	note A_, 2
+	note D#, 4
+	note A_, 4
+	note D#, 2
+	note A_, 4
+	note A_, 2
+	note D#, 4
+	note A_, 4
+	note D#, 2
+	note A_, 2
+	note A_, 2
+	note A_, 2
+	note D#, 4
+	note A_, 4
+	note D#, 2
+	note A_, 4
+	note A_, 4
+	note A_, 4
+	note A_, 2
+	note D_, 1
+	note D_, 1
+	note C#, 1
+	note C#, 1
+	note C_, 1
+	note C_, 1
 	callchannel Music_TitleScreen_branch_ebd8b
 	callchannel Music_TitleScreen_branch_ebd93
-	note C#, 0
-	note D_, 0
-	note D_, 0
-	note C#, 0
+	note C#, 1
+	note D_, 1
+	note D_, 1
+	note C#, 1
 	notetype $c
 	callchannel Music_TitleScreen_branch_ebd8b
 	callchannel Music_TitleScreen_branch_ebd93
-	note D_, 0
-	note D_, 0
-	note C#, 0
-	note C#, 0
+	note D_, 1
+	note D_, 1
+	note C#, 1
+	note C#, 1
 	notetype $c
 	callchannel Music_TitleScreen_branch_ebd8b
 	callchannel Music_TitleScreen_branch_ebd93
-	note C#, 0
-	note C#, 0
-	note C#, 0
-	note C#, 0
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
 	notetype $c
-	note G#, 15
+	note G#, 16
 
 Music_TitleScreen_branch_ebd40: ; ebd40
-	note __, 15
+	note __, 16
 	loopchannel 6, Music_TitleScreen_branch_ebd40
-	note __, 11
+	note __, 12
 	notetype $6
-	note D_, 0
-	note C#, 0
-	note D_, 0
-	note C#, 0
-	note D_, 0
-	note C#, 0
-	note C_, 0
-	note C_, 0
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
+	note C_, 1
 	notetype $c
-	note C_, 3
-	note C_, 5
-	note C_, 0
-	note C_, 0
-	note C_, 3
-	note C_, 3
-	note C_, 5
-	note C_, 0
-	note C_, 0
-	note C_, 3
-	note C_, 3
-	note C_, 5
-	note C_, 0
-	note C_, 0
-	note C_, 3
-	note C_, 3
-	note C_, 3
-	notetype $8
+	note C_, 4
+	note C_, 6
 	note C_, 1
 	note C_, 1
+	note C_, 4
+	note C_, 4
+	note C_, 6
 	note C_, 1
+	note C_, 1
+	note C_, 4
+	note C_, 4
+	note C_, 6
+	note C_, 1
+	note C_, 1
+	note C_, 4
+	note C_, 4
+	note C_, 4
+	notetype $8
+	note C_, 2
+	note C_, 2
+	note C_, 2
 	notetype $6
-	note C#, 0
-	note C#, 0
-	note D_, 0
-	note D_, 0
-	note C#, 0
-	note C#, 0
-	note C_, 0
-	note C_, 0
+	note C#, 1
+	note C#, 1
+	note D_, 1
+	note D_, 1
+	note C#, 1
+	note C#, 1
+	note C_, 1
+	note C_, 1
 	notetype $c
-	note C_, 3
-	note B_, 3
+	note C_, 4
+	note B_, 4
 	endchannel
 ; ebd77
 
 Music_TitleScreen_branch_ebd77: ; ebd77
+	note C_, 2
+	note D#, 2
+	note C_, 2
+	note D#, 2
+	note F_, 2
 	note C_, 1
-	note D#, 1
 	note C_, 1
-	note D#, 1
-	note F_, 1
-	note C_, 0
-	note C_, 0
-	note C_, 1
-	note D#, 1
+	note C_, 2
+	note D#, 2
 	endchannel
 ; ebd81
 
 Music_TitleScreen_branch_ebd81: ; ebd81
+	note C_, 2
+	note D#, 2
+	note C_, 2
+	note F_, 2
+	note D#, 2
 	note C_, 1
-	note D#, 1
 	note C_, 1
-	note F_, 1
-	note D#, 1
-	note C_, 0
-	note C_, 0
-	note C_, 1
-	note D#, 1
+	note C_, 2
+	note D#, 2
 	endchannel
 ; ebd8b
 
 Music_TitleScreen_branch_ebd8b: ; ebd8b
+	note C_, 2
 	note C_, 1
-	note C_, 0
-	note C_, 0
+	note C_, 1
 	loopchannel 4, Music_TitleScreen_branch_ebd8b
 	endchannel
 ; ebd93
 
 Music_TitleScreen_branch_ebd93: ; ebd93
+	note C_, 2
 	note C_, 1
-	note C_, 0
-	note C_, 0
 	note C_, 1
-	note C_, 0
-	note C_, 0
+	note C_, 2
+	note C_, 1
+	note C_, 1
 	notetype $8
-	note C_, 3
-	note C_, 3
+	note C_, 4
+	note C_, 4
 	endchannel
 ; ebd9e
--- a/audio/music/trainervictory.asm
+++ b/audio/music/trainervictory.asm
@@ -12,14 +12,14 @@
 	tone $0001
 	notetype $8, $b1
 	octave 4
-	note E_, 1
-	note E_, 1
-	note E_, 1
-	note E_, 1
-	note F#, 1
-	note G_, 1
+	note E_, 2
+	note E_, 2
+	note E_, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
 	intensity $b6
-	note A_, 11
+	note A_, 12
 	stereopanning $f
 
 Music_TrainerVictory_branch_ebecd: ; ebecd
@@ -26,67 +26,67 @@
 	intensity $72
 	callchannel Music_TrainerVictory_branch_ebf11
 	intensity $51
-	note C#, 1
-	note E_, 1
-	note F#, 1
-	note A_, 1
-	note B_, 1
+	note C#, 2
+	note E_, 2
+	note F#, 2
+	note A_, 2
+	note B_, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	intensity $72
 	octave 3
-	note A_, 1
-	note __, 1
+	note A_, 2
+	note __, 2
 	octave 4
-	note C#, 1
-	note E_, 5
+	note C#, 2
+	note E_, 6
 	loopchannel 2, Music_TrainerVictory_branch_ebecd
 	callchannel Music_TrainerVictory_branch_ebf11
-	note A_, 1
-	note __, 1
-	note F_, 1
-	note A_, 5
-	note A#, 1
-	note __, 1
-	note G_, 1
-	note A#, 5
+	note A_, 2
+	note __, 2
+	note F_, 2
+	note A_, 6
+	note A#, 2
+	note __, 2
+	note G_, 2
+	note A#, 6
 
 Music_TrainerVictory_branch_ebef2: ; ebef2
 	intensity $72
 	octave 4
-	note D_, 1
-	note C#, 1
+	note D_, 2
+	note C#, 2
 	octave 3
-	note A_, 1
+	note A_, 2
 	loopchannel 3, Music_TrainerVictory_branch_ebef2
-	note F#, 1
-	note A_, 1
+	note F#, 2
+	note A_, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 
 Music_TrainerVictory_branch_ebf01: ; ebf01
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note B_, 1
-	note A_, 1
+	note B_, 2
+	note A_, 2
 	loopchannel 3, Music_TrainerVictory_branch_ebf01
-	note E_, 1
-	note F#, 1
-	note G_, 1
+	note E_, 2
+	note F#, 2
+	note G_, 2
 	loopchannel 0, Music_TrainerVictory_branch_ebecd
 ; ebf11
 
 Music_TrainerVictory_branch_ebf11: ; ebf11
 	octave 3
-	note F#, 1
-	note __, 1
-	note D_, 1
-	note F#, 5
-	note G_, 1
-	note __, 1
-	note E_, 1
-	note G_, 5
+	note F#, 2
+	note __, 2
+	note D_, 2
+	note F#, 6
+	note G_, 2
+	note __, 2
+	note E_, 2
+	note G_, 6
 	endchannel
 
 Music_TrainerVictory_Ch2: ; ebf1b
@@ -94,147 +94,147 @@
 	dutycycle $3
 	notetype $8, $d1
 	octave 4
-	note A_, 1
-	note A_, 1
-	note A_, 1
-	note A_, 1
-	note B_, 1
+	note A_, 2
+	note A_, 2
+	note A_, 2
+	note A_, 2
+	note B_, 2
 	octave 5
-	note C#, 1
+	note C#, 2
 	intensity $d6
-	note D_, 11
+	note D_, 12
 	stereopanning $f0
 
 Music_TrainerVictory_branch_ebf30: ; ebf30
 	notetype $8, $82
 	callchannel Music_TrainerVictory_branch_ebf56
-	note F#, 1
-	note __, 1
-	note G_, 1
-	note A_, 5
-	note E_, 1
-	note __, 1
-	note F#, 1
-	note G_, 5
+	note F#, 2
+	note __, 2
+	note G_, 2
+	note A_, 6
+	note E_, 2
+	note __, 2
+	note F#, 2
+	note G_, 6
 	loopchannel 2, Music_TrainerVictory_branch_ebf30
 	callchannel Music_TrainerVictory_branch_ebf56
-	note F_, 1
-	note __, 1
-	note C_, 1
-	note F_, 5
-	note G_, 1
-	note __, 1
-	note D_, 1
-	note G_, 5
+	note F_, 2
+	note __, 2
+	note C_, 2
+	note F_, 6
+	note G_, 2
+	note __, 2
+	note D_, 2
+	note G_, 6
 	notetype $c, $88
-	note F#, 15
-	note E_, 15
+	note F#, 16
+	note E_, 16
 	loopchannel 0, Music_TrainerVictory_branch_ebf30
 ; ebf56
 
 Music_TrainerVictory_branch_ebf56: ; ebf56
 	octave 4
-	note D_, 1
-	note __, 1
+	note D_, 2
+	note __, 2
 	octave 3
-	note A_, 1
+	note A_, 2
 	octave 4
-	note D_, 5
-	note E_, 1
-	note __, 1
+	note D_, 6
+	note E_, 2
+	note __, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note E_, 5
+	note E_, 6
 	endchannel
 
 Music_TrainerVictory_Ch3: ; ebf64
 	notetype $8, $25
 	octave 3
-	note G_, 5
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note F#, 5
-	note D_, 1
-	note C#, 1
+	note G_, 6
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note F#, 6
+	note D_, 2
+	note C#, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 
 Music_TrainerVictory_branch_ebf74: ; ebf74
 	callchannel Music_TrainerVictory_branch_ebfb1
 	octave 3
-	note C#, 1
-	note __, 1
-	note C#, 1
-	note A_, 1
-	note F#, 1
-	note C#, 1
+	note C#, 2
+	note __, 2
+	note C#, 2
+	note A_, 2
+	note F#, 2
+	note C#, 2
 	octave 2
+	note A_, 2
+	note __, 2
+	octave 3
 	note A_, 1
 	note __, 1
-	octave 3
-	note A_, 0
-	note __, 0
-	note A_, 5
+	note A_, 6
 	loopchannel 2, Music_TrainerVictory_branch_ebf74
 	callchannel Music_TrainerVictory_branch_ebfb1
 	octave 3
-	note C_, 1
-	note __, 1
-	note C_, 1
-	note A_, 1
-	note F_, 1
-	note C_, 1
-	note D_, 1
-	note __, 1
-	note D_, 1
+	note C_, 2
+	note __, 2
+	note C_, 2
+	note A_, 2
+	note F_, 2
+	note C_, 2
+	note D_, 2
+	note __, 2
+	note D_, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note A#, 1
-	note G_, 1
-	note D_, 1
-	note F#, 1
-	note A_, 1
+	note A#, 2
+	note G_, 2
+	note D_, 2
+	note F#, 2
+	note A_, 2
 	octave 4
-	note D_, 11
+	note D_, 12
 	octave 3
-	note A_, 1
-	note F#, 1
-	note D_, 1
+	note A_, 2
+	note F#, 2
+	note D_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note D_, 1
-	note E_, 1
-	note A_, 11
-	note G_, 1
-	note E_, 1
-	note C#, 1
+	note D_, 2
+	note E_, 2
+	note A_, 12
+	note G_, 2
+	note E_, 2
+	note C#, 2
 	loopchannel 0, Music_TrainerVictory_branch_ebf74
 ; ebfb1
 
 Music_TrainerVictory_branch_ebfb1: ; ebfb1
 	octave 2
-	note A_, 1
-	note __, 1
-	note A_, 1
+	note A_, 2
+	note __, 2
+	note A_, 2
 	octave 3
-	note F#, 1
-	note D_, 1
+	note F#, 2
+	note D_, 2
 	octave 2
-	note A_, 1
-	note B_, 1
-	note __, 1
-	note B_, 1
+	note A_, 2
+	note B_, 2
+	note __, 2
+	note B_, 2
 	octave 3
-	note G_, 1
-	note E_, 1
+	note G_, 2
+	note E_, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	endchannel
 ; ebfc3
--- a/audio/music/unioncave.asm
+++ b/audio/music/unioncave.asm
@@ -23,41 +23,41 @@
 
 Music_UnionCave_branch_f5c85: ; f5c85
 	octave 2
-	note G#, 1
+	note G#, 2
 	octave 3
-	note C#, 1
-	note E_, 3
-	note C#, 1
-	note E_, 1
-	note F_, 3
+	note C#, 2
+	note E_, 4
+	note C#, 2
+	note E_, 2
+	note F_, 4
 	loopchannel 8, Music_UnionCave_branch_f5c85
 
 Music_UnionCave_branch_f5c91: ; f5c91
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note D_, 1
-	note F_, 3
-	note D_, 1
-	note F_, 1
-	note F#, 3
+	note D_, 2
+	note F_, 4
+	note D_, 2
+	note F_, 2
+	note F#, 4
 	loopchannel 4, Music_UnionCave_branch_f5c91
-	note __, 3
+	note __, 4
 	intensity $80
-	note F_, 15
-	note F#, 15
-	note G_, 15
-	note F#, 15
-	note G_, 7
-	note F#, 7
-	note F_, 7
-	note E_, 7
-	note G_, 7
-	note F#, 7
+	note F_, 16
+	note F#, 16
+	note G_, 16
+	note F#, 16
+	note G_, 8
+	note F#, 8
+	note F_, 8
+	note E_, 8
+	note G_, 8
+	note F#, 8
 	octave 4
-	note C_, 7
+	note C_, 8
 	octave 3
-	note A_, 7
+	note A_, 8
 	intensity $95
 	tone $0004
 	callchannel Music_UnionCave_branch_f5ccf
@@ -73,10 +73,10 @@
 
 Music_UnionCave_branch_f5ccf: ; f5ccf
 	octave 2
-	note G#, 1
+	note G#, 2
 	octave 3
-	note C#, 1
-	note E_, 11
+	note C#, 2
+	note E_, 12
 	endchannel
 
 Music_UnionCave_Ch2: ; f5cd5
@@ -91,44 +91,44 @@
 	intensity $c7
 	callchannel Music_UnionCave_branch_f5d34
 	intensity $c4
-	note C#, 3
+	note C#, 4
 	octave 3
-	note B_, 3
+	note B_, 4
 	octave 4
-	note D_, 1
-	note E_, 1
-	note C#, 1
+	note D_, 2
+	note E_, 2
+	note C#, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note C#, 3
+	note C#, 4
 	octave 3
-	note B_, 3
+	note B_, 4
 	octave 4
-	note D_, 7
+	note D_, 8
 	octave 3
-	note B_, 3
+	note B_, 4
 	octave 4
-	note D_, 3
-	note F#, 1
-	note F_, 1
-	note C#, 1
+	note D_, 4
+	note F#, 2
+	note F_, 2
+	note C#, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note C#, 7
-	note D_, 3
-	note C#, 3
-	note __, 3
+	note C#, 8
+	note D_, 4
+	note C#, 4
+	note __, 4
 	intensity $a0
-	note C_, 15
-	note C#, 15
-	note D_, 15
-	note C#, 15
-	note E_, 15
-	note D#, 15
-	note A#, 15
-	note A_, 15
+	note C_, 16
+	note C#, 16
+	note D_, 16
+	note C#, 16
+	note E_, 16
+	note D#, 16
+	note A#, 16
+	note A_, 16
 	intensity $a5
 	vibrato $6, $44
 	callchannel Music_UnionCave_branch_f5d52
@@ -144,43 +144,43 @@
 
 Music_UnionCave_branch_f5d34: ; f5d34
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note A#, 3
+	note A#, 4
 	octave 4
-	note C#, 1
-	note D#, 1
-	note C_, 1
+	note C#, 2
+	note D#, 2
+	note C_, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C_, 3
+	note C_, 4
 	octave 3
-	note A#, 3
+	note A#, 4
 	octave 4
-	note C#, 7
+	note C#, 8
 	octave 3
-	note A#, 3
+	note A#, 4
 	octave 4
-	note C#, 3
-	note F_, 1
-	note E_, 1
-	note C_, 1
+	note C#, 4
+	note F_, 2
+	note E_, 2
+	note C_, 2
 	octave 3
-	note A#, 1
+	note A#, 2
 	octave 4
-	note C_, 7
-	note C#, 3
-	note C_, 3
+	note C_, 8
+	note C#, 4
+	note C_, 4
 	endchannel
 ; f5d52
 
 Music_UnionCave_branch_f5d52: ; f5d52
 	octave 2
-	note G#, 1
+	note G#, 2
 	octave 3
-	note C#, 1
-	note E_, 11
+	note C#, 2
+	note E_, 12
 	endchannel
 
 Music_UnionCave_Ch3: ; f5d58
@@ -188,66 +188,66 @@
 	stereopanning $f0
 
 Music_UnionCave_branch_f5d5d: ; f5d5d
-	note __, 15
+	note __, 16
 	loopchannel 7, Music_UnionCave_branch_f5d5d
-	note __, 13
+	note __, 14
 	octave 4
-	note C_, 1
+	note C_, 2
 
 Music_UnionCave_branch_f5d65: ; f5d65
-	note __, 1
+	note __, 2
 	octave 3
-	note E_, 1
-	note __, 1
-	note E_, 1
-	note G#, 1
-	note E_, 1
-	note __, 1
+	note E_, 2
+	note __, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note __, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	loopchannel 4, Music_UnionCave_branch_f5d65
 
 Music_UnionCave_branch_f5d73: ; f5d73
-	note __, 1
+	note __, 2
 	octave 3
-	note F_, 1
-	note __, 1
-	note F_, 1
-	note A_, 1
-	note F_, 1
-	note __, 1
+	note F_, 2
+	note __, 2
+	note F_, 2
+	note A_, 2
+	note F_, 2
+	note __, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	loopchannel 4, Music_UnionCave_branch_f5d73
-	note __, 3
-	note C_, 7
+	note __, 4
+	note C_, 8
 	octave 3
-	note B_, 7
-	note A#, 7
-	note A_, 7
+	note B_, 8
+	note A#, 8
+	note A_, 8
 	octave 4
-	note C#, 7
-	note C_, 7
+	note C#, 8
+	note C_, 8
 	octave 3
-	note B_, 7
-	note A#, 7
+	note B_, 8
+	note A#, 8
 
 Music_UnionCave_branch_f5d8d: ; f5d8d
-	note A_, 3
-	note G_, 3
-	note A#, 1
+	note A_, 4
+	note G_, 4
+	note A#, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note A_, 1
-	note G_, 1
+	note A_, 2
+	note G_, 2
 	loopchannel 3, Music_UnionCave_branch_f5d8d
-	note A_, 3
-	note G_, 3
-	note A#, 7
+	note A_, 4
+	note G_, 4
+	note A#, 8
 
 Music_UnionCave_branch_f5d9c: ; f5d9c
-	note __, 15
+	note __, 16
 	loopchannel 4, Music_UnionCave_branch_f5d9c
 	loopchannel 0, Music_UnionCave_branch_f5d5d
 
@@ -257,19 +257,19 @@
 
 Music_UnionCave_branch_f5da9: ; f5da9
 	stereopanning $f0
-	note E_, 3
+	note E_, 4
 	stereopanning $ff
-	note F_, 3
+	note F_, 4
 	stereopanning $f
-	note G#, 3
-	note __, 7
+	note G#, 4
+	note __, 8
 	stereopanning $f
-	note E_, 3
+	note E_, 4
 	stereopanning $ff
-	note F_, 3
+	note F_, 4
 	stereopanning $f0
-	note G#, 3
-	note __, 7
+	note G#, 4
+	note __, 8
 	loopchannel 0, Music_UnionCave_branch_f5da9
 ; f5dc1
 
--- a/audio/music/vermilioncity.asm
+++ b/audio/music/vermilioncity.asm
@@ -13,22 +13,22 @@
 	dutycycle $2
 	notetype $c, $65
 	octave 4
-	note B_, 3
-	note G#, 3
-	note F#, 3
-	note E_, 3
-	note D_, 3
+	note B_, 4
+	note G#, 4
+	note F#, 4
+	note E_, 4
+	note D_, 4
 	octave 3
-	note B_, 3
-	note A_, 1
-	note B_, 0
+	note B_, 4
+	note A_, 2
+	note B_, 1
 	octave 4
-	note D_, 0
-	note E_, 0
-	note G#, 0
-	note B_, 0
+	note D_, 1
+	note E_, 1
+	note G#, 1
+	note B_, 1
 	octave 5
-	note D_, 0
+	note D_, 1
 	vibrato $10, $23
 
 Music_VermilionCity_branch_eb6a0: ; eb6a0
@@ -35,111 +35,111 @@
 	dutycycle $1
 	notetype $c, $85
 	callchannel Music_VermilionCity_branch_eb6f9
-	note F_, 3
+	note F_, 4
 	octave 4
-	note D_, 3
-	note C#, 3
-	note E_, 3
+	note D_, 4
+	note C#, 4
+	note E_, 4
 	callchannel Music_VermilionCity_branch_eb6f9
 	callchannel Music_VermilionCity_branch_eb701
 	dutycycle $2
 	notetype $c, $85
 	callchannel Music_VermilionCity_branch_eb6f9
-	note F_, 3
+	note F_, 4
 	octave 4
-	note D_, 3
-	note E_, 0
-	note C#, 0
+	note D_, 4
+	note E_, 1
+	note C#, 1
 	octave 3
-	note A_, 0
-	note E_, 0
+	note A_, 1
+	note E_, 1
 	octave 4
-	note C#, 0
+	note C#, 1
 	octave 3
-	note A_, 0
-	note E_, 0
-	note C_, 0
+	note A_, 1
+	note E_, 1
+	note C_, 1
 	callchannel Music_VermilionCity_branch_eb6f9
 	callchannel Music_VermilionCity_branch_eb701
 	intensity $93
 	dutycycle $0
-	note __, 1
-	note F#, 1
-	note __, 1
-	note F#, 1
-	note __, 1
-	note F#, 1
-	note __, 1
-	note F#, 1
+	note __, 2
+	note F#, 2
+	note __, 2
+	note F#, 2
+	note __, 2
+	note F#, 2
+	note __, 2
+	note F#, 2
 	callchannel Music_VermilionCity_branch_eb70c
 	callchannel Music_VermilionCity_branch_eb70c
 	intensity $87
 	dutycycle $2
 	octave 4
-	note D_, 7
+	note D_, 8
 	octave 3
-	note G#, 7
-	note E_, 7
-	note B_, 7
-	note A_, 3
-	note G#, 3
-	note F#, 3
-	note E_, 3
+	note G#, 8
+	note E_, 8
+	note B_, 8
+	note A_, 4
+	note G#, 4
+	note F#, 4
+	note E_, 4
 	octave 2
-	note B_, 3
-	note G#, 3
-	note B_, 3
+	note B_, 4
+	note G#, 4
+	note B_, 4
 	octave 3
-	note D_, 3
+	note D_, 4
 	loopchannel 0, Music_VermilionCity_branch_eb6a0
 ; eb6f9
 
 Music_VermilionCity_branch_eb6f9: ; eb6f9
 	octave 3
-	note C#, 3
-	note E_, 3
-	note F#, 1
-	note A_, 1
-	note E_, 1
-	note G#, 1
+	note C#, 4
+	note E_, 4
+	note F#, 2
+	note A_, 2
+	note E_, 2
+	note G#, 2
 	endchannel
 ; eb701
 
 Music_VermilionCity_branch_eb701: ; eb701
-	note D_, 1
-	note F_, 1
-	note A_, 1
+	note D_, 2
+	note F_, 2
+	note A_, 2
 	octave 4
-	note D_, 1
-	note E_, 1
-	note C#, 1
+	note D_, 2
+	note E_, 2
+	note C#, 2
 	octave 3
-	note A_, 1
-	note E_, 1
+	note A_, 2
+	note E_, 2
 	endchannel
 ; eb70c
 
 Music_VermilionCity_branch_eb70c: ; eb70c
-	note __, 1
-	note F#, 1
-	note A_, 1
-	note F#, 1
+	note __, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note F#, 1
-	note A_, 1
-	note F#, 1
-	note __, 1
-	note G#, 1
-	note B_, 1
-	note G#, 1
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note __, 2
+	note G#, 2
+	note B_, 2
+	note G#, 2
 	octave 4
-	note E_, 1
+	note E_, 2
 	octave 3
-	note G#, 1
-	note B_, 1
-	note G#, 1
+	note G#, 2
+	note B_, 2
+	note G#, 2
 	endchannel
 
 Music_VermilionCity_Ch2: ; eb721
@@ -148,84 +148,84 @@
 	notetype $c, $77
 	vibrato $10, $23
 	octave 5
-	note E_, 3
-	note D_, 3
+	note E_, 4
+	note D_, 4
 	octave 4
-	note B_, 3
-	note G#, 3
-	note F#, 3
-	note E_, 3
-	note F#, 3
-	note G#, 3
+	note B_, 4
+	note G#, 4
+	note F#, 4
+	note E_, 4
+	note F#, 4
+	note G#, 4
 
 Music_VermilionCity_branch_eb735: ; eb735
 	notetype $c, $97
 	callchannel Music_VermilionCity_branch_eb768
-	note G#, 1
+	note G#, 2
 	callchannel Music_VermilionCity_branch_eb768
-	note E_, 1
+	note E_, 2
 	intensity $b7
 	octave 3
-	note B_, 3
+	note B_, 4
 	octave 4
-	note C#, 3
-	note D_, 3
-	note E_, 3
+	note C#, 4
+	note D_, 4
+	note E_, 4
 	callchannel Music_VermilionCity_branch_eb77e
 	callchannel Music_VermilionCity_branch_eb77e
-	note F#, 5
-	note E_, 0
-	note F#, 0
-	note E_, 7
-	note A_, 5
-	note G#, 0
-	note A_, 0
-	note G#, 7
-	note G#, 13
+	note F#, 6
+	note E_, 1
+	note F#, 1
+	note E_, 8
+	note A_, 6
+	note G#, 1
+	note A_, 1
+	note G#, 8
+	note G#, 14
 	notetype $6, $57
-	note __, 0
+	note __, 1
 	octave 4
-	note E_, 0
-	note G#, 0
-	note B_, 0
+	note E_, 1
+	note G#, 1
+	note B_, 1
 	notetype $c, $87
 	octave 5
-	note E_, 15
+	note E_, 16
 	loopchannel 0, Music_VermilionCity_branch_eb735
 ; eb768
 
 Music_VermilionCity_branch_eb768: ; eb768
 	octave 1
-	note A_, 7
+	note A_, 8
 	octave 2
-	note F#, 3
-	note E_, 3
-	note D_, 5
-	note C#, 0
-	note D_, 0
-	note E_, 7
+	note F#, 4
+	note E_, 4
+	note D_, 6
+	note C#, 1
+	note D_, 1
+	note E_, 8
 	octave 1
-	note A_, 7
+	note A_, 8
 	octave 2
-	note F#, 3
-	note E_, 3
-	note D_, 5
-	note E_, 0
-	note D_, 0
-	note C#, 1
+	note F#, 4
+	note E_, 4
+	note D_, 6
 	note E_, 1
+	note D_, 1
+	note C#, 2
+	note E_, 2
 	octave 1
-	note A_, 1
+	note A_, 2
 	endchannel
 ; eb77e
 
 Music_VermilionCity_branch_eb77e: ; eb77e
-	note F#, 7
-	note B_, 7
-	note A_, 3
-	note G#, 3
-	note F#, 3
-	note E_, 3
+	note F#, 8
+	note B_, 8
+	note A_, 4
+	note G#, 4
+	note F#, 4
+	note E_, 4
 	endchannel
 
 Music_VermilionCity_Ch3: ; eb785
@@ -233,117 +233,117 @@
 	vibrato $22, $23
 	notetype $c, $25
 	octave 2
-	note E_, 3
-	note B_, 3
+	note E_, 4
+	note B_, 4
 	octave 3
-	note E_, 3
-	note B_, 3
-	note D_, 3
-	note E_, 3
-	note D_, 1
+	note E_, 4
+	note B_, 4
+	note D_, 4
+	note E_, 4
+	note D_, 2
 	octave 3
-	note B_, 0
-	note G#, 0
-	note F#, 0
-	note E_, 0
-	note D_, 0
+	note B_, 1
+	note G#, 1
+	note F#, 1
+	note E_, 1
+	note D_, 1
 	octave 2
-	note B_, 0
+	note B_, 1
 
 Music_VermilionCity_branch_eb79e: ; eb79e
 	notetype $c, $22
 	callchannel Music_VermilionCity_branch_eb7de
 	octave 5
-	note A_, 5
+	note A_, 6
 	intensity $24
-	note E_, 0
-	note G#, 0
+	note E_, 1
+	note G#, 1
 	callchannel Music_VermilionCity_branch_eb7de
-	note A_, 7
+	note A_, 8
 	intensity $14
 	octave 3
-	note D_, 3
-	note C#, 3
+	note D_, 4
+	note C#, 4
 	octave 2
-	note B_, 3
-	note A_, 3
+	note B_, 4
+	note A_, 4
 	octave 3
+	note D_, 2
+	note __, 4
 	note D_, 1
-	note __, 3
-	note D_, 0
-	note D_, 0
+	note D_, 1
 	callchannel Music_VermilionCity_branch_eb7f5
 	octave 4
-	note D_, 1
+	note D_, 2
 	octave 3
-	note D_, 1
-	note __, 1
-	note D_, 1
+	note D_, 2
+	note __, 2
+	note D_, 2
 	callchannel Music_VermilionCity_branch_eb7f5
 	intensity $25
 	octave 3
-	note E_, 7
+	note E_, 8
 	octave 4
-	note E_, 7
+	note E_, 8
 	octave 3
-	note B_, 7
+	note B_, 8
 	octave 4
-	note E_, 7
+	note E_, 8
 	octave 2
-	note E_, 15
+	note E_, 16
 	octave 3
-	note E_, 13
+	note E_, 14
 	intensity $22
 	octave 5
-	note E_, 0
-	note G#, 0
+	note E_, 1
+	note G#, 1
 	loopchannel 0, Music_VermilionCity_branch_eb79e
 ; eb7de
 
 Music_VermilionCity_branch_eb7de: ; eb7de
 	octave 5
-	note A_, 7
+	note A_, 8
 	octave 6
-	note D_, 3
-	note C#, 3
+	note D_, 4
+	note C#, 4
 	octave 5
-	note B_, 5
-	note A_, 0
-	note B_, 0
+	note B_, 6
+	note A_, 1
+	note B_, 1
 	octave 6
-	note C#, 7
+	note C#, 8
 	octave 5
-	note A_, 7
+	note A_, 8
 	octave 6
-	note D_, 3
-	note C#, 3
+	note D_, 4
+	note C#, 4
 	octave 5
-	note B_, 5
+	note B_, 6
 	octave 6
-	note C#, 0
+	note C#, 1
 	octave 5
-	note B_, 0
+	note B_, 1
 	endchannel
 ; eb7f5
 
 Music_VermilionCity_branch_eb7f5: ; eb7f5
-	note A_, 0
-	note __, 0
 	note A_, 1
 	note __, 1
-	note F#, 1
+	note A_, 2
+	note __, 2
+	note F#, 2
+	note E_, 2
+	note __, 4
 	note E_, 1
-	note __, 3
-	note E_, 0
-	note E_, 0
+	note E_, 1
 	octave 4
-	note E_, 0
-	note __, 0
-	note D_, 1
+	note E_, 1
 	note __, 1
+	note D_, 2
+	note __, 2
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note C#, 0
+	note C#, 1
 	endchannel
 ; eb808
--- a/audio/music/victoryroad.asm
+++ b/audio/music/victoryroad.asm
@@ -21,24 +21,24 @@
 Music_VictoryRoad_branch_f6c94: ; f6c94
 	intensity $b2
 	octave 2
-	note A_, 0
+	note A_, 1
 	octave 3
-	note C#, 0
-	note D_, 0
-	note __, 0
+	note C#, 1
+	note D_, 1
+	note __, 1
 	octave 2
-	note A_, 0
+	note A_, 1
 	intensity $b7
 	octave 3
-	note C#, 2
+	note C#, 3
 	octave 2
-	note A_, 0
+	note A_, 1
 	octave 3
-	note D_, 2
+	note D_, 3
 	octave 2
-	note A_, 0
+	note A_, 1
 	octave 3
-	note G#, 2
+	note G#, 3
 	loopchannel 2, Music_VictoryRoad_branch_f6c94
 
 Music_VictoryRoad_branch_f6cae: ; f6cae
@@ -50,22 +50,22 @@
 Music_VictoryRoad_branch_f6cb9: ; f6cb9
 	intensity $b2
 	octave 2
-	note G_, 0
-	note B_, 0
+	note G_, 1
+	note B_, 1
 	octave 3
-	note C_, 0
-	note __, 0
+	note C_, 1
+	note __, 1
 	octave 2
-	note G_, 0
+	note G_, 1
 	intensity $b7
-	note B_, 2
-	note G_, 0
+	note B_, 3
+	note G_, 1
 	octave 3
-	note C_, 2
+	note C_, 3
 	octave 2
-	note G_, 0
+	note G_, 1
 	octave 3
-	note F#, 2
+	note F#, 3
 	endchannel
 
 Music_VictoryRoad_Ch2: ; f6cce
@@ -75,70 +75,70 @@
 Music_VictoryRoad_branch_f6cd3: ; f6cd3
 	notetype $c, $c2
 	callchannel Music_VictoryRoad_branch_f6d1e
-	note __, 1
+	note __, 2
 	callchannel Music_VictoryRoad_branch_f6d1e
-	note __, 0
+	note __, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	notetype $c, $b0
-	note E_, 7
+	note E_, 8
 	octave 5
-	note C_, 3
+	note C_, 4
 	octave 4
-	note B_, 3
-	note E_, 14
-	note D#, 0
+	note B_, 4
+	note E_, 15
+	note D#, 1
 	notetype $c, $b0
-	note E_, 7
+	note E_, 8
 	octave 5
-	note C_, 3
+	note C_, 4
 	octave 4
-	note B_, 3
+	note B_, 4
 	notetype $c, $b0
 	octave 5
-	note E_, 7
+	note E_, 8
 	notetype $c, $b7
-	note E_, 7
+	note E_, 8
 	notetype $c, $c7
-	note D_, 7
+	note D_, 8
 	stereopanning $f0
-	note C#, 3
+	note C#, 4
 	stereopanning $f
 	octave 4
-	note A_, 3
+	note A_, 4
 	stereopanning $ff
 	octave 5
-	note C_, 7
+	note C_, 8
 	stereopanning $f
 	octave 4
-	note A#, 3
+	note A#, 4
 	stereopanning $f0
-	note F_, 3
+	note F_, 4
 	stereopanning $ff
-	note A_, 11
-	note D_, 0
-	note F#, 0
-	note A_, 0
+	note A_, 12
+	note D_, 1
+	note F#, 1
+	note A_, 1
 	octave 5
-	note C#, 0
-	note D_, 15
+	note C#, 1
+	note D_, 16
 	loopchannel 0, Music_VictoryRoad_branch_f6cd3
 ; f6d1e
 
 Music_VictoryRoad_branch_f6d1e: ; f6d1e
 	octave 3
-	note E_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note F#, 0
-	note F#, 0
+	note E_, 1
 	note __, 1
-	note G#, 0
-	note G#, 0
+	note E_, 1
 	note __, 1
-	note A_, 0
-	note A_, 0
+	note F#, 1
+	note F#, 1
+	note __, 2
+	note G#, 1
+	note G#, 1
+	note __, 2
+	note A_, 1
+	note A_, 1
 	endchannel
 
 Music_VictoryRoad_Ch3: ; f6d2c
@@ -150,17 +150,17 @@
 	loopchannel 6, Music_VictoryRoad_branch_f6d31
 
 Music_VictoryRoad_branch_f6d38: ; f6d38
-	note D_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note F_, 0
-	note A_, 2
-	note D_, 0
-	note B_, 0
+	note D_, 1
 	note __, 1
-	note D_, 0
-	note B_, 2
+	note B_, 1
+	note __, 1
+	note F_, 1
+	note A_, 3
+	note D_, 1
+	note B_, 1
+	note __, 2
+	note D_, 1
+	note B_, 3
 	loopchannel 2, Music_VictoryRoad_branch_f6d38
 
 Music_VictoryRoad_branch_f6d47: ; f6d47
@@ -171,17 +171,17 @@
 
 Music_VictoryRoad_branch_f6d52: ; f6d52
 	octave 3
-	note C_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note D#, 0
-	note G_, 2
-	note C_, 0
-	note A_, 0
+	note C_, 1
 	note __, 1
-	note C_, 0
-	note A_, 2
+	note A_, 1
+	note __, 1
+	note D#, 1
+	note G_, 3
+	note C_, 1
+	note A_, 1
+	note __, 2
+	note C_, 1
+	note A_, 3
 	endchannel
 
 Music_VictoryRoad_Ch4: ; f6d5f
@@ -189,23 +189,23 @@
 	notetype $c
 
 Music_VictoryRoad_branch_f6d63: ; f6d63
-	note D_, 1
-	note D_, 1
-	note D#, 0
 	note D_, 2
-	note D#, 0
 	note D_, 2
-	note D#, 0
+	note D#, 1
+	note D_, 3
+	note D#, 1
+	note D_, 3
+	note D#, 1
+	note D_, 3
 	note D_, 2
-	note D_, 1
-	note D_, 1
-	note D#, 0
 	note D_, 2
-	note D#, 0
-	note D#, 0
-	note D_, 1
-	note D#, 0
-	note D_, 1
-	note D#, 0
+	note D#, 1
+	note D_, 3
+	note D#, 1
+	note D#, 1
+	note D_, 2
+	note D#, 1
+	note D_, 2
+	note D#, 1
 	loopchannel 0, Music_VictoryRoad_branch_f6d63
 ; f6d79
--- a/audio/music/violetcity.asm
+++ b/audio/music/violetcity.asm
@@ -12,291 +12,291 @@
 	vibrato $12, $25
 	dutycycle $2
 	notetype $c, $95
-	note __, 15
+	note __, 16
 	stereopanning $f0
 	octave 2
-	note E_, 0
-	note G#, 0
-	note B_, 0
+	note E_, 1
+	note G#, 1
+	note B_, 1
 	stereopanning $ff
 	octave 3
-	note D#, 0
-	note G#, 0
-	note __, 0
-	note A#, 3
+	note D#, 1
 	note G#, 1
-	note F#, 1
-	note C#, 1
+	note __, 1
+	note A#, 4
+	note G#, 2
+	note F#, 2
+	note C#, 2
 	stereopanning $f
 	octave 2
-	note D#, 0
-	note F#, 0
-	note A#, 0
+	note D#, 1
+	note F#, 1
+	note A#, 1
 	stereopanning $ff
 	octave 3
-	note C#, 0
-	note F#, 0
-	note __, 0
-	note D#, 3
-	note G#, 1
-	note D#, 1
+	note C#, 1
+	note F#, 1
+	note __, 1
+	note D#, 4
+	note G#, 2
+	note D#, 2
 	octave 2
+	note G#, 2
+	note C#, 1
+	note E_, 1
 	note G#, 1
-	note C#, 0
-	note E_, 0
-	note G#, 0
-	note B_, 0
+	note B_, 1
 	octave 3
-	note G#, 0
-	note __, 0
+	note G#, 1
+	note __, 1
 	octave 2
-	note B_, 3
+	note B_, 4
 	notetype $6, $91
 	octave 3
-	note C#, 1
-	note F_, 1
-	note C#, 1
-	note F_, 1
-	note G#, 1
-	note B_, 1
+	note C#, 2
+	note F_, 2
+	note C#, 2
+	note F_, 2
+	note G#, 2
+	note B_, 2
 	intensity $a4
 	octave 2
-	note B_, 7
-	note __, 3
+	note B_, 8
+	note __, 4
 	octave 3
-	note C#, 11
-	note __, 7
+	note C#, 12
+	note __, 8
 
 Music_VioletCity_branch_f0056: ; f0056
 	notetype $6, $95
-	note __, 3
+	note __, 4
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note C#, 1
-	note D#, 3
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note __, 1
-	note F#, 1
-	note __, 1
-	note G#, 1
-	note __, 1
-	note B_, 1
-	note __, 1
+	note C#, 2
+	note D#, 4
+	note D#, 2
+	note E_, 2
+	note D#, 2
+	note __, 2
+	note F#, 2
+	note __, 2
+	note G#, 2
+	note __, 2
+	note B_, 2
+	note __, 2
 	stereopanning $f0
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note G#, 1
-	note E_, 1
+	note G#, 2
+	note E_, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	stereopanning $ff
-	note C_, 1
+	note C_, 2
 	octave 3
-	note G#, 1
-	note E_, 1
+	note G#, 2
+	note E_, 2
 	octave 4
-	note C_, 1
+	note C_, 2
 	stereopanning $f
 	octave 3
-	note B_, 1
-	note __, 1
-	note B_, 1
-	note __, 1
-	note A#, 7
+	note B_, 2
+	note __, 2
+	note B_, 2
+	note __, 2
+	note A#, 8
 	stereopanning $ff
-	note __, 3
-	note C#, 1
-	note E_, 1
-	note A#, 3
-	note A#, 1
+	note __, 4
+	note C#, 2
+	note E_, 2
+	note A#, 4
+	note A#, 2
 	octave 4
-	note C#, 1
+	note C#, 2
 	octave 3
-	note A#, 1
-	note __, 1
-	note F#, 1
-	note __, 1
-	note E_, 1
-	note __, 1
-	note C#, 1
-	note __, 1
+	note A#, 2
+	note __, 2
+	note F#, 2
+	note __, 2
+	note E_, 2
+	note __, 2
+	note C#, 2
+	note __, 2
 	stereopanning $f
-	note D#, 7
+	note D#, 8
 	stereopanning $ff
-	note E_, 7
+	note E_, 8
 	stereopanning $f0
-	note F_, 1
-	note __, 1
-	note F_, 1
-	note __, 1
-	note F#, 1
-	note __, 1
-	note G_, 3
+	note F_, 2
+	note __, 2
+	note F_, 2
+	note __, 2
+	note F#, 2
+	note __, 2
+	note G_, 4
 	stereopanning $ff
-	note G#, 1
-	note D#, 0
-	note __, 0
+	note G#, 2
+	note D#, 1
+	note __, 1
 	octave 2
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 3
-	note D#, 0
-	note __, 0
-	note B_, 3
-	note G#, 1
-	note G#, 1
-	note A#, 1
+	note D#, 1
 	note __, 1
-	note A#, 1
-	note __, 1
-	note D#, 3
-	note F#, 1
-	note __, 1
+	note B_, 4
+	note G#, 2
+	note G#, 2
+	note A#, 2
+	note __, 2
+	note A#, 2
+	note __, 2
+	note D#, 4
+	note F#, 2
+	note __, 2
 	notetype $c, $95
-	note __, 7
+	note __, 8
 	octave 4
-	note F_, 2
+	note F_, 3
 	dutycycle $1
 	notetype $6, $75
-	note G#, 0
-	note B_, 0
+	note G#, 1
+	note B_, 1
 	octave 5
-	note D#, 7
+	note D#, 8
 	notetype $c, $93
 	dutycycle $2
-	note __, 15
+	note __, 16
 	notetype $6, $91
 	stereopanning $f0
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note B_, 1
-	note G#, 1
+	note B_, 2
+	note G#, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	stereopanning $f
 	octave 2
-	note B_, 1
-	note G#, 1
-	note B_, 1
+	note B_, 2
+	note G#, 2
+	note B_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	intensity $a4
 	stereopanning $ff
-	note D#, 7
-	note __, 7
+	note D#, 8
+	note __, 8
 	dutycycle $3
 	intensity $84
-	note __, 3
-	note G_, 1
-	note A_, 1
-	note B_, 3
+	note __, 4
+	note G_, 2
+	note A_, 2
+	note B_, 4
 	octave 4
-	note D_, 3
-	note C#, 3
+	note D_, 4
+	note C#, 4
 	notetype $8, $84
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note C#, 0
+	note C#, 1
 	octave 3
-	note B_, 0
-	note A_, 2
+	note B_, 1
+	note A_, 3
 	notetype $c, $84
-	note F#, 0
-	note __, 0
 	note F#, 1
-	note C#, 0
-	note __, 0
-	note F#, 1
-	note D_, 3
-	note E_, 3
-	note F#, 1
-	note B_, 0
-	note __, 0
-	note B_, 0
+	note __, 1
+	note F#, 2
+	note C#, 1
+	note __, 1
+	note F#, 2
+	note D_, 4
+	note E_, 4
+	note F#, 2
+	note B_, 1
+	note __, 1
+	note B_, 1
 	octave 4
-	note C#, 0
+	note C#, 1
+	note D_, 2
+	note F#, 2
+	note E_, 2
+	notetype $8, $84
 	note D_, 1
-	note F#, 1
 	note E_, 1
-	notetype $8, $84
-	note D_, 0
-	note E_, 0
-	note D_, 0
-	note C#, 2
+	note D_, 1
+	note C#, 3
 	notetype $c, $84
 	octave 3
-	note B_, 0
-	note __, 0
-	note A_, 1
-	note F#, 0
-	note __, 0
-	note A_, 1
+	note B_, 1
+	note __, 1
+	note A_, 2
+	note F#, 1
+	note __, 1
+	note A_, 2
 	octave 4
-	note E_, 3
-	note D_, 3
-	note C#, 1
-	note G#, 0
-	note E_, 0
+	note E_, 4
+	note D_, 4
+	note C#, 2
+	note G#, 1
+	note E_, 1
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note E_, 0
-	note G#, 0
-	note __, 0
-	note G#, 0
-	note A#, 0
-	note B_, 3
-	note __, 3
-	note G#, 0
-	note F_, 0
+	note E_, 1
+	note G#, 1
+	note __, 1
+	note G#, 1
+	note A#, 1
+	note B_, 4
+	note __, 4
+	note G#, 1
+	note F_, 1
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note F_, 0
-	note G#, 0
-	note __, 0
-	note G#, 0
-	note A#, 0
-	note B_, 3
-	note __, 3
-	note C#, 0
+	note F_, 1
+	note G#, 1
+	note __, 1
+	note G#, 1
+	note A#, 1
+	note B_, 4
+	note __, 4
+	note C#, 1
 	octave 3
-	note B_, 0
-	note F#, 0
+	note B_, 1
+	note F#, 1
 	octave 4
-	note C#, 0
+	note C#, 1
 	octave 3
-	note B_, 0
-	note F#, 0
+	note B_, 1
+	note F#, 1
 	octave 4
-	note C#, 0
+	note C#, 1
 	octave 3
-	note B_, 0
-	note F#, 0
-	note C#, 0
-	note F#, 0
-	note A#, 0
+	note B_, 1
+	note F#, 1
+	note C#, 1
+	note F#, 1
+	note A#, 1
 	octave 4
-	note C#, 0
-	note F#, 0
-	note A#, 0
+	note C#, 1
+	note F#, 1
+	note A#, 1
 	octave 5
-	note C#, 0
+	note C#, 1
 	dutycycle $2
 	octave 4
-	note C#, 5
-	note C_, 0
+	note C#, 6
+	note C_, 1
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note C#, 3
-	note __, 3
+	note C#, 4
+	note __, 4
 	loopchannel 0, Music_VioletCity_branch_f0056
 
 Music_VioletCity_Ch2: ; f0162
@@ -303,433 +303,433 @@
 	vibrato $12, $24
 	dutycycle $2
 	notetype $c, $c7
-	note __, 15
+	note __, 16
 	octave 3
-	note G#, 0
-	note __, 0
-	note A#, 0
-	note __, 0
-	note B_, 0
-	note __, 0
+	note G#, 1
+	note __, 1
+	note A#, 1
+	note __, 1
+	note B_, 1
+	note __, 1
 	octave 4
-	note D#, 3
-	note C#, 1
+	note D#, 4
+	note C#, 2
 	octave 3
-	note A#, 1
+	note A#, 2
+	note G#, 2
+	note F#, 1
+	note __, 1
 	note G#, 1
-	note F#, 0
-	note __, 0
-	note G#, 0
-	note __, 0
-	note A#, 0
-	note __, 0
+	note __, 1
+	note A#, 1
+	note __, 1
 	octave 4
-	note C#, 3
+	note C#, 4
 	octave 3
-	note B_, 1
+	note B_, 2
+	note A#, 2
+	note B_, 2
+	note G#, 1
+	note __, 1
 	note A#, 1
+	note __, 1
 	note B_, 1
-	note G#, 0
-	note __, 0
-	note A#, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note G#, 3
-	note A#, 1
-	note B_, 1
+	note __, 1
+	note G#, 4
+	note A#, 2
+	note B_, 2
 	octave 4
-	note C#, 1
-	note D#, 1
+	note C#, 2
+	note D#, 2
 	octave 3
-	note F#, 1
+	note F#, 2
 	octave 4
-	note D#, 0
-	note __, 0
-	note C#, 5
+	note D#, 1
 	note __, 1
-	note D#, 0
-	note E_, 0
+	note C#, 6
+	note __, 2
+	note D#, 1
+	note E_, 1
 
 Music_VioletCity_branch_f0199: ; f0199
 	intensity $b7
-	note F#, 3
+	note F#, 4
+	note __, 2
+	note F#, 1
+	note G#, 1
+	note F#, 1
 	note __, 1
-	note F#, 0
-	note G#, 0
-	note F#, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	note E_, 13
-	note C#, 0
-	note D#, 0
-	note E_, 3
+	note E_, 1
 	note __, 1
-	note E_, 0
-	note F#, 0
-	note E_, 0
-	note __, 0
-	note D#, 0
-	note __, 0
-	note C#, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note D#, 11
+	note D#, 1
 	note __, 1
-	octave 3
-	note B_, 0
-	octave 4
-	note C#, 0
-	note D#, 3
+	note F#, 1
 	note __, 1
-	note D#, 0
-	note E_, 0
-	note D#, 0
-	note __, 0
-	note C#, 0
-	note __, 0
+	note E_, 14
+	note C#, 1
+	note D#, 1
+	note E_, 4
+	note __, 2
+	note E_, 1
+	note F#, 1
+	note E_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note D#, 12
+	note __, 2
 	octave 3
 	note B_, 1
 	octave 4
-	note C#, 0
-	note __, 0
-	note D#, 3
-	note G#, 3
-	note B_, 2
+	note C#, 1
+	note D#, 4
 	note __, 2
-	note C#, 0
-	note D#, 0
+	note D#, 1
 	note E_, 1
+	note D#, 1
+	note __, 1
+	note C#, 1
+	note __, 1
 	octave 3
-	note G#, 1
-	note B_, 1
+	note B_, 2
 	octave 4
-	note E_, 1
-	note D#, 0
+	note C#, 1
+	note __, 1
+	note D#, 4
+	note G#, 4
+	note B_, 3
+	note __, 3
+	note C#, 1
+	note D#, 1
+	note E_, 2
 	octave 3
-	note F#, 0
-	note B_, 0
+	note G#, 2
+	note B_, 2
 	octave 4
-	note D#, 0
-	note C#, 0
+	note E_, 2
+	note D#, 1
 	octave 3
-	note E_, 0
-	note A#, 0
+	note F#, 1
+	note B_, 1
 	octave 4
-	note C#, 0
+	note D#, 1
+	note C#, 1
 	octave 3
-	note B_, 11
-	note __, 3
+	note E_, 1
+	note A#, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note B_, 12
+	note __, 4
 	intensity $a7
 	dutycycle $3
-	note __, 1
-	note B_, 0
+	note __, 2
+	note B_, 1
 	octave 4
-	note C#, 0
+	note C#, 1
+	note D_, 2
+	note F#, 2
+	note E_, 2
+	notetype $8, $a7
 	note D_, 1
-	note F#, 1
 	note E_, 1
-	notetype $8, $a7
-	note D_, 0
-	note E_, 0
-	note D_, 0
-	note C#, 2
+	note D_, 1
+	note C#, 3
 	notetype $c, $a7
 	octave 3
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
+	note A_, 2
+	note F#, 1
+	note __, 1
+	note A_, 2
+	octave 4
+	note E_, 4
+	note D_, 4
+	note C#, 2
+	note __, 2
+	note G_, 1
 	note A_, 1
-	note F#, 0
-	note __, 0
-	note A_, 1
+	note B_, 2
+	octave 5
+	note D_, 2
+	note C#, 2
+	notetype $8, $a7
 	octave 4
-	note E_, 3
-	note D_, 3
-	note C#, 1
-	note __, 1
-	note G_, 0
-	note A_, 0
 	note B_, 1
 	octave 5
-	note D_, 1
 	note C#, 1
-	notetype $8, $a7
 	octave 4
-	note B_, 0
-	octave 5
-	note C#, 0
-	octave 4
-	note B_, 0
-	note A_, 2
+	note B_, 1
+	note A_, 3
 	notetype $c, $a7
-	note G_, 0
-	note __, 0
-	note F#, 1
-	note C#, 0
-	note __, 0
-	note F#, 1
+	note G_, 1
+	note __, 1
+	note F#, 2
+	note C#, 1
+	note __, 1
+	note F#, 2
 	vibrato $0, $0
 	intensity $87
 	octave 5
-	note E_, 3
-	note F#, 3
-	note D_, 0
-	note E_, 0
-	note F#, 11
-	note __, 1
-	note D_, 0
-	note E_, 0
-	note F#, 11
-	note __, 1
+	note E_, 4
+	note F#, 4
+	note D_, 1
+	note E_, 1
+	note F#, 12
+	note __, 2
+	note D_, 1
+	note E_, 1
+	note F#, 12
+	note __, 2
 	octave 4
-	note A#, 0
-	note B_, 0
+	note A#, 1
+	note B_, 1
 	octave 5
-	note C#, 10
-	note __, 4
+	note C#, 11
+	note __, 5
 	vibrato $12, $24
 	intensity $a7
 	dutycycle $2
 	octave 4
-	note A#, 5
-	note A_, 0
-	note G#, 0
-	note F#, 3
-	note __, 1
-	note D#, 0
-	note E_, 0
+	note A#, 6
+	note A_, 1
+	note G#, 1
+	note F#, 4
+	note __, 2
+	note D#, 1
+	note E_, 1
 	loopchannel 0, Music_VioletCity_branch_f0199
 
 Music_VioletCity_Ch3: ; f0247
 	notetype $c, $25
-	note __, 15
-	note __, 5
+	note __, 16
+	note __, 6
 	octave 4
-	note E_, 3
-	note __, 5
-	note __, 5
+	note E_, 4
+	note __, 6
+	note __, 6
 	octave 3
-	note G#, 3
-	note __, 5
-	note __, 5
-	note F_, 3
-	note __, 5
+	note G#, 4
+	note __, 6
+	note __, 6
+	note F_, 4
+	note __, 6
 	octave 2
-	note F#, 3
+	note F#, 4
 	octave 3
-	note C#, 0
-	note __, 0
-	note A#, 3
-	note A_, 0
-	note G#, 0
-	note F#, 1
+	note C#, 1
+	note __, 1
+	note A#, 4
+	note A_, 1
+	note G#, 1
+	note F#, 2
 	octave 2
-	note A#, 1
+	note A#, 2
 
 Music_VioletCity_branch_f0261: ; f0261
 	notetype $c, $25
-	note B_, 0
-	note __, 4
-	note B_, 0
-	note B_, 0
+	note B_, 1
+	note __, 5
+	note B_, 1
+	note B_, 1
+	note __, 2
+	note B_, 1
 	note __, 1
-	note B_, 0
-	note __, 0
 	octave 3
-	note F#, 1
+	note F#, 2
 	octave 2
-	note F#, 0
-	note __, 0
-	octave 3
-	note C#, 0
-	note __, 4
-	note C#, 0
-	note C#, 0
-	note __, 1
-	note C#, 0
-	note __, 0
-	note G#, 1
-	octave 2
-	note G#, 0
-	note __, 0
-	note F#, 0
-	note __, 4
-	note F#, 0
-	note F#, 0
-	note F#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
-	octave 3
 	note F#, 1
-	note C#, 0
-	note __, 0
-	octave 2
-	note B_, 0
-	note __, 4
-	note B_, 0
-	note B_, 0
 	note __, 1
-	note B_, 0
-	note __, 0
 	octave 3
-	note B_, 3
-	note G#, 0
-	note __, 4
-	note G#, 0
-	note G#, 0
-	note G_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note F#, 1
-	note F#, 0
-	note __, 0
-	notetype $6, $25
-	octave 3
 	note C#, 1
-	note F_, 1
-	note G#, 1
-	note B_, 1
-	octave 4
+	note __, 5
 	note C#, 1
-	note F_, 1
-	note G#, 1
-	note B_, 1
-	octave 4
-	note C#, 5
-	notetype $c, $25
-	note __, 4
-	notetype $6, $25
+	note C#, 1
+	note __, 2
+	note C#, 1
+	note __, 1
+	note G#, 2
 	octave 2
-	note E_, 1
-	note __, 9
-	note E_, 1
-	note E_, 1
+	note G#, 1
+	note __, 1
 	note F#, 1
+	note __, 5
+	note F#, 1
+	note F#, 1
+	note F#, 1
 	note __, 1
 	note F#, 1
 	note __, 1
 	octave 3
-	note C#, 3
-	note C_, 3
+	note F#, 2
+	note C#, 1
+	note __, 1
 	octave 2
 	note B_, 1
-	note __, 9
+	note __, 5
 	note B_, 1
 	note B_, 1
-	note __, 3
+	note __, 2
 	note B_, 1
 	note __, 1
-	note A_, 7
-	callchannel Music_VioletCity_branch_f0311
-	note F#, 1
-	note __, 9
-	note B_, 1
-	note B_, 1
-	note B_, 1
+	octave 3
+	note B_, 4
+	note G#, 1
+	note __, 5
+	note G#, 1
+	note G#, 1
+	note G_, 1
 	note __, 1
-	note A#, 7
-	note A_, 1
+	note G_, 1
 	note __, 1
-	callchannel Music_VioletCity_branch_f0311
+	note F#, 2
 	note F#, 1
-	note __, 9
-	note B_, 1
-	note B_, 1
-	note B_, 1
 	note __, 1
-	note A#, 7
-	note A_, 1
-	note __, 1
+	notetype $6, $25
 	octave 3
-	note E_, 1
-	note __, 9
-	note E_, 1
-	note E_, 1
-	note __, 3
-	note E_, 1
-	note __, 1
-	note B_, 3
-	note G#, 1
-	note F#, 1
-	note F_, 1
-	note __, 9
-	note F_, 1
-	note F_, 1
-	note __, 3
-	note F_, 1
-	note __, 1
+	note C#, 2
+	note F_, 2
+	note G#, 2
+	note B_, 2
 	octave 4
-	note C#, 3
+	note C#, 2
+	note F_, 2
+	note G#, 2
+	note B_, 2
+	octave 4
+	note C#, 6
+	notetype $c, $25
+	note __, 5
+	notetype $6, $25
+	octave 2
+	note E_, 2
+	note __, 10
+	note E_, 2
+	note E_, 2
+	note F#, 2
+	note __, 2
+	note F#, 2
+	note __, 2
 	octave 3
-	note A#, 1
-	note G#, 1
-	note F#, 1
-	note __, 9
-	note F#, 1
-	note F#, 1
+	note C#, 4
+	note C_, 4
 	octave 2
-	note F#, 1
-	note __, 1
-	note F#, 1
-	note __, 1
+	note B_, 2
+	note __, 10
+	note B_, 2
+	note B_, 2
+	note __, 4
+	note B_, 2
+	note __, 2
+	note A_, 8
+	callchannel Music_VioletCity_branch_f0311
+	note F#, 2
+	note __, 10
+	note B_, 2
+	note B_, 2
+	note B_, 2
+	note __, 2
+	note A#, 8
+	note A_, 2
+	note __, 2
+	callchannel Music_VioletCity_branch_f0311
+	note F#, 2
+	note __, 10
+	note B_, 2
+	note B_, 2
+	note B_, 2
+	note __, 2
+	note A#, 8
+	note A_, 2
+	note __, 2
 	octave 3
-	note F#, 3
+	note E_, 2
+	note __, 10
+	note E_, 2
+	note E_, 2
+	note __, 4
+	note E_, 2
+	note __, 2
+	note B_, 4
+	note G#, 2
+	note F#, 2
+	note F_, 2
+	note __, 10
+	note F_, 2
+	note F_, 2
+	note __, 4
+	note F_, 2
+	note __, 2
+	octave 4
+	note C#, 4
+	octave 3
+	note A#, 2
+	note G#, 2
+	note F#, 2
+	note __, 10
+	note F#, 2
+	note F#, 2
 	octave 2
-	note F#, 1
-	note G#, 1
+	note F#, 2
+	note __, 2
+	note F#, 2
+	note __, 2
 	octave 3
-	note F#, 11
-	note G#, 1
-	note A_, 1
-	note A#, 7
-	note __, 3
+	note F#, 4
 	octave 2
-	note A#, 3
+	note F#, 2
+	note G#, 2
+	octave 3
+	note F#, 12
+	note G#, 2
+	note A_, 2
+	note A#, 8
+	note __, 4
+	octave 2
+	note A#, 4
 	loopchannel 0, Music_VioletCity_branch_f0261
 ; f0311
 
 Music_VioletCity_branch_f0311: ; f0311
-	note G_, 1
-	note __, 9
-	note G_, 1
-	note G_, 1
-	note A_, 1
-	note __, 1
-	note A_, 1
-	note __, 1
+	note G_, 2
+	note __, 10
+	note G_, 2
+	note G_, 2
+	note A_, 2
+	note __, 2
+	note A_, 2
+	note __, 2
 	octave 3
-	note E_, 3
+	note E_, 4
 	octave 2
-	note A_, 3
+	note A_, 4
 	endchannel
 
 Music_VioletCity_Ch4: ; f031e
 	togglenoise $3
 	notetype $c
+	note D#, 2
+	note D_, 2
 	note D#, 1
-	note D_, 1
-	note D#, 0
-	note D#, 0
-	note D_, 1
-	note D_, 3
-	note F#, 3
+	note D#, 1
+	note D_, 2
+	note D_, 4
+	note F#, 4
 	callchannel Music_VioletCity_branch_f036c
 	callchannel Music_VioletCity_branch_f036c
 	callchannel Music_VioletCity_branch_f036c
-	note D_, 1
-	note D#, 0
-	note D#, 0
-	note D_, 1
-	note C_, 7
+	note D_, 2
 	note D#, 1
+	note D#, 1
+	note D_, 2
+	note C_, 8
+	note D#, 2
 
 Music_VioletCity_branch_f0338: ; f0338
 	callchannel Music_VioletCity_branch_f037a
@@ -752,33 +752,33 @@
 ; f036c
 
 Music_VioletCity_branch_f036c: ; f036c
-	note D_, 0
-	note D_, 0
-	note D#, 0
-	note D#, 0
 	note D_, 1
+	note D_, 1
+	note D#, 1
+	note D#, 1
+	note D_, 2
+	note G_, 2
 	note G_, 1
-	note G_, 0
-	note G_, 0
-	note F#, 1
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
+	note G_, 1
+	note F#, 2
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
 	endchannel
 ; f037a
 
 Music_VioletCity_branch_f037a: ; f037a
-	note D#, 1
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note __, 0
-	note D#, 0
-	note D#, 0
+	note D#, 2
+	note G_, 1
+	note G_, 1
+	note G_, 1
 	note __, 1
 	note D#, 1
-	note D_, 1
 	note D#, 1
+	note __, 2
+	note D#, 2
+	note D_, 2
+	note D#, 2
 	endchannel
 ; f0386
--- a/audio/music/viridiancity.asm
+++ b/audio/music/viridiancity.asm
@@ -14,265 +14,265 @@
 	vibrato $12, $34
 	notetype $c, $a7
 	octave 3
-	note F#, 0
-	note __, 2
 	note F#, 1
 	note __, 3
+	note F#, 2
+	note __, 4
+	note F#, 2
+	note __, 2
 	note F#, 1
 	note __, 1
-	note F#, 0
-	note __, 0
-	note F#, 3
-	note __, 1
+	note F#, 4
+	note __, 2
 	octave 4
-	note D_, 1
-	note __, 1
+	note D_, 2
+	note __, 2
 	octave 3
-	note A_, 1
-	note __, 1
-	note F#, 0
-	note __, 0
-	note F#, 0
+	note A_, 2
 	note __, 2
 	note F#, 1
-	note __, 3
-	note F#, 1
 	note __, 1
-	note G_, 0
-	note __, 0
+	note F#, 1
 	note __, 3
-	note G_, 7
-	note __, 3
+	note F#, 2
+	note __, 4
+	note F#, 2
+	note __, 2
+	note G_, 1
+	note __, 1
+	note __, 4
+	note G_, 8
+	note __, 4
 
 Music_ViridianCity_branch_f4039: ; f4039
 	callchannel Music_ViridianCity_branch_f40c5
-	note __, 3
+	note __, 4
 	callchannel Music_ViridianCity_branch_f40c5
 	octave 4
-	note C_, 3
+	note C_, 4
 	callchannel Music_ViridianCity_branch_f410f
 	octave 4
-	note B_, 1
-	note G_, 1
-	note D_, 1
+	note B_, 2
+	note G_, 2
+	note D_, 2
 	octave 3
-	note B_, 1
+	note B_, 2
+	note F#, 2
+	note E_, 2
 	note F#, 1
-	note E_, 1
-	note F#, 0
-	note __, 0
-	note A_, 0
-	note __, 2
-	note F#, 1
-	note A_, 0
-	note __, 0
+	note __, 1
+	note A_, 1
+	note __, 3
+	note F#, 2
+	note A_, 1
+	note __, 1
 	octave 4
-	note C#, 0
-	note __, 0
+	note C#, 1
 	note __, 1
+	note __, 2
 	octave 3
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
 	octave 4
-	note C#, 0
-	note __, 0
-	note F#, 0
-	note __, 0
+	note C#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
 	intensity $87
 	octave 5
-	note F#, 3
-	note F_, 3
+	note F#, 4
+	note F_, 4
 	intensity $a7
 	octave 3
-	note G_, 5
-	note B_, 7
+	note G_, 6
+	note B_, 8
 	octave 4
-	note E_, 1
-	note __, 1
-	note E_, 1
+	note E_, 2
+	note __, 2
+	note E_, 2
 	octave 3
-	note B_, 3
-	note G_, 1
-	note F#, 1
-	note E_, 3
-	note D_, 1
+	note B_, 4
+	note G_, 2
+	note F#, 2
+	note E_, 4
+	note D_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note D_, 0
-	note __, 0
-	note F#, 0
-	note __, 2
 	note D_, 1
-	note F#, 0
-	note __, 0
-	note A_, 0
-	note __, 0
 	note __, 1
 	note F#, 1
-	note A_, 0
-	note __, 0
+	note __, 3
+	note D_, 2
+	note F#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note __, 2
+	note F#, 2
+	note A_, 1
+	note __, 1
 	octave 4
-	note C_, 0
-	note __, 0
-	note D#, 1
 	note C_, 1
+	note __, 1
+	note D#, 2
+	note C_, 2
 	octave 3
-	note B_, 1
-	note A_, 1
+	note B_, 2
+	note A_, 2
 	callchannel Music_ViridianCity_branch_f410f
 	octave 4
-	note A_, 1
-	note G_, 1
-	note D_, 1
-	note G_, 1
+	note A_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
 	octave 3
+	note F#, 2
+	note E_, 2
 	note F#, 1
-	note E_, 1
-	note F#, 0
-	note __, 0
-	note A_, 0
-	note __, 2
-	note F#, 1
-	note A_, 0
-	note __, 0
-	octave 4
-	note C_, 0
-	note __, 0
 	note __, 1
-	note E_, 1
+	note A_, 1
+	note __, 3
+	note F#, 2
+	note A_, 1
 	note __, 1
+	octave 4
 	note C_, 1
 	note __, 1
+	note __, 2
+	note E_, 2
+	note __, 2
+	note C_, 2
+	note __, 2
 	octave 3
-	note A_, 1
+	note A_, 2
+	note __, 2
+	note F#, 2
+	note G_, 6
+	note B_, 1
 	note __, 1
-	note F#, 1
-	note G_, 5
-	note B_, 0
-	note __, 0
 	octave 4
-	note E_, 3
-	note F#, 1
-	note G_, 5
-	note E_, 1
-	note __, 1
+	note E_, 4
+	note F#, 2
+	note G_, 6
+	note E_, 2
+	note __, 2
 	octave 3
-	note G_, 1
+	note G_, 2
 	octave 4
-	note E_, 1
-	note __, 1
-	note F#, 5
-	note D_, 3
-	octave 3
-	note A_, 3
-	note F#, 3
-	note G_, 0
+	note E_, 2
 	note __, 2
-	note G_, 7
-	note A#, 3
+	note F#, 6
+	note D_, 4
+	octave 3
+	note A_, 4
+	note F#, 4
+	note G_, 1
+	note __, 3
+	note G_, 8
+	note A#, 4
 	loopchannel 0, Music_ViridianCity_branch_f4039
 ; f40c5
 
 Music_ViridianCity_branch_f40c5: ; f40c5
 	octave 3
-	note A_, 0
-	note __, 2
 	note A_, 1
 	note __, 3
+	note A_, 2
+	note __, 4
+	note A_, 2
+	note __, 2
 	note A_, 1
 	note __, 1
-	note A_, 0
-	note __, 0
 	octave 4
-	note C_, 3
-	note __, 1
+	note C_, 4
+	note __, 2
 	octave 3
+	note A_, 2
+	note __, 2
+	octave 4
+	note C_, 2
+	octave 3
 	note A_, 1
 	note __, 1
 	octave 4
 	note C_, 1
+	note __, 1
 	octave 3
-	note A_, 0
-	note __, 0
+	note B_, 1
+	note __, 3
+	note G_, 2
+	note __, 4
+	note G_, 2
+	note __, 2
 	octave 4
-	note C_, 0
-	note __, 0
+	note D_, 2
+	note __, 2
 	octave 3
-	note B_, 0
+	note B_, 2
 	note __, 2
 	note G_, 1
-	note __, 3
-	note G_, 1
 	note __, 1
-	octave 4
-	note D_, 1
-	note __, 1
-	octave 3
+	note G_, 4
+	note __, 2
 	note B_, 1
 	note __, 1
-	note G_, 0
-	note __, 0
-	note G_, 3
-	note __, 1
-	note B_, 0
-	note __, 0
 	octave 4
-	note D_, 0
-	note __, 2
 	note D_, 1
 	note __, 3
+	note D_, 2
+	note __, 4
+	note D_, 2
+	note __, 2
 	note D_, 1
 	note __, 1
-	note D_, 0
-	note __, 0
 	octave 3
-	note G_, 3
-	note __, 1
+	note G_, 4
+	note __, 2
 	octave 4
-	note C#, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note D_, 3
-	note C#, 0
-	note __, 0
+	note C#, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note D_, 4
+	note C#, 1
+	note __, 1
 	octave 3
-	note A_, 0
-	note __, 2
-	note F#, 1
+	note A_, 1
 	note __, 3
-	note F#, 1
+	note F#, 2
+	note __, 4
+	note F#, 2
+	note __, 2
+	note G_, 1
 	note __, 1
-	note G_, 0
-	note __, 0
-	note __, 3
-	note G_, 7
+	note __, 4
+	note G_, 8
 	endchannel
 ; f410f
 
 Music_ViridianCity_branch_f410f: ; f410f
 	octave 3
-	note B_, 1
-	note D_, 1
-	note G_, 0
-	note __, 0
-	note B_, 0
-	note __, 2
+	note B_, 2
+	note D_, 2
 	note G_, 1
-	note B_, 0
-	note __, 0
+	note __, 1
+	note B_, 1
+	note __, 3
+	note G_, 2
+	note B_, 1
+	note __, 1
 	octave 4
-	note D_, 0
-	note __, 0
+	note D_, 1
 	note __, 1
+	note __, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note D_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
 	endchannel
 
 Music_ViridianCity_Ch2: ; f4125
@@ -281,238 +281,238 @@
 	notetype $c, $b7
 	stereopanning $f0
 	octave 2
-	note D_, 3
+	note D_, 4
+	note __, 2
+	note A_, 1
 	note __, 1
-	note A_, 0
-	note __, 0
-	note A_, 3
-	note __, 3
-	note D_, 3
+	note A_, 4
+	note __, 4
+	note D_, 4
+	note __, 2
+	note A_, 1
 	note __, 1
-	note A_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
 	octave 3
-	note C#, 3
+	note C#, 4
 	octave 2
-	note A_, 0
-	note __, 0
-	note D_, 3
+	note A_, 1
 	note __, 1
-	note A_, 0
-	note __, 0
-	note A_, 3
+	note D_, 4
+	note __, 2
+	note A_, 1
 	note __, 1
-	note E_, 0
-	note __, 0
-	note __, 3
-	note E_, 7
-	note __, 3
+	note A_, 4
+	note __, 2
+	note E_, 1
+	note __, 1
+	note __, 4
+	note E_, 8
+	note __, 4
 
 Music_ViridianCity_branch_f414c: ; f414c
 	callchannel Music_ViridianCity_branch_f41c0
-	note __, 3
+	note __, 4
 	callchannel Music_ViridianCity_branch_f41c0
 	octave 2
-	note F#, 3
+	note F#, 4
 	callchannel Music_ViridianCity_branch_f4201
-	note G_, 3
-	note __, 1
+	note G_, 4
+	note __, 2
 	octave 3
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
 	octave 2
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 1
 	octave 3
-	note D_, 3
+	note D_, 4
 	octave 2
-	note B_, 1
+	note B_, 2
 	callchannel Music_ViridianCity_branch_f420b
-	note __, 1
-	note F#, 1
-	note __, 1
+	note __, 2
+	note F#, 2
+	note __, 2
 	octave 3
-	note C#, 0
-	note __, 0
-	note C#, 3
-	note C_, 3
-	callchannel Music_ViridianCity_branch_f4215
-	note E_, 3
+	note C#, 1
 	note __, 1
-	note B_, 0
-	note __, 0
-	note E_, 1
+	note C#, 4
+	note C_, 4
+	callchannel Music_ViridianCity_branch_f4215
+	note E_, 4
+	note __, 2
 	note B_, 1
-	note G_, 3
-	note D_, 3
 	note __, 1
-	note A_, 0
-	note __, 0
-	note A_, 3
-	note C_, 1
-	note C#, 1
+	note E_, 2
+	note B_, 2
+	note G_, 4
+	note D_, 4
+	note __, 2
+	note A_, 1
 	note __, 1
-	note D#, 1
-	note A_, 0
-	note __, 0
+	note A_, 4
+	note C_, 2
+	note C#, 2
+	note __, 2
+	note D#, 2
+	note A_, 1
+	note __, 1
 	octave 3
-	note C_, 0
-	note __, 0
-	note D#, 1
 	note C_, 1
+	note __, 1
+	note D#, 2
+	note C_, 2
 	octave 2
-	note A_, 1
-	note F#, 1
+	note A_, 2
+	note F#, 2
 	callchannel Music_ViridianCity_branch_f4201
-	note G_, 3
+	note G_, 4
+	note __, 2
+	note B_, 1
 	note __, 1
-	note B_, 0
-	note __, 0
-	note G_, 0
-	note __, 0
-	note B_, 3
 	note G_, 1
-	callchannel Music_ViridianCity_branch_f420b
 	note __, 1
-	note F#, 1
-	note __, 1
-	note A_, 1
-	note __, 1
+	note B_, 4
+	note G_, 2
+	callchannel Music_ViridianCity_branch_f420b
+	note __, 2
+	note F#, 2
+	note __, 2
+	note A_, 2
+	note __, 2
 	octave 3
-	note C_, 1
-	note __, 1
+	note C_, 2
+	note __, 2
 	octave 2
-	note D#, 1
+	note D#, 2
 	callchannel Music_ViridianCity_branch_f4215
-	note E_, 3
+	note E_, 4
+	note __, 2
+	note A#, 1
 	note __, 1
-	note A#, 0
-	note __, 0
-	note A#, 3
+	note A#, 4
+	note __, 2
+	note G_, 1
 	note __, 1
-	note G_, 0
-	note __, 0
-	note D_, 3
+	note D_, 4
+	note __, 2
+	note A_, 1
 	note __, 1
-	note A_, 0
-	note __, 0
-	note A_, 3
-	note __, 1
-	note D_, 0
-	note __, 0
-	note E_, 0
+	note A_, 4
 	note __, 2
-	note E_, 7
+	note D_, 1
+	note __, 1
+	note E_, 1
+	note __, 3
+	note E_, 8
 	octave 1
-	note A_, 3
+	note A_, 4
 	loopchannel 0, Music_ViridianCity_branch_f414c
 ; f41c0
 
 Music_ViridianCity_branch_f41c0: ; f41c0
 	octave 2
-	note D_, 3
+	note D_, 4
+	note __, 2
+	note A_, 1
 	note __, 1
-	note A_, 0
-	note __, 0
-	note A_, 3
-	note __, 3
-	note D#, 3
+	note A_, 4
+	note __, 4
+	note D#, 4
+	note __, 2
+	note A_, 1
 	note __, 1
-	note A_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 1
 	octave 3
-	note C_, 3
+	note C_, 4
 	octave 2
-	note A_, 0
-	note __, 0
-	note E_, 3
+	note A_, 1
 	note __, 1
-	note B_, 0
-	note __, 0
-	note B_, 3
-	note __, 3
-	note E_, 3
+	note E_, 4
+	note __, 2
+	note B_, 1
 	note __, 1
-	note B_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
+	note B_, 4
+	note __, 4
+	note E_, 4
+	note __, 2
+	note B_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
 	octave 3
-	note D_, 3
+	note D_, 4
 	octave 2
-	note B_, 0
-	note __, 0
-	note G_, 3
+	note B_, 1
 	note __, 1
+	note G_, 4
+	note __, 2
 	octave 3
-	note D_, 0
-	note __, 0
-	note D_, 3
-	note __, 3
-	octave 2
-	note A_, 3
+	note D_, 1
 	note __, 1
+	note D_, 4
+	note __, 4
+	octave 2
+	note A_, 4
+	note __, 2
 	octave 3
-	note E_, 0
-	note __, 0
-	note E_, 0
-	note __, 0
-	note G_, 3
-	note E_, 0
-	note __, 0
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note G_, 4
+	note E_, 1
+	note __, 1
 	octave 2
-	note D_, 3
+	note D_, 4
+	note __, 2
+	note A_, 1
 	note __, 1
-	note A_, 0
-	note __, 0
-	note A_, 3
+	note A_, 4
+	note __, 2
+	note E_, 1
 	note __, 1
-	note E_, 0
-	note __, 0
-	note __, 3
-	note E_, 7
+	note __, 4
+	note E_, 8
 	endchannel
 ; f4201
 
 Music_ViridianCity_branch_f4201: ; f4201
-	note G_, 3
-	note __, 1
+	note G_, 4
+	note __, 2
 	octave 3
-	note D_, 0
-	note __, 0
-	note D_, 3
+	note D_, 1
+	note __, 1
+	note D_, 4
 	octave 2
-	note F_, 1
-	note F#, 1
+	note F_, 2
+	note F#, 2
 	endchannel
 ; f420b
 
 Music_ViridianCity_branch_f420b: ; f420b
-	note F#, 3
-	note __, 1
+	note F#, 4
+	note __, 2
 	octave 3
-	note C#, 0
-	note __, 0
-	note C#, 3
+	note C#, 1
+	note __, 1
+	note C#, 4
 	octave 2
-	note E_, 1
-	note F_, 1
+	note E_, 2
+	note F_, 2
 	endchannel
 ; f4215
 
 Music_ViridianCity_branch_f4215: ; f4215
 	octave 2
-	note E_, 3
+	note E_, 4
+	note __, 2
+	note B_, 1
 	note __, 1
-	note B_, 0
-	note __, 0
-	note B_, 3
-	note D_, 1
-	note D#, 1
+	note B_, 4
+	note D_, 2
+	note D#, 2
 	endchannel
 
 Music_ViridianCity_Ch3: ; f421e
@@ -520,183 +520,183 @@
 	notetype $c, $13
 	stereopanning $ff
 	octave 4
-	note A_, 0
-	note __, 2
 	note A_, 1
 	note __, 3
+	note A_, 2
+	note __, 4
+	note A_, 2
+	note __, 2
 	note A_, 1
 	note __, 1
-	note A_, 0
-	note __, 0
-	note A_, 3
-	note __, 1
+	note A_, 4
+	note __, 2
 	octave 5
-	note F#, 1
-	note __, 1
-	note C#, 1
-	note __, 1
-	octave 4
-	note A_, 0
-	note __, 0
-	note A_, 0
+	note F#, 2
 	note __, 2
+	note C#, 2
+	note __, 2
+	octave 4
 	note A_, 1
-	note __, 3
-	note A_, 1
 	note __, 1
-	octave 5
-	note D_, 0
-	note __, 0
+	note A_, 1
 	note __, 3
-	note D_, 7
-	note F#, 1
-	note G_, 1
+	note A_, 2
+	note __, 4
+	note A_, 2
+	note __, 2
+	octave 5
+	note D_, 1
+	note __, 1
+	note __, 4
+	note D_, 8
+	note F#, 2
+	note G_, 2
 
 Music_ViridianCity_branch_f4246: ; f4246
 	intensity $13
 	callchannel Music_ViridianCity_branch_f42a2
 	octave 5
-	note F#, 1
-	note G_, 1
+	note F#, 2
+	note G_, 2
 	callchannel Music_ViridianCity_branch_f42a2
-	note E_, 3
+	note E_, 4
 	vibrato $18, $25
 	intensity $25
-	note B_, 11
-	note G_, 3
+	note B_, 12
+	note G_, 4
 	octave 6
-	note D_, 7
-	note E_, 1
-	note D_, 1
-	note C#, 1
+	note D_, 8
+	note E_, 2
+	note D_, 2
+	note C#, 2
 	octave 5
-	note B_, 1
-	note A_, 11
-	note F#, 3
-	note A_, 7
-	note A_, 3
-	note G#, 3
-	note E_, 9
-	note E_, 1
-	note F#, 1
-	note G_, 1
-	note __, 1
-	note G_, 1
-	note F#, 3
-	note E_, 3
-	note G_, 3
-	note F#, 11
-	note D_, 3
-	note A_, 3
-	note __, 3
+	note B_, 2
+	note A_, 12
+	note F#, 4
+	note A_, 8
+	note A_, 4
+	note G#, 4
+	note E_, 10
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note __, 2
+	note G_, 2
+	note F#, 4
+	note E_, 4
+	note G_, 4
+	note F#, 12
+	note D_, 4
+	note A_, 4
+	note __, 4
 	octave 6
-	note C_, 7
+	note C_, 8
 	octave 5
-	note B_, 11
+	note B_, 12
 	octave 6
-	note C#, 1
-	note D_, 1
-	note E_, 1
-	note __, 1
-	note D_, 1
-	note __, 1
-	note C#, 1
-	note __, 1
+	note C#, 2
+	note D_, 2
+	note E_, 2
+	note __, 2
+	note D_, 2
+	note __, 2
+	note C#, 2
+	note __, 2
 	octave 5
-	note B_, 1
-	note __, 1
-	note A_, 9
-	note A_, 1
-	note B_, 1
+	note B_, 2
+	note __, 2
+	note A_, 10
+	note A_, 2
+	note B_, 2
 	octave 6
-	note C_, 1
-	note __, 1
+	note C_, 2
+	note __, 2
 	octave 5
-	note B_, 1
-	note __, 1
-	note A_, 1
-	note __, 1
-	note F#, 1
-	note __, 1
-	note G_, 11
-	note G_, 1
-	note A_, 1
-	note A#, 5
-	note A_, 1
-	note __, 1
-	note G_, 1
-	note A#, 1
-	note __, 1
-	note A_, 13
-	note __, 3
-	note D_, 0
+	note B_, 2
 	note __, 2
-	note D_, 7
-	note E_, 3
+	note A_, 2
+	note __, 2
+	note F#, 2
+	note __, 2
+	note G_, 12
+	note G_, 2
+	note A_, 2
+	note A#, 6
+	note A_, 2
+	note __, 2
+	note G_, 2
+	note A#, 2
+	note __, 2
+	note A_, 14
+	note __, 4
+	note D_, 1
+	note __, 3
+	note D_, 8
+	note E_, 4
 	loopchannel 0, Music_ViridianCity_branch_f4246
 ; f42a2
 
 Music_ViridianCity_branch_f42a2: ; f42a2
 	octave 5
-	note A_, 1
-	note __, 1
-	note G_, 1
-	note __, 1
-	note F#, 1
-	note __, 5
-	note __, 1
-	note F#, 1
-	note G_, 1
-	note A_, 1
-	note __, 1
-	note A_, 1
-	note G_, 1
-	note F#, 1
-	note G_, 1
-	note E_, 1
+	note A_, 2
+	note __, 2
+	note G_, 2
+	note __, 2
+	note F#, 2
+	note __, 6
+	note __, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note __, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note G_, 2
+	note E_, 2
 	octave 4
+	note B_, 2
+	note __, 4
+	note B_, 2
+	note __, 2
+	octave 5
+	note G_, 2
+	note __, 2
+	note D_, 2
+	note __, 2
+	octave 4
 	note B_, 1
-	note __, 3
-	note B_, 1
 	note __, 1
+	note B_, 4
 	octave 5
-	note G_, 1
-	note __, 1
-	note D_, 1
-	note __, 1
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note __, 2
+	note F#, 2
+	note __, 2
+	note E_, 2
+	note __, 6
+	note __, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note __, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note D_, 2
 	octave 4
-	note B_, 0
-	note __, 0
-	note B_, 3
+	note A_, 2
+	note __, 4
+	note A_, 2
+	note __, 2
 	octave 5
-	note E_, 1
-	note F#, 1
-	note G_, 1
-	note __, 1
-	note F#, 1
-	note __, 1
-	note E_, 1
-	note __, 5
-	note __, 1
-	note E_, 1
-	note F#, 1
-	note G_, 1
-	note __, 1
-	note G_, 1
-	note F#, 1
-	note E_, 1
-	note F#, 1
 	note D_, 1
-	octave 4
-	note A_, 1
-	note __, 3
-	note A_, 1
 	note __, 1
-	octave 5
-	note D_, 0
-	note __, 0
-	note __, 3
-	note D_, 7
+	note __, 4
+	note D_, 8
 	endchannel
 
 Music_ViridianCity_Ch4: ; f42df
@@ -726,75 +726,75 @@
 ; f431d
 
 Music_ViridianCity_branch_f431d: ; f431d
-	note E_, 1
-	note E_, 1
-	note D_, 1
-	note E_, 3
-	note D_, 1
-	note E_, 1
-	note F#, 1
-	note E_, 1
-	note E_, 1
-	note D_, 3
-	note E_, 1
-	note D_, 1
-	note E_, 1
-	note F#, 1
+	note E_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 4
+	note D_, 2
+	note E_, 2
+	note F#, 2
+	note E_, 2
+	note E_, 2
+	note D_, 4
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F#, 2
 	endchannel
 ; f432c
 
 Music_ViridianCity_branch_f432c: ; f432c
-	note E_, 1
-	note E_, 1
-	note D_, 1
-	note E_, 3
-	note D_, 1
-	note E_, 1
-	note F#, 1
-	note E_, 1
-	note E_, 1
-	note F#, 3
-	note D_, 1
-	note D_, 1
-	note A#, 1
-	note A#, 1
+	note E_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 4
+	note D_, 2
+	note E_, 2
+	note F#, 2
+	note E_, 2
+	note E_, 2
+	note F#, 4
+	note D_, 2
+	note D_, 2
+	note A#, 2
+	note A#, 2
 	endchannel
 ; f433b
 
 Music_ViridianCity_branch_f433b: ; f433b
-	note D#, 1
-	note F#, 1
-	note D_, 1
-	note D#, 1
-	note D#, 1
-	note F#, 1
-	note D_, 3
-	note D#, 1
-	note F#, 1
-	note D_, 1
-	note D#, 1
-	note D#, 1
-	note F#, 1
-	note D_, 1
-	note D#, 1
+	note D#, 2
+	note F#, 2
+	note D_, 2
+	note D#, 2
+	note D#, 2
+	note F#, 2
+	note D_, 4
+	note D#, 2
+	note F#, 2
+	note D_, 2
+	note D#, 2
+	note D#, 2
+	note F#, 2
+	note D_, 2
+	note D#, 2
 	endchannel
 ; f434b
 
 Music_ViridianCity_branch_f434b: ; f434b
-	note D#, 1
-	note F#, 1
-	note D_, 1
-	note D#, 1
-	note D#, 1
-	note F#, 1
-	note D_, 3
-	note D#, 1
-	note F#, 1
-	note D_, 1
-	note D#, 1
-	note D#, 1
-	note D_, 1
-	note D_, 1
-	note F#, 1
+	note D#, 2
+	note F#, 2
+	note D_, 2
+	note D#, 2
+	note D#, 2
+	note F#, 2
+	note D_, 4
+	note D#, 2
+	note F#, 2
+	note D_, 2
+	note D#, 2
+	note D#, 2
+	note D_, 2
+	note D_, 2
+	note F#, 2
 	endchannel
 ; f435b
--- a/audio/music/wildpokemonvictory.asm
+++ b/audio/music/wildpokemonvictory.asm
@@ -12,12 +12,12 @@
 	tone $0001
 	notetype $c, $b1
 	octave 3
-	note B_, 0
-	note A_, 0
-	note G#, 0
-	note F#, 0
+	note B_, 1
+	note A_, 1
+	note G#, 1
+	note F#, 1
 	intensity $b6
-	note E_, 11
+	note E_, 12
 
 Music_SuccessfulCapture_branch_f4536: ; f4536
 	stereopanning $f
@@ -24,25 +24,25 @@
 
 Music_WildPokemonVictory_branch_f4538: ; f4538
 	callchannel Music_WildPokemonVictory_branch_f455c
-	note F#, 1
-	note F#, 1
-	note F#, 3
+	note F#, 2
+	note F#, 2
+	note F#, 4
 	callchannel Music_WildPokemonVictory_branch_f455c
-	note G#, 3
+	note G#, 4
 	intensity $78
 	octave 3
-	note G_, 3
+	note G_, 4
 	forceoctave $1
 	callchannel Music_WildPokemonVictory_branch_f455c
-	note F#, 1
-	note F#, 1
-	note F#, 3
+	note F#, 2
+	note F#, 2
+	note F#, 4
 	callchannel Music_WildPokemonVictory_branch_f455c
-	note G#, 3
+	note G#, 4
 	forceoctave $0
 	intensity $78
 	octave 3
-	note F#, 3
+	note F#, 4
 	loopchannel 0, Music_WildPokemonVictory_branch_f4538
 ; f455c
 
@@ -49,27 +49,27 @@
 Music_WildPokemonVictory_branch_f455c: ; f455c
 	intensity $71
 	octave 3
-	note G#, 0
-	note B_, 0
+	note G#, 1
+	note B_, 1
 	octave 4
-	note E_, 1
+	note E_, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
-	note E_, 1
+	note E_, 2
 	octave 3
-	note G#, 0
-	note F#, 0
-	note E_, 0
-	note F#, 0
 	note G#, 1
+	note F#, 1
 	note E_, 1
-	note A_, 0
-	octave 4
-	note C#, 0
-	note E_, 1
-	note E_, 1
+	note F#, 1
+	note G#, 2
+	note E_, 2
 	note A_, 1
+	octave 4
+	note C#, 1
+	note E_, 2
+	note E_, 2
+	note A_, 2
 	endchannel
 
 Music_WildPokemonVictory_Ch2: ; f4575
@@ -77,12 +77,12 @@
 	dutycycle $2
 	notetype $c, $d1
 	octave 4
-	note E_, 0
-	note F#, 0
-	note G#, 0
-	note A_, 0
+	note E_, 1
+	note F#, 1
+	note G#, 1
+	note A_, 1
 	intensity $d6
-	note B_, 11
+	note B_, 12
 
 Music_SuccessfulCapture_branch_f4585: ; f4585
 	stereopanning $f0
@@ -90,34 +90,34 @@
 Music_WildPokemonVictory_branch_f4587: ; f4587
 	callchannel Music_WildPokemonVictory_branch_f45b5
 	octave 4
-	note B_, 1
-	note B_, 1
-	note B_, 3
+	note B_, 2
+	note B_, 2
+	note B_, 4
 	callchannel Music_WildPokemonVictory_branch_f45b5
 	octave 4
-	note B_, 3
+	note B_, 4
 	intensity $81
-	note C_, 0
-	note E_, 0
-	note G_, 0
-	note A#, 0
+	note C_, 1
+	note E_, 1
+	note G_, 1
+	note A#, 1
 	forceoctave $1
 	callchannel Music_WildPokemonVictory_branch_f45b5
 	octave 4
-	note B_, 1
-	note B_, 1
-	note B_, 3
+	note B_, 2
+	note B_, 2
+	note B_, 4
 	callchannel Music_WildPokemonVictory_branch_f45b5
 	octave 4
-	note B_, 3
+	note B_, 4
 	forceoctave $0
 	intensity $81
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note D#, 0
-	note F#, 0
-	note A_, 0
+	note D#, 1
+	note F#, 1
+	note A_, 1
 	loopchannel 0, Music_WildPokemonVictory_branch_f4587
 ; f45b5
 
@@ -124,56 +124,56 @@
 Music_WildPokemonVictory_branch_f45b5: ; f45b5
 	intensity $81
 	octave 4
-	note B_, 1
-	note A_, 1
-	note G#, 1
-	note A_, 1
-	note B_, 1
-	note B_, 1
-	note B_, 3
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note B_, 2
+	note B_, 2
+	note B_, 4
 	octave 5
-	note C#, 1
-	note C#, 1
-	note C#, 3
+	note C#, 2
+	note C#, 2
+	note C#, 4
 	endchannel
 
 Music_WildPokemonVictory_Ch3: ; f45c4
 	notetype $c, $20
-	note __, 5
+	note __, 6
 	octave 6
-	note D#, 0
-	note __, 0
-	note E_, 0
-	note __, 2
-	note E_, 0
-	note __, 2
+	note D#, 1
+	note __, 1
+	note E_, 1
+	note __, 3
+	note E_, 1
+	note __, 3
 
 Music_SuccessfulCapture_branch_f45cf: ; f45cf
 
 Music_WildPokemonVictory_branch_f45cf: ; f45cf
 	callchannel Music_WildPokemonVictory_branch_f45f4
-	note D#, 1
-	note C#, 1
+	note D#, 2
+	note C#, 2
 	octave 2
-	note B_, 1
-	note __, 1
+	note B_, 2
+	note __, 2
 	callchannel Music_WildPokemonVictory_branch_f45f4
-	note E_, 1
-	note __, 1
-	note C_, 3
+	note E_, 2
+	note __, 2
+	note C_, 4
 	forceoctave $1
 	callchannel Music_WildPokemonVictory_branch_f45f4
-	note D#, 1
-	note C#, 1
+	note D#, 2
+	note C#, 2
 	octave 2
-	note B_, 1
-	note __, 1
+	note B_, 2
+	note __, 2
 	callchannel Music_WildPokemonVictory_branch_f45f4
-	note E_, 1
-	note __, 1
+	note E_, 2
+	note __, 2
 	forceoctave $0
 	octave 2
-	note B_, 3
+	note B_, 4
 	loopchannel 0, Music_WildPokemonVictory_branch_f45cf
 ; f45f4
 
@@ -180,15 +180,15 @@
 Music_WildPokemonVictory_branch_f45f4: ; f45f4
 	intensity $25
 	octave 3
-	note E_, 1
-	note __, 3
-	note E_, 1
-	note __, 1
-	note D_, 1
-	note __, 1
-	note D_, 1
-	note C#, 1
-	note __, 3
-	note C#, 1
+	note E_, 2
+	note __, 4
+	note E_, 2
+	note __, 2
+	note D_, 2
+	note __, 2
+	note D_, 2
+	note C#, 2
+	note __, 4
+	note C#, 2
 	endchannel
 ; f4602
--- a/macros.asm
+++ b/macros.asm
@@ -71,7 +71,7 @@
 
 
 note: MACRO
-	db \1 << 4 + \2
+	db \1 << 4 + (\2 - 1)
 	ENDM
 
 ; pitch