diff options
| author | PokeCodec <doremylover456@gmail.com> | 2020-07-19 15:57:20 -0400 |
|---|---|---|
| committer | PokeCodec <doremylover456@gmail.com> | 2020-07-24 22:18:57 -0400 |
| commit | c5aa91741b4ba674e0eec574b33a6fb78b349b7a (patch) | |
| tree | 769263133a1e7c895b2be39089466fe5fc1755e1 /src/mirage_tower.c | |
| parent | 69a04f88f4411d9b0db67aa2c42e17e4bfb0dd0e (diff) | |
Change signedness and add casts to avoid implicit conversion warnings
Diffstat (limited to 'src/mirage_tower.c')
| -rw-r--r-- | src/mirage_tower.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mirage_tower.c b/src/mirage_tower.c index e2f5cefb7..bdddbdbe6 100644 --- a/src/mirage_tower.c +++ b/src/mirage_tower.c @@ -168,7 +168,7 @@ const struct PulseBlendSettings gMirageTowerPulseBlendSettings = { .numColors = 15, .delay = 5, .numFadeCycles = -1, - .maxBlendCoeff = 11, + .maxBlendCoeff = -5, .fadeType = 1, .restorePaletteOnUnload = FALSE, .unk7_7 = 1, @@ -412,10 +412,9 @@ void DoMirageTowerCeilingCrumble(void) static void WaitCeilingCrumble(u8 taskId) { - u16 *data = gTasks[taskId].data; - data[1]++; + u16 *data = (u16 *)gTasks[taskId].data; // Either wait 1000 frames, or until all 16 crumble sprites and the one screen-shake task are completed. - if (data[1] == 1000 || data[0] == 17) + if (++data[1] == 1000 || data[0] == 17) gTasks[taskId].func = FinishCeilingCrumbleTask; } |