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/celadonmartroof.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data/mapObjects/celadonmartroof.asm') diff --git a/data/mapObjects/celadonmartroof.asm b/data/mapObjects/celadonmartroof.asm index 63a1b4d7..e6fda0e7 100755 --- a/data/mapObjects/celadonmartroof.asm +++ b/data/mapObjects/celadonmartroof.asm @@ -2,17 +2,17 @@ CeladonMartRoofObject: db $42 ; border block db $1 ; warps - db $2, $f, $0, CELADON_MART_5 + warp $f, $2, $0, CELADON_MART_5 db $4 ; signs - db $1, $a, $3 ; CeladonMartRoofText3 - db $1, $b, $4 ; CeladonMartRoofText4 - db $2, $c, $5 ; CeladonMartRoofText5 - db $2, $d, $6 ; CeladonMartRoofText6 + sign $a, $1, $3 ; CeladonMartRoofText3 + sign $b, $1, $4 ; CeladonMartRoofText4 + sign $c, $2, $5 ; CeladonMartRoofText5 + sign $d, $2, $6 ; CeladonMartRoofText6 db $2 ; objects object SPRITE_BLACK_HAIR_BOY_2, $a, $4, STAY, LEFT, $1 ; person object SPRITE_LITTLE_GIRL, $5, $5, WALK, $0, $2 ; person ; warp-to - EVENT_DISP CELADON_MART_ROOF_WIDTH, $2, $f ; CELADON_MART_5 + warp_to $f, $2, CELADON_MART_ROOF_WIDTH ; CELADON_MART_5 -- cgit v1.3.1-sl0p