diff options
| author | YamaArashi <shadow962@live.com> | 2016-09-10 02:36:05 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-09-10 02:36:05 -0700 |
| commit | 8765b09e09dfaf271b0ae4974f615f43486bd7e2 (patch) | |
| tree | a2c634ceb3fd62650a5b6b0ae4effaeaea1ddd7a | |
| parent | 19bffecc4deb401aa51add3b95163b72686f40ee (diff) | |
use name length defines
| -rw-r--r-- | include/global.h | 3 | ||||
| -rw-r--r-- | include/pokemon.h | 10 | ||||
| -rw-r--r-- | src/pokemon_1.c | 4 |
3 files changed, 11 insertions, 6 deletions
diff --git a/include/global.h b/include/global.h index 8aba50d74..e42684b58 100644 --- a/include/global.h +++ b/include/global.h @@ -12,6 +12,9 @@ #define ARRAY_COUNT(array) (sizeof(array) / sizeof((array)[0])) +#define POKEMON_NAME_LENGTH 10 +#define OT_NAME_LENGTH 7 + extern u8 gStringVar1[]; extern u8 gStringVar2[]; extern u8 gStringVar3[]; diff --git a/include/pokemon.h b/include/pokemon.h index b1ccf2704..a0b1d3126 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -1,6 +1,8 @@ #ifndef GUARD_POKEMON_H #define GUARD_POKEMON_H +#include "global.h" + #define MON_DATA_PERSONALITY 0 #define MON_DATA_OT_ID 1 #define MON_DATA_NICKNAME 2 @@ -178,13 +180,13 @@ struct BoxPokemon { u32 personality; u32 otId; - u8 nickname[10]; + u8 nickname[POKEMON_NAME_LENGTH]; u8 language; u8 isBadEgg:1; u8 sanity2:1; u8 sanity3:1; u8 unused:5; - u8 otName[7]; + u8 otName[OT_NAME_LENGTH]; u8 markings; u16 checksum; u16 unknown; @@ -234,7 +236,7 @@ struct UnknownPokemonStruct u32 gap:1; u32 altAbility:1; u32 personality; - u8 nickname[11]; + u8 nickname[POKEMON_NAME_LENGTH + 1]; u8 friendship; }; @@ -270,7 +272,7 @@ struct BattlePokemon u8 friendship; u16 maxHP; u16 item; - u8 nickname[11]; + u8 nickname[POKEMON_NAME_LENGTH + 1]; u8 unknown2; u8 otName[8]; u32 unknown3; diff --git a/src/pokemon_1.c b/src/pokemon_1.c index 566db2e68..f7dc3aa01 100644 --- a/src/pokemon_1.c +++ b/src/pokemon_1.c @@ -73,7 +73,7 @@ void CreateMon(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 hasFix void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV, u8 hasFixedPersonality, u32 fixedPersonality, u8 otIdType, u32 fixedOtId) { - u8 speciesName[10]; + u8 speciesName[POKEMON_NAME_LENGTH + 1]; u32 personality; u32 value; u16 checksum; @@ -298,7 +298,7 @@ void CreateMonWithEVSpread(struct Pokemon *mon, u16 species, u8 level, u8 fixedI void sub_803ADE8(struct Pokemon *mon, struct UnknownPokemonStruct *src) { s32 i; - u8 nickname[11]; + u8 nickname[POKEMON_NAME_LENGTH + 1]; u8 language; u8 value; |