Merge branch 'master' into movement-action

This commit is contained in:
cbt6
2022-08-15 12:54:47 +08:00
committed by GitHub
286 changed files with 8970 additions and 9432 deletions
+3 -4
View File
@@ -38,16 +38,15 @@ TrainerTower_Elevator_EventScript_ChooseFloor::
TrainerTower_Elevator_EventScript_SelectLobby::
setvar VAR_0x8006, 3
setdynamicwarp MAP_TRAINER_TOWER_LOBBY, 255, 17, 8
compare VAR_ELEVATOR_FLOOR, 3
goto_if_eq TrainerTower_Elevator_EventScript_CloseFloorSelect
setdynamicwarp MAP_TRAINER_TOWER_LOBBY, 17, 8
goto_if_eq VAR_ELEVATOR_FLOOR, 3, TrainerTower_Elevator_EventScript_CloseFloorSelect
call TrainerTower_Elevator_EventScript_MoveElevator
setvar VAR_ELEVATOR_FLOOR, 3
special CloseElevatorCurrentFloorWindow
delay 25
applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Elevator_Movement_ExitElevator
waitmovement 0
warp MAP_TRAINER_TOWER_LOBBY, 255, 17, 8
warp MAP_TRAINER_TOWER_LOBBY, 17, 8
waitstate
releaseall
end