Fix OPP_FORM_OVERRIDES so that form index 0 is selectable

This commit is contained in:
NightKev 2025-03-13 08:32:54 -07:00
parent 9c524b7273
commit e7864cf022
2 changed files with 3 additions and 2 deletions

View File

@ -6916,10 +6916,10 @@ export class EnemyPokemon extends Pokemon {
if ( if (
speciesId in Overrides.OPP_FORM_OVERRIDES && speciesId in Overrides.OPP_FORM_OVERRIDES &&
Overrides.OPP_FORM_OVERRIDES[speciesId] && !isNullOrUndefined(Overrides.OPP_FORM_OVERRIDES[speciesId]) &&
this.species.forms[Overrides.OPP_FORM_OVERRIDES[speciesId]] this.species.forms[Overrides.OPP_FORM_OVERRIDES[speciesId]]
) { ) {
this.formIndex = Overrides.OPP_FORM_OVERRIDES[speciesId] ?? 0; this.formIndex = Overrides.OPP_FORM_OVERRIDES[speciesId];
} }
if (!dataSource) { if (!dataSource) {

View File

@ -53,6 +53,7 @@ export class SelectStarterPhase extends Phase {
let starterFormIndex = Math.min(starterProps.formIndex, Math.max(starter.species.forms.length - 1, 0)); let starterFormIndex = Math.min(starterProps.formIndex, Math.max(starter.species.forms.length - 1, 0));
if ( if (
starter.species.speciesId in Overrides.STARTER_FORM_OVERRIDES && starter.species.speciesId in Overrides.STARTER_FORM_OVERRIDES &&
!Utils.isNullOrUndefined(Overrides.STARTER_FORM_OVERRIDES[starter.species.speciesId]) &&
starter.species.forms[Overrides.STARTER_FORM_OVERRIDES[starter.species.speciesId]!] starter.species.forms[Overrides.STARTER_FORM_OVERRIDES[starter.species.speciesId]!]
) { ) {
starterFormIndex = Overrides.STARTER_FORM_OVERRIDES[starter.species.speciesId]!; starterFormIndex = Overrides.STARTER_FORM_OVERRIDES[starter.species.speciesId]!;