diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2017-09-23 10:23:00 -0400 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2017-09-23 10:23:00 -0400 |
| commit | fff1871a51e72365db7b5856f0335cfd14a7c005 (patch) | |
| tree | e387206cd5a509edd7b72d9fa6ed38eb6c7263dc | |
| parent | 6437a6cd49404b5e2e83bf940d8ac2284eb1e6bf (diff) | |
| download | gen3uploader-fff1871a51e72365db7b5856f0335cfd14a7c005.tar.gz gen3uploader-fff1871a51e72365db7b5856f0335cfd14a7c005.tar.bz2 gen3uploader-fff1871a51e72365db7b5856f0335cfd14a7c005.zip | |
Stopped bit-packing serialized Pokémon data
It seems to have been causing some difficulty with the GameCube being able to parse the data, so for now I'm not going to do it.
| -rw-r--r-- | include/pokemon.h | 14 |
1 files changed, 7 insertions, 7 deletions
| diff --git a/include/pokemon.h b/include/pokemon.h index 04ecfa0..95af35e 100644 --- a/include/pokemon.h +++ b/include/pokemon.h | |||
| @@ -54,17 +54,17 @@ struct __attribute__((aligned(4))) PokemonIntermediate { | |||
| 54 | u16 otId; // only the lower 2 bytes, because the upper 2 are secret | 54 | u16 otId; // only the lower 2 bytes, because the upper 2 are secret |
| 55 | 55 | ||
| 56 | u8 ppBonuses; | 56 | u8 ppBonuses; |
| 57 | u8 otGender:1; | 57 | u8 otGender; |
| 58 | u8 metLevel:7; | 58 | u8 metLevel; |
| 59 | u8 metLocation; | 59 | u8 metLocation; |
| 60 | u8 nickname[POKEMON_NAME_LENGTH]; | 60 | u8 nickname[POKEMON_NAME_LENGTH]; |
| 61 | u8 otName[OT_NAME_LENGTH]; | 61 | u8 otName[OT_NAME_LENGTH]; |
| 62 | u8 pokeball; | 62 | u8 pokeball; |
| 63 | u8 language:3; | 63 | u8 language; |
| 64 | u8 altAbility:1; | 64 | u8 altAbility; |
| 65 | u8 orre:1; | 65 | u8 gender; |
| 66 | u8 gender:2; | 66 | u8 orre; |
| 67 | u8 shiny:1; | 67 | u8 shiny; |
| 68 | u8 nature; | 68 | u8 nature; |
| 69 | u8 unownLetter; | 69 | u8 unownLetter; |
| 70 | 70 | ||