From 91915c5662318efcc04e193ee053c737617683c7 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 8 Nov 2022 13:39:39 -0500 Subject: [PATCH] Fix player list array sizes --- include/link_rfu.h | 6 +++--- include/union_room.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/link_rfu.h b/include/link_rfu.h index 47588004c..e3b60ccb4 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -240,8 +240,8 @@ void MG_DrawCheckerboardPattern(void); void Rfu_SetCloseLinkCallback(void); bool8 IsLinkRfuTaskFinished(void); void DestroyWirelessStatusIndicatorSprite(void); -void CreateTask_LinkMysteryGiftWithFriend(u32 arg0); -void CreateTask_LinkMysteryGiftOverWireless(u32 arg0); +void CreateTask_LinkMysteryGiftWithFriend(u32 activity); +void CreateTask_LinkMysteryGiftOverWireless(u32 activity); void CreateTask_SendMysteryGift(u32 activity); void Rfu_SendPacket(void *data); u8 CreateTask_ListenToWireless(void); @@ -292,7 +292,7 @@ bool8 LmanAcceptSlotFlagIsNotZero(void); void LinkRfu_StopManagerAndFinalizeSlots(void); bool32 RfuTryDisconnectLeavingChildren(void); bool32 IsRfuCommunicatingWithAllChildren(void); -bool32 WaitRfuState(bool32 a0); +bool32 WaitRfuState(bool32 force); bool32 HasTrainerLeftPartnersList(u16 trainerId, const u8 *trainerName); void SendRfuStatusToPartner(u8 status, u16 trainerId, const u8 *name); u32 WaitSendRfuStatusToPartner(u16 trainerId, const u8 *name); diff --git a/include/union_room.h b/include/union_room.h index 51390c637..0e1fd6260 100644 --- a/include/union_room.h +++ b/include/union_room.h @@ -38,7 +38,7 @@ struct RfuPlayer struct RfuPlayerList { - struct RfuPlayer players[0]; // TODO: Should be size MAX_RFU_PLAYER_LIST_SIZE + struct RfuPlayer players[MAX_RFU_PLAYER_LIST_SIZE]; }; struct RfuIncomingPlayer @@ -49,7 +49,7 @@ struct RfuIncomingPlayer struct RfuIncomingPlayerList { - struct RfuIncomingPlayer players[0]; // TODO: Should be size MAX_RFU_PLAYERS + struct RfuIncomingPlayer players[MAX_RFU_PLAYERS]; }; struct WirelessLink_Leader