diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-23 09:05:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-23 09:05:26 -0400 |
| commit | 6e36c229200e083ca005cbc448e99210d111f3b2 (patch) | |
| tree | aec86bd0f081a7ff207f68cba33315991b629be1 /include/global.h | |
| parent | 4bc284ff2c7d0ec3f24df8d94a77860fbaed588b (diff) | |
| parent | 3efd2e1210b4149628197446d063df0fc11281ab (diff) | |
Merge pull request #130 from PikalaxALT/trainers
Trainers, event flags, mystery_event_msg, map object gfx
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 5ddf9a0a8..57035ce30 100644 --- a/include/global.h +++ b/include/global.h @@ -127,7 +127,7 @@ struct Pokedex /*0x00*/ u8 order; /*0x01*/ u8 unknown1; /*0x02*/ u8 nationalMagic; // must equal 0xDA in order to have National mode - /*0x03*/ u8 unknown2; + /*0x03*/ u8 unknown2; // set to 0xB9 when national dex is first enabled /*0x04*/ u32 unownPersonality; // set when you first see Unown /*0x08*/ u32 spindaPersonality; // set when you first see Spinda /*0x0C*/ u32 unknown3; @@ -493,12 +493,12 @@ struct RecordMixingDayCareMail bool16 holdsItem[DAYCARE_MON_COUNT]; }; -struct MysteryEventStruct +struct MENewsJisanStruct { u8 unk_0_0:2; u8 unk_0_2:3; u8 unk_0_5:3; - u8 unk_1; + u8 berry; }; struct QuestLogNPCData @@ -674,7 +674,7 @@ struct MEventBuffers /*0x1c0 0x32e0*/ struct MEventBuffer_32E0 buffer_1c0; /*0x310 0x3430*/ struct MEventBuffer_3430 buffer_310; /*0x338 0x3458*/ u16 unk_338[4]; - /*0x340 0x3460*/ struct MysteryEventStruct unk_340; + /*0x340 0x3460*/ struct MENewsJisanStruct unk_340; /*0x344 0x3464*/ u32 unk_344[2][5]; }; // 0x36C 0x348C |