aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/celadongym.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/celadongym.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/celadongym.asm')
-rwxr-xr-xdata/mapObjects/celadongym.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/celadongym.asm b/data/mapObjects/celadongym.asm
index 212c389e..b9ebcb93 100755
--- a/data/mapObjects/celadongym.asm
+++ b/data/mapObjects/celadongym.asm
@@ -2,8 +2,8 @@ CeladonGymObject:
db $3 ; border block
db $2 ; warps
- db $11, $4, $6, $ff
- db $11, $5, $6, $ff
+ warp $4, $11, $6, $ff
+ warp $5, $11, $6, $ff
db $0 ; signs
@@ -18,5 +18,5 @@ CeladonGymObject:
object SPRITE_LASS, $5, $3, STAY, DOWN, $8, OPP_COOLTRAINER_F, $1
; warp-to
- EVENT_DISP CELADON_GYM_WIDTH, $11, $4
- EVENT_DISP CELADON_GYM_WIDTH, $11, $5
+ warp_to $4, $11, CELADON_GYM_WIDTH
+ warp_to $5, $11, CELADON_GYM_WIDTH