From 248031a45cc3236145bb979bd2fcac5b3a5b7ca6 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sun, 19 Mar 2017 11:07:57 -0700 Subject: [PATCH] Precompute gen3 personaltable shuffling Less convoluted & faster loading --- PKHeX/Legality/Core.cs | 2 -- PKHeX/PKM/PKX.cs | 4 ++-- PKHeX/PersonalInfo/PersonalTable.cs | 5 ++--- PKHeX/Resources/byte/personal_e | Bin 11536 -> 10836 bytes PKHeX/Resources/byte/personal_fr | Bin 11536 -> 10836 bytes PKHeX/Resources/byte/personal_lg | Bin 11536 -> 10836 bytes PKHeX/Resources/byte/personal_rs | Bin 11536 -> 10836 bytes 7 files changed, 4 insertions(+), 7 deletions(-) diff --git a/PKHeX/Legality/Core.cs b/PKHeX/Legality/Core.cs index 6731fa0cd..3b1257ebe 100644 --- a/PKHeX/Legality/Core.cs +++ b/PKHeX/Legality/Core.cs @@ -35,8 +35,6 @@ public static partial class Legal private static readonly Learnset[] LevelUpFR = Learnset6.getArray(Data.unpackMini(Resources.lvlmove_fr, "fr")); private static readonly Learnset[] LevelUpLG = Learnset6.getArray(Data.unpackMini(Resources.lvlmove_lg, "lg")); private static readonly EggMoves[] EggMovesRS = EggMoves6.getArray(Data.unpackMini(Resources.eggmove_rs, "rs")); - //private static readonly TMHMTutorMoves[] TutorsG3 = TMHMTutorMoves.getArray(Data.unpackMini(Properties.Resources.tutors_g3, "g3")); - //private static readonly TMHMTutorMoves[] HMTMG3 = TMHMTutorMoves.getArray(Data.unpackMini(Properties.Resources.hmtm_g3, "g3")); private static readonly EvolutionTree Evolves3; private static readonly EncounterArea[] SlotsR, SlotsS, SlotsE, SlotsFR, SlotsLG; private static readonly EncounterStatic[] StaticR, StaticS, StaticE, StaticFR, StaticLG; diff --git a/PKHeX/PKM/PKX.cs b/PKHeX/PKM/PKX.cs index 68dfc87ab..0ff96f574 100644 --- a/PKHeX/PKM/PKX.cs +++ b/PKHeX/PKM/PKX.cs @@ -1395,7 +1395,7 @@ public static int getGender(int species, uint PID) } } #region Gen 3 Species Table - public static int[] newindex => new[] + private static readonly int[] newindex = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30, 31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58, @@ -1417,7 +1417,7 @@ public static int getGender(int species, uint PID) 385,386,358, }; - public static int[] oldindex => new[] + private static readonly int[] oldindex = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30, 31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58, diff --git a/PKHeX/PersonalInfo/PersonalTable.cs b/PKHeX/PersonalInfo/PersonalTable.cs index dcf2c28b5..9aec81298 100644 --- a/PKHeX/PersonalInfo/PersonalTable.cs +++ b/PKHeX/PersonalInfo/PersonalTable.cs @@ -74,9 +74,8 @@ private PersonalTable(byte[] data, GameVersion format) case GameVersion.E: case GameVersion.FR: case GameVersion.LG: - Array.Resize(ref d, 387); - for (int i = 0; i < d.Length; i++) // entries are not in order of natdexID - d[i] = new PersonalInfoG3(entries[PKX.getG3Species(i)]); + for (int i = 0; i < d.Length; i++) + d[i] = new PersonalInfoG3(entries[i]); break; case GameVersion.DP: case GameVersion.Pt: diff --git a/PKHeX/Resources/byte/personal_e b/PKHeX/Resources/byte/personal_e index e62f207581484895ad4274b9dc27deed326c2529..b3c0bab023a9bd519cbf82def284582d9068ebb7 100644 GIT binary patch delta 322 zcmW;HF-yZx5C`zrCar}^rXn_d4Yp}tlb9@_kk>YXS&D)})YPE}isS=y=+HrMu%koq z58@(p&_U>+xH^kNw>mgD^aD8f0UUho!41b9zq=cCKcnYS;dM_NC$U}Pn2MZR5#%z* zpwz;wc7UIa2m>R+Lxp39(HotjFWOu$<~tqN^D-IdJVzFBnQP0bbbXD;csGyn%Q(I( z4cs#i+~TV1J3$<-O1F0;LC9<|E~QsAMy^mcnphXUFW_9YfudeO%o=zp6%bY;jH?_* zjbmg|bvO2d*q5a4qb!)^)?`ZAB4h}Kwb0Qyo^%f%g6dg4%tcKtibC{B?<%*$lJx)~^OAvkd{D-m%eBDhfyM*8WZ zl$cY7wyRR;ri&t!f{QM?bkRjivn}*TxD?_Wb>&uw_bu*)cev-A%jtO?|D=--tk4QW zizpuZk|J6CJ)%rT4hfq=DK;NEjw4gtrWnyn3NmhjDLJAS*yJ|Ox#(&Fze@s#dI8U?LgnTwZu*S%w??A) zQ;>5hm15I0jBSlWDNkUuDzIb2Jzc1lV=itir{m$fNdMnR zO*}cwb$W*N;wn0lIW3{-k_W}`)WxSxtL0>~{Ht=kd0dM#_K4^RA9Nc(CkyJ6UB{0u z;(xw@RuI*c^soZ@&)5AB_A}26xbCTKdL+U$UVF@E^s#Gp)+NJ KPtU`s6)piF)86U; diff --git a/PKHeX/Resources/byte/personal_fr b/PKHeX/Resources/byte/personal_fr index 113ab70094a7fb5c33813dcfcdf527e7f49ac1d3..0e90accb0a299c0ff2da108efc2ec86dd84bf65c 100644 GIT binary patch delta 322 zcmW;HF-yZx5C`zrCar}^rXn_d4Yp}tlb9@_kk>YXS&D)})YPE}isS=y=+HrMu%koq z58@(p&_U>+xH^kNw>mgD^aD8f0UUho!41b9zq=cCKcnYS;dM_NC$U}Pn2MZR5#%z* zpwz;wc7UIa2m>R+Lxp39(HotjFWOu$<~tqN^D-IdJVzFBnQP0bbbXD;csGyn%Q(I( z4cs#i+~TV1J3$<-O1F0;LC9<|E~QsAMy^mcnphXUFW_9YfudeO%o=zp6%bY;jH?_* zjbmg|bvO2d*q5a4qb!)^)?`ZAB4h}Kwb0Qyo^%f%g6dg4%tcKtibC{B?<%*$lJx)~^OAvkd{D-m%eBDhfyM*8WZ zl$cY7wyRR;ri&t!f{QM?bkRjivn}*TxD?_Wb>&uw_bu*)cev-A%jtO?|D=--tk4QW zizpuZk|J6CJ)%rT4hfq=DK;NEjw4gtrWnyn3NmhjDLJAS*yJ|Ox#(&Fze@s#dI8U?LgnTwZu*S%w??A) zQ;>5hm15I0jBSlWDNkUuDzIb2Jzc1lV=itir{m$fNdMnR zO*}cwb$W*N;wn0lIW3{-k_W}`)WxSxtL0>~{Ht=kd0dM#_K4^RA9Nc(CkyJ6UB{0u z;(xw@RuI*c^soZ@&)5AB_A}26xbCTKdL+U$UVF@E^s#Gp)+NJ KPtU`s6)piF)86U; diff --git a/PKHeX/Resources/byte/personal_lg b/PKHeX/Resources/byte/personal_lg index 113ab70094a7fb5c33813dcfcdf527e7f49ac1d3..0e90accb0a299c0ff2da108efc2ec86dd84bf65c 100644 GIT binary patch delta 322 zcmW;HF-yZx5C`zrCar}^rXn_d4Yp}tlb9@_kk>YXS&D)})YPE}isS=y=+HrMu%koq z58@(p&_U>+xH^kNw>mgD^aD8f0UUho!41b9zq=cCKcnYS;dM_NC$U}Pn2MZR5#%z* zpwz;wc7UIa2m>R+Lxp39(HotjFWOu$<~tqN^D-IdJVzFBnQP0bbbXD;csGyn%Q(I( z4cs#i+~TV1J3$<-O1F0;LC9<|E~QsAMy^mcnphXUFW_9YfudeO%o=zp6%bY;jH?_* zjbmg|bvO2d*q5a4qb!)^)?`ZAB4h}Kwb0Qyo^%f%g6dg4%tcKtibC{B?<%*$lJx)~^OAvkd{D-m%eBDhfyM*8WZ zl$cY7wyRR;ri&t!f{QM?bkRjivn}*TxD?_Wb>&uw_bu*)cev-A%jtO?|D=--tk4QW zizpuZk|J6CJ)%rT4hfq=DK;NEjw4gtrWnyn3NmhjDLJAS*yJ|Ox#(&Fze@s#dI8U?LgnTwZu*S%w??A) zQ;>5hm15I0jBSlWDNkUuDzIb2Jzc1lV=itir{m$fNdMnR zO*}cwb$W*N;wn0lIW3{-k_W}`)WxSxtL0>~{Ht=kd0dM#_K4^RA9Nc(CkyJ6UB{0u z;(xw@RuI*c^soZ@&)5AB_A}26xbCTKdL+U$UVF@E^s#Gp)+NJ KPtU`s6)piF)86U; diff --git a/PKHeX/Resources/byte/personal_rs b/PKHeX/Resources/byte/personal_rs index e62f207581484895ad4274b9dc27deed326c2529..b3c0bab023a9bd519cbf82def284582d9068ebb7 100644 GIT binary patch delta 322 zcmW;HF-yZx5C`zrCar}^rXn_d4Yp}tlb9@_kk>YXS&D)})YPE}isS=y=+HrMu%koq z58@(p&_U>+xH^kNw>mgD^aD8f0UUho!41b9zq=cCKcnYS;dM_NC$U}Pn2MZR5#%z* zpwz;wc7UIa2m>R+Lxp39(HotjFWOu$<~tqN^D-IdJVzFBnQP0bbbXD;csGyn%Q(I( z4cs#i+~TV1J3$<-O1F0;LC9<|E~QsAMy^mcnphXUFW_9YfudeO%o=zp6%bY;jH?_* zjbmg|bvO2d*q5a4qb!)^)?`ZAB4h}Kwb0Qyo^%f%g6dg4%tcKtibC{B?<%*$lJx)~^OAvkd{D-m%eBDhfyM*8WZ zl$cY7wyRR;ri&t!f{QM?bkRjivn}*TxD?_Wb>&uw_bu*)cev-A%jtO?|D=--tk4QW zizpuZk|J6CJ)%rT4hfq=DK;NEjw4gtrWnyn3NmhjDLJAS*yJ|Ox#(&Fze@s#dI8U?LgnTwZu*S%w??A) zQ;>5hm15I0jBSlWDNkUuDzIb2Jzc1lV=itir{m$fNdMnR zO*}cwb$W*N;wn0lIW3{-k_W}`)WxSxtL0>~{Ht=kd0dM#_K4^RA9Nc(CkyJ6UB{0u z;(xw@RuI*c^soZ@&)5AB_A}26xbCTKdL+U$UVF@E^s#Gp)+NJ KPtU`s6)piF)86U;