about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--gba/source/serialize.c1
-rw-r--r--include/pokemon.h3
2 files changed, 3 insertions, 1 deletions
diff --git a/gba/source/serialize.c b/gba/source/serialize.c index 12afbdc..069418d 100644 --- a/gba/source/serialize.c +++ b/gba/source/serialize.c
@@ -91,6 +91,7 @@ void PokemonIntermediateInit(
91 pki->pokeball = sub3->pokeball; 91 pki->pokeball = sub3->pokeball;
92 pki->altAbility = sub3->altAbility; 92 pki->altAbility = sub3->altAbility;
93 pki->language = bpkm->language & 7; 93 pki->language = bpkm->language & 7;
94 pki->orre = (sub3->metGame == 15);
94 95
95 // Derive nature from the personality value. 96 // Derive nature from the personality value.
96 pki->nature = (bpkm->personality % 25); 97 pki->nature = (bpkm->personality % 25);
diff --git a/include/pokemon.h b/include/pokemon.h index bd311c4..072386f 100644 --- a/include/pokemon.h +++ b/include/pokemon.h
@@ -62,7 +62,8 @@ struct __attribute__((aligned(4))) PokemonIntermediate {
62 u8 pokeball; 62 u8 pokeball;
63 u8 language:3; 63 u8 language:3;
64 u8 altAbility:1; 64 u8 altAbility:1;
65 u8 filler:4; // waste of space but nothing to pack it with 65 u8 orre:1;
66 u8 filler:3; // waste of space but nothing to pack it with
66 67
67 // the following values are generated from the personality value. 68 // the following values are generated from the personality value.
68 u8 nature:6; 69 u8 nature:6;