summaryrefslogtreecommitdiff
path: root/data/maps/objects/Route16Gate2F.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/Route16Gate2F.asm
parent2fe1505babaf02b995cc0d9c3a827b798935b19a (diff)
parentd5db0c3dbf78a957e8f10ad410789c4256d64f74 (diff)
Merge pull request #287 from Rangi42/master
Simplify map event definitions
Diffstat (limited to 'data/maps/objects/Route16Gate2F.asm')
-rwxr-xr-xdata/maps/objects/Route16Gate2F.asm9
1 files changed, 4 insertions, 5 deletions
diff --git a/data/maps/objects/Route16Gate2F.asm b/data/maps/objects/Route16Gate2F.asm
index 21dddd07..5f428151 100755
--- a/data/maps/objects/Route16Gate2F.asm
+++ b/data/maps/objects/Route16Gate2F.asm
@@ -1,16 +1,15 @@
Route16Gate2F_Object:
db $a ; border block
- db 1 ; warps
+ def_warps
warp 7, 7, 8, ROUTE_16_GATE_1F
- db 2 ; signs
+ def_signs
sign 1, 2, 3 ; Route16GateUpstairsText3
sign 6, 2, 4 ; Route16GateUpstairsText4
- db 2 ; objects
+ def_objects
object SPRITE_LITTLE_BOY, 4, 2, STAY, NONE, 1 ; person
object SPRITE_LITTLE_GIRL, 2, 5, WALK, LEFT_RIGHT, 2 ; person
- ; warp-to
- warp_to 7, 7, ROUTE_16_GATE_2F_WIDTH ; ROUTE_16_GATE_1F
+ def_warps_to ROUTE_16_GATE_2F