Skip to content

Commit 7c72098

Browse files
Jimmybald1IBBCalc
andauthored
fix(battle): DoubleOnly trainers no longer set to single battle after reload (#7110)
Add doubleOnly check to trainer session failsafe Co-authored-by: Jimmybald1 <147992650+IBBCalc@users.noreply.github.com>
1 parent c6abd0d commit 7c72098

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/battle-scene.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1267,7 +1267,11 @@ export class BattleScene extends SceneBase {
12671267
mysteryEncounterType?: MysteryEncounterType,
12681268
): Battle {
12691269
// failsafe for corrupt saves (such as due to enum shifting)
1270-
if (trainerData?.variant === TrainerVariant.DOUBLE && !trainerConfigs[trainerData.trainerType].hasDouble) {
1270+
if (
1271+
trainerData?.variant === TrainerVariant.DOUBLE
1272+
&& !trainerConfigs[trainerData.trainerType].hasDouble
1273+
&& !trainerConfigs[trainerData.trainerType].doubleOnly
1274+
) {
12711275
trainerData.variant = TrainerVariant.DEFAULT;
12721276
double = false;
12731277
}

0 commit comments

Comments
 (0)