-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
Refactored incense baby checks into table and added Gen 9 config. #2531
Refactored incense baby checks into table and added Gen 9 config. #2531
Conversation
It might be nice to use a struct for this, e.g.: static const struct {
u16 parentSpecies;
u16 item;
u16 babySpecies;
} sIncenseBabyTable[] =
{
... // As before. Then the loop can become: for (i = 0; i < ARRAY_COUNT(IncenseBabyTable); i++)
{
if (sIncenseBabyTable[i].babySpecies == *species && motherItem != sIncenseBabyTable[i].item && fatherItem != sIncenseBabyTable[i].item)
*species = sIncenseBabyTable[i].parentSpecies;
} (Even if not, probably a good idea to make your array Also, I'm not sure about my choice of |
Fixed compile and applied suggestions |
I think you might need some ifdefs to make sure the game compiles without having all Pokémon from other gens enabled. |
The species defines are still present when the generation toggles are disabled, so it should compile. However, you are right that getting a gen 4 species shouldn't happen when those are scrubbed. Will fix that. |
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.
fix conflicts and suggestions and looks good
Can I take the chance to add a table for the Pichu/Volt Tackle interaction? Or should I leave that for a separate PR? |
seems fine to me |
…able, allowing for custom combinations
# Conflicts: # include/config/pokemon.h
Ready for re-review |
Now properly ready ^^; |
Description
Title.
Discord contact info
AsparagusEduardo#6051