Update audio macro names

change audio channel numbers from 0-7 back to 1-8
change all note macros back to single note macro
todo: fix comments with old macro names, update noise macros/instrument names

1 files changed, 840 insertions, 840 deletions

diff --git a/audio/music/gymleaderbattle.asm b/audio/music/gymleaderbattle.asm
index 6c1cffb5..cebda01b 100644
--- a/audio/music/gymleaderbattle.asm
+++ b/audio/music/gymleaderbattle.asm
@@ -1,1400 +1,1400 @@
-Music_GymLeaderBattle_Ch0::
+Music_GymLeaderBattle_Ch1::
 	tempo 104
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 8, 3, 4
-	toggleperfectpitch
-	notetype 12, 11, 3
+	toggle_perfect_pitch
+	note_type 12, 11, 3
 	rest 6
 	octave 3
-	F# 1
-	F_ 1
-	E_ 1
-	F_ 1
-	E_ 1
-	D# 1
-	E_ 1
-	D# 1
-	D_ 1
-	D# 1
-	D_ 1
-	C# 1
-	D_ 1
-	C# 1
-	C_ 1
-	C# 1
-	C_ 1
+	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
-	B_ 1
+	note B_, 1
 	octave 1
-	G# 1
-	A_ 1
-	A# 1
-	A_ 1
-	A# 1
-	B_ 1
-	A# 1
-	B_ 1
+	note G#, 1
+	note A_, 1
+	note A#, 1
+	note A_, 1
+	note A#, 1
+	note B_, 1
+	note A#, 1
+	note B_, 1
 	octave 2
-	F# 1
+	note F#, 1
 	rest 15
-	F# 1
+	note F#, 1
 	rest 9
-	G_ 6
-	F# 1
+	note G_, 6
+	note F#, 1
 	rest 15
-	F# 1
+	note F#, 1
 	rest 9
-	F_ 6
-	F# 1
+	note F_, 6
+	note F#, 1
 	rest 15
-	F# 1
+	note F#, 1
 	rest 9
-	G_ 6
-	F# 1
+	note G_, 6
+	note F#, 1
 	rest 15
-	F# 1
+	note F#, 1
 	rest 9
-	A_ 6
+	note A_, 6
 
 Music_GymLeaderBattle_branch_223b0::
-	F# 1
+	note F#, 1
 	octave 3
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
 	octave 2
-	E_ 1
-	A_ 1
+	note E_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
-	F# 1
+	note B_, 1
+	note A_, 1
+	note F#, 1
 	octave 3
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
 	octave 2
-	E_ 1
-	A_ 1
+	note E_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	rest 2
 	octave 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 2
-	D_ 4
+	note D_, 4
 	octave 1
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 2
-	E_ 4
+	note E_, 4
 	octave 1
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 2
-	D_ 4
+	note D_, 4
 	octave 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 2
-	C# 2
+	note C#, 2
 	octave 1
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 2
-	D_ 4
+	note D_, 4
 	octave 1
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 2
-	E_ 4
+	note E_, 4
 	octave 1
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 2
-	D_ 4
+	note D_, 4
 	octave 1
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 2
-	C# 2
+	note C#, 2
 	octave 1
-	B_ 2
-	A_ 2
+	note B_, 2
+	note A_, 2
 	octave 2
-	C# 2
+	note C#, 2
 	octave 1
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	rest 16
 	octave 1
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 1
-	A_ 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	notetype 12, 11, 5
+	note_type 12, 11, 5
 	octave 3
-	C# 12
-	notetype 12, 11, 3
+	note C#, 12
+	note_type 12, 11, 3
 	octave 1
-	A_ 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	notetype 12, 11, 5
+	note_type 12, 11, 5
 	octave 3
-	A_ 12
-	notetype 12, 11, 3
-	D# 4
-	C# 4
-	D# 4
-	E_ 2
-	F# 4
+	note A_, 12
+	note_type 12, 11, 3
+	note D#, 4
+	note C#, 4
+	note D#, 4
+	note E_, 2
+	note F#, 4
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	C# 2
-	F# 2
-	B_ 2
-	F# 2
-	D# 2
-	F# 2
+	note C#, 2
+	note F#, 2
+	note B_, 2
+	note F#, 2
+	note D#, 2
+	note F#, 2
 	octave 1
-	A_ 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	notetype 12, 11, 5
+	note_type 12, 11, 5
 	octave 3
-	A_ 12
-	notetype 12, 11, 3
-	C# 1
+	note A_, 12
+	note_type 12, 11, 3
+	note C#, 1
 	octave 2
-	B_ 1
+	note B_, 1
 	octave 3
-	C# 1
-	D# 1
-	E_ 1
-	D# 1
-	E_ 1
-	F# 1
-	A_ 1
-	G# 1
-	F# 1
-	E_ 1
-	F# 1
-	E_ 1
-	D# 1
-	C# 1
-	notetype 12, 11, 5
-	D# 4
-	E_ 4
-	C# 2
-	D# 6
-	F# 4
-	E_ 2
-	D# 4
-	C# 6
+	note C#, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note F#, 1
+	note A_, 1
+	note G#, 1
+	note F#, 1
+	note E_, 1
+	note F#, 1
+	note E_, 1
+	note D#, 1
+	note C#, 1
+	note_type 12, 11, 5
+	note D#, 4
+	note E_, 4
+	note C#, 2
+	note D#, 6
+	note F#, 4
+	note E_, 2
+	note D#, 4
+	note C#, 6
 	rest 16
 	rest 10
-	E_ 6
-	D# 4
-	E_ 4
-	C# 2
-	D# 6
-	E_ 4
-	D# 2
-	C# 4
+	note E_, 6
+	note D#, 4
+	note E_, 4
+	note C#, 2
+	note D#, 6
+	note E_, 4
+	note D#, 2
+	note C#, 4
 	octave 2
-	B_ 6
+	note B_, 6
 	octave 3
-	D# 4
-	E_ 4
-	C# 2
-	D# 6
-	F# 4
-	A_ 2
-	G# 4
-	E_ 6
-	loopchannel 0, Music_GymLeaderBattle_branch_223b0
+	note D#, 4
+	note E_, 4
+	note C#, 2
+	note D#, 6
+	note F#, 4
+	note A_, 2
+	note G#, 4
+	note E_, 6
+	sound_loop 0, Music_GymLeaderBattle_branch_223b0
 
 
-Music_GymLeaderBattle_Ch1::
-	duty 3
+Music_GymLeaderBattle_Ch2::
+	duty_cycle 3
 	vibrato 8, 2, 5
-	notetype 12, 12, 3
+	note_type 12, 12, 3
 	octave 4
-	F_ 1
-	E_ 1
-	D# 1
-	E_ 1
-	D# 1
-	D_ 1
-	D# 1
-	D_ 1
-	C# 1
-	D_ 1
-	C# 1
-	C_ 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
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 5
-	F# 1
-	F_ 1
-	E_ 1
-	F_ 1
-	E_ 1
-	D# 1
-	E_ 1
-	D# 1
-	D_ 1
-	D# 1
-	D_ 1
-	C# 1
-	D_ 1
-	C# 1
-	B_ 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	note B_, 1
 	rest 15
-	B_ 1
+	note B_, 1
 	rest 9
 	octave 4
-	C_ 6
+	note C_, 6
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 15
-	B_ 1
+	note B_, 1
 	rest 9
-	A# 6
+	note A#, 6
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 15
-	B_ 1
+	note B_, 1
 	rest 9
 	octave 4
-	C_ 6
+	note C_, 6
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 15
-	B_ 1
+	note B_, 1
 	rest 9
 	octave 4
-	C# 6
+	note C#, 6
 
 Music_GymLeaderBattle_branch_225e0::
-	notetype 12, 12, 5
-	D# 4
-	C# 4
-	D# 4
-	E_ 2
-	F# 4
-	E_ 4
-	D# 2
-	C# 2
+	note_type 12, 12, 5
+	note D#, 4
+	note C#, 4
+	note D#, 4
+	note E_, 2
+	note F#, 4
+	note E_, 4
+	note D#, 2
+	note C#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	C# 2
-	D# 2
-	notetype 12, 11, 7
-	duty 2
+	note C#, 2
+	note D#, 2
+	note_type 12, 11, 7
+	duty_cycle 2
 	octave 3
-	A_ 8
+	note A_, 8
 	octave 4
-	C# 8
-	E_ 8
-	C# 8
-	notetype 12, 12, 5
-	duty 3
-	D# 4
-	C# 4
-	D# 4
-	E_ 2
-	F# 4
-	E_ 4
-	D# 2
-	C# 2
+	note C#, 8
+	note E_, 8
+	note C#, 8
+	note_type 12, 12, 5
+	duty_cycle 3
+	note D#, 4
+	note C#, 4
+	note D#, 4
+	note E_, 2
+	note F#, 4
+	note E_, 4
+	note D#, 2
+	note C#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	C# 2
-	D# 2
-	notetype 12, 11, 7
-	duty 2
-	C# 8
+	note C#, 2
+	note D#, 2
+	note_type 12, 11, 7
+	duty_cycle 2
+	note C#, 8
 	octave 3
-	B_ 8
-	A_ 8
-	notetype 12, 12, 3
+	note B_, 8
+	note A_, 8
+	note_type 12, 12, 3
 	octave 4
-	E_ 4
-	E_ 2
-	C# 2
-	notetype 12, 12, 5
-	duty 3
+	note E_, 4
+	note E_, 2
+	note C#, 2
+	note_type 12, 12, 5
+	duty_cycle 3
 	octave 1
-	B_ 1
+	note B_, 1
 	rest 3
 	octave 3
-	D_ 1
-	C# 1
+	note D_, 1
+	note C#, 1
 	octave 2
-	B_ 1
+	note B_, 1
 	octave 3
-	D_ 1
+	note D_, 1
 	rest 4
-	E_ 1
-	D_ 1
+	note E_, 1
+	note D_, 1
 	octave 2
-	B_ 1
+	note B_, 1
 	octave 3
-	E_ 1
+	note E_, 1
 	rest 4
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
 	rest 2
-	E_ 1
-	C# 1
-	E_ 1
+	note E_, 1
+	note C#, 1
+	note E_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	D_ 1
-	C# 1
+	note D_, 1
+	note C#, 1
 	octave 2
-	B_ 1
+	note B_, 1
 	octave 3
-	D_ 1
+	note D_, 1
 	rest 4
-	E_ 1
-	D_ 1
+	note E_, 1
+	note D_, 1
 	octave 2
-	B_ 1
+	note B_, 1
 	octave 3
-	E_ 1
+	note E_, 1
 	rest 4
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
 	rest 1
-	C# 1
+	note C#, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	C# 1
+	note C#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 1
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	notetype 12, 11, 0
+	note_type 12, 11, 0
 	octave 3
-	B_ 4
+	note B_, 4
 	octave 4
-	C_ 4
+	note C_, 4
 	octave 3
-	A_ 4
-	B_ 4
+	note A_, 4
+	note B_, 4
 	octave 4
-	C_ 4
+	note C_, 4
 	octave 3
-	A_ 4
-	G_ 4
-	notetype 12, 11, 0
-	F# 8
-	notetype 12, 11, 7
-	F# 8
-	notetype 12, 12, 3
-	C_ 1
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
-	D# 1
-	D_ 1
-	C# 1
-	C_ 1
+	note A_, 4
+	note G_, 4
+	note_type 12, 11, 0
+	note F#, 8
+	note_type 12, 11, 7
+	note F#, 8
+	note_type 12, 12, 3
+	note C_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	G_ 1
-	F# 1
-	F_ 1
-	E_ 1
-	F_ 1
-	F# 1
-	G_ 1
-	A_ 1
-	B_ 1
-	notetype 12, 11, 0
+	note B_, 1
+	note A_, 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	note F#, 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
+	note_type 12, 11, 0
 	octave 3
-	B_ 4
+	note B_, 4
 	octave 4
-	C_ 4
+	note C_, 4
 	octave 3
-	A_ 4
-	B_ 4
+	note A_, 4
+	note B_, 4
 	octave 4
-	C_ 4
+	note C_, 4
 	octave 3
-	A_ 4
+	note A_, 4
 	octave 4
-	C_ 4
-	notetype 12, 11, 0
+	note C_, 4
+	note_type 12, 11, 0
 	octave 3
-	B_ 16
-	notetype 12, 3, 15
+	note B_, 16
+	note_type 12, 3, 15
 	octave 4
-	F# 16
-	notetype 12, 12, 3
-	duty 3
+	note F#, 16
+	note_type 12, 12, 3
+	duty_cycle 3
 	octave 1
-	A_ 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	notetype 12, 12, 7
+	note_type 12, 12, 7
 	octave 3
-	A_ 12
-	notetype 12, 12, 3
+	note A_, 12
+	note_type 12, 12, 3
 	octave 1
-	A_ 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	notetype 12, 12, 7
+	note_type 12, 12, 7
 	octave 4
-	C# 12
-	notetype 12, 11, 0
-	D# 16
-	notetype 12, 11, 7
-	D# 16
-	notetype 12, 12, 3
+	note C#, 12
+	note_type 12, 11, 0
+	note D#, 16
+	note_type 12, 11, 7
+	note D#, 16
+	note_type 12, 12, 3
 	octave 1
-	A_ 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	notetype 12, 12, 7
+	note_type 12, 12, 7
 	octave 4
-	C# 12
-	notetype 12, 12, 0
-	A_ 8
-	E_ 8
-	B_ 16
-	notetype 12, 12, 7
-	B_ 16
-	notetype 12, 12, 4
+	note C#, 12
+	note_type 12, 12, 0
+	note A_, 8
+	note E_, 8
+	note B_, 16
+	note_type 12, 12, 7
+	note B_, 16
+	note_type 12, 12, 4
 	octave 3
-	D# 4
-	E_ 4
-	C# 2
-	D# 6
-	F# 4
-	A_ 2
-	G# 4
+	note D#, 4
+	note E_, 4
+	note C#, 2
+	note D#, 6
+	note F#, 4
+	note A_, 2
+	note G#, 4
 	rest 2
-	B_ 1
+	note B_, 1
 	octave 4
-	D# 1
-	F# 1
-	A# 1
-	notetype 12, 12, 0
-	B_ 16
-	F# 16
-	A_ 16
+	note D#, 1
+	note F#, 1
+	note A#, 1
+	note_type 12, 12, 0
+	note B_, 16
+	note F#, 16
+	note A_, 16
 	octave 5
-	C# 8
+	note C#, 8
 	rest 2
-	notetype 12, 12, 3
+	note_type 12, 12, 3
 	octave 4
-	A_ 6
-	loopchannel 0, Music_GymLeaderBattle_branch_225e0
+	note A_, 6
+	sound_loop 0, Music_GymLeaderBattle_branch_225e0
 
 
-Music_GymLeaderBattle_Ch2::
+Music_GymLeaderBattle_Ch3::
 	vibrato 0, 2, 0
-	notetype 12, 1, 3
+	note_type 12, 1, 3
 	rest 12
 	octave 3
-	B_ 1
+	note B_, 1
 	octave 4
-	C_ 1
-	C# 1
-	C_ 1
-	C# 1
-	D_ 1
-	C# 1
-	D_ 1
-	D# 1
-	D_ 1
-	D# 1
-	E_ 1
-	D# 1
-	E_ 1
-	F_ 1
-	E_ 1
-	F_ 1
-	F# 1
-	F_ 1
-	F# 1
+	note C_, 1
+	note C#, 1
+	note C_, 1
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	note F#, 1
+	note F_, 1
+	note F#, 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	C_ 6
+	note C_, 6
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F_ 6
+	note F_, 6
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	C_ 6
+	note C_, 6
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	C# 6
-	notetype 12, 1, 4
+	note C#, 6
+	note_type 12, 1, 4
 
 Music_GymLeaderBattle_branch_227b1::
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	D_ 4
+	note D_, 4
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	E_ 4
+	note E_, 4
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	D_ 4
+	note D_, 4
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	C# 2
+	note C#, 2
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	D_ 4
+	note D_, 4
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	E_ 4
+	note E_, 4
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	D_ 4
+	note D_, 4
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	C# 2
+	note C#, 2
 	octave 3
-	B_ 2
-	A_ 2
+	note B_, 2
+	note A_, 2
 	octave 4
-	C# 2
+	note C#, 2
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 13
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 13
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 13
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 13
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 13
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 13
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 13
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 13
-	A_ 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 4
-	C# 12
+	note C#, 12
 	octave 3
-	A_ 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 4
-	E_ 12
-	D# 16
+	note E_, 12
+	note D#, 16
 	octave 3
-	B_ 16
-	A_ 1
+	note B_, 16
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 4
-	E_ 12
-	C# 8
-	E_ 8
+	note E_, 12
+	note C#, 8
+	note E_, 8
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	E_ 6
+	note E_, 6
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	G_ 6
+	note G_, 6
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	C_ 6
+	note C_, 6
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	G_ 6
-	loopchannel 0, Music_GymLeaderBattle_branch_227b1
+	note G_, 6
+	sound_loop 0, Music_GymLeaderBattle_branch_227b1