summaryrefslogtreecommitdiff
path: root/src/field_weather.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-02-28 10:26:49 -0500
committerGitHub <noreply@github.com>2021-02-28 10:26:49 -0500
commitea748ff7f51a7c119658930f878d046cc8b83c51 (patch)
tree3616ea8ad0a2b3f05482ffd3b9db929a8b5f4573 /src/field_weather.c
parent70c560cc84ec4152438815a7abae673ae6f589f8 (diff)
parent293df1887f4b849e96d06530c722bd39afb7b72b (diff)
Merge pull request #1344 from GriffinRichards/doc-ec
Document easy chat and mail, script.c cleanup, add/use some general constants
Diffstat (limited to 'src/field_weather.c')
-rw-r--r--src/field_weather.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field_weather.c b/src/field_weather.c
index 02e3a0cb0..f60c04e34 100644
--- a/src/field_weather.c
+++ b/src/field_weather.c
@@ -782,7 +782,7 @@ void FadeScreen(u8 mode, s8 delay)
if (useWeatherPal)
CpuFastCopy(gPlttBufferFaded, gPlttBufferUnfaded, 0x400);
- BeginNormalPaletteFade(0xFFFFFFFF, delay, 0, 16, fadeColor);
+ BeginNormalPaletteFade(PALETTES_ALL, delay, 0, 16, fadeColor);
gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_OUT;
}
else
@@ -791,7 +791,7 @@ void FadeScreen(u8 mode, s8 delay)
if (useWeatherPal)
gWeatherPtr->fadeScreenCounter = 0;
else
- BeginNormalPaletteFade(0xFFFFFFFF, delay, 16, 0, fadeColor);
+ BeginNormalPaletteFade(PALETTES_ALL, delay, 16, 0, fadeColor);
gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_IN;
gWeatherPtr->unknown_6CA = 1;