ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-20 02:14:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1996 from ghoulslash/pe/evo_weather

Browse Source 
fix EVO_LEVEL_RAIN
This commit is contained in:
ultima-soul 2021-12-16 16:14:08 -08:00 committed by GitHub
commit 5788caef39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pokemon.c
View File

@ -6557,7 +6557,8 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 mode, u16 evolutionItem, u
break;
case EVO_LEVEL_RAIN:
j = GetCurrentWeather();
if (j == WEATHER_RAIN || j == WEATHER_RAIN_THUNDERSTORM || j == WEATHER_DOWNPOUR)
if (gEvolutionTable[species][i].param <= level
&& (j == WEATHER_RAIN || j == WEATHER_RAIN_THUNDERSTORM || j == WEATHER_DOWNPOUR))
targetSpecies = gEvolutionTable[species][i].targetSpecies;
break;
case EVO_MAPSEC: