Merge branch 'master' into doc-menu

2021-11-04 12:11:31 -04:00
parent 17b657d83a 7940f121f6
commit be7d0bd3b0
53 changed files with 842 additions and 899 deletions
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -1310,7 +1310,7 @@ static void StartEasyChatScreen(u8 taskId, TaskFunc taskFunc)

 static void Task_InitEasyChatScreen(u8 taskId)
 {
-    if (!IsUpdateLinkStateCBActive())
+    if (!IsOverworldLinkActive())
    {
        while (InitEasyChatScreen(taskId));
    }