diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-19 17:04:04 -0500 |
---|---|---|
committer | GriffinR <griffin.g.richards@gmail.com> | 2021-11-19 20:36:59 -0500 |
commit | b2c74cae8456cfa10a27a3a2d4b97971fd964b6d (patch) | |
tree | 0c98bbc5052c586cc0957ab7edad600021a9f769 /src/union_room.c | |
parent | cd4462f58cce785f408af26a7a3b11ad08575a5a (diff) |
Sync global
Diffstat (limited to 'src/union_room.c')
-rw-r--r-- | src/union_room.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/union_room.c b/src/union_room.c index 1c23f924d..74e540bf2 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -1768,14 +1768,14 @@ static void Task_StartUnionRoomTrade(u8 taskId) } break; case 2: - memcpy(gBlockSendBuffer, gSaveBlock1Ptr->mail, sizeof(struct MailStruct) * PARTY_SIZE + 4); - if (SendBlock(0, gBlockSendBuffer, sizeof(struct MailStruct) * PARTY_SIZE + 4)) + memcpy(gBlockSendBuffer, gSaveBlock1Ptr->mail, sizeof(struct Mail) * PARTY_SIZE + 4); + if (SendBlock(0, gBlockSendBuffer, sizeof(struct Mail) * PARTY_SIZE + 4)) gTasks[taskId].data[0]++; break; case 3: if (GetBlockReceivedStatus() == 3) { - memcpy(gLinkPartnerMail, gBlockRecvBuffer[GetMultiplayerId() ^ 1], sizeof(struct MailStruct) * PARTY_SIZE); + memcpy(gLinkPartnerMail, gBlockRecvBuffer[GetMultiplayerId() ^ 1], sizeof(struct Mail) * PARTY_SIZE); ResetBlockReceivedFlags(); gSelectedTradeMonPositions[TRADE_PLAYER] = monId; gSelectedTradeMonPositions[TRADE_PARTNER] = PARTY_SIZE; |