summaryrefslogtreecommitdiff
path: root/data/mapObjects/viridianforestexit.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/viridianforestexit.asm')
-rwxr-xr-xdata/mapObjects/viridianforestexit.asm26
1 files changed, 13 insertions, 13 deletions
diff --git a/data/mapObjects/viridianforestexit.asm b/data/mapObjects/viridianforestexit.asm
index 0f48fd1c..521ad818 100755
--- a/data/mapObjects/viridianforestexit.asm
+++ b/data/mapObjects/viridianforestexit.asm
@@ -1,20 +1,20 @@
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
+ db 4 ; warps
+ warp 4, 0, 1, -1
+ warp 5, 0, 1, -1
+ warp 4, 7, 0, VIRIDIAN_FOREST
+ warp 5, 7, 0, VIRIDIAN_FOREST
- db $0 ; signs
+ db 0 ; signs
- db $2 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, $3, $2, STAY, NONE, $1 ; person
- object SPRITE_OLD_PERSON, $2, $5, STAY, NONE, $2 ; person
+ db 2 ; objects
+ object SPRITE_BLACK_HAIR_BOY_2, 3, 2, STAY, NONE, 1 ; person
+ 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