diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-15 23:27:27 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-15 23:27:27 +0200 |
| commit | 003a8a501b7ee0a4f8bf8bb803cf7e077d52d068 (patch) | |
| tree | 2ebb9f702f863ab0cfb78a996aeeac331428ba7b /include/pokedex.h | |
| parent | 9d4acb9635b3b74d5ae4edee70d673f49c0aab74 (diff) | |
| parent | 0d38d443b561f9baaae12324712503dfccaf01ea (diff) | |
fix merge conflict
Diffstat (limited to 'include/pokedex.h')
| -rw-r--r-- | include/pokedex.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/pokedex.h b/include/pokedex.h index 38aca0915..79721899f 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -16,6 +16,8 @@ enum FLAG_SET_CAUGHT }; -u8 GetSetPokedexFlag(u16 nationalNum, u8 caseId); +s8 GetSetPokedexFlag(u16 nationalNum, u8 caseId); +u16 pokedex_count(u8); +u16 sub_80C0844(u8); #endif // GUARD_POKEDEX_H |