From 41583673a55acd5b665fb0a3605df14109ca19d3 Mon Sep 17 00:00:00 2001
From: ghoulslash <41651341+ghoulslash@users.noreply.github.com>
Date: Wed, 26 Jun 2024 04:41:14 -0400
Subject: [PATCH] Zero Enemy Data at end of battles (#4867)

* zero enemy data in FreeResetData_ReturnToOvOrDoEvolutions

* only run through FreeBattleResources once at end of battle in FreeResetData_ReturnToOvOrDoEvolutions

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
---
 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 e9c18be505..97123470f0 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -5526,8 +5526,9 @@ static void FreeResetData_ReturnToOvOrDoEvolutions(void)
     }
 
     FreeAllWindowBuffers();
-    if (!(gBattleTypeFlags & BATTLE_TYPE_LINK))
+    if (gBattleStruct != NULL && !(gBattleTypeFlags & BATTLE_TYPE_LINK))
     {
+        ZeroEnemyPartyMons();
         FreeMonSpritesGfx();
         FreeBattleResources();
         FreeBattleSpritesData();