aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/viridianforestentrance.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/viridianforestentrance.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/viridianforestentrance.asm')
-rwxr-xr-xdata/mapObjects/viridianforestentrance.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/mapObjects/viridianforestentrance.asm b/data/mapObjects/viridianforestentrance.asm
index 06faad72..40b1b42e 100755
--- a/data/mapObjects/viridianforestentrance.asm
+++ b/data/mapObjects/viridianforestentrance.asm
@@ -2,10 +2,10 @@ ViridianForestEntranceObject:
db $a ; border block
db $4 ; warps
- db $0, $4, $3, VIRIDIAN_FOREST
- db $0, $5, $4, VIRIDIAN_FOREST
- db $7, $4, $5, $ff
- db $7, $5, $5, $ff
+ warp $4, $0, $3, VIRIDIAN_FOREST
+ warp $5, $0, $4, VIRIDIAN_FOREST
+ warp $4, $7, $5, $ff
+ warp $5, $7, $5, $ff
db $0 ; signs
@@ -14,7 +14,7 @@ ViridianForestEntranceObject:
object SPRITE_LITTLE_GIRL, $2, $4, WALK, $1, $2 ; person
; warp-to
- EVENT_DISP VIRIDIAN_FOREST_ENTRANCE_WIDTH, $0, $4 ; VIRIDIAN_FOREST
- EVENT_DISP VIRIDIAN_FOREST_ENTRANCE_WIDTH, $0, $5 ; VIRIDIAN_FOREST
- EVENT_DISP VIRIDIAN_FOREST_ENTRANCE_WIDTH, $7, $4
- EVENT_DISP VIRIDIAN_FOREST_ENTRANCE_WIDTH, $7, $5
+ warp_to $4, $0, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; VIRIDIAN_FOREST
+ warp_to $5, $0, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; VIRIDIAN_FOREST
+ warp_to $4, $7, VIRIDIAN_FOREST_ENTRANCE_WIDTH
+ warp_to $5, $7, VIRIDIAN_FOREST_ENTRANCE_WIDTH