aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/RocketHideoutB4F.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/RocketHideoutB4F.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/RocketHideoutB4F.asm (renamed from data/mapObjects/rockethideout4.asm)10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/mapObjects/rockethideout4.asm b/data/mapObjects/RocketHideoutB4F.asm
index 97025c71..be353f25 100755
--- a/data/mapObjects/rockethideout4.asm
+++ b/data/mapObjects/RocketHideoutB4F.asm
@@ -1,8 +1,8 @@
-RocketHideout4Object:
+RocketHideoutB4F_Object:
db $2e ; border block
db 3 ; warps
- warp 19, 10, 1, ROCKET_HIDEOUT_3
+ warp 19, 10, 1, ROCKET_HIDEOUT_B3F
warp 24, 15, 0, ROCKET_HIDEOUT_ELEVATOR
warp 25, 15, 1, ROCKET_HIDEOUT_ELEVATOR
@@ -20,6 +20,6 @@ RocketHideout4Object:
object SPRITE_BALL, 10, 2, STAY, NONE, 9, LIFT_KEY
; warp-to
- warp_to 19, 10, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_3
- warp_to 24, 15, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
- warp_to 25, 15, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
+ warp_to 19, 10, ROCKET_HIDEOUT_B4F_WIDTH ; ROCKET_HIDEOUT_B3F
+ warp_to 24, 15, ROCKET_HIDEOUT_B4F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
+ warp_to 25, 15, ROCKET_HIDEOUT_B4F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR