more of battle2 done

6 files changed, 46 insertions, 9 deletions

diff --git a/include/battle.h b/include/battle.h
index 72168aa60..afb3c8d6e 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -264,32 +264,32 @@
 
 struct TrainerMonNoItemDefaultMoves
 {
-    u16 species;
+    u16 iv;
     u8 lvl;
-    u16 evsValue;
+    u16 species;
 };
 
 struct TrainerMonItemDefaultMoves
 {
-    u16 species;
+    u16 iv;
     u8 lvl;
-    u16 evsValue;
+    u16 species;
     u16 heldItem;
 };
 
 struct TrainerMonNoItemCustomMoves
 {
-    u16 species;
+    u16 iv;
     u8 lvl;
-    u16 evsValue;
+    u16 species;
     u16 moves[4];
 };
 
 struct TrainerMonItemCustomMoves
 {
-    u16 species;
+    u16 iv;
     u8 lvl;
-    u16 evsValue;
+    u16 species;
     u16 heldItem;
     u16 moves[4];
 };
@@ -863,10 +863,13 @@ extern struct BattleScripting gBattleScripting;
 // battle_1
 void LoadBattleTextboxAndBackground(void);
 void LoadBattleEntryBackground(void);
+void ApplyPlayerChosenFrameToBattleMenu(void);
+bool8 LoadChosenBattleElement(u8 caseId);
 void task00_0800F6FC(u8 taskId);
 
 // battle_2
 void CB2_InitBattle(void);
+void CB2_QuitRecordedBattle(void);
 void CancelMultiTurnMoves(u8 bank);
 void PressurePPLose(u8 bankAtk, u8 bankDef, u16 move);
 void PrepareStringBattle(u16 stringId, u8 bank);
@@ -933,15 +936,18 @@ extern const u8 gUnknown_0831C494[];
 
 // battle_5
 void AllocateBattleResrouces(void);
+void FreeBattleResources(void);
 void AdjustFriendshipOnBattleFaint(u8 bank);
 void sub_80571DC(u8 bank, u8 arg1);
 u32 sub_805725C(u8 bank);
 
 // battle 7
 void AllocateBattleSpritesData(void);
+void FreeBattleSpritesData(void);
+void AllocateMonSpritesGfx(void);
+void FreeMonSpritesGfx(void);
 void BattleMusicStop(void);
 void sub_805E990(struct Pokemon* mon, u8 bank);
-void AllocateMonSpritesGfx(void);
 void sub_805EF14(void);
 bool8 BattleInitAllSprites(u8 *state1, u8 *state2);
 
@@ -950,6 +956,30 @@ u8 GetBankSide(u8 bank);
 u8 GetBankIdentity(u8 bank);
 u8 GetBankByIdentity(u8 bank);
 
+struct BattleSpriteInfo
+{
+    u16 invisible : 1; // 0x1
+    u16 flag_x2 : 1; // 0x2
+    u16 behindSubstitute : 1; // 0x4
+    u16 flag_x8 : 1; // 0x8
+    u16 hpNumbersNoBars : 1; // 0x10
+    u16 transformSpecies;
+};
+
+struct BattleAnimationInfo
+{
+    u16 field; // to fill up later
+};
+
+struct BattleSpriteData
+{
+    struct BattleSpriteInfo *bankData;
+    void* field_4;
+    struct BattleAnimationInfo *animationData;
+};
+
+extern struct BattleSpriteData *gBattleSpritesDataPtr;
+
 // Move this somewhere else
 
 #include "sprite.h"
diff --git a/include/link.h b/include/link.h
index b719371da..9d581a6c1 100644
--- a/include/link.h
+++ b/include/link.h
@@ -182,5 +182,6 @@ void sub_800E0E8(void);
 bool8 sub_800A520(void);
 bool8 sub_8010500(void);
 void sub_800DFB4(u8, u8);
+void sub_800ADF8(void);
 
 #endif // GUARD_LINK_H
diff --git a/include/main.h b/include/main.h
index e5460b3bf..e283d1754 100644
--- a/include/main.h
+++ b/include/main.h
@@ -39,6 +39,7 @@ struct Main
 
     /*0x439*/ u8 oamLoadDisabled:1;
     /*0x439*/ u8 inBattle:1;
+    /*0x439*/ u8 field_439_x4:1;
 };
 
 extern u8 gUnknown_3001764;
diff --git a/include/pokemon.h b/include/pokemon.h
index 5ebb9afb1..4b678d679 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -637,5 +637,6 @@ void sub_8068AA4(void); // sets stats for deoxys
 #include "sprite.h"
 
 void DoMonFrontSpriteAnimation(struct Sprite* sprite, u16 species, bool8 noCry, u8 arg3);
+void BattleAnimateFrontSprite(struct Sprite* sprite, u16 species, bool8 noCry, u8 arg3);
 
 #endif // GUARD_POKEMON_H
diff --git a/include/recorded_battle.h b/include/recorded_battle.h
index 407d0caf7..5f3099d83 100644
--- a/include/recorded_battle.h
+++ b/include/recorded_battle.h
@@ -7,5 +7,8 @@ void sub_8185F84(void);
 void sub_8184E58(void);
 void RecordedBattle_SetBankAction(u8 bank, u8 action);
 void sub_8185F90(u16 arg0);
+bool8 sub_8186450(void);
+u8 sub_8185FAC(void);
+u8 MoveRecordedBattleToSaveData(void);
 
 #endif // GUARD_RECORDED_BATTLE_H
diff --git a/include/unknown_task.h b/include/unknown_task.h
index 7457451a8..9c6968c30 100644
--- a/include/unknown_task.h
+++ b/include/unknown_task.h
@@ -17,5 +17,6 @@ extern struct UnknownTaskStruct gUnknown_0831AC70;
 // Exported ROM declarations
 void remove_some_task(void);
 void sub_80BA038(struct UnknownTaskStruct arg0);
+void sub_80BA0A8(void);
 
 #endif // GUARD_unknown_task_H