From b9b9f7c0ca3824c670d525e4c46e52cd72f3a8d3 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Sun, 24 Sep 2017 14:11:00 -0400 Subject: Fixed Unown form determination --- gba/source/serialize.c | 8 ++++---- source/deserialize.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gba/source/serialize.c b/gba/source/serialize.c index 8929689..f5446ef 100644 --- a/gba/source/serialize.c +++ b/gba/source/serialize.c @@ -135,10 +135,10 @@ void PokemonIntermediateInit( if (sub0->species == UNOWN_SPECIES_INDEX) { u8 unownDeterminer = - ((bpkm->personality & 0x07000000) >> 18) - | ((bpkm->personality & 0x00070000) >> 12) - | ((bpkm->personality & 0x00000700) >> 6) - | (bpkm->personality & 0x00000007); + ((bpkm->personality & 0x03000000) >> 18) + | ((bpkm->personality & 0x00030000) >> 12) + | ((bpkm->personality & 0x00000300) >> 6) + | (bpkm->personality & 0x00000003); pki->unownLetter = (unownDeterminer % 28); } diff --git a/source/deserialize.c b/source/deserialize.c index e6fdf3b..da2d919 100644 --- a/source/deserialize.c +++ b/source/deserialize.c @@ -203,7 +203,7 @@ cJSON* pokemonToJson(const struct PokemonIntermediate* pki) pki->altAbility); // Handle Unown form. - if (pki->species == 201) + if (__builtin_bswap16(pki->species) == 201) { cJSON_AddNumberToObject( jPoke, -- cgit 1.4.1