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/trade.c | |
| parent | cd4462f58cce785f408af26a7a3b11ad08575a5a (diff) | |
Sync global
Diffstat (limited to 'src/trade.c')
| -rw-r--r-- | src/trade.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/trade.c b/src/trade.c index d3a395f05..a406d87d9 100644 --- a/src/trade.c +++ b/src/trade.c @@ -79,7 +79,7 @@ enum TradeStatusMsg static EWRAM_DATA u8 *sSpriteTextTileBuffer = NULL; static EWRAM_DATA u8 *sSpriteTextTilePtrs[14] = {}; -EWRAM_DATA struct MailStruct gLinkPartnerMail[6] = {}; +EWRAM_DATA struct Mail gLinkPartnerMail[6] = {}; EWRAM_DATA u8 gSelectedTradeMonPositions[2] = {0}; static EWRAM_DATA struct TradeMenuResources * sTradeMenuResourcesPtr = NULL; @@ -119,7 +119,7 @@ static const size_t sSizesAndOffsets[] = { sizeof(struct MapLayout), 0x530, // unk 0x34, // unk - sizeof(struct MailStruct), + sizeof(struct Mail), sizeof(struct Pokemon), 0x528 // unk }; @@ -1398,7 +1398,7 @@ static bool8 shedinja_maker_maybe(void) } break; case 13: - Trade_Memcpy(gBlockSendBuffer, gSaveBlock1Ptr->mail, PARTY_SIZE * sizeof(struct MailStruct) + 4); // why the extra 4 bytes? + Trade_Memcpy(gBlockSendBuffer, gSaveBlock1Ptr->mail, PARTY_SIZE * sizeof(struct Mail) + 4); // why the extra 4 bytes? sTradeMenuResourcesPtr->state++; break; case 15: @@ -1411,7 +1411,7 @@ static bool8 shedinja_maker_maybe(void) case 16: if (GetBlockReceivedStatus() == 3) { - Trade_Memcpy(gLinkPartnerMail, gBlockRecvBuffer[id ^ 1], PARTY_SIZE * sizeof(struct MailStruct)); + Trade_Memcpy(gLinkPartnerMail, gBlockRecvBuffer[id ^ 1], PARTY_SIZE * sizeof(struct Mail)); ResetBlockReceivedFlags(); sTradeMenuResourcesPtr->state++; } |