summaryrefslogtreecommitdiff
path: root/data/mapObjects/viridianforestexit.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/viridianforestexit.asm
parentc84667c4df36918071bb7487c456d7adafb921ca (diff)
Add warp, sign, and warp_to macros for data/mapObjects definitions
Diffstat (limited to 'data/mapObjects/viridianforestexit.asm')
-rwxr-xr-xdata/mapObjects/viridianforestexit.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/mapObjects/viridianforestexit.asm b/data/mapObjects/viridianforestexit.asm
index 0f48fd1c..278f5770 100755
--- a/data/mapObjects/viridianforestexit.asm
+++ b/data/mapObjects/viridianforestexit.asm
@@ -2,10 +2,10 @@ ViridianForestExitObject:
db $a ; border block
db $4 ; warps
- db $0, $4, $1, $ff
- db $0, $5, $1, $ff
- db $7, $4, $0, VIRIDIAN_FOREST
- db $7, $5, $0, VIRIDIAN_FOREST
+ warp $4, $0, $1, $ff
+ warp $5, $0, $1, $ff
+ warp $4, $7, $0, VIRIDIAN_FOREST
+ warp $5, $7, $0, VIRIDIAN_FOREST
db $0 ; signs
@@ -14,7 +14,7 @@ ViridianForestExitObject:
object SPRITE_OLD_PERSON, $2, $5, STAY, NONE, $2 ; person
; warp-to
- EVENT_DISP VIRIDIAN_FOREST_EXIT_WIDTH, $0, $4
- EVENT_DISP VIRIDIAN_FOREST_EXIT_WIDTH, $0, $5
- EVENT_DISP VIRIDIAN_FOREST_EXIT_WIDTH, $7, $4 ; VIRIDIAN_FOREST
- EVENT_DISP VIRIDIAN_FOREST_EXIT_WIDTH, $7, $5 ; VIRIDIAN_FOREST
+ warp_to $4, $0, VIRIDIAN_FOREST_EXIT_WIDTH
+ warp_to $5, $0, VIRIDIAN_FOREST_EXIT_WIDTH
+ warp_to $4, $7, VIRIDIAN_FOREST_EXIT_WIDTH ; VIRIDIAN_FOREST
+ warp_to $5, $7, VIRIDIAN_FOREST_EXIT_WIDTH ; VIRIDIAN_FOREST