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/trade.c
+++ b/src/trade.c
@@ -388,7 +388,7 @@ static void CB2_CreateTradeMenu(void)

        if (!gReceivedRemoteLinkPlayers)
        {
-            gLinkType = 0x1122;
+            gLinkType = LINKTYPE_0x1122;
            sTradeMenuData->timer = 0;

            if (gWirelessCommType)
@@ -2939,7 +2939,7 @@ void CB2_LinkTrade(void)
    case 0:
        if (!gReceivedRemoteLinkPlayers)
        {
-            gLinkType = 0x1144;
+            gLinkType = LINKTYPE_0x1144;
            CloseLink();
        }
        sTradeData = AllocZeroed(sizeof(*sTradeData));