diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-09 11:56:50 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-09 11:56:50 +0100 |
| commit | 4683cdc30cbe81db56b69dfeb7a1fb32fe6641e2 (patch) | |
| tree | c7c791620bcb6849a24b549b4a5c48abec281c10 /src/strings.c | |
| parent | 606fb71392651dac4f5f8773c4117f35de7b087e (diff) | |
| parent | 0b91d2948a431a5d44166544897a550061c01a31 (diff) | |
Merge branch 'master' into weather
Diffstat (limited to 'src/strings.c')
| -rw-r--r-- | src/strings.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/strings.c b/src/strings.c index 3ac6fa36c..bd8c766de 100644 --- a/src/strings.c +++ b/src/strings.c @@ -255,25 +255,25 @@ const u8 gText_ThePC[] = _("the PC"); const u8 *const gReturnToXStringsTable[] = { gText_TheField, - gText_TheBattle, - gText_ThePokemonList, - gText_TheShop, - gText_TheField, - gText_TheField, - gText_ThePC, - gText_TheField, - gText_TheField, - gText_TheField, - gText_TheBattle, - gText_ThePC + gText_TheBattle, + gText_ThePokemonList, + gText_TheShop, + gText_TheField, + gText_TheField, + gText_ThePC, + gText_TheField, + gText_TheField, + gText_TheField, + gText_TheBattle, + gText_ThePC }; const u8 *const gReturnToXStringsTable2[] = { gText_TheField, - gText_TheBattle, - gText_ThePokemonList, - gText_TheField + gText_TheBattle, + gText_ThePokemonList, + gText_TheField }; const u8 gText_ReturnToVar1[] = _("Return to\n{STR_VAR_1}."); @@ -286,10 +286,10 @@ const u8 gText_KeyItemsPocket[] = _("KEY ITEMS"); const u8 *const gPocketNamesStringsTable[] = { gText_ItemsPocket, - gText_PokeBallsPocket, - gText_TMHMPocket, - gText_BerriesPocket, - gText_KeyItemsPocket + gText_PokeBallsPocket, + gText_TMHMPocket, + gText_BerriesPocket, + gText_KeyItemsPocket }; const u8 gText_UnkF908Var1Clear7Var2[] = _("{NO}{STR_VAR_1}{CLEAR 0x07}{STR_VAR_2}"); |