dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

standardize "grey" to "gray"

Browse Source
This commit is contained in:
Kurausukun
2021-04-09 22:34:08 -04:00
parent 52c25bac8e
commit 4b182affb6
35 changed files with 201 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/berry_crush.c
+6 -6
View File
@@ -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;