diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-05-20 20:17:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 20:17:30 -0500 |
| commit | 500d99c258145d233af8d14cdb5c6e0200dfc1d8 (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /scripts/SilphCoElevator.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| parent | Merge remote-tracking branch 'pokered/master' (diff) | |
| download | pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.gz pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.xz pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.zip | |
Merge pull request #50 from dannye/master
merge pokered
Diffstat (limited to '')
| -rwxr-xr-x | scripts/SilphCoElevator.asm (renamed from scripts/silphcoelevator.asm) | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/silphcoelevator.asm b/scripts/SilphCoElevator.asm index df4d08c7..49de6b27 100755 --- a/scripts/silphcoelevator.asm +++ b/scripts/SilphCoElevator.asm @@ -1,4 +1,4 @@ -SilphCoElevatorScript: +SilphCoElevator_Script: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] @@ -32,7 +32,7 @@ SilphCoElevatorScript_457ea: ret SilphCoElevatorScript_457f1: - ld hl, SilphCoElavatorFloors + ld hl, SilphCoElevatorFloors call LoadItemList ld hl, SilphCoElevatorWarpMaps ld de, wElevatorWarpMaps @@ -40,7 +40,7 @@ SilphCoElevatorScript_457f1: call CopyData ret -SilphCoElavatorFloors: +SilphCoElevatorFloors: db $0B ; num elements in list db FLOOR_1F db FLOOR_2F @@ -77,7 +77,7 @@ SilphCoElevatorScript_45827: callba ShakeElevator ret -SilphCoElevatorTextPointers: +SilphCoElevator_TextPointers: dw SilphCoElevatorText1 SilphCoElevatorText1: |