From 41e743949637e2eab5d7b8c0dd82756fa0cac1f0 Mon Sep 17 00:00:00 2001
From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com>
Date: Sun, 25 Jun 2023 20:09:52 +0100
Subject: [PATCH] Fix Mewtwo theme play issues

Mewtwo's theme wasn't playing properly because I am silly and forgot to add a `jr .playSong` so it doesn't fall through. Also, it needed to be before the wild check. Now it works as expected.

This also has the latest version of the Mewtwo theme by LuciShrimp, which is reaching a pretty amazing state.
---
 audio/play_battle_music.asm      |    5 +-
 crysaudio/music/RBY/mewtwo01.asm | 1415 ++++++++++++++++++------------
 2 files changed, 835 insertions(+), 585 deletions(-)

diff --git a/audio/play_battle_music.asm b/audio/play_battle_music.asm
index 2afb2352..9819eac8 100644
--- a/audio/play_battle_music.asm
+++ b/audio/play_battle_music.asm
@@ -14,10 +14,10 @@ PlayBattleMusic::
 	jr .playSong
 .notGymLeaderBattle
 	ld a, [wCurOpponent]
+	cp MEWTWO ; Needs to be before OPP_ID_OFFSET to skip the wild check.
+	jr z, .mewtwoBattle
 	cp OPP_ID_OFFSET
 	jr c, .wildBattle
-	cp MEWTWO
-	jr z, .mewtwoBattle
 	cp OPP_YUJIROU
 	jr z, .Elite4Battle
 	cp OPP_LORELEI ; elite four now play the gym leader battle theme
@@ -48,6 +48,7 @@ PlayBattleMusic::
 	jr .playSong
 .mewtwoBattle
 	ld a, MUSIC_MEWTWO01
+	jr .playSong
 .wildBattle
 	ld a, MUSIC_WILD_BATTLE
 .playSong
diff --git a/crysaudio/music/RBY/mewtwo01.asm b/crysaudio/music/RBY/mewtwo01.asm
index adebc557..caccba51 100644
--- a/crysaudio/music/RBY/mewtwo01.asm
+++ b/crysaudio/music/RBY/mewtwo01.asm
@@ -740,259 +740,196 @@ Music_Mewtwo01_Ch1:
 	duty_cycle 2
 	octave 2
 	note C_, 1
-	octave 3
-	note A_, 1
-	note D_, 1
-	note_type 12, 15, 8
-	volume_envelope 12, 8
-	note A_, 1
-	note A_, 1
-	note_type 12, 15, 8
-	volume_envelope 12, 8
-	note A_, 1
-	note_type 12, 15, 8
-	volume_envelope 12, 8
-	note G_, 1
-	octave 4
-	note_type 12, 15, 8
-	volume_envelope 12, 8
-	note C_, 1
-	note C_, 1
-	note_type 12, 15, 8
-	volume_envelope 12, 8
-	note C_, 1
-	octave 3
-	note A#, 1
-	note A_, 1
-	octave 4
-	note C_, 1
-	octave 3
-	note A#, 1
-	note A_, 1
-	note G_, 1
-	note A#, 1
-	note A_, 1
-	note D_, 1
-	note A_, 1
-	note A_, 1
-	note A_, 1
-	note G_, 1
-	octave 4
-	note C_, 1
-	note C_, 1
-	note C_, 1
-	note D#, 1
-	note D_, 1
-	note C_, 1
-	note D_, 1
-	note C_, 1
-	octave 3
-	note A#, 1
-	note G_, 1
-	note A_, 1
-	note D_, 1
-	note A_, 1
-	note A_, 1
-	note A_, 1
-	note G_, 1
-	octave 4
-	note C_, 1
-	note C_, 1
-	note C_, 1
-	octave 3
-	note A#, 1
-	note A_, 1
-	note G_, 1
-	note A#, 1
-	note A_, 1
-	note G_, 1
-	note D#, 1
-	note D_, 1
-	note D#, 1
-	note F_, 1
-	note G_, 1
-	note A_, 1
-	note G_, 1
-	note G_, 1
+	duty_cycle 3
 	note D_, 1
 	note_type 6, 12, 8
 	note D_, 1
 	note_type 12, 12, 8
-	note G_, 1
-	note G_, 1
-	note G_, 1
+	note D_, 1
+	note D_, 1
 	note_type 6, 12, 8
-	note G_, 1
-	note_type 12, 12, 8
-	note G_, 1
-	note D#, 1
-	note C_, 1
-	note D#, 1
-	note_type 6, 15, 8
 	note D_, 1
-	octave 2
-	note A#, 1
-	octave 3
-	note D_, 1
-	note A_, 1
 	rest 1
-	note F#, 1
-	note A_, 1
-	note A_, 1
+	note_type 12, 12, 8
 	note D_, 1
-	note F_, 1
-	note A_, 1
-	note F_, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
+	note_type 6, 12, 8
 	note D_, 1
-	note D#, 1
-	note F_, 1
-	note G_, 1
+	note D_, 1
+	octave 1
 	note A_, 1
-	note A#, 1
-	octave 4
+	octave 2
 	note C_, 1
 	note D_, 1
 	note_type 12, 15, 8
+	volume_envelope 12, 8
 	note D#, 1
-	note_type 6, 15, 8
-	note D_, 1
-	note C_, 1
+	note_type 6, 12, 8
 	note D#, 1
-	note D_, 1
-	note C_, 1
-	octave 3
+	note_type 12, 12, 8
+	note D#, 1
+	note D#, 1
+	note_type 6, 12, 8
+	note D#, 1
+	rest 1
+	note_type 12, 12, 8
+	note D#, 1
+	note_type 6, 12, 8
+	note D#, 1
+	note D#, 1
+	octave 1
 	note A#, 1
-	octave 4
-	note D#, 1
-	note_type 4, 15, 8
+	octave 2
 	note D_, 1
 	note D#, 1
+	note_type 12, 12, 8
+	note D_, 1
+	note_type 6, 12, 8
+	note D_, 1
+	note_type 12, 12, 8
+	note D_, 1
+	note D_, 1
+	note_type 6, 12, 8
+	note D_, 1
+	rest 1
+	note_type 12, 12, 8
+	note D_, 1
+	note_type 6, 12, 8
+	note D_, 1
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note C_, 1
+	note D_, 1
+	note_type 12, 12, 8
+	note D#, 1
+	note_type 6, 12, 8
+	note D#, 1
+	note_type 12, 12, 8
+	note D#, 1
+	note D#, 1
+	note_type 6, 12, 8
+	note D#, 1
+	rest 1
+	note_type 12, 12, 8
+	note D#, 1
+	note_type 6, 12, 8
+	note D#, 1
+	note D#, 1
+	octave 1
+	note A#, 1
+	octave 2
 	note D_, 1
 	note D#, 1
+	note_type 12, 12, 8
+	note D_, 1
+	note_type 6, 12, 8
+	note D_, 1
+	note_type 12, 12, 8
+	note D_, 1
+	note D_, 1
+	note_type 6, 12, 8
+	note D_, 1
+	rest 1
+	note_type 12, 12, 8
+	note D_, 1
+	note_type 6, 12, 8
+	note D_, 1
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note C_, 1
+	note D_, 1
+	note_type 12, 12, 8
+	note D#, 1
+	note_type 6, 12, 8
+	note D#, 1
+	note_type 12, 12, 8
+	note D#, 1
+	note D#, 1
+	note_type 6, 12, 8
+	note D#, 1
+	rest 1
+	note_type 12, 12, 8
+	note D#, 1
+	note_type 6, 12, 8
+	note D#, 1
+	note D#, 1
+	octave 1
+	note A#, 1
+	octave 2
+	note D_, 1
+	note D#, 1
+	note_type 12, 12, 8
+	note D_, 1
+	note_type 6, 12, 8
+	note D_, 1
+	note_type 12, 12, 8
+	note D_, 1
+	note D_, 1
+	note_type 6, 12, 8
+	note D_, 1
+	rest 1
+	note_type 12, 12, 8
+	note D_, 1
+	note_type 6, 12, 8
+	note D_, 1
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note C_, 1
+	note D_, 1
+	note_type 12, 12, 8
+	note D#, 1
+	note_type 6, 12, 8
+	note D#, 1
+	note_type 12, 12, 8
+	note D#, 1
+	note D#, 1
+	note_type 6, 12, 8
+	note D#, 1
+	rest 1
+	note_type 12, 12, 8
+	note D#, 1
+	note_type 6, 12, 8
+	note D#, 1
+	note D#, 1
+	octave 1
+	note A#, 1
+	octave 2
 	note D_, 1
 	note D#, 1
 	note_type 6, 15, 8
-	note D_, 1
-	note C_, 1
-	octave 3
-	note A#, 1
-	note A_, 1
-	octave 4
-	note D_, 1
-	octave 3
-	note A_, 1
-	note F_, 1
-	note D#, 1
-	note D_, 1
-	note C_, 1
-	note D#, 1
-	note D_, 1
-	note D#, 1
-	note G_, 1
-	octave 2
-	note A#, 1
-	octave 3
-	note G_, 1
-	note D#, 1
-	note G_, 1
-	octave 2
-	note A#, 1
-	octave 3
-	note G_, 1
-	note A#, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
-	note G_, 1
-	note F_, 1
-	note D#, 1
-	note G_, 1
-	note D_, 1
-	note C_, 1
+	volume_envelope 7, 8
+	rest 16
+	rest 7
 	note_type 12, 15, 8
-	note D_, 1
+	volume_envelope 7, 8
+	rest 1
 	note_type 6, 15, 8
-	note C_, 1
-	octave 2
-	note A_, 1
-	octave 3
-	note D_, 1
-	note C_, 1
-	note D_, 1
-	octave 2
-	note A_, 1
-	octave 3
-	note D_, 1
-	octave 2
-	note A_, 1
-	octave 3
-	note F_, 1
-	note G_, 1
-	note A_, 1
-	note A#, 1
-	octave 4
-	note C_, 1
-	octave 3
-	note A#, 1
-	note A_, 1
-	note A#, 1
-	octave 4
-	note D#, 1
-	note D_, 1
-	note C_, 1
-	octave 3
-	note A#, 1
-	note A#, 1
-	note A_, 1
-	note G_, 1
-	note A#, 1
-	note G_, 1
-	note G_, 1
-	note F_, 1
-	note D#, 1
-	note G_, 1
-	note A_, 1
-	note A#, 1
-	note A_, 1
-	note F_, 1
-	note G_, 1
-	note F_, 1
-	note D#, 1
-	note G_, 1
-	note A_, 1
-	octave 4
-	note D#, 1
-	note F_, 1
-	note D#, 1
-	note D_, 1
-	note C_, 1
-	note D#, 1
-	octave 3
-	note D#, 1
-	note A#, 1
-	note G_, 1
-	note A#, 1
-	octave 4
-	note D#, 1
-	note D_, 1
-	note C_, 1
-	note D#, 1
-	note D#, 1
-	note D_, 1
-	note C_, 1
-	octave 3
-	note A#, 1
+	volume_envelope 7, 8
+	rest 7
 	note_type 4, 15, 8
-	note A#, 1
-	octave 4
-	note C_, 1
-	note D_, 1
-	note D#, 1
-	note F_, 1
-	note G_, 1
+	volume_envelope 7, 8
+	rest 6
+	note_type 6, 15, 8
+	volume_envelope 7, 8
+	rest 16
+	rest 14
+	note_type 12, 15, 8
+	volume_envelope 7, 8
+	rest 1
+	note_type 6, 15, 8
+	volume_envelope 7, 8
+	rest 16
+	rest 16
+	rest 16
+	rest 8
+	note_type 4, 15, 8
+	volume_envelope 7, 8
+	rest 6
 	note_type 12, 15, 8
 	octave 8
 	rest 16
@@ -1105,8 +1042,7 @@ Music_Mewtwo01_Ch2:
 	volume_envelope 15, 7
 	note E_, 11
 	octave 3
-	note B_, 1
-	note B_, 4
+	note B_, 5
 	octave 4
 	note E_, 1
 	octave 3
@@ -1357,19 +1293,65 @@ Music_Mewtwo01_Ch2:
 	note A#, 4
 	note G#, 1
 	note F_, 1
-	octave 3
 	note G#, 1
 	note C_, 1
 	note_type 12, 15, 7
 	note D_, 1
-	volume_envelope 6, 7
+	rest 1
+	volume_envelope 8, 7
 	note D_, 1
+	rest 1
+	volume_envelope 4, 7
+	note D_, 1
+	note_type 6, 6, 7
+	volume_envelope 15, 7
+	rest 1
+	note_type 1, 6, 7
+	rest 6
+	volume_envelope 4, 7
+	note_type 12, 4, 7
 	volume_envelope 2, 7
 	note D_, 1
-	rest 16
-	rest 13
+	note_type 6, 4, 7
+	rest 10
+	note_type 12, 4, 7
+	rest 4
+	note_type 6, 15, 7
+	rest 4
+	note D_, 1
+	octave 5
+	note D_, 1
 	octave 4
-	volume_envelope 11, 7
+	note G_, 1
+	rest 1
+	volume_envelope 4, 7
+	note D_, 1
+	octave 5
+	note D_, 1
+	octave 4
+	note G_, 1
+	rest 1
+	volume_envelope 15, 7
+	octave 3
+	note G_, 1
+	note_type 6, 4, 7
+	volume_envelope 15, 7
+	octave 4
+	note G_, 1
+	note_type 6, 4, 7
+	volume_envelope 15, 7
+	note D_, 1
+	rest 1
+	volume_envelope 4, 7
+	octave 3
+	note G_, 1
+	octave 4
+	note G_, 1
+	note D_, 1
+	rest 1
+	note_type 12, 4, 7
+	rest 6
+	volume_envelope 12, 7
 	note G_, 3
 	vibrato 0, 2, 3
 	duty_cycle 3
@@ -1377,22 +1359,110 @@ Music_Mewtwo01_Ch2:
 	note G_, 2
 	note D_, 2
 	note G_, 2
-	note G#, 8
-	rest 8
+	note G#, 6
+	note_type 6, 12, 7
+	volume_envelope 15, 7
+	note G#, 1
+	octave 5
+	note G#, 1
+	octave 4
+	note F_, 1
+	note_type 12, 15, 7
+	rest 1
+	note_type 6, 15, 7
+	volume_envelope 4, 7
+	note G#, 1
+	octave 5
+	note G#, 1
+	octave 4
+	note F_, 1
+	note_type 6, 12, 7
+	note F_, 1
+	octave 5
+	note G#, 1
+	octave 4
+	note G_, 1
+	rest 2
+	volume_envelope 4, 7
+	note F_, 1
+	octave 5
+	note G#, 1
+	octave 4
+	note G_, 1
+	rest 4
+	note_type 12, 12, 7
 	note G_, 3
 	note D_, 7
 	note G_, 2
 	note D_, 2
 	note G_, 2
-	note F_, 8
-	rest 8
+	note F_, 6
+	note_type 6, 12, 7
+	volume_envelope 15, 7
+	note F_, 1
+	octave 5
+	note F_, 1
+	note C_, 1
+	rest 2
+	octave 4
+	volume_envelope 4, 7
+	note F_, 1
+	octave 5
+	note F_, 1
+	note C_, 1
+	octave 4
+	volume_envelope 14, 7
+	note C_, 1
+	octave 5
+	note C_, 1
+	octave 4
+	note F_, 1
+	rest 1
+	note_type 6, 12, 7
+	rest 1
+	volume_envelope 4, 7
+	note C_, 1
+	octave 5
+	note C_, 1
+	octave 4
+	note F_, 1
+	note_type 12, 12, 7
+	rest 2
 	note D#, 8
 	note_type 6, 11, 7
 	note A#, 8
 	note D#, 8
 	note_type 12, 11, 7
-	note F_, 8
-	rest 8
+	note F_, 6
+	note_type 6, 11, 7
+	volume_envelope 14, 7
+	note F_, 1
+	octave 5
+	note F_, 1
+	note C_, 1
+	rest 2
+	volume_envelope 4, 7
+	octave 4
+	note F_, 1
+	octave 5
+	note F_, 1
+	note C_, 1
+	volume_envelope 14, 7
+	octave 4
+	note C_, 1
+	octave 5
+	note C_, 1
+	octave 4
+	note F_, 1
+	rest 2
+	volume_envelope 4, 7
+	note C_, 1
+	octave 5
+	note C_, 1
+	octave 4
+	note F_, 1
+	note_type 12, 11, 7
+	rest 2
 	note D#, 8
 	octave 5
 	note_type 6, 11, 7
@@ -1401,259 +1471,131 @@ Music_Mewtwo01_Ch2:
 	note_type 12, 11, 7
 	note C_, 8
 	note_type 6, 11, 7
-	rest 1
-	octave 3
+	volume_envelope 14, 7
 	note C_, 1
-	note D_, 1
-	note D#, 1
-	note F_, 1
-	note G_, 1
-	note A_, 1
-	note A#, 1
 	octave 4
-	note C_, 1
-	note D_, 1
 	note F_, 1
-	note D#, 1
-	note D_, 1
-	note C_, 1
-	octave 3
 	note A#, 1
-	octave 4
-	note D_, 1
 	rest 1
-	note D_, 1
-	note C_, 1
-	note F_, 1
-	note D#, 1
-	note D_, 1
-	note C_, 1
-	note D#, 1
-	note D_, 1
-	note C_, 1
-	octave 3
-	note A#, 1
-	note A_, 1
-	octave 4
-	note C_, 1
-	octave 3
-	note G_, 1
-	note A#, 1
-	note G_, 1
-	note D#, 1
-	note F_, 1
-	note G_, 1
-	note A_, 1
-	note A#, 1
-	octave 4
-	note C_, 1
-	note D_, 1
-	note D#, 1
-	note F_, 1
-	note D#, 1
-	note D_, 1
-	note C_, 1
-	note D#, 1
-	note_type 8, 11, 7
-	note D#, 1
-	note_type 4, 11, 7
-	rest 1
-	note_type 6, 11, 7
-	note D#, 1
-	note D_, 1
-	note D#, 1
-	note C_, 1
-	note A_, 1
-	rest 1
-	note A_, 1
-	rest 1
-	note A_, 1
-	rest 1
-	note A_, 1
-	note C_, 1
-	note D_, 1
-	note D_, 1
-	note C_, 1
-	note G_, 1
-	note A_, 1
-	note A#, 1
-	note G_, 1
-	note D#, 1
-	note A#, 1
 	octave 5
-	note D_, 1
+	volume_envelope 4, 7
 	note C_, 1
 	octave 4
+	note F_, 1
 	note A#, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
-	note D#, 1
-	note C_, 1
-	note D_, 1
-	note D#, 1
-	octave 3
-	note A_, 1
-	note A#, 1
-	note G_, 1
-	note F_, 1
-	note D#, 1
-	note G_, 1
-	note F_, 1
-	note D#, 1
-	note D_, 1
-	note F_, 1
-	note D#, 1
-	note C_, 1
-	note F_, 1
 	rest 1
-	note C_, 1
-	note D_, 1
-	note D#, 1
+	volume_envelope 14, 7
 	note F_, 1
-	note G_, 1
-	note A_, 1
-	note A#, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
-	note D#, 1
-	note C_, 1
-	note D#, 1
-	note D_, 1
-	note C_, 1
-	note C_, 1
-	note D#, 1
-	note C_, 1
-	note D#, 1
-	note C_, 1
-	note D_, 1
-	octave 2
 	note A#, 1
 	octave 3
-	note D_, 1
-	octave 2
 	note A#, 1
-	octave 3
-	note D_, 1
-	octave 2
-	note A#, 1
-	octave 3
-	note D_, 1
-	octave 2
-	note A#, 1
-	octave 3
-	note D_, 1
-	octave 2
-	note A#, 1
-	octave 3
-	note D_, 1
+	rest 1
+	octave 4
+	volume_envelope 4, 7
 	note F_, 1
-	note D_, 1
-	note F_, 1
-	note D_, 1
-	note F_, 1
-	note A_, 1
-	note D_, 1
+	note A#, 1
+	octave 3
+	note A#, 1
+	rest 1
 	note_type 12, 11, 7
-	octave 2
-	note A#, 1
-	note_type 6, 11, 7
-	rest 1
-	octave 3
-	note G_, 1
-	note A#, 1
 	note A_, 1
-	note G_, 1
-	note F_, 1
-	note F_, 1
 	note D_, 1
-	octave 2
-	note A#, 1
-	note A#, 1
-	octave 3
-	note D#, 1
-	octave 2
-	note A#, 1
-	note_type 12, 11, 7
-	octave 3
-	note D#, 1
-	note D#, 1
 	note A_, 1
+	note A_, 2
+	note G_, 1
+	octave 4
+	note C_, 3
+	octave 3
+	note A#, 1
 	note A_, 1
 	octave 4
-	note D_, 1
-	note D_, 1
-	note A_, 1
+	note C_, 1
+	octave 3
+	note A#, 1
 	note A_, 1
 	note G_, 1
+	note A#, 1
+	note A_, 1
+	note D_, 1
+	note A_, 3
 	note G_, 1
+	octave 4
+	note C_, 3
+	note D#, 1
+	note D_, 1
+	note C_, 1
+	note D_, 1
+	note C_, 1
+	octave 3
+	note A#, 1
 	note G_, 1
+	note A_, 1
+	note D_, 1
+	note A_, 3
+	note G_, 1
+	octave 4
+	note C_, 3
+	octave 3
+	note A#, 1
+	note A_, 1
+	note G_, 1
+	note A#, 1
+	note A_, 1
+	note G_, 1
+	note D#, 1
+	note D_, 1
+	note D#, 1
 	note F_, 1
-	note D#, 1
-	note D#, 1
-	note D#, 1
-	rest 1
-	octave 3
-	note D_, 1
-	note D_, 1
-	note A_, 1
+	note G_, 1
 	note A_, 1
+	note G_, 2
+	note D_, 2
+	note G_, 4
+	note D#, 1
+	note C_, 1
+	note D#, 3
+	note A_, 2
 	octave 4
-	note D_, 1
-	note D_, 1
-	note A_, 1
-	note A_, 1
-	note A#, 1
-	note A#, 1
-	note A#, 1
-	note A_, 1
-	note G_, 1
-	note G_, 1
-	note G_, 1
-	rest 1
-	octave 3
-	note D#, 1
-	note D#, 1
-	note A_, 1
-	note A_, 1
-	octave 4
-	note D_, 1
-	note D_, 1
-	note A_, 1
-	note A_, 1
-	note G_, 1
-	note G_, 1
-	note G_, 1
+	note D_, 2
+	note A_, 2
+	note G_, 3
 	note F_, 1
-	note D#, 1
-	note D#, 1
-	note D#, 1
+	note D#, 3
 	rest 1
 	octave 3
-	note D_, 1
-	note D_, 1
-	note A_, 1
-	note A_, 1
+	note D_, 2
+	note A_, 2
 	octave 4
-	note D_, 1
-	note D_, 1
-	note A_, 1
+	note D_, 2
+	note A_, 2
+	note A#, 3
 	note A_, 1
+	note G_, 4
+	octave 3
+	note D#, 2
+	note A_, 2
+	octave 4
+	note D_, 2
+	note A_, 2
+	note G_, 3
+	note F_, 1
+	note D#, 4
+	octave 3
+	note D_, 2
+	note A_, 2
+	octave 4
+	note D_, 2
+	note A_, 2
 	octave 5
-	note D#, 1
-	note D#, 1
-	note D#, 1
+	note D#, 3
 	note D_, 1
-	note C_, 1
-	note C_, 1
+	note C_, 2
 	octave 4
-	note A#, 1
-	note A#, 1
-	rest 16
-	rest 16
-	rest 16
-	rest 16
+	note A#, 2
+	note A_, 16
+	note A_, 16
+	note A_, 16
+	note A_, 16
 	rest 16
 	rest 16
 	rest 16
@@ -2066,141 +2008,452 @@ Music_Mewtwo01_Ch3:
 	note C_, 1
 	octave 4
 	note A#, 1
-	note F_, 1
-	octave 5
+	note_type 6, 3, 4
+	octave 3
+	volume_envelope 3, 3
 	note C_, 1
-	octave 4
+	note C_, 1
+	note D_, 1
+	note D#, 1
+	note F_, 1
+	note G_, 1
+	note A_, 1
 	note A#, 1
-	note F_, 1
-	octave 5
-	note C_, 1
 	octave 4
-	note A#, 1
-	note F_, 1
-	octave 5
 	note C_, 1
-	note_type 9, 3, 4
-	volume_envelope 1, 2
-	octave 2
-	note D_, 2
+	note D_, 1
+	note F_, 1
+	note D#, 1
+	note D_, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note A_, 1
+	note_type 6, 1, 2
+	octave 4
+	volume_envelope 3, 3
+	note D_, 1
+	note C_, 1
 	note_type 6, 3, 4
-	volume_envelope 1, 2
-	note D_, 2
-	note_type 7, 3, 4
-	volume_envelope 1, 2
-	note D_, 2
-	note_type 1, 3, 4
-	rest 4
-	note_type 3, 3, 4
-	rest 2
-	note_type 9, 3, 4
-	volume_envelope 1, 2
-	note D_, 2
-	note_type 3, 3, 4
-	volume_envelope 1, 2
-	note D_, 2
-	octave 1
-	note A_, 2
-	octave 2
-	note C_, 2
-	note D_, 2
-	note_type 9, 3, 4
-	volume_envelope 1, 2
-	note D#, 2
+	volume_envelope 3, 3
+	note F_, 1
+	note D#, 1
+	note D_, 1
+	note C_, 1
+	note D#, 1
 	note_type 6, 3, 4
-	volume_envelope 1, 2
-	note D#, 2
-	note_type 7, 3, 4
-	volume_envelope 1, 2
-	note D#, 2
-	note_type 5, 3, 4
-	rest 2
-	note_type 9, 3, 4
-	volume_envelope 1, 2
-	note D#, 2
-	note_type 3, 3, 4
-	volume_envelope 1, 2
-	note D#, 2
-	octave 1
-	note A#, 2
-	octave 2
-	note D_, 2
-	note D#, 2
-	note_type 9, 3, 4
-	volume_envelope 1, 2
-	note D_, 2
+	volume_envelope 3, 3
+	note D_, 1
+	note C_, 1
+	note_type 6, 1, 2
+	octave 3
+	volume_envelope 3, 3
+	note A#, 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note A_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note G_, 1
+	note A#, 1
+	note G_, 1
+	note D#, 1
+	note F_, 1
+	note G_, 1
 	note_type 6, 3, 4
-	volume_envelope 1, 2
-	note D_, 2
-	note_type 8, 3, 4
-	volume_envelope 1, 2
-	note D_, 2
-	note_type 1, 3, 4
-	rest 2
-	note_type 3, 3, 4
-	rest 2
-	note_type 9, 3, 4
-	volume_envelope 1, 2
-	note D_, 2
-	note_type 3, 3, 4
-	volume_envelope 1, 2
-	note D_, 2
-	octave 1
-	note A#, 2
-	octave 2
-	note C#, 2
-	note D_, 2
-	note_type 9, 3, 4
-	volume_envelope 1, 2
-	note D#, 2
+	volume_envelope 3, 3
+	note A_, 1
+	note A#, 1
+	octave 4
+	note C_, 1
+	note D_, 1
+	note D#, 1
+	note F_, 1
+	note D#, 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note D_, 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note C_, 1
+	note D#, 1
+	note D#, 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note D#, 1
+	note D#, 1
+	note D_, 1
+	note D#, 1
+	note C_, 1
 	note_type 6, 3, 4
-	volume_envelope 1, 2
-	note D#, 2
-	note_type 7, 3, 4
-	volume_envelope 1, 2
-	note D#, 2
-	note_type 1, 3, 4
-	rest 4
+	volume_envelope 3, 3
+	note A_, 1
+	rest 1
+	note A_, 1
+	note_type 1, 1, 2
+	rest 2
+	note_type 4, 1, 2
+	rest 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note A_, 1
 	note_type 3, 3, 4
 	rest 2
-	note_type 9, 3, 4
 	volume_envelope 1, 2
-	note D#, 2
-	note_type 3, 3, 4
-	volume_envelope 1, 2
-	note D#, 2
-	octave 1
-	note A#, 2
-	octave 2
-	note D_, 2
-	note D#, 2
-	note_type 9, 3, 4
-	volume_envelope 1, 2
-	note D_, 2
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note A_, 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note C_, 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note D_, 1
+	note D_, 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note C_, 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note G_, 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note A_, 1
+	note A#, 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note G_, 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note D#, 1
 	note_type 6, 3, 4
-	volume_envelope 1, 2
-	note D_, 2
-	note_type 7, 3, 4
-	volume_envelope 1, 2
-	note D_, 2
-	note_type 5, 3, 4
-	rest 2
-	note_type 9, 3, 4
-	volume_envelope 1, 2
-	note D_, 2
-	note_type 3, 3, 4
-	volume_envelope 1, 2
-	note D_, 2
-	octave 1
-	note A_, 2
+	volume_envelope 3, 3
+	note A#, 1
+	octave 5
+	note D_, 1
+	note C_, 1
+	note_type 6, 1, 2
+	octave 4
+	volume_envelope 3, 3
+	note A_, 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note A_, 1
+	note_type 6, 3, 4
+	volume_envelope 3, 3
+	note G_, 1
+	note F_, 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note D#, 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note C_, 1
+	note D_, 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note D#, 1
+	octave 3
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note A_, 1
+	note A#, 1
+	note G_, 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note F_, 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note D#, 1
+	note_type 6, 3, 4
+	volume_envelope 3, 3
+	note G_, 1
+	note F_, 1
+	note D#, 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note D_, 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note F_, 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note D#, 1
+	note C_, 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note F_, 1
+	note G_, 1
+	note C_, 1
+	note D_, 1
+	note D#, 1
+	note F_, 1
+	note G_, 1
+	note A_, 1
+	note A#, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note D#, 1
+	note C_, 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note D#, 1
+	note D_, 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note C_, 1
+	note C_, 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note D#, 1
+	note C_, 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note D#, 1
+	note C_, 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note D_, 1
 	octave 2
-	note C_, 2
-	note D_, 2
-	note_type 12, 3, 4
-	volume_envelope 1, 2
-	note D#, 2
-	rest 16
-	rest 16
+	note A#, 1
+	octave 3
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note D_, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note D_, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note D_, 1
+	octave 2
+	note A#, 1
+	note_type 6, 1, 2
+	octave 3
+	volume_envelope 3, 3
+	note D_, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note D_, 1
+	note F_, 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note D_, 1
+	note F_, 1
+	note D_, 1
+	note F_, 1
+	note A_, 1
+	note D_, 1
+	octave 2
+	note A#, 1
+	note A#, 1
+	octave 3
+	note G_, 1
+	note G_, 1
+	note A#, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note F_, 1
+	note D_, 1
+	octave 2
+	note A#, 1
+	note A#, 1
+	octave 3
+	note D#, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note D_, 1
+	note A_, 1
+	rest 1
+	note F#, 1
+	note_type 12, 1, 2
+	volume_envelope 3, 3
+	note A_, 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note D_, 1
+	note F_, 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note A_, 1
+	note F_, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note D_, 1
+	note D#, 1
+	note F_, 1
+	note G_, 1
+	note A_, 1
+	note A#, 1
+	octave 4
+	note C_, 1
+	note D_, 1
+	note D#, 1
+	note D#, 1
+	note D_, 1
+	note C_, 1
+	note D#, 1
+	note D_, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note D#, 1
+	note_type 4, 1, 2
+	volume_envelope 3, 3
+	note D_, 1
+	note D#, 1
+	note D_, 1
+	note D#, 1
+	note D_, 1
+	note D#, 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note D_, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	note A_, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note A_, 1
+	note F_, 1
+	note D#, 1
+	note D_, 1
+	note C_, 1
+	note D#, 1
+	note D_, 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note D#, 1
+	note G_, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note G_, 1
+	note D#, 1
+	note G_, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note G_, 1
+	note A#, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note G_, 1
+	note F_, 1
+	note D#, 1
+	note G_, 1
+	note D_, 1
+	note C_, 1
+	note_type 12, 1, 2
+	volume_envelope 3, 3
+	note D_, 1
+	note_type 6, 1, 2
+	volume_envelope 3, 3
+	note C_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note D_, 1
+	note C_, 1
+	note D_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note F_, 1
+	note G_, 1
+	note A_, 1
+	note A#, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A#, 1
+	note A_, 1
+	note A#, 1
+	octave 4
+	note D#, 1
+	note D_, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	note A#, 1
+	note A_, 1
+	note G_, 1
+	note A#, 1
+	note G_, 1
+	note G_, 1
+	note F_, 1
+	note D#, 1
+	note G_, 1
+	note A_, 1
+	note A#, 1
+	note A_, 1
+	note F_, 1
+	note G_, 1
+	note F_, 1
+	note D#, 1
+	note G_, 1
+	note A_, 1
+	octave 4
+	note D#, 1
+	note F_, 1
+	note D#, 1
+	note D_, 1
+	note C_, 1
+	note D#, 1
+	octave 3
+	note D#, 1
+	note A#, 1
+	note G_, 1
+	note A#, 1
+	octave 4
+	note D#, 1
+	note D_, 1
+	note C_, 1
+	note D#, 1
+	note D#, 1
+	note D_, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	note_type 4, 1, 2
+	volume_envelope 3, 3
+	note A#, 1
+	octave 4
+	note C_, 1
+	note D_, 1
+	note D#, 1
+	note F_, 1
+	note G_, 1
+	note_type 12, 1, 2
 	rest 16
 	rest 16
 	rest 16
@@ -2214,10 +2467,6 @@ Music_Mewtwo01_Ch3:
 	rest 16
 	rest 16
 	octave 8
-	rest 16
-	rest 16
-	rest 16
-	rest 6
 	sound_loop 0, .mainLoop
 
 Music_Mewtwo01_Ch4: