Merge remote-tracking branch 'upstream/master' into document-trade

2019-10-12 15:39:17 -05:00
parent 3514f9dd6b 4e2be7ff5e
commit 8df4982b3f
173 changed files with 6154 additions and 6895 deletions
--- a/src/link_rfu.c
+++ b/src/link_rfu.c
@@ -4741,7 +4741,7 @@ void sub_8011AFC(void)
    SetVBlankCallback(sub_8011AE8);
    if (IsWirelessAdapterConnected())
    {
-        gLinkType = 0x1111;
+        gLinkType = LINKTYPE_0x1111;
        sub_800B488();
        OpenLink();
        SeedRng(gMain.vblankCounter2);