berry blender fix merge conflicts

2017-11-26 19:21:51 +01:00
parent ad3a97e178 1e4f12e6fa
commit b0657350a4
27 changed files with 1034 additions and 2406 deletions
--- a/include/link.h
+++ b/include/link.h
@@ -180,6 +180,7 @@ void LinkVSync(void);
 void Timer3Intr(void);
 void SerialCB(void);
 u8 GetLinkPlayerCount(void);
+bool32 InUnionRoom(void);

 void sub_800E0E8(void);
 bool8 sub_800A520(void);