diff options
author | scnorton <scnorton@biociphers.org> | 2017-06-27 15:01:18 -0400 |
---|---|---|
committer | scnorton <scnorton@biociphers.org> | 2017-06-27 15:01:18 -0400 |
commit | 00c7dee919c8f93b8519a7eede2c41ba2ddcaf08 (patch) | |
tree | 5707f8764920abcd4cffca84c675e5c53c32559d /include/field_effect.h | |
parent | 3d9eb18add0d8a9eb5bfa77fc64cd7b1f37fea5d (diff) | |
parent | 06b6cada0ddedc62063171703ba6607019751a9a (diff) |
Merge branch 'master' into pokemon_data
Diffstat (limited to 'include/field_effect.h')
-rw-r--r-- | include/field_effect.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/include/field_effect.h b/include/field_effect.h index 2cf7f0c7a..cd84652b1 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 { @@ -71,15 +72,13 @@ enum FieldEffectScriptIdx FLDEFF_USE_TELEPORT }; -extern const struct SpritePalette gTrainerFrontPicPaletteTable[2]; +extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[2]; extern const struct SpritePalette gUnknown_0839F114; -extern const struct SpriteSheet gTrainerFrontPicTable[2]; +extern const struct CompressedSpriteSheet gTrainerFrontPicTable[2]; extern const struct SpriteTemplate gSpriteTemplate_839F128; extern const struct OamData gOamData_839F0F4; extern struct SpriteTemplate gUnknown_02024E8C; -extern const struct SpritePalette *sub_80409C8(u16, u32, u32); - extern u8 gLastFieldPokeMenuOpened; u32 FieldEffectStart(u8 id); @@ -235,4 +234,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 |