summaryrefslogtreecommitdiff
path: root/include/pokemon.h
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-01-18 18:33:37 -0800
committerGitHub <noreply@github.com>2018-01-18 18:33:37 -0800
commit1d8798203e86b61e889ea1c0fba851cbdbdd03d7 (patch)
tree129a2f696f5f35f1f13a0fd11b421b822b401d93 /include/pokemon.h
parentd69b05190e3edb03e7cbc50360c70d1501e9ad0e (diff)
parenta0cb6c72b6ba7c1b2d2464f3c1ac04354d5d05de (diff)
Merge pull request #535 from ProjectRevoTPP/fixes
fixes
Diffstat (limited to 'include/pokemon.h')
-rw-r--r--include/pokemon.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/pokemon.h b/include/pokemon.h
index 8f1b46387..6e3e15404 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -258,7 +258,6 @@ struct BoxPokemon
/*0x13*/ u8 isBadEgg:1;
u8 hasSpecies:1;
u8 isEgg:1;
- u8 unused:5;
/*0x14*/ u8 otName[OT_NAME_LENGTH];
/*0x1B*/ u8 markings;
/*0x1C*/ u16 checksum;
@@ -419,7 +418,6 @@ struct BattleMove
u8 target;
s8 priority;
u8 flags;
- u8 pad[3];
};
#define FLAG_MAKES_CONTACT 0x1