summaryrefslogtreecommitdiff
path: root/include/blend_palette.h
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2018-01-31 00:02:16 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2018-01-31 00:02:16 +0100
commit9fbedcc41c2c888b612efd1b3797c181ff7cb107 (patch)
tree49dbac1e2b3aa0ff7e4451a0d64e9299ae030357 /include/blend_palette.h
parente6fb626c1fddb2f696b26219156d2591867295e7 (diff)
parentb3315b64a1ecefc04f36ed50dd341f1f90d3ba97 (diff)
coord weather fix conflicts
Diffstat (limited to 'include/blend_palette.h')
-rw-r--r--include/blend_palette.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/include/blend_palette.h b/include/blend_palette.h
index 1db3f4eb0..a00847bc3 100644
--- a/include/blend_palette.h
+++ b/include/blend_palette.h
@@ -1,12 +1,6 @@
#ifndef GUARD_BLEND_PALETTE_H
#define GUARD_BLEND_PALETTE_H
-// Exported type declarations
+void BlendPalette(u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor);
-// Exported RAM declarations
-
-// Exported ROM declarations
-
-void BlendPalette(u16, u16, u8, u16);
-
-#endif //GUARD_BLEND_PALETTE_H
+#endif // GUARD_BLEND_PALETTE_H