aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/UndergroundPathNorthSouth.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/UndergroundPathNorthSouth.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/UndergroundPathNorthSouth.asm')
-rwxr-xr-xdata/maps/objects/UndergroundPathNorthSouth.asm10
1 files changed, 4 insertions, 6 deletions
diff --git a/data/maps/objects/UndergroundPathNorthSouth.asm b/data/maps/objects/UndergroundPathNorthSouth.asm
index 35e21cca..61f33087 100755
--- a/data/maps/objects/UndergroundPathNorthSouth.asm
+++ b/data/maps/objects/UndergroundPathNorthSouth.asm
@@ -1,14 +1,12 @@
UndergroundPathNorthSouth_Object:
db $1 ; border block
- db 2 ; warps
+ def_warps
warp 5, 4, 2, UNDERGROUND_PATH_ROUTE_5
warp 2, 41, 2, UNDERGROUND_PATH_ROUTE_6
- db 0 ; signs
+ def_signs
- db 0 ; objects
+ def_objects
- ; warp-to
- warp_to 5, 4, UNDERGROUND_PATH_NORTH_SOUTH_WIDTH ; UNDERGROUND_PATH_ROUTE_5
- warp_to 2, 41, UNDERGROUND_PATH_NORTH_SOUTH_WIDTH ; UNDERGROUND_PATH_ROUTE_6
+ def_warps_to UNDERGROUND_PATH_NORTH_SOUTH