ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-04 18:30:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1673 from sphericalice/try-free-and-set-null

Browse Source 
Use the TRY_FREE_AND_SET_NULL macro where appropriate
This commit is contained in:
GriffinR 2022-06-03 11:07:38 -04:00 committed by GitHub
commit 817fcb1c34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 34 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/battle_anim_utility_funcs.c
View File

@ -594,8 +594,7 @@ static void StatsChangeAnimation_Step3(u8 taskId)
if (gTasks[taskId].data[6] == 1) if (gTasks[taskId].data[6] == 1)
gSprites[gTasks[taskId].data[7]].oam.priority++; gSprites[gTasks[taskId].data[7]].oam.priority++;
Free(sAnimStatsChangeData); FREE_AND_SET_NULL(sAnimStatsChangeData);
sAnimStatsChangeData = NULL;
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
break; break;
} }

3
src/battle_factory_screen.c
View File

@ -1131,8 +1131,7 @@ static void CB2_InitSelectScreen(void)
switch (gMain.state) switch (gMain.state)
{ {
case 0: case 0:
if (sFactorySelectMons != NULL) TRY_FREE_AND_SET_NULL(sFactorySelectMons);
FREE_AND_SET_NULL(sFactorySelectMons);
SetHBlankCallback(NULL); SetHBlankCallback(NULL);
SetVBlankCallback(NULL); SetVBlankCallback(NULL);
CpuFill32(0, (void *)VRAM, VRAM_SIZE); CpuFill32(0, (void *)VRAM, VRAM_SIZE);

9
src/battle_main.c
View File

@ -1498,8 +1498,7 @@ static void CB2_PreInitMultiBattle(void)
gBattleTypeFlags = *savedBattleTypeFlags; gBattleTypeFlags = *savedBattleTypeFlags;
gMain.savedCallback = *savedCallback; gMain.savedCallback = *savedCallback;
SetMainCallback2(CB2_InitBattleInternal); SetMainCallback2(CB2_InitBattleInternal);
Free(sMultiPartnerPartyBuffer); FREE_AND_SET_NULL(sMultiPartnerPartyBuffer);
sMultiPartnerPartyBuffer = NULL;
} }
} }
else if (gReceivedRemoteLinkPlayers == 0) else if (gReceivedRemoteLinkPlayers == 0)
@ -1507,8 +1506,7 @@ static void CB2_PreInitMultiBattle(void)
gBattleTypeFlags = *savedBattleTypeFlags; gBattleTypeFlags = *savedBattleTypeFlags;
gMain.savedCallback = *savedCallback; gMain.savedCallback = *savedCallback;
SetMainCallback2(CB2_InitBattleInternal); SetMainCallback2(CB2_InitBattleInternal);
Free(sMultiPartnerPartyBuffer); FREE_AND_SET_NULL(sMultiPartnerPartyBuffer);
sMultiPartnerPartyBuffer = NULL;
} }
break; break;
} }
@ -1544,8 +1542,7 @@ static void CB2_PreInitIngamePlayerPartnerBattle(void)
gBattleTypeFlags = *savedBattleTypeFlags; gBattleTypeFlags = *savedBattleTypeFlags;
gMain.savedCallback = *savedCallback; gMain.savedCallback = *savedCallback;
SetMainCallback2(CB2_InitBattleInternal); SetMainCallback2(CB2_InitBattleInternal);
Free(sMultiPartnerPartyBuffer); FREE_AND_SET_NULL(sMultiPartnerPartyBuffer);
sMultiPartnerPartyBuffer = NULL;
} }
break; break;
} }

9
src/easy_chat.c
View File

@ -1672,8 +1672,7 @@ static bool8 InitEasyChatScreenStruct(u8 type, u16 *words, u8 displayedPersonTyp
static void FreeEasyChatScreenStruct(void) static void FreeEasyChatScreenStruct(void)
{ {
if (sEasyChatScreen != NULL) TRY_FREE_AND_SET_NULL(sEasyChatScreen);
FREE_AND_SET_NULL(sEasyChatScreen);
} }
// Returns the function ID of the action to take as a result of player's input. // Returns the function ID of the action to take as a result of player's input.
@ -3075,8 +3074,7 @@ static bool8 LoadEasyChatScreen(void)
static void FreeEasyChatScreenControl(void) static void FreeEasyChatScreenControl(void)
{ {
if (sScreenControl) TRY_FREE_AND_SET_NULL(sScreenControl);
FREE_AND_SET_NULL(sScreenControl);
} }
static void StartEasyChatFunction(u16 funcId) static void StartEasyChatFunction(u16 funcId)
@ -5573,8 +5571,7 @@ static bool8 InitEasyChatScreenWordData(void)
static void FreeEasyChatScreenWordData(void) static void FreeEasyChatScreenWordData(void)
{ {
if (sWordData) TRY_FREE_AND_SET_NULL(sWordData);
FREE_AND_SET_NULL(sWordData);
} }
static void SetUnlockedEasyChatGroups(void) static void SetUnlockedEasyChatGroups(void)

6
src/evolution_scene.c
View File

@ -816,8 +816,7 @@ static void Task_EvolutionScene(u8 taskId)
DestroyTask(taskId); DestroyTask(taskId);
FreeMonSpritesGfx(); FreeMonSpritesGfx();
Free(sEvoStructPtr); FREE_AND_SET_NULL(sEvoStructPtr);
sEvoStructPtr = NULL;
FreeAllWindowBuffers(); FreeAllWindowBuffers();
SetMainCallback2(gCB2_AfterEvolution); SetMainCallback2(gCB2_AfterEvolution);
} }
@ -1223,8 +1222,7 @@ static void Task_TradeEvolutionScene(u8 taskId)
if (!IsTextPrinterActive(0)) if (!IsTextPrinterActive(0))
{ {
DestroyTask(taskId); DestroyTask(taskId);
Free(sEvoStructPtr); FREE_AND_SET_NULL(sEvoStructPtr);
sEvoStructPtr = NULL;
gTextFlags.useAlternateDownArrow = 0; gTextFlags.useAlternateDownArrow = 0;
SetMainCallback2(gCB2_AfterEvolution); SetMainCallback2(gCB2_AfterEvolution);
} }

5
src/field_region_map.c
View File

@ -192,10 +192,7 @@ static void FieldUpdateRegionMap(void)
{ {
FreeRegionMapIconResources(); FreeRegionMapIconResources();
SetMainCallback2(sFieldRegionMapHandler->callback); SetMainCallback2(sFieldRegionMapHandler->callback);
if (sFieldRegionMapHandler != NULL) TRY_FREE_AND_SET_NULL(sFieldRegionMapHandler);
{
FREE_AND_SET_NULL(sFieldRegionMapHandler);
}
FreeAllWindowBuffers(); FreeAllWindowBuffers();
} }
break; break;

18
src/hall_of_fame.c
View File

@ -529,10 +529,8 @@ static void Task_Hof_TrySaveData(u8 taskId)
UnsetBgTilemapBuffer(3); UnsetBgTilemapBuffer(3);
FreeAllWindowBuffers(); FreeAllWindowBuffers();
if (sHofGfxPtr != NULL) TRY_FREE_AND_SET_NULL(sHofGfxPtr);
FREE_AND_SET_NULL(sHofGfxPtr); TRY_FREE_AND_SET_NULL(sHofMonPtr);
if (sHofMonPtr != NULL)
FREE_AND_SET_NULL(sHofMonPtr);
DestroyTask(taskId); DestroyTask(taskId);
} }
@ -773,10 +771,8 @@ static void Task_Hof_HandleExit(u8 taskId)
ResetBgsAndClearDma3BusyFlags(0); ResetBgsAndClearDma3BusyFlags(0);
DestroyTask(taskId); DestroyTask(taskId);
if (sHofGfxPtr != NULL) TRY_FREE_AND_SET_NULL(sHofGfxPtr);
FREE_AND_SET_NULL(sHofGfxPtr); TRY_FREE_AND_SET_NULL(sHofMonPtr);
if (sHofMonPtr != NULL)
FREE_AND_SET_NULL(sHofMonPtr);
StartCredits(); StartCredits();
} }
@ -1081,10 +1077,8 @@ static void Task_HofPC_HandleExit(u8 taskId)
ResetBgsAndClearDma3BusyFlags(0); ResetBgsAndClearDma3BusyFlags(0);
DestroyTask(taskId); DestroyTask(taskId);
if (sHofGfxPtr != NULL) TRY_FREE_AND_SET_NULL(sHofGfxPtr);
FREE_AND_SET_NULL(sHofGfxPtr); TRY_FREE_AND_SET_NULL(sHofMonPtr);
if (sHofMonPtr != NULL)
FREE_AND_SET_NULL(sHofMonPtr);
ReturnFromHallOfFamePC(); ReturnFromHallOfFamePC();
} }

3
src/mystery_gift_client.c
View File

@ -44,8 +44,7 @@ u32 MysteryGiftClient_Run(u16 * endVal)
{ {
*endVal = sClient->param; *endVal = sClient->param;
MysteryGiftClient_Free(sClient); MysteryGiftClient_Free(sClient);
Free(sClient); FREE_AND_SET_NULL(sClient);
sClient = NULL;
} }
return result; return result;
} }

3
src/mystery_gift_server.c
View File

@ -44,8 +44,7 @@ u32 MysterGiftServer_Run(u16 * endVal)
{ {
*endVal = sServer->param; *endVal = sServer->param;
MysteryGiftServer_Free(sServer); MysteryGiftServer_Free(sServer);
Free(sServer); FREE_AND_SET_NULL(sServer);
sServer = NULL;
} }
return result; return result;
} }

6
src/mystery_gift_view.c
View File

@ -207,8 +207,7 @@ void WonderCard_Destroy(void)
if (sWonderCardData != NULL) if (sWonderCardData != NULL)
{ {
*sWonderCardData = (struct WonderCardData){}; *sWonderCardData = (struct WonderCardData){};
Free(sWonderCardData); FREE_AND_SET_NULL(sWonderCardData);
sWonderCardData = NULL;
} }
} }
@ -660,8 +659,7 @@ void WonderNews_Destroy(void)
if (sWonderNewsData != NULL) if (sWonderNewsData != NULL)
{ {
*sWonderNewsData = (struct WonderNewsData){}; *sWonderNewsData = (struct WonderNewsData){};
Free(sWonderNewsData); FREE_AND_SET_NULL(sWonderNewsData);
sWonderNewsData = NULL;
} }
} }

3
src/pokemon_storage_system.c
View File

@ -5417,8 +5417,7 @@ static bool32 WaitForWallpaperGfxLoad(void)
if (IsDma3ManagerBusyWithBgCopy()) if (IsDma3ManagerBusyWithBgCopy())
return FALSE; return FALSE;
if (sStorage->wallpaperTiles != NULL) TRY_FREE_AND_SET_NULL(sStorage->wallpaperTiles);
FREE_AND_SET_NULL(sStorage->wallpaperTiles);
return TRUE; return TRUE;
} }

3
src/pokenav.c
View File

@ -557,8 +557,7 @@ void *GetSubstructPtr(u32 index)
void FreePokenavSubstruct(u32 index) void FreePokenavSubstruct(u32 index)
{ {
if (gPokenavResources->substructPtrs[index] != NULL) TRY_FREE_AND_SET_NULL(gPokenavResources->substructPtrs[index]);
FREE_AND_SET_NULL(gPokenavResources->substructPtrs[index]);
} }
u32 GetPokenavMode(void) u32 GetPokenavMode(void)

6
src/region_map.c
View File

@ -2024,11 +2024,7 @@ static void CB_ExitFlyMap(void)
{ {
SetMainCallback2(CB2_ReturnToPartyMenuFromFlyMap); SetMainCallback2(CB2_ReturnToPartyMenuFromFlyMap);
} }
if (sFlyMap != NULL) TRY_FREE_AND_SET_NULL(sFlyMap);
{
free(sFlyMap);
sFlyMap = NULL;
}
FreeAllWindowBuffers(); FreeAllWindowBuffers();
} }
break; break;

3
src/rotating_tile_puzzle.c
View File

@ -101,8 +101,7 @@ void FreeRotatingTilePuzzle(void)
{ {
u8 id; u8 id;
if (sRotatingTilePuzzle != NULL) TRY_FREE_AND_SET_NULL(sRotatingTilePuzzle);
FREE_AND_SET_NULL(sRotatingTilePuzzle);
id = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0); id = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0);
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[id]); ObjectEventClearHeldMovementIfFinished(&gObjectEvents[id]);

24
src/slot_machine.c
View File

@ -1756,14 +1756,10 @@ static bool8 SlotTask_FreeDataStructures(struct Task *task)
FREE_AND_SET_NULL(sImageTable_DigitalDisplay_Number); FREE_AND_SET_NULL(sImageTable_DigitalDisplay_Number);
FREE_AND_SET_NULL(sImageTable_DigitalDisplay_Pokeball); FREE_AND_SET_NULL(sImageTable_DigitalDisplay_Pokeball);
FREE_AND_SET_NULL(sImageTable_DigitalDisplay_DPad); FREE_AND_SET_NULL(sImageTable_DigitalDisplay_DPad);
if (sImageTable_ReelTimePikachu != NULL) TRY_FREE_AND_SET_NULL(sImageTable_ReelTimePikachu);
FREE_AND_SET_NULL(sImageTable_ReelTimePikachu); TRY_FREE_AND_SET_NULL(sImageTable_ReelTimeMachineAntennae);
if (sImageTable_ReelTimeMachineAntennae != NULL) TRY_FREE_AND_SET_NULL(sImageTable_ReelTimeMachine);
FREE_AND_SET_NULL(sImageTable_ReelTimeMachineAntennae); TRY_FREE_AND_SET_NULL(sImageTable_BrokenReelTimeMachine);
if (sImageTable_ReelTimeMachine != NULL)
FREE_AND_SET_NULL(sImageTable_ReelTimeMachine);
if (sImageTable_BrokenReelTimeMachine != NULL)
FREE_AND_SET_NULL(sImageTable_BrokenReelTimeMachine);
FREE_AND_SET_NULL(sMenuGfx); FREE_AND_SET_NULL(sMenuGfx);
FREE_AND_SET_NULL(sSelectedPikaPowerTile); FREE_AND_SET_NULL(sSelectedPikaPowerTile);
FREE_AND_SET_NULL(sReelOverlay_Tilemap); FREE_AND_SET_NULL(sReelOverlay_Tilemap);
@ -4178,8 +4174,7 @@ static void CreateReelTimePikachuSprite(void)
static void DestroyReelTimePikachuSprite(void) static void DestroyReelTimePikachuSprite(void)
{ {
DestroySprite(&gSprites[sSlotMachine->reelTimePikachuSpriteId]); DestroySprite(&gSprites[sSlotMachine->reelTimePikachuSpriteId]);
if (sImageTable_ReelTimePikachu != NULL) TRY_FREE_AND_SET_NULL(sImageTable_ReelTimePikachu);
FREE_AND_SET_NULL(sImageTable_ReelTimePikachu);
} }
static void SpriteCB_ReelTimePikachu(struct Sprite *sprite) static void SpriteCB_ReelTimePikachu(struct Sprite *sprite)
@ -4308,10 +4303,8 @@ static void DestroyReelTimeMachineSprites(void)
for (i = 0; i < ARRAY_COUNT(sSlotMachine->reelTimeMachineSpriteIds); i++) for (i = 0; i < ARRAY_COUNT(sSlotMachine->reelTimeMachineSpriteIds); i++)
DestroySprite(&gSprites[sSlotMachine->reelTimeMachineSpriteIds[i]]); DestroySprite(&gSprites[sSlotMachine->reelTimeMachineSpriteIds[i]]);
if (sImageTable_ReelTimeMachineAntennae != NULL) TRY_FREE_AND_SET_NULL(sImageTable_ReelTimeMachineAntennae);
FREE_AND_SET_NULL(sImageTable_ReelTimeMachineAntennae); TRY_FREE_AND_SET_NULL(sImageTable_ReelTimeMachine);
if (sImageTable_ReelTimeMachine != NULL)
FREE_AND_SET_NULL(sImageTable_ReelTimeMachine);
for (i = 0; i < ARRAY_COUNT(sSlotMachine->reelTimeNumberSpriteIds); i++) for (i = 0; i < ARRAY_COUNT(sSlotMachine->reelTimeNumberSpriteIds); i++)
DestroySprite(&gSprites[sSlotMachine->reelTimeNumberSpriteIds[i]]); DestroySprite(&gSprites[sSlotMachine->reelTimeNumberSpriteIds[i]]);
@ -4328,8 +4321,7 @@ static void DestroyReelTimeShadowSprites(void)
static void DestroyBrokenReelTimeMachineSprite(void) static void DestroyBrokenReelTimeMachineSprite(void)
{ {
DestroySprite(&gSprites[sSlotMachine->reelTimeBrokenMachineSpriteId]); DestroySprite(&gSprites[sSlotMachine->reelTimeBrokenMachineSpriteId]);
if (sImageTable_BrokenReelTimeMachine != NULL) TRY_FREE_AND_SET_NULL(sImageTable_BrokenReelTimeMachine);
FREE_AND_SET_NULL(sImageTable_BrokenReelTimeMachine);
} }
#define sDelayTimer data[0] #define sDelayTimer data[0]

3
src/union_room_chat.c
View File

@ -2160,8 +2160,7 @@ static bool32 IsDisplaySubtask0Active(void)
static void FreeDisplay(void) static void FreeDisplay(void)
{ {
FreeSprites(); FreeSprites();
if (sDisplay) TRY_FREE_AND_SET_NULL(sDisplay);
FREE_AND_SET_NULL(sDisplay);
FreeAllWindowBuffers(); FreeAllWindowBuffers();
gScanlineEffect.state = 3; gScanlineEffect.state = 3;