diff options
Diffstat (limited to 'src/battle_setup.c')
-rw-r--r-- | src/battle_setup.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index dc8564a99..27cef8441 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -1,4 +1,5 @@ #include "global.h" +#include "battle.h" #include "main.h" #include "species.h" #include "pokemon.h" @@ -53,21 +54,6 @@ u16 sub_8082C4C(u16 a1); extern u16 gScriptResult; -struct Trainer -{ -/* 0x00 */ u8 partyFlags; -/* 0x01 */ u8 trainerClass; -/* 0x02 */ u8 encounterMusic:7; -/* 0x02 */ u8 gender:1; -/* 0x03 */ u8 trainerPic; -/* 0x04 */ u8 trainerName[12]; -/* 0x10 */ u16 items[4]; -/* 0x18 */ bool8 doubleBattle; -/* 0x1C */ u32 aiFlags; -/* 0x20 */ u8 partySize; -/* 0x24 */ void *party; -}; - struct TrainerPartyMember0 { u16 iv; |