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/pokemontower6.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/mapObjects/pokemontower6.asm') diff --git a/data/mapObjects/pokemontower6.asm b/data/mapObjects/pokemontower6.asm index d0035faa..62513fb4 100755 --- a/data/mapObjects/pokemontower6.asm +++ b/data/mapObjects/pokemontower6.asm @@ -2,8 +2,8 @@ PokemonTower6Object: db $1 ; border block db $2 ; warps - db $9, $12, $1, POKEMONTOWER_5 - db $10, $9, $0, POKEMONTOWER_7 + warp $12, $9, $1, POKEMONTOWER_5 + warp $9, $10, $0, POKEMONTOWER_7 db $0 ; signs @@ -15,5 +15,5 @@ PokemonTower6Object: object SPRITE_BALL, $e, $e, STAY, NONE, $5, X_ACCURACY ; warp-to - EVENT_DISP POKEMONTOWER_6_WIDTH, $9, $12 ; POKEMONTOWER_5 - EVENT_DISP POKEMONTOWER_6_WIDTH, $10, $9 ; POKEMONTOWER_7 + warp_to $12, $9, POKEMONTOWER_6_WIDTH ; POKEMONTOWER_5 + warp_to $9, $10, POKEMONTOWER_6_WIDTH ; POKEMONTOWER_7 -- cgit v1.3.1-sl0p