Merge with master

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
 };