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 /src/main_menu.c | |
| parent | e5b6d15f9163cca8688cd67ca5a0563ce6667601 (diff) | |
| parent | bb8c53f8988be6cad8f270c46f24e0f6f1e862cc (diff) | |
fix merge conflicts
Diffstat (limited to 'src/main_menu.c')
| -rw-r--r-- | src/main_menu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main_menu.c b/src/main_menu.c index 85a445a67..ed6b79e6a 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -1814,9 +1814,9 @@ void fmt_pokedex(void) if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE) { if (IsNationalPokedexEnabled()) - dexCount = pokedex_count(1); + dexCount = GetNationalPokedexCount(1); else - dexCount = sub_80C0844(1); + dexCount = GetHoennPokedexCount(1); StringExpandPlaceholders(gStringVar4, gText_ContinueMenuPokedex); box_print(2, 1, 0, 33, gUnknown_082FF0E3, -1, gStringVar4); ConvertIntToDecimalStringN(str, dexCount, 0, 3); |