diff options
| author | yenatch <yenatch@gmail.com> | 2017-06-25 00:04:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-25 00:04:39 -0400 |
| commit | 98a170597f29156e04e92ae2701a186d01c19ca5 (patch) | |
| tree | 0cc698a3ef9536b109af0baefcb88b4e518cc134 /include/battle.h | |
| parent | 45b4b7ed85022c7771ee1adab8336f2b438b845e (diff) | |
| parent | f62282f0b994458b08e8ed8fcc03b39f6d96df7d (diff) | |
Merge pull request #336 from camthesaxman/decompile_battle_6
decompile battle_6
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/battle.h b/include/battle.h index 395cf042a..d93860094 100644 --- a/include/battle.h +++ b/include/battle.h @@ -185,7 +185,6 @@ struct Struct2017810 u8 unk1_0:1; u8 unk2; u8 unk3; - //u8 filler2[2]; u8 unk4; u8 unk5; u8 unk6; @@ -198,13 +197,21 @@ 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; +}; + extern struct UnkBattleStruct1 unk_2016A00; extern struct UnkBattleStruct4 gDisableStructs[]; extern struct AI_ThinkingStruct gAIThinkingSpace; +extern struct Struct20238C8 gUnknown_020238C8; // TODO: move ewram to global.h extern u8 ewram[]; |