From 08b976a08bbf056398e2c5891e25df6b6bc6d2b6 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Sun, 23 Jul 2023 21:06:28 +0100 Subject: [PATCH] FRLG Legendary Battle theme LuciShrimp strikes again! A demake of the Legendary Battle theme from FireRed/LeafGreen. This theme is set to change down the line, possibly taking elements from the Emerald theme Mew uses to differentiate itself more. Mainly committing as the infrastructure has been put in place. --- README.md | 6 +- audio.asm | 1 + audio/play_battle_music.asm | 23 +- constants/music_constants.asm | 1 + crysaudio/music/RBY/legendarybattle.asm | 1850 +++++++++++++++++++++++ crysaudio/music_pointers_red.asm | 1 + data/maps/objects/CitrineCity.asm | 4 +- data/maps/objects/VermilionCity.asm | 4 +- engine/debug/debug_menu.asm | 2 +- 9 files changed, 1882 insertions(+), 10 deletions(-) create mode 100644 crysaudio/music/RBY/legendarybattle.asm diff --git a/README.md b/README.md index 3d2734ad..11dcefd4 100644 --- a/README.md +++ b/README.md @@ -96,7 +96,9 @@ New Areas New Music ==== -- Mewtwo has its own theme song, being a demake of the iconic Stadium battle theme. Composed by LuciShrimp. +- Mewtwo has its own battle theme: A demake of the iconic Stadium track! It features some creative deviations to give it a distinct Game Boy feel while fitting with Mewtwo's mystique. Composed by LuciShrimp. +- Mew and the Kantonian Birds have their own battle theme, a demake of the FireRed/LeafGreen pitch-shifted remix. Not simply pitching it up, percussion elements have been added to give it that rustic FRLG "feel" that distinguishes it from the original games. Composed by LuciShrimp. +- Pokemon Yellow's various tracks have been backported, such as Jessie and James's encounter theme. - Several pieces of unused music, including Digda01, Victory4, Field6, Kincho01, and Giovanni's theme have been implemented. - A remix of the unused Koukan (trading) music is also used as a town theme. Composed by BGVC. @@ -357,7 +359,7 @@ If you use our implementations of anything at all, it is encouraged to submit Pu * 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, Instatext option, general assistance. -* LuciShrimp - Mewtwo & Galarian Bird custom battle music +* LuciShrimp - Mewtwo & FireRed/LeafGreen Legendary custom battle music * dannye33 - Assisting with crysaudio implementation * Frrf - Assisting with the development of the Pikachu / Eevee Mode + 5 Starters scenes in Oak's Lab, debugging * erosunica - Assistance with developing Celadon University & Citrine City, plus sources for various subjects. diff --git a/audio.asm b/audio.asm index 43c5b34f..e5cd0024 100644 --- a/audio.asm +++ b/audio.asm @@ -379,6 +379,7 @@ INCLUDE "crysaudio/music/RBY/field06.asm" INCLUDE "crysaudio/music/RBY/victory4.asm" INCLUDE "crysaudio/music/RBY/kinchou01.asm" INCLUDE "crysaudio/music/RBY/mewtwo01.asm" +INCLUDE "crysaudio/music/RBY/legendarybattle.asm" SECTION "TCG Songs 1", ROMX diff --git a/audio/play_battle_music.asm b/audio/play_battle_music.asm index 9819eac8..05bfa0ba 100644 --- a/audio/play_battle_music.asm +++ b/audio/play_battle_music.asm @@ -13,9 +13,25 @@ PlayBattleMusic:: ld a, MUSIC_GYM_LEADER_BATTLE jr .playSong .notGymLeaderBattle - ld a, [wCurOpponent] + ld a, [wCurOpponent] ; This can probably be made better with a list thing but uhhh idk how to do it. seethe. cp MEWTWO ; Needs to be before OPP_ID_OFFSET to skip the wild check. jr z, .mewtwoBattle + cp ARTICUNO + jr z, .legendaryBattle + cp ZAPDOS + jr z, .legendaryBattle + cp MOLTRES + jr z, .legendaryBattle + cp MEW + jr z, .legendaryBattle + cp OMEGA + jr z, .legendaryBattle + cp ARTICUNO_G ; Temporary - plans for galar bird themes have been made. + jr z, .legendaryBattle + cp ZAPDOS_G + jr z, .legendaryBattle + cp MOLTRES_G + jr z, .legendaryBattle cp OPP_ID_OFFSET jr c, .wildBattle cp OPP_YUJIROU @@ -35,8 +51,6 @@ PlayBattleMusic:: cp OPP_CHIEF jr z, .finalBattle jr nz, .normalTrainerBattle - ld a, MUSIC_FINAL_BATTLE - jr .playSong .Elite4Battle ld a, MUSIC_GYM_LEADER_BATTLE jr .playSong @@ -49,6 +63,9 @@ PlayBattleMusic:: .mewtwoBattle ld a, MUSIC_MEWTWO01 jr .playSong +.legendaryBattle + ld a, MUSIC_LEGENDARYBATTLE + jr .playSong .wildBattle ld a, MUSIC_WILD_BATTLE .playSong diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 231aea0f..cda43eac 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -63,6 +63,7 @@ const MUSIC_VICTORY4 const MUSIC_KINCHOU01 const MUSIC_MEWTWO01 + const MUSIC_LEGENDARYBATTLE const NUM_SONGS diff --git a/crysaudio/music/RBY/legendarybattle.asm b/crysaudio/music/RBY/legendarybattle.asm new file mode 100644 index 00000000..a6e2f935 --- /dev/null +++ b/crysaudio/music/RBY/legendarybattle.asm @@ -0,0 +1,1850 @@ +Music_UntitledSong: + channel_count 4 + channel 1, Music_UntitledSong_Ch1 + channel 2, Music_UntitledSong_Ch2 + channel 3, Music_UntitledSong_Ch3 + channel 4, Music_UntitledSong_Ch4 + +Music_UntitledSong_Ch1: + volume 7, 7 + octave 1 + duty_cycle 2 + note_type 6, 15, 8 + tempo 200 + volume_envelope 15, 7 + note E_, 1 + rest 1 + note E_, 1 + note D#, 1 + note F_, 1 + rest 1 + note F_, 1 + note D#, 1 + note F#, 1 + rest 1 + note F#, 1 + note D#, 1 + note G_, 1 + rest 1 + note G_, 1 + note D#, 1 + note G#, 1 + rest 1 + note G#, 1 + note D#, 1 + note A_, 1 + rest 1 + note A_, 1 + note D#, 1 + note A#, 1 + rest 1 + note A#, 1 + note D#, 1 + note_type 12, 15, 8 + volume_envelope 15, 7 + note B_, 1 + note A#, 1 + note D#, 1 + rest 2 + note_type 6, 15, 8 + volume_envelope 15, 7 + note D#, 1 + rest 1 + note_type 12, 15, 8 + rest 1 + note_type 6, 15, 8 + volume_envelope 15, 7 + note D#, 1 + rest 1 + note_type 12, 15, 8 + volume_envelope 15, 7 + octave 2 + note D#, 1 + octave 1 + note A#, 1 + note D#, 1 + rest 2 + note_type 3, 15, 7 + note A#, 1 + rest 1 + note A#, 1 + rest 1 + note_type 12, 15, 7 + note B_, 1 + octave 2 + note C#, 1 + octave 1 + note G#, 1 + note A#, 1 + note E_, 1 + rest 1 + note E_, 1 + octave 2 + note E_, 1 + volume_envelope 8, 7 + note E_, 1 + note E_, 1 + octave 1 + volume_envelope 15, 7 + note E_, 1 + note A#, 1 + note E_, 1 + note A#, 1 + octave 2 + note E_, 1 + note C#, 1 + note C#, 1 + note D#, 1 + octave 1 + note B_, 1 + octave 2 + note C#, 1 + octave 1 + note D#, 1 + rest 2 + note_type 6, 15, 7 + note D#, 1 + rest 1 + note_type 12, 15, 7 + rest 1 + note_type 6, 15, 7 + note D#, 1 + rest 1 + note_type 12, 15, 7 + octave 2 + note D#, 1 + octave 1 + note A#, 1 + note D#, 1 + rest 1 + note_type 6, 15, 7 + note D#, 1 + note F_, 1 + note_type 12, 15, 7 + note A#, 1 + note_type 6, 15, 7 + note A#, 1 + rest 1 + note_type 12, 15, 7 + note B_, 1 + note G#, 1 + note A#, 1 + note E_, 1 + note B_, 1 + note_type 6, 15, 7 + note D#, 1 + note E_, 1 + note G#, 1 + note B_, 1 + octave 2 + note_type 12, 15, 7 + note E_, 1 + note D#, 1 + note C#, 1 + note D#, 1 + octave 1 + note E_, 1 + note B_, 1 + octave 2 + note D#, 1 + note E_, 1 + octave 1 + note_type 6, 15, 7 + note E_, 1 + note G#, 1 + note B_, 1 + octave 2 + note C#, 1 + note_type 12, 15, 7 + note E_, 1 + note C#, 1 + octave 8 +.mainLoop: + octave 1 + note D#, 1 + rest 1 + note D_, 1 + note_type 6, 15, 7 + note D#, 1 + rest 1 + note_type 12, 15, 7 + rest 1 + octave 2 + note D#, 1 + note_type 6, 15, 7 + octave 1 + note G#, 1 + note G_, 1 + note F_, 1 + note E_, 1 + note_type 12, 15, 7 + note D#, 1 + note_type 6, 15, 7 + note D#, 1 + rest 1 + note_type 12, 15, 7 + rest 1 + note_type 6, 15, 7 + note D#, 1 + rest 1 + note_type 12, 15, 7 + note D#, 2 + note B_, 1 + note A#, 1 + note E_, 1 + rest 1 + note D#, 1 + note E_, 3 + note D#, 2 + note_type 6, 15, 7 + note E_, 1 + rest 1 + note_type 12, 15, 7 + note E_, 1 + rest 2 + octave 2 + note C#, 1 + note D#, 1 + octave 1 + note B_, 1 + octave 2 + note C#, 1 + octave 1 + note D#, 2 + note A#, 1 + note_type 9, 15, 7 + note D#, 2 + note_type 1, 15, 7 + rest 6 + note_type 6, 15, 7 + note D#, 2 + note A#, 2 + note_type 12, 15, 7 + note D#, 1 + note D#, 1 + note A#, 1 + rest 1 + note A#, 1 + rest 1 + note A#, 1 + note A_, 1 + note_type 6, 15, 7 + note A#, 1 + rest 1 + note_type 12, 15, 7 + note D#, 1 + note A#, 1 + rest 1 + note A#, 1 + rest 1 + note A#, 1 + note A_, 1 + note A#, 1 + note D#, 2 + octave 2 + note C#, 2 + octave 1 + note C#, 2 + note_type 9, 15, 7 + note G#, 2 + note_type 3, 15, 7 + note F#, 1 + note F_, 1 + note_type 12, 15, 7 + note E_, 2 + note D#, 1 + note_type 9, 15, 7 + note E_, 2 + note_type 1, 15, 7 + rest 6 + note_type 12, 15, 7 + note E_, 1 + note_type 3, 15, 7 + note B_, 1 + note_type 1, 15, 7 + rest 9 + note_type 12, 15, 7 + note C#, 1 + octave 2 + note E_, 1 + note_type 6, 15, 7 + octave 1 + note G#, 1 + note_type 1, 15, 7 + rest 6 + note_type 12, 15, 7 + note B_, 1 + octave 2 + note_type 6, 15, 7 + note E_, 1 + note_type 1, 15, 7 + rest 6 + octave 1 + note_type 6, 15, 7 + note E_, 1 + note G#, 1 + note A#, 1 + note B_, 1 + octave 2 + note_type 12, 15, 7 + note E_, 1 + note D_, 1 + octave 1 + note A#, 1 + note D#, 1 + note A#, 1 + note_type 6, 15, 7 + note D#, 1 + rest 1 + note_type 12, 15, 7 + note D#, 1 + note_type 6, 15, 7 + note A#, 1 + rest 1 + note_type 12, 15, 7 + note A#, 1 + note A_, 1 + note D#, 1 + note A#, 1 + note D#, 1 + note A#, 1 + octave 2 + note_type 6, 15, 7 + note D_, 1 + note D#, 1 + octave 1 + note B_, 1 + octave 2 + note C#, 1 + octave 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note C#, 1 + rest 1 + note_type 12, 15, 7 + note C#, 1 + rest 1 + note C#, 1 + octave 2 + note C#, 1 + octave 1 + note_type 9, 15, 7 + note C#, 2 + note_type 1, 15, 7 + rest 6 + note_type 6, 15, 7 + note C#, 1 + note_type 1, 15, 7 + rest 6 + note_type 12, 15, 7 + note C#, 1 + rest 1 + note_type 6, 15, 7 + note C#, 1 + note_type 1, 15, 7 + rest 6 + note_type 3, 15, 7 + note C#, 1 + rest 1 + note C#, 1 + rest 1 + note_type 12, 15, 7 + octave 2 + note C#, 4 + octave 1 + note A#, 2 + note_type 6, 15, 7 + note G_, 1 + rest 1 + note A#, 1 + octave 2 + note C_, 1 + note_type 12, 15, 7 + note D#, 1 + octave 1 + note A#, 1 + note G_, 1 + note A#, 1 + note D#, 1 + note D_, 1 + rest 1 + note G#, 3 + rest 1 + note G#, 1 + octave 2 + note C#, 1 + rest 2 + note_type 3, 15, 7 + note C#, 1 + rest 1 + note C#, 1 + rest 1 + note_type 12, 15, 7 + octave 1 + note G#, 4 + note D#, 1 + octave 2 + note D#, 1 + octave 1 + note D#, 1 + octave 2 + note C#, 1 + octave 1 + note D#, 1 + octave 2 + note C_, 1 + octave 1 + note G_, 1 + note G#, 1 + note D#, 1 + note A#, 1 + note D#, 1 + note G#, 1 + note D#, 1 + note G_, 1 + note A_, 1 + note A#, 1 + octave 2 + note D#, 1 + note_type 6, 15, 7 + octave 1 + note A#, 1 + rest 1 + note_type 12, 15, 7 + note G_, 1 + note_type 6, 15, 7 + note A#, 1 + octave 2 + note_type 1, 15, 7 + rest 1 + note_type 5, 15, 7 + rest 1 + note_type 6, 15, 7 + note C#, 1 + note D#, 1 + octave 1 + note A#, 1 + note B_, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note_type 12, 15, 7 + note D#, 1 + rest 1 + note D_, 1 + note_type 6, 15, 7 + note D#, 1 + rest 1 + note_type 12, 15, 7 + rest 1 + note_type 6, 15, 7 + note D#, 1 + rest 1 + note_type 12, 15, 7 + octave 2 + note C#, 1 + octave 1 + note D#, 1 + octave 2 + note D_, 1 + note D#, 2 + octave 1 + note_type 9, 15, 7 + note D#, 2 + note_type 1, 15, 7 + rest 6 + note_type 12, 15, 7 + note D_, 1 + note_type 6, 15, 7 + note D#, 1 + rest 1 + note D#, 1 + rest 1 + note_type 12, 15, 7 + note E_, 1 + rest 1 + note D#, 1 + note_type 9, 15, 7 + note E_, 2 + note_type 1, 15, 7 + rest 6 + note_type 12, 15, 7 + note E_, 1 + octave 2 + note E_, 1 + octave 1 + note E_, 1 + octave 2 + note D#, 1 + note E_, 1 + rest 2 + octave 1 + note B_, 1 + octave 2 + note_type 6, 15, 7 + note C_, 1 + rest 1 + note_type 12, 15, 7 + octave 1 + note G#, 1 + note_type 6, 15, 7 + note B_, 1 + rest 1 + note_type 12, 15, 7 + octave 8 + sound_loop 0, .mainLoop + +Music_UntitledSong_Ch2: + note_type 6, 15, 8 + duty_cycle 3 + volume_envelope 15, 7 + vibrato 0, 2, 1 + octave 3 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note_type 12, 15, 8 + volume_envelope 15, 7 + note A#, 1 + rest 2 + note A#, 1 + rest 2 + note A#, 1 + rest 5 + note A#, 1 + rest 6 + note A#, 1 + rest 2 + note A#, 1 + rest 4 + note A_, 5 + note A#, 1 + rest 2 + note A#, 1 + rest 2 + note A#, 1 + rest 5 + note A#, 1 + rest 6 + note A#, 1 + rest 2 + note A#, 1 + rest 4 + note A#, 5 + octave 8 +.mainLoop: + note_type 12, 15, 7 + vibrato 0, 2, 1 + octave 3 + note A#, 3 + note A_, 3 + note_type 8, 15, 7 + note G_, 3 + note_type 12, 15, 7 + note A#, 3 + octave 4 + note C_, 3 + note_type 8, 15, 7 + octave 3 + note A#, 3 + note_type 12, 15, 7 + volume_envelope 7, -7 + octave 4 + note B_, 6 + volume_envelope 15, 7 + note A#, 1 + rest 1 + note B_, 1 + note A#, 1 + octave 5 + rest 2 + volume_envelope 15, -7 + note E_, 4 + octave 4 + volume_envelope 11, -7 + note D#, 3 + note C#, 3 + note_type 8, 15, -7 + volume_envelope 11, -7 + octave 3 + note B_, 3 + octave 4 + note_type 12, 15, -7 + volume_envelope 11, -7 + note E_, 3 + note D#, 3 + note_type 8, 15, -7 + volume_envelope 11, -7 + note C#, 3 + note_type 12, 15, -7 + volume_envelope 11, -7 + note G#, 3 + note G_, 3 + note_type 8, 15, -7 + volume_envelope 11, -7 + note F_, 3 + note C#, 3 + note D#, 3 + note F_, 3 + note G#, 3 + note_type 12, 15, -7 + volume_envelope 3, -7 + note B_, 16 + note A#, 16 + volume_envelope 15, 7 + octave 3 + note G#, 4 + octave 4 + note C#, 4 + note F_, 4 + note G#, 4 + note G_, 8 + volume_envelope 15, -7 + note G_, 8 + octave 3 + note G#, 4 + octave 4 + note C#, 4 + note F_, 4 + note G#, 4 + note A#, 8 + octave 5 + volume_envelope 6, -7 + note D#, 8 + octave 4 + volume_envelope 15, -7 + note G_, 6 + note G_, 1 + rest 1 + note G#, 1 + note G_, 2 + rest 5 + note G#, 6 + note G#, 1 + rest 1 + note B_, 1 + note A#, 1 + rest 2 + note G#, 4 + octave 8 + sound_loop 0, .mainLoop + +Music_UntitledSong_Ch3: + note_type 6, 1, 0 + octave 5 + vibrato 0, 4, 1 + volume_envelope 2, 7 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note C_, 1 + octave 4 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + octave 5 + volume_envelope 2, 2 + vibrato 0, 15, 1 + note_type 1, 2, 2 + volume_envelope 2, 7 + note E_, 1 + rest 2 + note_type 3, 2, 7 + rest 1 + volume_envelope 2, 2 + note_type 1, 2, 2 + volume_envelope 2, 1 + note E_, 1 + rest 2 + note_type 3, 2, 7 + rest 1 + note_type 12, 2, 7 + rest 1 + volume_envelope 2, 2 + note_type 1, 2, 2 + volume_envelope 2, 1 + note E_, 1 + rest 2 + note_type 3, 2, 7 + rest 1 + volume_envelope 2, 2 + note_type 1, 2, 2 + volume_envelope 2, 1 + note E_, 1 + rest 2 + note_type 3, 2, 7 + rest 1 + note_type 12, 2, 7 + octave 3 + vibrato 0, 4, 5 + note G_, 1 + octave 5 + volume_envelope 2, 2 + note_type 1, 2, 2 + volume_envelope 2, 1 + note E_, 1 + rest 2 + note_type 3, 2, 7 + rest 1 + volume_envelope 2, 2 + note_type 1, 2, 2 + volume_envelope 2, 1 + note E_, 1 + rest 2 + note_type 3, 2, 7 + rest 1 + note_type 12, 2, 7 + octave 3 + rest 1 + note F#, 1 + octave 5 + note_type 1, 2, 7 + volume_envelope 2, 1 + note E_, 1 + rest 2 + note_type 3, 2, 7 + rest 1 + note_type 1, 2, 7 + volume_envelope 2, 1 + note E_, 1 + rest 5 + note E_, 1 + rest 2 + note_type 3, 2, 7 + rest 3 + note_type 1, 2, 7 + volume_envelope 2, 1 + note E_, 1 + rest 2 + note_type 3, 2, 7 + rest 3 + note_type 1, 2, 7 + volume_envelope 2, 1 + note E_, 1 + rest 2 + note_type 3, 2, 7 + rest 3 + note_type 1, 2, 7 + volume_envelope 2, 1 + note E_, 1 + rest 4 + note_type 3, 2, 7 + rest 2 + note_type 1, 2, 7 + rest 1 + note_type 12, 2, 7 + octave 3 + note E_, 1 + octave 5 + note_type 1, 2, 7 + volume_envelope 2, 1 + note E_, 1 + rest 2 + note_type 3, 2, 7 + rest 3 + note_type 1, 2, 7 + volume_envelope 2, 1 + note E_, 1 + rest 2 + note_type 3, 2, 7 + rest 3 + note_type 1, 2, 7 + volume_envelope 2, 1 + note E_, 1 + rest 2 + note_type 3, 2, 7 + rest 3 + note_type 1, 2, 7 + note E_, 1 + rest 2 + note_type 3, 2, 7 + rest 1 + note_type 1, 2, 7 + volume_envelope 2, 1 + note E_, 1 + rest 2 + note_type 3, 2, 7 + rest 1 + note_type 1, 2, 7 + volume_envelope 2, 1 + note E_, 1 + rest 2 + note_type 3, 2, 7 + rest 3 + note_type 1, 2, 7 + volume_envelope 2, 1 + note E_, 1 + rest 2 + note_type 3, 2, 7 + rest 3 + note_type 12, 2, 7 + octave 3 + note G_, 1 + octave 5 + note_type 1, 2, 7 + volume_envelope 2, 1 + note E_, 1 + rest 2 + note_type 3, 2, 7 + rest 3 + note_type 1, 2, 7 + volume_envelope 2, 1 + note E_, 1 + rest 2 + note_type 3, 2, 7 + rest 3 + note_type 12, 2, 7 + octave 3 + note F#, 1 + octave 5 + note_type 1, 2, 7 + volume_envelope 2, 1 + note E_, 1 + rest 2 + note_type 3, 2, 7 + rest 3 + note_type 1, 2, 7 + volume_envelope 2, 1 + note E_, 1 + rest 2 + note_type 3, 2, 7 + rest 3 + note_type 12, 2, 7 + rest 1 + note_type 1, 2, 7 + volume_envelope 2, 1 + note E_, 1 + rest 2 + note_type 3, 2, 7 + rest 3 + note_type 1, 2, 7 + volume_envelope 2, 1 + note E_, 1 + octave 3 + note_type 11, 2, 7 + note E_, 1 + note_type 1, 2, 7 + octave 5 + volume_envelope 2, 1 + note E_, 1 + octave 3 + note_type 11, 2, 7 + note E_, 1 + note_type 1, 2, 7 + octave 5 + volume_envelope 2, 1 + note E_, 1 + octave 3 + note_type 11, 2, 7 + note E_, 1 + note_type 1, 2, 7 + octave 5 + volume_envelope 2, 1 + note E_, 1 + octave 3 + note_type 11, 2, 7 + note E_, 1 + note_type 1, 2, 7 + octave 5 + volume_envelope 2, 1 + note E_, 1 + octave 3 + note_type 11, 2, 7 + note E_, 1 + note_type 1, 2, 7 + octave 5 + note E_, 1 + octave 3 + note_type 11, 2, 7 + note A#, 1 + octave 5 + note_type 1, 2, 7 + volume_envelope 2, 1 + note E_, 1 + rest 2 + note_type 3, 2, 7 + rest 1 + note_type 1, 2, 7 + volume_envelope 2, 1 + note E_, 1 + rest 2 + note_type 3, 2, 7 + rest 1 + note_type 1, 2, 7 + volume_envelope 2, 1 + note E_, 1 + rest 2 + note_type 3, 2, 7 + rest 3 + note_type 1, 2, 7 + note E_, 1 + octave 3 + note_type 11, 2, 7 + note G_, 1 + octave 5 + note_type 1, 2, 7 + volume_envelope 2, 1 + note E_, 1 + rest 11 + note E_, 1 + rest 11 + note_type 12, 2, 7 + octave 3 + note F#, 1 + octave 5 + volume_envelope 2, 1 + note_type 1, 2, 1 + note E_, 1 + rest 2 + note_type 3, 2, 1 + rest 1 + note_type 1, 2, 1 + note E_, 1 + rest 5 + note E_, 1 + rest 2 + note_type 3, 2, 1 + rest 1 + note_type 1, 2, 1 + note E_, 1 + rest 2 + note_type 3, 2, 1 + rest 1 + note_type 1, 2, 7 + volume_envelope 2, 1 + note E_, 1 + rest 11 + note E_, 1 + rest 11 + note E_, 1 + rest 11 + note_type 12, 2, 7 + octave 3 + note E_, 1 + octave 5 + note_type 1, 2, 7 + volume_envelope 2, 1 + note E_, 1 + rest 11 + note_type 3, 2, 7 + rest 2 + volume_envelope 2, 1 + note_type 1, 2, 1 + note E_, 1 + rest 2 + note_type 3, 2, 1 + rest 1 + note_type 1, 2, 1 + note E_, 1 + rest 2 + note_type 3, 2, 1 + rest 1 + note_type 1, 2, 1 + note E_, 1 + rest 2 + note_type 3, 2, 1 + rest 1 + note_type 1, 2, 7 + note E_, 1 + rest 11 + volume_envelope 2, 1 + note E_, 1 + rest 11 + note E_, 1 + rest 11 + note E_, 1 + octave 3 + note_type 11, 2, 7 + note F#, 1 + octave 5 + note_type 1, 2, 7 + volume_envelope 2, 1 + note E_, 1 + rest 11 + note E_, 1 + rest 11 + note_type 12, 2, 7 + octave 3 + note F#, 1 + octave 5 + note_type 1, 2, 7 + volume_envelope 2, 1 + note E_, 1 + rest 11 + note E_, 1 + rest 11 + note E_, 1 + rest 11 + note E_, 1 + rest 11 + note_type 12, 2, 7 + octave 3 + note E_, 5 + octave 8 +.mainLoop: + volume_envelope 2, 6 + note_type 1, 2, 6 + octave 5 + vibrato 0, 4, 5 + volume_envelope 2, 7 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note E_, 1 + note_type 6, 2, 6 + note F_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 2, 1 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note E_, 1 + note_type 6, 2, 6 + note D#, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 2, 1 + note E_, 1 + note_type 5, 2, 6 + octave 3 + note E_, 1 + note_type 6, 2, 6 + note F_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 2, 1 + note E_, 1 + note_type 5, 2, 6 + octave 3 + note E_, 1 + note_type 6, 2, 6 + note D#, 1 + note E_, 1 + note F_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 2, 1 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note F#, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 2, 1 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note F_, 1 + note_type 1, 2, 6 + octave 5 + volume_envelope 2, 1 + note E_, 1 + note_type 5, 2, 6 + octave 3 + note E_, 1 + note_type 6, 2, 6 + note D#, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 2, 1 + note E_, 1 + note_type 5, 2, 6 + octave 3 + note D_, 1 + note_type 6, 2, 6 + note D#, 1 + note_type 1, 2, 6 + octave 5 + volume_envelope 2, 1 + note E_, 1 + note_type 5, 2, 6 + octave 3 + note E_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 2, 1 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note F_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 2, 1 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note F#, 1 + note_type 6, 2, 6 + note F_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 2, 1 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note E_, 1 + note_type 6, 2, 6 + note F_, 1 + note F#, 1 + note F_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 2, 1 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note E_, 1 + note_type 6, 2, 6 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 2, 1 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note F_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 2, 7 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note E_, 1 + note_type 6, 2, 6 + note F_, 1 + note F#, 1 + note G_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 2, 1 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note G#, 1 + note_type 6, 2, 6 + note A_, 1 + note A#, 1 + note B_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 2, 1 + note E_, 1 + octave 4 + note_type 5, 2, 6 + note C_, 1 + note_type 6, 2, 6 + octave 3 + note B_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 2, 1 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note A#, 1 + note_type 6, 2, 6 + note A_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 2, 1 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note G#, 1 + note_type 1, 2, 6 + octave 5 + volume_envelope 2, 1 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note G_, 1 + note_type 1, 2, 6 + octave 5 + volume_envelope 2, 1 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note F#, 1 + note_type 1, 2, 6 + octave 5 + volume_envelope 2, 1 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note F_, 1 + note_type 6, 2, 6 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note_type 1, 2, 6 + octave 5 + volume_envelope 2, 1 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note A_, 1 + note_type 6, 2, 6 + note B_, 1 + note_type 1, 2, 6 + octave 5 + volume_envelope 2, 1 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note E_, 1 + note_type 6, 2, 6 + note F_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note F_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 2, 1 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note F#, 1 + note_type 6, 2, 6 + note G_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 2, 1 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note F#, 1 + note_type 6, 2, 6 + note F_, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 2, 1 + note E_, 1 + note_type 5, 2, 6 + octave 3 + note G#, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 2, 1 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note G_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 2, 1 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note F#, 1 + note_type 6, 2, 6 + note F_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note F_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 2, 1 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note F#, 1 + note_type 6, 2, 6 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 2, 1 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note F#, 1 + note_type 6, 2, 6 + note F_, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 2, 1 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note F#, 1 + note_type 6, 2, 6 + note F_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 2, 1 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note E_, 1 + note_type 6, 2, 6 + note F_, 1 + note F#, 1 + note G_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 2, 1 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note G#, 1 + note_type 6, 2, 6 + note A_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 2, 1 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note G#, 1 + note_type 6, 2, 6 + note G_, 1 + note_type 1, 2, 6 + volume_envelope 2, 1 + octave 5 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note F#, 1 + note_type 6, 2, 6 + note F_, 1 + note F#, 1 + note G_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 1, 1 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note G#, 1 + note_type 6, 2, 6 + note A_, 1 + note A#, 1 + note B_, 1 + octave 4 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note A_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 1, 1 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note G#, 1 + note_type 6, 2, 6 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 1, 1 + note E_, 1 + octave 4 + note_type 5, 2, 6 + note C_, 1 + note_type 6, 2, 6 + octave 3 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 1, 1 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note E_, 1 + note_type 6, 2, 6 + note F_, 1 + note F#, 1 + note G_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 1, 1 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note G#, 1 + note_type 6, 2, 6 + note A_, 1 + note A#, 1 + note B_, 1 + octave 4 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note A_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 1, 1 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note G#, 1 + note_type 6, 2, 6 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note A_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 1, 1 + note E_, 1 + octave 3 + note_type 5, 2, 6 + note G#, 1 + note_type 6, 2, 6 + note G_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 1, 1 + note E_, 1 + octave 3 + note_type 11, 2, 6 + note D#, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 1, 1 + note E_, 1 + octave 3 + note_type 11, 2, 6 + note D#, 1 + note_type 12, 2, 6 + note D#, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 1, 1 + note E_, 1 + octave 3 + note_type 11, 2, 6 + note D#, 1 + note_type 12, 2, 6 + note F_, 2 + octave 5 + note_type 1, 2, 6 + volume_envelope 1, 1 + note E_, 1 + octave 3 + note_type 11, 2, 6 + note G#, 1 + note_type 12, 2, 6 + note G#, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 1, 1 + note E_, 1 + rest 11 + note E_, 1 + octave 3 + note_type 11, 2, 6 + note G_, 1 + note_type 12, 2, 6 + note G_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 1, 1 + note E_, 1 + octave 3 + note_type 11, 2, 6 + note F_, 1 + note_type 12, 2, 6 + note F_, 2 + octave 5 + note_type 1, 2, 6 + volume_envelope 1, 1 + note E_, 1 + octave 3 + note_type 11, 2, 6 + note G#, 1 + note_type 12, 2, 6 + note G#, 1 + octave 4 + note C_, 6 + note C#, 2 + octave 3 + note A#, 8 + octave 5 + note_type 1, 2, 6 + volume_envelope 1, 1 + note E_, 1 + octave 3 + note_type 11, 2, 6 + note F_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 1, 1 + note E_, 1 + octave 3 + note_type 11, 2, 6 + note F_, 1 + note_type 12, 2, 6 + note D#, 1 + note_type 1, 2, 6 + octave 5 + volume_envelope 1, 1 + note E_, 1 + octave 3 + note_type 11, 2, 6 + note D#, 1 + note_type 12, 2, 6 + note F_, 2 + octave 5 + note_type 1, 2, 6 + volume_envelope 1, 1 + note E_, 1 + octave 3 + note_type 11, 2, 6 + note G#, 1 + note_type 12, 2, 6 + note G#, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 1, 1 + note E_, 1 + octave 3 + note_type 11, 2, 6 + note A#, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 1, 1 + note E_, 1 + octave 3 + note_type 11, 2, 6 + note A#, 1 + note_type 12, 2, 6 + note A#, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 1, 1 + note E_, 1 + octave 4 + note_type 11, 2, 6 + note C_, 1 + note_type 12, 2, 6 + note C_, 2 + octave 5 + note_type 1, 2, 6 + volume_envelope 1, 1 + note E_, 1 + octave 4 + note_type 7, 2, 6 + note D_, 1 + note_type 8, 2, 6 + note D_, 2 + note_type 12, 1, 0 + volume_envelope 2, 6 + note D#, 8 + note A#, 8 + octave 5 + note_type 1, 2, 6 + volume_envelope 1, 1 + note D#, 1 + octave 4 + note_type 11, 2, 6 + note D#, 1 + note_type 12, 2, 6 + note D#, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 1, 1 + note D#, 1 + octave 4 + note_type 11, 2, 6 + note D#, 1 + note_type 12, 2, 6 + note D#, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 1, 1 + note D#, 1 + octave 4 + note_type 11, 2, 6 + note D#, 1 + note_type 12, 2, 6 + note D#, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 1, 1 + note D#, 1 + octave 4 + note_type 11, 2, 6 + note D#, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 1, 1 + note D#, 1 + rest 11 + note D#, 1 + octave 4 + note_type 11, 2, 6 + note E_, 1 + note_type 12, 2, 6 + note D#, 1 + rest 2 + octave 5 + note_type 1, 2, 6 + volume_envelope 1, 1 + note D#, 1 + rest 11 + note D#, 1 + rest 11 + note D#, 1 + rest 5 + note D#, 1 + rest 5 + note D#, 1 + rest 5 + note D#, 1 + rest 5 + note D#, 1 + octave 4 + note_type 11, 2, 6 + note E_, 1 + note_type 12, 2, 6 + note E_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 1, 1 + note D#, 1 + octave 4 + note_type 11, 2, 6 + note E_, 1 + note_type 12, 2, 6 + note E_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 1, 1 + note D#, 1 + octave 4 + note_type 11, 2, 6 + note E_, 1 + note_type 12, 2, 6 + note E_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 1, 1 + note D#, 1 + octave 4 + note_type 11, 2, 6 + note E_, 1 + note_type 12, 2, 6 + rest 1 + note_type 1, 2, 6 + octave 5 + volume_envelope 1, 1 + note D#, 1 + octave 4 + note_type 11, 2, 6 + note G#, 1 + note_type 12, 2, 6 + note F#, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 1, 1 + note D#, 1 + rest 11 + note_type 12, 2, 6 + rest 1 + note_type 1, 2, 6 + volume_envelope 1, 1 + note D#, 1 + octave 4 + note_type 11, 2, 6 + note E_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 1, 1 + note D#, 1 + octave 4 + note_type 11, 2, 6 + note E_, 1 + octave 5 + note_type 1, 2, 6 + volume_envelope 1, 1 + note D#, 1 + octave 4 + note_type 5, 2, 6 + note E_, 1 + note_type 1, 2, 6 + octave 5 + volume_envelope 1, 1 + note D#, 1 + octave 4 + note_type 5, 2, 6 + note E_, 1 + note_type 1, 2, 6 + octave 5 + volume_envelope 1, 1 + note D#, 1 + octave 4 + note_type 5, 2, 6 + note E_, 1 + note_type 1, 2, 6 + octave 5 + volume_envelope 1, 1 + note D#, 1 + octave 4 + note_type 5, 2, 6 + note E_, 1 + note_type 12, 2, 6 + octave 8 + sound_loop 0, .mainLoop + +Music_UntitledSong_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 + sound_loop 0, .mainLoop diff --git a/crysaudio/music_pointers_red.asm b/crysaudio/music_pointers_red.asm index 43c7e49f..f5dfe32c 100644 --- a/crysaudio/music_pointers_red.asm +++ b/crysaudio/music_pointers_red.asm @@ -57,3 +57,4 @@ Music: dba Music_Victory4 dba Music_Kinchou01 dba Music_Mewtwo01 + dba Music_LegendaryBattle diff --git a/data/maps/objects/CitrineCity.asm b/data/maps/objects/CitrineCity.asm index c43ae967..251f32d5 100644 --- a/data/maps/objects/CitrineCity.asm +++ b/data/maps/objects/CitrineCity.asm @@ -8,8 +8,8 @@ CitrineCity_Object: warp_event 15, 27, CITRINE_MART, 1 warp_event 23, 5, CELESTE_HILL_OUTSIDE, 1 warp_event 11, 7, BATTLE_TENT, 1 - warp_event 27, 33, VERMILION_CITY, 6 - warp_event 26, 33, VERMILION_CITY, 6 + warp_event 27, 33, VERMILION_CITY, 9 + warp_event 26, 33, VERMILION_CITY, 10 def_bg_events bg_event 16, 27, 5 ; Citrine Shop diff --git a/data/maps/objects/VermilionCity.asm b/data/maps/objects/VermilionCity.asm index e11f138d..af5bf58f 100644 --- a/data/maps/objects/VermilionCity.asm +++ b/data/maps/objects/VermilionCity.asm @@ -10,8 +10,8 @@ VermilionCity_Object: warp_event 18, 31, VERMILION_DOCK, 1 warp_event 19, 31, VERMILION_DOCK, 1 warp_event 15, 13, VERMILION_TRADE_HOUSE, 1 - warp_event 10, 31, FARAWAY_ISLAND_OUTSIDE, 2 - warp_event 11, 31, FARAWAY_ISLAND_OUTSIDE, 1 + warp_event 10, 31, CITRINE_CITY, 7 + warp_event 11, 31, CITRINE_CITY, 8 def_bg_events bg_event 27, 3, 9 ; VermilionCityText7 diff --git a/engine/debug/debug_menu.asm b/engine/debug/debug_menu.asm index a5cf507d..79b0e2a6 100644 --- a/engine/debug/debug_menu.asm +++ b/engine/debug/debug_menu.asm @@ -130,7 +130,7 @@ TestBattle: ld [hli], a ; Opponent's Pokemon. - ld a, MEWTWO ; Test new theme + ld a, ARTICUNO ; Test new theme ld [wCurOpponent], a ld a, 100 ; Set the level you want here. ld [wCurEnemyLVL], a