aboutsummaryrefslogtreecommitdiffstats
path: root/data/tilesets
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2021-05-31 19:40:14 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2021-05-31 19:40:14 -0400
commit7d4ec90538d297ebbfd65d82213d9c13c3527379 (patch)
tree421657da2f1a2108f004c7d388c60eacc9d749ab /data/tilesets
parentUse rgblink -w to have one $2000-byte WRAM0 region (diff)
downloadpokeyellow-7d4ec90538d297ebbfd65d82213d9c13c3527379.tar.gz
pokeyellow-7d4ec90538d297ebbfd65d82213d9c13c3527379.tar.xz
pokeyellow-7d4ec90538d297ebbfd65d82213d9c13c3527379.zip
Some miscellaneous changes, syncing more with pokered
Diffstat (limited to 'data/tilesets')
-rw-r--r--data/tilesets/tileset_headers.asm1
-rw-r--r--data/tilesets/warp_tile_ids.asm2
2 files changed, 2 insertions, 1 deletions
diff --git a/data/tilesets/tileset_headers.asm b/data/tilesets/tileset_headers.asm
index 819364b3..3355de6d 100644
--- a/data/tilesets/tileset_headers.asm
+++ b/data/tilesets/tileset_headers.asm
@@ -8,6 +8,7 @@ ENDM
Tilesets:
table_width 12, Tilesets
+ ; name, 3 counter tiles, grass tile, animations
tileset Overworld, -1, -1, -1, $52, TILEANIM_WATER_FLOWER
tileset RedsHouse1, -1, -1, -1, -1, TILEANIM_NONE
tileset Mart, $18,$19,$1E, -1, TILEANIM_NONE
diff --git a/data/tilesets/warp_tile_ids.asm b/data/tilesets/warp_tile_ids.asm
index b30a731d..61b93a36 100644
--- a/data/tilesets/warp_tile_ids.asm
+++ b/data/tilesets/warp_tile_ids.asm
@@ -92,7 +92,7 @@ ENDM
; fallthrough
.ShipPortWarpTileIDs:
.ClubWarpTileIDs:
- warp_tiles
+ warp_tiles ; end
.BeachHouseWarpTileIDs:
warp_tiles ; end