Skip to content

Add Sword/Shield encounters (Part 5: The Isle of Armor)#1600

Merged
Naramsim merged 25 commits into
PokeAPI:masterfrom
jemarq04:feat/add-swsh-isle-of-armor
Jul 10, 2026
Merged

Add Sword/Shield encounters (Part 5: The Isle of Armor)#1600
Naramsim merged 25 commits into
PokeAPI:masterfrom
jemarq04:feat/add-swsh-isle-of-armor

Conversation

@jemarq04

@jemarq04 jemarq04 commented Jul 9, 2026

Copy link
Copy Markdown
Member

Change description

The continuation of PR #1550, #1564, #1577, #1581, 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 all needed conditions (weather and before/after beating the game) in The Isle of Armor. This PR also adds a new encounter method chase-water for the Sharpedo that appear and chase you whenever you enter water in the surrounding sea. A new encounter condition value other-daily-1-in-100-chance was added for the rare level 80 wandering Wailord that appears in Workout Sea.

Also, I hadn't realized until checking Bulbapedia but some of the in-game trades I had added in an earlier PR were actually version-exclusive. I removed the relevant encounters for those.

After this, I'll tackle the-crown-tundra and loop back to add max raid encounters for everything.. I entirely forgot about those!

AI coding assistance disclosure

No AI was 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 23 commits July 6, 2026 10:56
@Naramsim

Copy link
Copy Markdown
Member

Hi! Thanks for the PR! I'm a bit confused by the Get 1/100 chance to spawn when entering location for the first time that day phrasing. This is the encounter condition, right?

@jemarq04

Copy link
Copy Markdown
Member Author

I got the information for the Wailord encounter from Bulbapedia: https://bulbapedia.bulbagarden.net/wiki/Workout_Sea#Pok%C3%A9mon

Admittedly, I think I just got confused by the wording. Wandering encounters all have a daily respawn check, this is just a wandering encounter that isn't 100% guaranteed. I'll just update this to use an encounter slot with 1% rarity, as it should be

@jemarq04

Copy link
Copy Markdown
Member Author

I've also been having some trouble working with my git fork lately - is the master tag new? It seems that git can't resolve between upstream/master the branch and upstream/master the tag now and I have to go to GitHub to actually sync my master branch to pokeAPI's.

@Naramsim

Copy link
Copy Markdown
Member

Ah, Yeah, that's a new tag. I'll remove it and change the name to something different. I hope it resolves it.

@Naramsim Naramsim merged commit d638fe7 into PokeAPI:master Jul 10, 2026
19 checks passed
@Naramsim

Copy link
Copy Markdown
Member

@jemarq04 could you try again and pull? I renamed the release to master-branch.

@pokeapi-machine-user

Copy link
Copy Markdown

A PokeAPI/api-data refresh has started. In ~45 minutes the staging branch of PokeAPI/api-data will be pushed with the new generated data.

The staging branch will be deployed in our staging environment and the entire API will be ready to review.

A Pull Request (master<-staging) will be also created at PokeAPI/api-data and assigned to the PokeAPI Core team to be reviewed. If approved and merged new data will soon be available worldwide at pokeapi.co.

@pokeapi-machine-user

Copy link
Copy Markdown

The updater script has finished its job and has now opened a Pull Request towards PokeAPI/api-data with the updated data.

The Pull Request can be seen deployed in our staging environment when CircleCI deploy will be finished (check the start time of the last build).

@jemarq04

Copy link
Copy Markdown
Member Author

@jemarq04 could you try again and pull? I renamed the release to master-branch.

I'm still seeing a master tag, there's just a new master-branch tag as well.

@jemarq04 jemarq04 deleted the feat/add-swsh-isle-of-armor branch July 10, 2026 11:58
Naramsim pushed a commit to PokeAPI/api-data that referenced this pull request Jul 10, 2026
@Naramsim

Copy link
Copy Markdown
Member

Maybe you need to pull the tags so that the local version gets deleted

@Naramsim

Copy link
Copy Markdown
Member

Maybe this can help you: https://stackoverflow.com/a/54297675/3482533

@jemarq04

Copy link
Copy Markdown
Member Author

I mean that the tag is still listed on GitHub: https://github.com/PokeAPI/pokeapi/tags. When I run git fetch --prune-tags upstream nothing happens and the tag is still around:

$ git show-ref master
332f2b9ae08b48056d7dea3cd76f5f26840e73a0 refs/heads/master
332f2b9ae08b48056d7dea3cd76f5f26840e73a0 refs/remotes/origin/master
d638fe7791214a8d3c3282e2a3113eea7cfef288 refs/remotes/upstream/master
c839bfc352bf5c4abfa2d6427166dd12c65b5a48 refs/tags/master

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.

3 participants