From c610b9fe4ae9fbb5650badf9685ebe20f27fdb0e Mon Sep 17 00:00:00 2001 From: Temps Ray Date: Mon, 20 May 2024 22:35:54 -0400 Subject: [PATCH] Add forced grunt encounter and update dialogue --- src/battle.ts | 2 ++ src/data/dialogue.ts | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/battle.ts b/src/battle.ts index 9de4adcf3c7..fa49f2ebae5 100644 --- a/src/battle.ts +++ b/src/battle.ts @@ -366,6 +366,8 @@ export const fixedBattles: FixedBattleConfigs = { .setGetTrainerFunc(scene => new Trainer(scene, TrainerType.RIVAL, scene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT)), [25]: new FixedBattleConfig().setBattleType(BattleType.TRAINER) .setGetTrainerFunc(scene => new Trainer(scene, TrainerType.RIVAL_2, scene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT)), + [35]: new FixedBattleConfig().setBattleType(BattleType.TRAINER) + .setGetTrainerFunc(scene => new Trainer(scene, getEvilTeamBattle(scene.evilTeamThisRun, "admin"), TrainerVariant.DEFAULT)), [55]: new FixedBattleConfig().setBattleType(BattleType.TRAINER) .setGetTrainerFunc(scene => new Trainer(scene, TrainerType.RIVAL_3, scene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT)), [95]: new FixedBattleConfig().setBattleType(BattleType.TRAINER) diff --git a/src/data/dialogue.ts b/src/data/dialogue.ts index d5a16e5ff63..207d6582cb2 100644 --- a/src/data/dialogue.ts +++ b/src/data/dialogue.ts @@ -511,7 +511,7 @@ export const trainerTypeDialogue = { [TrainerType.MAXIE_2]: [ { encounter: [ - `Hold it right there.` + `do I need salt cure?` ], victory: [ `I... I lost again?` @@ -531,7 +531,7 @@ export const trainerTypeDialogue = { [TrainerType.ARCHIE_2]: [ { encounter: [ - `Hold it right there.` + `do I bring soak?` ], victory: [ `I... I lost again?` @@ -591,10 +591,10 @@ export const trainerTypeDialogue = { [TrainerType.LYSANDRE_2]: [ { encounter: [ - `Enough of this.` + `Can someone recommend me some good pokemon?` ], victory: [ - `Whaugh!` + `Who's a good carry for endless?` ] } ],