Commit graph

2883 commits

Author SHA1 Message Date
wwwwwwzx
5b83d5b2d4 Merge pull request #1 from kwsch/master
Update from upstream repo kwsch/PKHeX
2017-03-22 13:28:41 -07:00
Kurt
38ee35d3e4 Merge pull request #968 from pokecal/pokecal-patch-1
fix gen4dex forms
2017-03-22 08:48:48 -07:00
pokecal
5b85c4dfdc fix gen4dex forms
mismatch of formFlag and languageFlag also fixed.
full editing of DexUpgrade added.
DP,with SetToSavOption,some mons otherLangDexFlag will be edit.
2017-03-22 17:01:02 +09:00
Kurt
eb8b9602b2 Add pkm modified & unset alert
Same for save edited check on closing, this will alert the user if View
is called without the data being Set first.
2017-03-21 23:25:17 -07:00
wwwwwwzx
207a6b8b44 Add B2W2 hidden grotto table (#966) 2017-03-21 23:22:22 -07:00
Kurt
503a9b9d71 Finish legality string translation feature
Same " = " separator as the main form translation, uses the cache style
in GameStrings to only load once.

Closes #959, feel free to discuss there.
2017-03-21 21:40:33 -07:00
Kurt
db3783bb0b Fix exeggutor forme tutors
Closes #964
2017-03-21 20:19:58 -07:00
Kurt
a3862b99be Cleanup
No functional changes, just simplification
sneaky linq to generate slots for unown forms on one line
2017-03-21 20:17:21 -07:00
Kurt
68fe715774 Add party data editing for batch editor
functions properly for games without a party (RS BOX) by checking if a
party exists
if there's ever a game that doesn't have a box, it'll work for that too
:P
2017-03-21 19:27:45 -07:00
Kurt
7adcbbea3d Merge pull request #965 from wwwwwwzx/master
Add gen5/ fix gen4 swarming encounters tables
2017-03-21 18:47:23 -07:00
wwwwwwzx
8d5454136e Minor fix
- Fix location index of route 3 in gen5
- reduce loop
2017-03-21 18:14:16 -07:00
wwwwwwzx
1d72876632 Fix gen4 swarm encounters table
- Make the table compact
- fix Delibird location in dppt (216/217)
- fix Spoink location in dppt (224->214)
- fix fishing encounter type in hgss (some pkm can only be caught via
super rod etc.)
2017-03-21 18:02:04 -07:00
wwwwwwzx
812aa32a3b Remove unused hgss swarm table 2017-03-21 17:57:59 -07:00
wwwwwwzx
ea69f22492 Add gen5 swarm encounters table 2017-03-21 17:57:23 -07:00
wwwwwwzx
e08d831ce5 Misc table fixes (#963)
* 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
2017-03-21 08:57:10 -07:00
ReignOfComputer
6f7c8e73a0 Dump Single Box (#962)
* Dump Single Box

Probably can be better optimized or something. The code works, the thing
is I can't seem to edit the Menu Items to add this in as it causes the
view to go haywire. VS can be silly sometimes. For your consideration :)

Related:
https://projectpokemon.org/forums/forums/topic/40358-how-to-export-all-pokemon-in-boxes-as-pk7/

* Manual Design Edit of Main
2017-03-21 00:21:03 -07:00
javierhimura
2bb9f61033 Shellos and Gastrodom East Sea Form in Gen 4 Encounters (#961)
* Add shellos and gastrodom alt form in east sea locations

* Improved MarkG4AltFormSlots

* Remove inside of truck

* Move code for group by Areas to a propert function, to avoid duplicate code, also group by Areas in gen 2, 6 and 7. Is not needed in gen 1

* Reduce all gen7 areas
2017-03-21 00:20:51 -07:00
Kurt
3027eadb8d Refactory legality strings
For future translation feature as per #959
3 helper methods provided to facilitate the localization (import /
export / update)

I decided to simplify some duplicate-function sections
2017-03-21 00:18:44 -07:00
pokecal
e3b501d2ee Upgrade with NationalDexMode (#960)
Just edit dex. Events unchanged.
2017-03-20 20:14:37 -07:00
Kurt
f7b3820e57 Merge pull request #958 from javierhimura/master
Some gen 3 egg location improvements
2017-03-20 19:06:04 -07:00
javierhimura
5d39407c85 Merge branch 'kwsch' 2017-03-21 02:28:37 +01:00
javierhimura
133133f205 Remove unused second meteor falls location and inside of truck from the table of valid met locations 2017-03-21 02:25:58 +01:00
Kurt
90e6a2a193 Merge pull request #957 from wwwwwwzx/master
Add gen4/5 roaming PKM locations
2017-03-20 18:21:32 -07:00
Kurt
23830f6bdc Merge pull request #956 from javierhimura/master
Gen 2 filter encounter location when with crystal met location
2017-03-20 18:21:18 -07:00
javierhimura
d02e2de63b Merge branch 'kwsch' 2017-03-21 02:18:50 +01:00
Kurt
6196a8101a Fix C/XD pkm loading
Thanks ArcticLoveBunny!
2017-03-20 18:18:16 -07:00
javierhimura
33edf8af30 Gen 3 and 4 check unhatched egg transfered to another generation
When a gen 3 pokemon is hatched the origin game is not overwrited, that allows FR eggs hatched in emerald locations if traded before hatched
2017-03-21 02:18:09 +01:00
wwwwwwzx
2a997979c4 Add gen4/5 roaming PKM locations
- gen5 from bulbapedia
- hgss from RNGtool
- dppt needs research (I will look into it together with gen3)
- Some formatting
2017-03-20 18:09:34 -07:00
Kurt
92b39e9da5 Add gen3 valid egg hatch locations
Met_RS was unused; since the met location string list is sequential,
GameInfo.cs just used 0-87, 87-196, 0-87|196-212 for RS/FRLG/E.

Cannibalized the array and split it into 3.
2017-03-20 18:03:34 -07:00
javierhimura
d7927d80b4 Gen 2 filter encounter location when pokemon have crystal met location to found only in crystal encounters
If the pokemon does not have met location but cant be tradeback to gen 1 games then search only in gold and silver encounters
2017-03-21 01:50:35 +01:00
Kurt
89a2546773 Simplify swarm slot adding
Only concatenate the swarm list once all swarm slots have been
generated, use ienumerable to remove the need to call ToArray except for
the finalization
2017-03-20 16:00:29 -07:00
Kurt
24ef01b5c1 Misc changes
Fixes #954
Incorporates changes from #955
TMHM info was loaded to Emerald personal table

Static encounter table reformatted to separate arrays which are then
combined later (reduces indentation, possible to further separate into
other tables if need be).
2017-03-20 15:50:23 -07:00
Kurt
d6aa9ec059 Merge pull request #953 from javierhimura/master
Complete gen 3 and 4 tutor moves
2017-03-20 11:32:56 -07:00
javierhimura
5d9c0f006a Simplify gen 4 tm and hm 2017-03-20 19:10:50 +01:00
javierhimura
90b93514d1 Clean up 2017-03-20 19:01:38 +01:00
javierhimura
02c10f6fc7 Get tutor moves for gen 3 and 4 pokemon, including special tutors
Filter deoxys gen 3 level moves by form
2017-03-20 18:53:16 +01:00
Kurt
94944a57f5 Merge pull request #952 from javierhimura/master
More Gen 3 and 4 Encounters
2017-03-20 09:34:17 -07:00
javierhimura
8773724aa4 Simplified code in function MarkG4SwarmSlots 2017-03-20 16:01:22 +01:00
javierhimura
5127a098de Order swarm tables by location id 2017-03-20 15:56:18 +01:00
javierhimura
7809ffc2ae Move swarm slots from encounter static to encounter slot
Swarm slots replace encounter slots 0 and 1, species id is the only data not found in encounter raw data.
Swarm encounter slots have hardcoded species and location only, levels are loaded from the encounter raw data
I check and all the levels that was harcoded in the swarm static encounters are found in encounters slots 0 and 1
2017-03-20 15:49:05 +01:00
javierhimura
4d76ef231c Add locations to roaming pokemon in gen 3
Add roaming flag to static pokemon, in gen 3 roaming pokemon have a different PID-IV generation
2017-03-20 13:35:12 +01:00
javierhimura
d4fb002f11 Add location to gen 3 gift egg, legal analysis adapted to ignore gen 3 gift eggs encounters if the pokemon is hatched
Is impossible to differentiated gen 3 normal eggs to gift eggs after hatched, assume normal egg.
In the case of pokemon box eggs with special moves those moves should be analyzed separately and check the pokemon legal moves with both possible origins: normal egg and box egg
2017-03-20 12:45:28 +01:00
javierhimura
6eb7e1b195 Gen 3 Swarms
Fixed gen 3 feebas encounter
2017-03-20 12:40:34 +01:00
Kurt
127d2c2aaa static analysis fixes
fixes the friend safari form checks (if else were chained incorrectly)
argumentorder of some unused sections (BV date, canlearnmachinemove)
2017-03-20 00:03:31 -07:00
Kurt
55e8732740 Add gen4 egg loc detection 2017-03-19 23:44:55 -07:00
Kurt
a7863f2935 Merge pull request #951 from wwwwwwzx/master
Misc table fixes
2017-03-19 22:41:03 -07:00
wwwwwwzx
a925149575 Misc table fixes
- Add emerald roaming PKM
- Fix version exclusive for Tornadus/Thundurus
- Add HGSS Togepi egg move
- Add N' Zorua met location
- Misc species ID location ID and Met_Level fixes
2017-03-19 22:32:23 -07:00
Kurt
9c4c52eec9 Update egg location/level checks for 3-5
Extracted some reusable parts
2017-03-19 21:36:03 -07:00
Kurt
6076199013 Fix truncated levelup sets
Last move wasn't being transferred; TransformLearnset updated to fix
export
Output byte array needed to be resized +=4 as the terminator bytes
weren't added
2017-03-19 19:08:19 -07:00
Kurt
b638f079df More recognition for gen3 legality
Egg levels, ingame trade recognition

Noticed that the levelup tables for gen3/4 are missing their last move
(truncated to 0xFFFF), will have to fix later
2017-03-19 18:13:21 -07:00