Minor refactoring

src/data/ability.ts

@@ -1,4 +1,4 @@
-import Pokemon, { HitResult, PokemonMove } from "../pokemon";
+import Pokemon, { HitResult, PokemonMove } from "../field/pokemon";
 import { Type } from "./type";
 import * as Utils from "../utils";
 import { BattleStat, getBattleStatName } from "./battle-stat";

src/data/arena-tag.ts

@@ -1,9 +1,9 @@
-import { Arena } from "../arena";
+import { Arena } from "../field/arena";
 import { Type } from "./type";
 import * as Utils from "../utils";
 import { allMoves } from "./move";
 import { getPokemonMessage } from "../messages";
-import Pokemon, { HitResult, PokemonMove } from "../pokemon";
+import Pokemon, { HitResult, PokemonMove } from "../field/pokemon";
 import { DamagePhase, MoveEffectPhase, ObtainStatusEffectPhase } from "../phases";
 import { StatusEffect } from "./status-effect";
 import { BattlerTagType } from "./enums/battler-tag-type";

src/data/battle-anims.ts

@@ -1,7 +1,7 @@
 //import { battleAnimRawData } from "./battle-anim-raw-data";
 import BattleScene from "../battle-scene";
 import { AttackMove, ChargeAttr, DelayedAttackAttr, MoveFlags, SelfStatusMove, allMoves } from "./move";
-import Pokemon from "../pokemon";
+import Pokemon from "../field/pokemon";
 import * as Utils from "../utils";
 import { BattlerIndex } from "../battle";
 import stringify, { Element } from "json-stable-stringify";

src/data/battler-tags.ts

@@ -1,7 +1,7 @@
 import { CommonAnim, CommonBattleAnim } from "./battle-anims";
 import { CommonAnimPhase, DamagePhase, MovePhase, ObtainStatusEffectPhase, PokemonHealPhase, ShowAbilityPhase } from "../phases";
 import { getPokemonMessage } from "../messages";
-import Pokemon, { MoveResult, HitResult } from "../pokemon";
+import Pokemon, { MoveResult, HitResult } from "../field/pokemon";
 import { Stat } from "./pokemon-stat";
 import { StatusEffect } from "./status-effect";
 import * as Utils from "../utils";

src/data/berry.ts

@@ -1,6 +1,6 @@
 import { PokemonHealPhase, StatChangePhase } from "../phases";
 import { getPokemonMessage } from "../messages";
-import Pokemon, { HitResult } from "../pokemon";
+import Pokemon, { HitResult } from "../field/pokemon";
 import { getBattleStatName } from "./battle-stat";
 import { BattleStat } from "./battle-stat";
 import { BattlerTagType } from "./enums/battler-tag-type";

src/data/move.ts

@@ -5,7 +5,7 @@ import { BattleStat, getBattleStatName } from "./battle-stat";
 import { EncoreTag } from "./battler-tags";
 import { BattlerTagType } from "./enums/battler-tag-type";
 import { getPokemonMessage } from "../messages";
-import Pokemon, { AttackMoveResult, HitResult, MoveResult, PlayerPokemon, PokemonMove, TurnMove } from "../pokemon";
+import Pokemon, { AttackMoveResult, HitResult, MoveResult, PlayerPokemon, PokemonMove, TurnMove } from "../field/pokemon";
 import { StatusEffect, getStatusEffectDescriptor, getStatusEffectHealText } from "./status-effect";
 import { Type } from "./type";
 import * as Utils from "../utils";

src/data/pokemon-evolutions.ts

@@ -3,7 +3,7 @@ import { AttackTypeBoosterModifier, FlinchChanceModifier } from "../modifier/mod
 import { AttackTypeBoosterModifierType } from "../modifier/modifier-type";
 import { Moves } from "./enums/moves";
 import { PokeballType } from "./pokeball";
-import Pokemon from "../pokemon";
+import Pokemon from "../field/pokemon";
 import { Stat } from "./pokemon-stat";
 import { Species } from "./enums/species";
 import { Type } from "./type";

src/data/pokemon-forms.ts

@@ -1,6 +1,6 @@
 import { TimeOfDay } from "./enums/time-of-day";
 import { PokemonFormChangeItemModifier } from "../modifier/modifier";
-import Pokemon from "../pokemon";
+import Pokemon from "../field/pokemon";
 import { Moves } from "./enums/moves";
 import { SpeciesFormKey } from "./pokemon-species";
 import { Species } from "./enums/species";

src/data/trainer-config.ts

@@ -1,6 +1,6 @@
 import BattleScene, { startingWave } from "../battle-scene";
 import { ModifierTypeFunc, modifierTypes } from "../modifier/modifier-type";
-import { EnemyPokemon } from "../pokemon";
+import { EnemyPokemon } from "../field/pokemon";
 import * as Utils from "../utils";
 import { TrainerType } from "./enums/trainer-type";
 import { Moves } from "./enums/moves";

src/data/weather.ts

@@ -1,6 +1,6 @@
 import { Biome } from "./enums/biome";
 import { getPokemonMessage } from "../messages";
-import Pokemon from "../pokemon";
+import Pokemon from "../field/pokemon";
 import { Type } from "./type";
 import Move, { AttackMove } from "./move";
 import * as Utils from "../utils";