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

Add FORM_CHANGE_BATTLE_TERASTALLIZATION + allow species to force tera types #4438

Merged
merged 19 commits into from
Jun 4, 2024

Conversation

kittenchilly
Copy link

@kittenchilly kittenchilly commented Apr 25, 2024

Description

Adds FORM_CHANGE_BATTLE_TERASTALLIZATION , which happens upon terastallization and requires the pokemon to be the defined tera type in order to change to that form. Form tables have also been updated with this.

Also adds forceTeraType to species, which will make any pokemon of that species or form always use that tera type. Terapagos and Ogerpon properly force the correct tera types with this, and Ogerpon's tera type properly changes when changing between its forms.

Discord contact info

kittenchilly

Copy link
Collaborator

@AsparagusEduardo AsparagusEduardo left a comment

Choose a reason for hiding this comment

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

I disagree that forced Tera Types should be allowed to be changed after being generated. The forced Tera type field itself should signify that you cannot change the type.

src/pokemon.c Outdated Show resolved Hide resolved
include/pokemon.h Show resolved Hide resolved
src/data/pokemon/species_info/gen_9_families.h Outdated Show resolved Hide resolved
src/pokemon.c Outdated Show resolved Hide resolved
@kittenchilly
Copy link
Author

Addressed all reviews

@kittenchilly
Copy link
Author

kittenchilly commented Apr 25, 2024

I disagree that forced Tera Types should be allowed to be changed after being generated. The forced Tera type field itself should signify that you cannot change the type.

I didn't notice this comment until after I addressed the reviews but doing this would be a lot easier

@kittenchilly
Copy link
Author

kittenchilly commented Apr 25, 2024

It actually isn't easier apparently, a bunch of tests start failing if I force it through GetTeraType or GetMonData. It works fine how it is right now so I think we should leave it be. Might even be more accurate to the games this way

@AsparagusEduardo
Copy link
Collaborator

It actually isn't easier apparently, a bunch of tests start failing if I force it through GetTeraType or GetMonData. It works fine how it is right now so I think we should leave it be. Might even be more accurate to the games this way

I think this is because of the type order. I think we need to address this before this PR.

@kittenchilly
Copy link
Author

I actually figured out how to fix it, and it forces it properly.

@kittenchilly
Copy link
Author

Actually, I won't make P_SHOW_TERA_TYPE GEN_LATEST until we add unique tera type icons for it, which will be a separate PR.

@AlexOn1ine AlexOn1ine added this to the 1.9.0 milestone May 23, 2024
@kittenchilly
Copy link
Author

Ready to re-review

Copy link
Collaborator

@AsparagusEduardo AsparagusEduardo left a comment

Choose a reason for hiding this comment

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

This needs to add a test to confirm that species is being changed upon Terastallization.

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

@AlexOn1ine AlexOn1ine left a comment

Choose a reason for hiding this comment

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

Kitten since the forms will be functional with this can you please write tests for #4454?

@kittenchilly
Copy link
Author

kittenchilly commented Jun 3, 2024

Addressed all reviews again. This should fix #4454 now as well.

test/battle/gimmick/terastal.c Outdated Show resolved Hide resolved
@AsparagusEduardo AsparagusEduardo dismissed AlexOn1ine’s stale review June 3, 2024 21:40

Tests added for Tera Starstorm

@AlexOn1ine AlexOn1ine merged commit 7f8f480 into rh-hideout:upcoming Jun 4, 2024
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