diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2021-07-02 12:53:12 -0400 |
|---|---|---|
| committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2021-07-02 12:53:12 -0400 |
| commit | b3d66f5528ccfc8b8a3f6c0d46444ad5943364f4 (patch) | |
| tree | 9917de58912d28e884871cb7efc5b4d291ec4e78 /src/strings.c | |
| parent | 9fd27fe8552eb0716222e72bc92ffa7f7334c68d (diff) | |
| parent | 3964820a84e4819bb807d601d2c3c7b196f764e8 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald
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 18cf31fb7..4987e32d2 100644 --- a/src/strings.c +++ b/src/strings.c @@ -1229,7 +1229,7 @@ ALIGNED(4) const u8 gText_Facility[] = _("{STR_VAR_1}"); const u8 gText_Give[] = _("Give"); const u8 gText_NoNeed[] = _("No need"); -const u8 gText_ColorLightShadowDarkGrey[] = _("{COLOR LIGHT_GRAY}{SHADOW DARK_GRAY}"); +const u8 gText_ColorLightShadowDarkGray[] = _("{COLOR LIGHT_GRAY}{SHADOW DARK_GRAY}"); const u8 gText_ColorBlue[] = _("{COLOR BLUE}"); const u8 gText_ColorTransparent[] = _("{HIGHLIGHT TRANSPARENT}{COLOR TRANSPARENT}"); const u8 gText_CDot[] = _("C."); @@ -1239,9 +1239,9 @@ const u8 gText_PreliminaryResults[] = _("The preliminary results!"); const u8 gText_Round2Results[] = _("Round 2 results!"); const u8 gText_ContestantsMonWon[] = _("{STR_VAR_1}'s {STR_VAR_2} won!"); const u8 gText_CommunicationStandby[] = _("Communication standby…"); -const u8 gText_ColorDarkGrey[] = _("{COLOR DARK_GRAY}"); +const u8 gText_ColorDarkGray[] = _("{COLOR DARK_GRAY}"); const u8 gText_ColorDynamic6WhiteDynamic5[] = _("{COLOR_HIGHLIGHT_SHADOW DYNAMIC_COLOR6 WHITE DYNAMIC_COLOR5}"); // Unused -const u8 gText_HighlightDarkGrey[] = _("{HIGHLIGHT DARK_GRAY}"); +const u8 gText_HighlightDarkGray[] = _("{HIGHLIGHT DARK_GRAY}"); const u8 gText_EmptySpace2[] = _(" "); // Unused const u8 gText_DynColor2Male[] = _("{COLOR DYNAMIC_COLOR2}♂"); const u8 gText_DynColor1Female[] = _("{COLOR DYNAMIC_COLOR1}♀"); |