Commit graph

2965 commits

Author SHA1 Message Date
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
Kurt
d112f98ab5 Misc gen3 table fixes
IV of farfetch'd trade
castform species ID
2017-03-19 18:11:22 -07:00
Kurt
4862890e1e Merge pull request #950 from wwwwwwzx/master
Add gen5 EncounterStatic
2017-03-19 18:10:03 -07:00
wwwwwwzx
0b5b5ee81a Add gen5 EncounterStatic
- add gen5 table
- fix gen3 snorlax location
I will go over gen3-5 later to see if there is other typo
2017-03-19 18:02:08 -07:00
Kurt
9b375e8e8e Fix compiler warning
static array should be declared before used in static context
2017-03-19 16:58:06 -07:00
Kurt
d5f95475ce Start recognizing some gen3 encounters
Add overrides for detecting encounter type
Will need to come up with something more intelligent for when this met
location info is lost on transfer. Probably some re-parse guessing like
was done for Gen1/2.

Fix hitmonlee/chan level

Noticed that Aerodacytl is met at level 5 with current level 30; will
have to figure out a way to work around Current!=Met level
2017-03-19 16:52:56 -07:00
Kurt
deac1724c7 Add gen4/5 event concatenated binaries
events now show up in the event browser too

pcd(4)/pgf(5) will be used for encounter matching by the legality check.
2017-03-19 16:19:59 -07:00
Kurt
623b836cdf Add gen3 pk3 encryption detection
pokebox gba can export encrypted, just recalc the checksum and if
invalid try decrypting.
2017-03-19 15:54:16 -07:00
Kurt
1b3294c8b3 Update nickname text check
Generation specific names now show up legal if they are correct (ie all
caps)
2017-03-19 15:40:49 -07:00
Kurt
865efe9c77 Merge pull request #949 from wwwwwwzx/master
Update gen3 encounterstatic and tradegift
2017-03-19 15:14:46 -07:00
wwwwwwzx
7c0470b4b5 Add gen5 tradegift 2017-03-19 14:49:37 -07:00
wwwwwwzx
104b559936 Add GameVersion and contest stats for tradegift 2017-03-19 13:57:24 -07:00
wwwwwwzx
3579290ce7 Add gen3 TradeGift 2017-03-19 13:32:00 -07:00
wwwwwwzx
cbe7f0fa3a Add gen3 EncounterStatic 2017-03-19 13:31:31 -07:00
wwwwwwzx
135c3e2653 Fix gen4 egglocation 2017-03-19 13:29:02 -07:00
wwwwwwzx
37a906d6ed Merge remote-tracking branch 'refs/remotes/kwsch/master' 2017-03-19 13:27:18 -07:00
Kurt
5a9340223b Map gen3 species in encounter slots to natdex ID
As noted in #947
FR/LG don't have any species > 251, so remapping didn't change the
binary.
To re-map rse the ushort species ID was written back to the byte array
at the same offset; after the entire table was loaded it was saved as a
new packed binary.
2017-03-19 12:44:59 -07:00
Kurt
1ab2a6d37f Add slotnumber tracking for gen3/4
As noted in #947

No need to tack on a RNG% range at this point, only use the slotnum &
slottype with origin game to look it up later
2017-03-19 12:27:58 -07:00
Kurt
248031a45c Precompute gen3 personaltable shuffling
Less convoluted & faster loading
2017-03-19 11:07:57 -07:00