aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/SafariZoneCenter.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/SafariZoneCenter.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/SafariZoneCenter.asm (renamed from data/mapObjects/safarizonecenter.asm)8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/safarizonecenter.asm b/data/mapObjects/SafariZoneCenter.asm
index 9e0d5751..e54cec74 100755
--- a/data/mapObjects/safarizonecenter.asm
+++ b/data/mapObjects/SafariZoneCenter.asm
@@ -1,16 +1,16 @@
-SafariZoneCenterObject:
+SafariZoneCenter_Object:
db $0 ; border block
db 9 ; warps
- warp 14, 25, 2, SAFARI_ZONE_ENTRANCE
- warp 15, 25, 3, SAFARI_ZONE_ENTRANCE
+ warp 14, 25, 2, SAFARI_ZONE_GATE
+ warp 15, 25, 3, SAFARI_ZONE_GATE
warp 0, 10, 4, SAFARI_ZONE_WEST
warp 0, 11, 5, SAFARI_ZONE_WEST
warp 14, 0, 4, SAFARI_ZONE_NORTH
warp 15, 0, 5, SAFARI_ZONE_NORTH
warp 29, 10, 2, SAFARI_ZONE_EAST
warp 29, 11, 3, SAFARI_ZONE_EAST
- warp 17, 19, 0, SAFARI_ZONE_REST_HOUSE_1
+ warp 17, 19, 0, SAFARI_ZONE_CENTER_REST_HOUSE
db 2 ; signs
sign 18, 20, 2 ; SafariZoneCenterText2