trade through sub_804C728 (nonmatching

5 files changed, 11 insertions, 4 deletions

diff --git a/include/link.h b/include/link.h
index 7c4b871de..552e50970 100644
--- a/include/link.h
+++ b/include/link.h
@@ -181,7 +181,7 @@ extern u32 gLinkStatus;
 extern u16 gBlockRecvBuffer[MAX_RFU_PLAYERS][BLOCK_BUFFER_SIZE / 2];
 extern u16 gSendCmd[CMD_LENGTH];
 extern u8 gShouldAdvanceLinkState;
-extern struct LinkPlayer gLinkPlayers[];
+extern struct LinkPlayer gLinkPlayers[MAX_RFU_PLAYERS];
 extern u16 word_3002910[];
 extern bool8 gReceivedRemoteLinkPlayers;
 extern bool8 gLinkVSyncDisabled;
@@ -212,6 +212,7 @@ u8 GetBlockReceivedStatus(void);
 void ResetBlockReceivedFlags(void);
 void ResetBlockReceivedFlag(u8);
 void SetLinkDebugValues(u32, u32);
+u8 GetSavedPlayerCount(void);
 u8 GetLinkPlayerCount_2(void);
 bool8 IsLinkMaster(void);
 void CB2_LinkError(void);
@@ -232,10 +233,10 @@ bool8 sub_800A520(void);
 bool8 sub_8010500(void);
 void sub_800DFB4(u8, u8);
 void sub_800AB9C(void);
-void sub_800B488(void);
+void sub_800B1F4(void);
 void sub_8009734(void);
 void sub_800A620(void);
-void sub_8011BD0(void);
+void sub_80FBB4C(void);
 u8 sub_800ABAC(void);
 u8 sub_800ABBC(void);
 void sub_800AAC0(void);
diff --git a/include/link_rfu.h b/include/link_rfu.h
index 2757e5296..518c3fc65 100644
--- a/include/link_rfu.h
+++ b/include/link_rfu.h
@@ -39,5 +39,7 @@ bool32 sub_80FAEF0(void);
 bool32 IsRfuRecvQueueEmpty(void);
 u32 GetRfuRecvQueueLength(void);
 void sub_80F8DC0(void);
+void sub_80FBB20(void);
+bool8 sub_80FA484(bool32 a0);
 
 #endif //GUARD_LINK_RFU_H
diff --git a/include/party_menu.h b/include/party_menu.h
index bea5dcdde..ad9d6eda6 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -82,5 +82,6 @@ void OpenPartyMenuInBattle(u8 arg);
 void sub_8127EC4(u8 battlerId, u8 unk, u8 arrayIndex);
 bool8 IsMultiBattle(void);
 void sub_8126EDC(void);
+void sub_812256C(u8 *partyCount, u8 *icons, u8 side);
 
 #endif // GUARD_PARTY_MENU_H
diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h
index cd8c798f9..a81961390 100644
--- a/include/pokemon_icon.h
+++ b/include/pokemon_icon.h
@@ -10,11 +10,13 @@ void sub_80D2F68(u16 iconId);
 u8 sub_80D2D78(u16 iconId, void callback(struct Sprite *), u16 x, u16 y, u16 a4, u8 a5);
 void sub_80D2FF0(u16 iconId);
 void sub_80D2EF8(struct Sprite *sprite);
-void sub_809707C(void);
+void LoadMonIconPalettes(void);
 void FreeMonIconPalettes(void);
 u16 sub_8096FD4(u16);
 u8 sub_8096ECC(u16, void (*)(struct Sprite *), s16, s16, u8, bool32);
 void sub_8097070(struct Sprite *);
 u16 GetUnownLetterByPersonality(u32 personality);
+void sub_809718C(void);
+u8 CreateMonIcon(u16 species, void (*callback)(void), s16 x, s16 y, u8 subpriority, u32 personality, bool32 extra);
 
 #endif // GUARD_POKEMON_ICON_H
diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h
index 6790fb775..2d881878f 100644
--- a/include/pokemon_storage_system.h
+++ b/include/pokemon_storage_system.h
@@ -16,5 +16,6 @@ u8 * GetBoxNamePtr(u8 boxId);
 void sub_808CE60(void);
 void ResetPokemonStorageSystem(void);
 u8 StorageGetCurrentBox(void);
+void sub_808BEB4(const u8 *name, u8 *a1, u8 a2, u8 a3, u8 *buffer, u8 a5);
 
 #endif // GUARD_POKEMON_STORAGE_SYSTEM_H