diff --git a/audio.asm b/audio.asm index f7ef5677..b1defe61 100644 --- a/audio.asm +++ b/audio.asm @@ -380,6 +380,7 @@ INCLUDE "crysaudio/music/RBY/victory4.asm" INCLUDE "crysaudio/music/RBY/kinchou01.asm" INCLUDE "crysaudio/music/RBY/mewtwo01.asm" INCLUDE "crysaudio/music/RBY/legendarybattle.asm" +INCLUDE "crysaudio/music/RBY/giovannisroom.asm" SECTION "TCG Songs 1", ROMX diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 2356a040..cf463bad 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -64,6 +64,7 @@ const MUSIC_KINCHOU01 const MUSIC_MEWTWO01 const MUSIC_LEGENDARYBATTLE + const MUSIC_GIOVANNIS_ROOM const NUM_SONGS diff --git a/crysaudio/music/RBY/giovannisroom.asm b/crysaudio/music/RBY/giovannisroom.asm new file mode 100644 index 00000000..ef88d392 --- /dev/null +++ b/crysaudio/music/RBY/giovannisroom.asm @@ -0,0 +1,368 @@ +Music_GiovannisRoom: + channel_count 2 + channel 2, Music_GiovannisRoom_Ch2 + channel 3, Music_GiovannisRoom_Ch3 + +Music_GiovannisRoom_Ch2: + vibrato 11, 1, 5 + duty_cycle 3 + note_type 12, 0, -7 + stereo_panning TRUE, FALSE + note_type 12, 4, -5 + octave 5 + rest 4 + stereo_panning TRUE, TRUE +Music_GiovannisRoom_branch_7dfeb: + note_type 12, 12, 2 +Music_GiovannisRoom_branch_7dfed: + sound_call Music_GiovannisRoom_branch_7e097 + sound_loop 3, Music_GiovannisRoom_branch_7dfed + octave 2 + note E_, 1 + note E_, 1 + note B_, 1 + octave 3 + note C_, 1 + rest 2 + note C_, 1 + octave 2 + note B_, 1 + note E_, 1 + note E_, 1 + note A_, 1 + note G_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note D#, 1 +Music_GiovannisRoom_branch_7e006: + sound_call Music_GiovannisRoom_branch_7e097 + sound_loop 4, Music_GiovannisRoom_branch_7e006 + rest 2 + sound_call Music_GiovannisRoom_branch_7e0ab + octave 3 + note C_, 4 + sound_call Music_GiovannisRoom_branch_7e0ab + octave 3 + note C#, 4 + sound_call Music_GiovannisRoom_branch_7e0ab + octave 3 + note D#, 4 + note_type 12, 13, 3 + octave 4 + note E_, 4 + note D#, 4 + note C_, 4 + octave 3 + note B_, 4 + note_type 12, 13, 2 + sound_call Music_GiovannisRoom_branch_7e0b5 + octave 3 + note F#, 4 + sound_call Music_GiovannisRoom_branch_7e0b5 + octave 3 + note G_, 4 + sound_call Music_GiovannisRoom_branch_7e0b5 + octave 3 + note A#, 4 + note_type 12, 13, 3 + octave 4 + note E_, 4 + note D#, 4 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note C_, 4 + octave 3 + note B_, 4 + note G_, 4 + note F#, 2 + note_type 12, 13, 6 + note E_, 8 + note F_, 8 + note F#, 8 + note G_, 8 + note_type 12, 13, 2 + sound_call Music_GiovannisRoom_branch_7e0ba + rest 10 + note E_, 1 + rest 1 + sound_call Music_GiovannisRoom_branch_7e0ba + rest 12 + sound_call Music_GiovannisRoom_branch_7e0ba + rest 12 + sound_call Music_GiovannisRoom_branch_7e0ba + rest 14 + note_type 12, 13, 3 + sound_call Music_GiovannisRoom_branch_7e0cd + note D#, 4 + sound_call Music_GiovannisRoom_branch_7e0cd + note D#, 2 + rest 2 + note_type 12, 13, 2 + sound_call Music_GiovannisRoom_branch_7e0c0 + rest 2 + octave 3 + note F#, 4 + octave 2 + note E_, 1 + note E_, 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note C_, 1 + rest 1 + note C#, 1 + rest 1 + note D_, 1 + note C#, 1 + rest 2 + octave 3 + note G_, 4 + sound_call Music_GiovannisRoom_branch_7e0c0 + octave 3 + note A#, 4 + note_type 12, 13, 6 + note B_, 8 + octave 4 + note D#, 8 + note_type 12, 13, 2 + sound_call Music_GiovannisRoom_branch_7e097 + sound_call Music_GiovannisRoom_branch_7e097 + sound_loop 0, Music_GiovannisRoom_branch_7dfeb + +Music_GiovannisRoom_branch_7e097: + octave 2 + note E_, 1 + note E_, 1 + note B_, 1 + octave 3 + note C_, 1 + rest 2 + note C_, 1 + octave 2 + note B_, 1 + note E_, 1 + note E_, 1 + note B_, 1 + octave 3 + note C_, 1 + rest 2 + note C_, 1 + octave 2 + note B_, 1 + sound_ret + +Music_GiovannisRoom_branch_7e0ab: + octave 2 + note E_, 1 + note E_, 1 + rest 2 + octave 1 + note E_, 1 + rest 3 + note E_, 1 + rest 3 + sound_ret + +Music_GiovannisRoom_branch_7e0b5: + octave 2 + note E_, 1 + note E_, 1 + rest 10 + sound_ret + +Music_GiovannisRoom_branch_7e0ba: + octave 1 + note E_, 1 + note G_, 1 + note E_, 1 + note D#, 1 + sound_ret + +Music_GiovannisRoom_branch_7e0c0: + octave 2 + note E_, 1 + note E_, 1 + octave 4 + note E_, 1 + rest 1 + note D#, 1 + rest 1 + note D_, 1 + rest 1 + note C#, 1 + note C_, 1 + sound_ret + +Music_GiovannisRoom_branch_7e0cd: + octave 3 + note E_, 6 + note G_, 6 + note E_, 4 + note A_, 6 + octave 4 + note C_, 6 + octave 3 + note B_, 4 + note G_, 6 + note A#, 6 + note F#, 4 + note E_, 6 + note F#, 6 + sound_ret + +Music_GiovannisRoom_Ch3: + note_type 12, 1, 1 + vibrato 8, 2, 6 + rest 2 + octave 4 + note D_, 1 + note D#, 1 +Music_GiovannisRoom_branch_7e0e5: + sound_call Music_GiovannisRoom_branch_7e140 + sound_call Music_GiovannisRoom_branch_7e140 + octave 5 + note E_, 2 + rest 4 + octave 3 + note E_, 1 + rest 3 + note E_, 1 + rest 1 + octave 4 + note F#, 4 + sound_call Music_GiovannisRoom_branch_7e154 + octave 4 + note G_, 4 + sound_call Music_GiovannisRoom_branch_7e154 + octave 4 + note A_, 4 + note B_, 4 + note A#, 4 + note G_, 4 + note F#, 4 + rest 6 + sound_call Music_GiovannisRoom_branch_7e177 + note B_, 4 + note A#, 4 + note G_, 4 + note F#, 4 + note G_, 4 + note F#, 4 + note E_, 4 + note D#, 4 + sound_call Music_GiovannisRoom_branch_7e15e + rest 12 + sound_call Music_GiovannisRoom_branch_7e15e + rest 12 + sound_call Music_GiovannisRoom_branch_7e15e + rest 10 + note E_, 1 + rest 1 + sound_call Music_GiovannisRoom_branch_7e15e + rest 12 + sound_call Music_GiovannisRoom_branch_7e15e + rest 12 + sound_call Music_GiovannisRoom_branch_7e15e + rest 10 + note D_, 1 + note D#, 1 + sound_call Music_GiovannisRoom_branch_7e164 + sound_call Music_GiovannisRoom_branch_7e164 + note E_, 2 + rest 4 + sound_call Music_GiovannisRoom_branch_7e177 + note B_, 8 + note F#, 6 + note D_, 1 + note D#, 1 + rest 16 + rest 16 + sound_loop 0, Music_GiovannisRoom_branch_7e0e5 + +Music_GiovannisRoom_branch_7e140: + octave 5 + note E_, 4 + note B_, 4 + note A#, 4 + octave 6 + note D_, 4 + note C#, 4 + octave 5 + note G#, 4 + note G_, 4 + note B_, 4 + note A#, 4 + note E_, 4 + note D#, 4 + note A_, 4 + note G#, 4 + note E_, 4 + note F#, 4 + note D#, 4 + sound_ret + +Music_GiovannisRoom_branch_7e154: + octave 6 + note E_, 1 + note E_, 1 + rest 4 + octave 3 + note E_, 1 + rest 3 + note E_, 1 + rest 1 + sound_ret + +Music_GiovannisRoom_branch_7e15e: + octave 3 + note E_, 1 + note G_, 1 + note E_, 1 + note D#, 1 + sound_ret + +Music_GiovannisRoom_branch_7e164: + note E_, 4 + note B_, 4 + note A#, 4 + octave 4 + note D_, 4 + note C#, 4 + octave 3 + note G#, 4 + note G_, 4 + note B_, 4 + note A#, 4 + note E_, 4 + note D#, 4 + note A_, 4 + note G#, 4 + note E_, 4 + note F#, 4 + note D#, 4 + sound_ret + +Music_GiovannisRoom_branch_7e177: + octave 4 + note E_, 1 + rest 3 + note E_, 1 + rest 1 + note F#, 4 + rest 6 + note E_, 1 + rest 3 + note E_, 1 + rest 1 + note G_, 4 + rest 6 + note E_, 1 + rest 3 + note E_, 1 + note E_, 1 + note A#, 4 + sound_ret diff --git a/crysaudio/music_pointers_red.asm b/crysaudio/music_pointers_red.asm index e5bf36e1..e48fa6b7 100644 --- a/crysaudio/music_pointers_red.asm +++ b/crysaudio/music_pointers_red.asm @@ -58,3 +58,4 @@ Music: dba Music_Kinchou01 dba Music_Mewtwo01 dba Music_LegendaryBattle + dba Music_GiovannisRoom diff --git a/data/maps/songs.asm b/data/maps/songs.asm index 47fec6da..f510fc8b 100644 --- a/data/maps/songs.asm +++ b/data/maps/songs.asm @@ -248,7 +248,7 @@ MapSongBanks:: db MUSIC_DUNGEON1, 0 ; BRUNOS_ROOM db MUSIC_POKEMON_TOWER, 0 ; AGATHAS_ROOM db MUSIC_DUNGEON3, 0 ; ROCK_TUNNEL_B1F - db MUSIC_DUNGEON1, 0 ; GIOVANNIS_ROOM + db MUSIC_GIOVANNIS_ROOM, 0 ; GIOVANNIS_ROOM db MUSIC_GYM, 0 ; BATTLE_TENT db MUSIC_VICTORY4, 0 ; MT_MOON_SQUARE db MUSIC_VICTORY4, 0 ; MT_MOON_SQUARE_HOUSE