diff --git a/PKHeX.Core/Properties/Resources.Designer.cs b/PKHeX.Core/Properties/Resources.Designer.cs index 73a7b522d..2e70ed8b8 100644 --- a/PKHeX.Core/Properties/Resources.Designer.cs +++ b/PKHeX.Core/Properties/Resources.Designer.cs @@ -78,6 +78,20 @@ internal class Resources { } } + /// + /// Looks up a localized string similar to 0299 Spiky-eared Pichu(IlexForest) 0:Not appeared,2:disappeared + ///0161 Beasts(BurnedTower) 0:stay,1:roamed/fleed + ///0304 Lati@s(Roamer) 0:Not appeared,1:Ready to roam,2:roamed + ///0067 Enigma Stone 0:Not activated,1778:Activated + ///0249 Embedded Tower 0:Not obtained Kanto starter,1:Obtained Kanto starter,2:Obtained Orb,3:Kyogre activated,4:Kyogre disappeared,6:Rayquaza activated,7:Rayquaza caught,9:Rayquaza defeated/runaway + ///0251 Sinjoh Ruins 1:Not entered,4:teleported(1st),5:went outside,6:Cynthia talkable(cabin), [rest of string was truncated]";. + /// + internal static string const_hgss { + get { + return ResourceManager.GetString("const_hgss", resourceCulture); + } + } + /// /// Looks up a localized string similar to 60 Ash ///21 Test1 @@ -144,6 +158,29 @@ internal class Resources { } } + /// + /// Looks up a localized string similar to 0607 Red(Mt.Silver) disappeared + ///0774 Articuno disappeared + ///0663 Zapdos disappeared + ///0775 Moltres disappeared + ///0773 Mewtwo disappeared + ///0457 Raikou roamed + ///0458 Entei roamed + ///0459 Suicune(BurnedTower) fleed + ///0673 Suicune(R25) disappeared + ///0782 Suicune(backed to BurnedTower) disappeared + ///0579 Lugia disappeared + ///0578 Ho-Oh disappeared + ///0781 Lati@s(PewterCity) disappeared + ///0721 Kyogre/Groudon disappeared + ///0722 Rayquaza disappeared + /// + internal static string flags_hgss { + get { + return ResourceManager.GetString("flags_hgss", 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 2b5602a15..4982d20b6 100644 --- a/PKHeX.Core/Properties/Resources.resx +++ b/PKHeX.Core/Properties/Resources.resx @@ -1439,4 +1439,10 @@ ..\Resources\text\other\flags_dp.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;shift_jis + + ..\Resources\text\other\const_hgss.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;shift_jis + + + ..\Resources\text\other\flags_hgss.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 index bfeaa64bb..d9715393f 100644 --- a/PKHeX.Core/Resources/text/other/const_dp.txt +++ b/PKHeX.Core/Resources/text/other/const_dp.txt @@ -1,9 +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 +0152 Dialga/Palkia 00:Event,01:Event,02:Event,03:Event,04:Disappeared,05:Battleable +0158 Heatran 00:Not appeared,01:Battleable,02:Disappeared +0054 Fullmoon Is. 0:Not appeared,520:On the Map +0055 Newmoon Is. 0:Not appeared,553:On the Map +0056 Spring Path 0:Not appeared,786:Appeared +0057 Seabreak Path 0:Not appeared,4136:Appeared +0067 Member Card 0:Not activated,4617:Activated +0068 Oak Letter 0:Not activated,4370:Activated +0069 Azure Flute 0:Not activated,4387:Activated \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/other/const_hgss.txt b/PKHeX.Core/Resources/text/other/const_hgss.txt new file mode 100644 index 000000000..373b27987 --- /dev/null +++ b/PKHeX.Core/Resources/text/other/const_hgss.txt @@ -0,0 +1,8 @@ +0299 Spiky-eared Pichu(IlexForest) 0:Not appeared,2:disappeared +0161 Beasts(BurnedTower) 0:stay,1:roamed/fleed +0304 Lati@s(Roamer) 0:Not appeared,1:Ready to roam,2:roamed +0067 Enigma Stone 0:Not activated,1778:Activated +0249 Embedded Tower 0:Not obtained Kanto starter,1:Obtained Kanto starter,2:Obtained Orb,3:Kyogre activated,4:Kyogre disappeared,6:Rayquaza activated,7:Rayquaza caught,9:Rayquaza defeated/runaway +0251 Sinjoh Ruins 1:Not entered,4:teleported(1st),5:went outside,6:Cynthia talkable(cabin),7:Cynthia talkable(stage),8:before choose,10:obtained(1st),13:teleported(2nd),14:obtained(2nd) +0259 Obtained(1st) 1:Dialga,2:Palkia,3:Giratina +0258 Teleportable(2nd) Arceus 1:Hall of Origin,2:FatefulEncountered \ 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 index 3dfef874d..b494ab702 100644 --- a/PKHeX.Core/Resources/text/other/flags_dp.txt +++ b/PKHeX.Core/Resources/text/other/flags_dp.txt @@ -1,15 +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 +0511 Uxie disappeared +0509 Mesprit(Verity Cavern) disappeared +0510 Azelf disappeared +0621 Cresselia(FullmoonIs.) disappeared +0288 Heatran disappeared +0609 Regigigas disappeared +0622 Giratina disappeared +0606 Darkrai disappeared +0623 Shaymin(FlowerParadise) disappeared +0620 Arceus disappeared +0286 Arceus(MapObj) disappeared +0307 Ferry FullmoonIs. accessable +0316 Ferry NewmoonIs. accessable +0301 Oak(R224) disappeared +0634 Shaymin(R224 MapObj) disappeared \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/other/flags_hgss.txt b/PKHeX.Core/Resources/text/other/flags_hgss.txt new file mode 100644 index 000000000..6caad0894 --- /dev/null +++ b/PKHeX.Core/Resources/text/other/flags_hgss.txt @@ -0,0 +1,15 @@ +0607 Red(Mt.Silver) disappeared +0774 Articuno disappeared +0663 Zapdos disappeared +0775 Moltres disappeared +0773 Mewtwo disappeared +0457 Raikou roamed +0458 Entei roamed +0459 Suicune(BurnedTower) fleed +0673 Suicune(R25) disappeared +0782 Suicune(backed to BurnedTower) disappeared +0579 Lugia disappeared +0578 Ho-Oh disappeared +0781 Lati@s(PewterCity) disappeared +0721 Kyogre/Groudon disappeared +0722 Rayquaza disappeared \ No newline at end of file diff --git a/PKHeX.Core/Saves/SAV4.cs b/PKHeX.Core/Saves/SAV4.cs index 9db0b3439..a95b342f7 100644 --- a/PKHeX.Core/Saves/SAV4.cs +++ b/PKHeX.Core/Saves/SAV4.cs @@ -49,7 +49,7 @@ 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 => EventFlag > 0 ? 0x280 : int.MinValue; + protected override int EventFlagMax => EventFlag > 0 ? 0xB60 : int.MinValue; protected override int EventConstMax => EventConst > 0 ? (EventFlag - EventConst) >> 1 : int.MinValue; protected override int GiftCountMax => 11; public override int OTLength => 7; @@ -203,8 +203,8 @@ private void getSAVOffsets() LegalMailItems = Legal.Pouch_Mail_DP; HeldItems = Legal.HeldItems_DP; - EventConst = 0xD80 + GBO; - EventFlag = 0xFE0 + GBO; + EventConst = 0xD9C + GBO; + EventFlag = 0xFDC + GBO; Daycare = 0x141C + GBO; Box = 0xC104 + SBO; break; @@ -264,7 +264,8 @@ private void getSAVOffsets() LegalMailItems = Legal.Pouch_Mail_HGSS; HeldItems = Legal.HeldItems_HGSS; - + EventConst = 0xDE4 + GBO; + EventFlag = 0x10C4 + GBO; Daycare = 0x15FC + GBO; Box = 0xF700 + SBO; break; diff --git a/PKHeX.WinForms/Subforms/Save Editors/SAV_EventFlags.cs b/PKHeX.WinForms/Subforms/Save Editors/SAV_EventFlags.cs index 0a6ddd792..68ae85926 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/SAV_EventFlags.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/SAV_EventFlags.cs @@ -108,6 +108,9 @@ private string[] getStringList(string type) case GameVersion.DP: gamePrefix = "dp"; break; + case GameVersion.HGSS: + gamePrefix = "hgss"; + break; default: return null; }