diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-06-17 19:46:25 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-06-17 19:46:25 -0500 |
| commit | 82ddae9db42f45abf876e68dc9b0b69a00b44070 (patch) | |
| tree | 26e39c75e92ca8cf128b9143c0e664b06bff23a9 /src/pokemon_size_record.c | |
| parent | c56305607a1bad264b89d07b7539eff3fe010e0d (diff) | |
| parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) | |
fix merge conflicts
Diffstat (limited to 'src/pokemon_size_record.c')
| -rw-r--r-- | src/pokemon_size_record.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c index b2f8a1569..f293190e8 100644 --- a/src/pokemon_size_record.c +++ b/src/pokemon_size_record.c @@ -2,14 +2,12 @@ #include "pokemon_size_record.h" #include "data2.h" #include "event_data.h" +#include "pokedex.h" #include "species.h" #include "string_util.h" #include "strings2.h" #include "text.h" -extern u16 SpeciesToNationalPokedexNum(u16); -extern u16 GetPokedexHeightWeight(u16, u8); - struct UnknownStruct { u16 unk0; |