diff options
| author | scnorton <scnorton@biociphers.org> | 2017-06-27 15:01:18 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-06-27 15:01:18 -0400 |
| commit | 00c7dee919c8f93b8519a7eede2c41ba2ddcaf08 (patch) | |
| tree | 5707f8764920abcd4cffca84c675e5c53c32559d /src/mauville_old_man.c | |
| parent | 3d9eb18add0d8a9eb5bfa77fc64cd7b1f37fea5d (diff) | |
| parent | 06b6cada0ddedc62063171703ba6607019751a9a (diff) | |
Merge branch 'master' into pokemon_data
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[]; |