summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2020-09-09 16:27:24 -0400
committerGitHub <noreply@github.com>2020-09-09 16:27:24 -0400
commitd260943249387a5d25cbb60886b6c8aa72e3f24f (patch)
tree7e326cc3ea683c03827e7715fa7ef1836e87671d /include
parent8f6d6b933e081d6e7a35b52bd36da9d11952145b (diff)
parent7f1827767c27c6b696a9cd1a8c15b2b31a125b78 (diff)
Merge pull request #1182 from PokeCodec/PokemonLogicFix
Fix more fakematches
Diffstat (limited to 'include')
-rw-r--r--include/pokemon.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/pokemon.h b/include/pokemon.h
index d75ec94f3..81c17f545 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -123,12 +123,12 @@ struct Pokemon
struct Unknown_806F160_Struct
{
- 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;
+ u32 field_0_0:4;
+ u32 field_0_1:4;
+ u32 field_1:8;
+ u16 magic:8;
+ u32 size:4;
+ u16 field_3_1:4;
void *bytes;
u8 **byteArrays;
struct SpriteTemplate *templates;