diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-06 18:06:24 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-06 18:06:24 -0400 |
| commit | 736b89ae3d4ffb335ef9e073556bc630c5541b70 (patch) | |
| tree | e97d50e764c52c012092aecb2d80266442677a79 /include/global.h | |
| parent | 5620b0ed1a330e38c0d4cdbbfea2c5ce75053925 (diff) | |
| parent | fb9b695f9a366f662b5262f440d77c770b131d0d (diff) | |
Merge branch 'master' into link
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/include/global.h b/include/global.h index 55233a340..35f8de01b 100644 --- a/include/global.h +++ b/include/global.h @@ -205,6 +205,14 @@ struct UnkSaveBlock2Substruct_55C /* 0x016:0x572 */ u8 unk_16; }; // size: 0x018 +struct UnkSaveBlock2Substruct_B0 +{ + /* 0x000:0x0B0 */ u8 field_0[0x3F0]; + /* 0x3F0:0x4A0 */ u32 field_3F0[0x2F]; + /* 0x4AC:0x55C */ struct UnkSaveBlock2Substruct_55C field_4AC; + /* 0x4C4:0x574 */ u8 field_4C4[0x324]; +}; // size: 0x7E8 + struct SaveBlock2 { /*0x000*/ u8 playerName[PLAYER_NAME_LENGTH]; @@ -227,14 +235,16 @@ struct SaveBlock2 /*0x098*/ struct Time localTimeOffset; /*0x0A0*/ struct Time lastBerryTreeUpdate; /*0x0A8*/ u32 field_A8; - /*0x0AC*/ u8 filler_AC[0x3F4]; - /*0x4A0*/ u32 unk_4A0[0x2F]; - /*0x55c*/ struct UnkSaveBlock2Substruct_55C unk_55C; - /*0x574*/ u8 filler_574[0x324]; + /*0x0AC*/ u8 field_AC; + /*0x0AD*/ u8 field_AD; + /*0x0AE*/ u8 filler_AE[0x2]; + /*0x0B0*/ struct UnkSaveBlock2Substruct_B0 unk_B0; /*0x898*/ u16 mapView[0x100]; /*0xA98*/ struct LinkBattleRecords linkBattleRecords; /*0xAF0*/ struct BerryCrush berryCrush; - /*0xB00*/ u8 filler_B00[0x420]; + /*0xB00*/ struct PokemonJumpResults pokeJump; + /*0xB10*/ struct BerryPickingResults berryPick; + /*0xB20*/ u8 filler_B20[0x400]; /*0xF20*/ u32 encryptionKey; }; |