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

SpeciesInfo tests #3688

Merged
merged 7 commits into from
Dec 11, 2023
Merged

Conversation

mrgriffin
Copy link
Collaborator

@mrgriffin mrgriffin commented Dec 11, 2023

Adds tests that verify appropriate invariants hold between the members of gSpeciesInfo:

  • All forms of a species have the same .formSpeciesIdTable.
  • All form changes' .targetSpecies are to a species ID in .formSpeciesIdTable.

Also corrects some small issues I noticed while writing and fixing these tests.

Closes #3689

@@ -48948,6 +48949,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.categoryName = _("Drummer"), \
.footprint = gMonFootprint_Rillaboom, \
LEARNSETS(Rillaboom), \
.formSpeciesIdTable = sRillaboomFormSpeciesIdTable, \
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I understand that they were missing from the base forms, but shouldn't they be in the Gigantamax forms also? The Mega Evolutions certainly seem to have the tables assigned to all forms, so we should probably be consistent (unless there's a reason not to be?)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, all forms of a species should have the table assigned.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not at all clear here on GitHub, but this is a change to the RILLABOOM_MISC_INFO macro which is used by both SPECIES_RILLABOOM and SPECIES_RILLABOOM_GIGANTAMAX. So it should be applied to both the base form and the Gigantamax forms.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, sorry, just woke up xD

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apologies, my bad :) all good to go then!

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

np! It's really difficult to see on GitHub!

@Bassoonian Bassoonian merged commit ee1fb1d into rh-hideout:upcoming Dec 11, 2023
1 check passed
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