diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm index a519fe43..8d9b9e69 100644 --- a/constants/tileset_constants.asm +++ b/constants/tileset_constants.asm @@ -32,4 +32,5 @@ const BETAMART const JACKY const FOSSILLAB + const SEAGALLOPPORT DEF NUM_TILESETS EQU const_value diff --git a/data/maps/headers/VermilionFerryDock.asm b/data/maps/headers/VermilionFerryDock.asm index fe5279e5..c988f186 100644 --- a/data/maps/headers/VermilionFerryDock.asm +++ b/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 diff --git a/data/maps/objects/VermilionFerryDock.asm b/data/maps/objects/VermilionFerryDock.asm index 466a658f..a8d070a7 100644 --- a/data/maps/objects/VermilionFerryDock.asm +++ b/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 diff --git a/data/tilesets/collision_tile_ids.asm b/data/tilesets/collision_tile_ids.asm index 44b51514..052a2e84 100644 --- a/data/tilesets/collision_tile_ids.asm +++ b/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 diff --git a/data/tilesets/door_tile_ids.asm b/data/tilesets/door_tile_ids.asm index 4cbdbf2f..5a097dc1 100644 --- a/data/tilesets/door_tile_ids.asm +++ b/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 diff --git a/data/tilesets/tileset_headers.asm b/data/tilesets/tileset_headers.asm index 05e32aa5..581ddb32 100644 --- a/data/tilesets/tileset_headers.asm +++ b/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 diff --git a/data/tilesets/warp_tile_ids.asm b/data/tilesets/warp_tile_ids.asm index 9417864e..0282b6b6 100644 --- a/data/tilesets/warp_tile_ids.asm +++ b/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 diff --git a/gfx/blocksets/seagallop_port.bst b/gfx/blocksets/seagallop_port.bst new file mode 100644 index 00000000..e0ac6cd6 Binary files /dev/null and b/gfx/blocksets/seagallop_port.bst differ diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm index 37543234..aee94231 100644 --- a/gfx/tilesets.asm +++ b/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" diff --git a/gfx/tilesets/seagallop_port.png b/gfx/tilesets/seagallop_port.png new file mode 100644 index 00000000..9bc24d9c Binary files /dev/null and b/gfx/tilesets/seagallop_port.png differ diff --git a/maps/VermilionFerryDock.blk b/maps/VermilionFerryDock.blk index f4a95739..c9c5d199 100644 Binary files a/maps/VermilionFerryDock.blk and b/maps/VermilionFerryDock.blk differ