From 284e46927a3584ec6ffdc0be61f237fee3773b6a Mon Sep 17 00:00:00 2001
From: sphericalice <sphericalice@outlook.com>
Date: Fri, 3 Jun 2022 15:56:11 +0100
Subject: [PATCH] Use the FREE_AND_SET_NULL macro where appropriate

---
 src/battle_anim_utility_funcs.c | 3 +--
 src/battle_main.c               | 9 +++------
 src/evolution_scene.c           | 6 ++----
 src/mystery_gift_client.c       | 3 +--
 src/mystery_gift_server.c       | 3 +--
 src/mystery_gift_view.c         | 6 ++----
 6 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c
index e2c674c57f..aae8d6b5d8 100644
--- a/src/battle_anim_utility_funcs.c
+++ b/src/battle_anim_utility_funcs.c
@@ -594,8 +594,7 @@ static void StatsChangeAnimation_Step3(u8 taskId)
         if (gTasks[taskId].data[6] == 1)
             gSprites[gTasks[taskId].data[7]].oam.priority++;
 
-        Free(sAnimStatsChangeData);
-        sAnimStatsChangeData = NULL;
+        FREE_AND_SET_NULL(sAnimStatsChangeData);
         DestroyAnimVisualTask(taskId);
         break;
     }
diff --git a/src/battle_main.c b/src/battle_main.c
index 682849af73..f61d5eaae0 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -1498,8 +1498,7 @@ static void CB2_PreInitMultiBattle(void)
                 gBattleTypeFlags = *savedBattleTypeFlags;
                 gMain.savedCallback = *savedCallback;
                 SetMainCallback2(CB2_InitBattleInternal);
-                Free(sMultiPartnerPartyBuffer);
-                sMultiPartnerPartyBuffer = NULL;
+                FREE_AND_SET_NULL(sMultiPartnerPartyBuffer);
             }
         }
         else if (gReceivedRemoteLinkPlayers == 0)
@@ -1507,8 +1506,7 @@ static void CB2_PreInitMultiBattle(void)
             gBattleTypeFlags = *savedBattleTypeFlags;
             gMain.savedCallback = *savedCallback;
             SetMainCallback2(CB2_InitBattleInternal);
-            Free(sMultiPartnerPartyBuffer);
-            sMultiPartnerPartyBuffer = NULL;
+            FREE_AND_SET_NULL(sMultiPartnerPartyBuffer);
         }
         break;
     }
@@ -1544,8 +1542,7 @@ static void CB2_PreInitIngamePlayerPartnerBattle(void)
             gBattleTypeFlags = *savedBattleTypeFlags;
             gMain.savedCallback = *savedCallback;
             SetMainCallback2(CB2_InitBattleInternal);
-            Free(sMultiPartnerPartyBuffer);
-            sMultiPartnerPartyBuffer = NULL;
+            FREE_AND_SET_NULL(sMultiPartnerPartyBuffer);
         }
         break;
     }
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index bde11ddb5e..eb458d39d4 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -816,8 +816,7 @@ static void Task_EvolutionScene(u8 taskId)
 
             DestroyTask(taskId);
             FreeMonSpritesGfx();
-            Free(sEvoStructPtr);
-            sEvoStructPtr = NULL;
+            FREE_AND_SET_NULL(sEvoStructPtr);
             FreeAllWindowBuffers();
             SetMainCallback2(gCB2_AfterEvolution);
         }
@@ -1223,8 +1222,7 @@ static void Task_TradeEvolutionScene(u8 taskId)
         if (!IsTextPrinterActive(0))
         {
             DestroyTask(taskId);
-            Free(sEvoStructPtr);
-            sEvoStructPtr = NULL;
+            FREE_AND_SET_NULL(sEvoStructPtr);
             gTextFlags.useAlternateDownArrow = 0;
             SetMainCallback2(gCB2_AfterEvolution);
         }
diff --git a/src/mystery_gift_client.c b/src/mystery_gift_client.c
index adf3ce8a62..eeebec5d68 100644
--- a/src/mystery_gift_client.c
+++ b/src/mystery_gift_client.c
@@ -44,8 +44,7 @@ u32 MysteryGiftClient_Run(u16 * endVal)
     {
         *endVal = sClient->param;
         MysteryGiftClient_Free(sClient);
-        Free(sClient);
-        sClient = NULL;
+        FREE_AND_SET_NULL(sClient);
     }
     return result;
 }
diff --git a/src/mystery_gift_server.c b/src/mystery_gift_server.c
index 0e0acb6428..891870659d 100644
--- a/src/mystery_gift_server.c
+++ b/src/mystery_gift_server.c
@@ -44,8 +44,7 @@ u32 MysterGiftServer_Run(u16 * endVal)
     {
         *endVal = sServer->param;
         MysteryGiftServer_Free(sServer);
-        Free(sServer);
-        sServer = NULL;
+        FREE_AND_SET_NULL(sServer);
     }
     return result;
 }
diff --git a/src/mystery_gift_view.c b/src/mystery_gift_view.c
index 3047a219e8..ff34c88536 100644
--- a/src/mystery_gift_view.c
+++ b/src/mystery_gift_view.c
@@ -207,8 +207,7 @@ void WonderCard_Destroy(void)
     if (sWonderCardData != NULL)
     {
         *sWonderCardData = (struct WonderCardData){};
-        Free(sWonderCardData);
-        sWonderCardData = NULL;
+        FREE_AND_SET_NULL(sWonderCardData);
     }
 }
 
@@ -660,8 +659,7 @@ void WonderNews_Destroy(void)
     if (sWonderNewsData != NULL)
     {
         *sWonderNewsData = (struct WonderNewsData){};
-        Free(sWonderNewsData);
-        sWonderNewsData = NULL;
+        FREE_AND_SET_NULL(sWonderNewsData);
     }
 }