From 5e98891577fbda2223b45f7ac93d2120bccb5f83 Mon Sep 17 00:00:00 2001 From: kittenchilly Date: Sun, 20 Aug 2023 13:24:20 -0500 Subject: [PATCH] Snow doesn't cause shade anymore --- src/field_weather.c | 3 +-- src/field_weather_effect.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/field_weather.c b/src/field_weather.c index a252b17857..045c234acd 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -382,7 +382,6 @@ static void FadeInScreenWithWeather(void) case WEATHER_RAIN: case WEATHER_RAIN_THUNDERSTORM: case WEATHER_DOWNPOUR: - case WEATHER_SNOW: case WEATHER_SHADE: if (FadeInScreen_RainShowShade() == FALSE) { @@ -404,6 +403,7 @@ static void FadeInScreenWithWeather(void) gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE; } break; + case WEATHER_SNOW: case WEATHER_VOLCANIC_ASH: case WEATHER_SANDSTORM: case WEATHER_FOG_DIAGONAL: @@ -774,7 +774,6 @@ void FadeScreen(u8 mode, s8 delay) case WEATHER_RAIN: case WEATHER_RAIN_THUNDERSTORM: case WEATHER_DOWNPOUR: - case WEATHER_SNOW: case WEATHER_FOG_HORIZONTAL: case WEATHER_SHADE: case WEATHER_DROUGHT: diff --git a/src/field_weather_effect.c b/src/field_weather_effect.c index bfd4e325b3..3340334039 100644 --- a/src/field_weather_effect.c +++ b/src/field_weather_effect.c @@ -768,7 +768,7 @@ void Snow_InitVars(void) { gWeatherPtr->initStep = 0; gWeatherPtr->weatherGfxLoaded = FALSE; - gWeatherPtr->targetColorMapIndex = 3; + gWeatherPtr->targetColorMapIndex = 0; gWeatherPtr->colorMapStepDelay = 20; gWeatherPtr->targetSnowflakeSpriteCount = 16; gWeatherPtr->snowflakeVisibleCounter = 0;