summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/battle.h2
-rw-r--r--include/trainer.h8
2 files changed, 9 insertions, 1 deletions
diff --git a/include/battle.h b/include/battle.h
index d3cbd24f5..3dc1aeaf2 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -53,7 +53,7 @@ struct Trainer
/*0x18*/ bool8 doubleBattle;
/*0x1C*/ u32 aiFlags;
/*0x20*/ u8 partySize;
- /*0x24*/ void *party;
+ /*0x24*/ const void *party;
};
struct UnkBattleStruct1 // AI_Opponent_Info?
diff --git a/include/trainer.h b/include/trainer.h
index e8f2776d2..96143245a 100644
--- a/include/trainer.h
+++ b/include/trainer.h
@@ -16,6 +16,14 @@
#define TRAINER_ENCOUNTER_MUSIC_INTERVIEWER 12
#define TRAINER_ENCOUNTER_MUSIC_RICH 13 // Rich Boys and Gentlemen
+#define F_TRAINER_FEMALE 1 << 7
+
+// All trainer parties specify the IV, level, and species for each Pokémon in
+// the party. Some trainer parties also specify held items and custom moves
+// for each Pokémon.
+#define F_TRAINER_PARTY_CUSTOM_MOVESET 1 << 0
+#define F_TRAINER_PARTY_HELD_ITEM 1 << 1
+
enum {
FACILITY_CLASS_AQUA_LEADER,
FACILITY_CLASS_TEAM_AQUA_M,