diff --git a/README.md b/README.md index d8872536..370d0cab 100644 --- a/README.md +++ b/README.md @@ -107,6 +107,7 @@ Improved Areas - Viridian Gym now has a minor new area once you make Giovanni leave. - Various Move Tutors from FireRed and LeafGreen have been distributed around the region, instead giving their respective TMs. - The S.S. Anne now returns after getting the Marsh Badge and features trades for Galarian forms & Evolutions, as well as Paldean Tauros. +- The healer from the S.S. Anne is now featured in the rightmost room on 1F. - A few existing areas have unique palettes to make them stand out: - The Game Corner has a new palette, meant to reflect the bright, exciting colours that casinos and pachinko parlours tend to have. - The Seafoam Islands have a cyan-coloured palette to make it seem more like an ice cave. Lorelei's room also has it. @@ -120,6 +121,7 @@ QoL Enhancements - To accomodate this, Celadon Gym's trainers use their more neutral text from Crystal. - All 151 original Pokemon, plus an additional 100, can be obtained without the use of trading or glitches, including Mew! - Bag capacity is increased from 20 to 30 items. +- Pokemon Box capacity is now 280 Pokemon with 14 boxes. - New Pokedex entries for most Pokemon are available, sourced from the original 1996 Pokedex book by Creatures Inc., restoring a ton of old Kanto lore. Thanks to [Dr. Lava and Nob Ogasawara](http://lavacutcontent.com/1996-creatures-pokedex-translation-1/) for their incredible work translating and writing about it! - Pikachu and Eevee are now starters, featuring fully functional Rival lineups. If you pick Pikachu, he picks Eevee, and if you pick Eevee, he picks Pikachu! Their growth rates have been changed to Medium Slow to give them the early-game power spike the other starters have. - Item Descriptions are available! @@ -213,6 +215,9 @@ Known Bugs - GiveMonName doesn't work properly for the Vermilion Beauty after receiving the Pokemon, jank ensues. - Text scrolls immediately when receiving the Pokemon from the Vermilion Beauty. - HP DV does not appear to display correctly. +- Vermilion City sign near Diglett's Cave doesn't show correctly (prolly just an event thing) +- Vermilion Beauty gives wrong Pokemon when cats are chosen +- Cancelling teaching with a TM and choosing another crashes the game Evolution Methods for new Pokemon ==== @@ -331,7 +336,9 @@ Credits * Paulluxx - Showdown Mod assistance * DuoM2 - Showdown Mod assistance * Albatross - Many of the new sprites used in the hack (A significant number of post-Gen 1 evolutions, all regional variants, Meltan and Carapthor lines, etc.) +* BlueZangoose / Vimescarrot - Pokemon box expansion, general assistance. * Frrf - Assisting with the development of the Pikachu / Eevee Mode, debugging +* LuciShrimp - Mewtwo & Galarian Bird custom battle music * dannye33 - Assisting with crysaudio implementation * erosunica - Assistance with developing Celadon University & Citrine City, plus sources for various subjects. * Chatot4444 - Assisting with gym scaling code diff --git a/audio.asm b/audio.asm index 8572daaf..c3fcef18 100644 --- a/audio.asm +++ b/audio.asm @@ -377,6 +377,7 @@ INCLUDE "crysaudio/music/RBY/digda01.asm" INCLUDE "crysaudio/music/RBY/field06.asm" INCLUDE "crysaudio/music/RBY/victory4.asm" INCLUDE "crysaudio/music/RBY/kinchou01.asm" +INCLUDE "crysaudio/music/RBY/mewtwo01.asm" SECTION "TCG Songs 1", ROMX diff --git a/audio/play_battle_music.asm b/audio/play_battle_music.asm index ab37b5c3..80613b28 100644 --- a/audio/play_battle_music.asm +++ b/audio/play_battle_music.asm @@ -16,6 +16,8 @@ PlayBattleMusic:: ld a, [wCurOpponent] 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 @@ -46,5 +48,7 @@ PlayBattleMusic:: jr .playSong .wildBattle ld a, MUSIC_WILD_BATTLE +.mewtwoBattle + ld a, MUSIC_MEWTWO01 .playSong jp PlayMusic diff --git a/constants/music_constants.asm b/constants/music_constants.asm index cc6c9aae..9f65aedb 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -61,6 +61,7 @@ const MUSIC_SAKAKI const MUSIC_VICTORY4 const MUSIC_KINCHOU01 + const MUSIC_MEWTWO01 const NUM_SONGS diff --git a/crysaudio/music/RBY/mewtwo01.asm b/crysaudio/music/RBY/mewtwo01.asm new file mode 100644 index 00000000..adebc557 --- /dev/null +++ b/crysaudio/music/RBY/mewtwo01.asm @@ -0,0 +1,2271 @@ +Music_Mewtwo01: + channel_count 4 + channel 1, Music_Mewtwo01_Ch1 + channel 2, Music_Mewtwo01_Ch2 + channel 3, Music_Mewtwo01_Ch3 + channel 4, Music_Mewtwo01_Ch4 + +Music_Mewtwo01_Ch1: + tempo 256 + volume 7, 7 + note_type 6, 15, 8 + duty_cycle 2 + octave 2 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note A#, 1 + note A_, 1 + note G#, 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 + note_type 3, 15, 8 + volume_envelope 14, 8 + note F#, 1 + note F_, 1 + volume_envelope 13, 8 + note E_, 1 + note D#, 1 + volume_envelope 12, 8 + note G_, 1 + note F#, 1 + volume_envelope 11, 8 + note F_, 1 + note E_, 1 + volume_envelope 10, 8 + note F#, 1 + note F_, 1 + volume_envelope 9, 8 + note E_, 1 + note D#, 1 + volume_envelope 8, 8 + note G_, 1 + note F#, 1 + volume_envelope 7, 8 + note F_, 1 + note E_, 1 + volume_envelope 6, 8 + note F#, 1 + note F_, 1 + volume_envelope 5, 8 + note E_, 1 + note D#, 1 + volume_envelope 7, 8 + note G_, 1 + note F#, 1 + volume_envelope 9, 8 + note F_, 1 + note E_, 1 + volume_envelope 11, 8 + note F#, 1 + note F_, 1 + volume_envelope 13, 8 + note E_, 1 + note D#, 1 + volume_envelope 15, 8 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note_type 12, 15, 8 + octave 1 + note E_, 1 + note D_, 1 + note E_, 1 + note D_, 1 + note E_, 1 + note D_, 1 + note E_, 1 + note D_, 1 + note E_, 1 + note D_, 1 + note E_, 1 + note D_, 1 + note E_, 1 + note D_, 1 + note E_, 1 + note D_, 1 + note E_, 1 + note D_, 1 + note E_, 1 + note D_, 1 + note E_, 1 + note D_, 1 + note E_, 1 + note D_, 1 + note E_, 1 + note D_, 1 + note E_, 1 + note D_, 1 + note E_, 1 + note D_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note D_, 1 + note E_, 1 + note D_, 1 + note E_, 1 + note D_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note D_, 1 + note E_, 1 + note D_, 1 + note E_, 1 + note D_, 1 + note E_, 1 + note D_, 1 + note E_, 1 + note D_, 1 + octave 2 + note_type 3, 15, 8 + note D_, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + note D_, 1 + note_type 12, 15, 8 + note E_, 1 + octave 2 + note E_, 1 + octave 3 + note E_, 1 + octave 2 + note E_, 1 + octave 3 + note E_, 1 + octave 2 + note E_, 1 + octave 3 + note_type 3, 15, 8 + note D_, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note A_, 1 + note B_, 1 + octave 4 + note C_, 1 + note D_, 1 + note_type 12, 15, 8 + note E_, 1 + octave 3 + note E_, 1 + octave 4 + note E_, 1 + octave 3 + note E_, 1 + octave 8 +.mainLoop: + duty_cycle 0 + octave 1 + note A_, 1 + note_type 6, 15, 8 + note A_, 1 + note_type 12, 15, 8 + note A_, 1 + note_type 6, 15, 8 + note A_, 1 + note A_, 1 + note_type 12, 15, 8 + note A_, 1 + note_type 6, 15, 8 + note A_, 1 + note_type 12, 15, 8 + octave 2 + note E_, 1 + octave 1 + note_type 6, 15, 8 + note B_, 1 + note_type 12, 15, 8 + note A_, 1 + note_type 6, 15, 8 + rest 1 + note_type 12, 15, 8 + note A_, 1 + note_type 6, 15, 8 + note A_, 1 + note_type 12, 15, 8 + note A_, 1 + note_type 6, 15, 8 + note A_, 1 + note A_, 1 + note_type 12, 15, 8 + note A_, 1 + note_type 6, 15, 8 + note A_, 1 + note_type 12, 15, 8 + octave 2 + note E_, 1 + note_type 6, 15, 8 + note A_, 1 + note G_, 1 + note F_, 1 + note E_, 1 + note_type 12, 15, 8 + note F_, 1 + note_type 6, 15, 8 + note F_, 1 + note_type 12, 15, 8 + note F_, 1 + note_type 6, 15, 8 + note F_, 1 + note F_, 1 + note_type 12, 15, 8 + note F_, 1 + note_type 6, 15, 8 + octave 1 + note F_, 1 + note F_, 1 + note F_, 1 + octave 2 + note C_, 1 + note_type 12, 15, 8 + note C_, 1 + note_type 6, 15, 8 + note C_, 1 + note_type 12, 15, 8 + note F_, 1 + note_type 6, 15, 8 + note F_, 1 + note_type 12, 15, 8 + note F_, 1 + note_type 6, 15, 8 + note F_, 1 + note F_, 1 + note_type 12, 15, 8 + note F_, 1 + octave 1 + note_type 6, 15, 8 + note F_, 1 + note F_, 1 + octave 2 + note C_, 1 + note F_, 1 + note E_, 1 + note D_, 1 + note C_, 1 + note_type 12, 15, 8 + octave 1 + note A#, 1 + note_type 6, 15, 8 + note A#, 1 + note_type 12, 15, 8 + note A#, 1 + note_type 6, 15, 8 + note A#, 1 + note A#, 1 + note_type 12, 15, 8 + note A#, 1 + note_type 6, 15, 8 + note A#, 1 + note A_, 1 + note A#, 1 + octave 2 + note D_, 1 + note_type 12, 15, 8 + note C_, 1 + note_type 6, 15, 8 + octave 1 + note G_, 1 + note_type 12, 15, 8 + note A#, 1 + note_type 6, 15, 8 + note A#, 1 + note_type 12, 15, 8 + note A#, 1 + note_type 6, 15, 8 + note A#, 1 + note A#, 1 + note_type 12, 15, 8 + note A#, 1 + note_type 6, 15, 8 + note A#, 1 + note A_, 1 + note A#, 1 + octave 2 + note D_, 1 + note C_, 1 + octave 1 + note A#, 1 + note G_, 1 + note_type 12, 15, 8 + note A_, 1 + note_type 6, 15, 8 + note A_, 1 + note_type 12, 15, 8 + note A_, 1 + note_type 6, 15, 8 + note A_, 1 + note A_, 1 + note_type 12, 15, 8 + note A_, 1 + note_type 6, 15, 8 + note A_, 1 + note_type 12, 15, 8 + octave 2 + note E_, 1 + note_type 6, 15, 8 + octave 1 + note A_, 1 + note_type 12, 15, 8 + note E_, 1 + note_type 6, 15, 8 + note G_, 1 + note_type 12, 15, 8 + note A_, 1 + note_type 6, 15, 8 + note A_, 1 + note_type 12, 15, 8 + note A_, 1 + note_type 6, 15, 8 + note A_, 1 + note A_, 1 + note_type 12, 15, 8 + note A_, 1 + note_type 6, 15, 8 + note A_, 1 + note_type 12, 15, 8 + octave 2 + note E_, 1 + octave 1 + note_type 6, 15, 8 + note A_, 1 + note_type 12, 15, 8 + note E_, 1 + note_type 6, 15, 8 + note G_, 1 + note_type 12, 15, 8 + note F_, 1 + note_type 6, 15, 8 + note F_, 1 + note_type 12, 15, 8 + note F_, 1 + note_type 6, 15, 8 + note F_, 1 + note F_, 1 + note_type 12, 15, 8 + note F_, 1 + note_type 6, 15, 8 + note F_, 1 + note F_, 1 + note F_, 1 + octave 2 + note C_, 1 + note_type 12, 15, 8 + note C_, 1 + note_type 6, 15, 8 + note C_, 1 + note_type 12, 15, 8 + octave 1 + note F_, 1 + note_type 6, 15, 8 + note F_, 1 + note_type 12, 15, 8 + note F_, 1 + note_type 6, 15, 8 + note F_, 1 + note F_, 1 + note_type 12, 15, 8 + note F_, 1 + octave 2 + note_type 6, 15, 8 + note C_, 1 + octave 1 + note A_, 1 + octave 2 + note C_, 1 + note F_, 1 + note E_, 1 + note D_, 1 + note C_, 1 + note_type 12, 15, 8 + octave 1 + note A#, 1 + note_type 6, 15, 8 + note A#, 1 + note_type 12, 15, 8 + note A#, 1 + note_type 6, 15, 8 + note A#, 1 + note A#, 1 + note_type 12, 15, 8 + note A#, 1 + note_type 6, 15, 8 + note A#, 1 + note A#, 1 + note A#, 1 + octave 2 + note F_, 1 + octave 1 + note_type 12, 15, 8 + note A#, 1 + note_type 6, 15, 8 + note A_, 1 + note_type 12, 15, 8 + note A#, 1 + note_type 6, 15, 8 + note A#, 1 + note_type 12, 15, 8 + note A#, 1 + note_type 6, 15, 8 + note A#, 1 + note A#, 1 + note_type 12, 15, 8 + note A#, 1 + note_type 6, 15, 8 + note A#, 1 + note A#, 1 + note A#, 1 + octave 2 + note D_, 1 + note C_, 1 + octave 1 + note A#, 1 + note G_, 1 + note_type 12, 15, 8 + note A_, 1 + note_type 6, 15, 8 + note A_, 1 + note_type 12, 15, 8 + note A_, 1 + note_type 6, 15, 8 + note A_, 1 + note A_, 1 + note_type 12, 15, 8 + note A_, 1 + note_type 6, 15, 8 + note A_, 1 + note_type 12, 15, 8 + octave 2 + note E_, 1 + note_type 6, 15, 8 + octave 1 + note A_, 1 + note_type 12, 15, 8 + note G_, 1 + note_type 6, 15, 8 + note E_, 1 + note_type 12, 15, 8 + note A_, 1 + note_type 6, 15, 8 + note A_, 1 + note_type 12, 15, 8 + note A_, 1 + note_type 6, 15, 8 + note A_, 1 + note A_, 1 + note_type 12, 15, 8 + note A_, 1 + note_type 6, 15, 8 + note A_, 1 + note_type 12, 15, 8 + octave 2 + note E_, 1 + octave 1 + note_type 6, 15, 8 + note A_, 1 + note_type 12, 15, 8 + note G_, 1 + note_type 6, 15, 8 + note E_, 1 + note_type 12, 15, 8 + note A_, 1 + note_type 6, 15, 8 + note A_, 1 + note_type 12, 15, 8 + note A_, 1 + note_type 6, 15, 8 + note A_, 1 + note A_, 1 + note_type 12, 15, 8 + note A_, 1 + note_type 6, 15, 8 + note A_, 1 + note_type 12, 15, 8 + octave 2 + note E_, 1 + note_type 6, 15, 8 + octave 1 + note A_, 1 + note_type 12, 15, 8 + note G_, 1 + note_type 6, 15, 8 + note F_, 1 + note_type 12, 15, 8 + note A_, 1 + note_type 6, 15, 8 + note A_, 1 + note_type 12, 15, 8 + note A_, 1 + note_type 6, 15, 8 + note A_, 1 + note_type 12, 15, 8 + note A_, 1 + note_type 6, 15, 8 + note A#, 1 + note A#, 1 + note_type 12, 15, 8 + note A#, 1 + note_type 6, 15, 8 + note A#, 1 + note_type 12, 15, 8 + note A#, 1 + note_type 6, 15, 8 + note A#, 1 + note_type 12, 15, 8 + duty_cycle 1 + volume_envelope 12, 8 + note E_, 1 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + note G_, 1 + note E_, 1 + note G_, 1 + note A#, 1 + note G#, 1 + note F_, 1 + note A#, 1 + note G#, 1 + note F_, 1 + note A#, 1 + note G#, 1 + note F_, 1 + note A#, 1 + note G#, 1 + note F_, 1 + note A#, 1 + note G#, 1 + note F_, 1 + note A#, 1 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + note F_, 1 + octave 2 + note C_, 1 + octave 1 + note A#, 1 + note F_, 1 + octave 2 + note C_, 1 + octave 1 + note A#, 1 + note F_, 1 + octave 2 + note C_, 1 + octave 1 + note A#, 1 + note F_, 1 + octave 2 + note C_, 1 + octave 1 + note A#, 1 + note F_, 1 + octave 2 + note C_, 1 + octave 1 + note A#, 1 + note F_, 1 + octave 2 + note D#, 1 + note C_, 1 + octave 1 + note A#, 1 + octave 2 + note D#, 1 + note C_, 1 + octave 1 + note A#, 1 + octave 2 + note D#, 1 + note C_, 1 + octave 1 + note A#, 1 + octave 2 + note D#, 1 + note C_, 1 + octave 1 + note A#, 1 + octave 2 + note D#, 1 + note C_, 1 + octave 1 + note A#, 1 + note G_, 1 + note F_, 1 + octave 2 + note C_, 1 + octave 1 + note A#, 1 + note F_, 1 + octave 2 + note C_, 1 + octave 1 + note A#, 1 + note F_, 1 + octave 2 + note C_, 1 + octave 1 + note A#, 1 + note F_, 1 + octave 2 + note C_, 1 + octave 1 + note A#, 1 + note F_, 1 + octave 2 + note C_, 1 + octave 1 + note A#, 1 + note F_, 1 + octave 2 + note D#, 1 + note C_, 1 + octave 1 + note A#, 1 + octave 2 + note D#, 1 + note C_, 1 + octave 1 + note A#, 1 + octave 2 + note D#, 1 + note C_, 1 + octave 1 + note A#, 1 + octave 2 + note D#, 1 + note C_, 1 + octave 1 + note A#, 1 + octave 2 + note D#, 1 + note C_, 1 + octave 1 + note A#, 1 + note G_, 1 + note F_, 1 + octave 2 + note C_, 1 + octave 1 + note A#, 1 + note F_, 1 + octave 2 + note C_, 1 + octave 1 + note A#, 1 + note F_, 1 + octave 2 + note C_, 1 + octave 1 + note A#, 1 + note F_, 1 + octave 2 + note C_, 1 + octave 1 + note A#, 1 + note F_, 1 + note A_, 1 + note A#, 1 + 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 + 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_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 D_, 1 + note F_, 1 + 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_type 12, 15, 8 + note D#, 1 + note_type 6, 15, 8 + 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, 15, 8 + note D_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + 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 + note_type 12, 15, 8 + note D_, 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 + 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 + note_type 12, 15, 8 + octave 8 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + sound_loop 0, .mainLoop + +Music_Mewtwo01_Ch2: + note_type 3, 15, 8 + duty_cycle 3 + octave 3 + volume_envelope 15, 7 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + octave 4 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note A_, 1 + octave 4 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + octave 4 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + octave 4 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 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_type 4, 15, 8 + rest 1 + volume_envelope 15, 7 + octave 3 + vibrato 0, 1, 1 + note A#, 1 + rest 1 + note A#, 1 + rest 1 + note F_, 1 + rest 1 + note C_, 1 + rest 1 + octave 2 + note A#, 1 + octave 3 + rest 1 + note D_, 1 + rest 1 + note B_, 1 + rest 1 + note A_, 1 + rest 1 + octave 4 + note D#, 1 + rest 1 + note A#, 1 + rest 1 + note_type 12, 15, 8 + volume_envelope 15, 7 + note B_, 1 + volume_envelope 12, 7 + note B_, 1 + volume_envelope 10, 7 + note B_, 1 + volume_envelope 9, 7 + note B_, 1 + note_type 6, 15, 8 + octave 2 + volume_envelope 15, 7 + note E_, 1 + octave 3 + note E_, 1 + note_type 12, 15, 8 + octave 4 + volume_envelope 15, 7 + note E_, 11 + octave 3 + note B_, 1 + note B_, 4 + octave 4 + note E_, 1 + octave 3 + note B_, 1 + note A#, 5 + octave 4 + note E_, 1 + rest 1 + volume_envelope 8, 7 + note E_, 1 + rest 1 + volume_envelope 3, 7 + note E_, 1 + rest 1 + volume_envelope 15, 7 + note_type 6, 15, 7 + note E_, 1 + octave 5 + note E_, 1 + note_type 6, 3, 7 + volume_envelope 15, 7 + octave 4 + note E_, 1 + note_type 1, 3, 7 + rest 3 + note_type 3, 3, 7 + rest 1 + note_type 6, 3, 7 + volume_envelope 4, 7 + note E_, 1 + note_type 6, 3, 7 + volume_envelope 4, 7 + octave 5 + note E_, 1 + note_type 6, 3, 7 + volume_envelope 4, 7 + octave 4 + note E_, 1 + rest 1 + volume_envelope 15, 7 + octave 3 + note B_, 1 + octave 4 + note B_, 1 + octave 3 + note A#, 1 + rest 1 + volume_envelope 4, 7 + note B_, 1 + octave 4 + note B_, 1 + octave 3 + note A#, 1 + rest 1 + note_type 12, 15, 7 + rest 1 + note_type 6, 15, 7 + note B_, 1 + octave 4 + note E_, 1 + note B_, 1 + rest 2 + note_type 3, 15, 7 + volume_envelope 3, 7 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 1 + note B_, 1 + note A#, 1 + volume_envelope 5, 7 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + volume_envelope 8, 7 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + volume_envelope 10, 7 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + volume_envelope 9, 7 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + volume_envelope 8, 7 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + volume_envelope 7, 7 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + volume_envelope 6, 7 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + volume_envelope 5, 7 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + volume_envelope 4, 7 + note B_, 1 + note A#, 1 + volume_envelope 3, 7 + note B_, 1 + note A#, 1 + note B_, 1 + note_type 12, 15, 7 + octave 8 +.mainLoop: + octave 3 + vibrato 0, 2, 2 + note B_, 10 + note A_, 2 + octave 4 + note_type 8, 15, 7 + note D_, 2 + note C_, 2 + octave 3 + note B_, 2 + note_type 12, 15, 7 + octave 4 + note D_, 4 + note_type 4, 15, 7 + note G_, 4 + note F_, 4 + note E_, 4 + note_type 6, 15, 7 + note D_, 1 + note E_, 1 + octave 3 + note_type 15, 15, 7 + note A_, 7 + note_type 1, 15, 7 + rest 3 + note_type 12, 15, 7 + rest 2 + note_type 8, 15, 7 + note A#, 2 + note A_, 2 + note A#, 2 + note_type 12, 15, 7 + octave 4 + note D_, 3 + note C_, 3 + octave 3 + note A#, 2 + note A_, 6 + note_type 8, 15, 7 + note A_, 1 + note_type 4, 15, 7 + note G_, 1 + note_type 6, 15, 7 + note A_, 1 + note_type 15, 15, 7 + note E_, 8 + note_type 1, 15, 7 + rest 6 + note_type 12, 15, 7 + rest 2 + note_type 8, 15, 7 + note E_, 2 + note F_, 2 + note G_, 2 + note A_, 2 + note B_, 2 + octave 4 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + note G_, 2 + note_type 12, 15, 7 + note A_, 5 + note A_, 1 + octave 4 + note C_, 1 + note G_, 3 + note_type 6, 15, 7 + note F_, 1 + note E_, 1 + note D_, 1 + note C_, 1 + note E_, 1 + note D_, 1 + note C_, 1 + octave 3 + note A#, 1 + octave 4 + note D_, 1 + note C_, 1 + octave 3 + note A#, 1 + note G_, 1 + note_type 13, 15, 7 + note A_, 7 + note_type 1, 15, 7 + rest 5 + note_type 12, 15, 7 + note B_, 3 + octave 4 + note F#, 5 + note C#, 7 + rest 1 + note D#, 4 + note_type 6, 15, 7 + 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 + note D_, 1 + volume_envelope 2, 7 + note D_, 1 + rest 16 + rest 13 + octave 4 + volume_envelope 11, 7 + note G_, 3 + vibrato 0, 2, 3 + duty_cycle 3 + note D_, 7 + note G_, 2 + note D_, 2 + note G_, 2 + note G#, 8 + rest 8 + note G_, 3 + note D_, 7 + note G_, 2 + note D_, 2 + note G_, 2 + note F_, 8 + rest 8 + 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 D#, 8 + octave 5 + note_type 6, 11, 7 + note C_, 8 + note D_, 8 + note_type 12, 11, 7 + note C_, 8 + note_type 6, 11, 7 + rest 1 + octave 3 + 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 + note C_, 1 + octave 4 + 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 + 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 + note F_, 1 + note D_, 1 + note F_, 1 + note D_, 1 + note F_, 1 + note A_, 1 + note D_, 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_, 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 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 A_, 1 + 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 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 A_, 1 + octave 4 + note D_, 1 + note D_, 1 + note A_, 1 + note A_, 1 + octave 5 + note D#, 1 + note D#, 1 + note D#, 1 + note D_, 1 + note C_, 1 + note C_, 1 + octave 4 + note A#, 1 + note A#, 1 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + octave 8 + sound_loop 0, .mainLoop + +Music_Mewtwo01_Ch3: + note_type 12, 1, 0 + octave 1 + note B_, 1 + octave 2 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note_type 6, 1, 0 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note_type 8, 1, 0 + octave 4 + note E_, 1 + note E_, 1 + note E_, 1 + octave 3 + note E_, 1 + note E_, 1 + note E_, 1 + octave 2 + note E_, 1 + note E_, 1 + note E_, 1 + octave 3 + note E_, 1 + note E_, 1 + note E_, 1 + octave 4 + note E_, 1 + note D_, 1 + note E_, 1 + octave 3 + note E_, 1 + note D_, 1 + note E_, 1 + octave 2 + note E_, 1 + note D_, 1 + note E_, 1 + octave 3 + note E_, 1 + note D_, 1 + note E_, 1 + octave 4 + note E_, 1 + note E_, 1 + note E_, 1 + octave 3 + note E_, 1 + note E_, 1 + note E_, 1 + octave 2 + note E_, 1 + note E_, 1 + note E_, 1 + octave 3 + note E_, 1 + note E_, 1 + note E_, 1 + octave 4 + note E_, 1 + note D_, 1 + note E_, 1 + octave 3 + note E_, 1 + note D_, 1 + note E_, 1 + octave 2 + note E_, 1 + note D_, 1 + note E_, 1 + octave 3 + note E_, 1 + note D_, 1 + note E_, 1 + octave 4 + note E_, 1 + note E_, 1 + note E_, 1 + octave 3 + note E_, 1 + note E_, 1 + note E_, 1 + octave 2 + note E_, 1 + note E_, 1 + note E_, 1 + octave 3 + note E_, 1 + note E_, 1 + note E_, 1 + octave 4 + note E_, 1 + note D_, 1 + note E_, 1 + octave 3 + note E_, 1 + note D_, 1 + note E_, 1 + octave 2 + note E_, 1 + note D_, 1 + note E_, 1 + note_type 3, 1, 0 + octave 3 + note D_, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note A_, 1 + note B_, 1 + octave 4 + note C_, 1 + note D_, 1 + note_type 8, 1, 0 + note E_, 1 + note E_, 1 + octave 3 + note E_, 1 + octave 4 + note E_, 1 + note E_, 1 + octave 3 + note E_, 1 + octave 4 + note E_, 1 + note E_, 1 + octave 3 + note E_, 1 + octave 4 + note_type 3, 1, 0 + note D_, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note A_, 1 + note B_, 1 + octave 5 + note C_, 1 + note D_, 1 + note_type 8, 1, 0 + note E_, 1 + note E_, 1 + octave 4 + note E_, 1 + octave 5 + note E_, 1 + note E_, 1 + octave 4 + note E_, 1 + octave 5 + note E_, 1 + note E_, 1 + octave 4 + note E_, 1 + octave 5 + note E_, 1 + note E_, 1 + octave 4 + note E_, 1 + note_type 12, 1, 0 + octave 8 +.mainLoop: + note_type 12, 1, 0 + vibrato 0, 2, 2 + octave 3 + volume_envelope 1, 1 + note A_, 5 + note_type 12, 3, 0 + octave 2 + volume_envelope 1, 1 + note A_, 5 + octave 3 + rest 6 + note F_, 5 + octave 4 + note F_, 5 + octave 3 + rest 6 + note A#, 5 + octave 2 + note A#, 5 + rest 6 + octave 3 + note A_, 2 + note A_, 1 + note A_, 2 + octave 4 + note A_, 5 + octave 3 + rest 6 + note F_, 5 + octave 2 + note F_, 5 + octave 3 + rest 6 + note A#, 2 + note A#, 1 + note A#, 2 + octave 4 + note A#, 1 + note A#, 4 + octave 3 + rest 6 + note_type 6, 1, 0 + volume_envelope 3, 4 + note E_, 12 + note_type 5, 1, 0 + volume_envelope 3, 4 + note G#, 12 + note_type 4, 3, 7 + volume_envelope 3, 4 + note B_, 9 + note_type 12, 3, 7 + volume_envelope 3, 4 + note B_, 2 + octave 4 + note_type 7, 1, 0 + volume_envelope 3, 4 + note E_, 12 + note_type 1, 1, 0 + rest 5 + note_type 7, 1, 0 + rest 1 + note_type 4, 1, 0 + volume_envelope 3, 4 + note G#, 3 + note G#, 1 + note G#, 8 + note_type 2, 3, 4 + note D#, 12 + note_type 6, 1, 0 + volume_envelope 3, 4 + note D#, 1 + octave 3 + note A#, 1 + note D#, 1 + rest 1 + note_type 12, 3, 4 + octave 4 + note E_, 1 + note A_, 1 + note G_, 1 + note E_, 1 + note_type 12, 1, 0 + volume_envelope 3, 4 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + note G_, 3 + note D_, 7 + note G_, 2 + note D_, 2 + note G_, 2 + note G#, 2 + note F_, 1 + note A#, 1 + note G#, 1 + note F_, 1 + note A#, 1 + note G#, 1 + note F_, 1 + note A#, 1 + note G#, 1 + note F_, 1 + note A#, 1 + note G#, 1 + note F_, 1 + note A#, 1 + note G_, 1 + note G_, 1 + note G_, 1 + note D_, 1 + note D_, 1 + note D_, 1 + note D_, 1 + note D_, 1 + note D_, 1 + note D_, 1 + note G_, 1 + note G_, 1 + note D_, 1 + note D_, 1 + note G_, 1 + note G_, 1 + note F_, 1 + octave 5 + note C_, 1 + octave 4 + note A#, 1 + note F_, 1 + octave 5 + note C_, 1 + octave 4 + note A#, 1 + note F_, 1 + octave 5 + note C_, 1 + octave 4 + note A#, 1 + note F_, 1 + octave 5 + note C_, 1 + octave 4 + note A#, 1 + note F_, 1 + octave 5 + note C_, 1 + octave 4 + note A#, 1 + note F_, 1 + note D#, 8 + note A#, 4 + note D#, 4 + note F_, 1 + octave 5 + note C_, 1 + octave 4 + note A#, 1 + note F_, 1 + octave 5 + note C_, 1 + octave 4 + note A#, 1 + note F_, 1 + octave 5 + note C_, 1 + octave 4 + note A#, 1 + note F_, 1 + octave 5 + note C_, 1 + octave 4 + note A#, 1 + note F_, 1 + octave 5 + note C_, 1 + octave 4 + note A#, 1 + note F_, 1 + note D#, 8 + octave 5 + note C_, 4 + note D_, 4 + note C_, 1 + octave 4 + note A#, 1 + note F_, 1 + octave 5 + note C_, 1 + octave 4 + note A#, 1 + note F_, 1 + octave 5 + note C_, 1 + octave 4 + note A#, 1 + note F_, 1 + octave 5 + note C_, 1 + octave 4 + 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_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 + 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 + 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 + 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 D_, 2 + note D#, 2 + note_type 9, 3, 4 + volume_envelope 1, 2 + note D_, 2 + 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 C_, 2 + note D_, 2 + note_type 12, 3, 4 + volume_envelope 1, 2 + note D#, 2 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + octave 8 + rest 16 + rest 16 + rest 16 + rest 6 + sound_loop 0, .mainLoop + +Music_Mewtwo01_Ch4: + toggle_noise 0 + drum_speed 12 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + octave 8 +.mainLoop: + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + sound_loop 0, .mainLoop diff --git a/crysaudio/music_pointers_red.asm b/crysaudio/music_pointers_red.asm index efe37247..4eb06c89 100644 --- a/crysaudio/music_pointers_red.asm +++ b/crysaudio/music_pointers_red.asm @@ -55,3 +55,4 @@ Music: dba Music_Sakaki dba Music_Victory4 dba Music_Kinchou01 + dba Music_Mewtwo01 diff --git a/data/maps/objects/SSAnne1F.asm b/data/maps/objects/SSAnne1F.asm index 61184a1b..72821c47 100644 --- a/data/maps/objects/SSAnne1F.asm +++ b/data/maps/objects/SSAnne1F.asm @@ -4,9 +4,9 @@ SSAnne1F_Object: def_warp_events warp_event 26, 0, VERMILION_DOCK, 2 warp_event 27, 0, VERMILION_DOCK, 2 - warp_event 31, 8, SS_ANNE_1F_ROOMS, 1 + warp_event 19, 8, SS_ANNE_1F_ROOMS, 1 warp_event 23, 8, SS_ANNE_1F_ROOMS, 2 - warp_event 19, 8, SS_ANNE_1F_ROOMS, 3 + warp_event 31, 8, SS_ANNE_1F_ROOMS, 3 warp_event 15, 8, SS_ANNE_1F_ROOMS, 4 warp_event 11, 8, SS_ANNE_1F_ROOMS, 5 warp_event 7, 8, SS_ANNE_1F_ROOMS, 6 diff --git a/data/maps/objects/SSAnne1FRooms.asm b/data/maps/objects/SSAnne1FRooms.asm index 9cdb3037..5b56f452 100644 --- a/data/maps/objects/SSAnne1FRooms.asm +++ b/data/maps/objects/SSAnne1FRooms.asm @@ -16,7 +16,7 @@ SSAnne1FRooms_Object: object_event 11, 4, SPRITE_GENTLEMAN, STAY, UP, 2, OPP_GENTLEMAN, 2 object_event 11, 14, SPRITE_YOUNGSTER, STAY, UP, 3, OPP_YOUNGSTER, 8 object_event 13, 11, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_LASS, 11 - object_event 22, 3, SPRITE_GIRL, WALK, UP_DOWN, 5 ; person + object_event 23, 12, SPRITE_GIRL, WALK, UP_DOWN, 5 ; person object_event 0, 14, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 6 ; person object_event 2, 11, SPRITE_LITTLE_GIRL, STAY, DOWN, 7 ; person object_event 3, 11, SPRITE_FAIRY, STAY, DOWN, 8 ; person @@ -25,5 +25,6 @@ SSAnne1FRooms_Object: object_event 21, 13, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, 11 ; person object_event 0, 4, SPRITE_GAMEBOY_KID, STAY, DOWN, 12 ; Perrserker Trader object_event 10, 4, SPRITE_GAMEBOY_KID, STAY, DOWN, 13 ; Weezing Trader + object_event 23, 3, SPRITE_NURSE, STAY, LEFT, 14 ; Healer def_warps_to SS_ANNE_1F_ROOMS diff --git a/engine/debug/debug_menu.asm b/engine/debug/debug_menu.asm index 520a89be..117da7f6 100644 --- a/engine/debug/debug_menu.asm +++ b/engine/debug/debug_menu.asm @@ -108,7 +108,7 @@ TestBattle: ld [hl], a ; Player's Pokemon. - ld a, NIDOREIGN + ld a, MEW ld [wcf91], a ld a, 100 ld [wCurEnemyLVL], a @@ -130,7 +130,7 @@ TestBattle: ld [hli], a ; Opponent's Pokemon. - ld a, SANDY_SHOCKS + ld a, MEWTWO ; Test new theme ld [wCurOpponent], a ld a, 100 ; Set the level you want here. ld [wCurEnemyLVL], a diff --git a/scripts/SSAnne1FRooms.asm b/scripts/SSAnne1FRooms.asm index 3f805575..bdc0dfeb 100644 --- a/scripts/SSAnne1FRooms.asm +++ b/scripts/SSAnne1FRooms.asm @@ -26,6 +26,7 @@ SSAnne1FRooms_TextPointers: dw SSAnne8Text11 dw PerrserkerTrade dw WeezingTrade + dw SSAnneNurse SSAnne8TrainerHeaders: def_trainers @@ -151,3 +152,18 @@ WeezingTrade: ld [wWhichTrade], a predef DoInGameTradeDialogue jp TextScriptEnd + +SSAnneNurse: + text_far _SilphCo9Text_5d8e5 + text_asm + predef HealParty + call GBFadeOutToWhite + call Delay3 + call GBFadeInFromWhite + ld hl, SSAnneNurseDone + call PrintText + jp TextScriptEnd + +SSAnneNurseDone: + text_far _SSAnneNurseDone + text_end \ No newline at end of file diff --git a/text/SSAnne1FRooms.asm b/text/SSAnne1FRooms.asm index da672f8d..94474220 100644 --- a/text/SSAnne1FRooms.asm +++ b/text/SSAnne1FRooms.asm @@ -103,3 +103,9 @@ _SSAnne8Text11:: para "I'm on the trail" line "of TEAM ROCKET!" done + +_SSAnneNurseDone:: + text "Thank you for" + line "choosing the" + cont "S.S. ANNE!" + done