aboutsummaryrefslogtreecommitdiffstats
path: root/data/tilesets/warp_carpet_tile_ids.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-15 12:26:16 -0400
committerGitHub <noreply@github.com>2020-07-15 12:26:16 -0400
commite18e5d50b5e154c1a7c94a2a1f39a3a99daa689a (patch)
treed8a157ae5aa323a00873efe79eb4693327b8bb70 /data/tilesets/warp_carpet_tile_ids.asm
parentMerge pull request #269 from Rangi42/master (diff)
parentDon't compare strings with ==; use STRCMP (diff)
downloadpokeyellow-e18e5d50b5e154c1a7c94a2a1f39a3a99daa689a.tar.gz
pokeyellow-e18e5d50b5e154c1a7c94a2a1f39a3a99daa689a.tar.xz
pokeyellow-e18e5d50b5e154c1a7c94a2a1f39a3a99daa689a.zip
Merge pull request #273 from Rangi42/master
Clean up some data, using macros for multiline list entries
Diffstat (limited to 'data/tilesets/warp_carpet_tile_ids.asm')
-rw-r--r--data/tilesets/warp_carpet_tile_ids.asm32
1 files changed, 20 insertions, 12 deletions
diff --git a/data/tilesets/warp_carpet_tile_ids.asm b/data/tilesets/warp_carpet_tile_ids.asm
index 6f312bc7..be327599 100644
--- a/data/tilesets/warp_carpet_tile_ids.asm
+++ b/data/tilesets/warp_carpet_tile_ids.asm
@@ -1,17 +1,25 @@
WarpTileListPointers:
- dw .facingDownWarpTiles
- dw .facingUpWarpTiles
- dw .facingLeftWarpTiles
- dw .facingRightWarpTiles
+ dw .FacingDownWarpTiles
+ dw .FacingUpWarpTiles
+ dw .FacingLeftWarpTiles
+ dw .FacingRightWarpTiles
-.facingDownWarpTiles
- db $01,$12,$17,$3D,$04,$18,$33,$FF
+warp_carpet_tiles: MACRO
+REPT _NARG
+ db \1
+ shift
+ENDR
+ db -1 ; end
+ENDM
-.facingUpWarpTiles
- db $01,$5C,$FF
+.FacingDownWarpTiles:
+ warp_carpet_tiles $01, $12, $17, $3D, $04, $18, $33
-.facingLeftWarpTiles
- db $1A,$4B,$FF
+.FacingUpWarpTiles:
+ warp_carpet_tiles $01, $5C
-.facingRightWarpTiles
- db $0F,$4E,$FF
+.FacingLeftWarpTiles:
+ warp_carpet_tiles $1A, $4B
+
+.FacingRightWarpTiles:
+ warp_carpet_tiles $0F, $4E