summaryrefslogtreecommitdiff
path: root/include/field_effect.h
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2018-01-04 23:42:42 -0600
committercamthesaxman <cameronghall@cox.net>2018-01-04 23:42:42 -0600
commit3d49abfecb20b9b86311cbd83ff92a20761ea256 (patch)
tree9e65e0cf9a6ce4ba318f0e144553248e6709eb61 /include/field_effect.h
parent501482beadd05c5ade13f6919c3c2cd42c86952d (diff)
parentf5fbe5b66226f4e7e38fe5d4638831d1ce19b36b (diff)
fix merge conflicts
Diffstat (limited to 'include/field_effect.h')
-rw-r--r--include/field_effect.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/field_effect.h b/include/field_effect.h
index 9f71efba1..bb859074f 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -252,6 +252,7 @@ void FreeResourcesAndDestroySprite(struct Sprite *sprite);
void MultiplyInvertedPaletteRGBComponents(u16, u8, u8, u8);
void sub_80878A8(void);
void sub_8087BA8(void);
+void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b);
extern s32 gFieldEffectArguments[8];