Rename Silver SV->SI

SV will likely be the lump for SCarlet and VIolet
2026-08-28 06:02:17 -05:00 · 2022-02-27 11:16:12 -08:00
parent 0d96d801ac
commit e5e2a3427f
15 changed files with 25 additions and 25 deletions
--- a/PKHeX.Core/Editing/Saves/Editors/EventOld/EventWorkspace.cs
+++ b/PKHeX.Core/Editing/Saves/Editors/EventOld/EventWorkspace.cs
@@ -43,7 +43,7 @@ public void Save()
            E => "e",
            FR or LG or FRLG => "frlg",
            C => "c",
-            GD or SV or GS => "gs",
+            GD or SI or GS => "gs",
            _ => throw new ArgumentOutOfRangeException(nameof(GameVersion)),
        };
    }
--- a/PKHeX.Core/Game/Enums/GameVersion.cs
+++ b/PKHeX.Core/Game/Enums/GameVersion.cs
@@ -174,7 +174,7 @@ public enum GameVersion
        /// <summary>
        /// Pokémon Silver (3DS Virtual Console)
        /// </summary>
-        SV = 40,
+        SI = 40,

        /// <summary>
        /// Pokémon Crystal (3DS Virtual Console)
@@ -242,14 +242,14 @@ public enum GameVersion
        /// Pokémon Gold &amp; Silver [<see cref="SAV2"/>] identifier.
        /// </summary>
        /// <see cref="GD"/>
-        /// <see cref="SV"/>
+        /// <see cref="SI"/>
        GS,

        /// <summary>
        /// Pokémon Gold/Silver/Crystal [<see cref="SAV2"/>] identifier.
        /// </summary>
        /// <see cref="GD"/>
-        /// <see cref="SV"/>
+        /// <see cref="SI"/>
        /// <see cref="C"/>
        GSC,

--- a/PKHeX.Core/Game/GameStrings/MetDataSource.cs
+++ b/PKHeX.Core/Game/GameStrings/MetDataSource.cs
@@ -210,7 +210,7 @@ public IReadOnlyList<ComboItem> GetLocationList(GameVersion version, int current
                SN or MN => Partition2(MetGen7, z => z    < 200), // Outer Cape
                US or UM
                   or RD or BU or GN or YW
-                   or GD or SV or C => Partition2(MetGen7, z => z < 234), // Dividing Peak Tunnel
+                   or GD or SI or C => Partition2(MetGen7, z => z < 234), // Dividing Peak Tunnel
                GP or GE or GO => Partition2(MetGen7GG, z => z <= 54), // Pokémon League
                SW or SH => Partition2(MetGen8, z => z < 400),
                BD or SP => Partition2(MetGen8b, z => z < 628),
--- a/PKHeX.Core/Game/GameUtil.cs
+++ b/PKHeX.Core/Game/GameUtil.cs
@@ -45,7 +45,7 @@ private static GameVersion[] GetValidGameVersions()
            GO => GO,

            // VC Transfers
-            RD or BU or YW or GN or GD or SV or C => USUM,
+            RD or BU or YW or GN or GD or SI or C => USUM,

            // Gen2 -- PK2
            GS or GSC => GSC,
@@ -168,7 +168,7 @@ public static bool Contains(this GameVersion g1, GameVersion g2)
                RBY or Stadium => RB.Contains(g2) || g2 == YW,
                Gen1 => RBY.Contains(g2) || g2 == Stadium,

-                GS => g2 is GD or SV,
+                GS => g2 is GD or SI,
                GSC or Stadium2 => GS.Contains(g2) || g2 == C,
                Gen2 => GSC.Contains(g2) || g2 == Stadium2,

--- a/PKHeX.Core/Legality/Breeding.cs
+++ b/PKHeX.Core/Legality/Breeding.cs
@@ -18,7 +18,7 @@ public static class Breeding

        private static readonly HashSet<GameVersion> GamesWithEggs = new()
        {
-            GD, SV, C,
+            GD, SI, C,
            R, S, E, FR, LG,
            D, P, Pt, HG, SS,
            B, W, B2, W2,
--- a/PKHeX.Core/Legality/Encounters/Data/Encounters2.cs
+++ b/PKHeX.Core/Legality/Encounters/Data/Encounters2.cs
@@ -11,7 +11,7 @@ namespace PKHeX.Core
    internal static class Encounters2
    {
        internal static readonly EncounterArea2[] SlotsGD = EncounterArea2.GetAreas(Get("gold", "g2"), GD);
-        internal static readonly EncounterArea2[] SlotsSV = EncounterArea2.GetAreas(Get("silver", "g2"), SV);
+        internal static readonly EncounterArea2[] SlotsSV = EncounterArea2.GetAreas(Get("silver", "g2"), SI);
        internal static readonly EncounterArea2[] SlotsC = EncounterArea2.GetAreas(Get("crystal", "g2"), C);

        internal static readonly EncounterArea2[] SlotsGS = ArrayUtil.ConcatAll(SlotsGD, SlotsSV);
@@ -49,10 +49,10 @@ internal static class Encounters2
            new(245, 40, GS), // Suicune

            new(249, 70, GD), // Lugia @ Whirl Islands
-            new(249, 40, SV), // Lugia @ Whirl Islands
+            new(249, 40, SI), // Lugia @ Whirl Islands

            new(250, 40, GD), // Ho-Oh @ Tin Tower
-            new(250, 70, SV), // Ho-Oh @ Tin Tower
+            new(250, 70, SI), // Ho-Oh @ Tin Tower

            new(137, 15, GS), // Porygon @ Celadon Game Corner
            new(133, 15, GS), // Eevee @ Celadon Game Corner
--- a/PKHeX.Core/Legality/Encounters/Generator/Specific/EncounterSlotGenerator.cs
+++ b/PKHeX.Core/Legality/Encounters/Generator/Specific/EncounterSlotGenerator.cs
@@ -37,7 +37,7 @@ public static IEnumerable<EncounterSlot> GetPossible(PKM pkm, IReadOnlyList<DexL
            YW => SlotsYW,

            GD => SlotsGD,
-            SV => SlotsSV,
+            SI => SlotsSV,
            C => SlotsC,

            _ => GetEncounterSlots(pkm, gameSource),
@@ -116,7 +116,7 @@ private static IEnumerable<EncounterArea> GetEncounterAreas(PKM pkm, GameVersion
        {
            RBY or RD or BU or GN or YW => pkm.Japanese ? SlotsRGBY : SlotsRBY,

-            GSC or GD or SV or C => GetEncounterTableGSC(pkm),
+            GSC or GD or SI or C => GetEncounterTableGSC(pkm),

            R => SlotsR,
            S => SlotsS,
--- a/PKHeX.Core/Legality/Encounters/Generator/Specific/EncounterStaticGenerator.cs
+++ b/PKHeX.Core/Legality/Encounters/Generator/Specific/EncounterStaticGenerator.cs
@@ -30,7 +30,7 @@ public static IEnumerable<EncounterStatic> GetPossible(PKM pkm, IReadOnlyList<De
            var table = gameSource switch
            {
                RD or GN or BU or YW => StaticRBY.Where(z => z.Version.Contains(gameSource)),
-                GD or SV => StaticGS.Where(z => z.Version.Contains(gameSource)),
+                GD or SI => StaticGS.Where(z => z.Version.Contains(gameSource)),
                C => StaticC,
                _ => GetEncounterStaticTable(pkm, gameSource),
            };
@@ -139,7 +139,7 @@ internal static EncounterStatic7 GetVCStaticTransferEncounter(PKM pkm, IEncounte
        {
            RBY or RD or BU or GN or YW => StaticRBY,

-            GSC or GD or SV or C => GetEncounterStaticTableGSC(pkm),
+            GSC or GD or SI or C => GetEncounterStaticTableGSC(pkm),

            R => StaticR,
            S => StaticS,
--- a/PKHeX.Core/Legality/Moves/GameData.cs
+++ b/PKHeX.Core/Legality/Moves/GameData.cs
@@ -20,7 +20,7 @@ public static Learnset GetLearnset(GameVersion game, int species, int form)
        {
            RD or GN or BU or RB => Legal.LevelUpRB,
            YW or RBY => Legal.LevelUpY,
-            GD or SV or GS => Legal.LevelUpGS,
+            GD or SI or GS => Legal.LevelUpGS,
            C or GSC => Legal.LevelUpC,

            R or S or RS or RSE => Legal.LevelUpRS,
@@ -66,7 +66,7 @@ public static Learnset GetLearnset(GameVersion game, int species, int form)
        {
            RD or GN or BU or RB => PersonalTable.RB,
            YW or RBY => PersonalTable.Y,
-            GD or SV or GS => PersonalTable.GS,
+            GD or SI or GS => PersonalTable.GS,
            C or GSC => PersonalTable.C,

            R or S or RS or RSE => PersonalTable.RS,
--- a/PKHeX.Core/Legality/Moves/MoveLevelUp.cs
+++ b/PKHeX.Core/Legality/Moves/MoveLevelUp.cs
@@ -85,7 +85,7 @@ private static LearnVersion GetIsLevelUp2(int species, int form, int move, int m
                        return first;
                    return LearnC.GetIsLevelUpMin(species, move, maxLevel, minLevel, form);

-                case GD or SV or GS:
+                case GD or SI or GS:
                    return LearnGS.GetIsLevelUpMin(species, move, maxLevel, minLevel, form);
                case C when !korean:
                    return LearnC.GetIsLevelUpMin(species, move, maxLevel, minLevel, form);
@@ -354,7 +354,7 @@ private static List<int> AddMovesLevelUp2(List<int> moves, GameVersion ver, int
                        return moves;
                    return LearnC.AddMoves(moves, species, form, max, min);

-                case GD or SV or GS:
+                case GD or SI or GS:
                    return LearnGS.AddMoves(moves, species, form, max, min);
                case C when !korean:
                    return LearnC.AddMoves(moves, species, form, max, min);
--- a/PKHeX.Core/Legality/Verifiers/Egg/EggStateLegality.cs
+++ b/PKHeX.Core/Legality/Verifiers/Egg/EggStateLegality.cs
@@ -128,7 +128,7 @@ public static int GetMaximumEggHatchCycles(PKM pk, IEncounterTemplate enc)

            GSC or C when format <= 2 => Locations.HatchLocationC,
            RD or BU or GN or YW => Locations.Transfer1,
-            GD or SV or C => Locations.Transfer2,
+            GD or SI or C => Locations.Transfer2,

            SW or SH => Locations.HatchLocation8,
            BD or SP => Locations.HatchLocation8b,
--- a/PKHeX.Core/PKM/PK2.cs
+++ b/PKHeX.Core/PKM/PK2.cs
@@ -143,7 +143,7 @@ public PK7 ConvertToPK7()
                PID = Util.Rand32(),
                Ball = 4,
                MetDate = DateTime.Now,
-                Version = HasOriginalMetLocation ? (int)GameVersion.C : (int)GameVersion.SV,
+                Version = HasOriginalMetLocation ? (int)GameVersion.C : (int)GameVersion.SI,
                Move1 = Move1,
                Move2 = Move2,
                Move3 = Move3,
--- a/PKHeX.Core/PKM/Searching/SearchSettings.cs
+++ b/PKHeX.Core/PKM/Searching/SearchSettings.cs
@@ -189,11 +189,11 @@ public IReadOnlyList<GameVersion> GetVersions(SaveFile sav, GameVersion fallback
            return Generation switch
            {
                1 when !ParseSettings.AllowGen1Tradeback => new[] {GameVersion.RD, GameVersion.BU, GameVersion.GN, GameVersion.YW},
-                2 when sav is SAV2 {Korean: true} => new[] {GameVersion.GD, GameVersion.SV},
+                2 when sav is SAV2 {Korean: true} => new[] {GameVersion.GD, GameVersion.SI},
                1 or 2 => new[]
                {
                    GameVersion.RD, GameVersion.BU, GameVersion.GN, GameVersion.YW,
-                    GameVersion.GD, GameVersion.SV, GameVersion.C,
+                    GameVersion.GD, GameVersion.SI, GameVersion.C,
                },

                _ when fallback.GetGeneration() == Generation => GameUtil.GetVersionsWithinRange(sav, Generation).ToArray(),
--- a/PKHeX.Core/Saves/Util/SaveUtil.cs
+++ b/PKHeX.Core/Saves/Util/SaveUtil.cs
@@ -731,7 +731,7 @@ public static SaveFile GetBlankSAV(GameVersion game, string trainerName, Languag
            StadiumJ => new SAV1StadiumJ(),
            Stadium => new SAV1Stadium(language == LanguageID.Japanese),

-            GD or SV or GS => new SAV2(version: GS, lang: language),
+            GD or SI or GS => new SAV2(version: GS, lang: language),
            C or GSC => new SAV2(version: C, lang: language),
            Stadium2 => new SAV2Stadium(language == LanguageID.Japanese),

--- a/Tests/PKHeX.Core.Tests/Legality/BreedTests.cs
+++ b/Tests/PKHeX.Core.Tests/Legality/BreedTests.cs
@@ -21,7 +21,7 @@ private static int[] GetMoves(Move[] moves)

        [Theory]
        [InlineData(GD, Bulbasaur, 0, Tackle, Growl)]
-        [InlineData(SV, Igglybuff, 0, FeintAttack, Pound, Curse, ZapCannon)]
+        [InlineData(SI, Igglybuff, 0, FeintAttack, Pound, Curse, ZapCannon)]
        [InlineData( C, Igglybuff, 0, FeintAttack, Pound, Flamethrower, Sing)]
        [InlineData( B, Heracross, 0, Megahorn, NightSlash, CloseCombat, StoneEdge)]
        [InlineData( B, Heracross, 0, Bide, Megahorn, Counter, Reversal)]