Merge branch 'master' into event_object_movement

1 files changed, 26 insertions, 1 deletions

diff --git a/include/easy_chat.h b/include/easy_chat.h
index e7ec52fd1..11711cbbc 100644
--- a/include/easy_chat.h
+++ b/include/easy_chat.h
@@ -30,7 +30,6 @@ struct EasyChatWordsByLetter
     int numWords;
 };
 
-void InitEasyChatPhrases(void);
 u8 *CopyEasyChatWord(u8 *dest, u16 word);
 u8 *ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 length1, u16 length2);
 bool8 EC_DoesEasyChatStringFitOnLine(const u16 *easyChatWords, u8 columns, u8 rows, u16 maxLength);
@@ -46,5 +45,31 @@ u16 GetNumDisplayedWords(void);
 const u8 *GetEasyChatWordGroupName(u8);
 u8 *CopyEasyChatWordPadded(u8 *, u16, u16);
 void DoEasyChatScreen(u8 type, u16 *words, MainCallback callback);
+u8 GetNumDisplayableGroups(void);
+bool8 InitEasyChatGraphicsWork(void);
+bool8 LoadEasyChatGraphics(void);
+void DestroyEasyChatGraphicsResources(void);
+void EasyChatInterfaceCommand_Setup(u16 id);
+bool8 EasyChatInterfaceCommand_Run(void);
+u8 GetEasyChatScreenFrameId(void);
+const u8 *GetTitleText(void);
+u16 *GetEasyChatWordBuffer(void);
+u8 GetNumRows(void);
+u8 GetNumColumns(void);
+u8 GetMainCursorColumn(void);
+u8 GetMainCursorRow(void);
+void GetEasyChatInstructionsText(const u8 **str1, const u8 **str2);
+void GetEasyChatConfirmText(const u8 **str1, const u8 **str2);
+void GetEasyChatConfirmCancelText(const u8 **str1, const u8 **str2);
+void GetEasyChatConfirmDeletionText(const u8 **str1, const u8 **str2);
+void GetECSelectGroupCursorCoords(u8 *Xp, u8 *Yp);
+bool8 IsEasyChatAlphaMode(void);
+u8 GetECSelectGroupRowsAbove(void);
+void GetECSelectWordCursorCoords(s8 *arg0, s8 *arg1);
+u8 GetECSelectWordRowsAbove(void);
+u8 GetECSelectWordNumRows(void);
+u8 unref_sub_80FFE60(void);
+bool32 ShouldDrawECUpArrow(void);
+bool32 ShouldDrawECDownArrow(void);
 
 #endif // GUARD_EASY_CHAT_H