summaryrefslogtreecommitdiff
path: root/src/mirage_tower.c
diff options
context:
space:
mode:
authorluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2021-05-23 10:51:26 -0400
committerluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2021-05-23 10:51:26 -0400
commitc723d980e772f7e7ab82dbcb7ad07132c09ab5b4 (patch)
tree0bed002b2990b9e837220618a321f3b6517a1099 /src/mirage_tower.c
parentc50a21fba07db80ac44c6f09fd202ba4b2e2c7d3 (diff)
parentffbbc88801de3fc56d0bf5f0af1418ca7cfcfa4f (diff)
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'src/mirage_tower.c')
-rw-r--r--src/mirage_tower.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mirage_tower.c b/src/mirage_tower.c
index ef7bf7228..d18ddcc0f 100644
--- a/src/mirage_tower.c
+++ b/src/mirage_tower.c
@@ -398,7 +398,7 @@ static void DoScreenShake(u8 taskId)
static void IncrementCeilingCrumbleFinishedCount(void)
{
u8 taskId = FindTaskIdByFunc(WaitCeilingCrumble);
- if (taskId != 0xFF)
+ if (taskId != TASK_NONE)
gTasks[taskId].data[0]++;
}
@@ -610,7 +610,7 @@ static void DoMirageTowerDisintegration(u8 taskId)
case 4:
UnsetBgTilemapBuffer(0);
bgShakeTaskId = FindTaskIdByFunc(UpdateBgShake);
- if (bgShakeTaskId != 0xFF)
+ if (bgShakeTaskId != TASK_NONE)
DestroyTask(bgShakeTaskId);
sBgShakeOffsets->bgVOFS = sBgShakeOffsets->bgHOFS = 0;
SetBgShakeOffsets();