mirror of
https://github.com/kwsch/PKHeX
synced 2024-11-10 06:34:19 +00:00
Replace é->e for code symbols
Closes #3519 Usages weren't consistent; since `é` isn't accessible on usual english keyboards, just use regular `e` instead of alt-223 entry. Not sure why VS preferred to save the text files without an encoding prefix; oh well.
This commit is contained in:
parent
184440f266
commit
436588eb10
32 changed files with 72 additions and 73 deletions
|
@ -131,7 +131,7 @@ namespace PKHeX.Core
|
|||
MGDB_G8A,
|
||||
MGDB_G8B,
|
||||
}.SelectMany(z => z);
|
||||
regular = regular.Where(mg => !mg.IsItem && mg.IsPokémon && mg.Species > 0);
|
||||
regular = regular.Where(mg => !mg.IsItem && mg.IsEntity && mg.Species > 0);
|
||||
var result = MGDB_G3.Concat(regular);
|
||||
if (sorted)
|
||||
result = result.OrderBy(mg => mg.Species);
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
private static void SetNPokemonData(PK5 pk5, int lang)
|
||||
{
|
||||
pk5.IV_HP = pk5.IV_ATK = pk5.IV_DEF = pk5.IV_SPA = pk5.IV_SPD = pk5.IV_SPE = 30;
|
||||
pk5.NPokémon = NSparkle;
|
||||
pk5.NSparkle = NSparkle;
|
||||
pk5.OT_Name = GetOT(lang);
|
||||
pk5.TID = 00002;
|
||||
pk5.SID = 00000;
|
||||
|
|
|
@ -31,7 +31,7 @@ namespace PKHeX.Core
|
|||
case PK4 pk4 when pk4.ShinyLeaf != 0:
|
||||
data.AddLine(GetInvalid(LEggShinyLeaf, Egg));
|
||||
break;
|
||||
case PK4 pk4 when pk4.PokéathlonStat != 0:
|
||||
case PK4 pk4 when pk4.PokeathlonStat != 0:
|
||||
data.AddLine(GetInvalid(LEggPokeathlon, Egg));
|
||||
break;
|
||||
case PK3 when pkm.Language != 1: // All Eggs are Japanese and flagged specially for localized string
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
namespace PKHeX.Core
|
||||
{
|
||||
/// <summary>
|
||||
/// Verifies the <see cref="PK5.NPokémon"/> data.
|
||||
/// Verifies the <see cref="PK5.NSparkle"/> data.
|
||||
/// </summary>
|
||||
public sealed class NHarmoniaVerifier : Verifier
|
||||
{
|
||||
|
@ -15,7 +15,7 @@ namespace PKHeX.Core
|
|||
bool checksRequired = data.EncounterMatch is EncounterStatic5N;
|
||||
if (pkm is PK5 pk5)
|
||||
{
|
||||
bool has = pk5.NPokémon;
|
||||
bool has = pk5.NSparkle;
|
||||
if (checksRequired && !has)
|
||||
data.AddLine(GetInvalid(LG5SparkleRequired, CheckIdentifier.Fateful));
|
||||
if (!checksRequired && has)
|
||||
|
|
|
@ -124,7 +124,7 @@ namespace PKHeX.Core
|
|||
public abstract bool IsItem { get; set; }
|
||||
public abstract int ItemID { get; set; }
|
||||
|
||||
public abstract bool IsPokémon { get; set; }
|
||||
public abstract bool IsEntity { get; set; }
|
||||
public virtual int Quantity { get => 1; set { } }
|
||||
public virtual bool Empty => false;
|
||||
|
||||
|
|
|
@ -53,7 +53,7 @@ namespace PKHeX.Core
|
|||
{
|
||||
AddLinesItem(gift, strings, result);
|
||||
}
|
||||
else if (gift.IsPokémon)
|
||||
else if (gift.IsEntity)
|
||||
{
|
||||
try
|
||||
{
|
||||
|
|
|
@ -54,7 +54,7 @@ namespace PKHeX.Core
|
|||
public void SetMetadata(ReadOnlySpan<byte> data) => data.CopyTo(Data.AsSpan(PGT.Size));
|
||||
|
||||
public override bool GiftUsed { get => Gift.GiftUsed; set => Gift.GiftUsed = value; }
|
||||
public override bool IsPokémon { get => Gift.IsPokémon; set => Gift.IsPokémon = value; }
|
||||
public override bool IsEntity { get => Gift.IsEntity; set => Gift.IsEntity = value; }
|
||||
public override bool IsItem { get => Gift.IsItem; set => Gift.IsItem = value; }
|
||||
public override int ItemID { get => Gift.ItemID; set => Gift.ItemID = value; }
|
||||
public bool IsLockCapsule => IsItem && ItemID == 533; // 0x215
|
||||
|
|
|
@ -171,14 +171,14 @@ namespace PKHeX.Core
|
|||
public override bool IsShiny => PIDType == 2;
|
||||
public override int Location { get => MetLocation; set => MetLocation = (ushort)value; }
|
||||
public override IReadOnlyList<int> Moves => new[] { Move1, Move2, Move3, Move4 };
|
||||
public override bool IsPokémon { get => CardType == 1; set { if (value) CardType = 1; } }
|
||||
public override bool IsEntity { get => CardType == 1; set { if (value) CardType = 1; } }
|
||||
public override bool IsItem { get => CardType == 2; set { if (value) CardType = 2; } }
|
||||
public bool IsPower { get => CardType == 3; set { if (value) CardType = 3; } }
|
||||
|
||||
public override PKM ConvertToPKM(ITrainerInfo sav, EncounterCriteria criteria)
|
||||
{
|
||||
if (!IsPokémon)
|
||||
throw new ArgumentException(nameof(IsPokémon));
|
||||
if (!IsEntity)
|
||||
throw new ArgumentException(nameof(IsEntity));
|
||||
|
||||
var rnd = Util.Rand;
|
||||
|
||||
|
|
|
@ -15,14 +15,14 @@ namespace PKHeX.Core
|
|||
|
||||
public override byte Level
|
||||
{
|
||||
get => IsManaphyEgg ? (byte)1 : IsPokémon ? (byte)PK.Met_Level : (byte)0;
|
||||
set { if (IsPokémon) PK.Met_Level = value; }
|
||||
get => IsManaphyEgg ? (byte)1 : IsEntity ? (byte)PK.Met_Level : (byte)0;
|
||||
set { if (IsEntity) PK.Met_Level = value; }
|
||||
}
|
||||
|
||||
public override int Ball
|
||||
{
|
||||
get => IsPokémon ? PK.Ball : 0;
|
||||
set { if (IsPokémon) PK.Ball = value; }
|
||||
get => IsEntity ? PK.Ball : 0;
|
||||
set { if (IsEntity) PK.Ball = value; }
|
||||
}
|
||||
|
||||
public override AbilityPermission Ability => IsManaphyEgg ? AbilityPermission.Any12 : (int)(PK.PID & 1) == 1 ? AbilityPermission.OnlySecond : AbilityPermission.OnlyFirst;
|
||||
|
@ -108,7 +108,7 @@ namespace PKHeX.Core
|
|||
public bool IsManaphyEgg { get => PGTGiftType == GiftType.ManaphyEgg; set { if (value) PGTGiftType = GiftType.ManaphyEgg; } }
|
||||
public override bool EggEncounter => IsEgg;
|
||||
public override bool IsItem { get => PGTGiftType == GiftType.Item; set { if (value) PGTGiftType = GiftType.Item; } }
|
||||
public override bool IsPokémon { get => PGTGiftType is GiftType.Pokémon or GiftType.PokémonEgg or GiftType.ManaphyEgg; set { } }
|
||||
public override bool IsEntity { get => PGTGiftType is GiftType.Pokémon or GiftType.PokémonEgg or GiftType.ManaphyEgg; set { } }
|
||||
|
||||
public override int Species { get => IsManaphyEgg ? 490 : PK.Species; set => PK.Species = value; }
|
||||
public override IReadOnlyList<int> Moves { get => PK.Moves; set => PK.SetMoves(value.ToArray()); }
|
||||
|
@ -130,8 +130,8 @@ namespace PKHeX.Core
|
|||
|
||||
public override PKM ConvertToPKM(ITrainerInfo sav, EncounterCriteria criteria)
|
||||
{
|
||||
if (!IsPokémon)
|
||||
throw new ArgumentException(nameof(IsPokémon));
|
||||
if (!IsEntity)
|
||||
throw new ArgumentException(nameof(IsEntity));
|
||||
|
||||
// template is already filled out, only minor mutations required
|
||||
PK4 pk4 = new((byte[])PK.Data.Clone()) { Sanity = 0 };
|
||||
|
|
|
@ -91,7 +91,7 @@ namespace PKHeX.Core
|
|||
public int SID { get => ReadUInt16LittleEndian(Data.AsSpan(0x02)); set => WriteUInt16LittleEndian(Data.AsSpan(0x02), (ushort)value); }
|
||||
public int OriginGame { get => Data[0x04]; set => Data[0x04] = (byte)value; }
|
||||
public uint EncryptionConstant { get => ReadUInt32LittleEndian(Data.AsSpan(0x08)); set => WriteUInt32LittleEndian(Data.AsSpan(0x08), value); }
|
||||
public int Pokéball { get => Data[0xE]; set => Data[0xE] = (byte)value; }
|
||||
public int Ball { get => Data[0xE]; set => Data[0xE] = (byte)value; }
|
||||
public int HeldItem { get => ReadUInt16LittleEndian(Data.AsSpan(0x10)); set => WriteUInt16LittleEndian(Data.AsSpan(0x10), (ushort)value); }
|
||||
public int Move1 { get => ReadUInt16LittleEndian(Data.AsSpan(0x12)); set => WriteUInt16LittleEndian(Data.AsSpan(0x12), (ushort)value); }
|
||||
public int Move2 { get => ReadUInt16LittleEndian(Data.AsSpan(0x14)); set => WriteUInt16LittleEndian(Data.AsSpan(0x14), (ushort)value); }
|
||||
|
|
|
@ -75,7 +75,7 @@ namespace PKHeX.Core
|
|||
public void SetQuantity(int index, ushort quantity) => WriteUInt16LittleEndian(Data.AsSpan(0x1A + (4 * index)), quantity);
|
||||
|
||||
// Pokémon Properties
|
||||
public override bool IsPokémon { get => CardType == GiftType.Pokemon; set { if (value) CardType = GiftType.Pokemon; } }
|
||||
public override bool IsEntity { get => CardType == GiftType.Pokemon; set { if (value) CardType = GiftType.Pokemon; } }
|
||||
|
||||
public override bool IsShiny => Shiny.IsShiny();
|
||||
|
||||
|
@ -388,8 +388,8 @@ namespace PKHeX.Core
|
|||
|
||||
public override PKM ConvertToPKM(ITrainerInfo sav, EncounterCriteria criteria)
|
||||
{
|
||||
if (!IsPokémon)
|
||||
throw new ArgumentException(nameof(IsPokémon));
|
||||
if (!IsEntity)
|
||||
throw new ArgumentException(nameof(IsEntity));
|
||||
|
||||
int currentLevel = Level > 0 ? Level : (1 + Util.Rand.Next(100));
|
||||
int metLevel = MetLevel > 0 ? MetLevel : currentLevel;
|
||||
|
|
|
@ -132,7 +132,7 @@ namespace PKHeX.Core
|
|||
}
|
||||
|
||||
// Pokémon Properties
|
||||
public override bool IsPokémon { get => CardType == 0; set { if (value) CardType = 0; } }
|
||||
public override bool IsEntity { get => CardType == 0; set { if (value) CardType = 0; } }
|
||||
public override bool IsShiny => PIDType == ShinyType6.Always;
|
||||
|
||||
public override Shiny Shiny => PIDType switch
|
||||
|
@ -330,8 +330,8 @@ namespace PKHeX.Core
|
|||
|
||||
public override PKM ConvertToPKM(ITrainerInfo sav, EncounterCriteria criteria)
|
||||
{
|
||||
if (!IsPokémon)
|
||||
throw new ArgumentException(nameof(IsPokémon));
|
||||
if (!IsEntity)
|
||||
throw new ArgumentException(nameof(IsEntity));
|
||||
|
||||
var rnd = Util.Rand;
|
||||
|
||||
|
|
|
@ -86,7 +86,7 @@ namespace PKHeX.Core
|
|||
public void SetQuantity(int index, ushort quantity) => WriteUInt16LittleEndian(Data.AsSpan(CardStart + 0x22 + (0x10 * index)), quantity);
|
||||
|
||||
// Pokémon Properties
|
||||
public override bool IsPokémon { get => CardType == GiftType.Pokemon; set { if (value) CardType = GiftType.Pokemon; } }
|
||||
public override bool IsEntity { get => CardType == GiftType.Pokemon; set { if (value) CardType = GiftType.Pokemon; } }
|
||||
|
||||
public override bool IsShiny => Shiny.IsShiny();
|
||||
|
||||
|
@ -381,8 +381,8 @@ namespace PKHeX.Core
|
|||
|
||||
public override PKM ConvertToPKM(ITrainerInfo sav, EncounterCriteria criteria)
|
||||
{
|
||||
if (!IsPokémon)
|
||||
throw new ArgumentException(nameof(IsPokémon));
|
||||
if (!IsEntity)
|
||||
throw new ArgumentException(nameof(IsEntity));
|
||||
|
||||
int currentLevel = Level > 0 ? Level : (1 + Util.Rand.Next(100));
|
||||
int metLevel = MetLevel > 0 ? MetLevel : currentLevel;
|
||||
|
|
|
@ -59,7 +59,7 @@ namespace PKHeX.Core
|
|||
public override int CardID { get; set; }
|
||||
public override bool IsItem { get; set; }
|
||||
public override int ItemID { get; set; }
|
||||
public override bool IsPokémon { get; set; } = true;
|
||||
public override bool IsEntity { get; set; } = true;
|
||||
public override bool Empty => false;
|
||||
public override int Gender { get; set; }
|
||||
public override int Form { get; set; }
|
||||
|
|
|
@ -121,7 +121,7 @@ namespace PKHeX.Core
|
|||
set => WriteUInt16LittleEndian(Data.AsSpan(0x70), (ushort)value); }
|
||||
|
||||
// Pokémon Properties
|
||||
public override bool IsPokémon { get => CardType == 0; set { if (value) CardType = 0; } }
|
||||
public override bool IsEntity { get => CardType == 0; set { if (value) CardType = 0; } }
|
||||
public override bool IsShiny => Shiny.IsShiny();
|
||||
|
||||
public override Shiny Shiny => IsEgg ? Shiny.Random : PIDType switch
|
||||
|
@ -295,8 +295,8 @@ namespace PKHeX.Core
|
|||
|
||||
public override PKM ConvertToPKM(ITrainerInfo sav, EncounterCriteria criteria)
|
||||
{
|
||||
if (!IsPokémon)
|
||||
throw new ArgumentException(nameof(IsPokémon));
|
||||
if (!IsEntity)
|
||||
throw new ArgumentException(nameof(IsEntity));
|
||||
|
||||
var rnd = Util.Rand;
|
||||
|
||||
|
|
|
@ -136,7 +136,7 @@ namespace PKHeX.Core
|
|||
}
|
||||
|
||||
// Pokémon Properties
|
||||
public override bool IsPokémon { get => CardType == 0; set { if (value) CardType = 0; } }
|
||||
public override bool IsEntity { get => CardType == 0; set { if (value) CardType = 0; } }
|
||||
public override bool IsShiny => Shiny.IsShiny();
|
||||
|
||||
public override Shiny Shiny => IsEgg ? Shiny.Random : PIDType switch
|
||||
|
@ -347,8 +347,8 @@ namespace PKHeX.Core
|
|||
|
||||
public override PKM ConvertToPKM(ITrainerInfo sav, EncounterCriteria criteria)
|
||||
{
|
||||
if (!IsPokémon)
|
||||
throw new ArgumentException(nameof(IsPokémon));
|
||||
if (!IsEntity)
|
||||
throw new ArgumentException(nameof(IsEntity));
|
||||
|
||||
var rnd = Util.Rand;
|
||||
|
||||
|
|
|
@ -77,7 +77,7 @@ namespace PKHeX.Core
|
|||
public void SetQuantity(int index, ushort quantity) => WriteUInt16LittleEndian(Data.AsSpan(CardStart + 0x22 + (4 * index)), quantity);
|
||||
|
||||
// Pokémon Properties
|
||||
public override bool IsPokémon { get => CardType == GiftType.Pokemon; set { if (value) CardType = GiftType.Pokemon; } }
|
||||
public override bool IsEntity { get => CardType == GiftType.Pokemon; set { if (value) CardType = GiftType.Pokemon; } }
|
||||
|
||||
public override bool IsShiny => Shiny.IsShiny();
|
||||
|
||||
|
@ -372,8 +372,8 @@ namespace PKHeX.Core
|
|||
|
||||
public override PKM ConvertToPKM(ITrainerInfo sav, EncounterCriteria criteria)
|
||||
{
|
||||
if (!IsPokémon)
|
||||
throw new ArgumentException(nameof(IsPokémon));
|
||||
if (!IsEntity)
|
||||
throw new ArgumentException(nameof(IsEntity));
|
||||
|
||||
int currentLevel = Level > 0 ? Level : (1 + Util.Rand.Next(100));
|
||||
int metLevel = MetLevel > 0 ? MetLevel : currentLevel;
|
||||
|
|
|
@ -122,7 +122,7 @@ namespace PKHeX.Core
|
|||
}
|
||||
}
|
||||
|
||||
public override bool IsPokémon
|
||||
public override bool IsEntity
|
||||
{
|
||||
get => GiftType == WR7GiftType.Pokemon;
|
||||
set
|
||||
|
@ -135,8 +135,8 @@ namespace PKHeX.Core
|
|||
public override PKM ConvertToPKM(ITrainerInfo sav, EncounterCriteria criteria)
|
||||
{
|
||||
// this method shouldn't really be called, use the WB7 data not the WR7 data.
|
||||
if (!IsPokémon)
|
||||
throw new ArgumentException(nameof(IsPokémon));
|
||||
if (!IsEntity)
|
||||
throw new ArgumentException(nameof(IsEntity));
|
||||
|
||||
// we'll just generate something as close as we can, since we must return something!
|
||||
var pk = new PB7();
|
||||
|
|
|
@ -267,7 +267,7 @@ namespace PKHeX.Core
|
|||
public override int OT_Gender { get => Data[0x84] & 1; set => Data[0x84] = (byte)((Data[0x84] & ~0x1) | (value & 1)); }
|
||||
public override GroundTileType GroundTile { get => (GroundTileType)Data[0x85]; set => Data[0x85] = (byte)value; }
|
||||
public override byte BallHGSS { get => Data[0x86]; set => Data[0x86] = value; }
|
||||
public override byte PokéathlonStat { get => Data[0x87]; set => Data[0x87] = value; }
|
||||
public override byte PokeathlonStat { get => Data[0x87]; set => Data[0x87] = value; }
|
||||
#endregion
|
||||
|
||||
// Not stored
|
||||
|
|
|
@ -257,7 +257,7 @@ namespace PKHeX.Core
|
|||
public override int OT_Gender { get => Data[0x84] >> 7; set => Data[0x84] = (byte)((Data[0x84] & ~0x80) | value << 7); }
|
||||
public override GroundTileType GroundTile { get => (GroundTileType)Data[0x85]; set => Data[0x85] = (byte)value; }
|
||||
public override byte BallHGSS { get => Data[0x86]; set => Data[0x86] = value; }
|
||||
public override byte PokéathlonStat { get => Data[0x87]; set => Data[0x87] = value; }
|
||||
public override byte PokeathlonStat { get => Data[0x87]; set => Data[0x87] = value; }
|
||||
#endregion
|
||||
|
||||
#region Battle Stats
|
||||
|
|
|
@ -183,7 +183,7 @@ namespace PKHeX.Core
|
|||
public override int Form { get => Data[0x40] >> 3; set => Data[0x40] = (byte)((Data[0x40] & 0x07) | (value << 3)); }
|
||||
public override int Nature { get => Data[0x41]; set => Data[0x41] = (byte)value; }
|
||||
public bool HiddenAbility { get => (Data[0x42] & 1) == 1; set => Data[0x42] = (byte)((Data[0x42] & ~0x01) | (value ? 1 : 0)); }
|
||||
public bool NPokémon { get => (Data[0x42] & 2) == 2; set => Data[0x42] = (byte)((Data[0x42] & ~0x02) | (value ? 2 : 0)); }
|
||||
public bool NSparkle { get => (Data[0x42] & 2) == 2; set => Data[0x42] = (byte)((Data[0x42] & ~0x02) | (value ? 2 : 0)); }
|
||||
// 0x43-0x47 Unused
|
||||
#endregion
|
||||
|
||||
|
|
|
@ -174,7 +174,7 @@ namespace PKHeX.Core
|
|||
public abstract GroundTileType GroundTile { get; set; }
|
||||
public abstract byte BallDPPt { get; set; }
|
||||
public abstract byte BallHGSS { get; set; }
|
||||
public abstract byte PokéathlonStat { get; set; }
|
||||
public abstract byte PokeathlonStat { get; set; }
|
||||
public override int MarkingCount => 6;
|
||||
|
||||
public override int GetMarking(int index)
|
||||
|
@ -352,7 +352,7 @@ namespace PKHeX.Core
|
|||
BallDPPt = BallDPPt,
|
||||
BallHGSS = BallHGSS,
|
||||
GroundTile = GroundTile,
|
||||
PokéathlonStat = PokéathlonStat,
|
||||
PokeathlonStat = PokeathlonStat,
|
||||
FatefulEncounter = FatefulEncounter,
|
||||
|
||||
Met_Level = Met_Level,
|
||||
|
|
|
@ -240,7 +240,7 @@ namespace PKHeX.Core
|
|||
|
||||
public const uint KVolumeBackgroundMusic = 0xF8154AC9; // U32 0-10
|
||||
public const uint KVolumeSoundEffects = 0x62F05895; // U32 0-10
|
||||
public const uint KVolumePokémonCries = 0x1D482A63; // U32 0-10
|
||||
public const uint KVolumePokemonCries = 0x1D482A63; // U32 0-10
|
||||
|
||||
public const uint KRecordCramorantRobo = 0xB9C0ECFC; // cormorant_robo (Cram-o-matic uses)
|
||||
public const uint KRecordBattleVersion = 0x7A9EF7D9; // battle_rom_mark (Past-gen Pokémon reset for battling in Ranked)
|
||||
|
|
|
@ -220,7 +220,7 @@ namespace PKHeX.Core
|
|||
{
|
||||
1 => "Unused1",
|
||||
2 => "Unused2",
|
||||
3 => "Poké_Cup",
|
||||
3 => "Poke_Cup",
|
||||
_ => ((Stadium1TeamType)type).ToString(),
|
||||
};
|
||||
}
|
||||
|
|
|
@ -205,7 +205,7 @@ namespace PKHeX.Core
|
|||
{
|
||||
Anything_Goes = 0,
|
||||
Little_Cup = 1,
|
||||
Poké_Cup = 2,
|
||||
Poke_Cup = 2,
|
||||
Prime_Cup = 3,
|
||||
GymLeader_Castle = 4,
|
||||
Vs_Rival = 5,
|
||||
|
|
|
@ -353,10 +353,10 @@ namespace PKHeX.Core
|
|||
Shirt_and_Tie_Gray,
|
||||
Shirt_and_Tie_Green,
|
||||
Shirt_and_Tie_Blue,
|
||||
Poké_Ball_Baby_Doll_Tee_Aqua,
|
||||
Poké_Ball_Baby_Doll_Tee_Purple,
|
||||
Poké_Ball_Baby_Doll_Tee_Yellow,
|
||||
Poké_Ball_Baby_Doll_Tee_Green,
|
||||
Poke_Ball_Baby_Doll_Tee_Aqua,
|
||||
Poke_Ball_Baby_Doll_Tee_Purple,
|
||||
Poke_Ball_Baby_Doll_Tee_Yellow,
|
||||
Poke_Ball_Baby_Doll_Tee_Green,
|
||||
}
|
||||
|
||||
public enum F6Socks
|
||||
|
|
|
@ -77,7 +77,7 @@
|
|||
Maxie = 72,
|
||||
Archie = 73,
|
||||
|
||||
Pokémon_Center = 0x80,
|
||||
Pokemon_Center = 0x80,
|
||||
Gift = 0x81,
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,16 +1,15 @@
|
|||
namespace PKHeX.Core
|
||||
namespace PKHeX.Core;
|
||||
|
||||
public enum MenuOrderOption : uint
|
||||
{
|
||||
public enum MenuOrderOption : uint
|
||||
{
|
||||
Pokédex = 0x00,
|
||||
Pokémon = 0x01,
|
||||
Bag = 0x02,
|
||||
League_Card = 0x03,
|
||||
Save = 0x04,
|
||||
Town_Map = 0x05,
|
||||
Pokémon_Camp = 0x06,
|
||||
Mystery_Gift = 0x07,
|
||||
VS = 0x08,
|
||||
Options = 0x09,
|
||||
}
|
||||
Pokedex = 0x00,
|
||||
Pokemon = 0x01,
|
||||
Bag = 0x02,
|
||||
League_Card = 0x03,
|
||||
Save = 0x04,
|
||||
Town_Map = 0x05,
|
||||
Pokemon_Camp = 0x06,
|
||||
Mystery_Gift = 0x07,
|
||||
VS = 0x08,
|
||||
Options = 0x09,
|
||||
}
|
||||
|
|
|
@ -198,7 +198,7 @@ namespace PKHeX.Core
|
|||
case PKM pk:
|
||||
yield return pk;
|
||||
break;
|
||||
case MysteryGift {IsPokémon: true} g:
|
||||
case MysteryGift {IsEntity: true} g:
|
||||
yield return g.ConvertToPKM(sav);
|
||||
break;
|
||||
case GP1 g when g.Species != 0:
|
||||
|
|
|
@ -26,7 +26,7 @@ public static class MysteryGiftSpriteUtil
|
|||
{
|
||||
if (gift.IsEgg && gift.Species == (int)Species.Manaphy) // Manaphy Egg
|
||||
return SpriteUtil.GetMysteryGiftPreviewPoke(gift);
|
||||
if (gift.IsPokémon)
|
||||
if (gift.IsEntity)
|
||||
return SpriteUtil.GetMysteryGiftPreviewPoke(gift);
|
||||
|
||||
if (gift.IsItem)
|
||||
|
|
|
@ -16,7 +16,7 @@ namespace PKHeX.WinForms.Controls
|
|||
LoadMisc4(pk5);
|
||||
CB_GroundTile.SelectedValue = pk5.Gen4 ? (int)pk5.GroundTile : 0;
|
||||
CB_GroundTile.Visible = Label_GroundTile.Visible = pk5.Gen4;
|
||||
CHK_NSparkle.Checked = pk5.NPokémon;
|
||||
CHK_NSparkle.Checked = pk5.NSparkle;
|
||||
|
||||
if (HaX)
|
||||
DEV_Ability.SelectedValue = pk5.Ability;
|
||||
|
@ -40,7 +40,7 @@ namespace PKHeX.WinForms.Controls
|
|||
SaveMisc4(pk5);
|
||||
|
||||
pk5.GroundTile = (GroundTileType)WinFormsUtil.GetIndex(CB_GroundTile);
|
||||
pk5.NPokémon = CHK_NSparkle.Checked;
|
||||
pk5.NSparkle = CHK_NSparkle.Checked;
|
||||
if (!HaX) // specify via extra 0x42 instead
|
||||
pk5.HiddenAbility = CB_Ability.SelectedIndex > 1; // not 0 or 1
|
||||
|
||||
|
|
|
@ -626,7 +626,7 @@ namespace PKHeX.WinForms
|
|||
|
||||
private bool OpenMysteryGift(MysteryGift tg, string path)
|
||||
{
|
||||
if (!tg.IsPokémon)
|
||||
if (!tg.IsEntity)
|
||||
{
|
||||
WinFormsUtil.Alert(MsgPKMMysteryGiftFail, path);
|
||||
return true;
|
||||
|
|
Loading…
Reference in a new issue