From 3f51e119c7339770a3a5d0bc2ac225e9e46e4986 Mon Sep 17 00:00:00 2001 From: wwwwwwzx Date: Tue, 18 Apr 2017 03:24:23 -0700 Subject: [PATCH] Fix Japanese choonpu in gen3 string Fix gen3->gen4 encoded value mapping. Also replace choonpu in gen4 unicode table with later generation format. --- PKHeX/PKM/PKX.cs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/PKHeX/PKM/PKX.cs b/PKHeX/PKM/PKX.cs index 241e00007..bb39897b0 100644 --- a/PKHeX/PKM/PKX.cs +++ b/PKHeX/PKM/PKX.cs @@ -1652,7 +1652,7 @@ public static int getGender(int species, uint PID) 65334, 65335, 65336, 65337, 65338, 65345, 65346, 65347, 65348, 65349, 65350, 65351, 65352, 65353, 65354, 65355, 65356, 65357, 65358, 65359, 65360, 65361, 65362, 65363, 65364, 65365, 65366, 65367, 65368, 65369, 65370, 65281, 65311, 12289, 12290, 8943, 12539, 65295, 12300, 12301, 12302, 12303, 65288, 65289, 9325, 9326, - 65291, 65293, 9319, 9320, 65309, 65370, 65306, 65307, 65294, 65292, 9327, 9328, 9329, 9330, 9331, 9332, 9333, + 65291, 12540, 9319, 9320, 65309, 65370, 65306, 65307, 65294, 65292, 9327, 9328, 9329, 9330, 9331, 9332, 9333, 9334, 9335, 9336, 65312, 9337, 65285, 9338, 9339, 9341, 10052, 9739, 9812, 9813, 9738, 8663, 8664, 9790, 165, 9800, 9801, 9802, 9803, 9804, 9805, 9806, 9807, 8592, 8593, 8595, 8594, 8227, 65286, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, @@ -1857,7 +1857,7 @@ public static int getGender(int species, uint PID) 144, 145, 146, 147, 149, 151, 153, 154, 155, 156, 157, 158, 159, 160, 161, 082, // 7 084, 086, 088, 090, 148, 150, 152, 093, 095, 097, 099, 101, 103, 105, 107, 109, // 8 111, 113, 115, 118, 120, 122, 129, 132, 135, 138, 141, 130, 133, 136, 139, 142, // 9 - 116, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 225, 226, 228, 446, 230, // A + 116, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 225, 226, 228, 241, 230, // A 229, 234, 235, 232, 233, 443, 444, 424, 430, 242, 433, 172, 173, 174, 175, 176, // B 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, // C 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, // D @@ -2712,9 +2712,7 @@ public static string getString4(byte[] data, int offset, int count) if (chr == 0xFFFF) break; s.Append((char)chr); } - return s.ToString() - .Replace("\uFF0D", "\u30FC") // Japanese chōonpu - ; + return s.ToString(); } /// Gets the bytes for a 4th Generation String @@ -2728,7 +2726,6 @@ public static byte[] setString4(string value, int maxLength, int padTo = 0, usho if (value.Length > maxLength) value = value.Substring(0, maxLength); // Hard cap string temp = UnSanitizeString(value) // Replace Special Characters and add Terminator - .Replace("\u30FC", "\uFF0D") // Japanese chōonpu .PadRight(value.Length + 1, (char)0xFFFF) // Null Terminator .PadRight(padTo, (char)padWith); // Padding