From 3a251d6b47eee5565f9c3c94d6fc2e14ef38ca9e Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Tue, 16 Dec 2014 18:56:08 -0800
Subject: [PATCH] 12-17-14 release fixes

Items, translations and some bug fixes.
---
 Misc/Legal.cs                   |   2 +-
 Misc/PKX.cs                     | 218 ++++++++++++++++----------------
 PKX/f1-Main.Designer.cs         |   6 +-
 PKX/f1-Main.cs                  |  17 ++-
 Resources/img/item/item_258.png | Bin 460 -> 630 bytes
 Resources/img/item/item_504.png | Bin 532 -> 674 bytes
 Resources/img/item/item_565.png | Bin 0 -> 309 bytes
 Resources/img/item/item_566.png | Bin 0 -> 311 bytes
 Resources/img/item/item_567.png | Bin 0 -> 314 bytes
 Resources/img/item/item_568.png | Bin 0 -> 311 bytes
 Resources/img/item/item_569.png | Bin 0 -> 309 bytes
 Resources/img/item/item_570.png | Bin 0 -> 312 bytes
 Resources/img/item/item_571.png | Bin 280 -> 267 bytes
 Resources/img/item/item_699.png | Bin 524 -> 489 bytes
 Resources/text/changelog.txt    |  13 +-
 Resources/text/de/lang_de.txt   |   2 +-
 Resources/text/es/lang_es.txt   |   4 +-
 Resources/text/fr/lang_fr.txt   |   4 +-
 Resources/text/ja/lang_ja.txt   |   2 +-
 Resources/text/zh/lang_zh.txt   |   2 +-
 SAV/SAV_PokedexORAS.cs          |   2 +-
 21 files changed, 144 insertions(+), 128 deletions(-)
 create mode 100644 Resources/img/item/item_565.png
 create mode 100644 Resources/img/item/item_566.png
 create mode 100644 Resources/img/item/item_567.png
 create mode 100644 Resources/img/item/item_568.png
 create mode 100644 Resources/img/item/item_569.png
 create mode 100644 Resources/img/item/item_570.png

diff --git a/Misc/Legal.cs b/Misc/Legal.cs
index 41ae92c58..3a0f65a15 100644
--- a/Misc/Legal.cs
+++ b/Misc/Legal.cs
@@ -31,7 +31,7 @@ class Legal
         internal static readonly int[] Items_CommonBall = { 4, 3, 2 };
         internal static readonly int[] Items_UncommonBall = { 7, 576, 13, 492, 497, 14, 495, 493, 496, 494, 11, 498, 8, 6, 12, 15, 9, 5, 499, 10, 1, 16 };
         #endregion
-        internal static readonly int[] Gen4EncounterTypes = { 0, 2, 4, 9, 10, 24 };
+        internal static readonly int[] Gen4EncounterTypes = { 2, 4, 9, 10, 24 };
         #region Games
         internal static readonly int[] Games_6xy = { 24, 25 };
         internal static readonly int[] Games_6oras = { 26, 27 };
diff --git a/Misc/PKX.cs b/Misc/PKX.cs
index b88e0068c..40dc5c575 100644
--- a/Misc/PKX.cs
+++ b/Misc/PKX.cs
@@ -29,115 +29,114 @@ public static uint LCRNG(uint seed)
         public static DataTable ExpTable()
         {
             DataTable table = new DataTable();
-            table.Columns.Add("Level", typeof(int));
-
-            table.Columns.Add("0 - Erratic", typeof(uint));
-            table.Columns.Add("1 - Fast", typeof(uint));
-            table.Columns.Add("2 - MF", typeof(uint));
+            table.Columns.Add("Level", typeof(byte));
+            table.Columns.Add("0 - MF", typeof(uint));
+            table.Columns.Add("1 - Erratic", typeof(uint));
+            table.Columns.Add("2 - Fluctuating", typeof(uint));
             table.Columns.Add("3 - MS", typeof(uint));
-            table.Columns.Add("4 - Slow", typeof(uint));
-            table.Columns.Add("5 - Fluctuating", typeof(uint));
+            table.Columns.Add("4 - Fast", typeof(uint));
+            table.Columns.Add("5 - Slow", typeof(uint));
             table.Rows.Add(0, 0, 0, 0, 0, 0, 0);
             table.Rows.Add(1, 0, 0, 0, 0, 0, 0);
-            table.Rows.Add(2, 15, 6, 8, 9, 10, 4);
-            table.Rows.Add(3, 52, 21, 27, 57, 33, 13);
-            table.Rows.Add(4, 122, 51, 64, 96, 80, 32);
-            table.Rows.Add(5, 237, 100, 125, 135, 156, 65);
-            table.Rows.Add(6, 406, 172, 216, 179, 270, 112);
-            table.Rows.Add(7, 637, 274, 343, 236, 428, 178);
-            table.Rows.Add(8, 942, 409, 512, 314, 640, 276);
-            table.Rows.Add(9, 1326, 583, 729, 419, 911, 393);
-            table.Rows.Add(10, 1800, 800, 1000, 560, 1250, 540);
-            table.Rows.Add(11, 2369, 1064, 1331, 742, 1663, 745);
-            table.Rows.Add(12, 3041, 1382, 1728, 973, 2160, 967);
-            table.Rows.Add(13, 3822, 1757, 2197, 1261, 2746, 1230);
-            table.Rows.Add(14, 4719, 2195, 2744, 1612, 3430, 1591);
-            table.Rows.Add(15, 5737, 2700, 3375, 2035, 4218, 1957);
-            table.Rows.Add(16, 6881, 3276, 4096, 2535, 5120, 2457);
-            table.Rows.Add(17, 8155, 3930, 4913, 3120, 6141, 3046);
-            table.Rows.Add(18, 9564, 4665, 5832, 3798, 7290, 3732);
-            table.Rows.Add(19, 11111, 5487, 6859, 4575, 8573, 4526);
-            table.Rows.Add(20, 12800, 6400, 8000, 5460, 10000, 5440);
-            table.Rows.Add(21, 14632, 7408, 9261, 6458, 11576, 6482);
-            table.Rows.Add(22, 16610, 8518, 10648, 7577, 13310, 7666);
-            table.Rows.Add(23, 18737, 9733, 12167, 8825, 15208, 9003);
-            table.Rows.Add(24, 21012, 11059, 13824, 10208, 17280, 10506);
-            table.Rows.Add(25, 23437, 12500, 15625, 11735, 19531, 12187);
-            table.Rows.Add(26, 26012, 14060, 17576, 13411, 21970, 14060);
-            table.Rows.Add(27, 28737, 15746, 19683, 15244, 24603, 16140);
-            table.Rows.Add(28, 31610, 17561, 21952, 17242, 27440, 18439);
-            table.Rows.Add(29, 34632, 19511, 24389, 19411, 30486, 20974);
-            table.Rows.Add(30, 37800, 21600, 27000, 21760, 33750, 23760);
-            table.Rows.Add(31, 41111, 23832, 29791, 24294, 37238, 26811);
-            table.Rows.Add(32, 44564, 26214, 32768, 27021, 40960, 30146);
-            table.Rows.Add(33, 48155, 28749, 35937, 29949, 44921, 33780);
-            table.Rows.Add(34, 51881, 31443, 39304, 33084, 49130, 37731);
-            table.Rows.Add(35, 55737, 34300, 42875, 36435, 53593, 42017);
-            table.Rows.Add(36, 59719, 37324, 46656, 40007, 58320, 46656);
-            table.Rows.Add(37, 63822, 40522, 50653, 43808, 63316, 50653);
-            table.Rows.Add(38, 68041, 43897, 54872, 47846, 68590, 55969);
-            table.Rows.Add(39, 72369, 47455, 59319, 52127, 74148, 60505);
-            table.Rows.Add(40, 76800, 51200, 64000, 56660, 80000, 66560);
-            table.Rows.Add(41, 81326, 55136, 68921, 61450, 86151, 71677);
-            table.Rows.Add(42, 85942, 59270, 74088, 66505, 92610, 78533);
-            table.Rows.Add(43, 90637, 63605, 79507, 71833, 99383, 84277);
-            table.Rows.Add(44, 95406, 68147, 85184, 77440, 106480, 91998);
-            table.Rows.Add(45, 100237, 72900, 91125, 83335, 113906, 98415);
-            table.Rows.Add(46, 105122, 77868, 97336, 89523, 121670, 107069);
-            table.Rows.Add(47, 110052, 83058, 103823, 96012, 129778, 114205);
-            table.Rows.Add(48, 115015, 88473, 110592, 102810, 138240, 123863);
-            table.Rows.Add(49, 120001, 94119, 117649, 109923, 147061, 131766);
-            table.Rows.Add(50, 125000, 100000, 125000, 117360, 156250, 142500);
-            table.Rows.Add(51, 131324, 106120, 132651, 125126, 165813, 151222);
-            table.Rows.Add(52, 137795, 112486, 140608, 133229, 175760, 163105);
-            table.Rows.Add(53, 144410, 119101, 148877, 141677, 186096, 172697);
-            table.Rows.Add(54, 151165, 125971, 157464, 150476, 196830, 185807);
-            table.Rows.Add(55, 158056, 133100, 166375, 159635, 207968, 196322);
-            table.Rows.Add(56, 165079, 140492, 175616, 169159, 219520, 210739);
-            table.Rows.Add(57, 172229, 148154, 185193, 179056, 231491, 222231);
-            table.Rows.Add(58, 179503, 156089, 195112, 189334, 243890, 238036);
-            table.Rows.Add(59, 186894, 164303, 205379, 199999, 256723, 250562);
-            table.Rows.Add(60, 194400, 172800, 216000, 211060, 270000, 267840);
-            table.Rows.Add(61, 202013, 181584, 226981, 222522, 283726, 281456);
-            table.Rows.Add(62, 209728, 190662, 238328, 234393, 297910, 300293);
-            table.Rows.Add(63, 217540, 200037, 250047, 246681, 312558, 315059);
-            table.Rows.Add(64, 225443, 209715, 262144, 259392, 327680, 335544);
-            table.Rows.Add(65, 233431, 219700, 274625, 272535, 343281, 351520);
-            table.Rows.Add(66, 241496, 229996, 287496, 286115, 359370, 373744);
-            table.Rows.Add(67, 249633, 240610, 300763, 300140, 375953, 390991);
-            table.Rows.Add(68, 257834, 251545, 314432, 314618, 393040, 415050);
-            table.Rows.Add(69, 267406, 262807, 328509, 329555, 410636, 433631);
-            table.Rows.Add(70, 276458, 274400, 343000, 344960, 428750, 459620);
-            table.Rows.Add(71, 286328, 286328, 357911, 360838, 447388, 479600);
-            table.Rows.Add(72, 296358, 298598, 373248, 377197, 466560, 507617);
-            table.Rows.Add(73, 305767, 311213, 389017, 394045, 486271, 529063);
-            table.Rows.Add(74, 316074, 324179, 405224, 411388, 506530, 559209);
-            table.Rows.Add(75, 326531, 337500, 421875, 429235, 527343, 582187);
-            table.Rows.Add(76, 336255, 351180, 438976, 447591, 548720, 614566);
-            table.Rows.Add(77, 346965, 365226, 456533, 466464, 570666, 639146);
-            table.Rows.Add(78, 357812, 379641, 474552, 485862, 593190, 673863);
-            table.Rows.Add(79, 367807, 394431, 493039, 505791, 616298, 700115);
-            table.Rows.Add(80, 378880, 409600, 512000, 526260, 640000, 737280);
-            table.Rows.Add(81, 390077, 425152, 531441, 547274, 664301, 765275);
-            table.Rows.Add(82, 400293, 441094, 551368, 568841, 689210, 804997);
-            table.Rows.Add(83, 411686, 457429, 571787, 590969, 714733, 834809);
-            table.Rows.Add(84, 423190, 474163, 592704, 613664, 740880, 877201);
-            table.Rows.Add(85, 433572, 491300, 614125, 636935, 767656, 908905);
-            table.Rows.Add(86, 445239, 508844, 636056, 660787, 795070, 954084);
-            table.Rows.Add(87, 457001, 526802, 658503, 685228, 823128, 987754);
-            table.Rows.Add(88, 467489, 545177, 681472, 710266, 851840, 1035837);
-            table.Rows.Add(89, 479378, 563975, 704969, 735907, 881211, 1071552);
-            table.Rows.Add(90, 491346, 583200, 729000, 762160, 911250, 1122660);
-            table.Rows.Add(91, 501878, 602856, 753571, 789030, 941963, 1160499);
-            table.Rows.Add(92, 513934, 622950, 778688, 816525, 973360, 1214753);
-            table.Rows.Add(93, 526049, 643485, 804357, 844653, 1005446, 1254796);
-            table.Rows.Add(94, 536557, 664467, 830584, 873420, 1038230, 1312322);
-            table.Rows.Add(95, 548720, 685900, 857375, 902835, 1071718, 1354652);
-            table.Rows.Add(96, 560922, 707788, 884736, 932903, 1105920, 1415577);
-            table.Rows.Add(97, 571333, 730138, 912673, 963632, 1140841, 1460276);
-            table.Rows.Add(98, 583539, 752953, 941192, 995030, 1176490, 1524731);
-            table.Rows.Add(99, 591882, 776239, 970299, 1027103, 1212873, 1571884);
-            table.Rows.Add(100, 600000, 800000, 1000000, 1059860, 1250000, 1640000);
+            table.Rows.Add(2, 8, 15, 4, 9, 6, 10);
+            table.Rows.Add(3, 27, 52, 13, 57, 21, 33);
+            table.Rows.Add(4, 64, 122, 32, 96, 51, 80);
+            table.Rows.Add(5, 125, 237, 65, 135, 100, 156);
+            table.Rows.Add(6, 216, 406, 112, 179, 172, 270);
+            table.Rows.Add(7, 343, 637, 178, 236, 274, 428);
+            table.Rows.Add(8, 512, 942, 276, 314, 409, 640);
+            table.Rows.Add(9, 729, 1326, 393, 419, 583, 911);
+            table.Rows.Add(10, 1000, 1800, 540, 560, 800, 1250);
+            table.Rows.Add(11, 1331, 2369, 745, 742, 1064, 1663);
+            table.Rows.Add(12, 1728, 3041, 967, 973, 1382, 2160);
+            table.Rows.Add(13, 2197, 3822, 1230, 1261, 1757, 2746);
+            table.Rows.Add(14, 2744, 4719, 1591, 1612, 2195, 3430);
+            table.Rows.Add(15, 3375, 5737, 1957, 2035, 2700, 4218);
+            table.Rows.Add(16, 4096, 6881, 2457, 2535, 3276, 5120);
+            table.Rows.Add(17, 4913, 8155, 3046, 3120, 3930, 6141);
+            table.Rows.Add(18, 5832, 9564, 3732, 3798, 4665, 7290);
+            table.Rows.Add(19, 6859, 11111, 4526, 4575, 5487, 8573);
+            table.Rows.Add(20, 8000, 12800, 5440, 5460, 6400, 10000);
+            table.Rows.Add(21, 9261, 14632, 6482, 6458, 7408, 11576);
+            table.Rows.Add(22, 10648, 16610, 7666, 7577, 8518, 13310);
+            table.Rows.Add(23, 12167, 18737, 9003, 8825, 9733, 15208);
+            table.Rows.Add(24, 13824, 21012, 10506, 10208, 11059, 17280);
+            table.Rows.Add(25, 15625, 23437, 12187, 11735, 12500, 19531);
+            table.Rows.Add(26, 17576, 26012, 14060, 13411, 14060, 21970);
+            table.Rows.Add(27, 19683, 28737, 16140, 15244, 15746, 24603);
+            table.Rows.Add(28, 21952, 31610, 18439, 17242, 17561, 27440);
+            table.Rows.Add(29, 24389, 34632, 20974, 19411, 19511, 30486);
+            table.Rows.Add(30, 27000, 37800, 23760, 21760, 21600, 33750);
+            table.Rows.Add(31, 29791, 41111, 26811, 24294, 23832, 37238);
+            table.Rows.Add(32, 32768, 44564, 30146, 27021, 26214, 40960);
+            table.Rows.Add(33, 35937, 48155, 33780, 29949, 28749, 44921);
+            table.Rows.Add(34, 39304, 51881, 37731, 33084, 31443, 49130);
+            table.Rows.Add(35, 42875, 55737, 42017, 36435, 34300, 53593);
+            table.Rows.Add(36, 46656, 59719, 46656, 40007, 37324, 58320);
+            table.Rows.Add(37, 50653, 63822, 50653, 43808, 40522, 63316);
+            table.Rows.Add(38, 54872, 68041, 55969, 47846, 43897, 68590);
+            table.Rows.Add(39, 59319, 72369, 60505, 52127, 47455, 74148);
+            table.Rows.Add(40, 64000, 76800, 66560, 56660, 51200, 80000);
+            table.Rows.Add(41, 68921, 81326, 71677, 61450, 55136, 86151);
+            table.Rows.Add(42, 74088, 85942, 78533, 66505, 59270, 92610);
+            table.Rows.Add(43, 79507, 90637, 84277, 71833, 63605, 99383);
+            table.Rows.Add(44, 85184, 95406, 91998, 77440, 68147, 106480);
+            table.Rows.Add(45, 91125, 100237, 98415, 83335, 72900, 113906);
+            table.Rows.Add(46, 97336, 105122, 107069, 89523, 77868, 121670);
+            table.Rows.Add(47, 103823, 110052, 114205, 96012, 83058, 129778);
+            table.Rows.Add(48, 110592, 115015, 123863, 102810, 88473, 138240);
+            table.Rows.Add(49, 117649, 120001, 131766, 109923, 94119, 147061);
+            table.Rows.Add(50, 125000, 125000, 142500, 117360, 100000, 156250);
+            table.Rows.Add(51, 132651, 131324, 151222, 125126, 106120, 165813);
+            table.Rows.Add(52, 140608, 137795, 163105, 133229, 112486, 175760);
+            table.Rows.Add(53, 148877, 144410, 172697, 141677, 119101, 186096);
+            table.Rows.Add(54, 157464, 151165, 185807, 150476, 125971, 196830);
+            table.Rows.Add(55, 166375, 158056, 196322, 159635, 133100, 207968);
+            table.Rows.Add(56, 175616, 165079, 210739, 169159, 140492, 219520);
+            table.Rows.Add(57, 185193, 172229, 222231, 179056, 148154, 231491);
+            table.Rows.Add(58, 195112, 179503, 238036, 189334, 156089, 243890);
+            table.Rows.Add(59, 205379, 186894, 250562, 199999, 164303, 256723);
+            table.Rows.Add(60, 216000, 194400, 267840, 211060, 172800, 270000);
+            table.Rows.Add(61, 226981, 202013, 281456, 222522, 181584, 283726);
+            table.Rows.Add(62, 238328, 209728, 300293, 234393, 190662, 297910);
+            table.Rows.Add(63, 250047, 217540, 315059, 246681, 200037, 312558);
+            table.Rows.Add(64, 262144, 225443, 335544, 259392, 209715, 327680);
+            table.Rows.Add(65, 274625, 233431, 351520, 272535, 219700, 343281);
+            table.Rows.Add(66, 287496, 241496, 373744, 286115, 229996, 359370);
+            table.Rows.Add(67, 300763, 249633, 390991, 300140, 240610, 375953);
+            table.Rows.Add(68, 314432, 257834, 415050, 314618, 251545, 393040);
+            table.Rows.Add(69, 328509, 267406, 433631, 329555, 262807, 410636);
+            table.Rows.Add(70, 343000, 276458, 459620, 344960, 274400, 428750);
+            table.Rows.Add(71, 357911, 286328, 479600, 360838, 286328, 447388);
+            table.Rows.Add(72, 373248, 296358, 507617, 377197, 298598, 466560);
+            table.Rows.Add(73, 389017, 305767, 529063, 394045, 311213, 486271);
+            table.Rows.Add(74, 405224, 316074, 559209, 411388, 324179, 506530);
+            table.Rows.Add(75, 421875, 326531, 582187, 429235, 337500, 527343);
+            table.Rows.Add(76, 438976, 336255, 614566, 447591, 351180, 548720);
+            table.Rows.Add(77, 456533, 346965, 639146, 466464, 365226, 570666);
+            table.Rows.Add(78, 474552, 357812, 673863, 485862, 379641, 593190);
+            table.Rows.Add(79, 493039, 367807, 700115, 505791, 394431, 616298);
+            table.Rows.Add(80, 512000, 378880, 737280, 526260, 409600, 640000);
+            table.Rows.Add(81, 531441, 390077, 765275, 547274, 425152, 664301);
+            table.Rows.Add(82, 551368, 400293, 804997, 568841, 441094, 689210);
+            table.Rows.Add(83, 571787, 411686, 834809, 590969, 457429, 714733);
+            table.Rows.Add(84, 592704, 423190, 877201, 613664, 474163, 740880);
+            table.Rows.Add(85, 614125, 433572, 908905, 636935, 491300, 767656);
+            table.Rows.Add(86, 636056, 445239, 954084, 660787, 508844, 795070);
+            table.Rows.Add(87, 658503, 457001, 987754, 685228, 526802, 823128);
+            table.Rows.Add(88, 681472, 467489, 1035837, 710266, 545177, 851840);
+            table.Rows.Add(89, 704969, 479378, 1071552, 735907, 563975, 881211);
+            table.Rows.Add(90, 729000, 491346, 1122660, 762160, 583200, 911250);
+            table.Rows.Add(91, 753571, 501878, 1160499, 789030, 602856, 941963);
+            table.Rows.Add(92, 778688, 513934, 1214753, 816525, 622950, 973360);
+            table.Rows.Add(93, 804357, 526049, 1254796, 844653, 643485, 1005446);
+            table.Rows.Add(94, 830584, 536557, 1312322, 873420, 664467, 1038230);
+            table.Rows.Add(95, 857375, 548720, 1354652, 902835, 685900, 1071718);
+            table.Rows.Add(96, 884736, 560922, 1415577, 932903, 707788, 1105920);
+            table.Rows.Add(97, 912673, 571333, 1460276, 963632, 730138, 1140841);
+            table.Rows.Add(98, 941192, 583539, 1524731, 995030, 752953, 1176490);
+            table.Rows.Add(99, 970299, 591882, 1571884, 1027103, 776239, 1212873);
+            table.Rows.Add(100, 1000000, 600000, 1640000, 1059860, 800000, 1250000);
             return table;
         }
         
@@ -215,10 +214,11 @@ public static int getLevel(int species, ref uint exp)
             DataTable table = PKX.ExpTable();
 
             int growth = MonData.EXPGrowth;
+            uint levelxp = (uint)table.Rows[tl][growth + 1];
 
-            if ((uint)table.Rows[tl][growth + 1] < exp)
+            if (levelxp < exp)
             {
-                while ((uint)table.Rows[tl][growth + 1] < exp)
+                while (levelxp < exp)
                 {
                     // While EXP for guessed level is below our current exp
                     tl += 1;
@@ -229,7 +229,7 @@ public static int getLevel(int species, ref uint exp)
                     }
                     // when calcexp exceeds our exp, we exit loop
                 }
-                if ((uint)table.Rows[tl][growth + 1] == exp) // Matches level threshold
+                if (levelxp == exp) // Matches level threshold
                     return tl;
                 else return (tl - 1);
             }
diff --git a/PKX/f1-Main.Designer.cs b/PKX/f1-Main.Designer.cs
index 0d5bae788..19cb20afc 100644
--- a/PKX/f1-Main.Designer.cs
+++ b/PKX/f1-Main.Designer.cs
@@ -1030,7 +1030,7 @@ public void InitializeComponent()
             // CHK_Fateful
             // 
             this.CHK_Fateful.AutoSize = true;
-            this.CHK_Fateful.Location = new System.Drawing.Point(105, 135);
+            this.CHK_Fateful.Location = new System.Drawing.Point(105, 115);
             this.CHK_Fateful.Name = "CHK_Fateful";
             this.CHK_Fateful.Size = new System.Drawing.Size(110, 17);
             this.CHK_Fateful.TabIndex = 7;
@@ -1098,7 +1098,7 @@ public void InitializeComponent()
             // Label_EncounterType
             // 
             this.Label_EncounterType.Enabled = false;
-            this.Label_EncounterType.Location = new System.Drawing.Point(25, 114);
+            this.Label_EncounterType.Location = new System.Drawing.Point(25, 138);
             this.Label_EncounterType.Name = "Label_EncounterType";
             this.Label_EncounterType.Size = new System.Drawing.Size(77, 13);
             this.Label_EncounterType.TabIndex = 5;
@@ -1214,7 +1214,7 @@ public void InitializeComponent()
             this.CB_EncounterType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.CB_EncounterType.DropDownWidth = 140;
             this.CB_EncounterType.FormattingEnabled = true;
-            this.CB_EncounterType.Location = new System.Drawing.Point(105, 110);
+            this.CB_EncounterType.Location = new System.Drawing.Point(105, 135);
             this.CB_EncounterType.Name = "CB_EncounterType";
             this.CB_EncounterType.Size = new System.Drawing.Size(122, 21);
             this.CB_EncounterType.TabIndex = 6;
diff --git a/PKX/f1-Main.cs b/PKX/f1-Main.cs
index e7b81fc66..ffc2b8269 100644
--- a/PKX/f1-Main.cs
+++ b/PKX/f1-Main.cs
@@ -770,7 +770,7 @@ private void InitializeLanguage()
             CB_Species.DataSource = Util.getCBList(specieslist, null);
             DEV_Ability.DataSource = Util.getCBList(abilitylist, null);
             CB_Nature.DataSource = Util.getCBList(natures, null);
-            CB_EncounterType.DataSource = Util.getCBList(encountertypelist, Legal.Gen4EncounterTypes);
+            CB_EncounterType.DataSource = Util.getCBList(encountertypelist, new int[] { 0 }, Legal.Gen4EncounterTypes);
             CB_GameOrigin.DataSource = Util.getCBList(gamelist, Legal.Games_6oras, Legal.Games_6xy, Legal.Games_5, Legal.Games_4, Legal.Games_4e, Legal.Games_4r, Legal.Games_3, Legal.Games_3e, Legal.Games_3r, Legal.Games_3s);
                 
             // Set the Move ComboBoxes too..
@@ -785,6 +785,7 @@ private void InitializeLanguage()
         }
         private void populateFields(byte[] buff)
         {
+            init = false;
             CAL_EggDate.Value = new DateTime(2000, 01, 01);
             Tab_Main.Focus();
             // Encryption Constant
@@ -912,8 +913,7 @@ private void populateFields(byte[] buff)
             CB_HeldItem.SelectedValue = helditem;
             updateAbilityList(TB_AbilityNumber, species, CB_Ability, CB_Form);
             TB_AbilityNumber.Text = abilitynum.ToString();
-            if (abilitynum>>1 < 3) CB_Ability.SelectedIndex = abilitynum>>1; // error handling
-            else CB_Ability.SelectedIndex = 0;
+            CB_Ability.SelectedIndex = (abilitynum < 6) ? abilitynum >> 1 : 0; // error handling
             CB_Nature.SelectedValue = nature;
 
             TB_EXP.Text = exp.ToString();
@@ -1046,7 +1046,11 @@ private void populateFields(byte[] buff)
             if (init)
                 if (!PKX.verifychk(buff))
                     Util.Alert("PKX File has an invalid checksum.");
-            
+
+            CB_EncounterType.Visible = Label_EncounterType.Visible = !(gamevers > 12 || gamevers < 7);
+            if (gamevers > 12 || gamevers < 7)
+                CB_EncounterType.SelectedValue = 0;
+
             init = true;
 
             if (HaX) // DEV Illegality
@@ -1885,6 +1889,10 @@ private void updateLocations(int gameorigin)
                 origintrack = "Gen4";
                 #endregion
             }
+
+            CB_EncounterType.Visible = Label_EncounterType.Visible = !(gameorigin > 12 || gameorigin < 7);
+            if (gameorigin > 12 || gameorigin < 7)
+                CB_EncounterType.SelectedValue = 0;
         }
         private void updateExtraByteValue(object sender, EventArgs e)
         {
@@ -3590,6 +3598,7 @@ private void getSAVOffsets()
         }
         private void getQuickFiller(PictureBox pb)
         {
+            if (!init) return;
             byte[] dslotdata = preparepkx(buff, false); // don't perform control loss click
 
             int species = BitConverter.ToInt16(dslotdata, 0x08); // Get Species
diff --git a/Resources/img/item/item_258.png b/Resources/img/item/item_258.png
index 786a4fea955705a64929a472de6caff183b4c26e..9a042b6756ae52a5bd74a3a18926fc28133c31c7 100644
GIT binary patch
delta 616
zcmV-u0+;>F1NH=v8Gi-<002AIl}Z2r010qNS#tmY4#NNd4#NS*Z>VGd00JmUL_t(2
zk%f`FPm^I3#-DROD7E!NG!70VPF{Kmn4n!WQ4$jz6i1A$7(-)|#<mR3{sAV=LIMLZ
zY%*wN02kDvw1k^Y<WfaVm0RgW5wQLGeaC^Cn6%V)KELz)&VTa))gLi40YFo;W59o}
zOD?uvhy!R~=KqjH004*6-ZL@tLW+_sghzVCVL$N}z!9njGcy^6Vexc!Y&;owWSL)@
z!^%d=*!sE4V=rIFt7R)9A^>cSjYs+O_XIMV>vHU{m2Ibw7dA7Ry&_CRwalc8h$|HA
z9O=IAF|V%Xbbnp3LOrA+olcu_nVeDyH2v);7`T<q?##;aN<@n<gp0lX54JmQw9DCZ
zO+8kN*<PkvDybzH@a$xMO&iHnR9pNsEZ(~}vjCcjKmh9g2_q&VrIhFj20ZD^_OyIU
z#qtY@uypy{X#g%Fpftxsq=1NOh{;si*c=M(sU}lVZGS!yHoAQ79RMvQqw+hQj+1@u
z*RM#R`_6XiN38f|Wn5eQI4oYDI}1<~@m?2Ypu_3tk3^r!S}v+j&JG!4k-_3jd`P@L
z&z>q1h^V&GuW;+7^S4{h*b4dII;*Nm4OUX7Cg=3N-oZ8iF$fe9(JI1AON;N{j7Ln#
zugiv7Uty2BgDRdqkL?2Tftg4|^hzKA@aX8P%OU^6cfw}Q7Yq8<)-GV61^|gb_5%Tc
zm<fg<4Og$VO&qY8Pic7#(TOSl>e~8aBCrUI{op@=^zyoqQ<n(<0000<MNUMnLSTZ)
CmL94A

delta 445
zcmV;u0Yd)v1k3}F8Gix*006YK0v!MV010qNS#tmY3labT3lag+-G2N400DkUL_t(2
zk#&;KOF}^q$7gmoNP~Wv5tKqv6w%2;B#2}Zbm(j+p?{@ow<tOU5d=XLQAx+%6GEj9
zrj<$ItwSBM3{p>Tb~-#uk=OUI3&UrJ?{{XAnc*L4t+m!tN`FMOEBGI+wMIllWM)JF
zKmZVqC^HKoGU?3T-fpc{|7+?%+g&s1%=>p~&<~qi>&$GMai#$vf0y%(^aW-nCZ>DN
z6Gs3*M5+xXBBhjR7{mUKPPgl^_*5x>Dba7+Yo@d(pp-IAv;0|DS`J?%l1#m0qf^1T
zV8aYEGcyrsO@GX68ph%AMx6@VJ8PzyWM-{3{|XxyVmg(&&1HR~u7$<fgZ;$hcz7W)
zZ&{WQLWo8@BqAZi_4UomYu4lK8XENEbI(KGKr|X5A}M8SDq&BcSbXU2k)cqq^6@Tl
zAR3KWmeqy=fKW;TKs>&BpMASDu5R<CTGax8ziqdw={CDst(~5okVUcBirejW+;L-q
n_UYKqfwmtI5dgG)x;Fg)v!2{wc6u-{00000NkvXXu0mjf*W$)q

diff --git a/Resources/img/item/item_504.png b/Resources/img/item/item_504.png
index 437ad2c7a62b54ff95d623328e93bdad736581cc..fd378ef0ddd944a73273f49015e0daabbdae2a34 100644
GIT binary patch
literal 674
zcmV;T0$u%yP)<h;3K|Lk000e1NJLTq000gE000dL1^@s6ncQE000004XF*Lt006O%
z3;baP00009a7bBm000ic000ic0Tn1pfB*mh8gxZibW?9;ba!ELWdKlNX>N2bPDNB8
zb~7$DE-^4L^m3s900JIKL_t(2Q-zYtZxT@$#pf?@uZ#W<6roTEuR+E#jL5qK7O+EW
zO4>?VjFeg&Md?e?v^2I#QDZftf<R2FX=Ct#i8hTU8j~*AH{G!6`gn&$<3i$1&gQ${
zFX!gmLs1=$OeX6#Syd^{uSKt3!FJj^niJp{QFdUGZU#j?7Ps9P7MXoAWBv(~ixU>c
zoH*<4+sl-ENETTnihan|eYm~tMP$Zu(5qAE{&wghkl+Z@t*7~UeE;?YZySp!lzq5E
zp!hQesn;BG4L^iwON;Dk+A!O%{XCho;l`^lcB{*Hb2EVVm08rLow)nKhs>rE_m)p%
zEp5iqrU#)*<|cvV6zx>vYK4PXcBApTh{n!i)I>La?i8`Q#v&h3A<xM1fL9?`abfB?
z3q7Yeq)ZMaqIn}`$~NS-M)BoWkvQkD`{O0@{XNKglvvGJaO=exjNP|@n^Hn)l7Uhi
z<#9f#!&rfaShYhec`;WNuu>n!O4Ws>k^|%Gr(jR^fFA7z9X%<5hm`c*Kp@b(wtfK{
zAJbTP$G3x6*m5IQU|_qffH5iqchP`zaVI<;4+vvx2P7pm7zwrNUu)R-lt%0k1Ml_T
zHXtc_MZo!yAY3k&l&V0~b@VN2wOThc6ghZUn}vT)1M9d3{Dd9x!~|$Fy{FY`69hQk
zsRT@Da9}?+AA~Rx2G8?S^jWD*|E(NxX028$3<g6=>T4(94<2$HCTxV*&Hw-a07*qo
IM6N<$g03<q4FCWD

literal 532
zcmV+v0_**WP)<h;3K|Lk000e1NJLTq000jF000jN0ssI2w6p>p00009a7bBm000XT
z000XT0n*)m`~Uy}#z{m$R49>+k<Uw1Q546|x%bU`Wj@AH8_CiU0wcnO1ev2WyTk}0
zLH`9;?%bDuK;U8mp%52R;X*`Pn8maRF&A0z6pTa{jyewGI6Ch=r+M$*)8fi#uNHn+
zmvcYo=NE|xE-d!nC=m(a|63?X6Ok``MC4o}pg;mU&j}$AQR7-JlYjGWvRH5sQA$~1
zP-ROg8AAX}@9Zt4W*67rn>P=e{lwtFvnw?rDTy(5Mgze9?!kvobM{HrZLms4UN_8R
z@5tP4AL@Tz71oIe5t(YVvhr;>*<aMxIwR$Kc2i5ybiCiq7BX%5<@89o<Rc;xF)0NA
zeEyQsV|gPcu(d7ZPy@enV{Ef(sSpic{hFB@pLh)bLI}nf2Y~x`y9&RIjm+xDotfSC
zXineuyP`k(!m~fqTi;JYhNh;~)cEmue173!*e*qHF)KG;blHaQxJ$CSRD1hU)6*w?
z0Khpv+tP8|vE-}9HkR6&*|co49JzKm*4>eK^td-t8~N*kYGucEN0TqC^m2{7{-86_
z)7w*5Usw4(HAP7XK}3baqqmb&+5M~vdY&hxtT1@qTlH3D)CEpU2D}XT&p8ipN`C-6
Wc>^I!`pClo0000<MNUMnLSTaa5$`bo

diff --git a/Resources/img/item/item_565.png b/Resources/img/item/item_565.png
new file mode 100644
index 0000000000000000000000000000000000000000..18b03829bf07cd7cba3f6478d359a6ee5c1d22aa
GIT binary patch
literal 309
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b
z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L0m@TF)WP}N3H
z7sn6_|EZG?@-`drxEi}%KhYzz+o@m1vW&McR?$7Ipi(n_Q-%}IBk#aT-*b~E2Yonc
zIXhgy+w;P%nQ!w&v%j^g#RyfHNz7u{Z};>(L%^%Fhl%qWdGaOqJU@9s^4+urFBlra
z>XKyr=68$6$@?;&nf-P1&pFdqamjzWsGrF9a<h5B-#NU>*#Rj{f=@Ykw)#$H>u6Ln
zG%4+Rv6#<M@5SSltz9+J(;{EEPpsZ?%+D&mOS5%pk;U#NpyL@lUHx3vIVCg!01V)7
Ar2qf`

literal 0
HcmV?d00001

diff --git a/Resources/img/item/item_566.png b/Resources/img/item/item_566.png
new file mode 100644
index 0000000000000000000000000000000000000000..3cebf2cb04eee4f8827c805f102d6f81a20743bd
GIT binary patch
literal 311
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b
z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L0m@TF)WP}OEn
z7sn6_|EZG=`I-%QT#J|X$XbdgyN9{C9gA6-y#BzAiC5ote^KogN)m|gnzSchdiIni
z|8qC@G(~td#mR5JAANMz-*ueRS>$+ksU0|7{o9yf%B;wW8|ey%quEkt@yb3-<Lu&N
z$auWDtJI=akLgYS!z&D*FaNqZ=UNb}&d(Rq4cfollwMJHZr4Op4Wok{MJ#Q%mU%KC
zahNPI%gXgj;BE!+FCVWsx$fgVt@CB^3EP-t<+=LJ9~%zdD%J-D2!p4qpUXO@geCx~
Crgb0y

literal 0
HcmV?d00001

diff --git a/Resources/img/item/item_567.png b/Resources/img/item/item_567.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2392d46e9e9448aa4ca22ac29b53afba551ded5
GIT binary patch
literal 314
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b
z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L0m@TF)WP}Me1
z7sn6_|EZG=`I-%QT#J{+v?>?$_Q~#aI^NT>*X?**<HU)kPa}U#a^*Da(0BE`x4qZb
z>!AAcn7vIAUQKq{Yky}aovpjx;?3007AySVdihUdhAFcmD{iDK9FAtItO+k^nXRf}
z#qeNpj@q?{U(VLDw>>Y)N_dtYn^3H^nKR<kMg2s+mz&K4{>~{?&JIXv5`4<Rv(<Mp
zTSudsp-E}ii^XM*dM_TYZ0)L%o)-DSePZ>FV{TUVk*#%y<@1<IfIeXGboFyt=akR{
E0AplxBme*a

literal 0
HcmV?d00001

diff --git a/Resources/img/item/item_568.png b/Resources/img/item/item_568.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c0fe40a45e4dbd1fc1009dcf6bc245a753881d2
GIT binary patch
literal 311
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b
z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L0m@TF)WP}OEn
z7sn6_|EZG=`I-%QT#J{+EDuk5dt;+=_=^)KPKX*Am6_H~+?R5(MdHZxMJn%aA5&ZU
zU~;k9dWC6|7L=O*-W$5+ru?h|&j&XXGMN6{IyIkh!IiUz4%;zH-ZQGG6LU`A5#6+i
znZYl9b&{;#{BDN+P3F7?`Pa@r`!a8JgR1;rp=T59s+q5zziF_E%~eezu<t;?ZIjFf
zi3}m<;N=~5uLPbn+0BbuabkPo%+@-Qo$c9gmJ~B=_v)M}abM#X(D@9Wu6{1-oD!M<
D4j*<S

literal 0
HcmV?d00001

diff --git a/Resources/img/item/item_569.png b/Resources/img/item/item_569.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd6db88b7b9b3eaddd2916dbea97e93b52d6ebe3
GIT binary patch
literal 309
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b
z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L0m@TF)WP}N3H
z7sn6_|EZHV^0pZ8xNZ&#OPZU#-pBK#R(Kk#R~U!Q>wPJA8O=Dn10UGlJ~(C4o~*Tp
z-G#JWFQiL9-k}?@S>CI{^TB$BDGb~9{o`a1ogP|oBV6I3vg7Pq8-9cdhb?%+(D1r?
zbAs%lIji{i7Wn@SY523H-Youe662Z=H}ezaKF!_h@Hg5!FpalMrQ=0(!mG`hmly;y
zgo1;Y_t<4~ym~UVw`gk}kN31+fhqpqD+15)ZB=gRofP<M1<>&fp00i_>zopr0LSoh
Apa1{>

literal 0
HcmV?d00001

diff --git a/Resources/img/item/item_570.png b/Resources/img/item/item_570.png
new file mode 100644
index 0000000000000000000000000000000000000000..0de089638bad7e6eef1ddca80c83199d95811c65
GIT binary patch
literal 312
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b
z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L0m@TF)WP}LSs
z7sn6_|EZHV3N{<?xbB_geu8U_%S_RjpiOM5sbL;3Md#Sa&lhGn-sD_vcl&)kXQ#j%
z|DKIE3X&8#qKY-|Z)eN?wp%Gis6y;T7sK-Fzug%EE}l7b$c&luo{+?)#RBO&BAf0o
zGAy^bmhjeZe)rYNonj7uHr1KUzZ}C{!T<Q5__GOi@+{kaS-!T)4p3<lc*;?-)ps&m
zM}yi$)6$|X>tZKx|EkDZI4A$GQ1M@lpz`ZCJf1Vhgj8>ATD$QU(ESXau6{1-oD!M<
D@p5s<

literal 0
HcmV?d00001

diff --git a/Resources/img/item/item_571.png b/Resources/img/item/item_571.png
index d32b2388060f248cc0148cb180fd0dfa1a518c76..4264d78fbb7ce254ec37d48663c65be61255f012 100644
GIT binary patch
delta 23
fcmbQi)Xg+OWul=3*C7T5zC(<n8eR<(gO36LPO1k3

delta 34
qcmeBXn!z+dg^RH`$lZxy-8q?;6BVVo4l^+D9cDb9zanL#+fe|#Xbb=V

diff --git a/Resources/img/item/item_699.png b/Resources/img/item/item_699.png
index 40c44ee873f50fcf1eb250ebc81de45c66241abd..495b6f980fad90d170471ecf622587f2846ac1f1 100644
GIT binary patch
literal 489
zcmV<F0T%v=P)<h;3K|Lk000e1NJLTq000mG000UI1^@s6y}sU@00004XF*Lt006O%
z3;baP00009a7bBm000ic000ic0Tn1pfB*mh8gxZibW?9;ba!ELWdKlNX>N2bPDNB8
zb~7$DE-^4L^m3s900Cu5L_t(2Q;m|pO9F8i#%~X)xxb)Q5<N)tyr8(U)6<Z25D7vq
zG?acU1t!)-6oe5`5Cma_gCNv&i)d(r4UGpb1q}@iaX|<TPv6%-2qf->cY8n2!}Go`
z$5|}9-9F4()xshak1Jsj<2VM5hP`|;7Zi-nt_qxF&`il@MBwB9iZF0!l6NfS72jif
zeE}$@fVXF$bqnkzP+yi!k#__JiZD1?P<+NyMgcB1fv-=XdJ0_TfRYB351}Xh$j*55
zz5qG0p55?!UyQZTclUZ9_;~LP_e74<z|{^Kt5K-a?wT~=l-RtDGTNjmr=%{rYmFoM
z7id&~hdbcr04T)J-Hw7pNt{f`tnZvvJ-S}@1D$!`Y#h*;Tcy|osVN4<p;!a+ih?6h
zugWI!V?byGcx7NIhW1Jjv_M+qAICu|kq{qmp8HJPOX#%1$fX5?PDdxSd~apWmC&|C
f(6i9fSOtFo?u5u78^O)*00000NkvXXu0mjf;ugps

literal 524
zcmV+n0`vWeP)<h;3K|Lk000e1NJLTq000jF000jN0ssI2w6p>p00009a7bBm000XT
z000XT0n*)m`~Uy}zDYzuR49>s($7oNaTo{i=lOg;7#kiHO<aiU2P2znWk~E`11}~W
zx&$qvLv`zK=oVDcrGqEK4h2P&O~fD~b>FC{h(!n^s<F+!NX@x)I_3L$-X6Z<j}?2L
zUk|)_o`(TY-FSeRiAdFV#&ww)fH(7hz2%hFbETzq*JUCAT+;-A7-MNoM7iSMcTesw
zydKN!4d1wV+t;ACb&azhkJ6jxC*%Dc&A#Nwy;mLaTSG&eokWaf?Q*fcQ-QW-4n~ok
z<>L3@M=$j0%WRBMiV2)^O7{2zN<EGB#RKiF+!>+F2mHwwip!sK^Q&_|V~HyaAeS$t
z-aq3^GS(Olg!XY~l)lU$Jyocx^jgE>uRL2ChkCltUS!)&Wxw8ucUM|w9TmDtjz)U2
zP(iw)%H=XaROm!-;9OTE>eot7Prdz-{g!BJ#Y>0IOfP&gc7c}GmPw!vMuUUryCO&Z
zT8S|t!T>H@x>lW^xO;v7aB|W4xIWO*v=R&-7))$AB2tz`L=2$1x-v5Q(C?GqMQPgO
z9yxyOa8Iw_;+@V5iwFRvb{$nj2-xX1wYP6$3^RF$Qq2FlZC&TFYO(=C2>%HV{i(bF
O0000<MNUMnLSTY@UhqHw

diff --git a/Resources/text/changelog.txt b/Resources/text/changelog.txt
index 834ec3f23..32c5c401b 100644
--- a/Resources/text/changelog.txt
+++ b/Resources/text/changelog.txt
@@ -380,7 +380,7 @@ http://projectpokemon.org/forums/showthread.php?36986
  - Added: More rebattle flags; Virizion may not be correct but it's our best guess.
  - - Rebattling Lati@s has yet to be ironed out, we haven't figured out how to go back to the island.
 
-12/8/14 - New Update:
+12/8/14 - New Update: (5200)
  - Added: Unicode Gender text toggle in Options.
  - Fixed: Shiny Star will now appear in boxes.
  - Fixed: Gendered formes will now appear properly in boxes.
@@ -396,7 +396,7 @@ http://projectpokemon.org/forums/showthread.php?36986
  - Fixed: Full Pokedex code causing CyberGadget to corrupt saves.
  - Fixed: Corruption Alert will now appear for ORAS saves, you can ignore it if you are using SaveDataFiler.
 
-12/14/14 - New Update:
+12/16/14 - New Update: (810)
  - Added: Fully translatable interface capability.
  --- Use lang_en.txt for the basis of your translation, as it has a consice list of every control that you can translate.
  --- Window titles are translatable too; change the existing title within the translation file.
@@ -408,4 +408,11 @@ http://projectpokemon.org/forums/showthread.php?36986
  - Internal: Tons of code reorganization, might be a little faster/lighter.
  - Improved: Box Report now is more verbose in terms of Locations and sprites. Can also sort (slow) by clicking the column header, and upon exit you can save a .csv table.
  - Improved: Message popups should be much more appealing.
- - Fixed various bugs for drag&drop.
\ No newline at end of file
+ - Fixed various bugs for drag&drop.
+
+12/17/14 - New Update:
+ - Fixed: DexNav levels saving to species-1.
+ - Fixed: EXP growth accessing the wrong exp table.
+ - Fixed: Dragout sprite update triggering errors.
+ - Changed: Gen4 Encounter Type will only appear for Pokemon that originate from Gen 4.
+ - Fixed: Some item sprites.
\ No newline at end of file
diff --git a/Resources/text/de/lang_de.txt b/Resources/text/de/lang_de.txt
index d5cb35384..73bb8ed10 100644
--- a/Resources/text/de/lang_de.txt
+++ b/Resources/text/de/lang_de.txt
@@ -128,7 +128,7 @@ L_DaycareSeed = Seed
 L_ReadOnlyOther = Dieser Tab ist nur lesbar.
 B_BoxIO = Box Öffnen / Speichern
 B_JPEG = Speichere PGL .JPEG
-B_OUTHallofFame = Ruhmeshalle
+B_OpenHallofFame = Ruhmeshalle
 B_OUTPasserby = Passanten
 L_IntegrityCheck = Integritäscheck:
 B_VerifyCHK = Checksums
diff --git a/Resources/text/es/lang_es.txt b/Resources/text/es/lang_es.txt
index 0205b48e7..2b613cc18 100644
--- a/Resources/text/es/lang_es.txt
+++ b/Resources/text/es/lang_es.txt
@@ -1,4 +1,4 @@
-! PKHeX Interface Customization File
+! PKHeX Interface Customization File
 ! Languages: Save this file accordingly and put it in the same folder as PKHeX's executable.
 ! lang_en.txt = English
 ! lang_jp.txt = Japanese
@@ -129,7 +129,7 @@ L_DaycareSeed = Seed
 L_ReadOnlyOther = Sólo leer.
 B_BoxIO = Abrir/Guardar Contenidos de la Caja
 B_JPEG = Guardar PGL .JPEG
-B_OUTHallofFame = Hall de la fama
+B_OpenHallofFame = Hall de la fama
 B_OUTPasserby = Transeúntes
 L_IntegrityCheck = Chequeo de integridad:
 B_VerifyCHK = Checksums
diff --git a/Resources/text/fr/lang_fr.txt b/Resources/text/fr/lang_fr.txt
index b3a7f832d..499a96092 100644
--- a/Resources/text/fr/lang_fr.txt
+++ b/Resources/text/fr/lang_fr.txt
@@ -112,7 +112,7 @@ B_OpenPokePuffs = Pofiteroles
 B_OpenItemPouch = Objets
 B_OpenTrainerInfo = Infos Dress.
 B_OpenBoxLayout = Fonds Boîte
-B_OpenWondercards = Cartes Micle
+B_OpenWondercards = CarteMiracle
 B_OpenBerryField = Baies
 B_OpenOPowers = O-Auras
 B_OpenEventFlags = Evènements
@@ -130,7 +130,7 @@ L_DaycareSeed = Seed
 L_ReadOnlyOther = Cet onglet est en lecture seule.
 B_BoxIO = Ouvr./Sauv. Boîte
 B_JPEG = Sauver image PGL
-B_OUTHallofFame = Panthéon
+B_OpenHallofFame = Panthéon
 B_OUTPasserby = PSS
 L_IntegrityCheck = Vérificateur avancé :
 B_VerifyCHK = Checksums
diff --git a/Resources/text/ja/lang_ja.txt b/Resources/text/ja/lang_ja.txt
index b91eeed50..889a30fd4 100644
--- a/Resources/text/ja/lang_ja.txt
+++ b/Resources/text/ja/lang_ja.txt
@@ -125,7 +125,7 @@ L_DaycareSeed = Seed
 L_ReadOnlyOther = このタブは読み取り専用です。
 B_BoxIO = 開く/保存パッケージ内容
 B_JPEG = 保存PGL。JPEG
-B_OUTHallofFame = 殿堂入り
+B_OpenHallofFame = 殿堂入り
 B_OUTPasserby = 通行人
 L_IntegrityCheck = 整合性チェック
 B_VerifyCHK = チェックサム
diff --git a/Resources/text/zh/lang_zh.txt b/Resources/text/zh/lang_zh.txt
index bfce9f43b..5e715c53f 100644
--- a/Resources/text/zh/lang_zh.txt
+++ b/Resources/text/zh/lang_zh.txt
@@ -126,7 +126,7 @@ L_DaycareSeed = 种子
 L_ReadOnlyOther = 在此选项卡是只读的。
 B_BoxIO = 读取/保存精灵箱子内容
 B_JPEG = 保存PGL。JPEG
-B_OUTHallofFame = 名人堂
+B_OpenHallofFame = 名人堂
 B_OUTPasserby = 路人
 L_IntegrityCheck = 检测完整性
 B_VerifyCHK = 校验
diff --git a/SAV/SAV_PokedexORAS.cs b/SAV/SAV_PokedexORAS.cs
index 999e48e18..654cd4e1e 100644
--- a/SAV/SAV_PokedexORAS.cs
+++ b/SAV/SAV_PokedexORAS.cs
@@ -497,7 +497,7 @@ private void B_FillDex_Click(object sender, EventArgs e)
         private void changeEncounteredCount(object sender, EventArgs e)
         {
             if (!editing)
-                Array.Copy(BitConverter.GetBytes(Math.Min(0xFFFF,Util.ToUInt32(MT_Count))), 0, sav, dexoffset + 0x686 + (LB_Species.SelectedIndex - 1) * 2, 2);
+                Array.Copy(BitConverter.GetBytes(Math.Min(0xFFFF, Util.ToUInt32(MT_Count))), 0, sav, dexoffset + 0x686 + (Util.getIndex(CB_Species) - 1) * 2, 2);
         }
     }
 }