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

Sync global

Browse Source
This commit is contained in:
GriffinR
2021-11-19 17:04:04 -05:00
parent cd4462f58c
commit b2c74cae84
40 changed files with 456 additions and 522 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/trade.c
+4 -4
View File
@@ -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++;
}