Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-09-07 23:08:47 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1093 from javierhimura/master

Browse Source 
Fix Encounter Type checks
This commit is contained in:
Kurt
2017-04-24 12:26:46 -07:00
committed by GitHub
parent 7a508590a3 4d9cd1cfc2
commit e0dc6bce47
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
PKHeX/Legality/Core.cs
View File

@@ -326,7 +326,8 @@ private static EncounterType GetEncounterTypeBySlotHGSS(SlotType Type, Encounter
{
// HGSS Safari encounters have normal water/grass encounter type, not safari encounter type
case SlotType.Grass:
case SlotType.Grass_Safari: return GrassType;
case SlotType.Grass_Safari:
case SlotType.BugContest: return GrassType;
case SlotType.Surf:
case SlotType.Old_Rod:
case SlotType.Good_Rod:
@@ -671,12 +672,12 @@ private static EncounterArea[] getTables2(GameVersion Version)
SlotsHG = addExtraTableSlots(HG_Slots, HG_Headbutt_Slots, SlotsHGSSAlt);
SlotsSS = addExtraTableSlots(SS_Slots, SS_Headbutt_Slots, SlotsHGSSAlt);
MarkDPPtEncounterTypeSlots(ref D_Slots);
MarkDPPtEncounterTypeSlots(ref P_Slots);
MarkDPPtEncounterTypeSlots(ref Pt_Slots);
MarkHGSSEncounterTypeSlots(ref HG_Slots);
MarkHGSSEncounterTypeSlots(ref SS_Slots);
MarkDPPtEncounterTypeSlots(ref SlotsD);
MarkDPPtEncounterTypeSlots(ref SlotsP);
MarkDPPtEncounterTypeSlots(ref SlotsPt);
MarkHGSSEncounterTypeSlots(ref SlotsHG);
MarkHGSSEncounterTypeSlots(ref SlotsSS);
Evolves4 = new EvolutionTree(new[] { Resources.evos_g4 }, GameVersion.DP, PersonalTable.DP, MaxSpeciesID_4);
// Update Personal Entries with Tutor Data

1
PKHeX/Legality/Tables4.cs
View File

@@ -232,6 +232,7 @@ public static partial class Legal
209, // Ruins of Alph
210, // Union Cave
211, // SLOWPOKE Well
214, // Ilex Forest
216, // Mt. Mortar
217, // Ice Path
218, // Whirl Islands