aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/Route19.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/Route19.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/Route19.asm')
-rwxr-xr-xdata/maps/objects/Route19.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/objects/Route19.asm b/data/maps/objects/Route19.asm
index a2130295..8f445364 100755
--- a/data/maps/objects/Route19.asm
+++ b/data/maps/objects/Route19.asm
@@ -1,12 +1,12 @@
Route19_Object:
db $43 ; border block
- db 0 ; warps
+ def_warps
- db 1 ; signs
+ def_signs
sign 11, 9, 11 ; Route19Text11
- db 10 ; objects
+ def_objects
object SPRITE_COOLTRAINER_M, 8, 7, STAY, LEFT, 1, OPP_SWIMMER, 2
object SPRITE_COOLTRAINER_M, 13, 7, STAY, LEFT, 2, OPP_SWIMMER, 3
object SPRITE_SWIMMER, 13, 25, STAY, LEFT, 3, OPP_SWIMMER, 4
@@ -18,4 +18,4 @@ Route19_Object:
object SPRITE_SWIMMER, 9, 42, STAY, UP, 9, OPP_SWIMMER, 8
object SPRITE_SWIMMER, 10, 44, STAY, DOWN, 10, OPP_BEAUTY, 14
- ; warp-to
+ def_warps_to ROUTE_19