summaryrefslogtreecommitdiff
path: root/include/pokedex.h
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-11-03 18:00:47 -0700
committerMarcus Huderle <huderlem@gmail.com>2017-11-03 18:14:15 -0700
commit415fb6738308a9bfa2217419d3861784dcd8e5d9 (patch)
tree8793240342d37104610f34756f6fee9db706ee8f /include/pokedex.h
parentae56f7859fe17915d3fb33713dfef2fe31fe2a1d (diff)
parent1698e882b4760bcfe8cf91073cf7e46541ae6392 (diff)
Merge remote-tracking branch 'upstream/master' into pokenav
Diffstat (limited to 'include/pokedex.h')
-rw-r--r--include/pokedex.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/include/pokedex.h b/include/pokedex.h
index 1bc63a4ff..c47494e1f 100644
--- a/include/pokedex.h
+++ b/include/pokedex.h
@@ -9,7 +9,17 @@ void CB2_InitPokedex(void);
u8 sub_809070C(u16 dexNum, u32 b, u32 c);
const u8 *GetPokemonCategory(u16);
u16 GetPokedexHeightWeight(u16 dexNum, u8 data);
-s8 GetNationalPokedexFlag(u16, u8);
+
+enum
+{
+ FLAG_GET_SEEN,
+ FLAG_GET_CAUGHT,
+ FLAG_SET_SEEN,
+ FLAG_SET_CAUGHT
+};
+
+s8 GetSetPokedexFlag(u16, u8);
+
u16 GetNationalPokedexCount(u8);
u16 GetHoennPokedexCount(u8);
bool8 sub_8090FC0(void);