aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/SafariZoneGate.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/SafariZoneGate.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/SafariZoneGate.asm (renamed from data/mapObjects/safarizoneentrance.asm)10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/mapObjects/safarizoneentrance.asm b/data/mapObjects/SafariZoneGate.asm
index 5a3379c7..6749b45b 100755
--- a/data/mapObjects/safarizoneentrance.asm
+++ b/data/mapObjects/SafariZoneGate.asm
@@ -1,4 +1,4 @@
-SafariZoneEntranceObject:
+SafariZoneGate_Object:
db $a ; border block
db 4 ; warps
@@ -14,7 +14,7 @@ SafariZoneEntranceObject:
object SPRITE_WHITE_PLAYER, 1, 4, STAY, RIGHT, 2 ; person
; warp-to
- warp_to 3, 5, SAFARI_ZONE_ENTRANCE_WIDTH
- warp_to 4, 5, SAFARI_ZONE_ENTRANCE_WIDTH
- warp_to 3, 0, SAFARI_ZONE_ENTRANCE_WIDTH ; SAFARI_ZONE_CENTER
- warp_to 4, 0, SAFARI_ZONE_ENTRANCE_WIDTH ; SAFARI_ZONE_CENTER
+ warp_to 3, 5, SAFARI_ZONE_GATE_WIDTH
+ warp_to 4, 5, SAFARI_ZONE_GATE_WIDTH
+ warp_to 3, 0, SAFARI_ZONE_GATE_WIDTH ; SAFARI_ZONE_CENTER
+ warp_to 4, 0, SAFARI_ZONE_GATE_WIDTH ; SAFARI_ZONE_CENTER