aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/pokemontower1.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/pokemontower1.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/pokemontower1.asm')
-rwxr-xr-xdata/mapObjects/pokemontower1.asm12
1 files changed, 6 insertions, 6 deletions
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