ported battle_controller_player from pokeem and matched several new functions

src/battle_ai_script_commands.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "battle.h"
-#include "battle_2.h"
+#include "battle_main.h"
 #include "util.h"
 #include "item.h"
 #include "random.h"

src/battle_controller_opponent.c

@@ -530,7 +530,7 @@ static u32 GetOpponentMonData(u8 monId, u8 *dst)
             moveData.pp[size] = GetMonData(&gEnemyParty[monId], MON_DATA_PP1 + size);
         }
         moveData.ppBonuses = GetMonData(&gEnemyParty[monId], MON_DATA_PP_BONUSES);
-        src = (u8*)(&moveData);
+        src = (u8 *)(&moveData);
         for (size = 0; size < sizeof(moveData); ++size)
             dst[size] = src[size];
         break;

src/battle_controllers.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "battle.h"
-#include "battle_2.h"
+#include "battle_main.h"
 #include "battle_ai_script_commands.h"
 #include "battle_anim.h"
 #include "battle_util.h"

src/battle_gfx_sfx_util.c

@@ -12,7 +12,7 @@
 #include "util.h"
 #include "party_menu.h"
 #include "battle.h"
-#include "battle_2.h"
+#include "battle_main.h"
 #include "battle_controllers.h"
 #include "battle_ai_script_commands.h"
 #include "battle_anim.h"
@@ -450,7 +450,7 @@ void DecompressTrainerFrontPic(u16 frontPicId, u8 battlerId)
 
 void DecompressTrainerBackPalette(u16 index, u8 palette)
 {
-    LoadCompressedPalette(gUnknown_8239FD4[index].data, (palette + 16) * 16, 0x20);
+    LoadCompressedPalette(gTrainerBackPicPaletteTable[index].data, (palette + 16) * 16, 0x20);
 }
 
 void nullsub_16(u8 a1)

src/pokemon.c

@@ -8,7 +8,7 @@
 #include "data2.h"
 #include "string_util.h"
 #include "battle.h"
-#include "battle_2.h"
+#include "battle_main.h"
 #include "item.h"
 #include "event_data.h"
 #include "util.h"

src/teachy_tv.c

@@ -23,7 +23,7 @@
 #include "event_data.h"
 #include "load_save.h"
 #include "battle_transition.h"
-#include "battle_2.h"
+#include "battle_main.h"
 #include "battle.h"
 #include "global.fieldmap.h"
 #include "teachy_tv.h"

src/trainer_tower.c

@@ -17,7 +17,7 @@
 #include "battle_setup.h"
 #include "battle_transition.h"
 #include "battle.h"
-#include "battle_2.h"
+#include "battle_main.h"
 #include "overworld.h"
 #include "item.h"
 #include "window.h"