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/redshouse1f.asm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'data/mapObjects/redshouse1f.asm') diff --git a/data/mapObjects/redshouse1f.asm b/data/mapObjects/redshouse1f.asm index 4d32ea3d..8c30fb84 100755 --- a/data/mapObjects/redshouse1f.asm +++ b/data/mapObjects/redshouse1f.asm @@ -2,17 +2,17 @@ RedsHouse1FObject: db $0A ; border block db $3 ; warps - db $7, $2, $0, $FF ; exit1 - db $7, $3, $0, $FF ; exit2 - db $1, $7, $0, REDS_HOUSE_2F ; staircase + warp $2, $7, $0, $FF ; exit1 + warp $3, $7, $0, $FF ; exit2 + warp $7, $1, $0, REDS_HOUSE_2F ; staircase db $1 ; signs - db $1, $3, $2 ; TV + sign $3, $1, $2 ; TV db $1 ; objects object SPRITE_MOM, $5, $4, STAY, LEFT, $1 ; Mom ; warp-to - EVENT_DISP REDS_HOUSE_1F_WIDTH, $7, $2 - EVENT_DISP REDS_HOUSE_1F_WIDTH, $7, $3 - EVENT_DISP REDS_HOUSE_1F_WIDTH, $1, $7 + warp_to $2, $7, REDS_HOUSE_1F_WIDTH + warp_to $3, $7, REDS_HOUSE_1F_WIDTH + warp_to $7, $1, REDS_HOUSE_1F_WIDTH -- cgit v1.3.1-sl0p