diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-09-22 15:08:38 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-09-22 15:23:47 -0500 |
| commit | 9e840dc5fea3d732a347092c804afb3c6a86d61a (patch) | |
| tree | 22141282dc7f0f7cf9fd05f48dbb884def3d9f19 /src/battle_util2.c | |
| parent | d50554bb8e90d314ae0131e925224406992a4c97 (diff) | |
| parent | 1f767e4c4925f77f1a34c3da124b8be267a0b193 (diff) | |
Merge remote-tracking branch 'Tetra/master'
Diffstat (limited to 'src/battle_util2.c')
| -rw-r--r-- | src/battle_util2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_util2.c b/src/battle_util2.c index 1d2f1e95b..5881abf25 100644 --- a/src/battle_util2.c +++ b/src/battle_util2.c @@ -19,7 +19,7 @@ void AllocateBattleResources(void) { gBattleResources = gBattleResources; // something dumb needed to match - if (gBattleTypeFlags & BATTLE_TYPE_x4000000) + if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) sub_81D55D0(); gBattleStruct = AllocZeroed(sizeof(*gBattleStruct)); @@ -49,7 +49,7 @@ void AllocateBattleResources(void) void FreeBattleResources(void) { - if (gBattleTypeFlags & BATTLE_TYPE_x4000000) + if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) sub_81D5694(); if (gBattleResources != NULL) |