Skip to content

Conversation

@SimplyBLGDev
Copy link
Contributor

@SimplyBLGDev SimplyBLGDev commented Mar 7, 2021

Review commits for more details on changes.

Overall changes:

  • Encounter methods for special Pokémon (Only one and Pokéflute).
  • Encounter conditions for special Pokémon.
  • Missing area for special Pokémon (Bell Tower Roof for Ho-Oh, Sky Pillar Roof for Rayquaza, Terra Cave for Groudon, Marine Cave for Kyogre, Cave of Origin b4f for Groudon/Kyogre)
  • Locations and areas for roaming Pokémon (Kanto, Johto, Hoenn and Sinnoh)
  • Missing encounters in:
  • 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

SimplyBLGDev and others added 6 commits March 6, 2021 19:55
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.
Comment on lines 54366 to 54372
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
Copy link
Contributor Author

@SimplyBLGDev SimplyBLGDev Mar 7, 2021

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
@SimplyBLGDev
Copy link
Contributor Author

  • Added all headbutt encounters from Gold, Silver and Crystal, taken straight from a decompilation (check the 'add heabutt encounters' commit for more info).
  • Added Snorlax encounters from Gold, Silver, Crystal, Heart Gold and Soul Silver.
  • Added Groudon, Kyogre and Rayquaza encounters for Ruby, Sapphire and Emerald.
  • Also added some additional conditions, locations, location areas and condition values to support these new encounters.
  • Corrected some minor typos that were present in earlier commits.

Please merge as soon as possible.

795,800,0,area
796,801,0,area
797,802,0,area
798,228,0,area
Copy link
Member

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?

Copy link
Contributor Author

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)

@Naramsim
Copy link
Member

Naramsim commented Mar 8, 2021

I checked a bit locally. Seems to work well! Let's check the API diff.

@Naramsim Naramsim merged commit aefce08 into PokeAPI:master Mar 8, 2021
@pokeapi-machine-user
Copy link

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 staging branch will be deployed in our staging environment and you will be able to review the entire API.

A Pull Request (master<-staging) will be also created at PokeAPI/api-data and assigned to the PokeAPI Core team to be reviewed. If approved and merged new data will soon be available worldwide at pokeapi.co.

@pokeapi-machine-user
Copy link

The updater script has finished its job and has now opened a Pull Request towards PokeAPI/api-data with the updated data.

You can see the Pull Request deployed at our staging environment when CircleCI deploy will be finished (check the started time of the last build).

@SimplyBLGDev SimplyBLGDev deleted the Missing_encounters_fixes branch March 9, 2021 16:47
@SimplyBLGDev SimplyBLGDev restored the Missing_encounters_fixes branch March 9, 2021 16:50
@SimplyBLGDev SimplyBLGDev deleted the Missing_encounters_fixes branch March 9, 2021 16:52
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.

3 participants