diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-09-09 20:54:41 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-09-09 20:54:41 -0500 |
| commit | a1368c545df5d49c2cde32c09c14aba8d4bdc967 (patch) | |
| tree | 0dd69e9a676d0d4872e51552d465cbc0364e2a55 /include/global.berry.h | |
| parent | f29fc55796cc5500f954b396264edc863f96f486 (diff) | |
| parent | eb280768a48eba5332468b463aab962e1eafb18e (diff) | |
Merge remote-tracking branch 'pret/master'
Diffstat (limited to 'include/global.berry.h')
| -rw-r--r-- | include/global.berry.h | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/include/global.berry.h b/include/global.berry.h index 6632e55e2..6695a9f4b 100644 --- a/include/global.berry.h +++ b/include/global.berry.h @@ -19,9 +19,29 @@ struct Berry u8 smoothness; }; +// with no const fields + +struct Berry2 +{ + u8 name[7]; + u8 firmness; + u16 size; + u8 maxYield; + u8 minYield; + u8 *description1; + u8 *description2; + u8 stageDuration; + u8 spicy; + u8 dry; + u8 sweet; + u8 bitter; + u8 sour; + u8 smoothness; +}; + struct EnigmaBerry { - struct Berry berry; + struct Berry2 berry; u8 pic[(6 * 6) * TILE_SIZE_4BPP]; u16 palette[16]; u8 description1[45]; |