diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-02-13 22:19:14 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-02-13 22:19:14 -0500 |
| commit | e1bd37dca9a53298e733c53189b5fdba9dff050b (patch) | |
| tree | 0dabac229ff7c9a64e3c2bdc862f133a97d5ba4f /include/pokedex.h | |
| parent | e5b6d15f9163cca8688cd67ca5a0563ce6667601 (diff) | |
| parent | bb8c53f8988be6cad8f270c46f24e0f6f1e862cc (diff) | |
fix merge conflicts
Diffstat (limited to 'include/pokedex.h')
| -rw-r--r-- | include/pokedex.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/pokedex.h b/include/pokedex.h index 236feac45..d3cb670c8 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -17,7 +17,7 @@ enum }; s8 GetSetPokedexFlag(u16 nationalNum, u8 caseId); -u16 pokedex_count(u8); -u16 sub_80C0844(u8); +u16 GetNationalPokedexCount(u8); +u16 GetHoennPokedexCount(u8); #endif // GUARD_POKEDEX_H |