diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-09-23 21:49:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-23 21:49:49 -0400 |
| commit | 9d0f9042febd46d506110778a3beeec90c8c9c1e (patch) | |
| tree | c3bf2f4b0b3183de111bfcc89fac3316f562c937 /src/palette.c | |
| parent | 0c2e9a5b4c1c0c0f2a62be6165e826760dd572cb (diff) | |
| parent | a6ab2eb883b4cef727a6caee993745cfeff1274b (diff) | |
Merge pull request #1498 from LOuroboros/trailingSpaces
Removed trailing spaces in the most relevant files
Diffstat (limited to 'src/palette.c')
| -rw-r--r-- | src/palette.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/palette.c b/src/palette.c index cbaae8da2..e106ce685 100644 --- a/src/palette.c +++ b/src/palette.c @@ -586,7 +586,7 @@ static u8 UpdateFastPaletteFade(void) if (IsSoftwarePaletteFadeFinishing()) return gPaletteFade.active ? PALETTE_FADE_STATUS_ACTIVE : PALETTE_FADE_STATUS_DONE; - + if (gPaletteFade.objPaletteToggle) { @@ -721,7 +721,7 @@ static u8 UpdateFastPaletteFade(void) gPaletteFade.mode = NORMAL_FADE; gPaletteFade.softwareFadeFinishing = 1; } - + // gPaletteFade.active cannot change since the last time it was checked. So this // is equivalent to `return PALETTE_FADE_STATUS_ACTIVE;` return gPaletteFade.active ? PALETTE_FADE_STATUS_ACTIVE : PALETTE_FADE_STATUS_DONE; @@ -986,8 +986,8 @@ static bool32 IsBlendPalettesGraduallyTaskActive(u8 id) int i; for (i = 0; i < NUM_TASKS; i++) - if ((gTasks[i].isActive == TRUE) - && (gTasks[i].func == Task_BlendPalettesGradually) + if ((gTasks[i].isActive == TRUE) + && (gTasks[i].func == Task_BlendPalettesGradually) && (gTasks[i].tId == id)) return TRUE; |