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/region_map.c | |
| parent | c9632154babc05708d0f2c7ee1f20b2939762ea1 (diff) | |
| parent | b54bd2e387feb7ece4f34f50f17519e329419716 (diff) | |
Merge remote-tracking branch 'origin' into doc_pokesum
Diffstat (limited to 'src/region_map.c')
| -rw-r--r-- | src/region_map.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/region_map.c b/src/region_map.c index c964fcf5a..858c5754d 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -511,9 +511,9 @@ static const struct WindowTemplate sRegionMapWindowTemplates[] = { }, DUMMY_WIN_TEMPLATE }; -ALIGNED(4) const u8 sTextColor_White[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY}; -ALIGNED(4) const u8 sTextColor_Green[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_GREEN, TEXT_COLOR_DARK_GREY}; -ALIGNED(4) const u8 sTextColor_Red[] = {TEXT_COLOR_TRANSPARENT, TEXT_DYNAMIC_COLOR_1, TEXT_COLOR_DARK_GREY}; +ALIGNED(4) const u8 sTextColor_White[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY}; +ALIGNED(4) const u8 sTextColor_Green[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_GREEN, TEXT_COLOR_DARK_GRAY}; +ALIGNED(4) const u8 sTextColor_Red[] = {TEXT_COLOR_TRANSPARENT, TEXT_DYNAMIC_COLOR_1, TEXT_COLOR_DARK_GRAY}; static const u8 *const sTextColorTable[] = { [MAPSECTYPE_VISITED - 2] = sTextColor_Green, @@ -812,7 +812,7 @@ static const u8 sWinRegs[][2] = { {REG_OFFSET_WIN1V, REG_OFFSET_WIN1H} }; -static const u8 sTextColors[] = {TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY}; +static const u8 sTextColors[] = {TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY}; static const u8 *const sMapNames[] = { [MAPSEC_PALLET_TOWN - MAPSECS_KANTO] = gMapSecName_PalletTown, |