aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/Route21.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/Route21.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/Route21.asm')
-rwxr-xr-xdata/maps/objects/Route21.asm8
1 files changed, 5 insertions, 3 deletions
diff --git a/data/maps/objects/Route21.asm b/data/maps/objects/Route21.asm
index aff8f833..71817640 100755
--- a/data/maps/objects/Route21.asm
+++ b/data/maps/objects/Route21.asm
@@ -1,11 +1,11 @@
Route21_Object:
db $43 ; border block
- db 0 ; warps
+ def_warps
- db 0 ; signs
+ def_signs
- db 9 ; objects
+ def_objects
object SPRITE_FISHER, 4, 24, STAY, LEFT, 1, OPP_FISHER, 7
object SPRITE_FISHER, 6, 25, STAY, DOWN, 2, OPP_FISHER, 9
object SPRITE_SWIMMER, 10, 31, STAY, UP, 3, OPP_SWIMMER, 12
@@ -15,3 +15,5 @@ Route21_Object:
object SPRITE_SWIMMER, 15, 71, STAY, LEFT, 7, OPP_SWIMMER, 15
object SPRITE_FISHER, 14, 56, STAY, LEFT, 8, OPP_FISHER, 8
object SPRITE_FISHER, 17, 57, STAY, RIGHT, 9, OPP_FISHER, 10
+
+ def_warps_to ROUTE_21