diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-06-19 15:29:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-19 15:29:24 +0200 |
commit | 11ad653b57d811dbe8df831d4987128da39bdcb5 (patch) | |
tree | 9e9a793c7dc9a4af7992e6b65c0418d16b25a400 /src/mauville_old_man.c | |
parent | 48a15638c63f2b3d4b2d12d346e466ddca006570 (diff) | |
parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) |
Merge pull request #1 from pret/master
be up to date with the master
Diffstat (limited to 'src/mauville_old_man.c')
-rw-r--r-- | src/mauville_old_man.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c index d6fb33917..93684fc60 100644 --- a/src/mauville_old_man.c +++ b/src/mauville_old_man.c @@ -1,20 +1,16 @@ #include "global.h" -#include "asm.h" +#include "mauville_old_man.h" +#include "easy_chat.h" #include "menu.h" #include "rng.h" #include "script.h" #include "string_util.h" #include "strings.h" +#include "trader.h" extern u16 gScriptResult; extern u16 gSpecialVar_0x8004; -extern void sub_80F83F8(void); -extern void sub_81099CC(void); -extern void sub_80F83D0(void); -extern void sub_80F7F80(u8); -extern u16 sub_80EB8EC(void); -extern void sub_80F7DC0(void); extern u32 gUnknown_083E5388[]; extern u32 gUnknown_083E53A8[]; |