aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/SafariZoneNorth.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/SafariZoneNorth.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/SafariZoneNorth.asm (renamed from data/mapObjects/safarizonenorth.asm)4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/mapObjects/safarizonenorth.asm b/data/mapObjects/SafariZoneNorth.asm
index b768a077..9eda7b4b 100755
--- a/data/mapObjects/safarizonenorth.asm
+++ b/data/mapObjects/SafariZoneNorth.asm
@@ -1,4 +1,4 @@
-SafariZoneNorthObject:
+SafariZoneNorth_Object:
db $0 ; border block
db 9 ; warps
@@ -10,7 +10,7 @@ SafariZoneNorthObject:
warp 21, 35, 5, SAFARI_ZONE_CENTER
warp 39, 30, 0, SAFARI_ZONE_EAST
warp 39, 31, 1, SAFARI_ZONE_EAST
- warp 35, 3, 0, SAFARI_ZONE_REST_HOUSE_4
+ warp 35, 3, 0, SAFARI_ZONE_NORTH_REST_HOUSE
db 5 ; signs
sign 36, 4, 3 ; SafariZoneNorthText3