diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-25 09:22:50 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-25 09:22:50 +0800 |
| commit | 2f87855072fb4fdca6ce22d60bfb1b7fdc000134 (patch) | |
| tree | a3a6d928910ed170904b5b367084afb2d1fb8b3d /include/pokemon.h | |
| parent | 6ca932e5e98fcd69c281d798406e53aee5a4d816 (diff) | |
| parent | 7579fc65c12bd46c045d10eb8cd9a2320fd1f3f0 (diff) | |
Merge branch 'master' into battle
Diffstat (limited to 'include/pokemon.h')
| -rw-r--r-- | include/pokemon.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index 24328e44e..79933a22c 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -317,7 +317,7 @@ struct BattleTowerPokemon u32 gap:1; u32 abilityNum:1; /*0x1C*/ u32 personality; - /*0x20*/ u8 nickname[POKEMON_NAME_LENGTH + 1]; + /*0x20*/ u8 nickname[11]; /*0x2B*/ u8 friendship; }; |