15 files changed, 41 insertions, 4 deletions

diff --git a/include/berry_crush.h b/include/berry_crush.h
new file mode 100644
index 000000000..2583aba61
--- /dev/null
+++ b/include/berry_crush.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_BERRY_CRUSH_H
+#define GUARD_BERRY_CRUSH_H
+
+void sub_814B754(MainCallback callback);
+
+#endif //GUARD_BERRY_CRUSH_H
diff --git a/include/cable_club.h b/include/cable_club.h
index 5375c2210..c1dbab1a5 100644
--- a/include/cable_club.h
+++ b/include/cable_club.h
@@ -10,5 +10,6 @@
 // Exported ROM declarations
 void sub_8081A90(u8 taskId);
 u8 sub_8081150(void);
+void sub_8081668(void);
 
 #endif //GUARD_CABLE_CLUB_H
diff --git a/include/dodrio_berry_picking.h b/include/dodrio_berry_picking.h
new file mode 100644
index 000000000..59736ba7a
--- /dev/null
+++ b/include/dodrio_berry_picking.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_DODRIO_BERRY_PICKING_H
+#define GUARD_DODRIO_BERRY_PICKING_H
+
+void sub_81507FC(u16 species, MainCallback callback);
+
+#endif //GUARD_DODRIO_BERRY_PICKING_H
diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h
index ecb622de5..57a2fab66 100644
--- a/include/field_control_avatar.h
+++ b/include/field_control_avatar.h
@@ -7,5 +7,6 @@ extern u32 gUnknown_3005078;
 
 void RestartWildEncounterImmunitySteps(void);
 void ClearPoisonStepCounter(void);
+void SetCableClubWarp(void);
 
 #endif //GUARD_FIELD_CONTROL_AVATAR_H
diff --git a/include/field_weather.h b/include/field_weather.h
index 2709a7298..de2543edb 100644
--- a/include/field_weather.h
+++ b/include/field_weather.h
@@ -3,7 +3,7 @@
 
 #include "global.h"
 
-void fade_screen(u8, s8);
+void FadeScreen(u8, s8);
 
 void SetSav1Weather(u32);
 u8 GetSav1Weather(void);
diff --git a/include/link.h b/include/link.h
index 4175ac97f..770a60f44 100644
--- a/include/link.h
+++ b/include/link.h
@@ -278,5 +278,6 @@ bool8 HandleLinkConnection(void);
 void sub_800B0B4(void);
 void sub_800B110(u32 who);
 void sub_800ACBC(u32 status, u8 lastSendQueueCount, u8 lastRecvQueueCount, u8 unk_06);
+u8 sub_800A8D4(void);
 
 #endif // GUARD_LINK_H
diff --git a/include/link_rfu.h b/include/link_rfu.h
index a0db0a425..6f7e01678 100644
--- a/include/link_rfu.h
+++ b/include/link_rfu.h
@@ -235,7 +235,7 @@ bool8 IsLinkRfuTaskFinished(void);
 void DestroyWirelessStatusIndicatorSprite(void);
 void MEvent_CreateTask_CardOrNewsWithFriend(u8);
 void MEvent_CreateTask_CardOrNewsOverWireless(u8);
-void MEvent_CreateTask_Leader(u8);
+void MEvent_CreateTask_Leader(u32 arg0);
 void sub_80F9E2C(void * data);
 u8 sub_8116DE0(void);
 void sub_80FBB4C(void);
@@ -309,6 +309,12 @@ void sub_80FBD4C(const u8 *ptr, u16 a1);
 void LinkRfu3_SetGnameUnameFromStaticBuffers(struct GFtgtGname *gname, u8 *uname);
 void sub_80FBBD8(void);
 void sub_80FA6BC(void);
+void sub_80FBF54(const u8 *src, u16 trainerId);
+void sub_80FB008(u8 a0, u32 a1, u32 a2);
+void RecordMixTrainerNames(void);
+void sub_80F8CFC();
+void sub_80F8D14();
+void sub_80FAF74(bool32 a0, bool32 a1);
 
 #include "mevent_server.h"
 extern const struct mevent_server_cmd gMEventSrvScript_OtherTrainerCanceled[];
diff --git a/include/mevent.h b/include/mevent.h
index 81caeb42f..eb7cf77f3 100644
--- a/include/mevent.h
+++ b/include/mevent.h
@@ -70,5 +70,8 @@ void sub_8143D24(void);
 u16 sub_81445C0(u32 command);
 void sub_8144714(u32 a0, u32 a1);
 u16 *GetMEventProfileECWordsMaybe(void);
+void sub_81446C4(void);
+bool32 sub_81446D0(u16 a0);
+u16 GetWonderCardFlagID(void);
 
 #endif //GUARD_MEVENT_H
diff --git a/include/mystery_gift_menu.h b/include/mystery_gift_menu.h
index 32624d602..bd790b36e 100644
--- a/include/mystery_gift_menu.h
+++ b/include/mystery_gift_menu.h
@@ -7,5 +7,8 @@ void MainCB_FreeAllBuffersAndReturnToInitTitleScreen(void);
 void PrintMysteryGiftOrEReaderTopMenu(bool8, bool32);
 void c2_mystery_gift(void);
 void c2_mystery_gift_e_reader_run(void);
+s8 mevent_message_print_and_prompt_yes_no(u8 * textState, u16 * windowId, bool8 yesNoBoxPlacement, const u8 * str);
+void MG_DrawTextBorder(u8 windowId);
+u16 GetMysteryGiftBaseBlock(void);
 
 #endif //GUARD_MYSTERY_GIFT_MENU_H
diff --git a/include/overworld.h b/include/overworld.h
index c24b63cf9..a7031e56d 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -62,7 +62,8 @@ extern struct WarpData gUnknown_2031DB4;
 extern struct WarpData gUnknown_2031DBC;
 
 extern u8 gUnknown_2031DE0;
-extern u8 gUnknown_300502C;
+extern u8 gFieldLinkPlayerCount;
+extern u8 gLocalLinkPlayerId;
 
 void IncrementGameStat(u8 index);
 
diff --git a/include/pokemon_jump.h b/include/pokemon_jump.h
index 8623b223a..0e9094752 100644
--- a/include/pokemon_jump.h
+++ b/include/pokemon_jump.h
@@ -5,5 +5,6 @@
 
 void ResetPokeJumpResults(void);
 bool32 IsSpeciesAllowedInPokemonJump(u16 species);
+void sub_8147AA8(u16 species, MainCallback callback);
 
 #endif // GUARD_POKEMON_JUMP_H
diff --git a/include/save_location.h b/include/save_location.h
index fb71ab728..c8e362231 100644
--- a/include/save_location.h
+++ b/include/save_location.h
@@ -6,6 +6,7 @@
 #define POKECENTER_SAVEWARP          (1 << 1)
 #define LOBBY_SAVEWARP               (1 << 2)
 #define UNK_SPECIAL_SAVE_WARP_FLAG_3 (1 << 3)
+#define CHAMPION_SAVEWARP            (1 << 7)
 
 void TrySetMapSaveWarpStatus(void);
 bool32 IsCurMapPokeCenter(void);
diff --git a/include/union_room.h b/include/union_room.h
index d57683a8a..9221b6bf5 100644
--- a/include/union_room.h
+++ b/include/union_room.h
@@ -134,7 +134,7 @@ union UnkUnion_Main
     struct UnkStruct_URoom *uRoom;
 };
 
-struct TradeUnkStruct
+struct UnionRoomTrade
 {
     u16 field_0;
     u16 type;
diff --git a/include/union_room_chat.h b/include/union_room_chat.h
index 17e482525..66daac376 100644
--- a/include/union_room_chat.h
+++ b/include/union_room_chat.h
@@ -2,6 +2,7 @@
 #define GUARD_UNION_ROOM_CHAT_H
 
 void sub_801DD98(void);
+void sub_8128420(void);
 void copy_strings_to_sav1(void);
 
 #endif // GUARD_UNION_ROOM_CHAT_H
diff --git a/include/union_room_player_avatar.h b/include/union_room_player_avatar.h
new file mode 100644
index 000000000..12b7773e7
--- /dev/null
+++ b/include/union_room_player_avatar.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_UNION_ROOM_PLAYER_AVATAR_H
+#define GUARD_UNION_ROOM_PLAYER_AVATAR_H
+
+void sub_811C1C8(void);
+
+#endif //GUARD_UNION_ROOM_PLAYER_AVATAR_H