aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/viridianforest.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2020-05-20 19:40:33 -0500
committerdannye <33dannye@gmail.com>2020-05-20 20:02:53 -0500
commit10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch)
tree7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /data/mapObjects/viridianforest.asm
parentMerge pull request #39 from TiKevin83/master (diff)
downloadpokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz
pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz
pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip
Sync with pokered
Diffstat (limited to '')
-rwxr-xr-xdata/mapObjects/ViridianForest.asm (renamed from data/mapObjects/viridianforest.asm)14
1 files changed, 7 insertions, 7 deletions
diff --git a/data/mapObjects/viridianforest.asm b/data/mapObjects/ViridianForest.asm
index 9502ed7d..94f74b96 100755
--- a/data/mapObjects/viridianforest.asm
+++ b/data/mapObjects/ViridianForest.asm
@@ -1,13 +1,13 @@
-ViridianForestObject:
+ViridianForest_Object:
db $3 ; border block
db 6 ; warps
- warp 1, 0, 2, VIRIDIAN_FOREST_EXIT
- warp 2, 0, 2, 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
+ warp 1, 0, 2, VIRIDIAN_FOREST_NORTH_GATE
+ warp 2, 0, 2, VIRIDIAN_FOREST_NORTH_GATE
+ warp 15, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE
+ warp 16, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE
+ warp 17, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE
+ warp 18, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE
db 6 ; signs
sign 24, 40, 11 ; ViridianForestText9