Skip to content

Commit 90a4404

Browse files
fattardfattard
committed
Bumped PKHeX.Core version 24.7.3 and compatibility fixes
1 parent d292a1b commit 90a4404

17 files changed

+109
-71
lines changed

‎FlagsEditorEX.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ GameVersion.CXD or
9999
GameVersion.BATREV or
100100
GameVersion.ORASDEMO or
101101
GameVersion.GO or
102-
GameVersion.Unknown or
103102
GameVersion.Invalid
104103
=> false,
105104

‎FlagsEditorEX.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<EmbeddedResource Include="localization\lang_zh.txt" />
5555
</ItemGroup>
5656
<ItemGroup>
57-
<PackageReference Include="PKHeX.Core" Version="24.1.12" />
57+
<PackageReference Include="PKHeX.Core" Version="24.7.3" />
5858
</ItemGroup>
5959
<ItemGroup>
6060
<Using Include="PKHeX.Core" />

‎FlagsGen3E.cs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ protected override void InitFlagsData(SaveFile savFile, string? resData)
1818
int idxEventFlagsSection = s_flagsList_res.IndexOf("//\tEvent Flags");
1919
int idxEventWorkSection = s_flagsList_res.IndexOf("//\tEvent Work");
2020

21-
AssembleList(s_flagsList_res[idxEventFlagsSection..], 0, "Event Flags", ((IEventFlagArray)m_savFile!).GetEventFlags());
22-
AssembleWorkList(s_flagsList_res[idxEventWorkSection..], ((IEventWorkArray<ushort>)m_savFile!).GetAllEventWork());
21+
var evtWork = ((IEventFlag37)m_savFile)!;
22+
23+
AssembleList(s_flagsList_res[idxEventFlagsSection..], 0, "Event Flags", evtWork.GetEventFlags());
24+
AssembleWorkList(s_flagsList_res[idxEventWorkSection..], evtWork.GetAllEventWork());
2325
}
2426

2527
public override bool SupportsBulkEditingFlags(EventFlagType flagType) => flagType switch
@@ -47,7 +49,7 @@ void ChangeFlagsVal(EventFlagType flagType, bool value)
4749
{
4850
if (SupportsBulkEditingFlags(flagType))
4951
{
50-
var flagHelper = (IEventFlagArray)m_savFile!;
52+
var flagHelper = (IEventFlag37)m_savFile!;
5153

5254
foreach (var f in m_flagsGroupsList[0].Flags)
5355
{
@@ -62,7 +64,7 @@ void ChangeFlagsVal(EventFlagType flagType, bool value)
6264

6365
public override void SyncEditedFlags(FlagsGroup fGroup)
6466
{
65-
var flagHelper = (IEventFlagArray)m_savFile!;
67+
var flagHelper = (IEventFlag37)m_savFile!;
6668

6769
switch (fGroup.SourceIdx)
6870
{
@@ -77,7 +79,7 @@ public override void SyncEditedFlags(FlagsGroup fGroup)
7779

7880
public override void SyncEditedEventWork()
7981
{
80-
var eventWorkHelper = (IEventWorkArray<ushort>)m_savFile!;
82+
var eventWorkHelper = (IEventFlag37)m_savFile!;
8183

8284
foreach (var w in m_eventWorkList)
8385
{

‎FlagsGen3FRLG.cs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ protected override void InitFlagsData(SaveFile savFile, string? resData)
1818
int idxEventFlagsSection = s_flagsList_res.IndexOf("//\tEvent Flags");
1919
int idxEventWorkSection = s_flagsList_res.IndexOf("//\tEvent Work");
2020

21-
AssembleList(s_flagsList_res[idxEventFlagsSection..], 0, "Event Flags", ((IEventFlagArray)m_savFile!).GetEventFlags());
22-
AssembleWorkList(s_flagsList_res[idxEventWorkSection..], ((IEventWorkArray<ushort>)m_savFile!).GetAllEventWork());
21+
var evtWork = ((IEventFlag37)m_savFile)!;
22+
23+
AssembleList(s_flagsList_res[idxEventFlagsSection..], 0, "Event Flags", evtWork.GetEventFlags());
24+
AssembleWorkList(s_flagsList_res[idxEventWorkSection..], evtWork.GetAllEventWork());
2325
}
2426

2527
public override bool SupportsBulkEditingFlags(EventFlagType flagType) => flagType switch
@@ -47,7 +49,7 @@ void ChangeFlagsVal(EventFlagType flagType, bool value)
4749
{
4850
if (SupportsBulkEditingFlags(flagType))
4951
{
50-
var flagHelper = (IEventFlagArray)m_savFile!;
52+
var flagHelper = (IEventFlag37)m_savFile!;
5153

5254
foreach (var f in m_flagsGroupsList[0].Flags)
5355
{
@@ -62,7 +64,7 @@ void ChangeFlagsVal(EventFlagType flagType, bool value)
6264

6365
public override void SyncEditedFlags(FlagsGroup fGroup)
6466
{
65-
var flagHelper = (IEventFlagArray)m_savFile!;
67+
var flagHelper = (IEventFlag37)m_savFile!;
6668

6769
switch (fGroup.SourceIdx)
6870
{
@@ -77,7 +79,7 @@ public override void SyncEditedFlags(FlagsGroup fGroup)
7779

7880
public override void SyncEditedEventWork()
7981
{
80-
var eventWorkHelper = (IEventWorkArray<ushort>)m_savFile!;
82+
var eventWorkHelper = (IEventFlag37)m_savFile!;
8183

8284
foreach (var w in m_eventWorkList)
8385
{

‎FlagsGen3RS.cs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ protected override void InitFlagsData(SaveFile savFile, string? resData)
1818
int idxEventFlagsSection = s_flagsList_res.IndexOf("//\tEvent Flags");
1919
int idxEventWorkSection = s_flagsList_res.IndexOf("//\tEvent Work");
2020

21-
AssembleList(s_flagsList_res[idxEventFlagsSection..], 0, "Event Flags", ((IEventFlagArray)m_savFile!).GetEventFlags());
22-
AssembleWorkList(s_flagsList_res[idxEventWorkSection..], ((IEventWorkArray<ushort>)m_savFile!).GetAllEventWork());
21+
var evtWork = ((IEventFlag37)m_savFile)!;
22+
23+
AssembleList(s_flagsList_res[idxEventFlagsSection..], 0, "Event Flags", evtWork.GetEventFlags());
24+
AssembleWorkList(s_flagsList_res[idxEventWorkSection..], evtWork.GetAllEventWork());
2325
}
2426

2527
public override bool SupportsBulkEditingFlags(EventFlagType flagType) => flagType switch
@@ -47,7 +49,7 @@ void ChangeFlagsVal(EventFlagType flagType, bool value)
4749
{
4850
if (SupportsBulkEditingFlags(flagType))
4951
{
50-
var flagHelper = (IEventFlagArray)m_savFile!;
52+
var flagHelper = (IEventFlag37)m_savFile!;
5153

5254
foreach (var f in m_flagsGroupsList[0].Flags)
5355
{
@@ -62,7 +64,7 @@ void ChangeFlagsVal(EventFlagType flagType, bool value)
6264

6365
public override void SyncEditedFlags(FlagsGroup fGroup)
6466
{
65-
var flagHelper = (IEventFlagArray)m_savFile!;
67+
var flagHelper = (IEventFlag37)m_savFile!;
6668

6769
switch (fGroup.SourceIdx)
6870
{
@@ -77,7 +79,7 @@ public override void SyncEditedFlags(FlagsGroup fGroup)
7779

7880
public override void SyncEditedEventWork()
7981
{
80-
var eventWorkHelper = (IEventWorkArray<ushort>)m_savFile!;
82+
var eventWorkHelper = (IEventFlag37)m_savFile!;
8183

8284
foreach (var w in m_eventWorkList)
8385
{

‎FlagsGen4DP.cs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ protected override void InitFlagsData(SaveFile savFile, string? resData)
1818
int idxEventFlagsSection = s_flagsList_res.IndexOf("//\tEvent Flags");
1919
int idxEventWorkSection = s_flagsList_res.IndexOf("//\tEvent Work");
2020

21-
AssembleList(s_flagsList_res[idxEventFlagsSection..], 0, "Event Flags", ((IEventFlagArray)m_savFile!).GetEventFlags());
22-
AssembleWorkList(s_flagsList_res[idxEventWorkSection..], ((IEventWorkArray<ushort>)m_savFile!).GetAllEventWork());
21+
var evtWork = ((IEventFlag37)m_savFile)!;
22+
23+
AssembleList(s_flagsList_res[idxEventFlagsSection..], 0, "Event Flags", evtWork.GetEventFlags());
24+
AssembleWorkList(s_flagsList_res[idxEventWorkSection..], evtWork.GetAllEventWork());
2325
}
2426

2527
public override bool SupportsBulkEditingFlags(EventFlagType flagType) => flagType switch
@@ -47,7 +49,7 @@ void ChangeFlagsVal(EventFlagType flagType, bool value)
4749
{
4850
if (SupportsBulkEditingFlags(flagType))
4951
{
50-
var flagHelper = (IEventFlagArray)m_savFile!;
52+
var flagHelper = (IEventFlag37)m_savFile!;
5153

5254
foreach (var f in m_flagsGroupsList[0].Flags)
5355
{
@@ -62,7 +64,7 @@ void ChangeFlagsVal(EventFlagType flagType, bool value)
6264

6365
public override void SyncEditedFlags(FlagsGroup fGroup)
6466
{
65-
var flagHelper = (IEventFlagArray)m_savFile!;
67+
var flagHelper = (IEventFlag37)m_savFile!;
6668

6769
switch (fGroup.SourceIdx)
6870
{
@@ -77,7 +79,7 @@ public override void SyncEditedFlags(FlagsGroup fGroup)
7779

7880
public override void SyncEditedEventWork()
7981
{
80-
var eventWorkHelper = (IEventWorkArray<ushort>)m_savFile!;
82+
var eventWorkHelper = (IEventFlag37)m_savFile!;
8183

8284
foreach (var w in m_eventWorkList)
8385
{

‎FlagsGen4HGSS.cs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ protected override void InitFlagsData(SaveFile savFile, string? resData)
1818
int idxEventFlagsSection = s_flagsList_res.IndexOf("//\tEvent Flags");
1919
int idxEventWorkSection = s_flagsList_res.IndexOf("//\tEvent Work");
2020

21-
AssembleList(s_flagsList_res[idxEventFlagsSection..], 0, "Event Flags", ((IEventFlagArray)m_savFile!).GetEventFlags());
22-
AssembleWorkList(s_flagsList_res[idxEventWorkSection..], ((IEventWorkArray<ushort>)m_savFile!).GetAllEventWork());
21+
var evtWork = ((IEventFlag37)m_savFile)!;
22+
23+
AssembleList(s_flagsList_res[idxEventFlagsSection..], 0, "Event Flags", evtWork.GetEventFlags());
24+
AssembleWorkList(s_flagsList_res[idxEventWorkSection..], evtWork.GetAllEventWork());
2325
}
2426

2527
public override bool SupportsBulkEditingFlags(EventFlagType flagType) => flagType switch
@@ -47,7 +49,7 @@ void ChangeFlagsVal(EventFlagType flagType, bool value)
4749
{
4850
if (SupportsBulkEditingFlags(flagType))
4951
{
50-
var flagHelper = (IEventFlagArray)m_savFile!;
52+
var flagHelper = (IEventFlag37)m_savFile!;
5153

5254
foreach (var f in m_flagsGroupsList[0].Flags)
5355
{
@@ -62,7 +64,7 @@ void ChangeFlagsVal(EventFlagType flagType, bool value)
6264

6365
public override void SyncEditedFlags(FlagsGroup fGroup)
6466
{
65-
var flagHelper = (IEventFlagArray)m_savFile!;
67+
var flagHelper = (IEventFlag37)m_savFile!;
6668

6769
switch (fGroup.SourceIdx)
6870
{
@@ -77,7 +79,7 @@ public override void SyncEditedFlags(FlagsGroup fGroup)
7779

7880
public override void SyncEditedEventWork()
7981
{
80-
var eventWorkHelper = (IEventWorkArray<ushort>)m_savFile!;
82+
var eventWorkHelper = (IEventFlag37)m_savFile!;
8183

8284
foreach (var w in m_eventWorkList)
8385
{

‎FlagsGen4Pt.cs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ protected override void InitFlagsData(SaveFile savFile, string? resData)
1818
int idxEventFlagsSection = s_flagsList_res.IndexOf("//\tEvent Flags");
1919
int idxEventWorkSection = s_flagsList_res.IndexOf("//\tEvent Work");
2020

21-
AssembleList(s_flagsList_res[idxEventFlagsSection..], 0, "Event Flags", ((IEventFlagArray)m_savFile!).GetEventFlags());
22-
AssembleWorkList(s_flagsList_res[idxEventWorkSection..], ((IEventWorkArray<ushort>)m_savFile!).GetAllEventWork());
21+
var evtWork = ((IEventFlag37)m_savFile)!;
22+
23+
AssembleList(s_flagsList_res[idxEventFlagsSection..], 0, "Event Flags", evtWork.GetEventFlags());
24+
AssembleWorkList(s_flagsList_res[idxEventWorkSection..], evtWork.GetAllEventWork());
2325
}
2426

2527
public override bool SupportsBulkEditingFlags(EventFlagType flagType) => flagType switch
@@ -47,7 +49,7 @@ void ChangeFlagsVal(EventFlagType flagType, bool value)
4749
{
4850
if (SupportsBulkEditingFlags(flagType))
4951
{
50-
var flagHelper = (IEventFlagArray)m_savFile!;
52+
var flagHelper = (IEventFlag37)m_savFile!;
5153

5254
foreach (var f in m_flagsGroupsList[0].Flags)
5355
{
@@ -62,7 +64,7 @@ void ChangeFlagsVal(EventFlagType flagType, bool value)
6264

6365
public override void SyncEditedFlags(FlagsGroup fGroup)
6466
{
65-
var flagHelper = (IEventFlagArray)m_savFile!;
67+
var flagHelper = (IEventFlag37)m_savFile!;
6668

6769
switch (fGroup.SourceIdx)
6870
{
@@ -77,7 +79,7 @@ public override void SyncEditedFlags(FlagsGroup fGroup)
7779

7880
public override void SyncEditedEventWork()
7981
{
80-
var eventWorkHelper = (IEventWorkArray<ushort>)m_savFile!;
82+
var eventWorkHelper = (IEventFlag37)m_savFile!;
8183

8284
foreach (var w in m_eventWorkList)
8385
{

‎FlagsGen5B2W2.cs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ protected override void InitFlagsData(SaveFile savFile, string? resData)
1818
int idxEventFlagsSection = s_flagsList_res.IndexOf("//\tEvent Flags");
1919
int idxEventWorkSection = s_flagsList_res.IndexOf("//\tEvent Work");
2020

21-
AssembleList(s_flagsList_res[idxEventFlagsSection..], 0, "Event Flags", ((IEventFlagArray)m_savFile!).GetEventFlags());
22-
AssembleWorkList(s_flagsList_res[idxEventWorkSection..], ((IEventWorkArray<ushort>)m_savFile!).GetAllEventWork());
21+
var evtWork = ((IEventFlagProvider37)m_savFile)!.EventWork;
22+
23+
AssembleList(s_flagsList_res[idxEventFlagsSection..], 0, "Event Flags", evtWork.GetEventFlags());
24+
AssembleWorkList(s_flagsList_res[idxEventWorkSection..], evtWork.GetAllEventWork());
2325
}
2426

2527
public override bool SupportsBulkEditingFlags(EventFlagType flagType) => flagType switch
@@ -47,7 +49,7 @@ void ChangeFlagsVal(EventFlagType flagType, bool value)
4749
{
4850
if (SupportsBulkEditingFlags(flagType))
4951
{
50-
var flagHelper = (IEventFlagArray)m_savFile!;
52+
var flagHelper = ((IEventFlagProvider37)m_savFile!).EventWork;
5153

5254
foreach (var f in m_flagsGroupsList[0].Flags)
5355
{
@@ -62,7 +64,7 @@ void ChangeFlagsVal(EventFlagType flagType, bool value)
6264

6365
public override void SyncEditedFlags(FlagsGroup fGroup)
6466
{
65-
var flagHelper = (IEventFlagArray)m_savFile!;
67+
var flagHelper = ((IEventFlagProvider37)m_savFile!).EventWork;
6668

6769
switch (fGroup.SourceIdx)
6870
{
@@ -77,7 +79,7 @@ public override void SyncEditedFlags(FlagsGroup fGroup)
7779

7880
public override void SyncEditedEventWork()
7981
{
80-
var eventWorkHelper = (IEventWorkArray<ushort>)m_savFile!;
82+
var eventWorkHelper = ((IEventFlagProvider37)m_savFile!).EventWork;
8183

8284
foreach (var w in m_eventWorkList)
8385
{

‎FlagsGen5BW.cs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ protected override void InitFlagsData(SaveFile savFile, string? resData)
1818
int idxEventFlagsSection = s_flagsList_res.IndexOf("//\tEvent Flags");
1919
int idxEventWorkSection = s_flagsList_res.IndexOf("//\tEvent Work");
2020

21-
AssembleList(s_flagsList_res[idxEventFlagsSection..], 0, "Event Flags", ((IEventFlagArray)m_savFile!).GetEventFlags());
22-
AssembleWorkList(s_flagsList_res[idxEventWorkSection..], ((IEventWorkArray<ushort>)m_savFile!).GetAllEventWork());
21+
var evtWork = ((IEventFlagProvider37)m_savFile)!.EventWork;
22+
23+
AssembleList(s_flagsList_res[idxEventFlagsSection..], 0, "Event Flags", evtWork.GetEventFlags());
24+
AssembleWorkList(s_flagsList_res[idxEventWorkSection..], evtWork.GetAllEventWork());
2325
}
2426

2527
public override bool SupportsBulkEditingFlags(EventFlagType flagType) => flagType switch
@@ -47,7 +49,7 @@ void ChangeFlagsVal(EventFlagType flagType, bool value)
4749
{
4850
if (SupportsBulkEditingFlags(flagType))
4951
{
50-
var flagHelper = (IEventFlagArray)m_savFile!;
52+
var flagHelper = ((IEventFlagProvider37)m_savFile!).EventWork;
5153

5254
foreach (var f in m_flagsGroupsList[0].Flags)
5355
{
@@ -62,7 +64,7 @@ void ChangeFlagsVal(EventFlagType flagType, bool value)
6264

6365
public override void SyncEditedFlags(FlagsGroup fGroup)
6466
{
65-
var flagHelper = (IEventFlagArray)m_savFile!;
67+
var flagHelper = ((IEventFlagProvider37)m_savFile!).EventWork;
6668

6769
switch (fGroup.SourceIdx)
6870
{
@@ -77,7 +79,7 @@ public override void SyncEditedFlags(FlagsGroup fGroup)
7779

7880
public override void SyncEditedEventWork()
7981
{
80-
var eventWorkHelper = (IEventWorkArray<ushort>)m_savFile!;
82+
var eventWorkHelper = ((IEventFlagProvider37)m_savFile!).EventWork;
8183

8284
foreach (var w in m_eventWorkList)
8385
{

‎FlagsGen6ORAS.cs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ protected override void InitFlagsData(SaveFile savFile, string? resData)
1818
int idxEventFlagsSection = s_flagsList_res.IndexOf("//\tEvent Flags");
1919
int idxEventWorkSection = s_flagsList_res.IndexOf("//\tEvent Work");
2020

21-
AssembleList(s_flagsList_res[idxEventFlagsSection..], 0, "Event Flags", ((IEventFlagArray)m_savFile!).GetEventFlags());
22-
AssembleWorkList(s_flagsList_res[idxEventWorkSection..], ((IEventWorkArray<ushort>)m_savFile!).GetAllEventWork());
21+
var evtWork = ((IEventFlagProvider37)m_savFile)!.EventWork;
22+
23+
AssembleList(s_flagsList_res[idxEventFlagsSection..], 0, "Event Flags", evtWork.GetEventFlags());
24+
AssembleWorkList(s_flagsList_res[idxEventWorkSection..], evtWork.GetAllEventWork());
2325
}
2426

2527
public override bool SupportsBulkEditingFlags(EventFlagType flagType) => flagType switch
@@ -47,7 +49,7 @@ void ChangeFlagsVal(EventFlagType flagType, bool value)
4749
{
4850
if (SupportsBulkEditingFlags(flagType))
4951
{
50-
var flagHelper = (IEventFlagArray)m_savFile!;
52+
var flagHelper = ((IEventFlagProvider37)m_savFile!).EventWork;
5153

5254
foreach (var f in m_flagsGroupsList[0].Flags)
5355
{
@@ -62,7 +64,7 @@ void ChangeFlagsVal(EventFlagType flagType, bool value)
6264

6365
public override void SyncEditedFlags(FlagsGroup fGroup)
6466
{
65-
var flagHelper = (IEventFlagArray)m_savFile!;
67+
var flagHelper = ((IEventFlagProvider37)m_savFile!).EventWork;
6668

6769
switch (fGroup.SourceIdx)
6870
{
@@ -77,7 +79,7 @@ public override void SyncEditedFlags(FlagsGroup fGroup)
7779

7880
public override void SyncEditedEventWork()
7981
{
80-
var eventWorkHelper = (IEventWorkArray<ushort>)m_savFile!;
82+
var eventWorkHelper = ((IEventFlagProvider37)m_savFile!).EventWork;
8183

8284
foreach (var w in m_eventWorkList)
8385
{

0 commit comments

Comments
 (0)