diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-03-17 17:20:40 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2019-03-17 17:20:40 -0500 |
| commit | e9a3cc6d51ce3818eed11de585f5084342450093 (patch) | |
| tree | 414ed687f836521c1a966531e87122951c070083 /include/pokedex.h | |
| parent | c3feb9871f4d05cd9874dd8fc0c2016eaa072864 (diff) | |
| parent | 4ae8a52473a0e4842cf140bf0c59f0276125a896 (diff) | |
Merge remote-tracking branch 'upstream/master' into move-tutor
# Conflicts:
# include/pokenav.h
# src/battle_script_commands.c
Diffstat (limited to 'include/pokedex.h')
| -rw-r--r-- | include/pokedex.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/pokedex.h b/include/pokedex.h index 6136f7786..a1b7378bf 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -43,5 +43,7 @@ s8 GetSetPokedexFlag(u16 nationalNum, u8 caseId); u16 CreateMonSpriteFromNationalDexNumber(u16, s16, s16, u16); bool16 HasAllHoennMons(void); void ResetPokedexScrollPositions(void); +u16 sub_80C0944(void); +void CB2_Pokedex(void); #endif // GUARD_POKEDEX_H |