diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-15 23:27:27 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-15 23:27:27 +0200 |
| commit | 003a8a501b7ee0a4f8bf8bb803cf7e077d52d068 (patch) | |
| tree | 2ebb9f702f863ab0cfb78a996aeeac331428ba7b /include/easy_chat.h | |
| parent | 9d4acb9635b3b74d5ae4edee70d673f49c0aab74 (diff) | |
| parent | 0d38d443b561f9baaae12324712503dfccaf01ea (diff) | |
fix merge conflict
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 |