diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 00:08:55 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 00:08:55 +0100 |
commit | 8cd4908fa3820b22a8b4e3d96780d725132549c4 (patch) | |
tree | bcc8e697ce7dd0d4ab532a61fccafbbdb6d2400e /data/scripts/maps/TrainerHill_Elevator.inc | |
parent | 6b5157b2a3b2d81f83a910b211834cde5cd3a238 (diff) | |
parent | 841ee0f2b25b39b923a9f800279df413edb8c66d (diff) |
merge bike with master, fix conflicts
Diffstat (limited to 'data/scripts/maps/TrainerHill_Elevator.inc')
-rw-r--r-- | data/scripts/maps/TrainerHill_Elevator.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/scripts/maps/TrainerHill_Elevator.inc b/data/scripts/maps/TrainerHill_Elevator.inc index 5efad0b86..c3644e0de 100644 --- a/data/scripts/maps/TrainerHill_Elevator.inc +++ b/data/scripts/maps/TrainerHill_Elevator.inc @@ -24,7 +24,7 @@ TrainerHill_Elevator_EventScript_269375:: @ 8269375 waitmovement 0 lockall msgbox TrainerHill_Elevator_Text_268F3E, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq TrainerHill_Elevator_EventScript_269360 releaseall applymovement 1, TrainerHill_Elevator_Movement_2693F0 |