Merge branch 'master' into decompile_battle_tent

2018-06-30 14:43:41 +02:00
parent 5434db2fc6 91ee3221b3
commit 15fe5a031b
2916 changed files with 9504 additions and 10000 deletions
@@ -228,7 +228,7 @@ static void ShowMapNamePopUpWindow(void)

    if(InBattlePyramid())
    {
-        if(gMapHeader.mapDataId == 0x17A)
+        if(gMapHeader.mapLayoutId == 0x17A)
        {
            withoutPrefixPtr = &(mapDisplayHeader[3]);
            mapDisplayHeaderSource = gBattlePyramid_MapHeaderStrings[7];