address review changes

This commit is contained in:
jiangzhengwenjz
2019-08-29 03:26:11 +08:00
parent 4b5195c9cb
commit 2599dac8ac
+8 -14
View File
@@ -12,12 +12,10 @@ void AllocateBattleResources(void)
InitTrainerTowerBattleStruct(); InitTrainerTowerBattleStruct();
if (gBattleTypeFlags & BATTLE_TYPE_POKEDUDE) if (gBattleTypeFlags & BATTLE_TYPE_POKEDUDE)
{ {
void **ptr = gUnknown_3005EE0; s32 i;
s32 i = 3;
for (i = 0; i < 4; ++i)
do gUnknown_3005EE0[i] = AllocZeroed(8);
*ptr++ = AllocZeroed(8);
while (--i >= 0);
} }
gBattleStruct = AllocZeroed(sizeof(*gBattleStruct)); gBattleStruct = AllocZeroed(sizeof(*gBattleStruct));
gBattleResources = AllocZeroed(sizeof(*gBattleResources)); gBattleResources = AllocZeroed(sizeof(*gBattleResources));
@@ -43,16 +41,12 @@ void FreeBattleResources(void)
FreeTrainerTowerBattleStruct(); FreeTrainerTowerBattleStruct();
if (gBattleTypeFlags & BATTLE_TYPE_POKEDUDE) if (gBattleTypeFlags & BATTLE_TYPE_POKEDUDE)
{ {
void **ptr = gUnknown_3005EE0; s32 i;
void *nullPtr = NULL;
s32 i = 3; for (i = 0; i < 4; ++i)
do
{ {
Free(*ptr); FREE_AND_SET_NULL(gUnknown_3005EE0[i]);
*ptr++ = nullPtr;
} }
while (--i >= 0);
} }
if (gBattleResources != NULL) if (gBattleResources != NULL)
{ {