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
@@ -219,7 +219,7 @@ const u8 gUnknown_082ED224[] = {

 // .text

-bool8 sub_80093CC(void)
+bool8 IsWirelessAdapterConnected(void)
 {
    sub_800B488();
    sub_800E700();
@@ -444,7 +444,7 @@ static void LinkTestProcessKeyInput(void)
    }
    if (gMain.newKeys & L_BUTTON)
    {
-        BeginNormalPaletteFade(-1, 0, 16, 0, 2);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 2);
    }
    if (gMain.newKeys & START_BUTTON)
    {