diff options
| author | scnorton <scnorton@biociphers.org> | 2017-05-30 10:29:22 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-05-30 10:29:22 -0400 |
| commit | 432f5372c711696e818a26c545ac030539f72f5e (patch) | |
| tree | 595efb5474128da4f802c9bd38a485cc0d6716bf /include | |
| parent | f2e369d6835a4405644f1a1c9936a06d7cb52775 (diff) | |
sub_80BDC14; get ResetGabbyAndTy matching
Diffstat (limited to 'include')
| -rw-r--r-- | include/global.fieldmap.h | 26 | ||||
| -rw-r--r-- | include/global.h | 10 |
2 files changed, 21 insertions, 15 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 62b699e67..a0fe0e6ab 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -160,20 +160,20 @@ struct MapConnections struct MapHeader { - struct MapData *mapData; - struct MapEvents *events; - u8 *mapScripts; - struct MapConnections *connections; - u16 music; - u16 mapDataId; - u8 name; - u8 cave; - u8 weather; + /* 0x00 */ struct MapData *mapData; + /* 0x04 */ struct MapEvents *events; + /* 0x08 */ u8 *mapScripts; + /* 0x0C */ struct MapConnections *connections; + /* 0x10 */ u16 music; + /* 0x12 */ u16 mapDataId; + /* 0x14 */ u8 name; + /* 0x15 */ u8 cave; + /* 0x16 */ u8 weather; /* 0x17 */ u8 mapType; - u8 filler_18; - u8 escapeRope; - u8 flags; - u8 battleType; + /* 0x18 */ u8 filler_18; + /* 0x19 */ u8 escapeRope; + /* 0x1A */ u8 flags; + /* 0x1B */ u8 battleType; }; struct MapObject diff --git a/include/global.h b/include/global.h index def6708c3..311a84af8 100644 --- a/include/global.h +++ b/include/global.h @@ -455,8 +455,14 @@ struct GabbyAndTyData { /*2b1a*/ u8 valA_1:1; /*2b1a*/ u8 valA_2:1; /*2b1a*/ u8 valA_3:1; - /*2b1a*/ u8 valA_4:4; - /*2b1b*/ u8 valB; + /*2b1a*/ u8 valA_4:1; + /*2b1a*/ u8 valA_5:3; + /*2b1b*/ u8 valB_0:1; + /*2b1b*/ u8 valB_1:1; + /*2b1b*/ u8 valB_2:1; + /*2b1b*/ u8 valB_3:1; + /*2b1b*/ u8 valB_4:1; + /*2b1b*/ u8 valB_5:3; }; struct RecordMixing_UnknownStruct { |