diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-28 15:50:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-28 15:50:13 -0500 |
| commit | 7b913802ab5745ea7529b634ebca6a147fe1c560 (patch) | |
| tree | 6932ba627bf459011086528dc530ffdca1c05433 /src/union_room.c | |
| parent | 6282f75cae2fb9484b9fe9a6c601c9a0c07c4250 (diff) | |
| parent | 7e38583a5dc00b37a5ad7df94d4489c3150def8c (diff) | |
Merge pull request #477 from GriffinRichards/sync-global
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; |