diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-06-11 17:10:37 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-06-11 17:10:37 -0500 |
| commit | 401d6e7f36e86aa246a2c0591195e1f0f01e879f (patch) | |
| tree | 1a8c702fa533d2923c952e9f6b69bb28d657e357 /scripts/celadonmartelevator.asm | |
| parent | c979b3bb03b121dd03a800df74144cd69a74601a (diff) | |
More syncing with pokered
from April 8, 2016 to present
Diffstat (limited to 'scripts/celadonmartelevator.asm')
| -rwxr-xr-x | scripts/celadonmartelevator.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/celadonmartelevator.asm b/scripts/celadonmartelevator.asm index e78d86fc..60e5210c 100755 --- a/scripts/celadonmartelevator.asm +++ b/scripts/celadonmartelevator.asm @@ -32,23 +32,23 @@ CeladonMartElevatorScript_4862a: ret CeladonMartElevatorScript_48631: - ld hl, CeladonMartElavatorFloors + ld hl, CeladonMartElevatorFloors call LoadItemList - ld hl, CeldaonMartElevatorWarpMaps + ld hl, CeladonMartElevatorWarpMaps ld de, wElevatorWarpMaps - ld bc, CeldaonMartElevatorWarpMapsEnd - CeldaonMartElevatorWarpMaps + ld bc, CeladonMartElevatorWarpMapsEnd - CeladonMartElevatorWarpMaps jp CopyData -CeladonMartElavatorFloors: - db $05 ; num elements in list +CeladonMartElevatorFloors: + db 5 ; number of elements in list db FLOOR_1F db FLOOR_2F db FLOOR_3F db FLOOR_4F db FLOOR_5F - db $FF ; terminator + db $FF -CeldaonMartElevatorWarpMaps: +CeladonMartElevatorWarpMaps: ; first byte is warp number ; second byte is map number ; These specify where the player goes after getting out of the elevator. @@ -57,7 +57,7 @@ CeldaonMartElevatorWarpMaps: db $02, CELADON_MART_3 db $02, CELADON_MART_4 db $02, CELADON_MART_5 -CeldaonMartElevatorWarpMapsEnd: +CeladonMartElevatorWarpMapsEnd: CeladonMartElevatorScript_48654: jpba ShakeElevator @@ -68,6 +68,6 @@ CeladonMartElevatorTextPointers: CeladonMartElevatorText1: TX_ASM call CeladonMartElevatorScript_48631 - ld hl, CeldaonMartElevatorWarpMaps + ld hl, CeladonMartElevatorWarpMaps predef DisplayElevatorFloorMenu jp TextScriptEnd |