aboutsummaryrefslogtreecommitdiffstats
path: root/data/tilesets
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2021-04-17 19:06:56 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2021-04-17 19:06:56 -0400
commitdd690920c9f8502b649f1022fadbb99fab67a44a (patch)
tree6241fa9659e8ba2a82ea6fa45194dbd6e5dc39ef /data/tilesets
parentUse assertions to catch the GetName bug, and use a NAME_BUFFER_LENGTH constant (diff)
downloadpokeyellow-dd690920c9f8502b649f1022fadbb99fab67a44a.tar.gz
pokeyellow-dd690920c9f8502b649f1022fadbb99fab67a44a.tar.xz
pokeyellow-dd690920c9f8502b649f1022fadbb99fab67a44a.zip
Use rgbds 0.5.0 features:
- FOR loops - {interpolation} - REDEF EQUS - \# for all macro args
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 d348d5d5..c1bee7ce 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 c371e92b..716f76f3 100644
--- a/data/tilesets/door_tile_ids.asm
+++ b/data/tilesets/door_tile_ids.asm
@@ -15,10 +15,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 94c5397c..80df6cdf 100644
--- a/data/tilesets/warp_tile_ids.asm
+++ b/data/tilesets/warp_tile_ids.asm
@@ -27,10 +27,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