diff --git a/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts b/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts index 5a1bbc214c2..085cb8f3594 100644 --- a/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts +++ b/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts @@ -12,8 +12,8 @@ import { CustomPokemonData } from "#data/pokemon-data"; import type { PokemonSpecies } from "#data/pokemon-species"; import { getStatusEffectCatchRateMultiplier } from "#data/status-effect"; import type { AbilityId } from "#enums/ability-id"; -import type { HeldItemId } from "#enums/held-item-id"; import { ChallengeType } from "#enums/challenge-type"; +import type { HeldItemId } from "#enums/held-item-id"; import { PlayerGender } from "#enums/player-gender"; import type { PokeballType } from "#enums/pokeball"; import type { PokemonType } from "#enums/pokemon-type"; @@ -643,22 +643,17 @@ export async function catchPokemon( } }; const addToParty = (slotIndex?: number) => { - pokemon.addToParty(pokeballType, slotIndex); + const newPokemon = pokemon.addToParty(pokeballType, slotIndex); if (globalScene.getPlayerParty().filter(p => p.isShiny()).length === 6) { globalScene.validateAchv(achvs.SHINY_PARTY); } - }; - Promise.all([pokemon.hideInfo(), globalScene.gameData.setPokemonCaught(pokemon)]).then(() => { - const addStatus = new BooleanHolder(true); - applyChallenges(ChallengeType.POKEMON_ADD_TO_PARTY, pokemon, addStatus); - if (!addStatus.value) { - removePokemon(); - if (newPokemon) { - newPokemon.loadAssets().then(end); - } else { - end(); - } - }); + globalScene.updateItems(true); + removePokemon(); + if (newPokemon) { + newPokemon.loadAssets().then(end); + } else { + end(); + } }; Promise.all([pokemon.hideInfo(), globalScene.gameData.setPokemonCaught(pokemon)]).then(() => { const addStatus = new BooleanHolder(true); diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts index 13b9fcbb517..557ec6c7e29 100644 --- a/src/ui/party-ui-handler.ts +++ b/src/ui/party-ui-handler.ts @@ -187,7 +187,7 @@ export class PartyUiHandler extends MessageUiHandler { private lastCursor = 0; private lastLeftPokemonCursor = 0; private lastRightPokemonCursor = 0; - private selectCallback: PartySelectCallback | PokemonItemTransferSelectFilter | null; + private selectCallback: PartySelectCallback | PartyItemTransferSelectCallback | null; private selectFilter: PokemonSelectFilter | PokemonItemTransferSelectFilter; private moveSelectFilter: PokemonMoveSelectFilter; private tmMoveId: MoveId; diff --git a/src/utils/challenge-utils.ts b/src/utils/challenge-utils.ts index 43297027e04..b924df1cd08 100644 --- a/src/utils/challenge-utils.ts +++ b/src/utils/challenge-utils.ts @@ -8,7 +8,7 @@ import type { MoveId } from "#enums/move-id"; import type { MoveSourceType } from "#enums/move-source-type"; import type { SpeciesId } from "#enums/species-id"; import type { EnemyPokemon, PlayerPokemon, Pokemon } from "#field/pokemon"; -import type { ModifierTypeOption } from "#modifiers/modifier-type"; +import type { RewardOption } from "#items/reward"; import type { DexAttrProps } from "#system/game-data"; import { BooleanHolder, type NumberHolder } from "./common"; import { getPokemonSpecies } from "./pokemon-utils"; @@ -229,7 +229,7 @@ export function applyChallenges( */ export function applyChallenges( challengeType: ChallengeType.SHOP_ITEM, - shopItem: ModifierTypeOption | null, + shopItem: RewardOption | null, status: BooleanHolder, ): boolean; @@ -242,7 +242,7 @@ export function applyChallenges( */ export function applyChallenges( challengeType: ChallengeType.WAVE_REWARD, - reward: ModifierTypeOption | null, + reward: RewardOption | null, status: BooleanHolder, ): boolean;