-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Missing encounters fixes #583
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
Missing encounters fixes #583
Conversation
Sync with upstream
Added encounters method "Only One" and "Pokéflute". Added encounters for Voltorb, Electrode, Snorlax, Articuno, Zapdos, Moltres and Mewtwo for Red/Blue and yellow versions.
Added encounters for Electrode, Snorlax, Articuno, Zapdos, Moltres and Mewtwo for FR/LG.
Added encounters for Lugia, Ho-Oh and Suicune in GSC.
Added: - Encounter conditions for beat elite four, beat elite four round 2 - Added locations and areas for roaming Pokémon (One for each region) - Added area for Bell Tower Roof - Added encounters for Lugia, Ho-Oh, Articuno, Zapdos, Moltres, Mewtwo, Raikou, Entei, Suicune, Latios and Latias to GSC, HGSS, FRLG and RSE where applicable. - Bound encounter conditions where applicable.
data/v2/csv/encounters.csv
Outdated
| 58076,3,262,561,144,50,50 | ||
| 58077,3,330,561,145,50,50 | ||
| 58078,3,330,561,100,40,40 | ||
| 58079,3,330,561,101,43,43 | ||
| 58080,3,332,561,146,50,50 | ||
| 58081,3,276,579,143,30,30 | ||
| 58082,3,309,579,143,30,30 | ||
| 58076,3,262,562,144,50,50 | ||
| 58077,3,330,562,145,50,50 | ||
| 58078,3,330,562,100,40,40 | ||
| 58079,3,330,562,101,43,43 | ||
| 58080,3,332,562,146,50,50 | ||
| 58081,3,276,580,143,30,30 | ||
| 58082,3,309,580,143,30,30 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changed encounter slot id from 561 to 562 and 579 to 580 for yellow encounters since slots 561 and 579 are associated to version group red-blue instead of version group yellow, this didn't seem to generate any errors anywhere but it was to be corrected anyways.
Add: - Encounter methods: Headbutt low encounter rate tree, Headbutt normal encounter rate tree, Headbutt high encounter rate tree - Location: Azalea Town and it's area (Required for headbutt encounters) - Encounter Slots: Encounter slots for heabutt low, normal and high for Gold, Silver and Crystal, along with their respective and correct chances - Encounters: 1682 new encounters corresponding to every missing headbutt encounter from Pokémon Gold Silver and Crystal PS: The source of all this data is the Pokémon decompilations by pret on github (https://github.com/pret/pokecrystal)[Pokémon Crystal decompilation], (https://github.com/pret/pokegold)[Pokémon Gold and Pokémon Silver Decompilation] The data is as accurate as these decompilations are.
- Snorlax in GSC, HGSS - Groudon, Kyogre and Rayquaza in RSE - Removed unused Goldenrod city area location area - Changed location area prose to some areas to correct duplicate location name in display - Added proper default values for story-progress condition - Added new condition 'other' for weirder conditions - Added missing areas for legendary encounters in Hoenn - Added missing locations for legendary encounters in Hoenn
Please merge as soon as possible. |
| 795,800,0,area | ||
| 796,801,0,area | ||
| 797,802,0,area | ||
| 798,228,0,area |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You left out 799 on purpose?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, it was removed in one of the later commits since it was unused (The data was to be used on headbutts but was an empty table, hence I created the area and later realized it was useless)
|
I checked a bit locally. Seems to work well! Let's check the API diff. |
|
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 updater script has finished its job and has now opened a Pull Request towards PokeAPI/api-data with the updated data. |
Review commits for more details on changes.
Overall changes:
Red, Blue, Yellow (Articuno, Zapdos, Moltres, Mewtwo, Electrode, Voltorb and Snorlax).
Gold, Silver, Crystal (Raikou, Entei, Suicune, Lugia, Ho-Oh, Snorlax)
Ruby, Sapphire, Emerald (Latios, Latias, Groudon, Kyogre, Rayquaza)
Fire Red, Leaf Green (Articuno, Zapdos, Moltres, Mewtwo, Snorlax, Electrode, Raikou, Entei, Suicune)
Heart Gold, Soul Silver (Raikou, Entei, Suicune, Lugia, Ho-Oh, Latios, Latias, Articuno, Zapdos, Moltres, Mewtwo, Snorlax)
Encounter methods for headbutts (low encounter tree, normal encounter tree, high encounter tree)
Headbutt encounter slots for Gold Silver Crystal
Missing location area for headbutt encounters (Azalea town Area)
Headbutt encounters for Gold Silver Crystal