diff --git a/audio.asm b/audio.asm index 26aa7f43..59f3d62e 100644 --- a/audio.asm +++ b/audio.asm @@ -383,6 +383,8 @@ INCLUDE "crysaudio/music/RBY/legendarybattle.asm" INCLUDE "crysaudio/music/RBY/giovannisroom.asm" INCLUDE "crysaudio/music/RBY/rocketrby.asm" INCLUDE "crysaudio/music/RBY/giovannibattle.asm" +INCLUDE "crysaudio/music/RBY/elitefourbattle.asm" +INCLUDE "crysaudio/music/RBY/champrival.asm" SECTION "TCG Songs 1", ROMX diff --git a/audio/play_battle_music.asm b/audio/play_battle_music.asm index 4a2eb0cf..a4d831b2 100644 --- a/audio/play_battle_music.asm +++ b/audio/play_battle_music.asm @@ -43,23 +43,23 @@ PlayBattleMusic:: cp OPP_ID_OFFSET jp c, .wildBattle cp OPP_YUJIROU - jp z, .GymOrElite4Battle + jp z, .GymBattle cp OPP_KOICHI - jp z, .GymOrElite4Battle + jp z, .GymBattle cp OPP_BROCK ; there's probably a much better way of doing this, but this allows the Gym leader rematches in SIlph to play the Gym Battle music - jp z, .GymOrElite4Battle + jp z, .GymBattle cp OPP_MISTY - jp z, .GymOrElite4Battle + jp z, .GymBattle cp OPP_LT_SURGE - jp z, .GymOrElite4Battle + jp z, .GymBattle cp OPP_ERIKA - jp z, .GymOrElite4Battle + jp z, .GymBattle cp OPP_KOGA - jp z, .GymOrElite4Battle + jp z, .GymBattle cp OPP_SABRINA - jp z, .GymOrElite4Battle + jp z, .GymBattle cp OPP_BLAINE - jp z, .GymOrElite4Battle + jp z, .GymBattle cp OPP_ROCKET jr z, .RocketBattle cp OPP_JESSIE_JAMES @@ -71,21 +71,24 @@ PlayBattleMusic:: cp OPP_CHIEF jr z, .Giovanni cp OPP_LORELEI ; elite four now play the gym leader battle theme - jr z, .GymOrElite4Battle + jr z, .Elite4Battle cp OPP_BRUNO - jr z, .GymOrElite4Battle + jr z, .Elite4Battle cp OPP_AGATHA - jr z, .GymOrElite4Battle + jr z, .Elite4Battle cp OPP_LANCE - jr z, .GymOrElite4Battle - cp OPP_PROF_OAK ; could also use the final battle theme, but I think the gym leader/elite 4 theme fits better instead. I'm happy to change this if it isn't well-liked. - jr z, .GymOrElite4Battle + jr z, .Elite4Battle + cp OPP_PROF_OAK ; could also use the final battle theme, but I think the elite 4 theme fits better instead. I'm happy to change this if it isn't well-liked. + jr z, .Elite4Battle cp OPP_RIVAL3 jr z, .finalBattle jr nz, .normalTrainerBattle -.GymOrElite4Battle +.GymBattle ld a, MUSIC_GYM_LEADER_BATTLE jr .playSong +.Elite4Battle + ld a, MUSIC_ELITE_FOUR_BATTLE + jr .playSong .normalTrainerBattle ld a, MUSIC_TRAINER_BATTLE jr .playSong diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 55fdcfb1..0369e749 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -67,6 +67,8 @@ const MUSIC_GIOVANNIS_ROOM const MUSIC_ROCKET_RBY const MUSIC_GIOVANNI_BATTLE + const MUSIC_ELITE_FOUR_BATTLE + const MUSIC_CHAMP_RIVAL const NUM_SONGS diff --git a/crysaudio/music/RBY/champrival.asm b/crysaudio/music/RBY/champrival.asm new file mode 100644 index 00000000..4071243d --- /dev/null +++ b/crysaudio/music/RBY/champrival.asm @@ -0,0 +1,358 @@ +Music_ChampRival: + channel_count 3 + channel 1, Music_ChampRival_Ch1 + channel 2, Music_ChampRival_Ch2 + channel 3, Music_ChampRival_Ch3 + +Music_ChampRival_Ch1: + tempo 170 +Music_ChampRival_branch_b123: + volume 7, 7 + duty_cycle 3 + vibrato 6, 3, 4 + toggle_perfect_pitch + note_type 12, 11, 3 + octave 3 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 2 + octave 2 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 6 + note E_, 1 + rest 1 + note E_, 1 + rest 1 + note E_, 1 + rest 1 + note E_, 1 + rest 3 + note B_, 2 + note A_, 2 + note B_, 2 + octave 3 +Music_ChampRival_branch_b140: + octave 3 + note C#, 4 + note C_, 2 + octave 2 + note B_, 4 + note A_, 2 + octave 3 + note D_, 4 + note E_, 4 + rest 2 + note E_, 4 + note D#, 2 + note D_, 2 + note C#, 2 + note D_, 4 + note F#, 2 + note E_, 4 + note D_, 2 + note C#, 4 + note D_, 4 + rest 2 + note A_, 4 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + note G#, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note E_, 2 + octave 3 + note E_, 2 + rest 2 + octave 2 + note E_, 2 + octave 3 + note D_, 4 + note C#, 2 + note C_, 2 + note C#, 2 + note D_, 2 + note G_, 2 + octave 2 + note A_, 2 + octave 3 + note D_, 2 + note G_, 2 + note F_, 2 + note D_, 2 + note C_, 2 + octave 2 + note G#, 4 + rest 2 + octave 3 + note C_, 4 + note D_, 2 + note C_, 2 + note D_, 2 + note_type 12, 11, 7 + octave 2 + note A_, 4 + note E_, 2 + note G_, 6 + note G#, 4 + note E_, 2 + rest 4 + note E_, 4 + note_type 12, 11, 3 + note B_, 2 + note A_, 2 + note B_, 2 + octave 3 + sound_loop 0, Music_ChampRival_branch_b140 + +Music_ChampRival_Ch2: + duty_cycle 3 + vibrato 10, 2, 6 + note_type 12, 12, 7 + octave 4 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note A_, 2 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 6 + octave 2 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + note F#, 1 + rest 1 + note E_, 1 + rest 1 + octave 3 + note E_, 2 + note G_, 2 + note G#, 2 + octave 4 +Music_ChampRival_branch_b1d8: + note_type 12, 12, 7 + octave 3 + note A_, 4 + note E_, 2 + note G_, 6 + note G#, 4 + note A_, 4 + rest 2 + note A_, 4 + note A_, 2 + octave 4 + note C_, 2 + note C#, 2 + note D_, 4 + octave 3 + note A_, 2 + octave 4 + note C_, 6 + note C#, 4 + note D_, 4 + rest 2 + note D_, 4 + note D_, 2 + note C#, 2 + note D_, 2 + note_type 12, 11, 8 + note E_, 16 + note_type 12, 11, 5 + note E_, 6 + note_type 12, 12, 7 + note G_, 4 + note E_, 2 + note D_, 2 + note E_, 2 + note_type 12, 11, 8 + note D_, 8 + note_type 12, 12, 7 + note D_, 8 + octave 3 + note D_, 4 + rest 2 + octave 4 + note C_, 4 + octave 3 + note A_, 2 + note G_, 2 + note_type 12, 11, 8 + note A_, 16 + note_type 12, 11, 3 + note A_, 2 + octave 2 + note A_, 2 + rest 4 + note A_, 4 + octave 3 + note E_, 2 + note G_, 2 + note G#, 2 + octave 4 + sound_loop 0, Music_ChampRival_branch_b1d8 + +Music_ChampRival_Ch3: + note_type 12, 1, 4 + octave 4 + note E_, 2 + rest 2 + note D#, 2 + rest 2 + note D_, 2 + rest 2 + note C#, 2 + octave 3 + rest 2 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + note A_, 1 + octave 4 + rest 1 +Music_ChampRival_branch_b24b: + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + rest 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + rest 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + rest 4 + octave 4 + note E_, 4 + octave 3 + note A_, 2 + octave 4 + note C_, 2 + note C#, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + rest 2 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + rest 2 + octave 4 + note C#, 2 + note D_, 4 + rest 2 + note D_, 4 + note D_, 2 + note C#, 2 + octave 3 + note B_, 2 + note G#, 2 + note B_, 2 + rest 2 + note G#, 2 + note B_, 2 + note G#, 2 + rest 2 + note B_, 2 + note G#, 2 + note B_, 2 + rest 2 + note G#, 2 + note B_, 2 + note G#, 2 + octave 4 + note E_, 2 + octave 3 + note B_, 2 + note F#, 2 + octave 4 + note D_, 2 + rest 2 + octave 3 + note F#, 2 + octave 4 + note D_, 2 + octave 3 + note F#, 2 + note G_, 2 + note A_, 2 + note F#, 4 + rest 2 + note F#, 2 + octave 4 + note D_, 2 + note C#, 2 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + octave 4 + note C_, 2 + octave 3 + rest 2 + note A_, 2 + octave 4 + note C_, 2 + octave 3 + note A_, 2 + rest 2 + octave 4 + note C_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + rest 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + rest 2 + octave 4 + note E_, 2 + octave 5 + sound_loop 0, Music_ChampRival_branch_b24b diff --git a/crysaudio/music/RBY/elitefourbattle.asm b/crysaudio/music/RBY/elitefourbattle.asm new file mode 100644 index 00000000..bc22ba23 --- /dev/null +++ b/crysaudio/music/RBY/elitefourbattle.asm @@ -0,0 +1,1357 @@ +; "But isn't this just a pitched down Gym-" Yes. Diamond and Pearl did the same thing, shut up. + +Music_EliteFourBattle: + channel_count 3 + channel 1, Music_EliteFourBattle_Ch1 + channel 2, Music_EliteFourBattle_Ch2 + channel 3, Music_EliteFourBattle_Ch3 + +Music_EliteFourBattle_Ch1: + tempo 104 + volume 7, 7 + duty_cycle 3 + vibrato 8, 3, 4 + toggle_perfect_pitch + note_type 12, 11, 3 + rest 6 + octave 3 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note C_, 1 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note A_, 1 + octave 1 + note F#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note G#, 1 + note A_, 1 + octave 2 + note E_, 1 + rest 15 + note E_, 1 + rest 9 + note F_, 6 + note E_, 1 + rest 15 + note E_, 1 + rest 9 + note D#, 6 + note E_, 1 + rest 15 + note E_, 1 + rest 9 + note F_, 6 + note E_, 1 + rest 15 + note E_, 1 + rest 9 + note G_, 6 +Music_EliteFourBattle_branch_223b0: + note E_, 1 + octave 2 + note B_, 1 + octave 3 + note E_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note E_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note E_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note E_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note E_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note E_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note E_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note E_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note E_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note E_, 1 + note D_, 1 + octave 2 + note B_, 1 + note D_, 1 + note G_, 1 + note B_, 1 + note A_, 1 + note G_, 1 + note B_, 1 + note A_, 1 + note G_, 1 + note B_, 1 + note A_, 1 + note G_, 1 + note B_, 1 + note A_, 1 + note G_, 1 + note B_, 1 + note A_, 1 + note G_, 1 + note B_, 1 + note A_, 1 + note G_, 1 + note B_, 1 + note A_, 1 + note G_, 1 + note B_, 1 + note A_, 1 + note G_, 1 + note B_, 1 + note A_, 1 + note G_, 1 + note B_, 1 + note A_, 1 + note G_, 1 + note E_, 1 + note B_, 1 + octave 3 + note E_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note E_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note E_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note E_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note E_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note E_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note E_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note E_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note E_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note E_, 1 + note D_, 1 + octave 2 + note B_, 1 + note D_, 1 + note G_, 1 + note B_, 1 + note A_, 1 + note G_, 1 + note B_, 1 + note A_, 1 + note G_, 1 + note B_, 1 + note A_, 1 + note G_, 1 + note B_, 1 + note A_, 1 + note G_, 1 + note B_, 1 + note A_, 1 + note G_, 1 + note B_, 1 + note A_, 1 + note G_, 1 + note B_, 1 + note A_, 1 + note G_, 1 + note B_, 1 + note A_, 1 + note G_, 1 + note B_, 1 + note A_, 1 + note G_, 1 + note B_, 1 + note A_, 1 + note G_, 1 + rest 2 + octave 1 + note A_, 1 + rest 1 + octave 2 + note C_, 4 + octave 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + octave 2 + note D_, 4 + octave 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + octave 2 + note C_, 4 + octave 1 + note A_, 1 + rest 1 + note B_, 2 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + octave 2 + note C_, 4 + octave 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + octave 2 + note D_, 4 + octave 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + octave 2 + note C_, 4 + octave 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + note B_, 2 + note A_, 2 + note G_, 2 + note B_, 2 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + octave 2 + note A#, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G_, 1 + note A_, 1 + rest 16 + octave 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + octave 2 + note A#, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G_, 1 + note A_, 1 + octave 1 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + note_type 12, 11, 5 + octave 2 + note B_, 12 + note_type 12, 11, 3 + octave 1 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + note_type 12, 11, 5 + octave 3 + note G_, 12 + note_type 12, 11, 3 + note C#, 4 + octave 2 + note B_, 4 + octave 3 + note C#, 4 + note D_, 2 + note E_, 4 + octave 2 + note A_, 2 + note B_, 2 + octave 3 + note E_, 2 + note A_, 2 + note E_, 2 + note C#, 2 + note E_, 2 + octave 1 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + note_type 12, 11, 5 + octave 3 + note G_, 12 + note_type 12, 11, 3 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note E_, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note D_, 1 + note E_, 1 + note D_, 1 + note C#, 1 + octave 2 + note B_, 1 + octave 3 + note_type 12, 11, 5 + note C#, 4 + note D_, 4 + octave 2 + note B_, 2 + octave 3 + note C#, 6 + note E_, 4 + note D_, 2 + note C#, 4 + octave 2 + note B_, 6 + octave 3 + rest 16 + rest 10 + note D_, 6 + note C#, 4 + note D_, 4 + octave 2 + note B_, 2 + octave 3 + note C#, 6 + note D_, 4 + note C#, 2 + octave 2 + note B_, 4 + note A_, 6 + octave 3 + note C#, 4 + note D_, 4 + octave 2 + note B_, 2 + octave 3 + note C#, 6 + note E_, 4 + note G_, 2 + note F#, 4 + note D_, 6 + sound_loop 0, Music_EliteFourBattle_branch_223b0 + +Music_EliteFourBattle_Ch2: + duty_cycle 3 + vibrato 8, 2, 5 + note_type 12, 12, 3 + octave 4 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note A_, 1 + rest 5 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note C_, 1 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + octave 3 + note A_, 1 + rest 15 + note A_, 1 + rest 9 + note A#, 6 + note A_, 1 + rest 15 + note A_, 1 + rest 9 + note G#, 6 + note A_, 1 + rest 15 + note A_, 1 + rest 9 + note A#, 6 + note A_, 1 + rest 15 + note A_, 1 + rest 9 + note B_, 6 + octave 4 +Music_EliteFourBattle_branch_225e0: + note_type 12, 12, 5 + note C#, 4 + octave 3 + note B_, 4 + octave 4 + note C#, 4 + note D_, 2 + note E_, 4 + note D_, 4 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note B_, 2 + octave 4 + note C#, 2 + note_type 12, 11, 7 + duty_cycle 2 + octave 3 + note G_, 8 + note B_, 8 + octave 4 + note D_, 8 + octave 3 + note B_, 8 + octave 4 + note_type 12, 12, 5 + duty_cycle 3 + note C#, 4 + octave 3 + note B_, 4 + octave 4 + note C#, 4 + note D_, 2 + note E_, 4 + note D_, 4 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note B_, 2 + octave 4 + note C#, 2 + note_type 12, 11, 7 + duty_cycle 2 + octave 3 + note B_, 8 + note A_, 8 + note G_, 8 + note_type 12, 12, 3 + octave 4 + note D_, 4 + note D_, 2 + octave 3 + note B_, 2 + note_type 12, 12, 5 + duty_cycle 3 + octave 1 + note A_, 1 + rest 3 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C_, 1 + rest 4 + note D_, 1 + note C_, 1 + octave 2 + note A_, 1 + octave 3 + note D_, 1 + rest 4 + note E_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note E_, 1 + rest 2 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note D_, 1 + rest 1 + note D#, 1 + rest 1 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C_, 1 + rest 4 + note D_, 1 + note C_, 1 + octave 2 + note A_, 1 + octave 3 + note D_, 1 + rest 4 + note E_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note E_, 1 + note D_, 1 + rest 1 + octave 2 + note B_, 1 + octave 3 + rest 1 + note C_, 1 + rest 1 + octave 2 + note B_, 1 + octave 3 + rest 1 + note E_, 1 + rest 1 + note D_, 1 + rest 1 + octave 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + note_type 12, 11, 8 + octave 3 + note A_, 4 + note A#, 4 + note G_, 4 + note A_, 4 + note A#, 4 + note G_, 4 + note F_, 4 + note E_, 8 + note_type 12, 11, 7 + note E_, 8 + note_type 12, 12, 3 + octave 2 + note A#, 1 + note B_, 1 + octave 3 + note C_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 2 + note B_, 1 + note A#, 1 + note A_, 1 + note G_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note G_, 1 + note A_, 1 + note_type 12, 11, 8 + octave 3 + note A_, 4 + note A#, 4 + note G_, 4 + note A_, 4 + note A#, 4 + note G_, 4 + note A#, 4 + note A_, 16 + note_type 12, 3, -7 + octave 4 + note E_, 16 + note_type 12, 12, 3 + octave 1 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + note_type 12, 12, 7 + octave 3 + note G_, 12 + note_type 12, 12, 3 + octave 1 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + note_type 12, 12, 7 + octave 3 + note B_, 12 + octave 4 + note_type 12, 11, 8 + note C#, 16 + note_type 12, 11, 7 + note C#, 16 + note_type 12, 12, 3 + octave 1 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + note_type 12, 12, 7 + octave 3 + note B_, 12 + octave 4 + note_type 12, 12, 8 + note G_, 8 + note D_, 8 + note A_, 16 + note_type 12, 12, 7 + note A_, 16 + note_type 12, 12, 4 + octave 3 + note C#, 4 + note D_, 4 + octave 2 + note B_, 2 + octave 3 + note C#, 6 + note E_, 4 + note G_, 2 + note F#, 4 + rest 2 + note A_, 1 + octave 4 + note C#, 1 + note E_, 1 + note G#, 1 + note_type 12, 12, 8 + note A_, 16 + note E_, 16 + note G_, 16 + note B_, 8 + rest 2 + note_type 12, 12, 3 + note G_, 6 + sound_loop 0, Music_EliteFourBattle_branch_225e0 + +Music_EliteFourBattle_Ch3: + vibrato 0, 2, 0 + note_type 12, 1, 3 + rest 12 + octave 3 + note A_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 1 + octave 4 + note C_, 1 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note E_, 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + note A#, 6 + note A_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note D#, 6 + octave 3 + note A_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + note A#, 6 + note A_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + note B_, 6 + octave 4 + note_type 12, 1, 4 +Music_EliteFourBattle_branch_227b1: + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note G_, 2 + octave 4 + note D_, 2 + octave 3 + note G_, 2 + octave 4 + note D_, 2 + octave 3 + note G_, 2 + octave 4 + note D_, 2 + octave 3 + note G_, 2 + octave 4 + note D_, 2 + octave 3 + note G_, 2 + octave 4 + note D_, 2 + octave 3 + note G_, 2 + octave 4 + note D_, 2 + octave 3 + note G_, 2 + octave 4 + note D_, 2 + octave 3 + note G_, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note G_, 2 + octave 4 + note D_, 2 + octave 3 + note G_, 2 + octave 4 + note D_, 2 + octave 3 + note G_, 2 + octave 4 + note D_, 2 + octave 3 + note G_, 2 + octave 4 + note D_, 2 + octave 3 + note G_, 2 + octave 4 + note D_, 2 + octave 3 + note G_, 2 + octave 4 + note D_, 2 + octave 3 + note G_, 2 + octave 4 + note D_, 2 + octave 3 + note G_, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + octave 4 + note C_, 4 + octave 3 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + octave 4 + note D_, 4 + octave 3 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + octave 4 + note C_, 4 + octave 3 + note A_, 1 + rest 1 + note B_, 2 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + octave 4 + note C_, 4 + octave 3 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + octave 4 + note D_, 4 + octave 3 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + octave 4 + note C_, 4 + octave 3 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + note B_, 2 + note A_, 2 + note G_, 2 + note B_, 2 + note A_, 1 + rest 1 + note A_, 1 + rest 13 + note A_, 1 + rest 1 + note A_, 1 + rest 13 + note A_, 1 + rest 1 + note A_, 1 + rest 13 + note A_, 1 + rest 1 + note A_, 1 + rest 13 + note A_, 1 + rest 1 + note A_, 1 + rest 13 + note A_, 1 + rest 1 + note A_, 1 + rest 13 + note A_, 1 + rest 1 + note A_, 1 + rest 13 + note A_, 1 + rest 1 + note A_, 1 + rest 13 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + note B_, 12 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + octave 4 + note D_, 12 + note C#, 16 + octave 3 + note A_, 16 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + octave 4 + note D_, 12 + octave 3 + note B_, 8 + octave 4 + note D_, 8 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 6 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note F_, 6 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + note A#, 6 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note F_, 6 + sound_loop 0, Music_EliteFourBattle_branch_227b1 diff --git a/crysaudio/music_pointers_red.asm b/crysaudio/music_pointers_red.asm index 59f6ad1d..f776403c 100644 --- a/crysaudio/music_pointers_red.asm +++ b/crysaudio/music_pointers_red.asm @@ -61,3 +61,5 @@ Music: dba Music_GiovannisRoom dba Music_RocketRBY dba Music_GiovanniBattle + dba Music_EliteFourBattle + dba Music_ChampRival