1 files changed, 14 insertions, 12 deletions

diff --git a/src/battle_tent.c b/src/battle_tent.c
index e30cac386..f3aec1345 100644
--- a/src/battle_tent.c
+++ b/src/battle_tent.c
@@ -9,7 +9,7 @@
 #include "random.h"
 #include "item.h"
 #include "battle_factory.h"
-#include "battle_frontier_2.h"
+#include "frontier_util.h"
 #include "constants/items.h"
 #include "constants/region_map_sections.h"
 
@@ -19,6 +19,8 @@ extern const u16 gBattleFrontierHeldItems[];
 
 extern u16 gUnknown_03006298[];
 
+extern void sub_81A4C30(void);
+
 // This file's functions.
 static void sub_81B99D4(void);
 static void sub_81B9A28(void);
@@ -102,7 +104,7 @@ void sub_81B99B4(void)
 static void sub_81B99D4(void)
 {
     gSaveBlock2Ptr->frontier.field_CA8 = 0;
-    gSaveBlock2Ptr->frontier.field_CB2 = 0;
+    gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0;
     gSaveBlock2Ptr->frontier.field_CA9_a = FALSE;
     saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1);
 }
@@ -120,13 +122,13 @@ static void sub_81B9A44(void)
 static void sub_81B9A60(void)
 {
     gTrainerBattleOpponent_A = (u32)((Random() % 255) * 5) / 64;
-    sub_8162614(gTrainerBattleOpponent_A, 0);
+    SetBattleFacilityTrainerGfxId(gTrainerBattleOpponent_A, 0);
 }
 
 static void sub_81B9A90(void)
 {
     if (gTrainerBattleOpponent_A < 300)
-        ConvertBattleFrontierTrainerSpeechToString(gFacilityTrainers[gTrainerBattleOpponent_A].speechBefore);
+        FrontierSpeechToString(gFacilityTrainers[gTrainerBattleOpponent_A].speechBefore);
 }
 
 static void sub_81B9ABC(void)
@@ -164,7 +166,7 @@ void sub_81B9B80(void)
 static void sub_81B9BA0(void)
 {
     gSaveBlock2Ptr->frontier.field_CA8 = 0;
-    gSaveBlock2Ptr->frontier.field_CB2 = 0;
+    gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0;
     gSaveBlock2Ptr->frontier.field_CA9_a = FALSE;
     saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1);
 }
@@ -219,7 +221,7 @@ void sub_81B9D08(void)
 static void sub_81B9D28(void)
 {
     gSaveBlock2Ptr->frontier.field_CA8 = 0;
-    gSaveBlock2Ptr->frontier.field_CB2 = 0;
+    gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0;
     gSaveBlock2Ptr->frontier.field_CA9_a = FALSE;
     saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1);
 }
@@ -551,25 +553,25 @@ static void sub_81BA040(void)
         do
         {
             trainerId = Random() % 30;
-            for (i = 0; i < gSaveBlock2Ptr->frontier.field_CB2; i++)
+            for (i = 0; i < gSaveBlock2Ptr->frontier.curChallengeBattleNum; i++)
             {
                 if (gSaveBlock2Ptr->frontier.field_CB4[i] == trainerId)
                     break;
             }
-        } while (i != gSaveBlock2Ptr->frontier.field_CB2);
+        } while (i != gSaveBlock2Ptr->frontier.curChallengeBattleNum);
 
         gTrainerBattleOpponent_A = trainerId;
-        while (gFacilityTrainers[gTrainerBattleOpponent_A].btMonPool[monPoolCount] != 0xFFFF)
+        while (gFacilityTrainers[gTrainerBattleOpponent_A].bfMonPool[monPoolCount] != 0xFFFF)
             monPoolCount++;
         if (monPoolCount > 8)
             break;
         monPoolCount = 0;
     }
 
-    if (gSaveBlock2Ptr->frontier.field_CB2 < 2)
-        gSaveBlock2Ptr->frontier.field_CB4[gSaveBlock2Ptr->frontier.field_CB2] = gTrainerBattleOpponent_A;
+    if (gSaveBlock2Ptr->frontier.curChallengeBattleNum < 2)
+        gSaveBlock2Ptr->frontier.field_CB4[gSaveBlock2Ptr->frontier.curChallengeBattleNum] = gTrainerBattleOpponent_A;
 
-    monSetsPool = gFacilityTrainers[gTrainerBattleOpponent_A].btMonPool;
+    monSetsPool = gFacilityTrainers[gTrainerBattleOpponent_A].bfMonPool;
     i = 0;
     while (i != 3)
     {