From faf554de7af7712f91ab117f957b691a052344bf Mon Sep 17 00:00:00 2001
From: vblm12 <vblm12@gmail.com>
Date: Fri, 20 Jul 2018 21:46:31 -0500
Subject: Copy the Trainer struct from pokeemerald.

Also regenerate trainers*.h
---
 include/battle.h | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'include/battle.h')

diff --git a/include/battle.h b/include/battle.h
index 06a390cdf..ac95f6fff 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -3,6 +3,7 @@
 
 #include "sprite.h"
 #include "constants/battle_constants.h"
+#include "battle_setup.h"
 
 #define GET_BATTLER_POSITION(bank)((gBattlerPositions[bank]))
 #define GET_BATTLER_SIDE(bank)((GetBattlerPosition(bank) & BIT_SIDE))
@@ -60,6 +61,14 @@ enum
     BATTLE_TERRAIN_PLAIN,
 };
 
+union TrainerMonPtr
+{
+    const struct TrainerMonNoItemDefaultMoves *NoItemDefaultMoves;
+    const struct TrainerMonNoItemCustomMoves *NoItemCustomMoves;
+    const struct TrainerMonItemDefaultMoves *ItemDefaultMoves;
+    const struct TrainerMonItemCustomMoves *ItemCustomMoves;
+};
+
 struct Trainer
 {
     /*0x00*/ u8 partyFlags;
@@ -71,7 +80,7 @@ struct Trainer
     /*0x18*/ bool8 doubleBattle;
     /*0x1C*/ u32 aiFlags;
     /*0x20*/ u8 partySize;
-    /*0x24*/ const void *party;
+    /*0x24*/ union TrainerMonPtr party;
 };
 
 struct BattleHistory
-- 
cgit v1.2.3