summaryrefslogtreecommitdiff
path: root/include/pokemon.h
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2018-09-18 10:03:57 -0500
committerDiegoisawesome <diego@domoreaweso.me>2018-09-18 10:03:57 -0500
commit8a05bf82ec680aba6b331313742e61812ac30f1e (patch)
treec0a77c2ddf82b94d7bd5c8f12b1ee7c1de8a647c /include/pokemon.h
parent899ae7a59a2335917b3494b2b5c65dfa52faf4ce (diff)
parent7f2d52d9e0d6a449a5df2274fdb80ede9e2bec54 (diff)
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'include/pokemon.h')
-rw-r--r--include/pokemon.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/pokemon.h b/include/pokemon.h
index abfb360f0..9eddd8155 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -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;