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/link.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/link.c')
-rw-r--r-- | src/link.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/link.c b/src/link.c index 17e78e0a5..5f6c32370 100644 --- a/src/link.c +++ b/src/link.c @@ -1,7 +1,9 @@ #include "global.h" #include "link.h" -#include "asm.h" #include "battle.h" +#include "berry.h" +#include "berry_blender.h" +#include "hall_of_fame.h" #include "main.h" #include "menu.h" #include "palette.h" @@ -75,6 +77,7 @@ static void sub_80083E0(void); static void sub_8008454(void); static void sub_80084C8(void); static void sub_80084F4(void); + static void CheckErrorStatus(void); static void CB2_PrintErrorMessage(void); static u8 IsSioMultiMaster(void); |