diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2019-01-14 14:18:29 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-14 14:18:29 -0600 |
| commit | b4b4fb951a588dd50b4589efea11d1a17fd88342 (patch) | |
| tree | 8bce21f083717e8b39df833136fdab956673001b /src/battle_util2.c | |
| parent | e13895e58ab38c8adbde1e572068692e8ee5ee35 (diff) | |
| parent | 87763d133fadac8270dab0cba3d964a47b5b0dd2 (diff) | |
Merge pull request #519 from DizzyEggg/trainer_hill
Trainer Hill
Diffstat (limited to 'src/battle_util2.c')
| -rw-r--r-- | src/battle_util2.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/battle_util2.c b/src/battle_util2.c index 0a0f65b95..9c0d55a57 100644 --- a/src/battle_util2.c +++ b/src/battle_util2.c @@ -3,21 +3,19 @@ #include "battle_controllers.h" #include "alloc.h" #include "pokemon.h" +#include "trainer_hill.h" #include "party_menu.h" #include "event_data.h" #include "constants/abilities.h" #include "random.h" #include "battle_scripts.h" -extern void sub_81D55D0(void); -extern void sub_81D5694(void); - void AllocateBattleResources(void) { gBattleResources = gBattleResources; // something dumb needed to match if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) - sub_81D55D0(); + InitTrainerHillBattleStruct(); gBattleStruct = AllocZeroed(sizeof(*gBattleStruct)); @@ -47,7 +45,7 @@ void AllocateBattleResources(void) void FreeBattleResources(void) { if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) - sub_81D5694(); + FreeTrainerHillBattleStruct(); if (gBattleResources != NULL) { |