Move RestoreBattlerData out of Ai_CalcDmg and add SaveBattlerData Protections #4156
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
ghoulslash
changed the title
AlexOn1ine
reviewed
Feb 13, 2024
AlexOn1ine
approved these changes
May 15, 2024
|
Just realized SetBatrlerData checks I will add a follow-up PR for this tomorrow if nobody else gets to it first |
AlexOn1ine
added a commit
that referenced
this pull request
Jun 28, 2024
Since #4156 SetBattlerData and RestoreBattlerData were moved out of `AI_CalcDamage`. I assume this was a bad merge somewhere
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.
Having this restore function implicit to AI_CalcDamage seems like poor coding practice. Also, AI_CalcDamage and AI_CalcDamageSaveBattlers were called within ai routines without saving or restoring the battlers afterwards, respectively, which could be problematic
Also adds a "saved" field to
struct AI_SavedBattleMonto prevent calling SaveBattlerData twice on the same battler until the data is restored to prevent overwriting values