diff --git a/include/overlay104/ov104_0223B6F4.h b/include/overlay104/ov104_0223B6F4.h
index 87f12aa421..ce55759005 100644
--- a/include/overlay104/ov104_0223B6F4.h
+++ b/include/overlay104/ov104_0223B6F4.h
@@ -24,6 +24,6 @@ void ov104_0223BAB8(UnkStruct_ov104_0223BA10 *param0);
 u16 ov104_0223BB60(UnkStruct_ov104_0223BA10 *param0);
 void ov104_0223BB84(BgConfig *param0, UnkStruct_ov104_0223BA10 *param1, u32 param2);
 u16 ov104_0223BC24(u16 param0);
-void ov104_0223BC2C(UnkStruct_0203068C *param0, u8 param1, int param2);
+void ov104_0223BC2C(BattleFrontier *param0, u8 param1, int param2);
 
 #endif // POKEPLATINUM_OV104_0223B6F4_H
diff --git a/include/struct_decls/struct_0203068C_decl.h b/include/struct_decls/struct_0203068C_decl.h
index af39a399d4..f1df57031c 100644
--- a/include/struct_decls/struct_0203068C_decl.h
+++ b/include/struct_decls/struct_0203068C_decl.h
@@ -1,6 +1,6 @@
 #ifndef POKEPLATINUM_STRUCT_0203068C_DECL_H
 #define POKEPLATINUM_STRUCT_0203068C_DECL_H
 
-typedef struct UnkStruct_0203068C_t UnkStruct_0203068C;
+typedef struct BattleFrontier_t BattleFrontier;
 
 #endif // POKEPLATINUM_STRUCT_0203068C_DECL_H
diff --git a/include/struct_defs/struct_0203068C.h b/include/struct_defs/struct_0203068C.h
index b5b1bf9cb5..67ef73d355 100644
--- a/include/struct_defs/struct_0203068C.h
+++ b/include/struct_defs/struct_0203068C.h
@@ -15,7 +15,7 @@
 #include "struct_defs/struct_020305B8.h"
 #include "struct_defs/struct_02030698.h"
 
-typedef struct UnkStruct_0203068C_t {
+typedef struct BattleFrontier_t {
     UnkStruct_02030698 unk_00;
     union {
         UnkStruct_0202D060 unk_8E0_val1;
@@ -41,6 +41,6 @@ typedef struct UnkStruct_0203068C_t {
     struct {
         UnkStruct_020305B8 unk_00;
     } unk_1620;
-} UnkStruct_0203068C;
+} BattleFrontier;
 
 #endif // POKEPLATINUM_STRUCT_0203068C_H
diff --git a/include/unk_0203061C.h b/include/unk_0203061C.h
index 9e7a941042..fb3ac666d9 100644
--- a/include/unk_0203061C.h
+++ b/include/unk_0203061C.h
@@ -5,16 +5,16 @@
 
 #include "savedata.h"
 
-int Frontier_SaveSize(void);
-void Frontier_Init(UnkStruct_0203068C *param0);
-UnkStruct_0203068C *sub_0203068C(SaveData *saveData);
-u16 sub_02030698(UnkStruct_0203068C *param0, int param1, int param2);
-u16 sub_020306E4(UnkStruct_0203068C *param0, int param1, int param2, u16 param3);
-void sub_02030764(UnkStruct_0203068C *param0);
-void sub_02030788(UnkStruct_0203068C *param0, int param1);
-void sub_020307F0(UnkStruct_0203068C *param0, int param1, int param2);
-u16 sub_02030804(UnkStruct_0203068C *param0, int param1, int param2, int param3);
-u16 sub_02030824(UnkStruct_0203068C *param0, int param1, int param2, int param3);
-u16 sub_02030848(UnkStruct_0203068C *param0, int param1, int param2, u16 param3);
+int BattleFrontier_SaveSize(void);
+void BattleFrontier_Init(BattleFrontier *param0);
+BattleFrontier *SaveData_GetBattleFrontier(SaveData *saveData);
+u16 sub_02030698(BattleFrontier *param0, int param1, int param2);
+u16 sub_020306E4(BattleFrontier *param0, int param1, int param2, u16 param3);
+void sub_02030764(BattleFrontier *param0);
+void sub_02030788(BattleFrontier *param0, int param1);
+void sub_020307F0(BattleFrontier *param0, int param1, int param2);
+u16 sub_02030804(BattleFrontier *param0, int param1, int param2, int param3);
+u16 sub_02030824(BattleFrontier *param0, int param1, int param2, int param3);
+u16 sub_02030848(BattleFrontier *param0, int param1, int param2, u16 param3);
 
 #endif // POKEPLATINUM_UNK_0203061C_H
diff --git a/src/overlay004/ov4_021D0D80.c b/src/overlay004/ov4_021D0D80.c
index c7e3c43fec..d7c3c61848 100644
--- a/src/overlay004/ov4_021D0D80.c
+++ b/src/overlay004/ov4_021D0D80.c
@@ -557,7 +557,7 @@ static void ov4_021D1744(int param0, int param1, void *param2)
     MI_CpuCopy8(Unk_ov4_0221A400->unk_100, sub_0202AED8(SaveData_GetWiFiList(Unk_ov4_0221A400->unk_F6C), 0), 32 * sizeof(DWCFriendData));
 
     sub_0202B270(SaveData_GetWiFiList(Unk_ov4_0221A400->unk_F6C), param0, param1);
-    sub_020307F0(sub_0203068C(Unk_ov4_0221A400->unk_F6C), param0, param1);
+    sub_020307F0(SaveData_GetBattleFrontier(Unk_ov4_0221A400->unk_F6C), param0, param1);
 }
 
 static void ov4_021D17A0(int param0, void *param1)
diff --git a/src/overlay005/ov5_021EA874.c b/src/overlay005/ov5_021EA874.c
index c5b7ff5394..819d8b7e01 100644
--- a/src/overlay005/ov5_021EA874.c
+++ b/src/overlay005/ov5_021EA874.c
@@ -354,7 +354,7 @@ static BOOL ov5_021EAD38(UnkStruct_ov5_021EAE78 *param0)
     if (v4 == 0xffffffff) {
         return 0;
     } else if (v4 == 0) {
-        sub_02030788(sub_0203068C(param0->unk_34), param0->unk_90);
+        sub_02030788(SaveData_GetBattleFrontier(param0->unk_34), param0->unk_90);
         sub_0202AFD4(v0, param0->unk_90);
         sub_02039298(param0->unk_34, param0->unk_8C, 32 - 1, 4, 0);
         param0->unk_48 = 1;
diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c
index 3b972099c0..d12aac61b4 100644
--- a/src/overlay064/ov64_0222DCE0.c
+++ b/src/overlay064/ov64_0222DCE0.c
@@ -1849,7 +1849,7 @@ static int ov64_0222F0C4(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E06
             v2 = ov64_0222FF38(param0);
 
             sub_0202AFD4(v1, param1->unk_08.unk_04[v2]);
-            sub_02030788(sub_0203068C(param1->saveData), param1->unk_08.unk_04[v2]);
+            sub_02030788(SaveData_GetBattleFrontier(param1->saveData), param1->unk_08.unk_04[v2]);
             ov64_0222E164(param1);
             ov64_0222FC80(param0, param1, param2, param0->unk_00, param0->unk_04, 0, heapID);
             ov64_0222EA28(param2, 1);
@@ -4003,7 +4003,7 @@ asm static void ov64_02231528 (UnkStruct_ov64_02230F98 * param0, UnkStruct_ov64_
     ldr r0, [r5, #0]
     add r6, r3, #0
     add r4, r2, #0
-    bl sub_0203068C
+    bl SaveData_GetBattleFrontier
     str r0, [sp, #0x24]
     mov r0, #0x80
     add r1, r6, #0
@@ -4151,7 +4151,7 @@ asm static void ov64_02231664 (UnkStruct_ov64_02230F98 * param0, UnkStruct_ov64_
     ldr r0, [r5, #0]
     add r6, r3, #0
     add r4, r2, #0
-    bl sub_0203068C
+    bl SaveData_GetBattleFrontier
     str r0, [sp, #0x24]
     mov r0, #0x80
     add r1, r6, #0
@@ -4580,7 +4580,7 @@ asm static void ov64_02231A00 (UnkStruct_ov64_02230F98 * param0, UnkStruct_ov64_
     ldr r0, [r5, #0]
     add r6, r3, #0
     add r4, r2, #0
-    bl sub_0203068C
+    bl SaveData_GetBattleFrontier
     str r0, [sp, #0x24]
     mov r0, #0x80
     add r1, r6, #0
@@ -4803,7 +4803,7 @@ asm static void ov64_02231BE0 (UnkStruct_ov64_02230F98 * param0, UnkStruct_ov64_
     ldr r0, [r5, #0]
     str r3, [sp, #0x24]
     add r4, r2, #0
-    bl sub_0203068C
+    bl SaveData_GetBattleFrontier
     str r0, [sp, #0x28]
     ldr r1, [sp, #0x24]
     mov r0, #0x80
@@ -4977,7 +4977,7 @@ asm static void ov64_02231D58 (UnkStruct_ov64_02230F98 * param0, UnkStruct_ov64_
     ldr r0, [r5, #0]
     add r6, r3, #0
     add r4, r2, #0
-    bl sub_0203068C
+    bl SaveData_GetBattleFrontier
     str r0, [sp, #0x24]
     mov r0, #0x80
     add r1, r6, #0
@@ -5125,7 +5125,7 @@ asm static void ov64_02231E94 (UnkStruct_ov64_02230F98 * param0, UnkStruct_ov64_
     ldr r0, [r5, #0]
     add r4, r2, #0
     add r7, r3, #0
-    bl sub_0203068C
+    bl SaveData_GetBattleFrontier
     ldr r0, [r5, #0]
     bl SaveData_GetWiFiList
     str r0, [sp, #0x24]
diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c
index a749d66f59..88e9b5b1c1 100644
--- a/src/overlay065/ov65_0222DCE0.c
+++ b/src/overlay065/ov65_0222DCE0.c
@@ -1730,7 +1730,7 @@ static int ov65_0222F304(UnkStruct_ov65_0222EBE0 *param0, int param1)
         if (v1 == 0) {
             WiFiList_Init(param0->unk_00);
             Email_Init(SaveData_SaveTable(param0->saveData, SAVE_TABLE_ENTRY_EMAIL));
-            sub_02030764(sub_0203068C(param0->saveData));
+            sub_02030764(SaveData_GetBattleFrontier(param0->saveData));
             param0->unk_3A8 = 14;
             param0->unk_04 = sub_0203871C(param0->saveData, sizeof(UnkStruct_0207DFAC));
             ov65_02232B58(param0, 23, 1);
@@ -6268,10 +6268,10 @@ static void ov65_022342A8(UnkStruct_ov65_0222EBE0 *param0, u32 heapID)
 {
     int v0;
     int v1;
-    UnkStruct_0203068C *v2;
+    BattleFrontier *v2;
     Strbuf *v3;
 
-    v2 = sub_0203068C(param0->saveData);
+    v2 = SaveData_GetBattleFrontier(param0->saveData);
     v0 = param0->unk_BE0.unk_71 - 1;
 
     {
@@ -6376,7 +6376,7 @@ static void ov65_02234628(UnkStruct_ov65_0222EBE0 *param0)
 static void ov65_02234694(UnkStruct_ov65_0222EBE0 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5)
 {
     int v0;
-    UnkStruct_0203068C *v1 = sub_0203068C(param0->saveData);
+    BattleFrontier *v1 = SaveData_GetBattleFrontier(param0->saveData);
     v0 = sub_02030698(v1, param2, param3);
 
     ov65_02234708(param0, param1, v0, param4, param5);
@@ -6384,7 +6384,7 @@ static void ov65_02234694(UnkStruct_ov65_0222EBE0 *param0, u32 param1, u32 param
 
 static void ov65_022346C4(UnkStruct_ov65_0222EBE0 *param0, Strbuf *param1, u32 param2, u32 param3)
 {
-    UnkStruct_0203068C *v0;
+    BattleFrontier *v0;
     BOOL v1;
     u32 v2;
     static const u32 v3[6] = {
@@ -6398,7 +6398,7 @@ static void ov65_022346C4(UnkStruct_ov65_0222EBE0 *param0, Strbuf *param1, u32 p
 
     GF_ASSERT(param2 < 6);
 
-    v0 = sub_0203068C(param0->saveData);
+    v0 = SaveData_GetBattleFrontier(param0->saveData);
     v1 = sub_02030698(v0, v3[param2], param3);
 
     if (v1 == 0) {
diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c
index 12c0db29ba..decf06588d 100644
--- a/src/overlay088/ov88_0223B140.c
+++ b/src/overlay088/ov88_0223B140.c
@@ -1824,7 +1824,7 @@ static int ov88_0223D514(UnkStruct_02095E80 *param0)
 
     switch (ov88_0223ED2C(param0->unk_174, &param0->unk_6BC, &param0->unk_6C8)) {
     case 0:
-        sub_02030788(sub_0203068C(param0->unk_04), param0->unk_36C8);
+        sub_02030788(SaveData_GetBattleFrontier(param0->unk_04), param0->unk_36C8);
         sub_0202AFD4(param0->unk_36EC, param0->unk_36C8);
         sub_02039298(param0->unk_04, param0->unk_36C4, 32 - 1, 26, 0);
         param0->unk_226C = ov88_0223D854;
diff --git a/src/overlay090/ov90_021D0D80.c b/src/overlay090/ov90_021D0D80.c
index 5e02504b08..19f6e78529 100644
--- a/src/overlay090/ov90_021D0D80.c
+++ b/src/overlay090/ov90_021D0D80.c
@@ -74,7 +74,7 @@ typedef struct {
     BgConfig *unk_10;
     UnkStruct_ov90_021D0D80 *unk_14;
     Options *unk_18;
-    UnkStruct_0203068C *unk_1C;
+    BattleFrontier *unk_1C;
     UnkStruct_0202D750 *unk_20;
     UnkStruct_0202D764 *unk_24;
     UnkStruct_ov90_021D0ECC_sub1 unk_28;
@@ -127,7 +127,7 @@ int ov90_021D0D80(OverlayManager *param0, int *param1)
     v0->unk_08 = v1->unk_04;
     v0->unk_0A = v1->unk_06;
     v0->unk_18 = SaveData_GetOptions(v1->unk_00);
-    v0->unk_1C = sub_0203068C(v1->unk_00);
+    v0->unk_1C = SaveData_GetBattleFrontier(v1->unk_00);
     v0->unk_20 = sub_0202D750(v1->unk_00);
     v0->unk_24 = sub_0202D764(v1->unk_00);
     v0->heapID = HEAP_ID_74;
diff --git a/src/overlay104/ov104_0222ECE8.c b/src/overlay104/ov104_0222ECE8.c
index b4cdc401d2..2fdd023341 100644
--- a/src/overlay104/ov104_0222ECE8.c
+++ b/src/overlay104/ov104_0222ECE8.c
@@ -735,7 +735,7 @@ BOOL ov104_0222F3B8(UnkStruct_ov104_0223BA10 *param0)
     v1 += 3;
     v1 += (7 + 1);
 
-    param0->unk_3C0[v1] = sub_02030698(sub_0203068C(param0->unk_04), sub_0205E630(param0->unk_10), sub_0205E6A8(sub_0205E630(param0->unk_10)));
+    param0->unk_3C0[v1] = sub_02030698(SaveData_GetBattleFrontier(param0->unk_04), sub_0205E630(param0->unk_10), sub_0205E6A8(sub_0205E630(param0->unk_10)));
     v1 += 1;
 
     if (CommSys_SendData(42, param0->unk_3C0, v3) == 1) {
diff --git a/src/overlay104/ov104_022339B4.c b/src/overlay104/ov104_022339B4.c
index 0208bf7929..e5667c4c54 100644
--- a/src/overlay104/ov104_022339B4.c
+++ b/src/overlay104/ov104_022339B4.c
@@ -95,8 +95,8 @@ UnkStruct_ov104_0223ADA0 *ov104_022339B4(SaveData *param0, u16 param1, u8 param2
         }
 
         if (v3 == 1) {
-            v7->unk_0C = sub_02030698(sub_0203068C(v7->unk_4F8), sub_0205E430(v7->unk_05, v7->unk_04), sub_0205E6A8(sub_0205E430(v7->unk_05, v7->unk_04)));
-            v7->unk_08 = sub_02030698(sub_0203068C(v7->unk_4F8), sub_0205E488(v7->unk_05, v7->unk_04), sub_0205E6A8(sub_0205E488(v7->unk_05, v7->unk_04)));
+            v7->unk_0C = sub_02030698(SaveData_GetBattleFrontier(v7->unk_4F8), sub_0205E430(v7->unk_05, v7->unk_04), sub_0205E6A8(sub_0205E430(v7->unk_05, v7->unk_04)));
+            v7->unk_08 = sub_02030698(SaveData_GetBattleFrontier(v7->unk_4F8), sub_0205E488(v7->unk_05, v7->unk_04), sub_0205E6A8(sub_0205E488(v7->unk_05, v7->unk_04)));
         } else {
             v7->unk_0C = 0;
             v7->unk_08 = 0;
@@ -107,8 +107,8 @@ UnkStruct_ov104_0223ADA0 *ov104_022339B4(SaveData *param0, u16 param1, u8 param2
         v7->unk_04 = (u8)sub_02030030(v0, 1, 0, NULL);
         v7->unk_05 = (u8)sub_02030030(v0, 0, 0, NULL);
         v7->unk_06 = (u8)sub_02030030(v0, 2, 0, NULL);
-        v7->unk_0C = sub_02030698(sub_0203068C(v7->unk_4F8), sub_0205E430(v7->unk_05, v7->unk_04), sub_0205E6A8(sub_0205E430(v7->unk_05, v7->unk_04)));
-        v7->unk_08 = sub_02030698(sub_0203068C(v7->unk_4F8), sub_0205E488(v7->unk_05, v7->unk_04), sub_0205E6A8(sub_0205E488(v7->unk_05, v7->unk_04)));
+        v7->unk_0C = sub_02030698(SaveData_GetBattleFrontier(v7->unk_4F8), sub_0205E430(v7->unk_05, v7->unk_04), sub_0205E6A8(sub_0205E430(v7->unk_05, v7->unk_04)));
+        v7->unk_08 = sub_02030698(SaveData_GetBattleFrontier(v7->unk_4F8), sub_0205E488(v7->unk_05, v7->unk_04), sub_0205E6A8(sub_0205E488(v7->unk_05, v7->unk_04)));
     }
 
     v7->unk_0E = (u16)(v7->unk_0C / 7);
@@ -360,12 +360,12 @@ void ov104_02234148(UnkStruct_ov104_0223ADA0 *param0, u8 param1)
     u16 v6[4];
     u32 v7[4];
     u32 v8, v9, v10;
-    UnkStruct_0203068C *v11;
+    BattleFrontier *v11;
     Pokemon *v12;
     UnkStruct_0202FF58 *v13 = param0->unk_4F4;
     UnkStruct_020300F4 *v14 = sub_020300F4(param0->unk_4F8);
 
-    v11 = sub_0203068C(param0->unk_4F8);
+    v11 = SaveData_GetBattleFrontier(param0->unk_4F8);
     v3 = ov104_0223AA50(param0->unk_04);
     v4 = ov104_0223AA74(param0->unk_04, 1);
 
diff --git a/src/overlay104/ov104_02234DB4.c b/src/overlay104/ov104_02234DB4.c
index 8061b8c9ea..7aafba9225 100644
--- a/src/overlay104/ov104_02234DB4.c
+++ b/src/overlay104/ov104_02234DB4.c
@@ -82,7 +82,7 @@ UnkStruct_ov104_0223B5C0 *ov104_02234DB4(SaveData *param0, u16 param1, u8 param2
         }
 
         if (v2 == 1) {
-            v10->unk_08 = sub_02030698(sub_0203068C(v10->unk_6FC), sub_0205E50C(v10->unk_04), sub_0205E6A8(sub_0205E50C(v10->unk_04)));
+            v10->unk_08 = sub_02030698(SaveData_GetBattleFrontier(v10->unk_6FC), sub_0205E50C(v10->unk_04), sub_0205E6A8(sub_0205E50C(v10->unk_04)));
         } else {
             v10->unk_08 = 0;
 
@@ -97,7 +97,7 @@ UnkStruct_ov104_0223B5C0 *ov104_02234DB4(SaveData *param0, u16 param1, u8 param2
         v10->unk_04 = (u8)sub_02030198(v0, 0, 0, 0, NULL);
         v4 = ov104_0223B500(v10->unk_04);
         v10->unk_05 = (u8)sub_02030198(v0, 1, 0, 0, NULL);
-        v10->unk_08 = sub_02030698(sub_0203068C(v10->unk_6FC), sub_0205E50C(v10->unk_04), sub_0205E6A8(sub_0205E50C(v10->unk_04)));
+        v10->unk_08 = sub_02030698(SaveData_GetBattleFrontier(v10->unk_6FC), sub_0205E50C(v10->unk_04), sub_0205E6A8(sub_0205E50C(v10->unk_04)));
 
         for (v5 = 0; v5 < v4; v5++) {
             v10->unk_260[v5] = (u8)sub_02030198(v0, 3, v5, 0, NULL);
@@ -254,13 +254,13 @@ void ov104_0223526C(UnkStruct_ov104_0223B5C0 *param0, u8 param1)
     u8 v1[4];
     u16 v2[4];
     u32 v3[4];
-    UnkStruct_0203068C *v4;
+    BattleFrontier *v4;
     u16 v5, v6, v7, v8, v9;
     Pokemon *v10;
     UnkStruct_02030114 *v11 = param0->unk_6F8;
     UnkStruct_0203026C *v12 = sub_0203026C(param0->unk_6FC);
 
-    v4 = sub_0203068C(param0->unk_6FC);
+    v4 = SaveData_GetBattleFrontier(param0->unk_6FC);
     v1[0] = param0->unk_04;
 
     sub_02030140(param0->unk_6F8, 0, 0, 0, v1);
@@ -424,7 +424,7 @@ u16 ov104_02235578(UnkStruct_ov104_0223B5C0 *param0)
 
 static u16 ov104_022355C0(SaveData *param0, u8 param1, u8 param2, u16 *param3, u16 *param4)
 {
-    u16 v0 = sub_02030698(sub_0203068C(param0), sub_0205E4E0(param1, param2), sub_0205E6A8(sub_0205E4E0(param1, param2)));
+    u16 v0 = sub_02030698(SaveData_GetBattleFrontier(param0), sub_0205E4E0(param1, param2), sub_0205E6A8(sub_0205E4E0(param1, param2)));
     v0 &= 0xff;
 
     *param3 = (v0 & 0xf);
@@ -459,7 +459,7 @@ static void ov104_02235620(SaveData *param0, u8 param1, u8 param2, u8 param3)
     v2 = (param3 << (4 * v1));
     v3 |= v2;
 
-    sub_020306E4(sub_0203068C(param0), sub_0205E4E0(param1, param2), sub_0205E6A8(sub_0205E4E0(param1, param2)), v3);
+    sub_020306E4(SaveData_GetBattleFrontier(param0), sub_0205E4E0(param1, param2), sub_0205E6A8(sub_0205E4E0(param1, param2)), v3);
     return;
 }
 
diff --git a/src/overlay104/ov104_022358E8.c b/src/overlay104/ov104_022358E8.c
index 8a9c4191b9..f91e5b06f5 100644
--- a/src/overlay104/ov104_022358E8.c
+++ b/src/overlay104/ov104_022358E8.c
@@ -402,7 +402,7 @@ BOOL ov104_02235BC0(UnkStruct_ov104_0222E930 *param0)
         }
 
         if (v10 == 1) {
-            ov104_0223BC2C(sub_0203068C(v11->saveData), v3->unk_10, 50);
+            ov104_0223BC2C(SaveData_GetBattleFrontier(v11->saveData), v3->unk_10, 50);
         } else {
             v3->unk_A1C -= 50;
         }
@@ -471,10 +471,10 @@ BOOL ov104_02235BC0(UnkStruct_ov104_0222E930 *param0)
     case 44:
         if (v3->unk_10 == 3) {
             if (v15 == 0) {
-                v3->unk_22 = sub_02030698(sub_0203068C(v11->saveData), sub_0205E630(v3->unk_10), sub_0205E6A8(sub_0205E630(v3->unk_10)));
-                sub_020306E4(sub_0203068C(v11->saveData), sub_0205E630(v3->unk_10), sub_0205E6A8(sub_0205E630(v3->unk_10)), v3->unk_20);
+                v3->unk_22 = sub_02030698(SaveData_GetBattleFrontier(v11->saveData), sub_0205E630(v3->unk_10), sub_0205E6A8(sub_0205E630(v3->unk_10)));
+                sub_020306E4(SaveData_GetBattleFrontier(v11->saveData), sub_0205E630(v3->unk_10), sub_0205E6A8(sub_0205E630(v3->unk_10)), v3->unk_20);
             } else {
-                sub_020306E4(sub_0203068C(v11->saveData), sub_0205E630(v3->unk_10), sub_0205E6A8(sub_0205E630(v3->unk_10)), v3->unk_22);
+                sub_020306E4(SaveData_GetBattleFrontier(v11->saveData), sub_0205E630(v3->unk_10), sub_0205E6A8(sub_0205E630(v3->unk_10)), v3->unk_22);
             }
         }
         break;
@@ -590,7 +590,7 @@ BOOL ov104_022360D8(UnkStruct_ov104_0222E930 *param0)
     u16 *v2 = ov104_0222FBE4(param0);
 
     v0 = sub_0209B970(param0->unk_00->unk_00);
-    *v2 = sub_02030698(sub_0203068C(v0->saveData), sub_0205E630(v1), sub_0205E6A8(sub_0205E630(v1)));
+    *v2 = sub_02030698(SaveData_GetBattleFrontier(v0->saveData), sub_0205E630(v1), sub_0205E6A8(sub_0205E630(v1)));
 
     return 0;
 }
@@ -602,7 +602,7 @@ BOOL ov104_02236120(UnkStruct_ov104_0222E930 *param0)
     u16 v2 = ov104_0222FC00(param0);
 
     v0 = sub_0209B970(param0->unk_00->unk_00);
-    ov104_0223BC2C(sub_0203068C(v0->saveData), v1, v2);
+    ov104_0223BC2C(SaveData_GetBattleFrontier(v0->saveData), v1, v2);
 
     return 0;
 }
diff --git a/src/overlay104/ov104_022361B4.c b/src/overlay104/ov104_022361B4.c
index f352390e00..d17ae2f16d 100644
--- a/src/overlay104/ov104_022361B4.c
+++ b/src/overlay104/ov104_022361B4.c
@@ -100,15 +100,15 @@ UnkStruct_ov104_0223BA10 *ov104_022361B4(SaveData *param0, u16 param1, u8 param2
         }
 
         if (v5 == 1) {
-            v9->unk_14 = sub_02030698(sub_0203068C(v9->unk_04), sub_0205E5E0(v9->unk_10), sub_0205E6A8(sub_0205E5E0(v9->unk_10)));
+            v9->unk_14 = sub_02030698(SaveData_GetBattleFrontier(v9->unk_04), sub_0205E5E0(v9->unk_10), sub_0205E6A8(sub_0205E5E0(v9->unk_10)));
         } else {
             v9->unk_14 = 0;
 
-            sub_020306E4(sub_0203068C(v9->unk_04), sub_0205E630(v9->unk_10), sub_0205E6A8(sub_0205E630(v9->unk_10)), 0);
-            sub_020306E4(sub_0203068C(v9->unk_04), sub_0205E658(param2), sub_0205E6A8(sub_0205E658(param2)), 0);
+            sub_020306E4(SaveData_GetBattleFrontier(v9->unk_04), sub_0205E630(v9->unk_10), sub_0205E6A8(sub_0205E630(v9->unk_10)), 0);
+            sub_020306E4(SaveData_GetBattleFrontier(v9->unk_04), sub_0205E658(param2), sub_0205E6A8(sub_0205E658(param2)), 0);
 
             for (v7 = 0; v7 < 3; v7++) {
-                sub_020306E4(sub_0203068C(v9->unk_04), sub_0205E5B4(v9->unk_10, v7), sub_0205E6A8(sub_0205E5B4(v9->unk_10, v7)), 1);
+                sub_020306E4(SaveData_GetBattleFrontier(v9->unk_04), sub_0205E5B4(v9->unk_10, v7), sub_0205E6A8(sub_0205E5B4(v9->unk_10, v7)), 1);
             }
         }
 
@@ -117,13 +117,13 @@ UnkStruct_ov104_0223BA10 *ov104_022361B4(SaveData *param0, u16 param1, u8 param2
         v9->unk_24[0] = param3;
         v9->unk_24[1] = param4;
         v9->unk_24[2] = param5;
-        v9->unk_20 = sub_02030698(sub_0203068C(v9->unk_04), sub_0205E630(v9->unk_10), sub_0205E6A8(sub_0205E630(v9->unk_10)));
+        v9->unk_20 = sub_02030698(SaveData_GetBattleFrontier(v9->unk_04), sub_0205E630(v9->unk_10), sub_0205E6A8(sub_0205E630(v9->unk_10)));
 
-        sub_02030804(sub_0203068C(v9->unk_04), sub_0205E630(v9->unk_10), sub_0205E6A8(sub_0205E630(v9->unk_10)), 10);
+        sub_02030804(SaveData_GetBattleFrontier(v9->unk_04), sub_0205E630(v9->unk_10), sub_0205E6A8(sub_0205E630(v9->unk_10)), 10);
     } else {
         v9->unk_10 = (u8)sub_02030398(v4, 0, 0, 0, NULL);
         v9->unk_11 = (u8)sub_02030398(v4, 1, 0, 0, NULL);
-        v9->unk_14 = sub_02030698(sub_0203068C(v9->unk_04), sub_0205E5E0(v9->unk_10), sub_0205E6A8(sub_0205E5E0(v9->unk_10)));
+        v9->unk_14 = sub_02030698(SaveData_GetBattleFrontier(v9->unk_04), sub_0205E5E0(v9->unk_10), sub_0205E6A8(sub_0205E5E0(v9->unk_10)));
         v9->unk_16 = (u16)(v9->unk_14 / 7);
 
         for (v7 = 0; v7 < 3; v7++) {
@@ -354,12 +354,12 @@ void ov104_02236848(UnkStruct_ov104_0223BA10 *param0, u8 param1)
     u16 v5[4];
     u32 v6[4];
     u32 v7, v8, v9;
-    UnkStruct_0203068C *v10;
+    BattleFrontier *v10;
     Pokemon *v11;
     UnkStruct_020302DC *v12 = param0->unk_08;
     UnkStruct_0203041C *v13 = sub_0203041C(param0->unk_04);
 
-    v10 = sub_0203068C(param0->unk_04);
+    v10 = SaveData_GetBattleFrontier(param0->unk_04);
     v3 = ov104_0223B7DC(param0->unk_10, 1);
     v4[0] = param0->unk_10;
 
@@ -471,7 +471,7 @@ void ov104_02236B8C(UnkStruct_ov104_0223BA10 *param0)
     v0[0] = 1;
 
     for (v1 = 0; v1 < 3; v1++) {
-        sub_020306E4(sub_0203068C(param0->unk_04), sub_0205E5B4(param0->unk_10, v1), sub_0205E6A8(sub_0205E5B4(param0->unk_10, v1)), 1);
+        sub_020306E4(SaveData_GetBattleFrontier(param0->unk_04), sub_0205E5B4(param0->unk_10, v1), sub_0205E6A8(sub_0205E5B4(param0->unk_10, v1)), 1);
     }
 
     ov104_02236848(param0, 1);
@@ -653,12 +653,12 @@ int ov104_02236D10(UnkStruct_ov104_0223BA10 *param0)
 
 void ov104_02236ED8(SaveData *param0, u8 param1, int param2)
 {
-    u16 v0 = sub_02030698(sub_0203068C(param0), sub_0205E630(param1), sub_0205E6A8(sub_0205E630(param1)));
+    u16 v0 = sub_02030698(SaveData_GetBattleFrontier(param0), sub_0205E630(param1), sub_0205E6A8(sub_0205E630(param1)));
 
     if (v0 + param2 > 9999) {
-        sub_020306E4(sub_0203068C(param0), sub_0205E630(param1), sub_0205E6A8(sub_0205E630(param1)), 9999);
+        sub_020306E4(SaveData_GetBattleFrontier(param0), sub_0205E630(param1), sub_0205E6A8(sub_0205E630(param1)), 9999);
     } else {
-        sub_02030804(sub_0203068C(param0), sub_0205E630(param1), sub_0205E6A8(sub_0205E630(param1)), param2);
+        sub_02030804(SaveData_GetBattleFrontier(param0), sub_0205E630(param1), sub_0205E6A8(sub_0205E630(param1)), param2);
     }
 
     GameRecords_AddToRecordValue(SaveData_GetGameRecords(param0), RECORD_UNK_065, param2);
@@ -770,18 +770,18 @@ void ov104_02237180(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_0223BA10 *
 
     if (ov104_0223BA14(param1->unk_10) == 0) {
         GF_ASSERT(param0->unk_A8 != NULL);
-        v0 = sub_02030698(sub_0203068C(param1->unk_04), sub_0205E630(param1->unk_10), sub_0205E6A8(sub_0205E630(param1->unk_10)));
+        v0 = sub_02030698(SaveData_GetBattleFrontier(param1->unk_04), sub_0205E630(param1->unk_10), sub_0205E6A8(sub_0205E630(param1->unk_10)));
         ov104_02237284(param0, param0->unk_A8, SaveData_GetTrainerInfo(param1->unk_04), v0);
     } else {
         GF_ASSERT(param0->unk_A8 != NULL);
         GF_ASSERT(param0->unk_AC != NULL);
 
         if (CommSys_CurNetId() == 0) {
-            v0 = sub_02030698(sub_0203068C(param1->unk_04), sub_0205E630(param1->unk_10), sub_0205E6A8(sub_0205E630(param1->unk_10)));
+            v0 = sub_02030698(SaveData_GetBattleFrontier(param1->unk_04), sub_0205E630(param1->unk_10), sub_0205E6A8(sub_0205E630(param1->unk_10)));
             v1 = param1->unk_A1C;
         } else {
             v0 = param1->unk_A1C;
-            v1 = sub_02030698(sub_0203068C(param1->unk_04), sub_0205E630(param1->unk_10), sub_0205E6A8(sub_0205E630(param1->unk_10)));
+            v1 = sub_02030698(SaveData_GetBattleFrontier(param1->unk_04), sub_0205E630(param1->unk_10), sub_0205E6A8(sub_0205E630(param1->unk_10)));
         }
 
         ov104_02237284(param0, param0->unk_A8, CommInfo_TrainerInfo(0), v0);
diff --git a/src/overlay104/ov104_02237DD8.c b/src/overlay104/ov104_02237DD8.c
index 90dce18bcd..f937b1e8cd 100644
--- a/src/overlay104/ov104_02237DD8.c
+++ b/src/overlay104/ov104_02237DD8.c
@@ -180,7 +180,7 @@ UnkStruct_ov104_0223BFFC *ov104_02237DD8(SaveData *param0, u16 param1, u8 param2
         }
 
         if (v5 == 1) {
-            v9->unk_18 = sub_02030698(sub_0203068C(v9->unk_04), sub_0205E700(v9->unk_10), sub_0205E6A8(sub_0205E700(v9->unk_10)));
+            v9->unk_18 = sub_02030698(SaveData_GetBattleFrontier(v9->unk_04), sub_0205E700(v9->unk_10), sub_0205E6A8(sub_0205E700(v9->unk_10)));
         } else {
             v9->unk_18 = 0;
         }
@@ -196,7 +196,7 @@ UnkStruct_ov104_0223BFFC *ov104_02237DD8(SaveData *param0, u16 param1, u8 param2
         v9->unk_11 = (u8)sub_0203054C(v4, 2, 0, 0, NULL);
         v9->unk_1C = (u8)sub_0203054C(v4, 3, 0, 0, NULL);
         v9->unk_12 = (u8)sub_0203054C(v4, 1, 0, 0, NULL);
-        v9->unk_18 = sub_02030698(sub_0203068C(v9->unk_04), sub_0205E700(v9->unk_10), sub_0205E6A8(sub_0205E700(v9->unk_10)));
+        v9->unk_18 = sub_02030698(SaveData_GetBattleFrontier(v9->unk_04), sub_0205E700(v9->unk_10), sub_0205E6A8(sub_0205E700(v9->unk_10)));
         v9->unk_1A = (u16)(v9->unk_18 / 7);
 
         for (v7 = 0; v7 < 3; v7++) {
@@ -408,16 +408,16 @@ void ov104_02238278(UnkStruct_ov104_0223BFFC *param0, u8 param1)
 
     v2[0] = param0->unk_12;
     sub_020304CC(param0->unk_08, 1, 0, 0, v2);
-    sub_020306E4(sub_0203068C(param0->unk_04), sub_0205E700(param0->unk_10), sub_0205E6A8(sub_0205E700(param0->unk_10)), param0->unk_18);
+    sub_020306E4(SaveData_GetBattleFrontier(param0->unk_04), sub_0205E700(param0->unk_10), sub_0205E6A8(sub_0205E700(param0->unk_10)), param0->unk_18);
 
     if (param1 != 2) {
-        v5 = sub_02030848(sub_0203068C(param0->unk_04), sub_0205E728(param0->unk_10), sub_0205E6A8(sub_0205E728(param0->unk_10)), param0->unk_18);
+        v5 = sub_02030848(SaveData_GetBattleFrontier(param0->unk_04), sub_0205E728(param0->unk_10), sub_0205E6A8(sub_0205E728(param0->unk_10)), param0->unk_18);
 
         v2[0] = param0->unk_2F;
         sub_020305CC(v9, 8, param0->unk_10, 0, v2);
 
         if (param0->unk_10 == 3) {
-            sub_020306E4(sub_0203068C(param0->unk_04), 110, sub_0205E6A8(110), param0->unk_2F);
+            sub_020306E4(SaveData_GetBattleFrontier(param0->unk_04), 110, sub_0205E6A8(110), param0->unk_2F);
         }
     }
 
diff --git a/src/overlay104/ov104_022395F0.c b/src/overlay104/ov104_022395F0.c
index 12bf672537..53c5ca1807 100644
--- a/src/overlay104/ov104_022395F0.c
+++ b/src/overlay104/ov104_022395F0.c
@@ -233,10 +233,10 @@ BOOL ov104_022397B0(UnkStruct_ov104_0222E930 *param0)
         break;
 
     case 3:
-        *v9 = (u16)sub_02030698(sub_0203068C(v5->saveData), 106, sub_0205E6A8(106));
+        *v9 = (u16)sub_02030698(SaveData_GetBattleFrontier(v5->saveData), 106, sub_0205E6A8(106));
         break;
     case 4:
-        *v9 = sub_02030698(sub_0203068C(v5->saveData), sub_0205E55C(3), sub_0205E6A8(sub_0205E55C(3)));
+        *v9 = sub_02030698(SaveData_GetBattleFrontier(v5->saveData), sub_0205E55C(3), sub_0205E6A8(sub_0205E55C(3)));
         break;
     case 5:
         *v9 = v4->unk_76[v7];
@@ -259,24 +259,24 @@ BOOL ov104_022397B0(UnkStruct_ov104_0222E930 *param0)
     case 11:
         *v9 = 1;
         v1 = ov104_0223C264(v4->unk_A0);
-        v2 = sub_02030698(sub_0203068C(v4->unk_00), v1, sub_0205E6A8(v1));
+        v2 = sub_02030698(SaveData_GetBattleFrontier(v4->unk_00), v1, sub_0205E6A8(v1));
 
         if (v2 != v4->unk_72) {
-            sub_020306E4(sub_0203068C(v4->unk_00), v1, sub_0205E6A8(v1), 0);
+            sub_020306E4(SaveData_GetBattleFrontier(v4->unk_00), v1, sub_0205E6A8(v1), 0);
 
             v1 = ov104_0223C29C(v4->unk_A0);
-            sub_020306E4(sub_0203068C(v4->unk_00), v1, sub_0205E6A8(v1), 0);
+            sub_020306E4(SaveData_GetBattleFrontier(v4->unk_00), v1, sub_0205E6A8(v1), 0);
 
             *v9 = 0;
         }
         break;
     case 12:
         v1 = ov104_0223C29C(v4->unk_A0);
-        *v9 = sub_02030698(sub_0203068C(v4->unk_00), v1, sub_0205E6A8(v1));
+        *v9 = sub_02030698(SaveData_GetBattleFrontier(v4->unk_00), v1, sub_0205E6A8(v1));
 
         if (*v9 == 0) {
             v1 = ov104_0223C264(v4->unk_A0);
-            sub_020306E4(sub_0203068C(v4->unk_00), v1, sub_0205E6A8(v1), 0);
+            sub_020306E4(SaveData_GetBattleFrontier(v4->unk_00), v1, sub_0205E6A8(v1), 0);
 
             if (v4->unk_A0 == 1) {
                 v3 = sub_0202D750(v4->unk_00);
@@ -284,19 +284,19 @@ BOOL ov104_022397B0(UnkStruct_ov104_0222E930 *param0)
             }
 
             if (v4->unk_A0 == 4) {
-                sub_020306E4(sub_0203068C(v4->unk_00), 136, sub_0205E6A8(v1), 0);
-                sub_020306E4(sub_0203068C(v4->unk_00), 137, sub_0205E6A8(v1), 0);
+                sub_020306E4(SaveData_GetBattleFrontier(v4->unk_00), 136, sub_0205E6A8(v1), 0);
+                sub_020306E4(SaveData_GetBattleFrontier(v4->unk_00), 137, sub_0205E6A8(v1), 0);
             }
 
             if (v4->unk_A0 == 2) {
-                sub_020306E4(sub_0203068C(v4->unk_00), sub_0205E488(0, 3), sub_0205E6A8(sub_0205E488(0, 3)), 0);
+                sub_020306E4(SaveData_GetBattleFrontier(v4->unk_00), sub_0205E488(0, 3), sub_0205E6A8(sub_0205E488(0, 3)), 0);
             }
 
             if (v4->unk_A0 == 3) {
-                sub_020306E4(sub_0203068C(v4->unk_00), sub_0205E488(1, 3), sub_0205E6A8(sub_0205E488(1, 3)), 0);
+                sub_020306E4(SaveData_GetBattleFrontier(v4->unk_00), sub_0205E488(1, 3), sub_0205E6A8(sub_0205E488(1, 3)), 0);
             }
         } else {
-            sub_020306E4(sub_0203068C(v4->unk_00), v1, sub_0205E6A8(v1), 0);
+            sub_020306E4(SaveData_GetBattleFrontier(v4->unk_00), v1, sub_0205E6A8(v1), 0);
         }
         break;
     case 13:
diff --git a/src/overlay104/ov104_0223B6F4.c b/src/overlay104/ov104_0223B6F4.c
index 5954980fce..8bb9d8cc2d 100644
--- a/src/overlay104/ov104_0223B6F4.c
+++ b/src/overlay104/ov104_0223B6F4.c
@@ -427,7 +427,7 @@ u16 ov104_0223BC24(u16 param0)
     return param0;
 }
 
-void ov104_0223BC2C(UnkStruct_0203068C *param0, u8 param1, int param2)
+void ov104_0223BC2C(BattleFrontier *param0, u8 param1, int param2)
 {
     u16 v0;
 
diff --git a/src/overlay107/ov107_02241AE0.c b/src/overlay107/ov107_02241AE0.c
index c62fdddf4a..08985e9cd6 100644
--- a/src/overlay107/ov107_02241AE0.c
+++ b/src/overlay107/ov107_02241AE0.c
@@ -211,7 +211,7 @@ const u16 Unk_ov107_02249E12[] = {
 
 struct UnkStruct_ov107_02241D6C_t {
     OverlayManager * unk_00;
-    UnkStruct_0203068C * unk_04;
+    BattleFrontier * unk_04;
     u8 unk_08;
     u8 unk_09;
     u8 unk_0A;
@@ -473,7 +473,7 @@ int ov107_02241AE0 (OverlayManager * param0, int * param1)
     v1->unk_43C = v2->unk_18;
     v1->unk_12 = 0xff;
     v1->unk_49A = v2->unk_28;
-    v1->unk_04 = sub_0203068C(v1->unk_1CC);
+    v1->unk_04 = SaveData_GetBattleFrontier(v1->unk_1CC);
 
     for (v0 = 0; v0 < 3; v0++) {
         v1->unk_497[v0] = 1;
@@ -4143,7 +4143,7 @@ static void ov107_02245C94 (UnkStruct_ov107_02241D6C * param0, u8 param1, u8 par
 
             v4 = ov107_02249CAC(param0->unk_1CC, param0->unk_09, v2);
             v5[0] = (v4 + 1);
-            sub_020306E4(sub_0203068C(param0->unk_1CC), sub_0205E5B4(param0->unk_09, v2), sub_0205E6A8(sub_0205E5B4(param0->unk_09, v2)), (v4 + 1));
+            sub_020306E4(SaveData_GetBattleFrontier(param0->unk_1CC), sub_0205E5B4(param0->unk_09, v2), sub_0205E6A8(sub_0205E5B4(param0->unk_09, v2)), (v4 + 1));
 
             if (ov104_0223BA14(param0->unk_09) == 1) {
                 if (param2 == 4) {
@@ -4172,7 +4172,7 @@ static void ov107_02245C94 (UnkStruct_ov107_02241D6C * param0, u8 param1, u8 par
             v4 = ov107_02249CAC(param0->unk_1CC, param0->unk_09, v2);
 
             v5[0] = (v4 + 1);
-            sub_020306E4(sub_0203068C(param0->unk_1CC), sub_0205E5B4(param0->unk_09, v2), sub_0205E6A8(sub_0205E5B4(param0->unk_09, v2)), (v4 + 1));
+            sub_020306E4(SaveData_GetBattleFrontier(param0->unk_1CC), sub_0205E5B4(param0->unk_09, v2), sub_0205E6A8(sub_0205E5B4(param0->unk_09, v2)), (v4 + 1));
 
             if (ov104_0223BA14(param0->unk_09) == 1) {
                 if (param2 == 4) {
diff --git a/src/overlay107/ov107_02245EB0.c b/src/overlay107/ov107_02245EB0.c
index 53cba4c185..dad9209357 100644
--- a/src/overlay107/ov107_02245EB0.c
+++ b/src/overlay107/ov107_02245EB0.c
@@ -66,7 +66,7 @@ FS_EXTERN_OVERLAY(overlay104);
 
 struct UnkStruct_ov107_02246170_t {
     OverlayManager * unk_00;
-    UnkStruct_0203068C * unk_04;
+    BattleFrontier * unk_04;
     u8 unk_08;
     u8 unk_09;
     u8 unk_0A;
@@ -266,7 +266,7 @@ int ov107_02245EB0 (OverlayManager * param0, int * param1)
     v1->unk_3D8 = &v2->unk_14[0];
     v1->unk_11 = 0xff;
     v1->unk_43A = v2->unk_28;
-    v1->unk_04 = sub_0203068C(v1->unk_14C);
+    v1->unk_04 = SaveData_GetBattleFrontier(v1->unk_14C);
 
     for (v0 = 0; v0 < 3; v0++) {
         v1->unk_437[v0] = 1;
@@ -3464,7 +3464,7 @@ static void ov107_022493CC (UnkStruct_ov107_02246170 * param0, u8 param1, u8 par
             v4 = ov107_02249CAC(param0->unk_14C, param0->unk_09, v2);
 
             v5[0] = (v4 + 1);
-            sub_020306E4(sub_0203068C(param0->unk_14C), sub_0205E5B4(param0->unk_09, v2), sub_0205E6A8(sub_0205E5B4(param0->unk_09, v2)), (v4 + 1));
+            sub_020306E4(SaveData_GetBattleFrontier(param0->unk_14C), sub_0205E5B4(param0->unk_09, v2), sub_0205E6A8(sub_0205E5B4(param0->unk_09, v2)), (v4 + 1));
 
             if (ov104_0223BA14(param0->unk_09) == 1) {
                 param0->unk_0F_3 = 2;
@@ -3489,7 +3489,7 @@ static void ov107_022493CC (UnkStruct_ov107_02246170 * param0, u8 param1, u8 par
             v4 = ov107_02249CAC(param0->unk_14C, param0->unk_09, v2);
 
             v5[0] = (v4 + 1);
-            sub_020306E4(sub_0203068C(param0->unk_14C), sub_0205E5B4(param0->unk_09, v2), sub_0205E6A8(sub_0205E5B4(param0->unk_09, v2)), (v4 + 1));
+            sub_020306E4(SaveData_GetBattleFrontier(param0->unk_14C), sub_0205E5B4(param0->unk_09, v2), sub_0205E6A8(sub_0205E5B4(param0->unk_09, v2)), (v4 + 1));
 
             if (ov104_0223BA14(param0->unk_09) == 1) {
                 param0->unk_0F_3 = 2;
diff --git a/src/overlay107/ov107_02249C98.c b/src/overlay107/ov107_02249C98.c
index 37353db6c1..6a14534346 100644
--- a/src/overlay107/ov107_02249C98.c
+++ b/src/overlay107/ov107_02249C98.c
@@ -36,7 +36,7 @@ u8 ov107_02249C9C(u8 param0, u8 param1)
 
 u8 ov107_02249CAC(SaveData *param0, u8 param1, u8 param2)
 {
-    return sub_02030698(sub_0203068C(param0), sub_0205E5B4(param1, param2), sub_0205E6A8(sub_0205E5B4(param1, param2)));
+    return sub_02030698(SaveData_GetBattleFrontier(param0), sub_0205E5B4(param1, param2), sub_0205E6A8(sub_0205E5B4(param1, param2)));
 }
 
 void ov107_02249CE0(u32 param0, u16 param1)
diff --git a/src/overlay108/ov108_02241AE0.c b/src/overlay108/ov108_02241AE0.c
index 5ce4f6a655..1591693f59 100644
--- a/src/overlay108/ov108_02241AE0.c
+++ b/src/overlay108/ov108_02241AE0.c
@@ -150,7 +150,7 @@ static const u8 Unk_ov108_0224367C[] = {
 
 struct UnkStruct_ov108_02241DB0_t {
     OverlayManager *unk_00;
-    UnkStruct_0203068C *unk_04;
+    BattleFrontier *unk_04;
     u8 unk_08;
     u8 unk_09;
     u8 unk_0A;
@@ -302,7 +302,7 @@ int ov108_02241AE0(OverlayManager *param0, int *param1)
     v1->unk_3C8 = v2->unk_30;
     v1->unk_3CC = v2->unk_34;
     v1->unk_0E = 0xff;
-    v1->unk_04 = sub_0203068C(v1->unk_DC);
+    v1->unk_04 = SaveData_GetBattleFrontier(v1->unk_DC);
     v1->unk_3C0 = v2->unk_08;
     v1->unk_1C = v2->unk_0C;
     v1->unk_20 = v2->unk_10;
diff --git a/src/overlay110/ov110_021D0D80.c b/src/overlay110/ov110_021D0D80.c
index 251f349767..de2f2f05fc 100644
--- a/src/overlay110/ov110_021D0D80.c
+++ b/src/overlay110/ov110_021D0D80.c
@@ -54,7 +54,7 @@ typedef struct {
     PaletteData *unk_120;
     const Options * unk_124;
     SaveData * unk_128;
-    UnkStruct_0203068C * unk_12C;
+    BattleFrontier * unk_12C;
 } UnkStruct_ov110_021D0F78;
 
 int ov110_021D0D80(OverlayManager * param0, int * param1);
@@ -115,7 +115,7 @@ int ov110_021D0D80 (OverlayManager * param0, int * param1)
     v2 = (UnkStruct_0203E564 *)OverlayManager_Args(param0);
 
     v1->unk_128 = v2->unk_00;
-    v1->unk_12C = sub_0203068C(v1->unk_128);
+    v1->unk_12C = SaveData_GetBattleFrontier(v1->unk_128);
     v1->unk_05 = v2->unk_04;
     v1->unk_06 = v2->unk_05;
     v1->unk_08 = v2->unk_06;
@@ -745,7 +745,7 @@ static u32 ov110_021D17AC (UnkStruct_ov110_021D0F78 * param0, u8 param1)
     }
 
     if (param0->unk_05 == 3) {
-        v0 = sub_02030698(sub_0203068C(param0->unk_128), v1, sub_0205E6A8(v1));
+        v0 = sub_02030698(SaveData_GetBattleFrontier(param0->unk_128), v1, sub_0205E6A8(v1));
     } else {
         v0 = (u8)sub_020300E0(sub_020300F4(param0->unk_128), 10, (param1 * 4) + param0->unk_05, NULL);
     }
@@ -844,7 +844,7 @@ asm static void ov110_021D1808 (UnkStruct_ov110_021D0F78 * param0)
     mov r0, #0x4a
     lsl r0, r0, #2
     ldr r0, [r5, r0]
-    bl sub_0203068C
+    bl SaveData_GetBattleFrontier
     add r4, r0, #0
     ldrb r0, [r5, #5]
     bl sub_0205E55C
@@ -1088,7 +1088,7 @@ asm static void ov110_021D19F4 (UnkStruct_ov110_021D0F78 * param0)
     mov r0, #0x4a
     lsl r0, r0, #2
     ldr r0, [r5, r0]
-    bl sub_0203068C
+    bl SaveData_GetBattleFrontier
     add r4, r0, #0
     ldrb r0, [r5, #5]
     bl sub_0205E630
@@ -1160,7 +1160,7 @@ asm static void ov110_021D19F4 (UnkStruct_ov110_021D0F78 * param0)
     mov r0, #0x4a
     lsl r0, r0, #2
     ldr r0, [r5, r0]
-    bl sub_0203068C
+    bl SaveData_GetBattleFrontier
     add r4, r0, #0
     ldrb r0, [r5, #5]
     bl sub_0205E680
@@ -1205,7 +1205,7 @@ static u32 ov110_021D1BEC (UnkStruct_ov110_021D0F78 * param0)
     u8 v0;
 
     if (param0->unk_05 == 3) {
-        v0 = sub_02030698(sub_0203068C(param0->unk_128), 108, sub_0205E6A8(108));
+        v0 = sub_02030698(SaveData_GetBattleFrontier(param0->unk_128), 108, sub_0205E6A8(108));
     } else {
         v0 = (u8)sub_02030470(sub_0203041C(param0->unk_128), 9, param0->unk_05, 0, NULL);
     }
@@ -1361,7 +1361,7 @@ static u32 ov110_021D1D68 (UnkStruct_ov110_021D0F78 * param0)
     u8 v0;
 
     if (param0->unk_05 == 3) {
-        v0 = sub_02030698(sub_0203068C(param0->unk_128), 110, sub_0205E6A8(110));
+        v0 = sub_02030698(SaveData_GetBattleFrontier(param0->unk_128), 110, sub_0205E6A8(110));
     } else {
         v0 = (u8)sub_02030600(sub_020305B8(param0->unk_128), 8, param0->unk_05, 0, NULL);
     }
diff --git a/src/savedata/save_table.c b/src/savedata/save_table.c
index 73263c1900..190f294821 100644
--- a/src/savedata/save_table.c
+++ b/src/savedata/save_table.c
@@ -69,7 +69,7 @@ const SaveTableEntry gSaveTable[] = {
     { SAVE_TABLE_ENTRY_GAME_RECORDS, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)GameRecords_SaveSize, (SaveEntryInitFunc)GameRecords_Init },
     { SAVE_TABLE_ENTRY_BALL_SEALS, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)BallSeal_SaveSize, (SaveEntryInitFunc)BallSeal_Init },
     { SAVE_TABLE_ENTRY_CHATOT, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)ChatotCry_SaveSize, (SaveEntryInitFunc)ChatotCry_Init },
-    { SAVE_TABLE_ENTRY_FRONTIER, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)Frontier_SaveSize, (SaveEntryInitFunc)Frontier_Init },
+    { SAVE_TABLE_ENTRY_FRONTIER, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)BattleFrontier_SaveSize, (SaveEntryInitFunc)BattleFrontier_Init },
     { SAVE_TABLE_ENTRY_RIBBONS, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)Ribbons_SaveSize, (SaveEntryInitFunc)Ribbons_Init },
     { SAVE_TABLE_ENTRY_ENCOUNTERS, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)SpecialEncounter_SaveSize, (SaveEntryInitFunc)SpecialEncounter_Init },
     { SAVE_TABLE_ENTRY_GLOBAL_TRADE, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)GlobalTrade_SaveSize, (SaveEntryInitFunc)GlobalTrade_Init },
diff --git a/src/unk_0202D05C.c b/src/unk_0202D05C.c
index 3e88030e77..1534a771d1 100644
--- a/src/unk_0202D05C.c
+++ b/src/unk_0202D05C.c
@@ -374,13 +374,13 @@ u32 sub_0202D474(UnkStruct_0202D750 *param0)
 
 void sub_0202D478(SaveData *saveData, int param1, Sentence *param2)
 {
-    UnkStruct_0203068C *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
+    BattleFrontier *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
     sub_02014CC0(&(v0->unk_950.unk_168.unk_00[param1]), param2);
 }
 
 Sentence *sub_0202D498(SaveData *saveData, int param1)
 {
-    UnkStruct_0203068C *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
+    BattleFrontier *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
 
     return &(v0->unk_950.unk_168.unk_00[param1]);
 }
@@ -542,18 +542,18 @@ UnkStruct_ov90_021D1750 *sub_0202D71C(UnkStruct_0202D764 *param0, int heapID)
 
 UnkStruct_0202D060 *sub_0202D740(SaveData *saveData)
 {
-    UnkStruct_0203068C *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
+    BattleFrontier *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
     return &v0->unk_8E0_val1;
 }
 
 UnkStruct_0202D750 *sub_0202D750(SaveData *saveData)
 {
-    UnkStruct_0203068C *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
+    BattleFrontier *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
     return &v0->unk_950.unk_00;
 }
 
 UnkStruct_0202D764 *sub_0202D764(SaveData *saveData)
 {
-    UnkStruct_0203068C *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
+    BattleFrontier *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
     return &v0->unk_950.unk_188;
 }
diff --git a/src/unk_0202E840.c b/src/unk_0202E840.c
index fc1003e1ec..18132b5894 100644
--- a/src/unk_0202E840.c
+++ b/src/unk_0202E840.c
@@ -121,7 +121,7 @@ static u32 *sub_0202E924(SaveData *param0, int param1)
     int v0;
     u32 v1;
     GameRecords *v2;
-    UnkStruct_0203068C *v3;
+    BattleFrontier *v3;
     u32 *v4;
     static const int v5[] = {
         0x0,
@@ -140,7 +140,7 @@ static u32 *sub_0202E924(SaveData *param0, int param1)
     };
 
     v2 = SaveData_GetGameRecords(param0);
-    v3 = sub_0203068C(param0);
+    v3 = SaveData_GetBattleFrontier(param0);
     v4 = Heap_AllocFromHeapAtEnd(param1, 4 * 13);
 
     for (v0 = 0; v0 < 13; v0++) {
diff --git a/src/unk_0202FF4C.c b/src/unk_0202FF4C.c
index d19957f1d1..9931511d9b 100644
--- a/src/unk_0202FF4C.c
+++ b/src/unk_0202FF4C.c
@@ -26,7 +26,7 @@ void sub_0202FF4C(UnkStruct_0202FF58 *param0)
 
 UnkStruct_0202FF58 *sub_0202FF58(SaveData *saveData)
 {
-    UnkStruct_0203068C *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
+    BattleFrontier *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
     return &v0->unk_8E0_val2;
 }
 
@@ -148,6 +148,6 @@ u32 sub_020300E0(UnkStruct_020300F4 *param0, u8 param1, u8 param2, void *param3)
 
 UnkStruct_020300F4 *sub_020300F4(SaveData *saveData)
 {
-    UnkStruct_0203068C *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
+    BattleFrontier *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
     return &v0->unk_1614.unk_00;
 }
diff --git a/src/unk_02030108.c b/src/unk_02030108.c
index 4d54507cfc..7e7079b6c2 100644
--- a/src/unk_02030108.c
+++ b/src/unk_02030108.c
@@ -29,7 +29,7 @@ void sub_02030108(UnkStruct_02030114 *param0)
 
 UnkStruct_02030114 *sub_02030114(SaveData *saveData)
 {
-    UnkStruct_0203068C *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
+    BattleFrontier *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
     return &v0->unk_8E0_val3;
 }
 
@@ -148,7 +148,7 @@ void sub_02030260(UnkStruct_0203026C *param0)
 
 UnkStruct_0203026C *sub_0203026C(SaveData *saveData)
 {
-    UnkStruct_0203068C *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
+    BattleFrontier *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
     return &v0->unk_1618.unk_00;
 }
 
diff --git a/src/unk_020302D0.c b/src/unk_020302D0.c
index 03dfbb6d86..6c8eea880a 100644
--- a/src/unk_020302D0.c
+++ b/src/unk_020302D0.c
@@ -26,7 +26,7 @@ void sub_020302D0(UnkStruct_020302DC *param0)
 
 UnkStruct_020302DC *sub_020302DC(SaveData *saveData)
 {
-    UnkStruct_0203068C *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
+    BattleFrontier *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
     return &v0->unk_8E0_val4;
 }
 
@@ -123,7 +123,7 @@ void sub_02030410(UnkStruct_0203041C *param0)
 
 UnkStruct_0203041C *sub_0203041C(SaveData *saveData)
 {
-    UnkStruct_0203068C *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
+    BattleFrontier *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
     return &v0->unk_161C.unk_00;
 }
 
diff --git a/src/unk_02030494.c b/src/unk_02030494.c
index 02a3cd26c1..61b7362f16 100644
--- a/src/unk_02030494.c
+++ b/src/unk_02030494.c
@@ -26,7 +26,7 @@ void sub_02030494(UnkStruct_020304A0 *param0)
 
 UnkStruct_020304A0 *sub_020304A0(SaveData *saveData)
 {
-    UnkStruct_0203068C *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
+    BattleFrontier *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
     return &v0->unk_8E0_val5;
 }
 
@@ -115,7 +115,7 @@ void sub_020305AC(UnkStruct_020305B8 *param0)
 
 UnkStruct_020305B8 *sub_020305B8(SaveData *saveData)
 {
-    UnkStruct_0203068C *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
+    BattleFrontier *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
     return &v0->unk_1620.unk_00;
 }
 
diff --git a/src/unk_0203061C.c b/src/unk_0203061C.c
index 18f0864d93..3543e2b70c 100644
--- a/src/unk_0203061C.c
+++ b/src/unk_0203061C.c
@@ -13,14 +13,14 @@
 #include "unk_020302D0.h"
 #include "unk_02030494.h"
 
-int Frontier_SaveSize(void)
+int BattleFrontier_SaveSize(void)
 {
-    return sizeof(UnkStruct_0203068C);
+    return sizeof(BattleFrontier);
 }
 
-void Frontier_Init(UnkStruct_0203068C *param0)
+void BattleFrontier_Init(BattleFrontier *param0)
 {
-    MI_CpuClear8(param0, sizeof(UnkStruct_0203068C));
+    MI_CpuClear8(param0, sizeof(BattleFrontier));
 
     sub_0202D06C(&param0->unk_950.unk_00);
     sub_0202D080(&param0->unk_950.unk_168);
@@ -33,12 +33,12 @@ void Frontier_Init(UnkStruct_0203068C *param0)
     return;
 }
 
-UnkStruct_0203068C *sub_0203068C(SaveData *saveData)
+BattleFrontier *SaveData_GetBattleFrontier(SaveData *saveData)
 {
     return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
 }
 
-u16 sub_02030698(UnkStruct_0203068C *param0, int param1, int param2)
+u16 sub_02030698(BattleFrontier *param0, int param1, int param2)
 {
     UnkStruct_02030698 *v0 = &param0->unk_00;
 
@@ -68,7 +68,7 @@ u16 sub_02030698(UnkStruct_0203068C *param0, int param1, int param2)
     }
 }
 
-u16 sub_020306E4(UnkStruct_0203068C *param0, int param1, int param2, u16 param3)
+u16 sub_020306E4(BattleFrontier *param0, int param1, int param2, u16 param3)
 {
     UnkStruct_02030698 *v0 = &param0->unk_00;
 
@@ -107,7 +107,7 @@ u16 sub_020306E4(UnkStruct_0203068C *param0, int param1, int param2, u16 param3)
     return param3;
 }
 
-void sub_02030764(UnkStruct_0203068C *param0)
+void sub_02030764(BattleFrontier *param0)
 {
     int v0;
     UnkStruct_02030698 *v1 = &param0->unk_00;
@@ -119,7 +119,7 @@ void sub_02030764(UnkStruct_0203068C *param0)
     }
 }
 
-void sub_02030788(UnkStruct_0203068C *param0, int param1)
+void sub_02030788(BattleFrontier *param0, int param1)
 {
     UnkStruct_02030698 *v0 = &param0->unk_00;
     int v1, v2;
@@ -140,13 +140,13 @@ void sub_02030788(UnkStruct_0203068C *param0, int param1)
     MI_CpuClear8(v0->unk_E0[v1], sizeof(u16) * (144 - 112));
 }
 
-void sub_020307F0(UnkStruct_0203068C *param0, int param1, int param2)
+void sub_020307F0(BattleFrontier *param0, int param1, int param2)
 {
     UnkStruct_02030698 *v0 = &param0->unk_00;
     MI_CpuClear8(v0->unk_E0[param1], sizeof(u16) * (144 - 112));
 }
 
-u16 sub_02030804(UnkStruct_0203068C *param0, int param1, int param2, int param3)
+u16 sub_02030804(BattleFrontier *param0, int param1, int param2, int param3)
 {
     UnkStruct_02030698 *v0 = &param0->unk_00;
     u16 v1 = sub_02030698(param0, param1, param2);
@@ -155,7 +155,7 @@ u16 sub_02030804(UnkStruct_0203068C *param0, int param1, int param2, int param3)
     return sub_020306E4(param0, param1, param2, v1);
 }
 
-u16 sub_02030824(UnkStruct_0203068C *param0, int param1, int param2, int param3)
+u16 sub_02030824(BattleFrontier *param0, int param1, int param2, int param3)
 {
     UnkStruct_02030698 *v0 = &param0->unk_00;
     int v1 = sub_02030698(param0, param1, param2);
@@ -168,7 +168,7 @@ u16 sub_02030824(UnkStruct_0203068C *param0, int param1, int param2, int param3)
     return sub_020306E4(param0, param1, param2, v1);
 }
 
-u16 sub_02030848(UnkStruct_0203068C *param0, int param1, int param2, u16 param3)
+u16 sub_02030848(BattleFrontier *param0, int param1, int param2, u16 param3)
 {
     u16 v0 = sub_02030698(param0, param1, param2);
 
diff --git a/src/unk_02030880.c b/src/unk_02030880.c
index 89e76b85cc..f05f9560ce 100644
--- a/src/unk_02030880.c
+++ b/src/unk_02030880.c
@@ -120,7 +120,7 @@ static u16 sub_02030954(SaveData *param0, BattleFrontierStage *param1, int param
 
 BOOL sub_020309A0(SaveData *param0, int param1, int param2, int param3, int param4, int param5, int *param6, int *param7)
 {
-    UnkStruct_0203068C *v0;
+    BattleFrontier *v0;
     BattleFrontierStage *v1;
     u16 v2, v3, v4;
     int v5;
@@ -140,7 +140,7 @@ BOOL sub_020309A0(SaveData *param0, int param1, int param2, int param3, int para
         return v6;
     }
 
-    v0 = sub_0203068C(param0);
+    v0 = SaveData_GetBattleFrontier(param0);
     v3 = sub_02030698(v0, param1, param3);
     v5 = sub_02030698(v0, param2, param3);
     v1 = sub_020308A0(param0, param5, param6);
diff --git a/src/unk_02049D08.c b/src/unk_02049D08.c
index 4cd3c23d03..ac987d08fb 100644
--- a/src/unk_02049D08.c
+++ b/src/unk_02049D08.c
@@ -246,11 +246,11 @@ u16 sub_02049FF8(SaveData *param0, u16 param1)
     }
 
     if (param1 == 6) {
-        v0 = sub_02030698(sub_0203068C(param0), 113, sub_0205E6A8(113));
+        v0 = sub_02030698(SaveData_GetBattleFrontier(param0), 113, sub_0205E6A8(113));
         return v0;
     }
 
-    v0 = sub_02030698(sub_0203068C(param0), 1 + param1 * 2, 0xff);
+    v0 = sub_02030698(SaveData_GetBattleFrontier(param0), 1 + param1 * 2, 0xff);
 
     return v0;
 }
@@ -288,13 +288,13 @@ u16 sub_0204A064(SaveData *param0)
     }
 
     if (v0 == 6) {
-        sub_020306E4(sub_0203068C(param0), 100, sub_0205E6A8(100), 0);
+        sub_020306E4(SaveData_GetBattleFrontier(param0), 100, sub_0205E6A8(100), 0);
     } else {
         sub_0202D414(v3, 8 + v0, 2);
     }
 
     sub_0202D3B4(v3, v0, 2);
-    sub_020306E4(sub_0203068C(param0), sub_0205E750(v0), sub_0205E6A8(sub_0205E750(v0)), 0);
+    sub_020306E4(SaveData_GetBattleFrontier(param0), sub_0205E750(v0), sub_0205E6A8(sub_0205E750(v0)), 0);
 
     if ((v0 != 4) && (v0 != 6)) {
         sub_0206C02C(param0);
@@ -320,7 +320,7 @@ UnkStruct_0204AFC4 *sub_0204A124(SaveData *param0, u16 param1, u16 param2)
     u8 v0;
     u16 v1, v2;
     UnkStruct_0204AFC4 *v3;
-    UnkStruct_0203068C *v4;
+    BattleFrontier *v4;
     GameRecords *v5;
 
     v3 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0204AFC4));
@@ -372,7 +372,7 @@ UnkStruct_0204AFC4 *sub_0204A124(SaveData *param0, u16 param1, u16 param2)
     v3->unk_11 = TrainerInfo_Gender(SaveData_GetTrainerInfo(param0));
 
     if (v3->unk_0F != 5) {
-        v4 = sub_0203068C(param0);
+        v4 = SaveData_GetBattleFrontier(param0);
         v5 = SaveData_GetGameRecords(param0);
 
         if (v3->unk_0F == 6) {
@@ -597,7 +597,7 @@ void sub_0204A660(UnkStruct_0204AFC4 *param0, SaveData *param1)
     int v1;
     u16 v2, v3, v4;
     GameRecords *v5 = SaveData_GetGameRecords(param1);
-    UnkStruct_0203068C *v6 = sub_0203068C(param1);
+    BattleFrontier *v6 = SaveData_GetBattleFrontier(param1);
 
     if (param0->unk_0F == 5) {
         return;
@@ -619,7 +619,7 @@ void sub_0204A660(UnkStruct_0204AFC4 *param0, SaveData *param1)
     }
 
     if (param0->unk_0F == 6) {
-        v4 = sub_02030698(sub_0203068C(param1), 100, sub_0205E6A8(100));
+        v4 = sub_02030698(SaveData_GetBattleFrontier(param1), 100, sub_0205E6A8(100));
     } else {
         v4 = sub_0202D414(param0->unk_74, 8 + param0->unk_0F, 0);
     }
@@ -627,7 +627,7 @@ void sub_0204A660(UnkStruct_0204AFC4 *param0, SaveData *param1)
     v0 = sub_020306E4(v6, v1 + 1, sub_0205E6A8(v1 + 1), (param0->unk_1A + param0->unk_0D));
 
     if (param0->unk_0F == 6) {
-        sub_020306E4(sub_0203068C(param1), 100, sub_0205E6A8(100), 0);
+        sub_020306E4(SaveData_GetBattleFrontier(param1), 100, sub_0205E6A8(100), 0);
     } else {
         sub_0202D414(param0->unk_74, 8 + param0->unk_0F, 2);
     }
@@ -657,14 +657,14 @@ void sub_0204A7A4(UnkStruct_0204AFC4 *param0, SaveData *param1, JournalEntry *jo
     void *journalEntryOnlineEvent;
     u16 v3, v4, v5;
     GameRecords *v6;
-    UnkStruct_0203068C *v7;
+    BattleFrontier *v7;
 
     if (param0->unk_0F == 5) {
         return;
     }
 
     v6 = SaveData_GetGameRecords(param1);
-    v7 = sub_0203068C(param1);
+    v7 = SaveData_GetBattleFrontier(param1);
 
     if (param0->unk_0F == 6) {
         v1 = 112;
@@ -673,7 +673,7 @@ void sub_0204A7A4(UnkStruct_0204AFC4 *param0, SaveData *param1, JournalEntry *jo
     }
 
     if (param0->unk_0F == 6) {
-        v5 = sub_02030698(sub_0203068C(param1), 100, sub_0205E6A8(100));
+        v5 = sub_02030698(SaveData_GetBattleFrontier(param1), 100, sub_0205E6A8(100));
     } else {
         v5 = sub_0202D414(param0->unk_74, 8 + param0->unk_0F, 0);
     }
@@ -681,7 +681,7 @@ void sub_0204A7A4(UnkStruct_0204AFC4 *param0, SaveData *param1, JournalEntry *jo
     v0 = sub_020306E4(v7, v1 + 1, sub_0205E6A8(v1 + 1), (param0->unk_1A + param0->unk_0D));
 
     if (param0->unk_0F == 6) {
-        sub_020306E4(sub_0203068C(param1), 100, sub_0205E6A8(100), 1);
+        sub_020306E4(SaveData_GetBattleFrontier(param1), 100, sub_0205E6A8(100), 1);
     } else {
         sub_0202D414(param0->unk_74, 8 + param0->unk_0F, 1);
     }
@@ -937,7 +937,7 @@ u16 sub_0204ABF4(UnkStruct_0204AFC4 *param0, SaveData *param1)
     u8 v0;
 
     if (param0->unk_0F == 6) {
-        v0 = sub_02030698(sub_0203068C(param1), 100, sub_0205E6A8(100));
+        v0 = sub_02030698(SaveData_GetBattleFrontier(param1), 100, sub_0205E6A8(100));
     } else {
         v0 = sub_0202D414(param0->unk_74, 8 + param0->unk_0F, 0);
     }
diff --git a/src/unk_0204F04C.c b/src/unk_0204F04C.c
index dbfb579321..06b2bdef7d 100644
--- a/src/unk_0204F04C.c
+++ b/src/unk_0204F04C.c
@@ -33,11 +33,11 @@ BOOL ScrCmd_2C5(ScriptContext *param0)
             v0 = 104;
         }
 
-        sub_020306E4(sub_0203068C(param0->fieldSystem->saveData), v0, sub_0205E6A8(v0), 0);
+        sub_020306E4(SaveData_GetBattleFrontier(param0->fieldSystem->saveData), v0, sub_0205E6A8(v0), 0);
     }
 
-    sub_020306E4(sub_0203068C(param0->fieldSystem->saveData), sub_0205E430(v4, v3), sub_0205E6A8(sub_0205E430(v4, v3)), 0);
-    sub_020306E4(sub_0203068C(param0->fieldSystem->saveData), sub_0205E488(v4, v3), sub_0205E6A8(sub_0205E488(v4, v3)), 0);
+    sub_020306E4(SaveData_GetBattleFrontier(param0->fieldSystem->saveData), sub_0205E430(v4, v3), sub_0205E6A8(sub_0205E430(v4, v3)), 0);
+    sub_020306E4(SaveData_GetBattleFrontier(param0->fieldSystem->saveData), sub_0205E488(v4, v3), sub_0205E6A8(sub_0205E488(v4, v3)), 0);
 
     return 0;
 }
diff --git a/src/unk_0204F13C.c b/src/unk_0204F13C.c
index 1ee5188158..a17818a203 100644
--- a/src/unk_0204F13C.c
+++ b/src/unk_0204F13C.c
@@ -105,7 +105,7 @@ BOOL ScrCmd_2CC(ScriptContext *param0)
     case 1:
 
         if (v4 == 3) {
-            *v6 = sub_02030698(sub_0203068C(param0->fieldSystem->saveData),
+            *v6 = sub_02030698(SaveData_GetBattleFrontier(param0->fieldSystem->saveData),
                 106,
                 sub_0205E6A8(106));
         } else {
@@ -114,7 +114,7 @@ BOOL ScrCmd_2CC(ScriptContext *param0)
         break;
 
     case 2:
-        *v6 = sub_02030698(sub_0203068C(param0->fieldSystem->saveData),
+        *v6 = sub_02030698(SaveData_GetBattleFrontier(param0->fieldSystem->saveData),
             sub_0205E55C(v4),
             sub_0205E6A8(sub_0205E55C(v4)));
         break;
@@ -518,7 +518,7 @@ BOOL ScrCmd_324(ScriptContext *param0)
     int v0;
     int v1;
     BattleFrontierStage *v2;
-    UnkStruct_0203068C *v3;
+    BattleFrontier *v3;
     u32 v4, v5, v6;
     u16 v7, v8;
     FieldSystem *fieldSystem = param0->fieldSystem;
@@ -653,7 +653,7 @@ BOOL ScrCmd_326(ScriptContext *param0)
     int v0;
     int v1;
     BattleFrontierStage *v2;
-    UnkStruct_0203068C *v3;
+    BattleFrontier *v3;
     u32 v4, v5;
     FieldSystem *fieldSystem = param0->fieldSystem;
     u16 *v7 = ScriptContext_GetVarPointer(param0);
@@ -698,11 +698,11 @@ BOOL ScrCmd_32A(ScriptContext *param0)
 
     u16 *v2 = ScriptContext_GetVarPointer(param0);
 
-    v0 = sub_02030698(sub_0203068C(param0->fieldSystem->saveData),
+    v0 = sub_02030698(SaveData_GetBattleFrontier(param0->fieldSystem->saveData),
         sub_0205E55C(0),
         0xff);
 
-    v1 = sub_02030698(sub_0203068C(param0->fieldSystem->saveData),
+    v1 = sub_02030698(SaveData_GetBattleFrontier(param0->fieldSystem->saveData),
         sub_0205E50C(0),
         0xff);
 
diff --git a/src/unk_0204FA34.c b/src/unk_0204FA34.c
index 2bad408114..10877b6745 100644
--- a/src/unk_0204FA34.c
+++ b/src/unk_0204FA34.c
@@ -42,10 +42,10 @@ void sub_0204FA50(SaveData *param0, UnkStruct_0203026C *param1, u8 param2)
     sub_02030280(param1, 5, param2, 0, v1);
 
     if (param2 == 3) {
-        sub_020306E4(sub_0203068C(param0), 106, sub_0205E6A8(106), 0);
+        sub_020306E4(SaveData_GetBattleFrontier(param0), 106, sub_0205E6A8(106), 0);
     }
 
-    sub_020306E4(sub_0203068C(param0), sub_0205E50C(param2), sub_0205E6A8(sub_0205E50C(param2)), 0);
+    sub_020306E4(SaveData_GetBattleFrontier(param0), sub_0205E50C(param2), sub_0205E6A8(sub_0205E50C(param2)), 0);
 
     return;
 }
diff --git a/src/unk_0204FAB4.c b/src/unk_0204FAB4.c
index 15cf10fcb6..cf5e3e56dd 100644
--- a/src/unk_0204FAB4.c
+++ b/src/unk_0204FAB4.c
@@ -83,7 +83,7 @@ BOOL ScrCmd_2D2(ScriptContext *param0)
         break;
     case 1:
         if (v4 == 3) {
-            *v6 = sub_02030698(sub_0203068C(param0->fieldSystem->saveData), 108, sub_0205E6A8(108));
+            *v6 = sub_02030698(SaveData_GetBattleFrontier(param0->fieldSystem->saveData), 108, sub_0205E6A8(108));
         } else {
             *v6 = (u16)sub_02030470(v11, 9, v4, 0, NULL);
         }
@@ -134,16 +134,16 @@ static void sub_0204FBEC(SaveData *param0, UnkStruct_0203041C *param1, u8 param2
     sub_02030430(param1, 9, param2, 0, v2);
 
     if (param2 == 3) {
-        sub_020306E4(sub_0203068C(param0), 108, sub_0205E6A8(108), 0);
+        sub_020306E4(SaveData_GetBattleFrontier(param0), 108, sub_0205E6A8(108), 0);
     }
 
-    sub_020306E4(sub_0203068C(param0), sub_0205E5E0(param2), sub_0205E6A8(sub_0205E5E0(param2)), 0);
-    sub_020306E4(sub_0203068C(param0), sub_0205E630(param2), sub_0205E6A8(sub_0205E630(param2)), 0);
+    sub_020306E4(SaveData_GetBattleFrontier(param0), sub_0205E5E0(param2), sub_0205E6A8(sub_0205E5E0(param2)), 0);
+    sub_020306E4(SaveData_GetBattleFrontier(param0), sub_0205E630(param2), sub_0205E6A8(sub_0205E630(param2)), 0);
 
     v1[0] = 1;
 
     for (v0 = 0; v0 < 3; v0++) {
-        sub_020306E4(sub_0203068C(param0), sub_0205E5B4(param2, v0), sub_0205E6A8(sub_0205E5B4(param2, v0)), 1);
+        sub_020306E4(SaveData_GetBattleFrontier(param0), sub_0205E5B4(param2, v0), sub_0205E6A8(sub_0205E5B4(param2, v0)), 1);
     }
 
     return;
diff --git a/src/unk_0205003C.c b/src/unk_0205003C.c
index f05f0562d5..fb6ad6f694 100644
--- a/src/unk_0205003C.c
+++ b/src/unk_0205003C.c
@@ -83,7 +83,7 @@ BOOL ScrCmd_2D9(ScriptContext *param0)
         break;
     case 1:
         if (v4 == 3) {
-            *v6 = sub_02030698(sub_0203068C(param0->fieldSystem->saveData), 110, sub_0205E6A8(110));
+            *v6 = sub_02030698(SaveData_GetBattleFrontier(param0->fieldSystem->saveData), 110, sub_0205E6A8(110));
         } else {
             *v6 = (u16)sub_02030600(v11, 8, v4, 0, NULL);
         }
@@ -134,10 +134,10 @@ static void sub_02050174(SaveData *param0, UnkStruct_020305B8 *param1, u8 param2
     sub_020305CC(param1, 8, param2, 0, v2);
 
     if (param2 == 3) {
-        sub_020306E4(sub_0203068C(param0), 110, sub_0205E6A8(110), 0);
+        sub_020306E4(SaveData_GetBattleFrontier(param0), 110, sub_0205E6A8(110), 0);
     }
 
-    sub_020306E4(sub_0203068C(param0), sub_0205E700(param2), sub_0205E6A8(sub_0205E700(param2)), 0);
+    sub_020306E4(SaveData_GetBattleFrontier(param0), sub_0205E700(param2), sub_0205E6A8(sub_0205E700(param2)), 0);
     return;
 }
 
diff --git a/src/unk_0206B9D8.c b/src/unk_0206B9D8.c
index 298a249397..5f3902ad7e 100644
--- a/src/unk_0206B9D8.c
+++ b/src/unk_0206B9D8.c
@@ -326,13 +326,13 @@ void sub_0206BD88(FieldTask *param0, u16 param1, u16 param2)
 
 u16 sub_0206BDBC(SaveData *param0)
 {
-    UnkStruct_0203068C *v0;
+    BattleFrontier *v0;
     UnkStruct_0202D750 *v1;
     UndergroundData *v2;
     u16 v3;
     u8 v4, v5, v6, v7, v8, v9;
 
-    v0 = sub_0203068C(param0);
+    v0 = SaveData_GetBattleFrontier(param0);
     v3 = sub_02030698(v0, 0, 0xff);
 
     if (v3 < 20) {
@@ -401,12 +401,12 @@ u16 sub_0206BDBC(SaveData *param0)
 
 u16 sub_0206BF04(SaveData *param0)
 {
-    UnkStruct_0203068C *v0;
+    BattleFrontier *v0;
     UnkStruct_0202D750 *v1;
     u16 v2;
     u8 v3, v4, v5, v6, v7, v8;
 
-    v0 = sub_0203068C(param0);
+    v0 = SaveData_GetBattleFrontier(param0);
     v2 = sub_02030698(v0, 0, 0xff);
 
     if (v2 < 20) {
diff --git a/src/unk_02071D40.c b/src/unk_02071D40.c
index 28da825669..6e239c1c06 100644
--- a/src/unk_02071D40.c
+++ b/src/unk_02071D40.c
@@ -125,13 +125,13 @@ u8 sub_02071F28(FieldSystem *fieldSystem)
     GameRecords *gameRecords;
     VarsFlags *varsFlags;
     SecretBaseRecord *v4;
-    UnkStruct_0203068C *v5;
+    BattleFrontier *v5;
 
     saveData = FieldSystem_GetSaveData(fieldSystem);
     gameRecords = SaveData_GetGameRecords(saveData);
     varsFlags = SaveData_GetVarsFlags(saveData);
     v4 = SaveData_SecretBaseRecord(saveData);
-    v5 = sub_0203068C(saveData);
+    v5 = SaveData_GetBattleFrontier(saveData);
     v0 = 0;
 
     if (SystemFlag_CheckGameCompleted(varsFlags)) {
diff --git a/src/unk_0209BA80.c b/src/unk_0209BA80.c
index 63dca326c5..60dc7d8432 100644
--- a/src/unk_0209BA80.c
+++ b/src/unk_0209BA80.c
@@ -199,7 +199,7 @@ BOOL sub_0209BBA4(UnkStruct_0209BBA4 *param0)
     param0->unk_08[0] = param0->unk_A0;
 
     v2 = ov104_0223C264(param0->unk_A0);
-    param0->unk_08[1] = sub_02030698(sub_0203068C(param0->unk_00), v2, sub_0205E6A8(v2));
+    param0->unk_08[1] = sub_02030698(SaveData_GetBattleFrontier(param0->unk_00), v2, sub_0205E6A8(v2));
 
     if (CommSys_SendData(57, param0->unk_08, v1) == 1) {
         v0 = 1;