diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-06 02:27:58 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-12-06 19:05:28 -0600 |
| commit | efaea2a3ab10523ed1b299d5363922667c809381 (patch) | |
| tree | b97e1b21806b41b7406251cf960943e070d8856d /src | |
| parent | a4191040c97fdd297e00f5fa68a0466e064e9e12 (diff) | |
Revert WEATHER_CLOUDY to WEATHER_SHADE
Diffstat (limited to 'src')
| -rw-r--r-- | src/coord_event_weather.c | 8 | ||||
| -rw-r--r-- | src/field_weather.c | 6 | ||||
| -rw-r--r-- | src/field_weather_effect.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/coord_event_weather.c b/src/coord_event_weather.c index 2c5dbe183..0f9181290 100644 --- a/src/coord_event_weather.c +++ b/src/coord_event_weather.c @@ -18,7 +18,7 @@ static void CoordEventWeather_HorizontalFog(void); static void CoordEventWeather_DiagonalFog(void); static void CoordEventWeather_Ash(void); static void CoordEventWeather_Sandstorm(void); -static void CoordEventWeather_Cloudy(void); +static void CoordEventWeather_Shade(void); static void CoordEventWeather_Drought(void); static void CoordEventWeather_Route119Cycle(void); static void CoordEventWeather_Route123Cycle(void); @@ -34,7 +34,7 @@ static const struct CoordEventWeather sCoordEventWeatherFuncs[] = { COORD_EVENT_WEATHER_FOG_DIAGONAL, CoordEventWeather_DiagonalFog }, { COORD_EVENT_WEATHER_VOLCANIC_ASH, CoordEventWeather_Ash }, { COORD_EVENT_WEATHER_SANDSTORM, CoordEventWeather_Sandstorm }, - { COORD_EVENT_WEATHER_CLOUDY, CoordEventWeather_Cloudy }, + { COORD_EVENT_WEATHER_SHADE, CoordEventWeather_Shade }, { COORD_EVENT_WEATHER_DROUGHT, CoordEventWeather_Drought }, { COORD_EVENT_WEATHER_ROUTE119_CYCLE, CoordEventWeather_Route119Cycle }, { COORD_EVENT_WEATHER_ROUTE123_CYCLE, CoordEventWeather_Route123Cycle }, @@ -85,9 +85,9 @@ static void CoordEventWeather_Sandstorm(void) SetWeather(WEATHER_SANDSTORM); } -static void CoordEventWeather_Cloudy(void) +static void CoordEventWeather_Shade(void) { - SetWeather(WEATHER_CLOUDY); + SetWeather(WEATHER_SHADE); } static void CoordEventWeather_Drought(void) diff --git a/src/field_weather.c b/src/field_weather.c index 7fe929bf3..352571dfc 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -375,7 +375,7 @@ static void FadeInScreenWithWeather(void) case WEATHER_RAIN_THUNDERSTORM: case WEATHER_DOWNPOUR: case WEATHER_SNOW: - case WEATHER_CLOUDY: + case WEATHER_SHADE: if (FadeInScreen_RainShowShade() == FALSE) { gWeatherPtr->gammaIndex = 3; @@ -768,7 +768,7 @@ void FadeScreen(u8 mode, s8 delay) case WEATHER_DOWNPOUR: case WEATHER_SNOW: case WEATHER_FOG_HORIZONTAL: - case WEATHER_CLOUDY: + case WEATHER_SHADE: case WEATHER_DROUGHT: useWeatherPal = TRUE; break; @@ -1022,7 +1022,7 @@ void sub_80AC274(u8 a) SetWeather(WEATHER_SANDSTORM); break; case 10: - SetWeather(WEATHER_CLOUDY); + SetWeather(WEATHER_SHADE); break; } } diff --git a/src/field_weather_effect.c b/src/field_weather_effect.c index 540541406..bb4eccec2 100644 --- a/src/field_weather_effect.c +++ b/src/field_weather_effect.c @@ -2558,7 +2558,7 @@ static u8 TranslateWeatherNum(u8 weather) case WEATHER_SANDSTORM: return WEATHER_SANDSTORM; case WEATHER_FOG_DIAGONAL: return WEATHER_FOG_DIAGONAL; case WEATHER_UNDERWATER: return WEATHER_UNDERWATER; - case WEATHER_CLOUDY: return WEATHER_CLOUDY; + case WEATHER_SHADE: return WEATHER_SHADE; case WEATHER_DROUGHT: return WEATHER_DROUGHT; case WEATHER_DOWNPOUR: return WEATHER_DOWNPOUR; case WEATHER_UNDERWATER_BUBBLES: return WEATHER_UNDERWATER_BUBBLES; |