diff options
Diffstat (limited to 'scripts/rockethideoutelevator.asm')
| -rwxr-xr-x | scripts/rockethideoutelevator.asm | 58 |
1 files changed, 31 insertions, 27 deletions
diff --git a/scripts/rockethideoutelevator.asm b/scripts/rockethideoutelevator.asm index e7bc24f3..aed0f0cf 100755 --- a/scripts/rockethideoutelevator.asm +++ b/scripts/rockethideoutelevator.asm @@ -1,5 +1,5 @@ -RocketHideoutElevatorScript: ; 45710 (11:5710) - ld hl, wd126 +RocketHideoutElevatorScript: + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] push hl @@ -14,15 +14,15 @@ RocketHideoutElevatorScript: ; 45710 (11:5710) ld [wDoNotWaitForButtonPressAfterDisplayingText], a ret -RocketHideoutElevatorScript_4572c: ; 4572c (11:572c) +RocketHideoutElevatorScript_4572c: ld hl, wWarpEntries - ld a, [wd73b] + ld a, [wWarpedFromWhichWarp] ld b, a - ld a, [wd73c] + ld a, [wWarpedFromWhichMap] ld c, a call RocketHideoutElevatorScript_4573a -RocketHideoutElevatorScript_4573a: ; 4573a (11:573a) +RocketHideoutElevatorScript_4573a: inc hl inc hl ld a, b @@ -31,51 +31,55 @@ RocketHideoutElevatorScript_4573a: ; 4573a (11:573a) ld [hli], a ret -RocketHideoutElevatorScript_45741: ; 45741 (11:5741) - ld hl, RocketHideoutElavatorFloors ; $5754 +RocketHideoutElevatorScript_45741: + ld hl, RocketHideoutElavatorFloors call LoadItemList - ld hl, RocketHideoutElevatorWarpMaps ; $5759 - ld de, wcc5b - ld bc, $0006 + ld hl, RocketHideoutElevatorWarpMaps + ld de, wElevatorWarpMaps + ld bc, RocketHideoutElevatorWarpMapsEnd - RocketHideoutElevatorWarpMaps call CopyData ret -RocketHideoutElavatorFloors: ; 45754 (11:5754) +RocketHideoutElavatorFloors: db $03 ; num elements in list - db $55, $54, $61 ; "B1F", "B2F", "B4F" + 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. db $04, ROCKET_HIDEOUT_1 db $04, ROCKET_HIDEOUT_2 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) - db $08 ; asm +RocketHideoutElevatorText1: + TX_ASM ld b, LIFT_KEY call IsItemInBag - jr z, .asm_8d8f0 ; 0x45773 + jr z, .asm_45782 call RocketHideoutElevatorScript_45741 - ld hl, RocketHideoutElevatorWarpMaps ; $5759 - predef Func_1c9c6 - jr .asm_46c43 ; 0x45780 -.asm_8d8f0 ; 0x45782 + ld hl, RocketHideoutElevatorWarpMaps + predef DisplayElevatorFloorMenu + jr .asm_45788 +.asm_45782 ld hl, RocketHideoutElevatorText_4578b call PrintText -.asm_46c43 ; 0x45788 +.asm_45788 jp TextScriptEnd -RocketHideoutElevatorText_4578b: ; 4578b (11:578b) - TX_FAR _RocketElevatorText_4578b ; 0x82438 - db $d, "@" +RocketHideoutElevatorText_4578b: + TX_FAR _RocketElevatorText_4578b + TX_WAIT + db "@" |