Fixed shininess determination

Shininess is determined with the ID of the OT, not the game the Pokémon
is currently in.

3 files changed, 7 insertions, 15 deletions

@@ -106,10 +106,6 @@ int main(void)
       (trainerId[1] << 8)
     | (trainerId[0]);
 
-  u16 secretIdNum =
-      (trainerId[3] << 8)
-    | (trainerId[2]);
-
   sendU32(trainerIdNum);
   waitForAck();
 
@@ -208,7 +204,7 @@ int main(void)
 
     struct PokemonIntermediate pki;
 
-    PokemonIntermediateInit(&pki, bpkm, trainerIdNum, secretIdNum);
+    PokemonIntermediateInit(&pki, bpkm);
     PokemonIntermediateStream(&pki);
   }
 }
@@ -41,9 +41,7 @@ u32 CalculateStat(
 
 void PokemonIntermediateInit(
   struct PokemonIntermediate* pki,
-  struct BoxPokemon* bpkm,
-  u16 trainerId,
-  u16 secretId)
+  struct BoxPokemon* bpkm)
 {
   DecryptBoxPokemon(bpkm);
 
@@ -120,10 +118,10 @@ void PokemonIntermediateInit(
   }
 
   // Determine shininess from the personality value.
-  u16 shinyDeterminer =
-      (trainerId)
-    ^ (secretId)
-    ^ ((bpkm->personality >> 16) & 0x0000FFFF)
+  u32 shinyDeterminer =
+      ((bpkm->otId & 0xFFFF0000) >> 16)
+    ^ (bpkm->otId & 0x0000FFFF)
+    ^ ((bpkm->personality & 0xFFFF0000) >> 16)
     ^ (bpkm->personality & 0x0000FFFF);
 
   if (shinyDeterminer < 8)
@@ -15,9 +15,7 @@ struct GameData;
 
 void PokemonIntermediateInit(
   struct PokemonIntermediate* pki,
-  struct BoxPokemon* bpkm,
-  u16 trainerId,
-  u16 secretId);
+  struct BoxPokemon* bpkm);
 
 void PokemonIntermediateStream(struct PokemonIntermediate* pki);