Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise

2018-11-12 14:14:50 +00:00
parent be33878b94 65f053fd89
commit 1b895ff52c
258 changed files with 80987 additions and 87448 deletions
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -237,5 +237,7 @@ void sub_80B7CAC(struct Sprite*);
 void sub_80B7A58(struct Sprite*);

 void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b);
+void FreeResourcesAndDestroySprite(struct Sprite *sprite, u8 spriteId);
+u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, u8 subpriority);

 #endif //GUARD_FIELD_EFFECTS_H