aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/route4.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/route4.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/route4.asm')
-rwxr-xr-xdata/mapObjects/route4.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/route4.asm b/data/mapObjects/route4.asm
index e52f4909..c997212e 100755
--- a/data/mapObjects/route4.asm
+++ b/data/mapObjects/route4.asm
@@ -2,14 +2,14 @@ Route4Object:
db $2c ; border block
db $3 ; warps
- db $5, $b, $0, MT_MOON_POKECENTER
- db $5, $12, $0, MT_MOON_1
- db $5, $18, $7, MT_MOON_2
+ warp $b, $5, $0, MT_MOON_POKECENTER
+ warp $12, $5, $0, MT_MOON_1
+ warp $18, $5, $7, MT_MOON_2
db $3 ; signs
- db $5, $c, $4 ; PokeCenterSignText
- db $7, $11, $5 ; Route4Text5
- db $7, $1b, $6 ; Route4Text6
+ sign $c, $5, $4 ; PokeCenterSignText
+ sign $11, $7, $5 ; Route4Text5
+ sign $1b, $7, $6 ; Route4Text6
db $3 ; objects
object SPRITE_LASS, $9, $8, WALK, $0, $1 ; person
@@ -17,6 +17,6 @@ Route4Object:
object SPRITE_BALL, $39, $3, STAY, NONE, $3, TM_04
; warp-to
- EVENT_DISP ROUTE_4_WIDTH, $5, $b ; MT_MOON_POKECENTER
- EVENT_DISP ROUTE_4_WIDTH, $5, $12 ; MT_MOON_1
- EVENT_DISP ROUTE_4_WIDTH, $5, $18 ; MT_MOON_2
+ warp_to $b, $5, ROUTE_4_WIDTH ; MT_MOON_POKECENTER
+ warp_to $12, $5, ROUTE_4_WIDTH ; MT_MOON_1
+ warp_to $18, $5, ROUTE_4_WIDTH ; MT_MOON_2