aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/silphcoelevator.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2020-05-20 19:40:33 -0500
committerdannye <33dannye@gmail.com>2020-05-20 20:02:53 -0500
commit10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch)
tree7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /scripts/silphcoelevator.asm
parentMerge pull request #39 from TiKevin83/master (diff)
downloadpokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz
pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz
pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip
Sync with pokered
Diffstat (limited to '')
-rwxr-xr-xscripts/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: