diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-07-22 19:57:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-22 19:57:00 -0500 |
| commit | 833f9026ff89c4bc7c9cf84b6c23d01e790e51e0 (patch) | |
| tree | 595bc979ea25ffb98b9d1033f52662cab62acf4a /include/global.h | |
| parent | 566392f441a66da41fc827b6d2e8cbeaf1cf4825 (diff) | |
| parent | 275344c3de95471b93a6a417e2178d93688887a9 (diff) | |
Merge pull request #385 from drifloony/mystery_event_script
finish decompiling mystery_event_script
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/include/global.h b/include/global.h index 73f73093d..f076274cc 100644 --- a/include/global.h +++ b/include/global.h @@ -557,6 +557,20 @@ struct LinkBattleRecord u16 draws; }; +struct RecordMixingGiftData +{ + u8 unk0; + u8 quantity; + u16 itemId; + u8 filler4[8]; +}; + +struct RecordMixingGift +{ + int checksum; + struct RecordMixingGiftData data; +}; + struct SaveBlock1 /* 0x02025734 */ { /*0x00*/ struct Coords16 pos; @@ -642,7 +656,7 @@ struct SaveBlock1 /* 0x02025734 */ /*0x3144*/ struct Roamer roamer; /*0x3160*/ struct EnigmaBerry enigmaBerry; /*0x3690*/ struct RamScript ramScript; - /*0x3A7C*/ u8 filler_3A7C[0x10]; + /*0x3A7C*/ struct RecordMixingGift recordMixingGift; /*0x3A8C*/ u8 unk3A8C[52]; //pokedex related }; @@ -674,7 +688,8 @@ struct SaveBlock2_Sub /*0x0000, 0x00A8*/ u8 filler_000[0x3D8]; /*0x03D8, 0x0480*/ u16 var_480; /*0x03DA, 0x0482*/ u16 var_482; - /*0x03DC, 0x0484*/ u8 filler_3DC[0xD0]; + /*0x03DC, 0x0484*/ u8 filler_3DC[0x14]; + /*0x03F0, 0x0498*/ u8 ereaderTrainer[0xBC]; /*0x04AC, 0x0554*/ u8 var_4AC; /*0x04AD, 0x0555*/ u8 var_4AD; /*0x04AE, 0x0556*/ u8 var_4AE[2]; |