diff options
| author | dannye <33dannye@gmail.com> | 2021-03-25 17:39:44 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-03-25 17:39:44 -0500 |
| commit | eb47bda8ee5c1f002236200df36012de9e243a97 (patch) | |
| tree | fc69fc5435582efebd36fc54414673dd8ac7f646 /data/tilesets | |
| parent | Merge remote-tracking branch 'remotes/pokered/master' (diff) | |
| parent | Verify data table and name list sizes with assertion macros (diff) | |
| download | pokeyellow-eb47bda8ee5c1f002236200df36012de9e243a97.tar.gz pokeyellow-eb47bda8ee5c1f002236200df36012de9e243a97.tar.xz pokeyellow-eb47bda8ee5c1f002236200df36012de9e243a97.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/tilesets')
| -rw-r--r-- | data/tilesets/tileset_headers.asm | 2 | ||||
| -rw-r--r-- | data/tilesets/warp_tile_ids.asm | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/data/tilesets/tileset_headers.asm b/data/tilesets/tileset_headers.asm index 71c67ec3..e96932fd 100644 --- a/data/tilesets/tileset_headers.asm +++ b/data/tilesets/tileset_headers.asm @@ -7,6 +7,7 @@ tileset: MACRO ENDM Tilesets: + table_width 12, Tilesets ; block, gfx, coll, 3 counter tiles, grass tile, animations tileset Overworld_Block, Overworld_GFX, Overworld_Coll, $FF,$FF,$FF, $52, TILEANIM_WATER_FLOWER tileset RedsHouse1_Block, RedsHouse1_GFX, RedsHouse1_Coll, $FF,$FF,$FF, $FF, TILEANIM_NONE @@ -33,3 +34,4 @@ Tilesets: 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 + assert_table_length NUM_TILESETS diff --git a/data/tilesets/warp_tile_ids.asm b/data/tilesets/warp_tile_ids.asm index 7c207e27..bba7787a 100644 --- a/data/tilesets/warp_tile_ids.asm +++ b/data/tilesets/warp_tile_ids.asm @@ -1,4 +1,5 @@ WarpTileIDPointers: + table_width 2, WarpTileIDPointers dw .OverworldWarpTileIDs dw .RedsHouse1WarpTileIDs dw .MartWarpTileIDs @@ -24,6 +25,7 @@ WarpTileIDPointers: dw .FacilityWarpTileIDs dw .PlateauWarpTileIDs dw .BeachHouseWarpTileIDs + assert_table_length NUM_TILESETS warp_tiles: MACRO REPT _NARG |