summaryrefslogtreecommitdiff
path: root/data/maps/objects/SaffronGym.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/SaffronGym.asm
parent2fe1505babaf02b995cc0d9c3a827b798935b19a (diff)
Use def_* macros for automatic map event counts
Diffstat (limited to 'data/maps/objects/SaffronGym.asm')
-rwxr-xr-xdata/maps/objects/SaffronGym.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/SaffronGym.asm b/data/maps/objects/SaffronGym.asm
index 54083d60..39ac124a 100755
--- a/data/maps/objects/SaffronGym.asm
+++ b/data/maps/objects/SaffronGym.asm
@@ -1,7 +1,7 @@
SaffronGym_Object:
db $2e ; border block
- db 32 ; warps
+ def_warps
warp 8, 17, 2, LAST_MAP
warp 9, 17, 2, LAST_MAP
warp 1, 3, 22, SAFFRON_GYM
@@ -35,9 +35,9 @@ SaffronGym_Object:
warp 15, 17, 11, SAFFRON_GYM
warp 19, 17, 19, SAFFRON_GYM
- db 0 ; signs
+ def_signs
- db 9 ; objects
+ def_objects
object SPRITE_GIRL, 9, 8, STAY, DOWN, 1, OPP_SABRINA, 1
object SPRITE_CHANNELER, 10, 1, STAY, DOWN, 2, OPP_CHANNELER, 22
object SPRITE_YOUNGSTER, 17, 1, STAY, DOWN, 3, OPP_PSYCHIC_TR, 1