Leahnaya/pkNX
1
0
Fork 0
mirror of https://github.com/kwsch/pkNX.git synced 2026-04-24 23:06:56 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add Slowpoke-1 handling (#52)

Browse Source
This commit is contained in:
Matt 2020-01-13 20:36:00 -05:00 committed by Kurt
parent ce65b78800
commit dc9563f000
6 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkNX.Game/GameLocation.cs
View File

@ -63,7 +63,7 @@ public static GameLocation GetGame(string dir)
private const int FILECOUNT_USUM = 333;
private const int FILECOUNT_GG = 27818;
private const int FILECOUNT_SWSH = 41702;
private const int FILECOUNT_SWSH_update1 = 41951;
private const int FILECOUNT_SWSH_1 = 41951;
private static GameVersion GetGameFromCount(int fileCount, string romfs)
{
@ -91,10 +91,8 @@ private static GameVersion GetGameFromCount(int fileCount, string romfs)
return GameVersion.GG;
case FILECOUNT_SWSH:
return GameVersion.SW; // todo: differentiate
case FILECOUNT_SWSH_update1:
return GameVersion.SH;
case FILECOUNT_SWSH_1:
return GameVersion.SW;
default:
return GameVersion.Invalid;

2
pkNX.Randomization/Randomizers/FormRandomizer.cs
View File

@ -49,7 +49,7 @@ public int GetRandomForme(int species, PersonalInfo[] stats = null)
if (AllowAlolanForm && Legal.EvolveToAlolanForms.Contains(species))
return Util.Random.Next(2);
if (AllowGalarianForm && Legal.EvolveToGalarForms.Contains(species))
return Util.Random.Next(2);
return species == 079 ? 1 : Util.Random.Next(2);
if (!Legal.BattleExclusiveForms.Contains(species) || AllowMega)
return Util.Random.Next(stats[species].FormeCount); // Slot-Random
return 0;

3
pkNX.Sprites/Properties/Resources.resx
View File

@ -9226,6 +9226,9 @@
<data name="b_79" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Sprites\Big Pokemon Sprites\b_79.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="b_79_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Sprites\Big Pokemon Sprites\b_79-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="b_790" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Sprites\Big Pokemon Sprites\b_790.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>

BIN
pkNX.Sprites/Sprites/Big Pokemon Sprites/b_79-1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 780 B

2
pkNX.Structures/Legality/Legal.cs
View File

@ -24,6 +24,8 @@ public static int GetRandomForme(int species, bool mega, bool alola, bool galar,
if (galar && species == 052) // Galarian Meowth is altform 2
return Util.Rand.Next(3);
if (galar && species == 079) // todo: remove when Kanto Slowpoke is made usable in SWSH
return 1;
if (galar && species == 555) // Galarian Darmanitan is altform 2, Galarian Zen is altform 3
return Util.Rand.Next(4);

1
pkNX.Structures/Legality/Tables8.cs
View File

@ -170,6 +170,7 @@ public static partial class Legal
052, // Meowth
077, // Ponyta
078, // Rapidash
079, // Slowpoke
083, // Farfetch’d
122, // Mr. Mime
222, // Corsola