diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-08-19 13:26:22 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-08-19 13:26:22 -0500 |
| commit | bbe876153c2a0903a30b37734874bf63ca6d8a10 (patch) | |
| tree | 7efa03650e784e7ff6ac7d479b5315194a4081fb /include/battle.h | |
| parent | 300f2274f381b5a700b6a67847c3b9f97c67a541 (diff) | |
| parent | c2218920d57c883dc83078c2d1d7cf3af82babbb (diff) | |
Merge remote-tracking branch 'upstream/master' into ice
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 11 |
1 files changed, 10 insertions, 1 deletions
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 |