diff --git a/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts b/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts index a05da4893c6..cc7b839588c 100644 --- a/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts +++ b/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts @@ -34,7 +34,6 @@ import { setEncounterRewards, transitionMysteryEncounterIntroVisuals, } from "#mystery-encounters/encounter-phase-utils"; -import { getSpriteKeysFromSpecies } from "#mystery-encounters/encounter-pokemon-utils"; import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option"; @@ -177,7 +176,26 @@ export const BugTypeSuperfanEncounter: MysteryEncounter = MysteryEncounterBuilde .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) .withScenePartySizeRequirement(3, 6) .withMaxAllowedEncounters(1) - .withIntroSpriteConfigs([]) // These are set in onInit() + .withIntroSpriteConfigs([ + { + species: SpeciesId.VESPIQUEN, + spriteKey: "", + fileRoot: "", + hasShadow: true, + repeat: true, + x: 35, + y: -2, + yShadow: -2, + }, + { + spriteKey: "bug_type_superfan", + fileRoot: "trainer", + hasShadow: true, + x: -20, + y: 5, + yShadow: 5, + }, + ]) .withAutoHideIntroVisuals(false) .withIntroDialogue([ { @@ -194,56 +212,11 @@ export const BugTypeSuperfanEncounter: MysteryEncounter = MysteryEncounterBuilde // Bug type superfan trainer config const config = getTrainerConfigForWave(globalScene.currentBattle.waveIndex); - const spriteKey = config.getSpriteKey(); encounter.enemyPartyConfigs.push({ trainerConfig: config, female: true, }); - let beedrillKeys: { spriteKey: string; fileRoot: string }; - let butterfreeKeys: { spriteKey: string; fileRoot: string }; - if (globalScene.currentBattle.waveIndex < WAVE_LEVEL_BREAKPOINTS[3]) { - beedrillKeys = getSpriteKeysFromSpecies(SpeciesId.BEEDRILL, false); - butterfreeKeys = getSpriteKeysFromSpecies(SpeciesId.BUTTERFREE, false); - } else { - // Mega Beedrill/Gmax Butterfree - beedrillKeys = getSpriteKeysFromSpecies(SpeciesId.BEEDRILL, false, 1); - butterfreeKeys = getSpriteKeysFromSpecies(SpeciesId.BUTTERFREE, false, 1); - } - - encounter.spriteConfigs = [ - { - spriteKey: beedrillKeys.spriteKey, - fileRoot: beedrillKeys.fileRoot, - hasShadow: true, - repeat: true, - isPokemon: true, - x: -30, - tint: 0.15, - y: -4, - yShadow: -4, - }, - { - spriteKey: butterfreeKeys.spriteKey, - fileRoot: butterfreeKeys.fileRoot, - hasShadow: true, - repeat: true, - isPokemon: true, - x: 30, - tint: 0.15, - y: -4, - yShadow: -4, - }, - { - spriteKey, - fileRoot: "trainer", - hasShadow: true, - x: 4, - y: 7, - yShadow: 7, - }, - ]; - const requiredItems = [ generateModifierType(modifierTypes.QUICK_CLAW), generateModifierType(modifierTypes.GRIP_CLAW), diff --git a/src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts b/src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts index fa65164ecfd..f2eaaa6df35 100644 --- a/src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts +++ b/src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts @@ -48,13 +48,14 @@ export const ShadyVitaminDealerEncounter: MysteryEncounter = MysteryEncounterBui .withPrimaryPokemonHealthRatioRequirement([0.51, 1]) // At least 1 Pokemon must have above half HP .withIntroSpriteConfigs([ { - spriteKey: SpeciesId.KROOKODILE.toString(), + spriteKey: SpeciesId.KROKOROK.toString(), fileRoot: "pokemon", hasShadow: true, - repeat: true, - x: 12, - y: -5, - yShadow: -5, + repeat: false, + scale: 1.1, + x: 24, + y: 0, + yShadow: 0, }, { spriteKey: "shady_vitamin_dealer",