Leahnaya/DS-Pokemon-Rom-Editor
1
0
Fork 0
mirror of https://github.com/AdAstra-LD/DS-Pokemon-Rom-Editor.git synced 2026-05-31 20:42:36 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/YakosWG/DS-Pokemon-Rom-Editor

Browse Source
This commit is contained in:
Yako 2025-06-16 18:37:39 +02:00
commit 37ce885965
3 changed files with 357 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

415
DS_Map/Editors/ItemEditor.Designer.cs generated
View File

@ -35,33 +35,42 @@
this.itemNameInputComboBox = new System.Windows.Forms.ComboBox();
this.priceNumericUpDown = new System.Windows.Forms.NumericUpDown();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.holdEffectLabel = new System.Windows.Forms.Label();
this.fieldPocketLabel = new System.Windows.Forms.Label();
this.battlePocketLabel = new System.Windows.Forms.Label();
this.priceLabel = new System.Windows.Forms.Label();
this.saveDataButton = new System.Windows.Forms.Button();
this.holdEffectParameterLabel = new System.Windows.Forms.Label();
this.holdFlowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();
this.holdGroupBox = new System.Windows.Forms.GroupBox();
this.holdEffectParameterNumericUpDown = new System.Windows.Forms.NumericUpDown();
this.holdEffectParameterLabel = new System.Windows.Forms.Label();
this.holdEffectLabel = new System.Windows.Forms.Label();
this.pocketFlowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();
this.pocketGroupBox = new System.Windows.Forms.GroupBox();
this.fieldPocketLabel = new System.Windows.Forms.Label();
this.battlePocketLabel = new System.Windows.Forms.Label();
this.moveRelatedFlowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();
this.moveRelatedGroupBox = new System.Windows.Forms.GroupBox();
this.naturalGiftTypeComboBox = new System.Windows.Forms.ComboBox();
this.naturalGiftTypeLabel = new System.Windows.Forms.Label();
this.naturalGiftPowerLabel = new System.Windows.Forms.Label();
this.flingEffectLabel = new System.Windows.Forms.Label();
this.naturalGiftPowerNumericUpDown = new System.Windows.Forms.NumericUpDown();
this.flingEffectNumericUpDown = new System.Windows.Forms.NumericUpDown();
this.flingPowerNumericUpDown = new System.Windows.Forms.NumericUpDown();
this.pluckEffectNumericUpDown = new System.Windows.Forms.NumericUpDown();
this.flingPowerLabel = new System.Windows.Forms.Label();
this.pluckEffectLabel = new System.Windows.Forms.Label();
this.flingEffectNumericUpDown = new System.Windows.Forms.NumericUpDown();
this.naturalGiftPowerNumericUpDown = new System.Windows.Forms.NumericUpDown();
this.flingEffectLabel = new System.Windows.Forms.Label();
this.naturalGiftPowerLabel = new System.Windows.Forms.Label();
this.naturalGiftTypeLabel = new System.Windows.Forms.Label();
this.naturalGiftTypeComboBox = new System.Windows.Forms.ComboBox();
this.checksFlowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();
this.checksGroupBox = new System.Windows.Forms.GroupBox();
this.preventTossCheckBox = new System.Windows.Forms.CheckBox();
this.canSelectCheckBox = new System.Windows.Forms.CheckBox();
this.preventTossCheckBox = new System.Windows.Forms.CheckBox();
this.priceFlowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();
this.priceGroupBox = new System.Windows.Forms.GroupBox();
this.priceLabel = new System.Windows.Forms.Label();
this.functionsFlowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();
this.functionsGroupBox = new System.Windows.Forms.GroupBox();
this.battleFunctionComboBox = new System.Windows.Forms.ComboBox();
this.fieldFunctionLabel = new System.Windows.Forms.Label();
this.fieldFunctionComboBox = new System.Windows.Forms.ComboBox();
this.battleFunctionLabel = new System.Windows.Forms.Label();
this.partyUseCheckBox = new System.Windows.Forms.CheckBox();
((System.ComponentModel.ISupportInitialize)(this.itemNumberNumericUpDown)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.priceNumericUpDown)).BeginInit();
this.tableLayoutPanel1.SuspendLayout();
@ -72,12 +81,16 @@
this.pocketGroupBox.SuspendLayout();
this.moveRelatedFlowLayoutPanel.SuspendLayout();
this.moveRelatedGroupBox.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.naturalGiftPowerNumericUpDown)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.flingEffectNumericUpDown)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.flingPowerNumericUpDown)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pluckEffectNumericUpDown)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.flingEffectNumericUpDown)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.naturalGiftPowerNumericUpDown)).BeginInit();
this.checksFlowLayoutPanel.SuspendLayout();
this.checksGroupBox.SuspendLayout();
this.priceFlowLayoutPanel.SuspendLayout();
this.priceGroupBox.SuspendLayout();
this.functionsFlowLayoutPanel.SuspendLayout();
this.functionsGroupBox.SuspendLayout();
this.SuspendLayout();
//
// itemNumberNumericUpDown
@ -132,7 +145,7 @@
// priceNumericUpDown
//
this.priceNumericUpDown.Anchor = System.Windows.Forms.AnchorStyles.None;
this.priceNumericUpDown.Location = new System.Drawing.Point(871, 340);
this.priceNumericUpDown.Location = new System.Drawing.Point(122, 35);
this.priceNumericUpDown.Name = "priceNumericUpDown";
this.priceNumericUpDown.Size = new System.Drawing.Size(120, 20);
this.priceNumericUpDown.TabIndex = 5;
@ -145,15 +158,15 @@
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
this.tableLayoutPanel1.Controls.Add(this.priceNumericUpDown, 3, 2);
this.tableLayoutPanel1.Controls.Add(this.itemNumberNumericUpDown, 2, 0);
this.tableLayoutPanel1.Controls.Add(this.itemNameInputComboBox, 1, 0);
this.tableLayoutPanel1.Controls.Add(this.priceLabel, 3, 1);
this.tableLayoutPanel1.Controls.Add(this.saveDataButton, 3, 0);
this.tableLayoutPanel1.Controls.Add(this.holdFlowLayoutPanel, 0, 1);
this.tableLayoutPanel1.Controls.Add(this.pocketFlowLayoutPanel, 1, 1);
this.tableLayoutPanel1.Controls.Add(this.moveRelatedFlowLayoutPanel, 0, 2);
this.tableLayoutPanel1.Controls.Add(this.checksFlowLayoutPanel, 2, 1);
this.tableLayoutPanel1.Controls.Add(this.priceFlowLayoutPanel, 3, 1);
this.tableLayoutPanel1.Controls.Add(this.functionsFlowLayoutPanel, 0, 3);
this.tableLayoutPanel1.Location = new System.Drawing.Point(12, 12);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 4;
@ -164,50 +177,6 @@
this.tableLayoutPanel1.Size = new System.Drawing.Size(1065, 563);
this.tableLayoutPanel1.TabIndex = 6;
//
// holdEffectLabel
//
this.holdEffectLabel.Anchor = System.Windows.Forms.AnchorStyles.None;
this.holdEffectLabel.AutoSize = true;
this.holdEffectLabel.Location = new System.Drawing.Point(26, 38);
this.holdEffectLabel.Name = "holdEffectLabel";
this.holdEffectLabel.Size = new System.Drawing.Size(35, 13);
this.holdEffectLabel.TabIndex = 6;
this.holdEffectLabel.Text = "Effect";
this.holdEffectLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// fieldPocketLabel
//
this.fieldPocketLabel.Anchor = System.Windows.Forms.AnchorStyles.None;
this.fieldPocketLabel.AutoSize = true;
this.fieldPocketLabel.Location = new System.Drawing.Point(21, 38);
this.fieldPocketLabel.Name = "fieldPocketLabel";
this.fieldPocketLabel.Size = new System.Drawing.Size(66, 13);
this.fieldPocketLabel.TabIndex = 7;
this.fieldPocketLabel.Text = "Field Pocket";
this.fieldPocketLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// battlePocketLabel
//
this.battlePocketLabel.Anchor = System.Windows.Forms.AnchorStyles.None;
this.battlePocketLabel.AutoSize = true;
this.battlePocketLabel.Location = new System.Drawing.Point(16, 81);
this.battlePocketLabel.Name = "battlePocketLabel";
this.battlePocketLabel.Size = new System.Drawing.Size(71, 13);
this.battlePocketLabel.TabIndex = 8;
this.battlePocketLabel.Text = "Battle Pocket";
this.battlePocketLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// priceLabel
//
this.priceLabel.Anchor = System.Windows.Forms.AnchorStyles.None;
this.priceLabel.AutoSize = true;
this.priceLabel.Location = new System.Drawing.Point(916, 203);
this.priceLabel.Name = "priceLabel";
this.priceLabel.Size = new System.Drawing.Size(31, 13);
this.priceLabel.TabIndex = 9;
this.priceLabel.Text = "Price";
this.priceLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// saveDataButton
//
this.saveDataButton.Anchor = System.Windows.Forms.AnchorStyles.None;
@ -219,17 +188,6 @@
this.saveDataButton.UseVisualStyleBackColor = true;
this.saveDataButton.Click += new System.EventHandler(this.saveDataButton_Click);
//
// holdEffectParameterLabel
//
this.holdEffectParameterLabel.Anchor = System.Windows.Forms.AnchorStyles.None;
this.holdEffectParameterLabel.AutoSize = true;
this.holdEffectParameterLabel.Location = new System.Drawing.Point(6, 81);
this.holdEffectParameterLabel.Name = "holdEffectParameterLabel";
this.holdEffectParameterLabel.Size = new System.Drawing.Size(55, 13);
this.holdEffectParameterLabel.TabIndex = 7;
this.holdEffectParameterLabel.Text = "Parameter";
this.holdEffectParameterLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// holdFlowLayoutPanel
//
this.holdFlowLayoutPanel.Controls.Add(this.holdGroupBox);
@ -260,6 +218,28 @@
this.holdEffectParameterNumericUpDown.TabIndex = 12;
this.holdEffectParameterNumericUpDown.ValueChanged += new System.EventHandler(this.holdEffectParameterNumericUpDown_ValueChanged);
//
// holdEffectParameterLabel
//
this.holdEffectParameterLabel.Anchor = System.Windows.Forms.AnchorStyles.None;
this.holdEffectParameterLabel.AutoSize = true;
this.holdEffectParameterLabel.Location = new System.Drawing.Point(6, 81);
this.holdEffectParameterLabel.Name = "holdEffectParameterLabel";
this.holdEffectParameterLabel.Size = new System.Drawing.Size(55, 13);
this.holdEffectParameterLabel.TabIndex = 7;
this.holdEffectParameterLabel.Text = "Parameter";
this.holdEffectParameterLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// holdEffectLabel
//
this.holdEffectLabel.Anchor = System.Windows.Forms.AnchorStyles.None;
this.holdEffectLabel.AutoSize = true;
this.holdEffectLabel.Location = new System.Drawing.Point(26, 38);
this.holdEffectLabel.Name = "holdEffectLabel";
this.holdEffectLabel.Size = new System.Drawing.Size(35, 13);
this.holdEffectLabel.TabIndex = 6;
this.holdEffectLabel.Text = "Effect";
this.holdEffectLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// pocketFlowLayoutPanel
//
this.pocketFlowLayoutPanel.Controls.Add(this.pocketGroupBox);
@ -281,6 +261,28 @@
this.pocketGroupBox.TabStop = false;
this.pocketGroupBox.Text = "Pocket Data";
//
// fieldPocketLabel
//
this.fieldPocketLabel.Anchor = System.Windows.Forms.AnchorStyles.None;
this.fieldPocketLabel.AutoSize = true;
this.fieldPocketLabel.Location = new System.Drawing.Point(21, 38);
this.fieldPocketLabel.Name = "fieldPocketLabel";
this.fieldPocketLabel.Size = new System.Drawing.Size(66, 13);
this.fieldPocketLabel.TabIndex = 7;
this.fieldPocketLabel.Text = "Field Pocket";
this.fieldPocketLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// battlePocketLabel
//
this.battlePocketLabel.Anchor = System.Windows.Forms.AnchorStyles.None;
this.battlePocketLabel.AutoSize = true;
this.battlePocketLabel.Location = new System.Drawing.Point(16, 81);
this.battlePocketLabel.Name = "battlePocketLabel";
this.battlePocketLabel.Size = new System.Drawing.Size(71, 13);
this.battlePocketLabel.TabIndex = 8;
this.battlePocketLabel.Text = "Battle Pocket";
this.battlePocketLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// moveRelatedFlowLayoutPanel
//
this.tableLayoutPanel1.SetColumnSpan(this.moveRelatedFlowLayoutPanel, 2);
@ -309,67 +311,6 @@
this.moveRelatedGroupBox.TabStop = false;
this.moveRelatedGroupBox.Text = "Move Related";
//
// naturalGiftTypeComboBox
//
this.naturalGiftTypeComboBox.Anchor = System.Windows.Forms.AnchorStyles.None;
this.naturalGiftTypeComboBox.FormattingEnabled = true;
this.naturalGiftTypeComboBox.Location = new System.Drawing.Point(106, 53);
this.naturalGiftTypeComboBox.Name = "naturalGiftTypeComboBox";
this.naturalGiftTypeComboBox.Size = new System.Drawing.Size(121, 21);
this.naturalGiftTypeComboBox.TabIndex = 3;
this.naturalGiftTypeComboBox.SelectedIndexChanged += new System.EventHandler(this.naturalGiftTypeComboBox_SelectedIndexChanged);
//
// naturalGiftTypeLabel
//
this.naturalGiftTypeLabel.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
this.naturalGiftTypeLabel.AutoSize = true;
this.naturalGiftTypeLabel.Location = new System.Drawing.Point(6, 56);
this.naturalGiftTypeLabel.Name = "naturalGiftTypeLabel";
this.naturalGiftTypeLabel.Size = new System.Drawing.Size(87, 13);
this.naturalGiftTypeLabel.TabIndex = 8;
this.naturalGiftTypeLabel.Text = "Natural Gift Type";
this.naturalGiftTypeLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// naturalGiftPowerLabel
//
this.naturalGiftPowerLabel.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
this.naturalGiftPowerLabel.AutoSize = true;
this.naturalGiftPowerLabel.Location = new System.Drawing.Point(6, 86);
this.naturalGiftPowerLabel.Name = "naturalGiftPowerLabel";
this.naturalGiftPowerLabel.Size = new System.Drawing.Size(93, 13);
this.naturalGiftPowerLabel.TabIndex = 10;
this.naturalGiftPowerLabel.Text = "Natural Gift Power";
this.naturalGiftPowerLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// flingEffectLabel
//
this.flingEffectLabel.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
this.flingEffectLabel.AutoSize = true;
this.flingEffectLabel.Location = new System.Drawing.Point(306, 81);
this.flingEffectLabel.Name = "flingEffectLabel";
this.flingEffectLabel.Size = new System.Drawing.Size(60, 13);
this.flingEffectLabel.TabIndex = 12;
this.flingEffectLabel.Text = "Fling Effect";
this.flingEffectLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// naturalGiftPowerNumericUpDown
//
this.naturalGiftPowerNumericUpDown.Anchor = System.Windows.Forms.AnchorStyles.None;
this.naturalGiftPowerNumericUpDown.Location = new System.Drawing.Point(107, 84);
this.naturalGiftPowerNumericUpDown.Name = "naturalGiftPowerNumericUpDown";
this.naturalGiftPowerNumericUpDown.Size = new System.Drawing.Size(120, 20);
this.naturalGiftPowerNumericUpDown.TabIndex = 13;
this.naturalGiftPowerNumericUpDown.ValueChanged += new System.EventHandler(this.naturalGiftPowerNumericUpDown_ValueChanged);
//
// flingEffectNumericUpDown
//
this.flingEffectNumericUpDown.Anchor = System.Windows.Forms.AnchorStyles.None;
this.flingEffectNumericUpDown.Location = new System.Drawing.Point(389, 79);
this.flingEffectNumericUpDown.Name = "flingEffectNumericUpDown";
this.flingEffectNumericUpDown.Size = new System.Drawing.Size(120, 20);
this.flingEffectNumericUpDown.TabIndex = 14;
this.flingEffectNumericUpDown.ValueChanged += new System.EventHandler(this.flingEffectNumericUpDown_ValueChanged);
//
// flingPowerNumericUpDown
//
this.flingPowerNumericUpDown.Anchor = System.Windows.Forms.AnchorStyles.None;
@ -410,6 +351,67 @@
this.pluckEffectLabel.Text = "Pluck Effect";
this.pluckEffectLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// flingEffectNumericUpDown
//
this.flingEffectNumericUpDown.Anchor = System.Windows.Forms.AnchorStyles.None;
this.flingEffectNumericUpDown.Location = new System.Drawing.Point(389, 79);
this.flingEffectNumericUpDown.Name = "flingEffectNumericUpDown";
this.flingEffectNumericUpDown.Size = new System.Drawing.Size(120, 20);
this.flingEffectNumericUpDown.TabIndex = 14;
this.flingEffectNumericUpDown.ValueChanged += new System.EventHandler(this.flingEffectNumericUpDown_ValueChanged);
//
// naturalGiftPowerNumericUpDown
//
this.naturalGiftPowerNumericUpDown.Anchor = System.Windows.Forms.AnchorStyles.None;
this.naturalGiftPowerNumericUpDown.Location = new System.Drawing.Point(107, 84);
this.naturalGiftPowerNumericUpDown.Name = "naturalGiftPowerNumericUpDown";
this.naturalGiftPowerNumericUpDown.Size = new System.Drawing.Size(120, 20);
this.naturalGiftPowerNumericUpDown.TabIndex = 13;
this.naturalGiftPowerNumericUpDown.ValueChanged += new System.EventHandler(this.naturalGiftPowerNumericUpDown_ValueChanged);
//
// flingEffectLabel
//
this.flingEffectLabel.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
this.flingEffectLabel.AutoSize = true;
this.flingEffectLabel.Location = new System.Drawing.Point(306, 81);
this.flingEffectLabel.Name = "flingEffectLabel";
this.flingEffectLabel.Size = new System.Drawing.Size(60, 13);
this.flingEffectLabel.TabIndex = 12;
this.flingEffectLabel.Text = "Fling Effect";
this.flingEffectLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// naturalGiftPowerLabel
//
this.naturalGiftPowerLabel.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
this.naturalGiftPowerLabel.AutoSize = true;
this.naturalGiftPowerLabel.Location = new System.Drawing.Point(6, 86);
this.naturalGiftPowerLabel.Name = "naturalGiftPowerLabel";
this.naturalGiftPowerLabel.Size = new System.Drawing.Size(93, 13);
this.naturalGiftPowerLabel.TabIndex = 10;
this.naturalGiftPowerLabel.Text = "Natural Gift Power";
this.naturalGiftPowerLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// naturalGiftTypeLabel
//
this.naturalGiftTypeLabel.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
this.naturalGiftTypeLabel.AutoSize = true;
this.naturalGiftTypeLabel.Location = new System.Drawing.Point(6, 56);
this.naturalGiftTypeLabel.Name = "naturalGiftTypeLabel";
this.naturalGiftTypeLabel.Size = new System.Drawing.Size(87, 13);
this.naturalGiftTypeLabel.TabIndex = 8;
this.naturalGiftTypeLabel.Text = "Natural Gift Type";
this.naturalGiftTypeLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// naturalGiftTypeComboBox
//
this.naturalGiftTypeComboBox.Anchor = System.Windows.Forms.AnchorStyles.None;
this.naturalGiftTypeComboBox.FormattingEnabled = true;
this.naturalGiftTypeComboBox.Location = new System.Drawing.Point(106, 53);
this.naturalGiftTypeComboBox.Name = "naturalGiftTypeComboBox";
this.naturalGiftTypeComboBox.Size = new System.Drawing.Size(121, 21);
this.naturalGiftTypeComboBox.TabIndex = 3;
this.naturalGiftTypeComboBox.SelectedIndexChanged += new System.EventHandler(this.naturalGiftTypeComboBox_SelectedIndexChanged);
//
// checksFlowLayoutPanel
//
this.checksFlowLayoutPanel.Controls.Add(this.checksGroupBox);
@ -420,6 +422,7 @@
//
// checksGroupBox
//
this.checksGroupBox.Controls.Add(this.partyUseCheckBox);
this.checksGroupBox.Controls.Add(this.canSelectCheckBox);
this.checksGroupBox.Controls.Add(this.preventTossCheckBox);
this.checksGroupBox.Location = new System.Drawing.Point(3, 3);
@ -429,17 +432,6 @@
this.checksGroupBox.TabStop = false;
this.checksGroupBox.Text = "Checks";
//
// preventTossCheckBox
//
this.preventTossCheckBox.AutoSize = true;
this.preventTossCheckBox.Location = new System.Drawing.Point(17, 38);
this.preventTossCheckBox.Name = "preventTossCheckBox";
this.preventTossCheckBox.Size = new System.Drawing.Size(89, 17);
this.preventTossCheckBox.TabIndex = 0;
this.preventTossCheckBox.Text = "Prevent Toss";
this.preventTossCheckBox.UseVisualStyleBackColor = true;
this.preventTossCheckBox.CheckedChanged += new System.EventHandler(this.preventTossCheckBox_CheckedChanged);
//
// canSelectCheckBox
//
this.canSelectCheckBox.AutoSize = true;
@ -451,6 +443,121 @@
this.canSelectCheckBox.UseVisualStyleBackColor = true;
this.canSelectCheckBox.CheckedChanged += new System.EventHandler(this.canSelectCheckBox_CheckedChanged);
//
// preventTossCheckBox
//
this.preventTossCheckBox.AutoSize = true;
this.preventTossCheckBox.Location = new System.Drawing.Point(17, 38);
this.preventTossCheckBox.Name = "preventTossCheckBox";
this.preventTossCheckBox.Size = new System.Drawing.Size(89, 17);
this.preventTossCheckBox.TabIndex = 0;
this.preventTossCheckBox.Text = "Prevent Toss";
this.preventTossCheckBox.UseVisualStyleBackColor = true;
this.preventTossCheckBox.CheckedChanged += new System.EventHandler(this.preventTossCheckBox_CheckedChanged);
//
// priceFlowLayoutPanel
//
this.priceFlowLayoutPanel.Controls.Add(this.priceGroupBox);
this.priceFlowLayoutPanel.Location = new System.Drawing.Point(801, 143);
this.priceFlowLayoutPanel.Name = "priceFlowLayoutPanel";
this.priceFlowLayoutPanel.Size = new System.Drawing.Size(260, 134);
this.priceFlowLayoutPanel.TabIndex = 15;
//
// priceGroupBox
//
this.priceGroupBox.Controls.Add(this.priceNumericUpDown);
this.priceGroupBox.Controls.Add(this.priceLabel);
this.priceGroupBox.Location = new System.Drawing.Point(3, 3);
this.priceGroupBox.Name = "priceGroupBox";
this.priceGroupBox.Size = new System.Drawing.Size(261, 131);
this.priceGroupBox.TabIndex = 10;
this.priceGroupBox.TabStop = false;
this.priceGroupBox.Text = "Price";
//
// priceLabel
//
this.priceLabel.Anchor = System.Windows.Forms.AnchorStyles.None;
this.priceLabel.AutoSize = true;
this.priceLabel.Location = new System.Drawing.Point(30, 37);
this.priceLabel.Name = "priceLabel";
this.priceLabel.Size = new System.Drawing.Size(31, 13);
this.priceLabel.TabIndex = 9;
this.priceLabel.Text = "Price";
this.priceLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// functionsFlowLayoutPanel
//
this.functionsFlowLayoutPanel.Controls.Add(this.functionsGroupBox);
this.functionsFlowLayoutPanel.Location = new System.Drawing.Point(3, 423);
this.functionsFlowLayoutPanel.Name = "functionsFlowLayoutPanel";
this.functionsFlowLayoutPanel.Size = new System.Drawing.Size(260, 137);
this.functionsFlowLayoutPanel.TabIndex = 16;
//
// functionsGroupBox
//
this.functionsGroupBox.Controls.Add(this.battleFunctionComboBox);
this.functionsGroupBox.Controls.Add(this.fieldFunctionLabel);
this.functionsGroupBox.Controls.Add(this.fieldFunctionComboBox);
this.functionsGroupBox.Controls.Add(this.battleFunctionLabel);
this.functionsGroupBox.Location = new System.Drawing.Point(3, 3);
this.functionsGroupBox.Name = "functionsGroupBox";
this.functionsGroupBox.Size = new System.Drawing.Size(257, 134);
this.functionsGroupBox.TabIndex = 0;
this.functionsGroupBox.TabStop = false;
this.functionsGroupBox.Text = "Functions";
//
// battleFunctionComboBox
//
this.battleFunctionComboBox.Anchor = System.Windows.Forms.AnchorStyles.None;
this.battleFunctionComboBox.FormattingEnabled = true;
this.battleFunctionComboBox.Location = new System.Drawing.Point(113, 78);
this.battleFunctionComboBox.Name = "battleFunctionComboBox";
this.battleFunctionComboBox.Size = new System.Drawing.Size(121, 21);
this.battleFunctionComboBox.TabIndex = 10;
this.battleFunctionComboBox.SelectedIndexChanged += new System.EventHandler(this.battleFunctionComboBox_SelectedIndexChanged);
//
// fieldFunctionLabel
//
this.fieldFunctionLabel.Anchor = System.Windows.Forms.AnchorStyles.None;
this.fieldFunctionLabel.AutoSize = true;
this.fieldFunctionLabel.Location = new System.Drawing.Point(27, 38);
this.fieldFunctionLabel.Name = "fieldFunctionLabel";
this.fieldFunctionLabel.Size = new System.Drawing.Size(73, 13);
this.fieldFunctionLabel.TabIndex = 11;
this.fieldFunctionLabel.Text = "Field Function";
this.fieldFunctionLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// fieldFunctionComboBox
//
this.fieldFunctionComboBox.Anchor = System.Windows.Forms.AnchorStyles.None;
this.fieldFunctionComboBox.FormattingEnabled = true;
this.fieldFunctionComboBox.Location = new System.Drawing.Point(113, 35);
this.fieldFunctionComboBox.Name = "fieldFunctionComboBox";
this.fieldFunctionComboBox.Size = new System.Drawing.Size(121, 21);
this.fieldFunctionComboBox.TabIndex = 9;
this.fieldFunctionComboBox.SelectedIndexChanged += new System.EventHandler(this.fieldFunctionComboBox_SelectedIndexChanged);
//
// battleFunctionLabel
//
this.battleFunctionLabel.Anchor = System.Windows.Forms.AnchorStyles.None;
this.battleFunctionLabel.AutoSize = true;
this.battleFunctionLabel.Location = new System.Drawing.Point(22, 81);
this.battleFunctionLabel.Name = "battleFunctionLabel";
this.battleFunctionLabel.Size = new System.Drawing.Size(78, 13);
this.battleFunctionLabel.TabIndex = 12;
this.battleFunctionLabel.Text = "Battle Function";
this.battleFunctionLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// partyUseCheckBox
//
this.partyUseCheckBox.AutoSize = true;
this.partyUseCheckBox.Location = new System.Drawing.Point(136, 39);
this.partyUseCheckBox.Name = "partyUseCheckBox";
this.partyUseCheckBox.Size = new System.Drawing.Size(72, 17);
this.partyUseCheckBox.TabIndex = 2;
this.partyUseCheckBox.Text = "Party Use";
this.partyUseCheckBox.UseVisualStyleBackColor = true;
this.partyUseCheckBox.CheckedChanged += new System.EventHandler(this.partyUseCheckBox_CheckedChanged);
//
// ItemEditor
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -462,7 +569,6 @@
((System.ComponentModel.ISupportInitialize)(this.itemNumberNumericUpDown)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.priceNumericUpDown)).EndInit();
this.tableLayoutPanel1.ResumeLayout(false);
this.tableLayoutPanel1.PerformLayout();
this.holdFlowLayoutPanel.ResumeLayout(false);
this.holdGroupBox.ResumeLayout(false);
this.holdGroupBox.PerformLayout();
@ -473,13 +579,19 @@
this.moveRelatedFlowLayoutPanel.ResumeLayout(false);
this.moveRelatedGroupBox.ResumeLayout(false);
this.moveRelatedGroupBox.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.naturalGiftPowerNumericUpDown)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.flingEffectNumericUpDown)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.flingPowerNumericUpDown)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pluckEffectNumericUpDown)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.flingEffectNumericUpDown)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.naturalGiftPowerNumericUpDown)).EndInit();
this.checksFlowLayoutPanel.ResumeLayout(false);
this.checksGroupBox.ResumeLayout(false);
this.checksGroupBox.PerformLayout();
this.priceFlowLayoutPanel.ResumeLayout(false);
this.priceGroupBox.ResumeLayout(false);
this.priceGroupBox.PerformLayout();
this.functionsFlowLayoutPanel.ResumeLayout(false);
this.functionsGroupBox.ResumeLayout(false);
this.functionsGroupBox.PerformLayout();
this.ResumeLayout(false);
}
@ -520,5 +632,14 @@
private System.Windows.Forms.GroupBox checksGroupBox;
private System.Windows.Forms.CheckBox preventTossCheckBox;
private System.Windows.Forms.CheckBox canSelectCheckBox;
private System.Windows.Forms.FlowLayoutPanel priceFlowLayoutPanel;
private System.Windows.Forms.GroupBox priceGroupBox;
private System.Windows.Forms.FlowLayoutPanel functionsFlowLayoutPanel;
private System.Windows.Forms.GroupBox functionsGroupBox;
private System.Windows.Forms.ComboBox battleFunctionComboBox;
private System.Windows.Forms.Label fieldFunctionLabel;
private System.Windows.Forms.ComboBox fieldFunctionComboBox;
private System.Windows.Forms.Label battleFunctionLabel;
private System.Windows.Forms.CheckBox partyUseCheckBox;
}
}

43
DS_Map/Editors/ItemEditor.cs
View File

@ -45,7 +45,7 @@ namespace DSPRE.Editors
// Set up max and min for numerics
priceNumericUpDown.Minimum = 0;
priceNumericUpDown.Maximum = 65535;
itemNumberNumericUpDown.Minimum = 1;
itemNumberNumericUpDown.Minimum = 0;
itemNumberNumericUpDown.Maximum = this.itemFileNames.Length - 1;
holdEffectParameterNumericUpDown.Minimum = 0;
holdEffectParameterNumericUpDown.Maximum = 255;
@ -64,6 +64,8 @@ namespace DSPRE.Editors
fieldPocketComboBox.Items.AddRange(Enum.GetNames(typeof(FieldPocket)));
battlePocketComboBox.Items.AddRange(Enum.GetNames(typeof(BattlePocket)));
naturalGiftTypeComboBox.Items.AddRange(Enum.GetNames(typeof(NaturalGiftType)));
fieldFunctionComboBox.Items.AddRange(Enum.GetNames(typeof(FieldUseFunc)));
battleFunctionComboBox.Items.AddRange(Enum.GetNames(typeof(BattleUseFunc)));
Helpers.EnableHandlers();
@ -137,10 +139,16 @@ namespace DSPRE.Editors
// Checks
preventTossCheckBox.Checked = currentLoadedFile.PreventToss;
canSelectCheckBox.Checked = currentLoadedFile.Selectable;
partyUseCheckBox.Checked = currentLoadedFile.PartyUse == 1;
// Price
priceNumericUpDown.Value = currentLoadedFile.price;
// Usage Functions
fieldFunctionComboBox.SelectedIndex = (int)currentLoadedFile.fieldUseFunc;
battleFunctionComboBox.SelectedIndex = (int)currentLoadedFile.battleUseFunc;
//descriptionTextBox.Text = itemDescriptions[currentLoadedId];
}
@ -327,5 +335,38 @@ namespace DSPRE.Editors
currentLoadedFile.Selectable = canSelectCheckBox.Checked;
setDirty(true);
}
private void fieldFunctionComboBox_SelectedIndexChanged(object sender, EventArgs e)
{
if (Helpers.HandlersDisabled)
{
return;
}
currentLoadedFile.fieldUseFunc = (FieldUseFunc)fieldFunctionComboBox.SelectedIndex;
setDirty(true);
}
private void battleFunctionComboBox_SelectedIndexChanged(object sender, EventArgs e)
{
if (Helpers.HandlersDisabled)
{
return;
}
currentLoadedFile.battleUseFunc = (BattleUseFunc)battleFunctionComboBox.SelectedIndex;
setDirty(true);
}
private void partyUseCheckBox_CheckedChanged(object sender, EventArgs e)
{
if (Helpers.HandlersDisabled)
{
return;
}
currentLoadedFile.PartyUse = (byte)(partyUseCheckBox.Checked ? 1: 0);
setDirty(true);
}
}
}

53
DS_Map/ROMFiles/ItemData.cs
View File

@ -27,6 +27,47 @@ namespace DSPRE.ROMFiles
NONE = 31
}
public enum FieldUseFunc : byte
{
Generic = 0,
HealingItem = 1,
Dummy1 = 2,
Dummy2 = 3,
Bicycle = 4,
Dummy3 = 5,
TMHM = 6,
Mail = 7,
Berry = 8,
Dummy4 = 9,
PalPad = 10,
Dummy5 = 11,
Dummy6 = 12,
Dummy7 = 13,
Honey = 14,
Dummy8 = 15,
OldRod = 16,
GoodRod = 17,
SuperRod = 18,
Generic2 = 19,
EvoStone = 20,
EscapeRope = 21,
Dummy9 = 22,
ApricornBox = 23,
BerryPots = 24,
UnownReport = 25,
DowsingMchn = 26,
GbSounds = 27,
Gracidea = 28,
VSRecorder = 29
}
public enum BattleUseFunc : byte
{
No_Use = 0,
Ball = 1,
Healing = 2,
Escape = 3
}
public enum FieldPocket
{
@ -292,8 +333,8 @@ namespace DSPRE.ROMFiles
public FieldPocket fieldPocket; // 4 bits
public BattlePocket battlePocket; // 5 bits
public byte FieldUseFunc;
public byte BattleUseFunc;
public FieldUseFunc fieldUseFunc;
public BattleUseFunc battleUseFunc;
public byte PartyUse;
public ItemPartyUseParam PartyUseParam;
@ -316,8 +357,8 @@ namespace DSPRE.ROMFiles
fieldPocket = (FieldPocket)((bitfield >> 7) & 0b1111);
battlePocket = (BattlePocket)((bitfield >> 11) & 0b11111);
FieldUseFunc = reader.ReadByte();
BattleUseFunc = reader.ReadByte();
fieldUseFunc = (FieldUseFunc)reader.ReadByte();
battleUseFunc = (BattleUseFunc)reader.ReadByte();
PartyUse = reader.ReadByte();
//reader.ReadByte(); // skip 1 byte padding_0D
@ -352,8 +393,8 @@ namespace DSPRE.ROMFiles
bitfield |= (ushort)(((byte)battlePocket & 0b11111) << 11);
writer.Write(bitfield);
writer.Write(FieldUseFunc);
writer.Write(BattleUseFunc);
writer.Write((byte)fieldUseFunc);
writer.Write((byte)battleUseFunc);
writer.Write(PartyUse);
writer.Write((byte)0); // padding