Celeste Hill & tileset

This adds the baseline stuff for Celeste Hill. The map, the tileset, and so on. No events or warps are currently available.

data/maps/headers/CelesteHill.asm

@@ -0,0 +1,2 @@
+	map_header CelesteHill, CELESTE_HILL, CELESTE, 0
+	end_map_header

data/maps/map_header_banks.asm

@@ -77,7 +77,7 @@ MapHeaderBanks::
 	db BANK(Daycare_h)
 	db BANK(Route6Gate_h)
 	db BANK(UndergroundPathRoute6_h)
-	db BANK(UndergroundPathRoute6_h) ; UNDERGROUND_PATH_ROUTE_6_COPY
+	db BANK(CelesteHill_h) ; was db BANK(UndergroundPathRoute6_h), UNDERGROUND_PATH_ROUTE_6_COPY
 	db BANK(Route7Gate_h)
 	db BANK(UndergroundPathRoute7_h)
 	db BANK(UndergroundPathRoute7Copy_h)

data/maps/map_header_pointers.asm

@@ -77,7 +77,7 @@ MapHeaderPointers::
 	dw Daycare_h
 	dw Route6Gate_h
 	dw UndergroundPathRoute6_h
-	dw UndergroundPathRoute6_h ; UNDERGROUND_PATH_ROUTE_6_COPY
+	dw CelesteHill_h ; was dw UndergroundPathRoute6_h, UNDERGROUND_PATH_ROUTE_6_COPY
 	dw Route7Gate_h
 	dw UndergroundPathRoute7_h
 	dw UndergroundPathRoute7Copy_h

data/maps/names.asm

@@ -56,3 +56,4 @@ CeruleanCaveName:    db "CERULEAN CAVE@"
 PowerPlantName:      db "POWER PLANT@"
 FarawayIslandName:	 db "FARAWAY ISLAND@"
 UnderwaterTunnelName: db "UNDERWATER TUNNEL@"
+CelesteHillName: db "CELESTE HILL@"

data/maps/objects/CelesteHill.asm

@@ -0,0 +1,11 @@
+CelesteHill_Object:
+	db $0 ; border block
+
+	def_warp_events
+	warp_event  4, 11, 0, REDS_HOUSE_2F
+
+	def_bg_events
+
+	def_object_events
+
+	def_warps_to CELESTE_HILL

data/maps/town_map_entries.asm

@@ -67,7 +67,6 @@ InternalMapEntries:
 	internal_map MT_MOON_POKECENTER,             5,  2, Route4Name
 	internal_map VIRIDIAN_PRE_GYM,  			10,  2, ViridianCityName
 	internal_map DAYCARE,                       10,  4, Route5Name
-	internal_map UNDERGROUND_PATH_ROUTE_6_COPY, 10,  6, Route6Name
 	internal_map UNDERGROUND_PATH_ROUTE_7_COPY,  9,  5, Route7Name
 	internal_map UNDERGROUND_PATH_ROUTE_8,      11,  5, Route8Name
 	internal_map ROCK_TUNNEL_1F,                14,  3, RockTunnelName
@@ -126,4 +125,5 @@ InternalMapEntries:
 	internal_map UNDERWATER_TUNNEL,             14,  1, UnderwaterTunnelName
 	internal_map CELADON_UNIVERSITY_POKECENTER,   7, 4, CeladonCityName
 	internal_map AGATHAS_ROOM,                   0,  2, PokemonLeagueName
+	internal_map CELESTE_HILL, 					 9,  9, CelesteHillName
 	db -1 ; end

data/tilesets/bike_riding_tilesets.asm

@@ -5,4 +5,5 @@ BikeRidingTilesets::
 	db SHIP_PORT
 	db CAVERN
 	db CITRINE
+	db CELESTE
 	db -1 ; end

data/tilesets/collision_tile_ids.asm

@@ -75,3 +75,5 @@ PreGym_Coll::
 Citrine_Coll::
 	coll_tiles $2C, $31, $3F, $55, $0E, $2F, $23, $20, $10, $03, $1C, $1B, $0B, $0C, $21
 
+Celeste_Coll::
+	coll_tiles $1e, $20, $2e, $30, $34, $37, $39, $3a, $40, $51, $52, $5a, $5c, $5e, $5f, $09, $08, $18, $19

data/tilesets/tileset_headers.asm

@@ -35,4 +35,5 @@ Tilesets:
 	tileset Plateau,      -1, -1, -1, $45, TILEANIM_WATER
 	tileset PreGym,		 $3A, $3B, -1,  -1, TILEANIM_NONE
 	tileset Citrine,	 -1,  -1,  -1, $3F, TILEANIM_WATER_FLOWER
+	tileset Celeste,	 -1,  -1,  -1, $19, TILEANIM_WATER_FLOWER
 	assert_table_length NUM_TILESETS

data/tilesets/warp_tile_ids.asm

@@ -26,6 +26,7 @@ WarpTileIDPointers:
 	dw .PlateauWarpTileIDs
 	dw .PreGymWarpTileIDs
 	dw .CitrineWarpTileIDs
+	dw .CelesteWarpTileIDs
 	assert_table_length NUM_TILESETS
 
 MACRO warp_tiles
@@ -98,6 +99,9 @@ ENDM
 .CitrineWarpTileIDs:
 	warp_tiles $1B, $1C
 
+.CelesteWarpTileIDs:
+	warp_tiles $5A, $5C, $3A, $30, $50, $51 ; Like Forest but a bit better
+
 .ShipPortWarpTileIDs:
 .ClubWarpTileIDs:
 	warp_tiles ; end

data/tilesets/water_tilesets.asm

@@ -10,4 +10,5 @@ WaterTilesets:
 	db FACILITY
 	db PLATEAU
 	db CITRINE
+	db CELESTE
 	db -1 ; end