summaryrefslogtreecommitdiff
path: root/scripts/RocketHideoutElevator.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-16 17:00:57 -0400
committerGitHub <noreply@github.com>2020-07-16 17:00:57 -0400
commitd44c7c305c3f94b59e3e2c008408779836a0020a (patch)
tree2cdc51be4a22992701038b959d6c964e9ee8fc58 /scripts/RocketHideoutElevator.asm
parentb9a113a9f4712771e37313a4c8a76f7ef23cebb2 (diff)
parent7306c1dc2dca5666a5276a6758d1a64e1ddeae20 (diff)
Merge pull request #277 from Rangi42/master
Miscellaneous constant and label updates
Diffstat (limited to 'scripts/RocketHideoutElevator.asm')
-rwxr-xr-xscripts/RocketHideoutElevator.asm15
1 files changed, 7 insertions, 8 deletions
diff --git a/scripts/RocketHideoutElevator.asm b/scripts/RocketHideoutElevator.asm
index 45b27e3b..8c51294e 100755
--- a/scripts/RocketHideoutElevator.asm
+++ b/scripts/RocketHideoutElevator.asm
@@ -41,19 +41,18 @@ RocketHideoutElevatorScript_45741:
ret
RocketHideoutElavatorFloors:
- db $03 ; num elements in list
+ db 3 ; #
db FLOOR_B1F
db FLOOR_B2F
db FLOOR_B4F
- db $FF ; terminator
+ db -1 ; end
-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_B1F
- db $04, ROCKET_HIDEOUT_B2F
- db $02, ROCKET_HIDEOUT_B4F
+RocketHideoutElevatorWarpMaps:
+ ; warp number, map id
+ db 4, ROCKET_HIDEOUT_B1F
+ db 4, ROCKET_HIDEOUT_B2F
+ db 2, ROCKET_HIDEOUT_B4F
RocketHideoutElevatorWarpMapsEnd:
RocketHideoutElevatorScript_4575f: