From 6943860539a541f2079f79ed9187d0b7f29ba7ab Mon Sep 17 00:00:00 2001
From: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Date: Sun, 25 Aug 2024 01:01:30 +0200
Subject: [PATCH] Basically titles are now always shown (like in the real
 games)

---
 src/phases/summon-phase.ts        | 2 +-
 src/phases/switch-summon-phase.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/phases/summon-phase.ts b/src/phases/summon-phase.ts
index 50424170ea7..45e78bc24b0 100644
--- a/src/phases/summon-phase.ts
+++ b/src/phases/summon-phase.ts
@@ -80,7 +80,7 @@ export class SummonPhase extends PartyMemberPokemonPhase {
       });
       this.scene.time.delayedCall(750, () => this.summon());
     } else {
-      const trainerName = this.scene.currentBattle.trainer?.getName(!(this.fieldIndex % 2) ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER);
+      const trainerName = this.scene.currentBattle.trainer?.getName(!(this.fieldIndex % 2) ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER, true);
       const pokemonName = this.getPokemon().getNameToRender();
       const message = i18next.t("battle:trainerSendOut", { trainerName, pokemonName });
 
diff --git a/src/phases/switch-summon-phase.ts b/src/phases/switch-summon-phase.ts
index 3e401925cea..e4beb6c7d36 100644
--- a/src/phases/switch-summon-phase.ts
+++ b/src/phases/switch-summon-phase.ts
@@ -70,7 +70,7 @@ export class SwitchSummonPhase extends SummonPhase {
     this.scene.ui.showText(this.player ?
       i18next.t("battle:playerComeBack", { pokemonName: getPokemonNameWithAffix(pokemon) }) :
       i18next.t("battle:trainerComeBack", {
-        trainerName: this.scene.currentBattle.trainer?.getName(!(this.fieldIndex % 2) ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER),
+        trainerName: this.scene.currentBattle.trainer?.getName(!(this.fieldIndex % 2) ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER, true),
         pokemonName: getPokemonNameWithAffix(pokemon)
       })
     );
@@ -111,7 +111,7 @@ export class SwitchSummonPhase extends SummonPhase {
         this.scene.ui.showText(this.player ?
           i18next.t("battle:playerGo", { pokemonName: getPokemonNameWithAffix(switchedInPokemon) }) :
           i18next.t("battle:trainerGo", {
-            trainerName: this.scene.currentBattle.trainer?.getName(!(this.fieldIndex % 2) ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER),
+            trainerName: this.scene.currentBattle.trainer?.getName(!(this.fieldIndex % 2) ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER, true),
             pokemonName: this.getPokemon().getNameToRender()
           })
         );