summaryrefslogtreecommitdiff
path: root/data/maps/objects/Route4.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/Route4.asm
parent2fe1505babaf02b995cc0d9c3a827b798935b19a (diff)
parentd5db0c3dbf78a957e8f10ad410789c4256d64f74 (diff)
Merge pull request #287 from Rangi42/master
Simplify map event definitions
Diffstat (limited to 'data/maps/objects/Route4.asm')
-rwxr-xr-xdata/maps/objects/Route4.asm11
1 files changed, 4 insertions, 7 deletions
diff --git a/data/maps/objects/Route4.asm b/data/maps/objects/Route4.asm
index fb073cd5..fccbf542 100755
--- a/data/maps/objects/Route4.asm
+++ b/data/maps/objects/Route4.asm
@@ -1,22 +1,19 @@
Route4_Object:
db $2c ; border block
- db 3 ; warps
+ def_warps
warp 11, 5, 0, MT_MOON_POKECENTER
warp 18, 5, 0, MT_MOON_1F
warp 24, 5, 7, MT_MOON_B1F
- db 3 ; signs
+ def_signs
sign 12, 5, 4 ; PokeCenterSignText
sign 17, 7, 5 ; Route4Text5
sign 27, 7, 6 ; Route4Text6
- db 3 ; objects
+ def_objects
object SPRITE_COOLTRAINER_F, 9, 8, WALK, ANY_DIR, 1 ; person
object SPRITE_COOLTRAINER_F, 63, 3, STAY, RIGHT, 2, OPP_LASS, 4
object SPRITE_POKE_BALL, 57, 3, STAY, NONE, 3, TM_WHIRLWIND
- ; warp-to
- warp_to 11, 5, ROUTE_4_WIDTH ; MT_MOON_POKECENTER
- warp_to 18, 5, ROUTE_4_WIDTH ; MT_MOON_1F
- warp_to 24, 5, ROUTE_4_WIDTH ; MT_MOON_B1F
+ def_warps_to ROUTE_4