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/route12gate.asm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'data/mapObjects/route12gate.asm') diff --git a/data/mapObjects/route12gate.asm b/data/mapObjects/route12gate.asm index 27e8532a..be4e3cb8 100755 --- a/data/mapObjects/route12gate.asm +++ b/data/mapObjects/route12gate.asm @@ -2,11 +2,11 @@ Route12GateObject: db $a ; border block db $5 ; warps - db $0, $4, $0, $ff - db $0, $5, $1, $ff - db $7, $4, $2, $ff - db $7, $5, $2, $ff - db $6, $8, $0, ROUTE_12_GATE_2F + warp $4, $0, $0, $ff + warp $5, $0, $1, $ff + warp $4, $7, $2, $ff + warp $5, $7, $2, $ff + warp $8, $6, $0, ROUTE_12_GATE_2F db $0 ; signs @@ -14,8 +14,8 @@ Route12GateObject: object SPRITE_GUARD, $1, $3, STAY, NONE, $1 ; person ; warp-to - EVENT_DISP ROUTE_12_GATE_1F_WIDTH, $0, $4 - EVENT_DISP ROUTE_12_GATE_1F_WIDTH, $0, $5 - EVENT_DISP ROUTE_12_GATE_1F_WIDTH, $7, $4 - EVENT_DISP ROUTE_12_GATE_1F_WIDTH, $7, $5 - EVENT_DISP ROUTE_12_GATE_1F_WIDTH, $6, $8 ; ROUTE_12_GATE_2F + warp_to $4, $0, ROUTE_12_GATE_1F_WIDTH + warp_to $5, $0, ROUTE_12_GATE_1F_WIDTH + warp_to $4, $7, ROUTE_12_GATE_1F_WIDTH + warp_to $5, $7, ROUTE_12_GATE_1F_WIDTH + warp_to $8, $6, ROUTE_12_GATE_1F_WIDTH ; ROUTE_12_GATE_2F -- cgit v1.3.1-sl0p