summaryrefslogtreecommitdiff
path: root/include/pokemon.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/pokemon.h')
-rw-r--r--include/pokemon.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/include/pokemon.h b/include/pokemon.h
index a60ad66be..9eddd8155 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -205,7 +205,7 @@ struct BoxPokemon
u8 hasSpecies:1;
u8 isEgg:1;
u8 unused:5;
- u8 otName[OT_NAME_LENGTH];
+ u8 otName[PLAYER_NAME_LENGTH];
u8 markings;
u16 checksum;
u16 unknown;
@@ -268,12 +268,12 @@ struct UnknownPokemonStruct3
struct Unknown_806F160_Struct
{
- u8 field_0_0 : 4;
- u8 field_0_1 : 4;
+ u8 field_0_0:4;
+ u8 field_0_1:4;
u8 field_1;
u8 magic;
- u8 field_3_0 : 4;
- u8 field_3_1 : 4;
+ u8 field_3_0:4;
+ u8 field_3_1:4;
void *bytes;
u8 **byteArrays;
struct SpriteTemplate *templates;
@@ -456,6 +456,7 @@ extern const u8 gStatStageRatios[][2];
extern const u16 gUnknown_08329D54[];
extern const struct SpriteTemplate gUnknown_08329D98[];
extern const struct CompressedSpritePalette gMonPaletteTable[];
+extern const s8 gNatureStatTable[][5];
void ZeroBoxMonData(struct BoxPokemon *boxMon);
void ZeroMonData(struct Pokemon *mon);