[Refactor] Moved empty, pre-initialization allSpecies/allMoves/allAbilities lists to one file

src/battle-scene.ts

@@ -1,10 +1,10 @@
 import Phaser from "phaser";
 import UI from "#app/ui/ui";
+import { allAbilities, allMoves, allSpecies } from "#app/data/data-lists";
 import type { Pokemon } from "#app/field/pokemon";
 import { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon";
 import type { PokemonSpeciesFilter } from "./@types/PokemonSpeciesFilter";
 import type PokemonSpecies from "#app/data/pokemon-species";
-import { allSpecies } from "./data/all-species";
 import { getPokemonSpecies } from "./utils/pokemon-species-utils";
 import {
   fixedNumber,
@@ -52,7 +52,6 @@ import { Arena, ArenaBase } from "#app/field/arena";
 import { GameData } from "#app/system/game-data";
 import { addTextObject, getTextColor } from "#app/ui/text";
 import { TextStyle } from "#enums/text-style";
-import { allMoves } from "#app/data/all-moves";
 import {
   getDefaultModifierTypeForTier,
   getEnemyModifierTypesForWave,
@@ -66,7 +65,6 @@ import { getModifierType } from "./utils/modifier-type-utils";
 import { modifierTypes } from "./modifier/modifier-types";
 import { ModifierPoolType } from "#enums/modifier-pool-type";
 import AbilityBar from "#app/ui/ability-bar";
-import { allAbilities } from "./data/all-abilities";
 import { applyAbAttrs } from "./data/apply-ab-attrs";
 import type { FixedBattleConfig } from "#app/battle";
 import type { BattlerIndex } from "#enums/battler-index";

src/data/ab-attrs/bypass-speed-chance-ab-attr.ts

@@ -1,4 +1,4 @@
-import { allMoves } from "#app/data/all-moves";
+import { allMoves } from "#app/data/data-lists";
 import { MoveCategory } from "#enums/move-category";
 import type { Pokemon } from "#app/field/pokemon";
 import { globalScene } from "#app/global-scene";

src/data/ab-attrs/copy-fainted-ally-ability-ab-attr.ts

@@ -1,4 +1,4 @@
-import { allAbilities } from "../all-abilities";
+import { allAbilities } from "#app/data/data-lists";
 import type { Pokemon } from "#app/field/pokemon";
 import { globalScene } from "#app/global-scene";
 import { getPokemonNameWithAffix } from "#app/messages";

src/data/ab-attrs/post-damage-force-switch-ab-attr.ts

@@ -3,7 +3,7 @@ import { BooleanHolder, toDmgValue } from "#app/utils";
 import { Abilities } from "#enums/abilities";
 import { SwitchType } from "#enums/switch-type";
 import { PostDamageAbAttr } from "./post-damage-ab-attr";
-import { allMoves } from "#app/data/all-moves";
+import { allMoves } from "#app/data/data-lists";
 import type { Move } from "#app/data/move";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { globalScene } from "#app/global-scene";

src/data/ab-attrs/post-summon-copy-ability-ab-attr.ts

@@ -1,4 +1,4 @@
-import { allAbilities } from "../all-abilities";
+import { allAbilities } from "#app/data/data-lists";
 import type { Pokemon } from "#app/field/pokemon";
 import { globalScene } from "#app/global-scene";
 import { getPokemonNameWithAffix } from "#app/messages";

src/data/ab-attrs/prevent-bypass-speed-chance-ab-attr.ts

@@ -1,5 +1,5 @@
 import type { Move } from "#app/data/move";
-import { allMoves } from "#app/data/all-moves";
+import { allMoves } from "#app/data/data-lists";
 import type { Pokemon } from "#app/field/pokemon";
 import { globalScene } from "#app/global-scene";
 import { BattleCommand } from "#enums/battle-command";

src/data/ab-attrs/redirect-move-ab-attr.ts

@@ -1,4 +1,4 @@
-import { allMoves } from "#app/data/all-moves";
+import { allMoves } from "#app/data/data-lists";
 import { MoveTarget } from "#enums/move-target";
 import type { Pokemon } from "#app/field/pokemon";
 import type { NumberHolder } from "#app/utils";

src/data/ab-attrs/redirect-type-move-ab-attr.ts

@@ -1,4 +1,4 @@
-import { allMoves } from "#app/data/all-moves";
+import { allMoves } from "#app/data/data-lists";
 import type { MoveId } from "#enums/move-id";
 import type { ElementalType } from "#enums/elemental-type";
 import { RedirectMoveAbAttr } from "./redirect-move-ab-attr";

src/data/arena-tag.ts

@@ -2,7 +2,7 @@ import { globalScene } from "#app/global-scene";
 import type { Arena } from "#app/field/arena";
 import { ElementalType } from "#enums/elemental-type";
 import { BooleanHolder, isNullOrUndefined, NumberHolder, toDmgValue } from "#app/utils";
-import { allMoves } from "#app/data/all-moves";
+import { allMoves } from "#app/data/data-lists";
 import { MoveTarget } from "#enums/move-target";
 import { MoveCategory } from "#enums/move-category";
 import { getPokemonNameWithAffix } from "#app/messages";

src/data/balance/egg-moves.ts

@@ -1,4 +1,4 @@
-import { allMoves } from "#app/data/all-moves";
+import { allMoves } from "#app/data/data-lists";
 import { getEnumKeys, getEnumValues } from "#app/utils";
 import { MoveId } from "#enums/move-id";
 import { Species } from "#enums/species";

src/data/battle-anims/move-anim.ts

@@ -1,4 +1,4 @@
-import { allMoves } from "#app/data/all-moves";
+import { allMoves } from "#app/data/data-lists";
 import { AnimConfig } from "#app/data/anim-config";
 import { BattleAnim } from "#app/data/battle-anims";
 import { moveAnims } from "#app/data/move-anims";

src/data/battler-tags.ts

@@ -1,13 +1,12 @@
 import { globalScene } from "#app/global-scene";
-import { allAbilities } from "./all-abilities";
 import { applyAbAttrs } from "./apply-ab-attrs";
 import { CommonBattleAnim } from "./battle-anims/common-battle-anim";
 import { MoveChargeAnim } from "./battle-anims/move-charge-anim";
 import { CommonAnim } from "#enums/common-anim";
 import { ChargeAnim } from "#enums/charge-anim";
 import { SelfStatusMove, type Move } from "#app/data/move";
 import { applyMoveAttrs } from "#app/utils/move-utils";
-import { allMoves } from "#app/data/all-moves";
+import { allMoves, allAbilities } from "#app/data/data-lists";
 import { StatusCategoryOnAllyAttr } from "./move-attrs/status-category-on-ally-attr";
 import { ConsecutiveUseDoublePowerAttr } from "./move-attrs/consecutive-use-double-power-attr";
 import { HealOnAllyAttr } from "./move-attrs/heal-on-ally-attr";

src/data/data-lists.ts

@@ -0,0 +1,15 @@
+import type PokemonSpecies from "#app/data/pokemon-species";
+import { type Move } from "#app/data/move";
+import { type MoveId } from "#enums/move-id";
+import type { Ability } from "#app/data/ability";
+
+//#region Type
+
+export type AllMoves = {
+  [moveId in MoveId]: Move;
+};
+
+// Initialized as being empty; these will be filled during initialization
+export const allSpecies: PokemonSpecies[] = [];
+export const allMoves: AllMoves = {} as AllMoves;
+export const allAbilities: Ability[] = [];

src/data/init-abilities.ts

@@ -174,7 +174,7 @@ import { WeatherBasedSpeedDoublerAbAttr } from "#app/data/ab-attrs/weather-based
 import { WeightMultiplierAbAttr } from "#app/data/ab-attrs/weight-multiplier-ab-attr";
 import { WonderSkinAbAttr } from "#app/data/ab-attrs/wonder-skin-ab-attr";
 import { Ability } from "#app/data/ability";
-import { allMoves } from "#app/data/all-moves";
+import { allMoves, allAbilities } from "#app/data/data-lists";
 import { type Move } from "#app/data/move";
 import { FlinchAttr } from "#app/data/move-attrs/flinch-attr";
 import { VariableMoveTypeAttr } from "#app/data/move-attrs/variable-move-type-attr";
@@ -201,11 +201,11 @@ import { StatusEffect } from "#enums/status-effect";
 import { TerrainType } from "#enums/terrain-type";
 import { WeatherType } from "#enums/weather-type";
 import i18next from "i18next";
-import { allAbilities } from "./all-abilities";
 import { BypassParaSpeedReductionAbAttr } from "./ab-attrs/bypass-para-speed-reduction-ab-attr";
 
 export function initAbilities() {
   allAbilities.push(
+    new Ability(Abilities.NONE, 3),
     new Ability(Abilities.STENCH, 3).attr(
       PostAttackApplyBattlerTagAbAttr,
       false,

src/data/init-move-anim.ts

@@ -1,4 +1,4 @@
-import { allMoves } from "#app/data/all-moves";
+import { allMoves } from "#app/data/data-lists";
 import { chargeAnims } from "./charge-anims";
 import { moveAnims } from "./move-anims";
 import { AnimConfig } from "./anim-config";

src/data/init-moves.ts

@@ -1,4 +1,4 @@
-import { allMoves } from "#app/data/all-moves";
+import { allMoves } from "#app/data/data-lists";
 import { type ShellTrapTag, type StockpilingTag } from "#app/data/battler-tags";
 import { AttackMove, SelfStatusMove, StatusMove, type Move } from "#app/data/move";
 import { AbilityChangeAttr } from "#app/data/move-attrs/ability-change-attr";

src/data/init-species.ts

@@ -1,4 +1,4 @@
-import { allSpecies } from "#app/data/all-species";
+import { allSpecies } from "#app/data/data-lists";
 import PokemonSpecies from "#app/data/pokemon-species";
 import { PokemonForm } from "./pokemon-form";
 import { Abilities } from "#enums/abilities";

src/data/move-attrs/ability-change-attr.ts

@@ -3,7 +3,7 @@ import type { Pokemon } from "#app/field/pokemon";
 import { globalScene } from "#app/global-scene";
 import { getPokemonNameWithAffix } from "#app/messages";
 import i18next from "i18next";
-import { allAbilities } from "../all-abilities";
+import { allAbilities } from "#app/data/data-lists";
 import type { Move } from "#app/data/move";
 import { SpeciesFormChangeRevertWeatherFormTrigger } from "#app/data/pokemon-forms";
 import { MoveEffectAttr } from "#app/data/move-attrs/move-effect-attr";

src/data/move-attrs/ability-copy-attr.ts

@@ -2,7 +2,7 @@ import type { Pokemon } from "#app/field/pokemon";
 import { globalScene } from "#app/global-scene";
 import { getPokemonNameWithAffix } from "#app/messages";
 import i18next from "i18next";
-import { allAbilities } from "../all-abilities";
+import { allAbilities } from "#app/data/data-lists";
 import type { Move } from "#app/data/move";
 import { MoveEffectAttr } from "#app/data/move-attrs/move-effect-attr";
 import type { MoveConditionFunc } from "#app/@types/MoveConditionFunc";

src/data/move-attrs/ability-give-attr.ts

@@ -2,7 +2,7 @@ import type { Pokemon } from "#app/field/pokemon";
 import { globalScene } from "#app/global-scene";
 import { getPokemonNameWithAffix } from "#app/messages";
 import i18next from "i18next";
-import { allAbilities } from "../all-abilities";
+import { allAbilities } from "#app/data/data-lists";
 import type { Move } from "#app/data/move";
 import { MoveEffectAttr } from "#app/data/move-attrs/move-effect-attr";
 import type { MoveConditionFunc } from "#app/@types/MoveConditionFunc";

src/data/move-attrs/random-move-attr.ts

@@ -5,7 +5,7 @@ import { globalScene } from "#app/global-scene";
 import { LoadMoveAnimPhase } from "#app/phases/load-move-anim-phase";
 import { getEnumValues } from "#app/utils";
 import { type Move, getMoveTargets } from "#app/data/move";
-import { allMoves } from "#app/data/all-moves";
+import { allMoves } from "#app/data/data-lists";
 import { OverrideMoveEffectAttr } from "#app/data/move-attrs/override-move-effect-attr";
 
 /**

src/data/move-attrs/repeat-move-attr.ts

@@ -5,7 +5,7 @@ import { globalScene } from "#app/global-scene";
 import { getPokemonNameWithAffix } from "#app/messages";
 import i18next from "i18next";
 import { type Move } from "#app/data/move";
-import { allMoves } from "#app/data/all-moves";
+import { allMoves } from "#app/data/data-lists";
 import { MoveEffectAttr } from "#app/data/move-attrs/move-effect-attr";
 import type { MoveConditionFunc } from "#app/@types/MoveConditionFunc";
 import { PhaseId } from "#enums/phase-id";

src/data/move-attrs/sketch-attr.ts

@@ -4,7 +4,7 @@ import { getPokemonNameWithAffix } from "#app/messages";
 import { MoveId } from "#enums/move-id";
 import i18next from "i18next";
 import { type Move } from "../move";
-import { allMoves } from "#app/data/all-moves";
+import { allMoves } from "#app/data/data-lists";
 import type { MoveConditionFunc } from "#app/@types/MoveConditionFunc";
 import { targetMoveCopiableCondition } from "../move-conditions/target-move-copiable-condition";
 import { MoveEffectAttr } from "./move-effect-attr";

src/data/move-conditions/upper-hand-condition.ts

@@ -1,4 +1,4 @@
-import { allMoves } from "#app/data/all-moves";
+import { allMoves } from "#app/data/data-lists";
 import { MoveCondition } from "#app/data/move-conditions/move-condition";
 import { globalScene } from "#app/global-scene";
 import { BattleCommand } from "#enums/battle-command";

src/data/move.ts

@@ -31,7 +31,7 @@ import { VariableTargetAttr } from "#app/data/move-attrs/variable-target-attr";
 import type { MoveConditionFunc } from "#app/@types/MoveConditionFunc";
 import { MoveCondition } from "#app/data/move-conditions/move-condition";
 import { Stat } from "#enums/stat";
-import { allMoves } from "#app/data/all-moves";
+import { allMoves } from "#app/data/data-lists";
 import { UseHigherAttackingStatAttr } from "./move-attrs/use-higher-attacking-stat-attr";
 import { GMaxPowerAttr } from "./move-attrs/gmax-power-attr";
 import type { Species } from "#enums/species";

src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts

@@ -47,7 +47,7 @@ import {
 } from "#app/modifier/modifier";
 import i18next from "i18next";
 import MoveInfoOverlay from "#app/ui/move-info-overlay";
-import { allMoves } from "#app/data/all-moves";
+import { allMoves } from "#app/data/data-lists";
 import { ModifierTier } from "#enums/modifier-tier";
 import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 import { getSpriteKeysFromSpecies } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";

src/data/mystery-encounters/encounters/global-trade-system-encounter.ts

@@ -15,7 +15,7 @@ import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-en
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { Species } from "#enums/species";
 import type PokemonSpecies from "#app/data/pokemon-species";
-import { allSpecies } from "#app/data/all-species";
+import { allSpecies } from "#app/data/data-lists";
 import { getPokemonSpecies } from "#app/utils/pokemon-species-utils";
 import { getTypeRgb } from "#app/data/type";
 import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";

src/data/mystery-encounters/encounters/training-session-encounter.ts

@@ -1,5 +1,5 @@
 import type { Ability } from "#app/data/ability";
-import { allAbilities } from "#app/data/all-abilities";
+import { allAbilities } from "#app/data/data-lists";
 import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import {
   initBattleWithEnemyConfig,

src/data/mystery-encounters/encounters/weird-dream-encounter.ts

@@ -20,7 +20,7 @@ import { PokemonMove } from "#app/field/pokemon-move";
 import { NumberHolder, isNullOrUndefined, randSeedInt, randSeedShuffle } from "#app/utils";
 import type PokemonSpecies from "#app/data/pokemon-species";
 import { getPokemonSpecies, getSpecialSpeciesList } from "#app/utils/pokemon-species-utils";
-import { allSpecies } from "#app/data/all-species";
+import { allSpecies } from "#app/data/data-lists";
 import type { PokemonHeldItemModifier } from "#app/modifier/modifier";
 import { HiddenAbilityRateBoosterModifier } from "#app/modifier/modifier";
 import { achvs } from "#app/system/achv";

src/data/mystery-encounters/mystery-encounter-requirements.ts

@@ -1,5 +1,5 @@
 import { globalScene } from "#app/global-scene";
-import { allAbilities } from "../all-abilities";
+import { allAbilities } from "#app/data/data-lists";
 import { pokemonEvolutions } from "#app/data/balance/pokemon-evolutions";
 import { EvolutionItem } from "#enums/evolution-item";
 import { Nature } from "#enums/nature";

src/data/pokemon-forms.ts

@@ -1,5 +1,5 @@
 import type { Pokemon } from "../field/pokemon";
-import { allMoves } from "#app/data/all-moves";
+import { allMoves } from "#app/data/data-lists";
 import { MoveCategory } from "#enums/move-category";
 import { ElementalType } from "#enums/elemental-type";
 import type { AbstractConstructor, nil } from "#app/utils";

src/field/pokemon-move.ts

@@ -1,4 +1,4 @@
-import { allMoves } from "#app/data/all-moves";
+import { allMoves } from "#app/data/data-lists";
 import type { Move } from "#app/data/move";
 import type { Pokemon } from "#app/field/pokemon";
 import { toDmgValue } from "#app/utils";

src/field/pokemon.ts

@@ -9,7 +9,6 @@ import { PlayerBattleInfo, EnemyBattleInfo } from "#app/ui/battle-info";
 import type { Move } from "#app/data/move";
 import { getMoveTargets } from "#app/data/move";
 import { applyMoveAttrs } from "#app/utils/move-utils";
-import { allMoves } from "#app/data/all-moves";
 import { RechargeAttr } from "#app/data/move-attrs/recharge-attr";
 import { HitsTagAttr } from "#app/data/move-attrs/hits-tag-attr";
 import { TypelessAttr } from "#app/data/move-attrs/typeless-attr";
@@ -120,7 +119,7 @@ import { NoCritTag } from "#app/data/arena-tag";
 import { ArenaTagSide } from "#enums/arena-tag-side";
 import type { Ability } from "#app/data/ability";
 import { getAbApplyFunc } from "#app/data/apply-ab-attrs";
-import { allAbilities } from "#app/data/all-abilities";
+import { allAbilities, allMoves } from "#app/data/data-lists";
 import { applyAbAttrs } from "#app/data/apply-ab-attrs";
 import type PokemonData from "#app/system/pokemon-data";
 import { BattlerIndex } from "#enums/battler-index";

src/game-mode.ts

@@ -6,7 +6,7 @@ import { allChallenges, copyChallenge } from "./data/challenge";
 import { applyChallenges } from "./utils/challenge-utils";
 import { ChallengeType } from "#enums/challenge-type";
 import type PokemonSpecies from "./data/pokemon-species";
-import { allSpecies } from "./data/all-species";
+import { allSpecies } from "#app/data/data-lists";
 import type { Arena } from "./field/arena";
 import Overrides from "#app/overrides";
 import { randSeedInt, randSeedItem } from "#app/utils";

src/modifier/modifier-type.ts

@@ -1,7 +1,7 @@
 import type { PokemonMoveSelectFilter } from "#app/@types/PokemonMoveSelectFilter";
 import type { PokemonSelectFilter } from "#app/@types/PokemonSelectFilter";
 import { PARTY_UI_NO_EFFECT_MSG_i18N_KEY } from "#app/constants";
-import { allMoves } from "#app/data/all-moves";
+import { allMoves } from "#app/data/data-lists";
 import { pokemonEvolutions } from "#app/data/balance/pokemon-evolutions";
 import { tmPoolTiers, tmSpecies } from "#app/data/balance/tms";
 import { getNatureName, getNatureStatMultiplier } from "#app/data/nature";

src/phases/faint-phase.ts

@@ -10,7 +10,7 @@ import { type SkyDropTag } from "#app/data/battler-tags";
 import type { BattlerIndex } from "#enums/battler-index";
 import { BattleType } from "#enums/battle-type";
 import { applyAbAttrs } from "#app/data/apply-ab-attrs";
-import { allMoves } from "#app/data/all-moves";
+import { allMoves } from "#app/data/data-lists";
 import { FRIENDSHIP_LOSS_FROM_FAINT } from "#app/data/balance/starters";
 import { type DestinyBondTag, type GrudgeTag } from "#app/data/battler-tags";
 import { BattlerTagLapseType } from "#enums/battler-tag-lapse-type";

src/phases/learn-move-phase.ts

@@ -1,4 +1,4 @@
-import { allMoves } from "#app/data/all-moves";
+import { allMoves } from "#app/data/data-lists";
 import { loadMoveAnimAssets } from "#app/utils/move-anim-utils";
 import { initMoveAnim } from "#app/data/init-move-anim";
 import type { Move } from "#app/data/move";

src/phases/move-phase.ts

@@ -1,6 +1,6 @@
 import { BattlerIndex } from "#enums/battler-index";
 import { applyAbAttrs } from "#app/data/apply-ab-attrs";
-import { allMoves } from "#app/data/all-moves";
+import { allMoves } from "#app/data/data-lists";
 import { CommonAnim } from "#enums/common-anim";
 import { type CenterOfAttentionTag } from "#app/data/battler-tags";
 import { BattlerTagLapseType } from "#enums/battler-tag-lapse-type";

src/phases/select-target-phase.ts

@@ -1,5 +1,5 @@
 import type { BattlerIndex } from "#enums/battler-index";
-import { allMoves } from "#app/data/all-moves";
+import { allMoves } from "#app/data/data-lists";
 import { globalScene } from "#app/global-scene";
 import { UiMode } from "#enums/ui-mode";
 import { MoveId } from "#enums/move-id";

src/phases/turn-start-phase.ts

@@ -1,6 +1,6 @@
 import { BattlerIndex } from "#enums/battler-index";
 import { applyAbAttrs } from "#app/data/apply-ab-attrs";
-import { allMoves } from "#app/data/all-moves";
+import { allMoves } from "#app/data/data-lists";
 import { MoveHeaderAttr } from "#app/data/move-attrs/move-header-attr";
 import { type Pokemon } from "#app/field/pokemon";
 import { PokemonMove } from "#app/field/pokemon-move";