Merge branch 'master' into battle

2019-10-24 01:42:52 +08:00
parent 9a53686a4e 6e36c22920
commit 1dc0b25c1e
1127 changed files with 79056 additions and 34785 deletions
@@ -329,7 +329,7 @@ static void InitLocalLinkPlayer(void)
    gLocalLinkPlayer.version = gGameVersion + 0x4000;
    gLocalLinkPlayer.lp_field_2 = 0x8000;
    gLocalLinkPlayer.name[8] = IsNationalPokedexEnabled();
-    if (FlagGet(FLAG_0x844))
+    if (FlagGet(FLAG_SYS_CAN_LINK_WITH_RS))
    {
        gLocalLinkPlayer.name[8] |= 0x10;
    }