2 files changed, 14 insertions, 10 deletions
diff --git a/include/friend_rescue.h b/include/friend_rescue.h
index f7bbe50..62af956 100644
--- a/include/friend_rescue.h
+++ b/include/friend_rescue.h
@@ -4,12 +4,16 @@
 struct WonderMailStruct_203B33C
 {
     // size: 0x568
-    u32 unk0;
+    u32 state;
     u32 unk4;
-    u8 unk8[0x36];
+    u8 passwordBuffer[0x36];
     u32 unk40;
-    u32 unk44;
-    u16 unk48[232];
+    u32 status;
+    u16 unk48[(0xE0 - 0x48) / 2];
+    s16 unkE0;
+    u8 unkE2[0x168 - 0xE2];
+    s16 unk168;
+    u8 unk16A[0x218 - 0x16A];
     u8 unk218;
     u8 padding7[3];
     u32 unk21C;
@@ -31,7 +35,7 @@ struct WonderMailStruct_203B33C
     u8 fill52E;
     u32 unk530;
     u32 unk534;
-    u16 unk538; // A7 << 3
+    s16 unk538; // A7 << 3
     u32 unk53C;
     u32 unk540; // A8 << 4
     s16 unk544;
diff --git a/include/personality_test.h b/include/personality_test.h
index 71a2200..d1cc2c6 100644
--- a/include/personality_test.h
+++ b/include/personality_test.h
@@ -71,15 +71,15 @@ void PrintPersonalityTypeDescription(void);
 void SetPlayerGender(void);
 void RevealPersonality(void);
 void RevealStarter(void);
-void sub_803CA8C(void);
+void AdvanceToPickPartnerPrompt(void);
 void PromptPickPartner(void);
-void sub_803CAD4(void);
+void AdvanceToPartnerSelection(void);
 void CallCreatePartnerSelectionMenu(void);
 void PromptForPartnerNickname(void);
-void sub_803CB5C(void);
-void sub_803CB7C(void);
+void AdvanceToPartnerNickhameScreen(void);
+void NicknamePartner(void);
 void PrintEndIntroText(void);
-void sub_803CBE4(void);
+void AdvanceToTestEnd(void);
 s32 GetValidPartners(void);
 void UpdateNatureTotals(void);
 void PromptNewQuestion(void);