diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-09-24 10:17:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-24 10:17:34 -0400 |
| commit | 42d2fefe0218f529f9c22f3b6b4230ca91a00de5 (patch) | |
| tree | db4ae87659baced2022e440109306266c1c80e3b /src/fldeff_escalator.c | |
| parent | f8f7617946e150514313267ba52a35ebd9052936 (diff) | |
| parent | 09fd4fc4c57796036905cdc5caaa53fb96c436f8 (diff) | |
Merge branch 'master' into tag-none
Diffstat (limited to 'src/fldeff_escalator.c')
| -rw-r--r-- | src/fldeff_escalator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fldeff_escalator.c b/src/fldeff_escalator.c index 733dca722..769e73562 100644 --- a/src/fldeff_escalator.c +++ b/src/fldeff_escalator.c @@ -71,7 +71,7 @@ static void SetEscalatorMetatile(u8 taskId, const s16 *metatileIds, u16 metatile s16 i; s16 j; - // Check all the escalator sections and only progress the selected one to the next stage + // Check all the escalator sections and only progress the selected one to the next stage if (!gTasks[taskId].tGoingUp) { for (i = 0; i < 3; i++) @@ -178,7 +178,7 @@ void StopEscalator(void) bool8 IsEscalatorMoving(void) { - if (gTasks[sEscalatorAnim_TaskId].tDrawingEscalator == FALSE + if (gTasks[sEscalatorAnim_TaskId].tDrawingEscalator == FALSE && gTasks[sEscalatorAnim_TaskId].tTransitionStage == LAST_ESCALATOR_STAGE) return FALSE; else |