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.
I should've gotten to these sooner, but this fixes a few outstanding issues.
#2943: Revives are buggy in 1v2 Battles.
This was a simple fix. The battle script to send out the revived battler was changed to use
BS_SCRIPTING
andgBattleScripting.battler
was set when an item required a revive animation. Originally, it was usingBS_ATTACKER
, meaning it would perform a send out animation on the battler that used the item.#2967: Unable to cancel actions in a double battle after using an item.
I don't understand this fix if I'm being totally honest, but it works. In
battle_controller_player.c
, whereB_ACTION_CANCEL_PARTNER_ACTION
is supposed to be returned, I removed the Poke Ball check to return an item to the player's bag when cancelling an action after the first battler used an item. This was not meant to be the fix, but I couldn't find where to look next, and when doing some debug printing I noticed it was enough. Wonderful.#2967: Bad item use battlestring.
This was a fix to
BS_GetBattlerSide
, which erroneously usescmd->battler
without passing it throughGetBattlerForBattleScript
. This meansBS_ATTACKER
will always be1
, so it will always print the enemy trainer string, which looks bugged for the player. There are other natives that seem to make this error as well.Issue(s) that this PR fixes
Fixes #2943 and #2967.
Discord contact info
Agustin#1522