Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-23 12:33:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Misc table fixes (#963)

Browse source 
* FIx hgss encounter table

- fix roaming location mixup
- uncomment Unown A

* Fix dppt roaming locations

- roaming pkm can be met on water in dppt
- can not go to route 223 224 and northwest island 225-230
- Add 2 non-route location

* Fix FRLG roaming locations

it's also possible to encounter on water

* Fix unable to save uncheck seen&caught states

* Revert unown
This commit is contained in:
wwwwwwzx 2017-03-21 08:57:10 -07:00 committed by Kurt
parent 6f7c8e73a0
commit e08d831ce5
3 changed files with 14 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
PKHeX/Legality/Tables3.cs
View file

@ -187,32 +187,10 @@ namespace PKHeX.Core
internal static readonly int[] Roaming_MetLocation_FRLG =
{
// TODO: Check if roaming encounter is possible in route 21
101, // Route 1
102, // Route 2
103, // Route 3
104, // Route 4
105, // Route 5
106, // Route 6
107, // Route 7
108, // Route 8
109, // Route 9
110, // Route 10
111, // Route 11
112, // Route 12
113, // Route 13
114, // Route 14
115, // Route 15
116, // Route 16
117, // Route 17
118, // Route 18
// Routes 19 and 20 only have surf encounters
121, // Route 21 Grass encounter in water route
122, // Route 22
123, // Route 23
124, // Route 24
125, // Route 25
// Kanto route 26 does not exits in gen 3
//Route 1-25 encounter is possible either in grass or on water
101,102,103,104,105,106,107,108,109,110,
111,112,113,114,115,116,117,118,119,120,
121,122,123,124,125
};
internal static readonly int[] Roaming_MetLocation_RSE =

14
PKHeX/Legality/Tables4.cs
View file

@ -238,10 +238,12 @@ namespace PKHeX.Core
internal static readonly int[] Roaming_MetLocation_DPPt =
{
// Route 201-230
// Route 201-222 can be encountered in either grass or water
16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
26, 27, 28, 29, 30, 31, 32, 33,
36, 37, 39, 40, 41, 42, 43, 44, 45, // Route 219,220,223 surfing only
26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
36, 37,
47, // Valley Windworks
49, // Fuego Ironworks
};
internal static readonly EncounterStatic[] Encounter_DPPt_Roam =
{
@ -393,7 +395,7 @@ namespace PKHeX.Core
internal static readonly EncounterStatic[] Encounter_HGSS = Encounter_HGSS_KantoRoam.SelectMany(e => e.Clone(Roaming_MetLocation_HGSS_Kanto)).Concat(
Encounter_HGSS_JohtoRoam.SelectMany(e => e.Clone(Roaming_MetLocation_HGSS_Johto))).Concat(
Encounter_DPPt_Regular).ToArray();
Encounter_HGSS_Regular).ToArray();
internal static readonly EncounterTrade[] TradeGift_DPPt =
{
@ -440,7 +442,7 @@ namespace PKHeX.Core
Location = 53, //Solaceon Ruins
Slots = new[]
{
//new EncounterSlot { Species = 201, LevelMin = 14, LevelMax = 30, Type = SlotType.Grass, Form = 0 }, // Unown A
//new EncounterSlot { Species = 201, LevelMin = 14, LevelMax = 30, Type = SlotType.Grass, Form = 0 }, // Unown A Loaded from encounters raw file
new EncounterSlot { Species = 201, LevelMin = 14, LevelMax = 30, Type = SlotType.Grass, Form = 1 }, // Unown B
new EncounterSlot { Species = 201, LevelMin = 14, LevelMax = 30, Type = SlotType.Grass, Form = 2 }, // Unown C
new EncounterSlot { Species = 201, LevelMin = 14, LevelMax = 30, Type = SlotType.Grass, Form = 3 }, // Unown D
@ -476,7 +478,7 @@ namespace PKHeX.Core
Location = 209, // Ruins of Alph
Slots = new[]
{
//new EncounterSlot { Species = 201, LevelMin = 5, LevelMax = 5, Type = SlotType.Grass, Form = 0 }, // Unown A
//new EncounterSlot { Species = 201, LevelMin = 5, LevelMax = 5, Type = SlotType.Grass, Form = 0 }, // Unown A Loaded from encounters raw file
new EncounterSlot { Species = 201, LevelMin = 5, LevelMax = 5, Type = SlotType.Grass, Form = 1 }, // Unown B
new EncounterSlot { Species = 201, LevelMin = 5, LevelMax = 5, Type = SlotType.Grass, Form = 2 }, // Unown C
new EncounterSlot { Species = 201, LevelMin = 5, LevelMax = 5, Type = SlotType.Grass, Form = 3 }, // Unown D

4
PKHeX/Saves/SAV3.cs
View file

@ -514,7 +514,7 @@ namespace PKHeX.Core
{
int bit = species - 1;
int ofs = bit / 8;
int bitval = caught ? 1 << (bit&7) : 0;
int bitval = 1 << (bit&7);
int caughtOffset = BlockOfs[0] + 0x28 + ofs;
if (caught)
@ -536,7 +536,7 @@ namespace PKHeX.Core
{
int bit = species - 1;
int ofs = bit / 8;
int bitval = seen ? 1 << (bit&7) : 0;
int bitval = 1 << (bit&7);
if (seen)
{