Merge branch 'master' into bard_music

2017-11-02 00:09:14 -04:00
parent 6e5dcf19f7 c71f6baa8c
commit 75262c1920
99 changed files with 20105 additions and 61297 deletions
--- a/include/easy_chat.h
+++ b/include/easy_chat.h
@@ -34,6 +34,6 @@ 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);
-bool8 IsECWordInValidRange(u16 word);
+bool8 ECWord_CheckIfOutsideOfValidRange(u16 word);

 #endif // GUARD_EASYCHAT_H