Citrine Rocket House

This map is pretty much finished, save for the map sprites for Jessie, James, and the unused Cat (aka Meowth) being imported, as well as an & symbol. This adds everything else - the marts, the Rocket Trio fight, the meeting music, the tileset, the trainer class for Jessie/James, I could go on. A ton of work well-done.

data/tilesets/bookshelf_tile_ids.asm

@@ -24,4 +24,6 @@ BookshelfTileIDs:
 	bookshelf_tile SHIP,         $36, BookOrSculptureText
 	bookshelf_tile PREGYM,		 $56, BookOrSculptureText
 	bookshelf_tile PREGYM,		 $57, BookOrSculptureText
+	bookshelf_tile ROCKETHOUSE,  $38, BookOrSculptureText
+	bookshelf_tile ROCKETHOUSE,  $39, BookOrSculptureText
 	db -1 ; end

data/tilesets/collision_tile_ids.asm

@@ -76,4 +76,7 @@ Citrine_Coll::
 	coll_tiles $2C, $31, $3F, $55, $0E, $2F, $23, $20, $10, $03, $1C, $1B, $0B, $0C, $21, $39, $3C, $48, $49, $58, $59
 
 Celeste_Coll::
-	coll_tiles $1e, $20, $2e, $30, $34, $37, $39, $3a, $40, $51, $52, $5a, $5c, $5e, $5f, $09, $08, $18, $19
+	coll_tiles $1e, $20, $2e, $30, $34, $37, $39, $3a, $40, $51, $52, $5a, $5c, $5e, $5f, $09, $08, $18, $19
+
+RocketHouse_Coll::
+	coll_tiles $13, $31, $01, $53

data/tilesets/dungeon_tilesets.asm

@@ -10,4 +10,5 @@ DungeonTilesets:
 	db FACILITY
 	db CEMETERY
 	db GYM
+	db ROCKETHOUSE
 	db -1 ; end

data/tilesets/tileset_headers.asm

@@ -36,4 +36,5 @@ Tilesets:
 	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
+	tileset RocketHouse, $0A,  -1,  -1,  -1, TILEANIM_NONE
 	assert_table_length NUM_TILESETS

data/tilesets/warp_tile_ids.asm

@@ -27,6 +27,7 @@ WarpTileIDPointers:
 	dw .PreGymWarpTileIDs
 	dw .CitrineWarpTileIDs
 	dw .CelesteWarpTileIDs
+	dw .RocketHouseWarpTileIDs
 	assert_table_length NUM_TILESETS
 
 MACRO warp_tiles
@@ -97,11 +98,14 @@ ENDM
 	warp_tiles $23
 
 .CitrineWarpTileIDs:
-	warp_tiles $1B, $1C
+	warp_tiles $1B, $1C, $0B, $0C
 
 .CelesteWarpTileIDs:
 	warp_tiles $5A, $5C, $3A, $30, $50, $51 ; Like Forest but a bit better
 
+.RocketHouseWarpTileIDs:
+	warp_tiles $53
+
 .ShipPortWarpTileIDs:
 .ClubWarpTileIDs:
 	warp_tiles ; end