Skip to content

Add Sword/Shield encounters (Part 2)#1564

Open
jemarq04 wants to merge 90 commits into
PokeAPI:masterfrom
jemarq04:feat/add-sword-shield-encounters
Open

Add Sword/Shield encounters (Part 2)#1564
jemarq04 wants to merge 90 commits into
PokeAPI:masterfrom
jemarq04:feat/add-sword-shield-encounters

Conversation

@jemarq04

Copy link
Copy Markdown
Member

Change description

The continuation of PR #1550, addressing issue #1459. I've reviewed each of the location areas as I usually do for encounter PRs that I review formally to try and catch as many mistakes as possible.

This PR adds encounters for every single location in-game aside from wild areas including all gifts and trades for Sword/Shield and its DLCs. In addition, I've also added one wild area: Rolling Fields.

Encounter Conditions

This PR adds new encounter conditions for save data, finding Alolan Diglett across the Isle of Armor, and weather conditions. The relevant condition values (i.e. which save data, how many Diglett, and what weather conditions) were added to describe the encounters. Relevant prose was added.

Encounter methods

A new encounter method, overworld-dirt, was used for Pokemon that come from underground and spawn in the overworld. Relevant prose was added.

Locations

A new location for Galar Energy Plant was added.

Location areas

Missing prose was added for each location area that gained encounters. New areas were added as needed, and existing areas were removed/renamed to be consistent.

I also renamed the Galar routes' prose to have "Galar" in the name, like the other regions.

Coming in later PRs

I intend to continue adding new wild areas, but they are massive. Rolling Fields takes up over half of the encounters added in #1550 and this PR combined. There are many wild areas to add, and each location area in the DLCs are wild areas.

Additionally, I've noticed an issue with our versions. There are version exclusives in the DLCs, but we lump both versions' DLC into one version (i.e. the-isle-of-armor instead of sword-the-isle-of-armor and shield-the-isle-of-armor). To accurately document version-exclusive encounters between Sword/Shield, we either need to add some DLC condition (which would get tiresome) or add these new versions tied to the relevant version group and restructure some existing entries in the API. For the moment, the gifts/trades I added from the DLC are tied to Sword/Shield rather than the relevant DLC for simplicity, but I intend to fix this in a separate PR dedicated to this specific fix.

@Naramsim I've added all of this in one large PR as I got the impression that you'd rather add this data in so we have the encounters we've been missing now and we can check things later, since I tend to work with encounters closely. If you'd rather smaller chunks as I mentioned in the past PR, let me know and I can break things apart for easier checks.

AI coding assistance disclosure

No AI used.

Contributor check list

  • I have written a description of the contribution and explained its motivation.
  • I have written tests for my code changes (if applicable).
  • I have read and understood the AI Assisted Contribution guidelines.
  • I will own this change in production, and I am prepared to fix any bugs caused by my code change.

jemarq04 added 30 commits June 8, 2026 10:11
jemarq04 added 30 commits June 12, 2026 20:13
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.

1 participant