diff options
Diffstat (limited to 'data/maps/objects/ViridianForest.asm')
| -rwxr-xr-x | data/maps/objects/ViridianForest.asm | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/data/maps/objects/ViridianForest.asm b/data/maps/objects/ViridianForest.asm index beee25c2..a06e67eb 100755 --- a/data/maps/objects/ViridianForest.asm +++ b/data/maps/objects/ViridianForest.asm @@ -1,7 +1,7 @@ ViridianForest_Object: db $3 ; border block - db 6 ; warps + def_warps warp 1, 0, 2, VIRIDIAN_FOREST_NORTH_GATE warp 2, 0, 3, VIRIDIAN_FOREST_NORTH_GATE warp 15, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE @@ -9,7 +9,7 @@ ViridianForest_Object: warp 17, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE warp 18, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE - db 6 ; signs + def_signs sign 24, 40, 9 ; ViridianForestText9 sign 16, 32, 10 ; ViridianForestText10 sign 26, 17, 11 ; ViridianForestText11 @@ -17,7 +17,7 @@ ViridianForest_Object: sign 18, 45, 13 ; ViridianForestText13 sign 2, 1, 14 ; ViridianForestText14 - db 8 ; objects + def_objects object SPRITE_YOUNGSTER, 16, 43, STAY, NONE, 1 ; person object SPRITE_YOUNGSTER, 30, 33, STAY, LEFT, 2, OPP_BUG_CATCHER, 1 object SPRITE_YOUNGSTER, 30, 19, STAY, LEFT, 3, OPP_BUG_CATCHER, 2 @@ -27,10 +27,4 @@ ViridianForest_Object: object SPRITE_POKE_BALL, 1, 31, STAY, NONE, 7, POKE_BALL object SPRITE_YOUNGSTER, 27, 40, STAY, NONE, 8 ; person - ; warp-to - warp_to 1, 0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_NORTH_GATE - warp_to 2, 0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_NORTH_GATE - warp_to 15, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE - warp_to 16, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE - warp_to 17, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE - warp_to 18, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE + def_warps_to VIRIDIAN_FOREST |