Fixed typo relating to AI switching, fixed Pokémon sent from the party to storage in battle not resetting their battle-only conditions, fixed player's sprite in Duel minigame not caring about the player's outfit, added missing move flags

This commit is contained in:
Maruno17
2023-09-21 19:36:10 +01:00
parent bc18aa95f2
commit b2c66b7b0c
6 changed files with 15 additions and 9 deletions

View File

@@ -32,8 +32,13 @@ module Battle::CatchAndStoreMixin
end
next if party_index < 0 # Cancelled
party_size = pbPlayer.party.length
# Send chosen Pokémon to storage
# Get chosen Pokémon and clear battle-related conditions
send_pkmn = pbPlayer.party[party_index]
@peer.pbOnLeavingBattle(self, send_pkmn, @usedInBattle[0][party_index], true)
send_pkmn.statusCount = 0 if send_pkmn.status == :POISON # Bad poison becomes regular
send_pkmn.makeUnmega
send_pkmn.makeUnprimal
# Send chosen Pokémon to storage
stored_box = @peer.pbStorePokemon(pbPlayer, send_pkmn)
pbPlayer.party.delete_at(party_index)
box_name = @peer.pbBoxName(stored_box)