From d271d6917549074e721f3e5064b77e1ad1dbe44a Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 29 Jan 2018 02:31:32 -0500 Subject: Add warp, sign, and warp_to macros for data/mapObjects definitions --- data/mapObjects/route22gate.asm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'data/mapObjects/route22gate.asm') diff --git a/data/mapObjects/route22gate.asm b/data/mapObjects/route22gate.asm index 2798311b..e321d95d 100755 --- a/data/mapObjects/route22gate.asm +++ b/data/mapObjects/route22gate.asm @@ -2,10 +2,10 @@ Route22GateObject: db $a ; border block db $4 ; warps - db $7, $4, $0, $ff - db $7, $5, $0, $ff - db $0, $4, $0, $ff - db $0, $5, $1, $ff + warp $4, $7, $0, $ff + warp $5, $7, $0, $ff + warp $4, $0, $0, $ff + warp $5, $0, $1, $ff db $0 ; signs @@ -13,7 +13,7 @@ Route22GateObject: object SPRITE_GUARD, $6, $2, STAY, LEFT, $1 ; person ; warp-to - EVENT_DISP ROUTE_22_GATE_WIDTH, $7, $4 - EVENT_DISP ROUTE_22_GATE_WIDTH, $7, $5 - EVENT_DISP ROUTE_22_GATE_WIDTH, $0, $4 - EVENT_DISP ROUTE_22_GATE_WIDTH, $0, $5 + warp_to $4, $7, ROUTE_22_GATE_WIDTH + warp_to $5, $7, ROUTE_22_GATE_WIDTH + warp_to $4, $0, ROUTE_22_GATE_WIDTH + warp_to $5, $0, ROUTE_22_GATE_WIDTH -- cgit v1.2.3