aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/rockethideoutelevator.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 /scripts/rockethideoutelevator.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-xscripts/RocketHideoutElevator.asm (renamed from scripts/rockethideoutelevator.asm)10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/rockethideoutelevator.asm b/scripts/RocketHideoutElevator.asm
index aed0f0cf..9525db3a 100755
--- a/scripts/rockethideoutelevator.asm
+++ b/scripts/RocketHideoutElevator.asm
@@ -1,4 +1,4 @@
-RocketHideoutElevatorScript:
+RocketHideoutElevator_Script:
ld hl, wCurrentMapScriptFlags
bit 5, [hl]
res 5, [hl]
@@ -51,9 +51,9 @@ RocketHideoutElevatorWarpMaps:
; first byte is warp number
; second byte is map number
; These specify where the player goes after getting out of the elevator.
- db $04, ROCKET_HIDEOUT_1
- db $04, ROCKET_HIDEOUT_2
- db $02, ROCKET_HIDEOUT_4
+ db $04, ROCKET_HIDEOUT_B1F
+ db $04, ROCKET_HIDEOUT_B2F
+ db $02, ROCKET_HIDEOUT_B4F
RocketHideoutElevatorWarpMapsEnd:
RocketHideoutElevatorScript_4575f:
@@ -61,7 +61,7 @@ RocketHideoutElevatorScript_4575f:
callba ShakeElevator
ret
-RocketHideoutElevatorTextPointers:
+RocketHideoutElevator_TextPointers:
dw RocketHideoutElevatorText1
RocketHideoutElevatorText1: