diff options
| author | dannye <33dannye@gmail.com> | 2023-11-20 00:33:27 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-20 20:23:27 -0600 |
| commit | 298e99d3776580585c3f434e5d93137ae431bdd3 (patch) | |
| tree | a808c4ffd0fd0f9bd28972bae5236e0d3345c8e5 /scripts/RocketHideoutElevator.asm | |
| parent | Add sound bits documentation for wOptions (#110) (diff) | |
| parent | Name 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F (#437) (diff) | |
| download | pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.gz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.xz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts/RocketHideoutElevator.asm')
| -rw-r--r-- | scripts/RocketHideoutElevator.asm | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/scripts/RocketHideoutElevator.asm b/scripts/RocketHideoutElevator.asm index 8c51294e..71ff0758 100644 --- a/scripts/RocketHideoutElevator.asm +++ b/scripts/RocketHideoutElevator.asm @@ -3,26 +3,26 @@ RocketHideoutElevator_Script: bit 5, [hl] res 5, [hl] push hl - call nz, RocketHideoutElevatorScript_4572c + call nz, RocketHideoutElevatorStoreWarpEntriesScript pop hl bit 7, [hl] res 7, [hl] - call nz, RocketHideoutElevatorScript_4575f + call nz, RocketHideoutElevatorShakeScript xor a ld [wAutoTextBoxDrawingControl], a inc a ld [wDoNotWaitForButtonPressAfterDisplayingText], a ret -RocketHideoutElevatorScript_4572c: +RocketHideoutElevatorStoreWarpEntriesScript: ld hl, wWarpEntries ld a, [wWarpedFromWhichWarp] ld b, a ld a, [wWarpedFromWhichMap] ld c, a - call RocketHideoutElevatorScript_4573a - -RocketHideoutElevatorScript_4573a: + call .StoreWarpEntry + ; fallthrough +.StoreWarpEntry: inc hl inc hl ld a, b @@ -31,12 +31,12 @@ RocketHideoutElevatorScript_4573a: ld [hli], a ret -RocketHideoutElevatorScript_45741: +RocketHideoutElevatorScript: ld hl, RocketHideoutElavatorFloors call LoadItemList ld hl, RocketHideoutElevatorWarpMaps ld de, wElevatorWarpMaps - ld bc, RocketHideoutElevatorWarpMapsEnd - RocketHideoutElevatorWarpMaps + ld bc, RocketHideoutElevatorWarpMaps.End - RocketHideoutElevatorWarpMaps call CopyData ret @@ -53,32 +53,33 @@ RocketHideoutElevatorWarpMaps: db 4, ROCKET_HIDEOUT_B1F db 4, ROCKET_HIDEOUT_B2F db 2, ROCKET_HIDEOUT_B4F -RocketHideoutElevatorWarpMapsEnd: +.End: -RocketHideoutElevatorScript_4575f: +RocketHideoutElevatorShakeScript: call Delay3 farcall ShakeElevator ret RocketHideoutElevator_TextPointers: - dw RocketHideoutElevatorText1 + def_text_pointers + dw_const RocketHideoutElevatorText, TEXT_ROCKETHIDEOUTELEVATOR -RocketHideoutElevatorText1: +RocketHideoutElevatorText: text_asm ld b, LIFT_KEY call IsItemInBag - jr z, .asm_45782 - call RocketHideoutElevatorScript_45741 + jr z, .no_key + call RocketHideoutElevatorScript ld hl, RocketHideoutElevatorWarpMaps predef DisplayElevatorFloorMenu - jr .asm_45788 -.asm_45782 - ld hl, RocketHideoutElevatorText_4578b + jr .text_script_end +.no_key + ld hl, .AppearsToNeedKeyText call PrintText -.asm_45788 +.text_script_end jp TextScriptEnd -RocketHideoutElevatorText_4578b: - text_far _RocketElevatorText_4578b +.AppearsToNeedKeyText: + text_far _RocketHideoutElevatorAppearsToNeedKeyText text_waitbutton text_end |