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

Merge branch 'master' of https://github.com/kwsch/PKHeX

Browse source
This commit is contained in:
Kurt 2018-11-01 15:20:45 -07:00
commit b53cc1b7f8
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
PKHeX.Core/Legality/Encounters/Data/Encounters3Shadow.cs
View file

@ -678,8 +678,8 @@
Species = 125, // Electabuzz
Locks = new[] {
new NPCLock(277), // Shadow Swellow
new NPCLock(065, 12, 0, 063), // Alakazam (M) (Serious)
new NPCLock(230, 18, 1, 127), // Kingdra (F) (Bashful)
new NPCLock(065, 24, 0, 063), // Alakazam (M) (Serious)
new NPCLock(230, 6, 1, 127), // Kingdra (F) (Bashful)
new NPCLock(214, 18, 1, 127), // Heracross (F) (Bashful)
}};
@ -688,8 +688,8 @@
Comment = "Swellow Seen",
Locks = new[] {
new NPCLock(277, true), // Shadow Swellow (Seen)
new NPCLock(065, 12, 0, 063), // Alakazam (M) (Serious)
new NPCLock(230, 18, 1, 127), // Kingdra (F) (Bashful)
new NPCLock(065, 24, 0, 063), // Alakazam (M) (Serious)
new NPCLock(230, 6, 1, 127), // Kingdra (F) (Bashful)
new NPCLock(214, 18, 1, 127), // Heracross (F) (Bashful)
}};

2
README.md
View file

@ -17,7 +17,7 @@ The interface can be translated with resource/external text files so that differ
Pokémon Showdown sets and QR codes can be imported/exported to assist in sharing.
Nintendo 3DS savedata containers use an AES MAC that cannot be emulated without the 3DS's keys, thus a resigning service is required ([Checkpoint](https://github.com/BernardoGiordano/Checkpoint/), save_manager, [JKSM](https://github.com/J-D-K/JKSM), or SaveDataFiler).
Nintendo 3DS savedata containers use an AES MAC that cannot be emulated without the 3DS's keys, thus a resigning service is required ([Checkpoint](https://github.com/FlagBrew/Checkpoint), save_manager, [JKSM](https://github.com/J-D-K/JKSM), or SaveDataFiler).
**We do not support or condone cheating at the expense of others. Do not use significantly hacked Pokémon in battle or in trades with those who are unaware hacked Pokémon are in use.**