From d8d00ba96746c0860066f482d0c910579de60ee9 Mon Sep 17 00:00:00 2001 From: Evan Date: Thu, 21 Jan 2021 21:28:19 -0700 Subject: [PATCH] fix orb check --- src/battle_util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/battle_util.c b/src/battle_util.c index 8ab69f4b5..8f1fe3c24 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -7857,9 +7857,9 @@ bool32 CanBattlerGetOrLoseItem(u8 battlerId, u16 itemId) // Mail can be stolen now if (itemId == ITEM_ENIGMA_BERRY) return FALSE; - else if (GET_BASE_SPECIES_ID(species) == SPECIES_KYOGRE && (itemId == ITEM_BLUE_ORB || holdEffect == HOLD_EFFECT_PRIMAL_ORB)) + else if (GET_BASE_SPECIES_ID(species) == SPECIES_KYOGRE && itemId == ITEM_BLUE_ORB) // includes primal return FALSE; - else if (GET_BASE_SPECIES_ID(species) == SPECIES_GROUDON && (itemId == ITEM_BLUE_ORB || holdEffect == HOLD_EFFECT_PRIMAL_ORB)) + else if (GET_BASE_SPECIES_ID(species) == SPECIES_GROUDON && itemId == ITEM_RED_ORB) // includes primal return FALSE; // Mega stone cannot be lost if pokemon can mega evolve with it or is already mega evolved. else if (holdEffect == HOLD_EFFECT_MEGA_STONE