From bb9fb72436ad9615de806f9381d8ad65a42ea9ea Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Tue, 14 Dec 2021 13:56:25 -0500 Subject: [PATCH 1/2] fix evo_level_rain --- src/pokemon.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pokemon.c b/src/pokemon.c index eb4ec02d5..0767af63f 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -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: From f0ffc749e9e7cca978105c3f554e22d7cfc7d537 Mon Sep 17 00:00:00 2001 From: ultima-soul <33333039+ultima-soul@users.noreply.github.com> Date: Thu, 16 Dec 2021 16:05:51 -0800 Subject: [PATCH 2/2] Fix formatting for EVO_LEVEL_RAIN checks. --- src/pokemon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pokemon.c b/src/pokemon.c index 0767af63f..0b1b97d15 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -6558,7 +6558,7 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 mode, u16 evolutionItem, u case EVO_LEVEL_RAIN: j = GetCurrentWeather(); if (gEvolutionTable[species][i].param <= level - && (j == WEATHER_RAIN || j == WEATHER_RAIN_THUNDERSTORM || j == WEATHER_DOWNPOUR)) + && (j == WEATHER_RAIN || j == WEATHER_RAIN_THUNDERSTORM || j == WEATHER_DOWNPOUR)) targetSpecies = gEvolutionTable[species][i].targetSpecies; break; case EVO_MAPSEC: