diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-09-09 15:51:13 +0100 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-09-09 15:51:13 +0100 |
| commit | 1ba17e16668c54d4ebfff91801768267e5ce1d10 (patch) | |
| tree | 88669548588ed70fe40dac73e4e204665a675991 /include/global.h | |
| parent | e1834c9d7bc961f872169e056b788fec04f39867 (diff) | |
| parent | 6454740587f9a97105c45d54bf4284015a20d6d1 (diff) | |
Merge branch 'decompile_frontier_2' of https://github.com/DizzyEggg/pokeemerald into factory-data
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/global.h b/include/global.h index 6977d4059..b35008550 100644 --- a/include/global.h +++ b/include/global.h @@ -344,7 +344,9 @@ struct FrontierMonData struct Struct_field_E70 { u16 monId; - u8 unk2[9]; + u32 personality; + u8 ivs; + u8 abilityBit; }; struct BattleDomeTrainer @@ -413,9 +415,7 @@ struct BattleFrontier /*0xDD8*/ u16 field_DD8; /*0xDDA*/ u16 field_DDA[2]; /*0xDDE*/ u16 field_DDE[2]; - /*0xDE2*/ u16 field_DE2[2]; - /*0xDE6*/ u16 field_DE6; - /*0xDE8*/ u16 field_DE8; + /*0xDE2*/ u16 field_DE2[2][2]; /*0xDEA*/ u16 field_DEA[2]; /*0xDEE*/ u16 field_DEE; /*0xDF0*/ u16 field_DF0; |