diff options
| author | Rangi42 <remy.oukaour+rangi42@gmail.com> | 2023-11-18 19:44:03 -0500 |
|---|---|---|
| committer | Rangi42 <remy.oukaour+rangi42@gmail.com> | 2023-11-18 19:44:03 -0500 |
| commit | 26a342b104e48bede16b9e2324c2f8f57df5bd50 (patch) | |
| tree | 47dc8ca18fa2bbc8aee0f52c99d710d50ef45bd6 /scripts/RocketHideoutElevator.asm | |
| parent | .calculateHPBarCoords incorrectly referenced OAM (diff) | |
| download | pokeyellow-26a342b104e48bede16b9e2324c2f8f57df5bd50.tar.gz pokeyellow-26a342b104e48bede16b9e2324c2f8f57df5bd50.tar.xz pokeyellow-26a342b104e48bede16b9e2324c2f8f57df5bd50.zip | |
Identify more map script labels
Diffstat (limited to 'scripts/RocketHideoutElevator.asm')
| -rw-r--r-- | scripts/RocketHideoutElevator.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/RocketHideoutElevator.asm b/scripts/RocketHideoutElevator.asm index 9352a518..71ff0758 100644 --- a/scripts/RocketHideoutElevator.asm +++ b/scripts/RocketHideoutElevator.asm @@ -3,7 +3,7 @@ RocketHideoutElevator_Script: bit 5, [hl] res 5, [hl] push hl - call nz, RocketHideoutElevatorGetWarpsScript + call nz, RocketHideoutElevatorStoreWarpEntriesScript pop hl bit 7, [hl] res 7, [hl] @@ -14,15 +14,15 @@ RocketHideoutElevator_Script: ld [wDoNotWaitForButtonPressAfterDisplayingText], a ret -RocketHideoutElevatorGetWarpsScript: +RocketHideoutElevatorStoreWarpEntriesScript: ld hl, wWarpEntries ld a, [wWarpedFromWhichWarp] ld b, a ld a, [wWarpedFromWhichMap] ld c, a - call .SetWarpEntries - -.SetWarpEntries: + call .StoreWarpEntry + ; fallthrough +.StoreWarpEntry: inc hl inc hl ld a, b @@ -36,7 +36,7 @@ RocketHideoutElevatorScript: call LoadItemList ld hl, RocketHideoutElevatorWarpMaps ld de, wElevatorWarpMaps - ld bc, RocketHideoutElevatorWarpMapsEnd - RocketHideoutElevatorWarpMaps + ld bc, RocketHideoutElevatorWarpMaps.End - RocketHideoutElevatorWarpMaps call CopyData ret @@ -53,7 +53,7 @@ RocketHideoutElevatorWarpMaps: db 4, ROCKET_HIDEOUT_B1F db 4, ROCKET_HIDEOUT_B2F db 2, ROCKET_HIDEOUT_B4F -RocketHideoutElevatorWarpMapsEnd: +.End: RocketHideoutElevatorShakeScript: call Delay3 |