From bef5d98b88cef4138fe83adad0b572f0893f6661 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sat, 18 Mar 2023 09:47:54 -0300 Subject: [PATCH] =?UTF-8?q?Fixed=20Pok=C3=A9mon=20fainting=20in=20the=20Ov?= =?UTF-8?q?erworld=20that=20don't=20have=20that=20specific=20form=20change?= =?UTF-8?q?=20entry?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pokemon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pokemon.c b/src/pokemon.c index e11014120a..62e1891ab6 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -8670,7 +8670,7 @@ bool32 TryFormChange(u32 monId, u32 side, u16 method) targetSpecies = GetFormChangeTargetSpecies(&party[monId], method, 0); - if (targetSpecies == SPECIES_NONE) + if (targetSpecies == SPECIES_NONE && gBattleStruct != NULL) targetSpecies = gBattleStruct->changedSpecies[monId]; if (targetSpecies != SPECIES_NONE)