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
@@ -14,6 +14,6 @@ enum {
 };

 void ExecuteWhiteOut(void);
-u32 DoPoisonFieldEffect(void);
+s32 DoPoisonFieldEffect(void);

 #endif //GUARD_FIELD_POISON_H