From 07e14ac67cfbf0b44374014827755be9d2875768 Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Sun, 8 Jun 2025 04:38:15 -0700
Subject: [PATCH] Fix missed merge conflicts

---
 .../mystery-encounters/encounters/clowning-around-encounter.ts  | 2 +-
 src/data/mystery-encounters/utils/encounter-pokemon-utils.ts    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/data/mystery-encounters/encounters/clowning-around-encounter.ts b/src/data/mystery-encounters/encounters/clowning-around-encounter.ts
index 3096b50afc8..701accd9198 100644
--- a/src/data/mystery-encounters/encounters/clowning-around-encounter.ts
+++ b/src/data/mystery-encounters/encounters/clowning-around-encounter.ts
@@ -467,7 +467,7 @@ function displayYesNoOptions(resolve) {
   globalScene.ui.setModeWithoutClear(UiMode.OPTION_SELECT, config, null, true);
 }
 
-function handleRepeatedAbility(resolve, pokemon: PlayerPokemon, ability: Abilities) {
+function handleRepeatedAbility(resolve, pokemon: PlayerPokemon, ability: AbilityId) {
   showEncounterText(`${namespace}:option.1.repeated_ability`);
   const fullOptions = [
     {
diff --git a/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts b/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts
index 51ffb0c0adc..a08b09a81fc 100644
--- a/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts
+++ b/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts
@@ -1027,7 +1027,7 @@ export function isPokemonValidForEncounterOptionSelection(
  * @param flagAcceptAbility
  */
 
-export function applyAbilityOverrideToPokemon(pokemon: Pokemon, ability: Abilities, flagAcceptAbility: boolean) {
+export function applyAbilityOverrideToPokemon(pokemon: Pokemon, ability: AbilityId, flagAcceptAbility: boolean) {
   const isFusion = pokemon.isFusion();
   const data = isFusion
     ? (pokemon.fusionCustomPokemonData ??= new CustomPokemonData())