From 707e3ae7a98426a5d1952ef4f1635d006e7a8d2d Mon Sep 17 00:00:00 2001 From: MementoMartha Date: Thu, 20 Apr 2023 21:28:48 +0100 Subject: [PATCH] Lavenbar Island-Town This is an attempt to recreate the music in the video below. Still unfinished as the new channel isn't in sync. (https://www.youtube.com/watch?v=60toSFxt_Jo&t=59s) --- audio.asm | 1 + constants/music_constants.asm | 1 + crysaudio/music/RBY/lavenbar.asm | 269 +++++++++++++++++++++++++++++++ crysaudio/music_pointers_red.asm | 1 + data/maps/songs.asm | 2 +- 5 files changed, 273 insertions(+), 1 deletion(-) create mode 100644 crysaudio/music/RBY/lavenbar.asm diff --git a/audio.asm b/audio.asm index e86836e1..aa23dcac 100644 --- a/audio.asm +++ b/audio.asm @@ -330,6 +330,7 @@ INCLUDE "crysaudio/music/RBY/lavender.asm" INCLUDE "crysaudio/music/RBY/safarizone.asm" INCLUDE "crysaudio/music/RBY/gym.asm" INCLUDE "crysaudio/music/RBY/pokecenter.asm" +INCLUDE "crysaudio/music/RBY/lavenbar.asm" SECTION "RBY Songs 2", ROMX diff --git a/constants/music_constants.asm b/constants/music_constants.asm index b5cc5f70..12535aa7 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -27,6 +27,7 @@ const MUSIC_ROUTES3 const MUSIC_ROUTES4 const MUSIC_INDIGO_PLATEAU + const MUSIC_LAVENBAR const MUSIC_GYM_LEADER_BATTLE const MUSIC_TRAINER_BATTLE diff --git a/crysaudio/music/RBY/lavenbar.asm b/crysaudio/music/RBY/lavenbar.asm new file mode 100644 index 00000000..dc872111 --- /dev/null +++ b/crysaudio/music/RBY/lavenbar.asm @@ -0,0 +1,269 @@ +Music_Lavenbar:: + channel_count 4 + channel 1, Music_Lavenbar_Ch1 + channel 2, Music_Lavenbar_Ch2 + channel 3, Music_Lavenbar_Ch3 + channel 4, Music_Lavenbar_Ch4 + +Music_Lavenbar_Ch1:: + tempo 152 + volume 7, 7 + duty_cycle 1 + toggle_perfect_pitch + vibrato 0, 8, 8 + note_type 12, 8, 7 + note_type 12, 10, 7 + +Music_Lavenbar_branch_bb6b:: + octave 3 + note G_, 8 + note G_, 8 + note E_, 8 + note E_, 8 + note G_, 4 + note F#, 4 + note E_, 4 + note B_, 4 + note C#, 8 + note C#, 8 + note G_, 8 + note G_, 8 + note F#, 8 + note F#, 8 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + octave 4 + note C_, 8 + note C_, 8 + octave 3 + note G_, 8 + note G_, 8 + note E_, 8 + note E_, 8 + note G_, 4 + note F#, 4 + note E_, 4 + note B_, 4 + note C#, 8 + note C#, 8 + note G_, 8 + note G_, 8 + note F#, 8 + note F#, 8 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + note C_, 8 + note C_, 8 + rest 16 + rest 16 + rest 16 + rest 16 + sound_loop 0, Music_Lavenbar_branch_bb6b + + +Music_Lavenbar_Ch2:: + tempo 144 + volume 7, 7 + duty_cycle 3 + vibrato 12, 3, 4 + toggle_perfect_pitch + +Music_Lavenbar_branch_b878:: + note_type 12, 11, 5 + rest 4 + octave 3 + note D_, 4 + note E_, 6 + note C#, 2 + note_type 12, 11, 1 + note D_, 4 + note_type 12, 11, 5 + note B_, 4 + octave 4 + note C_, 6 + octave 3 + note A_, 2 + note_type 12, 11, 1 + note B_, 4 + note_type 12, 11, 5 + note G_, 4 + note F#, 4 + note E_, 2 + note F#, 2 + note_type 12, 11, 1 + note G_, 4 + note_type 12, 11, 5 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note E_, 4 + note F#, 6 + note A_, 2 + note_type 12, 11, 1 + note G_, 4 + note_type 12, 11, 5 + note B_, 4 + octave 4 + note C_, 6 + octave 3 + note A_, 2 + note B_, 4 + note G_, 4 + note F#, 3 ; <- Starting here is too early... + note E_, 1 ; <- ...and starting here is too late? + note F#, 2 + note A_, 2 + note_type 12, 10, 2 + note G_, 4 + octave 4 + note D_, 1 + note E_, 1 + note D_, 4 + note_type 12, 7, 2 + note D_, 1 + note E_, 1 + note D_, 4 + note_type 12, 10, 7 + octave 3 + note B_, 6 + note G_, 2 + note E_, 8 + octave 4 + note C_, 6 + octave 3 + note A_, 2 + note F#, 8 + octave 4 + note F#, 6 + note D_, 2 + octave 3 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note G_, 8 + note F#, 4 + note E_, 4 + sound_loop 0, Music_Lavenbar_branch_b878 + + +Music_Lavenbar_Ch3:: + vibrato 4, 1, 1 + note_type 12, 3, 15 + note_type 12, 2, 15 + load_wave 2, 1, 14, 2, 3, 3, 2, 8, 14, 1, 2, 2, 15, 15, 14, 10, 1, 0, 1, 4, 13, 12, 1, 0, 14, 3, 4, 1, 5, 1, 7, 3 + +Music_Lavenbar_branch_bbb9:: + octave 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 4 + note_type 12, 3, 15 + octave 6 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + note_type 12, 2, 15 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + octave 7 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + octave 4 + note E_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 4 + note_type 12, 2, 15 + octave 6 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + octave 7 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + octave 8 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + octave 4 + note E_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + sound_loop 0, Music_Lavenbar_branch_bbb9 + + +Music_Lavenbar_Ch4:: + toggle_noise 0 + drum_speed 12 + +Music_Lavenbar_branch_bc26:: + drum_note 7, 8 + drum_note 7, 8 + sound_loop 0, Music_Lavenbar_branch_bc26 diff --git a/crysaudio/music_pointers_red.asm b/crysaudio/music_pointers_red.asm index 7c97cc0c..1049451d 100644 --- a/crysaudio/music_pointers_red.asm +++ b/crysaudio/music_pointers_red.asm @@ -23,6 +23,7 @@ Music: dba Music_Routes3 dba Music_Routes4 dba Music_RBYIndigoPlateau + dba Music_Lavenbar dba Music_GymLeaderBattle dba Music_TrainerBattle dba Music_WildBattle diff --git a/data/maps/songs.asm b/data/maps/songs.asm index ac8a8fc9..eb10a7b6 100644 --- a/data/maps/songs.asm +++ b/data/maps/songs.asm @@ -5,7 +5,7 @@ MapSongBanks:: db MUSIC_CITIES1, 0 ; PEWTER_CITY db MUSIC_CITIES2, 0 ; CERULEAN_CITY db MUSIC_VERMILION, 0 ; VERMILION_CITY - db MUSIC_LAVENDER, 0 ; LAVENDER_TOWN + db MUSIC_LAVENBAR, 0 ; LAVENDER_TOWN db MUSIC_CELADON, 0 ; CELADON_CITY db MUSIC_CELADON, 0 ; CELADON_UNIVERSITY_OUTSIDE db MUSIC_CITIES2, 0 ; FUCHSIA_CITY