aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/celadonmartroof.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/celadonmartroof.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/CeladonMartRoof.asm (renamed from data/mapObjects/celadonmartroof.asm)4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/mapObjects/celadonmartroof.asm b/data/mapObjects/CeladonMartRoof.asm
index 744a636d..05cef2d4 100755
--- a/data/mapObjects/celadonmartroof.asm
+++ b/data/mapObjects/CeladonMartRoof.asm
@@ -1,8 +1,8 @@
-CeladonMartRoofObject:
+CeladonMartRoof_Object:
db $42 ; border block
db 1 ; warps
- warp 15, 2, 0, CELADON_MART_5
+ warp 15, 2, 0, CELADON_MART_5F
db 4 ; signs
sign 10, 1, 3 ; CeladonMartRoofText3