diff options
| author | U-User-PC\User <golemgalvanize@github.com> | 2017-10-18 19:28:36 -0400 |
|---|---|---|
| committer | U-User-PC\User <golemgalvanize@github.com> | 2017-10-18 19:28:36 -0400 |
| commit | d4532c70cb03962d38517fef2d723f81a9b27c1b (patch) | |
| tree | 70220c06025360d7089011f5d80239b61ac183af /include/easy_chat.h | |
| parent | 11f9a27640a9f921c6dc1858261d9a609a6599ca (diff) | |
| parent | 0f0ba1e28c5c14bb93d403fd2df4a2d89e057a65 (diff) | |
fix merge conflicts
Diffstat (limited to 'include/easy_chat.h')
| -rw-r--r-- | include/easy_chat.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/easy_chat.h b/include/easy_chat.h index fc44b6a8a..b0a217320 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -30,7 +30,9 @@ enum void InitEasyChatPhrases(void); void easy_chat_input_maybe(void); -void CopyEasyChatWord(u8 *, u16); -bool32 sub_811F8D8(u16); +void CopyEasyChatWord(u8 *dest, u16 word); +bool32 sub_811F8D8(u16 word); +void InitializeEasyChatWordArray(u16 *words, u16 length); +void ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 length1, u16 length2); #endif // GUARD_EASYCHAT_H |