diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-25 21:07:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-25 21:07:18 -0500 |
| commit | 78864c88bb4f1e2f7a1894528db3714913cc84ca (patch) | |
| tree | 7d9e646e984522e7eb9b3d0752e8277c34070eb6 /src/pokemon.c | |
| parent | a09e66b53f61027d8805e5d6bb4df3d679693485 (diff) | |
| parent | 52fbc43d73995977aa8f6c45405a91c68d515061 (diff) | |
Merge pull request #240 from PikalaxALT/union_room_chat
Union room chat
Diffstat (limited to 'src/pokemon.c')
| -rw-r--r-- | src/pokemon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pokemon.c b/src/pokemon.c index d1305861a..09e2ed998 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[PLAYER_NAME_LENGTH]; u32 otId; GetMonData(mon, MON_DATA_OT_NAME, otName); otId = GetMonData(mon, MON_DATA_OT_ID, 0); |