diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-10-13 10:22:58 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-10-13 10:22:58 -0500 |
| commit | b24559d69b6fa0abf042a1b7cdbcab3d1ec91fd6 (patch) | |
| tree | 7b51d7b9cb9a370fe1dd9db8eeadc23089ba1328 /src/mail_data.c | |
| parent | fa9d1759bd7fa17ced37225bd31d46466da857c6 (diff) | |
| parent | a2a6700966cc802185577e44ba88a9154429c93b (diff) | |
Merge remote-tracking branch 'upstream/master' into shop
# Conflicts:
# asm/shop.s
Diffstat (limited to 'src/mail_data.c')
| -rw-r--r-- | src/mail_data.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mail_data.c b/src/mail_data.c index ebb49febf..809dcc2a8 100644 --- a/src/mail_data.c +++ b/src/mail_data.c @@ -22,7 +22,7 @@ void ClearMailStruct(struct MailStruct *mail) for (i = 0; i < MAIL_WORDS_COUNT; i++) mail->words[i] = 0xFFFF; - for (i = 0; i < PLAYER_NAME_LENGTH; i++) + for (i = 0; i < PLAYER_NAME_LENGTH + 1; i++) mail->playerName[i] = EOS; for (i = 0; i < 4; i++) @@ -58,7 +58,7 @@ u8 GiveMailToMon(struct Pokemon *mon, u16 itemId) for (i = 0; i < MAIL_WORDS_COUNT; i++) gSaveBlock1Ptr->mail[id].words[i] = 0xFFFF; - for (i = 0; i < PLAYER_NAME_LENGTH - 1; i++) + for (i = 0; i < PLAYER_NAME_LENGTH + 1 - 1; i++) gSaveBlock1Ptr->mail[id].playerName[i] = gSaveBlock2Ptr->playerName[i]; gSaveBlock1Ptr->mail[id].playerName[i] = EOS; PadNameString(gSaveBlock1Ptr->mail[id].playerName, CHAR_SPACE); |