Merge master into ObjEvent rename

1 files changed, 4 insertions, 4 deletions

diff --git a/include/apprentice.h b/include/apprentice.h
index 195106c53..27ce0371e 100644
--- a/include/apprentice.h
+++ b/include/apprentice.h
@@ -1,21 +1,21 @@
 #ifndef GUARD_APPRENTICE_H
 #define GUARD_APPRENTICE_H
 
-#define APPRENTICE_SPECIES_COUNT 10
+#include "constants/apprentice.h"
 
 struct ApprenticeTrainer
 {
-    u8 name[6][PLAYER_NAME_LENGTH + 1]; // For all six languages.
+    u8 name[NUM_LANGUAGES - 1][PLAYER_NAME_LENGTH + 1]; // For all languages except the unused one.
     u16 otId;
     u8 facilityClass;
     u16 species[APPRENTICE_SPECIES_COUNT];
     u8 id;
-    u16 easyChatWords[6];
+    u16 speechLost[EASY_CHAT_BATTLE_WORDS_COUNT];
 };
 
 extern const struct ApprenticeTrainer gApprentices[];
 
-void CopyFriendsApprenticeChallengeText(u8 saveblockApprenticeId);
+void BufferApprenticeChallengeText(u8 saveApprenticeId);
 void Apprentice_EnableBothScriptContexts(void);
 void ResetApprenticeStruct(struct Apprentice *apprentice);
 void ResetAllApprenticeData(void);