diff --git a/audio.asm b/audio.asm index 43c55e0..c538c60 100644 --- a/audio.asm +++ b/audio.asm @@ -165,7 +165,8 @@ INCLUDE "audio/music/NihonTrainerBattle.asm" INCLUDE "audio/music/NorthCity.asm" INCLUDE "audio/music/Tanoby01.asm" INCLUDE "audio/music/mart.asm" - +INCLUDE "audio/music/SepiaCity.asm" +INCLUDE "audio/music/CoralCity.asm" SECTION "Sound Effects", ROMX diff --git a/audio/music/CoralCity.asm b/audio/music/CoralCity.asm new file mode 100644 index 0000000..f1d3dea --- /dev/null +++ b/audio/music/CoralCity.asm @@ -0,0 +1,665 @@ +; Coral City theme +; 4/4 rhythm, composed in D Mixolydian. +; Behold, a harbor town! The wave channel uses a sawtooth waveform, emulating an accordeon(At least I think that's the English name), which works really well in my opinion. +; The Mixolydian scale gives the theme a centered feeling, without going too deep into dramatic territory(As I tend to do with my music, but alas). +; Other than that, this theme, uhhhhh, just sounds harbor-y. I am not sure how to explain it, to be honest. It does invoke the feeling for me and I grew up close to a harbor town, so it checks out in my head! +; Composed by LuciShrimp. + +Music_CoralCity: + channel_count 4 + channel 1, Music_CoralCity_Ch1 + channel 2, Music_CoralCity_Ch2 + channel 3, Music_CoralCity_Ch3 + channel 4, Music_CoralCity_Ch4 + +Music_CoralCity_Ch1: + volume 7, 7 + note_type 12, 12, 7 + duty_cycle 3 + vibrato 13, 1, 3 + tempo 200 + octave 2 + note A_, 8 + note D_, 8 + note A_, 8 + note F#, 8 + note A_, 8 + note G_, 4 + note E_, 4 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + octave 8 +.mainLoop: + octave 2 + volume_envelope 12, 7 + note A_, 8 + note D_, 4 + note E_, 2 + note F#, 1 + note G_, 1 + note A_, 8 + note F#, 4 + note E_, 2 + note F#, 1 + note G_, 1 + note A_, 8 + note G_, 4 + note C_, 1 + note D_, 1 + note E_, 1 + note F#, 1 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note D_, 12 + octave 1 + note G_, 1 + note A_, 1 + note B_, 1 + octave 2 + note C_, 1 + note D_, 4 + note E_, 4 + note D_, 4 + note C_, 2 + octave 1 + note B_, 1 + octave 2 + note C_, 1 + note D_, 12 + note A_, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note E_, 4 + note C_, 4 + note D_, 4 + note G_, 1 + note F#, 1 + note E_, 1 + note D_, 1 + octave 1 + note A_, 8 + note B_, 4 + octave 2 + note D_, 4 + note C_, 8 + note D_, 4 + note F#, 4 + note E_, 8 + note A_, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note D_, 1 + note E_, 8 + note D_, 4 + note D_, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note D_, 12 + octave 1 + note G_, 1 + note A_, 1 + note B_, 1 + octave 2 + note C_, 1 + note D_, 4 + note E_, 4 + note D_, 4 + note C_, 2 + octave 1 + note B_, 1 + octave 2 + note C_, 1 + note D_, 12 + note A_, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note E_, 4 + note C_, 4 + note D_, 4 + note G_, 1 + note F#, 1 + note E_, 1 + note D_, 1 + octave 8 + note_type 12, 15, 8 + sound_loop 0, .mainLoop + +Music_CoralCity_Ch2: + note_type 12, 12, 7 + vibrato 7, 1, 1 + duty_cycle 3 + octave 4 + note D_, 1 + rest 1 + volume_envelope 6, 7 + note D_, 1 + rest 1 + volume_envelope 3, 7 + note D_, 1 + rest 1 + volume_envelope 12, 7 + note C_, 1 + rest 1 + volume_envelope 6, 7 + note C_, 1 + rest 1 + volume_envelope 3, 7 + note C_, 1 + rest 1 + volume_envelope 12, 7 + note E_, 1 + rest 1 + volume_envelope 6, 7 + note E_, 1 + rest 1 + volume_envelope 12, 7 + note D_, 1 + rest 1 + volume_envelope 6, 7 + note D_, 1 + rest 1 + volume_envelope 3, 7 + note D_, 1 + rest 1 + volume_envelope 12, 7 + note C_, 1 + rest 1 + volume_envelope 6, 7 + note C_, 1 + rest 1 + volume_envelope 3, 7 + note C_, 1 + rest 1 + volume_envelope 12, 7 + note G_, 1 + rest 1 + volume_envelope 6, 7 + note G_, 1 + rest 1 + volume_envelope 12, 7 + note F#, 1 + rest 1 + volume_envelope 6, 7 + note F#, 1 + rest 1 + volume_envelope 3, 7 + note F#, 1 + rest 1 + volume_envelope 12, 7 + note D_, 1 + rest 1 + volume_envelope 6, 7 + note D_, 1 + rest 1 + volume_envelope 3, 7 + note D_, 1 + rest 1 + volume_envelope 12, 7 + note F#, 1 + rest 1 + volume_envelope 6, 7 + note F#, 1 + rest 1 + volume_envelope 12, 7 + note E_, 1 + rest 1 + volume_envelope 6, 7 + note E_, 1 + rest 1 + volume_envelope 3, 7 + note E_, 1 + rest 1 + volume_envelope 12, 7 + note G_, 1 + rest 1 + volume_envelope 6, 7 + note G_, 1 + rest 1 + volume_envelope 3, 7 + note G_, 1 + rest 1 + volume_envelope 12, 7 + note A_, 1 + rest 1 + volume_envelope 6, 7 + note A_, 1 + rest 1 + octave 8 +.mainLoop: + octave 4 + volume_envelope 12, 7 + note D_, 6 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + note D_, 4 + note F#, 1 + note E_, 1 + note D_, 2 + note C_, 8 + octave 3 + note A_, 2 + note B_, 2 + octave 4 + note C_, 2 + note D_, 1 + note E_, 1 + note F#, 14 + note E_, 2 + note F#, 8 + note G_, 4 + note F#, 4 + note E_, 6 + note D_, 2 + note E_, 8 + note F#, 14 + note E_, 2 + note F#, 8 + note B_, 1 + note A_, 1 + note G_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note D_, 1 + note E_, 8 + note F#, 4 + note E_, 4 + note G_, 8 + note D_, 2 + note E_, 2 + note F#, 1 + note G_, 1 + note A_, 1 + note B_, 1 + octave 5 + note C_, 8 + octave 4 + note B_, 2 + note A_, 2 + note G_, 1 + note A_, 1 + note G_, 1 + note F#, 1 + note E_, 8 + note D_, 4 + note D_, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note A_, 4 + note B_, 4 + note F#, 2 + note A_, 2 + note F#, 1 + note E_, 1 + note D_, 1 + note C#, 1 + note D_, 8 + note F#, 4 + note E_, 2 + note D_, 1 + note C#, 1 + note D_, 8 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + note D_, 2 + note E_, 4 + note D_, 8 + note_type 8, 12, 7 + note C_, 2 + note D_, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note E_, 2 + note_type 12, 12, 7 + note D_, 8 + note C_, 4 + octave 3 + note B_, 1 + note A_, 1 + note B_, 1 + octave 4 + note C_, 1 + octave 8 + note_type 12, 15, 8 + sound_loop 0, .mainLoop + +Music_CoralCity_Ch3: + note_type 12, 1, 0 + octave 3 + sound_call .sub1 + volume_envelope 1, 4 + note B_, 4 + note A_, 4 + sound_call .sub1 + note_type 12, 1, 4 + octave 3 + note B_, 4 + octave 4 + note D_, 4 + octave 8 +.mainLoop: + octave 3 + sound_call .sub2 + volume_envelope 1, 4 + note B_, 4 + note A_, 4 + sound_call .sub2 + note_type 12, 1, 4 + octave 3 + note B_, 4 + octave 4 + note D_, 4 + octave 3 + sound_call .sub3 + octave 4 + volume_envelope 1, 4 + note D_, 4 + note C_, 4 + octave 3 + sound_call .sub3 + note_type 12, 1, 4 + octave 4 + note D_, 4 + note F#, 4 + octave 3 + sound_call .sub4 + octave 4 + volume_envelope 1, 4 + note E_, 4 + note D_, 4 + octave 3 + sound_call .sub4 + note_type 12, 1, 4 + octave 4 + note E_, 4 + note G_, 4 + octave 3 + sound_call .sub5 + octave 4 + volume_envelope 1, 4 + note D_, 4 + note C_, 4 + octave 3 + sound_call .sub5 + note_type 12, 1, 4 + octave 3 + note B_, 4 + note A_, 2 + note E_, 2 + octave 8 + note_type 12, 1, 0 + sound_loop 0, .mainLoop + +.sub1: + volume_envelope 1, 4 + note D_, 2 + note G_, 2 + note E_, 2 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + note G_, 2 + note F#, 2 + note E_, 4 + note D_, 2 + note G_, 2 + note E_, 2 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + sound_ret + +.sub2: + volume_envelope 1, 4 + note D_, 2 + note G_, 1 + note F#, 1 + note E_, 2 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + note G_, 2 + note F#, 2 + note E_, 2 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + note D_, 2 + note G_, 1 + note F#, 1 + note E_, 2 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + sound_ret + +.sub3: + volume_envelope 1, 4 + note F#, 2 + note B_, 1 + note A_, 1 + note G_, 2 + note D_, 1 + note E_, 1 + note B_, 2 + note A_, 2 + note G_, 2 + note D_, 1 + note E_, 1 + note F#, 2 + note B_, 1 + note A_, 1 + note G_, 2 + note D_, 1 + note E_, 1 + sound_ret + +.sub4: + volume_envelope 1, 4 + note G_, 2 + octave 4 + note C_, 1 + octave 3 + note B_, 1 + note A_, 2 + note E_, 1 + note F#, 1 + octave 4 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + note E_, 1 + note F#, 1 + note G_, 2 + octave 4 + note C_, 1 + octave 3 + note B_, 1 + note A_, 2 + note E_, 1 + note F#, 1 + sound_ret + +.sub5: + volume_envelope 1, 4 + note F#, 2 + note B_, 1 + note A_, 1 + note G_, 2 + note D_, 1 + note E_, 1 + note B_, 2 + note A_, 2 + note G_, 2 + note D_, 1 + note E_, 1 + note F#, 2 + note B_, 1 + note A_, 1 + note G_, 2 + note D_, 1 + note E_, 1 + sound_ret + +Music_CoralCity_Ch4: + toggle_noise 0 + drum_speed 12 + octave 6 + toggle_noise + toggle_noise 3 + drum_note 1, 4 + drum_note 1, 4 + drum_note 1, 3 + octave 5 + drum_note 11, 1 + octave 6 + drum_note 1, 1 + drum_note 1, 3 + drum_note 1, 4 + drum_note 1, 4 + drum_note 1, 3 + octave 5 + drum_note 11, 1 + octave 6 + drum_note 1, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 1 + rest 1 + drum_note 1, 1 + rest 1 + drum_note 1, 1 + rest 1 + octave 5 + drum_note 11, 1 + rest 1 + drum_note 11, 1 + rest 1 + drum_note 11, 1 + rest 1 + octave 6 + drum_note 1, 1 + rest 1 + drum_note 1, 1 + rest 1 + drum_note 1, 1 + rest 1 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 1 + rest 1 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 1 + rest 1 + octave 5 + drum_note 11, 1 + drum_note 11, 1 + octave 6 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 1 + octave 8 +.mainLoop: + octave 5 +.loop1: + drum_note 12, 2 + octave 6 + drum_note 1, 2 + drum_note 1, 2 + octave 5 + drum_note 11, 2 + octave 6 + drum_note 1, 2 + drum_note 1, 2 + octave 5 + drum_note 11, 2 + octave 6 + drum_note 1, 1 + drum_note 1, 1 + octave 5 + drum_note 11, 1 + drum_note 11, 1 + octave 6 + drum_note 1, 2 + drum_note 1, 2 + octave 5 + drum_note 11, 1 + drum_note 11, 1 + octave 6 + drum_note 1, 2 + drum_note 1, 1 + drum_note 1, 1 + octave 5 + drum_note 11, 1 + drum_note 11, 1 + octave 6 + drum_note 1, 1 + drum_speed 6 + drum_note 1, 2 + octave 5 + drum_speed 12 + drum_note 12, 2 + octave 6 + drum_note 1, 1 + drum_note 2, 1 + octave 5 + drum_note 11, 2 + octave 6 + drum_note 1, 1 + drum_note 2, 1 + octave 5 + drum_note 11, 2 + octave 6 + drum_note 1, 1 + drum_note 2, 1 + octave 5 + drum_note 12, 2 + octave 6 + drum_note 1, 1 + drum_note 2, 1 + drum_note 1, 2 + octave 5 + drum_note 12, 2 + octave 6 + drum_note 1, 2 + octave 5 + drum_note 12, 2 + octave 6 + drum_note 1, 2 + octave 5 + drum_note 12, 2 + octave 6 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 1 + octave 5 + sound_loop 4, .loop1 + octave 8 + sound_loop 0, .mainLoop diff --git a/audio/music/SepiaCity.asm b/audio/music/SepiaCity.asm new file mode 100644 index 0000000..4e6b22e --- /dev/null +++ b/audio/music/SepiaCity.asm @@ -0,0 +1,440 @@ +; Sepia City theme +; 4/4 rhythm, composed in A Lydian. +; This theme aims to invoke a similar vibe to the Peaceful route theme, utilizing the same mode(But a different key) and a bit more tempo for a more "towny" sound. +; Getting this one done took me quite a while. I went through countless ideas and temporarily burnt myself out as I did not want this theme to sound too similar to the one on the route next to the city. +; This took me quite a few attempts, but here we are! +; Composed by LuciShrimp. + +Music_SepiaCity: + channel_count 4 + channel 1, Music_SepiaCity_Ch1 + channel 2, Music_SepiaCity_Ch2 + channel 3, Music_SepiaCity_Ch3 + channel 4, Music_SepiaCity_Ch4 + +Music_SepiaCity_Ch1: + volume 7, 7 + note_type 12, 8, 7 + vibrato 24, 2, 4 + tempo 289 + duty_cycle 3 + octave 1 + note A_, 4 + note F#, 4 + octave 2 + note C#, 4 + octave 1 + note B_, 1 + note A_, 1 + note G#, 1 + note F#, 1 + octave 8 +.mainLoop: + octave 1 + volume_envelope 7, 7 + vibrato 24, 2, 4 + duty_cycle 1 + tempo 289 + note A_, 6 + note B_, 1 + octave 2 + note C#, 1 + note F#, 8 + octave 1 + note A_, 6 + note B_, 1 + octave 2 + note C#, 1 + note F#, 4 + note E_, 4 + note C#, 6 + octave 1 + note B_, 6 + note A_, 4 + octave 2 + note C#, 6 + note E_, 1 + note F#, 1 + note G#, 2 + note A_, 2 + note D#, 2 + note E_, 2 + octave 1 + note A_, 6 + note B_, 1 + octave 2 + note C#, 1 + note F#, 4 + note E_, 4 + octave 1 + note A_, 6 + note B_, 1 + octave 2 + note C#, 1 + note F#, 2 + note G#, 2 + note E_, 2 + note D#, 2 + note C#, 6 + note E_, 1 + note F#, 1 + note G#, 8 + note C#, 6 + note E_, 1 + note F#, 1 + note G#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + sound_call .sub1 + octave 2 + volume_envelope 7, 7 + vibrato 24, 2, 4 + duty_cycle 1 + tempo 289 + note E_, 4 + note C#, 2 + note D#, 1 + note E_, 1 + note F#, 8 + sound_call .sub1 + note_type 12, 7, 7 + octave 2 + vibrato 24, 2, 4 + duty_cycle 1 + tempo 289 + note E_, 4 + note C#, 2 + note D#, 1 + note E_, 1 + note F#, 3 + note D#, 1 + octave 1 + note B_, 2 + note G#, 2 + octave 8 + note_type 12, 15, 8 + sound_loop 0, .mainLoop + +.sub1: + octave 2 + volume_envelope 7, 7 + vibrato 24, 2, 4 + duty_cycle 1 + tempo 289 + note E_, 4 + note C#, 2 + note E_, 1 + note F#, 1 + note A_, 4 + note G#, 4 + octave 3 + sound_ret + +Music_SepiaCity_Ch2: + note_type 12, 10, 6 + vibrato 20, 2, 4 + duty_cycle 3 + octave 3 + note C#, 4 + octave 2 + note A_, 4 + note B_, 4 + note G#, 1 + note F#, 1 + note E_, 1 + note D#, 1 + octave 8 +.mainLoop: + volume_envelope 10, 7 + vibrato 20, 2, 4 + duty_cycle 1 + octave 2 + note E_, 6 + note F#, 2 + note G#, 4 + note C#, 2 + note E_, 1 + note F#, 1 + note A_, 2 + octave 3 + note F#, 1 + note E_, 1 + note D#, 1 + note C#, 1 + octave 2 + note B_, 2 + octave 3 + note C#, 4 + octave 2 + note A_, 4 + note G#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + note F#, 6 + note B_, 4 + note E_, 1 + note D#, 1 + octave 1 + note B_, 1 + octave 2 + note D#, 1 + note E_, 2 + note G#, 1 + note B_, 1 + note E_, 2 + note D#, 1 + note F#, 1 + note G#, 4 + note E_, 6 + note D#, 6 + note C#, 2 + note E_, 1 + note F#, 1 + note A_, 2 + note G#, 1 + note A_, 1 + note B_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 4 + octave 3 + note E_, 1 + octave 2 + note B_, 1 + octave 3 + note C#, 1 + octave 2 + note F#, 1 + note A_, 1 + note F#, 1 + note G#, 6 + note F#, 6 + note B_, 4 + note G#, 6 + note F#, 6 + note G#, 4 + note B_, 4 + note G#, 1 + note A_, 1 + note B_, 6 + note A_, 1 + note G#, 1 + note F#, 2 + note G#, 4 + note A_, 1 + note B_, 1 + octave 3 + note C#, 6 + octave 2 + note B_, 2 + note A_, 2 + note G#, 4 + note F#, 1 + note A_, 1 + note B_, 6 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + octave 3 + note C#, 1 + note D#, 1 + note E_, 4 + octave 2 + note B_, 2 + octave 3 + note C#, 4 + octave 2 + note B_, 2 + note A_, 1 + note F#, 1 + note E_, 1 + note D#, 1 + octave 8 + note_type 12, 15, 8 + sound_loop 0, .mainLoop + +Music_SepiaCity_Ch3: + note_type 12, 1, 1 + vibrato 22, 2, 4 + rest 16 + octave 8 +.mainLoop: + octave 4 + sound_call .sub1 + vibrato 22, 2, 4 + volume_envelope 1, 1 + octave 5 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 + octave 4 + note B_, 6 + octave 5 + note D#, 1 + note C#, 1 + octave 4 + note B_, 6 + octave 5 + note C#, 1 + octave 4 + note B_, 1 + note A_, 6 + note G#, 1 + note B_, 1 + octave 5 + note C#, 2 + note D#, 1 + note C#, 1 + note D#, 2 + octave 4 + note B_, 1 + note G#, 1 + sound_call .sub1 + note_type 12, 1, 1 + vibrato 22, 2, 4 + octave 5 + note G#, 1 + note E_, 1 + note F#, 1 + note D#, 1 + note E_, 1 + note C#, 1 + note D#, 1 + octave 4 + note B_, 1 + octave 5 + note E_, 6 + note D#, 1 + note C#, 1 + octave 4 + note B_, 6 + octave 5 + note C#, 1 + octave 4 + note B_, 1 + octave 5 + note D#, 6 + octave 4 + note G#, 1 + note B_, 1 + octave 5 + note C#, 2 + note D#, 2 + note C#, 2 + octave 4 + note A_, 2 + note B_, 6 + octave 5 + note E_, 1 + note D#, 1 + note C#, 4 + octave 4 + note B_, 2 + octave 5 + note C#, 2 + note D#, 4 + note C#, 2 + note D#, 2 + note E_, 4 + note D#, 1 + note C#, 1 + octave 4 + note B_, 1 + note A_, 1 + note B_, 4 + note A_, 4 + octave 5 + note C#, 4 + octave 4 + note B_, 4 + note G#, 8 + note A_, 4 + note G#, 4 + octave 8 + sound_loop 0, .mainLoop + +.sub1: + vibrato 22, 2, 4 + volume_envelope 1, 1 + octave 4 + note A_, 2 + note B_, 2 + note G#, 2 + note A_, 2 + octave 5 + note C#, 1 + octave 4 + note B_, 3 + octave 5 + note E_, 1 + note D#, 3 + note F#, 8 + octave 4 + sound_ret + +Music_SepiaCity_Ch4: + toggle_noise 0 + drum_speed 12 + octave 6 + toggle_noise + toggle_noise 3 + drum_note 9, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 9, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 9, 1 + drum_note 2, 1 + drum_note 9, 1 + drum_note 1, 1 + drum_note 9, 1 + drum_note 9, 1 + drum_note 9, 1 + drum_note 9, 1 + octave 8 +.mainLoop: + octave 6 + toggle_noise + toggle_noise 3 +.loop1: + drum_note 9, 2 + drum_note 2, 1 + drum_note 9, 1 + drum_note 9, 2 + drum_note 3, 2 + drum_note 9, 2 + drum_note 2, 1 + drum_note 9, 1 + drum_note 9, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 1 + sound_loop 8, .loop1 +.loop2: + drum_note 9, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 9, 1 + drum_note 9, 2 + drum_note 3, 2 + drum_note 9, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 9, 1 + drum_note 9, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 1 + sound_loop 4, .loop2 + drum_speed 12 + octave 8 + sound_loop 0, .mainLoop diff --git a/audio/music_pointers.asm b/audio/music_pointers.asm index 3a7adf0..f3e6c02 100644 --- a/audio/music_pointers.asm +++ b/audio/music_pointers.asm @@ -120,4 +120,6 @@ Music: dba Music_NorthCity dba Music_Tanoby01 dba Music_Mart + dba Music_CoralCity + dba Music_SepiaCity assert_table_length NUM_MUSIC_SONGS diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 58890a5..0b391a1 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -118,6 +118,8 @@ const MUSIC_NORTHCITY ; 71 const MUSIC_TANOBY01 ; 72 const MUSIC_MART ; 74 + const MUSIC_CORALCITY ; 75 + const MUSIC_SEPIACITY ; 76 DEF NUM_MUSIC_SONGS EQU const_value ; GetMapMusic picks music for this value (see home/map.asm) diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 6f6d6e4..6a0b4c2 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -715,7 +715,7 @@ MapGroup_SilentHills: MapGroup_OldCity: table_width MAP_LENGTH, MapGroup_OldCity - map OldCity, TILESET_NIHON_OLD, TOWN, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, TRUE, PALETTE_AUTO, FISHGROUP_POND + map OldCity, TILESET_NIHON_OLD, TOWN, LANDMARK_OLD_CITY, MUSIC_SEPIACITY, TRUE, PALETTE_AUTO, FISHGROUP_POND map OldCityPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_OLD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_NONE map OldMart, TILESET_NIHON_MART, INDOOR, LANDMARK_OLD_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_NONE map HoneyGrandmasHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE @@ -742,7 +742,7 @@ MapGroup_SavoyCity: MapGroup_CoralCity: table_width MAP_LENGTH, MapGroup_CoralCity - map CoralCity, TILESET_NIHON_HIGHTECH, TOWN, LANDMARK_CORAL_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map CoralCity, TILESET_NIHON_HIGHTECH, TOWN, LANDMARK_CORAL_CITY, MUSIC_CORALCITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map CoralCityPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_CORAL_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_NONE map CoralMart, TILESET_NIHON_MART, INDOOR, LANDMARK_CORAL_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_NONE map Route51, TILESET_NIHON_HIGHTECH, ROUTE, LANDMARK_ROUTE_51, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE