From 4d2b22a899c11dfcacfec6889968ab01655a3fe3 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Fri, 26 May 2017 14:53:51 +0200 Subject: Add headers --- src/link.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/link.c') diff --git a/src/link.c b/src/link.c index 17e78e0a5..102714c39 100644 --- a/src/link.c +++ b/src/link.c @@ -1,6 +1,6 @@ +#include "berry_blender.h" #include "global.h" #include "link.h" -#include "asm.h" #include "battle.h" #include "main.h" #include "menu.h" @@ -75,6 +75,12 @@ static void sub_80083E0(void); static void sub_8008454(void); static void sub_80084C8(void); static void sub_80084F4(void); + +extern void *species_and_otid_get_pal(/*TODO: arg types*/); +extern void sub_8143680(int, u8); +extern void sub_81428CC(void); + +extern struct Berry *GetBerryInfo(u8 berry); static void CheckErrorStatus(void); static void CB2_PrintErrorMessage(void); static u8 IsSioMultiMaster(void); -- cgit v1.2.3 From f26daa3d6954d2db3a7c44b79d319a7a084462c2 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Fri, 26 May 2017 15:01:42 +0200 Subject: Sort includes --- src/link.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/link.c') diff --git a/src/link.c b/src/link.c index 102714c39..6ad5a8fb7 100644 --- a/src/link.c +++ b/src/link.c @@ -1,7 +1,7 @@ -#include "berry_blender.h" #include "global.h" #include "link.h" #include "battle.h" +#include "berry_blender.h" #include "main.h" #include "menu.h" #include "palette.h" -- cgit v1.2.3 From 2aae7e99d52fc488e75309909d279b459f5e1d80 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Fri, 26 May 2017 15:35:40 +0200 Subject: Make rom build again --- src/link.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/link.c') diff --git a/src/link.c b/src/link.c index 6ad5a8fb7..5f6c32370 100644 --- a/src/link.c +++ b/src/link.c @@ -1,7 +1,9 @@ #include "global.h" #include "link.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" @@ -76,11 +78,6 @@ static void sub_8008454(void); static void sub_80084C8(void); static void sub_80084F4(void); -extern void *species_and_otid_get_pal(/*TODO: arg types*/); -extern void sub_8143680(int, u8); -extern void sub_81428CC(void); - -extern struct Berry *GetBerryInfo(u8 berry); static void CheckErrorStatus(void); static void CB2_PrintErrorMessage(void); static u8 IsSioMultiMaster(void); -- cgit v1.2.3