diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-11-26 23:33:31 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-11-26 23:33:31 -0600 |
| commit | 5d74d11d3e3047b4b53153365325db9e6999c627 (patch) | |
| tree | f15fe9425296d4f95d0cd7190d6f19f852fbfe93 /src/strings.c | |
| parent | 48ec0941b4ebbe78fe70ef93d205ce52d2de89b2 (diff) | |
| parent | e6500d12a21e9833e08ad25cc6a76b075cff42dd (diff) | |
fix merge conflicts
Diffstat (limited to 'src/strings.c')
| -rw-r--r-- | src/strings.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/strings.c b/src/strings.c index 6c8dce9d6..06bbadb8f 100644 --- a/src/strings.c +++ b/src/strings.c @@ -409,7 +409,7 @@ const u8 OtherText_Switch[] = _("SWITCH"); const u8 OtherText_PokeInfo[] = _("POKéMON INFO"); const u8 OtherText_PokeSkills[] = _("POKéMON SKILLS"); const u8 OtherText_BattleMoves[] = _("BATTLE MOVES"); -const u8 OtherText_ContestMoves[] = _("C0NTEST MOVES"); // why the l33t 0, that's stupid +const u8 OtherText_ContestMoves[] = _("C0NTEST MOVES"); // The "O" in "CONTEST" is actually a 0. const u8 OtherText_Info[] = _("INFO"); const u8 gOtherText_EggLongTime[] = _("It looks like this EGG will\ntake a long time to hatch."); |