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
@@ -5620,7 +5620,7 @@ void SetWildMonHeldItem(void)
            var1 = 20;
            var2 = 80;
        }
-        if (gMapHeader.mapDataId == 0x1A4)
+        if (gMapHeader.mapLayoutId == 0x1A4)
        {
            s32 alteringCaveId = GetWildMonTableIdInAlteringCave(species);
            if (alteringCaveId != 0)