diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-20 17:16:56 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-20 17:16:56 +0100 |
commit | b615af4184108b83227a24aac1eff7ec0a0cc749 (patch) | |
tree | b74e22f9c574a7e690c2f239f63d1f39f2f3614f /include/strings.h | |
parent | cb229f56e8951e3f9efc35516447a54e18e8fef0 (diff) | |
parent | 7e6a68a99a832383e7cbf3c91aef321dd46ed61f (diff) |
fix pokeblock merge conflicts
Diffstat (limited to 'include/strings.h')
-rw-r--r-- | include/strings.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/strings.h b/include/strings.h index 757cc8cac..5521d828b 100644 --- a/include/strings.h +++ b/include/strings.h @@ -107,6 +107,9 @@ extern const u8 gText_Cancel4[]; extern const u8 gText_IsThisTheCorrectTime[]; extern const u8 gText_PkmnFainted3[]; extern const u8 gText_Coins[]; +extern const u8 gText_Draw[]; +extern const u8 gText_Loss[]; +extern const u8 gText_Win[]; extern const u8 gText_Var1AteTheVar2[]; extern const u8 gText_Var1HappilyAteVar2[]; |