fix battle setup conflicts

2017-12-17 20:26:13 +01:00
parent bb82032208 6d73bb4b57
commit 7517f6a030
46 changed files with 1365 additions and 1826 deletions
--- a/include/strings.h
+++ b/include/strings.h
@@ -83,6 +83,9 @@ extern const u8 gText_OkayToDeleteFromRegistry[];
 extern const u8 gText_RegisteredDataDeleted[];
 extern const u8 gUnknown_085EA79D[];
 extern const u8 gText_EmptyString2[];
+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[];