aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/UndergroundPathRoute5.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-08-20 19:07:42 -0400
committerGitHub <noreply@github.com>2020-08-20 19:07:42 -0400
commit7e9ccbb5b254f794a79c4d0f9d816b3cbfb81f3f (patch)
treeddda1118461d6151597a4bf9eefcb0eddc835da1 /data/maps/objects/UndergroundPathRoute5.asm
parentUse ANY_DIR, UP_DOWN, and LEFT_RIGHT for map objects (diff)
parentComments explain the def_warps_to macros (diff)
downloadpokeyellow-7e9ccbb5b254f794a79c4d0f9d816b3cbfb81f3f.tar.gz
pokeyellow-7e9ccbb5b254f794a79c4d0f9d816b3cbfb81f3f.tar.xz
pokeyellow-7e9ccbb5b254f794a79c4d0f9d816b3cbfb81f3f.zip
Merge pull request #287 from Rangi42/master
Simplify map event definitions
Diffstat (limited to 'data/maps/objects/UndergroundPathRoute5.asm')
-rwxr-xr-xdata/maps/objects/UndergroundPathRoute5.asm11
1 files changed, 4 insertions, 7 deletions
diff --git a/data/maps/objects/UndergroundPathRoute5.asm b/data/maps/objects/UndergroundPathRoute5.asm
index af96f6dc..45ba156b 100755
--- a/data/maps/objects/UndergroundPathRoute5.asm
+++ b/data/maps/objects/UndergroundPathRoute5.asm
@@ -1,17 +1,14 @@
UndergroundPathRoute5_Object:
db $a ; border block
- db 3 ; warps
+ def_warps
warp 3, 7, 3, LAST_MAP
warp 4, 7, 3, LAST_MAP
warp 4, 4, 0, UNDERGROUND_PATH_NORTH_SOUTH
- db 0 ; signs
+ def_signs
- db 1 ; objects
+ def_objects
object SPRITE_LITTLE_GIRL, 2, 3, STAY, NONE, 1 ; person
- ; warp-to
- warp_to 3, 7, UNDERGROUND_PATH_ROUTE_5_WIDTH
- warp_to 4, 7, UNDERGROUND_PATH_ROUTE_5_WIDTH
- warp_to 4, 4, UNDERGROUND_PATH_ROUTE_5_WIDTH ; UNDERGROUND_PATH_NORTH_SOUTH
+ def_warps_to UNDERGROUND_PATH_ROUTE_5