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

2018-02-15 09:45:15 +05:30
parent deeaac2bf1 e706d89ff1
commit 895c72cb26
16 changed files with 2073 additions and 5636 deletions
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -74,6 +74,7 @@ extern u32 gFieldEffectArguments[8];
 u32 FieldEffectStart(u8);
 bool8 FieldEffectActiveListContains(u8 id);
 void sub_80B69DC(void);
+u8 AddNewGameBirchObject(s16, s16, u8);
 void FieldEffectStop(struct Sprite *sprite, u8 id);
 u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buffer);
 void sub_80B7FC8(void);