Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-22 20:13:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/kwsch/PKHeX

Browse source
This commit is contained in:
Kurt 2023-09-28 16:40:17 -07:00
commit 963eaaaa40
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
PKHeX.Core/Saves/Access/SaveBlockAccessor9SV.cs
View file

@ -1258,8 +1258,8 @@ public sealed class SaveBlockAccessor9SV : SCBlockAccessor, ISaveBlock9Main
private const uint KOutbreak01DLC1Species = 0x37E55F64; // EncountOutbreakSave_f1_monsno[0]
private const uint KOutbreak01DLC1Form = 0x69A930AB; // EncountOutbreakSave_f1_formno[0]
private const uint KOutbreak01DLC1Found = 0x7B688081; // EncountOutbreakSave_f1_isFind[0]
private const uint KOutbreak01DLC1NumKOed = 0x3C7E8AA4; // EncountOutbreakSave_f1_subjugationCount[0]
private const uint KOutbreak01DLC1TotalSpawns = 0x79399BC0; // EncountOutbreakSave_f1_subjugationLimit[0]
private const uint KOutbreak01DLC1NumKOed = 0xB29D7978; // EncountOutbreakSave_f1_subjugationCount[0]
private const uint KOutbreak01DLC1TotalSpawns = 0x9E16873C; // EncountOutbreakSave_f1_subjugationLimit[0]
private const uint KOutbreak01DLC1Materials = 0x0DEEA32D; // EncountOutbreakSave_f1_dropMaterialCount[0]
private const uint KOutbreak01DLC1DeliveryID = 0x6CADFC47; // EncountOutbreakSave_f1_deliveryId[0]
private const uint KOutbreak01DLC1DeliveryZoneID = 0x9F8C7243; // EncountOutbreakSave_f1_deliveryZoneIdx[0]
@ -1270,8 +1270,8 @@ public sealed class SaveBlockAccessor9SV : SCBlockAccessor, ISaveBlock9Main
private const uint KOutbreak02DLC1Species = 0x37E33059; // EncountOutbreakSave_f1_monsno[1]
private const uint KOutbreak02DLC1Form = 0x69AD204E; // EncountOutbreakSave_f1_formno[1]
private const uint KOutbreak02DLC1Found = 0x7B6A42CC; // EncountOutbreakSave_f1_isFind[1]
private const uint KOutbreak02DLC1NumKOed = 0x3C7AA899; // EncountOutbreakSave_f1_subjugationCount[1]
private const uint KOutbreak02DLC1TotalSpawns = 0x79362675; // EncountOutbreakSave_f1_subjugationLimit[1]
private const uint KOutbreak02DLC1NumKOed = 0xB29ADDAD; // EncountOutbreakSave_f1_subjugationCount[1]
private const uint KOutbreak02DLC1TotalSpawns = 0x9E12A531; // EncountOutbreakSave_f1_subjugationLimit[1]
private const uint KOutbreak02DLC1Materials = 0x0DF13EF8; // EncountOutbreakSave_f1_dropMaterialCount[1]
private const uint KOutbreak02DLC1DeliveryID = 0x6CB0A5AA; // EncountOutbreakSave_f1_deliveryId[1]
private const uint KOutbreak02DLC1DeliveryZoneID = 0x9F8FF526; // EncountOutbreakSave_f1_deliveryZoneIdx[1]
@ -1282,8 +1282,8 @@ public sealed class SaveBlockAccessor9SV : SCBlockAccessor, ISaveBlock9Main
private const uint KOutbreak03DLC1Species = 0x37DFB442; // EncountOutbreakSave_f1_monsno[2]
private const uint KOutbreak03DLC1Form = 0x69AEE965; // EncountOutbreakSave_f1_formno[2]
private const uint KOutbreak03DLC1Found = 0x7B61EE47; // EncountOutbreakSave_f1_isFind[2]
private const uint KOutbreak03DLC1NumKOed = 0x3C78DF82; // EncountOutbreakSave_f1_subjugationCount[2]
private const uint KOutbreak03DLC1TotalSpawns = 0x7933F09E; // EncountOutbreakSave_f1_subjugationLimit[2]
private const uint KOutbreak03DLC1NumKOed = 0xB298A7D6; // EncountOutbreakSave_f1_subjugationCount[2]
private const uint KOutbreak03DLC1TotalSpawns = 0x9E10DC1A; // EncountOutbreakSave_f1_subjugationLimit[2]
private const uint KOutbreak03DLC1Materials = 0x0DE87DB3; // EncountOutbreakSave_f1_dropMaterialCount[2]
private const uint KOutbreak03DLC1DeliveryID = 0x6CB48E81; // EncountOutbreakSave_f1_deliveryId[2]
private const uint KOutbreak03DLC1DeliveryZoneID = 0x9F922AFD; // EncountOutbreakSave_f1_deliveryZoneIdx[2]
@ -1294,8 +1294,8 @@ public sealed class SaveBlockAccessor9SV : SCBlockAccessor, ISaveBlock9Main
private const uint KOutbreak04DLC1Species = 0x37DD779F; // EncountOutbreakSave_f1_monsno[3]
private const uint KOutbreak04DLC1Form = 0x69B2CB70; // EncountOutbreakSave_f1_formno[3]
private const uint KOutbreak04DLC1Found = 0x7B6497AA; // EncountOutbreakSave_f1_isFind[3]
private const uint KOutbreak04DLC1NumKOed = 0x3C74EFDF; // EncountOutbreakSave_f1_subjugationCount[3]
private const uint KOutbreak04DLC1TotalSpawns = 0x7931473B; // EncountOutbreakSave_f1_subjugationLimit[3]
private const uint KOutbreak04DLC1NumKOed = 0xB294B833; // EncountOutbreakSave_f1_subjugationCount[3]
private const uint KOutbreak04DLC1TotalSpawns = 0x9E0CEC77; // EncountOutbreakSave_f1_subjugationLimit[3]
private const uint KOutbreak04DLC1Materials = 0x0DEC6D56; // EncountOutbreakSave_f1_dropMaterialCount[3]
private const uint KOutbreak04DLC1DeliveryID = 0x6CB650CC; // EncountOutbreakSave_f1_deliveryId[3]
private const uint KOutbreak04DLC1DeliveryZoneID = 0x9F960D08; // EncountOutbreakSave_f1_deliveryZoneIdx[3]
@ -1310,8 +1310,8 @@ public sealed class SaveBlockAccessor9SV : SCBlockAccessor, ISaveBlock9Main
private const uint KOutbreak01DLC2Species = 0xB8E99C8D; // EncountOutbreakSave_f2_monsno[0]
private const uint KOutbreak01DLC2Form = 0xEFA6983A; // EncountOutbreakSave_f2_formno[0]
private const uint KOutbreak01DLC2Found = 0x32074910; // EncountOutbreakSave_f2_isFind[0]
private const uint KOutbreak01DLC2NumKOed = 0xF97C2871; // EncountOutbreakSave_f2_subjugationCount[0]
private const uint KOutbreak01DLC2TotalSpawns = 0xD39DAF41; // EncountOutbreakSave_f2_subjugationLimit[0]
private const uint KOutbreak01DLC2NumKOed = 0x4EF9BC25; // EncountOutbreakSave_f2_subjugationCount[0]
private const uint KOutbreak01DLC2TotalSpawns = 0x4385E0AD; // EncountOutbreakSave_f2_subjugationLimit[0]
private const uint KOutbreak01DLC2Materials = 0x01B2F482; // EncountOutbreakSave_f2_dropMaterialCount[0]
private const uint KOutbreak01DLC2DeliveryID = 0x8273D376; // EncountOutbreakSave_f2_deliveryId[0]
private const uint KOutbreak01DLC2DeliveryZoneID = 0x1BF676D4; // EncountOutbreakSave_f2_deliveryZoneIdx[0]

3
PKHeX.WinForms/MainWindow/Main.cs
View file

@ -42,11 +42,12 @@ public partial class Main : Form
startup.ReadArguments(args);
startup.ReadSettings(Settings.Startup);
startup.ReadTemplateIfNoEntity(TemplatePath);
FormLoadInitialFiles(startup);
if (Settings.Startup.PluginLoadMethod != PluginLoadSetting.DontLoad)
FormLoadPlugins();
FormLoadInitialFiles(startup);
if (HaX)
{
EntityConverter.AllowIncompatibleConversion = EntityCompatibilitySetting.AllowIncompatibleAll;