From 8e4320cc211da9d0ccd14a2b9c220cf85c05aeef Mon Sep 17 00:00:00 2001 From: Deokishisu <6993375+Deokishisu@users.noreply.github.com> Date: Thu, 3 Jun 2021 12:45:59 -0400 Subject: Sync LinkPlayer Struct with pokeemerald In pokefirered, the `LinkPlayer` struct used an 11-byte name field and puts extra link-related info in the last three bytes. pokeemerald separates these last three bytes into their own fields. This commit replicates how pokeemerald handles those fields. Also renamed `IntlConvertLinkPlayerName` to pokeemerald's `ConvertLinkPlayerName` because I was there and noticed it. --- src/link_rfu_2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/link_rfu_2.c') diff --git a/src/link_rfu_2.c b/src/link_rfu_2.c index 76db5d1b0..d2c605d7b 100644 --- a/src/link_rfu_2.c +++ b/src/link_rfu_2.c @@ -1769,7 +1769,7 @@ static void ReceiveRfuLinkPlayers(const struct SioInfo *chunk) for (i = 0; i < MAX_RFU_PLAYERS; i++) { gLinkPlayers[i] = chunk->linkPlayers[i]; - IntlConvertLinkPlayerName(gLinkPlayers + i); + ConvertLinkPlayerName(gLinkPlayers + i); } } @@ -1814,7 +1814,7 @@ static void Task_ExchangeLinkPlayers(u8 taskId) ResetBlockReceivedFlag(r4); r2 = (struct LinkPlayerBlock *)gBlockRecvBuffer[r4]; gLinkPlayers[r4] = r2->linkPlayer; - IntlConvertLinkPlayerName(gLinkPlayers + r4); + ConvertLinkPlayerName(gLinkPlayers + r4); gTasks[taskId].data[0]++; } break; -- cgit v1.2.3