Sevii Islands Work

constants/map_constants.asm

@@ -568,7 +568,7 @@ ENDM
 	endgroup
 	
 	newgroup TWO_ISLAND ; 29
-	map_const TWO_ISLAND,							10, 10 ; 1
+	map_const TWO_ISLAND,							20, 9  ; 1
 	map_const CAPE_BRINK,							10, 10 ; 2
 	endgroup
 	

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

gfx/sgb/predef.pal

@@ -90,4 +90,4 @@
 	RGB 31,31,31, 31,31,31, 25,30,00, 25,30,00 ; PREDEFPAL_GAMEFREAK_LOGO_OB
 	RGB 00,00,00, 08,11,11, 21,21,21, 31,31,31 ; PREDEFPAL_GAMEFREAK_LOGO_BG
 	RGB 31,31,31, 23,21,16, 15,20,20, 00,00,00 ; PREDEFPAL_ROUTES_NIHON
-	RGB 31,31,31, 18,18,18, 15,20,20, 00,00,00 ; PREDEFPAL_GATES_NIHON
+	RGB 31,31,31, 18,18,18, 15,20,20, 00,00,00 ; PREDEFPAL_GATES_NIHON	

home/map.asm

@@ -1377,6 +1377,8 @@ LoadTilesetGFX::
 	jr z, .load_roof
 	cp TILESET_BATTLE_TOWER_OUTSIDE
 	jr z, .load_roof
+	cp TILESET_SEVII
+	jr z, .load_roof
 	jr .skip_roof
 
 .load_roof

maps/DebugRoom.asm

@@ -402,7 +402,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, ONE_ISLAND, 1 ; southeast warp
+	warp_event 33, 33, TWO_ISLAND, 1 ; southeast warp
 	warp_event  5,  3, AZALEA_TOWN, 1
 	warp_event 34, 11, WINNERS_PATH, 3
 

maps/KindleRoad.ablk

@@ -38,5 +38,5 @@ K66
DE8
 
 	6
6JFE8
 
-	6
7GDE87
(HI80(((L"M(83M!(8978!(89
V8#(B#3M#<?8##!###
+	6
7GDE87
(HI80(((L"M(83M!(897st8!(89
V8#(B#3M#<?8##!###
 	8

maps/MtEmberExterior.ablk

@@ -1 +1 @@
-@D@@@ki			@D=A@@ki			@HQF@=A=h	=AD=A@i		A@HF@fjjjQQjjFi			LA@=AD@HQQjjjQQUg			80@=A@D@APQI		89@@@D=fQjjjQQI		LM9@@@HF^66

76		89@@@D\ecc
cc	^_	89@@=ADHQQQQgXY		89=A=A@DUA

6Y		830@@@D	fjjjj`]		89@@f\W[72
789=A@HQQQF6
X
27
	LM9@@6
7
HQWhh	89@fW[7

666
7
ORRR?	(89(@X666\[6666
7
D		89(@\`a6
\``ecccdU	89(=Ab666

\[7
Y
7Z]	89(@\``[


\W]
Z](830(=AX7
7

7Y(89(((OORRNjjjjORRNNLM30OOONNOORNNN89ODDRNEPjjFDOEEE89DODEEEDDDENN89DDOPIEN((ODHFNEE8
+@D@@@ki			@D=A@@ki			@HQF@=A=h	=AD=Ak@i		A@HF@fjjjQQjjFi			LA@=AD@HQQjjjQQUg			80@=A@D@APQI		89@@@D=fQjjjQQI		LM9@@@HF^66

76		89@@@D\ecc
cc	^_	89@@=ADHQQQQgXY		89=A=A@DUA

6Y		830@@@D	fjjjj`]		89@@f\W[72
789=A@HQQQF6
X
27
	LM9@@6
7
HQWhh	89@fW[7

666
7
ORRR?	(89(@X666\[6666
7
D		89(@\`a6
\``ecccdU	89(=Ab666

\[7
Y
7Z]	89(@\``[


\W]
Z](830(=AX7
7

7Y(89(((OORRNjjjjORRNNLM30OOONNOORNNN89ODDRNEPjjFDOEEE89DODEEEDDDENN89DDOPIEN((ODHFNEE8

maps/OneIsland.ablk

@@ -37,12 +37,12 @@
 5L
 
 
-	7
2(
+	7
st2(
 
 
-	
2(
+	st
2(
 
 
 	77$%(
 
-7
1&(((4"0>!
#3@!)*+.=!-,,/,,
+7
1&(((L4"0>"M
#30@!)*+.9=!,,,/,,3

maps/TwoIsland.asm

@@ -9,6 +9,8 @@ TwoIsland_MapEvents:
 	db 0, 0 ; filler
 
 	def_warp_events
+	warp_event  8,  7, DEBUG_ROOM, 1
+	warp_event  9,  7, DEBUG_ROOM, 1
 
 	def_coord_events