diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2017-09-13 15:43:40 -0400 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2017-09-13 15:43:40 -0400 |
| commit | e2a76d1f0fd978f285edf1dbc0f6e87cf89c63ce (patch) | |
| tree | 2d0ead3d268bb7ddf4ab7272c7d0d6c711ea3f51 | |
| parent | 98fec850efde05daa72259c937b1eac05b2c695a (diff) | |
| download | gen3uploader-e2a76d1f0fd978f285edf1dbc0f6e87cf89c63ce.tar.gz gen3uploader-e2a76d1f0fd978f285edf1dbc0f6e87cf89c63ce.tar.bz2 gen3uploader-e2a76d1f0fd978f285edf1dbc0f6e87cf89c63ce.zip | |
Added "Orre" flag to Pokémon serialization
See wiki for more information on why.
| -rw-r--r-- | gba/source/serialize.c | 1 | ||||
| -rw-r--r-- | include/pokemon.h | 3 |
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; |