diff --git a/Misc/CodeGenerator.Designer.cs b/Misc/CodeGenerator.Designer.cs
index 471b95570..712023f2a 100644
--- a/Misc/CodeGenerator.Designer.cs
+++ b/Misc/CodeGenerator.Designer.cs
@@ -96,7 +96,7 @@
this.CB_Source.Items.AddRange(new object[] {
"Loaded EKX (Tabs)",
"Box EKX",
- "Wondercard"});
+ "Wonder Card"});
this.CB_Source.Location = new System.Drawing.Point(29, 148);
this.CB_Source.Name = "CB_Source";
this.CB_Source.Size = new System.Drawing.Size(132, 21);
@@ -141,7 +141,7 @@
this.CB_Slot.Items.AddRange(new object[] {
"Loaded EKX (Tabs)",
"Box EKX ",
- "Wondercard"});
+ "Wonder Card"});
this.CB_Slot.Location = new System.Drawing.Point(126, 169);
this.CB_Slot.Name = "CB_Slot";
this.CB_Slot.Size = new System.Drawing.Size(35, 21);
diff --git a/Resources/text/en/lang_en.txt b/Resources/text/en/lang_en.txt
index e4cce0dbc..76b55f9d8 100644
--- a/Resources/text/en/lang_en.txt
+++ b/Resources/text/en/lang_en.txt
@@ -113,7 +113,7 @@ B_OpenItemPouch = Items
B_OpenTrainerInfo = Trainer Info
B_OUTPasserby = Passerby
B_OpenBoxLayout = Box Layout
-B_OpenWondercards = Wondercard
+B_OpenWondercards = WonderCard
B_OpenSuperTraining = Super Train
B_OpenHallofFame = Hall of Fame
B_OpenOPowers = O-Powers
@@ -724,7 +724,7 @@ cb8 = 8 - Iceberg
! End
! -----------------------------------------------------
- DO NOT CHANGE THIS SECTION.
-! SAV_Wondercard = Wondercard I/O
+! SAV_Wondercard = Wonder Card I/O
- Change stuff below this line, not above.
-------------------------------------------------------
B_DeleteFlag = X
@@ -733,7 +733,7 @@ L_Details = Details:
B_DisplaytoWCSlot = <
B_WCSlottoDisplay = >
L_Received = Received List:
-L_WCs = Wondercards:
+L_WCs = Wonder Cards:
B_Import = Import .wc6
B_Output = Output .wc6
B_Cancel = Cancel
diff --git a/Resources/text/other/lang_pt.txt b/Resources/text/other/lang_pt.txt
index 60d79be2f..4c20f766f 100644
--- a/Resources/text/other/lang_pt.txt
+++ b/Resources/text/other/lang_pt.txt
@@ -113,7 +113,7 @@ B_OpenItemPouch = Itens
B_OpenTrainerInfo = Informação do Treinador
B_OUTPasserby = Passerby
B_OpenBoxLayout = Aparência das Boxes
-B_OpenWondercards = Wondercard
+B_OpenWondercards = WonderCard
B_OpenSuperTraining = Super Treino
B_OpenHallofFame = Hall of Fame
B_OpenOPowers = O-Powers
@@ -724,7 +724,7 @@ cb8 = 8 - Iceberg
! End
! -----------------------------------------------------
- DO NOT CHANGE THIS SECTION.
-! SAV_Wondercard = Wondercard I/O
+! SAV_Wondercard = Wonder Card I/O
- Change stuff below this line, not above.
-------------------------------------------------------
B_DeleteFlag = X
@@ -733,7 +733,7 @@ L_Details = Detalhes:
B_DisplaytoWCSlot = <
B_WCSlottoDisplay = >
L_Received = Lista de Recebidos:
-L_WCs = Wondercards:
+L_WCs = Wonder Cards:
B_Import = Importar .wc6
B_Output = Exportar .wc6
B_Cancel = Cancelar
diff --git a/SAV/SAV_Wondercard.Designer.cs b/SAV/SAV_Wondercard.Designer.cs
index 706c32c3f..ef03b9a6c 100644
--- a/SAV/SAV_Wondercard.Designer.cs
+++ b/SAV/SAV_Wondercard.Designer.cs
@@ -28,6 +28,7 @@
///
private void InitializeComponent()
{
+ this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SAV_Wondercard));
this.B_Save = new System.Windows.Forms.Button();
this.B_Cancel = new System.Windows.Forms.Button();
@@ -45,13 +46,66 @@
this.B_DeleteFlag = new System.Windows.Forms.Button();
this.L_QR = new System.Windows.Forms.Label();
this.PB_Preview = new System.Windows.Forms.PictureBox();
+ this.PB_Card01 = new System.Windows.Forms.PictureBox();
+ this.mnuVSD = new System.Windows.Forms.ContextMenuStrip(this.components);
+ this.mnuView = new System.Windows.Forms.ToolStripMenuItem();
+ this.mnuSet = new System.Windows.Forms.ToolStripMenuItem();
+ this.mnuDelete = new System.Windows.Forms.ToolStripMenuItem();
+ this.PB_Card02 = new System.Windows.Forms.PictureBox();
+ this.PB_Card03 = new System.Windows.Forms.PictureBox();
+ this.PB_Card04 = new System.Windows.Forms.PictureBox();
+ this.PB_Card05 = new System.Windows.Forms.PictureBox();
+ this.PB_Card06 = new System.Windows.Forms.PictureBox();
+ this.PB_Card12 = new System.Windows.Forms.PictureBox();
+ this.PB_Card11 = new System.Windows.Forms.PictureBox();
+ this.PB_Card10 = new System.Windows.Forms.PictureBox();
+ this.PB_Card09 = new System.Windows.Forms.PictureBox();
+ this.PB_Card08 = new System.Windows.Forms.PictureBox();
+ this.PB_Card07 = new System.Windows.Forms.PictureBox();
+ this.PB_Card18 = new System.Windows.Forms.PictureBox();
+ this.PB_Card17 = new System.Windows.Forms.PictureBox();
+ this.PB_Card16 = new System.Windows.Forms.PictureBox();
+ this.PB_Card15 = new System.Windows.Forms.PictureBox();
+ this.PB_Card14 = new System.Windows.Forms.PictureBox();
+ this.PB_Card13 = new System.Windows.Forms.PictureBox();
+ this.PB_Card24 = new System.Windows.Forms.PictureBox();
+ this.PB_Card23 = new System.Windows.Forms.PictureBox();
+ this.PB_Card22 = new System.Windows.Forms.PictureBox();
+ this.PB_Card21 = new System.Windows.Forms.PictureBox();
+ this.PB_Card20 = new System.Windows.Forms.PictureBox();
+ this.PB_Card19 = new System.Windows.Forms.PictureBox();
((System.ComponentModel.ISupportInitialize)(this.PB_Preview)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card01)).BeginInit();
+ this.mnuVSD.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card02)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card03)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card04)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card05)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card06)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card09)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card08)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card07)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card18)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card17)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card16)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card24)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card23)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card22)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card21)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card20)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card19)).BeginInit();
this.SuspendLayout();
//
// 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(347, 227);
+ this.B_Save.Location = new System.Drawing.Point(347, 277);
this.B_Save.Name = "B_Save";
this.B_Save.Size = new System.Drawing.Size(75, 23);
this.B_Save.TabIndex = 0;
@@ -62,7 +116,7 @@
// 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(276, 227);
+ this.B_Cancel.Location = new System.Drawing.Point(276, 277);
this.B_Cancel.Name = "B_Cancel";
this.B_Cancel.Size = new System.Drawing.Size(71, 23);
this.B_Cancel.TabIndex = 1;
@@ -96,7 +150,7 @@
this.LB_WCs.FormattingEnabled = true;
this.LB_WCs.Location = new System.Drawing.Point(12, 25);
this.LB_WCs.Name = "LB_WCs";
- this.LB_WCs.Size = new System.Drawing.Size(78, 95);
+ this.LB_WCs.Size = new System.Drawing.Size(78, 134);
this.LB_WCs.TabIndex = 4;
//
// LB_Received
@@ -104,7 +158,7 @@
this.LB_Received.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.LB_Received.FormattingEnabled = true;
- this.LB_Received.Location = new System.Drawing.Point(12, 155);
+ this.LB_Received.Location = new System.Drawing.Point(12, 194);
this.LB_Received.Name = "LB_Received";
this.LB_Received.Size = new System.Drawing.Size(78, 95);
this.LB_Received.Sorted = true;
@@ -115,14 +169,14 @@
this.L_WCs.AutoSize = true;
this.L_WCs.Location = new System.Drawing.Point(12, 9);
this.L_WCs.Name = "L_WCs";
- this.L_WCs.Size = new System.Drawing.Size(74, 13);
+ this.L_WCs.Size = new System.Drawing.Size(78, 13);
this.L_WCs.TabIndex = 6;
- this.L_WCs.Text = "Wondercards:";
+ this.L_WCs.Text = "Wonder Cards:";
//
// L_Received
//
this.L_Received.AutoSize = true;
- this.L_Received.Location = new System.Drawing.Point(12, 139);
+ this.L_Received.Location = new System.Drawing.Point(9, 178);
this.L_Received.Name = "L_Received";
this.L_Received.Size = new System.Drawing.Size(75, 13);
this.L_Received.TabIndex = 7;
@@ -156,7 +210,7 @@
this.RTB.Location = new System.Drawing.Point(120, 59);
this.RTB.Name = "RTB";
this.RTB.ReadOnly = true;
- this.RTB.Size = new System.Drawing.Size(302, 162);
+ this.RTB.Size = new System.Drawing.Size(302, 59);
this.RTB.TabIndex = 10;
this.RTB.Text = "";
//
@@ -182,7 +236,7 @@
// B_DeleteFlag
//
this.B_DeleteFlag.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.B_DeleteFlag.Location = new System.Drawing.Point(96, 197);
+ this.B_DeleteFlag.Location = new System.Drawing.Point(96, 247);
this.B_DeleteFlag.Name = "B_DeleteFlag";
this.B_DeleteFlag.Size = new System.Drawing.Size(18, 24);
this.B_DeleteFlag.TabIndex = 13;
@@ -210,12 +264,402 @@
this.PB_Preview.TabIndex = 63;
this.PB_Preview.TabStop = false;
//
+ // PB_Card01
+ //
+ this.PB_Card01.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.PB_Card01.BackColor = System.Drawing.Color.Transparent;
+ this.PB_Card01.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.PB_Card01.ContextMenuStrip = this.mnuVSD;
+ this.PB_Card01.Location = new System.Drawing.Point(128, 122);
+ this.PB_Card01.Name = "PB_Card01";
+ this.PB_Card01.Size = new System.Drawing.Size(42, 32);
+ this.PB_Card01.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+ this.PB_Card01.TabIndex = 64;
+ this.PB_Card01.TabStop = false;
+ this.PB_Card01.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown);
+ //
+ // mnuVSD
+ //
+ this.mnuVSD.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.mnuView,
+ this.mnuSet,
+ this.mnuDelete});
+ this.mnuVSD.Name = "mnuVSD";
+ this.mnuVSD.Size = new System.Drawing.Size(108, 70);
+ //
+ // mnuView
+ //
+ this.mnuView.Name = "mnuView";
+ this.mnuView.Size = new System.Drawing.Size(107, 22);
+ this.mnuView.Text = "View";
+ this.mnuView.Click += new System.EventHandler(this.clickView);
+ //
+ // mnuSet
+ //
+ this.mnuSet.Name = "mnuSet";
+ this.mnuSet.Size = new System.Drawing.Size(107, 22);
+ this.mnuSet.Text = "Set";
+ this.mnuSet.Click += new System.EventHandler(this.clickSet);
+ //
+ // mnuDelete
+ //
+ this.mnuDelete.Name = "mnuDelete";
+ this.mnuDelete.Size = new System.Drawing.Size(107, 22);
+ this.mnuDelete.Text = "Delete";
+ this.mnuDelete.Click += new System.EventHandler(this.clickDelete);
+ //
+ // PB_Card02
+ //
+ this.PB_Card02.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.PB_Card02.BackColor = System.Drawing.Color.Transparent;
+ this.PB_Card02.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.PB_Card02.ContextMenuStrip = this.mnuVSD;
+ this.PB_Card02.Location = new System.Drawing.Point(176, 122);
+ this.PB_Card02.Name = "PB_Card02";
+ this.PB_Card02.Size = new System.Drawing.Size(42, 32);
+ this.PB_Card02.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+ this.PB_Card02.TabIndex = 65;
+ this.PB_Card02.TabStop = false;
+ this.PB_Card02.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown);
+ //
+ // PB_Card03
+ //
+ this.PB_Card03.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.PB_Card03.BackColor = System.Drawing.Color.Transparent;
+ this.PB_Card03.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.PB_Card03.ContextMenuStrip = this.mnuVSD;
+ this.PB_Card03.Location = new System.Drawing.Point(224, 122);
+ this.PB_Card03.Name = "PB_Card03";
+ this.PB_Card03.Size = new System.Drawing.Size(42, 32);
+ this.PB_Card03.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+ this.PB_Card03.TabIndex = 66;
+ this.PB_Card03.TabStop = false;
+ this.PB_Card03.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown);
+ //
+ // PB_Card04
+ //
+ this.PB_Card04.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.PB_Card04.BackColor = System.Drawing.Color.Transparent;
+ this.PB_Card04.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.PB_Card04.ContextMenuStrip = this.mnuVSD;
+ this.PB_Card04.Location = new System.Drawing.Point(272, 122);
+ this.PB_Card04.Name = "PB_Card04";
+ this.PB_Card04.Size = new System.Drawing.Size(42, 32);
+ this.PB_Card04.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+ this.PB_Card04.TabIndex = 67;
+ this.PB_Card04.TabStop = false;
+ this.PB_Card04.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown);
+ //
+ // PB_Card05
+ //
+ this.PB_Card05.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.PB_Card05.BackColor = System.Drawing.Color.Transparent;
+ this.PB_Card05.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.PB_Card05.ContextMenuStrip = this.mnuVSD;
+ this.PB_Card05.Location = new System.Drawing.Point(320, 122);
+ this.PB_Card05.Name = "PB_Card05";
+ this.PB_Card05.Size = new System.Drawing.Size(42, 32);
+ this.PB_Card05.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+ this.PB_Card05.TabIndex = 68;
+ this.PB_Card05.TabStop = false;
+ this.PB_Card05.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown);
+ //
+ // PB_Card06
+ //
+ this.PB_Card06.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.PB_Card06.BackColor = System.Drawing.Color.Transparent;
+ this.PB_Card06.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.PB_Card06.ContextMenuStrip = this.mnuVSD;
+ this.PB_Card06.Location = new System.Drawing.Point(368, 122);
+ this.PB_Card06.Name = "PB_Card06";
+ this.PB_Card06.Size = new System.Drawing.Size(42, 32);
+ this.PB_Card06.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+ this.PB_Card06.TabIndex = 69;
+ this.PB_Card06.TabStop = false;
+ this.PB_Card06.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown);
+ //
+ // PB_Card12
+ //
+ this.PB_Card12.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.PB_Card12.BackColor = System.Drawing.Color.Transparent;
+ this.PB_Card12.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.PB_Card12.ContextMenuStrip = this.mnuVSD;
+ this.PB_Card12.Location = new System.Drawing.Point(368, 160);
+ this.PB_Card12.Name = "PB_Card12";
+ this.PB_Card12.Size = new System.Drawing.Size(42, 32);
+ this.PB_Card12.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+ this.PB_Card12.TabIndex = 75;
+ this.PB_Card12.TabStop = false;
+ this.PB_Card12.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown);
+ //
+ // PB_Card11
+ //
+ this.PB_Card11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.PB_Card11.BackColor = System.Drawing.Color.Transparent;
+ this.PB_Card11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.PB_Card11.ContextMenuStrip = this.mnuVSD;
+ this.PB_Card11.Location = new System.Drawing.Point(320, 160);
+ this.PB_Card11.Name = "PB_Card11";
+ this.PB_Card11.Size = new System.Drawing.Size(42, 32);
+ this.PB_Card11.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+ this.PB_Card11.TabIndex = 74;
+ this.PB_Card11.TabStop = false;
+ this.PB_Card11.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown);
+ //
+ // PB_Card10
+ //
+ this.PB_Card10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.PB_Card10.BackColor = System.Drawing.Color.Transparent;
+ this.PB_Card10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.PB_Card10.ContextMenuStrip = this.mnuVSD;
+ this.PB_Card10.Location = new System.Drawing.Point(272, 160);
+ this.PB_Card10.Name = "PB_Card10";
+ this.PB_Card10.Size = new System.Drawing.Size(42, 32);
+ this.PB_Card10.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+ this.PB_Card10.TabIndex = 73;
+ this.PB_Card10.TabStop = false;
+ this.PB_Card10.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown);
+ //
+ // PB_Card09
+ //
+ this.PB_Card09.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.PB_Card09.BackColor = System.Drawing.Color.Transparent;
+ this.PB_Card09.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.PB_Card09.ContextMenuStrip = this.mnuVSD;
+ this.PB_Card09.Location = new System.Drawing.Point(224, 160);
+ this.PB_Card09.Name = "PB_Card09";
+ this.PB_Card09.Size = new System.Drawing.Size(42, 32);
+ this.PB_Card09.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+ this.PB_Card09.TabIndex = 72;
+ this.PB_Card09.TabStop = false;
+ this.PB_Card09.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown);
+ //
+ // PB_Card08
+ //
+ this.PB_Card08.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.PB_Card08.BackColor = System.Drawing.Color.Transparent;
+ this.PB_Card08.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.PB_Card08.ContextMenuStrip = this.mnuVSD;
+ this.PB_Card08.Location = new System.Drawing.Point(176, 160);
+ this.PB_Card08.Name = "PB_Card08";
+ this.PB_Card08.Size = new System.Drawing.Size(42, 32);
+ this.PB_Card08.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+ this.PB_Card08.TabIndex = 71;
+ this.PB_Card08.TabStop = false;
+ this.PB_Card08.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown);
+ //
+ // PB_Card07
+ //
+ this.PB_Card07.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.PB_Card07.BackColor = System.Drawing.Color.Transparent;
+ this.PB_Card07.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.PB_Card07.ContextMenuStrip = this.mnuVSD;
+ this.PB_Card07.Location = new System.Drawing.Point(128, 160);
+ this.PB_Card07.Name = "PB_Card07";
+ this.PB_Card07.Size = new System.Drawing.Size(42, 32);
+ this.PB_Card07.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+ this.PB_Card07.TabIndex = 70;
+ this.PB_Card07.TabStop = false;
+ this.PB_Card07.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown);
+ //
+ // PB_Card18
+ //
+ this.PB_Card18.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.PB_Card18.BackColor = System.Drawing.Color.Transparent;
+ this.PB_Card18.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.PB_Card18.ContextMenuStrip = this.mnuVSD;
+ this.PB_Card18.Location = new System.Drawing.Point(368, 198);
+ this.PB_Card18.Name = "PB_Card18";
+ this.PB_Card18.Size = new System.Drawing.Size(42, 32);
+ this.PB_Card18.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+ this.PB_Card18.TabIndex = 81;
+ this.PB_Card18.TabStop = false;
+ this.PB_Card18.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown);
+ //
+ // PB_Card17
+ //
+ this.PB_Card17.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.PB_Card17.BackColor = System.Drawing.Color.Transparent;
+ this.PB_Card17.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.PB_Card17.ContextMenuStrip = this.mnuVSD;
+ this.PB_Card17.Location = new System.Drawing.Point(320, 198);
+ this.PB_Card17.Name = "PB_Card17";
+ this.PB_Card17.Size = new System.Drawing.Size(42, 32);
+ this.PB_Card17.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+ this.PB_Card17.TabIndex = 80;
+ this.PB_Card17.TabStop = false;
+ this.PB_Card17.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown);
+ //
+ // PB_Card16
+ //
+ this.PB_Card16.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.PB_Card16.BackColor = System.Drawing.Color.Transparent;
+ this.PB_Card16.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.PB_Card16.ContextMenuStrip = this.mnuVSD;
+ this.PB_Card16.Location = new System.Drawing.Point(272, 198);
+ this.PB_Card16.Name = "PB_Card16";
+ this.PB_Card16.Size = new System.Drawing.Size(42, 32);
+ this.PB_Card16.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+ this.PB_Card16.TabIndex = 79;
+ this.PB_Card16.TabStop = false;
+ this.PB_Card16.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown);
+ //
+ // PB_Card15
+ //
+ this.PB_Card15.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.PB_Card15.BackColor = System.Drawing.Color.Transparent;
+ this.PB_Card15.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.PB_Card15.ContextMenuStrip = this.mnuVSD;
+ this.PB_Card15.Location = new System.Drawing.Point(224, 198);
+ this.PB_Card15.Name = "PB_Card15";
+ this.PB_Card15.Size = new System.Drawing.Size(42, 32);
+ this.PB_Card15.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+ this.PB_Card15.TabIndex = 78;
+ this.PB_Card15.TabStop = false;
+ this.PB_Card15.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown);
+ //
+ // PB_Card14
+ //
+ this.PB_Card14.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.PB_Card14.BackColor = System.Drawing.Color.Transparent;
+ this.PB_Card14.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.PB_Card14.ContextMenuStrip = this.mnuVSD;
+ this.PB_Card14.Location = new System.Drawing.Point(176, 198);
+ this.PB_Card14.Name = "PB_Card14";
+ this.PB_Card14.Size = new System.Drawing.Size(42, 32);
+ this.PB_Card14.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+ this.PB_Card14.TabIndex = 77;
+ this.PB_Card14.TabStop = false;
+ this.PB_Card14.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown);
+ //
+ // PB_Card13
+ //
+ this.PB_Card13.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.PB_Card13.BackColor = System.Drawing.Color.Transparent;
+ this.PB_Card13.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.PB_Card13.ContextMenuStrip = this.mnuVSD;
+ this.PB_Card13.Location = new System.Drawing.Point(128, 198);
+ this.PB_Card13.Name = "PB_Card13";
+ this.PB_Card13.Size = new System.Drawing.Size(42, 32);
+ this.PB_Card13.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+ this.PB_Card13.TabIndex = 76;
+ this.PB_Card13.TabStop = false;
+ this.PB_Card13.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown);
+ //
+ // PB_Card24
+ //
+ this.PB_Card24.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.PB_Card24.BackColor = System.Drawing.Color.Transparent;
+ this.PB_Card24.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.PB_Card24.ContextMenuStrip = this.mnuVSD;
+ this.PB_Card24.Location = new System.Drawing.Point(368, 236);
+ this.PB_Card24.Name = "PB_Card24";
+ this.PB_Card24.Size = new System.Drawing.Size(42, 32);
+ this.PB_Card24.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+ this.PB_Card24.TabIndex = 87;
+ this.PB_Card24.TabStop = false;
+ this.PB_Card24.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown);
+ //
+ // PB_Card23
+ //
+ this.PB_Card23.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.PB_Card23.BackColor = System.Drawing.Color.Transparent;
+ this.PB_Card23.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.PB_Card23.ContextMenuStrip = this.mnuVSD;
+ this.PB_Card23.Location = new System.Drawing.Point(320, 236);
+ this.PB_Card23.Name = "PB_Card23";
+ this.PB_Card23.Size = new System.Drawing.Size(42, 32);
+ this.PB_Card23.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+ this.PB_Card23.TabIndex = 86;
+ this.PB_Card23.TabStop = false;
+ this.PB_Card23.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown);
+ //
+ // PB_Card22
+ //
+ this.PB_Card22.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.PB_Card22.BackColor = System.Drawing.Color.Transparent;
+ this.PB_Card22.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.PB_Card22.ContextMenuStrip = this.mnuVSD;
+ this.PB_Card22.Location = new System.Drawing.Point(272, 236);
+ this.PB_Card22.Name = "PB_Card22";
+ this.PB_Card22.Size = new System.Drawing.Size(42, 32);
+ this.PB_Card22.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+ this.PB_Card22.TabIndex = 85;
+ this.PB_Card22.TabStop = false;
+ this.PB_Card22.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown);
+ //
+ // PB_Card21
+ //
+ this.PB_Card21.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.PB_Card21.BackColor = System.Drawing.Color.Transparent;
+ this.PB_Card21.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.PB_Card21.ContextMenuStrip = this.mnuVSD;
+ this.PB_Card21.Location = new System.Drawing.Point(224, 236);
+ this.PB_Card21.Name = "PB_Card21";
+ this.PB_Card21.Size = new System.Drawing.Size(42, 32);
+ this.PB_Card21.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+ this.PB_Card21.TabIndex = 84;
+ this.PB_Card21.TabStop = false;
+ this.PB_Card21.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown);
+ //
+ // PB_Card20
+ //
+ this.PB_Card20.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.PB_Card20.BackColor = System.Drawing.Color.Transparent;
+ this.PB_Card20.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.PB_Card20.ContextMenuStrip = this.mnuVSD;
+ this.PB_Card20.Location = new System.Drawing.Point(176, 236);
+ this.PB_Card20.Name = "PB_Card20";
+ this.PB_Card20.Size = new System.Drawing.Size(42, 32);
+ this.PB_Card20.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+ this.PB_Card20.TabIndex = 83;
+ this.PB_Card20.TabStop = false;
+ this.PB_Card20.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown);
+ //
+ // PB_Card19
+ //
+ this.PB_Card19.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.PB_Card19.BackColor = System.Drawing.Color.Transparent;
+ this.PB_Card19.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.PB_Card19.ContextMenuStrip = this.mnuVSD;
+ this.PB_Card19.Location = new System.Drawing.Point(128, 236);
+ this.PB_Card19.Name = "PB_Card19";
+ this.PB_Card19.Size = new System.Drawing.Size(42, 32);
+ this.PB_Card19.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+ this.PB_Card19.TabIndex = 82;
+ this.PB_Card19.TabStop = false;
+ this.PB_Card19.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown);
+ //
// SAV_Wondercard
//
this.AllowDrop = true;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(434, 262);
+ this.ClientSize = new System.Drawing.Size(434, 312);
+ this.Controls.Add(this.PB_Card24);
+ this.Controls.Add(this.PB_Card23);
+ this.Controls.Add(this.PB_Card22);
+ this.Controls.Add(this.PB_Card21);
+ this.Controls.Add(this.PB_Card20);
+ this.Controls.Add(this.PB_Card19);
+ this.Controls.Add(this.PB_Card18);
+ this.Controls.Add(this.PB_Card17);
+ this.Controls.Add(this.PB_Card16);
+ this.Controls.Add(this.PB_Card15);
+ this.Controls.Add(this.PB_Card14);
+ this.Controls.Add(this.PB_Card13);
+ this.Controls.Add(this.PB_Card12);
+ this.Controls.Add(this.PB_Card11);
+ this.Controls.Add(this.PB_Card10);
+ this.Controls.Add(this.PB_Card09);
+ this.Controls.Add(this.PB_Card08);
+ this.Controls.Add(this.PB_Card07);
+ this.Controls.Add(this.PB_Card06);
+ this.Controls.Add(this.PB_Card05);
+ this.Controls.Add(this.PB_Card04);
+ this.Controls.Add(this.PB_Card03);
+ this.Controls.Add(this.PB_Card02);
+ this.Controls.Add(this.PB_Card01);
this.Controls.Add(this.PB_Preview);
this.Controls.Add(this.L_QR);
this.Controls.Add(this.B_DeleteFlag);
@@ -236,11 +680,36 @@
this.MaximizeBox = false;
this.MaximumSize = new System.Drawing.Size(700, 500);
this.MinimizeBox = false;
- this.MinimumSize = new System.Drawing.Size(450, 300);
+ this.MinimumSize = new System.Drawing.Size(450, 350);
this.Name = "SAV_Wondercard";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "Wondercard I/O";
+ this.Text = "Wonder Card I/O";
((System.ComponentModel.ISupportInitialize)(this.PB_Preview)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card01)).EndInit();
+ this.mnuVSD.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card02)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card03)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card04)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card05)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card06)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card09)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card08)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card07)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card18)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card17)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card16)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card24)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card23)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card22)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card21)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card20)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.PB_Card19)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -264,5 +733,33 @@
private System.Windows.Forms.Button B_DeleteFlag;
private System.Windows.Forms.Label L_QR;
private System.Windows.Forms.PictureBox PB_Preview;
+ private System.Windows.Forms.PictureBox PB_Card01;
+ private System.Windows.Forms.PictureBox PB_Card02;
+ private System.Windows.Forms.PictureBox PB_Card03;
+ private System.Windows.Forms.PictureBox PB_Card04;
+ private System.Windows.Forms.PictureBox PB_Card05;
+ private System.Windows.Forms.PictureBox PB_Card06;
+ private System.Windows.Forms.PictureBox PB_Card12;
+ private System.Windows.Forms.PictureBox PB_Card11;
+ private System.Windows.Forms.PictureBox PB_Card10;
+ private System.Windows.Forms.PictureBox PB_Card09;
+ private System.Windows.Forms.PictureBox PB_Card08;
+ private System.Windows.Forms.PictureBox PB_Card07;
+ private System.Windows.Forms.PictureBox PB_Card18;
+ private System.Windows.Forms.PictureBox PB_Card17;
+ private System.Windows.Forms.PictureBox PB_Card16;
+ private System.Windows.Forms.PictureBox PB_Card15;
+ private System.Windows.Forms.PictureBox PB_Card14;
+ private System.Windows.Forms.PictureBox PB_Card13;
+ private System.Windows.Forms.PictureBox PB_Card24;
+ private System.Windows.Forms.PictureBox PB_Card23;
+ private System.Windows.Forms.PictureBox PB_Card22;
+ private System.Windows.Forms.PictureBox PB_Card21;
+ private System.Windows.Forms.PictureBox PB_Card20;
+ private System.Windows.Forms.PictureBox PB_Card19;
+ private System.Windows.Forms.ContextMenuStrip mnuVSD;
+ private System.Windows.Forms.ToolStripMenuItem mnuView;
+ private System.Windows.Forms.ToolStripMenuItem mnuSet;
+ private System.Windows.Forms.ToolStripMenuItem mnuDelete;
}
}
\ No newline at end of file
diff --git a/SAV/SAV_Wondercard.cs b/SAV/SAV_Wondercard.cs
index 1bee36cac..3746955f5 100644
--- a/SAV/SAV_Wondercard.cs
+++ b/SAV/SAV_Wondercard.cs
@@ -14,6 +14,14 @@ namespace PKHeX
InitializeComponent();
Util.TranslateInterface(this, Main.curlanguage);
sav = (byte[])Main.SAV.Data.Clone();
+ pba = new[]
+ {
+ PB_Card01, PB_Card02, PB_Card03, PB_Card04, PB_Card05, PB_Card06,
+ PB_Card07, PB_Card08, PB_Card09, PB_Card10, PB_Card11, PB_Card12,
+ PB_Card13, PB_Card14, PB_Card15, PB_Card16, PB_Card17, PB_Card18,
+ PB_Card19, PB_Card20, PB_Card21, PB_Card22, PB_Card23, PB_Card24,
+ };
+
populateWClist();
populateReceived();
@@ -32,6 +40,7 @@ namespace PKHeX
public byte[] sav;
public byte[] wondercard_data = new byte[0x108];
private const uint EonTicketConst = 0x225D73C2;
+ private PictureBox[] pba;
// Repopulation Functions
private void populateWClist()
@@ -42,9 +51,15 @@ namespace PKHeX
int offset = Main.SAV.WondercardData + i * 0x108;
int cardID = BitConverter.ToUInt16(sav, offset);
if (cardID == 0)
+ {
LB_WCs.Items.Add((i + 1).ToString("00") + " - Empty");
+ pba[i].Image = null;
+ }
else
+ {
LB_WCs.Items.Add((i + 1).ToString("00") + " - " + cardID.ToString("0000"));
+ pba[i].Image = getWCPreviewImage(sav.Skip(Main.SAV.WondercardData + WC6.Size * i).Take(WC6.Size).ToArray());
+ }
}
}
private void loadwcdata()
@@ -55,7 +70,7 @@ namespace PKHeX
{
if (DialogResult.Yes !=
Util.Prompt(MessageBoxButtons.YesNo,
- "Wondercard is marked as USED and will not be able to be picked up in-game.",
+ "Wonder Card is marked as USED and will not be able to be picked up in-game.",
"Do you want to remove the USED flag so that it is UNUSED?"))
return;
@@ -66,7 +81,7 @@ namespace PKHeX
}
catch (Exception e)
{
- Util.Error("Loading of data failed... is this really a Wondercard?", e.ToString());
+ Util.Error("Loading of data failed... is this really a Wonder Card?", e.ToString());
Array.Copy(new byte[0x108], wondercard_data, 0x108);
RTB.Clear();
}
@@ -82,13 +97,13 @@ namespace PKHeX
// Wondercard IO (.wc6<->window)
private void B_Import_Click(object sender, EventArgs e)
{
- OpenFileDialog importwc6 = new OpenFileDialog {Filter = "Wondercard|*.wc6"};
+ OpenFileDialog importwc6 = new OpenFileDialog {Filter = "Wonder Card|*.wc6"};
if (importwc6.ShowDialog() != DialogResult.OK) return;
string path = importwc6.FileName;
if (new FileInfo(path).Length != 0x108)
{
- Util.Error("File is not a Wondercard:", path);
+ Util.Error("File is not a Wonder Card:", path);
return;
}
byte[] newwc6 = File.ReadAllBytes(path);
@@ -101,7 +116,7 @@ namespace PKHeX
int cardID = BitConverter.ToUInt16(wondercard_data, 0);
string cardname = Encoding.Unicode.GetString(wondercard_data, 0x2, 0x48);
outputwc6.FileName = cardID + " - " + cardname + ".wc6";
- outputwc6.Filter = "Wondercard|*.wc6";
+ outputwc6.Filter = "Wonder Card|*.wc6";
if (outputwc6.ShowDialog() != DialogResult.OK) return;
string path = outputwc6.FileName;
@@ -262,27 +277,18 @@ namespace PKHeX
}
else if (cardtype == 0) // PKM
{
- int species = BitConverter.ToUInt16(data, 0x82);
- int helditem = BitConverter.ToUInt16(data, 0x78);
- int move1 = BitConverter.ToUInt16(data, 0x7A);
- int move2 = BitConverter.ToUInt16(data, 0x7C);
- int move3 = BitConverter.ToUInt16(data, 0x7E);
- int move4 = BitConverter.ToUInt16(data, 0x80);
- int TID = BitConverter.ToUInt16(data, 0x68);
- int SID = BitConverter.ToUInt16(data, 0x6A);
-
- string OTname = Util.TrimFromZero(Encoding.Unicode.GetString(data, 0xB6, 22));
+ WC6 card = new WC6(data);
s += String.Format(
"{1} @ {2} --- {7} - {8}/{9}{0}" +
"{3} / {4} / {5} / {6}{0}",
Environment.NewLine,
- Main.specieslist[species],
- Main.itemlist[helditem],
- Main.movelist[move1],
- Main.movelist[move2],
- Main.movelist[move3],
- Main.movelist[move4],
- OTname, TID.ToString("00000"), SID.ToString("00000"));
+ Main.specieslist[card.Species],
+ Main.itemlist[card.HeldItem],
+ Main.movelist[card.Move1],
+ Main.movelist[card.Move2],
+ Main.movelist[card.Move3],
+ Main.movelist[card.Move4],
+ card.OT, card.TID.ToString("00000"), card.SID.ToString("00000"));
}
else
s += "Unknown Wondercard Type!";
@@ -347,5 +353,39 @@ namespace PKHeX
new QR(qr, PB_Preview.Image, desc, "", "", "PKHeX Wondercard @ ProjectPokemon.org").ShowDialog();
}
}
+
+ private void pbBoxSlot_MouseDown(object sender, MouseEventArgs e)
+ {
+ switch (ModifierKeys)
+ {
+ case Keys.Control: clickView(sender, e); break;
+ case Keys.Shift: clickSet(sender, e); break;
+ case Keys.Alt: clickDelete(sender, e); break;
+ }
+ }
+ private void clickView(object sender, EventArgs e)
+ {
+ string name = (sender is ToolStripItem)
+ ? ((sender as ToolStripItem).Owner as ContextMenuStrip).SourceControl.Name
+ : (sender as PictureBox).Name;
+ LB_WCs.SelectedIndex = Array.FindIndex(pba, p => p.Name == name);
+ B_WCSlottoDisplay.PerformClick();
+ }
+ private void clickSet(object sender, EventArgs e)
+ {
+ string name = (sender is ToolStripItem)
+ ? ((sender as ToolStripItem).Owner as ContextMenuStrip).SourceControl.Name
+ : (sender as PictureBox).Name;
+ LB_WCs.SelectedIndex = Array.FindIndex(pba, p => p.Name == name);
+ B_DisplaytoWCSlot.PerformClick();
+ }
+ private void clickDelete(object sender, EventArgs e)
+ {
+ string name = (sender is ToolStripItem)
+ ? ((sender as ToolStripItem).Owner as ContextMenuStrip).SourceControl.Name
+ : (sender as PictureBox).Name;
+ LB_WCs.SelectedIndex = Array.FindIndex(pba, p => p.Name == name);
+ B_DeleteWC.PerformClick();
+ }
}
}
\ No newline at end of file
diff --git a/SAV/SAV_Wondercard.resx b/SAV/SAV_Wondercard.resx
index 603f660be..fad816a54 100644
--- a/SAV/SAV_Wondercard.resx
+++ b/SAV/SAV_Wondercard.resx
@@ -117,6 +117,9 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 17, 17
+