diff options
| author | dannye <33dannye@gmail.com> | 2021-04-17 21:00:28 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-04-17 21:00:28 -0500 |
| commit | d4154b289176647ff20e19879de70073bd6d9a30 (patch) | |
| tree | f4175a9303dd0e1430f4c42e79a4d5ffb1f32c00 /data/tilesets | |
| parent | Merge remote-tracking branch 'remotes/pokered/master' (diff) | |
| parent | Prevent some gcc versions from complaining about {0} in tools/scan_includes.c (diff) | |
| download | pokeyellow-d4154b289176647ff20e19879de70073bd6d9a30.tar.gz pokeyellow-d4154b289176647ff20e19879de70073bd6d9a30.tar.xz pokeyellow-d4154b289176647ff20e19879de70073bd6d9a30.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/tilesets')
| -rw-r--r-- | data/tilesets/collision_tile_ids.asm | 7 | ||||
| -rw-r--r-- | data/tilesets/door_tile_ids.asm | 7 | ||||
| -rw-r--r-- | data/tilesets/warp_carpet_tile_ids.asm | 7 | ||||
| -rw-r--r-- | data/tilesets/warp_tile_ids.asm | 7 |
4 files changed, 12 insertions, 16 deletions
diff --git a/data/tilesets/collision_tile_ids.asm b/data/tilesets/collision_tile_ids.asm index 058a815c..eb09f4fb 100644 --- a/data/tilesets/collision_tile_ids.asm +++ b/data/tilesets/collision_tile_ids.asm @@ -1,8 +1,7 @@ coll_tiles: MACRO -REPT _NARG - db \1 - shift -ENDR + IF _NARG + db \# ; all args + ENDC db -1 ; end ENDM diff --git a/data/tilesets/door_tile_ids.asm b/data/tilesets/door_tile_ids.asm index 5fca7114..950115e0 100644 --- a/data/tilesets/door_tile_ids.asm +++ b/data/tilesets/door_tile_ids.asm @@ -16,10 +16,9 @@ DoorTileIDPointers: db -1 ; end door_tiles: MACRO -REPT _NARG - db \1 - shift -ENDR + IF _NARG + db \# ; all args + ENDC db 0 ; end ENDM diff --git a/data/tilesets/warp_carpet_tile_ids.asm b/data/tilesets/warp_carpet_tile_ids.asm index be327599..a8a19011 100644 --- a/data/tilesets/warp_carpet_tile_ids.asm +++ b/data/tilesets/warp_carpet_tile_ids.asm @@ -5,10 +5,9 @@ WarpTileListPointers: dw .FacingRightWarpTiles warp_carpet_tiles: MACRO -REPT _NARG - db \1 - shift -ENDR + IF _NARG + db \# ; all args + ENDC db -1 ; end ENDM diff --git a/data/tilesets/warp_tile_ids.asm b/data/tilesets/warp_tile_ids.asm index bba7787a..b30a731d 100644 --- a/data/tilesets/warp_tile_ids.asm +++ b/data/tilesets/warp_tile_ids.asm @@ -28,10 +28,9 @@ WarpTileIDPointers: assert_table_length NUM_TILESETS warp_tiles: MACRO -REPT _NARG - db \1 - shift -ENDR + IF _NARG + db \# ; all args + ENDC db -1 ; end ENDM |