aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/viridianforestexit.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/viridianforestexit.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/ViridianForestNorthGate.asm (renamed from data/mapObjects/viridianforestexit.asm)10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/mapObjects/viridianforestexit.asm b/data/mapObjects/ViridianForestNorthGate.asm
index 521ad818..81e7fece 100755
--- a/data/mapObjects/viridianforestexit.asm
+++ b/data/mapObjects/ViridianForestNorthGate.asm
@@ -1,4 +1,4 @@
-ViridianForestExitObject:
+ViridianForestNorthGate_Object:
db $a ; border block
db 4 ; warps
@@ -14,7 +14,7 @@ ViridianForestExitObject:
object SPRITE_OLD_PERSON, 2, 5, STAY, NONE, 2 ; person
; warp-to
- warp_to 4, 0, VIRIDIAN_FOREST_EXIT_WIDTH
- warp_to 5, 0, VIRIDIAN_FOREST_EXIT_WIDTH
- warp_to 4, 7, VIRIDIAN_FOREST_EXIT_WIDTH ; VIRIDIAN_FOREST
- warp_to 5, 7, VIRIDIAN_FOREST_EXIT_WIDTH ; VIRIDIAN_FOREST
+ warp_to 4, 0, VIRIDIAN_FOREST_NORTH_GATE_WIDTH
+ warp_to 5, 0, VIRIDIAN_FOREST_NORTH_GATE_WIDTH
+ warp_to 4, 7, VIRIDIAN_FOREST_NORTH_GATE_WIDTH ; VIRIDIAN_FOREST
+ warp_to 5, 7, VIRIDIAN_FOREST_NORTH_GATE_WIDTH ; VIRIDIAN_FOREST