From 81dd4d64d0b18819aa35e6c7225d66bd960fc7e6 Mon Sep 17 00:00:00 2001
From: LuciShrimp <gruenrosablau123@googlemail.com>
Date: Sun, 18 Aug 2024 15:45:05 +0200
Subject: [PATCH] First new music batch (#31)

* First new music batch

First batch of original themes:
- Birdon theme
- WIP Desert type theme
- Funky theme(Maybe)
- Upbeat route theme
- Calm route theme
- TowerThing theme(Navel Rock?)
- South City theme

* Create lavendercrypt.asm

* JEP Themes with finished descriptions

* New Music - Constants

Added the new tracks to audio.asm and music_constants.asm

* And the music pointers(Silly mode)

Okay, now *this* should do the trick!

* AAAAAAAAAA

EEEEEEEEE
---
 audio.asm                     |   5 +
 audio/music/CoastTown.asm     | 960 ++++++++++++++++++++++++++++++++++
 audio/music/NihonTime.asm     | 471 +++++++++++++++++
 audio/music/Peaceful.asm      | 392 ++++++++++++++
 audio/music/SouthCity.asm     | 741 ++++++++++++++++++++++++++
 audio/music/lavendercrypt.asm | 712 +++++++++++++++++++++++++
 audio/music_pointers.asm      |   5 +
 audio/wave_samples.asm        |   6 +
 constants/music_constants.asm |   5 +
 9 files changed, 3297 insertions(+)
 create mode 100644 audio/music/CoastTown.asm
 create mode 100644 audio/music/NihonTime.asm
 create mode 100644 audio/music/Peaceful.asm
 create mode 100644 audio/music/SouthCity.asm
 create mode 100644 audio/music/lavendercrypt.asm

diff --git a/audio.asm b/audio.asm
index c6ab9f3..b21ad8e 100644
--- a/audio.asm
+++ b/audio.asm
@@ -154,6 +154,11 @@ SECTION "New Songs", ROMX
 
 INCLUDE "audio/music/nihontest.asm"
 INCLUDE "audio/music/sinjohsample.asm"
+INCLUDE "audio/music/lavendercrypt.asm"
+INCLUDE "audio/music/nihontime.asm"
+INCLUDE "audio/music/southcity.asm"
+INCLUDE "audio/music/peaceful.asm"
+INCLUDE "audio/music/coasttown.asm"
 
 
 SECTION "Sound Effects", ROMX
diff --git a/audio/music/CoastTown.asm b/audio/music/CoastTown.asm
new file mode 100644
index 0000000..18c398e
--- /dev/null
+++ b/audio/music/CoastTown.asm
@@ -0,0 +1,960 @@
+; Birdon theme
+; 11/4 rhythm, composed in D Dorian
+; An upbeat city theme, using staccato backing notes on Channel 2. The drum pattern is very simple and mainly here for stability of the soundscape.
+; Channel 1 uses a quick staircase note pattern in some places as to emulate hammer-ons. 
+; The intro part is identical to the last section of the loop, except for the more intricate drum pattern.
+; Composed by LuciShrimp
+
+Music_CoastTown:
+	channel_count 4
+	channel 1, Music_CoastTown_Ch1
+	channel 2, Music_CoastTown_Ch2
+	channel 3, Music_CoastTown_Ch3
+	channel 4, Music_CoastTown_Ch4
+
+Music_CoastTown_Ch1:
+	volume 7, 7
+	note_type 12, 11, 4
+	vibrato 18, 2, 3
+	duty_cycle 1
+	tempo 140
+	octave 3
+	note A_, 4
+	octave 4
+	note C_, 4
+	octave 3
+	note B_, 2
+	note A_, 2
+	note G_, 8
+	note A_, 4
+	note B_, 4
+	note A_, 4
+	note B_, 2
+	note G_, 2
+	note F_, 4
+	note G_, 4
+	note B_, 4
+	note A_, 4
+	octave 4
+	note D_, 2
+	octave 3
+	note B_, 2
+	octave 4
+	note C_, 4
+	note D_, 4
+	note E_, 2
+	note F_, 2
+	note G_, 4
+	note F_, 4
+	note E_, 4
+	note D_, 4
+	note E_, 2
+	note F_, 2
+	octave 8
+.mainLoop:
+	duty_cycle 1
+	vibrato 18, 2, 3
+	tempo 140
+	note_type 12, 11, 4
+	octave 4
+	note G_, 4
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note_type 6, 11, 4
+	note C#, 1
+	note_type 12, 11, 4
+	note D_, 7
+	note_type 6, 11, 4
+	rest 1
+	note_type 12, 11, 4
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note D_, 4
+	note C_, 2
+	note F_, 4
+	note G_, 4
+	note F_, 4
+	note_type 6, 11, 4
+	note D#, 1
+	note_type 12, 11, 4
+	note E_, 11
+	note_type 6, 11, 4
+	rest 1
+	note C#, 1
+	note_type 12, 11, 4
+	note D_, 11
+	note_type 6, 11, 4
+	rest 1
+	note_type 12, 11, 4
+	note C_, 12
+	note_type 6, 11, 4
+	note C#, 1
+	note_type 12, 11, 4
+	note D_, 7
+	note_type 6, 11, 4
+	rest 1
+	note_type 12, 11, 4
+	note C_, 16
+	rest 8
+	octave 3
+	note B_, 12
+	note_type 14, 11, 4
+	note A_, 6
+	note_type 6, 11, 4
+	note A_, 1
+	note B_, 1
+	octave 4
+	note_type 15, 11, 4
+	note C_, 16
+	rest 3
+	note_type 3, 11, 4
+	rest 1
+	note_type 12, 11, 4
+	note D_, 4
+	note F_, 4
+	note E_, 4
+	octave 3
+	note B_, 8
+	octave 4
+	note C_, 12
+	note D_, 12
+	note C_, 12
+	note D_, 8
+	note_type 6, 11, 4
+	note D#, 1
+	note_type 12, 11, 4
+	note E_, 16
+	rest 1
+	note_type 6, 11, 4
+	rest 1
+	note_type 12, 11, 4
+	note D_, 6
+	note_type 6, 11, 4
+	note D#, 1
+	note_type 12, 11, 4
+	note E_, 16
+	rest 3
+	note_type 6, 11, 4
+	rest 1
+	octave 3
+	note_type 12, 11, 4
+	sound_call .sub1
+	note_type 12, 11, 4
+	sound_loop 0, .mainLoop
+
+.sub1:
+	octave 3
+	note A_, 4
+	octave 4
+	note C_, 4
+	octave 3
+	note B_, 2
+	note A_, 2
+	note G_, 8
+	note A_, 4
+	note B_, 4
+	note A_, 4
+	note B_, 2
+	note G_, 2
+	note F_, 4
+	note G_, 4
+	note B_, 4
+	note A_, 4
+	octave 4
+	note D_, 2
+	octave 3
+	note B_, 2
+	octave 4
+	note C_, 4
+	note D_, 4
+	note E_, 2
+	note F_, 2
+	note G_, 4
+	note F_, 4
+	note E_, 4
+	note D_, 4
+	note E_, 2
+	note F_, 2
+	sound_ret
+
+Music_CoastTown_Ch2:
+	note_type 12, 2, 1
+	vibrato 18, 2, 3
+	duty_cycle 2
+	octave 2
+	note A_, 2
+	note_type 6, 1, 1
+	note A_, 2
+	note_type 1, 4, 1
+	rest 12
+	note_type 12, 2, 1
+	octave 3
+	note C_, 2
+	note_type 6, 1, 1
+	note C_, 2
+	note_type 1, 4, 1
+	rest 12
+	note_type 12, 2, 1
+	octave 2
+	note B_, 2
+	note_type 6, 1, 1
+	note A_, 2
+	note_type 1, 4, 1
+	rest 12
+	note_type 12, 2, 1
+	note G_, 2
+	note_type 6, 1, 1
+	note G_, 2
+	note_type 1, 4, 1
+	rest 12
+	note_type 12, 2, 1
+	note G_, 2
+	note_type 6, 1, 1
+	note G_, 2
+	note_type 1, 4, 1
+	rest 12
+	note_type 12, 2, 1
+	note A_, 2
+	note_type 6, 1, 1
+	note A_, 2
+	note_type 1, 4, 1
+	rest 12
+	note_type 12, 2, 1
+	note B_, 2
+	note_type 6, 1, 1
+	note B_, 2
+	note_type 1, 4, 1
+	rest 12
+	note_type 12, 2, 1
+	note A_, 2
+	note_type 6, 1, 1
+	note A_, 2
+	note_type 1, 4, 1
+	rest 12
+	note_type 12, 2, 1
+	note B_, 2
+	note_type 6, 1, 1
+	note G_, 2
+	note_type 1, 4, 1
+	rest 12
+	note_type 12, 2, 1
+	note A_, 2
+	octave 3
+	note_type 6, 1, 1
+	note C_, 2
+	note_type 1, 4, 1
+	rest 12
+	note_type 12, 2, 1
+	octave 2
+	note A_, 2
+	octave 3
+	note_type 6, 1, 1
+	note E_, 2
+	note_type 1, 4, 1
+	rest 12
+	note_type 12, 2, 1
+	note C_, 2
+	note_type 6, 1, 1
+	note C_, 2
+	note_type 1, 4, 1
+	rest 12
+	note_type 12, 4, 1
+	note E_, 2
+	note_type 6, 2, 1
+	note E_, 2
+	note_type 1, 4, 1
+	rest 12
+	note_type 12, 4, 1
+	note G_, 2
+	note_type 6, 2, 1
+	note G_, 2
+	note_type 1, 4, 1
+	rest 12
+	note_type 12, 4, 1
+	note E_, 2
+	note_type 6, 2, 1
+	note E_, 2
+	note_type 1, 4, 1
+	rest 12
+	note_type 12, 4, 1
+	note G_, 2
+	note_type 6, 2, 1
+	note G_, 2
+	note_type 1, 4, 1
+	rest 12
+	note_type 12, 4, 1
+	note B_, 2
+	note_type 6, 2, 1
+	note G_, 2
+	note_type 1, 4, 1
+	rest 12
+	note_type 12, 4, 1
+	note D_, 2
+	note_type 6, 2, 1
+	note D_, 2
+	note_type 1, 4, 1
+	rest 12
+	note_type 12, 6, 1
+	note F_, 2
+	note_type 6, 3, 1
+	note F_, 2
+	note_type 1, 4, 1
+	rest 12
+	note_type 12, 6, 1
+	note A_, 2
+	note_type 6, 3, 1
+	note A_, 2
+	note_type 1, 4, 1
+	rest 12
+	note_type 12, 6, 1
+	note D_, 2
+	note_type 6, 3, 1
+	note G_, 2
+	note_type 1, 4, 1
+	rest 12
+	note_type 12, 7, 1
+	note D_, 2
+	note_type 6, 3, 1
+	octave 2
+	note B_, 2
+	note_type 1, 4, 1
+	rest 12
+	note_type 12, 4, 1
+	octave 8
+.mainLoop:
+	vibrato 18, 2, 3
+	duty_cycle 2
+	octave 3
+	volume_envelope 8, 1
+	note D_, 2
+	volume_envelope 4, 1
+	note D_, 2
+	volume_envelope 8, 1
+	note F_, 2
+	volume_envelope 4, 1
+	note F_, 2
+	volume_envelope 8, 1
+	note A_, 2
+	volume_envelope 4, 1
+	note A_, 2
+	volume_envelope 8, 1
+	note C_, 2
+	volume_envelope 4, 1
+	note C_, 2
+	volume_envelope 8, 1
+	note F_, 2
+	volume_envelope 4, 1
+	note F_, 2
+	volume_envelope 8, 1
+	note A_, 2
+	volume_envelope 4, 1
+	note F_, 2
+	volume_envelope 8, 1
+	note C_, 2
+	volume_envelope 4, 1
+	note C_, 2
+	volume_envelope 8, 1
+	note E_, 2
+	volume_envelope 4, 1
+	note E_, 2
+	volume_envelope 8, 1
+	note G_, 2
+	volume_envelope 4, 1
+	note G_, 2
+	volume_envelope 8, 1
+	octave 2
+	note A_, 2
+	octave 3
+	volume_envelope 4, 1
+	note C_, 2
+	volume_envelope 8, 1
+	octave 2
+	note A_, 2
+	octave 3
+	volume_envelope 4, 1
+	note E_, 2
+	volume_envelope 8, 1
+	note C_, 2
+	volume_envelope 4, 1
+	note C_, 2
+	volume_envelope 8, 1
+	note E_, 2
+	volume_envelope 4, 1
+	note E_, 2
+	volume_envelope 8, 1
+	note G_, 2
+	volume_envelope 4, 1
+	note G_, 2
+	volume_envelope 8, 1
+	note E_, 2
+	volume_envelope 4, 1
+	note E_, 2
+	volume_envelope 8, 1
+	note G_, 2
+	volume_envelope 4, 1
+	note G_, 2
+	volume_envelope 8, 1
+	note B_, 2
+	volume_envelope 4, 1
+	note G_, 2
+	note D_, 2
+	note D_, 2
+	note F_, 2
+	note F_, 2
+	note A_, 2
+	note A_, 2
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note B_, 2
+	note C_, 2
+	note C_, 2
+	note E_, 2
+	note E_, 2
+	note G_, 2
+	note G_, 2
+	note C_, 2
+	note C_, 2
+	note E_, 2
+	note E_, 2
+	note G_, 2
+	note G_, 2
+	octave 2
+	note B_, 2
+	note B_, 2
+	octave 3
+	note E_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note D_, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note F_, 2
+	note C_, 2
+	note C_, 2
+	note E_, 2
+	note E_, 2
+	note G_, 2
+	note G_, 2
+	note C_, 2
+	note C_, 2
+	note E_, 2
+	note E_, 2
+	note G_, 2
+	note G_, 2
+	octave 2
+	note B_, 2
+	note B_, 2
+	octave 3
+	note E_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note D_, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note F_, 2
+	note C_, 2
+	note C_, 2
+	note E_, 2
+	note E_, 2
+	note A_, 2
+	note A_, 2
+	note F_, 2
+	note F_, 2
+	note D_, 2
+	note D_, 2
+	octave 2
+	note B_, 2
+	note B_, 2
+	octave 3
+	note E_, 2
+	note E_, 2
+	note G_, 2
+	note G_, 2
+	note E_, 2
+	note E_, 2
+	note D_, 2
+	note F_, 2
+	note A_, 2
+	note F_, 2
+	note E_, 2
+	note E_, 2
+	note G_, 2
+	note G_, 2
+	note B_, 2
+	note B_, 2
+	note G_, 2
+	note G_, 2
+	note E_, 2
+	note E_, 2
+	note A_, 2
+	note A_, 2
+	note B_, 2
+	note B_, 2
+	note G_, 2
+	note G_, 2
+	note E_, 2
+	note E_, 2
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note E_, 2
+	octave 2
+	note A_, 2
+	note A_, 2
+	octave 3
+	note C_, 2
+	note C_, 2
+	octave 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note G_, 2
+	note G_, 2
+	note G_, 2
+	note A_, 2
+	note A_, 2
+	note B_, 2
+	note B_, 2
+	note A_, 2
+	note A_, 2
+	note B_, 2
+	note G_, 2
+	note A_, 2
+	octave 3
+	note C_, 2
+	octave 2
+	note A_, 2
+	octave 3
+	note E_, 2
+	note C_, 2
+	note C_, 2
+	note E_, 2
+	note E_, 2
+	note G_, 2
+	note G_, 2
+	note E_, 2
+	note E_, 2
+	note G_, 2
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note D_, 2
+	note D_, 2
+	note F_, 2
+	note F_, 2
+	note A_, 2
+	note A_, 2
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note_type 12, 4, 1
+	sound_loop 0, .mainLoop
+
+Music_CoastTown_Ch3:
+	note_type 12, 2, 5
+	vibrato 6, 2, 6
+	octave 3
+	note D_, 2
+	rest 4
+	note G_, 2
+	note A_, 2
+	note F_, 2
+	octave 2
+	note A#, 2
+	octave 3
+	rest 4
+	note D_, 2
+	note F_, 2
+	note A_, 2
+	note G_, 2
+	rest 2
+	note G_, 2
+	rest 2
+	note C_, 2
+	note E_, 2
+	note F_, 2
+	rest 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	rest 2
+	note C_, 2
+	rest 2
+	note G_, 2
+	note E_, 2
+	octave 2
+	note B_, 2
+	octave 3
+	rest 2
+	note D_, 2
+	rest 2
+	note E_, 2
+	note G_, 2
+	note D_, 2
+	rest 2
+	note D_, 2
+	rest 2
+	note F_, 2
+	note G_, 2
+	note A_, 2
+	rest 2
+	note G_, 2
+	note F_, 2
+	octave 8
+.mainLoop:
+	vibrato 6, 2, 6
+	octave 3
+	volume_envelope 2, 5
+	note D_, 2
+	rest 2
+	note D_, 2
+	rest 2
+	note A_, 2
+	note F_, 2
+	note C_, 2
+	rest 2
+	note C_, 2
+	rest 2
+	note F_, 2
+	note A_, 2
+	note G_, 2
+	rest 2
+	note G_, 2
+	rest 2
+	note C_, 2
+	note E_, 2
+	note F_, 2
+	rest 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	rest 2
+	note C_, 2
+	rest 2
+	note G_, 2
+	note E_, 2
+	octave 2
+	note B_, 2
+	rest 2
+	note B_, 2
+	octave 3
+	note D_, 2
+	note G_, 2
+	note E_, 2
+	note D_, 2
+	rest 2
+	note D_, 2
+	rest 2
+	note F_, 2
+	note G_, 2
+	note A_, 2
+	rest 2
+	note G_, 2
+	note D_, 2
+	note C_, 4
+	note E_, 8
+	note C_, 4
+	note G_, 4
+	octave 4
+	note C_, 4
+	octave 2
+	note B_, 4
+	octave 3
+	note E_, 8
+	octave 2
+	note B_, 2
+	octave 3
+	note D_, 2
+	note F_, 2
+	note B_, 2
+	note C_, 4
+	note E_, 4
+	octave 4
+	note C_, 4
+	octave 3
+	note G_, 8
+	note E_, 2
+	note C_, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note G_, 2
+	note E_, 8
+	note F_, 2
+	note D_, 2
+	octave 2
+	note B_, 4
+	octave 3
+	note C_, 4
+	note E_, 4
+	note A_, 2
+	note E_, 2
+	octave 2
+	note B_, 4
+	octave 3
+	note D_, 4
+	note F_, 2
+	note D_, 2
+	note C_, 4
+	note E_, 4
+	note G_, 2
+	note E_, 2
+	note D_, 4
+	note A_, 2
+	note F_, 2
+	note E_, 4
+	note G_, 8
+	note B_, 4
+	note A_, 4
+	note G_, 4
+	note E_, 4
+	note G_, 8
+	note E_, 4
+	note B_, 2
+	note G_, 2
+	sound_call .sub1
+	note_type 12, 2, 5
+	sound_loop 0, .mainLoop
+
+.sub1:
+	octave 3
+	volume_envelope 2, 5
+	note D_, 2
+	rest 4
+	note G_, 2
+	note A_, 2
+	note F_, 2
+	octave 2
+	note A#, 2
+	octave 3
+	rest 4
+	note D_, 2
+	note F_, 2
+	note A_, 2
+	note G_, 2
+	rest 2
+	note G_, 2
+	rest 2
+	note C_, 2
+	note E_, 2
+	note F_, 2
+	rest 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	rest 2
+	note C_, 2
+	rest 2
+	note G_, 2
+	note E_, 2
+	octave 2
+	note B_, 2
+	octave 3
+	rest 2
+	note D_, 2
+	rest 2
+	note E_, 2
+	note G_, 2
+	note D_, 2
+	rest 2
+	note D_, 2
+	rest 2
+	note F_, 2
+	note G_, 2
+	note A_, 2
+	rest 2
+	note G_, 2
+	note F_, 2
+	sound_ret
+
+Music_CoastTown_Ch4:
+	toggle_noise 0
+	drum_speed 12
+	octave 5
+	drum_note 8, 1
+	rest 3
+	drum_note 6, 1
+	rest 3
+	drum_note 6, 1
+	rest 3
+	drum_note 8, 1
+	rest 3
+	drum_note 6, 1
+	rest 3
+	drum_note 6, 1
+	rest 3
+	drum_note 8, 1
+	rest 3
+	drum_note 6, 1
+	rest 3
+	drum_note 6, 1
+	rest 3
+	drum_note 8, 1
+	rest 3
+	drum_note 6, 1
+	rest 1
+	drum_note 6, 1
+	rest 1
+	drum_note 8, 1
+	rest 3
+	drum_note 6, 1
+	rest 3
+	drum_note 6, 1
+	rest 3
+	drum_note 8, 1
+	rest 3
+	drum_note 6, 1
+	rest 3
+	drum_note 6, 1
+	rest 1
+	drum_note 6, 1
+	rest 1
+	drum_note 8, 1
+	rest 3
+	drum_note 6, 1
+	rest 3
+	drum_note 6, 1
+	rest 3
+	drum_note 8, 1
+	rest 1
+	drum_note 6, 1
+	rest 1
+	drum_note 6, 1
+	rest 1
+	drum_note 6, 1
+	drum_note 6, 1
+	octave 8
+.mainLoop:
+	toggle_noise
+	toggle_noise 2
+	octave 5
+.loop1:
+.loop2:
+	sound_call .sub1
+	rest 1
+	sound_loop 2, .loop2
+.loop3:
+	drum_note 2, 1
+	rest 3
+	drum_note 8, 1
+	rest 3
+	drum_note 8, 1
+	rest 3
+	drum_note 2, 1
+	rest 3
+	drum_note 8, 1
+	rest 1
+	drum_note 8, 1
+	rest 1
+	drum_note 8, 1
+	rest 3
+	drum_note 2, 1
+	rest 3
+	drum_note 8, 1
+	rest 3
+	drum_note 8, 1
+	rest 3
+	drum_note 2, 1
+	rest 3
+	drum_note 8, 1
+	rest 1
+	drum_note 8, 1
+	rest 1
+	drum_note 2, 1
+	rest 3
+	drum_note 8, 1
+	rest 1
+	drum_note 8, 1
+	rest 1
+	drum_note 8, 1
+	rest 3
+	drum_note 2, 1
+	rest 3
+	drum_note 8, 1
+	rest 1
+	drum_note 8, 1
+	rest 1
+	drum_note 8, 1
+	rest 1
+	drum_note 8, 1
+	rest 1
+	drum_note 2, 1
+	rest 3
+	drum_note 8, 1
+	rest 1
+	drum_note 8, 1
+	rest 1
+	drum_note 8, 1
+	rest 3
+	drum_note 2, 1
+	rest 1
+	drum_note 8, 1
+	rest 1
+	drum_note 8, 1
+	rest 1
+	drum_note 8, 1
+	drum_note 6, 1
+	sound_loop 2, .loop3
+	sound_call .sub1
+	drum_speed 12
+	rest 1
+	sound_call .sub1
+	drum_speed 12
+	rest 1
+	octave 5
+	sound_loop 0, .mainLoop
+
+.sub1:
+	drum_note 2, 1
+	rest 3
+	drum_note 8, 1
+	rest 1
+	drum_note 6, 1
+	rest 1
+	drum_note 8, 1
+	rest 3
+	octave 6
+	drum_note 3, 1
+	rest 3
+	octave 5
+	drum_note 8, 1
+	rest 1
+	drum_note 6, 1
+	rest 1
+	drum_note 8, 1
+	rest 3
+	octave 6
+	drum_note 3, 1
+	rest 3
+	octave 5
+	drum_note 8, 1
+	rest 1
+	drum_note 6, 1
+	rest 1
+	drum_note 8, 1
+	rest 3
+	octave 6
+	drum_note 3, 1
+	rest 3
+	octave 5
+	drum_note 8, 1
+	rest 1
+	drum_note 8, 1
+	sound_ret
diff --git a/audio/music/NihonTime.asm b/audio/music/NihonTime.asm
new file mode 100644
index 0000000..6535658
--- /dev/null
+++ b/audio/music/NihonTime.asm
@@ -0,0 +1,471 @@
+; Nihon Route theme
+; 4/4 rhythm, composed in C# Mixolydian.
+; An upbeat generic route theme, loosely inspired by the intro theme song of the Johto Journeys anime.
+; The relatively high BPM(read: low Tempo value) along with the fast drums gives the theme an adventurous feel.
+; The drums are quite fast in the latter half of the track to give it more of a forward push.
+; Composed by LuciShrimp
+
+Music_NihonTime:
+	channel_count 4
+	channel 1, Music_NihonTime_Ch1
+	channel 2, Music_NihonTime_Ch2
+	channel 3, Music_NihonTime_Ch3
+	channel 4, Music_NihonTime_Ch4
+
+Music_NihonTime_Ch1:
+	tempo 256
+	volume 7, 7
+	note_type 12, 15, 8
+.mainLoop:
+	tempo 160
+	duty_cycle 2
+	volume_envelope 10, 4
+	octave 3
+	note G#, 4
+	note F_, 2
+	note D#, 2
+	note F#, 4
+	note F_, 4
+	note A#, 4
+	note G#, 2
+	note F_, 2
+	note F#, 4
+	note D#, 4
+	note G#, 4
+	volume_envelope 7, 4
+	note G#, 4
+	volume_envelope 5, 4
+	note G#, 4
+	volume_envelope 3, 4
+	note G#, 4
+	volume_envelope 10, 4
+	note F#, 4
+	note F_, 2
+	note F#, 2
+	note G#, 4
+	octave 2
+	note B_, 1
+	octave 3
+	note D#, 1
+	note F#, 1
+	note G#, 1
+	note A#, 4
+	note G#, 2
+	note F#, 2
+	note F_, 4
+	note C#, 4
+	octave 4
+	note C#, 4
+	octave 3
+	note B_, 2
+	note G#, 2
+	note A#, 2
+	note G#, 2
+	note F#, 2
+	note D#, 2
+	octave 4
+	note C#, 4
+	volume_envelope 7, 4
+	note C#, 4
+	volume_envelope 5, 4
+	note C#, 4
+	volume_envelope 3, 4
+	note C#, 2
+	octave 3
+	volume_envelope 10, 4
+	note G#, 1
+	note A#, 1
+	note B_, 4
+	note A#, 2
+	note B_, 2
+	octave 4
+	note C#, 1
+	octave 3
+	note B_, 1
+	note G#, 1
+	note F_, 1
+	note C#, 1
+	octave 2
+	note A#, 1
+	note F#, 1
+	note D#, 1
+	octave 3
+	note C#, 2
+	note D#, 4
+	note F_, 4
+	note G#, 4
+	note F#, 2
+	note C#, 1
+	note D#, 1
+	note F_, 1
+	note F#, 1
+	note A#, 1
+	note B_, 1
+	octave 4
+	note C#, 1
+	note D#, 1
+	octave 3
+	note A#, 1
+	note B_, 1
+	note F#, 1
+	note G#, 1
+	note F#, 4
+	note G#, 4
+	octave 4
+	note C#, 4
+	note F_, 4
+	note D#, 1
+	note C#, 1
+	octave 3
+	note B_, 1
+	note A#, 1
+	octave 4
+	note C#, 4
+	note F_, 2
+	note F#, 2
+	note D#, 2
+	note F#, 1
+	note F_, 1
+	note D#, 1
+	note C#, 1
+	octave 3
+	note B_, 1
+	note G#, 1
+	note F_, 2
+	note F#, 4
+	note G#, 4
+	note B_, 4
+	note A#, 2
+	note F_, 1
+	note F#, 1
+	note G#, 1
+	note A#, 1
+	octave 4
+	note C#, 1
+	note D#, 1
+	note F_, 1
+	note F#, 1
+	note C#, 1
+	note D#, 1
+	octave 3
+	note A#, 1
+	note B_, 1
+	octave 4
+	note D#, 4
+	octave 3
+	note G#, 4
+	octave 4
+	note C#, 1
+	octave 3
+	note B_, 2
+	note A#, 1
+	note G#, 2
+	note F#, 1
+	note D#, 2
+	note F#, 1
+	note G#, 2
+	octave 4
+	note D#, 4
+	note C#, 2
+	note D#, 2
+	note F_, 1
+	note D#, 1
+	note C#, 1
+	octave 3
+	note B_, 1
+	note A#, 1
+	note G#, 1
+	note F#, 1
+	note F_, 1
+	octave 8
+	sound_loop 0, .mainLoop
+
+Music_NihonTime_Ch2:
+	note_type 12, 15, 8
+.mainLoop:
+	volume_envelope 11, 4
+	vibrato 18, 2, 3
+	duty_cycle 1
+	octave 4
+	note C#, 16
+	note D#, 8
+	octave 3
+	note B_, 6
+	note A#, 1
+	note B_, 1
+	octave 4
+	note C#, 4
+	volume_envelope 9, 4
+	note C#, 4
+	volume_envelope 6, 4
+	note C#, 4
+	volume_envelope 3, 4
+	note C#, 4
+	volume_envelope 11, 4
+	note F#, 1
+	note F_, 2
+	note D#, 1
+	note C#, 2
+	octave 3
+	note B_, 1
+	note A#, 2
+	note B_, 1
+	octave 4
+	note C#, 2
+	note D#, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note C#, 1
+	note D#, 1
+	note F_, 14
+	note D#, 1
+	note F_, 1
+	note F#, 8
+	note D#, 6
+	note C#, 1
+	note D#, 1
+	note F_, 4
+	volume_envelope 9, 4
+	note F_, 4
+	volume_envelope 6, 4
+	note F_, 4
+	volume_envelope 3, 4
+	note F_, 4
+	rest 8
+	volume_envelope 11, 4
+	note D#, 4
+	octave 3
+	note B_, 4
+	octave 4
+	note C#, 2
+	note D#, 4
+	note C#, 1
+	octave 3
+	note B_, 1
+	note G#, 4
+	note F#, 1
+	note G#, 1
+	note B_, 1
+	octave 4
+	note D#, 1
+	note F#, 4
+	note F_, 4
+	note D#, 4
+	octave 3
+	note B_, 4
+	octave 4
+	note C#, 16
+	note F#, 4
+	rest 4
+	note G#, 4
+	note F#, 4
+	note F_, 8
+	note G#, 4
+	note B_, 3
+	note_type 6, 11, 4
+	note B_, 1
+	octave 5
+	note C#, 1
+	note_type 12, 11, 4
+	note D#, 2
+	note C#, 2
+	octave 4
+	note B_, 2
+	note G#, 2
+	note F#, 4
+	note G#, 4
+	note C#, 4
+	rest 4
+	octave 3
+	note G#, 1
+	note A#, 1
+	octave 4
+	note C#, 1
+	note F_, 1
+	note D#, 1
+	note C#, 1
+	octave 3
+	note B_, 1
+	note A#, 1
+	note B_, 4
+	note A#, 2
+	note B_, 2
+	octave 4
+	note C#, 4
+	octave 3
+	note F#, 1
+	note G#, 1
+	note A#, 1
+	note B_, 1
+	octave 8
+	sound_loop 0, .mainLoop
+
+Music_NihonTime_Ch3:
+	note_type 12, 1, 0
+.mainLoop:
+	octave 2
+.loop1:
+	vibrato 5, 2, 6
+	volume_envelope 2, 5
+	octave 3
+	note C#, 4
+	note F_, 2
+	note D#, 2
+	note F_, 1
+	note F#, 3
+	note F_, 2
+	note D#, 2
+	octave 2
+	note B_, 1
+	note B_, 3
+	note A#, 2
+	note B_, 2
+	octave 3
+	note C#, 2
+	note C#, 2
+	note F_, 2
+	note D#, 2
+	note C#, 4
+	note F_, 2
+	note D#, 2
+	note F_, 1
+	note F#, 3
+	note F_, 2
+	note D#, 2
+	octave 2
+	note B_, 1
+	note B_, 3
+	note A#, 2
+	note B_, 2
+	octave 3
+	note C#, 2
+	note C#, 2
+	note F_, 2
+	note D#, 2
+	note F_, 4
+	note G#, 2
+	note F#, 2
+	note G#, 1
+	note A#, 3
+	note G#, 2
+	note F#, 2
+	note D#, 1
+	note D#, 3
+	note C#, 2
+	note D#, 2
+	note F_, 2
+	note F_, 2
+	note G#, 2
+	note F#, 2
+	note_type 12, 2, 5
+	note C#, 4
+	note F_, 2
+	note D#, 2
+	note F_, 1
+	note F#, 3
+	note F_, 2
+	note D#, 2
+	octave 2
+	note B_, 1
+	note B_, 3
+	note A#, 2
+	note B_, 2
+	octave 3
+	note C#, 2
+	note C#, 2
+	note F_, 2
+	note D#, 2
+	octave 2
+	sound_loop 2, .loop1
+	octave 8
+	sound_loop 0, .mainLoop
+
+Music_NihonTime_Ch4:
+	toggle_noise 0
+	drum_speed 12
+.mainLoop:
+	toggle_noise
+	toggle_noise 3
+	octave 6
+	sound_call .sub1
+	drum_speed 12
+	sound_call .sub1
+	drum_speed 12
+	octave 6
+	sound_call .sub1
+	drum_speed 12
+	octave 6
+	sound_call .sub1
+	drum_speed 12
+	octave 6
+	sound_call .sub1
+	drum_speed 12
+	octave 6
+	sound_call .sub1
+	drum_speed 12
+	octave 6
+	sound_call .sub1
+	drum_speed 12
+	octave 6
+	sound_call .sub1
+	drum_speed 12
+	octave 6
+	sound_call .sub2
+	drum_speed 12
+	octave 6
+	sound_call .sub2
+	drum_speed 12
+	octave 6
+	sound_call .sub2
+	drum_speed 12
+	octave 6
+	sound_call .sub2
+	drum_speed 12
+	octave 6
+	sound_call .sub2
+	drum_speed 12
+	octave 6
+	sound_call .sub2
+	drum_speed 12
+	octave 6
+	sound_call .sub2
+	drum_speed 12
+	octave 6
+	sound_call .sub2
+	octave 8
+	drum_speed 12
+	sound_loop 0, .mainLoop
+
+.sub1:
+	drum_note 4, 4
+	drum_note 3, 2
+	drum_note 4, 1
+	drum_note 4, 2
+	drum_note 8, 1
+	drum_note 4, 2
+	drum_note 3, 2
+	drum_note 8, 1
+	drum_speed 6
+	drum_note 8, 1
+	drum_note 8, 1
+	sound_ret
+
+.sub2:
+	drum_note 4, 2
+	drum_note 7, 1
+	drum_note 4, 1
+	drum_note 3, 1
+	drum_note 3, 1
+	drum_note 4, 1
+	drum_note 4, 1
+	drum_note 4, 1
+	drum_note 8, 1
+	drum_note 4, 1
+	drum_note 8, 1
+	drum_note 3, 2
+	drum_note 8, 1
+	drum_speed 6
+	drum_note 8, 1
+	drum_note 8, 1
+	sound_ret
diff --git a/audio/music/Peaceful.asm b/audio/music/Peaceful.asm
new file mode 100644
index 0000000..738602c
--- /dev/null
+++ b/audio/music/Peaceful.asm
@@ -0,0 +1,392 @@
+; Peaceful route theme
+; 11/4 rhythm, composed in G Lydian.
+; This theme started out as a melody I often play on my guitar. It is very calm and peaceful, and could probably even work as a lullaby.
+; With the slow tempo, mellow instruments and simple drum pattern, this theme works well for quiet areas. (I personally picture it playing on a beach in the evening, but I digress)
+; Composed by LuciShrimp.
+
+Music_PeacefulTheme:
+	channel_count 4
+	channel 1, Music_PeacefulTheme_Ch1
+	channel 2, Music_PeacefulTheme_Ch2
+	channel 3, Music_PeacefulTheme_Ch3
+	channel 4, Music_PeacefulTheme_Ch4
+
+Music_PeacefulTheme_Ch1:
+	tempo 256
+	volume 7, 7
+	note_type 12, 15, 8
+	octave 3
+	sound_call .sub1
+	octave 8
+	note_type 12, 15, 8
+.mainLoop:
+	duty_cycle 2
+	vibrato 18, 2, 5
+	volume_envelope 10, 7
+	octave 2
+	sound_call .sub2
+	note_type 12, 10, 7
+	sound_call .sub1
+	octave 8
+	note_type 12, 15, 8
+	sound_loop 0, .mainLoop
+
+.sub1:
+	volume_envelope 9, 7
+	vibrato 18, 2, 3
+	duty_cycle 2
+	note D#, 4
+	note D_, 4
+	octave 2
+	note A#, 4
+	octave 3
+	note C_, 4
+	note D_, 6
+	note D#, 8
+	note D_, 2
+	note F_, 2
+	note G_, 6
+	note D#, 2
+	note D_, 2
+	note F_, 6
+	note D#, 4
+	octave 2
+	note G_, 2
+	note A#, 6
+	octave 3
+	note C_, 4
+	octave 2
+	note A#, 6
+	note A_, 2
+	note F_, 4
+	note G_, 6
+	note F_, 2
+	note D#, 2
+	sound_ret
+
+.sub2:
+	volume_envelope 9, 7
+	vibrato 18, 2, 3
+	duty_cycle 2
+	note F_, 6
+	rest 4
+	octave 3
+	note C_, 1
+	note D_, 1
+	note D#, 6
+	note D_, 3
+	octave 2
+	note A_, 1
+	octave 3
+	note F_, 6
+	rest 4
+	note D_, 1
+	note D#, 1
+	note F_, 6
+	note G_, 3
+	note C_, 1
+	note D_, 6
+	rest 4
+	note C_, 1
+	note D_, 1
+	note D#, 6
+	note D_, 3
+	octave 2
+	note A_, 1
+	note A#, 6
+	note F_, 2
+	note F_, 1
+	note F_, 1
+	note F_, 2
+	note G_, 2
+	note A_, 2
+	note A#, 2
+	octave 3
+	note C_, 1
+	note C_, 1
+	note D_, 2
+	sound_ret
+
+Music_PeacefulTheme_Ch2:
+	note_type 12, 15, 8
+	octave 3
+	sound_call .sub2
+	octave 8
+.mainLoop:
+	vibrato 18, 2, 5
+	duty_cycle 3
+	volume_envelope 11, 7
+	octave 3
+	sound_call .sub1
+	note_type 12, 11, 7
+	sound_call .sub2
+	octave 8
+	note_type 12, 15, 8
+	sound_loop 0, .mainLoop
+
+.sub1:
+	duty_cycle 3
+	vibrato 18, 2, 3
+	volume_envelope 10, 7
+	note A#, 6
+	rest 4
+	note G_, 1
+	note A_, 1
+	note A#, 6
+	note A_, 3
+	octave 4
+	note C_, 1
+	octave 3
+	note A#, 6
+	rest 4
+	note A#, 1
+	octave 4
+	note C_, 1
+	note D_, 4
+	note C_, 4
+	octave 3
+	note A_, 2
+	note A#, 6
+	rest 4
+	note F_, 1
+	note G_, 1
+	note F_, 6
+	note D#, 2
+	note D#, 1
+	note F_, 1
+	note D_, 6
+	note C_, 2
+	note C_, 1
+	note C_, 1
+	note C_, 2
+	note D_, 2
+	note D#, 2
+	note F_, 2
+	note G_, 2
+	note A_, 2
+	sound_ret
+
+.sub2:
+	duty_cycle 3
+	vibrato 18, 2, 3
+	volume_envelope 10, 7
+	note A#, 4
+	note A_, 4
+	octave 4
+	note C_, 4
+	octave 3
+	note F_, 6
+	note A_, 4
+	note A#, 4
+	note A_, 4
+	note G_, 4
+	note F_, 8
+	note G_, 1
+	note A_, 1
+	note A#, 4
+	octave 4
+	note D_, 2
+	note D_, 2
+	octave 3
+	note G_, 4
+	note A_, 2
+	note A_, 2
+	note A_, 2
+	note A#, 2
+	note F_, 2
+	note F_, 1
+	note F_, 1
+	note G_, 4
+	note F_, 8
+	note G_, 2
+	note A_, 2
+	note A#, 2
+	note A_, 2
+	sound_ret
+
+Music_PeacefulTheme_Ch3:
+	note_type 12, 1, 0
+	octave 2
+	sound_call .sub1
+	octave 8
+	note_type 12, 1, 0
+.mainLoop:
+	volume_envelope 2, 5
+	octave 1
+	sound_call .sub2
+	note_type 12, 2, 5
+	vibrato 18, 2, 5
+	sound_call .sub1
+	note_type 12, 2, 5
+	octave 8
+	sound_loop 0, .mainLoop
+
+.sub1:
+	vibrato 8, 2, 3
+	volume_envelope 2, 5
+	note D#, 2
+	note G_, 2
+	note A#, 2
+	octave 3
+	note F_, 2
+	octave 2
+	note A#, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note A#, 2
+	octave 3
+	note C_, 2
+	note D_, 1
+	note F_, 1
+	octave 2
+	note D#, 2
+	note G_, 2
+	note A#, 2
+	octave 3
+	note F_, 2
+	octave 2
+	note A#, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note A#, 2
+	octave 3
+	note C_, 2
+	note D_, 1
+	note F_, 1
+	octave 2
+	note D#, 2
+	note G_, 2
+	note A#, 2
+	octave 3
+	note F_, 2
+	octave 2
+	note A#, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note A#, 2
+	octave 3
+	note C_, 2
+	note D_, 1
+	note F_, 1
+	octave 2
+	note D#, 2
+	note G_, 2
+	note A#, 2
+	octave 3
+	note F_, 2
+	octave 2
+	note A#, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note A#, 2
+	octave 3
+	note C_, 2
+	note_type 12, 2, 5
+	note F_, 1
+	note D_, 1
+	sound_ret
+
+.sub2:
+	vibrato 8, 2, 3
+	volume_envelope 2, 5
+	note A#, 2
+	octave 2
+	note D_, 2
+	note F_, 2
+	octave 3
+	note D_, 2
+	octave 2
+	note A#, 2
+	note F_, 2
+	note D#, 2
+	note G_, 2
+	note A#, 2
+	octave 3
+	note C_, 2
+	note D_, 1
+	note F_, 1
+	octave 1
+	note A#, 2
+	octave 2
+	note D_, 2
+	note F_, 2
+	octave 3
+	note F_, 2
+	octave 2
+	note A#, 2
+	note F_, 2
+	note D#, 2
+	note G_, 2
+	note A#, 2
+	octave 3
+	note C_, 2
+	note F_, 1
+	note D_, 1
+	octave 1
+	note A#, 2
+	octave 2
+	note D_, 2
+	note F_, 2
+	octave 3
+	note D_, 2
+	octave 2
+	note A#, 2
+	note F_, 2
+	note D#, 2
+	note G_, 2
+	note A#, 2
+	octave 3
+	note C_, 2
+	note D_, 1
+	note F_, 1
+	octave 1
+	note A#, 2
+	octave 2
+	note D_, 2
+	note F_, 2
+	octave 3
+	note F_, 2
+	rest 2
+	octave 1
+	note A#, 2
+	octave 2
+	note C_, 6
+	note D_, 4
+	sound_ret
+
+Music_PeacefulTheme_Ch4:
+	toggle_noise 0
+	drum_speed 12
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 8
+.mainLoop:
+	toggle_noise
+	toggle_noise 3
+	octave 5
+.loop1:
+	drum_note 3, 2
+	drum_note 7, 2
+	drum_note 7, 2
+	drum_note 3, 2
+	drum_note 7, 1
+	drum_note 3, 1
+	drum_note 7, 2
+	drum_note 3, 2
+	drum_note 7, 1
+	drum_note 3, 1
+	drum_note 7, 2
+	drum_note 3, 2
+	drum_note 7, 1
+	drum_note 7, 1
+	sound_loop 8, .loop1
+	drum_speed 12
+	octave 8
+	sound_loop 0, .mainLoop
diff --git a/audio/music/SouthCity.asm b/audio/music/SouthCity.asm
new file mode 100644
index 0000000..17799ca
--- /dev/null
+++ b/audio/music/SouthCity.asm
@@ -0,0 +1,741 @@
+; South City theme
+; An upbeat city theme with relatively simple chord progression.
+; 4/4 rhythm, G Major scale. Briefly borrows a note from the Lydian scale in the chorus part.
+; The relatively fast drums give the theme some forwards momentum, I tried to keep them realistic... to the point that the Game Boy allows, of course!
+; The note parameters are kept close to the original GSC soundtrack for coherence in a GSC rom hack.
+; Composed by LuciShrimp
+
+Music_SouthCity:
+	channel_count 4
+	channel 1, Music_SouthCity_Ch1
+	channel 2, Music_SouthCity_Ch2
+	channel 3, Music_SouthCity_Ch3
+	channel 4, Music_SouthCity_Ch4
+
+Music_SouthCity_Ch1:
+	volume 7, 7
+	octave 3
+	tempo 212
+	note_type 12, 12, 8
+	sound_call .sub1
+	note_type 12, 3, 8
+	octave 8
+.mainLoop:
+	octave 3
+	volume_envelope 12, 8
+.loop1:
+	duty_cycle 2
+	volume_envelope 12, 7
+	octave 2
+	tempo 222
+	note G_, 8
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 8
+	note E_, 8
+	note G_, 8
+	note F#, 1
+	note E_, 1
+	note F#, 1
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note D_, 1
+	note C_, 1
+	note D_, 8
+	note C_, 2
+	note D_, 2
+	note E_, 2
+	note F#, 2
+	octave 3
+	sound_loop 2, .loop1
+	sound_call .sub1
+	octave 8
+	note_type 12, 15, 8
+	sound_loop 0, .mainLoop
+
+.sub1:
+	duty_cycle 2
+	octave 2
+	tempo 222
+	volume_envelope 12, 7
+	note G_, 8
+	note_type 12, 12, 7
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 8
+	note E_, 8
+	note G_, 8
+	note F#, 4
+	note D_, 4
+	octave 1
+	note B_, 8
+	octave 2
+	note C_, 4
+	note C_, 1
+	note D_, 1
+	note E_, 1
+	note F#, 1
+	octave 3
+	sound_ret
+
+Music_SouthCity_Ch2:
+	note_type 12, 12, 7
+	vibrato 18, 2, 3
+	octave 3
+	duty_cycle 3
+	sound_call .sub1
+	rest 1
+	octave 8
+.mainLoop:
+	volume_envelope 12, 7
+	octave 4
+	note C_, 2
+	note D_, 1
+	octave 3
+	note A_, 1
+	note B_, 4
+	octave 4
+	note C_, 2
+	octave 3
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note B_, 2
+	octave 4
+	note C_, 1
+	octave 3
+	note B_, 1
+	note G_, 1
+	note A_, 1
+	octave 4
+	note_type 9, 12, 7
+	note D_, 2
+	note_type 6, 12, 7
+	note D#, 1
+	note_type 12, 12, 7
+	note E_, 4
+	note D_, 4
+	note E_, 2
+	note F_, 1
+	note C_, 1
+	note D_, 2
+	note C_, 2
+	octave 3
+	note B_, 1
+	note A_, 1
+	note B_, 1
+	note A_, 1
+	note G_, 1
+	note A_, 1
+	note G_, 1
+	note F#, 1
+	note G_, 3
+	duty_cycle 2
+	octave 2
+	note F#, 1
+	note A_, 3
+	note G_, 1
+	note B_, 3
+	note G_, 1
+	note A_, 3
+	note F#, 1
+	octave 4
+	duty_cycle 3
+	note C_, 8
+	octave 3
+	note B_, 8
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note G_, 2
+	note B_, 2
+	note A_, 2
+	note G_, 1
+	note F#, 1
+	note E_, 1
+	note F#, 1
+	note G_, 8
+	note A_, 6
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note G_, 2
+	note B_, 2
+	note A_, 2
+	note G_, 1
+	note F#, 1
+	note E_, 1
+	note F#, 1
+	sound_call .sub1
+	octave 8
+	note_type 12, 15, 8
+	rest 1
+	sound_loop 0, .mainLoop
+
+.sub1:
+	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 1, 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 1, 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 1, 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 1, 7
+	note D_, 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 1, 7
+	note G_, 1
+	rest 1
+	volume_envelope 12, 7
+	note A_, 1
+	rest 1
+	volume_envelope 6, 7
+	note A_, 1
+	rest 1
+	volume_envelope 3, 7
+	note A_, 1
+	rest 1
+	volume_envelope 1, 7
+	note A_, 1
+	rest 1
+	volume_envelope 12, 7
+	note B_, 1
+	rest 1
+	volume_envelope 6, 7
+	note B_, 1
+	rest 1
+	volume_envelope 3, 7
+	octave 4
+	note C_, 1
+	rest 1
+	volume_envelope 1, 7
+	note C_, 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 C_, 1
+	rest 1
+	volume_envelope 1, 7
+	note C_, 1
+	octave 3
+	sound_ret
+
+Music_SouthCity_Ch3:
+	note_type 12, 1, 5
+	vibrato 8, 2, 3
+	rest 16
+	rest 16
+	octave 4
+	sound_call .sub1
+	note_type 12, 3, 5
+	octave 8
+.mainLoop:
+	volume_envelope 1, 2
+	octave 3
+	note G_, 1
+	octave 4
+	note D_, 1
+	rest 1
+	volume_envelope 2, 2
+	octave 3
+	note G_, 1
+	octave 4
+	note D_, 1
+	rest 1
+	volume_envelope 3, 2
+	octave 3
+	note G_, 1
+	octave 4
+	note D_, 1
+	volume_envelope 1, 2
+	octave 3
+	note F#, 1
+	octave 4
+	note C_, 1
+	octave 3
+	rest 1
+	volume_envelope 2, 2
+	note F#, 1
+	octave 4
+	note C_, 1
+	octave 3
+	rest 1
+	volume_envelope 3, 2
+	note F#, 1
+	octave 4
+	note C_, 1
+	octave 3
+	volume_envelope 1, 2
+	note G_, 1
+	octave 4
+	note D_, 1
+	rest 1
+	volume_envelope 2, 2
+	octave 3
+	note G_, 1
+	octave 4
+	note D_, 1
+	rest 1
+	volume_envelope 3, 2
+	octave 3
+	note G_, 1
+	octave 4
+	note D_, 1
+	volume_envelope 1, 2
+	octave 3
+	note A_, 1
+	octave 4
+	note E_, 1
+	rest 1
+	volume_envelope 2, 2
+	octave 3
+	note A_, 1
+	octave 4
+	note E_, 1
+	rest 1
+	volume_envelope 3, 2
+	octave 3
+	note A_, 1
+	octave 4
+	note E_, 1
+	volume_envelope 1, 2
+	octave 3
+	note G_, 1
+	octave 4
+	note D_, 1
+	rest 1
+	volume_envelope 2, 2
+	octave 3
+	note G_, 1
+	octave 4
+	note D_, 1
+	rest 1
+	volume_envelope 3, 2
+	octave 3
+	note G_, 1
+	octave 4
+	note D_, 1
+	volume_envelope 1, 2
+	octave 3
+	note F#, 1
+	octave 4
+	note C_, 1
+	octave 3
+	rest 1
+	volume_envelope 2, 2
+	note F#, 1
+	octave 4
+	note C_, 1
+	octave 3
+	rest 1
+	volume_envelope 3, 2
+	note F#, 1
+	octave 4
+	note C_, 1
+	octave 3
+	volume_envelope 1, 2
+	note G_, 1
+	octave 4
+	note D_, 1
+	rest 1
+	volume_envelope 2, 2
+	octave 3
+	note G_, 1
+	octave 4
+	note D_, 1
+	rest 1
+	volume_envelope 3, 2
+	octave 3
+	note G_, 1
+	octave 4
+	note D_, 1
+	volume_envelope 1, 2
+	note C_, 1
+	note G_, 1
+	rest 1
+	volume_envelope 2, 2
+	note C_, 1
+	note G_, 1
+	rest 1
+	volume_envelope 3, 2
+	note C_, 1
+	note G_, 1
+	volume_envelope 1, 2
+	octave 3
+	note G_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	rest 1
+	volume_envelope 2, 2
+	note G_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	rest 1
+	volume_envelope 3, 2
+	note G_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	volume_envelope 1, 2
+	note F#, 1
+	note B_, 1
+	rest 1
+	volume_envelope 2, 2
+	note F#, 1
+	note B_, 1
+	rest 1
+	volume_envelope 3, 2
+	note F#, 1
+	note B_, 1
+	volume_envelope 1, 2
+	note E_, 1
+	note A_, 1
+	rest 1
+	volume_envelope 2, 2
+	note E_, 1
+	note A_, 1
+	rest 1
+	volume_envelope 3, 2
+	note E_, 1
+	note A_, 1
+	volume_envelope 1, 2
+	note F#, 1
+	note B_, 1
+	rest 1
+	volume_envelope 2, 2
+	note F#, 1
+	note B_, 1
+	rest 1
+	volume_envelope 3, 2
+	note F#, 1
+	note B_, 1
+	volume_envelope 1, 2
+	note G_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	rest 1
+	volume_envelope 2, 2
+	note G_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	rest 1
+	volume_envelope 3, 2
+	note G_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	volume_envelope 1, 2
+	note F#, 1
+	note B_, 1
+	rest 1
+	volume_envelope 2, 2
+	note F#, 1
+	note B_, 1
+	rest 1
+	volume_envelope 3, 2
+	note F#, 1
+	note B_, 1
+	volume_envelope 1, 2
+	note E_, 1
+	note A_, 1
+	rest 1
+	volume_envelope 2, 2
+	note E_, 1
+	note A_, 1
+	rest 1
+	volume_envelope 3, 2
+	note E_, 1
+	note A_, 1
+	volume_envelope 1, 2
+	note F#, 1
+	note B_, 1
+	rest 1
+	volume_envelope 2, 2
+	note F#, 1
+	note B_, 1
+	rest 1
+	volume_envelope 3, 2
+	note F#, 1
+	note B_, 1
+	volume_envelope 1, 2
+	octave 4
+	note D_, 2
+	volume_envelope 2, 2
+	octave 3
+	note D_, 2
+	volume_envelope 3, 2
+	octave 4
+	note D_, 2
+	octave 3
+	note D_, 2
+	volume_envelope 1, 2
+	octave 4
+	note C_, 2
+	volume_envelope 2, 2
+	octave 3
+	note C_, 2
+	volume_envelope 3, 2
+	octave 4
+	note C_, 2
+	octave 3
+	note C_, 2
+	volume_envelope 1, 2
+	note B_, 2
+	volume_envelope 2, 2
+	octave 2
+	note B_, 2
+	volume_envelope 3, 2
+	octave 3
+	note B_, 2
+	octave 2
+	note B_, 2
+	volume_envelope 1, 2
+	octave 3
+	note A_, 2
+	volume_envelope 2, 2
+	octave 2
+	note A_, 2
+	volume_envelope 3, 2
+	octave 3
+	note A_, 2
+	octave 2
+	note A_, 2
+	volume_envelope 1, 2
+	octave 4
+	sound_call .sub1
+	octave 8
+	note_type 12, 1, 0
+	sound_loop 0, .mainLoop
+
+.sub1:
+	volume_envelope 1, 2
+	note D_, 2
+	volume_envelope 2, 2
+	octave 3
+	note D_, 2
+	volume_envelope 3, 2
+	octave 4
+	note D_, 2
+	octave 3
+	note D_, 2
+	volume_envelope 1, 2
+	octave 4
+	note E_, 2
+	volume_envelope 2, 2
+	octave 3
+	note E_, 2
+	volume_envelope 3, 2
+	octave 4
+	note E_, 2
+	octave 3
+	note E_, 2
+	volume_envelope 1, 2
+	octave 4
+	note F#, 2
+	volume_envelope 2, 2
+	octave 3
+	note F#, 2
+	volume_envelope 3, 2
+	octave 4
+	note G_, 2
+	octave 3
+	note G_, 2
+	volume_envelope 1, 2
+	octave 4
+	note A_, 2
+	volume_envelope 2, 2
+	octave 3
+	note A_, 2
+	volume_envelope 3, 2
+	octave 4
+	note G_, 2
+	octave 3
+	note A_, 2
+	sound_ret
+
+Music_SouthCity_Ch4:
+	toggle_noise 0
+	drum_speed 12
+	rest 16
+	rest 16
+	rest 16
+	rest 8
+	octave 5
+	toggle_noise
+	toggle_noise 3
+	sound_call .sub1
+	octave 8
+	drum_speed 12
+	toggle_noise
+	toggle_noise 0
+.mainLoop:
+	octave 5
+	toggle_noise
+	toggle_noise 3
+	drum_speed 6
+.loop1:
+	drum_note 4, 4
+	drum_speed 12
+	sound_call .sub2
+	sound_loop 2, .loop1
+	octave 5
+	drum_speed 6
+.loop2:
+	drum_note 4, 2
+	drum_note 4, 2
+	drum_speed 12
+	drum_note 7, 1
+	drum_note 4, 1
+	drum_note 3, 1
+	drum_note 3, 1
+	drum_note 7, 1
+	drum_speed 6
+	drum_note 7, 1
+	drum_note 7, 1
+	drum_note 4, 2
+	drum_note 4, 2
+	drum_speed 12
+	drum_note 7, 1
+	drum_note 4, 1
+	drum_note 3, 1
+	drum_note 3, 1
+	drum_note 7, 1
+	drum_speed 6
+	drum_note 7, 1
+	drum_note 7, 1
+	drum_note 4, 2
+	drum_note 4, 2
+	drum_speed 12
+	drum_note 7, 1
+	drum_note 4, 1
+	drum_note 3, 1
+	drum_note 3, 1
+	drum_note 7, 1
+	drum_speed 6
+	drum_note 7, 1
+	drum_note 7, 1
+	drum_note 4, 2
+	drum_note 4, 2
+	drum_speed 12
+	drum_note 7, 1
+	drum_note 4, 1
+	drum_note 4, 1
+	drum_note 3, 1
+	drum_note 4, 1
+	drum_speed 6
+	drum_note 4, 1
+	drum_note 4, 1
+	sound_loop 2, .loop2
+	drum_speed 6
+	drum_note 4, 4
+	drum_speed 12
+	sound_call .sub2
+	drum_speed 6
+	drum_note 4, 4
+	drum_speed 12
+	sound_call .sub2
+	drum_speed 12
+	octave 8
+	sound_loop 0, .mainLoop
+
+.sub1:
+	drum_note 4, 2
+	drum_note 3, 2
+	drum_note 7, 2
+	drum_note 3, 1
+	drum_note 3, 1
+	sound_ret
+
+.sub2:
+	drum_note 7, 1
+	drum_note 7, 1
+	drum_note 3, 2
+	drum_note 7, 1
+	drum_note 7, 1
+	drum_note 4, 2
+	drum_note 7, 1
+	drum_note 7, 1
+	drum_note 3, 2
+	drum_note 7, 1
+	drum_speed 6
+	drum_note 7, 1
+	drum_note 7, 1
+	drum_note 4, 4
+	drum_speed 12
+	drum_note 7, 1
+	drum_note 7, 1
+	drum_note 3, 2
+	drum_note 7, 1
+	drum_note 7, 1
+	drum_note 4, 2
+	drum_note 4, 1
+	drum_note 7, 1
+	drum_note 3, 1
+	drum_note 4, 1
+	drum_speed 6
+	drum_note 7, 1
+	drum_note 7, 1
+	drum_note 7, 1
+	drum_note 7, 1
+	sound_ret
diff --git a/audio/music/lavendercrypt.asm b/audio/music/lavendercrypt.asm
new file mode 100644
index 0000000..98391c2
--- /dev/null
+++ b/audio/music/lavendercrypt.asm
@@ -0,0 +1,712 @@
+; Lavender Crypt theme
+; Eerie music, combining motifs from Lavender City and Pokémon Tower, along with original parts and a broken record feel.
+; This theme makes use of custom waveforms, therefore including the JEP wave_samples.asm file in the build is required for proper playback.
+; Specifically the 10th and 11th waveform are required.
+; With a 13/8 time signature, the Lavender Town scale(C Lydian with a few flattened 5ths and almost entirely without the 6th), abrupt melody stops and several tempo changes, 
+;   this theme gives a very uneasy/lopsided feeling, working well for creepy areas.
+; The note parameters stick close to original GSC themes as to not feel out of place in a GSC rom hack environment.
+; Composed by LuciShrimp
+
+Music_LavenderCrypt:
+	channel_count 4
+	channel 1, Music_LavenderCrypt_Ch1
+	channel 2, Music_LavenderCrypt_Ch2
+	channel 3, Music_LavenderCrypt_Ch3
+	channel 4, Music_LavenderCrypt_Ch4
+
+Music_LavenderCrypt_Ch1:
+	tempo 256
+	volume 7, 7
+	note_type 12, 15, 8
+.mainLoop:
+	octave 2
+	tempo 211
+	duty_cycle 2
+	volume_envelope 0, 7
+	vibrato 2, 2, 2
+	note C_, 1
+	rest 16
+	rest 15
+	note_type 12, 15, 8
+	rest 12
+	volume_envelope 11, 7
+	note C_, 2
+	note D_, 2
+	note E_, 2
+	note F#, 2
+	note G_, 8
+	note E_, 8
+	note F#, 8
+	note A_, 8
+	note G_, 4
+	note G_, 4
+	note F#, 4
+	note F#, 4
+	note E_, 2
+	note C#, 2
+	octave 3
+	note C_, 8
+	octave 2
+	note B_, 8
+	note A#, 8
+	note G_, 8
+	note F#, 8
+	note E_, 8
+	note D_, 4
+	note G_, 1
+	rest 7
+	note G_, 1
+	rest 7
+	octave 1
+	note B_, 1
+	rest 7
+	note B_, 1
+	rest 3
+	note B_, 1
+	rest 3
+	octave 2
+	note C_, 8
+	note D_, 4
+	note C_, 2
+	note E_, 2
+	note F_, 2
+	note F#, 2
+	note C_, 8
+	rest 8
+	octave 1
+	note B_, 8
+	rest 8
+	note G_, 8
+	rest 8
+	octave 2
+	volume_envelope 0, 7
+	tempo 141
+	note C_, 4
+	volume_envelope 11, 7
+	tempo 231
+	note C_, 8
+	rest 8
+	octave 1
+	note B_, 8
+	rest 8
+	note G_, 6
+	note G_, 1
+	rest 9
+	tempo 144
+	note G_, 1
+	rest 3
+	octave 4
+	tempo 211
+	note C_, 8
+	octave 3
+	note B_, 8
+	note G_, 8
+	note E_, 8
+	octave 4
+	note C_, 8
+	octave 3
+	note B_, 4
+	note G_, 4
+	note E_, 4
+	octave 4
+	note C_, 8
+	octave 3
+	note B_, 8
+	note G_, 8
+	note E_, 8
+	octave 4
+	note C_, 8
+	octave 3
+	note B_, 4
+	note G_, 4
+	note_type 6, 11, 7
+	tempo 141
+	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 12, 11, 6
+.loop1:
+	duty_cycle 2
+	octave 4
+	volume_envelope 11, 7
+	tempo 211
+	note C_, 3
+	octave 3
+	note B_, 3
+	note G_, 3
+	note E_, 3
+	octave 5
+	sound_loop 2, .loop1
+	sound_call .sub1
+	duty_cycle 2
+	octave 4
+	volume_envelope 11, 7
+	note C_, 3
+	octave 3
+	note B_, 3
+	octave 4
+	note C_, 3
+	octave 3
+	note B_, 3
+	volume_envelope 10, 7
+	note G_, 3
+	note E_, 3
+	octave 4
+	volume_envelope 9, 7
+	note C_, 3
+	octave 3
+	note B_, 3
+	volume_envelope 8, 7
+	note G_, 3
+	note E_, 3
+	octave 4
+	volume_envelope 7, 7
+	note C_, 3
+	octave 3
+	note B_, 3
+	volume_envelope 6, 7
+	note G_, 3
+	note E_, 3
+	octave 4
+	volume_envelope 5, 7
+	note C_, 3
+	octave 3
+	note B_, 3
+	volume_envelope 4, 7
+	note G_, 3
+	note E_, 3
+	octave 4
+	volume_envelope 3, 7
+	note C_, 3
+	octave 3
+	volume_envelope 2, 7
+	note B_, 3
+	volume_envelope 1, 7
+	note G_, 3
+	note E_, 3
+	note_type 12, 11, 6
+	rest 2
+	octave 8
+	sound_loop 0, .mainLoop
+
+.sub1:
+	duty_cycle 2
+	octave 4
+	volume_envelope 11, 7
+	note C_, 3
+	octave 3
+	note B_, 3
+	note G_, 3
+	note E_, 3
+	octave 4
+	sound_ret
+
+Music_LavenderCrypt_Ch2:
+	note_type 12, 15, 8
+.mainLoop:
+	octave 5
+	vibrato 0, 2, 1
+	duty_cycle 1
+	volume_envelope 15, 2
+.loop1:
+	duty_cycle 3
+	vibrato 20, 3, 4
+	volume_envelope 15, 2
+	note C_, 2
+	rest 1
+	volume_envelope 3, 2
+	note C_, 1
+	volume_envelope 15, 2
+	note G_, 2
+	rest 1
+	volume_envelope 3, 2
+	note G_, 1
+	volume_envelope 15, 2
+	note B_, 2
+	rest 1
+	volume_envelope 3, 2
+	note B_, 1
+	volume_envelope 15, 2
+	note F#, 2
+	rest 1
+	volume_envelope 3, 2
+	note F#, 1
+	sound_loop 2, .loop1
+	sound_call .sub1
+	rest 1
+	volume_envelope 7, 2
+	note F#, 1
+	note_type 12, 15, 2
+	octave 5
+	duty_cycle 3
+	vibrato 20, 3, 4
+	note C_, 2
+	octave 4
+	note B_, 2
+	octave 5
+	sound_call .sub1
+	note_type 12, 15, 2
+	rest 1
+	volume_envelope 7, 2
+	note F#, 1
+	octave 4
+	sound_call .sub2
+	rest 1
+	volume_envelope 4, 2
+	note E_, 1
+	octave 4
+	duty_cycle 3
+	vibrato 20, 3, 4
+	volume_envelope 15, 2
+	note A_, 2
+	rest 1
+	volume_envelope 4, 2
+	note A_, 1
+	octave 5
+	volume_envelope 15, 2
+	note E_, 2
+	rest 1
+	volume_envelope 4, 2
+	note E_, 1
+	volume_envelope 15, 2
+	note A_, 2
+	rest 1
+	volume_envelope 4, 2
+	note A_, 1
+	volume_envelope 15, 2
+	note E_, 2
+	note_type 12, 15, 2
+	rest 1
+	volume_envelope 4, 2
+	note E_, 1
+	volume_envelope 15, 2
+	note A_, 2
+	note E_, 2
+	octave 4
+	volume_envelope 12, 7
+	note G_, 8
+	note F#, 8
+	note F_, 8
+	note D_, 8
+	note C#, 8
+	octave 3
+	note B_, 8
+	note A_, 4
+	octave 5
+	note C_, 8
+	octave 4
+	note B_, 4
+	note G_, 1
+	note F#, 1
+	note E_, 1
+	note D#, 1
+	note G_, 8
+	octave 5
+	note C_, 8
+	octave 4
+	note B_, 4
+	note G_, 4
+	note E_, 4
+	note G_, 4
+	octave 5
+	note C_, 4
+	octave 4
+	sound_call .sub3
+	duty_cycle 3
+	vibrato 20, 3, 4
+	volume_envelope 12, 7
+	note E_, 8
+	note E_, 8
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note B_, 4
+	octave 3
+	pitch_slide 3, 4, C#
+	note C#, 4
+	octave 4
+	sound_call .sub3
+	note_type 12, 12, 7
+	duty_cycle 3
+	vibrato 20, 3, 4
+	note F#, 8
+	note F#, 8
+	note B_, 4
+	note G_, 4
+	note F#, 4
+	note B_, 4
+	note_type 6, 15, 7
+	octave 5
+	note C_, 1
+	octave 4
+	note B_, 1
+	note A#, 1
+	note G#, 1
+	note G_, 1
+	note F#, 1
+	note E_, 1
+	note D_, 1
+	note_type 12, 15, 7
+	sound_call .sub4
+	rest 4
+	sound_call .sub4
+	note_type 12, 15, 7
+	rest 4
+	duty_cycle 3
+	note D_, 6
+	rest 2
+	note E_, 6
+	rest 2
+	note G_, 3
+	rest 1
+	note A#, 12
+	rest 4
+	note F#, 12
+	rest 4
+	note A#, 16
+	rest 4
+	octave 3
+	volume_envelope 0, 7
+	note C_, 3
+	rest 9
+	rest 7
+	rest 16
+	rest 16
+	rest 5
+	octave 5
+	volume_envelope 1, 2
+	note C_, 2
+	rest 2
+	note G_, 2
+	rest 2
+	volume_envelope 2, 2
+	note B_, 2
+	rest 2
+	note F#, 2
+	rest 2
+	volume_envelope 3, 2
+	note C_, 2
+	rest 2
+	volume_envelope 4, 2
+	note G_, 2
+	rest 2
+	volume_envelope 5, 2
+	note B_, 2
+	rest 2
+	volume_envelope 7, 2
+	note F#, 2
+	rest 2
+	note C_, 2
+	rest 2
+	volume_envelope 8, 2
+	note G_, 2
+	rest 2
+	volume_envelope 9, 2
+	note B_, 2
+	rest 2
+	volume_envelope 10, 2
+	note F#, 2
+	rest 2
+	octave 8
+	sound_loop 0, .mainLoop
+
+.sub1:
+	duty_cycle 3
+	vibrato 20, 3, 4
+	volume_envelope 15, 2
+	note C_, 2
+	rest 1
+	volume_envelope 7, 2
+	note C_, 1
+	volume_envelope 15, 2
+	note G_, 2
+	rest 1
+	volume_envelope 7, 2
+	note G_, 1
+	volume_envelope 15, 2
+	note B_, 2
+	rest 1
+	volume_envelope 7, 2
+	note B_, 1
+	volume_envelope 15, 2
+	note F#, 2
+	sound_ret
+
+.sub2:
+	duty_cycle 3
+	vibrato 20, 3, 4
+	volume_envelope 15, 2
+	note B_, 2
+	rest 1
+	octave 4
+	volume_envelope 4, 2
+	note B_, 1
+	octave 5
+	volume_envelope 15, 2
+	note F#, 2
+	rest 1
+	volume_envelope 4, 2
+	note F#, 1
+	volume_envelope 15, 2
+	note A#, 2
+	rest 1
+	volume_envelope 4, 2
+	note A#, 1
+	volume_envelope 15, 2
+	note E_, 2
+	sound_ret
+
+.sub3:
+	duty_cycle 3
+	vibrato 20, 3, 4
+	volume_envelope 12, 7
+	note G_, 8
+	note G_, 8
+	sound_ret
+
+.sub4:
+	duty_cycle 3
+	note C_, 12
+	sound_ret
+
+Music_LavenderCrypt_Ch3:
+	note_type 12, 1, 0
+.mainLoop:
+	octave 2
+	volume_envelope 2, 11
+	note C_, 16
+	volume_envelope 1, 0
+	octave 1
+	note B_, 16
+	octave 2
+	note_type 12, 1, 0
+	note D_, 16
+	octave 1
+	note B_, 4
+	octave 2
+	vibrato 5, 2, 2
+	volume_envelope 1, 10
+	note D_, 4
+	note E_, 4
+	note F#, 4
+	note G_, 4
+	note C_, 4
+	note D_, 4
+	note D_, 4
+	note E_, 4
+	octave 1
+	note B_, 8
+	rest 4
+	octave 3
+	note E_, 2
+	note D#, 2
+	note F#, 2
+	note D#, 2
+	note E_, 12
+	note F#, 12
+	note D_, 12
+	octave 2
+	note B_, 8
+	octave 3
+	note D_, 8
+	note E_, 1
+	rest 7
+	note E_, 1
+	rest 7
+	note E_, 1
+	rest 3
+	note E_, 1
+	note D#, 1
+	note F#, 1
+	note D#, 1
+	note E_, 1
+	rest 3
+	volume_envelope 3, 10
+	sound_call .sub2
+	rest 3
+	sound_call .sub2
+	note_type 12, 3, 10
+	rest 3
+	sound_call .sub2
+	note_type 12, 3, 10
+	rest 3
+	octave 4
+	sound_call .sub1
+	octave 3
+	pitch_slide 3, 4, C#
+	note C#, 4
+	octave 4
+	sound_call .sub1
+	note_type 12, 1, 10
+	vibrato 5, 2, 2
+	octave 3
+	note E_, 4
+	rest 8
+	note G_, 8
+	note E_, 8
+	note G_, 8
+	octave 4
+.loop1:
+	vibrato 5, 2, 2
+	octave 3
+	volume_envelope 1, 10
+	note E_, 4
+	note G_, 4
+	octave 4
+	sound_loop 2, .loop1
+	vibrato 5, 2, 2
+	octave 3
+	volume_envelope 1, 10
+	note F#, 2
+	note G_, 2
+	octave 4
+.loop2:
+	vibrato 5, 2, 2
+	octave 3
+	volume_envelope 1, 12
+	note G_, 3
+	octave 4
+	rest 1
+	sound_loop 12, .loop2
+	vibrato 5, 2, 2
+	octave 3
+	volume_envelope 1, 12
+	note G_, 2
+	note_type 6, 1, 10
+	note G#, 1
+	note A_, 1
+	note A#, 1
+	note B_, 1
+	octave 5
+	note_type 12, 1, 0
+.loop3:
+	vibrato 5, 2, 2
+	octave 4
+	volume_envelope 1, 10
+	note C_, 3
+	octave 3
+	note B_, 3
+	note G_, 3
+	note E_, 3
+	octave 5
+	sound_loop 3, .loop3
+	vibrato 5, 2, 2
+	octave 4
+	volume_envelope 1, 10
+	note C_, 3
+	octave 3
+	note B_, 3
+	volume_envelope 1, 12
+	note G_, 16
+	note G_, 16
+	volume_envelope 2, 12
+	note G_, 16
+	volume_envelope 3, 11
+	note D_, 1
+	note C#, 1
+	note C_, 1
+	octave 2
+	note B_, 1
+	note A#, 1
+	note A_, 1
+	note G#, 1
+	volume_envelope 2, 11
+	note G_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	octave 8
+	sound_loop 0, .mainLoop
+
+.sub1:
+	vibrato 5, 2, 2
+	octave 3
+	volume_envelope 1, 10
+	note E_, 8
+	volume_envelope 3, 10
+	note E_, 8
+	volume_envelope 1, 10
+	note D_, 8
+	volume_envelope 3, 10
+	note D_, 8
+	volume_envelope 1, 10
+	note C_, 8
+	volume_envelope 3, 10
+	note C_, 8
+	octave 4
+	sound_ret
+
+.sub2:
+	note E_, 1
+	note D#, 1
+	note F#, 1
+	note D#, 1
+	note E_, 1
+	sound_ret
+
+Music_LavenderCrypt_Ch4:
+	toggle_noise 0
+	drum_speed 12
+.mainLoop:
+	rest 16
+	rest 16
+	drum_speed 12
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 8
+	octave 7
+	toggle_noise
+	toggle_noise 3
+.loop1:
+	drum_note 3, 8
+	drum_note 7, 8
+	drum_note 3, 8
+	drum_note 7, 8
+	drum_note 3, 8
+	drum_note 7, 8
+	sound_call .sub1
+	sound_loop 7, .loop1
+	rest 2
+	octave 7
+	sound_call .sub1
+	drum_speed 12
+	rest 2
+	octave 7
+	sound_call .sub1
+	drum_speed 12
+	rest 2
+	octave 7
+	sound_call .sub1
+	drum_speed 12
+	rest 16
+	rest 10
+	drum_speed 1
+	rest 16
+	rest 16
+	rest 16
+	rest 4
+	drum_speed 12
+	octave 8
+	rest 3
+	drum_speed 1
+	rest 8
+	drum_speed 12
+	sound_loop 0, .mainLoop
+
+.sub1:
+	drum_note 7, 1
+	drum_note 3, 1
+	drum_note 7, 1
+	drum_note 7, 1
+	sound_ret
diff --git a/audio/music_pointers.asm b/audio/music_pointers.asm
index 6fbe1a8..bfea6d2 100644
--- a/audio/music_pointers.asm
+++ b/audio/music_pointers.asm
@@ -109,4 +109,9 @@ Music:
 	dba Music_MobileCenter
 	dba Music_NihonTown01
 	dba Music_SinjohRuins
+	dba Music_LavenderCrypt
+	dba Music_SouthCity
+	dba Music_NihonTime
+	dba Music_PeacefulTheme
+	dba Music_CoastTown
 	assert_table_length NUM_MUSIC_SONGS
diff --git a/audio/wave_samples.asm b/audio/wave_samples.asm
index 81fee21..195497c 100644
--- a/audio/wave_samples.asm
+++ b/audio/wave_samples.asm
@@ -11,3 +11,9 @@ WaveSamples:
 	dn 12,  0, 10,  9,  8,  7, 15,  5, 15, 15, 15, 14, 14, 13, 13, 12,  4,  4,  3,  3,  2,  2, 15,  1,  0,  2,  4,  6,  8, 10, 12, 14
 	dn  4,  4,  3,  3,  2,  2,  1, 15,  0,  0,  4,  6,  8, 10, 12, 14, 15,  8, 15, 14, 14, 13, 13, 12, 12, 11, 10,  9,  8,  7,  6,  5
 	dn  1,  1,  0,  0,  0,  0,  0,  8,  0,  0,  1,  3,  5,  7,  9, 10, 11,  4, 11, 10, 10,  9,  9,  8,  8,  7,  6,  5,  4,  3,  2,  1
+	dn  0,	0,	0,	0,	0,	0,	1,	1,	1,	1,	1,	1,	2,	2,	3,	3,	4,	4,	5,	6,	7,	8, 10, 12, 14, 15, 14, 12, 10,	8,	4,	1
+	dn	1, 15, 14, 13, 12, 11, 10,	9,	8,	7,	6,	5,	4,	3,	2,	1,	1,	2,	3,	4,	5,	6,	7,	8,	9, 10, 11, 12, 13, 14, 15,	1
+	dn	0, 15, 14, 13, 12, 11, 10,	1,	0, 15, 14, 13, 12, 11, 10,	1,	0, 15, 14, 13, 12, 11, 10,	1,	0, 15, 14, 13, 12, 11, 10,	1
+	dn 15, 15, 14, 14, 13, 13, 12, 12, 11, 11, 15, 15, 14, 14, 13, 13, 12, 12, 11, 11, 15, 15, 14, 14, 13, 13, 12, 12, 11, 11,	0,	0
+	dn 	0, 15,  0, 15,	0,	5, 10, 15,	0,	2,	4,	6,	8, 10, 12, 14,	0,	1,	2,	3,	4,	5,	6,	7,	8,	9, 10, 11, 12, 13, 14, 15
+	dn  0,	4,	8, 12,	1,	5,	9, 13,	2,	6, 10, 14,	3,	7, 11, 15, 15, 11,	7,	3, 14, 10,	6,	2, 13,	9,	5,	1, 12,	8,	4,	0
\ No newline at end of file
diff --git a/constants/music_constants.asm b/constants/music_constants.asm
index f48f94b..01e7779 100644
--- a/constants/music_constants.asm
+++ b/constants/music_constants.asm
@@ -107,6 +107,11 @@
 	const MUSIC_MOBILE_CENTER                ; 66
 	const MUSIC_NIHON_TOWN_01                ; 67
 	const MUSIC_SINJOH_RUINS                 ; 68
+	const MUSIC_LAVENDERCRYPT				 ; 69
+	const MUSIC_SOUTHCITY					 ; 6a
+	const MUSIC_NIHONTIME					 ; 6b
+	const MUSIC_PEACEFULTHEME				 ; 6c
+	const MUSIC_COASTTOWN					 ; 6d
 DEF NUM_MUSIC_SONGS EQU const_value
 
 ; GetMapMusic picks music for this value (see home/map.asm)