Merge pull request #312 from DizzyEggg/decompile_frontier_2

Decompile Battle Factory

9 files changed, 34 insertions, 15 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/constants/battle_frontier.h b/include/constants/battle_frontier.h
index fddcdc8fe..1cd750a3d 100644
--- a/include/constants/battle_frontier.h
+++ b/include/constants/battle_frontier.h
@@ -13,6 +13,7 @@
 // Battle Frontier lvl modes.
 #define FRONTIER_LVL_50 0
 #define FRONTIER_LVL_OPEN 1
+#define FRONTIER_LVL_TENT 2
 
 // Battle Frontier battle modes.
 #define FRONTIER_MODE_SINGLES 0
diff --git a/include/global.h b/include/global.h
index 6977d4059..b35008550 100644
--- a/include/global.h
+++ b/include/global.h
@@ -344,7 +344,9 @@ struct FrontierMonData
 struct Struct_field_E70
 {
     u16 monId;
-    u8 unk2[9];
+    u32 personality;
+    u8 ivs;
+    u8 abilityBit;
 };
 
 struct BattleDomeTrainer
@@ -413,9 +415,7 @@ struct BattleFrontier
     /*0xDD8*/ u16 field_DD8;
     /*0xDDA*/ u16 field_DDA[2];
     /*0xDDE*/ u16 field_DDE[2];
-    /*0xDE2*/ u16 field_DE2[2];
-    /*0xDE6*/ u16 field_DE6;
-    /*0xDE8*/ u16 field_DE8;
+    /*0xDE2*/ u16 field_DE2[2][2];
     /*0xDEA*/ u16 field_DEA[2];
     /*0xDEE*/ u16 field_DEE;
     /*0xDF0*/ u16 field_DF0;
diff --git a/include/menu.h b/include/menu.h
index a13fe73ec..309667b19 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -27,7 +27,7 @@ void sub_81973A4(void);
 void NewMenuHelpers_DrawDialogueFrame(u8, u8);
 void sub_819746C(u8 windowId, bool8 copyToVram);
 void NewMenuHelpers_DrawStdWindowFrame(u8, u8);
-u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextSubPrinter *, u16), u8 fgColor, u8 bgColor, u8 shadowColor);
+u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextSubPrinter *, u16), u8 fgColor, u8 bgColor, u8 shadowColor);
 void PrintPlayerNameOnWindow(u8, const u8*, u16, u16);
 void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback);
 void sub_8197434(u8 windowId, bool8 copyToVram);
@@ -35,9 +35,8 @@ 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 box_print(u8 windowId, u8 fontId, u8 left, u8 top, const u8 *color, s8 speed, const u8 *str);
+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);
 void SetWindowTemplateFields(struct WindowTemplate* template, u8 priority, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 palNum, u16 baseBlock);
 void SetWindowBorderStyle(u8 windowId, bool8 copyToVram, u16 tileStart, u8 palette);
@@ -58,7 +57,7 @@ s8 Menu_ProcessInputNoWrap_(void);
 s8 ProcessMenuInput_other(void);
 void do_scheduled_bg_tilemap_copies_to_vram(void);
 void clear_scheduled_bg_copies_to_vram(void);
-void AddTextPrinterParameterized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const u8 *color, s8 speed, const u8 *str);
+void AddTextPrinterParameterized4(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const u8 *color, s8 speed, const u8 *str);
 void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 a2, u8 a3);
 void sub_81995E4(u8 windowId, u8 optionsNo, const struct MenuAction *actions, const u8 *actionIds);
 void sub_8197DF8(u8 windowId, bool8 copyToVram);
@@ -84,8 +83,9 @@ void sub_819A344(u8 a0, u8 *dest, u8 color);
 void RemoveMapNamePopUpWindow(void);
 u8 GetMapNamePopUpWindowId(void);
 u8 AddMapNamePopUpWindow(void);
-void sub_8199F74(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top, u8 speed, void (*callback)(struct TextSubPrinter *, u16), u8 letterSpacing, u8 lineSpacing);
+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/pokemon_summary_screen.h b/include/pokemon_summary_screen.h
index 3d3b6f0e3..a8eee9c18 100755
--- a/include/pokemon_summary_screen.h
+++ b/include/pokemon_summary_screen.h
@@ -1,6 +1,7 @@
 #ifndef GUARD_POKEMON_SUMMARY_SCREEN_H
 #define GUARD_POKEMON_SUMMARY_SCREEN_H
 
+void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void));
 void sub_81C4F98(u8, void(*)(void));
 void ShowSelectMovePokemonSummaryScreen(struct Pokemon *, u8, u8, MainCallback, u16);
 
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);
diff --git a/include/text.h b/include/text.h
index 92def780c..e2120efa3 100644
--- a/include/text.h
+++ b/include/text.h
@@ -223,7 +223,7 @@ u8 gGlyphDimensions[0x2];
 
 void SetFontsPointer(const struct FontInfo *fonts);
 void DeactivateAllTextPrinters(void);
-u16 PrintTextOnWindow(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextSubPrinter *, u16));
+u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextSubPrinter *, u16));
 bool16 AddTextPrinter(struct TextSubPrinter *textSubPrinter, u8 speed, void (*callback)(struct TextSubPrinter *, u16));
 void RunTextPrinters(void);
 bool16 IsTextPrinterActive(u8 id);