From 499198fd78fb964772bb4b4e326ccfab6a92f934 Mon Sep 17 00:00:00 2001 From: Frutescens Date: Fri, 2 Aug 2024 20:10:32 -0700 Subject: [PATCH] Manual merge locales/en/config.ts --- src/locales/en/config.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/locales/en/config.ts b/src/locales/en/config.ts index 032acad9d8f..a577ba1d2b7 100644 --- a/src/locales/en/config.ts +++ b/src/locales/en/config.ts @@ -39,7 +39,7 @@ import { nature } from "./nature"; import { partyUiHandler } from "./party-ui-handler"; import { pokeball } from "./pokeball"; import { pokemon } from "./pokemon"; -import { pokemonForm } from "./pokemon-form"; +import { pokemonForm, battlePokemonForm } from "./pokemon-form"; import { pokemonInfo } from "./pokemon-info"; import { pokemonInfoContainer } from "./pokemon-info-container"; import { pokemonSummary } from "./pokemon-summary"; @@ -63,6 +63,7 @@ export const enConfig = { battle: battle, battleInfo: battleInfo, battleMessageUiHandler: battleMessageUiHandler, + battlePokemonForm: battlePokemonForm, battlerTags: battlerTags, berry: berry, bgmName: bgmName,