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

2018-02-17 04:03:59 -06:00
parent 1605f62535 e2932a38de
commit ebd88b3606
125 changed files with 6338 additions and 14112 deletions
@@ -17,8 +17,6 @@ enum
 };

 s8 GetSetPokedexFlag(u16 nationalNum, u8 caseId);
-u16 pokedex_count(u8);
-u16 sub_80C0844(u8);
 u16 sub_80C0E9C(u16, s16, s16, u16);

 #endif // GUARD_POKEDEX_H