diff --git a/src/battle_main.c b/src/battle_main.c index ed50332bb8..27314c256e 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -5234,10 +5234,13 @@ static void ReturnFromBattleToOverworld(void) UpdateRoamerHPStatus(&gEnemyParty[0]); #ifndef BUGFIX + // Bug: When Roar is used by a roamer, gBattleOutcome is B_OUTCOME_PLAYER_TELEPORTED (5), + // which deactivates the roamer. if ((gBattleOutcome & B_OUTCOME_WON) || gBattleOutcome == B_OUTCOME_CAUGHT) #else - if ((gBattleOutcome == B_OUTCOME_WON) || gBattleOutcome == B_OUTCOME_CAUGHT) // Bug: When Roar is used by roamer, gBattleOutcome is B_OUTCOME_PLAYER_TELEPORTED (5). -#endif // & with B_OUTCOME_WON (1) will return TRUE and deactivates the roamer. + if ((gBattleOutcome == B_OUTCOME_WON) || gBattleOutcome == B_OUTCOME_CAUGHT || + gBattleOutcome == B_OUTCOME_DREW) +#endif SetRoamerInactive(); }