Removes duplicate code in AI functions #5457
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Ready for review. |
AlexOn1ine
changed the title
AlexOn1ine
commented
Oct 3, 2024
src/battle_util.c
Outdated
Comment on lines
5382
to
5400
| switch(gLastUsedAbility) | ||
| { | ||
| case ABILITY_MOTOR_DRIVE: | ||
| statId = STAT_SPEED; | ||
| break; | ||
| case ABILITY_LIGHTNING_ROD: | ||
| case ABILITY_STORM_DRAIN: | ||
| statId = STAT_SPATK; | ||
| break; | ||
| case ABILITY_SAP_SIPPER: | ||
| case ABILITY_WIND_RIDER: | ||
| statId = STAT_ATK; | ||
| break; | ||
| case ABILITY_WELL_BAKED_BODY: | ||
| statAmount = 2; | ||
| statId = STAT_DEF; | ||
| break; | ||
|
|
||
| } |
There was a problem hiding this comment.
This part is a bit scuffed but it was worse when I checked them in the function directly. It is cleaner isolated here.
There was a problem hiding this comment.
The enums look chef's kiss though, I'll try to make time to review tomorrow if no one beats me to it :)
|
I found a potential bug in singles (present before the pr) but when I tried to fix it some tests started failing. Didn't want to go to deep into it so I left a comment. |
Pawkkie
reviewed
Oct 4, 2024
hedara90
added
category: battle-ai
Pawkkie
previously approved these changes
Oct 8, 2024
AlexOn1ine
commented
Oct 9, 2024
|
Let's wait with merging until #5489 is merged |
DizzyEggg
requested changes
Oct 9, 2024
AlexOn1ine
commented
Oct 9, 2024
Ready for re-review. I think it is fine if this one is merged first, Someone will have to take care of conflicts anyways. |
DizzyEggg
approved these changes
Oct 9, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
CanAbilityBlockMove,CanPartnerAbilityBlockMoveandCanAbilityAbsorbMoveto remove redundancy inAI_CheckBadMoveandIsDamageMoveUnusableNot that much code was removed but the important part was to unify both so we don't need to add those abilities to AI functions. We actually didn't have a check for Good As Gold, Wind Rider and we didn't check the opposing partner ability.
Closes #5454