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

Fix Forecast and Flower Gift corruption (#7796)

Browse Source
This commit is contained in:
Bassoonian 2025-09-25 16:03:17 +02:00 committed by GitHub
parent 2f69b44f81
commit d1bd4edc57
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle_script_commands.c
View File

@ -15194,7 +15194,7 @@ void BS_ItemRestorePP(void)
void BS_TryRevertWeatherForm(void)
{
NATIVE_ARGS();
if (TryBattleFormChange(gBattlerTarget, FORM_CHANGE_BATTLE_WEATHER))
if (IsBattlerAlive(gBattlerTarget) && TryBattleFormChange(gBattlerTarget, FORM_CHANGE_BATTLE_WEATHER))
{
gBattleScripting.battler = gBattlerTarget;
BattleScriptPush(cmd->nextInstr);

26
test/battle/form_change/faint.c
View File

@ -3,8 +3,9 @@
SINGLE_BATTLE_TEST("Aegislash reverts to Shield Form upon fainting")
{
KNOWN_FAILING;
GIVEN {
PLAYER(SPECIES_AEGISLASH_SHIELD) { HP(1); }
PLAYER(SPECIES_AEGISLASH_BLADE) { HP(1); }
PLAYER(SPECIES_WOBBUFFET);
OPPONENT(SPECIES_WOBBUFFET);
} WHEN {
@ -16,3 +17,26 @@ SINGLE_BATTLE_TEST("Aegislash reverts to Shield Form upon fainting")
EXPECT_EQ(GetMonData(&PLAYER_PARTY[0], MON_DATA_SPECIES), SPECIES_AEGISLASH_SHIELD);
}
}
DOUBLE_BATTLE_TEST("Causing a Forecast or Flower Gift Pokémon to faint should not cause a message") // issue 7795
{
u32 species;
PARAMETRIZE { species = SPECIES_CASTFORM; }
PARAMETRIZE { species = SPECIES_CHERRIM; }
GIVEN {
PLAYER(SPECIES_WYNAUT);
PLAYER(SPECIES_WOBBUFFET);
OPPONENT(SPECIES_VULPIX) { Ability(ABILITY_DROUGHT); }
OPPONENT(species) { HP(1); }
} WHEN {
TURN { MOVE(playerRight, MOVE_GYRO_BALL, target: opponentRight); }
} SCENE {
if (species == SPECIES_CASTFORM) {
MESSAGE("The opposing Castform fainted!");
NOT MESSAGE("The opposing Castform transformed!");
} else {
MESSAGE("The opposing Cherrim fainted!");
NOT MESSAGE("The opposing Cherrim transformed!");
}
}
}