diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-07-22 07:25:21 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-22 07:25:21 -0700 |
| commit | d1358719dbf4c7298662041b4e18a4567f65a6ba (patch) | |
| tree | cf7274e31840023aeda74a204ca00d6298457a20 /include/battle_setup.h | |
| parent | 0807de5288a025a5ddccd2520184a5beaad05552 (diff) | |
| parent | 74d273002c3e2b6e37d704bf00fdb258a874e207 (diff) | |
Merge pull request #658 from vblm12/trainer_data
Copy the Trainer struct from pokeemerald and regen the trainers.h files.
Diffstat (limited to 'include/battle_setup.h')
| -rw-r--r-- | include/battle_setup.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/battle_setup.h b/include/battle_setup.h index 88afcdf0a..fec5a249a 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -5,7 +5,7 @@ #define TRAINER_REMATCH_STEPS 255 // IV + LEVEL + SPECIES -struct TrainerPartyMember0 +struct TrainerMonNoItemDefaultMoves { u16 iv; u8 level; @@ -13,7 +13,7 @@ struct TrainerPartyMember0 }; // IV + LEVEL + SPECIES + MOVES -struct TrainerPartyMember1 +struct TrainerMonNoItemCustomMoves { u16 iv; u8 level; @@ -22,7 +22,7 @@ struct TrainerPartyMember1 }; // IV + LEVEL + SPECIES + ITEMS -struct TrainerPartyMember2 +struct TrainerMonItemDefaultMoves { u16 iv; u8 level; @@ -31,7 +31,7 @@ struct TrainerPartyMember2 }; // IV + LEVEL + SPECIES + ITEMS + MOVES -struct TrainerPartyMember3 +struct TrainerMonItemCustomMoves { u16 iv; u8 level; |