Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-23 04:23:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add gs event flags

Browse source 
https://projectpokemon.org/home/forums/topic/49717-pkhex-flag-editing/?tab=comments#comment-240804

via pret repo; looks like 2000 event flags, and 0x100 event
consts/work-vals (byte)
add more rebattle toggles
This commit is contained in:
Kurt 2019-03-05 23:06:05 -08:00
parent a4bf6335a9
commit 61bf82e2bd
11 changed files with 101 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
PKHeX.Core/PKHeX.Core.csproj
View file

@ -697,6 +697,9 @@
<None Remove="Resources\text\script\flags_c_en.txt" />
<None Remove="Resources\text\script\flags_c_ja.txt" />
<None Remove="Resources\text\script\flags_c_zh.txt" />
<None Remove="Resources\text\script\flags_gs_en.txt" />
<None Remove="Resources\text\script\flags_gs_ja.txt" />
<None Remove="Resources\text\script\flags_gs_zh.txt" />
<None Remove="Resources\text\zh\lang_zh.txt" />
<None Remove="Resources\text\zh\LegalityCheckStrings_zh.txt" />
<None Remove="Resources\text\zh\MessageStrings_zh.txt" />
@ -1432,6 +1435,9 @@
<EmbeddedResource Include="Resources\text\script\flags_c_en.txt" />
<EmbeddedResource Include="Resources\text\script\flags_c_ja.txt" />
<EmbeddedResource Include="Resources\text\script\flags_c_zh.txt" />
<EmbeddedResource Include="Resources\text\script\flags_gs_en.txt" />
<EmbeddedResource Include="Resources\text\script\flags_gs_ja.txt" />
<EmbeddedResource Include="Resources\text\script\flags_gs_zh.txt" />
<EmbeddedResource Include="Resources\text\zh\lang_zh.txt" />
<EmbeddedResource Include="Resources\text\zh\LegalityCheckStrings_zh.txt" />
<EmbeddedResource Include="Resources\text\zh\MessageStrings_zh.txt" />

5
PKHeX.Core/Resources/text/script/flags_c_en.txt
View file

@ -1,6 +1,11 @@
0042 Captured Sudowoodo
0079 Received Eevee
0190 Kurt can check GS Ball
0191 Kurt ready to return GS Ball (combine with above Flag)
0192 GS Ball can be inserted into Ilex Forest Shrine
0791 Captured Ho-oh
0792 Captured Lugia
0830 Received Odd Egg
0832 Received GS Ball
1872 Captured Snorlax
1873 Captured Red Gyarados

5
PKHeX.Core/Resources/text/script/flags_c_ja.txt
View file

@ -1,6 +1,11 @@
0042 Captured Sudowoodo
0079 Received Eevee
0190 ＧＳボールイベント (ガンテツ確認中)
0191 ＧＳボールイベント (ガンテツから受け取れる / 上のフラグと組み合わせて使用)
0192 ＧＳボールが置ける (ウバメのもりのほこら)
0791 Captured Ho-oh
0792 Captured Lugia
0830 なぞのタマゴ 受け取り済み
0832 ＧＳボール 受け取り済み
1872 Captured Snorlax
1873 Captured Red Gyarados

5
PKHeX.Core/Resources/text/script/flags_c_zh.txt
View file

@ -1,6 +1,11 @@
0042 Captured Sudowoodo
0079 Received Eevee
0190 钢铁能检查GS球
0191 钢铁能归还GS球 (与上述旗标绑定)
0192 GS球能放入桐树林祠堂
0830 已接收 奇异的蛋
0832 已接收 GS球
0791 Captured Ho-oh
0792 Captured Lugia
1872 Captured Snorlax
1873 Captured Red Gyarados

6
PKHeX.Core/Resources/text/script/flags_gs_en.txt Normal file
View file

@ -0,0 +1,6 @@
0190 Kurt can check GS Ball
0191 Kurt ready to return GS Ball (combine with above Flag)
0192 GS Ball can be inserted into Ilex Forest Shrine
0830 Received Odd Egg
0832 Received GS Ball
1873 Captured Red Gyarados

6
PKHeX.Core/Resources/text/script/flags_gs_ja.txt Normal file
View file

@ -0,0 +1,6 @@
0042 Captured Sudowoodo
0079 Received Eevee
0791 Captured Ho-oh
0792 Captured Lugia
1872 Captured Snorlax
1873 Captured Red Gyarados

6
PKHeX.Core/Resources/text/script/flags_gs_zh.txt Normal file
View file

@ -0,0 +1,6 @@
0042 Captured Sudowoodo
0079 Received Eevee
0791 Captured Ho-oh
0792 Captured Lugia
1872 Captured Snorlax
1873 Captured Red Gyarados

32
PKHeX.Core/Saves/SAV2.cs
View file

@ -125,6 +125,7 @@ namespace PKHeX.Core
// Enable Pokedex editing
PokeDex = 0;
EventFlag = Offsets.EventFlag;
EventConst = Offsets.EventConst;
if (!Exportable)
ClearBoxes();
@ -256,9 +257,8 @@ namespace PKHeX.Core
public override bool IsPKMPresent(int offset) => PKX.IsPKMPresentGB(Data, offset);
// not correct, but whole contains. Data[EventFlag+0x22F]=Data[0x1A2F] means repel count.
protected override int EventFlagMax => Version == GameVersion.C ? 0x230 << 3 : base.EventFlagMax;
protected override int EventConstMax => Version == GameVersion.C ? 0 : base.EventConstMax;
protected override int EventConstMax => 0x100;
protected override int EventFlagMax => 2000;
public override int BoxCount => Japanese ? 9 : 14;
public override int MaxEV => 65535;
@ -626,6 +626,32 @@ namespace PKHeX.Core
return GetFlag(Offsets.PokedexCaught + ofs, bit & 7);
}
/// <summary>All Event Constant values for the save file</summary>
/// <remarks>These are all bytes</remarks>
public override ushort[] EventConsts
{
get
{
if (EventConstMax <= 0)
return Array.Empty<ushort>();
ushort[] Constants = new ushort[EventConstMax];
for (int i = 0; i < Constants.Length; i++)
Constants[i] = Data[EventConst + i];
return Constants;
}
set
{
if (EventConstMax <= 0)
return;
if (value.Length != EventConstMax)
return;
for (int i = 0; i < value.Length; i++)
Data[EventConst + i] = Math.Min(byte.MaxValue, (byte)value[i]);
}
}
// Misc
public ushort ResetKey => GetResetKey();

6
PKHeX.Core/Saves/SaveFile.cs
View file

@ -283,11 +283,11 @@ namespace PKHeX.Core
}
/// <summary> All Event Constant values for the savegame </summary>
public ushort[] EventConsts
public virtual ushort[] EventConsts
{
get
{
if (EventConstMax < 0)
if (EventConstMax <= 0)
return Array.Empty<ushort>();
ushort[] Constants = new ushort[EventConstMax];
@ -297,7 +297,7 @@ namespace PKHeX.Core
}
set
{
if (EventConstMax < 0)
if (EventConstMax <= 0)
return;
if (value.Length != EventConstMax)
return;

10
PKHeX.Core/Saves/Substructures/Gen12/SAV2Offsets.cs
View file

@ -14,6 +14,7 @@
else
LoadOffsetsInternational(sav.Version);
Daycare = PokedexSeen + 0x1F + 28 + 1; // right after first unown seen
EventConst = EventFlag - 0x100;
}
public int Options { get; }
@ -34,7 +35,8 @@
public int Gender { get; private set; } = -1;
public int AccumulatedChecksumEnd { get; private set; } = -1;
public int OverallChecksumPosition { get; private set; } = -1;
public int EventFlag { get; private set; } = int.MinValue;
public int EventFlag { get; private set; }= -1;
public int EventConst { get; }
public int Daycare { get; }
public int PouchTMHM { get; private set; } = -1;
@ -70,6 +72,8 @@
PouchKey = 0x2449;
PouchBall = 0x2464;
PouchPC = 0x247E;
EventFlag = CurrentBoxIndex - 0x105;
break;
case GameVersion.C:
TimePlayed = 0x2052;
@ -126,6 +130,8 @@
PouchKey = 0x242A;
PouchBall = 0x2445;
PouchPC = 0x245F;
EventFlag = CurrentBoxIndex - 0x105;
break;
case GameVersion.C:
Money = 0x23BE;
@ -179,6 +185,8 @@
PouchKey = 0x2441;
PouchBall = 0x245C;
PouchPC = 0x2476;
EventFlag = CurrentBoxIndex - 0x105;
}
}
}

70
PKHeX.WinForms/Subforms/Save Editors/SAV_EventFlags.cs
View file

@ -106,59 +106,31 @@ namespace PKHeX.WinForms
private string[] GetStringList(string type)
{
switch (SAV.Version)
gamePrefix = GetResourceSuffix(SAV.Version);
return GameInfo.GetStrings(gamePrefix, GameInfo.CurrentLanguage, type);
}
private static string GetResourceSuffix(GameVersion ver)
{
switch (ver)
{
case GameVersion.X:
case GameVersion.Y:
gamePrefix = "xy";
break;
case GameVersion.OR:
case GameVersion.AS:
gamePrefix = "oras";
break;
case GameVersion.SN:
case GameVersion.MN:
gamePrefix = "sm";
break;
case GameVersion.US:
case GameVersion.UM:
gamePrefix = "usum";
break;
case GameVersion.DP:
gamePrefix = "dp";
break;
case GameVersion.Pt:
gamePrefix = "pt";
break;
case GameVersion.HGSS:
gamePrefix = "hgss";
break;
case GameVersion.BW:
gamePrefix = "bw";
break;
case GameVersion.B2W2:
gamePrefix = "b2w2";
break;
case GameVersion.R:
case GameVersion.S:
case GameVersion.RS:
gamePrefix = "rs";
break;
case GameVersion.E:
gamePrefix = "e";
break;
case GameVersion.FR:
case GameVersion.LG:
case GameVersion.FRLG:
gamePrefix = "frlg";
break;
case GameVersion.C:
gamePrefix = "c";
break;
case GameVersion.X: case GameVersion.Y: return "xy";
case GameVersion.OR: case GameVersion.AS: return "oras";
case GameVersion.SN: case GameVersion.MN: return "sm";
case GameVersion.US: case GameVersion.UM: return "usum";
case GameVersion.DP: return "dp";
case GameVersion.Pt: return "pt";
case GameVersion.HGSS: return "hgss";
case GameVersion.BW: return "bw";
case GameVersion.B2W2: return "b2w2";
case GameVersion.R: case GameVersion.S: case GameVersion.RS: return "rs";
case GameVersion.E: return "e";
case GameVersion.FR: case GameVersion.LG: case GameVersion.FRLG: return "frlg";
case GameVersion.C: return "c";
case GameVersion.GD: case GameVersion.SV: case GameVersion.GS: return "gs";
default:
throw new ArgumentException(nameof(GameVersion));
}
return GameInfo.GetStrings(gamePrefix, GameInfo.CurrentLanguage, type);
}
private void AddFlagList(string[] list)