diff options
Diffstat (limited to 'include/pokemon.h')
| -rw-r--r-- | include/pokemon.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index b1ccf2704..11de26acc 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 hasSpecies:1; + u8 isEgg: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; @@ -374,7 +376,7 @@ void DecryptBoxMon(struct BoxPokemon *boxMon); union PokemonSubstruct *GetSubstruct(struct BoxPokemon *boxMon, u32 personality, u8 substructType); u32 GetMonData(struct Pokemon *mon, s32 field, u8 *data); u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data); -void SetMonData(struct Pokemon *mon, s32 field, u8 *data); +void SetMonData(struct Pokemon *mon, s32 field, const u8 *data); void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const u8 *data); u8 GetNature(struct Pokemon *mon); |