more battle frontier 2

4 files changed, 33 insertions, 32 deletions

diff --git a/include/apprentice.h b/include/apprentice.h
index ca0b04800..23e1fc8f2 100644
--- a/include/apprentice.h
+++ b/include/apprentice.h
@@ -9,7 +9,9 @@ struct ApprenticeTrainer
     u16 otId;
     u8 facilityClass;
     u16 species[APPRENTICE_SPECIES_COUNT];
-    u8 rest[14];
+    u8 unk;
+    u8 unk_;
+    u16 easyChatWords[6];
 };
 
 extern const struct ApprenticeTrainer gApprentices[];
diff --git a/include/battle_frontier_2.h b/include/battle_frontier_2.h
index 3bd605829..c4639aded 100644
--- a/include/battle_frontier_2.h
+++ b/include/battle_frontier_2.h
@@ -2,8 +2,8 @@
 #define GUARD_BATTLE_FRONTIER_2_H
 
 #define FRONTIER_BEFORE_TEXT 0
-#define FRONTIER_WIN_TEXT 1
-#define FRONTIER_LOSE_TEXT 2
+#define FRONTIER_PLAYER_LOST_TEXT 1
+#define FRONTIER_PLAYER_WON_TEXT 2
 
 void CopyFrontierTrainerText(u8 whichText, u16 trainerId);
 void sub_81A8934(u8);
@@ -15,5 +15,7 @@ void sub_81AA078(u16*, u8);
 void sub_81A4C30(void);
 bool8 sub_81A6BF4(void);
 u8 sub_81A6CA8(u8, u8);
+void sub_81A3908(void);
+u32 GetCurrentFacilityWinStreak(void);
 
 #endif // GUARD_BATTLE_FRONTIER_2_H
diff --git a/include/global.h b/include/global.h
index d23800139..7f5a025be 100644
--- a/include/global.h
+++ b/include/global.h
@@ -331,8 +331,8 @@ struct EmeraldBattleTowerRecord
     /*0x04*/ u8 name[PLAYER_NAME_LENGTH + 1];
     /*0x0C*/ u8 trainerId[4];
     /*0x10*/ u16 greeting[6];
-    /*0x1C*/ u16 unk1C[6];
-    /*0x28*/ u16 unk28[6];
+    /*0x1C*/ u16 speechWon[6];
+    /*0x28*/ u16 speechLost[6];
     /*0x34*/ struct UnknownPokemonStruct party[4];
     /*0xE4*/ u8 language;
     /*0xE8*/ u32 checksum;
@@ -400,8 +400,8 @@ struct BattleFrontier
     /*0xCB2*/ u16 curChallengeBattleNum; // In case of battle pyramid, the floor.
     /*0xCB4*/ u16 field_CB4[20];
     /*0xCDC*/ u32 field_CDC;
-    /*0xCE0*/ u16 winStreaks[4][2];
-    /*0xCF0*/ u16 field_CF0[4][2];
+    /*0xCE0*/ u16 towerWinStreaks[4][2];
+    /*0xCF0*/ u16 towerRecordWinStreaks[4][2];
     /*0xD06*/ u16 field_D00;
     /*0xD06*/ u16 field_D02;
     /*0xD06*/ u16 field_D04;
@@ -418,34 +418,29 @@ struct BattleFrontier
     /*0xD09*/ u8 filler_D09;
     /*0xD0A*/ u8 field_D0A;
     /*0xD0B*/ u8 field_D0B;
-    /*0xD0C*/ u16 field_D0C[2][2];
-    /*0xD14*/ u16 field_D14[2][2];
-    /*0xD1C*/ u16 field_D1C[2][2];
+    /*0xD0C*/ u16 domeWinStreaks[2][2];
+    /*0xD14*/ u16 domeRecordWinStreaks[2][2];
+    /*0xD1C*/ u16 domeTotalChampionships[2][2];
     /*0xD24*/ struct BattleDomeTrainer domeTrainers[DOME_TOURNAMENT_TRAINERS_COUNT];
-    /*0xD64*/ u16 domeMonId[DOME_TOURNAMENT_TRAINERS_COUNT][3];
+    /*0xD64*/ u16 domeMonIds[DOME_TOURNAMENT_TRAINERS_COUNT][3];
     /*0xD64*/ u16 field_DC4[2];
-    /*0xDC8*/ u16 field_DC8[2][2];
-    /*0xDD0*/ u16 field_DD0[2][2];
+    /*0xDC8*/ u16 palaceWinStreaks[2][2];
+    /*0xDD0*/ u16 palaceRecordWinStreaks[2][2];
     /*0xDD8*/ u16 field_DD8;
-    /*0xDDA*/ u16 field_DDA[2];
-    /*0xDDE*/ u16 field_DDE[2];
-    /*0xDE2*/ u16 field_DE2[2][2];
-    /*0xDEA*/ u16 field_DEA[2];
-    /*0xDEE*/ u16 field_DEE;
-    /*0xDF0*/ u16 field_DF0;
-    /*0xDF2*/ u16 field_DF2;
-    /*0xDF4*/ u16 field_DF4;
-    /*0xDF6*/ u16 field_DF6;
-    /*0xDF8*/ u16 field_DF8;
-    /*0xDFA*/ u16 field_DFA;
-    /*0xDFC*/ u16 field_DFC;
-    /*0xDFE*/ u16 field_DFE;
-    /*0xE00*/ u16 field_E00;
+    /*0xDDA*/ u16 arenaWinStreaks[2];
+    /*0xDDE*/ u16 arenaRecordStreaks[2];
+    /*0xDE2*/ u16 factoryWinStreaks[2][2];
+    /*0xDEA*/ u16 factoryRecordWinStreaks[2][2];
+    /*0xDF6*/ u16 factoryRentsCount[2][2];
+    /*0xDFA*/ u16 factoryRecordRentsCount[2][2];
     /*0xE02*/ u16 field_E02;
-    /*0xE04*/ u16 field_E04[2];
-    /*0xE08*/ u16 field_E08[9];
-    /*0xE1A*/ u16 field_E1A[2];
-    /*0xE1E*/ u16 field_E1E[7];
+    /*0xE04*/ u16 pikeWinStreaks[2];
+    /*0xE08*/ u16 pikeRecordStreaks[2];
+    /*0xE0C*/ u16 pikeTotalStreaks[2];
+    /*0xE10*/ u16 field_E10[5];
+    /*0xE1A*/ u16 pyramidWinStreaks[2];
+    /*0xE1E*/ u16 pyramidRecordStreaks[2];
+    /*0xE1E*/ u16 field_E1F[5];
     /*0xE2C*/ struct PyramidBag pyramidBag;
     /*0xE58*/ u16 field_E58;
     /*0xE6A*/ u16 field_E6A;
@@ -517,7 +512,7 @@ struct SaveBlock2
     /*0x1FC*/ struct PokemonJumpResults pokeJump;
     /*0x20C*/ struct BerryPickingResults berryPick;
     /*0x21C*/ u8 field_21C[1032];
-    /*0x624*/ u16 contestLinkResults[20]; // 4 positions for 5 categories, possibly a struct or a 2d array
+    /*0x624*/ u16 contestLinkResults[5][4]; // 4 positions for 5 categories.
     /*0x64C*/ struct BattleFrontier frontier;
 }; // sizeof=0xF2C
 
diff --git a/include/tv.h b/include/tv.h
index 4f1d7730f..5528bada7 100644
--- a/include/tv.h
+++ b/include/tv.h
@@ -51,5 +51,7 @@ void BravoTrainerPokemonProfile_BeforeInterview1(u16 move);
 void UpdateTVScreensOnMap(int, int);
 void TV_PrintIntToStringVar(u8 varIdx, int value);
 void SaveRecordedItemPurchasesForTVShow(void);
+bool8 sub_80EE818(void);
+void sub_80EE8C8(u16 winStreak, u8 facilityAndMode);
 
 #endif //GUARD_TV_H