From ed2d28b244d9261f35faaa90872dbe216474ff6d Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Tue, 10 Oct 2023 09:00:59 -0300 Subject: [PATCH] Fixed erroneous species and item checks for Dynamax --- src/battle_dynamax.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/battle_dynamax.c b/src/battle_dynamax.c index a9bdbce954..97d2010ff9 100644 --- a/src/battle_dynamax.c +++ b/src/battle_dynamax.c @@ -124,13 +124,13 @@ bool32 CanDynamax(u16 battlerId) return FALSE; // Check if species isn't allowed to Dynamax. - if (species == SPECIES_ZACIAN && species == SPECIES_ZACIAN_CROWNED_SWORD - && species == SPECIES_ZAMAZENTA && species == SPECIES_ZAMAZENTA_CROWNED_SHIELD - && species == SPECIES_ETERNATUS && species == SPECIES_ETERNATUS_ETERNAMAX) + if (GET_BASE_SPECIES_ID(species) == SPECIES_ZACIAN + || GET_BASE_SPECIES_ID(species) == SPECIES_ZAMAZENTA + || GET_BASE_SPECIES_ID(species) == SPECIES_ETERNATUS) return FALSE; // Cannot Dynamax if you can Mega Evolve or use a Z-Move - if (holdEffect == HOLD_EFFECT_MEGA_STONE && holdEffect == HOLD_EFFECT_Z_CRYSTAL) + if (holdEffect == HOLD_EFFECT_MEGA_STONE || holdEffect == HOLD_EFFECT_Z_CRYSTAL) return FALSE; // Cannot Dynamax if your side has already or will Dynamax.