Commit graph

4050 commits

Author SHA1 Message Date
Michael Scire
c9be698d46 Fix Partner Cap pikachu icon 2017-11-09 14:41:00 -08:00
Kurt
6071da6ff3
Merge pull request #1578 from sora10pls/patch-1
Add USUM Pinsir on Exeggutor Island locations
2017-11-09 13:59:10 -08:00
Matt
273231ad00
Add USUM Pinsir on Exeggutor Island locations 2017-11-09 16:56:10 -05:00
Kurt
ccdb84b851 update for some errors
restore ekans values, re-add antishiny for yungoos set
2017-11-09 07:22:34 -08:00
Kurt
b615ef0057 Update static7 with more data 2017-11-09 07:17:36 -08:00
Kurt
ae0122254a Add abilities & IV3 flags for usum gifts 2017-11-09 06:43:11 -08:00
Kurt
3eb52bb3ef
Merge pull request #1576 from sora10pls/master
Additional Totem-Sized gift checks
2017-11-09 06:17:48 -08:00
Matt
800a6b32b8
Merge pull request #1 from kwsch/master
Update from upstream repo kwsch/PKHeX
2017-11-09 02:02:42 -05:00
sora10pls
38cbf160ec Add Totem-Sized gift ability/version checks 2017-11-09 02:01:09 -05:00
Kurt
2af7b152a7 re-enable error suppression
oops
2017-11-08 22:59:18 -08:00
Kurt
665e94b0aa misc cleanup
add german forme names
truncate some forme names
fix nidoran gender symbols

adds null check for invalid (caught error) pkm

disables accessory giving (needs more research)
2017-11-08 22:56:42 -08:00
Kurt
9f2899617d add ultra moon encounter legality binaries
fix an odd edge case going from a bad FRLG save to gen6+ while we're
pushing code
2017-11-08 21:56:56 -08:00
Kurt
6f99bc5365
Merge pull request #1574 from wwwwwwzx/master
Fix USUM Chinese species names encoding
2017-11-08 20:34:28 -08:00
Kurt
28d15bb06e Permit usum met locations & add new move PP counts 2017-11-08 20:32:23 -08:00
Kurt
ab8faac55d Update legal tables with usum species 2017-11-08 20:23:06 -08:00
wwwwwwzx
9ab2938b84 Fix USUM Chinese species names encoding 2017-11-08 20:20:41 -08:00
wwwwwwzx
e984d1958e
Merge pull request #1 from kwsch/master
Update from upstream repo kwsch/PKHeX
2017-11-08 20:18:36 -08:00
Kurt
c9965b2ac9
Merge pull request #1573 from sora10pls/patch-1
Add more USUM static encounter locations
2017-11-08 20:01:40 -08:00
Matt
a8000608f2
Add more USUM static encounter locations
Totems @ Heahea Beach, Island Scan.

Grovyle is Akala-Friday @ Route 5, as is Bellsprout in SM; assume locations were unchanged.
2017-11-08 22:56:13 -05:00
Kurt
115c611120 add surf to gift pikachu moveset
only gift pkm with special move
2017-11-08 19:51:04 -08:00
Kurt
da5dd5ccb3 remove usum early return for dex bit setting
I highly doubt this is causing save corruption; looked through the
disassembly and the offset ptrs are the same relative to sun/moon.
Implementation is flexible for both as gamefreak allocated enough space
in each bit array.

pokedex editor recognizes bools correctly (including for formes).
2017-11-08 19:34:07 -08:00
Kurt
93b49928a0 add lvl/egg move tables for usum
add a few met locations for static encounters, recognizes torracat with
double kick correctly!
2017-11-08 19:31:07 -08:00
Kurt
93bd974249 Add EncounterStatic data
sourced from Ultra Moon, location IDs are not known (need manual docs).
Many of these may be unused, like last gen. Will eventually remove
unused ones once crowdsourced effort finishes.
2017-11-08 18:43:55 -08:00
Kurt
134e676e91 Unlock Pokedex & HoF editors 2017-11-08 18:42:52 -08:00
Kurt
0caa0dec72 Group forms with special battle formes check 2017-11-08 16:27:35 -08:00
Kurt
800ba6cf90 encounter additions
add ingame trade data
add placeholder SOS data containers
add refs to all wild encounters (pelago is same as sm)
unmark some todo's
2017-11-08 15:07:04 -08:00
Kurt
cf35adca6f Add roto blank item handling
preserve input data
2017-11-08 14:12:41 -08:00
Kurt
47058d5709 Permit loading of usum met locations to pkmeditor 2017-11-08 13:44:55 -08:00
Kurt
9ba5ede81a Fix broken test 2017-11-08 13:30:52 -08:00
Kurt
97dcd1a845 Add pokedex forme flag correlation table 2017-11-08 13:29:06 -08:00
Kurt
56ca5d02bc re-add newline
now boots, inventory editor now works
2017-11-08 13:12:10 -08:00
Kurt
80bedb97c4 Misc tweaks
Adds game names for languages other than english
adds z crystal sprites for held items
temp-fixes chinese pkm names (need manual translation for the new
species)
remove newline at eof
toggle back on legal item lists, add assumed Key Item list
differentiate duplicate item name strings (-arizers)
2017-11-08 13:06:20 -08:00
Kurt
f825377e83
Merge pull request #1572 from kwsch/usum
Fix save resigning for USUM, add resources for new pokemon
2017-11-08 12:35:44 -08:00
Michael Scire
78acb8e13b Fix save resigning for USUM, add resources for new pokemon 2017-11-08 11:31:09 -08:00
Kurt
ae773f189b add usum tutor data
one large list at static.rodata:005E6860, formatted to look like AO
table with deletions & insertions at the bottom.
bitflags are used in one large set (not 4 chunks of 4 like prior).
2017-11-08 01:25:10 -08:00
Kurt
ece66e1a02 Misc tweaks
allows loading of species > 720 lol
still nowhere near done (large task is resource acquisition)
2017-11-08 00:51:08 -08:00
Kurt
543736d568 Early rough USUM compatibility
need to dump string resources, sprites, and repoint the form list string
fetch later. tons more to do

no guarantee of any working functions
2017-11-08 00:34:32 -08:00
Evan Dixon
52a22fbf7d Add more checks to failing test 2017-11-07 19:21:17 -06:00
Evan Dixon
ad81343915 Merge remote-tracking branch 'origin/master' into f/savedata-checksum-tests 2017-11-07 19:13:21 -06:00
Kurt
9af0876352 clone cached string resources
don't share object references, need to be passed as new copies as the
array contents can be modified

need to clone on dict return to not pollute dict, and need to clone
after dict add so that the first return doesn't equal the dict copy --
this one could be on the dict add... keep returns same.
2017-11-07 17:12:04 -08:00
Evan Dixon
889302fea6 Merge remote-tracking branch 'origin/master' into f/savedata-checksum-tests 2017-11-07 19:07:55 -06:00
Evan Dixon
bb02488c6d Add checksum tests 2017-11-07 19:07:13 -06:00
Kurt
d08bd25b4f always clear memecrypto sig on load
allows verification & resigning to work as intended
reverts to code prior to refactor

b1641772e6 (diff-1681616e650971296aa4b549afadd0eaL116)

cleanup suggestions for tests
2017-11-07 16:57:18 -08:00
Kurt
9ef4152736 add more xml docs 2017-11-06 22:44:51 -08:00
Kurt
6df1f97f95 early abort on altforms < 1
prior generations store 0 instead of 1 for some cases

24121553b4 (commitcomment-25445089)
2017-11-06 21:08:39 -08:00
Kurt
24121553b4 Add savegame sensitive pkm legality checking
uses the forme count of the savefile (rather than a futureproofed
same-gen forme count)
Closes #1559
2017-11-06 19:31:24 -08:00
Kurt
062684f4a6 Relocate transfer block cases to separate method
#1559
2017-11-06 18:34:35 -08:00
Kurt
9cac3738dc Add handling for mid-chain lowlvl encounter evos
haunter caught at level 20, transferred at 24, leveled once as gengar
did not allow gengar in the chain as it is assumed (incorrectly) that
gengar is evolved after transfer.

determine if the lower levels of the next step's evolution rung are
valid, using the same logic as pikachu case but to handle the other side

Closes #1564

(should probably refactor the encounter chain generator to use the base
encounter data if known, but oh well works fine and isn't a cpu hog)
2017-11-06 18:21:58 -08:00
Kurt
38989b4747 Export correct species name for verbose output
#1564
2017-11-06 18:06:23 -08:00
Kurt
0f69c1116e Add unown gen2 invalid form check
closes #1565
2017-11-06 17:13:16 -08:00