diff --git a/PKHeX.Core/Properties/Resources.Designer.cs b/PKHeX.Core/Properties/Resources.Designer.cs index 4aa86ccbd..73a7b522d 100644 --- a/PKHeX.Core/Properties/Resources.Designer.cs +++ b/PKHeX.Core/Properties/Resources.Designer.cs @@ -61,6 +61,23 @@ internal class Resources { } } + /// + /// Looks up a localized string similar to 0166 Dialga/Palkia 00:Event,01:Event,02:Event,03:Event,04:Disappeared,05:Battleable + ///0172 Heatran 00:Not appeared,01:Battleable,02:Disappeared + ///0068 Fullmoon Is. 0:Not appeared,520:On the Map + ///0069 Newmoon Is. 0:Not appeared,553:On the Map + ///0070 Spring Path 0:Not appeared,786:Appeared + ///0071 Seabreak Path 0:Not appeared,4136:Appeared + ///0081 Member Card 0:Not activated,4617:Activated + ///0082 Oak Letter 0:Not activated,4370:Activated + ///0083 Azure Flute 0:Not activated,4387:Activated. + /// + internal static string const_dp { + get { + return ResourceManager.GetString("const_dp", resourceCulture); + } + } + /// /// Looks up a localized string similar to 60 Ash ///21 Test1 @@ -103,6 +120,30 @@ internal class Resources { } } + /// + /// Looks up a localized string similar to 0479 Uxie disappeared + ///0477 Mesprit(Verity Cavern) disappeared + ///0478 Azelf disappeared + ///0589 Cresselia(FullmoonIs.) disappeared + ///0256 Heatran disappeared + ///0577 Regigigas disappeared + ///0590 Giratina disappeared + ///0574 Darkrai disappeared + ///0591 Shaymin(FlowerParadise) disappeared + ///0588 Arceus disappeared + ///0254 Arceus(MapObj) disappeared + ///0275 Ferry FullmoonIs. accessable + ///0284 Ferry NewmoonIs. accessable + ///0269 Oak(R224) disappeared + ///0602 Shaymin?(R224 MapObj) disappeared + ///. + /// + internal static string flags_dp { + get { + return ResourceManager.GetString("flags_dp", resourceCulture); + } + } + /// /// Looks up a localized string similar to 0648 (OR) Groudon Defeated ///2839 (OR) Groudon Captured diff --git a/PKHeX.Core/Properties/Resources.resx b/PKHeX.Core/Properties/Resources.resx index 5bac4cd5b..2b5602a15 100644 --- a/PKHeX.Core/Properties/Resources.resx +++ b/PKHeX.Core/Properties/Resources.resx @@ -1433,4 +1433,10 @@ ..\Resources\text\zh\text_Char_zh2.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + + ..\Resources\text\other\const_dp.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;shift_jis + + + ..\Resources\text\other\flags_dp.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;shift_jis + \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/other/const_dp.txt b/PKHeX.Core/Resources/text/other/const_dp.txt new file mode 100644 index 000000000..bfeaa64bb --- /dev/null +++ b/PKHeX.Core/Resources/text/other/const_dp.txt @@ -0,0 +1,9 @@ +0166 Dialga/Palkia 00:Event,01:Event,02:Event,03:Event,04:Disappeared,05:Battleable +0172 Heatran 00:Not appeared,01:Battleable,02:Disappeared +0068 Fullmoon Is. 0:Not appeared,520:On the Map +0069 Newmoon Is. 0:Not appeared,553:On the Map +0070 Spring Path 0:Not appeared,786:Appeared +0071 Seabreak Path 0:Not appeared,4136:Appeared +0081 Member Card 0:Not activated,4617:Activated +0082 Oak Letter 0:Not activated,4370:Activated +0083 Azure Flute 0:Not activated,4387:Activated \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/other/flags_dp.txt b/PKHeX.Core/Resources/text/other/flags_dp.txt new file mode 100644 index 000000000..3dfef874d --- /dev/null +++ b/PKHeX.Core/Resources/text/other/flags_dp.txt @@ -0,0 +1,15 @@ +0479 Uxie disappeared +0477 Mesprit(Verity Cavern) disappeared +0478 Azelf disappeared +0589 Cresselia(FullmoonIs.) disappeared +0256 Heatran disappeared +0577 Regigigas disappeared +0590 Giratina disappeared +0574 Darkrai disappeared +0591 Shaymin(FlowerParadise) disappeared +0588 Arceus disappeared +0254 Arceus(MapObj) disappeared +0275 Ferry FullmoonIs. accessable +0284 Ferry NewmoonIs. accessable +0269 Oak(R224) disappeared +0602 Shaymin(R224 MapObj) disappeared \ No newline at end of file diff --git a/PKHeX.Core/Saves/SAV4.cs b/PKHeX.Core/Saves/SAV4.cs index 0e74e7bc1..840556468 100644 --- a/PKHeX.Core/Saves/SAV4.cs +++ b/PKHeX.Core/Saves/SAV4.cs @@ -49,8 +49,8 @@ public SAV4(byte[] data = null, GameVersion versionOverride = GameVersion.Any) public override int BoxCount => 18; public override int MaxEV => 255; public override int Generation => 4; - protected override int EventFlagMax => int.MinValue; - protected override int EventConstMax => int.MinValue; + protected override int EventFlagMax => EventFlag > 0 ? 0x280 : int.MinValue; + protected override int EventConstMax => EventConst > 0 ? (EventFlag - EventConst) >> 1 : int.MinValue; protected override int GiftCountMax => 11; public override int OTLength => 7; public override int NickLength => 10; @@ -203,7 +203,8 @@ private void getSAVOffsets() LegalMailItems = Legal.Pouch_Mail_DP; HeldItems = Legal.HeldItems_DP; - + EventConst = 0xD80 + GBO; + EventFlag = 0xFE0 + GBO; Daycare = 0x141C + GBO; Box = 0xC104 + SBO; break; diff --git a/PKHeX.WinForms/Subforms/Save Editors/SAV_EventFlags.cs b/PKHeX.WinForms/Subforms/Save Editors/SAV_EventFlags.cs index 2d4560076..0a6ddd792 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/SAV_EventFlags.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/SAV_EventFlags.cs @@ -105,6 +105,9 @@ private string[] getStringList(string type) case GameVersion.MN: gamePrefix = "sm"; break; + case GameVersion.DP: + gamePrefix = "dp"; + break; default: return null; }