diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index 3fda452..3657797 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -584,7 +584,7 @@ ENDM
 	endgroup
 	
 	newgroup FOUR_ISLAND ; 31
-	map_const FOUR_ISLAND,							10, 10 ; 1
+	map_const FOUR_ISLAND,							25, 20 ; 1
 	map_const ICEFALL_CAVE_ENTRANCE,				10, 10 ; 2
 	map_const ICEFALL_CAVE_1F,						10, 10 ; 3
 	map_const ICEFALL_CAVE_B1F,						10, 10 ; 4
diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm
index 26cd21e..24dc17b 100644
--- a/data/maps/attributes.asm
+++ b/data/maps/attributes.asm
@@ -782,7 +782,7 @@ ENDM
 	connection east, ThreeIsland, THREE_ISLAND, 3
 	map_attributes BerryForest, BERRY_FOREST, $05, 0 ; Bank 3
 	
-	map_attributes FourIsland, FOUR_ISLAND, $00, 0 ; Bank 3
+	map_attributes FourIsland, FOUR_ISLAND, $02, 0 ; Bank 3
 	map_attributes IcefallCaveEntrance, ICEFALL_CAVE_ENTRANCE, $00, 0 ; Bank 3
 	map_attributes IcefallCave1F, ICEFALL_CAVE_1F, $00, 0 ; Bank 3
 	map_attributes IcefallCaveB1F, ICEFALL_CAVE_B1F, $00, 0 ; Bank 3
diff --git a/data/maps/maps.asm b/data/maps/maps.asm
index 8171bec..b0a0309 100644
--- a/data/maps/maps.asm
+++ b/data/maps/maps.asm
@@ -639,7 +639,7 @@ MapGroup_ThreeIsland:	; 30
 
 MapGroup_FourIsland:	; 31
 	table_width MAP_LENGTH, MapGroup_FourIsland
-	map FourIsland, TILESET_CAVE, TOWN, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map FourIsland, TILESET_SEVII, TOWN, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 	map IcefallCaveEntrance, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
 	map IcefallCave1F, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
 	map IcefallCaveB1F, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
diff --git a/data/tilesets/sevii_attributes.bin b/data/tilesets/sevii_attributes.bin
index 015b188..30aca7e 100644
Binary files a/data/tilesets/sevii_attributes.bin and b/data/tilesets/sevii_attributes.bin differ
diff --git a/data/tilesets/sevii_collision.asm b/data/tilesets/sevii_collision.asm
index b771858..0930d65 100644
--- a/data/tilesets/sevii_collision.asm
+++ b/data/tilesets/sevii_collision.asm
@@ -134,4 +134,4 @@
 	tilecoll WALL, WALL, WALL, WALL ; 85
 	tilecoll WALL, WALL, WALL, WALL ; 86
 	tilecoll WALL, WALL, WALL, WALL ; 87
-	tilecoll WALL, WALL, WALL, WALL ; 88
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 88
diff --git a/data/tilesets/sevii_metatiles.bin b/data/tilesets/sevii_metatiles.bin
index 9392f03..19f7973 100644
Binary files a/data/tilesets/sevii_metatiles.bin and b/data/tilesets/sevii_metatiles.bin differ
diff --git a/gfx/pokegear/sevii1.bin b/gfx/pokegear/sevii1.bin
index b4afdf3..f431304 100644
Binary files a/gfx/pokegear/sevii1.bin and b/gfx/pokegear/sevii1.bin differ
diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm
index f396aa9..b43d576 100644
--- a/maps/DebugRoom.asm
+++ b/maps/DebugRoom.asm
@@ -404,7 +404,7 @@ DebugRoom_MapEvents:
 	warp_event 35, 17, OLD_CITY, 1 ; east warp
 	warp_event  5, 35, LAVENDER_TOWN, 1 ; southwest warp
 	warp_event 19, 34, SAFARI_ZONE_FUCHSIA_GATE_BETA, 3 ; southern warp
-	warp_event 33, 33, TWO_ISLAND, 1 ; southeast warp
+	warp_event 33, 33, FOUR_ISLAND, 1 ; southeast warp
 	warp_event  5,  3, HAUNTED_HOUSE_FOYER, 1
 	warp_event 34, 11, WINNERS_PATH, 3
 
diff --git a/maps/FourIsland.ablk b/maps/FourIsland.ablk
index eeb5760..74d57ef 100644
Binary files a/maps/FourIsland.ablk and b/maps/FourIsland.ablk differ
diff --git a/maps/FourIsland.asm b/maps/FourIsland.asm
index 051181a..3c06e84 100644
--- a/maps/FourIsland.asm
+++ b/maps/FourIsland.asm
@@ -14,7 +14,8 @@ FourIsland_MapEvents:
 	db 0, 0 ; filler
 
 	def_warp_events
-
+	warp_event 12, 29, DEBUG_ROOM, 1
+	warp_event 13, 29, DEBUG_ROOM, 1
 	def_coord_events
 
 	def_bg_events