diff --git a/src/field_weather.c b/src/field_weather.c index 56cf6505b..5b1caedf9 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -580,7 +580,6 @@ static void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 bl struct RGBColor color1; struct RGBColor color2; u8 r1, g1, b1; - u8 r2, g2, b2; color1 = *(struct RGBColor *)&gPlttBufferUnfaded[palOffset]; r1 = color1.r; @@ -1019,44 +1018,6 @@ bool8 Weather_UpdateBlend(void) return FALSE; } -// Unused. Uses the same numbering scheme as the coord events -static void SetFieldWeather(u8 weather) -{ - switch (weather) - { - case COORD_EVENT_WEATHER_SUNNY_CLOUDS: - SetWeather(WEATHER_SUNNY_CLOUDS); - break; - case COORD_EVENT_WEATHER_SUNNY: - SetWeather(WEATHER_SUNNY); - break; - case COORD_EVENT_WEATHER_RAIN: - SetWeather(WEATHER_RAIN); - break; - case COORD_EVENT_WEATHER_SNOW: - SetWeather(WEATHER_SNOW); - break; - case COORD_EVENT_WEATHER_RAIN_THUNDERSTORM: - SetWeather(WEATHER_RAIN_THUNDERSTORM); - break; - case COORD_EVENT_WEATHER_FOG_HORIZONTAL: - SetWeather(WEATHER_FOG_HORIZONTAL); - break; - case COORD_EVENT_WEATHER_FOG_DIAGONAL: - SetWeather(WEATHER_FOG_DIAGONAL); - break; - case COORD_EVENT_WEATHER_VOLCANIC_ASH: - SetWeather(WEATHER_VOLCANIC_ASH); - break; - case COORD_EVENT_WEATHER_SANDSTORM: - SetWeather(WEATHER_SANDSTORM); - break; - case COORD_EVENT_WEATHER_SHADE: - SetWeather(WEATHER_SHADE); - break; - } -} - u8 GetCurrentWeather(void) { return gWeatherPtr->currWeather; diff --git a/src/field_weather_util.c b/src/field_weather_util.c index abf3c9fec..ae4f7cc4c 100644 --- a/src/field_weather_util.c +++ b/src/field_weather_util.c @@ -31,12 +31,6 @@ void SetWeather(u32 weather) SetNextWeather(GetSav1Weather()); } -void SetWeather_Unused(u32 weather) -{ - SetSavedWeather(weather); - SetCurrentAndNextWeather(GetSav1Weather()); -} - void DoCurrentWeather(void) { u8 weather = GetSav1Weather();