diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-28 10:27:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-28 10:27:50 -0500 |
| commit | 3f5936239785c8dae923e1f5c4bb91492e67cb5a (patch) | |
| tree | cb0c74dc4a2c09551e1b6699b7c71ed7dc7c85d7 /src/mirage_tower.c | |
| parent | 763724a98046c81da15dd5a5877ad30adb8129ba (diff) | |
| parent | ea748ff7f51a7c119658930f878d046cc8b83c51 (diff) | |
Merge branch 'master' into doc-pokejump
Diffstat (limited to 'src/mirage_tower.c')
| -rw-r--r-- | src/mirage_tower.c | 4 |
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(); |