Gen 1 style music for the Sevii islands (more needs to be added later but i'll get to it :V)

README.md

@@ -174,6 +174,7 @@ JEP-affiliated musicians require music to be used with direct credit for non-com
 
 ### Unaffiliated
 - FroggestSpirit: HGSS Poke Mart Demix
+- TempoQuill: Gen 1 Style Remixes of Lake of Rage and Azalea Town (used in the Sevii Islands)
 
 ## Other Sources
 - Nob Ogasawara (Many prototype Pokemon names)

audio.asm

@@ -176,6 +176,8 @@ INCLUDE "audio/music/FloodedShrine.asm"
 INCLUDE "audio/music/AlphalithBattle.asm"
 INCLUDE "audio/music/FortunaSF.asm"
 INCLUDE "audio/music/JasperForest.asm"
+INCLUDE "audio/music/sevii.asm"
+INCLUDE "audio/music/FourIsland.asm"
 
 SECTION "Sound Effects", ROMX
 

audio/music/FourIsland.asm

@@ -0,0 +1,343 @@
+; By TempoQuill, From https://github.com/TempoQuill/PokeGoldG1/blob/main/audio/music/azalea.asm
+Music_FourIsland:
+	channel_count 4
+	channel 1, Music_FourIsland_Ch1
+	channel 2, Music_FourIsland_Ch2
+	channel 3, Music_FourIsland_Ch3
+	channel 4, Music_FourIsland_Ch4
+
+Music_FourIsland_Ch1:
+	tempo 149
+	volume 7, 7
+	pitch_offset 1
+	duty_cycle 3
+.mainloop:
+	note_type 12, 11, 3
+	sound_call .sub1
+	note A_, 8
+	note B_, 8
+	sound_call .sub1
+	note F#, 8
+	note D#, 8
+	octave 2
+	note B_, 4
+	octave 3
+	note D#, 4
+	note F#, 4
+	note B_, 4
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G#, 10
+	octave 2
+	note B_, 4
+	octave 3
+	note C#, 4
+	note D#, 4
+	note F#, 4
+	note F#, 2
+	note G#, 2
+	note F#, 2
+	note E_, 10
+	volume_envelope 10, 6
+	note A_, 8
+	note G#, 8
+	note F#, 8
+	note E_, 8
+	volume_envelope 10, 3
+	note D#, 6
+	note C#, 6
+	note F#, 4
+	note B_, 6
+	octave 4
+	note C#, 6
+	note D#, 4
+	sound_jump .mainloop
+
+.sub1:
+	rest 4
+	octave 3
+	note E_, 4
+	note G#, 12
+	note C#, 4
+	note E_, 4
+	note C#, 4
+	note A_, 8
+	note G#, 8
+	note A_, 8
+	octave 4
+	note C#, 8
+	octave 3
+	note E_, 8
+	note G#, 4
+	note E_, 2
+	note D#, 2
+	note C#, 8
+	note B_, 4
+	note A_, 2
+	note G#, 2
+	note A_, 8
+	note G#, 8
+	sound_ret
+
+Music_FourIsland_Ch2:
+	duty_cycle 3
+.mainloop:
+	sound_call .sub1
+	note E_, 2
+	rest 2
+	note F#, 10
+	sound_call .sub1
+	octave 2
+	note B_, 2
+	rest 2
+	octave 3
+	note B_, 10
+	duty_cycle 2
+	vibrato 0, 0, 0
+	volume_envelope 10, 5
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note B_, 4
+	note A_, 4
+	note G#, 2
+	note F#, 2
+	note G#, 2
+	note F#, 2
+	note E_, 10
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note F#, 4
+	note B_, 4
+	octave 4
+	note D#, 2
+	note D#, 2
+	note E_, 2
+	note D#, 2
+	octave 3
+	note G#, 10
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note G#, 4
+	note F#, 4
+	note E_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note G#, 4
+	octave 4
+	note C#, 4
+	note D#, 2
+	octave 3
+	note B_, 16
+	duty_cycle 3
+	volume_envelope 10, 3
+	note D#, 6
+	note E_, 6
+	note F#, 4
+	sound_jump .mainloop
+
+.sub1:
+	vibrato 7, 2, 2
+	note_type 12, 12, 5
+	octave 4
+	note E_, 2
+	octave 3
+	note B_, 2
+	octave 4
+	note D#, 2
+	note E_, 4
+	note F#, 4
+	note G#, 2
+	note B_, 6
+	note G#, 4
+	note F#, 4
+	note G#, 2
+	note E_, 12
+	vibrato 0, 0, 0
+	volume_envelope 11, 4
+	octave 3
+	note E_, 4
+	note C#, 8
+	note E_, 8
+	vibrato 7, 2, 2
+	volume_envelope 12, 5
+	octave 4
+	note A_, 8
+	vibrato 0, 0, 0
+	volume_envelope 11, 4
+	octave 3
+	note C#, 4
+	vibrato 7, 2, 2
+	volume_envelope 12, 5
+	octave 4
+	note G#, 2
+	note F#, 2
+	note E_, 8
+	vibrato 0, 0, 0
+	volume_envelope 11, 4
+	octave 3
+	note E_, 4
+	vibrato 7, 2, 2
+	volume_envelope 12, 5
+	octave 4
+	note D#, 2
+	note E_, 2
+	note F#, 16
+	volume_envelope 11, 4
+	octave 3
+	note D#, 2
+	sound_ret
+
+Music_FourIsland_Ch3:
+	note_type 12, 1, 0
+.mainloop:
+	sound_call .sub1
+	sound_call .sub1
+	sound_call .sub3
+.loop1:
+	note G#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	sound_loop 4, .loop1
+	sound_call .sub3
+.loop2:
+	octave 4
+	note G#, 1
+	rest 1
+	octave 5
+	note C#, 1
+	rest 1
+	sound_loop 4, .loop2
+.loop3:
+	octave 4
+	note A_, 1
+	rest 1
+	octave 5
+	note C#, 1
+	rest 1
+	sound_loop 7, .loop3
+	octave 4
+	note A#, 1
+	rest 1
+	octave 5
+	note C#, 1
+	rest 1
+	sound_call .sub2
+	sound_jump .mainloop
+
+.sub1:
+	octave 4
+	note G#, 1
+	rest 1
+	octave 5
+	note E_, 1
+	rest 1
+	sound_loop 4, .sub1
+	octave 4
+.sub1loop1:
+	note G#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	sound_loop 3, .sub1loop1
+	note E_, 1
+	rest 1
+	note B_, 1
+	rest 1
+.sub1loop2:
+	note A_, 1
+	rest 1
+	octave 5
+	note C#, 1
+	rest 1
+	octave 4
+	note A_, 1
+	rest 1
+	octave 5
+	note C#, 1
+	rest 1
+	octave 4
+	note A_, 1
+	rest 1
+	octave 5
+	note C#, 1
+	rest 1
+	octave 4
+	note B_, 1
+	rest 1
+	octave 5
+	note C#, 1
+	rest 1
+	octave 4
+	note F#, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note A_, 1
+	rest 1
+	octave 5
+	note C#, 1
+	rest 1
+	octave 4
+	note A_, 1
+	rest 1
+	sound_loop 2, .sub1loop2
+.sub2:
+	octave 4
+	note B_, 1
+	rest 1
+	octave 5
+	note D#, 1
+	rest 1
+	sound_loop 5, .sub2
+	note F#, 1
+	rest 1
+	note D#, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note D#, 1
+	rest 1
+	octave 4
+	note B_, 1
+	rest 1
+	octave 5
+	note D#, 1
+	rest 1
+	sound_ret
+
+.sub3:
+	octave 4
+	note A_, 1
+	rest 1
+	octave 5
+	note D#, 1
+	rest 1
+	sound_loop 4, .sub3
+	octave 4
+	sound_ret
+
+Music_FourIsland_Ch4:
+	toggle_noise 0
+	drum_speed 12
+.mainloop:
+	drum_note 6, 6
+	drum_note 6, 6
+	drum_note 7, 4
+	drum_note 6, 6
+	drum_note 6, 4
+	drum_note 6, 2
+	drum_note 7, 2
+	drum_note 6, 2
+	sound_jump .mainloop

audio/music/sevii.asm

@@ -0,0 +1,318 @@
+; By TempoQuill, From https://github.com/TempoQuill/PokeGoldG1/blob/main/audio/music/lakeofrage.asm
+Music_Sevii:
+	channel_count 4
+	channel 1, Music_Sevii_Ch1
+	channel 2, Music_Sevii_Ch2
+	channel 3, Music_Sevii_Ch3
+	channel 4, Music_Sevii_Ch4
+
+Music_Sevii_Ch1:
+	tempo 154
+	volume 7, 7
+	duty_cycle 2
+	pitch_offset 1
+	vibrato 8, 3, 2
+	note_type 12, 10, 7
+	octave 3
+.mainloop:
+	sound_call .sub1
+	note F_, 8
+	note F_, 4
+	note E_, 4
+	note D_, 8
+	note A#, 4
+	octave 4
+	note D_, 4
+	sound_call .sub1
+	note A_, 8
+	note F_, 4
+	note E_, 4
+	note D_, 8
+	note A#, 4
+	octave 4
+	note D_, 4
+	octave 3
+	note A#, 4
+	note A_, 4
+	note G_, 4
+	note F_, 4
+	note E_, 4
+	note F_, 4
+	note E_, 2
+	note F_, 2
+	note E_, 2
+	note C_, 2
+	octave 2
+	note A#, 8
+	octave 3
+	note D_, 8
+	note F_, 8
+	note A#, 4
+	note F_, 4
+	note G_, 6
+	note A_, 6
+	note G_, 4
+	note E_, 6
+	octave 4
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	octave 3
+	note A#, 2
+	sound_jump .mainloop
+
+.sub1:
+	octave 3
+	note A_, 6
+	note A_, 1
+	note A#, 1
+	octave 4
+	note C_, 8
+	note C_, 6
+	note D_, 1
+	note E_, 1
+	note C_, 4
+	octave 3
+	note A#, 4
+	sound_ret
+
+Music_Sevii_Ch2:
+	duty_cycle 3
+	vibrato 20, 2, 4
+.mainloop:
+	note_type 12, 13, 0
+	octave 3
+	note F_, 8
+	volume_envelope 13, 7
+	note F_, 8
+	volume_envelope 13, 0
+	note G_, 8
+	volume_envelope 13, 7
+	note G_, 8
+	volume_envelope 13, 0
+	octave 4
+	note C_, 8
+	note_type 8, 13, 7
+	note C_, 4
+	octave 3
+	note G_, 4
+	octave 4
+	note C_, 4
+	volume_envelope 13, 0
+	note G_, 12
+	volume_envelope 13, 7
+	note G_, 4
+	note A#, 4
+	note A_, 4
+	note_type 12, 13, 0
+	note F_, 8
+	volume_envelope 13, 7
+	note F_, 4
+	note A_, 4
+	note G_, 3
+	note F_, 1
+	note E_, 12
+	note_type 8, 13, 7
+	octave 3
+	note F_, 4
+	note E_, 4
+	note D_, 4
+	note_type 12, 13, 7
+	note D_, 8
+	note F_, 2
+	note A#, 1
+	octave 4
+	note D_, 1
+	note F_, 1
+	rest 1
+	note D_, 1
+	note F_, 1
+	note A#, 8
+	octave 3
+	note C_, 2
+	octave 4
+	note G_, 4
+	note F_, 4
+	note E_, 4
+	note D_, 2
+	note_type 8, 13, 7
+	note C_, 4
+	note D_, 4
+	note E_, 4
+	note G_, 12
+	octave 3
+	note F_, 4
+	note E_, 4
+	note D_, 4
+	note A#, 4
+	note A_, 4
+	note G_, 4
+	octave 4
+	note D_, 4
+	note C_, 4
+	octave 3
+	note A#, 4
+	octave 4
+	note F_, 4
+	note E_, 4
+	note D_, 4
+	note_type 12, 13, 0
+	note E_, 8
+	volume_envelope 13, 7
+	note E_, 6
+	note E_, 1
+	note F_, 1
+	volume_envelope 13, 0
+	note G_, 8
+	volume_envelope 13, 7
+	note G_, 8
+	sound_jump .mainloop
+
+Music_Sevii_Ch3:
+	note_type 12, 1, 4
+.mainloop:
+	sound_call .sub1
+	sound_call .sub1
+	sound_call .sub2
+.loop1:
+	octave 3
+	note A#, 1
+	rest 1
+	octave 4
+	note D_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	octave 3
+	note A#, 1
+	rest 1
+	octave 4
+	note F_, 1
+	rest 1
+	note A#, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	sound_loop 2, .loop1
+	sound_call .sub2
+	sound_jump .mainloop
+
+.sub1:
+	octave 3
+	note F_, 1
+	rest 1
+	octave 4
+	note C_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	sound_loop 2, .sub1
+	rest 2
+	note F_, 1
+	note C_, 1
+.sub1loop1:
+	octave 3
+	note E_, 1
+	rest 1
+	octave 4
+	note C_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	sound_loop 2, .sub1loop1
+	octave 3
+	note E_, 1
+	rest 1
+	octave 4
+	note C_, 1
+	rest 1
+	octave 3
+	note D_, 1
+	rest 1
+	octave 4
+	note D_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	octave 3
+	note F_, 1
+	rest 1
+	octave 4
+	note D_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	octave 3
+	note A_, 1
+	rest 1
+	octave 4
+	note F_, 1
+	rest 1
+.sub1loop2:
+	octave 3
+	note A#, 1
+	rest 1
+	octave 4
+	note F_, 1
+	rest 1
+	note A#, 1
+	rest 1
+	sound_loop 2, .sub1loop2
+	note A_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	sound_ret
+
+.sub2:
+	octave 4
+	note C_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note C_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	octave 5
+	note C_, 1
+	rest 1
+	octave 4
+	note E_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	sound_loop 2, .sub2
+	sound_ret
+
+Music_Sevii_Ch4:
+	toggle_noise 0
+	drum_speed 6
+.mainloop:
+	sound_call .sub1
+	drum_note 6, 4
+	drum_note 4, 4
+	sound_call .sub1
+	drum_note 7, 4
+	drum_note 4, 1
+	drum_note 4, 1
+	drum_note 3, 1
+	drum_note 2, 1
+	sound_jump .mainloop
+
+.sub1:
+	drum_note 2, 4
+	drum_note 4, 2
+	drum_note 4, 2
+	drum_note 2, 4
+	drum_note 4, 2
+	drum_note 4, 2
+	drum_note 2, 2
+	drum_note 4, 2
+	drum_note 2, 4
+	sound_ret

audio/music_pointers.asm

@@ -128,4 +128,6 @@ Music:
 	dba Music_AlphalithBattle
 	dba Music_FortunaSF
 	dba Music_JasperForest
+	dba Music_Sevii
+	dba Music_FourIsland
 	assert_table_length NUM_MUSIC_SONGS

constants/music_constants.asm

@@ -126,6 +126,8 @@
 	const MUSIC_ALPHALITHBATTLE				 ; 79
 	const MUSIC_FORTUNASF					 ; 7a
 	const MUSIC_JASPERFOREST				 ; 7b
+	const MUSIC_SEVII						 ; 7c
+	const MUSIC_FOURISLAND					 ; 7d (We're coming up on $80, there's a fix in the pokecrystal design flaws section but that and above may be buggy)
 DEF NUM_MUSIC_SONGS EQU const_value
 
 ; GetMapMusic picks music for this value (see home/map.asm)

data/maps/maps.asm

@@ -624,48 +624,48 @@ MapGroup_Citrine:		; 27
 
 MapGroup_OneIsland:	; 28
 	table_width MAP_LENGTH, MapGroup_OneIsland
-	map FarawayIslandOutside, TILESET_SEVII, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map FarawayIslandOutside, TILESET_SEVII, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map FarawayIslandInside, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
+	map FarawayIslandInside, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_SEVII, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
-	map OneIsland, TILESET_SEVII, TOWN, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map OneIsland, TILESET_SEVII, TOWN, LANDMARK_ONE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map TreasureBeach, TILESET_SEVII, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map TreasureBeach, TILESET_SEVII, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map KindleRoad, TILESET_SEVII, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map KindleRoad, TILESET_SEVII, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map MtEmberExterior, TILESET_SEVII, TOWN, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
+	map MtEmberExterior, TILESET_SEVII, TOWN, LANDMARK_ONE_ISLAND, MUSIC_SEVII, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
-	map MtEmberInterior, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map MtEmberInterior, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_SEVII, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map MtEmberSummit, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
+	map MtEmberSummit, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_SEVII, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
-	map MtEmberHiddenPath, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map MtEmberHiddenPath, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_SEVII, TRUE, PALETTE_DAY, FISHGROUP_SHORE
 	assert_table_length NUM_ONE_ISLAND_MAPS
 
 MapGroup_TwoIsland:	; 29
 	table_width MAP_LENGTH, MapGroup_TwoIsland
-	map TwoIsland, TILESET_SEVII, TOWN, LANDMARK_TWO_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map TwoIsland, TILESET_SEVII, TOWN, LANDMARK_TWO_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map CapeBrink, TILESET_SEVII, ROUTE, LANDMARK_TWO_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map CapeBrink, TILESET_SEVII, ROUTE, LANDMARK_TWO_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 	assert_table_length NUM_TWO_ISLAND_MAPS
 
 MapGroup_ThreeIsland:	; 30
 	table_width MAP_LENGTH, MapGroup_ThreeIsland
-	map ThreeIslandPort, TILESET_SEVII, TOWN, LANDMARK_THREE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map ThreeIslandPort, TILESET_SEVII, TOWN, LANDMARK_THREE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map ThreeIsland, TILESET_SEVII, TOWN, LANDMARK_THREE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map ThreeIsland, TILESET_SEVII, TOWN, LANDMARK_THREE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map BondBridge, TILESET_SEVII, ROUTE, LANDMARK_THREE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map BondBridge, TILESET_SEVII, ROUTE, LANDMARK_THREE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 	map BerryForest, TILESET_FOREST_KANTO, FOREST, LANDMARK_THREE_ISLAND, MUSIC_ROUTE_3, TRUE, PALETTE_AUTO, FISHGROUP_POND
 	assert_table_length NUM_THREE_ISLAND_MAPS
 
 MapGroup_FourIsland:	; 31
 	table_width MAP_LENGTH, MapGroup_FourIsland
-	map FourIsland, TILESET_SEVII, TOWN, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map FourIsland, TILESET_SEVII, TOWN, LANDMARK_FOUR_ISLAND, MUSIC_FOURISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map IcefallCaveEntrance, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map IcefallCaveEntrance, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_FOURISLAND, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map IcefallCave1F, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map IcefallCave1F, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_FOURISLAND, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map IcefallCaveB1F, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map IcefallCaveB1F, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_FOURISLAND, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map IcefallCaveBack, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map IcefallCaveBack, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_FOURISLAND, TRUE, PALETTE_DAY, FISHGROUP_SHORE
 	assert_table_length NUM_FOUR_ISLAND_MAPS
 
 MapGroup_FiveIsland:	; 32
 	table_width MAP_LENGTH, MapGroup_FiveIsland
-	map FiveIsland, TILESET_CAVE, TOWN, LANDMARK_FIVE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map FiveIsland, TILESET_CAVE, TOWN, LANDMARK_FIVE_ISLAND, MUSIC_FOURISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map FiveIslandMeadow, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map FiveIslandMeadow, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_FOURISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map MemorialPillar, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map MemorialPillar, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_FOURISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map WaterLabyrinth, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map WaterLabyrinth, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_FOURISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map ResortGorgeous, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map ResortGorgeous, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_FOURISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map LostCave, TILESET_CAVE, CAVE, LANDMARK_FIVE_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map LostCave, TILESET_CAVE, CAVE, LANDMARK_FIVE_ISLAND, MUSIC_FOURISLAND, TRUE, PALETTE_DAY, FISHGROUP_SHORE
 	assert_table_length NUM_FIVE_ISLAND_MAPS
 
 MapGroup_SixIsland:	; 33