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

Fixed Forecast and Flower Gift #2978

Merged
merged 8 commits into from
May 23, 2023

Conversation

AgustinGDLV
Copy link
Collaborator

@AgustinGDLV AgustinGDLV commented May 5, 2023

Description

This PR does the following:

  • The now unused u8 TryWeatherFormChange has been removed (last remnant of old Castform hacks?).
  • Flower Gift now correctly boosts its own and an ally's attack and special defense by 1.5x.
  • Forecast and Flower Gift form changes work consistently with weather changes.
  • Gastro Acid, Core Enforcer, Simple Beam, and Worry Seed revert Castform and Cherrim to normal in Gen 5+ (config added).
  • Adds tests for Forecast and Flower Gift.

Tests Added

image
image

Issue(s) that this PR fixes

Fixes #2972.

Discord contact info

Agustin#1522

src/battle_script_commands.c Outdated Show resolved Hide resolved
src/battle_script_commands.c Outdated Show resolved Hide resolved
src/battle_script_commands.c Outdated Show resolved Hide resolved
data/battle_scripts_1.s Outdated Show resolved Hide resolved
data/battle_scripts_1.s Show resolved Hide resolved
test/ability_flower_gift.c Outdated Show resolved Hide resolved
test/ability_forecast.c Show resolved Hide resolved
test/ability_forecast.c Show resolved Hide resolved
test/ability_forecast.c Show resolved Hide resolved
test/ability_forecast.c Show resolved Hide resolved
@AgustinGDLV
Copy link
Collaborator Author

Ready for review! I added a missing interaction with Air Lock (that also makes it pretty much impossible to test Strong Winds), reworked how the weather form reversion is done, and added all the missing tests. Castform is now functional with snow, too!

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.

B_WEATHER_FORMS already exists.

In retrospect, I didn't properly communicate that I wanted Castform and Cherrim's generational changes to be handled by the form change tables, which is why I proposed the optional ability parameter, in order to toggle between them by changing the data.

src/battle_util.c Outdated Show resolved Hide resolved
@AgustinGDLV
Copy link
Collaborator Author

AgustinGDLV commented May 23, 2023

Added assumptions, ready again. Ignore the force push, I forgot committed code review changes don't just magically make their way onto my local repo, but the change was made in the new commit anyways so I just force pushed.

@AsparagusEduardo AsparagusEduardo merged commit 5061927 into rh-hideout:upcoming May 23, 2023
@AsparagusEduardo AsparagusEduardo mentioned this pull request May 31, 2023
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.

Cherrim and Castform's form changes seems broken.
2 participants