diff options
author | Tetrable <atiftetra@gmail.com> | 2018-09-09 20:42:23 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-09 20:42:23 +0100 |
commit | 3a0c26887efb6abc8106671ceefcc098737d823b (patch) | |
tree | 930dcf2dc217011c45671f3bf2017ec9111fd6ed /include/global.berry.h | |
parent | 5a53d6d1fb304736c1fb3c222192a3b722707bca (diff) | |
parent | e1834c9d7bc961f872169e056b788fec04f39867 (diff) |
Merge pull request #3 from pret/master
merge
Diffstat (limited to 'include/global.berry.h')
-rw-r--r-- | include/global.berry.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/global.berry.h b/include/global.berry.h index 5c8a43a02..8046d344e 100644 --- a/include/global.berry.h +++ b/include/global.berry.h @@ -1,12 +1,12 @@ #ifndef GUARD_GLOBAL_BERRY_H #define GUARD_GLOBAL_BERRY_H -#define BERRY_NAME_COUNT 7 +#define BERRY_NAME_LENGTH 6 #define BERRY_ITEM_EFFECT_COUNT 18 struct Berry { - const u8 name[BERRY_NAME_COUNT]; + const u8 name[BERRY_NAME_LENGTH + 1]; u8 firmness; u16 size; u8 maxYield; @@ -26,7 +26,7 @@ struct Berry struct Berry2 { - u8 name[BERRY_NAME_COUNT]; + u8 name[BERRY_NAME_LENGTH + 1]; u8 firmness; u16 size; u8 maxYield; @@ -53,7 +53,7 @@ struct EnigmaBerry struct BattleEnigmaBerry { - /*0x00*/ u8 name[BERRY_NAME_COUNT]; + /*0x00*/ u8 name[BERRY_NAME_LENGTH + 1]; /*0x07*/ u8 holdEffect; /*0x08*/ u8 itemEffect[BERRY_ITEM_EFFECT_COUNT]; /*0x1A*/ u8 holdEffectParam; |