Commit graph

4929 commits

Author SHA1 Message Date
Kurt
431baec087
Merge pull request #1716 from smileynation/patch-9
Update text_cxd_00000_ja.txt
2017-12-19 18:42:17 -08:00
Kurt
2e701349db
Merge pull request #1717 from smileynation/patch-10
Update text_rsefrlg_00000_ja.txt
2017-12-19 18:42:10 -08:00
smileynation
0615895dce
Update text_rsefrlg_00000_ja.txt 2017-12-20 11:11:43 +09:00
smileynation
7fb7487e6b
Update text_cxd_00000_ja.txt 2017-12-20 11:08:28 +09:00
Kurt
9429bc6961 Fix showdown import on gen3
https://projectpokemon.org/home/forums/topic/43126-problems-with-importing-rse-showdown-files-from-clipboard-in-pkhex/

Sceptile @ Leftovers
EVs: 4 Def / 252 SpA / 252 Spe
Timid Nature
- Leaf Blade
- Leech Seed
- Substitute
- Hidden Power Ice

also fix apricorn form title
2017-12-19 15:33:23 -08:00
Kurt
5e59e20ea1 Store matched encounter generation
previously was only defined for gen1/2, why not all gens
can now query encounters in Core for encounters per generation via
reflection; can help group encounters for data vis or be faster than
getting individual gen numbers
2017-12-18 16:17:21 -08:00
Kurt
80baaea3b7 add b2w2 n's pokemon PIDs
add b2w2 fixed PID encounters (N's Pokemon), move nsparkle to this class
redo static encounter cloning
2017-12-18 15:25:40 -08:00
Kurt
9263856845 Add apricorn pouch editing 2017-12-18 09:36:53 -08:00
Kurt
60787e652c Add new text ja flag resources to project
re: previous pull requests
2017-12-17 21:35:06 -08:00
Kurt
24b5cc48ed Fix gb encounter move comparison
don't calc NoMoveReminder for non-gen2 formats, also fix comparisons
(gen1 || gen2&&noRemind)
Closes #1707
2017-12-17 21:26:31 -08:00
Kurt
975be16c3c Merge branch 'master' of https://github.com/kwsch/PKHeX 2017-12-17 21:24:56 -08:00
Kurt
453f66e2b4
Merge pull request #1709 from smileynation/patch-3
Create flags_oras_ja.txt
2017-12-17 20:27:51 -08:00
Kurt
a1bf7e1b3a
Merge pull request #1710 from smileynation/patch-4
Create flags_b2w2_ja.txt
2017-12-17 20:27:45 -08:00
Kurt
dc9e83fcfe
Merge pull request #1711 from smileynation/patch-5
Create flags_bw_ja.txt
2017-12-17 20:27:38 -08:00
Kurt
c88024534a
Merge pull request #1712 from smileynation/patch-6
Create flags_pt_ja.txt
2017-12-17 20:27:27 -08:00
Kurt
14acaa6d04
Merge pull request #1713 from smileynation/patch-7
Create flags_dp_ja.txt
2017-12-17 20:27:22 -08:00
Kurt
fd55f1a8a2
Merge pull request #1714 from smileynation/patch-8
Create flags_hgss_ja.txt
2017-12-17 20:27:15 -08:00
smileynation
673147b94f
Create flags_hgss_ja.txt 2017-12-18 13:04:25 +09:00
smileynation
6331758973
Create flags_dp_ja.txt 2017-12-18 13:04:01 +09:00
smileynation
5b4f24e54a
Create flags_pt_ja.txt 2017-12-18 13:03:37 +09:00
smileynation
c545c53121
Create flags_bw_ja.txt 2017-12-18 13:03:01 +09:00
smileynation
54e1410f78
Create flags_b2w2_ja.txt 2017-12-18 13:02:50 +09:00
smileynation
fd33e4e7a0
Create flags_oras_ja.txt 2017-12-18 12:56:52 +09:00
Kurt
e8c4cc8fa8 Fix broken crystal origin pkm test
works fine on a crystal save, the test needs this enabled for crystal
origins
2017-12-17 19:42:31 -08:00
Kurt
810ec39ee0 add recent pr flags resource
#1708
2017-12-17 19:33:26 -08:00
Kurt
e241387c87
Merge pull request #1708 from smileynation/patch-2
Create flags_xy_ja.txt
2017-12-17 19:13:58 -08:00
smileynation
c2031bf347
Update flags_xy_ja.txt 2017-12-18 11:43:03 +09:00
smileynation
037ab76d45
Create flags_xy_ja.txt
I can not understand the meaning of Statuette and can not translate.
2017-12-18 11:31:34 +09:00
Kurt
bd611cf8dc
Merge pull request #1706 from smileynation/patch-1
Update text_Ribbons_ja.txt
2017-12-17 17:45:06 -08:00
smileynation
205f141c44
Update text_Ribbons_ja.txt
Gen3, Gen4 Ribbons transration.
2017-12-18 10:29:57 +09:00
Kurt
47eee3aa98 Add roto powers as held items
not gonna add sprites because these are useless, anyone can submit via
pr (image might need downscaling to <15x15)
Closes #1703

remove useless null checks (throws the exact same exception it would if
it were not there, except without detail)
2017-12-16 19:52:06 -08:00
Kurt
2dbdb35955 Misc tweaks
possibly fix UI not-1x scaling screwing up drawn pkm images with
items/shiny/illegal.
simplify some logic -> speed improvements (wow so noticable /s)
2017-12-16 18:29:10 -08:00
Kurt
21c1dde3a7 Fix static encounter gift / egg edge case
extract EncounterStatic match determination; in doing so fixes "lvl" by
passing byval.

Pichu encounters (2) come before the Gift level 25 pikachu, causing lvl
to be dropped to 5. When pikachu comes around, it compares 5==25 -> bad;
pulling out the method and passing byval allows it to be 25 at the start
of every new encounterstatic checked.
2017-12-16 18:24:03 -08:00
Kurt
06ea6d94a2 Allow box layout / wallpaper editing for sav5
was temporarily disabled during sav5 implementation 2y ago, now noticed.
Closes #1702
2017-12-16 14:15:09 -08:00
Kurt
18796d6f92 Misc tweaks
fix bk4 ribbon checks (lacked interface inheritance)
change MN -> UM for get blank save (unused in PKHeX solution)
prevent inheriting from derived pkm classes
2017-12-16 14:11:41 -08:00
Kurt
0b58d4ffe9 Add form/nature checks for gen5 trades
altform wasn't checked for EncounterTrade
nature wasn't checked for gen5 origin (decoupled from PID, but forced)
#1702
2017-12-16 14:09:03 -08:00
Kurt
e5aa39a6bb Refactoring
get language list now doesn't return new objects (or re-enumerate)
update rand usage to be inclusive for top bound, extend shuffle to
collections
remove unnecessary location overrides (already overriden in legal fetch)
2017-12-14 20:58:55 -08:00
Kurt
9c8e1ab13f
Merge pull request #1701 from wwwwwwzx/master
Fix chinese language ID check
2017-12-14 20:27:09 -08:00
wwwwwwzx
6c4a4ff4ec Fix chinese language ID check
Some species have the same unicode name in CHS and in CHT, so it will lose language info after converting from a in-game string to textbox (The game will use different fonts to distinguish them, bad GF)
This change will give CHT encoding a higher priorty if the pkm is in CHT, although it's possible to get CHS encoding default species name with CHT language ID.
Also fixed previous editing error
2017-12-14 19:30:59 -08:00
Kurt
b5640de538 Misc tweaks
reorder some args, reuse some standard methods;
add spanish for gen1/2 egg name case
2017-12-14 16:16:47 -08:00
Kurt
278f7cad25 Add pwt record get/set
thanks @sora10pls
2017-12-14 12:34:03 -08:00
Kurt
9a39f818f9 Misc fixes
#1700
dp personal: add wormadam/deoxys manual forme count values
generator: bcc handling for pkm present in & out of bcc, and static/wild
duplicates
util: fix incorrect variable reference
2017-12-13 16:17:02 -08:00
Kurt
a9ff74059a Misc perf tweaks
checking untraded should just check for the first character (rather than
creating string object)
hashset for wild6 balls
2017-12-13 16:12:53 -08:00
Kurt
816ebf6b0e Refactoring
no functional change
2017-12-11 16:01:24 -08:00
Kurt
0588135b60 sync missing change
g already used
2017-12-11 11:01:57 -08:00
Kurt
f1cabdfa25 Handle setting decrypted pgt pkm gift data 2017-12-11 10:13:08 -08:00
Kurt
dd21f9375f Misc updates
Disallow sandygast on US
Add 2 more records
thanks @feralfalcon
Closes #1698
2017-12-08 08:54:00 -08:00
Kurt
a43880184a Fix artist ribbon gen6+
having 4 ribbons is sufficient (normal/super/hyper/master = 4, etc)

https://projectpokemon.org/home/forums/topic/42933-2-issues-invalid-ribbons-artist-encounter-level-in-origin-game/
2017-12-07 07:57:07 -08:00
Kurt
f9946368a0 Remove usage of LegalityAnalysis from PK*
CK3<->XK3 transfers to PK3 first now (no direct transfer legally)
2017-12-06 21:28:34 -08:00
Kurt
bd9f7fc7e2 Remove fossils from usum capture list 2017-12-06 21:05:36 -08:00