diff options
Diffstat (limited to 'maps/BattleTowerElevator.asm')
| -rw-r--r-- | maps/BattleTowerElevator.asm | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index 20ae591bb..9a25e55a4 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -1,45 +1,48 @@ +const_value set 2 + const BATTLETOWERELEVATOR_RECEPTIONIST + BattleTowerElevator_MapScriptHeader: .MapTriggers: db 2 ; triggers - dw UnknownScript_0x9f562, 0 - dw UnknownScript_0x9f567, 0 + dw .Trigger0, 0 + dw .Trigger1, 0 .MapCallbacks: db 0 -UnknownScript_0x9f562: - priorityjump UnknownScript_0x9f568 +.Trigger0: + priorityjump .RideElevator dotrigger $1 -UnknownScript_0x9f567: +.Trigger1: end -UnknownScript_0x9f568: - follow $2, PLAYER - applymovement $2, MovementData_0x9f58f - applymovement PLAYER, MovementData_0x9f592 - writebyte BATTLE_TOWER_ACTION_0A +.RideElevator: + follow BATTLETOWERELEVATOR_RECEPTIONIST, PLAYER + applymovement BATTLETOWERELEVATOR_RECEPTIONIST, MovementData_BattleTowerElevatorReceptionistWalksIn + applymovement PLAYER, MovementData_BattleTowerElevatorPlayerWalksIn + writebyte BATTLETOWERACTION_0A special BattleTowerAction playsound SFX_ELEVATOR earthquake 60 - waitbutton - follow $2, PLAYER - applymovement $2, MovementData_0x9e578 + waitsfx + follow BATTLETOWERELEVATOR_RECEPTIONIST, PLAYER + applymovement BATTLETOWERELEVATOR_RECEPTIONIST, MovementData_BattleTowerElevatorExitElevator stopfollow warpsound - disappear $2 - applymovement PLAYER, MovementData_0x9e578 + disappear BATTLETOWERELEVATOR_RECEPTIONIST + applymovement PLAYER, MovementData_BattleTowerElevatorExitElevator warpcheck end -MovementData_0x9f58f: +MovementData_BattleTowerElevatorReceptionistWalksIn: step_right turn_head_down step_end -MovementData_0x9f592: +MovementData_BattleTowerElevatorPlayerWalksIn: turn_head_down step_end @@ -60,4 +63,4 @@ BattleTowerElevator_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_RECEPTIONIST, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MovementData_0x9f58f, -1 + person_event SPRITE_RECEPTIONIST, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1 |