atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow evolution after exp from mon catching

Browse source
This commit is contained in:
DizzyEggg 2019-07-08 13:26:21 +02:00
parent d1fa9c24cc
commit d3d9051c4a
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/battle_main.c
View file

@ -4887,14 +4887,14 @@ static void FreeResetData_ReturnToOvOrDoEvolutions(void)
if (!gPaletteFade.active)
{
ResetSpriteData();
if (gLeveledUpInBattle == 0 || gBattleOutcome != B_OUTCOME_WON)
if (gLeveledUpInBattle && (gBattleOutcome == B_OUTCOME_WON || gBattleOutcome == B_OUTCOME_CAUGHT))
{
gBattleMainFunc = ReturnFromBattleToOverworld;
return;
gBattleMainFunc = TryEvolvePokemon;
}
else
{
gBattleMainFunc = TryEvolvePokemon;
gBattleMainFunc = ReturnFromBattleToOverworld;
return;
}
}
@ -5724,5 +5724,3 @@ static void HandleAction_ActionFinished(void)
gBattleScripting.multihitMoveEffect = 0;
gBattleResources->battleScriptsStack->size = 0;
}