diff options
| author | ultima-soul <akshayjhanji@hotmail.com> | 2020-03-13 00:32:04 -0700 |
|---|---|---|
| committer | ultima-soul <akshayjhanji@hotmail.com> | 2020-03-13 00:32:04 -0700 |
| commit | 99e4de062ae43aa978ad4f1a8cd70bc739c64c9d (patch) | |
| tree | 1164d31577e6ebddc1cb313d40bb69ce0d426170 /src/battle_transition.c | |
| parent | 339c2914affc3c62ac9a5725aa1a0c7ccc3161ca (diff) | |
| parent | 6af8c04d8fa6aaeaeb6c8b919e7770a65b9a883d (diff) | |
Merge branch 'master' into event_object_movement
Diffstat (limited to 'src/battle_transition.c')
| -rw-r--r-- | src/battle_transition.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_transition.c b/src/battle_transition.c index 463a3d930..b33d72f15 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -644,7 +644,7 @@ static bool8 BT_Phase1Blink(struct Task *task) static bool8 BT_WaitForPhase1(struct Task *task) { - if (FindTaskIdByFunc(sBT_Phase1Tasks[task->tTransitionId]) == TASK_NONE) + if (FindTaskIdByFunc(sBT_Phase1Tasks[task->tTransitionId]) == TAIL_SENTINEL) { ++task->tState; return TRUE; @@ -665,7 +665,7 @@ static bool8 BT_Phase2LaunchAnimTask(struct Task *task) static bool8 BT_WaitForPhase2(struct Task *task) { task->tTransitionDone = FALSE; - if (FindTaskIdByFunc(sBT_Phase2Tasks[task->tTransitionId]) == TASK_NONE) + if (FindTaskIdByFunc(sBT_Phase2Tasks[task->tTransitionId]) == TAIL_SENTINEL) task->tTransitionDone = TRUE; return FALSE; } @@ -3432,7 +3432,7 @@ static void BT_CreatePhase1SubTask(s16 fadeOutDelay, s16 fadeInDelay, s16 blinkT static bool8 BT_IsPhase1Done(void) { - if (FindTaskIdByFunc(BT_Phase1SubTask) == TASK_NONE) + if (FindTaskIdByFunc(BT_Phase1SubTask) == TAIL_SENTINEL) return TRUE; else return FALSE; |