diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-05 18:28:16 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-04-05 18:28:16 -0700 |
| commit | d975a85c84616155e226b2d5120aee9adcae16b5 (patch) | |
| tree | 0668eb03388e9404e134e24b3dcd753f7bc47050 /include/global.berry.h | |
| parent | 37396ce835e702248b9e8fa1bbaec07b8b64ab4f (diff) | |
| parent | 62388f3bfd5b1abd9fa369628b805e683e64c302 (diff) | |
Merge remote-tracking branch 'upstream/master' into various_data
Diffstat (limited to 'include/global.berry.h')
| -rw-r--r-- | include/global.berry.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/global.berry.h b/include/global.berry.h index 21a0dd500..8f185c8f9 100644 --- a/include/global.berry.h +++ b/include/global.berry.h @@ -3,7 +3,7 @@ struct Berry { - /*0x00*/ const u8 name[7]; + /*0x00*/ u8 name[7]; /*0x07*/ u8 firmness; /*0x08*/ u16 size; /*0x0A*/ u8 maxYield; |