fix merge conflicts

1 files changed, 16 insertions, 16 deletions

diff --git a/include/palette.h b/include/palette.h
index 37fcb4d65..193773d24 100644
--- a/include/palette.h
+++ b/include/palette.h
@@ -16,22 +16,22 @@ enum
 
 struct PaletteFadeControl
 {
-    u32 multipurpose1;
-    u8 delayCounter:6;
-    u16 y:5; // blend coefficient
-    u16 targetY:5; // target blend coefficient
-    u16 blendColor:15;
-    u16 active:1;
-    u16 multipurpose2:6;
-    u16 yDec:1; // whether blend coefficient is decreasing
-    u16 bufferTransferDisabled:1;
-    u16 mode:2;
-    u16 shouldResetBlendRegisters:1;
-    u16 hardwareFadeFinishing:1;
-    u16 softwareFadeFinishingCounter:5;
-    u16 softwareFadeFinishing:1;
-    u16 objPaletteToggle:1;
-    u8 deltaY:4; // rate of change of blend coefficient
+    /*0x00*/    u32 multipurpose1;
+    /*0x04*/    u8 delayCounter:6;
+    /*0x05*/    u16 y:5; // blend coefficient
+    /*0x05-06*/ u16 targetY:5; // target blend coefficient
+    /*0x07*/    u16 blendColor:15;
+    /*0x07*/    u16 active:1;
+    /*0x08*/    u16 multipurpose2:6;
+    /*0x08*/    u16 yDec:1; // whether blend coefficient is decreasing
+    /*0x08*/    u16 bufferTransferDisabled:1;
+    /*0x09*/    u16 mode:2;
+    /*0x09*/    u16 shouldResetBlendRegisters:1;
+    /*0x09*/    u16 hardwareFadeFinishing:1;
+    /*0x09-0a*/ u16 softwareFadeFinishingCounter:5;
+    /*0x0a*/    u16 softwareFadeFinishing:1;
+    /*0x0a*/    u16 objPaletteToggle:1;
+    /*0x0a*/    u8 deltaY:4; // rate of change of blend coefficient
 };
 
 extern struct PaletteFadeControl gPaletteFade;