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/trainer_card.c | |
| parent | 02af81bc95367d4557189fda0f1dccccf16c852a (diff) | |
| parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) | |
Merge remote-tracking branch 'origin/master' into field_map_obj_data
Diffstat (limited to 'src/trainer_card.c')
| -rw-r--r-- | src/trainer_card.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/trainer_card.c b/src/trainer_card.c index ef3a2d857..b2a1ad71b 100644 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -1,7 +1,8 @@ #include "global.h" #include "trainer_card.h" -#include "asm.h" +#include "easy_chat.h" #include "event_data.h" +#include "field_effect.h" #include "link.h" #include "main.h" #include "menu.h" @@ -16,6 +17,8 @@ #include "string_util.h" #include "strings2.h" #include "task.h" +#include "unknown_task.h" +#include "util.h" typedef void (*Callback)(void); @@ -68,9 +71,8 @@ extern u16 gUnknown_08E8D9C0[]; extern bool8 (*const gUnknown_083B5EBC[])(struct Task *); extern bool8 (*const gUnknown_083B5ED8[])(struct Task *); -// Other signature than on save_menu_util.h +// FIXME: Other signature than on save_menu_util.h void FormatPlayTime(u8 *playtime, u16 hours, u16 minutes, s16 colon); - u16 GetPokedexSeenCount(void); enum |