fix merge conflicts

1 files changed, 20 insertions, 0 deletions

diff --git a/src/engine/blend_palette.c b/src/engine/blend_palette.c
new file mode 100644
index 000000000..843c50ac1
--- /dev/null
+++ b/src/engine/blend_palette.c
@@ -0,0 +1,20 @@
+#include "global.h"
+#include "blend_palette.h"
+#include "palette.h"
+
+void BlendPalette(u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor)
+{
+    u16 i;
+    for (i = 0; i < numEntries; i++)
+    {
+        u16 index = i + palOffset;
+        struct PlttData *data1 = (struct PlttData *)&gPlttBufferUnfaded[index];
+        s8 r = data1->r;
+        s8 g = data1->g;
+        s8 b = data1->b;
+        struct PlttData *data2 = (struct PlttData *)&blendColor;
+        gPlttBufferFaded[index] = ((r + (((data2->r - r) * coeff) >> 4)) << 0)
+                                | ((g + (((data2->g - g) * coeff) >> 4)) << 5)
+                                | ((b + (((data2->b - b) * coeff) >> 4)) << 10);
+    }
+}