Seagallop Ferry Port

This adds a new tileset for the Seagallop Ferry. Had to remake the tileset from scratch using the S.S. Anne one. Very awkward!

The map could be made to look more like the FRLG one but that's neither here nor there.

constants/tileset_constants.asm

@@ -32,4 +32,5 @@
 	const BETAMART
 	const JACKY
 	const FOSSILLAB
+	const SEAGALLOPPORT
 DEF NUM_TILESETS EQU const_value

data/maps/headers/VermilionFerryDock.asm

@@ -1,2 +1,2 @@
-	map_header VermilionFerryDock, VERMILION_FERRY_DOCK, SHIP_PORT, 0
+	map_header VermilionFerryDock, VERMILION_FERRY_DOCK, SEAGALLOPPORT, 0
 	end_map_header

data/maps/objects/VermilionFerryDock.asm

@@ -1,9 +1,9 @@
 VermilionFerryDock_Object:
-	db $f ; border block
+	db $13 ; border block
 
 	def_warp_events
 	warp_event 14,  0, LAST_MAP, 9
-	warp_event 14,  2, SEAGALLOP_FERRY, 1
+	warp_event 14,  5, SEAGALLOP_FERRY, 1
 
 	def_bg_events
 

data/tilesets/collision_tile_ids.asm

@@ -85,3 +85,6 @@ BetaMart_Coll::
 
 Jacky_Coll::
 	coll_tiles $01, $40, $11, $04, $14, $02, $03, $13, $12, 
+
+SeagallopPort_Coll::
+	coll_tiles $1C, $0E, $1E

data/tilesets/door_tile_ids.asm

@@ -15,6 +15,7 @@ DoorTileIDPointers:
 	dbw INTERIOR,    .InteriorDoorTileIDs ; fixes weirdness in silph co.
 	dbw CITRINE, 	 .CitrineDoorTileIDs
 	dbw CELESTE, 	 .CelesteDoorTileIDs
+	dbw SEAGALLOPPORT,        .SeagallopPortDoorTileIDs
 	db -1 ; end
 
 MACRO door_tiles
@@ -60,9 +61,11 @@ ENDM
 .InteriorDoorTileIDs:
 	door_tiles $04, $15
 
-.CitrineDoorTileIDs
+.CitrineDoorTileIDs:
 	door_tiles $1C, $1B, $58, $59
 
-.CelesteDoorTileIDs
+.CelesteDoorTileIDs:
 	door_tiles $0C, $1C
 
+.SeagallopPortDoorTileIDs:
+	door_tiles $0E, $1E

data/tilesets/tileset_headers.asm

@@ -40,4 +40,5 @@ Tilesets:
 	tileset BetaMart,    $18, -1, -1,  -1, TILEANIM_NONE
 	tileset Jacky,	 	  -1,  -1,  -1, -1, TILEANIM_NONE
 	tileset FossilLab,    -1, -1, -1,  -1, TILEANIM_NONE
+	tileset SeagallopPort,     -1, -1, -1,  -1, TILEANIM_WATER
 	assert_table_length NUM_TILESETS

data/tilesets/warp_tile_ids.asm

@@ -33,6 +33,7 @@ WarpTileIDPointers:
 	dw .BetaMartWarpTileIDs
 	dw .JackyWarpTileIDs
 	dw .LabWarpTileIDs ; Fossil Lab
+	dw .ShipPortWarpTileIDs ; Seagallop Port
 	assert_table_length NUM_TILESETS
 
 MACRO warp_tiles

gfx/tilesets.asm

@@ -88,3 +88,5 @@ Jacky_Block::       INCBIN "gfx/blocksets/jacky.bst"
 FossilLab_GFX::		INCBIN "gfx/tilesets/fossillab.2bpp"
 FossilLab_Block::   INCBIN "gfx/blocksets/fossillab.bst"
 
+SeagallopPort_GFX::		INCBIN "gfx/tilesets/seagallop_port.2bpp"
+SeagallopPort_Block::   INCBIN "gfx/blocksets/seagallop_port.bst"