Skip to content

Commit

Permalink
适配PKHeX2022.6.26
Browse files Browse the repository at this point in the history
  • Loading branch information
8CBCA403 committed Jun 30, 2022
1 parent 66292fa commit 49f31ce
Show file tree
Hide file tree
Showing 5,675 changed files with 142 additions and 22 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions WangPlugin/GUI/AboutUI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ private void InitializeComponent()
this.Controls.Add(this.AboutTextBox);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.Name = "AboutUI";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Super Wang";
Expand Down
1 change: 1 addition & 0 deletions WangPlugin/GUI/DexBuildForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ private void InitializeComponent()
this.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.Name = "DexBuildForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Super Wang";
Expand Down
1 change: 1 addition & 0 deletions WangPlugin/GUI/EH1ViewerUI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ private void InitializeComponent()
this.Controls.Add(this.LoadEH1_BTN);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.Name = "EH1ViewerUI";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "SuperWang";
Expand Down
1 change: 1 addition & 0 deletions WangPlugin/GUI/EggGeneratorUI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ private void InitializeComponent()
this.Controls.Add(this.GEgg);
this.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.Name = "EggGeneratorUI";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Super Wang";
Expand Down
1 change: 1 addition & 0 deletions WangPlugin/GUI/GP1Editor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,7 @@ private void InitializeComponent()
this.Controls.Add(this.ImportGP_BTN);
this.Font = new System.Drawing.Font("Arial", 9F);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.Name = "GP1Editor";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Super Wang";
Expand Down
1 change: 1 addition & 0 deletions WangPlugin/GUI/MutiCalcUI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,7 @@ private void InitializeComponent()
this.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.Name = "MutiCalcUI";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Super Wang";
Expand Down
4 changes: 4 additions & 0 deletions WangPlugin/GUI/RNGForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ private void InitializeComponent()
//
// RNGForm
//
this.AutoValidate = System.Windows.Forms.AutoValidate.EnablePreventFocusChange;
this.BackColor = System.Drawing.SystemColors.Control;
this.ClientSize = new System.Drawing.Size(296, 177);
this.Controls.Add(this.LockIV);
Expand All @@ -192,6 +193,7 @@ private void InitializeComponent()
this.ForeColor = System.Drawing.SystemColors.ControlText;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.Name = "RNGForm";
this.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
Expand Down Expand Up @@ -467,5 +469,7 @@ private void methodTypeBox_SelectedIndexChanged(object sender, EventArgs e)
{

}


}
}
6 changes: 2 additions & 4 deletions WangPlugin/GUI/ShinyMakerUI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ internal class ShinyMakerUI : Form
public static Stopwatch sw = new();
private Button ForceStar;
private Label XorValue_Label;
private static int i=0;

public enum Shinytype
{
Expand Down Expand Up @@ -131,6 +130,7 @@ private void InitializeComponent()
this.Controls.Add(this.ShinySID_BTN);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.Name = "ShinyMakerUI";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Super Wang";
Expand Down Expand Up @@ -191,8 +191,6 @@ private static uint ShinyPID(PKM val,int f=0)
}
public static void ShinyFunction(PKM pkm)
{
i++;
MessageBox.Show($"{i}");
PKM val = pkm.Clone();
PKM va = pkm.Clone();
if (!MythicalPool.MythicalFlag(pkm.Species))
Expand Down Expand Up @@ -286,7 +284,7 @@ public static void ShinyFunction(PKM pkm)
if (Version.Gen8SWSHFlag(val.Version))
{
pkm.PID = Util.Rand32();
if (EggFlag)
if (EggFlag||pkm.Met_Location==162)
{
pkm.PID = ShinyPID(val);
CommonEdits.SetRandomEC(pkm);
Expand Down
8 changes: 7 additions & 1 deletion WangPlugin/GUI/SimpleEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ private void InitializeComponent()
this.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.Name = "SimpleEditor";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Super Wang";
Expand Down Expand Up @@ -224,7 +225,12 @@ private PA8 Handle_OTPokemon(PA8 pk,PKM pkm)
pk.TrainerSID7 = pkm.TrainerSID7;
pk.OT_Gender = pkm.OT_Gender;
pk.IVs = pkm.IVs;
pk.EVs = pkm.EVs;
pk.EV_ATK = pkm.EV_ATK;
pk.EV_DEF = pkm.EV_DEF;
pk.EV_HP = pkm.EV_HP;
pk.EV_SPA = pkm.EV_SPA;
pk.EV_SPD = pkm.EV_SPD;
pk.EV_SPE = pkm.EV_SPE;
pk.Nature = pkm.Nature;
pk.AbilityNumber = pkm.AbilityNumber;
pk.StatNature = pkm.StatNature;
Expand Down
1 change: 1 addition & 0 deletions WangPlugin/GUI/TESTForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ private void InitializeComponent()
this.Controls.Add(this.SetAll_BTN);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.Name = "TESTForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Super Wang";
Expand Down
4 changes: 2 additions & 2 deletions WangPlugin/GameEnums/MythicalPool.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ public static bool MythicalFlag(int Species)
{
if (Species is 151 or 251 or 385 or 489 or 490 or 492 or 493 or
494 or 648 or 649 or 719 or 720 or 721 or 801 or
802 or 808 or 386 or 491 or 647 or 807 or 809 or
893 )
802 or 808 or 386 or 491 or 647 or 807 or 809 or 892 or
893 or 888 or 889 or 890 or 896 or 897 or 898 )
return true;
else
return false;
Expand Down
2 changes: 1 addition & 1 deletion WangPlugin/Plugins/AboutPlugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ private void OpenForm(object sender, EventArgs e)
{

var form = new AboutUI();
form.ShowDialog();
form.Show();
}
}
}
2 changes: 1 addition & 1 deletion WangPlugin/Plugins/DexBuildPlugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ private void OpenForm(object sender, EventArgs e)
{

var form = new DexBuildForm(SaveFileEditor);
form.ShowDialog();
form.Show();
}
}
}
2 changes: 1 addition & 1 deletion WangPlugin/Plugins/EH1ViewerPlugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ private void OpenForm(object sender, EventArgs e)
{

var form = new EH1ViewerUI(SaveFileEditor, PKMEditor);
form.ShowDialog();
form.Show();
}
}
}
2 changes: 1 addition & 1 deletion WangPlugin/Plugins/EggGeneratorPlugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ private void OpenForm(object sender, EventArgs e)
{

var form = new EggGeneratorUI(SaveFileEditor, PKMEditor);
form.ShowDialog();
form.Show();
}
}
}
2 changes: 1 addition & 1 deletion WangPlugin/Plugins/GP1Plugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ private void OpenForm(object sender, EventArgs e)
{

var form = new GP1Editor(SaveFileEditor, PKMEditor);
form.ShowDialog();
form.Show();
}
}
}
2 changes: 1 addition & 1 deletion WangPlugin/Plugins/MutiCalcPlugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ private static void OpenForm(object sender, EventArgs e)
{

var form = new MutiCalcUI();
form.ShowDialog();
form.Show();
}
}
}
5 changes: 1 addition & 4 deletions WangPlugin/Plugins/RNGPlugin.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System;
using WangPlugin.GUI;
using PKHeX.Core;
using System.Windows.Forms;

namespace WangPlugin.Plugins
Expand All @@ -19,14 +18,12 @@ protected override void AddPluginControl(ToolStripDropDownItem modmenu)
ctrl.Click += OpenForm;
ctrl.Name = "RNG面板/RNG Form";
modmenu.DropDownItems.Add(ctrl);

}

private void OpenForm(object sender, EventArgs e)
{

var form = new RNGForm(SaveFileEditor, PKMEditor);
form.ShowDialog();
form.Show();
}
}
}
2 changes: 1 addition & 1 deletion WangPlugin/Plugins/ShinyMakerPlugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ private void OpenForm(object sender, EventArgs e)
{
MessageBox.Show("请确保本身全部精灵合法!\n不是100%准确,使用前请备份存档!", "SuperWang", MessageBoxButtons.OK, MessageBoxIcon.Warning);
var form = new ShinyMakerUI(SaveFileEditor, PKMEditor);
form.ShowDialog();
form.Show();
}
}
}
2 changes: 1 addition & 1 deletion WangPlugin/Plugins/SimpleEditorPlugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ private void OpenForm(object sender, EventArgs e)
{

var form = new SimpleEditor(SaveFileEditor,PKMEditor);
form.ShowDialog();
form.Show();
}
}
}
2 changes: 1 addition & 1 deletion WangPlugin/Plugins/TEST.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ private void OpenForm(object sender, EventArgs e)
{

var form = new TESTForm(SaveFileEditor, PKMEditor);
form.ShowDialog();
form.Show();
}
}
}
10 changes: 8 additions & 2 deletions WangPlugin/RNG/Overworld8RNG.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using PKHeX.Core;
using System;
namespace WangPlugin

{
Expand Down Expand Up @@ -67,7 +66,14 @@ public static bool GenPkm(ref PKM pk,uint seed, bool[] shiny, bool[] IV,uint Xo
scale.HeightScalar = (byte)((int)xoro.NextInt(0x81) + (int)xoro.NextInt(0x80));
scale.WeightScalar = (byte)((int)xoro.NextInt(0x81) + (int)xoro.NextInt(0x80));
var ability = (1 << (int)xoro.NextInt(2));
if (pk.Species is not (638 or 639 or 640))
if(pk.Species is (638 or 639 or 640))
{
if (ability != 1)
return false;
else
pk.AbilityNumber = ability;
}
else
pk.AbilityNumber = ability;
pk.RefreshChecksum();
return true;
Expand Down
Binary file removed WangPlugin/Resources/SomeSave/GEN2TOGEN7/Y/main
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This file (1) is before the glitch.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This one's for (2) save file.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
About This File
I'm making this for my youtube channel.

The game is completed and all 151 Pokemon (Mew with Mew glitch)

Have been obtained.

If you stumble upon my save file, I hope you come and check out my channel.

I'm new to this Youtube thing soo yeah.

Channel Name: Shadowmare
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
About This File
This a Pokémon Dream Radar save file that can be used to directly transfer all the Legendary Pokémon, and some extra Pokémon and items to Pokémon Black 2 and White 2.

Available Pokémon and Items to transfer:
-Tornadus, Thundurus, Landorus, Dialga, Palkia, Giratina, Ho-oh and Lugia
-Riolu, Ralts, Togepi, Spiritomb, Porygon and Rotom
-Sun Stone x10, Moon Stone x10, Fire Stone x10, Water Stone x10, Thunder Stone x10 and Leaf Stone x10

This save is also 100% cleared, so it can be used to catch any non-Legendary Pokémon and collect any item:
-999999 Orbs
-All Extensions Unlocked
-All Upgrades Unlocked
-Max Game Records

Note: It is not needed to use Pokémon Dream Radar to transfer Pokémon and items to B2W2, thanks to the Gen 5 Save Tool. This save has also been edited using the Pokémon Dream Radar Save Editor, both tools made by Suloku. It's recommended to use JKSV or Checkpoint for importing 3DS save files.

https://projectpokemon.org/home/files/file/4689-pok%C3%A9mon-dream-radar-100-save-file/
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
Project 22796 - "Every" Event Pokemon Save File(s) By TFOTT

All of the Mythical and Legendary Pokemon in three save files. (Well "all" of them, there's still some missing out there, like the 1997 CoroCoro 20th Anniversary Mews, and so on.)

Also includes Shiny Locked and Unreleased Pokemon. (AZ’s Floette, Azure Flute Arceus, Oak's Letter Shaymin, Member Card Darkrai, Original Coloured Magearna, and etc.)

All of the save files listed are:

USUM:

"Gen 7 - Project 22796 (USUM) 1" - Has all events from Gen 1-6.

"Gen 7 - Project 22796 (USUM) 2" - Has all events from Gen 6-7, Unreleased Pokemon, Shinylocked Pokemon, and Other Events.

"Gen 7 - Project 22796 - Mystery Mew (USUM)" - Has all of the Mystery Mews from Generation 3.

ORAS:

"Gen 6 - Project 22796 (ORAS) 1" - Has all events from Gen 1-5.

"Gen 6 - Project 22796 (ORAS) 2" - Has all events from Gen 5-6, Unreleased Pokemon, Shinylocked Pokemon, and Other Events.

"Gen 6 - Project 22796 - Mystery Mew (ORAS)" - Has all of the Mystery Mews from Generation 3.

XY:

"Gen 6 - Project 22796 (XY) 1": Has all events from Gen 1-5.

"Gen 6 - Project 22796 (ORAS) 2" - Has all events from Gen 5-6, Unreleased Pokemon, Shinylocked Pokemon, and Other Events.

"Gen 6 - Project 22796 - Mystery Mew (XY) - Has all of the Mystery Mews from Generation 3.

BW:

"Gen 5 - Project 22796 (BW) 1" - Has all events from Gen 1-4.

"Gen 5 - Project 22796 (BW) 2'' - Has all events from Gen 4-5, Unreleased Pokemon, Shinylocked Pokemon, and Other events.

"Gen 5 - Project 22796 - Mystery Mew (BW)" - Has all Mystery Mews from Generation 3.

IMPORTANT: WHEN YOU DOWNLOAD THE SAVE FILE(S), PLEASE RENAME IT TO "main" (obviously, without the quotation marks.)

IMPORTANT FOR DS GAMES (DP, HGSS, BW and B2W2): WHEN YOU DOWNLOAD THE SAVE FILES(S), PLEASE RENAME IT TO YOUR ROM NAME. OTHERWISE IT WOULDN'T WORK.

All of these save files have a 100% Pokedex and a Completed Story.

All events were Injected from PKHeX and PKSM.

All the credits go to projectpokemon.org and ProjectPokemon’s Event Gallery. This wouldn’t have existed if it wasn’t for them.

Special thanks to theSLAYER, Sabresite, Kaphotics, jasenyoface, The Flagbrew Team, ProjectPokemon, and the Project Pokemon Event Gallery.

READ: NOT ALL POKEMON IN THIS SAVE FILE ARE LEGAL, ALL OF THE GENERATION 1 EVENTS ARE NOT LEGAL, SHINYLOCKED AND UNRELEASED POKEMON ARE NOT LEGAL. KEEP IN MIND OF THAT.

https://projectpokemon.org/home/files/file/4200-project-22796-every-event-legendarymythical-pokemon-in-a-save-files-generations-5-6-and-7/

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 49f31ce

Please sign in to comment.