aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/lavendermart.asm
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2018-01-29 02:31:32 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2018-01-29 02:31:32 -0500
commitd271d6917549074e721f3e5064b77e1ad1dbe44a (patch)
treecee0f1b9a44aa7394dbf36ee3ad3654dde08df06 /data/mapObjects/lavendermart.asm
parentAdd pokegold and pokefirered. (diff)
downloadpokeyellow-d271d6917549074e721f3e5064b77e1ad1dbe44a.tar.gz
pokeyellow-d271d6917549074e721f3e5064b77e1ad1dbe44a.tar.xz
pokeyellow-d271d6917549074e721f3e5064b77e1ad1dbe44a.zip
Add warp, sign, and warp_to macros for data/mapObjects definitions
Diffstat (limited to 'data/mapObjects/lavendermart.asm')
-rwxr-xr-xdata/mapObjects/lavendermart.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/lavendermart.asm b/data/mapObjects/lavendermart.asm
index 2d8e7636..1b459d5c 100755
--- a/data/mapObjects/lavendermart.asm
+++ b/data/mapObjects/lavendermart.asm
@@ -2,8 +2,8 @@ LavenderMartObject:
db $0 ; border block
db $2 ; warps
- db $7, $3, $3, $ff
- db $7, $4, $3, $ff
+ warp $3, $7, $3, $ff
+ warp $4, $7, $3, $ff
db $0 ; signs
@@ -13,5 +13,5 @@ LavenderMartObject:
object SPRITE_BLACK_HAIR_BOY_1, $7, $2, STAY, NONE, $3 ; person
; warp-to
- EVENT_DISP LAVENDER_MART_WIDTH, $7, $3
- EVENT_DISP LAVENDER_MART_WIDTH, $7, $4
+ warp_to $3, $7, LAVENDER_MART_WIDTH
+ warp_to $4, $7, LAVENDER_MART_WIDTH