diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-05-21 12:17:01 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-05-21 12:17:01 -0400 |
| commit | 2ef0ea3098d09d20ea8fb4140e78e6e5717e0ac7 (patch) | |
| tree | 085ea1e53b2a70996728ed08aad0566da69f0f52 /include/battle.h | |
| parent | a8314b86903e5168e017345a4a0d1a5e9ec480aa (diff) | |
| parent | bfe02a627f9f49a94f90835d4284ab89d4e5a6f9 (diff) | |
Merge branch 'master' of github.com:pret/pokeruby into field_map_obj
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/include/battle.h b/include/battle.h index f05c7369d..be474b59f 100644 --- a/include/battle.h +++ b/include/battle.h @@ -124,17 +124,22 @@ struct BattleStruct /* 0x2000000 */ struct UnknownStruct4 { - u8 filler0[0x3]; - u16 unk4; - u16 unk6; - u8 unk8; - u8 unk9; - u8 fillerA[0x9]; - u8 taunt:4; - u8 unkC:4; - u8 fillerD[0x2]; - u8 unk16; - u8 filler17[0x4]; + /*0x00*/ u8 filler0[0x3]; + /*0x04*/ u16 unk4; + /*0x06*/ u16 unk6; + /*0x08*/ u8 unk8; + /*0x09*/ u8 unk9; + /*0x0A*/ u8 unkA; + u8 fillerB[4]; + u8 unkF_0:4; + u8 unkF_4:4; + u8 filler10[3]; + /*0x13*/ u8 taunt:4; + /*0x13*/ u8 unkC:4; + /*0x14*/ u8 unk14; + /*0x15*/ u8 unk15; + /*0x16*/ u8 unk16; + /*0x17*/ u8 filler17[0x4]; }; extern struct UnknownStruct1 unk_2016A00; |