dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync src/battle_controllers.c

Browse Source
This commit is contained in:
Eduardo Quezada
2022-08-08 10:04:18 -04:00
parent 56f8b1a47c
commit 57374b796b
16 changed files with 234 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/trade.c
+6 -6
View File
@@ -767,7 +767,7 @@ static void CB2_ReturnFromLinkTrade2(void)
gMain.state++;
}
if (gWirelessCommType == 0)
CreateTask(Task_WaitForReceivedRemoteLinkPlayers5SecondTimeout, 1);
CreateTask(Task_WaitForLinkPlayerConnection, 1);
}
else
{
@@ -1692,7 +1692,7 @@ static void CommunicatePlayerSelectedMonForTrade(void)
{
sTradeMenuResourcesPtr->linkData[0] = 0xAABB;
sTradeMenuResourcesPtr->linkData[1] = sTradeMenuResourcesPtr->tradeMenuCursorPosition;
SendBlock(bitmask_all_link_players_but_self(), sTradeMenuResourcesPtr->linkData, 20);
SendBlock(BitmaskAllOtherLinkPlayers(), sTradeMenuResourcesPtr->linkData, 20);
}
else
{
@@ -1751,7 +1751,7 @@ static void TradeMenuCB_0(void)
{
for (i = 0; i < 10; i++)
sTradeMenuResourcesPtr->linkData[i] = i;
SendBlock(bitmask_all_link_players_but_self(), sTradeMenuResourcesPtr->linkData, 20);
SendBlock(BitmaskAllOtherLinkPlayers(), sTradeMenuResourcesPtr->linkData, 20);
}
}
@@ -1864,7 +1864,7 @@ static void CommunicateWhetherMonCanBeTraded(void)
sTradeMenuResourcesPtr->linkData[0] = 0xBBBB;
if (IsLinkTaskFinished())
{
SendBlock(bitmask_all_link_players_but_self(), sTradeMenuResourcesPtr->linkData, 20);
SendBlock(BitmaskAllOtherLinkPlayers(), sTradeMenuResourcesPtr->linkData, 20);
}
break;
case 2:
@@ -1890,7 +1890,7 @@ static void TradeMenuCB_3(void)
if (IsLinkTaskFinished())
{
sTradeMenuResourcesPtr->linkData[0] = 0xBBCC;
SendBlock(bitmask_all_link_players_but_self(), sTradeMenuResourcesPtr->linkData, 20);
SendBlock(BitmaskAllOtherLinkPlayers(), sTradeMenuResourcesPtr->linkData, 20);
}
sTradeMenuResourcesPtr->tradeMenuCBnum = 100;
PutWindowTilemap(17);
@@ -2410,7 +2410,7 @@ static void RunScheduledLinkTasks(void)
switch (sTradeMenuResourcesPtr->cron[i].kind)
{
case 0:
SendBlock(bitmask_all_link_players_but_self(), sTradeMenuResourcesPtr->linkData, 20);
SendBlock(BitmaskAllOtherLinkPlayers(), sTradeMenuResourcesPtr->linkData, 20);
break;
case 1:
PrintTradeErrorOrStatusMessage(TRADESTATMSG_COMMSTANDBY);