summaryrefslogtreecommitdiff
path: root/data/mapObjects/viridianforest.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/viridianforest.asm')
-rwxr-xr-xdata/mapObjects/viridianforest.asm58
1 files changed, 29 insertions, 29 deletions
diff --git a/data/mapObjects/viridianforest.asm b/data/mapObjects/viridianforest.asm
index 0e466a70..601f73e2 100755
--- a/data/mapObjects/viridianforest.asm
+++ b/data/mapObjects/viridianforest.asm
@@ -1,36 +1,36 @@
ViridianForestObject:
db $3 ; border block
- db $6 ; warps
- db $0, $1, $2, VIRIDIAN_FOREST_EXIT
- db $0, $2, $3, VIRIDIAN_FOREST_EXIT
- db $2f, $f, $1, VIRIDIAN_FOREST_ENTRANCE
- db $2f, $10, $1, VIRIDIAN_FOREST_ENTRANCE
- db $2f, $11, $1, VIRIDIAN_FOREST_ENTRANCE
- db $2f, $12, $1, VIRIDIAN_FOREST_ENTRANCE
+ db 6 ; warps
+ warp 1, 0, 2, VIRIDIAN_FOREST_EXIT
+ warp 2, 0, 3, VIRIDIAN_FOREST_EXIT
+ warp 15, 47, 1, VIRIDIAN_FOREST_ENTRANCE
+ warp 16, 47, 1, VIRIDIAN_FOREST_ENTRANCE
+ warp 17, 47, 1, VIRIDIAN_FOREST_ENTRANCE
+ warp 18, 47, 1, VIRIDIAN_FOREST_ENTRANCE
- db $6 ; signs
- db $28, $18, $9 ; ViridianForestText9
- db $20, $10, $a ; ViridianForestText10
- db $11, $1a, $b ; ViridianForestText11
- db $18, $4, $c ; ViridianForestText12
- db $2d, $12, $d ; ViridianForestText13
- db $1, $2, $e ; ViridianForestText14
+ db 6 ; signs
+ sign 24, 40, 9 ; ViridianForestText9
+ sign 16, 32, 10 ; ViridianForestText10
+ sign 26, 17, 11 ; ViridianForestText11
+ sign 4, 24, 12 ; ViridianForestText12
+ sign 18, 45, 13 ; ViridianForestText13
+ sign 2, 1, 14 ; ViridianForestText14
- db $8 ; objects
- object SPRITE_BUG_CATCHER, $10, $2b, STAY, NONE, $1 ; person
- object SPRITE_BUG_CATCHER, $1e, $21, STAY, LEFT, $2, OPP_BUG_CATCHER, $1
- object SPRITE_BUG_CATCHER, $1e, $13, STAY, LEFT, $3, OPP_BUG_CATCHER, $2
- object SPRITE_BUG_CATCHER, $2, $12, STAY, LEFT, $4, OPP_BUG_CATCHER, $3
- object SPRITE_BALL, $19, $b, STAY, NONE, $5, ANTIDOTE
- object SPRITE_BALL, $c, $1d, STAY, NONE, $6, POTION
- object SPRITE_BALL, $1, $1f, STAY, NONE, $7, POKE_BALL
- object SPRITE_BUG_CATCHER, $1b, $28, STAY, NONE, $8 ; person
+ db 8 ; objects
+ object SPRITE_BUG_CATCHER, 16, 43, STAY, NONE, 1 ; person
+ object SPRITE_BUG_CATCHER, 30, 33, STAY, LEFT, 2, OPP_BUG_CATCHER, 1
+ object SPRITE_BUG_CATCHER, 30, 19, STAY, LEFT, 3, OPP_BUG_CATCHER, 2
+ object SPRITE_BUG_CATCHER, 2, 18, STAY, LEFT, 4, OPP_BUG_CATCHER, 3
+ object SPRITE_BALL, 25, 11, STAY, NONE, 5, ANTIDOTE
+ object SPRITE_BALL, 12, 29, STAY, NONE, 6, POTION
+ object SPRITE_BALL, 1, 31, STAY, NONE, 7, POKE_BALL
+ object SPRITE_BUG_CATCHER, 27, 40, STAY, NONE, 8 ; person
; warp-to
- EVENT_DISP VIRIDIAN_FOREST_WIDTH, $0, $1 ; VIRIDIAN_FOREST_EXIT
- EVENT_DISP VIRIDIAN_FOREST_WIDTH, $0, $2 ; VIRIDIAN_FOREST_EXIT
- EVENT_DISP VIRIDIAN_FOREST_WIDTH, $2f, $f ; VIRIDIAN_FOREST_ENTRANCE
- EVENT_DISP VIRIDIAN_FOREST_WIDTH, $2f, $10 ; VIRIDIAN_FOREST_ENTRANCE
- EVENT_DISP VIRIDIAN_FOREST_WIDTH, $2f, $11 ; VIRIDIAN_FOREST_ENTRANCE
- EVENT_DISP VIRIDIAN_FOREST_WIDTH, $2f, $12 ; VIRIDIAN_FOREST_ENTRANCE
+ warp_to 1, 0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_EXIT
+ warp_to 2, 0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_EXIT
+ warp_to 15, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_ENTRANCE
+ warp_to 16, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_ENTRANCE
+ warp_to 17, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_ENTRANCE
+ warp_to 18, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_ENTRANCE