diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-18 13:01:55 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-18 13:01:55 -0400 |
commit | 5d04fe94d9eed2980ac0b439b0e45af13c792037 (patch) | |
tree | bf9f0c1eaecbcf25e9de4ef6d5c99c16f132e5a4 /src/pokemon_summary_screen.c | |
parent | 02af81bc95367d4557189fda0f1dccccf16c852a (diff) | |
parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) |
Merge remote-tracking branch 'origin/master' into field_map_obj_data
Diffstat (limited to 'src/pokemon_summary_screen.c')
-rw-r--r-- | src/pokemon_summary_screen.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 56a56e455..61ae11438 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -1,20 +1,15 @@ #include "global.h" -#include "asm.h" +#include "pokemon_summary_screen.h" #include "link.h" #include "menu.h" #include "pokemon.h" +#include "region_map.h" #include "string_util.h" #include "strings2.h" +#include "tv.h" extern struct Pokemon *unk_2018000; -extern u8 *(gNatureNames[]); - -u8 *sub_80A1E9C(u8 *dest, u8 *src, u8); -u8 PokemonSummaryScreen_CheckOT(struct Pokemon *pokemon); -u8 *PokemonSummaryScreen_CopyPokemonLevel(u8 *dest, u8 level); -u32 GetPlayerTrainerId(void); - bool8 PokemonSummaryScreen_CheckOT(struct Pokemon *mon) { u32 trainerId; |