Merge pull request #580 from GriffinRichards/sync-rfu2

Sync wireless link
2022-11-14 11:39:05 -05:00
parent 9388be6700 a0f41da30d
commit c8562b05ab
59 changed files with 4600 additions and 4521 deletions
@@ -773,7 +773,7 @@ static void LoadTradeMonPic(u8 whichParty, u8 action)
    }
 }

-void CB2_InitTradeAnim_LinkTrade(void)
+void CB2_LinkTrade(void)
 {
    switch (gMain.state)
    {
@@ -2668,7 +2668,7 @@ static void CB2_HandleTradeEnded(void)
    case 8:
        if (IsBGMStopped() == TRUE)
        {
-            if (gWirelessCommType && gMain.savedCallback == CB2_ReturnFromLinkTrade)
+            if (gWirelessCommType && gMain.savedCallback == CB2_StartCreateTradeMenu)
            {
                SetLinkStandbyCallback();
            }
@@ -2680,7 +2680,7 @@ static void CB2_HandleTradeEnded(void)
        }
        break;
    case 9:
-        if (gWirelessCommType && gMain.savedCallback == CB2_ReturnFromLinkTrade)
+        if (gWirelessCommType && gMain.savedCallback == CB2_StartCreateTradeMenu)
        {
            if (IsLinkRfuTaskFinished())
            {