diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-05-18 11:21:58 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-05-18 11:21:58 -0400 |
| commit | 095d071cab1950f404f7fb5b6c0ff04ccc6c37f2 (patch) | |
| tree | ba0ed46a64acdd6485af9252d88209669aabc10c /include/global.h | |
| parent | 0aabedd7514ad7831ec76c93e4e9e83e3c68809d (diff) | |
Merge tv show list and extra attributes into a single struct
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/include/global.h b/include/global.h index 522ec065b..4b70d3283 100644 --- a/include/global.h +++ b/include/global.h @@ -354,14 +354,19 @@ typedef union SB_Struct { // size is 0x198 struct UnknownSaveStruct2A98 { - u8 var00; - u8 var01; - u16 var02; - u16 var04; - u16 var06; - u16 var08; - u8 var0a; - u8 pad0b[25]; + u8 var00; + u8 var01; + u16 var02; + u16 var04; + u16 var06; + u16 var08; + u8 var0a; + u8 pad0b[25]; +}; + +struct SaveTVStruct { + TVShow shows[24]; + struct UnknownSaveStruct2A98 unknown_2A98; }; struct UnknownSaveStruct2ABC { @@ -417,8 +422,7 @@ struct SaveBlock1 /* 0x02025734 */ /*0x2704*/ u8 decorDoll[40]; /*0x272C*/ u8 decorCushion[10]; /*0x2736*/ u8 padding_2736[2]; - /*0x2738*/ TVShow tvShows[24]; - /*0x2A98*/ struct UnknownSaveStruct2A98 unknown_2A98; + /*0x2738*/ struct SaveTVStruct tvShows; /*0x2ABC*/ struct UnknownSaveStruct2ABC unknown_2ABC[16]; /*0x2AFC*/ u16 outbreakPokemonSpecies; /*0x2AFE*/ u8 outbreakLocationMapNum; |