Skip to content

Add oras surfing and fishing encounters (Part 1)#1542

Open
ConnorMolz wants to merge 13 commits into
PokeAPI:masterfrom
ConnorMolz:Add-ORAS-surfing-and-fishing-encounters
Open

Add oras surfing and fishing encounters (Part 1)#1542
ConnorMolz wants to merge 13 commits into
PokeAPI:masterfrom
ConnorMolz:Add-ORAS-surfing-and-fishing-encounters

Conversation

@ConnorMolz

@ConnorMolz ConnorMolz commented Jun 5, 2026

Copy link
Copy Markdown

Change description

I am adding the surfing and fishing encounters from ORAS to the project.
I will add in this PR Route 101 to 109, Oldale Town, Petalburg City, Rustboro City, Dewford Town and Slateport City

AI coding assistance disclosure

I used only the inline assistance of VS-Code (not sure if its AI).

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.

@ConnorMolz ConnorMolz changed the title Add oras surfing and fishing encounters Add oras surfing and fishing encounters (Part 1) Jun 5, 2026
@Naramsim

Copy link
Copy Markdown
Member

Hi I completely missed this PR, sorry for the late reply. I'll try to see if the additions round up in the next days

@ConnorMolz

Copy link
Copy Markdown
Author

Hi I completely missed this PR, sorry for the late reply. I'll try to see if the additions round up in the next days

Hi,

All fine was busy last days...
I finished the Part 1 so far. To the AI Guidelines I used AI to create a local debug script (local and not pushed)

@ConnorMolz ConnorMolz marked this pull request as ready for review June 17, 2026 10:45
Copilot AI review requested due to automatic review settings June 17, 2026 10:45

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Note

Copilot was unable to run its full agentic suite in this review.

Adds new encounter data and normalizes encounter method records in the v2 CSV dataset.

Changes:

  • Appends new encounter rows for additional location areas/versions.
  • Introduces new encounter slots tied to newly added methods/slot distributions.
  • Fixes missing IDs in encounter methods and adds prose for new methods.

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 2 comments.

File Description
data/v2/csv/encounters.csv Adds new encounter rows referencing newly-added slot IDs.
data/v2/csv/encounter_slots.csv Adds new encounter slot definitions to support the new encounters/methods.
data/v2/csv/encounter_methods.csv Fills in missing IDs and adds a new encounter method.
data/v2/csv/encounter_method_prose.csv Adds new prose rows for honey-tree and poke-nav-surfing.

Comment on lines 55 to +57
54,hidden-grotto,54
55,honey-tree,54 No newline at end of file
55,honey-tree,54
56,poke-nav-surfing,55 No newline at end of file

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we should just have poke-nav as the method, seeing as we don't have something like that for other similar grass encounters in the game.

55,9,Slathering a Honey Tree with Honey and waiting for a Pokémon to appear. No newline at end of file
55,9,Slathering a Honey Tree with Honey and waiting for a Pokémon to appear.
56,9,Surfing and using the PokéNav Plus in Pokémon Omega Ruby and Alpha Sapphire
56,6,Surfen und das Poké-Multi-Navi nutzen in Pokémon Omega Rubin und Alpha Saphire No newline at end of file
@ConnorMolz

Copy link
Copy Markdown
Author

@Naramsim I dont know why there still a Merge conflict, I fixed it local...

@ConnorMolz

Copy link
Copy Markdown
Author

Sorry for the Ping got it solved localy

Comment on lines 55 to +57
54,hidden-grotto,54
55,honey-tree,54 No newline at end of file
55,honey-tree,54
56,poke-nav-surfing,55 No newline at end of file

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1496,10,1,8,5
1497,10,1,9,5
1498,10,1,10,5
1499,16,5,,60

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you reveal a bit how you added all these numbers? I just checked the entries for Frillish and they seem ok.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did a little reverse engeniering on some data, and copied the structure for the data I added.

As data source I used the german vatient of Bulbepedia (https://www.pokewiki.de/Hauptseite)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Can you change the order in the file above, fix again the conflicts?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are all missing the slot number, these should be added in as well. For example,

Suggested change
1499,16,5,,60
1499,16,5,1,60

@jemarq04 jemarq04 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added some comments as I reviewed the contributions. Not sure why encounters in Heartgold/Soulsilver were added to this? This is not in the scope of the PR.

Also, regarding the PokeNav encounters, we should just use one encounter slot set at 100% rarity since these seem to be chosen at an undetermined rarity. I'd rather not choose an arbitrary 60/35/5 split between the possible encounters.

1496,10,1,8,5
1497,10,1,9,5
1498,10,1,10,5
1499,16,5,,60

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are all missing the slot number, these should be added in as well. For example,

Suggested change
1499,16,5,,60
1499,16,5,1,60

Comment on lines 55 to +57
54,hidden-grotto,54
55,honey-tree,54 No newline at end of file
55,honey-tree,54
56,poke-nav-surfing,55 No newline at end of file

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we should just have poke-nav as the method, seeing as we don't have something like that for other similar grass encounters in the game.

Comment on lines +69661 to +69664
75523,16,236,1487,190,15,16
75524,15,241,1482,163,15,16
75525,16,241,1482,163,15,16
75526,15,241,1483,204,15,16

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
75523,16,236,1487,190,15,16
75524,15,241,1482,163,15,16
75525,16,241,1482,163,15,16
75526,15,241,1483,204,15,16

Why did this PR add anything to do with headbutt encounters in Johto?

Comment on lines +69429 to +69440
75291,25,395,1499,72,20,25
75292,25,395,1500,278,20,20
75293,25,395,1501,279,25,30
75294,25,395,1502,129,10,15
75295,25,395,1503,72,5,5
75296,25,395,1504,129,25,25
75297,25,395,1505,72,25,25
75298,25,395,1506,320,25,25
75299,25,395,1507,320,30,40
75300,26,395,1499,72,20,25
75301,26,395,1500,278,20,20
75302,26,395,1501,279,25,30

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
75291,25,395,1499,72,20,25
75292,25,395,1500,278,20,20
75293,25,395,1501,279,25,30
75294,25,395,1502,129,10,15
75295,25,395,1503,72,5,5
75296,25,395,1504,129,25,25
75297,25,395,1505,72,25,25
75298,25,395,1506,320,25,25
75299,25,395,1507,320,30,40
75300,26,395,1499,72,20,25
75301,26,395,1500,278,20,20
75302,26,395,1501,279,25,30
75291,25,395,1523,72,20,25
75292,25,395,1524,278,20,20
75293,25,395,1525,279,25,30
75294,25,395,1502,129,10,15
75295,25,395,1503,72,5,5
75296,25,395,1504,129,25,25
75297,25,395,1505,72,25,25
75298,25,395,1506,320,25,25
75299,25,395,1507,320,30,40
75300,26,395,1523,72,20,25
75301,26,395,1524,278,20,20
75302,26,395,1525,279,25,30

The surfing encounters in Route 103 should be at rates 65/30/5% (not 60/35/5 as was used).

75338,25,350,1517,341,30,40
75339,26,350,1508,183,15,15
75340,26,350,1509,184,20,25
75341,26,350,1510,283,20,20

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
75341,26,350,1510,283,20,20
75341,26,350,1510,283,15,15

Surskit should be level 15 in Petalburg City, to match what was given in Omega Ruby.

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.

4 participants