diff options
author | Garak <thomastaps194@comcast.net> | 2018-07-17 09:24:30 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-17 09:24:30 -0400 |
commit | 5e46a0fcc57d421879c1f65b40b4692bbe65a813 (patch) | |
tree | 398b53f56158397a04e0e8de8159e00eeba9acc3 /include/palette.h | |
parent | e06b63efc9ea39875b17f00e5ff20c2e0fcb0415 (diff) | |
parent | 06b3ce408f774c7192202308e783cc22bb8e7643 (diff) |
Merge pull request #2 from pret/master
sync with source repo
Diffstat (limited to 'include/palette.h')
-rw-r--r-- | include/palette.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/palette.h b/include/palette.h index a1259d327..d14fa1fcd 100644 --- a/include/palette.h +++ b/include/palette.h @@ -24,16 +24,16 @@ struct PaletteFadeControl u16 y:5; // blend coefficient u16 targetY:5; // target blend coefficient u16 blendColor:15; - u16 active:1; + bool16 active:1; u16 multipurpose2:6; - u16 yDec:1; // whether blend coefficient is decreasing - u16 bufferTransferDisabled:1; + bool16 yDec:1; // whether blend coefficient is decreasing + bool16 bufferTransferDisabled:1; u16 mode:2; - u16 shouldResetBlendRegisters:1; - u16 hardwareFadeFinishing:1; + bool16 shouldResetBlendRegisters:1; + bool16 hardwareFadeFinishing:1; u16 softwareFadeFinishingCounter:5; - u16 softwareFadeFinishing:1; - u16 objPaletteToggle:1; + bool16 softwareFadeFinishing:1; + bool16 objPaletteToggle:1; u8 deltaY:4; // rate of change of blend coefficient }; |