mirror of
https://github.com/kwsch/PKHeX
synced 2024-11-10 06:34:19 +00:00
Update EncounterTrade2.cs
This commit is contained in:
parent
45444578ab
commit
fed6b41950
1 changed files with 14 additions and 0 deletions
|
@ -156,6 +156,13 @@ public sealed record EncounterTrade2 : IEncounterable, IEncounterMatch, IFixedTr
|
|||
return false;
|
||||
|
||||
ReadOnlySpan<char> ot = pk.OriginalTrainerName;
|
||||
if (language == 4 && Species is (ushort)Shuckle)
|
||||
{
|
||||
// Same nickname, different OT name for Italian and Spanish.
|
||||
if (ot is "MANIA")
|
||||
return true;
|
||||
language = 7; // Might be remapped.
|
||||
}
|
||||
var expect = pk.Format < 7 ? TrainerNames[language] : GetExpectedOT(Species, language, pk.Language);
|
||||
return ot.SequenceEqual(expect);
|
||||
}
|
||||
|
@ -192,6 +199,13 @@ public sealed record EncounterTrade2 : IEncounterable, IEncounterMatch, IFixedTr
|
|||
return false;
|
||||
|
||||
ReadOnlySpan<char> ot = pk.OriginalTrainerName;
|
||||
if (language == 4 && Species is (ushort)Shuckle)
|
||||
{
|
||||
// Same nickname, different OT name for Italian and Spanish.
|
||||
if (ot is "MANIA")
|
||||
return true;
|
||||
language = 7; // Might be remapped.
|
||||
}
|
||||
var expect = pk.Format < 7 ? TrainerNames[language] : GetExpectedOT(Species, language, pk.Language);
|
||||
return ot.SequenceEqual(expect);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue