Skip to content

Update from upstream repo kwsch/PKHeX#1

Open
backstroke-bot wants to merge 8239 commits into
Delphox:masterfrom
kwsch:master
Open

Update from upstream repo kwsch/PKHeX#1
backstroke-bot wants to merge 8239 commits into
Delphox:masterfrom
kwsch:master

Conversation

@backstroke-bot

Copy link
Copy Markdown

Hello!
The remote kwsch/PKHeX has some new changes that aren't in this fork.

So, here they are, ready to be merged! 🎉

If this pull request can be merged without conflict, you can publish your software
with these new changes. Otherwise, if you have merge conflicts, this
is the place to fix them.

Have fun! 👋

From,
🏊 Your Neighborly Backstroke Bot

PS. Hey, there's a new version of Backstroke available. If you'd like to configure repo-to-repo syncing or sync to all forks, check it out here.

@kwsch kwsch force-pushed the master branch 2 times, most recently from e13acf3 to 6bed33f Compare July 16, 2021 03:40
@kwsch kwsch force-pushed the master branch 3 times, most recently from 0c4f92a to 9ef9355 Compare August 21, 2021 03:50
@kwsch kwsch force-pushed the master branch 2 times, most recently from a730ac5 to 6e9f230 Compare August 23, 2021 01:52
@kwsch kwsch force-pushed the master branch 2 times, most recently from bfccdae to fbb9e0b Compare December 26, 2021 02:44
@kwsch kwsch force-pushed the master branch 2 times, most recently from c460f5b to ecee948 Compare April 25, 2022 03:29
@kwsch kwsch force-pushed the master branch 2 times, most recently from fcadbda to 2bbd767 Compare September 11, 2022 05:54
@kwsch kwsch force-pushed the master branch 3 times, most recently from 81c04d8 to 5d5d913 Compare November 26, 2022 04:54
kwsch and others added 30 commits June 10, 2026 23:19
pc went to sleep, hover preview was missing (minimized?)
this workaround works, maybe I can deduplicate the dllimport in PokePreview, or make this more abstract for future hover card previews like encounters?
Closes #2058

so many spots needing updating:
- ability verifier (legality check)
- encounter template=>pk5 (generating)
- editor load abilities (show the ability in list)
- editor save ability (acknowledge ability index)
Co-authored-by: 9B1td0 <157295620+9B1td0@users.noreply.github.com>
Co-authored-by: Lusamine <30205550+Lusamine@users.noreply.github.com>
Reflow inventory editor, gridlines and too-wide sprite column, row select
Make troubleshooting menu items visible for all builds, add localization
Show filename in label for savefile force loader
* Update MessageStrings_de.txt

* Update MessageStrings_ko.txt

* Update MessageStrings_es-419.txt

* Update MessageStrings_es.txt

* Update lang_de.txt

* Update lang_en.txt

* Update lang_es-419.txt

* Update lang_es.txt

* Update lang_fr.txt

* Update lang_it.txt

* Update lang_ja.txt

* Update lang_ko.txt

* Update lang_zh-Hans.txt

* Update lang_zh-Hant.txt

* Update lang_es.txt

* Update lang_es-419.txt

* Update lang_fr.txt

* Update lang_it.txt

* Update lang_es-419.txt

* Update lang_es.txt

* Update lang_de.txt
didnt bother checking disassembly; this handles basculin if we just use the RefreshAbility API.
Show item sprites for TM/HM in inventory editor, just be more general on the Lumped image method
Rework Trainer ID, now updates tooltip as you change TID. Components are separate controls.
Re-flow Chatter editor GUI
Add Experience bar to pkm editor for more visual editing of the EXP. Matches scroll behavior of EXP/Level textboxes.
Exp bar can be hidden via settings.
bulbapedia's Contest Stat nature amp table for neutral natures is wrong lol
https://bulbapedia.bulbagarden.net/wiki/Contest_condition#Natures
Closes #4821
not sure this is a perfect solution (traded from gen1=>nicknamed complainers, or iterator prefer-matching gen1 when having !?)
Some edge case staryu reported by bustah2975, thanks dawg
kwsch/PKHeX.EncounterSlotDumper@9d25578
0x018 -> 0x108: 0x18 is the MarkingValue offset (an actively-used
field), so listing it among the "unused" ExtraBytes exposed it in the
byte editor and let edits there clobber the low marking byte (markings
0-3). 0x108 is the byte actually intended in the 0x100-0x10F run.

0xE9 -> 0xEB: the "0xDE-0xEB unused" range listed 0xE9 twice and omitted
0xEB.
MathF.FusedMultiplyAdd(percent, 0.40000004f, 0.8f);
vs
(percent * 0.40000004f) + 0.8f;
Turns out shiny-Enamorus uses a hardcoded value like Meltan!

sneak in a ball applicator restriction for Shedinja, for DPPt ones to disallow Sport being suggested as OK.
Flag EVs in PLA if no EXP gained (similar to Gen1)
Make exp bar background different from the tab background
Add more "was touched" checks for PLA
remove empty xmldoc declarations
now supports click+drag, includes tooltip to show remaining exp, % progress, and can hold control to only tooltip current EXP rather than cursor position.
BD/SP => HOME sanitizes -1=>0 and 0=>658. HOME is therefore "clean" so the other side-data do not need to know about BD/SP goofiness.
Handles 658 for mainline-legitimate values (none?), better to be correct.
Adds in a link traded egg checks for unhatched static eggs in Gen6 (previously unchecked)
SelectionLength => Select (avoid winapi fetch of SelectionStart), no functional change
Rename DisallowSearch => IsSearchAllowed (check a positive, not a negative)
Fix some stale xmldoc refs
Remove some unused usings
Small preference tweaks (aka resharper yelling at me)
ty anubis, santacrab, and Bowarcky for testing & data aggregation

Co-Authored-By: Lusamine <30205550+Lusamine@users.noreply.github.com>
Co-Authored-By: santacrab2 <79347566+santacrab2@users.noreply.github.com>
Co-Authored-By: Bowarcky <54773567+bowarcky@users.noreply.github.com>
Closes #4493
Future pull requests may be added with other font files to add game-specific font files (such as Gen1/2 having JPN/KOR/INT in the pixelated style like SciresM/Rhydon)

For now, the Control provides via EntityContext. If we need to provide different granularity, maybe another enum would be OK. Possibly add that as a property to IStringConverter.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.