From 97fb704bb418923985502c857dff3b34e2373efe Mon Sep 17 00:00:00 2001 From: AdAstra-LD <76622070+AdAstra-LD@users.noreply.github.com> Date: Tue, 21 May 2024 18:09:02 +0200 Subject: [PATCH] Implemented battle effect descriptions in Move Data Editor --- DS_Map/Editors/MoveDataEditor.Designer.cs | 213 ++++---- DS_Map/Editors/MoveDataEditor.cs | 17 +- DS_Map/Resources/PokeDatabase.cs | 605 ++++++++++++++++------ 3 files changed, 563 insertions(+), 272 deletions(-) diff --git a/DS_Map/Editors/MoveDataEditor.Designer.cs b/DS_Map/Editors/MoveDataEditor.Designer.cs index 297bfc9..207259a 100644 --- a/DS_Map/Editors/MoveDataEditor.Designer.cs +++ b/DS_Map/Editors/MoveDataEditor.Designer.cs @@ -27,6 +27,7 @@ this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.saveDataButton = new System.Windows.Forms.Button(); this.moveNumberNumericUpDown = new System.Windows.Forms.NumericUpDown(); + this.moveNameInputComboBox = new DSPRE.InputComboBox(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); this.prioPictureBox = new System.Windows.Forms.PictureBox(); @@ -78,7 +79,6 @@ this.ppUpDown = new System.Windows.Forms.NumericUpDown(); this.label8 = new System.Windows.Forms.Label(); this.sideEffectProbabilityUpDown = new System.Windows.Forms.NumericUpDown(); - this.moveNameInputComboBox = new DSPRE.InputComboBox(); this.tableLayoutPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.moveNumberNumericUpDown)).BeginInit(); this.groupBox3.SuspendLayout(); @@ -103,8 +103,8 @@ // tableLayoutPanel1 // this.tableLayoutPanel1.ColumnCount = 4; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.41322F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 56.65722F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 57.02703F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 22.3796F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.43285F)); this.tableLayoutPanel1.Controls.Add(this.saveDataButton, 3, 0); @@ -141,6 +141,19 @@ this.moveNumberNumericUpDown.TabIndex = 16; this.moveNumberNumericUpDown.ValueChanged += new System.EventHandler(this.moveNumberNumericUpDown_ValueChanged); // + // moveNameInputComboBox + // + this.moveNameInputComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.moveNameInputComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.moveNameInputComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.moveNameInputComboBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.moveNameInputComboBox.FormattingEnabled = true; + this.moveNameInputComboBox.Location = new System.Drawing.Point(77, 14); + this.moveNameInputComboBox.Name = "moveNameInputComboBox"; + this.moveNameInputComboBox.Size = new System.Drawing.Size(416, 32); + this.moveNameInputComboBox.TabIndex = 31; + this.moveNameInputComboBox.SelectedIndexChanged += new System.EventHandler(this.moveNameInputComboBox_SelectedIndexChanged); + // // groupBox3 // this.tableLayoutPanel1.SetColumnSpan(this.groupBox3, 4); @@ -156,13 +169,13 @@ // tableLayoutPanel3 // this.tableLayoutPanel3.ColumnCount = 7; - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 21.7569F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 57.32663F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25.22124F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 53.9823F)); this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20.91647F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 145F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 114F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 103F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 67F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 252F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 69F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 109F)); this.tableLayoutPanel3.Controls.Add(this.prioPictureBox, 2, 3); this.tableLayoutPanel3.Controls.Add(this.contestAppealNumericUpDown, 4, 2); this.tableLayoutPanel3.Controls.Add(this.label6, 3, 2); @@ -212,23 +225,23 @@ // prioPictureBox // this.prioPictureBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.prioPictureBox.Location = new System.Drawing.Point(227, 119); + this.prioPictureBox.Location = new System.Drawing.Point(184, 119); this.prioPictureBox.Name = "prioPictureBox"; - this.prioPictureBox.Size = new System.Drawing.Size(52, 31); + this.prioPictureBox.Size = new System.Drawing.Size(41, 31); this.prioPictureBox.TabIndex = 27; this.prioPictureBox.TabStop = false; // // contestAppealNumericUpDown // this.contestAppealNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.contestAppealNumericUpDown.Location = new System.Drawing.Point(365, 88); + this.contestAppealNumericUpDown.Location = new System.Drawing.Point(298, 88); this.contestAppealNumericUpDown.Maximum = new decimal(new int[] { 255, 0, 0, 0}); this.contestAppealNumericUpDown.Name = "contestAppealNumericUpDown"; - this.contestAppealNumericUpDown.Size = new System.Drawing.Size(139, 20); + this.contestAppealNumericUpDown.Size = new System.Drawing.Size(246, 20); this.contestAppealNumericUpDown.TabIndex = 24; this.contestAppealNumericUpDown.ValueChanged += new System.EventHandler(this.contestAppealNumericUpDown_ValueChanged); // @@ -236,9 +249,9 @@ // this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(285, 85); + this.label6.Location = new System.Drawing.Point(231, 85); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(74, 26); + this.label6.Size = new System.Drawing.Size(61, 26); this.label6.TabIndex = 23; this.label6.Text = "Contest Appeal"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -246,9 +259,9 @@ // contestConditionPictureBox // this.contestConditionPictureBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.contestConditionPictureBox.Location = new System.Drawing.Point(227, 84); + this.contestConditionPictureBox.Location = new System.Drawing.Point(184, 84); this.contestConditionPictureBox.Name = "contestConditionPictureBox"; - this.contestConditionPictureBox.Size = new System.Drawing.Size(52, 29); + this.contestConditionPictureBox.Size = new System.Drawing.Size(41, 29); this.contestConditionPictureBox.TabIndex = 22; this.contestConditionPictureBox.TabStop = false; // @@ -256,9 +269,9 @@ // this.contestConditionComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.contestConditionComboBox.FormattingEnabled = true; - this.contestConditionComboBox.Location = new System.Drawing.Point(66, 88); + this.contestConditionComboBox.Location = new System.Drawing.Point(62, 88); this.contestConditionComboBox.Name = "contestConditionComboBox"; - this.contestConditionComboBox.Size = new System.Drawing.Size(155, 21); + this.contestConditionComboBox.Size = new System.Drawing.Size(116, 21); this.contestConditionComboBox.TabIndex = 21; this.contestConditionComboBox.SelectedIndexChanged += new System.EventHandler(this.contestConditionComboBox_SelectedIndexChanged); // @@ -268,17 +281,17 @@ this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(5, 85); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(55, 26); + this.label3.Size = new System.Drawing.Size(51, 26); this.label3.TabIndex = 20; - this.label3.Text = "Contest Condition"; + this.label3.Text = "Contest\r\nCondition"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // moveSplitPictureBox // this.moveSplitPictureBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.moveSplitPictureBox.Location = new System.Drawing.Point(227, 46); + this.moveSplitPictureBox.Location = new System.Drawing.Point(184, 46); this.moveSplitPictureBox.Name = "moveSplitPictureBox"; - this.moveSplitPictureBox.Size = new System.Drawing.Size(52, 32); + this.moveSplitPictureBox.Size = new System.Drawing.Size(41, 32); this.moveSplitPictureBox.TabIndex = 19; this.moveSplitPictureBox.TabStop = false; // @@ -287,9 +300,9 @@ this.tableLayoutPanel3.SetColumnSpan(this.groupBox4, 4); this.groupBox4.Controls.Add(this.flagsTableLayoutPanel); this.groupBox4.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox4.Location = new System.Drawing.Point(285, 318); + this.groupBox4.Location = new System.Drawing.Point(231, 318); this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(438, 142); + this.groupBox4.Size = new System.Drawing.Size(492, 142); this.groupBox4.TabIndex = 18; this.groupBox4.TabStop = false; this.groupBox4.Text = "Flags"; @@ -315,7 +328,7 @@ this.flagsTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); this.flagsTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); this.flagsTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); - this.flagsTableLayoutPanel.Size = new System.Drawing.Size(432, 123); + this.flagsTableLayoutPanel.Size = new System.Drawing.Size(486, 123); this.flagsTableLayoutPanel.TabIndex = 11; // // checkBox1 @@ -323,7 +336,7 @@ this.checkBox1.Dock = System.Windows.Forms.DockStyle.Fill; this.checkBox1.Location = new System.Drawing.Point(3, 3); this.checkBox1.Name = "checkBox1"; - this.checkBox1.Size = new System.Drawing.Size(137, 35); + this.checkBox1.Size = new System.Drawing.Size(155, 35); this.checkBox1.TabIndex = 1; this.checkBox1.Text = "checkBox1"; this.checkBox1.UseVisualStyleBackColor = true; @@ -331,9 +344,9 @@ // checkBox11 // this.checkBox11.Dock = System.Windows.Forms.DockStyle.Fill; - this.checkBox11.Location = new System.Drawing.Point(146, 3); + this.checkBox11.Location = new System.Drawing.Point(164, 3); this.checkBox11.Name = "checkBox11"; - this.checkBox11.Size = new System.Drawing.Size(138, 35); + this.checkBox11.Size = new System.Drawing.Size(156, 35); this.checkBox11.TabIndex = 2; this.checkBox11.Text = "checkBox11"; this.checkBox11.UseVisualStyleBackColor = true; @@ -341,9 +354,9 @@ // checkBox12 // this.checkBox12.Dock = System.Windows.Forms.DockStyle.Fill; - this.checkBox12.Location = new System.Drawing.Point(290, 3); + this.checkBox12.Location = new System.Drawing.Point(326, 3); this.checkBox12.Name = "checkBox12"; - this.checkBox12.Size = new System.Drawing.Size(139, 35); + this.checkBox12.Size = new System.Drawing.Size(157, 35); this.checkBox12.TabIndex = 3; this.checkBox12.Text = "checkBox12"; this.checkBox12.UseVisualStyleBackColor = true; @@ -353,7 +366,7 @@ this.checkBox13.Dock = System.Windows.Forms.DockStyle.Fill; this.checkBox13.Location = new System.Drawing.Point(3, 44); this.checkBox13.Name = "checkBox13"; - this.checkBox13.Size = new System.Drawing.Size(137, 35); + this.checkBox13.Size = new System.Drawing.Size(155, 35); this.checkBox13.TabIndex = 4; this.checkBox13.Text = "checkBox13"; this.checkBox13.UseVisualStyleBackColor = true; @@ -361,9 +374,9 @@ // checkBox14 // this.checkBox14.Dock = System.Windows.Forms.DockStyle.Fill; - this.checkBox14.Location = new System.Drawing.Point(146, 44); + this.checkBox14.Location = new System.Drawing.Point(164, 44); this.checkBox14.Name = "checkBox14"; - this.checkBox14.Size = new System.Drawing.Size(138, 35); + this.checkBox14.Size = new System.Drawing.Size(156, 35); this.checkBox14.TabIndex = 5; this.checkBox14.Text = "checkBox14"; this.checkBox14.UseVisualStyleBackColor = true; @@ -371,9 +384,9 @@ // checkBox15 // this.checkBox15.Dock = System.Windows.Forms.DockStyle.Fill; - this.checkBox15.Location = new System.Drawing.Point(290, 44); + this.checkBox15.Location = new System.Drawing.Point(326, 44); this.checkBox15.Name = "checkBox15"; - this.checkBox15.Size = new System.Drawing.Size(139, 35); + this.checkBox15.Size = new System.Drawing.Size(157, 35); this.checkBox15.TabIndex = 6; this.checkBox15.Text = "checkBox15"; this.checkBox15.UseVisualStyleBackColor = true; @@ -383,7 +396,7 @@ this.checkBox16.Dock = System.Windows.Forms.DockStyle.Fill; this.checkBox16.Location = new System.Drawing.Point(3, 85); this.checkBox16.Name = "checkBox16"; - this.checkBox16.Size = new System.Drawing.Size(137, 35); + this.checkBox16.Size = new System.Drawing.Size(155, 35); this.checkBox16.TabIndex = 7; this.checkBox16.Text = "checkBox16"; this.checkBox16.UseVisualStyleBackColor = true; @@ -391,9 +404,9 @@ // checkBox17 // this.checkBox17.Dock = System.Windows.Forms.DockStyle.Fill; - this.checkBox17.Location = new System.Drawing.Point(146, 85); + this.checkBox17.Location = new System.Drawing.Point(164, 85); this.checkBox17.Name = "checkBox17"; - this.checkBox17.Size = new System.Drawing.Size(138, 35); + this.checkBox17.Size = new System.Drawing.Size(156, 35); this.checkBox17.TabIndex = 8; this.checkBox17.Text = "checkBox17"; this.checkBox17.UseVisualStyleBackColor = true; @@ -402,9 +415,9 @@ // this.moveTypeComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.moveTypeComboBox.FormattingEnabled = true; - this.moveTypeComboBox.Location = new System.Drawing.Point(66, 12); + this.moveTypeComboBox.Location = new System.Drawing.Point(62, 12); this.moveTypeComboBox.Name = "moveTypeComboBox"; - this.moveTypeComboBox.Size = new System.Drawing.Size(155, 21); + this.moveTypeComboBox.Size = new System.Drawing.Size(116, 21); this.moveTypeComboBox.TabIndex = 7; this.moveTypeComboBox.SelectedIndexChanged += new System.EventHandler(this.moveTypeComboBox_SelectedIndexChanged); // @@ -412,9 +425,9 @@ // this.battleSeqComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.battleSeqComboBox.FormattingEnabled = true; - this.battleSeqComboBox.Location = new System.Drawing.Point(365, 12); + this.battleSeqComboBox.Location = new System.Drawing.Point(298, 12); this.battleSeqComboBox.Name = "battleSeqComboBox"; - this.battleSeqComboBox.Size = new System.Drawing.Size(139, 21); + this.battleSeqComboBox.Size = new System.Drawing.Size(246, 21); this.battleSeqComboBox.TabIndex = 0; this.battleSeqComboBox.SelectedIndexChanged += new System.EventHandler(this.battleSeqComboBox_SelectedIndexChanged); // @@ -422,11 +435,11 @@ // this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(285, 16); + this.label1.Location = new System.Drawing.Point(231, 9); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(74, 13); + this.label1.Size = new System.Drawing.Size(61, 26); this.label1.TabIndex = 1; - this.label1.Text = "Battle Seq"; + this.label1.Text = "Effect Sequence"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // typeLabel @@ -435,7 +448,7 @@ this.typeLabel.AutoSize = true; this.typeLabel.Location = new System.Drawing.Point(5, 16); this.typeLabel.Name = "typeLabel"; - this.typeLabel.Size = new System.Drawing.Size(55, 13); + this.typeLabel.Size = new System.Drawing.Size(51, 13); this.typeLabel.TabIndex = 2; this.typeLabel.Text = "Type"; this.typeLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -446,7 +459,7 @@ this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(5, 55); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(55, 13); + this.label2.Size = new System.Drawing.Size(51, 13); this.label2.TabIndex = 5; this.label2.Text = "Split"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -455,18 +468,18 @@ // this.moveSplitComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.moveSplitComboBox.FormattingEnabled = true; - this.moveSplitComboBox.Location = new System.Drawing.Point(66, 51); + this.moveSplitComboBox.Location = new System.Drawing.Point(62, 51); this.moveSplitComboBox.Name = "moveSplitComboBox"; - this.moveSplitComboBox.Size = new System.Drawing.Size(155, 21); + this.moveSplitComboBox.Size = new System.Drawing.Size(116, 21); this.moveSplitComboBox.TabIndex = 6; this.moveSplitComboBox.SelectedIndexChanged += new System.EventHandler(this.moveSplitComboBox_SelectedIndexChanged); // // moveTypePictureBox // this.moveTypePictureBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.moveTypePictureBox.Location = new System.Drawing.Point(227, 5); + this.moveTypePictureBox.Location = new System.Drawing.Point(184, 5); this.moveTypePictureBox.Name = "moveTypePictureBox"; - this.moveTypePictureBox.Size = new System.Drawing.Size(52, 35); + this.moveTypePictureBox.Size = new System.Drawing.Size(41, 35); this.moveTypePictureBox.TabIndex = 3; this.moveTypePictureBox.TabStop = false; // @@ -475,10 +488,10 @@ this.tableLayoutPanel3.SetColumnSpan(this.groupBox1, 4); this.groupBox1.Controls.Add(this.rangesTableLayoutPanel); this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox1.Location = new System.Drawing.Point(285, 156); + this.groupBox1.Location = new System.Drawing.Point(231, 156); this.groupBox1.Name = "groupBox1"; this.tableLayoutPanel3.SetRowSpan(this.groupBox1, 2); - this.groupBox1.Size = new System.Drawing.Size(438, 156); + this.groupBox1.Size = new System.Drawing.Size(492, 156); this.groupBox1.TabIndex = 12; this.groupBox1.TabStop = false; this.groupBox1.Text = "Range of action"; @@ -508,15 +521,15 @@ this.rangesTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); this.rangesTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); this.rangesTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); - this.rangesTableLayoutPanel.Size = new System.Drawing.Size(432, 137); + this.rangesTableLayoutPanel.Size = new System.Drawing.Size(486, 137); this.rangesTableLayoutPanel.TabIndex = 11; // // checkBox20 // this.checkBox20.Dock = System.Windows.Forms.DockStyle.Fill; - this.checkBox20.Location = new System.Drawing.Point(146, 105); + this.checkBox20.Location = new System.Drawing.Point(164, 105); this.checkBox20.Name = "checkBox20"; - this.checkBox20.Size = new System.Drawing.Size(138, 29); + this.checkBox20.Size = new System.Drawing.Size(156, 29); this.checkBox20.TabIndex = 11; this.checkBox20.Text = "checkBox20"; this.checkBox20.UseVisualStyleBackColor = true; @@ -526,7 +539,7 @@ this.checkBox19.Dock = System.Windows.Forms.DockStyle.Fill; this.checkBox19.Location = new System.Drawing.Point(3, 105); this.checkBox19.Name = "checkBox19"; - this.checkBox19.Size = new System.Drawing.Size(137, 29); + this.checkBox19.Size = new System.Drawing.Size(155, 29); this.checkBox19.TabIndex = 10; this.checkBox19.Text = "checkBox19"; this.checkBox19.UseVisualStyleBackColor = true; @@ -536,7 +549,7 @@ this.checkBox2.Dock = System.Windows.Forms.DockStyle.Fill; this.checkBox2.Location = new System.Drawing.Point(3, 3); this.checkBox2.Name = "checkBox2"; - this.checkBox2.Size = new System.Drawing.Size(137, 28); + this.checkBox2.Size = new System.Drawing.Size(155, 28); this.checkBox2.TabIndex = 1; this.checkBox2.Text = "checkBox2"; this.checkBox2.UseVisualStyleBackColor = true; @@ -544,9 +557,9 @@ // checkBox3 // this.checkBox3.Dock = System.Windows.Forms.DockStyle.Fill; - this.checkBox3.Location = new System.Drawing.Point(146, 3); + this.checkBox3.Location = new System.Drawing.Point(164, 3); this.checkBox3.Name = "checkBox3"; - this.checkBox3.Size = new System.Drawing.Size(138, 28); + this.checkBox3.Size = new System.Drawing.Size(156, 28); this.checkBox3.TabIndex = 2; this.checkBox3.Text = "checkBox3"; this.checkBox3.UseVisualStyleBackColor = true; @@ -554,9 +567,9 @@ // checkBox4 // this.checkBox4.Dock = System.Windows.Forms.DockStyle.Fill; - this.checkBox4.Location = new System.Drawing.Point(290, 3); + this.checkBox4.Location = new System.Drawing.Point(326, 3); this.checkBox4.Name = "checkBox4"; - this.checkBox4.Size = new System.Drawing.Size(139, 28); + this.checkBox4.Size = new System.Drawing.Size(157, 28); this.checkBox4.TabIndex = 3; this.checkBox4.Text = "checkBox4"; this.checkBox4.UseVisualStyleBackColor = true; @@ -566,7 +579,7 @@ this.checkBox5.Dock = System.Windows.Forms.DockStyle.Fill; this.checkBox5.Location = new System.Drawing.Point(3, 37); this.checkBox5.Name = "checkBox5"; - this.checkBox5.Size = new System.Drawing.Size(137, 28); + this.checkBox5.Size = new System.Drawing.Size(155, 28); this.checkBox5.TabIndex = 4; this.checkBox5.Text = "checkBox5"; this.checkBox5.UseVisualStyleBackColor = true; @@ -574,9 +587,9 @@ // checkBox6 // this.checkBox6.Dock = System.Windows.Forms.DockStyle.Fill; - this.checkBox6.Location = new System.Drawing.Point(146, 37); + this.checkBox6.Location = new System.Drawing.Point(164, 37); this.checkBox6.Name = "checkBox6"; - this.checkBox6.Size = new System.Drawing.Size(138, 28); + this.checkBox6.Size = new System.Drawing.Size(156, 28); this.checkBox6.TabIndex = 5; this.checkBox6.Text = "checkBox6"; this.checkBox6.UseVisualStyleBackColor = true; @@ -584,9 +597,9 @@ // checkBox7 // this.checkBox7.Dock = System.Windows.Forms.DockStyle.Fill; - this.checkBox7.Location = new System.Drawing.Point(290, 37); + this.checkBox7.Location = new System.Drawing.Point(326, 37); this.checkBox7.Name = "checkBox7"; - this.checkBox7.Size = new System.Drawing.Size(139, 28); + this.checkBox7.Size = new System.Drawing.Size(157, 28); this.checkBox7.TabIndex = 6; this.checkBox7.Text = "checkBox7"; this.checkBox7.UseVisualStyleBackColor = true; @@ -596,7 +609,7 @@ this.checkBox8.Dock = System.Windows.Forms.DockStyle.Fill; this.checkBox8.Location = new System.Drawing.Point(3, 71); this.checkBox8.Name = "checkBox8"; - this.checkBox8.Size = new System.Drawing.Size(137, 28); + this.checkBox8.Size = new System.Drawing.Size(155, 28); this.checkBox8.TabIndex = 7; this.checkBox8.Text = "checkBox8"; this.checkBox8.UseVisualStyleBackColor = true; @@ -604,9 +617,9 @@ // checkBox9 // this.checkBox9.Dock = System.Windows.Forms.DockStyle.Fill; - this.checkBox9.Location = new System.Drawing.Point(146, 71); + this.checkBox9.Location = new System.Drawing.Point(164, 71); this.checkBox9.Name = "checkBox9"; - this.checkBox9.Size = new System.Drawing.Size(138, 28); + this.checkBox9.Size = new System.Drawing.Size(156, 28); this.checkBox9.TabIndex = 8; this.checkBox9.Text = "checkBox9"; this.checkBox9.UseVisualStyleBackColor = true; @@ -614,9 +627,9 @@ // checkBox10 // this.checkBox10.Dock = System.Windows.Forms.DockStyle.Fill; - this.checkBox10.Location = new System.Drawing.Point(290, 71); + this.checkBox10.Location = new System.Drawing.Point(326, 71); this.checkBox10.Name = "checkBox10"; - this.checkBox10.Size = new System.Drawing.Size(139, 28); + this.checkBox10.Size = new System.Drawing.Size(157, 28); this.checkBox10.TabIndex = 9; this.checkBox10.Text = "checkBox10"; this.checkBox10.UseVisualStyleBackColor = true; @@ -629,7 +642,7 @@ this.groupBox2.Location = new System.Drawing.Point(5, 156); this.groupBox2.Name = "groupBox2"; this.tableLayoutPanel3.SetRowSpan(this.groupBox2, 3); - this.groupBox2.Size = new System.Drawing.Size(274, 304); + this.groupBox2.Size = new System.Drawing.Size(220, 304); this.groupBox2.TabIndex = 17; this.groupBox2.TabStop = false; this.groupBox2.Text = "Description"; @@ -643,16 +656,16 @@ this.textBox1.Name = "textBox1"; this.textBox1.ReadOnly = true; this.textBox1.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.textBox1.Size = new System.Drawing.Size(268, 285); + this.textBox1.Size = new System.Drawing.Size(214, 285); this.textBox1.TabIndex = 0; // // label4 // this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(510, 16); + this.label4.Location = new System.Drawing.Point(550, 16); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(108, 13); + this.label4.Size = new System.Drawing.Size(63, 13); this.label4.TabIndex = 13; this.label4.Text = "Power"; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -660,14 +673,14 @@ // powerNumericUpDown // this.powerNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.powerNumericUpDown.Location = new System.Drawing.Point(624, 12); + this.powerNumericUpDown.Location = new System.Drawing.Point(619, 12); this.powerNumericUpDown.Maximum = new decimal(new int[] { 255, 0, 0, 0}); this.powerNumericUpDown.Name = "powerNumericUpDown"; - this.powerNumericUpDown.Size = new System.Drawing.Size(99, 20); + this.powerNumericUpDown.Size = new System.Drawing.Size(104, 20); this.powerNumericUpDown.TabIndex = 14; this.powerNumericUpDown.ValueChanged += new System.EventHandler(this.powerNumericUpDown_ValueChanged); // @@ -675,9 +688,9 @@ // this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(510, 55); + this.label5.Location = new System.Drawing.Point(550, 55); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(108, 13); + this.label5.Size = new System.Drawing.Size(63, 13); this.label5.TabIndex = 15; this.label5.Text = "Accuracy"; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -685,9 +698,9 @@ // accuracyNumericUpDown // this.accuracyNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.accuracyNumericUpDown.Location = new System.Drawing.Point(624, 52); + this.accuracyNumericUpDown.Location = new System.Drawing.Point(619, 52); this.accuracyNumericUpDown.Name = "accuracyNumericUpDown"; - this.accuracyNumericUpDown.Size = new System.Drawing.Size(99, 20); + this.accuracyNumericUpDown.Size = new System.Drawing.Size(104, 20); this.accuracyNumericUpDown.TabIndex = 16; this.accuracyNumericUpDown.ValueChanged += new System.EventHandler(this.accuracyNumericUpDown_ValueChanged); // @@ -697,7 +710,7 @@ this.label7.AutoSize = true; this.label7.Location = new System.Drawing.Point(5, 128); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(55, 13); + this.label7.Size = new System.Drawing.Size(51, 13); this.label7.TabIndex = 25; this.label7.Text = "Priority"; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -705,7 +718,7 @@ // priorityNumericUpDown // this.priorityNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.priorityNumericUpDown.Location = new System.Drawing.Point(66, 124); + this.priorityNumericUpDown.Location = new System.Drawing.Point(62, 124); this.priorityNumericUpDown.Maximum = new decimal(new int[] { 32, 0, @@ -717,7 +730,7 @@ 0, -2147483648}); this.priorityNumericUpDown.Name = "priorityNumericUpDown"; - this.priorityNumericUpDown.Size = new System.Drawing.Size(155, 20); + this.priorityNumericUpDown.Size = new System.Drawing.Size(116, 20); this.priorityNumericUpDown.TabIndex = 26; this.priorityNumericUpDown.ValueChanged += new System.EventHandler(this.priorityNumericUpDown_ValueChanged); // @@ -725,9 +738,9 @@ // this.ppLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.ppLabel.AutoSize = true; - this.ppLabel.Location = new System.Drawing.Point(285, 55); + this.ppLabel.Location = new System.Drawing.Point(231, 55); this.ppLabel.Name = "ppLabel"; - this.ppLabel.Size = new System.Drawing.Size(74, 13); + this.ppLabel.Size = new System.Drawing.Size(61, 13); this.ppLabel.TabIndex = 4; this.ppLabel.Text = "PP"; this.ppLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -735,9 +748,9 @@ // ppUpDown // this.ppUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.ppUpDown.Location = new System.Drawing.Point(365, 52); + this.ppUpDown.Location = new System.Drawing.Point(298, 52); this.ppUpDown.Name = "ppUpDown"; - this.ppUpDown.Size = new System.Drawing.Size(139, 20); + this.ppUpDown.Size = new System.Drawing.Size(246, 20); this.ppUpDown.TabIndex = 8; this.ppUpDown.ValueChanged += new System.EventHandler(this.ppUpDown_ValueChanged); // @@ -745,9 +758,9 @@ // this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(285, 121); + this.label8.Location = new System.Drawing.Point(231, 121); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(74, 26); + this.label8.Size = new System.Drawing.Size(61, 26); this.label8.TabIndex = 28; this.label8.Text = "Side Effect Probability"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -755,29 +768,17 @@ // sideEffectProbabilityUpDown // this.sideEffectProbabilityUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.sideEffectProbabilityUpDown.Location = new System.Drawing.Point(365, 124); + this.sideEffectProbabilityUpDown.Location = new System.Drawing.Point(298, 124); this.sideEffectProbabilityUpDown.Maximum = new decimal(new int[] { 255, 0, 0, 0}); this.sideEffectProbabilityUpDown.Name = "sideEffectProbabilityUpDown"; - this.sideEffectProbabilityUpDown.Size = new System.Drawing.Size(139, 20); + this.sideEffectProbabilityUpDown.Size = new System.Drawing.Size(246, 20); this.sideEffectProbabilityUpDown.TabIndex = 29; this.sideEffectProbabilityUpDown.ValueChanged += new System.EventHandler(this.sideEffectUpDown_ValueChanged); // - // moveNameInputComboBox - // - this.moveNameInputComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.moveNameInputComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.moveNameInputComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.moveNameInputComboBox.FormattingEnabled = true; - this.moveNameInputComboBox.Location = new System.Drawing.Point(80, 14); - this.moveNameInputComboBox.Name = "moveNameInputComboBox"; - this.moveNameInputComboBox.Size = new System.Drawing.Size(413, 21); - this.moveNameInputComboBox.TabIndex = 31; - this.moveNameInputComboBox.SelectedIndexChanged += new System.EventHandler(this.moveNameInputComboBox_SelectedIndexChanged); - // // MoveDataEditor // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/DS_Map/Editors/MoveDataEditor.cs b/DS_Map/Editors/MoveDataEditor.cs index 72398b3..7a83df6 100644 --- a/DS_Map/Editors/MoveDataEditor.cs +++ b/DS_Map/Editors/MoveDataEditor.cs @@ -1,4 +1,5 @@ -using DSPRE.ROMFiles; +using DSPRE.Resources; +using DSPRE.ROMFiles; using System; using System.Collections.Generic; using System.IO; @@ -13,7 +14,6 @@ namespace DSPRE { private readonly string[] fileNames; private readonly string[] moveDescriptions; - private readonly string[] battleSequenceFiles; private int currentLoadedId = 0; private MoveData currentLoadedFile = null; @@ -31,8 +31,17 @@ namespace DSPRE { moveNumberNumericUpDown.Maximum = fileNames.Length - 1; moveNameInputComboBox.Items.AddRange(this.fileNames); - this.battleSequenceFiles = RomInfo.GetBattleEffectSequenceFiles().Select( x => Path.GetFileName(x) ).ToArray(); - battleSeqComboBox.Items.AddRange(this.battleSequenceFiles); + string[] battleSequenceFiles = RomInfo.GetBattleEffectSequenceFiles(); + + for (int i = 0; i < battleSequenceFiles.Length; i++) { + string[] db = PokeDatabase.MoveData.battleSequenceDescriptions; + + if (i >= db.Length || db[i] is null) { + battleSeqComboBox.Items.Add($"{i:D3} - Undocumented"); + } else { + battleSeqComboBox.Items.Add(db[i]); + } + } moveSplitComboBox.Items.AddRange(Enum.GetNames(typeof(MoveData.MoveSplit))); diff --git a/DS_Map/Resources/PokeDatabase.cs b/DS_Map/Resources/PokeDatabase.cs index bf151eb..06785ce 100644 --- a/DS_Map/Resources/PokeDatabase.cs +++ b/DS_Map/Resources/PokeDatabase.cs @@ -1268,8 +1268,8 @@ namespace DSPRE.Resources { [493] = "Arceus", [494] = "Egg", [495] = "Bad Egg", - - // empty indices + + // empty indices [496] = "Egg", [497] = "Egg", [498] = "Egg", @@ -1319,163 +1319,163 @@ namespace DSPRE.Resources { [542] = "Egg", [543] = "Egg", - // Gen V - [544] = "Victini", - [545] = "Snivy", - [546] = "Servine", - [547] = "Serperior", - [548] = "Tepig", - [549] = "Pignite", - [550] = "Emboar", - [551] = "Oshawott", - [552] = "Dewott", - [553] = "Samurott", - [554] = "Patrat", - [555] = "Watchog", - [556] = "Lillipup", - [557] = "Herdier", - [558] = "Stoutland", - [559] = "Purrloin", - [560] = "Liepard", - [561] = "Pansage", - [562] = "Simisage", - [563] = "Pansear", - [564] = "Simisear", - [565] = "Panpour", - [566] = "Simipour", - [567] = "Munna", - [568] = "Musharna", - [569] = "Pidove", - [570] = "Tranquill", - [571] = "Unfezant", - [572] = "Blitzle", - [573] = "Zebstrika", - [574] = "Roggenrola", - [575] = "Boldore", - [576] = "Gigalith", - [577] = "Woobat", - [578] = "Swoobat", - [579] = "Drilbur", - [580] = "Excadrill", - [581] = "Audino", - [582] = "Timburr", - [583] = "Gurdurr", - [584] = "Conkeldurr", - [585] = "Tympole", - [586] = "Palpitoad", - [587] = "Seismitoad", - [588] = "Throh", - [589] = "Sawk", - [590] = "Sewaddle", - [591] = "Swadloon", - [592] = "Leavanny", - [593] = "Venipede", - [594] = "Whirlipede", - [595] = "Scolipede", - [596] = "Cottonee", - [597] = "Whimsicott", - [598] = "Petilil", - [599] = "Lilligant", - [600] = "Basculin", - [601] = "Sandile", - [602] = "Krokorok", - [603] = "Krookodile", - [604] = "Darumaka", - [605] = "Darmanitan", - [606] = "Maractus", - [607] = "Dwebble", - [608] = "Crustle", - [609] = "Scraggy", - [610] = "Scrafty", - [611] = "Sigilyph", - [612] = "Yamask", - [613] = "Cofagrigus", - [614] = "Tirtouga", - [615] = "Carracosta", - [616] = "Archen", - [617] = "Archeops", - [618] = "Trubbish", - [619] = "Garbodor", - [620] = "Zorua", - [621] = "Zoroark", - [622] = "Minccino", - [623] = "Cinccino", - [624] = "Gothita", - [625] = "Gothorita", - [626] = "Gothitelle", - [627] = "Solosis", - [628] = "Duosion", - [629] = "Reuniclus", - [630] = "Ducklett", - [631] = "Swanna", - [632] = "Vanillite", - [633] = "Vanillish", - [634] = "Vanilluxe", - [635] = "Deerling", - [636] = "Sawsbuck", - [637] = "Emolga", - [638] = "Karrablast", - [639] = "Escavalier", - [640] = "Foongus", - [641] = "Amoonguss", - [642] = "Frillish", - [643] = "Jellicent", - [644] = "Alomomola", - [645] = "Joltik", - [646] = "Galvantula", - [647] = "Ferroseed", - [648] = "Ferrothorn", - [649] = "Klink", - [650] = "Klang", - [651] = "Klinklang", - [652] = "Tynamo", - [653] = "Eelektrik", - [654] = "Eelektross", - [655] = "Elgyem", - [656] = "Beheeyem", - [657] = "Litwick", - [658] = "Lampent", - [659] = "Chandelure", - [660] = "Axew", - [661] = "Fraxure", - [662] = "Haxorus", - [663] = "Cubchoo", - [664] = "Beartic", - [665] = "Cryogonal", - [666] = "Shelmet", - [667] = "Accelgor", - [668] = "Stunfisk", - [669] = "Mienfoo", - [670] = "Mienshao", - [671] = "Druddigon", - [672] = "Golett", - [673] = "Golurk", - [674] = "Pawniard", - [675] = "Bisharp", - [676] = "Bouffalant", - [677] = "Rufflet", - [678] = "Braviary", - [679] = "Vullaby", - [680] = "Mandibuzz", - [681] = "Heatmor", - [682] = "Durant", - [683] = "Deino", - [684] = "Zweilous", - [685] = "Hydreigon", - [686] = "Larvesta", - [687] = "Volcarona", - [688] = "Cobalion", - [689] = "Terrakion", - [690] = "Virizion", - [691] = "Tornadus", - [692] = "Thundurus", - [693] = "Reshiram", - [694] = "Zekrom", - [695] = "Landorus", - [696] = "Kyurem", - [697] = "Keldeo", - [698] = "Meloetta", - [699] = "Genesect", + // Gen V + [544] = "Victini", + [545] = "Snivy", + [546] = "Servine", + [547] = "Serperior", + [548] = "Tepig", + [549] = "Pignite", + [550] = "Emboar", + [551] = "Oshawott", + [552] = "Dewott", + [553] = "Samurott", + [554] = "Patrat", + [555] = "Watchog", + [556] = "Lillipup", + [557] = "Herdier", + [558] = "Stoutland", + [559] = "Purrloin", + [560] = "Liepard", + [561] = "Pansage", + [562] = "Simisage", + [563] = "Pansear", + [564] = "Simisear", + [565] = "Panpour", + [566] = "Simipour", + [567] = "Munna", + [568] = "Musharna", + [569] = "Pidove", + [570] = "Tranquill", + [571] = "Unfezant", + [572] = "Blitzle", + [573] = "Zebstrika", + [574] = "Roggenrola", + [575] = "Boldore", + [576] = "Gigalith", + [577] = "Woobat", + [578] = "Swoobat", + [579] = "Drilbur", + [580] = "Excadrill", + [581] = "Audino", + [582] = "Timburr", + [583] = "Gurdurr", + [584] = "Conkeldurr", + [585] = "Tympole", + [586] = "Palpitoad", + [587] = "Seismitoad", + [588] = "Throh", + [589] = "Sawk", + [590] = "Sewaddle", + [591] = "Swadloon", + [592] = "Leavanny", + [593] = "Venipede", + [594] = "Whirlipede", + [595] = "Scolipede", + [596] = "Cottonee", + [597] = "Whimsicott", + [598] = "Petilil", + [599] = "Lilligant", + [600] = "Basculin", + [601] = "Sandile", + [602] = "Krokorok", + [603] = "Krookodile", + [604] = "Darumaka", + [605] = "Darmanitan", + [606] = "Maractus", + [607] = "Dwebble", + [608] = "Crustle", + [609] = "Scraggy", + [610] = "Scrafty", + [611] = "Sigilyph", + [612] = "Yamask", + [613] = "Cofagrigus", + [614] = "Tirtouga", + [615] = "Carracosta", + [616] = "Archen", + [617] = "Archeops", + [618] = "Trubbish", + [619] = "Garbodor", + [620] = "Zorua", + [621] = "Zoroark", + [622] = "Minccino", + [623] = "Cinccino", + [624] = "Gothita", + [625] = "Gothorita", + [626] = "Gothitelle", + [627] = "Solosis", + [628] = "Duosion", + [629] = "Reuniclus", + [630] = "Ducklett", + [631] = "Swanna", + [632] = "Vanillite", + [633] = "Vanillish", + [634] = "Vanilluxe", + [635] = "Deerling", + [636] = "Sawsbuck", + [637] = "Emolga", + [638] = "Karrablast", + [639] = "Escavalier", + [640] = "Foongus", + [641] = "Amoonguss", + [642] = "Frillish", + [643] = "Jellicent", + [644] = "Alomomola", + [645] = "Joltik", + [646] = "Galvantula", + [647] = "Ferroseed", + [648] = "Ferrothorn", + [649] = "Klink", + [650] = "Klang", + [651] = "Klinklang", + [652] = "Tynamo", + [653] = "Eelektrik", + [654] = "Eelektross", + [655] = "Elgyem", + [656] = "Beheeyem", + [657] = "Litwick", + [658] = "Lampent", + [659] = "Chandelure", + [660] = "Axew", + [661] = "Fraxure", + [662] = "Haxorus", + [663] = "Cubchoo", + [664] = "Beartic", + [665] = "Cryogonal", + [666] = "Shelmet", + [667] = "Accelgor", + [668] = "Stunfisk", + [669] = "Mienfoo", + [670] = "Mienshao", + [671] = "Druddigon", + [672] = "Golett", + [673] = "Golurk", + [674] = "Pawniard", + [675] = "Bisharp", + [676] = "Bouffalant", + [677] = "Rufflet", + [678] = "Braviary", + [679] = "Vullaby", + [680] = "Mandibuzz", + [681] = "Heatmor", + [682] = "Durant", + [683] = "Deino", + [684] = "Zweilous", + [685] = "Hydreigon", + [686] = "Larvesta", + [687] = "Volcarona", + [688] = "Cobalion", + [689] = "Terrakion", + [690] = "Virizion", + [691] = "Tornadus", + [692] = "Thundurus", + [693] = "Reshiram", + [694] = "Zekrom", + [695] = "Landorus", + [696] = "Kyurem", + [697] = "Keldeo", + [698] = "Meloetta", + [699] = "Genesect", }; public static class MatrixCellColors { /* Initialize dictionary of colors corresponding to border maps in the matrix editor */ @@ -1567,7 +1567,7 @@ namespace DSPRE.Resources { }; public static Dictionary hgssweatherImageDict = new Dictionary() { - [new byte[] { 0}] = "hgssnormal", + [new byte[] { 0 }] = "hgssnormal", [new byte[] { 1, 2, 3, 4 }] = "hgssrain", [new byte[] { 5, 6 }] = "hgsssnow", [new byte[] { 7 }] = "hgssnormal", //sandstorm in battle only @@ -1579,10 +1579,291 @@ namespace DSPRE.Resources { }; } } + public static class MoveData { + public static string[] battleSequenceDescriptions = new string[] { + /* 0 */ "None", + /* 1 */ "Causes Sleep", + /* 2 */ "Chance to Poison", + /* 3 */ "Damages target; Heals user up to 50% of damage dealt", + /* 4 */ "Chance to Burn", + /* 5 */ "Chance to Freeze", + /* 6 */ "Chance to Paralyze", + /* 7 */ "Selfdestruct/ Explosion effect", + /* 8 */ "Damages sleeping target; Heals user up to 50% of damage dealt", + /* 9 */ "Mirror Move effect", + /* 10 */ "Raises Atk", + /* 11 */ "Raises Def", + /* 12 */ "Raises Spd", + /* 13 */ "Raises SpAtk", + /* 14 */ "Raises SpDef", + /* 15 */ "Raises Accuracy", + /* 16 */ "Raises Evasion", + /* 17 */ "Always hits", + /* 18 */ "Lowers Atk (Status)", + /* 19 */ "Lowers Def (Status)", + /* 20 */ "Lowers Spd (Status)", + /* 21 */ "Lowers SpAtk (Status)", + /* 22 */ "Lowers SpDef (Status)", + /* 23 */ "Lowers Accuracy (Status)", + /* 24 */ "Lowers Evasion (Status)", + /* 25 */ "Resets stat changes", + /* 26 */ "Bide effect", + /* 27 */ "Locked into move for 2-3 turns; confuses user after", + /* 28 */ "Whirlwind/ Roar effect", + /* 29 */ "Hits target 2-5 times", + /* 30 */ "Changes user's type to match one of its moves", + /* 31 */ "Chance to Flinch", + /* 32 */ "Restores up to 50% max HP", + /* 33 */ "Badly Poisons", + /* 34 */ "Pay Day effect", + /* 35 */ "1/2 damage from Special attacks", + /* 36 */ "Chance of either Paralyzing; Burning; or Freezing target", + /* 37 */ "Causes Sleep and restores all HP", + /* 38 */ "OHKO", + /* 39 */ "Charging turn; high crit ratio", + /* 40 */ "Deals damage equal to 1/2 target's current hp", + /* 41 */ "Deals 40 damage", + /* 42 */ "Binding move effect", + /* 43 */ "High crit ratio", + /* 44 */ "Hits twice", + /* 45 */ "Deals 1/2 user's max HP to user if it misses", + /* 46 */ "Prevents lowering of stats", + /* 47 */ "Sharply raises crit ratio", + /* 48 */ "1/4 damage dealt recoil", + /* 49 */ "Guaranteed Confusion (Status)", + /* 50 */ "Sharply raises Atk (Status)", + /* 51 */ "Sharply raises Def (Status)", + /* 52 */ "Sharply raises Spd (Status)", + /* 53 */ "Sharply raises SpAtk (Status)", + /* 54 */ "Sharply raises SpDef (Status)", + /* 55 */ "Sharply raises Accuracy (Status)", + /* 56 */ "Sharply raises Evasion (Status)", + /* 57 */ "Transform effect", + /* 58 */ "Sharply lowers Atk (Status)", + /* 59 */ "Sharply lowers Def (Status)", + /* 60 */ "Sharply lowers Spd (Status)", + /* 61 */ "Sharply lowers SpAtk (Status)", + /* 62 */ "Sharply lowers Accuracy (Status)", + /* 63 */ "Sharply lowers Evasion (Status)", + /* 64 */ null, + /* 65 */ "1/2 damage from Physical attacks", + /* 66 */ "Guaranteed Poison", + /* 67 */ "Guaranteed Paralysis", + /* 68 */ "Lowers Atk (Attack)", + /* 69 */ "Lowers Def (Attack)", + /* 70 */ "Lowers Spd (Attack)", + /* 71 */ "Lowers SpAtk (Attack)", + /* 72 */ "Lowers SpDef (Attack)", + /* 73 */ "Lowers Accuracy (Attack)", + /* 74 */ "Lowers Evasion (Attack)", + /* 75 */ "Attacks next turn; chance of flinch; increased crit ratio", + /* 76 */ "Chance to Confuse", + /* 77 */ "Hits twice; chance to poison", + /* 78 */ "Vital Throw ??", + /* 79 */ "Substitute effect", + /* 80 */ "Recharge turn", + /* 81 */ "Locked into move; raises Atk whenever hit", + /* 82 */ "Copies user-selected move", + /* 83 */ "Metronome effect", + /* 84 */ "Leech Seed effect", + /* 85 */ "Splash effect", + /* 86 */ "Disables last move used for 4-7 turns", + /* 87 */ "Deals damage equal to user's level", + /* 88 */ "Deals up to user's level x1.5 damage", + /* 89 */ "2x last amount of damage received", + /* 90 */ "Locks target into last move used for 3-7 turns", + /* 91 */ "Pain Split effect", + /* 92 */ "Can only be used while asleep; chance of causing Flinch", + /* 93 */ "Conversion2 effect", + /* 94 */ "Next move used by user guaranteed to hit", + /* 95 */ "Sketch effect", + /* 96 */ null, + /* 97 */ "Sleep Talk effect", + /* 98 */ "Destiny Bond effect", + /* 99 */ "Higher power the less HP the user has", + /* 100 */ "Decreases PP of target's last move used by 4", + /* 101 */ "False Swipe effect", + /* 102 */ "Heal Bell effect", + /* 103 */ "Priority +1", + /* 104 */ "Hits the target up to 3 times; increases power by 10 with each hit", + /* 105 */ "Steals target's held item", + /* 106 */ "Prevents target from switching out or fleeing", + /* 107 */ "If asleep; target takes damage equal to 1/4 its max HP at the end of every turn", + /* 108 */ "Raises Evasion; weak to Stomp/Rollout/Bodyslam", + /* 109 */ "Curse effect", + /* 110 */ null, + /* 111 */ "Protect/ Detect effect", + /* 112 */ "Spikes effect", + /* 113 */ "Ignores type immunities", + /* 114 */ "All users on field faint in 3 turns", + /* 115 */ "Causes Sandstorm", + /* 116 */ "Allows user to endure a fatal hit and survive at 1 HP", + /* 117 */ "Rollout effect", + /* 118 */ "Sharply raises target's Atk and causes Confusion", + /* 119 */ "2x power for every consecutive hit", + /* 120 */ "Infatuates target of opposite gender", + /* 121 */ "Return effect", + /* 122 */ "Present Effect", + /* 123 */ "Frustration effect", + /* 124 */ "Safeguard effect", + /* 125 */ "Thaws user; chance to Burn", + /* 126 */ "Magnitude effect", + /* 127 */ "Baton Pass effect", + /* 128 */ "Pursuit effect", + /* 129 */ "Removes all hazards/ binding moves on user's side of the field", + /* 130 */ "Inflicts 20 damage", + /* 131 */ null, + /* 132 */ "Synthesis effect", + /* 133 */ null, + /* 134 */ null, + /* 135 */ "Hidden Power effect", + /* 136 */ "Causes Rain", + /* 137 */ "Causes Harsh Sunlight", + /* 138 */ "Chance of raising Def", + /* 139 */ "Chance of raising Atk", + /* 140 */ "Ancient Power boost", + /* 141 */ null, + /* 142 */ "Belly Drum effect", + /* 143 */ "Copies all of target's stat boosts", + /* 144 */ "Mirror Coat effect", + /* 145 */ "Raises Def; attacks next turn", + /* 146 */ "Twister effect", + /* 147 */ "2x Damage on Pokemon using Dig", + /* 148 */ "Future Sight effect", + /* 149 */ "2x Damage on Pokemon using Bounce/Fly", + /* 150 */ "Causes flinch and 2x damage if target has used Minimize", + /* 151 */ "Charging turn unless in Harsh Sunlight", + /* 152 */ "Always hits in rain; chance to Paralyze", + /* 153 */ "Flees from wild single battle", + /* 154 */ "Beat Up effect", + /* 155 */ "Fly effect", + /* 156 */ "Raises Def and 2x Rollout/ Ice Ball power", + /* 157 */ null, + /* 158 */ "Guaranteed Flinch; can only be used turn 1", + /* 159 */ "Uproar effect", + /* 160 */ "Stockpile effect", + /* 161 */ "Spit Up effect", + /* 162 */ "Swallow effect", + /* 163 */ null, + /* 164 */ "Causes Hail", + /* 165 */ "Torment effect", + /* 166 */ "Raises target's SpAtk and causes Confusion", + /* 167 */ "Guaranteed Burn; activates Flash Fire", + /* 168 */ "User faints and target's Atk and SpAtk are lowered sharply", + /* 169 */ "2x power if user is Poisoned; Paralyzed; or Burned.", + /* 170 */ "Focus Punch effect", + /* 171 */ "2x power if target is Paralyzed; cures target of Paralysis", + /* 172 */ "Redirects all moves to user", + /* 173 */ "Nature Power effect", + /* 174 */ "Next move deals 2x damage if it is Electric-type", + /* 175 */ "Target can't use status moves for 3-5 turns", + /* 176 */ "Ally's attack deals 1.5x damage this turn", + /* 177 */ "User switches held items with target", + /* 178 */ "User copies target's Ability", + /* 179 */ "1/2 of user's max HP is restored at the end of next turn", + /* 180 */ "Assist effect", + /* 181 */ "Ingrain effect", + /* 182 */ "Lowers user's Atk and Def", + /* 183 */ "Reflects status moves back at their user", + /* 184 */ "User regains a consumed held item", + /* 185 */ "2x power if the user has been hit this turn", + /* 186 */ "Removes Light Screen/ Reflect from target's side of the field", + /* 187 */ "Yawn effect", + /* 188 */ "Renders the target's held item unusable", + /* 189 */ "Target's HP becomes equal to the user's current HP", + /* 190 */ "Power= Base power x(user's current HP/ user's max HP)", + /* 191 */ "User swaps Abilities with the target", + /* 192 */ "Target is prevented from using moves shared with the user", + /* 193 */ "Cures user of Burn; Poison; or Paralysis", + /* 194 */ "Grudge effect", + /* 195 */ "If any Pokemon uses a beneficial status move; the user uses it instead", + /* 196 */ "Inflicts greater damage on heavier targets", + /* 197 */ "Secret Power effect", + /* 198 */ "1/3 damage dealt recoil", + /* 199 */ "Guaranteed Confusion (Attack)", + /* 200 */ "Chance of causing Burn; increased Crit ratio", + /* 201 */ "Weakens Electric-type moves by 50% until user switches out", + /* 202 */ "Chance of Badly Poisoning", + /* 203 */ "Type changes to match weather", + /* 204 */ "Lowers user's SpAtk harshly", + /* 205 */ "Lowers target's Atk and Def", + /* 206 */ "Raises user's Def and SpDef", + /* 207 */ "Can hit Pokemon during semi-invulnerable turns of Fly/Bounce", + /* 208 */ "Raises user's Atk and Def", + /* 209 */ "Chance of causing Poison; increased crit ratio", + /* 210 */ "Water Sport effect", + /* 211 */ "Raises user's SpAtk and SpDef", + /* 212 */ "Raises user's Atk and Spd", + /* 213 */ "Camouflage effect", + /* 214 */ "Roost effect", + /* 215 */ "Gravity effect", + /* 216 */ "2x power if target is asleep; wakes up target", + /* 217 */ "Causes all moves to ignore changes to the target's Evasiveness", + /* 218 */ "Lowers user's Spd", + /* 219 */ "Power = min(150; (25 x Target's Current Speed / User's Current Speed) + 1)", + /* 220 */ "Healing Wish effect", + /* 221 */ "2x power if target is at or below 1/2 HP", + /* 222 */ "Natural Gift effect", + /* 223 */ "Can only hit targets that have used Protect/ Detect", + /* 224 */ "Consumes target's berry", + /* 225 */ "2x Spd for user's party for 3 turns", + /* 226 */ "Sharply raises a random stat of the target", + /* 227 */ "Damage= 1.5x damage dealt by the target's last attack", + /* 228 */ "Switches user out after dealing damage", + /* 229 */ "Lowers user's Def and SpDef", + /* 230 */ "2x Power if user moves after target", + /* 231 */ "2x damage if the target has already taken damage this turn", + /* 232 */ "Prevents the target from using its held item or having items used on it", + /* 233 */ "Power and effect determined by held item", + /* 234 */ "Cures user of any status condition and afflicts the target with it", + /* 235 */ "The less PP the move has; the greater its Power", + /* 236 */ "Heal Block effect", + /* 237 */ "Power = Base power + 120 x (Target's Current HP / Target's Maximum HP)", + /* 238 */ "Swaps the user's Atk stat with its Def stat", + /* 239 */ "Suppresses the target's Ability", + /* 240 */ "Prevents opponents from landing critical hits on the user's party for 5 turns", + /* 241 */ "If the target has not moved yet; the user copies their move and uses it with 1.5x power", + /* 242 */ "User uses the last move that was used in battle", + /* 243 */ "Swaps the user's Atk and SpAtk buffs with the target's Atk and SpAtk buffs", + /* 244 */ "Swaps the user's Def and SpDef buffs with the target's Def and SpDef buffs", + /* 245 */ "Power= 60 + (20x # of stat increases of target)", + /* 246 */ "Fails unless the user has used all of its other moves at least once", + /* 247 */ "Changes the target's Ability to Insomnia", + /* 248 */ "Fails if the target did not select a damaging move or has already moved", + /* 249 */ "Toxic Spikes effect", + /* 250 */ "Swaps the user's stat changes with the target's", + /* 251 */ "Restores 1/16 of the user's max HP at the end of every turn", + /* 252 */ "User becomes immune to Ground-type attacks and field hazards for 5 turns", + /* 253 */ "Chance of causing Burn; 1/3 damage dealt recoil", + /* 254 */ "Struggle effect", + /* 255 */ "Dive effect", + /* 256 */ "Dig effect", + /* 257 */ "2x Damage on Pokemon using Dive", + /* 258 */ "Defog effect", + /* 259 */ "Trick Room effect", + /* 260 */ "Always hits in Hail", + /* 261 */ "Whirlpool effect", + /* 262 */ "Chance of causing Paralysis; 1/3 damage dealt recoil", + /* 263 */ "Bounce effect", + /* 264 */ null, + /* 265 */ "Lowers opposite gender target's SpAtk harshly", + /* 266 */ "Stealth Rocks effect", + /* 267 */ "Chatter effect", + /* 268 */ "Type= Type of Plate held by user", + /* 269 */ "1/2 damage dealt recoil", + /* 270 */ "Lunar Dance effect", + /* 271 */ "Chance of lowering target's SpDef harshly", + /* 272 */ "Shadow Force effect", + /* 273 */ "Chance of causing Burn; chance of causing Flinch", + /* 274 */ "Chance of causing Freeze; chance of causing Flinch", + /* 275 */ "Chance of causing Paralysis; chance of causing Flinch", + /* 276 */ "Chance of raising user's SpAtk", + }; + } public static class PersonalData { public class PersonalExtraFiles { - public int monId { get; set; } - public string description { get; set; } + public int monId { get; set; } + public string description { get; set; } public int iconId { get; set; } public PersonalExtraFiles(int monId, string desc, int iconId) {