From ce99d6e75c66a385dc1a7a6f5634cb9faed5a96f Mon Sep 17 00:00:00 2001
From: Dana Yatsuta <danayatsuta@gmail.com>
Date: Wed, 5 Mar 2025 15:44:11 +0300
Subject: [PATCH] Fix roamers having 0 hp on repeat encounters (#6366)

---
 src/battle_main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/battle_main.c b/src/battle_main.c
index c2779e2b9a..03c58f8bf4 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -5668,7 +5668,7 @@ static void FreeResetData_ReturnToOvOrDoEvolutions(void)
     {
         // To account for Battle Factory and Slateport Battle Tent, enemy parties are zeroed out in the facilitites respective src/xxx.c files
         // The ZeroEnemyPartyMons() call happens in SaveXXXChallenge function (eg. SaveFactoryChallenge)
-        if (!(gBattleTypeFlags & BATTLE_TYPE_FRONTIER))
+        if (!(gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_ROAMER)))
         {
             ZeroEnemyPartyMons();
         }
@@ -5741,6 +5741,7 @@ static void ReturnFromBattleToOverworld(void)
     if (gBattleTypeFlags & BATTLE_TYPE_ROAMER)
     {
         UpdateRoamerHPStatus(&gEnemyParty[0]);
+        ZeroEnemyPartyMons();
 
 #ifndef BUGFIX
         if ((gBattleOutcome & B_OUTCOME_WON) || gBattleOutcome == B_OUTCOME_CAUGHT)