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

2017-10-13 20:29:11 -05:00
parent 2852f4f1b8 f6af9e7013
commit 924c0c6b5a
106 changed files with 14610 additions and 25063 deletions
--- a/include/rom6.h
+++ b/include/rom6.h
@@ -2,5 +2,6 @@
 #define GUARD_ROM6_H

 void sub_81357FC(u8, void(void));
+u8 GetLeadMonIndex(void);

 #endif //GUARD_ROM6_H