aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/GameCorner.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/GameCorner.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/GameCorner.asm (renamed from data/mapObjects/celadongamecorner.asm)4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/mapObjects/celadongamecorner.asm b/data/mapObjects/GameCorner.asm
index be5a3c71..afac025e 100755
--- a/data/mapObjects/celadongamecorner.asm
+++ b/data/mapObjects/GameCorner.asm
@@ -1,10 +1,10 @@
-CeladonGameCornerObject:
+GameCorner_Object:
db $f ; border block
db 3 ; warps
warp 15, 17, 7, -1
warp 16, 17, 7, -1
- warp 17, 4, 1, ROCKET_HIDEOUT_1
+ warp 17, 4, 1, ROCKET_HIDEOUT_B1F
db 1 ; signs
sign 9, 4, 12 ; CeladonGameCornerText12