Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed softlock w/ weather-triggered form changes & Cloud Nine (#4382)

Browse Source 
* Fixed softlock when weather-triggered form changes are suppressed by Cloud Nine

* Removed KNOWN_FAILING; line from Castform Air Lock test
This commit is contained in:
skolgrahd 2024-04-13 13:19:14 -04:00 committed by GitHub
parent a0a5ba4af2
commit 3b17ce39f7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/battle_util.c
View File

@ -10454,7 +10454,8 @@ u16 GetBattleFormChangeTargetSpecies(u32 battler, u16 method)
targetSpecies = formChanges[i].targetSpecies; targetSpecies = formChanges[i].targetSpecies;
} }
// Otherwise, just check for a match between the weather and the form change table. // Otherwise, just check for a match between the weather and the form change table.
else if (gBattleWeather & formChanges[i].param1 // Added a check for whether the weather is in effect to prevent end-of-turn soft locks with Cloud Nine / Air Lock
else if (((gBattleWeather & formChanges[i].param1) && WEATHER_HAS_EFFECT)
|| (gBattleWeather == B_WEATHER_NONE && formChanges[i].param1 == B_WEATHER_NONE)) || (gBattleWeather == B_WEATHER_NONE && formChanges[i].param1 == B_WEATHER_NONE))
{ {
targetSpecies = formChanges[i].targetSpecies; targetSpecies = formChanges[i].targetSpecies;

1
test/battle/ability/forecast.c
View File

@ -266,7 +266,6 @@ SINGLE_BATTLE_TEST("Forecast transforms Castform back to normal when Sandstorm i
SINGLE_BATTLE_TEST("Forecast transforms Castform back to normal under Air Lock") SINGLE_BATTLE_TEST("Forecast transforms Castform back to normal under Air Lock")
{ {
KNOWN_FAILING;
GIVEN { GIVEN {
PLAYER(SPECIES_CASTFORM_NORMAL) { Ability(ABILITY_FORECAST); } PLAYER(SPECIES_CASTFORM_NORMAL) { Ability(ABILITY_FORECAST); }
OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET);