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

2018-10-21 00:20:09 +01:00
parent 7a072d4527 2a3ba78831
commit 3d8874d919
422 changed files with 7626 additions and 12999 deletions
@@ -12,6 +12,8 @@ void sub_80FA794(s16 x, s16 y);
 void CreateRecordMixingSprite(void);
 void DestroyRecordMixingSprite(void);
 void FldeffPoison_Start(void);
+void sub_80FA970(s16);
+void sub_80FA9D0(void);
 bool8 sub_80FADE4(u16, u8);

 #endif //GUARD_FLDEFF_80F9BCC_H