Merge with master

This commit is contained in:
DizzyEggg committed 2020-08-27 12:01:28 +02:00
commit f70a9ce153
352 files changed
+18862 -18407

No files matched your search

+1 -1
View File
@@ -291,7 +291,7 @@ extern const u8 gText_PkmnGettingPumped[];
extern const u8 gText_PkmnShroudedInMist[];
extern const u8 gText_PkmnsXPreventsSwitching[];
extern const u8 gText_TheGreatNewHope[];
extern const u8 gText_WillChampinshipDreamComeTrue[];
extern const u8 gText_WillChampionshipDreamComeTrue[];
extern const u8 gText_AFormerChampion[];
extern const u8 gText_ThePreviousChampion[];
extern const u8 gText_TheUnbeatenChampion[];