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/lance.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data/mapObjects/lance.asm') diff --git a/data/mapObjects/lance.asm b/data/mapObjects/lance.asm index e7bf0ad6..73ed8e63 100755 --- a/data/mapObjects/lance.asm +++ b/data/mapObjects/lance.asm @@ -2,9 +2,9 @@ LanceObject: db $3 ; border block db $3 ; warps - db $10, $18, $2, AGATHAS_ROOM - db $0, $5, $0, CHAMPIONS_ROOM - db $0, $6, $0, CHAMPIONS_ROOM + warp $18, $10, $2, AGATHAS_ROOM + warp $5, $0, $0, CHAMPIONS_ROOM + warp $6, $0, $0, CHAMPIONS_ROOM db $0 ; signs @@ -12,6 +12,6 @@ LanceObject: object SPRITE_LANCE, $6, $1, STAY, DOWN, $1, OPP_LANCE, $1 ; warp-to - EVENT_DISP LANCES_ROOM_WIDTH, $10, $18 ; AGATHAS_ROOM - EVENT_DISP LANCES_ROOM_WIDTH, $0, $5 ; CHAMPIONS_ROOM - EVENT_DISP LANCES_ROOM_WIDTH, $0, $6 ; CHAMPIONS_ROOM + warp_to $18, $10, LANCES_ROOM_WIDTH ; AGATHAS_ROOM + warp_to $5, $0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM + warp_to $6, $0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM -- cgit v1.3.1-sl0p