Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-05-05 21:17:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean

Browse Source
This commit is contained in:
Kurt 2020-02-15 14:29:23 -08:00
parent 5e65df6758
commit 0d4cff81c6
4 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PKHeX.Core/Legality/Verifiers/BallVerifier.cs
View File

@ -343,9 +343,7 @@ public static bool IsGalarCapture(int species)
if ((int)Species.Dracozolt <= species && species <= (int)Species.Arctovish) // fossil
return false;
var pt = PersonalTable.SWSH;
if (((PersonalInfoSWSH) pt.GetFormeEntry(species, 0)).PokeDexIndex != 0)
return true;
return false;
return ((PersonalInfoSWSH)pt.GetFormeEntry(species, 0)).PokeDexIndex != 0;
}
private CheckResult VerifyBallEquals(LegalityAnalysis data, int ball) => GetResult(ball == data.pkm.Ball);

1
PKHeX.Core/Legality/Verifiers/MiscVerifier.cs
View File

@ -317,7 +317,6 @@ private static bool IsCloseEnough(float a, float b)
return Math.Abs(ia - ib) <= 7;
}
private static readonly int[] tradeEvo7b = { 064, 067, 075, 093 };
private static bool IsStarter(PKM pb7) => (pb7.Species == (int)Species.Pikachu && pb7.AltForm == 8) || (pb7.Species == (int)Species.Eevee && pb7.AltForm == 1);
private void VerifySWSHStats(LegalityAnalysis data, PK8 pk8)

2
PKHeX.Core/Saves/Substructures/Gen5/BattleSubway5.cs
View File

@ -93,6 +93,7 @@ public int SuperDoubleRecord
get => BitConverter.ToUInt16(Data, Offset + 0x26);
set => BitConverter.GetBytes((ushort)value).CopyTo(Data, Offset + 0x26);
}
public int SuperMultiNPCPast
{
get => BitConverter.ToUInt16(Data, Offset + 0x16);
@ -104,6 +105,7 @@ public int SuperMultiNPCRecord
get => BitConverter.ToUInt16(Data, Offset + 0x28);
set => BitConverter.GetBytes((ushort)value).CopyTo(Data, Offset + 0x28);
}
public int SuperMultiFriendsPast
{
get => BitConverter.ToUInt16(Data, Offset + 0x18);

8
PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Misc5.cs
View File

@ -40,7 +40,7 @@ private void B_Save_Click(object sender, EventArgs e)
Origin.CopyChangesFrom(SAV);
Close();
}
private ComboBox[] cbr;
private int ofsFly;
private int[] FlyDestC;
@ -722,10 +722,9 @@ private void SetForms(EntreeSlot slot)
private void ReadSubway()
{
sw = SAV.BattleSubway;
int swSuperCheck;
// Figure out the Super Checks
swSuperCheck = sw.SuperCheck;
var swSuperCheck = sw.SuperCheck;
if (swSuperCheck == 0x00)
{
CHK_SuperSingle.Checked = CHK_SuperDouble.Checked = CHK_SuperMulti.Checked = false;
@ -783,7 +782,6 @@ private void ReadSubway()
// Multi Friends
NUD_SMultiFriendsPast.Value = sw.SuperMultiFriendsPast;
NUD_SMultiFriendsRecord.Value = sw.SuperMultiFriendsRecord;
}
private void SaveSubway()
@ -824,8 +822,6 @@ private void SaveSubway()
// Multi Friends
sw.SuperMultiFriendsPast = (int)NUD_SMultiFriendsPast.Value;
sw.SuperMultiFriendsRecord = (int)NUD_SMultiFriendsRecord.Value;
}
}
}