From 095ee08c001398d67bbc04ceb4eeeb2d0a8eafdb Mon Sep 17 00:00:00 2001 From: Greg Edwards Date: Fri, 16 May 2014 16:55:33 -0400 Subject: [PATCH] Fixes to GT data decrypter --- gts/Box Upload Xor Pad.bin | Bin 256 -> 256 bytes gts/src/GtsSessionBase.cs | 2 +- gts/test/BoxUp.aspx | 2 +- gts/test/BoxUp.aspx.cs | 2 +- library/Structures/GtsRecord4.cs | 1 + 5 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gts/Box Upload Xor Pad.bin b/gts/Box Upload Xor Pad.bin index 423563f2ed6fff4745df42582118806bd8dc5ed9..329b805aa8f03666bdeff61894512e4b80f09458 100644 GIT binary patch delta 12 TcmZo*YG9hk@`t7Su)iw+8!QBT delta 11 ScmZo*YG7jNKJ4#0;ST^6g9LW~ diff --git a/gts/src/GtsSessionBase.cs b/gts/src/GtsSessionBase.cs index b08b26b3..6f09fdde 100644 --- a/gts/src/GtsSessionBase.cs +++ b/gts/src/GtsSessionBase.cs @@ -140,4 +140,4 @@ namespace PkmnFoundations.GTS return (prev * 0x45 + 0x1111) & 0x7fffffff; } } -} \ No newline at end of file +} diff --git a/gts/test/BoxUp.aspx b/gts/test/BoxUp.aspx index 21cf6809..da863f19 100644 --- a/gts/test/BoxUp.aspx +++ b/gts/test/BoxUp.aspx @@ -6,7 +6,7 @@
-

Uplaod your Generation IV box upload, battle video, and dressup capture:

+

Uplaod your Generation IV box upload, battle video, or dressup capture:

 Pad offset: diff --git a/gts/test/BoxUp.aspx.cs b/gts/test/BoxUp.aspx.cs index 43a63065..f11ddbfe 100644 --- a/gts/test/BoxUp.aspx.cs +++ b/gts/test/BoxUp.aspx.cs @@ -31,7 +31,7 @@ namespace PkmnFoundations.GTS.debug s.Close(); int padOffset = Convert.ToInt32(txtOffset.Text); - for (int x = 4; x < data.Length; x++) + for (int x = 6; x < data.Length; x++) { data[x] ^= pad[(x + padOffset) % 256]; } diff --git a/library/Structures/GtsRecord4.cs b/library/Structures/GtsRecord4.cs index 8964dc1e..a64ece06 100644 --- a/library/Structures/GtsRecord4.cs +++ b/library/Structures/GtsRecord4.cs @@ -69,6 +69,7 @@ namespace PkmnFoundations.Structures /// 16 bytes /// public byte[] TrainerName; // todo: decode/encode to unicode and provide a String wrapper. + // https://github.com/veekun/pokedex/blob/master/pokedex/struct/_pokemon_struct.py public ushort TrainerOT;