aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/celadonmartelevator.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/celadonmartelevator.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/CeladonMartElevator.asm (renamed from data/mapObjects/celadonmartelevator.asm)6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/celadonmartelevator.asm b/data/mapObjects/CeladonMartElevator.asm
index 14fca2bf..9688daef 100755
--- a/data/mapObjects/celadonmartelevator.asm
+++ b/data/mapObjects/CeladonMartElevator.asm
@@ -1,9 +1,9 @@
-CeladonMartElevatorObject:
+CeladonMartElevator_Object:
db $f ; border block
db 2 ; warps
- warp 1, 3, 5, CELADON_MART_1
- warp 2, 3, 5, CELADON_MART_1
+ warp 1, 3, 5, CELADON_MART_1F
+ warp 2, 3, 5, CELADON_MART_1F
db 1 ; signs
sign 3, 0, 1 ; CeladonMartElevatorText1