summaryrefslogtreecommitdiff
path: root/include/field_effect.h
diff options
context:
space:
mode:
authorgarak <garakmon@gmail.com>2018-09-24 08:40:33 -0400
committergarak <garakmon@gmail.com>2018-09-24 08:40:33 -0400
commit72f9afcbf4a81909019f21acad0484b72ed217f6 (patch)
treebc7e9a48b8056e28403e251dab7ac64f649ad9e4 /include/field_effect.h
parent3964dbd4822f1b22bbc696add7e56ff0c5b2caea (diff)
parent7ceabffc842dfdf127fd594055f895a0803f54f6 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/field_effect.h')
-rw-r--r--include/field_effect.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/field_effect.h b/include/field_effect.h
index 9c9501bfa..e05ded621 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -74,7 +74,10 @@ enum FieldEffectScriptIdx
FLDEFF_USE_FLY_ANCIENT_TOMB,
FLDEFF_PCTURN_ON,
FLDEFF_HALL_OF_FAME_RECORD,
- FLDEFF_USE_TELEPORT
+ FLDEFF_USE_TELEPORT,
+ FLDEFF_64,
+ FLDEFF_65,
+ FLDEFF_66,
};
extern s32 gFieldEffectArguments[8];
@@ -233,4 +236,6 @@ void sub_80B9CDC(s16*, u8);
void sub_80B7CAC(struct Sprite*);
void sub_80B7A58(struct Sprite*);
+void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b);
+
#endif //GUARD_FIELD_EFFECTS_H