merge trainer hill changes

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)
     {