Merge branch 'master' into link

2017-12-16 11:27:10 -05:00
parent b1c6f80e10 224fdbf026
commit 190a2cba61
196 changed files with 20942 additions and 24990 deletions
--- a/include/strings.h
+++ b/include/strings.h
@@ -87,5 +87,7 @@ extern const u8 gText_MoveCloserToLinkPartner[];
 extern const u8 gText_CommErrorCheckConnections[];
 extern const u8 gText_ABtnTitleScreen[];
 extern const u8 gText_ABtnRegistrationCounter[];
+extern const u8 gText_PkmnFainted3[];
+extern const u8 gText_Coins[];

 #endif //GUARD_STRINGS_H