diff --git a/audio/music/ceruleancity.asm b/audio/music/ceruleancity.asm
index fdc3f8a68..78b1beb32 100644
--- a/audio/music/ceruleancity.asm
+++ b/audio/music/ceruleancity.asm
@@ -1,954 +1,796 @@
-; Pokémon HG/SS - Cerulean City
-; Demixed by FroggestSpirit
-; https://github.com/froggestspirit/CrystalComplete/blob/master/audio/music/custom/ceruleanGSC.asm
-
-Music_CeruleanCityHGSS: ; f5127
-	dbw $c0, Music_CeruleanCityHGSS_Ch1
-	dbw $01, Music_CeruleanCityHGSS_Ch2
-	dbw $02, Music_CeruleanCityHGSS_Ch3
-	dbw $03, Music_CeruleanCityHGSS_Ch4
-
-Music_CeruleanCityHGSS_Ch1:
-	tempo $94
-	volume $77
-	notetype $C, $B2
-	tone $0001
-	dutycycle 2
-	octave 4
-	note E_, 2
-	note D#, 2
-	note C#, 2
+; remixed by zumi in 2022
+
+Music_CeruleanCity:
+	channel_count 4
+	channel 1, Music_CeruleanCity_Ch1
+	channel 2, Music_CeruleanCity_Ch2
+	channel 3, Music_CeruleanCity_Ch3
+	channel 4, Music_CeruleanCity_Ch4
+
+; Drum constants, replace with the proper values
+DEF DRUM_CERULEAN_CITY_08	EQU	2
+DEF DRUM_CERULEAN_CITY_09	EQU	3
+DEF DRUM_CERULEAN_CITY_0a	EQU	4
+DEF DRUM_CERULEAN_CITY_0c	EQU	5
+DEF DRUM_CERULEAN_CITY_0d	EQU	8
+DEF DRUM_CERULEAN_CITY_0e	EQU	8
+
+; Drumset to use, replace with the proper value
+DEF DRUMSET_CERULEAN_CITY	EQU	3
+
+Music_CeruleanCity_Ch1:
+	tempo 75
+	volume 7, 7
+	note_type 12, 10, 2
+	vibrato 18, 3, 4
+	sound_call .pattern0
+.loop
+	sound_call .pattern1
+	sound_call .pattern1
+	sound_call .pattern2
+	sound_call .pattern3
+	sound_call .pattern8
+	sound_call .pattern4
+	sound_call .pattern5
+	sound_call .pattern6
+	sound_call .pattern7
+	sound_loop 0, .loop
+	sound_ret
+
+.pattern0
+	pitch_offset 1
+	rest 16
+	pitch_offset 1
+	rest 16
+	sound_ret
+
+.pattern1
+	duty_cycle 0
+	stereo_panning TRUE, FALSE
+	note_type 12, 13, 1
 	octave 3
+	note G#, 4
+	note E_, 2
+	octave 2
 	note B_, 2
-	note A_, 2
-	note B_, 2
-	octave 4
-	note C#, 2
-	note D#, 2
-Music_CeruleanCityHGSS_Loop1:
-	intensity $B1
-	octave 3
-	note G#, 2
-	octave 4
-	note G#, 2
 	octave 3
+	note G#, 4
+	note E_, 2
+	octave 2
 	note B_, 2
-	octave 4
-	note G#, 2
 	octave 3
-	note B_, 2
-	octave 4
-	note G#, 2
+	note G#, 4
+	note E_, 2
+	note C#, 2
+	note G#, 4
+	note E_, 2
+	note C#, 2
+	note A_, 4
+	note F#, 2
+	note D#, 2
+	note A_, 4
+	note D#, 2
+	note F#, 2
+	note B_, 4
+	note D#, 2
+	note F#, 2
+	note B_, 4
+	note D#, 2
+	note F#, 2
+	sound_ret
+
+.pattern2
+	duty_cycle 0
+	note_type 12, 13, 1
 	octave 3
+	note G#, 4
+	note E_, 2
+	octave 2
 	note B_, 2
-	octave 4
-	note G#, 2
 	octave 3
-	note A_, 2
+	note G#, 4
+	duty_cycle 2
+	stereo_panning FALSE, TRUE
+	note_type 12, 10, 2
 	octave 4
 	note E_, 2
 	octave 3
-	note A_, 2
+	note G#, 2
+	note B_, 4
 	octave 4
+	note C#, 4
+	note C#, 2
+	note D#, 2
 	note E_, 2
+	note F#, 2
+	note_type 12, 10, 4
+	note C#, 8
 	octave 3
-	note B_, 2
+	note B_, 4
+	note_type 12, 13, 1
 	octave 4
+	note C#, 2
 	note D#, 2
+	note_type 12, 10, 4
+	note C#, 8
 	octave 3
-	note B_, 2
-	octave 4
-	note D#, 2
+	note B_, 8
+	sound_ret
+
+.pattern3
+	duty_cycle 1
+	stereo_panning TRUE, FALSE
+	note_type 12, 11, 1
 	octave 3
-	note B_, 2
-	octave 4
 	note G#, 2
-	octave 3
-	note B_, 2
-	octave 4
 	note G#, 2
-	octave 3
-	note B_, 2
-	octave 4
 	note G#, 2
-	octave 3
-	note B_, 2
-	octave 4
 	note G#, 2
-	octave 3
-	note A_, 2
-	octave 4
+	note G#, 8
+	duty_cycle 0
+	note_type 12, 10, 2
+	note G#, 4
 	note E_, 2
-	octave 3
-	note A_, 2
-	octave 4
+	note C#, 2
+	note G#, 4
 	note E_, 2
+	note C#, 2
+	note A_, 4
+	note F#, 2
 	note D#, 2
-	note B_, 2
+	note A_, 4
 	note D#, 2
-	note B_, 2
-	octave 3
+	note F#, 2
 	note B_, 4
-	note B_, 2
-	note G#, 1
-	note G#, 1
-	note E_, 2
+	note D#, 2
 	note F#, 2
-	intensity $B4
-	note G#, 1
-	note A_, 1
-	note B_, 1
-	octave 4
-	note C#, 1
+	note B_, 4
+	note D#, 2
+	note F#, 2
+	sound_ret
+
+.pattern8
+	duty_cycle 1
+	note_type 12, 12, 3
 	octave 3
-	note B_, 6
-	octave 4
-	note C#, 1
+	note E_, 4
+	note F#, 4
+	sound_ret
+
+.pattern4
+	note_type 12, 10, 3
 	octave 3
-	note B_, 1
-	note A_, 8
-	intensity $B2
-	note G#, 1
-	note G#, 1
-	note G#, 1
-	note G#, 1
-	note G#, 2
-	note G#, 1
-	note G#, 1
-	note E_, 2
-	note F#, 2
-	intensity $B4
-	note G#, 1
-	note A_, 1
-	note B_, 1
+	note G#, 4
+	rest 4
 	octave 4
-	note C#, 1
+	note E_, 8
 	octave 3
-	note B_, 6
-	note G#, 1
-	note B_, 1
+	note B_, 8
+	note F#, 4
+	note G#, 4
+	note A_, 4
+	rest 4
 	octave 4
+	note F#, 8
 	note D#, 8
 	octave 3
-	note E_, 2
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note __, 3
-	note B_, 4
+	note F#, 4
 	note G#, 4
-	note B_, 2
-	note B_, 1
-	octave 4
-	note C#, 1
-	note D#, 1
-	note __, 3
-	note D#, 4
-	octave 3
-	note B_, 4
-	note A_, 1
-	note G#, 1
-	note A_, 1
-	note B_, 1
-	octave 4
-	note C#, 1
-	note __, 1
-	note C#, 1
+	sound_ret
+
+.pattern5
+	note_type 12, 10, 3
 	octave 3
-	note B_, 1
-	octave 4
-	note C#, 1
-	note D#, 1
-	note E_, 1
-	note __, 1
-	note E_, 1
-	note F#, 1
-	note E_, 1
-	note F#, 1
-	octave 5
-	note B_, 1
-	note F#, 1
-	note D#, 1
-	note C#, 1
-	octave 4
-	note B_, 1
-	octave 5
-	note C#, 1
-	note D#, 1
-	note F#, 1
-	note B_, 8
-	intensity $B6
+	note C#, 4
+	note_type 12, 13, 1
+	note C#, 2
+	octave 2
+	note B_, 2
 	octave 3
+	note C#, 2
+	note D#, 2
+	note_type 12, 10, 3
+	note E_, 4
+	note_type 12, 13, 1
+	note E_, 2
+	note D#, 2
+	note E_, 2
+	note F#, 2
+	note_type 12, 10, 6
+	note G#, 16
+	note_type 12, 10, 3
+	note F#, 16
+	sound_ret
+
+.pattern6
+	rest 4
+	duty_cycle 1
+	note_type 12, 10, 3
+	octave 2
+	note E_, 8
+	note E_, 8
+	octave 1
+	note F#, 8
 	note G#, 8
-	note G#, 4
+	note A_, 8
+	note A#, 4
 	note B_, 4
-	octave 4
-	note E_, 4
+	note A_, 4
+	note G#, 4
 	note F#, 4
+	sound_ret
+
+.pattern7
+	rest 4
+	duty_cycle 1
+	note_type 12, 10, 3
+	octave 2
+	note E_, 8
+	note E_, 8
+	octave 1
+	note F#, 8
 	note G#, 8
-;Channel1_Bar16:
-	note D#, 8
+	note A_, 8
+	note A#, 4
 	octave 3
-	note B_, 4
+	note_type 12, 10, 3
+	note E_, 4
+	note D#, 4
+	note C#, 4
+	note D#, 4
+	sound_ret
+
+Music_CeruleanCity_Ch2:
+	vibrato 15, 4, 4
+	sound_call .pattern0
+.loop
+	sound_call .pattern1
+	sound_call .pattern2
+	sound_call .pattern3
+	sound_call .pattern4
+	sound_call .pattern9
+	sound_call .pattern5
+	sound_call .pattern6
+	sound_call .pattern7
+	sound_call .pattern8
+	sound_loop 0, .loop
+	sound_ret
+
+.pattern0
+	duty_cycle 2
+	note_type 12, 12, 2
 	octave 4
+	note E_, 4
+	note D#, 4
+	note C#, 4
+	octave 3
 	note B_, 4
-;Channel1_Bar17:
 	note A_, 4
 	note B_, 4
-	intensity $B2
+	octave 4
+	note C#, 4
+	note D#, 4
+	sound_ret
+
+.pattern1
+	note_type 12, 12, 2
+	octave 4
+	note E_, 12
+	note_type 12, 12, 1
 	note E_, 2
-	note D#, 2
-	note C#, 2
-	note C_, 2
-;Channel1_Bar18:
-	loopchannel 0, Music_CeruleanCityHGSS_Loop1
-
-Music_CeruleanCityHGSS_Ch2:
-;Channel2_Bar1:
-	vibrato 12,$34
-	dutycycle 2
-	notetype 2, $C2
-	tone $0002
-	note __, 2
-	notetype 12, $C2
-	octave 5
+	octave 3
+	note B_, 2
+	note_type 12, 12, 2
+	octave 4
+	note C#, 4
+	note D#, 4
 	note E_, 2
-	note D#, 2
-	note C#, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note_type 12, 12, 4
+	note G#, 12
+	note_type 12, 12, 1
+	note A_, 2
+	note G#, 2
+	note_type 12, 12, 4
+	note F#, 16
+	sound_ret
+
+.pattern2
+	rest 12
+	note_type 12, 12, 1
 	octave 4
+	note E_, 2
+	octave 3
 	note B_, 2
+	note_type 12, 12, 2
+	octave 4
+	note C#, 4
+	note D#, 4
+	note E_, 2
+	note F#, 2
+	note G#, 2
 	note A_, 2
+	note_type 12, 12, 4
+	note G#, 12
+	note_type 12, 12, 1
+	note E_, 2
+	note G#, 2
+	note_type 12, 12, 4
+	note B_, 16
+	sound_ret
+
+.pattern3
+	rest 12
+	duty_cycle 1
+	stereo_panning TRUE, FALSE
+	note_type 12, 12, 1
+	octave 4
+	note E_, 2
+	octave 3
 	note B_, 2
-	octave 5
-	note C#, 2
-	notetype 2, $C2
-	note D#, 10
-;Channel2_Bar2:
-Music_CeruleanCityHGSS_Loop2:
-	notetype 12, $C2
-	note E_, 6
-	octave 3
-	note E_, 1
-	octave 2
-	note B_, 1
+	note_type 12, 12, 2
+	octave 4
+	note C#, 4
+	note D#, 4
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note_type 12, 12, 4
+	note G#, 12
+	note_type 12, 12, 1
+	note A_, 2
+	note G#, 2
+	note_type 12, 12, 4
+	note F#, 16
+	sound_ret
+
+.pattern4
+	duty_cycle 2
+	stereo_panning FALSE, TRUE
+	note_type 12, 13, 1
+	octave 4
+	note E_, 2
+	note E_, 2
+	note E_, 2
+	note E_, 2
+	note E_, 4
+	duty_cycle 1
+	stereo_panning TRUE, TRUE
+	note E_, 2
 	octave 3
+	note B_, 2
+	note_type 12, 13, 2
+	octave 4
+	note C#, 4
+	note D#, 4
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note_type 12, 12, 4
+	note G#, 12
+	note_type 12, 13, 1
+	note E_, 2
+	note G#, 2
+	note_type 12, 12, 4
+	note B_, 16
+	sound_ret
+
+.pattern9
+	duty_cycle 2
+	note_type 12, 10, 6
+	octave 4
 	note C#, 2
-	note D#, 2
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
-;Channel2_Bar3:
-	intensity $C4
-	note G#, 6
-	note A_, 1
-	note G#, 1
-	note F#, 14
-;Channel2_Bar4:
-	intensity $C2
-	note E_, 1
-	octave 2
-	note B_, 1
 	octave 3
+	note B_, 2
+	octave 4
 	note C#, 2
 	note D#, 2
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
-;Channel2_Bar5:
-	intensity $C4
-	note G#, 6
-	note E_, 1
-	note G#, 1
-	note B_, 14
-;Channel2_Bar6:
-	intensity $C2
-	dutycycle 1
-	octave 4
-	note E_, 1
-	octave 3
-	note B_, 1
+	sound_ret
+
+.pattern5
+	note_type 12, 12, 1
 	octave 4
+	note E_, 8
+	note_type 12, 12, 4
+	note G#, 8
+	note E_, 8
+	note_type 12, 12, 5
+	note D#, 2
 	note C#, 2
 	note D#, 2
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
-;Channel2_Bar7:
-	intensity $C4
-	note G#, 6
-	note A_, 1
-	note G#, 1
+	note E_, 2
+	note_type 12, 12, 1
 	note F#, 8
-;Channel2_Bar8:
-	intensity $C2
-	note B_, 1
-	note B_, 1
-	note B_, 1
-	note B_, 1
-	note B_, 2
-	note E_, 1
+	note_type 12, 12, 4
+	note B_, 8
+	note F#, 8
+	note_type 12, 12, 5
+	note C#, 2
 	octave 3
-	note B_, 1
+	note B_, 2
 	octave 4
 	note C#, 2
 	note D#, 2
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
-;Channel2_Bar9:
-	intensity $C4
-	note G#, 6
-	note E_, 1
-	note G#, 1
-	note B_, 8
-;Channel2_Bar10:
-	octave 3
-	note C#, 1
-	octave 2
-	note B_, 1
-	octave 3
-	note C#, 1
-	note D#, 1
-	note E_, 1
-	note __, 3
-	sound_duty 2, 2, 0, 0
-	dutycycle 0
+	sound_ret
+
+.pattern6
+	note_type 12, 12, 3
 	octave 4
-	note G#, 4
 	note E_, 4
-;Channel2_Bar11:
-	sound_duty 1, 1, 1, 1
-	dutycycle 1
+	note_type 12, 12, 5
+	note E_, 2
+	note D#, 2
+	note E_, 2
+	note F#, 2
+	note_type 12, 12, 3
+	note G#, 4
+	note_type 12, 12, 5
+	note G#, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note_type 12, 12, 3
+	note B_, 2
+	note F#, 2
+	note D#, 2
+	note C#, 2
 	octave 3
-	note D#, 1
-	note C#, 1
-	note D#, 1
-	note E_, 1
-	note F#, 1
-	note __, 3
-	sound_duty 2, 2, 0, 0
-	dutycycle 0
+	note B_, 2
 	octave 4
-	note B_, 4
-	note F#, 4
-;Channel2_Bar12:
-	sound_duty 1, 1, 1, 1
-	dutycycle 1
-	octave 3
-	note C#, 1
-	octave 2
-	note B_, 1
-	octave 3
-	note C#, 1
-	note D#, 1
-	note E_, 1
-	note __, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note __, 1
-	note G#, 1
-	note A_, 1
-	note G#, 1
-	note A_, 1
-;Channel2_Bar13:
-	note B_, 1
-	note F#, 1
-	note D#, 1
-	note C#, 1
+	note C#, 2
+	note D#, 2
+	note F#, 2
+	note B_, 16
+	sound_ret
+
+.pattern7
+	rest 16
+	rest 16
+	stereo_panning FALSE, TRUE
+	note_type 12, 12, 7
 	octave 2
-	note B_, 1
-	octave 3
-	note C#, 1
-	note D#, 1
-	note F#, 1
 	note B_, 8
-;Channel2_Bar14:
-	sound_duty 2, 2, 0, 0
-	intensity $C6
-	dutycycle 2
-	octave 4
-	note E_, 8
 	octave 3
-	note B_, 4
+	note F#, 8
+	note G#, 16
+	sound_ret
+
+.pattern8
+	note_type 12, 12, 7
+	octave 3
+	note B_, 16
+	note E_, 16
+	note F#, 16
+	stereo_panning TRUE, TRUE
+	note_type 12, 12, 2
 	octave 4
-	note F#, 4
-;Channel2_Bar15:
-	note G#, 4
-	note A_, 4
-	note B_, 8
-;Channel2_Bar16:
-	note B_, 8
-	note G#, 4
-	octave 5
+	note E_, 4
 	note D#, 4
-;Channel2_Bar17:
 	note C#, 4
 	note D#, 4
-	sound_duty 2, 2, 2, 2
-	notetype 2, $C2
-	note __, 2
-	notetype 12, $C2
-	note E_, 2
-	note D#, 2
-	note C#, 2
-	notetype 2, $C2
-	note D#, 10
-;Channel2_Bar18:
-	loopchannel 0, Music_CeruleanCityHGSS_Loop2
-
-Music_CeruleanCityHGSS_Ch3:
-	notetype 6, $15
-	vibrato 12, $24
-;Channel3_Bar1:
-	note __, 16
+	sound_ret
+
+Music_CeruleanCity_Ch3:
+	vibrato 18, 3, 3
+	note_type 12, 9, 2
+	sound_call .pattern0
+.loop
+	sound_call .pattern1
+	sound_call .pattern1
+	sound_call .pattern1
+	sound_call .pattern1
+	sound_call .pattern2
+	sound_call .pattern3
+	sound_call .pattern6
+	sound_call .pattern4
+	sound_call .pattern5
+	sound_loop 0, .loop
+	sound_ret
+
+.pattern0
+	rest 16
+	stereo_panning FALSE, TRUE
+	note_type 12, 2, 5
 	octave 4
-	note E_, 3
-	note __, 1
-	note D#, 3
-	note __, 1
-	note C#, 3
-	note __, 1
-	note C_, 3
-	note __, 1
-;Channel3_Bar2:
-Music_CeruleanCityHGSS_Loop3:
-	octave 1
-	note E_, 2
-	note __, 6
-	note E_, 2
-	note __, 4
-	note E_, 1
-	note __, 1
-	note E_, 2
-	note __, 2
-	octave 2
-	note E_, 2
-	note __, 2
-	octave 1
-	note E_, 2
-	note __, 2
-	octave 2
-	note E_, 2
-	note __, 2
-	octave 1
-	note F#, 2
-	note __, 6
-	note F#, 2
-	note __, 4
-	octave 2
-	note C#, 2
-	octave 1
-	note B_, 2
-	note __, 2
-	octave 2
-	note B_, 2
-	note __, 2
-	octave 1
-	note B_, 2
-	note __, 2
-	octave 2
-	note B_, 2
-	note __, 2
-	octave 1
-	note E_, 2
-	note __, 6
-	note E_, 2
-	note __, 4
-	note E_, 1
-	note __, 1
-	note E_, 2
-	note __, 2
-	octave 2
-	note E_, 2
-	note __, 2
-	octave 1
-	note E_, 2
-	note __, 2
-	octave 2
-	note E_, 2
-	note __, 2
-	octave 1
-	note F#, 2
-	note __, 6
-	note F#, 2
-	note __, 4
-	octave 2
-	note C#, 2
-	octave 1
-	note B_, 2
-	note __, 2
+	note E_, 4
+	note D#, 4
+	note C#, 4
+	note C_, 4
+	sound_ret
+
+.pattern1
+	stereo_panning TRUE, TRUE
+	note_type 12, 2, 6
 	octave 2
-	note B_, 2
-	note __, 2
+	note E_, 4
+	rest 2
+	note G#, 1
+	rest 1
+	note E_, 4
 	octave 1
-	note B_, 2
+	note B_, 3
+	rest 1
 	octave 2
-	note B_, 2
-	octave 4
-	note B_, 2
-	octave 3
-	note B_, 2
-	octave 1
-	note E_, 2
-	note __, 2
-	octave 5
+	note E_, 4
 	note G#, 1
-	note __, 3
-	octave 1
-	note E_, 2
-	note __, 2
-	octave 5
+	rest 3
+	note E_, 4
 	note G#, 1
-	note __, 1
-	octave 1
-	note E_, 1
-	note __, 1
-	note E_, 2
-	note __, 2
-	octave 5
+	rest 3
+	note F#, 4
+	rest 2
 	note G#, 1
-	note __, 1
-	octave 2
-	note E_, 2
-	octave 1
-	note E_, 2
+	rest 1
+	note F#, 4
+	note A_, 4
+	note B_, 3
+	rest 1
+	note A_, 1
+	note B_, 1
+	note A_, 2
+	note G#, 4
+	note F#, 4
+	sound_ret
+
+.pattern2
+	note_type 12, 2, 6
 	octave 2
-	note E_, 2
-	octave 5
-	note G#, 1
-	note __, 1
-	octave 1
-	note E_, 2
-	note F#, 2
-	note __, 2
-	octave 6
-	note C#, 1
-	note __, 3
-	octave 1
-	note F#, 2
-	note __, 2
-	octave 6
-	note C#, 1
-	note __, 1
+	note E_, 4
+	note F#, 4
+	sound_ret
+
+.pattern3
 	octave 2
+	note G#, 4
+	octave 3
 	note C#, 2
-	octave 1
-	note B_, 2
-	note __, 2
-	octave 6
-	note D#, 1
-	note __, 1
+	rest 2
 	octave 2
-	note B_, 2
-	octave 1
-	note B_, 2
-	octave 2
-	note B_, 2
-	octave 6
-	note D#, 1
-	note __, 1
-	octave 1
-	note B_, 2
-	octave 2
-	note E_, 2
+	note G#, 4
 	octave 3
-	note E_, 2
-	octave 4
-	note E_, 2
-	octave 5
-	note E_, 2
-	octave 1
-	note E_, 2
-	note __, 2
-	octave 5
-	note G#, 1
-	note __, 1
-	octave 1
-	note E_, 1
-	note __, 1
-	note E_, 2
-	note __, 2
-	octave 5
-	note G#, 1
-	note __, 1
+	note C#, 2
+	rest 2
 	octave 2
-	note E_, 2
-	octave 1
-	note E_, 2
+	note G#, 4
+	octave 3
+	note C#, 2
+	rest 2
 	octave 2
-	note E_, 2
-	octave 5
-	note G#, 1
-	note __, 1
-	octave 1
-	note E_, 2
-	note F#, 2
-	note __, 2
-	octave 5
-	note E_, 1
-	note __, 3
-	octave 1
+	note G#, 2
 	note F#, 2
-	note __, 2
-	octave 5
-	note E_, 1
-	note __, 1
-	octave 2
-	note C#, 2
-	octave 1
-	note B_, 2
-	note __, 2
-	octave 5
-	note F#, 1
-	note __, 1
-	octave 1
-	note B_, 2
 	note G#, 2
-	octave 4
-	note D#, 2
-	octave 5
-	note G#, 1
-	note __, 1
+	note A_, 2
+	note B_, 4
 	octave 3
-	note G#, 2
+	note D#, 2
+	rest 2
 	octave 2
-	note C#, 2
-	note __, 6
-	note C#, 2
-	note __, 4
-	note C#, 1
-	note __, 1
-	note C#, 2
-	note __, 2
+	note B_, 4
 	octave 3
-	note C#, 2
-	note __, 2
+	note D#, 2
+	rest 2
 	octave 2
-	note C#, 2
-	note __, 2
+	note B_, 4
 	octave 3
-	note C#, 2
-	note __, 2
-	octave 1
-	note G#, 2
-	note __, 6
-	note G#, 2
-	note __, 4
-	note G#, 1
-	note __, 1
-	note G#, 2
-	note __, 2
+	note D#, 2
+	rest 2
 	octave 2
 	note G#, 2
-	note __, 2
-	octave 1
-	note G#, 2
-	note __, 2
-	octave 2
+	note F#, 2
 	note G#, 2
-	note __, 2
-	octave 1
-	note A_, 4
-	octave 2
 	note A_, 2
-	note __, 2
-	octave 1
+	sound_ret
+
+.pattern4
+	note_type 12, 1, 1
+	octave 5
+	note E_, 14
+	note D#, 1
+	note C#, 1
+	octave 4
+	note B_, 8
+	octave 5
+	note F#, 8
+	note G#, 8
+	note A_, 8
+	note B_, 16
+	sound_ret
+
+.pattern5
+	octave 5
+	note B_, 16
+	note G#, 8
+	octave 6
+	note D#, 7
+	note D_, 1
+	note C#, 8
+	note D#, 8
+	note_type 12, 2, 6
+	octave 2
+	note B_, 3
+	rest 1
+	note A_, 1
+	note B_, 1
 	note A_, 2
-	note __, 2
 	note G#, 4
-	octave 2
-	note G#, 2
-	note __, 2
-	octave 1
-	note G#, 2
-	note __, 2
 	note F#, 4
+	sound_ret
+
+.pattern6
+	octave 3
+	note C#, 4
+	rest 8
 	octave 2
-	note F#, 2
-	note __, 2
-	octave 1
-	note F#, 2
-	note __, 2
-	note B_, 2
-	note __, 2
-	note B_, 8
-	note __, 16
-	note __, 4
-	octave 2
-	note E_, 2
-	note __, 2
-	octave 1
-	note E_, 2
-	note __, 2
-	octave 2
-	note E_, 2
-	note __, 6
-	note E_, 2
-	note __, 2
-	octave 1
-	note E_, 2
-	note __, 2
-	octave 2
-	note E_, 2
-	note __, 6
-	note F#, 2
-	note __, 2
-	octave 1
-	note F#, 2
-	note __, 2
-	octave 2
-	note F#, 2
-	note __, 6
-	note F#, 2
-	note __, 2
-	octave 1
-	note F#, 2
-	note __, 2
-	octave 2
-	note F#, 2
-	note __, 6
-	note G#, 2
-	note __, 2
-	octave 1
-	note G#, 2
-	note __, 2
-	octave 2
-	note G#, 2
-	note __, 6
-	note G#, 2
-	note __, 2
-	octave 1
-	note G#, 2
-	note __, 2
-	octave 2
-	note G#, 2
-	note __, 6
-	note A_, 2
-	note __, 2
-	octave 1
-	note A_, 2
-	note __, 2
+	note A_, 4
+	note A#, 4
+	octave 3
+	note C#, 4
 	octave 2
-	note A_, 2
-	note __, 6
-	note A_, 2
-	note __, 2
+	note B_, 8
 	octave 1
-	note A_, 2
-	note __, 2
+	note B_, 8
 	octave 2
+	note B_, 3
+	rest 1
+	note A_, 1
+	note B_, 1
 	note A_, 2
-	note __, 2
-	loopchannel 0, Music_CeruleanCityHGSS_Loop3
-
-Music_CeruleanCityHGSS_Ch4:
-	notetype $C
-	togglenoise 0
-;Channel4_Bar1:
-	note __, 16
-;Channel4_Bar2:
-Music_CeruleanCityHGSS_Loop4:
-	note A#, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-;Channel4_Bar3:
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-;Channel4_Bar4:
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-;Channel4_Bar5:
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note F_, 1
-;Channel4_Bar6:
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-;Channel4_Bar7:
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note A#, 2
-;Channel4_Bar8:
-	note F_, 1
-	note F_, 1
-	note G_, 1
-	note F_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-;Channel4_Bar9:
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 2
-	note A#, 2
-	note D_, 2
-	note D_, 1
-	note F_, 1
-;Channel4_Bar10:
-	note A#, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-;Channel4_Bar11:
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note A#, 2
-;Channel4_Bar12:
-	note A#, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note A_, 2
-	note G_, 1
-	note G_, 1
-;Channel4_Bar13:
-	note D_, 2
-	note D_, 2
-	note D_, 12
-;Channel4_Bar14:
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-;Channel4_Bar15:
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-;Channel4_Bar16:
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-;Channel4_Bar17:
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note A#, 2
-	note D_, 2
-	note F_, 1
-	note F_, 1
-;Channel4_Bar18:
-	loopchannel 0, Music_CeruleanCityHGSS_Loop4
\ No newline at end of file
+	note G#, 4
+	note F#, 4
+	sound_ret
+
+Music_CeruleanCity_Ch4:
+	toggle_noise DRUMSET_CERULEAN_CITY
+	drum_speed 12
+	sound_call .pattern0
+.loop
+	sound_call .pattern1
+	sound_call .pattern1
+	sound_call .pattern1
+	sound_call .pattern2
+	sound_call .pattern6
+	sound_call .pattern1
+	sound_call .pattern3
+	sound_call .pattern5
+	sound_call .pattern4
+	sound_loop 0, .loop
+	sound_ret
+
+.pattern0
+	rest 16
+	drum_note DRUM_CERULEAN_CITY_0a, 4
+	drum_note DRUM_CERULEAN_CITY_09, 4
+	drum_note DRUM_CERULEAN_CITY_0a, 2
+	drum_note DRUM_CERULEAN_CITY_0a, 2
+	drum_note DRUM_CERULEAN_CITY_09, 4
+	sound_ret
+
+.pattern1
+	drum_note DRUM_CERULEAN_CITY_0a, 4
+	drum_note DRUM_CERULEAN_CITY_0e, 2
+	drum_note DRUM_CERULEAN_CITY_0e, 2
+	drum_note DRUM_CERULEAN_CITY_09, 4
+	drum_note DRUM_CERULEAN_CITY_0e, 4
+	drum_note DRUM_CERULEAN_CITY_0a, 4
+	drum_note DRUM_CERULEAN_CITY_0e, 4
+	drum_note DRUM_CERULEAN_CITY_09, 4
+	drum_note DRUM_CERULEAN_CITY_0e, 4
+	drum_note DRUM_CERULEAN_CITY_0a, 4
+	drum_note DRUM_CERULEAN_CITY_0e, 2
+	drum_note DRUM_CERULEAN_CITY_0e, 2
+	drum_note DRUM_CERULEAN_CITY_09, 4
+	drum_note DRUM_CERULEAN_CITY_0e, 4
+	drum_note DRUM_CERULEAN_CITY_0a, 4
+	drum_note DRUM_CERULEAN_CITY_0e, 4
+	drum_note DRUM_CERULEAN_CITY_09, 4
+	drum_note DRUM_CERULEAN_CITY_0e, 2
+	drum_note DRUM_CERULEAN_CITY_09, 2
+	sound_ret
+
+.pattern2
+	drum_note DRUM_CERULEAN_CITY_09, 2
+	drum_note DRUM_CERULEAN_CITY_09, 2
+	drum_note DRUM_CERULEAN_CITY_08, 2
+	drum_note DRUM_CERULEAN_CITY_0e, 2
+	drum_note DRUM_CERULEAN_CITY_09, 4
+	drum_note DRUM_CERULEAN_CITY_0e, 4
+	drum_note DRUM_CERULEAN_CITY_0a, 4
+	drum_note DRUM_CERULEAN_CITY_0e, 4
+	drum_note DRUM_CERULEAN_CITY_09, 4
+	drum_note DRUM_CERULEAN_CITY_0e, 4
+	drum_note DRUM_CERULEAN_CITY_0a, 4
+	drum_note DRUM_CERULEAN_CITY_0e, 2
+	drum_note DRUM_CERULEAN_CITY_0e, 2
+	drum_note DRUM_CERULEAN_CITY_09, 4
+	drum_note DRUM_CERULEAN_CITY_0e, 4
+	drum_note DRUM_CERULEAN_CITY_0a, 4
+	drum_note DRUM_CERULEAN_CITY_0e, 4
+	drum_note DRUM_CERULEAN_CITY_09, 4
+	drum_note DRUM_CERULEAN_CITY_0e, 2
+	drum_note DRUM_CERULEAN_CITY_09, 2
+	sound_ret
+
+.pattern6
+	drum_note DRUM_CERULEAN_CITY_09, 2
+	drum_note DRUM_CERULEAN_CITY_09, 2
+	drum_note DRUM_CERULEAN_CITY_0e, 2
+	drum_note DRUM_CERULEAN_CITY_09, 2
+	sound_ret
+
+.pattern3
+	drum_note DRUM_CERULEAN_CITY_09, 4
+	drum_note DRUM_CERULEAN_CITY_09, 2
+	drum_note DRUM_CERULEAN_CITY_09, 2
+	drum_note DRUM_CERULEAN_CITY_0a, 2
+	drum_note DRUM_CERULEAN_CITY_09, 2
+	drum_note DRUM_CERULEAN_CITY_09, 4
+	drum_note DRUM_CERULEAN_CITY_0a, 2
+	drum_note DRUM_CERULEAN_CITY_09, 2
+	drum_note DRUM_CERULEAN_CITY_09, 4
+	drum_note DRUM_CERULEAN_CITY_0a, 8
+	drum_note DRUM_CERULEAN_CITY_09, 6
+	drum_note DRUM_CERULEAN_CITY_0a, 2
+	drum_note DRUM_CERULEAN_CITY_0a, 4
+	drum_note DRUM_CERULEAN_CITY_09, 4
+	drum_note DRUM_CERULEAN_CITY_0a, 2
+	drum_note DRUM_CERULEAN_CITY_09, 4
+	drum_note DRUM_CERULEAN_CITY_09, 2
+	sound_ret
+
+.pattern4
+	drum_note DRUM_CERULEAN_CITY_0c, 4
+	drum_note DRUM_CERULEAN_CITY_0d, 2
+	drum_note DRUM_CERULEAN_CITY_0d, 2
+	drum_note DRUM_CERULEAN_CITY_0c, 4
+	drum_note DRUM_CERULEAN_CITY_0d, 2
+	drum_note DRUM_CERULEAN_CITY_0d, 2
+	drum_note DRUM_CERULEAN_CITY_0c, 4
+	drum_note DRUM_CERULEAN_CITY_0d, 2
+	drum_note DRUM_CERULEAN_CITY_0d, 2
+	drum_note DRUM_CERULEAN_CITY_0c, 4
+	drum_note DRUM_CERULEAN_CITY_0d, 2
+	drum_note DRUM_CERULEAN_CITY_0d, 2
+	drum_note DRUM_CERULEAN_CITY_0c, 4
+	drum_note DRUM_CERULEAN_CITY_0d, 2
+	drum_note DRUM_CERULEAN_CITY_0d, 2
+	drum_note DRUM_CERULEAN_CITY_0c, 4
+	drum_note DRUM_CERULEAN_CITY_0d, 2
+	drum_note DRUM_CERULEAN_CITY_0d, 2
+	drum_note DRUM_CERULEAN_CITY_0a, 2
+	drum_note DRUM_CERULEAN_CITY_09, 2
+	drum_note DRUM_CERULEAN_CITY_0e, 4
+	drum_note DRUM_CERULEAN_CITY_09, 4
+	drum_note DRUM_CERULEAN_CITY_09, 2
+	drum_note DRUM_CERULEAN_CITY_09, 2
+	sound_ret
+
+.pattern5
+	drum_note DRUM_CERULEAN_CITY_0c, 4
+	drum_note DRUM_CERULEAN_CITY_0d, 2
+	drum_note DRUM_CERULEAN_CITY_0d, 2
+	drum_note DRUM_CERULEAN_CITY_0c, 4
+	drum_note DRUM_CERULEAN_CITY_0d, 2
+	drum_note DRUM_CERULEAN_CITY_0d, 2
+	drum_note DRUM_CERULEAN_CITY_0c, 4
+	drum_note DRUM_CERULEAN_CITY_0d, 2
+	drum_note DRUM_CERULEAN_CITY_0d, 2
+	drum_note DRUM_CERULEAN_CITY_0c, 4
+	drum_note DRUM_CERULEAN_CITY_0d, 2
+	drum_note DRUM_CERULEAN_CITY_0d, 2
+	drum_note DRUM_CERULEAN_CITY_0c, 4
+	drum_note DRUM_CERULEAN_CITY_0d, 2
+	drum_note DRUM_CERULEAN_CITY_0d, 2
+	drum_note DRUM_CERULEAN_CITY_0c, 4
+	drum_note DRUM_CERULEAN_CITY_0d, 2
+	drum_note DRUM_CERULEAN_CITY_0d, 2
+	drum_note DRUM_CERULEAN_CITY_0c, 4
+	drum_note DRUM_CERULEAN_CITY_0d, 2
+	drum_note DRUM_CERULEAN_CITY_0d, 2
+	drum_note DRUM_CERULEAN_CITY_0c, 4
+	drum_note DRUM_CERULEAN_CITY_0d, 2
+	drum_note DRUM_CERULEAN_CITY_0d, 2
+	sound_ret
\ No newline at end of file
diff --git a/audio/music_pointers.asm b/audio/music_pointers.asm
index b993d7b4d..be69b9107 100644
--- a/audio/music_pointers.asm
+++ b/audio/music_pointers.asm
@@ -110,7 +110,7 @@ Music:
 ; new to SourCrystal
 	dba Music_Route47HGSS
 	dba Music_SafariZoneGateHGSS
-	dba Music_CeruleanCityHGSS
+	dba Music_CeruleanCity
 	dba Music_NuggetBridgeHGSS
 	dba Music_CinnabarIslandHGSS
 	dba Music_HoOhBattleHGSS