diff --git a/src/data/trainer-config.ts b/src/data/trainer-config.ts index adfffc2f9ce..db6d1a93aaf 100644 --- a/src/data/trainer-config.ts +++ b/src/data/trainer-config.ts @@ -11,7 +11,7 @@ import { Species } from "./enums/species"; import { tmSpecies } from "./tms"; import { Type } from "./type"; import { initTrainerTypeDialogue } from "./dialogue"; -import { PersistentModifier, TerastallizeModifier } from "../modifier/modifier"; +import { PersistentModifier } from "../modifier/modifier"; export enum TrainerPoolTier { COMMON, diff --git a/src/ui/battle-info.ts b/src/ui/battle-info.ts index baac2d94b4b..56e0cc6ff3c 100644 --- a/src/ui/battle-info.ts +++ b/src/ui/battle-info.ts @@ -359,7 +359,7 @@ export default class BattleInfo extends Phaser.GameObjects.Container { } updateNameText(pokemon: Pokemon): void { - let displayName = pokemon.name; + let displayName = pokemon.name.replace(/[♂♀]/g, ''); let nameTextWidth: number; let nameSizeTest = addTextObject(this.scene, 0, 0, displayName, TextStyle.BATTLE_INFO); diff --git a/src/utils.ts b/src/utils.ts index f186aee9857..44f6d6d27f7 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -87,10 +87,10 @@ export function randSeedWeightedItem(items: T[]): T { } export function getSunday(date: Date): Date { - const day = date.getDay(), - diff = date.getDate() - day; + const day = date.getDay(); + const diff = date.getDate() - day; const newDate = new Date(date.setDate(diff)); - return new Date(newDate.getFullYear(), newDate.getMonth(), newDate.getDate()); + return new Date(Date.UTC(newDate.getUTCFullYear(), newDate.getUTCMonth(), newDate.getUTCDate())); } export function getFrameMs(frameCount: integer): integer {