aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/route7gate.asm
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2018-01-29 02:31:32 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2018-01-29 02:31:32 -0500
commitd271d6917549074e721f3e5064b77e1ad1dbe44a (patch)
treecee0f1b9a44aa7394dbf36ee3ad3654dde08df06 /data/mapObjects/route7gate.asm
parentAdd pokegold and pokefirered. (diff)
downloadpokeyellow-d271d6917549074e721f3e5064b77e1ad1dbe44a.tar.gz
pokeyellow-d271d6917549074e721f3e5064b77e1ad1dbe44a.tar.xz
pokeyellow-d271d6917549074e721f3e5064b77e1ad1dbe44a.zip
Add warp, sign, and warp_to macros for data/mapObjects definitions
Diffstat (limited to 'data/mapObjects/route7gate.asm')
-rwxr-xr-xdata/mapObjects/route7gate.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/mapObjects/route7gate.asm b/data/mapObjects/route7gate.asm
index 3aea6a88..293be913 100755
--- a/data/mapObjects/route7gate.asm
+++ b/data/mapObjects/route7gate.asm
@@ -2,10 +2,10 @@ Route7GateObject:
db $a ; border block
db $4 ; warps
- db $3, $0, $3, $ff
- db $4, $0, $3, $ff
- db $3, $5, $0, $ff
- db $4, $5, $1, $ff
+ warp $0, $3, $3, $ff
+ warp $0, $4, $3, $ff
+ warp $5, $3, $0, $ff
+ warp $5, $4, $1, $ff
db $0 ; signs
@@ -13,7 +13,7 @@ Route7GateObject:
object SPRITE_GUARD, $3, $1, STAY, DOWN, $1 ; person
; warp-to
- EVENT_DISP ROUTE_7_GATE_WIDTH, $3, $0
- EVENT_DISP ROUTE_7_GATE_WIDTH, $4, $0
- EVENT_DISP ROUTE_7_GATE_WIDTH, $3, $5
- EVENT_DISP ROUTE_7_GATE_WIDTH, $4, $5
+ warp_to $0, $3, ROUTE_7_GATE_WIDTH
+ warp_to $0, $4, ROUTE_7_GATE_WIDTH
+ warp_to $5, $3, ROUTE_7_GATE_WIDTH
+ warp_to $5, $4, ROUTE_7_GATE_WIDTH