ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-20 19:23:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2079 from LOuroboros/patch-4

Browse Source 
Fix Enigma Berry check in CanMegaEvolve
This commit is contained in:
Eduardo Quezada D'Ottone 2022-03-20 18:57:09 -03:00 committed by GitHub
commit f371288bc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/battle_util.c
View File

@ -9333,8 +9333,13 @@ bool32 CanMegaEvolve(u8 battlerId)
{
if (B_ENABLE_DEBUG && gBattleStruct->debugHoldEffects[battlerId])
holdEffect = gBattleStruct->debugHoldEffects[battlerId];
#ifdef ITEM_EXPANSION
else if (itemId == ITEM_ENIGMA_BERRY_E_READER)
holdEffect = gEnigmaBerries[battlerId].holdEffect;
#else
else if (itemId == ITEM_ENIGMA_BERRY)
holdEffect = gEnigmaBerries[battlerId].holdEffect;
#endif
else
holdEffect = ItemId_GetHoldEffect(itemId);