aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/SilphCo6F.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/SilphCo6F.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/SilphCo6F.asm')
-rwxr-xr-xdata/maps/objects/SilphCo6F.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/SilphCo6F.asm b/data/maps/objects/SilphCo6F.asm
index fc0787ae..600070b4 100755
--- a/data/maps/objects/SilphCo6F.asm
+++ b/data/maps/objects/SilphCo6F.asm
@@ -1,16 +1,16 @@
SilphCo6F_Object:
db $2e ; border block
- db 5 ; warps
+ def_warps
warp 16, 0, 1, SILPH_CO_7F
warp 14, 0, 0, SILPH_CO_5F
warp 18, 0, 0, SILPH_CO_ELEVATOR
warp 3, 3, 4, SILPH_CO_4F
warp 23, 3, 6, SILPH_CO_2F
- db 0 ; signs
+ def_signs
- db 10 ; objects
+ def_objects
object SPRITE_SILPH_WORKER, 10, 6, STAY, NONE, 1 ; person
object SPRITE_SILPH_WORKER, 20, 6, STAY, NONE, 2 ; person
object SPRITE_ERIKA, 21, 6, STAY, DOWN, 3 ; person