aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/CeladonMart5F.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-08-17 16:54:59 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-08-17 16:54:59 -0400
commite2c99f19103856426966e30cf1910d07995bb936 (patch)
tree513ecaba5794061a71ffcc9dbff5b3d426eade21 /data/maps/objects/CeladonMart5F.asm
parentUse ANY_DIR, UP_DOWN, and LEFT_RIGHT for map objects (diff)
downloadpokeyellow-e2c99f19103856426966e30cf1910d07995bb936.tar.gz
pokeyellow-e2c99f19103856426966e30cf1910d07995bb936.tar.xz
pokeyellow-e2c99f19103856426966e30cf1910d07995bb936.zip
Use def_* macros for automatic map event counts
Diffstat (limited to 'data/maps/objects/CeladonMart5F.asm')
-rwxr-xr-xdata/maps/objects/CeladonMart5F.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/CeladonMart5F.asm b/data/maps/objects/CeladonMart5F.asm
index 61a7428e..834b3248 100755
--- a/data/maps/objects/CeladonMart5F.asm
+++ b/data/maps/objects/CeladonMart5F.asm
@@ -1,15 +1,15 @@
CeladonMart5F_Object:
db $f ; border block
- db 3 ; warps
+ def_warps
warp 12, 1, 0, CELADON_MART_ROOF
warp 16, 1, 1, CELADON_MART_4F
warp 1, 1, 0, CELADON_MART_ELEVATOR
- db 1 ; signs
+ def_signs
sign 14, 1, 5 ; CeladonMart5Text5
- db 4 ; objects
+ def_objects
object SPRITE_GENTLEMAN, 14, 5, WALK, UP_DOWN, 1 ; person
object SPRITE_SAILOR, 2, 6, STAY, NONE, 2 ; person
object SPRITE_CLERK, 5, 3, STAY, DOWN, 3 ; person