diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-06-21 20:47:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-21 20:47:58 +0200 |
| commit | c84bb67156d6ab822b6ff1b508e9fae73f054675 (patch) | |
| tree | 5973f1e72156bb75cb6561a11dd7f333b90fcb3f /include/field_effect.h | |
| parent | 11ad653b57d811dbe8df831d4987128da39bdcb5 (diff) | |
| parent | 42ae04c74fe07d05175efb4df143dbcf1b2752bc (diff) | |
Merge pull request #2 from pret/master
be up to date with master2
Diffstat (limited to 'include/field_effect.h')
| -rw-r--r-- | include/field_effect.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/field_effect.h b/include/field_effect.h index 74b5fa34d..cd84652b1 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -72,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); |