Sevii Islands Work

data/maps/blocks.asm

@@ -746,12 +746,6 @@ MtEmberSummit_Blocks:
 MtEmberHiddenPath_Blocks:
 	INCBIN "maps/MtEmberHiddenPath.ablk"
 
-TwoIsland_Blocks:
-	INCBIN "maps/TwoIsland.ablk"
-
-CapeBrink_Blocks:
-	INCBIN "maps/CapeBrink.ablk"
-
 SECTION "Map Blocks 3", ROMX
 
 SlowpokeWellB1F_Blocks:
@@ -1279,3 +1273,10 @@ Route50_Blocks:
 
 JackysHouse_Blocks:
 	INCBIN "maps/JackysHouse.ablk"
+	
+TwoIsland_Blocks:
+	INCBIN "maps/TwoIsland.ablk"
+
+CapeBrink_Blocks:
+	INCBIN "maps/CapeBrink.ablk"
+

data/maps/maps.asm

@@ -621,8 +621,8 @@ MapGroup_OneIsland:	; 28
 
 MapGroup_TwoIsland:	; 29
 	table_width MAP_LENGTH, MapGroup_TwoIsland
-	map TwoIsland, TILESET_CAVE, TOWN, LANDMARK_TWO_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map CapeBrink, TILESET_CAVE, ROUTE, LANDMARK_TWO_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map TwoIsland, TILESET_SEVII, TOWN, LANDMARK_TWO_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map CapeBrink, TILESET_SEVII, ROUTE, LANDMARK_TWO_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 	assert_table_length NUM_TWO_ISLAND_MAPS
 
 MapGroup_ThreeIsland:	; 30

data/maps/roofs.asm

@@ -39,13 +39,13 @@ MapGroupRoofs:
 	db -1             ; 25
 	db ROOF_NEW_BARK  ; 26 (Cherrygrove)
 	db ROOF_GOLDENROD ; 27 (Citrine)
-	db ROOF_NEW_BARK  ; 28 (One Island)
-	db ROOF_VIOLET	  ; 29 (Two Island)
-	db ROOF_VIOLET	  ; 30 (Three Island)
-	db ROOF_VIOLET	  ; 31 (Four Island)
-	db ROOF_VIOLET	  ; 32 (Five Island)
-	db ROOF_VIOLET	  ; 33 (Six Island)
-	db ROOF_VIOLET	  ; 34 (Seven Island)
+	db ROOF_AZALEA    ; 28 (One Island)
+	db ROOF_AZALEA	  ; 29 (Two Island)
+	db ROOF_AZALEA	  ; 30 (Three Island)
+	db ROOF_AZALEA	  ; 31 (Four Island)
+	db ROOF_AZALEA	  ; 32 (Five Island)
+	db ROOF_AZALEA	  ; 33 (Six Island)
+	db ROOF_AZALEA	  ; 34 (Seven Island)
 	db ROOF_NEW_BARK  ; 35 (Silent Hills)
 	db ROOF_VIOLET    ; 36 (Old City)
 	db ROOF_NEW_BARK  ; 37 (Blue Forest)

data/tilesets/sevii_collision.asm

@@ -39,7 +39,7 @@
 	tilecoll FLOOR, WALL, WALL, WALL ; 26
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
-	tilecoll WATER, WALL, WATER, FLOOR ; 29
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 29
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 2a
 	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2b
 	tilecoll WATER, WATER, WATER, WATER ; 2c
@@ -113,5 +113,8 @@
 	tilecoll WALL, WALL, WALL, DOOR ; 70
 	tilecoll WALL, WALL, WALL, WALL ; 71
 	tilecoll WALL, WALL, WALL, WALL ; 72
-	tilecoll WALL, DOOR, FLOOR, FLOOR ; 73
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 74
+	tilecoll WALL, WALL, WALL, DOOR ; 73
+	tilecoll WALL, WALL, WALL, WALL ; 74
+	tilecoll WATER, WALL, WALL, WALL ; 75
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 76
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 77