diff options
| author | yenatch <yenatch@gmail.com> | 2017-07-05 17:48:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-05 17:48:21 -0400 |
| commit | 124e2eb02c4adc46265e5b34b47ac0c625a24ec3 (patch) | |
| tree | 5c0af98d9e49a767f455fff1ceec5d07cb8539b8 /include/battle.h | |
| parent | 123d5cc8b26d2a93fa3981beaccb84377c6ae20f (diff) | |
| parent | 813c1846c94fa14b55bf75cf4c14465f1fb26635 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/battle.h b/include/battle.h index 006e4e6fe..4e102c145 100644 --- a/include/battle.h +++ b/include/battle.h @@ -425,9 +425,9 @@ struct Struct2017810 u8 unk0_6:1; u8 unk0_7:1; u8 unk1_0:1; + u8 unk1_1:5; u8 unk2; u8 unk3; - //u8 filler2[2]; u8 unk4; u8 unk5; u8 unk6; @@ -440,10 +440,17 @@ struct Struct2017810 struct Struct2017840 { u16 unk0; - u8 filler2[7]; + u8 filler2[6]; + u8 unk8; u8 unk9_0:1; }; +struct Struct20238C8 +{ + u8 unk0_0:7; + u8 unk0_7:1; +}; + struct ProtectStruct { /*field0*/ @@ -534,6 +541,7 @@ extern struct SpecialStatus gSpecialStatuses[MAX_BANKS_BATTLE]; extern struct sideTimer gSideTimer[2]; extern struct WishFutureKnock gWishFutureKnock; extern struct AI_ThinkingStruct gAIThinkingSpace; +extern struct Struct20238C8 gUnknown_020238C8; // TODO: move ewram to global.h extern u8 ewram[]; |