diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-08 19:00:01 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-08 19:00:01 -0400 |
| commit | 2e0259fceb54edb68df7e7956418f3bbbe8c08da (patch) | |
| tree | 3598721e4aea16456820b3ef189ccd6f94607c46 /include/global.h | |
| parent | 0335914719ef86def6999d50eefd8a342d696a6e (diff) | |
| parent | 10fff9c6f2d29899952d1751d3de827e7e98bb60 (diff) | |
Merge branch 'master' into vs_seeker
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/include/global.h b/include/global.h index f1a5fbc18..11a79ebe8 100644 --- a/include/global.h +++ b/include/global.h @@ -466,6 +466,14 @@ struct RecordMixingDayCareMail bool16 holdsItem[DAYCARE_MON_COUNT]; }; +struct MysteryEventStruct +{ + u8 unk_0_0:2; + u8 unk_0_2:3; + u8 unk_0_5:3; + u8 unk_1; +}; + #define MAP_OBJECTS_COUNT 16 #define BERRY_TREES_COUNT 128 #define FLAGS_COUNT 300 @@ -486,7 +494,9 @@ struct SaveBlock1 /*0x63a*/ u8 trainerRematches[100]; /*0x06A0*/ struct MapObject mapObjects[MAP_OBJECTS_COUNT]; /*0x08E0*/ struct MapObjectTemplate mapObjectTemplates[64]; - /*0x0EE0*/ u8 fillerEE0[0x273C]; + /*0x0EE0*/ u8 fillerEE0[0x2580]; + /*0x3460*/ struct MysteryEventStruct unk_3460; + /*0x3464*/ u8 filler_3464[0x1b8]; /*0x361C*/ struct RamScript ramScript; /*0x3A08*/ u8 filler3A08[0x44]; /*0x3A4C*/ u8 rivalName[PLAYER_NAME_LENGTH]; |