diff options
Diffstat (limited to 'data/tilesets')
| -rw-r--r-- | data/tilesets/collision_tile_ids.asm | 3 | ||||
| -rw-r--r-- | data/tilesets/door_tile_ids.asm | 4 | ||||
| -rw-r--r-- | data/tilesets/tileset_headers.asm | 1 | ||||
| -rw-r--r-- | data/tilesets/warp_tile_ids.asm | 4 |
4 files changed, 12 insertions, 0 deletions
diff --git a/data/tilesets/collision_tile_ids.asm b/data/tilesets/collision_tile_ids.asm index d348d5d5..058a815c 100644 --- a/data/tilesets/collision_tile_ids.asm +++ b/data/tilesets/collision_tile_ids.asm @@ -69,3 +69,6 @@ Facility_Coll:: Plateau_Coll:: coll_tiles $1b, $23, $2c, $2d, $3b, $45 + +BeachHouse_Coll:: + coll_tiles $01, $11, $12, $14 diff --git a/data/tilesets/door_tile_ids.asm b/data/tilesets/door_tile_ids.asm index c371e92b..5fca7114 100644 --- a/data/tilesets/door_tile_ids.asm +++ b/data/tilesets/door_tile_ids.asm @@ -12,6 +12,7 @@ DoorTileIDPointers: dbw LAB, .LabDoorTileIDs dbw FACILITY, .FacilityDoorTileIDs dbw PLATEAU, .PlateauDoorTileIDs + dbw INTERIOR, .InteriorDoorTileIDs db -1 ; end door_tiles: MACRO @@ -54,3 +55,6 @@ ENDM .PlateauDoorTileIDs: door_tiles $3b, $1b + +.InteriorDoorTileIDs: + door_tiles $04, $15 diff --git a/data/tilesets/tileset_headers.asm b/data/tilesets/tileset_headers.asm index 65fc4fa9..71c67ec3 100644 --- a/data/tilesets/tileset_headers.asm +++ b/data/tilesets/tileset_headers.asm @@ -32,3 +32,4 @@ Tilesets: tileset Club_Block, Club_GFX, Club_Coll, $07,$17,$FF, $FF, TILEANIM_NONE tileset Facility_Block, Facility_GFX, Facility_Coll, $12,$FF,$FF, $FF, TILEANIM_WATER tileset Plateau_Block, Plateau_GFX, Plateau_Coll, $FF,$FF,$FF, $45, TILEANIM_WATER + tileset BeachHouse_Block, BeachHouse_GFX, BeachHouse_Coll, $FF,$FF,$FF, $FF, TILEANIM_NONE diff --git a/data/tilesets/warp_tile_ids.asm b/data/tilesets/warp_tile_ids.asm index db005dcf..7c207e27 100644 --- a/data/tilesets/warp_tile_ids.asm +++ b/data/tilesets/warp_tile_ids.asm @@ -23,6 +23,7 @@ WarpTileIDPointers: dw .ClubWarpTileIDs dw .FacilityWarpTileIDs dw .PlateauWarpTileIDs + dw .BeachHouseWarpTileIDs warp_tiles: MACRO REPT _NARG @@ -90,4 +91,7 @@ ENDM ; fallthrough .ShipPortWarpTileIDs: .ClubWarpTileIDs: + warp_tiles + +.BeachHouseWarpTileIDs: warp_tiles ; end |