PLAYER_NAME_LENGTH to 7

12 files changed, 43 insertions, 43 deletions

diff --git a/include/global.h b/include/global.h
index 686ecb11c..3da77e307 100644
--- a/include/global.h
+++ b/include/global.h
@@ -182,13 +182,13 @@ struct BerryCrush
     u32 unk;
 };
 
-#define PLAYER_NAME_LENGTH  8
+#define PLAYER_NAME_LENGTH   7
 
 #define LINK_B_RECORDS_COUNT 5
 
 struct LinkBattleRecord
 {
-    u8 name[PLAYER_NAME_LENGTH];
+    u8 name[PLAYER_NAME_LENGTH + 1];
     u16 trainerId;
     u16 wins;
     u16 losses;
@@ -261,7 +261,7 @@ struct BattleTowerData // Leftover from R/S
 
 struct SaveBlock2
 {
-    /*0x000*/ u8 playerName[PLAYER_NAME_LENGTH];
+    /*0x000*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
     /*0x008*/ u8 playerGender; // MALE, FEMALE
     /*0x009*/ u8 specialSaveWarpFlags;
     /*0x00A*/ u8 playerTrainerId[4];
@@ -312,7 +312,7 @@ struct SecretBaseRecord
     /*0x1A9D*/ u8 gender:1;
     /*0x1A9D*/ u8 sbr_field_1_5:1;
     /*0x1A9D*/ u8 sbr_field_1_6:2;
-    /*0x1A9E*/ u8 trainerName[7]; // TODO: Change PLAYER_NAME_LENGTH to 7
+    /*0x1A9E*/ u8 trainerName[7]; // TODO: Change PLAYER_NAME_LENGTH + 1 to 7
     /*0x1AA5*/ u8 trainerId[4]; // byte 0 is used for determining trainer class
     /*0x1AA9*/ u8 language;
     /*0x1AAA*/ u16 sbr_field_e;
@@ -404,7 +404,7 @@ struct UnkMauvilleOldManStruct
     u8 unk_2D95;
     /*0x2D96*/ u16 mauvilleOldMan_ecArray[6];
     /*0x2DA2*/ u16 mauvilleOldMan_ecArray2[6];
-    /*0x2DAE*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
+    /*0x2DAE*/ u8 playerName[PLAYER_NAME_LENGTH + 1 + 1];
     /*0x2DB6*/ u8 filler_2DB6[0x3];
     /*0x2DB9*/ u8 playerTrainerId[4];
     u8 unk_2DBD;
@@ -715,7 +715,7 @@ struct TrainerRematchState
 struct TrainerNameRecord
 {
     u32 trainerId;
-    u8 trainerName[PLAYER_NAME_LENGTH];
+    u8 trainerName[PLAYER_NAME_LENGTH + 1];
 };
 
 #define UNION_ROOM_KB_ROW_COUNT 10
@@ -772,7 +772,7 @@ struct SaveBlock1
     /*0x361C*/ struct RamScript ramScript;
     /*0x3A08*/ u8 filler3A08[16];
     /*0x3A18*/ u8 seen2[DEX_FLAGS_NO];
-    /*0x3A4C*/ u8 rivalName[PLAYER_NAME_LENGTH];
+    /*0x3A4C*/ u8 rivalName[PLAYER_NAME_LENGTH + 1];
     /*0x3A54*/ struct FameCheckerSaveData fameChecker[NUM_FAMECHECKER_PERSONS];
     /*0x3A94*/ u8 filler3A94[0x40];
     /*0x3AD4*/ u8 unk3AD4[UNION_ROOM_KB_ROW_COUNT][21];
diff --git a/include/trainer_card.h b/include/trainer_card.h
index 06844dc2e..ed3e803d5 100644
--- a/include/trainer_card.h
+++ b/include/trainer_card.h
@@ -24,7 +24,7 @@ struct TrainerCard
     /*0x20*/ u16 pokemonTrades;
     /*0x24*/ u32 money;
     /*0x28*/ u16 var_28[4];
-    /*0x30*/ u8 playerName[PLAYER_NAME_LENGTH];
+    /*0x30*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
     /*0x38*/ u8 version;
     /*0x3A*/ u16 var_3A;
     /*0x3C*/ u32 berryCrushPoints;
diff --git a/include/union_room.h b/include/union_room.h
index 3cb8eb84a..7e48b3e6e 100644
--- a/include/union_room.h
+++ b/include/union_room.h
@@ -7,7 +7,7 @@
 struct UnkStruct_Shared
 {
     struct GFtgtGname gname;
-    u8 ALIGNED(4) playerName[PLAYER_NAME_LENGTH];
+    u8 ALIGNED(4) playerName[PLAYER_NAME_LENGTH + 1];
 };
 
 struct UnkStruct_x1C
diff --git a/src/daycare.c b/src/daycare.c
index a377e97f5..856a5fbc0 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -638,7 +638,7 @@ static void ClearDaycareMonMail(struct DayCareMail *mail)
 {
     s32 i;
 
-    for (i = 0; i < PLAYER_NAME_LENGTH/* + 1*/; i++)
+    for (i = 0; i < PLAYER_NAME_LENGTH + 1/* + 1*/; i++)
         mail->OT_name[i] = 0;
     for (i = 0; i < POKEMON_NAME_LENGTH + 1; i++)
         mail->monName[i] = 0;
diff --git a/src/link_rfu_2.c b/src/link_rfu_2.c
index 17f604ee8..4d1917789 100644
--- a/src/link_rfu_2.c
+++ b/src/link_rfu_2.c
@@ -30,7 +30,7 @@ static u16 gUnknown_3002008[7];
 
 struct GFtgtGname gHostRFUtgtGnameBuffer;
 struct UnkRfuStruct_2 Rfu;
-u8 gHostRFUtgtUnameBuffer[PLAYER_NAME_LENGTH];
+u8 gHostRFUtgtUnameBuffer[PLAYER_NAME_LENGTH + 1];
 
 static void sub_80F8AA4(void);
 static void sub_80F8AEC(void);
diff --git a/src/link_rfu_3.c b/src/link_rfu_3.c
index 31ea0830b..69b6603a8 100644
--- a/src/link_rfu_3.c
+++ b/src/link_rfu_3.c
@@ -848,7 +848,7 @@ static void ZeroName(u8 *name)
 {
     s32 i;
 
-    for (i = 0; i < PLAYER_NAME_LENGTH; i++)
+    for (i = 0; i < PLAYER_NAME_LENGTH + 1; i++)
     {
         *name++ = 0;
     }
@@ -858,7 +858,7 @@ static bool32 NameIsEmpty(const u8 *name)
 {
     s32 i;
 
-    for (i = 0; i < PLAYER_NAME_LENGTH; i++)
+    for (i = 0; i < PLAYER_NAME_LENGTH + 1; i++)
     {
         if (*name++ != 0)
         {
diff --git a/src/mail_data.c b/src/mail_data.c
index d4fa649e1..43ca1d0e6 100644
--- a/src/mail_data.c
+++ b/src/mail_data.c
@@ -20,7 +20,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++)
         mail->trainerId[i] = 0;
@@ -52,7 +52,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 && gSaveBlock2Ptr->playerName[i] != EOS; i++)
+            for (i = 0; i < PLAYER_NAME_LENGTH && gSaveBlock2Ptr->playerName[i] != EOS; i++)
                 gSaveBlock1Ptr->mail[id].playerName[i] = gSaveBlock2Ptr->playerName[i];
             for (; i <= 5; i++)
             	gSaveBlock1Ptr->mail[id].playerName[i] = CHAR_SPACE;
diff --git a/src/new_game.c b/src/new_game.c
index 381ba28c8..7428563de 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -108,7 +108,7 @@ void ResetMenuAndMonGlobals(void)
 
 void NewGameInitData(void)
 {
-    u8 rivalName[PLAYER_NAME_LENGTH];
+    u8 rivalName[PLAYER_NAME_LENGTH + 1];
 
     StringCopy(rivalName, gSaveBlock1Ptr->rivalName);
     gDifferentSaveFile = TRUE;
diff --git a/src/oak_speech.c b/src/oak_speech.c
index 0ad5d6a6f..6887ff85a 100644
--- a/src/oak_speech.c
+++ b/src/oak_speech.c
@@ -1902,8 +1902,8 @@ static void GetDefaultName(u8 arg0, u8 namePick)
         src = sRivalNameChoices[namePick];
         dest = gSaveBlock1Ptr->rivalName;
     }
-    for (i = 0; i < PLAYER_NAME_LENGTH - 1 && src[i] != EOS; i++)
+    for (i = 0; i < PLAYER_NAME_LENGTH && src[i] != EOS; i++)
         dest[i] = src[i];
-    for (; i < PLAYER_NAME_LENGTH; i++)
+    for (; i < PLAYER_NAME_LENGTH + 1; i++)
         dest[i] = EOS;
 }
diff --git a/src/pokemon.c b/src/pokemon.c
index d1305861a..130709598 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -2991,7 +2991,7 @@ u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data)
     {
         retVal = 0;
 
-        // FRLG changed this to 7 which used to be PLAYER_NAME_LENGTH
+        // FRLG changed this to 7 which used to be PLAYER_NAME_LENGTH + 1
         while (retVal < 7)
         {
             data[retVal] = boxMon->otName[retVal];
@@ -5769,7 +5769,7 @@ s8 GetFlavorRelationByPersonality(u32 personality, u8 flavor)
 
 bool8 IsTradedMon(struct Pokemon *mon)
 {
-    u8 otName[7 + 1]; // change PLAYER_NAME_LENGTH to 7
+    u8 otName[7 + 1]; // change PLAYER_NAME_LENGTH + 1 to 7
     u32 otId;
     GetMonData(mon, MON_DATA_OT_NAME, otName);
     otId = GetMonData(mon, MON_DATA_OT_ID, 0);
diff --git a/src/quest_log.c b/src/quest_log.c
index 0cda4eb77..a02aea302 100644
--- a/src/quest_log.c
+++ b/src/quest_log.c
@@ -2411,8 +2411,8 @@ static void BufferFanClubTrainerName(struct LinkBattleRecords *linkRecords, u8 w
     else
     {
         str = gStringVar1;
-        StringCopyN(str, linkTrainerName, PLAYER_NAME_LENGTH - 1);
-        str[PLAYER_NAME_LENGTH - 1] = EOS;
+        StringCopyN(str, linkTrainerName, PLAYER_NAME_LENGTH);
+        str[PLAYER_NAME_LENGTH] = EOS;
         if (   str[0] == EXT_CTRL_CODE_BEGIN
             && str[1] == EXT_CTRL_CODE_JPN)
         {
@@ -3401,8 +3401,8 @@ static const u16 *BufferQuestLogText_LinkTraded(const u16 *a0)
 {
     const u16 *r6 = a0 + 4;
 
-    memset(gStringVar1, EOS, PLAYER_NAME_LENGTH);
-    memcpy(gStringVar1, r6, PLAYER_NAME_LENGTH - 1);
+    memset(gStringVar1, EOS, PLAYER_NAME_LENGTH + 1);
+    memcpy(gStringVar1, r6, PLAYER_NAME_LENGTH);
 
     BufferLinkPartnersName(gStringVar1);
     QuestLog_GetSpeciesName(a0[3], gStringVar2, 0); // Mon received
@@ -3435,7 +3435,7 @@ static u16 *BufferQuestLogData_LinkBattledSingle(u16 *a0, const u16 *eventData)
     a0[0] = QL_EVENT_LINK_BATTLED_SINGLE;
     a0[1] = sQuestLogIdx;
     *((u8 *)a0 + 4) = *((const u8 *)eventData + 0);
-    memcpy((u8 *)a0 + 5, (const u8 *)eventData + 1, PLAYER_NAME_LENGTH - 1);
+    memcpy((u8 *)a0 + 5, (const u8 *)eventData + 1, PLAYER_NAME_LENGTH);
     a0 += 6;
     return a0;
 }
@@ -3444,8 +3444,8 @@ static const u16 *BufferQuestLogText_LinkBattledSingle(const u16 *a0)
 {
     DynamicPlaceholderTextUtil_Reset();
 
-    memset(gStringVar1, EOS, PLAYER_NAME_LENGTH);
-    memcpy(gStringVar1, (const u8 *)a0 + 5, PLAYER_NAME_LENGTH - 1);
+    memset(gStringVar1, EOS, PLAYER_NAME_LENGTH + 1);
+    memcpy(gStringVar1, (const u8 *)a0 + 5, PLAYER_NAME_LENGTH);
     BufferLinkPartnersName(gStringVar1);
     DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1);
     DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, sBattleOutcomeTexts[((const u8 *)a0)[4]]);
@@ -3459,7 +3459,7 @@ static u16 *BufferQuestLogData_LinkBattledDouble(u16 *a0, const u16 *eventData)
     a0[0] = QL_EVENT_LINK_BATTLED_DOUBLE;
     a0[1] = sQuestLogIdx;
     *((u8 *)a0 + 4) = *((const u8 *)eventData + 0);
-    memcpy((u8 *)a0 + 5, (const u8 *)eventData + 1, PLAYER_NAME_LENGTH - 1);
+    memcpy((u8 *)a0 + 5, (const u8 *)eventData + 1, PLAYER_NAME_LENGTH);
     a0 += 6;
     return a0;
 }
@@ -3468,8 +3468,8 @@ static const u16 *BufferQuestLogText_LinkBattledDouble(const u16 *a0)
 {
     DynamicPlaceholderTextUtil_Reset();
 
-    memset(gStringVar1, EOS, PLAYER_NAME_LENGTH);
-    memcpy(gStringVar1, (const u8 *)a0 + 5, PLAYER_NAME_LENGTH - 1);
+    memset(gStringVar1, EOS, PLAYER_NAME_LENGTH + 1);
+    memcpy(gStringVar1, (const u8 *)a0 + 5, PLAYER_NAME_LENGTH);
     BufferLinkPartnersName(gStringVar1);
     DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1);
     DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, sBattleOutcomeTexts[((const u8 *)a0)[4]]);
@@ -3483,9 +3483,9 @@ static u16 *BufferQuestLogData_LinkBattledMulti(u16 *a0, const u16 *eventData)
     a0[0] = QL_EVENT_LINK_BATTLED_MULTI;
     a0[1] = sQuestLogIdx;
     *((u8 *)a0 + 4) = *((const u8 *)eventData + 0);
-    memcpy((u8 *)a0 +  5, (const u8 *)eventData +  1, PLAYER_NAME_LENGTH - 1);
-    memcpy((u8 *)a0 + 12, (const u8 *)eventData +  8, PLAYER_NAME_LENGTH - 1);
-    memcpy((u8 *)a0 + 19, (const u8 *)eventData + 15, PLAYER_NAME_LENGTH - 1);
+    memcpy((u8 *)a0 +  5, (const u8 *)eventData +  1, PLAYER_NAME_LENGTH);
+    memcpy((u8 *)a0 + 12, (const u8 *)eventData +  8, PLAYER_NAME_LENGTH);
+    memcpy((u8 *)a0 + 19, (const u8 *)eventData + 15, PLAYER_NAME_LENGTH);
     a0 += 13;
     return a0;
 }
@@ -3494,9 +3494,9 @@ static const u16 *BufferQuestLogText_LinkBattledMulti(const u16 *a0)
 {
     DynamicPlaceholderTextUtil_Reset();
 
-    memset(gStringVar1, EOS, PLAYER_NAME_LENGTH);
-    memset(gStringVar2, EOS, PLAYER_NAME_LENGTH);
-    memset(gStringVar3, EOS, PLAYER_NAME_LENGTH);
+    memset(gStringVar1, EOS, PLAYER_NAME_LENGTH + 1);
+    memset(gStringVar2, EOS, PLAYER_NAME_LENGTH + 1);
+    memset(gStringVar3, EOS, PLAYER_NAME_LENGTH + 1);
     StringCopy7(gStringVar1, (const u8 *)a0 +  5);
     StringCopy7(gStringVar2, (const u8 *)a0 + 12);
     StringCopy7(gStringVar3, (const u8 *)a0 + 19);
@@ -3548,7 +3548,7 @@ static u16 *BufferQuestLogData_LinkTradedUnionRoom(u16 *a0, const u16 *eventData
     a0[1] = sQuestLogIdx;
     a0[2] = eventData[0];
     a0[3] = eventData[1];
-    memcpy(r4, eventData + 2, PLAYER_NAME_LENGTH - 1);
+    memcpy(r4, eventData + 2, PLAYER_NAME_LENGTH);
     r4 += 8;
     return (u16 *)r4;
 }
@@ -3556,8 +3556,8 @@ static u16 *BufferQuestLogData_LinkTradedUnionRoom(u16 *a0, const u16 *eventData
 static const u16 *BufferQuestLogText_LinkTradedUnionRoom(const u16 *a0)
 {
     const u8 *r6 = (const u8 *)(a0 + 4);
-    memset(gStringVar1, EOS, PLAYER_NAME_LENGTH);
-    memcpy(gStringVar1, r6, PLAYER_NAME_LENGTH - 1);
+    memset(gStringVar1, EOS, PLAYER_NAME_LENGTH + 1);
+    memcpy(gStringVar1, r6, PLAYER_NAME_LENGTH);
     BufferLinkPartnersName(gStringVar1);
     QuestLog_GetSpeciesName(a0[3], gStringVar2, 0);
     QuestLog_GetSpeciesName(a0[2], gStringVar3, 0);
@@ -3571,15 +3571,15 @@ static u16 *BufferQuestLogData_LinkBattledUnionRoom(u16 *a0, const u16 *eventDat
     a0[0] = QL_EVENT_LINK_BATTLED_UNION;
     a0[1] = sQuestLogIdx;
     *(u8 *)&a0[2] = *(const u8 *)&eventData[0];
-    memcpy((u8 *)a0 + 5, (const u8 *)eventData + 1, PLAYER_NAME_LENGTH - 1);
+    memcpy((u8 *)a0 + 5, (const u8 *)eventData + 1, PLAYER_NAME_LENGTH);
     a0 += 6;
     return a0;
 }
 
 static const u16 *BufferQuestLogText_LinkBattledUnionRoom(const u16 *a0)
 {
-    memset(gStringVar1, EOS, PLAYER_NAME_LENGTH);
-    memcpy(gStringVar1, (const u8 *)a0 + 5, PLAYER_NAME_LENGTH - 1);
+    memset(gStringVar1, EOS, PLAYER_NAME_LENGTH + 1);
+    memcpy(gStringVar1, (const u8 *)a0 + 5, PLAYER_NAME_LENGTH);
     BufferLinkPartnersName(gStringVar1);
     StringCopy(gStringVar2, sBattleOutcomeTexts[*(const u8 *)&a0[2]]);
     StringExpandPlaceholders(gStringVar4, QuestLog_Text_BattledTrainerEndedInOutcome);
diff --git a/src/union_room.c b/src/union_room.c
index 4e3428cc6..6be88e2dd 100644
--- a/src/union_room.c
+++ b/src/union_room.c
@@ -3385,7 +3385,7 @@ static void sub_81199FC(u8 taskId)
         case 2:
             if (sUnionRoomPlayerName[0] == EOS)
             {
-                for (i = 0; i < PLAYER_NAME_LENGTH; i++)
+                for (i = 0; i < PLAYER_NAME_LENGTH + 1; i++)
                 {
                     if (structPtr->field_0->arr[i].field_1A_0 == 1)
                     {