diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-04-12 16:18:38 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-04-12 16:18:38 -0400 |
| commit | 03b4ea32a9af67e6afb954cc44ff0c2768b86091 (patch) | |
| tree | 0371bfddb0f099e447cd6cdb3a23192993162535 /src/berry_crush.c | |
| parent | c9632154babc05708d0f2c7ee1f20b2939762ea1 (diff) | |
| parent | b54bd2e387feb7ece4f34f50f17519e329419716 (diff) | |
Merge remote-tracking branch 'origin' into doc_pokesum
Diffstat (limited to 'src/berry_crush.c')
| -rw-r--r-- | src/berry_crush.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/berry_crush.c b/src/berry_crush.c index 87888756e..05be05802 100644 --- a/src/berry_crush.c +++ b/src/berry_crush.c @@ -400,15 +400,15 @@ static const struct BgTemplate sBgTemplates[] = { static const u8 sBerryCrushTextColorTable[][3] = { { TEXT_COLOR_WHITE, - TEXT_COLOR_DARK_GREY, - TEXT_COLOR_LIGHT_GREY + TEXT_COLOR_DARK_GRAY, + TEXT_COLOR_LIGHT_GRAY }, { TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, - TEXT_COLOR_DARK_GREY + TEXT_COLOR_DARK_GRAY }, { TEXT_COLOR_TRANSPARENT, - TEXT_COLOR_LIGHT_GREY, + TEXT_COLOR_LIGHT_GRAY, TEXT_COLOR_RED }, { TEXT_COLOR_WHITE, @@ -1091,11 +1091,11 @@ static u32 BerryCrushCommand_PrintMessage(struct BerryCrushGame * game, u8 *para if (params[1] & 2) { StringExpandPlaceholders(gStringVar4, sBerryCrushMessages[params[0]]); - AddTextPrinterParameterized2(0, 2, gStringVar4, game->textSpeed, 0, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); + AddTextPrinterParameterized2(0, 2, gStringVar4, game->textSpeed, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); } else { - AddTextPrinterParameterized2(0, 2, sBerryCrushMessages[params[0]], game->textSpeed, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); + AddTextPrinterParameterized2(0, 2, sBerryCrushMessages[params[0]], game->textSpeed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); } CopyWindowToVram(0, COPYWIN_BOTH); break; @@ -2695,7 +2695,7 @@ static void PrintBerryCrushResultWindow(struct BerryCrushGame * game, u8 command break; } if (linkPlayerId == game->localId) - StringCopy(gStringVar3, gText_1_ClrLtGryShdwBlk_Dynamic0); + StringCopy(gStringVar3, gText_1_ClrBluShdwLtBlu_Dynamic0); else StringCopy(gStringVar3, gText_1_Dynamic0); gStringVar3[0] = linkIdToPrint + CHAR_1; |