merge overworld with master

2018-02-14 01:12:17 +01:00
parent 94b47c0686 bb8c53f898
commit 5dde701c81
46 changed files with 2827 additions and 7155 deletions
@@ -1957,11 +1957,11 @@ void sub_80EDB44(void)
        show->rivalTrainer.badgeCount = nBadges;
        if (IsNationalPokedexEnabled())
        {
-            show->rivalTrainer.dexCount = pokedex_count(0x01);
+            show->rivalTrainer.dexCount = GetNationalPokedexCount(0x01);
        }
        else
        {
-            show->rivalTrainer.dexCount = sub_80C0844(0x01);
+            show->rivalTrainer.dexCount = GetHoennPokedexCount(0x01);
        }
        show->rivalTrainer.location = gMapHeader.regionMapSectionId;
        show->rivalTrainer.mapDataId = gMapHeader.mapDataId;