Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2025-02-17 05:48:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revise gen6/7 HA banlist to account for altforms

Browse source
This commit is contained in:
Kurt 2020-10-09 20:04:09 -07:00
parent 20bb2c6a49
commit 6b1fff05bd
2 changed files with 35 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
PKHeX.Core/Legality/Tables/Tables6.cs
View file

@ -279,19 +279,19 @@ namespace PKHeX.Core
internal static readonly HashSet<int> Ban_NoHidden6 = new HashSet<int>
{
//Not avaliable at Friend Safari or Horde Encounter
669 + (2 << 11), //Flabébé-Orange
670 + (2 << 11), //Floette-Orange
671 + (2 << 11), //Florges-Orange
669 + (4 << 11), //Flabébé-White
670 + (4 << 11), //Floette-White
671 + (4 << 11), //Florges-White
// Not available at Friend Safari or Horde Encounter
(int)Species.Flabébé + (2 << 11), // Orange
(int)Species.Floette + (2 << 11), // Orange
(int)Species.Florges + (2 << 11), // Orange
(int)Species.Flabébé + (4 << 11), // White
(int)Species.Floette + (4 << 11), // White
(int)Species.Florges + (4 << 11), // White
710 + (1 << 11), //Pumpkaboo-Small
711 + (1 << 11), //Gourgeist-Small
710 + (2 << 11), //Pumpkaboo-Large
711 + (2 << 11), //Gourgeist-Large
//Super Size can be obtained as a Pumpkaboo from event distributions
// Super Size can be obtained as a Pumpkaboo from event distributions
(int)Species.Pumpkaboo + (1 << 11), // Small
(int)Species.Gourgeist + (1 << 11), // Small
(int)Species.Pumpkaboo + (2 << 11), // Large
(int)Species.Gourgeist + (2 << 11), // Large
// Same abilities (1/2/H), not available as H
(int)Species.Honedge,
@ -310,7 +310,18 @@ namespace PKHeX.Core
(int)Species.Castform,
(int)Species.Furfrou,
(int)Species.Furfrou,
(int)Species.Furfrou + (1 << 11),
(int)Species.Furfrou + (2 << 11),
(int)Species.Furfrou + (3 << 11),
(int)Species.Furfrou + (4 << 11),
(int)Species.Furfrou + (5 << 11),
(int)Species.Furfrou + (6 << 11),
(int)Species.Furfrou + (7 << 11),
(int)Species.Furfrou + (8 << 11),
(int)Species.Furfrou + (9 << 11),
};
#region Ball Table
internal static readonly HashSet<int> Inherit_Sport = new HashSet<int>
{

18
PKHeX.Core/Legality/Tables/Tables7.cs
View file

@ -557,13 +557,19 @@ namespace PKHeX.Core
(int)Species.Komala,
// No Encounter
774, // Minior
(int)Species.Minior + (07 << 11),
(int)Species.Minior + (08 << 11),
(int)Species.Minior + (09 << 11),
(int)Species.Minior + (10 << 11),
(int)Species.Minior + (11 << 11),
(int)Species.Minior + (12 << 11),
(int)Species.Minior + (13 << 11),
// Pre-Gen
710 + (1 << 11), //Pumpkaboo-Small
711 + (1 << 11), //Gourgeist-Small
710 + (2 << 11), //Pumpkaboo-Large
711 + (2 << 11), //Gourgeist-Large
// Previous-Gen
(int)Species.Pumpkaboo + (1 << 11), // Small
(int)Species.Gourgeist + (1 << 11), // Small
(int)Species.Pumpkaboo + (2 << 11), // Large
(int)Species.Gourgeist + (2 << 11), // Large
// Same abilities (1/2/H), not available as H
(int)Species.Honedge,