summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-08-29 03:26:11 +0800
committerjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-08-29 03:33:04 +0800
commit2599dac8ac8c12268fca902910bfe1aab40a68ca (patch)
treedf2eb7008697ce4125c6cc32da286a21499066ea /src
parent4b5195c9cb7afa4f7fd45d5381b258a0e7ee17cf (diff)
address review changes
Diffstat (limited to 'src')
-rw-r--r--src/battle_util2.c22
1 files changed, 8 insertions, 14 deletions
diff --git a/src/battle_util2.c b/src/battle_util2.c
index 6a3f3525b..d940d8508 100644
--- a/src/battle_util2.c
+++ b/src/battle_util2.c
@@ -12,12 +12,10 @@ void AllocateBattleResources(void)
InitTrainerTowerBattleStruct();
if (gBattleTypeFlags & BATTLE_TYPE_POKEDUDE)
{
- void **ptr = gUnknown_3005EE0;
- s32 i = 3;
-
- do
- *ptr++ = AllocZeroed(8);
- while (--i >= 0);
+ s32 i;
+
+ for (i = 0; i < 4; ++i)
+ gUnknown_3005EE0[i] = AllocZeroed(8);
}
gBattleStruct = AllocZeroed(sizeof(*gBattleStruct));
gBattleResources = AllocZeroed(sizeof(*gBattleResources));
@@ -43,16 +41,12 @@ void FreeBattleResources(void)
FreeTrainerTowerBattleStruct();
if (gBattleTypeFlags & BATTLE_TYPE_POKEDUDE)
{
- void **ptr = gUnknown_3005EE0;
- void *nullPtr = NULL;
- s32 i = 3;
-
- do
+ s32 i;
+
+ for (i = 0; i < 4; ++i)
{
- Free(*ptr);
- *ptr++ = nullPtr;
+ FREE_AND_SET_NULL(gUnknown_3005EE0[i]);
}
- while (--i >= 0);
}
if (gBattleResources != NULL)
{