aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/SafariZoneEast.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/SafariZoneEast.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/SafariZoneEast.asm')
-rwxr-xr-xdata/maps/objects/SafariZoneEast.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/SafariZoneEast.asm b/data/maps/objects/SafariZoneEast.asm
index fa04087f..b169b288 100755
--- a/data/maps/objects/SafariZoneEast.asm
+++ b/data/maps/objects/SafariZoneEast.asm
@@ -1,19 +1,19 @@
SafariZoneEast_Object:
db $0 ; border block
- db 5 ; warps
+ def_warps
warp 0, 4, 6, SAFARI_ZONE_NORTH
warp 0, 5, 7, SAFARI_ZONE_NORTH
warp 0, 22, 6, SAFARI_ZONE_CENTER
warp 0, 23, 6, SAFARI_ZONE_CENTER
warp 25, 9, 0, SAFARI_ZONE_EAST_REST_HOUSE
- db 3 ; signs
+ def_signs
sign 26, 10, 5 ; SafariZoneEastText5
sign 6, 4, 6 ; SafariZoneEastText6
sign 5, 23, 7 ; SafariZoneEastText7
- db 4 ; objects
+ def_objects
object SPRITE_POKE_BALL, 21, 10, STAY, NONE, 1, FULL_RESTORE
object SPRITE_POKE_BALL, 3, 7, STAY, NONE, 2, MAX_POTION
object SPRITE_POKE_BALL, 20, 13, STAY, NONE, 3, CARBOS