diff options
| author | scnorton <scnorton@biociphers.org> | 2017-06-21 12:43:59 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-06-21 12:43:59 -0400 |
| commit | 99f9d40be14633630503ebcd75787fc7fdfe1486 (patch) | |
| tree | c3962867c76bca0f06311bc39791aa42889e877d /include/field_effect.h | |
| parent | 294cbd8beb08b14a24385a78f1a8435f5fbe2f8c (diff) | |
| parent | 42ae04c74fe07d05175efb4df143dbcf1b2752bc (diff) | |
Merge remote-tracking branch 'origin/master' into field_specials
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); |