aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/Route16.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/Route16.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/Route16.asm')
-rwxr-xr-xdata/maps/objects/Route16.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/Route16.asm b/data/maps/objects/Route16.asm
index fb23e6ca..c141a58a 100755
--- a/data/maps/objects/Route16.asm
+++ b/data/maps/objects/Route16.asm
@@ -1,7 +1,7 @@
Route16_Object:
db $f ; border block
- db 9 ; warps
+ def_warps
warp 17, 10, 0, ROUTE_16_GATE_1F
warp 17, 11, 1, ROUTE_16_GATE_1F
warp 24, 10, 2, ROUTE_16_GATE_1F
@@ -12,11 +12,11 @@ Route16_Object:
warp 24, 5, 7, ROUTE_16_GATE_1F
warp 7, 5, 0, ROUTE_16_FLY_HOUSE
- db 2 ; signs
+ def_signs
sign 27, 11, 8 ; Route16Text8
sign 5, 17, 9 ; Route16Text9
- db 7 ; objects
+ def_objects
object SPRITE_BIKER, 17, 12, STAY, LEFT, 1, OPP_BIKER, 5
object SPRITE_BIKER, 14, 13, STAY, RIGHT, 2, OPP_CUE_BALL, 1
object SPRITE_BIKER, 11, 12, STAY, UP, 3, OPP_CUE_BALL, 2