From 9a195c0fef7a47e5ab55c7047d80969c9cd6e44e Mon Sep 17 00:00:00 2001
From: gAlfonso-bit <83477269+gAlfonso-bit@users.noreply.github.com>
Date: Wed, 12 May 2021 15:23:14 -0400
Subject: [PATCH] Cherry-pick roamer bug fix from pokefirered

Adapted https://github.com/pret/pokefirered/blob/master/src/battle_main.c#L3831 to pokeemerald
---
 src/battle_main.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/battle_main.c b/src/battle_main.c
index c74de896e6..001e2ec17c 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -5148,7 +5148,12 @@ static void ReturnFromBattleToOverworld(void)
     if (gBattleTypeFlags & BATTLE_TYPE_ROAMER)
     {
         UpdateRoamerHPStatus(&gEnemyParty[0]);
+
+#ifndef BUGFIX
         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.
             SetRoamerInactive();
     }