From 449c806170626b62929f467cfcade8312a2695de Mon Sep 17 00:00:00 2001
From: Jakub Hanko <60473007+JakubHanko@users.noreply.github.com>
Date: Thu, 16 May 2024 22:34:23 +0200
Subject: [PATCH] Fix imports

---
 src/data/battler-tags.ts | 23 ++++++++++++-----------
 src/data/move.ts         | 39 ++++++++++++++++++++-------------------
 src/field/pokemon.ts     |  4 ++--
 3 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts
index 52642d2f81c..ef1a62cac93 100644
--- a/src/data/battler-tags.ts
+++ b/src/data/battler-tags.ts
@@ -1,19 +1,20 @@
-import Pokemon, { HitResult, MoveResult } from "../field/pokemon";
-import { getPokemonMessage, getPokemonPrefix } from "../messages";
-import { CommonAnimPhase, MoveEffectPhase, MovePhase, PokemonHealPhase, ShowAbilityPhase, StatChangePhase } from "../phases";
-import * as Utils from "../utils";
-import { BlockNonDirectDamageAbAttr, FlinchEffectAbAttr, ReverseDrainAbAttr, allAbilities, applyAbAttrs } from "./ability";
 import { CommonAnim, CommonBattleAnim } from "./battle-anims";
-import { BattleStat } from "./battle-stat";
-import { Abilities } from "./enums/abilities";
-import { BattlerTagType } from "./enums/battler-tag-type";
-import { Moves } from "./enums/moves";
-import { ChargeAttr, MoveFlags, allMoves } from "./move";
+import { CommonAnimPhase, MoveEffectPhase, MovePhase, PokemonHealPhase, ShowAbilityPhase, StatChangePhase } from "../phases";
+import { getPokemonMessage, getPokemonPrefix } from "../messages";
+import Pokemon, { MoveResult, HitResult } from "../field/pokemon";
 import { Stat, getStatName } from "./pokemon-stat";
 import { StatusEffect } from "./status-effect";
+import * as Utils from "../utils";
+import { Moves } from "./enums/moves";
+import { ChargeAttr, MoveFlags, allMoves } from "./move";
+import { getTypeDamageMultiplier, Type } from "./type";
+import { BlockNonDirectDamageAbAttr, FlinchEffectAbAttr, ReverseDrainAbAttr, applyAbAttrs } from "./ability";
+import { Abilities } from "./enums/abilities";
+import { BattlerTagType } from "./enums/battler-tag-type";
 import { TerrainType } from "./terrain";
-import { Type, getTypeDamageMultiplier } from "./type";
 import { WeatherType } from "./weather";
+import { BattleStat } from "./battle-stat";
+import { allAbilities } from "./ability"
 
 export enum BattlerTagLapseType {
   FAINT,
diff --git a/src/data/move.ts b/src/data/move.ts
index a2d66012ffe..e98aafdea47 100644
--- a/src/data/move.ts
+++ b/src/data/move.ts
@@ -1,29 +1,30 @@
-import { ModifierPoolType } from "#app/modifier/modifier-type";
-import { BattlerIndex } from "../battle";
-import Pokemon, { AttackMoveResult, EnemyPokemon, HitResult, MoveResult, PlayerPokemon, PokemonMove, TurnMove } from "../field/pokemon";
-import { getPokemonMessage } from "../messages";
-import { PokemonHeldItemModifier } from "../modifier/modifier";
-import { BattleEndPhase, MoveEffectPhase, MovePhase, NewBattlePhase, PartyStatusCurePhase, PokemonHealPhase, StatChangePhase, SwitchSummonPhase } from "../phases";
-import i18next, { Localizable } from '../plugins/i18n';
-import { Command } from "../ui/command-ui-handler";
-import * as Utils from "../utils";
-import { BlockNonDirectDamageAbAttr, BlockOneHitKOAbAttr, BlockRecoilDamageAttr, FieldPreventExplosiveMovesAbAttr, ForceSwitchOutImmunityAbAttr, IgnoreContactAbAttr, MaxMultiHitAbAttr, MoveAbilityBypassAbAttr, PostDefendContactApplyStatusEffectAbAttr, PreSwitchOutAbAttr, ReverseDrainAbAttr, UncopiableAbilityAbAttr, UnsuppressableAbilityAbAttr, UnswappableAbilityAbAttr, allAbilities, applyAbAttrs, applyPostDefendAbAttrs, applyPreSwitchOutAbAttrs } from "./ability";
-import { ArenaTagSide, ArenaTrapTag } from "./arena-tag";
+import { Moves } from "./enums/moves";
 import { ChargeAnim, MoveChargeAnim, initMoveAnim, loadMoveAnimAssets } from "./battle-anims";
+import { BattleEndPhase, MovePhase, NewBattlePhase, PartyStatusCurePhase, PokemonHealPhase, StatChangePhase, SwitchSummonPhase } from "../phases";
 import { BattleStat, getBattleStatName } from "./battle-stat";
 import { EncoreTag } from "./battler-tags";
-import { Abilities } from "./enums/abilities";
-import { ArenaTagType } from "./enums/arena-tag-type";
 import { BattlerTagType } from "./enums/battler-tag-type";
-import { Biome } from "./enums/biome";
-import { Moves } from "./enums/moves";
-import { Species } from "./enums/species";
-import { SpeciesFormChangeActiveTrigger } from "./pokemon-forms";
-import { Stat } from "./pokemon-stat";
+import { getPokemonMessage } from "../messages";
+import Pokemon, { AttackMoveResult, EnemyPokemon, HitResult, MoveResult, PlayerPokemon, PokemonMove, TurnMove } from "../field/pokemon";
 import { StatusEffect, getStatusEffectHealText } from "./status-effect";
-import { TerrainType } from "./terrain";
 import { Type } from "./type";
+import * as Utils from "../utils";
 import { WeatherType } from "./weather";
+import { ArenaTagSide, ArenaTrapTag } from "./arena-tag";
+import { ArenaTagType } from "./enums/arena-tag-type";
+import { UnswappableAbilityAbAttr, UncopiableAbilityAbAttr, UnsuppressableAbilityAbAttr, NoTransformAbilityAbAttr, BlockRecoilDamageAttr, BlockOneHitKOAbAttr, IgnoreContactAbAttr, MaxMultiHitAbAttr, applyAbAttrs, BlockNonDirectDamageAbAttr, applyPreSwitchOutAbAttrs, PreSwitchOutAbAttr, applyPostDefendAbAttrs, PostDefendContactApplyStatusEffectAbAttr, MoveAbilityBypassAbAttr, ReverseDrainAbAttr, FieldPreventExplosiveMovesAbAttr, ForceSwitchOutImmunityAbAttr } from "./ability";
+import { Abilities } from "./enums/abilities";
+import { allAbilities } from './ability';
+import { PokemonHeldItemModifier } from "../modifier/modifier";
+import Battle, { BattlerIndex } from "../battle";
+import { Stat } from "./pokemon-stat";
+import { TerrainType } from "./terrain";
+import { SpeciesFormChangeActiveTrigger } from "./pokemon-forms";
+import { Species } from "./enums/species";
+import { ModifierPoolType } from "#app/modifier/modifier-type";
+import { Command } from "../ui/command-ui-handler";
+import { Biome } from "./enums/biome";
+import i18next, { Localizable } from '../plugins/i18n';
 
 export enum MoveCategory {
   PHYSICAL,
diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 752883d5c67..00b39ea9813 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -27,10 +27,10 @@ import { TempBattleStat } from '../data/temp-battle-stat';
 import { ArenaTagSide, WeakenMoveScreenTag, WeakenMoveTypeTag } from '../data/arena-tag';
 import { ArenaTagType } from "../data/enums/arena-tag-type";
 import { Biome } from "../data/enums/biome";
-import { Ability, AbAttr, BattleStatMultiplierAbAttr, BlockCritAbAttr, BonusCritAbAttr, BypassBurnDamageReductionAbAttr, FieldPriorityMoveImmunityAbAttr, FieldVariableMovePowerAbAttr, IgnoreOpponentStatChangesAbAttr, MoveImmunityAbAttr, MoveTypeChangeAttr, NonSuperEffectiveImmunityAbAttr, PreApplyBattlerTagAbAttr, PreDefendFullHpEndureAbAttr, ReceivedMoveDamageMultiplierAbAttr, ReduceStatusEffectDurationAbAttr, StabBoostAbAttr, StatusEffectImmunityAbAttr, TypeImmunityAbAttr, VariableMovePowerAbAttr, VariableMoveTypeAbAttr, WeightMultiplierAbAttr, allAbilities, applyAbAttrs, applyBattleStatMultiplierAbAttrs, applyPostDefendAbAttrs, applyPreApplyBattlerTagAbAttrs, applyPreAttackAbAttrs, applyPreDefendAbAttrs, applyPreSetStatusAbAttrs, UnsuppressableAbilityAbAttr, SuppressFieldAbilitiesAbAttr, NoFusionAbilityAbAttr, MultCritAbAttr, IgnoreTypeImmunityAbAttr, DamageBoostAbAttr, IgnoreTypeStatusEffectImmunityAbAttr } from '../data/ability';
+import { Ability, AbAttr, BattleStatMultiplierAbAttr, BlockCritAbAttr, BonusCritAbAttr, BypassBurnDamageReductionAbAttr, FieldPriorityMoveImmunityAbAttr, FieldVariableMovePowerAbAttr, IgnoreOpponentStatChangesAbAttr, MoveImmunityAbAttr, MoveTypeChangeAttr, NonSuperEffectiveImmunityAbAttr, PreApplyBattlerTagAbAttr, PreDefendFullHpEndureAbAttr, ReceivedMoveDamageMultiplierAbAttr, ReduceStatusEffectDurationAbAttr, StabBoostAbAttr, StatusEffectImmunityAbAttr, TypeImmunityAbAttr, VariableMovePowerAbAttr, VariableMoveTypeAbAttr, WeightMultiplierAbAttr, allAbilities, applyAbAttrs, applyBattleStatMultiplierAbAttrs, applyPostDefendAbAttrs, applyPreApplyBattlerTagAbAttrs, applyPreAttackAbAttrs, applyPreDefendAbAttrs, applyPreSetStatusAbAttrs, UnsuppressableAbilityAbAttr, SuppressFieldAbilitiesAbAttr, NoFusionAbilityAbAttr, MultCritAbAttr, IgnoreTypeImmunityAbAttr, DamageBoostAbAttr } from '../data/ability';
 import { Abilities } from "#app/data/enums/abilities";
 import PokemonData from '../system/pokemon-data';
-import Battle, { BattlerIndex } from '../battle';
+import { BattlerIndex } from '../battle';
 import { BattleSpec } from "../enums/battle-spec";
 import { Mode } from '../ui/ui';
 import PartyUiHandler, { PartyOption, PartyUiMode } from '../ui/party-ui-handler';