aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/GameCorner.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2019-01-01 15:06:23 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2019-01-01 23:33:10 -0500
commitc7796024590fec48ac79756793c1a6e3b54daf8f (patch)
tree0d61caa7ebe429995a61e800d1d78c3a82aec886 /data/mapObjects/GameCorner.asm
parentMerge pull request #193 from luckytyphlosion/master (diff)
downloadpokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.tar.gz
pokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.tar.xz
pokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.zip
Rename map files, labels, and constants to be consistent and work with Polished Map
Diffstat (limited to '')
-rwxr-xr-xdata/mapObjects/GameCorner.asm (renamed from data/mapObjects/celadongamecorner.asm)6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/celadongamecorner.asm b/data/mapObjects/GameCorner.asm
index a09691d6..2704f6ab 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
@@ -25,4 +25,4 @@ CeladonGameCornerObject:
; warp-to
warp_to 15, 17, GAME_CORNER_WIDTH
warp_to 16, 17, GAME_CORNER_WIDTH
- warp_to 17, 4, GAME_CORNER_WIDTH ; ROCKET_HIDEOUT_1
+ warp_to 17, 4, GAME_CORNER_WIDTH ; ROCKET_HIDEOUT_B1F