mirror of
https://github.com/rh-hideout/pokeemerald-expansion.git
synced 2026-09-10 03:26:06 -05:00
Merge commit '98b522cda91744d10dd5a46ebcdcb9f4950a8a6a' into pret-merge
This commit is contained in:
13
src/link.c
13
src/link.c
@@ -2133,6 +2133,9 @@ static bool8 DoHandshake(void)
|
||||
u8 i;
|
||||
u8 playerCount;
|
||||
u16 minRecv;
|
||||
#ifdef UBFIX
|
||||
u64 recvSiomlt;
|
||||
#endif
|
||||
|
||||
playerCount = 0;
|
||||
minRecv = 0xFFFF;
|
||||
@@ -2144,7 +2147,12 @@ static bool8 DoHandshake(void)
|
||||
{
|
||||
REG_SIOMLT_SEND = SLAVE_HANDSHAKE;
|
||||
}
|
||||
#ifdef UBFIX
|
||||
recvSiomlt = REG_SIOMLT_RECV;
|
||||
memcpy(gLink.handshakeBuffer, &recvSiomlt, sizeof(gLink.handshakeBuffer));
|
||||
#else
|
||||
*(u64 *)gLink.handshakeBuffer = REG_SIOMLT_RECV;
|
||||
#endif
|
||||
REG_SIOMLT_RECV = 0;
|
||||
gLink.handshakeAsMaster = FALSE;
|
||||
for (i = 0; i < MAX_LINK_PLAYERS; i++)
|
||||
@@ -2184,8 +2192,13 @@ static void DoRecv(void)
|
||||
u16 recv[4];
|
||||
u8 i;
|
||||
u8 index;
|
||||
#ifdef UBFIX
|
||||
u64 recvSiomlt = REG_SIOMLT_RECV;
|
||||
|
||||
memcpy(recv, &recvSiomlt, sizeof(recv));
|
||||
#else
|
||||
*(u64 *)recv = REG_SIOMLT_RECV;
|
||||
#endif
|
||||
if (gLink.sendCmdIndex == 0)
|
||||
{
|
||||
for (i = 0; i < gLink.playerCount; i++)
|
||||
|
||||
Reference in New Issue
Block a user