summaryrefslogtreecommitdiff
path: root/src/berry.c
diff options
context:
space:
mode:
authorTetrable <atiftetra@gmail.com>2018-09-09 20:42:23 +0100
committerGitHub <noreply@github.com>2018-09-09 20:42:23 +0100
commit3a0c26887efb6abc8106671ceefcc098737d823b (patch)
tree930dcf2dc217011c45671f3bf2017ec9111fd6ed /src/berry.c
parent5a53d6d1fb304736c1fb3c222192a3b722707bca (diff)
parente1834c9d7bc961f872169e056b788fec04f39867 (diff)
Merge pull request #3 from pret/master
merge
Diffstat (limited to 'src/berry.c')
-rw-r--r--src/berry.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/berry.c b/src/berry.c
index f8a0204c4..ea216b61c 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -1076,8 +1076,8 @@ u16 BerryTypeToItemId(u16 berry)
void GetBerryNameByBerryType(u8 berry, u8 *string)
{
- memcpy(string, GetBerryInfo(berry)->name, BERRY_NAME_COUNT - 1);
- string[BERRY_NAME_COUNT - 1] = EOS;
+ memcpy(string, GetBerryInfo(berry)->name, BERRY_NAME_LENGTH);
+ string[BERRY_NAME_LENGTH] = EOS;
}
void GetBerryCountStringByBerryType(u8 berry, u8* dest, u32 berryCount)