ported battle_controller_player from pokeem and matched several new functions

1 files changed, 0 insertions, 64 deletions

diff --git a/include/battle_2.h b/include/battle_2.h
deleted file mode 100644
index 19f59fc75..000000000
--- a/include/battle_2.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifndef GUARD_BATTLE_2_H
-#define GUARD_BATTLE_2_H
-
-#include "global.h"
-#include "sprite.h"
-
-void CB2_InitBattle(void);
-void BattleMainCB2(void);
-void CB2_QuitRecordedBattle(void);
-void sub_8038528(struct Sprite* sprite);
-void sub_8038A04(void); // unused
-void VBlankCB_Battle(void);
-void sub_8038B74(struct Sprite *sprite);
-void sub_8038D64(void);
-u32 sub_80391E0(u8 arrayId, u8 caseId);
-u32 sub_80397C4(u32 setId, u32 tableId);
-void oac_poke_opponent(struct Sprite *sprite);
-void SpriteCallbackDummy_2(struct Sprite *sprite);
-void sub_8039934(struct Sprite *sprite);
-void sub_8039AD8(struct Sprite *sprite);
-void sub_8039B2C(struct Sprite *sprite);
-void sub_8039B58(struct Sprite *sprite);
-void sub_8039BB4(struct Sprite *sprite);
-void sub_80105DC(struct Sprite *sprite);
-void sub_8039C00(struct Sprite *sprite);
-void dp11b_obj_instanciate(u8 bank, u8 b, s8 c, s8 d);
-void dp11b_obj_free(u8 bank, bool8 b);
-void sub_8039E44(struct Sprite *sprite);
-void sub_8039E60(struct Sprite *sprite);
-void sub_8039E84(struct Sprite *sprite);
-void sub_8039E9C(struct Sprite *sprite);
-void nullsub_20(void);
-void BeginBattleIntro(void);
-void SwitchInClearSetData(void);
-void FaintClearSetData(void);
-void sub_803B3AC(void); // unused
-void sub_803B598(void); // unused
-void BattleTurnPassed(void);
-u8 IsRunningFromBattleImpossible(void);
-void sub_803BDA0(u8 bank);
-void SwapTurnOrder(u8 id1, u8 id2);
-u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreChosenMoves);
-void RunBattleScriptCommands_PopCallbacksStack(void);
-void RunBattleScriptCommands(void);
-bool8 TryRunFromBattle(u8 bank);
-void sub_800FD9C(void);
-void sub_80120C4(struct Sprite *);
-void sub_8012100(struct Sprite *);
-void nullsub_12(void);
-void SpriteCB_FaintOpponentMon(struct Sprite *sprite);
-
-extern const u8 gStatusConditionString_PoisonJpn[8];
-extern const u8 gStatusConditionString_SleepJpn[8];
-extern const u8 gStatusConditionString_ParalysisJpn[8];
-extern const u8 gStatusConditionString_BurnJpn[8];
-extern const u8 gStatusConditionString_IceJpn[8];
-extern const u8 gStatusConditionString_ConfusionJpn[8];
-extern const u8 gStatusConditionString_LoveJpn[8];
-
-extern const u8 * const gStatusConditionStringsTable[7][2];
-
-extern const u8 gTypeEffectiveness[336];
-
-#endif // GUARD_BATTLE_2_H