5 files changed, 23 insertions, 6 deletions
diff --git a/include/battle_factory.h b/include/battle_factory.h
new file mode 100644
index 000000000..1b0e44943
--- /dev/null
+++ b/include/battle_factory.h
@@ -0,0 +1,7 @@
+#ifndef GUARD_BATTLE_FACTORY_H
+#define GUARD_BATTLE_FACTORY_H
+
+void DoBattleFactorySelectScreen(void);
+void DoBattleFactorySwapScreen(void);
+
+#endif // GUARD_BATTLE_FACTORY_H
diff --git a/include/battle_frontier_2.h b/include/battle_frontier_2.h
index 09e974068..4ef860e80 100644
--- a/include/battle_frontier_2.h
+++ b/include/battle_frontier_2.h
@@ -9,8 +9,6 @@ bool8 InBattlePike(void);
 void sub_819FA50(void);
 void sub_81AA078(u16*, u8);
 void sub_81A4C30(void);
-void sub_819A4F8(void);
-void sub_819DC00(void);
 bool8 sub_81A6BF4(void);
 
 #endif // GUARD_BATTLE_FRONTIER_2_H
diff --git a/include/battle_tower.h b/include/battle_tower.h
index f07e9e544..5879a73bb 100644
--- a/include/battle_tower.h
+++ b/include/battle_tower.h
@@ -31,7 +31,7 @@ struct BattleFrontierTrainer
     u16 speechBefore[6];
     u16 speechWin[6];
     u16 speechLose[6];
-    u16 *btMonPool;
+    const u16 *btMonPool;
 };
 
 struct FacilityMon
diff --git a/include/menu.h b/include/menu.h
index b52b165f2..309667b19 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -35,7 +35,6 @@ void SetStandardWindowBorderStyle(u8 a0, u8 a1);
 void sub_8197930(void);
 u8 GetPlayerTextSpeed(void);
 void sub_81978B0(u16 arg0);
-
 void AddTextPrinterWithCallbackForMessage(bool8 a1, void (*callback)(struct TextSubPrinter *, u16));
 void AddTextPrinterParameterized3(u8 windowId, u8 fontId, u8 left, u8 top, const u8 *color, s8 speed, const u8 *str);
 void sub_8198070(u8 windowId, bool8 copyToVram);
@@ -87,5 +86,6 @@ u8 AddMapNamePopUpWindow(void);
 void AddTextPrinterParameterized5(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top, u8 speed, void (*callback)(struct TextSubPrinter *, u16), u8 letterSpacing, u8 lineSpacing);
 void sub_8199C30(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette);
 void sub_8199D3C(void *ptr, int delta, int width, int height, bool32 is8BPP);
+void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyToVram);
 
 #endif // GUARD_MENU_H
diff --git a/include/save.h b/include/save.h
index 9859870b4..a87e31e99 100644
--- a/include/save.h
+++ b/include/save.h
@@ -1,8 +1,6 @@
 #ifndef GUARD_SAVE_H
 #define GUARD_SAVE_H
 
-extern u16 gSaveFileStatus;
-
 struct SaveSectionLocation
 {
     void *data;
@@ -58,6 +56,20 @@ enum
 
 #define SECTION_ID_RECORDED_BATTLE  31
 
+extern u16 gLastWrittenSector;
+extern u32 gLastSaveCounter;
+extern u16 gLastKnownGoodSector;
+extern u32 gDamagedSaveSectors;
+extern u32 gSaveCounter;
+extern struct SaveSection *gFastSaveSection;
+extern u16 gUnknown_03006208;
+extern u16 gSaveFileStatus;
+extern void (*gGameContinueCallback)(void);
+extern struct SaveSectionLocation gRamSaveSectionLocations[];
+extern u16 gUnknown_03006294;
+
+extern struct SaveSection gSaveDataBuffer;
+
 void ClearSaveData(void);
 void Save_ResetSaveCounters(void);
 bool32 SetDamagedSectorBits(u8 op, u8 bit);