diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-26 19:21:51 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-26 19:21:51 +0100 |
| commit | b0657350a43f3f91cd5e3ab8f910ab5ab78bb61c (patch) | |
| tree | 9568b4252f963e3210410880dad3b53dd3b5ab7d /include/global.h | |
| parent | ad3a97e178b93c38b1d43f8120449b042ac23a0e (diff) | |
| parent | 1e4f12e6fa9e3b22d4f1a60ca69313b5dec0ca38 (diff) | |
berry blender fix merge conflicts
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/global.h b/include/global.h index 62f946c6d..f3ec9ce33 100644 --- a/include/global.h +++ b/include/global.h @@ -238,7 +238,9 @@ struct SaveBlock2 /*0xCA9*/ u8 field_CA9_d : 1; // 0x20 /*0xCA9*/ u8 field_CA9_e : 1; // 0x40 /*0xCA9*/ u8 field_CA9_f : 1; // 0x80 - /*0xCAA*/ u16 field_CAA[0x2e]; + /*0xCAA*/ u16 field_CAA[4]; + /*0xCB2*/ u16 battlePyramidWildHeaderId; + /*0xCB4*/ u8 field_CB4[82]; /*0xD06*/ u8 field_D06; /*0xD07*/ u8 field_D07; /*0xD08*/ u8 filler_D08[0x112]; |