aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/celadonmartelevator.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/celadonmartelevator.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/CeladonMartElevator.asm (renamed from scripts/celadonmartelevator.asm)14
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/celadonmartelevator.asm b/scripts/CeladonMartElevator.asm
index 60e5210c..34b923f9 100755
--- a/scripts/celadonmartelevator.asm
+++ b/scripts/CeladonMartElevator.asm
@@ -1,4 +1,4 @@
-CeladonMartElevatorScript:
+CeladonMartElevator_Script:
ld hl, wCurrentMapScriptFlags
bit 5, [hl]
res 5, [hl]
@@ -52,17 +52,17 @@ CeladonMartElevatorWarpMaps:
; first byte is warp number
; second byte is map number
; These specify where the player goes after getting out of the elevator.
- db $05, CELADON_MART_1
- db $02, CELADON_MART_2
- db $02, CELADON_MART_3
- db $02, CELADON_MART_4
- db $02, CELADON_MART_5
+ db $05, CELADON_MART_1F
+ db $02, CELADON_MART_2F
+ db $02, CELADON_MART_3F
+ db $02, CELADON_MART_4F
+ db $02, CELADON_MART_5F
CeladonMartElevatorWarpMapsEnd:
CeladonMartElevatorScript_48654:
jpba ShakeElevator
-CeladonMartElevatorTextPointers:
+CeladonMartElevator_TextPointers:
dw CeladonMartElevatorText1
CeladonMartElevatorText1: