Commit graph

5743 commits

Author SHA1 Message Date
Easy World
3ded274079 Merge pull request #5 from kwsch/master
merge
2016-07-02 20:02:01 +08:00
Kaphotics
c129c0d663 Fix cast
should have been included in the previous commit
2016-07-01 21:21:15 -07:00
Kaphotics
418f1c772d Fix gen3 pouch set 2016-07-01 17:06:45 -07:00
Kaphotics
67e7d3edaf Simplify control finding for translation
Figured I'd rewrite this to remove the gotos
2016-06-30 22:36:54 -07:00
Kaphotics
537246d4b9 Add SAV3 inventory code
Still need to figure out how I want to handle the different-index item
numbers.
2016-06-30 21:53:24 -07:00
Kaphotics
08ccec7a07 Fix pk3 sprite helditem fetch
g3item is raw value (gen 3 index), HeldItem returns the equivalent gen4
item.

In the future the populatefields(PK3) method will use the gen3 index
(list needs to be init first) but the display is always the helditem.
2016-06-30 18:10:09 -07:00
Kaphotics
053657c3be Error check on invalid legality
Check fails -> flag instead of error.
2016-06-29 22:59:20 -07:00
Kaphotics
8a8926bcca Split up setforms
individual forms do it themselves, allows for main window to handle more
generations
2016-06-29 22:58:02 -07:00
Kaphotics
9e4fa6bec9 Save Language default -1 (none) 2016-06-29 22:57:26 -07:00
Kaphotics
fa9ca3ea59 Flag Legality of Battle Primals
Mark as illegal.

Thanks Asia81!
2016-06-29 17:42:00 -07:00
Kaphotics
d8ed96fd69 Fix drag&drop save file
Missed a 'return', the logic afterwards handles loading a PKM (which we
know the file is NOT).

Thanks @Favna

Previous two commits & this one resolve #127
2016-06-29 17:36:03 -07:00
Kaphotics
c14b87fcd9 Fix PCBin/BoxBin setters
Thanks @Favna
2016-06-29 17:31:52 -07:00
Kaphotics
a0bade7dc0 Fix Save Version get/set
Short circuited -> rewritten, removed sav5 getter for Version (handled
by abstract parent class)

Thanks @Favna
2016-06-29 17:21:59 -07:00
Kaphotics
9d36976860 Remove unused itempouch resources
Was never used, will never use.
2016-06-28 17:54:07 -07:00
Kaphotics
8e62803897 Tweak savefile enumeration
Use one enum to denote Version across all code, also identifies if data
is invalid
Move some SAV code to virtual members in abstract class
(BAK/Exportable/Footer)

Few minor bugfixes here and there (hiding Characteristic label, loading
pk6 to sav3, sav3 version detection via gamecode)
2016-06-27 23:03:57 -07:00
Kaphotics
744c5b927b Isolate secret base ability code
Was referencing main form code; this is gen6 only so do it gen6 only.
Main form will change to handle all generations.
2016-06-27 22:27:53 -07:00
Kaphotics
92b357c660 Simplify hidden power calc
Calculate inline
2016-06-27 22:26:39 -07:00
Kaphotics
6ddaa036d4 Update database to load formats correctly 2016-06-27 22:20:31 -07:00
Kaphotics
44fd5ca07c Update database viewer with Format filter
Filters reorganized into tablelayoutpanel for tight appearance.
2016-06-27 21:16:46 -07:00
Kaphotics
ae0759b27f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Saves/SaveUtil.cs
2016-06-26 14:28:46 -07:00
Kaphotics
e6e3caabb2 Sync basic gen3 support
Still many things not yet working (item/inventory editing needs new
string resources)
2016-06-26 14:23:41 -07:00
Kaphotics
5c79015091 Merge pull request #126 from evandixon/master
Enable Use as Class Library
2016-06-26 14:22:32 -07:00
Evan Dixon
37fb94c8c0 Fixed each save file's Footer not being initialized within the class 2016-06-26 14:39:53 -05:00
Evan Dixon
2cba9de40a Fixed incomplete implementation 2016-06-26 13:54:02 -05:00
Evan Dixon
f538cb779c Implementation fixes 2016-06-26 13:48:39 -05:00
Evan Dixon
86b2090ba1 Altered SaveUtil to be usable from external assemblies 2016-06-26 13:46:08 -05:00
Kaphotics
ca139cf7e4 Add gen4 current box 2016-06-23 21:55:18 -07:00
Kaphotics
d2342ba965 Fix pokecenter purchase ORAS
Ever Grande Pokémon League lobby has a vendor, and is considered a Pokécenter.
Thus, memory 5 is obtainable in OR/AS.

Resolves #125
2016-06-22 12:31:53 -07:00
Kaphotics
027518c330 Fix pkm info clearing on SAV load
returned PKM uses the same reference as the Main.pkm; clone to a new
object before returning => separate object reference.
2016-06-21 22:19:30 -07:00
Kaphotics
505d17c86a Update readme
Reflect multiple generation support
2016-06-21 21:54:14 -07:00
Kaphotics
27bf0c1df1 Merge remote-tracking branch 'refs/remotes/origin/multigen' 2016-06-21 20:14:56 -07:00
Kaphotics
1a6cc17515 Remove SAV5
Trying to resolve conflicts.
2016-06-21 20:14:38 -07:00
Kaphotics
83cd043fff Merge remote-tracking branch 'refs/remotes/origin/master' into multigen
# Conflicts:
#	Misc/SAV5.cs
2016-06-21 20:10:33 -07:00
Kaphotics
93d27989a1 Add fallback check for g4 saves
Check for block identifiers if the general block checksum is invalid
(manually tampered).
BW/B2W2 detection is fine as is; the checksum block /won't/ be manually
modified.
2016-06-21 17:57:55 -07:00
Kaphotics
3351c7f9bb Add simple trainer editor (past gen)
Fixed save invalidation as well. GameVersions were detected based on
checksum validity.
Gonna change that so an invalid save can still be recognized (based off
of other markers)
2016-06-21 17:35:12 -07:00
Kaphotics
ff1b084523 Switch to expression on click
one liner.
2016-06-21 17:33:03 -07:00
Kaphotics
68f144e040 Re-add PKM property verification
Item/move/species (didn't add Ball and Version) being imported from a
.pkm or forcefully input now requires the user to OK before it is set to
the save.

EX: Hyperspace Fury isn't in X/Y, drag from another instance of the
program with OR/AS loaded and a Hyperspace Fury move... the user will be
alerted of the incompatibility and will be allowed to continue (and fix,
if desired).
2016-06-20 23:02:26 -07:00
Kaphotics
cb0c5998cd Change argument name, check maxspecies
pretty template for the future, I don't like the PKX.Personal reference.
If multidex bool setting is added that'd have to change.
2016-06-20 22:59:10 -07:00
Kaphotics
a1d9d25a01 Hide TSV/PSV on gen<6 2016-06-20 21:11:48 -07:00
Kaphotics
5386bb738d Fix PID changing for gen4 pkm
Filling the EC textboxes when it is not visible is unnecessary as well.
2016-06-20 20:58:35 -07:00
Kaphotics
0d477a0153 Futureproof gen6 subforms
Species selection should be limited to species available in game; upon
adding S&M these comboboxes are ready!

The CB_HeldItem in SAV_SecretBase doesn't need filtering as it is
limited when the SAV is loaded to the main form.
2016-06-20 19:07:40 -07:00
Kaphotics
28141729a9 Limit PKX dropdowns when Version changes
Filters out choices that are not obtainable in the loaded version of
game (such as new Mega Stones).
2016-06-20 18:58:06 -07:00
Kaphotics
1da183a8cc Minor tweak
SAV5 change didn't get saved
no need to "take" the rest of the data when footer checking.

this logic can be expanded if other emulators behave differently...
2016-06-19 22:13:57 -07:00
Kaphotics
e6a4f4cce1 Add .dsv support
Even catches the 1MB misconfigured DSV's (stuffs the bak data in with
the footer).

Works by searching for the DeSmuME footer signature in the input data,
if present, breaking up the info.
2016-06-19 22:11:53 -07:00
Kaphotics
e784389ad2 Manually merge latest pull requests
Should have forked to begin with.

Thanks @chenzw95 && @Eskuero
2016-06-19 21:29:38 -07:00
Kaphotics
6378eb7f56 Current progress
Still a few milestones left to hit before official release.
2016-06-19 21:22:43 -07:00
Kaphotics
ff8c697a99 Merge pull request #123 from SciresM/master
Add basic Gen V Checksum Support
2016-06-14 16:21:12 -07:00
Michael Scire
1bf70d99a3 Preliminary Gen V Checksum Support 2016-06-14 15:31:33 -07:00
Kaphotics
5df46cfc72 Merge pull request #120 from chenzw95/legality-memorychecks
Legality: separate memory checks from history checks
2016-06-10 09:09:33 -07:00
chenzw95
52ff97191a Clarify History vs Memory check in legality output 2016-06-10 15:44:25 +08:00