diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2019-05-11 21:22:09 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-05-11 21:22:09 -0400 |
commit | 539d47279625a3d7a274726a02468bb5c1c56514 (patch) | |
tree | 08f68b473f37d1a74396ef2e28e1a0cecc60a9f1 /include/field_effect.h | |
parent | a58d9a16dd7e4f263ebccda50e70103e7490886b (diff) | |
parent | fc72b74e6ca6626dbaffa353eabf49429ff5e75f (diff) |
Merge branch 'master' into dodrio_berry_picking
Diffstat (limited to 'include/field_effect.h')
-rw-r--r-- | include/field_effect.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/field_effect.h b/include/field_effect.h index 1f5f4ee29..0dbe600d3 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -1,9 +1,7 @@ #ifndef GUARD_FIELD_EFFECTS_H #define GUARD_FIELD_EFFECTS_H -extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[2]; extern const struct SpritePalette gNewGameBirchObjectPaletteInfo; -extern const struct CompressedSpriteSheet gTrainerFrontPicTable[2]; extern const struct SpriteTemplate gNewGameBirchObjectTemplate; extern const struct OamData gNewGameBirchOamAttributes; @@ -53,4 +51,4 @@ void FreeResourcesAndDestroySprite(struct Sprite *sprite, u8 spriteId); u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, u8 subpriority); void StartEscapeRopeFieldEffect(void); -#endif //GUARD_FIELD_EFFECTS_H +#endif // GUARD_FIELD_EFFECTS_H |