diff --git a/src/battle_main.c b/src/battle_main.c index 46a1b547c5..1569f3a3a8 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -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; } - -