Skip to content
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

4 new species flags #2293

Merged

Conversation

AsparagusEduardo
Copy link
Collaborator

@AsparagusEduardo AsparagusEduardo commented Sep 5, 2022

Description

Added in preparation for #2291

  • SPECIES_FLAG_ALL_PERFECT_IVS
  • SPECIES_FLAG_SHINY_LOCKED
  • SPECIES_FLAG_CANNOT_BE_TRADED

Added to assist with #2262 :

  • SPECIES_FLAG_MEGA_EVOLUTION

Discord contact info

AsparagusEduardo#6051

src/pokemon.c Outdated Show resolved Hide resolved
@AsparagusEduardo
Copy link
Collaborator Author

Solved conflicts and added new flag: SPECIES_FLAG_CANNOT_BE_TRADED.
Should be applyable to species like fusions and Partner Pikachu and Eevee.

@AsparagusEduardo AsparagusEduardo changed the title 2 new species flags, FLAG_ALL_PERFECT_IVS and FLAG_SHINY_LOCKED 3 new species flags Sep 9, 2022
@AsparagusEduardo AsparagusEduardo changed the base branch from master to dev September 10, 2022 01:32
@AsparagusEduardo AsparagusEduardo added the category: pokemon Pertains to Pokémon data and functionality label Sep 16, 2022
@AsparagusEduardo AsparagusEduardo changed the base branch from dev to dev_1.x September 16, 2022 17:29
@AsparagusEduardo AsparagusEduardo changed the title 3 new species flags 4 new species flags Sep 27, 2022
@AsparagusEduardo
Copy link
Collaborator Author

Solved conflicts and added new flag: SPECIES_FLAG_MEGA_EVOLUTION.

Should be useful for #2262.

@ghoulslash ghoulslash merged commit 441586f into rh-hideout:upcoming Oct 7, 2022
@AsparagusEduardo AsparagusEduardo deleted the RHH/pr/pokemonFlags branch October 7, 2022 17:19
@AsparagusEduardo AsparagusEduardo mentioned this pull request Oct 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category: pokemon Pertains to Pokémon data and functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants