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
@@ -20,7 +20,7 @@ const struct BardSound *GetWordSounds(u16 word)
    u32 subword;
    const struct BardSound (*ptr)[6];

-    if (IsECWordInValidRange(word))
+    if (ECWord_CheckIfOutsideOfValidRange(word))
    {
        return gBardSound_InvalidWord;
    }