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/pokemontower1.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data/mapObjects/pokemontower1.asm') diff --git a/data/mapObjects/pokemontower1.asm b/data/mapObjects/pokemontower1.asm index 54af9efc..fdddcd9c 100755 --- a/data/mapObjects/pokemontower1.asm +++ b/data/mapObjects/pokemontower1.asm @@ -2,9 +2,9 @@ PokemonTower1Object: db $1 ; border block db $3 ; warps - db $11, $a, $1, $ff - db $11, $b, $1, $ff - db $9, $12, $1, POKEMONTOWER_2 + warp $a, $11, $1, $ff + warp $b, $11, $1, $ff + warp $12, $9, $1, POKEMONTOWER_2 db $0 ; signs @@ -16,6 +16,6 @@ PokemonTower1Object: object SPRITE_MEDIUM, $11, $7, STAY, LEFT, $5 ; person ; warp-to - EVENT_DISP POKEMONTOWER_1_WIDTH, $11, $a - EVENT_DISP POKEMONTOWER_1_WIDTH, $11, $b - EVENT_DISP POKEMONTOWER_1_WIDTH, $9, $12 ; POKEMONTOWER_2 + warp_to $a, $11, POKEMONTOWER_1_WIDTH + warp_to $b, $11, POKEMONTOWER_1_WIDTH + warp_to $12, $9, POKEMONTOWER_1_WIDTH ; POKEMONTOWER_2 -- cgit v1.3.1-sl0p