diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-06-17 19:46:25 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-06-17 19:46:25 -0500 |
| commit | 82ddae9db42f45abf876e68dc9b0b69a00b44070 (patch) | |
| tree | 26e39c75e92ca8cf128b9143c0e664b06bff23a9 /include/field_effect.h | |
| parent | c56305607a1bad264b89d07b7539eff3fe010e0d (diff) | |
| parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) | |
fix merge conflicts
Diffstat (limited to 'include/field_effect.h')
| -rw-r--r-- | include/field_effect.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/field_effect.h b/include/field_effect.h index 2cf7f0c7a..74b5fa34d 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -2,6 +2,7 @@ #define GUARD_FIELD_EFFECT_H #include "sprite.h" +#include "task.h" enum FieldEffectScriptIdx { @@ -235,4 +236,13 @@ void sub_808948C(struct Task *); void sub_80894C4(struct Task *); void fishE(struct Task *); +u8 CreateTrainerSprite_BirchSpeech(u8 gender, s16 x, s16 y, u8 subpriority, u8 *buffer); +void LoadTrainerGfx_TrainerCard(u8 gender, u16 palOffset, u8 *dest); +u8 CreateBirchSprite(s16 x, s16 y, u8 subpriority); +u8 CreateMonSprite_PicBox(u16, s16, s16, u8); +void FreeResourcesAndDestroySprite(struct Sprite *sprite); +void MultiplyInvertedPaletteRGBComponents(u16, u8, u8, u8); +void sub_80878A8(void); +void sub_8087BA8(void); + #endif // GUARD_FIELD_EFFECT_H |