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/rockethideout4.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data/mapObjects/rockethideout4.asm') diff --git a/data/mapObjects/rockethideout4.asm b/data/mapObjects/rockethideout4.asm index b4e98d04..2450af12 100755 --- a/data/mapObjects/rockethideout4.asm +++ b/data/mapObjects/rockethideout4.asm @@ -2,9 +2,9 @@ RocketHideout4Object: db $2e ; border block db $3 ; warps - db $a, $13, $1, ROCKET_HIDEOUT_3 - db $f, $18, $0, ROCKET_HIDEOUT_ELEVATOR - db $f, $19, $1, ROCKET_HIDEOUT_ELEVATOR + warp $13, $a, $1, ROCKET_HIDEOUT_3 + warp $18, $f, $0, ROCKET_HIDEOUT_ELEVATOR + warp $19, $f, $1, ROCKET_HIDEOUT_ELEVATOR db $0 ; signs @@ -20,6 +20,6 @@ RocketHideout4Object: object SPRITE_BALL, $a, $2, STAY, NONE, $9, LIFT_KEY ; warp-to - EVENT_DISP ROCKET_HIDEOUT_4_WIDTH, $a, $13 ; ROCKET_HIDEOUT_3 - EVENT_DISP ROCKET_HIDEOUT_4_WIDTH, $f, $18 ; ROCKET_HIDEOUT_ELEVATOR - EVENT_DISP ROCKET_HIDEOUT_4_WIDTH, $f, $19 ; ROCKET_HIDEOUT_ELEVATOR + warp_to $13, $a, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_3 + warp_to $18, $f, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_ELEVATOR + warp_to $19, $f, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_ELEVATOR -- cgit v1.2.3