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/viridianforestentrance.asm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'data/mapObjects/viridianforestentrance.asm') diff --git a/data/mapObjects/viridianforestentrance.asm b/data/mapObjects/viridianforestentrance.asm index 06faad72..40b1b42e 100755 --- a/data/mapObjects/viridianforestentrance.asm +++ b/data/mapObjects/viridianforestentrance.asm @@ -2,10 +2,10 @@ ViridianForestEntranceObject: db $a ; border block db $4 ; warps - db $0, $4, $3, VIRIDIAN_FOREST - db $0, $5, $4, VIRIDIAN_FOREST - db $7, $4, $5, $ff - db $7, $5, $5, $ff + warp $4, $0, $3, VIRIDIAN_FOREST + warp $5, $0, $4, VIRIDIAN_FOREST + warp $4, $7, $5, $ff + warp $5, $7, $5, $ff db $0 ; signs @@ -14,7 +14,7 @@ ViridianForestEntranceObject: object SPRITE_LITTLE_GIRL, $2, $4, WALK, $1, $2 ; person ; warp-to - EVENT_DISP VIRIDIAN_FOREST_ENTRANCE_WIDTH, $0, $4 ; VIRIDIAN_FOREST - EVENT_DISP VIRIDIAN_FOREST_ENTRANCE_WIDTH, $0, $5 ; VIRIDIAN_FOREST - EVENT_DISP VIRIDIAN_FOREST_ENTRANCE_WIDTH, $7, $4 - EVENT_DISP VIRIDIAN_FOREST_ENTRANCE_WIDTH, $7, $5 + warp_to $4, $0, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; VIRIDIAN_FOREST + warp_to $5, $0, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; VIRIDIAN_FOREST + warp_to $4, $7, VIRIDIAN_FOREST_ENTRANCE_WIDTH + warp_to $5, $7, VIRIDIAN_FOREST_ENTRANCE_WIDTH -- cgit v1.3.1-sl0p