Merge and fix conflicts

This commit is contained in:
Christopher Schmidt 2024-10-15 18:16:23 -04:00
parent c205f07255
commit 74f664ef96

View File

@ -6430,8 +6430,8 @@ export class TransformAttr extends MoveEffectAttr {
user.summonData.gender = target.getGender();
user.summonData.fusionGender = target.getFusionGender();
// Power Trick's effect will not preserved after using Transform
user.removeTag(BattlerTagType.POWER_TRICK);
// Power Trick's effect will not preserved after using Transform
user.removeTag(BattlerTagType.POWER_TRICK);
// Copy all stats (except HP)
for (const s of EFFECTIVE_STATS) {