summaryrefslogtreecommitdiff
path: root/include/battle.h
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2018-01-15 21:29:14 -0600
committercamthesaxman <cameronghall@cox.net>2018-01-15 21:29:14 -0600
commit15cffaecf34d93c99aa635586ad24fa9978a70a0 (patch)
tree9993a2ad6e2c7609763f5649d5417aa4f784b9a3 /include/battle.h
parent5d923c4d5f3d0786715663b3ad83bc9f3e778164 (diff)
match ChangeStatBuffs
Diffstat (limited to 'include/battle.h')
-rw-r--r--include/battle.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/include/battle.h b/include/battle.h
index 8727f2eca..d3cbd24f5 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -73,16 +73,16 @@ struct AI_Stack
struct AI_ThinkingStruct /* 0x2016800 */
{
-/* 0x00 */ u8 aiState;
-/* 0x01 */ u8 movesetIndex;
-/* 0x02 */ u16 moveConsidered;
-/* 0x04 */ s8 score[4]; // score?
-/* 0x08 */ u32 funcResult;
-/* 0x0C */ u32 aiFlags;
-/* 0x10 */ u8 aiAction;
-/* 0x11 */ u8 aiLogicId;
-/* 0x12 */ u8 filler12[6];
-/* 0x18 */ u8 simulatedRNG[4];
+ /*0x00*/ u8 aiState;
+ /*0x01*/ u8 movesetIndex;
+ /*0x02*/ u16 moveConsidered;
+ /*0x04*/ s8 score[4]; // score?
+ /*0x08*/ u32 funcResult;
+ /*0x0C*/ u32 aiFlags;
+ /*0x10*/ u8 aiAction;
+ /*0x11*/ u8 aiLogicId;
+ /*0x12*/ u8 filler12[6];
+ /*0x18*/ u8 simulatedRNG[4];
};
struct BattleStruct /* 0x2000000 */
@@ -527,7 +527,7 @@ struct WishFutureKnock
u8 wishCounter[MAX_BANKS_BATTLE];
u8 wishUserID[MAX_BANKS_BATTLE];
u8 weatherDuration;
- u16 knockedOffPokes;
+ u8 knockedOffPokes[2];
};
extern struct UnkBattleStruct1 unk_2016A00;