Commit graph

3643 commits

Author SHA1 Message Date
Kurt
f00388c4ca Fix 5->6 dropping CNT_Sheen 2017-04-01 13:53:29 -07:00
Kurt
d54bb72d59 Temp fix egg detection
Egg location should be used to detect if it was an egg; encounter
matching should determine if it is a StaticEncounter gift.
2017-04-01 13:02:37 -07:00
Kurt
d800ffdf97 refactoring
Reduce nesting a little
2017-04-01 11:32:59 -07:00
javierhimura
f0e6e96435 parseMoves functions improvement (#1018)
* Add egg locations and gits egg locations for gen 4 and 5
Add WasGiftEgg property and diferenciate from WasEventEgg

* Separate parseMoves Pre Relearn and Post Relearn generations
Separte parseMoves Pre Relearn egg-encounter for non-egg encounters, a gen3 pokemon can be both
Post Relearn IsEgg pokemon should have all moves as relearn moves
parseMovesSketch should not be used for Smeargle inside an egg
WasGiftEgg should not have egg moves

* Fix WasEgg and WasEventEgg functions for Manaphy

* Add gen 5 trade egg location
Check for generation 3 IsEgg if is a gift egg or an event egg that there is a valid encounter for the egg

* Move parseMovesGetGift bellow WasEggPreRelearn. WasEggPreRelearn is already checking for gift encounters, some generation 3 pokemon could be both an egg or an event encounter

* Check for gift egg without valid encounter in verifyEncounterEgg

* Check WasEventEgg without encounter in verifyEncounterEgg
2017-04-01 09:45:13 -07:00
Kurt
7051c42078 Sync missing file
oops
2017-03-31 18:53:30 -07:00
Kurt
05c0a0bdb5 Filter GB Era only encounters if not allowed
All are encounter statics which were identified by GameVersion.SPECIAL;
rename enum value for clearer meaning and prevent these from matching if
not allowed.
2017-03-31 18:49:13 -07:00
Kurt
a1153f1004 Misc simplifications
Segregate gen4 transfer legality check from encounter detection
reorder EncounterSlot[] match test to be before EncounterStatic. Closes
#1016
Fix manaphy gift handling
2017-03-31 18:35:43 -07:00
javierhimura
f0fc473a7e Shedinja evolution moves and some egg fixes (#1015)
* Add getMoves function with min level and max level, usefull for shedjina evolves moves (min level 20) and generation 1 moves ( no move reminder, min level is min encounter level + 1)

Also for gen1 encounters another function should be created to get by the encounter level the four moves that the pokemon learn by default, the last four in its movepool up until the encounter level

* getShedinjaEvolveMoves, function that return the moves that shedinja could learn from Ninjask move pool at the moment when Nincada evolves, in the same format that getValidMovesAllGens

* Add validation in parse moves for shedinja evolve moves.
Shedinja could have any gen3/4 moves from Ninjas learnset but only one is allowed

* Shedinja evolve moves text resources

* Fix egg moves pre-gen 6 validation:
Add skipoption variable to getEggMoves function from pre-gen6 games, to verify egg moves from split breed species
Flag illegal combinations of base egg moves and special egg moves
Return crystal egg moves for gen2 pokemon that can be tradeback to gen 1 games

* Fix for mix between event egg moves and base egg moves

* Changes just to make if there is only shedinja evolve move that is also the only base egg move change it from base egg move to evolve move, to avoid flag illegal if also the pokemon have a special egg move

* Revert "Changes just to make if there is only shedinja evolve move that is also the only base egg move change it from base egg move to evolve move, to avoid flag illegal if also the pokemon have a special egg move"

Revert the last change, i search in bulbapedia an there wasn't any nincada distributed with special moves in generation 3 nor 4, making this complicated validation unnecessary

This reverts commit 57f5ac1bbb.

* Fix error
2017-03-31 17:40:30 -07:00
Kurt
5b204dfff6 Misc simplifications
only species outside of the NohatchFromEgg is manaphy; if it's a
recognized encounter it's okay. Safer to check generally than having to
update explicitly if there's a mew egg (lol)
remove HGSS check for BugContest, simpler to express as cant be
BugContest without HGSS anyway (implied)

pull out strings from trainer7 (localization cantidate), identify common
operations (getBits from ListBox), use |= instead of +=
2017-03-31 01:12:49 -07:00
Kurt
b3c5752476 Cleanup
refactor out the encounter trade screening; fixes the IV check loop (the
continue continued the for loop not the foreach).
Similar approach can be applied later for the encounterstatic checks if
it is to be converted to ienumerable (in which a secondary screen may be
necessary)
2017-03-31 00:04:29 -07:00
Kurt
5011ddca1b Merge pull request #1013 from javierhimura/master
Safari ball and sport ball checking
2017-03-30 23:29:47 -07:00
javierhimura
fcaa2d8b18 Revert unnecessary change 2017-03-31 00:14:52 +02:00
Kurt
1366e767b4 Merge pull request #1014 from pokecal/pokecal-patch-2
Add Gen7 Mega unlock
2017-03-30 14:39:20 -07:00
javierhimura
e93ebf838e Fix species in slots time replace for DPPt 2017-03-30 22:25:08 +02:00
javierhimura
9bac13ced9 Fix deoxys forms to get moves in gen3 format, there is no format info for deoxys in the gen 3 personal tables because deoxys have only 1 form available per game 2017-03-30 21:34:48 +02:00
javierhimura
78216a3b89 Fix for deoxys encounter, also was needed for any other gen 3 transfer encounters.
EncounterMatch was being overwritten, returns for gen3 the last valid encounter found
2017-03-30 21:13:38 +02:00
javierhimura
ab2d18eb8a Fix for Manaphy Egg Gen 4 event encounter
- changed trade egg location in mystery gift search
- adapted getMinLevelEncounter to take into account gen 4 eggs in gen 4 games
- remvoed manaphy for static encounters, is already included in event database
- fix no hatching for an egg check for gen 4 manaphy
2017-03-30 20:58:30 +02:00
pokecal
2f149a539d Add Gen7 Mega unlock
This checkbox just unlock the MegaButton in battle.
I have tested wildPokemon battle, not checked about InternetBattle.
2017-03-31 03:21:05 +09:00
javierhimura
70b3b22ab5 Correction in the comments 2017-03-30 13:24:38 +02:00
javierhimura
9bc7ee40d6 Safari ball and sport ball checking 2017-03-30 13:18:05 +02:00
Kurt
a692382ed2 Merge pull request #1012 from wwwwwwzx/master
General gen5 fixes
2017-03-30 00:34:00 -07:00
wwwwwwzx
dc079050c4 General gen5 fixes
- begin to impl ball checking
- add white forest for white (move greatmarshalt to table4)
- fix several datapoints
- fix ability from dream world
- add in-game version filtering
2017-03-29 23:31:02 -07:00
Kurt
288aee8c3b performance tweak
only do the flicker hack if the combobox is actually visible
delay form appearing until initial files are loaded
2017-03-29 22:23:18 -07:00
Kurt
f2c072bc8a Fix gen2 slot set
Fixes #1007
Closes #1008 with a slightly different implementation of the validation
check; other fixes for legality incorporated. Thanks @javierhimura !

Note for the Electrode encounter: both PIDIVs should be method 1 (not
J/K) thus only one is kept in the array.
2017-03-29 17:43:17 -07:00
Kurt
7feb5a8451 Add Pickup item record
This only applies to Pickup/honey gather ability procs

179 is incremented if some value is >10000, which is immediately after
photos rated (119)
184 is incremented if GetSelectRankRoyal == 3 (after 159 and 137)

other pairs: 5,137

eh just check Savedata::IncRecord usages
2017-03-29 00:58:19 -07:00
ReignOfComputer
d6f9ad9bf8 Unban Pidgeotite and Steelixite (#1009)
Stones have been released.
2017-03-29 00:48:56 -07:00
wwwwwwzx
c2f225b523 Two minor fixes (#1006)
* Fix ingame trade legality check

- fix early return
- fix locations of the same name "a link trade", otherwise
metlocation=30001 in sm be recogized as 30002

* Fix wc7 to pkm for event egg

Nickname should be added

* Fix gen4 in-game trade

- fix ivs order
- use default met location to compact table

* Support multiple ingame trade filtering

Fix Steelix glitch, fix some table data, thanks to RoCs' PC

* Minor improvement

As suggested

* Fix gen5 in-game trade

- skip gender checks if set to default
- fix in-game trade metloaction for gen5
- fix ivs order
2017-03-29 00:48:31 -07:00
ReignOfComputer
1e8e8bbb8e General Fixes (#1005)
* Fix FRLG Viapois Chamber Location

* Gen 3 In-game Trade Fixes

3rd Gen Trades still need changes to verifyNicknameTrade to work though.
Temporarily suppressed the legality warning. It seems Bulbapedia may
have some mistakes?

* Fix Squirtle Gift in HGSS
2017-03-28 02:02:46 -07:00
Kurt
0aa2149ca6 Merge pull request #1004 from javierhimura/master
Fix gen 3 level up moves and add some missing g3/4 encounters
2017-03-27 14:29:29 -07:00
javierhimura
c70d690e9a Return fr/lg level up moves for gen 3 pokemon 2017-03-27 23:11:16 +02:00
javierhimura
c84f599e76 Static encounter for gen 3 and 4 game corner pokemon prizes
Fix Squirtle gen 3 starter encounter
Add met location to gen 3 ingame trades
2017-03-27 23:11:01 +02:00
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