Merge branch 'master' into main-menu-state-machine

2019-03-02 17:35:44 -05:00
parent 3716da5430 043071ae12
commit 9372731c3e
188 changed files with 4322 additions and 3958 deletions
@@ -1016,7 +1016,7 @@ static bool32 MapAllowsMatchCall(void)
    
    if (gMapHeader.regionMapSectionId == MAPSEC_SOOTOPOLIS_CITY
     && FlagGet(FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA) == TRUE
-     && FlagGet(FLAG_UNUSED_0x0DC) == FALSE)
+     && FlagGet(FLAG_NEVER_SET_0x0DC) == FALSE)
        return FALSE;

    if (gMapHeader.regionMapSectionId == MAPSEC_MT_CHIMNEY