diff options
| author | dannye <33dannye@gmail.com> | 2020-05-20 19:40:33 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-05-20 20:02:53 -0500 |
| commit | 10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /scripts/rockethideoutelevator.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| download | pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip | |
Sync with pokered
Diffstat (limited to '')
| -rwxr-xr-x | scripts/RocketHideoutElevator.asm (renamed from scripts/rockethideoutelevator.asm) | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/scripts/rockethideoutelevator.asm b/scripts/RocketHideoutElevator.asm index 526ac3cc..9525db3a 100755 --- a/scripts/rockethideoutelevator.asm +++ b/scripts/RocketHideoutElevator.asm @@ -1,4 +1,4 @@ -RocketHideoutElevatorScript: +RocketHideoutElevator_Script: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] @@ -51,9 +51,9 @@ RocketHideoutElevatorWarpMaps: ; first byte is warp number ; second byte is map number ; These specify where the player goes after getting out of the elevator. - db $04, ROCKET_HIDEOUT_1 - db $04, ROCKET_HIDEOUT_2 - db $02, ROCKET_HIDEOUT_4 + db $04, ROCKET_HIDEOUT_B1F + db $04, ROCKET_HIDEOUT_B2F + db $02, ROCKET_HIDEOUT_B4F RocketHideoutElevatorWarpMapsEnd: RocketHideoutElevatorScript_4575f: @@ -61,7 +61,7 @@ RocketHideoutElevatorScript_4575f: callba ShakeElevator ret -RocketHideoutElevatorTextPointers: +RocketHideoutElevator_TextPointers: dw RocketHideoutElevatorText1 RocketHideoutElevatorText1: @@ -81,4 +81,5 @@ RocketHideoutElevatorText1: RocketHideoutElevatorText_4578b: TX_FAR _RocketElevatorText_4578b - db $d, "@" + TX_WAIT + db "@" |