ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 19:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Snow doesn't cause shade anymore

Browse Source
This commit is contained in:
kittenchilly 2023-08-20 13:24:20 -05:00
parent 0ad3919f22
commit 5e98891577
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/field_weather.c
View File

@ -382,7 +382,6 @@ static void FadeInScreenWithWeather(void)
case WEATHER_RAIN: case WEATHER_RAIN:
case WEATHER_RAIN_THUNDERSTORM: case WEATHER_RAIN_THUNDERSTORM:
case WEATHER_DOWNPOUR: case WEATHER_DOWNPOUR:
case WEATHER_SNOW:
case WEATHER_SHADE: case WEATHER_SHADE:
if (FadeInScreen_RainShowShade() == FALSE) if (FadeInScreen_RainShowShade() == FALSE)
{ {
@ -404,6 +403,7 @@ static void FadeInScreenWithWeather(void)
gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE; gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE;
} }
break; break;
case WEATHER_SNOW:
case WEATHER_VOLCANIC_ASH: case WEATHER_VOLCANIC_ASH:
case WEATHER_SANDSTORM: case WEATHER_SANDSTORM:
case WEATHER_FOG_DIAGONAL: case WEATHER_FOG_DIAGONAL:
@ -774,7 +774,6 @@ void FadeScreen(u8 mode, s8 delay)
case WEATHER_RAIN: case WEATHER_RAIN:
case WEATHER_RAIN_THUNDERSTORM: case WEATHER_RAIN_THUNDERSTORM:
case WEATHER_DOWNPOUR: case WEATHER_DOWNPOUR:
case WEATHER_SNOW:
case WEATHER_FOG_HORIZONTAL: case WEATHER_FOG_HORIZONTAL:
case WEATHER_SHADE: case WEATHER_SHADE:
case WEATHER_DROUGHT: case WEATHER_DROUGHT:

2
src/field_weather_effect.c
View File

@ -768,7 +768,7 @@ void Snow_InitVars(void)
{ {
gWeatherPtr->initStep = 0; gWeatherPtr->initStep = 0;
gWeatherPtr->weatherGfxLoaded = FALSE; gWeatherPtr->weatherGfxLoaded = FALSE;
gWeatherPtr->targetColorMapIndex = 3; gWeatherPtr->targetColorMapIndex = 0;
gWeatherPtr->colorMapStepDelay = 20; gWeatherPtr->colorMapStepDelay = 20;
gWeatherPtr->targetSnowflakeSpriteCount = 16; gWeatherPtr->targetSnowflakeSpriteCount = 16;
gWeatherPtr->snowflakeVisibleCounter = 0; gWeatherPtr->snowflakeVisibleCounter = 0;