Merge branch 'master' into record_mixing

This commit is contained in:
PikalaxALT committed 2018-02-11 20:12:40 -05:00
commit 590c4b500b
6672 files changed
+937954 -212286

No files matched your search

+1
View File
@@ -11,5 +11,6 @@ void sub_80FA5E4(s16 id, s16 x, s16 y);
void sub_80FA794(s16 x, s16 y);
void sub_80FB00C(void);
void sub_80FB074(void);
void overworld_poison_effect(void);
#endif //GUARD_FLDEFF_80F9BCC_H