Repository navigation
Conversation
serabi
marked this pull request as ready for review
November 14, 2026 20:15
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Change description
The goal of this PR is to add swarm conditions to the HeartGold and SoulSilver encounters at the S.S. Anne dock (location-area
349). The dock has the swarm slots, but nothing in the API currently marks them as swarm-only. Because of that, surfing adds up to 160%, and the extra Magikarp fishing slots mentioned in the issue show up all the time.For each version, this adds
swarm-yesto the swarm slot andswarm-noto the regular slot it replaces:Old Rod slot 3 and Good Rod slot 1 are already Magikarp, so the swarm doesn't change them and they stay as they are.
The main Vermilion City area (
282) already tags its Wingull surfing swarm the same way.Closes #1110.
References
T06) surfing swarm to Wingull and its fishing swarm to Magikarp:https://github.com/pret/pokeheartgold/blob/6bf138d6035aa6b43d6f8f4132a12df70f86dcec/files/fielddata/encountdata/gs_enc_data.json#L19305
https://github.com/pret/pokeheartgold/blob/6bf138d6035aa6b43d6f8f4132a12df70f86dcec/files/fielddata/encountdata/gs_enc_data.json#L19493-L19495
https://github.com/pret/pokeheartgold/blob/6bf138d6035aa6b43d6f8f4132a12df70f86dcec/src/field/encounter_check.c#L174-L212
https://github.com/pret/pokeheartgold/blob/6bf138d6035aa6b43d6f8f4132a12df70f86dcec/src/field/encounter_check.c#L308
https://github.com/PokeAPI/pokeapi/blob/8a92bfa7dab2f12b84b5d151562f9857c133ff30/data/v2/csv/encounters.csv#L22881-L22936
https://github.com/PokeAPI/pokeapi/blob/8a92bfa7dab2f12b84b5d151562f9857c133ff30/data/v2/csv/encounter_condition_value_map.csv#L6495-L6496
Testing
Built the local database before and after the change and checked the S.S. Anne dock location-area endpoint.
Surfing and each rod now total 100% both with and without a swarm, in both versions.
All 69 tests passed, along with pre-commit, lint, formatting and type checks.
AI coding assistance disclosure
I used AI assistance from Claude Code (Claude Opus 5.5) to investigate the issue, compare PokeAPI's CSV records with HGSS's disassembled encounter data and code, and apply the fix. I then reviewed all of the code manually. All decisions made - and the PR text - are my own.
Contributor check list