Leahnaya/pk3DS
1
0
Fork 0
mirror of https://github.com/kwsch/pk3DS.git synced 2026-08-03 10:09:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

More fixes (#286)

Browse Source
This commit is contained in:
Matt 2018-02-06 00:36:45 -05:00 committed by Kurt
parent 1e7fd04746
commit c4332b077f
5 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pk3DS.Core/Legality/Legal.cs
View File

@ -266,14 +266,14 @@ public static partial class Legal
{
012, 013, 014, 023, 052, 074, 075, 076, 077, 078, 079, 089, 090, 129, 131, 132, 138, 144, 146, 149, 152, 153, 154, 155, 156, 158, 159, 160, 164, 167, 215, 216, 217, 218, 219, 220, 221,
222, 235, 236, 238, 239, 240, 241, 349, 350, 351, 352, 356, 357, 358, 359, 360, 392, 396, 398, 400, 401, 403, 405, 409, 410, 412, 413, 414, 415, 416, 417, 418, 419, 435, 438, 439, 440,
441, 447, 448, 449, 450, 451, 452, 467, 477, 478, 479, 481, 482, 483, 484,
441, 447, 448, 449, 450, 451, 452, 467, 477, 478, 479, 480, 481, 482, 483, 484,
};
public static readonly int[] ImportantTrainers_USUM =
{
012, 013, 014, 023, 052, 074, 075, 076, 077, 078, 079, 089, 090, 131, 132, 138, 144, 146, 149, 153, 154, 156, 159, 160, 215, 216, 217, 218, 219, 220, 221, 222, 235, 236, 238, 239, 240,
241, 350, 351, 352, 356, 358, 359, 396, 398, 401, 405, 409, 410, 412, 415, 416, 417, 418, 419, 438, 439, 440, 441, 447, 448, 449, 450, 451, 452, 477, 478, 479, 489, 490, 494, 495, 496,
497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 541, 542, 543, 555, 556, 557, 558, 559, 560, 561, 562, 572, 573, 578, 580, 582, 583, 623, 630, 644, 645, 647, 648, 649, 650,
651, 652,
241, 350, 351, 352, 356, 358, 359, 396, 398, 401, 405, 409, 410, 412, 415, 416, 417, 418, 419, 438, 439, 440, 441, 447, 448, 449, 450, 451, 452, 477, 478, 479, 480, 489, 490, 494, 495,
496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 541, 542, 543, 555, 556, 557, 558, 559, 560, 561, 562, 572, 573, 578, 580, 582, 583, 623, 630, 644, 645, 647, 648, 649,
650, 651, 652,
};
public static readonly int[] BasicStarters_6 =
{

7
pk3DS.Core/Randomizers/EvolutionRandomizer.cs
View File

@ -16,7 +16,6 @@ public EvolutionRandomizer(GameConfig config, EvolutionSet[] evolutions)
Randomizer = new SpeciesRandomizer(Config);
}
public void Execute()
{
for (var i = 0; i < Evolutions.Length; i++)
@ -50,7 +49,7 @@ private void Trade(EvolutionSet evo, int i)
var evos = evo.PossibleEvolutions;
foreach (EvolutionMethod v in evos)
{
if ((Config.XY || Config.ORAS) && v.Method == 5) // Gen 6 uses Argument rather than Level
if (Config.Generation == 6 && v.Method == 5) // Gen 6 uses Argument rather than Level
{
if (i == 708 || i == 710) // Phantump/Pumpkaboo
v.Argument = 20;
@ -59,9 +58,9 @@ private void Trade(EvolutionSet evo, int i)
v.Method = 4; // trade -> level up
}
if ((Config.SM || Config.USUM) && v.Method == 5)
else if (Config.Generation == 7 && v.Method == 5)
{
if (i == 708 || i == 710 || i == 876 || i == 877 | i == 878) // Phantump/Pumpkaboo forms
if (i == 708 || i == 710 || i == 871 || i == 872 || i == 873 || i == 876 || i == 877 || i == 878) // Phantump/Pumpkaboo forms
v.Level = 20;
else
v.Level = 30;

4
pk3DS/Subforms/Gen6/StarterEditor6.Designer.cs generated
View File

@ -338,7 +338,7 @@ private void InitializeComponent()
// B_Save
//
this.B_Save.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.B_Save.Location = new System.Drawing.Point(711, 331);
this.B_Save.Location = new System.Drawing.Point(711, 306);
this.B_Save.Name = "B_Save";
this.B_Save.Size = new System.Drawing.Size(75, 23);
this.B_Save.TabIndex = 464;
@ -349,7 +349,7 @@ private void InitializeComponent()
// B_Cancel
//
this.B_Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.B_Cancel.Location = new System.Drawing.Point(711, 309);
this.B_Cancel.Location = new System.Drawing.Point(711, 328);
this.B_Cancel.Name = "B_Cancel";
this.B_Cancel.Size = new System.Drawing.Size(75, 23);
this.B_Cancel.TabIndex = 465;

22
pk3DS/Subforms/ShinyRate.Designer.cs generated
View File

@ -42,7 +42,7 @@ private void InitializeComponent()
this.GB_RerollHelper = new System.Windows.Forms.GroupBox();
this.GB_Rerolls = new System.Windows.Forms.GroupBox();
this.label1 = new System.Windows.Forms.Label();
this.checkBox1 = new System.Windows.Forms.CheckBox();
this.CHK_EverythingShiny = new System.Windows.Forms.CheckBox();
((System.ComponentModel.ISupportInitialize)(this.NUD_Rerolls)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.NUD_Rate)).BeginInit();
this.GB_RerollHelper.SuspendLayout();
@ -196,22 +196,22 @@ private void InitializeComponent()
this.label1.Text = "Note:\r\nThe above reroll count will overwrite the existing code.\r\n\r\nTo revert chan" +
"ges, use the button below.";
//
// checkBox1
// CHK_EverythingShiny
//
this.checkBox1.AutoSize = true;
this.checkBox1.Location = new System.Drawing.Point(281, 184);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(96, 30);
this.checkBox1.TabIndex = 14;
this.checkBox1.Text = "EVERYTHING\r\nSHINY";
this.checkBox1.UseVisualStyleBackColor = true;
this.CHK_EverythingShiny.AutoSize = true;
this.CHK_EverythingShiny.Location = new System.Drawing.Point(281, 184);
this.CHK_EverythingShiny.Name = "CHK_EverythingShiny";
this.CHK_EverythingShiny.Size = new System.Drawing.Size(96, 30);
this.CHK_EverythingShiny.TabIndex = 14;
this.CHK_EverythingShiny.Text = "EVERYTHING\r\nSHINY";
this.CHK_EverythingShiny.UseVisualStyleBackColor = true;
//
// ShinyRate
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(384, 271);
this.Controls.Add(this.checkBox1);
this.Controls.Add(this.CHK_EverythingShiny);
this.Controls.Add(this.label1);
this.Controls.Add(this.GB_Rerolls);
this.Controls.Add(this.GB_RerollHelper);
@ -253,6 +253,6 @@ private void InitializeComponent()
private System.Windows.Forms.GroupBox GB_RerollHelper;
private System.Windows.Forms.GroupBox GB_Rerolls;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.CheckBox checkBox1;
private System.Windows.Forms.CheckBox CHK_EverythingShiny;
}
}

10
pk3DS/Subforms/ShinyRate.cs
View File

@ -93,7 +93,7 @@ private void CheckAlwaysShiny()
if (index < 0)
{
checkBox1.Enabled = checkBox1.Visible = false;
CHK_EverythingShiny.Enabled = CHK_EverythingShiny.Visible = false;
return;
}
@ -102,19 +102,19 @@ private void CheckAlwaysShiny()
if (!original && !always) // oh no
{
checkBox1.Enabled = checkBox1.Visible = false;
CHK_EverythingShiny.Enabled = CHK_EverythingShiny.Visible = false;
return;
}
checkBox1.Checked = always;
CHK_EverythingShiny.Checked = always;
}
private void B_Cancel_Click(object sender, EventArgs e) => Close();
private void B_Save_Click(object sender, EventArgs e)
{
writeCodePatch();
if (checkBox1.Enabled)
exefsData[alwaysIndex] = (byte)(checkBox1.Checked ? 0xEA : 0x0A);
if (CHK_EverythingShiny.Enabled)
exefsData[alwaysIndex] = (byte)(CHK_EverythingShiny.Checked ? 0xEA : 0x0A);
File.WriteAllBytes(codebin, exefsData);
Close();
}