Merge branch 'master' into clock

2017-12-15 21:04:25 -05:00
parent 88636dfc2a 224fdbf026
commit da2e0dfe50
195 changed files with 20967 additions and 25013 deletions
@@ -85,5 +85,7 @@ extern const u8 gUnknown_085EA79D[];
 extern const u8 gText_Confirm3[];
 extern const u8 gText_Cancel4[];
 extern const u8 gText_IsThisTheCorrectTime[];
+extern const u8 gText_PkmnFainted3[];
+extern const u8 gText_Coins[];

 #endif //GUARD_STRINGS_H