diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-18 16:58:14 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-18 16:58:14 +0100 |
commit | cb229f56e8951e3f9efc35516447a54e18e8fef0 (patch) | |
tree | 656599caae716c6cc8e81121f2b1cd061927b99e /include/strings.h | |
parent | c3abe2863feb8ebb21921c40d3c685a27a4135c4 (diff) | |
parent | 6a674e1e83db097d7a31a3786d12e42987f09f70 (diff) |
fix pokeblock conflicts
Diffstat (limited to 'include/strings.h')
-rw-r--r-- | include/strings.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/strings.h b/include/strings.h index 15a6374a3..757cc8cac 100644 --- a/include/strings.h +++ b/include/strings.h @@ -101,6 +101,10 @@ extern const u8 gText_NoRegistry[]; 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[]; |