summaryrefslogtreecommitdiff
path: root/src/palette.c
diff options
context:
space:
mode:
authorgarak <garakmon@gmail.com>2018-10-16 14:31:45 -0400
committergarak <garakmon@gmail.com>2018-10-16 14:31:45 -0400
commit0051947414df4656826a5ba0b252fdbb5fb0e065 (patch)
tree4ac69544094baaa620b1e8556ddf79715db4fde3 /src/palette.c
parent72f9afcbf4a81909019f21acad0484b72ed217f6 (diff)
parented1bb3030bae8b0d00a1fbb68ebd50f6376938ac (diff)
Merge remote-tracking branch 'upstream/master' into event-flags
Diffstat (limited to 'src/palette.c')
-rw-r--r--src/palette.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/palette.c b/src/palette.c
index fd4ad32ad..1e92f4bba 100644
--- a/src/palette.c
+++ b/src/palette.c
@@ -1,6 +1,6 @@
#include "global.h"
-#include "blend_palette.h"
#include "palette.h"
+#include "util.h"
#include "decompress.h"
#include "gpu_regs.h"
#include "task.h"