-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Begin adding Sword/Shield encounters #1550
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.
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
jemarq04
wants to merge
52
commits into
PokeAPI:master
from
jemarq04:feat/add-part-sword-shield-encounters
Open
Changes from all commits
Commits
Show all changes
52 commits
Select commit
Hold shift + click to select a range
d21b591
feat: add new swsh encounter slots
jemarq04 37c9c8c
feat: add galar-route-1 encounters for sword and shield
jemarq04 ea75c8a
feat: add slowpoke wedgehurst encounters
jemarq04 54fdf33
feat: update galar-route-2 location areas
jemarq04 8218e46
fix: update encounter slots and current galar encounters
jemarq04 95570a5
feat: add encounters to galar-route-2-main
jemarq04 d058625
feat: add fishing encounter method and encounter slots in swsh
jemarq04 69182b5
feat: add fishing encounters to galar-route-2
jemarq04 3cddf7c
fix: change seedot encounters in shield to lotad on route 2
jemarq04 7e8630e
feat: add encounters for galar-route-2-lake
jemarq04 7811f87
feat: add most encounters on galar-route-2-lakeside
jemarq04 d8f8cda
feat: update fishing encounter slots to match others and re-add galar...
jemarq04 de5e35c
feat: add fishing encounters for galar-route-2-lakeside
jemarq04 bd80cf8
feat: add motostoke location areas
jemarq04 bb6c73d
feat: add motostoke encounters
jemarq04 87f41e8
feat: add location area prose
jemarq04 5f64873
fix: remove unknown location area for galar-route-3
jemarq04 aebc6d9
feat: add galar-route-3 prose and update location area name
jemarq04 d7e4a79
feat: add galar-route-3 encounters
jemarq04 2b1d949
feat: update galar-route-3 location areas
jemarq04 432cf50
fix: add missing galar-route-3 encounters
jemarq04 41da8e9
feat: add galar-encounters and location area prose
jemarq04 427ea6a
feat: add encounter slots for berry trees in sword-shield
jemarq04 fc89211
fix: add missing berry-trees encounters. rename berry-piles to berry-...
jemarq04 3112e85
fix: update encounter slots and clear encounter progress
jemarq04 d1e0267
feat: add galar-route-1 encounters
jemarq04 364879a
feat: add wedgehurst encounters and location area prose
jemarq04 4ff7831
feat: add galar-route-2 encounters for main and lake location areas
jemarq04 d14ec02
feat: add galar-route-2-lakeside encounters
jemarq04 471b127
feat: add motostoke encounters
jemarq04 11fb367
feat: add galar-route-3 encounters
jemarq04 dd468e4
feat: add galar-mine encounters
jemarq04 f169604
fix: change overworld-special and overworld-water-special to only-one...
jemarq04 03e5189
feat: add galar-route-4 encounters
jemarq04 cc6c596
feat: add turffield encounters and location area prose
jemarq04 d3d1f0c
feat: add galar-route-5 encounters and location area prose
jemarq04 1fc35af
feat: add hulbury encounters
jemarq04 5fc8c89
feat: add galar-mine-no-2 encounters
jemarq04 6c20030
feat: add motostoke-outskirts encounters and location area prose
jemarq04 4fb5f6f
merge: Merge branch 'master' of github.com:jemarq04/pokeapi into feat...
jemarq04 c3b41b0
feat: add galar-route-6 encounters and location area prose
jemarq04 c905cd3
feat: add glimwood-tangle location area prose
jemarq04 5d65805
fix: begin re-doing encounters with encounter slots made per unique s...
jemarq04 903b8e7
feat: add galar-route-2 encounters
jemarq04 7719645
feat: add motostoke encounters
jemarq04 551b4e9
feat: add galar-route-3 encounters
jemarq04 83f75cb
feat: add galar-mine encounters
jemarq04 2af1460
feat: add galar-route-4, turffield, galar-route-5 encounters
jemarq04 9622050
feat: add hulbury, galar-mine-no-2, and motostoke-outskirts encounters
jemarq04 3b03f53
merge: Merge branch 'master' of github.com:jemarq04/pokeapi into feat...
jemarq04 17c313b
fix: correct location area prose for Route 6 (wrong id)
jemarq04 224edf6
fix: remove fishing encounter method and use existing bubbling-spots ...
jemarq04 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.