From cf0908a21e47eb9e989b8f5ea9870b0a997fd51b Mon Sep 17 00:00:00 2001 From: Kurt Date: Mon, 8 Jul 2019 10:03:53 -0700 Subject: [PATCH] Remove check for impossible conditions #2354 SUBE is never < 0 with the latest change (blank saves behave same as retail saves). --- PKHeX.Core/Saves/SAV6AO.cs | 6 ------ PKHeX.Core/Saves/SAV6XY.cs | 6 ------ 2 files changed, 12 deletions(-) diff --git a/PKHeX.Core/Saves/SAV6AO.cs b/PKHeX.Core/Saves/SAV6AO.cs index a8a1dfcb7..4149acbc6 100644 --- a/PKHeX.Core/Saves/SAV6AO.cs +++ b/PKHeX.Core/Saves/SAV6AO.cs @@ -296,9 +296,6 @@ public ushort[][] GymTeams { get { - if (SUBE < 0 || ORASDEMO) - return Array.Empty(); // no gym data - const int teamsize = 2 * 6; // 2byte/species, 6species/team const int size = teamsize * 8; // 8 gyms int ofs = SUBE - size - 4; @@ -311,9 +308,6 @@ public ushort[][] GymTeams } set { - if (SUBE < 0 || ORASDEMO) - return; // no gym data - const int teamsize = 2 * 6; // 2byte/species, 6species/team const int size = teamsize * 8; // 8 gyms int ofs = SUBE - size - 4; diff --git a/PKHeX.Core/Saves/SAV6XY.cs b/PKHeX.Core/Saves/SAV6XY.cs index bd9d0860f..4bf805662 100644 --- a/PKHeX.Core/Saves/SAV6XY.cs +++ b/PKHeX.Core/Saves/SAV6XY.cs @@ -206,9 +206,6 @@ public ushort[][] GymTeams { get { - if (SUBE < 0) - return Array.Empty(); // no gym data - const int teamsize = 2 * 6; // 2byte/species, 6species/team const int size = teamsize * 8; // 8 gyms int ofs = SUBE - size - 4; @@ -221,9 +218,6 @@ public ushort[][] GymTeams } set { - if (SUBE < 0) - return; // no gym data - const int teamsize = 2 * 6; // 2byte/species, 6species/team const int size = teamsize * 8; // 8 gyms int ofs = SUBE - size - 4;