diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 19:34:55 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 19:34:55 +0100 |
commit | d0245cf8d23aa65a357977a00b21f58d42dfcf6e (patch) | |
tree | cb5e1c81baaf882f2bb8f323b04a7b41d316be7b /include/strings.h | |
parent | 3e1f3d0e1e2bc5fbe5e630d81b741b653080e77b (diff) | |
parent | a98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff) |
recorded battle merge conflicts fix
Diffstat (limited to 'include/strings.h')
-rw-r--r-- | include/strings.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/strings.h b/include/strings.h index fcdb1eca4..08e2b4bba 100644 --- a/include/strings.h +++ b/include/strings.h @@ -70,6 +70,13 @@ extern const u8 gText_Cushion[]; extern const u8 gText_Decorate[]; extern const u8 gText_PutAway[]; extern const u8 gText_Toss2[]; +extern const u8 gText_Hoenn[]; +extern const u8 gText_Ferry[]; +extern const u8 gText_SecretBase[]; +extern const u8 gText_Hideout[]; +extern const u8 gText_FlyToWhere[]; +extern const u8 gText_PokemonLeague[]; +extern const u8 gText_PokemonCenter[]; extern const u8 gText_ApostropheSBase[]; extern const u8 gText_NoRegistry[]; extern const u8 gText_OkayToDeleteFromRegistry[]; |