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 /src/mystery_event_script.c | |
| parent | 5a53d6d1fb304736c1fb3c222192a3b722707bca (diff) | |
| parent | e1834c9d7bc961f872169e056b788fec04f39867 (diff) | |
Merge pull request #3 from pret/master
merge
Diffstat (limited to 'src/mystery_event_script.c')
| -rw-r--r-- | src/mystery_event_script.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mystery_event_script.c b/src/mystery_event_script.c index 8822cd05a..921c8e97c 100644 --- a/src/mystery_event_script.c +++ b/src/mystery_event_script.c @@ -226,9 +226,9 @@ bool8 MEScrCmd_setenigmaberry(struct ScriptContext *ctx) const u8 *message; bool32 haveBerry = IsEnigmaBerryValid(); u8 *berry = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]); - StringCopyN(gStringVar1, gSaveBlock1Ptr->enigmaBerry.berry.name, BERRY_NAME_COUNT); + StringCopyN(gStringVar1, gSaveBlock1Ptr->enigmaBerry.berry.name, BERRY_NAME_LENGTH + 1); SetEnigmaBerry(berry); - StringCopyN(gStringVar2, gSaveBlock1Ptr->enigmaBerry.berry.name, BERRY_NAME_COUNT); + StringCopyN(gStringVar2, gSaveBlock1Ptr->enigmaBerry.berry.name, BERRY_NAME_LENGTH + 1); if (!haveBerry) { |