diff options
Diffstat (limited to 'scripts/rockethideoutelevator.asm')
| -rwxr-xr-x | scripts/rockethideoutelevator.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/scripts/rockethideoutelevator.asm b/scripts/rockethideoutelevator.asm index c90b0aad..526ac3cc 100755 --- a/scripts/rockethideoutelevator.asm +++ b/scripts/rockethideoutelevator.asm @@ -1,4 +1,4 @@ -RocketHideoutElevatorScript: ; 45710 (11:5710) +RocketHideoutElevatorScript: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] @@ -14,7 +14,7 @@ RocketHideoutElevatorScript: ; 45710 (11:5710) ld [wDoNotWaitForButtonPressAfterDisplayingText], a ret -RocketHideoutElevatorScript_4572c: ; 4572c (11:572c) +RocketHideoutElevatorScript_4572c: ld hl, wWarpEntries ld a, [wWarpedFromWhichWarp] ld b, a @@ -22,7 +22,7 @@ RocketHideoutElevatorScript_4572c: ; 4572c (11:572c) ld c, a call RocketHideoutElevatorScript_4573a -RocketHideoutElevatorScript_4573a: ; 4573a (11:573a) +RocketHideoutElevatorScript_4573a: inc hl inc hl ld a, b @@ -31,7 +31,7 @@ RocketHideoutElevatorScript_4573a: ; 4573a (11:573a) ld [hli], a ret -RocketHideoutElevatorScript_45741: ; 45741 (11:5741) +RocketHideoutElevatorScript_45741: ld hl, RocketHideoutElavatorFloors call LoadItemList ld hl, RocketHideoutElevatorWarpMaps @@ -40,14 +40,14 @@ RocketHideoutElevatorScript_45741: ; 45741 (11:5741) call CopyData ret -RocketHideoutElavatorFloors: ; 45754 (11:5754) +RocketHideoutElavatorFloors: db $03 ; num elements in list db FLOOR_B1F db FLOOR_B2F db FLOOR_B4F db $FF ; terminator -RocketHideoutElevatorWarpMaps: ; 45759 (11:5759) +RocketHideoutElevatorWarpMaps: ; first byte is warp number ; second byte is map number ; These specify where the player goes after getting out of the elevator. @@ -56,15 +56,15 @@ RocketHideoutElevatorWarpMaps: ; 45759 (11:5759) db $02, ROCKET_HIDEOUT_4 RocketHideoutElevatorWarpMapsEnd: -RocketHideoutElevatorScript_4575f: ; 4575f (11:575f) +RocketHideoutElevatorScript_4575f: call Delay3 callba ShakeElevator ret -RocketHideoutElevatorTextPointers: ; 4576b (11:576b) +RocketHideoutElevatorTextPointers: dw RocketHideoutElevatorText1 -RocketHideoutElevatorText1: ; 4576d (11:576d) +RocketHideoutElevatorText1: TX_ASM ld b, LIFT_KEY call IsItemInBag @@ -79,6 +79,6 @@ RocketHideoutElevatorText1: ; 4576d (11:576d) .asm_45788 jp TextScriptEnd -RocketHideoutElevatorText_4578b: ; 4578b (11:578b) +RocketHideoutElevatorText_4578b: TX_FAR _RocketElevatorText_4578b db $d, "@" |