diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2021-10-07 16:10:35 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-07 16:10:35 -0400 |
commit | a2655ba9ab82646a54f60abc6078df372179f8d4 (patch) | |
tree | 95b074a1a4d77d6cd77e413e1d6e72eb55b595b0 /src/palette_util.c | |
parent | e86d3410a1719fcbf62754bfda93a295aa7e0d57 (diff) | |
parent | 001a25e49cd6acdac89a62f4230aef80422e78f2 (diff) |
Merge branch 'master' into doc-union
Diffstat (limited to 'src/palette_util.c')
-rwxr-xr-x | src/palette_util.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/palette_util.c b/src/palette_util.c index 5364ff6d9..3fbde9284 100755 --- a/src/palette_util.c +++ b/src/palette_util.c @@ -247,7 +247,7 @@ int InitPulseBlendPaletteSettings(struct PulseBlend *pulseBlend, const struct Pu if (pulseBlendPalette == NULL) return 0xFF; - + pulseBlendPalette->blendCoeff = 0; pulseBlendPalette->fadeDirection = 0; pulseBlendPalette->available = 1; @@ -322,7 +322,7 @@ void MarkUsedPulseBlendPalettes(struct PulseBlend *pulseBlend, u16 pulseBlendPal pulseBlend->usedPulseBlendPalettes |= 1 << i; } } - } + } } void UnmarkUsedPulseBlendPalettes(struct PulseBlend *pulseBlend, u16 pulseBlendPaletteSelector, u8 multiSelection) @@ -423,7 +423,7 @@ void UpdatePulseBlend(struct PulseBlend *pulseBlend) pulseBlendPalette->blendCoeff = 0; else pulseBlendPalette->blendCoeff = pulseBlendPalette->pulseBlendSettings.maxBlendCoeff & 0xF; - + pulseBlendPalette->fadeDirection ^= 1; pulseBlendPalette->fadeCycleCounter++; break; |