diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-12 13:05:57 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-02-12 13:05:57 -0500 |
| commit | 956090b05f678db9f43d567131d6d43ce11806ec (patch) | |
| tree | 0f8318bf22c1e6f049772fd0846af6db14e86349 /src/strings.c | |
| parent | 9c934c966400813e8ed6c8a5c0f93fb8cdc12546 (diff) | |
| parent | 66c6b7a38b2a071ce7029978dd0d02fe6ec05952 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
Diffstat (limited to 'src/strings.c')
| -rw-r--r-- | src/strings.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/strings.c b/src/strings.c index f0566c859..3ca7f693f 100644 --- a/src/strings.c +++ b/src/strings.c @@ -1206,12 +1206,12 @@ const u8 gText_UnionTradesAndBattles[] = _("UNION TRADES & BATTLES"); const u8 gText_BerryCrush[] = _("BERRY CRUSH"); const u8 gText_WaitingTrainerFinishReading[] = _("Waiting for the other TRAINER to\nfinish reading your TRAINER CARD."); const u8 gText_PokeblocksWithFriends[] = _("{POKEBLOCK}S W/FRIENDS"); -const u8 gText_Var1DarkGreyShadowLightGrey[] = _("{STR_VAR_1}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}"); +const u8 gText_NumPokeblocks[] = _("{STR_VAR_1}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}"); const u8 gText_WonContestsWFriends[] = _("WON CONTESTS W/FRIENDS"); const u8 gText_BattlePtsWon[] = _("BATTLE POINTS WON"); -const u8 gText_Var1DarkLightGreyBP[] = _("{STR_VAR_1}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}BP"); +const u8 gText_NumBP[] = _("{STR_VAR_1}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}BP"); const u8 gText_BattleTower[] = _("BATTLE TOWER"); -const u8 gText_WSlashStraightSlash[] = _("W/{COLOR RED}{SHADOW LIGHT_RED}{STR_VAR_1}{COLOR DARK_GREY}{SHADOW LIGHT_GREY} STRAIGHT/{COLOR RED}{SHADOW LIGHT_RED}{STR_VAR_2}"); +const u8 gText_WinsStraight[] = _("W/{COLOR RED}{SHADOW LIGHT_RED}{STR_VAR_1}{COLOR DARK_GREY}{SHADOW LIGHT_GREY} STRAIGHT/{COLOR RED}{SHADOW LIGHT_RED}{STR_VAR_2}"); const u8 gText_BattleTower2[] = _("BATTLE TOWER"); const u8 gText_BattleDome[] = _("BATTLE DOME"); const u8 gText_BattlePalace[] = _("BATTLE PALACE"); |