Merge branch 'master' into fix-eventobj

2020-01-12 22:42:43 -05:00
parent 635267ce32 fa5816915d
commit 655910a16f
127 changed files with 15606 additions and 21934 deletions
@@ -360,7 +360,7 @@ static void InitGiddyTaleList(void)
                    break;
            if (r1 == 6)
                r1 = 0;
-            giddy->randomWords[i] = sub_811EE90(arr[r1][0]);
+            giddy->randomWords[i] = GetRandomEasyChatWordFromUnlockedGroup(arr[r1][0]);
        }
    }
 }