diff --git a/DS_Map/DSPRE.csproj b/DS_Map/DSPRE.csproj index 142ad0f..0c20992 100644 --- a/DS_Map/DSPRE.csproj +++ b/DS_Map/DSPRE.csproj @@ -138,6 +138,12 @@ HeadbuttEncounterEditorTab.cs + + Form + + + ItemEditor.cs + UserControl @@ -277,6 +283,7 @@ + @@ -429,6 +436,9 @@ HeadbuttEncounterEditorTab.cs + + ItemEditor.cs + LevelScriptEditor.cs diff --git a/DS_Map/DocTool.cs b/DS_Map/DocTool.cs index 66f9521..ea6f95c 100644 --- a/DS_Map/DocTool.cs +++ b/DS_Map/DocTool.cs @@ -29,7 +29,7 @@ namespace DSPRE string moveDataPath = Path.Combine(docsFolderPath, "MoveData.csv"); string TMHMDataPath = Path.Combine(docsFolderPath, "TMHMData.csv"); - DSUtils.TryUnpackNarcs(new List { DirNames.personalPokeData, DirNames.learnsets, DirNames.evolutions, DirNames.trainerParty, DirNames.trainerProperties ,DirNames.moveData}); + DSUtils.TryUnpackNarcs(new List { DirNames.personalPokeData, DirNames.learnsets, DirNames.evolutions, DirNames.trainerParty, DirNames.trainerProperties ,DirNames.moveData, DirNames.itemData}); string[] pokeNames = RomInfo.GetPokemonNames(); string[] itemNames = RomInfo.GetItemNames(); diff --git a/DS_Map/Editors/ItemEditor.Designer.cs b/DS_Map/Editors/ItemEditor.Designer.cs new file mode 100644 index 0000000..e653ba7 --- /dev/null +++ b/DS_Map/Editors/ItemEditor.Designer.cs @@ -0,0 +1,524 @@ +namespace DSPRE.Editors +{ + partial class ItemEditor + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.itemNumberNumericUpDown = new System.Windows.Forms.NumericUpDown(); + this.holdEffectComboBox = new System.Windows.Forms.ComboBox(); + this.fieldPocketComboBox = new System.Windows.Forms.ComboBox(); + this.battlePocketComboBox = new System.Windows.Forms.ComboBox(); + 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.pocketFlowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel(); + this.pocketGroupBox = new System.Windows.Forms.GroupBox(); + 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.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(); + ((System.ComponentModel.ISupportInitialize)(this.itemNumberNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.priceNumericUpDown)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); + this.holdFlowLayoutPanel.SuspendLayout(); + this.holdGroupBox.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.holdEffectParameterNumericUpDown)).BeginInit(); + this.pocketFlowLayoutPanel.SuspendLayout(); + 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(); + this.checksFlowLayoutPanel.SuspendLayout(); + this.checksGroupBox.SuspendLayout(); + this.SuspendLayout(); + // + // itemNumberNumericUpDown + // + this.itemNumberNumericUpDown.Anchor = System.Windows.Forms.AnchorStyles.None; + this.itemNumberNumericUpDown.Location = new System.Drawing.Point(605, 60); + this.itemNumberNumericUpDown.Name = "itemNumberNumericUpDown"; + this.itemNumberNumericUpDown.Size = new System.Drawing.Size(120, 20); + this.itemNumberNumericUpDown.TabIndex = 0; + this.itemNumberNumericUpDown.ValueChanged += new System.EventHandler(this.itemNumberNumericUpDown_ValueChanged); + // + // holdEffectComboBox + // + this.holdEffectComboBox.Anchor = System.Windows.Forms.AnchorStyles.None; + this.holdEffectComboBox.FormattingEnabled = true; + this.holdEffectComboBox.Location = new System.Drawing.Point(106, 35); + this.holdEffectComboBox.Name = "holdEffectComboBox"; + this.holdEffectComboBox.Size = new System.Drawing.Size(121, 21); + this.holdEffectComboBox.TabIndex = 1; + this.holdEffectComboBox.SelectedIndexChanged += new System.EventHandler(this.holdEffectComboBox_SelectedIndexChanged); + // + // fieldPocketComboBox + // + this.fieldPocketComboBox.Anchor = System.Windows.Forms.AnchorStyles.None; + this.fieldPocketComboBox.FormattingEnabled = true; + this.fieldPocketComboBox.Location = new System.Drawing.Point(107, 35); + this.fieldPocketComboBox.Name = "fieldPocketComboBox"; + this.fieldPocketComboBox.Size = new System.Drawing.Size(121, 21); + this.fieldPocketComboBox.TabIndex = 2; + this.fieldPocketComboBox.SelectedIndexChanged += new System.EventHandler(this.fieldPocketComboBox_SelectedIndexChanged); + // + // battlePocketComboBox + // + this.battlePocketComboBox.Anchor = System.Windows.Forms.AnchorStyles.None; + this.battlePocketComboBox.FormattingEnabled = true; + this.battlePocketComboBox.Location = new System.Drawing.Point(107, 78); + this.battlePocketComboBox.Name = "battlePocketComboBox"; + this.battlePocketComboBox.Size = new System.Drawing.Size(121, 21); + this.battlePocketComboBox.TabIndex = 3; + this.battlePocketComboBox.SelectedIndexChanged += new System.EventHandler(this.battlePocketComboBox_SelectedIndexChanged); + // + // itemNameInputComboBox + // + this.itemNameInputComboBox.Anchor = System.Windows.Forms.AnchorStyles.None; + this.itemNameInputComboBox.FormattingEnabled = true; + this.itemNameInputComboBox.Location = new System.Drawing.Point(338, 59); + this.itemNameInputComboBox.Name = "itemNameInputComboBox"; + this.itemNameInputComboBox.Size = new System.Drawing.Size(121, 21); + this.itemNameInputComboBox.TabIndex = 4; + this.itemNameInputComboBox.SelectedIndexChanged += new System.EventHandler(this.itemNameInputComboBox_SelectedIndexChanged); + // + // priceNumericUpDown + // + this.priceNumericUpDown.Anchor = System.Windows.Forms.AnchorStyles.None; + this.priceNumericUpDown.Location = new System.Drawing.Point(871, 340); + this.priceNumericUpDown.Name = "priceNumericUpDown"; + this.priceNumericUpDown.Size = new System.Drawing.Size(120, 20); + this.priceNumericUpDown.TabIndex = 5; + this.priceNumericUpDown.ValueChanged += new System.EventHandler(this.priceNumericUpDown_ValueChanged); + // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.ColumnCount = 4; + 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.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.Location = new System.Drawing.Point(12, 12); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 4; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); + 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; + this.saveDataButton.Location = new System.Drawing.Point(883, 58); + this.saveDataButton.Name = "saveDataButton"; + this.saveDataButton.Size = new System.Drawing.Size(96, 23); + this.saveDataButton.TabIndex = 10; + this.saveDataButton.Text = "Save Changes"; + 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); + this.holdFlowLayoutPanel.Location = new System.Drawing.Point(3, 143); + this.holdFlowLayoutPanel.Name = "holdFlowLayoutPanel"; + this.holdFlowLayoutPanel.Size = new System.Drawing.Size(260, 134); + this.holdFlowLayoutPanel.TabIndex = 11; + // + // holdGroupBox + // + this.holdGroupBox.Controls.Add(this.holdEffectParameterNumericUpDown); + this.holdGroupBox.Controls.Add(this.holdEffectParameterLabel); + this.holdGroupBox.Controls.Add(this.holdEffectLabel); + this.holdGroupBox.Controls.Add(this.holdEffectComboBox); + this.holdGroupBox.Location = new System.Drawing.Point(3, 3); + this.holdGroupBox.Name = "holdGroupBox"; + this.holdGroupBox.Size = new System.Drawing.Size(257, 131); + this.holdGroupBox.TabIndex = 0; + this.holdGroupBox.TabStop = false; + this.holdGroupBox.Text = "Hold Effects"; + // + // holdEffectParameterNumericUpDown + // + this.holdEffectParameterNumericUpDown.Anchor = System.Windows.Forms.AnchorStyles.None; + this.holdEffectParameterNumericUpDown.Location = new System.Drawing.Point(107, 79); + this.holdEffectParameterNumericUpDown.Name = "holdEffectParameterNumericUpDown"; + this.holdEffectParameterNumericUpDown.Size = new System.Drawing.Size(120, 20); + this.holdEffectParameterNumericUpDown.TabIndex = 12; + this.holdEffectParameterNumericUpDown.ValueChanged += new System.EventHandler(this.holdEffectParameterNumericUpDown_ValueChanged); + // + // pocketFlowLayoutPanel + // + this.pocketFlowLayoutPanel.Controls.Add(this.pocketGroupBox); + this.pocketFlowLayoutPanel.Location = new System.Drawing.Point(269, 143); + this.pocketFlowLayoutPanel.Name = "pocketFlowLayoutPanel"; + this.pocketFlowLayoutPanel.Size = new System.Drawing.Size(260, 134); + this.pocketFlowLayoutPanel.TabIndex = 12; + // + // pocketGroupBox + // + this.pocketGroupBox.Controls.Add(this.battlePocketComboBox); + this.pocketGroupBox.Controls.Add(this.fieldPocketLabel); + this.pocketGroupBox.Controls.Add(this.fieldPocketComboBox); + this.pocketGroupBox.Controls.Add(this.battlePocketLabel); + this.pocketGroupBox.Location = new System.Drawing.Point(3, 3); + this.pocketGroupBox.Name = "pocketGroupBox"; + this.pocketGroupBox.Size = new System.Drawing.Size(257, 131); + this.pocketGroupBox.TabIndex = 0; + this.pocketGroupBox.TabStop = false; + this.pocketGroupBox.Text = "Pocket Data"; + // + // moveRelatedFlowLayoutPanel + // + this.tableLayoutPanel1.SetColumnSpan(this.moveRelatedFlowLayoutPanel, 2); + this.moveRelatedFlowLayoutPanel.Controls.Add(this.moveRelatedGroupBox); + this.moveRelatedFlowLayoutPanel.Location = new System.Drawing.Point(3, 283); + this.moveRelatedFlowLayoutPanel.Name = "moveRelatedFlowLayoutPanel"; + this.moveRelatedFlowLayoutPanel.Size = new System.Drawing.Size(526, 134); + this.moveRelatedFlowLayoutPanel.TabIndex = 13; + // + // moveRelatedGroupBox + // + this.moveRelatedGroupBox.Controls.Add(this.flingPowerNumericUpDown); + this.moveRelatedGroupBox.Controls.Add(this.pluckEffectNumericUpDown); + this.moveRelatedGroupBox.Controls.Add(this.flingPowerLabel); + this.moveRelatedGroupBox.Controls.Add(this.pluckEffectLabel); + this.moveRelatedGroupBox.Controls.Add(this.flingEffectNumericUpDown); + this.moveRelatedGroupBox.Controls.Add(this.naturalGiftPowerNumericUpDown); + this.moveRelatedGroupBox.Controls.Add(this.flingEffectLabel); + this.moveRelatedGroupBox.Controls.Add(this.naturalGiftPowerLabel); + this.moveRelatedGroupBox.Controls.Add(this.naturalGiftTypeLabel); + this.moveRelatedGroupBox.Controls.Add(this.naturalGiftTypeComboBox); + this.moveRelatedGroupBox.Location = new System.Drawing.Point(3, 3); + this.moveRelatedGroupBox.Name = "moveRelatedGroupBox"; + this.moveRelatedGroupBox.Size = new System.Drawing.Size(523, 131); + this.moveRelatedGroupBox.TabIndex = 0; + 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; + this.flingPowerNumericUpDown.Location = new System.Drawing.Point(389, 105); + this.flingPowerNumericUpDown.Name = "flingPowerNumericUpDown"; + this.flingPowerNumericUpDown.Size = new System.Drawing.Size(120, 20); + this.flingPowerNumericUpDown.TabIndex = 18; + this.flingPowerNumericUpDown.ValueChanged += new System.EventHandler(this.flingPowerNumericUpDown_ValueChanged); + // + // pluckEffectNumericUpDown + // + this.pluckEffectNumericUpDown.Anchor = System.Windows.Forms.AnchorStyles.None; + this.pluckEffectNumericUpDown.Location = new System.Drawing.Point(389, 28); + this.pluckEffectNumericUpDown.Name = "pluckEffectNumericUpDown"; + this.pluckEffectNumericUpDown.Size = new System.Drawing.Size(120, 20); + this.pluckEffectNumericUpDown.TabIndex = 17; + this.pluckEffectNumericUpDown.ValueChanged += new System.EventHandler(this.pluckEffectNumericUpDown_ValueChanged); + // + // flingPowerLabel + // + this.flingPowerLabel.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.flingPowerLabel.AutoSize = true; + this.flingPowerLabel.Location = new System.Drawing.Point(306, 107); + this.flingPowerLabel.Name = "flingPowerLabel"; + this.flingPowerLabel.Size = new System.Drawing.Size(62, 13); + this.flingPowerLabel.TabIndex = 16; + this.flingPowerLabel.Text = "Fling Power"; + this.flingPowerLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // pluckEffectLabel + // + this.pluckEffectLabel.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.pluckEffectLabel.AutoSize = true; + this.pluckEffectLabel.Location = new System.Drawing.Point(307, 31); + this.pluckEffectLabel.Name = "pluckEffectLabel"; + this.pluckEffectLabel.Size = new System.Drawing.Size(65, 13); + this.pluckEffectLabel.TabIndex = 15; + this.pluckEffectLabel.Text = "Pluck Effect"; + this.pluckEffectLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // checksFlowLayoutPanel + // + this.checksFlowLayoutPanel.Controls.Add(this.checksGroupBox); + this.checksFlowLayoutPanel.Location = new System.Drawing.Point(535, 143); + this.checksFlowLayoutPanel.Name = "checksFlowLayoutPanel"; + this.checksFlowLayoutPanel.Size = new System.Drawing.Size(260, 134); + this.checksFlowLayoutPanel.TabIndex = 14; + // + // checksGroupBox + // + this.checksGroupBox.Controls.Add(this.canSelectCheckBox); + this.checksGroupBox.Controls.Add(this.preventTossCheckBox); + this.checksGroupBox.Location = new System.Drawing.Point(3, 3); + this.checksGroupBox.Name = "checksGroupBox"; + this.checksGroupBox.Size = new System.Drawing.Size(257, 131); + this.checksGroupBox.TabIndex = 0; + 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; + this.canSelectCheckBox.Location = new System.Drawing.Point(17, 77); + this.canSelectCheckBox.Name = "canSelectCheckBox"; + this.canSelectCheckBox.Size = new System.Drawing.Size(76, 17); + this.canSelectCheckBox.TabIndex = 1; + this.canSelectCheckBox.Text = "Selectable"; + this.canSelectCheckBox.UseVisualStyleBackColor = true; + this.canSelectCheckBox.CheckedChanged += new System.EventHandler(this.canSelectCheckBox_CheckedChanged); + // + // ItemEditor + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1089, 587); + this.Controls.Add(this.tableLayoutPanel1); + this.Name = "ItemEditor"; + this.Text = "ItemEditor"; + ((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(); + ((System.ComponentModel.ISupportInitialize)(this.holdEffectParameterNumericUpDown)).EndInit(); + this.pocketFlowLayoutPanel.ResumeLayout(false); + this.pocketGroupBox.ResumeLayout(false); + this.pocketGroupBox.PerformLayout(); + 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(); + this.checksFlowLayoutPanel.ResumeLayout(false); + this.checksGroupBox.ResumeLayout(false); + this.checksGroupBox.PerformLayout(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.NumericUpDown itemNumberNumericUpDown; + private System.Windows.Forms.ComboBox holdEffectComboBox; + private System.Windows.Forms.ComboBox fieldPocketComboBox; + private System.Windows.Forms.ComboBox battlePocketComboBox; + private System.Windows.Forms.ComboBox itemNameInputComboBox; + private System.Windows.Forms.NumericUpDown priceNumericUpDown; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; + private System.Windows.Forms.Label holdEffectLabel; + private System.Windows.Forms.Label fieldPocketLabel; + private System.Windows.Forms.Label battlePocketLabel; + private System.Windows.Forms.Label priceLabel; + private System.Windows.Forms.Button saveDataButton; + private System.Windows.Forms.Label holdEffectParameterLabel; + private System.Windows.Forms.FlowLayoutPanel holdFlowLayoutPanel; + private System.Windows.Forms.GroupBox holdGroupBox; + private System.Windows.Forms.NumericUpDown holdEffectParameterNumericUpDown; + private System.Windows.Forms.FlowLayoutPanel pocketFlowLayoutPanel; + private System.Windows.Forms.GroupBox pocketGroupBox; + private System.Windows.Forms.FlowLayoutPanel moveRelatedFlowLayoutPanel; + private System.Windows.Forms.GroupBox moveRelatedGroupBox; + private System.Windows.Forms.Label naturalGiftTypeLabel; + private System.Windows.Forms.ComboBox naturalGiftTypeComboBox; + private System.Windows.Forms.Label flingEffectLabel; + private System.Windows.Forms.Label naturalGiftPowerLabel; + private System.Windows.Forms.NumericUpDown flingPowerNumericUpDown; + private System.Windows.Forms.NumericUpDown pluckEffectNumericUpDown; + private System.Windows.Forms.Label flingPowerLabel; + private System.Windows.Forms.Label pluckEffectLabel; + private System.Windows.Forms.NumericUpDown flingEffectNumericUpDown; + private System.Windows.Forms.NumericUpDown naturalGiftPowerNumericUpDown; + private System.Windows.Forms.FlowLayoutPanel checksFlowLayoutPanel; + private System.Windows.Forms.GroupBox checksGroupBox; + private System.Windows.Forms.CheckBox preventTossCheckBox; + private System.Windows.Forms.CheckBox canSelectCheckBox; + } +} \ No newline at end of file diff --git a/DS_Map/Editors/ItemEditor.cs b/DS_Map/Editors/ItemEditor.cs new file mode 100644 index 0000000..9f40fa8 --- /dev/null +++ b/DS_Map/Editors/ItemEditor.cs @@ -0,0 +1,331 @@ +using DSPRE.Resources; +using DSPRE.ROMFiles; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Net.Sockets; +using System.Text; +using System.Windows.Forms; +using MessageBox = System.Windows.Forms.MessageBox; + +namespace DSPRE.Editors +{ + public partial class ItemEditor : Form + { + + private string[] itemFileNames; + //private readonly string[] itemDescriptions; + + private int currentLoadedId = 0; + private ItemData currentLoadedFile = null; + + private static bool dirty = false; + private static readonly string formName = "Item Data Editor"; + + public ItemEditor(string[] itemFileNames) //, string[] itemDescriptions) + { + int killCount = 0; + List cleanNames = itemFileNames.ToList(); + for (int i = 0; i < itemFileNames.Length; i++) + { + if (itemFileNames[i] == null || itemFileNames[i] == "???") + { + cleanNames.RemoveAt(i-killCount); + killCount++; + } + } + this.itemFileNames = cleanNames.ToArray(); + //this.itemDescriptions = itemDescriptions; + + InitializeComponent(); + + Helpers.DisableHandlers(); + + // Set up max and min for numerics + priceNumericUpDown.Minimum = 0; + priceNumericUpDown.Maximum = 65535; + itemNumberNumericUpDown.Minimum = 1; + itemNumberNumericUpDown.Maximum = this.itemFileNames.Length - 1; + holdEffectParameterNumericUpDown.Minimum = 0; + holdEffectParameterNumericUpDown.Maximum = 255; + pluckEffectNumericUpDown.Minimum = 0; + pluckEffectNumericUpDown.Maximum = 255; + flingEffectNumericUpDown.Minimum = 0; + flingEffectNumericUpDown.Maximum = 255; + flingPowerNumericUpDown.Minimum = 0; + flingPowerNumericUpDown.Maximum = 255; + naturalGiftPowerNumericUpDown.Minimum = 0; + naturalGiftPowerNumericUpDown.Maximum = 255; + + // Set up combobox ranges + itemNameInputComboBox.Items.AddRange(this.itemFileNames); + holdEffectComboBox.Items.AddRange(Enum.GetNames(typeof(HoldEffect))); + fieldPocketComboBox.Items.AddRange(Enum.GetNames(typeof(FieldPocket))); + battlePocketComboBox.Items.AddRange(Enum.GetNames(typeof(BattlePocket))); + naturalGiftTypeComboBox.Items.AddRange(Enum.GetNames(typeof(NaturalGiftType))); + + Helpers.EnableHandlers(); + + itemNameInputComboBox.SelectedIndex = 1; + } + + private void setDirty(bool status) + { + if (status) + { + dirty = true; + this.Text = formName + "*"; + } + else + { + dirty = false; + this.Text = formName; + } + } + + private bool CheckDiscardChanges() + { + if (!dirty) + { + return true; + } + + DialogResult res = MessageBox.Show(this, "There are unsaved changes to the current Item data.\nDiscard and proceed?", "Unsaved changes", MessageBoxButtons.YesNo, MessageBoxIcon.Question); + if (res == DialogResult.Yes) + { + return true; + } + + itemNumberNumericUpDown.Value = currentLoadedId; + itemNameInputComboBox.SelectedIndex = currentLoadedId; + return false; + } + + private void ChangeLoadedFile(int toLoad) + { + Console.WriteLine("ItemEditor: ChangeLoadedFile: toLoad = " + toLoad); + currentLoadedId = toLoad; + currentLoadedFile = new ItemData(toLoad); + PopulateAllFromCurrentFile(); + setDirty(false); + } + + private void PopulateAllFromCurrentFile() + { + // Hold effects + holdEffectComboBox.SelectedIndex = (int)currentLoadedFile.holdEffect; + holdEffectParameterNumericUpDown.Value = currentLoadedFile.HoldEffectParam; + + // Pockets + fieldPocketComboBox.SelectedIndex = (int)currentLoadedFile.fieldPocket; + // Set the selected value for non sequential enums + BattlePocket battlePocket = (BattlePocket)currentLoadedFile.battlePocket; + string battlePocketEnum = Enum.GetName(typeof(BattlePocket), battlePocket); + battlePocketComboBox.SelectedItem = battlePocketEnum; + + // Move Related + // Set the selected value for non sequential enums + NaturalGiftType naturalGiftType = (NaturalGiftType)currentLoadedFile.naturalGiftType; + string naturalGiftTypeEnum = Enum.GetName(typeof(NaturalGiftType), naturalGiftType); + naturalGiftTypeComboBox.SelectedItem = naturalGiftTypeEnum; + naturalGiftPowerNumericUpDown.Value = currentLoadedFile.NaturalGiftPower; + flingEffectNumericUpDown.Value = currentLoadedFile.FlingEffect; + flingPowerNumericUpDown.Value = currentLoadedFile.FlingPower; + pluckEffectNumericUpDown.Value = currentLoadedFile.PluckEffect; + + // Checks + preventTossCheckBox.Checked = currentLoadedFile.PreventToss; + canSelectCheckBox.Checked = currentLoadedFile.Selectable; + + // Price + priceNumericUpDown.Value = currentLoadedFile.price; + + //descriptionTextBox.Text = itemDescriptions[currentLoadedId]; + } + + private void saveDataButton_Click(object sender, EventArgs e) + { + currentLoadedFile.SaveToFileDefaultDir(currentLoadedId, true); + setDirty(false); + } + + private void itemNameInputComboBox_SelectedIndexChanged(object sender, EventArgs e) + { + if (Helpers.HandlersDisabled) + { + return; + } + + Helpers.DisableHandlers(); + + if (CheckDiscardChanges()) + { + int newId = itemNameInputComboBox.SelectedIndex; + Console.WriteLine("ItemEditor: itemNameInputComboBox_SelectedIndexChanged: newId = " + newId); + itemNumberNumericUpDown.Value = newId; + ChangeLoadedFile(newId); + } + + Helpers.EnableHandlers(); + } + + private void itemNumberNumericUpDown_ValueChanged(object sender, EventArgs e) + { + if (Helpers.HandlersDisabled) + { + return; + } + + Helpers.DisableHandlers(); + + if (CheckDiscardChanges()) + { + int newId = (int)itemNumberNumericUpDown.Value; + itemNameInputComboBox.SelectedIndex = newId; + Console.WriteLine("ItemEditor: itemNumberNumericUpDown_ValueChanged: newId = " + newId); + ChangeLoadedFile(newId); + } + + Helpers.EnableHandlers(); + } + + private void saveToFileToolStripMenuItem_Click(object sender, EventArgs e) + { + string suggestedFilename = this.itemFileNames[currentLoadedId]; + currentLoadedFile.SaveToFileExplorePath(suggestedFilename, true); + } + + private void holdEffectComboBox_SelectedIndexChanged(object sender, EventArgs e) + { + if (Helpers.HandlersDisabled) + { + return; + } + + currentLoadedFile.holdEffect = (HoldEffect)holdEffectComboBox.SelectedIndex; + setDirty(true); + } + + private void fieldPocketComboBox_SelectedIndexChanged(object sender, EventArgs e) + { + if (Helpers.HandlersDisabled) + { + return; + } + + currentLoadedFile.fieldPocket = (FieldPocket)fieldPocketComboBox.SelectedIndex; + setDirty(true); + } + + private void battlePocketComboBox_SelectedIndexChanged(object sender, EventArgs e) + { + if (Helpers.HandlersDisabled) + { + return; + } + + currentLoadedFile.battlePocket = (BattlePocket)battlePocketComboBox.SelectedValue; + setDirty(true); + } + + private void priceNumericUpDown_ValueChanged(object sender, EventArgs e) + { + if (Helpers.HandlersDisabled) + { + return; + } + + currentLoadedFile.price = (ushort)priceNumericUpDown.Value; + setDirty(true); + } + + private void holdEffectParameterNumericUpDown_ValueChanged(object sender, EventArgs e) + { + if (Helpers.HandlersDisabled) + { + return; + } + + currentLoadedFile.HoldEffectParam = (byte)holdEffectParameterNumericUpDown.Value; + setDirty(true); + } + + private void naturalGiftTypeComboBox_SelectedIndexChanged(object sender, EventArgs e) + { + if (Helpers.HandlersDisabled) + { + return; + } + + currentLoadedFile.naturalGiftType = (NaturalGiftType)naturalGiftTypeComboBox.SelectedIndex; + setDirty(true); + } + + private void naturalGiftPowerNumericUpDown_ValueChanged(object sender, EventArgs e) + { + if (Helpers.HandlersDisabled) + { + return; + } + + currentLoadedFile.NaturalGiftPower = (byte)naturalGiftPowerNumericUpDown.Value; + setDirty(true); + } + + private void pluckEffectNumericUpDown_ValueChanged(object sender, EventArgs e) + { + if (Helpers.HandlersDisabled) + { + return; + } + + currentLoadedFile.PluckEffect = (byte)pluckEffectNumericUpDown.Value; + setDirty(true); + } + + private void flingEffectNumericUpDown_ValueChanged(object sender, EventArgs e) + { + if (Helpers.HandlersDisabled) + { + return; + } + + currentLoadedFile.FlingEffect = (byte)flingEffectNumericUpDown.Value; + setDirty(true); + } + + private void flingPowerNumericUpDown_ValueChanged(object sender, EventArgs e) + { + if (Helpers.HandlersDisabled) + { + return; + } + + currentLoadedFile.FlingPower = (byte)flingPowerNumericUpDown.Value; + setDirty(true); + } + + private void preventTossCheckBox_CheckedChanged(object sender, EventArgs e) + { + if (Helpers.HandlersDisabled) + { + return; + } + + currentLoadedFile.PreventToss = preventTossCheckBox.Checked; + setDirty(true); + } + + private void canSelectCheckBox_CheckedChanged(object sender, EventArgs e) + { + if (Helpers.HandlersDisabled) + { + return; + } + + currentLoadedFile.Selectable = canSelectCheckBox.Checked; + setDirty(true); + } + } +} diff --git a/DS_Map/Editors/ItemEditor.resx b/DS_Map/Editors/ItemEditor.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/DS_Map/Editors/ItemEditor.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/DS_Map/Editors/PokemonEditor.Designer.cs b/DS_Map/Editors/PokemonEditor.Designer.cs index 3cb3475..29a8fc4 100644 --- a/DS_Map/Editors/PokemonEditor.Designer.cs +++ b/DS_Map/Editors/PokemonEditor.Designer.cs @@ -23,15 +23,16 @@ /// the contents of this method with the code editor. /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PokemonEditor)); this.tabControl = new System.Windows.Forms.TabControl(); this.personalPage = new System.Windows.Forms.TabPage(); this.learnsetPage = new System.Windows.Forms.TabPage(); this.evoPage = new System.Windows.Forms.TabPage(); - this.syncChangesCheckbox = new System.Windows.Forms.CheckBox(); - this.syncChangesLabel = new System.Windows.Forms.Label(); - this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.spritePage = new System.Windows.Forms.TabPage(); + this.syncChangesCheckbox = new System.Windows.Forms.CheckBox(); + this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); + this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.tabControl.SuspendLayout(); this.flowLayoutPanel1.SuspendLayout(); this.SuspendLayout(); @@ -56,7 +57,7 @@ this.personalPage.Location = new System.Drawing.Point(4, 22); this.personalPage.Name = "personalPage"; this.personalPage.Padding = new System.Windows.Forms.Padding(3); - this.personalPage.Size = new System.Drawing.Size(1024, 534); + this.personalPage.Size = new System.Drawing.Size(1024, 817); this.personalPage.TabIndex = 0; this.personalPage.Text = "Personal Editor"; this.personalPage.UseVisualStyleBackColor = true; @@ -66,7 +67,7 @@ this.learnsetPage.Location = new System.Drawing.Point(4, 22); this.learnsetPage.Name = "learnsetPage"; this.learnsetPage.Padding = new System.Windows.Forms.Padding(3); - this.learnsetPage.Size = new System.Drawing.Size(1024, 526); + this.learnsetPage.Size = new System.Drawing.Size(1024, 817); this.learnsetPage.TabIndex = 1; this.learnsetPage.Text = "Learnset Editor"; this.learnsetPage.UseVisualStyleBackColor = true; @@ -76,11 +77,21 @@ this.evoPage.Location = new System.Drawing.Point(4, 22); this.evoPage.Name = "evoPage"; this.evoPage.Padding = new System.Windows.Forms.Padding(3); - this.evoPage.Size = new System.Drawing.Size(1024, 526); + this.evoPage.Size = new System.Drawing.Size(1024, 817); this.evoPage.TabIndex = 2; this.evoPage.Text = "Evolution Editor"; this.evoPage.UseVisualStyleBackColor = true; // + // spritePage + // + this.spritePage.Location = new System.Drawing.Point(4, 22); + this.spritePage.Name = "spritePage"; + this.spritePage.Padding = new System.Windows.Forms.Padding(3); + this.spritePage.Size = new System.Drawing.Size(1024, 817); + this.spritePage.TabIndex = 3; + this.spritePage.Text = "Sprite Editor"; + this.spritePage.UseVisualStyleBackColor = true; + // // syncChangesCheckbox // this.syncChangesCheckbox.AutoSize = true; @@ -91,42 +102,17 @@ this.syncChangesCheckbox.TabIndex = 1; this.syncChangesCheckbox.Text = "Synchronize Pokémon selection"; this.syncChangesCheckbox.UseVisualStyleBackColor = true; - // - // syncChangesLabel - // - this.syncChangesLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.syncChangesLabel.AutoSize = true; - this.syncChangesLabel.Dock = System.Windows.Forms.DockStyle.Bottom; - this.syncChangesLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.syncChangesLabel.ForeColor = System.Drawing.SystemColors.Highlight; - this.syncChangesLabel.Location = new System.Drawing.Point(186, 10); - this.syncChangesLabel.Name = "syncChangesLabel"; - this.syncChangesLabel.Size = new System.Drawing.Size(433, 13); - this.syncChangesLabel.TabIndex = 2; - this.syncChangesLabel.Text = "When this CheckBox is marked, mon selection will be synchronized accross all tabs" + - " below."; // // flowLayoutPanel1 // this.flowLayoutPanel1.AutoSize = true; this.flowLayoutPanel1.Controls.Add(this.syncChangesCheckbox); - this.flowLayoutPanel1.Controls.Add(this.syncChangesLabel); this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Top; this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; this.flowLayoutPanel1.Size = new System.Drawing.Size(1032, 23); this.flowLayoutPanel1.TabIndex = 3; // - // spritePage - // - this.spritePage.Location = new System.Drawing.Point(4, 22); - this.spritePage.Name = "spritePage"; - this.spritePage.Padding = new System.Windows.Forms.Padding(3); - this.spritePage.Size = new System.Drawing.Size(1024, 817); - this.spritePage.TabIndex = 3; - this.spritePage.Text = "Sprite Editor"; - this.spritePage.UseVisualStyleBackColor = true; - // // PokemonEditor // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -154,8 +140,8 @@ private System.Windows.Forms.TabPage learnsetPage; private System.Windows.Forms.TabPage evoPage; private System.Windows.Forms.CheckBox syncChangesCheckbox; - private System.Windows.Forms.Label syncChangesLabel; private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; private System.Windows.Forms.TabPage spritePage; + private System.Windows.Forms.ToolTip toolTip1; } } \ No newline at end of file diff --git a/DS_Map/Editors/PokemonEditor.cs b/DS_Map/Editors/PokemonEditor.cs index e32e80f..196cbb7 100644 --- a/DS_Map/Editors/PokemonEditor.cs +++ b/DS_Map/Editors/PokemonEditor.cs @@ -41,8 +41,10 @@ namespace DSPRE { spriteEditor.TopLevel = false; spriteEditor.Show(); spritePage.Controls.Add(spriteEditor); - spritePage.Enabled = false; - spritePage.Visible = false; + //spritePage.Enabled = false; + //spritePage.Visible = false; + + toolTip1.SetToolTip(syncChangesCheckbox, "When this CheckBox is marked, mon selection will be synchronized accross all tabs below."); } public void TrySyncIndices(ComboBox sender) { diff --git a/DS_Map/Editors/PokemonEditor.resx b/DS_Map/Editors/PokemonEditor.resx index f6489bb..3744d74 100644 --- a/DS_Map/Editors/PokemonEditor.resx +++ b/DS_Map/Editors/PokemonEditor.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + diff --git a/DS_Map/Editors/PokemonSpriteEditor.cs b/DS_Map/Editors/PokemonSpriteEditor.cs index 006d40b..48c322d 100644 --- a/DS_Map/Editors/PokemonSpriteEditor.cs +++ b/DS_Map/Editors/PokemonSpriteEditor.cs @@ -103,6 +103,7 @@ namespace DSPRE.Editors Button SaveSingle; Button MakeShiny; Button OpenOther; + Button SaveChanges; NarcReader nr; PictureBox[,] Display; @@ -350,6 +351,7 @@ namespace DSPRE.Editors SaveSingle = new Button(); MakeShiny = new Button(); OpenOther = new Button(); + SaveChanges = new Button(); lblMale = new Label(); lblFemale = new Label(); @@ -449,6 +451,12 @@ namespace DSPRE.Editors MakeShiny.Text = "Create Shiny Palette"; MakeShiny.Click += (MakeShiny_Click); + SaveChanges.Location = new Point(754, 8); + SaveChanges.Name = "SaveChanges"; + SaveChanges.Size = new Size(70, 21); + SaveChanges.Text = "Save Changes"; + SaveChanges.Click += (SaveChanges_Click); + lblFemale.Text = "Female"; lblFemale.Location = new Point(232, 36); Controls.Add(lblFemale); @@ -485,6 +493,7 @@ namespace DSPRE.Editors Controls.Add(SaveSingle); Controls.Add(MakeShiny); Controls.Add(OpenOther); + Controls.Add(SaveChanges); AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; Width = 760; Height = 808; @@ -492,6 +501,7 @@ namespace DSPRE.Editors FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; MaximizeBox = false; OpenPngs.Enabled = false; + OpenOther.Visible = false; } void IndexBox_SelectedIndexChanged(object sender, EventArgs e) @@ -987,7 +997,7 @@ namespace DSPRE.Editors OpenPngs.Enabled = true; } - void menuItem8_Click(object sender, EventArgs e) + void SaveChanges_Click(object sender, EventArgs e) { if (OpenPngs.Enabled == false) return; diff --git a/DS_Map/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs index 96136ce..50602e5 100644 --- a/DS_Map/Main Window.Designer.cs +++ b/DS_Map/Main Window.Designer.cs @@ -30,22 +30,22 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainProgram)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle49 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle50 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle51 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle52 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle53 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle54 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle55 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle56 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle57 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle58 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle59 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle60 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle61 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle62 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle63 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle64 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); this.mainTabControl = new System.Windows.Forms.TabControl(); this.headerEditorTabPage = new System.Windows.Forms.TabPage(); this.removeLastHeaderBTN = new System.Windows.Forms.Button(); @@ -167,21 +167,27 @@ this.weatherPicLabel = new System.Windows.Forms.Label(); this.weatherPictureBox = new System.Windows.Forms.PictureBox(); this.matrixEditorTabPage = new System.Windows.Forms.TabPage(); - this.setSpawnPointButton = new System.Windows.Forms.Button(); - this.saveMatrixButton = new System.Windows.Forms.Button(); - this.locateCurrentMatrixFile = new System.Windows.Forms.Button(); - this.resetColorTableButton = new System.Windows.Forms.Button(); - this.importColorTableButton = new System.Windows.Forms.Button(); - this.importMatrixButton = new System.Windows.Forms.Button(); - this.exportMatrixButton = new System.Windows.Forms.Button(); - this.removeMatrixButton = new System.Windows.Forms.Button(); - this.addMatrixButton = new System.Windows.Forms.Button(); - this.removeHeightsButton = new System.Windows.Forms.Button(); - this.removeHeadersButton = new System.Windows.Forms.Button(); - this.addHeightsButton = new System.Windows.Forms.Button(); - this.addHeadersButton = new System.Windows.Forms.Button(); + this.panel1 = new System.Windows.Forms.Panel(); this.labelMatrices = new System.Windows.Forms.Label(); + this.setSpawnPointButton = new System.Windows.Forms.Button(); + this.selectMatrixComboBox = new System.Windows.Forms.ComboBox(); + this.saveMatrixButton = new System.Windows.Forms.Button(); this.matrixNameLabel = new System.Windows.Forms.Label(); + this.locateCurrentMatrixFile = new System.Windows.Forms.Button(); + this.matrixNameTextBox = new System.Windows.Forms.TextBox(); + this.resetColorTableButton = new System.Windows.Forms.Button(); + this.widthLabel = new System.Windows.Forms.Label(); + this.importColorTableButton = new System.Windows.Forms.Button(); + this.widthUpDown = new System.Windows.Forms.NumericUpDown(); + this.importMatrixButton = new System.Windows.Forms.Button(); + this.heightUpDown = new System.Windows.Forms.NumericUpDown(); + this.exportMatrixButton = new System.Windows.Forms.Button(); + this.addHeadersButton = new System.Windows.Forms.Button(); + this.removeMatrixButton = new System.Windows.Forms.Button(); + this.addHeightsButton = new System.Windows.Forms.Button(); + this.addMatrixButton = new System.Windows.Forms.Button(); + this.removeHeadersButton = new System.Windows.Forms.Button(); + this.removeHeightsButton = new System.Windows.Forms.Button(); this.matrixTabControl = new System.Windows.Forms.TabControl(); this.headersTabPage = new System.Windows.Forms.TabPage(); this.headersGridView = new System.Windows.Forms.DataGridView(); @@ -189,12 +195,12 @@ this.heightsGridView = new System.Windows.Forms.DataGridView(); this.mapFilesTabPage = new System.Windows.Forms.TabPage(); this.mapFilesGridView = new System.Windows.Forms.DataGridView(); - this.matrixNameTextBox = new System.Windows.Forms.TextBox(); - this.heightUpDown = new System.Windows.Forms.NumericUpDown(); - this.widthUpDown = new System.Windows.Forms.NumericUpDown(); - this.widthLabel = new System.Windows.Forms.Label(); - this.selectMatrixComboBox = new System.Windows.Forms.ComboBox(); this.mapEditorTabPage = new System.Windows.Forms.TabPage(); + this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); + this.mapScreenshotButton = new System.Windows.Forms.Button(); + this.wireframeCheckBox = new System.Windows.Forms.CheckBox(); + this.radio3D = new System.Windows.Forms.RadioButton(); + this.radio2D = new System.Windows.Forms.RadioButton(); this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); this.addMapFileButton = new System.Windows.Forms.Button(); this.locateCurrentMapBin = new System.Windows.Forms.Button(); @@ -202,7 +208,6 @@ this.replaceMapBinButton = new System.Windows.Forms.Button(); this.exportCurrentMapBinButton = new System.Windows.Forms.Button(); this.saveMapButton = new System.Windows.Forms.Button(); - this.mapScreenshotButton = new System.Windows.Forms.Button(); this.mapRenderPanel = new System.Windows.Forms.Panel(); this.mapOpenGlControl = new Tao.Platform.Windows.SimpleOpenGlControl(); this.movPictureBox = new System.Windows.Forms.PictureBox(); @@ -297,9 +302,6 @@ this.unsupportedBGSEditLBL = new System.Windows.Forms.Label(); this.soundPlatesImportButton = new System.Windows.Forms.Button(); this.soundPlatesExportButton = new System.Windows.Forms.Button(); - this.radio3D = new System.Windows.Forms.RadioButton(); - this.radio2D = new System.Windows.Forms.RadioButton(); - this.wireframeCheckBox = new System.Windows.Forms.CheckBox(); this.nsbtxEditorTabPage = new System.Windows.Forms.TabPage(); this.groupBox7 = new System.Windows.Forms.GroupBox(); this.tableLayoutPanel37 = new System.Windows.Forms.TableLayoutPanel(); @@ -823,6 +825,7 @@ this.overlayEditorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.spawnEditorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.moveDataEditorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.flyWarpEditorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.aboutToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.statusLabel = new System.Windows.Forms.ToolStripStatusLabel(); @@ -858,9 +861,7 @@ this.weatherMapEditor = new System.Windows.Forms.ToolStripButton(); this.versionLabel = new System.Windows.Forms.Label(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); - this.panel1 = new System.Windows.Forms.Panel(); - this.flyWarpEditorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.itemEditorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mainTabControl.SuspendLayout(); this.headerEditorTabPage.SuspendLayout(); this.worldmapCoordsGroupBox.SuspendLayout(); @@ -890,6 +891,9 @@ ((System.ComponentModel.ISupportInitialize)(this.cameraPictureBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.weatherPictureBox)).BeginInit(); this.matrixEditorTabPage.SuspendLayout(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.widthUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.heightUpDown)).BeginInit(); this.matrixTabControl.SuspendLayout(); this.headersTabPage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.headersGridView)).BeginInit(); @@ -897,9 +901,8 @@ ((System.ComponentModel.ISupportInitialize)(this.heightsGridView)).BeginInit(); this.mapFilesTabPage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.mapFilesGridView)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.heightUpDown)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.widthUpDown)).BeginInit(); this.mapEditorTabPage.SuspendLayout(); + this.flowLayoutPanel1.SuspendLayout(); this.tableLayoutPanel3.SuspendLayout(); this.mapRenderPanel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.movPictureBox)).BeginInit(); @@ -1100,8 +1103,6 @@ this.menuStrip1.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.mainToolStrip.SuspendLayout(); - this.flowLayoutPanel1.SuspendLayout(); - this.panel1.SuspendLayout(); this.SuspendLayout(); // // mainTabControl @@ -2531,6 +2532,44 @@ this.matrixEditorTabPage.TabIndex = 1; this.matrixEditorTabPage.Text = "Matrix Editor"; // + // panel1 + // + this.panel1.Controls.Add(this.labelMatrices); + this.panel1.Controls.Add(this.setSpawnPointButton); + this.panel1.Controls.Add(this.selectMatrixComboBox); + this.panel1.Controls.Add(this.saveMatrixButton); + this.panel1.Controls.Add(this.matrixNameLabel); + this.panel1.Controls.Add(this.locateCurrentMatrixFile); + this.panel1.Controls.Add(this.matrixNameTextBox); + this.panel1.Controls.Add(this.resetColorTableButton); + this.panel1.Controls.Add(this.widthLabel); + this.panel1.Controls.Add(this.importColorTableButton); + this.panel1.Controls.Add(this.widthUpDown); + this.panel1.Controls.Add(this.importMatrixButton); + this.panel1.Controls.Add(this.heightUpDown); + this.panel1.Controls.Add(this.exportMatrixButton); + this.panel1.Controls.Add(this.addHeadersButton); + this.panel1.Controls.Add(this.removeMatrixButton); + this.panel1.Controls.Add(this.addHeightsButton); + this.panel1.Controls.Add(this.addMatrixButton); + this.panel1.Controls.Add(this.removeHeadersButton); + this.panel1.Controls.Add(this.removeHeightsButton); + this.panel1.Dock = System.Windows.Forms.DockStyle.Left; + this.panel1.Location = new System.Drawing.Point(3, 3); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(134, 669); + this.panel1.TabIndex = 36; + // + // labelMatrices + // + this.labelMatrices.AutoSize = true; + this.labelMatrices.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.labelMatrices.Location = new System.Drawing.Point(3, 0); + this.labelMatrices.Name = "labelMatrices"; + this.labelMatrices.Size = new System.Drawing.Size(47, 13); + this.labelMatrices.TabIndex = 21; + this.labelMatrices.Text = "Matrices"; + // // setSpawnPointButton // this.setSpawnPointButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); @@ -2547,6 +2586,16 @@ this.setSpawnPointButton.UseVisualStyleBackColor = true; this.setSpawnPointButton.Click += new System.EventHandler(this.setSpawnPointButton_Click); // + // selectMatrixComboBox + // + this.selectMatrixComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.selectMatrixComboBox.FormattingEnabled = true; + this.selectMatrixComboBox.Location = new System.Drawing.Point(7, 16); + this.selectMatrixComboBox.Name = "selectMatrixComboBox"; + this.selectMatrixComboBox.Size = new System.Drawing.Size(112, 21); + this.selectMatrixComboBox.TabIndex = 12; + this.selectMatrixComboBox.SelectedIndexChanged += new System.EventHandler(this.selectMatrixComboBox_SelectedIndexChanged); + // // saveMatrixButton // this.saveMatrixButton.Dock = System.Windows.Forms.DockStyle.Bottom; @@ -2562,6 +2611,16 @@ this.saveMatrixButton.UseVisualStyleBackColor = true; this.saveMatrixButton.Click += new System.EventHandler(this.saveMatrixButton_Click); // + // matrixNameLabel + // + this.matrixNameLabel.AutoSize = true; + this.matrixNameLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.matrixNameLabel.Location = new System.Drawing.Point(5, 49); + this.matrixNameLabel.Name = "matrixNameLabel"; + this.matrixNameLabel.Size = new System.Drawing.Size(64, 13); + this.matrixNameLabel.TabIndex = 20; + this.matrixNameLabel.Text = "Matrix name"; + // // locateCurrentMatrixFile // this.locateCurrentMatrixFile.Image = global::DSPRE.Properties.Resources.open_file; @@ -2573,6 +2632,15 @@ this.locateCurrentMatrixFile.UseVisualStyleBackColor = true; this.locateCurrentMatrixFile.Click += new System.EventHandler(this.locateCurrentMatrixFile_Click); // + // matrixNameTextBox + // + this.matrixNameTextBox.Location = new System.Drawing.Point(7, 65); + this.matrixNameTextBox.MaxLength = 16; + this.matrixNameTextBox.Name = "matrixNameTextBox"; + this.matrixNameTextBox.Size = new System.Drawing.Size(112, 20); + this.matrixNameTextBox.TabIndex = 17; + this.matrixNameTextBox.TextChanged += new System.EventHandler(this.matrixNameTextBox_TextChanged); + // // resetColorTableButton // this.resetColorTableButton.Image = global::DSPRE.Properties.Resources.resetColorTable; @@ -2587,6 +2655,16 @@ this.resetColorTableButton.UseVisualStyleBackColor = true; this.resetColorTableButton.Click += new System.EventHandler(this.resetColorTableButton_Click); // + // widthLabel + // + this.widthLabel.AutoSize = true; + this.widthLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.widthLabel.Location = new System.Drawing.Point(7, 98); + this.widthLabel.Name = "widthLabel"; + this.widthLabel.Size = new System.Drawing.Size(27, 13); + this.widthLabel.TabIndex = 13; + this.widthLabel.Text = "Size"; + // // importColorTableButton // this.importColorTableButton.Image = global::DSPRE.Properties.Resources.loadColorTable; @@ -2601,6 +2679,29 @@ this.importColorTableButton.UseVisualStyleBackColor = true; this.importColorTableButton.Click += new System.EventHandler(this.importColorTableButton_Click); // + // widthUpDown + // + this.widthUpDown.Location = new System.Drawing.Point(38, 95); + this.widthUpDown.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.widthUpDown.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.widthUpDown.Name = "widthUpDown"; + this.widthUpDown.Size = new System.Drawing.Size(37, 20); + this.widthUpDown.TabIndex = 15; + this.widthUpDown.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.widthUpDown.ValueChanged += new System.EventHandler(this.widthUpDown_ValueChanged); + // // importMatrixButton // this.importMatrixButton.Image = global::DSPRE.Properties.Resources.importArrow; @@ -2614,6 +2715,29 @@ this.importMatrixButton.UseVisualStyleBackColor = true; this.importMatrixButton.Click += new System.EventHandler(this.importMatrixButton_Click); // + // heightUpDown + // + this.heightUpDown.Location = new System.Drawing.Point(81, 95); + this.heightUpDown.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.heightUpDown.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.heightUpDown.Name = "heightUpDown"; + this.heightUpDown.Size = new System.Drawing.Size(37, 20); + this.heightUpDown.TabIndex = 16; + this.heightUpDown.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.heightUpDown.ValueChanged += new System.EventHandler(this.heightUpDown_ValueChanged); + // // exportMatrixButton // this.exportMatrixButton.Image = global::DSPRE.Properties.Resources.exportArrow; @@ -2627,6 +2751,19 @@ this.exportMatrixButton.UseVisualStyleBackColor = true; this.exportMatrixButton.Click += new System.EventHandler(this.exportMatrixButton_Click); // + // addHeadersButton + // + this.addHeadersButton.Image = ((System.Drawing.Image)(resources.GetObject("addHeadersButton.Image"))); + this.addHeadersButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.addHeadersButton.Location = new System.Drawing.Point(8, 280); + this.addHeadersButton.Name = "addHeadersButton"; + this.addHeadersButton.Size = new System.Drawing.Size(117, 35); + this.addHeadersButton.TabIndex = 23; + this.addHeadersButton.Text = "Add Header Tab"; + this.addHeadersButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.addHeadersButton.UseVisualStyleBackColor = true; + this.addHeadersButton.Click += new System.EventHandler(this.addHeaderSectionButton_Click); + // // removeMatrixButton // this.removeMatrixButton.Image = ((System.Drawing.Image)(resources.GetObject("removeMatrixButton.Image"))); @@ -2640,46 +2777,6 @@ this.removeMatrixButton.UseVisualStyleBackColor = true; this.removeMatrixButton.Click += new System.EventHandler(this.removeMatrixButton_Click); // - // addMatrixButton - // - this.addMatrixButton.Image = ((System.Drawing.Image)(resources.GetObject("addMatrixButton.Image"))); - this.addMatrixButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addMatrixButton.Location = new System.Drawing.Point(8, 180); - this.addMatrixButton.Name = "addMatrixButton"; - this.addMatrixButton.Size = new System.Drawing.Size(51, 35); - this.addMatrixButton.TabIndex = 2; - this.addMatrixButton.Text = "Add"; - this.addMatrixButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.addMatrixButton.UseVisualStyleBackColor = true; - this.addMatrixButton.Click += new System.EventHandler(this.addMatrixButton_Click); - // - // removeHeightsButton - // - this.removeHeightsButton.Image = ((System.Drawing.Image)(resources.GetObject("removeHeightsButton.Image"))); - this.removeHeightsButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeHeightsButton.Location = new System.Drawing.Point(8, 399); - this.removeHeightsButton.Margin = new System.Windows.Forms.Padding(2); - this.removeHeightsButton.Name = "removeHeightsButton"; - this.removeHeightsButton.Size = new System.Drawing.Size(117, 35); - this.removeHeightsButton.TabIndex = 26; - this.removeHeightsButton.Text = "Remove Heights"; - this.removeHeightsButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.removeHeightsButton.UseVisualStyleBackColor = true; - this.removeHeightsButton.Click += new System.EventHandler(this.removeHeightsButton_Click); - // - // removeHeadersButton - // - this.removeHeadersButton.Image = ((System.Drawing.Image)(resources.GetObject("removeHeadersButton.Image"))); - this.removeHeadersButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeHeadersButton.Location = new System.Drawing.Point(8, 320); - this.removeHeadersButton.Name = "removeHeadersButton"; - this.removeHeadersButton.Size = new System.Drawing.Size(117, 35); - this.removeHeadersButton.TabIndex = 25; - this.removeHeadersButton.Text = "Remove Headers"; - this.removeHeadersButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.removeHeadersButton.UseVisualStyleBackColor = true; - this.removeHeadersButton.Click += new System.EventHandler(this.removeHeadersButton_Click); - // // addHeightsButton // this.addHeightsButton.Image = ((System.Drawing.Image)(resources.GetObject("addHeightsButton.Image"))); @@ -2694,38 +2791,45 @@ this.addHeightsButton.UseVisualStyleBackColor = true; this.addHeightsButton.Click += new System.EventHandler(this.addHeightsButton_Click); // - // addHeadersButton + // addMatrixButton // - this.addHeadersButton.Image = ((System.Drawing.Image)(resources.GetObject("addHeadersButton.Image"))); - this.addHeadersButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addHeadersButton.Location = new System.Drawing.Point(8, 280); - this.addHeadersButton.Name = "addHeadersButton"; - this.addHeadersButton.Size = new System.Drawing.Size(117, 35); - this.addHeadersButton.TabIndex = 23; - this.addHeadersButton.Text = "Add Header Tab"; - this.addHeadersButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.addHeadersButton.UseVisualStyleBackColor = true; - this.addHeadersButton.Click += new System.EventHandler(this.addHeaderSectionButton_Click); + this.addMatrixButton.Image = ((System.Drawing.Image)(resources.GetObject("addMatrixButton.Image"))); + this.addMatrixButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.addMatrixButton.Location = new System.Drawing.Point(8, 180); + this.addMatrixButton.Name = "addMatrixButton"; + this.addMatrixButton.Size = new System.Drawing.Size(51, 35); + this.addMatrixButton.TabIndex = 2; + this.addMatrixButton.Text = "Add"; + this.addMatrixButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.addMatrixButton.UseVisualStyleBackColor = true; + this.addMatrixButton.Click += new System.EventHandler(this.addMatrixButton_Click); // - // labelMatrices + // removeHeadersButton // - this.labelMatrices.AutoSize = true; - this.labelMatrices.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.labelMatrices.Location = new System.Drawing.Point(3, 0); - this.labelMatrices.Name = "labelMatrices"; - this.labelMatrices.Size = new System.Drawing.Size(47, 13); - this.labelMatrices.TabIndex = 21; - this.labelMatrices.Text = "Matrices"; + this.removeHeadersButton.Image = ((System.Drawing.Image)(resources.GetObject("removeHeadersButton.Image"))); + this.removeHeadersButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.removeHeadersButton.Location = new System.Drawing.Point(8, 320); + this.removeHeadersButton.Name = "removeHeadersButton"; + this.removeHeadersButton.Size = new System.Drawing.Size(117, 35); + this.removeHeadersButton.TabIndex = 25; + this.removeHeadersButton.Text = "Remove Headers"; + this.removeHeadersButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.removeHeadersButton.UseVisualStyleBackColor = true; + this.removeHeadersButton.Click += new System.EventHandler(this.removeHeadersButton_Click); // - // matrixNameLabel + // removeHeightsButton // - this.matrixNameLabel.AutoSize = true; - this.matrixNameLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.matrixNameLabel.Location = new System.Drawing.Point(5, 49); - this.matrixNameLabel.Name = "matrixNameLabel"; - this.matrixNameLabel.Size = new System.Drawing.Size(64, 13); - this.matrixNameLabel.TabIndex = 20; - this.matrixNameLabel.Text = "Matrix name"; + this.removeHeightsButton.Image = ((System.Drawing.Image)(resources.GetObject("removeHeightsButton.Image"))); + this.removeHeightsButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.removeHeightsButton.Location = new System.Drawing.Point(8, 399); + this.removeHeightsButton.Margin = new System.Windows.Forms.Padding(2); + this.removeHeightsButton.Name = "removeHeightsButton"; + this.removeHeightsButton.Size = new System.Drawing.Size(117, 35); + this.removeHeightsButton.TabIndex = 26; + this.removeHeightsButton.Text = "Remove Heights"; + this.removeHeightsButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.removeHeightsButton.UseVisualStyleBackColor = true; + this.removeHeightsButton.Click += new System.EventHandler(this.removeHeightsButton_Click); // // matrixTabControl // @@ -2762,40 +2866,40 @@ this.headersGridView.AllowUserToResizeColumns = false; this.headersGridView.AllowUserToResizeRows = false; this.headersGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle49.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle49.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - dataGridViewCellStyle49.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle49.ForeColor = System.Drawing.SystemColors.Info; - dataGridViewCellStyle49.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle49.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle49.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.headersGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle49; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.Info; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.headersGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; this.headersGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle50.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle50.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle50.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle50.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle50.Format = "D4"; - dataGridViewCellStyle50.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle50.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle50.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.headersGridView.DefaultCellStyle = dataGridViewCellStyle50; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle2.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle2.Format = "D4"; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.headersGridView.DefaultCellStyle = dataGridViewCellStyle2; this.headersGridView.Location = new System.Drawing.Point(0, 0); this.headersGridView.MultiSelect = false; this.headersGridView.Name = "headersGridView"; - dataGridViewCellStyle51.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle51.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle51.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle51.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle51.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle51.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle51.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.headersGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle51; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.headersGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle3; this.headersGridView.RowHeadersWidth = 50; this.headersGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - dataGridViewCellStyle52.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle52.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.headersGridView.RowsDefaultCellStyle = dataGridViewCellStyle52; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle4.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.headersGridView.RowsDefaultCellStyle = dataGridViewCellStyle4; this.headersGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.headersGridView.RowTemplate.Height = 18; this.headersGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; @@ -2824,43 +2928,43 @@ this.heightsGridView.AllowUserToDeleteRows = false; this.heightsGridView.AllowUserToResizeColumns = false; this.heightsGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle53.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle53; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5; this.heightsGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle54.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle54.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle54.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle54.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle54.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle54.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle54.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.heightsGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle54; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle6.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.heightsGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6; this.heightsGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle55.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle55.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle55.Font = new System.Drawing.Font("Tahoma", 8.25F); - dataGridViewCellStyle55.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle55.Format = "D2"; - dataGridViewCellStyle55.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle55.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle55.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle55; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle7.Font = new System.Drawing.Font("Tahoma", 8.25F); + dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle7.Format = "D2"; + dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle7; this.heightsGridView.Location = new System.Drawing.Point(0, 0); this.heightsGridView.MultiSelect = false; this.heightsGridView.Name = "heightsGridView"; - dataGridViewCellStyle56.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle56.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle56.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle56.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle56.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle56.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle56.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.heightsGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle56; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle8.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.heightsGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle8; this.heightsGridView.RowHeadersWidth = 50; this.heightsGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - dataGridViewCellStyle57.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle57.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.heightsGridView.RowsDefaultCellStyle = dataGridViewCellStyle57; + dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle9.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.heightsGridView.RowsDefaultCellStyle = dataGridViewCellStyle9; this.heightsGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.heightsGridView.RowTemplate.Height = 18; this.heightsGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; @@ -2887,43 +2991,43 @@ this.mapFilesGridView.AllowUserToDeleteRows = false; this.mapFilesGridView.AllowUserToResizeColumns = false; this.mapFilesGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle58.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle58; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10; this.mapFilesGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle59.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle59.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle59.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle59.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle59.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle59.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle59.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mapFilesGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle59; + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle11.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.mapFilesGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11; this.mapFilesGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle60.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle60.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle60.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle60.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle60.Format = "D4"; - dataGridViewCellStyle60.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle60.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle60.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle60; + dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle12.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle12.Format = "D4"; + dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle12; this.mapFilesGridView.Location = new System.Drawing.Point(0, 0); this.mapFilesGridView.MultiSelect = false; this.mapFilesGridView.Name = "mapFilesGridView"; - dataGridViewCellStyle61.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle61.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle61.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle61.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle61.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle61.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle61.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mapFilesGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle61; + dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle13.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.mapFilesGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle13; this.mapFilesGridView.RowHeadersWidth = 50; this.mapFilesGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - dataGridViewCellStyle62.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle62.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.mapFilesGridView.RowsDefaultCellStyle = dataGridViewCellStyle62; + dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle14.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.mapFilesGridView.RowsDefaultCellStyle = dataGridViewCellStyle14; this.mapFilesGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.mapFilesGridView.RowTemplate.Height = 18; this.mapFilesGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; @@ -2935,81 +3039,6 @@ this.mapFilesGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.mapFilesGridView_CellValueChanged); this.mapFilesGridView.SelectionChanged += new System.EventHandler(this.mapFilesGridView_SelectionChanged); // - // matrixNameTextBox - // - this.matrixNameTextBox.Location = new System.Drawing.Point(7, 65); - this.matrixNameTextBox.MaxLength = 16; - this.matrixNameTextBox.Name = "matrixNameTextBox"; - this.matrixNameTextBox.Size = new System.Drawing.Size(112, 20); - this.matrixNameTextBox.TabIndex = 17; - this.matrixNameTextBox.TextChanged += new System.EventHandler(this.matrixNameTextBox_TextChanged); - // - // heightUpDown - // - this.heightUpDown.Location = new System.Drawing.Point(81, 95); - this.heightUpDown.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.heightUpDown.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.heightUpDown.Name = "heightUpDown"; - this.heightUpDown.Size = new System.Drawing.Size(37, 20); - this.heightUpDown.TabIndex = 16; - this.heightUpDown.Value = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.heightUpDown.ValueChanged += new System.EventHandler(this.heightUpDown_ValueChanged); - // - // widthUpDown - // - this.widthUpDown.Location = new System.Drawing.Point(38, 95); - this.widthUpDown.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.widthUpDown.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.widthUpDown.Name = "widthUpDown"; - this.widthUpDown.Size = new System.Drawing.Size(37, 20); - this.widthUpDown.TabIndex = 15; - this.widthUpDown.Value = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.widthUpDown.ValueChanged += new System.EventHandler(this.widthUpDown_ValueChanged); - // - // widthLabel - // - this.widthLabel.AutoSize = true; - this.widthLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.widthLabel.Location = new System.Drawing.Point(7, 98); - this.widthLabel.Name = "widthLabel"; - this.widthLabel.Size = new System.Drawing.Size(27, 13); - this.widthLabel.TabIndex = 13; - this.widthLabel.Text = "Size"; - // - // selectMatrixComboBox - // - this.selectMatrixComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.selectMatrixComboBox.FormattingEnabled = true; - this.selectMatrixComboBox.Location = new System.Drawing.Point(7, 16); - this.selectMatrixComboBox.Name = "selectMatrixComboBox"; - this.selectMatrixComboBox.Size = new System.Drawing.Size(112, 21); - this.selectMatrixComboBox.TabIndex = 12; - this.selectMatrixComboBox.SelectedIndexChanged += new System.EventHandler(this.selectMatrixComboBox_SelectedIndexChanged); - // // mapEditorTabPage // this.mapEditorTabPage.BackColor = System.Drawing.SystemColors.Window; @@ -3032,6 +3061,76 @@ this.mapEditorTabPage.Text = "Map Editor"; this.mapEditorTabPage.Enter += new System.EventHandler(this.mapEditorTabPage_Enter); // + // flowLayoutPanel1 + // + this.flowLayoutPanel1.Controls.Add(this.mapScreenshotButton); + this.flowLayoutPanel1.Controls.Add(this.wireframeCheckBox); + this.flowLayoutPanel1.Controls.Add(this.radio3D); + this.flowLayoutPanel1.Controls.Add(this.radio2D); + this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Right; + this.flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.BottomUp; + this.flowLayoutPanel1.Location = new System.Drawing.Point(1134, 3); + this.flowLayoutPanel1.Name = "flowLayoutPanel1"; + this.flowLayoutPanel1.Size = new System.Drawing.Size(48, 669); + this.flowLayoutPanel1.TabIndex = 42; + // + // mapScreenshotButton + // + this.mapScreenshotButton.Anchor = System.Windows.Forms.AnchorStyles.None; + this.mapScreenshotButton.Image = global::DSPRE.Properties.Resources.cameraIcon; + this.mapScreenshotButton.Location = new System.Drawing.Point(3, 626); + this.mapScreenshotButton.Name = "mapScreenshotButton"; + this.mapScreenshotButton.Size = new System.Drawing.Size(41, 40); + this.mapScreenshotButton.TabIndex = 39; + this.mapScreenshotButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.mapScreenshotButton.UseVisualStyleBackColor = true; + this.mapScreenshotButton.Click += new System.EventHandler(this.mapScreenshotButton_Click); + // + // wireframeCheckBox + // + this.wireframeCheckBox.Anchor = System.Windows.Forms.AnchorStyles.None; + this.wireframeCheckBox.Appearance = System.Windows.Forms.Appearance.Button; + this.wireframeCheckBox.AutoSize = true; + this.wireframeCheckBox.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.wireframeCheckBox.Location = new System.Drawing.Point(8, 597); + this.wireframeCheckBox.Name = "wireframeCheckBox"; + this.wireframeCheckBox.Size = new System.Drawing.Size(31, 23); + this.wireframeCheckBox.TabIndex = 27; + this.wireframeCheckBox.Text = " W"; + this.wireframeCheckBox.UseVisualStyleBackColor = true; + this.wireframeCheckBox.CheckedChanged += new System.EventHandler(this.wireframeCheckBox_CheckedChanged); + // + // radio3D + // + this.radio3D.Anchor = System.Windows.Forms.AnchorStyles.None; + this.radio3D.Appearance = System.Windows.Forms.Appearance.Button; + this.radio3D.AutoSize = true; + this.radio3D.Checked = true; + this.radio3D.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.radio3D.Location = new System.Drawing.Point(8, 568); + this.radio3D.Name = "radio3D"; + this.radio3D.Size = new System.Drawing.Size(31, 23); + this.radio3D.TabIndex = 26; + this.radio3D.TabStop = true; + this.radio3D.Text = "3D"; + this.radio3D.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.radio3D.UseVisualStyleBackColor = true; + // + // radio2D + // + this.radio2D.Anchor = System.Windows.Forms.AnchorStyles.None; + this.radio2D.Appearance = System.Windows.Forms.Appearance.Button; + this.radio2D.AutoSize = true; + this.radio2D.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.radio2D.Location = new System.Drawing.Point(8, 539); + this.radio2D.Name = "radio2D"; + this.radio2D.Size = new System.Drawing.Size(31, 23); + this.radio2D.TabIndex = 25; + this.radio2D.Text = "2D"; + this.radio2D.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.radio2D.UseVisualStyleBackColor = true; + this.radio2D.CheckedChanged += new System.EventHandler(this.radio2D_CheckedChanged); + // // tableLayoutPanel3 // this.tableLayoutPanel3.ColumnCount = 4; @@ -3141,18 +3240,6 @@ this.saveMapButton.UseVisualStyleBackColor = true; this.saveMapButton.Click += new System.EventHandler(this.saveMapButton_Click); // - // mapScreenshotButton - // - this.mapScreenshotButton.Anchor = System.Windows.Forms.AnchorStyles.None; - this.mapScreenshotButton.Image = global::DSPRE.Properties.Resources.cameraIcon; - this.mapScreenshotButton.Location = new System.Drawing.Point(3, 626); - this.mapScreenshotButton.Name = "mapScreenshotButton"; - this.mapScreenshotButton.Size = new System.Drawing.Size(41, 40); - this.mapScreenshotButton.TabIndex = 39; - this.mapScreenshotButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.mapScreenshotButton.UseVisualStyleBackColor = true; - this.mapScreenshotButton.Click += new System.EventHandler(this.mapScreenshotButton_Click); - // // mapRenderPanel // this.mapRenderPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; @@ -4343,51 +4430,6 @@ this.soundPlatesExportButton.UseVisualStyleBackColor = true; this.soundPlatesExportButton.Click += new System.EventHandler(this.soundPlatesExportButton_Click); // - // radio3D - // - this.radio3D.Anchor = System.Windows.Forms.AnchorStyles.None; - this.radio3D.Appearance = System.Windows.Forms.Appearance.Button; - this.radio3D.AutoSize = true; - this.radio3D.Checked = true; - this.radio3D.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.radio3D.Location = new System.Drawing.Point(8, 568); - this.radio3D.Name = "radio3D"; - this.radio3D.Size = new System.Drawing.Size(31, 23); - this.radio3D.TabIndex = 26; - this.radio3D.TabStop = true; - this.radio3D.Text = "3D"; - this.radio3D.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.radio3D.UseVisualStyleBackColor = true; - // - // radio2D - // - this.radio2D.Anchor = System.Windows.Forms.AnchorStyles.None; - this.radio2D.Appearance = System.Windows.Forms.Appearance.Button; - this.radio2D.AutoSize = true; - this.radio2D.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.radio2D.Location = new System.Drawing.Point(8, 539); - this.radio2D.Name = "radio2D"; - this.radio2D.Size = new System.Drawing.Size(31, 23); - this.radio2D.TabIndex = 25; - this.radio2D.Text = "2D"; - this.radio2D.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.radio2D.UseVisualStyleBackColor = true; - this.radio2D.CheckedChanged += new System.EventHandler(this.radio2D_CheckedChanged); - // - // wireframeCheckBox - // - this.wireframeCheckBox.Anchor = System.Windows.Forms.AnchorStyles.None; - this.wireframeCheckBox.Appearance = System.Windows.Forms.Appearance.Button; - this.wireframeCheckBox.AutoSize = true; - this.wireframeCheckBox.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.wireframeCheckBox.Location = new System.Drawing.Point(8, 597); - this.wireframeCheckBox.Name = "wireframeCheckBox"; - this.wireframeCheckBox.Size = new System.Drawing.Size(31, 23); - this.wireframeCheckBox.TabIndex = 27; - this.wireframeCheckBox.Text = " W"; - this.wireframeCheckBox.UseVisualStyleBackColor = true; - this.wireframeCheckBox.CheckedChanged += new System.EventHandler(this.wireframeCheckBox_CheckedChanged); - // // nsbtxEditorTabPage // this.nsbtxEditorTabPage.Controls.Add(this.groupBox7); @@ -7386,8 +7428,8 @@ this.textEditorDataGridView.Location = new System.Drawing.Point(12, 77); this.textEditorDataGridView.Name = "textEditorDataGridView"; this.textEditorDataGridView.RowHeadersWidth = 68; - dataGridViewCellStyle63.Font = new System.Drawing.Font("Consolas", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textEditorDataGridView.RowsDefaultCellStyle = dataGridViewCellStyle63; + dataGridViewCellStyle15.Font = new System.Drawing.Font("Consolas", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textEditorDataGridView.RowsDefaultCellStyle = dataGridViewCellStyle15; this.textEditorDataGridView.Size = new System.Drawing.Size(655, 406); this.textEditorDataGridView.TabIndex = 24; this.textEditorDataGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.textEditorDataGridView_CellValueChanged); @@ -7491,9 +7533,9 @@ this.cameraEditorDataGridView.CausesValidation = false; this.cameraEditorDataGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised; this.cameraEditorDataGridView.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle64.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle64.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.cameraEditorDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle64; + dataGridViewCellStyle16.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.cameraEditorDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle16; this.cameraEditorDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.cameraEditorDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.DistanceGVCol, @@ -10473,14 +10515,14 @@ // essentialToolStripMenuItem // this.essentialToolStripMenuItem.Name = "essentialToolStripMenuItem"; - this.essentialToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.essentialToolStripMenuItem.Size = new System.Drawing.Size(127, 22); this.essentialToolStripMenuItem.Text = "Essential"; this.essentialToolStripMenuItem.MouseDown += new System.Windows.Forms.MouseEventHandler(this.simpleToolStripMenuItem_MouseDown); // // simpleToolStripMenuItem // this.simpleToolStripMenuItem.Name = "simpleToolStripMenuItem"; - this.simpleToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.simpleToolStripMenuItem.Size = new System.Drawing.Size(127, 22); this.simpleToolStripMenuItem.Text = "Simple"; this.simpleToolStripMenuItem.MouseDown += new System.Windows.Forms.MouseEventHandler(this.simpleToolStripMenuItem_MouseDown); // @@ -10489,14 +10531,14 @@ this.advancedStripMenuItem.Checked = true; this.advancedStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.advancedStripMenuItem.Name = "advancedStripMenuItem"; - this.advancedStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.advancedStripMenuItem.Size = new System.Drawing.Size(127, 22); this.advancedStripMenuItem.Text = "Advanced"; this.advancedStripMenuItem.MouseDown += new System.Windows.Forms.MouseEventHandler(this.simpleToolStripMenuItem_MouseDown); // // fullViewToolStripMenuItem // this.fullViewToolStripMenuItem.Name = "fullViewToolStripMenuItem"; - this.fullViewToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.fullViewToolStripMenuItem.Size = new System.Drawing.Size(127, 22); this.fullViewToolStripMenuItem.Text = "Complete"; this.fullViewToolStripMenuItem.MouseDown += new System.Windows.Forms.MouseEventHandler(this.simpleToolStripMenuItem_MouseDown); // @@ -10507,7 +10549,8 @@ this.overlayEditorToolStripMenuItem, this.spawnEditorToolStripMenuItem, this.moveDataEditorToolStripMenuItem, - this.flyWarpEditorToolStripMenuItem}); + this.flyWarpEditorToolStripMenuItem, + this.itemEditorToolStripMenuItem}); this.otherEditorsToolStripMenuItem.Enabled = false; this.otherEditorsToolStripMenuItem.Name = "otherEditorsToolStripMenuItem"; this.otherEditorsToolStripMenuItem.Size = new System.Drawing.Size(88, 20); @@ -10516,31 +10559,38 @@ // personalDataEditorToolStripMenuItem // this.personalDataEditorToolStripMenuItem.Name = "personalDataEditorToolStripMenuItem"; - this.personalDataEditorToolStripMenuItem.Size = new System.Drawing.Size(174, 22); + this.personalDataEditorToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.personalDataEditorToolStripMenuItem.Text = "Pokémon Editor"; this.personalDataEditorToolStripMenuItem.Click += new System.EventHandler(this.pokemonDataEditorToolStripMenuItem_Click); // // overlayEditorToolStripMenuItem // this.overlayEditorToolStripMenuItem.Name = "overlayEditorToolStripMenuItem"; - this.overlayEditorToolStripMenuItem.Size = new System.Drawing.Size(174, 22); + this.overlayEditorToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.overlayEditorToolStripMenuItem.Text = "Overlay Editor"; this.overlayEditorToolStripMenuItem.Click += new System.EventHandler(this.overlayEditorToolStripMenuItem_Click); // // spawnEditorToolStripMenuItem // this.spawnEditorToolStripMenuItem.Name = "spawnEditorToolStripMenuItem"; - this.spawnEditorToolStripMenuItem.Size = new System.Drawing.Size(174, 22); + this.spawnEditorToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.spawnEditorToolStripMenuItem.Text = "Spawn Point Editor"; this.spawnEditorToolStripMenuItem.Click += new System.EventHandler(this.spawnEditorToolStripButton_Click); // // moveDataEditorToolStripMenuItem // this.moveDataEditorToolStripMenuItem.Name = "moveDataEditorToolStripMenuItem"; - this.moveDataEditorToolStripMenuItem.Size = new System.Drawing.Size(174, 22); + this.moveDataEditorToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.moveDataEditorToolStripMenuItem.Text = "Move Data Editor"; this.moveDataEditorToolStripMenuItem.Click += new System.EventHandler(this.moveDataEditorToolStripMenuItem_Click); // + // flyWarpEditorToolStripMenuItem + // + this.flyWarpEditorToolStripMenuItem.Name = "flyWarpEditorToolStripMenuItem"; + this.flyWarpEditorToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.flyWarpEditorToolStripMenuItem.Text = "Fly Warp Editor"; + this.flyWarpEditorToolStripMenuItem.Click += new System.EventHandler(this.flyWarpEditorToolStripMenuItem_Click); + // // aboutToolStripMenuItem1 // this.aboutToolStripMenuItem1.Name = "aboutToolStripMenuItem1"; @@ -10928,53 +10978,12 @@ this.versionLabel.Text = "ROM:"; this.versionLabel.Visible = false; // - // flowLayoutPanel1 + // itemEditorToolStripMenuItem // - this.flowLayoutPanel1.Controls.Add(this.mapScreenshotButton); - this.flowLayoutPanel1.Controls.Add(this.wireframeCheckBox); - this.flowLayoutPanel1.Controls.Add(this.radio3D); - this.flowLayoutPanel1.Controls.Add(this.radio2D); - this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Right; - this.flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.BottomUp; - this.flowLayoutPanel1.Location = new System.Drawing.Point(1134, 3); - this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(48, 669); - this.flowLayoutPanel1.TabIndex = 42; - // - // panel1 - // - this.panel1.Controls.Add(this.labelMatrices); - this.panel1.Controls.Add(this.setSpawnPointButton); - this.panel1.Controls.Add(this.selectMatrixComboBox); - this.panel1.Controls.Add(this.saveMatrixButton); - this.panel1.Controls.Add(this.matrixNameLabel); - this.panel1.Controls.Add(this.locateCurrentMatrixFile); - this.panel1.Controls.Add(this.matrixNameTextBox); - this.panel1.Controls.Add(this.resetColorTableButton); - this.panel1.Controls.Add(this.widthLabel); - this.panel1.Controls.Add(this.importColorTableButton); - this.panel1.Controls.Add(this.widthUpDown); - this.panel1.Controls.Add(this.importMatrixButton); - this.panel1.Controls.Add(this.heightUpDown); - this.panel1.Controls.Add(this.exportMatrixButton); - this.panel1.Controls.Add(this.addHeadersButton); - this.panel1.Controls.Add(this.removeMatrixButton); - this.panel1.Controls.Add(this.addHeightsButton); - this.panel1.Controls.Add(this.addMatrixButton); - this.panel1.Controls.Add(this.removeHeadersButton); - this.panel1.Controls.Add(this.removeHeightsButton); - this.panel1.Dock = System.Windows.Forms.DockStyle.Left; - this.panel1.Location = new System.Drawing.Point(3, 3); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(134, 669); - this.panel1.TabIndex = 36; - // - // flyWarpEditorToolStripMenuItem - // - this.flyWarpEditorToolStripMenuItem.Name = "flyWarpEditorToolStripMenuItem"; - this.flyWarpEditorToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.flyWarpEditorToolStripMenuItem.Text = "Fly Warp Editor"; - this.flyWarpEditorToolStripMenuItem.Click += new System.EventHandler(this.flyWarpEditorToolStripMenuItem_Click); + this.itemEditorToolStripMenuItem.Name = "itemEditorToolStripMenuItem"; + this.itemEditorToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.itemEditorToolStripMenuItem.Text = "Item Editor"; + this.itemEditorToolStripMenuItem.Click += new System.EventHandler(this.itemEditorToolStripMenuItem_Click); // // MainProgram // @@ -11035,6 +11044,10 @@ ((System.ComponentModel.ISupportInitialize)(this.cameraPictureBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.weatherPictureBox)).EndInit(); this.matrixEditorTabPage.ResumeLayout(false); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.widthUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.heightUpDown)).EndInit(); this.matrixTabControl.ResumeLayout(false); this.headersTabPage.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.headersGridView)).EndInit(); @@ -11042,10 +11055,10 @@ ((System.ComponentModel.ISupportInitialize)(this.heightsGridView)).EndInit(); this.mapFilesTabPage.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.mapFilesGridView)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.heightUpDown)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.widthUpDown)).EndInit(); this.mapEditorTabPage.ResumeLayout(false); this.mapEditorTabPage.PerformLayout(); + this.flowLayoutPanel1.ResumeLayout(false); + this.flowLayoutPanel1.PerformLayout(); this.tableLayoutPanel3.ResumeLayout(false); this.mapRenderPanel.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.movPictureBox)).EndInit(); @@ -11300,10 +11313,6 @@ this.statusStrip1.PerformLayout(); this.mainToolStrip.ResumeLayout(false); this.mainToolStrip.PerformLayout(); - this.flowLayoutPanel1.ResumeLayout(false); - this.flowLayoutPanel1.PerformLayout(); - this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -12125,6 +12134,7 @@ private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; private System.Windows.Forms.Panel panel1; private System.Windows.Forms.ToolStripMenuItem flyWarpEditorToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem itemEditorToolStripMenuItem; } } diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index 37644ac..fb6634d 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -9248,7 +9248,7 @@ namespace DSPRE { private void unpackToFolderToolStripMenuItem_Click(object sender, EventArgs e) { OpenFileDialog of = new OpenFileDialog { - Filter = "NARC File (*.narc)|*.narc" + Filter = "NARC File (*.narc)|*.narc|All files (*.*)|*.*" }; if (of.ShowDialog(this) != DialogResult.OK) { return; @@ -10080,5 +10080,21 @@ namespace DSPRE { var flyEditor = new FlyEditor(gameFamily, headerListBoxNames); flyEditor.Show(); } + + private void itemEditorToolStripMenuItem_Click(object sender, EventArgs e) + { + Helpers.statusLabelMessage("Setting up Item Data Editor..."); + Update(); + + DSUtils.TryUnpackNarcs(new List { DirNames.itemData }); + + ItemEditor itemEditor = new ItemEditor( + RomInfo.GetItemNames() + ); + itemEditor.ShowDialog(); + + Helpers.statusLabelMessage(); + Update(); + } } } diff --git a/DS_Map/Main Window.resx b/DS_Map/Main Window.resx index dc8414d..f22dc3e 100644 --- a/DS_Map/Main Window.resx +++ b/DS_Map/Main Window.resx @@ -117,145 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 533, 20 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAAFxJREFUOE9j+P//PwM2zDBF7h/DFLn/DNNk/4PY6PJwdegCKAYsUPgPxqMG4DcA - HtoYWBaiGWwAJCawYhSFpGJQFFPBACzOAmMivYAeKCQHIrrAqAFoBiASFk4DAOQLbokdS+snAAAAAElF - TkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAAFBJREFUOE+l0bEJwDAMRNFDG3ijrJfeeJ8sFoW0vur7itd8sBCyulsJC5QFygJl - gdJduhKaqjehpepH48j/Nh+wr0TlR9y/hbJAWaAsUBaoD7HiY1fWoY0CAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAAFxJREFUOE9j+P//PwM2zDBF7h/DFLn/DNNk/4PY6PJwdegCKAYsUPgPxqMG4DcA - HtoYWBaiGWwAJCawYhSFpGJQFFPBACzOAmMivYAeKCQHIrrAqAFoBiASFk4DAOQLbokdS+snAAAAAElF - TkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAAFxJREFUOE9j+P//PwM2zDBF7h/DFLn/DNNk/4PY6PJwdegCKAYsUPgPxqMG4DcA - HtoYWBaiGWwAJCawYhSFpGJQFFPBACzOAmMivYAeKCQHIrrAqAFoBiASFk4DAOQLbokdS+snAAAAAElF - TkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAAFBJREFUOE+l0bEJwDAMRNFDG3ijrJfeeJ8sFoW0vur7itd8sBCyulsJC5QFygJl - gdJduhKaqjehpepH48j/Nh+wr0TlR9y/hbJAWaAsUBaoD7HiY1fWoY0CAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAAFBJREFUOE+l0bEJwDAMRNFDG3ijrJfeeJ8sFoW0vur7itd8sBCyulsJC5QFygJl - gdJduhKaqjehpepH48j/Nh+wr0TlR9y/hbJAWaAsUBaoD7HiY1fWoY0CAAAAAElFTkSuQmCC - - - - 239, 17 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM - EgAAAk1TRnQBSQFMAgEBCgEAASABHQEgAR0BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo - AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA - AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 - AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA - AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm - AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM - AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA - ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz - AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ - AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM - AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA - AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA - AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ - AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/ - AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA - AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm - ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ - Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz - AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA - AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM - AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM - ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM - Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA - AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM - AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ - AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz - AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm - AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw - AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/xMABLwEAAS8KwAGvAIA - BOkBvAMABOkBvCoAASYBHgQAArwBAATpBAAE6QG8KgABJgEeAgABJgEeAQABvAEAAukBvAIABLwBAALp - AbwtAAG8ASYBHgMAAukBvAEABAsCvALpAbwsAAEmAR4CAAG8AgAC6QG8AgsBvAEAAgsBvALpAbwmAAO8 - AgABJgEeAgABvAMAAukBvAILArwCCwEAAukBvCUAAc0BCgEAAbwBAAEmAR4BAAHsAwABvAEAAukBvAUL - AgAC6QG8JQABzQEKAQACvAEmAR4BAAESArwBAAG8AQAC6QG8AgsCvAMAAukBvCQAAc0BCgMAAbwBAAEm - AR4GAALpAbwBAAILA7wBAALpAbwkAAHNAQoBEgHsAQABEgG8CAAC6QG8AgADCwIAAukBvCQAAc0BCgES - AgABEgG8CAAC6QO8BAABvALpAbwjAAHNAQoBAAG8AwABvAgABOkBvAMABOkBvAEAAbwhAAHNAQoBAAG8 - AwAB7AG8BwAE6QQABOkBGwExAZkhAAFlGwADMT0AARsBMQEbKQAB7AESAe8FAAH0EQAKEhgAAvMC6wHv - AewB6wHzBQAB6gH0BQAC8gH0BgADEgZKAxIUAAHzAfEBvALsAQcBvAEHAewB6wEHBAABDgESAe0EAAHw - ASIBKQHrAfMFAAESAkoGbgJKARIDAAEPBwABDwUAAQ8BAAG8AfcB7QGSAe8BvAEHAfAB9AHyAesB6gQA - AQ4BbQHtAwABBwEjAisBKgHrAfMDAAESAUoBbgFKBm4BSgFuAUoBEgEAAQ8J7wEPAwAB7wIAAW0C9wHw - AbwB8wLyAvQB7QHrAQcDAAEHARUB6gPtASkBKwElAR8BJQEqAesB9AIAARIBSgFuAUoGkwFKAW4BSgES - AgAB7wEBAR8G7wMAAu8CAAG8Ae8B8QH0AfYB8gLwAfQB9gHvAewBbQMAAfQBEAHrAUoBMAEDASUBFwH5 - AiABJQEqAeoCAAESAUoBkwFuBkkBbgGTAUoBEgIAAe8CAQEfBe8BAAIPAu8CAAHyAe8C9gH3AW0B6wHy - AfQB9gHzAesB7AEHAgAB9AEQAXMBRQEkASAB+QEXAfkBIAEfASABMQEiAfQBAAESAZMBbgFJBmwBSQFu - AZMBEgIAAe8BAQEfBu8DAALvAwAB7wHzAbwBkgHwAfcB9gH3Ae0BBwHrAewB7wMAAfIBEQFFAR8CIAH5 - ARcB+QEgAR8BMQEiAfQBAAESAZMBSQJsBHECbAFJAZMBEgEAAQ8J7wEPAwAB7wMAAQcB8AFEASUBGgKS - AfIC8wH0ARIB6wHyAgAB8gFDAewBRQEfASAB+QEXASYBMQE3ATABFAIAAUkBbgFsAXEBlwRxAZcBcQFs - AW4BEgIAAQ8HAAEPBQABDwIAAfQBbQEsASUB6wH0AvEC7wHyAusBvAIAAfMBbQHrAUUBHwIgAfkBMQFR - Am0B8wIAAUkCbAGXAnEClwJxAZcCbAFJAgABFQEPARUDAAEVAQ8BFQgAARwBLAErAeoBBwG8Au8B9AK8 - AfMCbQMAAfABEwFFAR8BJAIrAVEBvAUAAUkBbAJxBpcCcQFsAUkBAAEVAfcBBwH3ARUBAAEVAfcBBwH3 - ARUGAAHvAisBSwHvAQcBvAHxBAcB9AGLAeoDAAHwAREBSwEkASMBAwFKAfAHAAFsAXEDlwJ4A5cBcQFs - AgABDwEHAQABBwEPAQABDwEHAQABBwEPBQAB7wErASwBRQK8AQcB7wEHAbwB8AEZAtsBbAEHAwAB8AEj - AisBDgHwAfEIAAFJAXEClwF4BZcBcQFJAgABFQH3AQcB9wEVAQABFQH3AQcB9wEVBQABEgEsAUUB8gHz - Ae8B8gHxAbsC2gGzAosB8wQAAfABIwE3ATEBDgsAAUkBcQKXAXgDlwFxAUkEAAEVAQ8BFQMAARUBDwEV - BwABEgG8AgABBwGzAdQBswJsAe8IAAHvAg4B8wwAAWwBcQSXAXEBbBkAAQcCEgG8HQAEcRcAAfQL8wH0 - EwAN8xMAAQcL7wEHAgAPEAEAAQcNswEHBwAEQwcAAe8BAAG7BrMBuwIAAe8CAAEQBjgBEAbTARABAAGz - DQABswUAAkME8AJDBQAB7wEAAbMGAAGzAgAB7wIAARACOAMAATgBEALTAgAC0wEQAQABsw0AAbMEAAFD - CPABQwQAAe8BAAGtAQABlwJWAZcBAAGzAgAB7wIAARADOAEAAjgBEAHTAQAC0wEAAdMBEAEAAbMBAAFW - CVABVgEAAbMDAAFDA/ABkgJDAZID8AFDAwAB7wEAAa0BAARWAQABswH0AQAB7wIAARACOAIAAjgBEAHT - AQAC0wEAAdMBEAEAAbMBAAtWAQABswMAAUMB8AGSARIBQwHwAZIBQwESAZIB8AFDAwAB7wEAAa0BAARW - AQABswH0AQAB7wIAARADOAEAAjgBEALTAgAC0wEQAQABswEAC1YBAAGzAgABQwHwARICYwFDAQAB8AFD - AmMBEgHwAUMCAAHvAQABrQEABHgBAAGzAfQBAAHvAgABEAY4ARAG0wEQAQABswEAC1YBAAGzAgABQwES - BEcCQwRHARIBQwIAAe8BAAGtBgABswHzAQAB7wIADxABAAGzAQALVgEAAbMCAAFDDEcBQwIAAe8BAAG7 - Aq0EswG7AfMBAAHvAgABEAZHARAGAAEQAQABswEAC1YBAAGzAgABQwxHAUMCAAHvAQAB8wP0AfMB9AQA - Ae8CAAEQAkcCAAJHARAGAAEQAQABswEAC1YBAAGzAwABQwJHApQGRwFDAwAB7wEAAXQCMgEsAXQBAAG8 - AvcBAAHvAgABEAFHAQACRwEAAUcBEAYAARABAAGzAQABVgl4AVYBAAGzAwABQwFHBJQFRwFDAwAB7wEA - ASwDwwFTAQAB9wIAAfMB8AIAARABRwEAAkcBAAFHARAGAAEQAQABswEAC3gBAAGzBAABQwSUBEcBQwQA - Ae8BAAF0AywBdAEAAfcBAAHzAfADAAEQAkcCAAJHARAGAAEQAQABswEAC3gBAAGzBQACQwGUA0cCQwUA - Ae8IAAHzAfAEAAEQBkcBEAYAARABAAGzDQABswcABEMHAAEHCO8BBwUADxABAAEJDbMBCREAAUIBTQE+ - BwABPgMAASgDAAFAAwABMAMAAQEBAAEBBQABgAEBFgAD/wEAAv8CwwQAAf8BgQKDBAAB/wEAAYcBgwQA - Af8BMAGMASMEAAH/AeEBiAEDBAAB/wHBAYEBAwQAAfEBgwGAASMEAAHhAQ4BgAFjBAAB4AEAAYAB4wQA - AcABgQGIASMEAAHAAX8BjAFjBAABxAF/AYMBwwQAAYQBfwGDAYIEAAGEAT8BhwGABAABjAF/Af8B+AQA - A/8B+AQAAf8BjwG/Af8B4AEHAv8B+AEHAo8BwAEDAv8BwAEHAY8BBwHAAQMBgAE8AYABBwGOAQMBgAEB - AQABGAGAAQMBgAEBAYABAQIAAYABAwGAAQEBgAEBAgABgAEBAYABAAGAAQECAAHAAQEBwAEAAYABAQEA - ARgBwAEAAcABAQGAAQEBgAE8AcABAAHAAQEBgAEBAY4BPwHAAQAB4AEPAYABAQEEAR8BgAEAAeABHwHA - AQMBJAGfAgAB4AE/AcABAwEEAR8BAAEBAeAB/wHgAQcBjgE/AZgBDwHwAf8B8AEPAv8B+AF/Av8B/AE/ - Av8BgAEDAv8BgAEDAv8BgAEDAQABAQEAAQEB/AE/AaABGwEAAQEBfwH9AfABDwGvAdsBAAExAX8B/QHg - AQcBqAFbAQABSQFAAQUBwAEDAagBSwEAAUkBQAEFAcABAwGoAUsBAAExAUABBQGBAQEBqAFLAQABAQFA - AQUBgAEBAa8BywEAAQEBQAEFAYABAQGgAQsBAAH9AUABBQGAAQEBoAF7ARgBxQFAAQUBwAEDAaABiwEk - Ae0BQAEFAcABAwGgAbMBJAHNAUABBQHgAQcBoAGnARgB7QFAAQUB8AEPAb8BzwEAAf0BfwH9AfwBPwGA - AR8BAAEBAQABAQL/Cw== - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -694,6 +556,51 @@ WQT4nDhGC/CgsUPIUQsMIa2AlrPAbAJ8TiYP4RCSgBa1AH+S86/gZAKaXbEkwF9T9BAC7OcgoYELaBEF unRPhsBWCzsfHq7haAII0uyIuuD6owgA/K8jLBZxPxALbowVDuGFx8IDY/kD7lUZk+GYq/AAAAAASUVO RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAAFxJREFUOE9j+P//PwM2zDBF7h/DFLn/DNNk/4PY6PJwdegCKAYsUPgPxqMG4DcA + HtoYWBaiGWwAJCawYhSFpGJQFFPBACzOAmMivYAeKCQHIrrAqAFoBiASFk4DAOQLbokdS+snAAAAAElF + TkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAAFBJREFUOE+l0bEJwDAMRNFDG3ijrJfeeJ8sFoW0vur7itd8sBCyulsJC5QFygJl + gdJduhKaqjehpepH48j/Nh+wr0TlR9y/hbJAWaAsUBaoD7HiY1fWoY0CAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAAFxJREFUOE9j+P//PwM2zDBF7h/DFLn/DNNk/4PY6PJwdegCKAYsUPgPxqMG4DcA + HtoYWBaiGWwAJCawYhSFpGJQFFPBACzOAmMivYAeKCQHIrrAqAFoBiASFk4DAOQLbokdS+snAAAAAElF + TkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAAFxJREFUOE9j+P//PwM2zDBF7h/DFLn/DNNk/4PY6PJwdegCKAYsUPgPxqMG4DcA + HtoYWBaiGWwAJCawYhSFpGJQFFPBACzOAmMivYAeKCQHIrrAqAFoBiASFk4DAOQLbokdS+snAAAAAElF + TkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAAFBJREFUOE+l0bEJwDAMRNFDG3ijrJfeeJ8sFoW0vur7itd8sBCyulsJC5QFygJl + gdJduhKaqjehpepH48j/Nh+wr0TlR9y/hbJAWaAsUBaoD7HiY1fWoY0CAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAAFBJREFUOE+l0bEJwDAMRNFDG3ijrJfeeJ8sFoW0vur7itd8sBCyulsJC5QFygJl + gdJduhKaqjehpepH48j/Nh+wr0TlR9y/hbJAWaAsUBaoD7HiY1fWoY0CAAAAAElFTkSuQmCC @@ -1034,6 +941,96 @@ NaU33+5Z3SbBeCjNjTd7hGN5BvoHcLjuU61DOJY7hFqN2+9TVrdJMLmucutdkkiqit0+xMT0LAYQSZYP gTp3PkpWt0kw9Pw7Vxa/8TAUZdBu3xh3z2wsfIkyG/yL+bctha1u18TK1oHguBDiohCi7x8a/430CiG6 zeXfJelqUKnUyCAAAAAASUVORK5CYII= + + + + 239, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM + EgAAAk1TRnQBSQFMAgEBCgEAASgBHQEoAR0BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA + AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 + AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA + AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm + AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM + AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA + ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz + AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ + AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM + AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA + AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA + AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ + AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/ + AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA + AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm + ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ + Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz + AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA + AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM + AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM + ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM + Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA + AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM + AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ + AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz + AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm + AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw + AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/xMABLwEAAS8KwAGvAIA + BOkBvAMABOkBvCoAASYBHgQAArwBAATpBAAE6QG8KgABJgEeAgABJgEeAQABvAEAAukBvAIABLwBAALp + AbwtAAG8ASYBHgMAAukBvAEABAsCvALpAbwsAAEmAR4CAAG8AgAC6QG8AgsBvAEAAgsBvALpAbwmAAO8 + AgABJgEeAgABvAMAAukBvAILArwCCwEAAukBvCUAAc0BCgEAAbwBAAEmAR4BAAHsAwABvAEAAukBvAUL + AgAC6QG8JQABzQEKAQACvAEmAR4BAAESArwBAAG8AQAC6QG8AgsCvAMAAukBvCQAAc0BCgMAAbwBAAEm + AR4GAALpAbwBAAILA7wBAALpAbwkAAHNAQoBEgHsAQABEgG8CAAC6QG8AgADCwIAAukBvCQAAc0BCgES + AgABEgG8CAAC6QO8BAABvALpAbwjAAHNAQoBAAG8AwABvAgABOkBvAMABOkBvAEAAbwhAAHNAQoBAAG8 + AwAB7AG8BwAE6QQABOkBGwExAZkhAAFlGwADMT0AARsBMQEbKQAB7AESAe8FAAH0EQAKEhgAAvMC6wHv + AewB6wHzBQAB6gH0BQAC8gH0BgADEgZKAxIUAAHzAfEBvALsAQcBvAEHAewB6wEHBAABDgESAe0EAAHw + ASIBKQHrAfMFAAESAkoGbgJKARIDAAEPBwABDwUAAQ8BAAG8AfcB7QGSAe8BvAEHAfAB9AHyAesB6gQA + AQ4BbQHtAwABBwEjAisBKgHrAfMDAAESAUoBbgFKBm4BSgFuAUoBEgEAAQ8J7wEPAwAB7wIAAW0C9wHw + AbwB8wLyAvQB7QHrAQcDAAEHARUB6gPtASkBKwElAR8BJQEqAesB9AIAARIBSgFuAUoGkwFKAW4BSgES + AgAB7wEBAR8G7wMAAu8CAAG8Ae8B8QH0AfYB8gLwAfQB9gHvAewBbQMAAfQBEAHrAUoBMAEDASUBFwH5 + AiABJQEqAeoCAAESAUoBkwFuBkkBbgGTAUoBEgIAAe8CAQEfBe8BAAIPAu8CAAHyAe8C9gH3AW0B6wHy + AfQB9gHzAesB7AEHAgAB9AEQAXMBRQEkASAB+QEXAfkBIAEfASABMQEiAfQBAAESAZMBbgFJBmwBSQFu + AZMBEgIAAe8BAQEfBu8DAALvAwAB7wHzAbwBkgHwAfcB9gH3Ae0BBwHrAewB7wMAAfIBEQFFAR8CIAH5 + ARcB+QEgAR8BMQEiAfQBAAESAZMBSQJsBHECbAFJAZMBEgEAAQ8J7wEPAwAB7wMAAQcB8AFEASUBGgKS + AfIC8wH0ARIB6wHyAgAB8gFDAewBRQEfASAB+QEXASYBMQE3ATABFAIAAUkBbgFsAXEBlwRxAZcBcQFs + AW4BEgIAAQ8HAAEPBQABDwIAAfQBbQEsASUB6wH0AvEC7wHyAusBvAIAAfMBbQHrAUUBHwIgAfkBMQFR + Am0B8wIAAUkCbAGXAnEClwJxAZcCbAFJAgABFQEPARUDAAEVAQ8BFQgAARwBLAErAeoBBwG8Au8B9AK8 + AfMCbQMAAfABEwFFAR8BJAIrAVEBvAUAAUkBbAJxBpcCcQFsAUkBAAEVAfcBBwH3ARUBAAEVAfcBBwH3 + ARUGAAHvAisBSwHvAQcBvAHxBAcB9AGLAeoDAAHwAREBSwEkASMBAwFKAfAHAAFsAXEDlwJ4A5cBcQFs + AgABDwEHAQABBwEPAQABDwEHAQABBwEPBQAB7wErASwBRQK8AQcB7wEHAbwB8AEZAtsBbAEHAwAB8AEj + AisBDgHwAfEIAAFJAXEClwF4BZcBcQFJAgABFQH3AQcB9wEVAQABFQH3AQcB9wEVBQABEgEsAUUB8gHz + Ae8B8gHxAbsC2gGzAosB8wQAAfABIwE3ATEBDgsAAUkBcQKXAXgDlwFxAUkEAAEVAQ8BFQMAARUBDwEV + BwABEgG8AgABBwGzAdQBswJsAe8IAAHvAg4B8wwAAWwBcQSXAXEBbBkAAQcCEgG8HQAEcRcAAfQL8wH0 + EwAN8xMAAQcL7wEHAgAPEAEAAQcNswEHBwAEQwcAAe8BAAG7BrMBuwIAAe8CAAEQBjgBEAbTARABAAGz + DQABswUAAkME8AJDBQAB7wEAAbMGAAGzAgAB7wIAARACOAMAATgBEALTAgAC0wEQAQABsw0AAbMEAAFD + CPABQwQAAe8BAAGtAQABlwJWAZcBAAGzAgAB7wIAARADOAEAAjgBEAHTAQAC0wEAAdMBEAEAAbMBAAFW + CVABVgEAAbMDAAFDA/ABkgJDAZID8AFDAwAB7wEAAa0BAARWAQABswH0AQAB7wIAARACOAIAAjgBEAHT + AQAC0wEAAdMBEAEAAbMBAAtWAQABswMAAUMB8AGSARIBQwHwAZIBQwESAZIB8AFDAwAB7wEAAa0BAARW + AQABswH0AQAB7wIAARADOAEAAjgBEALTAgAC0wEQAQABswEAC1YBAAGzAgABQwHwARICYwFDAQAB8AFD + AmMBEgHwAUMCAAHvAQABrQEABHgBAAGzAfQBAAHvAgABEAY4ARAG0wEQAQABswEAC1YBAAGzAgABQwES + BEcCQwRHARIBQwIAAe8BAAGtBgABswHzAQAB7wIADxABAAGzAQALVgEAAbMCAAFDDEcBQwIAAe8BAAG7 + Aq0EswG7AfMBAAHvAgABEAZHARAGAAEQAQABswEAC1YBAAGzAgABQwxHAUMCAAHvAQAB8wP0AfMB9AQA + Ae8CAAEQAkcCAAJHARAGAAEQAQABswEAC1YBAAGzAwABQwJHApQGRwFDAwAB7wEAAXQCMgEsAXQBAAG8 + AvcBAAHvAgABEAFHAQACRwEAAUcBEAYAARABAAGzAQABVgl4AVYBAAGzAwABQwFHBJQFRwFDAwAB7wEA + ASwDwwFTAQAB9wIAAfMB8AIAARABRwEAAkcBAAFHARAGAAEQAQABswEAC3gBAAGzBAABQwSUBEcBQwQA + Ae8BAAF0AywBdAEAAfcBAAHzAfADAAEQAkcCAAJHARAGAAEQAQABswEAC3gBAAGzBQACQwGUA0cCQwUA + Ae8IAAHzAfAEAAEQBkcBEAYAARABAAGzDQABswcABEMHAAEHCO8BBwUADxABAAEJDbMBCREAAUIBTQE+ + BwABPgMAASgDAAFAAwABMAMAAQEBAAEBBQABgAEBFgAD/wEAAv8CwwQAAf8BgQKDBAAB/wEAAYcBgwQA + Af8BMAGMASMEAAH/AeEBiAEDBAAB/wHBAYEBAwQAAfEBgwGAASMEAAHhAQ4BgAFjBAAB4AEAAYAB4wQA + AcABgQGIASMEAAHAAX8BjAFjBAABxAF/AYMBwwQAAYQBfwGDAYIEAAGEAT8BhwGABAABjAF/Af8B+AQA + A/8B+AQAAf8BjwG/Af8B4AEHAv8B+AEHAo8BwAEDAv8BwAEHAY8BBwHAAQMBgAE8AYABBwGOAQMBgAEB + AQABGAGAAQMBgAEBAYABAQIAAYABAwGAAQEBgAEBAgABgAEBAYABAAGAAQECAAHAAQEBwAEAAYABAQEA + ARgBwAEAAcABAQGAAQEBgAE8AcABAAHAAQEBgAEBAY4BPwHAAQAB4AEPAYABAQEEAR8BgAEAAeABHwHA + AQMBJAGfAgAB4AE/AcABAwEEAR8BAAEBAeAB/wHgAQcBjgE/AZgBDwHwAf8B8AEPAv8B+AF/Av8B/AE/ + Av8BgAEDAv8BgAEDAv8BgAEDAQABAQEAAQEB/AE/AaABGwEAAQEBfwH9AfABDwGvAdsBAAExAX8B/QHg + AQcBqAFbAQABSQFAAQUBwAEDAagBSwEAAUkBQAEFAcABAwGoAUsBAAExAUABBQGBAQEBqAFLAQABAQFA + AQUBgAEBAa8BywEAAQEBQAEFAYABAQGgAQsBAAH9AUABBQGAAQEBoAF7ARgBxQFAAQUBwAEDAaABiwEk + Ae0BQAEFAcABAwGgAbMBJAHNAUABBQHgAQcBoAGnARgB7QFAAQUB8AEPAb8BzwEAAf0BfwH9AfwBPwGA + AR8BAAEBAQABAQL/Cw== diff --git a/DS_Map/ROMFiles/ItemData.cs b/DS_Map/ROMFiles/ItemData.cs new file mode 100644 index 0000000..b3ccd5a --- /dev/null +++ b/DS_Map/ROMFiles/ItemData.cs @@ -0,0 +1,568 @@ +using System; +using System.IO; +using static DSPRE.RomInfo; +using static Microsoft.WindowsAPICodePack.Shell.PropertySystem.SystemProperties.System; + +namespace DSPRE.ROMFiles +{ + public enum NaturalGiftType + { + Normal = 0, + Fighting = 1, + Flying = 2, + Poison = 3, + Ground = 4, + Rock = 5, + Bug = 6, + Ghost = 7, + Steel = 8, + Fire = 10, + Water = 11, + Grass = 12, + Electric = 13, + Psychic = 14, + Ice = 15, + Dragon = 16, + Dark = 17, + NONE = 31 + } + + + public enum FieldPocket + { + Items = 0, + Medicine = 1, + Balls = 2, + TmHms = 3, + Berries = 4, + Mail = 5, + BattleItems = 6, + KeyItems = 7 + } + + public enum BattlePocket + { + None = 0, + PokeBalls = 1, + BattleItems = 2, + HpRestore = 4, + StatusHealers = 8, + PpRestore = 16 + } + + public enum HoldEffect + { + None = 0, + HpRestore = 1, + GiratinaBoost = 2, + DialgaBoost = 3, + PalkiaBoost = 4, + PrzRestore = 5, + SlpRestore = 6, + PsnRestore = 7, + BrnRestore = 8, + FrzRestore = 9, + PpRestore = 10, + ConfuseRestore = 11, + StatusRestore = 12, + HpPctRestore = 13, + HpRestoreSpicy = 14, + HpRestoreDry = 15, + HpRestoreSweet = 16, + HpRestoreBitter = 17, + HpRestoreSour = 18, + WeakenSeFire = 19, + WeakenSeWater = 20, + WeakenSeElectric = 21, + WeakenSeGrass = 22, + WeakenSeIce = 23, + WeakenSeFight = 24, + WeakenSePoison = 25, + WeakenSeGround = 26, + WeakenSeFlying = 27, + WeakenSePsychic = 28, + WeakenSeBug = 29, + WeakenSeRock = 30, + WeakenSeGhost = 31, + WeakenSeDragon = 32, + WeakenSeDark = 33, + WeakenSeSteel = 34, + WeakenNormal = 35, + PinchAtkUp = 36, + PinchDefUp = 37, + PinchSpeedUp = 38, + PinchSpAtkUp = 39, + PinchSpDefUp = 40, + PinchCritrateUp = 41, + PinchRandomUp = 42, + HpRestoreSe = 43, + PinchAccUp = 44, + PinchPriority = 45, + RecoilPhysical = 46, + RecoilSpecial = 47, + AccReduce = 48, + StatdownRestore = 49, + EvsUpSpeedDown = 50, + ExpShare = 51, + SometimesPriority = 52, + FriendshipUp = 53, + HealInfatuation = 54, + ChoiceAtk = 55, + SometimesFlinch = 56, + StrengthenBug = 57, + MoneyUp = 58, + EncountersDown = 59, + LatiSpecial = 60, + ClamperlSpAtk = 61, + ClamperlSpDef = 62, + Flee = 63, + NoEvolve = 64, + MaybeEndure = 65, + ExpUp = 66, + CritrateUp = 67, + StrengthenSteel = 68, + HpRestoreGradual = 69, + EvolveSeadra = 70, + PikaSpAtkUp = 71, + StrengthenGround = 72, + StrengthenRock = 73, + StrengthenGrass = 74, + StrengthenDark = 75, + StrengthenFight = 76, + StrengthenElectric = 77, + StrengthenWater = 78, + StrengthenFlying = 79, + StrengthenPoison = 80, + StrengthenIce = 81, + StrengthenGhost = 82, + StrengthenPsychic = 83, + StrengthenFire = 84, + StrengthenDragon = 85, + StrengthenNormal = 86, + EvolvePorygon = 87, + HpRestoreOnDmg = 88, + ChanseyCritrateUp = 89, + DittoDefUp = 90, + CuboneAtkUp = 91, + FarfetchdCritrateUp = 92, + AccuracyUp = 93, + PowerUpPhys = 94, + PowerUpSpec = 95, + PowerUpSe = 96, + ExtendScreens = 97, + HpDrainOnAtk = 98, + ChargeSkip = 99, + PsnUser = 100, + BrnUser = 101, + DittoSpeedUp = 102, + Endure = 103, + AccuracyUpSlower = 104, + BoostRepeated = 105, + SpeedDownGrounded = 106, + PriorityDown = 107, + ReciprocateInfat = 108, + HpRestorePsnType = 109, + ExtendHail = 110, + ExtendSandstorm = 111, + ExtendSun = 112, + ExtendRain = 113, + ExtendTrapping = 114, + ChoiceSpeed = 115, + DmgUserContactXfr = 116, + LvlupAtkEvUp = 117, + LvlupDefEvUp = 118, + LvlupSpAtkEvUp = 119, + LvlupSpDefEvUp = 120, + LvlupSpeedEvUp = 121, + LvlupHpEvUp = 122, + Switch = 123, + LeechBoost = 124, + ChoiceSpAtk = 125, + ArceusFire = 126, + ArceusWater = 127, + ArceusElectric = 128, + ArceusGrass = 129, + ArceusIce = 130, + ArceusFighting = 131, + ArceusPoison = 132, + ArceusGround = 133, + ArceusFlying = 134, + ArceusPsychic = 135, + ArceusBug = 136, + ArceusRock = 137, + ArceusGhost = 138, + ArceusDragon = 139, + ArceusDark = 140, + ArceusSteel = 141, + EvolveRhydon = 142, + EvolveElectabuzz = 143, + EvolveMagmar = 144, + EvolvePorygon2 = 145, + EvolveDusclops = 146, + // These are hg-engine items, not in gen 4 + //BurnDrive = 147, + //ChillDrive = 148, + //DouseDrive = 149, + //ShockDrive = 150, + //EvolveFeebas = 151, + //Eviolite = 152, + //HalveWeight = 153, + //DamageOnContact = 154, + //UngroundDestroyedOnHit = 155, + //ForceSwitchOnDamage = 156, + //LoseTypeImmunities = 157, + //TrappingDamageUp = 158, + //BoostSpecialAttackOnWaterHit = 159, + //BoostAtkOnElectricHit = 160, + //SwitchOutWhenHit = 161, + //BoostAtkAndSpAtkOnSe = 162, + //SpDefBoostNoStatusMoves = 163, + //ArceusFairy = 164, + //EvolveSwirlix = 165, + //EvolveSpritzee = 166, + //BoostSpecialDefenseOnWaterHit = 167, + //BoostAtkOnIceHit = 168, + //SporePowderImmunity = 169, + //WeakenSeFairy = 170, + //BoostDefOnPhysicalHit = 171, + //BoostSpDefOnSpecialHit = 172, + //IntimidateBoostSpeed = 173, + //ExtendTerrain = 174, + //PreventContactEffects = 175, + //BoostDefOnElectricTerrain = 176, + //BoostSpDefOnPsychicTerrain = 177, + //BoostSpDefOnMistyTerrain = 178, + //BoostDefOnGrassyTerrain = 179, + //FightingMemory = 180, + //FlyingMemory = 181, + //PoisonMemory = 182, + //GroundMemory = 183, + //RockMemory = 184, + //BugMemory = 185, + //GhostMemory = 186, + //SteelMemory = 187, + //FireMemory = 188, + //WaterMemory = 189, + //GrassMemory = 190, + //ElectricMemory = 191, + //PsychicMemory = 192, + //IceMemory = 193, + //DragonMemory = 194, + //DarkMemory = 195, + //FairyMemory = 196, + //TransformZacian = 197, + //TransformZamazenta = 198, + //BoostSpAtkOnSoundMove = 199, + //SwitchOutOnStatDrop = 200, + //IgnoreEntryHazards = 201, + //BoostSpeedOnMiss = 202, + //DropSpeedInTrickRoom = 203, + //UnaffectedByRainOrSun = 204, + //DialgaBoostAndTransform = 205, + //PalkiaBoostAndTransform = 206, + //GiratinaBoostAndTransform = 207, + //ArceusNormal = 208, + //ActivateParadoxAbilities = 209, + //PreventAbilityChanges = 210, + //PreventStatDrops = 211, + //CopyStatIncrease = 212, + //IncreasePunchingMoveDmg = 213, + //PreventSecondaryEffects = 214, + //IncreaseMultiStrikeMinimum = 215, + //StrengthenFairy = 216, + //CornerstoneMask = 217, + //WellspringMask = 218, + //HearthflameMask = 219 + } + + public class ItemData : RomFile + { + public ushort price; + public HoldEffect holdEffect; + public byte HoldEffectParam; + public byte PluckEffect; + public byte FlingEffect; + public byte FlingPower; + public byte NaturalGiftPower; + + // Bit-packed 16-bit value + public NaturalGiftType naturalGiftType; // 5 bits + public bool PreventToss; // 1 bit + public bool Selectable; // 1 bit + public FieldPocket fieldPocket; // 4 bits + public BattlePocket battlePocket; // 5 bits + + public byte FieldUseFunc; + public byte BattleUseFunc; + public byte PartyUse; + public ItemPartyUseParam PartyUseParam; + + public ItemData(Stream stream) + { + using (BinaryReader reader = new BinaryReader(stream)) + { + price = reader.ReadUInt16(); + holdEffect = (HoldEffect)reader.ReadByte(); + HoldEffectParam = reader.ReadByte(); + PluckEffect = reader.ReadByte(); + FlingEffect = reader.ReadByte(); + FlingPower = reader.ReadByte(); + NaturalGiftPower = reader.ReadByte(); + + ushort bitfield = reader.ReadUInt16(); + naturalGiftType = (NaturalGiftType)(bitfield & 0b0001_1111); + PreventToss = (bitfield & (1 << 5)) != 0; + Selectable = (bitfield & (1 << 6)) != 0; + fieldPocket = (FieldPocket)((bitfield >> 7) & 0b1111); + battlePocket = (BattlePocket)((bitfield >> 11) & 0b11111); + + FieldUseFunc = reader.ReadByte(); + BattleUseFunc = reader.ReadByte(); + PartyUse = reader.ReadByte(); + + //reader.ReadByte(); // skip 1 byte padding_0D + + PartyUseParam = new ItemPartyUseParam(reader); + + reader.ReadBytes(2); // skip padding_22 + } + } + + + public ItemData(int ID) : this(new FileStream(RomInfo.gameDirs[DirNames.itemData].unpackedDir + "\\" + ID.ToString("D4"), FileMode.Open)) { } + + public override byte[] ToByteArray() + { + using (MemoryStream stream = new MemoryStream()) + using (BinaryWriter writer = new BinaryWriter(stream)) + { + writer.Write(price); + writer.Write((byte)holdEffect); + writer.Write(HoldEffectParam); + writer.Write(PluckEffect); + writer.Write(FlingEffect); + writer.Write(FlingPower); + writer.Write(NaturalGiftPower); + + ushort bitfield = 0; + bitfield |= (ushort)((byte)naturalGiftType & 0b11111); + if (PreventToss) bitfield |= (1 << 5); + if (Selectable) bitfield |= (1 << 6); + bitfield |= (ushort)(((byte)fieldPocket & 0b1111) << 7); + bitfield |= (ushort)(((byte)battlePocket & 0b11111) << 11); + writer.Write(bitfield); + + writer.Write(FieldUseFunc); + writer.Write(BattleUseFunc); + writer.Write(PartyUse); + writer.Write((byte)0); // padding + + PartyUseParam.WriteTo(writer); + + writer.Write(new byte[2]); // padding + + return stream.ToArray(); + } + } + + public void SaveToFileDefaultDir(int IDtoReplace, bool showSuccessMessage = true) + { + SaveToFileDefaultDir(DirNames.itemData, IDtoReplace, showSuccessMessage); + } + public void SaveToFileExplorePath(string suggestedFileName, bool showSuccessMessage = true) + { + SaveToFileExplorePath("Gen IV Item data", "bin", suggestedFileName, showSuccessMessage); + } + + public class ItemPartyUseParam + { + // Flags (bit-packed) + public bool SlpHeal; + public bool PsnHeal; + public bool BrnHeal; + public bool FrzHeal; + public bool PrzHeal; + public bool CfsHeal; + public bool InfHeal; + + public bool GuardSpec; + + public bool Revive; + public bool ReviveAll; + + public bool LevelUp; + + public bool Evolve; + + public sbyte AtkStages; + public sbyte DefStages; + public sbyte SpAtkStages; + public sbyte SpDefStages; + public sbyte SpeedStages; + public sbyte AccuracyStages; + public sbyte CritRateStages; + + public bool PPUps; + public bool PPMax; + public bool PPRestore; + public bool PPRestoreAll; + public bool HPRestore; + + public bool[] EVUps = new bool[6]; // hp, atk, def, speed, spatk, spdef + public bool[] FriendshipMods = new bool[3]; // lo, med, hi + + public sbyte[] EVParams = new sbyte[6]; // hp, atk, def, speed, spatk, spdef + public byte HPRestoreParam; + public byte PPRestoreParam; + public sbyte[] FriendshipParams = new sbyte[3]; // lo, med, hi + + public ItemPartyUseParam(BinaryReader reader) + { + byte[] data = reader.ReadBytes(19); // Total size of struct + + // Byte 0: HealStatus1 bits + byte healStatus1 = data[0]; + SlpHeal = (healStatus1 & (1 << 0)) != 0; + PsnHeal = (healStatus1 & (1 << 1)) != 0; + BrnHeal = (healStatus1 & (1 << 2)) != 0; + FrzHeal = (healStatus1 & (1 << 3)) != 0; + PrzHeal = (healStatus1 & (1 << 4)) != 0; + CfsHeal = (healStatus1 & (1 << 5)) != 0; + InfHeal = (healStatus1 & (1 << 6)) != 0; + GuardSpec = (healStatus1 & (1 << 7)) != 0; + + // Byte 1: revive, revive_all, level_up, evolve, + 4 bits padding + byte flags1 = data[1]; + Revive = (flags1 & (1 << 0)) != 0; + ReviveAll = (flags1 & (1 << 1)) != 0; + LevelUp = (flags1 & (1 << 2)) != 0; + Evolve = (flags1 & (1 << 3)) != 0; + + // Byte 2: atk_stages (4 bits), def_stages (4 bits) + byte stages1 = data[2]; + AtkStages = (sbyte)(stages1 & 0x0F); + DefStages = (sbyte)((stages1 >> 4) & 0x0F); + + // Byte 3: spatk_stages (4 bits), spdef_stages (4 bits) + byte stages2 = data[3]; + SpAtkStages = (sbyte)(stages2 & 0x0F); + SpDefStages = (sbyte)((stages2 >> 4) & 0x0F); + + // Byte 4: speed_stages (4 bits), accuracy_stages (4 bits) + byte stages3 = data[4]; + SpeedStages = (sbyte)(stages3 & 0x0F); + AccuracyStages = (sbyte)((stages3 >> 4) & 0x0F); + + // Byte 5: critrate_stages (2 bits), pp_up, pp_max, pp_restore, pp_restore_all, hp_restore (5 bits) + byte flags2 = data[5]; + CritRateStages = (sbyte)(flags2 & 0x03); + PPUps = (flags2 & (1 << 2)) != 0; + PPMax = (flags2 & (1 << 3)) != 0; + PPRestore = (flags2 & (1 << 4)) != 0; + PPRestoreAll = (flags2 & (1 << 5)) != 0; + HPRestore = (flags2 & (1 << 6)) != 0; + + // Byte 6: ev flags + byte evFlags = data[6]; + EVUps = new bool[6]; + for (int i = 0; i < 6; i++) + EVUps[i] = (evFlags & (1 << i)) != 0; + + // Byte 7: friendship flags + byte friendFlags = data[7]; + FriendshipMods = new bool[3]; + for (int i = 0; i < 3; i++) + FriendshipMods[i] = (friendFlags & (1 << i)) != 0; + + // Bytes 8-13: EVParams + EVParams = new sbyte[6]; + for (int i = 0; i < 6; i++) + EVParams[i] = (sbyte)data[8 + i]; + + // Byte 14: HPRestoreParam + HPRestoreParam = data[14]; + + // Byte 15: PPRestoreParam + PPRestoreParam = data[15]; + + // Bytes 16–18: FriendshipParams + FriendshipParams = new sbyte[3]; + for (int i = 0; i < 3; i++) + FriendshipParams[i] = (sbyte)data[16 + i]; + + // Padding is ignored (2 bytes assumed to follow) + } + + public void WriteTo(BinaryWriter writer) + { + byte[] data = new byte[18]; + + // Byte 0: HealStatus1 + data[0] = 0; + if (SlpHeal) data[0] |= (1 << 0); + if (PsnHeal) data[0] |= (1 << 1); + if (BrnHeal) data[0] |= (1 << 2); + if (FrzHeal) data[0] |= (1 << 3); + if (PrzHeal) data[0] |= (1 << 4); + if (CfsHeal) data[0] |= (1 << 5); + if (InfHeal) data[0] |= (1 << 6); + if (GuardSpec) data[0] |= (1 << 7); + + // Byte 1: revive, revive_all, level_up, evolve + data[1] = 0; + if (Revive) data[1] |= (1 << 0); + if (ReviveAll) data[1] |= (1 << 1); + if (LevelUp) data[1] |= (1 << 2); + if (Evolve) data[1] |= (1 << 3); + + // Byte 2: atk + def stages + data[2] = (byte)((DefStages & 0x0F) << 4 | (AtkStages & 0x0F)); + + // Byte 3: spatk + spdef stages + data[3] = (byte)((SpDefStages & 0x0F) << 4 | (SpAtkStages & 0x0F)); + + // Byte 4: speed + accuracy stages + data[4] = (byte)((AccuracyStages & 0x0F) << 4 | (SpeedStages & 0x0F)); + + // Byte 5: crit rate + pp/hp flags + data[5] = (byte)(CritRateStages & 0x03); + if (PPUps) data[5] |= (1 << 2); + if (PPMax) data[5] |= (1 << 3); + if (PPRestore) data[5] |= (1 << 4); + if (PPRestoreAll) data[5] |= (1 << 5); + if (HPRestore) data[5] |= (1 << 6); + + // Byte 6: EV flags + data[6] = 0; + for (int i = 0; i < 6; i++) + if (EVUps[i]) data[6] |= (byte)(1 << i); + + // Byte 7: Friendship flags + data[7] = 0; + for (int i = 0; i < 3; i++) + if (FriendshipMods[i]) data[7] |= (byte)(1 << i); + + // Bytes 8-13: EVParams + for (int i = 0; i < 6; i++) + data[8 + i] = (byte)EVParams[i]; + + // Byte 14: HPRestoreParam + data[14] = HPRestoreParam; + + // Byte 15: PPRestoreParam + data[15] = PPRestoreParam; + + // Bytes 16–18: FriendshipParams + for (int i = 0; i < 3; i++) + data[16 + i] = (byte)FriendshipParams[i]; + + // Write all bytes + writer.Write(data); + + // Write padding + writer.Write(new byte[2]); + } + + } + } +} diff --git a/DS_Map/RomInfo.cs b/DS_Map/RomInfo.cs index 2587a9a..48857de 100644 --- a/DS_Map/RomInfo.cs +++ b/DS_Map/RomInfo.cs @@ -70,6 +70,7 @@ namespace DSPRE public static int attackNamesTextNumber { get; private set; } public static int[] pokemonNamesTextNumbers { get; private set; } public static int itemNamesTextNumber { get; private set; } + public static int itemDescriptionsTextNumber { get; private set; } public static int itemScriptFileNumber { get; internal set; } public static int trainerClassMessageNumber { get; private set; } public static int trainerNamesMessageNumber { get; private set; } @@ -171,7 +172,9 @@ namespace DSPRE interiorBuildingModels, learnsets, - evolutions + evolutions, + + itemData }; public static Dictionary gameDirs { get; private set; } @@ -223,7 +226,7 @@ namespace DSPRE SetAbilityNamesTextNumber(); SetAttackNamesTextNumber(); SetPokemonNamesTextNumber(); - SetItemNamesTextNumber(); + SetItemsTextNumber(); SetItemScriptFileNumber(); SetLocationNamesTextNumber(); SetTrainerNamesMessageNumber(); @@ -1015,20 +1018,23 @@ namespace DSPRE } } - private static void SetItemNamesTextNumber() + private static void SetItemsTextNumber() { switch (gameFamily) { case GameFamilies.DP: itemNamesTextNumber = 344; + itemDescriptionsTextNumber = 0; break; case GameFamilies.Plat: itemNamesTextNumber = 392; + itemDescriptionsTextNumber = 0; break; default: itemNamesTextNumber = gameLanguage == GameLanguages.Japanese ? 219 : 222; + itemDescriptionsTextNumber = 221; break; } } @@ -1461,6 +1467,8 @@ namespace DSPRE [DirNames.pokemonBattleSprites] = @"data\poketool\pokegra\pokegra.narc", [DirNames.otherPokemonBattleSprites] = @"data\poketool\pokegra\otherpoke.narc", + + [DirNames.itemData] = @"data\itemtool\item_data.narc", }; //Personal Data archive is different for Pearl @@ -1513,6 +1521,8 @@ namespace DSPRE [DirNames.encounters] = @"data\fielddata\encountdata\" + suffix + '_' + "enc_data.narc", [DirNames.learnsets] = @"data\poketool\personal\wotbl.narc", [DirNames.evolutions] = @"data\poketool\personal\evo.narc", + + [DirNames.itemData] = @"data\itemtool\pl_item_data.narc", }; break; @@ -1552,7 +1562,7 @@ namespace DSPRE [DirNames.interiorBuildingModels] = @"data\a\1\4\8", [DirNames.learnsets] = @"data\a\0\3\3", [DirNames.evolutions] = @"data\a\0\3\4", - + [DirNames.itemData] = @"data\a\0\1\7", [DirNames.safariZone] = @"data\a\2\3\0", [DirNames.headbutt] = @"data\a\2\5\2", //both versions use the same folder with different data };