merge with master

2017-12-01 21:27:29 +01:00
parent 646664ff29 0250aefb73
commit 039c9f4bd8
17 changed files with 282 additions and 483 deletions
--- a/include/strings.h
+++ b/include/strings.h
@@ -83,5 +83,7 @@ extern const u8 gText_OkayToDeleteFromRegistry[];
 extern const u8 gText_RegisteredDataDeleted[];
 extern const u8 gUnknown_085EA79D[];
 extern const u8 gText_EmptyString2[];
+extern const u8 gText_PkmnFainted3[];
+extern const u8 gText_Coins[];

 #endif //GUARD_STRINGS_H