Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-04-24 23:57:12 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update WC9 ID32 handling for 2.0.1

Browse Source 
Seems like
This commit is contained in:
Kurt 2023-09-23 21:31:33 -07:00
parent f6ee2b1ffa
commit 88a5a1c9e5
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
PKHeX.Core/MysteryGifts/WC9.cs
View File

@ -126,6 +126,12 @@ private uint GetShinyXor()
// When applying the TID32, the game sets the DisplayTID7 directly, then sets pk9.DisplaySID7 as (wc9.DisplaySID7 - wc9.CardID)
// Since we expose the 16bit (pk9) component values here, just adjust them accordingly with an inlined calc.
public override uint ID32
{
get => ReadUInt32LittleEndian(Data.AsSpan(CardStart + 0x18));
set => WriteUInt32LittleEndian(Data.AsSpan(CardStart + 0x18), value);
}
public uint ID32Old
{
get => ReadUInt32LittleEndian(Data.AsSpan(CardStart + 0x18)) - (1000000u * (uint)CardID);
set => WriteUInt32LittleEndian(Data.AsSpan(CardStart + 0x18), value + (1000000u * (uint)CardID));
@ -448,8 +454,7 @@ public override PK9 ConvertToPKM(ITrainerInfo tr, EncounterCriteria criteria)
var pk = new PK9
{
EncryptionConstant = EncryptionConstant != 0 ? EncryptionConstant : rnd.Rand32(),
TID16 = TID16,
SID16 = SID16,
ID32 = ID32,
Species = Species,
Form = Form,
CurrentLevel = currentLevel,
@ -506,14 +511,18 @@ public override PK9 ConvertToPKM(ITrainerInfo tr, EncounterCriteria criteria)
while (!CanBeReceivedByVersion(pk));
}
var date = GetSuggestedDate();
pk.MetDate = date;
if (OTGender >= 2)
{
pk.TID16 = tr.TID16;
pk.SID16 = tr.SID16;
}
var date = GetSuggestedDate();
pk.MetDate = date;
else if (IsBeforePatch200(date))
{
pk.ID32 = ID32Old;
}
var nickname_language = GetLanguage(language);
pk.Language = nickname_language != 0 ? nickname_language : tr.Language;
@ -551,7 +560,9 @@ public override PK9 ConvertToPKM(ITrainerInfo tr, EncounterCriteria criteria)
private static bool IsBeforePatch120(int cardID) => cardID is 0001 or 0006 or 0501 or 1501; // Flabébé, Gyarados, Pikachu, Garganacl
private const int DayNumber20230301 = 738579; // S/V Patch 1.2.0
private static bool IsBeforePatch120(DateOnly date) => date.DayNumber < DayNumber20230301;
private const int DayNumber20230913 = 738775; // S/V Patch 2.0.1
private static bool IsBeforePatch120(DateOnly date) => date.DayNumber < DayNumber20230301; // scale handling updated
private static bool IsBeforePatch200(DateOnly date) => date.DayNumber <= DayNumber20230913; // ID32 handling updated
private DateOnly GetSuggestedDate()
{
@ -669,8 +680,8 @@ public override bool IsMatchExact(PKM pk, EvoCriteria evo)
{
if (OTGender < 2)
{
if (SID16 != pk.SID16) return false;
if (TID16 != pk.TID16) return false;
var expect = pk.MetDate is { } x && IsBeforePatch200(x) ? ID32Old : ID32;
if (expect != pk.ID32) return false;
if (OTGender != pk.OT_Gender) return false;
}