WIP Document Apprentice

4 files changed, 50 insertions, 26 deletions

diff --git a/include/apprentice.h b/include/apprentice.h
index ac7dff886..44329b677 100644
--- a/include/apprentice.h
+++ b/include/apprentice.h
@@ -10,7 +10,7 @@ struct ApprenticeTrainer
     u8 facilityClass;
     u16 species[APPRENTICE_SPECIES_COUNT];
     u8 id;
-    u16 easyChatWords[6];
+    u16 speechLost[EASY_CHAT_BATTLE_WORDS_COUNT];
 };
 
 extern const struct ApprenticeTrainer gApprentices[];
diff --git a/include/constants/apprentice.h b/include/constants/apprentice.h
index 61f257767..87b7b12f5 100644
--- a/include/constants/apprentice.h
+++ b/include/constants/apprentice.h
@@ -7,33 +7,57 @@
 #define APPRENTICE_LVL_MODE_50    (FRONTIER_LVL_50 + 1)
 #define APPRENTICE_LVL_MODE_OPEN  (FRONTIER_LVL_OPEN + 1)
 
-#define APPRENTICE_FUNC_0 0
-#define APPRENTICE_FUNC_1 1
-#define APPRENTICE_FUNC_2 2
+#define APPRENTICE_FUNC_GAVE_LVLMODE 0
+#define APPRENTICE_FUNC_SET_LVLMODE 1
+#define APPRENTICE_FUNC_SET_ID 2
 #define APPRENTICE_FUNC_3 3
 #define APPRENTICE_FUNC_4 4
-#define APPRENTICE_FUNC_5 5
+#define APPRENTICE_FUNC_ANSWERED_QUESTION 5
 #define APPRENTICE_FUNC_6 6
 #define APPRENTICE_FUNC_MENU 7
 #define APPRENTICE_FUNC_PRINT_MSG 8
-#define APPRENTICE_FUNC_9 9
-#define APPRENTICE_FUNC_SET_TRUE_1 10
-#define APPRENTICE_FUNC_11 11
-#define APPRENTICE_FUNC_12 12
-#define APPRENTICE_FUNC_13 13
-#define APPRENTICE_FUNC_14 14
-#define APPRENTICE_FUNC_15 15
-#define APPRENTICE_FUNC_16 16
-#define APPRENTICE_FUNC_17 17
-#define APPRENTICE_FUNC_18 18
-#define APPRENTICE_FUNC_19 19
+#define APPRENTICE_FUNC_RESET 9
+#define APPRENTICE_FUNC_CHECK_GONE 10
+#define APPRENTICE_FUNC_GET_QUESTION 11
+#define APPRENTICE_FUNC_GET_NUM_PARTY_MONS 12
+#define APPRENTICE_FUNC_SET_PARTY_MON 13
+#define APPRENTICE_FUNC_INIT_QUESTION_DATA 14
+#define APPRENTICE_FUNC_FREE_QUESTION_DATA 15
+#define APPRENTICE_FUNC_BUFFER_STRING 16
+#define APPRENTICE_FUNC_SET_MOVE 17
+#define APPRENTICE_FUNC_SET_FIRST_MON 18
+#define APPRENTICE_FUNC_OPEN_BAG 19
 #define APPRENTICE_FUNC_20 20
 #define APPRENTICE_FUNC_21 21
-#define APPRENTICE_FUNC_22 22
-#define APPRENTICE_FUNC_23 23
-#define APPRENTICE_FUNC_24 24
+#define APPRENTICE_FUNC_SET_GFX_SAVED 22
+#define APPRENTICE_FUNC_SET_GFX 23
+#define APPRENTICE_FUNC_SHOULD_LEAVE 24
 #define APPRENTICE_FUNC_25 25
 
+#define APPRENTICE_MSG_PLEASE_TEACH            0
+#define APPRENTICE_MSG_REJECT           1
+#define APPRENTICE_MSG_WHICH_LVL_MODE   2
+#define APPRENTICE_MSG_THANKS_LVL_MODE  3
+#define APPRENTICE_MSG_WHICH_MON_FIRST     4
+#define APPRENTICE_MSG_THANKS_MON_FIRST     5
+#define APPRENTICE_MSG_WHICH_MON     6
+#define APPRENTICE_MSG_THANKS_MON     7
+#define APPRENTICE_MSG_WHICH_MOVE    8
+#define APPRENTICE_MSG_THANKS_MOVE     9
+#define APPRENTICE_MSG_WHAT_HELD_ITEM    10
+#define APPRENTICE_MSG_PICK_WIN_SPEECH    11
+#define APPRENTICE_MSG_THANKS_HELD_ITEM    12
+#define APPRENTICE_MSG_HOLD_NOTHING    13
+#define APPRENTICE_MSG_THANKS_NO_HELD_ITEM    14
+#define APPRENTICE_MSG_THANKS_WIN_SPEECH    15
+#define APPRENTICE_MSG_ITEM_ALREADY_SUGGESTED  16
+
+#define APPRENTICE_QUESTION_WHICH_FIRST    1
+#define APPRENTICE_QUESTION_WHICH_MON      2
+#define APPRENTICE_QUESTION_WHICH_MOVE     3
+#define APPRENTICE_QUESTION_WHAT_ITEM      4
+#define APPRENTICE_QUESTION_WIN_SPEECH     5
+
 #define APPRENTICE_ASK_WHICH_LEVEL 0
 #define APPRENTICE_ASK_3SPECIES 1
 #define APPRENTICE_ASK_2SPECIES 2
@@ -48,8 +72,8 @@
 #define APPRENTICE_BUFF_MOVE2 4
 #define APPRENTICE_BUFF_ITEM 5
 #define APPRENTICE_BUFF_NAME 6
-#define APPRENTICE_BUFF_EASY_CHAT 7
+#define APPRENTICE_BUFF_WIN_SPEECH 7
 #define APPRENTICE_BUFF_LEVEL 8
-#define APPRENTICE_BUFF_SPECIES4 9
+#define APPRENTICE_BUFF_FIRST_MON_SPECIES 9
 
 #endif // GUARD_CONSTANTS_APPRENTICE_H
diff --git a/include/global.h b/include/global.h
index f067f5bbc..c00d71d8f 100644
--- a/include/global.h
+++ b/include/global.h
@@ -223,7 +223,7 @@ struct Apprentice
     u8 field_1;
     u8 number;
     struct ApprenticeMon party[MULTI_PARTY_SIZE];
-    u16 easyChatWords[EASY_CHAT_BATTLE_WORDS_COUNT];
+    u16 speechWon[EASY_CHAT_BATTLE_WORDS_COUNT];
     u8 playerId[TRAINER_ID_LENGTH];
     u8 playerName[PLAYER_NAME_LENGTH];
     u8 language;
@@ -415,9 +415,9 @@ struct Sav2_B8
 struct PlayersApprentice
 {
     /*0xB0*/ u8 id;
-    /*0xB1*/ u8 lvlMode:2; //0: Unassigned, 1: Lv 50, 2: Open Lv
-    /*0xB1*/ u8 field_B1_1:4;
-    /*0xB1*/ u8 field_B1_2:2;
+    /*0xB1*/ u8 lvlMode:2;  //0: Unassigned, 1: Lv 50, 2: Open Lv
+    /*0xB1*/ u8 questionsAnswered:4;
+    /*0xB1*/ u8 firstMonId:2;
     /*0xB2*/ u8 field_B2_0:3;
     /*0xB2*/ u8 field_B2_1:2;
     /*0xB3*/ u8 field_B3;
diff --git a/include/item_menu.h b/include/item_menu.h
index a21a6da4f..508f94815 100644
--- a/include/item_menu.h
+++ b/include/item_menu.h
@@ -71,7 +71,7 @@ extern u16 gSpecialVar_ItemId;
 void sub_81AAC14(void);
 void FavorLadyOpenBagMenu(void);
 void QuizLadyOpenBagMenu(void);
-void sub_81AAC28(void);
+void ApprenticeOpenBagMenu(void);
 void sub_81AABB0(void);
 void SetInitialScrollAndCursorPositions(u8 pocketId);
 void bag_menu_mail_related(void);