Merge master into doc-questlog

2020-01-15 16:27:36 -05:00
parent 04d176334a 3170b75344
commit 153858af60
39 changed files with 7646 additions and 15876 deletions
@@ -984,7 +984,7 @@ u8 GetMultiplayerId(void)
 {
    if (gWirelessCommType == 1)
    {
-        return rfu_get_multiplayer_id();
+        return LinkRfu_GetMultiplayerId();
    }
    return SIO_MULTI_CNT->id;
 }