Cleaned trailing whitespace
This commit is contained in:
+5
-5
@@ -61,7 +61,7 @@ struct SioInfo
|
||||
u8 filler[92];
|
||||
};
|
||||
|
||||
// Struct is mostly empty, presumably because usage of
|
||||
// Struct is mostly empty, presumably because usage of
|
||||
// its fields was largely removed before release
|
||||
struct RfuDebug
|
||||
{
|
||||
@@ -1643,7 +1643,7 @@ bool32 RfuTryDisconnectLeavingChildren(void)
|
||||
{
|
||||
u8 childrenLeaving = 0;
|
||||
s32 i;
|
||||
|
||||
|
||||
// Check all children, get those waiting to be disconnected
|
||||
for (i = 0; i < RFU_CHILD_MAX; i++)
|
||||
{
|
||||
@@ -2123,7 +2123,7 @@ void SetUnionRoomChatPlayerData(u32 numPlayers)
|
||||
// Only trainerId is shifted by the number of children, so the active flag and gender
|
||||
// are only ever set for the first child
|
||||
partnerInfo |= ((PINFO_ACTIVE_FLAG
|
||||
| ((gLinkPlayers[gRfu.linkPlayerIdx[i]].gender & 1) << PINFO_GENDER_SHIFT)
|
||||
| ((gLinkPlayers[gRfu.linkPlayerIdx[i]].gender & 1) << PINFO_GENDER_SHIFT)
|
||||
| (gLinkPlayers[gRfu.linkPlayerIdx[i]].trainerId & PINFO_TID_MASK)) << (numConnectedChildren * 8));
|
||||
numConnectedChildren++;
|
||||
if (numConnectedChildren == numPlayers - 1)
|
||||
@@ -2477,7 +2477,7 @@ static void LinkManagerCB_UnionRoom(u8 msg, u8 paramCount)
|
||||
rfu_LMAN_stopManager(FALSE);
|
||||
}
|
||||
|
||||
if (gRfuLinkStatus->parentChild == MODE_NEUTRAL
|
||||
if (gRfuLinkStatus->parentChild == MODE_NEUTRAL
|
||||
&& !lman.pcswitch_flag
|
||||
&& FuncIsActiveTask(Task_UnionRoomListen) == TRUE)
|
||||
gRfu.state = RFUSTATE_UR_CONNECT;
|
||||
@@ -2816,7 +2816,7 @@ static bool32 IsPartnerActivityIncompatible(s16 activity, struct RfuGameData *pa
|
||||
}
|
||||
else if (activity == (ACTIVITY_TRADE | IN_UNION_ROOM))
|
||||
{
|
||||
// Verify that the trade offered hasn't changed
|
||||
// Verify that the trade offered hasn't changed
|
||||
struct RfuGameData *original = &gRfu.parent;
|
||||
if (original->tradeSpecies == SPECIES_EGG)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user