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/rockethideout1.asm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'data/mapObjects/rockethideout1.asm') diff --git a/data/mapObjects/rockethideout1.asm b/data/mapObjects/rockethideout1.asm index 0b2bf374..75b3569d 100755 --- a/data/mapObjects/rockethideout1.asm +++ b/data/mapObjects/rockethideout1.asm @@ -2,11 +2,11 @@ RocketHideout1Object: db $2e ; border block db $5 ; warps - db $2, $17, $0, ROCKET_HIDEOUT_2 - db $2, $15, $2, GAME_CORNER - db $13, $18, $0, ROCKET_HIDEOUT_ELEVATOR - db $18, $15, $3, ROCKET_HIDEOUT_2 - db $13, $19, $1, ROCKET_HIDEOUT_ELEVATOR + warp $17, $2, $0, ROCKET_HIDEOUT_2 + warp $15, $2, $2, GAME_CORNER + warp $18, $13, $0, ROCKET_HIDEOUT_ELEVATOR + warp $15, $18, $3, ROCKET_HIDEOUT_2 + warp $19, $13, $1, ROCKET_HIDEOUT_ELEVATOR db $0 ; signs @@ -20,8 +20,8 @@ RocketHideout1Object: object SPRITE_BALL, $9, $11, STAY, NONE, $7, HYPER_POTION ; warp-to - EVENT_DISP ROCKET_HIDEOUT_1_WIDTH, $2, $17 ; ROCKET_HIDEOUT_2 - EVENT_DISP ROCKET_HIDEOUT_1_WIDTH, $2, $15 ; GAME_CORNER - EVENT_DISP ROCKET_HIDEOUT_1_WIDTH, $13, $18 ; ROCKET_HIDEOUT_ELEVATOR - EVENT_DISP ROCKET_HIDEOUT_1_WIDTH, $18, $15 ; ROCKET_HIDEOUT_2 - EVENT_DISP ROCKET_HIDEOUT_1_WIDTH, $13, $19 ; ROCKET_HIDEOUT_ELEVATOR + warp_to $17, $2, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_2 + warp_to $15, $2, ROCKET_HIDEOUT_1_WIDTH ; GAME_CORNER + warp_to $18, $13, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_ELEVATOR + warp_to $15, $18, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_2 + warp_to $19, $13, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_ELEVATOR -- cgit v1.2.3