Kurt
ef79b45347
Merge pull request #1002 from javierhimura/master
...
Fix issue #1001 Better approach for verifyEncounterG3Transfer function
2017-03-27 12:25:33 -07:00
javierhimura
56eaaf2299
Mew and Deoxys correction
2017-03-27 21:20:54 +02:00
javierhimura
a3fcb31530
Fix issue #1001
...
Changed verifyEncounterG3Transfer, when both Egg Result and other Result happens Egg only overwrite if is the only valid encounter
Corrections in verifyEncounterG3Transfer also adding code to check gen 3 WasEvent pokemon, but for now it will return Mistery Gift not found
Changed verifyEncounterG3Transfer and verifyEncounterG4Transfer to return both message error for InvalidTransfer and G3/G4 invalid encounter if both errors happen at the same time
Excluded fateful encounter pokemon from getWasEgg23, it can be WasEgg pokemon because FatefulEncounter from eggs is lost when hatch
2017-03-27 21:10:30 +02:00
Kurt
f86ad4ed0e
Merge pull request #1000 from wwwwwwzx/master
...
Misc gen4 legality database update
2017-03-26 20:47:03 -07:00
wwwwwwzx
dbab260a81
Misc fixes
...
- Add data from serebii for safari zone in hgss
- Fix several typos
- Update chinese translation
2017-03-26 20:25:17 -07:00
wwwwwwzx
543e7bab88
Add daily changing pokemon in Great Marsh (dppt)
...
add batch encounterarea generation function
2017-03-26 20:23:45 -07:00
wwwwwwzx
d0427f0322
Fix hgss swarm slots replacement
...
note that dppt only have grass swarm
2017-03-26 20:21:44 -07:00
Kurt
f014f5ed1c
Misc changes
...
remove multiple iteration of ienumerable, reduce nesting
2017-03-26 19:10:37 -07:00
Kurt
89e32b24f0
Merge pull request #998 from pokecal/pokecal-patch-2
...
Add G7BattleTree Supers Unlock
2017-03-26 19:08:09 -07:00
Kurt
5b892eb7ec
Merge pull request #997 from javierhimura/master
...
Gen3 WasEgg Pokemon in gen 4 or later, Gen 4 transfer encounter
2017-03-26 19:08:02 -07:00
pokecal
f69e4a0c81
Add G7BattleTree Supers Unlock
...
Not checked for legality(e.g.MaxStreaks)
2017-03-27 11:04:25 +09:00
javierhimura
8511c2a36d
verifyEncounterEgg Fix for Manaphy egg from gen4
2017-03-27 02:56:25 +02:00
javierhimura
22e0b0f873
Unreleased Shaymin from Diamond and Pearl
2017-03-27 01:56:38 +02:00
javierhimura
a66f106aef
Detect English faraway island mew and hall of origin arceus as invalid, they are unreleased events
2017-03-27 01:51:19 +02:00
javierhimura
f1d4bccb09
WasEvent included in PK4
2017-03-27 01:38:31 +02:00
javierhimura
4bb9e01ff9
Better approach of WasEgg functions
...
Private variable _WasEgg is only needed for pokemon from gen 2 and 3, for gen 4 return WasEgg if EggLocation > 0
A gen4 Legal.EggLocations array should be created in the future
2017-03-27 01:36:08 +02:00
javierhimura
c93acf4767
In PK6 and PK7 defer to base properties when GenNumber < 5 for WasEgg, WasTradedEgg and WasIngameTrade
2017-03-27 01:28:34 +02:00
javierhimura
ed681fa626
Crown error text
2017-03-27 01:27:10 +02:00
javierhimura
bff867ce31
Add transporter or crown location text error
2017-03-27 01:18:26 +02:00
javierhimura
8729ddf17a
Add verifyEncounterG4Transfer, is similar to gen3transfer but more simple, it just add an invalid transfer to gen 5 validation and return that if is wrong and there is no other wrong encounter result
2017-03-27 01:15:24 +02:00
javierhimura
25180a32c5
Include check of invalid transfer to gen 4/5
2017-03-27 01:00:52 +02:00
javierhimura
6d8d6b7758
Ignore NonEgg Encounter for gen 3 illegal transfer unhatched eggs
2017-03-27 00:48:50 +02:00
javierhimura
7f21973038
verifyEncounterG3Transfer function
...
For gen 3 transfer pokemon it checks the non egg possible encounter and if the pokemon could have been hatched egg encounter
Return the result from one of the two encounters that is valid, with non egg preference but marking WasEgg a True if it can be from an egg
In verify moves both possible encounters are considered, there is no way to discart one or another
2017-03-27 00:37:56 +02:00
javierhimura
286c8524d5
Merge remote-tracking branch 'remotes/kwsch/master'
2017-03-27 00:12:12 +02:00
javierhimura
c704fe5625
If pokemon is transfer from gen 3 to 4 or latter and it can be from an egg (pokeball 4, level and met level above 5, etc) check always for an egg encounter first, if does not match egg encounter then check other encounters
...
When verify moves for this pokemon it here is a non egg possible encounter first check moves from that encounter and if does not match check egg encounters
Also for gen 2 unhatched eggs ignore gen 1 encounters
2017-03-27 00:11:09 +02:00
Kurt
a3408b37f1
Merge pull request #996 from javierhimura/master
...
Gen 3 and 4 Safari Zones and Bug Contest Encounters
2017-03-26 14:44:02 -07:00
javierhimura
98fd09b653
Gen 4 Bug Contest source link was incorrect
2017-03-26 23:21:04 +02:00
javierhimura
14a42b5dc4
Merge remote-tracking branch 'remotes/kwsch/master'
2017-03-26 23:17:39 +02:00
javierhimura
cc994c7e7d
Fix for pokemon with encounters in both safari zone and bug contest
2017-03-26 23:15:17 +02:00
Kurt
d17c92c2a8
Merge pull request #995 from pokecal/pokecal-patch-2
...
Add controls of G7Stamp,BallThrow
2017-03-26 14:12:02 -07:00
javierhimura
406d267ba6
Fix Magikarp rockey beach safari encounter
2017-03-26 23:10:49 +02:00
javierhimura
a12979ed41
Mark G3 and G4 Safari Slots
2017-03-26 22:46:05 +02:00
javierhimura
2f2014cdde
Check safari ball and sport ball legality in encounters when met location is lost
2017-03-26 22:23:57 +02:00
pokecal
dce4b839b1
Add controls of G7Stamp,BallThrow
...
Some function has already included in SAV7, but no controls?
Add function about BallThrow Flags.
2017-03-27 04:50:38 +09:00
javierhimura
e952b8f435
Check valid ball for Safari Zone and Bug Contest
2017-03-26 21:44:56 +02:00
javierhimura
5371a51c43
HG SS Bug Contest Encounters
...
Safari Zone locations
2017-03-26 21:33:32 +02:00
javierhimura
082d87f5d0
HG SS Safari Zone encounters, extracted from Bulbapedia
...
Commented encounters with unknown levels
2017-03-26 21:11:00 +02:00
Kurt
a1e477606e
Merge pull request #993 from wwwwwwzx/master
...
Fix gen4 encounters reading
2017-03-26 11:08:23 -07:00
Kurt
c42355b7bf
Merge branch 'master' into master
2017-03-26 11:08:05 -07:00
Kurt
5b9e390909
Merge pull request #994 from javierhimura/master
...
Pre relearn egg moves analysis improved
2017-03-26 11:06:16 -07:00
javierhimura
d85f2444fc
Revert "The last commit was reverted because the change should not apply to base moves from was egg pokemon, unlike egg moves base level moves are not equal among all generations."
...
Pokemon crystal does not store egg received location like generation 3 games, that means both crystal and gold/silver should be checked for base egg moves always
2017-03-26 19:17:30 +02:00
javierhimura
d9d138d2a5
Fix getBaseGamesIsEgg, there is some cases when crystal origin can be discarted
2017-03-26 18:47:26 +02:00
javierhimura
ca63bf2e51
Names changed to avoid confusions
2017-03-26 18:45:01 +02:00
javierhimura
59750b8cfe
The last commit was reverted because the change should not apply to base moves from was egg pokemon, unlike egg moves base level moves are not equal among all generations.
...
Also for generation 2 check if pokemon have crystal location for the was egg base moves
2017-03-26 18:42:20 +02:00
javierhimura
b950879065
Revert "There is no need to check egg moves both times for gold/silver and crystal, gold/silver egg moves is a subset of crystal egg moves, every legal combination from g/s is also a legal combination in crystal"
...
This reverts commit 620df347f0
2017-03-26 18:37:17 +02:00
javierhimura
620df347f0
There is no need to check egg moves both times for gold/silver and crystal, gold/silver egg moves is a subset of crystal egg moves, every legal combination from g/s is also a legal combination in crystal
2017-03-26 18:29:50 +02:00
javierhimura
aecd3f9738
Fix error loading save from gen 2 when pokeball does not have elements
2017-03-26 18:24:02 +02:00
javierhimura
d7156f1f42
Fix smeargle check, should be after verifyMovesIsEggPreRelearn but before verifyMovesWasEggPreRelearn
2017-03-26 18:14:15 +02:00
javierhimura
c4433d4436
Missing strings from new legality errors
2017-03-26 18:06:30 +02:00
javierhimura
e9befeae3f
Fix for special moves with invalid move list order
...
Fix for minum level for gen 3 pokemon met as egg
Temporal fix for pokemon box encounters
2017-03-26 18:05:58 +02:00
