diff options
| author | garak <garakmon@gmail.com> | 2018-09-24 08:40:33 -0400 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-09-24 08:40:33 -0400 |
| commit | 72f9afcbf4a81909019f21acad0484b72ed217f6 (patch) | |
| tree | bc7e9a48b8056e28403e251dab7ac64f649ad9e4 /src/mystery_event_script.c | |
| parent | 3964dbd4822f1b22bbc696add7e56ff0c5b2caea (diff) | |
| parent | 7ceabffc842dfdf127fd594055f895a0803f54f6 (diff) | |
Merge remote-tracking branch 'upstream/master'
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) { |