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/ceruleanhouse2.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data/mapObjects/ceruleanhouse2.asm') diff --git a/data/mapObjects/ceruleanhouse2.asm b/data/mapObjects/ceruleanhouse2.asm index 669cd098..c7c4beae 100755 --- a/data/mapObjects/ceruleanhouse2.asm +++ b/data/mapObjects/ceruleanhouse2.asm @@ -2,9 +2,9 @@ CeruleanHouse2Object: db $c ; border block db $3 ; warps - db $0, $2, $9, $ff - db $7, $2, $8, $ff - db $7, $3, $8, $ff + warp $2, $0, $9, $ff + warp $2, $7, $8, $ff + warp $3, $7, $8, $ff db $0 ; signs @@ -12,6 +12,6 @@ CeruleanHouse2Object: object SPRITE_FAT_BALD_GUY, $5, $3, STAY, RIGHT, $1 ; person ; warp-to - EVENT_DISP CERULEAN_HOUSE_2_WIDTH, $0, $2 - EVENT_DISP CERULEAN_HOUSE_2_WIDTH, $7, $2 - EVENT_DISP CERULEAN_HOUSE_2_WIDTH, $7, $3 + warp_to $2, $0, CERULEAN_HOUSE_2_WIDTH + warp_to $2, $7, CERULEAN_HOUSE_2_WIDTH + warp_to $3, $7, CERULEAN_HOUSE_2_WIDTH -- cgit v1.3.1-sl0p