merge union room with master

2018-07-22 13:14:58 +02:00
parent c9d486a5d3 06b3ce408f
commit 1e9143e0b2
5307 changed files with 54502 additions and 62660 deletions
--- a/include/link.h
+++ b/include/link.h
@@ -201,7 +201,7 @@ extern u32 gLinkStatus;

 void c2_mystery_gift(void);
 void sub_801867C(void);
-bool8 sub_80093CC(void);
+bool8 IsWirelessAdapterConnected(void);
 void Task_DestroySelf(u8 taskId);
 void OpenLink(void);
 void CloseLink(void);