aboutsummaryrefslogtreecommitdiffstats
path: root/data/tilesets
diff options
context:
space:
mode:
Diffstat (limited to 'data/tilesets')
-rw-r--r--data/tilesets/collision_tile_ids.asm7
-rw-r--r--data/tilesets/door_tile_ids.asm7
-rw-r--r--data/tilesets/warp_carpet_tile_ids.asm7
-rw-r--r--data/tilesets/warp_tile_ids.asm7
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