ported battle_util2 from pokeem

include/battle.h

@@ -236,7 +236,7 @@ extern const struct Trainer gTrainers[];
 
 #define TRAINER_ENCOUNTER_MUSIC(trainer)((gTrainers[trainer].encounterMusic_gender & 0x7F))
 
-struct UnknownFlags
+struct ResourceFlags
 {
     u32 flags[4];
 };
@@ -447,11 +447,11 @@ struct StatsArray
 
 struct BattleResources
 {
-    struct SecretBaseRecord* secretBase;
-    struct UnknownFlags *flags;
-    struct BattleScriptsStack* battleScriptsStack;
-    struct BattleCallbacksStack* battleCallbackStack;
-    struct StatsArray* statsBeforeLvlUp;
+    struct SecretBaseRecord *secretBase;
+    struct ResourceFlags *flags;
+    struct BattleScriptsStack *battleScriptsStack;
+    struct BattleCallbacksStack *battleCallbackStack;
+    struct StatsArray *beforeLvlUp;
     struct AI_ThinkingStruct *ai;
     struct BattleHistory *battleHistory;
     struct BattleScriptsStack *AI_ScriptsStack;
@@ -610,7 +610,7 @@ struct BattleStruct
     u8 field_2A2;
 };
 
-extern struct BattleStruct* gBattleStruct;
+extern struct BattleStruct *gBattleStruct;
 
 #define GET_MOVE_TYPE(move, typeArg)                        \
 {                                                           \
@@ -975,5 +975,8 @@ extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
 extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
 extern void (*gPreBattleCallback1)(void);
 extern bool8 gDoingBattleAnim;
+extern void *gUnknown_3005EE0[];
+extern u8 *gUnknown_2022BB8;
+extern u8 *gUnknown_2022BBC;
 
 #endif // GUARD_BATTLE_H

include/battle_util2.h

@@ -6,7 +6,5 @@
 void AllocateBattleResources(void);
 void FreeBattleResources(void);
 void AdjustFriendshipOnBattleFaint(u8 bank);
-void sub_80571DC(u8 bank, u8 arg1);
-u32 sub_805725C(u8 bank);
 
 #endif // GUARD_BATTLE_UTIL_H

include/constants/battle.h

@@ -63,7 +63,7 @@
 #define BATTLE_TYPE_POKEDUDE        0x10000
 #define BATTLE_TYPE_PALACE          0x20000
 #define BATTLE_TYPE_ARENA           0x40000
-#define BATTLE_TYPE_FACTORY         0x80000
+#define BATTLE_TYPE_TRAINER_TOWER   0x80000
 #define BATTLE_TYPE_PIKE            0x100000
 #define BATTLE_TYPE_PYRAMID         0x200000
 #define BATTLE_TYPE_INGAME_PARTNER  0x400000

include/trainer_tower.h

@@ -2,5 +2,7 @@
 #define GUARD_TRAINER_TOWER_H
 
 void PrintTrainerTowerRecords(void);
+void InitTrainerTowerBattleStruct(void);
+void FreeTrainerTowerBattleStruct(void);
 
 #endif //GUARD_TRAINER_TOWER_H