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/rockethideout2.asm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'data/mapObjects/rockethideout2.asm') diff --git a/data/mapObjects/rockethideout2.asm b/data/mapObjects/rockethideout2.asm index 6689110c..08e7ccf1 100755 --- a/data/mapObjects/rockethideout2.asm +++ b/data/mapObjects/rockethideout2.asm @@ -2,11 +2,11 @@ RocketHideout2Object: db $2e ; border block db $5 ; warps - db $8, $1b, $0, ROCKET_HIDEOUT_1 - db $8, $15, $0, ROCKET_HIDEOUT_3 - db $13, $18, $0, ROCKET_HIDEOUT_ELEVATOR - db $16, $15, $3, ROCKET_HIDEOUT_1 - db $13, $19, $1, ROCKET_HIDEOUT_ELEVATOR + warp $1b, $8, $0, ROCKET_HIDEOUT_1 + warp $15, $8, $0, ROCKET_HIDEOUT_3 + warp $18, $13, $0, ROCKET_HIDEOUT_ELEVATOR + warp $15, $16, $3, ROCKET_HIDEOUT_1 + warp $19, $13, $1, ROCKET_HIDEOUT_ELEVATOR db $0 ; signs @@ -18,8 +18,8 @@ RocketHideout2Object: object SPRITE_BALL, $3, $15, STAY, NONE, $5, SUPER_POTION ; warp-to - EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $8, $1b ; ROCKET_HIDEOUT_1 - EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $8, $15 ; ROCKET_HIDEOUT_3 - EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $13, $18 ; ROCKET_HIDEOUT_ELEVATOR - EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $16, $15 ; ROCKET_HIDEOUT_1 - EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $13, $19 ; ROCKET_HIDEOUT_ELEVATOR + warp_to $1b, $8, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_1 + warp_to $15, $8, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_3 + warp_to $18, $13, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_ELEVATOR + warp_to $15, $16, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_1 + warp_to $19, $13, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_ELEVATOR -- cgit v1.3.1-sl0p