sub_81186E0

5 files changed, 47 insertions, 31 deletions

diff --git a/include/field_fadetransition.h b/include/field_fadetransition.h
index 22849a37d..d27d0e54a 100644
--- a/include/field_fadetransition.h
+++ b/include/field_fadetransition.h
@@ -17,6 +17,8 @@ void FieldCallback_ReturnToEventScript2(void);
 void sub_807DC00(void);
 void FadeTransition_FadeInOnReturnToStartMenu(void);
 
+void sub_807DCE4(void);
+
 bool32 sub_807E418(void);
 
 #endif // GUARD_FIELD_FADETRANSITION_H
diff --git a/include/link_rfu.h b/include/link_rfu.h
index 35e5d46ff..3869ba000 100644
--- a/include/link_rfu.h
+++ b/include/link_rfu.h
@@ -316,6 +316,13 @@ void sub_80F8CFC();
 void sub_80F8D14();
 void sub_80FAF74(bool32 a0, bool32 a1);
 void ClearAndInitHostRFUtgtGname(void);
+void sub_80F8FA0(void);
+void sub_80FAFA0(u32 type, u32 species, u32 level);
+bool32 sub_80FBB0C(void);
+void sub_80FBC00(void);
+void sub_80FBD6C(u32 a0);
+void sub_80FC114(const u8 *name, struct GFtgtGname *structPtr, u8 a2);
+bool32 sub_80FD338(u16 id, u8 *name);
 
 #include "mevent_server.h"
 extern const struct mevent_server_cmd gMEventSrvScript_OtherTrainerCanceled[];
diff --git a/include/party_menu.h b/include/party_menu.h
index cc8889137..a1b85e059 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -68,7 +68,7 @@ void CB2_ChooseMonToGiveItem(void);
 void ChooseMonToGiveMailFromMailbox(void);
 void InitChooseHalfPartyForBattle(u8 a1);
 void ClearSelectedPartyOrder(void);
-void sub_81277F4(u8 menuType, MainCallback callback);
+void ChooseMonForTradingBoard(u8 menuType, MainCallback callback);
 void ChooseMonForMoveTutor(void);
 void ChooseMonForWirelessMinigame(void);
 void OpenPartyMenuInTutorialBattle(u8 partyAction);
diff --git a/include/union_room.h b/include/union_room.h
index b485d2035..fa3ead8dc 100644
--- a/include/union_room.h
+++ b/include/union_room.h
@@ -95,36 +95,36 @@ struct UnkStruct_8019BA8
 
 struct UnkStruct_URoom
 {
-    struct UnkStruct_Main0 *field_0;
-    struct UnkStruct_Main4 *field_4;
-    struct UnkStruct_Main0 *field_8;
-    struct UnkStruct_Main4 *field_C;
-    u16 field_10;
-    u16 field_12;
-    u8 state;
-    u8 stateAfterPrint;
-    u8 textState;
-    u8 field_17;
-    u8 field_18;
-    u8 field_19;
-    u8 field_1A;
-    u8 field_1B;
-    u8 field_1C;
-    u8 field_1D;
-    u8 field_1E;
-    u8 field_1F;
-    u8 field_20;
-    u8 spriteIds[40];
-    u8 field_49;
-    u8 field_4A;
-    u16 field_4C[6];
-    u8 field_58[0x98 - 0x58];
-    u16 field_98;
-    u16 field_9A[3];
-    struct UnkStruct_8019BA8 field_A0[8];
-    u8 field_C0[12][15];
-    u8 field_174[48];
-    u8 field_1A4[180];
+    /* 0x000 */ struct UnkStruct_Main0 *field_0;
+    /* 0x004 */ struct UnkStruct_Main4 *field_4;
+    /* 0x008 */ struct UnkStruct_Main0 *field_8;
+    /* 0x00C */ struct UnkStruct_Main4 *field_C;
+    /* 0x010 */ u16 field_10;
+    /* 0x012 */ u16 field_12;
+    /* 0x014 */ u8 state;
+    /* 0x015 */ u8 stateAfterPrint;
+    /* 0x016 */ u8 textState;
+    /* 0x017 */ u8 field_17;
+    /* 0x018 */ u8 field_18;
+    /* 0x019 */ u8 field_19;
+    /* 0x01A */ u8 field_1A;
+    /* 0x01B */ u8 field_1B;
+    /* 0x01C */ u8 field_1C;
+    /* 0x01D */ u8 field_1D;
+    /* 0x01E */ u8 field_1E;
+    /* 0x01F */ u8 field_1F;
+    /* 0x020 */ u8 field_20;
+    /* 0x021 */ u8 spriteIds[40];
+    /* 0x049 */ u8 field_49;
+    /* 0x04A */ u8 field_4A;
+    /* 0x04C */ u16 field_4C[6];
+    /* 0x058 */ u8 field_58[0x84 - 0x58];
+    /* 0x084 */ u16 field_98;
+    /* 0x086 */ u16 field_9A[3];
+    /* 0x08C */ struct UnkStruct_8019BA8 field_A0[8];
+    /* 0x08C */ u8 field_C0[12][15];
+    /* 0x08C */ u8 field_174[48];
+    /* 0x08C */ u8 field_1A4[200];
 };
 
 union UnkUnion_Main
diff --git a/include/union_room_player_avatar.h b/include/union_room_player_avatar.h
index 12b7773e7..68d64736d 100644
--- a/include/union_room_player_avatar.h
+++ b/include/union_room_player_avatar.h
@@ -2,5 +2,12 @@
 #define GUARD_UNION_ROOM_PLAYER_AVATAR_H
 
 void sub_811C1C8(void);
+void sub_811BAAC(u8 *spriteIds, s32 arg1);
+void sub_811BB40(u8 *spriteIds);
+void sub_811BB68(void);
+void sub_811BECC(struct UnkStruct_URoom *arg0);
+void sub_811BEDC(struct UnkStruct_URoom *arg0);
+bool32 sub_811BF00(struct UnkStruct_Main0 *arg0, s16 *arg1, s16 *arg2, u8 *arg3);
+void sub_811C028(u32 arg0, u32 arg1, struct UnkStruct_Main0 *arg2);
 
 #endif //GUARD_UNION_ROOM_PLAYER_AVATAR_H