Skip to content

Add Johto safari zone encounters #1557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Machine-Maker wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Add Johto safari zone encounters #1557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7f2ef50
Add Johto safari zone encounters
Machine-Maker Jun 13, 2026
a2673a4
Merge branch 'master' into fix/johto-safari-zone
Machine-Maker Jun 13, 2026
f3ac386
Adjust naming/prose
Machine-Maker Jun 19, 2026
b3d88a0
Merge remote-tracking branch 'upstream/master' into fix/johto-safari-…
Machine-Maker Jun 20, 2026
88b92af
Use more expressive conditions
Machine-Maker Jun 30, 2026
3b32834
Merge remote-tracking branch 'upstream/master' into fix/johto-safari-…
Machine-Maker Jun 30, 2026
8976c19
Remove impossible water-based encounters
Machine-Maker Jul 1, 2026
f0e1511
Adjust naming
Machine-Maker Jul 1, 2026
1649168
Merge remote-tracking branch 'upstream/master' into fix/johto-safari-…
Machine-Maker Jul 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions data/v2/csv/encounter_condition_prose.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,4 @@ encounter_condition_id,local_language_id,name
23,9,Have save data from another Pokémon game
24,9,Find a certain number of Alolan Diglett in Isle of Armor
25,9,"During specific weather conditions like sun, rain, or snow"
26,9,Johto Safari Zone Blocks
Loading
Loading