From 604347808138a0514933b3b994ac0f4eb62237a8 Mon Sep 17 00:00:00 2001
From: jiangzhengwenjz <jiangzhengwenjzw@qq.com>
Date: Mon, 29 Jul 2019 08:34:15 +0800
Subject: ported battle_util2 from pokeem

---
 src/trainer_tower.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/trainer_tower.c')

diff --git a/src/trainer_tower.c b/src/trainer_tower.c
index d80be781d..0415990c6 100644
--- a/src/trainer_tower.c
+++ b/src/trainer_tower.c
@@ -631,7 +631,7 @@ u8 sub_815DA3C(void)
     return gFacilityClassToPicIndex[gUnknown_203F45C->unk_3D];
 }
 
-void sub_815DA54(void)
+void InitTrainerTowerBattleStruct(void)
 {
     u16 r10;
     s32 r9;
@@ -660,7 +660,7 @@ void sub_815DA54(void)
     sub_815DD2C();
 }
 
-void sub_815DBDC(void)
+void FreeTrainerTowerBattleStruct(void)
 {
     Free(gUnknown_203F45C);
     gUnknown_203F45C = NULL;
@@ -1122,7 +1122,7 @@ void sub_815E124(u8 taskId)
 
 void sub_815E160(void)
 {
-    gBattleTypeFlags = BATTLE_TYPE_TRAINER | BATTLE_TYPE_FACTORY;
+    gBattleTypeFlags = BATTLE_TYPE_TRAINER | BATTLE_TYPE_TRAINER_TOWER;
     if (gUnknown_203F458->unk_0004.trainers[gUnknown_203F458->unk_0000].unk_002 == 1)
         gBattleTypeFlags |= BATTLE_TYPE_DOUBLE;
     gTrainerBattleOpponent_A = 0;
-- 
cgit v1.2.3


From 6a063cf74ad8168e9080c1f3be20e5dfe3c3187c Mon Sep 17 00:00:00 2001
From: jiangzhengwenjz <jiangzhengwenjzw@qq.com>
Date: Sat, 3 Aug 2019 06:55:42 +0800
Subject: ported battle_controller_opponent from pokeem and corrected lots of
 stuff

---
 src/trainer_tower.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/trainer_tower.c')

diff --git a/src/trainer_tower.c b/src/trainer_tower.c
index 0415990c6..a1eedf2ac 100644
--- a/src/trainer_tower.c
+++ b/src/trainer_tower.c
@@ -626,7 +626,7 @@ void sub_815DA28(u8 * dest)
     StringCopyN(dest, gUnknown_203F45C->unk_00, 11);
 }
 
-u8 sub_815DA3C(void)
+u8 GetTrainerTowerTrainerFrontSpriteId(void)
 {
     return gFacilityClassToPicIndex[gUnknown_203F45C->unk_3D];
 }
-- 
cgit v1.2.3


From b9d547a02f615b991713158bb7068ce0d7169088 Mon Sep 17 00:00:00 2001
From: jiangzhengwenjz <jiangzhengwenjzw@qq.com>
Date: Mon, 5 Aug 2019 08:15:58 +0800
Subject: ported battle_controller_player from pokeem and matched several new
 functions

---
 src/trainer_tower.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/trainer_tower.c')

diff --git a/src/trainer_tower.c b/src/trainer_tower.c
index a1eedf2ac..054a0da2f 100644
--- a/src/trainer_tower.c
+++ b/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"
-- 
cgit v1.2.3