Commit graph

3724 commits

Author SHA1 Message Date
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
javierhimura
813e68e0d6 Reverted base egg moves deletion from parseMovesRegular when pokemon was an egg but adapted to check that moves after all the normal moves and before egg moves, also checking if base egg moves are non tradeback moves 2017-03-26 17:20:55 +02:00
javierhimura
62b6f2c98d Base egg moves are not only moves from hatched level ( 5 in gen 2 and 3, 1 in gen 4 and 5)
Included level up moves learned above hatched level that can be inherited from parents, unlike base egg moves this moves are optional
Added to eggs machine moves and crytal tutor moves, it can be inherited too
2017-03-26 17:07:36 +02:00
javierhimura
ff6b6c5026 Base Egg Moves is not needed anymore in parseMovesRegular because if the pokemon is inside an egg base moves are already checked in verifyMovesEggPreRelearn, if the pokemon was an egg base egg moves are already included in level up moves 2017-03-26 15:46:25 +02:00
javierhimura
53984c1807 Verify egg moves from gen 2 to 5 pokemon inside egg with a algorithm similar to verify relearn moves.
Egg moves should have fist the base egg moves and after that inherited egg moves, with base egg moves present if there are less that 4 egg moves.
Also for special eggs like gift and events every special moves should be present after base egg moves but should not have any egg move that are not included in the special moves list
2017-03-26 15:39:09 +02:00
javierhimura
8e703e17fb Clean FutureGenMoves for format 1 and 2 2017-03-26 15:09:41 +02:00
wwwwwwzx
53635c9450 Remove duplicated swarms table 2017-03-26 06:02:18 -07:00
wwwwwwzx
21dd24638c Fix generations category 2017-03-26 05:02:04 -07:00
wwwwwwzx
270807b04c Fix sound slots level 2017-03-26 04:14:00 -07:00
wwwwwwzx
f3fd36a9de Add Spiritomb encounter (dppt)
Bulbapedia forgot you..
2017-03-26 03:01:42 -07:00
wwwwwwzx
7ebdaf3098 Fix hgss sound slots species reading
2 bytes is enough for species ID
for hgss the species ID are stored every 2 bytes instead of 4
bytes(dppt)
2017-03-26 02:43:11 -07:00
wwwwwwzx
1edde07418 Add GameVersion compare method
Recognize game grouping in encounter tables (DP as D or P, for example)
Also for future use.
2017-03-26 02:39:13 -07:00
Kurt
6a0d824b31 Add trophy garden encounters (dppt)
Refactor addExtraTableSlots to instead combine encounter tables
slightly faster due to not repeating the where comparison and over
multiple calls

select all tables from array -> group by location -> combine slots if
many tables -> return combined array

fixes transferred 4->5 event met level check
2017-03-26 01:25:21 -07:00
Kurt
6bea46ced3 Fix bad evo tree not creating move arrays 2017-03-25 22:23:54 -07:00
Kurt
d8bc2154ba Fix dppt slot species reading
Offset re-read the level value; now we just read the byte for level
(always 0-100) and the species is 4 bytes afterwards
2017-03-25 22:23:36 -07:00
Kurt
7d45b5c4fb Fix levelup egg pre-relearnmove check
Closes #991
2017-03-25 19:57:41 -07:00
Kurt
159ccba8b3 Merge pull request #992 from wwwwwwzx/master
Minor legality string translation fix
2017-03-25 18:35:41 -07:00
wwwwwwzx
8059b6a327 Fix chinese translation
Go over the translation to make it more native and reasonable
2017-03-25 18:17:38 -07:00
wwwwwwzx
1ba78d98b9 Translate all lines of legality report
The string before move haven't been translated
2017-03-25 18:15:28 -07:00
Kurt
805cedcea3 Add CheckIdentifier tostring method
Closes #984
2017-03-25 16:38:40 -07:00
Kurt
ed40cdae64 Misc tweaks
int[][] to List<int> to reduce ToArray() overhead as adding range is
quicker
remove multiple use of ienumerable by calling tolist()
2017-03-25 13:53:33 -07:00
Kurt
aa25d10e53 Misc matching fixes
Transferred 4->5 event met level
Add fateful encounter flags for gen3 encounters
gen5 legendary trio met locations
2017-03-25 12:26:19 -07:00
Kurt
9def544029 Merge pull request #990 from javierhimura/master
Crossgen Moves legal analysis and pokemon box encounter
2017-03-25 12:26:04 -07:00
javierhimura
b5a8a53320 Fix RemoveFutureMoves for VC and GB games 2017-03-25 19:49:34 +01:00
javierhimura
f0b2294e3c Add pokemon box static encounters
Fix gen 3 met egg location to allow 255 (pokemon box) and 253 (in game egg)
2017-03-25 19:02:33 +01:00
javierhimura
5adb2dac22 Adapted base egg moves to new parsemoves format 2017-03-25 18:32:05 +01:00
javierhimura
66a9f8901c Merge branch 'kwsch'
# Conflicts:
#	PKHeX/Legality/Checks.cs
#	PKHeX/PKM/PKM.cs
2017-03-25 18:24:56 +01:00
javierhimura
81217799fe Fix parseMoves and RemoveFutureMoves functions 2017-03-25 18:19:38 +01:00
Kurt
46e7e06326 Fix pumpkaboo average size safari check
Closes #989
2017-03-25 10:18:38 -07:00
javierhimura
69d562685c Gen 2 get moves, returns crystal egg moves by default when origin can not be determined
return gold/silver egg moves in the cases when origin can be proven is not from crystal
2017-03-25 18:14:57 +01:00
wwwwwwzx
d828b72e3e Add PokeWalker encounters (#988)
* Add PokeWalker encounters

* Change PokeWalker location marking method

move `gift = true` out of PokeWalker table
move the combining of EncounterStatic tables into function
`getStaticEncounters`

* Cleanup

Add zeros before move indexes & align the entry
Remove unused chinese translation string
2017-03-25 10:13:02 -07:00
javierhimura
8d4ad80949 Gen 2 WasEgg fix 2017-03-25 18:12:48 +01:00
javierhimura
82b200681e Cross generation check moves 2017-03-25 16:41:45 +01:00
javierhimura
2fd67b98ca Add getValidMovesAllGens to return the valid moves list from every valid generation from a pokemon instead of one list with all generations mixed, for crossgen legal analysis 2017-03-25 13:27:42 +01:00
javierhimura
007105b852 Add optional paramter in functions getMoves and getValidmoves to not remove HM moves on transfer from gen 3 and 4 to next 4 and 5 2017-03-25 13:26:33 +01:00
Kurt
d09b0ba345 marill edge case 2017-03-25 00:09:26 -07:00
Kurt
13965d2766 gender check update
check gender correctly for transferred species
2017-03-25 00:01:02 -07:00
Kurt
047d7a0ae5 Add more event recognition
Transferred events 4->5+ now recognized (met location checks for
transfer value)
Re-mapped gen3 AbilityNumber to gen6 style (1/2/4)
Add gen3 egg hatch location suggestion, gen3/4 met level
2017-03-24 22:41:45 -07:00
Kurt
d7dac3b266 Fix egg move check for 3-5
Inherited levelup moves now properly checked
adds gen5 levelup cases

updates nickname check for all caps nicknames
2017-03-24 19:24:01 -07:00