aboutsummaryrefslogtreecommitdiffstats
path: root/data/tilesets
diff options
context:
space:
mode:
authorvulcandth <vulcandth@gmail.com>2022-06-06 16:25:31 -0500
committerGitHub <noreply@github.com>2022-06-06 17:25:31 -0400
commit6b5be9129cabe72b9f775b02db1bf7e7169153da (patch)
treed92012450c70f90bf8086bed32ec3dc87b68b332 /data/tilesets
parentImproved Virtual Console patch identifiers (#357) (diff)
downloadpokeyellow-6b5be9129cabe72b9f775b02db1bf7e7169153da.tar.gz
pokeyellow-6b5be9129cabe72b9f775b02db1bf7e7169153da.tar.xz
pokeyellow-6b5be9129cabe72b9f775b02db1bf7e7169153da.zip
RGBDS syntax updates (#358)
New MACRO and DEF syntax
Diffstat (limited to 'data/tilesets')
-rw-r--r--data/tilesets/bookshelf_tile_ids.asm2
-rw-r--r--data/tilesets/collision_tile_ids.asm2
-rw-r--r--data/tilesets/door_tile_ids.asm2
-rw-r--r--data/tilesets/spinner_tiles.asm2
-rw-r--r--data/tilesets/tileset_headers.asm2
-rw-r--r--data/tilesets/warp_carpet_tile_ids.asm2
-rw-r--r--data/tilesets/warp_tile_ids.asm2
7 files changed, 7 insertions, 7 deletions
diff --git a/data/tilesets/bookshelf_tile_ids.asm b/data/tilesets/bookshelf_tile_ids.asm
index 55143d73..71529761 100644
--- a/data/tilesets/bookshelf_tile_ids.asm
+++ b/data/tilesets/bookshelf_tile_ids.asm
@@ -1,4 +1,4 @@
-bookshelf_tile: MACRO
+MACRO bookshelf_tile
db \1, \2
db_tx_pre \3
ENDM
diff --git a/data/tilesets/collision_tile_ids.asm b/data/tilesets/collision_tile_ids.asm
index c1bee7ce..94efc925 100644
--- a/data/tilesets/collision_tile_ids.asm
+++ b/data/tilesets/collision_tile_ids.asm
@@ -1,4 +1,4 @@
-coll_tiles: MACRO
+MACRO coll_tiles
IF _NARG
db \# ; all args
ENDC
diff --git a/data/tilesets/door_tile_ids.asm b/data/tilesets/door_tile_ids.asm
index 716f76f3..4b4a65ed 100644
--- a/data/tilesets/door_tile_ids.asm
+++ b/data/tilesets/door_tile_ids.asm
@@ -14,7 +14,7 @@ DoorTileIDPointers:
dbw PLATEAU, .PlateauDoorTileIDs
db -1 ; end
-door_tiles: MACRO
+MACRO door_tiles
IF _NARG
db \# ; all args
ENDC
diff --git a/data/tilesets/spinner_tiles.asm b/data/tilesets/spinner_tiles.asm
index 82506b6d..9ce3deb3 100644
--- a/data/tilesets/spinner_tiles.asm
+++ b/data/tilesets/spinner_tiles.asm
@@ -1,4 +1,4 @@
-spinner: MACRO
+MACRO spinner
; \1: source
; \2: offset (BANK() chokes on literals)
; \3: dest
diff --git a/data/tilesets/tileset_headers.asm b/data/tilesets/tileset_headers.asm
index 375b0687..a8500ef2 100644
--- a/data/tilesets/tileset_headers.asm
+++ b/data/tilesets/tileset_headers.asm
@@ -1,4 +1,4 @@
-tileset: MACRO
+MACRO tileset
db BANK(\1_GFX)
dw \1_Block, \1_GFX, \1_Coll
db \2, \3, \4 ; counter tiles
diff --git a/data/tilesets/warp_carpet_tile_ids.asm b/data/tilesets/warp_carpet_tile_ids.asm
index a8a19011..1b8ebbbe 100644
--- a/data/tilesets/warp_carpet_tile_ids.asm
+++ b/data/tilesets/warp_carpet_tile_ids.asm
@@ -4,7 +4,7 @@ WarpTileListPointers:
dw .FacingLeftWarpTiles
dw .FacingRightWarpTiles
-warp_carpet_tiles: MACRO
+MACRO warp_carpet_tiles
IF _NARG
db \# ; all args
ENDC
diff --git a/data/tilesets/warp_tile_ids.asm b/data/tilesets/warp_tile_ids.asm
index 80df6cdf..823b4b36 100644
--- a/data/tilesets/warp_tile_ids.asm
+++ b/data/tilesets/warp_tile_ids.asm
@@ -26,7 +26,7 @@ WarpTileIDPointers:
dw .PlateauWarpTileIDs
assert_table_length NUM_TILESETS
-warp_tiles: MACRO
+MACRO warp_tiles
IF _NARG
db \# ; all args
ENDC