summaryrefslogtreecommitdiff
path: root/include/battle.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/battle.h')
-rw-r--r--include/battle.h39
1 files changed, 30 insertions, 9 deletions
diff --git a/include/battle.h b/include/battle.h
index 82ed5f29c..be5b5f2d2 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -17,6 +17,15 @@
#define BATTLE_TYPE_LEGENDARY 0x2000
#define BATTLE_TYPE_REGI 0x4000
+#define AI_ACTION_UNK1 0x0001
+#define AI_ACTION_UNK2 0x0002
+#define AI_ACTION_UNK3 0x0004
+#define AI_ACTION_UNK4 0x0008
+#define AI_ACTION_UNK5 0x0010
+#define AI_ACTION_UNK6 0x0020
+#define AI_ACTION_UNK7 0x0040
+#define AI_ACTION_UNK8 0x0080
+
struct Trainer
{
/*0x00*/ u8 partyFlags;
@@ -32,15 +41,24 @@ struct Trainer
/*0x24*/ void *party;
};
+struct UnknownStruct1
+{
+ /*0x00*/ u16 unk0[2][8];
+ /*0x20*/ u8 unk20[2];
+ /*0x22*/ u8 unk22[2];
+ /*0x24*/ u16 items[4];
+ /*0x2C*/ u8 unk8;
+};
+
struct AI_ThinkingStruct /* 0x2016800 */
{
-/* 0x00 */ u8 unk0;
-/* 0x01 */ u8 moveConsidered;
-/* 0x02 */ u16 unk2;
+/* 0x00 */ u8 aiState;
+/* 0x01 */ u8 movesetIndex;
+/* 0x02 */ u16 moveConsidered;
/* 0x04 */ s8 score[4]; // score?
/* 0x08 */ u32 funcResult;
/* 0x0C */ u32 aiFlags;
-/* 0x10 */ u8 unk10;
+/* 0x10 */ u8 aiAction;
/* 0x11 */ u8 aiLogicId;
/* 0x12 */ u8 filler12[6];
/* 0x18 */ u8 unk18[4];
@@ -56,7 +74,7 @@ struct SmallBattleStruct1
struct SmallItemStruct
{
- u8 item[2][2];
+ u8 itemLocal[2][3];
};
struct BattleStruct /* 0x2000000 */
@@ -64,14 +82,17 @@ struct BattleStruct /* 0x2000000 */
u8 filler0[0x1601C];
struct SmallBattleStruct1 unk;
u8 filler1[0x68]; // 0x2016020
- u8 unk88;
+ u8 safariFleeRate;
u8 filler1_2[0x42];
/* 0x160CB */ u8 linkPlayerIndex;
- struct SmallItemStruct item;
- u8 filler2[0x730];
- struct AI_ThinkingStruct ai; /* 0x2016800 */
+ /* 0x160CC */ struct SmallItemStruct item;
+ u8 filler2[0x72E];
+ /* 0x16800 */ struct AI_ThinkingStruct ai; /* 0x2016800 */
+ u8 filler1681C[0x1E4];
+ /* 0x16A00 */ struct UnknownStruct1 unk_2016A00_2;
};
+extern struct UnknownStruct1 unk_2016A00;
extern struct BattleStruct battle_2000000;
extern struct AI_ThinkingStruct gAIThinkingSpace;