diff --git a/src/enums/confirm-ui-mode.ts b/src/enums/confirm-ui-mode.ts new file mode 100644 index 00000000000..46bc42374cd --- /dev/null +++ b/src/enums/confirm-ui-mode.ts @@ -0,0 +1,13 @@ +// biome-ignore lint/correctness/noUnusedImports: Used in tsdoc +import type ConfirmUiHandler from "#app/ui/confirm-ui-handler"; + +/** + * Used by {@linkcode ConfirmUiHandler} to determine whether the cursor should start on Yes or No + */ +export const ConfirmUiMode = Object.freeze({ + /** Start cursor on Yes */ + DEFAULT_YES: 1, + /** Start cursor on No */ + DEFAULT_NO: 2 +}); +export type ConfirmUiMode = typeof ConfirmUiMode[keyof typeof ConfirmUiMode]; \ No newline at end of file diff --git a/src/phases/learn-move-phase.ts b/src/phases/learn-move-phase.ts index a0376c86b43..c12b5657acc 100644 --- a/src/phases/learn-move-phase.ts +++ b/src/phases/learn-move-phase.ts @@ -13,7 +13,7 @@ import i18next from "i18next"; import { PlayerPartyMemberPokemonPhase } from "#app/phases/player-party-member-pokemon-phase"; import type Pokemon from "#app/field/pokemon"; import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; -import { ConfirmUiMode } from "#app/ui/confirm-ui-handler"; +import { ConfirmUiMode } from "#enums/confirm-ui-mode"; export enum LearnMoveType { /** For learning a move via level-up, evolution, or other non-item-based event */ @@ -175,7 +175,7 @@ export class LearnMovePhase extends PlayerPartyMemberPokemonPhase { false, 0, 0, - ConfirmUiMode.REJECT_MOVE, + ConfirmUiMode.DEFAULT_NO, ); } diff --git a/src/ui/confirm-ui-handler.ts b/src/ui/confirm-ui-handler.ts index 788ceb26d5e..37fd50ca671 100644 --- a/src/ui/confirm-ui-handler.ts +++ b/src/ui/confirm-ui-handler.ts @@ -4,11 +4,7 @@ import { UiMode } from "#enums/ui-mode"; import i18next from "i18next"; import { Button } from "#enums/buttons"; import { globalScene } from "#app/global-scene"; - -export enum ConfirmUiMode { - DEFAULT, - REJECT_MOVE, -} +import { ConfirmUiMode } from "#enums/confirm-ui-mode"; export default class ConfirmUiHandler extends AbstractOptionSelectUiHandler { private confirmUiMode: ConfirmUiMode; @@ -112,13 +108,13 @@ export default class ConfirmUiHandler extends AbstractOptionSelectUiHandler { this.optionSelectContainer.setPosition(globalScene.game.canvas.width / 6 - 1 + xOffset, -48 + yOffset); - this.confirmUiMode = args.length >= 6 ? (args[5] as ConfirmUiMode) : ConfirmUiMode.DEFAULT; + this.confirmUiMode = args.length >= 6 ? (args[5] as ConfirmUiMode) : ConfirmUiMode.DEFAULT_YES; switch (this.confirmUiMode) { - case ConfirmUiMode.DEFAULT: + case ConfirmUiMode.DEFAULT_YES: this.setCursor(this.switchCheck ? this.switchCheckCursor : 0); break; - case ConfirmUiMode.REJECT_MOVE: + case ConfirmUiMode.DEFAULT_NO: this.setCursor(this.switchCheck ? this.switchCheckCursor : 1); break; }