summaryrefslogtreecommitdiff
path: root/include/pokedex.h
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-11-17 19:34:55 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2017-11-17 19:34:55 +0100
commitd0245cf8d23aa65a357977a00b21f58d42dfcf6e (patch)
treecb5e1c81baaf882f2bb8f323b04a7b41d316be7b /include/pokedex.h
parent3e1f3d0e1e2bc5fbe5e630d81b741b653080e77b (diff)
parenta98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff)
recorded battle merge conflicts fix
Diffstat (limited to 'include/pokedex.h')
-rw-r--r--include/pokedex.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/pokedex.h b/include/pokedex.h
index 79721899f..236feac45 100644
--- a/include/pokedex.h
+++ b/include/pokedex.h
@@ -2,7 +2,7 @@
#define GUARD_POKEDEX_H
void ResetPokedex(void);
-const u8 *GetPokemonCategory(u16);
+void CopyMonCategoryText(u16 species, u8 *dst);
u16 GetPokedexHeightWeight(u16 dexNum, u8 data);
u16 GetNationalPokedexCount(u8);
u16 GetHoennPokedexCount(u8);