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/route15gate.asm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'data/mapObjects/route15gate.asm') diff --git a/data/mapObjects/route15gate.asm b/data/mapObjects/route15gate.asm index 06a6790a..a5902851 100755 --- a/data/mapObjects/route15gate.asm +++ b/data/mapObjects/route15gate.asm @@ -2,11 +2,11 @@ Route15GateObject: db $a ; border block db $5 ; warps - db $4, $0, $0, $ff - db $5, $0, $1, $ff - db $4, $7, $2, $ff - db $5, $7, $3, $ff - db $8, $6, $0, ROUTE_15_GATE_2F + warp $0, $4, $0, $ff + warp $0, $5, $1, $ff + warp $7, $4, $2, $ff + warp $7, $5, $3, $ff + warp $6, $8, $0, ROUTE_15_GATE_2F db $0 ; signs @@ -14,8 +14,8 @@ Route15GateObject: object SPRITE_GUARD, $4, $1, STAY, NONE, $1 ; person ; warp-to - EVENT_DISP ROUTE_15_GATE_1F_WIDTH, $4, $0 - EVENT_DISP ROUTE_15_GATE_1F_WIDTH, $5, $0 - EVENT_DISP ROUTE_15_GATE_1F_WIDTH, $4, $7 - EVENT_DISP ROUTE_15_GATE_1F_WIDTH, $5, $7 - EVENT_DISP ROUTE_15_GATE_1F_WIDTH, $8, $6 ; ROUTE_15_GATE_2F + warp_to $0, $4, ROUTE_15_GATE_1F_WIDTH + warp_to $0, $5, ROUTE_15_GATE_1F_WIDTH + warp_to $7, $4, ROUTE_15_GATE_1F_WIDTH + warp_to $7, $5, ROUTE_15_GATE_1F_WIDTH + warp_to $6, $8, ROUTE_15_GATE_1F_WIDTH ; ROUTE_15_GATE_2F -- cgit v1.2.3