aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/oakslab.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/oakslab.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/oakslab.asm')
-rwxr-xr-xdata/mapObjects/oakslab.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/oakslab.asm b/data/mapObjects/oakslab.asm
index 3834c49a..c23c5afe 100755
--- a/data/mapObjects/oakslab.asm
+++ b/data/mapObjects/oakslab.asm
@@ -2,8 +2,8 @@ OaksLabObject:
db $3 ; border block
db $2 ; warps
- db $b, $4, $2, $ff
- db $b, $5, $2, $ff
+ warp $4, $b, $2, $ff
+ warp $5, $b, $2, $ff
db $0 ; signs
@@ -21,5 +21,5 @@ OaksLabObject:
object SPRITE_OAK_AIDE, $8, $a, STAY, NONE, $b ; person
; warp-to
- EVENT_DISP OAKS_LAB_WIDTH, $b, $4
- EVENT_DISP OAKS_LAB_WIDTH, $b, $5
+ warp_to $4, $b, OAKS_LAB_WIDTH
+ warp_to $5, $b, OAKS_LAB_WIDTH