From 42523cdb12bd46ae1c1d1289a6da6f4524bed896 Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Sat, 2 Mar 2024 10:33:30 +0100 Subject: [PATCH 01/40] Wild Editor fixes --- DS_Map/WildEditorDPPt.Designer.cs | 36 +- DS_Map/WildEditorDPPt.cs | 10 +- DS_Map/WildEditorDPPt.resx | 10 +- DS_Map/WildEditorHGSS.Designer.cs | 2715 +++++++++++++++-------------- DS_Map/WildEditorHGSS.cs | 8 +- 5 files changed, 1396 insertions(+), 1383 deletions(-) diff --git a/DS_Map/WildEditorDPPt.Designer.cs b/DS_Map/WildEditorDPPt.Designer.cs index 2c71af0..e43b179 100644 --- a/DS_Map/WildEditorDPPt.Designer.cs +++ b/DS_Map/WildEditorDPPt.Designer.cs @@ -1675,7 +1675,7 @@ this.label70.Name = "label70"; this.label70.Size = new System.Drawing.Size(21, 13); this.label70.TabIndex = 20; - this.label70.Text = "1%"; + this.label70.Text = "5%"; // // superRodOneComboBox // @@ -1708,11 +1708,11 @@ // this.label71.AutoSize = true; this.label71.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label71.Location = new System.Drawing.Point(18, 161); + this.label71.Location = new System.Drawing.Point(12, 161); this.label71.Name = "label71"; - this.label71.Size = new System.Drawing.Size(21, 13); + this.label71.Size = new System.Drawing.Size(27, 13); this.label71.TabIndex = 16; - this.label71.Text = "4%"; + this.label71.Text = "10%"; // // superRodFourComboBox // @@ -1786,7 +1786,7 @@ this.label73.Name = "label73"; this.label73.Size = new System.Drawing.Size(27, 13); this.label73.TabIndex = 8; - this.label73.Text = "40%"; + this.label73.Text = "30%"; // // superRodSecondFortyComboBox // @@ -1934,7 +1934,7 @@ this.label54.Name = "label54"; this.label54.Size = new System.Drawing.Size(21, 13); this.label54.TabIndex = 20; - this.label54.Text = "1%"; + this.label54.Text = "5%"; // // goodRodOneComboBox // @@ -1967,11 +1967,11 @@ // this.label55.AutoSize = true; this.label55.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label55.Location = new System.Drawing.Point(18, 161); + this.label55.Location = new System.Drawing.Point(12, 161); this.label55.Name = "label55"; - this.label55.Size = new System.Drawing.Size(21, 13); + this.label55.Size = new System.Drawing.Size(27, 13); this.label55.TabIndex = 16; - this.label55.Text = "4%"; + this.label55.Text = "10%"; // // goodRodFourComboBox // @@ -2045,7 +2045,7 @@ this.label57.Name = "label57"; this.label57.Size = new System.Drawing.Size(27, 13); this.label57.TabIndex = 8; - this.label57.Text = "40%"; + this.label57.Text = "30%"; // // goodRodSecondFortyComboBox // @@ -2193,7 +2193,7 @@ this.label46.Name = "label46"; this.label46.Size = new System.Drawing.Size(21, 13); this.label46.TabIndex = 20; - this.label46.Text = "1%"; + this.label46.Text = "5%"; // // oldRodOneComboBox // @@ -2226,11 +2226,11 @@ // this.label47.AutoSize = true; this.label47.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label47.Location = new System.Drawing.Point(18, 161); + this.label47.Location = new System.Drawing.Point(11, 161); this.label47.Name = "label47"; - this.label47.Size = new System.Drawing.Size(21, 13); + this.label47.Size = new System.Drawing.Size(27, 13); this.label47.TabIndex = 16; - this.label47.Text = "4%"; + this.label47.Text = "10%"; // // oldRodFourComboBox // @@ -2263,11 +2263,11 @@ // this.label48.AutoSize = true; this.label48.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label48.Location = new System.Drawing.Point(18, 134); + this.label48.Location = new System.Drawing.Point(11, 134); this.label48.Name = "label48"; - this.label48.Size = new System.Drawing.Size(21, 13); + this.label48.Size = new System.Drawing.Size(27, 13); this.label48.TabIndex = 12; - this.label48.Text = "5%"; + this.label48.Text = "15%"; // // oldRodFiveComboBox // @@ -2341,7 +2341,7 @@ this.label50.Name = "label50"; this.label50.Size = new System.Drawing.Size(27, 13); this.label50.TabIndex = 4; - this.label50.Text = "60%"; + this.label50.Text = "40%"; // // oldRodSixtyComboBox // diff --git a/DS_Map/WildEditorDPPt.cs b/DS_Map/WildEditorDPPt.cs index 7f42124..713904a 100644 --- a/DS_Map/WildEditorDPPt.cs +++ b/DS_Map/WildEditorDPPt.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.IO; +using System.Reflection; using System.Windows.Forms; using static DSPRE.RomInfo; @@ -10,11 +11,11 @@ namespace DSPRE { public string encounterFileFolder { get; private set; } EncounterFileDPPt currentFile; bool disableHandlers = false; - + public WildEditorDPPt(string dirPath, string[] names, int encToOpen, int totalNumHeaderFiles) { InitializeComponent(); encounterFileFolder = dirPath; - + Text = "DSPRE Reloaded " + GetDSPREVersion() + " - DPPt Encounters Editor"; disableHandlers = true; MapHeader tempMapHeader; @@ -236,6 +237,11 @@ namespace DSPRE { disableHandlers = false; } + public string GetDSPREVersion() { + return "" + Assembly.GetExecutingAssembly().GetName().Version.Major + "." + Assembly.GetExecutingAssembly().GetName().Version.Minor + + "." + Assembly.GetExecutingAssembly().GetName().Version.Build; + } + private void exportEncounterFileButton_Click(object sender, EventArgs e) { currentFile.SaveToFileExplorePath("Encounter File " + selectEncounterComboBox.SelectedIndex); } diff --git a/DS_Map/WildEditorDPPt.resx b/DS_Map/WildEditorDPPt.resx index 10a5d64..3879d32 100644 --- a/DS_Map/WildEditorDPPt.resx +++ b/DS_Map/WildEditorDPPt.resx @@ -121,7 +121,7 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAdCAYAAADLnm6HAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC41ZYUyZQAAAPBJREFUSEvtkkEK + vgAADr4B6kKxwAAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC41ZYUyZQAAAPBJREFUSEvtkkEK wjAURHOEHkFw1WWv5dalV/Eqnq0y+qeM32iaNgkUMvAIbfIzr2Lo6TlMzsMwE3vVLih9TNNCUxEtv4/j i6YiKGAxuZ3eVBfBpfrlnqoivny+XhZUAhQX+VeuqAQoIrK23ONFsGaLbC0nnAOUACpiVd9h+R4Bwnkl KYGNmASIlaxB7wBJAfxsJUV0FvBuq/wMN/lP5rOXALEyj57Xu7FaZTx6eKuInvF3WU06LM4V0fec56xd @@ -132,7 +132,7 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAXCAYAAAARIY8tAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC41ZYUyZQAAA95JREFUSEutlN1P + vQAADr0BR/uQrQAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC41ZYUyZQAAA95JREFUSEutlN1P U3cYx3+ZjBcdirhCi1Rooe2v7Tmnp7RnVkUSTRR8i9FoBibuhmxTb4wXxt0srXOsM6DUFwxJFSFGeVES fEGLL6QGozDdINuy7M7/wItlN7vZ43menv56KiSS6C/5htPn+3w/z++c8zuwxS4+xEZ0AcozxPYb5Y+z dGB/U2r5662PPweUNlaSxpphf/jCXbc8sUDrdC0pcncZ3Ylhv3/xQTas63+zDIvWYga8m897jPyybYQn @@ -166,7 +166,7 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAK - 7QAACu0BAohJwQAAACB0RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgTVi7kSokAAABOElE + 6wAACusBgosNWgAAACB0RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgTVi7kSokAAABOElE QVRIS7WToRLCMBBE+aRKPiOyks9AViKRfAYSWcknIJFIZF1gM7OZzeUKDVPEm1w2e7dNC5sY419xxTWp hK7rYh9CxMr6OAzvo9K3lGKDgawxmMNZ86yFXOhwRUPmPJ/IxadmnCHkOo7NIbn41qghLd+k2CwNaXld lYBGxZ7zmyx9Xa6o2CHYt4S4osUL8VAPqQQPbUZ97bfxOewS4+2eOJ0vbkixsXhPhj2HA+w53PPnQvGM @@ -178,7 +178,7 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAe - vwAAHr8BQ/1smgAAAAd0SU1FB9UDGhMWCY0H+k0AAAEJSURBVEhLtZKxEcIwDEUZhzIlJSOkpGQEyoyQ + vQAAHr0BPAOvEwAAAAd0SU1FB9UDGhMWCY0H+k0AAAEJSURBVEhLtZKxEcIwDEUZhzIlJSOkpGQEyoyQ ERgjJSVlRkjJCJTpzH3fSafYki3nQvGOb1nRi4BTCOGvqMUjUYtd14XHeA74pAzSPg9ZAQMp0+Bpvkbk nZfNwRpAkuV7b5ZsDqWHcbdHwsHz0B4JB+8DrRIOXoH80UHt38XBKwAtW3BoEQCvhMNeQe1r4mAJUC/d 1bbgoDWgtq5rmG8XdQAJSltwSAfgjMESSzIMU0S73zRSpvN7+cQ3w/Dn9DIFfT9GigJgSazhBEm0LbJG @@ -189,7 +189,7 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAK - 7QAACu0BAohJwQAAACB0RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgTVi7kSokAAABFElE + 6wAACusBgosNWgAAACB0RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgTVi7kSokAAABFElE QVRIS7WUvQ3CMBSEKSkZJSVlxmCElIxAyQgZgzJlSkagzBjpjC7SWc+PI/4RFJ+cd7bvU4LEIYTwV2RI uq4LxO+VIkOA0mUaNq79qVkiQ0DBPPabYLjdmyQyJChk+fxamiQytKBwfExRUvu5ZEhYhBWCcTjGT1Yq kSHwBZhRTgnWEokMv12kBG+AFeQkH0HuAvbtW+QkyZArJzWSZCgVgFJJcoHPpeAOfw+sEPme5DCfa7AS diff --git a/DS_Map/WildEditorHGSS.Designer.cs b/DS_Map/WildEditorHGSS.Designer.cs index 0b87ce4..903c5fd 100644 --- a/DS_Map/WildEditorHGSS.Designer.cs +++ b/DS_Map/WildEditorHGSS.Designer.cs @@ -51,24 +51,13 @@ this.rockSmashNinetyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); this.rockSmashNinetyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); this.rockSmashRateUpDown = new System.Windows.Forms.NumericUpDown(); - this.rockSmashNinetyComboBox = new DSPRE.InputComboBox(); this.label13 = new System.Windows.Forms.Label(); - this.rockSmashTenComboBox = new DSPRE.InputComboBox(); this.radioMusicComboBox = new System.Windows.Forms.GroupBox(); - this.sinnohSecondComboBox = new DSPRE.InputComboBox(); this.label10 = new System.Windows.Forms.Label(); - this.sinnohFirstComboBox = new DSPRE.InputComboBox(); - this.hoennSecondComboBox = new DSPRE.InputComboBox(); this.label9 = new System.Windows.Forms.Label(); - this.hoennFirstComboBox = new DSPRE.InputComboBox(); this.swarmsGroupBox = new System.Windows.Forms.GroupBox(); - this.superRodSwarmComboBox = new DSPRE.InputComboBox(); - this.goodRodSwarmComboBox = new DSPRE.InputComboBox(); this.label5 = new System.Windows.Forms.Label(); - this.surfSwarmComboBox = new DSPRE.InputComboBox(); this.label6 = new System.Windows.Forms.Label(); - this.grassSwarmComboBox = new DSPRE.InputComboBox(); - this.label7 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label(); this.walkingGroupBox = new System.Windows.Forms.GroupBox(); this.label4 = new System.Windows.Forms.Label(); @@ -77,6 +66,127 @@ this.label14 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); + this.oneSecondLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label79 = new System.Windows.Forms.Label(); + this.oneFirstLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label80 = new System.Windows.Forms.Label(); + this.fourSecondLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label81 = new System.Windows.Forms.Label(); + this.fourFirstLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label82 = new System.Windows.Forms.Label(); + this.fiveSecondLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label83 = new System.Windows.Forms.Label(); + this.fiveFirstLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label84 = new System.Windows.Forms.Label(); + this.tenFourthLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label85 = new System.Windows.Forms.Label(); + this.tenThirdLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label86 = new System.Windows.Forms.Label(); + this.tenSecondLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label87 = new System.Windows.Forms.Label(); + this.tenFirstLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label88 = new System.Windows.Forms.Label(); + this.twentySecondLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label89 = new System.Windows.Forms.Label(); + this.twentyFirstLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label90 = new System.Windows.Forms.Label(); + this.waterTabPage = new System.Windows.Forms.TabPage(); + this.surfPicture = new System.Windows.Forms.PictureBox(); + this.pictureBox7 = new System.Windows.Forms.PictureBox(); + this.pictureBox6 = new System.Windows.Forms.PictureBox(); + this.pictureBox5 = new System.Windows.Forms.PictureBox(); + this.superRodGroupBox = new System.Windows.Forms.GroupBox(); + this.label59 = new System.Windows.Forms.Label(); + this.label60 = new System.Windows.Forms.Label(); + this.superRodRateUpDown = new System.Windows.Forms.NumericUpDown(); + this.label69 = new System.Windows.Forms.Label(); + this.superRodOneMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.superRodOneMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label70 = new System.Windows.Forms.Label(); + this.superRodFourMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.superRodFourMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label71 = new System.Windows.Forms.Label(); + this.superRodFifteenMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.superRodFifteenMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label72 = new System.Windows.Forms.Label(); + this.superRodSecondFortyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.superRodSecondFortyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label73 = new System.Windows.Forms.Label(); + this.superRodFirstFortyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.superRodFirstFortyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label74 = new System.Windows.Forms.Label(); + this.goodRodGroupBox = new System.Windows.Forms.GroupBox(); + this.label51 = new System.Windows.Forms.Label(); + this.label52 = new System.Windows.Forms.Label(); + this.goodRodRateUpDown = new System.Windows.Forms.NumericUpDown(); + this.label53 = new System.Windows.Forms.Label(); + this.goodRodOneMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.goodRodOneMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label54 = new System.Windows.Forms.Label(); + this.goodRodFourMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.goodRodFourMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label55 = new System.Windows.Forms.Label(); + this.goodRodFifteenMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.goodRodFifteenMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label56 = new System.Windows.Forms.Label(); + this.goodRodSecondFortyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.goodRodSecondFortyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label57 = new System.Windows.Forms.Label(); + this.goodRodFirstFortyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.goodRodFirstFortyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label58 = new System.Windows.Forms.Label(); + this.oldRodGroupBox = new System.Windows.Forms.GroupBox(); + this.label43 = new System.Windows.Forms.Label(); + this.label44 = new System.Windows.Forms.Label(); + this.oldRodRateUpDown = new System.Windows.Forms.NumericUpDown(); + this.label45 = new System.Windows.Forms.Label(); + this.oldRodOneMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.oldRodOneMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label46 = new System.Windows.Forms.Label(); + this.oldRodFourMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.oldRodFourMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label47 = new System.Windows.Forms.Label(); + this.oldRodFiveMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.oldRodFiveMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label48 = new System.Windows.Forms.Label(); + this.oldRodThirtyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.oldRodThirtyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label49 = new System.Windows.Forms.Label(); + this.oldRodSixtyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.oldRodSixtyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label50 = new System.Windows.Forms.Label(); + this.surfGroupBox = new System.Windows.Forms.GroupBox(); + this.label68 = new System.Windows.Forms.Label(); + this.label67 = new System.Windows.Forms.Label(); + this.surfRateUpDown = new System.Windows.Forms.NumericUpDown(); + this.label61 = new System.Windows.Forms.Label(); + this.surfOneMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.surfOneMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label62 = new System.Windows.Forms.Label(); + this.surfFourMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.surfFourMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label63 = new System.Windows.Forms.Label(); + this.surfFiveMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.surfFiveMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label64 = new System.Windows.Forms.Label(); + this.surfThirtyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.surfThirtyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label65 = new System.Windows.Forms.Label(); + this.surfSixtyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.surfSixtyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label66 = new System.Windows.Forms.Label(); + this.repairAllButton = new System.Windows.Forms.Button(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.goodRodSwarmComboBox = new DSPRE.InputComboBox(); + this.rockSmashNinetyComboBox = new DSPRE.InputComboBox(); + this.rockSmashTenComboBox = new DSPRE.InputComboBox(); + this.sinnohSecondComboBox = new DSPRE.InputComboBox(); + this.sinnohFirstComboBox = new DSPRE.InputComboBox(); + this.hoennSecondComboBox = new DSPRE.InputComboBox(); + this.hoennFirstComboBox = new DSPRE.InputComboBox(); + this.superRodSwarmComboBox = new DSPRE.InputComboBox(); + this.surfSwarmComboBox = new DSPRE.InputComboBox(); + this.grassSwarmComboBox = new DSPRE.InputComboBox(); this.nightOneSecondComboBox = new DSPRE.InputComboBox(); this.nightOneFirstComboBox = new DSPRE.InputComboBox(); this.nightFourSecondComboBox = new DSPRE.InputComboBox(); @@ -101,148 +211,38 @@ this.dayTenFirstComboBox = new DSPRE.InputComboBox(); this.dayTwentySecondComboBox = new DSPRE.InputComboBox(); this.dayTwentyFirstComboBox = new DSPRE.InputComboBox(); - this.oneSecondLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label79 = new System.Windows.Forms.Label(); this.morningOneSecondComboBox = new DSPRE.InputComboBox(); - this.oneFirstLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label80 = new System.Windows.Forms.Label(); this.morningOneFirstComboBox = new DSPRE.InputComboBox(); - this.fourSecondLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label81 = new System.Windows.Forms.Label(); this.morningFourSecondComboBox = new DSPRE.InputComboBox(); - this.fourFirstLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label82 = new System.Windows.Forms.Label(); this.morningFourFirstComboBox = new DSPRE.InputComboBox(); - this.fiveSecondLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label83 = new System.Windows.Forms.Label(); this.morningFiveSecondComboBox = new DSPRE.InputComboBox(); - this.fiveFirstLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label84 = new System.Windows.Forms.Label(); this.morningFiveFirstComboBox = new DSPRE.InputComboBox(); - this.tenFourthLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label85 = new System.Windows.Forms.Label(); this.morningTenFourthComboBox = new DSPRE.InputComboBox(); - this.tenThirdLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label86 = new System.Windows.Forms.Label(); this.morningTenThirdComboBox = new DSPRE.InputComboBox(); - this.tenSecondLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label87 = new System.Windows.Forms.Label(); this.morningTenSecondComboBox = new DSPRE.InputComboBox(); - this.tenFirstLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label88 = new System.Windows.Forms.Label(); this.morningTenFirstComboBox = new DSPRE.InputComboBox(); - this.twentySecondLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label89 = new System.Windows.Forms.Label(); this.morningTwentySecondComboBox = new DSPRE.InputComboBox(); - this.twentyFirstLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label90 = new System.Windows.Forms.Label(); this.morningTwentyFirstComboBox = new DSPRE.InputComboBox(); - this.waterTabPage = new System.Windows.Forms.TabPage(); - this.surfPicture = new System.Windows.Forms.PictureBox(); - this.pictureBox7 = new System.Windows.Forms.PictureBox(); - this.pictureBox6 = new System.Windows.Forms.PictureBox(); - this.pictureBox5 = new System.Windows.Forms.PictureBox(); - this.superRodGroupBox = new System.Windows.Forms.GroupBox(); - this.label59 = new System.Windows.Forms.Label(); - this.label60 = new System.Windows.Forms.Label(); - this.superRodRateUpDown = new System.Windows.Forms.NumericUpDown(); - this.label69 = new System.Windows.Forms.Label(); - this.superRodOneMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.superRodOneMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label70 = new System.Windows.Forms.Label(); this.superRodOneComboBox = new DSPRE.InputComboBox(); - this.superRodFourMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.superRodFourMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label71 = new System.Windows.Forms.Label(); this.superRodFourComboBox = new DSPRE.InputComboBox(); - this.superRodFifteenMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.superRodFifteenMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label72 = new System.Windows.Forms.Label(); this.superRodFifteenComboBox = new DSPRE.InputComboBox(); - this.superRodSecondFortyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.superRodSecondFortyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label73 = new System.Windows.Forms.Label(); this.superRodSecondFortyComboBox = new DSPRE.InputComboBox(); - this.superRodFirstFortyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.superRodFirstFortyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label74 = new System.Windows.Forms.Label(); this.superRodFirstFortyComboBox = new DSPRE.InputComboBox(); - this.goodRodGroupBox = new System.Windows.Forms.GroupBox(); - this.label51 = new System.Windows.Forms.Label(); - this.label52 = new System.Windows.Forms.Label(); - this.goodRodRateUpDown = new System.Windows.Forms.NumericUpDown(); - this.label53 = new System.Windows.Forms.Label(); - this.goodRodOneMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.goodRodOneMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label54 = new System.Windows.Forms.Label(); this.goodRodOneComboBox = new DSPRE.InputComboBox(); - this.goodRodFourMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.goodRodFourMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label55 = new System.Windows.Forms.Label(); this.goodRodFourComboBox = new DSPRE.InputComboBox(); - this.goodRodFifteenMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.goodRodFifteenMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label56 = new System.Windows.Forms.Label(); this.goodRodFifteenComboBox = new DSPRE.InputComboBox(); - this.goodRodSecondFortyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.goodRodSecondFortyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label57 = new System.Windows.Forms.Label(); this.goodRodSecondFortyComboBox = new DSPRE.InputComboBox(); - this.goodRodFirstFortyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.goodRodFirstFortyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label58 = new System.Windows.Forms.Label(); this.goodRodFirstFortyComboBox = new DSPRE.InputComboBox(); - this.oldRodGroupBox = new System.Windows.Forms.GroupBox(); - this.label43 = new System.Windows.Forms.Label(); - this.label44 = new System.Windows.Forms.Label(); - this.oldRodRateUpDown = new System.Windows.Forms.NumericUpDown(); - this.label45 = new System.Windows.Forms.Label(); - this.oldRodOneMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.oldRodOneMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label46 = new System.Windows.Forms.Label(); this.oldRodOneComboBox = new DSPRE.InputComboBox(); - this.oldRodFourMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.oldRodFourMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label47 = new System.Windows.Forms.Label(); this.oldRodFourComboBox = new DSPRE.InputComboBox(); - this.oldRodFiveMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.oldRodFiveMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label48 = new System.Windows.Forms.Label(); this.oldRodFiveComboBox = new DSPRE.InputComboBox(); - this.oldRodThirtyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.oldRodThirtyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label49 = new System.Windows.Forms.Label(); this.oldRodThirtyComboBox = new DSPRE.InputComboBox(); - this.oldRodSixtyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.oldRodSixtyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label50 = new System.Windows.Forms.Label(); this.oldRodSixtyComboBox = new DSPRE.InputComboBox(); - this.surfGroupBox = new System.Windows.Forms.GroupBox(); - this.label68 = new System.Windows.Forms.Label(); - this.label67 = new System.Windows.Forms.Label(); - this.surfRateUpDown = new System.Windows.Forms.NumericUpDown(); - this.label61 = new System.Windows.Forms.Label(); - this.surfOneMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.surfOneMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label62 = new System.Windows.Forms.Label(); this.surfOneComboBox = new DSPRE.InputComboBox(); - this.surfFourMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.surfFourMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label63 = new System.Windows.Forms.Label(); this.surfFourComboBox = new DSPRE.InputComboBox(); - this.surfFiveMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.surfFiveMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label64 = new System.Windows.Forms.Label(); this.surfFiveComboBox = new DSPRE.InputComboBox(); - this.surfThirtyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.surfThirtyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label65 = new System.Windows.Forms.Label(); this.surfThirtyComboBox = new DSPRE.InputComboBox(); - this.surfSixtyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.surfSixtyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label66 = new System.Windows.Forms.Label(); this.surfSixtyComboBox = new DSPRE.InputComboBox(); - this.repairAllButton = new System.Windows.Forms.Button(); this.mainTabControl.SuspendLayout(); this.grassGroundTabPage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); @@ -323,6 +323,7 @@ ((System.ComponentModel.ISupportInitialize)(this.surfThirtyMinLevelUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.surfSixtyMaxLevelUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.surfSixtyMinLevelUpDown)).BeginInit(); + this.groupBox1.SuspendLayout(); this.SuspendLayout(); // // removeEncounterFileButton @@ -416,11 +417,12 @@ this.mainTabControl.Location = new System.Drawing.Point(9, 53); this.mainTabControl.Name = "mainTabControl"; this.mainTabControl.SelectedIndex = 0; - this.mainTabControl.Size = new System.Drawing.Size(742, 490); + this.mainTabControl.Size = new System.Drawing.Size(803, 534); this.mainTabControl.TabIndex = 68; // // grassGroundTabPage // + this.grassGroundTabPage.Controls.Add(this.groupBox1); this.grassGroundTabPage.Controls.Add(this.pictureBox3); this.grassGroundTabPage.Controls.Add(this.pictureBox1); this.grassGroundTabPage.Controls.Add(this.pictureBox2); @@ -431,7 +433,7 @@ this.grassGroundTabPage.Location = new System.Drawing.Point(4, 22); this.grassGroundTabPage.Name = "grassGroundTabPage"; this.grassGroundTabPage.Padding = new System.Windows.Forms.Padding(3); - this.grassGroundTabPage.Size = new System.Drawing.Size(734, 464); + this.grassGroundTabPage.Size = new System.Drawing.Size(795, 508); this.grassGroundTabPage.TabIndex = 0; this.grassGroundTabPage.Text = "Grass/Ground"; this.grassGroundTabPage.UseVisualStyleBackColor = true; @@ -439,7 +441,7 @@ // pictureBox3 // this.pictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox3.Image"))); - this.pictureBox3.Location = new System.Drawing.Point(615, 4); + this.pictureBox3.Location = new System.Drawing.Point(677, 9); this.pictureBox3.Name = "pictureBox3"; this.pictureBox3.Size = new System.Drawing.Size(16, 21); this.pictureBox3.TabIndex = 233; @@ -448,7 +450,7 @@ // pictureBox1 // this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(566, 210); + this.pictureBox1.Location = new System.Drawing.Point(628, 225); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(16, 21); this.pictureBox1.TabIndex = 232; @@ -477,9 +479,9 @@ this.rockSmashGroupBox.Controls.Add(this.rockSmashNinetyComboBox); this.rockSmashGroupBox.Controls.Add(this.label13); this.rockSmashGroupBox.Controls.Add(this.rockSmashTenComboBox); - this.rockSmashGroupBox.Location = new System.Drawing.Point(492, 212); + this.rockSmashGroupBox.Location = new System.Drawing.Point(554, 227); this.rockSmashGroupBox.Name = "rockSmashGroupBox"; - this.rockSmashGroupBox.Size = new System.Drawing.Size(232, 189); + this.rockSmashGroupBox.Size = new System.Drawing.Size(232, 212); this.rockSmashGroupBox.TabIndex = 165; this.rockSmashGroupBox.TabStop = false; this.rockSmashGroupBox.Text = "Rock Smash"; @@ -567,17 +569,6 @@ this.rockSmashRateUpDown.TabIndex = 69; this.rockSmashRateUpDown.ValueChanged += new System.EventHandler(this.rockSmashRateUpDown_ValueChanged); // - // rockSmashNinetyComboBox - // - this.rockSmashNinetyComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.rockSmashNinetyComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.rockSmashNinetyComboBox.FormattingEnabled = true; - this.rockSmashNinetyComboBox.Location = new System.Drawing.Point(7, 79); - this.rockSmashNinetyComboBox.Name = "rockSmashNinetyComboBox"; - this.rockSmashNinetyComboBox.Size = new System.Drawing.Size(121, 21); - this.rockSmashNinetyComboBox.TabIndex = 39; - this.rockSmashNinetyComboBox.SelectedIndexChanged += new System.EventHandler(this.rockSmashNinetyComboBox_SelectedIndexChanged); - // // label13 // this.label13.AutoSize = true; @@ -588,17 +579,6 @@ this.label13.TabIndex = 68; this.label13.Text = "Encounter Rate"; // - // rockSmashTenComboBox - // - this.rockSmashTenComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.rockSmashTenComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.rockSmashTenComboBox.FormattingEnabled = true; - this.rockSmashTenComboBox.Location = new System.Drawing.Point(7, 128); - this.rockSmashTenComboBox.Name = "rockSmashTenComboBox"; - this.rockSmashTenComboBox.Size = new System.Drawing.Size(121, 21); - this.rockSmashTenComboBox.TabIndex = 42; - this.rockSmashTenComboBox.SelectedIndexChanged += new System.EventHandler(this.rockSmashTenComboBox_SelectedIndexChanged); - // // radioMusicComboBox // this.radioMusicComboBox.Controls.Add(this.sinnohSecondComboBox); @@ -607,24 +587,13 @@ this.radioMusicComboBox.Controls.Add(this.hoennSecondComboBox); this.radioMusicComboBox.Controls.Add(this.label9); this.radioMusicComboBox.Controls.Add(this.hoennFirstComboBox); - this.radioMusicComboBox.Location = new System.Drawing.Point(492, 7); + this.radioMusicComboBox.Location = new System.Drawing.Point(554, 12); this.radioMusicComboBox.Name = "radioMusicComboBox"; - this.radioMusicComboBox.Size = new System.Drawing.Size(232, 191); + this.radioMusicComboBox.Size = new System.Drawing.Size(232, 209); this.radioMusicComboBox.TabIndex = 164; this.radioMusicComboBox.TabStop = false; this.radioMusicComboBox.Text = "Radio Sound Pokémon"; // - // sinnohSecondComboBox - // - this.sinnohSecondComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.sinnohSecondComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.sinnohSecondComboBox.FormattingEnabled = true; - this.sinnohSecondComboBox.Location = new System.Drawing.Point(42, 151); - this.sinnohSecondComboBox.Name = "sinnohSecondComboBox"; - this.sinnohSecondComboBox.Size = new System.Drawing.Size(150, 21); - this.sinnohSecondComboBox.TabIndex = 231; - this.sinnohSecondComboBox.SelectedIndexChanged += new System.EventHandler(this.sinnohSecondComboBox_SelectedIndexChanged); - // // label10 // this.label10.AutoSize = true; @@ -634,28 +603,6 @@ this.label10.TabIndex = 230; this.label10.Text = "Sinnoh Music"; // - // sinnohFirstComboBox - // - this.sinnohFirstComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.sinnohFirstComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.sinnohFirstComboBox.FormattingEnabled = true; - this.sinnohFirstComboBox.Location = new System.Drawing.Point(42, 124); - this.sinnohFirstComboBox.Name = "sinnohFirstComboBox"; - this.sinnohFirstComboBox.Size = new System.Drawing.Size(150, 21); - this.sinnohFirstComboBox.TabIndex = 229; - this.sinnohFirstComboBox.SelectedIndexChanged += new System.EventHandler(this.sinnohFirstComboBox_SelectedIndexChanged); - // - // hoennSecondComboBox - // - this.hoennSecondComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.hoennSecondComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.hoennSecondComboBox.FormattingEnabled = true; - this.hoennSecondComboBox.Location = new System.Drawing.Point(42, 72); - this.hoennSecondComboBox.Name = "hoennSecondComboBox"; - this.hoennSecondComboBox.Size = new System.Drawing.Size(150, 21); - this.hoennSecondComboBox.TabIndex = 228; - this.hoennSecondComboBox.SelectedIndexChanged += new System.EventHandler(this.hoennSecondComboBox_SelectedIndexChanged); - // // label9 // this.label9.AutoSize = true; @@ -665,77 +612,31 @@ this.label9.TabIndex = 227; this.label9.Text = "Hoenn Music"; // - // hoennFirstComboBox - // - this.hoennFirstComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.hoennFirstComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.hoennFirstComboBox.FormattingEnabled = true; - this.hoennFirstComboBox.Location = new System.Drawing.Point(42, 45); - this.hoennFirstComboBox.Name = "hoennFirstComboBox"; - this.hoennFirstComboBox.Size = new System.Drawing.Size(150, 21); - this.hoennFirstComboBox.TabIndex = 226; - this.hoennFirstComboBox.SelectedIndexChanged += new System.EventHandler(this.hoennFirstComboBox_SelectedIndexChanged); - // // swarmsGroupBox // this.swarmsGroupBox.Controls.Add(this.superRodSwarmComboBox); - this.swarmsGroupBox.Controls.Add(this.goodRodSwarmComboBox); this.swarmsGroupBox.Controls.Add(this.label5); this.swarmsGroupBox.Controls.Add(this.surfSwarmComboBox); this.swarmsGroupBox.Controls.Add(this.label6); this.swarmsGroupBox.Controls.Add(this.grassSwarmComboBox); - this.swarmsGroupBox.Controls.Add(this.label7); this.swarmsGroupBox.Controls.Add(this.label8); - this.swarmsGroupBox.Location = new System.Drawing.Point(12, 404); + this.swarmsGroupBox.Location = new System.Drawing.Point(12, 445); this.swarmsGroupBox.Name = "swarmsGroupBox"; - this.swarmsGroupBox.Size = new System.Drawing.Size(712, 51); + this.swarmsGroupBox.Size = new System.Drawing.Size(536, 51); this.swarmsGroupBox.TabIndex = 163; this.swarmsGroupBox.TabStop = false; this.swarmsGroupBox.Text = "Swarm"; // - // superRodSwarmComboBox - // - this.superRodSwarmComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.superRodSwarmComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.superRodSwarmComboBox.FormattingEnabled = true; - this.superRodSwarmComboBox.Location = new System.Drawing.Point(575, 19); - this.superRodSwarmComboBox.Name = "superRodSwarmComboBox"; - this.superRodSwarmComboBox.Size = new System.Drawing.Size(121, 21); - this.superRodSwarmComboBox.TabIndex = 50; - this.superRodSwarmComboBox.SelectedIndexChanged += new System.EventHandler(this.superRodSwarmComboBox_SelectedIndexChanged); - // - // goodRodSwarmComboBox - // - this.goodRodSwarmComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.goodRodSwarmComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.goodRodSwarmComboBox.FormattingEnabled = true; - this.goodRodSwarmComboBox.Location = new System.Drawing.Point(395, 19); - this.goodRodSwarmComboBox.Name = "goodRodSwarmComboBox"; - this.goodRodSwarmComboBox.Size = new System.Drawing.Size(121, 21); - this.goodRodSwarmComboBox.TabIndex = 48; - this.goodRodSwarmComboBox.SelectedIndexChanged += new System.EventHandler(this.goodRodSwarmComboBox_SelectedIndexChanged); - // // label5 // this.label5.AutoSize = true; this.label5.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label5.Location = new System.Drawing.Point(181, 22); + this.label5.Location = new System.Drawing.Point(175, 22); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(26, 13); this.label5.TabIndex = 47; this.label5.Text = "Surf"; // - // surfSwarmComboBox - // - this.surfSwarmComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.surfSwarmComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.surfSwarmComboBox.FormattingEnabled = true; - this.surfSwarmComboBox.Location = new System.Drawing.Point(213, 19); - this.surfSwarmComboBox.Name = "surfSwarmComboBox"; - this.surfSwarmComboBox.Size = new System.Drawing.Size(121, 21); - this.surfSwarmComboBox.TabIndex = 46; - this.surfSwarmComboBox.SelectedIndexChanged += new System.EventHandler(this.surfSwarmComboBox_SelectedIndexChanged); - // // label6 // this.label6.AutoSize = true; @@ -746,36 +647,15 @@ this.label6.TabIndex = 45; this.label6.Text = "Grass"; // - // grassSwarmComboBox - // - this.grassSwarmComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.grassSwarmComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.grassSwarmComboBox.FormattingEnabled = true; - this.grassSwarmComboBox.Location = new System.Drawing.Point(48, 19); - this.grassSwarmComboBox.Name = "grassSwarmComboBox"; - this.grassSwarmComboBox.Size = new System.Drawing.Size(121, 21); - this.grassSwarmComboBox.TabIndex = 44; - this.grassSwarmComboBox.SelectedIndexChanged += new System.EventHandler(this.grassSwarmComboBox_SelectedIndexChanged); - // - // label7 - // - this.label7.AutoSize = true; - this.label7.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label7.Location = new System.Drawing.Point(348, 22); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(41, 13); - this.label7.TabIndex = 49; - this.label7.Text = "G. Rod"; - // // label8 // this.label8.AutoSize = true; this.label8.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label8.Location = new System.Drawing.Point(529, 22); + this.label8.Location = new System.Drawing.Point(334, 22); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(40, 13); + this.label8.Size = new System.Drawing.Size(48, 13); this.label8.TabIndex = 51; - this.label8.Text = "S. Rod"; + this.label8.Text = "Any Rod"; // // walkingGroupBox // @@ -847,7 +727,7 @@ this.walkingGroupBox.Controls.Add(this.morningTwentyFirstComboBox); this.walkingGroupBox.Location = new System.Drawing.Point(12, 7); this.walkingGroupBox.Name = "walkingGroupBox"; - this.walkingGroupBox.Size = new System.Drawing.Size(474, 394); + this.walkingGroupBox.Size = new System.Drawing.Size(536, 432); this.walkingGroupBox.TabIndex = 162; this.walkingGroupBox.TabStop = false; this.walkingGroupBox.Text = "Walking"; @@ -905,6 +785,1223 @@ this.label1.TabIndex = 222; this.label1.Text = "Morning"; // + // oneSecondLevelUpDown + // + this.oneSecondLevelUpDown.Location = new System.Drawing.Point(418, 365); + this.oneSecondLevelUpDown.Name = "oneSecondLevelUpDown"; + this.oneSecondLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.oneSecondLevelUpDown.TabIndex = 197; + this.oneSecondLevelUpDown.ValueChanged += new System.EventHandler(this.oneSecondLevelUpDown_ValueChanged); + // + // label79 + // + this.label79.AutoSize = true; + this.label79.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label79.Location = new System.Drawing.Point(10, 367); + this.label79.Name = "label79"; + this.label79.Size = new System.Drawing.Size(21, 13); + this.label79.TabIndex = 196; + this.label79.Text = "1%"; + // + // oneFirstLevelUpDown + // + this.oneFirstLevelUpDown.Location = new System.Drawing.Point(418, 338); + this.oneFirstLevelUpDown.Name = "oneFirstLevelUpDown"; + this.oneFirstLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.oneFirstLevelUpDown.TabIndex = 194; + this.oneFirstLevelUpDown.ValueChanged += new System.EventHandler(this.oneFirstLevelUpDown_ValueChanged); + // + // label80 + // + this.label80.AutoSize = true; + this.label80.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label80.Location = new System.Drawing.Point(10, 340); + this.label80.Name = "label80"; + this.label80.Size = new System.Drawing.Size(21, 13); + this.label80.TabIndex = 193; + this.label80.Text = "1%"; + // + // fourSecondLevelUpDown + // + this.fourSecondLevelUpDown.Location = new System.Drawing.Point(418, 311); + this.fourSecondLevelUpDown.Name = "fourSecondLevelUpDown"; + this.fourSecondLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.fourSecondLevelUpDown.TabIndex = 191; + this.fourSecondLevelUpDown.ValueChanged += new System.EventHandler(this.fourSecondLevelUpDown_ValueChanged); + // + // label81 + // + this.label81.AutoSize = true; + this.label81.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label81.Location = new System.Drawing.Point(10, 313); + this.label81.Name = "label81"; + this.label81.Size = new System.Drawing.Size(21, 13); + this.label81.TabIndex = 190; + this.label81.Text = "4%"; + // + // fourFirstLevelUpDown + // + this.fourFirstLevelUpDown.Location = new System.Drawing.Point(418, 284); + this.fourFirstLevelUpDown.Name = "fourFirstLevelUpDown"; + this.fourFirstLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.fourFirstLevelUpDown.TabIndex = 188; + this.fourFirstLevelUpDown.ValueChanged += new System.EventHandler(this.fourFirstLevelUpDown_ValueChanged); + // + // label82 + // + this.label82.AutoSize = true; + this.label82.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label82.Location = new System.Drawing.Point(10, 286); + this.label82.Name = "label82"; + this.label82.Size = new System.Drawing.Size(21, 13); + this.label82.TabIndex = 187; + this.label82.Text = "4%"; + // + // fiveSecondLevelUpDown + // + this.fiveSecondLevelUpDown.Location = new System.Drawing.Point(418, 257); + this.fiveSecondLevelUpDown.Name = "fiveSecondLevelUpDown"; + this.fiveSecondLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.fiveSecondLevelUpDown.TabIndex = 185; + this.fiveSecondLevelUpDown.ValueChanged += new System.EventHandler(this.fiveSecondLevelUpDown_ValueChanged); + // + // label83 + // + this.label83.AutoSize = true; + this.label83.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label83.Location = new System.Drawing.Point(10, 259); + this.label83.Name = "label83"; + this.label83.Size = new System.Drawing.Size(21, 13); + this.label83.TabIndex = 184; + this.label83.Text = "5%"; + // + // fiveFirstLevelUpDown + // + this.fiveFirstLevelUpDown.Location = new System.Drawing.Point(418, 230); + this.fiveFirstLevelUpDown.Name = "fiveFirstLevelUpDown"; + this.fiveFirstLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.fiveFirstLevelUpDown.TabIndex = 182; + this.fiveFirstLevelUpDown.ValueChanged += new System.EventHandler(this.fiveFirstLevelUpDown_ValueChanged); + // + // label84 + // + this.label84.AutoSize = true; + this.label84.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label84.Location = new System.Drawing.Point(10, 232); + this.label84.Name = "label84"; + this.label84.Size = new System.Drawing.Size(21, 13); + this.label84.TabIndex = 181; + this.label84.Text = "5%"; + // + // tenFourthLevelUpDown + // + this.tenFourthLevelUpDown.Location = new System.Drawing.Point(418, 203); + this.tenFourthLevelUpDown.Name = "tenFourthLevelUpDown"; + this.tenFourthLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.tenFourthLevelUpDown.TabIndex = 179; + this.tenFourthLevelUpDown.ValueChanged += new System.EventHandler(this.tenFourthLevelUpDown_ValueChanged); + // + // label85 + // + this.label85.AutoSize = true; + this.label85.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label85.Location = new System.Drawing.Point(4, 205); + this.label85.Name = "label85"; + this.label85.Size = new System.Drawing.Size(27, 13); + this.label85.TabIndex = 178; + this.label85.Text = "10%"; + // + // tenThirdLevelUpDown + // + this.tenThirdLevelUpDown.Location = new System.Drawing.Point(418, 176); + this.tenThirdLevelUpDown.Name = "tenThirdLevelUpDown"; + this.tenThirdLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.tenThirdLevelUpDown.TabIndex = 176; + this.tenThirdLevelUpDown.ValueChanged += new System.EventHandler(this.tenThirdLevelUpDown_ValueChanged); + // + // label86 + // + this.label86.AutoSize = true; + this.label86.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label86.Location = new System.Drawing.Point(4, 178); + this.label86.Name = "label86"; + this.label86.Size = new System.Drawing.Size(27, 13); + this.label86.TabIndex = 175; + this.label86.Text = "10%"; + // + // tenSecondLevelUpDown + // + this.tenSecondLevelUpDown.Location = new System.Drawing.Point(418, 149); + this.tenSecondLevelUpDown.Name = "tenSecondLevelUpDown"; + this.tenSecondLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.tenSecondLevelUpDown.TabIndex = 173; + this.tenSecondLevelUpDown.ValueChanged += new System.EventHandler(this.tenSecondLevelUpDown_ValueChanged); + // + // label87 + // + this.label87.AutoSize = true; + this.label87.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label87.Location = new System.Drawing.Point(4, 151); + this.label87.Name = "label87"; + this.label87.Size = new System.Drawing.Size(27, 13); + this.label87.TabIndex = 172; + this.label87.Text = "10%"; + // + // tenFirstLevelUpDown + // + this.tenFirstLevelUpDown.Location = new System.Drawing.Point(418, 122); + this.tenFirstLevelUpDown.Name = "tenFirstLevelUpDown"; + this.tenFirstLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.tenFirstLevelUpDown.TabIndex = 170; + this.tenFirstLevelUpDown.ValueChanged += new System.EventHandler(this.tenFirstLevelUpDown_ValueChanged); + // + // label88 + // + this.label88.AutoSize = true; + this.label88.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label88.Location = new System.Drawing.Point(4, 124); + this.label88.Name = "label88"; + this.label88.Size = new System.Drawing.Size(27, 13); + this.label88.TabIndex = 169; + this.label88.Text = "10%"; + // + // twentySecondLevelUpDown + // + this.twentySecondLevelUpDown.Location = new System.Drawing.Point(418, 95); + this.twentySecondLevelUpDown.Name = "twentySecondLevelUpDown"; + this.twentySecondLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.twentySecondLevelUpDown.TabIndex = 167; + this.twentySecondLevelUpDown.ValueChanged += new System.EventHandler(this.twentySecondLevelUpDown_ValueChanged); + // + // label89 + // + this.label89.AutoSize = true; + this.label89.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label89.Location = new System.Drawing.Point(4, 97); + this.label89.Name = "label89"; + this.label89.Size = new System.Drawing.Size(27, 13); + this.label89.TabIndex = 166; + this.label89.Text = "20%"; + // + // twentyFirstLevelUpDown + // + this.twentyFirstLevelUpDown.Location = new System.Drawing.Point(418, 68); + this.twentyFirstLevelUpDown.Name = "twentyFirstLevelUpDown"; + this.twentyFirstLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.twentyFirstLevelUpDown.TabIndex = 164; + this.twentyFirstLevelUpDown.ValueChanged += new System.EventHandler(this.twentyFirstLevelUpDown_ValueChanged); + // + // label90 + // + this.label90.AutoSize = true; + this.label90.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label90.Location = new System.Drawing.Point(4, 70); + this.label90.Name = "label90"; + this.label90.Size = new System.Drawing.Size(27, 13); + this.label90.TabIndex = 163; + this.label90.Text = "20%"; + // + // waterTabPage + // + this.waterTabPage.Controls.Add(this.surfPicture); + this.waterTabPage.Controls.Add(this.pictureBox7); + this.waterTabPage.Controls.Add(this.pictureBox6); + this.waterTabPage.Controls.Add(this.pictureBox5); + this.waterTabPage.Controls.Add(this.superRodGroupBox); + this.waterTabPage.Controls.Add(this.goodRodGroupBox); + this.waterTabPage.Controls.Add(this.oldRodGroupBox); + this.waterTabPage.Controls.Add(this.surfGroupBox); + this.waterTabPage.Location = new System.Drawing.Point(4, 22); + this.waterTabPage.Name = "waterTabPage"; + this.waterTabPage.Padding = new System.Windows.Forms.Padding(3); + this.waterTabPage.Size = new System.Drawing.Size(795, 508); + this.waterTabPage.TabIndex = 1; + this.waterTabPage.Text = "Water"; + this.waterTabPage.UseVisualStyleBackColor = true; + // + // surfPicture + // + this.surfPicture.Image = global::DSPRE.Properties.Resources.SurfIcon; + this.surfPicture.Location = new System.Drawing.Point(67, -1); + this.surfPicture.Name = "surfPicture"; + this.surfPicture.Size = new System.Drawing.Size(42, 42); + this.surfPicture.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.surfPicture.TabIndex = 200; + this.surfPicture.TabStop = false; + // + // pictureBox7 + // + this.pictureBox7.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox7.Image"))); + this.pictureBox7.Location = new System.Drawing.Point(452, 232); + this.pictureBox7.Name = "pictureBox7"; + this.pictureBox7.Size = new System.Drawing.Size(25, 26); + this.pictureBox7.TabIndex = 196; + this.pictureBox7.TabStop = false; + // + // pictureBox6 + // + this.pictureBox6.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox6.Image"))); + this.pictureBox6.Location = new System.Drawing.Point(79, 230); + this.pictureBox6.Name = "pictureBox6"; + this.pictureBox6.Size = new System.Drawing.Size(25, 26); + this.pictureBox6.TabIndex = 195; + this.pictureBox6.TabStop = false; + // + // pictureBox5 + // + this.pictureBox5.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox5.Image"))); + this.pictureBox5.Location = new System.Drawing.Point(442, 8); + this.pictureBox5.Name = "pictureBox5"; + this.pictureBox5.Size = new System.Drawing.Size(25, 26); + this.pictureBox5.TabIndex = 194; + this.pictureBox5.TabStop = false; + // + // superRodGroupBox + // + this.superRodGroupBox.Controls.Add(this.label59); + this.superRodGroupBox.Controls.Add(this.label60); + this.superRodGroupBox.Controls.Add(this.superRodRateUpDown); + this.superRodGroupBox.Controls.Add(this.label69); + this.superRodGroupBox.Controls.Add(this.superRodOneMaxLevelUpDown); + this.superRodGroupBox.Controls.Add(this.superRodOneMinLevelUpDown); + this.superRodGroupBox.Controls.Add(this.label70); + this.superRodGroupBox.Controls.Add(this.superRodOneComboBox); + this.superRodGroupBox.Controls.Add(this.superRodFourMaxLevelUpDown); + this.superRodGroupBox.Controls.Add(this.superRodFourMinLevelUpDown); + this.superRodGroupBox.Controls.Add(this.label71); + this.superRodGroupBox.Controls.Add(this.superRodFourComboBox); + this.superRodGroupBox.Controls.Add(this.superRodFifteenMaxLevelUpDown); + this.superRodGroupBox.Controls.Add(this.superRodFifteenMinLevelUpDown); + this.superRodGroupBox.Controls.Add(this.label72); + this.superRodGroupBox.Controls.Add(this.superRodFifteenComboBox); + this.superRodGroupBox.Controls.Add(this.superRodSecondFortyMaxLevelUpDown); + this.superRodGroupBox.Controls.Add(this.superRodSecondFortyMinLevelUpDown); + this.superRodGroupBox.Controls.Add(this.label73); + this.superRodGroupBox.Controls.Add(this.superRodSecondFortyComboBox); + this.superRodGroupBox.Controls.Add(this.superRodFirstFortyMaxLevelUpDown); + this.superRodGroupBox.Controls.Add(this.superRodFirstFortyMinLevelUpDown); + this.superRodGroupBox.Controls.Add(this.label74); + this.superRodGroupBox.Controls.Add(this.superRodFirstFortyComboBox); + this.superRodGroupBox.Location = new System.Drawing.Point(384, 234); + this.superRodGroupBox.Name = "superRodGroupBox"; + this.superRodGroupBox.Size = new System.Drawing.Size(325, 210); + this.superRodGroupBox.TabIndex = 44; + this.superRodGroupBox.TabStop = false; + this.superRodGroupBox.Text = "Super Rod"; + // + // label59 + // + this.label59.AutoSize = true; + this.label59.Location = new System.Drawing.Point(264, 50); + this.label59.Name = "label59"; + this.label59.Size = new System.Drawing.Size(47, 13); + this.label59.TabIndex = 41; + this.label59.Text = "Max Lvl."; + // + // label60 + // + this.label60.AutoSize = true; + this.label60.Location = new System.Drawing.Point(214, 50); + this.label60.Name = "label60"; + this.label60.Size = new System.Drawing.Size(44, 13); + this.label60.TabIndex = 40; + this.label60.Text = "Min Lvl."; + // + // superRodRateUpDown + // + this.superRodRateUpDown.Location = new System.Drawing.Point(265, 17); + this.superRodRateUpDown.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.superRodRateUpDown.Name = "superRodRateUpDown"; + this.superRodRateUpDown.Size = new System.Drawing.Size(42, 20); + this.superRodRateUpDown.TabIndex = 39; + this.superRodRateUpDown.ValueChanged += new System.EventHandler(this.superRodRateUpDown_ValueChanged); + // + // label69 + // + this.label69.AutoSize = true; + this.label69.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label69.Location = new System.Drawing.Point(229, 19); + this.label69.Name = "label69"; + this.label69.Size = new System.Drawing.Size(30, 13); + this.label69.TabIndex = 38; + this.label69.Text = "Rate"; + // + // superRodOneMaxLevelUpDown + // + this.superRodOneMaxLevelUpDown.Location = new System.Drawing.Point(265, 179); + this.superRodOneMaxLevelUpDown.Name = "superRodOneMaxLevelUpDown"; + this.superRodOneMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.superRodOneMaxLevelUpDown.TabIndex = 22; + this.superRodOneMaxLevelUpDown.ValueChanged += new System.EventHandler(this.superRodOneMaxLevelUpDown_ValueChanged); + // + // superRodOneMinLevelUpDown + // + this.superRodOneMinLevelUpDown.Location = new System.Drawing.Point(217, 179); + this.superRodOneMinLevelUpDown.Name = "superRodOneMinLevelUpDown"; + this.superRodOneMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.superRodOneMinLevelUpDown.TabIndex = 21; + this.superRodOneMinLevelUpDown.ValueChanged += new System.EventHandler(this.superRodOneMinLevelUpDown_ValueChanged); + // + // label70 + // + this.label70.AutoSize = true; + this.label70.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label70.Location = new System.Drawing.Point(18, 181); + this.label70.Name = "label70"; + this.label70.Size = new System.Drawing.Size(21, 13); + this.label70.TabIndex = 20; + this.label70.Text = "5%"; + // + // superRodFourMaxLevelUpDown + // + this.superRodFourMaxLevelUpDown.Location = new System.Drawing.Point(265, 152); + this.superRodFourMaxLevelUpDown.Name = "superRodFourMaxLevelUpDown"; + this.superRodFourMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.superRodFourMaxLevelUpDown.TabIndex = 18; + this.superRodFourMaxLevelUpDown.ValueChanged += new System.EventHandler(this.superRodFourMaxLevelUpDown_ValueChanged); + // + // superRodFourMinLevelUpDown + // + this.superRodFourMinLevelUpDown.Location = new System.Drawing.Point(217, 152); + this.superRodFourMinLevelUpDown.Name = "superRodFourMinLevelUpDown"; + this.superRodFourMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.superRodFourMinLevelUpDown.TabIndex = 17; + this.superRodFourMinLevelUpDown.ValueChanged += new System.EventHandler(this.superRodFourMinLevelUpDown_ValueChanged); + // + // label71 + // + this.label71.AutoSize = true; + this.label71.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label71.Location = new System.Drawing.Point(12, 154); + this.label71.Name = "label71"; + this.label71.Size = new System.Drawing.Size(27, 13); + this.label71.TabIndex = 16; + this.label71.Text = "10%"; + // + // superRodFifteenMaxLevelUpDown + // + this.superRodFifteenMaxLevelUpDown.Location = new System.Drawing.Point(265, 125); + this.superRodFifteenMaxLevelUpDown.Name = "superRodFifteenMaxLevelUpDown"; + this.superRodFifteenMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.superRodFifteenMaxLevelUpDown.TabIndex = 14; + this.superRodFifteenMaxLevelUpDown.ValueChanged += new System.EventHandler(this.superRodFifteenMaxLevelUpDown_ValueChanged); + // + // superRodFifteenMinLevelUpDown + // + this.superRodFifteenMinLevelUpDown.Location = new System.Drawing.Point(217, 125); + this.superRodFifteenMinLevelUpDown.Name = "superRodFifteenMinLevelUpDown"; + this.superRodFifteenMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.superRodFifteenMinLevelUpDown.TabIndex = 13; + this.superRodFifteenMinLevelUpDown.ValueChanged += new System.EventHandler(this.superRodFifteenMinLevelUpDown_ValueChanged); + // + // label72 + // + this.label72.AutoSize = true; + this.label72.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label72.Location = new System.Drawing.Point(12, 127); + this.label72.Name = "label72"; + this.label72.Size = new System.Drawing.Size(27, 13); + this.label72.TabIndex = 12; + this.label72.Text = "15%"; + // + // superRodSecondFortyMaxLevelUpDown + // + this.superRodSecondFortyMaxLevelUpDown.Location = new System.Drawing.Point(265, 98); + this.superRodSecondFortyMaxLevelUpDown.Name = "superRodSecondFortyMaxLevelUpDown"; + this.superRodSecondFortyMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.superRodSecondFortyMaxLevelUpDown.TabIndex = 10; + this.superRodSecondFortyMaxLevelUpDown.ValueChanged += new System.EventHandler(this.superRodSecondFortyMaxLevelUpDown_ValueChanged); + // + // superRodSecondFortyMinLevelUpDown + // + this.superRodSecondFortyMinLevelUpDown.Location = new System.Drawing.Point(217, 98); + this.superRodSecondFortyMinLevelUpDown.Name = "superRodSecondFortyMinLevelUpDown"; + this.superRodSecondFortyMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.superRodSecondFortyMinLevelUpDown.TabIndex = 9; + this.superRodSecondFortyMinLevelUpDown.ValueChanged += new System.EventHandler(this.superRodSecondFortyMinLevelUpDown_ValueChanged); + // + // label73 + // + this.label73.AutoSize = true; + this.label73.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label73.Location = new System.Drawing.Point(12, 100); + this.label73.Name = "label73"; + this.label73.Size = new System.Drawing.Size(27, 13); + this.label73.TabIndex = 8; + this.label73.Text = "30%"; + // + // superRodFirstFortyMaxLevelUpDown + // + this.superRodFirstFortyMaxLevelUpDown.Location = new System.Drawing.Point(265, 71); + this.superRodFirstFortyMaxLevelUpDown.Name = "superRodFirstFortyMaxLevelUpDown"; + this.superRodFirstFortyMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.superRodFirstFortyMaxLevelUpDown.TabIndex = 6; + this.superRodFirstFortyMaxLevelUpDown.ValueChanged += new System.EventHandler(this.superRodFirstFortyMaxLevelUpDown_ValueChanged); + // + // superRodFirstFortyMinLevelUpDown + // + this.superRodFirstFortyMinLevelUpDown.Location = new System.Drawing.Point(217, 71); + this.superRodFirstFortyMinLevelUpDown.Name = "superRodFirstFortyMinLevelUpDown"; + this.superRodFirstFortyMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.superRodFirstFortyMinLevelUpDown.TabIndex = 5; + this.superRodFirstFortyMinLevelUpDown.ValueChanged += new System.EventHandler(this.superRodFirstFortyMinLevelUpDown_ValueChanged); + // + // label74 + // + this.label74.AutoSize = true; + this.label74.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label74.Location = new System.Drawing.Point(12, 73); + this.label74.Name = "label74"; + this.label74.Size = new System.Drawing.Size(27, 13); + this.label74.TabIndex = 4; + this.label74.Text = "40%"; + // + // goodRodGroupBox + // + this.goodRodGroupBox.Controls.Add(this.label51); + this.goodRodGroupBox.Controls.Add(this.label52); + this.goodRodGroupBox.Controls.Add(this.goodRodRateUpDown); + this.goodRodGroupBox.Controls.Add(this.label53); + this.goodRodGroupBox.Controls.Add(this.goodRodOneMaxLevelUpDown); + this.goodRodGroupBox.Controls.Add(this.goodRodOneMinLevelUpDown); + this.goodRodGroupBox.Controls.Add(this.label54); + this.goodRodGroupBox.Controls.Add(this.goodRodOneComboBox); + this.goodRodGroupBox.Controls.Add(this.goodRodFourMaxLevelUpDown); + this.goodRodGroupBox.Controls.Add(this.goodRodFourMinLevelUpDown); + this.goodRodGroupBox.Controls.Add(this.label55); + this.goodRodGroupBox.Controls.Add(this.goodRodFourComboBox); + this.goodRodGroupBox.Controls.Add(this.goodRodFifteenMaxLevelUpDown); + this.goodRodGroupBox.Controls.Add(this.goodRodFifteenMinLevelUpDown); + this.goodRodGroupBox.Controls.Add(this.label56); + this.goodRodGroupBox.Controls.Add(this.goodRodFifteenComboBox); + this.goodRodGroupBox.Controls.Add(this.goodRodSecondFortyMaxLevelUpDown); + this.goodRodGroupBox.Controls.Add(this.goodRodSecondFortyMinLevelUpDown); + this.goodRodGroupBox.Controls.Add(this.label57); + this.goodRodGroupBox.Controls.Add(this.goodRodSecondFortyComboBox); + this.goodRodGroupBox.Controls.Add(this.goodRodFirstFortyMaxLevelUpDown); + this.goodRodGroupBox.Controls.Add(this.goodRodFirstFortyMinLevelUpDown); + this.goodRodGroupBox.Controls.Add(this.label58); + this.goodRodGroupBox.Controls.Add(this.goodRodFirstFortyComboBox); + this.goodRodGroupBox.Location = new System.Drawing.Point(17, 234); + this.goodRodGroupBox.Name = "goodRodGroupBox"; + this.goodRodGroupBox.Size = new System.Drawing.Size(325, 210); + this.goodRodGroupBox.TabIndex = 43; + this.goodRodGroupBox.TabStop = false; + this.goodRodGroupBox.Text = "Good Rod"; + // + // label51 + // + this.label51.AutoSize = true; + this.label51.Location = new System.Drawing.Point(264, 50); + this.label51.Name = "label51"; + this.label51.Size = new System.Drawing.Size(47, 13); + this.label51.TabIndex = 41; + this.label51.Text = "Max Lvl."; + // + // label52 + // + this.label52.AutoSize = true; + this.label52.Location = new System.Drawing.Point(214, 50); + this.label52.Name = "label52"; + this.label52.Size = new System.Drawing.Size(44, 13); + this.label52.TabIndex = 40; + this.label52.Text = "Min Lvl."; + // + // goodRodRateUpDown + // + this.goodRodRateUpDown.Location = new System.Drawing.Point(265, 17); + this.goodRodRateUpDown.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.goodRodRateUpDown.Name = "goodRodRateUpDown"; + this.goodRodRateUpDown.Size = new System.Drawing.Size(42, 20); + this.goodRodRateUpDown.TabIndex = 39; + this.goodRodRateUpDown.ValueChanged += new System.EventHandler(this.goodRodRateUpDown_ValueChanged); + // + // label53 + // + this.label53.AutoSize = true; + this.label53.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label53.Location = new System.Drawing.Point(229, 19); + this.label53.Name = "label53"; + this.label53.Size = new System.Drawing.Size(30, 13); + this.label53.TabIndex = 38; + this.label53.Text = "Rate"; + // + // goodRodOneMaxLevelUpDown + // + this.goodRodOneMaxLevelUpDown.Location = new System.Drawing.Point(265, 179); + this.goodRodOneMaxLevelUpDown.Name = "goodRodOneMaxLevelUpDown"; + this.goodRodOneMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.goodRodOneMaxLevelUpDown.TabIndex = 22; + this.goodRodOneMaxLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodOneMaxLevelUpDown_ValueChanged); + // + // goodRodOneMinLevelUpDown + // + this.goodRodOneMinLevelUpDown.Location = new System.Drawing.Point(217, 179); + this.goodRodOneMinLevelUpDown.Name = "goodRodOneMinLevelUpDown"; + this.goodRodOneMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.goodRodOneMinLevelUpDown.TabIndex = 21; + this.goodRodOneMinLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodOneMinLevelUpDown_ValueChanged); + // + // label54 + // + this.label54.AutoSize = true; + this.label54.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label54.Location = new System.Drawing.Point(18, 181); + this.label54.Name = "label54"; + this.label54.Size = new System.Drawing.Size(21, 13); + this.label54.TabIndex = 20; + this.label54.Text = "5%"; + // + // goodRodFourMaxLevelUpDown + // + this.goodRodFourMaxLevelUpDown.Location = new System.Drawing.Point(265, 152); + this.goodRodFourMaxLevelUpDown.Name = "goodRodFourMaxLevelUpDown"; + this.goodRodFourMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.goodRodFourMaxLevelUpDown.TabIndex = 18; + this.goodRodFourMaxLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodFourMaxLevelUpDown_ValueChanged); + // + // goodRodFourMinLevelUpDown + // + this.goodRodFourMinLevelUpDown.Location = new System.Drawing.Point(217, 152); + this.goodRodFourMinLevelUpDown.Name = "goodRodFourMinLevelUpDown"; + this.goodRodFourMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.goodRodFourMinLevelUpDown.TabIndex = 17; + this.goodRodFourMinLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodFourMinLevelUpDown_ValueChanged); + // + // label55 + // + this.label55.AutoSize = true; + this.label55.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label55.Location = new System.Drawing.Point(12, 154); + this.label55.Name = "label55"; + this.label55.Size = new System.Drawing.Size(27, 13); + this.label55.TabIndex = 16; + this.label55.Text = "10%"; + // + // goodRodFifteenMaxLevelUpDown + // + this.goodRodFifteenMaxLevelUpDown.Location = new System.Drawing.Point(265, 125); + this.goodRodFifteenMaxLevelUpDown.Name = "goodRodFifteenMaxLevelUpDown"; + this.goodRodFifteenMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.goodRodFifteenMaxLevelUpDown.TabIndex = 14; + this.goodRodFifteenMaxLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodFifteenMaxLevelUpDown_ValueChanged); + // + // goodRodFifteenMinLevelUpDown + // + this.goodRodFifteenMinLevelUpDown.Location = new System.Drawing.Point(217, 125); + this.goodRodFifteenMinLevelUpDown.Name = "goodRodFifteenMinLevelUpDown"; + this.goodRodFifteenMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.goodRodFifteenMinLevelUpDown.TabIndex = 13; + this.goodRodFifteenMinLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodFifteenMinLevelUpDown_ValueChanged); + // + // label56 + // + this.label56.AutoSize = true; + this.label56.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label56.Location = new System.Drawing.Point(12, 127); + this.label56.Name = "label56"; + this.label56.Size = new System.Drawing.Size(27, 13); + this.label56.TabIndex = 12; + this.label56.Text = "15%"; + // + // goodRodSecondFortyMaxLevelUpDown + // + this.goodRodSecondFortyMaxLevelUpDown.Location = new System.Drawing.Point(265, 98); + this.goodRodSecondFortyMaxLevelUpDown.Name = "goodRodSecondFortyMaxLevelUpDown"; + this.goodRodSecondFortyMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.goodRodSecondFortyMaxLevelUpDown.TabIndex = 10; + this.goodRodSecondFortyMaxLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodSecondFortyMaxLevelUpDown_ValueChanged); + // + // goodRodSecondFortyMinLevelUpDown + // + this.goodRodSecondFortyMinLevelUpDown.Location = new System.Drawing.Point(217, 98); + this.goodRodSecondFortyMinLevelUpDown.Name = "goodRodSecondFortyMinLevelUpDown"; + this.goodRodSecondFortyMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.goodRodSecondFortyMinLevelUpDown.TabIndex = 9; + this.goodRodSecondFortyMinLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodSecondFortyMinLevelUpDown_ValueChanged); + // + // label57 + // + this.label57.AutoSize = true; + this.label57.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label57.Location = new System.Drawing.Point(12, 100); + this.label57.Name = "label57"; + this.label57.Size = new System.Drawing.Size(27, 13); + this.label57.TabIndex = 8; + this.label57.Text = "30%"; + // + // goodRodFirstFortyMaxLevelUpDown + // + this.goodRodFirstFortyMaxLevelUpDown.Location = new System.Drawing.Point(265, 71); + this.goodRodFirstFortyMaxLevelUpDown.Name = "goodRodFirstFortyMaxLevelUpDown"; + this.goodRodFirstFortyMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.goodRodFirstFortyMaxLevelUpDown.TabIndex = 6; + this.goodRodFirstFortyMaxLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodFirstFortyMaxLevelUpDown_ValueChanged); + // + // goodRodFirstFortyMinLevelUpDown + // + this.goodRodFirstFortyMinLevelUpDown.Location = new System.Drawing.Point(217, 71); + this.goodRodFirstFortyMinLevelUpDown.Name = "goodRodFirstFortyMinLevelUpDown"; + this.goodRodFirstFortyMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.goodRodFirstFortyMinLevelUpDown.TabIndex = 5; + this.goodRodFirstFortyMinLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodFirstFortyMinLevelUpDown_ValueChanged); + // + // label58 + // + this.label58.AutoSize = true; + this.label58.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label58.Location = new System.Drawing.Point(12, 73); + this.label58.Name = "label58"; + this.label58.Size = new System.Drawing.Size(27, 13); + this.label58.TabIndex = 4; + this.label58.Text = "40%"; + // + // oldRodGroupBox + // + this.oldRodGroupBox.Controls.Add(this.label43); + this.oldRodGroupBox.Controls.Add(this.label44); + this.oldRodGroupBox.Controls.Add(this.oldRodRateUpDown); + this.oldRodGroupBox.Controls.Add(this.label45); + this.oldRodGroupBox.Controls.Add(this.oldRodOneMaxLevelUpDown); + this.oldRodGroupBox.Controls.Add(this.oldRodOneMinLevelUpDown); + this.oldRodGroupBox.Controls.Add(this.label46); + this.oldRodGroupBox.Controls.Add(this.oldRodOneComboBox); + this.oldRodGroupBox.Controls.Add(this.oldRodFourMaxLevelUpDown); + this.oldRodGroupBox.Controls.Add(this.oldRodFourMinLevelUpDown); + this.oldRodGroupBox.Controls.Add(this.label47); + this.oldRodGroupBox.Controls.Add(this.oldRodFourComboBox); + this.oldRodGroupBox.Controls.Add(this.oldRodFiveMaxLevelUpDown); + this.oldRodGroupBox.Controls.Add(this.oldRodFiveMinLevelUpDown); + this.oldRodGroupBox.Controls.Add(this.label48); + this.oldRodGroupBox.Controls.Add(this.oldRodFiveComboBox); + this.oldRodGroupBox.Controls.Add(this.oldRodThirtyMaxLevelUpDown); + this.oldRodGroupBox.Controls.Add(this.oldRodThirtyMinLevelUpDown); + this.oldRodGroupBox.Controls.Add(this.label49); + this.oldRodGroupBox.Controls.Add(this.oldRodThirtyComboBox); + this.oldRodGroupBox.Controls.Add(this.oldRodSixtyMaxLevelUpDown); + this.oldRodGroupBox.Controls.Add(this.oldRodSixtyMinLevelUpDown); + this.oldRodGroupBox.Controls.Add(this.label50); + this.oldRodGroupBox.Controls.Add(this.oldRodSixtyComboBox); + this.oldRodGroupBox.Location = new System.Drawing.Point(384, 10); + this.oldRodGroupBox.Name = "oldRodGroupBox"; + this.oldRodGroupBox.Size = new System.Drawing.Size(325, 210); + this.oldRodGroupBox.TabIndex = 42; + this.oldRodGroupBox.TabStop = false; + this.oldRodGroupBox.Text = "Old Rod"; + // + // label43 + // + this.label43.AutoSize = true; + this.label43.Location = new System.Drawing.Point(264, 50); + this.label43.Name = "label43"; + this.label43.Size = new System.Drawing.Size(47, 13); + this.label43.TabIndex = 41; + this.label43.Text = "Max Lvl."; + // + // label44 + // + this.label44.AutoSize = true; + this.label44.Location = new System.Drawing.Point(214, 50); + this.label44.Name = "label44"; + this.label44.Size = new System.Drawing.Size(44, 13); + this.label44.TabIndex = 40; + this.label44.Text = "Min Lvl."; + // + // oldRodRateUpDown + // + this.oldRodRateUpDown.Location = new System.Drawing.Point(265, 17); + this.oldRodRateUpDown.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.oldRodRateUpDown.Name = "oldRodRateUpDown"; + this.oldRodRateUpDown.Size = new System.Drawing.Size(42, 20); + this.oldRodRateUpDown.TabIndex = 39; + this.oldRodRateUpDown.ValueChanged += new System.EventHandler(this.oldRodRateUpDown_ValueChanged); + // + // label45 + // + this.label45.AutoSize = true; + this.label45.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label45.Location = new System.Drawing.Point(229, 19); + this.label45.Name = "label45"; + this.label45.Size = new System.Drawing.Size(30, 13); + this.label45.TabIndex = 38; + this.label45.Text = "Rate"; + // + // oldRodOneMaxLevelUpDown + // + this.oldRodOneMaxLevelUpDown.Location = new System.Drawing.Point(265, 179); + this.oldRodOneMaxLevelUpDown.Name = "oldRodOneMaxLevelUpDown"; + this.oldRodOneMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.oldRodOneMaxLevelUpDown.TabIndex = 22; + this.oldRodOneMaxLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodOneMaxLevelUpDown_ValueChanged); + // + // oldRodOneMinLevelUpDown + // + this.oldRodOneMinLevelUpDown.Location = new System.Drawing.Point(217, 179); + this.oldRodOneMinLevelUpDown.Name = "oldRodOneMinLevelUpDown"; + this.oldRodOneMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.oldRodOneMinLevelUpDown.TabIndex = 21; + this.oldRodOneMinLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodOneMinLevelUpDown_ValueChanged); + // + // label46 + // + this.label46.AutoSize = true; + this.label46.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label46.Location = new System.Drawing.Point(18, 181); + this.label46.Name = "label46"; + this.label46.Size = new System.Drawing.Size(21, 13); + this.label46.TabIndex = 20; + this.label46.Text = "5%"; + // + // oldRodFourMaxLevelUpDown + // + this.oldRodFourMaxLevelUpDown.Location = new System.Drawing.Point(265, 152); + this.oldRodFourMaxLevelUpDown.Name = "oldRodFourMaxLevelUpDown"; + this.oldRodFourMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.oldRodFourMaxLevelUpDown.TabIndex = 18; + this.oldRodFourMaxLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodFourMaxLevelUpDown_ValueChanged); + // + // oldRodFourMinLevelUpDown + // + this.oldRodFourMinLevelUpDown.Location = new System.Drawing.Point(217, 152); + this.oldRodFourMinLevelUpDown.Name = "oldRodFourMinLevelUpDown"; + this.oldRodFourMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.oldRodFourMinLevelUpDown.TabIndex = 17; + this.oldRodFourMinLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodFourMinLevelUpDown_ValueChanged); + // + // label47 + // + this.label47.AutoSize = true; + this.label47.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label47.Location = new System.Drawing.Point(12, 154); + this.label47.Name = "label47"; + this.label47.Size = new System.Drawing.Size(27, 13); + this.label47.TabIndex = 16; + this.label47.Text = "10%"; + // + // oldRodFiveMaxLevelUpDown + // + this.oldRodFiveMaxLevelUpDown.Location = new System.Drawing.Point(265, 125); + this.oldRodFiveMaxLevelUpDown.Name = "oldRodFiveMaxLevelUpDown"; + this.oldRodFiveMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.oldRodFiveMaxLevelUpDown.TabIndex = 14; + this.oldRodFiveMaxLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodFiveMaxLevelUpDown_ValueChanged); + // + // oldRodFiveMinLevelUpDown + // + this.oldRodFiveMinLevelUpDown.Location = new System.Drawing.Point(217, 125); + this.oldRodFiveMinLevelUpDown.Name = "oldRodFiveMinLevelUpDown"; + this.oldRodFiveMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.oldRodFiveMinLevelUpDown.TabIndex = 13; + this.oldRodFiveMinLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodFiveMinLevelUpDown_ValueChanged); + // + // label48 + // + this.label48.AutoSize = true; + this.label48.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label48.Location = new System.Drawing.Point(12, 127); + this.label48.Name = "label48"; + this.label48.Size = new System.Drawing.Size(27, 13); + this.label48.TabIndex = 12; + this.label48.Text = "15%"; + // + // oldRodThirtyMaxLevelUpDown + // + this.oldRodThirtyMaxLevelUpDown.Location = new System.Drawing.Point(265, 98); + this.oldRodThirtyMaxLevelUpDown.Name = "oldRodThirtyMaxLevelUpDown"; + this.oldRodThirtyMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.oldRodThirtyMaxLevelUpDown.TabIndex = 10; + this.oldRodThirtyMaxLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodThirtyMaxLevelUpDown_ValueChanged); + // + // oldRodThirtyMinLevelUpDown + // + this.oldRodThirtyMinLevelUpDown.Location = new System.Drawing.Point(217, 98); + this.oldRodThirtyMinLevelUpDown.Name = "oldRodThirtyMinLevelUpDown"; + this.oldRodThirtyMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.oldRodThirtyMinLevelUpDown.TabIndex = 9; + this.oldRodThirtyMinLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodThirtyMinLevelUpDown_ValueChanged); + // + // label49 + // + this.label49.AutoSize = true; + this.label49.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label49.Location = new System.Drawing.Point(12, 100); + this.label49.Name = "label49"; + this.label49.Size = new System.Drawing.Size(27, 13); + this.label49.TabIndex = 8; + this.label49.Text = "30%"; + // + // oldRodSixtyMaxLevelUpDown + // + this.oldRodSixtyMaxLevelUpDown.Location = new System.Drawing.Point(265, 71); + this.oldRodSixtyMaxLevelUpDown.Name = "oldRodSixtyMaxLevelUpDown"; + this.oldRodSixtyMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.oldRodSixtyMaxLevelUpDown.TabIndex = 6; + this.oldRodSixtyMaxLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodSixtyMaxLevelUpDown_ValueChanged); + // + // oldRodSixtyMinLevelUpDown + // + this.oldRodSixtyMinLevelUpDown.Location = new System.Drawing.Point(217, 71); + this.oldRodSixtyMinLevelUpDown.Name = "oldRodSixtyMinLevelUpDown"; + this.oldRodSixtyMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.oldRodSixtyMinLevelUpDown.TabIndex = 5; + this.oldRodSixtyMinLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodSixtyMinLevelUpDown_ValueChanged); + // + // label50 + // + this.label50.AutoSize = true; + this.label50.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label50.Location = new System.Drawing.Point(12, 73); + this.label50.Name = "label50"; + this.label50.Size = new System.Drawing.Size(27, 13); + this.label50.TabIndex = 4; + this.label50.Text = "40%"; + // + // surfGroupBox + // + this.surfGroupBox.Controls.Add(this.label68); + this.surfGroupBox.Controls.Add(this.label67); + this.surfGroupBox.Controls.Add(this.surfRateUpDown); + this.surfGroupBox.Controls.Add(this.label61); + this.surfGroupBox.Controls.Add(this.surfOneMaxLevelUpDown); + this.surfGroupBox.Controls.Add(this.surfOneMinLevelUpDown); + this.surfGroupBox.Controls.Add(this.label62); + this.surfGroupBox.Controls.Add(this.surfOneComboBox); + this.surfGroupBox.Controls.Add(this.surfFourMaxLevelUpDown); + this.surfGroupBox.Controls.Add(this.surfFourMinLevelUpDown); + this.surfGroupBox.Controls.Add(this.label63); + this.surfGroupBox.Controls.Add(this.surfFourComboBox); + this.surfGroupBox.Controls.Add(this.surfFiveMaxLevelUpDown); + this.surfGroupBox.Controls.Add(this.surfFiveMinLevelUpDown); + this.surfGroupBox.Controls.Add(this.label64); + this.surfGroupBox.Controls.Add(this.surfFiveComboBox); + this.surfGroupBox.Controls.Add(this.surfThirtyMaxLevelUpDown); + this.surfGroupBox.Controls.Add(this.surfThirtyMinLevelUpDown); + this.surfGroupBox.Controls.Add(this.label65); + this.surfGroupBox.Controls.Add(this.surfThirtyComboBox); + this.surfGroupBox.Controls.Add(this.surfSixtyMaxLevelUpDown); + this.surfGroupBox.Controls.Add(this.surfSixtyMinLevelUpDown); + this.surfGroupBox.Controls.Add(this.label66); + this.surfGroupBox.Controls.Add(this.surfSixtyComboBox); + this.surfGroupBox.Location = new System.Drawing.Point(17, 10); + this.surfGroupBox.Name = "surfGroupBox"; + this.surfGroupBox.Size = new System.Drawing.Size(325, 210); + this.surfGroupBox.TabIndex = 4; + this.surfGroupBox.TabStop = false; + this.surfGroupBox.Text = "Surfing"; + // + // label68 + // + this.label68.AutoSize = true; + this.label68.Location = new System.Drawing.Point(264, 50); + this.label68.Name = "label68"; + this.label68.Size = new System.Drawing.Size(47, 13); + this.label68.TabIndex = 41; + this.label68.Text = "Max Lvl."; + // + // label67 + // + this.label67.AutoSize = true; + this.label67.Location = new System.Drawing.Point(214, 50); + this.label67.Name = "label67"; + this.label67.Size = new System.Drawing.Size(44, 13); + this.label67.TabIndex = 40; + this.label67.Text = "Min Lvl."; + // + // surfRateUpDown + // + this.surfRateUpDown.Location = new System.Drawing.Point(265, 17); + this.surfRateUpDown.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.surfRateUpDown.Name = "surfRateUpDown"; + this.surfRateUpDown.Size = new System.Drawing.Size(42, 20); + this.surfRateUpDown.TabIndex = 39; + this.surfRateUpDown.ValueChanged += new System.EventHandler(this.surfRateUpDown_ValueChanged); + // + // label61 + // + this.label61.AutoSize = true; + this.label61.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label61.Location = new System.Drawing.Point(229, 19); + this.label61.Name = "label61"; + this.label61.Size = new System.Drawing.Size(30, 13); + this.label61.TabIndex = 38; + this.label61.Text = "Rate"; + // + // surfOneMaxLevelUpDown + // + this.surfOneMaxLevelUpDown.Location = new System.Drawing.Point(265, 179); + this.surfOneMaxLevelUpDown.Name = "surfOneMaxLevelUpDown"; + this.surfOneMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.surfOneMaxLevelUpDown.TabIndex = 22; + this.surfOneMaxLevelUpDown.ValueChanged += new System.EventHandler(this.surfOneMaxLevelUpDown_ValueChanged); + // + // surfOneMinLevelUpDown + // + this.surfOneMinLevelUpDown.Location = new System.Drawing.Point(217, 179); + this.surfOneMinLevelUpDown.Name = "surfOneMinLevelUpDown"; + this.surfOneMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.surfOneMinLevelUpDown.TabIndex = 21; + this.surfOneMinLevelUpDown.ValueChanged += new System.EventHandler(this.surfOneMinLevelUpDown_ValueChanged); + // + // label62 + // + this.label62.AutoSize = true; + this.label62.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label62.Location = new System.Drawing.Point(18, 181); + this.label62.Name = "label62"; + this.label62.Size = new System.Drawing.Size(21, 13); + this.label62.TabIndex = 20; + this.label62.Text = "1%"; + // + // surfFourMaxLevelUpDown + // + this.surfFourMaxLevelUpDown.Location = new System.Drawing.Point(265, 152); + this.surfFourMaxLevelUpDown.Name = "surfFourMaxLevelUpDown"; + this.surfFourMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.surfFourMaxLevelUpDown.TabIndex = 18; + this.surfFourMaxLevelUpDown.ValueChanged += new System.EventHandler(this.surfFourMaxLevelUpDown_ValueChanged); + // + // surfFourMinLevelUpDown + // + this.surfFourMinLevelUpDown.Location = new System.Drawing.Point(217, 152); + this.surfFourMinLevelUpDown.Name = "surfFourMinLevelUpDown"; + this.surfFourMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.surfFourMinLevelUpDown.TabIndex = 17; + this.surfFourMinLevelUpDown.ValueChanged += new System.EventHandler(this.surfFourMinLevelUpDown_ValueChanged); + // + // label63 + // + this.label63.AutoSize = true; + this.label63.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label63.Location = new System.Drawing.Point(18, 154); + this.label63.Name = "label63"; + this.label63.Size = new System.Drawing.Size(21, 13); + this.label63.TabIndex = 16; + this.label63.Text = "4%"; + // + // surfFiveMaxLevelUpDown + // + this.surfFiveMaxLevelUpDown.Location = new System.Drawing.Point(265, 125); + this.surfFiveMaxLevelUpDown.Name = "surfFiveMaxLevelUpDown"; + this.surfFiveMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.surfFiveMaxLevelUpDown.TabIndex = 14; + this.surfFiveMaxLevelUpDown.ValueChanged += new System.EventHandler(this.surfFiveMaxLevelUpDown_ValueChanged); + // + // surfFiveMinLevelUpDown + // + this.surfFiveMinLevelUpDown.Location = new System.Drawing.Point(217, 125); + this.surfFiveMinLevelUpDown.Name = "surfFiveMinLevelUpDown"; + this.surfFiveMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.surfFiveMinLevelUpDown.TabIndex = 13; + this.surfFiveMinLevelUpDown.ValueChanged += new System.EventHandler(this.surfFiveMinLevelUpDown_ValueChanged); + // + // label64 + // + this.label64.AutoSize = true; + this.label64.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label64.Location = new System.Drawing.Point(18, 127); + this.label64.Name = "label64"; + this.label64.Size = new System.Drawing.Size(21, 13); + this.label64.TabIndex = 12; + this.label64.Text = "5%"; + // + // surfThirtyMaxLevelUpDown + // + this.surfThirtyMaxLevelUpDown.Location = new System.Drawing.Point(265, 98); + this.surfThirtyMaxLevelUpDown.Name = "surfThirtyMaxLevelUpDown"; + this.surfThirtyMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.surfThirtyMaxLevelUpDown.TabIndex = 10; + this.surfThirtyMaxLevelUpDown.ValueChanged += new System.EventHandler(this.surfThirtyMaxLevelUpDown_ValueChanged); + // + // surfThirtyMinLevelUpDown + // + this.surfThirtyMinLevelUpDown.Location = new System.Drawing.Point(217, 98); + this.surfThirtyMinLevelUpDown.Name = "surfThirtyMinLevelUpDown"; + this.surfThirtyMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.surfThirtyMinLevelUpDown.TabIndex = 9; + this.surfThirtyMinLevelUpDown.ValueChanged += new System.EventHandler(this.surfThirtyMinLevelUpDown_ValueChanged); + // + // label65 + // + this.label65.AutoSize = true; + this.label65.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label65.Location = new System.Drawing.Point(12, 100); + this.label65.Name = "label65"; + this.label65.Size = new System.Drawing.Size(27, 13); + this.label65.TabIndex = 8; + this.label65.Text = "30%"; + // + // surfSixtyMaxLevelUpDown + // + this.surfSixtyMaxLevelUpDown.Location = new System.Drawing.Point(265, 71); + this.surfSixtyMaxLevelUpDown.Name = "surfSixtyMaxLevelUpDown"; + this.surfSixtyMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.surfSixtyMaxLevelUpDown.TabIndex = 6; + this.surfSixtyMaxLevelUpDown.ValueChanged += new System.EventHandler(this.surfSixtyMaxLevelUpDown_ValueChanged); + // + // surfSixtyMinLevelUpDown + // + this.surfSixtyMinLevelUpDown.Location = new System.Drawing.Point(217, 71); + this.surfSixtyMinLevelUpDown.Name = "surfSixtyMinLevelUpDown"; + this.surfSixtyMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.surfSixtyMinLevelUpDown.TabIndex = 5; + this.surfSixtyMinLevelUpDown.ValueChanged += new System.EventHandler(this.surfSixtyMinLevelUpDown_ValueChanged); + // + // label66 + // + this.label66.AutoSize = true; + this.label66.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label66.Location = new System.Drawing.Point(12, 73); + this.label66.Name = "label66"; + this.label66.Size = new System.Drawing.Size(27, 13); + this.label66.TabIndex = 4; + this.label66.Text = "60%"; + // + // repairAllButton + // + this.repairAllButton.Image = global::DSPRE.Properties.Resources.wrenchIcon; + this.repairAllButton.Location = new System.Drawing.Point(590, 9); + this.repairAllButton.Name = "repairAllButton"; + this.repairAllButton.Size = new System.Drawing.Size(38, 40); + this.repairAllButton.TabIndex = 69; + this.repairAllButton.UseVisualStyleBackColor = true; + this.repairAllButton.Click += new System.EventHandler(this.repairAllButton_Click); + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.goodRodSwarmComboBox); + this.groupBox1.Location = new System.Drawing.Point(563, 445); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(223, 51); + this.groupBox1.TabIndex = 234; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Night Fishing"; + // + // goodRodSwarmComboBox + // + this.goodRodSwarmComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.goodRodSwarmComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.goodRodSwarmComboBox.FormattingEnabled = true; + this.goodRodSwarmComboBox.Location = new System.Drawing.Point(49, 19); + this.goodRodSwarmComboBox.Name = "goodRodSwarmComboBox"; + this.goodRodSwarmComboBox.Size = new System.Drawing.Size(121, 21); + this.goodRodSwarmComboBox.TabIndex = 48; + this.goodRodSwarmComboBox.SelectedIndexChanged += new System.EventHandler(this.goodRodSwarmComboBox_SelectedIndexChanged); + // + // rockSmashNinetyComboBox + // + this.rockSmashNinetyComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.rockSmashNinetyComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.rockSmashNinetyComboBox.FormattingEnabled = true; + this.rockSmashNinetyComboBox.Location = new System.Drawing.Point(7, 79); + this.rockSmashNinetyComboBox.Name = "rockSmashNinetyComboBox"; + this.rockSmashNinetyComboBox.Size = new System.Drawing.Size(121, 21); + this.rockSmashNinetyComboBox.TabIndex = 39; + this.rockSmashNinetyComboBox.SelectedIndexChanged += new System.EventHandler(this.rockSmashNinetyComboBox_SelectedIndexChanged); + // + // rockSmashTenComboBox + // + this.rockSmashTenComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.rockSmashTenComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.rockSmashTenComboBox.FormattingEnabled = true; + this.rockSmashTenComboBox.Location = new System.Drawing.Point(7, 128); + this.rockSmashTenComboBox.Name = "rockSmashTenComboBox"; + this.rockSmashTenComboBox.Size = new System.Drawing.Size(121, 21); + this.rockSmashTenComboBox.TabIndex = 42; + this.rockSmashTenComboBox.SelectedIndexChanged += new System.EventHandler(this.rockSmashTenComboBox_SelectedIndexChanged); + // + // sinnohSecondComboBox + // + this.sinnohSecondComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.sinnohSecondComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.sinnohSecondComboBox.FormattingEnabled = true; + this.sinnohSecondComboBox.Location = new System.Drawing.Point(42, 151); + this.sinnohSecondComboBox.Name = "sinnohSecondComboBox"; + this.sinnohSecondComboBox.Size = new System.Drawing.Size(150, 21); + this.sinnohSecondComboBox.TabIndex = 231; + this.sinnohSecondComboBox.SelectedIndexChanged += new System.EventHandler(this.sinnohSecondComboBox_SelectedIndexChanged); + // + // sinnohFirstComboBox + // + this.sinnohFirstComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.sinnohFirstComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.sinnohFirstComboBox.FormattingEnabled = true; + this.sinnohFirstComboBox.Location = new System.Drawing.Point(42, 124); + this.sinnohFirstComboBox.Name = "sinnohFirstComboBox"; + this.sinnohFirstComboBox.Size = new System.Drawing.Size(150, 21); + this.sinnohFirstComboBox.TabIndex = 229; + this.sinnohFirstComboBox.SelectedIndexChanged += new System.EventHandler(this.sinnohFirstComboBox_SelectedIndexChanged); + // + // hoennSecondComboBox + // + this.hoennSecondComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.hoennSecondComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.hoennSecondComboBox.FormattingEnabled = true; + this.hoennSecondComboBox.Location = new System.Drawing.Point(42, 72); + this.hoennSecondComboBox.Name = "hoennSecondComboBox"; + this.hoennSecondComboBox.Size = new System.Drawing.Size(150, 21); + this.hoennSecondComboBox.TabIndex = 228; + this.hoennSecondComboBox.SelectedIndexChanged += new System.EventHandler(this.hoennSecondComboBox_SelectedIndexChanged); + // + // hoennFirstComboBox + // + this.hoennFirstComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.hoennFirstComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.hoennFirstComboBox.FormattingEnabled = true; + this.hoennFirstComboBox.Location = new System.Drawing.Point(42, 45); + this.hoennFirstComboBox.Name = "hoennFirstComboBox"; + this.hoennFirstComboBox.Size = new System.Drawing.Size(150, 21); + this.hoennFirstComboBox.TabIndex = 226; + this.hoennFirstComboBox.SelectedIndexChanged += new System.EventHandler(this.hoennFirstComboBox_SelectedIndexChanged); + // + // superRodSwarmComboBox + // + this.superRodSwarmComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.superRodSwarmComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.superRodSwarmComboBox.FormattingEnabled = true; + this.superRodSwarmComboBox.Location = new System.Drawing.Point(388, 19); + this.superRodSwarmComboBox.Name = "superRodSwarmComboBox"; + this.superRodSwarmComboBox.Size = new System.Drawing.Size(121, 21); + this.superRodSwarmComboBox.TabIndex = 50; + this.superRodSwarmComboBox.SelectedIndexChanged += new System.EventHandler(this.superRodSwarmComboBox_SelectedIndexChanged); + // + // surfSwarmComboBox + // + this.surfSwarmComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.surfSwarmComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.surfSwarmComboBox.FormattingEnabled = true; + this.surfSwarmComboBox.Location = new System.Drawing.Point(207, 19); + this.surfSwarmComboBox.Name = "surfSwarmComboBox"; + this.surfSwarmComboBox.Size = new System.Drawing.Size(121, 21); + this.surfSwarmComboBox.TabIndex = 46; + this.surfSwarmComboBox.SelectedIndexChanged += new System.EventHandler(this.surfSwarmComboBox_SelectedIndexChanged); + // + // grassSwarmComboBox + // + this.grassSwarmComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.grassSwarmComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.grassSwarmComboBox.FormattingEnabled = true; + this.grassSwarmComboBox.Location = new System.Drawing.Point(48, 19); + this.grassSwarmComboBox.Name = "grassSwarmComboBox"; + this.grassSwarmComboBox.Size = new System.Drawing.Size(121, 21); + this.grassSwarmComboBox.TabIndex = 44; + this.grassSwarmComboBox.SelectedIndexChanged += new System.EventHandler(this.grassSwarmComboBox_SelectedIndexChanged); + // // nightOneSecondComboBox // this.nightOneSecondComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1169,24 +2266,6 @@ this.dayTwentyFirstComboBox.TabIndex = 198; this.dayTwentyFirstComboBox.SelectedIndexChanged += new System.EventHandler(this.dayTwentyFirstComboBox_SelectedIndexChanged); // - // oneSecondLevelUpDown - // - this.oneSecondLevelUpDown.Location = new System.Drawing.Point(418, 365); - this.oneSecondLevelUpDown.Name = "oneSecondLevelUpDown"; - this.oneSecondLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.oneSecondLevelUpDown.TabIndex = 197; - this.oneSecondLevelUpDown.ValueChanged += new System.EventHandler(this.oneSecondLevelUpDown_ValueChanged); - // - // label79 - // - this.label79.AutoSize = true; - this.label79.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label79.Location = new System.Drawing.Point(10, 367); - this.label79.Name = "label79"; - this.label79.Size = new System.Drawing.Size(21, 13); - this.label79.TabIndex = 196; - this.label79.Text = "1%"; - // // morningOneSecondComboBox // this.morningOneSecondComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1198,24 +2277,6 @@ this.morningOneSecondComboBox.TabIndex = 195; this.morningOneSecondComboBox.SelectedIndexChanged += new System.EventHandler(this.morningOneSecondComboBox_SelectedIndexChanged); // - // oneFirstLevelUpDown - // - this.oneFirstLevelUpDown.Location = new System.Drawing.Point(418, 338); - this.oneFirstLevelUpDown.Name = "oneFirstLevelUpDown"; - this.oneFirstLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.oneFirstLevelUpDown.TabIndex = 194; - this.oneFirstLevelUpDown.ValueChanged += new System.EventHandler(this.oneFirstLevelUpDown_ValueChanged); - // - // label80 - // - this.label80.AutoSize = true; - this.label80.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label80.Location = new System.Drawing.Point(10, 340); - this.label80.Name = "label80"; - this.label80.Size = new System.Drawing.Size(21, 13); - this.label80.TabIndex = 193; - this.label80.Text = "1%"; - // // morningOneFirstComboBox // this.morningOneFirstComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1227,24 +2288,6 @@ this.morningOneFirstComboBox.TabIndex = 192; this.morningOneFirstComboBox.SelectedIndexChanged += new System.EventHandler(this.morningOneFirstComboBox_SelectedIndexChanged); // - // fourSecondLevelUpDown - // - this.fourSecondLevelUpDown.Location = new System.Drawing.Point(418, 311); - this.fourSecondLevelUpDown.Name = "fourSecondLevelUpDown"; - this.fourSecondLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.fourSecondLevelUpDown.TabIndex = 191; - this.fourSecondLevelUpDown.ValueChanged += new System.EventHandler(this.fourSecondLevelUpDown_ValueChanged); - // - // label81 - // - this.label81.AutoSize = true; - this.label81.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label81.Location = new System.Drawing.Point(10, 313); - this.label81.Name = "label81"; - this.label81.Size = new System.Drawing.Size(21, 13); - this.label81.TabIndex = 190; - this.label81.Text = "4%"; - // // morningFourSecondComboBox // this.morningFourSecondComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1256,24 +2299,6 @@ this.morningFourSecondComboBox.TabIndex = 189; this.morningFourSecondComboBox.SelectedIndexChanged += new System.EventHandler(this.morningFourSecondComboBox_SelectedIndexChanged); // - // fourFirstLevelUpDown - // - this.fourFirstLevelUpDown.Location = new System.Drawing.Point(418, 284); - this.fourFirstLevelUpDown.Name = "fourFirstLevelUpDown"; - this.fourFirstLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.fourFirstLevelUpDown.TabIndex = 188; - this.fourFirstLevelUpDown.ValueChanged += new System.EventHandler(this.fourFirstLevelUpDown_ValueChanged); - // - // label82 - // - this.label82.AutoSize = true; - this.label82.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label82.Location = new System.Drawing.Point(10, 286); - this.label82.Name = "label82"; - this.label82.Size = new System.Drawing.Size(21, 13); - this.label82.TabIndex = 187; - this.label82.Text = "4%"; - // // morningFourFirstComboBox // this.morningFourFirstComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1285,24 +2310,6 @@ this.morningFourFirstComboBox.TabIndex = 186; this.morningFourFirstComboBox.SelectedIndexChanged += new System.EventHandler(this.morningFourFirstComboBox_SelectedIndexChanged); // - // fiveSecondLevelUpDown - // - this.fiveSecondLevelUpDown.Location = new System.Drawing.Point(418, 257); - this.fiveSecondLevelUpDown.Name = "fiveSecondLevelUpDown"; - this.fiveSecondLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.fiveSecondLevelUpDown.TabIndex = 185; - this.fiveSecondLevelUpDown.ValueChanged += new System.EventHandler(this.fiveSecondLevelUpDown_ValueChanged); - // - // label83 - // - this.label83.AutoSize = true; - this.label83.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label83.Location = new System.Drawing.Point(10, 259); - this.label83.Name = "label83"; - this.label83.Size = new System.Drawing.Size(21, 13); - this.label83.TabIndex = 184; - this.label83.Text = "5%"; - // // morningFiveSecondComboBox // this.morningFiveSecondComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1314,24 +2321,6 @@ this.morningFiveSecondComboBox.TabIndex = 183; this.morningFiveSecondComboBox.SelectedIndexChanged += new System.EventHandler(this.morningFiveSecondComboBox_SelectedIndexChanged); // - // fiveFirstLevelUpDown - // - this.fiveFirstLevelUpDown.Location = new System.Drawing.Point(418, 230); - this.fiveFirstLevelUpDown.Name = "fiveFirstLevelUpDown"; - this.fiveFirstLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.fiveFirstLevelUpDown.TabIndex = 182; - this.fiveFirstLevelUpDown.ValueChanged += new System.EventHandler(this.fiveFirstLevelUpDown_ValueChanged); - // - // label84 - // - this.label84.AutoSize = true; - this.label84.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label84.Location = new System.Drawing.Point(10, 232); - this.label84.Name = "label84"; - this.label84.Size = new System.Drawing.Size(21, 13); - this.label84.TabIndex = 181; - this.label84.Text = "5%"; - // // morningFiveFirstComboBox // this.morningFiveFirstComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1343,24 +2332,6 @@ this.morningFiveFirstComboBox.TabIndex = 180; this.morningFiveFirstComboBox.SelectedIndexChanged += new System.EventHandler(this.morningFiveFirstComboBox_SelectedIndexChanged); // - // tenFourthLevelUpDown - // - this.tenFourthLevelUpDown.Location = new System.Drawing.Point(418, 203); - this.tenFourthLevelUpDown.Name = "tenFourthLevelUpDown"; - this.tenFourthLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.tenFourthLevelUpDown.TabIndex = 179; - this.tenFourthLevelUpDown.ValueChanged += new System.EventHandler(this.tenFourthLevelUpDown_ValueChanged); - // - // label85 - // - this.label85.AutoSize = true; - this.label85.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label85.Location = new System.Drawing.Point(4, 205); - this.label85.Name = "label85"; - this.label85.Size = new System.Drawing.Size(27, 13); - this.label85.TabIndex = 178; - this.label85.Text = "10%"; - // // morningTenFourthComboBox // this.morningTenFourthComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1372,24 +2343,6 @@ this.morningTenFourthComboBox.TabIndex = 177; this.morningTenFourthComboBox.SelectedIndexChanged += new System.EventHandler(this.morningTenFourthComboBox_SelectedIndexChanged); // - // tenThirdLevelUpDown - // - this.tenThirdLevelUpDown.Location = new System.Drawing.Point(418, 176); - this.tenThirdLevelUpDown.Name = "tenThirdLevelUpDown"; - this.tenThirdLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.tenThirdLevelUpDown.TabIndex = 176; - this.tenThirdLevelUpDown.ValueChanged += new System.EventHandler(this.tenThirdLevelUpDown_ValueChanged); - // - // label86 - // - this.label86.AutoSize = true; - this.label86.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label86.Location = new System.Drawing.Point(4, 178); - this.label86.Name = "label86"; - this.label86.Size = new System.Drawing.Size(27, 13); - this.label86.TabIndex = 175; - this.label86.Text = "10%"; - // // morningTenThirdComboBox // this.morningTenThirdComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1401,24 +2354,6 @@ this.morningTenThirdComboBox.TabIndex = 174; this.morningTenThirdComboBox.SelectedIndexChanged += new System.EventHandler(this.morningTenThirdComboBox_SelectedIndexChanged); // - // tenSecondLevelUpDown - // - this.tenSecondLevelUpDown.Location = new System.Drawing.Point(418, 149); - this.tenSecondLevelUpDown.Name = "tenSecondLevelUpDown"; - this.tenSecondLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.tenSecondLevelUpDown.TabIndex = 173; - this.tenSecondLevelUpDown.ValueChanged += new System.EventHandler(this.tenSecondLevelUpDown_ValueChanged); - // - // label87 - // - this.label87.AutoSize = true; - this.label87.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label87.Location = new System.Drawing.Point(4, 151); - this.label87.Name = "label87"; - this.label87.Size = new System.Drawing.Size(27, 13); - this.label87.TabIndex = 172; - this.label87.Text = "10%"; - // // morningTenSecondComboBox // this.morningTenSecondComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1430,24 +2365,6 @@ this.morningTenSecondComboBox.TabIndex = 171; this.morningTenSecondComboBox.SelectedIndexChanged += new System.EventHandler(this.morningTenSecondComboBox_SelectedIndexChanged); // - // tenFirstLevelUpDown - // - this.tenFirstLevelUpDown.Location = new System.Drawing.Point(418, 122); - this.tenFirstLevelUpDown.Name = "tenFirstLevelUpDown"; - this.tenFirstLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.tenFirstLevelUpDown.TabIndex = 170; - this.tenFirstLevelUpDown.ValueChanged += new System.EventHandler(this.tenFirstLevelUpDown_ValueChanged); - // - // label88 - // - this.label88.AutoSize = true; - this.label88.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label88.Location = new System.Drawing.Point(4, 124); - this.label88.Name = "label88"; - this.label88.Size = new System.Drawing.Size(27, 13); - this.label88.TabIndex = 169; - this.label88.Text = "10%"; - // // morningTenFirstComboBox // this.morningTenFirstComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1459,24 +2376,6 @@ this.morningTenFirstComboBox.TabIndex = 168; this.morningTenFirstComboBox.SelectedIndexChanged += new System.EventHandler(this.morningTenFirstComboBox_SelectedIndexChanged); // - // twentySecondLevelUpDown - // - this.twentySecondLevelUpDown.Location = new System.Drawing.Point(418, 95); - this.twentySecondLevelUpDown.Name = "twentySecondLevelUpDown"; - this.twentySecondLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.twentySecondLevelUpDown.TabIndex = 167; - this.twentySecondLevelUpDown.ValueChanged += new System.EventHandler(this.twentySecondLevelUpDown_ValueChanged); - // - // label89 - // - this.label89.AutoSize = true; - this.label89.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label89.Location = new System.Drawing.Point(4, 97); - this.label89.Name = "label89"; - this.label89.Size = new System.Drawing.Size(27, 13); - this.label89.TabIndex = 166; - this.label89.Text = "20%"; - // // morningTwentySecondComboBox // this.morningTwentySecondComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1488,24 +2387,6 @@ this.morningTwentySecondComboBox.TabIndex = 165; this.morningTwentySecondComboBox.SelectedIndexChanged += new System.EventHandler(this.morningTwentySecondComboBox_SelectedIndexChanged); // - // twentyFirstLevelUpDown - // - this.twentyFirstLevelUpDown.Location = new System.Drawing.Point(418, 68); - this.twentyFirstLevelUpDown.Name = "twentyFirstLevelUpDown"; - this.twentyFirstLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.twentyFirstLevelUpDown.TabIndex = 164; - this.twentyFirstLevelUpDown.ValueChanged += new System.EventHandler(this.twentyFirstLevelUpDown_ValueChanged); - // - // label90 - // - this.label90.AutoSize = true; - this.label90.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label90.Location = new System.Drawing.Point(4, 70); - this.label90.Name = "label90"; - this.label90.Size = new System.Drawing.Size(27, 13); - this.label90.TabIndex = 163; - this.label90.Text = "20%"; - // // morningTwentyFirstComboBox // this.morningTwentyFirstComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1517,161 +2398,6 @@ this.morningTwentyFirstComboBox.TabIndex = 162; this.morningTwentyFirstComboBox.SelectedIndexChanged += new System.EventHandler(this.morningTwentyFirstComboBox_SelectedIndexChanged); // - // waterTabPage - // - this.waterTabPage.Controls.Add(this.surfPicture); - this.waterTabPage.Controls.Add(this.pictureBox7); - this.waterTabPage.Controls.Add(this.pictureBox6); - this.waterTabPage.Controls.Add(this.pictureBox5); - this.waterTabPage.Controls.Add(this.superRodGroupBox); - this.waterTabPage.Controls.Add(this.goodRodGroupBox); - this.waterTabPage.Controls.Add(this.oldRodGroupBox); - this.waterTabPage.Controls.Add(this.surfGroupBox); - this.waterTabPage.Location = new System.Drawing.Point(4, 22); - this.waterTabPage.Name = "waterTabPage"; - this.waterTabPage.Padding = new System.Windows.Forms.Padding(3); - this.waterTabPage.Size = new System.Drawing.Size(734, 464); - this.waterTabPage.TabIndex = 1; - this.waterTabPage.Text = "Water"; - this.waterTabPage.UseVisualStyleBackColor = true; - // - // surfPicture - // - this.surfPicture.Image = global::DSPRE.Properties.Resources.SurfIcon; - this.surfPicture.Location = new System.Drawing.Point(67, -1); - this.surfPicture.Name = "surfPicture"; - this.surfPicture.Size = new System.Drawing.Size(42, 42); - this.surfPicture.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.surfPicture.TabIndex = 200; - this.surfPicture.TabStop = false; - // - // pictureBox7 - // - this.pictureBox7.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox7.Image"))); - this.pictureBox7.Location = new System.Drawing.Point(452, 232); - this.pictureBox7.Name = "pictureBox7"; - this.pictureBox7.Size = new System.Drawing.Size(25, 26); - this.pictureBox7.TabIndex = 196; - this.pictureBox7.TabStop = false; - // - // pictureBox6 - // - this.pictureBox6.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox6.Image"))); - this.pictureBox6.Location = new System.Drawing.Point(79, 230); - this.pictureBox6.Name = "pictureBox6"; - this.pictureBox6.Size = new System.Drawing.Size(25, 26); - this.pictureBox6.TabIndex = 195; - this.pictureBox6.TabStop = false; - // - // pictureBox5 - // - this.pictureBox5.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox5.Image"))); - this.pictureBox5.Location = new System.Drawing.Point(442, 8); - this.pictureBox5.Name = "pictureBox5"; - this.pictureBox5.Size = new System.Drawing.Size(25, 26); - this.pictureBox5.TabIndex = 194; - this.pictureBox5.TabStop = false; - // - // superRodGroupBox - // - this.superRodGroupBox.Controls.Add(this.label59); - this.superRodGroupBox.Controls.Add(this.label60); - this.superRodGroupBox.Controls.Add(this.superRodRateUpDown); - this.superRodGroupBox.Controls.Add(this.label69); - this.superRodGroupBox.Controls.Add(this.superRodOneMaxLevelUpDown); - this.superRodGroupBox.Controls.Add(this.superRodOneMinLevelUpDown); - this.superRodGroupBox.Controls.Add(this.label70); - this.superRodGroupBox.Controls.Add(this.superRodOneComboBox); - this.superRodGroupBox.Controls.Add(this.superRodFourMaxLevelUpDown); - this.superRodGroupBox.Controls.Add(this.superRodFourMinLevelUpDown); - this.superRodGroupBox.Controls.Add(this.label71); - this.superRodGroupBox.Controls.Add(this.superRodFourComboBox); - this.superRodGroupBox.Controls.Add(this.superRodFifteenMaxLevelUpDown); - this.superRodGroupBox.Controls.Add(this.superRodFifteenMinLevelUpDown); - this.superRodGroupBox.Controls.Add(this.label72); - this.superRodGroupBox.Controls.Add(this.superRodFifteenComboBox); - this.superRodGroupBox.Controls.Add(this.superRodSecondFortyMaxLevelUpDown); - this.superRodGroupBox.Controls.Add(this.superRodSecondFortyMinLevelUpDown); - this.superRodGroupBox.Controls.Add(this.label73); - this.superRodGroupBox.Controls.Add(this.superRodSecondFortyComboBox); - this.superRodGroupBox.Controls.Add(this.superRodFirstFortyMaxLevelUpDown); - this.superRodGroupBox.Controls.Add(this.superRodFirstFortyMinLevelUpDown); - this.superRodGroupBox.Controls.Add(this.label74); - this.superRodGroupBox.Controls.Add(this.superRodFirstFortyComboBox); - this.superRodGroupBox.Location = new System.Drawing.Point(384, 234); - this.superRodGroupBox.Name = "superRodGroupBox"; - this.superRodGroupBox.Size = new System.Drawing.Size(325, 210); - this.superRodGroupBox.TabIndex = 44; - this.superRodGroupBox.TabStop = false; - this.superRodGroupBox.Text = "Super Rod"; - // - // label59 - // - this.label59.AutoSize = true; - this.label59.Location = new System.Drawing.Point(264, 50); - this.label59.Name = "label59"; - this.label59.Size = new System.Drawing.Size(47, 13); - this.label59.TabIndex = 41; - this.label59.Text = "Max Lvl."; - // - // label60 - // - this.label60.AutoSize = true; - this.label60.Location = new System.Drawing.Point(214, 50); - this.label60.Name = "label60"; - this.label60.Size = new System.Drawing.Size(44, 13); - this.label60.TabIndex = 40; - this.label60.Text = "Min Lvl."; - // - // superRodRateUpDown - // - this.superRodRateUpDown.Location = new System.Drawing.Point(265, 17); - this.superRodRateUpDown.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.superRodRateUpDown.Name = "superRodRateUpDown"; - this.superRodRateUpDown.Size = new System.Drawing.Size(42, 20); - this.superRodRateUpDown.TabIndex = 39; - this.superRodRateUpDown.ValueChanged += new System.EventHandler(this.superRodRateUpDown_ValueChanged); - // - // label69 - // - this.label69.AutoSize = true; - this.label69.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label69.Location = new System.Drawing.Point(229, 19); - this.label69.Name = "label69"; - this.label69.Size = new System.Drawing.Size(30, 13); - this.label69.TabIndex = 38; - this.label69.Text = "Rate"; - // - // superRodOneMaxLevelUpDown - // - this.superRodOneMaxLevelUpDown.Location = new System.Drawing.Point(265, 179); - this.superRodOneMaxLevelUpDown.Name = "superRodOneMaxLevelUpDown"; - this.superRodOneMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.superRodOneMaxLevelUpDown.TabIndex = 22; - this.superRodOneMaxLevelUpDown.ValueChanged += new System.EventHandler(this.superRodOneMaxLevelUpDown_ValueChanged); - // - // superRodOneMinLevelUpDown - // - this.superRodOneMinLevelUpDown.Location = new System.Drawing.Point(217, 179); - this.superRodOneMinLevelUpDown.Name = "superRodOneMinLevelUpDown"; - this.superRodOneMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.superRodOneMinLevelUpDown.TabIndex = 21; - this.superRodOneMinLevelUpDown.ValueChanged += new System.EventHandler(this.superRodOneMinLevelUpDown_ValueChanged); - // - // label70 - // - this.label70.AutoSize = true; - this.label70.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label70.Location = new System.Drawing.Point(18, 181); - this.label70.Name = "label70"; - this.label70.Size = new System.Drawing.Size(21, 13); - this.label70.TabIndex = 20; - this.label70.Text = "1%"; - // // superRodOneComboBox // this.superRodOneComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1683,32 +2409,6 @@ this.superRodOneComboBox.TabIndex = 19; this.superRodOneComboBox.SelectedIndexChanged += new System.EventHandler(this.superRodOneComboBox_SelectedIndexChanged); // - // superRodFourMaxLevelUpDown - // - this.superRodFourMaxLevelUpDown.Location = new System.Drawing.Point(265, 152); - this.superRodFourMaxLevelUpDown.Name = "superRodFourMaxLevelUpDown"; - this.superRodFourMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.superRodFourMaxLevelUpDown.TabIndex = 18; - this.superRodFourMaxLevelUpDown.ValueChanged += new System.EventHandler(this.superRodFourMaxLevelUpDown_ValueChanged); - // - // superRodFourMinLevelUpDown - // - this.superRodFourMinLevelUpDown.Location = new System.Drawing.Point(217, 152); - this.superRodFourMinLevelUpDown.Name = "superRodFourMinLevelUpDown"; - this.superRodFourMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.superRodFourMinLevelUpDown.TabIndex = 17; - this.superRodFourMinLevelUpDown.ValueChanged += new System.EventHandler(this.superRodFourMinLevelUpDown_ValueChanged); - // - // label71 - // - this.label71.AutoSize = true; - this.label71.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label71.Location = new System.Drawing.Point(18, 154); - this.label71.Name = "label71"; - this.label71.Size = new System.Drawing.Size(21, 13); - this.label71.TabIndex = 16; - this.label71.Text = "4%"; - // // superRodFourComboBox // this.superRodFourComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1720,32 +2420,6 @@ this.superRodFourComboBox.TabIndex = 15; this.superRodFourComboBox.SelectedIndexChanged += new System.EventHandler(this.superRodFourComboBox_SelectedIndexChanged); // - // superRodFifteenMaxLevelUpDown - // - this.superRodFifteenMaxLevelUpDown.Location = new System.Drawing.Point(265, 125); - this.superRodFifteenMaxLevelUpDown.Name = "superRodFifteenMaxLevelUpDown"; - this.superRodFifteenMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.superRodFifteenMaxLevelUpDown.TabIndex = 14; - this.superRodFifteenMaxLevelUpDown.ValueChanged += new System.EventHandler(this.superRodFifteenMaxLevelUpDown_ValueChanged); - // - // superRodFifteenMinLevelUpDown - // - this.superRodFifteenMinLevelUpDown.Location = new System.Drawing.Point(217, 125); - this.superRodFifteenMinLevelUpDown.Name = "superRodFifteenMinLevelUpDown"; - this.superRodFifteenMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.superRodFifteenMinLevelUpDown.TabIndex = 13; - this.superRodFifteenMinLevelUpDown.ValueChanged += new System.EventHandler(this.superRodFifteenMinLevelUpDown_ValueChanged); - // - // label72 - // - this.label72.AutoSize = true; - this.label72.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label72.Location = new System.Drawing.Point(12, 127); - this.label72.Name = "label72"; - this.label72.Size = new System.Drawing.Size(27, 13); - this.label72.TabIndex = 12; - this.label72.Text = "15%"; - // // superRodFifteenComboBox // this.superRodFifteenComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1757,32 +2431,6 @@ this.superRodFifteenComboBox.TabIndex = 11; this.superRodFifteenComboBox.SelectedIndexChanged += new System.EventHandler(this.superRodFifteenComboBox_SelectedIndexChanged); // - // superRodSecondFortyMaxLevelUpDown - // - this.superRodSecondFortyMaxLevelUpDown.Location = new System.Drawing.Point(265, 98); - this.superRodSecondFortyMaxLevelUpDown.Name = "superRodSecondFortyMaxLevelUpDown"; - this.superRodSecondFortyMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.superRodSecondFortyMaxLevelUpDown.TabIndex = 10; - this.superRodSecondFortyMaxLevelUpDown.ValueChanged += new System.EventHandler(this.superRodSecondFortyMaxLevelUpDown_ValueChanged); - // - // superRodSecondFortyMinLevelUpDown - // - this.superRodSecondFortyMinLevelUpDown.Location = new System.Drawing.Point(217, 98); - this.superRodSecondFortyMinLevelUpDown.Name = "superRodSecondFortyMinLevelUpDown"; - this.superRodSecondFortyMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.superRodSecondFortyMinLevelUpDown.TabIndex = 9; - this.superRodSecondFortyMinLevelUpDown.ValueChanged += new System.EventHandler(this.superRodSecondFortyMinLevelUpDown_ValueChanged); - // - // label73 - // - this.label73.AutoSize = true; - this.label73.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label73.Location = new System.Drawing.Point(12, 100); - this.label73.Name = "label73"; - this.label73.Size = new System.Drawing.Size(27, 13); - this.label73.TabIndex = 8; - this.label73.Text = "40%"; - // // superRodSecondFortyComboBox // this.superRodSecondFortyComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1794,32 +2442,6 @@ this.superRodSecondFortyComboBox.TabIndex = 7; this.superRodSecondFortyComboBox.SelectedIndexChanged += new System.EventHandler(this.superRodSecondFortyComboBox_SelectedIndexChanged); // - // superRodFirstFortyMaxLevelUpDown - // - this.superRodFirstFortyMaxLevelUpDown.Location = new System.Drawing.Point(265, 71); - this.superRodFirstFortyMaxLevelUpDown.Name = "superRodFirstFortyMaxLevelUpDown"; - this.superRodFirstFortyMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.superRodFirstFortyMaxLevelUpDown.TabIndex = 6; - this.superRodFirstFortyMaxLevelUpDown.ValueChanged += new System.EventHandler(this.superRodFirstFortyMaxLevelUpDown_ValueChanged); - // - // superRodFirstFortyMinLevelUpDown - // - this.superRodFirstFortyMinLevelUpDown.Location = new System.Drawing.Point(217, 71); - this.superRodFirstFortyMinLevelUpDown.Name = "superRodFirstFortyMinLevelUpDown"; - this.superRodFirstFortyMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.superRodFirstFortyMinLevelUpDown.TabIndex = 5; - this.superRodFirstFortyMinLevelUpDown.ValueChanged += new System.EventHandler(this.superRodFirstFortyMinLevelUpDown_ValueChanged); - // - // label74 - // - this.label74.AutoSize = true; - this.label74.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label74.Location = new System.Drawing.Point(12, 73); - this.label74.Name = "label74"; - this.label74.Size = new System.Drawing.Size(27, 13); - this.label74.TabIndex = 4; - this.label74.Text = "40%"; - // // superRodFirstFortyComboBox // this.superRodFirstFortyComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1831,106 +2453,6 @@ this.superRodFirstFortyComboBox.TabIndex = 3; this.superRodFirstFortyComboBox.SelectedIndexChanged += new System.EventHandler(this.superRodFirstFortyComboBox_SelectedIndexChanged); // - // goodRodGroupBox - // - this.goodRodGroupBox.Controls.Add(this.label51); - this.goodRodGroupBox.Controls.Add(this.label52); - this.goodRodGroupBox.Controls.Add(this.goodRodRateUpDown); - this.goodRodGroupBox.Controls.Add(this.label53); - this.goodRodGroupBox.Controls.Add(this.goodRodOneMaxLevelUpDown); - this.goodRodGroupBox.Controls.Add(this.goodRodOneMinLevelUpDown); - this.goodRodGroupBox.Controls.Add(this.label54); - this.goodRodGroupBox.Controls.Add(this.goodRodOneComboBox); - this.goodRodGroupBox.Controls.Add(this.goodRodFourMaxLevelUpDown); - this.goodRodGroupBox.Controls.Add(this.goodRodFourMinLevelUpDown); - this.goodRodGroupBox.Controls.Add(this.label55); - this.goodRodGroupBox.Controls.Add(this.goodRodFourComboBox); - this.goodRodGroupBox.Controls.Add(this.goodRodFifteenMaxLevelUpDown); - this.goodRodGroupBox.Controls.Add(this.goodRodFifteenMinLevelUpDown); - this.goodRodGroupBox.Controls.Add(this.label56); - this.goodRodGroupBox.Controls.Add(this.goodRodFifteenComboBox); - this.goodRodGroupBox.Controls.Add(this.goodRodSecondFortyMaxLevelUpDown); - this.goodRodGroupBox.Controls.Add(this.goodRodSecondFortyMinLevelUpDown); - this.goodRodGroupBox.Controls.Add(this.label57); - this.goodRodGroupBox.Controls.Add(this.goodRodSecondFortyComboBox); - this.goodRodGroupBox.Controls.Add(this.goodRodFirstFortyMaxLevelUpDown); - this.goodRodGroupBox.Controls.Add(this.goodRodFirstFortyMinLevelUpDown); - this.goodRodGroupBox.Controls.Add(this.label58); - this.goodRodGroupBox.Controls.Add(this.goodRodFirstFortyComboBox); - this.goodRodGroupBox.Location = new System.Drawing.Point(17, 234); - this.goodRodGroupBox.Name = "goodRodGroupBox"; - this.goodRodGroupBox.Size = new System.Drawing.Size(325, 210); - this.goodRodGroupBox.TabIndex = 43; - this.goodRodGroupBox.TabStop = false; - this.goodRodGroupBox.Text = "Good Rod"; - // - // label51 - // - this.label51.AutoSize = true; - this.label51.Location = new System.Drawing.Point(264, 50); - this.label51.Name = "label51"; - this.label51.Size = new System.Drawing.Size(47, 13); - this.label51.TabIndex = 41; - this.label51.Text = "Max Lvl."; - // - // label52 - // - this.label52.AutoSize = true; - this.label52.Location = new System.Drawing.Point(214, 50); - this.label52.Name = "label52"; - this.label52.Size = new System.Drawing.Size(44, 13); - this.label52.TabIndex = 40; - this.label52.Text = "Min Lvl."; - // - // goodRodRateUpDown - // - this.goodRodRateUpDown.Location = new System.Drawing.Point(265, 17); - this.goodRodRateUpDown.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.goodRodRateUpDown.Name = "goodRodRateUpDown"; - this.goodRodRateUpDown.Size = new System.Drawing.Size(42, 20); - this.goodRodRateUpDown.TabIndex = 39; - this.goodRodRateUpDown.ValueChanged += new System.EventHandler(this.goodRodRateUpDown_ValueChanged); - // - // label53 - // - this.label53.AutoSize = true; - this.label53.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label53.Location = new System.Drawing.Point(229, 19); - this.label53.Name = "label53"; - this.label53.Size = new System.Drawing.Size(30, 13); - this.label53.TabIndex = 38; - this.label53.Text = "Rate"; - // - // goodRodOneMaxLevelUpDown - // - this.goodRodOneMaxLevelUpDown.Location = new System.Drawing.Point(265, 179); - this.goodRodOneMaxLevelUpDown.Name = "goodRodOneMaxLevelUpDown"; - this.goodRodOneMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.goodRodOneMaxLevelUpDown.TabIndex = 22; - this.goodRodOneMaxLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodOneMaxLevelUpDown_ValueChanged); - // - // goodRodOneMinLevelUpDown - // - this.goodRodOneMinLevelUpDown.Location = new System.Drawing.Point(217, 179); - this.goodRodOneMinLevelUpDown.Name = "goodRodOneMinLevelUpDown"; - this.goodRodOneMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.goodRodOneMinLevelUpDown.TabIndex = 21; - this.goodRodOneMinLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodOneMinLevelUpDown_ValueChanged); - // - // label54 - // - this.label54.AutoSize = true; - this.label54.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label54.Location = new System.Drawing.Point(18, 181); - this.label54.Name = "label54"; - this.label54.Size = new System.Drawing.Size(21, 13); - this.label54.TabIndex = 20; - this.label54.Text = "1%"; - // // goodRodOneComboBox // this.goodRodOneComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1942,32 +2464,6 @@ this.goodRodOneComboBox.TabIndex = 19; this.goodRodOneComboBox.SelectedIndexChanged += new System.EventHandler(this.goodRodOneComboBox_SelectedIndexChanged); // - // goodRodFourMaxLevelUpDown - // - this.goodRodFourMaxLevelUpDown.Location = new System.Drawing.Point(265, 152); - this.goodRodFourMaxLevelUpDown.Name = "goodRodFourMaxLevelUpDown"; - this.goodRodFourMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.goodRodFourMaxLevelUpDown.TabIndex = 18; - this.goodRodFourMaxLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodFourMaxLevelUpDown_ValueChanged); - // - // goodRodFourMinLevelUpDown - // - this.goodRodFourMinLevelUpDown.Location = new System.Drawing.Point(217, 152); - this.goodRodFourMinLevelUpDown.Name = "goodRodFourMinLevelUpDown"; - this.goodRodFourMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.goodRodFourMinLevelUpDown.TabIndex = 17; - this.goodRodFourMinLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodFourMinLevelUpDown_ValueChanged); - // - // label55 - // - this.label55.AutoSize = true; - this.label55.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label55.Location = new System.Drawing.Point(18, 154); - this.label55.Name = "label55"; - this.label55.Size = new System.Drawing.Size(21, 13); - this.label55.TabIndex = 16; - this.label55.Text = "4%"; - // // goodRodFourComboBox // this.goodRodFourComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1979,32 +2475,6 @@ this.goodRodFourComboBox.TabIndex = 15; this.goodRodFourComboBox.SelectedIndexChanged += new System.EventHandler(this.goodRodFourComboBox_SelectedIndexChanged); // - // goodRodFifteenMaxLevelUpDown - // - this.goodRodFifteenMaxLevelUpDown.Location = new System.Drawing.Point(265, 125); - this.goodRodFifteenMaxLevelUpDown.Name = "goodRodFifteenMaxLevelUpDown"; - this.goodRodFifteenMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.goodRodFifteenMaxLevelUpDown.TabIndex = 14; - this.goodRodFifteenMaxLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodFifteenMaxLevelUpDown_ValueChanged); - // - // goodRodFifteenMinLevelUpDown - // - this.goodRodFifteenMinLevelUpDown.Location = new System.Drawing.Point(217, 125); - this.goodRodFifteenMinLevelUpDown.Name = "goodRodFifteenMinLevelUpDown"; - this.goodRodFifteenMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.goodRodFifteenMinLevelUpDown.TabIndex = 13; - this.goodRodFifteenMinLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodFifteenMinLevelUpDown_ValueChanged); - // - // label56 - // - this.label56.AutoSize = true; - this.label56.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label56.Location = new System.Drawing.Point(12, 127); - this.label56.Name = "label56"; - this.label56.Size = new System.Drawing.Size(27, 13); - this.label56.TabIndex = 12; - this.label56.Text = "15%"; - // // goodRodFifteenComboBox // this.goodRodFifteenComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -2016,32 +2486,6 @@ this.goodRodFifteenComboBox.TabIndex = 11; this.goodRodFifteenComboBox.SelectedIndexChanged += new System.EventHandler(this.goodRodFifteenComboBox_SelectedIndexChanged); // - // goodRodSecondFortyMaxLevelUpDown - // - this.goodRodSecondFortyMaxLevelUpDown.Location = new System.Drawing.Point(265, 98); - this.goodRodSecondFortyMaxLevelUpDown.Name = "goodRodSecondFortyMaxLevelUpDown"; - this.goodRodSecondFortyMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.goodRodSecondFortyMaxLevelUpDown.TabIndex = 10; - this.goodRodSecondFortyMaxLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodSecondFortyMaxLevelUpDown_ValueChanged); - // - // goodRodSecondFortyMinLevelUpDown - // - this.goodRodSecondFortyMinLevelUpDown.Location = new System.Drawing.Point(217, 98); - this.goodRodSecondFortyMinLevelUpDown.Name = "goodRodSecondFortyMinLevelUpDown"; - this.goodRodSecondFortyMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.goodRodSecondFortyMinLevelUpDown.TabIndex = 9; - this.goodRodSecondFortyMinLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodSecondFortyMinLevelUpDown_ValueChanged); - // - // label57 - // - this.label57.AutoSize = true; - this.label57.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label57.Location = new System.Drawing.Point(12, 100); - this.label57.Name = "label57"; - this.label57.Size = new System.Drawing.Size(27, 13); - this.label57.TabIndex = 8; - this.label57.Text = "40%"; - // // goodRodSecondFortyComboBox // this.goodRodSecondFortyComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -2053,32 +2497,6 @@ this.goodRodSecondFortyComboBox.TabIndex = 7; this.goodRodSecondFortyComboBox.SelectedIndexChanged += new System.EventHandler(this.goodRodSecondFortyComboBox_SelectedIndexChanged); // - // goodRodFirstFortyMaxLevelUpDown - // - this.goodRodFirstFortyMaxLevelUpDown.Location = new System.Drawing.Point(265, 71); - this.goodRodFirstFortyMaxLevelUpDown.Name = "goodRodFirstFortyMaxLevelUpDown"; - this.goodRodFirstFortyMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.goodRodFirstFortyMaxLevelUpDown.TabIndex = 6; - this.goodRodFirstFortyMaxLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodFirstFortyMaxLevelUpDown_ValueChanged); - // - // goodRodFirstFortyMinLevelUpDown - // - this.goodRodFirstFortyMinLevelUpDown.Location = new System.Drawing.Point(217, 71); - this.goodRodFirstFortyMinLevelUpDown.Name = "goodRodFirstFortyMinLevelUpDown"; - this.goodRodFirstFortyMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.goodRodFirstFortyMinLevelUpDown.TabIndex = 5; - this.goodRodFirstFortyMinLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodFirstFortyMinLevelUpDown_ValueChanged); - // - // label58 - // - this.label58.AutoSize = true; - this.label58.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label58.Location = new System.Drawing.Point(12, 73); - this.label58.Name = "label58"; - this.label58.Size = new System.Drawing.Size(27, 13); - this.label58.TabIndex = 4; - this.label58.Text = "40%"; - // // goodRodFirstFortyComboBox // this.goodRodFirstFortyComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -2090,106 +2508,6 @@ this.goodRodFirstFortyComboBox.TabIndex = 3; this.goodRodFirstFortyComboBox.SelectedIndexChanged += new System.EventHandler(this.goodRodFirstFortyComboBox_SelectedIndexChanged); // - // oldRodGroupBox - // - this.oldRodGroupBox.Controls.Add(this.label43); - this.oldRodGroupBox.Controls.Add(this.label44); - this.oldRodGroupBox.Controls.Add(this.oldRodRateUpDown); - this.oldRodGroupBox.Controls.Add(this.label45); - this.oldRodGroupBox.Controls.Add(this.oldRodOneMaxLevelUpDown); - this.oldRodGroupBox.Controls.Add(this.oldRodOneMinLevelUpDown); - this.oldRodGroupBox.Controls.Add(this.label46); - this.oldRodGroupBox.Controls.Add(this.oldRodOneComboBox); - this.oldRodGroupBox.Controls.Add(this.oldRodFourMaxLevelUpDown); - this.oldRodGroupBox.Controls.Add(this.oldRodFourMinLevelUpDown); - this.oldRodGroupBox.Controls.Add(this.label47); - this.oldRodGroupBox.Controls.Add(this.oldRodFourComboBox); - this.oldRodGroupBox.Controls.Add(this.oldRodFiveMaxLevelUpDown); - this.oldRodGroupBox.Controls.Add(this.oldRodFiveMinLevelUpDown); - this.oldRodGroupBox.Controls.Add(this.label48); - this.oldRodGroupBox.Controls.Add(this.oldRodFiveComboBox); - this.oldRodGroupBox.Controls.Add(this.oldRodThirtyMaxLevelUpDown); - this.oldRodGroupBox.Controls.Add(this.oldRodThirtyMinLevelUpDown); - this.oldRodGroupBox.Controls.Add(this.label49); - this.oldRodGroupBox.Controls.Add(this.oldRodThirtyComboBox); - this.oldRodGroupBox.Controls.Add(this.oldRodSixtyMaxLevelUpDown); - this.oldRodGroupBox.Controls.Add(this.oldRodSixtyMinLevelUpDown); - this.oldRodGroupBox.Controls.Add(this.label50); - this.oldRodGroupBox.Controls.Add(this.oldRodSixtyComboBox); - this.oldRodGroupBox.Location = new System.Drawing.Point(384, 10); - this.oldRodGroupBox.Name = "oldRodGroupBox"; - this.oldRodGroupBox.Size = new System.Drawing.Size(325, 210); - this.oldRodGroupBox.TabIndex = 42; - this.oldRodGroupBox.TabStop = false; - this.oldRodGroupBox.Text = "Old Rod"; - // - // label43 - // - this.label43.AutoSize = true; - this.label43.Location = new System.Drawing.Point(264, 50); - this.label43.Name = "label43"; - this.label43.Size = new System.Drawing.Size(47, 13); - this.label43.TabIndex = 41; - this.label43.Text = "Max Lvl."; - // - // label44 - // - this.label44.AutoSize = true; - this.label44.Location = new System.Drawing.Point(214, 50); - this.label44.Name = "label44"; - this.label44.Size = new System.Drawing.Size(44, 13); - this.label44.TabIndex = 40; - this.label44.Text = "Min Lvl."; - // - // oldRodRateUpDown - // - this.oldRodRateUpDown.Location = new System.Drawing.Point(265, 17); - this.oldRodRateUpDown.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.oldRodRateUpDown.Name = "oldRodRateUpDown"; - this.oldRodRateUpDown.Size = new System.Drawing.Size(42, 20); - this.oldRodRateUpDown.TabIndex = 39; - this.oldRodRateUpDown.ValueChanged += new System.EventHandler(this.oldRodRateUpDown_ValueChanged); - // - // label45 - // - this.label45.AutoSize = true; - this.label45.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label45.Location = new System.Drawing.Point(229, 19); - this.label45.Name = "label45"; - this.label45.Size = new System.Drawing.Size(30, 13); - this.label45.TabIndex = 38; - this.label45.Text = "Rate"; - // - // oldRodOneMaxLevelUpDown - // - this.oldRodOneMaxLevelUpDown.Location = new System.Drawing.Point(265, 179); - this.oldRodOneMaxLevelUpDown.Name = "oldRodOneMaxLevelUpDown"; - this.oldRodOneMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.oldRodOneMaxLevelUpDown.TabIndex = 22; - this.oldRodOneMaxLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodOneMaxLevelUpDown_ValueChanged); - // - // oldRodOneMinLevelUpDown - // - this.oldRodOneMinLevelUpDown.Location = new System.Drawing.Point(217, 179); - this.oldRodOneMinLevelUpDown.Name = "oldRodOneMinLevelUpDown"; - this.oldRodOneMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.oldRodOneMinLevelUpDown.TabIndex = 21; - this.oldRodOneMinLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodOneMinLevelUpDown_ValueChanged); - // - // label46 - // - this.label46.AutoSize = true; - this.label46.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label46.Location = new System.Drawing.Point(18, 181); - this.label46.Name = "label46"; - this.label46.Size = new System.Drawing.Size(21, 13); - this.label46.TabIndex = 20; - this.label46.Text = "1%"; - // // oldRodOneComboBox // this.oldRodOneComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -2201,32 +2519,6 @@ this.oldRodOneComboBox.TabIndex = 19; this.oldRodOneComboBox.SelectedIndexChanged += new System.EventHandler(this.oldRodOneComboBox_SelectedIndexChanged); // - // oldRodFourMaxLevelUpDown - // - this.oldRodFourMaxLevelUpDown.Location = new System.Drawing.Point(265, 152); - this.oldRodFourMaxLevelUpDown.Name = "oldRodFourMaxLevelUpDown"; - this.oldRodFourMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.oldRodFourMaxLevelUpDown.TabIndex = 18; - this.oldRodFourMaxLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodFourMaxLevelUpDown_ValueChanged); - // - // oldRodFourMinLevelUpDown - // - this.oldRodFourMinLevelUpDown.Location = new System.Drawing.Point(217, 152); - this.oldRodFourMinLevelUpDown.Name = "oldRodFourMinLevelUpDown"; - this.oldRodFourMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.oldRodFourMinLevelUpDown.TabIndex = 17; - this.oldRodFourMinLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodFourMinLevelUpDown_ValueChanged); - // - // label47 - // - this.label47.AutoSize = true; - this.label47.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label47.Location = new System.Drawing.Point(18, 154); - this.label47.Name = "label47"; - this.label47.Size = new System.Drawing.Size(21, 13); - this.label47.TabIndex = 16; - this.label47.Text = "4%"; - // // oldRodFourComboBox // this.oldRodFourComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -2238,32 +2530,6 @@ this.oldRodFourComboBox.TabIndex = 15; this.oldRodFourComboBox.SelectedIndexChanged += new System.EventHandler(this.oldRodFourComboBox_SelectedIndexChanged); // - // oldRodFiveMaxLevelUpDown - // - this.oldRodFiveMaxLevelUpDown.Location = new System.Drawing.Point(265, 125); - this.oldRodFiveMaxLevelUpDown.Name = "oldRodFiveMaxLevelUpDown"; - this.oldRodFiveMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.oldRodFiveMaxLevelUpDown.TabIndex = 14; - this.oldRodFiveMaxLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodFiveMaxLevelUpDown_ValueChanged); - // - // oldRodFiveMinLevelUpDown - // - this.oldRodFiveMinLevelUpDown.Location = new System.Drawing.Point(217, 125); - this.oldRodFiveMinLevelUpDown.Name = "oldRodFiveMinLevelUpDown"; - this.oldRodFiveMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.oldRodFiveMinLevelUpDown.TabIndex = 13; - this.oldRodFiveMinLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodFiveMinLevelUpDown_ValueChanged); - // - // label48 - // - this.label48.AutoSize = true; - this.label48.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label48.Location = new System.Drawing.Point(18, 127); - this.label48.Name = "label48"; - this.label48.Size = new System.Drawing.Size(21, 13); - this.label48.TabIndex = 12; - this.label48.Text = "5%"; - // // oldRodFiveComboBox // this.oldRodFiveComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -2275,32 +2541,6 @@ this.oldRodFiveComboBox.TabIndex = 11; this.oldRodFiveComboBox.SelectedIndexChanged += new System.EventHandler(this.oldRodFiveComboBox_SelectedIndexChanged); // - // oldRodThirtyMaxLevelUpDown - // - this.oldRodThirtyMaxLevelUpDown.Location = new System.Drawing.Point(265, 98); - this.oldRodThirtyMaxLevelUpDown.Name = "oldRodThirtyMaxLevelUpDown"; - this.oldRodThirtyMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.oldRodThirtyMaxLevelUpDown.TabIndex = 10; - this.oldRodThirtyMaxLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodThirtyMaxLevelUpDown_ValueChanged); - // - // oldRodThirtyMinLevelUpDown - // - this.oldRodThirtyMinLevelUpDown.Location = new System.Drawing.Point(217, 98); - this.oldRodThirtyMinLevelUpDown.Name = "oldRodThirtyMinLevelUpDown"; - this.oldRodThirtyMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.oldRodThirtyMinLevelUpDown.TabIndex = 9; - this.oldRodThirtyMinLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodThirtyMinLevelUpDown_ValueChanged); - // - // label49 - // - this.label49.AutoSize = true; - this.label49.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label49.Location = new System.Drawing.Point(12, 100); - this.label49.Name = "label49"; - this.label49.Size = new System.Drawing.Size(27, 13); - this.label49.TabIndex = 8; - this.label49.Text = "30%"; - // // oldRodThirtyComboBox // this.oldRodThirtyComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -2312,32 +2552,6 @@ this.oldRodThirtyComboBox.TabIndex = 7; this.oldRodThirtyComboBox.SelectedIndexChanged += new System.EventHandler(this.oldRodThirtyComboBox_SelectedIndexChanged); // - // oldRodSixtyMaxLevelUpDown - // - this.oldRodSixtyMaxLevelUpDown.Location = new System.Drawing.Point(265, 71); - this.oldRodSixtyMaxLevelUpDown.Name = "oldRodSixtyMaxLevelUpDown"; - this.oldRodSixtyMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.oldRodSixtyMaxLevelUpDown.TabIndex = 6; - this.oldRodSixtyMaxLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodSixtyMaxLevelUpDown_ValueChanged); - // - // oldRodSixtyMinLevelUpDown - // - this.oldRodSixtyMinLevelUpDown.Location = new System.Drawing.Point(217, 71); - this.oldRodSixtyMinLevelUpDown.Name = "oldRodSixtyMinLevelUpDown"; - this.oldRodSixtyMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.oldRodSixtyMinLevelUpDown.TabIndex = 5; - this.oldRodSixtyMinLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodSixtyMinLevelUpDown_ValueChanged); - // - // label50 - // - this.label50.AutoSize = true; - this.label50.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label50.Location = new System.Drawing.Point(12, 73); - this.label50.Name = "label50"; - this.label50.Size = new System.Drawing.Size(27, 13); - this.label50.TabIndex = 4; - this.label50.Text = "60%"; - // // oldRodSixtyComboBox // this.oldRodSixtyComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -2349,106 +2563,6 @@ this.oldRodSixtyComboBox.TabIndex = 3; this.oldRodSixtyComboBox.SelectedIndexChanged += new System.EventHandler(this.oldRodSixtyComboBox_SelectedIndexChanged); // - // surfGroupBox - // - this.surfGroupBox.Controls.Add(this.label68); - this.surfGroupBox.Controls.Add(this.label67); - this.surfGroupBox.Controls.Add(this.surfRateUpDown); - this.surfGroupBox.Controls.Add(this.label61); - this.surfGroupBox.Controls.Add(this.surfOneMaxLevelUpDown); - this.surfGroupBox.Controls.Add(this.surfOneMinLevelUpDown); - this.surfGroupBox.Controls.Add(this.label62); - this.surfGroupBox.Controls.Add(this.surfOneComboBox); - this.surfGroupBox.Controls.Add(this.surfFourMaxLevelUpDown); - this.surfGroupBox.Controls.Add(this.surfFourMinLevelUpDown); - this.surfGroupBox.Controls.Add(this.label63); - this.surfGroupBox.Controls.Add(this.surfFourComboBox); - this.surfGroupBox.Controls.Add(this.surfFiveMaxLevelUpDown); - this.surfGroupBox.Controls.Add(this.surfFiveMinLevelUpDown); - this.surfGroupBox.Controls.Add(this.label64); - this.surfGroupBox.Controls.Add(this.surfFiveComboBox); - this.surfGroupBox.Controls.Add(this.surfThirtyMaxLevelUpDown); - this.surfGroupBox.Controls.Add(this.surfThirtyMinLevelUpDown); - this.surfGroupBox.Controls.Add(this.label65); - this.surfGroupBox.Controls.Add(this.surfThirtyComboBox); - this.surfGroupBox.Controls.Add(this.surfSixtyMaxLevelUpDown); - this.surfGroupBox.Controls.Add(this.surfSixtyMinLevelUpDown); - this.surfGroupBox.Controls.Add(this.label66); - this.surfGroupBox.Controls.Add(this.surfSixtyComboBox); - this.surfGroupBox.Location = new System.Drawing.Point(17, 10); - this.surfGroupBox.Name = "surfGroupBox"; - this.surfGroupBox.Size = new System.Drawing.Size(325, 210); - this.surfGroupBox.TabIndex = 4; - this.surfGroupBox.TabStop = false; - this.surfGroupBox.Text = "Surfing"; - // - // label68 - // - this.label68.AutoSize = true; - this.label68.Location = new System.Drawing.Point(264, 50); - this.label68.Name = "label68"; - this.label68.Size = new System.Drawing.Size(47, 13); - this.label68.TabIndex = 41; - this.label68.Text = "Max Lvl."; - // - // label67 - // - this.label67.AutoSize = true; - this.label67.Location = new System.Drawing.Point(214, 50); - this.label67.Name = "label67"; - this.label67.Size = new System.Drawing.Size(44, 13); - this.label67.TabIndex = 40; - this.label67.Text = "Min Lvl."; - // - // surfRateUpDown - // - this.surfRateUpDown.Location = new System.Drawing.Point(265, 17); - this.surfRateUpDown.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.surfRateUpDown.Name = "surfRateUpDown"; - this.surfRateUpDown.Size = new System.Drawing.Size(42, 20); - this.surfRateUpDown.TabIndex = 39; - this.surfRateUpDown.ValueChanged += new System.EventHandler(this.surfRateUpDown_ValueChanged); - // - // label61 - // - this.label61.AutoSize = true; - this.label61.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label61.Location = new System.Drawing.Point(229, 19); - this.label61.Name = "label61"; - this.label61.Size = new System.Drawing.Size(30, 13); - this.label61.TabIndex = 38; - this.label61.Text = "Rate"; - // - // surfOneMaxLevelUpDown - // - this.surfOneMaxLevelUpDown.Location = new System.Drawing.Point(265, 179); - this.surfOneMaxLevelUpDown.Name = "surfOneMaxLevelUpDown"; - this.surfOneMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.surfOneMaxLevelUpDown.TabIndex = 22; - this.surfOneMaxLevelUpDown.ValueChanged += new System.EventHandler(this.surfOneMaxLevelUpDown_ValueChanged); - // - // surfOneMinLevelUpDown - // - this.surfOneMinLevelUpDown.Location = new System.Drawing.Point(217, 179); - this.surfOneMinLevelUpDown.Name = "surfOneMinLevelUpDown"; - this.surfOneMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.surfOneMinLevelUpDown.TabIndex = 21; - this.surfOneMinLevelUpDown.ValueChanged += new System.EventHandler(this.surfOneMinLevelUpDown_ValueChanged); - // - // label62 - // - this.label62.AutoSize = true; - this.label62.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label62.Location = new System.Drawing.Point(18, 181); - this.label62.Name = "label62"; - this.label62.Size = new System.Drawing.Size(21, 13); - this.label62.TabIndex = 20; - this.label62.Text = "1%"; - // // surfOneComboBox // this.surfOneComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -2460,32 +2574,6 @@ this.surfOneComboBox.TabIndex = 19; this.surfOneComboBox.SelectedIndexChanged += new System.EventHandler(this.surfOneComboBox_SelectedIndexChanged); // - // surfFourMaxLevelUpDown - // - this.surfFourMaxLevelUpDown.Location = new System.Drawing.Point(265, 152); - this.surfFourMaxLevelUpDown.Name = "surfFourMaxLevelUpDown"; - this.surfFourMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.surfFourMaxLevelUpDown.TabIndex = 18; - this.surfFourMaxLevelUpDown.ValueChanged += new System.EventHandler(this.surfFourMaxLevelUpDown_ValueChanged); - // - // surfFourMinLevelUpDown - // - this.surfFourMinLevelUpDown.Location = new System.Drawing.Point(217, 152); - this.surfFourMinLevelUpDown.Name = "surfFourMinLevelUpDown"; - this.surfFourMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.surfFourMinLevelUpDown.TabIndex = 17; - this.surfFourMinLevelUpDown.ValueChanged += new System.EventHandler(this.surfFourMinLevelUpDown_ValueChanged); - // - // label63 - // - this.label63.AutoSize = true; - this.label63.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label63.Location = new System.Drawing.Point(18, 154); - this.label63.Name = "label63"; - this.label63.Size = new System.Drawing.Size(21, 13); - this.label63.TabIndex = 16; - this.label63.Text = "4%"; - // // surfFourComboBox // this.surfFourComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -2497,32 +2585,6 @@ this.surfFourComboBox.TabIndex = 15; this.surfFourComboBox.SelectedIndexChanged += new System.EventHandler(this.surfFourComboBox_SelectedIndexChanged); // - // surfFiveMaxLevelUpDown - // - this.surfFiveMaxLevelUpDown.Location = new System.Drawing.Point(265, 125); - this.surfFiveMaxLevelUpDown.Name = "surfFiveMaxLevelUpDown"; - this.surfFiveMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.surfFiveMaxLevelUpDown.TabIndex = 14; - this.surfFiveMaxLevelUpDown.ValueChanged += new System.EventHandler(this.surfFiveMaxLevelUpDown_ValueChanged); - // - // surfFiveMinLevelUpDown - // - this.surfFiveMinLevelUpDown.Location = new System.Drawing.Point(217, 125); - this.surfFiveMinLevelUpDown.Name = "surfFiveMinLevelUpDown"; - this.surfFiveMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.surfFiveMinLevelUpDown.TabIndex = 13; - this.surfFiveMinLevelUpDown.ValueChanged += new System.EventHandler(this.surfFiveMinLevelUpDown_ValueChanged); - // - // label64 - // - this.label64.AutoSize = true; - this.label64.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label64.Location = new System.Drawing.Point(18, 127); - this.label64.Name = "label64"; - this.label64.Size = new System.Drawing.Size(21, 13); - this.label64.TabIndex = 12; - this.label64.Text = "5%"; - // // surfFiveComboBox // this.surfFiveComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -2534,32 +2596,6 @@ this.surfFiveComboBox.TabIndex = 11; this.surfFiveComboBox.SelectedIndexChanged += new System.EventHandler(this.surfFiveComboBox_SelectedIndexChanged); // - // surfThirtyMaxLevelUpDown - // - this.surfThirtyMaxLevelUpDown.Location = new System.Drawing.Point(265, 98); - this.surfThirtyMaxLevelUpDown.Name = "surfThirtyMaxLevelUpDown"; - this.surfThirtyMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.surfThirtyMaxLevelUpDown.TabIndex = 10; - this.surfThirtyMaxLevelUpDown.ValueChanged += new System.EventHandler(this.surfThirtyMaxLevelUpDown_ValueChanged); - // - // surfThirtyMinLevelUpDown - // - this.surfThirtyMinLevelUpDown.Location = new System.Drawing.Point(217, 98); - this.surfThirtyMinLevelUpDown.Name = "surfThirtyMinLevelUpDown"; - this.surfThirtyMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.surfThirtyMinLevelUpDown.TabIndex = 9; - this.surfThirtyMinLevelUpDown.ValueChanged += new System.EventHandler(this.surfThirtyMinLevelUpDown_ValueChanged); - // - // label65 - // - this.label65.AutoSize = true; - this.label65.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label65.Location = new System.Drawing.Point(12, 100); - this.label65.Name = "label65"; - this.label65.Size = new System.Drawing.Size(27, 13); - this.label65.TabIndex = 8; - this.label65.Text = "30%"; - // // surfThirtyComboBox // this.surfThirtyComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -2571,32 +2607,6 @@ this.surfThirtyComboBox.TabIndex = 7; this.surfThirtyComboBox.SelectedIndexChanged += new System.EventHandler(this.surfThirtyComboBox_SelectedIndexChanged); // - // surfSixtyMaxLevelUpDown - // - this.surfSixtyMaxLevelUpDown.Location = new System.Drawing.Point(265, 71); - this.surfSixtyMaxLevelUpDown.Name = "surfSixtyMaxLevelUpDown"; - this.surfSixtyMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.surfSixtyMaxLevelUpDown.TabIndex = 6; - this.surfSixtyMaxLevelUpDown.ValueChanged += new System.EventHandler(this.surfSixtyMaxLevelUpDown_ValueChanged); - // - // surfSixtyMinLevelUpDown - // - this.surfSixtyMinLevelUpDown.Location = new System.Drawing.Point(217, 71); - this.surfSixtyMinLevelUpDown.Name = "surfSixtyMinLevelUpDown"; - this.surfSixtyMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.surfSixtyMinLevelUpDown.TabIndex = 5; - this.surfSixtyMinLevelUpDown.ValueChanged += new System.EventHandler(this.surfSixtyMinLevelUpDown_ValueChanged); - // - // label66 - // - this.label66.AutoSize = true; - this.label66.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label66.Location = new System.Drawing.Point(12, 73); - this.label66.Name = "label66"; - this.label66.Size = new System.Drawing.Size(27, 13); - this.label66.TabIndex = 4; - this.label66.Text = "60%"; - // // surfSixtyComboBox // this.surfSixtyComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -2608,21 +2618,11 @@ this.surfSixtyComboBox.TabIndex = 3; this.surfSixtyComboBox.SelectedIndexChanged += new System.EventHandler(this.surfSixtyComboBox_SelectedIndexChanged); // - // repairAllButton - // - this.repairAllButton.Image = global::DSPRE.Properties.Resources.wrenchIcon; - this.repairAllButton.Location = new System.Drawing.Point(590, 9); - this.repairAllButton.Name = "repairAllButton"; - this.repairAllButton.Size = new System.Drawing.Size(38, 40); - this.repairAllButton.TabIndex = 69; - this.repairAllButton.UseVisualStyleBackColor = true; - this.repairAllButton.Click += new System.EventHandler(this.repairAllButton_Click); - // // WildEditorHGSS // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(758, 555); + this.ClientSize = new System.Drawing.Size(813, 583); this.Controls.Add(this.repairAllButton); this.Controls.Add(this.mainTabControl); this.Controls.Add(this.removeEncounterFileButton); @@ -2723,6 +2723,7 @@ ((System.ComponentModel.ISupportInitialize)(this.surfThirtyMinLevelUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.surfSixtyMaxLevelUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.surfSixtyMinLevelUpDown)).EndInit(); + this.groupBox1.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -2917,7 +2918,6 @@ private DSPRE.InputComboBox surfSwarmComboBox; private System.Windows.Forms.Label label6; private DSPRE.InputComboBox grassSwarmComboBox; - private System.Windows.Forms.Label label7; private System.Windows.Forms.Label label8; private System.Windows.Forms.GroupBox radioMusicComboBox; private DSPRE.InputComboBox sinnohSecondComboBox; @@ -2944,5 +2944,6 @@ private System.Windows.Forms.Button repairAllButton; private System.Windows.Forms.Label label15; private System.Windows.Forms.Label label16; + private System.Windows.Forms.GroupBox groupBox1; } } \ No newline at end of file diff --git a/DS_Map/WildEditorHGSS.cs b/DS_Map/WildEditorHGSS.cs index f3a0ce9..6fbe156 100644 --- a/DS_Map/WildEditorHGSS.cs +++ b/DS_Map/WildEditorHGSS.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.IO; +using System.Reflection; using System.Windows.Forms; using static DSPRE.RomInfo; @@ -16,7 +17,7 @@ namespace DSPRE { encounterFileFolder = dirPath; disableHandlers = true; - + Text = "DSPRE Reloaded " + GetDSPREVersion() + " - HGSS Encounters Editor"; MapHeader tempMapHeader; List locationNames = RomInfo.GetLocationNames(); Dictionary EncounterFileLocationName = new Dictionary(); @@ -86,6 +87,11 @@ namespace DSPRE { SetupControls(); } + public string GetDSPREVersion() { + return "" + Assembly.GetExecutingAssembly().GetName().Version.Major + "." + Assembly.GetExecutingAssembly().GetName().Version.Minor + + "." + Assembly.GetExecutingAssembly().GetName().Version.Build; + } + public void SetupControls() { disableHandlers = true; From b6789bb3ad6b1a1c7cc7bc2c52ef7f504582317b Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Sat, 2 Mar 2024 11:12:45 +0100 Subject: [PATCH 02/40] Merged mon editors into one. Needs testing --- DS_Map/DSPRE.csproj | 9 +++ DS_Map/EvolutionsEditor.cs | 7 +- DS_Map/LearnsetEditor.cs | 7 +- DS_Map/Main Window.Designer.cs | 4 +- DS_Map/Main Window.cs | 7 +- DS_Map/Main Window.resx | 2 +- DS_Map/PersonalDataEditor.cs | 7 +- DS_Map/PokemonEditor.Designer.cs | 95 +++++++++++++++++++++++ DS_Map/PokemonEditor.cs | 41 ++++++++++ DS_Map/PokemonEditor.resx | 120 ++++++++++++++++++++++++++++++ DS_Map/Properties/AssemblyInfo.cs | 8 +- 11 files changed, 292 insertions(+), 15 deletions(-) create mode 100644 DS_Map/PokemonEditor.Designer.cs create mode 100644 DS_Map/PokemonEditor.cs create mode 100644 DS_Map/PokemonEditor.resx diff --git a/DS_Map/DSPRE.csproj b/DS_Map/DSPRE.csproj index 0ad65fd..edd7cf7 100644 --- a/DS_Map/DSPRE.csproj +++ b/DS_Map/DSPRE.csproj @@ -141,6 +141,12 @@ PersonalDataEditor.cs + + Form + + + PokemonEditor.cs + True True @@ -305,6 +311,9 @@ PersonalDataEditor.cs + + PokemonEditor.cs + ResXFileCodeGenerator BDHCAMPatchDB.Designer.cs diff --git a/DS_Map/EvolutionsEditor.cs b/DS_Map/EvolutionsEditor.cs index 57c6bee..00480e5 100644 --- a/DS_Map/EvolutionsEditor.cs +++ b/DS_Map/EvolutionsEditor.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Windows.Forms; +using static System.Windows.Forms.VisualStyles.VisualStyleElement.TextBox; namespace DSPRE { public partial class EvolutionsEditor : Form { @@ -19,7 +20,7 @@ namespace DSPRE { private static readonly string formName = "Evolutions Editor"; private (ComboBox m, Label l, NumericUpDown p, ComboBox t)[] evoRows; - public EvolutionsEditor() { + public EvolutionsEditor(Control parent = null) { this.pokeNames = RomInfo.GetPokemonNames(); this.moveNames = RomInfo.GetAttackNames(); this.itemNames = RomInfo.GetItemNames(); @@ -30,7 +31,9 @@ namespace DSPRE { this.fileNames = fileNames.ToArray(); InitializeComponent(); - + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.Size = parent.Size; + this.Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top | AnchorStyles.Bottom; disableHandlers = true; evoRows = new (ComboBox m, Label l, NumericUpDown p, ComboBox t)[EvolutionFile.numEvolutions] { diff --git a/DS_Map/LearnsetEditor.cs b/DS_Map/LearnsetEditor.cs index ae16a93..70984a7 100644 --- a/DS_Map/LearnsetEditor.cs +++ b/DS_Map/LearnsetEditor.cs @@ -6,6 +6,7 @@ using System.Linq; using System.Windows; using System.Windows.Forms; using static ScintillaNET.Style; +using static System.Windows.Forms.VisualStyles.VisualStyleElement.TextBox; using MessageBox = System.Windows.Forms.MessageBox; namespace DSPRE { @@ -33,11 +34,13 @@ namespace DSPRE { private static bool dirty = false; private static readonly string formName = "Learnset Editor"; - public LearnsetEditor(string[] moveNames) { + public LearnsetEditor(string[] moveNames, Control parent = null) { this.moveNames = moveNames; InitializeComponent(); - + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.Size = parent.Size; + this.Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top | AnchorStyles.Bottom; disableHandlers = true; BindingList listMoveNames = new BindingList(moveNames); diff --git a/DS_Map/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs index fd690bb..5b5093b 100644 --- a/DS_Map/Main Window.Designer.cs +++ b/DS_Map/Main Window.Designer.cs @@ -11153,7 +11153,7 @@ // this.personalDataEditorToolStripMenuItem.Name = "personalDataEditorToolStripMenuItem"; this.personalDataEditorToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.personalDataEditorToolStripMenuItem.Text = "Personal Data Editor"; + this.personalDataEditorToolStripMenuItem.Text = "Pokemon Editor"; this.personalDataEditorToolStripMenuItem.Click += new System.EventHandler(this.personalDataEditorToolStripMenuItem_Click); // // learnsetsEditorToolStripMenuItem @@ -11161,6 +11161,7 @@ this.learnsetsEditorToolStripMenuItem.Name = "learnsetsEditorToolStripMenuItem"; this.learnsetsEditorToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.learnsetsEditorToolStripMenuItem.Text = "Learnsets Editor"; + this.learnsetsEditorToolStripMenuItem.Visible = false; this.learnsetsEditorToolStripMenuItem.Click += new System.EventHandler(this.learnsetsEditorToolStripMenuItem_Click); // // evolutionsEditorToolStripMenuItem @@ -11168,6 +11169,7 @@ this.evolutionsEditorToolStripMenuItem.Name = "evolutionsEditorToolStripMenuItem"; this.evolutionsEditorToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.evolutionsEditorToolStripMenuItem.Text = "Evolutions Editor"; + this.evolutionsEditorToolStripMenuItem.Visible = false; this.evolutionsEditorToolStripMenuItem.Click += new System.EventHandler(this.evolutionsEditorToolStripMenuItem_Click); // // menuViewToolStripMenuItem diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index dd0f869..13f0950 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -10698,14 +10698,15 @@ namespace DSPRE { private void personalDataEditorToolStripMenuItem_Click(object sender, EventArgs e) { string[] itemNames = RomInfo.GetItemNames(); string[] abilityNames = RomInfo.GetAbilityNames(); + string[] moveNames = RomInfo.GetAttackNames(); - statusLabelMessage("Setting up Personal Data Editor..."); + statusLabelMessage("Setting up Pokemon Data Editor..."); Update(); - DSUtils.TryUnpackNarcs(new List { DirNames.personalPokeData, DirNames.monIcons }); + DSUtils.TryUnpackNarcs(new List { DirNames.personalPokeData, DirNames.learnsets, DirNames.evolutions, DirNames.monIcons }); RomInfo.SetMonIconsPalTableAddress(); - PersonalDataEditor pde = new PersonalDataEditor(itemNames, abilityNames); + PokemonEditor pde = new PokemonEditor(itemNames, abilityNames, moveNames); pde.ShowDialog(); statusLabelMessage(); diff --git a/DS_Map/Main Window.resx b/DS_Map/Main Window.resx index 4cb7035..0c5441b 100644 --- a/DS_Map/Main Window.resx +++ b/DS_Map/Main Window.resx @@ -956,7 +956,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM - EgAAAk1TRnQBSQFMAgEBCgEAAZgBGwGYARsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + EgAAAk1TRnQBSQFMAgEBCgEAAaABGwGgARsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/DS_Map/PersonalDataEditor.cs b/DS_Map/PersonalDataEditor.cs index 7a6d3e3..e8f8b17 100644 --- a/DS_Map/PersonalDataEditor.cs +++ b/DS_Map/PersonalDataEditor.cs @@ -6,6 +6,7 @@ using System.ComponentModel; using System.Linq; using System.Windows.Controls; using System.Windows.Forms; +using static System.Windows.Forms.VisualStyles.VisualStyleElement.TextBox; namespace DSPRE { public partial class PersonalDataEditor : Form { @@ -20,11 +21,13 @@ namespace DSPRE { private static bool dirty = false; private static readonly string formName = "Personal Data Editor"; - public PersonalDataEditor(string[] itemNames, string[] abilityNames) { + public PersonalDataEditor(string[] itemNames, string[] abilityNames, System.Windows.Forms.Control parent = null) { this.fileNames = RomInfo.GetPokemonNames().ToArray();; InitializeComponent(); - + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.Size = parent.Size; + this.Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top | AnchorStyles.Bottom; disableHandlers = true; BindingList listItemNames = new BindingList(itemNames); diff --git a/DS_Map/PokemonEditor.Designer.cs b/DS_Map/PokemonEditor.Designer.cs new file mode 100644 index 0000000..7982eeb --- /dev/null +++ b/DS_Map/PokemonEditor.Designer.cs @@ -0,0 +1,95 @@ +namespace DSPRE { + partial class PokemonEditor { + /// + /// 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.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.tabControl.SuspendLayout(); + this.SuspendLayout(); + // + // tabControl + // + this.tabControl.Controls.Add(this.personalPage); + this.tabControl.Controls.Add(this.learnsetPage); + this.tabControl.Controls.Add(this.evoPage); + this.tabControl.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControl.Location = new System.Drawing.Point(0, 0); + this.tabControl.Name = "tabControl"; + this.tabControl.SelectedIndex = 0; + this.tabControl.Size = new System.Drawing.Size(800, 450); + this.tabControl.TabIndex = 0; + // + // personalPage + // + 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(792, 424); + this.personalPage.TabIndex = 0; + this.personalPage.Text = "Personal Editor"; + this.personalPage.UseVisualStyleBackColor = true; + // + // learnsetPage + // + 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(792, 424); + this.learnsetPage.TabIndex = 1; + this.learnsetPage.Text = "Learnset Editor"; + this.learnsetPage.UseVisualStyleBackColor = true; + // + // evoPage + // + 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(792, 424); + this.evoPage.TabIndex = 2; + this.evoPage.Text = "Evolution Editor"; + this.evoPage.UseVisualStyleBackColor = true; + // + // PokemonEditor + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(800, 450); + this.Controls.Add(this.tabControl); + this.Name = "PokemonEditor"; + this.Text = "PokemonEditor"; + this.tabControl.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.TabControl tabControl; + private System.Windows.Forms.TabPage personalPage; + private System.Windows.Forms.TabPage learnsetPage; + private System.Windows.Forms.TabPage evoPage; + } +} \ No newline at end of file diff --git a/DS_Map/PokemonEditor.cs b/DS_Map/PokemonEditor.cs new file mode 100644 index 0000000..b0276c0 --- /dev/null +++ b/DS_Map/PokemonEditor.cs @@ -0,0 +1,41 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Controls.Primitives; +using System.Windows.Forms; +using static DSPRE.RomInfo; + +namespace DSPRE { + public partial class PokemonEditor : Form { + public PokemonEditor(string[] itemNames, string[] abilityNames, string[] moveNames) { + InitializeComponent(); + foreach (var cb in Controls.OfType()) { + cb.Resize += (sender, e) => { + if (!cb.Focused) + cb.SelectionLength = 0; + }; + } + IsMdiContainer = true; + + PersonalDataEditor personalEditor = new PersonalDataEditor(itemNames, abilityNames, evoPage); + personalEditor.TopLevel = false; + personalEditor.Show(); + personalPage.Controls.Add(personalEditor); + + LearnsetEditor learnsetEditor = new LearnsetEditor(moveNames, evoPage); + learnsetEditor.TopLevel = false; + learnsetEditor.Show(); + learnsetPage.Controls.Add(learnsetEditor); + + EvolutionsEditor evoEditor = new EvolutionsEditor(evoPage); + evoEditor.TopLevel = false; + evoEditor.Show(); + evoPage.Controls.Add(evoEditor); + } + } +} diff --git a/DS_Map/PokemonEditor.resx b/DS_Map/PokemonEditor.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/DS_Map/PokemonEditor.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/Properties/AssemblyInfo.cs b/DS_Map/Properties/AssemblyInfo.cs index ade54bb..5def708 100644 --- a/DS_Map/Properties/AssemblyInfo.cs +++ b/DS_Map/Properties/AssemblyInfo.cs @@ -4,11 +4,11 @@ using System.Runtime.InteropServices; // Le informazioni generali relative a un assembly sono controllate dal seguente // set di attributi. Modificare i valori di questi attributi per modificare le informazioni // associate a un assembly. -[assembly: AssemblyTitle("DSPRE Reloaded 1.11.1")] +[assembly: AssemblyTitle("DSPRE Reloaded 1.11.2")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("DSPRE Reloaded 1.11.1")] +[assembly: AssemblyProduct("DSPRE Reloaded 1.11.2")] [assembly: AssemblyCopyright("Copyright © 2023")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // È possibile specificare tutti i valori oppure impostare valori predefiniti per i numeri relativi alla revisione e alla build // usando l'asterisco '*' come illustrato di seguito: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.11.1")] -[assembly: AssemblyFileVersion("1.11.1")] +[assembly: AssemblyVersion("1.11.2")] +[assembly: AssemblyFileVersion("1.11.2")] From 7cf53fadb5b38087d7e807956920d92001b84506 Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Sun, 3 Mar 2024 14:07:40 +0100 Subject: [PATCH 03/40] Started merging changes Co-authored-by: Cuddlyogre --- DS_Map/BuildingEditor.cs | 2 +- DS_Map/DSPRE.csproj | 2 + DS_Map/DSUtils.cs | 2 +- DS_Map/Filesystem.cs | 245 ++++++ DS_Map/GameCamera.cs | 2 +- DS_Map/Helpers.cs | 397 ++++++++++ DS_Map/Main Window.Designer.cs | 234 +++--- DS_Map/Main Window.cs | 236 +++--- DS_Map/Main Window.resx | 185 ++--- DS_Map/PokemonEditor.cs | 6 - DS_Map/ROMFiles/AreaData.cs | 4 +- DS_Map/ROMFiles/MapFile.cs | 10 +- DS_Map/ROMFiles/MapHeader.cs | 12 +- DS_Map/ROMFiles/ScriptCommand.cs | 24 +- DS_Map/ROMFiles/ScriptFile.cs | 12 +- DS_Map/ROMFiles/TrainerFile.cs | 4 +- DS_Map/ROMToolboxDialog.cs | 26 +- DS_Map/Resources/PokeDatabase.cs | 64 +- DS_Map/Resources/ROMToolboxDB/ToolboxDB.cs | 84 +-- DS_Map/RomInfo.cs | 817 ++++++++------------- DS_Map/SpawnEditor.cs | 6 +- DS_Map/WildEditorDPPt.cs | 2 +- 22 files changed, 1409 insertions(+), 967 deletions(-) create mode 100644 DS_Map/Filesystem.cs create mode 100644 DS_Map/Helpers.cs diff --git a/DS_Map/BuildingEditor.cs b/DS_Map/BuildingEditor.cs index 3988b65..fcdfef9 100644 --- a/DS_Map/BuildingEditor.cs +++ b/DS_Map/BuildingEditor.cs @@ -45,7 +45,7 @@ namespace DSPRE { buildingOpenGLControl.MouseWheel += new MouseEventHandler(buildingOpenGLControl_MouseWheel); Gl.glEnable(Gl.GL_TEXTURE_2D); - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { interiorCheckBox.Enabled = true; } diff --git a/DS_Map/DSPRE.csproj b/DS_Map/DSPRE.csproj index edd7cf7..4c82d6f 100644 --- a/DS_Map/DSPRE.csproj +++ b/DS_Map/DSPRE.csproj @@ -125,7 +125,9 @@ EvolutionsEditor.cs + + Component diff --git a/DS_Map/DSUtils.cs b/DS_Map/DSUtils.cs index 6bf2848..3313457 100644 --- a/DS_Map/DSUtils.cs +++ b/DS_Map/DSUtils.cs @@ -70,7 +70,7 @@ namespace DSPRE { return new FileInfo(RomInfo.arm9Path).Length <= 0xBC000; } public static bool CheckCompressionMark() { - return BitConverter.ToInt32(DSUtils.ARM9.ReadBytes((uint)(RomInfo.gameFamily == gFamEnum.DP ? 0xB7C : 0xBB4), 4), 0) != 0; + return BitConverter.ToInt32(DSUtils.ARM9.ReadBytes((uint)(RomInfo.gameFamily == GameFamilies.DP ? 0xB7C : 0xBB4), 4), 0) != 0; } public static byte[] ReadBytes(uint startOffset, long numberOfBytes = 0) { return ReadFromFile(RomInfo.arm9Path, startOffset, numberOfBytes); diff --git a/DS_Map/Filesystem.cs b/DS_Map/Filesystem.cs new file mode 100644 index 0000000..3d503ab --- /dev/null +++ b/DS_Map/Filesystem.cs @@ -0,0 +1,245 @@ +using System.IO; + +namespace DSPRE { + public static class Filesystem { + public static string eventFiles { get { return RomInfo.gameDirs[RomInfo.DirNames.eventFiles].unpackedDir; } } + public static string OWSprites { get { return RomInfo.gameDirs[RomInfo.DirNames.OWSprites].unpackedDir; } } + public static string mapTextures { get { return RomInfo.gameDirs[RomInfo.DirNames.mapTextures].unpackedDir; } } + public static string buildingTextures { get { return RomInfo.gameDirs[RomInfo.DirNames.buildingTextures].unpackedDir; } } + public static string dynamicHeaders { get { return RomInfo.gameDirs[RomInfo.DirNames.dynamicHeaders].unpackedDir; } } + public static string dynamicHeadersPacked { get { return RomInfo.gameDirs[RomInfo.DirNames.dynamicHeaders].packedDir; } } + public static string scripts { get { return RomInfo.gameDirs[RomInfo.DirNames.scripts].unpackedDir; } } + public static string maps { get { return RomInfo.gameDirs[RomInfo.DirNames.maps].unpackedDir; } } + public static string matrices { get { return RomInfo.gameDirs[RomInfo.DirNames.matrices].unpackedDir; } } + public static string buildingConfigFiles { get { return RomInfo.gameDirs[RomInfo.DirNames.buildingConfigFiles].unpackedDir; } } + public static string areaData { get { return RomInfo.gameDirs[RomInfo.DirNames.areaData].unpackedDir; } } + public static string textArchives { get { return RomInfo.gameDirs[RomInfo.DirNames.textArchives].unpackedDir; } } + public static string trainerProperties { get { return RomInfo.gameDirs[RomInfo.DirNames.trainerProperties].unpackedDir; } } + public static string trainerParty { get { return RomInfo.gameDirs[RomInfo.DirNames.trainerParty].unpackedDir; } } + public static string trainerGraphics { get { return RomInfo.gameDirs[RomInfo.DirNames.trainerGraphics].unpackedDir; } } + public static string encounters { get { return RomInfo.gameDirs[RomInfo.DirNames.encounters].unpackedDir; } } + public static string headbutt { get { return RomInfo.gameDirs[RomInfo.DirNames.headbutt].unpackedDir; } } + public static string safariZone { get { return RomInfo.gameDirs[RomInfo.DirNames.safariZone].unpackedDir; } } + public static string monIcons { get { return RomInfo.gameDirs[RomInfo.DirNames.monIcons].unpackedDir; } } + public static string synthOverlay { get { return RomInfo.gameDirs[RomInfo.DirNames.synthOverlay].unpackedDir; } } + public static string interiorBuildingModels { get { return RomInfo.gameDirs[RomInfo.DirNames.interiorBuildingModels].unpackedDir; } } + public static string exteriorBuildingModels { get { return RomInfo.gameDirs[RomInfo.DirNames.exteriorBuildingModels].unpackedDir; } } + + public static string GetBuildingModelsDirPath(bool interior) { + if (interior) { + return interiorBuildingModels; + } else { + return exteriorBuildingModels; + } + } + + public static string expArmPath { get { return Path.Combine(synthOverlay, ROMToolboxDialog.expandedARMfileID.ToString("D4")); } } + + public static string GetPath(string path, int id, string format = "D4") { + return Path.Combine(path, id.ToString(format)); + } + + public static string GetPath(string path, string prefix, int id, string ext, string format = "D4") { + return Path.Combine(path, prefix + id.ToString(format) + "." + ext); + } + + static string[] GetBuildingModelFiles(bool interior) { + return Directory.GetFiles(Filesystem.GetBuildingModelsDirPath(interior)); + } + + public static string GetBuildingModelPath(bool interior, int id) { + return GetPath(Filesystem.GetBuildingModelsDirPath(interior), id); + } + + public static int GetBuildingCount(bool interior) { + return GetBuildingModelFiles(interior).Length; + } + + public static string[] GetAreaDataFiles() { + return Directory.GetFiles(Filesystem.areaData); + } + + public static string GetAreaDataPath(int id) { + return GetPath(Filesystem.areaData, id); + } + + public static int GetAreaDataCount() { + return GetAreaDataFiles().Length; + } + + public static string GetTexturePath(bool useMapTiles, int textureID) { + string path = Filesystem.GetMapTexturePath(textureID); + string path2 = Filesystem.GetBuildingTexturePath(textureID); + string tilesetPath = useMapTiles ? path : path2; + return tilesetPath; + } + + static string[] GetMapTextureFiles() { + return Directory.GetFiles(Filesystem.mapTextures); + } + + public static string GetMapTexturePath(int id) { + return GetPath(Filesystem.mapTextures, id); + } + + public static int GetMapTexturesCount() { + return GetMapTextureFiles().Length; + } + + static string[] GetBuildingTextureFiles() { + return Directory.GetFiles(Filesystem.buildingTextures); + } + + public static string GetBuildingTexturePath(int id) { + return GetPath(Filesystem.buildingTextures, id); + } + + public static int GetBuildingTexturesCount() { + return GetBuildingTextureFiles().Length; + } + + static string[] GetMatrixFiles() { + return Directory.GetFiles(Filesystem.matrices); + } + + public static string GetMatrixPath(int id) { + return GetPath(Filesystem.matrices, id); + } + + public static int GetMatrixCount() { + return GetMatrixFiles().Length; + } + + static string[] GetTextArchiveFiles() { + return Directory.GetFiles(Filesystem.textArchives); + } + + public static string GetTextArchivePath(int id) { + return GetPath(Filesystem.textArchives, id); + } + + public static int GetTextArchivesCount() { + return GetTextArchiveFiles().Length; + } + + static string[] GetMapFiles() { + return Directory.GetFiles(Filesystem.maps); + } + + public static string GetMapPath(int id) { + return GetPath(Filesystem.maps, id); + } + + public static int GetMapCount() { + return GetMapFiles().Length; + } + + static string[] GetScriptFiles() { + return Directory.GetFiles(Filesystem.scripts); + } + + public static string GetScriptPath(int id) { + return GetPath(Filesystem.scripts, id); + } + + public static int GetScriptCount() { + return GetScriptFiles().Length; + } + + static string[] GetEventFiles() { + return Directory.GetFiles(Filesystem.eventFiles); + } + + public static string GetEventPath(int id) { + return GetPath(Filesystem.eventFiles, id); + } + + public static int GetEventFileCount() { + return GetEventFiles().Length; + } + + static string[] GetTrainerPropertiesFiles() { + return Directory.GetFiles(Filesystem.trainerProperties); + } + + public static string GetTrainerPropertiesPath(int id) { + return GetPath(Filesystem.trainerProperties, id); + } + + public static int GetTrainerPropertiesCount() { + return GetTrainerPropertiesFiles().Length; + } + + static string[] GetDynamicHeaderFiles() { + return Directory.GetFiles(Filesystem.dynamicHeaders); + } + + public static string GetDynamicHeaderPath(int id) { + return GetPath(Filesystem.dynamicHeaders, id); + } + + public static int GetDynamicHeadersCount() { + return GetDynamicHeaderFiles().Length; + } + + static string[] GetEncounterFiles() { + return Directory.GetFiles(Filesystem.encounters); + } + + public static string GetEncounterPath(int id) { + return GetPath(Filesystem.encounters, id); + } + + public static int GetEncountersCount() { + return GetEncounterFiles().Length; + } + + static string[] GetSafariZoneFiles() { + return Directory.GetFiles(Filesystem.safariZone); + } + + public static string GetSafariZonePath(int id) { + return GetPath(Filesystem.safariZone, id); + } + + public static int GetSafariZoneCount() { + return GetSafariZoneFiles().Length; + } + + static string[] GetHeadbuttFiles() { + return Directory.GetFiles(Filesystem.headbutt); + } + + public static string GetHeadbuttPath(int id) { + return GetPath(Filesystem.headbutt, id); + } + + public static int GetHeadbuttCount() { + return GetHeadbuttFiles().Length; + } + + public static string GetOWSpritePath(int id) { + return GetPath(Filesystem.OWSprites, id); + } + + public static string GetBuildingConfigPath(int id) { + return GetPath(Filesystem.buildingConfigFiles, id); + } + + public static string GetTrainerPartyPath(int id) { + return GetPath(Filesystem.trainerParty, id); + } + + public static string GetTrainerGraphicsPath(int id) { + return GetPath(Filesystem.trainerGraphics, id); + } + + public static string GetMonIconPath(int id, string format = "D4") { + return GetPath(Filesystem.monIcons, id, format); + } + + public static string GetSynthOerlayPath(int id) { + return GetPath(Filesystem.synthOverlay, id); + } + } +} diff --git a/DS_Map/GameCamera.cs b/DS_Map/GameCamera.cs index 8aefe8e..f006233 100644 --- a/DS_Map/GameCamera.cs +++ b/DS_Map/GameCamera.cs @@ -146,7 +146,7 @@ public class GameCamera { nearClip = b.ReadUInt32(); farClip = b.ReadUInt32(); - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { xOffset = b.ReadInt32(); yOffset = b.ReadInt32(); zOffset = b.ReadInt32(); diff --git a/DS_Map/Helpers.cs b/DS_Map/Helpers.cs new file mode 100644 index 0000000..81d1b9a --- /dev/null +++ b/DS_Map/Helpers.cs @@ -0,0 +1,397 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Drawing; +using System.IO; +using System.Text; +using System.Windows.Forms; +using Tao.OpenGl; +using LibNDSFormats.NSBMD; +using LibNDSFormats.NSBTX; +using DSPRE.ROMFiles; +using Images; +using Ekona.Images; +using ScintillaNET; +using ScintillaNET.Utils; +using Tao.Platform.Windows; +using NSMBe4.DSFileSystem; + +namespace DSPRE { + public static class Helpers { + static MainProgram MainProgram; + + public static RomInfo romInfo; + public static bool hideBuildings = new bool(); + + public static NSBMDGlRenderer mapRenderer; + + public static ToolStripProgressBar toolStripProgressBar { get { return MainProgram.toolStripProgressBar; } } + + public static void Initialize(MainProgram mainProgram) { + MainProgram = mainProgram; + mapRenderer = new NSBMDGlRenderer(); + } + + static bool disableHandlersOld; + static bool disableHandlers; + + public static bool HandlersDisabled { get { return disableHandlers == true; } } + public static bool HandlersEnabled { get { return disableHandlers == false; } } + + public static void BackUpDisableHandler() { + disableHandlersOld = disableHandlers; + } + + public static void RestoreDisableHandler() { + disableHandlers = disableHandlersOld; + } + + public static void DisableHandlers() { + disableHandlers = true; + } + + public static void EnableHandlers() { + disableHandlers = false; + } + + public static void statusLabelMessage(string msg = "Ready") { + ToolStripStatusLabel statusLabel = MainProgram.statusLabel; + statusLabel.Text = msg; + statusLabel.Font = new Font(statusLabel.Font, FontStyle.Regular); + statusLabel.ForeColor = Color.Black; + statusLabel.Invalidate(); + } + + public static void statusLabelError(string errorMsg, bool severe = true) { + ToolStripStatusLabel statusLabel = MainProgram.statusLabel; + statusLabel.Text = errorMsg; + statusLabel.Font = new Font(statusLabel.Font, FontStyle.Bold); + statusLabel.ForeColor = severe ? Color.Red : Color.DarkOrange; + statusLabel.Invalidate(); + } + + //Locate File - buttons + public static void ExplorerSelect(string path) { + if (System.IO.File.Exists(path)) { + Process.Start("explorer.exe", "/select" + "," + "\"" + path + "\""); + } + } + + public static string[] GetTrainerNames() { + List trainerList = new List(); + + /* Store all trainer names and classes */ + TextArchive trainerClasses = new TextArchive(RomInfo.trainerClassMessageNumber); + TextArchive trainerNames = new TextArchive(RomInfo.trainerNamesMessageNumber); + + int trainerCount = Filesystem.GetTrainerPropertiesCount(); + for (int i = 0; i < trainerCount; i++) { + string path = Filesystem.GetTrainerPropertiesPath(i); + int classMessageID = BitConverter.ToUInt16(DSUtils.ReadFromFile(path, startOffset: 1, 2), 0); + string currentTrainerName; + + if (i < trainerNames.messages.Count) { + currentTrainerName = trainerNames.messages[i]; + } else { + currentTrainerName = TrainerFile.NAME_NOT_FOUND; + } + + trainerList.Add("[" + i.ToString("D2") + "] " + trainerClasses.messages[classMessageID] + " " + currentTrainerName); + } + + return trainerList.ToArray(); + } + + public static void MW_LoadModelTextures(NSBMD model, string textureFolder, int fileID) { + if (fileID < 0) { + return; + } + + string texturePath = Filesystem.GetPath(textureFolder, fileID); + model.materials = NSBTXLoader.LoadNsbtx(new MemoryStream(System.IO.File.ReadAllBytes(texturePath)), out model.Textures, out model.Palettes); + try { + model.MatchTextures(); + } catch { + } + } + + public static void MW_LoadModelTextures(MapFile mapFile, int fileID) { + MW_LoadModelTextures(mapFile.mapModel, Filesystem.mapTextures, fileID); + } + + public static void MW_LoadModelTextures(Building building, int fileID) { + MW_LoadModelTextures(building.NSBMDFile, Filesystem.buildingTextures, fileID); + } + + public static void SetupRenderer(float ang, float dist, float elev, float perspective, int width, int height) { + //TODO: improve this + Gl.glEnable(Gl.GL_RESCALE_NORMAL); + Gl.glEnable(Gl.GL_COLOR_MATERIAL); + Gl.glEnable(Gl.GL_DEPTH_TEST); + Gl.glEnable(Gl.GL_NORMALIZE); + Gl.glDisable(Gl.GL_CULL_FACE); + Gl.glFrontFace(Gl.GL_CCW); + Gl.glClearDepth(1); + Gl.glEnable(Gl.GL_ALPHA_TEST); + Gl.glBlendFunc(Gl.GL_SRC_ALPHA, Gl.GL_ONE_MINUS_SRC_ALPHA); + Gl.glEnable(Gl.GL_BLEND); + Gl.glAlphaFunc(Gl.GL_GREATER, 0f); + Gl.glClearColor(51f / 255f, 51f / 255f, 51f / 255f, 1f); + Gl.glViewport(0, 0, width, height); + float aspect = width / height; //(vp[2] - vp[0]) / (vp[3] - vp[1]); + Gl.glMatrixMode(Gl.GL_PROJECTION); + Gl.glLoadIdentity(); + Glu.gluPerspective(perspective, aspect, 0.2f, 500.0f); //0.02f, 32.0f); + Gl.glTranslatef(0, 0, -dist); + Gl.glRotatef(elev, 1, 0, 0); + Gl.glRotatef(ang, 0, 1, 0); + Gl.glMatrixMode(Gl.GL_MODELVIEW); + Gl.glLoadIdentity(); + Gl.glTranslatef(0, 0, -dist); + Gl.glRotatef(elev, 1, 0, 0); + Gl.glRotatef(-ang, 0, 1, 0); + Gl.glLightfv(Gl.GL_LIGHT0, Gl.GL_POSITION, new float[] { 1, 1, 1, 0 }); + Gl.glLightfv(Gl.GL_LIGHT1, Gl.GL_POSITION, new float[] { 1, 1, 1, 0 }); + Gl.glLightfv(Gl.GL_LIGHT2, Gl.GL_POSITION, new float[] { 1, 1, 1, 0 }); + Gl.glLightfv(Gl.GL_LIGHT3, Gl.GL_POSITION, new float[] { 1, 1, 1, 0 }); + Gl.glLoadIdentity(); + Gl.glBindTexture(Gl.GL_TEXTURE_2D, 0); + Gl.glColor3f(1.0f, 1.0f, 1.0f); + Gl.glDepthMask(Gl.GL_TRUE); + Gl.glClear(Gl.GL_COLOR_BUFFER_BIT | Gl.GL_DEPTH_BUFFER_BIT); + } + + public static void RenderMap(ref MapFile mapFile, int width, int height, float ang, float dist, float elev, float perspective, bool mapTexturesON = true, bool buildingTexturesON = true) { + #region Useless variables that the rendering API still needs + + MKDS_Course_Editor.NSBTA.NSBTA.NSBTA_File ani = new MKDS_Course_Editor.NSBTA.NSBTA.NSBTA_File(); + MKDS_Course_Editor.NSBTP.NSBTP.NSBTP_File tp = new MKDS_Course_Editor.NSBTP.NSBTP.NSBTP_File(); + MKDS_Course_Editor.NSBCA.NSBCA.NSBCA_File ca = new MKDS_Course_Editor.NSBCA.NSBCA.NSBCA_File(); + int[] aniframeS = new int[0]; + + #endregion + + /* Adjust rendering settings */ + SetupRenderer(ang, dist, elev, perspective, width, height); + + /* Render the map model */ + NSBMD model = mapFile.mapModel; + mapRenderer.Model = model.models[0]; + + // int scale = 64; + float scale = 0.015625f; + Gl.glScalef(mapRenderer.Model.modelScale * scale, mapRenderer.Model.modelScale * scale, mapRenderer.Model.modelScale * scale); + + /* Determine if map textures must be rendered */ + if (mapTexturesON) { + Gl.glEnable(Gl.GL_TEXTURE_2D); + } else { + Gl.glDisable(Gl.GL_TEXTURE_2D); + } + + // Render map model + mapRenderer.RenderModel("", ani, aniframeS, aniframeS, aniframeS, aniframeS, aniframeS, ca, false, -1, 0.0f, 0.0f, dist, elev, ang, true, tp, model); + + if (hideBuildings) { + return; + } + + if (buildingTexturesON) { + Gl.glEnable(Gl.GL_TEXTURE_2D); + } else { + Gl.glDisable(Gl.GL_TEXTURE_2D); + } + + for (int i = 0; i < mapFile.buildings.Count; i++) { + Building building = mapFile.buildings[i]; + model = building.NSBMDFile; + if (model is null) { + Console.WriteLine("Null building can't be rendered"); + } else { + mapRenderer.Model = model.models[0]; + ScaleTranslateRotateBuilding(building); + mapRenderer.RenderModel("", ani, aniframeS, aniframeS, aniframeS, aniframeS, aniframeS, ca, false, -1, 0.0f, 0.0f, dist, elev, ang, true, tp, model); + } + } + } + + public static Bitmap GrabMapScreenshot(int width, int height) { + Bitmap bmp = new Bitmap(width, height); + System.Drawing.Imaging.BitmapData data = bmp.LockBits(new Rectangle(0, 0, width, height), System.Drawing.Imaging.ImageLockMode.WriteOnly, System.Drawing.Imaging.PixelFormat.Format24bppRgb); + Gl.glReadPixels(0, 0, width, height, Gl.GL_BGR, Gl.GL_UNSIGNED_BYTE, data.Scan0); + bmp.UnlockBits(data); + bmp.RotateFlip(RotateFlipType.RotateNoneFlipY); + return bmp; + } + + private static void ScaleTranslateRotateBuilding(Building building) { + float fullXcoord = building.xPosition + building.xFraction / 65536f; + float fullYcoord = building.yPosition + building.yFraction / 65536f; + float fullZcoord = building.zPosition + building.zFraction / 65536f; + + float scaleFactor = building.NSBMDFile.models[0].modelScale / 1024; + float translateFactor = 256 / building.NSBMDFile.models[0].modelScale; + + Gl.glScalef(scaleFactor * building.width, scaleFactor * building.height, scaleFactor * building.length); + Gl.glTranslatef(fullXcoord * translateFactor / building.width, fullYcoord * translateFactor / building.height, fullZcoord * translateFactor / building.length); + Gl.glRotatef(Building.U16ToDeg(building.xRotation), 1, 0, 0); + Gl.glRotatef(Building.U16ToDeg(building.yRotation), 0, 1, 0); + Gl.glRotatef(Building.U16ToDeg(building.zRotation), 0, 0, 1); + } + + public static Image GetPokePic(int species, int w, int h, PaletteBase paletteBase, ImageBase imageBase, SpriteBase spriteBase) { + bool fiveDigits = false; // some extreme future proofing + try { + string path = Filesystem.GetMonIconPath(0); + paletteBase = new NCLR(path, 0, Path.GetFileName(path)); + } catch (FileNotFoundException) { + string path = Filesystem.GetMonIconPath(0, "D5"); + paletteBase = new NCLR(path, 0, Path.GetFileName(path)); + fiveDigits = true; + } + + // read arm9 table to grab pal ID + int paletteId = 0; + byte[] iconPalTableBuf; + + switch (RomInfo.gameFamily) { + case RomInfo.GameFamilies.DP: + iconPalTableBuf = DSUtils.ARM9.ReadBytes(0x6B838, 4); + break; + case RomInfo.GameFamilies.Plat: + iconPalTableBuf = DSUtils.ARM9.ReadBytes(0x79F80, 4); + break; + case RomInfo.GameFamilies.HGSS: + default: + iconPalTableBuf = DSUtils.ARM9.ReadBytes(0x74408, 4); + break; + } + + int iconPalTableAddress = (iconPalTableBuf[3] & 0xFF) << 24 | (iconPalTableBuf[2] & 0xFF) << 16 | (iconPalTableBuf[1] & 0xFF) << 8 | (iconPalTableBuf[0] & 0xFF) /* << 0 */; + string iconTablePath; + + int iconPalTableOffsetFromFileStart; + if (iconPalTableAddress >= RomInfo.synthOverlayLoadAddress) { + // if the pointer shows the table was moved to the synthetic overlay + iconPalTableOffsetFromFileStart = iconPalTableAddress - (int)RomInfo.synthOverlayLoadAddress; + iconTablePath = Filesystem.expArmPath; + } else { + iconPalTableOffsetFromFileStart = iconPalTableAddress - 0x02000000; + iconTablePath = RomInfo.arm9Path; + } + + using (DSUtils.EasyReader idReader = new DSUtils.EasyReader(iconTablePath, iconPalTableOffsetFromFileStart + species)) { + paletteId = idReader.ReadByte(); + } + + if (paletteId != 0) { + paletteBase.Palette[0] = paletteBase.Palette[paletteId]; // update pal 0 to be the new pal + } + + // grab tiles + int spriteFileID = species + 7; + if (fiveDigits) { + string path = Filesystem.GetMonIconPath(spriteFileID, "D5"); + imageBase = new NCGR(path, spriteFileID, Path.GetFileName(path)); + } else { + string path = Filesystem.GetMonIconPath(spriteFileID); + imageBase = new NCGR(path, spriteFileID, Path.GetFileName(path)); + } + + // grab sprite + const int ncerFileId = 2; + if (fiveDigits) { + string path = Filesystem.GetMonIconPath(ncerFileId, "D5"); + spriteBase = new NCER(path, ncerFileId, Path.GetFileName(path)); + } else { + string path = Filesystem.GetMonIconPath(ncerFileId); + spriteBase = new NCER(path, ncerFileId, Path.GetFileName(path)); + } + + // copy this from the trainer + int bank0OAMcount = spriteBase.Banks[0].oams.Length; + int[] OAMenabled = new int[bank0OAMcount]; + for (int i = 0; i < OAMenabled.Length; i++) { + OAMenabled[i] = i; + } + + // finally compose image + try { + return spriteBase.Get_Image(imageBase, paletteBase, 0, w, h, false, false, false, true, true, -1, OAMenabled); + } catch (FormatException) { + return Properties.Resources.IconPokeball; + } + // default: + //partyPokemonPictureBoxList[partyPos].Image = cb.SelectedIndex > 0 ? (Image)Properties.PokePics.ResourceManager.GetObject(FixPokenameString(PokeDatabase.System.pokeNames[(ushort)cb.SelectedIndex])) : global::DSPRE.Properties.Resources.IconPokeball; + } + + public static void GenerateKeystrokes(string keys, Scintilla textArea) { + //Example + //GenerateKeystrokes("+{TAB}"); + HotKeyManager.Enable = false; + textArea.Focus(); + SendKeys.Send(keys); + HotKeyManager.Enable = true; + } + + public static void PictureBoxDisable(object sender, PaintEventArgs e) { + if (sender is PictureBox pict && pict.Image != null && (!pict.Enabled)) { + using (Bitmap img = new Bitmap(pict.Image, pict.ClientSize)) { + ControlPaint.DrawImageDisabled(e.Graphics, img, 0, 0, pict.BackColor); + } + } + } + + public static List getHeaderListBoxNames() { + List headerListBoxNames = new List(); + + using (DSUtils.EasyReader reader = new DSUtils.EasyReader(RomInfo.internalNamesPath)) { + int headerCount = RomInfo.GetHeaderCount(); + for (int i = 0; i < headerCount; i++) { + byte[] row = reader.ReadBytes(RomInfo.internalNameLength); + string internalName = Encoding.ASCII.GetString(row); //.TrimEnd(); + headerListBoxNames.Add(MapHeader.BuildName(i, internalName)); + } + } + + return headerListBoxNames; + } + + public static List getInternalNames() { + List internalNames = new List(); + + using (DSUtils.EasyReader reader = new DSUtils.EasyReader(RomInfo.internalNamesPath)) { + int headerCount = RomInfo.GetHeaderCount(); + for (int i = 0; i < headerCount; i++) { + byte[] row = reader.ReadBytes(RomInfo.internalNameLength); + string internalName = Encoding.ASCII.GetString(row); //.TrimEnd(); + internalNames.Add(internalName.TrimEnd('\0')); + } + } + + return internalNames; + } + + public static void OpenWildEditor(int encToOpen = 0) { + Helpers.statusLabelMessage("Attempting to extract Wild Encounters NARC..."); + + DSUtils.TryUnpackNarcs(new List() { RomInfo.DirNames.encounters, RomInfo.DirNames.monIcons }); + + Helpers.statusLabelMessage("Passing control to Wild Pokémon Editor..."); + + switch (RomInfo.gameFamily) { + case RomInfo.GameFamilies.DP: + case RomInfo.GameFamilies.Plat: + using (WildEditorDPPt editor = new WildEditorDPPt(encToOpen)) + editor.ShowDialog(); + break; + default: + using (WildEditorHGSS editor = new WildEditorHGSS(encToOpen)) + editor.ShowDialog(); + break; + } + + Helpers.statusLabelMessage(); + } + } +} \ No newline at end of file diff --git a/DS_Map/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs index 5b5093b..6f3019b 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 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(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = 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(); @@ -2826,40 +2826,40 @@ this.headersGridView.AllowUserToResizeColumns = false; this.headersGridView.AllowUserToResizeRows = false; this.headersGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - 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; + dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + dataGridViewCellStyle17.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.Info; + dataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.headersGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle17; this.headersGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - 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; + dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle18.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle18.Format = "D4"; + dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.headersGridView.DefaultCellStyle = dataGridViewCellStyle18; this.headersGridView.Location = new System.Drawing.Point(0, 0); this.headersGridView.MultiSelect = false; this.headersGridView.Name = "headersGridView"; - 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; + dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle19.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.headersGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle19; this.headersGridView.RowHeadersWidth = 50; this.headersGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - 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; + dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle20.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.headersGridView.RowsDefaultCellStyle = dataGridViewCellStyle20; this.headersGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.headersGridView.RowTemplate.Height = 18; this.headersGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; @@ -2888,43 +2888,43 @@ this.heightsGridView.AllowUserToDeleteRows = false; this.heightsGridView.AllowUserToResizeColumns = false; this.heightsGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle21; this.heightsGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - 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; + dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle22.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.heightsGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle22; this.heightsGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - 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; + dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle23.Font = new System.Drawing.Font("Tahoma", 8.25F); + dataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle23.Format = "D2"; + dataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle23; this.heightsGridView.Location = new System.Drawing.Point(0, 0); this.heightsGridView.MultiSelect = false; this.heightsGridView.Name = "heightsGridView"; - 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; + dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle24.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.heightsGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle24; this.heightsGridView.RowHeadersWidth = 50; this.heightsGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - 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; + dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle25.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.heightsGridView.RowsDefaultCellStyle = dataGridViewCellStyle25; this.heightsGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.heightsGridView.RowTemplate.Height = 18; this.heightsGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; @@ -2951,43 +2951,43 @@ this.mapFilesGridView.AllowUserToDeleteRows = false; this.mapFilesGridView.AllowUserToResizeColumns = false; this.mapFilesGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle26; this.mapFilesGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - 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; + dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle27.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.mapFilesGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle27; this.mapFilesGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - 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; + dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle28.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle28.Format = "D4"; + dataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle28; this.mapFilesGridView.Location = new System.Drawing.Point(0, 0); this.mapFilesGridView.MultiSelect = false; this.mapFilesGridView.Name = "mapFilesGridView"; - 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; + dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle29.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.mapFilesGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle29; this.mapFilesGridView.RowHeadersWidth = 50; this.mapFilesGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - 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; + dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle30.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.mapFilesGridView.RowsDefaultCellStyle = dataGridViewCellStyle30; this.mapFilesGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.mapFilesGridView.RowTemplate.Height = 18; this.mapFilesGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; @@ -8132,8 +8132,8 @@ this.textEditorDataGridView.Location = new System.Drawing.Point(12, 77); this.textEditorDataGridView.Name = "textEditorDataGridView"; this.textEditorDataGridView.RowHeadersWidth = 68; - dataGridViewCellStyle15.Font = new System.Drawing.Font("Consolas", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textEditorDataGridView.RowsDefaultCellStyle = dataGridViewCellStyle15; + dataGridViewCellStyle31.Font = new System.Drawing.Font("Consolas", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textEditorDataGridView.RowsDefaultCellStyle = dataGridViewCellStyle31; this.textEditorDataGridView.Size = new System.Drawing.Size(873, 500); this.textEditorDataGridView.TabIndex = 24; this.textEditorDataGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.textEditorDataGridView_CellValueChanged); @@ -8236,9 +8236,9 @@ this.cameraEditorDataGridView.CausesValidation = false; this.cameraEditorDataGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised; this.cameraEditorDataGridView.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - 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; + dataGridViewCellStyle32.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.cameraEditorDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle32; this.cameraEditorDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.cameraEditorDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.DistanceGVCol, @@ -11152,14 +11152,14 @@ // personalDataEditorToolStripMenuItem // this.personalDataEditorToolStripMenuItem.Name = "personalDataEditorToolStripMenuItem"; - this.personalDataEditorToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.personalDataEditorToolStripMenuItem.Size = new System.Drawing.Size(163, 22); this.personalDataEditorToolStripMenuItem.Text = "Pokemon Editor"; this.personalDataEditorToolStripMenuItem.Click += new System.EventHandler(this.personalDataEditorToolStripMenuItem_Click); // // learnsetsEditorToolStripMenuItem // this.learnsetsEditorToolStripMenuItem.Name = "learnsetsEditorToolStripMenuItem"; - this.learnsetsEditorToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.learnsetsEditorToolStripMenuItem.Size = new System.Drawing.Size(163, 22); this.learnsetsEditorToolStripMenuItem.Text = "Learnsets Editor"; this.learnsetsEditorToolStripMenuItem.Visible = false; this.learnsetsEditorToolStripMenuItem.Click += new System.EventHandler(this.learnsetsEditorToolStripMenuItem_Click); @@ -11167,7 +11167,7 @@ // evolutionsEditorToolStripMenuItem // this.evolutionsEditorToolStripMenuItem.Name = "evolutionsEditorToolStripMenuItem"; - this.evolutionsEditorToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.evolutionsEditorToolStripMenuItem.Size = new System.Drawing.Size(163, 22); this.evolutionsEditorToolStripMenuItem.Text = "Evolutions Editor"; this.evolutionsEditorToolStripMenuItem.Visible = false; this.evolutionsEditorToolStripMenuItem.Click += new System.EventHandler(this.evolutionsEditorToolStripMenuItem_Click); @@ -11226,16 +11226,16 @@ this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.statusLabel, this.toolStripProgressBar}); - this.statusStrip1.Location = new System.Drawing.Point(0, 739); + this.statusStrip1.Location = new System.Drawing.Point(0, 737); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(1214, 22); + this.statusStrip1.Size = new System.Drawing.Size(1214, 24); this.statusStrip1.TabIndex = 13; this.statusStrip1.Text = "statusStrip1"; // // statusLabel // this.statusLabel.Name = "statusLabel"; - this.statusLabel.Size = new System.Drawing.Size(39, 17); + this.statusLabel.Size = new System.Drawing.Size(39, 19); this.statusLabel.Text = "Ready"; // // toolStripProgressBar @@ -12001,7 +12001,6 @@ private System.Windows.Forms.RadioButton radio2D; private System.Windows.Forms.CheckBox wireframeCheckBox; private System.Windows.Forms.StatusStrip statusStrip1; - private System.Windows.Forms.ToolStripStatusLabel statusLabel; private System.Windows.Forms.PictureBox collisionPictureBox; private System.Windows.Forms.PictureBox typePictureBox; private System.Windows.Forms.Label typeLabel; @@ -12317,7 +12316,6 @@ private System.Windows.Forms.PictureBox rightClickPicture; private System.Windows.Forms.Label WheelClickLabel; private System.Windows.Forms.Label LeftClickLabel; - private System.Windows.Forms.ToolStripProgressBar toolStripProgressBar; private System.Windows.Forms.ToolStripButton unpackAllButton; private System.Windows.Forms.Button pasteHeaderButton; private System.Windows.Forms.Button copyHeaderButton; @@ -12793,6 +12791,8 @@ private System.Windows.Forms.Button setSpawnPointButton; private System.Windows.Forms.Button saveMatrixButton; private System.Windows.Forms.ToolStripMenuItem evolutionsEditorToolStripMenuItem; + public System.Windows.Forms.ToolStripStatusLabel statusLabel; + public System.Windows.Forms.ToolStripProgressBar toolStripProgressBar; } } diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index 13f0950..53bd776 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -506,13 +506,13 @@ namespace DSPRE { if (forceUnpack) { DSUtils.ForceUnpackNarcs(toUnpack); - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { DSUtils.ForceUnpackNarcs(new List { DirNames.interiorBuildingModels });// Last = interior buildings dir } } else { DSUtils.TryUnpackNarcs(toUnpack); - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { DSUtils.TryUnpackNarcs(new List { DirNames.interiorBuildingModels }); } } @@ -594,7 +594,11 @@ namespace DSPRE { gameIcon.Refresh(); // Paint game icon statusLabelMessage("Attempting to unpack NARCs from folder..."); Update(); - + for (int i = 0; i < 128; i++) { + if (DSUtils.OverlayIsCompressed(i)) { + DSUtils.DecompressOverlay(i); + } + } ReadROMInitData(); } @@ -605,7 +609,7 @@ namespace DSPRE { versionLabel.Text = RomInfo.gameVersion.ToString() + " " + "[" + RomInfo.romID + "]"; languageLabel.Text = "Lang: " + RomInfo.gameLanguage; - if (RomInfo.gameLanguage == gLangEnum.English) { + if (RomInfo.gameLanguage == GameLanguages.English) { if (europeByte == 0x0A) { languageLabel.Text += " [Europe]"; } else { @@ -654,7 +658,7 @@ namespace DSPRE { private void ReadROMInitData() { if (DSUtils.ARM9.CheckCompressionMark()) { - if (!RomInfo.gameFamily.Equals(gFamEnum.HGSS)) { + if (!RomInfo.gameFamily.Equals(GameFamilies.HGSS)) { MessageBox.Show("Unexpected compressed ARM9. It is advised that you double check the ARM9."); } if (!DSUtils.ARM9.Decompress(RomInfo.arm9Path)) { @@ -724,7 +728,7 @@ namespace DSPRE { MessageBoxButtons.YesNo, MessageBoxIcon.Question); if (d == DialogResult.Yes) { - DSUtils.ARM9.WriteBytes(new byte[4] { 0, 0, 0, 0 }, (uint)(RomInfo.gameFamily == gFamEnum.DP ? 0xB7C : 0xBB4)); + DSUtils.ARM9.WriteBytes(new byte[4] { 0, 0, 0, 0 }, (uint)(RomInfo.gameFamily == GameFamilies.DP ? 0xB7C : 0xBB4)); } } @@ -749,9 +753,15 @@ namespace DSPRE { Update(); + for (int i = 0; i < 128; i++) { + if (!DSUtils.OverlayIsCompressed(i)) { + DSUtils.CompressOverlay(i); + } + } + DSUtils.RepackROM(saveRom.FileName); - if (RomInfo.gameFamily != gFamEnum.DP && RomInfo.gameFamily != gFamEnum.Plat) { + if (RomInfo.gameFamily != GameFamilies.DP && RomInfo.gameFamily != GameFamilies.Plat) { if (eventEditorIsReady) { if (DSUtils.OverlayIsCompressed(1)) { DSUtils.DecompressOverlay(1); @@ -819,16 +829,16 @@ namespace DSPRE { } } private void diamondAndPearlToolStripMenuItem_Click(object sender, EventArgs e) { - OpenCommandsDatabase(RomInfo.BuildCommandNamesDatabase(gFamEnum.DP), RomInfo.BuildCommandParametersDatabase(gFamEnum.DP), - RomInfo.BuildActionNamesDatabase(gFamEnum.DP), RomInfo.BuildComparisonOperatorsDatabase(gFamEnum.DP)); + OpenCommandsDatabase(RomInfo.BuildCommandNamesDatabase(GameFamilies.DP), RomInfo.BuildCommandParametersDatabase(GameFamilies.DP), + RomInfo.BuildActionNamesDatabase(GameFamilies.DP), RomInfo.BuildComparisonOperatorsDatabase(GameFamilies.DP)); } private void platinumToolStripMenuItem_Click(object sender, EventArgs e) { - OpenCommandsDatabase(RomInfo.BuildCommandNamesDatabase(gFamEnum.Plat), RomInfo.BuildCommandParametersDatabase(gFamEnum.Plat), - RomInfo.BuildActionNamesDatabase(gFamEnum.Plat), RomInfo.BuildComparisonOperatorsDatabase(gFamEnum.Plat)); + OpenCommandsDatabase(RomInfo.BuildCommandNamesDatabase(GameFamilies.Plat), RomInfo.BuildCommandParametersDatabase(GameFamilies.Plat), + RomInfo.BuildActionNamesDatabase(GameFamilies.Plat), RomInfo.BuildComparisonOperatorsDatabase(GameFamilies.Plat)); } private void heartGoldAndSoulSilverToolStripMenuItem_Click(object sender, EventArgs e) { - OpenCommandsDatabase(RomInfo.BuildCommandNamesDatabase(gFamEnum.HGSS), RomInfo.BuildCommandParametersDatabase(gFamEnum.HGSS), - RomInfo.BuildActionNamesDatabase(gFamEnum.HGSS), RomInfo.BuildComparisonOperatorsDatabase(gFamEnum.HGSS)); + OpenCommandsDatabase(RomInfo.BuildCommandNamesDatabase(GameFamilies.HGSS), RomInfo.BuildCommandParametersDatabase(GameFamilies.HGSS), + RomInfo.BuildActionNamesDatabase(GameFamilies.HGSS), RomInfo.BuildComparisonOperatorsDatabase(GameFamilies.HGSS)); } private void mainTabControl_SelectedIndexChanged(object sender, EventArgs e) { if (mainTabControl.SelectedTab == headerEditorTabPage) { @@ -915,8 +925,8 @@ namespace DSPRE { string wildPokeUnpackedPath = gameDirs[DirNames.encounters].unpackedDir; switch (RomInfo.gameFamily) { - case gFamEnum.DP: - case gFamEnum.Plat: + case GameFamilies.DP: + case GameFamilies.Plat: using (WildEditorDPPt editor = new WildEditorDPPt(wildPokeUnpackedPath, RomInfo.GetPokemonNames(), encToOpen, internalNames.Count)) editor.ShowDialog(); break; @@ -996,7 +1006,7 @@ namespace DSPRE { ReloadHeaderEditorLocationsList(currentTextArchive.messages); switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: areaIconComboBox.Enabled = false; areaIconPictureBox.Image = (Image)Properties.Resources.ResourceManager.GetObject("dpareaicon"); areaSettingsLabel.Text = "Show nametag:"; @@ -1014,7 +1024,7 @@ namespace DSPRE { battleBackgroundLabel.Location = new Point(battleBackgroundLabel.Location.X - 25, battleBackgroundLabel.Location.Y - 8); battleBackgroundUpDown.Location = new Point(battleBackgroundUpDown.Location.X - 25, battleBackgroundUpDown.Location.Y - 8); break; - case gFamEnum.Plat: + case GameFamilies.Plat: areaSettingsLabel.Text = "Show nametag:"; areaIconComboBox.Items.Clear(); cameraComboBox.Items.Clear(); @@ -1134,9 +1144,9 @@ namespace DSPRE { string imageName; switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: break; - case gFamEnum.Plat: + case GameFamilies.Plat: ((HeaderPt)currentHeader).areaIcon = (byte)areaIconComboBox.SelectedIndex; imageName = "areaicon0" + areaIconComboBox.SelectedIndex.ToString(); areaIconPictureBox.Image = (Image)Properties.Resources.ResourceManager.GetObject(imageName); @@ -1162,7 +1172,7 @@ namespace DSPRE { return; } - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { HeaderHGSS currentHeaderHGSS = (HeaderHGSS)currentHeader; currentHeaderHGSS.followMode = (byte)followModeComboBox.SelectedIndex; } @@ -1172,7 +1182,7 @@ namespace DSPRE { if (disableHandlers) { return; } - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { HeaderHGSS currentHeaderHGSS = (HeaderHGSS)currentHeader; currentHeaderHGSS.kantoFlag = kantoRadioButton.Checked; } @@ -1195,7 +1205,7 @@ namespace DSPRE { if (flag3CheckBox.Checked) flagVal += (byte)Math.Pow(2, 3); - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { if (flag4CheckBox.Checked) flagVal += (byte)Math.Pow(2, 4); if (flag5CheckBox.Checked) @@ -1243,7 +1253,7 @@ namespace DSPRE { cameraUpDown.Value = currentHeader.cameraAngleID; battleBackgroundUpDown.Value = currentHeader.battleBackground; - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { areaSettingsComboBox.SelectedIndex = ((HeaderHGSS)currentHeader).locationType; } @@ -1252,7 +1262,7 @@ namespace DSPRE { /* Setup controls for fields with version-specific differences */ try { switch (RomInfo.gameFamily) { - case gFamEnum.DP: { + case GameFamilies.DP: { HeaderDP h = (HeaderDP)currentHeader; locationNameComboBox.SelectedIndex = h.locationName; @@ -1261,7 +1271,7 @@ namespace DSPRE { areaSettingsComboBox.SelectedIndex = areaSettingsComboBox.FindString("[" + $"{currentHeader.locationSpecifier:D3}"); break; } - case gFamEnum.Plat: { + case GameFamilies.Plat: { HeaderPt h = (HeaderPt)currentHeader; areaIconComboBox.SelectedIndex = h.areaIcon; @@ -1301,7 +1311,7 @@ namespace DSPRE { flag2CheckBox.Checked = ba[2]; flag3CheckBox.Checked = ba[3]; - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { flag4CheckBox.Checked = ba[4]; flag5CheckBox.Checked = ba[5]; flag6CheckBox.Checked = ba[6]; @@ -1360,10 +1370,10 @@ namespace DSPRE { } switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: ((HeaderDP)currentHeader).locationName = (ushort)locationNameComboBox.SelectedIndex; break; - case gFamEnum.Plat: + case GameFamilies.Plat: ((HeaderPt)currentHeader).locationName = (byte)locationNameComboBox.SelectedIndex; break; default: @@ -1382,10 +1392,10 @@ namespace DSPRE { return; } switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: currentHeader.musicDayID = (ushort)(musicDayUpDown.Value = PokeDatabase.MusicDB.DPMusicDict.Keys.ElementAt(musicDayComboBox.SelectedIndex)); break; - case gFamEnum.Plat: + case GameFamilies.Plat: currentHeader.musicDayID = (ushort)(musicDayUpDown.Value = PokeDatabase.MusicDB.PtMusicDict.Keys.ElementAt(musicDayComboBox.SelectedIndex)); break; default: @@ -1399,10 +1409,10 @@ namespace DSPRE { } switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: currentHeader.musicNightID = (ushort)(musicNightUpDown.Value = PokeDatabase.MusicDB.DPMusicDict.Keys.ElementAt(musicNightComboBox.SelectedIndex)); break; - case gFamEnum.Plat: + case GameFamilies.Plat: currentHeader.musicNightID = (ushort)(musicNightUpDown.Value = PokeDatabase.MusicDB.PtMusicDict.Keys.ElementAt(musicNightComboBox.SelectedIndex)); break; default: @@ -1420,10 +1430,10 @@ namespace DSPRE { currentHeader.musicDayID = updValue; try { switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: musicDayComboBox.SelectedItem = PokeDatabase.MusicDB.DPMusicDict[updValue]; break; - case gFamEnum.Plat: + case GameFamilies.Plat: musicDayComboBox.SelectedItem = PokeDatabase.MusicDB.PtMusicDict[updValue]; break; default: @@ -1445,10 +1455,10 @@ namespace DSPRE { currentHeader.musicNightID = updValue; try { switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: musicNightComboBox.SelectedItem = PokeDatabase.MusicDB.DPMusicDict[updValue]; break; - case gFamEnum.Plat: + case GameFamilies.Plat: musicNightComboBox.SelectedItem = PokeDatabase.MusicDB.PtMusicDict[updValue]; break; default: @@ -1475,10 +1485,10 @@ namespace DSPRE { disableHandlers = true; try { switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: weatherComboBox.SelectedItem = PokeDatabase.Weather.DPWeatherDict[currentHeader.weatherID]; break; - case gFamEnum.Plat: + case GameFamilies.Plat: weatherComboBox.SelectedItem = PokeDatabase.Weather.PtWeatherDict[currentHeader.weatherID]; break; default: @@ -1494,10 +1504,10 @@ namespace DSPRE { try { Dictionary dict; switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: dict = PokeDatabase.System.WeatherPics.dpWeatherImageDict; break; - case gFamEnum.Plat: + case GameFamilies.Plat: dict = PokeDatabase.System.WeatherPics.ptWeatherImageDict; break; default: @@ -1528,10 +1538,10 @@ namespace DSPRE { disableHandlers = true; try { switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: cameraComboBox.SelectedItem = PokeDatabase.CameraAngles.DPPtCameraDict[currentHeader.cameraAngleID]; break; - case gFamEnum.Plat: + case GameFamilies.Plat: cameraComboBox.SelectedItem = PokeDatabase.CameraAngles.DPPtCameraDict[currentHeader.cameraAngleID]; break; default: @@ -1547,11 +1557,11 @@ namespace DSPRE { string imageName; try { switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: currentHeader.cameraAngleID = (byte)cameraComboBox.SelectedIndex; imageName = "dpcamera" + cameraUpDown.Value.ToString(); break; - case gFamEnum.Plat: + case GameFamilies.Plat: currentHeader.cameraAngleID = (byte)cameraComboBox.SelectedIndex; imageName = "ptcamera" + cameraUpDown.Value.ToString(); break; @@ -1572,10 +1582,10 @@ namespace DSPRE { } switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: weatherUpDown.Value = PokeDatabase.Weather.DPWeatherDict.Keys.ElementAt(weatherComboBox.SelectedIndex); break; - case gFamEnum.Plat: + case GameFamilies.Plat: weatherUpDown.Value = PokeDatabase.Weather.PtWeatherDict.Keys.ElementAt(weatherComboBox.SelectedIndex); break; default: @@ -1594,10 +1604,10 @@ namespace DSPRE { } switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: cameraUpDown.Value = PokeDatabase.CameraAngles.DPPtCameraDict.Keys.ElementAt(cameraComboBox.SelectedIndex); break; - case gFamEnum.Plat: + case GameFamilies.Plat: cameraUpDown.Value = PokeDatabase.CameraAngles.DPPtCameraDict.Keys.ElementAt(cameraComboBox.SelectedIndex); break; default: @@ -1751,13 +1761,13 @@ namespace DSPRE { string locationName = ""; switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: locationName = locationNameComboBox.Items[((HeaderDP)h).locationName].ToString(); break; - case gFamEnum.Plat: + case GameFamilies.Plat: locationName = locationNameComboBox.Items[((HeaderPt)h).locationName].ToString(); break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: locationName = locationNameComboBox.Items[((HeaderHGSS)h).locationName].ToString(); break; } @@ -1792,13 +1802,13 @@ namespace DSPRE { string[] locBuff = new string[2]; switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: locBuff[1] = locationNameComboBox.Items[((HeaderDP)hBuff[1]).locationName].ToString(); break; - case gFamEnum.Plat: + case GameFamilies.Plat: locBuff[1] = locationNameComboBox.Items[((HeaderPt)hBuff[1]).locationName].ToString(); break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: locBuff[1] = locationNameComboBox.Items[((HeaderHGSS)hBuff[1]).locationName].ToString(); break; } @@ -1810,13 +1820,13 @@ namespace DSPRE { string lastName = locBuff[0]; //Kind of a locBuff[-1] locBuff[0] = locBuff[1]; switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: locBuff[1] = locationNameComboBox.Items[((HeaderDP)hBuff[1]).locationName].ToString(); break; - case gFamEnum.Plat: + case GameFamilies.Plat: locBuff[1] = locationNameComboBox.Items[((HeaderPt)hBuff[1]).locationName].ToString(); break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: locBuff[1] = locationNameComboBox.Items[((HeaderHGSS)hBuff[1]).locationName].ToString(); break; } @@ -1854,11 +1864,11 @@ namespace DSPRE { } switch (RomInfo.gameFamily) { - case gFamEnum.DP: - case gFamEnum.Plat: + case GameFamilies.DP: + case GameFamilies.Plat: currentHeader.locationSpecifier = Byte.Parse(areaSettingsComboBox.SelectedItem.ToString().Substring(1, 3)); break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: HeaderHGSS ch = (HeaderHGSS)currentHeader; ch.locationType = (byte)areaSettingsComboBox.SelectedIndex; break; @@ -2124,11 +2134,11 @@ namespace DSPRE { wildPokeUpDown.Value = encountersIDCopy; switch (RomInfo.gameFamily) { - case gFamEnum.DP: - case gFamEnum.Plat: + case GameFamilies.DP: + case GameFamilies.Plat: areaSettingsComboBox.SelectedIndex = shownameCopy; break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: areaSettingsComboBox.SelectedIndex = areaSettingsCopy; break; } @@ -2614,7 +2624,7 @@ namespace DSPRE { statusLabelMessage("Multiple Headers are associated to this Matrix, including the last selected one [Header " + headerID + "]. Now using its textures."); } else { - if (gameFamily.Equals(gFamEnum.DP)) { + if (gameFamily.Equals(GameFamilies.DP)) { foreach (ushort r in result) { HeaderDP hdp; hdp = (HeaderDP)MapHeader.LoadFromARM9(r); @@ -2624,7 +2634,7 @@ namespace DSPRE { break; } } - } else if (gameFamily.Equals(gFamEnum.Plat)) { + } else if (gameFamily.Equals(GameFamilies.Plat)) { foreach (ushort r in result) { HeaderPt hpt; if (ROMToolboxDialog.flag_DynamicHeadersPatchApplied || ROMToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { @@ -3195,7 +3205,7 @@ namespace DSPRE { DirNames.areaData, }); - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { DSUtils.TryUnpackNarcs(new List { DirNames.interiorBuildingModels }); } @@ -3204,8 +3214,8 @@ namespace DSPRE { collisionPainterPictureBox.Image = new Bitmap(100, 100); typePainterPictureBox.Image = new Bitmap(100, 100); switch (RomInfo.gameFamily) { - case gFamEnum.DP: - case gFamEnum.Plat: + case GameFamilies.DP: + case GameFamilies.Plat: mapPartsTabControl.TabPages.Remove(bgsTabPage); break; default: @@ -3222,8 +3232,8 @@ namespace DSPRE { for (int i = 0; i < mapCount; i++) { using (DSUtils.EasyReader reader = new DSUtils.EasyReader(RomInfo.gameDirs[DirNames.maps].unpackedDir + "\\" + i.ToString("D4"))) { switch (RomInfo.gameFamily) { - case gFamEnum.DP: - case gFamEnum.Plat: + case GameFamilies.DP: + case GameFamilies.Plat: reader.BaseStream.Position = 0x10 + reader.ReadUInt32() + reader.ReadUInt32(); break; default: @@ -3288,12 +3298,12 @@ namespace DSPRE { selectMapComboBox.SelectedIndex = 0; exteriorbldRadioButton.Checked = true; switch (RomInfo.gameFamily) { - case gFamEnum.DP: - case gFamEnum.Plat: + case GameFamilies.DP: + case GameFamilies.Plat: mapTextureComboBox.SelectedIndex = 7; buildTextureComboBox.SelectedIndex = 1; break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: mapTextureComboBox.SelectedIndex = 3; buildTextureComboBox.SelectedIndex = 1; break; @@ -3328,12 +3338,12 @@ namespace DSPRE { UpdateMapBinAndRefresh(temp, "Map BIN imported successfully!"); return; } else { - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { //If HGSS didn't work try reading as Platinum Map - temp = new MapFile(of.FileName, gFamEnum.Plat, false); + temp = new MapFile(of.FileName, GameFamilies.Plat, false); } else { //If Plat didn't work try reading as HGSS Map - temp = new MapFile(of.FileName, gFamEnum.HGSS, false); + temp = new MapFile(of.FileName, GameFamilies.HGSS, false); } if (temp.correctnessFlag) { @@ -3723,7 +3733,7 @@ namespace DSPRE { modelSizeLBL.Text = currentMapFile.mapModelData.Length.ToString() + " B"; terrainSizeLBL.Text = currentMapFile.bdhc.Length.ToString() + " B"; - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { BGSSizeLBL.Text = currentMapFile.bgs.Length.ToString() + " B"; } } @@ -4674,7 +4684,7 @@ namespace DSPRE { #region BDHC I/O private void bdhcImportButton_Click(object sender, EventArgs e) { OpenFileDialog it = new OpenFileDialog() { - Filter = RomInfo.gameFamily == gFamEnum.DP ? MapFile.BDHCFilter : MapFile.BDHCamFilter + Filter = RomInfo.gameFamily == GameFamilies.DP ? MapFile.BDHCFilter : MapFile.BDHCamFilter }; if (it.ShowDialog(this) != DialogResult.OK) { @@ -4688,7 +4698,7 @@ namespace DSPRE { private void bdhcExportButton_Click(object sender, EventArgs e) { SaveFileDialog sf = new SaveFileDialog { FileName = selectMapComboBox.SelectedItem.ToString(), - Filter = RomInfo.gameFamily == gFamEnum.DP ? MapFile.BDHCFilter : MapFile.BDHCamFilter + Filter = RomInfo.gameFamily == GameFamilies.DP ? MapFile.BDHCFilter : MapFile.BDHCamFilter }; if (sf.ShowDialog(this) != DialogResult.OK) { @@ -4811,7 +4821,7 @@ namespace DSPRE { Dictionary dict = new Dictionary(); - if (gameFamily.Equals(gFamEnum.DP)) { + if (gameFamily.Equals(GameFamilies.DP)) { foreach (ushort headerID in result) { HeaderDP hdp = (HeaderDP)MapHeader.LoadFromARM9(headerID); @@ -5041,7 +5051,7 @@ namespace DSPRE { MW_LoadModelTextures(eventMapFile.mapModel, RomInfo.gameDirs[DirNames.mapTextures].unpackedDir, areaData.mapTileset); bool isInteriorMap = false; - if ((RomInfo.gameVersion == gVerEnum.HeartGold || RomInfo.gameVersion == gVerEnum.SoulSilver) && areaData.areaType == 0x0) + if ((RomInfo.gameVersion == GameVersions.HeartGold || RomInfo.gameVersion == GameVersions.SoulSilver) && areaData.areaType == 0x0) isInteriorMap = true; for (int i = 0; i < eventMapFile.buildings.Count; i++) { @@ -5262,15 +5272,15 @@ namespace DSPRE { RomInfo.SetOWtable(); RomInfo.Set3DOverworldsDict(); - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { DSUtils.TryUnpackNarcs(new List { DirNames.interiorBuildingModels }); } disableHandlers = true; if (File.Exists(RomInfo.OWtablePath)) { switch (RomInfo.gameFamily) { - case gFamEnum.DP: - case gFamEnum.Plat: + case GameFamilies.DP: + case GameFamilies.Plat: break; default: // HGSS Overlay 1 must be decompressed in order to read the overworld table @@ -6340,13 +6350,13 @@ namespace DSPRE { int locNum; switch (RomInfo.gameFamily) { - case gFamEnum.DP: { + case GameFamilies.DP: { HeaderDP h = (HeaderDP)destHeader; locNum = h.locationName; break; } - case gFamEnum.Plat: { + case GameFamilies.Plat: { HeaderPt h = (HeaderPt)destHeader; locNum = h.locationName; @@ -8093,8 +8103,8 @@ namespace DSPRE { string[] lightTypes; switch (RomInfo.gameFamily) { - case gFamEnum.DP: - case gFamEnum.Plat: + case GameFamilies.DP: + case GameFamilies.Plat: lightTypes = new string[3] { "Day/Night Light", "Model's light", "Unknown Light" }; break; default: @@ -8322,7 +8332,7 @@ namespace DSPRE { areaDataLightTypeComboBox.SelectedIndex = currentAreaData.lightType; disableHandlers = true; - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { areaDataDynamicTexturesNumericUpDown.Value = currentAreaData.dynamicTextureType; bool interior = currentAreaData.areaType == 0; @@ -8499,7 +8509,7 @@ namespace DSPRE { overlayCameraTblOffset = RAMaddresses[0] - DSUtils.GetOverlayRAMAddress(RomInfo.cameraTblOverlayNumber); using (DSUtils.EasyReader br = new DSUtils.EasyReader(camOverlayPath, overlayCameraTblOffset)) { - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { currentCameraTable = new GameCamera[17]; for (int i = 0; i < currentCameraTable.Length; i++) { currentCameraTable[i] = new GameCamera(br.ReadUInt32(), br.ReadInt16(), br.ReadInt16(), br.ReadInt16(), @@ -8649,7 +8659,7 @@ namespace DSPRE { uint entrySize = 4; uint tableSizeOffset = 10; - if (gameFamily == gFamEnum.HGSS) { + if (gameFamily == GameFamilies.HGSS) { entrySize += 2; tableSizeOffset += 2; encounterSSEQAltUpDown.Enabled = true; @@ -8661,7 +8671,7 @@ namespace DSPRE { uint entryOffset = (uint)ar.BaseStream.Position; byte tclass = (byte)ar.ReadUInt16(); ushort musicD = ar.ReadUInt16(); - ushort? musicN = gameFamily == gFamEnum.HGSS ? ar.ReadUInt16() : (ushort?)null; + ushort? musicN = gameFamily == GameFamilies.HGSS ? ar.ReadUInt16() : (ushort?)null; trainerClassEncounterMusicDict[tclass] = (entryOffset, musicD, musicN); } } @@ -8805,7 +8815,7 @@ namespace DSPRE { pokemonSpecies[i] = new SpeciesFile(new FileStream(RomInfo.gameDirs[DirNames.personalPokeData].unpackedDir + "\\" + i.ToString("D4"), FileMode.Open)); } - if (gameFamily == gFamEnum.HGSS) { + if (gameFamily == GameFamilies.HGSS) { foreach (ComboBox partyGenderComboBox in partyGenderComboBoxList) { partyGenderComboBox.Visible = true; partyGenderComboBox.Items.Add("Default Gender"); @@ -8817,7 +8827,7 @@ namespace DSPRE { partyGenderComboBox.Visible = false; } - if (gameFamily == gFamEnum.DP) { + if (gameFamily == GameFamilies.DP) { foreach (ComboBox partyFormComboBox in partyFormComboBoxList) partyFormComboBox.Visible = false; @@ -9124,7 +9134,7 @@ namespace DSPRE { currentTrainerFile.party[i].difficulty = (byte)partyIVUpdownList[i].Value; - if (hasMoreThanOneGender((int)currentTrainerFile.party[i].pokeID, pokemonSpecies) && gameFamily == gFamEnum.HGSS) { + if (hasMoreThanOneGender((int)currentTrainerFile.party[i].pokeID, pokemonSpecies) && gameFamily == GameFamilies.HGSS) { switch (partyGenderComboBoxList[i].SelectedIndex) { case TRAINER_PARTY_POKEMON_GENDER_DEFAULT_INDEX: currentTrainerFile.party[i].genderAndAbilityFlags = PartyPokemon.GenderAndAbilityFlags.NO_FLAGS; @@ -9239,7 +9249,7 @@ namespace DSPRE { encounterSSEQMainUpDown.Value = 0; } - eyeContactMusicAltLabel.Enabled = encounterSSEQAltUpDown.Enabled = (encounterSSEQMainUpDown.Enabled && gameFamily == gFamEnum.HGSS); + eyeContactMusicAltLabel.Enabled = encounterSSEQAltUpDown.Enabled = (encounterSSEQMainUpDown.Enabled && gameFamily == GameFamilies.HGSS); encounterSSEQAltUpDown.Value = output.musicN != null ? (ushort)output.musicN : 0; currentTrainerFile.trp.trainerClass = (byte)selection; } @@ -9253,7 +9263,7 @@ namespace DSPRE { string tilesFilename = tilesFileID.ToString("D4"); trainerTile = new NCGR(gameDirs[DirNames.trainerGraphics].unpackedDir + "\\" + tilesFilename, tilesFileID, tilesFilename); - if (gameFamily == gFamEnum.DP) { + if (gameFamily == GameFamilies.DP) { return 0; } @@ -9406,7 +9416,7 @@ namespace DSPRE { } disableHandlers = false; - if (gameFamily.Equals(gFamEnum.HGSS) && tableEditorIsReady) { + if (gameFamily.Equals(GameFamilies.HGSS) && tableEditorIsReady) { pbEffectsTrainerCombobox.Items[selectedTrClass] = trainerClassListBox.Items[selectedTrClass]; for (int i = 0; i < vsTrainerEffectsList.Count; i++) { if (vsTrainerEffectsList[i].trainerClass == selectedTrClass) { @@ -9442,7 +9452,7 @@ namespace DSPRE { partyAbilityComboBoxList[partyPokemonPosition].Items.Add(ability1); //if the name " -" is returned for ability 2 then there is no ability 2 - if (ability2.Equals(" -") || ability2.Equals(ability1) || gameFamily != gFamEnum.HGSS) { + if (ability2.Equals(" -") || ability2.Equals(ability1) || gameFamily != GameFamilies.HGSS) { partyAbilityComboBoxList[partyPokemonPosition].Enabled = false; } else { partyAbilityComboBoxList[partyPokemonPosition].Items.Add(ability2); @@ -9456,7 +9466,7 @@ namespace DSPRE { int currentPokemonGenderRatio = pokemonSpecies[partyPokemonComboboxList[partyPokemonPosition].SelectedIndex].GenderRatioMaleToFemale; PartyPokemon.GenderAndAbilityFlags currentPokemonGenderAndAbilityFlags = currentTrainerFile.party[partyPokemonPosition].genderAndAbilityFlags; - if (gameFamily == gFamEnum.HGSS) { + if (gameFamily == GameFamilies.HGSS) { switch (currentPokemonGenderRatio) { case GENDER_RATIO_MALE: partyGenderComboBoxList[partyPokemonPosition].SelectedIndex = TRAINER_PARTY_POKEMON_GENDER_MALE_INDEX; @@ -9489,7 +9499,7 @@ namespace DSPRE { switch (pokemonID) { case PICHU_ID_NUM: - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { pokemonFormNames.Add("Non-Spiky-Eared"); pokemonFormNames.Add("Spiky-Eared"); } else { @@ -9547,7 +9557,7 @@ namespace DSPRE { } private void setTrainerPartyPokemonForm(int partyPokemonPosition) { - if (gameFamily != gFamEnum.DP) { + if (gameFamily != GameFamilies.DP) { partyFormComboBoxList[partyPokemonPosition].Items.Clear(); List currentPokemonFormName = getPokemonFormNames(partyPokemonComboboxList[partyPokemonPosition].SelectedIndex); foreach (string formName in currentPokemonFormName) @@ -9586,7 +9596,7 @@ namespace DSPRE { private void SetupConditionalMusicTable() { switch (RomInfo.gameFamily) { - case gFamEnum.HGSS: + case GameFamilies.HGSS: RomInfo.SetConditionalMusicTableOffsetToRAMAddress(); conditionalMusicTable = new List<(ushort, ushort, ushort)>(); @@ -9615,7 +9625,7 @@ namespace DSPRE { } break; - case gFamEnum.Plat: + case GameFamilies.Plat: pbEffectsMonGroupBox.Enabled = false; pbEffectsTrainerGroupBox.Enabled = false; conditionalMusicGroupBox.Enabled = false; @@ -9630,7 +9640,7 @@ namespace DSPRE { } } private void SetupBattleEffectsTables() { - if (RomInfo.gameFamily == gFamEnum.HGSS || RomInfo.gameFamily == gFamEnum.Plat) { + if (RomInfo.gameFamily == GameFamilies.HGSS || RomInfo.gameFamily == GameFamilies.Plat) { DSUtils.TryUnpackNarcs(new List { DirNames.trainerGraphics, DirNames.textArchives, @@ -9647,7 +9657,7 @@ namespace DSPRE { byte comboTableEntriesCount; - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { comboTableEntriesCount = DSUtils.ARM9.ReadByte(RomInfo.effectsComboTableOffsetToSizeLimiter); vsPokemonEffectsList = new List<(int pokemonID, int comboID)>(); @@ -9680,7 +9690,7 @@ namespace DSPRE { String expArmPath = RomInfo.gameDirs[DirNames.synthOverlay].unpackedDir + '\\' + ROMToolboxDialog.expandedARMfileID.ToString("D4"); - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { using (DSUtils.EasyReader ar = new DSUtils.EasyReader(ROMToolboxDialog.flag_TrainerClassBattleTableRepointed ? expArmPath : RomInfo.arm9Path, vsTrainerTableStartAddress)) { byte trainerTableEntriesCount = DSUtils.ARM9.ReadByte(RomInfo.vsTrainerEntryTableOffsetToSizeLimiter); @@ -9722,7 +9732,7 @@ namespace DSPRE { } } - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { var items = pbEffectsCombosListbox.Items.Cast().ToArray(); pbEffectsPokemonChooseMainCombobox.Items.Clear(); @@ -9777,13 +9787,13 @@ namespace DSPRE { MapHeader selected = MapHeader.LoadFromARM9(newTuple.header); switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: locationNameConditionalMusicLBL.Text = RomInfo.GetLocationNames()[(selected as HeaderDP).locationName]; break; - case gFamEnum.Plat: + case GameFamilies.Plat: locationNameConditionalMusicLBL.Text = RomInfo.GetLocationNames()[(selected as HeaderPt).locationName]; break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: locationNameConditionalMusicLBL.Text = RomInfo.GetLocationNames()[(selected as HeaderHGSS).locationName]; break; } @@ -9839,7 +9849,7 @@ namespace DSPRE { string updatedEntry = "Combo " + index.ToString("D2") + " - " + "Effect #" + battleIntroEffect + ", " + "Music #" + battleMusic; pbEffectsCombosListbox.Items[index] = updatedEntry; - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { pbEffectsTrainerChooseMainCombobox.Items[index] = pbEffectsPokemonChooseMainCombobox.Items[index] = updatedEntry; } disableHandlers = false; @@ -9880,7 +9890,7 @@ namespace DSPRE { private void HOWpbEffectsTableButton_Click(object sender, EventArgs e) { MessageBox.Show("An entry of this table is a combination of VS. Graphics + Battle Theme.\n\n" + - (RomInfo.gameFamily.Equals(gFamEnum.HGSS) ? "Each entry can be \"inherited\" by one or more Pokémon or Trainer classes." : ""), + (RomInfo.gameFamily.Equals(GameFamilies.HGSS) ? "Each entry can be \"inherited\" by one or more Pokémon or Trainer classes." : ""), "How this table works", MessageBoxButtons.OK, MessageBoxIcon.Information); } diff --git a/DS_Map/Main Window.resx b/DS_Map/Main Window.resx index 0c5441b..297f370 100644 --- a/DS_Map/Main Window.resx +++ b/DS_Map/Main Window.resx @@ -117,6 +117,96 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 239, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM + EgAAAk1TRnQBSQFMAgEBCgEAAagBGwGoARsBEAEAARABAAT/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== + + @@ -946,96 +1036,6 @@ p3S+M+m1V1me9QgCUQNXX2YRT1sYHBiEP3wHVbp3PF3cB40GbrzN86xHENrScf1NDsl8FaI4jODMHOgS SOacfYAmbr5XeNYjGH7yDReXv+JeNIUhUYwFpmZjDz+nMLf5B3b2rcZ5tju4ntjtFw4T54j+v2g/t9NH 9AiCIPwGJelqUAd/T3AAAAAASUVORK5CYII= - - - - 239, 17 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM - EgAAAk1TRnQBSQFMAgEBCgEAAaABGwGgARsBEAEAARABAAT/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== @@ -1047,8 +1047,11 @@ 386, 19 + + 533, 20 + - 144 + 67 diff --git a/DS_Map/PokemonEditor.cs b/DS_Map/PokemonEditor.cs index b0276c0..b222a58 100644 --- a/DS_Map/PokemonEditor.cs +++ b/DS_Map/PokemonEditor.cs @@ -14,12 +14,6 @@ namespace DSPRE { public partial class PokemonEditor : Form { public PokemonEditor(string[] itemNames, string[] abilityNames, string[] moveNames) { InitializeComponent(); - foreach (var cb in Controls.OfType()) { - cb.Resize += (sender, e) => { - if (!cb.Focused) - cb.SelectionLength = 0; - }; - } IsMdiContainer = true; PersonalDataEditor personalEditor = new PersonalDataEditor(itemNames, abilityNames, evoPage); diff --git a/DS_Map/ROMFiles/AreaData.cs b/DS_Map/ROMFiles/AreaData.cs index cc2d400..a724da1 100644 --- a/DS_Map/ROMFiles/AreaData.cs +++ b/DS_Map/ROMFiles/AreaData.cs @@ -24,7 +24,7 @@ namespace DSPRE.ROMFiles { buildingsTileset = reader.ReadUInt16(); mapTileset = reader.ReadUInt16(); - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { dynamicTextureType = reader.ReadUInt16(); areaType = reader.ReadByte(); lightType = reader.ReadByte(); @@ -44,7 +44,7 @@ namespace DSPRE.ROMFiles { writer.Write(buildingsTileset); writer.Write(mapTileset); - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { writer.Write(dynamicTextureType); writer.Write(areaType); writer.Write((byte)lightType); diff --git a/DS_Map/ROMFiles/MapFile.cs b/DS_Map/ROMFiles/MapFile.cs index 7c768b6..0bc4a22 100644 --- a/DS_Map/ROMFiles/MapFile.cs +++ b/DS_Map/ROMFiles/MapFile.cs @@ -76,9 +76,9 @@ namespace DSPRE.ROMFiles { #endregion #region Constructors (1) - public MapFile(string path, gFamEnum gFamily, bool discardMoveperms = false, bool showMessages = true) : this (new FileStream(path, FileMode.Open), gFamily, discardMoveperms, showMessages) {} - public MapFile(int mapNumber, gFamEnum gFamily, bool discardMoveperms = false, bool showMessages = true) : this(RomInfo.gameDirs[DirNames.maps].unpackedDir + "\\" + mapNumber.ToString("D4"), gFamily, discardMoveperms, showMessages) { } - public MapFile(Stream data, gFamEnum gFamily, bool discardMoveperms = false, bool showMessages = true) { + public MapFile(string path, GameFamilies gFamily, bool discardMoveperms = false, bool showMessages = true) : this (new FileStream(path, FileMode.Open), gFamily, discardMoveperms, showMessages) {} + public MapFile(int mapNumber, GameFamilies gFamily, bool discardMoveperms = false, bool showMessages = true) : this(RomInfo.gameDirs[DirNames.maps].unpackedDir + "\\" + mapNumber.ToString("D4"), gFamily, discardMoveperms, showMessages) { } + public MapFile(Stream data, GameFamilies gFamily, bool discardMoveperms = false, bool showMessages = true) { using (BinaryReader reader = new BinaryReader(data)) { /* Read sections lengths */ int permissionsSectionLength = reader.ReadInt32(); @@ -87,7 +87,7 @@ namespace DSPRE.ROMFiles { int bdhcSectionLength = reader.ReadInt32(); /* Read background sounds section */ - if (gFamily == gFamEnum.HGSS) { //Map must be loaded as HGSS + if (gFamily == GameFamilies.HGSS) { //Map must be loaded as HGSS ushort bgsSignature = reader.ReadUInt16(); if (bgsSignature == 0x1234) { ushort bgsDataLength = reader.ReadUInt16(); @@ -227,7 +227,7 @@ namespace DSPRE.ROMFiles { writer.Write(bdhc.Length); /* Write soundplate section for HG/SS */ - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { writer.Write(bgs); } diff --git a/DS_Map/ROMFiles/MapHeader.cs b/DS_Map/ROMFiles/MapHeader.cs index 425f383..f0c19d3 100644 --- a/DS_Map/ROMFiles/MapHeader.cs +++ b/DS_Map/ROMFiles/MapHeader.cs @@ -128,32 +128,32 @@ namespace DSPRE.ROMFiles { #endregion Fields #region Methods (1) - public static MapHeader LoadFromByteArray(byte[] headerData, ushort headerNumber, gFamEnum gameFamily = gFamEnum.NULL) { + public static MapHeader LoadFromByteArray(byte[] headerData, ushort headerNumber, GameFamilies gameFamily = GameFamilies.NULL) { /* Encapsulate header data into the class appropriate for the gameVersion */ if (headerData.Length < MapHeader.length) { MessageBox.Show("File of header " + headerNumber + " is too small and can't store header data.", "Header file too small", MessageBoxButtons.OK, MessageBoxIcon.Error); return null; } - if (gameFamily == gFamEnum.NULL) { + if (gameFamily == GameFamilies.NULL) { gameFamily = RomInfo.gameFamily; } switch (gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: return new HeaderDP(headerNumber, new MemoryStream(headerData)); - case gFamEnum.Plat: + case GameFamilies.Plat: return new HeaderPt(headerNumber, new MemoryStream(headerData)); default: return new HeaderHGSS(headerNumber, new MemoryStream(headerData)); } } - public static MapHeader LoadFromFile(string filename, ushort headerNumber, long offsetInFile, gFamEnum gameFamily = gFamEnum.NULL) { + public static MapHeader LoadFromFile(string filename, ushort headerNumber, long offsetInFile, GameFamilies gameFamily = GameFamilies.NULL) { /* Calculate header offset and load data */ byte[] headerData = DSUtils.ReadFromFile(filename, offsetInFile, MapHeader.length); return LoadFromByteArray(headerData, headerNumber, gameFamily); } - public static MapHeader LoadFromARM9(ushort headerNumber, gFamEnum gameFamily = gFamEnum.NULL) { + public static MapHeader LoadFromARM9(ushort headerNumber, GameFamilies gameFamily = GameFamilies.NULL) { long headerOffset = RomInfo.headerTableOffset + MapHeader.length * headerNumber; return LoadFromFile(RomInfo.arm9Path, headerNumber, headerOffset, gameFamily); } diff --git a/DS_Map/ROMFiles/ScriptCommand.cs b/DS_Map/ROMFiles/ScriptCommand.cs index a847097..8472bb2 100644 --- a/DS_Map/ROMFiles/ScriptCommand.cs +++ b/DS_Map/ROMFiles/ScriptCommand.cs @@ -90,42 +90,42 @@ namespace DSPRE.ROMFiles { break; case 0x00B0: // Warp [HGSS] - if (RomInfo.gameFamily.Equals(RomInfo.gFamEnum.HGSS)) { + if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.HGSS)) { name += FormatCmd_Warp(parametersList); } else { goto default; } break; case 0x0152: // SetOverworldDefaultPosition [HGSS] - if (RomInfo.gameFamily.Equals(RomInfo.gFamEnum.HGSS)) { + if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.HGSS)) { name += FormatCmd_Overworld_TwoParams(parametersList); } else { goto default; } break; case 0x0153: // SetOverworldPosition [HGSS] - if (RomInfo.gameFamily.Equals(RomInfo.gFamEnum.HGSS)) { + if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.HGSS)) { name += FormatCmd_Overworld_3Coords_Dir(parametersList); } else { goto default; } break; case 0x0154: // SetOverworldDefaultMovement [HGSS] - if (RomInfo.gameFamily.Equals(RomInfo.gFamEnum.HGSS)) { + if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.HGSS)) { name += FormatCmd_Overworld_Move(parametersList); } else { goto default; } break; case 0x0155: // SetOverworldDefaultDirection [DPPt] - if (RomInfo.gameFamily.Equals(RomInfo.gFamEnum.HGSS)) { + if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.HGSS)) { name += FormatCmd_Overworld_Dir(parametersList); } else { goto default; } break; case 0x0158: // SetOverworldDirection [DPPt] - if (RomInfo.gameFamily.Equals(RomInfo.gFamEnum.HGSS)) { + if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.HGSS)) { name += FormatCmd_Overworld_Dir(parametersList); } else { goto default; @@ -133,42 +133,42 @@ namespace DSPRE.ROMFiles { break; case 0x00BE: // Warp [DPPt] - if (RomInfo.gameFamily.Equals(RomInfo.gFamEnum.DP) || RomInfo.gameFamily.Equals(RomInfo.gFamEnum.Plat)) { + if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.DP) || RomInfo.gameFamily.Equals(RomInfo.GameFamilies.Plat)) { name += FormatCmd_Warp(parametersList); } else { goto default; } break; case 0x0186: // SetOverworldDefaultPosition [DPPt] - if (RomInfo.gameFamily.Equals(RomInfo.gFamEnum.DP) || RomInfo.gameFamily.Equals(RomInfo.gFamEnum.Plat)) { + if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.DP) || RomInfo.gameFamily.Equals(RomInfo.GameFamilies.Plat)) { name += FormatCmd_Overworld_TwoParams(parametersList); } else { goto default; } break; case 0x0187: // SetOverworldPosition [DPPt] - if (RomInfo.gameFamily.Equals(RomInfo.gFamEnum.DP) || RomInfo.gameFamily.Equals(RomInfo.gFamEnum.Plat)) { + if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.DP) || RomInfo.gameFamily.Equals(RomInfo.GameFamilies.Plat)) { name += FormatCmd_Overworld_3Coords_Dir(parametersList); } else { goto default; } break; case 0x0188: // SetOverworldDefaultMovement [DPPt] - if (RomInfo.gameFamily.Equals(RomInfo.gFamEnum.DP) || RomInfo.gameFamily.Equals(RomInfo.gFamEnum.Plat)) { + if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.DP) || RomInfo.gameFamily.Equals(RomInfo.GameFamilies.Plat)) { name += FormatCmd_Overworld_Move(parametersList); } else { goto default; } break; case 0x0189: // SetOverworldDefaultDirection [DPPt] - if (RomInfo.gameFamily.Equals(RomInfo.gFamEnum.DP) || RomInfo.gameFamily.Equals(RomInfo.gFamEnum.Plat)) { + if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.DP) || RomInfo.gameFamily.Equals(RomInfo.GameFamilies.Plat)) { name += FormatCmd_Overworld_Dir(parametersList); } else { goto default; } break; case 0x018C: // SetOverworldDirection [DPPt] - if (RomInfo.gameFamily.Equals(RomInfo.gFamEnum.DP) || RomInfo.gameFamily.Equals(RomInfo.gFamEnum.Plat)) { + if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.DP) || RomInfo.gameFamily.Equals(RomInfo.GameFamilies.Plat)) { name += FormatCmd_Overworld_Dir(parametersList); } else { goto default; diff --git a/DS_Map/ROMFiles/ScriptFile.cs b/DS_Map/ROMFiles/ScriptFile.cs index ccdc1bb..864abdc 100644 --- a/DS_Map/ROMFiles/ScriptFile.cs +++ b/DS_Map/ROMFiles/ScriptFile.cs @@ -211,8 +211,8 @@ namespace DSPRE.ROMFiles { /* How to read parameters for different commands for DPPt*/ switch (RomInfo.gameFamily) { - case gFamEnum.DP: - case gFamEnum.Plat: + case GameFamilies.DP: + case GameFamilies.Plat: switch (id) { case 0x16: //Jump case 0x1A: //Call @@ -318,7 +318,7 @@ namespace DSPRE.ROMFiles { } break; case 0x2C5: { - if (RomInfo.gameVersion == gVerEnum.Platinum) { + if (RomInfo.gameVersion == GameVersions.Platinum) { parameterList.Add(dataReader.ReadBytes(2)); parameterList.Add(dataReader.ReadBytes(2)); } else { @@ -330,13 +330,13 @@ namespace DSPRE.ROMFiles { case 0x2C9: case 0x2CA: case 0x2CD: - if (RomInfo.gameVersion == gVerEnum.Platinum) { + if (RomInfo.gameVersion == GameVersions.Platinum) { break; } else { goto default; } case 0x2CF: - if (RomInfo.gameVersion == gVerEnum.Platinum) { + if (RomInfo.gameVersion == GameVersions.Platinum) { parameterList.Add(dataReader.ReadBytes(2)); parameterList.Add(dataReader.ReadBytes(2)); } else { @@ -348,7 +348,7 @@ namespace DSPRE.ROMFiles { break; } break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: switch (id) { case 0x16: //Jump case 0x1A: //Call diff --git a/DS_Map/ROMFiles/TrainerFile.cs b/DS_Map/ROMFiles/TrainerFile.cs index 567cf22..1aba11d 100644 --- a/DS_Map/ROMFiles/TrainerFile.cs +++ b/DS_Map/ROMFiles/TrainerFile.cs @@ -78,7 +78,7 @@ namespace DSPRE.ROMFiles { writer.Write(move); } } - if (RomInfo.gameFamily == RomInfo.gFamEnum.HGSS || RomInfo.gameFamily == RomInfo.gFamEnum.Plat) + if (RomInfo.gameFamily == RomInfo.GameFamilies.HGSS || RomInfo.gameFamily == RomInfo.GameFamilies.Plat) writer.Write(ballSeals); // Diamond and Pearl apparently dont save ball capsule data in enemy trainer pokedata!!! } return newData.ToArray(); @@ -249,7 +249,7 @@ namespace DSPRE.ROMFiles { } - if (RomInfo.gameFamily == RomInfo.gFamEnum.HGSS || RomInfo.gameFamily == RomInfo.gFamEnum.Plat) + if (RomInfo.gameFamily == RomInfo.GameFamilies.HGSS || RomInfo.gameFamily == RomInfo.GameFamilies.Plat) content[i] = new PartyPokemon(difficulty, genderAndAbilityFlags, level, pokemon, form_no, reader.ReadUInt16(), heldItem, moves); else content[i] = new PartyPokemon(difficulty, level, pokemon, heldItem, moves); // Diamond and Pearl apparently dont save ball capsule data in enemy trainer pokedata!!! diff --git a/DS_Map/ROMToolboxDialog.cs b/DS_Map/ROMToolboxDialog.cs index 882130e..d5b9b18 100644 --- a/DS_Map/ROMToolboxDialog.cs +++ b/DS_Map/ROMToolboxDialog.cs @@ -38,7 +38,7 @@ namespace DSPRE { CheckStandardizedItems(); - if (RomInfo.gameLanguage == gLangEnum.English || RomInfo.gameLanguage == gLangEnum.Spanish) { + if (RomInfo.gameLanguage == GameLanguages.English || RomInfo.gameLanguage == GameLanguages.Spanish) { CheckARM9ExpansionApplied(); } else { DisableARM9patch("Unsupported\nlanguage"); @@ -50,31 +50,31 @@ namespace DSPRE { switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: DisableOverlay1patch("Unsupported"); DisableDynamicHeadersPatch("Unsupported"); DisableMatrixExpansionPatch("Unsupported"); DisableScrcmdRepointPatch("Unsupported"); DisableKillTextureAnimationsPatch("Unsupported"); break; - case gFamEnum.Plat: + case GameFamilies.Plat: DisableOverlay1patch("Unsupported"); DisableMatrixExpansionPatch("Unsupported"); DisableScrcmdRepointPatch("Unsupported"); DisableKillTextureAnimationsPatch("Unsupported"); - if (RomInfo.gameLanguage == gLangEnum.English || RomInfo.gameLanguage == gLangEnum.Spanish) { + if (RomInfo.gameLanguage == GameLanguages.English || RomInfo.gameLanguage == GameLanguages.Spanish) { CheckBDHCamPatchApplied(); } CheckDynamicHeadersPatchApplied(); break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: if (!DSUtils.CheckOverlayHasCompressionFlag(1)) { DisableOverlay1patch("Already applied"); overlay1CB.Visible = true; } - if (RomInfo.gameLanguage == gLangEnum.English || RomInfo.gameLanguage == gLangEnum.Spanish) { + if (RomInfo.gameLanguage == GameLanguages.English || RomInfo.gameLanguage == GameLanguages.Spanish) { CheckBDHCamPatchApplied(); CheckMatrixExpansionApplied(); CheckScrcmdRepointPatchApplied(); @@ -264,8 +264,8 @@ namespace DSPRE { DisableARM9patch("Already applied"); switch (RomInfo.gameFamily) { - case gFamEnum.Plat: - case gFamEnum.HGSS: + case GameFamilies.Plat: + case GameFamilies.HGSS: BDHCamARM9requiredLBL.Visible = false; BDHCamPatchButton.Enabled = true; BDHCamPatchLBL.Enabled = true; @@ -364,7 +364,7 @@ namespace DSPRE { private void BDHCAMPatchButton_Click(object sender, EventArgs e) { BDHCAMPatchData data = new BDHCAMPatchData(); - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { if (DSUtils.CheckOverlayHasCompressionFlag(data.overlayNumber)) { DialogResult d1 = MessageBox.Show("It is STRONGLY recommended to configure Overlay1 as uncompressed before proceeding.\n\n" + "More details in the following dialog.\n\n" + "Do you want to know more?", @@ -513,7 +513,7 @@ namespace DSPRE { }; //Distortion world - turnback cave Griseous Orb fix - if (gameFamily.Equals(gFamEnum.Plat)) { + if (gameFamily.Equals(GameFamilies.Plat)) { string ow9path = DSUtils.GetOverlayPath(9); int ow9offs = 0x8E20 + 10; @@ -590,8 +590,8 @@ namespace DSPRE { ROMToolboxDialog.flag_arm9Expanded = true; switch (RomInfo.gameFamily) { - case gFamEnum.Plat: - case gFamEnum.HGSS: + case GameFamilies.Plat: + case GameFamilies.HGSS: BDHCamPatchButton.Text = "Apply Patch"; BDHCamPatchButton.Enabled = true; BDHCamPatchLBL.Enabled = true; @@ -660,7 +660,7 @@ namespace DSPRE { DynamicHeadersPatchData data = new DynamicHeadersPatchData(); var headersDir = RomInfo.gameDirs[DirNames.dynamicHeaders]; - bool specialCase = RomInfo.gameFamily == gFamEnum.HGSS && RomInfo.gameLanguage != gLangEnum.Japanese && RomInfo.gameLanguage != gLangEnum.Spanish; + bool specialCase = RomInfo.gameFamily == GameFamilies.HGSS && RomInfo.gameLanguage != GameLanguages.Japanese && RomInfo.gameLanguage != GameLanguages.Spanish; string specialCaseChanges = ""; if (specialCase) { diff --git a/DS_Map/Resources/PokeDatabase.cs b/DS_Map/Resources/PokeDatabase.cs index f938da6..2deb915 100644 --- a/DS_Map/Resources/PokeDatabase.cs +++ b/DS_Map/Resources/PokeDatabase.cs @@ -612,42 +612,42 @@ namespace DSPRE.Resources { } } public static class System { - public static Dictionary versionsDict = new Dictionary() { - ["ADAE"] = gVerEnum.Diamond, - ["ADAS"] = gVerEnum.Diamond, - ["ADAI"] = gVerEnum.Diamond, - ["ADAF"] = gVerEnum.Diamond, - ["ADAD"] = gVerEnum.Diamond, - ["ADAJ"] = gVerEnum.Diamond, + public static Dictionary versionsDict = new Dictionary() { + ["ADAE"] = GameVersions.Diamond, + ["ADAS"] = GameVersions.Diamond, + ["ADAI"] = GameVersions.Diamond, + ["ADAF"] = GameVersions.Diamond, + ["ADAD"] = GameVersions.Diamond, + ["ADAJ"] = GameVersions.Diamond, - ["APAE"] = gVerEnum.Pearl, - ["APAS"] = gVerEnum.Pearl, - ["APAI"] = gVerEnum.Pearl, - ["APAF"] = gVerEnum.Pearl, - ["APAD"] = gVerEnum.Pearl, - ["APAJ"] = gVerEnum.Pearl, + ["APAE"] = GameVersions.Pearl, + ["APAS"] = GameVersions.Pearl, + ["APAI"] = GameVersions.Pearl, + ["APAF"] = GameVersions.Pearl, + ["APAD"] = GameVersions.Pearl, + ["APAJ"] = GameVersions.Pearl, - ["CPUE"] = gVerEnum.Platinum, - ["CPUS"] = gVerEnum.Platinum, - ["CPUI"] = gVerEnum.Platinum, - ["CPUF"] = gVerEnum.Platinum, - ["CPUD"] = gVerEnum.Platinum, - ["CPUJ"] = gVerEnum.Platinum, - ["CPUP"] = gVerEnum.Platinum, + ["CPUE"] = GameVersions.Platinum, + ["CPUS"] = GameVersions.Platinum, + ["CPUI"] = GameVersions.Platinum, + ["CPUF"] = GameVersions.Platinum, + ["CPUD"] = GameVersions.Platinum, + ["CPUJ"] = GameVersions.Platinum, + ["CPUP"] = GameVersions.Platinum, - ["IPKE"] = gVerEnum.HeartGold, - ["IPKS"] = gVerEnum.HeartGold, - ["IPKI"] = gVerEnum.HeartGold, - ["IPKF"] = gVerEnum.HeartGold, - ["IPKD"] = gVerEnum.HeartGold, - ["IPKJ"] = gVerEnum.HeartGold, + ["IPKE"] = GameVersions.HeartGold, + ["IPKS"] = GameVersions.HeartGold, + ["IPKI"] = GameVersions.HeartGold, + ["IPKF"] = GameVersions.HeartGold, + ["IPKD"] = GameVersions.HeartGold, + ["IPKJ"] = GameVersions.HeartGold, - ["IPGE"] = gVerEnum.SoulSilver, - ["IPGS"] = gVerEnum.SoulSilver, - ["IPGI"] = gVerEnum.SoulSilver, - ["IPGF"] = gVerEnum.SoulSilver, - ["IPGD"] = gVerEnum.SoulSilver, - ["IPGJ"] = gVerEnum.SoulSilver + ["IPGE"] = GameVersions.SoulSilver, + ["IPGS"] = GameVersions.SoulSilver, + ["IPGI"] = GameVersions.SoulSilver, + ["IPGF"] = GameVersions.SoulSilver, + ["IPGD"] = GameVersions.SoulSilver, + ["IPGJ"] = GameVersions.SoulSilver }; public static Dictionary MapCollisionPainters = new Dictionary() { diff --git a/DS_Map/Resources/ROMToolboxDB/ToolboxDB.cs b/DS_Map/Resources/ROMToolboxDB/ToolboxDB.cs index e577255..d844273 100644 --- a/DS_Map/Resources/ROMToolboxDB/ToolboxDB.cs +++ b/DS_Map/Resources/ROMToolboxDB/ToolboxDB.cs @@ -14,36 +14,36 @@ namespace DSPRE.Resources.ROMToolboxDB { internal uint initOffset; public static Dictionary arm9ExpansionCodeDB = new Dictionary() { - ["branchString" + "_" + RomInfo.gFamEnum.DP + "_" + RomInfo.gLangEnum.English] = "05 F1 34 FC", - ["branchString" + "_" + RomInfo.gFamEnum.DP + "_" + RomInfo.gLangEnum.Spanish] = "05 F1 04 FD", - ["branchString" + "_" + RomInfo.gFamEnum.Plat + "_" + RomInfo.gLangEnum.English] = "00 F1 B4 F8", - ["branchString" + "_" + RomInfo.gFamEnum.Plat + "_" + RomInfo.gLangEnum.Spanish] = "00 F1 B2 F9", - ["branchString" + "_" + RomInfo.gFamEnum.HGSS + "_" + RomInfo.gLangEnum.English] = "0F F1 30 FB", - ["branchString" + "_" + RomInfo.gFamEnum.HGSS + "_" + RomInfo.gLangEnum.Spanish] = "0F F1 40 FB", + ["branchString" + "_" + RomInfo.GameFamilies.DP + "_" + RomInfo.GameLanguages.English] = "05 F1 34 FC", + ["branchString" + "_" + RomInfo.GameFamilies.DP + "_" + RomInfo.GameLanguages.Spanish] = "05 F1 04 FD", + ["branchString" + "_" + RomInfo.GameFamilies.Plat + "_" + RomInfo.GameLanguages.English] = "00 F1 B4 F8", + ["branchString" + "_" + RomInfo.GameFamilies.Plat + "_" + RomInfo.GameLanguages.Spanish] = "00 F1 B2 F9", + ["branchString" + "_" + RomInfo.GameFamilies.HGSS + "_" + RomInfo.GameLanguages.English] = "0F F1 30 FB", + ["branchString" + "_" + RomInfo.GameFamilies.HGSS + "_" + RomInfo.GameLanguages.Spanish] = "0F F1 40 FB", - ["initString" + "_" + RomInfo.gFamEnum.DP] = "FC B5 05 48 C0 46 41 21 09 22 02 4D A8 47 00 20 03 21 FC BD F1 64 00 02 00 80 3C 02", //Valid for ENG and ESP, also for P - ["initString" + "_" + RomInfo.gFamEnum.Plat + "_" + RomInfo.gLangEnum.English] = "FC B5 05 48 C0 46 41 21 09 22 02 4D A8 47 00 20 03 21 FC BD A5 6A 00 02 00 80 3C 02", - ["initString" + "_" + RomInfo.gFamEnum.Plat + "_" + RomInfo.gLangEnum.Spanish] = "FC B5 05 48 C0 46 41 21 09 22 02 4D A8 47 00 20 03 21 FC BD B9 6A 00 02 00 80 3C 02", - ["initString" + "_" + RomInfo.gFamEnum.HGSS] = "FC B5 05 48 C0 46 1C 21 00 22 02 4D A8 47 00 20 03 21 FC BD 09 75 00 02 00 80 3C 02" //Valid for ENG and ESP, also for SS + ["initString" + "_" + RomInfo.GameFamilies.DP] = "FC B5 05 48 C0 46 41 21 09 22 02 4D A8 47 00 20 03 21 FC BD F1 64 00 02 00 80 3C 02", //Valid for ENG and ESP, also for P + ["initString" + "_" + RomInfo.GameFamilies.Plat + "_" + RomInfo.GameLanguages.English] = "FC B5 05 48 C0 46 41 21 09 22 02 4D A8 47 00 20 03 21 FC BD A5 6A 00 02 00 80 3C 02", + ["initString" + "_" + RomInfo.GameFamilies.Plat + "_" + RomInfo.GameLanguages.Spanish] = "FC B5 05 48 C0 46 41 21 09 22 02 4D A8 47 00 20 03 21 FC BD B9 6A 00 02 00 80 3C 02", + ["initString" + "_" + RomInfo.GameFamilies.HGSS] = "FC B5 05 48 C0 46 1C 21 00 22 02 4D A8 47 00 20 03 21 FC BD 09 75 00 02 00 80 3C 02" //Valid for ENG and ESP, also for SS }; public static Dictionary arm9ExpansionOffsetsDB = new Dictionary() { - ["branchOffset" + "_" + RomInfo.gFamEnum.DP] = 0x02000C80, //Valid also for P - ["branchOffset" + "_" + RomInfo.gFamEnum.Plat] = 0x02000CB4, - ["branchOffset" + "_" + RomInfo.gFamEnum.HGSS] = 0x02000CD0, //Valid also for SS + ["branchOffset" + "_" + RomInfo.GameFamilies.DP] = 0x02000C80, //Valid also for P + ["branchOffset" + "_" + RomInfo.GameFamilies.Plat] = 0x02000CB4, + ["branchOffset" + "_" + RomInfo.GameFamilies.HGSS] = 0x02000CD0, //Valid also for SS - ["initOffset" + "_" + RomInfo.gFamEnum.DP + "_" + RomInfo.gLangEnum.English] = 0x021064EC, - ["initOffset" + "_" + RomInfo.gFamEnum.DP + "_" + RomInfo.gLangEnum.Spanish] = 0x0210668C, - ["initOffset" + "_" + RomInfo.gFamEnum.Plat + "_" + RomInfo.gLangEnum.English] = 0x02100E20, - ["initOffset" + "_" + RomInfo.gFamEnum.Plat + "_" + RomInfo.gLangEnum.Spanish] = 0x0210101C, - ["initOffset" + "_" + RomInfo.gFamEnum.HGSS + "_" + RomInfo.gLangEnum.English] = 0x02110334, - ["initOffset" + "_" + RomInfo.gFamEnum.HGSS + "_" + RomInfo.gLangEnum.Spanish] = 0x02110354 + ["initOffset" + "_" + RomInfo.GameFamilies.DP + "_" + RomInfo.GameLanguages.English] = 0x021064EC, + ["initOffset" + "_" + RomInfo.GameFamilies.DP + "_" + RomInfo.GameLanguages.Spanish] = 0x0210668C, + ["initOffset" + "_" + RomInfo.GameFamilies.Plat + "_" + RomInfo.GameLanguages.English] = 0x02100E20, + ["initOffset" + "_" + RomInfo.GameFamilies.Plat + "_" + RomInfo.GameLanguages.Spanish] = 0x0210101C, + ["initOffset" + "_" + RomInfo.GameFamilies.HGSS + "_" + RomInfo.GameLanguages.English] = 0x02110334, + ["initOffset" + "_" + RomInfo.GameFamilies.HGSS + "_" + RomInfo.GameLanguages.Spanish] = 0x02110354 }; internal ARM9PatchData() { branchOffset = arm9ExpansionOffsetsDB[nameof(branchOffset) + "_" + RomInfo.gameFamily] - DSUtils.ARM9.address; initOffset = arm9ExpansionOffsetsDB[nameof(initOffset) + "_" + RomInfo.gameFamily + "_" + RomInfo.gameLanguage] - DSUtils.ARM9.address; branchString = arm9ExpansionCodeDB[nameof(branchString) + "_" + RomInfo.gameFamily + "_" + RomInfo.gameLanguage]; - if (RomInfo.gameFamily == gFamEnum.Plat) { + if (RomInfo.gameFamily == GameFamilies.Plat) { initString = arm9ExpansionCodeDB[nameof(initString) + "_" + RomInfo.gameFamily + "_" + RomInfo.gameLanguage]; } else { initString = arm9ExpansionCodeDB[nameof(initString) + "_" + RomInfo.gameFamily]; @@ -65,32 +65,32 @@ namespace DSPRE.Resources.ROMToolboxDB { internal byte[] subroutine; public static Dictionary BDHCamCodeDB = new Dictionary() { - ["branchString" + "_" + RomInfo.gFamEnum.Plat + "_" + RomInfo.gLangEnum.English] = "B9 F3 E2 F8", - ["branchString" + "_" + RomInfo.gFamEnum.Plat + "_" + RomInfo.gLangEnum.Spanish] = "B9 F3 AA F8", - ["branchString" + "_" + RomInfo.gFamEnum.HGSS] = "B6 F3 2E FA", //Also valid for SS, both ESP and ENG + ["branchString" + "_" + RomInfo.GameFamilies.Plat + "_" + RomInfo.GameLanguages.English] = "B9 F3 E2 F8", + ["branchString" + "_" + RomInfo.GameFamilies.Plat + "_" + RomInfo.GameLanguages.Spanish] = "B9 F3 AA F8", + ["branchString" + "_" + RomInfo.GameFamilies.HGSS] = "B6 F3 2E FA", //Also valid for SS, both ESP and ENG ["overlayString1"] = "00 4B 18 47 41 9C 3D 02", ["overlayString2"] = "00 4B 18 47 01 9C 3D 02", }; public static Dictionary BDHCamOffsetsDB = new Dictionary() { - ["branchOffset" + "_" + RomInfo.gFamEnum.Plat + "_" + RomInfo.gLangEnum.English] = 0x0202040C, - ["branchOffset" + "_" + RomInfo.gFamEnum.Plat + "_" + RomInfo.gLangEnum.Spanish] = 0x0202047C, - ["branchOffset" + "_" + RomInfo.gFamEnum.HGSS] = 0x02023174, //Also valid for SS, both ESP and ENG + ["branchOffset" + "_" + RomInfo.GameFamilies.Plat + "_" + RomInfo.GameLanguages.English] = 0x0202040C, + ["branchOffset" + "_" + RomInfo.GameFamilies.Plat + "_" + RomInfo.GameLanguages.Spanish] = 0x0202047C, + ["branchOffset" + "_" + RomInfo.GameFamilies.HGSS] = 0x02023174, //Also valid for SS, both ESP and ENG - ["overlayOffset1" + "_" + RomInfo.gFamEnum.Plat + "_" + RomInfo.gLangEnum.English] = 0x0001E1B4, - ["overlayOffset1" + "_" + RomInfo.gFamEnum.Plat + "_" + RomInfo.gLangEnum.Spanish] = 0x0001E1BC, - ["overlayOffset1" + "_" + RomInfo.gFamEnum.HGSS] = 0x0001574C, + ["overlayOffset1" + "_" + RomInfo.GameFamilies.Plat + "_" + RomInfo.GameLanguages.English] = 0x0001E1B4, + ["overlayOffset1" + "_" + RomInfo.GameFamilies.Plat + "_" + RomInfo.GameLanguages.Spanish] = 0x0001E1BC, + ["overlayOffset1" + "_" + RomInfo.GameFamilies.HGSS] = 0x0001574C, - ["overlayOffset2" + "_" + RomInfo.gFamEnum.Plat + "_" + RomInfo.gLangEnum.English] = 0x0001E2CC, - ["overlayOffset2" + "_" + RomInfo.gFamEnum.Plat + "_" + RomInfo.gLangEnum.Spanish] = 0x0001E2D4, - ["overlayOffset2" + "_" + RomInfo.gFamEnum.HGSS] = 0x00015864, + ["overlayOffset2" + "_" + RomInfo.GameFamilies.Plat + "_" + RomInfo.GameLanguages.English] = 0x0001E2CC, + ["overlayOffset2" + "_" + RomInfo.GameFamilies.Plat + "_" + RomInfo.GameLanguages.Spanish] = 0x0001E2D4, + ["overlayOffset2" + "_" + RomInfo.GameFamilies.HGSS] = 0x00015864, }; public static uint BDHCamSubroutineOffset = 0x000115B0; internal BDHCAMPatchData() { switch (RomInfo.gameFamily) { - case gFamEnum.Plat: + case GameFamilies.Plat: overlayNumber = 5; branchString = BDHCamCodeDB[nameof(branchString) + "_" + RomInfo.gameFamily + "_" + RomInfo.gameLanguage]; @@ -98,7 +98,7 @@ namespace DSPRE.Resources.ROMToolboxDB { overlayOffset1 = BDHCamOffsetsDB[nameof(overlayOffset1) + "_" + RomInfo.gameFamily + "_" + RomInfo.gameLanguage]; overlayOffset2 = BDHCamOffsetsDB[nameof(overlayOffset2) + "_" + RomInfo.gameFamily + "_" + RomInfo.gameLanguage]; break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: overlayNumber = 1; branchString = BDHCamCodeDB[nameof(branchString) + "_" + RomInfo.gameFamily]; @@ -167,9 +167,9 @@ namespace DSPRE.Resources.ROMToolboxDB { return "00 B5 01 1C 32 20 00 22 CC F7 58 F9 03 1C DF F7 49 FC 00 BD"; } } - public static Dictionary[]> dynamicHeadersPointersDB = new Dictionary[]>() { + public static Dictionary[]> dynamicHeadersPointersDB = new Dictionary[]>() { // format: headerID*18 offset, (ARM9_HEADER_TABLE_OFFSET + n) offset - [gFamEnum.Plat] = new Tuple[] { + [GameFamilies.Plat] = new Tuple[] { new Tuple(0x3A03E, 0x3A048), new Tuple(0x3A052, 0x3A05C), new Tuple(0x3A066, 0x3A080), @@ -191,7 +191,7 @@ namespace DSPRE.Resources.ROMToolboxDB { new Tuple(0x3A1F6, 0x3A208), new Tuple(0x3A212, 0x3A224), }, - [gFamEnum.HGSS] = new Tuple[] { + [GameFamilies.HGSS] = new Tuple[] { new Tuple(0x3B282, 0x3B28C), new Tuple(0x3B296, 0x3B2A8), new Tuple(0x3B2B2, 0x3B2BC), @@ -225,7 +225,7 @@ namespace DSPRE.Resources.ROMToolboxDB { initOffset = getDynamicHeadersInitOffset(RomInfo.romID); initString = getDynamicHeadersInitString(RomInfo.romID); - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { pointerDiff = (int)(initOffset - getDynamicHeadersInitOffset("IPKE")); } else { pointerDiff = (int)(initOffset - getDynamicHeadersInitOffset("CPUE")); @@ -233,10 +233,10 @@ namespace DSPRE.Resources.ROMToolboxDB { } } - public static Dictionary syntheticOverlayFileNumbersDB = new Dictionary() { - [gFamEnum.DP] = 9, - [gFamEnum.Plat] = 9, - [gFamEnum.HGSS] = 0, + public static Dictionary syntheticOverlayFileNumbersDB = new Dictionary() { + [GameFamilies.DP] = 9, + [GameFamilies.Plat] = 9, + [GameFamilies.HGSS] = 0, }; public static Dictionary matrixExpansionDB = new Dictionary() { diff --git a/DS_Map/RomInfo.cs b/DS_Map/RomInfo.cs index 8420125..a77297e 100644 --- a/DS_Map/RomInfo.cs +++ b/DS_Map/RomInfo.cs @@ -6,7 +6,6 @@ using System.Linq; using DSPRE.Resources; using System; using DSPRE.ROMFiles; -using static DSPRE.RomInfo; namespace DSPRE { @@ -15,49 +14,44 @@ namespace DSPRE { /// public class RomInfo { + public static readonly byte internalNameLength = 16; + public static uint synthOverlayLoadAddress = 0x023C8000; + public Dictionary, (Color background, Color foreground)> MapCellsColorDictionary; public static string folderSuffix = "_DSPRE_contents"; + const string dataFolderName = @"data"; + public static string romID { get; private set; } public static string fileName { get; private set; } public static string workDir { get; private set; } public static string arm9Path { get; private set; } + public static string arm7Path { get; private set; } public static string overlayTablePath { get; set; } + public static string y7Path { get; set; } + public static string dataPath { get; set; } public static string overlayPath { get; set; } - - public static gLangEnum gameLanguage { get; private set; } - public static gVerEnum gameVersion { get; private set; } - public static gFamEnum gameFamily { get; private set; } - - - public static uint synthOverlayLoadAddress = 0x023C8000; + public static string unpackedPath { get; set; } + public static string bannerPath { get; set; } + public static string headerPath { get; set; } + public static GameLanguages gameLanguage { get; private set; } + public static GameVersions gameVersion { get; private set; } + public static GameFamilies gameFamily { get; private set; } public static uint arm9spawnOffset { get; private set; } - public static int initialMoneyOverlayNumber { get; private set; } public static uint initialMoneyOverlayOffset { get; private set; } - public static int cameraTblOverlayNumber { get; private set; } public static uint[] cameraTblOffsetsToRAMaddress { get; private set; } - public static uint headerTableOffset { get; private set; } - public static uint conditionalMusicTableOffsetToRAMAddress { get; internal set; } public static uint encounterMusicTableOffsetToRAMAddress { get; internal set; } - public static uint vsTrainerEntryTableOffsetToRAMAddress { get; internal set; } public static uint vsPokemonEntryTableOffsetToRAMAddress { get; internal set; } public static uint effectsComboTableOffsetToRAMAddress { get; internal set; } - public static uint vsTrainerEntryTableOffsetToSizeLimiter { get; internal set; } public static uint vsPokemonEntryTableOffsetToSizeLimiter { get; internal set; } public static uint effectsComboTableOffsetToSizeLimiter { get; internal set; } - - public static uint OWTableOffset { get; internal set; } public static string OWtablePath { get; private set; } - - public static uint monIconPalTableAddress { get; private set; } - public static int nullEncounterID { get; private set; } - public static int abilityNamesTextNumber { get; private set; } public static int attackNamesTextNumber { get; private set; } public static int[] pokemonNamesTextNumbers { get; private set; } public static int itemNamesTextNumber { get; private set; } @@ -65,37 +59,26 @@ namespace DSPRE { public static int trainerClassMessageNumber { get; private set; } public static int trainerNamesMessageNumber { get; private set; } public static int locationNamesTextNumber { get; private set; } - public static int trainerNameLenOffset { get; private set; } - public static int trainerNameMaxLen { get; private set; } - - public static string internalNamesLocation { get; private set; } - public static readonly byte internalNameLength = 16; + public static string internalNamesPath { get; private set; } public static int cameraSize { get; private set; } - - public Dictionary, (Color background, Color foreground)> MapCellsColorDictionary; public static SortedDictionary OverworldTable { get; private set; } public static uint[] overworldTableKeys { get; private set; } public static Dictionary ow3DSpriteDict { get; private set; } - - public static Dictionary ScriptCommandNamesDict { get; private set; } public static Dictionary ScriptCommandNamesReverseDict { get; private set; } - public static Dictionary ScriptActionNamesDict { get; private set; } public static Dictionary ScriptActionNamesReverseDict { get; private set; } - public static Dictionary ScriptCommandParametersDict { get; private set; } - public static Dictionary ScriptComparisonOperatorsDict { get; private set; } public static Dictionary ScriptComparisonOperatorsReverseDict { get; private set; } - public enum gVerEnum : byte { + public enum GameVersions : byte { Diamond, Pearl, Platinum, HeartGold, SoulSilver, Black, White, Black2, White2 } - public enum gFamEnum : byte { + public enum GameFamilies : byte { NULL, DP, Plat, @@ -103,7 +86,7 @@ namespace DSPRE { BW, BW2 } - public enum gLangEnum : byte { + public enum GameLanguages : byte { English, Japanese, @@ -113,8 +96,6 @@ namespace DSPRE { German } public enum DirNames : byte { - personalPokeData, - synthOverlay, dynamicHeaders, @@ -132,7 +113,10 @@ namespace DSPRE { OWSprites, scripts, + encounters, + headbutt, + safariZone, trainerProperties, trainerParty, @@ -140,24 +124,29 @@ namespace DSPRE { monIcons, - interiorBuildingModels, - learnsets, - evolutions + interiorBuildingModels }; public static Dictionary gameDirs { get; private set; } - #region Constructors (1) public RomInfo(string id, string romName, bool useSuffix = true) { if (!useSuffix) { folderSuffix = ""; } - workDir = Path.GetDirectoryName(romName) + "\\" + Path.GetFileNameWithoutExtension(romName) + folderSuffix + "\\"; - arm9Path = workDir + @"arm9.bin"; - overlayTablePath = workDir + @"y9.bin"; - overlayPath = workDir + "overlay"; - internalNamesLocation = workDir + @"data\fielddata\maptable\mapname.bin"; + string path = Path.GetDirectoryName(romName) + "\\" + Path.GetFileNameWithoutExtension(romName) + folderSuffix + "\\"; + + workDir = path; + arm9Path = Path.Combine(workDir, @"arm9.bin"); + arm7Path = Path.Combine(workDir, @"arm7.bin"); + overlayTablePath = Path.Combine(workDir, @"y9.bin"); + y7Path = Path.Combine(workDir, @"y7.bin"); + dataPath = Path.Combine(workDir, dataFolderName); + overlayPath = Path.Combine(workDir, @"overlay"); + bannerPath = Path.Combine(workDir, @"banner.bin"); + headerPath = Path.Combine(workDir, @"header.bin"); + unpackedPath = Path.Combine(workDir, @"unpacked"); + internalNamesPath = Path.Combine(workDir, $@"{dataFolderName}\fielddata\maptable\mapname.bin"); try { gameVersion = PokeDatabase.System.versionsDict[id]; @@ -177,7 +166,6 @@ namespace DSPRE { SetHeaderTableOffset(); SetNullEncounterID(); - SetAbilityNamesTextNumber(); SetAttackNamesTextNumber(); SetPokemonNamesTextNumber(); SetItemNamesTextNumber(); @@ -185,7 +173,6 @@ namespace DSPRE { SetLocationNamesTextNumber(); SetTrainerNamesMessageNumber(); SetTrainerClassMessageNumber(); - SetTrainerNameLenOffset(); /* System */ ScriptCommandParametersDict = BuildCommandParametersDatabase(gameFamily); @@ -201,16 +188,16 @@ namespace DSPRE { #endregion #region Methods (22) - public static Dictionary BuildCommandNamesDatabase(gFamEnum gameFam) { + public static Dictionary BuildCommandNamesDatabase(GameFamilies gameFam) { Dictionary commonDictionaryNames; Dictionary specificDictionaryNames; switch (gameFam) { - case gFamEnum.DP: + case GameFamilies.DP: commonDictionaryNames = ScriptDatabase.DPPtScrCmdNames; specificDictionaryNames = ScriptDatabase.DPScrCmdNames; break; - case gFamEnum.Plat: + case GameFamilies.Plat: commonDictionaryNames = ScriptDatabase.DPPtScrCmdNames; specificDictionaryNames = ScriptDatabase.PlatScrCmdNames; break; @@ -225,16 +212,16 @@ namespace DSPRE { } return commonDictionaryNames.Concat(specificDictionaryNames).ToLookup(x => x.Key, x => x.Value).ToDictionary(x => x.Key, g => g.First()); } - public static Dictionary BuildCommandParametersDatabase(gFamEnum gameFam) { + public static Dictionary BuildCommandParametersDatabase(GameFamilies gameFam) { Dictionary commonDictionaryParams; Dictionary specificDictionaryParams; switch (gameFam) { - case gFamEnum.DP: + case GameFamilies.DP: commonDictionaryParams = ScriptDatabase.DPPtScrCmdParameters; specificDictionaryParams = ScriptDatabase.DPScrCmdParameters; break; - case gFamEnum.Plat: + case GameFamilies.Plat: commonDictionaryParams = ScriptDatabase.DPPtScrCmdParameters; specificDictionaryParams = ScriptDatabase.PlatScrCmdParameters; break; @@ -249,10 +236,10 @@ namespace DSPRE { } return commonDictionaryParams.Concat(specificDictionaryParams).ToLookup(x => x.Key, x => x.Value).ToDictionary(x => x.Key, g => g.First()); } - public static Dictionary BuildActionNamesDatabase(gFamEnum gameFam) { + public static Dictionary BuildActionNamesDatabase(GameFamilies gameFam) { switch (gameFam) { - case gFamEnum.DP: - case gFamEnum.Plat: + case GameFamilies.DP: + case GameFamilies.Plat: return ScriptDatabase.movementsDictIDName; default: #if false @@ -264,11 +251,11 @@ namespace DSPRE { #endif } } - public static Dictionary BuildComparisonOperatorsDatabase(gFamEnum gameFam) { + public static Dictionary BuildComparisonOperatorsDatabase(GameFamilies gameFam) { switch (gameFam) { - case gFamEnum.DP: - case gFamEnum.Plat: - case gFamEnum.HGSS: + case GameFamilies.DP: + case GameFamilies.Plat: + case GameFamilies.HGSS: return ScriptDatabase.comparisonOperatorsDict; default: var commonDict = ScriptDatabase.comparisonOperatorsDict; @@ -290,68 +277,68 @@ namespace DSPRE { } public static void SetHeaderTableOffset() { switch (gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: switch (gameLanguage) { - case gLangEnum.English: + case GameLanguages.English: headerTableOffset = 0xEEDBC; break; - case gLangEnum.Spanish: + case GameLanguages.Spanish: headerTableOffset = 0xEEE08; break; - case gLangEnum.Italian: + case GameLanguages.Italian: headerTableOffset = 0xEED70; break; - case gLangEnum.French: + case GameLanguages.French: headerTableOffset = 0xEEDFC; break; - case gLangEnum.German: + case GameLanguages.German: headerTableOffset = 0xEEDCC; break; - case gLangEnum.Japanese: - headerTableOffset = gameVersion == gVerEnum.Diamond ? (uint)0xF0D68 : 0xF0D6C; + case GameLanguages.Japanese: + headerTableOffset = gameVersion == GameVersions.Diamond ? (uint)0xF0D68 : 0xF0D6C; break; } break; - case gFamEnum.Plat: + case GameFamilies.Plat: switch (gameLanguage) { - case gLangEnum.English: + case GameLanguages.English: headerTableOffset = 0xE601C; break; - case gLangEnum.Spanish: + case GameLanguages.Spanish: headerTableOffset = 0xE60B0; break; - case gLangEnum.Italian: + case GameLanguages.Italian: headerTableOffset = 0xE6038; break; - case gLangEnum.French: + case GameLanguages.French: headerTableOffset = 0xE60A4; break; - case gLangEnum.German: + case GameLanguages.German: headerTableOffset = 0xE6074; break; - case gLangEnum.Japanese: + case GameLanguages.Japanese: headerTableOffset = 0xE56F0; break; } break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: switch (gameLanguage) { - case gLangEnum.English: + case GameLanguages.English: headerTableOffset = 0xF6BE0; break; - case gLangEnum.Spanish: - headerTableOffset = gameVersion == gVerEnum.HeartGold ? 0xF6BC8 : (uint)0xF6BD0; + case GameLanguages.Spanish: + headerTableOffset = gameVersion == GameVersions.HeartGold ? 0xF6BC8 : (uint)0xF6BD0; break; - case gLangEnum.Italian: + case GameLanguages.Italian: headerTableOffset = 0xF6B58; break; - case gLangEnum.French: + case GameLanguages.French: headerTableOffset = 0xF6BC4; break; - case gLangEnum.German: + case GameLanguages.German: headerTableOffset = 0xF6B94; break; - case gLangEnum.Japanese: + case GameLanguages.Japanese: headerTableOffset = 0xF6390; break; } @@ -360,74 +347,74 @@ namespace DSPRE { } public static void SetupSpawnSettings() { switch (gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: initialMoneyOverlayNumber = 52; initialMoneyOverlayOffset = 0x1E4; switch (gameLanguage) { - case gLangEnum.English: + case GameLanguages.English: arm9spawnOffset = 0xF2B9C; break; - case gLangEnum.Spanish: + case GameLanguages.Spanish: arm9spawnOffset = 0xF2BE8; break; - case gLangEnum.Italian: + case GameLanguages.Italian: arm9spawnOffset = 0xF2B50; break; - case gLangEnum.French: + case GameLanguages.French: arm9spawnOffset = 0xF2BDC; break; - case gLangEnum.German: + case GameLanguages.German: arm9spawnOffset = 0xF2BAC; break; - case gLangEnum.Japanese: + case GameLanguages.Japanese: arm9spawnOffset = 0xF4B48; break; } break; - case gFamEnum.Plat: + case GameFamilies.Plat: initialMoneyOverlayNumber = 57; initialMoneyOverlayOffset = 0x1EC; switch (gameLanguage) { - case gLangEnum.English: + case GameLanguages.English: arm9spawnOffset = 0xEA12C; break; - case gLangEnum.Spanish: + case GameLanguages.Spanish: arm9spawnOffset = 0xEA1C0; break; - case gLangEnum.Italian: + case GameLanguages.Italian: arm9spawnOffset = 0xEA148; break; - case gLangEnum.French: + case GameLanguages.French: arm9spawnOffset = 0xEA1B4; break; - case gLangEnum.German: + case GameLanguages.German: arm9spawnOffset = 0xEA184; break; - case gLangEnum.Japanese: + case GameLanguages.Japanese: arm9spawnOffset = 0xE9800; break; } break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: initialMoneyOverlayNumber = 36; initialMoneyOverlayOffset = 0x2FC; switch (gameLanguage) { - case gLangEnum.English: + case GameLanguages.English: arm9spawnOffset = 0xFA17C; break; - case gLangEnum.Spanish: - arm9spawnOffset = gameVersion == gVerEnum.HeartGold ? 0xFA164 : (uint)0xFA16C; + case GameLanguages.Spanish: + arm9spawnOffset = gameVersion == GameVersions.HeartGold ? 0xFA164 : (uint)0xFA16C; break; - case gLangEnum.Italian: + case GameLanguages.Italian: arm9spawnOffset = 0xFA0F4; break; - case gLangEnum.French: + case GameLanguages.French: arm9spawnOffset = 0xFA160; break; - case gLangEnum.German: + case GameLanguages.German: arm9spawnOffset = 0xFA130; break; - case gLangEnum.Japanese: + case GameLanguages.Japanese: arm9spawnOffset = 0xF992C; break; } @@ -436,28 +423,28 @@ namespace DSPRE { } public static void PrepareCameraData() { switch (gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: cameraTblOverlayNumber = 5; - cameraTblOffsetsToRAMaddress = gameLanguage.Equals(gLangEnum.Japanese) ? (new uint[] { 0x4C50 }) : (new uint[] { 0x4908 }); + cameraTblOffsetsToRAMaddress = gameLanguage.Equals(GameLanguages.Japanese) ? (new uint[] { 0x4C50 }) : (new uint[] { 0x4908 }); cameraSize = 24; break; - case gFamEnum.Plat: + case GameFamilies.Plat: cameraTblOverlayNumber = 5; cameraTblOffsetsToRAMaddress = new uint[] { 0x4E24 }; cameraSize = 24; break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: cameraTblOverlayNumber = 1; cameraSize = 36; switch (gameLanguage) { - case gLangEnum.English: - case gLangEnum.Spanish: - case gLangEnum.French: - case gLangEnum.German: - case gLangEnum.Italian: + case GameLanguages.English: + case GameLanguages.Spanish: + case GameLanguages.French: + case GameLanguages.German: + case GameLanguages.Italian: cameraTblOffsetsToRAMaddress = new uint[] { 0x532C, 0x547C }; break; - case gLangEnum.Japanese: + case GameLanguages.Japanese: cameraTblOffsetsToRAMaddress = new uint[] { 0x5324, 0x5474 }; break; } @@ -466,13 +453,13 @@ namespace DSPRE { } public static void SetOWtable() { switch (gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: OWtablePath = DSUtils.GetOverlayPath(5); switch (gameLanguage) { // Go to the beginning of the overworld table - case gLangEnum.English: + case GameLanguages.English: OWTableOffset = 0x22BCC; break; - case gLangEnum.Japanese: + case GameLanguages.Japanese: OWTableOffset = 0x23BB8; break; default: @@ -480,20 +467,20 @@ namespace DSPRE { break; } break; - case gFamEnum.Plat: + case GameFamilies.Plat: OWtablePath = DSUtils.GetOverlayPath(5); switch (gameLanguage) { // Go to the beginning of the overworld table - case gLangEnum.Italian: + case GameLanguages.Italian: OWTableOffset = 0x2BC44; break; - case gLangEnum.French: - case gLangEnum.Spanish: + case GameLanguages.French: + case GameLanguages.Spanish: OWTableOffset = 0x2BC3C; break; - case gLangEnum.German: + case GameLanguages.German: OWTableOffset = 0x2BC50; break; - case gLangEnum.Japanese: + case GameLanguages.Japanese: OWTableOffset = 0x2BA24; break; default: @@ -501,7 +488,7 @@ namespace DSPRE { break; } break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: if (DSUtils.CheckOverlayHasCompressionFlag(1)) { if (DSUtils.OverlayIsCompressed(1)) { if (DSUtils.DecompressOverlay(1) < 0) { @@ -516,17 +503,17 @@ namespace DSPRE { int ramAddrOfPointer; switch (gameLanguage) { - case gLangEnum.Italian: + case GameLanguages.Italian: ramAddrOfPointer = 0x021F929C; break; - case gLangEnum.French: - case gLangEnum.Spanish: + case GameLanguages.French: + case GameLanguages.Spanish: ramAddrOfPointer = 0x021F931C; break; - case gLangEnum.German: + case GameLanguages.German: ramAddrOfPointer = 0x021F92DC; break; - case gLangEnum.Japanese: + case GameLanguages.Japanese: ramAddrOfPointer = 0x021F86C4; break; default: @@ -536,21 +523,14 @@ namespace DSPRE { using (DSUtils.EasyReader bReader = new DSUtils.EasyReader(ov1Path, ramAddrOfPointer - ov1Address)) { // read the pointer at the specified ram address and adjust accordingly below uint ramAddressOfTable = bReader.ReadUInt32(); - if ((ramAddressOfTable >> 0x18) != 0x02) { + if (ramAddressOfTable >= 0x03000000) { MessageBox.Show("Something went wrong reading the Overworld configuration table.\nOverworld sprites in the Event Editor will be " + "displayed incorrectly or not displayed at all.", "Decompression error", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } - - string ov131path = DSUtils.GetOverlayPath(131); - if (File.Exists(ov131path)) { - // if HGE field extension overlay exists - OWTableOffset = ramAddressOfTable - DSUtils.GetOverlayRAMAddress(131); - OWtablePath = ov131path; - } else if (ramAddressOfTable >= RomInfo.synthOverlayLoadAddress) { - // if the pointer shows the table was moved to the synthetic overlay + if (ramAddressOfTable >= RomInfo.synthOverlayLoadAddress) { // if the pointer shows the table was moved to the synthetic overlay OWTableOffset = ramAddressOfTable - RomInfo.synthOverlayLoadAddress; - OWtablePath = gameDirs[DirNames.synthOverlay].unpackedDir + "\\" + ROMToolboxDialog.expandedARMfileID.ToString("D4"); + OWtablePath = Filesystem.expArmPath; } else { OWTableOffset = ramAddressOfTable - ov1Address; OWtablePath = ov1Path; @@ -561,18 +541,18 @@ namespace DSPRE { } public static void SetConditionalMusicTableOffsetToRAMAddress() { switch (gameFamily) { - case gFamEnum.HGSS: + case GameFamilies.HGSS: switch (gameLanguage) { - case gLangEnum.Spanish: - conditionalMusicTableOffsetToRAMAddress = gameVersion == gVerEnum.HeartGold ? (uint)0x667D0 : 0x667D8; + case GameLanguages.Spanish: + conditionalMusicTableOffsetToRAMAddress = gameVersion == GameVersions.HeartGold ? (uint)0x667D0 : 0x667D8; break; - case gLangEnum.English: - case gLangEnum.Italian: - case gLangEnum.French: - case gLangEnum.German: + case GameLanguages.English: + case GameLanguages.Italian: + case GameLanguages.French: + case GameLanguages.German: conditionalMusicTableOffsetToRAMAddress = 0x667D8; break; - case gLangEnum.Japanese: + case GameLanguages.Japanese: conditionalMusicTableOffsetToRAMAddress = 0x66238; break; } @@ -581,22 +561,22 @@ namespace DSPRE { } public static void SetBattleEffectsData() { switch (gameFamily) { - case gFamEnum.HGSS: + case GameFamilies.HGSS: switch (gameLanguage) { - case gLangEnum.Spanish: - vsPokemonEntryTableOffsetToRAMAddress = gameVersion == gVerEnum.HeartGold ? (uint)0x518CC : 0x518D4; - vsTrainerEntryTableOffsetToRAMAddress = gameVersion == gVerEnum.HeartGold ? (uint)0x51888 : 0x51890; - effectsComboTableOffsetToRAMAddress = gameVersion == gVerEnum.HeartGold ? (uint)0x517C0 : 0x517C8; + case GameLanguages.Spanish: + vsPokemonEntryTableOffsetToRAMAddress = gameVersion == GameVersions.HeartGold ? (uint)0x518CC : 0x518D4; + vsTrainerEntryTableOffsetToRAMAddress = gameVersion == GameVersions.HeartGold ? (uint)0x51888 : 0x51890; + effectsComboTableOffsetToRAMAddress = gameVersion == GameVersions.HeartGold ? (uint)0x517C0 : 0x517C8; break; - case gLangEnum.English: - case gLangEnum.Italian: - case gLangEnum.French: - case gLangEnum.German: + case GameLanguages.English: + case GameLanguages.Italian: + case GameLanguages.French: + case GameLanguages.German: vsPokemonEntryTableOffsetToRAMAddress = 0x518D4; vsTrainerEntryTableOffsetToRAMAddress = 0x51890; effectsComboTableOffsetToRAMAddress = 0x517C8; break; - case gLangEnum.Japanese: + case GameLanguages.Japanese: vsPokemonEntryTableOffsetToRAMAddress = 0x5136C; vsTrainerEntryTableOffsetToRAMAddress = 0x51328; effectsComboTableOffsetToRAMAddress = 0x51260; @@ -607,18 +587,18 @@ namespace DSPRE { effectsComboTableOffsetToSizeLimiter = effectsComboTableOffsetToRAMAddress - 0x1E; break; - case gFamEnum.Plat: + case GameFamilies.Plat: switch (gameLanguage) { - case gLangEnum.English: + case GameLanguages.English: effectsComboTableOffsetToRAMAddress = 0x51BE0; break; - case gLangEnum.Italian: - case gLangEnum.French: - case gLangEnum.Spanish: - case gLangEnum.German: + case GameLanguages.Italian: + case GameLanguages.French: + case GameLanguages.Spanish: + case GameLanguages.German: effectsComboTableOffsetToRAMAddress = 0x51C84; break; - case gLangEnum.Japanese: + case GameLanguages.Japanese: effectsComboTableOffsetToRAMAddress = 0x514C0; break; } @@ -627,130 +607,64 @@ namespace DSPRE { } public static void SetEncounterMusicTableOffsetToRAMAddress() { switch (gameFamily) { - case gFamEnum.HGSS: + case GameFamilies.HGSS: switch (gameLanguage) { - case gLangEnum.Spanish: - encounterMusicTableOffsetToRAMAddress = gameVersion == gVerEnum.HeartGold ? (uint)0x550D8 : 0x550E0; + case GameLanguages.Spanish: + encounterMusicTableOffsetToRAMAddress = gameVersion == GameVersions.HeartGold ? (uint)0x550D8 : 0x550E0; break; - case gLangEnum.English: - case gLangEnum.Italian: - case gLangEnum.French: - case gLangEnum.German: + case GameLanguages.English: + case GameLanguages.Italian: + case GameLanguages.French: + case GameLanguages.German: encounterMusicTableOffsetToRAMAddress = 0x550E0; break; - case gLangEnum.Japanese: + case GameLanguages.Japanese: encounterMusicTableOffsetToRAMAddress = 0x54B44; break; } break; - case gFamEnum.Plat: + case GameFamilies.Plat: switch (gameLanguage) { - case gLangEnum.English: + case GameLanguages.English: encounterMusicTableOffsetToRAMAddress = 0x5563C; break; - case gLangEnum.Italian: - case gLangEnum.French: - case gLangEnum.Spanish: - case gLangEnum.German: + case GameLanguages.Italian: + case GameLanguages.French: + case GameLanguages.Spanish: + case GameLanguages.German: encounterMusicTableOffsetToRAMAddress = 0x556E0; break; - case gLangEnum.Japanese: + case GameLanguages.Japanese: encounterMusicTableOffsetToRAMAddress = 0x54F04; break; } break; - case gFamEnum.DP: + case GameFamilies.DP: switch (gameLanguage) { - case gLangEnum.English: + case GameLanguages.English: encounterMusicTableOffsetToRAMAddress = 0x4AD3C; break; - case gLangEnum.Italian: - case gLangEnum.French: - case gLangEnum.Spanish: - case gLangEnum.German: + case GameLanguages.Italian: + case GameLanguages.French: + case GameLanguages.Spanish: + case GameLanguages.German: encounterMusicTableOffsetToRAMAddress = 0x4ADAC; break; - case gLangEnum.Japanese: + case GameLanguages.Japanese: encounterMusicTableOffsetToRAMAddress = 0x4D9AC; break; } break; } } - public static void SetMonIconsPalTableAddress() { - switch (RomInfo.gameFamily) { - case gFamEnum.DP: - switch (gameLanguage) { - case gLangEnum.English: - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x6B838, 4), 0); - break; - case gLangEnum.Italian: - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x6B874, 4), 0); - break; - case gLangEnum.German: - case gLangEnum.French: - case gLangEnum.Spanish: - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x6B894, 4), 0); - break; - case gLangEnum.Japanese: - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x6FDEC, 4), 0); - break; - } - break; - case gFamEnum.Plat: - switch (gameLanguage) { - case gLangEnum.English: - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x79F80, 4), 0); - break; - case gLangEnum.Italian: - case gLangEnum.German: - case gLangEnum.French: - case gLangEnum.Spanish: - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x7A020, 4), 0); - break; - case gLangEnum.Japanese: - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x79858, 4), 0); - break; - } - break; - case gFamEnum.HGSS: - default: - switch (gameLanguage) { - case gLangEnum.English: - case gLangEnum.Italian: - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x74408, 4), 0); - break; - case gLangEnum.German: - if (gameVersion == gVerEnum.HeartGold) { - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x74408, 4), 0); - } else { - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x74400, 4), 0); - } - break; - case gLangEnum.French: - case gLangEnum.Spanish: - if (gameVersion == gVerEnum.HeartGold) { - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x74400, 4), 0); - } else { - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x74408, 4), 0); - } - break; - case gLangEnum.Japanese: - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x73EA0, 4), 0); - break; - } - break; - } - } - - private static void SetItemScriptFileNumber() { + private void SetItemScriptFileNumber() { switch (gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: itemScriptFileNumber = 370; break; - case gFamEnum.Plat: + case GameFamilies.Plat: itemScriptFileNumber = 404; break; default: @@ -758,208 +672,110 @@ namespace DSPRE { break; } } - private static void SetNullEncounterID() { + private void SetNullEncounterID() { switch (gameFamily) { - case gFamEnum.DP: - case gFamEnum.Plat: + case GameFamilies.DP: + case GameFamilies.Plat: nullEncounterID = ushort.MaxValue; break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: nullEncounterID = Byte.MaxValue; break; } } - - private static void SetAbilityNamesTextNumber() { + private void SetAttackNamesTextNumber() { switch (gameFamily) { - case gFamEnum.DP: - abilityNamesTextNumber = 552; - break; - case gFamEnum.Plat: - abilityNamesTextNumber = 610; - break; - case gFamEnum.HGSS: - abilityNamesTextNumber = 720; - break; - default: - break; - } - } - - private static void SetAttackNamesTextNumber() { - switch (gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: attackNamesTextNumber = 588; break; - case gFamEnum.Plat: + case GameFamilies.Plat: attackNamesTextNumber = 647; break; default: - attackNamesTextNumber = gameLanguage == gLangEnum.Japanese ? 739 : 750; + attackNamesTextNumber = gameLanguage == GameLanguages.Japanese ? 739 : 750; break; } } - private static void SetItemNamesTextNumber() { + private void SetItemNamesTextNumber() { switch (gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: itemNamesTextNumber = 344; break; - case gFamEnum.Plat: + case GameFamilies.Plat: itemNamesTextNumber = 392; break; default: - itemNamesTextNumber = gameLanguage == gLangEnum.Japanese ? 219 : 222; + itemNamesTextNumber = gameLanguage == GameLanguages.Japanese ? 219 : 222; break; } } - private static void SetLocationNamesTextNumber() { + private void SetLocationNamesTextNumber() { switch (gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: locationNamesTextNumber = 382; break; - case gFamEnum.Plat: + case GameFamilies.Plat: locationNamesTextNumber = 433; break; default: - locationNamesTextNumber = gameLanguage == gLangEnum.Japanese ? 272 : 279; + locationNamesTextNumber = gameLanguage == GameLanguages.Japanese ? 272 : 279; break; } } - private static void SetPokemonNamesTextNumber() { + private void SetPokemonNamesTextNumber() { switch (gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: pokemonNamesTextNumbers = new int[2] { 362, 363 }; break; - case gFamEnum.Plat: + case GameFamilies.Plat: pokemonNamesTextNumbers = new int[7] { 412, 413, 712, 713, 714, 715, 716 }; //413? break; - case gFamEnum.HGSS: - pokemonNamesTextNumbers = gameLanguage.Equals(gLangEnum.Japanese) ? new int[1] { 232 } : new int[7] { 237, 238, 817, 818, 819, 820, 821 }; //238? + case GameFamilies.HGSS: + pokemonNamesTextNumbers = gameLanguage.Equals(GameLanguages.Japanese) ? new int[1] { 232 } : new int[7] { 237, 238, 817, 818, 819, 820, 821 }; //238? break; } } - private static void SetTrainerNamesMessageNumber() { + private void SetTrainerNamesMessageNumber() { switch (gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: trainerNamesMessageNumber = 559; - if (gameLanguage.Equals(gLangEnum.Japanese)) { + if (gameLanguage.Equals(GameLanguages.Japanese)) { trainerNamesMessageNumber -= 9; } break; - case gFamEnum.Plat: + case GameFamilies.Plat: trainerNamesMessageNumber = 618; break; default: trainerNamesMessageNumber = 729; - if (gameLanguage == gLangEnum.Japanese) { + if (gameLanguage == GameLanguages.Japanese) { trainerNamesMessageNumber -= 10; } break; } } - private static void SetTrainerClassMessageNumber() { + private void SetTrainerClassMessageNumber() { switch (gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: trainerClassMessageNumber = 560; - if (gameLanguage.Equals(gLangEnum.Japanese)) { + if (gameLanguage.Equals(GameLanguages.Japanese)) { trainerClassMessageNumber -= 9; } break; - case gFamEnum.Plat: + case GameFamilies.Plat: trainerClassMessageNumber = 619; break; default: trainerClassMessageNumber = 730; - if (gameLanguage.Equals(gLangEnum.Japanese)) { + if (gameLanguage.Equals(GameLanguages.Japanese)) { trainerClassMessageNumber -= 10; } break; } } - private static void SetTrainerNameLenOffset() { - switch (RomInfo.gameFamily) { - case gFamEnum.DP: - switch (RomInfo.gameLanguage) { - case gLangEnum.English: - trainerNameLenOffset = 0x6AC32; - break; - case gLangEnum.Italian: - trainerNameLenOffset = 0x6AC6E; - break; - case gLangEnum.Spanish: - case gLangEnum.German: - case gLangEnum.French: - trainerNameLenOffset = 0x6AC8E; - break; - - case gLangEnum.Japanese: //? - default: - trainerNameLenOffset = -1; - break; - } - break; - - case gFamEnum.Plat: - switch (RomInfo.gameLanguage) { - case gLangEnum.English: - trainerNameLenOffset = 0x791DE; - break; - case gLangEnum.Spanish: - case gLangEnum.Italian: - case gLangEnum.German: - case gLangEnum.French: - trainerNameLenOffset = 0x7927E; - break; - case gLangEnum.Japanese: - trainerNameLenOffset = 0x78AB6; - break; - - default: - trainerNameLenOffset = -1; - break; - } - break; - - case gFamEnum.HGSS: - if (RomInfo.gameLanguage.Equals(gLangEnum.Japanese)) { - //Jap HGSS - trainerNameLenOffset = 0x7342E; - } else if(gameVersion.Equals(gVerEnum.SoulSilver)){ - //All SS languages except Jap - trainerNameLenOffset = 0x72EC2; - } else { - //All HG languages except Jap - switch (RomInfo.gameLanguage) { - case gLangEnum.English: - case gLangEnum.Italian: - case gLangEnum.German: - case gLangEnum.French: - trainerNameLenOffset = 0x7342E; - break; - case gLangEnum.Spanish: - trainerNameLenOffset = 0x73426; - break; - } - } - break; - } - } - - public static int SetTrainerNameMaxLen() { - if(trainerNameLenOffset < 0) { - trainerNameMaxLen = TrainerFile.defaultNameLen; - } else { - using (DSUtils.ARM9.Reader ar = new DSUtils.ARM9.Reader(trainerNameLenOffset)) { - trainerNameMaxLen = ar.ReadByte(); - } - } - return trainerNameMaxLen; - } - - public string GetBuildingModelsDirPath(bool interior) => interior ? gameDirs[DirNames.interiorBuildingModels].unpackedDir : gameDirs[DirNames.exteriorBuildingModels].unpackedDir; public string GetRomNameFromWorkdir() => workDir.Substring(0, workDir.Length - folderSuffix.Length - 1); - public static int GetHeaderCount() => (int)new FileInfo(internalNamesLocation).Length / internalNameLength; + public static int GetHeaderCount() => (int)new FileInfo(internalNamesPath).Length / internalNameLength; public static List GetLocationNames() => new TextArchive(locationNamesTextNumber).messages; public static string[] GetSimpleTrainerNames() => new TextArchive(trainerNamesMessageNumber).messages.ToArray(); public static string[] GetTrainerClassNames() => new TextArchive(trainerClassMessageNumber).messages.ToArray(); @@ -969,23 +785,7 @@ namespace DSPRE { return itemNames.messages.GetRange(startIndex, count == null ? itemNames.messages.Count - 1 : (int)count).ToArray(); } public static string[] GetPokemonNames() => new TextArchive(pokemonNamesTextNumbers[0]).messages.ToArray(); - public static string[] GetAbilityNames() => new TextArchive(abilityNamesTextNumber).messages.ToArray(); public static string[] GetAttackNames() => new TextArchive(attackNamesTextNumber).messages.ToArray(); - public static int GetLearnsetFilesCount() => Directory.GetFiles(gameDirs[DirNames.learnsets].unpackedDir).Length; - public static int GetPersonalFilesCount() => Directory.GetFiles(gameDirs[DirNames.personalPokeData].unpackedDir).Length; - public static string[] GetEvolutionFilesList() => Directory.GetFiles(gameDirs[DirNames.evolutions].unpackedDir); - public static int GetEvolutionFilesCount() => GetEvolutionFilesList().Length; - - public int GetAreaDataCount() => Directory.GetFiles(gameDirs[DirNames.areaData].unpackedDir).Length; - public int GetMapTexturesCount() => Directory.GetFiles(gameDirs[DirNames.mapTextures].unpackedDir).Length; - public int GetBuildingTexturesCount() => Directory.GetFiles(gameDirs[DirNames.buildingTextures].unpackedDir).Length; - public int GetMatrixCount() => Directory.GetFiles(gameDirs[DirNames.matrices].unpackedDir).Length; - public int GetTextArchivesCount() => Directory.GetFiles(gameDirs[DirNames.textArchives].unpackedDir).Length; - public int GetMapCount() => Directory.GetFiles(gameDirs[DirNames.maps].unpackedDir).Length; - public int GetEventCount() => Directory.GetFiles(gameDirs[DirNames.eventFiles].unpackedDir).Length; - public int GetScriptCount() => Directory.GetFiles(gameDirs[DirNames.scripts].unpackedDir).Length; - public int GetBuildingCount(bool interior) => Directory.GetFiles(GetBuildingModelsDirPath(interior)).Length; - public static int GetEventFileCount() => Directory.GetFiles(RomInfo.gameDirs[DirNames.eventFiles].unpackedDir).Length; #endregion #region System Methods @@ -996,7 +796,7 @@ namespace DSPRE { case "CPUE": case "IPKE": case "IPGE": - gameLanguage = gLangEnum.English; + gameLanguage = GameLanguages.English; break; case "ADAS": @@ -1005,7 +805,7 @@ namespace DSPRE { case "IPKS": case "IPGS": case "LATA": - gameLanguage = gLangEnum.Spanish; + gameLanguage = GameLanguages.Spanish; break; case "ADAI": @@ -1013,7 +813,7 @@ namespace DSPRE { case "CPUI": case "IPKI": case "IPGI": - gameLanguage = gLangEnum.Italian; + gameLanguage = GameLanguages.Italian; break; case "ADAF": @@ -1021,7 +821,7 @@ namespace DSPRE { case "CPUF": case "IPKF": case "IPGF": - gameLanguage = gLangEnum.French; + gameLanguage = GameLanguages.French; break; case "ADAD": @@ -1029,161 +829,152 @@ namespace DSPRE { case "CPUD": case "IPKD": case "IPGD": - gameLanguage = gLangEnum.German; + gameLanguage = GameLanguages.German; break; default: - gameLanguage = gLangEnum.Japanese; + gameLanguage = GameLanguages.Japanese; break; } } private void LoadGameFamily() { switch (gameVersion) { - case gVerEnum.Diamond: - case gVerEnum.Pearl: - gameFamily = gFamEnum.DP; + case GameVersions.Diamond: + case GameVersions.Pearl: + gameFamily = GameFamilies.DP; break; - case gVerEnum.Platinum: - gameFamily = gFamEnum.Plat; + case GameVersions.Platinum: + gameFamily = GameFamilies.Plat; break; - case gVerEnum.HeartGold: - case gVerEnum.SoulSilver: - gameFamily = gFamEnum.HGSS; + case GameVersions.HeartGold: + case GameVersions.SoulSilver: + gameFamily = GameFamilies.HGSS; break; } } private void SetNarcDirs() { Dictionary packedDirsDict = null; switch (gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: string suffix = ""; - if (!gameLanguage.Equals(gLangEnum.Japanese)) { + if (!gameLanguage.Equals(GameLanguages.Japanese)) suffix = "_release"; - } packedDirsDict = new Dictionary() { - [DirNames.synthOverlay] = @"data\data\weather_sys.narc", - [DirNames.textArchives] = @"data\msgdata\msg.narc", + [DirNames.synthOverlay] = @"data\weather_sys.narc", + [DirNames.textArchives] = @"msgdata\msg.narc", - [DirNames.matrices] = @"data\fielddata\mapmatrix\map_matrix.narc", + [DirNames.matrices] = @"fielddata\mapmatrix\map_matrix.narc", - [DirNames.maps] = @"data\fielddata\land_data\land_data" + suffix + ".narc", - [DirNames.exteriorBuildingModels] = @"data\fielddata\build_model\build_model.narc", - [DirNames.buildingConfigFiles] = @"data\fielddata\areadata\area_build_model\area_build.narc", - [DirNames.buildingTextures] = @"data\fielddata\areadata\area_build_model\areabm_texset.narc", - [DirNames.mapTextures] = @"data\fielddata\areadata\area_map_tex\map_tex_set.narc", - [DirNames.areaData] = @"data\fielddata\areadata\area_data.narc", + [DirNames.maps] = @"fielddata\land_data\land_data" + suffix + ".narc", + [DirNames.exteriorBuildingModels] = @"fielddata\build_model\build_model.narc", + [DirNames.buildingConfigFiles] = @"fielddata\areadata\area_build_model\area_build.narc", + [DirNames.buildingTextures] = @"fielddata\areadata\area_build_model\areabm_texset.narc", + [DirNames.mapTextures] = @"fielddata\areadata\area_map_tex\map_tex_set.narc", + [DirNames.areaData] = @"fielddata\areadata\area_data.narc", - [DirNames.eventFiles] = @"data\fielddata\eventdata\zone_event" + suffix + ".narc", - [DirNames.OWSprites] = @"data\data\mmodel\mmodel.narc", + [DirNames.eventFiles] = @"fielddata\eventdata\zone_event" + suffix + ".narc", + [DirNames.OWSprites] = @"data\mmodel\mmodel.narc", - [DirNames.scripts] = @"data\fielddata\script\scr_seq" + suffix + ".narc", + [DirNames.scripts] = @"fielddata\script\scr_seq" + suffix + ".narc", - [DirNames.trainerProperties] = @"data\poketool\trainer\trdata.narc", - [DirNames.trainerParty] = @"data\poketool\trainer\trpoke.narc", - [DirNames.trainerGraphics] = @"data\poketool\trgra\trfgra.narc", + [DirNames.trainerProperties] = @"poketool\trainer\trdata.narc", + [DirNames.trainerParty] = @"poketool\trainer\trpoke.narc", + [DirNames.trainerGraphics] = @"poketool\trgra\trfgra.narc", - [DirNames.monIcons] = @"data\poketool\icongra\poke_icon.narc", + [DirNames.monIcons] = @"poketool\icongra\poke_icon.narc", - [DirNames.encounters] = @"data\fielddata\encountdata\" + char.ToLower(gameVersion.ToString()[0]) + '_' + "enc_data.narc", - [DirNames.learnsets] = @"data\poketool\personal\wotbl.narc", - [DirNames.evolutions] = @"data\poketool\personal\evo.narc", - }; - - //Personal Data archive is different for Pearl - string personal = @"data\poketool\personal"; - if (gameVersion == gVerEnum.Pearl) { - personal += ("_" + gameVersion.ToString().ToLower()); - } - personal += @"\personal.narc"; - packedDirsDict[DirNames.personalPokeData] = personal; - - break; - case gFamEnum.Plat: - suffix = gameVersion.ToString().Substring(0, 2).ToLower(); - - packedDirsDict = new Dictionary() { - [DirNames.personalPokeData] = @"data\poketool\personal\pl_personal.narc", - [DirNames.synthOverlay] = @"data\data\weather_sys.narc", - [DirNames.dynamicHeaders] = @"data\debug\cb_edit\d_test.narc", - - [DirNames.textArchives] = @"data\msgdata\" + suffix + '_' + "msg.narc", - - [DirNames.matrices] = @"data\fielddata\mapmatrix\map_matrix.narc", - - [DirNames.maps] = @"data\fielddata\land_data\land_data.narc", - [DirNames.exteriorBuildingModels] = @"data\fielddata\build_model\build_model.narc", - [DirNames.buildingConfigFiles] = @"data\fielddata\areadata\area_build_model\area_build.narc", - [DirNames.buildingTextures] = @"data\fielddata\areadata\area_build_model\areabm_texset.narc", - [DirNames.mapTextures] = @"data\fielddata\areadata\area_map_tex\map_tex_set.narc", - [DirNames.areaData] = @"data\fielddata\areadata\area_data.narc", - - [DirNames.eventFiles] = @"data\fielddata\eventdata\zone_event.narc", - [DirNames.OWSprites] = @"data\data\mmodel\mmodel.narc", - - [DirNames.scripts] = @"data\fielddata\script\scr_seq.narc", - - [DirNames.trainerProperties] = @"data\poketool\trainer\trdata.narc", - [DirNames.trainerParty] = @"data\poketool\trainer\trpoke.narc", - [DirNames.trainerGraphics] = @"data\poketool\trgra\trfgra.narc", - - [DirNames.monIcons] = @"data\poketool\icongra\pl_poke_icon.narc", - - [DirNames.encounters] = @"data\fielddata\encountdata\" + suffix + '_' + "enc_data.narc", - [DirNames.learnsets] = @"data\poketool\personal\wotbl.narc", - [DirNames.evolutions] = @"data\poketool\personal\evo.narc", + [DirNames.encounters] = @"fielddata\encountdata\" + char.ToLower(gameVersion.ToString()[0]) + '_' + "enc_data.narc" }; break; - case gFamEnum.HGSS: + case GameFamilies.Plat: packedDirsDict = new Dictionary() { - [DirNames.personalPokeData] = @"data\a\0\0\2", - [DirNames.synthOverlay] = @"data\a\0\2\8", - [DirNames.dynamicHeaders] = @"data\a\0\5\0", + [DirNames.synthOverlay] = @"data\weather_sys.narc", + [DirNames.dynamicHeaders] = @"debug\cb_edit\d_test.narc", - [DirNames.textArchives] = @"data\a\0\2\7", + [DirNames.textArchives] = @"msgdata\" + gameVersion.ToString().Substring(0, 2).ToLower() + '_' + "msg.narc", - [DirNames.matrices] = @"data\a\0\4\1", + [DirNames.matrices] = @"fielddata\mapmatrix\map_matrix.narc", - [DirNames.maps] = @"data\a\0\6\5", - [DirNames.exteriorBuildingModels] = @"data\a\0\4\0", - [DirNames.buildingConfigFiles] = @"data\a\0\4\3", - [DirNames.buildingTextures] = @"data\a\0\7\0", - [DirNames.mapTextures] = @"data\a\0\4\4", - [DirNames.areaData] = @"data\a\0\4\2", + [DirNames.maps] = @"fielddata\land_data\land_data.narc", + [DirNames.exteriorBuildingModels] = @"fielddata\build_model\build_model.narc", + [DirNames.buildingConfigFiles] = @"fielddata\areadata\area_build_model\area_build.narc", + [DirNames.buildingTextures] = @"fielddata\areadata\area_build_model\areabm_texset.narc", + [DirNames.mapTextures] = @"fielddata\areadata\area_map_tex\map_tex_set.narc", + [DirNames.areaData] = @"fielddata\areadata\area_data.narc", - [DirNames.eventFiles] = @"data\a\0\3\2", - [DirNames.OWSprites] = @"data\a\0\8\1", + [DirNames.eventFiles] = @"fielddata\eventdata\zone_event.narc", + [DirNames.OWSprites] = @"data\mmodel\mmodel.narc", + + [DirNames.scripts] = @"fielddata\script\scr_seq.narc", + + [DirNames.trainerProperties] = @"poketool\trainer\trdata.narc", + [DirNames.trainerParty] = @"poketool\trainer\trpoke.narc", + [DirNames.trainerGraphics] = @"poketool\trgra\trfgra.narc", + + [DirNames.monIcons] = @"poketool\icongra\pl_poke_icon.narc", + + [DirNames.encounters] = @"fielddata\encountdata\" + gameVersion.ToString().Substring(0, 2).ToLower() + '_' + "enc_data.narc" + }; + break; + case GameFamilies.HGSS: + packedDirsDict = new Dictionary() { + [DirNames.synthOverlay] = @"a\0\2\8", + [DirNames.dynamicHeaders] = @"a\0\5\0", + + [DirNames.textArchives] = @"a\0\2\7", + + [DirNames.matrices] = @"a\0\4\1", + + [DirNames.maps] = @"a\0\6\5", + [DirNames.exteriorBuildingModels] = @"a\0\4\0", + [DirNames.buildingConfigFiles] = @"a\0\4\3", + [DirNames.buildingTextures] = @"a\0\7\0", + [DirNames.mapTextures] = @"a\0\4\4", + [DirNames.areaData] = @"a\0\4\2", + + [DirNames.eventFiles] = @"a\0\3\2", + [DirNames.OWSprites] = @"a\0\8\1", + + [DirNames.scripts] = @"a\0\1\2", - [DirNames.scripts] = @"data\a\0\1\2", //ENCOUNTERS FOLDER DEPENDS ON VERSION - [DirNames.trainerProperties] = @"data\a\0\5\5", - [DirNames.trainerParty] = @"data\a\0\5\6", - [DirNames.trainerGraphics] = @"data\a\0\5\8", + [DirNames.trainerProperties] = @"a\0\5\5", + [DirNames.trainerParty] = @"a\0\5\6", + [DirNames.trainerGraphics] = @"a\0\5\8", - [DirNames.monIcons] = @"data\a\0\2\0", + [DirNames.monIcons] = @"a\0\2\0", - [DirNames.interiorBuildingModels] = @"data\a\1\4\8", - [DirNames.learnsets] = @"data\a\0\3\3", - [DirNames.evolutions] = @"data\a\0\3\4", + [DirNames.interiorBuildingModels] = @"a\1\4\8", + + [DirNames.safariZone] = @"a\2\3\0", + [DirNames.headbutt] = @"a\2\5\2", //both versions use the same folder with different data }; //Encounter archive is different for SS - packedDirsDict[DirNames.encounters] = gameVersion == gVerEnum.HeartGold ? @"data\a\0\3\7" : @"data\a\1\3\6"; + if (gameVersion == GameVersions.HeartGold) { + packedDirsDict[DirNames.encounters] = @"a\0\3\7"; + } else { + packedDirsDict[DirNames.encounters] = @"a\1\3\6"; + } + break; } gameDirs = new Dictionary(); foreach (KeyValuePair kvp in packedDirsDict) { - gameDirs.Add(kvp.Key, (workDir + kvp.Value, workDir + @"unpacked" + '\\' + kvp.Key.ToString())); + string _packedPath = Path.Combine(workDir, Path.Combine(dataFolderName, kvp.Value)); + string _unpackedPath = Path.Combine(unpackedPath, kvp.Key.ToString()); + gameDirs.Add(kvp.Key, (_packedPath, _unpackedPath)); } } public void ResetMapCellsColorDictionary() { switch (gameFamily) { - case gFamEnum.DP: - case gFamEnum.Plat: + case GameFamilies.DP: + case GameFamilies.Plat: MapCellsColorDictionary = PokeDatabase.System.MatrixCellColors.DPPtmatrixColorsDict; break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: MapCellsColorDictionary = PokeDatabase.System.MatrixCellColors.HGSSmatrixColorsDict; break; } @@ -1191,8 +982,8 @@ namespace DSPRE { public static void ReadOWTable() { OverworldTable = new SortedDictionary(); switch (gameFamily) { - case gFamEnum.DP: - case gFamEnum.Plat: + case GameFamilies.DP: + case GameFamilies.Plat: using (BinaryReader idReader = new BinaryReader(new FileStream(OWtablePath, FileMode.Open))) { idReader.BaseStream.Position = OWTableOffset; @@ -1205,7 +996,7 @@ namespace DSPRE { } } break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: using (BinaryReader idReader = new BinaryReader(new FileStream(OWtablePath, FileMode.Open))) { idReader.BaseStream.Position = OWTableOffset; diff --git a/DS_Map/SpawnEditor.cs b/DS_Map/SpawnEditor.cs index 12f8e60..998c790 100644 --- a/DS_Map/SpawnEditor.cs +++ b/DS_Map/SpawnEditor.cs @@ -120,13 +120,13 @@ namespace DSPRE { matrixyUpDown.Maximum = headerMatrix.maps.GetLength(0) - 1; switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: locationNameLBL.Text = locations[((HeaderDP)currentHeader).locationName]; break; - case gFamEnum.Plat: + case GameFamilies.Plat: locationNameLBL.Text = locations[((HeaderPt)currentHeader).locationName]; break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: locationNameLBL.Text = locations[((HeaderHGSS)currentHeader).locationName]; break; } diff --git a/DS_Map/WildEditorDPPt.cs b/DS_Map/WildEditorDPPt.cs index 713904a..895ed0d 100644 --- a/DS_Map/WildEditorDPPt.cs +++ b/DS_Map/WildEditorDPPt.cs @@ -30,7 +30,7 @@ namespace DSPRE { } if (tempMapHeader.wildPokemon != MapHeader.DPPT_NULL_ENCOUNTER_FILE_ID) { - if (RomInfo.gameFamily == gFamEnum.DP) { + if (RomInfo.gameFamily == GameFamilies.DP) { EncounterFileLocationName.Add(tempMapHeader.wildPokemon, locationNames[((HeaderDP)tempMapHeader).locationName]); } else { EncounterFileLocationName.Add(tempMapHeader.wildPokemon, locationNames[((HeaderPt)tempMapHeader).locationName]); From aefa4028808668d945219a702a1e5be76ba8cf7d Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Sun, 3 Mar 2024 14:10:42 +0100 Subject: [PATCH 04/40] Fixes --- DS_Map/RomInfo.cs | 425 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 317 insertions(+), 108 deletions(-) diff --git a/DS_Map/RomInfo.cs b/DS_Map/RomInfo.cs index a77297e..1559e97 100644 --- a/DS_Map/RomInfo.cs +++ b/DS_Map/RomInfo.cs @@ -6,6 +6,7 @@ using System.Linq; using DSPRE.Resources; using System; using DSPRE.ROMFiles; +using static DSPRE.RomInfo; namespace DSPRE { @@ -14,44 +15,49 @@ namespace DSPRE { /// public class RomInfo { - public static readonly byte internalNameLength = 16; - public static uint synthOverlayLoadAddress = 0x023C8000; - public Dictionary, (Color background, Color foreground)> MapCellsColorDictionary; public static string folderSuffix = "_DSPRE_contents"; - const string dataFolderName = @"data"; - public static string romID { get; private set; } public static string fileName { get; private set; } public static string workDir { get; private set; } public static string arm9Path { get; private set; } - public static string arm7Path { get; private set; } public static string overlayTablePath { get; set; } - public static string y7Path { get; set; } - public static string dataPath { get; set; } public static string overlayPath { get; set; } - public static string unpackedPath { get; set; } - public static string bannerPath { get; set; } - public static string headerPath { get; set; } + public static GameLanguages gameLanguage { get; private set; } public static GameVersions gameVersion { get; private set; } public static GameFamilies gameFamily { get; private set; } + + + public static uint synthOverlayLoadAddress = 0x023C8000; public static uint arm9spawnOffset { get; private set; } + public static int initialMoneyOverlayNumber { get; private set; } public static uint initialMoneyOverlayOffset { get; private set; } + public static int cameraTblOverlayNumber { get; private set; } public static uint[] cameraTblOffsetsToRAMaddress { get; private set; } + public static uint headerTableOffset { get; private set; } + public static uint conditionalMusicTableOffsetToRAMAddress { get; internal set; } public static uint encounterMusicTableOffsetToRAMAddress { get; internal set; } + public static uint vsTrainerEntryTableOffsetToRAMAddress { get; internal set; } public static uint vsPokemonEntryTableOffsetToRAMAddress { get; internal set; } public static uint effectsComboTableOffsetToRAMAddress { get; internal set; } + public static uint vsTrainerEntryTableOffsetToSizeLimiter { get; internal set; } public static uint vsPokemonEntryTableOffsetToSizeLimiter { get; internal set; } public static uint effectsComboTableOffsetToSizeLimiter { get; internal set; } + + public static uint OWTableOffset { get; internal set; } public static string OWtablePath { get; private set; } + + public static uint monIconPalTableAddress { get; private set; } + public static int nullEncounterID { get; private set; } + public static int abilityNamesTextNumber { get; private set; } public static int attackNamesTextNumber { get; private set; } public static int[] pokemonNamesTextNumbers { get; private set; } public static int itemNamesTextNumber { get; private set; } @@ -59,16 +65,27 @@ namespace DSPRE { public static int trainerClassMessageNumber { get; private set; } public static int trainerNamesMessageNumber { get; private set; } public static int locationNamesTextNumber { get; private set; } - public static string internalNamesPath { get; private set; } + public static int trainerNameLenOffset { get; private set; } + public static int trainerNameMaxLen { get; private set; } + + public static string internalNamesLocation { get; private set; } + public static readonly byte internalNameLength = 16; public static int cameraSize { get; private set; } + + public Dictionary, (Color background, Color foreground)> MapCellsColorDictionary; public static SortedDictionary OverworldTable { get; private set; } public static uint[] overworldTableKeys { get; private set; } public static Dictionary ow3DSpriteDict { get; private set; } + + public static Dictionary ScriptCommandNamesDict { get; private set; } public static Dictionary ScriptCommandNamesReverseDict { get; private set; } + public static Dictionary ScriptActionNamesDict { get; private set; } public static Dictionary ScriptActionNamesReverseDict { get; private set; } + public static Dictionary ScriptCommandParametersDict { get; private set; } + public static Dictionary ScriptComparisonOperatorsDict { get; private set; } public static Dictionary ScriptComparisonOperatorsReverseDict { get; private set; } @@ -96,6 +113,8 @@ namespace DSPRE { German } public enum DirNames : byte { + personalPokeData, + synthOverlay, dynamicHeaders, @@ -113,10 +132,7 @@ namespace DSPRE { OWSprites, scripts, - encounters, - headbutt, - safariZone, trainerProperties, trainerParty, @@ -124,29 +140,24 @@ namespace DSPRE { monIcons, - interiorBuildingModels + interiorBuildingModels, + learnsets, + evolutions }; public static Dictionary gameDirs { get; private set; } + #region Constructors (1) public RomInfo(string id, string romName, bool useSuffix = true) { if (!useSuffix) { folderSuffix = ""; } - string path = Path.GetDirectoryName(romName) + "\\" + Path.GetFileNameWithoutExtension(romName) + folderSuffix + "\\"; - - workDir = path; - arm9Path = Path.Combine(workDir, @"arm9.bin"); - arm7Path = Path.Combine(workDir, @"arm7.bin"); - overlayTablePath = Path.Combine(workDir, @"y9.bin"); - y7Path = Path.Combine(workDir, @"y7.bin"); - dataPath = Path.Combine(workDir, dataFolderName); - overlayPath = Path.Combine(workDir, @"overlay"); - bannerPath = Path.Combine(workDir, @"banner.bin"); - headerPath = Path.Combine(workDir, @"header.bin"); - unpackedPath = Path.Combine(workDir, @"unpacked"); - internalNamesPath = Path.Combine(workDir, $@"{dataFolderName}\fielddata\maptable\mapname.bin"); + workDir = Path.GetDirectoryName(romName) + "\\" + Path.GetFileNameWithoutExtension(romName) + folderSuffix + "\\"; + arm9Path = workDir + @"arm9.bin"; + overlayTablePath = workDir + @"y9.bin"; + overlayPath = workDir + "overlay"; + internalNamesLocation = workDir + @"data\fielddata\maptable\mapname.bin"; try { gameVersion = PokeDatabase.System.versionsDict[id]; @@ -166,6 +177,7 @@ namespace DSPRE { SetHeaderTableOffset(); SetNullEncounterID(); + SetAbilityNamesTextNumber(); SetAttackNamesTextNumber(); SetPokemonNamesTextNumber(); SetItemNamesTextNumber(); @@ -173,6 +185,7 @@ namespace DSPRE { SetLocationNamesTextNumber(); SetTrainerNamesMessageNumber(); SetTrainerClassMessageNumber(); + SetTrainerNameLenOffset(); /* System */ ScriptCommandParametersDict = BuildCommandParametersDatabase(gameFamily); @@ -523,14 +536,21 @@ namespace DSPRE { using (DSUtils.EasyReader bReader = new DSUtils.EasyReader(ov1Path, ramAddrOfPointer - ov1Address)) { // read the pointer at the specified ram address and adjust accordingly below uint ramAddressOfTable = bReader.ReadUInt32(); - if (ramAddressOfTable >= 0x03000000) { + if ((ramAddressOfTable >> 0x18) != 0x02) { MessageBox.Show("Something went wrong reading the Overworld configuration table.\nOverworld sprites in the Event Editor will be " + "displayed incorrectly or not displayed at all.", "Decompression error", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } - if (ramAddressOfTable >= RomInfo.synthOverlayLoadAddress) { // if the pointer shows the table was moved to the synthetic overlay + + string ov131path = DSUtils.GetOverlayPath(131); + if (File.Exists(ov131path)) { + // if HGE field extension overlay exists + OWTableOffset = ramAddressOfTable - DSUtils.GetOverlayRAMAddress(131); + OWtablePath = ov131path; + } else if (ramAddressOfTable >= RomInfo.synthOverlayLoadAddress) { + // if the pointer shows the table was moved to the synthetic overlay OWTableOffset = ramAddressOfTable - RomInfo.synthOverlayLoadAddress; - OWtablePath = Filesystem.expArmPath; + OWtablePath = gameDirs[DirNames.synthOverlay].unpackedDir + "\\" + ROMToolboxDialog.expandedARMfileID.ToString("D4"); } else { OWTableOffset = ramAddressOfTable - ov1Address; OWtablePath = ov1Path; @@ -659,7 +679,73 @@ namespace DSPRE { break; } } - private void SetItemScriptFileNumber() { + public static void SetMonIconsPalTableAddress() { + switch (RomInfo.gameFamily) { + case GameFamilies.DP: + switch (gameLanguage) { + case GameLanguages.English: + monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x6B838, 4), 0); + break; + case GameLanguages.Italian: + monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x6B874, 4), 0); + break; + case GameLanguages.German: + case GameLanguages.French: + case GameLanguages.Spanish: + monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x6B894, 4), 0); + break; + case GameLanguages.Japanese: + monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x6FDEC, 4), 0); + break; + } + break; + case GameFamilies.Plat: + switch (gameLanguage) { + case GameLanguages.English: + monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x79F80, 4), 0); + break; + case GameLanguages.Italian: + case GameLanguages.German: + case GameLanguages.French: + case GameLanguages.Spanish: + monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x7A020, 4), 0); + break; + case GameLanguages.Japanese: + monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x79858, 4), 0); + break; + } + break; + case GameFamilies.HGSS: + default: + switch (gameLanguage) { + case GameLanguages.English: + case GameLanguages.Italian: + monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x74408, 4), 0); + break; + case GameLanguages.German: + if (gameVersion == GameVersions.HeartGold) { + monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x74408, 4), 0); + } else { + monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x74400, 4), 0); + } + break; + case GameLanguages.French: + case GameLanguages.Spanish: + if (gameVersion == GameVersions.HeartGold) { + monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x74400, 4), 0); + } else { + monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x74408, 4), 0); + } + break; + case GameLanguages.Japanese: + monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x73EA0, 4), 0); + break; + } + break; + } + } + + private static void SetItemScriptFileNumber() { switch (gameFamily) { case GameFamilies.DP: itemScriptFileNumber = 370; @@ -672,7 +758,7 @@ namespace DSPRE { break; } } - private void SetNullEncounterID() { + private static void SetNullEncounterID() { switch (gameFamily) { case GameFamilies.DP: case GameFamilies.Plat: @@ -683,7 +769,24 @@ namespace DSPRE { break; } } - private void SetAttackNamesTextNumber() { + + private static void SetAbilityNamesTextNumber() { + switch (gameFamily) { + case GameFamilies.DP: + abilityNamesTextNumber = 552; + break; + case GameFamilies.Plat: + abilityNamesTextNumber = 610; + break; + case GameFamilies.HGSS: + abilityNamesTextNumber = 720; + break; + default: + break; + } + } + + private static void SetAttackNamesTextNumber() { switch (gameFamily) { case GameFamilies.DP: attackNamesTextNumber = 588; @@ -696,7 +799,7 @@ namespace DSPRE { break; } } - private void SetItemNamesTextNumber() { + private static void SetItemNamesTextNumber() { switch (gameFamily) { case GameFamilies.DP: itemNamesTextNumber = 344; @@ -709,7 +812,7 @@ namespace DSPRE { break; } } - private void SetLocationNamesTextNumber() { + private static void SetLocationNamesTextNumber() { switch (gameFamily) { case GameFamilies.DP: locationNamesTextNumber = 382; @@ -722,7 +825,7 @@ namespace DSPRE { break; } } - private void SetPokemonNamesTextNumber() { + private static void SetPokemonNamesTextNumber() { switch (gameFamily) { case GameFamilies.DP: pokemonNamesTextNumbers = new int[2] { 362, 363 }; @@ -735,7 +838,7 @@ namespace DSPRE { break; } } - private void SetTrainerNamesMessageNumber() { + private static void SetTrainerNamesMessageNumber() { switch (gameFamily) { case GameFamilies.DP: trainerNamesMessageNumber = 559; @@ -754,7 +857,7 @@ namespace DSPRE { break; } } - private void SetTrainerClassMessageNumber() { + private static void SetTrainerClassMessageNumber() { switch (gameFamily) { case GameFamilies.DP: trainerClassMessageNumber = 560; @@ -774,8 +877,89 @@ namespace DSPRE { } } + private static void SetTrainerNameLenOffset() { + switch (RomInfo.gameFamily) { + case GameFamilies.DP: + switch (RomInfo.gameLanguage) { + case GameLanguages.English: + trainerNameLenOffset = 0x6AC32; + break; + case GameLanguages.Italian: + trainerNameLenOffset = 0x6AC6E; + break; + case GameLanguages.Spanish: + case GameLanguages.German: + case GameLanguages.French: + trainerNameLenOffset = 0x6AC8E; + break; + + case GameLanguages.Japanese: //? + default: + trainerNameLenOffset = -1; + break; + } + break; + + case GameFamilies.Plat: + switch (RomInfo.gameLanguage) { + case GameLanguages.English: + trainerNameLenOffset = 0x791DE; + break; + case GameLanguages.Spanish: + case GameLanguages.Italian: + case GameLanguages.German: + case GameLanguages.French: + trainerNameLenOffset = 0x7927E; + break; + case GameLanguages.Japanese: + trainerNameLenOffset = 0x78AB6; + break; + + default: + trainerNameLenOffset = -1; + break; + } + break; + + case GameFamilies.HGSS: + if (RomInfo.gameLanguage.Equals(GameLanguages.Japanese)) { + //Jap HGSS + trainerNameLenOffset = 0x7342E; + } else if(gameVersion.Equals(GameVersions.SoulSilver)){ + //All SS languages except Jap + trainerNameLenOffset = 0x72EC2; + } else { + //All HG languages except Jap + switch (RomInfo.gameLanguage) { + case GameLanguages.English: + case GameLanguages.Italian: + case GameLanguages.German: + case GameLanguages.French: + trainerNameLenOffset = 0x7342E; + break; + case GameLanguages.Spanish: + trainerNameLenOffset = 0x73426; + break; + } + } + break; + } + } + + public static int SetTrainerNameMaxLen() { + if(trainerNameLenOffset < 0) { + trainerNameMaxLen = TrainerFile.defaultNameLen; + } else { + using (DSUtils.ARM9.Reader ar = new DSUtils.ARM9.Reader(trainerNameLenOffset)) { + trainerNameMaxLen = ar.ReadByte(); + } + } + return trainerNameMaxLen; + } + + public string GetBuildingModelsDirPath(bool interior) => interior ? gameDirs[DirNames.interiorBuildingModels].unpackedDir : gameDirs[DirNames.exteriorBuildingModels].unpackedDir; public string GetRomNameFromWorkdir() => workDir.Substring(0, workDir.Length - folderSuffix.Length - 1); - public static int GetHeaderCount() => (int)new FileInfo(internalNamesPath).Length / internalNameLength; + public static int GetHeaderCount() => (int)new FileInfo(internalNamesLocation).Length / internalNameLength; public static List GetLocationNames() => new TextArchive(locationNamesTextNumber).messages; public static string[] GetSimpleTrainerNames() => new TextArchive(trainerNamesMessageNumber).messages.ToArray(); public static string[] GetTrainerClassNames() => new TextArchive(trainerClassMessageNumber).messages.ToArray(); @@ -785,7 +969,23 @@ namespace DSPRE { return itemNames.messages.GetRange(startIndex, count == null ? itemNames.messages.Count - 1 : (int)count).ToArray(); } public static string[] GetPokemonNames() => new TextArchive(pokemonNamesTextNumbers[0]).messages.ToArray(); + public static string[] GetAbilityNames() => new TextArchive(abilityNamesTextNumber).messages.ToArray(); public static string[] GetAttackNames() => new TextArchive(attackNamesTextNumber).messages.ToArray(); + public static int GetLearnsetFilesCount() => Directory.GetFiles(gameDirs[DirNames.learnsets].unpackedDir).Length; + public static int GetPersonalFilesCount() => Directory.GetFiles(gameDirs[DirNames.personalPokeData].unpackedDir).Length; + public static string[] GetEvolutionFilesList() => Directory.GetFiles(gameDirs[DirNames.evolutions].unpackedDir); + public static int GetEvolutionFilesCount() => GetEvolutionFilesList().Length; + + public int GetAreaDataCount() => Directory.GetFiles(gameDirs[DirNames.areaData].unpackedDir).Length; + public int GetMapTexturesCount() => Directory.GetFiles(gameDirs[DirNames.mapTextures].unpackedDir).Length; + public int GetBuildingTexturesCount() => Directory.GetFiles(gameDirs[DirNames.buildingTextures].unpackedDir).Length; + public int GetMatrixCount() => Directory.GetFiles(gameDirs[DirNames.matrices].unpackedDir).Length; + public int GetTextArchivesCount() => Directory.GetFiles(gameDirs[DirNames.textArchives].unpackedDir).Length; + public int GetMapCount() => Directory.GetFiles(gameDirs[DirNames.maps].unpackedDir).Length; + public int GetEventCount() => Directory.GetFiles(gameDirs[DirNames.eventFiles].unpackedDir).Length; + public int GetScriptCount() => Directory.GetFiles(gameDirs[DirNames.scripts].unpackedDir).Length; + public int GetBuildingCount(bool interior) => Directory.GetFiles(GetBuildingModelsDirPath(interior)).Length; + public static int GetEventFileCount() => Directory.GetFiles(RomInfo.gameDirs[DirNames.eventFiles].unpackedDir).Length; #endregion #region System Methods @@ -857,115 +1057,124 @@ namespace DSPRE { switch (gameFamily) { case GameFamilies.DP: string suffix = ""; - if (!gameLanguage.Equals(GameLanguages.Japanese)) + if (!gameLanguage.Equals(GameLanguages.Japanese)) { suffix = "_release"; + } packedDirsDict = new Dictionary() { - [DirNames.synthOverlay] = @"data\weather_sys.narc", - [DirNames.textArchives] = @"msgdata\msg.narc", + [DirNames.synthOverlay] = @"data\data\weather_sys.narc", + [DirNames.textArchives] = @"data\msgdata\msg.narc", - [DirNames.matrices] = @"fielddata\mapmatrix\map_matrix.narc", + [DirNames.matrices] = @"data\fielddata\mapmatrix\map_matrix.narc", - [DirNames.maps] = @"fielddata\land_data\land_data" + suffix + ".narc", - [DirNames.exteriorBuildingModels] = @"fielddata\build_model\build_model.narc", - [DirNames.buildingConfigFiles] = @"fielddata\areadata\area_build_model\area_build.narc", - [DirNames.buildingTextures] = @"fielddata\areadata\area_build_model\areabm_texset.narc", - [DirNames.mapTextures] = @"fielddata\areadata\area_map_tex\map_tex_set.narc", - [DirNames.areaData] = @"fielddata\areadata\area_data.narc", + [DirNames.maps] = @"data\fielddata\land_data\land_data" + suffix + ".narc", + [DirNames.exteriorBuildingModels] = @"data\fielddata\build_model\build_model.narc", + [DirNames.buildingConfigFiles] = @"data\fielddata\areadata\area_build_model\area_build.narc", + [DirNames.buildingTextures] = @"data\fielddata\areadata\area_build_model\areabm_texset.narc", + [DirNames.mapTextures] = @"data\fielddata\areadata\area_map_tex\map_tex_set.narc", + [DirNames.areaData] = @"data\fielddata\areadata\area_data.narc", - [DirNames.eventFiles] = @"fielddata\eventdata\zone_event" + suffix + ".narc", - [DirNames.OWSprites] = @"data\mmodel\mmodel.narc", + [DirNames.eventFiles] = @"data\fielddata\eventdata\zone_event" + suffix + ".narc", + [DirNames.OWSprites] = @"data\data\mmodel\mmodel.narc", - [DirNames.scripts] = @"fielddata\script\scr_seq" + suffix + ".narc", + [DirNames.scripts] = @"data\fielddata\script\scr_seq" + suffix + ".narc", - [DirNames.trainerProperties] = @"poketool\trainer\trdata.narc", - [DirNames.trainerParty] = @"poketool\trainer\trpoke.narc", - [DirNames.trainerGraphics] = @"poketool\trgra\trfgra.narc", + [DirNames.trainerProperties] = @"data\poketool\trainer\trdata.narc", + [DirNames.trainerParty] = @"data\poketool\trainer\trpoke.narc", + [DirNames.trainerGraphics] = @"data\poketool\trgra\trfgra.narc", - [DirNames.monIcons] = @"poketool\icongra\poke_icon.narc", + [DirNames.monIcons] = @"data\poketool\icongra\poke_icon.narc", - [DirNames.encounters] = @"fielddata\encountdata\" + char.ToLower(gameVersion.ToString()[0]) + '_' + "enc_data.narc" + [DirNames.encounters] = @"data\fielddata\encountdata\" + char.ToLower(gameVersion.ToString()[0]) + '_' + "enc_data.narc", + [DirNames.learnsets] = @"data\poketool\personal\wotbl.narc", + [DirNames.evolutions] = @"data\poketool\personal\evo.narc", }; + + //Personal Data archive is different for Pearl + string personal = @"data\poketool\personal"; + if (gameVersion == GameVersions.Pearl) { + personal += ("_" + gameVersion.ToString().ToLower()); + } + personal += @"\personal.narc"; + packedDirsDict[DirNames.personalPokeData] = personal; + break; case GameFamilies.Plat: + suffix = gameVersion.ToString().Substring(0, 2).ToLower(); + packedDirsDict = new Dictionary() { - [DirNames.synthOverlay] = @"data\weather_sys.narc", - [DirNames.dynamicHeaders] = @"debug\cb_edit\d_test.narc", + [DirNames.personalPokeData] = @"data\poketool\personal\pl_personal.narc", + [DirNames.synthOverlay] = @"data\data\weather_sys.narc", + [DirNames.dynamicHeaders] = @"data\debug\cb_edit\d_test.narc", - [DirNames.textArchives] = @"msgdata\" + gameVersion.ToString().Substring(0, 2).ToLower() + '_' + "msg.narc", + [DirNames.textArchives] = @"data\msgdata\" + suffix + '_' + "msg.narc", - [DirNames.matrices] = @"fielddata\mapmatrix\map_matrix.narc", + [DirNames.matrices] = @"data\fielddata\mapmatrix\map_matrix.narc", - [DirNames.maps] = @"fielddata\land_data\land_data.narc", - [DirNames.exteriorBuildingModels] = @"fielddata\build_model\build_model.narc", - [DirNames.buildingConfigFiles] = @"fielddata\areadata\area_build_model\area_build.narc", - [DirNames.buildingTextures] = @"fielddata\areadata\area_build_model\areabm_texset.narc", - [DirNames.mapTextures] = @"fielddata\areadata\area_map_tex\map_tex_set.narc", - [DirNames.areaData] = @"fielddata\areadata\area_data.narc", + [DirNames.maps] = @"data\fielddata\land_data\land_data.narc", + [DirNames.exteriorBuildingModels] = @"data\fielddata\build_model\build_model.narc", + [DirNames.buildingConfigFiles] = @"data\fielddata\areadata\area_build_model\area_build.narc", + [DirNames.buildingTextures] = @"data\fielddata\areadata\area_build_model\areabm_texset.narc", + [DirNames.mapTextures] = @"data\fielddata\areadata\area_map_tex\map_tex_set.narc", + [DirNames.areaData] = @"data\fielddata\areadata\area_data.narc", - [DirNames.eventFiles] = @"fielddata\eventdata\zone_event.narc", - [DirNames.OWSprites] = @"data\mmodel\mmodel.narc", + [DirNames.eventFiles] = @"data\fielddata\eventdata\zone_event.narc", + [DirNames.OWSprites] = @"data\data\mmodel\mmodel.narc", - [DirNames.scripts] = @"fielddata\script\scr_seq.narc", + [DirNames.scripts] = @"data\fielddata\script\scr_seq.narc", - [DirNames.trainerProperties] = @"poketool\trainer\trdata.narc", - [DirNames.trainerParty] = @"poketool\trainer\trpoke.narc", - [DirNames.trainerGraphics] = @"poketool\trgra\trfgra.narc", + [DirNames.trainerProperties] = @"data\poketool\trainer\trdata.narc", + [DirNames.trainerParty] = @"data\poketool\trainer\trpoke.narc", + [DirNames.trainerGraphics] = @"data\poketool\trgra\trfgra.narc", - [DirNames.monIcons] = @"poketool\icongra\pl_poke_icon.narc", + [DirNames.monIcons] = @"data\poketool\icongra\pl_poke_icon.narc", - [DirNames.encounters] = @"fielddata\encountdata\" + gameVersion.ToString().Substring(0, 2).ToLower() + '_' + "enc_data.narc" + [DirNames.encounters] = @"data\fielddata\encountdata\" + suffix + '_' + "enc_data.narc", + [DirNames.learnsets] = @"data\poketool\personal\wotbl.narc", + [DirNames.evolutions] = @"data\poketool\personal\evo.narc", }; break; case GameFamilies.HGSS: packedDirsDict = new Dictionary() { - [DirNames.synthOverlay] = @"a\0\2\8", - [DirNames.dynamicHeaders] = @"a\0\5\0", + [DirNames.personalPokeData] = @"data\a\0\0\2", + [DirNames.synthOverlay] = @"data\a\0\2\8", + [DirNames.dynamicHeaders] = @"data\a\0\5\0", - [DirNames.textArchives] = @"a\0\2\7", + [DirNames.textArchives] = @"data\a\0\2\7", - [DirNames.matrices] = @"a\0\4\1", + [DirNames.matrices] = @"data\a\0\4\1", - [DirNames.maps] = @"a\0\6\5", - [DirNames.exteriorBuildingModels] = @"a\0\4\0", - [DirNames.buildingConfigFiles] = @"a\0\4\3", - [DirNames.buildingTextures] = @"a\0\7\0", - [DirNames.mapTextures] = @"a\0\4\4", - [DirNames.areaData] = @"a\0\4\2", + [DirNames.maps] = @"data\a\0\6\5", + [DirNames.exteriorBuildingModels] = @"data\a\0\4\0", + [DirNames.buildingConfigFiles] = @"data\a\0\4\3", + [DirNames.buildingTextures] = @"data\a\0\7\0", + [DirNames.mapTextures] = @"data\a\0\4\4", + [DirNames.areaData] = @"data\a\0\4\2", - [DirNames.eventFiles] = @"a\0\3\2", - [DirNames.OWSprites] = @"a\0\8\1", - - [DirNames.scripts] = @"a\0\1\2", + [DirNames.eventFiles] = @"data\a\0\3\2", + [DirNames.OWSprites] = @"data\a\0\8\1", + [DirNames.scripts] = @"data\a\0\1\2", //ENCOUNTERS FOLDER DEPENDS ON VERSION - [DirNames.trainerProperties] = @"a\0\5\5", - [DirNames.trainerParty] = @"a\0\5\6", - [DirNames.trainerGraphics] = @"a\0\5\8", + [DirNames.trainerProperties] = @"data\a\0\5\5", + [DirNames.trainerParty] = @"data\a\0\5\6", + [DirNames.trainerGraphics] = @"data\a\0\5\8", - [DirNames.monIcons] = @"a\0\2\0", + [DirNames.monIcons] = @"data\a\0\2\0", - [DirNames.interiorBuildingModels] = @"a\1\4\8", - - [DirNames.safariZone] = @"a\2\3\0", - [DirNames.headbutt] = @"a\2\5\2", //both versions use the same folder with different data + [DirNames.interiorBuildingModels] = @"data\a\1\4\8", + [DirNames.learnsets] = @"data\a\0\3\3", + [DirNames.evolutions] = @"data\a\0\3\4", }; //Encounter archive is different for SS - if (gameVersion == GameVersions.HeartGold) { - packedDirsDict[DirNames.encounters] = @"a\0\3\7"; - } else { - packedDirsDict[DirNames.encounters] = @"a\1\3\6"; - } - + packedDirsDict[DirNames.encounters] = gameVersion == GameVersions.HeartGold ? @"data\a\0\3\7" : @"data\a\1\3\6"; break; } gameDirs = new Dictionary(); foreach (KeyValuePair kvp in packedDirsDict) { - string _packedPath = Path.Combine(workDir, Path.Combine(dataFolderName, kvp.Value)); - string _unpackedPath = Path.Combine(unpackedPath, kvp.Key.ToString()); - gameDirs.Add(kvp.Key, (_packedPath, _unpackedPath)); + gameDirs.Add(kvp.Key, (workDir + kvp.Value, workDir + @"unpacked" + '\\' + kvp.Key.ToString())); } } public void ResetMapCellsColorDictionary() { From 5e37eb659a6ff16b6c85271ccc4c94b05aa2885a Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Sun, 3 Mar 2024 14:42:51 +0100 Subject: [PATCH 05/40] More changes with build success now Co-authored-by: Cuddlyogre --- DS_Map/BuildingEditor.cs | 12 +- DS_Map/EvolutionsEditor.cs | 21 +- DS_Map/Helpers.cs | 26 +- DS_Map/LearnsetEditor.cs | 17 +- DS_Map/Main Window.Designer.cs | 218 ++++++------ DS_Map/Main Window.cs | 630 ++++++++++++++++----------------- DS_Map/Main Window.resx | 183 +++++----- DS_Map/PersonalDataEditor.cs | 75 ++-- DS_Map/ROMFiles/MapHeader.cs | 61 +++- DS_Map/RomInfo.cs | 7 + DS_Map/WildEditorDPPt.cs | 229 ++++++------ DS_Map/WildEditorHGSS.cs | 271 +++++++------- 12 files changed, 881 insertions(+), 869 deletions(-) diff --git a/DS_Map/BuildingEditor.cs b/DS_Map/BuildingEditor.cs index fcdfef9..0587fe8 100644 --- a/DS_Map/BuildingEditor.cs +++ b/DS_Map/BuildingEditor.cs @@ -49,11 +49,11 @@ namespace DSPRE { interiorCheckBox.Enabled = true; } - disableHandlers = true; + Helpers.DisableHandlers(); FillListBox(false); FillTexturesBox(); textureComboBox.SelectedIndex = 0; - disableHandlers = false; + Helpers.EnableHandlers(); buildingEditorBldListBox.SelectedIndex = 0; } @@ -167,7 +167,7 @@ namespace DSPRE { RenderModel(); } private void buildingEditorListBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers || buildingEditorBldListBox.SelectedIndex < 0) { + if (Helpers.HandlersDisabled || buildingEditorBldListBox.SelectedIndex < 0) { return; } @@ -213,17 +213,17 @@ namespace DSPRE { } } private void interiorCheckBox_CheckedChanged(object sender, EventArgs e) { - disableHandlers = true; + Helpers.DisableHandlers(); buildingEditorBldListBox.Items.Clear(); FillListBox(interiorCheckBox.Checked); - disableHandlers = false; + Helpers.EnableHandlers(); buildingEditorBldListBox.SelectedIndex = 0; } private void textureComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } LoadModelTextures(textureComboBox.SelectedIndex - 1); diff --git a/DS_Map/EvolutionsEditor.cs b/DS_Map/EvolutionsEditor.cs index 00480e5..2d9229d 100644 --- a/DS_Map/EvolutionsEditor.cs +++ b/DS_Map/EvolutionsEditor.cs @@ -6,7 +6,6 @@ using static System.Windows.Forms.VisualStyles.VisualStyleElement.TextBox; namespace DSPRE { public partial class EvolutionsEditor : Form { - private bool disableHandlers = false; private readonly string[] fileNames; private readonly string[] pokeNames; @@ -34,7 +33,7 @@ namespace DSPRE { this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Size = parent.Size; this.Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top | AnchorStyles.Bottom; - disableHandlers = true; + Helpers.DisableHandlers(); evoRows = new (ComboBox m, Label l, NumericUpDown p, ComboBox t)[EvolutionFile.numEvolutions] { (evoMethodComboBox1, descLabel1, evoParamUpDown1, evoTargetMonComboBox1), @@ -59,32 +58,32 @@ namespace DSPRE { pokemonNameInputComboBox.Items.AddRange(this.fileNames); - disableHandlers = false; + Helpers.EnableHandlers(); pokemonNameInputComboBox.SelectedIndex = 1; } private void pokemonNameInputComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); if (CheckDiscardChanges()) { int newNumber = pokemonNameInputComboBox.SelectedIndex; monNumberNumericUpDown.Value = newNumber; ChangeLoadedFile(newNumber); } - disableHandlers = false; + Helpers.EnableHandlers(); } private void monNumberNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); if (CheckDiscardChanges()) { int newNumber = (int)monNumberNumericUpDown.Value; @@ -92,7 +91,7 @@ namespace DSPRE { ChangeLoadedFile(newNumber); } - disableHandlers = false; + Helpers.EnableHandlers(); } private void ChangeLoadedFile(int toLoad) { currentLoadedId = toLoad; @@ -236,7 +235,7 @@ namespace DSPRE { return; } - disableHandlers = true; + Helpers.DisableHandlers(); EvolutionMethod method = (EvolutionMethod)m.SelectedIndex; EvolutionParamMeaning type = EvolutionFile.evoDescriptions[method]; @@ -294,7 +293,7 @@ namespace DSPRE { throw new Exception("Unknown evolution parameter type: " + type); } - disableHandlers = false; + Helpers.EnableHandlers(); } private void evoParamUpDown1_ValueChanged(object sender, EventArgs e) { diff --git a/DS_Map/Helpers.cs b/DS_Map/Helpers.cs index 81d1b9a..f6d2aa0 100644 --- a/DS_Map/Helpers.cs +++ b/DS_Map/Helpers.cs @@ -47,11 +47,11 @@ namespace DSPRE { } public static void DisableHandlers() { - disableHandlers = true; + Helpers.DisableHandlers(); } public static void EnableHandlers() { - disableHandlers = false; + Helpers.EnableHandlers(); } public static void statusLabelMessage(string msg = "Ready") { @@ -371,27 +371,5 @@ namespace DSPRE { return internalNames; } - - public static void OpenWildEditor(int encToOpen = 0) { - Helpers.statusLabelMessage("Attempting to extract Wild Encounters NARC..."); - - DSUtils.TryUnpackNarcs(new List() { RomInfo.DirNames.encounters, RomInfo.DirNames.monIcons }); - - Helpers.statusLabelMessage("Passing control to Wild Pokémon Editor..."); - - switch (RomInfo.gameFamily) { - case RomInfo.GameFamilies.DP: - case RomInfo.GameFamilies.Plat: - using (WildEditorDPPt editor = new WildEditorDPPt(encToOpen)) - editor.ShowDialog(); - break; - default: - using (WildEditorHGSS editor = new WildEditorHGSS(encToOpen)) - editor.ShowDialog(); - break; - } - - Helpers.statusLabelMessage(); - } } } \ No newline at end of file diff --git a/DS_Map/LearnsetEditor.cs b/DS_Map/LearnsetEditor.cs index 70984a7..a0ef089 100644 --- a/DS_Map/LearnsetEditor.cs +++ b/DS_Map/LearnsetEditor.cs @@ -11,7 +11,6 @@ using MessageBox = System.Windows.Forms.MessageBox; namespace DSPRE { public partial class LearnsetEditor : Form { - private bool disableHandlers = false; private readonly string[] fileNames; private readonly string[] pokenames; @@ -41,7 +40,7 @@ namespace DSPRE { this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Size = parent.Size; this.Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top | AnchorStyles.Bottom; - disableHandlers = true; + Helpers.DisableHandlers(); BindingList listMoveNames = new BindingList(moveNames); moveInputComboBox.DataSource = listMoveNames; @@ -65,7 +64,7 @@ namespace DSPRE { descriptorLabel.Text = ""; statusLabel.Text = ""; - disableHandlers = false; + Helpers.EnableHandlers(); pokemonNameInputComboBox.SelectedIndex = 1; } @@ -128,26 +127,26 @@ namespace DSPRE { } private void pokemonNameInputComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); if (CheckDiscardChanges()) { int newNumber = pokemonNameInputComboBox.SelectedIndex; monNumberNumericUpDown.Value = newNumber; ChangeLoadedFile(newNumber); } - disableHandlers = false; + Helpers.EnableHandlers(); } private void monNumberNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); if (CheckDiscardChanges()) { int newNumber = (int)monNumberNumericUpDown.Value; @@ -155,7 +154,7 @@ namespace DSPRE { ChangeLoadedFile(newNumber); } - disableHandlers = false; + Helpers.EnableHandlers(); } private void moveInputComboBox_SelectedIndexChanged(object sender, EventArgs e) { diff --git a/DS_Map/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs index 6f3019b..65baac3 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 dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = 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(); @@ -2826,40 +2826,40 @@ this.headersGridView.AllowUserToResizeColumns = false; this.headersGridView.AllowUserToResizeRows = false; this.headersGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - dataGridViewCellStyle17.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.Info; - dataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.headersGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle17; + 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; - dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle18.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle18.Format = "D4"; - dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.headersGridView.DefaultCellStyle = dataGridViewCellStyle18; + 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"; - dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle19.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.headersGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle19; + 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; - dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle20.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.headersGridView.RowsDefaultCellStyle = dataGridViewCellStyle20; + 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; @@ -2888,43 +2888,43 @@ this.heightsGridView.AllowUserToDeleteRows = false; this.heightsGridView.AllowUserToResizeColumns = false; this.heightsGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle21; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5; this.heightsGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle22.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.heightsGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle22; + 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; - dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle23.Font = new System.Drawing.Font("Tahoma", 8.25F); - dataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle23.Format = "D2"; - dataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle23; + 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"; - dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle24.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.heightsGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle24; + 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; - dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle25.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.heightsGridView.RowsDefaultCellStyle = dataGridViewCellStyle25; + 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; @@ -2951,43 +2951,43 @@ this.mapFilesGridView.AllowUserToDeleteRows = false; this.mapFilesGridView.AllowUserToResizeColumns = false; this.mapFilesGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle26; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10; this.mapFilesGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle27.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mapFilesGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle27; + 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; - dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle28.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle28.Format = "D4"; - dataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle28; + 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"; - dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle29.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mapFilesGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle29; + 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; - dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle30.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.mapFilesGridView.RowsDefaultCellStyle = dataGridViewCellStyle30; + 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; @@ -8132,8 +8132,8 @@ this.textEditorDataGridView.Location = new System.Drawing.Point(12, 77); this.textEditorDataGridView.Name = "textEditorDataGridView"; this.textEditorDataGridView.RowHeadersWidth = 68; - dataGridViewCellStyle31.Font = new System.Drawing.Font("Consolas", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textEditorDataGridView.RowsDefaultCellStyle = dataGridViewCellStyle31; + 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(873, 500); this.textEditorDataGridView.TabIndex = 24; this.textEditorDataGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.textEditorDataGridView_CellValueChanged); @@ -8236,9 +8236,9 @@ this.cameraEditorDataGridView.CausesValidation = false; this.cameraEditorDataGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised; this.cameraEditorDataGridView.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle32.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.cameraEditorDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle32; + 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, diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index 53bd776..f70f808 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -37,7 +37,6 @@ namespace DSPRE { #region Program Window #region Variables - public bool disableHandlers = false; public bool iconON = false; /* Editors Setup */ @@ -104,18 +103,7 @@ namespace DSPRE { } return trainerList.ToArray(); } - private void statusLabelMessage(string msg = "Ready") { - statusLabel.Text = msg; - statusLabel.Font = new Font(statusLabel.Font, FontStyle.Regular); - statusLabel.ForeColor = Color.Black; - statusLabel.Invalidate(); - } - private void statusLabelError(string errorMsg, bool severe = true) { - statusLabel.Text = errorMsg; - statusLabel.Font = new Font(statusLabel.Font, FontStyle.Bold); - statusLabel.ForeColor = severe ? Color.Red : Color.DarkOrange; - statusLabel.Invalidate(); - } + private void PaintGameIcon(object sender, PaintEventArgs e) { if (iconON) { FileStream banner; @@ -223,7 +211,7 @@ namespace DSPRE { public void SetupScriptEditor() { /* Extract essential NARCs sub-archives*/ - statusLabelMessage("Setting up Script Editor..."); + Helpers.statusLabelMessage("Setting up Script Editor..."); Update(); DSUtils.TryUnpackNarcs(new List { DirNames.scripts }); //12 = scripts Narc Dir @@ -236,12 +224,12 @@ namespace DSPRE { UpdateScriptNumberCheckBox((NumberStyles)Properties.Settings.Default.scriptEditorFormatPreference); selectScriptFileComboBox.SelectedIndex = 0; - statusLabelMessage(); + Helpers.statusLabelMessage(); } private void SetupTextEditor() { DSUtils.TryUnpackNarcs(new List { DirNames.textArchives }); - statusLabelMessage("Setting up Text Editor..."); + Helpers.statusLabelMessage("Setting up Text Editor..."); Update(); selectTextFileComboBox.Items.Clear(); @@ -250,12 +238,12 @@ namespace DSPRE { selectTextFileComboBox.Items.Add("Text Archive " + i); } - disableHandlers = true; + Helpers.DisableHandlers(); hexRadiobutton.Checked = Properties.Settings.Default.textEditorPreferHex; - disableHandlers = false; + Helpers.EnableHandlers(); selectTextFileComboBox.SelectedIndex = 0; - statusLabelMessage(); + Helpers.statusLabelMessage(); } private int UnpackRomCheckUserChoice() { @@ -284,7 +272,7 @@ namespace DSPRE { } } private bool UnpackRom(string ndsFileName) { - statusLabelMessage("Unpacking ROM contents to " + RomInfo.workDir + " ..."); + Helpers.statusLabelMessage("Unpacking ROM contents to " + RomInfo.workDir + " ..."); Update(); Directory.CreateDirectory(RomInfo.workDir); @@ -466,11 +454,11 @@ namespace DSPRE { } private void OpenCommandsDatabase(Dictionary namesDict, Dictionary paramsDict, Dictionary actionsDict, Dictionary comparisonOPsDict) { - statusLabelMessage("Setting up Commands Database. Please wait..."); + Helpers.statusLabelMessage("Setting up Commands Database. Please wait..."); Update(); CommandsDatabase form = new CommandsDatabase(namesDict, paramsDict, actionsDict, comparisonOPsDict); form.Show(); - statusLabelMessage(); + Helpers.statusLabelMessage(); } private void headerSearchToolStripButton_Click(object sender, EventArgs e) { mainTabControl.SelectedIndex = 0; //Select Header Editor @@ -490,7 +478,7 @@ namespace DSPRE { private void unpackBuildingEditorNARCs(bool forceUnpack = false) { toolStripProgressBar.Visible = true; - statusLabelMessage("Attempting to unpack Building Editor NARCs... Please wait. This might take a while"); + Helpers.statusLabelMessage("Attempting to unpack Building Editor NARCs... Please wait. This might take a while"); toolStripProgressBar.Visible = true; toolStripProgressBar.Maximum = 4; toolStripProgressBar.Value = 0; @@ -519,7 +507,7 @@ namespace DSPRE { toolStripProgressBar.Value = 0; toolStripProgressBar.Visible = false; - statusLabelMessage(); + Helpers.statusLabelMessage(); Update(); } private void aboutToolStripMenuItem_Click(object sender, EventArgs e) { @@ -553,7 +541,7 @@ namespace DSPRE { int userchoice = UnpackRomCheckUserChoice(); switch (userchoice) { case -1: - statusLabelMessage("Loading aborted"); + Helpers.statusLabelMessage("Loading aborted"); Update(); return; case 0: @@ -562,7 +550,7 @@ namespace DSPRE { case 2: Application.DoEvents(); if (userchoice == 1) { - statusLabelMessage("Deleting old data..."); + Helpers.statusLabelMessage("Deleting old data..."); try { Directory.Delete(RomInfo.workDir, true); } catch (IOException) { @@ -575,7 +563,7 @@ namespace DSPRE { try { if (!UnpackRom(openRom.FileName)) { - statusLabelError("ERROR"); + Helpers.statusLabelError("ERROR"); languageLabel.Text = ""; versionLabel.Text = "Error"; return; @@ -583,7 +571,7 @@ namespace DSPRE { DSUtils.ARM9.EditSize(-12); } catch (IOException) { MessageBox.Show("Can't access temp directory: \n" + RomInfo.workDir + "\nThis might be a temporary issue.\nMake sure no other process is using it and try again.", "Open Error", MessageBoxButtons.OK, MessageBoxIcon.Error); - statusLabelError("ERROR: Concurrent access to " + RomInfo.workDir); + Helpers.statusLabelError("ERROR: Concurrent access to " + RomInfo.workDir); Update(); return; } @@ -592,7 +580,7 @@ namespace DSPRE { iconON = true; gameIcon.Refresh(); // Paint game icon - statusLabelMessage("Attempting to unpack NARCs from folder..."); + Helpers.statusLabelMessage("Attempting to unpack NARCs from folder..."); Update(); for (int i = 0; i < 128; i++) { if (DSUtils.OverlayIsCompressed(i)) { @@ -696,7 +684,7 @@ namespace DSPRE { monEditorToolStripMenuItem.Enabled = true; scriptCommandsButton.Enabled = true; - statusLabelMessage(); + Helpers.statusLabelMessage(); this.Text += " - " + RomInfo.fileName; } @@ -708,7 +696,7 @@ namespace DSPRE { return; } - statusLabelMessage("Repacking NARCS..."); + Helpers.statusLabelMessage("Repacking NARCS..."); Update(); // Repack NARCs @@ -721,7 +709,7 @@ namespace DSPRE { if (DSUtils.ARM9.CheckCompressionMark()) { - statusLabelMessage("Awaiting user response..."); + Helpers.statusLabelMessage("Awaiting user response..."); DialogResult d = MessageBox.Show("The ARM9 file of this ROM is currently uncompressed, but marked as compressed.\n" + "This will prevent your ROM from working on native hardware.\n\n" + "Do you want to mark the ARM9 as uncompressed?", "ARM9 compression mismatch detected", @@ -732,7 +720,7 @@ namespace DSPRE { } } - statusLabelMessage("Repacking ROM..."); + Helpers.statusLabelMessage("Repacking ROM..."); if (DSUtils.CheckOverlayHasCompressionFlag(1)) { if (ROMToolboxDialog.overlay1MustBeRestoredFromBackup) { @@ -770,10 +758,10 @@ namespace DSPRE { } Properties.Settings.Default.Save(); - statusLabelMessage(); + Helpers.statusLabelMessage(); } private void unpackAllButton_Click(object sender, EventArgs e) { - statusLabelMessage("Awaiting user response..."); + Helpers.statusLabelMessage("Awaiting user response..."); DialogResult d = MessageBox.Show("Do you wish to unpack all extracted NARCS?\n" + "This operation might be long and can't be interrupted.\n\n" + "Any unsaved changes made to the ROM in this session will be lost." + @@ -784,7 +772,7 @@ namespace DSPRE { toolStripProgressBar.Maximum = RomInfo.gameDirs.Count; toolStripProgressBar.Visible = true; toolStripProgressBar.Value = 0; - statusLabelMessage("Attempting to unpack all NARCs... Be patient. This might take a while..."); + Helpers.statusLabelMessage("Attempting to unpack all NARCs... Be patient. This might take a while..."); Update(); DSUtils.ForceUnpackNarcs(Enum.GetValues(typeof(DirNames)).Cast().ToList()); @@ -803,12 +791,12 @@ namespace DSPRE { SetupTextEditor(); SetupTrainerEditor(); - statusLabelMessage(); + Helpers.statusLabelMessage(); Update(); } } private void updateMapNarcsButton_Click(object sender, EventArgs e) { - statusLabelMessage("Awaiting user response..."); + Helpers.statusLabelMessage("Awaiting user response..."); DialogResult d = MessageBox.Show("Do you wish to unpack all NARC files necessary for the Building Editor ?\n" + "This operation might be long and can't be interrupted.\n\n" + "Any unsaved changes made to building models and textures in this session will be lost." + @@ -820,7 +808,7 @@ namespace DSPRE { MessageBox.Show("Operation completed.", "Success", MessageBoxButtons.OK, MessageBoxIcon.Information); - statusLabelMessage(); + Helpers.statusLabelMessage(); if (mapEditorIsReady) { updateBuildingListComboBox(interiorbldRadioButton.Checked); @@ -913,12 +901,12 @@ namespace DSPRE { openWildEditor(loadCurrent: true); } private void openWildEditor(bool loadCurrent) { - statusLabelMessage("Attempting to extract Wild Encounters NARC..."); + Helpers.statusLabelMessage("Attempting to extract Wild Encounters NARC..."); Update(); DSUtils.TryUnpackNarcs(new List() { DirNames.encounters, DirNames.monIcons }); - statusLabelMessage("Passing control to Wild Pokémon Editor..."); + Helpers.statusLabelMessage("Passing control to Wild Pokémon Editor..."); Update(); int encToOpen = loadCurrent ? (int)wildPokeUpDown.Value : 0; @@ -935,7 +923,7 @@ namespace DSPRE { editor.ShowDialog(); break; } - statusLabelMessage(); + Helpers.statusLabelMessage(); } #endregion @@ -949,12 +937,12 @@ namespace DSPRE { private void SetupHeaderEditor() { /* Extract essential NARCs sub-archives*/ - statusLabelMessage("Attempting to unpack Header Editor NARCs... Please wait."); + Helpers.statusLabelMessage("Attempting to unpack Header Editor NARCs... Please wait."); Update(); DSUtils.TryUnpackNarcs(new List { DirNames.synthOverlay, DirNames.textArchives, DirNames.dynamicHeaders }); - statusLabelMessage("Reading internal names... Please wait."); + Helpers.statusLabelMessage("Reading internal names... Please wait."); Update(); internalNames = new List(); @@ -1077,7 +1065,7 @@ namespace DSPRE { if (headerListBox.Items.Count > 0) { headerListBox.SelectedIndex = 0; } - statusLabelMessage(); + Helpers.statusLabelMessage(); } private void addHeaderBTN_Click(object sender, EventArgs e) { // Add new file in the dynamic headers directory @@ -1121,7 +1109,7 @@ namespace DSPRE { } } private void areaDataUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentHeader.areaDataID = (byte)areaDataUpDown.Value; @@ -1138,7 +1126,7 @@ namespace DSPRE { internalNameLenLabel.Text = "[ " + (internalNameBox.Text.Length) + " ]"; } private void areaIconComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -1159,7 +1147,7 @@ namespace DSPRE { } } private void eventFileUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentHeader.eventFileID = (ushort)eventFileUpDown.Value; @@ -1168,7 +1156,7 @@ namespace DSPRE { currentHeader.battleBackground = (byte)battleBackgroundUpDown.Value; } private void followModeComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -1179,7 +1167,7 @@ namespace DSPRE { } private void kantoRadioButton_CheckedChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } if (RomInfo.gameFamily == GameFamilies.HGSS) { @@ -1188,7 +1176,7 @@ namespace DSPRE { } } private void headerFlagsCheckBoxes_CheckedChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -1216,7 +1204,7 @@ namespace DSPRE { currentHeader.flags = flagVal; } private void headerListBox_SelectedValueChanged(object sender, EventArgs e) { - if (disableHandlers || headerListBox.SelectedIndex < 0) { + if (Helpers.HandlersDisabled || headerListBox.SelectedIndex < 0) { return; } @@ -1353,19 +1341,19 @@ namespace DSPRE { } } private void headerListBox_Leave(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } headerListBox.Refresh(); } private void levelScriptUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentHeader.levelScriptID = (ushort)levelScriptUpDown.Value; } private void mapNameComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -1382,13 +1370,13 @@ namespace DSPRE { } } private void matrixUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentHeader.matrixID = (ushort)matrixUpDown.Value; } private void musicDayComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } switch (RomInfo.gameFamily) { @@ -1404,7 +1392,7 @@ namespace DSPRE { } } private void musicNightComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -1421,11 +1409,11 @@ namespace DSPRE { } } private void musicDayUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); ushort updValue = (ushort)((NumericUpDown)sender).Value; currentHeader.musicDayID = updValue; try { @@ -1443,14 +1431,14 @@ namespace DSPRE { } catch (KeyNotFoundException) { musicDayComboBox.SelectedItem = null; } - disableHandlers = false; + Helpers.EnableHandlers(); } private void musicNightUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); ushort updValue = (ushort)((NumericUpDown)sender).Value; currentHeader.musicNightID = updValue; try { @@ -1468,7 +1456,7 @@ namespace DSPRE { } catch (KeyNotFoundException) { musicNightComboBox.SelectedItem = null; } - disableHandlers = false; + Helpers.EnableHandlers(); } private void worldmapXCoordUpDown_ValueChanged(object sender, EventArgs e) { ((HeaderHGSS)currentHeader).worldmapX = (byte)worldmapXCoordUpDown.Value; @@ -1477,12 +1465,12 @@ namespace DSPRE { ((HeaderHGSS)currentHeader).worldmapY = (byte)worldmapYCoordUpDown.Value; } private void updateWeatherPicAndComboBox() { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } /* Update Weather Combobox*/ - disableHandlers = true; + Helpers.DisableHandlers(); try { switch (RomInfo.gameFamily) { case GameFamilies.DP: @@ -1498,7 +1486,7 @@ namespace DSPRE { } catch (KeyNotFoundException) { weatherComboBox.SelectedItem = null; } - disableHandlers = false; + Helpers.EnableHandlers(); /* Update Weather Picture */ try { @@ -1530,12 +1518,12 @@ namespace DSPRE { } } private void updateCameraPicAndComboBox() { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } /* Update Camera Combobox*/ - disableHandlers = true; + Helpers.DisableHandlers(); try { switch (RomInfo.gameFamily) { case GameFamilies.DP: @@ -1551,7 +1539,7 @@ namespace DSPRE { } catch (KeyNotFoundException) { cameraComboBox.SelectedItem = null; } - disableHandlers = false; + Helpers.EnableHandlers(); /* Update Camera Picture */ string imageName; @@ -1577,7 +1565,7 @@ namespace DSPRE { } private void weatherComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers || weatherComboBox.SelectedIndex < 0) { + if (Helpers.HandlersDisabled || weatherComboBox.SelectedIndex < 0) { return; } @@ -1599,7 +1587,7 @@ namespace DSPRE { updateWeatherPicAndComboBox(); } private void cameraComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers || cameraComboBox.SelectedIndex < 0) { + if (Helpers.HandlersDisabled || cameraComboBox.SelectedIndex < 0) { return; } @@ -1690,12 +1678,12 @@ namespace DSPRE { uint headerOffset = (uint)(RomInfo.headerTableOffset + MapHeader.length * currentHeader.ID); DSUtils.ARM9.WriteBytes(currentHeader.ToByteArray(), headerOffset); } - disableHandlers = true; + Helpers.DisableHandlers(); updateCurrentInternalName(); updateHeaderNameShown(headerListBox.SelectedIndex); headerListBox.Focus(); - disableHandlers = false; + Helpers.EnableHandlers(); } private byte[] StringToInternalName(string text) { if (text.Length > internalNameLength) { @@ -1720,12 +1708,12 @@ namespace DSPRE { } } private void updateHeaderNameShown(int thisIndex) { - disableHandlers = true; + Helpers.DisableHandlers(); string val = (string)(headerListBox.Items[thisIndex] = headerListBoxNames[currentHeader.ID]); if (eventEditorIsReady) { eventEditorWarpHeaderListBox.Items[thisIndex] = val; } - disableHandlers = false; + Helpers.EnableHandlers(); } private void resetButton_Click(object sender, EventArgs e) { resetHeaderSearch(); @@ -1734,7 +1722,7 @@ namespace DSPRE { void resetHeaderSearch() { searchLocationTextBox.Clear(); HeaderSearch.ResetResults(headerListBox, headerListBoxNames, prependNumbers: false); - statusLabelMessage(); + Helpers.statusLabelMessage(); } private void searchHeaderTextBox_KeyPress(object sender, KeyEventArgs e) { @@ -1853,13 +1841,13 @@ namespace DSPRE { //File.WriteAllLines("dummy.txt", output); } private void scriptFileUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentHeader.scriptFileID = (ushort)scriptFileUpDown.Value; } private void areaSettingsComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers || areaSettingsComboBox.SelectedItem is null) { + if (Helpers.HandlersDisabled || areaSettingsComboBox.SelectedItem is null) { return; } @@ -1875,14 +1863,14 @@ namespace DSPRE { } } private void textFileUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentHeader.textArchiveID = (ushort)textFileUpDown.Value; } private void wildPokeUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -2302,12 +2290,12 @@ namespace DSPRE { } #endregion private void SetupMatrixEditor() { - statusLabelMessage("Setting up Matrix Editor..."); + Helpers.statusLabelMessage("Setting up Matrix Editor..."); Update(); DSUtils.TryUnpackNarcs(new List { DirNames.matrices }); - disableHandlers = true; + Helpers.DisableHandlers(); /* Add matrix entries to ComboBox */ selectMatrixComboBox.Items.Clear(); @@ -2321,9 +2309,9 @@ namespace DSPRE { } RomInfo.SetupSpawnSettings(); - disableHandlers = false; + Helpers.EnableHandlers(); selectMatrixComboBox.SelectedIndex = 0; - statusLabelMessage(); + Helpers.statusLabelMessage(); } private void addHeaderSectionButton_Click(object sender, EventArgs e) { if (!currentMatrix.hasHeadersSection) { @@ -2373,7 +2361,7 @@ namespace DSPRE { } private void DisplaySelection(DataGridViewSelectedCellCollection selectedCells) { if (selectedCells.Count > 0) { - statusLabelMessage("Selection: " + selectedCells[0].ColumnIndex + ", " + selectedCells[0].RowIndex); + Helpers.statusLabelMessage("Selection: " + selectedCells[0].ColumnIndex + ", " + selectedCells[0].RowIndex); } } private void headersGridView_CellMouseDoubleClick(object sender, DataGridViewCellMouseEventArgs e) { @@ -2388,7 +2376,7 @@ namespace DSPRE { } } private void headersGridView_CellValueChanged(object sender, DataGridViewCellEventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } if (e.RowIndex > -1 && e.ColumnIndex > -1) { @@ -2410,7 +2398,7 @@ namespace DSPRE { return; } - disableHandlers = true; + Helpers.DisableHandlers(); /* Format table cells corresponding to border maps or void */ if (!ushort.TryParse(mapFilesGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString(), out ushort colorValue)) { @@ -2426,11 +2414,11 @@ namespace DSPRE { e.Value = 0; } - disableHandlers = false; + Helpers.EnableHandlers(); } private void heightsGridView_CellValueChanged(object sender, DataGridViewCellEventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } if (e.RowIndex > -1 && e.ColumnIndex > -1) { @@ -2445,10 +2433,10 @@ namespace DSPRE { } } private void widthUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); /* Add or remove rows in DataGridView control */ int delta = (int)widthUpDown.Value - currentMatrix.width; @@ -2480,13 +2468,13 @@ namespace DSPRE { /* Modify matrix object */ currentMatrix.ResizeMatrix((int)heightUpDown.Value, (int)widthUpDown.Value); - disableHandlers = false; + Helpers.EnableHandlers(); } private void heightUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); /* Add or remove rows in DataGridView control */ int delta = (int)heightUpDown.Value - currentMatrix.height; @@ -2517,14 +2505,14 @@ namespace DSPRE { /* Modify matrix object */ currentMatrix.ResizeMatrix((int)heightUpDown.Value, (int)widthUpDown.Value); - disableHandlers = false; + Helpers.EnableHandlers(); } private void heightsGridView_CellFormatting(object sender, DataGridViewCellFormattingEventArgs e) { if (e.Value is null) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); /* Format table cells corresponding to border maps or void */ ushort colorValue = 0; @@ -2543,12 +2531,12 @@ namespace DSPRE { } catch { } e.Value = cellValue; - disableHandlers = false; + Helpers.EnableHandlers(); } private void importMatrixButton_Click(object sender, EventArgs e) { /* Prompt user to select .mtx file */ if (selectMatrixComboBox.SelectedIndex == 0) { - statusLabelMessage("Awaiting user response..."); + Helpers.statusLabelMessage("Awaiting user response..."); DialogResult d = MessageBox.Show("Replacing a matrix - especially Matrix 0 - with a new file is risky.\n" + "Do not do it unless you are absolutely sure.\nProceed?", "Risky operation", MessageBoxButtons.YesNo, MessageBoxIcon.Warning); @@ -2572,15 +2560,15 @@ namespace DSPRE { GenerateMatrixTables(); /* Setup matrix editor controls */ - disableHandlers = true; + Helpers.DisableHandlers(); matrixNameTextBox.Text = currentMatrix.name; widthUpDown.Value = currentMatrix.width; heightUpDown.Value = currentMatrix.height; - disableHandlers = false; + Helpers.EnableHandlers(); /* Display success message */ MessageBox.Show("Matrix imported successfully!", "", MessageBoxButtons.OK, MessageBoxIcon.Information); - statusLabelMessage(); + Helpers.statusLabelMessage(); } private void mapFilesGridView_CellMouseDoubleClick(object sender, DataGridViewCellEventArgs e) { if (e.RowIndex >= 0 && e.ColumnIndex >= 0) { @@ -2616,13 +2604,13 @@ namespace DSPRE { if (result.Length < 1) { headerID = currentHeader.ID; - statusLabelMessage("This Matrix is not linked to any Header. DSPRE can't determine the most appropriate AreaData (and textures) to use.\nDisplaying Textures from the last selected Header (" + headerID + ")'s AreaData..."); + Helpers.statusLabelMessage("This Matrix is not linked to any Header. DSPRE can't determine the most appropriate AreaData (and textures) to use.\nDisplaying Textures from the last selected Header (" + headerID + ")'s AreaData..."); } else { if (result.Length > 1) { if (result.Contains(currentHeader.ID)) { headerID = currentHeader.ID; - statusLabelMessage("Multiple Headers are associated to this Matrix, including the last selected one [Header " + headerID + "]. Now using its textures."); + Helpers.statusLabelMessage("Multiple Headers are associated to this Matrix, including the last selected one [Header " + headerID + "]. Now using its textures."); } else { if (gameFamily.Equals(GameFamilies.DP)) { foreach (ushort r in result) { @@ -2664,11 +2652,11 @@ namespace DSPRE { } } - statusLabelMessage("Multiple Headers are using this Matrix. Header " + headerID + "'s textures are currently being displayed."); + Helpers.statusLabelMessage("Multiple Headers are using this Matrix. Header " + headerID + "'s textures are currently being displayed."); } } else { headerID = result[0]; - statusLabelMessage("Loading Header " + headerID + "'s textures."); + Helpers.statusLabelMessage("Loading Header " + headerID + "'s textures."); } } } @@ -2689,7 +2677,7 @@ namespace DSPRE { } /* Load Map File and switch to Map Editor tab */ - disableHandlers = true; + Helpers.DisableHandlers(); AreaData areaData = new AreaData(h.areaDataID); selectMapComboBox.SelectedIndex = currentMatrix.maps[e.RowIndex, e.ColumnIndex]; @@ -2703,12 +2691,12 @@ namespace DSPRE { exteriorbldRadioButton.Checked = true; } - disableHandlers = false; + Helpers.EnableHandlers(); selectMapComboBox_SelectedIndexChanged(null, null); } } private void mapFilesGridView_CellValueChanged(object sender, DataGridViewCellEventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } if (e.RowIndex >= 0 && e.ColumnIndex >= 0) { @@ -2723,7 +2711,7 @@ namespace DSPRE { } } private void mapFilesGridView_CellFormatting(object sender, DataGridViewCellFormattingEventArgs e) { - disableHandlers = true; + Helpers.DisableHandlers(); /* Format table cells corresponding to border maps or void */ ushort colorValue = GameMatrix.EMPTY; @@ -2738,10 +2726,10 @@ namespace DSPRE { if (colorValue == GameMatrix.EMPTY) e.Value = '-'; - disableHandlers = false; + Helpers.EnableHandlers(); } private void matrixNameTextBox_TextChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentMatrix.name = matrixNameTextBox.Text; @@ -2828,7 +2816,7 @@ namespace DSPRE { } } private void selectMatrixComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } ClearMatrixTables(); @@ -2836,11 +2824,11 @@ namespace DSPRE { GenerateMatrixTables(); /* Setup matrix editor controls */ - disableHandlers = true; + Helpers.DisableHandlers(); matrixNameTextBox.Text = currentMatrix.name; widthUpDown.Value = currentMatrix.width; heightUpDown.Value = currentMatrix.height; - disableHandlers = false; + Helpers.EnableHandlers(); } private void importColorTableButton_Click(object sender, EventArgs e) { OpenFileDialog of = new OpenFileDialog { @@ -3194,7 +3182,7 @@ namespace DSPRE { toolStripProgressBar.Visible = true; toolStripProgressBar.Maximum = 9; toolStripProgressBar.Value = 0; - statusLabelMessage("Attempting to unpack Map Editor NARCs... Please wait."); + Helpers.statusLabelMessage("Attempting to unpack Map Editor NARCs... Please wait."); Update(); DSUtils.TryUnpackNarcs(new List { DirNames.maps, @@ -3209,7 +3197,7 @@ namespace DSPRE { DSUtils.TryUnpackNarcs(new List { DirNames.interiorBuildingModels }); } - disableHandlers = true; + Helpers.DisableHandlers(); collisionPainterPictureBox.Image = new Bitmap(100, 100); typePainterPictureBox.Image = new Bitmap(100, 100); @@ -3292,7 +3280,7 @@ namespace DSPRE { toolStripProgressBar.Value = 0; toolStripProgressBar.Visible = false; - disableHandlers = false; + Helpers.EnableHandlers(); //Default selections selectMapComboBox.SelectedIndex = 0; @@ -3313,7 +3301,7 @@ namespace DSPRE { break; }; - statusLabelMessage(); + Helpers.statusLabelMessage(); } private void addMapFileButton_Click(object sender, EventArgs e) { /* Add new map file to map folder */ @@ -3371,7 +3359,7 @@ namespace DSPRE { private void buildTextureComboBox_SelectedIndexChanged(object sender, EventArgs e) { int btIndex = buildTextureComboBox.SelectedIndex; - if (disableHandlers || btIndex < 0) { + if (Helpers.HandlersDisabled || btIndex < 0) { return; } @@ -3395,9 +3383,9 @@ namespace DSPRE { } catch { string itemAtIndex = buildTextureComboBox.Items[btIndex].ToString(); if (!itemAtIndex.StartsWith("Error!")) { - disableHandlers = true; + Helpers.DisableHandlers(); buildTextureComboBox.Items[btIndex] = itemAtIndex.Insert(0, "Error! - "); - disableHandlers = false; + Helpers.EnableHandlers(); } bldTexturesOn = false; } @@ -3409,7 +3397,7 @@ namespace DSPRE { RenderMap(ref mapRenderer, ref buildingsRenderer, ref currentMapFile, ang, dist, elev, perspective, mapOpenGlControl.Width, mapOpenGlControl.Height, mapTexturesOn, bldTexturesOn); } private void mapTextureComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -3686,7 +3674,7 @@ namespace DSPRE { currentMapFile.SaveToFileExplorePath(selectMapComboBox.SelectedItem.ToString()); } private void selectMapComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -3772,13 +3760,13 @@ namespace DSPRE { RenderMap(ref mapRenderer, ref buildingsRenderer, ref currentMapFile, ang, dist, elev, perspective, mapOpenGlControl.Width, mapOpenGlControl.Height, mapTexturesOn, bldTexturesOn); } private void buildIndexComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers || buildingsListBox.SelectedIndex < 0) { + if (Helpers.HandlersDisabled || buildingsListBox.SelectedIndex < 0) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); buildingsListBox.Items[buildingsListBox.SelectedIndex] = (buildingsListBox.SelectedIndex + 1).ToString("D2") + MapHeader.nameSeparator + buildIndexComboBox.SelectedItem; - disableHandlers = false; + Helpers.EnableHandlers(); currentMapFile.buildings[buildingsListBox.SelectedIndex].modelID = (uint)buildIndexComboBox.SelectedIndex; currentMapFile.buildings[buildingsListBox.SelectedIndex].LoadModelData(romInfo.GetBuildingModelsDirPath(interiorbldRadioButton.Checked)); @@ -3788,11 +3776,11 @@ namespace DSPRE { } private void buildingsListBox_SelectedIndexChanged(object sender, EventArgs e) { int buildingNumber = buildingsListBox.SelectedIndex; - if (disableHandlers || buildingNumber < 0) { + if (Helpers.HandlersDisabled || buildingNumber < 0) { return; } - bool oldStatus = disableHandlers; - disableHandlers = true; + Helpers.BackUpDisableHandler(); + Helpers.DisableHandlers(); Building selected = currentMapFile.buildings[buildingNumber]; if (selected.NSBMDFile != null) { @@ -3815,87 +3803,87 @@ namespace DSPRE { buildingLengthUpDown.Value = selected.length; } - disableHandlers = oldStatus; + Helpers.RestoreDisableHandler(); } private void xRotBuildUpDown_ValueChanged(object sender, EventArgs e) { int selection = buildingsListBox.SelectedIndex; - if (selection <= -1 || disableHandlers) { + if (selection <= -1 || Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); xRotDegBldUpDown.Value = (decimal)Building.U16ToDeg(currentMapFile.buildings[selection].xRotation = (ushort)((int)xRotBuildUpDown.Value & ushort.MaxValue)); RenderMap(ref mapRenderer, ref buildingsRenderer, ref currentMapFile, ang, dist, elev, perspective, mapOpenGlControl.Width, mapOpenGlControl.Height, mapTexturesOn, bldTexturesOn); - disableHandlers = false; + Helpers.EnableHandlers(); } private void yRotBuildUpDown_ValueChanged(object sender, EventArgs e) { int selection = buildingsListBox.SelectedIndex; - if (selection <= -1 || disableHandlers) { + if (selection <= -1 || Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); yRotDegBldUpDown.Value = (decimal)Building.U16ToDeg(currentMapFile.buildings[selection].yRotation = (ushort)((int)yRotBuildUpDown.Value & ushort.MaxValue)); RenderMap(ref mapRenderer, ref buildingsRenderer, ref currentMapFile, ang, dist, elev, perspective, mapOpenGlControl.Width, mapOpenGlControl.Height, mapTexturesOn, bldTexturesOn); - disableHandlers = false; + Helpers.EnableHandlers(); } private void zRotBuildUpDown_ValueChanged(object sender, EventArgs e) { int selection = buildingsListBox.SelectedIndex; - if (selection <= -1 || disableHandlers) { + if (selection <= -1 || Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); zRotDegBldUpDown.Value = (decimal)Building.U16ToDeg(currentMapFile.buildings[selection].zRotation = (ushort)((int)zRotBuildUpDown.Value & ushort.MaxValue)); RenderMap(ref mapRenderer, ref buildingsRenderer, ref currentMapFile, ang, dist, elev, perspective, mapOpenGlControl.Width, mapOpenGlControl.Height, mapTexturesOn, bldTexturesOn); - disableHandlers = false; + Helpers.EnableHandlers(); } private void xRotDegBldUpDown_ValueChanged(object sender, EventArgs e) { - if (buildingsListBox.SelectedIndex <= -1 || disableHandlers) { + if (buildingsListBox.SelectedIndex <= -1 || Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); currentMapFile.buildings[buildingsListBox.SelectedIndex].xRotation = (ushort)(xRotBuildUpDown.Value = Building.DegToU16((float)xRotDegBldUpDown.Value)); RenderMap(ref mapRenderer, ref buildingsRenderer, ref currentMapFile, ang, dist, elev, perspective, mapOpenGlControl.Width, mapOpenGlControl.Height, mapTexturesOn, bldTexturesOn); - disableHandlers = false; + Helpers.EnableHandlers(); } private void yRotDegBldUpDown_ValueChanged(object sender, EventArgs e) { - if (buildingsListBox.SelectedIndex <= -1 || disableHandlers) { + if (buildingsListBox.SelectedIndex <= -1 || Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); currentMapFile.buildings[buildingsListBox.SelectedIndex].yRotation = (ushort)(yRotBuildUpDown.Value = Building.DegToU16((float)yRotDegBldUpDown.Value)); RenderMap(ref mapRenderer, ref buildingsRenderer, ref currentMapFile, ang, dist, elev, perspective, mapOpenGlControl.Width, mapOpenGlControl.Height, mapTexturesOn, bldTexturesOn); - disableHandlers = false; + Helpers.EnableHandlers(); } private void zRotDegBldUpDown_ValueChanged(object sender, EventArgs e) { - if (buildingsListBox.SelectedIndex <= -1 || disableHandlers) { + if (buildingsListBox.SelectedIndex <= -1 || Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); currentMapFile.buildings[buildingsListBox.SelectedIndex].zRotation = (ushort)(zRotBuildUpDown.Value = Building.DegToU16((float)zRotDegBldUpDown.Value)); RenderMap(ref mapRenderer, ref buildingsRenderer, ref currentMapFile, ang, dist, elev, perspective, mapOpenGlControl.Width, mapOpenGlControl.Height, mapTexturesOn, bldTexturesOn); - disableHandlers = false; + Helpers.EnableHandlers(); } private void buildingHeightUpDown_ValueChanged(object sender, EventArgs e) { if (buildingsListBox.SelectedIndex > -1) { @@ -3949,7 +3937,7 @@ namespace DSPRE { MessageBox.Show("Buildings imported successfully!", "", MessageBoxButtons.OK, MessageBoxIcon.Information); } private void interiorRadioButton_CheckedChanged(object sender, EventArgs e) { - disableHandlers = true; + Helpers.DisableHandlers(); int index = buildIndexComboBox.SelectedIndex; buildIndexComboBox.Items.Clear(); @@ -3972,12 +3960,12 @@ namespace DSPRE { /* Render the map */ RenderMap(ref mapRenderer, ref buildingsRenderer, ref currentMapFile, ang, dist, elev, perspective, mapOpenGlControl.Width, mapOpenGlControl.Height, mapTexturesOn, bldTexturesOn); - disableHandlers = false; + Helpers.EnableHandlers(); } private void removeBuildingButton_Click(object sender, EventArgs e) { int toRemoveListBoxID = buildingsListBox.SelectedIndex; if (toRemoveListBoxID > -1) { - disableHandlers = true; + Helpers.DisableHandlers(); /* Remove building object from list and the corresponding entry in the ListBox */ @@ -3987,7 +3975,7 @@ namespace DSPRE { FillBuildingsBox(); // Update ListBox RenderMap(ref mapRenderer, ref buildingsRenderer, ref currentMapFile, ang, dist, elev, perspective, mapOpenGlControl.Width, mapOpenGlControl.Height, mapTexturesOn, bldTexturesOn); - disableHandlers = false; + Helpers.EnableHandlers(); if (buildingsListBox.Items.Count > 0) { if (toRemoveListBoxID > 0) { @@ -3999,7 +3987,7 @@ namespace DSPRE { } } private void xBuildUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers || buildingsListBox.SelectedIndex < 0) { + if (Helpers.HandlersDisabled || buildingsListBox.SelectedIndex < 0) { return; } @@ -4016,7 +4004,7 @@ namespace DSPRE { RenderMap(ref mapRenderer, ref buildingsRenderer, ref currentMapFile, ang, dist, elev, perspective, mapOpenGlControl.Width, mapOpenGlControl.Height, mapTexturesOn, bldTexturesOn); } private void zBuildUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers || buildingsListBox.SelectedIndex < 0) + if (Helpers.HandlersDisabled || buildingsListBox.SelectedIndex < 0) return; var wholePart = Math.Truncate(zBuildUpDown.Value); @@ -4032,7 +4020,7 @@ namespace DSPRE { RenderMap(ref mapRenderer, ref buildingsRenderer, ref currentMapFile, ang, dist, elev, perspective, mapOpenGlControl.Width, mapOpenGlControl.Height, mapTexturesOn, bldTexturesOn); } private void yBuildUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers || buildingsListBox.SelectedIndex < 0) + if (Helpers.HandlersDisabled || buildingsListBox.SelectedIndex < 0) return; var wholePart = Math.Truncate(yBuildUpDown.Value); @@ -4889,7 +4877,7 @@ namespace DSPRE { private void eventPictureBox_MouseMove(object sender, MouseEventArgs e) { Point coordinates = eventPictureBox.PointToClient(Cursor.Position); Point mouseTilePos = new Point(coordinates.X / (tileSize + 1), coordinates.Y / (tileSize + 1)); - statusLabelMessage("Local: " + mouseTilePos.X + ", " + mouseTilePos.Y + " | " + "Global: " + (eventMatrixXUpDown.Value * MapFile.mapSize + mouseTilePos.X).ToString() + ", " + (eventMatrixYUpDown.Value * MapFile.mapSize + mouseTilePos.Y).ToString()); + Helpers.statusLabelMessage("Local: " + mouseTilePos.X + ", " + mouseTilePos.Y + " | " + "Global: " + (eventMatrixXUpDown.Value * MapFile.mapSize + mouseTilePos.X).ToString() + ", " + (eventMatrixYUpDown.Value * MapFile.mapSize + mouseTilePos.Y).ToString()); } private void DisplayActiveEvents() { @@ -5035,10 +5023,10 @@ namespace DSPRE { areaDataID = h.areaDataID; - bool disableHandlersbackup = disableHandlers; - disableHandlers = true; + Helpers.BackUpDisableHandler(); + Helpers.DisableHandlers(); eventAreaDataUpDown.Value = h.areaDataID; - disableHandlers = disableHandlersbackup; + Helpers.RestoreDisableHandler(); } else { areaDataID = (byte)eventAreaDataUpDown.Value; } @@ -5248,7 +5236,7 @@ namespace DSPRE { private void SetupEventEditor() { /* Extract essential NARCs sub-archives*/ - statusLabelMessage("Attempting to unpack Event Editor NARCs... Please wait. This might take a while"); + Helpers.statusLabelMessage("Attempting to unpack Event Editor NARCs... Please wait. This might take a while"); toolStripProgressBar.Visible = true; toolStripProgressBar.Maximum = 12; toolStripProgressBar.Value = 0; @@ -5276,7 +5264,7 @@ namespace DSPRE { DSUtils.TryUnpackNarcs(new List { DirNames.interiorBuildingModels }); } - disableHandlers = true; + Helpers.DisableHandlers(); if (File.Exists(RomInfo.OWtablePath)) { switch (RomInfo.gameFamily) { case GameFamilies.DP: @@ -5298,7 +5286,7 @@ namespace DSPRE { } /* Add event file numbers to box */ - statusLabelMessage("Loading Events... Please wait."); + Helpers.statusLabelMessage("Loading Events... Please wait."); Update(); int eventCount = RomInfo.GetEventFileCount(); @@ -5373,7 +5361,7 @@ namespace DSPRE { eventMatrixUpDown.Maximum = romInfo.GetMatrixCount() - 1; eventAreaDataUpDown.Maximum = romInfo.GetAreaDataCount() - 1; - disableHandlers = false; + Helpers.EnableHandlers(); selectEventComboBox.SelectedIndex = 0; owItemComboBox.SelectedIndex = 0; @@ -5382,7 +5370,7 @@ namespace DSPRE { toolStripProgressBar.Value = 0; toolStripProgressBar.Visible = false; - statusLabelMessage(); + Helpers.statusLabelMessage(); } private void addEventFileButton_Click(object sender, EventArgs e) { /* Add copy of event 0 to event folder */ @@ -5405,17 +5393,17 @@ namespace DSPRE { eventMatrixYUpDown.Value = mouseTilePos.Y; } private void eventMatrixUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); eventMatrix = new GameMatrix((int)eventMatrixUpDown.Value); eventMatrixXUpDown.Maximum = eventMatrix.width - 1; eventMatrixYUpDown.Maximum = eventMatrix.height - 1; eventEditorFullMapReload((int)eventMatrixXUpDown.Value, (int)eventMatrixYUpDown.Value); - disableHandlers = false; + Helpers.EnableHandlers(); CenterEventViewOnEntities(); } @@ -5440,7 +5428,7 @@ namespace DSPRE { } } private void eventMatrixCoordsUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -5580,10 +5568,10 @@ namespace DSPRE { } } private void selectEventComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); /* Load events data into EventFile class instance */ currentEvFile = new EventFile(selectEventComboBox.SelectedIndex); @@ -5608,19 +5596,19 @@ namespace DSPRE { eventMatrixYUpDown.Maximum = eventMatrix.height - 1; eventAreaDataUpDown.Value = h.areaDataID; - statusLabelMessage($"Detected link between Event File {selectEventComboBox.SelectedIndex} and Header {mapHeader}"); + Helpers.statusLabelMessage($"Detected link between Event File {selectEventComboBox.SelectedIndex} and Header {mapHeader}"); } else { - statusLabelError($"Could not link Event File {selectEventComboBox.SelectedIndex} to any Header"); + Helpers.statusLabelError($"Could not link Event File {selectEventComboBox.SelectedIndex} to any Header"); } eventEditorFullMapReload((int)eventMatrixXUpDown.Value, (int)eventMatrixYUpDown.Value); - disableHandlers = false; + Helpers.EnableHandlers(); CenterEventViewOnEntities(); } private void showEventsCheckBoxes_CheckedChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -5764,7 +5752,7 @@ namespace DSPRE { return; } - disableHandlers = true; + Helpers.DisableHandlers(); /* Remove trigger object from list and the corresponding entry in the ListBox */ int spawnableNumber = spawnablesListBox.SelectedIndex; @@ -5773,7 +5761,7 @@ namespace DSPRE { FillSpawnablesBox(); // Update ListBox - disableHandlers = false; + Helpers.EnableHandlers(); if (spawnableNumber > 0) { spawnablesListBox.SelectedIndex = spawnableNumber - 1; @@ -5793,9 +5781,9 @@ namespace DSPRE { updateSelectedSpawnableName(); } private void spawnablesListBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers || spawnablesListBox.SelectedIndex < 0) + if (Helpers.HandlersDisabled || spawnablesListBox.SelectedIndex < 0) return; - disableHandlers = true; + Helpers.DisableHandlers(); /* Set Event */ selectedEvent = currentEvFile.spawnables[spawnablesListBox.SelectedIndex]; @@ -5812,11 +5800,11 @@ namespace DSPRE { spawnableYMatrixUpDown.Value = currentEvFile.spawnables[spawnablesListBox.SelectedIndex].yMatrixPosition; DisplayActiveEvents(); - disableHandlers = false; + Helpers.EnableHandlers(); } private void spawnableMatrixXUpDown_ValueChanged(object sender, EventArgs e) { int selectedSpawnable = spawnablesListBox.SelectedIndex; - if (disableHandlers || selectedSpawnable < 0) { + if (Helpers.HandlersDisabled || selectedSpawnable < 0) { return; } @@ -5825,7 +5813,7 @@ namespace DSPRE { } private void spawnableMatrixYUpDown_ValueChanged(object sender, EventArgs e) { int selectedSpawnable = spawnablesListBox.SelectedIndex; - if (disableHandlers || selectedSpawnable < 0) { + if (Helpers.HandlersDisabled || selectedSpawnable < 0) { return; } @@ -5834,7 +5822,7 @@ namespace DSPRE { } private void spawnableScriptUpDown_ValueChanged(object sender, EventArgs e) { int selectedSpawnable = spawnablesListBox.SelectedIndex; - if (disableHandlers || selectedSpawnable < 0) { + if (Helpers.HandlersDisabled || selectedSpawnable < 0) { return; } @@ -5843,7 +5831,7 @@ namespace DSPRE { } private void spawnableMapXUpDown_ValueChanged(object sender, EventArgs e) { int selectedSpawnable = spawnablesListBox.SelectedIndex; - if (disableHandlers || selectedSpawnable < 0) { + if (Helpers.HandlersDisabled || selectedSpawnable < 0) { return; } @@ -5852,7 +5840,7 @@ namespace DSPRE { } private void spawnableMapYUpDown_ValueChanged(object sender, EventArgs e) { int selectedSpawnable = spawnablesListBox.SelectedIndex; - if (disableHandlers || selectedSpawnable < 0) { + if (Helpers.HandlersDisabled || selectedSpawnable < 0) { return; } @@ -5861,7 +5849,7 @@ namespace DSPRE { } private void spawnableZUpDown_ValueChanged(object sender, EventArgs e) { int selectedSpawnable = spawnablesListBox.SelectedIndex; - if (disableHandlers || selectedSpawnable < 0) { + if (Helpers.HandlersDisabled || selectedSpawnable < 0) { return; } @@ -5870,7 +5858,7 @@ namespace DSPRE { } private void spawnableDirComboBox_SelectedIndexChanged(object sender, EventArgs e) { int selectedSpawnable = spawnablesListBox.SelectedIndex; - if (disableHandlers || selectedSpawnable < 0) { + if (Helpers.HandlersDisabled || selectedSpawnable < 0) { return; } @@ -5879,7 +5867,7 @@ namespace DSPRE { } private void spawnableTypeComboBox_SelectedIndexChanged(object sender, EventArgs e) { int selectedSpawnable = spawnablesListBox.SelectedIndex; - if (disableHandlers || selectedSpawnable < 0) { + if (Helpers.HandlersDisabled || selectedSpawnable < 0) { return; } @@ -5909,7 +5897,7 @@ namespace DSPRE { return; } - disableHandlers = true; + Helpers.DisableHandlers(); /* Remove overworld object from list and the corresponding entry in the ListBox */ int owNumber = overworldsListBox.SelectedIndex; @@ -5917,7 +5905,7 @@ namespace DSPRE { overworldsListBox.Items.RemoveAt(owNumber); FillOverworldsBox(); // Update ListBox - disableHandlers = false; + Helpers.EnableHandlers(); if (owNumber > 0) { overworldsListBox.SelectedIndex = owNumber - 1; @@ -5957,7 +5945,7 @@ namespace DSPRE { owScriptNumericUpDown.Enabled = true; owSpecialGroupBox.Enabled = false; - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentEvFile.overworlds[overworldsListBox.SelectedIndex].type = 0x0; @@ -5977,7 +5965,7 @@ namespace DSPRE { itemsSelectorHelpBtn.Enabled = true; owItemLabel.Enabled = true; - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentEvFile.overworlds[overworldsListBox.SelectedIndex].type = 0x3; @@ -5997,7 +5985,7 @@ namespace DSPRE { owItemComboBox.Enabled = false; itemsSelectorHelpBtn.Enabled = false; - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentEvFile.overworlds[overworldsListBox.SelectedIndex].type = 0x1; @@ -6007,7 +5995,7 @@ namespace DSPRE { } } private void owItemComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers || overworldsListBox.SelectedIndex < 0) { + if (Helpers.HandlersDisabled || overworldsListBox.SelectedIndex < 0) { return; } @@ -6016,10 +6004,10 @@ namespace DSPRE { private void overworldsListBox_SelectedIndexChanged(object sender, EventArgs e) { int index = overworldsListBox.SelectedIndex; - if (disableHandlers || index < 0) { + if (Helpers.HandlersDisabled || index < 0) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); selectedEvent = currentEvFile.overworlds[index]; Overworld selectedOw = (Overworld)selectedEvent; @@ -6085,12 +6073,12 @@ namespace DSPRE { MessageBox.Show(errorMsg, "Something went wrong", MessageBoxButtons.OK, MessageBoxIcon.Error); } - disableHandlers = false; + Helpers.EnableHandlers(); } private void owFlagNumericUpDown_ValueChanged(object sender, EventArgs e) { int selection = overworldsListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6099,7 +6087,7 @@ namespace DSPRE { private void owIDNumericUpDown_ValueChanged(object sender, EventArgs e) { int selection = overworldsListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6109,7 +6097,7 @@ namespace DSPRE { private void owMovementComboBox_SelectedIndexChanged(object sender, EventArgs e) { int selection = overworldsListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6125,7 +6113,7 @@ namespace DSPRE { if (selection >= 0) { owSpritePictureBox.BackgroundImage = GetOverworldImage(currentEvFile.overworlds[selection].overlayTableEntry, orientation); - if (!disableHandlers) { + if (Helpers.HandlersEnabled) { currentEvFile.overworlds[selection].orientation = orientation; DisplayActiveEvents(); } @@ -6138,7 +6126,7 @@ namespace DSPRE { private void owScriptNumericUpDown_ValueChanged(object sender, EventArgs e) { int selection = overworldsListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6148,7 +6136,7 @@ namespace DSPRE { private void owSightRangeUpDown_ValueChanged(object sender, EventArgs e) { int selection = overworldsListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6171,7 +6159,7 @@ namespace DSPRE { if (selection >= 0) { owSpritePictureBox.BackgroundImage = GetOverworldImage(overlayTableEntryID, currentEvFile.overworlds[selection].orientation); - if (!disableHandlers) { + if (Helpers.HandlersEnabled) { currentEvFile.overworlds[selection].overlayTableEntry = overlayTableEntryID; DisplayActiveEvents(); } @@ -6184,7 +6172,7 @@ namespace DSPRE { private void owPartnerTrainerCheckBox_CheckedChanged(object sender, EventArgs e) { int selection = overworldsListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6193,7 +6181,7 @@ namespace DSPRE { private void owTrainerComboBox_SelectedIndexChanged(object sender, EventArgs e) { int selection = overworldsListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6202,7 +6190,7 @@ namespace DSPRE { private void owXMapUpDown_ValueChanged(object sender, EventArgs e) { int selection = overworldsListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6212,7 +6200,7 @@ namespace DSPRE { private void owXRangeUpDown_ValueChanged(object sender, EventArgs e) { int selection = overworldsListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6221,7 +6209,7 @@ namespace DSPRE { private void owYRangeUpDown_ValueChanged(object sender, EventArgs e) { int selection = overworldsListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6230,7 +6218,7 @@ namespace DSPRE { private void owYMapUpDown_ValueChanged(object sender, EventArgs e) { int selection = overworldsListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6240,7 +6228,7 @@ namespace DSPRE { private void owZPositionUpDown_ValueChanged(object sender, EventArgs e) { int selection = overworldsListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6250,7 +6238,7 @@ namespace DSPRE { private void owXMatrixUpDown_ValueChanged(object sender, EventArgs e) { int selection = overworldsListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6261,7 +6249,7 @@ namespace DSPRE { } private void owYMatrixUpDown_ValueChanged(object sender, EventArgs e) { int selection = overworldsListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6291,7 +6279,7 @@ namespace DSPRE { return; } - disableHandlers = true; + Helpers.DisableHandlers(); /* Remove warp object from list and the corresponding entry in the ListBox */ int warpNumber = warpsListBox.SelectedIndex; @@ -6300,7 +6288,7 @@ namespace DSPRE { FillWarpsBox(); // Update ListBox - disableHandlers = false; + Helpers.EnableHandlers(); if (warpNumber > 0) { warpsListBox.SelectedIndex = warpNumber - 1; @@ -6325,7 +6313,7 @@ namespace DSPRE { eventEditorWarpHeaderListBox.SelectedIndex = n.header; } private void warpAnchorUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers || warpsListBox.SelectedIndex < 0) { + if (Helpers.HandlersDisabled || warpsListBox.SelectedIndex < 0) { return; } @@ -6373,7 +6361,7 @@ namespace DSPRE { eventEditorHeaderLocationNameLabel.Text = (string)locationNameComboBox.Items[locNum]; int warpSel = warpsListBox.SelectedIndex; - if (disableHandlers || warpSel < 0) { + if (Helpers.HandlersDisabled || warpSel < 0) { return; } currentEvFile.warps[warpSel].header = destHeaderID; @@ -6409,7 +6397,7 @@ namespace DSPRE { } private void warpsListBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers || warpsListBox.SelectedIndex < 0) { + if (Helpers.HandlersDisabled || warpsListBox.SelectedIndex < 0) { return; } @@ -6417,7 +6405,7 @@ namespace DSPRE { selectedEvent = currentEvFile.warps[warpsListBox.SelectedIndex]; eventEditorWarpHeaderListBox.SelectedIndex = currentEvFile.warps[warpsListBox.SelectedIndex].header; - disableHandlers = true; + Helpers.DisableHandlers(); warpAnchorUpDown.Value = currentEvFile.warps[warpsListBox.SelectedIndex].anchor; warpXMapUpDown.Value = currentEvFile.warps[warpsListBox.SelectedIndex].xMapPosition; @@ -6429,12 +6417,12 @@ namespace DSPRE { DisplayActiveEvents(); // Redraw events to show selection box #region Re-enable events - disableHandlers = false; + Helpers.EnableHandlers(); #endregion } private void warpMatrixXUpDown_ValueChanged(object sender, EventArgs e) { int index = warpsListBox.SelectedIndex; - if (disableHandlers || index < 0) { + if (Helpers.HandlersDisabled || index < 0) { return; } @@ -6443,7 +6431,7 @@ namespace DSPRE { } private void warpMatrixYUpDown_ValueChanged(object sender, EventArgs e) { int index = warpsListBox.SelectedIndex; - if (disableHandlers || index < 0) { + if (Helpers.HandlersDisabled || index < 0) { return; } @@ -6452,7 +6440,7 @@ namespace DSPRE { } private void warpXMapUpDown_ValueChanged(object sender, EventArgs e) { int index = warpsListBox.SelectedIndex; - if (disableHandlers || index < 0) { + if (Helpers.HandlersDisabled || index < 0) { return; } @@ -6461,7 +6449,7 @@ namespace DSPRE { } private void warpYMapUpDown_ValueChanged(object sender, EventArgs e) { int index = warpsListBox.SelectedIndex; - if (disableHandlers || index < 0) { + if (Helpers.HandlersDisabled || index < 0) { return; } @@ -6470,7 +6458,7 @@ namespace DSPRE { } private void warpZUpDown_ValueChanged(object sender, EventArgs e) { int index = warpsListBox.SelectedIndex; - if (disableHandlers || index < 0) { + if (Helpers.HandlersDisabled || index < 0) { return; } @@ -6530,7 +6518,7 @@ namespace DSPRE { return; } - disableHandlers = true; + Helpers.DisableHandlers(); /* Remove trigger object from list and the corresponding entry in the ListBox */ currentEvFile.triggers.RemoveAt(selection); @@ -6538,7 +6526,7 @@ namespace DSPRE { FillTriggersBox(); // Update ListBox - disableHandlers = false; + Helpers.EnableHandlers(); if (selection > 0) { triggersListBox.SelectedIndex = selection - 1; @@ -6560,10 +6548,10 @@ namespace DSPRE { private void triggersListBox_SelectedIndexChanged(object sender, EventArgs e) { int selectedIndex = triggersListBox.SelectedIndex; - if (disableHandlers || selectedIndex < 0) { + if (Helpers.HandlersDisabled || selectedIndex < 0) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); Trigger t = (selectedEvent = currentEvFile.triggers[selectedIndex]) as Trigger; @@ -6582,11 +6570,11 @@ namespace DSPRE { DisplayActiveEvents(); - disableHandlers = false; + Helpers.EnableHandlers(); } private void triggerVariableWatchedUpDown_ValueChanged(object sender, EventArgs e) { int selection = triggersListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6595,7 +6583,7 @@ namespace DSPRE { } private void expectedVarValueTriggerUpDown_ValueChanged(object sender, EventArgs e) { int selection = triggersListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6604,7 +6592,7 @@ namespace DSPRE { } private void triggerScriptUpDown_ValueChanged(object sender, EventArgs e) { int selection = triggersListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6613,7 +6601,7 @@ namespace DSPRE { } private void triggerXMapUpDown_ValueChanged(object sender, EventArgs e) { int selection = triggersListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6622,7 +6610,7 @@ namespace DSPRE { } private void triggerYMapUpDown_ValueChanged(object sender, EventArgs e) { int selection = triggersListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6631,7 +6619,7 @@ namespace DSPRE { } private void triggerZUpDown_ValueChanged(object sender, EventArgs e) { int selection = triggersListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6640,7 +6628,7 @@ namespace DSPRE { } private void triggerXMatrixUpDown_ValueChanged(object sender, EventArgs e) { int selection = triggersListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6649,7 +6637,7 @@ namespace DSPRE { } private void triggerYMatrixUpDown_ValueChanged(object sender, EventArgs e) { int selection = triggersListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6658,7 +6646,7 @@ namespace DSPRE { } private void triggerWidthUpDown_ValueChanged(object sender, EventArgs e) { int selection = triggersListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6667,7 +6655,7 @@ namespace DSPRE { } private void triggerLengthUpDown_ValueChanged(object sender, EventArgs e) { int selection = triggersListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6702,14 +6690,14 @@ namespace DSPRE { private Scintilla currentScintillaEditor; private SearchManager currentSearchManager; private void ScriptEditorSetClean() { - disableHandlers = true; + Helpers.DisableHandlers(); scriptsTabPage.Text = ScriptFile.containerTypes.Script.ToString() + "s"; functionsTabPage.Text = ScriptFile.containerTypes.Function.ToString() + "s"; actionsTabPage.Text = ScriptFile.containerTypes.Action.ToString() + "s"; scriptsDirty = functionsDirty = actionsDirty = false; - disableHandlers = false; + Helpers.EnableHandlers(); } private void scriptEditorTabControl_TabIndexChanged(object sender, EventArgs e) { if (scriptEditorTabControl.SelectedTab == scriptsTabPage) { @@ -7444,7 +7432,7 @@ namespace DSPRE { private bool ReloadScript() { Console.WriteLine("Script Reload has been requested"); /* clear controls */ - if (disableHandlers || selectScriptFileComboBox.SelectedIndex < 0) { + if (Helpers.HandlersDisabled || selectScriptFileComboBox.SelectedIndex < 0) { return false; } @@ -7452,9 +7440,9 @@ namespace DSPRE { DialogResult d = MessageBox.Show("There are unsaved changes in this Script File.\nDo you wish to discard them?", "Unsaved work", MessageBoxButtons.YesNo, MessageBoxIcon.Warning); if (!d.Equals(DialogResult.Yes)) { - disableHandlers = true; + Helpers.DisableHandlers(); selectScriptFileComboBox.SelectedIndex = (int)currentScriptFile.fileID; - disableHandlers = false; + Helpers.EnableHandlers(); return false; } } @@ -7475,7 +7463,7 @@ namespace DSPRE { clearCurrentLevelScriptButton.Visible = true; } else { - disableHandlers = true; + Helpers.DisableHandlers(); addScriptFileButton.Visible = true; removeScriptFileButton.Visible = true; @@ -7555,13 +7543,13 @@ namespace DSPRE { } ScriptEditorSetClean(); - statusLabelMessage(); - disableHandlers = false; + Helpers.statusLabelMessage(); + Helpers.EnableHandlers(); return true; } private void UpdateScriptNumberFormatDec(object sender, EventArgs e) { - if (!disableHandlers && scriptEditorNumberFormatDecimal.Checked) { + if (Helpers.HandlersEnabled && scriptEditorNumberFormatDecimal.Checked) { NumberStyles old = (NumberStyles)Properties.Settings.Default.scriptEditorFormatPreference; //Local Backup Properties.Settings.Default.scriptEditorFormatPreference = (int)NumberStyles.Integer; @@ -7572,7 +7560,7 @@ namespace DSPRE { } } private void UpdateScriptNumberFormatHex(object sender, EventArgs e) { - if (!disableHandlers && scriptEditorNumberFormatHex.Checked) { + if (Helpers.HandlersEnabled && scriptEditorNumberFormatHex.Checked) { NumberStyles old = (NumberStyles)Properties.Settings.Default.scriptEditorFormatPreference; //Local Backup Properties.Settings.Default.scriptEditorFormatPreference = (int)NumberStyles.HexNumber; @@ -7582,7 +7570,7 @@ namespace DSPRE { } } private void UpdateScriptNumberFormatNoPref(object sender, EventArgs e) { - if (!disableHandlers && scriptEditorNumberFormatNoPreference.Checked) { + if (Helpers.HandlersEnabled && scriptEditorNumberFormatNoPreference.Checked) { NumberStyles old = (NumberStyles)Properties.Settings.Default.scriptEditorFormatPreference; //Local Backup Properties.Settings.Default.scriptEditorFormatPreference = (int)NumberStyles.None; @@ -7594,7 +7582,7 @@ namespace DSPRE { private void UpdateScriptNumberCheckBox(NumberStyles toSet) { - disableHandlers = true; + Helpers.DisableHandlers(); Properties.Settings.Default.scriptEditorFormatPreference = (int)toSet; switch ((NumberStyles)Properties.Settings.Default.scriptEditorFormatPreference) { @@ -7609,7 +7597,7 @@ namespace DSPRE { break; } Console.WriteLine("changed style to " + Properties.Settings.Default.scriptEditorFormatPreference); - disableHandlers = false; + Helpers.EnableHandlers(); } private void scriptsNavListbox_SelectedIndexChanged(object sender, EventArgs e) { @@ -7662,7 +7650,7 @@ namespace DSPRE { int rowInd = textEditorDataGridView.RowCount - 1; - disableHandlers = true; + Helpers.DisableHandlers(); string format = "X"; string prefix = "0x"; @@ -7672,7 +7660,7 @@ namespace DSPRE { } textEditorDataGridView.Rows[rowInd].HeaderCell.Value = prefix + rowInd.ToString(format); - disableHandlers = false; + Helpers.EnableHandlers(); } private void exportTextFileButton_Click(object sender, EventArgs e) { @@ -7929,7 +7917,7 @@ namespace DSPRE { textSearchProgressBar.Value = cur; if (found) { - disableHandlers = true; + Helpers.DisableHandlers(); textSearchResultsListBox.Items.Add("Text archive (" + cur + ") - Succesfully edited"); currentTextArchive.SaveToFileDefaultDir(cur, showSuccessMessage: false); @@ -7938,7 +7926,7 @@ namespace DSPRE { UpdateTextEditorFileView(false); } - disableHandlers = false; + Helpers.EnableHandlers(); } //else searchMessageResultTextBox.AppendText(searchString + " not found in this file"); //this.saveMessageFileButton_Click(sender, e); @@ -7952,7 +7940,7 @@ namespace DSPRE { UpdateTextEditorFileView(true); } private void UpdateTextEditorFileView(bool readAgain) { - disableHandlers = true; + Helpers.DisableHandlers(); textEditorDataGridView.Rows.Clear(); if (currentTextArchive is null || readAgain) { @@ -7969,7 +7957,7 @@ namespace DSPRE { PrintTextEditorLinesDecimal(); } - disableHandlers = false; + Helpers.EnableHandlers(); textEditorDataGridView_CurrentCellChanged(textEditorDataGridView, null); } @@ -7988,7 +7976,7 @@ namespace DSPRE { } } private void textEditorDataGridView_CellValueChanged(object sender, DataGridViewCellEventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } if (e.RowIndex > -1 && e.ColumnIndex > -1) { @@ -8001,7 +7989,7 @@ namespace DSPRE { } private void textEditorDataGridView_CurrentCellChanged(object sender, EventArgs e) { DataGridView dgv = sender as DataGridView; - if (disableHandlers || dgv == null || dgv.CurrentCell == null) { + if (Helpers.HandlersDisabled || dgv == null || dgv.CurrentCell == null) { return; } @@ -8050,13 +8038,13 @@ namespace DSPRE { Properties.Settings.Default.textEditorPreferHex = hexRadiobutton.Checked; } private void updateTextEditorLineNumbers() { - disableHandlers = true; + Helpers.DisableHandlers(); if (hexRadiobutton.Checked) { PrintTextEditorLinesHex(); } else { PrintTextEditorLinesDecimal(); } - disableHandlers = false; + Helpers.EnableHandlers(); } #endregion @@ -8079,7 +8067,7 @@ namespace DSPRE { } } private void SetupNSBTXEditor() { - statusLabelMessage("Attempting to unpack Tileset Editor NARCs... Please wait."); + Helpers.statusLabelMessage("Attempting to unpack Tileset Editor NARCs... Please wait."); Update(); DSUtils.TryUnpackNarcs(new List { @@ -8132,7 +8120,7 @@ namespace DSPRE { if (palettesListBox.Items.Count > 0) { palettesListBox.SelectedIndex = 0; } - statusLabelMessage(); + Helpers.statusLabelMessage(); } private void buildingsTilesetRadioButton_CheckedChanged(object sender, EventArgs e) { FillTilesetBox(); @@ -8194,7 +8182,7 @@ namespace DSPRE { } } private void palettesListBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -8202,16 +8190,16 @@ namespace DSPRE { int ctrlCode = NSBTXRender(tex: texturesListBox.SelectedIndex, pal: palettesListBox.SelectedIndex, scale: nsbtxScaleFactor); if (ctrlCode > 0) { - statusLabelError($"ERROR! The selected palette doesn't have enough colors for this Palette{ctrlCode} texture."); + Helpers.statusLabelError($"ERROR! The selected palette doesn't have enough colors for this Palette{ctrlCode} texture."); } else { - statusLabelMessage(); + Helpers.statusLabelMessage(); } } private void texturePacksListBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); /* Clear ListBoxes */ texturesListBox.Items.Clear(); @@ -8230,47 +8218,47 @@ namespace DSPRE { texturePacksListBox.Items[texturePacksListBox.SelectedIndex] = "Error! - " + currentItemName; } - disableHandlers = false; + Helpers.EnableHandlers(); return; } /* Add textures and palette slot names to ListBoxes */ texturesListBox.Items.AddRange(currentNsbtx.texInfo.names.ToArray()); palettesListBox.Items.AddRange(currentNsbtx.palInfo.names.ToArray()); - disableHandlers = false; + Helpers.EnableHandlers(); if (texturesListBox.Items.Count > 0) { texturesListBox.SelectedIndex = 0; } } private void texturesListBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } - bool disableHandlersBackup = disableHandlers; - disableHandlers = true; + Helpers.BackUpDisableHandler(); + Helpers.DisableHandlers(); texturesLabel.Text = $"Textures [{texturesListBox.SelectedIndex + 1}/{texturesListBox.Items.Count}]"; string findThis = texturesListBox.SelectedItem.ToString(); string matchingPalette = findAndSelectMatchingPalette(findThis); if (matchingPalette == null) { - statusLabelError("Couldn't find a palette to match " + '"' + findThis + '"', severe: false); + Helpers.statusLabelError("Couldn't find a palette to match " + '"' + findThis + '"', severe: false); } else { palettesListBox.SelectedItem = matchingPalette; - statusLabelMessage("Ready"); + Helpers.statusLabelMessage("Ready"); } - disableHandlers = disableHandlersBackup; + Helpers.RestoreDisableHandler(); int ctrlCode = NSBTXRender(tex: Math.Max(0, texturesListBox.SelectedIndex), pal: Math.Max(0, palettesListBox.SelectedIndex), scale: nsbtxScaleFactor); if (matchingPalette != null && ctrlCode > 0) { - statusLabelError($"ERROR! The selected palette doesn't have enough colors for this Palette{ctrlCode} texture."); + Helpers.statusLabelError($"ERROR! The selected palette doesn't have enough colors for this Palette{ctrlCode} texture."); } } private string findAndSelectMatchingPalette(string findThis) { - statusLabelMessage("Searching palette..."); + Helpers.statusLabelMessage("Searching palette..."); string copy = findThis; while (copy.Length > 0) { @@ -8292,7 +8280,7 @@ namespace DSPRE { return null; } private void areaDataBuildingTilesetUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentAreaData.buildingsTileset = (ushort)areaDataBuildingTilesetUpDown.Value; @@ -8304,19 +8292,19 @@ namespace DSPRE { areaDataDynamicTexturesNumericUpDown.ForeColor = Color.Black; } - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentAreaData.dynamicTextureType = (ushort)areaDataDynamicTexturesNumericUpDown.Value; } private void areaDataLightTypeComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentAreaData.lightType = (byte)areaDataLightTypeComboBox.SelectedIndex; } private void areaDataMapTilesetUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentAreaData.mapTileset = (ushort)areaDataMapTilesetUpDown.Value; @@ -8331,7 +8319,7 @@ namespace DSPRE { areaDataMapTilesetUpDown.Value = currentAreaData.mapTileset; areaDataLightTypeComboBox.SelectedIndex = currentAreaData.lightType; - disableHandlers = true; + Helpers.DisableHandlers(); if (RomInfo.gameFamily == GameFamilies.HGSS) { areaDataDynamicTexturesNumericUpDown.Value = currentAreaData.dynamicTextureType; @@ -8339,7 +8327,7 @@ namespace DSPRE { indoorAreaRadioButton.Checked = interior; outdoorAreaRadioButton.Checked = !interior; } - disableHandlers = false; + Helpers.EnableHandlers(); } private void indoorAreaRadioButton_CheckedChanged(object sender, EventArgs e) { currentAreaData.areaType = indoorAreaRadioButton.Checked ? AreaData.TYPE_INDOOR : AreaData.TYPE_OUTDOOR; @@ -8677,12 +8665,12 @@ namespace DSPRE { } } private void SetupTrainerEditor() { - disableHandlers = true; + Helpers.DisableHandlers(); SetTrainerNameMaxLen(); SetupTrainerClassEncounterMusicTable(); /* Extract essential NARCs sub-archives*/ - statusLabelMessage("Setting up Trainer Editor..."); + Helpers.statusLabelMessage("Setting up Trainer Editor..."); Update(); DSUtils.TryUnpackNarcs(new List { @@ -8872,15 +8860,15 @@ namespace DSPRE { trainerComboBox.SelectedIndex = 0; - disableHandlers = false; + Helpers.EnableHandlers(); trainerComboBox_SelectedIndexChanged(null, null); - statusLabelMessage(); + Helpers.statusLabelMessage(); } private void trainerComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); int currentIndex = trainerComboBox.SelectedIndex; string suffix = "\\" + currentIndex.ToString("D4"); @@ -8898,7 +8886,7 @@ namespace DSPRE { RefreshTrainerPartyGUI(); RefreshTrainerPropertiesGUI(); - disableHandlers = false; + Helpers.EnableHandlers(); if (error) { MessageBox.Show("This Trainer File doesn't have a corresponding name.\n\n" + @@ -9083,7 +9071,7 @@ namespace DSPRE { } } private void partyMoveComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (!disableHandlers) { + if (Helpers.HandlersEnabled) { for (int i = 0; i < TrainerFile.POKE_IN_PARTY; i++) { ushort[] moves = currentTrainerFile.party[i].moves; @@ -9193,9 +9181,9 @@ namespace DSPRE { string editedTrainer = "[" + currentTrainerFile.trp.trainerID.ToString("D2") + "] " + trClass + " " + currentTrainerFile.name; - disableHandlers = true; + Helpers.DisableHandlers(); trainerComboBox.Items[trainerComboBox.SelectedIndex] = editedTrainer; - disableHandlers = false; + Helpers.EnableHandlers(); if (eventEditorIsReady) { owTrainerComboBox.Items[trainerComboBox.SelectedIndex] = editedTrainer; @@ -9395,7 +9383,7 @@ namespace DSPRE { } private void saveTrainerClassButton_Click(object sender, EventArgs e) { - disableHandlers = true; + Helpers.DisableHandlers(); int selectedTrClass = trainerClassListBox.SelectedIndex; @@ -9414,7 +9402,7 @@ namespace DSPRE { if (currentTrainerFile.trp.trainerClass == trainerClassListBox.SelectedIndex) { UpdateCurrentTrainerShownName(); } - disableHandlers = false; + Helpers.EnableHandlers(); if (gameFamily.Equals(GameFamilies.HGSS) && tableEditorIsReady) { pbEffectsTrainerCombobox.Items[selectedTrClass] = trainerClassListBox.Items[selectedTrClass]; @@ -9769,15 +9757,15 @@ namespace DSPRE { int selection = conditionalMusicTableListBox.SelectedIndex; headerConditionalMusicComboBox.SelectedIndex = conditionalMusicTable[selection].header; - disableHandlers = true; + Helpers.DisableHandlers(); flagConditionalMusicUpDown.Value = conditionalMusicTable[selection].flag; musicIDconditionalMusicUpDown.Value = conditionalMusicTable[selection].music; - disableHandlers = false; + Helpers.EnableHandlers(); } private void headerConditionalMusicComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -9799,7 +9787,7 @@ namespace DSPRE { } } private void flagConditionalMusicUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -9808,7 +9796,7 @@ namespace DSPRE { } private void musicIDconditionalMusicUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -9844,7 +9832,7 @@ namespace DSPRE { wr.Write(battleMusic); }; - disableHandlers = true; + Helpers.DisableHandlers(); string updatedEntry = "Combo " + index.ToString("D2") + " - " + "Effect #" + battleIntroEffect + ", " + "Music #" + battleMusic; pbEffectsCombosListbox.Items[index] = updatedEntry; @@ -9852,7 +9840,7 @@ namespace DSPRE { if (RomInfo.gameFamily == GameFamilies.HGSS) { pbEffectsTrainerChooseMainCombobox.Items[index] = pbEffectsPokemonChooseMainCombobox.Items[index] = updatedEntry; } - disableHandlers = false; + Helpers.EnableHandlers(); } private void saveVSPokemonEntryBTN_Click(object sender, EventArgs e) { @@ -9867,9 +9855,9 @@ namespace DSPRE { wr.Write((ushort)((pokemonID & 1023) + (comboID << 10))); //PokemonID }; - disableHandlers = true; + Helpers.DisableHandlers(); pbEffectsVsPokemonListbox.Items[index] = "[" + pokemonID.ToString("D3") + "]" + " " + pokeNames[pokemonID] + " uses Combo #" + comboID; - disableHandlers = false; + Helpers.EnableHandlers(); } private void saveVSTrainerEntryBTN_Click(object sender, EventArgs e) { @@ -9883,9 +9871,9 @@ namespace DSPRE { wr.Write((ushort)((trainerClass & 1023) + (comboID << 10))); }; - disableHandlers = true; + Helpers.DisableHandlers(); pbEffectsVsTrainerListbox.Items[index] = "[" + trainerClass.ToString("D3") + "]" + " " + trcNames[trainerClass] + " uses Combo #" + comboID; - disableHandlers = false; + Helpers.EnableHandlers(); } private void HOWpbEffectsTableButton_Click(object sender, EventArgs e) { @@ -9907,7 +9895,7 @@ namespace DSPRE { private void pbEffectsVsTrainerListbox_SelectedIndexChanged(object sender, EventArgs e) { int trainerSelection = pbEffectsVsTrainerListbox.SelectedIndex; - if (disableHandlers || trainerSelection < 0) { + if (Helpers.HandlersDisabled || trainerSelection < 0) { return; } @@ -9921,7 +9909,7 @@ namespace DSPRE { private void pbEffectsVsPokemonListbox_SelectedIndexChanged(object sender, EventArgs e) { int pokemonSelection = pbEffectsVsPokemonListbox.SelectedIndex; - if (disableHandlers || pokemonSelection < 0) { + if (Helpers.HandlersDisabled || pokemonSelection < 0) { return; } @@ -9938,7 +9926,7 @@ namespace DSPRE { private void pbEffectsCombosListbox_SelectedIndexChanged(object sender, EventArgs e) { int comboSelection = pbEffectsCombosListbox.SelectedIndex; - if (disableHandlers || comboSelection < 0) { + if (Helpers.HandlersDisabled || comboSelection < 0) { return; } @@ -9962,17 +9950,17 @@ namespace DSPRE { #endregion private void ExclusiveCBInvert(CheckBox cb) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); if (cb.Checked) { cb.Checked = !cb.Checked; } - disableHandlers = false; + Helpers.EnableHandlers(); } private void unpackToFolderToolStripMenuItem_Click(object sender, EventArgs e) { @@ -10710,7 +10698,7 @@ namespace DSPRE { string[] abilityNames = RomInfo.GetAbilityNames(); string[] moveNames = RomInfo.GetAttackNames(); - statusLabelMessage("Setting up Pokemon Data Editor..."); + Helpers.statusLabelMessage("Setting up Pokemon Data Editor..."); Update(); DSUtils.TryUnpackNarcs(new List { DirNames.personalPokeData, DirNames.learnsets, DirNames.evolutions, DirNames.monIcons }); @@ -10719,14 +10707,14 @@ namespace DSPRE { PokemonEditor pde = new PokemonEditor(itemNames, abilityNames, moveNames); pde.ShowDialog(); - statusLabelMessage(); + Helpers.statusLabelMessage(); Update(); } private void learnsetsEditorToolStripMenuItem_Click(object sender, EventArgs e) { string[] moveNames = RomInfo.GetAttackNames(); - statusLabelMessage("Setting up Learnsets Editor..."); + Helpers.statusLabelMessage("Setting up Learnsets Editor..."); Update(); DSUtils.TryUnpackNarcs(new List { DirNames.learnsets, DirNames.monIcons }); @@ -10735,12 +10723,12 @@ namespace DSPRE { LearnsetEditor le = new LearnsetEditor(moveNames); le.ShowDialog(); - statusLabelMessage(); + Helpers.statusLabelMessage(); Update(); } private void evolutionsEditorToolStripMenuItem_Click(object sender, EventArgs e) { - statusLabelMessage("Setting up Evolutions Editor..."); + Helpers.statusLabelMessage("Setting up Evolutions Editor..."); Update(); DSUtils.TryUnpackNarcs(new List { DirNames.evolutions, DirNames.monIcons }); @@ -10749,7 +10737,7 @@ namespace DSPRE { EvolutionsEditor eved = new EvolutionsEditor(); eved.ShowDialog(); - statusLabelMessage(); + Helpers.statusLabelMessage(); Update(); } } diff --git a/DS_Map/Main Window.resx b/DS_Map/Main Window.resx index 297f370..7d529c6 100644 --- a/DS_Map/Main Window.resx +++ b/DS_Map/Main Window.resx @@ -117,96 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 239, 17 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM - EgAAAk1TRnQBSQFMAgEBCgEAAagBGwGoARsBEAEAARABAAT/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== - - @@ -1036,6 +946,96 @@ p3S+M+m1V1me9QgCUQNXX2YRT1sYHBiEP3wHVbp3PF3cB40GbrzN86xHENrScf1NDsl8FaI4jODMHOgS SOacfYAmbr5XeNYjGH7yDReXv+JeNIUhUYwFpmZjDz+nMLf5B3b2rcZ5tju4ntjtFw4T54j+v2g/t9NH 9AiCIPwGJelqUAd/T3AAAAAASUVORK5CYII= + + + + 239, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM + EgAAAk1TRnQBSQFMAgEBCgEAAbABGwGwARsBEAEAARABAAT/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== @@ -1047,9 +1047,6 @@ 386, 19 - - 533, 20 - 67 diff --git a/DS_Map/PersonalDataEditor.cs b/DS_Map/PersonalDataEditor.cs index e8f8b17..034d446 100644 --- a/DS_Map/PersonalDataEditor.cs +++ b/DS_Map/PersonalDataEditor.cs @@ -10,7 +10,6 @@ using static System.Windows.Forms.VisualStyles.VisualStyleElement.TextBox; namespace DSPRE { public partial class PersonalDataEditor : Form { - private bool disableHandlers = false; private readonly string[] fileNames; private readonly string[] pokenames; @@ -28,7 +27,7 @@ namespace DSPRE { this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Size = parent.Size; this.Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top | AnchorStyles.Bottom; - disableHandlers = true; + Helpers.DisableHandlers(); BindingList listItemNames = new BindingList(itemNames); item1InputComboBox.DataSource = new BindingSource(listItemNames, string.Empty); @@ -68,7 +67,7 @@ namespace DSPRE { pokemonNameInputComboBox.Items.AddRange(this.fileNames); /* ---------------- */ - disableHandlers = false; + Helpers.EnableHandlers(); pokemonNameInputComboBox.SelectedIndex = 1; @@ -83,7 +82,7 @@ namespace DSPRE { } } private void baseHpNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.baseHP = (byte)baseHpNumericUpDown.Value; @@ -91,14 +90,14 @@ namespace DSPRE { } private void baseAtkNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.baseAtk = (byte)baseAtkNumericUpDown.Value; setDirty(true); } private void baseDefNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.baseDef = (byte)baseDefNumericUpDown.Value; @@ -106,7 +105,7 @@ namespace DSPRE { } private void baseSpAtkNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.baseSpAtk = (byte)baseSpAtkNumericUpDown.Value; @@ -114,7 +113,7 @@ namespace DSPRE { } private void baseSpDefNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.baseSpDef = (byte)baseSpDefNumericUpDown.Value; @@ -122,7 +121,7 @@ namespace DSPRE { } private void baseSpeedNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.baseSpeed = (byte)baseSpeedNumericUpDown.Value; @@ -130,7 +129,7 @@ namespace DSPRE { } private void evHpNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.evHP = (byte)evHpNumericUpDown.Value; @@ -138,7 +137,7 @@ namespace DSPRE { } private void evAtkNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.evAtk = (byte)evAtkNumericUpDown.Value; @@ -146,7 +145,7 @@ namespace DSPRE { } private void evDefNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.evDef = (byte)evDefNumericUpDown.Value; @@ -154,7 +153,7 @@ namespace DSPRE { } private void evSpAtkNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.evSpAtk = (byte)evSpAtkNumericUpDown.Value; @@ -162,7 +161,7 @@ namespace DSPRE { } private void evSpDefNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.evSpDef = (byte)evSpDefNumericUpDown.Value; @@ -170,7 +169,7 @@ namespace DSPRE { } private void evSpeedNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.evSpeed = (byte)evSpeedNumericUpDown.Value; @@ -179,7 +178,7 @@ namespace DSPRE { private void type1InputComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.type1 = (PokemonType)type1InputComboBox.SelectedIndex; @@ -187,7 +186,7 @@ namespace DSPRE { } private void type2InputComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.type2 = (PokemonType)type2InputComboBox.SelectedIndex; @@ -195,7 +194,7 @@ namespace DSPRE { } private void growthCurveInputComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.growthCurve = (PokemonGrowthCurve)growthCurveInputComboBox.SelectedIndex; @@ -203,7 +202,7 @@ namespace DSPRE { } private void baseExpYieldNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.givenExp = (byte)baseExpYieldNumericUpDown.Value; @@ -211,7 +210,7 @@ namespace DSPRE { } private void dexColorInputComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.color = (PokemonDexColor)dexColorInputComboBox.SelectedIndex; @@ -219,7 +218,7 @@ namespace DSPRE { } private void flipFlagCheckBox_CheckedChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.flip = flipFlagCheckBox.Checked; @@ -227,7 +226,7 @@ namespace DSPRE { } private void escapeRateNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.escapeRate = (byte)escapeRateNumericUpDown.Value; @@ -235,7 +234,7 @@ namespace DSPRE { } private void catchRateNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.catchRate = (byte)catchRateNumericUpDown.Value; @@ -243,7 +242,7 @@ namespace DSPRE { } private void genderProbabilityNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.genderVec = (byte)genderProbabilityNumericUpDown.Value; @@ -269,21 +268,21 @@ namespace DSPRE { } private void ability1InputComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.firstAbility = (byte)ability1InputComboBox.SelectedIndex; setDirty(true); } private void ability2InputComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.secondAbility = (byte)ability2InputComboBox.SelectedIndex; setDirty(true); } private void eggGroup1InputCombobox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.eggGroup1 = (byte)eggGroup1InputCombobox.SelectedIndex; @@ -291,7 +290,7 @@ namespace DSPRE { } private void eggGroup2InputCombobox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.eggGroup2 = (byte)eggGroup2InputCombobox.SelectedIndex; @@ -299,7 +298,7 @@ namespace DSPRE { } private void eggStepsNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.eggSteps = (byte)eggStepsNumericUpDown.Value; @@ -307,7 +306,7 @@ namespace DSPRE { } private void item1InputComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.item1 = (ushort)item1InputComboBox.SelectedIndex; @@ -315,7 +314,7 @@ namespace DSPRE { } private void item2InputComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.item2 = (ushort)item2InputComboBox.SelectedIndex; @@ -323,7 +322,7 @@ namespace DSPRE { } private void baseFriendshipNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.baseFriendship = (byte)baseFriendshipNumericUpDown.Value; @@ -411,31 +410,31 @@ namespace DSPRE { } private void pokemonNameInputComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); if (CheckDiscardChanges()) { int newNumber = pokemonNameInputComboBox.SelectedIndex; monNumberNumericUpDown.Value = newNumber; ChangeLoadedFile(newNumber); } - disableHandlers = false; + Helpers.EnableHandlers(); } private void monNumberNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); if (CheckDiscardChanges()) { int newNumber = (int)monNumberNumericUpDown.Value; pokemonNameInputComboBox.SelectedIndex = newNumber; ChangeLoadedFile(newNumber); } - disableHandlers = false; + Helpers.EnableHandlers(); } private void ChangeLoadedFile(int toLoad) { currentLoadedId = toLoad; diff --git a/DS_Map/ROMFiles/MapHeader.cs b/DS_Map/ROMFiles/MapHeader.cs index f0c19d3..3bd95af 100644 --- a/DS_Map/ROMFiles/MapHeader.cs +++ b/DS_Map/ROMFiles/MapHeader.cs @@ -128,37 +128,84 @@ namespace DSPRE.ROMFiles { #endregion Fields #region Methods (1) - public static MapHeader LoadFromByteArray(byte[] headerData, ushort headerNumber, GameFamilies gameFamily = GameFamilies.NULL) { + public static string BuildName(int headerID, string name) { + return headerID.ToString("D3") + MapHeader.nameSeparator + name; + } + + public static MapHeader LoadFromByteArray(byte[] headerData, ushort headerNumber, RomInfo.GameFamilies gameFamily = RomInfo.GameFamilies.NULL) { /* Encapsulate header data into the class appropriate for the gameVersion */ if (headerData.Length < MapHeader.length) { MessageBox.Show("File of header " + headerNumber + " is too small and can't store header data.", "Header file too small", MessageBoxButtons.OK, MessageBoxIcon.Error); return null; } - if (gameFamily == GameFamilies.NULL) { + if (gameFamily == RomInfo.GameFamilies.NULL) { gameFamily = RomInfo.gameFamily; } switch (gameFamily) { - case GameFamilies.DP: + case RomInfo.GameFamilies.DP: return new HeaderDP(headerNumber, new MemoryStream(headerData)); - case GameFamilies.Plat: + case RomInfo.GameFamilies.Plat: return new HeaderPt(headerNumber, new MemoryStream(headerData)); default: return new HeaderHGSS(headerNumber, new MemoryStream(headerData)); } } - public static MapHeader LoadFromFile(string filename, ushort headerNumber, long offsetInFile, GameFamilies gameFamily = GameFamilies.NULL) { + + public static MapHeader LoadFromFile(string filename, ushort headerNumber, long offsetInFile, RomInfo.GameFamilies gameFamily = RomInfo.GameFamilies.NULL) { /* Calculate header offset and load data */ byte[] headerData = DSUtils.ReadFromFile(filename, offsetInFile, MapHeader.length); return LoadFromByteArray(headerData, headerNumber, gameFamily); } - public static MapHeader LoadFromARM9(ushort headerNumber, GameFamilies gameFamily = GameFamilies.NULL) { + + public static MapHeader LoadFromARM9(ushort headerNumber, RomInfo.GameFamilies gameFamily = RomInfo.GameFamilies.NULL) { long headerOffset = RomInfo.headerTableOffset + MapHeader.length * headerNumber; return LoadFromFile(RomInfo.arm9Path, headerNumber, headerOffset, gameFamily); } - + public static MapHeader GetMapHeader(ushort headerNumber) { + MapHeader mapHeader; + + //Dynamic headers patch unsupported in DP + if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.DP)) { + return MapHeader.LoadFromARM9(headerNumber); + } + + /* Check if dynamic headers patch has been applied, and load header from arm9 or a/0/5/0 accordingly */ + if (ROMToolboxDialog.flag_DynamicHeadersPatchApplied) { + string path = Filesystem.GetDynamicHeaderPath(headerNumber); + mapHeader = MapHeader.LoadFromFile(path, headerNumber, 0); + } else { + mapHeader = MapHeader.LoadFromARM9(headerNumber); + } + + return mapHeader; + } + + public static int GetHeaderCount() { + int headerCount; + if (ROMToolboxDialog.flag_DynamicHeadersPatchApplied) { + headerCount = Filesystem.GetDynamicHeadersCount(); + } else { + headerCount = RomInfo.GetHeaderCount(); + } + + return headerCount; + } + + public void SaveFile() { + /* Check if dynamic headers patch has been applied, and save header to arm9 or a/0/5/0 accordingly */ + if (ROMToolboxDialog.flag_DynamicHeadersPatchApplied) { + string path = Filesystem.GetDynamicHeaderPath(ID); + DSUtils.WriteToFile(path, this.ToByteArray(), 0, 0, fmode: FileMode.Create); + } else { + uint headerOffset = (uint)(RomInfo.headerTableOffset + MapHeader.length * this.ID); + DSUtils.ARM9.WriteBytes(this.ToByteArray(), headerOffset); + } + } + + #endregion } diff --git a/DS_Map/RomInfo.cs b/DS_Map/RomInfo.cs index 1559e97..3c10a0d 100644 --- a/DS_Map/RomInfo.cs +++ b/DS_Map/RomInfo.cs @@ -16,6 +16,8 @@ namespace DSPRE { public class RomInfo { public static string folderSuffix = "_DSPRE_contents"; + const string dataFolderName = @"data"; + public static string romID { get; private set; } public static string fileName { get; private set; } public static string workDir { get; private set; } @@ -70,6 +72,8 @@ namespace DSPRE { public static string internalNamesLocation { get; private set; } public static readonly byte internalNameLength = 16; + public static string internalNamesPath { get; private set; } + public static int cameraSize { get; private set; } public Dictionary, (Color background, Color foreground)> MapCellsColorDictionary; @@ -132,7 +136,10 @@ namespace DSPRE { OWSprites, scripts, + encounters, + headbutt, + safariZone, trainerProperties, trainerParty, diff --git a/DS_Map/WildEditorDPPt.cs b/DS_Map/WildEditorDPPt.cs index 895ed0d..2c58ae4 100644 --- a/DS_Map/WildEditorDPPt.cs +++ b/DS_Map/WildEditorDPPt.cs @@ -10,13 +10,12 @@ namespace DSPRE { public partial class WildEditorDPPt : Form { public string encounterFileFolder { get; private set; } EncounterFileDPPt currentFile; - bool disableHandlers = false; public WildEditorDPPt(string dirPath, string[] names, int encToOpen, int totalNumHeaderFiles) { InitializeComponent(); encounterFileFolder = dirPath; Text = "DSPRE Reloaded " + GetDSPREVersion() + " - DPPt Encounters Editor"; - disableHandlers = true; + Helpers.DisableHandlers(); MapHeader tempMapHeader; List locationNames = RomInfo.GetLocationNames(); @@ -84,12 +83,12 @@ namespace DSPRE { } } - disableHandlers = false; + Helpers.EnableHandlers(); SetupControls(); } private void SetupControls() { - disableHandlers = true; + Helpers.DisableHandlers(); /* Setup encounter rates controls */ walkingRateUpDown.Value = currentFile.walkingRate; @@ -234,7 +233,7 @@ namespace DSPRE { superRodOneMinLevelUpDown.Value = currentFile.superRodMinLevels[4]; superRodOneMaxLevelUpDown.Value = currentFile.superRodMaxLevels[4]; - disableHandlers = false; + Helpers.EnableHandlers(); } public string GetDSPREVersion() { @@ -261,7 +260,7 @@ namespace DSPRE { SetupControls(); } private void selectEncounterComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -272,313 +271,313 @@ namespace DSPRE { currentFile.SaveToFileDefaultDir(selectEncounterComboBox.SelectedIndex); } private void walkingTwentyFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingPokemon[0] = (uint)walkingTwentyFirstComboBox.SelectedIndex; } private void walkingTwentySecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingPokemon[1] = (uint)walkingTwentySecondComboBox.SelectedIndex; } private void walkingTenFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingPokemon[2] = (uint)walkingTenFirstComboBox.SelectedIndex; } private void walkingTenSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingPokemon[3] = (uint)walkingTenSecondComboBox.SelectedIndex; } private void walkingTenThirdComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingPokemon[4] = (uint)walkingTenThirdComboBox.SelectedIndex; } private void walkingTenFourthComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingPokemon[5] = (uint)walkingTenFourthComboBox.SelectedIndex; } private void walkingFiveFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingPokemon[6] = (uint)walkingFiveFirstComboBox.SelectedIndex; } private void walkingFiveSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingPokemon[7] = (uint)walkingFiveSecondComboBox.SelectedIndex; } private void walkingFourFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingPokemon[8] = (uint)walkingFourFirstComboBox.SelectedIndex; } private void walkingFourSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingPokemon[9] = (uint)walkingFourSecondComboBox.SelectedIndex; } private void walkingOneFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingPokemon[10] = (uint)walkingOneFirstComboBox.SelectedIndex; } private void walkingOneSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingPokemon[11] = (uint)walkingOneSecondComboBox.SelectedIndex; } private void morningFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.morningPokemon[0] = (uint)morningFirstComboBox.SelectedIndex; } private void morningSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.morningPokemon[1] = (uint)morningSecondComboBox.SelectedIndex; } private void nightFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.nightPokemon[0] = (uint)nightFirstComboBox.SelectedIndex; } private void nightSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.nightPokemon[1] = (uint)nightSecondComboBox.SelectedIndex; } private void swarmFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.swarmPokemon[0] = (ushort)swarmFirstComboBox.SelectedIndex; } private void swarmSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.swarmPokemon[1] = (ushort)swarmSecondComboBox.SelectedIndex; } private void rubyFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.rubyPokemon[0] = (uint)rubyFirstComboBox.SelectedIndex; } private void rubySecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.rubyPokemon[1] = (uint)rubySecondComboBox.SelectedIndex; } private void sapphireFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.sapphirePokemon[0] = (uint)sapphireFirstComboBox.SelectedIndex; } private void sapphireSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.sapphirePokemon[1] = (uint)sapphireSecondComboBox.SelectedIndex; } private void emeraldFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.emeraldPokemon[0] = (uint)emeraldFirstComboBox.SelectedIndex; } private void emeraldSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.emeraldPokemon[1] = (uint)emeraldSecondComboBox.SelectedIndex; } private void fireRedFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.fireRedPokemon[0] = (uint)fireRedFirstComboBox.SelectedIndex; } private void fireRedSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.fireRedPokemon[1] = (uint)fireRedSecondComboBox.SelectedIndex; } private void leafGreenFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.leafGreenPokemon[0] = (uint)leafGreenFirstComboBox.SelectedIndex; } private void leafGreenSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.leafGreenPokemon[1] = (uint)leafGreenSecondComboBox.SelectedIndex; } private void radarFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.radarPokemon[0] = (uint)radarFirstComboBox.SelectedIndex; } private void radarSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.radarPokemon[1] = (uint)radarSecondComboBox.SelectedIndex; } private void radarThirdComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.radarPokemon[2] = (uint)radarThirdComboBox.SelectedIndex; } private void radarFourthComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.radarPokemon[3] = (uint)radarFourthComboBox.SelectedIndex; } private void surfSixtyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfPokemon[0] = (ushort)surfSixtyComboBox.SelectedIndex; } private void surfThirtyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfPokemon[1] = (ushort)surfThirtyComboBox.SelectedIndex; } private void surfFiveComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfPokemon[2] = (ushort)surfFiveComboBox.SelectedIndex; } private void surfFourComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfPokemon[3] = (ushort)surfFourComboBox.SelectedIndex; } private void surfOneComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfPokemon[4] = (ushort)surfOneComboBox.SelectedIndex; } private void oldRodSixtyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodPokemon[0] = (ushort)oldRodSixtyComboBox.SelectedIndex; } private void oldRodThirtyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodPokemon[1] = (ushort)oldRodThirtyComboBox.SelectedIndex; } private void oldRodFiveComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodPokemon[2] = (ushort)oldRodFiveComboBox.SelectedIndex; } private void oldRodFourComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodPokemon[3] = (ushort)oldRodFourComboBox.SelectedIndex; } private void oldRodOneComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodPokemon[4] = (ushort)oldRodOneComboBox.SelectedIndex; } private void goodRodFirstFortyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodPokemon[0] = (ushort)goodRodFirstFortyComboBox.SelectedIndex; } private void goodRodSecondFortyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodPokemon[1] = (ushort)goodRodSecondFortyComboBox.SelectedIndex; } private void goodRodFifteenComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodPokemon[2] = (ushort)goodRodFifteenComboBox.SelectedIndex; } private void goodRodFourComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodPokemon[3] = (ushort)goodRodFourComboBox.SelectedIndex; } private void goodRodOneComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodPokemon[4] = (ushort)goodRodOneComboBox.SelectedIndex; } private void superRodFirstFortyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodPokemon[0] = (ushort)superRodFirstFortyComboBox.SelectedIndex; } private void superRodSecondFortyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodPokemon[1] = (ushort)superRodSecondFortyComboBox.SelectedIndex; } private void superRodFifteenComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodPokemon[2] = (ushort)superRodFifteenComboBox.SelectedIndex; } private void superRodFourComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodPokemon[3] = (ushort)superRodFourComboBox.SelectedIndex; } private void superRodOneComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodPokemon[4] = (ushort)superRodOneComboBox.SelectedIndex; @@ -586,73 +585,73 @@ namespace DSPRE { /* Walking levels controls */ private void walkingTwentyFirstUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[0] = (byte)walkingTwentyFirstUpDown.Value; } private void walkingTwentySecondUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[1] = (byte)walkingTwentySecondUpDown.Value; } private void walkingTenFirstUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[2] = (byte)walkingTenFirstUpDown.Value; } private void walkingTenSecondUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[3] = (byte)walkingTenSecondUpDown.Value; } private void walkingTenThirdUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[4] = (byte)walkingTenThirdUpDown.Value; } private void walkingTenFourthUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[5] = (byte)walkingTenFourthUpDown.Value; } private void walkingFiveFirstUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[6] = (byte)walkingFiveFirstUpDown.Value; } private void walkingFiveSecondUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[7] = (byte)walkingFiveSecondUpDown.Value; } private void walkingFourFirstUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[8] = (byte)walkingFourFirstUpDown.Value; } private void walkingFourSecondUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[9] = (byte)walkingFourSecondUpDown.Value; } private void walkingOneFirstUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[10] = (byte)walkingOneFirstUpDown.Value; } private void walkingOneSecondUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[11] = (byte)walkingOneSecondUpDown.Value; @@ -660,244 +659,244 @@ namespace DSPRE { /* Water levels controls */ private void surfSixtyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMinLevels[0] = (byte)surfSixtyMinLevelUpDown.Value; } private void surfThirtyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMinLevels[1] = (byte)surfThirtyMinLevelUpDown.Value; } private void surfFiveMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMinLevels[2] = (byte)surfFiveMinLevelUpDown.Value; } private void surfFourMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMinLevels[3] = (byte)surfFourMinLevelUpDown.Value; } private void surfOneMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMinLevels[4] = (byte)surfOneMinLevelUpDown.Value; } private void surfSixtyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMaxLevels[0] = (byte)surfSixtyMaxLevelUpDown.Value; } private void surfThirtyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMaxLevels[1] = (byte)surfThirtyMaxLevelUpDown.Value; } private void surfFiveMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMaxLevels[2] = (byte)surfFiveMaxLevelUpDown.Value; } private void surfFourMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMaxLevels[3] = (byte)surfFourMaxLevelUpDown.Value; } private void surfOneMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMaxLevels[4] = (byte)surfOneMaxLevelUpDown.Value; } private void oldRodSixtyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMinLevels[0] = (byte)oldRodSixtyMinLevelUpDown.Value; } private void oldRodThirtyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMinLevels[1] = (byte)oldRodThirtyMinLevelUpDown.Value; } private void oldRodFiveMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMinLevels[2] = (byte)oldRodFiveMinLevelUpDown.Value; } private void oldRodFourMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMinLevels[3] = (byte)oldRodFourMinLevelUpDown.Value; } private void oldRodOneMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMinLevels[4] = (byte)oldRodOneMinLevelUpDown.Value; } private void oldRodSixtyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMaxLevels[0] = (byte)oldRodSixtyMaxLevelUpDown.Value; } private void oldRodThirtyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMaxLevels[1] = (byte)oldRodThirtyMaxLevelUpDown.Value; } private void oldRodFiveMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMaxLevels[2] = (byte)oldRodFiveMaxLevelUpDown.Value; } private void oldRodFourMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMaxLevels[3] = (byte)oldRodFourMaxLevelUpDown.Value; } private void oldRodOneMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMaxLevels[4] = (byte)oldRodOneMaxLevelUpDown.Value; } private void goodRodFirstFortyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMinLevels[0] = (byte)goodRodFirstFortyMinLevelUpDown.Value; } private void goodRodSecondFortyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMinLevels[1] = (byte)goodRodSecondFortyMinLevelUpDown.Value; } private void goodRodFifteenMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMinLevels[2] = (byte)goodRodFifteenMinLevelUpDown.Value; } private void goodRodFourMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMinLevels[3] = (byte)goodRodFourMinLevelUpDown.Value; } private void goodRodOneMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMinLevels[4] = (byte)goodRodOneMinLevelUpDown.Value; } private void goodRodFirstFortyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMaxLevels[0] = (byte)goodRodFirstFortyMaxLevelUpDown.Value; } private void goodRodSecondFortyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMaxLevels[1] = (byte)goodRodSecondFortyMaxLevelUpDown.Value; } private void goodRodFifteenMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMaxLevels[2] = (byte)goodRodFifteenMaxLevelUpDown.Value; } private void goodRodFourMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMaxLevels[3] = (byte)goodRodFourMaxLevelUpDown.Value; } private void goodRodOneMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMaxLevels[4] = (byte)goodRodOneMaxLevelUpDown.Value; } private void superRodFirstFortyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMinLevels[0] = (byte)superRodFirstFortyMinLevelUpDown.Value; } private void superRodSecondFortyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMinLevels[1] = (byte)superRodSecondFortyMinLevelUpDown.Value; } private void superRodFifteenMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMinLevels[2] = (byte)superRodFifteenMinLevelUpDown.Value; } private void superRodFourMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMinLevels[3] = (byte)superRodFourMinLevelUpDown.Value; } private void superRodOneMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMinLevels[4] = (byte)superRodOneMinLevelUpDown.Value; } private void superRodFirstFortyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMaxLevels[0] = (byte)superRodFirstFortyMaxLevelUpDown.Value; } private void superRodSecondFortyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMaxLevels[1] = (byte)superRodSecondFortyMaxLevelUpDown.Value; } private void superRodFifteenMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMaxLevels[2] = (byte)superRodFifteenMaxLevelUpDown.Value; } private void superRodFourMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMaxLevels[3] = (byte)superRodFourMaxLevelUpDown.Value; } private void superRodOneMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMaxLevels[4] = (byte)superRodOneMaxLevelUpDown.Value; @@ -905,32 +904,32 @@ namespace DSPRE { /* Encounter rate controls */ private void walkingRateUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingRate = (byte)walkingRateUpDown.Value; } private void surfRateUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfRate = (byte)surfRateUpDown.Value; } private void oldRodRateUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodRate = (byte)oldRodRateUpDown.Value; } private void goodRodRateUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodRate = (byte)goodRodRateUpDown.Value; } private void superRodRateUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodRate = (byte)superRodRateUpDown.Value; diff --git a/DS_Map/WildEditorHGSS.cs b/DS_Map/WildEditorHGSS.cs index 6fbe156..c592839 100644 --- a/DS_Map/WildEditorHGSS.cs +++ b/DS_Map/WildEditorHGSS.cs @@ -10,13 +10,12 @@ namespace DSPRE { public partial class WildEditorHGSS : Form { public string encounterFileFolder { get; private set; } EncounterFileHGSS currentFile; - bool disableHandlers = false; public WildEditorHGSS(string dirPath, string[] names, int encToOpen, int totalNumHeaderFiles) { InitializeComponent(); encounterFileFolder = dirPath; - disableHandlers = true; + Helpers.DisableHandlers(); Text = "DSPRE Reloaded " + GetDSPREVersion() + " - HGSS Encounters Editor"; MapHeader tempMapHeader; List locationNames = RomInfo.GetLocationNames(); @@ -82,7 +81,7 @@ namespace DSPRE { } } - disableHandlers = false; + Helpers.EnableHandlers(); SetupControls(); } @@ -93,7 +92,7 @@ namespace DSPRE { } public void SetupControls() { - disableHandlers = true; + Helpers.DisableHandlers(); /* Setup encounter rates controls */ walkingRateUpDown.Value = currentFile.walkingRate; @@ -261,7 +260,7 @@ namespace DSPRE { superRodOneMinLevelUpDown.Value = currentFile.superRodMinLevels[4]; superRodOneMaxLevelUpDown.Value = currentFile.superRodMaxLevels[4]; - disableHandlers = false; + Helpers.EnableHandlers(); } private void exportEncounterFileButton_Click(object sender, EventArgs e) { currentFile.SaveToFileExplorePath("Encounter File " + selectEncounterComboBox.SelectedIndex); @@ -282,7 +281,7 @@ namespace DSPRE { SetupControls(); } private void selectEncounterComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -294,546 +293,546 @@ namespace DSPRE { } private void walkingRateUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingRate = (byte)walkingRateUpDown.Value; } private void rockSmashRateUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.rockSmashRate = (byte)rockSmashRateUpDown.Value; } private void surfRateUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfRate = (byte)surfRateUpDown.Value; } private void oldRodRateUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodRate = (byte)oldRodRateUpDown.Value; } private void goodRodRateUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodRate = (byte)goodRodRateUpDown.Value; } private void superRodRateUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodRate = (byte)superRodRateUpDown.Value; } private void morningTwentyFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.morningPokemon[0] = (ushort)morningTwentyFirstComboBox.SelectedIndex; } private void morningTwentySecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.morningPokemon[1] = (ushort)morningTwentySecondComboBox.SelectedIndex; } private void morningTenFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.morningPokemon[2] = (ushort)morningTenFirstComboBox.SelectedIndex; } private void morningTenSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.morningPokemon[3] = (ushort)morningTenSecondComboBox.SelectedIndex; } private void morningTenThirdComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.morningPokemon[4] = (ushort)morningTenThirdComboBox.SelectedIndex; } private void morningTenFourthComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.morningPokemon[5] = (ushort)morningTenFourthComboBox.SelectedIndex; } private void morningFiveFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.morningPokemon[6] = (ushort)morningFiveFirstComboBox.SelectedIndex; } private void morningFiveSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.morningPokemon[7] = (ushort)morningFiveSecondComboBox.SelectedIndex; } private void morningFourFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.morningPokemon[8] = (ushort)morningFourFirstComboBox.SelectedIndex; } private void morningFourSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.morningPokemon[9] = (ushort)morningFourSecondComboBox.SelectedIndex; } private void morningOneFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.morningPokemon[10] = (ushort)morningOneFirstComboBox.SelectedIndex; } private void morningOneSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.morningPokemon[11] = (ushort)morningOneSecondComboBox.SelectedIndex; } private void dayTwentyFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.dayPokemon[0] = (ushort)dayTwentyFirstComboBox.SelectedIndex; } private void dayTwentySecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.dayPokemon[1] = (ushort)dayTwentySecondComboBox.SelectedIndex; } private void dayTenFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.dayPokemon[2] = (ushort)dayTenFirstComboBox.SelectedIndex; } private void dayTenSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.dayPokemon[3] = (ushort)dayTenSecondComboBox.SelectedIndex; } private void dayTenThirdComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.dayPokemon[4] = (ushort)dayTenThirdComboBox.SelectedIndex; } private void dayTenFourthComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.dayPokemon[5] = (ushort)dayTenFourthComboBox.SelectedIndex; } private void dayFiveFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.dayPokemon[6] = (ushort)dayFiveFirstComboBox.SelectedIndex; } private void dayFiveSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.dayPokemon[7] = (ushort)dayFiveSecondComboBox.SelectedIndex; } private void dayFourFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.dayPokemon[8] = (ushort)dayFourFirstComboBox.SelectedIndex; } private void dayFourSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.dayPokemon[9] = (ushort)dayFourSecondComboBox.SelectedIndex; } private void dayOneFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.dayPokemon[10] = (ushort)dayOneFirstComboBox.SelectedIndex; } private void dayOneSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.dayPokemon[11] = (ushort)dayOneSecondComboBox.SelectedIndex; } private void nightTwentyFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.nightPokemon[0] = (ushort)nightTwentyFirstComboBox.SelectedIndex; } private void nightTwentySecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.nightPokemon[1] = (ushort)nightTwentySecondComboBox.SelectedIndex; } private void nightTenFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.nightPokemon[2] = (ushort)nightTenFirstComboBox.SelectedIndex; } private void nightTenSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.nightPokemon[3] = (ushort)nightTenSecondComboBox.SelectedIndex; } private void nightTenThirdComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.nightPokemon[4] = (ushort)nightTenThirdComboBox.SelectedIndex; } private void nightTenFourthComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.nightPokemon[5] = (ushort)nightTenFourthComboBox.SelectedIndex; } private void nightFiveFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.nightPokemon[6] = (ushort)nightFiveFirstComboBox.SelectedIndex; } private void nightFiveSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.nightPokemon[7] = (ushort)nightFiveSecondComboBox.SelectedIndex; } private void nightFourFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.nightPokemon[8] = (ushort)nightFourFirstComboBox.SelectedIndex; } private void nightFourSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.nightPokemon[9] = (ushort)nightFourSecondComboBox.SelectedIndex; } private void nightOneFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.nightPokemon[10] = (ushort)nightOneFirstComboBox.SelectedIndex; } private void nightOneSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.nightPokemon[11] = (ushort)nightOneSecondComboBox.SelectedIndex; } private void twentyFirstLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[0] = (byte)twentyFirstLevelUpDown.Value; } private void twentySecondLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[1] = (byte)twentySecondLevelUpDown.Value; } private void tenFirstLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[2] = (byte)tenFirstLevelUpDown.Value; } private void tenSecondLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[3] = (byte)tenSecondLevelUpDown.Value; } private void tenThirdLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[4] = (byte)tenThirdLevelUpDown.Value; } private void tenFourthLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[5] = (byte)tenFourthLevelUpDown.Value; } private void fiveFirstLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[6] = (byte)fiveFirstLevelUpDown.Value; } private void fiveSecondLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[7] = (byte)fiveSecondLevelUpDown.Value; } private void fourFirstLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[8] = (byte)fourFirstLevelUpDown.Value; } private void fourSecondLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[9] = (byte)fourSecondLevelUpDown.Value; } private void oneFirstLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[10] = (byte)oneFirstLevelUpDown.Value; } private void oneSecondLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[11] = (byte)oneSecondLevelUpDown.Value; } private void hoennFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.hoennMusicPokemon[0] = (ushort)hoennFirstComboBox.SelectedIndex; } private void hoennSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.hoennMusicPokemon[1] = (ushort)hoennSecondComboBox.SelectedIndex; } private void sinnohFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.sinnohMusicPokemon[0] = (ushort)sinnohFirstComboBox.SelectedIndex; } private void sinnohSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.sinnohMusicPokemon[1] = (ushort)sinnohSecondComboBox.SelectedIndex; } private void rockSmashNinetyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.rockSmashPokemon[0] = (ushort)rockSmashNinetyComboBox.SelectedIndex; } private void rockSmashTenComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.rockSmashPokemon[1] = (ushort)rockSmashTenComboBox.SelectedIndex; } private void rockSmashNinetyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.rockSmashMinLevels[0] = (byte)rockSmashNinetyMinLevelUpDown.Value; } private void rockSmashTenMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.rockSmashMinLevels[1] = (byte)rockSmashTenMinLevelUpDown.Value; } private void rockSmashNinetyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.rockSmashMaxLevels[0] = (byte)rockSmashNinetyMaxLevelUpDown.Value; } private void rockSmashTenMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.rockSmashMaxLevels[1] = (byte)rockSmashNinetyMaxLevelUpDown.Value; } private void rockSmashNinetyMaxLevelUpDown_ValueChanged_1(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.rockSmashMaxLevels[0] = (byte)rockSmashNinetyMaxLevelUpDown.Value; } private void rockSmashTenMaxLevelUpDown_ValueChanged_1(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.rockSmashMaxLevels[1] = (byte)rockSmashTenMaxLevelUpDown.Value; } private void grassSwarmComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.swarmPokemon[0] = (ushort)grassSwarmComboBox.SelectedIndex; } private void surfSwarmComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.swarmPokemon[1] = (ushort)surfSwarmComboBox.SelectedIndex; } private void goodRodSwarmComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.swarmPokemon[2] = (ushort)goodRodSwarmComboBox.SelectedIndex; } private void superRodSwarmComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.swarmPokemon[3] = (ushort)superRodSwarmComboBox.SelectedIndex; } private void surfSixtyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfPokemon[0] = (ushort)surfSixtyComboBox.SelectedIndex; } private void surfThirtyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfPokemon[1] = (ushort)surfThirtyComboBox.SelectedIndex; } private void surfFiveComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfPokemon[2] = (ushort)surfFiveComboBox.SelectedIndex; } private void surfFourComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfPokemon[3] = (ushort)surfFourComboBox.SelectedIndex; } private void surfOneComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfPokemon[4] = (ushort)surfOneComboBox.SelectedIndex; } private void oldRodSixtyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodPokemon[0] = (ushort)oldRodSixtyComboBox.SelectedIndex; } private void oldRodThirtyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodPokemon[1] = (ushort)oldRodThirtyComboBox.SelectedIndex; } private void oldRodFiveComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodPokemon[2] = (ushort)oldRodFiveComboBox.SelectedIndex; } private void oldRodFourComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodPokemon[3] = (ushort)oldRodFourComboBox.SelectedIndex; } private void oldRodOneComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodPokemon[4] = (ushort)oldRodOneComboBox.SelectedIndex; } private void goodRodFirstFortyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodPokemon[0] = (ushort)goodRodFirstFortyComboBox.SelectedIndex; } private void goodRodSecondFortyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodPokemon[1] = (ushort)goodRodSecondFortyComboBox.SelectedIndex; } private void goodRodFifteenComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodPokemon[2] = (ushort)goodRodFifteenComboBox.SelectedIndex; } private void goodRodFourComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodPokemon[3] = (ushort)goodRodFourComboBox.SelectedIndex; } private void goodRodOneComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodPokemon[4] = (ushort)goodRodOneComboBox.SelectedIndex; } private void superRodFirstFortyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodPokemon[0] = (ushort)superRodFirstFortyComboBox.SelectedIndex; } private void superRodSecondFortyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodPokemon[1] = (ushort)superRodSecondFortyComboBox.SelectedIndex; } private void superRodFifteenComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodPokemon[2] = (ushort)superRodFifteenComboBox.SelectedIndex; } private void superRodFourComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodPokemon[3] = (ushort)superRodFourComboBox.SelectedIndex; } private void superRodOneComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodPokemon[4] = (ushort)superRodOneComboBox.SelectedIndex; @@ -841,129 +840,129 @@ namespace DSPRE { /* Water levels controls */ private void surfSixtyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMinLevels[0] = (byte)surfSixtyMinLevelUpDown.Value; } private void surfThirtyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMinLevels[1] = (byte)surfThirtyMinLevelUpDown.Value; } private void surfFiveMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMinLevels[2] = (byte)surfFiveMinLevelUpDown.Value; } private void surfFourMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMinLevels[3] = (byte)surfFourMinLevelUpDown.Value; } private void surfOneMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMinLevels[4] = (byte)surfOneMinLevelUpDown.Value; } private void surfSixtyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMaxLevels[0] = (byte)surfSixtyMaxLevelUpDown.Value; } private void surfThirtyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMaxLevels[1] = (byte)surfThirtyMaxLevelUpDown.Value; } private void surfFiveMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMaxLevels[2] = (byte)surfFiveMaxLevelUpDown.Value; } private void surfFourMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMaxLevels[3] = (byte)surfFourMaxLevelUpDown.Value; } private void surfOneMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMaxLevels[4] = (byte)surfOneMaxLevelUpDown.Value; } private void oldRodSixtyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMinLevels[0] = (byte)oldRodSixtyMinLevelUpDown.Value; } private void oldRodThirtyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMinLevels[1] = (byte)oldRodThirtyMinLevelUpDown.Value; } private void oldRodFiveMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMinLevels[2] = (byte)oldRodFiveMinLevelUpDown.Value; } private void oldRodFourMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMinLevels[3] = (byte)oldRodFourMinLevelUpDown.Value; } private void oldRodOneMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMinLevels[4] = (byte)oldRodOneMinLevelUpDown.Value; } private void oldRodSixtyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMaxLevels[0] = (byte)oldRodSixtyMaxLevelUpDown.Value; } private void oldRodThirtyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMaxLevels[1] = (byte)oldRodThirtyMaxLevelUpDown.Value; } private void oldRodFiveMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMaxLevels[2] = (byte)oldRodFiveMaxLevelUpDown.Value; } private void oldRodFourMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMaxLevels[3] = (byte)oldRodFourMaxLevelUpDown.Value; } private void oldRodOneMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMaxLevels[4] = (byte)oldRodOneMaxLevelUpDown.Value; } private void goodRodFirstFortyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -971,117 +970,117 @@ namespace DSPRE { } private void goodRodSecondFortyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMinLevels[1] = (byte)goodRodSecondFortyMinLevelUpDown.Value; } private void goodRodFifteenMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMinLevels[2] = (byte)goodRodFifteenMinLevelUpDown.Value; } private void goodRodFourMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMinLevels[3] = (byte)goodRodFourMinLevelUpDown.Value; } private void goodRodOneMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMinLevels[4] = (byte)goodRodOneMinLevelUpDown.Value; } private void goodRodFirstFortyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMaxLevels[0] = (byte)goodRodFirstFortyMaxLevelUpDown.Value; } private void goodRodSecondFortyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMaxLevels[1] = (byte)goodRodSecondFortyMaxLevelUpDown.Value; } private void goodRodFifteenMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMaxLevels[2] = (byte)goodRodFifteenMaxLevelUpDown.Value; } private void goodRodFourMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMaxLevels[3] = (byte)goodRodFourMaxLevelUpDown.Value; } private void goodRodOneMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMaxLevels[4] = (byte)goodRodOneMaxLevelUpDown.Value; } private void superRodFirstFortyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMinLevels[0] = (byte)superRodFirstFortyMinLevelUpDown.Value; } private void superRodSecondFortyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMinLevels[1] = (byte)superRodSecondFortyMinLevelUpDown.Value; } private void superRodFifteenMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMinLevels[2] = (byte)superRodFifteenMinLevelUpDown.Value; } private void superRodFourMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMinLevels[3] = (byte)superRodFourMinLevelUpDown.Value; } private void superRodOneMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMinLevels[4] = (byte)superRodOneMinLevelUpDown.Value; } private void superRodFirstFortyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMaxLevels[0] = (byte)superRodFirstFortyMaxLevelUpDown.Value; } private void superRodSecondFortyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMaxLevels[1] = (byte)superRodSecondFortyMaxLevelUpDown.Value; } private void superRodFifteenMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMaxLevels[2] = (byte)superRodFifteenMaxLevelUpDown.Value; } private void superRodFourMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMaxLevels[3] = (byte)superRodFourMaxLevelUpDown.Value; } private void superRodOneMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMaxLevels[4] = (byte)superRodOneMaxLevelUpDown.Value; From ff366931672f9e4a50ecc09a548e41f5acd21311 Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Sun, 3 Mar 2024 14:49:57 +0100 Subject: [PATCH 06/40] Migrated to nugets proper --- DS_Map/DSPRE.csproj | 32 ++++++++++++++------------------ DS_Map/packages.config | 7 ------- 2 files changed, 14 insertions(+), 25 deletions(-) delete mode 100644 DS_Map/packages.config diff --git a/DS_Map/DSPRE.csproj b/DS_Map/DSPRE.csproj index 4c82d6f..c991e02 100644 --- a/DS_Map/DSPRE.csproj +++ b/DS_Map/DSPRE.csproj @@ -64,30 +64,13 @@ False .\HelixToolkit.dll - - ..\packages\Microsoft.WindowsAPICodePack-Core.1.1.0.2\lib\Microsoft.WindowsAPICodePack.dll - - - ..\packages\Microsoft.WindowsAPICodePack-Shell.1.1.0.0\lib\Microsoft.WindowsAPICodePack.Shell.dll - - - ..\packages\Microsoft.WindowsAPICodePack-Shell.1.1.0.0\lib\Microsoft.WindowsAPICodePack.ShellExtensions.dll - False ..\..\..\..\..\Desktop\sdsme\Map_Editor\OpenTK.dll - - ..\packages\jacobslusser.ScintillaNET.3.6.3\lib\net40\ScintillaNET.dll - - - ..\packages\System.Collections.Specialized.4.3.0\lib\net46\System.Collections.Specialized.dll - True - True - @@ -354,7 +337,6 @@ WildEditorDPPt.cs - SettingsSingleFileGenerator Settings.Designer.cs @@ -611,5 +593,19 @@ Images + + + 3.6.3 + + + 1.1.0.2 + + + 1.1.0 + + + 4.3.0 + + \ No newline at end of file diff --git a/DS_Map/packages.config b/DS_Map/packages.config deleted file mode 100644 index 6eae2b6..0000000 --- a/DS_Map/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file From 0254b46a41b5cb3bcf33e55da51c50edf9356201 Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Sun, 3 Mar 2024 17:35:34 +0100 Subject: [PATCH 07/40] Added the levelscript editor Co-authored-by: Cuddlyogre --- DS_Map/DSPRE.csproj | 36 + DS_Map/EditorPanels.cs | 20 + DS_Map/Editors/LevelScriptEditor.Designer.cs | 458 +++++++ DS_Map/Editors/LevelScriptEditor.cs | 387 ++++++ DS_Map/Editors/LevelScriptEditor.resx | 120 ++ DS_Map/Editors/ScriptEditor.Designer.cs | 917 +++++++++++++ DS_Map/Editors/ScriptEditor.cs | 1047 +++++++++++++++ DS_Map/Editors/ScriptEditor.resx | 120 ++ DS_Map/ExtensionMethods.cs | 71 + DS_Map/Extensions.cs | 31 + DS_Map/Helpers.cs | 4 +- DS_Map/Main Window.Designer.cs | 1192 +++-------------- DS_Map/Main Window.cs | 1004 +------------- DS_Map/Main Window.resx | 183 +-- DS_Map/ROMFiles/HeadbuttEncounter.cs | 27 + DS_Map/ROMFiles/HeadbuttEncounterFile.cs | 136 ++ DS_Map/ROMFiles/HeadbuttEncounterMap.cs | 36 + DS_Map/ROMFiles/HeadbuttTree.cs | 103 ++ DS_Map/ROMFiles/HeadbuttTreeGroup.cs | 32 + DS_Map/ROMFiles/LevelScriptFile.cs | 139 ++ DS_Map/ROMFiles/LevelScriptTrigger.cs | 31 + DS_Map/ROMFiles/MapScreenLoadTrigger.cs | 35 + DS_Map/ROMFiles/SafariZoneEncounter.cs | 35 + DS_Map/ROMFiles/SafariZoneEncounterFile.cs | 101 ++ DS_Map/ROMFiles/SafariZoneEncounterGroup.cs | 108 ++ .../ROMFiles/SafariZoneObjectRequirement.cs | 40 + DS_Map/ROMFiles/ScriptActionContainer.cs | 13 + DS_Map/ROMFiles/ScriptCommand.cs | 168 +-- DS_Map/ROMFiles/ScriptCommandContainer.cs | 25 + DS_Map/ROMFiles/ScriptFile.cs | 270 ++-- DS_Map/ROMFiles/ScriptReference.cs | 22 + DS_Map/ROMFiles/VariableValueTrigger.cs | 32 + DS_Map/ROMToolboxDialog.cs | 49 +- DS_Map/Resources/ScriptDatabase.cs | 4 + 34 files changed, 4649 insertions(+), 2347 deletions(-) create mode 100644 DS_Map/EditorPanels.cs create mode 100644 DS_Map/Editors/LevelScriptEditor.Designer.cs create mode 100644 DS_Map/Editors/LevelScriptEditor.cs create mode 100644 DS_Map/Editors/LevelScriptEditor.resx create mode 100644 DS_Map/Editors/ScriptEditor.Designer.cs create mode 100644 DS_Map/Editors/ScriptEditor.cs create mode 100644 DS_Map/Editors/ScriptEditor.resx create mode 100644 DS_Map/ExtensionMethods.cs create mode 100644 DS_Map/ROMFiles/HeadbuttEncounter.cs create mode 100644 DS_Map/ROMFiles/HeadbuttEncounterFile.cs create mode 100644 DS_Map/ROMFiles/HeadbuttEncounterMap.cs create mode 100644 DS_Map/ROMFiles/HeadbuttTree.cs create mode 100644 DS_Map/ROMFiles/HeadbuttTreeGroup.cs create mode 100644 DS_Map/ROMFiles/LevelScriptFile.cs create mode 100644 DS_Map/ROMFiles/LevelScriptTrigger.cs create mode 100644 DS_Map/ROMFiles/MapScreenLoadTrigger.cs create mode 100644 DS_Map/ROMFiles/SafariZoneEncounter.cs create mode 100644 DS_Map/ROMFiles/SafariZoneEncounterFile.cs create mode 100644 DS_Map/ROMFiles/SafariZoneEncounterGroup.cs create mode 100644 DS_Map/ROMFiles/SafariZoneObjectRequirement.cs create mode 100644 DS_Map/ROMFiles/ScriptActionContainer.cs create mode 100644 DS_Map/ROMFiles/ScriptCommandContainer.cs create mode 100644 DS_Map/ROMFiles/ScriptReference.cs create mode 100644 DS_Map/ROMFiles/VariableValueTrigger.cs diff --git a/DS_Map/DSPRE.csproj b/DS_Map/DSPRE.csproj index c991e02..dc0ef6e 100644 --- a/DS_Map/DSPRE.csproj +++ b/DS_Map/DSPRE.csproj @@ -95,6 +95,19 @@ + + + UserControl + + + LevelScriptEditor.cs + + + UserControl + + + ScriptEditor.cs + Form @@ -107,6 +120,7 @@ EvolutionsEditor.cs + @@ -164,12 +178,28 @@ Component + + + + + + + + + + + + + + + + Form @@ -281,6 +311,12 @@ + + LevelScriptEditor.cs + + + ScriptEditor.cs + EventFileImport.cs diff --git a/DS_Map/EditorPanels.cs b/DS_Map/EditorPanels.cs new file mode 100644 index 0000000..c61106c --- /dev/null +++ b/DS_Map/EditorPanels.cs @@ -0,0 +1,20 @@ +using System.Windows.Forms; +using DSPRE.Editors; + +namespace DSPRE { + public static class EditorPanels { + public static MainProgram MainProgram; + + public static void Initialize(MainProgram mainProgram) { + MainProgram = mainProgram; + } + + public static ScriptEditor scriptEditor { get { return MainProgram.scriptEditor; } } + public static LevelScriptEditor levelScriptEditor { get { return MainProgram.levelScriptEditor; } } + public static TabControl mainTabControl { get { return MainProgram.mainTabControl; } } + + public static TabPage scriptEditorTabPage { get { return MainProgram.tabPageScriptEditor; } } + public static TabPage levelScriptEditorTabPage { get { return MainProgram.tabPageLevelScriptEditor; } } + + } +} diff --git a/DS_Map/Editors/LevelScriptEditor.Designer.cs b/DS_Map/Editors/LevelScriptEditor.Designer.cs new file mode 100644 index 0000000..e17cade --- /dev/null +++ b/DS_Map/Editors/LevelScriptEditor.Designer.cs @@ -0,0 +1,458 @@ +using System.ComponentModel; + +namespace DSPRE.Editors { + partial class LevelScriptEditor { + /// + /// Required designer variable. + /// + private 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 Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() { + this.buttonSave = new System.Windows.Forms.Button(); + this.buttonExport = new System.Windows.Forms.Button(); + this.radioButtonVariableValue = new System.Windows.Forms.RadioButton(); + this.radioButtonMapChange = new System.Windows.Forms.RadioButton(); + this.radioButtonScreenReset = new System.Windows.Forms.RadioButton(); + this.radioButtonLoadGame = new System.Windows.Forms.RadioButton(); + this.textBoxScriptID = new System.Windows.Forms.TextBox(); + this.textBoxVariableName = new System.Windows.Forms.TextBox(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.groupBoxVariable = new System.Windows.Forms.GroupBox(); + this.groupBoxValue = new System.Windows.Forms.GroupBox(); + this.textBoxVariableValue = new System.Windows.Forms.TextBox(); + this.checkBoxPadding = new System.Windows.Forms.CheckBox(); + this.buttonAdd = new System.Windows.Forms.Button(); + this.buttonRemove = new System.Windows.Forms.Button(); + this.radioButtonDecimal = new System.Windows.Forms.RadioButton(); + this.radioButtonHex = new System.Windows.Forms.RadioButton(); + this.radioButtonAuto = new System.Windows.Forms.RadioButton(); + this.selectScriptFileComboBox = new System.Windows.Forms.ComboBox(); + this.listBoxTriggers = new DSPRE.ListBox2(); + this.buttonOpenHeaderScript = new System.Windows.Forms.Button(); + this.buttonOpenSelectedScript = new System.Windows.Forms.Button(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.buttonLocate = new System.Windows.Forms.Button(); + this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.buttonImport = new System.Windows.Forms.Button(); + this.groupBox5 = new System.Windows.Forms.GroupBox(); + this.groupBox6 = new System.Windows.Forms.GroupBox(); + this.groupBox7 = new System.Windows.Forms.GroupBox(); + this.groupBox1.SuspendLayout(); + this.groupBox2.SuspendLayout(); + this.groupBoxVariable.SuspendLayout(); + this.groupBoxValue.SuspendLayout(); + this.groupBox3.SuspendLayout(); + this.groupBox4.SuspendLayout(); + this.groupBox5.SuspendLayout(); + this.groupBox6.SuspendLayout(); + this.groupBox7.SuspendLayout(); + this.SuspendLayout(); + // + // buttonSave + // + this.buttonSave.Location = new System.Drawing.Point(70, 19); + this.buttonSave.Name = "buttonSave"; + this.buttonSave.Size = new System.Drawing.Size(53, 23); + this.buttonSave.TabIndex = 5; + this.buttonSave.Text = "Save"; + this.buttonSave.UseVisualStyleBackColor = true; + this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click); + // + // buttonExport + // + this.buttonExport.Location = new System.Drawing.Point(129, 19); + this.buttonExport.Name = "buttonExport"; + this.buttonExport.Size = new System.Drawing.Size(51, 23); + this.buttonExport.TabIndex = 6; + this.buttonExport.Text = "Export"; + this.buttonExport.UseVisualStyleBackColor = true; + this.buttonExport.Click += new System.EventHandler(this.buttonExport_Click); + // + // radioButtonVariableValue + // + this.radioButtonVariableValue.AutoSize = true; + this.radioButtonVariableValue.Checked = true; + this.radioButtonVariableValue.Location = new System.Drawing.Point(6, 19); + this.radioButtonVariableValue.Name = "radioButtonVariableValue"; + this.radioButtonVariableValue.Size = new System.Drawing.Size(107, 17); + this.radioButtonVariableValue.TabIndex = 12; + this.radioButtonVariableValue.TabStop = true; + this.radioButtonVariableValue.Text = "Variable == value"; + this.radioButtonVariableValue.UseVisualStyleBackColor = true; + this.radioButtonVariableValue.CheckedChanged += new System.EventHandler(this.radioButtonVariableValue_CheckedChanged); + // + // radioButtonMapChange + // + this.radioButtonMapChange.AutoSize = true; + this.radioButtonMapChange.Location = new System.Drawing.Point(119, 19); + this.radioButtonMapChange.Name = "radioButtonMapChange"; + this.radioButtonMapChange.Size = new System.Drawing.Size(86, 17); + this.radioButtonMapChange.TabIndex = 13; + this.radioButtonMapChange.Text = "Player enters"; + this.radioButtonMapChange.UseVisualStyleBackColor = true; + this.radioButtonMapChange.CheckedChanged += new System.EventHandler(this.radioButtonMapChange_CheckedChanged); + // + // radioButtonScreenReset + // + this.radioButtonScreenReset.AutoSize = true; + this.radioButtonScreenReset.Location = new System.Drawing.Point(211, 19); + this.radioButtonScreenReset.Name = "radioButtonScreenReset"; + this.radioButtonScreenReset.Size = new System.Drawing.Size(88, 17); + this.radioButtonScreenReset.TabIndex = 14; + this.radioButtonScreenReset.Text = "Screen fades"; + this.radioButtonScreenReset.UseVisualStyleBackColor = true; + this.radioButtonScreenReset.CheckedChanged += new System.EventHandler(this.radioButtonScreenReset_CheckedChanged); + // + // radioButtonLoadGame + // + this.radioButtonLoadGame.AutoSize = true; + this.radioButtonLoadGame.Location = new System.Drawing.Point(305, 19); + this.radioButtonLoadGame.Name = "radioButtonLoadGame"; + this.radioButtonLoadGame.Size = new System.Drawing.Size(81, 17); + this.radioButtonLoadGame.TabIndex = 15; + this.radioButtonLoadGame.Text = "Game loads"; + this.radioButtonLoadGame.UseVisualStyleBackColor = true; + this.radioButtonLoadGame.CheckedChanged += new System.EventHandler(this.radioButtonLoadGame_CheckedChanged); + // + // textBoxScriptID + // + this.textBoxScriptID.Location = new System.Drawing.Point(6, 19); + this.textBoxScriptID.Name = "textBoxScriptID"; + this.textBoxScriptID.Size = new System.Drawing.Size(116, 20); + this.textBoxScriptID.TabIndex = 16; + this.textBoxScriptID.TextChanged += new System.EventHandler(this.textBoxScriptID_TextChanged); + // + // textBoxVariableName + // + this.textBoxVariableName.Location = new System.Drawing.Point(6, 19); + this.textBoxVariableName.Name = "textBoxVariableName"; + this.textBoxVariableName.Size = new System.Drawing.Size(116, 20); + this.textBoxVariableName.TabIndex = 17; + this.textBoxVariableName.TextChanged += new System.EventHandler(this.textBoxVariableName_TextChanged); + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.radioButtonVariableValue); + this.groupBox1.Controls.Add(this.radioButtonMapChange); + this.groupBox1.Controls.Add(this.radioButtonScreenReset); + this.groupBox1.Controls.Add(this.radioButtonLoadGame); + this.groupBox1.Location = new System.Drawing.Point(3, 366); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(397, 48); + this.groupBox1.TabIndex = 11; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "When this happens in the map:"; + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.textBoxScriptID); + this.groupBox2.Location = new System.Drawing.Point(3, 420); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(128, 48); + this.groupBox2.TabIndex = 12; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "Run this script ID"; + // + // groupBoxVariable + // + this.groupBoxVariable.Controls.Add(this.textBoxVariableName); + this.groupBoxVariable.Location = new System.Drawing.Point(137, 420); + this.groupBoxVariable.Name = "groupBoxVariable"; + this.groupBoxVariable.Size = new System.Drawing.Size(128, 48); + this.groupBoxVariable.TabIndex = 13; + this.groupBoxVariable.TabStop = false; + this.groupBoxVariable.Text = "when this variable =="; + // + // groupBoxValue + // + this.groupBoxValue.Controls.Add(this.textBoxVariableValue); + this.groupBoxValue.Location = new System.Drawing.Point(271, 420); + this.groupBoxValue.Name = "groupBoxValue"; + this.groupBoxValue.Size = new System.Drawing.Size(129, 48); + this.groupBoxValue.TabIndex = 13; + this.groupBoxValue.TabStop = false; + this.groupBoxValue.Text = "this value"; + // + // textBoxVariableValue + // + this.textBoxVariableValue.Location = new System.Drawing.Point(6, 19); + this.textBoxVariableValue.Name = "textBoxVariableValue"; + this.textBoxVariableValue.Size = new System.Drawing.Size(117, 20); + this.textBoxVariableValue.TabIndex = 18; + this.textBoxVariableValue.TextChanged += new System.EventHandler(this.textBoxVariableValue_TextChanged); + // + // checkBoxPadding + // + this.checkBoxPadding.AutoSize = true; + this.checkBoxPadding.Location = new System.Drawing.Point(186, 23); + this.checkBoxPadding.Name = "checkBoxPadding"; + this.checkBoxPadding.Size = new System.Drawing.Size(141, 17); + this.checkBoxPadding.TabIndex = 7; + this.checkBoxPadding.Text = "Word-alignment padding"; + this.checkBoxPadding.UseVisualStyleBackColor = true; + // + // buttonAdd + // + this.buttonAdd.Location = new System.Drawing.Point(6, 19); + this.buttonAdd.Name = "buttonAdd"; + this.buttonAdd.Size = new System.Drawing.Size(75, 23); + this.buttonAdd.TabIndex = 19; + this.buttonAdd.Text = "Add"; + this.buttonAdd.UseVisualStyleBackColor = true; + this.buttonAdd.Click += new System.EventHandler(this.buttonAdd_Click); + // + // buttonRemove + // + this.buttonRemove.Location = new System.Drawing.Point(87, 19); + this.buttonRemove.Name = "buttonRemove"; + this.buttonRemove.Size = new System.Drawing.Size(75, 23); + this.buttonRemove.TabIndex = 20; + this.buttonRemove.Text = "Remove"; + this.buttonRemove.UseVisualStyleBackColor = true; + this.buttonRemove.Click += new System.EventHandler(this.buttonRemove_Click); + // + // radioButtonDecimal + // + this.radioButtonDecimal.AutoSize = true; + this.radioButtonDecimal.Location = new System.Drawing.Point(109, 19); + this.radioButtonDecimal.Name = "radioButtonDecimal"; + this.radioButtonDecimal.Size = new System.Drawing.Size(63, 17); + this.radioButtonDecimal.TabIndex = 10; + this.radioButtonDecimal.Text = "Decimal"; + this.radioButtonDecimal.UseVisualStyleBackColor = true; + this.radioButtonDecimal.CheckedChanged += new System.EventHandler(this.radioButtonDecimal_CheckedChanged); + // + // radioButtonHex + // + this.radioButtonHex.AutoSize = true; + this.radioButtonHex.Location = new System.Drawing.Point(59, 19); + this.radioButtonHex.Name = "radioButtonHex"; + this.radioButtonHex.Size = new System.Drawing.Size(44, 17); + this.radioButtonHex.TabIndex = 9; + this.radioButtonHex.Text = "Hex"; + this.radioButtonHex.UseVisualStyleBackColor = true; + this.radioButtonHex.CheckedChanged += new System.EventHandler(this.radioButtonHex_CheckedChanged); + // + // radioButtonAuto + // + this.radioButtonAuto.AutoSize = true; + this.radioButtonAuto.Checked = true; + this.radioButtonAuto.Location = new System.Drawing.Point(6, 19); + this.radioButtonAuto.Name = "radioButtonAuto"; + this.radioButtonAuto.Size = new System.Drawing.Size(47, 17); + this.radioButtonAuto.TabIndex = 8; + this.radioButtonAuto.TabStop = true; + this.radioButtonAuto.Text = "Auto"; + this.radioButtonAuto.UseVisualStyleBackColor = true; + this.radioButtonAuto.CheckedChanged += new System.EventHandler(this.radioButtonAuto_CheckedChanged); + // + // selectScriptFileComboBox + // + this.selectScriptFileComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.selectScriptFileComboBox.FormattingEnabled = true; + this.selectScriptFileComboBox.Location = new System.Drawing.Point(6, 19); + this.selectScriptFileComboBox.Name = "selectScriptFileComboBox"; + this.selectScriptFileComboBox.Size = new System.Drawing.Size(152, 21); + this.selectScriptFileComboBox.TabIndex = 1; + this.selectScriptFileComboBox.SelectedIndexChanged += new System.EventHandler(this.selectScriptFileComboBox_SelectedIndexChanged); + // + // listBoxTriggers + // + this.listBoxTriggers.FormattingEnabled = true; + this.listBoxTriggers.Location = new System.Drawing.Point(3, 226); + this.listBoxTriggers.Name = "listBoxTriggers"; + this.listBoxTriggers.Size = new System.Drawing.Size(397, 134); + this.listBoxTriggers.TabIndex = 11; + this.listBoxTriggers.SelectedValueChanged += new System.EventHandler(this.listBoxTriggers_SelectedValueChanged); + // + // buttonOpenHeaderScript + // + this.buttonOpenHeaderScript.Location = new System.Drawing.Point(6, 19); + this.buttonOpenHeaderScript.Name = "buttonOpenHeaderScript"; + this.buttonOpenHeaderScript.Size = new System.Drawing.Size(88, 23); + this.buttonOpenHeaderScript.TabIndex = 2; + this.buttonOpenHeaderScript.Text = "Header Script"; + this.buttonOpenHeaderScript.UseVisualStyleBackColor = true; + this.buttonOpenHeaderScript.Click += new System.EventHandler(this.buttonOpenHeaderScript_Click); + // + // buttonOpenSelectedScript + // + this.buttonOpenSelectedScript.Location = new System.Drawing.Point(100, 19); + this.buttonOpenSelectedScript.Name = "buttonOpenSelectedScript"; + this.buttonOpenSelectedScript.Size = new System.Drawing.Size(94, 23); + this.buttonOpenSelectedScript.TabIndex = 3; + this.buttonOpenSelectedScript.Text = "Selected Script"; + this.buttonOpenSelectedScript.UseVisualStyleBackColor = true; + this.buttonOpenSelectedScript.Click += new System.EventHandler(this.buttonOpenSelectedScript_Click); + // + // groupBox3 + // + this.groupBox3.Controls.Add(this.buttonLocate); + this.groupBox3.Controls.Add(this.buttonOpenSelectedScript); + this.groupBox3.Controls.Add(this.buttonOpenHeaderScript); + this.groupBox3.Location = new System.Drawing.Point(3, 61); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Size = new System.Drawing.Size(263, 52); + this.groupBox3.TabIndex = 18; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "Open"; + // + // buttonLocate + // + this.buttonLocate.Location = new System.Drawing.Point(200, 19); + this.buttonLocate.Name = "buttonLocate"; + this.buttonLocate.Size = new System.Drawing.Size(56, 23); + this.buttonLocate.TabIndex = 3; + this.buttonLocate.Text = "Locate"; + this.buttonLocate.UseVisualStyleBackColor = true; + this.buttonLocate.Click += new System.EventHandler(this.buttonLocate_Click); + // + // groupBox4 + // + this.groupBox4.Controls.Add(this.buttonImport); + this.groupBox4.Controls.Add(this.buttonSave); + this.groupBox4.Controls.Add(this.buttonExport); + this.groupBox4.Controls.Add(this.checkBoxPadding); + this.groupBox4.Location = new System.Drawing.Point(3, 119); + this.groupBox4.Name = "groupBox4"; + this.groupBox4.Size = new System.Drawing.Size(329, 53); + this.groupBox4.TabIndex = 20; + this.groupBox4.TabStop = false; + this.groupBox4.Text = "File"; + // + // buttonImport + // + this.buttonImport.Location = new System.Drawing.Point(6, 19); + this.buttonImport.Name = "buttonImport"; + this.buttonImport.Size = new System.Drawing.Size(58, 23); + this.buttonImport.TabIndex = 4; + this.buttonImport.Text = "Import"; + this.buttonImport.UseVisualStyleBackColor = true; + this.buttonImport.Click += new System.EventHandler(this.buttonImport_Click); + // + // groupBox5 + // + this.groupBox5.Controls.Add(this.buttonRemove); + this.groupBox5.Controls.Add(this.buttonAdd); + this.groupBox5.Location = new System.Drawing.Point(231, 474); + this.groupBox5.Name = "groupBox5"; + this.groupBox5.Size = new System.Drawing.Size(169, 52); + this.groupBox5.TabIndex = 21; + this.groupBox5.TabStop = false; + this.groupBox5.Text = "Trigger"; + // + // groupBox6 + // + this.groupBox6.Controls.Add(this.radioButtonAuto); + this.groupBox6.Controls.Add(this.radioButtonDecimal); + this.groupBox6.Controls.Add(this.radioButtonHex); + this.groupBox6.Location = new System.Drawing.Point(3, 178); + this.groupBox6.Name = "groupBox6"; + this.groupBox6.Size = new System.Drawing.Size(178, 42); + this.groupBox6.TabIndex = 22; + this.groupBox6.TabStop = false; + this.groupBox6.Text = "Number Format"; + // + // groupBox7 + // + this.groupBox7.Controls.Add(this.selectScriptFileComboBox); + this.groupBox7.Location = new System.Drawing.Point(3, 3); + this.groupBox7.Name = "groupBox7"; + this.groupBox7.Size = new System.Drawing.Size(164, 52); + this.groupBox7.TabIndex = 23; + this.groupBox7.TabStop = false; + this.groupBox7.Text = "Script File"; + // + // LevelScriptEditor + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.SystemColors.Control; + this.Controls.Add(this.groupBox7); + this.Controls.Add(this.groupBox6); + this.Controls.Add(this.groupBox5); + this.Controls.Add(this.groupBox4); + this.Controls.Add(this.groupBox3); + this.Controls.Add(this.groupBoxValue); + this.Controls.Add(this.groupBoxVariable); + this.Controls.Add(this.groupBox2); + this.Controls.Add(this.groupBox1); + this.Controls.Add(this.listBoxTriggers); + this.Location = new System.Drawing.Point(15, 15); + this.Name = "LevelScriptEditor"; + this.Size = new System.Drawing.Size(408, 622); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); + this.groupBox2.ResumeLayout(false); + this.groupBox2.PerformLayout(); + this.groupBoxVariable.ResumeLayout(false); + this.groupBoxVariable.PerformLayout(); + this.groupBoxValue.ResumeLayout(false); + this.groupBoxValue.PerformLayout(); + this.groupBox3.ResumeLayout(false); + this.groupBox4.ResumeLayout(false); + this.groupBox4.PerformLayout(); + this.groupBox5.ResumeLayout(false); + this.groupBox6.ResumeLayout(false); + this.groupBox6.PerformLayout(); + this.groupBox7.ResumeLayout(false); + this.ResumeLayout(false); + + } + + private System.Windows.Forms.Button buttonImport; + private System.Windows.Forms.GroupBox groupBox4; + private System.Windows.Forms.GroupBox groupBox5; + + private System.Windows.Forms.Button buttonOpenSelectedScript; + private System.Windows.Forms.GroupBox groupBox3; + + public System.Windows.Forms.ComboBox selectScriptFileComboBox; + + #endregion + private System.Windows.Forms.Button buttonSave; + private DSPRE.ListBox2 listBoxTriggers; + private System.Windows.Forms.Button buttonExport; + private System.Windows.Forms.RadioButton radioButtonVariableValue; + private System.Windows.Forms.RadioButton radioButtonMapChange; + private System.Windows.Forms.RadioButton radioButtonScreenReset; + private System.Windows.Forms.RadioButton radioButtonLoadGame; + private System.Windows.Forms.TextBox textBoxScriptID; + private System.Windows.Forms.TextBox textBoxVariableName; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.GroupBox groupBox2; + private System.Windows.Forms.GroupBox groupBoxVariable; + private System.Windows.Forms.GroupBox groupBoxValue; + private System.Windows.Forms.TextBox textBoxVariableValue; + private System.Windows.Forms.CheckBox checkBoxPadding; + private System.Windows.Forms.Button buttonAdd; + private System.Windows.Forms.Button buttonRemove; + private System.Windows.Forms.RadioButton radioButtonDecimal; + private System.Windows.Forms.RadioButton radioButtonHex; + private System.Windows.Forms.RadioButton radioButtonAuto; + private System.Windows.Forms.Button buttonOpenHeaderScript; + private System.Windows.Forms.GroupBox groupBox6; + private System.Windows.Forms.GroupBox groupBox7; + private System.Windows.Forms.Button buttonLocate; + } +} + diff --git a/DS_Map/Editors/LevelScriptEditor.cs b/DS_Map/Editors/LevelScriptEditor.cs new file mode 100644 index 0000000..0c8c424 --- /dev/null +++ b/DS_Map/Editors/LevelScriptEditor.cs @@ -0,0 +1,387 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Windows.Forms; +using DSPRE.ROMFiles; + +namespace DSPRE.Editors { + public partial class LevelScriptEditor : UserControl { + public bool levelScriptEditorIsReady { get; set; } = false; + LevelScriptFile _levelScriptFile; + MainProgram _parent; + + public LevelScriptEditor() { + InitializeComponent(); + + } + + public void SetUpLevelScriptEditor(MainProgram parent, bool force = false) { + if (levelScriptEditorIsReady && !force) return; + levelScriptEditorIsReady = true; + this._parent = parent; + DSUtils.TryUnpackNarcs(new List { RomInfo.DirNames.scripts }); //12 = scripts Narc Dir + populate_selectScriptFileComboBox(); + } + + public void OpenLevelScriptEditor(MainProgram parent, int levelScriptID) { + + SetUpLevelScriptEditor(parent); + + selectScriptFileComboBox.SelectedIndex = levelScriptID; + EditorPanels.mainTabControl.SelectedTab = EditorPanels.levelScriptEditorTabPage; + } + + private void populate_selectScriptFileComboBox(int selectedIndex = 0) { + selectScriptFileComboBox.Items.Clear(); + int scriptCount = Filesystem.GetScriptCount(); + for (int i = 0; i < scriptCount; i++) { + // ScriptFile currentScriptFile = new ScriptFile(i, true, true); + // selectScriptFileComboBox.Items.Add(currentScriptFile); + selectScriptFileComboBox.Items.Add($"Script File {i}"); + } + + selectScriptFileComboBox.SelectedIndex = selectedIndex; + } + + void disableButtons() { + listBoxTriggers.DataSource = null; + + textBoxScriptID.Clear(); + textBoxVariableName.Clear(); + textBoxVariableValue.Clear(); + + radioButtonVariableValue.Checked = false; + radioButtonMapChange.Checked = false; + radioButtonScreenReset.Checked = false; + radioButtonLoadGame.Checked = false; + + textBoxScriptID.Enabled = false; + textBoxVariableName.Enabled = false; + textBoxVariableValue.Enabled = false; + + radioButtonVariableValue.Enabled = false; + radioButtonMapChange.Enabled = false; + radioButtonScreenReset.Enabled = false; + radioButtonLoadGame.Enabled = false; + + radioButtonAuto.Enabled = false; + radioButtonHex.Enabled = false; + radioButtonDecimal.Enabled = false; + + buttonImport.Enabled = false; + buttonSave.Enabled = false; + buttonExport.Enabled = false; + checkBoxPadding.Enabled = false; + + buttonAdd.Enabled = false; + buttonRemove.Enabled = false; + } + + void enableButtons() { + // textBoxScriptID.Enabled = true; + // textBoxVariableName.Enabled = true; + // textBoxVariableValue.Enabled = true; + + radioButtonVariableValue.Enabled = true; + radioButtonMapChange.Enabled = true; + radioButtonScreenReset.Enabled = true; + radioButtonLoadGame.Enabled = true; + + radioButtonAuto.Enabled = true; + radioButtonHex.Enabled = true; + radioButtonDecimal.Enabled = true; + + buttonImport.Enabled = true; + buttonSave.Enabled = true; + buttonExport.Enabled = true; + checkBoxPadding.Enabled = true; + } + + void buttonAdd_logic() { + buttonAdd.Enabled = false; + + if (radioButtonVariableValue.Checked) { + if (!string.IsNullOrEmpty(textBoxScriptID.Text) && !string.IsNullOrEmpty(textBoxVariableName.Text) && !string.IsNullOrEmpty(textBoxVariableValue.Text)) { + buttonAdd.Enabled = true; + } + } + else if (radioButtonMapChange.Checked || radioButtonScreenReset.Checked || radioButtonLoadGame.Checked) { + if (!string.IsNullOrEmpty(textBoxScriptID.Text)) { + buttonAdd.Enabled = true; + } + } + } + + private void selectScriptFileComboBox_SelectedIndexChanged(object sender, EventArgs e) { + if (selectScriptFileComboBox.SelectedIndex == -1) { + buttonOpenSelectedScript.Enabled = false; + buttonOpenHeaderScript.Enabled = false; + buttonLocate.Enabled = false; + } + else { + buttonOpenSelectedScript.Enabled = true; + buttonOpenHeaderScript.Enabled = true; + buttonLocate.Enabled = true; + } + + disableButtons(); + + try { + _levelScriptFile = new LevelScriptFile(selectScriptFileComboBox.SelectedIndex); + + listBoxTriggers.DataSource = _levelScriptFile.bufferSet; + if (listBoxTriggers.Items.Count > 0) listBoxTriggers.SelectedIndex = 0; + + enableButtons(); + } + catch (InvalidDataException ex) { //not a level script + disableButtons(); + Console.WriteLine(ex.Message); + } + } + + void listBoxTriggers_SelectedValueChanged(object sender, EventArgs e) { + if (listBoxTriggers.SelectedItem == null) { + buttonRemove.Enabled = false; + return; + } + + if (listBoxTriggers.SelectedItem is MapScreenLoadTrigger mapScreenLoadTrigger) { + if (mapScreenLoadTrigger.triggerType == LevelScriptTrigger.LOADGAME) { + radioButtonLoadGame.Checked = true; + } + else if (mapScreenLoadTrigger.triggerType == LevelScriptTrigger.MAPCHANGE) { + radioButtonMapChange.Checked = true; + } + else if (mapScreenLoadTrigger.triggerType == LevelScriptTrigger.SCREENRESET) { + radioButtonScreenReset.Checked = true; + } + } + else if (listBoxTriggers.SelectedItem is VariableValueTrigger variableValueTrigger) { + if (variableValueTrigger.triggerType == LevelScriptTrigger.VARIABLEVALUE) { + radioButtonVariableValue.Checked = true; + } + } + + handleAutoFormat(); + handleHexFormat(); + handleDecimalFormat(); + + textBoxScriptID.Enabled = true; + buttonRemove.Enabled = true; + } + + private void buttonAdd_Click(object sender, EventArgs e) { + // try { + if (_levelScriptFile == null) { + _levelScriptFile = new LevelScriptFile(); + } + + int convertBase = 10; //decimal + if (radioButtonHex.Checked) { + convertBase = 16; //hex + } + + if (radioButtonVariableValue.Checked) { + int scriptID = Convert.ToInt16(textBoxScriptID.Text, convertBase); + int variableName = Convert.ToInt16(textBoxVariableName.Text, convertBase); + int variableValue = Convert.ToInt16(textBoxVariableValue.Text, convertBase); + VariableValueTrigger variableValueTrigger = new VariableValueTrigger(scriptID, variableName, variableValue); + _levelScriptFile.bufferSet.Add(variableValueTrigger); + } + else { + int scriptID = Convert.ToInt16(textBoxScriptID.Text, convertBase); + if (radioButtonMapChange.Checked) { + MapScreenLoadTrigger mapScreenLoadTrigger = new MapScreenLoadTrigger(LevelScriptTrigger.MAPCHANGE, scriptID); + _levelScriptFile.bufferSet.Add(mapScreenLoadTrigger); + } + else if (radioButtonScreenReset.Checked) { + MapScreenLoadTrigger mapScreenLoadTrigger = new MapScreenLoadTrigger(LevelScriptTrigger.SCREENRESET, scriptID); + _levelScriptFile.bufferSet.Add(mapScreenLoadTrigger); + } + else if (radioButtonLoadGame.Checked) { + MapScreenLoadTrigger mapScreenLoadTrigger = new MapScreenLoadTrigger(LevelScriptTrigger.LOADGAME, scriptID); + _levelScriptFile.bufferSet.Add(mapScreenLoadTrigger); + } + } + + textBoxScriptID.Clear(); + textBoxVariableName.Clear(); + textBoxVariableValue.Clear(); + // } + // catch (Exception exception) { + // MessageBox.Show(exception.Message); + // } + } + + private void buttonRemove_Click(object sender, EventArgs e) { + _levelScriptFile.bufferSet.RemoveAt(listBoxTriggers.SelectedIndex); + } + + private void buttonOpenHeaderScript_Click(object sender, EventArgs e) { + EditorPanels.scriptEditor.OpenScriptEditor(this._parent, (int)EditorPanels.MainProgram.scriptFileUpDown.Value); + } + + private void buttonOpenSelectedScript_Click(object sender, EventArgs e) { + EditorPanels.scriptEditor.OpenScriptEditor(this._parent, (int)EditorPanels.levelScriptEditor.selectScriptFileComboBox.SelectedIndex); + } + + void buttonLocate_Click(object sender, EventArgs e) { + if (_levelScriptFile == null) return; + string path = Filesystem.GetScriptPath(_levelScriptFile.ID); + Helpers.ExplorerSelect(path); + } + + void buttonImport_Click(object sender, EventArgs e) { + OpenFileDialog ofd = new OpenFileDialog(); + if (ofd.ShowDialog() == DialogResult.OK) { + try { + LevelScriptFile importedFile = new LevelScriptFile(); + importedFile.parse_file(ofd.FileName); + _levelScriptFile.bufferSet.Clear(); + foreach (LevelScriptTrigger trigger in importedFile.bufferSet) { + _levelScriptFile.bufferSet.Add(trigger); + } + } + catch (InvalidDataException ex) { + MessageBox.Show(ex.Message, ex.GetType().ToString()); + } + } + } + + private void buttonSave_Click(object sender, EventArgs e) { + string path = Filesystem.GetScriptPath(_levelScriptFile.ID); + saveFile(path); + } + + private void buttonExport_Click(object sender, EventArgs e) { + SaveFileDialog sfd = new SaveFileDialog(); + try { + sfd.InitialDirectory = Path.GetDirectoryName(sfd.FileName); + sfd.FileName = Path.GetFileName(sfd.FileName); + } + catch (Exception ex) { + sfd.InitialDirectory = Path.GetDirectoryName(Environment.SpecialFolder.UserProfile.ToString()); + sfd.FileName = Path.GetFileName(sfd.FileName); + } + + if (sfd.ShowDialog() == DialogResult.OK) { + saveFile(sfd.FileName); + } + } + + void saveFile(string path) { + try { + long bytes_written = _levelScriptFile.write_file(path); + if (bytes_written <= 4) { + MessageBox.Show("Empty level script file was correctly saved.", "Success!"); + } + else { + MessageBox.Show("File was correctly saved.", "Success!"); + } + } + catch (Exception ex) { + MessageBox.Show(ex.Message, ex.GetType().ToString()); + } + } + + private void handleAutoFormat() { + if (!radioButtonAuto.Checked) return; + + textBoxScriptID.Clear(); + textBoxVariableName.Clear(); + textBoxVariableValue.Clear(); + + if (listBoxTriggers.SelectedItem is MapScreenLoadTrigger mapScreenLoadTrigger) { + textBoxScriptID.Text = mapScreenLoadTrigger.scriptTriggered.ToString(); + } + else if (listBoxTriggers.SelectedItem is VariableValueTrigger variableValueTrigger) { + textBoxScriptID.Text = variableValueTrigger.scriptTriggered.ToString(); + textBoxVariableName.Text = "" + variableValueTrigger.variableToWatch.ToString("D"); + textBoxVariableValue.Text = "" + variableValueTrigger.expectedValue.ToString("D"); + } + } + + private void handleHexFormat() { + if (!radioButtonHex.Checked) return; + + textBoxScriptID.Clear(); + textBoxVariableName.Clear(); + textBoxVariableValue.Clear(); + + if (listBoxTriggers.SelectedItem is MapScreenLoadTrigger mapScreenLoadTrigger) { + textBoxScriptID.Text = mapScreenLoadTrigger.scriptTriggered.ToString(); + } + else if (listBoxTriggers.SelectedItem is VariableValueTrigger variableValueTrigger) { + textBoxScriptID.Text = variableValueTrigger.scriptTriggered.ToString(); + textBoxVariableName.Text = "0x" + variableValueTrigger.variableToWatch.ToString("X"); + textBoxVariableValue.Text = "0x" + variableValueTrigger.expectedValue.ToString("X"); + } + } + + private void handleDecimalFormat() { + if (!radioButtonDecimal.Checked) return; + + textBoxScriptID.Clear(); + textBoxVariableName.Clear(); + textBoxVariableValue.Clear(); + + if (listBoxTriggers.SelectedItem is MapScreenLoadTrigger mapScreenLoadTrigger) { + textBoxScriptID.Text = mapScreenLoadTrigger.scriptTriggered.ToString(); + } + else if (listBoxTriggers.SelectedItem is VariableValueTrigger variableValueTrigger) { + textBoxScriptID.Text = variableValueTrigger.scriptTriggered.ToString(); + textBoxVariableName.Text = "" + variableValueTrigger.variableToWatch.ToString("D"); + textBoxVariableValue.Text = "" + variableValueTrigger.expectedValue.ToString("D"); + } + } + + private void radioButtonAuto_CheckedChanged(object sender, EventArgs e) { + handleAutoFormat(); + } + + private void radioButtonHex_CheckedChanged(object sender, EventArgs e) { + handleHexFormat(); + } + + private void radioButtonDecimal_CheckedChanged(object sender, EventArgs e) { + handleDecimalFormat(); + } + + private void radioButtonVariableValue_CheckedChanged(object sender, EventArgs e) { + textBoxVariableName.Enabled = true; + textBoxVariableValue.Enabled = true; + buttonAdd_logic(); + } + + private void radioButtonMapChange_CheckedChanged(object sender, EventArgs e) { + textBoxVariableName.Enabled = false; + textBoxVariableValue.Enabled = false; + buttonAdd_logic(); + } + + private void radioButtonScreenReset_CheckedChanged(object sender, EventArgs e) { + textBoxVariableName.Enabled = false; + textBoxVariableValue.Enabled = false; + buttonAdd_logic(); + } + + private void radioButtonLoadGame_CheckedChanged(object sender, EventArgs e) { + textBoxVariableName.Enabled = false; + textBoxVariableValue.Enabled = false; + buttonAdd_logic(); + } + + void textBoxScriptID_TextChanged(object sender, EventArgs e) { + buttonAdd_logic(); + } + + void textBoxVariableName_TextChanged(object sender, EventArgs e) { + buttonAdd_logic(); + } + + void textBoxVariableValue_TextChanged(object sender, EventArgs e) { + buttonAdd_logic(); + } + } +} diff --git a/DS_Map/Editors/LevelScriptEditor.resx b/DS_Map/Editors/LevelScriptEditor.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/DS_Map/Editors/LevelScriptEditor.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/ScriptEditor.Designer.cs b/DS_Map/Editors/ScriptEditor.Designer.cs new file mode 100644 index 0000000..9d00b3a --- /dev/null +++ b/DS_Map/Editors/ScriptEditor.Designer.cs @@ -0,0 +1,917 @@ + +namespace DSPRE.Editors +{ + partial class ScriptEditor + { + /// + /// 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 Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() { + this.selectScriptFileComboBox = new System.Windows.Forms.ComboBox(); + this.label5 = new System.Windows.Forms.Label(); + this.scriptEditorTabControl = new System.Windows.Forms.TabControl(); + this.scriptsTabPage = new System.Windows.Forms.TabPage(); + this.PanelSearchScripts = new System.Windows.Forms.Panel(); + this.BtnNextFindScript = new System.Windows.Forms.Button(); + this.BtnPrevFindScript = new System.Windows.Forms.Button(); + this.BtnCloseFindScript = new System.Windows.Forms.Button(); + this.panelFindScriptTextBox = new System.Windows.Forms.TextBox(); + this.scintillaScriptsPanel = new System.Windows.Forms.Panel(); + this.functionsTabPage = new System.Windows.Forms.TabPage(); + this.PanelSearchFunctions = new System.Windows.Forms.Panel(); + this.BtnNextFindFunc = new System.Windows.Forms.Button(); + this.BtnPrevFindFunc = new System.Windows.Forms.Button(); + this.BtnCloseFindFunc = new System.Windows.Forms.Button(); + this.panelFindFunctionTextBox = new System.Windows.Forms.TextBox(); + this.scintillaFunctionsPanel = new System.Windows.Forms.Panel(); + this.actionsTabPage = new System.Windows.Forms.TabPage(); + this.PanelSearchActions = new System.Windows.Forms.Panel(); + this.BtnNextFindActions = new System.Windows.Forms.Button(); + this.BtnPrevFindActions = new System.Windows.Forms.Button(); + this.BtnCloseFindActions = new System.Windows.Forms.Button(); + this.panelFindActionTextBox = new System.Windows.Forms.TextBox(); + this.scintillaActionsPanel = new System.Windows.Forms.Panel(); + this.addScriptFileButton = new System.Windows.Forms.Button(); + this.removeScriptFileButton = new System.Windows.Forms.Button(); + this.saveScriptFileButton = new System.Windows.Forms.Button(); + this.exportScriptFileButton = new System.Windows.Forms.Button(); + this.importScriptFileButton = new System.Windows.Forms.Button(); + this.groupBox8 = new System.Windows.Forms.GroupBox(); + this.searchInScriptsButton = new System.Windows.Forms.Button(); + this.searchOnlyCurrentScriptCheckBox = new System.Windows.Forms.CheckBox(); + this.scrollToBlockStartcheckBox = new System.Windows.Forms.CheckBox(); + this.scriptSearchCaseSensitiveCheckBox = new System.Windows.Forms.CheckBox(); + this.searchInScriptsTextBox = new System.Windows.Forms.TextBox(); + this.label31 = new System.Windows.Forms.Label(); + this.searchProgressBar = new System.Windows.Forms.ProgressBar(); + this.label30 = new System.Windows.Forms.Label(); + this.label29 = new System.Windows.Forms.Label(); + this.searchInScriptsResultListBox = new System.Windows.Forms.ListBox(); + this.groupBox24 = new System.Windows.Forms.GroupBox(); + this.ScriptNavigatorTabControl = new System.Windows.Forms.TabControl(); + this.ScriptsNavTab = new System.Windows.Forms.TabPage(); + this.scriptsNavListbox = new System.Windows.Forms.ListBox(); + this.FunctionsNavTab = new System.Windows.Forms.TabPage(); + this.functionsNavListbox = new System.Windows.Forms.ListBox(); + this.ActionsNavTab = new System.Windows.Forms.TabPage(); + this.actionsNavListbox = new System.Windows.Forms.ListBox(); + this.openFindScriptEditorButton = new System.Windows.Forms.Button(); + this.expandScriptTextButton = new System.Windows.Forms.Button(); + this.compressScriptTextButton = new System.Windows.Forms.Button(); + this.scriptEditorWordWrapCheckbox = new System.Windows.Forms.CheckBox(); + this.scriptEditorWhitespacesCheckbox = new System.Windows.Forms.CheckBox(); + this.groupBox26 = new System.Windows.Forms.GroupBox(); + this.scriptEditorNumberFormatNoPreference = new System.Windows.Forms.RadioButton(); + this.scriptEditorNumberFormatDecimal = new System.Windows.Forms.RadioButton(); + this.scriptEditorNumberFormatHex = new System.Windows.Forms.RadioButton(); + this.viewLevelScriptButton = new System.Windows.Forms.Button(); + this.locateCurrentScriptFile = new System.Windows.Forms.Button(); + this.scriptEditorTabControl.SuspendLayout(); + this.scriptsTabPage.SuspendLayout(); + this.PanelSearchScripts.SuspendLayout(); + this.functionsTabPage.SuspendLayout(); + this.PanelSearchFunctions.SuspendLayout(); + this.actionsTabPage.SuspendLayout(); + this.PanelSearchActions.SuspendLayout(); + this.groupBox8.SuspendLayout(); + this.groupBox24.SuspendLayout(); + this.ScriptNavigatorTabControl.SuspendLayout(); + this.ScriptsNavTab.SuspendLayout(); + this.FunctionsNavTab.SuspendLayout(); + this.ActionsNavTab.SuspendLayout(); + this.groupBox26.SuspendLayout(); + this.SuspendLayout(); + // + // selectScriptFileComboBox + // + this.selectScriptFileComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.selectScriptFileComboBox.FormattingEnabled = true; + this.selectScriptFileComboBox.Location = new System.Drawing.Point(7, 24); + this.selectScriptFileComboBox.Name = "selectScriptFileComboBox"; + this.selectScriptFileComboBox.Size = new System.Drawing.Size(152, 21); + this.selectScriptFileComboBox.TabIndex = 0; + this.selectScriptFileComboBox.SelectedIndexChanged += new System.EventHandler(this.selectScriptFileComboBox_SelectedIndexChanged); + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(5, 8); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(53, 13); + this.label5.TabIndex = 1; + this.label5.Text = "Script File"; + // + // scriptEditorTabControl + // + this.scriptEditorTabControl.Controls.Add(this.scriptsTabPage); + this.scriptEditorTabControl.Controls.Add(this.functionsTabPage); + this.scriptEditorTabControl.Controls.Add(this.actionsTabPage); + this.scriptEditorTabControl.Location = new System.Drawing.Point(481, 22); + this.scriptEditorTabControl.Name = "scriptEditorTabControl"; + this.scriptEditorTabControl.SelectedIndex = 0; + this.scriptEditorTabControl.Size = new System.Drawing.Size(692, 591); + this.scriptEditorTabControl.TabIndex = 18; + this.scriptEditorTabControl.SelectedIndexChanged += new System.EventHandler(this.scriptEditorTabControl_TabIndexChanged); + // + // scriptsTabPage + // + this.scriptsTabPage.Controls.Add(this.PanelSearchScripts); + this.scriptsTabPage.Controls.Add(this.scintillaScriptsPanel); + this.scriptsTabPage.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.scriptsTabPage.Location = new System.Drawing.Point(4, 22); + this.scriptsTabPage.Name = "scriptsTabPage"; + this.scriptsTabPage.Padding = new System.Windows.Forms.Padding(3); + this.scriptsTabPage.Size = new System.Drawing.Size(684, 565); + this.scriptsTabPage.TabIndex = 0; + this.scriptsTabPage.Text = "Scripts"; + this.scriptsTabPage.UseVisualStyleBackColor = true; + // + // PanelSearchScripts + // + this.PanelSearchScripts.BackColor = System.Drawing.Color.White; + this.PanelSearchScripts.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.PanelSearchScripts.Controls.Add(this.BtnNextFindScript); + this.PanelSearchScripts.Controls.Add(this.BtnPrevFindScript); + this.PanelSearchScripts.Controls.Add(this.BtnCloseFindScript); + this.PanelSearchScripts.Controls.Add(this.panelFindScriptTextBox); + this.PanelSearchScripts.Location = new System.Drawing.Point(386, 3); + this.PanelSearchScripts.Name = "PanelSearchScripts"; + this.PanelSearchScripts.Size = new System.Drawing.Size(292, 40); + this.PanelSearchScripts.TabIndex = 14; + this.PanelSearchScripts.Visible = false; + // + // BtnNextFindScript + // + this.BtnNextFindScript.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.BtnNextFindScript.ForeColor = System.Drawing.Color.White; + this.BtnNextFindScript.Image = global::DSPRE.Properties.Resources.arrowdown; + this.BtnNextFindScript.Location = new System.Drawing.Point(233, 4); + this.BtnNextFindScript.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.BtnNextFindScript.Name = "BtnNextFindScript"; + this.BtnNextFindScript.Size = new System.Drawing.Size(25, 30); + this.BtnNextFindScript.TabIndex = 32; + this.BtnNextFindScript.Tag = "Find next (Enter)"; + this.BtnNextFindScript.UseVisualStyleBackColor = true; + this.BtnNextFindScript.Click += new System.EventHandler(this.BtnNextFindScript_Click); + // + // BtnPrevFindScript + // + this.BtnPrevFindScript.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.BtnPrevFindScript.ForeColor = System.Drawing.Color.White; + this.BtnPrevFindScript.Image = global::DSPRE.Properties.Resources.arrowup; + this.BtnPrevFindScript.Location = new System.Drawing.Point(205, 4); + this.BtnPrevFindScript.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.BtnPrevFindScript.Name = "BtnPrevFindScript"; + this.BtnPrevFindScript.Size = new System.Drawing.Size(25, 30); + this.BtnPrevFindScript.TabIndex = 31; + this.BtnPrevFindScript.Tag = "Find previous (Shift+Enter)"; + this.BtnPrevFindScript.UseVisualStyleBackColor = true; + this.BtnPrevFindScript.Click += new System.EventHandler(this.BtnPrevFindScript_Click); + // + // BtnCloseFindScript + // + this.BtnCloseFindScript.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.BtnCloseFindScript.ForeColor = System.Drawing.Color.White; + this.BtnCloseFindScript.Image = global::DSPRE.Properties.Resources.Cross; + this.BtnCloseFindScript.Location = new System.Drawing.Point(261, 4); + this.BtnCloseFindScript.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.BtnCloseFindScript.Name = "BtnCloseFindScript"; + this.BtnCloseFindScript.Size = new System.Drawing.Size(25, 30); + this.BtnCloseFindScript.TabIndex = 33; + this.BtnCloseFindScript.Tag = "Close (Esc)"; + this.BtnCloseFindScript.UseVisualStyleBackColor = true; + this.BtnCloseFindScript.Click += new System.EventHandler(this.BtnCloseFindScript_Click); + // + // panelFindScriptTextBox + // + this.panelFindScriptTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.panelFindScriptTextBox.Font = new System.Drawing.Font("Segoe UI", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.panelFindScriptTextBox.Location = new System.Drawing.Point(10, 6); + this.panelFindScriptTextBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panelFindScriptTextBox.Name = "panelFindScriptTextBox"; + this.panelFindScriptTextBox.Size = new System.Drawing.Size(189, 25); + this.panelFindScriptTextBox.TabIndex = 30; + this.panelFindScriptTextBox.TextChanged += new System.EventHandler(this.panelFindScriptTextBox_TextChanged); + this.panelFindScriptTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.scriptTxtFind_KeyDown); + // + // scintillaScriptsPanel + // + this.scintillaScriptsPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.scintillaScriptsPanel.Location = new System.Drawing.Point(3, 3); + this.scintillaScriptsPanel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.scintillaScriptsPanel.Name = "scintillaScriptsPanel"; + this.scintillaScriptsPanel.Size = new System.Drawing.Size(678, 559); + this.scintillaScriptsPanel.TabIndex = 19; + // + // functionsTabPage + // + this.functionsTabPage.Controls.Add(this.PanelSearchFunctions); + this.functionsTabPage.Controls.Add(this.scintillaFunctionsPanel); + this.functionsTabPage.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.functionsTabPage.Location = new System.Drawing.Point(4, 22); + this.functionsTabPage.Name = "functionsTabPage"; + this.functionsTabPage.Padding = new System.Windows.Forms.Padding(3); + this.functionsTabPage.Size = new System.Drawing.Size(684, 565); + this.functionsTabPage.TabIndex = 1; + this.functionsTabPage.Text = "Functions"; + this.functionsTabPage.UseVisualStyleBackColor = true; + // + // PanelSearchFunctions + // + this.PanelSearchFunctions.BackColor = System.Drawing.Color.White; + this.PanelSearchFunctions.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.PanelSearchFunctions.Controls.Add(this.BtnNextFindFunc); + this.PanelSearchFunctions.Controls.Add(this.BtnPrevFindFunc); + this.PanelSearchFunctions.Controls.Add(this.BtnCloseFindFunc); + this.PanelSearchFunctions.Controls.Add(this.panelFindFunctionTextBox); + this.PanelSearchFunctions.Location = new System.Drawing.Point(386, 3); + this.PanelSearchFunctions.Name = "PanelSearchFunctions"; + this.PanelSearchFunctions.Size = new System.Drawing.Size(292, 40); + this.PanelSearchFunctions.TabIndex = 16; + this.PanelSearchFunctions.Visible = false; + // + // BtnNextFindFunc + // + this.BtnNextFindFunc.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.BtnNextFindFunc.ForeColor = System.Drawing.Color.White; + this.BtnNextFindFunc.Image = global::DSPRE.Properties.Resources.arrowdown; + this.BtnNextFindFunc.Location = new System.Drawing.Point(233, 4); + this.BtnNextFindFunc.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.BtnNextFindFunc.Name = "BtnNextFindFunc"; + this.BtnNextFindFunc.Size = new System.Drawing.Size(25, 30); + this.BtnNextFindFunc.TabIndex = 36; + this.BtnNextFindFunc.Tag = "Find next (Enter)"; + this.BtnNextFindFunc.UseVisualStyleBackColor = true; + this.BtnNextFindFunc.Click += new System.EventHandler(this.BtnNextFindFunc_Click); + // + // BtnPrevFindFunc + // + this.BtnPrevFindFunc.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.BtnPrevFindFunc.ForeColor = System.Drawing.Color.White; + this.BtnPrevFindFunc.Image = global::DSPRE.Properties.Resources.arrowup; + this.BtnPrevFindFunc.Location = new System.Drawing.Point(205, 4); + this.BtnPrevFindFunc.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.BtnPrevFindFunc.Name = "BtnPrevFindFunc"; + this.BtnPrevFindFunc.Size = new System.Drawing.Size(25, 30); + this.BtnPrevFindFunc.TabIndex = 35; + this.BtnPrevFindFunc.Tag = "Find previous (Shift+Enter)"; + this.BtnPrevFindFunc.UseVisualStyleBackColor = true; + this.BtnPrevFindFunc.Click += new System.EventHandler(this.BtnPrevFindFunc_Click); + // + // BtnCloseFindFunc + // + this.BtnCloseFindFunc.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.BtnCloseFindFunc.ForeColor = System.Drawing.Color.White; + this.BtnCloseFindFunc.Image = global::DSPRE.Properties.Resources.Cross; + this.BtnCloseFindFunc.Location = new System.Drawing.Point(261, 4); + this.BtnCloseFindFunc.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.BtnCloseFindFunc.Name = "BtnCloseFindFunc"; + this.BtnCloseFindFunc.Size = new System.Drawing.Size(25, 30); + this.BtnCloseFindFunc.TabIndex = 37; + this.BtnCloseFindFunc.Tag = "Close (Esc)"; + this.BtnCloseFindFunc.UseVisualStyleBackColor = true; + this.BtnCloseFindFunc.Click += new System.EventHandler(this.BtnCloseFindFunc_Click); + // + // panelFindFunctionTextBox + // + this.panelFindFunctionTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.panelFindFunctionTextBox.Font = new System.Drawing.Font("Segoe UI", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.panelFindFunctionTextBox.Location = new System.Drawing.Point(10, 6); + this.panelFindFunctionTextBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panelFindFunctionTextBox.Name = "panelFindFunctionTextBox"; + this.panelFindFunctionTextBox.Size = new System.Drawing.Size(189, 25); + this.panelFindFunctionTextBox.TabIndex = 34; + this.panelFindFunctionTextBox.TextChanged += new System.EventHandler(this.panelFindFunctionTextBox_TextChanged); + this.panelFindFunctionTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.functionTxtFind_KeyDown); + // + // scintillaFunctionsPanel + // + this.scintillaFunctionsPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.scintillaFunctionsPanel.Location = new System.Drawing.Point(3, 3); + this.scintillaFunctionsPanel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.scintillaFunctionsPanel.Name = "scintillaFunctionsPanel"; + this.scintillaFunctionsPanel.Size = new System.Drawing.Size(678, 559); + this.scintillaFunctionsPanel.TabIndex = 20; + // + // actionsTabPage + // + this.actionsTabPage.Controls.Add(this.PanelSearchActions); + this.actionsTabPage.Controls.Add(this.scintillaActionsPanel); + this.actionsTabPage.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.actionsTabPage.Location = new System.Drawing.Point(4, 22); + this.actionsTabPage.Name = "actionsTabPage"; + this.actionsTabPage.Padding = new System.Windows.Forms.Padding(3); + this.actionsTabPage.Size = new System.Drawing.Size(684, 565); + this.actionsTabPage.TabIndex = 2; + this.actionsTabPage.Text = "Actions"; + this.actionsTabPage.UseVisualStyleBackColor = true; + // + // PanelSearchActions + // + this.PanelSearchActions.BackColor = System.Drawing.Color.White; + this.PanelSearchActions.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.PanelSearchActions.Controls.Add(this.BtnNextFindActions); + this.PanelSearchActions.Controls.Add(this.BtnPrevFindActions); + this.PanelSearchActions.Controls.Add(this.BtnCloseFindActions); + this.PanelSearchActions.Controls.Add(this.panelFindActionTextBox); + this.PanelSearchActions.Location = new System.Drawing.Point(386, 3); + this.PanelSearchActions.Name = "PanelSearchActions"; + this.PanelSearchActions.Size = new System.Drawing.Size(292, 40); + this.PanelSearchActions.TabIndex = 16; + this.PanelSearchActions.Visible = false; + // + // BtnNextFindActions + // + this.BtnNextFindActions.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.BtnNextFindActions.ForeColor = System.Drawing.Color.White; + this.BtnNextFindActions.Image = global::DSPRE.Properties.Resources.arrowdown; + this.BtnNextFindActions.Location = new System.Drawing.Point(233, 4); + this.BtnNextFindActions.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.BtnNextFindActions.Name = "BtnNextFindActions"; + this.BtnNextFindActions.Size = new System.Drawing.Size(25, 30); + this.BtnNextFindActions.TabIndex = 40; + this.BtnNextFindActions.Tag = "Find next (Enter)"; + this.BtnNextFindActions.UseVisualStyleBackColor = true; + this.BtnNextFindActions.Click += new System.EventHandler(this.BtnNextFindActions_Click); + // + // BtnPrevFindActions + // + this.BtnPrevFindActions.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.BtnPrevFindActions.ForeColor = System.Drawing.Color.White; + this.BtnPrevFindActions.Image = global::DSPRE.Properties.Resources.arrowup; + this.BtnPrevFindActions.Location = new System.Drawing.Point(205, 4); + this.BtnPrevFindActions.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.BtnPrevFindActions.Name = "BtnPrevFindActions"; + this.BtnPrevFindActions.Size = new System.Drawing.Size(25, 30); + this.BtnPrevFindActions.TabIndex = 39; + this.BtnPrevFindActions.Tag = "Find previous (Shift+Enter)"; + this.BtnPrevFindActions.UseVisualStyleBackColor = true; + this.BtnPrevFindActions.Click += new System.EventHandler(this.BtnPrevFindActions_Click); + // + // BtnCloseFindActions + // + this.BtnCloseFindActions.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.BtnCloseFindActions.ForeColor = System.Drawing.Color.White; + this.BtnCloseFindActions.Image = global::DSPRE.Properties.Resources.Cross; + this.BtnCloseFindActions.Location = new System.Drawing.Point(261, 4); + this.BtnCloseFindActions.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.BtnCloseFindActions.Name = "BtnCloseFindActions"; + this.BtnCloseFindActions.Size = new System.Drawing.Size(25, 30); + this.BtnCloseFindActions.TabIndex = 41; + this.BtnCloseFindActions.Tag = "Close (Esc)"; + this.BtnCloseFindActions.UseVisualStyleBackColor = true; + this.BtnCloseFindActions.Click += new System.EventHandler(this.BtnCloseFindActions_Click); + // + // panelFindActionTextBox + // + this.panelFindActionTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.panelFindActionTextBox.Font = new System.Drawing.Font("Segoe UI", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.panelFindActionTextBox.Location = new System.Drawing.Point(10, 6); + this.panelFindActionTextBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panelFindActionTextBox.Name = "panelFindActionTextBox"; + this.panelFindActionTextBox.Size = new System.Drawing.Size(189, 25); + this.panelFindActionTextBox.TabIndex = 38; + this.panelFindActionTextBox.TextChanged += new System.EventHandler(this.panelFindActionTextBox_TextChanged); + this.panelFindActionTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.actionTxtFind_KeyDown); + // + // scintillaActionsPanel + // + this.scintillaActionsPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.scintillaActionsPanel.Location = new System.Drawing.Point(3, 3); + this.scintillaActionsPanel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.scintillaActionsPanel.Name = "scintillaActionsPanel"; + this.scintillaActionsPanel.Size = new System.Drawing.Size(678, 559); + this.scintillaActionsPanel.TabIndex = 21; + // + // addScriptFileButton + // + this.addScriptFileButton.Image = global::DSPRE.Properties.Resources.addIcon; + this.addScriptFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.addScriptFileButton.Location = new System.Drawing.Point(369, 667); + this.addScriptFileButton.Name = "addScriptFileButton"; + this.addScriptFileButton.Size = new System.Drawing.Size(106, 25); + this.addScriptFileButton.TabIndex = 4; + this.addScriptFileButton.Text = "Add Script File"; + this.addScriptFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.addScriptFileButton.UseVisualStyleBackColor = true; + this.addScriptFileButton.Click += new System.EventHandler(this.addScriptFileButton_Click); + // + // removeScriptFileButton + // + this.removeScriptFileButton.Image = global::DSPRE.Properties.Resources.deleteIcon; + this.removeScriptFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.removeScriptFileButton.Location = new System.Drawing.Point(369, 694); + this.removeScriptFileButton.Name = "removeScriptFileButton"; + this.removeScriptFileButton.Size = new System.Drawing.Size(106, 25); + this.removeScriptFileButton.TabIndex = 5; + this.removeScriptFileButton.Text = "Remove Last"; + this.removeScriptFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.removeScriptFileButton.UseVisualStyleBackColor = true; + this.removeScriptFileButton.Click += new System.EventHandler(this.removeScriptFileButton_Click); + // + // saveScriptFileButton + // + this.saveScriptFileButton.Image = global::DSPRE.Properties.Resources.saveButton; + this.saveScriptFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.saveScriptFileButton.Location = new System.Drawing.Point(6, 50); + this.saveScriptFileButton.Name = "saveScriptFileButton"; + this.saveScriptFileButton.Size = new System.Drawing.Size(154, 23); + this.saveScriptFileButton.TabIndex = 1; + this.saveScriptFileButton.Text = "&Save Current File"; + this.saveScriptFileButton.UseVisualStyleBackColor = true; + this.saveScriptFileButton.Click += new System.EventHandler(this.saveScriptFileButton_Click); + // + // exportScriptFileButton + // + this.exportScriptFileButton.Image = global::DSPRE.Properties.Resources.exportArrow; + this.exportScriptFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.exportScriptFileButton.Location = new System.Drawing.Point(294, 667); + this.exportScriptFileButton.Name = "exportScriptFileButton"; + this.exportScriptFileButton.Size = new System.Drawing.Size(70, 52); + this.exportScriptFileButton.TabIndex = 3; + this.exportScriptFileButton.Text = "&Export \r\nFile"; + this.exportScriptFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.exportScriptFileButton.UseVisualStyleBackColor = true; + this.exportScriptFileButton.Click += new System.EventHandler(this.exportScriptFileButton_Click); + // + // importScriptFileButton + // + this.importScriptFileButton.Image = global::DSPRE.Properties.Resources.importArrow; + this.importScriptFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.importScriptFileButton.Location = new System.Drawing.Point(219, 667); + this.importScriptFileButton.Name = "importScriptFileButton"; + this.importScriptFileButton.Size = new System.Drawing.Size(70, 52); + this.importScriptFileButton.TabIndex = 2; + this.importScriptFileButton.Text = "&Import\r\nFile"; + this.importScriptFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.importScriptFileButton.UseVisualStyleBackColor = true; + this.importScriptFileButton.Click += new System.EventHandler(this.importScriptFileButton_Click); + // + // groupBox8 + // + this.groupBox8.Controls.Add(this.searchInScriptsButton); + this.groupBox8.Controls.Add(this.searchOnlyCurrentScriptCheckBox); + this.groupBox8.Controls.Add(this.scrollToBlockStartcheckBox); + this.groupBox8.Controls.Add(this.scriptSearchCaseSensitiveCheckBox); + this.groupBox8.Controls.Add(this.searchInScriptsTextBox); + this.groupBox8.Controls.Add(this.label31); + this.groupBox8.Controls.Add(this.searchProgressBar); + this.groupBox8.Controls.Add(this.label30); + this.groupBox8.Controls.Add(this.label29); + this.groupBox8.Controls.Add(this.searchInScriptsResultListBox); + this.groupBox8.Location = new System.Drawing.Point(2, 315); + this.groupBox8.Name = "groupBox8"; + this.groupBox8.Size = new System.Drawing.Size(472, 298); + this.groupBox8.TabIndex = 18; + this.groupBox8.TabStop = false; + this.groupBox8.Text = "Search for commands:"; + // + // searchInScriptsButton + // + this.searchInScriptsButton.Image = global::DSPRE.Properties.Resources.SearchMiniIcon; + this.searchInScriptsButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.searchInScriptsButton.Location = new System.Drawing.Point(272, 27); + this.searchInScriptsButton.Name = "searchInScriptsButton"; + this.searchInScriptsButton.Size = new System.Drawing.Size(69, 36); + this.searchInScriptsButton.TabIndex = 13; + this.searchInScriptsButton.Text = "Search"; + this.searchInScriptsButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.searchInScriptsButton.UseVisualStyleBackColor = true; + this.searchInScriptsButton.Click += new System.EventHandler(this.searchInScriptsButton_Click); + // + // searchOnlyCurrentScriptCheckBox + // + this.searchOnlyCurrentScriptCheckBox.AutoSize = true; + this.searchOnlyCurrentScriptCheckBox.Location = new System.Drawing.Point(347, 15); + this.searchOnlyCurrentScriptCheckBox.Name = "searchOnlyCurrentScriptCheckBox"; + this.searchOnlyCurrentScriptCheckBox.Size = new System.Drawing.Size(84, 17); + this.searchOnlyCurrentScriptCheckBox.TabIndex = 14; + this.searchOnlyCurrentScriptCheckBox.Text = "Only Current"; + this.searchOnlyCurrentScriptCheckBox.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.searchOnlyCurrentScriptCheckBox.UseVisualStyleBackColor = true; + // + // scrollToBlockStartcheckBox + // + this.scrollToBlockStartcheckBox.AutoSize = true; + this.scrollToBlockStartcheckBox.Location = new System.Drawing.Point(347, 61); + this.scrollToBlockStartcheckBox.Name = "scrollToBlockStartcheckBox"; + this.scrollToBlockStartcheckBox.Size = new System.Drawing.Size(116, 17); + this.scrollToBlockStartcheckBox.TabIndex = 16; + this.scrollToBlockStartcheckBox.Text = "Scroll to block start"; + this.scrollToBlockStartcheckBox.UseVisualStyleBackColor = true; + // + // scriptSearchCaseSensitiveCheckBox + // + this.scriptSearchCaseSensitiveCheckBox.AutoSize = true; + this.scriptSearchCaseSensitiveCheckBox.Location = new System.Drawing.Point(347, 38); + this.scriptSearchCaseSensitiveCheckBox.Name = "scriptSearchCaseSensitiveCheckBox"; + this.scriptSearchCaseSensitiveCheckBox.Size = new System.Drawing.Size(83, 17); + this.scriptSearchCaseSensitiveCheckBox.TabIndex = 15; + this.scriptSearchCaseSensitiveCheckBox.Text = "Match Case"; + this.scriptSearchCaseSensitiveCheckBox.UseVisualStyleBackColor = true; + // + // searchInScriptsTextBox + // + this.searchInScriptsTextBox.Location = new System.Drawing.Point(11, 36); + this.searchInScriptsTextBox.Name = "searchInScriptsTextBox"; + this.searchInScriptsTextBox.Size = new System.Drawing.Size(255, 20); + this.searchInScriptsTextBox.TabIndex = 12; + this.searchInScriptsTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.searchInScriptsTextBox_KeyDown); + // + // label31 + // + this.label31.AutoSize = true; + this.label31.Location = new System.Drawing.Point(11, 261); + this.label31.Name = "label31"; + this.label31.Size = new System.Drawing.Size(48, 13); + this.label31.TabIndex = 37; + this.label31.Text = "Progress"; + // + // searchProgressBar + // + this.searchProgressBar.Location = new System.Drawing.Point(11, 277); + this.searchProgressBar.Name = "searchProgressBar"; + this.searchProgressBar.Size = new System.Drawing.Size(452, 14); + this.searchProgressBar.TabIndex = 36; + // + // label30 + // + this.label30.AutoSize = true; + this.label30.Location = new System.Drawing.Point(11, 68); + this.label30.Name = "label30"; + this.label30.Size = new System.Drawing.Size(42, 13); + this.label30.TabIndex = 35; + this.label30.Text = "Results"; + // + // label29 + // + this.label29.AutoSize = true; + this.label29.Location = new System.Drawing.Point(11, 20); + this.label29.Name = "label29"; + this.label29.Size = new System.Drawing.Size(77, 13); + this.label29.TabIndex = 33; + this.label29.Text = "Line to search:"; + // + // searchInScriptsResultListBox + // + this.searchInScriptsResultListBox.Location = new System.Drawing.Point(11, 84); + this.searchInScriptsResultListBox.Name = "searchInScriptsResultListBox"; + this.searchInScriptsResultListBox.Size = new System.Drawing.Size(452, 173); + this.searchInScriptsResultListBox.TabIndex = 17; + this.searchInScriptsResultListBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.searchInScriptsResultListBox_KeyDown); + this.searchInScriptsResultListBox.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.searchInScripts_GoToEntryResult); + // + // groupBox24 + // + this.groupBox24.Controls.Add(this.ScriptNavigatorTabControl); + this.groupBox24.Location = new System.Drawing.Point(3, 75); + this.groupBox24.Name = "groupBox24"; + this.groupBox24.Size = new System.Drawing.Size(472, 234); + this.groupBox24.TabIndex = 42; + this.groupBox24.TabStop = false; + this.groupBox24.Text = "Navigator"; + // + // ScriptNavigatorTabControl + // + this.ScriptNavigatorTabControl.Controls.Add(this.ScriptsNavTab); + this.ScriptNavigatorTabControl.Controls.Add(this.FunctionsNavTab); + this.ScriptNavigatorTabControl.Controls.Add(this.ActionsNavTab); + this.ScriptNavigatorTabControl.Location = new System.Drawing.Point(6, 16); + this.ScriptNavigatorTabControl.Name = "ScriptNavigatorTabControl"; + this.ScriptNavigatorTabControl.SelectedIndex = 0; + this.ScriptNavigatorTabControl.Size = new System.Drawing.Size(456, 209); + this.ScriptNavigatorTabControl.TabIndex = 8; + // + // ScriptsNavTab + // + this.ScriptsNavTab.Controls.Add(this.scriptsNavListbox); + this.ScriptsNavTab.Location = new System.Drawing.Point(4, 22); + this.ScriptsNavTab.Name = "ScriptsNavTab"; + this.ScriptsNavTab.Padding = new System.Windows.Forms.Padding(3); + this.ScriptsNavTab.Size = new System.Drawing.Size(448, 183); + this.ScriptsNavTab.TabIndex = 0; + this.ScriptsNavTab.Text = "Scripts"; + this.ScriptsNavTab.UseVisualStyleBackColor = true; + // + // scriptsNavListbox + // + this.scriptsNavListbox.Dock = System.Windows.Forms.DockStyle.Fill; + this.scriptsNavListbox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.scriptsNavListbox.ItemHeight = 15; + this.scriptsNavListbox.Location = new System.Drawing.Point(3, 3); + this.scriptsNavListbox.Name = "scriptsNavListbox"; + this.scriptsNavListbox.Size = new System.Drawing.Size(442, 177); + this.scriptsNavListbox.TabIndex = 9; + this.scriptsNavListbox.SelectedIndexChanged += new System.EventHandler(this.scriptsNavListbox_SelectedIndexChanged); + // + // FunctionsNavTab + // + this.FunctionsNavTab.Controls.Add(this.functionsNavListbox); + this.FunctionsNavTab.Location = new System.Drawing.Point(4, 22); + this.FunctionsNavTab.Name = "FunctionsNavTab"; + this.FunctionsNavTab.Padding = new System.Windows.Forms.Padding(3); + this.FunctionsNavTab.Size = new System.Drawing.Size(448, 183); + this.FunctionsNavTab.TabIndex = 1; + this.FunctionsNavTab.Text = "Functions"; + this.FunctionsNavTab.UseVisualStyleBackColor = true; + // + // functionsNavListbox + // + this.functionsNavListbox.Dock = System.Windows.Forms.DockStyle.Fill; + this.functionsNavListbox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.functionsNavListbox.ItemHeight = 15; + this.functionsNavListbox.Location = new System.Drawing.Point(3, 3); + this.functionsNavListbox.Name = "functionsNavListbox"; + this.functionsNavListbox.Size = new System.Drawing.Size(442, 177); + this.functionsNavListbox.TabIndex = 10; + this.functionsNavListbox.SelectedIndexChanged += new System.EventHandler(this.functionsNavListbox_SelectedIndexChanged); + // + // ActionsNavTab + // + this.ActionsNavTab.Controls.Add(this.actionsNavListbox); + this.ActionsNavTab.Location = new System.Drawing.Point(4, 22); + this.ActionsNavTab.Name = "ActionsNavTab"; + this.ActionsNavTab.Padding = new System.Windows.Forms.Padding(3); + this.ActionsNavTab.Size = new System.Drawing.Size(448, 183); + this.ActionsNavTab.TabIndex = 2; + this.ActionsNavTab.Text = "Actions"; + this.ActionsNavTab.UseVisualStyleBackColor = true; + // + // actionsNavListbox + // + this.actionsNavListbox.Dock = System.Windows.Forms.DockStyle.Fill; + this.actionsNavListbox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.actionsNavListbox.ItemHeight = 15; + this.actionsNavListbox.Location = new System.Drawing.Point(3, 3); + this.actionsNavListbox.Name = "actionsNavListbox"; + this.actionsNavListbox.Size = new System.Drawing.Size(442, 177); + this.actionsNavListbox.TabIndex = 11; + this.actionsNavListbox.SelectedIndexChanged += new System.EventHandler(this.actionsNavListbox_SelectedIndexChanged); + // + // openFindScriptEditorButton + // + this.openFindScriptEditorButton.Image = global::DSPRE.Properties.Resources.SearchMiniIcon; + this.openFindScriptEditorButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.openFindScriptEditorButton.Location = new System.Drawing.Point(1079, 11); + this.openFindScriptEditorButton.Name = "openFindScriptEditorButton"; + this.openFindScriptEditorButton.Size = new System.Drawing.Size(24, 24); + this.openFindScriptEditorButton.TabIndex = 27; + this.openFindScriptEditorButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.openFindScriptEditorButton.UseVisualStyleBackColor = true; + this.openFindScriptEditorButton.Click += new System.EventHandler(this.openFindScriptEditorButton_Click); + // + // expandScriptTextButton + // + this.expandScriptTextButton.Image = global::DSPRE.Properties.Resources.expandArrow; + this.expandScriptTextButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.expandScriptTextButton.Location = new System.Drawing.Point(1107, 11); + this.expandScriptTextButton.Name = "expandScriptTextButton"; + this.expandScriptTextButton.Size = new System.Drawing.Size(24, 24); + this.expandScriptTextButton.TabIndex = 28; + this.expandScriptTextButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.expandScriptTextButton.UseVisualStyleBackColor = true; + this.expandScriptTextButton.Click += new System.EventHandler(this.ScriptEditorExpandButton_Click); + // + // compressScriptTextButton + // + this.compressScriptTextButton.Image = global::DSPRE.Properties.Resources.compressArrow; + this.compressScriptTextButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.compressScriptTextButton.Location = new System.Drawing.Point(1135, 11); + this.compressScriptTextButton.Name = "compressScriptTextButton"; + this.compressScriptTextButton.Size = new System.Drawing.Size(24, 24); + this.compressScriptTextButton.TabIndex = 29; + this.compressScriptTextButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.compressScriptTextButton.UseVisualStyleBackColor = true; + this.compressScriptTextButton.Click += new System.EventHandler(this.ScriptEditorCollapseButton_Click); + // + // scriptEditorWordWrapCheckbox + // + this.scriptEditorWordWrapCheckbox.Appearance = System.Windows.Forms.Appearance.Button; + this.scriptEditorWordWrapCheckbox.AutoSize = true; + this.scriptEditorWordWrapCheckbox.Checked = true; + this.scriptEditorWordWrapCheckbox.CheckState = System.Windows.Forms.CheckState.Checked; + this.scriptEditorWordWrapCheckbox.Location = new System.Drawing.Point(907, 12); + this.scriptEditorWordWrapCheckbox.Name = "scriptEditorWordWrapCheckbox"; + this.scriptEditorWordWrapCheckbox.Size = new System.Drawing.Size(72, 23); + this.scriptEditorWordWrapCheckbox.TabIndex = 25; + this.scriptEditorWordWrapCheckbox.Text = "Word Wrap"; + this.scriptEditorWordWrapCheckbox.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.scriptEditorWordWrapCheckbox.UseVisualStyleBackColor = true; + this.scriptEditorWordWrapCheckbox.CheckedChanged += new System.EventHandler(this.scriptEditorWordWrapCheckbox_CheckedChanged); + // + // scriptEditorWhitespacesCheckbox + // + this.scriptEditorWhitespacesCheckbox.Appearance = System.Windows.Forms.Appearance.Button; + this.scriptEditorWhitespacesCheckbox.AutoSize = true; + this.scriptEditorWhitespacesCheckbox.Location = new System.Drawing.Point(981, 12); + this.scriptEditorWhitespacesCheckbox.Name = "scriptEditorWhitespacesCheckbox"; + this.scriptEditorWhitespacesCheckbox.Size = new System.Drawing.Size(79, 23); + this.scriptEditorWhitespacesCheckbox.TabIndex = 26; + this.scriptEditorWhitespacesCheckbox.Text = "Whitespaces"; + this.scriptEditorWhitespacesCheckbox.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.scriptEditorWhitespacesCheckbox.UseVisualStyleBackColor = true; + this.scriptEditorWhitespacesCheckbox.CheckedChanged += new System.EventHandler(this.viewWhiteSpacesButton_Click); + // + // groupBox26 + // + this.groupBox26.Controls.Add(this.scriptEditorNumberFormatNoPreference); + this.groupBox26.Controls.Add(this.scriptEditorNumberFormatDecimal); + this.groupBox26.Controls.Add(this.scriptEditorNumberFormatHex); + this.groupBox26.Location = new System.Drawing.Point(700, 4); + this.groupBox26.Name = "groupBox26"; + this.groupBox26.Size = new System.Drawing.Size(190, 36); + this.groupBox26.TabIndex = 50; + this.groupBox26.TabStop = false; + this.groupBox26.Text = "Number Format Preference"; + // + // scriptEditorNumberFormatNoPreference + // + this.scriptEditorNumberFormatNoPreference.AutoSize = true; + this.scriptEditorNumberFormatNoPreference.Checked = true; + this.scriptEditorNumberFormatNoPreference.Location = new System.Drawing.Point(11, 14); + this.scriptEditorNumberFormatNoPreference.Name = "scriptEditorNumberFormatNoPreference"; + this.scriptEditorNumberFormatNoPreference.Size = new System.Drawing.Size(47, 17); + this.scriptEditorNumberFormatNoPreference.TabIndex = 22; + this.scriptEditorNumberFormatNoPreference.TabStop = true; + this.scriptEditorNumberFormatNoPreference.Text = "Auto"; + this.scriptEditorNumberFormatNoPreference.UseVisualStyleBackColor = true; + this.scriptEditorNumberFormatNoPreference.CheckedChanged += new System.EventHandler(this.UpdateScriptNumberFormatNoPref); + // + // scriptEditorNumberFormatDecimal + // + this.scriptEditorNumberFormatDecimal.AutoSize = true; + this.scriptEditorNumberFormatDecimal.Location = new System.Drawing.Point(121, 14); + this.scriptEditorNumberFormatDecimal.Name = "scriptEditorNumberFormatDecimal"; + this.scriptEditorNumberFormatDecimal.Size = new System.Drawing.Size(63, 17); + this.scriptEditorNumberFormatDecimal.TabIndex = 24; + this.scriptEditorNumberFormatDecimal.Text = "Decimal"; + this.scriptEditorNumberFormatDecimal.UseVisualStyleBackColor = true; + this.scriptEditorNumberFormatDecimal.CheckedChanged += new System.EventHandler(this.UpdateScriptNumberFormatDec); + // + // scriptEditorNumberFormatHex + // + this.scriptEditorNumberFormatHex.AutoSize = true; + this.scriptEditorNumberFormatHex.Location = new System.Drawing.Point(68, 14); + this.scriptEditorNumberFormatHex.Name = "scriptEditorNumberFormatHex"; + this.scriptEditorNumberFormatHex.Size = new System.Drawing.Size(44, 17); + this.scriptEditorNumberFormatHex.TabIndex = 23; + this.scriptEditorNumberFormatHex.Text = "Hex"; + this.scriptEditorNumberFormatHex.UseVisualStyleBackColor = true; + this.scriptEditorNumberFormatHex.CheckedChanged += new System.EventHandler(this.UpdateScriptNumberFormatHex); + // + // viewLevelScriptButton + // + this.viewLevelScriptButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.viewLevelScriptButton.Location = new System.Drawing.Point(481, 681); + this.viewLevelScriptButton.Name = "viewLevelScriptButton"; + this.viewLevelScriptButton.Size = new System.Drawing.Size(91, 25); + this.viewLevelScriptButton.TabIndex = 6; + this.viewLevelScriptButton.Text = "View level script"; + this.viewLevelScriptButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.viewLevelScriptButton.UseVisualStyleBackColor = true; + this.viewLevelScriptButton.Click += new System.EventHandler(this.viewLevelScriptButton_Click); + // + // locateCurrentScriptFile + // + this.locateCurrentScriptFile.Image = global::DSPRE.Properties.Resources.open_file; + this.locateCurrentScriptFile.Location = new System.Drawing.Point(423, 29); + this.locateCurrentScriptFile.Name = "locateCurrentScriptFile"; + this.locateCurrentScriptFile.Size = new System.Drawing.Size(42, 40); + this.locateCurrentScriptFile.TabIndex = 7; + this.locateCurrentScriptFile.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.locateCurrentScriptFile.UseVisualStyleBackColor = true; + this.locateCurrentScriptFile.Click += new System.EventHandler(this.locateCurrentScriptFile_Click); + // + // ScriptEditor + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.locateCurrentScriptFile); + this.Controls.Add(this.groupBox24); + this.Controls.Add(this.viewLevelScriptButton); + this.Controls.Add(this.selectScriptFileComboBox); + this.Controls.Add(this.groupBox26); + this.Controls.Add(this.label5); + this.Controls.Add(this.scriptEditorWhitespacesCheckbox); + this.Controls.Add(this.scriptEditorWordWrapCheckbox); + this.Controls.Add(this.addScriptFileButton); + this.Controls.Add(this.compressScriptTextButton); + this.Controls.Add(this.removeScriptFileButton); + this.Controls.Add(this.expandScriptTextButton); + this.Controls.Add(this.saveScriptFileButton); + this.Controls.Add(this.openFindScriptEditorButton); + this.Controls.Add(this.exportScriptFileButton); + this.Controls.Add(this.importScriptFileButton); + this.Controls.Add(this.groupBox8); + this.Controls.Add(this.scriptEditorTabControl); + this.Name = "ScriptEditor"; + this.Size = new System.Drawing.Size(1177, 735); + this.scriptEditorTabControl.ResumeLayout(false); + this.scriptsTabPage.ResumeLayout(false); + this.PanelSearchScripts.ResumeLayout(false); + this.PanelSearchScripts.PerformLayout(); + this.functionsTabPage.ResumeLayout(false); + this.PanelSearchFunctions.ResumeLayout(false); + this.PanelSearchFunctions.PerformLayout(); + this.actionsTabPage.ResumeLayout(false); + this.PanelSearchActions.ResumeLayout(false); + this.PanelSearchActions.PerformLayout(); + this.groupBox8.ResumeLayout(false); + this.groupBox8.PerformLayout(); + this.groupBox24.ResumeLayout(false); + this.ScriptNavigatorTabControl.ResumeLayout(false); + this.ScriptsNavTab.ResumeLayout(false); + this.FunctionsNavTab.ResumeLayout(false); + this.ActionsNavTab.ResumeLayout(false); + this.groupBox26.ResumeLayout(false); + this.groupBox26.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + private System.Windows.Forms.CheckBox scrollToBlockStartcheckBox; + + #endregion + + public System.Windows.Forms.ComboBox selectScriptFileComboBox; + private System.Windows.Forms.Label label5; + public System.Windows.Forms.TabControl scriptEditorTabControl; + private System.Windows.Forms.TabPage scriptsTabPage; + private System.Windows.Forms.Panel PanelSearchScripts; + private System.Windows.Forms.Button BtnNextFindScript; + private System.Windows.Forms.Button BtnPrevFindScript; + private System.Windows.Forms.Button BtnCloseFindScript; + private System.Windows.Forms.TextBox panelFindScriptTextBox; + private System.Windows.Forms.Panel scintillaScriptsPanel; + private System.Windows.Forms.TabPage functionsTabPage; + private System.Windows.Forms.Panel PanelSearchFunctions; + private System.Windows.Forms.Button BtnNextFindFunc; + private System.Windows.Forms.Button BtnPrevFindFunc; + private System.Windows.Forms.Button BtnCloseFindFunc; + private System.Windows.Forms.TextBox panelFindFunctionTextBox; + private System.Windows.Forms.Panel scintillaFunctionsPanel; + private System.Windows.Forms.TabPage actionsTabPage; + private System.Windows.Forms.Panel PanelSearchActions; + private System.Windows.Forms.Button BtnNextFindActions; + private System.Windows.Forms.Button BtnPrevFindActions; + private System.Windows.Forms.Button BtnCloseFindActions; + private System.Windows.Forms.TextBox panelFindActionTextBox; + private System.Windows.Forms.Panel scintillaActionsPanel; + private System.Windows.Forms.Button addScriptFileButton; + private System.Windows.Forms.Button removeScriptFileButton; + private System.Windows.Forms.Button saveScriptFileButton; + private System.Windows.Forms.Button exportScriptFileButton; + private System.Windows.Forms.Button importScriptFileButton; + private System.Windows.Forms.GroupBox groupBox8; + private System.Windows.Forms.CheckBox searchOnlyCurrentScriptCheckBox; + private System.Windows.Forms.CheckBox scriptSearchCaseSensitiveCheckBox; + private System.Windows.Forms.TextBox searchInScriptsTextBox; + private System.Windows.Forms.Label label31; + private System.Windows.Forms.ProgressBar searchProgressBar; + private System.Windows.Forms.Label label30; + private System.Windows.Forms.Label label29; + private System.Windows.Forms.Button searchInScriptsButton; + private System.Windows.Forms.ListBox searchInScriptsResultListBox; + private System.Windows.Forms.GroupBox groupBox24; + private System.Windows.Forms.TabControl ScriptNavigatorTabControl; + private System.Windows.Forms.TabPage ScriptsNavTab; + private System.Windows.Forms.ListBox scriptsNavListbox; + private System.Windows.Forms.TabPage FunctionsNavTab; + private System.Windows.Forms.ListBox functionsNavListbox; + private System.Windows.Forms.TabPage ActionsNavTab; + private System.Windows.Forms.ListBox actionsNavListbox; + private System.Windows.Forms.Button openFindScriptEditorButton; + private System.Windows.Forms.Button expandScriptTextButton; + private System.Windows.Forms.Button compressScriptTextButton; + private System.Windows.Forms.CheckBox scriptEditorWordWrapCheckbox; + private System.Windows.Forms.CheckBox scriptEditorWhitespacesCheckbox; + private System.Windows.Forms.GroupBox groupBox26; + private System.Windows.Forms.RadioButton scriptEditorNumberFormatNoPreference; + private System.Windows.Forms.RadioButton scriptEditorNumberFormatDecimal; + private System.Windows.Forms.RadioButton scriptEditorNumberFormatHex; + private System.Windows.Forms.Button viewLevelScriptButton; + private System.Windows.Forms.Button locateCurrentScriptFile; + } +} diff --git a/DS_Map/Editors/ScriptEditor.cs b/DS_Map/Editors/ScriptEditor.cs new file mode 100644 index 0000000..f13f14a --- /dev/null +++ b/DS_Map/Editors/ScriptEditor.cs @@ -0,0 +1,1047 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.IO; +using System.Windows.Forms; +using DSPRE.Resources; +using DSPRE.ROMFiles; +using ScintillaNET; +using ScintillaNET.Utils; +using System.Globalization; + +namespace DSPRE.Editors { + public partial class ScriptEditor : UserControl { + public bool scriptEditorIsReady { get; set; } = false; + private Scintilla ScriptTextArea; + private Scintilla FunctionTextArea; + private Scintilla ActionTextArea; + private SearchManager scriptSearchManager; + private SearchManager functionSearchManager; + private SearchManager actionSearchManager; + private Scintilla currentScintillaEditor; + private SearchManager currentSearchManager; + private bool scriptsDirty = false; + private bool functionsDirty = false; + private bool actionsDirty = false; + private string cmdKeyWords = ""; + private string secondaryKeyWords = ""; + private ScriptFile currentScriptFile; + MainProgram _parent; + /// + /// the background color of the text area + /// + private readonly Color BACK_COLOR = Color.FromArgb(0x2A211C); + + /// + /// default text color of the text area + /// + private readonly Color FORE_COLOR = Color.FromArgb(0xB7B7B7); + + /// + /// change this to whatever margin you want the line numbers to show in + /// + private const int NUMBER_MARGIN = 1; + + /// + /// change this to whatever margin you want the bookmarks/breakpoints to show in + /// + private const int BOOKMARK_MARGIN = 2; + + private const int BOOKMARK_MARKER = 2; + + /// + /// change this to whatever margin you want the code folding tree (+/-) to show in + /// + private const int FOLDING_MARGIN = 3; + + /// + /// set this true to show circular buttons for code folding (the [+] and [-] buttons on the margin) + /// + private const bool CODE_FOLDING_CIRCULAR = true; + + readonly Point initial_importScriptFileButton_location; + readonly Point initial_exportScriptFileButton_location; + readonly Point initial_addScriptFileButton_location; + readonly Point initial_removeScriptFileButton_location; + readonly Point initial_viewLevelScript_location; + + readonly Point new_importScriptFileButton_location; + readonly Point new_exportScriptFileButton_location; + readonly Point new_addScriptFileButton_location; + readonly Point new_removeScriptFileButton_location; + readonly Point new_viewLevelScript_location; + + public ScriptEditor() { + InitializeComponent(); + + + //initially, these buttons are off the canvas so they can be interacted with in the designer + //they are then moved as needed + initial_importScriptFileButton_location = importScriptFileButton.Location; + initial_exportScriptFileButton_location = exportScriptFileButton.Location; + initial_addScriptFileButton_location = addScriptFileButton.Location; + initial_removeScriptFileButton_location = removeScriptFileButton.Location; + initial_viewLevelScript_location = viewLevelScriptButton.Location; + + new_importScriptFileButton_location = new Point(164, 22); + new_exportScriptFileButton_location = new Point(239, 22); + new_addScriptFileButton_location = new Point(314, 22); + new_removeScriptFileButton_location = new Point(314, 49); + new_viewLevelScript_location = new Point(326, 37); + + importScriptFileButton.Enabled = false; + exportScriptFileButton.Enabled = false; + addScriptFileButton.Enabled = false; + removeScriptFileButton.Enabled = false; + viewLevelScriptButton.Enabled = false; + } + + public void SetupScriptEditor(MainProgram parent, bool force = false) { + if (scriptEditorIsReady && !force) return; + scriptEditorIsReady = true; + this._parent = parent; + SetupScriptEditorTextAreas(); + + /* Extract essential NARCs sub-archives*/ + Helpers.statusLabelMessage("Setting up Script Editor..."); + Update(); + + DSUtils.TryUnpackNarcs(new List { RomInfo.DirNames.scripts }); //12 = scripts Narc Dir + + populate_selectScriptFileComboBox(0); + + UpdateScriptNumberCheckBox((NumberStyles)Properties.Settings.Default.scriptEditorFormatPreference); + Helpers.statusLabelMessage(); + } + + public void OpenScriptEditor(MainProgram parent, int scriptFileID) { + SetupScriptEditor(parent); + + scriptEditorTabControl.SelectedIndex = 0; + selectScriptFileComboBox.SelectedIndex = scriptFileID; + EditorPanels.mainTabControl.SelectedTab = EditorPanels.scriptEditorTabPage; + } + + private void SetupScriptEditorTextAreas() { + //PREPARE SCRIPT EDITOR KEYWORDS + cmdKeyWords = String.Join(" ", RomInfo.ScriptCommandNamesDict.Values) + + " " + String.Join(" ", ScriptDatabase.movementsDictIDName.Values); + cmdKeyWords += " " + cmdKeyWords.ToUpper() + " " + cmdKeyWords.ToLower(); + + secondaryKeyWords = String.Join(" ", RomInfo.ScriptComparisonOperatorsDict.Values) + + " " + String.Join(" ", ScriptDatabase.specialOverworlds.Values) + + " " + String.Join(" ", ScriptDatabase.overworldDirections.Values) + + " " + ScriptFile.ContainerTypes.Script.ToString() + + " " + ScriptFile.ContainerTypes.Function.ToString() + + " " + ScriptFile.ContainerTypes.Action.ToString() + + " " + Event.EventType.Overworld + + " " + Overworld.MovementCodeKW; + secondaryKeyWords += " " + secondaryKeyWords.ToUpper() + " " + secondaryKeyWords.ToLower(); + + // CREATE CONTROLS + ScriptTextArea = new Scintilla(); + scriptSearchManager = new SearchManager(EditorPanels.MainProgram, ScriptTextArea, panelFindScriptTextBox, PanelSearchScripts); + scintillaScriptsPanel.Controls.Clear(); + scintillaScriptsPanel.Controls.Add(ScriptTextArea); + + FunctionTextArea = new Scintilla(); + functionSearchManager = new SearchManager(EditorPanels.MainProgram, FunctionTextArea, panelFindFunctionTextBox, PanelSearchFunctions); + scintillaFunctionsPanel.Controls.Clear(); + scintillaFunctionsPanel.Controls.Add(FunctionTextArea); + + ActionTextArea = new Scintilla(); + actionSearchManager = new SearchManager(EditorPanels.MainProgram, ActionTextArea, panelFindActionTextBox, PanelSearchActions); + scintillaActionsPanel.Controls.Clear(); + scintillaActionsPanel.Controls.Add(ActionTextArea); + + currentScintillaEditor = ScriptTextArea; + currentSearchManager = scriptSearchManager; + + // BASIC CONFIG + ScriptTextArea.TextChanged += (OnTextChangedScript); + FunctionTextArea.TextChanged += (OnTextChangedFunction); + ActionTextArea.TextChanged += (OnTextChangedAction); + + // INITIAL VIEW CONFIG + InitialViewConfig(ScriptTextArea); + InitialViewConfig(FunctionTextArea); + InitialViewConfig(ActionTextArea); + + InitSyntaxColoring(ScriptTextArea); + InitSyntaxColoring(FunctionTextArea); + InitSyntaxColoring(ActionTextArea); + + // NUMBER MARGIN + InitNumberMargin(ScriptTextArea, ScriptTextArea_MarginClick); + InitNumberMargin(FunctionTextArea, FunctionTextArea_MarginClick); + InitNumberMargin(ActionTextArea, ActionTextArea_MarginClick); + + // BOOKMARK MARGIN + InitBookmarkMargin(ScriptTextArea); + InitBookmarkMargin(FunctionTextArea); + InitBookmarkMargin(ActionTextArea); + + // CODE FOLDING MARGIN + InitCodeFolding(ScriptTextArea); + InitCodeFolding(FunctionTextArea); + InitCodeFolding(ActionTextArea); + + // INIT HOTKEYS + InitHotkeys(ScriptTextArea, scriptSearchManager); + InitHotkeys(FunctionTextArea, functionSearchManager); + InitHotkeys(ActionTextArea, actionSearchManager); + + // INIT TOOLTIPS DWELLING + /* + ScriptTextArea.MouseDwellTime = 300; + ScriptTextArea.DwellEnd += TextArea_DwellEnd; + ScriptTextArea.DwellStart += TextArea_DwellStart; + + FunctionTextArea.MouseDwellTime = 300; + FunctionTextArea.DwellEnd += TextArea_DwellEnd; + FunctionTextArea.DwellStart += TextArea_DwellStart; + */ + } + + private void populate_selectScriptFileComboBox(int selectedIndex = 0) { + selectScriptFileComboBox.Items.Clear(); + int scriptCount = Filesystem.GetScriptCount(); + for (int i = 0; i < scriptCount; i++) { + // ScriptFile currentScriptFile = new ScriptFile(i, true, true); + // selectScriptFileComboBox.Items.Add(currentScriptFile); + selectScriptFileComboBox.Items.Add($"Script File {i}"); + } + + selectScriptFileComboBox.SelectedIndex = selectedIndex; + } + + private void InitialViewConfig(Scintilla textArea) { + textArea.Dock = DockStyle.Fill; + textArea.WrapMode = WrapMode.Word; + textArea.IndentationGuides = IndentView.LookBoth; + textArea.CaretPeriod = 500; + textArea.CaretForeColor = Color.White; + textArea.SetSelectionBackColor(true, Color.FromArgb(0x114D9C)); + textArea.WrapIndentMode = WrapIndentMode.Same; + } + + private void InitSyntaxColoring(Scintilla textArea) { + // Configure the default style + textArea.StyleResetDefault(); + textArea.Styles[Style.Default].Font = "Consolas"; + textArea.Styles[Style.Default].Size = 12; + textArea.Styles[Style.Default].BackColor = Color.FromArgb(0x212121); + textArea.Styles[Style.Default].ForeColor = Color.FromArgb(0xFFFFFF); + textArea.StyleClearAll(); + + // Configure the lexer styles + textArea.Styles[Style.Python.Identifier].ForeColor = Color.FromArgb(0xD0DAE2); + textArea.Styles[Style.Python.CommentLine].ForeColor = Color.FromArgb(0x40BF57); + textArea.Styles[Style.Python.Number].ForeColor = Color.FromArgb(0xFFFF00); + textArea.Styles[Style.Python.String].ForeColor = Color.FromArgb(0xFF00FF); + textArea.Styles[Style.Python.Character].ForeColor = Color.FromArgb(0xE95454); + textArea.Styles[Style.Python.Operator].ForeColor = Color.FromArgb(0xFFFF00); + textArea.Styles[Style.Python.Word].ForeColor = Color.FromArgb(0x48A8EE); + textArea.Styles[Style.Python.Word2].ForeColor = Color.FromArgb(0xF98906); + + textArea.Lexer = Lexer.Python; + + textArea.SetKeywords(0, cmdKeyWords); + textArea.SetKeywords(1, secondaryKeyWords); + } + + private void InitNumberMargin(Scintilla textArea, EventHandler textArea_MarginClick) { + textArea.Styles[Style.LineNumber].BackColor = BACK_COLOR; + textArea.Styles[Style.LineNumber].ForeColor = FORE_COLOR; + textArea.Styles[Style.IndentGuide].ForeColor = FORE_COLOR; + textArea.Styles[Style.IndentGuide].BackColor = BACK_COLOR; + + Margin nums = textArea.Margins[NUMBER_MARGIN]; + nums.Type = MarginType.Number; + nums.Sensitive = true; + nums.Mask = 0; + + textArea.MarginClick += textArea_MarginClick; + } + + private void InitBookmarkMargin(Scintilla textArea) { + //TextArea.SetFoldMarginColor(true, IntToColor(BACK_COLOR)); + + Margin margin = textArea.Margins[BOOKMARK_MARGIN]; + margin.Width = 20; + margin.Sensitive = true; + margin.Type = MarginType.Symbol; + margin.Mask = (1 << BOOKMARK_MARKER); + //margin.Cursor = MarginCursor.Arrow; + + Marker marker = textArea.Markers[BOOKMARK_MARKER]; + marker.Symbol = MarkerSymbol.Circle; + marker.SetBackColor(Color.FromArgb(0xFF003B)); + marker.SetForeColor(Color.FromArgb(0x000000)); + marker.SetAlpha(100); + } + + private void InitCodeFolding(Scintilla textArea) { + textArea.SetFoldMarginColor(true, BACK_COLOR); + textArea.SetFoldMarginHighlightColor(true, BACK_COLOR); + + // Enable code folding + textArea.SetProperty("fold", "1"); + textArea.SetProperty("fold.compact", "1"); + + // Configure a margin to display folding symbols + textArea.Margins[FOLDING_MARGIN].Type = MarginType.Symbol; + textArea.Margins[FOLDING_MARGIN].Mask = Marker.MaskFolders; + textArea.Margins[FOLDING_MARGIN].Sensitive = true; + textArea.Margins[FOLDING_MARGIN].Width = 20; + + // Set colors for all folding markers + for (int i = 25; i <= 31; i++) { + textArea.Markers[i].SetForeColor(BACK_COLOR); // styles for [+] and [-] + textArea.Markers[i].SetBackColor(FORE_COLOR); // styles for [+] and [-] + } + + // Configure folding markers with respective symbols + textArea.Markers[Marker.Folder].Symbol = CODE_FOLDING_CIRCULAR ? MarkerSymbol.CirclePlus : MarkerSymbol.BoxPlus; + textArea.Markers[Marker.FolderOpen].Symbol = CODE_FOLDING_CIRCULAR ? MarkerSymbol.CircleMinus : MarkerSymbol.BoxMinus; + textArea.Markers[Marker.FolderEnd].Symbol = CODE_FOLDING_CIRCULAR ? MarkerSymbol.CirclePlusConnected : MarkerSymbol.BoxPlusConnected; + textArea.Markers[Marker.FolderMidTail].Symbol = MarkerSymbol.TCorner; + textArea.Markers[Marker.FolderOpenMid].Symbol = CODE_FOLDING_CIRCULAR ? MarkerSymbol.CircleMinusConnected : MarkerSymbol.BoxMinusConnected; + textArea.Markers[Marker.FolderSub].Symbol = MarkerSymbol.VLine; + textArea.Markers[Marker.FolderTail].Symbol = MarkerSymbol.LCorner; + + // Enable automatic folding + textArea.AutomaticFold = (AutomaticFold.Show|AutomaticFold.Click|AutomaticFold.Change); + } + + private void InitHotkeys(Scintilla scintillaTb, SearchManager sm) { + // register the hotkeys with the form + HotKeyManager.AddHotKey(scintillaTb, sm.OpenSearch, Keys.F, true); + HotKeyManager.AddHotKey(scintillaTb, () => Uppercase(scintillaTb), Keys.U, true); + HotKeyManager.AddHotKey(scintillaTb, () => Lowercase(scintillaTb), Keys.L, true); + HotKeyManager.AddHotKey(scintillaTb, () => ZoomIn(scintillaTb), Keys.Oemplus, true); + HotKeyManager.AddHotKey(scintillaTb, () => ZoomOut(scintillaTb), Keys.OemMinus, true); + HotKeyManager.AddHotKey(scintillaTb, () => ZoomDefault(scintillaTb), Keys.D0, true); + HotKeyManager.AddHotKey(scintillaTb, sm.CloseSearch, Keys.Escape); + + // remove conflicting hotkeys from scintilla + scintillaTb.ClearCmdKey(Keys.Control|Keys.F); + scintillaTb.ClearCmdKey(Keys.Control|Keys.R); + scintillaTb.ClearCmdKey(Keys.Control|Keys.H); + scintillaTb.ClearCmdKey(Keys.Control|Keys.L); + scintillaTb.ClearCmdKey(Keys.Control|Keys.U); + } + + private void Uppercase(Scintilla textArea) { + // save the selection + int start = textArea.SelectionStart; + int end = textArea.SelectionEnd; + + // modify the selected text + textArea.ReplaceSelection(textArea.GetTextRange(start, end - start).ToUpper()); + + // preserve the original selection + textArea.SetSelection(start, end); + } + + private void Lowercase(Scintilla textArea) { + // save the selection + int start = textArea.SelectionStart; + int end = textArea.SelectionEnd; + + // modify the selected text + textArea.ReplaceSelection(textArea.GetTextRange(start, end - start).ToLower()); + + // preserve the original selection + textArea.SetSelection(start, end); + } + + private void ZoomIn(Scintilla textArea) { + textArea.ZoomIn(); + } + + private void ZoomOut(Scintilla textArea) { + textArea.ZoomOut(); + } + + private void ZoomDefault(Scintilla textArea) { + textArea.Zoom = 0; + } + + private void ScriptEditorSetClean() { + Helpers.DisableHandlers(); + + scriptsTabPage.Text = ScriptFile.ContainerTypes.Script.ToString() + "s"; + functionsTabPage.Text = ScriptFile.ContainerTypes.Function.ToString() + "s"; + actionsTabPage.Text = ScriptFile.ContainerTypes.Action.ToString() + "s"; + scriptsDirty = functionsDirty = actionsDirty = false; + + Helpers.EnableHandlers(); + } + + private void OnTextChangedScript(object sender, EventArgs e) { + ScriptTextArea.Margins[NUMBER_MARGIN].Width = ScriptTextArea.Lines.Count.ToString().Length * 13; + scriptsDirty = true; + scriptsTabPage.Text = ScriptFile.ContainerTypes.Script.ToString() + "s" + "*"; + } + + private void OnTextChangedFunction(object sender, EventArgs e) { + FunctionTextArea.Margins[NUMBER_MARGIN].Width = FunctionTextArea.Lines.Count.ToString().Length * 13; + functionsDirty = true; + functionsTabPage.Text = ScriptFile.ContainerTypes.Function.ToString() + "s" + "*"; + } + + private void OnTextChangedAction(object sender, EventArgs e) { + ActionTextArea.Margins[NUMBER_MARGIN].Width = ActionTextArea.Lines.Count.ToString().Length * 13; + actionsDirty = true; + actionsTabPage.Text = ScriptFile.ContainerTypes.Action.ToString() + "s" + "*"; + } + + private void ScriptTextArea_MarginClick(object sender, MarginClickEventArgs e) { + MarginClick(ScriptTextArea, e); + } + + private void FunctionTextArea_MarginClick(object sender, MarginClickEventArgs e) { + MarginClick(FunctionTextArea, e); + } + + private void ActionTextArea_MarginClick(object sender, MarginClickEventArgs e) { + MarginClick(ActionTextArea, e); + } + + private void MarginClick(Scintilla textArea, MarginClickEventArgs e) { + if (e.Margin == BOOKMARK_MARGIN) { + // Do we have a marker for this line? + const uint mask = (1 << BOOKMARK_MARKER); + Line line = textArea.Lines[textArea.LineFromPosition(e.Position)]; + if ((line.MarkerGet()&mask) > 0) { + // Remove existing bookmark + line.MarkerDelete(BOOKMARK_MARKER); + } + else { + // Add bookmark + line.MarkerAdd(BOOKMARK_MARKER); + } + } + } + + private void selectScriptFileComboBox_SelectedIndexChanged(object sender, EventArgs e) { + DisplayScript(); + } + + public void UpdateScriptNumberCheckBox(NumberStyles toSet) { + Helpers.DisableHandlers(); + Properties.Settings.Default.scriptEditorFormatPreference = (int)toSet; + + switch ((NumberStyles)Properties.Settings.Default.scriptEditorFormatPreference) { + case NumberStyles.None: + scriptEditorNumberFormatNoPreference.Checked = true; + break; + case NumberStyles.HexNumber: + scriptEditorNumberFormatHex.Checked = true; + break; + case NumberStyles.Integer: + scriptEditorNumberFormatDecimal.Checked = true; + break; + } + + Console.WriteLine("changed style to " + Properties.Settings.Default.scriptEditorFormatPreference); + Helpers.EnableHandlers(); + } + + private void UpdateScriptNumberFormat(NumberStyles numberStyle) { + if (Helpers.HandlersEnabled) { + NumberStyles old = (NumberStyles)Properties.Settings.Default.scriptEditorFormatPreference; //Local Backup + Properties.Settings.Default.scriptEditorFormatPreference = (int)numberStyle; + + if (!DisplayScript()) { + UpdateScriptNumberCheckBox(old); //Restore old checkbox status! Script couldn't be redrawn + } + } + } + + private void UpdateScriptNumberFormatNoPref(object sender, EventArgs e) { + UpdateScriptNumberFormat(NumberStyles.None); + } + + private void UpdateScriptNumberFormatDec(object sender, EventArgs e) { + UpdateScriptNumberFormat(NumberStyles.Integer); + } + + private void UpdateScriptNumberFormatHex(object sender, EventArgs e) { + UpdateScriptNumberFormat(NumberStyles.HexNumber); + } + + private bool DisplayScript() { + Console.WriteLine("Script Reload has been requested"); + + /* clear controls */ + if (Helpers.HandlersDisabled || selectScriptFileComboBox.SelectedItem == null) { + return false; + } + + if (scriptsDirty || functionsDirty || actionsDirty) { + DialogResult d = MessageBox.Show("There are unsaved changes in this Script File.\nDo you wish to discard them?", "Unsaved work", MessageBoxButtons.YesNo, MessageBoxIcon.Warning); + + if (!d.Equals(DialogResult.Yes)) { + Helpers.DisableHandlers(); + // selectScriptFileComboBox.SelectedItem = currentScriptFile; + selectScriptFileComboBox.SelectedIndex = (int)currentScriptFile.fileID; + Helpers.EnableHandlers(); + return false; + } + } + + Helpers.DisableHandlers(); + + ScriptFile lastScriptFile = currentScriptFile; + // currentScriptFile = (ScriptFile)selectScriptFileComboBox.SelectedItem; + currentScriptFile = new ScriptFile(selectScriptFileComboBox.SelectedIndex); // Load script file + + ScriptTextArea.ClearAll(); + FunctionTextArea.ClearAll(); + ActionTextArea.ClearAll(); + + scriptsNavListbox.Items.Clear(); + functionsNavListbox.Items.Clear(); + actionsNavListbox.Items.Clear(); + + //prevent buttons from flickering when the combobox selection changes + bool typeChanged = true; + if (lastScriptFile != null) { + typeChanged = lastScriptFile.isLevelScript != currentScriptFile.isLevelScript; + } + + if (typeChanged) { + if (currentScriptFile.isLevelScript) { + importScriptFileButton.Location = initial_importScriptFileButton_location; + exportScriptFileButton.Location = initial_exportScriptFileButton_location; + addScriptFileButton.Location = initial_addScriptFileButton_location; + removeScriptFileButton.Location = initial_removeScriptFileButton_location; + + viewLevelScriptButton.Location = new_viewLevelScript_location; + + importScriptFileButton.Enabled = false; + exportScriptFileButton.Enabled = false; + addScriptFileButton.Enabled = false; + removeScriptFileButton.Enabled = false; + + viewLevelScriptButton.Enabled = true; + } + else { + importScriptFileButton.Location = new_importScriptFileButton_location; + exportScriptFileButton.Location = new_exportScriptFileButton_location; + addScriptFileButton.Location = new_addScriptFileButton_location; + removeScriptFileButton.Location = new_removeScriptFileButton_location; + + viewLevelScriptButton.Location = initial_viewLevelScript_location; + + importScriptFileButton.Enabled = true; + exportScriptFileButton.Enabled = true; + addScriptFileButton.Enabled = true; + removeScriptFileButton.Enabled = true; + + viewLevelScriptButton.Enabled = false; + } + } + + if (!currentScriptFile.isLevelScript) { + displayScriptFile(ScriptFile.ContainerTypes.Script, currentScriptFile.allScripts, scriptsNavListbox, ScriptTextArea); + displayScriptFile(ScriptFile.ContainerTypes.Function, currentScriptFile.allFunctions, functionsNavListbox, FunctionTextArea); + displayScriptFileActions(ScriptFile.ContainerTypes.Action, currentScriptFile.allActions, actionsNavListbox, ActionTextArea); + } + + ScriptEditorSetClean(); + + Helpers.statusLabelMessage(); + Helpers.EnableHandlers(); + + return true; + } + + static void displayScriptFile(ScriptFile.ContainerTypes containerType, List commandList, ListBox navListBox, Scintilla textArea) { + string buffer = ""; + /* Add commands */ + for (int i = 0; i < commandList.Count; i++) { + ScriptCommandContainer scriptCommandContainer = commandList[i]; + + /* Write header */ + string header = containerType + " " + (i + 1); + buffer += header + ':' + Environment.NewLine; + navListBox.Items.Add(header); + + /* If current command is identical to another, print UseScript instead of commands */ + if (scriptCommandContainer.usedScriptID < 0) { + for (int j = 0; j < scriptCommandContainer.commands.Count; j++) { + ScriptCommand command = scriptCommandContainer.commands[j]; + if (!ScriptDatabase.endCodes.Contains(command.id)) { + buffer += '\t'; + } + + buffer += command.name + Environment.NewLine; + } + } + else { + buffer += '\t' + "UseScript_#" + scriptCommandContainer.usedScriptID + Environment.NewLine; + } + + textArea.AppendText(buffer + Environment.NewLine); + buffer = ""; + } + } + + static void displayScriptFileActions(ScriptFile.ContainerTypes containerType, List commandList, ListBox navListBox, Scintilla textArea) { + /* Add movements */ + string buffer = ""; + for (int i = 0; i < commandList.Count; i++) { + ScriptActionContainer currentCommand = commandList[i]; + + string header = containerType + " " + (i + 1); + buffer += header + ':' + Environment.NewLine; + navListBox.Items.Add(header); + + for (int j = 0; j < currentCommand.commands.Count; j++) { + ScriptAction command = currentCommand.commands[j]; + if (!ScriptDatabase.movementEndCodes.Contains(command.id)) { + buffer += '\t'; + } + + buffer += command.name + Environment.NewLine; + } + + textArea.AppendText(buffer + Environment.NewLine); + buffer = ""; + } + } + + private void scriptEditorZoomInButton_Click(object sender, EventArgs e) { + ZoomIn(currentScintillaEditor); + } + + private void scriptEditorZoomOutButton_Click(object sender, EventArgs e) { + ZoomOut(currentScintillaEditor); + } + + private void scriptEditorZoomResetButton_Click(object sender, EventArgs e) { + ZoomDefault(currentScintillaEditor); + } + + private void scriptEditorTabControl_TabIndexChanged(object sender, EventArgs e) { + if (scriptEditorTabControl.SelectedTab == scriptsTabPage) { + currentSearchManager = scriptSearchManager; + currentScintillaEditor = ScriptTextArea; + } + else if (scriptEditorTabControl.SelectedTab == functionsTabPage) { + currentSearchManager = functionSearchManager; + currentScintillaEditor = FunctionTextArea; + } + else { + //Actions + currentSearchManager = actionSearchManager; + currentScintillaEditor = ActionTextArea; + } + } + + private void removeScriptFileButton_Click(object sender, EventArgs e) { + DialogResult d = MessageBox.Show("Are you sure you want to delete the last Script File?", "Confirm deletion", MessageBoxButtons.YesNo, MessageBoxIcon.Warning); + if (d.Equals(DialogResult.Yes)) { + /* Delete script file */ + string path = Filesystem.GetScriptPath(selectScriptFileComboBox.Items.Count - 1); + File.Delete(path); + + /* Check if currently selected file is the last one, and in that case select the one before it */ + int lastIndex = selectScriptFileComboBox.Items.Count - 1; + if (selectScriptFileComboBox.SelectedIndex == lastIndex) { + selectScriptFileComboBox.SelectedIndex--; + } + + /* Remove item from ComboBox */ + selectScriptFileComboBox.Items.RemoveAt(lastIndex); + } + } + + private void addScriptFileButton_Click(object sender, EventArgs e) { + /* Add new event file to event folder */ + int fileID = selectScriptFileComboBox.Items.Count; + + ScriptFile scriptFile = new ScriptFile( + scriptLines: new Scintilla { Text = "Script 1:\nEnd" }.Lines.ToStringsList(trim: true), + functionLines: null, + actionLines: null, + fileID + ); + + //check if ScriptFile instance was created successfully + if (scriptFile.SaveToFileDefaultDir(fileID, showSuccessMessage: false)) { + /* Update ComboBox and select new file */ + selectScriptFileComboBox.Items.Add(scriptFile); + selectScriptFileComboBox.SelectedItem = scriptFile; + } + } + + private void saveScriptFileButton_Click(object sender, EventArgs e) { + /* Create new ScriptFile object using the values in the script editor */ + int fileID = currentScriptFile.fileID; + + ScriptFile userEdited = new ScriptFile( + scriptLines: ScriptTextArea.Lines.ToStringsList(trim: true), + functionLines: FunctionTextArea.Lines.ToStringsList(trim: true), + actionLines: ActionTextArea.Lines.ToStringsList(trim: true), + fileID + ); + + if (userEdited.hasNoScripts) { + MessageBox.Show("This " + nameof(ScriptFile) + " couldn't be saved. A minimum of one script is required.", "Can't save", MessageBoxButtons.OK, MessageBoxIcon.Warning); + return; + } + + //check if ScriptFile instance was created successfully + if (userEdited.SaveToFileDefaultDir(fileID)) { + currentScriptFile = userEdited; + ScriptEditorSetClean(); + } + } + + private void exportScriptFileButton_Click(object sender, EventArgs e) { + currentScriptFile.SaveToFileExplorePath(currentScriptFile.ToString(), blindmode: true); + } + + private void importScriptFileButton_Click(object sender, EventArgs e) { + /* Prompt user to select .scr or .bin file */ + OpenFileDialog of = new OpenFileDialog { + Filter = "Script File (*.scr, *.bin)|*.scr;*.bin" + }; + if (of.ShowDialog(this) != DialogResult.OK) { + return; + } + + /* Update scriptFile object in memory */ + int i = selectScriptFileComboBox.SelectedIndex; + string path = Filesystem.GetScriptPath(i); + File.Copy(of.FileName, path, true); + + populate_selectScriptFileComboBox(i); + + /* Refresh controls */ + selectScriptFileComboBox_SelectedIndexChanged(null, null); + + /* Display success message */ + MessageBox.Show("Scripts imported successfully!", "", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + + private void viewLevelScriptButton_Click(object sender, EventArgs e) { + EditorPanels.levelScriptEditor.OpenLevelScriptEditor(this._parent, selectScriptFileComboBox.SelectedIndex); + } + + private void locateCurrentScriptFile_Click(object sender, EventArgs e) { + string path = Filesystem.GetScriptPath(selectScriptFileComboBox.SelectedIndex); + Helpers.ExplorerSelect(path); + } + + private void findNext(SearchManager searchManager) { + searchManager.Find(true, false); + scrollResultToTop(searchManager); + } + + private void findPrev(SearchManager searchManager) { + searchManager.Find(false, false); + scrollResultToTop(searchManager); + } + + private void findCurrent(SearchManager searchManager) { + searchManager.Find(true, true); + scrollResultToTop(searchManager); + } + + private void TxtFindKeyDown(SearchManager searchManager, KeyEventArgs e) { + if (HotKeyManager.IsHotkey(e, Keys.Enter)) { + findNext(searchManager); + } + + if (HotKeyManager.IsHotkey(e, Keys.Enter, true) || HotKeyManager.IsHotkey(e, Keys.Enter, false, true)) { + findPrev(searchManager); + } + } + + private void BtnNextFindScript_Click(object sender, EventArgs e) { + findNext(scriptSearchManager); + } + + private void BtnPrevFindScript_Click(object sender, EventArgs e) { + findPrev(scriptSearchManager); + } + + private void panelFindScriptTextBox_TextChanged(object sender, EventArgs e) { + findCurrent(scriptSearchManager); + } + + private void scriptTxtFind_KeyDown(object sender, KeyEventArgs e) { + TxtFindKeyDown(scriptSearchManager, e); + } + + private void BtnCloseFindScript_Click(object sender, EventArgs e) { + scriptSearchManager.CloseSearch(); + } + + private void BtnNextFindFunc_Click(object sender, EventArgs e) { + findNext(functionSearchManager); + } + + private void BtnPrevFindFunc_Click(object sender, EventArgs e) { + findNext(functionSearchManager); + } + + private void panelFindFunctionTextBox_TextChanged(object sender, EventArgs e) { + findNext(functionSearchManager); + } + + private void functionTxtFind_KeyDown(object sender, KeyEventArgs e) { + TxtFindKeyDown(functionSearchManager, e); + } + + private void BtnCloseFindFunc_Click(object sender, EventArgs e) { + functionSearchManager.CloseSearch(); + } + + private void BtnNextFindActions_Click(object sender, EventArgs e) { + findNext(actionSearchManager); + } + + private void BtnPrevFindActions_Click(object sender, EventArgs e) { + findNext(actionSearchManager); + } + + private void panelFindActionTextBox_TextChanged(object sender, EventArgs e) { + findNext(actionSearchManager); + } + + private void actionTxtFind_KeyDown(object sender, KeyEventArgs e) { + TxtFindKeyDown(actionSearchManager, e); + } + + private void BtnCloseFindActions_Click(object sender, EventArgs e) { + actionSearchManager.CloseSearch(); + } + + void scrollResultToTop(SearchManager searchManager) { + int resultStart = searchManager.textAreaScintilla.CurrentLine - ScriptEditorSearchResult.ResultsPadding; + searchManager.textAreaScintilla.FirstVisibleLine = resultStart; + } + + private void NavigatorGoTo(ListBox listBox, TabPage tabPage, SearchManager searchManager, ScriptFile.ContainerTypes containerType) { + if (listBox.SelectedIndex < 0) { + return; + } + + scriptEditorTabControl.SelectedTab = tabPage; + int commandNumber = listBox.SelectedIndex + 1; + string CommandBlockOpen = $"{containerType} {commandNumber}:"; + searchManager.Find(true, false, CommandBlockOpen); + + scrollResultToTop(searchManager); + } + + private void scriptsNavListbox_SelectedIndexChanged(object sender, EventArgs e) { + NavigatorGoTo((ListBox)sender, scriptsTabPage, scriptSearchManager, ScriptFile.ContainerTypes.Script); + } + + private void functionsNavListbox_SelectedIndexChanged(object sender, EventArgs e) { + NavigatorGoTo((ListBox)sender, functionsTabPage, functionSearchManager, ScriptFile.ContainerTypes.Function); + } + + private void actionsNavListbox_SelectedIndexChanged(object sender, EventArgs e) { + NavigatorGoTo((ListBox)sender, actionsTabPage, actionSearchManager, ScriptFile.ContainerTypes.Action); + } + + private void openFindScriptEditorButton_Click(object sender, EventArgs e) { + currentSearchManager.OpenSearch(); + } + + private void ScriptEditorExpandButton_Click(object sender, EventArgs e) { + currentScintillaEditor.FoldAll(FoldAction.Expand); + } + + private void ScriptEditorCollapseButton_Click(object sender, EventArgs e) { + currentScintillaEditor.FoldAll(FoldAction.Contract); + } + + private void scriptEditorWordWrapCheckbox_CheckedChanged(object sender, EventArgs e) { + ScriptTextArea.WrapMode = scriptEditorWordWrapCheckbox.Checked ? WrapMode.Word : WrapMode.None; + FunctionTextArea.WrapMode = scriptEditorWordWrapCheckbox.Checked ? WrapMode.Word : WrapMode.None; + ActionTextArea.WrapMode = scriptEditorWordWrapCheckbox.Checked ? WrapMode.Word : WrapMode.None; + } + + private void viewWhiteSpacesButton_Click(object sender, EventArgs e) { + ScriptTextArea.ViewWhitespace = scriptEditorWhitespacesCheckbox.Checked ? WhitespaceMode.VisibleAlways : WhitespaceMode.Invisible; + FunctionTextArea.ViewWhitespace = scriptEditorWhitespacesCheckbox.Checked ? WhitespaceMode.VisibleAlways : WhitespaceMode.Invisible; + ActionTextArea.ViewWhitespace = scriptEditorWhitespacesCheckbox.Checked ? WhitespaceMode.VisibleAlways : WhitespaceMode.Invisible; + } + + private void searchInScriptsTextBox_KeyDown(object sender, KeyEventArgs e) { + if (e.KeyCode == Keys.Enter) { + searchInScriptsButton_Click(null, null); + } + } + + public List getScriptsToSearch() { + List scriptsToSearch = new List(); + + if (searchOnlyCurrentScriptCheckBox.Checked) { + this.UIThread(() => { + searchProgressBar.Maximum = 1; + }); + int i = selectScriptFileComboBox.SelectedIndex; + ScriptFile scriptFile = new ScriptFile(i); + Console.WriteLine("Attempting to load script " + scriptFile.fileID); + scriptsToSearch.Add(scriptFile); + this.UIThread(() => { + searchProgressBar.IncrementNoAnimation(); + }); + } + else { + this.UIThread(() => { + searchProgressBar.Maximum = selectScriptFileComboBox.Items.Count; + }); + for (int i = 0; i < selectScriptFileComboBox.Items.Count; i++) { + ScriptFile scriptFile = new ScriptFile(i); + Console.WriteLine("Attempting to load script " + scriptFile.fileID); + scriptsToSearch.Add(scriptFile); + this.UIThread(() => { + searchProgressBar.IncrementNoAnimation(); + }); + } + } + + return scriptsToSearch; + } + + private void searchInScriptsButton_Click(object sender, EventArgs e) { + if (searchInScriptsTextBox.Text == "") { + return; + } + + BackgroundWorker bw = new BackgroundWorker(); + bw.DoWork += (_sender, args) => { + this.UIThread(() => { + searchInScriptsResultListBox.Items.Clear(); + searchProgressBar.Value = 0; + }); + + List scriptsToSearch = getScriptsToSearch(); + + string searchString = searchInScriptsTextBox.Text; + Func searchCriteriaCS = (string s) => s.IndexOf(searchString, StringComparison.InvariantCulture) >= 0; + Func searchCriteriaCI = (string s) => s.IndexOf(searchString, StringComparison.InvariantCultureIgnoreCase) >= 0; + Func searchCriteria = scriptSearchCaseSensitiveCheckBox.Checked ? searchCriteriaCS : searchCriteriaCI; + + List results = new List(); + foreach (ScriptFile scriptFile in scriptsToSearch) { + List scriptResults = SearchInScripts(scriptFile, scriptFile.allScripts, searchCriteria); + List functionResults = SearchInScripts(scriptFile, scriptFile.allFunctions, searchCriteria); + // List actionResults = SearchInScripts(scriptFile, scriptFile.allActions, searchCriteria); + results.AddRange(scriptResults); + results.AddRange(functionResults); + // results.AddRange(actionResults); + } + + this.UIThread(() => { + searchInScriptsResultListBox.Items.AddRange(results.ToArray()); + searchProgressBar.Value = 0; + }); + }; + + bw.RunWorkerAsync(); + } + + private List SearchInScripts(ScriptFile scriptFile, List commandContainers, Func criteria) { + List results = new List(); + + for (int j = 0; j < commandContainers.Count; j++) { + if (commandContainers[j].commands is null) { + continue; + } + + ScriptCommandContainer scriptCommandContainer = commandContainers[j]; + foreach (ScriptCommand scriptCommand in scriptCommandContainer.commands) { + if (criteria(scriptCommand.name)) { + results.Add(new ScriptEditorSearchResult(scriptFile, scriptCommandContainer.containerType, j + 1, scriptCommand)); + } + } + } + + return results; + } + + private void searchInScriptsResultListBox_KeyDown(object sender, KeyEventArgs e) { + if (e.KeyCode == Keys.Enter) { + goToSearchResult(); + } + } + + private void searchInScripts_GoToEntryResult(object sender, MouseEventArgs e) { + goToSearchResult(); + } + + private void goToSearchResult() { + if (searchInScriptsResultListBox.SelectedItem == null) return; + + ScriptEditorSearchResult searchResult = (ScriptEditorSearchResult)searchInScriptsResultListBox.SelectedItem; + ScriptFile scriptFile = searchResult.scriptFile; + ScriptFile.ContainerTypes containerType = searchResult.containerType; + + selectScriptFileComboBox.SelectedIndex = scriptFile.fileID; + + if (containerType == ScriptFile.ContainerTypes.Script) { + displaySearchResult(scriptsTabPage, scriptSearchManager, searchResult); + } + else if (containerType == ScriptFile.ContainerTypes.Function) { + displaySearchResult(functionsTabPage, functionSearchManager, searchResult); + } + else if (containerType == ScriptFile.ContainerTypes.Action) { + displaySearchResult(actionsTabPage, actionSearchManager, searchResult); + } + } + + private void displaySearchResult(TabPage tabPage, SearchManager searchManager, ScriptEditorSearchResult searchResult) { + if (scriptEditorTabControl.SelectedTab != tabPage) { + scriptEditorTabControl.SelectedTab = tabPage; + } + + searchManager.Find(true, false, searchResult.CommandBlockOpen); + int blockStart = searchManager.textAreaScintilla.CurrentLine - ScriptEditorSearchResult.ResultsPadding; + + searchManager.Find(true, false, searchResult.scriptCommand.name); + int resultStart = searchManager.textAreaScintilla.CurrentLine - ScriptEditorSearchResult.ResultsPadding; + + if (scrollToBlockStartcheckBox.Checked) { + searchManager.textAreaScintilla.FirstVisibleLine = blockStart; + } + else { + searchManager.textAreaScintilla.FirstVisibleLine = resultStart; + } + } + } + + public class ScriptEditorSearchResult { + public readonly ScriptFile scriptFile; + public readonly ScriptFile.ContainerTypes containerType; + public readonly int commandNumber; + public readonly ScriptCommand scriptCommand; + + public const int ResultsPadding = 1; + + public ScriptEditorSearchResult(ScriptFile scriptFile, ScriptFile.ContainerTypes containerType, int commandNumber, ScriptCommand scriptCommand) { + this.scriptFile = scriptFile; + this.containerType = containerType; + this.commandNumber = commandNumber; + this.scriptCommand = scriptCommand; + } + + public string CommandBlockOpen { get { return $"{containerType} {commandNumber}:"; } } + + public override string ToString() { + return $"File {scriptFile.fileID} - {CommandBlockOpen} {scriptCommand.name}"; + } + } +} diff --git a/DS_Map/Editors/ScriptEditor.resx b/DS_Map/Editors/ScriptEditor.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/DS_Map/Editors/ScriptEditor.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/ExtensionMethods.cs b/DS_Map/ExtensionMethods.cs new file mode 100644 index 0000000..b306b5a --- /dev/null +++ b/DS_Map/ExtensionMethods.cs @@ -0,0 +1,71 @@ +using System; +using System.Windows.Forms; + +namespace DSPRE { + public static class ExtensionMethods { + /// + /// Increment the progress bar value, without using Windows Aero animation + /// + public static void IncrementNoAnimation(this ProgressBar pb, int amount = 1) { + pb.Value += amount; + if (pb.Value != pb.Maximum) pb.Value++; + pb.Value--; + } + + //https://stackoverflow.com/a/10939890 + /// + /// Sets the progress bar value, without using Windows Aero animation + /// + public static void SetProgressNoAnimation(this ProgressBar pb, int value) { + // Don't redraw if nothing is changing. + if (value == pb.Value) + return; + + // To get around this animation, we need to move the progress bar backwards. + if (value == pb.Maximum) { + // Special case (can't set value > Maximum). + pb.Value = value; // Set the value + pb.Value = value - 1; // Move it backwards + } + else { + pb.Value = value + 1; // Move past + } + + pb.Value = value; // Move to correct value + } + + /* + searchInScriptsButton.BeginInvoke(new Action(() => { + })); + + BackgroundWorker bw = new BackgroundWorker(); + bw.DoWork += (_sender, args) => { + this.UIThread(() => { + }); + }; + + //easier to set up + searchInScriptsButton.BeginInvoke(new Action(() => { + searchProgressBar.Value += 1; + })); + + //smoother if you put the control updates in the UIThread + //same as BeginInvoke if you put the entire logic in UIThread + BackgroundWorker bw = new BackgroundWorker(); + bw.DoWork += (_sender, args) => { + this.UIThread(() => { + searchProgressBar.Value += 1; + }); + }; + bw.RunWorkerAsync(); + */ + public static void UIThread(this Control control, Action code) { + if (control.InvokeRequired) { + control.BeginInvoke(code); + return; + } + + code.Invoke(); + } + } +} diff --git a/DS_Map/Extensions.cs b/DS_Map/Extensions.cs index ee71c01..76d1a9c 100644 --- a/DS_Map/Extensions.cs +++ b/DS_Map/Extensions.cs @@ -7,6 +7,8 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; +using System.ComponentModel; +using Tao.Platform.Windows; namespace DSPRE { public static class Extensions { @@ -142,4 +144,33 @@ namespace DSPRE { } public static Bitmap Resize(this Bitmap source, float factor) => source.Resize((int)(source.Width * factor), (int)(source.Height * factor)); } + + public class ListBox2 : ListBox { + public new void RefreshItem(int index) { + base.RefreshItem(index); + } + } + + public class SimpleOpenGlControl2 : SimpleOpenGlControl { + private bool designMode; + + public SimpleOpenGlControl2() : base() { + designMode = LicenseManager.UsageMode == LicenseUsageMode.Designtime; + } + + public new bool DesignMode { get { return designMode; } } + + protected override void OnPaint(PaintEventArgs e) { + //if the control is allowed to paint in design mode, a message box prevents working with it + //"No device or rendering context available!" + if (DesignMode) { + e.Graphics.Clear(this.BackColor); + if (this.BackgroundImage != null) + e.Graphics.DrawImage(this.BackgroundImage, this.ClientRectangle, 0, 0, this.BackgroundImage.Width, this.BackgroundImage.Height, GraphicsUnit.Pixel); + e.Graphics.Flush(); + return; + }; + base.OnPaint(e); + } + } } diff --git a/DS_Map/Helpers.cs b/DS_Map/Helpers.cs index f6d2aa0..13fa6d0 100644 --- a/DS_Map/Helpers.cs +++ b/DS_Map/Helpers.cs @@ -47,11 +47,11 @@ namespace DSPRE { } public static void DisableHandlers() { - Helpers.DisableHandlers(); + disableHandlers = true; } public static void EnableHandlers() { - Helpers.EnableHandlers(); + disableHandlers = false; } public static void statusLabelMessage(string msg = "Ready") { diff --git a/DS_Map/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs index 65baac3..58ed43f 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 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(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle43 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle44 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle45 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle46 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle47 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle48 = 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(); @@ -507,66 +507,6 @@ this.exportEventFileButton = new System.Windows.Forms.Button(); this.importEventFileButton = new System.Windows.Forms.Button(); this.saveEventsButton = new System.Windows.Forms.Button(); - this.scriptEditorTabPage = new System.Windows.Forms.TabPage(); - this.locateCurrentScriptFile = new System.Windows.Forms.Button(); - this.clearCurrentLevelScriptButton = new System.Windows.Forms.Button(); - this.groupBox26 = new System.Windows.Forms.GroupBox(); - this.scriptEditorNumberFormatNoPreference = new System.Windows.Forms.RadioButton(); - this.scriptEditorNumberFormatDecimal = new System.Windows.Forms.RadioButton(); - this.scriptEditorNumberFormatHex = new System.Windows.Forms.RadioButton(); - this.scriptEditorWhitespacesCheckbox = new System.Windows.Forms.CheckBox(); - this.scriptEditorWordWrapCheckbox = new System.Windows.Forms.CheckBox(); - this.compressScriptTextButton = new System.Windows.Forms.Button(); - this.expandScriptTextButton = new System.Windows.Forms.Button(); - this.openSearchScriptEditorButton = new System.Windows.Forms.Button(); - this.groupBox24 = new System.Windows.Forms.GroupBox(); - this.SyncNavigatorCB = new System.Windows.Forms.CheckBox(); - this.ScriptNavigatorTabControl = new System.Windows.Forms.TabControl(); - this.ScriptsNavTab = new System.Windows.Forms.TabPage(); - this.scriptsNavListbox = new System.Windows.Forms.ListBox(); - this.FunctionsNavTab = new System.Windows.Forms.TabPage(); - this.functionsNavListbox = new System.Windows.Forms.ListBox(); - this.ActionsNavTab = new System.Windows.Forms.TabPage(); - this.actionsNavListbox = new System.Windows.Forms.ListBox(); - this.groupBox8 = new System.Windows.Forms.GroupBox(); - this.searchOnlyCurrentScriptCheckBox = new System.Windows.Forms.CheckBox(); - this.scriptSearchCaseSensitiveCheckBox = new System.Windows.Forms.CheckBox(); - this.searchInScriptsTextBox = new System.Windows.Forms.TextBox(); - this.label31 = new System.Windows.Forms.Label(); - this.searchProgressBar = new System.Windows.Forms.ProgressBar(); - this.label30 = new System.Windows.Forms.Label(); - this.label29 = new System.Windows.Forms.Label(); - this.searchInScriptsButton = new System.Windows.Forms.Button(); - this.searchInScriptsResultListBox = new System.Windows.Forms.ListBox(); - this.importScriptFileButton = new System.Windows.Forms.Button(); - this.exportScriptFileButton = new System.Windows.Forms.Button(); - this.saveScriptFileButton = new System.Windows.Forms.Button(); - this.removeScriptFileButton = new System.Windows.Forms.Button(); - this.addScriptFileButton = new System.Windows.Forms.Button(); - this.scriptEditorTabControl = new System.Windows.Forms.TabControl(); - this.scriptsTabPage = new System.Windows.Forms.TabPage(); - this.PanelSearchScripts = new System.Windows.Forms.Panel(); - this.BtnNextSearchScript = new System.Windows.Forms.Button(); - this.BtnPrevSearchScript = new System.Windows.Forms.Button(); - this.BtnCloseSearchScript = new System.Windows.Forms.Button(); - this.panelSearchScriptTextBox = new System.Windows.Forms.TextBox(); - this.scintillaScriptsPanel = new System.Windows.Forms.Panel(); - this.functionsTabPage = new System.Windows.Forms.TabPage(); - this.PanelSearchFunctions = new System.Windows.Forms.Panel(); - this.BtnNextSearchFunc = new System.Windows.Forms.Button(); - this.BtnPrevSearchFunc = new System.Windows.Forms.Button(); - this.BtnCloseSearchFunc = new System.Windows.Forms.Button(); - this.panelSearchFunctionTextBox = new System.Windows.Forms.TextBox(); - this.scintillaFunctionsPanel = new System.Windows.Forms.Panel(); - this.actionsTabPage = new System.Windows.Forms.TabPage(); - this.PanelSearchActions = new System.Windows.Forms.Panel(); - this.BtnNextSearchActions = new System.Windows.Forms.Button(); - this.BtnPrevSearchActions = new System.Windows.Forms.Button(); - this.BtnCloseSearchActions = new System.Windows.Forms.Button(); - this.panelSearchActionTextBox = new System.Windows.Forms.TextBox(); - this.scintillaActionsPanel = new System.Windows.Forms.Panel(); - this.label5 = new System.Windows.Forms.Label(); - this.selectScriptFileComboBox = new System.Windows.Forms.ComboBox(); this.textEditorTabPage = new System.Windows.Forms.TabPage(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.label6 = new System.Windows.Forms.Label(); @@ -833,6 +773,8 @@ this.locationNameConditionalMusicLBL = new System.Windows.Forms.Label(); this.headerConditionalMusicComboBox = new System.Windows.Forms.ComboBox(); this.conditionalMusicTableListBox = new System.Windows.Forms.ListBox(); + this.tabPageScriptEditor = new System.Windows.Forms.TabPage(); + this.tabPageLevelScriptEditor = new System.Windows.Forms.TabPage(); this.mainTabImageList = new System.Windows.Forms.ImageList(this.components); this.gameIcon = new System.Windows.Forms.PictureBox(); this.languageLabel = new System.Windows.Forms.Label(); @@ -905,6 +847,8 @@ this.separator_afterMiscButtons = new System.Windows.Forms.ToolStripSeparator(); this.versionLabel = new System.Windows.Forms.Label(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); + this.scriptEditor = new DSPRE.Editors.ScriptEditor(); + this.levelScriptEditor = new DSPRE.Editors.LevelScriptEditor(); this.mainTabControl.SuspendLayout(); this.headerEditorTabPage.SuspendLayout(); this.worldmapCoordsGroupBox.SuspendLayout(); @@ -1060,21 +1004,6 @@ ((System.ComponentModel.ISupportInitialize)(this.rightClickPicture)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.wheelClickPicture)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.LeftClickPicture)).BeginInit(); - this.scriptEditorTabPage.SuspendLayout(); - this.groupBox26.SuspendLayout(); - this.groupBox24.SuspendLayout(); - this.ScriptNavigatorTabControl.SuspendLayout(); - this.ScriptsNavTab.SuspendLayout(); - this.FunctionsNavTab.SuspendLayout(); - this.ActionsNavTab.SuspendLayout(); - this.groupBox8.SuspendLayout(); - this.scriptEditorTabControl.SuspendLayout(); - this.scriptsTabPage.SuspendLayout(); - this.PanelSearchScripts.SuspendLayout(); - this.functionsTabPage.SuspendLayout(); - this.PanelSearchFunctions.SuspendLayout(); - this.actionsTabPage.SuspendLayout(); - this.PanelSearchActions.SuspendLayout(); this.textEditorTabPage.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); this.LineNumbersFormatgroupBox.SuspendLayout(); @@ -1151,6 +1080,8 @@ this.conditionalMusicGroupBox.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.musicIDconditionalMusicUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.flagConditionalMusicUpDown)).BeginInit(); + this.tabPageScriptEditor.SuspendLayout(); + this.tabPageLevelScriptEditor.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gameIcon)).BeginInit(); this.menuStrip1.SuspendLayout(); this.statusStrip1.SuspendLayout(); @@ -1165,11 +1096,12 @@ this.mainTabControl.Controls.Add(this.mapEditorTabPage); this.mainTabControl.Controls.Add(this.nsbtxEditorTabPage); this.mainTabControl.Controls.Add(this.eventEditorTabPage); - this.mainTabControl.Controls.Add(this.scriptEditorTabPage); this.mainTabControl.Controls.Add(this.textEditorTabPage); this.mainTabControl.Controls.Add(this.cameraEditorTabPage); this.mainTabControl.Controls.Add(this.trainerEditorTabPage); this.mainTabControl.Controls.Add(this.tableEditorTabPage); + this.mainTabControl.Controls.Add(this.tabPageScriptEditor); + this.mainTabControl.Controls.Add(this.tabPageLevelScriptEditor); this.mainTabControl.ImageList = this.mainTabImageList; this.mainTabControl.Location = new System.Drawing.Point(11, 72); this.mainTabControl.Name = "mainTabControl"; @@ -2826,40 +2758,40 @@ this.headersGridView.AllowUserToResizeColumns = false; this.headersGridView.AllowUserToResizeRows = false; this.headersGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - 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; + dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle33.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + dataGridViewCellStyle33.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle33.ForeColor = System.Drawing.SystemColors.Info; + dataGridViewCellStyle33.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle33.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.headersGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle33; this.headersGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - 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; + dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle34.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle34.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle34.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle34.Format = "D4"; + dataGridViewCellStyle34.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle34.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.headersGridView.DefaultCellStyle = dataGridViewCellStyle34; this.headersGridView.Location = new System.Drawing.Point(0, 0); this.headersGridView.MultiSelect = false; this.headersGridView.Name = "headersGridView"; - 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; + dataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle35.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle35.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle35.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle35.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle35.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.headersGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle35; this.headersGridView.RowHeadersWidth = 50; this.headersGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - 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; + dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle36.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.headersGridView.RowsDefaultCellStyle = dataGridViewCellStyle36; this.headersGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.headersGridView.RowTemplate.Height = 18; this.headersGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; @@ -2888,43 +2820,43 @@ this.heightsGridView.AllowUserToDeleteRows = false; this.heightsGridView.AllowUserToResizeColumns = false; this.heightsGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle37; this.heightsGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - 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; + dataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle38.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle38.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle38.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle38.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle38.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle38.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.heightsGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle38; this.heightsGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - 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; + dataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle39.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle39.Font = new System.Drawing.Font("Tahoma", 8.25F); + dataGridViewCellStyle39.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle39.Format = "D2"; + dataGridViewCellStyle39.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle39.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle39.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle39; this.heightsGridView.Location = new System.Drawing.Point(0, 0); this.heightsGridView.MultiSelect = false; this.heightsGridView.Name = "heightsGridView"; - 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; + dataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle40.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle40.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle40.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle40.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle40.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle40.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.heightsGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle40; this.heightsGridView.RowHeadersWidth = 50; this.heightsGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - 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; + dataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle41.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.heightsGridView.RowsDefaultCellStyle = dataGridViewCellStyle41; this.heightsGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.heightsGridView.RowTemplate.Height = 18; this.heightsGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; @@ -2951,43 +2883,43 @@ this.mapFilesGridView.AllowUserToDeleteRows = false; this.mapFilesGridView.AllowUserToResizeColumns = false; this.mapFilesGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle42.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle42; this.mapFilesGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - 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; + dataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle43.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle43.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle43.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle43.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle43.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle43.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.mapFilesGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle43; this.mapFilesGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - 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; + dataGridViewCellStyle44.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle44.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle44.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle44.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle44.Format = "D4"; + dataGridViewCellStyle44.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle44.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle44.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle44; this.mapFilesGridView.Location = new System.Drawing.Point(0, 0); this.mapFilesGridView.MultiSelect = false; this.mapFilesGridView.Name = "mapFilesGridView"; - 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; + dataGridViewCellStyle45.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle45.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle45.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle45.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle45.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle45.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle45.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.mapFilesGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle45; this.mapFilesGridView.RowHeadersWidth = 50; this.mapFilesGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - 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; + dataGridViewCellStyle46.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle46.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.mapFilesGridView.RowsDefaultCellStyle = dataGridViewCellStyle46; this.mapFilesGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.mapFilesGridView.RowTemplate.Height = 18; this.mapFilesGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; @@ -6995,758 +6927,6 @@ this.saveEventsButton.UseVisualStyleBackColor = true; this.saveEventsButton.Click += new System.EventHandler(this.saveEventsButton_Click); // - // scriptEditorTabPage - // - this.scriptEditorTabPage.Controls.Add(this.locateCurrentScriptFile); - this.scriptEditorTabPage.Controls.Add(this.clearCurrentLevelScriptButton); - this.scriptEditorTabPage.Controls.Add(this.groupBox26); - this.scriptEditorTabPage.Controls.Add(this.scriptEditorWhitespacesCheckbox); - this.scriptEditorTabPage.Controls.Add(this.scriptEditorWordWrapCheckbox); - this.scriptEditorTabPage.Controls.Add(this.compressScriptTextButton); - this.scriptEditorTabPage.Controls.Add(this.expandScriptTextButton); - this.scriptEditorTabPage.Controls.Add(this.openSearchScriptEditorButton); - this.scriptEditorTabPage.Controls.Add(this.groupBox24); - this.scriptEditorTabPage.Controls.Add(this.groupBox8); - this.scriptEditorTabPage.Controls.Add(this.importScriptFileButton); - this.scriptEditorTabPage.Controls.Add(this.exportScriptFileButton); - this.scriptEditorTabPage.Controls.Add(this.saveScriptFileButton); - this.scriptEditorTabPage.Controls.Add(this.removeScriptFileButton); - this.scriptEditorTabPage.Controls.Add(this.addScriptFileButton); - this.scriptEditorTabPage.Controls.Add(this.scriptEditorTabControl); - this.scriptEditorTabPage.Controls.Add(this.label5); - this.scriptEditorTabPage.Controls.Add(this.selectScriptFileComboBox); - this.scriptEditorTabPage.ImageIndex = 5; - this.scriptEditorTabPage.Location = new System.Drawing.Point(4, 23); - this.scriptEditorTabPage.Name = "scriptEditorTabPage"; - this.scriptEditorTabPage.Padding = new System.Windows.Forms.Padding(3); - this.scriptEditorTabPage.Size = new System.Drawing.Size(1185, 633); - this.scriptEditorTabPage.TabIndex = 4; - this.scriptEditorTabPage.Text = "Script Editor"; - this.scriptEditorTabPage.UseVisualStyleBackColor = true; - // - // locateCurrentScriptFile - // - this.locateCurrentScriptFile.Image = global::DSPRE.Properties.Resources.open_file; - this.locateCurrentScriptFile.Location = new System.Drawing.Point(429, 29); - this.locateCurrentScriptFile.Name = "locateCurrentScriptFile"; - this.locateCurrentScriptFile.Size = new System.Drawing.Size(42, 40); - this.locateCurrentScriptFile.TabIndex = 63; - this.locateCurrentScriptFile.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.locateCurrentScriptFile.UseVisualStyleBackColor = true; - this.locateCurrentScriptFile.Click += new System.EventHandler(this.locateCurrentScriptFile_Click); - // - // clearCurrentLevelScriptButton - // - this.clearCurrentLevelScriptButton.Image = global::DSPRE.Properties.Resources.destroyLevelScript; - this.clearCurrentLevelScriptButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.clearCurrentLevelScriptButton.Location = new System.Drawing.Point(320, 22); - this.clearCurrentLevelScriptButton.Name = "clearCurrentLevelScriptButton"; - this.clearCurrentLevelScriptButton.Size = new System.Drawing.Size(106, 52); - this.clearCurrentLevelScriptButton.TabIndex = 19; - this.clearCurrentLevelScriptButton.Text = "&Clear This\r\nLevel Script"; - this.clearCurrentLevelScriptButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.clearCurrentLevelScriptButton.UseVisualStyleBackColor = true; - this.clearCurrentLevelScriptButton.Visible = false; - this.clearCurrentLevelScriptButton.Click += new System.EventHandler(this.clearCurrentLevelScriptButton_Click); - // - // groupBox26 - // - this.groupBox26.Controls.Add(this.scriptEditorNumberFormatNoPreference); - this.groupBox26.Controls.Add(this.scriptEditorNumberFormatDecimal); - this.groupBox26.Controls.Add(this.scriptEditorNumberFormatHex); - this.groupBox26.Location = new System.Drawing.Point(693, 4); - this.groupBox26.Name = "groupBox26"; - this.groupBox26.Size = new System.Drawing.Size(190, 36); - this.groupBox26.TabIndex = 50; - this.groupBox26.TabStop = false; - this.groupBox26.Text = "Number Format Preference"; - // - // scriptEditorNumberFormatNoPreference - // - this.scriptEditorNumberFormatNoPreference.AutoSize = true; - this.scriptEditorNumberFormatNoPreference.Checked = true; - this.scriptEditorNumberFormatNoPreference.Location = new System.Drawing.Point(11, 14); - this.scriptEditorNumberFormatNoPreference.Name = "scriptEditorNumberFormatNoPreference"; - this.scriptEditorNumberFormatNoPreference.Size = new System.Drawing.Size(47, 17); - this.scriptEditorNumberFormatNoPreference.TabIndex = 36; - this.scriptEditorNumberFormatNoPreference.TabStop = true; - this.scriptEditorNumberFormatNoPreference.Text = "Auto"; - this.scriptEditorNumberFormatNoPreference.UseVisualStyleBackColor = true; - this.scriptEditorNumberFormatNoPreference.CheckedChanged += new System.EventHandler(this.UpdateScriptNumberFormatNoPref); - // - // scriptEditorNumberFormatDecimal - // - this.scriptEditorNumberFormatDecimal.AutoSize = true; - this.scriptEditorNumberFormatDecimal.Location = new System.Drawing.Point(121, 14); - this.scriptEditorNumberFormatDecimal.Name = "scriptEditorNumberFormatDecimal"; - this.scriptEditorNumberFormatDecimal.Size = new System.Drawing.Size(63, 17); - this.scriptEditorNumberFormatDecimal.TabIndex = 35; - this.scriptEditorNumberFormatDecimal.Text = "Decimal"; - this.scriptEditorNumberFormatDecimal.UseVisualStyleBackColor = true; - this.scriptEditorNumberFormatDecimal.CheckedChanged += new System.EventHandler(this.UpdateScriptNumberFormatDec); - // - // scriptEditorNumberFormatHex - // - this.scriptEditorNumberFormatHex.AutoSize = true; - this.scriptEditorNumberFormatHex.Location = new System.Drawing.Point(68, 14); - this.scriptEditorNumberFormatHex.Name = "scriptEditorNumberFormatHex"; - this.scriptEditorNumberFormatHex.Size = new System.Drawing.Size(44, 17); - this.scriptEditorNumberFormatHex.TabIndex = 34; - this.scriptEditorNumberFormatHex.Text = "Hex"; - this.scriptEditorNumberFormatHex.UseVisualStyleBackColor = true; - this.scriptEditorNumberFormatHex.CheckedChanged += new System.EventHandler(this.UpdateScriptNumberFormatHex); - // - // scriptEditorWhitespacesCheckbox - // - this.scriptEditorWhitespacesCheckbox.Appearance = System.Windows.Forms.Appearance.Button; - this.scriptEditorWhitespacesCheckbox.AutoSize = true; - this.scriptEditorWhitespacesCheckbox.Location = new System.Drawing.Point(987, 12); - this.scriptEditorWhitespacesCheckbox.Name = "scriptEditorWhitespacesCheckbox"; - this.scriptEditorWhitespacesCheckbox.Size = new System.Drawing.Size(79, 23); - this.scriptEditorWhitespacesCheckbox.TabIndex = 46; - this.scriptEditorWhitespacesCheckbox.Text = "Whitespaces"; - this.scriptEditorWhitespacesCheckbox.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.scriptEditorWhitespacesCheckbox.UseVisualStyleBackColor = true; - this.scriptEditorWhitespacesCheckbox.CheckedChanged += new System.EventHandler(this.viewWhiteSpacesButton_Click); - // - // scriptEditorWordWrapCheckbox - // - this.scriptEditorWordWrapCheckbox.Appearance = System.Windows.Forms.Appearance.Button; - this.scriptEditorWordWrapCheckbox.AutoSize = true; - this.scriptEditorWordWrapCheckbox.Checked = true; - this.scriptEditorWordWrapCheckbox.CheckState = System.Windows.Forms.CheckState.Checked; - this.scriptEditorWordWrapCheckbox.Location = new System.Drawing.Point(913, 12); - this.scriptEditorWordWrapCheckbox.Name = "scriptEditorWordWrapCheckbox"; - this.scriptEditorWordWrapCheckbox.Size = new System.Drawing.Size(72, 23); - this.scriptEditorWordWrapCheckbox.TabIndex = 43; - this.scriptEditorWordWrapCheckbox.Text = "Word Wrap"; - this.scriptEditorWordWrapCheckbox.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.scriptEditorWordWrapCheckbox.UseVisualStyleBackColor = true; - this.scriptEditorWordWrapCheckbox.CheckedChanged += new System.EventHandler(this.scriptEditorWordWrapCheckbox_CheckedChanged); - // - // compressScriptTextButton - // - this.compressScriptTextButton.Image = global::DSPRE.Properties.Resources.compressArrow; - this.compressScriptTextButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.compressScriptTextButton.Location = new System.Drawing.Point(1141, 11); - this.compressScriptTextButton.Name = "compressScriptTextButton"; - this.compressScriptTextButton.Size = new System.Drawing.Size(24, 24); - this.compressScriptTextButton.TabIndex = 49; - this.compressScriptTextButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.compressScriptTextButton.UseVisualStyleBackColor = true; - this.compressScriptTextButton.Click += new System.EventHandler(this.ScriptEditorCollapseButton_Click); - // - // expandScriptTextButton - // - this.expandScriptTextButton.Image = global::DSPRE.Properties.Resources.expandArrow; - this.expandScriptTextButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.expandScriptTextButton.Location = new System.Drawing.Point(1113, 11); - this.expandScriptTextButton.Name = "expandScriptTextButton"; - this.expandScriptTextButton.Size = new System.Drawing.Size(24, 24); - this.expandScriptTextButton.TabIndex = 48; - this.expandScriptTextButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.expandScriptTextButton.UseVisualStyleBackColor = true; - this.expandScriptTextButton.Click += new System.EventHandler(this.ScriptEditorExpandButton_Click); - // - // openSearchScriptEditorButton - // - this.openSearchScriptEditorButton.Image = global::DSPRE.Properties.Resources.SearchMiniIcon; - this.openSearchScriptEditorButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.openSearchScriptEditorButton.Location = new System.Drawing.Point(1085, 11); - this.openSearchScriptEditorButton.Name = "openSearchScriptEditorButton"; - this.openSearchScriptEditorButton.Size = new System.Drawing.Size(24, 24); - this.openSearchScriptEditorButton.TabIndex = 47; - this.openSearchScriptEditorButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.openSearchScriptEditorButton.UseVisualStyleBackColor = true; - this.openSearchScriptEditorButton.Click += new System.EventHandler(this.openSearchScriptEditorButton_Click); - // - // groupBox24 - // - this.groupBox24.Controls.Add(this.SyncNavigatorCB); - this.groupBox24.Controls.Add(this.ScriptNavigatorTabControl); - this.groupBox24.Location = new System.Drawing.Point(9, 75); - this.groupBox24.Name = "groupBox24"; - this.groupBox24.Size = new System.Drawing.Size(472, 234); - this.groupBox24.TabIndex = 42; - this.groupBox24.TabStop = false; - this.groupBox24.Text = "Navigator"; - // - // SyncNavigatorCB - // - this.SyncNavigatorCB.Appearance = System.Windows.Forms.Appearance.Button; - this.SyncNavigatorCB.AutoSize = true; - this.SyncNavigatorCB.Checked = true; - this.SyncNavigatorCB.CheckState = System.Windows.Forms.CheckState.Checked; - this.SyncNavigatorCB.Location = new System.Drawing.Point(417, 11); - this.SyncNavigatorCB.Name = "SyncNavigatorCB"; - this.SyncNavigatorCB.Size = new System.Drawing.Size(41, 23); - this.SyncNavigatorCB.TabIndex = 43; - this.SyncNavigatorCB.Text = "Sync"; - this.SyncNavigatorCB.UseVisualStyleBackColor = true; - // - // ScriptNavigatorTabControl - // - this.ScriptNavigatorTabControl.Controls.Add(this.ScriptsNavTab); - this.ScriptNavigatorTabControl.Controls.Add(this.FunctionsNavTab); - this.ScriptNavigatorTabControl.Controls.Add(this.ActionsNavTab); - this.ScriptNavigatorTabControl.Location = new System.Drawing.Point(6, 16); - this.ScriptNavigatorTabControl.Name = "ScriptNavigatorTabControl"; - this.ScriptNavigatorTabControl.SelectedIndex = 0; - this.ScriptNavigatorTabControl.Size = new System.Drawing.Size(456, 209); - this.ScriptNavigatorTabControl.TabIndex = 18; - // - // ScriptsNavTab - // - this.ScriptsNavTab.Controls.Add(this.scriptsNavListbox); - this.ScriptsNavTab.Location = new System.Drawing.Point(4, 22); - this.ScriptsNavTab.Name = "ScriptsNavTab"; - this.ScriptsNavTab.Padding = new System.Windows.Forms.Padding(3); - this.ScriptsNavTab.Size = new System.Drawing.Size(448, 183); - this.ScriptsNavTab.TabIndex = 0; - this.ScriptsNavTab.Text = "Scripts"; - this.ScriptsNavTab.UseVisualStyleBackColor = true; - // - // scriptsNavListbox - // - this.scriptsNavListbox.Dock = System.Windows.Forms.DockStyle.Fill; - this.scriptsNavListbox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.scriptsNavListbox.ItemHeight = 15; - this.scriptsNavListbox.Location = new System.Drawing.Point(3, 3); - this.scriptsNavListbox.Name = "scriptsNavListbox"; - this.scriptsNavListbox.Size = new System.Drawing.Size(442, 177); - this.scriptsNavListbox.TabIndex = 18; - this.scriptsNavListbox.SelectedIndexChanged += new System.EventHandler(this.scriptsNavListbox_SelectedIndexChanged); - // - // FunctionsNavTab - // - this.FunctionsNavTab.Controls.Add(this.functionsNavListbox); - this.FunctionsNavTab.Location = new System.Drawing.Point(4, 22); - this.FunctionsNavTab.Name = "FunctionsNavTab"; - this.FunctionsNavTab.Padding = new System.Windows.Forms.Padding(3); - this.FunctionsNavTab.Size = new System.Drawing.Size(448, 183); - this.FunctionsNavTab.TabIndex = 1; - this.FunctionsNavTab.Text = "Functions"; - this.FunctionsNavTab.UseVisualStyleBackColor = true; - // - // functionsNavListbox - // - this.functionsNavListbox.Dock = System.Windows.Forms.DockStyle.Fill; - this.functionsNavListbox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.functionsNavListbox.ItemHeight = 15; - this.functionsNavListbox.Location = new System.Drawing.Point(3, 3); - this.functionsNavListbox.Name = "functionsNavListbox"; - this.functionsNavListbox.Size = new System.Drawing.Size(442, 177); - this.functionsNavListbox.TabIndex = 19; - this.functionsNavListbox.SelectedIndexChanged += new System.EventHandler(this.functionsNavListbox_SelectedIndexChanged); - // - // ActionsNavTab - // - this.ActionsNavTab.Controls.Add(this.actionsNavListbox); - this.ActionsNavTab.Location = new System.Drawing.Point(4, 22); - this.ActionsNavTab.Name = "ActionsNavTab"; - this.ActionsNavTab.Padding = new System.Windows.Forms.Padding(3); - this.ActionsNavTab.Size = new System.Drawing.Size(448, 183); - this.ActionsNavTab.TabIndex = 2; - this.ActionsNavTab.Text = "Actions"; - this.ActionsNavTab.UseVisualStyleBackColor = true; - // - // actionsNavListbox - // - this.actionsNavListbox.Dock = System.Windows.Forms.DockStyle.Fill; - this.actionsNavListbox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.actionsNavListbox.ItemHeight = 15; - this.actionsNavListbox.Location = new System.Drawing.Point(3, 3); - this.actionsNavListbox.Name = "actionsNavListbox"; - this.actionsNavListbox.Size = new System.Drawing.Size(442, 177); - this.actionsNavListbox.TabIndex = 19; - this.actionsNavListbox.SelectedIndexChanged += new System.EventHandler(this.actionsNavListbox_SelectedIndexChanged); - // - // groupBox8 - // - this.groupBox8.Controls.Add(this.searchOnlyCurrentScriptCheckBox); - this.groupBox8.Controls.Add(this.scriptSearchCaseSensitiveCheckBox); - this.groupBox8.Controls.Add(this.searchInScriptsTextBox); - this.groupBox8.Controls.Add(this.label31); - this.groupBox8.Controls.Add(this.searchProgressBar); - this.groupBox8.Controls.Add(this.label30); - this.groupBox8.Controls.Add(this.label29); - this.groupBox8.Controls.Add(this.searchInScriptsButton); - this.groupBox8.Controls.Add(this.searchInScriptsResultListBox); - this.groupBox8.Location = new System.Drawing.Point(8, 315); - this.groupBox8.Name = "groupBox8"; - this.groupBox8.Size = new System.Drawing.Size(472, 298); - this.groupBox8.TabIndex = 18; - this.groupBox8.TabStop = false; - this.groupBox8.Text = "Search for commands:"; - // - // searchOnlyCurrentScriptCheckBox - // - this.searchOnlyCurrentScriptCheckBox.AutoSize = true; - this.searchOnlyCurrentScriptCheckBox.Location = new System.Drawing.Point(281, 48); - this.searchOnlyCurrentScriptCheckBox.Name = "searchOnlyCurrentScriptCheckBox"; - this.searchOnlyCurrentScriptCheckBox.Size = new System.Drawing.Size(84, 17); - this.searchOnlyCurrentScriptCheckBox.TabIndex = 41; - this.searchOnlyCurrentScriptCheckBox.Text = "Only Current"; - this.searchOnlyCurrentScriptCheckBox.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.searchOnlyCurrentScriptCheckBox.UseVisualStyleBackColor = true; - // - // scriptSearchCaseSensitiveCheckBox - // - this.scriptSearchCaseSensitiveCheckBox.AutoSize = true; - this.scriptSearchCaseSensitiveCheckBox.Location = new System.Drawing.Point(281, 26); - this.scriptSearchCaseSensitiveCheckBox.Name = "scriptSearchCaseSensitiveCheckBox"; - this.scriptSearchCaseSensitiveCheckBox.Size = new System.Drawing.Size(83, 17); - this.scriptSearchCaseSensitiveCheckBox.TabIndex = 39; - this.scriptSearchCaseSensitiveCheckBox.Text = "Match Case"; - this.scriptSearchCaseSensitiveCheckBox.UseVisualStyleBackColor = true; - // - // searchInScriptsTextBox - // - this.searchInScriptsTextBox.Location = new System.Drawing.Point(11, 35); - this.searchInScriptsTextBox.Name = "searchInScriptsTextBox"; - this.searchInScriptsTextBox.Size = new System.Drawing.Size(255, 20); - this.searchInScriptsTextBox.TabIndex = 38; - this.searchInScriptsTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.searchInScriptsTextBox_KeyDown); - // - // label31 - // - this.label31.AutoSize = true; - this.label31.Location = new System.Drawing.Point(7, 248); - this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(48, 13); - this.label31.TabIndex = 37; - this.label31.Text = "Progress"; - // - // searchProgressBar - // - this.searchProgressBar.Location = new System.Drawing.Point(9, 264); - this.searchProgressBar.Name = "searchProgressBar"; - this.searchProgressBar.Size = new System.Drawing.Size(453, 23); - this.searchProgressBar.TabIndex = 36; - // - // label30 - // - this.label30.AutoSize = true; - this.label30.Location = new System.Drawing.Point(7, 63); - this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(42, 13); - this.label30.TabIndex = 35; - this.label30.Text = "Results"; - // - // label29 - // - this.label29.AutoSize = true; - this.label29.Location = new System.Drawing.Point(8, 18); - this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(77, 13); - this.label29.TabIndex = 33; - this.label29.Text = "Line to search:"; - // - // searchInScriptsButton - // - this.searchInScriptsButton.Image = global::DSPRE.Properties.Resources.SearchMiniIcon; - this.searchInScriptsButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.searchInScriptsButton.Location = new System.Drawing.Point(371, 26); - this.searchInScriptsButton.Name = "searchInScriptsButton"; - this.searchInScriptsButton.Size = new System.Drawing.Size(91, 36); - this.searchInScriptsButton.TabIndex = 32; - this.searchInScriptsButton.Text = "Search"; - this.searchInScriptsButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.searchInScriptsButton.UseVisualStyleBackColor = true; - this.searchInScriptsButton.Click += new System.EventHandler(this.searchInScriptsButton_Click); - // - // searchInScriptsResultListBox - // - this.searchInScriptsResultListBox.Location = new System.Drawing.Point(10, 79); - this.searchInScriptsResultListBox.Name = "searchInScriptsResultListBox"; - this.searchInScriptsResultListBox.Size = new System.Drawing.Size(452, 160); - this.searchInScriptsResultListBox.TabIndex = 17; - this.searchInScriptsResultListBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.searchInScriptsResultListBox_KeyDown); - this.searchInScriptsResultListBox.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.searchInScripts_GoToEntryResult); - // - // importScriptFileButton - // - this.importScriptFileButton.Image = global::DSPRE.Properties.Resources.importArrow; - this.importScriptFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.importScriptFileButton.Location = new System.Drawing.Point(170, 22); - this.importScriptFileButton.Name = "importScriptFileButton"; - this.importScriptFileButton.Size = new System.Drawing.Size(70, 52); - this.importScriptFileButton.TabIndex = 16; - this.importScriptFileButton.Text = "&Import\r\nFile"; - this.importScriptFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.importScriptFileButton.UseVisualStyleBackColor = true; - this.importScriptFileButton.Click += new System.EventHandler(this.importScriptFileButton_Click); - // - // exportScriptFileButton - // - this.exportScriptFileButton.Image = global::DSPRE.Properties.Resources.exportArrow; - this.exportScriptFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.exportScriptFileButton.Location = new System.Drawing.Point(245, 22); - this.exportScriptFileButton.Name = "exportScriptFileButton"; - this.exportScriptFileButton.Size = new System.Drawing.Size(70, 52); - this.exportScriptFileButton.TabIndex = 15; - this.exportScriptFileButton.Text = "&Export \r\nFile"; - this.exportScriptFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.exportScriptFileButton.UseVisualStyleBackColor = true; - this.exportScriptFileButton.Click += new System.EventHandler(this.exportScriptFileButton_Click); - // - // saveScriptFileButton - // - this.saveScriptFileButton.Image = global::DSPRE.Properties.Resources.saveButton; - this.saveScriptFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.saveScriptFileButton.Location = new System.Drawing.Point(12, 50); - this.saveScriptFileButton.Name = "saveScriptFileButton"; - this.saveScriptFileButton.Size = new System.Drawing.Size(154, 23); - this.saveScriptFileButton.TabIndex = 14; - this.saveScriptFileButton.Text = "&Save Current File"; - this.saveScriptFileButton.UseVisualStyleBackColor = true; - this.saveScriptFileButton.Click += new System.EventHandler(this.saveScriptFileButton_Click); - // - // removeScriptFileButton - // - this.removeScriptFileButton.Image = global::DSPRE.Properties.Resources.deleteIcon; - this.removeScriptFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeScriptFileButton.Location = new System.Drawing.Point(320, 49); - this.removeScriptFileButton.Name = "removeScriptFileButton"; - this.removeScriptFileButton.Size = new System.Drawing.Size(106, 25); - this.removeScriptFileButton.TabIndex = 13; - this.removeScriptFileButton.Text = "Remove Last"; - this.removeScriptFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.removeScriptFileButton.UseVisualStyleBackColor = true; - this.removeScriptFileButton.Click += new System.EventHandler(this.removeScriptFileButton_Click); - // - // addScriptFileButton - // - this.addScriptFileButton.Image = global::DSPRE.Properties.Resources.addIcon; - this.addScriptFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addScriptFileButton.Location = new System.Drawing.Point(320, 22); - this.addScriptFileButton.Name = "addScriptFileButton"; - this.addScriptFileButton.Size = new System.Drawing.Size(106, 25); - this.addScriptFileButton.TabIndex = 10; - this.addScriptFileButton.Text = "Add Script File"; - this.addScriptFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.addScriptFileButton.UseVisualStyleBackColor = true; - this.addScriptFileButton.Click += new System.EventHandler(this.addScriptFileButton_Click); - // - // scriptEditorTabControl - // - this.scriptEditorTabControl.Controls.Add(this.scriptsTabPage); - this.scriptEditorTabControl.Controls.Add(this.functionsTabPage); - this.scriptEditorTabControl.Controls.Add(this.actionsTabPage); - this.scriptEditorTabControl.Location = new System.Drawing.Point(487, 22); - this.scriptEditorTabControl.Name = "scriptEditorTabControl"; - this.scriptEditorTabControl.SelectedIndex = 0; - this.scriptEditorTabControl.Size = new System.Drawing.Size(692, 591); - this.scriptEditorTabControl.TabIndex = 5; - this.scriptEditorTabControl.SelectedIndexChanged += new System.EventHandler(this.scriptEditorTabControl_TabIndexChanged); - // - // scriptsTabPage - // - this.scriptsTabPage.Controls.Add(this.PanelSearchScripts); - this.scriptsTabPage.Controls.Add(this.scintillaScriptsPanel); - this.scriptsTabPage.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.scriptsTabPage.Location = new System.Drawing.Point(4, 22); - this.scriptsTabPage.Name = "scriptsTabPage"; - this.scriptsTabPage.Padding = new System.Windows.Forms.Padding(3); - this.scriptsTabPage.Size = new System.Drawing.Size(684, 565); - this.scriptsTabPage.TabIndex = 0; - this.scriptsTabPage.Text = "Scripts"; - this.scriptsTabPage.UseVisualStyleBackColor = true; - // - // PanelSearchScripts - // - this.PanelSearchScripts.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.PanelSearchScripts.BackColor = System.Drawing.Color.White; - this.PanelSearchScripts.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.PanelSearchScripts.Controls.Add(this.BtnNextSearchScript); - this.PanelSearchScripts.Controls.Add(this.BtnPrevSearchScript); - this.PanelSearchScripts.Controls.Add(this.BtnCloseSearchScript); - this.PanelSearchScripts.Controls.Add(this.panelSearchScriptTextBox); - this.PanelSearchScripts.Location = new System.Drawing.Point(386, 3); - this.PanelSearchScripts.Name = "PanelSearchScripts"; - this.PanelSearchScripts.Size = new System.Drawing.Size(292, 40); - this.PanelSearchScripts.TabIndex = 14; - this.PanelSearchScripts.Visible = false; - // - // BtnNextSearchScript - // - this.BtnNextSearchScript.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.BtnNextSearchScript.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.BtnNextSearchScript.ForeColor = System.Drawing.Color.White; - this.BtnNextSearchScript.Image = global::DSPRE.Properties.Resources.arrowdown; - this.BtnNextSearchScript.Location = new System.Drawing.Point(233, 4); - this.BtnNextSearchScript.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.BtnNextSearchScript.Name = "BtnNextSearchScript"; - this.BtnNextSearchScript.Size = new System.Drawing.Size(25, 30); - this.BtnNextSearchScript.TabIndex = 9; - this.BtnNextSearchScript.Tag = "Find next (Enter)"; - this.BtnNextSearchScript.UseVisualStyleBackColor = true; - this.BtnNextSearchScript.Click += new System.EventHandler(this.BtnNextSearchScript_Click); - // - // BtnPrevSearchScript - // - this.BtnPrevSearchScript.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.BtnPrevSearchScript.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.BtnPrevSearchScript.ForeColor = System.Drawing.Color.White; - this.BtnPrevSearchScript.Image = global::DSPRE.Properties.Resources.arrowup; - this.BtnPrevSearchScript.Location = new System.Drawing.Point(205, 4); - this.BtnPrevSearchScript.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.BtnPrevSearchScript.Name = "BtnPrevSearchScript"; - this.BtnPrevSearchScript.Size = new System.Drawing.Size(25, 30); - this.BtnPrevSearchScript.TabIndex = 8; - this.BtnPrevSearchScript.Tag = "Find previous (Shift+Enter)"; - this.BtnPrevSearchScript.UseVisualStyleBackColor = true; - this.BtnPrevSearchScript.Click += new System.EventHandler(this.BtnPrevSearchScript_Click); - // - // BtnCloseSearchScript - // - this.BtnCloseSearchScript.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.BtnCloseSearchScript.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.BtnCloseSearchScript.ForeColor = System.Drawing.Color.White; - this.BtnCloseSearchScript.Image = global::DSPRE.Properties.Resources.Cross; - this.BtnCloseSearchScript.Location = new System.Drawing.Point(261, 4); - this.BtnCloseSearchScript.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.BtnCloseSearchScript.Name = "BtnCloseSearchScript"; - this.BtnCloseSearchScript.Size = new System.Drawing.Size(25, 30); - this.BtnCloseSearchScript.TabIndex = 7; - this.BtnCloseSearchScript.Tag = "Close (Esc)"; - this.BtnCloseSearchScript.UseVisualStyleBackColor = true; - this.BtnCloseSearchScript.Click += new System.EventHandler(this.BtnCloseSearchScript_Click); - // - // panelSearchScriptTextBox - // - this.panelSearchScriptTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.panelSearchScriptTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.panelSearchScriptTextBox.Font = new System.Drawing.Font("Segoe UI", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.panelSearchScriptTextBox.Location = new System.Drawing.Point(10, 6); - this.panelSearchScriptTextBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.panelSearchScriptTextBox.Name = "panelSearchScriptTextBox"; - this.panelSearchScriptTextBox.Size = new System.Drawing.Size(189, 25); - this.panelSearchScriptTextBox.TabIndex = 6; - this.panelSearchScriptTextBox.TextChanged += new System.EventHandler(this.panelSearchScriptTextBox_TextChanged); - this.panelSearchScriptTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.scriptTxtSearch_KeyDown); - // - // scintillaScriptsPanel - // - this.scintillaScriptsPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.scintillaScriptsPanel.Location = new System.Drawing.Point(3, 3); - this.scintillaScriptsPanel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.scintillaScriptsPanel.Name = "scintillaScriptsPanel"; - this.scintillaScriptsPanel.Size = new System.Drawing.Size(678, 559); - this.scintillaScriptsPanel.TabIndex = 13; - // - // functionsTabPage - // - this.functionsTabPage.Controls.Add(this.PanelSearchFunctions); - this.functionsTabPage.Controls.Add(this.scintillaFunctionsPanel); - this.functionsTabPage.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.functionsTabPage.Location = new System.Drawing.Point(4, 22); - this.functionsTabPage.Name = "functionsTabPage"; - this.functionsTabPage.Padding = new System.Windows.Forms.Padding(3); - this.functionsTabPage.Size = new System.Drawing.Size(684, 565); - this.functionsTabPage.TabIndex = 1; - this.functionsTabPage.Text = "Functions"; - this.functionsTabPage.UseVisualStyleBackColor = true; - // - // PanelSearchFunctions - // - this.PanelSearchFunctions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.PanelSearchFunctions.BackColor = System.Drawing.Color.White; - this.PanelSearchFunctions.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.PanelSearchFunctions.Controls.Add(this.BtnNextSearchFunc); - this.PanelSearchFunctions.Controls.Add(this.BtnPrevSearchFunc); - this.PanelSearchFunctions.Controls.Add(this.BtnCloseSearchFunc); - this.PanelSearchFunctions.Controls.Add(this.panelSearchFunctionTextBox); - this.PanelSearchFunctions.Location = new System.Drawing.Point(386, 3); - this.PanelSearchFunctions.Name = "PanelSearchFunctions"; - this.PanelSearchFunctions.Size = new System.Drawing.Size(292, 40); - this.PanelSearchFunctions.TabIndex = 16; - this.PanelSearchFunctions.Visible = false; - // - // BtnNextSearchFunc - // - this.BtnNextSearchFunc.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.BtnNextSearchFunc.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.BtnNextSearchFunc.ForeColor = System.Drawing.Color.White; - this.BtnNextSearchFunc.Image = global::DSPRE.Properties.Resources.arrowdown; - this.BtnNextSearchFunc.Location = new System.Drawing.Point(233, 4); - this.BtnNextSearchFunc.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.BtnNextSearchFunc.Name = "BtnNextSearchFunc"; - this.BtnNextSearchFunc.Size = new System.Drawing.Size(25, 30); - this.BtnNextSearchFunc.TabIndex = 9; - this.BtnNextSearchFunc.Tag = "Find next (Enter)"; - this.BtnNextSearchFunc.UseVisualStyleBackColor = true; - this.BtnNextSearchFunc.Click += new System.EventHandler(this.BtnNextSearchFunc_Click); - // - // BtnPrevSearchFunc - // - this.BtnPrevSearchFunc.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.BtnPrevSearchFunc.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.BtnPrevSearchFunc.ForeColor = System.Drawing.Color.White; - this.BtnPrevSearchFunc.Image = global::DSPRE.Properties.Resources.arrowup; - this.BtnPrevSearchFunc.Location = new System.Drawing.Point(205, 4); - this.BtnPrevSearchFunc.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.BtnPrevSearchFunc.Name = "BtnPrevSearchFunc"; - this.BtnPrevSearchFunc.Size = new System.Drawing.Size(25, 30); - this.BtnPrevSearchFunc.TabIndex = 8; - this.BtnPrevSearchFunc.Tag = "Find previous (Shift+Enter)"; - this.BtnPrevSearchFunc.UseVisualStyleBackColor = true; - this.BtnPrevSearchFunc.Click += new System.EventHandler(this.BtnPrevSearchFunc_Click); - // - // BtnCloseSearchFunc - // - this.BtnCloseSearchFunc.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.BtnCloseSearchFunc.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.BtnCloseSearchFunc.ForeColor = System.Drawing.Color.White; - this.BtnCloseSearchFunc.Image = global::DSPRE.Properties.Resources.Cross; - this.BtnCloseSearchFunc.Location = new System.Drawing.Point(261, 4); - this.BtnCloseSearchFunc.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.BtnCloseSearchFunc.Name = "BtnCloseSearchFunc"; - this.BtnCloseSearchFunc.Size = new System.Drawing.Size(25, 30); - this.BtnCloseSearchFunc.TabIndex = 7; - this.BtnCloseSearchFunc.Tag = "Close (Esc)"; - this.BtnCloseSearchFunc.UseVisualStyleBackColor = true; - this.BtnCloseSearchFunc.Click += new System.EventHandler(this.BtnCloseSearchFunc_Click); - // - // panelSearchFunctionTextBox - // - this.panelSearchFunctionTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.panelSearchFunctionTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.panelSearchFunctionTextBox.Font = new System.Drawing.Font("Segoe UI", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.panelSearchFunctionTextBox.Location = new System.Drawing.Point(10, 6); - this.panelSearchFunctionTextBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.panelSearchFunctionTextBox.Name = "panelSearchFunctionTextBox"; - this.panelSearchFunctionTextBox.Size = new System.Drawing.Size(189, 25); - this.panelSearchFunctionTextBox.TabIndex = 6; - this.panelSearchFunctionTextBox.TextChanged += new System.EventHandler(this.panelSearchFunctionTextBox_TextChanged); - this.panelSearchFunctionTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.functionTxtSearch_KeyDown); - // - // scintillaFunctionsPanel - // - this.scintillaFunctionsPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.scintillaFunctionsPanel.Location = new System.Drawing.Point(3, 3); - this.scintillaFunctionsPanel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.scintillaFunctionsPanel.Name = "scintillaFunctionsPanel"; - this.scintillaFunctionsPanel.Size = new System.Drawing.Size(678, 559); - this.scintillaFunctionsPanel.TabIndex = 15; - // - // actionsTabPage - // - this.actionsTabPage.Controls.Add(this.PanelSearchActions); - this.actionsTabPage.Controls.Add(this.scintillaActionsPanel); - this.actionsTabPage.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.actionsTabPage.Location = new System.Drawing.Point(4, 22); - this.actionsTabPage.Name = "actionsTabPage"; - this.actionsTabPage.Padding = new System.Windows.Forms.Padding(3); - this.actionsTabPage.Size = new System.Drawing.Size(684, 565); - this.actionsTabPage.TabIndex = 2; - this.actionsTabPage.Text = "Actions"; - this.actionsTabPage.UseVisualStyleBackColor = true; - // - // PanelSearchActions - // - this.PanelSearchActions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.PanelSearchActions.BackColor = System.Drawing.Color.White; - this.PanelSearchActions.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.PanelSearchActions.Controls.Add(this.BtnNextSearchActions); - this.PanelSearchActions.Controls.Add(this.BtnPrevSearchActions); - this.PanelSearchActions.Controls.Add(this.BtnCloseSearchActions); - this.PanelSearchActions.Controls.Add(this.panelSearchActionTextBox); - this.PanelSearchActions.Location = new System.Drawing.Point(386, 3); - this.PanelSearchActions.Name = "PanelSearchActions"; - this.PanelSearchActions.Size = new System.Drawing.Size(292, 40); - this.PanelSearchActions.TabIndex = 16; - this.PanelSearchActions.Visible = false; - // - // BtnNextSearchActions - // - this.BtnNextSearchActions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.BtnNextSearchActions.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.BtnNextSearchActions.ForeColor = System.Drawing.Color.White; - this.BtnNextSearchActions.Image = global::DSPRE.Properties.Resources.arrowdown; - this.BtnNextSearchActions.Location = new System.Drawing.Point(233, 4); - this.BtnNextSearchActions.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.BtnNextSearchActions.Name = "BtnNextSearchActions"; - this.BtnNextSearchActions.Size = new System.Drawing.Size(25, 30); - this.BtnNextSearchActions.TabIndex = 9; - this.BtnNextSearchActions.Tag = "Find next (Enter)"; - this.BtnNextSearchActions.UseVisualStyleBackColor = true; - this.BtnNextSearchActions.Click += new System.EventHandler(this.BtnNextSearchActions_Click); - // - // BtnPrevSearchActions - // - this.BtnPrevSearchActions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.BtnPrevSearchActions.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.BtnPrevSearchActions.ForeColor = System.Drawing.Color.White; - this.BtnPrevSearchActions.Image = global::DSPRE.Properties.Resources.arrowup; - this.BtnPrevSearchActions.Location = new System.Drawing.Point(205, 4); - this.BtnPrevSearchActions.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.BtnPrevSearchActions.Name = "BtnPrevSearchActions"; - this.BtnPrevSearchActions.Size = new System.Drawing.Size(25, 30); - this.BtnPrevSearchActions.TabIndex = 8; - this.BtnPrevSearchActions.Tag = "Find previous (Shift+Enter)"; - this.BtnPrevSearchActions.UseVisualStyleBackColor = true; - this.BtnPrevSearchActions.Click += new System.EventHandler(this.BtnPrevSearchActions_Click); - // - // BtnCloseSearchActions - // - this.BtnCloseSearchActions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.BtnCloseSearchActions.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.BtnCloseSearchActions.ForeColor = System.Drawing.Color.White; - this.BtnCloseSearchActions.Image = global::DSPRE.Properties.Resources.Cross; - this.BtnCloseSearchActions.Location = new System.Drawing.Point(261, 4); - this.BtnCloseSearchActions.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.BtnCloseSearchActions.Name = "BtnCloseSearchActions"; - this.BtnCloseSearchActions.Size = new System.Drawing.Size(25, 30); - this.BtnCloseSearchActions.TabIndex = 7; - this.BtnCloseSearchActions.Tag = "Close (Esc)"; - this.BtnCloseSearchActions.UseVisualStyleBackColor = true; - this.BtnCloseSearchActions.Click += new System.EventHandler(this.BtnCloseSearchActions_Click); - // - // panelSearchActionTextBox - // - this.panelSearchActionTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.panelSearchActionTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.panelSearchActionTextBox.Font = new System.Drawing.Font("Segoe UI", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.panelSearchActionTextBox.Location = new System.Drawing.Point(10, 6); - this.panelSearchActionTextBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.panelSearchActionTextBox.Name = "panelSearchActionTextBox"; - this.panelSearchActionTextBox.Size = new System.Drawing.Size(189, 25); - this.panelSearchActionTextBox.TabIndex = 6; - this.panelSearchActionTextBox.TextChanged += new System.EventHandler(this.panelSearchActionTextBox_TextChanged); - this.panelSearchActionTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.actiontTxtSearch_KeyDown); - // - // scintillaActionsPanel - // - this.scintillaActionsPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.scintillaActionsPanel.Location = new System.Drawing.Point(3, 3); - this.scintillaActionsPanel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.scintillaActionsPanel.Name = "scintillaActionsPanel"; - this.scintillaActionsPanel.Size = new System.Drawing.Size(678, 559); - this.scintillaActionsPanel.TabIndex = 15; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(11, 8); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(53, 13); - this.label5.TabIndex = 1; - this.label5.Text = "Script File"; - // - // selectScriptFileComboBox - // - this.selectScriptFileComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.selectScriptFileComboBox.FormattingEnabled = true; - this.selectScriptFileComboBox.Location = new System.Drawing.Point(13, 24); - this.selectScriptFileComboBox.Name = "selectScriptFileComboBox"; - this.selectScriptFileComboBox.Size = new System.Drawing.Size(152, 21); - this.selectScriptFileComboBox.TabIndex = 0; - this.selectScriptFileComboBox.SelectedIndexChanged += new System.EventHandler(this.selectScriptFileComboBox_SelectedIndexChanged); - // // textEditorTabPage // this.textEditorTabPage.Controls.Add(this.tableLayoutPanel1); @@ -8132,8 +7312,8 @@ this.textEditorDataGridView.Location = new System.Drawing.Point(12, 77); this.textEditorDataGridView.Name = "textEditorDataGridView"; this.textEditorDataGridView.RowHeadersWidth = 68; - dataGridViewCellStyle15.Font = new System.Drawing.Font("Consolas", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textEditorDataGridView.RowsDefaultCellStyle = dataGridViewCellStyle15; + dataGridViewCellStyle47.Font = new System.Drawing.Font("Consolas", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textEditorDataGridView.RowsDefaultCellStyle = dataGridViewCellStyle47; this.textEditorDataGridView.Size = new System.Drawing.Size(873, 500); this.textEditorDataGridView.TabIndex = 24; this.textEditorDataGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.textEditorDataGridView_CellValueChanged); @@ -8236,9 +7416,9 @@ this.cameraEditorDataGridView.CausesValidation = false; this.cameraEditorDataGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised; this.cameraEditorDataGridView.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - 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; + dataGridViewCellStyle48.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle48.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.cameraEditorDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle48; this.cameraEditorDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.cameraEditorDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.DistanceGVCol, @@ -10853,6 +10033,29 @@ this.conditionalMusicTableListBox.TabIndex = 0; this.conditionalMusicTableListBox.SelectedIndexChanged += new System.EventHandler(this.conditionalMusicTableListBox_SelectedIndexChanged); // + // tabPageScriptEditor + // + this.tabPageScriptEditor.Controls.Add(this.scriptEditor); + this.tabPageScriptEditor.ImageIndex = 5; + this.tabPageScriptEditor.Location = new System.Drawing.Point(4, 23); + this.tabPageScriptEditor.Name = "tabPageScriptEditor"; + this.tabPageScriptEditor.Padding = new System.Windows.Forms.Padding(3); + this.tabPageScriptEditor.Size = new System.Drawing.Size(1185, 633); + this.tabPageScriptEditor.TabIndex = 10; + this.tabPageScriptEditor.Text = "Script Editor New"; + this.tabPageScriptEditor.UseVisualStyleBackColor = true; + // + // tabPageLevelScriptEditor + // + this.tabPageLevelScriptEditor.Controls.Add(this.levelScriptEditor); + this.tabPageLevelScriptEditor.Location = new System.Drawing.Point(4, 23); + this.tabPageLevelScriptEditor.Name = "tabPageLevelScriptEditor"; + this.tabPageLevelScriptEditor.Padding = new System.Windows.Forms.Padding(3); + this.tabPageLevelScriptEditor.Size = new System.Drawing.Size(1185, 633); + this.tabPageLevelScriptEditor.TabIndex = 11; + this.tabPageLevelScriptEditor.Text = "Level Script Editor"; + this.tabPageLevelScriptEditor.UseVisualStyleBackColor = true; + // // mainTabImageList // this.mainTabImageList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("mainTabImageList.ImageStream"))); @@ -11226,16 +10429,16 @@ this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.statusLabel, this.toolStripProgressBar}); - this.statusStrip1.Location = new System.Drawing.Point(0, 737); + this.statusStrip1.Location = new System.Drawing.Point(0, 739); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(1214, 24); + this.statusStrip1.Size = new System.Drawing.Size(1214, 22); this.statusStrip1.TabIndex = 13; this.statusStrip1.Text = "statusStrip1"; // // statusLabel // this.statusLabel.Name = "statusLabel"; - this.statusLabel.Size = new System.Drawing.Size(39, 19); + this.statusLabel.Size = new System.Drawing.Size(39, 17); this.statusLabel.Text = "Ready"; // // toolStripProgressBar @@ -11585,6 +10788,23 @@ this.versionLabel.Text = "ROM:"; this.versionLabel.Visible = false; // + // scriptEditor + // + this.scriptEditor.Location = new System.Drawing.Point(2, 3); + this.scriptEditor.Name = "scriptEditor"; + this.scriptEditor.scriptEditorIsReady = false; + this.scriptEditor.Size = new System.Drawing.Size(1177, 735); + this.scriptEditor.TabIndex = 0; + // + // levelScriptEditor + // + this.levelScriptEditor.BackColor = System.Drawing.SystemColors.Control; + this.levelScriptEditor.levelScriptEditorIsReady = false; + this.levelScriptEditor.Location = new System.Drawing.Point(6, 8); + this.levelScriptEditor.Name = "levelScriptEditor"; + this.levelScriptEditor.Size = new System.Drawing.Size(408, 622); + this.levelScriptEditor.TabIndex = 0; + // // MainProgram // this.AllowDrop = true; @@ -11804,28 +11024,6 @@ ((System.ComponentModel.ISupportInitialize)(this.rightClickPicture)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.wheelClickPicture)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.LeftClickPicture)).EndInit(); - this.scriptEditorTabPage.ResumeLayout(false); - this.scriptEditorTabPage.PerformLayout(); - this.groupBox26.ResumeLayout(false); - this.groupBox26.PerformLayout(); - this.groupBox24.ResumeLayout(false); - this.groupBox24.PerformLayout(); - this.ScriptNavigatorTabControl.ResumeLayout(false); - this.ScriptsNavTab.ResumeLayout(false); - this.FunctionsNavTab.ResumeLayout(false); - this.ActionsNavTab.ResumeLayout(false); - this.groupBox8.ResumeLayout(false); - this.groupBox8.PerformLayout(); - this.scriptEditorTabControl.ResumeLayout(false); - this.scriptsTabPage.ResumeLayout(false); - this.PanelSearchScripts.ResumeLayout(false); - this.PanelSearchScripts.PerformLayout(); - this.functionsTabPage.ResumeLayout(false); - this.PanelSearchFunctions.ResumeLayout(false); - this.PanelSearchFunctions.PerformLayout(); - this.actionsTabPage.ResumeLayout(false); - this.PanelSearchActions.ResumeLayout(false); - this.PanelSearchActions.PerformLayout(); this.textEditorTabPage.ResumeLayout(false); this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); @@ -11921,6 +11119,8 @@ this.conditionalMusicGroupBox.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.musicIDconditionalMusicUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.flagConditionalMusicUpDown)).EndInit(); + this.tabPageScriptEditor.ResumeLayout(false); + this.tabPageLevelScriptEditor.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gameIcon)).EndInit(); this.menuStrip1.ResumeLayout(false); this.menuStrip1.PerformLayout(); @@ -11934,7 +11134,6 @@ } #endregion - private System.Windows.Forms.TabControl mainTabControl; private System.Windows.Forms.TabPage matrixEditorTabPage; private System.Windows.Forms.PictureBox gameIcon; private System.Windows.Forms.Label languageLabel; @@ -12047,7 +11246,6 @@ private System.Windows.Forms.ComboBox selectEventComboBox; private System.Windows.Forms.Label signScriptNumberLabel; private System.Windows.Forms.NumericUpDown spawnableScriptUpDown; - private System.Windows.Forms.TabPage scriptEditorTabPage; private System.Windows.Forms.TabPage textEditorTabPage; private System.Windows.Forms.ListBox warpsListBox; private System.Windows.Forms.ListBox triggersListBox; @@ -12092,17 +11290,6 @@ private System.Windows.Forms.NumericUpDown triggerScriptUpDown; private System.Windows.Forms.Label label28; private System.Windows.Forms.NumericUpDown triggerVariableWatchedUpDown; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.ComboBox selectScriptFileComboBox; - private System.Windows.Forms.TabControl scriptEditorTabControl; - private System.Windows.Forms.TabPage scriptsTabPage; - private System.Windows.Forms.TabPage functionsTabPage; - private System.Windows.Forms.TabPage actionsTabPage; - private System.Windows.Forms.Button addScriptFileButton; - private System.Windows.Forms.Button saveScriptFileButton; - private System.Windows.Forms.Button removeScriptFileButton; - private System.Windows.Forms.Button importScriptFileButton; - private System.Windows.Forms.Button exportScriptFileButton; private System.Windows.Forms.Button removeEventFileButton; private System.Windows.Forms.Button addEventFileButton; private System.Windows.Forms.Button removeMatrixButton; @@ -12126,13 +11313,6 @@ private System.Windows.Forms.CheckBox caseSensitiveTextSearchCheckbox; private System.Windows.Forms.ProgressBar textSearchProgressBar; private System.Windows.Forms.Label label8; - private System.Windows.Forms.ListBox searchInScriptsResultListBox; - private System.Windows.Forms.GroupBox groupBox8; - private System.Windows.Forms.Label label29; - private System.Windows.Forms.Button searchInScriptsButton; - private System.Windows.Forms.Label label30; - private System.Windows.Forms.Label label31; - private System.Windows.Forms.ProgressBar searchProgressBar; private System.Windows.Forms.ToolStripButton wildEditorButton; private System.Windows.Forms.TabPage nsbtxEditorTabPage; private System.Windows.Forms.GroupBox areaDataGroupBox; @@ -12170,7 +11350,6 @@ private System.Windows.Forms.Button addMapFileButton; private System.Windows.Forms.Label replaceTextLabel; private System.Windows.Forms.TextBox replaceMessageTextBox; - private System.Windows.Forms.TextBox searchInScriptsTextBox; private System.Windows.Forms.TabPage headerEditorTabPage; private System.Windows.Forms.GroupBox groupBox10; private System.Windows.Forms.Button openMessageFileButton; @@ -12211,7 +11390,6 @@ private System.Windows.Forms.Label levelScriptLabel; private System.Windows.Forms.Button openScriptButton; private System.Windows.Forms.Label scriptLabel; - private System.Windows.Forms.NumericUpDown scriptFileUpDown; private System.Windows.Forms.ListBox headerListBox; private System.Windows.Forms.Button saveHeaderButton; private System.Windows.Forms.GroupBox groupBox4; @@ -12369,7 +11547,6 @@ private System.Windows.Forms.Button resetColorTableButton; private System.Windows.Forms.Button duplicateBuildingButton; private System.Windows.Forms.Button replaceMapBinButton; - private System.Windows.Forms.CheckBox scriptSearchCaseSensitiveCheckBox; private System.Windows.Forms.GroupBox worldmapCoordsGroupBox; private System.Windows.Forms.Label label1; private System.Windows.Forms.NumericUpDown worldmapYCoordUpDown; @@ -12436,8 +11613,6 @@ private System.Windows.Forms.ToolStripButton nsbmdAddTexButton; private System.Windows.Forms.ToolStripSeparator separator_afterMiscButtons; private System.Windows.Forms.CheckBox embedTexturesInMapModelCheckBox; - private System.Windows.Forms.CheckBox searchOnlyCurrentScriptCheckBox; - private System.Windows.Forms.Button clearCurrentLevelScriptButton; private System.Windows.Forms.GroupBox bldRoundGroupbox; private System.Windows.Forms.RadioButton bldRoundDecmil; private System.Windows.Forms.RadioButton bldRoundMil; @@ -12463,15 +11638,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn ZDispGVCol; private System.Windows.Forms.DataGridViewButtonColumn ExportBTN; private System.Windows.Forms.DataGridViewButtonColumn ImportBTN; - private System.Windows.Forms.GroupBox groupBox24; - private System.Windows.Forms.TabControl ScriptNavigatorTabControl; - private System.Windows.Forms.TabPage ScriptsNavTab; - private System.Windows.Forms.ListBox scriptsNavListbox; - private System.Windows.Forms.TabPage FunctionsNavTab; - private System.Windows.Forms.ListBox functionsNavListbox; - private System.Windows.Forms.TabPage ActionsNavTab; - private System.Windows.Forms.ListBox actionsNavListbox; - private System.Windows.Forms.CheckBox SyncNavigatorCB; private System.Windows.Forms.Button removeLastHeaderBTN; private System.Windows.Forms.Button addHeaderBTN; private System.Windows.Forms.NumericUpDown cameraUpDown; @@ -12660,34 +11826,7 @@ private System.Windows.Forms.NumericUpDown tbEditorTrClassFramePreviewUpDown; private System.Windows.Forms.PictureBox tbEditorPokeminiPictureBox; private System.Windows.Forms.ToolStripMenuItem openFolderToolStripMenuItem; - private System.Windows.Forms.Panel PanelSearchScripts; - private System.Windows.Forms.Button BtnNextSearchScript; - private System.Windows.Forms.Button BtnPrevSearchScript; - private System.Windows.Forms.Button BtnCloseSearchScript; - private System.Windows.Forms.TextBox panelSearchScriptTextBox; - private System.Windows.Forms.Panel scintillaScriptsPanel; - private System.Windows.Forms.Panel PanelSearchFunctions; - private System.Windows.Forms.Button BtnNextSearchFunc; - private System.Windows.Forms.Button BtnPrevSearchFunc; - private System.Windows.Forms.Button BtnCloseSearchFunc; - private System.Windows.Forms.TextBox panelSearchFunctionTextBox; - private System.Windows.Forms.Panel scintillaFunctionsPanel; - private System.Windows.Forms.Panel PanelSearchActions; - private System.Windows.Forms.Button BtnNextSearchActions; - private System.Windows.Forms.Button BtnPrevSearchActions; - private System.Windows.Forms.Button BtnCloseSearchActions; - private System.Windows.Forms.TextBox panelSearchActionTextBox; - private System.Windows.Forms.Panel scintillaActionsPanel; - private System.Windows.Forms.CheckBox scriptEditorWhitespacesCheckbox; - private System.Windows.Forms.CheckBox scriptEditorWordWrapCheckbox; - private System.Windows.Forms.Button openSearchScriptEditorButton; - private System.Windows.Forms.Button compressScriptTextButton; - private System.Windows.Forms.Button expandScriptTextButton; private System.Windows.Forms.Button itemsSelectorHelpBtn; - private System.Windows.Forms.GroupBox groupBox26; - private System.Windows.Forms.RadioButton scriptEditorNumberFormatNoPreference; - private System.Windows.Forms.RadioButton scriptEditorNumberFormatDecimal; - private System.Windows.Forms.RadioButton scriptEditorNumberFormatHex; private System.Windows.Forms.Button deleteTrainerButton; private System.Windows.Forms.Label label67; private System.Windows.Forms.ToolStripMenuItem NarcUtilityToolStripMenuItem; @@ -12732,7 +11871,6 @@ private System.Windows.Forms.Button locateCurrentNsbtx; private System.Windows.Forms.Button locateCurrentAreaData; private System.Windows.Forms.Button locateCurrentEvFile; - private System.Windows.Forms.Button locateCurrentScriptFile; private System.Windows.Forms.Button locateCurrentTextArchive; private System.Windows.Forms.GroupBox groupBox31; private System.Windows.Forms.Label label75; @@ -12793,6 +11931,12 @@ private System.Windows.Forms.ToolStripMenuItem evolutionsEditorToolStripMenuItem; public System.Windows.Forms.ToolStripStatusLabel statusLabel; public System.Windows.Forms.ToolStripProgressBar toolStripProgressBar; + public System.Windows.Forms.TabPage tabPageScriptEditor; + public System.Windows.Forms.TabPage tabPageLevelScriptEditor; + public Editors.ScriptEditor scriptEditor; + public DSPRE.Editors.LevelScriptEditor levelScriptEditor; + public System.Windows.Forms.TabControl mainTabControl; + public System.Windows.Forms.NumericUpDown scriptFileUpDown; } } diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index f70f808..bc90567 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -25,11 +25,15 @@ using static DSPRE.ROMFiles.Event; using NSMBe4.NSBMD; using static DSPRE.ROMFiles.SpeciesFile; using System.Reflection; +using System.ComponentModel; +using DSPRE.Editors; namespace DSPRE { public partial class MainProgram : Form { public MainProgram() { InitializeComponent(); + EditorPanels.Initialize(this); + Helpers.Initialize(this); SetMenuLayout(Properties.Settings.Default.menuLayout); //Read user settings for menu layout Text = "DS Pokémon Rom Editor Reloaded " + GetDSPREVersion() + " (Nømura, AdAstra/LD3005, Mixone)"; } @@ -216,14 +220,14 @@ namespace DSPRE { DSUtils.TryUnpackNarcs(new List { DirNames.scripts }); //12 = scripts Narc Dir - selectScriptFileComboBox.Items.Clear(); + EditorPanels.scriptEditor.selectScriptFileComboBox.Items.Clear(); int scriptCount = Directory.GetFiles(RomInfo.gameDirs[DirNames.scripts].unpackedDir).Length; for (int i = 0; i < scriptCount; i++) { - selectScriptFileComboBox.Items.Add("Script File " + i); + EditorPanels.scriptEditor.selectScriptFileComboBox.Items.Add("Script File " + i); } - UpdateScriptNumberCheckBox((NumberStyles)Properties.Settings.Default.scriptEditorFormatPreference); - selectScriptFileComboBox.SelectedIndex = 0; + EditorPanels.scriptEditor.UpdateScriptNumberCheckBox((NumberStyles)Properties.Settings.Default.scriptEditorFormatPreference); + EditorPanels.scriptEditor.selectScriptFileComboBox.SelectedIndex = 0; Helpers.statusLabelMessage(); } private void SetupTextEditor() { @@ -531,6 +535,7 @@ namespace DSPRE { SetupROMLanguage(openRom.FileName); /* Set ROM gameVersion and language */ romInfo = new RomInfo(gameCode, openRom.FileName, useSuffix: true); + Helpers.romInfo = new RomInfo(gameCode, openRom.FileName, useSuffix: true); if (string.IsNullOrWhiteSpace(RomInfo.romID) || string.IsNullOrWhiteSpace(RomInfo.fileName)) { return; @@ -584,7 +589,7 @@ namespace DSPRE { Update(); for (int i = 0; i < 128; i++) { if (DSUtils.OverlayIsCompressed(i)) { - DSUtils.DecompressOverlay(i); + //DSUtils.DecompressOverlay(i); } } ReadROMInitData(); @@ -786,7 +791,6 @@ namespace DSPRE { SetupMapEditor(); SetupNSBTXEditor(); SetupEventEditor(); - SetupScriptEditorTextAreas(); SetupScriptEditor(); SetupTextEditor(); SetupTrainerEditor(); @@ -852,12 +856,6 @@ namespace DSPRE { SetupEventEditor(); eventEditorIsReady = true; } - } else if (mainTabControl.SelectedTab == scriptEditorTabPage) { - if (!scriptEditorIsReady) { - SetupScriptEditorTextAreas(); - SetupScriptEditor(); - scriptEditorIsReady = true; - } } else if (mainTabControl.SelectedTab == textEditorTabPage) { if (!textEditorIsReady) { SetupTextEditor(); @@ -883,6 +881,14 @@ namespace DSPRE { } } + private void tabPageScriptEditor_Enter(object sender, EventArgs e) { + scriptEditor.SetupScriptEditor(this); + } + + private void tabPageLevelScriptEditor_Enter(object sender, EventArgs e) { + levelScriptEditor.SetUpLevelScriptEditor(this); + } + private void spawnEditorToolStripButton_Click(object sender, EventArgs e) { if (!matrixEditorIsReady) { SetupMatrixEditor(); @@ -1375,6 +1381,15 @@ namespace DSPRE { } currentHeader.matrixID = (ushort)matrixUpDown.Value; } + + private void openScriptButton_Click(object sender, EventArgs e) { + EditorPanels.scriptEditor.OpenScriptEditor(this, (int)scriptFileUpDown.Value); + } + + private void openLevelScriptButton_Click(object sender, EventArgs e) { + EditorPanels.levelScriptEditor.OpenLevelScriptEditor(this, (int)levelScriptUpDown.Value); + } + private void musicDayComboBox_SelectedIndexChanged(object sender, EventArgs e) { if (Helpers.HandlersDisabled) { return; @@ -5326,7 +5341,7 @@ namespace DSPRE { } else { ScriptFile itemScript = new ScriptFile(RomInfo.itemScriptFileNumber); owItemComboBox.Items.Clear(); - foreach (CommandContainer cont in itemScript.allScripts) { + foreach (ScriptCommandContainer cont in itemScript.allScripts) { if (cont.commands.Count > 4) { continue; } @@ -6665,967 +6680,6 @@ namespace DSPRE { #endregion #endregion - #region Script Editor - #region Variables - //private static Mutex tooltipMutex = new Mutex(); - //private ScriptTooltip customTooltip; - - private bool scriptsDirty = false; - private bool functionsDirty = false; - private bool actionsDirty = false; - - private string cmdKeyWords = ""; - private string secondaryKeyWords = ""; - private ScriptFile currentScriptFile; - #endregion - #region Helper Methods - private ScintillaNET.Scintilla ScriptTextArea; - private ScintillaNET.Scintilla FunctionTextArea; - private ScintillaNET.Scintilla ActionTextArea; - - private SearchManager scriptSearchManager; - private SearchManager functionSearchManager; - private SearchManager actionSearchManager; - - private Scintilla currentScintillaEditor; - private SearchManager currentSearchManager; - private void ScriptEditorSetClean() { - Helpers.DisableHandlers(); - - scriptsTabPage.Text = ScriptFile.containerTypes.Script.ToString() + "s"; - functionsTabPage.Text = ScriptFile.containerTypes.Function.ToString() + "s"; - actionsTabPage.Text = ScriptFile.containerTypes.Action.ToString() + "s"; - scriptsDirty = functionsDirty = actionsDirty = false; - - Helpers.EnableHandlers(); - } - private void scriptEditorTabControl_TabIndexChanged(object sender, EventArgs e) { - if (scriptEditorTabControl.SelectedTab == scriptsTabPage) { - currentSearchManager = scriptSearchManager; - currentScintillaEditor = ScriptTextArea; - } else if (scriptEditorTabControl.SelectedTab == functionsTabPage) { - currentSearchManager = functionSearchManager; - currentScintillaEditor = FunctionTextArea; - } else { //Actions - currentSearchManager = actionSearchManager; - currentScintillaEditor = ActionTextArea; - } - } - private void SetupScriptEditorTextAreas() { - //PREPARE SCRIPT EDITOR KEYWORDS - cmdKeyWords = String.Join(" ", ScriptCommandNamesDict.Values) + - " " + String.Join(" ", ScriptDatabase.movementsDictIDName.Values); - cmdKeyWords += " " + cmdKeyWords.ToUpper() + " " + cmdKeyWords.ToLower(); - - secondaryKeyWords = String.Join(" ", RomInfo.ScriptComparisonOperatorsDict.Values) + - " " + String.Join(" ", ScriptDatabase.specialOverworlds.Values) + - " " + String.Join(" ", ScriptDatabase.overworldDirections.Values) + - " " + ScriptFile.containerTypes.Script.ToString() + - " " + ScriptFile.containerTypes.Function.ToString() + - " " + ScriptFile.containerTypes.Action.ToString() + - " " + EventType.Overworld + - " " + Overworld.MovementCodeKW; - secondaryKeyWords += " " + secondaryKeyWords.ToUpper() + " " + secondaryKeyWords.ToLower(); - - - // CREATE CONTROLS - ScriptTextArea = new ScintillaNET.Scintilla(); - scriptSearchManager = new SearchManager(this, ScriptTextArea, panelSearchScriptTextBox, PanelSearchScripts); - scintillaScriptsPanel.Controls.Clear(); - scintillaScriptsPanel.Controls.Add(ScriptTextArea); - - FunctionTextArea = new ScintillaNET.Scintilla(); - functionSearchManager = new SearchManager(this, FunctionTextArea, panelSearchFunctionTextBox, PanelSearchFunctions); - scintillaFunctionsPanel.Controls.Clear(); - scintillaFunctionsPanel.Controls.Add(FunctionTextArea); - - ActionTextArea = new ScintillaNET.Scintilla(); - actionSearchManager = new SearchManager(this, ActionTextArea, panelSearchActionTextBox, PanelSearchActions); - scintillaActionsPanel.Controls.Clear(); - scintillaActionsPanel.Controls.Add(ActionTextArea); - - currentScintillaEditor = ScriptTextArea; - currentSearchManager = scriptSearchManager; - - // BASIC CONFIG - ScriptTextArea.TextChanged += (this.OnTextChangedScript); - FunctionTextArea.TextChanged += (this.OnTextChangedFunction); - ActionTextArea.TextChanged += (this.OnTextChangedAction); - - // INITIAL VIEW CONFIG - InitialViewConfig(ScriptTextArea); - InitialViewConfig(FunctionTextArea); - InitialViewConfig(ActionTextArea); - - InitSyntaxColoring(ScriptTextArea); - InitSyntaxColoring(FunctionTextArea); - InitSyntaxColoring(ActionTextArea); - - // NUMBER MARGIN - InitNumberMargin(ScriptTextArea, ScriptTextArea_MarginClick); - InitNumberMargin(FunctionTextArea, FunctionTextArea_MarginClick); - InitNumberMargin(ActionTextArea, ActionTextArea_MarginClick); - - // BOOKMARK MARGIN - InitBookmarkMargin(ScriptTextArea); - InitBookmarkMargin(FunctionTextArea); - InitBookmarkMargin(ActionTextArea); - - // CODE FOLDING MARGIN - InitCodeFolding(ScriptTextArea); - InitCodeFolding(FunctionTextArea); - InitCodeFolding(ActionTextArea); - - // INIT HOTKEYS - InitHotkeys(ScriptTextArea, scriptSearchManager); - InitHotkeys(FunctionTextArea, functionSearchManager); - InitHotkeys(ActionTextArea, actionSearchManager); - - // INIT TOOLTIPS DWELLING - /* - ScriptTextArea.MouseDwellTime = 300; - ScriptTextArea.DwellEnd += TextArea_DwellEnd; - ScriptTextArea.DwellStart += TextArea_DwellStart; - - FunctionTextArea.MouseDwellTime = 300; - FunctionTextArea.DwellEnd += TextArea_DwellEnd; - FunctionTextArea.DwellStart += TextArea_DwellStart; - */ - } - - /* - private void TextArea_DwellStart(object sender, DwellEventArgs e) { - TextArea_DwellEnd(sender, e); - Scintilla ctr = sender as Scintilla; - string hoveredWord = ctr.GetWordFromPosition(e.Position); - ushort cmdID; - - string commandName = ""; - if (RomInfo.ScriptCommandNamesReverseDict.TryGetValue(hoveredWord, out cmdID)) { - commandName = hoveredWord; - } else { - if (!ushort.TryParse(hoveredWord, NumberStyles.HexNumber, new CultureInfo("en-US"), out cmdID)) { - return; - } - } - string tip = ""; - - tooltipMutex.WaitOne(); - tip += cmdID.ToString("X4") + ": " + commandName + "("; - byte[] parameters = ScriptCommandParametersDict[cmdID]; - for (int i = 0; i < parameters.Length; i++) { - if (parameters[i] == 0) { - break; - } else if (parameters[i] == 1) { - tip += "byte"; - } else { - tip += "uint" + 8 * parameters[i]; - } - if (i != parameters.Length - 1) { - tip += ", "; - } - } - tip += ")"; - tip += Environment.NewLine + "Command descriptions aren't available yet."; - - Point globalCtrCoords = ctr.PointToScreen(ctr.Location); - Point incrementedCoords = new Point(globalCtrCoords.X + e.X, globalCtrCoords.Y + e.Y); - - customTooltip = new ScriptTooltip(cmdKeyWords, tip); - customTooltip.Visible = false; - customTooltip.Show(); - - int newy = incrementedCoords.Y - customTooltip.Size.Height - 5; - customTooltip.Location = new Point(incrementedCoords.X, newy); - customTooltip.BringToFront(); - customTooltip.Visible = true; - Thread t = new Thread(() => { - customTooltip.Invoke((MethodInvoker)delegate { - customTooltip.ctrl.Visible = true; - customTooltip.FadeIn(16, 9); - customTooltip.WriteText(4); - }); - }); - t.Start(); - tooltipMutex.ReleaseMutex(); - } - private void TextArea_DwellEnd(object sender, DwellEventArgs e) { - if (customTooltip != null && !customTooltip.IsDisposed) { - tooltipMutex.WaitOne(); - Thread t = new Thread(() => { - customTooltip.Invoke((MethodInvoker)delegate { - customTooltip.FadeOut(16, 9); - customTooltip.Close(); - customTooltip.Dispose(); - }); - - }); - t.Start(); - tooltipMutex.ReleaseMutex(); - } - } - */ - - private void InitNumberMargin(Scintilla textArea, EventHandler textArea_MarginClick) { - textArea.Styles[Style.LineNumber].BackColor = BACK_COLOR; - textArea.Styles[Style.LineNumber].ForeColor = FORE_COLOR; - textArea.Styles[Style.IndentGuide].ForeColor = FORE_COLOR; - textArea.Styles[Style.IndentGuide].BackColor = BACK_COLOR; - - var nums = textArea.Margins[NUMBER_MARGIN]; - nums.Type = MarginType.Number; - nums.Sensitive = true; - nums.Mask = 0; - - textArea.MarginClick += textArea_MarginClick; - } - - private void InitHotkeys(Scintilla scintillaTb, SearchManager sm) { - // register the hotkeys with the form - HotKeyManager.AddHotKey(scintillaTb, sm.OpenSearch, Keys.F, true); - HotKeyManager.AddHotKey(scintillaTb, () => Uppercase(scintillaTb), Keys.U, true); - HotKeyManager.AddHotKey(scintillaTb, () => Lowercase(scintillaTb), Keys.L, true); - HotKeyManager.AddHotKey(scintillaTb, () => ZoomIn(scintillaTb), Keys.Oemplus, true); - HotKeyManager.AddHotKey(scintillaTb, () => ZoomOut(scintillaTb), Keys.OemMinus, true); - HotKeyManager.AddHotKey(scintillaTb, () => ZoomDefault(scintillaTb), Keys.D0, true); - HotKeyManager.AddHotKey(scintillaTb, sm.CloseSearch, Keys.Escape); - - // remove conflicting hotkeys from scintilla - scintillaTb.ClearCmdKey(Keys.Control | Keys.F); - scintillaTb.ClearCmdKey(Keys.Control | Keys.R); - scintillaTb.ClearCmdKey(Keys.Control | Keys.H); - scintillaTb.ClearCmdKey(Keys.Control | Keys.L); - scintillaTb.ClearCmdKey(Keys.Control | Keys.U); - } - - private void InitSyntaxColoring(Scintilla textArea) { - - // Configure the default style - textArea.StyleResetDefault(); - textArea.Styles[Style.Default].Font = "Consolas"; - textArea.Styles[Style.Default].Size = 12; - textArea.Styles[Style.Default].BackColor = Color.FromArgb(0x212121); - textArea.Styles[Style.Default].ForeColor = Color.FromArgb(0xFFFFFF); - textArea.StyleClearAll(); - - // Configure the lexer styles - textArea.Styles[Style.Python.Identifier].ForeColor = Color.FromArgb(0xD0DAE2); - textArea.Styles[Style.Python.CommentLine].ForeColor = Color.FromArgb(0x40BF57); - textArea.Styles[Style.Python.Number].ForeColor = Color.FromArgb(0xFFFF00); - textArea.Styles[Style.Python.String].ForeColor = Color.FromArgb(0xFF00FF); - textArea.Styles[Style.Python.Character].ForeColor = Color.FromArgb(0xE95454); - textArea.Styles[Style.Python.Operator].ForeColor = Color.FromArgb(0xFFFF00); - textArea.Styles[Style.Python.Word].ForeColor = Color.FromArgb(0x48A8EE); - textArea.Styles[Style.Python.Word2].ForeColor = Color.FromArgb(0xF98906); - - textArea.Lexer = Lexer.Python; - - textArea.SetKeywords(0, cmdKeyWords); - textArea.SetKeywords(1, secondaryKeyWords); - } - private void openSearchScriptEditorButton_Click(object sender, EventArgs e) { - currentSearchManager.OpenSearch(); - } - - private void OnTextChangedScript(object sender, EventArgs e) { - ScriptTextArea.Margins[NUMBER_MARGIN].Width = ScriptTextArea.Lines.Count.ToString().Length * 13; - scriptsDirty = true; - scriptsTabPage.Text = ScriptFile.containerTypes.Script.ToString() + "s" + "*"; - } - private void OnTextChangedFunction(object sender, EventArgs e) { - FunctionTextArea.Margins[NUMBER_MARGIN].Width = FunctionTextArea.Lines.Count.ToString().Length * 13; - functionsDirty = true; - functionsTabPage.Text = ScriptFile.containerTypes.Function.ToString() + "s" + "*"; - } - private void OnTextChangedAction(object sender, EventArgs e) { - ActionTextArea.Margins[NUMBER_MARGIN].Width = ActionTextArea.Lines.Count.ToString().Length * 13; - actionsDirty = true; - actionsTabPage.Text = ScriptFile.containerTypes.Action.ToString() + "s" + "*"; - } - - - #region Numbers, Bookmarks, Code Folding - - /// - /// the background color of the text area - /// - private readonly Color BACK_COLOR = Color.FromArgb(0x2A211C); - - /// - /// default text color of the text area - /// - private readonly Color FORE_COLOR = Color.FromArgb(0xB7B7B7); - - /// - /// change this to whatever margin you want the line numbers to show in - /// - private const int NUMBER_MARGIN = 1; - - /// - /// change this to whatever margin you want the bookmarks/breakpoints to show in - /// - private const int BOOKMARK_MARGIN = 2; - private const int BOOKMARK_MARKER = 2; - - /// - /// change this to whatever margin you want the code folding tree (+/-) to show in - /// - private const int FOLDING_MARGIN = 3; - - /// - /// set this true to show circular buttons for code folding (the [+] and [-] buttons on the margin) - /// - private const bool CODEFOLDING_CIRCULAR = true; - - - private void InitialViewConfig(Scintilla textArea) { - textArea.Dock = DockStyle.Fill; - textArea.WrapMode = ScintillaNET.WrapMode.Word; - textArea.IndentationGuides = IndentView.LookBoth; - textArea.CaretPeriod = 500; - textArea.CaretForeColor = Color.White; - textArea.SetSelectionBackColor(true, Color.FromArgb(0x114D9C)); - textArea.WrapIndentMode = WrapIndentMode.Same; - } - - private void InitBookmarkMargin(Scintilla textArea) { - - var margin = textArea.Margins[BOOKMARK_MARGIN]; - margin.Width = 20; - margin.Sensitive = true; - margin.Type = MarginType.Symbol; - margin.Mask = (1 << BOOKMARK_MARKER); - - var marker = textArea.Markers[BOOKMARK_MARKER]; - marker.Symbol = MarkerSymbol.Circle; - marker.SetBackColor(Color.FromArgb(0xFF003B)); - marker.SetForeColor(Color.FromArgb(0x000000)); - marker.SetAlpha(100); - } - - private void InitCodeFolding(Scintilla textArea) { - textArea.SetFoldMarginColor(true, BACK_COLOR); - textArea.SetFoldMarginHighlightColor(true, BACK_COLOR); - - // Enable code folding - textArea.SetProperty("fold", "1"); - textArea.SetProperty("fold.compact", "1"); - - // Configure a margin to display folding symbols - textArea.Margins[FOLDING_MARGIN].Type = MarginType.Symbol; - textArea.Margins[FOLDING_MARGIN].Mask = Marker.MaskFolders; - textArea.Margins[FOLDING_MARGIN].Sensitive = true; - textArea.Margins[FOLDING_MARGIN].Width = 20; - - // Set colors for all folding markers - for (int i = 25; i <= 31; i++) { - textArea.Markers[i].SetForeColor(BACK_COLOR); // styles for [+] and [-] - textArea.Markers[i].SetBackColor(FORE_COLOR); // styles for [+] and [-] - } - - // Configure folding markers with respective symbols - textArea.Markers[Marker.Folder].Symbol = CODEFOLDING_CIRCULAR ? MarkerSymbol.CirclePlus : MarkerSymbol.BoxPlus; - textArea.Markers[Marker.FolderOpen].Symbol = CODEFOLDING_CIRCULAR ? MarkerSymbol.CircleMinus : MarkerSymbol.BoxMinus; - textArea.Markers[Marker.FolderEnd].Symbol = CODEFOLDING_CIRCULAR ? MarkerSymbol.CirclePlusConnected : MarkerSymbol.BoxPlusConnected; - textArea.Markers[Marker.FolderMidTail].Symbol = MarkerSymbol.TCorner; - textArea.Markers[Marker.FolderOpenMid].Symbol = CODEFOLDING_CIRCULAR ? MarkerSymbol.CircleMinusConnected : MarkerSymbol.BoxMinusConnected; - textArea.Markers[Marker.FolderSub].Symbol = MarkerSymbol.VLine; - textArea.Markers[Marker.FolderTail].Symbol = MarkerSymbol.LCorner; - - // Enable automatic folding - textArea.AutomaticFold = (AutomaticFold.Show | AutomaticFold.Click | AutomaticFold.Change); - } - - private void ScriptTextArea_MarginClick(object sender, MarginClickEventArgs e) { - MarginClick(ScriptTextArea, e); - } - - private void FunctionTextArea_MarginClick(object sender, MarginClickEventArgs e) { - MarginClick(FunctionTextArea, e); - } - - private void ActionTextArea_MarginClick(object sender, MarginClickEventArgs e) { - MarginClick(ActionTextArea, e); - } - - private void MarginClick(Scintilla textArea, MarginClickEventArgs e) { - if (e.Margin == BOOKMARK_MARGIN) { - // Do we have a marker for this line? - const uint mask = (1 << BOOKMARK_MARKER); - var line = textArea.Lines[textArea.LineFromPosition(e.Position)]; - if ((line.MarkerGet() & mask) > 0) { - // Remove existing bookmark - line.MarkerDelete(BOOKMARK_MARKER); - } else { - // Add bookmark - line.MarkerAdd(BOOKMARK_MARKER); - } - } - } - - #endregion - - #region Main Menu Commands - - private void scriptEditorWordWrapCheckbox_CheckedChanged(object sender, EventArgs e) { - ScriptTextArea.WrapMode = scriptEditorWordWrapCheckbox.Checked ? ScintillaNET.WrapMode.Word : ScintillaNET.WrapMode.None; - FunctionTextArea.WrapMode = scriptEditorWordWrapCheckbox.Checked ? ScintillaNET.WrapMode.Word : ScintillaNET.WrapMode.None; - ActionTextArea.WrapMode = scriptEditorWordWrapCheckbox.Checked ? ScintillaNET.WrapMode.Word : ScintillaNET.WrapMode.None; - } - - - private void viewWhiteSpacesButton_Click(object sender, EventArgs e) { - ScriptTextArea.ViewWhitespace = scriptEditorWhitespacesCheckbox.Checked ? WhitespaceMode.VisibleAlways : WhitespaceMode.Invisible; - FunctionTextArea.ViewWhitespace = scriptEditorWhitespacesCheckbox.Checked ? WhitespaceMode.VisibleAlways : WhitespaceMode.Invisible; - ActionTextArea.ViewWhitespace = scriptEditorWhitespacesCheckbox.Checked ? WhitespaceMode.VisibleAlways : WhitespaceMode.Invisible; - } - - private void scriptEditorZoomInButton_Click(object sender, EventArgs e) { - ZoomIn(currentScintillaEditor); - } - - private void scriptEditorZoomOutButton_Click(object sender, EventArgs e) { - ZoomOut(currentScintillaEditor); - } - - private void scriptEditorZoomResetButton_Click(object sender, EventArgs e) { - ZoomDefault(currentScintillaEditor); - } - - private void ScriptEditorCollapseButton_Click(object sender, EventArgs e) { - currentScintillaEditor.FoldAll(FoldAction.Contract); - } - - private void ScriptEditorExpandButton_Click(object sender, EventArgs e) { - currentScintillaEditor.FoldAll(FoldAction.Expand); - } - - - #endregion - - #region Uppercase / Lowercase - - private void Lowercase(Scintilla textArea) { - - // save the selection - int start = textArea.SelectionStart; - int end = textArea.SelectionEnd; - - // modify the selected text - textArea.ReplaceSelection(textArea.GetTextRange(start, end - start).ToLower()); - - // preserve the original selection - textArea.SetSelection(start, end); - } - - private void Uppercase(Scintilla textArea) { - // save the selection - int start = textArea.SelectionStart; - int end = textArea.SelectionEnd; - - // modify the selected text - textArea.ReplaceSelection(textArea.GetTextRange(start, end - start).ToUpper()); - - // preserve the original selection - textArea.SetSelection(start, end); - } - - #endregion - - #region Indent / Outdent - - private void GenerateKeystrokes(string keys, Scintilla textArea) { - //Example - //GenerateKeystrokes("+{TAB}"); - HotKeyManager.Enable = false; - textArea.Focus(); - SendKeys.Send(keys); - HotKeyManager.Enable = true; - } - - #endregion - - #region Zoom - - private void ZoomIn(Scintilla textArea) { - textArea.ZoomIn(); - } - - private void ZoomOut(Scintilla textArea) { - textArea.ZoomOut(); - } - - private void ZoomDefault(Scintilla textArea) { - textArea.Zoom = 0; - } - #endregion - - #region Quick Search Bar - private void BtnPrevSearchScript_Click(object sender, EventArgs e) { - scriptSearchManager.Find(false, false); - } - - private void BtnNextSearchScript_Click(object sender, EventArgs e) { - scriptSearchManager.Find(true, false); - } - - private void BtnPrevSearchFunc_Click(object sender, EventArgs e) { - functionSearchManager.Find(false, false); - } - - private void BtnNextSearchFunc_Click(object sender, EventArgs e) { - functionSearchManager.Find(true, false); - } - - private void BtnPrevSearchActions_Click(object sender, EventArgs e) { - actionSearchManager.Find(false, false); - } - - private void BtnNextSearchActions_Click(object sender, EventArgs e) { - actionSearchManager.Find(true, false); - } - - private void BtnCloseSearchScript_Click(object sender, EventArgs e) { - scriptSearchManager.CloseSearch(); - } - - private void BtnCloseSearchFunc_Click(object sender, EventArgs e) { - functionSearchManager.CloseSearch(); - } - - private void BtnCloseSearchActions_Click(object sender, EventArgs e) { - actionSearchManager.CloseSearch(); - } - - private void scriptTxtSearch_KeyDown(object sender, KeyEventArgs e) { - TxtSearchKeyDown(scriptSearchManager, e); - } - private void functionTxtSearch_KeyDown(object sender, KeyEventArgs e) { - TxtSearchKeyDown(functionSearchManager, e); - } - private void actiontTxtSearch_KeyDown(object sender, KeyEventArgs e) { - TxtSearchKeyDown(actionSearchManager, e); - } - - private void TxtSearchKeyDown(SearchManager sm, KeyEventArgs e) { - if (HotKeyManager.IsHotkey(e, Keys.Enter)) { - sm.Find(true, false); - } - if (HotKeyManager.IsHotkey(e, Keys.Enter, true) || HotKeyManager.IsHotkey(e, Keys.Enter, false, true)) { - sm.Find(false, false); - } - } - - private void panelSearchScriptTextBox_TextChanged(object sender, EventArgs e) { - scriptSearchManager.Find(true, true); - } - private void panelSearchFunctionTextBox_TextChanged(object sender, EventArgs e) { - functionSearchManager.Find(true, true); - } - private void panelSearchActionTextBox_TextChanged(object sender, EventArgs e) { - actionSearchManager.Find(true, true); - } - - #endregion - private void addScriptFileButton_Click(object sender, EventArgs e) { - /* Add new event file to event folder */ - string scriptFilePath = RomInfo.gameDirs[DirNames.scripts].unpackedDir + "\\" + selectScriptFileComboBox.Items.Count.ToString("D4"); - File.WriteAllBytes(scriptFilePath, new ScriptFile(0).ToByteArray()); - - /* Update ComboBox and select new file */ - selectScriptFileComboBox.Items.Add("Script File " + selectScriptFileComboBox.Items.Count); - selectScriptFileComboBox.SelectedIndex = selectScriptFileComboBox.Items.Count - 1; - } - private void exportScriptFileButton_Click(object sender, EventArgs e) { - string suggestion = "Script File "; - if (currentScriptFile.isLevelScript) { - suggestion = "Level " + suggestion; - } - currentScriptFile.SaveToFileExplorePath(suggestion + selectScriptFileComboBox.SelectedIndex, blindmode: true); - } - private void saveScriptFileButton_Click(object sender, EventArgs e) { - /* Create new ScriptFile object */ - int idToAssign = selectScriptFileComboBox.SelectedIndex; - - ScriptFile userEdited = new ScriptFile( - scriptLines: ScriptTextArea.Lines.ToStringsList(trim: true), - functionLines: FunctionTextArea.Lines.ToStringsList(trim: true), - actionLines: ActionTextArea.Lines.ToStringsList(trim: true), - selectScriptFileComboBox.SelectedIndex - ); - - /* Write new scripts to file */ - if (userEdited.fileID == null) { - MessageBox.Show("This " + typeof(ScriptFile).Name + " couldn't be saved, due to a processing error.", "Can't save", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } else if (userEdited.fileID == int.MaxValue) { - MessageBox.Show("This " + typeof(ScriptFile).Name + " is couldn't be saved since it's empty.", "Can't save", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } else { //check if ScriptFile instance was created succesfully - if (userEdited.SaveToFileDefaultDir(selectScriptFileComboBox.SelectedIndex)) { - currentScriptFile = userEdited; - ScriptEditorSetClean(); - } - } - } - private void clearCurrentLevelScriptButton_Click(object sender, EventArgs e) { - string path = RomInfo.gameDirs[DirNames.scripts].unpackedDir + "\\" + selectScriptFileComboBox.SelectedIndex.ToString("D4"); - File.WriteAllBytes(path, new byte[4]); - MessageBox.Show("Level script correctly cleared.", "Success", MessageBoxButtons.OK, MessageBoxIcon.Information); - } - private void importScriptFileButton_Click(object sender, EventArgs e) { - /* Prompt user to select .scr or .bin file */ - OpenFileDialog of = new OpenFileDialog { - Filter = "Script File (*.scr, *.bin)|*.scr;*.bin" - }; - if (of.ShowDialog(this) != DialogResult.OK) { - return; - } - - /* Update scriptFile object in memory */ - string path = RomInfo.gameDirs[DirNames.scripts].unpackedDir + "\\" + selectScriptFileComboBox.SelectedIndex.ToString("D4"); - File.Copy(of.FileName, path, true); - - /* Refresh controls */ - selectScriptFileComboBox_SelectedIndexChanged(null, null); - - /* Display success message */ - MessageBox.Show("Scripts imported successfully!", "", MessageBoxButtons.OK, MessageBoxIcon.Information); - } - private void openScriptButton_Click(object sender, EventArgs e) { - if (!scriptEditorIsReady) { - SetupScriptEditorTextAreas(); - SetupScriptEditor(); - scriptEditorIsReady = true; - } - - scriptEditorTabControl.SelectedIndex = 0; - selectScriptFileComboBox.SelectedIndex = (int)scriptFileUpDown.Value; - mainTabControl.SelectedTab = scriptEditorTabPage; - } - private void openLevelScriptButton_Click(object sender, EventArgs e) { - if (!scriptEditorIsReady) { - SetupScriptEditorTextAreas(); - SetupScriptEditor(); - scriptEditorIsReady = true; - } - - selectScriptFileComboBox.SelectedIndex = (int)levelScriptUpDown.Value; - mainTabControl.SelectedTab = scriptEditorTabPage; - } - private void removeScriptFileButton_Click(object sender, EventArgs e) { - DialogResult d = MessageBox.Show("Are you sure you want to delete the last Script File?", "Confirm deletion", MessageBoxButtons.YesNo, MessageBoxIcon.Warning); - if (d.Equals(DialogResult.Yes)) { - /* Delete script file */ - File.Delete(RomInfo.gameDirs[DirNames.scripts].unpackedDir + "\\" + (selectScriptFileComboBox.Items.Count - 1).ToString("D4")); - - /* Check if currently selected file is the last one, and in that case select the one before it */ - int lastIndex = selectScriptFileComboBox.Items.Count - 1; - if (selectScriptFileComboBox.SelectedIndex == lastIndex) { - selectScriptFileComboBox.SelectedIndex--; - } - - /* Remove item from ComboBox */ - selectScriptFileComboBox.Items.RemoveAt(lastIndex); - } - } - private void searchInScriptsButton_Click(object sender, EventArgs e) { - if (searchInScriptsTextBox.Text == "") { - return; - } - - int firstArchive; - int lastArchive; - - if (searchOnlyCurrentScriptCheckBox.Checked) { - firstArchive = selectScriptFileComboBox.SelectedIndex; - lastArchive = firstArchive + 1; - } else { - firstArchive = 0; - lastArchive = romInfo.GetScriptCount(); - } - - searchInScriptsResultListBox.Items.Clear(); - string searchString = searchInScriptsTextBox.Text; - searchProgressBar.Maximum = selectScriptFileComboBox.Items.Count; - - List results = new List(); - - string scriptKw = ScriptFile.containerTypes.Script.ToString(); - string functionKw = ScriptFile.containerTypes.Function.ToString(); - - for (int i = firstArchive; i < lastArchive; i++) { - try { - Console.WriteLine("Attempting to load script " + i); - ScriptFile file = new ScriptFile(i, readActions: false); - - if (scriptSearchCaseSensitiveCheckBox.Checked) { - results.AddRange(SearchInScripts(i, file.allScripts, scriptKw, (string s) => s.Contains(searchString))); - results.AddRange(SearchInScripts(i, file.allFunctions, functionKw, (string s) => s.Contains(searchString))); - } else { - results.AddRange(SearchInScripts(i, file.allScripts, scriptKw, (string s) => s.IndexOf(searchString, StringComparison.InvariantCultureIgnoreCase) >= 0)); - results.AddRange(SearchInScripts(i, file.allFunctions, functionKw, (string s) => s.IndexOf(searchString, StringComparison.InvariantCultureIgnoreCase) >= 0)); - } - } catch { } - searchProgressBar.Value = i; - } - - searchProgressBar.Value = 0; - searchInScriptsResultListBox.Items.AddRange(results.ToArray()); - } - private List SearchInScripts(int fileID, List cmdList, string entryType, Func criteria) { - List results = new List(); - - for (int j = 0; j < cmdList.Count; j++) { - if (cmdList[j].commands is null) { - continue; - } - foreach (ScriptCommand cur in cmdList[j].commands) { - if (criteria(cur.name)) { - results.Add($"File {fileID} - {entryType} {j + 1}: {cur.name}{Environment.NewLine}"); - } - } - } - return results; - } - private void searchInScripts_GoToEntryResult(object sender, MouseEventArgs e) { - if (searchInScriptsResultListBox.SelectedIndex < 0) { - return; - } - - string[] split = searchInScriptsResultListBox.SelectedItem.ToString().Trim().Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries); - selectScriptFileComboBox.SelectedIndex = int.Parse(split[1]); - string cmdNameAndParams = String.Join(" ", split.Skip(5).Take(split.Length - 5)); - - if (split[3].StartsWith(ScriptFile.containerTypes.Script.ToString())) { - if (scriptEditorTabControl.SelectedTab != scriptsTabPage) { - scriptEditorTabControl.SelectedTab = scriptsTabPage; - } - scriptSearchManager.Find(true, false, ScriptFile.containerTypes.Script.ToString() + " " + split[4].Replace(":", "")); - scriptSearchManager.Find(true, false, cmdNameAndParams); - } else if (split[3].StartsWith(ScriptFile.containerTypes.Function.ToString())) { - if (scriptEditorTabControl.SelectedTab != functionsTabPage) { - scriptEditorTabControl.SelectedTab = functionsTabPage; - } - functionSearchManager.Find(true, false, ScriptFile.containerTypes.Function.ToString() + " " + split[4].Replace(":", "")); - functionSearchManager.Find(true, false, cmdNameAndParams); - } else if (split[3].StartsWith(ScriptFile.containerTypes.Action.ToString())) { - if (scriptEditorTabControl.SelectedTab != actionsTabPage) { - scriptEditorTabControl.SelectedTab = actionsTabPage; - } - actionSearchManager.Find(true, false, ScriptFile.containerTypes.Action.ToString() + " " + split[4].Replace(":", "")); - actionSearchManager.Find(true, false, cmdNameAndParams); - } - } - private void searchInScriptsResultListBox_KeyDown(object sender, KeyEventArgs e) { - if (e.KeyCode == Keys.Enter) { - searchInScripts_GoToEntryResult(null, null); - } - } - private void searchInScriptsTextBox_KeyDown(object sender, KeyEventArgs e) { - if (e.KeyCode == Keys.Enter) { - searchInScriptsButton_Click(null, null); - } - } - private void selectScriptFileComboBox_SelectedIndexChanged(object sender, EventArgs e) { - ReloadScript(); - } - - private bool ReloadScript() { - Console.WriteLine("Script Reload has been requested"); - /* clear controls */ - if (Helpers.HandlersDisabled || selectScriptFileComboBox.SelectedIndex < 0) { - return false; - } - - if (scriptsDirty || functionsDirty || actionsDirty) { - DialogResult d = MessageBox.Show("There are unsaved changes in this Script File.\nDo you wish to discard them?", "Unsaved work", MessageBoxButtons.YesNo, MessageBoxIcon.Warning); - - if (!d.Equals(DialogResult.Yes)) { - Helpers.DisableHandlers(); - selectScriptFileComboBox.SelectedIndex = (int)currentScriptFile.fileID; - Helpers.EnableHandlers(); - return false; - } - } - currentScriptFile = new ScriptFile(selectScriptFileComboBox.SelectedIndex); // Load script file - - ScriptTextArea.ClearAll(); - FunctionTextArea.ClearAll(); - ActionTextArea.ClearAll(); - - scriptsNavListbox.Items.Clear(); - functionsNavListbox.Items.Clear(); - actionsNavListbox.Items.Clear(); - - if (currentScriptFile.isLevelScript) { - ScriptTextArea.Text += "LevelScript files are currently not supported.\nYou can use AdAstra's Level Scripts Editor."; - addScriptFileButton.Visible = false; - removeScriptFileButton.Visible = false; - - clearCurrentLevelScriptButton.Visible = true; - } else { - Helpers.DisableHandlers(); - addScriptFileButton.Visible = true; - removeScriptFileButton.Visible = true; - - clearCurrentLevelScriptButton.Visible = false; - - string buffer = ""; - - /* Add scripts */ - for (int i = 0; i < currentScriptFile.allScripts.Count; i++) { - CommandContainer currentScript = currentScriptFile.allScripts[i]; - - /* Write header */ - string header = ScriptFile.containerTypes.Script.ToString() + " " + (i + 1); - buffer += header + ':' + Environment.NewLine; - scriptsNavListbox.Items.Add(header); - - /* If current script is identical to another, print UseScript instead of commands */ - if (currentScript.usedScript < 0) { - for (int j = 0; j < currentScript.commands.Count; j++) { - if (!ScriptDatabase.endCodes.Contains(currentScript.commands[j].id)) { - buffer += '\t'; - } - buffer += currentScript.commands[j].name + Environment.NewLine; - } - } else { - buffer += '\t' + "UseScript_#" + currentScript.usedScript + Environment.NewLine; - } - - ScriptTextArea.AppendText(buffer + Environment.NewLine); - buffer = ""; - } - - - /* Add functions */ - for (int i = 0; i < currentScriptFile.allFunctions.Count; i++) { - CommandContainer currentFunction = currentScriptFile.allFunctions[i]; - - /* Write Heaader */ - string header = ScriptFile.containerTypes.Function.ToString() + " " + (i + 1); - buffer += header + ':' + Environment.NewLine; - functionsNavListbox.Items.Add(header); - - /* If current function is identical to a script, print UseScript instead of commands */ - if (currentFunction.usedScript < 0) { - for (int j = 0; j < currentFunction.commands.Count; j++) { - if (!ScriptDatabase.endCodes.Contains(currentFunction.commands[j].id)) { - buffer += '\t'; - } - buffer += currentFunction.commands[j].name + Environment.NewLine; - } - } else { - buffer += '\t' + "UseScript_#" + currentFunction.usedScript + Environment.NewLine; - } - - FunctionTextArea.AppendText(buffer + Environment.NewLine); - buffer = ""; - } - - /* Add movements */ - for (int i = 0; i < currentScriptFile.allActions.Count; i++) { - ActionContainer currentAction = currentScriptFile.allActions[i]; - - string header = ScriptFile.containerTypes.Action.ToString() + " " + (i + 1); - buffer += header + ':' + Environment.NewLine; - actionsNavListbox.Items.Add(header); - - for (int j = 0; j < currentAction.actionCommandsList.Count; j++) { - if (currentAction.actionCommandsList[j].id != 0x00FE) { - buffer += '\t'; - } - buffer += currentAction.actionCommandsList[j].name + Environment.NewLine; - } - - ActionTextArea.AppendText(buffer + Environment.NewLine); - buffer = ""; - } - } - - ScriptEditorSetClean(); - Helpers.statusLabelMessage(); - Helpers.EnableHandlers(); - return true; - } - - private void UpdateScriptNumberFormatDec(object sender, EventArgs e) { - if (Helpers.HandlersEnabled && scriptEditorNumberFormatDecimal.Checked) { - NumberStyles old = (NumberStyles)Properties.Settings.Default.scriptEditorFormatPreference; //Local Backup - Properties.Settings.Default.scriptEditorFormatPreference = (int)NumberStyles.Integer; - - - if (!ReloadScript()) { - UpdateScriptNumberCheckBox(old); //Restore old checkbox status! Script couldn't be redrawn - } - } - } - private void UpdateScriptNumberFormatHex(object sender, EventArgs e) { - if (Helpers.HandlersEnabled && scriptEditorNumberFormatHex.Checked) { - NumberStyles old = (NumberStyles)Properties.Settings.Default.scriptEditorFormatPreference; //Local Backup - Properties.Settings.Default.scriptEditorFormatPreference = (int)NumberStyles.HexNumber; - - if (!ReloadScript()) { - UpdateScriptNumberCheckBox(old); //Restore old checkbox status! Script couldn't be redrawn - } - } - } - private void UpdateScriptNumberFormatNoPref(object sender, EventArgs e) { - if (Helpers.HandlersEnabled && scriptEditorNumberFormatNoPreference.Checked) { - NumberStyles old = (NumberStyles)Properties.Settings.Default.scriptEditorFormatPreference; //Local Backup - Properties.Settings.Default.scriptEditorFormatPreference = (int)NumberStyles.None; - - if (!ReloadScript()) { - UpdateScriptNumberCheckBox(old); //Restore old checkbox status! Script couldn't be redrawn - } - } - } - - private void UpdateScriptNumberCheckBox(NumberStyles toSet) { - - Helpers.DisableHandlers(); - Properties.Settings.Default.scriptEditorFormatPreference = (int)toSet; - - switch ((NumberStyles)Properties.Settings.Default.scriptEditorFormatPreference) { - case NumberStyles.None: - scriptEditorNumberFormatNoPreference.Checked = true; - break; - case NumberStyles.HexNumber: - scriptEditorNumberFormatHex.Checked = true; - break; - case NumberStyles.Integer: - scriptEditorNumberFormatDecimal.Checked = true; - break; - } - Console.WriteLine("changed style to " + Properties.Settings.Default.scriptEditorFormatPreference); - Helpers.EnableHandlers(); - } - - private void scriptsNavListbox_SelectedIndexChanged(object sender, EventArgs e) { - NavigatorGoTo((ListBox)sender, 0, scriptSearchManager, ScriptFile.containerTypes.Script.ToString()); - } - - private void functionsNavListbox_SelectedIndexChanged(object sender, EventArgs e) { - NavigatorGoTo((ListBox)sender, 1, functionSearchManager, ScriptFile.containerTypes.Function.ToString()); - } - - private void actionsNavListbox_SelectedIndexChanged(object sender, EventArgs e) { - NavigatorGoTo((ListBox)sender, 2, actionSearchManager, ScriptFile.containerTypes.Action.ToString()); - } - - private void NavigatorGoTo(ListBox currentLB, int indexToSwitchTo, SearchManager entrusted, string keyword) { - if (currentLB.SelectedIndex < 0) { - return; - } - - if (scriptEditorTabControl.SelectedIndex != indexToSwitchTo) { - scriptEditorTabControl.SelectedIndex = indexToSwitchTo; - } - - entrusted.Find(true, false, keyword + ' ' + (currentLB.SelectedIndex + 1) + ':'); - } - #endregion - #endregion - #region Text Editor #region Variables @@ -10540,7 +9594,7 @@ namespace DSPRE { ExplorerSelect(Path.Combine(gameDirs[DirNames.eventFiles].unpackedDir, selectEventComboBox.SelectedIndex.ToString("D4"))); } private void locateCurrentScriptFile_Click(object sender, EventArgs e) { - ExplorerSelect(Path.Combine(gameDirs[DirNames.scripts].unpackedDir, selectScriptFileComboBox.SelectedIndex.ToString("D4"))); + ExplorerSelect(Path.Combine(gameDirs[DirNames.scripts].unpackedDir, EditorPanels.scriptEditor.selectScriptFileComboBox.SelectedIndex.ToString("D4"))); } private void locateCurrentTextArchive_Click(object sender, EventArgs e) { ExplorerSelect(Path.Combine(gameDirs[DirNames.textArchives].unpackedDir, selectTextFileComboBox.SelectedIndex.ToString("D4"))); diff --git a/DS_Map/Main Window.resx b/DS_Map/Main Window.resx index 7d529c6..c9f95b4 100644 --- a/DS_Map/Main Window.resx +++ b/DS_Map/Main Window.resx @@ -117,6 +117,96 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 239, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM + EgAAAk1TRnQBSQFMAgEBCgEAAegBGwHoARsBEAEAARABAAT/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== + + @@ -946,96 +1036,6 @@ p3S+M+m1V1me9QgCUQNXX2YRT1sYHBiEP3wHVbp3PF3cB40GbrzN86xHENrScf1NDsl8FaI4jODMHOgS SOacfYAmbr5XeNYjGH7yDReXv+JeNIUhUYwFpmZjDz+nMLf5B3b2rcZ5tju4ntjtFw4T54j+v2g/t9NH 9AiCIPwGJelqUAd/T3AAAAAASUVORK5CYII= - - - - 239, 17 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM - EgAAAk1TRnQBSQFMAgEBCgEAAbABGwGwARsBEAEAARABAAT/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== @@ -1047,6 +1047,9 @@ 386, 19 + + 533, 20 + 67 diff --git a/DS_Map/ROMFiles/HeadbuttEncounter.cs b/DS_Map/ROMFiles/HeadbuttEncounter.cs new file mode 100644 index 0000000..7398a19 --- /dev/null +++ b/DS_Map/ROMFiles/HeadbuttEncounter.cs @@ -0,0 +1,27 @@ +using System.IO; + +namespace DSPRE.ROMFiles { + public class HeadbuttEncounter { + public ushort pokemonID; + public byte minLevel; + public byte maxLevel; + + public HeadbuttEncounter() { + maxLevel = 0; + minLevel = 0; + pokemonID = 0; + } + + public HeadbuttEncounter(BinaryReader br) { + this.pokemonID = br.ReadUInt16(); + this.minLevel = br.ReadByte(); + this.maxLevel = br.ReadByte(); + } + + public override string ToString() { + string[] pokemonNames = RomInfo.GetPokemonNames(); + string pokemon = pokemonNames[pokemonID]; + return $"{pokemonID,4} {pokemon,10}: {minLevel,3} - {maxLevel,3}"; + } + } +} diff --git a/DS_Map/ROMFiles/HeadbuttEncounterFile.cs b/DS_Map/ROMFiles/HeadbuttEncounterFile.cs new file mode 100644 index 0000000..7c7d6c7 --- /dev/null +++ b/DS_Map/ROMFiles/HeadbuttEncounterFile.cs @@ -0,0 +1,136 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.IO; + +namespace DSPRE.ROMFiles { + //https://hirotdk.neocities.org/FileSpecs.html#Headbutt + public class HeadbuttEncounterFile { + public ushort ID; + + //get encounter tables, 12 normal pokemon definitions, 6 special pokemon definitions, 4 bytes per definition + const int normalEncountersCount = 12; + const int specialEncountersCount = 6; + + public byte normalTreeGroupsCount; + public byte specialTreeGroupsCount; + public List normalEncounters; + public List specialEncounters; + public BindingList normalTreeGroups; + public BindingList specialTreeGroups; + + public HeadbuttEncounterFile(ushort id) { + this.ID = id; + string path = Filesystem.GetHeadbuttPath(id); + parse_file(path); + } + + public HeadbuttEncounterFile(string path) { + parse_file(path); + } + + public void parse_file(string path) { + FileStream fs = new FileStream(path, FileMode.Open); + using (BinaryReader br = new BinaryReader(fs)) { + //get the number of tree group definitions + normalTreeGroupsCount = br.ReadByte(); + br.ReadByte(); //padding + specialTreeGroupsCount = br.ReadByte(); + br.ReadByte(); //padding + + normalEncounters = new List(); + specialEncounters = new List(); + + normalTreeGroups = new BindingList(); + specialTreeGroups = new BindingList(); + + //if there are no trees defined in either section, there are no encounters or trees defined + bool hasTrees = normalTreeGroupsCount > 0 || specialTreeGroupsCount > 0; + if (!hasTrees) { + for (int i = 0; i < normalEncountersCount; i++) { + normalEncounters.Add(new HeadbuttEncounter()); + } + + for (int i = 0; i < specialEncountersCount; i++) { + specialEncounters.Add(new HeadbuttEncounter()); + } + + return; + } + + for (int i = 0; i < normalEncountersCount; i++) { + normalEncounters.Add(new HeadbuttEncounter(br)); + } + + for (int i = 0; i < specialEncountersCount; i++) { + specialEncounters.Add(new HeadbuttEncounter(br)); + } + + //tree groups have 6 sets of xy global coordinates x treeGroupsCount + //coordinates need to be converted to matrix and local coordinates to be useful + for (int i = 0; i < normalTreeGroupsCount; i++) { + normalTreeGroups.Add(new HeadbuttTreeGroup(br)); + } + + for (int i = 0; i < specialTreeGroupsCount; i++) { + specialTreeGroups.Add(new HeadbuttTreeGroup(br)); + } + } + } + + public byte[] ToByteArray() { + MemoryStream newData = new MemoryStream(); + using (BinaryWriter writer = new BinaryWriter(newData)) { + writer.Write((byte)normalTreeGroups.Count); + writer.Write((byte)0); + writer.Write((byte)specialTreeGroups.Count); + writer.Write((byte)0); + + foreach (HeadbuttEncounter encounter in normalEncounters) { + writer.Write((UInt16)encounter.pokemonID); + writer.Write((byte)encounter.minLevel); + writer.Write((byte)encounter.maxLevel); + } + + foreach (HeadbuttEncounter encounter in specialEncounters) { + writer.Write((UInt16)encounter.pokemonID); + writer.Write((byte)encounter.minLevel); + writer.Write((byte)encounter.maxLevel); + } + + foreach (var treeGroup in normalTreeGroups) { + foreach (var tree in treeGroup.trees) { + writer.Write((UInt16)tree.globalX); + writer.Write((UInt16)tree.globalY); + } + } + + foreach (var treeGroup in specialTreeGroups) { + foreach (var tree in treeGroup.trees) { + writer.Write((UInt16)tree.globalX); + writer.Write((UInt16)tree.globalY); + } + } + } + + return newData.ToArray(); + } + + public bool SaveToFile() { + string path = Filesystem.GetHeadbuttPath(ID); + return SaveToFile(path); + } + + public bool SaveToFile(int id) { + string path = Filesystem.GetHeadbuttPath(id); + return SaveToFile(path); + } + + + public bool SaveToFile(string path, bool showSuccessMessage = true) { + byte[] romFileToByteArray = ToByteArray(); + File.WriteAllBytes(path, romFileToByteArray); + return true; + } + } +} diff --git a/DS_Map/ROMFiles/HeadbuttEncounterMap.cs b/DS_Map/ROMFiles/HeadbuttEncounterMap.cs new file mode 100644 index 0000000..7738473 --- /dev/null +++ b/DS_Map/ROMFiles/HeadbuttEncounterMap.cs @@ -0,0 +1,36 @@ +namespace DSPRE.ROMFiles { + //This class is in case a MapHeader uses the same MapFile more than once + //ToString is the matrix x,y and mapID + class HeadbuttEncounterMap { + public readonly int mapID; + public readonly int x; + public readonly int y; + + public HeadbuttEncounterMap(int mapID, int x, int y) { + this.mapID = mapID; + this.x = x; + this.y = y; + } + + public override string ToString() { + return $"{mapID} - {x},{y}"; + } + + public override bool Equals(object obj) { + // If the passed object is null + if (obj == null) { + return false; + } + + if (obj is HeadbuttEncounterMap) { + return this.ToString() == ((HeadbuttEncounterMap)obj).ToString(); + } + + return false; + } + + public override int GetHashCode() { + return this.x.GetHashCode() ^ y.GetHashCode() ^ mapID.GetHashCode(); + } + } +} diff --git a/DS_Map/ROMFiles/HeadbuttTree.cs b/DS_Map/ROMFiles/HeadbuttTree.cs new file mode 100644 index 0000000..224d0da --- /dev/null +++ b/DS_Map/ROMFiles/HeadbuttTree.cs @@ -0,0 +1,103 @@ +using System.IO; + +namespace DSPRE.ROMFiles { + public class HeadbuttTree { + public bool picked = false; + + private ushort _globalX; + private ushort _globalY; + private ushort _matrixX; + private ushort _matrixY; + private ushort _mapX; + private ushort _mapY; + + public bool unused { get { return globalX == ushort.MaxValue && globalY == ushort.MaxValue; } } + + public enum Types { + Normal, + Special, + } + + public HeadbuttTree(BinaryReader br) { + this.globalX = br.ReadUInt16(); + this.globalY = br.ReadUInt16(); + } + + public HeadbuttTree(ushort globalX = ushort.MaxValue, ushort globalY = ushort.MaxValue) { + this.globalX = globalX; + this.globalY = globalY; + } + + public HeadbuttTree(HeadbuttTree original) { + this.globalX = original.globalX; + this.globalY = original.globalY; + } + + public ushort globalX { + get { return _globalX; } + set { + _globalX = value; + _matrixX = (ushort)(_globalX / MapFile.mapSize); + _mapX = (ushort)(_globalX % MapFile.mapSize); + } + } + + public ushort globalY { + get { return _globalY; } + set { + _globalY = value; + _matrixY = (ushort)(_globalY / MapFile.mapSize); + _mapY = (ushort)(_globalY % MapFile.mapSize); + } + } + + public ushort matrixX { + get { + return _matrixX; + } + set { + _matrixX = value; + _globalX = (ushort)(_matrixX * MapFile.mapSize + _mapX); + _mapX = (ushort)(_globalX % MapFile.mapSize); + } + } + + public ushort matrixY { + get { + return _matrixY; + } + set { + _matrixY = value; + _globalY = (ushort)(_matrixY * MapFile.mapSize + _mapY); + _mapY = (ushort)(_globalY % MapFile.mapSize); + } + } + + public ushort mapX { + get { + return _mapX; + } + set { + _mapX = value; + _globalX = (ushort)(_matrixX * MapFile.mapSize + _mapX); + _matrixX = (ushort)(_globalX / MapFile.mapSize); + } + } + + public ushort mapY { + get { + return _mapY; + } + set { + _mapY = value; + _globalY = (ushort)(_matrixY * MapFile.mapSize + _mapY); + _matrixY = (ushort)(_globalY / MapFile.mapSize); + } + } + + public override string ToString() { + string suffix = unused ? "unused" : $"globalX: {globalX}, globalY: {globalY}"; + return $"{nameof(HeadbuttTree)} - {suffix}"; + } + } +} diff --git a/DS_Map/ROMFiles/HeadbuttTreeGroup.cs b/DS_Map/ROMFiles/HeadbuttTreeGroup.cs new file mode 100644 index 0000000..f012e70 --- /dev/null +++ b/DS_Map/ROMFiles/HeadbuttTreeGroup.cs @@ -0,0 +1,32 @@ +using System.Collections.Generic; +using System.IO; + +namespace DSPRE.ROMFiles { + public class HeadbuttTreeGroup { + const int treeCount = 6; //number of trees in each tree group + + public List trees = new List(); + + public HeadbuttTreeGroup(BinaryReader br) { + for (int j = 0; j < treeCount; j++) { + trees.Add(new HeadbuttTree(br)); + } + } + + public HeadbuttTreeGroup() { + for (int j = 0; j < treeCount; j++) { + trees.Add(new HeadbuttTree()); + } + } + + public HeadbuttTreeGroup(HeadbuttTreeGroup original) { + foreach (HeadbuttTree headbuttTree in original.trees) { + trees.Add(new HeadbuttTree(headbuttTree)); + } + } + + public override string ToString() { + return $"{nameof(HeadbuttTreeGroup)}"; + } + } +} diff --git a/DS_Map/ROMFiles/LevelScriptFile.cs b/DS_Map/ROMFiles/LevelScriptFile.cs new file mode 100644 index 0000000..bb208bf --- /dev/null +++ b/DS_Map/ROMFiles/LevelScriptFile.cs @@ -0,0 +1,139 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.IO; + +namespace DSPRE.ROMFiles { + public class LevelScriptFile { + public int ID; + public BindingList bufferSet = new BindingList(); + + public LevelScriptFile() { } + + public LevelScriptFile(int id) { + this.ID = id; + string path1 = Filesystem.scripts; + string path = Path.Combine(path1, this.ID.ToString("D4")); + parse_file(path); + } + + public void parse_file(string path) { + FileStream fs = new FileStream(path, FileMode.Open); + using (BinaryReader br = new BinaryReader(fs)) { + bool hasConditionalStructure = false; + + //conditionalStructureOffset is used to ensure the structure of the file is correct + int conditionalStructureOffset = -1; + + while (true) { + //first byte is the script type + //if not a valid script type, break loop + byte triggerType = br.ReadByte(); + if (!LevelScriptTrigger.IsValidTriggerType(triggerType)) break; + + //subtract triggerType length from conditionalStructureOffset + if (hasConditionalStructure) conditionalStructureOffset -= sizeof(byte); + + //if trigger type is a variable value, that doesn't immediately mean we're processing that trigger + //the trigger data is processed last if it is there + if (triggerType == LevelScriptTrigger.VARIABLEVALUE) { + hasConditionalStructure = true; + conditionalStructureOffset = (int)br.ReadUInt32(); + continue; + } + + //map screen load trigger doesn't have a value or variable + uint scriptToTrigger = br.ReadUInt32(); + bufferSet.Add(new MapScreenLoadTrigger(triggerType, (int)scriptToTrigger)); + + //subtract scriptToTrigger length from conditionalStructureOffset + if (hasConditionalStructure) conditionalStructureOffset -= sizeof(UInt32); + } + + //the earliest position a trigger can be + const int SMALLEST_TRIGGER_SIZE = 5; + + //if triggerType is invalid + //and next uint16 == 0 + //and the file stream length is shorter than the earliest position a trigger can be + if (br.BaseStream.Position == 1 && br.ReadUInt16() == 0 && fs.Length < SMALLEST_TRIGGER_SIZE) { + return; + throw new InvalidDataException("This level script does nothing."); // "Interesting..." + } + + //br.BaseStream.Position == 3 + //triggerType is valid, + //stream position is earlier than the first possible trigger, or + //there is no start script condition specified + if (br.BaseStream.Position < SMALLEST_TRIGGER_SIZE) { + throw new InvalidDataException("Parser failure: The input file you attempted to load is either malformed or not a Level Script file."); + } + + //there are no instances of a variable value trigger + if (!hasConditionalStructure) { + return; + } + + //if there's a variable value trigger but the offset is incorrect, the file is corrupt + if (conditionalStructureOffset != 1) { + throw new InvalidDataException($"Field error: The Level Script file you attempted to load is broken. {conditionalStructureOffset}"); + } + + //get the variable value trigger parts + while (true) { + //there are no variables below 1 + int variableID = br.ReadUInt16(); + if (variableID <= 0) break; + + int varExpectedValue = br.ReadUInt16(); + int scriptToTrigger = br.ReadUInt16(); + bufferSet.Add(new VariableValueTrigger(scriptToTrigger, variableID, varExpectedValue)); + } + } + } + + public long write_file(string path, bool word_alignment_padding = false) { + FileStream fs = new FileStream(path, FileMode.OpenOrCreate, FileAccess.Write); + using (BinaryWriter bw = new BinaryWriter(fs)) { + HashSet mapScreenLoadTriggers = new HashSet(); + HashSet variableValueTriggers = new HashSet(); + + foreach (LevelScriptTrigger item in bufferSet) { + if (item is VariableValueTrigger variableValueTrigger) { + variableValueTriggers.Add(variableValueTrigger); + } + else if (item is MapScreenLoadTrigger mapScreenLoadTrigger) { + mapScreenLoadTriggers.Add(mapScreenLoadTrigger); + } + } + + foreach (MapScreenLoadTrigger item in mapScreenLoadTriggers) { + bw.Write((byte)item.triggerType); + bw.Write((UInt32)item.scriptTriggered); + } + + if (variableValueTriggers.Count > 0) { + bw.Write((byte)LevelScriptTrigger.VARIABLEVALUE); + bw.Write((UInt32)1); + bw.Write((byte)0); + foreach (VariableValueTrigger item in variableValueTriggers) { + bw.Write((UInt16)item.variableToWatch); + bw.Write((UInt16)item.expectedValue); + bw.Write((UInt16)item.scriptTriggered); + } + } + + bw.Write((UInt16)0); + + if (word_alignment_padding) { + long missing_bytes = bw.BaseStream.Position % 4; + for (int i = 0; i < 4 - missing_bytes; i++) { + bw.Write((byte)0); + } + } + + return bw.BaseStream.Position; + } + } + } +} diff --git a/DS_Map/ROMFiles/LevelScriptTrigger.cs b/DS_Map/ROMFiles/LevelScriptTrigger.cs new file mode 100644 index 0000000..eaae9b7 --- /dev/null +++ b/DS_Map/ROMFiles/LevelScriptTrigger.cs @@ -0,0 +1,31 @@ +using System; + +namespace DSPRE.ROMFiles { + public class LevelScriptTrigger { + public const int VARIABLEVALUE = 1; + public const int MAPCHANGE = 2; + public const int SCREENRESET = 3; + public const int LOADGAME = 4; + + private static int[] _triggerTypes; + public int triggerType { get; set; } + public int scriptTriggered { get; set; } + + public LevelScriptTrigger(int triggerType, int scriptTriggered) { + this.triggerType = triggerType; + this.scriptTriggered = scriptTriggered; + } + + public static bool IsValidTriggerType(byte triggerType) { + if (_triggerTypes == null) { + _triggerTypes = new[] { VARIABLEVALUE, MAPCHANGE, SCREENRESET, LOADGAME }; + } + + return Array.IndexOf(_triggerTypes, triggerType) != -1; + } + + public override string ToString() { + return "Starts Script " + scriptTriggered; + } + } +} diff --git a/DS_Map/ROMFiles/MapScreenLoadTrigger.cs b/DS_Map/ROMFiles/MapScreenLoadTrigger.cs new file mode 100644 index 0000000..69543a7 --- /dev/null +++ b/DS_Map/ROMFiles/MapScreenLoadTrigger.cs @@ -0,0 +1,35 @@ +namespace DSPRE.ROMFiles { + public class MapScreenLoadTrigger : LevelScriptTrigger { + public MapScreenLoadTrigger(int type, int scriptTriggered) : base(type, scriptTriggered) { } + + public override string ToString() { + switch (triggerType) { + case LevelScriptTrigger.MAPCHANGE: + return base.ToString() + " upon entering the LS map."; + case LevelScriptTrigger.SCREENRESET: + return base.ToString() + " when a fadescreen happens in the LS map."; + case LevelScriptTrigger.LOADGAME: + return base.ToString() + " when the game resumes in the LS map."; + default: + return base.ToString() + " under unknown circumstances."; + } + } + + public override bool Equals(object obj) { + // If the passed object is null + if (obj == null) { + return false; + } + + if (obj is MapScreenLoadTrigger) { + return this.ToString() == ((MapScreenLoadTrigger)obj).ToString(); + } + + return false; + } + + public override int GetHashCode() { + return this.triggerType.GetHashCode() ^ scriptTriggered.GetHashCode(); + } + } +} diff --git a/DS_Map/ROMFiles/SafariZoneEncounter.cs b/DS_Map/ROMFiles/SafariZoneEncounter.cs new file mode 100644 index 0000000..52df80b --- /dev/null +++ b/DS_Map/ROMFiles/SafariZoneEncounter.cs @@ -0,0 +1,35 @@ +using System; +using System.IO; + +namespace DSPRE.ROMFiles +{ + public class SafariZoneEncounter + { + public ushort pokemonID; + public byte level; + public SafariZoneEncounter() { + level = 1; + pokemonID = 0; + } + + public SafariZoneEncounter(BinaryReader br) { + readEncounter(br); + } + + public void readEncounter(BinaryReader br) { + this.pokemonID = br.ReadUInt16(); + this.level = br.ReadByte(); + } + + public void writeEncounter(BinaryWriter bw) { + bw.Write((UInt16)pokemonID); + bw.Write((byte)level); + } + + public override string ToString() { + string[] pokemonNames = RomInfo.GetPokemonNames(); + string pokemon = pokemonNames[pokemonID]; + return $"{pokemonID,4} {pokemon,10}: {level,3}"; + } + } +} diff --git a/DS_Map/ROMFiles/SafariZoneEncounterFile.cs b/DS_Map/ROMFiles/SafariZoneEncounterFile.cs new file mode 100644 index 0000000..5e3ddd2 --- /dev/null +++ b/DS_Map/ROMFiles/SafariZoneEncounterFile.cs @@ -0,0 +1,101 @@ +using System.Collections.Generic; +using System.IO; + +namespace DSPRE.ROMFiles { + public class SafariZoneEncounterFile { + public static Dictionary Names = new Dictionary() { + {0, "Plains"}, + {1, "Meadow"}, + {2, "Savannah"}, + {3, "Peak"}, + {4, "Rocky Beach"}, + {5, "Wetland"}, + {6, "Forest"}, + {7, "Swamp"}, + {8, "Marshland"}, + {9, "Wasteland"}, + {10, "Mountain"}, + {11, "Desert"}, + }; + + public int ID; + + public SafariZoneEncounterGroup grassEncounterGroup = new SafariZoneEncounterGroup(); + public SafariZoneEncounterGroup surfEncounterGroup = new SafariZoneEncounterGroup(); + public SafariZoneEncounterGroup oldRodEncounterGroup = new SafariZoneEncounterGroup(); + public SafariZoneEncounterGroup goodRodEncounterGroup = new SafariZoneEncounterGroup(); + public SafariZoneEncounterGroup superRodEncounterGroup = new SafariZoneEncounterGroup(); + + public SafariZoneEncounterFile(int id) { + this.ID = id; + string path = Filesystem.GetSafariZonePath(id); + parse_file(path); + } + + public SafariZoneEncounterFile(string path) { + parse_file(path); + } + + public void parse_file(string path) { + FileStream fs = new FileStream(path, FileMode.Open); + using (BinaryReader br = new BinaryReader(fs)) { + if (br.BaseStream.Length < 5) return; + //#1 Section - Object Arrangement Allocation + grassEncounterGroup.readObjectSlots(br); + surfEncounterGroup.readObjectSlots(br); + oldRodEncounterGroup.readObjectSlots(br); + goodRodEncounterGroup.readObjectSlots(br); + superRodEncounterGroup.readObjectSlots(br); + + br.ReadByte(); + br.ReadByte(); + br.ReadByte(); + + grassEncounterGroup.readGroup(br); + surfEncounterGroup.readGroup(br); + oldRodEncounterGroup.readGroup(br); + goodRodEncounterGroup.readGroup(br); + superRodEncounterGroup.readGroup(br); + } + } + + public byte[] ToByteArray() { + MemoryStream newData = new MemoryStream(); + using (BinaryWriter bw = new BinaryWriter(newData)) { + grassEncounterGroup.writeObjectSlots(bw); + surfEncounterGroup.writeObjectSlots(bw); + oldRodEncounterGroup.writeObjectSlots(bw); + goodRodEncounterGroup.writeObjectSlots(bw); + superRodEncounterGroup.writeObjectSlots(bw); + + bw.Write((byte)0); + bw.Write((byte)0); + bw.Write((byte)0); + + grassEncounterGroup.writeGroup(bw); + surfEncounterGroup.writeGroup(bw); + oldRodEncounterGroup.writeGroup(bw); + goodRodEncounterGroup.writeGroup(bw); + superRodEncounterGroup.writeGroup(bw); + } + return newData.ToArray(); + } + + public bool SaveToFile() { + string path = Filesystem.GetSafariZonePath(ID); + return SaveToFile(path); + } + + public bool SaveToFile(int id) { + string path = Filesystem.GetSafariZonePath(id); + return SaveToFile(path); + } + + + public bool SaveToFile(string path, bool showSuccessMessage = true) { + byte[] romFileToByteArray = ToByteArray(); + File.WriteAllBytes(path, romFileToByteArray); + return true; + } + } +} diff --git a/DS_Map/ROMFiles/SafariZoneEncounterGroup.cs b/DS_Map/ROMFiles/SafariZoneEncounterGroup.cs new file mode 100644 index 0000000..f94be89 --- /dev/null +++ b/DS_Map/ROMFiles/SafariZoneEncounterGroup.cs @@ -0,0 +1,108 @@ +using System.ComponentModel; +using System.IO; + +namespace DSPRE.ROMFiles +{ + public class SafariZoneEncounterGroup + { + private const int EncounterSlots = 10; + + public byte ObjectSlots; + public BindingList MorningEncounters = new BindingList(); + public BindingList DayEncounters = new BindingList(); + public BindingList NightEncounters = new BindingList(); + public BindingList MorningEncountersObject = new BindingList(); + public BindingList DayEncountersObject = new BindingList(); + public BindingList NightEncountersObject = new BindingList(); + public BindingList ObjectRequirements = new BindingList(); + public BindingList OptionalObjectRequirements = new BindingList(); + + public void readObjectSlots(BinaryReader br) { + ObjectSlots = br.ReadByte(); + } + + public void writeObjectSlots(BinaryWriter bw) { + bw.Write((byte)ObjectSlots); + } + + public void readGroup(BinaryReader br) { + //#2 Section - Tall Grass Encounters + for (int i = 0; i < EncounterSlots; i++) { + MorningEncounters.Add(new SafariZoneEncounter(br)); + br.ReadByte(); + } + + for (int i = 0; i < EncounterSlots; i++) { + DayEncounters.Add(new SafariZoneEncounter(br)); + br.ReadByte(); + } + + for (int i = 0; i < EncounterSlots; i++) { + NightEncounters.Add(new SafariZoneEncounter(br)); + br.ReadByte(); + } + + //#3 Section - Tall Grass Encounters (Object Arrangement) + for (int i = 0; i < ObjectSlots; i++) { + MorningEncountersObject.Add(new SafariZoneEncounter(br)); + br.ReadByte(); + } + + for (int i = 0; i < ObjectSlots; i++) { + DayEncountersObject.Add(new SafariZoneEncounter(br)); + br.ReadByte(); + } + + for (int i = 0; i < ObjectSlots; i++) { + NightEncountersObject.Add(new SafariZoneEncounter(br)); + br.ReadByte(); + } + + //#4 Section - Object Arrangement Requirements (Tall Grass) + for (int i = 0; i < ObjectSlots; i++) { + ObjectRequirements.Add(new SafariZoneObjectRequirement(br)); + OptionalObjectRequirements.Add(new SafariZoneObjectRequirement(br)); + } + } + + public void writeGroup(BinaryWriter bw) { + //#2 Section - Tall Grass Encounters + for (int i = 0; i < MorningEncounters.Count; i++) { + MorningEncounters[i].writeEncounter(bw); + bw.Write((byte)0); + } + + for (int i = 0; i < EncounterSlots; i++) { + DayEncounters[i].writeEncounter(bw); + bw.Write((byte)0); + } + + for (int i = 0; i < EncounterSlots; i++) { + NightEncounters[i].writeEncounter(bw); + bw.Write((byte)0); + } + + //#3 Section - Tall Grass Encounters (Object Arrangement) + for (int i = 0; i < ObjectSlots; i++) { + MorningEncountersObject[i].writeEncounter(bw); + bw.Write((byte)0); + } + + for (int i = 0; i < ObjectSlots; i++) { + DayEncountersObject[i].writeEncounter(bw); + bw.Write((byte)0); + } + + for (int i = 0; i < ObjectSlots; i++) { + NightEncountersObject[i].writeEncounter(bw); + bw.Write((byte)0); + } + + //#4 Section - Object Arrangement Requirements (Tall Grass) + for (int i = 0; i < ObjectSlots; i++) { + ObjectRequirements[i].writeRequirement(bw); + OptionalObjectRequirements[i].writeRequirement(bw); + } + } + } +} diff --git a/DS_Map/ROMFiles/SafariZoneObjectRequirement.cs b/DS_Map/ROMFiles/SafariZoneObjectRequirement.cs new file mode 100644 index 0000000..8fbaf65 --- /dev/null +++ b/DS_Map/ROMFiles/SafariZoneObjectRequirement.cs @@ -0,0 +1,40 @@ +using System.Collections.Generic; +using System.IO; + +namespace DSPRE.ROMFiles { + public class SafariZoneObjectRequirement { + public static Dictionary ObjectTypes = new Dictionary() { + { 0, "No Requirement" }, + { 1, "Plains" }, + { 2, "Forest" }, + { 3, "Peak" }, + { 4, "Waterside" }, + }; + + public byte typeID; + public byte quantity; + + public SafariZoneObjectRequirement(byte typeID = 0, byte quantity = 0) { + this.typeID = typeID; + this.quantity = quantity; + } + + public SafariZoneObjectRequirement(BinaryReader br) { + readRequirement(br); + } + + public void readRequirement(BinaryReader br) { + typeID = br.ReadByte(); + quantity = br.ReadByte(); + } + + public void writeRequirement(BinaryWriter bw) { + bw.Write((byte)typeID); + bw.Write((byte)quantity); + } + + public override string ToString() { + return $"{typeID} {ObjectTypes[typeID]}: {quantity}"; + } + } +} diff --git a/DS_Map/ROMFiles/ScriptActionContainer.cs b/DS_Map/ROMFiles/ScriptActionContainer.cs new file mode 100644 index 0000000..a004d56 --- /dev/null +++ b/DS_Map/ROMFiles/ScriptActionContainer.cs @@ -0,0 +1,13 @@ +using System.Collections.Generic; + +namespace DSPRE.ROMFiles { + public class ScriptActionContainer { + public List commands; + public uint manualUserID; + + public ScriptActionContainer(uint actionNumber, List commands = null) { + manualUserID = actionNumber; + this.commands = commands; + } + } +} diff --git a/DS_Map/ROMFiles/ScriptCommand.cs b/DS_Map/ROMFiles/ScriptCommand.cs index 8472bb2..ddb7e68 100644 --- a/DS_Map/ROMFiles/ScriptCommand.cs +++ b/DS_Map/ROMFiles/ScriptCommand.cs @@ -4,41 +4,25 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; using System.Windows.Forms; -using static DSPRE.ROMFiles.Event; -using static DSPRE.ROMFiles.ScriptFile; namespace DSPRE.ROMFiles { - public enum ParamTypeEnum { INTEGER, VARIABLE, FLEX, OW_ID, OW_MOVEMENT_TYPE, OW_DIRECTION, FUNCTION_ID, ACTION_ID, CMD_NUMBER }; - public class CommandContainer { - public List commands; - public uint manualUserID; - public int usedScript; //useScript ID referenced by this Script/Function - public containerTypes containerType; - internal static readonly string functionStart; - - #region Constructors (2) - public CommandContainer(uint scriptNumber, containerTypes containerType, int useScript = -1, List commandList = null) { - manualUserID = scriptNumber; - this.usedScript = useScript; - this.containerType = containerType; - commands = commandList; - } - public CommandContainer(uint newID, CommandContainer toCopy) { - manualUserID = newID; - usedScript = toCopy.usedScript; - containerType = toCopy.containerType; - commands = new List(toCopy.commands); //command parameters need to be copied recursively - } - #endregion - } public class ScriptCommand { - #region Fields (4) + enum ParamTypeEnum { + INTEGER, + VARIABLE, + FLEX, + OW_ID, + OW_MOVEMENT_TYPE, + OW_DIRECTION, + FUNCTION_ID, + ACTION_ID, + CMD_NUMBER + }; + public ushort? id; public List cmdParams; public string name; - #endregion - #region Constructors (2) public ScriptCommand(ushort id, List parametersList) { if (parametersList is null) { this.id = null; @@ -50,20 +34,20 @@ namespace DSPRE.ROMFiles { } switch (id) { - case 0x0016: // Jump - case 0x001A: // Call + case 0x0016: // Jump + case 0x001A: // Call name += $" {FormatNumber(parametersList[0], ParamTypeEnum.FUNCTION_ID)}"; break; - case 0x0017: // JumpIfObjID - case 0x0018: // JumpIfEventID + case 0x0017: // JumpIfObjID + case 0x0018: // JumpIfEventID name += $" {FormatNumber(parametersList[0], ParamTypeEnum.OW_ID)} {FormatNumber(parametersList[1])}"; break; - case 0x0019: // JumpIfPlayerDir + case 0x0019: // JumpIfPlayerDir name += $" {FormatNumber(parametersList[0], ParamTypeEnum.OW_DIRECTION)} {FormatNumber(parametersList[1], ParamTypeEnum.ACTION_ID)}"; break; - case 0x001C: // JumpIf - case 0x001D: // CallIf - { + case 0x001C: // JumpIf + case 0x001D: // CallIf + { string number = FormatNumber(parametersList[1], ParamTypeEnum.FUNCTION_ID); if (RomInfo.ScriptComparisonOperatorsDict.TryGetValue(parametersList[0][0], out string v)) { @@ -71,131 +55,150 @@ namespace DSPRE.ROMFiles { } else { name += $" {parametersList[0][0]} {number}"; } + break; } - case 0x005E: // Movement + case 0x005E: // Movement name += $" {FormatNumber(parametersList[0], ParamTypeEnum.OW_ID)} {FormatNumber(parametersList[1], ParamTypeEnum.ACTION_ID)}"; break; - case 0x006A: // GetOverworldPosition + case 0x006A: // GetOverworldPosition name += FormatCmd_Overworld_TwoParams(parametersList); break; - case 0x0062: // Lock - case 0x0063: // Release - case 0x0064: // AddOW - case 0x0065: // RemoveOW + case 0x0062: // Lock + case 0x0063: // Release + case 0x0064: // AddOW + case 0x0065: // RemoveOW name += $" {FormatNumber(parametersList[0], ParamTypeEnum.OW_ID)}"; break; - case 0x006D: // SetOverworldMovement + case 0x006D: // SetOverworldMovement name += FormatCmd_Overworld_Move(parametersList); break; - case 0x00B0: // Warp [HGSS] + case 0x00B0: // Warp [HGSS] if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.HGSS)) { name += FormatCmd_Warp(parametersList); } else { goto default; } + break; - case 0x0152: // SetOverworldDefaultPosition [HGSS] + case 0x0152: // SetOverworldDefaultPosition [HGSS] if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.HGSS)) { name += FormatCmd_Overworld_TwoParams(parametersList); } else { goto default; } + break; - case 0x0153: // SetOverworldPosition [HGSS] + case 0x0153: // SetOverworldPosition [HGSS] if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.HGSS)) { name += FormatCmd_Overworld_3Coords_Dir(parametersList); } else { goto default; } + break; - case 0x0154: // SetOverworldDefaultMovement [HGSS] + case 0x0154: // SetOverworldDefaultMovement [HGSS] if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.HGSS)) { name += FormatCmd_Overworld_Move(parametersList); } else { goto default; } + break; - case 0x0155: // SetOverworldDefaultDirection [DPPt] + case 0x0155: // SetOverworldDefaultDirection [DPPt] if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.HGSS)) { name += FormatCmd_Overworld_Dir(parametersList); } else { goto default; } + break; - case 0x0158: // SetOverworldDirection [DPPt] + case 0x0158: // SetOverworldDirection [DPPt] if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.HGSS)) { name += FormatCmd_Overworld_Dir(parametersList); } else { goto default; } + break; - case 0x00BE: // Warp [DPPt] + case 0x00BE: // Warp [DPPt] if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.DP) || RomInfo.gameFamily.Equals(RomInfo.GameFamilies.Plat)) { name += FormatCmd_Warp(parametersList); } else { goto default; } + break; - case 0x0186: // SetOverworldDefaultPosition [DPPt] + case 0x0186: // SetOverworldDefaultPosition [DPPt] if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.DP) || RomInfo.gameFamily.Equals(RomInfo.GameFamilies.Plat)) { name += FormatCmd_Overworld_TwoParams(parametersList); } else { goto default; } + break; - case 0x0187: // SetOverworldPosition [DPPt] + case 0x0187: // SetOverworldPosition [DPPt] if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.DP) || RomInfo.gameFamily.Equals(RomInfo.GameFamilies.Plat)) { name += FormatCmd_Overworld_3Coords_Dir(parametersList); } else { goto default; } + break; - case 0x0188: // SetOverworldDefaultMovement [DPPt] + case 0x0188: // SetOverworldDefaultMovement [DPPt] if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.DP) || RomInfo.gameFamily.Equals(RomInfo.GameFamilies.Plat)) { name += FormatCmd_Overworld_Move(parametersList); } else { goto default; } + break; - case 0x0189: // SetOverworldDefaultDirection [DPPt] + case 0x0189: // SetOverworldDefaultDirection [DPPt] if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.DP) || RomInfo.gameFamily.Equals(RomInfo.GameFamilies.Plat)) { name += FormatCmd_Overworld_Dir(parametersList); } else { goto default; } + break; - case 0x018C: // SetOverworldDirection [DPPt] + case 0x018C: // SetOverworldDirection [DPPt] if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.DP) || RomInfo.gameFamily.Equals(RomInfo.GameFamilies.Plat)) { name += FormatCmd_Overworld_Dir(parametersList); } else { goto default; } + break; default: for (int i = 0; i < parametersList.Count; i++) { name += $" {FormatNumber(parametersList[i])}"; } - break; + break; } + this.id = id; this.cmdParams = parametersList; } + private string FormatCmd_Warp(List parametersList) { return $" {FormatNumber(parametersList[0])} {FormatNumber(parametersList[1])} {FormatNumber(parametersList[2])} {FormatNumber(parametersList[3])} {FormatNumber(parametersList[4], ParamTypeEnum.OW_DIRECTION)}"; } + private string FormatCmd_Overworld_TwoParams(List parametersList) { return $" {FormatNumber(parametersList[0], ParamTypeEnum.OW_ID)} {FormatNumber(parametersList[1])} {FormatNumber(parametersList[2])}"; } + private string FormatCmd_Overworld_Move(List parametersList) { return $" {FormatNumber(parametersList[0], ParamTypeEnum.OW_ID)} {FormatNumber(parametersList[1], ParamTypeEnum.OW_MOVEMENT_TYPE)}"; } + private string FormatCmd_Overworld_3Coords_Dir(List parametersList) { return $" {FormatNumber(parametersList[0], ParamTypeEnum.OW_ID)} {FormatNumber(parametersList[1])} {FormatNumber(parametersList[2])} {FormatNumber(parametersList[3])} {FormatNumber(parametersList[4], ParamTypeEnum.OW_DIRECTION)}"; } + private string FormatCmd_Overworld_Dir(List parametersList) { return $" {FormatNumber(parametersList[0], ParamTypeEnum.OW_ID)} {FormatNumber(parametersList[1], ParamTypeEnum.OW_DIRECTION)}"; } @@ -212,7 +215,6 @@ namespace DSPRE.ROMFiles { } else { try { id = ushort.Parse(nameParts[0].PurgeSpecial(ScriptFile.specialChars), nameParts[0].GetNumberStyle()); - //id = ushort.Parse(nameParts[0].Substring(nameParts[0].("_")+1), Properties.Settings.Default.scriptEditorFormatPreference, CultureInfo.InvariantCulture); } catch { string details; if (wholeLine.Contains(':') && wholeLine.ContainsNumber()) { @@ -223,7 +225,7 @@ namespace DSPRE.ROMFiles { } MessageBox.Show("This Script file could not be saved." + - $"\nParser failed to interpret line {lineNumber}: \"{wholeLine}\".\n\n{details}", "Parser error", MessageBoxButtons.OK, MessageBoxIcon.Error); + $"\nParser failed to interpret line {lineNumber}: \"{wholeLine}\".\n\n{details}", "Parser error", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } } @@ -235,7 +237,7 @@ namespace DSPRE.ROMFiles { int paramLength = 0; int paramsProcessed = 0; - if (parametersSizeArr.First() == 0xFF) { + if (parametersSizeArr.First() == 0xFF) { int firstParamValue = int.Parse(nameParts[1].PurgeSpecial(ScriptFile.specialChars), nameParts[1].GetNumberStyle()); byte firstParamSize = parametersSizeArr[1]; @@ -262,7 +264,7 @@ namespace DSPRE.ROMFiles { // 5, 3, (2, 2, 2) => this will be the parameters subarray // 6, 1, 2 // }, - byte[] subParametersSize = parametersSizeArr.SubArray(i + 2, paramLength++); + byte[] subParametersSize = parametersSizeArr.SubArray(i + 2, paramLength++); //Create a slightly bigger temp array byte[] temp = new byte[1 + subParametersSize.Length]; @@ -271,26 +273,28 @@ namespace DSPRE.ROMFiles { temp[0] = firstParamSize; //Then copy the whole subarray of parameter sizes - Array.Copy(subParametersSize, 0, temp, 1, temp.Length-1); + Array.Copy(subParametersSize, 0, temp, 1, temp.Length - 1); //Replace the original parametersSizeArr with the new array parametersSizeArr = temp; found = true; break; } + i += 2 + paramLength; optionsCount++; } + if (!found) { MessageBox.Show($"Command {nameParts[0]} is a special Script Command.\n" + - $"The value of the first parameter must be a number in the range [0 - {optionsCount}].\n\n" + - $"Line {lineNumber}: {wholeLine}", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + $"The value of the first parameter must be a number in the range [0 - {optionsCount}].\n\n" + + $"Line {lineNumber}: {wholeLine}", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); id = null; return; } } else if (parametersSizeArr.Length == 1 && parametersSizeArr.First() == 0) { paramLength = 0; - } else { + } else { paramLength = parametersSizeArr.Length; } @@ -304,7 +308,7 @@ namespace DSPRE.ROMFiles { /* Convert strings of parameters to the correct datatypes */ NumberStyles numStyle = nameParts[i + 1].GetNumberStyle(); nameParts[i + 1] = nameParts[i + 1].PurgeSpecial(ScriptFile.specialChars); - + int result = 0; try { @@ -312,9 +316,9 @@ namespace DSPRE.ROMFiles { } catch { if (string.IsNullOrWhiteSpace(nameParts[i + 1])) { MessageBox.Show($"You must specify an Overworld ID, Script, Function or Action number.\n\n" + - $"Line {lineNumber}: {wholeLine}", "Unspecified identifier", MessageBoxButtons.OK, MessageBoxIcon.Error); + $"Line {lineNumber}: {wholeLine}", "Unspecified identifier", MessageBoxButtons.OK, MessageBoxIcon.Error); id = null; - } else { + } else { var first = ScriptDatabase.specialOverworlds.FirstOrDefault(x => x.Value.IgnoreCaseEquals(nameParts[i + 1])); if (string.IsNullOrWhiteSpace(first.Value)) { @@ -322,7 +326,7 @@ namespace DSPRE.ROMFiles { if (string.IsNullOrWhiteSpace(res.Value)) { MessageBox.Show($"Argument {nameParts[i + 1]} couldn't be parsed as a valid Condition, Overworld ID, Direction ID, Script, Function or Action number.\n\n" + - $"Line {lineNumber}: {wholeLine}", "Invalid identifier", MessageBoxButtons.OK, MessageBoxIcon.Error); + $"Line {lineNumber}: {wholeLine}", "Invalid identifier", MessageBoxButtons.OK, MessageBoxIcon.Error); id = null; } else { result = res.Key; @@ -343,14 +347,12 @@ namespace DSPRE.ROMFiles { } } else { MessageBox.Show($"Wrong number of parameters for command {nameParts[0]} at line {lineNumber}.\n" + - $"Received: {nameParts.Length - 1}\n" + - $"Expected: {paramLength}", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + $"Received: {nameParts.Length - 1}\n" + + $"Expected: {paramLength}", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); id = null; } } - #endregion - #region Utilities private string FormatNumber(byte[] par, ParamTypeEnum paramType = ParamTypeEnum.INTEGER) { //number acquisition uint num; @@ -365,8 +367,10 @@ namespace DSPRE.ROMFiles { } else { throw new InvalidOperationException(); } + return FormatNumber(num, paramType); } + private string FormatNumber(uint num, ParamTypeEnum paramType = ParamTypeEnum.INTEGER) { //differentiate depending on param type string formatOverride; @@ -387,36 +391,37 @@ namespace DSPRE.ROMFiles { return "CMD_" + prefix + num.ToString(formatOverride + '3'); case ParamTypeEnum.FUNCTION_ID: - return containerTypes.Function.ToString() + "#" + num; + return ScriptFile.ContainerTypes.Function.ToString() + "#" + num; case ParamTypeEnum.ACTION_ID: - return containerTypes.Action.ToString() + "#" + num; + return ScriptFile.ContainerTypes.Action.ToString() + "#" + num; case ParamTypeEnum.OW_MOVEMENT_TYPE: if (num < 4000) { outp += "Move."; } + goto default; - case ParamTypeEnum.OW_ID: - { + case ParamTypeEnum.OW_ID: { if (ScriptDatabase.specialOverworlds.TryGetValue((ushort)num, out string output)) { return output; } else { if (num < 4000) { - outp += $"{EventType.Overworld}."; + outp += $"{Event.EventType.Overworld}."; } + goto default; } } - case ParamTypeEnum.OW_DIRECTION: - { + case ParamTypeEnum.OW_DIRECTION: { if (ScriptDatabase.overworldDirections.TryGetValue((byte)num, out string output)) { return output; } else { if (num < 4000) { outp += $"Direction."; } + goto default; } } @@ -427,15 +432,16 @@ namespace DSPRE.ROMFiles { prefix = "0x"; } } + outp += prefix + num.ToString(formatOverride); break; } - + return outp; } + public override string ToString() { return name + " (" + ((ushort)id).ToString("X") + ")"; } - #endregion } } diff --git a/DS_Map/ROMFiles/ScriptCommandContainer.cs b/DS_Map/ROMFiles/ScriptCommandContainer.cs new file mode 100644 index 0000000..e374cea --- /dev/null +++ b/DS_Map/ROMFiles/ScriptCommandContainer.cs @@ -0,0 +1,25 @@ +using System.Collections.Generic; + +namespace DSPRE.ROMFiles { + public class ScriptCommandContainer { + public List commands; + public uint manualUserID; + public int usedScriptID; //useScript ID referenced by this Script/Function + public ScriptFile.ContainerTypes containerType; + internal static readonly string functionStart; + + public ScriptCommandContainer(uint scriptNumber, ScriptFile.ContainerTypes containerType, int usedScriptID = -1, List commandList = null) { + manualUserID = scriptNumber; + this.usedScriptID = usedScriptID; + this.containerType = containerType; + commands = commandList; + } + + public ScriptCommandContainer(uint newID, ScriptCommandContainer toCopy) { + manualUserID = newID; + usedScriptID = toCopy.usedScriptID; + containerType = toCopy.containerType; + commands = new List(toCopy.commands); //command parameters need to be copied recursively + } + } +} diff --git a/DS_Map/ROMFiles/ScriptFile.cs b/DS_Map/ROMFiles/ScriptFile.cs index 864abdc..4e6f223 100644 --- a/DS_Map/ROMFiles/ScriptFile.cs +++ b/DS_Map/ROMFiles/ScriptFile.cs @@ -1,67 +1,64 @@ using DSPRE.Resources; -using ScintillaNET; using System; using System.Collections.Generic; -using System.Globalization; using System.IO; using System.Linq; using System.Windows.Forms; -using static DSPRE.ROMFiles.ScriptFile; -using static DSPRE.RomInfo; namespace DSPRE.ROMFiles { /// /// Class to store script file data in Pokémon NDS games /// public class ScriptFile : RomFile { - #region Constants //this enum doesn't really make much sense now but it will, once scripts can be called and jumped to - public enum containerTypes { Function, Action, Script }; + public enum ContainerTypes { + Function, + Action, + Script + }; public struct ContainerReference { public uint ID; public uint offsetInFile; } - #endregion - - #region Fields (3) - public List allScripts = new List(); - public List allFunctions = new List(); - public List allActions = new List(); - public int? fileID = null; + public List allScripts = new List(); + public List allFunctions = new List(); + public List allActions = new List(); + public int fileID = -1; public bool isLevelScript = new bool(); - public static readonly char[] specialChars = { 'x', 'X', '#', '.', '_' }; - #endregion + public bool hasNoScripts { get { return fileID == int.MaxValue; } } - #region Constructors (1) + public static readonly char[] specialChars = { 'x', 'X', '#', '.', '_' }; public ScriptFile(Stream fs, bool readFunctions = true, bool readActions = true) { List scriptOffsets = new List(); List functionOffsets = new List(); List movementOffsets = new List(); - using (BinaryReader scrReader = new BinaryReader(fs)) { + using (BinaryReader br = new BinaryReader(fs)) { /* Read script offsets from the header */ isLevelScript = true; // Is Level Script as long as magic number FD13 doesn't exist try { while (true) { - uint checker = scrReader.ReadUInt16(); - scrReader.BaseStream.Position -= 0x2; - uint value = scrReader.ReadUInt32(); + uint checker = br.ReadUInt16(); + br.BaseStream.Position -= 0x2; + uint value = br.ReadUInt32(); if (value == 0 && scriptOffsets.Count == 0) { isLevelScript = true; break; - } else if (checker == 0xFD13) { - scrReader.BaseStream.Position -= 0x4; + } + + if (checker == 0xFD13) { + br.BaseStream.Position -= 0x4; isLevelScript = false; break; - } else { - int offsetFromStart = (int)(value + scrReader.BaseStream.Position); // Don't change order of addition - scriptOffsets.Add(offsetFromStart); } + + int offsetFromStart = (int)(value + br.BaseStream.Position); // Don't change order of addition + scriptOffsets.Add(offsetFromStart); } } catch (EndOfStreamException) { if (!isLevelScript) { @@ -78,12 +75,12 @@ namespace DSPRE.ROMFiles { int index = scriptOffsets.FindIndex(x => x == scriptOffsets[(int)current]); // Check for UseScript if (index == current) { - scrReader.BaseStream.Position = scriptOffsets[(int)current]; + br.BaseStream.Position = scriptOffsets[(int)current]; List cmdList = new List(); bool endScript = new bool(); while (!endScript) { - ScriptCommand cmd = ReadCommand(scrReader, ref functionOffsets, ref movementOffsets); + ScriptCommand cmd = ReadCommand(br, ref functionOffsets, ref movementOffsets); if (cmd.cmdParams is null) { return; } @@ -94,23 +91,24 @@ namespace DSPRE.ROMFiles { endScript = true; } } - allScripts.Add(new CommandContainer(current + 1, containerTypes.Script, commandList: cmdList)); + + allScripts.Add(new ScriptCommandContainer(current + 1, ContainerTypes.Script, commandList: cmdList)); } else { - allScripts.Add(new CommandContainer(current + 1, containerTypes.Script, useScript: index + 1)); + allScripts.Add(new ScriptCommandContainer(current + 1, ContainerTypes.Script, usedScriptID: index + 1)); } } /* Read functions */ if (readFunctions) { for (uint current = 0; current < functionOffsets.Count; current++) { - scrReader.BaseStream.Position = functionOffsets[(int)current]; + br.BaseStream.Position = functionOffsets[(int)current]; int posInList = scriptOffsets.IndexOf(functionOffsets[(int)current]); // Check for UseScript if (posInList == -1) { List cmdList = new List(); bool endFunction = new bool(); while (!endFunction) { - ScriptCommand command = ReadCommand(scrReader, ref functionOffsets, ref movementOffsets); + ScriptCommand command = ReadCommand(br, ref functionOffsets, ref movementOffsets); if (command.cmdParams is null) { return; } @@ -120,9 +118,10 @@ namespace DSPRE.ROMFiles { endFunction = true; } } - allFunctions.Add(new CommandContainer(current + 1, containerTypes.Function, commandList: cmdList)); + + allFunctions.Add(new ScriptCommandContainer(current + 1, ContainerTypes.Function, commandList: cmdList)); } else { - allFunctions.Add(new CommandContainer(current + 1, containerTypes.Function, useScript: posInList + 1)); + allFunctions.Add(new ScriptCommandContainer(current + 1, ContainerTypes.Function, usedScriptID: posInList + 1)); } } } @@ -130,53 +129,65 @@ namespace DSPRE.ROMFiles { if (readActions) { /* Read movements */ for (uint current = 0; current < movementOffsets.Count; current++) { - scrReader.BaseStream.Position = movementOffsets[(int)current]; + br.BaseStream.Position = movementOffsets[(int)current]; List cmdList = new List(); bool endMovement = new bool(); while (!endMovement) { - ushort id = scrReader.ReadUInt16(); + ushort id = br.ReadUInt16(); if (id == 0xFE) { endMovement = true; cmdList.Add(new ScriptAction(id, 0)); } else { - cmdList.Add(new ScriptAction(id, scrReader.ReadUInt16())); + cmdList.Add(new ScriptAction(id, br.ReadUInt16())); } } - allActions.Add(new ActionContainer(current + 1, actionCommandsList: cmdList)); + + allActions.Add(new ScriptActionContainer(current + 1, commands: cmdList)); } } } } - public ScriptFile(int fileID, bool readFunctions = true, bool readActions = true) : - this(new FileStream(RomInfo.gameDirs[DirNames.scripts].unpackedDir + "\\" + fileID.ToString("D4"), FileMode.Open), readFunctions, readActions) { + public ScriptFile(int fileID, bool readFunctions = true, bool readActions = true) : this(getFileStream(fileID), readFunctions, readActions) { this.fileID = fileID; } - public ScriptFile(List scripts, List functions, List movements, int fileID = -1) { + + static FileStream getFileStream(int fileID) { + string path = Filesystem.GetScriptPath(fileID); + return new FileStream(path, FileMode.OpenOrCreate); + } + + public override string ToString() { + string prefix = isLevelScript ? "Level " : ""; + return $"{prefix}Script File " + this.fileID; + } + + public ScriptFile(List scripts, List functions, List movements, int fileID = -1) { allScripts = scripts; allFunctions = functions; allActions = movements; isLevelScript = false; } + public ScriptFile(IEnumerable scriptLines, IEnumerable functionLines, IEnumerable actionLines, int fileID = -1) { //TODO: give user the possibility to jump to/call a script //once it's done, this Predicate below will be the only one needed, since there will be no distinction between //a script and a function bool functionEndCondition(List<(int linenum, string text)> source, int x, ushort? id) { return source[x].text.TrimEnd().IgnoreCaseEquals(RomInfo.ScriptCommandNamesDict[0x0002]) //End - || source[x].text.IndexOf(RomInfo.ScriptCommandNamesDict[0x0016] + ' ' + containerTypes.Function.ToString(), StringComparison.InvariantCultureIgnoreCase) >= 0 //Jump Function_# - || source[x].text.TrimEnd().IgnoreCaseEquals(RomInfo.ScriptCommandNamesDict[0x001B]) - || ScriptDatabase.endCodes.Contains(id); - } //Return + || source[x].text.IndexOf(RomInfo.ScriptCommandNamesDict[0x0016] + ' ' + ContainerTypes.Function.ToString(), StringComparison.InvariantCultureIgnoreCase) >= 0 //Jump Function_# + || source[x].text.TrimEnd().IgnoreCaseEquals(RomInfo.ScriptCommandNamesDict[0x001B]) + || ScriptDatabase.endCodes.Contains(id); + } //Return bool scriptEndCondition(List<(int linenum, string text)> source, int x, ushort? id) { - return source[x].text.TrimEnd().IgnoreCaseEquals(RomInfo.ScriptCommandNamesDict[0x0002]) //End - || source[x].text.IndexOf(RomInfo.ScriptCommandNamesDict[0x0016] + ' ' + containerTypes.Function.ToString()) >= 0 //Jump Function_# - || ScriptDatabase.endCodes.Contains(id); + return source[x].text.TrimEnd().IgnoreCaseEquals(RomInfo.ScriptCommandNamesDict[0x0002]) //End + || source[x].text.IndexOf(RomInfo.ScriptCommandNamesDict[0x0016] + ' ' + ContainerTypes.Function.ToString()) >= 0 //Jump Function_# + || ScriptDatabase.endCodes.Contains(id); } - allScripts = ReadCommandsFromLines(scriptLines.ToList(), containerTypes.Script, scriptEndCondition); //Jump + whitespace + allScripts = ReadCommandsFromLines(scriptLines.ToList(), ContainerTypes.Script, scriptEndCondition); //Jump + whitespace if (allScripts is null) { return; } @@ -187,7 +198,7 @@ namespace DSPRE.ROMFiles { } if (functionLines != null) { - allFunctions = ReadCommandsFromLines(functionLines.ToList(), containerTypes.Function, functionEndCondition); //Jump + whitespace + allFunctions = ReadCommandsFromLines(functionLines.ToList(), ContainerTypes.Function, functionEndCondition); //Jump + whitespace if (allFunctions is null) { return; } @@ -202,17 +213,15 @@ namespace DSPRE.ROMFiles { this.fileID = fileID; } - #endregion - #region Methods (1) private ScriptCommand ReadCommand(BinaryReader dataReader, ref List functionOffsets, ref List actionOffsets) { ushort id = dataReader.ReadUInt16(); List parameterList = new List(); /* How to read parameters for different commands for DPPt*/ switch (RomInfo.gameFamily) { - case GameFamilies.DP: - case GameFamilies.Plat: + case RomInfo.GameFamilies.DP: + case RomInfo.GameFamilies.Plat: switch (id) { case 0x16: //Jump case 0x1A: //Call @@ -223,15 +232,15 @@ namespace DSPRE.ROMFiles { case 0x19: //JumpIfPlayerDir case 0x1C: //JumpIf case 0x1D: //CallIf - //in the case of JumpIf and CallIf, the first param is a comparisonOperator - //for JumpIfPlayerDir it's a directionID - //for JumpIfObjID, it's an EventID + //in the case of JumpIf and CallIf, the first param is a comparisonOperator + //for JumpIfPlayerDir it's a directionID + //for JumpIfObjID, it's an EventID parameterList.Add(new byte[] { dataReader.ReadByte() }); ProcessRelativeJump(dataReader, ref parameterList, ref functionOffsets); break; case 0x5E: // Movement case 0x2A1: // Movement2 - //in the case of Movement, the first param is an overworld ID + //in the case of Movement, the first param is an overworld ID parameterList.Add(BitConverter.GetBytes(dataReader.ReadUInt16())); ProcessRelativeJump(dataReader, ref parameterList, ref actionOffsets); break; @@ -318,7 +327,7 @@ namespace DSPRE.ROMFiles { } break; case 0x2C5: { - if (RomInfo.gameVersion == GameVersions.Platinum) { + if (RomInfo.gameVersion == RomInfo.GameVersions.Platinum) { parameterList.Add(dataReader.ReadBytes(2)); parameterList.Add(dataReader.ReadBytes(2)); } else { @@ -330,25 +339,27 @@ namespace DSPRE.ROMFiles { case 0x2C9: case 0x2CA: case 0x2CD: - if (RomInfo.gameVersion == GameVersions.Platinum) { + if (RomInfo.gameVersion == RomInfo.GameVersions.Platinum) { break; } else { goto default; } case 0x2CF: - if (RomInfo.gameVersion == GameVersions.Platinum) { + if (RomInfo.gameVersion == RomInfo.GameVersions.Platinum) { parameterList.Add(dataReader.ReadBytes(2)); parameterList.Add(dataReader.ReadBytes(2)); } else { goto default; } + break; default: addParametersToList(ref parameterList, id, dataReader); break; } + break; - case GameFamilies.HGSS: + case RomInfo.GameFamilies.HGSS: switch (id) { case 0x16: //Jump case 0x1A: //Call @@ -377,7 +388,7 @@ namespace DSPRE.ROMFiles { } break; case 0x1D1: // Number of parameters differ depending on the first parameter value - { + { short parameter1 = dataReader.ReadInt16(); parameterList.Add(BitConverter.GetBytes(parameter1)); switch (parameter1) { @@ -403,7 +414,7 @@ namespace DSPRE.ROMFiles { } break; case 0x1E9: // Number of parameters differ depending on the first parameter value - { + { short parameter1 = dataReader.ReadInt16(); parameterList.Add(BitConverter.GetBytes(parameter1)); switch (parameter1) { @@ -433,8 +444,10 @@ namespace DSPRE.ROMFiles { addParametersToList(ref parameterList, id, dataReader); break; } + break; } + return new ScriptCommand(id, parameterList); } @@ -462,28 +475,30 @@ namespace DSPRE.ROMFiles { } } catch (NullReferenceException) { MessageBox.Show("Script command " + id + "can't be handled for now." + - Environment.NewLine + "Reference offset 0x" + dataReader.BaseStream.Position.ToString("X"), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + Environment.NewLine + "Reference offset 0x" + dataReader.BaseStream.Position.ToString("X"), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); parameterList = null; return; } catch { MessageBox.Show("Error: ID Read - " + id + - Environment.NewLine + "Reference offset 0x" + dataReader.BaseStream.Position.ToString("X"), "Unrecognized script command", MessageBoxButtons.OK, MessageBoxIcon.Error); + Environment.NewLine + "Reference offset 0x" + dataReader.BaseStream.Position.ToString("X"), "Unrecognized script command", MessageBoxButtons.OK, MessageBoxIcon.Error); parameterList = null; return; } } - private void AddReference(ref List references, ushort commandID, List parameterList, int pos, CommandContainer cont) { + + private void AddReference(ref List references, ushort commandID, List parameterList, int pos, ScriptCommandContainer cont) { if (ScriptDatabase.commandsWithRelativeJump.TryGetValue(commandID, out int parameterWithRelativeJump)) { - uint invokedID = BitConverter.ToUInt32(parameterList[parameterWithRelativeJump], 0); // Jump, Call + uint invokedID = BitConverter.ToUInt32(parameterList[parameterWithRelativeJump], 0); // Jump, Call if (commandID == 0x005E) - references.Add(new ScriptReference(cont.containerType, cont.manualUserID, containerTypes.Action, invokedID, pos - 4)); + references.Add(new ScriptReference(cont.containerType, cont.manualUserID, ContainerTypes.Action, invokedID, pos - 4)); else { - references.Add(new ScriptReference(cont.containerType, cont.manualUserID, containerTypes.Function, invokedID, pos - 4)); + references.Add(new ScriptReference(cont.containerType, cont.manualUserID, ContainerTypes.Function, invokedID, pos - 4)); } } } - private List ReadCommandsFromLines(List linelist, containerTypes containerType, Func, int, ushort?, bool> endConditions) { + + private List ReadCommandsFromLines(List linelist, ContainerTypes containerType, Func, int, ushort?, bool> endConditions) { List<(int linenum, string text)> lineSource = new List<(int linenum, string text)>(); for (int l = 0; l < linelist.Count; l++) { @@ -493,7 +508,7 @@ namespace DSPRE.ROMFiles { } } - List ls = new List(); + List ls = new List(); int i = 0; try { @@ -516,12 +531,13 @@ namespace DSPRE.ROMFiles { return null; } } + scriptNumber = uint.Parse(lineSource[i++].text.Substring(positionOfScriptNumber).Split()[0].Replace(":", "")); } if (lineSource[i].text.IndexOf("UseScript", StringComparison.InvariantCultureIgnoreCase) >= 0) { int useScriptNumber = short.Parse(lineSource[i].text.Substring(1 + lineSource[i].text.IndexOf('#'))); - ls.Add(new CommandContainer(scriptNumber, containerType, useScriptNumber)); + ls.Add(new ScriptCommandContainer(scriptNumber, containerType, useScriptNumber)); i++; } else { /* Read script commands */ @@ -535,23 +551,25 @@ namespace DSPRE.ROMFiles { } cmdList.Add(lastRead); - } while (!endConditions(lineSource, i++, lastRead.id)); + } + while (!endConditions(lineSource, i++, lastRead.id)); - ls.Add(new CommandContainer(scriptNumber, containerType, commandList: cmdList)); + ls.Add(new ScriptCommandContainer(scriptNumber, containerType, commandList: cmdList)); } + scriptNumber = 0; } } catch (ArgumentOutOfRangeException) { MessageBox.Show($"Unexpectedly reached end of lines.\n\n" + - $"Last line index: {lineSource[i].linenum}.\n" + - $"Managed to parse {ls.Count} Command Containers.", "Fatal Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + $"Last line index: {lineSource[i].linenum}.\n" + + $"Managed to parse {ls.Count} Command Containers.", "Fatal Error", MessageBoxButtons.OK, MessageBoxIcon.Error); return null; } return ls; } - private List ReadActionsFromLines(List linelist) { + private List ReadActionsFromLines(List linelist) { List<(int linenum, string text)> lineSource = new List<(int linenum, string text)>(); for (int l = 0; l < linelist.Count; l++) { @@ -561,7 +579,7 @@ namespace DSPRE.ROMFiles { } } - List ls = new List(); + List ls = new List(); int i = 0; try { @@ -570,7 +588,7 @@ namespace DSPRE.ROMFiles { while (i < lineSource.Count) { if (actionNumber == 0) { int positionOfActionNumber; - int positionOfActionKeyword = lineSource[i].text.IndexOf(containerTypes.Action.ToString(), StringComparison.InvariantCultureIgnoreCase); + int positionOfActionKeyword = lineSource[i].text.IndexOf(ContainerTypes.Action.ToString(), StringComparison.InvariantCultureIgnoreCase); if (positionOfActionKeyword > 0) { MessageBox.Show("Unrecognized container keyword: \"" + lineSource[i] + '"', "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); @@ -584,6 +602,7 @@ namespace DSPRE.ROMFiles { return null; } } + actionNumber = uint.Parse(lineSource[i].text.Substring(positionOfActionNumber).Split()[0].Replace(":", "")); i++; } @@ -597,23 +616,22 @@ namespace DSPRE.ROMFiles { } cmdList.Add(toAdd); + } + while (!lineSource[i++].text.IgnoreCaseEquals(RomInfo.ScriptActionNamesDict[0x00FE])); - } while (!lineSource[i++].text.IgnoreCaseEquals(RomInfo.ScriptActionNamesDict[0x00FE])); - - ls.Add(new ActionContainer(actionNumber, actionCommandsList: cmdList)); + ls.Add(new ScriptActionContainer(actionNumber, commands: cmdList)); actionNumber = 0; } } catch (ArgumentOutOfRangeException) { MessageBox.Show($"Unexpectedly reached end of lines.\n\n" + - $"Last line index: {i}.\n" + - $"Managed to parse {ls.Count} Command Containers.", "Fatal Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + $"Last line index: {i}.\n" + + $"Managed to parse {ls.Count} Command Containers.", "Fatal Error", MessageBoxButtons.OK, MessageBoxIcon.Error); return null; } return ls; } - #region Output public override byte[] ToByteArray() { MemoryStream newData = new MemoryStream(); using (BinaryWriter writer = new BinaryWriter(newData)) { @@ -627,11 +645,11 @@ namespace DSPRE.ROMFiles { try { writer.BaseStream.Position += allScripts.Count * 0x4; writer.Write((ushort)0xFD13); // Signal the end of header section - List useScriptCallers = new List(); + List useScriptCallers = new List(); /* Write scripts */ - foreach (CommandContainer currentScript in allScripts) { - if (currentScript.usedScript == -1) { + foreach (ScriptCommandContainer currentScript in allScripts) { + if (currentScript.usedScriptID == -1) { scriptOffsets.Add(new ContainerReference() { ID = currentScript.manualUserID, offsetInFile = (uint)writer.BaseStream.Position @@ -657,22 +675,22 @@ namespace DSPRE.ROMFiles { } int scriptsCount = scriptOffsets.Count; - foreach (CommandContainer caller in useScriptCallers) { + foreach (ScriptCommandContainer caller in useScriptCallers) { for (int i = 0; i < scriptsCount; i++) { ContainerReference scriptReference = scriptOffsets[i]; - if (scriptReference.ID == caller.usedScript) { + if (scriptReference.ID == caller.usedScriptID) { scriptOffsets.Add(new ContainerReference() { ID = caller.manualUserID, offsetInFile = scriptReference.offsetInFile - });// If script has UseScript, copy offset + }); // If script has UseScript, copy offset } } } /* Write functions */ - foreach (CommandContainer currentFunction in allFunctions) { - if (currentFunction.usedScript == -1) { + foreach (ScriptCommandContainer currentFunction in allFunctions) { + if (currentFunction.usedScriptID == -1) { functionOffsets.Add(new ContainerReference() { ID = currentFunction.manualUserID, offsetInFile = (uint)writer.BaseStream.Position @@ -694,20 +712,16 @@ namespace DSPRE.ROMFiles { AddReference(ref refList, (ushort)currentCmd.id, parameterList, (int)writer.BaseStream.Position, currentFunction); } } else { - int functionUsescript = currentFunction.usedScript - 1; - - //Find script with same ID as the function's referenced UseScript - int scriptUsedByFunction = scriptOffsets.FindIndex(ind => ind.ID == currentFunction.usedScript); - - if (functionUsescript >= scriptOffsets.Count || scriptUsedByFunction < 0) { - MessageBox.Show($"Function #{currentFunction.manualUserID} refers to Script {currentFunction.usedScript}, which does not exist.\n" + - $"This Script File can't be saved.", "Can't resolve UseScript reference", MessageBoxButtons.OK, MessageBoxIcon.Error); + int functionUsescript = currentFunction.usedScriptID - 1; + if (functionUsescript >= scriptOffsets.Count) { + MessageBox.Show($"Function #{currentFunction.manualUserID} refers to Script {currentFunction.usedScriptID}, which does not exist.\n" + + $"This Script File can't be saved.", "Can't resolve UseScript reference", MessageBoxButtons.OK, MessageBoxIcon.Error); return null; } functionOffsets.Add(new ContainerReference() { ID = currentFunction.manualUserID, - offsetInFile = scriptOffsets[scriptUsedByFunction].offsetInFile + offsetInFile = scriptOffsets[currentFunction.usedScriptID - 1].offsetInFile }); } } @@ -718,13 +732,13 @@ namespace DSPRE.ROMFiles { } /* Write movements */ - foreach (ActionContainer currentAction in allActions) { + foreach (ScriptActionContainer currentAction in allActions) { actionOffsets.Add(new ContainerReference() { ID = currentAction.manualUserID, offsetInFile = (uint)writer.BaseStream.Position }); - foreach (ScriptAction currentCmd in currentAction.actionCommandsList) { + foreach (ScriptAction currentCmd in currentAction.commands) { writer.Write((ushort)currentCmd.id); writer.Write((ushort)currentCmd.repetitionCount); } @@ -738,7 +752,6 @@ namespace DSPRE.ROMFiles { writer.Write(scriptOffsets[i].offsetInFile - (uint)writer.BaseStream.Position - 0x4); } - SortedSet undeclaredFuncs = new SortedSet(); SortedSet undeclaredActions = new SortedSet(); @@ -751,7 +764,7 @@ namespace DSPRE.ROMFiles { writer.BaseStream.Position = refList[i].invokedAt; //place seek head on parameter that is supposed to store the jump address ContainerReference result; - if (refList[i].typeOfInvoked is containerTypes.Action) { //isApplyMovement + if (refList[i].typeOfInvoked is ContainerTypes.Action) { //isApplyMovement result = actionOffsets.Find(entry => entry.ID == refList[i].invokedID); if (result.Equals(default(ContainerReference))) { @@ -770,12 +783,10 @@ namespace DSPRE.ROMFiles { int relativeOffset = (int)(result.offsetInFile - refList[i].invokedAt - 4); writer.Write(relativeOffset); - if (FunctionIsInvoked(refList, uninvokedFuncs, refList[i].invokedID, 0)) { uninvokedFuncs.Remove(refList[i].invokedID); } - //if (refList[i].callerType != containerTypes.Function || // (refList[i].callerType == refList[i].invokedType && refList[i].callerID == refList[i].invokedID) || // !uninvokedFuncs.Contains(refList[i].callerID)) { //remove reference if caller is a script, or if caller calls itself, or if caller is a function that's been invoked already @@ -792,11 +803,13 @@ namespace DSPRE.ROMFiles { errorMsg += "These Functions have been invoked but not declared: " + Environment.NewLine + string.Join(separator: ",", errorFunctionsUndeclared); errorMsg += Environment.NewLine; } + if (undeclaredActions.Count > 0) { string[] errorActionsUndeclared = undeclaredActions.ToArray().Select(x => x.ToString()).ToArray(); errorMsg += "These Actions have been referenced but not declared: " + Environment.NewLine + string.Join(separator: ",", errorActionsUndeclared); errorMsg += Environment.NewLine; } + if (!string.IsNullOrEmpty(errorMsg)) { MessageBox.Show(errorMsg + Environment.NewLine + "This Script File has not been overwritten since it can not be saved.", "Error!", MessageBoxButtons.OK, MessageBoxIcon.Error); errorMsg = ""; @@ -811,6 +824,7 @@ namespace DSPRE.ROMFiles { errorMsg += Environment.NewLine; errorMsg += Environment.NewLine; } + if (unreferencedActions.Count > 0) { string[] orphanedActions = unreferencedActions.ToArray().Select(x => x.ToString()).ToArray(); errorMsg += "Unused Action IDs detected: " + Environment.NewLine + string.Join(", ", orphanedActions); @@ -819,6 +833,7 @@ namespace DSPRE.ROMFiles { errorMsg += Environment.NewLine; errorMsg += Environment.NewLine; } + if (!string.IsNullOrEmpty(errorMsg)) { MessageBox.Show(errorMsg + Environment.NewLine + "Remember that every unused Function or Action is always lost upon reloading the Script File.", "Warning!", MessageBoxButtons.OK, MessageBoxIcon.Information); errorMsg = ""; @@ -835,8 +850,8 @@ namespace DSPRE.ROMFiles { private bool FunctionIsInvoked(List refList, SortedSet uninvokedFuncsSet, uint funcID, int callCount = 0, uint? excludedCaller = null) { if (callCount >= 30) { MessageBox.Show("Something went very wrong saving this Script File!" + - "\nIt is recommended that you backup its code somewhere, to avoid losing progress.", - "Fatal error", MessageBoxButtons.OK, MessageBoxIcon.Error); + "\nIt is recommended that you backup its code somewhere, to avoid losing progress.", + "Fatal error", MessageBoxButtons.OK, MessageBoxIcon.Error); return false; } @@ -860,12 +875,12 @@ namespace DSPRE.ROMFiles { return false; } - if (sr.typeOfCaller is containerTypes.Script) { + if (sr.typeOfCaller is ContainerTypes.Script) { Console.WriteLine("Function " + funcID + " is directly called by Script " + sr.callerID); return true; } - if (sr.typeOfCaller is containerTypes.Function) { + if (sr.typeOfCaller is ContainerTypes.Function) { if (FunctionIsInvoked(refList, uninvokedFuncsSet, sr.callerID, ++callCount, excludedCaller: sr.invokedID)) { //check if caller function is invoked as well Console.WriteLine("Function " + funcID + " is called by Function " + sr.callerID); return true; @@ -877,8 +892,9 @@ namespace DSPRE.ROMFiles { } public bool SaveToFileDefaultDir(int IDtoReplace, bool showSuccessMessage = true) { - return SaveToFileDefaultDir(DirNames.scripts, IDtoReplace, showSuccessMessage); + return SaveToFileDefaultDir(RomInfo.DirNames.scripts, IDtoReplace, showSuccessMessage); } + public void SaveToFileExplorePath(string suggestedFileName, bool blindmode) { SaveFileDialog sf = new SaveFileDialog { Filter = "Gen IV Script File (*.scr)|*.scr" @@ -893,7 +909,8 @@ namespace DSPRE.ROMFiles { } if (blindmode) { - File.Copy(RomInfo.gameDirs[DirNames.scripts].unpackedDir + "\\" + ((int)fileID).ToString("D4"), sf.FileName, overwrite: true); + string path = Filesystem.GetScriptPath(fileID); + File.Copy(path, sf.FileName, overwrite: true); string msg = ""; if (!isLevelScript) { @@ -905,28 +922,5 @@ namespace DSPRE.ROMFiles { this.SaveToFile(sf.FileName, showSuccessMessage: true); } } - #endregion - #endregion } - - internal class ScriptReference { - public containerTypes typeOfCaller { get; private set; } - public uint callerID { get; private set; } - public containerTypes typeOfInvoked { get; private set; } - public uint invokedID { get; private set; } - public int invokedAt { get; private set; } - - public ScriptReference(containerTypes typeOfCaller, uint callerID, containerTypes invokedType, uint invokedID, int invokedAt) { - this.typeOfCaller = typeOfCaller; - this.callerID = callerID; - this.typeOfInvoked = invokedType; - this.invokedID = invokedID; - - this.invokedAt = invokedAt; - } - - public override string ToString() { - return typeOfCaller + " " + callerID + " invokes " + typeOfInvoked + " " + invokedID + " at " + invokedAt; - } - } -} \ No newline at end of file +} diff --git a/DS_Map/ROMFiles/ScriptReference.cs b/DS_Map/ROMFiles/ScriptReference.cs new file mode 100644 index 0000000..4b5eec1 --- /dev/null +++ b/DS_Map/ROMFiles/ScriptReference.cs @@ -0,0 +1,22 @@ +namespace DSPRE.ROMFiles { + internal class ScriptReference { + public ScriptFile.ContainerTypes typeOfCaller { get; private set; } + public uint callerID { get; private set; } + public ScriptFile.ContainerTypes typeOfInvoked { get; private set; } + public uint invokedID { get; private set; } + public int invokedAt { get; private set; } + + public ScriptReference(ScriptFile.ContainerTypes typeOfCaller, uint callerID, ScriptFile.ContainerTypes invokedType, uint invokedID, int invokedAt) { + this.typeOfCaller = typeOfCaller; + this.callerID = callerID; + this.typeOfInvoked = invokedType; + this.invokedID = invokedID; + + this.invokedAt = invokedAt; + } + + public override string ToString() { + return typeOfCaller + " " + callerID + " invokes " + typeOfInvoked + " " + invokedID + " at " + invokedAt; + } + } +} diff --git a/DS_Map/ROMFiles/VariableValueTrigger.cs b/DS_Map/ROMFiles/VariableValueTrigger.cs new file mode 100644 index 0000000..1c03c73 --- /dev/null +++ b/DS_Map/ROMFiles/VariableValueTrigger.cs @@ -0,0 +1,32 @@ +namespace DSPRE.ROMFiles { + public class VariableValueTrigger : LevelScriptTrigger { + public int variableToWatch { get; set; } + public int expectedValue { get; set; } + + public VariableValueTrigger(int scriptIDtoTrigger, int variableToWatch, int expectedValue) : base(VARIABLEVALUE, scriptIDtoTrigger) { + this.variableToWatch = variableToWatch; + this.expectedValue = expectedValue; + } + + public override string ToString() { + return base.ToString() + " when Var " + variableToWatch + " == " + expectedValue; + } + + public override bool Equals(object obj) { + // If the passed object is null + if (obj == null) { + return false; + } + + if (!(obj is VariableValueTrigger)) { + return false; + } + + return this.ToString() == ((VariableValueTrigger)obj).ToString(); + } + + public override int GetHashCode() { + return this.triggerType.GetHashCode() ^ variableToWatch.GetHashCode() ^ expectedValue.GetHashCode(); + } + } +} diff --git a/DS_Map/ROMToolboxDialog.cs b/DS_Map/ROMToolboxDialog.cs index d5b9b18..98f86ba 100644 --- a/DS_Map/ROMToolboxDialog.cs +++ b/DS_Map/ROMToolboxDialog.cs @@ -461,8 +461,7 @@ namespace DSPRE { private void ApplyItemStandardizeButton_Click(object sender, EventArgs e) { DialogResult d = MessageBox.Show("This process will apply the following changes:\n\n" + - "- Item scripts will be rearranged to follow the natural, ascending index order.\n\n" + - "- Any unsaved change to the current Event File will be discarded.\n\n", + "- Item scripts will be rearranged to follow the natural, ascending index order.\n\n", "Confirm to proceed", MessageBoxButtons.YesNo, MessageBoxIcon.Warning); if (d == DialogResult.Yes) { @@ -478,59 +477,35 @@ namespace DSPRE { ScriptFile itemScriptFile = new ScriptFile(RomInfo.itemScriptFileNumber); // Create map for: script no. -> vanilla item - int[] vanillaItemsArray = new int[itemScriptFile.allScripts.Count - 1]; + int[] vanillaItemsArray = new int[itemScriptFile.allScripts.Count]; for (int i = 0; i < itemScriptFile.allScripts.Count - 1; i++) { vanillaItemsArray[i] = BitConverter.ToInt16(itemScriptFile.allScripts[i].commands[0].cmdParams[1], 0); - }; + } // Parse all event files and fix instances of ground items according to the new order - int cnt = RomInfo.GetEventFileCount(); - (int min, int max) itemScriptRange = (7000, 8000); - - for (int i = 0; i < cnt; i++) { - bool dirty = false; - + for (int i = 0; i < Filesystem.GetEventFileCount(); i++) { EventFile eventFile = new EventFile(i); for (int j = 0; j < eventFile.overworlds.Count; j++) { // If ow is marked as an item, or in the rare case it is not but script no. falls within item script range: bool isItem = eventFile.overworlds[j].type == (ushort)Overworld.OwType.ITEM - || (eventFile.overworlds[j].scriptNumber >= itemScriptRange.min - && eventFile.overworlds[j].scriptNumber <= itemScriptRange.max); + || (eventFile.overworlds[j].scriptNumber >= 7000 + && eventFile.overworlds[j].scriptNumber <= 8000); if (isItem) { - int itemScriptID = eventFile.overworlds[j].scriptNumber - (itemScriptRange.min - 1); - eventFile.overworlds[j].scriptNumber = (ushort)(itemScriptRange.min + vanillaItemsArray[itemScriptID - 1]); - dirty = true; + int itemScriptID = eventFile.overworlds[j].scriptNumber - 6999; + eventFile.overworlds[j].scriptNumber = (ushort)(7000 + vanillaItemsArray[itemScriptID - 1]); } } // Save event file - if (dirty) { - eventFile.SaveToFileDefaultDir(i, showSuccessMessage: false); - } - }; - - //Distortion world - turnback cave Griseous Orb fix - if (gameFamily.Equals(GameFamilies.Plat)) { - string ow9path = DSUtils.GetOverlayPath(9); - int ow9offs = 0x8E20 + 10; - - int itemScriptID; - - using (DSUtils.EasyReader ewr = new DSUtils.EasyReader(ow9path, ow9offs)) { - itemScriptID = ewr.ReadUInt16() - (itemScriptRange.min - 1); - } - - using (DSUtils.EasyWriter ewr = new DSUtils.EasyWriter(ow9path, ow9offs)) { - ewr.Write((ushort)(itemScriptRange.min + vanillaItemsArray[itemScriptID - 1])); - } + eventFile.SaveToFileDefaultDir(i, showSuccessMessage: false); } // Sort scripts in the Script File according to item indices int itemCount = new TextArchive(RomInfo.itemNamesTextNumber).messages.Count; - CommandContainer executeGive = new CommandContainer((uint)itemCount + 1, itemScriptFile.allScripts[itemScriptFile.allScripts.Count - 1]); + ScriptCommandContainer executeGive = new ScriptCommandContainer((uint)itemCount, itemScriptFile.allScripts[itemScriptFile.allScripts.Count - 1]); itemScriptFile.allScripts.Clear(); @@ -542,11 +517,11 @@ namespace DSPRE { new ScriptCommand("Jump Function_#1") }; - itemScriptFile.allScripts.Add(new CommandContainer((ushort)(i + 1), ScriptFile.containerTypes.Script, commandList: cmdList)); + itemScriptFile.allScripts.Add(new ScriptCommandContainer((ushort)(i + 1), ScriptFile.ContainerTypes.Script, commandList: cmdList)); } itemScriptFile.allScripts.Add(executeGive); - itemScriptFile.allFunctions[0].usedScript = itemCount + 1; + itemScriptFile.allFunctions[0].usedScriptID = itemCount + 1; itemScriptFile.SaveToFileDefaultDir(RomInfo.itemScriptFileNumber, showSuccessMessage: false); MessageBox.Show("Operation successful.", "Process completed.", MessageBoxButtons.OK, MessageBoxIcon.Information); diff --git a/DS_Map/Resources/ScriptDatabase.cs b/DS_Map/Resources/ScriptDatabase.cs index a70e808..a402edc 100644 --- a/DS_Map/Resources/ScriptDatabase.cs +++ b/DS_Map/Resources/ScriptDatabase.cs @@ -156,6 +156,10 @@ namespace DSPRE.Resources { [0x00FE] = "End" }; + public static HashSet movementEndCodes = new HashSet() { + 0x00FE, + }; + public static Dictionary DPPtScrCmdNames = new Dictionary() { [0x0000] = "Nop", [0x0001] = "Dummy", From e8a537cb64397ce888fc520963ef3bbe53bc47db Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Sun, 3 Mar 2024 18:32:30 +0100 Subject: [PATCH 08/40] Incorporated Safari and Headbutt editors Co-authored-by: Cuddlyogre --- DS_Map/DSPRE.csproj | 54 ++ DS_Map/DSUtils.cs | 31 +- DS_Map/Editors/EncountersEditor.Designer.cs | 115 ++++ DS_Map/Editors/EncountersEditor.cs | 27 + DS_Map/Editors/EncountersEditor.resx | 120 +++++ .../HeadbuttEncounterEditor.Designer.cs | 459 ++++++++++++++++ DS_Map/Editors/HeadbuttEncounterEditor.cs | 491 ++++++++++++++++++ DS_Map/Editors/HeadbuttEncounterEditor.resx | 120 +++++ .../HeadbuttEncounterEditorTab.Designer.cs | 235 +++++++++ DS_Map/Editors/HeadbuttEncounterEditorTab.cs | 95 ++++ .../Editors/HeadbuttEncounterEditorTab.resx | 120 +++++ DS_Map/Editors/SafariZoneEditor.Designer.cs | 250 +++++++++ DS_Map/Editors/SafariZoneEditor.cs | 105 ++++ DS_Map/Editors/SafariZoneEditor.resx | 120 +++++ .../SafariZoneEncounterEditorTab.Designer.cs | 218 ++++++++ .../Editors/SafariZoneEncounterEditorTab.cs | 63 +++ .../Editors/SafariZoneEncounterEditorTab.resx | 120 +++++ ...SafariZoneEncounterGroupEditor.Designer.cs | 323 ++++++++++++ .../Editors/SafariZoneEncounterGroupEditor.cs | 143 +++++ .../SafariZoneEncounterGroupEditor.resx | 120 +++++ DS_Map/Main Window.Designer.cs | 339 ++++++------ DS_Map/Main Window.cs | 17 +- DS_Map/Main Window.resx | 183 ++++--- DS_Map/Properties/AssemblyInfo.cs | 8 +- DS_Map/ROMFiles/MapFile.cs | 18 + DS_Map/RomInfo.cs | 31 +- 26 files changed, 3642 insertions(+), 283 deletions(-) create mode 100644 DS_Map/Editors/EncountersEditor.Designer.cs create mode 100644 DS_Map/Editors/EncountersEditor.cs create mode 100644 DS_Map/Editors/EncountersEditor.resx create mode 100644 DS_Map/Editors/HeadbuttEncounterEditor.Designer.cs create mode 100644 DS_Map/Editors/HeadbuttEncounterEditor.cs create mode 100644 DS_Map/Editors/HeadbuttEncounterEditor.resx create mode 100644 DS_Map/Editors/HeadbuttEncounterEditorTab.Designer.cs create mode 100644 DS_Map/Editors/HeadbuttEncounterEditorTab.cs create mode 100644 DS_Map/Editors/HeadbuttEncounterEditorTab.resx create mode 100644 DS_Map/Editors/SafariZoneEditor.Designer.cs create mode 100644 DS_Map/Editors/SafariZoneEditor.cs create mode 100644 DS_Map/Editors/SafariZoneEditor.resx create mode 100644 DS_Map/Editors/SafariZoneEncounterEditorTab.Designer.cs create mode 100644 DS_Map/Editors/SafariZoneEncounterEditorTab.cs create mode 100644 DS_Map/Editors/SafariZoneEncounterEditorTab.resx create mode 100644 DS_Map/Editors/SafariZoneEncounterGroupEditor.Designer.cs create mode 100644 DS_Map/Editors/SafariZoneEncounterGroupEditor.cs create mode 100644 DS_Map/Editors/SafariZoneEncounterGroupEditor.resx diff --git a/DS_Map/DSPRE.csproj b/DS_Map/DSPRE.csproj index dc0ef6e..63ac31d 100644 --- a/DS_Map/DSPRE.csproj +++ b/DS_Map/DSPRE.csproj @@ -96,12 +96,48 @@ + + UserControl + + + EncountersEditor.cs + + + UserControl + + + HeadbuttEncounterEditor.cs + + + UserControl + + + HeadbuttEncounterEditorTab.cs + UserControl LevelScriptEditor.cs + + UserControl + + + SafariZoneEditor.cs + + + UserControl + + + SafariZoneEncounterEditorTab.cs + + + UserControl + + + SafariZoneEncounterGroupEditor.cs + UserControl @@ -311,9 +347,27 @@ + + EncountersEditor.cs + + + HeadbuttEncounterEditor.cs + + + HeadbuttEncounterEditorTab.cs + LevelScriptEditor.cs + + SafariZoneEditor.cs + + + SafariZoneEncounterEditorTab.cs + + + SafariZoneEncounterGroupEditor.cs + ScriptEditor.cs diff --git a/DS_Map/DSUtils.cs b/DS_Map/DSUtils.cs index 3313457..b001237 100644 --- a/DS_Map/DSUtils.cs +++ b/DS_Map/DSUtils.cs @@ -431,23 +431,28 @@ namespace DSPRE { return b; } - public static void TryUnpackNarcs(List IDs) { + public static void TryUnpackNarcs(List IDs) { Parallel.ForEach(IDs, id => { - if (gameDirs.TryGetValue(id, out (string packedPath, string unpackedPath) paths)) { - DirectoryInfo di = new DirectoryInfo(paths.unpackedPath); - - if (!di.Exists || di.GetFiles().Length == 0) { - Narc opened = Narc.Open(paths.packedPath); - - if (opened is null) { - throw new NullReferenceException(); - } - - opened.ExtractToFolder(paths.unpackedPath); - } + if (!RomInfo.gameDirs.TryGetValue(id, out (string packedPath, string unpackedPath) paths)) { + return; } + + DirectoryInfo di = new DirectoryInfo(paths.unpackedPath); + + if (di.Exists && di.GetFiles().Length != 0) { + return; + } + + Narc opened = Narc.Open(paths.packedPath); + + if (opened is null) { + throw new NullReferenceException(); + } + + opened.ExtractToFolder(paths.unpackedPath); }); } + public static void ForceUnpackNarcs(List IDs) { Parallel.ForEach(IDs, id => { if (gameDirs.TryGetValue(id, out (string packedPath, string unpackedPath) paths)) { diff --git a/DS_Map/Editors/EncountersEditor.Designer.cs b/DS_Map/Editors/EncountersEditor.Designer.cs new file mode 100644 index 0000000..842c2ff --- /dev/null +++ b/DS_Map/Editors/EncountersEditor.Designer.cs @@ -0,0 +1,115 @@ + +namespace DSPRE.Editors +{ + partial class EncountersEditor + { + /// + /// 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 Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.tabControl = new System.Windows.Forms.TabControl(); + this.tabPageHeadbuttEditor = new System.Windows.Forms.TabPage(); + this.headbuttEncounterEditor = new DSPRE.Editors.HeadbuttEncounterEditor(); + this.tabPageSafariZoneEditor = new System.Windows.Forms.TabPage(); + this.safariZoneEditor = new DSPRE.Editors.SafariZoneEditor(); + this.tabControl.SuspendLayout(); + this.tabPageHeadbuttEditor.SuspendLayout(); + this.tabPageSafariZoneEditor.SuspendLayout(); + this.SuspendLayout(); + // + // tabControl + // + this.tabControl.Controls.Add(this.tabPageHeadbuttEditor); + this.tabControl.Controls.Add(this.tabPageSafariZoneEditor); + this.tabControl.Location = new System.Drawing.Point(4, 4); + this.tabControl.Name = "tabControl"; + this.tabControl.SelectedIndex = 0; + this.tabControl.Size = new System.Drawing.Size(1103, 654); + this.tabControl.TabIndex = 2; + // + // tabPageHeadbuttEditor + // + this.tabPageHeadbuttEditor.Controls.Add(this.headbuttEncounterEditor); + this.tabPageHeadbuttEditor.Location = new System.Drawing.Point(4, 22); + this.tabPageHeadbuttEditor.Name = "tabPageHeadbuttEditor"; + this.tabPageHeadbuttEditor.Padding = new System.Windows.Forms.Padding(3); + this.tabPageHeadbuttEditor.Size = new System.Drawing.Size(1095, 628); + this.tabPageHeadbuttEditor.TabIndex = 0; + this.tabPageHeadbuttEditor.Text = "Headbutt"; + this.tabPageHeadbuttEditor.UseVisualStyleBackColor = true; + this.tabPageHeadbuttEditor.Enter += new System.EventHandler(this.tabPageHeadbuttEditor_Enter); + // + // headbuttEncounterEditor + // + this.headbuttEncounterEditor.BackColor = System.Drawing.SystemColors.Control; + this.headbuttEncounterEditor.headbuttEncounterEditorIsReady = false; + this.headbuttEncounterEditor.Location = new System.Drawing.Point(6, 6); + this.headbuttEncounterEditor.Name = "headbuttEncounterEditor"; + this.headbuttEncounterEditor.Size = new System.Drawing.Size(1081, 621); + this.headbuttEncounterEditor.TabIndex = 1; + // + // tabPageSafariZoneEditor + // + this.tabPageSafariZoneEditor.Controls.Add(this.safariZoneEditor); + this.tabPageSafariZoneEditor.Location = new System.Drawing.Point(4, 22); + this.tabPageSafariZoneEditor.Name = "tabPageSafariZoneEditor"; + this.tabPageSafariZoneEditor.Padding = new System.Windows.Forms.Padding(3); + this.tabPageSafariZoneEditor.Size = new System.Drawing.Size(1095, 628); + this.tabPageSafariZoneEditor.TabIndex = 1; + this.tabPageSafariZoneEditor.Text = "Safari Zone"; + this.tabPageSafariZoneEditor.UseVisualStyleBackColor = true; + this.tabPageSafariZoneEditor.Enter += new System.EventHandler(this.tabPageSafariZoneEditor_Enter); + // + // safariZoneEditor + // + this.safariZoneEditor.Location = new System.Drawing.Point(6, 6); + this.safariZoneEditor.Name = "safariZoneEditor"; + this.safariZoneEditor.safariZoneEditorIsReady = false; + this.safariZoneEditor.Size = new System.Drawing.Size(996, 341); + this.safariZoneEditor.TabIndex = 1; + // + // EncountersEditor + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.tabControl); + this.Name = "EncountersEditor"; + this.Size = new System.Drawing.Size(1111, 664); + this.tabControl.ResumeLayout(false); + this.tabPageHeadbuttEditor.ResumeLayout(false); + this.tabPageSafariZoneEditor.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + public HeadbuttEncounterEditor headbuttEncounterEditor; + private System.Windows.Forms.TabControl tabControl; + private System.Windows.Forms.TabPage tabPageHeadbuttEditor; + private System.Windows.Forms.TabPage tabPageSafariZoneEditor; + public SafariZoneEditor safariZoneEditor; + } +} diff --git a/DS_Map/Editors/EncountersEditor.cs b/DS_Map/Editors/EncountersEditor.cs new file mode 100644 index 0000000..f9bafb4 --- /dev/null +++ b/DS_Map/Editors/EncountersEditor.cs @@ -0,0 +1,27 @@ +using System.Windows.Forms; + +namespace DSPRE.Editors +{ + public partial class EncountersEditor : UserControl + { + public EncountersEditor() + { + InitializeComponent(); + } + + public void SetupEncountersEditor() { + tabPageHeadbuttEditor_Enter(null, null); + } + + private void tabPageHeadbuttEditor_Enter(object sender, System.EventArgs e) + { + headbuttEncounterEditor.SetupHeadbuttEncounterEditor(); + headbuttEncounterEditor.makeCurrent(); + } + + private void tabPageSafariZoneEditor_Enter(object sender, System.EventArgs e) + { + safariZoneEditor.SetupSafariZoneEditor(); + } + } +} diff --git a/DS_Map/Editors/EncountersEditor.resx b/DS_Map/Editors/EncountersEditor.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/DS_Map/Editors/EncountersEditor.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/HeadbuttEncounterEditor.Designer.cs b/DS_Map/Editors/HeadbuttEncounterEditor.Designer.cs new file mode 100644 index 0000000..b1842db --- /dev/null +++ b/DS_Map/Editors/HeadbuttEncounterEditor.Designer.cs @@ -0,0 +1,459 @@ +using System.ComponentModel; + +namespace DSPRE.Editors { + partial class HeadbuttEncounterEditor { + /// + /// Required designer variable. + /// + private 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 Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() { + this.buttonSaveAs = new System.Windows.Forms.Button(); + this.buttonSave = new System.Windows.Forms.Button(); + this.tabControl = new System.Windows.Forms.TabControl(); + this.tabPageNormal = new System.Windows.Forms.TabPage(); + this.headbuttEncounterEditorTabNormal = new DSPRE.Editors.HeadbuttEncounterEditorTab(); + this.tabPageSpecial = new System.Windows.Forms.TabPage(); + this.headbuttEncounterEditorTabSpecial = new DSPRE.Editors.HeadbuttEncounterEditorTab(); + this.mapRenderPanel = new System.Windows.Forms.Panel(); + this.openGlPictureBox = new System.Windows.Forms.PictureBox(); + this.mapScreenshotButton = new System.Windows.Forms.Button(); + this.comboBoxMapHeader = new System.Windows.Forms.ComboBox(); + this.comboBoxMapFile = new System.Windows.Forms.ComboBox(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.labelLocationName = new System.Windows.Forms.Label(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.numericUpDownTreeGlobalX = new System.Windows.Forms.NumericUpDown(); + this.numericUpDownTreeGlobalY = new System.Windows.Forms.NumericUpDown(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.numericUpDownTreeMatrixX = new System.Windows.Forms.NumericUpDown(); + this.numericUpDownTreeMatrixY = new System.Windows.Forms.NumericUpDown(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.numericUpDownTreeMapX = new System.Windows.Forms.NumericUpDown(); + this.numericUpDownTreeMapY = new System.Windows.Forms.NumericUpDown(); + this.RightClickLabel = new System.Windows.Forms.Label(); + this.LeftClickLabel = new System.Windows.Forms.Label(); + this.LeftClickPicture = new System.Windows.Forms.PictureBox(); + this.rightClickPicture = new System.Windows.Forms.PictureBox(); + this.buttonImport = new System.Windows.Forms.Button(); + this.tabControl.SuspendLayout(); + this.tabPageNormal.SuspendLayout(); + this.tabPageSpecial.SuspendLayout(); + this.mapRenderPanel.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.openGlPictureBox)).BeginInit(); + this.groupBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownTreeGlobalX)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownTreeGlobalY)).BeginInit(); + this.groupBox2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownTreeMatrixX)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownTreeMatrixY)).BeginInit(); + this.groupBox3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownTreeMapX)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownTreeMapY)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.LeftClickPicture)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.rightClickPicture)).BeginInit(); + this.SuspendLayout(); + // + // buttonSaveAs + // + this.buttonSaveAs.Location = new System.Drawing.Point(338, 29); + this.buttonSaveAs.Name = "buttonSaveAs"; + this.buttonSaveAs.Size = new System.Drawing.Size(75, 23); + this.buttonSaveAs.TabIndex = 9; + this.buttonSaveAs.Text = "Save As"; + this.buttonSaveAs.UseVisualStyleBackColor = true; + this.buttonSaveAs.Click += new System.EventHandler(this.buttonSaveAs_Click); + // + // buttonSave + // + this.buttonSave.Location = new System.Drawing.Point(338, 3); + this.buttonSave.Name = "buttonSave"; + this.buttonSave.Size = new System.Drawing.Size(75, 23); + this.buttonSave.TabIndex = 10; + this.buttonSave.Text = "Save"; + this.buttonSave.UseVisualStyleBackColor = true; + this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click); + // + // tabControl + // + this.tabControl.Controls.Add(this.tabPageNormal); + this.tabControl.Controls.Add(this.tabPageSpecial); + this.tabControl.Location = new System.Drawing.Point(3, 71); + this.tabControl.Name = "tabControl"; + this.tabControl.SelectedIndex = 0; + this.tabControl.Size = new System.Drawing.Size(274, 544); + this.tabControl.TabIndex = 21; + // + // tabPageNormal + // + this.tabPageNormal.Controls.Add(this.headbuttEncounterEditorTabNormal); + this.tabPageNormal.Location = new System.Drawing.Point(4, 22); + this.tabPageNormal.Name = "tabPageNormal"; + this.tabPageNormal.Padding = new System.Windows.Forms.Padding(3); + this.tabPageNormal.Size = new System.Drawing.Size(266, 518); + this.tabPageNormal.TabIndex = 0; + this.tabPageNormal.Text = "Normal"; + this.tabPageNormal.UseVisualStyleBackColor = true; + // + // headbuttEncounterEditorTabNormal + // + this.headbuttEncounterEditorTabNormal.Location = new System.Drawing.Point(2, 2); + this.headbuttEncounterEditorTabNormal.Name = "headbuttEncounterEditorTabNormal"; + this.headbuttEncounterEditorTabNormal.Size = new System.Drawing.Size(264, 519); + this.headbuttEncounterEditorTabNormal.TabIndex = 0; + // + // tabPageSpecial + // + this.tabPageSpecial.Controls.Add(this.headbuttEncounterEditorTabSpecial); + this.tabPageSpecial.Location = new System.Drawing.Point(4, 22); + this.tabPageSpecial.Name = "tabPageSpecial"; + this.tabPageSpecial.Padding = new System.Windows.Forms.Padding(3); + this.tabPageSpecial.Size = new System.Drawing.Size(266, 518); + this.tabPageSpecial.TabIndex = 1; + this.tabPageSpecial.Text = "Special"; + this.tabPageSpecial.UseVisualStyleBackColor = true; + // + // headbuttEncounterEditorTabSpecial + // + this.headbuttEncounterEditorTabSpecial.Location = new System.Drawing.Point(2, 2); + this.headbuttEncounterEditorTabSpecial.Name = "headbuttEncounterEditorTabSpecial"; + this.headbuttEncounterEditorTabSpecial.Size = new System.Drawing.Size(402, 518); + this.headbuttEncounterEditorTabSpecial.TabIndex = 0; + // + // mapRenderPanel + // + this.mapRenderPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.mapRenderPanel.Controls.Add(this.openGlPictureBox); + this.mapRenderPanel.Location = new System.Drawing.Point(419, 4); + this.mapRenderPanel.Name = "mapRenderPanel"; + this.mapRenderPanel.Size = new System.Drawing.Size(610, 610); + this.mapRenderPanel.TabIndex = 24; + // + // openGlPictureBox + // + this.openGlPictureBox.BackColor = System.Drawing.Color.White; + this.openGlPictureBox.Location = new System.Drawing.Point(0, 0); + this.openGlPictureBox.Name = "openGlPictureBox"; + this.openGlPictureBox.Size = new System.Drawing.Size(608, 608); + this.openGlPictureBox.TabIndex = 3; + this.openGlPictureBox.TabStop = false; + this.openGlPictureBox.Click += new System.EventHandler(this.openGlPictureBox_Click); + // + // mapScreenshotButton + // + this.mapScreenshotButton.Image = global::DSPRE.Properties.Resources.cameraIcon; + this.mapScreenshotButton.Location = new System.Drawing.Point(1034, 574); + 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); + // + // comboBoxMapHeader + // + this.comboBoxMapHeader.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBoxMapHeader.FormattingEnabled = true; + this.comboBoxMapHeader.Location = new System.Drawing.Point(54, 4); + this.comboBoxMapHeader.Name = "comboBoxMapHeader"; + this.comboBoxMapHeader.Size = new System.Drawing.Size(278, 21); + this.comboBoxMapHeader.TabIndex = 40; + this.comboBoxMapHeader.SelectedIndexChanged += new System.EventHandler(this.comboBoxMapHeader_SelectedIndexChanged); + // + // comboBoxMapFile + // + this.comboBoxMapFile.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBoxMapFile.FormattingEnabled = true; + this.comboBoxMapFile.Location = new System.Drawing.Point(54, 31); + this.comboBoxMapFile.Name = "comboBoxMapFile"; + this.comboBoxMapFile.Size = new System.Drawing.Size(278, 21); + this.comboBoxMapFile.TabIndex = 40; + this.comboBoxMapFile.SelectedIndexChanged += new System.EventHandler(this.comboBoxMapFile_SelectedIndexChanged); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(6, 7); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(42, 13); + this.label1.TabIndex = 41; + this.label1.Text = "Header"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(20, 36); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(28, 13); + this.label2.TabIndex = 41; + this.label2.Text = "Map"; + // + // labelLocationName + // + this.labelLocationName.AutoSize = true; + this.labelLocationName.Location = new System.Drawing.Point(51, 55); + this.labelLocationName.Name = "labelLocationName"; + this.labelLocationName.Size = new System.Drawing.Size(35, 13); + this.labelLocationName.TabIndex = 42; + this.labelLocationName.Text = "label3"; + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.numericUpDownTreeGlobalX); + this.groupBox1.Controls.Add(this.numericUpDownTreeGlobalY); + this.groupBox1.Location = new System.Drawing.Point(279, 452); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(134, 49); + this.groupBox1.TabIndex = 16; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Global"; + // + // numericUpDownTreeGlobalX + // + this.numericUpDownTreeGlobalX.Location = new System.Drawing.Point(6, 19); + this.numericUpDownTreeGlobalX.Maximum = new decimal(new int[] { + 65535, + 0, + 0, + 0}); + this.numericUpDownTreeGlobalX.Name = "numericUpDownTreeGlobalX"; + this.numericUpDownTreeGlobalX.Size = new System.Drawing.Size(58, 20); + this.numericUpDownTreeGlobalX.TabIndex = 15; + this.numericUpDownTreeGlobalX.ValueChanged += new System.EventHandler(this.numericUpDownTreeGlobalX_ValueChanged); + // + // numericUpDownTreeGlobalY + // + this.numericUpDownTreeGlobalY.Location = new System.Drawing.Point(70, 19); + this.numericUpDownTreeGlobalY.Maximum = new decimal(new int[] { + 65535, + 0, + 0, + 0}); + this.numericUpDownTreeGlobalY.Name = "numericUpDownTreeGlobalY"; + this.numericUpDownTreeGlobalY.Size = new System.Drawing.Size(58, 20); + this.numericUpDownTreeGlobalY.TabIndex = 15; + this.numericUpDownTreeGlobalY.ValueChanged += new System.EventHandler(this.numericUpDownTreeGlobalY_ValueChanged); + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.numericUpDownTreeMatrixX); + this.groupBox2.Controls.Add(this.numericUpDownTreeMatrixY); + this.groupBox2.Location = new System.Drawing.Point(279, 507); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(134, 49); + this.groupBox2.TabIndex = 16; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "Matrix"; + // + // numericUpDownTreeMatrixX + // + this.numericUpDownTreeMatrixX.Location = new System.Drawing.Point(6, 19); + this.numericUpDownTreeMatrixX.Maximum = new decimal(new int[] { + 65535, + 0, + 0, + 0}); + this.numericUpDownTreeMatrixX.Name = "numericUpDownTreeMatrixX"; + this.numericUpDownTreeMatrixX.Size = new System.Drawing.Size(58, 20); + this.numericUpDownTreeMatrixX.TabIndex = 15; + this.numericUpDownTreeMatrixX.ValueChanged += new System.EventHandler(this.numericUpDownTreeMatrixX_ValueChanged); + // + // numericUpDownTreeMatrixY + // + this.numericUpDownTreeMatrixY.Location = new System.Drawing.Point(70, 19); + this.numericUpDownTreeMatrixY.Maximum = new decimal(new int[] { + 65535, + 0, + 0, + 0}); + this.numericUpDownTreeMatrixY.Name = "numericUpDownTreeMatrixY"; + this.numericUpDownTreeMatrixY.Size = new System.Drawing.Size(58, 20); + this.numericUpDownTreeMatrixY.TabIndex = 15; + this.numericUpDownTreeMatrixY.ValueChanged += new System.EventHandler(this.numericUpDownTreeMatrixY_ValueChanged); + // + // groupBox3 + // + this.groupBox3.Controls.Add(this.numericUpDownTreeMapX); + this.groupBox3.Controls.Add(this.numericUpDownTreeMapY); + this.groupBox3.Location = new System.Drawing.Point(279, 562); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Size = new System.Drawing.Size(134, 49); + this.groupBox3.TabIndex = 16; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "Local"; + // + // numericUpDownTreeMapX + // + this.numericUpDownTreeMapX.Location = new System.Drawing.Point(6, 19); + this.numericUpDownTreeMapX.Maximum = new decimal(new int[] { + 31, + 0, + 0, + 0}); + this.numericUpDownTreeMapX.Name = "numericUpDownTreeMapX"; + this.numericUpDownTreeMapX.Size = new System.Drawing.Size(58, 20); + this.numericUpDownTreeMapX.TabIndex = 15; + this.numericUpDownTreeMapX.ValueChanged += new System.EventHandler(this.numericUpDownTreeMapX_ValueChanged); + // + // numericUpDownTreeMapY + // + this.numericUpDownTreeMapY.Location = new System.Drawing.Point(70, 19); + this.numericUpDownTreeMapY.Maximum = new decimal(new int[] { + 31, + 0, + 0, + 0}); + this.numericUpDownTreeMapY.Name = "numericUpDownTreeMapY"; + this.numericUpDownTreeMapY.Size = new System.Drawing.Size(58, 20); + this.numericUpDownTreeMapY.TabIndex = 15; + this.numericUpDownTreeMapY.ValueChanged += new System.EventHandler(this.numericUpDownTreeMapY_ValueChanged); + // + // RightClickLabel + // + this.RightClickLabel.AutoSize = true; + this.RightClickLabel.Location = new System.Drawing.Point(308, 425); + this.RightClickLabel.Name = "RightClickLabel"; + this.RightClickLabel.Size = new System.Drawing.Size(37, 13); + this.RightClickLabel.TabIndex = 66; + this.RightClickLabel.Text = "Select"; + // + // LeftClickLabel + // + this.LeftClickLabel.AutoSize = true; + this.LeftClickLabel.Location = new System.Drawing.Point(352, 425); + this.LeftClickLabel.Name = "LeftClickLabel"; + this.LeftClickLabel.Size = new System.Drawing.Size(34, 13); + this.LeftClickLabel.TabIndex = 63; + this.LeftClickLabel.Text = "Move"; + // + // LeftClickPicture + // + this.LeftClickPicture.Image = global::DSPRE.Properties.Resources.LeftClick; + this.LeftClickPicture.ImageLocation = ""; + this.LeftClickPicture.Location = new System.Drawing.Point(349, 387); + this.LeftClickPicture.Name = "LeftClickPicture"; + this.LeftClickPicture.Size = new System.Drawing.Size(38, 38); + this.LeftClickPicture.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.LeftClickPicture.TabIndex = 61; + this.LeftClickPicture.TabStop = false; + // + // rightClickPicture + // + this.rightClickPicture.Image = global::DSPRE.Properties.Resources.RightClick; + this.rightClickPicture.ImageLocation = ""; + this.rightClickPicture.Location = new System.Drawing.Point(307, 387); + this.rightClickPicture.Name = "rightClickPicture"; + this.rightClickPicture.Size = new System.Drawing.Size(38, 38); + this.rightClickPicture.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.rightClickPicture.TabIndex = 65; + this.rightClickPicture.TabStop = false; + // + // buttonImport + // + this.buttonImport.Location = new System.Drawing.Point(338, 55); + this.buttonImport.Name = "buttonImport"; + this.buttonImport.Size = new System.Drawing.Size(75, 23); + this.buttonImport.TabIndex = 9; + this.buttonImport.Text = "Import"; + this.buttonImport.UseVisualStyleBackColor = true; + this.buttonImport.Click += new System.EventHandler(this.buttonImport_Click); + // + // HeadbuttEncounterEditor + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.SystemColors.Control; + this.Controls.Add(this.RightClickLabel); + this.Controls.Add(this.LeftClickLabel); + this.Controls.Add(this.LeftClickPicture); + this.Controls.Add(this.rightClickPicture); + this.Controls.Add(this.labelLocationName); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Controls.Add(this.comboBoxMapFile); + this.Controls.Add(this.comboBoxMapHeader); + this.Controls.Add(this.groupBox3); + this.Controls.Add(this.mapRenderPanel); + this.Controls.Add(this.tabControl); + this.Controls.Add(this.mapScreenshotButton); + this.Controls.Add(this.groupBox2); + this.Controls.Add(this.buttonImport); + this.Controls.Add(this.buttonSaveAs); + this.Controls.Add(this.buttonSave); + this.Controls.Add(this.groupBox1); + this.Location = new System.Drawing.Point(15, 15); + this.Name = "HeadbuttEncounterEditor"; + this.Size = new System.Drawing.Size(1080, 620); + this.tabControl.ResumeLayout(false); + this.tabPageNormal.ResumeLayout(false); + this.tabPageSpecial.ResumeLayout(false); + this.mapRenderPanel.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.openGlPictureBox)).EndInit(); + this.groupBox1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownTreeGlobalX)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownTreeGlobalY)).EndInit(); + this.groupBox2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownTreeMatrixX)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownTreeMatrixY)).EndInit(); + this.groupBox3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownTreeMapX)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownTreeMapY)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.LeftClickPicture)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.rightClickPicture)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + private System.Windows.Forms.Button buttonSaveAs; + private System.Windows.Forms.Button buttonSave; + + #endregion + private System.Windows.Forms.TabControl tabControl; + private System.Windows.Forms.TabPage tabPageNormal; + private System.Windows.Forms.TabPage tabPageSpecial; + private HeadbuttEncounterEditorTab headbuttEncounterEditorTabNormal; + private HeadbuttEncounterEditorTab headbuttEncounterEditorTabSpecial; + private System.Windows.Forms.Panel mapRenderPanel; + private System.Windows.Forms.PictureBox openGlPictureBox; + private System.Windows.Forms.Button mapScreenshotButton; + private System.Windows.Forms.ComboBox comboBoxMapHeader; + private System.Windows.Forms.ComboBox comboBoxMapFile; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label labelLocationName; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.NumericUpDown numericUpDownTreeGlobalX; + private System.Windows.Forms.NumericUpDown numericUpDownTreeGlobalY; + private System.Windows.Forms.GroupBox groupBox2; + private System.Windows.Forms.NumericUpDown numericUpDownTreeMatrixX; + private System.Windows.Forms.NumericUpDown numericUpDownTreeMatrixY; + private System.Windows.Forms.GroupBox groupBox3; + private System.Windows.Forms.NumericUpDown numericUpDownTreeMapX; + private System.Windows.Forms.NumericUpDown numericUpDownTreeMapY; + private System.Windows.Forms.Label RightClickLabel; + private System.Windows.Forms.Label LeftClickLabel; + private System.Windows.Forms.PictureBox LeftClickPicture; + private System.Windows.Forms.PictureBox rightClickPicture; + private System.Windows.Forms.Button buttonImport; + } +} + diff --git a/DS_Map/Editors/HeadbuttEncounterEditor.cs b/DS_Map/Editors/HeadbuttEncounterEditor.cs new file mode 100644 index 0000000..e497ee5 --- /dev/null +++ b/DS_Map/Editors/HeadbuttEncounterEditor.cs @@ -0,0 +1,491 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Drawing.Drawing2D; +using System.IO; +using System.Windows.Forms; +using DSPRE.ROMFiles; + +namespace DSPRE.Editors { + public partial class HeadbuttEncounterEditor : UserControl { + public bool headbuttEncounterEditorIsReady { get; set; } = false; + + private ListBox2 listBoxTrees; + private HeadbuttTree headbuttTree; + + private HeaderHGSS mapHeader; + private HeadbuttEncounterFile headbuttEncounterFile; + private HeadbuttEncounterMap headbuttEncounterMap; + private GameMatrix gameMatrix; + private AreaData areaData; + private MapFile mapFile; + private string locationName; + + private int width; + private int height; + static SimpleOpenGlControl2 openGlControl; + + private Pen selectedPen; + private Pen normalPen; + private SolidBrush normalBrush; + private Pen specialPen; + private SolidBrush specialBrush; + + private static float perspective; + private static float ang; + private static float dist; + private static float elev; + + public HeadbuttEncounterEditor() { + InitializeComponent(); + } + + //TODO: refresh headers list if a header is added + public void SetupHeadbuttEncounterEditor(bool force = false) { + if (headbuttEncounterEditorIsReady && !force) return; + headbuttEncounterEditorIsReady = true; + + DSUtils.TryUnpackNarcs(new List() { + RomInfo.DirNames.dynamicHeaders, + RomInfo.DirNames.matrices, + RomInfo.DirNames.textArchives, + RomInfo.DirNames.areaData, + RomInfo.DirNames.headbutt, + RomInfo.DirNames.maps, + RomInfo.DirNames.mapTextures, + RomInfo.DirNames.exteriorBuildingModels, + RomInfo.DirNames.buildingTextures, + }); + + width = openGlPictureBox.Width; + height = openGlPictureBox.Height; + + openGlControl = new SimpleOpenGlControl2(); + openGlControl.InitializeContexts(); + openGlControl.Width = width; + openGlControl.Height = height; + openGlControl.Invalidate(); + openGlControl.MakeCurrent(); + + List headerListBoxNames = Helpers.getHeaderListBoxNames(); + + Color selectedColor = Color.FromArgb(255, Color.White); + selectedPen = new Pen(selectedColor); + + Color normalColor = Color.FromArgb(128, Color.DarkBlue); + normalPen = new Pen(normalColor); + normalBrush = new SolidBrush(normalColor); + + Color specialColor = Color.FromArgb(128, Color.DarkRed); + specialPen = new Pen(specialColor); + specialBrush = new SolidBrush(specialColor); + + Helpers.DisableHandlers(); + + for (int i = 0; i < Filesystem.GetHeadbuttCount(); i++) { + if (i < headerListBoxNames.Count) { + comboBoxMapHeader.Items.Add(headerListBoxNames[i]); + } + else { + i.ToString("D4"); + } + } + + string[] pokemonNames = RomInfo.GetPokemonNames(); + headbuttEncounterEditorTabNormal.comboBoxPokemon.Items.AddRange(pokemonNames); + headbuttEncounterEditorTabNormal.comboBoxPokemon.SelectedIndex = 0; + headbuttEncounterEditorTabNormal.listBoxTrees.SelectedIndexChanged += ListBoxTrees_SelectedIndexChanged; + + headbuttEncounterEditorTabSpecial.comboBoxPokemon.Items.AddRange(pokemonNames); + headbuttEncounterEditorTabSpecial.comboBoxPokemon.SelectedIndex = 0; + headbuttEncounterEditorTabSpecial.listBoxTrees.SelectedIndexChanged += ListBoxTrees_SelectedIndexChanged; + + openGlPictureBox.BringToFront(); + SetCam2DValues(); + + Helpers.EnableHandlers(); + + if (comboBoxMapHeader.Items.Count > 0) { + comboBoxMapHeader.SelectedIndex = 0; + } + } + + public void makeCurrent() { + openGlControl.MakeCurrent(); + } + + private void comboBoxMapHeader_SelectedIndexChanged(object sender, EventArgs e) { + ushort headbuttID = (ushort)comboBoxMapHeader.SelectedIndex; + this.headbuttEncounterFile = new HeadbuttEncounterFile(headbuttID); + setCurrentMap(headbuttEncounterFile); + } + + public void setCurrentMap(HeadbuttEncounterFile headbuttEncounterFile) { + this.mapFile = null; + this.headbuttEncounterMap = null; + + comboBoxMapFile.Items.Clear(); + labelLocationName.Text = ""; + + listBoxTrees = null; + if (headbuttTree != null) headbuttTree.picked = false; + headbuttTree = null; + + headbuttEncounterEditorTabNormal.Reset(); + headbuttEncounterEditorTabSpecial.Reset(); + + numericUpDownTreeGlobalX.Value = 0; + numericUpDownTreeGlobalY.Value = 0; + numericUpDownTreeMatrixX.Value = 0; + numericUpDownTreeMatrixY.Value = 0; + numericUpDownTreeMapX.Value = 0; + numericUpDownTreeMapY.Value = 0; + + RenderBackground(); + + try { + if (headbuttEncounterFile.ID == GameMatrix.EMPTY) return; + this.mapHeader = (HeaderHGSS)MapHeader.GetMapHeader(headbuttEncounterFile.ID); + } + catch (Exception ex) { + //most likely more headbutt files than map headers + //there should be the same amount + Console.WriteLine(ex); + return; + } + + this.gameMatrix = new GameMatrix(mapHeader.matrixID); + this.areaData = new AreaData(mapHeader.areaDataID); + + TextArchive currentTextArchive = new TextArchive(RomInfo.locationNamesTextNumber); + this.locationName = currentTextArchive.messages[mapHeader.locationName]; + labelLocationName.Text = locationName; + + headbuttEncounterEditorTabNormal.SetHeadbuttEncounter(headbuttEncounterFile.normalEncounters, headbuttEncounterFile.normalTreeGroups); + headbuttEncounterEditorTabSpecial.SetHeadbuttEncounter(headbuttEncounterFile.specialEncounters, headbuttEncounterFile.specialTreeGroups); + + List mapHeaderMapsIDsList = new List(); + + if (gameMatrix.hasHeadersSection) { + for (int y = 0; y < gameMatrix.height; y++) { + for (int x = 0; x < gameMatrix.width; x++) { + if (gameMatrix.headers[y, x] == mapHeader.ID) { + int mapID = gameMatrix.maps[y, x]; + if (mapID == GameMatrix.EMPTY) continue; + HeadbuttEncounterMap map = new HeadbuttEncounterMap(mapID, x, y); + if (mapHeaderMapsIDsList.Contains(map)) continue; + mapHeaderMapsIDsList.Add(map); + } + } + } + } + else { + for (int y = 0; y < gameMatrix.height; y++) { + for (int x = 0; x < gameMatrix.width; x++) { + int mapID = gameMatrix.maps[y, x]; + if (mapID == GameMatrix.EMPTY) continue; + HeadbuttEncounterMap map = new HeadbuttEncounterMap(mapID, x, y); + if (mapHeaderMapsIDsList.Contains(map)) continue; + mapHeaderMapsIDsList.Add(map); + } + } + } + + foreach (HeadbuttTreeGroup treeGroup in headbuttEncounterFile.normalTreeGroups) { + foreach (HeadbuttTree tree in treeGroup.trees) { + if (tree.unused) continue; + if (tree.matrixX >= gameMatrix.width || tree.matrixY >= gameMatrix.height) continue; + int x = tree.matrixX; + int y = tree.matrixY; + int mapID = gameMatrix.maps[y, x]; + if (mapID == GameMatrix.EMPTY) continue; + HeadbuttEncounterMap map = new HeadbuttEncounterMap(mapID, x, y); + if (mapHeaderMapsIDsList.Contains(map)) continue; + mapHeaderMapsIDsList.Add(map); + } + } + + foreach (HeadbuttTreeGroup treeGroup in headbuttEncounterFile.specialTreeGroups) { + foreach (HeadbuttTree tree in treeGroup.trees) { + if (tree.unused) continue; + if (tree.matrixX >= gameMatrix.width || tree.matrixY >= gameMatrix.height) continue; + int x = tree.matrixX; + int y = tree.matrixY; + int mapID = gameMatrix.maps[y, x]; + if (mapID == GameMatrix.EMPTY) continue; + HeadbuttEncounterMap map = new HeadbuttEncounterMap(mapID, x, y); + if (mapHeaderMapsIDsList.Contains(map)) continue; + mapHeaderMapsIDsList.Add(map); + } + } + + mapHeaderMapsIDsList.Sort((first, second) => { + int ret = first.mapID.CompareTo(second.mapID); + return ret != 0 ? ret : first.x.CompareTo(second.x); + }); + foreach (HeadbuttEncounterMap map in mapHeaderMapsIDsList) { + comboBoxMapFile.Items.Add(map); + } + + if (comboBoxMapFile.Items.Count > 0) { + comboBoxMapFile.SelectedIndex = 0; + } + } + + private void buttonSave_Click(object sender, EventArgs e) { + if (headbuttEncounterFile == null) return; + headbuttEncounterFile.SaveToFile(); + } + + private void buttonSaveAs_Click(object sender, EventArgs e) { + if (headbuttEncounterFile == null) return; + + SaveFileDialog sfd = new SaveFileDialog(); + try { + sfd.InitialDirectory = Path.GetDirectoryName(sfd.FileName); + sfd.FileName = Path.GetFileName(sfd.FileName); + } + catch (Exception ex) { + sfd.InitialDirectory = Path.GetDirectoryName(Environment.SpecialFolder.UserProfile.ToString()); + sfd.FileName = Path.GetFileName(sfd.FileName); + } + + if (sfd.ShowDialog() != DialogResult.OK) return; + + headbuttEncounterFile.SaveToFile(sfd.FileName); + } + + private void buttonImport_Click(object sender, EventArgs e) { + OpenFileDialog ofd = new OpenFileDialog(); + try { + ofd.InitialDirectory = Path.GetDirectoryName(ofd.FileName); + ofd.FileName = Path.GetFileName(ofd.FileName); + } + catch (Exception ex) { + ofd.InitialDirectory = Path.GetDirectoryName(Environment.SpecialFolder.UserProfile.ToString()); + ofd.FileName = Path.GetFileName(ofd.FileName); + } + + if (ofd.ShowDialog() != DialogResult.OK) return; + + this.headbuttEncounterFile = new HeadbuttEncounterFile(ofd.FileName); + headbuttEncounterFile.ID = (ushort)comboBoxMapHeader.SelectedIndex; + setCurrentMap(headbuttEncounterFile); + } + + private void comboBoxMapFile_SelectedIndexChanged(object sender, EventArgs e) { + HeadbuttEncounterMap map = comboBoxMapFile.SelectedItem as HeadbuttEncounterMap; + int mapID = gameMatrix.maps[map.y, map.x]; + this.mapFile = new MapFile(mapID, RomInfo.gameFamily, discardMoveperms: true); + this.headbuttEncounterMap = map; + RenderBackground(); + } + + private Bitmap GetMapBitmap() { + Bitmap bm = RenderMap(); + openGlControl.Invalidate(); + return bm; + } + + private void RenderBackground() { + Bitmap bm = GetMapBitmap(); + + if (headbuttEncounterFile != null) { + using (Graphics g = Graphics.FromImage(bm)) { + g.InterpolationMode = InterpolationMode.NearestNeighbor; + g.PixelOffsetMode = PixelOffsetMode.HighQuality; + MarkTrees(g, headbuttEncounterFile.normalTreeGroups, HeadbuttTree.Types.Normal); + MarkTrees(g, headbuttEncounterFile.specialTreeGroups, HeadbuttTree.Types.Special); + } + } + + openGlPictureBox.BackgroundImage = bm; + } + + private Bitmap RenderMap() { + MapFile currentMapFile = this.mapFile; + + if (currentMapFile == null) { + Bitmap blank = new Bitmap(openGlPictureBox.Width, openGlPictureBox.Height); + using (Graphics g = Graphics.FromImage(blank)) { + g.Clear(Color.Black); + } + + return blank; + } + + Helpers.MW_LoadModelTextures(currentMapFile, areaData.mapTileset); + + bool isInteriorMap = false; + if (RomInfo.gameFamily == RomInfo.GameFamilies.HGSS && areaData.areaType == AreaData.TYPE_INDOOR) { + isInteriorMap = true; + } + + for (int i = 0; i < currentMapFile.buildings.Count; i++) { + Building building = currentMapFile.buildings[i]; + building.LoadModelData(isInteriorMap); // Load building nsbmd + Helpers.MW_LoadModelTextures(building, areaData.buildingsTileset); // Load building textures + } + + Helpers.RenderMap(ref currentMapFile, openGlControl.Width, openGlControl.Height, ang, dist, elev, perspective); + return Helpers.GrabMapScreenshot(width, height); + } + + private void MarkTrees(Graphics g, BindingList treeGroups, HeadbuttTree.Types treeType) { + HeadbuttEncounterMap map = comboBoxMapFile.SelectedItem as HeadbuttEncounterMap; + if (map == null) return; + + foreach (HeadbuttTreeGroup treeGroup in treeGroups) { + foreach (HeadbuttTree tree in treeGroup.trees) { + if (tree.unused) continue; + if (tree.matrixX != map.x || tree.matrixY != map.y) continue; + MarkTree(g, tree, treeType); + } + } + } + + private void MarkTree(Graphics g, HeadbuttTree tree, HeadbuttTree.Types treeType) { + Pen paintPen; + SolidBrush paintBrush; + if (treeType == HeadbuttTree.Types.Normal) { + paintPen = normalPen; + paintBrush = normalBrush; + } + else { + paintPen = specialPen; + paintBrush = specialBrush; + } + + if (tree.picked) { + paintPen = selectedPen; + } + + int tileWidth = openGlControl.Width / MapFile.mapSize; + int tileHeight = openGlControl.Height / MapFile.mapSize; + int tileX = tree.mapX * tileWidth; + int tileY = tree.mapY * tileHeight; + + int padding = 1; + Rectangle rectangle = new Rectangle(tileX + padding, tileY + padding, tileWidth - padding, tileHeight - padding); + g.FillRectangle(paintBrush, rectangle); + g.DrawRectangle(paintPen, rectangle); + } + + private void ListBoxTrees_SelectedIndexChanged(object sender, EventArgs e) { + listBoxTrees = sender as ListBox2; + headbuttTree = listBoxTrees.SelectedItem as HeadbuttTree; + if (headbuttTree == null) return; + numericUpDownTreeGlobalX.Value = headbuttTree.globalX; + numericUpDownTreeGlobalY.Value = headbuttTree.globalY; + numericUpDownTreeMatrixX.Value = headbuttTree.matrixX; + numericUpDownTreeMatrixY.Value = headbuttTree.matrixY; + numericUpDownTreeMapX.Value = headbuttTree.mapX; + numericUpDownTreeMapY.Value = headbuttTree.mapY; + } + + private void openGlPictureBox_Click(object sender, EventArgs e) { + MouseEventArgs mea = (MouseEventArgs)e; + + int tileWidth = openGlControl.Width / MapFile.mapSize; + int tileHeight = openGlControl.Height / MapFile.mapSize; + int mouseX = openGlPictureBox.PointToClient(MousePosition).X / tileWidth; + int mouseY = openGlPictureBox.PointToClient(MousePosition).Y / tileHeight; + + + if (mea.Button == MouseButtons.Left) { + if (this.headbuttEncounterMap != null) { + numericUpDownTreeMatrixX.Value = headbuttEncounterMap.x; + numericUpDownTreeMatrixY.Value = headbuttEncounterMap.y; + numericUpDownTreeMapX.Value = mouseX; + numericUpDownTreeMapY.Value = mouseY; + } + } + else if (mea.Button == MouseButtons.Middle) { + //warp + } + else if (mea.Button == MouseButtons.Right) { + if (headbuttTree != null) headbuttTree.picked = false; + + if (FindTreeFromMap(headbuttEncounterEditorTabNormal.listBoxTreeGroups, headbuttEncounterEditorTabNormal.listBoxTrees, mouseX, mouseY)) { + tabControl.SelectedTab = tabPageNormal; + } + else if (FindTreeFromMap(headbuttEncounterEditorTabSpecial.listBoxTreeGroups, headbuttEncounterEditorTabSpecial.listBoxTrees, mouseX, mouseY)) { + tabControl.SelectedTab = tabPageSpecial; + } + else { + headbuttEncounterEditorTabNormal.listBoxTreeGroups.SelectedItem = null; + headbuttEncounterEditorTabNormal.listBoxTrees.SelectedItem = null; + headbuttEncounterEditorTabSpecial.listBoxTreeGroups.SelectedItem = null; + headbuttEncounterEditorTabSpecial.listBoxTrees.SelectedItem = null; + } + } + + RenderBackground(); + } + + private bool FindTreeFromMap(ListBox2 listBoxTreeGroups, ListBox2 listBoxTrees, int x, int y) { + foreach (HeadbuttTreeGroup headbuttTreeGroup in listBoxTreeGroups.Items) { + foreach (HeadbuttTree tree in headbuttTreeGroup.trees) { + if (tree.mapX != x || tree.mapY != y) continue; + listBoxTreeGroups.SelectedItem = headbuttTreeGroup; + listBoxTrees.SelectedItem = tree; + tree.picked = true; + return true; + } + } + + return false; + } + + private void numericUpDownTreeGlobalX_ValueChanged(object sender, EventArgs e) { + if (headbuttTree == null) return; + headbuttTree.globalX = (ushort)((NumericUpDown)sender).Value; + listBoxTrees.RefreshItem(listBoxTrees.SelectedIndex); + } + + private void numericUpDownTreeGlobalY_ValueChanged(object sender, EventArgs e) { + if (headbuttTree == null) return; + headbuttTree.globalY = (ushort)((NumericUpDown)sender).Value; + listBoxTrees.RefreshItem(listBoxTrees.SelectedIndex); + } + + private void numericUpDownTreeMatrixX_ValueChanged(object sender, EventArgs e) { + if (headbuttTree == null) return; + headbuttTree.matrixX = (ushort)((NumericUpDown)sender).Value; + listBoxTrees.RefreshItem(listBoxTrees.SelectedIndex); + } + + private void numericUpDownTreeMatrixY_ValueChanged(object sender, EventArgs e) { + if (headbuttTree == null) return; + headbuttTree.matrixY = (ushort)((NumericUpDown)sender).Value; + listBoxTrees.RefreshItem(listBoxTrees.SelectedIndex); + } + + private void numericUpDownTreeMapX_ValueChanged(object sender, EventArgs e) { + if (headbuttTree == null) return; + headbuttTree.mapX = (ushort)((NumericUpDown)sender).Value; + listBoxTrees.RefreshItem(listBoxTrees.SelectedIndex); + } + + private void numericUpDownTreeMapY_ValueChanged(object sender, EventArgs e) { + if (headbuttTree == null) return; + headbuttTree.mapY = (ushort)((NumericUpDown)sender).Value; + listBoxTrees.RefreshItem(listBoxTrees.SelectedIndex); + } + + private void mapScreenshotButton_Click(object sender, EventArgs e) { + SaveFileDialog imageSFD = new SaveFileDialog { Filter = "PNG File(*.png)|*.png", }; + if (imageSFD.ShowDialog() != DialogResult.OK) return; + openGlPictureBox.BackgroundImage.Save(imageSFD.FileName); + MessageBox.Show("Screenshot saved.", "Success", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + + private void SetCam2DValues() { + perspective = 4f; + ang = 0f; + dist = 115.2f; + elev = 90f; + } + } +} diff --git a/DS_Map/Editors/HeadbuttEncounterEditor.resx b/DS_Map/Editors/HeadbuttEncounterEditor.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/DS_Map/Editors/HeadbuttEncounterEditor.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/HeadbuttEncounterEditorTab.Designer.cs b/DS_Map/Editors/HeadbuttEncounterEditorTab.Designer.cs new file mode 100644 index 0000000..1735cbb --- /dev/null +++ b/DS_Map/Editors/HeadbuttEncounterEditorTab.Designer.cs @@ -0,0 +1,235 @@ + +namespace DSPRE.Editors +{ + partial class HeadbuttEncounterEditorTab + { + /// + /// 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 Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() { + this.buttonDuplicateTreeGroup = new System.Windows.Forms.Button(); + this.buttonRemoveTreeGroup = new System.Windows.Forms.Button(); + this.numericUpDownMaxLevel = new System.Windows.Forms.NumericUpDown(); + this.numericUpDownMinLevel = new System.Windows.Forms.NumericUpDown(); + this.buttonAddTreeGroup = new System.Windows.Forms.Button(); + this.label5 = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.comboBoxPokemon = new System.Windows.Forms.ComboBox(); + this.listBoxTreeGroups = new DSPRE.ListBox2(); + this.listBoxTrees = new DSPRE.ListBox2(); + this.listBoxEncounters = new DSPRE.ListBox2(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownMaxLevel)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownMinLevel)).BeginInit(); + this.SuspendLayout(); + // + // buttonDuplicateTreeGroup + // + this.buttonDuplicateTreeGroup.Location = new System.Drawing.Point(177, 389); + this.buttonDuplicateTreeGroup.Name = "buttonDuplicateTreeGroup"; + this.buttonDuplicateTreeGroup.Size = new System.Drawing.Size(81, 23); + this.buttonDuplicateTreeGroup.TabIndex = 17; + this.buttonDuplicateTreeGroup.Text = "Duplicate"; + this.buttonDuplicateTreeGroup.UseVisualStyleBackColor = true; + this.buttonDuplicateTreeGroup.Click += new System.EventHandler(this.buttonDuplicateTreeGroup_Click); + // + // buttonRemoveTreeGroup + // + this.buttonRemoveTreeGroup.Location = new System.Drawing.Point(90, 389); + this.buttonRemoveTreeGroup.Name = "buttonRemoveTreeGroup"; + this.buttonRemoveTreeGroup.Size = new System.Drawing.Size(81, 23); + this.buttonRemoveTreeGroup.TabIndex = 17; + this.buttonRemoveTreeGroup.Text = "Remove"; + this.buttonRemoveTreeGroup.UseVisualStyleBackColor = true; + this.buttonRemoveTreeGroup.Click += new System.EventHandler(this.buttonRemoveTreeGroup_Click); + // + // numericUpDownMaxLevel + // + this.numericUpDownMaxLevel.Location = new System.Drawing.Point(200, 210); + this.numericUpDownMaxLevel.Name = "numericUpDownMaxLevel"; + this.numericUpDownMaxLevel.Size = new System.Drawing.Size(58, 20); + this.numericUpDownMaxLevel.TabIndex = 15; + this.numericUpDownMaxLevel.ValueChanged += new System.EventHandler(this.numericUpDownMaxLevel_ValueChanged); + // + // numericUpDownMinLevel + // + this.numericUpDownMinLevel.Location = new System.Drawing.Point(136, 210); + this.numericUpDownMinLevel.Name = "numericUpDownMinLevel"; + this.numericUpDownMinLevel.Size = new System.Drawing.Size(58, 20); + this.numericUpDownMinLevel.TabIndex = 15; + this.numericUpDownMinLevel.ValueChanged += new System.EventHandler(this.numericUpDownMinLevel_ValueChanged); + // + // buttonAddTreeGroup + // + this.buttonAddTreeGroup.Location = new System.Drawing.Point(3, 389); + this.buttonAddTreeGroup.Name = "buttonAddTreeGroup"; + this.buttonAddTreeGroup.Size = new System.Drawing.Size(81, 23); + this.buttonAddTreeGroup.TabIndex = 17; + this.buttonAddTreeGroup.Text = "Add"; + this.buttonAddTreeGroup.UseVisualStyleBackColor = true; + this.buttonAddTreeGroup.Click += new System.EventHandler(this.buttonAddTreeGroup_Click); + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(0, 233); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(66, 13); + this.label5.TabIndex = 18; + this.label5.Text = "Tree Groups"; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(0, 415); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(34, 13); + this.label6.TabIndex = 18; + this.label6.Text = "Trees"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(0, 193); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(52, 13); + this.label2.TabIndex = 18; + this.label2.Text = "Pokemon"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(133, 193); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(53, 13); + this.label3.TabIndex = 18; + this.label3.Text = "Min Level"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(0, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(86, 13); + this.label1.TabIndex = 18; + this.label1.Text = "Encounter Table"; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(197, 193); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(56, 13); + this.label4.TabIndex = 18; + this.label4.Text = "Max Level"; + // + // comboBoxPokemon + // + this.comboBoxPokemon.FormattingEnabled = true; + this.comboBoxPokemon.Location = new System.Drawing.Point(3, 209); + this.comboBoxPokemon.Name = "comboBoxPokemon"; + this.comboBoxPokemon.Size = new System.Drawing.Size(127, 21); + this.comboBoxPokemon.TabIndex = 19; + this.comboBoxPokemon.SelectedIndexChanged += new System.EventHandler(this.comboBoxPokemon_SelectedIndexChanged); + // + // listBoxTreeGroups + // + this.listBoxTreeGroups.DisplayMember = "DisplayName"; + this.listBoxTreeGroups.FormattingEnabled = true; + this.listBoxTreeGroups.Location = new System.Drawing.Point(3, 249); + this.listBoxTreeGroups.Name = "listBoxTreeGroups"; + this.listBoxTreeGroups.Size = new System.Drawing.Size(255, 134); + this.listBoxTreeGroups.TabIndex = 11; + this.listBoxTreeGroups.SelectedIndexChanged += new System.EventHandler(this.listBoxTreeGroups_SelectedIndexChanged); + // + // listBoxTrees + // + this.listBoxTrees.DisplayMember = "DisplayName"; + this.listBoxTrees.FormattingEnabled = true; + this.listBoxTrees.Location = new System.Drawing.Point(3, 431); + this.listBoxTrees.Name = "listBoxTrees"; + this.listBoxTrees.Size = new System.Drawing.Size(255, 82); + this.listBoxTrees.TabIndex = 11; + // + // listBoxEncounters + // + this.listBoxEncounters.Font = new System.Drawing.Font("Consolas", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.listBoxEncounters.FormattingEnabled = true; + this.listBoxEncounters.ItemHeight = 14; + this.listBoxEncounters.Location = new System.Drawing.Point(3, 15); + this.listBoxEncounters.Name = "listBoxEncounters"; + this.listBoxEncounters.Size = new System.Drawing.Size(255, 172); + this.listBoxEncounters.TabIndex = 13; + this.listBoxEncounters.SelectedIndexChanged += new System.EventHandler(this.listBoxEncounters_SelectedIndexChanged); + // + // HeadbuttEncounterEditorTab + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.comboBoxPokemon); + this.Controls.Add(this.label4); + this.Controls.Add(this.label1); + this.Controls.Add(this.listBoxTreeGroups); + this.Controls.Add(this.label3); + this.Controls.Add(this.buttonDuplicateTreeGroup); + this.Controls.Add(this.label2); + this.Controls.Add(this.buttonRemoveTreeGroup); + this.Controls.Add(this.listBoxTrees); + this.Controls.Add(this.label6); + this.Controls.Add(this.numericUpDownMaxLevel); + this.Controls.Add(this.listBoxEncounters); + this.Controls.Add(this.label5); + this.Controls.Add(this.numericUpDownMinLevel); + this.Controls.Add(this.buttonAddTreeGroup); + this.Name = "HeadbuttEncounterEditorTab"; + this.Size = new System.Drawing.Size(262, 517); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownMaxLevel)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownMinLevel)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + public DSPRE.ListBox2 listBoxTreeGroups; + private System.Windows.Forms.Button buttonDuplicateTreeGroup; + private System.Windows.Forms.Button buttonRemoveTreeGroup; + public ListBox2 listBoxTrees; + public System.Windows.Forms.NumericUpDown numericUpDownMaxLevel; + public DSPRE.ListBox2 listBoxEncounters; + public System.Windows.Forms.NumericUpDown numericUpDownMinLevel; + private System.Windows.Forms.Button buttonAddTreeGroup; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label4; + public System.Windows.Forms.ComboBox comboBoxPokemon; + } +} diff --git a/DS_Map/Editors/HeadbuttEncounterEditorTab.cs b/DS_Map/Editors/HeadbuttEncounterEditorTab.cs new file mode 100644 index 0000000..2ce87e4 --- /dev/null +++ b/DS_Map/Editors/HeadbuttEncounterEditorTab.cs @@ -0,0 +1,95 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Windows.Forms; +using DSPRE.ROMFiles; + +namespace DSPRE.Editors { + public partial class HeadbuttEncounterEditorTab : UserControl { + private List encounters; + private BindingList treeGroups; + + public HeadbuttEncounterEditorTab() { + InitializeComponent(); + } + + public void Reset() { + Helpers.DisableHandlers(); + listBoxEncounters.DataSource = null; + listBoxTreeGroups.DataSource = null; + listBoxTrees.DataSource = null; + comboBoxPokemon.SelectedIndex = 0; + numericUpDownMinLevel.Value = 0; + numericUpDownMaxLevel.Value = 0; + Helpers.EnableHandlers(); + } + + public void SetHeadbuttEncounter(List encounters, BindingList treeGroups) { + Helpers.DisableHandlers(); + this.encounters = encounters; + this.treeGroups = treeGroups; + listBoxEncounters.DataSource = this.encounters; + listBoxTreeGroups.DataSource = this.treeGroups; + listBoxEncounters.SelectedIndex = -1; + listBoxTreeGroups.SelectedIndex = -1; + Helpers.EnableHandlers(); + } + + private void listBoxEncounters_SelectedIndexChanged(object sender, EventArgs e) { + if (Helpers.HandlersDisabled) return; + HeadbuttEncounter headbuttEncounter = (HeadbuttEncounter)listBoxEncounters.SelectedItem; + if (headbuttEncounter == null) return; + comboBoxPokemon.SelectedIndex = headbuttEncounter.pokemonID; + numericUpDownMinLevel.Value = headbuttEncounter.minLevel; + numericUpDownMaxLevel.Value = headbuttEncounter.maxLevel; + } + + private void comboBoxPokemon_SelectedIndexChanged(object sender, EventArgs e) + { + if (Helpers.HandlersDisabled) return; + HeadbuttEncounter headbuttEncounter = (HeadbuttEncounter)listBoxEncounters.SelectedItem; + if (headbuttEncounter == null) return; + headbuttEncounter.pokemonID = (ushort)comboBoxPokemon.SelectedIndex; + listBoxEncounters.RefreshItem(listBoxEncounters.SelectedIndex); + } + + private void numericUpDownMinLevel_ValueChanged(object sender, EventArgs e) { + if (Helpers.HandlersDisabled) return; + HeadbuttEncounter headbuttEncounter = (HeadbuttEncounter)listBoxEncounters.SelectedItem; + if (headbuttEncounter == null) return; + headbuttEncounter.minLevel = (byte)numericUpDownMinLevel.Value; + listBoxEncounters.RefreshItem(listBoxEncounters.SelectedIndex); + } + + private void numericUpDownMaxLevel_ValueChanged(object sender, EventArgs e) { + if (Helpers.HandlersDisabled) return; + HeadbuttEncounter headbuttEncounter = (HeadbuttEncounter)listBoxEncounters.SelectedItem; + if (headbuttEncounter == null) return; + headbuttEncounter.maxLevel = (byte)numericUpDownMaxLevel.Value; + listBoxEncounters.RefreshItem(listBoxEncounters.SelectedIndex); + } + + private void listBoxTreeGroups_SelectedIndexChanged(object sender, EventArgs e) { + if (Helpers.HandlersDisabled) return; + HeadbuttTreeGroup headbuttTreeGroup = (HeadbuttTreeGroup)listBoxTreeGroups.SelectedItem; + if (headbuttTreeGroup == null) return; + listBoxTrees.DataSource = headbuttTreeGroup.trees; + } + + private void buttonAddTreeGroup_Click(object sender, EventArgs e) { + treeGroups.Add(new HeadbuttTreeGroup()); + } + + private void buttonRemoveTreeGroup_Click(object sender, EventArgs e) { + int selectedIndex = listBoxTreeGroups.SelectedIndex; + if (selectedIndex == -1) return; + treeGroups.RemoveAt(selectedIndex); + } + + private void buttonDuplicateTreeGroup_Click(object sender, EventArgs e) { + HeadbuttTreeGroup headbuttTreeGroup = (HeadbuttTreeGroup)listBoxTreeGroups.SelectedItem; + if (headbuttTreeGroup == null) return; + treeGroups.Add(new HeadbuttTreeGroup(headbuttTreeGroup)); + } + } +} diff --git a/DS_Map/Editors/HeadbuttEncounterEditorTab.resx b/DS_Map/Editors/HeadbuttEncounterEditorTab.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/DS_Map/Editors/HeadbuttEncounterEditorTab.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/SafariZoneEditor.Designer.cs b/DS_Map/Editors/SafariZoneEditor.Designer.cs new file mode 100644 index 0000000..5a675f4 --- /dev/null +++ b/DS_Map/Editors/SafariZoneEditor.Designer.cs @@ -0,0 +1,250 @@ + +namespace DSPRE.Editors +{ + partial class SafariZoneEditor + { + /// + /// 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 Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.buttonSaveAs = new System.Windows.Forms.Button(); + this.buttonSave = new System.Windows.Forms.Button(); + this.tabPageSuperRod = new System.Windows.Forms.TabPage(); + this.safariZoneEncounterGroupEditorSuperRod = new DSPRE.Editors.SafariZoneEncounterGroupEditor(); + this.tabPageGoodRod = new System.Windows.Forms.TabPage(); + this.safariZoneEncounterGroupEditorGoodRod = new DSPRE.Editors.SafariZoneEncounterGroupEditor(); + this.tabPageOldRod = new System.Windows.Forms.TabPage(); + this.safariZoneEncounterGroupEditorOldRod = new DSPRE.Editors.SafariZoneEncounterGroupEditor(); + this.tabPageSurf = new System.Windows.Forms.TabPage(); + this.safariZoneEncounterGroupEditorSurf = new DSPRE.Editors.SafariZoneEncounterGroupEditor(); + this.tabPageGrass = new System.Windows.Forms.TabPage(); + this.safariZoneEncounterGroupEditorGrass = new DSPRE.Editors.SafariZoneEncounterGroupEditor(); + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.label1 = new System.Windows.Forms.Label(); + this.comboBoxFileID = new System.Windows.Forms.ComboBox(); + this.buttonImport = new System.Windows.Forms.Button(); + this.tabPageSuperRod.SuspendLayout(); + this.tabPageGoodRod.SuspendLayout(); + this.tabPageOldRod.SuspendLayout(); + this.tabPageSurf.SuspendLayout(); + this.tabPageGrass.SuspendLayout(); + this.tabControl1.SuspendLayout(); + this.SuspendLayout(); + // + // buttonSaveAs + // + this.buttonSaveAs.Location = new System.Drawing.Point(236, 14); + this.buttonSaveAs.Name = "buttonSaveAs"; + this.buttonSaveAs.Size = new System.Drawing.Size(75, 23); + this.buttonSaveAs.TabIndex = 28; + this.buttonSaveAs.Text = "Save As"; + this.buttonSaveAs.UseVisualStyleBackColor = true; + this.buttonSaveAs.Click += new System.EventHandler(this.buttonSaveAs_Click); + // + // buttonSave + // + this.buttonSave.Location = new System.Drawing.Point(155, 14); + this.buttonSave.Name = "buttonSave"; + this.buttonSave.Size = new System.Drawing.Size(75, 23); + this.buttonSave.TabIndex = 28; + this.buttonSave.Text = "Save"; + this.buttonSave.UseVisualStyleBackColor = true; + this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click); + // + // tabPageSuperRod + // + this.tabPageSuperRod.Controls.Add(this.safariZoneEncounterGroupEditorSuperRod); + this.tabPageSuperRod.Location = new System.Drawing.Point(4, 22); + this.tabPageSuperRod.Name = "tabPageSuperRod"; + this.tabPageSuperRod.Padding = new System.Windows.Forms.Padding(3); + this.tabPageSuperRod.Size = new System.Drawing.Size(935, 264); + this.tabPageSuperRod.TabIndex = 4; + this.tabPageSuperRod.Text = "Super Rod"; + this.tabPageSuperRod.UseVisualStyleBackColor = true; + // + // safariZoneEncounterGroupEditorSuperRod + // + this.safariZoneEncounterGroupEditorSuperRod.Location = new System.Drawing.Point(6, 6); + this.safariZoneEncounterGroupEditorSuperRod.Name = "safariZoneEncounterGroupEditorSuperRod"; + this.safariZoneEncounterGroupEditorSuperRod.Size = new System.Drawing.Size(969, 255); + this.safariZoneEncounterGroupEditorSuperRod.TabIndex = 25; + // + // tabPageGoodRod + // + this.tabPageGoodRod.Controls.Add(this.safariZoneEncounterGroupEditorGoodRod); + this.tabPageGoodRod.Location = new System.Drawing.Point(4, 22); + this.tabPageGoodRod.Name = "tabPageGoodRod"; + this.tabPageGoodRod.Padding = new System.Windows.Forms.Padding(3); + this.tabPageGoodRod.Size = new System.Drawing.Size(935, 264); + this.tabPageGoodRod.TabIndex = 3; + this.tabPageGoodRod.Text = "Good Rod"; + this.tabPageGoodRod.UseVisualStyleBackColor = true; + // + // safariZoneEncounterGroupEditorGoodRod + // + this.safariZoneEncounterGroupEditorGoodRod.Location = new System.Drawing.Point(6, 6); + this.safariZoneEncounterGroupEditorGoodRod.Name = "safariZoneEncounterGroupEditorGoodRod"; + this.safariZoneEncounterGroupEditorGoodRod.Size = new System.Drawing.Size(969, 255); + this.safariZoneEncounterGroupEditorGoodRod.TabIndex = 25; + // + // tabPageOldRod + // + this.tabPageOldRod.Controls.Add(this.safariZoneEncounterGroupEditorOldRod); + this.tabPageOldRod.Location = new System.Drawing.Point(4, 22); + this.tabPageOldRod.Name = "tabPageOldRod"; + this.tabPageOldRod.Padding = new System.Windows.Forms.Padding(3); + this.tabPageOldRod.Size = new System.Drawing.Size(935, 264); + this.tabPageOldRod.TabIndex = 2; + this.tabPageOldRod.Text = "Old Rod"; + this.tabPageOldRod.UseVisualStyleBackColor = true; + // + // safariZoneEncounterGroupEditorOldRod + // + this.safariZoneEncounterGroupEditorOldRod.Location = new System.Drawing.Point(6, 6); + this.safariZoneEncounterGroupEditorOldRod.Name = "safariZoneEncounterGroupEditorOldRod"; + this.safariZoneEncounterGroupEditorOldRod.Size = new System.Drawing.Size(969, 255); + this.safariZoneEncounterGroupEditorOldRod.TabIndex = 25; + // + // tabPageSurf + // + this.tabPageSurf.Controls.Add(this.safariZoneEncounterGroupEditorSurf); + this.tabPageSurf.Location = new System.Drawing.Point(4, 22); + this.tabPageSurf.Name = "tabPageSurf"; + this.tabPageSurf.Padding = new System.Windows.Forms.Padding(3); + this.tabPageSurf.Size = new System.Drawing.Size(935, 264); + this.tabPageSurf.TabIndex = 1; + this.tabPageSurf.Text = "Surf"; + this.tabPageSurf.UseVisualStyleBackColor = true; + // + // safariZoneEncounterGroupEditorSurf + // + this.safariZoneEncounterGroupEditorSurf.Location = new System.Drawing.Point(6, 6); + this.safariZoneEncounterGroupEditorSurf.Name = "safariZoneEncounterGroupEditorSurf"; + this.safariZoneEncounterGroupEditorSurf.Size = new System.Drawing.Size(969, 255); + this.safariZoneEncounterGroupEditorSurf.TabIndex = 25; + // + // tabPageGrass + // + this.tabPageGrass.Controls.Add(this.safariZoneEncounterGroupEditorGrass); + this.tabPageGrass.Location = new System.Drawing.Point(4, 22); + this.tabPageGrass.Name = "tabPageGrass"; + this.tabPageGrass.Padding = new System.Windows.Forms.Padding(3); + this.tabPageGrass.Size = new System.Drawing.Size(935, 264); + this.tabPageGrass.TabIndex = 0; + this.tabPageGrass.Text = "Grass"; + this.tabPageGrass.UseVisualStyleBackColor = true; + // + // safariZoneEncounterGroupEditorGrass + // + this.safariZoneEncounterGroupEditorGrass.Location = new System.Drawing.Point(6, 6); + this.safariZoneEncounterGroupEditorGrass.Name = "safariZoneEncounterGroupEditorGrass"; + this.safariZoneEncounterGroupEditorGrass.Size = new System.Drawing.Size(969, 255); + this.safariZoneEncounterGroupEditorGrass.TabIndex = 25; + // + // tabControl1 + // + this.tabControl1.Controls.Add(this.tabPageGrass); + this.tabControl1.Controls.Add(this.tabPageSurf); + this.tabControl1.Controls.Add(this.tabPageOldRod); + this.tabControl1.Controls.Add(this.tabPageGoodRod); + this.tabControl1.Controls.Add(this.tabPageSuperRod); + this.tabControl1.Location = new System.Drawing.Point(4, 44); + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + this.tabControl1.Size = new System.Drawing.Size(943, 290); + this.tabControl1.TabIndex = 27; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(3, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(59, 13); + this.label1.TabIndex = 26; + this.label1.Text = "Map Name"; + // + // comboBoxFileID + // + this.comboBoxFileID.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBoxFileID.FormattingEnabled = true; + this.comboBoxFileID.Location = new System.Drawing.Point(3, 16); + this.comboBoxFileID.Name = "comboBoxFileID"; + this.comboBoxFileID.Size = new System.Drawing.Size(146, 21); + this.comboBoxFileID.TabIndex = 0; + this.comboBoxFileID.SelectedIndexChanged += new System.EventHandler(this.comboBoxFileID_SelectedIndexChanged); + // + // buttonImport + // + this.buttonImport.Location = new System.Drawing.Point(317, 14); + this.buttonImport.Name = "buttonImport"; + this.buttonImport.Size = new System.Drawing.Size(75, 23); + this.buttonImport.TabIndex = 28; + this.buttonImport.Text = "Import"; + this.buttonImport.UseVisualStyleBackColor = true; + this.buttonImport.Click += new System.EventHandler(this.buttonImport_Click); + // + // SafariZoneEditor + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.buttonImport); + this.Controls.Add(this.buttonSaveAs); + this.Controls.Add(this.buttonSave); + this.Controls.Add(this.tabControl1); + this.Controls.Add(this.label1); + this.Controls.Add(this.comboBoxFileID); + this.Name = "SafariZoneEditor"; + this.Size = new System.Drawing.Size(953, 340); + this.tabPageSuperRod.ResumeLayout(false); + this.tabPageGoodRod.ResumeLayout(false); + this.tabPageOldRod.ResumeLayout(false); + this.tabPageSurf.ResumeLayout(false); + this.tabPageGrass.ResumeLayout(false); + this.tabControl1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Button buttonSaveAs; + private System.Windows.Forms.Button buttonSave; + private System.Windows.Forms.TabPage tabPageSuperRod; + private SafariZoneEncounterGroupEditor safariZoneEncounterGroupEditorSuperRod; + private System.Windows.Forms.TabPage tabPageGoodRod; + private SafariZoneEncounterGroupEditor safariZoneEncounterGroupEditorGoodRod; + private System.Windows.Forms.TabPage tabPageOldRod; + private SafariZoneEncounterGroupEditor safariZoneEncounterGroupEditorOldRod; + private System.Windows.Forms.TabPage tabPageSurf; + private SafariZoneEncounterGroupEditor safariZoneEncounterGroupEditorSurf; + private System.Windows.Forms.TabPage tabPageGrass; + private SafariZoneEncounterGroupEditor safariZoneEncounterGroupEditorGrass; + private System.Windows.Forms.TabControl tabControl1; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.ComboBox comboBoxFileID; + private System.Windows.Forms.Button buttonImport; + } +} diff --git a/DS_Map/Editors/SafariZoneEditor.cs b/DS_Map/Editors/SafariZoneEditor.cs new file mode 100644 index 0000000..fe11773 --- /dev/null +++ b/DS_Map/Editors/SafariZoneEditor.cs @@ -0,0 +1,105 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Windows.Forms; +using DSPRE.ROMFiles; + +namespace DSPRE.Editors { + public partial class SafariZoneEditor : UserControl { + public bool safariZoneEditorIsReady { get; set; } = false; + private SafariZoneEncounterFile safariZoneEncounterFile; + + public SafariZoneEditor() { + InitializeComponent(); + } + + public void SetupSafariZoneEditor(bool force = false) { + if (safariZoneEditorIsReady && !force) return; + safariZoneEditorIsReady = true; + + DSUtils.TryUnpackNarcs(new List() { + RomInfo.DirNames.safariZone, + RomInfo.DirNames.textArchives, + }); + + safariZoneEncounterGroupEditorGrass.SetPokemonNames(); + safariZoneEncounterGroupEditorSurf.SetPokemonNames(); + safariZoneEncounterGroupEditorOldRod.SetPokemonNames(); + safariZoneEncounterGroupEditorGoodRod.SetPokemonNames(); + safariZoneEncounterGroupEditorSuperRod.SetPokemonNames(); + + int safariZoneCount = Filesystem.GetSafariZoneCount(); + comboBoxFileID.Items.Clear(); + for (int i = 0; i < safariZoneCount; i++) { + comboBoxFileID.Items.Add(SafariZoneEncounterFile.Names[i]); + } + + if (comboBoxFileID.Items.Count > 0) { + comboBoxFileID.SelectedIndex = 0; + } + } + + private void comboBoxFileID_SelectedIndexChanged(object sender, EventArgs e) { + if (comboBoxFileID.SelectedIndex == -1) { + safariZoneEncounterFile = null; + safariZoneEncounterGroupEditorGrass.Reset(); + safariZoneEncounterGroupEditorSurf.Reset(); + safariZoneEncounterGroupEditorOldRod.Reset(); + safariZoneEncounterGroupEditorGoodRod.Reset(); + safariZoneEncounterGroupEditorSuperRod.Reset(); + return; + } + + safariZoneEncounterFile = new SafariZoneEncounterFile(comboBoxFileID.SelectedIndex); + safariZoneEncounterGroupEditorGrass.SetData(safariZoneEncounterFile.grassEncounterGroup); + safariZoneEncounterGroupEditorSurf.SetData(safariZoneEncounterFile.surfEncounterGroup); + safariZoneEncounterGroupEditorOldRod.SetData(safariZoneEncounterFile.oldRodEncounterGroup); + safariZoneEncounterGroupEditorGoodRod.SetData(safariZoneEncounterFile.goodRodEncounterGroup); + safariZoneEncounterGroupEditorSuperRod.SetData(safariZoneEncounterFile.superRodEncounterGroup); + } + + private void buttonSave_Click(object sender, EventArgs e) { + if (safariZoneEncounterFile == null) return; + safariZoneEncounterFile.SaveToFile(); + } + + private void buttonSaveAs_Click(object sender, EventArgs e) { + if (safariZoneEncounterFile == null) return; + + SaveFileDialog sfd = new SaveFileDialog(); + try { + sfd.InitialDirectory = Path.GetDirectoryName(sfd.FileName); + sfd.FileName = Path.GetFileName(sfd.FileName); + } + catch (Exception ex) { + sfd.InitialDirectory = Path.GetDirectoryName(Environment.SpecialFolder.UserProfile.ToString()); + sfd.FileName = Path.GetFileName(sfd.FileName); + } + if (sfd.ShowDialog() != DialogResult.OK) return; + + safariZoneEncounterFile.SaveToFile(sfd.FileName); + } + + private void buttonImport_Click(object sender, EventArgs e) { + if (safariZoneEncounterFile == null) return; + + OpenFileDialog ofd = new OpenFileDialog(); + try { + ofd.InitialDirectory = Path.GetDirectoryName(ofd.FileName); + ofd.FileName = Path.GetFileName(ofd.FileName); + } + catch (Exception ex) { + ofd.InitialDirectory = Path.GetDirectoryName(Environment.SpecialFolder.UserProfile.ToString()); + ofd.FileName = Path.GetFileName(ofd.FileName); + } + if (ofd.ShowDialog() != DialogResult.OK) return; + + safariZoneEncounterFile = new SafariZoneEncounterFile(ofd.FileName); + safariZoneEncounterGroupEditorGrass.SetData(safariZoneEncounterFile.grassEncounterGroup); + safariZoneEncounterGroupEditorSurf.SetData(safariZoneEncounterFile.surfEncounterGroup); + safariZoneEncounterGroupEditorOldRod.SetData(safariZoneEncounterFile.oldRodEncounterGroup); + safariZoneEncounterGroupEditorGoodRod.SetData(safariZoneEncounterFile.goodRodEncounterGroup); + safariZoneEncounterGroupEditorSuperRod.SetData(safariZoneEncounterFile.superRodEncounterGroup); + } + } +} diff --git a/DS_Map/Editors/SafariZoneEditor.resx b/DS_Map/Editors/SafariZoneEditor.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/DS_Map/Editors/SafariZoneEditor.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/SafariZoneEncounterEditorTab.Designer.cs b/DS_Map/Editors/SafariZoneEncounterEditorTab.Designer.cs new file mode 100644 index 0000000..bb6a6cb --- /dev/null +++ b/DS_Map/Editors/SafariZoneEncounterEditorTab.Designer.cs @@ -0,0 +1,218 @@ + +namespace DSPRE.Editors +{ + partial class SafariZoneEncounterEditorTab + { + /// + /// 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 Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.numericUpDownLevel = new System.Windows.Forms.NumericUpDown(); + this.comboBoxPokemon = new System.Windows.Forms.ComboBox(); + this.numericUpDownLevelObject = new System.Windows.Forms.NumericUpDown(); + this.comboBoxPokemonObject = new System.Windows.Forms.ComboBox(); + this.label2 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); + this.listBoxEncountersObject = new DSPRE.ListBox2(); + this.listBoxEncounters = new DSPRE.ListBox2(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownLevel)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownLevelObject)).BeginInit(); + this.SuspendLayout(); + // + // numericUpDownLevel + // + this.numericUpDownLevel.Location = new System.Drawing.Point(139, 180); + this.numericUpDownLevel.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDownLevel.Name = "numericUpDownLevel"; + this.numericUpDownLevel.Size = new System.Drawing.Size(58, 20); + this.numericUpDownLevel.TabIndex = 20; + this.numericUpDownLevel.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDownLevel.ValueChanged += new System.EventHandler(this.numericUpDownLevel_ValueChanged); + // + // comboBoxPokemon + // + this.comboBoxPokemon.FormattingEnabled = true; + this.comboBoxPokemon.Location = new System.Drawing.Point(6, 179); + this.comboBoxPokemon.Name = "comboBoxPokemon"; + this.comboBoxPokemon.Size = new System.Drawing.Size(127, 21); + this.comboBoxPokemon.TabIndex = 21; + this.comboBoxPokemon.SelectedIndexChanged += new System.EventHandler(this.comboBoxPokemon_SelectedIndexChanged); + // + // numericUpDownLevelObject + // + this.numericUpDownLevelObject.Location = new System.Drawing.Point(339, 180); + this.numericUpDownLevelObject.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDownLevelObject.Name = "numericUpDownLevelObject"; + this.numericUpDownLevelObject.Size = new System.Drawing.Size(58, 20); + this.numericUpDownLevelObject.TabIndex = 20; + this.numericUpDownLevelObject.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDownLevelObject.ValueChanged += new System.EventHandler(this.numericUpDownLevelObject_ValueChanged); + // + // comboBoxPokemonObject + // + this.comboBoxPokemonObject.FormattingEnabled = true; + this.comboBoxPokemonObject.Location = new System.Drawing.Point(206, 179); + this.comboBoxPokemonObject.Name = "comboBoxPokemonObject"; + this.comboBoxPokemonObject.Size = new System.Drawing.Size(127, 21); + this.comboBoxPokemonObject.TabIndex = 21; + this.comboBoxPokemonObject.SelectedIndexChanged += new System.EventHandler(this.comboBoxPokemonObject_SelectedIndexChanged); + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(3, 0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(86, 13); + this.label2.TabIndex = 22; + this.label2.Text = "Encounter Table"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(203, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(120, 13); + this.label1.TabIndex = 22; + this.label1.Text = "Object Encounter Table"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(136, 163); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(33, 13); + this.label3.TabIndex = 23; + this.label3.Text = "Level"; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(3, 163); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(52, 13); + this.label4.TabIndex = 24; + this.label4.Text = "Pokemon"; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(203, 163); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(52, 13); + this.label5.TabIndex = 24; + this.label5.Text = "Pokemon"; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(336, 163); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(33, 13); + this.label6.TabIndex = 23; + this.label6.Text = "Level"; + // + // listBoxEncountersObject + // + this.listBoxEncountersObject.Font = new System.Drawing.Font("Consolas", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.listBoxEncountersObject.FormattingEnabled = true; + this.listBoxEncountersObject.ItemHeight = 14; + this.listBoxEncountersObject.Location = new System.Drawing.Point(206, 16); + this.listBoxEncountersObject.Name = "listBoxEncountersObject"; + this.listBoxEncountersObject.Size = new System.Drawing.Size(191, 144); + this.listBoxEncountersObject.TabIndex = 1; + this.listBoxEncountersObject.SelectedIndexChanged += new System.EventHandler(this.listBoxEncountersObject_SelectedIndexChanged); + // + // listBoxEncounters + // + this.listBoxEncounters.Font = new System.Drawing.Font("Consolas", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.listBoxEncounters.FormattingEnabled = true; + this.listBoxEncounters.ItemHeight = 14; + this.listBoxEncounters.Location = new System.Drawing.Point(6, 16); + this.listBoxEncounters.Name = "listBoxEncounters"; + this.listBoxEncounters.Size = new System.Drawing.Size(191, 144); + this.listBoxEncounters.TabIndex = 1; + this.listBoxEncounters.SelectedIndexChanged += new System.EventHandler(this.listBoxEncounters_SelectedIndexChanged); + // + // SafariZoneEncounterEditorTab + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label6); + this.Controls.Add(this.label3); + this.Controls.Add(this.label5); + this.Controls.Add(this.label4); + this.Controls.Add(this.label1); + this.Controls.Add(this.label2); + this.Controls.Add(this.comboBoxPokemonObject); + this.Controls.Add(this.comboBoxPokemon); + this.Controls.Add(this.numericUpDownLevelObject); + this.Controls.Add(this.numericUpDownLevel); + this.Controls.Add(this.listBoxEncountersObject); + this.Controls.Add(this.listBoxEncounters); + this.Name = "SafariZoneEncounterEditorTab"; + this.Size = new System.Drawing.Size(404, 208); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownLevel)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownLevelObject)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + public ListBox2 listBoxEncounters; + public System.Windows.Forms.NumericUpDown numericUpDownLevel; + public System.Windows.Forms.ComboBox comboBoxPokemon; + public ListBox2 listBoxEncountersObject; + public System.Windows.Forms.NumericUpDown numericUpDownLevelObject; + public System.Windows.Forms.ComboBox comboBoxPokemonObject; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Label label6; + } +} diff --git a/DS_Map/Editors/SafariZoneEncounterEditorTab.cs b/DS_Map/Editors/SafariZoneEncounterEditorTab.cs new file mode 100644 index 0000000..59416ba --- /dev/null +++ b/DS_Map/Editors/SafariZoneEncounterEditorTab.cs @@ -0,0 +1,63 @@ +using System; +using System.Windows.Forms; +using DSPRE.ROMFiles; + +namespace DSPRE.Editors { + public partial class SafariZoneEncounterEditorTab : UserControl { + public SafariZoneEncounterEditorTab() { + InitializeComponent(); + } + + private void listBoxEncounters_SelectedIndexChanged(object sender, EventArgs e) { + if (Helpers.HandlersDisabled) return; + SafariZoneEncounter safariZoneEncounter = (SafariZoneEncounter)listBoxEncounters.SelectedItem; + if (safariZoneEncounter == null) return; + comboBoxPokemon.SelectedIndex = safariZoneEncounter.pokemonID; + numericUpDownLevel.Value = safariZoneEncounter.level; + } + + private void comboBoxPokemon_SelectedIndexChanged(object sender, EventArgs e) { + if (Helpers.HandlersDisabled) return; + SafariZoneEncounter safariZoneEncounter = (SafariZoneEncounter)listBoxEncounters.SelectedItem; + if (safariZoneEncounter == null) return; + safariZoneEncounter.pokemonID = (ushort)comboBoxPokemon.SelectedIndex; + listBoxEncounters.RefreshItem(listBoxEncounters.SelectedIndex); + } + + private void numericUpDownLevel_ValueChanged(object sender, EventArgs e) { + if (Helpers.HandlersDisabled) return; + SafariZoneEncounter safariZoneEncounter = (SafariZoneEncounter)listBoxEncounters.SelectedItem; + if (safariZoneEncounter == null) return; + safariZoneEncounter.level = (byte)numericUpDownLevel.Value; + listBoxEncounters.RefreshItem(listBoxEncounters.SelectedIndex); + } + + private void listBoxEncountersObject_SelectedIndexChanged(object sender, EventArgs e) + { + if (Helpers.HandlersDisabled) return; + SafariZoneEncounter safariZoneEncounter = (SafariZoneEncounter)listBoxEncountersObject.SelectedItem; + if (safariZoneEncounter == null) return; + + comboBoxPokemonObject.SelectedIndex = safariZoneEncounter.pokemonID; + numericUpDownLevelObject.Value = safariZoneEncounter.level; + } + + private void comboBoxPokemonObject_SelectedIndexChanged(object sender, EventArgs e) + { + if (Helpers.HandlersDisabled) return; + SafariZoneEncounter safariZoneEncounter = (SafariZoneEncounter)listBoxEncountersObject.SelectedItem; + if (safariZoneEncounter == null) return; + safariZoneEncounter.pokemonID = (ushort)comboBoxPokemonObject.SelectedIndex; + listBoxEncountersObject.RefreshItem(listBoxEncountersObject.SelectedIndex); + } + + private void numericUpDownLevelObject_ValueChanged(object sender, EventArgs e) + { + if (Helpers.HandlersDisabled) return; + SafariZoneEncounter safariZoneEncounter = (SafariZoneEncounter)listBoxEncountersObject.SelectedItem; + if (safariZoneEncounter == null) return; + safariZoneEncounter.level = (byte)numericUpDownLevelObject.Value; + listBoxEncountersObject.RefreshItem(listBoxEncountersObject.SelectedIndex); + } + } +} diff --git a/DS_Map/Editors/SafariZoneEncounterEditorTab.resx b/DS_Map/Editors/SafariZoneEncounterEditorTab.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/DS_Map/Editors/SafariZoneEncounterEditorTab.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/SafariZoneEncounterGroupEditor.Designer.cs b/DS_Map/Editors/SafariZoneEncounterGroupEditor.Designer.cs new file mode 100644 index 0000000..bf45296 --- /dev/null +++ b/DS_Map/Editors/SafariZoneEncounterGroupEditor.Designer.cs @@ -0,0 +1,323 @@ + +namespace DSPRE.Editors +{ + partial class SafariZoneEncounterGroupEditor + { + /// + /// 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 Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.tabControlEncounters = new System.Windows.Forms.TabControl(); + this.tabPageMorning = new System.Windows.Forms.TabPage(); + this.safariZoneEncounterEditorMorningTab = new DSPRE.Editors.SafariZoneEncounterEditorTab(); + this.tabPageDay = new System.Windows.Forms.TabPage(); + this.safariZoneEncounterEditorDayTab = new DSPRE.Editors.SafariZoneEncounterEditorTab(); + this.tabPageNight = new System.Windows.Forms.TabPage(); + this.safariZoneEncounterEditorNightTab = new DSPRE.Editors.SafariZoneEncounterEditorTab(); + this.label3 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.comboBoxObjectRequirementType = new System.Windows.Forms.ComboBox(); + this.numericUpDownObjectRequirementQty = new System.Windows.Forms.NumericUpDown(); + this.listBoxObjectRequirements = new DSPRE.ListBox2(); + this.listBoxObjectOptionalRequirements = new DSPRE.ListBox2(); + this.numericUpDownObjectOptionalRequirementQty = new System.Windows.Forms.NumericUpDown(); + this.comboBoxOptionalObjectRequirementType = new System.Windows.Forms.ComboBox(); + this.label5 = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); + this.label7 = new System.Windows.Forms.Label(); + this.buttonRemoveObjectEncounter = new System.Windows.Forms.Button(); + this.buttonAddObjectEncounter = new System.Windows.Forms.Button(); + this.tabControlEncounters.SuspendLayout(); + this.tabPageMorning.SuspendLayout(); + this.tabPageDay.SuspendLayout(); + this.tabPageNight.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownObjectRequirementQty)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownObjectOptionalRequirementQty)).BeginInit(); + this.SuspendLayout(); + // + // tabControlEncounters + // + this.tabControlEncounters.Controls.Add(this.tabPageMorning); + this.tabControlEncounters.Controls.Add(this.tabPageDay); + this.tabControlEncounters.Controls.Add(this.tabPageNight); + this.tabControlEncounters.Location = new System.Drawing.Point(4, 7); + this.tabControlEncounters.Name = "tabControlEncounters"; + this.tabControlEncounters.SelectedIndex = 0; + this.tabControlEncounters.Size = new System.Drawing.Size(418, 244); + this.tabControlEncounters.TabIndex = 2; + // + // tabPageMorning + // + this.tabPageMorning.Controls.Add(this.safariZoneEncounterEditorMorningTab); + this.tabPageMorning.Location = new System.Drawing.Point(4, 22); + this.tabPageMorning.Name = "tabPageMorning"; + this.tabPageMorning.Padding = new System.Windows.Forms.Padding(3); + this.tabPageMorning.Size = new System.Drawing.Size(410, 218); + this.tabPageMorning.TabIndex = 0; + this.tabPageMorning.Text = "Morning"; + this.tabPageMorning.UseVisualStyleBackColor = true; + // + // safariZoneEncounterEditorMorningTab + // + this.safariZoneEncounterEditorMorningTab.Location = new System.Drawing.Point(6, 6); + this.safariZoneEncounterEditorMorningTab.Name = "safariZoneEncounterEditorMorningTab"; + this.safariZoneEncounterEditorMorningTab.Size = new System.Drawing.Size(405, 209); + this.safariZoneEncounterEditorMorningTab.TabIndex = 1; + // + // tabPageDay + // + this.tabPageDay.Controls.Add(this.safariZoneEncounterEditorDayTab); + this.tabPageDay.Location = new System.Drawing.Point(4, 22); + this.tabPageDay.Name = "tabPageDay"; + this.tabPageDay.Padding = new System.Windows.Forms.Padding(3); + this.tabPageDay.Size = new System.Drawing.Size(410, 218); + this.tabPageDay.TabIndex = 1; + this.tabPageDay.Text = "Day"; + this.tabPageDay.UseVisualStyleBackColor = true; + // + // safariZoneEncounterEditorDayTab + // + this.safariZoneEncounterEditorDayTab.Location = new System.Drawing.Point(6, 6); + this.safariZoneEncounterEditorDayTab.Name = "safariZoneEncounterEditorDayTab"; + this.safariZoneEncounterEditorDayTab.Size = new System.Drawing.Size(401, 206); + this.safariZoneEncounterEditorDayTab.TabIndex = 1; + // + // tabPageNight + // + this.tabPageNight.Controls.Add(this.safariZoneEncounterEditorNightTab); + this.tabPageNight.Location = new System.Drawing.Point(4, 22); + this.tabPageNight.Name = "tabPageNight"; + this.tabPageNight.Padding = new System.Windows.Forms.Padding(3); + this.tabPageNight.Size = new System.Drawing.Size(410, 218); + this.tabPageNight.TabIndex = 2; + this.tabPageNight.Text = "Night"; + this.tabPageNight.UseVisualStyleBackColor = true; + // + // safariZoneEncounterEditorNightTab + // + this.safariZoneEncounterEditorNightTab.Location = new System.Drawing.Point(6, 6); + this.safariZoneEncounterEditorNightTab.Name = "safariZoneEncounterEditorNightTab"; + this.safariZoneEncounterEditorNightTab.Size = new System.Drawing.Size(401, 206); + this.safariZoneEncounterEditorNightTab.TabIndex = 1; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(657, 198); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(23, 13); + this.label3.TabIndex = 29; + this.label3.Text = "Qty"; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(524, 198); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(31, 13); + this.label4.TabIndex = 30; + this.label4.Text = "Type"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(524, 35); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(133, 13); + this.label2.TabIndex = 28; + this.label2.Text = "Object Type Requirements"; + // + // comboBoxObjectRequirementType + // + this.comboBoxObjectRequirementType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBoxObjectRequirementType.FormattingEnabled = true; + this.comboBoxObjectRequirementType.Location = new System.Drawing.Point(527, 214); + this.comboBoxObjectRequirementType.Name = "comboBoxObjectRequirementType"; + this.comboBoxObjectRequirementType.Size = new System.Drawing.Size(127, 21); + this.comboBoxObjectRequirementType.TabIndex = 27; + this.comboBoxObjectRequirementType.SelectedIndexChanged += new System.EventHandler(this.comboBoxObjectRequirementType_SelectedIndexChanged); + // + // numericUpDownObjectRequirementQty + // + this.numericUpDownObjectRequirementQty.Location = new System.Drawing.Point(660, 215); + this.numericUpDownObjectRequirementQty.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDownObjectRequirementQty.Name = "numericUpDownObjectRequirementQty"; + this.numericUpDownObjectRequirementQty.Size = new System.Drawing.Size(58, 20); + this.numericUpDownObjectRequirementQty.TabIndex = 26; + this.numericUpDownObjectRequirementQty.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDownObjectRequirementQty.ValueChanged += new System.EventHandler(this.numericUpDownObjectRequirementQty_ValueChanged); + // + // listBoxObjectRequirements + // + this.listBoxObjectRequirements.Font = new System.Drawing.Font("Consolas", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.listBoxObjectRequirements.FormattingEnabled = true; + this.listBoxObjectRequirements.ItemHeight = 14; + this.listBoxObjectRequirements.Location = new System.Drawing.Point(527, 51); + this.listBoxObjectRequirements.Name = "listBoxObjectRequirements"; + this.listBoxObjectRequirements.Size = new System.Drawing.Size(191, 144); + this.listBoxObjectRequirements.TabIndex = 25; + this.listBoxObjectRequirements.SelectedIndexChanged += new System.EventHandler(this.listBoxObjectRequirements_SelectedIndexChanged); + // + // listBoxObjectOptionalRequirements + // + this.listBoxObjectOptionalRequirements.Font = new System.Drawing.Font("Consolas", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.listBoxObjectOptionalRequirements.FormattingEnabled = true; + this.listBoxObjectOptionalRequirements.ItemHeight = 14; + this.listBoxObjectOptionalRequirements.Location = new System.Drawing.Point(724, 51); + this.listBoxObjectOptionalRequirements.Name = "listBoxObjectOptionalRequirements"; + this.listBoxObjectOptionalRequirements.Size = new System.Drawing.Size(191, 144); + this.listBoxObjectOptionalRequirements.TabIndex = 25; + this.listBoxObjectOptionalRequirements.SelectedIndexChanged += new System.EventHandler(this.listBoxObjectOptionalRequirements_SelectedIndexChanged); + // + // numericUpDownObjectOptionalRequirementQty + // + this.numericUpDownObjectOptionalRequirementQty.Location = new System.Drawing.Point(857, 215); + this.numericUpDownObjectOptionalRequirementQty.Name = "numericUpDownObjectOptionalRequirementQty"; + this.numericUpDownObjectOptionalRequirementQty.Size = new System.Drawing.Size(58, 20); + this.numericUpDownObjectOptionalRequirementQty.TabIndex = 26; + this.numericUpDownObjectOptionalRequirementQty.ValueChanged += new System.EventHandler(this.numericUpDownObjectOptionalRequirementQty_ValueChanged); + // + // comboBoxOptionalObjectRequirementType + // + this.comboBoxOptionalObjectRequirementType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBoxOptionalObjectRequirementType.FormattingEnabled = true; + this.comboBoxOptionalObjectRequirementType.Location = new System.Drawing.Point(724, 214); + this.comboBoxOptionalObjectRequirementType.Name = "comboBoxOptionalObjectRequirementType"; + this.comboBoxOptionalObjectRequirementType.Size = new System.Drawing.Size(127, 21); + this.comboBoxOptionalObjectRequirementType.TabIndex = 27; + this.comboBoxOptionalObjectRequirementType.SelectedIndexChanged += new System.EventHandler(this.comboBoxOptionalObjectRequirementType_SelectedIndexChanged); + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(721, 35); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(175, 13); + this.label5.TabIndex = 28; + this.label5.Text = "Optional Object Type Requirements"; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(721, 198); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(31, 13); + this.label6.TabIndex = 30; + this.label6.Text = "Type"; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(854, 198); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(23, 13); + this.label7.TabIndex = 29; + this.label7.Text = "Qty"; + // + // buttonRemoveObjectEncounter + // + this.buttonRemoveObjectEncounter.Location = new System.Drawing.Point(424, 77); + this.buttonRemoveObjectEncounter.Name = "buttonRemoveObjectEncounter"; + this.buttonRemoveObjectEncounter.Size = new System.Drawing.Size(97, 55); + this.buttonRemoveObjectEncounter.TabIndex = 31; + this.buttonRemoveObjectEncounter.Text = "Remove Last Object Encounter"; + this.buttonRemoveObjectEncounter.UseVisualStyleBackColor = true; + this.buttonRemoveObjectEncounter.Click += new System.EventHandler(this.buttonRemoveObjectEncounter_Click); + // + // buttonAddObjectEncounter + // + this.buttonAddObjectEncounter.Location = new System.Drawing.Point(424, 32); + this.buttonAddObjectEncounter.Name = "buttonAddObjectEncounter"; + this.buttonAddObjectEncounter.Size = new System.Drawing.Size(97, 39); + this.buttonAddObjectEncounter.TabIndex = 31; + this.buttonAddObjectEncounter.Text = "Add Object Encounter"; + this.buttonAddObjectEncounter.UseVisualStyleBackColor = true; + this.buttonAddObjectEncounter.Click += new System.EventHandler(this.buttonAddObjectEncounter_Click); + // + // SafariZoneEncounterGroupEditor + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.buttonAddObjectEncounter); + this.Controls.Add(this.buttonRemoveObjectEncounter); + this.Controls.Add(this.label7); + this.Controls.Add(this.label3); + this.Controls.Add(this.label6); + this.Controls.Add(this.label4); + this.Controls.Add(this.tabControlEncounters); + this.Controls.Add(this.label5); + this.Controls.Add(this.comboBoxOptionalObjectRequirementType); + this.Controls.Add(this.label2); + this.Controls.Add(this.comboBoxObjectRequirementType); + this.Controls.Add(this.numericUpDownObjectOptionalRequirementQty); + this.Controls.Add(this.listBoxObjectOptionalRequirements); + this.Controls.Add(this.numericUpDownObjectRequirementQty); + this.Controls.Add(this.listBoxObjectRequirements); + this.Name = "SafariZoneEncounterGroupEditor"; + this.Size = new System.Drawing.Size(927, 257); + this.tabControlEncounters.ResumeLayout(false); + this.tabPageMorning.ResumeLayout(false); + this.tabPageDay.ResumeLayout(false); + this.tabPageNight.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownObjectRequirementQty)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownObjectOptionalRequirementQty)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + private System.Windows.Forms.TabControl tabControlEncounters; + private System.Windows.Forms.TabPage tabPageMorning; + private System.Windows.Forms.TabPage tabPageDay; + private System.Windows.Forms.TabPage tabPageNight; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label2; + public System.Windows.Forms.ComboBox comboBoxObjectRequirementType; + public System.Windows.Forms.NumericUpDown numericUpDownObjectRequirementQty; + public ListBox2 listBoxObjectRequirements; + public ListBox2 listBoxObjectOptionalRequirements; + public System.Windows.Forms.NumericUpDown numericUpDownObjectOptionalRequirementQty; + public System.Windows.Forms.ComboBox comboBoxOptionalObjectRequirementType; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label label7; + public SafariZoneEncounterEditorTab safariZoneEncounterEditorMorningTab; + public SafariZoneEncounterEditorTab safariZoneEncounterEditorDayTab; + public SafariZoneEncounterEditorTab safariZoneEncounterEditorNightTab; + private System.Windows.Forms.Button buttonRemoveObjectEncounter; + private System.Windows.Forms.Button buttonAddObjectEncounter; + } +} diff --git a/DS_Map/Editors/SafariZoneEncounterGroupEditor.cs b/DS_Map/Editors/SafariZoneEncounterGroupEditor.cs new file mode 100644 index 0000000..32686ce --- /dev/null +++ b/DS_Map/Editors/SafariZoneEncounterGroupEditor.cs @@ -0,0 +1,143 @@ +using System; +using System.Windows.Forms; +using DSPRE.ROMFiles; + +namespace DSPRE.Editors { + public partial class SafariZoneEncounterGroupEditor : UserControl { + private SafariZoneEncounterGroup safariZoneEncounterGroup; + + public SafariZoneEncounterGroupEditor() { + InitializeComponent(); + safariZoneEncounterEditorMorningTab.listBoxEncountersObject.SelectedIndexChanged += ListBoxEncountersObject_SelectedIndexChanged; + safariZoneEncounterEditorDayTab.listBoxEncountersObject.SelectedIndexChanged += ListBoxEncountersObject_SelectedIndexChanged; + safariZoneEncounterEditorNightTab.listBoxEncountersObject.SelectedIndexChanged += ListBoxEncountersObject_SelectedIndexChanged; + listBoxObjectRequirements.SelectedIndexChanged += ListBoxEncountersObject_SelectedIndexChanged; + listBoxObjectOptionalRequirements.SelectedIndexChanged += ListBoxEncountersObject_SelectedIndexChanged; + } + + private void ListBoxEncountersObject_SelectedIndexChanged(object sender, EventArgs e) { + try { + ListBox2 s = sender as ListBox2; + safariZoneEncounterEditorMorningTab.listBoxEncountersObject.SelectedIndex = s.SelectedIndex; + safariZoneEncounterEditorDayTab.listBoxEncountersObject.SelectedIndex = s.SelectedIndex; + safariZoneEncounterEditorNightTab.listBoxEncountersObject.SelectedIndex = s.SelectedIndex; + listBoxObjectRequirements.SelectedIndex = s.SelectedIndex; + listBoxObjectOptionalRequirements.SelectedIndex = s.SelectedIndex; + } + catch (Exception ex) { + } + } + + public void SetPokemonNames() { + string[] pokemonNames = RomInfo.GetPokemonNames(); + safariZoneEncounterEditorMorningTab.comboBoxPokemon.Items.AddRange(pokemonNames); + safariZoneEncounterEditorMorningTab.comboBoxPokemonObject.Items.AddRange(pokemonNames); + safariZoneEncounterEditorDayTab.comboBoxPokemon.Items.AddRange(pokemonNames); + safariZoneEncounterEditorDayTab.comboBoxPokemonObject.Items.AddRange(pokemonNames); + safariZoneEncounterEditorNightTab.comboBoxPokemon.Items.AddRange(pokemonNames); + safariZoneEncounterEditorNightTab.comboBoxPokemonObject.Items.AddRange(pokemonNames); + + foreach (string type in SafariZoneObjectRequirement.ObjectTypes.Values) { + comboBoxObjectRequirementType.Items.Add(type); + comboBoxOptionalObjectRequirementType.Items.Add(type); + } + } + + public void Reset() { + this.safariZoneEncounterGroup = null; + safariZoneEncounterEditorMorningTab.listBoxEncounters.DataSource = null; + safariZoneEncounterEditorDayTab.listBoxEncounters.DataSource = null; + safariZoneEncounterEditorNightTab.listBoxEncounters.DataSource = null; + + safariZoneEncounterEditorMorningTab.listBoxEncountersObject.DataSource = null; + safariZoneEncounterEditorDayTab.listBoxEncountersObject.DataSource = null; + safariZoneEncounterEditorNightTab.listBoxEncountersObject.DataSource = null; + listBoxObjectRequirements.DataSource = null; + listBoxObjectOptionalRequirements.DataSource = null; + } + + public void SetData(SafariZoneEncounterGroup safariZoneEncounterGroup) { + this.safariZoneEncounterGroup = safariZoneEncounterGroup; + safariZoneEncounterEditorMorningTab.listBoxEncounters.DataSource = this.safariZoneEncounterGroup.MorningEncounters; + safariZoneEncounterEditorDayTab.listBoxEncounters.DataSource = this.safariZoneEncounterGroup.DayEncounters; + safariZoneEncounterEditorNightTab.listBoxEncounters.DataSource = this.safariZoneEncounterGroup.NightEncounters; + + safariZoneEncounterEditorMorningTab.listBoxEncountersObject.DataSource = this.safariZoneEncounterGroup.MorningEncountersObject; + safariZoneEncounterEditorDayTab.listBoxEncountersObject.DataSource = this.safariZoneEncounterGroup.DayEncountersObject; + safariZoneEncounterEditorNightTab.listBoxEncountersObject.DataSource = this.safariZoneEncounterGroup.NightEncountersObject; + listBoxObjectRequirements.DataSource = this.safariZoneEncounterGroup.ObjectRequirements; + listBoxObjectOptionalRequirements.DataSource = this.safariZoneEncounterGroup.OptionalObjectRequirements; + } + + private void listBoxObjectRequirements_SelectedIndexChanged(object sender, EventArgs e) { + if (Helpers.HandlersDisabled) return; + SafariZoneObjectRequirement safariZoneObjectRequirement = (SafariZoneObjectRequirement)listBoxObjectRequirements.SelectedItem; + if (safariZoneObjectRequirement == null) return; + comboBoxObjectRequirementType.SelectedIndex = safariZoneObjectRequirement.typeID; + numericUpDownObjectRequirementQty.Value = safariZoneObjectRequirement.quantity; + } + + private void comboBoxObjectRequirementType_SelectedIndexChanged(object sender, EventArgs e) { + if (Helpers.HandlersDisabled) return; + // if (comboBoxObjectRequirementType.SelectedIndex == 0) comboBoxObjectRequirementType.SelectedIndex = 1; //no requirement is not valid + SafariZoneObjectRequirement safariZoneObjectRequirement = (SafariZoneObjectRequirement)listBoxObjectRequirements.SelectedItem; + if (safariZoneObjectRequirement == null) return; + safariZoneObjectRequirement.typeID = (byte)comboBoxObjectRequirementType.SelectedIndex; + listBoxObjectRequirements.RefreshItem(listBoxObjectRequirements.SelectedIndex); + } + + private void numericUpDownObjectRequirementQty_ValueChanged(object sender, EventArgs e) { + if (Helpers.HandlersDisabled) return; + SafariZoneObjectRequirement safariZoneObjectRequirement = (SafariZoneObjectRequirement)listBoxObjectRequirements.SelectedItem; + if (safariZoneObjectRequirement == null) return; + safariZoneObjectRequirement.quantity = (byte)numericUpDownObjectRequirementQty.Value; + listBoxObjectRequirements.RefreshItem(listBoxObjectRequirements.SelectedIndex); + } + + private void listBoxObjectOptionalRequirements_SelectedIndexChanged(object sender, EventArgs e) { + if (Helpers.HandlersDisabled) return; + SafariZoneObjectRequirement safariZoneObjectRequirement = (SafariZoneObjectRequirement)listBoxObjectOptionalRequirements.SelectedItem; + if (safariZoneObjectRequirement == null) return; + comboBoxOptionalObjectRequirementType.SelectedIndex = safariZoneObjectRequirement.typeID; + numericUpDownObjectOptionalRequirementQty.Value = safariZoneObjectRequirement.quantity; + } + + private void comboBoxOptionalObjectRequirementType_SelectedIndexChanged(object sender, EventArgs e) { + if (Helpers.HandlersDisabled) return; + SafariZoneObjectRequirement safariZoneObjectRequirement = (SafariZoneObjectRequirement)listBoxObjectOptionalRequirements.SelectedItem; + if (safariZoneObjectRequirement == null) return; + safariZoneObjectRequirement.typeID = (byte)comboBoxOptionalObjectRequirementType.SelectedIndex; + listBoxObjectOptionalRequirements.RefreshItem(listBoxObjectOptionalRequirements.SelectedIndex); + } + + private void numericUpDownObjectOptionalRequirementQty_ValueChanged(object sender, EventArgs e) { + if (Helpers.HandlersDisabled) return; + SafariZoneObjectRequirement safariZoneObjectRequirement = (SafariZoneObjectRequirement)listBoxObjectOptionalRequirements.SelectedItem; + if (safariZoneObjectRequirement == null) return; + safariZoneObjectRequirement.quantity = (byte)numericUpDownObjectOptionalRequirementQty.Value; + listBoxObjectOptionalRequirements.RefreshItem(listBoxObjectOptionalRequirements.SelectedIndex); + } + + private void buttonAddObjectEncounter_Click(object sender, EventArgs e) { + if (this.safariZoneEncounterGroup == null) return; + if (listBoxObjectOptionalRequirements.SelectedIndex == -1) return; + safariZoneEncounterGroup.MorningEncountersObject.Add(new SafariZoneEncounter()); + safariZoneEncounterGroup.DayEncountersObject.Add(new SafariZoneEncounter()); + safariZoneEncounterGroup.NightEncountersObject.Add(new SafariZoneEncounter()); + safariZoneEncounterGroup.ObjectRequirements.Add(new SafariZoneObjectRequirement(1, 1)); + safariZoneEncounterGroup.OptionalObjectRequirements.Add(new SafariZoneObjectRequirement(0, 0)); + safariZoneEncounterGroup.ObjectSlots = (byte)safariZoneEncounterGroup.ObjectRequirements.Count; //all the list counts should be the same + } + + private void buttonRemoveObjectEncounter_Click(object sender, EventArgs e) { + if (this.safariZoneEncounterGroup == null) return; + if (listBoxObjectOptionalRequirements.SelectedIndex == -1) return; + safariZoneEncounterGroup.MorningEncountersObject.RemoveAt(safariZoneEncounterGroup.MorningEncountersObject.Count - 1); + safariZoneEncounterGroup.DayEncountersObject.RemoveAt(safariZoneEncounterGroup.DayEncountersObject.Count - 1); + safariZoneEncounterGroup.NightEncountersObject.RemoveAt(safariZoneEncounterGroup.NightEncountersObject.Count - 1); + safariZoneEncounterGroup.ObjectRequirements.RemoveAt(safariZoneEncounterGroup.ObjectRequirements.Count - 1); + safariZoneEncounterGroup.OptionalObjectRequirements.RemoveAt(safariZoneEncounterGroup.OptionalObjectRequirements.Count - 1); + safariZoneEncounterGroup.ObjectSlots = (byte)safariZoneEncounterGroup.ObjectRequirements.Count; //all the list counts should be the same + } + } +} diff --git a/DS_Map/Editors/SafariZoneEncounterGroupEditor.resx b/DS_Map/Editors/SafariZoneEncounterGroupEditor.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/DS_Map/Editors/SafariZoneEncounterGroupEditor.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/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs index 58ed43f..6c3edb1 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 dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle43 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle44 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle45 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle46 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle47 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle48 = 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(); @@ -774,7 +774,11 @@ this.headerConditionalMusicComboBox = new System.Windows.Forms.ComboBox(); this.conditionalMusicTableListBox = new System.Windows.Forms.ListBox(); this.tabPageScriptEditor = new System.Windows.Forms.TabPage(); + this.scriptEditor = new DSPRE.Editors.ScriptEditor(); this.tabPageLevelScriptEditor = new System.Windows.Forms.TabPage(); + this.levelScriptEditor = new DSPRE.Editors.LevelScriptEditor(); + this.tabPageEncountersEditor = new System.Windows.Forms.TabPage(); + this.encountersEditor = new DSPRE.Editors.EncountersEditor(); this.mainTabImageList = new System.Windows.Forms.ImageList(this.components); this.gameIcon = new System.Windows.Forms.PictureBox(); this.languageLabel = new System.Windows.Forms.Label(); @@ -847,8 +851,6 @@ this.separator_afterMiscButtons = new System.Windows.Forms.ToolStripSeparator(); this.versionLabel = new System.Windows.Forms.Label(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.scriptEditor = new DSPRE.Editors.ScriptEditor(); - this.levelScriptEditor = new DSPRE.Editors.LevelScriptEditor(); this.mainTabControl.SuspendLayout(); this.headerEditorTabPage.SuspendLayout(); this.worldmapCoordsGroupBox.SuspendLayout(); @@ -1082,6 +1084,7 @@ ((System.ComponentModel.ISupportInitialize)(this.flagConditionalMusicUpDown)).BeginInit(); this.tabPageScriptEditor.SuspendLayout(); this.tabPageLevelScriptEditor.SuspendLayout(); + this.tabPageEncountersEditor.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gameIcon)).BeginInit(); this.menuStrip1.SuspendLayout(); this.statusStrip1.SuspendLayout(); @@ -1102,11 +1105,12 @@ this.mainTabControl.Controls.Add(this.tableEditorTabPage); this.mainTabControl.Controls.Add(this.tabPageScriptEditor); this.mainTabControl.Controls.Add(this.tabPageLevelScriptEditor); + this.mainTabControl.Controls.Add(this.tabPageEncountersEditor); this.mainTabControl.ImageList = this.mainTabImageList; this.mainTabControl.Location = new System.Drawing.Point(11, 72); this.mainTabControl.Name = "mainTabControl"; this.mainTabControl.SelectedIndex = 0; - this.mainTabControl.Size = new System.Drawing.Size(1193, 660); + this.mainTabControl.Size = new System.Drawing.Size(1193, 702); this.mainTabControl.TabIndex = 5; this.mainTabControl.Visible = false; this.mainTabControl.SelectedIndexChanged += new System.EventHandler(this.mainTabControl_SelectedIndexChanged); @@ -1141,7 +1145,7 @@ this.headerEditorTabPage.Location = new System.Drawing.Point(4, 23); this.headerEditorTabPage.Name = "headerEditorTabPage"; this.headerEditorTabPage.Padding = new System.Windows.Forms.Padding(3); - this.headerEditorTabPage.Size = new System.Drawing.Size(1185, 633); + this.headerEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.headerEditorTabPage.TabIndex = 0; this.headerEditorTabPage.Text = "Header Editor"; // @@ -2529,7 +2533,7 @@ this.matrixEditorTabPage.Location = new System.Drawing.Point(4, 23); this.matrixEditorTabPage.Name = "matrixEditorTabPage"; this.matrixEditorTabPage.Padding = new System.Windows.Forms.Padding(3); - this.matrixEditorTabPage.Size = new System.Drawing.Size(1185, 633); + this.matrixEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.matrixEditorTabPage.TabIndex = 1; this.matrixEditorTabPage.Text = "Matrix Editor"; // @@ -2539,7 +2543,7 @@ this.setSpawnPointButton.Image = global::DSPRE.Properties.Resources.spawnCoordsMatrixeditorIcon; this.setSpawnPointButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.setSpawnPointButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.setSpawnPointButton.Location = new System.Drawing.Point(12, 522); + this.setSpawnPointButton.Location = new System.Drawing.Point(12, -2832); this.setSpawnPointButton.Name = "setSpawnPointButton"; this.setSpawnPointButton.Size = new System.Drawing.Size(117, 43); this.setSpawnPointButton.TabIndex = 35; @@ -2555,7 +2559,7 @@ this.saveMatrixButton.Image = global::DSPRE.Properties.Resources.save_rom; this.saveMatrixButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.saveMatrixButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.saveMatrixButton.Location = new System.Drawing.Point(12, 567); + this.saveMatrixButton.Location = new System.Drawing.Point(12, -2787); this.saveMatrixButton.Name = "saveMatrixButton"; this.saveMatrixButton.Size = new System.Drawing.Size(117, 43); this.saveMatrixButton.TabIndex = 34; @@ -2737,16 +2741,16 @@ this.matrixTabControl.Multiline = true; this.matrixTabControl.Name = "matrixTabControl"; this.matrixTabControl.SelectedIndex = 0; - this.matrixTabControl.Size = new System.Drawing.Size(1040, 616); + this.matrixTabControl.Size = new System.Drawing.Size(0, 0); this.matrixTabControl.TabIndex = 18; // // headersTabPage // this.headersTabPage.Controls.Add(this.headersGridView); - this.headersTabPage.Location = new System.Drawing.Point(4, 22); + this.headersTabPage.Location = new System.Drawing.Point(4, 58); this.headersTabPage.Name = "headersTabPage"; this.headersTabPage.Padding = new System.Windows.Forms.Padding(3); - this.headersTabPage.Size = new System.Drawing.Size(1032, 590); + this.headersTabPage.Size = new System.Drawing.Size(0, 0); this.headersTabPage.TabIndex = 1; this.headersTabPage.Text = "Map Headers"; this.headersTabPage.UseVisualStyleBackColor = true; @@ -2758,40 +2762,40 @@ this.headersGridView.AllowUserToResizeColumns = false; this.headersGridView.AllowUserToResizeRows = false; this.headersGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle33.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - dataGridViewCellStyle33.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle33.ForeColor = System.Drawing.SystemColors.Info; - dataGridViewCellStyle33.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle33.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.headersGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle33; + 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; - dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle34.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle34.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle34.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle34.Format = "D4"; - dataGridViewCellStyle34.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle34.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.headersGridView.DefaultCellStyle = dataGridViewCellStyle34; + 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"; - dataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle35.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle35.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle35.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle35.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle35.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.headersGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle35; + 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; - dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle36.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.headersGridView.RowsDefaultCellStyle = dataGridViewCellStyle36; + 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; @@ -2807,9 +2811,9 @@ // heightsTabPage // this.heightsTabPage.Controls.Add(this.heightsGridView); - this.heightsTabPage.Location = new System.Drawing.Point(4, 22); + this.heightsTabPage.Location = new System.Drawing.Point(4, 58); this.heightsTabPage.Name = "heightsTabPage"; - this.heightsTabPage.Size = new System.Drawing.Size(1032, 590); + this.heightsTabPage.Size = new System.Drawing.Size(0, 0); this.heightsTabPage.TabIndex = 2; this.heightsTabPage.Text = "Map Heights"; this.heightsTabPage.UseVisualStyleBackColor = true; @@ -2820,43 +2824,43 @@ this.heightsGridView.AllowUserToDeleteRows = false; this.heightsGridView.AllowUserToResizeColumns = false; this.heightsGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle37; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5; this.heightsGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle38.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle38.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle38.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle38.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle38.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle38.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.heightsGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle38; + 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; - dataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle39.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle39.Font = new System.Drawing.Font("Tahoma", 8.25F); - dataGridViewCellStyle39.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle39.Format = "D2"; - dataGridViewCellStyle39.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle39.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle39.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle39; + 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"; - dataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle40.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle40.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle40.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle40.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle40.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle40.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.heightsGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle40; + 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; - dataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle41.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.heightsGridView.RowsDefaultCellStyle = dataGridViewCellStyle41; + 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; @@ -2870,9 +2874,9 @@ // mapFilesTabPage // this.mapFilesTabPage.Controls.Add(this.mapFilesGridView); - this.mapFilesTabPage.Location = new System.Drawing.Point(4, 22); + this.mapFilesTabPage.Location = new System.Drawing.Point(4, 58); this.mapFilesTabPage.Name = "mapFilesTabPage"; - this.mapFilesTabPage.Size = new System.Drawing.Size(1032, 590); + this.mapFilesTabPage.Size = new System.Drawing.Size(0, 0); this.mapFilesTabPage.TabIndex = 3; this.mapFilesTabPage.Text = "Map Files"; this.mapFilesTabPage.UseVisualStyleBackColor = true; @@ -2883,43 +2887,43 @@ this.mapFilesGridView.AllowUserToDeleteRows = false; this.mapFilesGridView.AllowUserToResizeColumns = false; this.mapFilesGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle42.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle42; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10; this.mapFilesGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle43.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle43.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle43.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle43.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle43.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle43.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mapFilesGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle43; + 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; - dataGridViewCellStyle44.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle44.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle44.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle44.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle44.Format = "D4"; - dataGridViewCellStyle44.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle44.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle44.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle44; + 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"; - dataGridViewCellStyle45.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle45.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle45.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle45.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle45.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle45.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle45.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mapFilesGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle45; + 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; - dataGridViewCellStyle46.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle46.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.mapFilesGridView.RowsDefaultCellStyle = dataGridViewCellStyle46; + 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; @@ -3026,7 +3030,7 @@ this.mapEditorTabPage.Location = new System.Drawing.Point(4, 23); this.mapEditorTabPage.Name = "mapEditorTabPage"; this.mapEditorTabPage.Padding = new System.Windows.Forms.Padding(3); - this.mapEditorTabPage.Size = new System.Drawing.Size(1185, 633); + this.mapEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.mapEditorTabPage.TabIndex = 2; this.mapEditorTabPage.Text = "Map Editor"; this.mapEditorTabPage.Enter += new System.EventHandler(this.mapEditorTabPage_Enter); @@ -4320,7 +4324,7 @@ this.radio3D.AutoSize = true; this.radio3D.Checked = true; this.radio3D.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.radio3D.Location = new System.Drawing.Point(1140, 546); + this.radio3D.Location = new System.Drawing.Point(-4818, -2808); this.radio3D.Name = "radio3D"; this.radio3D.Size = new System.Drawing.Size(31, 23); this.radio3D.TabIndex = 26; @@ -4335,7 +4339,7 @@ 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(1140, 570); + this.radio2D.Location = new System.Drawing.Point(-4818, -2784); this.radio2D.Name = "radio2D"; this.radio2D.Size = new System.Drawing.Size(31, 23); this.radio2D.TabIndex = 25; @@ -4350,7 +4354,7 @@ 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(1140, 594); + this.wireframeCheckBox.Location = new System.Drawing.Point(1140, -2760); this.wireframeCheckBox.Name = "wireframeCheckBox"; this.wireframeCheckBox.Size = new System.Drawing.Size(31, 23); this.wireframeCheckBox.TabIndex = 27; @@ -4365,7 +4369,7 @@ this.nsbtxEditorTabPage.Location = new System.Drawing.Point(4, 23); this.nsbtxEditorTabPage.Name = "nsbtxEditorTabPage"; this.nsbtxEditorTabPage.Padding = new System.Windows.Forms.Padding(3); - this.nsbtxEditorTabPage.Size = new System.Drawing.Size(1185, 633); + this.nsbtxEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.nsbtxEditorTabPage.TabIndex = 6; this.nsbtxEditorTabPage.Text = "NSBTX Editor"; this.nsbtxEditorTabPage.UseVisualStyleBackColor = true; @@ -4906,7 +4910,7 @@ this.eventEditorTabPage.Location = new System.Drawing.Point(4, 23); this.eventEditorTabPage.Name = "eventEditorTabPage"; this.eventEditorTabPage.Padding = new System.Windows.Forms.Padding(3); - this.eventEditorTabPage.Size = new System.Drawing.Size(1185, 633); + this.eventEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.eventEditorTabPage.TabIndex = 3; this.eventEditorTabPage.Text = "Event Editor"; this.eventEditorTabPage.Enter += new System.EventHandler(this.eventEditorTabPage_Enter); @@ -6786,7 +6790,7 @@ this.rightClickPicture.ImageLocation = ""; this.rightClickPicture.Location = new System.Drawing.Point(468, 420); this.rightClickPicture.Name = "rightClickPicture"; - this.rightClickPicture.Size = new System.Drawing.Size(38, 38); + this.rightClickPicture.Size = new System.Drawing.Size(0, 38); this.rightClickPicture.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.rightClickPicture.TabIndex = 59; this.rightClickPicture.TabStop = false; @@ -6799,7 +6803,7 @@ this.wheelClickPicture.ImageLocation = ""; this.wheelClickPicture.Location = new System.Drawing.Point(552, 420); this.wheelClickPicture.Name = "wheelClickPicture"; - this.wheelClickPicture.Size = new System.Drawing.Size(38, 38); + this.wheelClickPicture.Size = new System.Drawing.Size(0, 38); this.wheelClickPicture.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.wheelClickPicture.TabIndex = 56; this.wheelClickPicture.TabStop = false; @@ -6812,7 +6816,7 @@ this.LeftClickPicture.ImageLocation = ""; this.LeftClickPicture.Location = new System.Drawing.Point(510, 420); this.LeftClickPicture.Name = "LeftClickPicture"; - this.LeftClickPicture.Size = new System.Drawing.Size(38, 38); + this.LeftClickPicture.Size = new System.Drawing.Size(0, 38); this.LeftClickPicture.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.LeftClickPicture.TabIndex = 55; this.LeftClickPicture.TabStop = false; @@ -6938,7 +6942,7 @@ this.textEditorTabPage.Location = new System.Drawing.Point(4, 23); this.textEditorTabPage.Name = "textEditorTabPage"; this.textEditorTabPage.Padding = new System.Windows.Forms.Padding(3); - this.textEditorTabPage.Size = new System.Drawing.Size(1185, 633); + this.textEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.textEditorTabPage.TabIndex = 5; this.textEditorTabPage.Text = "Text Editor"; this.textEditorTabPage.UseVisualStyleBackColor = true; @@ -7312,8 +7316,8 @@ this.textEditorDataGridView.Location = new System.Drawing.Point(12, 77); this.textEditorDataGridView.Name = "textEditorDataGridView"; this.textEditorDataGridView.RowHeadersWidth = 68; - dataGridViewCellStyle47.Font = new System.Drawing.Font("Consolas", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textEditorDataGridView.RowsDefaultCellStyle = dataGridViewCellStyle47; + 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(873, 500); this.textEditorDataGridView.TabIndex = 24; this.textEditorDataGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.textEditorDataGridView_CellValueChanged); @@ -7362,7 +7366,7 @@ this.cameraEditorTabPage.ImageIndex = 7; this.cameraEditorTabPage.Location = new System.Drawing.Point(4, 23); this.cameraEditorTabPage.Name = "cameraEditorTabPage"; - this.cameraEditorTabPage.Size = new System.Drawing.Size(1185, 633); + this.cameraEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.cameraEditorTabPage.TabIndex = 7; this.cameraEditorTabPage.Text = "Camera Editor"; this.cameraEditorTabPage.UseVisualStyleBackColor = true; @@ -7416,9 +7420,9 @@ this.cameraEditorDataGridView.CausesValidation = false; this.cameraEditorDataGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised; this.cameraEditorDataGridView.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle48.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle48.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.cameraEditorDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle48; + 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, @@ -7552,7 +7556,7 @@ this.trainerEditorTabPage.ImageIndex = 8; this.trainerEditorTabPage.Location = new System.Drawing.Point(4, 23); this.trainerEditorTabPage.Name = "trainerEditorTabPage"; - this.trainerEditorTabPage.Size = new System.Drawing.Size(1185, 633); + this.trainerEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.trainerEditorTabPage.TabIndex = 8; this.trainerEditorTabPage.Text = "Trainer Editor"; this.trainerEditorTabPage.UseVisualStyleBackColor = true; @@ -9562,7 +9566,7 @@ this.tableEditorTabPage.Location = new System.Drawing.Point(4, 23); this.tableEditorTabPage.Name = "tableEditorTabPage"; this.tableEditorTabPage.Padding = new System.Windows.Forms.Padding(3); - this.tableEditorTabPage.Size = new System.Drawing.Size(1185, 633); + this.tableEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.tableEditorTabPage.TabIndex = 9; this.tableEditorTabPage.Text = "Table Editor"; this.tableEditorTabPage.UseVisualStyleBackColor = true; @@ -10040,22 +10044,57 @@ this.tabPageScriptEditor.Location = new System.Drawing.Point(4, 23); this.tabPageScriptEditor.Name = "tabPageScriptEditor"; this.tabPageScriptEditor.Padding = new System.Windows.Forms.Padding(3); - this.tabPageScriptEditor.Size = new System.Drawing.Size(1185, 633); + this.tabPageScriptEditor.Size = new System.Drawing.Size(1185, 675); this.tabPageScriptEditor.TabIndex = 10; this.tabPageScriptEditor.Text = "Script Editor New"; this.tabPageScriptEditor.UseVisualStyleBackColor = true; // + // scriptEditor + // + this.scriptEditor.Location = new System.Drawing.Point(2, 3); + this.scriptEditor.Name = "scriptEditor"; + this.scriptEditor.scriptEditorIsReady = false; + this.scriptEditor.Size = new System.Drawing.Size(1177, 735); + this.scriptEditor.TabIndex = 0; + // // tabPageLevelScriptEditor // this.tabPageLevelScriptEditor.Controls.Add(this.levelScriptEditor); this.tabPageLevelScriptEditor.Location = new System.Drawing.Point(4, 23); this.tabPageLevelScriptEditor.Name = "tabPageLevelScriptEditor"; this.tabPageLevelScriptEditor.Padding = new System.Windows.Forms.Padding(3); - this.tabPageLevelScriptEditor.Size = new System.Drawing.Size(1185, 633); + this.tabPageLevelScriptEditor.Size = new System.Drawing.Size(1185, 675); this.tabPageLevelScriptEditor.TabIndex = 11; this.tabPageLevelScriptEditor.Text = "Level Script Editor"; this.tabPageLevelScriptEditor.UseVisualStyleBackColor = true; // + // levelScriptEditor + // + this.levelScriptEditor.BackColor = System.Drawing.SystemColors.Control; + this.levelScriptEditor.levelScriptEditorIsReady = false; + this.levelScriptEditor.Location = new System.Drawing.Point(6, 8); + this.levelScriptEditor.Name = "levelScriptEditor"; + this.levelScriptEditor.Size = new System.Drawing.Size(408, 622); + this.levelScriptEditor.TabIndex = 0; + // + // tabPageEncountersEditor + // + this.tabPageEncountersEditor.Controls.Add(this.encountersEditor); + this.tabPageEncountersEditor.Location = new System.Drawing.Point(4, 23); + this.tabPageEncountersEditor.Name = "tabPageEncountersEditor"; + this.tabPageEncountersEditor.Padding = new System.Windows.Forms.Padding(3); + this.tabPageEncountersEditor.Size = new System.Drawing.Size(1185, 675); + this.tabPageEncountersEditor.TabIndex = 12; + this.tabPageEncountersEditor.Text = "Encounters"; + this.tabPageEncountersEditor.UseVisualStyleBackColor = true; + // + // encountersEditor + // + this.encountersEditor.Location = new System.Drawing.Point(6, 3); + this.encountersEditor.Name = "encountersEditor"; + this.encountersEditor.Size = new System.Drawing.Size(1176, 672); + this.encountersEditor.TabIndex = 0; + // // mainTabImageList // this.mainTabImageList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("mainTabImageList.ImageStream"))); @@ -10429,7 +10468,7 @@ this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.statusLabel, this.toolStripProgressBar}); - this.statusStrip1.Location = new System.Drawing.Point(0, 739); + this.statusStrip1.Location = new System.Drawing.Point(0, 777); this.statusStrip1.Name = "statusStrip1"; this.statusStrip1.Size = new System.Drawing.Size(1214, 22); this.statusStrip1.TabIndex = 13; @@ -10788,29 +10827,12 @@ this.versionLabel.Text = "ROM:"; this.versionLabel.Visible = false; // - // scriptEditor - // - this.scriptEditor.Location = new System.Drawing.Point(2, 3); - this.scriptEditor.Name = "scriptEditor"; - this.scriptEditor.scriptEditorIsReady = false; - this.scriptEditor.Size = new System.Drawing.Size(1177, 735); - this.scriptEditor.TabIndex = 0; - // - // levelScriptEditor - // - this.levelScriptEditor.BackColor = System.Drawing.SystemColors.Control; - this.levelScriptEditor.levelScriptEditorIsReady = false; - this.levelScriptEditor.Location = new System.Drawing.Point(6, 8); - this.levelScriptEditor.Name = "levelScriptEditor"; - this.levelScriptEditor.Size = new System.Drawing.Size(408, 622); - this.levelScriptEditor.TabIndex = 0; - // // MainProgram // this.AllowDrop = true; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1214, 761); + this.ClientSize = new System.Drawing.Size(1214, 799); this.Controls.Add(this.versionLabel); this.Controls.Add(this.languageLabel); this.Controls.Add(this.gameIcon); @@ -11121,6 +11143,7 @@ ((System.ComponentModel.ISupportInitialize)(this.flagConditionalMusicUpDown)).EndInit(); this.tabPageScriptEditor.ResumeLayout(false); this.tabPageLevelScriptEditor.ResumeLayout(false); + this.tabPageEncountersEditor.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gameIcon)).EndInit(); this.menuStrip1.ResumeLayout(false); this.menuStrip1.PerformLayout(); @@ -11937,6 +11960,8 @@ public DSPRE.Editors.LevelScriptEditor levelScriptEditor; public System.Windows.Forms.TabControl mainTabControl; public System.Windows.Forms.NumericUpDown scriptFileUpDown; + private System.Windows.Forms.TabPage tabPageEncountersEditor; + private Editors.EncountersEditor encountersEditor; } } diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index bc90567..75f6e63 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -889,6 +889,10 @@ namespace DSPRE { levelScriptEditor.SetUpLevelScriptEditor(this); } + private void tabPageEncountersEditor_Enter(object sender, EventArgs e) { + encountersEditor.SetupEncountersEditor(); + } + private void spawnEditorToolStripButton_Click(object sender, EventArgs e) { if (!matrixEditorIsReady) { SetupMatrixEditor(); @@ -964,20 +968,13 @@ namespace DSPRE { /* Read Header internal names */ try { - using (DSUtils.EasyReader reader = new DSUtils.EasyReader(RomInfo.internalNamesLocation)) { - for (int i = 0; i < headerCount; i++) { - byte[] row = reader.ReadBytes(RomInfo.internalNameLength); - - string internalName = Encoding.ASCII.GetString(row);//.TrimEnd(); - headerListBoxNames.Add(i.ToString("D3") + MapHeader.nameSeparator + internalName); - internalNames.Add(internalName.TrimEnd('\0')); - } - } + headerListBoxNames = Helpers.getHeaderListBoxNames(); + internalNames = Helpers.getInternalNames(); headerListBox.Items.Clear(); headerListBox.Items.AddRange(headerListBoxNames.ToArray()); } catch (FileNotFoundException) { - MessageBox.Show(RomInfo.internalNamesLocation + " doesn't exist.", "Couldn't read internal names", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show(RomInfo.internalNamesPath + " doesn't exist.", "Couldn't read internal names", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } diff --git a/DS_Map/Main Window.resx b/DS_Map/Main Window.resx index c9f95b4..af8eb9d 100644 --- a/DS_Map/Main Window.resx +++ b/DS_Map/Main Window.resx @@ -117,96 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 239, 17 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM - EgAAAk1TRnQBSQFMAgEBCgEAAegBGwHoARsBEAEAARABAAT/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== - - @@ -1036,6 +946,96 @@ p3S+M+m1V1me9QgCUQNXX2YRT1sYHBiEP3wHVbp3PF3cB40GbrzN86xHENrScf1NDsl8FaI4jODMHOgS SOacfYAmbr5XeNYjGH7yDReXv+JeNIUhUYwFpmZjDz+nMLf5B3b2rcZ5tju4ntjtFw4T54j+v2g/t9NH 9AiCIPwGJelqUAd/T3AAAAAASUVORK5CYII= + + + + 239, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM + EgAAAk1TRnQBSQFMAgEBCgEAARgBHAEYARwBEAEAARABAAT/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== @@ -1047,9 +1047,6 @@ 386, 19 - - 533, 20 - 67 diff --git a/DS_Map/Properties/AssemblyInfo.cs b/DS_Map/Properties/AssemblyInfo.cs index 5def708..0f9c7d6 100644 --- a/DS_Map/Properties/AssemblyInfo.cs +++ b/DS_Map/Properties/AssemblyInfo.cs @@ -4,11 +4,11 @@ using System.Runtime.InteropServices; // Le informazioni generali relative a un assembly sono controllate dal seguente // set di attributi. Modificare i valori di questi attributi per modificare le informazioni // associate a un assembly. -[assembly: AssemblyTitle("DSPRE Reloaded 1.11.2")] +[assembly: AssemblyTitle("DSPRE Reloaded 1.12.0")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("DSPRE Reloaded 1.11.2")] +[assembly: AssemblyProduct("DSPRE Reloaded 1.12.0")] [assembly: AssemblyCopyright("Copyright © 2023")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // È possibile specificare tutti i valori oppure impostare valori predefiniti per i numeri relativi alla revisione e alla build // usando l'asterisco '*' come illustrato di seguito: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.11.2")] -[assembly: AssemblyFileVersion("1.11.2")] +[assembly: AssemblyVersion("1.12.0")] +[assembly: AssemblyFileVersion("1.12.0")] diff --git a/DS_Map/ROMFiles/MapFile.cs b/DS_Map/ROMFiles/MapFile.cs index 0bc4a22..a9b0a64 100644 --- a/DS_Map/ROMFiles/MapFile.cs +++ b/DS_Map/ROMFiles/MapFile.cs @@ -341,6 +341,24 @@ namespace DSPRE.ROMFiles { public void LoadModelData(string dir) { LoadModelDataFromID((int)modelID, dir); } + + public void LoadModelData(bool interior) { + string modelPath = Filesystem.GetBuildingModelPath(interior, (int)modelID); + + if (string.IsNullOrWhiteSpace(modelPath) || !File.Exists(modelPath)) { + MessageBox.Show("Building " + modelID + " could not be found in\n" + '"' + Path.GetDirectoryName(modelPath) + '"', "Building not found", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + + try { + using (Stream fs = new FileStream(modelPath, FileMode.Open)) { + this.NSBMDFile = NSBMDLoader.LoadNSBMD(fs); + } + } catch (FileNotFoundException) { + MessageBox.Show("Building " + modelID + " could not be found in\n" + '"' + Path.GetDirectoryName(modelPath) + '"', "Building not found", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + public void LoadModelDataFromID(int modelID, string bmDir) { string modelPath = bmDir + "\\" + modelID.ToString("D4"); diff --git a/DS_Map/RomInfo.cs b/DS_Map/RomInfo.cs index 3c10a0d..21746b6 100644 --- a/DS_Map/RomInfo.cs +++ b/DS_Map/RomInfo.cs @@ -7,6 +7,8 @@ using DSPRE.Resources; using System; using DSPRE.ROMFiles; using static DSPRE.RomInfo; +using System.Windows.Shapes; +using Path = System.IO.Path; namespace DSPRE { @@ -22,8 +24,14 @@ namespace DSPRE { public static string fileName { get; private set; } public static string workDir { get; private set; } public static string arm9Path { get; private set; } + public static string arm7Path { get; private set; } public static string overlayTablePath { get; set; } + public static string y7Path { get; set; } + public static string dataPath { get; set; } public static string overlayPath { get; set; } + public static string unpackedPath { get; set; } + public static string bannerPath { get; set; } + public static string headerPath { get; set; } public static GameLanguages gameLanguage { get; private set; } public static GameVersions gameVersion { get; private set; } @@ -160,11 +168,19 @@ namespace DSPRE { folderSuffix = ""; } - workDir = Path.GetDirectoryName(romName) + "\\" + Path.GetFileNameWithoutExtension(romName) + folderSuffix + "\\"; - arm9Path = workDir + @"arm9.bin"; - overlayTablePath = workDir + @"y9.bin"; - overlayPath = workDir + "overlay"; - internalNamesLocation = workDir + @"data\fielddata\maptable\mapname.bin"; + string path = System.IO.Path.GetDirectoryName(romName) + "\\" + Path.GetFileNameWithoutExtension(romName) + folderSuffix + "\\"; + + workDir = path; + arm9Path = Path.Combine(workDir, @"arm9.bin"); + arm7Path = Path.Combine(workDir, @"arm7.bin"); + overlayTablePath = Path.Combine(workDir, @"y9.bin"); + y7Path = Path.Combine(workDir, @"y7.bin"); + dataPath = Path.Combine(workDir, dataFolderName); + overlayPath = Path.Combine(workDir, @"overlay"); + bannerPath = Path.Combine(workDir, @"banner.bin"); + headerPath = Path.Combine(workDir, @"header.bin"); + unpackedPath = Path.Combine(workDir, @"unpacked"); + internalNamesPath = Path.Combine(workDir, $@"{dataFolderName}\fielddata\maptable\mapname.bin"); try { gameVersion = PokeDatabase.System.versionsDict[id]; @@ -966,7 +982,7 @@ namespace DSPRE { public string GetBuildingModelsDirPath(bool interior) => interior ? gameDirs[DirNames.interiorBuildingModels].unpackedDir : gameDirs[DirNames.exteriorBuildingModels].unpackedDir; public string GetRomNameFromWorkdir() => workDir.Substring(0, workDir.Length - folderSuffix.Length - 1); - public static int GetHeaderCount() => (int)new FileInfo(internalNamesLocation).Length / internalNameLength; + public static int GetHeaderCount() => (int)new FileInfo(internalNamesPath).Length / internalNameLength; public static List GetLocationNames() => new TextArchive(locationNamesTextNumber).messages; public static string[] GetSimpleTrainerNames() => new TextArchive(trainerNamesMessageNumber).messages.ToArray(); public static string[] GetTrainerClassNames() => new TextArchive(trainerClassMessageNumber).messages.ToArray(); @@ -1172,6 +1188,9 @@ namespace DSPRE { [DirNames.interiorBuildingModels] = @"data\a\1\4\8", [DirNames.learnsets] = @"data\a\0\3\3", [DirNames.evolutions] = @"data\a\0\3\4", + + [DirNames.safariZone] = @"data\a\2\3\0", + [DirNames.headbutt] = @"data\a\2\5\2", //both versions use the same folder with different data }; //Encounter archive is different for SS From 144482fa30495c23d1af77b8938af22735272a7e Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Sun, 3 Mar 2024 20:50:31 +0100 Subject: [PATCH 09/40] Added HGSS commands MD as test --- DS_Map/DSPRE.csproj | 1 + DS_Map/Main Window.cs | 3 + DS_Map/Resources/HGSSCommands.md | 857 +++++++++++++++++++++++++++++++ 3 files changed, 861 insertions(+) create mode 100644 DS_Map/Resources/HGSSCommands.md diff --git a/DS_Map/DSPRE.csproj b/DS_Map/DSPRE.csproj index 63ac31d..a50042e 100644 --- a/DS_Map/DSPRE.csproj +++ b/DS_Map/DSPRE.csproj @@ -436,6 +436,7 @@ Settings.settings True + diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index 75f6e63..defa900 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -29,7 +29,10 @@ using System.ComponentModel; using DSPRE.Editors; namespace DSPRE { + + public partial class MainProgram : Form { + public MainProgram() { InitializeComponent(); EditorPanels.Initialize(this); diff --git a/DS_Map/Resources/HGSSCommands.md b/DS_Map/Resources/HGSSCommands.md new file mode 100644 index 0000000..005f04f --- /dev/null +++ b/DS_Map/Resources/HGSSCommands.md @@ -0,0 +1,857 @@ + Outer pipes Cell padding +No sorting +| | SDSME names | New proposed names | Parameters | Function | Notes | +| ---- | -------------------------- | ---------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| 0000 | Nop | Nop | \- | Nothing | | +| 0001 | Nop1 | Dummy | \- | Nothing | Has exactly the same ASM code as Nop. | +| 0002 | End | End | \- | End script execution | | +| 0003 | Return2 | WaitTime | u16: Time; Var: ??? | Stop script execution for Time frames | The Var's purpose is unknown. Command uses ScrReg 0 as countdown. | +| 0004 | | RegValueSet | u8: Script Register; u8: Value | Assigns Value to Script Register value | | +| 0005 | | RegDataSet | u8: Script Register; u32: Value | Assigns Value to Script Register value | | +| 0006 | | RegAdrsSet | u8: Script Register; u32: Address | Assigns data in Address offset to Script Register value | | +| 0007 | | AdrsValueSet | u32: Address; u8: Value | Assigns Value to the Address offset | | +| 0008 | | AdrsRegSet | u32: Address; u8: Script Register | Assigns Script Register value to the Address offset | | +| 0009 | | RegRegSet | u8: Script Register 1; u8: Script Register 2 | Assigns Script Register 2 value to Script Register 1 value | | +| 000A | | AdrsAdrsSet | u32: Address 1; u32: Address 2 | Assigns data in Address 2 to the Address 1 offset | | +| 000B | | CompareRegs | u8: Script Register; u8: Script Register | Compares two Script Register | | +| 000C | | CompareRegValue | u8: Script Register; u8: Value | Compares Script Register value with Value | | +| 000D | | CompareRegAdrs | u8: Script Register; u32: Address | Compares Script Register value with data in Address | | +| 000E | | CompareAdrsReg | u32: Address; u8: Script Register | Compares data in Address with Script Register value | | +| 000F | | CompareAdrsValue | u32: Address; u8: Value | Compares data in Address with Value | | +| 0010 | | CompareAdrsAdrs | u32: Address 1; u32: Address 2 | Compares data in Address 1 with data in Address 2 | | +| 0011 | If | CompareVarValue | Var: Variable; u16: Value | Compares Variable value with Value | | +| 0012 | If2 | CompareVars | Var: Variable 1; Var: Variable 2 | Compares Variable 1 value with Variable 2 value | | +| 0013 | | ParallelCommonScript | u16: ??? | ??? | Somehow related with parallel common script execution. | +| 0014 | CallStandard | CommonScript | u16: Global Script ID | Calls Global Script ID script | The Common Script table is located at 0xFA48C in IPKS arm9.bin, ordered from highest to lowest with structure: u16 Global Script ID | u16 Script file | u16 Text file. The executed script inside script file is determined as: used Global Script ID \- tabulated Global Script ID. | +| 0015 | | LocalScript | \- | Returns to the invoking script/function after a Common Script | | +| 0016 | Jump | Jump | u32: Relative Jump | Jumps to a function, Relative Jump bytes forward or backward | Relative Jump can have negative values (backward jump). | +| 0017 | | JumpIfObjID | u8: Event ID; u32: Relative Jump | Jumps to a function, Relative Jump bytes forward or backward, if invoking event has Event ID as ID | | +| 0018 | | JumpIfBgID | u8: ???; u32: Relative Jump | ??? | Maybe jumps to a function if invoking event has a specific ID. | +| 0019 | | JumpIfPlayerDir | u8: Player Direction; u32: Relative Jump | Jumps to a function, Relative Jump bytes forward or backward, if player is looking in Player Direction | Supposed. Needs to be tested in game. | +| 001A | Call | Call | u32: Relative Jump | Calls a function, Relative Jump bytes forward or backward | Can be used to make loops when calling the own invoking function. | +| 001B | Return | Return | \- | Returns to the invoking script/function after a Call | | +| 001C | CompareLastResultJump | JumpIf | u8: Condition; u32: Relative Jump | If Condition in the condition table, jumps to a function | Ask AdAstra for the condition list. Condition table is updated after a IfVarValue, IfVarVar, CheckFlag... | +| 001D | CompareLastResultCall | CallIf | u8: Condition; u32: Relative Jump | If Condition in the condition table, calls a function | | +| 001E | SetFlag | SetFlag | u16: Flag | Sets Flag to 1 | | +| 001F | ClearFlag | ClearFlag | u16: Flag | Sets Flag to 0 | | +| 0020 | CheckFlag | CheckFlag | u16: Flag | Checks if Flag is set | It updates the internal condition flag and maybe part of the condition table. | +| 0021 | | SetFlagFromVar | Var: Flag | Sets the flag whose ID is stored in Flag | | +| 0022 | | ClearFlagFromVar | Var: Flag | Clears the flag whose ID is stored in Flag | | +| 0023 | | FlagStatusToVar | Var: Flag; Var: Variable | Checks if Flag is set and store the result in Variable | | +| 0024 | | SetTrainerFlag | Flex: Trainer ID | Sets the flag of Trainer ID, so marks it as beaten trainer | So this trainer will not battle against you. Used in every Gym after the leader is beaten. | +| 0025 | | ClearTrainerFlag | Flex: Trainer ID | Clears the flag of Trainer ID, so marks it as unbeaten trainer | So this trainer can be challenged again. | +| 0026 | | CheckTrainerFlag | Flex: Trainer ID | Checks if Trainer ID has been beaten | It updates the internal condition flag and maybe part of the condition table. | +| 0027 | Copy | IncrementVar | Var: Variable; Flex: Operand | Stores the operation Variable \+ Operand in Variable | | +| 0028 | | DecrementVar | Var: Variable; Flex: Operand | Stores the operation Variable \- Operand in Variable | | +| 0029 | SetVar | SetVar | Var: Variable; u16: Value | Stores Value in Variable | | +| 002A | CopyVar | SetVarFromVariable | Var: Variable 1; Var: Variable 2 | Assigns value of Variable 2 to Variable 1 | | +| 002B | | SetVarFromFlexible | Var: Variable; Flex: Flexible Value | Stores Flexible Value (or its value if variable) in Variable | | +| 002C | | MessageAll | u8: Text Slot | Display line Text Slot from the text file, all at once | | +| 002D | Message | Message | u8: Text Slot | Display line Text Slot from the text file | | +| 002E | Message2 | MessageFlex | Flex: Text Slot | Display line Text Slot from the text file | Unlike 002D, this command also accepts a variable as the input field. | +| 002F | | MessageNoSkip | Flex: Text Slot | ??? | | +| 0030 | | | u8: Text Slot | ??? | | +| 0031 | | WaitAB | \- | Waits for button A or button B to be pressed | Somehow it uses ScrReg 0 as countdown. | +| 0032 | WaitButton | WaitButton | \- | Waits for a button to be pressed | It seems only A, B, X and direction pad buttons work. | +| 0033 | | WaitABPad | \- | Waits for button A, button B or pad buttons to be pressed | Supposed. Needs to be tested in game. | +| 0034 | | OpenMessage | \- | ??? | | +| 0035 | CloseMessageOnKeyPress | CloseMessage | \- | Closes message box | SDSME name is misleading, for no button is needed to be pressed. | +| 0036 | FreezeMessageBox | FreezeMessage | \- | ??? | Probably keeps the message box alive after a script. ASM differs with CloseMessage only in a BL instruction. | +| 0037 | CallMessageBox | SetIconBoard | u8: Text Slot; u8: Type; u16: Icon; u16: ??? | Prepares an icon board message box displaying Text Slot message, of Type type, and with Icon image if chosen type supports it | Type values from 0 to 3 are: brown (with icon), green (with icon), gray and blue. | +| 0038 | ColorMessageBox | SetTextBoard | u8: Type; u16: Icon | Prepares a text board message box of Type type, and with Icon image if chosen type supports it | Type values from 0 to 3 are: brown (with icon), green (with icon), gray and blue. | +| 0039 | TypeMessageBox | ShowBoard | u8: Process | Triggers different Process processes for the board | Process value 0 keeps the board, value 1 creates the board, value 2 hides the board, value 3 shows the board and value 4 deletes the board. | +| 003A | NoMapMessageBox | WaitBoard | \- | Waits the board last process to end | Supposed. | +| 003B | | BoardMessage | u8: Text Slot; u16: Variable | Displays Text Slot message in the current text box, stores the current text box status in Variable | | +| 003C | | CloseBoard | Var: Variable | Returns 1 to Variable if the player has pressed a button so the board must close, 0 otherwise | Variable is stored in ScrReg 0. Command waits for a button to be pressed and stores result in Variable. | +| 003D | | Menu | \- | | | +| 003E | | | u8: ???; u8: ???; u8: ???; u8: ???; u8: ???; u8: ??? | | | +| 003F | | YesNoBox | Var: Variable | Opens a Yes-No dialog and stores user response in Variable | Variable is stored in ScrReg 0. | +| 0040 | Multi | MultiStandardText | u8: X; u8: Y; u8: Cursor; u8: Cancel; Var: Selection | Prepares a multiple selection menu at X and Y screen position, with Cursor default selected option and possibility of cancelling depending on Cancel, with text bank #321, returns selected slot ID in Selection | If Cancel is 1, the user can select the last option by pressing B button. | +| 0041 | Multi2 | MultiLocalText | u8: X; u8: Y; u8: Cursor; u8: Cancel; Var: Selection | Prepares a multiple selection menu at X and Y screen position, with Cursor default selected option and possibility of cancelling depending on Cancel, with local texts, returns selected slot ID in Selection | If Cancel is 1, the user can select the last option by pressing B button. | +| 0042 | TextScriptMulti | AddMultiOption | u8: Text Slot; u8: Multi Slot | Adds an option with Multi Slot ID showing Text Slot text | | +| 0043 | CloseMulti | ShowMulti | \- | Shows the prepared multi in screen | The game will hide it when the player has selected an option. | +| 0044 | Multi3 | ListStandardText | u8: X; u8: Y; u8: Cursor; u8: Cancel; Var: Selection | Prepares a multiple selection list at X and Y screen position, with Cursor default selected option and possibility of cancelling depending on Cancel, with text bank #321, returns selected slot ID in Selection | If Cancel is 1, the user can select the last option by pressing B button. The difference between a Multi and a List seems to be that lists are scrollable. | +| 0045 | | ListLocalText | u8: X; u8: Y; u8: Cursor; u8: Cancel; Var: Selection | Prepares a multiple selection list at X and Y screen position, with Cursor default selected option and possibility of cancelling depending on Cancel, with local texts, returns selected slot ID in Selection | If Cancel is 1, the user can select the last option by pressing B button. The difference between a Multi and a List seems to be that lists are scrollable. | +| 0046 | | AddListOption | Flex: Option MSG; Flex: Highlight MSG; Flex: List Slot | Adds a new option to the list, with List Slot ID and showing text line Option MSG. It also displays text line Highlight MSG when that option is highlighted. | If Highlight MSG is set to 255 [0xFF], no message will be displayed when the option is highlighted.
This command relies on an open message box in order to display the highlight messages.

Trying to highlight an option with Highlight MSG different than 255 [0xFF] will result in a crash if no message box is already being displayed. | +| 0047 | | ShowList | \- | Shows the prepared list in screen | The game will hide it when the player has selected an option. | +| 0048 | MultiRow | MultiColumn | u8: Columns | Splits the multi window in Columns different columns | | +| 0049 | PlayFanfare | PlayFanfare | Flex: Sound | Plays Sound | | +| 004A | PlayFanfare2 | StopFanfare | Flex: Sound | Stops Sound | | +| 004B | WaitFanfare | WaitFanfare | Flex: Sound | Waits Sound to finish | | +| 004C | PlayCry | PlayCry | Flex: Pokémon; Flex: Unused | Plays a Pokémon cry | | +| 004D | WaitCry | WaitCry | \- | Waits the current cry to finish | | +| 004E | PlaySound | PlaySound | u16: Sound | Pauses current music, then Plays Sound | | +| 004F | FadeDefaultMusic | WaitSound | \- | Waits for Sound to finish, then resumes music | | +| 0050 | PlayMusic | PlayMusic | u16: Music | Plays Music | | +| 0051 | StopMusic | StopMusic | u16: Unused | Stops current music | Parameter is ignored because the game identifies what music is playing. | +| 0052 | RestartMusic | PlayDefaultMusic | \- | Plays map default music | | +| 0053 | | SetMusic | u16: Music | ??? | | +| 0054 | SwitchMusic | FadeOutMusic | u16: Volume; u16: Time | Fades out the current music to Volume in Time frames | | +| 0055 | | FadeInMusic | u16: Time | Fades in the current music to normal volume in Time frames | | +| 0056 | | SetMusicPauseStatus \* | u8: SSEQ Player ID; u8: Status | ??? | | +| 0057 | | TempMusic \* | u16: Music ID | ??? | | +| 0058 | | SetBGMFlag \* | u8: ??? | ??? | Seems to set a flag related to the music system. | +| 0059 | | CheckChatotCry | Var: Variable | Checks if Chatot has custom sound, stores answer in Variable | Returns 0 or 1 to the specified Variable. Not for a specific Chatot but for all (they share a custom sound). | +| 005A | SwitchMusic2 | StartChatotCry | Var: Variable | Starts Chatot microphone record, stores answer in Variable | Returns 0 or 1 to the specified Variable depending on successful recording. | +| 005B | | StopChatotCry | \- | Stops recording Chatot custom sound | | +| 005C | | SaveChatotCry | \- | ??? | Maybe saves the custom Chatot sound in the savegame. | +| 005D | | | \- | ??? | | +| 005E | ApplyMovement | Movement | Flex: Event ID; u32: Relative Jump | Applies movement at Relative Jump to Event ID | Movements must be halfword-aligned in the script file. If you're using an old tool which doesn't align them, force the alignment with a TextPlayerName 0x0 or some unnoticeable command of 3, 5, 7 or 9 bytes length. | +| 005F | WaitMovement | WaitMovement | \- | Waits for all movements to finish | | +| 0060 | LockAll | LockAll | \- | Locks every event in the map | | +| 0061 | ReleaseAll | ReleaseAll | \- | Releases every event in the map | | +| 0062 | Lock | Lock | u16: Event ID | Locks Event ID | | +| 0063 | Release | Release | u16: Event ID | Releases Event ID | | +| 0064 | AddPeople | AddOW | Flex: Event ID | Add Event ID overworld in the map | It is probable that, if executing this having Event ID overworld already in the map, it gets duplicated. | +| 0065 | RemovePeople | RemoveOW | Flex: Event ID | Removes Event ID overworld from the map | | +| 0066 | LockCam | LockCamera | Flex: X; Flex: Y | Locks the camera at position X and Y | Seems to place a invisible NPC at coords X and Y. It appears that both must be the current player position. | +| 0067 | | ReleaseCamera | \- | Releases the camera | | +| 0068 | FacePlayer | FacePlayer | \- | Makes the invoking event look at the player | In fact it simply takes the current player direction and makes the NPC look at the opposite direction. | +| 0069 | CheckSpritePosition | GetPlayerPosition | Var: X; Var: Y | Saves the current player position in X and Y | | +| 006A | | GetOWPosition | Flex: Event ID; Var: X; Var: Y | Saves the current Event ID position in X and Y | If Event ID is deleted (via RemoveOW) it gives 0xFF for both coordinates. | +| 006B | CheckPersonPosition | SetFollowingOverworld \* | Flex: X; Flex: Z; Flex: Y | ??? | Maybe teleports the player to other coords? | +| 006C | ContinueFollow | KeepOverworld | Flex: Event ID; u8: Value | If Value is 1, prevents Event ID from disappearing when entering on a new map header | | +| 006D | FollowHero | SetOWMovement | Flex: Event ID; u16: Movement | Changes the Event ID's movement number to Movement | | +| 006E | GiveMoney | GiveMoney | u32: Money | Adds Money to the player's money | | +| 006F | TakeMoney | TakeMoney | u32: Money | Subtracts Money from the player's money | | +| 0070 | CheckMoney | CompareMoney | Var: Variable; u32: Money | Stores 1 into Variable if the player has Money or more money. Stores 0 otherwise. | | +| 0071 | ShowMoney | ShowMoney | Flex: X; Flex: Y | Shows the money box at X and Y coordinates of the screen | Each X and Y unit implies 8 pixels. Values of 0 or higher than the screen may glitch the screen. | +| 0072 | HideMoney | HideMoney | \- | Hides the money box | | +| 0073 | | UpdateMoney | \- | Updates the current money in the money box | | +| 0074 | | ShowSpecialCurrency | u8: Currency; Flex: X Coord; Flex: Y Coord | Shows the Currency box at X and Y coordinates of the screen. | Currency:

0 = Coins
1 = Battle Points
2 = Athlete Points | +| 0075 | | HideSpecialCurrency | \- | Hides the currently displayed special currency box. | | +| 0076 | | UpdateSpecialCurrency | u16: Currency | Updates the current Currency in the currency box. | Currency types are the same as above [0074]. | +| 0077 | | CheckCoins | Var: Variable | Stores the current casino coin amount in Variable | | +| 0078 | | GiveCoins | Flex: Coins | Adds Coins to the player's casino coins | | +| 0079 | | TakeCoins | Flex: Coins | Subtracts Coins from the player's casino coins | | +| 007A | | GiveAthletePoints | Flex: Amount | Adds the given Amount to the player's Athlete Points | | +| 007B | | TakeAthletePoints | Flex: Amount | Subtracts the given Amount from the player's Athlete Points | | +| 007C | | CompareAthletePoints | Var: Result; Flex: Amount | Stores 1 into Variable if the player has the given Amount of Athlete Points or more. Stores 0 otherwise. | | +| 007D | | GiveItem | Flex: Item; Flex: Amount; Var: Variable | Adds Amount of Item item, stores 1 in Variable if the player had less than 1000 - Amount (100 - Amount if TM/HM), stores 0 otherwise | Both Item and Amount are flexible, but if you use CommonScript 0x7F1 after that (as it is meant to be) you must place these two values in 0x8004 and 0x8005 in order to make the script work properly. | +| 007E | TakeItem | TakeItem | Flex: Item; Flex: Amount; Var: Variable | Subs Amount of Item item, stores 1 in Variable if the player had at least Amount items in the bag, stores 0 otherwise | | +| 007F | GiveItem | CheckItemSpace | Flex: Item; Flex: Amount; Var: Variable | Stores 1 in Variable if the player has less than 1000 - Amount of Item items (100 - Amount if TM/HM), stores 0 otherwise | | +| 0080 | CheckItem | CheckItem | Flex: Item; Flex: Amount; Var: Variable | Stores 1 in Variable if the player has at least Amount of Item items in the bag, stores 0 otherwise | Even if the Amount to check for is 0, the check will return 0 if you don't have the item at all. | +| 0081 | | CheckItemIsMachine | Flex: Item; Var: Variable | Stores 1 in Variable if Item is TM or HM, stores 0 otherwise | | +| 0082 | | GetItemPocket | Flex: Item; Var: Variable | Stores the bag pocket of Item in Variable | | +| 0083 | | SetStarter | Flex: Pokémon | Stores Pokémon as the starting Pokémon in the game save data | | +| 0084 | DoubleMessage | GenderMessage | u8: Male Text; u8: Female Text | Displays Male Text or Female Text message depending on player's gender | | +| 0085 | | CheckSeals \* | Flex: Seal ID; Var: Number of Seals in Seal Case | Checks the number of a certain type of Ball Seals that the player has. The variable is the output of how many Seals you have. | Example: Farmhouse on Route 39 | +| 0086 | | GiveSeals \* | Flex: Seal ID; Flex: Number of Seals to be Given | Gives the player Ball Seals. | Example: Farmhouse on Route 39 | +| 0087 | | GiveRandomSeals \* | Var: Random Seal ID 1; Var: Random Seal ID 2; Var: Random Seal ID 3 | Generates three random types of Ball Seals and gives them to the player (repeats are possible). Each variable will yield a 0 if the player has no more room for the Seal(s) in the Seal Case. | Example: House in top right of Olivine City | +| 0088 | | CheckPokemonForm \* | Flex: Party Position; Var: Variable | Checks the form of the Pokemon in party slot Party Position and returns the form ID in Variable. | | +| 0089 | GiveStoredPokemon | GivePokemon | Flex: Pokémon; Flex: Level; Flex: Item ID; Flex: Form; Flex: Ability; Var: Variable | Gives Pokémon at level Level, store 1 in Variable if succeed and 0 otherwise | | +| 008A | | GivePokemonEgg | Flex: Pokémon; Flex: Location | Gives a Pokémon egg received from Location text slot at text bank #281 | | +| 008B | | ReplaceMove | Flex: Party Slot; Flex: Move Slot; u16: Move ID | Overwrites Move Slot of the Pokémon at the specified Party Slot with Move ID. | Party slot and move slot start at 0 rather than 1, so the ranges are 0-5 and 0-3 respectively.
[https://bulbapedia.bulbagarden.net/wiki/List_of_moves](https://bulbapedia.bulbagarden.net/wiki/List_of_moves) | +| 008C | | CheckPokemonHasMove | Var: Variable; Flex: Move ID; Flex: Party Slot | Checks if a Pokémon at the specified Party Slot knows a move with given Move ID.
Stores 1 into Variable if yes, 0 otherwise. | Example: Headbutt tutor in Ilex Forest (Script File 92, Script 3) | +| 008D | | CheckMoveInParty | Var: Variable; Flex: Move ID | Checks if any Pokémon in the party knows Move ID move, stores in Variable the position of the first Pokémon that knows it or stores 6 if no Pokémon in the party knows the move | | +| 008E | | CheckPokeGearRematch \* | Flex: Phone Number; Var: Variable | | Has something to do with rematches but not sure if it's checking if a rematch is active or the # the rematch is on. Gets used when deciding when to let Gym Leaders appear in the overworld for a photo shoot after they are defeated in the Dojo. | +| 008F | | ChooseRivalName | Var: Variable | Opens the keyboard for naming the rival, stores 1 in Variable if user cancels the proccess | | +| 0090 | | GetCounterpartSprite | Var: Variable | Stores 97 (Lyra sprite ID) into the Variable if you're playing as Ethan;
Stores 0 (Ethan sprite ID) into the Variable if you're playing as Lyra. | Remember that Overworld Entities with sprite IDs 101 to 116 refer to the value of vars 0x4020-0x402F for the sprite to display. | +| 0091 | | UpgradePokegear | u8: Module | Adds the worldmap to the Pokegear if Module is 1, adds the radio if Module is 2 | | +| 0092 | RecordPokegearNumber | RecordPokegearNumber | Flex: ??? | | | +| 0093 | | CheckPokegearNumberRegistered \* | Flex: Phone Number; Var: Variable | Stores 0 into Variable if Phone Number has not been registered, and 1 if it has been registered. | Example: Sabrina in Olivine Harbor (Script File 153, Script 7). Used frequently by Gym Leaders appearing in the overworld. | +| 0094 | | | | | | +| 0095 | | | | | | +| 0096 | CallEnd | ReturnScreen | \- | Restores the normal overworld screen | | +| 0097 | | | | | | +| 0098 | Wifi | | \- | | | +| 0099 | | DressPokemon \* | \- | | | +| 009A | OpenPokemonDress | ContestDressupScreen \* | \- | | | +| 009B | | DressUpArtworkScreen \* | \- | | | +| 009C | | SealCapsuleScreen \* | \- | | | +| 009D | OpenPokegearMap | WorldMapScreen | \- | Opens the worldmap screen | | +| 009E | | PCBoxScreen \* | \- | | | +| 009F | | DrawScreenUnion \* | \- | | | +| 00A0 | | TrainerCaseUnion \* | \- | | | +| 00A1 | CallEnd2 | TradeScreenUnion \* | \- | | | +| 00A2 | | RecordMixingUnion \* | \- | | | +| 00A3 | EndGame | EndGameScreen | \- | Opens the Hall of Fame and game ending screens | | +| 00A4 | | HallOfFameData \* | \- | | | +| 00A5 | | StoreGTSStatus \* | ??? | | | +| 00A6 | WFC | InitWFC \* | ??? | | | +| 00A7 | | StarterSelectionScreen | \- | Opens the starter Pokémon selection screen | | +| 00A8 | | GetTrainerPathToPlayer \* | Flex: ??? | | | +| 00A9 | | TrainerStepTowardsPlayer \* | Flex: ???; Var: Variable | | | +| 00AA | | GetTrainerEyeType \* | Var: Variable | | | +| 00AB | | GetEyeTrainerNum \* | Flex: ???; Var: Variable | | | +| 00AC | | WritePlayerName | Var: Variable | Opens the keyboard for naming the player, stores 1 in Variable if user cancels the proccess | | +| 00AD | GivePokemonNickname | WritePokemonName | Flex: Party Position; Var: Variable | Opens the keyboard for naming a Pokémon in Party Position, stores 1 in Variable if user cancels the proccess | | +| 00AE | FadeScreen | FadeScreen | u16: Frame Count; u16: Duration; u16: Fade Style; u16: Color | Fades screen to chosen 15-bit Color, using the chosen Fade Style. The transition will render Frame Count images, of Duration length each. | Type 0 for fade in, Type 1 for fade out. Color has 15-bit format. Transition is the number of color changes that the game does in the fading. | +| 00AF | ResetScreen | WaitFadeScreen | \- | Waits for the screen fade to end | | +| 00B0 | Warp | Warp | Flex: Map; u16: Door; Flex: X; Flex: Y; Flex: Dir | Warps to X and Y position of Map header with initial Dir direction, using Door warp | When Door is 0 it doesn't use any door animation. | +| 00B1 | HallFameData | RockClimbAnimation | Flex: Party Position | Uses rock climb with the Pokémon at Party Position position | | +| 00B2 | | SurfAnimation | Flex: Party Position | Uses surf with the Pokémon at Party Position position | | +| 00B3 | WFC1 | WaterfallAnimation | Flex: Party Position | Uses waterfall with the Pokémon at Party Position position | | +| 00B4 | | FlyAnimation | u16: Map; Flex: X; Flex: Y | Flies to Map header map, to coordinates X and Y | | +| 00B5 | | FlashAnimation | \- | Sets weather to 12 (darkness after flash) and then updates the weather graphics | | +| 00B6 | | WhirlpoolAnimation | Flex: Party Position | Uses whirlpool with the Pokémon at Party Position position | | +| 00B7 | | CutAnimation | Flex: Party Position | Uses cut with the Pokémon at Party Position position | | +| 00B8 | | CheckBike | Var: Variable | Stores 1 in Variable if player is riding the bike, stores 0 otherwise | | +| 00B9 | | RideBike | u8: Action | Changes player form from normal to riding the bike if Action is 1, otherwise it sets the normal form to the player | | +| 00BA | | CyclingRoad | u8: Action | If Action is 1, the game sets the cycling road flag and moves the player down. Otherwise the flag is deactivated. | | +| 00BB | | CheckPlayerForm | Var: Variable | Stores in Variable the current player form | Values 0 is for normal form, value 1 for riding the bike, value 2 for surfing, value 3 for Rocket clothing | +| 00BC | | SetPlayerForm | u16: Form | Activates the Form bit in the internal player form data | The purpose of the different bits still needs to be researched. | +| 00BD | | UpdatePlayerForm | \- | Updates changes in the internal player form data in the screen | | +| 00BE | SetVariableHero | TextPlayerName | u8: String Buffer | Stores player's name in String Buffer | | +| 00BF | SetVariableRival | TextRivalName | u8: String Buffer | Stores rival's name in String Buffer | | +| 00C0 | SetVariableAlter | TextCounterpart | u8: String Buffer | Stores counterpart's name in String Buffer | | +| 00C1 | SetVariablePokemon | TextPartyPokemon | u8: String Buffer; Flex: Party Position | Stores the name of the Pokémon in Party Position in String Buffer | | +| 00C2 | SetVariableItem | TextItem | u8: String Buffer; Flex: Item | Stores Item's name in String Buffer | | +| 00C3 | | TextPocket | u8: String Buffer; Flex: Pocket | Stores Pocket's name in String Buffer | | +| 00C4 | SetVariableAttackItem | TextMachineMove | u8: String Buffer; Flex: Item | Stores the name of the move contained in Item TM/HM in String Buffer | | +| 00C5 | SetVariableAttack | TextMove | u8: String Buffer; Flex: Move | Stores battle Move's name in String Buffer | | +| 00C6 | SetVariableNumber | TextNumber | u8: String Buffer; Flex: Number | Stores a Number in String Buffer | | +| 00C7 | SetVariablePokemonNickname | TextPokeNickname | u8: String Buffer; Flex: Party Position | Stores the nickname of the Pokémon in Party Position in String Buffer | | +| 00C8 | SetVariableObject | | | | | +| 00C9 | | TextPlayerTrainerType | u8: String Buffer | Stores player's Union Room trainer type in String Buffer | | +| 00CA | SetVariablePokemonStored | TextPokemon | u8: String Buffer; Flex: Pokémon; u16: Unused; u8: Unused | Stores Pokémon's name in String Buffer | The two Unused parameters are for defining male/female nouns and singular/plural nouns respectively. However both don't apply in this command. | +| 00CB | | TextStarterPokemon | u8: String Buffer | Stores the name of the player' starter Pokémon in String Buffer | | +| 00CC | | TextRivalStarter | u8: String Buffer | Stores the name of the rival' starter Pokémon in String Buffer | | +| 00CD | CheckStarter | TextCounterpartStarter | u8: String Buffer | Stores the name of the counterpart' starter Pokémon in String Buffer | | +| 00CE | | CheckStarter | Var: Variable | Stores the starter Pokémon ID in Variable | | +| 00CF | | DummyTextGoods | u8: String Buffer; Flex: Unused | Loads an empty string in String Buffer | | +| 00D0 | | DummyTextTrap | u8: Unused; Flex: Unused | Nothing | | +| 00D1 | | DummyTextTreasure | u8: Unused; Flex: Unused | Nothing | | +| 00D2 | | TextMapName | u8: String Buffer; Flex: Map | Stores Map header name in String Buffer | | +| 00D3 | | GetSwarmInfo | Var: Map; Var: Pokémon | Selects a zone depending on a random seed, then stores the zone ID in Map and the corresponding swarm Pokémon of that zone in Pokémon | Predicted. Needs to be checked. | +| 00D4 | | TrainerID | Var: Variable | Stores the trainer ID number in Variable depending on the script ID | This means you shouldn't use this command in a normal script. | +| 00D5 | TrainerBattle | TrainerBattle | Flex: Trainer 1; Flex: Trainer 2; u8: Result; u8: ??? | Starts a battle against Trainer 1 and, if Trainer 2 is neither 0 nor the same as Trainer 1, a double battle against both. Continues without warping to Pokemon Center/home if Result is equal to 1. | Your party will also be fully healed after the battle if Result is 1. Example: Cherrygrove City fight with Rival | +| 00D6 | | TrainerMessage | Flex: Trainer ID; Flex: Type | Displays the text of Trainer ID trainer at condition Type | The possible Type values are the following (expand the note for see them) | +| 00D7 | | TrainerMsgCheck | Var: Noticing; Var: Defeat; Var: One Pokémon | If the script ID corresponds to a single battle trainer, stores 0 in Noticing, 2 in Defeat and 0 in One Pokémon. If it corresponds to a double battle, stores 3, 5 and 6 or 7, 9 and 10 depending on whether it's the first or the second trainer | This means you shouldn't use this command in a normal script. | +| 00D8 | | TrainerRematchMsgCheck | Var: Noticing; Var: Defeat; Var: One Pokémon | If the script ID corresponds to a single battle trainer, stores 17 in Noticing, 0 in Defeat and 0 in One Pokémon. If it corresponds to a double battle, stores 18, 0 and 6 or 19, 0 and 10 depending on whether it's the first or the second trainer | This means you shouldn't use this command in a normal script. | +| 00D9 | | TrainerTypeCheck | Var: Variable | Stores 0 in Variable if the script ID corresponds to a single battle, stores 1 if it corresponds to a double battle | This means you shouldn't use this command in a normal script. | +| 00DA | | TrainerMusic | Flex: Trainer | Plays Trainer's overworld music | It checks if player is in Johto or Kanto for that. | +| 00DB | LostGoPokecenter | LostBattle | \- | Return to Pokémon Center or player's house after being defeated | | +| 00DC | CheckLost | CheckBattleIsLost | Var: Variable | Stores 0 in Variable if player has been defeated in battle, stores 1 otherwise | | +| 00DD | | CheckDefeatedPokemon | Var: Variable; u8: ??? | Stores 0 in Variable if player defeated or catched the wild Pokemon, stores 1 otherwise | | +| 00DE | StoreStarter | Check2vs2 | Var: Variable | Stores 1 in Variable if player has at least 2 not fainted Pokémon, stores 0 otherwise | | +| 00DF | | DummyTrainerBattle | \- | Starts a battle against trainer with ID 1 | | +| 00E0 | | DummyTrainerFlag | \- | Sets the trainer flag with the same ID as the invoking event | | +| 00E1 | | DummyTrainerFlagJump | u32: Relative Jump | Jumps to a function, Relative Jump bytes forward or backward, if trainer flag with the invoking event ID is set | | +| 00E2 | | | | | | +| 00E3 | | | | | | +| 00E4 | | | | | | +| 00E5 | | | | | | +| 00E6 | | | | | | +| 00E7 | | | | | | +| 00E8 | | | | | | +| 00E9 | | | | | | +| 00EA | | | | | | +| 00EB | | | | | | +| 00EC | | | | | | +| 00ED | | | | | | +| 00EE | | CheckPokerus | Var: Variable | Stores 1 in Variable if one or more Pokémon in the party are infected with the Pokérus | | +| 00EF | ChecPokemonGender | GetPokemonGender | Flex: Party Position; Var: Variable | Stores 0 in Variable if Pokémon at Party Position is male, 1 if is female and 2 if gender is unknown | Unknown gender value is supposed and should be checked. | +| 00F0 | WarpLift | SetElevatorWarp \* | Var: Variable | | | +| 00F1 | CheckFloor | GetElevatorFloor | Var: Variable | Stores in Variable the current floor in a elevator | | +| 00F2 | | ElevatorBox | u8: X; u8: Y; Var: Variable; Flex: Floor | Shows the current floor number in a box at X and Y coordinates in the screen | Each X and Y unit implies 8 pixels. Values of 0 or higher than the screen may glitch the screen. Variable and Floor parameters have not been tested. | +| 00F3 | WirelessBattleWait | CountJohtoDexSeen | Var: Variable | Stores in Variable the total seen Pokemon in the Johto Pokédex | | +| 00F4 | | CountJohtoDexObtained | Var: Variable | Stores in Variable the total obtained Pokemon in the Johto Pokédex | | +| 00F5 | | CountNationalDexSeen | Var: Variable | Stores in Variable the total seen Pokemon in the National Pokédex | | +| 00F6 | | CountNationalDexObtained | Var: Variable | Stores in Variable the total obtained Pokemon in the National Pokédex | | +| 00F7 | PokemonContest | DummyNationalDexCheck | \- | Nothing | | +| 00F8 | | GetDexProgressMsg | u8: Mode; Var: Message; Var: Unknown | Checks the number of seen Pokémon in the Johto Pokédex (if Mode is 0) or the number of obtained Pokémon in the National Pokédex (otherwise) and stores the corresponding Professor message in Message, also storing 0x4AA in Unknown | | +| 00F9 | | WildBattle | Flex: Pokémon; Flex: Level | Starts a wild battle against a Pokémon of level Level | | +| 00FA | | WildBattleNoButtons | Flex: Pokémon; Flex: Level | Starts a first wild battle against a Pokémon of level Level | The difference between this and other similar commands is that Bag, Run and Pokémon buttons are disabled. | +| 00FB | | CatchTutorial | \- | Starts the catch tutorial battle | | +| 00FC | | | | | | +| 00FD | | CheckSaveGame | Var: Variable | Stores 0 in Variable if a different savegame exists and it's not possible to save, stores 1 if no previous savegame exists, stores 2 if game has to save a lot of data and stores 3 if game can perform a quick save | | +| 00FE | | SaveGame \* | | | | +| 00FF | | CheckPortrait \* | | | | +| 0100 | | SetPortraitTitle \* | | | | +| 0101 | | | | | | +| 0102 | | | | | | +| 0103 | | | | | | +| 0104 | | | | | | +| 0105 | | | | | | +| 0106 | | | | | | +| 0107 | | | | | | +| 0108 | | | | | | +| 0109 | | | | | | +| 010A | | | | | | +| 010B | | | | | | +| 010C | | | | | | +| 010D | | | | | | +| 010E | | | | | | +| 010F | | | | | | +| 0110 | | | | | | +| 0111 | | | | | | +| 0112 | | | | | | +| 0113 | | MartScreen | Flex: Unused | Opens the common mart shopping screen | | +| 0114 | | SpMartScreen | Flex: Mart ID | Opens the Mart ID mart shopping screen | Used in the Departament Store for a shop with specific fixed items. At 0x48188 of arm9.bin (IPKS) is the pointer to the shops table, each entry of the table being a pointer to an item table. | +| 0115 | | GoodsMartScreen | Flex: Mart ID | Opens the Mart ID goods mart shopping screen | | +| 0116 | | SealMartScreen | Flex: Mart ID | Opens the Mart ID seal mart shopping screen | | +| 0117 | | DummyLostBattle | \- | Return to Pokémon Center or player's house after being defeated | Same code as LostBattle command. | +| 0118 | | SetLastWarp | Flex: Warp ID | Sets map's Warp ID warp as the last used warp | Supposed. This would affect actions like Escape Rope use. | +| 0119 | CheckGender | CheckPlayerGender | Var: Variable | Stores 0 in Variable if player is male, stores 1 if female | | +| 011A | HealPokemon | HealPokemon | \- | Heals every Pokémon in the player's party | That does not include the black fade nor the healing sound. | +| 011B | | EndWirelessComms \* | | | | +| 011C | | EnterBattleRoom \* | | | | +| 011D | | SetPlayerDirComm \* | | | | +| 011E | | UnionMapChange \* | | | | +| 011F | | UnionRoomSpriteScreen \* | | | | +| 0120 | | StoreUnionSprite \* | | | | +| 0121 | | SetUnionSprite \* | | | | +| 0122 | | CheckPokedex | Var: Variable | Stores 1 in Variable if player has the Pokédex, stores 0 otherwise | | +| 0123 | ActivatePokedex | GivePokedex | \- | Gives the Pokédex to the player | | +| 0124 | | CheckShoes | Var: Variable | Stores 1 in Variable if player has the running shoes, stores 0 otherwise | | +| 0125 | GiveRunningShoes | GiveShoes | \- | Gives the running shoes to the player | | +| 0126 | CheckBadge | CheckBadge | Flex: Badge ID; Var: Variable | Checks if player has Badge ID badge, stores result in Variable | | +| 0127 | EnableBadge | GiveBadge | Flex: Badge ID | Gives the player Badge ID badge | | +| 0128 | DisableBadge | CountBadges | Var: Variable | Stores in Variable the number of badges obtained | | +| 0129 | | DummyCheckBag | Var: Variable | Stores 1 in Variable if flag 0x960 is set, stores 0 otherwise | | +| 012A | | DummyGiveBag | \- | Sets flag 0x960 | | +| 012B | | CheckPartner | Var: Variable | Stores 1 in Variable if the following event flag is activated, stores 0 otherwise | | +| 012C | | SetPartner | \- | Activates the following event flag, so you can no longer use the bike, surf, rock climb... | | +| 012D | | ClearPartner | \- | Deactivates the following event flag, so you can use the bike, surf, rock climb... again | | +| 012E | | CheckStepFlag \* | | | | +| 012F | | SetStepFlag \* | | | | +| 0130 | | ClearStepFlag \* | | | | +| 0131 | | DummyCheckGameCompleted | Var: Variable | Stores 1 in Variable if flag 0x964 is set, stores 0 otherwise | This flag is not the one that HGSS uses when the player clears the game. | +| 0132 | | DummyGameCompleted | \- | Sets flag 0x964 | This flag is not the one that HGSS uses when the player clears the game. | +| 0133 | PrepareDoorAnimation | DoorAnimation | u16: Matrix X; u16: Matrix Y; Flex: Map X; Flex: Map Y; u8: Door ID | Prepares a building located at Map X and Map Y coordinates in a map located at Matrix X and Matrix Y in the current matrix for animation, with Door ID animation ID | | +| 0134 | CloseDoor | WaitDoor | u8: Door ID | Wait animation of building with Door ID animation ID | | +| 0135 | MoveDoor | FreeDoor | u8: Door ID | Free animation of building with Door ID animation ID | | +| 0136 | OpenDoor | OpenDoor | u8: Door ID | Triggers first animation of building with Door ID animation ID | | +| 0137 | WaitDoor | CloseDoor | u8: Door ID | Triggers second animation of building with Door ID animation ID | | +| 0138 | | GetDaycareNames | \- | Stores first daycare Pokémon nickname in string buffer 0, the second daycare Pokémon nickname in string buffer 1 and the first Pokémon trainer's name in buffer 2 | If there's only one Pokémon in the daycare, string buffer 1 does not change. If no Pokémon is in the daycare, commands does nothing. | +| 0139 | | GetDaycareStatus | Var: Variable | If daycare Pokémon have an egg, stores 1 in Variable. Otherwise it stores 0 if no Pokémon is in the daycare, 2 if only one Pokémon is in the daycare or 3 if there are two Pokémon | | +| 013A | | InitEcruteakGym \* | | | | +| 013B | | | | ??? Something to do with the Goldenrod Dept. Store Basement, probably moving around blocks or opening access to doors. | | +| 013C | | | | ??? | | +| 013D | | | | | | +| 013E | | CianwoodGymInit \* | | | | +| 013F | | CianwoodGymTurnWinch \* | | | | +| 0140 | | VermilionGymInit \* | | | | +| 0141 | VermillionGymAnimation | VermilionGymLockAction \* | | | | +| 0142 | VermillionGymBin | VermilionGymCanCheck \* | | | | +| 0143 | | ResetVermilionGymCans \* | | | | +| 0144 | | InitVioletGym | \- | Initializes Violet Gym internal data and 3D model animations | | +| 0145 | | VioletGymElevator | \- | Triggers model #111 to move up or down | | +| 0146 | | InitAzaleaGym \* | | | | +| 0147 | AzaleaGym | AzaleaGymSpinarak \* | | | | +| 0148 | AzaleaGym2 | AzaleaGymSwitch \* | | | | +| 0149 | | BlackthornGymInit \* | | | | +| 014A | | FuchsiaGymInit \* | | | | +| 014B | | ViridianGymInit \* | | | | +| 014C | CheckPartyNumber | GetPartyCount | Var: Variable | Stores in Variable the current number of Pokémon in the party | | +| 014D | | BagScreen \* | | | | +| 014E | | BagScreenSelection \* | | | | +| 014F | | CheckPocketItems \* | | | | +| 0150 | | DummyTextBerry \* | | | | +| 0151 | | TextNature? \* | | | | +| 0152 | | SetOWDefaultPosition | Flex: Event ID; Flex: X; Flex: Y | Sets Event ID spawn position to global coords X and Y | | +| 0153 | SetOverworldPosition | SetOWPosition | Flex: Event ID; Flex: X; Flex: Z; Flex: Y; Flex: Dir | Moves Event ID to global coords X, Y, Z with Dir direction | Even though some maps are higher, the Z parameter is often 0. Game seems to calculate the correct Z position if it is wrong. | +| 0154 | | SetOWDefaultMovement | Flex: Event ID; Flex: Movement ID | Sets Event ID's default move code to Movement ID | | +| 0155 | | SetOWDefaultDirection | Flex: Event ID; Flex: Direction ID | Sets Event ID's default direction to Direction ID | | +| 0156 | | SetWarpPosition | Flex: Warp ID; Flex: X; Flex: Y | Moves Warp ID to global coords X and Y | | +| 0157 | | SetSpawnablePosition | Flex: Spawnable ID; Flex: X; Flex: Y | Moves Spawnable ID to global coords X and Y | | +| 0158 | | SetOWDirection | Flex: Event ID; Flex: Direction ID | Sets Event ID's current direction to Direction ID | | +| 0159 | | AddWaitingIcon \* | | | | +| 015A | | RemoveWaitingIcon \* | | | | +| 015B | | ReturnScriptWkSet \* | | | | +| 015C | | WaitTimeOrAB | Flex: Time | Stops script execution until Time frames have passed or until user presses A or B buttons | | +| 015D | ChoosePokemonMenu | ChoosePKMNSelection \* | | | | +| 015E | ChoosePokemonMenu2 | UnionChoosePKMNSelection\* | | | | +| 015F | StorePokemonMenu | GetSelectedPartySlot | Var: Variable | Stores in Variable the selected party slot in a party Pokémon screen, or 0xFF is user cancelled the selection | | +| 0160 | | SelectMove \* | | | | +| 0161 | | GetMoveSelection \* | | | | +| 0162 | StorePokemonNumber | GetPartyPokemonID | Var: Party Position; Var: Variable | Stores in Variable the ID of the Pokémon at Party Position | It will return 0 if Pokémon is an egg. | +| 0163 | CheckIfPokemonTraded | CheckTradedPokemon | Var: Party Position; Var: Variable | Stores 0 in Variable if trainer ID and secret ID of the Pokémon at Party Position are the player's ones, stores 1 otherwise | | +| 0164 | | CountPartyBornPokemon | Var: Variable | Stores in Variable the number of Pokémon in the Pokémon party, excluding the eggs | | +| 0165 | | CountAlivePokemonExceptFirst | Var: Variable; Flex: Party Position | Stores in Variable how many alive Pokémon would remain in the Pokémon party if Pokémon at Party Position disappeared | Eggs are excluded from the count. | +| 0166 | | CountTotalAlivePokemon | Var: Variable | Stores in Variable the number of Pokémon in the Pokémon party and PC boxes, excluding the eggs and fainted Pokémon | As Pokémon can't be fainted in the PC boxes, only eggs are not taken into account in the PC boxes count. | +| 0167 | | CountPartyEggs | Var: Variable | Stores in Variable the number of eggs in the Pokémon party | | +| 0168 | | TakeMoneyFlex | Flex: Money | Subtracts Money from the player's money | | +| 0169 | | RetrieveDayCareMon \* | | | | +| 016A | | GiveLoanMon \* | | | | +| 016B | | CheckReturnLoanMon \* | | | | +| 016C | | DeletePartyPokemon | Flex: Party Position | Deletes the Pokémon at Party Position from the party | The Pokémon data is destroyed. | +| 016D | | RemoveDayCareEgg \* | | | | +| 016E | | GiveDayCareEgg \* | | | | +| 016F | | TextDayCareCost \* | | | | +| 0170 | CheckHiroMoneyNumber | CompareMoneyFlex | Var: Variable; Flex: Money | Returns 1 to Variable if the player has Money or more money, returns 0 otherwise | | +| 0171 | | EggHatchScreen | \- | Opens the egg hatching screen with an egg in the Pokémon party that has 0 steps left for hatching | This may crash if there's no ready egg in the Pokémon party. It's better not to use this command unless you know what are you doing. | +| 0172 | | | | | | +| 0173 | | CheckDaycareLevelGain \* | Var: Variable; Flex: Position | Stores the amount of levels a Pokémon in the Daycare has gained from being in the Daycare | | +| 0174 | | GetDayCareSpeciesandNick \* | | | | +| 0175 | | GiveDayCareMon \* | | | | +| 0176 | | UnvanishOverworld | Flex: Event ID | Makes Event ID visible again if it was invisible | Can be used on Following Pokémon. Useful for scripting events that happen as soon as the player walks into a buidling and their Following Pokémon hasn't spawned yet. The Following Pokémon will "unvanish" on the same tile as the player, so account for this in movement scripts. | +| 0177 | | VanishOverworld | Flex: Event ID | Makes Event ID invisible, but still collisionable | It's a great idea to use this command in a level script for blocking doors with invisible events. | +| 0178 | OpenMail | MailScreen | \- | Opens the mail screen | | +| 0179 | CheckMail | CountMail | Var: Variable | Stores in Variable the current amount of mails in the mailbox | | +| 017A | | RankingView \* | | | | +| 017B | | GetTimePeriod | Var: Variable | Stores in Variable the current time period of the day | The different values are:
0: From 04:00 AM to 09:59 AM (Morning)
1: From 10:00 AM to 04:59 PM (Noon)
2: From 05:00 PM to 07:59 PM (Evening)
3: From 08:00 PM to 11:59 PM (Night)
4: From 00:00 AM to 03:59 AM (Midnight) | +| 017C | | GetRandom | Var: Variable; Flex: Range | Generates a random number between 0 and Range \- 1, and stores it in Variable | | +| 017D | | DummyGetRandom | Var: Variable; Flex: Range | Generates a random number between 0 and Range \- 1, and stores it in Variable | Exactly the same code as the command above. | +| 017E | | GetPokemonHappiness | Var: Variable; Flex: Party Position | Stores in Variable the happiness of Pokémon in Party Position | | +| 017F | | AddHappiness | Flex: Happiness; Flex: Party Position | Adds Happiness to the happiness of Pokémon in Party Position | | +| 0180 | | SubHappiness | Flex: Happiness; Flex: Party Position | Subs Happiness to the happiness of Pokémon in Party Position | | +| 0181 | | TextDayCareMonStats \* | | | | +| 0182 | | GetPlayerDirection | Var: Variable | Stores in Variable the direction the player is looking at | Predicted. Seeing up gives 0, seeing down gives 1, seeing left gives 2 and seeing right gives 3. | +| 0183 | | GetDayCareMonCompatibility \* | | | | +| 0184 | | CheckDayCareEgg \* | | | | +| 0185 | | CheckBornPokemonInParty | Flex: Pokémon; Var: Variable | Stores 1 in Variable if Pokémon is currently in the Pokémon party, stores 0 otherwise | Eggs do not count as Pokémon, so they will be ignored. | +| 0186 | | CheckPokemonSizeRecord | Var: Variable; Flex: Party Position | Stores 0 in Variable if Pokémon at Party Position does not have a bigger relative size than player's record, stores 1 if it's the same size and stores 2 if it has a bigger relative size | | +| 0187 | | SetPokemonSizeRecord | Flex: Party Position | Stores the relative size of Pokémon at Party Position as player's record | | +| 0188 | ComparePokemonHeight | TextPartyPokemonSize | Flex: Integer String Buffer; Flex: Decimal String Buffer; Flex: Party Position | Stores the integer part of Pokémon at Party Position size in Integer String Buffer (1 to 3 digits) and the decimal part of the size in Decimal String Buffer (1 digit) | | +| 0189 | CheckPokemonHeight | TextPokemonRecordSize | Flex: Integer String Buffer; Flex: Decimal String Buffer; Flex: Pokémon ID | Stores the integer part of player's record size, normalized to Pokémon ID range, in Integer String Buffer (1 to 3 digits) and the decimal part of the size in Decimal String Buffer (1 digit) | | +| 018A | ChoosePokemonDelete | | | | | +| 018B | StoreDeleteMove | | | | | +| 018C | CheckMoveNumber | CountPokemonMoves | Var: Variable; Flex: Party Position | Stores in Variable the total amount of moves that the Pokémon at Party Position currently has | | +| 018D | DeleteMove | DeleteMove | Flex: Party Position; Flex: Move Slot | Deletes the move in Move Slot from the Pokémon at Party Position | | +| 018E | | GetPartyPokemonMove | Var: Variable; Flex: Party Position; Flex: Move Slot | Stores in Variable the ID of the move in Move Slot from the Pokémon at Party Position | | +| 018F | SetVariableDeleteMove | TextPartyPokemonMove | u8: String Buffer; Flex: Party Position; Flex: Move Slot | Stores the name of the move in Move Slot from the Pokémon at Party Position in String Buffer | | +| 0190 | | Strength | Command format depends on the first parameter:
u8: 0
u8: 1
u8: 2; Var: Variable | Function depends on the first parameter:
0: Disables Strength so player can no longer move boulders
1: Allows the player to automatically move Strength boulders
2: Checks if Strength is activated, store answer in Variable | | +| 0191 | | FlashAction \* | Command format depends on the first parameter:
u8: 0
u8: 1
u8: 2; Var: Variable | Function depends on the first parameter:
0: Clears the Flash system flag
1: Sets the Flash system flag
2: Checks if Flash is activated, store answer in Variable | | +| 0192 | | DefogAction \* | Command format depends on the first parameter:
u8: 0
u8: 1
u8: 2; Var: Variable | Function depends on the first parameter:
0: Clears the Defog system flag
1: Sets the Defog system flag
2: Checks if Defog is activated, store answer in Variable | | +| 0193 | | GiveAccessory \* | | | | +| 0194 | GiveItemStored | CheckGivenAccessory \* | | | | +| 0195 | | CheckAccessory \* | | | | +| 0196 | | GiveBGAccessory \* | | | | +| 0197 | | CheckBGAccessory \* | | | | +| 0198 | | | | | | +| 0199 | | | | | | +| 019A | | | | | | +| 019B | | | | | | +| 019C | | | | | | +| 019D | | | | | | +| 019E | | | | | | +| 019F | | | | | | +| 01A0 | | | | | | +| 01A1 | | | | | | +| 01A2 | | | | | | +| 01A3 | | | | | | +| 01A4 | | | | | | +| 01A5 | | | | | | +| 01A6 | | | | | | +| 01A7 | | CheckCompleteJohtoDex | Var: Variable | Stores 1 in Variable if every Pokémon in the Johto Pokédex has been seen, stores 0 otherwise | | +| 01A8 | | CheckCompleteNationalDex | Var: Variable | Stores 1 in Variable if every Pokémon in the National Pokédex has been caught, stores 0 otherwise | | +| 01A9 | | OpenPokedexScreen \* | | | | +| 01AA | | CheckPokemonMail \* | | | | +| 01AB | | | | | | +| 01AC | | TakePokemonMail \* | | | | +| 01AD | | CountFossils | Var: Variable | Stores in Variable the current amount of fossils in the bag | Technically it's the number of items in the bag whose ID is between 99 and 105. | +| 01AE | | PreparePokeGearCall | Var: ???; Var: ???; Var: ??? | | | +| 01AF | | StartPokeGearCall | \- | Starts the PokéGear phone call that was previously set. | | +| 01B0 | | CheckFossilPokemon | Var: Variable; Flex: Item ID | Stores in Variable the ID of the Pokémon to which Item ID fossil belongs | | +| 01B1 | | CheckFossil | Var: Position; Var: Item ID; Flex: Amount | Stores in Item ID the ID of the first fossil item in the bag that the player has at least Amount quantity of, and stores in Position the amount of fossils in the bag before the first fossil that met the quantity condition | Stores 0 in both variables if there's no fossil in the bag. | +| 01B2 | | CountPokemonUnderLevel | Var: Variable; Flex: Level | Stores in Variable the amount of Pokémon in party whose level is equal or lower than Level | Eggs are completely ignored. | +| 01B3 | | SurvivePoison | Var: Variable; Flex: Party Position | If Pokémon at Party Position is poisoned and at 1 HP, it cures the poison and stores 1 in Variable, otherwise it stores 0 | | +| 01B4 | | FinishOverworldScreen \* | | | | +| 01B5 | | DebugPoketch \* | | | | +| 01B6 | | MessageAllFromArchive \* | | | | +| 01B7 | | MessageFromArchive \* | | | | +| 01B8 | | MessageAllPutPMS \* | | | | +| 01B9 | | | | | | +| 01BA | | | | | | +| 01BB | | | | | | +| 01BC | | | | | | +| 01BD | | GetPreviousHeaderID | Var: Variable | Stores in Variable the header ID of the previous accessed map | | +| 01BE | | GetCurrentHeaderID | Var: Variable | Stores in Variable the header ID of the map the player is in | | +| 01BF | | SetSafariFlag | u8: Flag; u8: Mode | If Flag is 0 safari encounters are activated, if Flag is 1 safari encounters are deactivated, being the own safari encounters if Mode is 0 or using the Safari Zone link if 1 | | +| 01C0 | | BattleRoomWarp \* | | | | +| 01C1 | | ExitBattleRoom \* | | | | +| 01C2 | | GeonetScreen | \- | Opens the Geonet screen | | +| 01C3 | | | | | | +| 01C4 | | ShowPokemonPic | Flex: Pokémon; Flex: Gender | Opens a window with the picture of Pokémon with Gender gender and registers the Pokémon in the Pokédex as seen | 0 = Male or Genderless; 1 = Female | +| 01C5 | | HidePokemonPic | \- | Hides the window of a Pokémon picture | | +| 01C6 | | | | | | +| 01C7 | | | | | | +| 01C8 | | | | | | +| 01C9 | | GetPokemonNature \* | Var: Variable; Flex: Party Position | | | +| 01CA | | CheckPartyNature \* | Var: Variable; Flex: Nature ID | | | +| 01CB | | | | | | +| 01CC | | LoadPokegearData \* | | | | +| 01CD | | SetRebattleTrainerID \* | | | | +| 01CE | | SetRebattleGymLeaderID \* | | | | +| 01CF | | EnableMassOutbreaks \* | | | | +| 01D0 | | AddRoamingPokemon | u8: ID | Activates a roaming Pokemon depending on the ID | Uses ID to determine which roaming Pokémon must appear: 0 for Entei, 1 for Raikou, 2 for Latias and 3 for Latios. | +| 01D1 | | UnionGroup | Command format depends on the first parameter:
u16: 0; Flex: ID; Var: Variable
u16: 1; Flex: ID; Var: Variable
u16: 2; Flex: ID; Flex: String Buffer
u16: 3; Flex: ID; Flex: String Buffer
u16: 4; Var: Variable
u16: 5; Flex: ID
u16: 6
u16: 7; Var: Variable | Function depends on the first parameter:
0: Checks if group ID exists, returns answer in Variable
1: Checks if group ID is accesible, returns answer in Variable
2: Writes group ID name in String Buffer
3: Writes leader's name of Group ID in String Buffer
4: Opens keyboard, stores 1 in Variable if user cancels, 2 if group name already exists, 0 otherwise
5: Enter in group ID
6: Creates a group
7: ??? | This command is the devil. | +| 01D2 | | CheckEggMoves \* | | | | +| 01D3 | ChoosePokemonRem | RememberMoveScreen \* | | | | +| 01D4 | | TeachMovesScreen \* | | | | +| 01D5 | StoreMoveRem | ResponseTeachMove \* | | | | +| 01D6 | | InitTrade | u8: Trade ID | Initializes Trade ID trade data | | +| 01D7 | | GetOfferedPokemon | Var: Variable | Stores in Variable the ID of the offered Pokémon of the current trade data | | +| 01D8 | CheckPokemonTrade | GetRequestedPokemon | Var: Variable | Stores in Variable the ID of the requested Pokémon of the current trade data | | +| 01D9 | TradeChosenPokemon | TradePokemonScreen | Flex: Party Position | Opens the trade Pokémon screen, giving the Pokémon at Party Position and receiving the offered Pokémon of the current trade data | | +| 01DA | StopTrade | EndTrade | \- | Frees the current trade data from the memory | | +| 01DB | | DummyInternationalDex | \- | Nothing | | +| 01DC | | DummyDimorphismDex | \- | Nothing | In fact it does activate a dimorphism flag in the Pokédex data, but since the HGSS Pokédex has the gender comparision by default, command's actual purpose is not noticeable. | +| 01DD | | NationalDex | Command format depends on the first parameter:
u8: 1; Var: Unused
u8: 2; Var: Variable | Function depends on the first parameter:
1: Activates the National Pokédex mode
2: Stores 1 in Variable if player has the National Pokédex, otherwise it stores 0 | | +| 01DE | | CountPokemonRibbons | Var: Variable; Flex: Party Position | Stores in Variable the amount of ribbons that the Pokémon in Party Position has | | +| 01DF | | CountPartyRibbons | Var: Variable | Stores in Variable the total amount of different ribbons in the current Pokémon party | | +| 01E0 | CheckRibbon | CheckRibbon | Var: Variable; Flex: Party Position; Flex: Ribbon | Stores 1 in Variable if the Pokémon in Party Position has the Ribbon ribbon, stores 0 otherwise | | +| 01E1 | GiveRibbon | GiveRibbon | Flex: Party Position; Flex: Ribbon | Gives the Ribbon ribbon to Pokémon in Party Position | | +| 01E2 | | TextRibbon | u8: String Buffer; Flex: Ribbon | Stores the name of the Ribbon in String Buffer | | +| 01E3 | CheckPokemonRibbon | CountPokemonEVs | Var: Variable; Flex: Party Position | Stores in Variable the total amount of effort values of Pokémon in Party Position | Predicted. | +| 01E4 | | GetDayOfWeek | Var: Variable | Stores in Variable the current day of the week | Value 0 is the first possible value and it's for Sunday. | +| 01E5 | | ShowRulesList | Var: Variable | ??? | | +| 01E6 | RBattleRecorder | DummyGetPokemonFootprint | \- | Nothing | | +| 01E7 | | PCHealAnimation | Flex: PokéBalls | Triggers the Pokémon Center healing animation with PokéBalls number of player's Pokémon | | +| 01E8 | | ElevatorAnimation | Flex: Direction; Flex: Count | Triggers the animation of building #208 up (if Direction is 0) or down (if Direction is 1) Count consecutive times | | +| 01E9 | | MysteryGiftGive | Command format depends on the first parameter:
u16: 0
u16: 1; Var: Variable
u16: 2; Var: Variable
u16: 3; Var: Variable
u16: 4
u16: 5; Var: Text File; Var: Text Line
u16: 6; Var: Text File; Var: Text Line
u16: 7
u16: 8 | Function depends on the first parameter:
0: Initializes the data for receiving a Mystery Gift
1: Checks if there is a Mystery Gift, stores answer in Variable
2: Stores the Mystery Gift ID in Variable
3: Checks if player can receive the Mystery Gift, stores answer in Variable
4: Gives the Mystery Gift to the player
5: Shows the succeed text at Text File file and Text Line slot
6: Shows the unable text at Text File file and Text Line slot
7: Ends the Mystery Gift process
8: Saves data and ends the Mystery Gift process | This one too. | +| 01EA | | | | | | +| 01EB | | | | | | +| 01EC | | | | | | +| 01ED | | | | | | +| 01EE | | | | | | +| 01EF | CheckVersion | CheckVersion | Var: Variable | Returns 0x7 to Variable if game is HeartGold, 0x8 if SoulSilver | | +| 01F0 | | FirstPokemonInParty | Var: Variable | Stores in Variable the slot of the first Pokémon in the party that is not an egg | | +| 01F1 | | CheckPokemonType \* | | | | +| 01F2 | | FirstPrimoPassword \* | | | | +| 01F3 | | SecondPrimoPassword \* | | | | +| 01F4 | | PreparePCAnimation \* | | | | +| 01F5 | | OpenPCAnimation \* | | | | +| 01F6 | | ClosePCAnimation \* | | | | +| 01F7 | | GetLottoNumber | Var: Variable | Stores Lotto random number in Variable | Supposed by analogy with Platinum. | +| 01F8 | | CheckWinLotto | Var: MatchPos; Var: Digits; Var: PC; Flex: Winning Number | Takes a Winning Number as input and responds as follows.
If no matching Pokémon could be found or an error occurs:
MatchPos: 0; Digits: 0; PC: 0.

For all other cases:

If the matching Pokémon is in the Player's party, PC will be assigned 0.
Otherwise, if it's in the Player's Storage System, PC will be assigned 1.

MatchPos stores the zero-based position of the winning Pokémon (either as Party pos or Storage System pos, depending on the value of PC).

When there's a match, the Digits var is assigned the number of matching digits of the Winning Pokémon's PID.
In case of multiple matches, priority is always given to the one with the most matching digits. | Supposed by analogy with Platinum.

To retrieve the exact position of a winning Pokémon in the Storage System, first make sure PC equals 1.

The zero-based PC Page and Position indices can be calculated:

PC Page index = MatchPos / 30
Position in page = MatchPos % 30

where % is the modulo operator. | +| 01F9 | | InitLotto | \- | Generates two random numbers and assigns them to two system lottery variables. | Supposed by analogy with Platinum. | +| 01FA | | BufferBoxPokemonNick \* | | | | +| 01FB | CheckBoxesNumber | CountPCFreeSpace | Var: Variable | Stores in Variable the amount of free Pokémon slots in PC boxes | | +| 01FC | | PalParkControl \* | | | | +| 01FD | | PalParkDepositCountCheck \* | | | | +| 01FE | | PalParkBoxPokemonCaught \* | | | | +| 01FF | StoreFriendParkResult | PalParkScoreResult \* | | | | +| 0200 | | PlayerMovementSavingSet \* | | | | +| 0201 | | PlayerMovementSavingClear \* | | | | +| 0202 | | HallOfFameAnime \* | | | | +| 0203 | | AddTrainerScore \* | | | | +| 0204 | | TextAccessory | u8: String Buffer; Flex: Accesory | Stores Accesory's name in String Buffer | | +| 0205 | | CheckPokemonInParty | Flex: Pokémon; Var: Variable | Stores 1 in Variable if Pokémon (or its egg) is currently in the Pokémon party, stores 0 otherwise | | +| 0206 | | SetDeoxysForm | Flex: Form | Sets every Deoxys in the Pokémon party the Form form | Form 0 is Normal, form 1 is Attack, form 2 is Defense and form 3 is Speed. | +| 0207 | | CheckBurmyForms | Var: Variable | Stores in Variable the number of current different Burmy forms in the Pokémon party | Returns 0 if player has no Burmy in the party, 1 if only one different form, 2 if two different forms and 3 if has three or more Burmy with three different forms. | +| 0208 | | | \- | ??? | Sets a internal flag. | +| 0209 | | | \- | ??? | Resets a internal flag. | +| 020A | | GetHour | Var: Variable | Stores current hour from RTC in Variable | | +| 020B | | ShakeOverworld | Flex: Event ID; Flex: Count; Flex: Time; Flex: X; Flex: Y | Makes Event ID overworld shake Count times in Time frames, moving X horizontally and Y vertically each shake | Event ID must be released before this command in order to see the animation. | +| 020C | | BlinkOverworld | Flex: ???; Flex: ???; Flex: ???; Flex: ???; Flex: ??? | ??? | | +| 020D | | CheckRegis | Var: Variable | Stores 1 in Variable if player has the 3 Regis in the party, stores 0 otherwise | | +| 020E | | | | | | +| 020F | | MessageUnown | u16: Text Slot | Display line Text Slot from the text file with the Unown font | Predicted. | +| 0210 | | CheckGBACartidge | Var: Variable | Stores the current GBA cartridge ID in Variable | Stores 0 if no cartridge, 1 if Pokémon Sapphire, 2 if Pokémon Ruby, 3 if Pokémon Emerald, 4 if Pokémon FireRed and 5 if Pokémon LeafGreen. Somehow it could also set 7 if Pokémon Gold, 8 if Pokémon Silver, 10 if Pokémon Diamond, 11 if Pokémon Pearl, 12 if Pokémon Platinum and 15 if Pokémon Colosseum. | +| 0211 | | GetFirstAlivePokemonSlot | Var: Variable | Stores in Variable the slot of the first Pokémon in the party that is not an egg nor is fainted | Predicted. | +| 0212 | | SetMatrixAlternativeMap | Flex: Alternative ID; u8: Status | Permanently changes a worldmap matrix cell corresponding to Alternative ID if Status is 1, reverts the change if 0 | It only changes the map file value in the matrix, not the map header nor the map height. Seems that the only Alternative ID available values are 0 and 1, corresponding to Mahogany Town and to the Lake of Rage. | +| 0213 | | TextBackgroundName \* | | | | +| 0214 | | CheckCoinsImmediate \* | | | | +| 0215 | | CheckCoins \* | | | | +| 0216 | | AddCoins \* | | | | +| 0217 | | GetPokemonLevel | Var: Result; Flex: Party Slot | Stores into Result the level of the Pokémon at a given Party Slot. | | +| 0218 | | | | | | +| 0219 | | | | | | +| 021A | | | | | | +| 021B | | | | | | +| 021C | | | | | | +| 021D | | TextNumberSp | u8: String Buffer; Flex: Number; u8: Alignment Type; u8: Digits | Stores a Number in String Buffer with Alignment Type alignment and Digits length | Predicted. Alignment Type 0 is left-alignment, 1 is right alignment padded with spaces and 2 is right alignment padded with zeros. Digits is used only in these last two types. | +| 021E | | MonGetContestValue \* | | | | +| 021F | | CheckBirthday | Var: Variable | Stores 1 in Variable if the current day is the player's birthday, stores 0 otherwise | | +| 0220 | | MusicVolumeSet | Flex: Music ID; Flex: Volume | Identifies the BGM Player which is playing Music ID and sets its Volume | | +| 0221 | | CountSeenUnown | Var: Variable | Stores in Variable the number of different seen Unown forms | | +| 0222 | | | | | | +| 0223 | | | | | | +| 0224 | | | | | | +| 0225 | | | | | | +| 0226 | | CountHallOfFameEntries \* | | | | +| 0227 | | | | | | +| 0228 | | | | | | +| 0229 | | | | | | +| 022A | | | | | | +| 022B | | | | | | +| 022C | | | | | Related to move tutor? Possibly BP price check? | +| 022D | | CheckBattlePoints \* | | | | +| 022E | | GiveBP \* | | | | +| 022F | | TakeBP \* | | | | +| 0230 | | CompareBP \* | Flex: ???; Var: ??? | | | +| 0231 | | ShakeCamera | Flex: X Magnitude; Flex: Y Magnitude; Flex: Count; Flex: Time | Shakes the screen vertically and/or horizontally, moving the camera X Magnitude pixels horizontally and Y Magnitude pixels vertically in each shake, with Count total shakes of Time frames each one | Don't abuse this command, as it seems that camera might end up 1 pixel up or down in each animation, especially when Count is an odd number. | +| 0232 | | Battle2vs2 | Flex: Partner Trainer ID; Flex: Trainer 1 ID; Flex: Trainer 2 ID; u8: ??? | Starts a double battle with Partner Trainer ID versus Trainer 1 ID and Trainer 2 ID | Last parameter seems to always be 0x1. | +| 0233 | | | | | | +| 0234 | | | | | | +| 0235 | | | Var: ??? | ??? | | +| 0236 | ChoosePokemonMenuTrade | PartyPokemonTradeScreen | \- | Opens the party Pokémon screen for a trade | | +| 0237 | | GetDPPtPrizeItemIdAndCost \* | | | | +| 0238 | | | | | | +| 0239 | | | | | | +| 023A | | CheckCoinsVar \* | | | | +| 023B | | | | | | +| 023C | | GetUniqueSealsQuantity \* | | | | +| 023D | | DummyActivateMysteryGift \* | | | | +| 023E | | GetOWMovement \* | | | | +| 023F | | | | | | +| 0240 | | | | | | +| 0241 | | | | | | +| 0242 | | | | | | +| 0243 | | | | | | +| 0244 | | TextSealSingular \* | u8: String Buffer; Flex: Seal ID | Stores Seal's singular noun in String Buffer | International release exclusive(supposed). Text archive 15. | +| 0245 | | DummyLockAll \* | | | | +| 0246 | | | | | | +| 0247 | | | | | | +| 0248 | | PartyLegalCheck \* | var: Result | Checks legality of party, at least for WIFI stuff. If RESULT is 1, party check failed and you have an "illegal" mon | Used by the attendants in the PC to check your Pokemon before going into the Union Room, may be used elsewhere too | +| 0249 | | | | | | +| 024A | | | | | | +| 024B | | | \- | ??? | | +| 024C | | LastBattleCheckCaught \* | Var ??? | | | +| 024D | LegendaryBattle | WildBattleSp | Flex: Pokémon; Flex: Level; u8: Shiny Flag | Starts a wild battle against a Pokémon of level Level, and shiny if Shiny Flag is 1 | | +| 024E | | CheckTrainerCardLevel | Var: Variable | Stores in Variable the current trainer card level | | +| 024F | | DummyRideBike | \- | Nothing | Seems to allocate the bike music in the RAM but doesn't play it. | +| 0250 | | | | | | +| 0251 | | ShowSaveBox | \- | Displays the save data box (current map name, player's name, the amount of badges, the Pokédex counter and the play time) | | +| 0252 | | HideSaveBox | \- | Hides the save data box | | +| 0253 | | ScopeMode | u8: Mode | If Mode is 1, activates the scope mode, otherwise the command deactivates the scope mode | The scope mode prevents the game to do certain actions (like reseting system flags) when changing map, and probably it's related with more things. | +| 0254 | | GetFollowingPokeSize | Var: Variable | Stores 0 in Variable if the current following Pokémon is small and can follow the player indoors, stores 1 if it's big and can't follow the player indoors | In fact it returns the second byte of the following Pokémon data files, stored in a/1/4/1.narc, which is the one that the game reads for allowing Pokémon entering in buildings. This command will work even if a SendBackFollowingPoke is used and the following Pokémon is hidden at that moment. | +| 0255 | | | \- | ??? | Draws a heart icon above the following Pokémon. Maybe a dummy command? | +| 0256 | | | u16: ??? | ??? | Parameter must be 1 or 2, otherwise command won't do anything. Seems to trigger a default movement for switching current player's and following Pokémon positions (for example, when using a HM). | +| 0257 | | FollowingPokePCAnimation | \- | Triggers the animation of sending the current following Pokémon back to its PokéBall over the Pokémon Center healing counter | | +| 0258 | StartFriendPark | SendBackFollowingPoke | \- | Triggers the animation of sending the current following Pokémon back to its PokéBall and deactivates the following Pokémon until the game is reset or a warp is used | | +| 0259 | | FollowingPokeFacePlayer | \- | Makes the invoking event look at the player, but with a size limitation | When the following Pokemon has a big size, it won't turn to the player if there is an overworld on the opposite side so it would collide. The checked flag is the second byte of the Parameter 1 field, which could be called "double size overworlds" flag, as it is also used for drawing two grass patches in the tall grass for the following Pokemon. | +| 025A | | LockFollowingPoke | u16: Operation | Releases the following Pokemon animation if Operation is 0, locks the animation otherwise | Predicted comparing ASM with Lock and Release commands. | +| 025B | | WaitFollowingPoke | \- | Waits the following Pokemon to end its last movement | Predicted comparing ASM with Lock and Release commands. | +| 025C | | SetFollowingPokeMovement | u16: Move Code | Changes the following Pokemon default movement to Move Code | The most important movement IDs are 0x30 and 0x38 (following and ghost-following behaviours respectively). | +| 025D | | SetFollowingPokePosition | u8: Position; u8: Direction | Moves the following Pokémon to one tile Position next to player and facing at Direction | For both parameters, up is 0, down is 1, left is 2 and right is 3. | +| 025E | EndFriendPark | BallResetFollowingPoke | \- | Moves the following Pokémon to the current player's position, and triggers the animation of sending the Pokémon out of its PokéBall after the player walks a step | This is commonly used after a different event following the player, so the player sends out the following Pokémon in the next step (instead of forcing it automatically with SendOutFollowingPoke). | +| 025F | | NoBallResetFollowingPoke | \- | Moves the following Pokémon to the current player's position | Almost same as BallResetFollowingPoke, but without the PokéBall animation (exactly like when a small Pokémon spawns after the player uses a warp). | +| 0260 | | SendOutFollowingPoke | \- | Triggers the animation of sending the first non-fainted Pokémon out of its PokéBall and spawns it on the last player position | Seems to be needed for refreshing/forcing its apparition after a Warp on the same map. | +| 0261 | MecScript | | \- | ??? | It's used in a lot of scripts that involve following Pokémon movements, placed at the top of them. Seems that it resets a lot of following Pokémon movement parameters and data. | +| 0262 | | | | | | +| 0263 | | Pokeathlon \* | | | | +| 0264 | | | | | | +| 0265 | | GetPokegearContactRandomGiftBerry \* | | | | +| 0266 | | GetPokegearContactGiftItem \* | | | | +| 0267 | MakePhoto | CameronPhotoScreen \* | | | | +| 0268 | | | | | | +| 0269 | | | | | | +| 026A | CheckAlbumPhoto | CheckAlbumIfFull \* | | | | +| 026B | | CheckRocketCostume \* | | | | +| 026C | | ActivateRocketCostume \* | | | | +| 026D | | | | | | +| 026E | | GetOWDirection | u16: Event ID; Var: Variable | Stores in Variable the current direction which Event ID is facing | Up is 0, Down is 1, Left is 2 and Right is 3. | +| 026F | | ApricornTreeAnimation \* | | | | +| 0270 | | ApricornTreeGetApricorn \* | | | | +| 0271 | | GiveApricornFromTree \* | | | | +| 0272 | | TextApricornName \* | | | | +| 0273 | | | | | | +| 0274 | | | | | | +| 0275 | | | | | | +| 0276 | | | | | | +| 0277 | | | | | | +| 0278 | | CountPartyMonsOfSpecies \* | | | | +| 0279 | | | | | | +| 027A | | | | | | +| 027B | | | | | | +| 027C | | | | | | +| 027D | | | | | | +| 027E | | | | | | +| 027F | | | | | | +| 0280 | | | | | | +| 0281 | | SaveWipeExtraChunks \* | | | | +| 0282 | | | Var: Variable | ??? | | +| 0283 | | | | | | +| 0284 | | | | | | +| 0285 | | | | | | +| 0286 | | | | | | +| 0287 | | GetPartySlotWithSpecies \* | var: Slot; u16 or Flex(???): Pokemon ID | Checks party for the presence of a Pokemon, and returns which slot they are in. | Assume that it checks for the first instance and then stops, so if you have multiple of the same Pokemon, it stops at the first instance and returns which slot it is in (0-5). Used in Silph Co. for Rotom | +| 0288 | | | | | | +| 0289 | | OpenScratchCardScreen \* | | | | +| 028A | | CloseScratchCard \* | | | | +| 028B | | GetScratchCardPrize \* | | | | +| 028C | | | | | | +| 028D | | MoveTutorChooseMove \* | | | | +| 028E | | TutorMoveTeachInSlot \* | | | | +| 028F | | TutorMoveGetPrice \* | | | | +| 0290 | | CheckHeadbuttCompatibility | Flex: Party Slot; Var: Variable | Stores 1 into Variable if the Pokémon at the given Party Slot can learn Headbutt. | Ilex Forest Tutor: Script File 92, Script 3 | +| 0291 | | IVCheckerJudge \* | | | | +| 0292 | | BufferStatName \* | | | | +| 0293 | | SetMonForme \* | | | | +| 0294 | | TextTrainerName \* | | | | +| 0295 | | | | | | +| 0296 | | | | | | +| 0297 | | | | | | +| 0298 | | | | | | +| 0299 | | | | | | +| 029A | | | | | | +| 029B | | | | | | +| 029C | | TextTypeName \* | | | | +| 029D | | GetItemQuantity \* | | | | +| 029E | | GetHiddenPowerType \* | | | | +| 029F | | SetFavoriteMon \* | | | | +| 02A0 | | GetFavoriteMon \* | | | | +| 02A1 | | GetOwnedRotomFormes \* | | | | +| 02A2 | | CountTranformedRotomsInParty \* | | | | +| 02A3 | | UpdateRotomForme \* | | | | +| 02A4 | | GetPartyPokemonForm \* | | | | +| 02A5 | | | | | | +| 02A6 | | | | | | +| 02A7 | | | | | | +| 02A8 | | | | | | +| 02A9 | | | | | | +| 02AA | | | | | | +| 02AB | | | | | | +| 02AC | | GetCurrentWeather | Var: Variable | Stores the current weather in Variable | | +| 02AD | | GetPlayerCoordinates \* | | | | +| 02AE | | | | | | +| 02AF | | | | | | +| 02B0 | | CheckFatefulEncounter \* | | | | +| 02B1 | | CommSanitizeParty \* | | | | +| 02B2 | | DayCareSanitizeMon \* | | | | +| 02B3 | | | | | | +| 02B4 | | TextBattleHallStreak \* | | | | +| 02B5 | | BattleHallCountUsedSpecies \* | | | | +| 02B6 | | BattleHallGetTotalStreak \* | | | | +| 02B7 | | | | | | +| 02B8 | | | | | | +| 02B9 | | | | | | +| 02BA | | FollowingPokemonIsEventTrigger \* | | | | +| 02BB | | | | | | +| 02BC | CheckWildBattle2 | | | | | +| 02BD | WildBattle2 | PokemonHasItem \* | | | | +| 02BE | | BattleTowerSetUpMultiBattle \* | | | | +| 02BF | | SetPlayerVolume \* | | | | +| 02C0 | | | | | | +| 02C1 | | | | | | +| 02C2 | | | | | | +| 02C3 | | CheckPokemonIsSeen \* | | | | +| 02C4 | | FloorTrapAnimation | | Triggers Team Rocket HQ trap-floor's graphical effect in the player's current position | | +| 02C5 | | | | | | +| 02C6 | | | | | | +| 02C7 | | TalkFollowingPoke | \- | The following Pokémon triggers a random movement, and then a random following message | This seems to be the command that executes when the player talks to the following Pokémon (at script #163). Files in a/2/2/0.narc link map names to possible texts. The following Pokémon ends up locked, so a Release should be used after this command. | +| 02C8 | | | | | | +| 02C9 | | OpenAlphPuzzle \* | u8: Puzzle ID | Loads the stone-panel puzzle of Puzzle ID. | ID 0 = Kabuto, ID 1 = Aerodactyl, ID 2 = Omanyte, ID 3 = Ho-Oh
Appears to check Flag 2423, 2424, 2425, 2426 for the completion of puzzles 0 to 3 respectively. | +| 02CA | | OpenRuinsofAlphHiddenRoom \* | u8: Room ID | Something to do with the secret room, not the puzzle trapdoor. | ID 0 = Kabuto Room, ID 1 = Aerodactyl Room, ID 2 = Omanyte Room, ID 3 = Ho-Oh Room | +| 02CB | | UpdateDayCareMonOverworlds \* | | | | +| 02CC | | | | | | +| 02CD | | | | | | +| 02CE | | | | | | +| 02CF | | | | | | +| 02D0 | | | | | | +| 02D1 | | | | | | +| 02D2 | | | u8: ???; u8: ???; u16: ???; u16: ???; u16: ??? | ??? | | +| 02D3 | | BoatAnimation | u8: Animation; u8: ???; u16: Header; u16: X coord; u16: Y coord | Plays the S.S. Aqua animation of leaving the port. Animation is either 0 or 1, with 0 being Olivine and 1 being Vermilion. X and Y coordinates are for the destination map | | +| 02D4 | | | | | | +| 02D5 | | | | | | +| 02D6 | | | | | | +| 02D7 | | | Var: Variable | ??? | | +| 02D8 | | | u8: ???; u8: ??? | ??? | | +| 02D9 | | CheckAlivePokemon | Var: Variable | Checks if player has at least 1 not fainted Pokémon, stores the result in Variable | Predicted. | +| 02DA | | CheckFollowingPoke | Var: Variable | Checks if player has a following Pokémon, stores the result in Variable | Supposed. | +| 02DB | | | \- | ??? | | +| 02DC | | | u8: ??? | ??? | | +| 02DD | | | u8: ???; Var: ??? | ??? | | +| 02DE | | | | | | +| 02DF | | CheckKurtApricorn \* | | | If not 0, script continues to check if daily flag is reset, then gives you the apricorns | +| 02E0 | | ClearKurtApricorn \* | | | | +| 02E1 | | GiveApricornBalls \* | | | | +| 02E2 | | CheckApricornCount \* | | | | +| 02E3 | | KurtApricornMenuScreen \* | | | | +| 02E4 | | StoreApricornJuice \* | | | | +| 02E5 | | CheckJuice \* | | | | +| 02E6 | | | | | | +| 02E7 | | | | | | +| 02E8 | | CreatePokeathlonFriendshipRoomStatues \* | | | | +| 02E9 | | TextPokeathlonCourseName \* | | | | +| 02EA | OpenLowScreen | OpenTouchScreen | \- | Changes the low screen design to the green Pokéball background | | +| 02EB | CloseLowScreen | CloseTouchScreen | \- | Sets the default low screen design | | +| 02EC | OpenLowYesNoBox | YesNoTouchScreen | Var: Variable | Opens a Yes-No selection, stores player's answer in Variable | Crashes if OpenTouchScreen is not used previously. | +| 02ED | Multi4 | MultiTouchStandardText | u8: ???; u8: ???; u8: ???; u8: ???; Var: Selection | Prepares a multiple selection menu with text bank #191, returns selected slot ID in Selection | | +| 02EE | Multi5 | MultiTouchLocalText | u8: ???; u8: ???; u8: ???; u8: ???; Var: Selection | Prepares a multiple selection menu with local texts, returns selected slot ID in Selection | | +| 02EF | TextScriptMulti4 | CreateMultiTouchBox | Flex: Text Slot; Flex: Top Screen Text;
Flex: Multi Box Slot | Adds a box with Multi Box Slot ID showing Text Slot text on the bottom screen and Top Screen Text on the top in a message box. Text depends on whether you use MultiTouchStandardText or MultiTouchLocalText | | +| 02F0 | CloseMulti4 | CloseMultiTouch | \- | Closes the multiple selection boxes | | +| 02F1 | | RockSmashItemCheck \* | Flex: ???; Var: ???; Var: ??? | ??? | | +| 02F2 | | | Var: ??? | ??? | | +| 02F3 | | | | | | +| 02F4 | | | | | | +| 02F5 | | | | | | +| 02F6 | | | | | | +| 02F7 | | | | | | +| 02F8 | | | | | | +| 02F9 | | | | | | +| 02FA | | | | | | +| 02FB | | | | | | +| 02FC | | | | | | +| 02FD | | | | | | +| 02FE | | | | | | +| 02FF | | | \- | ??? | | +| 0300 | | | | | | +| 0301 | | | | | | +| 0302 | | | | | | +| 0303 | | | | | | +| 0304 | | | | | | +| 0305 | | RenderCutscene \* | ???: ??? | Renders a cutscene
2 = Arceus stock image cutscene | | +| 0306 | | | | | | +| 0307 | | | | | | +| 0308 | | GiveTogepiEgg \* | | | | +| 0309 | | | | | | +| 030A | | GiveSpikyEaredPichu \* | \- | ??? | | +| 030B | | | | | | +| 030C | | OpenVoltorbFlip \* | | | | +| 030D | | KenyaCheckPartyOrMailbox \* | | | | +| 030E | | MartSell \* | \- | ??? | Related with the mart interface. | +| 030F | | SetFollowPokeInhibitState \* | | | | +| 0310 | | ScriptOverlayCmd \* | | | | +| 0311 | | BugContestAction \* | | | | +| 0312 | | TextBugContestWinner \* | | | | +| 0313 | | JudgeBugContest \* | | | | +| 0314 | | TextBugContestMonNick \* | | | | +| 0315 | | BugContestGetTimeLeft \* | | | | +| 0316 | | IsBugContestantRegistered \* | | | | +| 0317 | | | | | | +| 0318 | | | | | | +| 0319 | TakeMomMoney | TakeMomMoney \* | | | | +| 031A | GiveMomMoney | CheckMomMoneyBalance \* | | | | +| 031B | OpenMomMoneyBox | ShowMomMoney | Flex: X; Flex: Y | Shows mom savings money box at X and Y coordinates of the screen | | +| 031C | CloseMomMoneyBox | HideMomMoney | \- | Hides mom savings money box | | +| 031D | | | | | | +| 031E | | TextRulesetName \* | | | | +| 031F | | | | | | +| 0320 | | | | | | +| 0321 | | | | | | +| 0322 | | | | | | +| 0323 | | | | | | +| 0324 | | UpdateTownMap \* | u8(?): Map Type | Updates the town map to include Kanto
1 = Normal, Johto-only view
2 = Whole map, Kanto included | | +| 0325 | | | | | | +| 0326 | | | | | | +| 0327 | | | | | | +| 0328 | | | | | | +| 0329 | | | | | | +| 032A | | CelebiTimeTravelAnimation \* | | | | +| 032B | | | | | | +| 032C | | | | | | +| 032D | | MomGiftCheck \* | | | | +| 032E | | | | | | +| 032F | | | | | | +| 0330 | | UnownCircle \* | | | | +| 0331 | | | | | | +| 0332 | | InitMystriStageAnimation \* | | | | +| 0333 | | | | | | +| 0334 | | | | | | +| 0335 | | GetBuenasPassword \* | | | | +| 0336 | | | | | | +| 0337 | | | | | | +| 0338 | | | | | | +| 0339 | | GetShinyLeafCount \* | | | | +| 033A | | TryGiveShinyLeafCrown \* | | | | +| 033B | | CheckPokemonNickname \* | Flex: Party Slot; Var: Variable | Checks to see if the Pokémon at Party Slot position has a nickname. The variable will return 0 if the Pokémon does have a nickname. | Example: Script File 913, Function 35 | +| 033C | | | | | | +| 033D | | | Var: ??? | ??? | | +| 033E | | | | | | +| 033F | | | | | | +| 0340 | | | | | | +| 0341 | | | | | | +| 0342 | | | Var: Variable | ??? | | +| 0343 | | | Var: Variable | ??? | | +| 0344 | | CheckJadeOrbRequirements | Var: Variable | Stores 1 in Variable if player has both Kyogre and Groudon in the Pokémon party and they have been caught in Johto, stores 0 otherwise | | +| 0345 | | | Var: Variable | ??? | | +| 0346 | CheckMomMoneyNumber | CheckMoneyFull | u16: Money Account; Var: Variable | Stores 1 in Variable if the chosen money account is full.
Money account 0 = Mom's savings;
Money account 1 = Player; | | +| 0347 | | SystemSetSleepFlag \* | | | | +| 0348 | | | | | | +| 0349 | | | | | | +| 034A | | | | | | +| 034B | | TextItemLowercase | u8: String Buffer; Flex: Item | Stores Item's lowercase name in String Buffer | International release exclusive. | +| 034C | | TextItemPlural | u8: String Buffer; Flex: Item | Stores Item's plural noun in String Buffer | International release exclusive. | +| 034D | | TextPartyPokemonDefault | u8: String Buffer; Flex: Party position | Stores the name of the Pokémon in Party Position in String Buffer with default color tags encoding | International release exclusive. Names stored at text file 238. | +| 034E | | | | | International release exclusive. | +| 034F | | | u8: String Buffer | ??? | International release exclusive. | +| 0350 | | | u8: String Buffer; Flex: Accesory | ??? | International release exclusive. | +| 0351 | | TextTrainerClass | u8: String Buffer; Flex: Trainer class | Stores Trainer class' lowercase noun in String Buffer | International release exclusive. | +| 0352 | | TextSealPlural | u8: String Buffer; Flex: Seal | Stores Seal's plural noun in String Buffer | International release exclusive. Text archive 16. | +| 0353 | | TextCapitalize | u8: String Buffer | Capitalizes the string currently stored in String Buffer | International release exclusive. | +| 0354 | | TextFloor | u8: String Buffer; u8: Floor | Stores Floor's name in String Buffer | International release exclusive. Names stored at text file 191, lines 0x74 to 0x7A. | \ No newline at end of file From b770f6785919d1a2f0bc6ef432b8bca630a79849 Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Sun, 3 Mar 2024 20:57:30 +0100 Subject: [PATCH 10/40] Better? --- DS_Map/Resources/HGSSCommands.md | 1712 +++++++++++++++--------------- 1 file changed, 855 insertions(+), 857 deletions(-) diff --git a/DS_Map/Resources/HGSSCommands.md b/DS_Map/Resources/HGSSCommands.md index 005f04f..e597fe1 100644 --- a/DS_Map/Resources/HGSSCommands.md +++ b/DS_Map/Resources/HGSSCommands.md @@ -1,857 +1,855 @@ - Outer pipes Cell padding -No sorting -| | SDSME names | New proposed names | Parameters | Function | Notes | -| ---- | -------------------------- | ---------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| 0000 | Nop | Nop | \- | Nothing | | -| 0001 | Nop1 | Dummy | \- | Nothing | Has exactly the same ASM code as Nop. | -| 0002 | End | End | \- | End script execution | | -| 0003 | Return2 | WaitTime | u16: Time; Var: ??? | Stop script execution for Time frames | The Var's purpose is unknown. Command uses ScrReg 0 as countdown. | -| 0004 | | RegValueSet | u8: Script Register; u8: Value | Assigns Value to Script Register value | | -| 0005 | | RegDataSet | u8: Script Register; u32: Value | Assigns Value to Script Register value | | -| 0006 | | RegAdrsSet | u8: Script Register; u32: Address | Assigns data in Address offset to Script Register value | | -| 0007 | | AdrsValueSet | u32: Address; u8: Value | Assigns Value to the Address offset | | -| 0008 | | AdrsRegSet | u32: Address; u8: Script Register | Assigns Script Register value to the Address offset | | -| 0009 | | RegRegSet | u8: Script Register 1; u8: Script Register 2 | Assigns Script Register 2 value to Script Register 1 value | | -| 000A | | AdrsAdrsSet | u32: Address 1; u32: Address 2 | Assigns data in Address 2 to the Address 1 offset | | -| 000B | | CompareRegs | u8: Script Register; u8: Script Register | Compares two Script Register | | -| 000C | | CompareRegValue | u8: Script Register; u8: Value | Compares Script Register value with Value | | -| 000D | | CompareRegAdrs | u8: Script Register; u32: Address | Compares Script Register value with data in Address | | -| 000E | | CompareAdrsReg | u32: Address; u8: Script Register | Compares data in Address with Script Register value | | -| 000F | | CompareAdrsValue | u32: Address; u8: Value | Compares data in Address with Value | | -| 0010 | | CompareAdrsAdrs | u32: Address 1; u32: Address 2 | Compares data in Address 1 with data in Address 2 | | -| 0011 | If | CompareVarValue | Var: Variable; u16: Value | Compares Variable value with Value | | -| 0012 | If2 | CompareVars | Var: Variable 1; Var: Variable 2 | Compares Variable 1 value with Variable 2 value | | -| 0013 | | ParallelCommonScript | u16: ??? | ??? | Somehow related with parallel common script execution. | -| 0014 | CallStandard | CommonScript | u16: Global Script ID | Calls Global Script ID script | The Common Script table is located at 0xFA48C in IPKS arm9.bin, ordered from highest to lowest with structure: u16 Global Script ID | u16 Script file | u16 Text file. The executed script inside script file is determined as: used Global Script ID \- tabulated Global Script ID. | -| 0015 | | LocalScript | \- | Returns to the invoking script/function after a Common Script | | -| 0016 | Jump | Jump | u32: Relative Jump | Jumps to a function, Relative Jump bytes forward or backward | Relative Jump can have negative values (backward jump). | -| 0017 | | JumpIfObjID | u8: Event ID; u32: Relative Jump | Jumps to a function, Relative Jump bytes forward or backward, if invoking event has Event ID as ID | | -| 0018 | | JumpIfBgID | u8: ???; u32: Relative Jump | ??? | Maybe jumps to a function if invoking event has a specific ID. | -| 0019 | | JumpIfPlayerDir | u8: Player Direction; u32: Relative Jump | Jumps to a function, Relative Jump bytes forward or backward, if player is looking in Player Direction | Supposed. Needs to be tested in game. | -| 001A | Call | Call | u32: Relative Jump | Calls a function, Relative Jump bytes forward or backward | Can be used to make loops when calling the own invoking function. | -| 001B | Return | Return | \- | Returns to the invoking script/function after a Call | | -| 001C | CompareLastResultJump | JumpIf | u8: Condition; u32: Relative Jump | If Condition in the condition table, jumps to a function | Ask AdAstra for the condition list. Condition table is updated after a IfVarValue, IfVarVar, CheckFlag... | -| 001D | CompareLastResultCall | CallIf | u8: Condition; u32: Relative Jump | If Condition in the condition table, calls a function | | -| 001E | SetFlag | SetFlag | u16: Flag | Sets Flag to 1 | | -| 001F | ClearFlag | ClearFlag | u16: Flag | Sets Flag to 0 | | -| 0020 | CheckFlag | CheckFlag | u16: Flag | Checks if Flag is set | It updates the internal condition flag and maybe part of the condition table. | -| 0021 | | SetFlagFromVar | Var: Flag | Sets the flag whose ID is stored in Flag | | -| 0022 | | ClearFlagFromVar | Var: Flag | Clears the flag whose ID is stored in Flag | | -| 0023 | | FlagStatusToVar | Var: Flag; Var: Variable | Checks if Flag is set and store the result in Variable | | -| 0024 | | SetTrainerFlag | Flex: Trainer ID | Sets the flag of Trainer ID, so marks it as beaten trainer | So this trainer will not battle against you. Used in every Gym after the leader is beaten. | -| 0025 | | ClearTrainerFlag | Flex: Trainer ID | Clears the flag of Trainer ID, so marks it as unbeaten trainer | So this trainer can be challenged again. | -| 0026 | | CheckTrainerFlag | Flex: Trainer ID | Checks if Trainer ID has been beaten | It updates the internal condition flag and maybe part of the condition table. | -| 0027 | Copy | IncrementVar | Var: Variable; Flex: Operand | Stores the operation Variable \+ Operand in Variable | | -| 0028 | | DecrementVar | Var: Variable; Flex: Operand | Stores the operation Variable \- Operand in Variable | | -| 0029 | SetVar | SetVar | Var: Variable; u16: Value | Stores Value in Variable | | -| 002A | CopyVar | SetVarFromVariable | Var: Variable 1; Var: Variable 2 | Assigns value of Variable 2 to Variable 1 | | -| 002B | | SetVarFromFlexible | Var: Variable; Flex: Flexible Value | Stores Flexible Value (or its value if variable) in Variable | | -| 002C | | MessageAll | u8: Text Slot | Display line Text Slot from the text file, all at once | | -| 002D | Message | Message | u8: Text Slot | Display line Text Slot from the text file | | -| 002E | Message2 | MessageFlex | Flex: Text Slot | Display line Text Slot from the text file | Unlike 002D, this command also accepts a variable as the input field. | -| 002F | | MessageNoSkip | Flex: Text Slot | ??? | | -| 0030 | | | u8: Text Slot | ??? | | -| 0031 | | WaitAB | \- | Waits for button A or button B to be pressed | Somehow it uses ScrReg 0 as countdown. | -| 0032 | WaitButton | WaitButton | \- | Waits for a button to be pressed | It seems only A, B, X and direction pad buttons work. | -| 0033 | | WaitABPad | \- | Waits for button A, button B or pad buttons to be pressed | Supposed. Needs to be tested in game. | -| 0034 | | OpenMessage | \- | ??? | | -| 0035 | CloseMessageOnKeyPress | CloseMessage | \- | Closes message box | SDSME name is misleading, for no button is needed to be pressed. | -| 0036 | FreezeMessageBox | FreezeMessage | \- | ??? | Probably keeps the message box alive after a script. ASM differs with CloseMessage only in a BL instruction. | -| 0037 | CallMessageBox | SetIconBoard | u8: Text Slot; u8: Type; u16: Icon; u16: ??? | Prepares an icon board message box displaying Text Slot message, of Type type, and with Icon image if chosen type supports it | Type values from 0 to 3 are: brown (with icon), green (with icon), gray and blue. | -| 0038 | ColorMessageBox | SetTextBoard | u8: Type; u16: Icon | Prepares a text board message box of Type type, and with Icon image if chosen type supports it | Type values from 0 to 3 are: brown (with icon), green (with icon), gray and blue. | -| 0039 | TypeMessageBox | ShowBoard | u8: Process | Triggers different Process processes for the board | Process value 0 keeps the board, value 1 creates the board, value 2 hides the board, value 3 shows the board and value 4 deletes the board. | -| 003A | NoMapMessageBox | WaitBoard | \- | Waits the board last process to end | Supposed. | -| 003B | | BoardMessage | u8: Text Slot; u16: Variable | Displays Text Slot message in the current text box, stores the current text box status in Variable | | -| 003C | | CloseBoard | Var: Variable | Returns 1 to Variable if the player has pressed a button so the board must close, 0 otherwise | Variable is stored in ScrReg 0. Command waits for a button to be pressed and stores result in Variable. | -| 003D | | Menu | \- | | | -| 003E | | | u8: ???; u8: ???; u8: ???; u8: ???; u8: ???; u8: ??? | | | -| 003F | | YesNoBox | Var: Variable | Opens a Yes-No dialog and stores user response in Variable | Variable is stored in ScrReg 0. | -| 0040 | Multi | MultiStandardText | u8: X; u8: Y; u8: Cursor; u8: Cancel; Var: Selection | Prepares a multiple selection menu at X and Y screen position, with Cursor default selected option and possibility of cancelling depending on Cancel, with text bank #321, returns selected slot ID in Selection | If Cancel is 1, the user can select the last option by pressing B button. | -| 0041 | Multi2 | MultiLocalText | u8: X; u8: Y; u8: Cursor; u8: Cancel; Var: Selection | Prepares a multiple selection menu at X and Y screen position, with Cursor default selected option and possibility of cancelling depending on Cancel, with local texts, returns selected slot ID in Selection | If Cancel is 1, the user can select the last option by pressing B button. | -| 0042 | TextScriptMulti | AddMultiOption | u8: Text Slot; u8: Multi Slot | Adds an option with Multi Slot ID showing Text Slot text | | -| 0043 | CloseMulti | ShowMulti | \- | Shows the prepared multi in screen | The game will hide it when the player has selected an option. | -| 0044 | Multi3 | ListStandardText | u8: X; u8: Y; u8: Cursor; u8: Cancel; Var: Selection | Prepares a multiple selection list at X and Y screen position, with Cursor default selected option and possibility of cancelling depending on Cancel, with text bank #321, returns selected slot ID in Selection | If Cancel is 1, the user can select the last option by pressing B button. The difference between a Multi and a List seems to be that lists are scrollable. | -| 0045 | | ListLocalText | u8: X; u8: Y; u8: Cursor; u8: Cancel; Var: Selection | Prepares a multiple selection list at X and Y screen position, with Cursor default selected option and possibility of cancelling depending on Cancel, with local texts, returns selected slot ID in Selection | If Cancel is 1, the user can select the last option by pressing B button. The difference between a Multi and a List seems to be that lists are scrollable. | -| 0046 | | AddListOption | Flex: Option MSG; Flex: Highlight MSG; Flex: List Slot | Adds a new option to the list, with List Slot ID and showing text line Option MSG. It also displays text line Highlight MSG when that option is highlighted. | If Highlight MSG is set to 255 [0xFF], no message will be displayed when the option is highlighted.
This command relies on an open message box in order to display the highlight messages.

Trying to highlight an option with Highlight MSG different than 255 [0xFF] will result in a crash if no message box is already being displayed. | -| 0047 | | ShowList | \- | Shows the prepared list in screen | The game will hide it when the player has selected an option. | -| 0048 | MultiRow | MultiColumn | u8: Columns | Splits the multi window in Columns different columns | | -| 0049 | PlayFanfare | PlayFanfare | Flex: Sound | Plays Sound | | -| 004A | PlayFanfare2 | StopFanfare | Flex: Sound | Stops Sound | | -| 004B | WaitFanfare | WaitFanfare | Flex: Sound | Waits Sound to finish | | -| 004C | PlayCry | PlayCry | Flex: Pokémon; Flex: Unused | Plays a Pokémon cry | | -| 004D | WaitCry | WaitCry | \- | Waits the current cry to finish | | -| 004E | PlaySound | PlaySound | u16: Sound | Pauses current music, then Plays Sound | | -| 004F | FadeDefaultMusic | WaitSound | \- | Waits for Sound to finish, then resumes music | | -| 0050 | PlayMusic | PlayMusic | u16: Music | Plays Music | | -| 0051 | StopMusic | StopMusic | u16: Unused | Stops current music | Parameter is ignored because the game identifies what music is playing. | -| 0052 | RestartMusic | PlayDefaultMusic | \- | Plays map default music | | -| 0053 | | SetMusic | u16: Music | ??? | | -| 0054 | SwitchMusic | FadeOutMusic | u16: Volume; u16: Time | Fades out the current music to Volume in Time frames | | -| 0055 | | FadeInMusic | u16: Time | Fades in the current music to normal volume in Time frames | | -| 0056 | | SetMusicPauseStatus \* | u8: SSEQ Player ID; u8: Status | ??? | | -| 0057 | | TempMusic \* | u16: Music ID | ??? | | -| 0058 | | SetBGMFlag \* | u8: ??? | ??? | Seems to set a flag related to the music system. | -| 0059 | | CheckChatotCry | Var: Variable | Checks if Chatot has custom sound, stores answer in Variable | Returns 0 or 1 to the specified Variable. Not for a specific Chatot but for all (they share a custom sound). | -| 005A | SwitchMusic2 | StartChatotCry | Var: Variable | Starts Chatot microphone record, stores answer in Variable | Returns 0 or 1 to the specified Variable depending on successful recording. | -| 005B | | StopChatotCry | \- | Stops recording Chatot custom sound | | -| 005C | | SaveChatotCry | \- | ??? | Maybe saves the custom Chatot sound in the savegame. | -| 005D | | | \- | ??? | | -| 005E | ApplyMovement | Movement | Flex: Event ID; u32: Relative Jump | Applies movement at Relative Jump to Event ID | Movements must be halfword-aligned in the script file. If you're using an old tool which doesn't align them, force the alignment with a TextPlayerName 0x0 or some unnoticeable command of 3, 5, 7 or 9 bytes length. | -| 005F | WaitMovement | WaitMovement | \- | Waits for all movements to finish | | -| 0060 | LockAll | LockAll | \- | Locks every event in the map | | -| 0061 | ReleaseAll | ReleaseAll | \- | Releases every event in the map | | -| 0062 | Lock | Lock | u16: Event ID | Locks Event ID | | -| 0063 | Release | Release | u16: Event ID | Releases Event ID | | -| 0064 | AddPeople | AddOW | Flex: Event ID | Add Event ID overworld in the map | It is probable that, if executing this having Event ID overworld already in the map, it gets duplicated. | -| 0065 | RemovePeople | RemoveOW | Flex: Event ID | Removes Event ID overworld from the map | | -| 0066 | LockCam | LockCamera | Flex: X; Flex: Y | Locks the camera at position X and Y | Seems to place a invisible NPC at coords X and Y. It appears that both must be the current player position. | -| 0067 | | ReleaseCamera | \- | Releases the camera | | -| 0068 | FacePlayer | FacePlayer | \- | Makes the invoking event look at the player | In fact it simply takes the current player direction and makes the NPC look at the opposite direction. | -| 0069 | CheckSpritePosition | GetPlayerPosition | Var: X; Var: Y | Saves the current player position in X and Y | | -| 006A | | GetOWPosition | Flex: Event ID; Var: X; Var: Y | Saves the current Event ID position in X and Y | If Event ID is deleted (via RemoveOW) it gives 0xFF for both coordinates. | -| 006B | CheckPersonPosition | SetFollowingOverworld \* | Flex: X; Flex: Z; Flex: Y | ??? | Maybe teleports the player to other coords? | -| 006C | ContinueFollow | KeepOverworld | Flex: Event ID; u8: Value | If Value is 1, prevents Event ID from disappearing when entering on a new map header | | -| 006D | FollowHero | SetOWMovement | Flex: Event ID; u16: Movement | Changes the Event ID's movement number to Movement | | -| 006E | GiveMoney | GiveMoney | u32: Money | Adds Money to the player's money | | -| 006F | TakeMoney | TakeMoney | u32: Money | Subtracts Money from the player's money | | -| 0070 | CheckMoney | CompareMoney | Var: Variable; u32: Money | Stores 1 into Variable if the player has Money or more money. Stores 0 otherwise. | | -| 0071 | ShowMoney | ShowMoney | Flex: X; Flex: Y | Shows the money box at X and Y coordinates of the screen | Each X and Y unit implies 8 pixels. Values of 0 or higher than the screen may glitch the screen. | -| 0072 | HideMoney | HideMoney | \- | Hides the money box | | -| 0073 | | UpdateMoney | \- | Updates the current money in the money box | | -| 0074 | | ShowSpecialCurrency | u8: Currency; Flex: X Coord; Flex: Y Coord | Shows the Currency box at X and Y coordinates of the screen. | Currency:

0 = Coins
1 = Battle Points
2 = Athlete Points | -| 0075 | | HideSpecialCurrency | \- | Hides the currently displayed special currency box. | | -| 0076 | | UpdateSpecialCurrency | u16: Currency | Updates the current Currency in the currency box. | Currency types are the same as above [0074]. | -| 0077 | | CheckCoins | Var: Variable | Stores the current casino coin amount in Variable | | -| 0078 | | GiveCoins | Flex: Coins | Adds Coins to the player's casino coins | | -| 0079 | | TakeCoins | Flex: Coins | Subtracts Coins from the player's casino coins | | -| 007A | | GiveAthletePoints | Flex: Amount | Adds the given Amount to the player's Athlete Points | | -| 007B | | TakeAthletePoints | Flex: Amount | Subtracts the given Amount from the player's Athlete Points | | -| 007C | | CompareAthletePoints | Var: Result; Flex: Amount | Stores 1 into Variable if the player has the given Amount of Athlete Points or more. Stores 0 otherwise. | | -| 007D | | GiveItem | Flex: Item; Flex: Amount; Var: Variable | Adds Amount of Item item, stores 1 in Variable if the player had less than 1000 - Amount (100 - Amount if TM/HM), stores 0 otherwise | Both Item and Amount are flexible, but if you use CommonScript 0x7F1 after that (as it is meant to be) you must place these two values in 0x8004 and 0x8005 in order to make the script work properly. | -| 007E | TakeItem | TakeItem | Flex: Item; Flex: Amount; Var: Variable | Subs Amount of Item item, stores 1 in Variable if the player had at least Amount items in the bag, stores 0 otherwise | | -| 007F | GiveItem | CheckItemSpace | Flex: Item; Flex: Amount; Var: Variable | Stores 1 in Variable if the player has less than 1000 - Amount of Item items (100 - Amount if TM/HM), stores 0 otherwise | | -| 0080 | CheckItem | CheckItem | Flex: Item; Flex: Amount; Var: Variable | Stores 1 in Variable if the player has at least Amount of Item items in the bag, stores 0 otherwise | Even if the Amount to check for is 0, the check will return 0 if you don't have the item at all. | -| 0081 | | CheckItemIsMachine | Flex: Item; Var: Variable | Stores 1 in Variable if Item is TM or HM, stores 0 otherwise | | -| 0082 | | GetItemPocket | Flex: Item; Var: Variable | Stores the bag pocket of Item in Variable | | -| 0083 | | SetStarter | Flex: Pokémon | Stores Pokémon as the starting Pokémon in the game save data | | -| 0084 | DoubleMessage | GenderMessage | u8: Male Text; u8: Female Text | Displays Male Text or Female Text message depending on player's gender | | -| 0085 | | CheckSeals \* | Flex: Seal ID; Var: Number of Seals in Seal Case | Checks the number of a certain type of Ball Seals that the player has. The variable is the output of how many Seals you have. | Example: Farmhouse on Route 39 | -| 0086 | | GiveSeals \* | Flex: Seal ID; Flex: Number of Seals to be Given | Gives the player Ball Seals. | Example: Farmhouse on Route 39 | -| 0087 | | GiveRandomSeals \* | Var: Random Seal ID 1; Var: Random Seal ID 2; Var: Random Seal ID 3 | Generates three random types of Ball Seals and gives them to the player (repeats are possible). Each variable will yield a 0 if the player has no more room for the Seal(s) in the Seal Case. | Example: House in top right of Olivine City | -| 0088 | | CheckPokemonForm \* | Flex: Party Position; Var: Variable | Checks the form of the Pokemon in party slot Party Position and returns the form ID in Variable. | | -| 0089 | GiveStoredPokemon | GivePokemon | Flex: Pokémon; Flex: Level; Flex: Item ID; Flex: Form; Flex: Ability; Var: Variable | Gives Pokémon at level Level, store 1 in Variable if succeed and 0 otherwise | | -| 008A | | GivePokemonEgg | Flex: Pokémon; Flex: Location | Gives a Pokémon egg received from Location text slot at text bank #281 | | -| 008B | | ReplaceMove | Flex: Party Slot; Flex: Move Slot; u16: Move ID | Overwrites Move Slot of the Pokémon at the specified Party Slot with Move ID. | Party slot and move slot start at 0 rather than 1, so the ranges are 0-5 and 0-3 respectively.
[https://bulbapedia.bulbagarden.net/wiki/List_of_moves](https://bulbapedia.bulbagarden.net/wiki/List_of_moves) | -| 008C | | CheckPokemonHasMove | Var: Variable; Flex: Move ID; Flex: Party Slot | Checks if a Pokémon at the specified Party Slot knows a move with given Move ID.
Stores 1 into Variable if yes, 0 otherwise. | Example: Headbutt tutor in Ilex Forest (Script File 92, Script 3) | -| 008D | | CheckMoveInParty | Var: Variable; Flex: Move ID | Checks if any Pokémon in the party knows Move ID move, stores in Variable the position of the first Pokémon that knows it or stores 6 if no Pokémon in the party knows the move | | -| 008E | | CheckPokeGearRematch \* | Flex: Phone Number; Var: Variable | | Has something to do with rematches but not sure if it's checking if a rematch is active or the # the rematch is on. Gets used when deciding when to let Gym Leaders appear in the overworld for a photo shoot after they are defeated in the Dojo. | -| 008F | | ChooseRivalName | Var: Variable | Opens the keyboard for naming the rival, stores 1 in Variable if user cancels the proccess | | -| 0090 | | GetCounterpartSprite | Var: Variable | Stores 97 (Lyra sprite ID) into the Variable if you're playing as Ethan;
Stores 0 (Ethan sprite ID) into the Variable if you're playing as Lyra. | Remember that Overworld Entities with sprite IDs 101 to 116 refer to the value of vars 0x4020-0x402F for the sprite to display. | -| 0091 | | UpgradePokegear | u8: Module | Adds the worldmap to the Pokegear if Module is 1, adds the radio if Module is 2 | | -| 0092 | RecordPokegearNumber | RecordPokegearNumber | Flex: ??? | | | -| 0093 | | CheckPokegearNumberRegistered \* | Flex: Phone Number; Var: Variable | Stores 0 into Variable if Phone Number has not been registered, and 1 if it has been registered. | Example: Sabrina in Olivine Harbor (Script File 153, Script 7). Used frequently by Gym Leaders appearing in the overworld. | -| 0094 | | | | | | -| 0095 | | | | | | -| 0096 | CallEnd | ReturnScreen | \- | Restores the normal overworld screen | | -| 0097 | | | | | | -| 0098 | Wifi | | \- | | | -| 0099 | | DressPokemon \* | \- | | | -| 009A | OpenPokemonDress | ContestDressupScreen \* | \- | | | -| 009B | | DressUpArtworkScreen \* | \- | | | -| 009C | | SealCapsuleScreen \* | \- | | | -| 009D | OpenPokegearMap | WorldMapScreen | \- | Opens the worldmap screen | | -| 009E | | PCBoxScreen \* | \- | | | -| 009F | | DrawScreenUnion \* | \- | | | -| 00A0 | | TrainerCaseUnion \* | \- | | | -| 00A1 | CallEnd2 | TradeScreenUnion \* | \- | | | -| 00A2 | | RecordMixingUnion \* | \- | | | -| 00A3 | EndGame | EndGameScreen | \- | Opens the Hall of Fame and game ending screens | | -| 00A4 | | HallOfFameData \* | \- | | | -| 00A5 | | StoreGTSStatus \* | ??? | | | -| 00A6 | WFC | InitWFC \* | ??? | | | -| 00A7 | | StarterSelectionScreen | \- | Opens the starter Pokémon selection screen | | -| 00A8 | | GetTrainerPathToPlayer \* | Flex: ??? | | | -| 00A9 | | TrainerStepTowardsPlayer \* | Flex: ???; Var: Variable | | | -| 00AA | | GetTrainerEyeType \* | Var: Variable | | | -| 00AB | | GetEyeTrainerNum \* | Flex: ???; Var: Variable | | | -| 00AC | | WritePlayerName | Var: Variable | Opens the keyboard for naming the player, stores 1 in Variable if user cancels the proccess | | -| 00AD | GivePokemonNickname | WritePokemonName | Flex: Party Position; Var: Variable | Opens the keyboard for naming a Pokémon in Party Position, stores 1 in Variable if user cancels the proccess | | -| 00AE | FadeScreen | FadeScreen | u16: Frame Count; u16: Duration; u16: Fade Style; u16: Color | Fades screen to chosen 15-bit Color, using the chosen Fade Style. The transition will render Frame Count images, of Duration length each. | Type 0 for fade in, Type 1 for fade out. Color has 15-bit format. Transition is the number of color changes that the game does in the fading. | -| 00AF | ResetScreen | WaitFadeScreen | \- | Waits for the screen fade to end | | -| 00B0 | Warp | Warp | Flex: Map; u16: Door; Flex: X; Flex: Y; Flex: Dir | Warps to X and Y position of Map header with initial Dir direction, using Door warp | When Door is 0 it doesn't use any door animation. | -| 00B1 | HallFameData | RockClimbAnimation | Flex: Party Position | Uses rock climb with the Pokémon at Party Position position | | -| 00B2 | | SurfAnimation | Flex: Party Position | Uses surf with the Pokémon at Party Position position | | -| 00B3 | WFC1 | WaterfallAnimation | Flex: Party Position | Uses waterfall with the Pokémon at Party Position position | | -| 00B4 | | FlyAnimation | u16: Map; Flex: X; Flex: Y | Flies to Map header map, to coordinates X and Y | | -| 00B5 | | FlashAnimation | \- | Sets weather to 12 (darkness after flash) and then updates the weather graphics | | -| 00B6 | | WhirlpoolAnimation | Flex: Party Position | Uses whirlpool with the Pokémon at Party Position position | | -| 00B7 | | CutAnimation | Flex: Party Position | Uses cut with the Pokémon at Party Position position | | -| 00B8 | | CheckBike | Var: Variable | Stores 1 in Variable if player is riding the bike, stores 0 otherwise | | -| 00B9 | | RideBike | u8: Action | Changes player form from normal to riding the bike if Action is 1, otherwise it sets the normal form to the player | | -| 00BA | | CyclingRoad | u8: Action | If Action is 1, the game sets the cycling road flag and moves the player down. Otherwise the flag is deactivated. | | -| 00BB | | CheckPlayerForm | Var: Variable | Stores in Variable the current player form | Values 0 is for normal form, value 1 for riding the bike, value 2 for surfing, value 3 for Rocket clothing | -| 00BC | | SetPlayerForm | u16: Form | Activates the Form bit in the internal player form data | The purpose of the different bits still needs to be researched. | -| 00BD | | UpdatePlayerForm | \- | Updates changes in the internal player form data in the screen | | -| 00BE | SetVariableHero | TextPlayerName | u8: String Buffer | Stores player's name in String Buffer | | -| 00BF | SetVariableRival | TextRivalName | u8: String Buffer | Stores rival's name in String Buffer | | -| 00C0 | SetVariableAlter | TextCounterpart | u8: String Buffer | Stores counterpart's name in String Buffer | | -| 00C1 | SetVariablePokemon | TextPartyPokemon | u8: String Buffer; Flex: Party Position | Stores the name of the Pokémon in Party Position in String Buffer | | -| 00C2 | SetVariableItem | TextItem | u8: String Buffer; Flex: Item | Stores Item's name in String Buffer | | -| 00C3 | | TextPocket | u8: String Buffer; Flex: Pocket | Stores Pocket's name in String Buffer | | -| 00C4 | SetVariableAttackItem | TextMachineMove | u8: String Buffer; Flex: Item | Stores the name of the move contained in Item TM/HM in String Buffer | | -| 00C5 | SetVariableAttack | TextMove | u8: String Buffer; Flex: Move | Stores battle Move's name in String Buffer | | -| 00C6 | SetVariableNumber | TextNumber | u8: String Buffer; Flex: Number | Stores a Number in String Buffer | | -| 00C7 | SetVariablePokemonNickname | TextPokeNickname | u8: String Buffer; Flex: Party Position | Stores the nickname of the Pokémon in Party Position in String Buffer | | -| 00C8 | SetVariableObject | | | | | -| 00C9 | | TextPlayerTrainerType | u8: String Buffer | Stores player's Union Room trainer type in String Buffer | | -| 00CA | SetVariablePokemonStored | TextPokemon | u8: String Buffer; Flex: Pokémon; u16: Unused; u8: Unused | Stores Pokémon's name in String Buffer | The two Unused parameters are for defining male/female nouns and singular/plural nouns respectively. However both don't apply in this command. | -| 00CB | | TextStarterPokemon | u8: String Buffer | Stores the name of the player' starter Pokémon in String Buffer | | -| 00CC | | TextRivalStarter | u8: String Buffer | Stores the name of the rival' starter Pokémon in String Buffer | | -| 00CD | CheckStarter | TextCounterpartStarter | u8: String Buffer | Stores the name of the counterpart' starter Pokémon in String Buffer | | -| 00CE | | CheckStarter | Var: Variable | Stores the starter Pokémon ID in Variable | | -| 00CF | | DummyTextGoods | u8: String Buffer; Flex: Unused | Loads an empty string in String Buffer | | -| 00D0 | | DummyTextTrap | u8: Unused; Flex: Unused | Nothing | | -| 00D1 | | DummyTextTreasure | u8: Unused; Flex: Unused | Nothing | | -| 00D2 | | TextMapName | u8: String Buffer; Flex: Map | Stores Map header name in String Buffer | | -| 00D3 | | GetSwarmInfo | Var: Map; Var: Pokémon | Selects a zone depending on a random seed, then stores the zone ID in Map and the corresponding swarm Pokémon of that zone in Pokémon | Predicted. Needs to be checked. | -| 00D4 | | TrainerID | Var: Variable | Stores the trainer ID number in Variable depending on the script ID | This means you shouldn't use this command in a normal script. | -| 00D5 | TrainerBattle | TrainerBattle | Flex: Trainer 1; Flex: Trainer 2; u8: Result; u8: ??? | Starts a battle against Trainer 1 and, if Trainer 2 is neither 0 nor the same as Trainer 1, a double battle against both. Continues without warping to Pokemon Center/home if Result is equal to 1. | Your party will also be fully healed after the battle if Result is 1. Example: Cherrygrove City fight with Rival | -| 00D6 | | TrainerMessage | Flex: Trainer ID; Flex: Type | Displays the text of Trainer ID trainer at condition Type | The possible Type values are the following (expand the note for see them) | -| 00D7 | | TrainerMsgCheck | Var: Noticing; Var: Defeat; Var: One Pokémon | If the script ID corresponds to a single battle trainer, stores 0 in Noticing, 2 in Defeat and 0 in One Pokémon. If it corresponds to a double battle, stores 3, 5 and 6 or 7, 9 and 10 depending on whether it's the first or the second trainer | This means you shouldn't use this command in a normal script. | -| 00D8 | | TrainerRematchMsgCheck | Var: Noticing; Var: Defeat; Var: One Pokémon | If the script ID corresponds to a single battle trainer, stores 17 in Noticing, 0 in Defeat and 0 in One Pokémon. If it corresponds to a double battle, stores 18, 0 and 6 or 19, 0 and 10 depending on whether it's the first or the second trainer | This means you shouldn't use this command in a normal script. | -| 00D9 | | TrainerTypeCheck | Var: Variable | Stores 0 in Variable if the script ID corresponds to a single battle, stores 1 if it corresponds to a double battle | This means you shouldn't use this command in a normal script. | -| 00DA | | TrainerMusic | Flex: Trainer | Plays Trainer's overworld music | It checks if player is in Johto or Kanto for that. | -| 00DB | LostGoPokecenter | LostBattle | \- | Return to Pokémon Center or player's house after being defeated | | -| 00DC | CheckLost | CheckBattleIsLost | Var: Variable | Stores 0 in Variable if player has been defeated in battle, stores 1 otherwise | | -| 00DD | | CheckDefeatedPokemon | Var: Variable; u8: ??? | Stores 0 in Variable if player defeated or catched the wild Pokemon, stores 1 otherwise | | -| 00DE | StoreStarter | Check2vs2 | Var: Variable | Stores 1 in Variable if player has at least 2 not fainted Pokémon, stores 0 otherwise | | -| 00DF | | DummyTrainerBattle | \- | Starts a battle against trainer with ID 1 | | -| 00E0 | | DummyTrainerFlag | \- | Sets the trainer flag with the same ID as the invoking event | | -| 00E1 | | DummyTrainerFlagJump | u32: Relative Jump | Jumps to a function, Relative Jump bytes forward or backward, if trainer flag with the invoking event ID is set | | -| 00E2 | | | | | | -| 00E3 | | | | | | -| 00E4 | | | | | | -| 00E5 | | | | | | -| 00E6 | | | | | | -| 00E7 | | | | | | -| 00E8 | | | | | | -| 00E9 | | | | | | -| 00EA | | | | | | -| 00EB | | | | | | -| 00EC | | | | | | -| 00ED | | | | | | -| 00EE | | CheckPokerus | Var: Variable | Stores 1 in Variable if one or more Pokémon in the party are infected with the Pokérus | | -| 00EF | ChecPokemonGender | GetPokemonGender | Flex: Party Position; Var: Variable | Stores 0 in Variable if Pokémon at Party Position is male, 1 if is female and 2 if gender is unknown | Unknown gender value is supposed and should be checked. | -| 00F0 | WarpLift | SetElevatorWarp \* | Var: Variable | | | -| 00F1 | CheckFloor | GetElevatorFloor | Var: Variable | Stores in Variable the current floor in a elevator | | -| 00F2 | | ElevatorBox | u8: X; u8: Y; Var: Variable; Flex: Floor | Shows the current floor number in a box at X and Y coordinates in the screen | Each X and Y unit implies 8 pixels. Values of 0 or higher than the screen may glitch the screen. Variable and Floor parameters have not been tested. | -| 00F3 | WirelessBattleWait | CountJohtoDexSeen | Var: Variable | Stores in Variable the total seen Pokemon in the Johto Pokédex | | -| 00F4 | | CountJohtoDexObtained | Var: Variable | Stores in Variable the total obtained Pokemon in the Johto Pokédex | | -| 00F5 | | CountNationalDexSeen | Var: Variable | Stores in Variable the total seen Pokemon in the National Pokédex | | -| 00F6 | | CountNationalDexObtained | Var: Variable | Stores in Variable the total obtained Pokemon in the National Pokédex | | -| 00F7 | PokemonContest | DummyNationalDexCheck | \- | Nothing | | -| 00F8 | | GetDexProgressMsg | u8: Mode; Var: Message; Var: Unknown | Checks the number of seen Pokémon in the Johto Pokédex (if Mode is 0) or the number of obtained Pokémon in the National Pokédex (otherwise) and stores the corresponding Professor message in Message, also storing 0x4AA in Unknown | | -| 00F9 | | WildBattle | Flex: Pokémon; Flex: Level | Starts a wild battle against a Pokémon of level Level | | -| 00FA | | WildBattleNoButtons | Flex: Pokémon; Flex: Level | Starts a first wild battle against a Pokémon of level Level | The difference between this and other similar commands is that Bag, Run and Pokémon buttons are disabled. | -| 00FB | | CatchTutorial | \- | Starts the catch tutorial battle | | -| 00FC | | | | | | -| 00FD | | CheckSaveGame | Var: Variable | Stores 0 in Variable if a different savegame exists and it's not possible to save, stores 1 if no previous savegame exists, stores 2 if game has to save a lot of data and stores 3 if game can perform a quick save | | -| 00FE | | SaveGame \* | | | | -| 00FF | | CheckPortrait \* | | | | -| 0100 | | SetPortraitTitle \* | | | | -| 0101 | | | | | | -| 0102 | | | | | | -| 0103 | | | | | | -| 0104 | | | | | | -| 0105 | | | | | | -| 0106 | | | | | | -| 0107 | | | | | | -| 0108 | | | | | | -| 0109 | | | | | | -| 010A | | | | | | -| 010B | | | | | | -| 010C | | | | | | -| 010D | | | | | | -| 010E | | | | | | -| 010F | | | | | | -| 0110 | | | | | | -| 0111 | | | | | | -| 0112 | | | | | | -| 0113 | | MartScreen | Flex: Unused | Opens the common mart shopping screen | | -| 0114 | | SpMartScreen | Flex: Mart ID | Opens the Mart ID mart shopping screen | Used in the Departament Store for a shop with specific fixed items. At 0x48188 of arm9.bin (IPKS) is the pointer to the shops table, each entry of the table being a pointer to an item table. | -| 0115 | | GoodsMartScreen | Flex: Mart ID | Opens the Mart ID goods mart shopping screen | | -| 0116 | | SealMartScreen | Flex: Mart ID | Opens the Mart ID seal mart shopping screen | | -| 0117 | | DummyLostBattle | \- | Return to Pokémon Center or player's house after being defeated | Same code as LostBattle command. | -| 0118 | | SetLastWarp | Flex: Warp ID | Sets map's Warp ID warp as the last used warp | Supposed. This would affect actions like Escape Rope use. | -| 0119 | CheckGender | CheckPlayerGender | Var: Variable | Stores 0 in Variable if player is male, stores 1 if female | | -| 011A | HealPokemon | HealPokemon | \- | Heals every Pokémon in the player's party | That does not include the black fade nor the healing sound. | -| 011B | | EndWirelessComms \* | | | | -| 011C | | EnterBattleRoom \* | | | | -| 011D | | SetPlayerDirComm \* | | | | -| 011E | | UnionMapChange \* | | | | -| 011F | | UnionRoomSpriteScreen \* | | | | -| 0120 | | StoreUnionSprite \* | | | | -| 0121 | | SetUnionSprite \* | | | | -| 0122 | | CheckPokedex | Var: Variable | Stores 1 in Variable if player has the Pokédex, stores 0 otherwise | | -| 0123 | ActivatePokedex | GivePokedex | \- | Gives the Pokédex to the player | | -| 0124 | | CheckShoes | Var: Variable | Stores 1 in Variable if player has the running shoes, stores 0 otherwise | | -| 0125 | GiveRunningShoes | GiveShoes | \- | Gives the running shoes to the player | | -| 0126 | CheckBadge | CheckBadge | Flex: Badge ID; Var: Variable | Checks if player has Badge ID badge, stores result in Variable | | -| 0127 | EnableBadge | GiveBadge | Flex: Badge ID | Gives the player Badge ID badge | | -| 0128 | DisableBadge | CountBadges | Var: Variable | Stores in Variable the number of badges obtained | | -| 0129 | | DummyCheckBag | Var: Variable | Stores 1 in Variable if flag 0x960 is set, stores 0 otherwise | | -| 012A | | DummyGiveBag | \- | Sets flag 0x960 | | -| 012B | | CheckPartner | Var: Variable | Stores 1 in Variable if the following event flag is activated, stores 0 otherwise | | -| 012C | | SetPartner | \- | Activates the following event flag, so you can no longer use the bike, surf, rock climb... | | -| 012D | | ClearPartner | \- | Deactivates the following event flag, so you can use the bike, surf, rock climb... again | | -| 012E | | CheckStepFlag \* | | | | -| 012F | | SetStepFlag \* | | | | -| 0130 | | ClearStepFlag \* | | | | -| 0131 | | DummyCheckGameCompleted | Var: Variable | Stores 1 in Variable if flag 0x964 is set, stores 0 otherwise | This flag is not the one that HGSS uses when the player clears the game. | -| 0132 | | DummyGameCompleted | \- | Sets flag 0x964 | This flag is not the one that HGSS uses when the player clears the game. | -| 0133 | PrepareDoorAnimation | DoorAnimation | u16: Matrix X; u16: Matrix Y; Flex: Map X; Flex: Map Y; u8: Door ID | Prepares a building located at Map X and Map Y coordinates in a map located at Matrix X and Matrix Y in the current matrix for animation, with Door ID animation ID | | -| 0134 | CloseDoor | WaitDoor | u8: Door ID | Wait animation of building with Door ID animation ID | | -| 0135 | MoveDoor | FreeDoor | u8: Door ID | Free animation of building with Door ID animation ID | | -| 0136 | OpenDoor | OpenDoor | u8: Door ID | Triggers first animation of building with Door ID animation ID | | -| 0137 | WaitDoor | CloseDoor | u8: Door ID | Triggers second animation of building with Door ID animation ID | | -| 0138 | | GetDaycareNames | \- | Stores first daycare Pokémon nickname in string buffer 0, the second daycare Pokémon nickname in string buffer 1 and the first Pokémon trainer's name in buffer 2 | If there's only one Pokémon in the daycare, string buffer 1 does not change. If no Pokémon is in the daycare, commands does nothing. | -| 0139 | | GetDaycareStatus | Var: Variable | If daycare Pokémon have an egg, stores 1 in Variable. Otherwise it stores 0 if no Pokémon is in the daycare, 2 if only one Pokémon is in the daycare or 3 if there are two Pokémon | | -| 013A | | InitEcruteakGym \* | | | | -| 013B | | | | ??? Something to do with the Goldenrod Dept. Store Basement, probably moving around blocks or opening access to doors. | | -| 013C | | | | ??? | | -| 013D | | | | | | -| 013E | | CianwoodGymInit \* | | | | -| 013F | | CianwoodGymTurnWinch \* | | | | -| 0140 | | VermilionGymInit \* | | | | -| 0141 | VermillionGymAnimation | VermilionGymLockAction \* | | | | -| 0142 | VermillionGymBin | VermilionGymCanCheck \* | | | | -| 0143 | | ResetVermilionGymCans \* | | | | -| 0144 | | InitVioletGym | \- | Initializes Violet Gym internal data and 3D model animations | | -| 0145 | | VioletGymElevator | \- | Triggers model #111 to move up or down | | -| 0146 | | InitAzaleaGym \* | | | | -| 0147 | AzaleaGym | AzaleaGymSpinarak \* | | | | -| 0148 | AzaleaGym2 | AzaleaGymSwitch \* | | | | -| 0149 | | BlackthornGymInit \* | | | | -| 014A | | FuchsiaGymInit \* | | | | -| 014B | | ViridianGymInit \* | | | | -| 014C | CheckPartyNumber | GetPartyCount | Var: Variable | Stores in Variable the current number of Pokémon in the party | | -| 014D | | BagScreen \* | | | | -| 014E | | BagScreenSelection \* | | | | -| 014F | | CheckPocketItems \* | | | | -| 0150 | | DummyTextBerry \* | | | | -| 0151 | | TextNature? \* | | | | -| 0152 | | SetOWDefaultPosition | Flex: Event ID; Flex: X; Flex: Y | Sets Event ID spawn position to global coords X and Y | | -| 0153 | SetOverworldPosition | SetOWPosition | Flex: Event ID; Flex: X; Flex: Z; Flex: Y; Flex: Dir | Moves Event ID to global coords X, Y, Z with Dir direction | Even though some maps are higher, the Z parameter is often 0. Game seems to calculate the correct Z position if it is wrong. | -| 0154 | | SetOWDefaultMovement | Flex: Event ID; Flex: Movement ID | Sets Event ID's default move code to Movement ID | | -| 0155 | | SetOWDefaultDirection | Flex: Event ID; Flex: Direction ID | Sets Event ID's default direction to Direction ID | | -| 0156 | | SetWarpPosition | Flex: Warp ID; Flex: X; Flex: Y | Moves Warp ID to global coords X and Y | | -| 0157 | | SetSpawnablePosition | Flex: Spawnable ID; Flex: X; Flex: Y | Moves Spawnable ID to global coords X and Y | | -| 0158 | | SetOWDirection | Flex: Event ID; Flex: Direction ID | Sets Event ID's current direction to Direction ID | | -| 0159 | | AddWaitingIcon \* | | | | -| 015A | | RemoveWaitingIcon \* | | | | -| 015B | | ReturnScriptWkSet \* | | | | -| 015C | | WaitTimeOrAB | Flex: Time | Stops script execution until Time frames have passed or until user presses A or B buttons | | -| 015D | ChoosePokemonMenu | ChoosePKMNSelection \* | | | | -| 015E | ChoosePokemonMenu2 | UnionChoosePKMNSelection\* | | | | -| 015F | StorePokemonMenu | GetSelectedPartySlot | Var: Variable | Stores in Variable the selected party slot in a party Pokémon screen, or 0xFF is user cancelled the selection | | -| 0160 | | SelectMove \* | | | | -| 0161 | | GetMoveSelection \* | | | | -| 0162 | StorePokemonNumber | GetPartyPokemonID | Var: Party Position; Var: Variable | Stores in Variable the ID of the Pokémon at Party Position | It will return 0 if Pokémon is an egg. | -| 0163 | CheckIfPokemonTraded | CheckTradedPokemon | Var: Party Position; Var: Variable | Stores 0 in Variable if trainer ID and secret ID of the Pokémon at Party Position are the player's ones, stores 1 otherwise | | -| 0164 | | CountPartyBornPokemon | Var: Variable | Stores in Variable the number of Pokémon in the Pokémon party, excluding the eggs | | -| 0165 | | CountAlivePokemonExceptFirst | Var: Variable; Flex: Party Position | Stores in Variable how many alive Pokémon would remain in the Pokémon party if Pokémon at Party Position disappeared | Eggs are excluded from the count. | -| 0166 | | CountTotalAlivePokemon | Var: Variable | Stores in Variable the number of Pokémon in the Pokémon party and PC boxes, excluding the eggs and fainted Pokémon | As Pokémon can't be fainted in the PC boxes, only eggs are not taken into account in the PC boxes count. | -| 0167 | | CountPartyEggs | Var: Variable | Stores in Variable the number of eggs in the Pokémon party | | -| 0168 | | TakeMoneyFlex | Flex: Money | Subtracts Money from the player's money | | -| 0169 | | RetrieveDayCareMon \* | | | | -| 016A | | GiveLoanMon \* | | | | -| 016B | | CheckReturnLoanMon \* | | | | -| 016C | | DeletePartyPokemon | Flex: Party Position | Deletes the Pokémon at Party Position from the party | The Pokémon data is destroyed. | -| 016D | | RemoveDayCareEgg \* | | | | -| 016E | | GiveDayCareEgg \* | | | | -| 016F | | TextDayCareCost \* | | | | -| 0170 | CheckHiroMoneyNumber | CompareMoneyFlex | Var: Variable; Flex: Money | Returns 1 to Variable if the player has Money or more money, returns 0 otherwise | | -| 0171 | | EggHatchScreen | \- | Opens the egg hatching screen with an egg in the Pokémon party that has 0 steps left for hatching | This may crash if there's no ready egg in the Pokémon party. It's better not to use this command unless you know what are you doing. | -| 0172 | | | | | | -| 0173 | | CheckDaycareLevelGain \* | Var: Variable; Flex: Position | Stores the amount of levels a Pokémon in the Daycare has gained from being in the Daycare | | -| 0174 | | GetDayCareSpeciesandNick \* | | | | -| 0175 | | GiveDayCareMon \* | | | | -| 0176 | | UnvanishOverworld | Flex: Event ID | Makes Event ID visible again if it was invisible | Can be used on Following Pokémon. Useful for scripting events that happen as soon as the player walks into a buidling and their Following Pokémon hasn't spawned yet. The Following Pokémon will "unvanish" on the same tile as the player, so account for this in movement scripts. | -| 0177 | | VanishOverworld | Flex: Event ID | Makes Event ID invisible, but still collisionable | It's a great idea to use this command in a level script for blocking doors with invisible events. | -| 0178 | OpenMail | MailScreen | \- | Opens the mail screen | | -| 0179 | CheckMail | CountMail | Var: Variable | Stores in Variable the current amount of mails in the mailbox | | -| 017A | | RankingView \* | | | | -| 017B | | GetTimePeriod | Var: Variable | Stores in Variable the current time period of the day | The different values are:
0: From 04:00 AM to 09:59 AM (Morning)
1: From 10:00 AM to 04:59 PM (Noon)
2: From 05:00 PM to 07:59 PM (Evening)
3: From 08:00 PM to 11:59 PM (Night)
4: From 00:00 AM to 03:59 AM (Midnight) | -| 017C | | GetRandom | Var: Variable; Flex: Range | Generates a random number between 0 and Range \- 1, and stores it in Variable | | -| 017D | | DummyGetRandom | Var: Variable; Flex: Range | Generates a random number between 0 and Range \- 1, and stores it in Variable | Exactly the same code as the command above. | -| 017E | | GetPokemonHappiness | Var: Variable; Flex: Party Position | Stores in Variable the happiness of Pokémon in Party Position | | -| 017F | | AddHappiness | Flex: Happiness; Flex: Party Position | Adds Happiness to the happiness of Pokémon in Party Position | | -| 0180 | | SubHappiness | Flex: Happiness; Flex: Party Position | Subs Happiness to the happiness of Pokémon in Party Position | | -| 0181 | | TextDayCareMonStats \* | | | | -| 0182 | | GetPlayerDirection | Var: Variable | Stores in Variable the direction the player is looking at | Predicted. Seeing up gives 0, seeing down gives 1, seeing left gives 2 and seeing right gives 3. | -| 0183 | | GetDayCareMonCompatibility \* | | | | -| 0184 | | CheckDayCareEgg \* | | | | -| 0185 | | CheckBornPokemonInParty | Flex: Pokémon; Var: Variable | Stores 1 in Variable if Pokémon is currently in the Pokémon party, stores 0 otherwise | Eggs do not count as Pokémon, so they will be ignored. | -| 0186 | | CheckPokemonSizeRecord | Var: Variable; Flex: Party Position | Stores 0 in Variable if Pokémon at Party Position does not have a bigger relative size than player's record, stores 1 if it's the same size and stores 2 if it has a bigger relative size | | -| 0187 | | SetPokemonSizeRecord | Flex: Party Position | Stores the relative size of Pokémon at Party Position as player's record | | -| 0188 | ComparePokemonHeight | TextPartyPokemonSize | Flex: Integer String Buffer; Flex: Decimal String Buffer; Flex: Party Position | Stores the integer part of Pokémon at Party Position size in Integer String Buffer (1 to 3 digits) and the decimal part of the size in Decimal String Buffer (1 digit) | | -| 0189 | CheckPokemonHeight | TextPokemonRecordSize | Flex: Integer String Buffer; Flex: Decimal String Buffer; Flex: Pokémon ID | Stores the integer part of player's record size, normalized to Pokémon ID range, in Integer String Buffer (1 to 3 digits) and the decimal part of the size in Decimal String Buffer (1 digit) | | -| 018A | ChoosePokemonDelete | | | | | -| 018B | StoreDeleteMove | | | | | -| 018C | CheckMoveNumber | CountPokemonMoves | Var: Variable; Flex: Party Position | Stores in Variable the total amount of moves that the Pokémon at Party Position currently has | | -| 018D | DeleteMove | DeleteMove | Flex: Party Position; Flex: Move Slot | Deletes the move in Move Slot from the Pokémon at Party Position | | -| 018E | | GetPartyPokemonMove | Var: Variable; Flex: Party Position; Flex: Move Slot | Stores in Variable the ID of the move in Move Slot from the Pokémon at Party Position | | -| 018F | SetVariableDeleteMove | TextPartyPokemonMove | u8: String Buffer; Flex: Party Position; Flex: Move Slot | Stores the name of the move in Move Slot from the Pokémon at Party Position in String Buffer | | -| 0190 | | Strength | Command format depends on the first parameter:
u8: 0
u8: 1
u8: 2; Var: Variable | Function depends on the first parameter:
0: Disables Strength so player can no longer move boulders
1: Allows the player to automatically move Strength boulders
2: Checks if Strength is activated, store answer in Variable | | -| 0191 | | FlashAction \* | Command format depends on the first parameter:
u8: 0
u8: 1
u8: 2; Var: Variable | Function depends on the first parameter:
0: Clears the Flash system flag
1: Sets the Flash system flag
2: Checks if Flash is activated, store answer in Variable | | -| 0192 | | DefogAction \* | Command format depends on the first parameter:
u8: 0
u8: 1
u8: 2; Var: Variable | Function depends on the first parameter:
0: Clears the Defog system flag
1: Sets the Defog system flag
2: Checks if Defog is activated, store answer in Variable | | -| 0193 | | GiveAccessory \* | | | | -| 0194 | GiveItemStored | CheckGivenAccessory \* | | | | -| 0195 | | CheckAccessory \* | | | | -| 0196 | | GiveBGAccessory \* | | | | -| 0197 | | CheckBGAccessory \* | | | | -| 0198 | | | | | | -| 0199 | | | | | | -| 019A | | | | | | -| 019B | | | | | | -| 019C | | | | | | -| 019D | | | | | | -| 019E | | | | | | -| 019F | | | | | | -| 01A0 | | | | | | -| 01A1 | | | | | | -| 01A2 | | | | | | -| 01A3 | | | | | | -| 01A4 | | | | | | -| 01A5 | | | | | | -| 01A6 | | | | | | -| 01A7 | | CheckCompleteJohtoDex | Var: Variable | Stores 1 in Variable if every Pokémon in the Johto Pokédex has been seen, stores 0 otherwise | | -| 01A8 | | CheckCompleteNationalDex | Var: Variable | Stores 1 in Variable if every Pokémon in the National Pokédex has been caught, stores 0 otherwise | | -| 01A9 | | OpenPokedexScreen \* | | | | -| 01AA | | CheckPokemonMail \* | | | | -| 01AB | | | | | | -| 01AC | | TakePokemonMail \* | | | | -| 01AD | | CountFossils | Var: Variable | Stores in Variable the current amount of fossils in the bag | Technically it's the number of items in the bag whose ID is between 99 and 105. | -| 01AE | | PreparePokeGearCall | Var: ???; Var: ???; Var: ??? | | | -| 01AF | | StartPokeGearCall | \- | Starts the PokéGear phone call that was previously set. | | -| 01B0 | | CheckFossilPokemon | Var: Variable; Flex: Item ID | Stores in Variable the ID of the Pokémon to which Item ID fossil belongs | | -| 01B1 | | CheckFossil | Var: Position; Var: Item ID; Flex: Amount | Stores in Item ID the ID of the first fossil item in the bag that the player has at least Amount quantity of, and stores in Position the amount of fossils in the bag before the first fossil that met the quantity condition | Stores 0 in both variables if there's no fossil in the bag. | -| 01B2 | | CountPokemonUnderLevel | Var: Variable; Flex: Level | Stores in Variable the amount of Pokémon in party whose level is equal or lower than Level | Eggs are completely ignored. | -| 01B3 | | SurvivePoison | Var: Variable; Flex: Party Position | If Pokémon at Party Position is poisoned and at 1 HP, it cures the poison and stores 1 in Variable, otherwise it stores 0 | | -| 01B4 | | FinishOverworldScreen \* | | | | -| 01B5 | | DebugPoketch \* | | | | -| 01B6 | | MessageAllFromArchive \* | | | | -| 01B7 | | MessageFromArchive \* | | | | -| 01B8 | | MessageAllPutPMS \* | | | | -| 01B9 | | | | | | -| 01BA | | | | | | -| 01BB | | | | | | -| 01BC | | | | | | -| 01BD | | GetPreviousHeaderID | Var: Variable | Stores in Variable the header ID of the previous accessed map | | -| 01BE | | GetCurrentHeaderID | Var: Variable | Stores in Variable the header ID of the map the player is in | | -| 01BF | | SetSafariFlag | u8: Flag; u8: Mode | If Flag is 0 safari encounters are activated, if Flag is 1 safari encounters are deactivated, being the own safari encounters if Mode is 0 or using the Safari Zone link if 1 | | -| 01C0 | | BattleRoomWarp \* | | | | -| 01C1 | | ExitBattleRoom \* | | | | -| 01C2 | | GeonetScreen | \- | Opens the Geonet screen | | -| 01C3 | | | | | | -| 01C4 | | ShowPokemonPic | Flex: Pokémon; Flex: Gender | Opens a window with the picture of Pokémon with Gender gender and registers the Pokémon in the Pokédex as seen | 0 = Male or Genderless; 1 = Female | -| 01C5 | | HidePokemonPic | \- | Hides the window of a Pokémon picture | | -| 01C6 | | | | | | -| 01C7 | | | | | | -| 01C8 | | | | | | -| 01C9 | | GetPokemonNature \* | Var: Variable; Flex: Party Position | | | -| 01CA | | CheckPartyNature \* | Var: Variable; Flex: Nature ID | | | -| 01CB | | | | | | -| 01CC | | LoadPokegearData \* | | | | -| 01CD | | SetRebattleTrainerID \* | | | | -| 01CE | | SetRebattleGymLeaderID \* | | | | -| 01CF | | EnableMassOutbreaks \* | | | | -| 01D0 | | AddRoamingPokemon | u8: ID | Activates a roaming Pokemon depending on the ID | Uses ID to determine which roaming Pokémon must appear: 0 for Entei, 1 for Raikou, 2 for Latias and 3 for Latios. | -| 01D1 | | UnionGroup | Command format depends on the first parameter:
u16: 0; Flex: ID; Var: Variable
u16: 1; Flex: ID; Var: Variable
u16: 2; Flex: ID; Flex: String Buffer
u16: 3; Flex: ID; Flex: String Buffer
u16: 4; Var: Variable
u16: 5; Flex: ID
u16: 6
u16: 7; Var: Variable | Function depends on the first parameter:
0: Checks if group ID exists, returns answer in Variable
1: Checks if group ID is accesible, returns answer in Variable
2: Writes group ID name in String Buffer
3: Writes leader's name of Group ID in String Buffer
4: Opens keyboard, stores 1 in Variable if user cancels, 2 if group name already exists, 0 otherwise
5: Enter in group ID
6: Creates a group
7: ??? | This command is the devil. | -| 01D2 | | CheckEggMoves \* | | | | -| 01D3 | ChoosePokemonRem | RememberMoveScreen \* | | | | -| 01D4 | | TeachMovesScreen \* | | | | -| 01D5 | StoreMoveRem | ResponseTeachMove \* | | | | -| 01D6 | | InitTrade | u8: Trade ID | Initializes Trade ID trade data | | -| 01D7 | | GetOfferedPokemon | Var: Variable | Stores in Variable the ID of the offered Pokémon of the current trade data | | -| 01D8 | CheckPokemonTrade | GetRequestedPokemon | Var: Variable | Stores in Variable the ID of the requested Pokémon of the current trade data | | -| 01D9 | TradeChosenPokemon | TradePokemonScreen | Flex: Party Position | Opens the trade Pokémon screen, giving the Pokémon at Party Position and receiving the offered Pokémon of the current trade data | | -| 01DA | StopTrade | EndTrade | \- | Frees the current trade data from the memory | | -| 01DB | | DummyInternationalDex | \- | Nothing | | -| 01DC | | DummyDimorphismDex | \- | Nothing | In fact it does activate a dimorphism flag in the Pokédex data, but since the HGSS Pokédex has the gender comparision by default, command's actual purpose is not noticeable. | -| 01DD | | NationalDex | Command format depends on the first parameter:
u8: 1; Var: Unused
u8: 2; Var: Variable | Function depends on the first parameter:
1: Activates the National Pokédex mode
2: Stores 1 in Variable if player has the National Pokédex, otherwise it stores 0 | | -| 01DE | | CountPokemonRibbons | Var: Variable; Flex: Party Position | Stores in Variable the amount of ribbons that the Pokémon in Party Position has | | -| 01DF | | CountPartyRibbons | Var: Variable | Stores in Variable the total amount of different ribbons in the current Pokémon party | | -| 01E0 | CheckRibbon | CheckRibbon | Var: Variable; Flex: Party Position; Flex: Ribbon | Stores 1 in Variable if the Pokémon in Party Position has the Ribbon ribbon, stores 0 otherwise | | -| 01E1 | GiveRibbon | GiveRibbon | Flex: Party Position; Flex: Ribbon | Gives the Ribbon ribbon to Pokémon in Party Position | | -| 01E2 | | TextRibbon | u8: String Buffer; Flex: Ribbon | Stores the name of the Ribbon in String Buffer | | -| 01E3 | CheckPokemonRibbon | CountPokemonEVs | Var: Variable; Flex: Party Position | Stores in Variable the total amount of effort values of Pokémon in Party Position | Predicted. | -| 01E4 | | GetDayOfWeek | Var: Variable | Stores in Variable the current day of the week | Value 0 is the first possible value and it's for Sunday. | -| 01E5 | | ShowRulesList | Var: Variable | ??? | | -| 01E6 | RBattleRecorder | DummyGetPokemonFootprint | \- | Nothing | | -| 01E7 | | PCHealAnimation | Flex: PokéBalls | Triggers the Pokémon Center healing animation with PokéBalls number of player's Pokémon | | -| 01E8 | | ElevatorAnimation | Flex: Direction; Flex: Count | Triggers the animation of building #208 up (if Direction is 0) or down (if Direction is 1) Count consecutive times | | -| 01E9 | | MysteryGiftGive | Command format depends on the first parameter:
u16: 0
u16: 1; Var: Variable
u16: 2; Var: Variable
u16: 3; Var: Variable
u16: 4
u16: 5; Var: Text File; Var: Text Line
u16: 6; Var: Text File; Var: Text Line
u16: 7
u16: 8 | Function depends on the first parameter:
0: Initializes the data for receiving a Mystery Gift
1: Checks if there is a Mystery Gift, stores answer in Variable
2: Stores the Mystery Gift ID in Variable
3: Checks if player can receive the Mystery Gift, stores answer in Variable
4: Gives the Mystery Gift to the player
5: Shows the succeed text at Text File file and Text Line slot
6: Shows the unable text at Text File file and Text Line slot
7: Ends the Mystery Gift process
8: Saves data and ends the Mystery Gift process | This one too. | -| 01EA | | | | | | -| 01EB | | | | | | -| 01EC | | | | | | -| 01ED | | | | | | -| 01EE | | | | | | -| 01EF | CheckVersion | CheckVersion | Var: Variable | Returns 0x7 to Variable if game is HeartGold, 0x8 if SoulSilver | | -| 01F0 | | FirstPokemonInParty | Var: Variable | Stores in Variable the slot of the first Pokémon in the party that is not an egg | | -| 01F1 | | CheckPokemonType \* | | | | -| 01F2 | | FirstPrimoPassword \* | | | | -| 01F3 | | SecondPrimoPassword \* | | | | -| 01F4 | | PreparePCAnimation \* | | | | -| 01F5 | | OpenPCAnimation \* | | | | -| 01F6 | | ClosePCAnimation \* | | | | -| 01F7 | | GetLottoNumber | Var: Variable | Stores Lotto random number in Variable | Supposed by analogy with Platinum. | -| 01F8 | | CheckWinLotto | Var: MatchPos; Var: Digits; Var: PC; Flex: Winning Number | Takes a Winning Number as input and responds as follows.
If no matching Pokémon could be found or an error occurs:
MatchPos: 0; Digits: 0; PC: 0.

For all other cases:

If the matching Pokémon is in the Player's party, PC will be assigned 0.
Otherwise, if it's in the Player's Storage System, PC will be assigned 1.

MatchPos stores the zero-based position of the winning Pokémon (either as Party pos or Storage System pos, depending on the value of PC).

When there's a match, the Digits var is assigned the number of matching digits of the Winning Pokémon's PID.
In case of multiple matches, priority is always given to the one with the most matching digits. | Supposed by analogy with Platinum.

To retrieve the exact position of a winning Pokémon in the Storage System, first make sure PC equals 1.

The zero-based PC Page and Position indices can be calculated:

PC Page index = MatchPos / 30
Position in page = MatchPos % 30

where % is the modulo operator. | -| 01F9 | | InitLotto | \- | Generates two random numbers and assigns them to two system lottery variables. | Supposed by analogy with Platinum. | -| 01FA | | BufferBoxPokemonNick \* | | | | -| 01FB | CheckBoxesNumber | CountPCFreeSpace | Var: Variable | Stores in Variable the amount of free Pokémon slots in PC boxes | | -| 01FC | | PalParkControl \* | | | | -| 01FD | | PalParkDepositCountCheck \* | | | | -| 01FE | | PalParkBoxPokemonCaught \* | | | | -| 01FF | StoreFriendParkResult | PalParkScoreResult \* | | | | -| 0200 | | PlayerMovementSavingSet \* | | | | -| 0201 | | PlayerMovementSavingClear \* | | | | -| 0202 | | HallOfFameAnime \* | | | | -| 0203 | | AddTrainerScore \* | | | | -| 0204 | | TextAccessory | u8: String Buffer; Flex: Accesory | Stores Accesory's name in String Buffer | | -| 0205 | | CheckPokemonInParty | Flex: Pokémon; Var: Variable | Stores 1 in Variable if Pokémon (or its egg) is currently in the Pokémon party, stores 0 otherwise | | -| 0206 | | SetDeoxysForm | Flex: Form | Sets every Deoxys in the Pokémon party the Form form | Form 0 is Normal, form 1 is Attack, form 2 is Defense and form 3 is Speed. | -| 0207 | | CheckBurmyForms | Var: Variable | Stores in Variable the number of current different Burmy forms in the Pokémon party | Returns 0 if player has no Burmy in the party, 1 if only one different form, 2 if two different forms and 3 if has three or more Burmy with three different forms. | -| 0208 | | | \- | ??? | Sets a internal flag. | -| 0209 | | | \- | ??? | Resets a internal flag. | -| 020A | | GetHour | Var: Variable | Stores current hour from RTC in Variable | | -| 020B | | ShakeOverworld | Flex: Event ID; Flex: Count; Flex: Time; Flex: X; Flex: Y | Makes Event ID overworld shake Count times in Time frames, moving X horizontally and Y vertically each shake | Event ID must be released before this command in order to see the animation. | -| 020C | | BlinkOverworld | Flex: ???; Flex: ???; Flex: ???; Flex: ???; Flex: ??? | ??? | | -| 020D | | CheckRegis | Var: Variable | Stores 1 in Variable if player has the 3 Regis in the party, stores 0 otherwise | | -| 020E | | | | | | -| 020F | | MessageUnown | u16: Text Slot | Display line Text Slot from the text file with the Unown font | Predicted. | -| 0210 | | CheckGBACartidge | Var: Variable | Stores the current GBA cartridge ID in Variable | Stores 0 if no cartridge, 1 if Pokémon Sapphire, 2 if Pokémon Ruby, 3 if Pokémon Emerald, 4 if Pokémon FireRed and 5 if Pokémon LeafGreen. Somehow it could also set 7 if Pokémon Gold, 8 if Pokémon Silver, 10 if Pokémon Diamond, 11 if Pokémon Pearl, 12 if Pokémon Platinum and 15 if Pokémon Colosseum. | -| 0211 | | GetFirstAlivePokemonSlot | Var: Variable | Stores in Variable the slot of the first Pokémon in the party that is not an egg nor is fainted | Predicted. | -| 0212 | | SetMatrixAlternativeMap | Flex: Alternative ID; u8: Status | Permanently changes a worldmap matrix cell corresponding to Alternative ID if Status is 1, reverts the change if 0 | It only changes the map file value in the matrix, not the map header nor the map height. Seems that the only Alternative ID available values are 0 and 1, corresponding to Mahogany Town and to the Lake of Rage. | -| 0213 | | TextBackgroundName \* | | | | -| 0214 | | CheckCoinsImmediate \* | | | | -| 0215 | | CheckCoins \* | | | | -| 0216 | | AddCoins \* | | | | -| 0217 | | GetPokemonLevel | Var: Result; Flex: Party Slot | Stores into Result the level of the Pokémon at a given Party Slot. | | -| 0218 | | | | | | -| 0219 | | | | | | -| 021A | | | | | | -| 021B | | | | | | -| 021C | | | | | | -| 021D | | TextNumberSp | u8: String Buffer; Flex: Number; u8: Alignment Type; u8: Digits | Stores a Number in String Buffer with Alignment Type alignment and Digits length | Predicted. Alignment Type 0 is left-alignment, 1 is right alignment padded with spaces and 2 is right alignment padded with zeros. Digits is used only in these last two types. | -| 021E | | MonGetContestValue \* | | | | -| 021F | | CheckBirthday | Var: Variable | Stores 1 in Variable if the current day is the player's birthday, stores 0 otherwise | | -| 0220 | | MusicVolumeSet | Flex: Music ID; Flex: Volume | Identifies the BGM Player which is playing Music ID and sets its Volume | | -| 0221 | | CountSeenUnown | Var: Variable | Stores in Variable the number of different seen Unown forms | | -| 0222 | | | | | | -| 0223 | | | | | | -| 0224 | | | | | | -| 0225 | | | | | | -| 0226 | | CountHallOfFameEntries \* | | | | -| 0227 | | | | | | -| 0228 | | | | | | -| 0229 | | | | | | -| 022A | | | | | | -| 022B | | | | | | -| 022C | | | | | Related to move tutor? Possibly BP price check? | -| 022D | | CheckBattlePoints \* | | | | -| 022E | | GiveBP \* | | | | -| 022F | | TakeBP \* | | | | -| 0230 | | CompareBP \* | Flex: ???; Var: ??? | | | -| 0231 | | ShakeCamera | Flex: X Magnitude; Flex: Y Magnitude; Flex: Count; Flex: Time | Shakes the screen vertically and/or horizontally, moving the camera X Magnitude pixels horizontally and Y Magnitude pixels vertically in each shake, with Count total shakes of Time frames each one | Don't abuse this command, as it seems that camera might end up 1 pixel up or down in each animation, especially when Count is an odd number. | -| 0232 | | Battle2vs2 | Flex: Partner Trainer ID; Flex: Trainer 1 ID; Flex: Trainer 2 ID; u8: ??? | Starts a double battle with Partner Trainer ID versus Trainer 1 ID and Trainer 2 ID | Last parameter seems to always be 0x1. | -| 0233 | | | | | | -| 0234 | | | | | | -| 0235 | | | Var: ??? | ??? | | -| 0236 | ChoosePokemonMenuTrade | PartyPokemonTradeScreen | \- | Opens the party Pokémon screen for a trade | | -| 0237 | | GetDPPtPrizeItemIdAndCost \* | | | | -| 0238 | | | | | | -| 0239 | | | | | | -| 023A | | CheckCoinsVar \* | | | | -| 023B | | | | | | -| 023C | | GetUniqueSealsQuantity \* | | | | -| 023D | | DummyActivateMysteryGift \* | | | | -| 023E | | GetOWMovement \* | | | | -| 023F | | | | | | -| 0240 | | | | | | -| 0241 | | | | | | -| 0242 | | | | | | -| 0243 | | | | | | -| 0244 | | TextSealSingular \* | u8: String Buffer; Flex: Seal ID | Stores Seal's singular noun in String Buffer | International release exclusive(supposed). Text archive 15. | -| 0245 | | DummyLockAll \* | | | | -| 0246 | | | | | | -| 0247 | | | | | | -| 0248 | | PartyLegalCheck \* | var: Result | Checks legality of party, at least for WIFI stuff. If RESULT is 1, party check failed and you have an "illegal" mon | Used by the attendants in the PC to check your Pokemon before going into the Union Room, may be used elsewhere too | -| 0249 | | | | | | -| 024A | | | | | | -| 024B | | | \- | ??? | | -| 024C | | LastBattleCheckCaught \* | Var ??? | | | -| 024D | LegendaryBattle | WildBattleSp | Flex: Pokémon; Flex: Level; u8: Shiny Flag | Starts a wild battle against a Pokémon of level Level, and shiny if Shiny Flag is 1 | | -| 024E | | CheckTrainerCardLevel | Var: Variable | Stores in Variable the current trainer card level | | -| 024F | | DummyRideBike | \- | Nothing | Seems to allocate the bike music in the RAM but doesn't play it. | -| 0250 | | | | | | -| 0251 | | ShowSaveBox | \- | Displays the save data box (current map name, player's name, the amount of badges, the Pokédex counter and the play time) | | -| 0252 | | HideSaveBox | \- | Hides the save data box | | -| 0253 | | ScopeMode | u8: Mode | If Mode is 1, activates the scope mode, otherwise the command deactivates the scope mode | The scope mode prevents the game to do certain actions (like reseting system flags) when changing map, and probably it's related with more things. | -| 0254 | | GetFollowingPokeSize | Var: Variable | Stores 0 in Variable if the current following Pokémon is small and can follow the player indoors, stores 1 if it's big and can't follow the player indoors | In fact it returns the second byte of the following Pokémon data files, stored in a/1/4/1.narc, which is the one that the game reads for allowing Pokémon entering in buildings. This command will work even if a SendBackFollowingPoke is used and the following Pokémon is hidden at that moment. | -| 0255 | | | \- | ??? | Draws a heart icon above the following Pokémon. Maybe a dummy command? | -| 0256 | | | u16: ??? | ??? | Parameter must be 1 or 2, otherwise command won't do anything. Seems to trigger a default movement for switching current player's and following Pokémon positions (for example, when using a HM). | -| 0257 | | FollowingPokePCAnimation | \- | Triggers the animation of sending the current following Pokémon back to its PokéBall over the Pokémon Center healing counter | | -| 0258 | StartFriendPark | SendBackFollowingPoke | \- | Triggers the animation of sending the current following Pokémon back to its PokéBall and deactivates the following Pokémon until the game is reset or a warp is used | | -| 0259 | | FollowingPokeFacePlayer | \- | Makes the invoking event look at the player, but with a size limitation | When the following Pokemon has a big size, it won't turn to the player if there is an overworld on the opposite side so it would collide. The checked flag is the second byte of the Parameter 1 field, which could be called "double size overworlds" flag, as it is also used for drawing two grass patches in the tall grass for the following Pokemon. | -| 025A | | LockFollowingPoke | u16: Operation | Releases the following Pokemon animation if Operation is 0, locks the animation otherwise | Predicted comparing ASM with Lock and Release commands. | -| 025B | | WaitFollowingPoke | \- | Waits the following Pokemon to end its last movement | Predicted comparing ASM with Lock and Release commands. | -| 025C | | SetFollowingPokeMovement | u16: Move Code | Changes the following Pokemon default movement to Move Code | The most important movement IDs are 0x30 and 0x38 (following and ghost-following behaviours respectively). | -| 025D | | SetFollowingPokePosition | u8: Position; u8: Direction | Moves the following Pokémon to one tile Position next to player and facing at Direction | For both parameters, up is 0, down is 1, left is 2 and right is 3. | -| 025E | EndFriendPark | BallResetFollowingPoke | \- | Moves the following Pokémon to the current player's position, and triggers the animation of sending the Pokémon out of its PokéBall after the player walks a step | This is commonly used after a different event following the player, so the player sends out the following Pokémon in the next step (instead of forcing it automatically with SendOutFollowingPoke). | -| 025F | | NoBallResetFollowingPoke | \- | Moves the following Pokémon to the current player's position | Almost same as BallResetFollowingPoke, but without the PokéBall animation (exactly like when a small Pokémon spawns after the player uses a warp). | -| 0260 | | SendOutFollowingPoke | \- | Triggers the animation of sending the first non-fainted Pokémon out of its PokéBall and spawns it on the last player position | Seems to be needed for refreshing/forcing its apparition after a Warp on the same map. | -| 0261 | MecScript | | \- | ??? | It's used in a lot of scripts that involve following Pokémon movements, placed at the top of them. Seems that it resets a lot of following Pokémon movement parameters and data. | -| 0262 | | | | | | -| 0263 | | Pokeathlon \* | | | | -| 0264 | | | | | | -| 0265 | | GetPokegearContactRandomGiftBerry \* | | | | -| 0266 | | GetPokegearContactGiftItem \* | | | | -| 0267 | MakePhoto | CameronPhotoScreen \* | | | | -| 0268 | | | | | | -| 0269 | | | | | | -| 026A | CheckAlbumPhoto | CheckAlbumIfFull \* | | | | -| 026B | | CheckRocketCostume \* | | | | -| 026C | | ActivateRocketCostume \* | | | | -| 026D | | | | | | -| 026E | | GetOWDirection | u16: Event ID; Var: Variable | Stores in Variable the current direction which Event ID is facing | Up is 0, Down is 1, Left is 2 and Right is 3. | -| 026F | | ApricornTreeAnimation \* | | | | -| 0270 | | ApricornTreeGetApricorn \* | | | | -| 0271 | | GiveApricornFromTree \* | | | | -| 0272 | | TextApricornName \* | | | | -| 0273 | | | | | | -| 0274 | | | | | | -| 0275 | | | | | | -| 0276 | | | | | | -| 0277 | | | | | | -| 0278 | | CountPartyMonsOfSpecies \* | | | | -| 0279 | | | | | | -| 027A | | | | | | -| 027B | | | | | | -| 027C | | | | | | -| 027D | | | | | | -| 027E | | | | | | -| 027F | | | | | | -| 0280 | | | | | | -| 0281 | | SaveWipeExtraChunks \* | | | | -| 0282 | | | Var: Variable | ??? | | -| 0283 | | | | | | -| 0284 | | | | | | -| 0285 | | | | | | -| 0286 | | | | | | -| 0287 | | GetPartySlotWithSpecies \* | var: Slot; u16 or Flex(???): Pokemon ID | Checks party for the presence of a Pokemon, and returns which slot they are in. | Assume that it checks for the first instance and then stops, so if you have multiple of the same Pokemon, it stops at the first instance and returns which slot it is in (0-5). Used in Silph Co. for Rotom | -| 0288 | | | | | | -| 0289 | | OpenScratchCardScreen \* | | | | -| 028A | | CloseScratchCard \* | | | | -| 028B | | GetScratchCardPrize \* | | | | -| 028C | | | | | | -| 028D | | MoveTutorChooseMove \* | | | | -| 028E | | TutorMoveTeachInSlot \* | | | | -| 028F | | TutorMoveGetPrice \* | | | | -| 0290 | | CheckHeadbuttCompatibility | Flex: Party Slot; Var: Variable | Stores 1 into Variable if the Pokémon at the given Party Slot can learn Headbutt. | Ilex Forest Tutor: Script File 92, Script 3 | -| 0291 | | IVCheckerJudge \* | | | | -| 0292 | | BufferStatName \* | | | | -| 0293 | | SetMonForme \* | | | | -| 0294 | | TextTrainerName \* | | | | -| 0295 | | | | | | -| 0296 | | | | | | -| 0297 | | | | | | -| 0298 | | | | | | -| 0299 | | | | | | -| 029A | | | | | | -| 029B | | | | | | -| 029C | | TextTypeName \* | | | | -| 029D | | GetItemQuantity \* | | | | -| 029E | | GetHiddenPowerType \* | | | | -| 029F | | SetFavoriteMon \* | | | | -| 02A0 | | GetFavoriteMon \* | | | | -| 02A1 | | GetOwnedRotomFormes \* | | | | -| 02A2 | | CountTranformedRotomsInParty \* | | | | -| 02A3 | | UpdateRotomForme \* | | | | -| 02A4 | | GetPartyPokemonForm \* | | | | -| 02A5 | | | | | | -| 02A6 | | | | | | -| 02A7 | | | | | | -| 02A8 | | | | | | -| 02A9 | | | | | | -| 02AA | | | | | | -| 02AB | | | | | | -| 02AC | | GetCurrentWeather | Var: Variable | Stores the current weather in Variable | | -| 02AD | | GetPlayerCoordinates \* | | | | -| 02AE | | | | | | -| 02AF | | | | | | -| 02B0 | | CheckFatefulEncounter \* | | | | -| 02B1 | | CommSanitizeParty \* | | | | -| 02B2 | | DayCareSanitizeMon \* | | | | -| 02B3 | | | | | | -| 02B4 | | TextBattleHallStreak \* | | | | -| 02B5 | | BattleHallCountUsedSpecies \* | | | | -| 02B6 | | BattleHallGetTotalStreak \* | | | | -| 02B7 | | | | | | -| 02B8 | | | | | | -| 02B9 | | | | | | -| 02BA | | FollowingPokemonIsEventTrigger \* | | | | -| 02BB | | | | | | -| 02BC | CheckWildBattle2 | | | | | -| 02BD | WildBattle2 | PokemonHasItem \* | | | | -| 02BE | | BattleTowerSetUpMultiBattle \* | | | | -| 02BF | | SetPlayerVolume \* | | | | -| 02C0 | | | | | | -| 02C1 | | | | | | -| 02C2 | | | | | | -| 02C3 | | CheckPokemonIsSeen \* | | | | -| 02C4 | | FloorTrapAnimation | | Triggers Team Rocket HQ trap-floor's graphical effect in the player's current position | | -| 02C5 | | | | | | -| 02C6 | | | | | | -| 02C7 | | TalkFollowingPoke | \- | The following Pokémon triggers a random movement, and then a random following message | This seems to be the command that executes when the player talks to the following Pokémon (at script #163). Files in a/2/2/0.narc link map names to possible texts. The following Pokémon ends up locked, so a Release should be used after this command. | -| 02C8 | | | | | | -| 02C9 | | OpenAlphPuzzle \* | u8: Puzzle ID | Loads the stone-panel puzzle of Puzzle ID. | ID 0 = Kabuto, ID 1 = Aerodactyl, ID 2 = Omanyte, ID 3 = Ho-Oh
Appears to check Flag 2423, 2424, 2425, 2426 for the completion of puzzles 0 to 3 respectively. | -| 02CA | | OpenRuinsofAlphHiddenRoom \* | u8: Room ID | Something to do with the secret room, not the puzzle trapdoor. | ID 0 = Kabuto Room, ID 1 = Aerodactyl Room, ID 2 = Omanyte Room, ID 3 = Ho-Oh Room | -| 02CB | | UpdateDayCareMonOverworlds \* | | | | -| 02CC | | | | | | -| 02CD | | | | | | -| 02CE | | | | | | -| 02CF | | | | | | -| 02D0 | | | | | | -| 02D1 | | | | | | -| 02D2 | | | u8: ???; u8: ???; u16: ???; u16: ???; u16: ??? | ??? | | -| 02D3 | | BoatAnimation | u8: Animation; u8: ???; u16: Header; u16: X coord; u16: Y coord | Plays the S.S. Aqua animation of leaving the port. Animation is either 0 or 1, with 0 being Olivine and 1 being Vermilion. X and Y coordinates are for the destination map | | -| 02D4 | | | | | | -| 02D5 | | | | | | -| 02D6 | | | | | | -| 02D7 | | | Var: Variable | ??? | | -| 02D8 | | | u8: ???; u8: ??? | ??? | | -| 02D9 | | CheckAlivePokemon | Var: Variable | Checks if player has at least 1 not fainted Pokémon, stores the result in Variable | Predicted. | -| 02DA | | CheckFollowingPoke | Var: Variable | Checks if player has a following Pokémon, stores the result in Variable | Supposed. | -| 02DB | | | \- | ??? | | -| 02DC | | | u8: ??? | ??? | | -| 02DD | | | u8: ???; Var: ??? | ??? | | -| 02DE | | | | | | -| 02DF | | CheckKurtApricorn \* | | | If not 0, script continues to check if daily flag is reset, then gives you the apricorns | -| 02E0 | | ClearKurtApricorn \* | | | | -| 02E1 | | GiveApricornBalls \* | | | | -| 02E2 | | CheckApricornCount \* | | | | -| 02E3 | | KurtApricornMenuScreen \* | | | | -| 02E4 | | StoreApricornJuice \* | | | | -| 02E5 | | CheckJuice \* | | | | -| 02E6 | | | | | | -| 02E7 | | | | | | -| 02E8 | | CreatePokeathlonFriendshipRoomStatues \* | | | | -| 02E9 | | TextPokeathlonCourseName \* | | | | -| 02EA | OpenLowScreen | OpenTouchScreen | \- | Changes the low screen design to the green Pokéball background | | -| 02EB | CloseLowScreen | CloseTouchScreen | \- | Sets the default low screen design | | -| 02EC | OpenLowYesNoBox | YesNoTouchScreen | Var: Variable | Opens a Yes-No selection, stores player's answer in Variable | Crashes if OpenTouchScreen is not used previously. | -| 02ED | Multi4 | MultiTouchStandardText | u8: ???; u8: ???; u8: ???; u8: ???; Var: Selection | Prepares a multiple selection menu with text bank #191, returns selected slot ID in Selection | | -| 02EE | Multi5 | MultiTouchLocalText | u8: ???; u8: ???; u8: ???; u8: ???; Var: Selection | Prepares a multiple selection menu with local texts, returns selected slot ID in Selection | | -| 02EF | TextScriptMulti4 | CreateMultiTouchBox | Flex: Text Slot; Flex: Top Screen Text;
Flex: Multi Box Slot | Adds a box with Multi Box Slot ID showing Text Slot text on the bottom screen and Top Screen Text on the top in a message box. Text depends on whether you use MultiTouchStandardText or MultiTouchLocalText | | -| 02F0 | CloseMulti4 | CloseMultiTouch | \- | Closes the multiple selection boxes | | -| 02F1 | | RockSmashItemCheck \* | Flex: ???; Var: ???; Var: ??? | ??? | | -| 02F2 | | | Var: ??? | ??? | | -| 02F3 | | | | | | -| 02F4 | | | | | | -| 02F5 | | | | | | -| 02F6 | | | | | | -| 02F7 | | | | | | -| 02F8 | | | | | | -| 02F9 | | | | | | -| 02FA | | | | | | -| 02FB | | | | | | -| 02FC | | | | | | -| 02FD | | | | | | -| 02FE | | | | | | -| 02FF | | | \- | ??? | | -| 0300 | | | | | | -| 0301 | | | | | | -| 0302 | | | | | | -| 0303 | | | | | | -| 0304 | | | | | | -| 0305 | | RenderCutscene \* | ???: ??? | Renders a cutscene
2 = Arceus stock image cutscene | | -| 0306 | | | | | | -| 0307 | | | | | | -| 0308 | | GiveTogepiEgg \* | | | | -| 0309 | | | | | | -| 030A | | GiveSpikyEaredPichu \* | \- | ??? | | -| 030B | | | | | | -| 030C | | OpenVoltorbFlip \* | | | | -| 030D | | KenyaCheckPartyOrMailbox \* | | | | -| 030E | | MartSell \* | \- | ??? | Related with the mart interface. | -| 030F | | SetFollowPokeInhibitState \* | | | | -| 0310 | | ScriptOverlayCmd \* | | | | -| 0311 | | BugContestAction \* | | | | -| 0312 | | TextBugContestWinner \* | | | | -| 0313 | | JudgeBugContest \* | | | | -| 0314 | | TextBugContestMonNick \* | | | | -| 0315 | | BugContestGetTimeLeft \* | | | | -| 0316 | | IsBugContestantRegistered \* | | | | -| 0317 | | | | | | -| 0318 | | | | | | -| 0319 | TakeMomMoney | TakeMomMoney \* | | | | -| 031A | GiveMomMoney | CheckMomMoneyBalance \* | | | | -| 031B | OpenMomMoneyBox | ShowMomMoney | Flex: X; Flex: Y | Shows mom savings money box at X and Y coordinates of the screen | | -| 031C | CloseMomMoneyBox | HideMomMoney | \- | Hides mom savings money box | | -| 031D | | | | | | -| 031E | | TextRulesetName \* | | | | -| 031F | | | | | | -| 0320 | | | | | | -| 0321 | | | | | | -| 0322 | | | | | | -| 0323 | | | | | | -| 0324 | | UpdateTownMap \* | u8(?): Map Type | Updates the town map to include Kanto
1 = Normal, Johto-only view
2 = Whole map, Kanto included | | -| 0325 | | | | | | -| 0326 | | | | | | -| 0327 | | | | | | -| 0328 | | | | | | -| 0329 | | | | | | -| 032A | | CelebiTimeTravelAnimation \* | | | | -| 032B | | | | | | -| 032C | | | | | | -| 032D | | MomGiftCheck \* | | | | -| 032E | | | | | | -| 032F | | | | | | -| 0330 | | UnownCircle \* | | | | -| 0331 | | | | | | -| 0332 | | InitMystriStageAnimation \* | | | | -| 0333 | | | | | | -| 0334 | | | | | | -| 0335 | | GetBuenasPassword \* | | | | -| 0336 | | | | | | -| 0337 | | | | | | -| 0338 | | | | | | -| 0339 | | GetShinyLeafCount \* | | | | -| 033A | | TryGiveShinyLeafCrown \* | | | | -| 033B | | CheckPokemonNickname \* | Flex: Party Slot; Var: Variable | Checks to see if the Pokémon at Party Slot position has a nickname. The variable will return 0 if the Pokémon does have a nickname. | Example: Script File 913, Function 35 | -| 033C | | | | | | -| 033D | | | Var: ??? | ??? | | -| 033E | | | | | | -| 033F | | | | | | -| 0340 | | | | | | -| 0341 | | | | | | -| 0342 | | | Var: Variable | ??? | | -| 0343 | | | Var: Variable | ??? | | -| 0344 | | CheckJadeOrbRequirements | Var: Variable | Stores 1 in Variable if player has both Kyogre and Groudon in the Pokémon party and they have been caught in Johto, stores 0 otherwise | | -| 0345 | | | Var: Variable | ??? | | -| 0346 | CheckMomMoneyNumber | CheckMoneyFull | u16: Money Account; Var: Variable | Stores 1 in Variable if the chosen money account is full.
Money account 0 = Mom's savings;
Money account 1 = Player; | | -| 0347 | | SystemSetSleepFlag \* | | | | -| 0348 | | | | | | -| 0349 | | | | | | -| 034A | | | | | | -| 034B | | TextItemLowercase | u8: String Buffer; Flex: Item | Stores Item's lowercase name in String Buffer | International release exclusive. | -| 034C | | TextItemPlural | u8: String Buffer; Flex: Item | Stores Item's plural noun in String Buffer | International release exclusive. | -| 034D | | TextPartyPokemonDefault | u8: String Buffer; Flex: Party position | Stores the name of the Pokémon in Party Position in String Buffer with default color tags encoding | International release exclusive. Names stored at text file 238. | -| 034E | | | | | International release exclusive. | -| 034F | | | u8: String Buffer | ??? | International release exclusive. | -| 0350 | | | u8: String Buffer; Flex: Accesory | ??? | International release exclusive. | -| 0351 | | TextTrainerClass | u8: String Buffer; Flex: Trainer class | Stores Trainer class' lowercase noun in String Buffer | International release exclusive. | -| 0352 | | TextSealPlural | u8: String Buffer; Flex: Seal | Stores Seal's plural noun in String Buffer | International release exclusive. Text archive 16. | -| 0353 | | TextCapitalize | u8: String Buffer | Capitalizes the string currently stored in String Buffer | International release exclusive. | -| 0354 | | TextFloor | u8: String Buffer; u8: Floor | Stores Floor's name in String Buffer | International release exclusive. Names stored at text file 191, lines 0x74 to 0x7A. | \ No newline at end of file +| | New proposed names | Parameters | Function | Notes | +| ---- | ---------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| 0000 | Nop | \- | Nothing | | +| 0001 | Dummy | \- | Nothing | Has exactly the same ASM code as Nop. | +| 0002 | End | \- | End script execution | | +| 0003 | WaitTime | u16: Time; Var: ??? | Stop script execution for Time frames | The Var's purpose is unknown. Command uses ScrReg 0 as countdown. | +| 0004 | RegValueSet | u8: Script Register; u8: Value | Assigns Value to Script Register value | | +| 0005 | RegDataSet | u8: Script Register; u32: Value | Assigns Value to Script Register value | | +| 0006 | RegAdrsSet | u8: Script Register; u32: Address | Assigns data in Address offset to Script Register value | | +| 0007 | AdrsValueSet | u32: Address; u8: Value | Assigns Value to the Address offset | | +| 0008 | AdrsRegSet | u32: Address; u8: Script Register | Assigns Script Register value to the Address offset | | +| 0009 | RegRegSet | u8: Script Register 1; u8: Script Register 2 | Assigns Script Register 2 value to Script Register 1 value | | +| 000A | AdrsAdrsSet | u32: Address 1; u32: Address 2 | Assigns data in Address 2 to the Address 1 offset | | +| 000B | CompareRegs | u8: Script Register; u8: Script Register | Compares two Script Register | | +| 000C | CompareRegValue | u8: Script Register; u8: Value | Compares Script Register value with Value | | +| 000D | CompareRegAdrs | u8: Script Register; u32: Address | Compares Script Register value with data in Address | | +| 000E | CompareAdrsReg | u32: Address; u8: Script Register | Compares data in Address with Script Register value | | +| 000F | CompareAdrsValue | u32: Address; u8: Value | Compares data in Address with Value | | +| 0010 | CompareAdrsAdrs | u32: Address 1; u32: Address 2 | Compares data in Address 1 with data in Address 2 | | +| 0011 | CompareVarValue | Var: Variable; u16: Value | Compares Variable value with Value | | +| 0012 | CompareVars | Var: Variable 1; Var: Variable 2 | Compares Variable 1 value with Variable 2 value | | +| 0013 | ParallelCommonScript | u16: ??? | ??? | Somehow related with parallel common script execution. | +| 0014 | CommonScript | u16: Global Script ID | Calls Global Script ID script | The Common Script table is located at 0xFA48C in IPKS arm9.bin, ordered from highest to lowest with structure: u16 Global Script ID | u16 Script file | u16 Text file. The executed script inside script file is determined as: used Global Script ID \- tabulated Global Script ID. | +| 0015 | LocalScript | \- | Returns to the invoking script/function after a Common Script | | +| 0016 | Jump | u32: Relative Jump | Jumps to a function, Relative Jump bytes forward or backward | Relative Jump can have negative values (backward jump). | +| 0017 | JumpIfObjID | u8: Event ID; u32: Relative Jump | Jumps to a function, Relative Jump bytes forward or backward, if invoking event has Event ID as ID | | +| 0018 | JumpIfBgID | u8: ???; u32: Relative Jump | ??? | Maybe jumps to a function if invoking event has a specific ID. | +| 0019 | JumpIfPlayerDir | u8: Player Direction; u32: Relative Jump | Jumps to a function, Relative Jump bytes forward or backward, if player is looking in Player Direction | Supposed. Needs to be tested in game. | +| 001A | Call | u32: Relative Jump | Calls a function, Relative Jump bytes forward or backward | Can be used to make loops when calling the own invoking function. | +| 001B | Return | \- | Returns to the invoking script/function after a Call | | +| 001C | JumpIf | u8: Condition; u32: Relative Jump | If Condition in the condition table, jumps to a function | Ask AdAstra for the condition list. Condition table is updated after a IfVarValue, IfVarVar, CheckFlag... | +| 001D | CallIf | u8: Condition; u32: Relative Jump | If Condition in the condition table, calls a function | | +| 001E | SetFlag | u16: Flag | Sets Flag to 1 | | +| 001F | ClearFlag | u16: Flag | Sets Flag to 0 | | +| 0020 | CheckFlag | u16: Flag | Checks if Flag is set | It updates the internal condition flag and maybe part of the condition table. | +| 0021 | SetFlagFromVar | Var: Flag | Sets the flag whose ID is stored in Flag | | +| 0022 | ClearFlagFromVar | Var: Flag | Clears the flag whose ID is stored in Flag | | +| 0023 | FlagStatusToVar | Var: Flag; Var: Variable | Checks if Flag is set and store the result in Variable | | +| 0024 | SetTrainerFlag | Flex: Trainer ID | Sets the flag of Trainer ID, so marks it as beaten trainer | So this trainer will not battle against you. Used in every Gym after the leader is beaten. | +| 0025 | ClearTrainerFlag | Flex: Trainer ID | Clears the flag of Trainer ID, so marks it as unbeaten trainer | So this trainer can be challenged again. | +| 0026 | CheckTrainerFlag | Flex: Trainer ID | Checks if Trainer ID has been beaten | It updates the internal condition flag and maybe part of the condition table. | +| 0027 | IncrementVar | Var: Variable; Flex: Operand | Stores the operation Variable \+ Operand in Variable | | +| 0028 | DecrementVar | Var: Variable; Flex: Operand | Stores the operation Variable \- Operand in Variable | | +| 0029 | SetVar | Var: Variable; u16: Value | Stores Value in Variable | | +| 002A | SetVarFromVariable | Var: Variable 1; Var: Variable 2 | Assigns value of Variable 2 to Variable 1 | | +| 002B | SetVarFromFlexible | Var: Variable; Flex: Flexible Value | Stores Flexible Value (or its value if variable) in Variable | | +| 002C | MessageAll | u8: Text Slot | Display line Text Slot from the text file, all at once | | +| 002D | Message | u8: Text Slot | Display line Text Slot from the text file | | +| 002E | MessageFlex | Flex: Text Slot | Display line Text Slot from the text file | Unlike 002D, this command also accepts a variable as the input field. | +| 002F | MessageNoSkip | Flex: Text Slot | ??? | | +| 0030 | | u8: Text Slot | ??? | | +| 0031 | WaitAB | \- | Waits for button A or button B to be pressed | Somehow it uses ScrReg 0 as countdown. | +| 0032 | WaitButton | \- | Waits for a button to be pressed | It seems only A, B, X and direction pad buttons work. | +| 0033 | WaitABPad | \- | Waits for button A, button B or pad buttons to be pressed | Supposed. Needs to be tested in game. | +| 0034 | OpenMessage | \- | ??? | | +| 0035 | CloseMessage | \- | Closes message box | SDSME name is misleading, for no button is needed to be pressed. | +| 0036 | FreezeMessage | \- | ??? | Probably keeps the message box alive after a script. ASM differs with CloseMessage only in a BL instruction. | +| 0037 | SetIconBoard | u8: Text Slot; u8: Type; u16: Icon; u16: ??? | Prepares an icon board message box displaying Text Slot message, of Type type, and with Icon image if chosen type supports it | Type values from 0 to 3 are: brown (with icon), green (with icon), gray and blue. | +| 0038 | SetTextBoard | u8: Type; u16: Icon | Prepares a text board message box of Type type, and with Icon image if chosen type supports it | Type values from 0 to 3 are: brown (with icon), green (with icon), gray and blue. | +| 0039 | ShowBoard | u8: Process | Triggers different Process processes for the board | Process value 0 keeps the board, value 1 creates the board, value 2 hides the board, value 3 shows the board and value 4 deletes the board. | +| 003A | WaitBoard | \- | Waits the board last process to end | Supposed. | +| 003B | BoardMessage | u8: Text Slot; u16: Variable | Displays Text Slot message in the current text box, stores the current text box status in Variable | | +| 003C | CloseBoard | Var: Variable | Returns 1 to Variable if the player has pressed a button so the board must close, 0 otherwise | Variable is stored in ScrReg 0. Command waits for a button to be pressed and stores result in Variable. | +| 003D | Menu | \- | | | +| 003E | | u8: ???; u8: ???; u8: ???; u8: ???; u8: ???; u8: ??? | | | +| 003F | YesNoBox | Var: Variable | Opens a Yes-No dialog and stores user response in Variable | Variable is stored in ScrReg 0. | +| 0040 | MultiStandardText | u8: X; u8: Y; u8: Cursor; u8: Cancel; Var: Selection | Prepares a multiple selection menu at X and Y screen position, with Cursor default selected option and possibility of cancelling depending on Cancel, with text bank #321, returns selected slot ID in Selection | If Cancel is 1, the user can select the last option by pressing B button. | +| 0041 | MultiLocalText | u8: X; u8: Y; u8: Cursor; u8: Cancel; Var: Selection | Prepares a multiple selection menu at X and Y screen position, with Cursor default selected option and possibility of cancelling depending on Cancel, with local texts, returns selected slot ID in Selection | If Cancel is 1, the user can select the last option by pressing B button. | +| 0042 | AddMultiOption | u8: Text Slot; u8: Multi Slot | Adds an option with Multi Slot ID showing Text Slot text | | +| 0043 | ShowMulti | \- | Shows the prepared multi in screen | The game will hide it when the player has selected an option. | +| 0044 | ListStandardText | u8: X; u8: Y; u8: Cursor; u8: Cancel; Var: Selection | Prepares a multiple selection list at X and Y screen position, with Cursor default selected option and possibility of cancelling depending on Cancel, with text bank #321, returns selected slot ID in Selection | If Cancel is 1, the user can select the last option by pressing B button. The difference between a Multi and a List seems to be that lists are scrollable. | +| 0045 | ListLocalText | u8: X; u8: Y; u8: Cursor; u8: Cancel; Var: Selection | Prepares a multiple selection list at X and Y screen position, with Cursor default selected option and possibility of cancelling depending on Cancel, with local texts, returns selected slot ID in Selection | If Cancel is 1, the user can select the last option by pressing B button. The difference between a Multi and a List seems to be that lists are scrollable. | +| 0046 | AddListOption | Flex: Option MSG; Flex: Highlight MSG; Flex: List Slot | Adds a new option to the list, with List Slot ID and showing text line Option MSG. It also displays text line Highlight MSG when that option is highlighted. | If Highlight MSG is set to 255 [0xFF], no message will be displayed when the option is highlighted.
This command relies on an open message box in order to display the highlight messages.

Trying to highlight an option with Highlight MSG different than 255 [0xFF] will result in a crash if no message box is already being displayed. | +| 0047 | ShowList | \- | Shows the prepared list in screen | The game will hide it when the player has selected an option. | +| 0048 | MultiColumn | u8: Columns | Splits the multi window in Columns different columns | | +| 0049 | PlayFanfare | Flex: Sound | Plays Sound | | +| 004A | StopFanfare | Flex: Sound | Stops Sound | | +| 004B | WaitFanfare | Flex: Sound | Waits Sound to finish | | +| 004C | PlayCry | Flex: Pokémon; Flex: Unused | Plays a Pokémon cry | | +| 004D | WaitCry | \- | Waits the current cry to finish | | +| 004E | PlaySound | u16: Sound | Pauses current music, then Plays Sound | | +| 004F | WaitSound | \- | Waits for Sound to finish, then resumes music | | +| 0050 | PlayMusic | u16: Music | Plays Music | | +| 0051 | StopMusic | u16: Unused | Stops current music | Parameter is ignored because the game identifies what music is playing. | +| 0052 | PlayDefaultMusic | \- | Plays map default music | | +| 0053 | SetMusic | u16: Music | ??? | | +| 0054 | FadeOutMusic | u16: Volume; u16: Time | Fades out the current music to Volume in Time frames | | +| 0055 | FadeInMusic | u16: Time | Fades in the current music to normal volume in Time frames | | +| 0056 | SetMusicPauseStatus \* | u8: SSEQ Player ID; u8: Status | ??? | | +| 0057 | TempMusic \* | u16: Music ID | ??? | | +| 0058 | SetBGMFlag \* | u8: ??? | ??? | Seems to set a flag related to the music system. | +| 0059 | CheckChatotCry | Var: Variable | Checks if Chatot has custom sound, stores answer in Variable | Returns 0 or 1 to the specified Variable. Not for a specific Chatot but for all (they share a custom sound). | +| 005A | StartChatotCry | Var: Variable | Starts Chatot microphone record, stores answer in Variable | Returns 0 or 1 to the specified Variable depending on successful recording. | +| 005B | StopChatotCry | \- | Stops recording Chatot custom sound | | +| 005C | SaveChatotCry | \- | ??? | Maybe saves the custom Chatot sound in the savegame. | +| 005D | | \- | ??? | | +| 005E | Movement | Flex: Event ID; u32: Relative Jump | Applies movement at Relative Jump to Event ID | Movements must be halfword-aligned in the script file. If you're using an old tool which doesn't align them, force the alignment with a TextPlayerName 0x0 or some unnoticeable command of 3, 5, 7 or 9 bytes length. | +| 005F | WaitMovement | \- | Waits for all movements to finish | | +| 0060 | LockAll | \- | Locks every event in the map | | +| 0061 | ReleaseAll | \- | Releases every event in the map | | +| 0062 | Lock | u16: Event ID | Locks Event ID | | +| 0063 | Release | u16: Event ID | Releases Event ID | | +| 0064 | AddOW | Flex: Event ID | Add Event ID overworld in the map | It is probable that, if executing this having Event ID overworld already in the map, it gets duplicated. | +| 0065 | RemoveOW | Flex: Event ID | Removes Event ID overworld from the map | | +| 0066 | LockCamera | Flex: X; Flex: Y | Locks the camera at position X and Y | Seems to place a invisible NPC at coords X and Y. It appears that both must be the current player position. | +| 0067 | ReleaseCamera | \- | Releases the camera | | +| 0068 | FacePlayer | \- | Makes the invoking event look at the player | In fact it simply takes the current player direction and makes the NPC look at the opposite direction. | +| 0069 | GetPlayerPosition | Var: X; Var: Y | Saves the current player position in X and Y | | +| 006A | GetOWPosition | Flex: Event ID; Var: X; Var: Y | Saves the current Event ID position in X and Y | If Event ID is deleted (via RemoveOW) it gives 0xFF for both coordinates. | +| 006B | SetFollowingOverworld \* | Flex: X; Flex: Z; Flex: Y | ??? | Maybe teleports the player to other coords? | +| 006C | KeepOverworld | Flex: Event ID; u8: Value | If Value is 1, prevents Event ID from disappearing when entering on a new map header | | +| 006D | SetOWMovement | Flex: Event ID; u16: Movement | Changes the Event ID's movement number to Movement | | +| 006E | GiveMoney | u32: Money | Adds Money to the player's money | | +| 006F | TakeMoney | u32: Money | Subtracts Money from the player's money | | +| 0070 | CompareMoney | Var: Variable; u32: Money | Stores 1 into Variable if the player has Money or more money. Stores 0 otherwise. | | +| 0071 | ShowMoney | Flex: X; Flex: Y | Shows the money box at X and Y coordinates of the screen | Each X and Y unit implies 8 pixels. Values of 0 or higher than the screen may glitch the screen. | +| 0072 | HideMoney | \- | Hides the money box | | +| 0073 | UpdateMoney | \- | Updates the current money in the money box | | +| 0074 | ShowSpecialCurrency | u8: Currency; Flex: X Coord; Flex: Y Coord | Shows the Currency box at X and Y coordinates of the screen. | Currency:

0 = Coins
1 = Battle Points
2 = Athlete Points | +| 0075 | HideSpecialCurrency | \- | Hides the currently displayed special currency box. | | +| 0076 | UpdateSpecialCurrency | u16: Currency | Updates the current Currency in the currency box. | Currency types are the same as above [0074]. | +| 0077 | CheckCoins | Var: Variable | Stores the current casino coin amount in Variable | | +| 0078 | GiveCoins | Flex: Coins | Adds Coins to the player's casino coins | | +| 0079 | TakeCoins | Flex: Coins | Subtracts Coins from the player's casino coins | | +| 007A | GiveAthletePoints | Flex: Amount | Adds the given Amount to the player's Athlete Points | | +| 007B | TakeAthletePoints | Flex: Amount | Subtracts the given Amount from the player's Athlete Points | | +| 007C | CompareAthletePoints | Var: Result; Flex: Amount | Stores 1 into Variable if the player has the given Amount of Athlete Points or more. Stores 0 otherwise. | | +| 007D | GiveItem | Flex: Item; Flex: Amount; Var: Variable | Adds Amount of Item item, stores 1 in Variable if the player had less than 1000 - Amount (100 - Amount if TM/HM), stores 0 otherwise | Both Item and Amount are flexible, but if you use CommonScript 0x7F1 after that (as it is meant to be) you must place these two values in 0x8004 and 0x8005 in order to make the script work properly. | +| 007E | TakeItem | Flex: Item; Flex: Amount; Var: Variable | Subs Amount of Item item, stores 1 in Variable if the player had at least Amount items in the bag, stores 0 otherwise | | +| 007F | CheckItemSpace | Flex: Item; Flex: Amount; Var: Variable | Stores 1 in Variable if the player has less than 1000 - Amount of Item items (100 - Amount if TM/HM), stores 0 otherwise | | +| 0080 | CheckItem | Flex: Item; Flex: Amount; Var: Variable | Stores 1 in Variable if the player has at least Amount of Item items in the bag, stores 0 otherwise | Even if the Amount to check for is 0, the check will return 0 if you don't have the item at all. | +| 0081 | CheckItemIsMachine | Flex: Item; Var: Variable | Stores 1 in Variable if Item is TM or HM, stores 0 otherwise | | +| 0082 | GetItemPocket | Flex: Item; Var: Variable | Stores the bag pocket of Item in Variable | | +| 0083 | SetStarter | Flex: Pokémon | Stores Pokémon as the starting Pokémon in the game save data | | +| 0084 | GenderMessage | u8: Male Text; u8: Female Text | Displays Male Text or Female Text message depending on player's gender | | +| 0085 | CheckSeals \* | Flex: Seal ID; Var: Number of Seals in Seal Case | Checks the number of a certain type of Ball Seals that the player has. The variable is the output of how many Seals you have. | Example: Farmhouse on Route 39 | +| 0086 | GiveSeals \* | Flex: Seal ID; Flex: Number of Seals to be Given | Gives the player Ball Seals. | Example: Farmhouse on Route 39 | +| 0087 | GiveRandomSeals \* | Var: Random Seal ID 1; Var: Random Seal ID 2; Var: Random Seal ID 3 | Generates three random types of Ball Seals and gives them to the player (repeats are possible). Each variable will yield a 0 if the player has no more room for the Seal(s) in the Seal Case. | Example: House in top right of Olivine City | +| 0088 | CheckPokemonForm \* | Flex: Party Position; Var: Variable | Checks the form of the Pokemon in party slot Party Position and returns the form ID in Variable. | | +| 0089 | GivePokemon | Flex: Pokémon; Flex: Level; Flex: Item ID; Flex: Form; Flex: Ability; Var: Variable | Gives Pokémon at level Level, store 1 in Variable if succeed and 0 otherwise | | +| 008A | GivePokemonEgg | Flex: Pokémon; Flex: Location | Gives a Pokémon egg received from Location text slot at text bank #281 | | +| 008B | ReplaceMove | Flex: Party Slot; Flex: Move Slot; u16: Move ID | Overwrites Move Slot of the Pokémon at the specified Party Slot with Move ID. | Party slot and move slot start at 0 rather than 1, so the ranges are 0-5 and 0-3 respectively.
[https://bulbapedia.bulbagarden.net/wiki/List_of_moves](https://bulbapedia.bulbagarden.net/wiki/List_of_moves) | +| 008C | CheckPokemonHasMove | Var: Variable; Flex: Move ID; Flex: Party Slot | Checks if a Pokémon at the specified Party Slot knows a move with given Move ID.
Stores 1 into Variable if yes, 0 otherwise. | Example: Headbutt tutor in Ilex Forest (Script File 92, Script 3) | +| 008D | CheckMoveInParty | Var: Variable; Flex: Move ID | Checks if any Pokémon in the party knows Move ID move, stores in Variable the position of the first Pokémon that knows it or stores 6 if no Pokémon in the party knows the move | | +| 008E | CheckPokeGearRematch \* | Flex: Phone Number; Var: Variable | | Has something to do with rematches but not sure if it's checking if a rematch is active or the # the rematch is on. Gets used when deciding when to let Gym Leaders appear in the overworld for a photo shoot after they are defeated in the Dojo. | +| 008F | ChooseRivalName | Var: Variable | Opens the keyboard for naming the rival, stores 1 in Variable if user cancels the proccess | | +| 0090 | GetCounterpartSprite | Var: Variable | Stores 97 (Lyra sprite ID) into the Variable if you're playing as Ethan;
Stores 0 (Ethan sprite ID) into the Variable if you're playing as Lyra. | Remember that Overworld Entities with sprite IDs 101 to 116 refer to the value of vars 0x4020-0x402F for the sprite to display. | +| 0091 | UpgradePokegear | u8: Module | Adds the worldmap to the Pokegear if Module is 1, adds the radio if Module is 2 | | +| 0092 | RecordPokegearNumber | Flex: ??? | | | +| 0093 | CheckPokegearNumberRegistered \* | Flex: Phone Number; Var: Variable | Stores 0 into Variable if Phone Number has not been registered, and 1 if it has been registered. | Example: Sabrina in Olivine Harbor (Script File 153, Script 7). Used frequently by Gym Leaders appearing in the overworld. | +| 0094 | | | | | +| 0095 | | | | | +| 0096 | ReturnScreen | \- | Restores the normal overworld screen | | +| 0097 | | | | | +| 0098 | | \- | | | +| 0099 | DressPokemon \* | \- | | | +| 009A | ContestDressupScreen \* | \- | | | +| 009B | DressUpArtworkScreen \* | \- | | | +| 009C | SealCapsuleScreen \* | \- | | | +| 009D | WorldMapScreen | \- | Opens the worldmap screen | | +| 009E | PCBoxScreen \* | \- | | | +| 009F | DrawScreenUnion \* | \- | | | +| 00A0 | TrainerCaseUnion \* | \- | | | +| 00A1 | TradeScreenUnion \* | \- | | | +| 00A2 | RecordMixingUnion \* | \- | | | +| 00A3 | EndGameScreen | \- | Opens the Hall of Fame and game ending screens | | +| 00A4 | HallOfFameData \* | \- | | | +| 00A5 | StoreGTSStatus \* | ??? | | | +| 00A6 | InitWFC \* | ??? | | | +| 00A7 | StarterSelectionScreen | \- | Opens the starter Pokémon selection screen | | +| 00A8 | GetTrainerPathToPlayer \* | Flex: ??? | | | +| 00A9 | TrainerStepTowardsPlayer \* | Flex: ???; Var: Variable | | | +| 00AA | GetTrainerEyeType \* | Var: Variable | | | +| 00AB | GetEyeTrainerNum \* | Flex: ???; Var: Variable | | | +| 00AC | WritePlayerName | Var: Variable | Opens the keyboard for naming the player, stores 1 in Variable if user cancels the proccess | | +| 00AD | WritePokemonName | Flex: Party Position; Var: Variable | Opens the keyboard for naming a Pokémon in Party Position, stores 1 in Variable if user cancels the proccess | | +| 00AE | FadeScreen | u16: Frame Count; u16: Duration; u16: Fade Style; u16: Color | Fades screen to chosen 15-bit Color, using the chosen Fade Style. The transition will render Frame Count images, of Duration length each. | Type 0 for fade in, Type 1 for fade out. Color has 15-bit format. Transition is the number of color changes that the game does in the fading. | +| 00AF | WaitFadeScreen | \- | Waits for the screen fade to end | | +| 00B0 | Warp | Flex: Map; u16: Door; Flex: X; Flex: Y; Flex: Dir | Warps to X and Y position of Map header with initial Dir direction, using Door warp | When Door is 0 it doesn't use any door animation. | +| 00B1 | RockClimbAnimation | Flex: Party Position | Uses rock climb with the Pokémon at Party Position position | | +| 00B2 | SurfAnimation | Flex: Party Position | Uses surf with the Pokémon at Party Position position | | +| 00B3 | WaterfallAnimation | Flex: Party Position | Uses waterfall with the Pokémon at Party Position position | | +| 00B4 | FlyAnimation | u16: Map; Flex: X; Flex: Y | Flies to Map header map, to coordinates X and Y | | +| 00B5 | FlashAnimation | \- | Sets weather to 12 (darkness after flash) and then updates the weather graphics | | +| 00B6 | WhirlpoolAnimation | Flex: Party Position | Uses whirlpool with the Pokémon at Party Position position | | +| 00B7 | CutAnimation | Flex: Party Position | Uses cut with the Pokémon at Party Position position | | +| 00B8 | CheckBike | Var: Variable | Stores 1 in Variable if player is riding the bike, stores 0 otherwise | | +| 00B9 | RideBike | u8: Action | Changes player form from normal to riding the bike if Action is 1, otherwise it sets the normal form to the player | | +| 00BA | CyclingRoad | u8: Action | If Action is 1, the game sets the cycling road flag and moves the player down. Otherwise the flag is deactivated. | | +| 00BB | CheckPlayerForm | Var: Variable | Stores in Variable the current player form | Values 0 is for normal form, value 1 for riding the bike, value 2 for surfing, value 3 for Rocket clothing | +| 00BC | SetPlayerForm | u16: Form | Activates the Form bit in the internal player form data | The purpose of the different bits still needs to be researched. | +| 00BD | UpdatePlayerForm | \- | Updates changes in the internal player form data in the screen | | +| 00BE | TextPlayerName | u8: String Buffer | Stores player's name in String Buffer | | +| 00BF | TextRivalName | u8: String Buffer | Stores rival's name in String Buffer | | +| 00C0 | TextCounterpart | u8: String Buffer | Stores counterpart's name in String Buffer | | +| 00C1 | TextPartyPokemon | u8: String Buffer; Flex: Party Position | Stores the name of the Pokémon in Party Position in String Buffer | | +| 00C2 | TextItem | u8: String Buffer; Flex: Item | Stores Item's name in String Buffer | | +| 00C3 | TextPocket | u8: String Buffer; Flex: Pocket | Stores Pocket's name in String Buffer | | +| 00C4 | TextMachineMove | u8: String Buffer; Flex: Item | Stores the name of the move contained in Item TM/HM in String Buffer | | +| 00C5 | TextMove | u8: String Buffer; Flex: Move | Stores battle Move's name in String Buffer | | +| 00C6 | TextNumber | u8: String Buffer; Flex: Number | Stores a Number in String Buffer | | +| 00C7 | TextPokeNickname | u8: String Buffer; Flex: Party Position | Stores the nickname of the Pokémon in Party Position in String Buffer | | +| 00C8 | | | | | +| 00C9 | TextPlayerTrainerType | u8: String Buffer | Stores player's Union Room trainer type in String Buffer | | +| 00CA | TextPokemon | u8: String Buffer; Flex: Pokémon; u16: Unused; u8: Unused | Stores Pokémon's name in String Buffer | The two Unused parameters are for defining male/female nouns and singular/plural nouns respectively. However both don't apply in this command. | +| 00CB | TextStarterPokemon | u8: String Buffer | Stores the name of the player' starter Pokémon in String Buffer | | +| 00CC | TextRivalStarter | u8: String Buffer | Stores the name of the rival' starter Pokémon in String Buffer | | +| 00CD | TextCounterpartStarter | u8: String Buffer | Stores the name of the counterpart' starter Pokémon in String Buffer | | +| 00CE | CheckStarter | Var: Variable | Stores the starter Pokémon ID in Variable | | +| 00CF | DummyTextGoods | u8: String Buffer; Flex: Unused | Loads an empty string in String Buffer | | +| 00D0 | DummyTextTrap | u8: Unused; Flex: Unused | Nothing | | +| 00D1 | DummyTextTreasure | u8: Unused; Flex: Unused | Nothing | | +| 00D2 | TextMapName | u8: String Buffer; Flex: Map | Stores Map header name in String Buffer | | +| 00D3 | GetSwarmInfo | Var: Map; Var: Pokémon | Selects a zone depending on a random seed, then stores the zone ID in Map and the corresponding swarm Pokémon of that zone in Pokémon | Predicted. Needs to be checked. | +| 00D4 | TrainerID | Var: Variable | Stores the trainer ID number in Variable depending on the script ID | This means you shouldn't use this command in a normal script. | +| 00D5 | TrainerBattle | Flex: Trainer 1; Flex: Trainer 2; u8: Result; u8: ??? | Starts a battle against Trainer 1 and, if Trainer 2 is neither 0 nor the same as Trainer 1, a double battle against both. Continues without warping to Pokemon Center/home if Result is equal to 1. | Your party will also be fully healed after the battle if Result is 1. Example: Cherrygrove City fight with Rival | +| 00D6 | TrainerMessage | Flex: Trainer ID; Flex: Type | Displays the text of Trainer ID trainer at condition Type | The possible Type values are the following (expand the note for see them) | +| 00D7 | TrainerMsgCheck | Var: Noticing; Var: Defeat; Var: One Pokémon | If the script ID corresponds to a single battle trainer, stores 0 in Noticing, 2 in Defeat and 0 in One Pokémon. If it corresponds to a double battle, stores 3, 5 and 6 or 7, 9 and 10 depending on whether it's the first or the second trainer | This means you shouldn't use this command in a normal script. | +| 00D8 | TrainerRematchMsgCheck | Var: Noticing; Var: Defeat; Var: One Pokémon | If the script ID corresponds to a single battle trainer, stores 17 in Noticing, 0 in Defeat and 0 in One Pokémon. If it corresponds to a double battle, stores 18, 0 and 6 or 19, 0 and 10 depending on whether it's the first or the second trainer | This means you shouldn't use this command in a normal script. | +| 00D9 | TrainerTypeCheck | Var: Variable | Stores 0 in Variable if the script ID corresponds to a single battle, stores 1 if it corresponds to a double battle | This means you shouldn't use this command in a normal script. | +| 00DA | TrainerMusic | Flex: Trainer | Plays Trainer's overworld music | It checks if player is in Johto or Kanto for that. | +| 00DB | LostBattle | \- | Return to Pokémon Center or player's house after being defeated | | +| 00DC | CheckBattleIsLost | Var: Variable | Stores 0 in Variable if player has been defeated in battle, stores 1 otherwise | | +| 00DD | CheckDefeatedPokemon | Var: Variable; u8: ??? | Stores 0 in Variable if player defeated or catched the wild Pokemon, stores 1 otherwise | | +| 00DE | Check2vs2 | Var: Variable | Stores 1 in Variable if player has at least 2 not fainted Pokémon, stores 0 otherwise | | +| 00DF | DummyTrainerBattle | \- | Starts a battle against trainer with ID 1 | | +| 00E0 | DummyTrainerFlag | \- | Sets the trainer flag with the same ID as the invoking event | | +| 00E1 | DummyTrainerFlagJump | u32: Relative Jump | Jumps to a function, Relative Jump bytes forward or backward, if trainer flag with the invoking event ID is set | | +| 00E2 | | | | | +| 00E3 | | | | | +| 00E4 | | | | | +| 00E5 | | | | | +| 00E6 | | | | | +| 00E7 | | | | | +| 00E8 | | | | | +| 00E9 | | | | | +| 00EA | | | | | +| 00EB | | | | | +| 00EC | | | | | +| 00ED | | | | | +| 00EE | CheckPokerus | Var: Variable | Stores 1 in Variable if one or more Pokémon in the party are infected with the Pokérus | | +| 00EF | GetPokemonGender | Flex: Party Position; Var: Variable | Stores 0 in Variable if Pokémon at Party Position is male, 1 if is female and 2 if gender is unknown | Unknown gender value is supposed and should be checked. | +| 00F0 | SetElevatorWarp \* | Var: Variable | | | +| 00F1 | GetElevatorFloor | Var: Variable | Stores in Variable the current floor in a elevator | | +| 00F2 | ElevatorBox | u8: X; u8: Y; Var: Variable; Flex: Floor | Shows the current floor number in a box at X and Y coordinates in the screen | Each X and Y unit implies 8 pixels. Values of 0 or higher than the screen may glitch the screen. Variable and Floor parameters have not been tested. | +| 00F3 | CountJohtoDexSeen | Var: Variable | Stores in Variable the total seen Pokemon in the Johto Pokédex | | +| 00F4 | CountJohtoDexObtained | Var: Variable | Stores in Variable the total obtained Pokemon in the Johto Pokédex | | +| 00F5 | CountNationalDexSeen | Var: Variable | Stores in Variable the total seen Pokemon in the National Pokédex | | +| 00F6 | CountNationalDexObtained | Var: Variable | Stores in Variable the total obtained Pokemon in the National Pokédex | | +| 00F7 | DummyNationalDexCheck | \- | Nothing | | +| 00F8 | GetDexProgressMsg | u8: Mode; Var: Message; Var: Unknown | Checks the number of seen Pokémon in the Johto Pokédex (if Mode is 0) or the number of obtained Pokémon in the National Pokédex (otherwise) and stores the corresponding Professor message in Message, also storing 0x4AA in Unknown | | +| 00F9 | WildBattle | Flex: Pokémon; Flex: Level | Starts a wild battle against a Pokémon of level Level | | +| 00FA | WildBattleNoButtons | Flex: Pokémon; Flex: Level | Starts a first wild battle against a Pokémon of level Level | The difference between this and other similar commands is that Bag, Run and Pokémon buttons are disabled. | +| 00FB | CatchTutorial | \- | Starts the catch tutorial battle | | +| 00FC | | | | | +| 00FD | CheckSaveGame | Var: Variable | Stores 0 in Variable if a different savegame exists and it's not possible to save, stores 1 if no previous savegame exists, stores 2 if game has to save a lot of data and stores 3 if game can perform a quick save | | +| 00FE | SaveGame \* | | | | +| 00FF | CheckPortrait \* | | | | +| 0100 | SetPortraitTitle \* | | | | +| 0101 | | | | | +| 0102 | | | | | +| 0103 | | | | | +| 0104 | | | | | +| 0105 | | | | | +| 0106 | | | | | +| 0107 | | | | | +| 0108 | | | | | +| 0109 | | | | | +| 010A | | | | | +| 010B | | | | | +| 010C | | | | | +| 010D | | | | | +| 010E | | | | | +| 010F | | | | | +| 0110 | | | | | +| 0111 | | | | | +| 0112 | | | | | +| 0113 | MartScreen | Flex: Unused | Opens the common mart shopping screen | | +| 0114 | SpMartScreen | Flex: Mart ID | Opens the Mart ID mart shopping screen | Used in the Departament Store for a shop with specific fixed items. At 0x48188 of arm9.bin (IPKS) is the pointer to the shops table, each entry of the table being a pointer to an item table. | +| 0115 | GoodsMartScreen | Flex: Mart ID | Opens the Mart ID goods mart shopping screen | | +| 0116 | SealMartScreen | Flex: Mart ID | Opens the Mart ID seal mart shopping screen | | +| 0117 | DummyLostBattle | \- | Return to Pokémon Center or player's house after being defeated | Same code as LostBattle command. | +| 0118 | SetLastWarp | Flex: Warp ID | Sets map's Warp ID warp as the last used warp | Supposed. This would affect actions like Escape Rope use. | +| 0119 | CheckPlayerGender | Var: Variable | Stores 0 in Variable if player is male, stores 1 if female | | +| 011A | HealPokemon | \- | Heals every Pokémon in the player's party | That does not include the black fade nor the healing sound. | +| 011B | EndWirelessComms \* | | | | +| 011C | EnterBattleRoom \* | | | | +| 011D | SetPlayerDirComm \* | | | | +| 011E | UnionMapChange \* | | | | +| 011F | UnionRoomSpriteScreen \* | | | | +| 0120 | StoreUnionSprite \* | | | | +| 0121 | SetUnionSprite \* | | | | +| 0122 | CheckPokedex | Var: Variable | Stores 1 in Variable if player has the Pokédex, stores 0 otherwise | | +| 0123 | GivePokedex | \- | Gives the Pokédex to the player | | +| 0124 | CheckShoes | Var: Variable | Stores 1 in Variable if player has the running shoes, stores 0 otherwise | | +| 0125 | GiveShoes | \- | Gives the running shoes to the player | | +| 0126 | CheckBadge | Flex: Badge ID; Var: Variable | Checks if player has Badge ID badge, stores result in Variable | | +| 0127 | GiveBadge | Flex: Badge ID | Gives the player Badge ID badge | | +| 0128 | CountBadges | Var: Variable | Stores in Variable the number of badges obtained | | +| 0129 | DummyCheckBag | Var: Variable | Stores 1 in Variable if flag 0x960 is set, stores 0 otherwise | | +| 012A | DummyGiveBag | \- | Sets flag 0x960 | | +| 012B | CheckPartner | Var: Variable | Stores 1 in Variable if the following event flag is activated, stores 0 otherwise | | +| 012C | SetPartner | \- | Activates the following event flag, so you can no longer use the bike, surf, rock climb... | | +| 012D | ClearPartner | \- | Deactivates the following event flag, so you can use the bike, surf, rock climb... again | | +| 012E | CheckStepFlag \* | | | | +| 012F | SetStepFlag \* | | | | +| 0130 | ClearStepFlag \* | | | | +| 0131 | DummyCheckGameCompleted | Var: Variable | Stores 1 in Variable if flag 0x964 is set, stores 0 otherwise | This flag is not the one that HGSS uses when the player clears the game. | +| 0132 | DummyGameCompleted | \- | Sets flag 0x964 | This flag is not the one that HGSS uses when the player clears the game. | +| 0133 | DoorAnimation | u16: Matrix X; u16: Matrix Y; Flex: Map X; Flex: Map Y; u8: Door ID | Prepares a building located at Map X and Map Y coordinates in a map located at Matrix X and Matrix Y in the current matrix for animation, with Door ID animation ID | | +| 0134 | WaitDoor | u8: Door ID | Wait animation of building with Door ID animation ID | | +| 0135 | FreeDoor | u8: Door ID | Free animation of building with Door ID animation ID | | +| 0136 | OpenDoor | u8: Door ID | Triggers first animation of building with Door ID animation ID | | +| 0137 | CloseDoor | u8: Door ID | Triggers second animation of building with Door ID animation ID | | +| 0138 | GetDaycareNames | \- | Stores first daycare Pokémon nickname in string buffer 0, the second daycare Pokémon nickname in string buffer 1 and the first Pokémon trainer's name in buffer 2 | If there's only one Pokémon in the daycare, string buffer 1 does not change. If no Pokémon is in the daycare, commands does nothing. | +| 0139 | GetDaycareStatus | Var: Variable | If daycare Pokémon have an egg, stores 1 in Variable. Otherwise it stores 0 if no Pokémon is in the daycare, 2 if only one Pokémon is in the daycare or 3 if there are two Pokémon | | +| 013A | InitEcruteakGym \* | | | | +| 013B | | | ??? Something to do with the Goldenrod Dept. Store Basement, probably moving around blocks or opening access to doors. | | +| 013C | | | ??? | | +| 013D | | | | | +| 013E | CianwoodGymInit \* | | | | +| 013F | CianwoodGymTurnWinch \* | | | | +| 0140 | VermilionGymInit \* | | | | +| 0141 | VermilionGymLockAction \* | | | | +| 0142 | VermilionGymCanCheck \* | | | | +| 0143 | ResetVermilionGymCans \* | | | | +| 0144 | InitVioletGym | \- | Initializes Violet Gym internal data and 3D model animations | | +| 0145 | VioletGymElevator | \- | Triggers model #111 to move up or down | | +| 0146 | InitAzaleaGym \* | | | | +| 0147 | AzaleaGymSpinarak \* | | | | +| 0148 | AzaleaGymSwitch \* | | | | +| 0149 | BlackthornGymInit \* | | | | +| 014A | FuchsiaGymInit \* | | | | +| 014B | ViridianGymInit \* | | | | +| 014C | GetPartyCount | Var: Variable | Stores in Variable the current number of Pokémon in the party | | +| 014D | BagScreen \* | | | | +| 014E | BagScreenSelection \* | | | | +| 014F | CheckPocketItems \* | | | | +| 0150 | DummyTextBerry \* | | | | +| 0151 | TextNature? \* | | | | +| 0152 | SetOWDefaultPosition | Flex: Event ID; Flex: X; Flex: Y | Sets Event ID spawn position to global coords X and Y | | +| 0153 | SetOWPosition | Flex: Event ID; Flex: X; Flex: Z; Flex: Y; Flex: Dir | Moves Event ID to global coords X, Y, Z with Dir direction | Even though some maps are higher, the Z parameter is often 0. Game seems to calculate the correct Z position if it is wrong. | +| 0154 | SetOWDefaultMovement | Flex: Event ID; Flex: Movement ID | Sets Event ID's default move code to Movement ID | | +| 0155 | SetOWDefaultDirection | Flex: Event ID; Flex: Direction ID | Sets Event ID's default direction to Direction ID | | +| 0156 | SetWarpPosition | Flex: Warp ID; Flex: X; Flex: Y | Moves Warp ID to global coords X and Y | | +| 0157 | SetSpawnablePosition | Flex: Spawnable ID; Flex: X; Flex: Y | Moves Spawnable ID to global coords X and Y | | +| 0158 | SetOWDirection | Flex: Event ID; Flex: Direction ID | Sets Event ID's current direction to Direction ID | | +| 0159 | AddWaitingIcon \* | | | | +| 015A | RemoveWaitingIcon \* | | | | +| 015B | ReturnScriptWkSet \* | | | | +| 015C | WaitTimeOrAB | Flex: Time | Stops script execution until Time frames have passed or until user presses A or B buttons | | +| 015D | ChoosePKMNSelection \* | | | | +| 015E | UnionChoosePKMNSelection\* | | | | +| 015F | GetSelectedPartySlot | Var: Variable | Stores in Variable the selected party slot in a party Pokémon screen, or 0xFF is user cancelled the selection | | +| 0160 | SelectMove \* | | | | +| 0161 | GetMoveSelection \* | | | | +| 0162 | GetPartyPokemonID | Var: Party Position; Var: Variable | Stores in Variable the ID of the Pokémon at Party Position | It will return 0 if Pokémon is an egg. | +| 0163 | CheckTradedPokemon | Var: Party Position; Var: Variable | Stores 0 in Variable if trainer ID and secret ID of the Pokémon at Party Position are the player's ones, stores 1 otherwise | | +| 0164 | CountPartyBornPokemon | Var: Variable | Stores in Variable the number of Pokémon in the Pokémon party, excluding the eggs | | +| 0165 | CountAlivePokemonExceptFirst | Var: Variable; Flex: Party Position | Stores in Variable how many alive Pokémon would remain in the Pokémon party if Pokémon at Party Position disappeared | Eggs are excluded from the count. | +| 0166 | CountTotalAlivePokemon | Var: Variable | Stores in Variable the number of Pokémon in the Pokémon party and PC boxes, excluding the eggs and fainted Pokémon | As Pokémon can't be fainted in the PC boxes, only eggs are not taken into account in the PC boxes count. | +| 0167 | CountPartyEggs | Var: Variable | Stores in Variable the number of eggs in the Pokémon party | | +| 0168 | TakeMoneyFlex | Flex: Money | Subtracts Money from the player's money | | +| 0169 | RetrieveDayCareMon \* | | | | +| 016A | GiveLoanMon \* | | | | +| 016B | CheckReturnLoanMon \* | | | | +| 016C | DeletePartyPokemon | Flex: Party Position | Deletes the Pokémon at Party Position from the party | The Pokémon data is destroyed. | +| 016D | RemoveDayCareEgg \* | | | | +| 016E | GiveDayCareEgg \* | | | | +| 016F | TextDayCareCost \* | | | | +| 0170 | CompareMoneyFlex | Var: Variable; Flex: Money | Returns 1 to Variable if the player has Money or more money, returns 0 otherwise | | +| 0171 | EggHatchScreen | \- | Opens the egg hatching screen with an egg in the Pokémon party that has 0 steps left for hatching | This may crash if there's no ready egg in the Pokémon party. It's better not to use this command unless you know what are you doing. | +| 0172 | | | | | +| 0173 | CheckDaycareLevelGain \* | Var: Variable; Flex: Position | Stores the amount of levels a Pokémon in the Daycare has gained from being in the Daycare | | +| 0174 | GetDayCareSpeciesandNick \* | | | | +| 0175 | GiveDayCareMon \* | | | | +| 0176 | UnvanishOverworld | Flex: Event ID | Makes Event ID visible again if it was invisible | Can be used on Following Pokémon. Useful for scripting events that happen as soon as the player walks into a buidling and their Following Pokémon hasn't spawned yet. The Following Pokémon will "unvanish" on the same tile as the player, so account for this in movement scripts. | +| 0177 | VanishOverworld | Flex: Event ID | Makes Event ID invisible, but still collisionable | It's a great idea to use this command in a level script for blocking doors with invisible events. | +| 0178 | MailScreen | \- | Opens the mail screen | | +| 0179 | CountMail | Var: Variable | Stores in Variable the current amount of mails in the mailbox | | +| 017A | RankingView \* | | | | +| 017B | GetTimePeriod | Var: Variable | Stores in Variable the current time period of the day | The different values are:
0: From 04:00 AM to 09:59 AM (Morning)
1: From 10:00 AM to 04:59 PM (Noon)
2: From 05:00 PM to 07:59 PM (Evening)
3: From 08:00 PM to 11:59 PM (Night)
4: From 00:00 AM to 03:59 AM (Midnight) | +| 017C | GetRandom | Var: Variable; Flex: Range | Generates a random number between 0 and Range \- 1, and stores it in Variable | | +| 017D | DummyGetRandom | Var: Variable; Flex: Range | Generates a random number between 0 and Range \- 1, and stores it in Variable | Exactly the same code as the command above. | +| 017E | GetPokemonHappiness | Var: Variable; Flex: Party Position | Stores in Variable the happiness of Pokémon in Party Position | | +| 017F | AddHappiness | Flex: Happiness; Flex: Party Position | Adds Happiness to the happiness of Pokémon in Party Position | | +| 0180 | SubHappiness | Flex: Happiness; Flex: Party Position | Subs Happiness to the happiness of Pokémon in Party Position | | +| 0181 | TextDayCareMonStats \* | | | | +| 0182 | GetPlayerDirection | Var: Variable | Stores in Variable the direction the player is looking at | Predicted. Seeing up gives 0, seeing down gives 1, seeing left gives 2 and seeing right gives 3. | +| 0183 | GetDayCareMonCompatibility \* | | | | +| 0184 | CheckDayCareEgg \* | | | | +| 0185 | CheckBornPokemonInParty | Flex: Pokémon; Var: Variable | Stores 1 in Variable if Pokémon is currently in the Pokémon party, stores 0 otherwise | Eggs do not count as Pokémon, so they will be ignored. | +| 0186 | CheckPokemonSizeRecord | Var: Variable; Flex: Party Position | Stores 0 in Variable if Pokémon at Party Position does not have a bigger relative size than player's record, stores 1 if it's the same size and stores 2 if it has a bigger relative size | | +| 0187 | SetPokemonSizeRecord | Flex: Party Position | Stores the relative size of Pokémon at Party Position as player's record | | +| 0188 | TextPartyPokemonSize | Flex: Integer String Buffer; Flex: Decimal String Buffer; Flex: Party Position | Stores the integer part of Pokémon at Party Position size in Integer String Buffer (1 to 3 digits) and the decimal part of the size in Decimal String Buffer (1 digit) | | +| 0189 | TextPokemonRecordSize | Flex: Integer String Buffer; Flex: Decimal String Buffer; Flex: Pokémon ID | Stores the integer part of player's record size, normalized to Pokémon ID range, in Integer String Buffer (1 to 3 digits) and the decimal part of the size in Decimal String Buffer (1 digit) | | +| 018A | | | | | +| 018B | | | | | +| 018C | CountPokemonMoves | Var: Variable; Flex: Party Position | Stores in Variable the total amount of moves that the Pokémon at Party Position currently has | | +| 018D | DeleteMove | Flex: Party Position; Flex: Move Slot | Deletes the move in Move Slot from the Pokémon at Party Position | | +| 018E | GetPartyPokemonMove | Var: Variable; Flex: Party Position; Flex: Move Slot | Stores in Variable the ID of the move in Move Slot from the Pokémon at Party Position | | +| 018F | TextPartyPokemonMove | u8: String Buffer; Flex: Party Position; Flex: Move Slot | Stores the name of the move in Move Slot from the Pokémon at Party Position in String Buffer | | +| 0190 | Strength | Command format depends on the first parameter:
u8: 0
u8: 1
u8: 2; Var: Variable | Function depends on the first parameter:
0: Disables Strength so player can no longer move boulders
1: Allows the player to automatically move Strength boulders
2: Checks if Strength is activated, store answer in Variable | | +| 0191 | FlashAction \* | Command format depends on the first parameter:
u8: 0
u8: 1
u8: 2; Var: Variable | Function depends on the first parameter:
0: Clears the Flash system flag
1: Sets the Flash system flag
2: Checks if Flash is activated, store answer in Variable | | +| 0192 | DefogAction \* | Command format depends on the first parameter:
u8: 0
u8: 1
u8: 2; Var: Variable | Function depends on the first parameter:
0: Clears the Defog system flag
1: Sets the Defog system flag
2: Checks if Defog is activated, store answer in Variable | | +| 0193 | GiveAccessory \* | | | | +| 0194 | CheckGivenAccessory \* | | | | +| 0195 | CheckAccessory \* | | | | +| 0196 | GiveBGAccessory \* | | | | +| 0197 | CheckBGAccessory \* | | | | +| 0198 | | | | | +| 0199 | | | | | +| 019A | | | | | +| 019B | | | | | +| 019C | | | | | +| 019D | | | | | +| 019E | | | | | +| 019F | | | | | +| 01A0 | | | | | +| 01A1 | | | | | +| 01A2 | | | | | +| 01A3 | | | | | +| 01A4 | | | | | +| 01A5 | | | | | +| 01A6 | | | | | +| 01A7 | CheckCompleteJohtoDex | Var: Variable | Stores 1 in Variable if every Pokémon in the Johto Pokédex has been seen, stores 0 otherwise | | +| 01A8 | CheckCompleteNationalDex | Var: Variable | Stores 1 in Variable if every Pokémon in the National Pokédex has been caught, stores 0 otherwise | | +| 01A9 | OpenPokedexScreen \* | | | | +| 01AA | CheckPokemonMail \* | | | | +| 01AB | | | | | +| 01AC | TakePokemonMail \* | | | | +| 01AD | CountFossils | Var: Variable | Stores in Variable the current amount of fossils in the bag | Technically it's the number of items in the bag whose ID is between 99 and 105. | +| 01AE | PreparePokeGearCall | Var: ???; Var: ???; Var: ??? | | | +| 01AF | StartPokeGearCall | \- | Starts the PokéGear phone call that was previously set. | | +| 01B0 | CheckFossilPokemon | Var: Variable; Flex: Item ID | Stores in Variable the ID of the Pokémon to which Item ID fossil belongs | | +| 01B1 | CheckFossil | Var: Position; Var: Item ID; Flex: Amount | Stores in Item ID the ID of the first fossil item in the bag that the player has at least Amount quantity of, and stores in Position the amount of fossils in the bag before the first fossil that met the quantity condition | Stores 0 in both variables if there's no fossil in the bag. | +| 01B2 | CountPokemonUnderLevel | Var: Variable; Flex: Level | Stores in Variable the amount of Pokémon in party whose level is equal or lower than Level | Eggs are completely ignored. | +| 01B3 | SurvivePoison | Var: Variable; Flex: Party Position | If Pokémon at Party Position is poisoned and at 1 HP, it cures the poison and stores 1 in Variable, otherwise it stores 0 | | +| 01B4 | FinishOverworldScreen \* | | | | +| 01B5 | DebugPoketch \* | | | | +| 01B6 | MessageAllFromArchive \* | | | | +| 01B7 | MessageFromArchive \* | | | | +| 01B8 | MessageAllPutPMS \* | | | | +| 01B9 | | | | | +| 01BA | | | | | +| 01BB | | | | | +| 01BC | | | | | +| 01BD | GetPreviousHeaderID | Var: Variable | Stores in Variable the header ID of the previous accessed map | | +| 01BE | GetCurrentHeaderID | Var: Variable | Stores in Variable the header ID of the map the player is in | | +| 01BF | SetSafariFlag | u8: Flag; u8: Mode | If Flag is 0 safari encounters are activated, if Flag is 1 safari encounters are deactivated, being the own safari encounters if Mode is 0 or using the Safari Zone link if 1 | | +| 01C0 | BattleRoomWarp \* | | | | +| 01C1 | ExitBattleRoom \* | | | | +| 01C2 | GeonetScreen | \- | Opens the Geonet screen | | +| 01C3 | | | | | +| 01C4 | ShowPokemonPic | Flex: Pokémon; Flex: Gender | Opens a window with the picture of Pokémon with Gender gender and registers the Pokémon in the Pokédex as seen | 0 = Male or Genderless; 1 = Female | +| 01C5 | HidePokemonPic | \- | Hides the window of a Pokémon picture | | +| 01C6 | | | | | +| 01C7 | | | | | +| 01C8 | | | | | +| 01C9 | GetPokemonNature \* | Var: Variable; Flex: Party Position | | | +| 01CA | CheckPartyNature \* | Var: Variable; Flex: Nature ID | | | +| 01CB | | | | | +| 01CC | LoadPokegearData \* | | | | +| 01CD | SetRebattleTrainerID \* | | | | +| 01CE | SetRebattleGymLeaderID \* | | | | +| 01CF | EnableMassOutbreaks \* | | | | +| 01D0 | AddRoamingPokemon | u8: ID | Activates a roaming Pokemon depending on the ID | Uses ID to determine which roaming Pokémon must appear: 0 for Entei, 1 for Raikou, 2 for Latias and 3 for Latios. | +| 01D1 | UnionGroup | Command format depends on the first parameter:
u16: 0; Flex: ID; Var: Variable
u16: 1; Flex: ID; Var: Variable
u16: 2; Flex: ID; Flex: String Buffer
u16: 3; Flex: ID; Flex: String Buffer
u16: 4; Var: Variable
u16: 5; Flex: ID
u16: 6
u16: 7; Var: Variable | Function depends on the first parameter:
0: Checks if group ID exists, returns answer in Variable
1: Checks if group ID is accesible, returns answer in Variable
2: Writes group ID name in String Buffer
3: Writes leader's name of Group ID in String Buffer
4: Opens keyboard, stores 1 in Variable if user cancels, 2 if group name already exists, 0 otherwise
5: Enter in group ID
6: Creates a group
7: ??? | This command is the devil. | +| 01D2 | CheckEggMoves \* | | | | +| 01D3 | RememberMoveScreen \* | | | | +| 01D4 | TeachMovesScreen \* | | | | +| 01D5 | ResponseTeachMove \* | | | | +| 01D6 | InitTrade | u8: Trade ID | Initializes Trade ID trade data | | +| 01D7 | GetOfferedPokemon | Var: Variable | Stores in Variable the ID of the offered Pokémon of the current trade data | | +| 01D8 | GetRequestedPokemon | Var: Variable | Stores in Variable the ID of the requested Pokémon of the current trade data | | +| 01D9 | TradePokemonScreen | Flex: Party Position | Opens the trade Pokémon screen, giving the Pokémon at Party Position and receiving the offered Pokémon of the current trade data | | +| 01DA | EndTrade | \- | Frees the current trade data from the memory | | +| 01DB | DummyInternationalDex | \- | Nothing | | +| 01DC | DummyDimorphismDex | \- | Nothing | In fact it does activate a dimorphism flag in the Pokédex data, but since the HGSS Pokédex has the gender comparision by default, command's actual purpose is not noticeable. | +| 01DD | NationalDex | Command format depends on the first parameter:
u8: 1; Var: Unused
u8: 2; Var: Variable | Function depends on the first parameter:
1: Activates the National Pokédex mode
2: Stores 1 in Variable if player has the National Pokédex, otherwise it stores 0 | | +| 01DE | CountPokemonRibbons | Var: Variable; Flex: Party Position | Stores in Variable the amount of ribbons that the Pokémon in Party Position has | | +| 01DF | CountPartyRibbons | Var: Variable | Stores in Variable the total amount of different ribbons in the current Pokémon party | | +| 01E0 | CheckRibbon | Var: Variable; Flex: Party Position; Flex: Ribbon | Stores 1 in Variable if the Pokémon in Party Position has the Ribbon ribbon, stores 0 otherwise | | +| 01E1 | GiveRibbon | Flex: Party Position; Flex: Ribbon | Gives the Ribbon ribbon to Pokémon in Party Position | | +| 01E2 | TextRibbon | u8: String Buffer; Flex: Ribbon | Stores the name of the Ribbon in String Buffer | | +| 01E3 | CountPokemonEVs | Var: Variable; Flex: Party Position | Stores in Variable the total amount of effort values of Pokémon in Party Position | Predicted. | +| 01E4 | GetDayOfWeek | Var: Variable | Stores in Variable the current day of the week | Value 0 is the first possible value and it's for Sunday. | +| 01E5 | ShowRulesList | Var: Variable | ??? | | +| 01E6 | DummyGetPokemonFootprint | \- | Nothing | | +| 01E7 | PCHealAnimation | Flex: PokéBalls | Triggers the Pokémon Center healing animation with PokéBalls number of player's Pokémon | | +| 01E8 | ElevatorAnimation | Flex: Direction; Flex: Count | Triggers the animation of building #208 up (if Direction is 0) or down (if Direction is 1) Count consecutive times | | +| 01E9 | MysteryGiftGive | Command format depends on the first parameter:
u16: 0
u16: 1; Var: Variable
u16: 2; Var: Variable
u16: 3; Var: Variable
u16: 4
u16: 5; Var: Text File; Var: Text Line
u16: 6; Var: Text File; Var: Text Line
u16: 7
u16: 8 | Function depends on the first parameter:
0: Initializes the data for receiving a Mystery Gift
1: Checks if there is a Mystery Gift, stores answer in Variable
2: Stores the Mystery Gift ID in Variable
3: Checks if player can receive the Mystery Gift, stores answer in Variable
4: Gives the Mystery Gift to the player
5: Shows the succeed text at Text File file and Text Line slot
6: Shows the unable text at Text File file and Text Line slot
7: Ends the Mystery Gift process
8: Saves data and ends the Mystery Gift process | This one too. | +| 01EA | | | | | +| 01EB | | | | | +| 01EC | | | | | +| 01ED | | | | | +| 01EE | | | | | +| 01EF | CheckVersion | Var: Variable | Returns 0x7 to Variable if game is HeartGold, 0x8 if SoulSilver | | +| 01F0 | FirstPokemonInParty | Var: Variable | Stores in Variable the slot of the first Pokémon in the party that is not an egg | | +| 01F1 | CheckPokemonType \* | | | | +| 01F2 | FirstPrimoPassword \* | | | | +| 01F3 | SecondPrimoPassword \* | | | | +| 01F4 | PreparePCAnimation \* | | | | +| 01F5 | OpenPCAnimation \* | | | | +| 01F6 | ClosePCAnimation \* | | | | +| 01F7 | GetLottoNumber | Var: Variable | Stores Lotto random number in Variable | Supposed by analogy with Platinum. | +| 01F8 | CheckWinLotto | Var: MatchPos; Var: Digits; Var: PC; Flex: Winning Number | Takes a Winning Number as input and responds as follows.
If no matching Pokémon could be found or an error occurs:
MatchPos: 0; Digits: 0; PC: 0.

For all other cases:

If the matching Pokémon is in the Player's party, PC will be assigned 0.
Otherwise, if it's in the Player's Storage System, PC will be assigned 1.

MatchPos stores the zero-based position of the winning Pokémon (either as Party pos or Storage System pos, depending on the value of PC).

When there's a match, the Digits var is assigned the number of matching digits of the Winning Pokémon's PID.
In case of multiple matches, priority is always given to the one with the most matching digits. | Supposed by analogy with Platinum.

To retrieve the exact position of a winning Pokémon in the Storage System, first make sure PC equals 1.

The zero-based PC Page and Position indices can be calculated:

PC Page index = MatchPos / 30
Position in page = MatchPos % 30

where % is the modulo operator. | +| 01F9 | InitLotto | \- | Generates two random numbers and assigns them to two system lottery variables. | Supposed by analogy with Platinum. | +| 01FA | BufferBoxPokemonNick \* | | | | +| 01FB | CountPCFreeSpace | Var: Variable | Stores in Variable the amount of free Pokémon slots in PC boxes | | +| 01FC | PalParkControl \* | | | | +| 01FD | PalParkDepositCountCheck \* | | | | +| 01FE | PalParkBoxPokemonCaught \* | | | | +| 01FF | PalParkScoreResult \* | | | | +| 0200 | PlayerMovementSavingSet \* | | | | +| 0201 | PlayerMovementSavingClear \* | | | | +| 0202 | HallOfFameAnime \* | | | | +| 0203 | AddTrainerScore \* | | | | +| 0204 | TextAccessory | u8: String Buffer; Flex: Accesory | Stores Accesory's name in String Buffer | | +| 0205 | CheckPokemonInParty | Flex: Pokémon; Var: Variable | Stores 1 in Variable if Pokémon (or its egg) is currently in the Pokémon party, stores 0 otherwise | | +| 0206 | SetDeoxysForm | Flex: Form | Sets every Deoxys in the Pokémon party the Form form | Form 0 is Normal, form 1 is Attack, form 2 is Defense and form 3 is Speed. | +| 0207 | CheckBurmyForms | Var: Variable | Stores in Variable the number of current different Burmy forms in the Pokémon party | Returns 0 if player has no Burmy in the party, 1 if only one different form, 2 if two different forms and 3 if has three or more Burmy with three different forms. | +| 0208 | | \- | ??? | Sets a internal flag. | +| 0209 | | \- | ??? | Resets a internal flag. | +| 020A | GetHour | Var: Variable | Stores current hour from RTC in Variable | | +| 020B | ShakeOverworld | Flex: Event ID; Flex: Count; Flex: Time; Flex: X; Flex: Y | Makes Event ID overworld shake Count times in Time frames, moving X horizontally and Y vertically each shake | Event ID must be released before this command in order to see the animation. | +| 020C | BlinkOverworld | Flex: ???; Flex: ???; Flex: ???; Flex: ???; Flex: ??? | ??? | | +| 020D | CheckRegis | Var: Variable | Stores 1 in Variable if player has the 3 Regis in the party, stores 0 otherwise | | +| 020E | | | | | +| 020F | MessageUnown | u16: Text Slot | Display line Text Slot from the text file with the Unown font | Predicted. | +| 0210 | CheckGBACartidge | Var: Variable | Stores the current GBA cartridge ID in Variable | Stores 0 if no cartridge, 1 if Pokémon Sapphire, 2 if Pokémon Ruby, 3 if Pokémon Emerald, 4 if Pokémon FireRed and 5 if Pokémon LeafGreen. Somehow it could also set 7 if Pokémon Gold, 8 if Pokémon Silver, 10 if Pokémon Diamond, 11 if Pokémon Pearl, 12 if Pokémon Platinum and 15 if Pokémon Colosseum. | +| 0211 | GetFirstAlivePokemonSlot | Var: Variable | Stores in Variable the slot of the first Pokémon in the party that is not an egg nor is fainted | Predicted. | +| 0212 | SetMatrixAlternativeMap | Flex: Alternative ID; u8: Status | Permanently changes a worldmap matrix cell corresponding to Alternative ID if Status is 1, reverts the change if 0 | It only changes the map file value in the matrix, not the map header nor the map height. Seems that the only Alternative ID available values are 0 and 1, corresponding to Mahogany Town and to the Lake of Rage. | +| 0213 | TextBackgroundName \* | | | | +| 0214 | CheckCoinsImmediate \* | | | | +| 0215 | CheckCoins \* | | | | +| 0216 | AddCoins \* | | | | +| 0217 | GetPokemonLevel | Var: Result; Flex: Party Slot | Stores into Result the level of the Pokémon at a given Party Slot. | | +| 0218 | | | | | +| 0219 | | | | | +| 021A | | | | | +| 021B | | | | | +| 021C | | | | | +| 021D | TextNumberSp | u8: String Buffer; Flex: Number; u8: Alignment Type; u8: Digits | Stores a Number in String Buffer with Alignment Type alignment and Digits length | Predicted. Alignment Type 0 is left-alignment, 1 is right alignment padded with spaces and 2 is right alignment padded with zeros. Digits is used only in these last two types. | +| 021E | MonGetContestValue \* | | | | +| 021F | CheckBirthday | Var: Variable | Stores 1 in Variable if the current day is the player's birthday, stores 0 otherwise | | +| 0220 | MusicVolumeSet | Flex: Music ID; Flex: Volume | Identifies the BGM Player which is playing Music ID and sets its Volume | | +| 0221 | CountSeenUnown | Var: Variable | Stores in Variable the number of different seen Unown forms | | +| 0222 | | | | | +| 0223 | | | | | +| 0224 | | | | | +| 0225 | | | | | +| 0226 | CountHallOfFameEntries \* | | | | +| 0227 | | | | | +| 0228 | | | | | +| 0229 | | | | | +| 022A | | | | | +| 022B | | | | | +| 022C | | | | Related to move tutor? Possibly BP price check? | +| 022D | CheckBattlePoints \* | | | | +| 022E | GiveBP \* | | | | +| 022F | TakeBP \* | | | | +| 0230 | CompareBP \* | Flex: ???; Var: ??? | | | +| 0231 | ShakeCamera | Flex: X Magnitude; Flex: Y Magnitude; Flex: Count; Flex: Time | Shakes the screen vertically and/or horizontally, moving the camera X Magnitude pixels horizontally and Y Magnitude pixels vertically in each shake, with Count total shakes of Time frames each one | Don't abuse this command, as it seems that camera might end up 1 pixel up or down in each animation, especially when Count is an odd number. | +| 0232 | Battle2vs2 | Flex: Partner Trainer ID; Flex: Trainer 1 ID; Flex: Trainer 2 ID; u8: ??? | Starts a double battle with Partner Trainer ID versus Trainer 1 ID and Trainer 2 ID | Last parameter seems to always be 0x1. | +| 0233 | | | | | +| 0234 | | | | | +| 0235 | | Var: ??? | ??? | | +| 0236 | PartyPokemonTradeScreen | \- | Opens the party Pokémon screen for a trade | | +| 0237 | GetDPPtPrizeItemIdAndCost \* | | | | +| 0238 | | | | | +| 0239 | | | | | +| 023A | CheckCoinsVar \* | | | | +| 023B | | | | | +| 023C | GetUniqueSealsQuantity \* | | | | +| 023D | DummyActivateMysteryGift \* | | | | +| 023E | GetOWMovement \* | | | | +| 023F | | | | | +| 0240 | | | | | +| 0241 | | | | | +| 0242 | | | | | +| 0243 | | | | | +| 0244 | TextSealSingular \* | u8: String Buffer; Flex: Seal ID | Stores Seal's singular noun in String Buffer | International release exclusive(supposed). Text archive 15. | +| 0245 | DummyLockAll \* | | | | +| 0246 | | | | | +| 0247 | | | | | +| 0248 | PartyLegalCheck \* | var: Result | Checks legality of party, at least for WIFI stuff. If RESULT is 1, party check failed and you have an "illegal" mon | Used by the attendants in the PC to check your Pokemon before going into the Union Room, may be used elsewhere too | +| 0249 | | | | | +| 024A | | | | | +| 024B | | \- | ??? | | +| 024C | LastBattleCheckCaught \* | Var ??? | | | +| 024D | WildBattleSp | Flex: Pokémon; Flex: Level; u8: Shiny Flag | Starts a wild battle against a Pokémon of level Level, and shiny if Shiny Flag is 1 | | +| 024E | CheckTrainerCardLevel | Var: Variable | Stores in Variable the current trainer card level | | +| 024F | DummyRideBike | \- | Nothing | Seems to allocate the bike music in the RAM but doesn't play it. | +| 0250 | | | | | +| 0251 | ShowSaveBox | \- | Displays the save data box (current map name, player's name, the amount of badges, the Pokédex counter and the play time) | | +| 0252 | HideSaveBox | \- | Hides the save data box | | +| 0253 | ScopeMode | u8: Mode | If Mode is 1, activates the scope mode, otherwise the command deactivates the scope mode | The scope mode prevents the game to do certain actions (like reseting system flags) when changing map, and probably it's related with more things. | +| 0254 | GetFollowingPokeSize | Var: Variable | Stores 0 in Variable if the current following Pokémon is small and can follow the player indoors, stores 1 if it's big and can't follow the player indoors | In fact it returns the second byte of the following Pokémon data files, stored in a/1/4/1.narc, which is the one that the game reads for allowing Pokémon entering in buildings. This command will work even if a SendBackFollowingPoke is used and the following Pokémon is hidden at that moment. | +| 0255 | | \- | ??? | Draws a heart icon above the following Pokémon. Maybe a dummy command? | +| 0256 | | u16: ??? | ??? | Parameter must be 1 or 2, otherwise command won't do anything. Seems to trigger a default movement for switching current player's and following Pokémon positions (for example, when using a HM). | +| 0257 | FollowingPokePCAnimation | \- | Triggers the animation of sending the current following Pokémon back to its PokéBall over the Pokémon Center healing counter | | +| 0258 | SendBackFollowingPoke | \- | Triggers the animation of sending the current following Pokémon back to its PokéBall and deactivates the following Pokémon until the game is reset or a warp is used | | +| 0259 | FollowingPokeFacePlayer | \- | Makes the invoking event look at the player, but with a size limitation | When the following Pokemon has a big size, it won't turn to the player if there is an overworld on the opposite side so it would collide. The checked flag is the second byte of the Parameter 1 field, which could be called "double size overworlds" flag, as it is also used for drawing two grass patches in the tall grass for the following Pokemon. | +| 025A | LockFollowingPoke | u16: Operation | Releases the following Pokemon animation if Operation is 0, locks the animation otherwise | Predicted comparing ASM with Lock and Release commands. | +| 025B | WaitFollowingPoke | \- | Waits the following Pokemon to end its last movement | Predicted comparing ASM with Lock and Release commands. | +| 025C | SetFollowingPokeMovement | u16: Move Code | Changes the following Pokemon default movement to Move Code | The most important movement IDs are 0x30 and 0x38 (following and ghost-following behaviours respectively). | +| 025D | SetFollowingPokePosition | u8: Position; u8: Direction | Moves the following Pokémon to one tile Position next to player and facing at Direction | For both parameters, up is 0, down is 1, left is 2 and right is 3. | +| 025E | BallResetFollowingPoke | \- | Moves the following Pokémon to the current player's position, and triggers the animation of sending the Pokémon out of its PokéBall after the player walks a step | This is commonly used after a different event following the player, so the player sends out the following Pokémon in the next step (instead of forcing it automatically with SendOutFollowingPoke). | +| 025F | NoBallResetFollowingPoke | \- | Moves the following Pokémon to the current player's position | Almost same as BallResetFollowingPoke, but without the PokéBall animation (exactly like when a small Pokémon spawns after the player uses a warp). | +| 0260 | SendOutFollowingPoke | \- | Triggers the animation of sending the first non-fainted Pokémon out of its PokéBall and spawns it on the last player position | Seems to be needed for refreshing/forcing its apparition after a Warp on the same map. | +| 0261 | | \- | ??? | It's used in a lot of scripts that involve following Pokémon movements, placed at the top of them. Seems that it resets a lot of following Pokémon movement parameters and data. | +| 0262 | | | | | +| 0263 | Pokeathlon \* | | | | +| 0264 | | | | | +| 0265 | GetPokegearContactRandomGiftBerry \* | | | | +| 0266 | GetPokegearContactGiftItem \* | | | | +| 0267 | CameronPhotoScreen \* | | | | +| 0268 | | | | | +| 0269 | | | | | +| 026A | CheckAlbumIfFull \* | | | | +| 026B | CheckRocketCostume \* | | | | +| 026C | ActivateRocketCostume \* | | | | +| 026D | | | | | +| 026E | GetOWDirection | u16: Event ID; Var: Variable | Stores in Variable the current direction which Event ID is facing | Up is 0, Down is 1, Left is 2 and Right is 3. | +| 026F | ApricornTreeAnimation \* | | | | +| 0270 | ApricornTreeGetApricorn \* | | | | +| 0271 | GiveApricornFromTree \* | | | | +| 0272 | TextApricornName \* | | | | +| 0273 | | | | | +| 0274 | | | | | +| 0275 | | | | | +| 0276 | | | | | +| 0277 | | | | | +| 0278 | CountPartyMonsOfSpecies \* | | | | +| 0279 | | | | | +| 027A | | | | | +| 027B | | | | | +| 027C | | | | | +| 027D | | | | | +| 027E | | | | | +| 027F | | | | | +| 0280 | | | | | +| 0281 | SaveWipeExtraChunks \* | | | | +| 0282 | | Var: Variable | ??? | | +| 0283 | | | | | +| 0284 | | | | | +| 0285 | | | | | +| 0286 | | | | | +| 0287 | GetPartySlotWithSpecies \* | var: Slot; u16 or Flex(???): Pokemon ID | Checks party for the presence of a Pokemon, and returns which slot they are in. | Assume that it checks for the first instance and then stops, so if you have multiple of the same Pokemon, it stops at the first instance and returns which slot it is in (0-5). Used in Silph Co. for Rotom | +| 0288 | | | | | +| 0289 | OpenScratchCardScreen \* | | | | +| 028A | CloseScratchCard \* | | | | +| 028B | GetScratchCardPrize \* | | | | +| 028C | | | | | +| 028D | MoveTutorChooseMove \* | | | | +| 028E | TutorMoveTeachInSlot \* | | | | +| 028F | TutorMoveGetPrice \* | | | | +| 0290 | CheckHeadbuttCompatibility | Flex: Party Slot; Var: Variable | Stores 1 into Variable if the Pokémon at the given Party Slot can learn Headbutt. | Ilex Forest Tutor: Script File 92, Script 3 | +| 0291 | IVCheckerJudge \* | | | | +| 0292 | BufferStatName \* | | | | +| 0293 | SetMonForme \* | | | | +| 0294 | TextTrainerName \* | | | | +| 0295 | | | | | +| 0296 | | | | | +| 0297 | | | | | +| 0298 | | | | | +| 0299 | | | | | +| 029A | | | | | +| 029B | | | | | +| 029C | TextTypeName \* | | | | +| 029D | GetItemQuantity \* | | | | +| 029E | GetHiddenPowerType \* | | | | +| 029F | SetFavoriteMon \* | | | | +| 02A0 | GetFavoriteMon \* | | | | +| 02A1 | GetOwnedRotomFormes \* | | | | +| 02A2 | CountTranformedRotomsInParty \* | | | | +| 02A3 | UpdateRotomForme \* | | | | +| 02A4 | GetPartyPokemonForm \* | | | | +| 02A5 | | | | | +| 02A6 | | | | | +| 02A7 | | | | | +| 02A8 | | | | | +| 02A9 | | | | | +| 02AA | | | | | +| 02AB | | | | | +| 02AC | GetCurrentWeather | Var: Variable | Stores the current weather in Variable | | +| 02AD | GetPlayerCoordinates \* | | | | +| 02AE | | | | | +| 02AF | | | | | +| 02B0 | CheckFatefulEncounter \* | | | | +| 02B1 | CommSanitizeParty \* | | | | +| 02B2 | DayCareSanitizeMon \* | | | | +| 02B3 | | | | | +| 02B4 | TextBattleHallStreak \* | | | | +| 02B5 | BattleHallCountUsedSpecies \* | | | | +| 02B6 | BattleHallGetTotalStreak \* | | | | +| 02B7 | | | | | +| 02B8 | | | | | +| 02B9 | | | | | +| 02BA | FollowingPokemonIsEventTrigger \* | | | | +| 02BB | | | | | +| 02BC | | | | | +| 02BD | PokemonHasItem \* | | | | +| 02BE | BattleTowerSetUpMultiBattle \* | | | | +| 02BF | SetPlayerVolume \* | | | | +| 02C0 | | | | | +| 02C1 | | | | | +| 02C2 | | | | | +| 02C3 | CheckPokemonIsSeen \* | | | | +| 02C4 | FloorTrapAnimation | | Triggers Team Rocket HQ trap-floor's graphical effect in the player's current position | | +| 02C5 | | | | | +| 02C6 | | | | | +| 02C7 | TalkFollowingPoke | \- | The following Pokémon triggers a random movement, and then a random following message | This seems to be the command that executes when the player talks to the following Pokémon (at script #163). Files in a/2/2/0.narc link map names to possible texts. The following Pokémon ends up locked, so a Release should be used after this command. | +| 02C8 | | | | | +| 02C9 | OpenAlphPuzzle \* | u8: Puzzle ID | Loads the stone-panel puzzle of Puzzle ID. | ID 0 = Kabuto, ID 1 = Aerodactyl, ID 2 = Omanyte, ID 3 = Ho-Oh
Appears to check Flag 2423, 2424, 2425, 2426 for the completion of puzzles 0 to 3 respectively. | +| 02CA | OpenRuinsofAlphHiddenRoom \* | u8: Room ID | Something to do with the secret room, not the puzzle trapdoor. | ID 0 = Kabuto Room, ID 1 = Aerodactyl Room, ID 2 = Omanyte Room, ID 3 = Ho-Oh Room | +| 02CB | UpdateDayCareMonOverworlds \* | | | | +| 02CC | | | | | +| 02CD | | | | | +| 02CE | | | | | +| 02CF | | | | | +| 02D0 | | | | | +| 02D1 | | | | | +| 02D2 | | u8: ???; u8: ???; u16: ???; u16: ???; u16: ??? | ??? | | +| 02D3 | BoatAnimation | u8: Animation; u8: ???; u16: Header; u16: X coord; u16: Y coord | Plays the S.S. Aqua animation of leaving the port. Animation is either 0 or 1, with 0 being Olivine and 1 being Vermilion. X and Y coordinates are for the destination map | | +| 02D4 | | | | | +| 02D5 | | | | | +| 02D6 | | | | | +| 02D7 | | Var: Variable | ??? | | +| 02D8 | | u8: ???; u8: ??? | ??? | | +| 02D9 | CheckAlivePokemon | Var: Variable | Checks if player has at least 1 not fainted Pokémon, stores the result in Variable | Predicted. | +| 02DA | CheckFollowingPoke | Var: Variable | Checks if player has a following Pokémon, stores the result in Variable | Supposed. | +| 02DB | | \- | ??? | | +| 02DC | | u8: ??? | ??? | | +| 02DD | | u8: ???; Var: ??? | ??? | | +| 02DE | | | | | +| 02DF | CheckKurtApricorn \* | | | If not 0, script continues to check if daily flag is reset, then gives you the apricorns | +| 02E0 | ClearKurtApricorn \* | | | | +| 02E1 | GiveApricornBalls \* | | | | +| 02E2 | CheckApricornCount \* | | | | +| 02E3 | KurtApricornMenuScreen \* | | | | +| 02E4 | StoreApricornJuice \* | | | | +| 02E5 | CheckJuice \* | | | | +| 02E6 | | | | | +| 02E7 | | | | | +| 02E8 | CreatePokeathlonFriendshipRoomStatues \* | | | | +| 02E9 | TextPokeathlonCourseName \* | | | | +| 02EA | OpenTouchScreen | \- | Changes the low screen design to the green Pokéball background | | +| 02EB | CloseTouchScreen | \- | Sets the default low screen design | | +| 02EC | YesNoTouchScreen | Var: Variable | Opens a Yes-No selection, stores player's answer in Variable | Crashes if OpenTouchScreen is not used previously. | +| 02ED | MultiTouchStandardText | u8: ???; u8: ???; u8: ???; u8: ???; Var: Selection | Prepares a multiple selection menu with text bank #191, returns selected slot ID in Selection | | +| 02EE | MultiTouchLocalText | u8: ???; u8: ???; u8: ???; u8: ???; Var: Selection | Prepares a multiple selection menu with local texts, returns selected slot ID in Selection | | +| 02EF | CreateMultiTouchBox | Flex: Text Slot; Flex: Top Screen Text;
Flex: Multi Box Slot | Adds a box with Multi Box Slot ID showing Text Slot text on the bottom screen and Top Screen Text on the top in a message box. Text depends on whether you use MultiTouchStandardText or MultiTouchLocalText | | +| 02F0 | CloseMultiTouch | \- | Closes the multiple selection boxes | | +| 02F1 | RockSmashItemCheck \* | Flex: ???; Var: ???; Var: ??? | ??? | | +| 02F2 | | Var: ??? | ??? | | +| 02F3 | | | | | +| 02F4 | | | | | +| 02F5 | | | | | +| 02F6 | | | | | +| 02F7 | | | | | +| 02F8 | | | | | +| 02F9 | | | | | +| 02FA | | | | | +| 02FB | | | | | +| 02FC | | | | | +| 02FD | | | | | +| 02FE | | | | | +| 02FF | | \- | ??? | | +| 0300 | | | | | +| 0301 | | | | | +| 0302 | | | | | +| 0303 | | | | | +| 0304 | | | | | +| 0305 | RenderCutscene \* | ???: ??? | Renders a cutscene
2 = Arceus stock image cutscene | | +| 0306 | | | | | +| 0307 | | | | | +| 0308 | GiveTogepiEgg \* | | | | +| 0309 | | | | | +| 030A | GiveSpikyEaredPichu \* | \- | ??? | | +| 030B | | | | | +| 030C | OpenVoltorbFlip \* | | | | +| 030D | KenyaCheckPartyOrMailbox \* | | | | +| 030E | MartSell \* | \- | ??? | Related with the mart interface. | +| 030F | SetFollowPokeInhibitState \* | | | | +| 0310 | ScriptOverlayCmd \* | | | | +| 0311 | BugContestAction \* | | | | +| 0312 | TextBugContestWinner \* | | | | +| 0313 | JudgeBugContest \* | | | | +| 0314 | TextBugContestMonNick \* | | | | +| 0315 | BugContestGetTimeLeft \* | | | | +| 0316 | IsBugContestantRegistered \* | | | | +| 0317 | | | | | +| 0318 | | | | | +| 0319 | TakeMomMoney \* | | | | +| 031A | CheckMomMoneyBalance \* | | | | +| 031B | ShowMomMoney | Flex: X; Flex: Y | Shows mom savings money box at X and Y coordinates of the screen | | +| 031C | HideMomMoney | \- | Hides mom savings money box | | +| 031D | | | | | +| 031E | TextRulesetName \* | | | | +| 031F | | | | | +| 0320 | | | | | +| 0321 | | | | | +| 0322 | | | | | +| 0323 | | | | | +| 0324 | UpdateTownMap \* | u8(?): Map Type | Updates the town map to include Kanto
1 = Normal, Johto-only view
2 = Whole map, Kanto included | | +| 0325 | | | | | +| 0326 | | | | | +| 0327 | | | | | +| 0328 | | | | | +| 0329 | | | | | +| 032A | CelebiTimeTravelAnimation \* | | | | +| 032B | | | | | +| 032C | | | | | +| 032D | MomGiftCheck \* | | | | +| 032E | | | | | +| 032F | | | | | +| 0330 | UnownCircle \* | | | | +| 0331 | | | | | +| 0332 | InitMystriStageAnimation \* | | | | +| 0333 | | | | | +| 0334 | | | | | +| 0335 | GetBuenasPassword \* | | | | +| 0336 | | | | | +| 0337 | | | | | +| 0338 | | | | | +| 0339 | GetShinyLeafCount \* | | | | +| 033A | TryGiveShinyLeafCrown \* | | | | +| 033B | CheckPokemonNickname \* | Flex: Party Slot; Var: Variable | Checks to see if the Pokémon at Party Slot position has a nickname. The variable will return 0 if the Pokémon does have a nickname. | Example: Script File 913, Function 35 | +| 033C | | | | | +| 033D | | Var: ??? | ??? | | +| 033E | | | | | +| 033F | | | | | +| 0340 | | | | | +| 0341 | | | | | +| 0342 | | Var: Variable | ??? | | +| 0343 | | Var: Variable | ??? | | +| 0344 | CheckJadeOrbRequirements | Var: Variable | Stores 1 in Variable if player has both Kyogre and Groudon in the Pokémon party and they have been caught in Johto, stores 0 otherwise | | +| 0345 | | Var: Variable | ??? | | +| 0346 | CheckMoneyFull | u16: Money Account; Var: Variable | Stores 1 in Variable if the chosen money account is full.
Money account 0 = Mom's savings;
Money account 1 = Player; | | +| 0347 | SystemSetSleepFlag \* | | | | +| 0348 | | | | | +| 0349 | | | | | +| 034A | | | | | +| 034B | TextItemLowercase | u8: String Buffer; Flex: Item | Stores Item's lowercase name in String Buffer | International release exclusive. | +| 034C | TextItemPlural | u8: String Buffer; Flex: Item | Stores Item's plural noun in String Buffer | International release exclusive. | +| 034D | TextPartyPokemonDefault | u8: String Buffer; Flex: Party position | Stores the name of the Pokémon in Party Position in String Buffer with default color tags encoding | International release exclusive. Names stored at text file 238. | +| 034E | | | | International release exclusive. | +| 034F | | u8: String Buffer | ??? | International release exclusive. | +| 0350 | | u8: String Buffer; Flex: Accesory | ??? | International release exclusive. | +| 0351 | TextTrainerClass | u8: String Buffer; Flex: Trainer class | Stores Trainer class' lowercase noun in String Buffer | International release exclusive. | +| 0352 | TextSealPlural | u8: String Buffer; Flex: Seal | Stores Seal's plural noun in String Buffer | International release exclusive. Text archive 16. | +| 0353 | TextCapitalize | u8: String Buffer | Capitalizes the string currently stored in String Buffer | International release exclusive. | +| 0354 | TextFloor | u8: String Buffer; u8: Floor | Stores Floor's name in String Buffer | International release exclusive. Names stored at text file 191, lines 0x74 to 0x7A. | \ No newline at end of file From 9b28d63e1e9244705071944de21d31f1491a9b9f Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Sun, 3 Mar 2024 21:42:26 +0100 Subject: [PATCH 11/40] added alpha ruin command names. needs checking asm --- DS_Map/Resources/ScriptDatabase.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DS_Map/Resources/ScriptDatabase.cs b/DS_Map/Resources/ScriptDatabase.cs index a402edc..1b89c37 100644 --- a/DS_Map/Resources/ScriptDatabase.cs +++ b/DS_Map/Resources/ScriptDatabase.cs @@ -2094,6 +2094,9 @@ namespace DSPRE.Resources { [0x02C7] = "TalkFollowingPoke", + [0x02C9] = "OpenAlphaPuzzle", + [0x02CA] = "OpenRuinsofAlphHiddenRoom", + [0x02D3] = "BoatAnimation", From 0ab3d123c66b4addec3cd2388b870f893bfdca09 Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Tue, 5 Mar 2024 13:53:48 +0100 Subject: [PATCH 12/40] Some more fixes to the new tabs and an arm9 issue (force it uncompressed) --- DS_Map/EditorPanels.cs | 12 +- DS_Map/Editors/LevelScriptEditor.cs | 654 ++++++++++++++-------------- DS_Map/Main Window.Designer.cs | 232 +++++----- DS_Map/Main Window.cs | 10 +- DS_Map/Main Window.resx | 183 ++++---- 5 files changed, 545 insertions(+), 546 deletions(-) diff --git a/DS_Map/EditorPanels.cs b/DS_Map/EditorPanels.cs index c61106c..6693a0e 100644 --- a/DS_Map/EditorPanels.cs +++ b/DS_Map/EditorPanels.cs @@ -8,13 +8,17 @@ namespace DSPRE { public static void Initialize(MainProgram mainProgram) { MainProgram = mainProgram; } + public static TabControl mainTabControl { get { return MainProgram.mainTabControl; } } public static ScriptEditor scriptEditor { get { return MainProgram.scriptEditor; } } public static LevelScriptEditor levelScriptEditor { get { return MainProgram.levelScriptEditor; } } - public static TabControl mainTabControl { get { return MainProgram.mainTabControl; } } + + public static EncountersEditor encountersEditor { get { return MainProgram.encountersEditor; } } public static TabPage scriptEditorTabPage { get { return MainProgram.tabPageScriptEditor; } } - public static TabPage levelScriptEditorTabPage { get { return MainProgram.tabPageLevelScriptEditor; } } - - } + public static TabPage levelScriptEditorTabPage { get { return MainProgram.tabPageLevelScriptEditor; } } + public static TabPage tabPageEncountersEditor { get { return MainProgram.tabPageEncountersEditor; } } + + + } } diff --git a/DS_Map/Editors/LevelScriptEditor.cs b/DS_Map/Editors/LevelScriptEditor.cs index 0c8c424..a980078 100644 --- a/DS_Map/Editors/LevelScriptEditor.cs +++ b/DS_Map/Editors/LevelScriptEditor.cs @@ -5,218 +5,209 @@ using System.Windows.Forms; using DSPRE.ROMFiles; namespace DSPRE.Editors { - public partial class LevelScriptEditor : UserControl { - public bool levelScriptEditorIsReady { get; set; } = false; - LevelScriptFile _levelScriptFile; + public partial class LevelScriptEditor : UserControl { + public bool levelScriptEditorIsReady { get; set; } = false; + LevelScriptFile _levelScriptFile; MainProgram _parent; - public LevelScriptEditor() { - InitializeComponent(); - - } + public LevelScriptEditor() { + InitializeComponent(); - public void SetUpLevelScriptEditor(MainProgram parent, bool force = false) { - if (levelScriptEditorIsReady && !force) return; - levelScriptEditorIsReady = true; + } + + public void SetUpLevelScriptEditor(MainProgram parent, bool force = false) { + if (levelScriptEditorIsReady && !force) return; + levelScriptEditorIsReady = true; this._parent = parent; DSUtils.TryUnpackNarcs(new List { RomInfo.DirNames.scripts }); //12 = scripts Narc Dir - populate_selectScriptFileComboBox(); - } + populate_selectScriptFileComboBox(); + } + + public void OpenLevelScriptEditor(MainProgram parent, int levelScriptID) { - public void OpenLevelScriptEditor(MainProgram parent, int levelScriptID) { - SetUpLevelScriptEditor(parent); - selectScriptFileComboBox.SelectedIndex = levelScriptID; - EditorPanels.mainTabControl.SelectedTab = EditorPanels.levelScriptEditorTabPage; - } - - private void populate_selectScriptFileComboBox(int selectedIndex = 0) { - selectScriptFileComboBox.Items.Clear(); - int scriptCount = Filesystem.GetScriptCount(); - for (int i = 0; i < scriptCount; i++) { - // ScriptFile currentScriptFile = new ScriptFile(i, true, true); - // selectScriptFileComboBox.Items.Add(currentScriptFile); - selectScriptFileComboBox.Items.Add($"Script File {i}"); - } - - selectScriptFileComboBox.SelectedIndex = selectedIndex; - } - - void disableButtons() { - listBoxTriggers.DataSource = null; - - textBoxScriptID.Clear(); - textBoxVariableName.Clear(); - textBoxVariableValue.Clear(); - - radioButtonVariableValue.Checked = false; - radioButtonMapChange.Checked = false; - radioButtonScreenReset.Checked = false; - radioButtonLoadGame.Checked = false; - - textBoxScriptID.Enabled = false; - textBoxVariableName.Enabled = false; - textBoxVariableValue.Enabled = false; - - radioButtonVariableValue.Enabled = false; - radioButtonMapChange.Enabled = false; - radioButtonScreenReset.Enabled = false; - radioButtonLoadGame.Enabled = false; - - radioButtonAuto.Enabled = false; - radioButtonHex.Enabled = false; - radioButtonDecimal.Enabled = false; - - buttonImport.Enabled = false; - buttonSave.Enabled = false; - buttonExport.Enabled = false; - checkBoxPadding.Enabled = false; - - buttonAdd.Enabled = false; - buttonRemove.Enabled = false; - } - - void enableButtons() { - // textBoxScriptID.Enabled = true; - // textBoxVariableName.Enabled = true; - // textBoxVariableValue.Enabled = true; - - radioButtonVariableValue.Enabled = true; - radioButtonMapChange.Enabled = true; - radioButtonScreenReset.Enabled = true; - radioButtonLoadGame.Enabled = true; - - radioButtonAuto.Enabled = true; - radioButtonHex.Enabled = true; - radioButtonDecimal.Enabled = true; - - buttonImport.Enabled = true; - buttonSave.Enabled = true; - buttonExport.Enabled = true; - checkBoxPadding.Enabled = true; - } - - void buttonAdd_logic() { - buttonAdd.Enabled = false; - - if (radioButtonVariableValue.Checked) { - if (!string.IsNullOrEmpty(textBoxScriptID.Text) && !string.IsNullOrEmpty(textBoxVariableName.Text) && !string.IsNullOrEmpty(textBoxVariableValue.Text)) { - buttonAdd.Enabled = true; + selectScriptFileComboBox.SelectedIndex = levelScriptID; + EditorPanels.mainTabControl.SelectedTab = EditorPanels.levelScriptEditorTabPage; } - } - else if (radioButtonMapChange.Checked || radioButtonScreenReset.Checked || radioButtonLoadGame.Checked) { - if (!string.IsNullOrEmpty(textBoxScriptID.Text)) { - buttonAdd.Enabled = true; + + private void populate_selectScriptFileComboBox(int selectedIndex = 0) { + selectScriptFileComboBox.Items.Clear(); + int scriptCount = Filesystem.GetScriptCount(); + for (int i = 0; i < scriptCount; i++) { + // ScriptFile currentScriptFile = new ScriptFile(i, true, true); + // selectScriptFileComboBox.Items.Add(currentScriptFile); + selectScriptFileComboBox.Items.Add($"Script File {i}"); + } + + selectScriptFileComboBox.SelectedIndex = selectedIndex; } - } - } - private void selectScriptFileComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (selectScriptFileComboBox.SelectedIndex == -1) { - buttonOpenSelectedScript.Enabled = false; - buttonOpenHeaderScript.Enabled = false; - buttonLocate.Enabled = false; - } - else { - buttonOpenSelectedScript.Enabled = true; - buttonOpenHeaderScript.Enabled = true; - buttonLocate.Enabled = true; - } + void disableButtons() { + listBoxTriggers.DataSource = null; - disableButtons(); + textBoxScriptID.Clear(); + textBoxVariableName.Clear(); + textBoxVariableValue.Clear(); - try { - _levelScriptFile = new LevelScriptFile(selectScriptFileComboBox.SelectedIndex); + radioButtonVariableValue.Checked = false; + radioButtonMapChange.Checked = false; + radioButtonScreenReset.Checked = false; + radioButtonLoadGame.Checked = false; - listBoxTriggers.DataSource = _levelScriptFile.bufferSet; - if (listBoxTriggers.Items.Count > 0) listBoxTriggers.SelectedIndex = 0; + textBoxScriptID.Enabled = false; + textBoxVariableName.Enabled = false; + textBoxVariableValue.Enabled = false; - enableButtons(); - } - catch (InvalidDataException ex) { //not a level script - disableButtons(); - Console.WriteLine(ex.Message); - } - } + radioButtonVariableValue.Enabled = false; + radioButtonMapChange.Enabled = false; + radioButtonScreenReset.Enabled = false; + radioButtonLoadGame.Enabled = false; - void listBoxTriggers_SelectedValueChanged(object sender, EventArgs e) { - if (listBoxTriggers.SelectedItem == null) { - buttonRemove.Enabled = false; - return; - } + radioButtonAuto.Enabled = false; + radioButtonHex.Enabled = false; + radioButtonDecimal.Enabled = false; - if (listBoxTriggers.SelectedItem is MapScreenLoadTrigger mapScreenLoadTrigger) { - if (mapScreenLoadTrigger.triggerType == LevelScriptTrigger.LOADGAME) { - radioButtonLoadGame.Checked = true; + buttonImport.Enabled = false; + buttonSave.Enabled = false; + buttonExport.Enabled = false; + checkBoxPadding.Enabled = false; + + buttonAdd.Enabled = false; + buttonRemove.Enabled = false; } - else if (mapScreenLoadTrigger.triggerType == LevelScriptTrigger.MAPCHANGE) { - radioButtonMapChange.Checked = true; + + void enableButtons() { + // textBoxScriptID.Enabled = true; + // textBoxVariableName.Enabled = true; + // textBoxVariableValue.Enabled = true; + + radioButtonVariableValue.Enabled = true; + radioButtonMapChange.Enabled = true; + radioButtonScreenReset.Enabled = true; + radioButtonLoadGame.Enabled = true; + + radioButtonAuto.Enabled = true; + radioButtonHex.Enabled = true; + radioButtonDecimal.Enabled = true; + + buttonImport.Enabled = true; + buttonSave.Enabled = true; + buttonExport.Enabled = true; + checkBoxPadding.Enabled = true; } - else if (mapScreenLoadTrigger.triggerType == LevelScriptTrigger.SCREENRESET) { - radioButtonScreenReset.Checked = true; + + void buttonAdd_logic() { + buttonAdd.Enabled = false; + + if (radioButtonVariableValue.Checked) { + if (!string.IsNullOrEmpty(textBoxScriptID.Text) && !string.IsNullOrEmpty(textBoxVariableName.Text) && !string.IsNullOrEmpty(textBoxVariableValue.Text)) { + buttonAdd.Enabled = true; + } + } else if (radioButtonMapChange.Checked || radioButtonScreenReset.Checked || radioButtonLoadGame.Checked) { + if (!string.IsNullOrEmpty(textBoxScriptID.Text)) { + buttonAdd.Enabled = true; + } + } } - } - else if (listBoxTriggers.SelectedItem is VariableValueTrigger variableValueTrigger) { - if (variableValueTrigger.triggerType == LevelScriptTrigger.VARIABLEVALUE) { - radioButtonVariableValue.Checked = true; + + private void selectScriptFileComboBox_SelectedIndexChanged(object sender, EventArgs e) { + if (selectScriptFileComboBox.SelectedIndex == -1) { + buttonOpenSelectedScript.Enabled = false; + buttonOpenHeaderScript.Enabled = false; + buttonLocate.Enabled = false; + } else { + buttonOpenSelectedScript.Enabled = true; + buttonOpenHeaderScript.Enabled = true; + buttonLocate.Enabled = true; + } + + disableButtons(); + + try { + _levelScriptFile = new LevelScriptFile(selectScriptFileComboBox.SelectedIndex); + + listBoxTriggers.DataSource = _levelScriptFile.bufferSet; + if (listBoxTriggers.Items.Count > 0) listBoxTriggers.SelectedIndex = 0; + + enableButtons(); + } catch (InvalidDataException ex) { //not a level script + disableButtons(); + Console.WriteLine(ex.Message); + } } - } - handleAutoFormat(); - handleHexFormat(); - handleDecimalFormat(); + void listBoxTriggers_SelectedValueChanged(object sender, EventArgs e) { + if (listBoxTriggers.SelectedItem == null) { + buttonRemove.Enabled = false; + return; + } - textBoxScriptID.Enabled = true; - buttonRemove.Enabled = true; - } + if (listBoxTriggers.SelectedItem is MapScreenLoadTrigger mapScreenLoadTrigger) { + if (mapScreenLoadTrigger.triggerType == LevelScriptTrigger.LOADGAME) { + radioButtonLoadGame.Checked = true; + } else if (mapScreenLoadTrigger.triggerType == LevelScriptTrigger.MAPCHANGE) { + radioButtonMapChange.Checked = true; + } else if (mapScreenLoadTrigger.triggerType == LevelScriptTrigger.SCREENRESET) { + radioButtonScreenReset.Checked = true; + } + } else if (listBoxTriggers.SelectedItem is VariableValueTrigger variableValueTrigger) { + if (variableValueTrigger.triggerType == LevelScriptTrigger.VARIABLEVALUE) { + radioButtonVariableValue.Checked = true; + } + } - private void buttonAdd_Click(object sender, EventArgs e) { - // try { - if (_levelScriptFile == null) { - _levelScriptFile = new LevelScriptFile(); - } + handleAutoFormat(); + handleHexFormat(); + handleDecimalFormat(); - int convertBase = 10; //decimal - if (radioButtonHex.Checked) { - convertBase = 16; //hex - } - - if (radioButtonVariableValue.Checked) { - int scriptID = Convert.ToInt16(textBoxScriptID.Text, convertBase); - int variableName = Convert.ToInt16(textBoxVariableName.Text, convertBase); - int variableValue = Convert.ToInt16(textBoxVariableValue.Text, convertBase); - VariableValueTrigger variableValueTrigger = new VariableValueTrigger(scriptID, variableName, variableValue); - _levelScriptFile.bufferSet.Add(variableValueTrigger); - } - else { - int scriptID = Convert.ToInt16(textBoxScriptID.Text, convertBase); - if (radioButtonMapChange.Checked) { - MapScreenLoadTrigger mapScreenLoadTrigger = new MapScreenLoadTrigger(LevelScriptTrigger.MAPCHANGE, scriptID); - _levelScriptFile.bufferSet.Add(mapScreenLoadTrigger); + textBoxScriptID.Enabled = true; + buttonRemove.Enabled = true; } - else if (radioButtonScreenReset.Checked) { - MapScreenLoadTrigger mapScreenLoadTrigger = new MapScreenLoadTrigger(LevelScriptTrigger.SCREENRESET, scriptID); - _levelScriptFile.bufferSet.Add(mapScreenLoadTrigger); - } - else if (radioButtonLoadGame.Checked) { - MapScreenLoadTrigger mapScreenLoadTrigger = new MapScreenLoadTrigger(LevelScriptTrigger.LOADGAME, scriptID); - _levelScriptFile.bufferSet.Add(mapScreenLoadTrigger); - } - } - textBoxScriptID.Clear(); - textBoxVariableName.Clear(); - textBoxVariableValue.Clear(); - // } - // catch (Exception exception) { - // MessageBox.Show(exception.Message); - // } - } + private void buttonAdd_Click(object sender, EventArgs e) { + // try { + if (_levelScriptFile == null) { + _levelScriptFile = new LevelScriptFile(); + } - private void buttonRemove_Click(object sender, EventArgs e) { - _levelScriptFile.bufferSet.RemoveAt(listBoxTriggers.SelectedIndex); - } + int convertBase = 10; //decimal + if (radioButtonHex.Checked) { + convertBase = 16; //hex + } + + if (radioButtonVariableValue.Checked) { + int scriptID = Convert.ToInt16(textBoxScriptID.Text, convertBase); + int variableName = Convert.ToInt16(textBoxVariableName.Text, convertBase); + int variableValue = Convert.ToInt16(textBoxVariableValue.Text, convertBase); + VariableValueTrigger variableValueTrigger = new VariableValueTrigger(scriptID, variableName, variableValue); + _levelScriptFile.bufferSet.Add(variableValueTrigger); + } else { + int scriptID = Convert.ToInt16(textBoxScriptID.Text, convertBase); + if (radioButtonMapChange.Checked) { + MapScreenLoadTrigger mapScreenLoadTrigger = new MapScreenLoadTrigger(LevelScriptTrigger.MAPCHANGE, scriptID); + _levelScriptFile.bufferSet.Add(mapScreenLoadTrigger); + } else if (radioButtonScreenReset.Checked) { + MapScreenLoadTrigger mapScreenLoadTrigger = new MapScreenLoadTrigger(LevelScriptTrigger.SCREENRESET, scriptID); + _levelScriptFile.bufferSet.Add(mapScreenLoadTrigger); + } else if (radioButtonLoadGame.Checked) { + MapScreenLoadTrigger mapScreenLoadTrigger = new MapScreenLoadTrigger(LevelScriptTrigger.LOADGAME, scriptID); + _levelScriptFile.bufferSet.Add(mapScreenLoadTrigger); + } + } + + textBoxScriptID.Clear(); + textBoxVariableName.Clear(); + textBoxVariableValue.Clear(); + // } + // catch (Exception exception) { + // MessageBox.Show(exception.Message); + // } + } + + private void buttonRemove_Click(object sender, EventArgs e) { + _levelScriptFile.bufferSet.RemoveAt(listBoxTriggers.SelectedIndex); + } private void buttonOpenHeaderScript_Click(object sender, EventArgs e) { EditorPanels.scriptEditor.OpenScriptEditor(this._parent, (int)EditorPanels.MainProgram.scriptFileUpDown.Value); @@ -227,161 +218,154 @@ namespace DSPRE.Editors { } void buttonLocate_Click(object sender, EventArgs e) { - if (_levelScriptFile == null) return; - string path = Filesystem.GetScriptPath(_levelScriptFile.ID); - Helpers.ExplorerSelect(path); - } - - void buttonImport_Click(object sender, EventArgs e) { - OpenFileDialog ofd = new OpenFileDialog(); - if (ofd.ShowDialog() == DialogResult.OK) { - try { - LevelScriptFile importedFile = new LevelScriptFile(); - importedFile.parse_file(ofd.FileName); - _levelScriptFile.bufferSet.Clear(); - foreach (LevelScriptTrigger trigger in importedFile.bufferSet) { - _levelScriptFile.bufferSet.Add(trigger); - } + if (_levelScriptFile == null) return; + string path = Filesystem.GetScriptPath(_levelScriptFile.ID); + Helpers.ExplorerSelect(path); } - catch (InvalidDataException ex) { - MessageBox.Show(ex.Message, ex.GetType().ToString()); + + void buttonImport_Click(object sender, EventArgs e) { + OpenFileDialog ofd = new OpenFileDialog(); + if (ofd.ShowDialog() == DialogResult.OK) { + try { + LevelScriptFile importedFile = new LevelScriptFile(); + importedFile.parse_file(ofd.FileName); + _levelScriptFile.bufferSet.Clear(); + foreach (LevelScriptTrigger trigger in importedFile.bufferSet) { + _levelScriptFile.bufferSet.Add(trigger); + } + } catch (InvalidDataException ex) { + MessageBox.Show(ex.Message, ex.GetType().ToString()); + } + } } - } - } - private void buttonSave_Click(object sender, EventArgs e) { - string path = Filesystem.GetScriptPath(_levelScriptFile.ID); - saveFile(path); - } - - private void buttonExport_Click(object sender, EventArgs e) { - SaveFileDialog sfd = new SaveFileDialog(); - try { - sfd.InitialDirectory = Path.GetDirectoryName(sfd.FileName); - sfd.FileName = Path.GetFileName(sfd.FileName); - } - catch (Exception ex) { - sfd.InitialDirectory = Path.GetDirectoryName(Environment.SpecialFolder.UserProfile.ToString()); - sfd.FileName = Path.GetFileName(sfd.FileName); - } - - if (sfd.ShowDialog() == DialogResult.OK) { - saveFile(sfd.FileName); - } - } - - void saveFile(string path) { - try { - long bytes_written = _levelScriptFile.write_file(path); - if (bytes_written <= 4) { - MessageBox.Show("Empty level script file was correctly saved.", "Success!"); + private void buttonSave_Click(object sender, EventArgs e) { + string path = Filesystem.GetScriptPath(_levelScriptFile.ID); + saveFile(path); } - else { - MessageBox.Show("File was correctly saved.", "Success!"); + + private void buttonExport_Click(object sender, EventArgs e) { + SaveFileDialog sfd = new SaveFileDialog(); + try { + sfd.InitialDirectory = Path.GetDirectoryName(sfd.FileName); + sfd.FileName = Path.GetFileName(sfd.FileName); + } catch (Exception ex) { + sfd.InitialDirectory = Path.GetDirectoryName(Environment.SpecialFolder.UserProfile.ToString()); + sfd.FileName = Path.GetFileName(sfd.FileName); + } + + if (sfd.ShowDialog() == DialogResult.OK) { + saveFile(sfd.FileName); + } + } + + void saveFile(string path) { + try { + long bytes_written = _levelScriptFile.write_file(path); + if (bytes_written <= 4) { + MessageBox.Show("Empty level script file was correctly saved.", "Success!"); + } else { + MessageBox.Show("File was correctly saved.", "Success!"); + } + } catch (Exception ex) { + MessageBox.Show(ex.Message, ex.GetType().ToString()); + } + } + + private void handleAutoFormat() { + if (!radioButtonAuto.Checked) return; + + textBoxScriptID.Clear(); + textBoxVariableName.Clear(); + textBoxVariableValue.Clear(); + + if (listBoxTriggers.SelectedItem is MapScreenLoadTrigger mapScreenLoadTrigger) { + textBoxScriptID.Text = mapScreenLoadTrigger.scriptTriggered.ToString(); + } else if (listBoxTriggers.SelectedItem is VariableValueTrigger variableValueTrigger) { + textBoxScriptID.Text = variableValueTrigger.scriptTriggered.ToString(); + textBoxVariableName.Text = "" + variableValueTrigger.variableToWatch.ToString("D"); + textBoxVariableValue.Text = "" + variableValueTrigger.expectedValue.ToString("D"); + } + } + + private void handleHexFormat() { + if (!radioButtonHex.Checked) return; + + textBoxScriptID.Clear(); + textBoxVariableName.Clear(); + textBoxVariableValue.Clear(); + + if (listBoxTriggers.SelectedItem is MapScreenLoadTrigger mapScreenLoadTrigger) { + textBoxScriptID.Text = mapScreenLoadTrigger.scriptTriggered.ToString(); + } else if (listBoxTriggers.SelectedItem is VariableValueTrigger variableValueTrigger) { + textBoxScriptID.Text = variableValueTrigger.scriptTriggered.ToString(); + textBoxVariableName.Text = "0x" + variableValueTrigger.variableToWatch.ToString("X"); + textBoxVariableValue.Text = "0x" + variableValueTrigger.expectedValue.ToString("X"); + } + } + + private void handleDecimalFormat() { + if (!radioButtonDecimal.Checked) return; + + textBoxScriptID.Clear(); + textBoxVariableName.Clear(); + textBoxVariableValue.Clear(); + + if (listBoxTriggers.SelectedItem is MapScreenLoadTrigger mapScreenLoadTrigger) { + textBoxScriptID.Text = mapScreenLoadTrigger.scriptTriggered.ToString(); + } else if (listBoxTriggers.SelectedItem is VariableValueTrigger variableValueTrigger) { + textBoxScriptID.Text = variableValueTrigger.scriptTriggered.ToString(); + textBoxVariableName.Text = "" + variableValueTrigger.variableToWatch.ToString("D"); + textBoxVariableValue.Text = "" + variableValueTrigger.expectedValue.ToString("D"); + } + } + + private void radioButtonAuto_CheckedChanged(object sender, EventArgs e) { + handleAutoFormat(); + } + + private void radioButtonHex_CheckedChanged(object sender, EventArgs e) { + handleHexFormat(); + } + + private void radioButtonDecimal_CheckedChanged(object sender, EventArgs e) { + handleDecimalFormat(); + } + + private void radioButtonVariableValue_CheckedChanged(object sender, EventArgs e) { + textBoxVariableName.Enabled = true; + textBoxVariableValue.Enabled = true; + buttonAdd_logic(); + } + + private void radioButtonMapChange_CheckedChanged(object sender, EventArgs e) { + textBoxVariableName.Enabled = false; + textBoxVariableValue.Enabled = false; + buttonAdd_logic(); + } + + private void radioButtonScreenReset_CheckedChanged(object sender, EventArgs e) { + textBoxVariableName.Enabled = false; + textBoxVariableValue.Enabled = false; + buttonAdd_logic(); + } + + private void radioButtonLoadGame_CheckedChanged(object sender, EventArgs e) { + textBoxVariableName.Enabled = false; + textBoxVariableValue.Enabled = false; + buttonAdd_logic(); + } + + void textBoxScriptID_TextChanged(object sender, EventArgs e) { + buttonAdd_logic(); + } + + void textBoxVariableName_TextChanged(object sender, EventArgs e) { + buttonAdd_logic(); + } + + void textBoxVariableValue_TextChanged(object sender, EventArgs e) { + buttonAdd_logic(); } - } - catch (Exception ex) { - MessageBox.Show(ex.Message, ex.GetType().ToString()); - } } - - private void handleAutoFormat() { - if (!radioButtonAuto.Checked) return; - - textBoxScriptID.Clear(); - textBoxVariableName.Clear(); - textBoxVariableValue.Clear(); - - if (listBoxTriggers.SelectedItem is MapScreenLoadTrigger mapScreenLoadTrigger) { - textBoxScriptID.Text = mapScreenLoadTrigger.scriptTriggered.ToString(); - } - else if (listBoxTriggers.SelectedItem is VariableValueTrigger variableValueTrigger) { - textBoxScriptID.Text = variableValueTrigger.scriptTriggered.ToString(); - textBoxVariableName.Text = "" + variableValueTrigger.variableToWatch.ToString("D"); - textBoxVariableValue.Text = "" + variableValueTrigger.expectedValue.ToString("D"); - } - } - - private void handleHexFormat() { - if (!radioButtonHex.Checked) return; - - textBoxScriptID.Clear(); - textBoxVariableName.Clear(); - textBoxVariableValue.Clear(); - - if (listBoxTriggers.SelectedItem is MapScreenLoadTrigger mapScreenLoadTrigger) { - textBoxScriptID.Text = mapScreenLoadTrigger.scriptTriggered.ToString(); - } - else if (listBoxTriggers.SelectedItem is VariableValueTrigger variableValueTrigger) { - textBoxScriptID.Text = variableValueTrigger.scriptTriggered.ToString(); - textBoxVariableName.Text = "0x" + variableValueTrigger.variableToWatch.ToString("X"); - textBoxVariableValue.Text = "0x" + variableValueTrigger.expectedValue.ToString("X"); - } - } - - private void handleDecimalFormat() { - if (!radioButtonDecimal.Checked) return; - - textBoxScriptID.Clear(); - textBoxVariableName.Clear(); - textBoxVariableValue.Clear(); - - if (listBoxTriggers.SelectedItem is MapScreenLoadTrigger mapScreenLoadTrigger) { - textBoxScriptID.Text = mapScreenLoadTrigger.scriptTriggered.ToString(); - } - else if (listBoxTriggers.SelectedItem is VariableValueTrigger variableValueTrigger) { - textBoxScriptID.Text = variableValueTrigger.scriptTriggered.ToString(); - textBoxVariableName.Text = "" + variableValueTrigger.variableToWatch.ToString("D"); - textBoxVariableValue.Text = "" + variableValueTrigger.expectedValue.ToString("D"); - } - } - - private void radioButtonAuto_CheckedChanged(object sender, EventArgs e) { - handleAutoFormat(); - } - - private void radioButtonHex_CheckedChanged(object sender, EventArgs e) { - handleHexFormat(); - } - - private void radioButtonDecimal_CheckedChanged(object sender, EventArgs e) { - handleDecimalFormat(); - } - - private void radioButtonVariableValue_CheckedChanged(object sender, EventArgs e) { - textBoxVariableName.Enabled = true; - textBoxVariableValue.Enabled = true; - buttonAdd_logic(); - } - - private void radioButtonMapChange_CheckedChanged(object sender, EventArgs e) { - textBoxVariableName.Enabled = false; - textBoxVariableValue.Enabled = false; - buttonAdd_logic(); - } - - private void radioButtonScreenReset_CheckedChanged(object sender, EventArgs e) { - textBoxVariableName.Enabled = false; - textBoxVariableValue.Enabled = false; - buttonAdd_logic(); - } - - private void radioButtonLoadGame_CheckedChanged(object sender, EventArgs e) { - textBoxVariableName.Enabled = false; - textBoxVariableValue.Enabled = false; - buttonAdd_logic(); - } - - void textBoxScriptID_TextChanged(object sender, EventArgs e) { - buttonAdd_logic(); - } - - void textBoxVariableName_TextChanged(object sender, EventArgs e) { - buttonAdd_logic(); - } - - void textBoxVariableValue_TextChanged(object sender, EventArgs e) { - buttonAdd_logic(); - } - } } diff --git a/DS_Map/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs index 6c3edb1..eb9f35d 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 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(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = 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(); @@ -2543,7 +2543,7 @@ this.setSpawnPointButton.Image = global::DSPRE.Properties.Resources.spawnCoordsMatrixeditorIcon; this.setSpawnPointButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.setSpawnPointButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.setSpawnPointButton.Location = new System.Drawing.Point(12, -2832); + this.setSpawnPointButton.Location = new System.Drawing.Point(12, -4034); this.setSpawnPointButton.Name = "setSpawnPointButton"; this.setSpawnPointButton.Size = new System.Drawing.Size(117, 43); this.setSpawnPointButton.TabIndex = 35; @@ -2559,7 +2559,7 @@ this.saveMatrixButton.Image = global::DSPRE.Properties.Resources.save_rom; this.saveMatrixButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.saveMatrixButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.saveMatrixButton.Location = new System.Drawing.Point(12, -2787); + this.saveMatrixButton.Location = new System.Drawing.Point(12, -3989); this.saveMatrixButton.Name = "saveMatrixButton"; this.saveMatrixButton.Size = new System.Drawing.Size(117, 43); this.saveMatrixButton.TabIndex = 34; @@ -2762,40 +2762,40 @@ this.headersGridView.AllowUserToResizeColumns = false; this.headersGridView.AllowUserToResizeRows = false; this.headersGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - 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; + dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + dataGridViewCellStyle17.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.Info; + dataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.headersGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle17; this.headersGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - 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; + dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle18.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle18.Format = "D4"; + dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.headersGridView.DefaultCellStyle = dataGridViewCellStyle18; this.headersGridView.Location = new System.Drawing.Point(0, 0); this.headersGridView.MultiSelect = false; this.headersGridView.Name = "headersGridView"; - 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; + dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle19.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.headersGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle19; this.headersGridView.RowHeadersWidth = 50; this.headersGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - 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; + dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle20.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.headersGridView.RowsDefaultCellStyle = dataGridViewCellStyle20; 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 +2824,43 @@ this.heightsGridView.AllowUserToDeleteRows = false; this.heightsGridView.AllowUserToResizeColumns = false; this.heightsGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle21; this.heightsGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - 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; + dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle22.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.heightsGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle22; this.heightsGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - 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; + dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle23.Font = new System.Drawing.Font("Tahoma", 8.25F); + dataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle23.Format = "D2"; + dataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle23; this.heightsGridView.Location = new System.Drawing.Point(0, 0); this.heightsGridView.MultiSelect = false; this.heightsGridView.Name = "heightsGridView"; - 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; + dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle24.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.heightsGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle24; this.heightsGridView.RowHeadersWidth = 50; this.heightsGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - 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; + dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle25.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.heightsGridView.RowsDefaultCellStyle = dataGridViewCellStyle25; 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 +2887,43 @@ this.mapFilesGridView.AllowUserToDeleteRows = false; this.mapFilesGridView.AllowUserToResizeColumns = false; this.mapFilesGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle26; this.mapFilesGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - 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; + dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle27.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.mapFilesGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle27; this.mapFilesGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - 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; + dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle28.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle28.Format = "D4"; + dataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle28; this.mapFilesGridView.Location = new System.Drawing.Point(0, 0); this.mapFilesGridView.MultiSelect = false; this.mapFilesGridView.Name = "mapFilesGridView"; - 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; + dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle29.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.mapFilesGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle29; this.mapFilesGridView.RowHeadersWidth = 50; this.mapFilesGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - 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; + dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle30.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.mapFilesGridView.RowsDefaultCellStyle = dataGridViewCellStyle30; this.mapFilesGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.mapFilesGridView.RowTemplate.Height = 18; this.mapFilesGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; @@ -4324,7 +4324,7 @@ this.radio3D.AutoSize = true; this.radio3D.Checked = true; this.radio3D.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.radio3D.Location = new System.Drawing.Point(-4818, -2808); + this.radio3D.Location = new System.Drawing.Point(-6804, -4010); this.radio3D.Name = "radio3D"; this.radio3D.Size = new System.Drawing.Size(31, 23); this.radio3D.TabIndex = 26; @@ -4339,7 +4339,7 @@ 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(-4818, -2784); + this.radio2D.Location = new System.Drawing.Point(-6804, -3986); this.radio2D.Name = "radio2D"; this.radio2D.Size = new System.Drawing.Size(31, 23); this.radio2D.TabIndex = 25; @@ -4354,7 +4354,7 @@ 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(1140, -2760); + this.wireframeCheckBox.Location = new System.Drawing.Point(1140, -3962); this.wireframeCheckBox.Name = "wireframeCheckBox"; this.wireframeCheckBox.Size = new System.Drawing.Size(31, 23); this.wireframeCheckBox.TabIndex = 27; @@ -7316,8 +7316,8 @@ this.textEditorDataGridView.Location = new System.Drawing.Point(12, 77); this.textEditorDataGridView.Name = "textEditorDataGridView"; this.textEditorDataGridView.RowHeadersWidth = 68; - dataGridViewCellStyle15.Font = new System.Drawing.Font("Consolas", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textEditorDataGridView.RowsDefaultCellStyle = dataGridViewCellStyle15; + dataGridViewCellStyle31.Font = new System.Drawing.Font("Consolas", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textEditorDataGridView.RowsDefaultCellStyle = dataGridViewCellStyle31; this.textEditorDataGridView.Size = new System.Drawing.Size(873, 500); this.textEditorDataGridView.TabIndex = 24; this.textEditorDataGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.textEditorDataGridView_CellValueChanged); @@ -7420,9 +7420,9 @@ this.cameraEditorDataGridView.CausesValidation = false; this.cameraEditorDataGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised; this.cameraEditorDataGridView.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - 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; + dataGridViewCellStyle32.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.cameraEditorDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle32; this.cameraEditorDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.cameraEditorDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.DistanceGVCol, @@ -11960,8 +11960,8 @@ public DSPRE.Editors.LevelScriptEditor levelScriptEditor; public System.Windows.Forms.TabControl mainTabControl; public System.Windows.Forms.NumericUpDown scriptFileUpDown; - private System.Windows.Forms.TabPage tabPageEncountersEditor; - private Editors.EncountersEditor encountersEditor; + public System.Windows.Forms.TabPage tabPageEncountersEditor; + public Editors.EncountersEditor encountersEditor; } } diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index defa900..cc46e3f 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -728,6 +728,8 @@ namespace DSPRE { } } + DSUtils.ARM9.WriteBytes(new byte[4] { 0, 0, 0, 0 }, (uint)(RomInfo.gameFamily == GameFamilies.DP ? 0xB7C : 0xBB4)); + Helpers.statusLabelMessage("Repacking ROM..."); if (DSUtils.CheckOverlayHasCompressionFlag(1)) { @@ -751,7 +753,7 @@ namespace DSPRE { for (int i = 0; i < 128; i++) { if (!DSUtils.OverlayIsCompressed(i)) { - DSUtils.CompressOverlay(i); + //DSUtils.CompressOverlay(i); } } @@ -881,6 +883,12 @@ namespace DSPRE { SetupBattleEffectsTables(); tableEditorIsReady = true; } + } else if (mainTabControl.SelectedTab == EditorPanels.scriptEditorTabPage) { + scriptEditor.SetupScriptEditor(this); + } else if (mainTabControl.SelectedTab == EditorPanels.levelScriptEditorTabPage) { + levelScriptEditor.SetUpLevelScriptEditor(this); + } else if (mainTabControl.SelectedTab == EditorPanels.tabPageEncountersEditor) { + encountersEditor.SetupEncountersEditor(); } } diff --git a/DS_Map/Main Window.resx b/DS_Map/Main Window.resx index af8eb9d..45d1ad3 100644 --- a/DS_Map/Main Window.resx +++ b/DS_Map/Main Window.resx @@ -117,6 +117,96 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 239, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM + EgAAAk1TRnQBSQFMAgEBCgEAASgBHAEoARwBEAEAARABAAT/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== + + @@ -946,96 +1036,6 @@ p3S+M+m1V1me9QgCUQNXX2YRT1sYHBiEP3wHVbp3PF3cB40GbrzN86xHENrScf1NDsl8FaI4jODMHOgS SOacfYAmbr5XeNYjGH7yDReXv+JeNIUhUYwFpmZjDz+nMLf5B3b2rcZ5tju4ntjtFw4T54j+v2g/t9NH 9AiCIPwGJelqUAd/T3AAAAAASUVORK5CYII= - - - - 239, 17 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM - EgAAAk1TRnQBSQFMAgEBCgEAARgBHAEYARwBEAEAARABAAT/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== @@ -1047,6 +1047,9 @@ 386, 19 + + 533, 20 + 67 From 7f26a62d31367004cb45be9f0a0bbc9c1ab85fbc Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Wed, 6 Mar 2024 00:30:04 +0100 Subject: [PATCH 13/40] fixed dummy --- DS_Map/Main Window.Designer.cs | 234 ++++++++++++++++----------------- DS_Map/Main Window.resx | 183 +++++++++++++------------- 2 files changed, 207 insertions(+), 210 deletions(-) diff --git a/DS_Map/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs index eb9f35d..806f555 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 dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = 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(); @@ -2543,7 +2543,7 @@ this.setSpawnPointButton.Image = global::DSPRE.Properties.Resources.spawnCoordsMatrixeditorIcon; this.setSpawnPointButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.setSpawnPointButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.setSpawnPointButton.Location = new System.Drawing.Point(12, -4034); + this.setSpawnPointButton.Location = new System.Drawing.Point(12, -4635); this.setSpawnPointButton.Name = "setSpawnPointButton"; this.setSpawnPointButton.Size = new System.Drawing.Size(117, 43); this.setSpawnPointButton.TabIndex = 35; @@ -2559,7 +2559,7 @@ this.saveMatrixButton.Image = global::DSPRE.Properties.Resources.save_rom; this.saveMatrixButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.saveMatrixButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.saveMatrixButton.Location = new System.Drawing.Point(12, -3989); + this.saveMatrixButton.Location = new System.Drawing.Point(12, -4590); this.saveMatrixButton.Name = "saveMatrixButton"; this.saveMatrixButton.Size = new System.Drawing.Size(117, 43); this.saveMatrixButton.TabIndex = 34; @@ -2741,16 +2741,16 @@ this.matrixTabControl.Multiline = true; this.matrixTabControl.Name = "matrixTabControl"; this.matrixTabControl.SelectedIndex = 0; - this.matrixTabControl.Size = new System.Drawing.Size(0, 0); + this.matrixTabControl.Size = new System.Drawing.Size(1040, 610); this.matrixTabControl.TabIndex = 18; // // headersTabPage // this.headersTabPage.Controls.Add(this.headersGridView); - this.headersTabPage.Location = new System.Drawing.Point(4, 58); + this.headersTabPage.Location = new System.Drawing.Point(4, 22); this.headersTabPage.Name = "headersTabPage"; this.headersTabPage.Padding = new System.Windows.Forms.Padding(3); - this.headersTabPage.Size = new System.Drawing.Size(0, 0); + this.headersTabPage.Size = new System.Drawing.Size(1032, 584); this.headersTabPage.TabIndex = 1; this.headersTabPage.Text = "Map Headers"; this.headersTabPage.UseVisualStyleBackColor = true; @@ -2762,40 +2762,40 @@ this.headersGridView.AllowUserToResizeColumns = false; this.headersGridView.AllowUserToResizeRows = false; this.headersGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - dataGridViewCellStyle17.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.Info; - dataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.headersGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle17; + 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; - dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle18.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle18.Format = "D4"; - dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.headersGridView.DefaultCellStyle = dataGridViewCellStyle18; + 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"; - dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle19.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.headersGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle19; + 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; - dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle20.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.headersGridView.RowsDefaultCellStyle = dataGridViewCellStyle20; + 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 +2824,43 @@ this.heightsGridView.AllowUserToDeleteRows = false; this.heightsGridView.AllowUserToResizeColumns = false; this.heightsGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle21; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5; this.heightsGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle22.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.heightsGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle22; + 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; - dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle23.Font = new System.Drawing.Font("Tahoma", 8.25F); - dataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle23.Format = "D2"; - dataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle23; + 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"; - dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle24.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.heightsGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle24; + 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; - dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle25.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.heightsGridView.RowsDefaultCellStyle = dataGridViewCellStyle25; + 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 +2887,43 @@ this.mapFilesGridView.AllowUserToDeleteRows = false; this.mapFilesGridView.AllowUserToResizeColumns = false; this.mapFilesGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle26; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10; this.mapFilesGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle27.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mapFilesGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle27; + 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; - dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle28.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle28.Format = "D4"; - dataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle28; + 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"; - dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle29.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mapFilesGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle29; + 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; - dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle30.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.mapFilesGridView.RowsDefaultCellStyle = dataGridViewCellStyle30; + 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; @@ -4324,7 +4324,7 @@ this.radio3D.AutoSize = true; this.radio3D.Checked = true; this.radio3D.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.radio3D.Location = new System.Drawing.Point(-6804, -4010); + this.radio3D.Location = new System.Drawing.Point(-7797, -4611); this.radio3D.Name = "radio3D"; this.radio3D.Size = new System.Drawing.Size(31, 23); this.radio3D.TabIndex = 26; @@ -4339,7 +4339,7 @@ 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(-6804, -3986); + this.radio2D.Location = new System.Drawing.Point(-7797, -4587); this.radio2D.Name = "radio2D"; this.radio2D.Size = new System.Drawing.Size(31, 23); this.radio2D.TabIndex = 25; @@ -4354,7 +4354,7 @@ 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(1140, -3962); + this.wireframeCheckBox.Location = new System.Drawing.Point(1140, -4563); this.wireframeCheckBox.Name = "wireframeCheckBox"; this.wireframeCheckBox.Size = new System.Drawing.Size(31, 23); this.wireframeCheckBox.TabIndex = 27; @@ -7316,8 +7316,8 @@ this.textEditorDataGridView.Location = new System.Drawing.Point(12, 77); this.textEditorDataGridView.Name = "textEditorDataGridView"; this.textEditorDataGridView.RowHeadersWidth = 68; - dataGridViewCellStyle31.Font = new System.Drawing.Font("Consolas", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textEditorDataGridView.RowsDefaultCellStyle = dataGridViewCellStyle31; + 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(873, 500); this.textEditorDataGridView.TabIndex = 24; this.textEditorDataGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.textEditorDataGridView_CellValueChanged); @@ -7420,9 +7420,9 @@ this.cameraEditorDataGridView.CausesValidation = false; this.cameraEditorDataGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised; this.cameraEditorDataGridView.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle32.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.cameraEditorDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle32; + 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, diff --git a/DS_Map/Main Window.resx b/DS_Map/Main Window.resx index 45d1ad3..238eeca 100644 --- a/DS_Map/Main Window.resx +++ b/DS_Map/Main Window.resx @@ -117,96 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 239, 17 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM - EgAAAk1TRnQBSQFMAgEBCgEAASgBHAEoARwBEAEAARABAAT/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== - - @@ -1036,6 +946,96 @@ p3S+M+m1V1me9QgCUQNXX2YRT1sYHBiEP3wHVbp3PF3cB40GbrzN86xHENrScf1NDsl8FaI4jODMHOgS SOacfYAmbr5XeNYjGH7yDReXv+JeNIUhUYwFpmZjDz+nMLf5B3b2rcZ5tju4ntjtFw4T54j+v2g/t9NH 9AiCIPwGJelqUAd/T3AAAAAASUVORK5CYII= + + + + 239, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM + EgAAAk1TRnQBSQFMAgEBCgEAATABHAEwARwBEAEAARABAAT/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== @@ -1047,9 +1047,6 @@ 386, 19 - - 533, 20 - 67 From 00532dd8e6306523701282c6c69a772ffbcb18a1 Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Sat, 2 Mar 2024 10:33:30 +0100 Subject: [PATCH 14/40] Wild Editor fixes --- DS_Map/WildEditorDPPt.Designer.cs | 36 +- DS_Map/WildEditorDPPt.cs | 10 +- DS_Map/WildEditorDPPt.resx | 10 +- DS_Map/WildEditorHGSS.Designer.cs | 2715 +++++++++++++++-------------- DS_Map/WildEditorHGSS.cs | 8 +- 5 files changed, 1396 insertions(+), 1383 deletions(-) diff --git a/DS_Map/WildEditorDPPt.Designer.cs b/DS_Map/WildEditorDPPt.Designer.cs index 2c71af0..e43b179 100644 --- a/DS_Map/WildEditorDPPt.Designer.cs +++ b/DS_Map/WildEditorDPPt.Designer.cs @@ -1675,7 +1675,7 @@ this.label70.Name = "label70"; this.label70.Size = new System.Drawing.Size(21, 13); this.label70.TabIndex = 20; - this.label70.Text = "1%"; + this.label70.Text = "5%"; // // superRodOneComboBox // @@ -1708,11 +1708,11 @@ // this.label71.AutoSize = true; this.label71.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label71.Location = new System.Drawing.Point(18, 161); + this.label71.Location = new System.Drawing.Point(12, 161); this.label71.Name = "label71"; - this.label71.Size = new System.Drawing.Size(21, 13); + this.label71.Size = new System.Drawing.Size(27, 13); this.label71.TabIndex = 16; - this.label71.Text = "4%"; + this.label71.Text = "10%"; // // superRodFourComboBox // @@ -1786,7 +1786,7 @@ this.label73.Name = "label73"; this.label73.Size = new System.Drawing.Size(27, 13); this.label73.TabIndex = 8; - this.label73.Text = "40%"; + this.label73.Text = "30%"; // // superRodSecondFortyComboBox // @@ -1934,7 +1934,7 @@ this.label54.Name = "label54"; this.label54.Size = new System.Drawing.Size(21, 13); this.label54.TabIndex = 20; - this.label54.Text = "1%"; + this.label54.Text = "5%"; // // goodRodOneComboBox // @@ -1967,11 +1967,11 @@ // this.label55.AutoSize = true; this.label55.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label55.Location = new System.Drawing.Point(18, 161); + this.label55.Location = new System.Drawing.Point(12, 161); this.label55.Name = "label55"; - this.label55.Size = new System.Drawing.Size(21, 13); + this.label55.Size = new System.Drawing.Size(27, 13); this.label55.TabIndex = 16; - this.label55.Text = "4%"; + this.label55.Text = "10%"; // // goodRodFourComboBox // @@ -2045,7 +2045,7 @@ this.label57.Name = "label57"; this.label57.Size = new System.Drawing.Size(27, 13); this.label57.TabIndex = 8; - this.label57.Text = "40%"; + this.label57.Text = "30%"; // // goodRodSecondFortyComboBox // @@ -2193,7 +2193,7 @@ this.label46.Name = "label46"; this.label46.Size = new System.Drawing.Size(21, 13); this.label46.TabIndex = 20; - this.label46.Text = "1%"; + this.label46.Text = "5%"; // // oldRodOneComboBox // @@ -2226,11 +2226,11 @@ // this.label47.AutoSize = true; this.label47.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label47.Location = new System.Drawing.Point(18, 161); + this.label47.Location = new System.Drawing.Point(11, 161); this.label47.Name = "label47"; - this.label47.Size = new System.Drawing.Size(21, 13); + this.label47.Size = new System.Drawing.Size(27, 13); this.label47.TabIndex = 16; - this.label47.Text = "4%"; + this.label47.Text = "10%"; // // oldRodFourComboBox // @@ -2263,11 +2263,11 @@ // this.label48.AutoSize = true; this.label48.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label48.Location = new System.Drawing.Point(18, 134); + this.label48.Location = new System.Drawing.Point(11, 134); this.label48.Name = "label48"; - this.label48.Size = new System.Drawing.Size(21, 13); + this.label48.Size = new System.Drawing.Size(27, 13); this.label48.TabIndex = 12; - this.label48.Text = "5%"; + this.label48.Text = "15%"; // // oldRodFiveComboBox // @@ -2341,7 +2341,7 @@ this.label50.Name = "label50"; this.label50.Size = new System.Drawing.Size(27, 13); this.label50.TabIndex = 4; - this.label50.Text = "60%"; + this.label50.Text = "40%"; // // oldRodSixtyComboBox // diff --git a/DS_Map/WildEditorDPPt.cs b/DS_Map/WildEditorDPPt.cs index 7f42124..713904a 100644 --- a/DS_Map/WildEditorDPPt.cs +++ b/DS_Map/WildEditorDPPt.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.IO; +using System.Reflection; using System.Windows.Forms; using static DSPRE.RomInfo; @@ -10,11 +11,11 @@ namespace DSPRE { public string encounterFileFolder { get; private set; } EncounterFileDPPt currentFile; bool disableHandlers = false; - + public WildEditorDPPt(string dirPath, string[] names, int encToOpen, int totalNumHeaderFiles) { InitializeComponent(); encounterFileFolder = dirPath; - + Text = "DSPRE Reloaded " + GetDSPREVersion() + " - DPPt Encounters Editor"; disableHandlers = true; MapHeader tempMapHeader; @@ -236,6 +237,11 @@ namespace DSPRE { disableHandlers = false; } + public string GetDSPREVersion() { + return "" + Assembly.GetExecutingAssembly().GetName().Version.Major + "." + Assembly.GetExecutingAssembly().GetName().Version.Minor + + "." + Assembly.GetExecutingAssembly().GetName().Version.Build; + } + private void exportEncounterFileButton_Click(object sender, EventArgs e) { currentFile.SaveToFileExplorePath("Encounter File " + selectEncounterComboBox.SelectedIndex); } diff --git a/DS_Map/WildEditorDPPt.resx b/DS_Map/WildEditorDPPt.resx index 10a5d64..3879d32 100644 --- a/DS_Map/WildEditorDPPt.resx +++ b/DS_Map/WildEditorDPPt.resx @@ -121,7 +121,7 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAdCAYAAADLnm6HAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC41ZYUyZQAAAPBJREFUSEvtkkEK + vgAADr4B6kKxwAAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC41ZYUyZQAAAPBJREFUSEvtkkEK wjAURHOEHkFw1WWv5dalV/Eqnq0y+qeM32iaNgkUMvAIbfIzr2Lo6TlMzsMwE3vVLih9TNNCUxEtv4/j i6YiKGAxuZ3eVBfBpfrlnqoivny+XhZUAhQX+VeuqAQoIrK23ONFsGaLbC0nnAOUACpiVd9h+R4Bwnkl KYGNmASIlaxB7wBJAfxsJUV0FvBuq/wMN/lP5rOXALEyj57Xu7FaZTx6eKuInvF3WU06LM4V0fec56xd @@ -132,7 +132,7 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAXCAYAAAARIY8tAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC41ZYUyZQAAA95JREFUSEutlN1P + vQAADr0BR/uQrQAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC41ZYUyZQAAA95JREFUSEutlN1P U3cYx3+ZjBcdirhCi1Rooe2v7Tmnp7RnVkUSTRR8i9FoBibuhmxTb4wXxt0srXOsM6DUFwxJFSFGeVES fEGLL6QGozDdINuy7M7/wItlN7vZ43menv56KiSS6C/5htPn+3w/z++c8zuwxS4+xEZ0AcozxPYb5Y+z dGB/U2r5662PPweUNlaSxpphf/jCXbc8sUDrdC0pcncZ3Ylhv3/xQTas63+zDIvWYga8m897jPyybYQn @@ -166,7 +166,7 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAK - 7QAACu0BAohJwQAAACB0RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgTVi7kSokAAABOElE + 6wAACusBgosNWgAAACB0RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgTVi7kSokAAABOElE QVRIS7WToRLCMBBE+aRKPiOyks9AViKRfAYSWcknIJFIZF1gM7OZzeUKDVPEm1w2e7dNC5sY419xxTWp hK7rYh9CxMr6OAzvo9K3lGKDgawxmMNZ86yFXOhwRUPmPJ/IxadmnCHkOo7NIbn41qghLd+k2CwNaXld lYBGxZ7zmyx9Xa6o2CHYt4S4osUL8VAPqQQPbUZ97bfxOewS4+2eOJ0vbkixsXhPhj2HA+w53PPnQvGM @@ -178,7 +178,7 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAe - vwAAHr8BQ/1smgAAAAd0SU1FB9UDGhMWCY0H+k0AAAEJSURBVEhLtZKxEcIwDEUZhzIlJSOkpGQEyoyQ + vQAAHr0BPAOvEwAAAAd0SU1FB9UDGhMWCY0H+k0AAAEJSURBVEhLtZKxEcIwDEUZhzIlJSOkpGQEyoyQ ERgjJSVlRkjJCJTpzH3fSafYki3nQvGOb1nRi4BTCOGvqMUjUYtd14XHeA74pAzSPg9ZAQMp0+Bpvkbk nZfNwRpAkuV7b5ZsDqWHcbdHwsHz0B4JB+8DrRIOXoH80UHt38XBKwAtW3BoEQCvhMNeQe1r4mAJUC/d 1bbgoDWgtq5rmG8XdQAJSltwSAfgjMESSzIMU0S73zRSpvN7+cQ3w/Dn9DIFfT9GigJgSazhBEm0LbJG @@ -189,7 +189,7 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAK - 7QAACu0BAohJwQAAACB0RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgTVi7kSokAAABFElE + 6wAACusBgosNWgAAACB0RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgTVi7kSokAAABFElE QVRIS7WUvQ3CMBSEKSkZJSVlxmCElIxAyQgZgzJlSkagzBjpjC7SWc+PI/4RFJ+cd7bvU4LEIYTwV2RI uq4LxO+VIkOA0mUaNq79qVkiQ0DBPPabYLjdmyQyJChk+fxamiQytKBwfExRUvu5ZEhYhBWCcTjGT1Yq kSHwBZhRTgnWEokMv12kBG+AFeQkH0HuAvbtW+QkyZArJzWSZCgVgFJJcoHPpeAOfw+sEPme5DCfa7AS diff --git a/DS_Map/WildEditorHGSS.Designer.cs b/DS_Map/WildEditorHGSS.Designer.cs index 0b87ce4..903c5fd 100644 --- a/DS_Map/WildEditorHGSS.Designer.cs +++ b/DS_Map/WildEditorHGSS.Designer.cs @@ -51,24 +51,13 @@ this.rockSmashNinetyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); this.rockSmashNinetyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); this.rockSmashRateUpDown = new System.Windows.Forms.NumericUpDown(); - this.rockSmashNinetyComboBox = new DSPRE.InputComboBox(); this.label13 = new System.Windows.Forms.Label(); - this.rockSmashTenComboBox = new DSPRE.InputComboBox(); this.radioMusicComboBox = new System.Windows.Forms.GroupBox(); - this.sinnohSecondComboBox = new DSPRE.InputComboBox(); this.label10 = new System.Windows.Forms.Label(); - this.sinnohFirstComboBox = new DSPRE.InputComboBox(); - this.hoennSecondComboBox = new DSPRE.InputComboBox(); this.label9 = new System.Windows.Forms.Label(); - this.hoennFirstComboBox = new DSPRE.InputComboBox(); this.swarmsGroupBox = new System.Windows.Forms.GroupBox(); - this.superRodSwarmComboBox = new DSPRE.InputComboBox(); - this.goodRodSwarmComboBox = new DSPRE.InputComboBox(); this.label5 = new System.Windows.Forms.Label(); - this.surfSwarmComboBox = new DSPRE.InputComboBox(); this.label6 = new System.Windows.Forms.Label(); - this.grassSwarmComboBox = new DSPRE.InputComboBox(); - this.label7 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label(); this.walkingGroupBox = new System.Windows.Forms.GroupBox(); this.label4 = new System.Windows.Forms.Label(); @@ -77,6 +66,127 @@ this.label14 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); + this.oneSecondLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label79 = new System.Windows.Forms.Label(); + this.oneFirstLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label80 = new System.Windows.Forms.Label(); + this.fourSecondLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label81 = new System.Windows.Forms.Label(); + this.fourFirstLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label82 = new System.Windows.Forms.Label(); + this.fiveSecondLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label83 = new System.Windows.Forms.Label(); + this.fiveFirstLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label84 = new System.Windows.Forms.Label(); + this.tenFourthLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label85 = new System.Windows.Forms.Label(); + this.tenThirdLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label86 = new System.Windows.Forms.Label(); + this.tenSecondLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label87 = new System.Windows.Forms.Label(); + this.tenFirstLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label88 = new System.Windows.Forms.Label(); + this.twentySecondLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label89 = new System.Windows.Forms.Label(); + this.twentyFirstLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label90 = new System.Windows.Forms.Label(); + this.waterTabPage = new System.Windows.Forms.TabPage(); + this.surfPicture = new System.Windows.Forms.PictureBox(); + this.pictureBox7 = new System.Windows.Forms.PictureBox(); + this.pictureBox6 = new System.Windows.Forms.PictureBox(); + this.pictureBox5 = new System.Windows.Forms.PictureBox(); + this.superRodGroupBox = new System.Windows.Forms.GroupBox(); + this.label59 = new System.Windows.Forms.Label(); + this.label60 = new System.Windows.Forms.Label(); + this.superRodRateUpDown = new System.Windows.Forms.NumericUpDown(); + this.label69 = new System.Windows.Forms.Label(); + this.superRodOneMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.superRodOneMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label70 = new System.Windows.Forms.Label(); + this.superRodFourMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.superRodFourMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label71 = new System.Windows.Forms.Label(); + this.superRodFifteenMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.superRodFifteenMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label72 = new System.Windows.Forms.Label(); + this.superRodSecondFortyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.superRodSecondFortyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label73 = new System.Windows.Forms.Label(); + this.superRodFirstFortyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.superRodFirstFortyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label74 = new System.Windows.Forms.Label(); + this.goodRodGroupBox = new System.Windows.Forms.GroupBox(); + this.label51 = new System.Windows.Forms.Label(); + this.label52 = new System.Windows.Forms.Label(); + this.goodRodRateUpDown = new System.Windows.Forms.NumericUpDown(); + this.label53 = new System.Windows.Forms.Label(); + this.goodRodOneMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.goodRodOneMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label54 = new System.Windows.Forms.Label(); + this.goodRodFourMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.goodRodFourMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label55 = new System.Windows.Forms.Label(); + this.goodRodFifteenMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.goodRodFifteenMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label56 = new System.Windows.Forms.Label(); + this.goodRodSecondFortyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.goodRodSecondFortyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label57 = new System.Windows.Forms.Label(); + this.goodRodFirstFortyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.goodRodFirstFortyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label58 = new System.Windows.Forms.Label(); + this.oldRodGroupBox = new System.Windows.Forms.GroupBox(); + this.label43 = new System.Windows.Forms.Label(); + this.label44 = new System.Windows.Forms.Label(); + this.oldRodRateUpDown = new System.Windows.Forms.NumericUpDown(); + this.label45 = new System.Windows.Forms.Label(); + this.oldRodOneMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.oldRodOneMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label46 = new System.Windows.Forms.Label(); + this.oldRodFourMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.oldRodFourMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label47 = new System.Windows.Forms.Label(); + this.oldRodFiveMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.oldRodFiveMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label48 = new System.Windows.Forms.Label(); + this.oldRodThirtyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.oldRodThirtyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label49 = new System.Windows.Forms.Label(); + this.oldRodSixtyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.oldRodSixtyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label50 = new System.Windows.Forms.Label(); + this.surfGroupBox = new System.Windows.Forms.GroupBox(); + this.label68 = new System.Windows.Forms.Label(); + this.label67 = new System.Windows.Forms.Label(); + this.surfRateUpDown = new System.Windows.Forms.NumericUpDown(); + this.label61 = new System.Windows.Forms.Label(); + this.surfOneMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.surfOneMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label62 = new System.Windows.Forms.Label(); + this.surfFourMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.surfFourMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label63 = new System.Windows.Forms.Label(); + this.surfFiveMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.surfFiveMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label64 = new System.Windows.Forms.Label(); + this.surfThirtyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.surfThirtyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label65 = new System.Windows.Forms.Label(); + this.surfSixtyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.surfSixtyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); + this.label66 = new System.Windows.Forms.Label(); + this.repairAllButton = new System.Windows.Forms.Button(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.goodRodSwarmComboBox = new DSPRE.InputComboBox(); + this.rockSmashNinetyComboBox = new DSPRE.InputComboBox(); + this.rockSmashTenComboBox = new DSPRE.InputComboBox(); + this.sinnohSecondComboBox = new DSPRE.InputComboBox(); + this.sinnohFirstComboBox = new DSPRE.InputComboBox(); + this.hoennSecondComboBox = new DSPRE.InputComboBox(); + this.hoennFirstComboBox = new DSPRE.InputComboBox(); + this.superRodSwarmComboBox = new DSPRE.InputComboBox(); + this.surfSwarmComboBox = new DSPRE.InputComboBox(); + this.grassSwarmComboBox = new DSPRE.InputComboBox(); this.nightOneSecondComboBox = new DSPRE.InputComboBox(); this.nightOneFirstComboBox = new DSPRE.InputComboBox(); this.nightFourSecondComboBox = new DSPRE.InputComboBox(); @@ -101,148 +211,38 @@ this.dayTenFirstComboBox = new DSPRE.InputComboBox(); this.dayTwentySecondComboBox = new DSPRE.InputComboBox(); this.dayTwentyFirstComboBox = new DSPRE.InputComboBox(); - this.oneSecondLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label79 = new System.Windows.Forms.Label(); this.morningOneSecondComboBox = new DSPRE.InputComboBox(); - this.oneFirstLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label80 = new System.Windows.Forms.Label(); this.morningOneFirstComboBox = new DSPRE.InputComboBox(); - this.fourSecondLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label81 = new System.Windows.Forms.Label(); this.morningFourSecondComboBox = new DSPRE.InputComboBox(); - this.fourFirstLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label82 = new System.Windows.Forms.Label(); this.morningFourFirstComboBox = new DSPRE.InputComboBox(); - this.fiveSecondLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label83 = new System.Windows.Forms.Label(); this.morningFiveSecondComboBox = new DSPRE.InputComboBox(); - this.fiveFirstLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label84 = new System.Windows.Forms.Label(); this.morningFiveFirstComboBox = new DSPRE.InputComboBox(); - this.tenFourthLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label85 = new System.Windows.Forms.Label(); this.morningTenFourthComboBox = new DSPRE.InputComboBox(); - this.tenThirdLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label86 = new System.Windows.Forms.Label(); this.morningTenThirdComboBox = new DSPRE.InputComboBox(); - this.tenSecondLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label87 = new System.Windows.Forms.Label(); this.morningTenSecondComboBox = new DSPRE.InputComboBox(); - this.tenFirstLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label88 = new System.Windows.Forms.Label(); this.morningTenFirstComboBox = new DSPRE.InputComboBox(); - this.twentySecondLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label89 = new System.Windows.Forms.Label(); this.morningTwentySecondComboBox = new DSPRE.InputComboBox(); - this.twentyFirstLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label90 = new System.Windows.Forms.Label(); this.morningTwentyFirstComboBox = new DSPRE.InputComboBox(); - this.waterTabPage = new System.Windows.Forms.TabPage(); - this.surfPicture = new System.Windows.Forms.PictureBox(); - this.pictureBox7 = new System.Windows.Forms.PictureBox(); - this.pictureBox6 = new System.Windows.Forms.PictureBox(); - this.pictureBox5 = new System.Windows.Forms.PictureBox(); - this.superRodGroupBox = new System.Windows.Forms.GroupBox(); - this.label59 = new System.Windows.Forms.Label(); - this.label60 = new System.Windows.Forms.Label(); - this.superRodRateUpDown = new System.Windows.Forms.NumericUpDown(); - this.label69 = new System.Windows.Forms.Label(); - this.superRodOneMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.superRodOneMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label70 = new System.Windows.Forms.Label(); this.superRodOneComboBox = new DSPRE.InputComboBox(); - this.superRodFourMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.superRodFourMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label71 = new System.Windows.Forms.Label(); this.superRodFourComboBox = new DSPRE.InputComboBox(); - this.superRodFifteenMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.superRodFifteenMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label72 = new System.Windows.Forms.Label(); this.superRodFifteenComboBox = new DSPRE.InputComboBox(); - this.superRodSecondFortyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.superRodSecondFortyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label73 = new System.Windows.Forms.Label(); this.superRodSecondFortyComboBox = new DSPRE.InputComboBox(); - this.superRodFirstFortyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.superRodFirstFortyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label74 = new System.Windows.Forms.Label(); this.superRodFirstFortyComboBox = new DSPRE.InputComboBox(); - this.goodRodGroupBox = new System.Windows.Forms.GroupBox(); - this.label51 = new System.Windows.Forms.Label(); - this.label52 = new System.Windows.Forms.Label(); - this.goodRodRateUpDown = new System.Windows.Forms.NumericUpDown(); - this.label53 = new System.Windows.Forms.Label(); - this.goodRodOneMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.goodRodOneMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label54 = new System.Windows.Forms.Label(); this.goodRodOneComboBox = new DSPRE.InputComboBox(); - this.goodRodFourMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.goodRodFourMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label55 = new System.Windows.Forms.Label(); this.goodRodFourComboBox = new DSPRE.InputComboBox(); - this.goodRodFifteenMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.goodRodFifteenMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label56 = new System.Windows.Forms.Label(); this.goodRodFifteenComboBox = new DSPRE.InputComboBox(); - this.goodRodSecondFortyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.goodRodSecondFortyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label57 = new System.Windows.Forms.Label(); this.goodRodSecondFortyComboBox = new DSPRE.InputComboBox(); - this.goodRodFirstFortyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.goodRodFirstFortyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label58 = new System.Windows.Forms.Label(); this.goodRodFirstFortyComboBox = new DSPRE.InputComboBox(); - this.oldRodGroupBox = new System.Windows.Forms.GroupBox(); - this.label43 = new System.Windows.Forms.Label(); - this.label44 = new System.Windows.Forms.Label(); - this.oldRodRateUpDown = new System.Windows.Forms.NumericUpDown(); - this.label45 = new System.Windows.Forms.Label(); - this.oldRodOneMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.oldRodOneMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label46 = new System.Windows.Forms.Label(); this.oldRodOneComboBox = new DSPRE.InputComboBox(); - this.oldRodFourMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.oldRodFourMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label47 = new System.Windows.Forms.Label(); this.oldRodFourComboBox = new DSPRE.InputComboBox(); - this.oldRodFiveMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.oldRodFiveMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label48 = new System.Windows.Forms.Label(); this.oldRodFiveComboBox = new DSPRE.InputComboBox(); - this.oldRodThirtyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.oldRodThirtyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label49 = new System.Windows.Forms.Label(); this.oldRodThirtyComboBox = new DSPRE.InputComboBox(); - this.oldRodSixtyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.oldRodSixtyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label50 = new System.Windows.Forms.Label(); this.oldRodSixtyComboBox = new DSPRE.InputComboBox(); - this.surfGroupBox = new System.Windows.Forms.GroupBox(); - this.label68 = new System.Windows.Forms.Label(); - this.label67 = new System.Windows.Forms.Label(); - this.surfRateUpDown = new System.Windows.Forms.NumericUpDown(); - this.label61 = new System.Windows.Forms.Label(); - this.surfOneMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.surfOneMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label62 = new System.Windows.Forms.Label(); this.surfOneComboBox = new DSPRE.InputComboBox(); - this.surfFourMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.surfFourMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label63 = new System.Windows.Forms.Label(); this.surfFourComboBox = new DSPRE.InputComboBox(); - this.surfFiveMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.surfFiveMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label64 = new System.Windows.Forms.Label(); this.surfFiveComboBox = new DSPRE.InputComboBox(); - this.surfThirtyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.surfThirtyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label65 = new System.Windows.Forms.Label(); this.surfThirtyComboBox = new DSPRE.InputComboBox(); - this.surfSixtyMaxLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.surfSixtyMinLevelUpDown = new System.Windows.Forms.NumericUpDown(); - this.label66 = new System.Windows.Forms.Label(); this.surfSixtyComboBox = new DSPRE.InputComboBox(); - this.repairAllButton = new System.Windows.Forms.Button(); this.mainTabControl.SuspendLayout(); this.grassGroundTabPage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); @@ -323,6 +323,7 @@ ((System.ComponentModel.ISupportInitialize)(this.surfThirtyMinLevelUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.surfSixtyMaxLevelUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.surfSixtyMinLevelUpDown)).BeginInit(); + this.groupBox1.SuspendLayout(); this.SuspendLayout(); // // removeEncounterFileButton @@ -416,11 +417,12 @@ this.mainTabControl.Location = new System.Drawing.Point(9, 53); this.mainTabControl.Name = "mainTabControl"; this.mainTabControl.SelectedIndex = 0; - this.mainTabControl.Size = new System.Drawing.Size(742, 490); + this.mainTabControl.Size = new System.Drawing.Size(803, 534); this.mainTabControl.TabIndex = 68; // // grassGroundTabPage // + this.grassGroundTabPage.Controls.Add(this.groupBox1); this.grassGroundTabPage.Controls.Add(this.pictureBox3); this.grassGroundTabPage.Controls.Add(this.pictureBox1); this.grassGroundTabPage.Controls.Add(this.pictureBox2); @@ -431,7 +433,7 @@ this.grassGroundTabPage.Location = new System.Drawing.Point(4, 22); this.grassGroundTabPage.Name = "grassGroundTabPage"; this.grassGroundTabPage.Padding = new System.Windows.Forms.Padding(3); - this.grassGroundTabPage.Size = new System.Drawing.Size(734, 464); + this.grassGroundTabPage.Size = new System.Drawing.Size(795, 508); this.grassGroundTabPage.TabIndex = 0; this.grassGroundTabPage.Text = "Grass/Ground"; this.grassGroundTabPage.UseVisualStyleBackColor = true; @@ -439,7 +441,7 @@ // pictureBox3 // this.pictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox3.Image"))); - this.pictureBox3.Location = new System.Drawing.Point(615, 4); + this.pictureBox3.Location = new System.Drawing.Point(677, 9); this.pictureBox3.Name = "pictureBox3"; this.pictureBox3.Size = new System.Drawing.Size(16, 21); this.pictureBox3.TabIndex = 233; @@ -448,7 +450,7 @@ // pictureBox1 // this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(566, 210); + this.pictureBox1.Location = new System.Drawing.Point(628, 225); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(16, 21); this.pictureBox1.TabIndex = 232; @@ -477,9 +479,9 @@ this.rockSmashGroupBox.Controls.Add(this.rockSmashNinetyComboBox); this.rockSmashGroupBox.Controls.Add(this.label13); this.rockSmashGroupBox.Controls.Add(this.rockSmashTenComboBox); - this.rockSmashGroupBox.Location = new System.Drawing.Point(492, 212); + this.rockSmashGroupBox.Location = new System.Drawing.Point(554, 227); this.rockSmashGroupBox.Name = "rockSmashGroupBox"; - this.rockSmashGroupBox.Size = new System.Drawing.Size(232, 189); + this.rockSmashGroupBox.Size = new System.Drawing.Size(232, 212); this.rockSmashGroupBox.TabIndex = 165; this.rockSmashGroupBox.TabStop = false; this.rockSmashGroupBox.Text = "Rock Smash"; @@ -567,17 +569,6 @@ this.rockSmashRateUpDown.TabIndex = 69; this.rockSmashRateUpDown.ValueChanged += new System.EventHandler(this.rockSmashRateUpDown_ValueChanged); // - // rockSmashNinetyComboBox - // - this.rockSmashNinetyComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.rockSmashNinetyComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.rockSmashNinetyComboBox.FormattingEnabled = true; - this.rockSmashNinetyComboBox.Location = new System.Drawing.Point(7, 79); - this.rockSmashNinetyComboBox.Name = "rockSmashNinetyComboBox"; - this.rockSmashNinetyComboBox.Size = new System.Drawing.Size(121, 21); - this.rockSmashNinetyComboBox.TabIndex = 39; - this.rockSmashNinetyComboBox.SelectedIndexChanged += new System.EventHandler(this.rockSmashNinetyComboBox_SelectedIndexChanged); - // // label13 // this.label13.AutoSize = true; @@ -588,17 +579,6 @@ this.label13.TabIndex = 68; this.label13.Text = "Encounter Rate"; // - // rockSmashTenComboBox - // - this.rockSmashTenComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.rockSmashTenComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.rockSmashTenComboBox.FormattingEnabled = true; - this.rockSmashTenComboBox.Location = new System.Drawing.Point(7, 128); - this.rockSmashTenComboBox.Name = "rockSmashTenComboBox"; - this.rockSmashTenComboBox.Size = new System.Drawing.Size(121, 21); - this.rockSmashTenComboBox.TabIndex = 42; - this.rockSmashTenComboBox.SelectedIndexChanged += new System.EventHandler(this.rockSmashTenComboBox_SelectedIndexChanged); - // // radioMusicComboBox // this.radioMusicComboBox.Controls.Add(this.sinnohSecondComboBox); @@ -607,24 +587,13 @@ this.radioMusicComboBox.Controls.Add(this.hoennSecondComboBox); this.radioMusicComboBox.Controls.Add(this.label9); this.radioMusicComboBox.Controls.Add(this.hoennFirstComboBox); - this.radioMusicComboBox.Location = new System.Drawing.Point(492, 7); + this.radioMusicComboBox.Location = new System.Drawing.Point(554, 12); this.radioMusicComboBox.Name = "radioMusicComboBox"; - this.radioMusicComboBox.Size = new System.Drawing.Size(232, 191); + this.radioMusicComboBox.Size = new System.Drawing.Size(232, 209); this.radioMusicComboBox.TabIndex = 164; this.radioMusicComboBox.TabStop = false; this.radioMusicComboBox.Text = "Radio Sound Pokémon"; // - // sinnohSecondComboBox - // - this.sinnohSecondComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.sinnohSecondComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.sinnohSecondComboBox.FormattingEnabled = true; - this.sinnohSecondComboBox.Location = new System.Drawing.Point(42, 151); - this.sinnohSecondComboBox.Name = "sinnohSecondComboBox"; - this.sinnohSecondComboBox.Size = new System.Drawing.Size(150, 21); - this.sinnohSecondComboBox.TabIndex = 231; - this.sinnohSecondComboBox.SelectedIndexChanged += new System.EventHandler(this.sinnohSecondComboBox_SelectedIndexChanged); - // // label10 // this.label10.AutoSize = true; @@ -634,28 +603,6 @@ this.label10.TabIndex = 230; this.label10.Text = "Sinnoh Music"; // - // sinnohFirstComboBox - // - this.sinnohFirstComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.sinnohFirstComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.sinnohFirstComboBox.FormattingEnabled = true; - this.sinnohFirstComboBox.Location = new System.Drawing.Point(42, 124); - this.sinnohFirstComboBox.Name = "sinnohFirstComboBox"; - this.sinnohFirstComboBox.Size = new System.Drawing.Size(150, 21); - this.sinnohFirstComboBox.TabIndex = 229; - this.sinnohFirstComboBox.SelectedIndexChanged += new System.EventHandler(this.sinnohFirstComboBox_SelectedIndexChanged); - // - // hoennSecondComboBox - // - this.hoennSecondComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.hoennSecondComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.hoennSecondComboBox.FormattingEnabled = true; - this.hoennSecondComboBox.Location = new System.Drawing.Point(42, 72); - this.hoennSecondComboBox.Name = "hoennSecondComboBox"; - this.hoennSecondComboBox.Size = new System.Drawing.Size(150, 21); - this.hoennSecondComboBox.TabIndex = 228; - this.hoennSecondComboBox.SelectedIndexChanged += new System.EventHandler(this.hoennSecondComboBox_SelectedIndexChanged); - // // label9 // this.label9.AutoSize = true; @@ -665,77 +612,31 @@ this.label9.TabIndex = 227; this.label9.Text = "Hoenn Music"; // - // hoennFirstComboBox - // - this.hoennFirstComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.hoennFirstComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.hoennFirstComboBox.FormattingEnabled = true; - this.hoennFirstComboBox.Location = new System.Drawing.Point(42, 45); - this.hoennFirstComboBox.Name = "hoennFirstComboBox"; - this.hoennFirstComboBox.Size = new System.Drawing.Size(150, 21); - this.hoennFirstComboBox.TabIndex = 226; - this.hoennFirstComboBox.SelectedIndexChanged += new System.EventHandler(this.hoennFirstComboBox_SelectedIndexChanged); - // // swarmsGroupBox // this.swarmsGroupBox.Controls.Add(this.superRodSwarmComboBox); - this.swarmsGroupBox.Controls.Add(this.goodRodSwarmComboBox); this.swarmsGroupBox.Controls.Add(this.label5); this.swarmsGroupBox.Controls.Add(this.surfSwarmComboBox); this.swarmsGroupBox.Controls.Add(this.label6); this.swarmsGroupBox.Controls.Add(this.grassSwarmComboBox); - this.swarmsGroupBox.Controls.Add(this.label7); this.swarmsGroupBox.Controls.Add(this.label8); - this.swarmsGroupBox.Location = new System.Drawing.Point(12, 404); + this.swarmsGroupBox.Location = new System.Drawing.Point(12, 445); this.swarmsGroupBox.Name = "swarmsGroupBox"; - this.swarmsGroupBox.Size = new System.Drawing.Size(712, 51); + this.swarmsGroupBox.Size = new System.Drawing.Size(536, 51); this.swarmsGroupBox.TabIndex = 163; this.swarmsGroupBox.TabStop = false; this.swarmsGroupBox.Text = "Swarm"; // - // superRodSwarmComboBox - // - this.superRodSwarmComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.superRodSwarmComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.superRodSwarmComboBox.FormattingEnabled = true; - this.superRodSwarmComboBox.Location = new System.Drawing.Point(575, 19); - this.superRodSwarmComboBox.Name = "superRodSwarmComboBox"; - this.superRodSwarmComboBox.Size = new System.Drawing.Size(121, 21); - this.superRodSwarmComboBox.TabIndex = 50; - this.superRodSwarmComboBox.SelectedIndexChanged += new System.EventHandler(this.superRodSwarmComboBox_SelectedIndexChanged); - // - // goodRodSwarmComboBox - // - this.goodRodSwarmComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.goodRodSwarmComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.goodRodSwarmComboBox.FormattingEnabled = true; - this.goodRodSwarmComboBox.Location = new System.Drawing.Point(395, 19); - this.goodRodSwarmComboBox.Name = "goodRodSwarmComboBox"; - this.goodRodSwarmComboBox.Size = new System.Drawing.Size(121, 21); - this.goodRodSwarmComboBox.TabIndex = 48; - this.goodRodSwarmComboBox.SelectedIndexChanged += new System.EventHandler(this.goodRodSwarmComboBox_SelectedIndexChanged); - // // label5 // this.label5.AutoSize = true; this.label5.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label5.Location = new System.Drawing.Point(181, 22); + this.label5.Location = new System.Drawing.Point(175, 22); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(26, 13); this.label5.TabIndex = 47; this.label5.Text = "Surf"; // - // surfSwarmComboBox - // - this.surfSwarmComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.surfSwarmComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.surfSwarmComboBox.FormattingEnabled = true; - this.surfSwarmComboBox.Location = new System.Drawing.Point(213, 19); - this.surfSwarmComboBox.Name = "surfSwarmComboBox"; - this.surfSwarmComboBox.Size = new System.Drawing.Size(121, 21); - this.surfSwarmComboBox.TabIndex = 46; - this.surfSwarmComboBox.SelectedIndexChanged += new System.EventHandler(this.surfSwarmComboBox_SelectedIndexChanged); - // // label6 // this.label6.AutoSize = true; @@ -746,36 +647,15 @@ this.label6.TabIndex = 45; this.label6.Text = "Grass"; // - // grassSwarmComboBox - // - this.grassSwarmComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.grassSwarmComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.grassSwarmComboBox.FormattingEnabled = true; - this.grassSwarmComboBox.Location = new System.Drawing.Point(48, 19); - this.grassSwarmComboBox.Name = "grassSwarmComboBox"; - this.grassSwarmComboBox.Size = new System.Drawing.Size(121, 21); - this.grassSwarmComboBox.TabIndex = 44; - this.grassSwarmComboBox.SelectedIndexChanged += new System.EventHandler(this.grassSwarmComboBox_SelectedIndexChanged); - // - // label7 - // - this.label7.AutoSize = true; - this.label7.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label7.Location = new System.Drawing.Point(348, 22); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(41, 13); - this.label7.TabIndex = 49; - this.label7.Text = "G. Rod"; - // // label8 // this.label8.AutoSize = true; this.label8.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label8.Location = new System.Drawing.Point(529, 22); + this.label8.Location = new System.Drawing.Point(334, 22); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(40, 13); + this.label8.Size = new System.Drawing.Size(48, 13); this.label8.TabIndex = 51; - this.label8.Text = "S. Rod"; + this.label8.Text = "Any Rod"; // // walkingGroupBox // @@ -847,7 +727,7 @@ this.walkingGroupBox.Controls.Add(this.morningTwentyFirstComboBox); this.walkingGroupBox.Location = new System.Drawing.Point(12, 7); this.walkingGroupBox.Name = "walkingGroupBox"; - this.walkingGroupBox.Size = new System.Drawing.Size(474, 394); + this.walkingGroupBox.Size = new System.Drawing.Size(536, 432); this.walkingGroupBox.TabIndex = 162; this.walkingGroupBox.TabStop = false; this.walkingGroupBox.Text = "Walking"; @@ -905,6 +785,1223 @@ this.label1.TabIndex = 222; this.label1.Text = "Morning"; // + // oneSecondLevelUpDown + // + this.oneSecondLevelUpDown.Location = new System.Drawing.Point(418, 365); + this.oneSecondLevelUpDown.Name = "oneSecondLevelUpDown"; + this.oneSecondLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.oneSecondLevelUpDown.TabIndex = 197; + this.oneSecondLevelUpDown.ValueChanged += new System.EventHandler(this.oneSecondLevelUpDown_ValueChanged); + // + // label79 + // + this.label79.AutoSize = true; + this.label79.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label79.Location = new System.Drawing.Point(10, 367); + this.label79.Name = "label79"; + this.label79.Size = new System.Drawing.Size(21, 13); + this.label79.TabIndex = 196; + this.label79.Text = "1%"; + // + // oneFirstLevelUpDown + // + this.oneFirstLevelUpDown.Location = new System.Drawing.Point(418, 338); + this.oneFirstLevelUpDown.Name = "oneFirstLevelUpDown"; + this.oneFirstLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.oneFirstLevelUpDown.TabIndex = 194; + this.oneFirstLevelUpDown.ValueChanged += new System.EventHandler(this.oneFirstLevelUpDown_ValueChanged); + // + // label80 + // + this.label80.AutoSize = true; + this.label80.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label80.Location = new System.Drawing.Point(10, 340); + this.label80.Name = "label80"; + this.label80.Size = new System.Drawing.Size(21, 13); + this.label80.TabIndex = 193; + this.label80.Text = "1%"; + // + // fourSecondLevelUpDown + // + this.fourSecondLevelUpDown.Location = new System.Drawing.Point(418, 311); + this.fourSecondLevelUpDown.Name = "fourSecondLevelUpDown"; + this.fourSecondLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.fourSecondLevelUpDown.TabIndex = 191; + this.fourSecondLevelUpDown.ValueChanged += new System.EventHandler(this.fourSecondLevelUpDown_ValueChanged); + // + // label81 + // + this.label81.AutoSize = true; + this.label81.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label81.Location = new System.Drawing.Point(10, 313); + this.label81.Name = "label81"; + this.label81.Size = new System.Drawing.Size(21, 13); + this.label81.TabIndex = 190; + this.label81.Text = "4%"; + // + // fourFirstLevelUpDown + // + this.fourFirstLevelUpDown.Location = new System.Drawing.Point(418, 284); + this.fourFirstLevelUpDown.Name = "fourFirstLevelUpDown"; + this.fourFirstLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.fourFirstLevelUpDown.TabIndex = 188; + this.fourFirstLevelUpDown.ValueChanged += new System.EventHandler(this.fourFirstLevelUpDown_ValueChanged); + // + // label82 + // + this.label82.AutoSize = true; + this.label82.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label82.Location = new System.Drawing.Point(10, 286); + this.label82.Name = "label82"; + this.label82.Size = new System.Drawing.Size(21, 13); + this.label82.TabIndex = 187; + this.label82.Text = "4%"; + // + // fiveSecondLevelUpDown + // + this.fiveSecondLevelUpDown.Location = new System.Drawing.Point(418, 257); + this.fiveSecondLevelUpDown.Name = "fiveSecondLevelUpDown"; + this.fiveSecondLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.fiveSecondLevelUpDown.TabIndex = 185; + this.fiveSecondLevelUpDown.ValueChanged += new System.EventHandler(this.fiveSecondLevelUpDown_ValueChanged); + // + // label83 + // + this.label83.AutoSize = true; + this.label83.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label83.Location = new System.Drawing.Point(10, 259); + this.label83.Name = "label83"; + this.label83.Size = new System.Drawing.Size(21, 13); + this.label83.TabIndex = 184; + this.label83.Text = "5%"; + // + // fiveFirstLevelUpDown + // + this.fiveFirstLevelUpDown.Location = new System.Drawing.Point(418, 230); + this.fiveFirstLevelUpDown.Name = "fiveFirstLevelUpDown"; + this.fiveFirstLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.fiveFirstLevelUpDown.TabIndex = 182; + this.fiveFirstLevelUpDown.ValueChanged += new System.EventHandler(this.fiveFirstLevelUpDown_ValueChanged); + // + // label84 + // + this.label84.AutoSize = true; + this.label84.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label84.Location = new System.Drawing.Point(10, 232); + this.label84.Name = "label84"; + this.label84.Size = new System.Drawing.Size(21, 13); + this.label84.TabIndex = 181; + this.label84.Text = "5%"; + // + // tenFourthLevelUpDown + // + this.tenFourthLevelUpDown.Location = new System.Drawing.Point(418, 203); + this.tenFourthLevelUpDown.Name = "tenFourthLevelUpDown"; + this.tenFourthLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.tenFourthLevelUpDown.TabIndex = 179; + this.tenFourthLevelUpDown.ValueChanged += new System.EventHandler(this.tenFourthLevelUpDown_ValueChanged); + // + // label85 + // + this.label85.AutoSize = true; + this.label85.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label85.Location = new System.Drawing.Point(4, 205); + this.label85.Name = "label85"; + this.label85.Size = new System.Drawing.Size(27, 13); + this.label85.TabIndex = 178; + this.label85.Text = "10%"; + // + // tenThirdLevelUpDown + // + this.tenThirdLevelUpDown.Location = new System.Drawing.Point(418, 176); + this.tenThirdLevelUpDown.Name = "tenThirdLevelUpDown"; + this.tenThirdLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.tenThirdLevelUpDown.TabIndex = 176; + this.tenThirdLevelUpDown.ValueChanged += new System.EventHandler(this.tenThirdLevelUpDown_ValueChanged); + // + // label86 + // + this.label86.AutoSize = true; + this.label86.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label86.Location = new System.Drawing.Point(4, 178); + this.label86.Name = "label86"; + this.label86.Size = new System.Drawing.Size(27, 13); + this.label86.TabIndex = 175; + this.label86.Text = "10%"; + // + // tenSecondLevelUpDown + // + this.tenSecondLevelUpDown.Location = new System.Drawing.Point(418, 149); + this.tenSecondLevelUpDown.Name = "tenSecondLevelUpDown"; + this.tenSecondLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.tenSecondLevelUpDown.TabIndex = 173; + this.tenSecondLevelUpDown.ValueChanged += new System.EventHandler(this.tenSecondLevelUpDown_ValueChanged); + // + // label87 + // + this.label87.AutoSize = true; + this.label87.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label87.Location = new System.Drawing.Point(4, 151); + this.label87.Name = "label87"; + this.label87.Size = new System.Drawing.Size(27, 13); + this.label87.TabIndex = 172; + this.label87.Text = "10%"; + // + // tenFirstLevelUpDown + // + this.tenFirstLevelUpDown.Location = new System.Drawing.Point(418, 122); + this.tenFirstLevelUpDown.Name = "tenFirstLevelUpDown"; + this.tenFirstLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.tenFirstLevelUpDown.TabIndex = 170; + this.tenFirstLevelUpDown.ValueChanged += new System.EventHandler(this.tenFirstLevelUpDown_ValueChanged); + // + // label88 + // + this.label88.AutoSize = true; + this.label88.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label88.Location = new System.Drawing.Point(4, 124); + this.label88.Name = "label88"; + this.label88.Size = new System.Drawing.Size(27, 13); + this.label88.TabIndex = 169; + this.label88.Text = "10%"; + // + // twentySecondLevelUpDown + // + this.twentySecondLevelUpDown.Location = new System.Drawing.Point(418, 95); + this.twentySecondLevelUpDown.Name = "twentySecondLevelUpDown"; + this.twentySecondLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.twentySecondLevelUpDown.TabIndex = 167; + this.twentySecondLevelUpDown.ValueChanged += new System.EventHandler(this.twentySecondLevelUpDown_ValueChanged); + // + // label89 + // + this.label89.AutoSize = true; + this.label89.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label89.Location = new System.Drawing.Point(4, 97); + this.label89.Name = "label89"; + this.label89.Size = new System.Drawing.Size(27, 13); + this.label89.TabIndex = 166; + this.label89.Text = "20%"; + // + // twentyFirstLevelUpDown + // + this.twentyFirstLevelUpDown.Location = new System.Drawing.Point(418, 68); + this.twentyFirstLevelUpDown.Name = "twentyFirstLevelUpDown"; + this.twentyFirstLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.twentyFirstLevelUpDown.TabIndex = 164; + this.twentyFirstLevelUpDown.ValueChanged += new System.EventHandler(this.twentyFirstLevelUpDown_ValueChanged); + // + // label90 + // + this.label90.AutoSize = true; + this.label90.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label90.Location = new System.Drawing.Point(4, 70); + this.label90.Name = "label90"; + this.label90.Size = new System.Drawing.Size(27, 13); + this.label90.TabIndex = 163; + this.label90.Text = "20%"; + // + // waterTabPage + // + this.waterTabPage.Controls.Add(this.surfPicture); + this.waterTabPage.Controls.Add(this.pictureBox7); + this.waterTabPage.Controls.Add(this.pictureBox6); + this.waterTabPage.Controls.Add(this.pictureBox5); + this.waterTabPage.Controls.Add(this.superRodGroupBox); + this.waterTabPage.Controls.Add(this.goodRodGroupBox); + this.waterTabPage.Controls.Add(this.oldRodGroupBox); + this.waterTabPage.Controls.Add(this.surfGroupBox); + this.waterTabPage.Location = new System.Drawing.Point(4, 22); + this.waterTabPage.Name = "waterTabPage"; + this.waterTabPage.Padding = new System.Windows.Forms.Padding(3); + this.waterTabPage.Size = new System.Drawing.Size(795, 508); + this.waterTabPage.TabIndex = 1; + this.waterTabPage.Text = "Water"; + this.waterTabPage.UseVisualStyleBackColor = true; + // + // surfPicture + // + this.surfPicture.Image = global::DSPRE.Properties.Resources.SurfIcon; + this.surfPicture.Location = new System.Drawing.Point(67, -1); + this.surfPicture.Name = "surfPicture"; + this.surfPicture.Size = new System.Drawing.Size(42, 42); + this.surfPicture.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.surfPicture.TabIndex = 200; + this.surfPicture.TabStop = false; + // + // pictureBox7 + // + this.pictureBox7.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox7.Image"))); + this.pictureBox7.Location = new System.Drawing.Point(452, 232); + this.pictureBox7.Name = "pictureBox7"; + this.pictureBox7.Size = new System.Drawing.Size(25, 26); + this.pictureBox7.TabIndex = 196; + this.pictureBox7.TabStop = false; + // + // pictureBox6 + // + this.pictureBox6.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox6.Image"))); + this.pictureBox6.Location = new System.Drawing.Point(79, 230); + this.pictureBox6.Name = "pictureBox6"; + this.pictureBox6.Size = new System.Drawing.Size(25, 26); + this.pictureBox6.TabIndex = 195; + this.pictureBox6.TabStop = false; + // + // pictureBox5 + // + this.pictureBox5.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox5.Image"))); + this.pictureBox5.Location = new System.Drawing.Point(442, 8); + this.pictureBox5.Name = "pictureBox5"; + this.pictureBox5.Size = new System.Drawing.Size(25, 26); + this.pictureBox5.TabIndex = 194; + this.pictureBox5.TabStop = false; + // + // superRodGroupBox + // + this.superRodGroupBox.Controls.Add(this.label59); + this.superRodGroupBox.Controls.Add(this.label60); + this.superRodGroupBox.Controls.Add(this.superRodRateUpDown); + this.superRodGroupBox.Controls.Add(this.label69); + this.superRodGroupBox.Controls.Add(this.superRodOneMaxLevelUpDown); + this.superRodGroupBox.Controls.Add(this.superRodOneMinLevelUpDown); + this.superRodGroupBox.Controls.Add(this.label70); + this.superRodGroupBox.Controls.Add(this.superRodOneComboBox); + this.superRodGroupBox.Controls.Add(this.superRodFourMaxLevelUpDown); + this.superRodGroupBox.Controls.Add(this.superRodFourMinLevelUpDown); + this.superRodGroupBox.Controls.Add(this.label71); + this.superRodGroupBox.Controls.Add(this.superRodFourComboBox); + this.superRodGroupBox.Controls.Add(this.superRodFifteenMaxLevelUpDown); + this.superRodGroupBox.Controls.Add(this.superRodFifteenMinLevelUpDown); + this.superRodGroupBox.Controls.Add(this.label72); + this.superRodGroupBox.Controls.Add(this.superRodFifteenComboBox); + this.superRodGroupBox.Controls.Add(this.superRodSecondFortyMaxLevelUpDown); + this.superRodGroupBox.Controls.Add(this.superRodSecondFortyMinLevelUpDown); + this.superRodGroupBox.Controls.Add(this.label73); + this.superRodGroupBox.Controls.Add(this.superRodSecondFortyComboBox); + this.superRodGroupBox.Controls.Add(this.superRodFirstFortyMaxLevelUpDown); + this.superRodGroupBox.Controls.Add(this.superRodFirstFortyMinLevelUpDown); + this.superRodGroupBox.Controls.Add(this.label74); + this.superRodGroupBox.Controls.Add(this.superRodFirstFortyComboBox); + this.superRodGroupBox.Location = new System.Drawing.Point(384, 234); + this.superRodGroupBox.Name = "superRodGroupBox"; + this.superRodGroupBox.Size = new System.Drawing.Size(325, 210); + this.superRodGroupBox.TabIndex = 44; + this.superRodGroupBox.TabStop = false; + this.superRodGroupBox.Text = "Super Rod"; + // + // label59 + // + this.label59.AutoSize = true; + this.label59.Location = new System.Drawing.Point(264, 50); + this.label59.Name = "label59"; + this.label59.Size = new System.Drawing.Size(47, 13); + this.label59.TabIndex = 41; + this.label59.Text = "Max Lvl."; + // + // label60 + // + this.label60.AutoSize = true; + this.label60.Location = new System.Drawing.Point(214, 50); + this.label60.Name = "label60"; + this.label60.Size = new System.Drawing.Size(44, 13); + this.label60.TabIndex = 40; + this.label60.Text = "Min Lvl."; + // + // superRodRateUpDown + // + this.superRodRateUpDown.Location = new System.Drawing.Point(265, 17); + this.superRodRateUpDown.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.superRodRateUpDown.Name = "superRodRateUpDown"; + this.superRodRateUpDown.Size = new System.Drawing.Size(42, 20); + this.superRodRateUpDown.TabIndex = 39; + this.superRodRateUpDown.ValueChanged += new System.EventHandler(this.superRodRateUpDown_ValueChanged); + // + // label69 + // + this.label69.AutoSize = true; + this.label69.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label69.Location = new System.Drawing.Point(229, 19); + this.label69.Name = "label69"; + this.label69.Size = new System.Drawing.Size(30, 13); + this.label69.TabIndex = 38; + this.label69.Text = "Rate"; + // + // superRodOneMaxLevelUpDown + // + this.superRodOneMaxLevelUpDown.Location = new System.Drawing.Point(265, 179); + this.superRodOneMaxLevelUpDown.Name = "superRodOneMaxLevelUpDown"; + this.superRodOneMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.superRodOneMaxLevelUpDown.TabIndex = 22; + this.superRodOneMaxLevelUpDown.ValueChanged += new System.EventHandler(this.superRodOneMaxLevelUpDown_ValueChanged); + // + // superRodOneMinLevelUpDown + // + this.superRodOneMinLevelUpDown.Location = new System.Drawing.Point(217, 179); + this.superRodOneMinLevelUpDown.Name = "superRodOneMinLevelUpDown"; + this.superRodOneMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.superRodOneMinLevelUpDown.TabIndex = 21; + this.superRodOneMinLevelUpDown.ValueChanged += new System.EventHandler(this.superRodOneMinLevelUpDown_ValueChanged); + // + // label70 + // + this.label70.AutoSize = true; + this.label70.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label70.Location = new System.Drawing.Point(18, 181); + this.label70.Name = "label70"; + this.label70.Size = new System.Drawing.Size(21, 13); + this.label70.TabIndex = 20; + this.label70.Text = "5%"; + // + // superRodFourMaxLevelUpDown + // + this.superRodFourMaxLevelUpDown.Location = new System.Drawing.Point(265, 152); + this.superRodFourMaxLevelUpDown.Name = "superRodFourMaxLevelUpDown"; + this.superRodFourMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.superRodFourMaxLevelUpDown.TabIndex = 18; + this.superRodFourMaxLevelUpDown.ValueChanged += new System.EventHandler(this.superRodFourMaxLevelUpDown_ValueChanged); + // + // superRodFourMinLevelUpDown + // + this.superRodFourMinLevelUpDown.Location = new System.Drawing.Point(217, 152); + this.superRodFourMinLevelUpDown.Name = "superRodFourMinLevelUpDown"; + this.superRodFourMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.superRodFourMinLevelUpDown.TabIndex = 17; + this.superRodFourMinLevelUpDown.ValueChanged += new System.EventHandler(this.superRodFourMinLevelUpDown_ValueChanged); + // + // label71 + // + this.label71.AutoSize = true; + this.label71.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label71.Location = new System.Drawing.Point(12, 154); + this.label71.Name = "label71"; + this.label71.Size = new System.Drawing.Size(27, 13); + this.label71.TabIndex = 16; + this.label71.Text = "10%"; + // + // superRodFifteenMaxLevelUpDown + // + this.superRodFifteenMaxLevelUpDown.Location = new System.Drawing.Point(265, 125); + this.superRodFifteenMaxLevelUpDown.Name = "superRodFifteenMaxLevelUpDown"; + this.superRodFifteenMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.superRodFifteenMaxLevelUpDown.TabIndex = 14; + this.superRodFifteenMaxLevelUpDown.ValueChanged += new System.EventHandler(this.superRodFifteenMaxLevelUpDown_ValueChanged); + // + // superRodFifteenMinLevelUpDown + // + this.superRodFifteenMinLevelUpDown.Location = new System.Drawing.Point(217, 125); + this.superRodFifteenMinLevelUpDown.Name = "superRodFifteenMinLevelUpDown"; + this.superRodFifteenMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.superRodFifteenMinLevelUpDown.TabIndex = 13; + this.superRodFifteenMinLevelUpDown.ValueChanged += new System.EventHandler(this.superRodFifteenMinLevelUpDown_ValueChanged); + // + // label72 + // + this.label72.AutoSize = true; + this.label72.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label72.Location = new System.Drawing.Point(12, 127); + this.label72.Name = "label72"; + this.label72.Size = new System.Drawing.Size(27, 13); + this.label72.TabIndex = 12; + this.label72.Text = "15%"; + // + // superRodSecondFortyMaxLevelUpDown + // + this.superRodSecondFortyMaxLevelUpDown.Location = new System.Drawing.Point(265, 98); + this.superRodSecondFortyMaxLevelUpDown.Name = "superRodSecondFortyMaxLevelUpDown"; + this.superRodSecondFortyMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.superRodSecondFortyMaxLevelUpDown.TabIndex = 10; + this.superRodSecondFortyMaxLevelUpDown.ValueChanged += new System.EventHandler(this.superRodSecondFortyMaxLevelUpDown_ValueChanged); + // + // superRodSecondFortyMinLevelUpDown + // + this.superRodSecondFortyMinLevelUpDown.Location = new System.Drawing.Point(217, 98); + this.superRodSecondFortyMinLevelUpDown.Name = "superRodSecondFortyMinLevelUpDown"; + this.superRodSecondFortyMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.superRodSecondFortyMinLevelUpDown.TabIndex = 9; + this.superRodSecondFortyMinLevelUpDown.ValueChanged += new System.EventHandler(this.superRodSecondFortyMinLevelUpDown_ValueChanged); + // + // label73 + // + this.label73.AutoSize = true; + this.label73.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label73.Location = new System.Drawing.Point(12, 100); + this.label73.Name = "label73"; + this.label73.Size = new System.Drawing.Size(27, 13); + this.label73.TabIndex = 8; + this.label73.Text = "30%"; + // + // superRodFirstFortyMaxLevelUpDown + // + this.superRodFirstFortyMaxLevelUpDown.Location = new System.Drawing.Point(265, 71); + this.superRodFirstFortyMaxLevelUpDown.Name = "superRodFirstFortyMaxLevelUpDown"; + this.superRodFirstFortyMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.superRodFirstFortyMaxLevelUpDown.TabIndex = 6; + this.superRodFirstFortyMaxLevelUpDown.ValueChanged += new System.EventHandler(this.superRodFirstFortyMaxLevelUpDown_ValueChanged); + // + // superRodFirstFortyMinLevelUpDown + // + this.superRodFirstFortyMinLevelUpDown.Location = new System.Drawing.Point(217, 71); + this.superRodFirstFortyMinLevelUpDown.Name = "superRodFirstFortyMinLevelUpDown"; + this.superRodFirstFortyMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.superRodFirstFortyMinLevelUpDown.TabIndex = 5; + this.superRodFirstFortyMinLevelUpDown.ValueChanged += new System.EventHandler(this.superRodFirstFortyMinLevelUpDown_ValueChanged); + // + // label74 + // + this.label74.AutoSize = true; + this.label74.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label74.Location = new System.Drawing.Point(12, 73); + this.label74.Name = "label74"; + this.label74.Size = new System.Drawing.Size(27, 13); + this.label74.TabIndex = 4; + this.label74.Text = "40%"; + // + // goodRodGroupBox + // + this.goodRodGroupBox.Controls.Add(this.label51); + this.goodRodGroupBox.Controls.Add(this.label52); + this.goodRodGroupBox.Controls.Add(this.goodRodRateUpDown); + this.goodRodGroupBox.Controls.Add(this.label53); + this.goodRodGroupBox.Controls.Add(this.goodRodOneMaxLevelUpDown); + this.goodRodGroupBox.Controls.Add(this.goodRodOneMinLevelUpDown); + this.goodRodGroupBox.Controls.Add(this.label54); + this.goodRodGroupBox.Controls.Add(this.goodRodOneComboBox); + this.goodRodGroupBox.Controls.Add(this.goodRodFourMaxLevelUpDown); + this.goodRodGroupBox.Controls.Add(this.goodRodFourMinLevelUpDown); + this.goodRodGroupBox.Controls.Add(this.label55); + this.goodRodGroupBox.Controls.Add(this.goodRodFourComboBox); + this.goodRodGroupBox.Controls.Add(this.goodRodFifteenMaxLevelUpDown); + this.goodRodGroupBox.Controls.Add(this.goodRodFifteenMinLevelUpDown); + this.goodRodGroupBox.Controls.Add(this.label56); + this.goodRodGroupBox.Controls.Add(this.goodRodFifteenComboBox); + this.goodRodGroupBox.Controls.Add(this.goodRodSecondFortyMaxLevelUpDown); + this.goodRodGroupBox.Controls.Add(this.goodRodSecondFortyMinLevelUpDown); + this.goodRodGroupBox.Controls.Add(this.label57); + this.goodRodGroupBox.Controls.Add(this.goodRodSecondFortyComboBox); + this.goodRodGroupBox.Controls.Add(this.goodRodFirstFortyMaxLevelUpDown); + this.goodRodGroupBox.Controls.Add(this.goodRodFirstFortyMinLevelUpDown); + this.goodRodGroupBox.Controls.Add(this.label58); + this.goodRodGroupBox.Controls.Add(this.goodRodFirstFortyComboBox); + this.goodRodGroupBox.Location = new System.Drawing.Point(17, 234); + this.goodRodGroupBox.Name = "goodRodGroupBox"; + this.goodRodGroupBox.Size = new System.Drawing.Size(325, 210); + this.goodRodGroupBox.TabIndex = 43; + this.goodRodGroupBox.TabStop = false; + this.goodRodGroupBox.Text = "Good Rod"; + // + // label51 + // + this.label51.AutoSize = true; + this.label51.Location = new System.Drawing.Point(264, 50); + this.label51.Name = "label51"; + this.label51.Size = new System.Drawing.Size(47, 13); + this.label51.TabIndex = 41; + this.label51.Text = "Max Lvl."; + // + // label52 + // + this.label52.AutoSize = true; + this.label52.Location = new System.Drawing.Point(214, 50); + this.label52.Name = "label52"; + this.label52.Size = new System.Drawing.Size(44, 13); + this.label52.TabIndex = 40; + this.label52.Text = "Min Lvl."; + // + // goodRodRateUpDown + // + this.goodRodRateUpDown.Location = new System.Drawing.Point(265, 17); + this.goodRodRateUpDown.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.goodRodRateUpDown.Name = "goodRodRateUpDown"; + this.goodRodRateUpDown.Size = new System.Drawing.Size(42, 20); + this.goodRodRateUpDown.TabIndex = 39; + this.goodRodRateUpDown.ValueChanged += new System.EventHandler(this.goodRodRateUpDown_ValueChanged); + // + // label53 + // + this.label53.AutoSize = true; + this.label53.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label53.Location = new System.Drawing.Point(229, 19); + this.label53.Name = "label53"; + this.label53.Size = new System.Drawing.Size(30, 13); + this.label53.TabIndex = 38; + this.label53.Text = "Rate"; + // + // goodRodOneMaxLevelUpDown + // + this.goodRodOneMaxLevelUpDown.Location = new System.Drawing.Point(265, 179); + this.goodRodOneMaxLevelUpDown.Name = "goodRodOneMaxLevelUpDown"; + this.goodRodOneMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.goodRodOneMaxLevelUpDown.TabIndex = 22; + this.goodRodOneMaxLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodOneMaxLevelUpDown_ValueChanged); + // + // goodRodOneMinLevelUpDown + // + this.goodRodOneMinLevelUpDown.Location = new System.Drawing.Point(217, 179); + this.goodRodOneMinLevelUpDown.Name = "goodRodOneMinLevelUpDown"; + this.goodRodOneMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.goodRodOneMinLevelUpDown.TabIndex = 21; + this.goodRodOneMinLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodOneMinLevelUpDown_ValueChanged); + // + // label54 + // + this.label54.AutoSize = true; + this.label54.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label54.Location = new System.Drawing.Point(18, 181); + this.label54.Name = "label54"; + this.label54.Size = new System.Drawing.Size(21, 13); + this.label54.TabIndex = 20; + this.label54.Text = "5%"; + // + // goodRodFourMaxLevelUpDown + // + this.goodRodFourMaxLevelUpDown.Location = new System.Drawing.Point(265, 152); + this.goodRodFourMaxLevelUpDown.Name = "goodRodFourMaxLevelUpDown"; + this.goodRodFourMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.goodRodFourMaxLevelUpDown.TabIndex = 18; + this.goodRodFourMaxLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodFourMaxLevelUpDown_ValueChanged); + // + // goodRodFourMinLevelUpDown + // + this.goodRodFourMinLevelUpDown.Location = new System.Drawing.Point(217, 152); + this.goodRodFourMinLevelUpDown.Name = "goodRodFourMinLevelUpDown"; + this.goodRodFourMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.goodRodFourMinLevelUpDown.TabIndex = 17; + this.goodRodFourMinLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodFourMinLevelUpDown_ValueChanged); + // + // label55 + // + this.label55.AutoSize = true; + this.label55.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label55.Location = new System.Drawing.Point(12, 154); + this.label55.Name = "label55"; + this.label55.Size = new System.Drawing.Size(27, 13); + this.label55.TabIndex = 16; + this.label55.Text = "10%"; + // + // goodRodFifteenMaxLevelUpDown + // + this.goodRodFifteenMaxLevelUpDown.Location = new System.Drawing.Point(265, 125); + this.goodRodFifteenMaxLevelUpDown.Name = "goodRodFifteenMaxLevelUpDown"; + this.goodRodFifteenMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.goodRodFifteenMaxLevelUpDown.TabIndex = 14; + this.goodRodFifteenMaxLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodFifteenMaxLevelUpDown_ValueChanged); + // + // goodRodFifteenMinLevelUpDown + // + this.goodRodFifteenMinLevelUpDown.Location = new System.Drawing.Point(217, 125); + this.goodRodFifteenMinLevelUpDown.Name = "goodRodFifteenMinLevelUpDown"; + this.goodRodFifteenMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.goodRodFifteenMinLevelUpDown.TabIndex = 13; + this.goodRodFifteenMinLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodFifteenMinLevelUpDown_ValueChanged); + // + // label56 + // + this.label56.AutoSize = true; + this.label56.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label56.Location = new System.Drawing.Point(12, 127); + this.label56.Name = "label56"; + this.label56.Size = new System.Drawing.Size(27, 13); + this.label56.TabIndex = 12; + this.label56.Text = "15%"; + // + // goodRodSecondFortyMaxLevelUpDown + // + this.goodRodSecondFortyMaxLevelUpDown.Location = new System.Drawing.Point(265, 98); + this.goodRodSecondFortyMaxLevelUpDown.Name = "goodRodSecondFortyMaxLevelUpDown"; + this.goodRodSecondFortyMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.goodRodSecondFortyMaxLevelUpDown.TabIndex = 10; + this.goodRodSecondFortyMaxLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodSecondFortyMaxLevelUpDown_ValueChanged); + // + // goodRodSecondFortyMinLevelUpDown + // + this.goodRodSecondFortyMinLevelUpDown.Location = new System.Drawing.Point(217, 98); + this.goodRodSecondFortyMinLevelUpDown.Name = "goodRodSecondFortyMinLevelUpDown"; + this.goodRodSecondFortyMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.goodRodSecondFortyMinLevelUpDown.TabIndex = 9; + this.goodRodSecondFortyMinLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodSecondFortyMinLevelUpDown_ValueChanged); + // + // label57 + // + this.label57.AutoSize = true; + this.label57.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label57.Location = new System.Drawing.Point(12, 100); + this.label57.Name = "label57"; + this.label57.Size = new System.Drawing.Size(27, 13); + this.label57.TabIndex = 8; + this.label57.Text = "30%"; + // + // goodRodFirstFortyMaxLevelUpDown + // + this.goodRodFirstFortyMaxLevelUpDown.Location = new System.Drawing.Point(265, 71); + this.goodRodFirstFortyMaxLevelUpDown.Name = "goodRodFirstFortyMaxLevelUpDown"; + this.goodRodFirstFortyMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.goodRodFirstFortyMaxLevelUpDown.TabIndex = 6; + this.goodRodFirstFortyMaxLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodFirstFortyMaxLevelUpDown_ValueChanged); + // + // goodRodFirstFortyMinLevelUpDown + // + this.goodRodFirstFortyMinLevelUpDown.Location = new System.Drawing.Point(217, 71); + this.goodRodFirstFortyMinLevelUpDown.Name = "goodRodFirstFortyMinLevelUpDown"; + this.goodRodFirstFortyMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.goodRodFirstFortyMinLevelUpDown.TabIndex = 5; + this.goodRodFirstFortyMinLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodFirstFortyMinLevelUpDown_ValueChanged); + // + // label58 + // + this.label58.AutoSize = true; + this.label58.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label58.Location = new System.Drawing.Point(12, 73); + this.label58.Name = "label58"; + this.label58.Size = new System.Drawing.Size(27, 13); + this.label58.TabIndex = 4; + this.label58.Text = "40%"; + // + // oldRodGroupBox + // + this.oldRodGroupBox.Controls.Add(this.label43); + this.oldRodGroupBox.Controls.Add(this.label44); + this.oldRodGroupBox.Controls.Add(this.oldRodRateUpDown); + this.oldRodGroupBox.Controls.Add(this.label45); + this.oldRodGroupBox.Controls.Add(this.oldRodOneMaxLevelUpDown); + this.oldRodGroupBox.Controls.Add(this.oldRodOneMinLevelUpDown); + this.oldRodGroupBox.Controls.Add(this.label46); + this.oldRodGroupBox.Controls.Add(this.oldRodOneComboBox); + this.oldRodGroupBox.Controls.Add(this.oldRodFourMaxLevelUpDown); + this.oldRodGroupBox.Controls.Add(this.oldRodFourMinLevelUpDown); + this.oldRodGroupBox.Controls.Add(this.label47); + this.oldRodGroupBox.Controls.Add(this.oldRodFourComboBox); + this.oldRodGroupBox.Controls.Add(this.oldRodFiveMaxLevelUpDown); + this.oldRodGroupBox.Controls.Add(this.oldRodFiveMinLevelUpDown); + this.oldRodGroupBox.Controls.Add(this.label48); + this.oldRodGroupBox.Controls.Add(this.oldRodFiveComboBox); + this.oldRodGroupBox.Controls.Add(this.oldRodThirtyMaxLevelUpDown); + this.oldRodGroupBox.Controls.Add(this.oldRodThirtyMinLevelUpDown); + this.oldRodGroupBox.Controls.Add(this.label49); + this.oldRodGroupBox.Controls.Add(this.oldRodThirtyComboBox); + this.oldRodGroupBox.Controls.Add(this.oldRodSixtyMaxLevelUpDown); + this.oldRodGroupBox.Controls.Add(this.oldRodSixtyMinLevelUpDown); + this.oldRodGroupBox.Controls.Add(this.label50); + this.oldRodGroupBox.Controls.Add(this.oldRodSixtyComboBox); + this.oldRodGroupBox.Location = new System.Drawing.Point(384, 10); + this.oldRodGroupBox.Name = "oldRodGroupBox"; + this.oldRodGroupBox.Size = new System.Drawing.Size(325, 210); + this.oldRodGroupBox.TabIndex = 42; + this.oldRodGroupBox.TabStop = false; + this.oldRodGroupBox.Text = "Old Rod"; + // + // label43 + // + this.label43.AutoSize = true; + this.label43.Location = new System.Drawing.Point(264, 50); + this.label43.Name = "label43"; + this.label43.Size = new System.Drawing.Size(47, 13); + this.label43.TabIndex = 41; + this.label43.Text = "Max Lvl."; + // + // label44 + // + this.label44.AutoSize = true; + this.label44.Location = new System.Drawing.Point(214, 50); + this.label44.Name = "label44"; + this.label44.Size = new System.Drawing.Size(44, 13); + this.label44.TabIndex = 40; + this.label44.Text = "Min Lvl."; + // + // oldRodRateUpDown + // + this.oldRodRateUpDown.Location = new System.Drawing.Point(265, 17); + this.oldRodRateUpDown.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.oldRodRateUpDown.Name = "oldRodRateUpDown"; + this.oldRodRateUpDown.Size = new System.Drawing.Size(42, 20); + this.oldRodRateUpDown.TabIndex = 39; + this.oldRodRateUpDown.ValueChanged += new System.EventHandler(this.oldRodRateUpDown_ValueChanged); + // + // label45 + // + this.label45.AutoSize = true; + this.label45.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label45.Location = new System.Drawing.Point(229, 19); + this.label45.Name = "label45"; + this.label45.Size = new System.Drawing.Size(30, 13); + this.label45.TabIndex = 38; + this.label45.Text = "Rate"; + // + // oldRodOneMaxLevelUpDown + // + this.oldRodOneMaxLevelUpDown.Location = new System.Drawing.Point(265, 179); + this.oldRodOneMaxLevelUpDown.Name = "oldRodOneMaxLevelUpDown"; + this.oldRodOneMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.oldRodOneMaxLevelUpDown.TabIndex = 22; + this.oldRodOneMaxLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodOneMaxLevelUpDown_ValueChanged); + // + // oldRodOneMinLevelUpDown + // + this.oldRodOneMinLevelUpDown.Location = new System.Drawing.Point(217, 179); + this.oldRodOneMinLevelUpDown.Name = "oldRodOneMinLevelUpDown"; + this.oldRodOneMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.oldRodOneMinLevelUpDown.TabIndex = 21; + this.oldRodOneMinLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodOneMinLevelUpDown_ValueChanged); + // + // label46 + // + this.label46.AutoSize = true; + this.label46.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label46.Location = new System.Drawing.Point(18, 181); + this.label46.Name = "label46"; + this.label46.Size = new System.Drawing.Size(21, 13); + this.label46.TabIndex = 20; + this.label46.Text = "5%"; + // + // oldRodFourMaxLevelUpDown + // + this.oldRodFourMaxLevelUpDown.Location = new System.Drawing.Point(265, 152); + this.oldRodFourMaxLevelUpDown.Name = "oldRodFourMaxLevelUpDown"; + this.oldRodFourMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.oldRodFourMaxLevelUpDown.TabIndex = 18; + this.oldRodFourMaxLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodFourMaxLevelUpDown_ValueChanged); + // + // oldRodFourMinLevelUpDown + // + this.oldRodFourMinLevelUpDown.Location = new System.Drawing.Point(217, 152); + this.oldRodFourMinLevelUpDown.Name = "oldRodFourMinLevelUpDown"; + this.oldRodFourMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.oldRodFourMinLevelUpDown.TabIndex = 17; + this.oldRodFourMinLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodFourMinLevelUpDown_ValueChanged); + // + // label47 + // + this.label47.AutoSize = true; + this.label47.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label47.Location = new System.Drawing.Point(12, 154); + this.label47.Name = "label47"; + this.label47.Size = new System.Drawing.Size(27, 13); + this.label47.TabIndex = 16; + this.label47.Text = "10%"; + // + // oldRodFiveMaxLevelUpDown + // + this.oldRodFiveMaxLevelUpDown.Location = new System.Drawing.Point(265, 125); + this.oldRodFiveMaxLevelUpDown.Name = "oldRodFiveMaxLevelUpDown"; + this.oldRodFiveMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.oldRodFiveMaxLevelUpDown.TabIndex = 14; + this.oldRodFiveMaxLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodFiveMaxLevelUpDown_ValueChanged); + // + // oldRodFiveMinLevelUpDown + // + this.oldRodFiveMinLevelUpDown.Location = new System.Drawing.Point(217, 125); + this.oldRodFiveMinLevelUpDown.Name = "oldRodFiveMinLevelUpDown"; + this.oldRodFiveMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.oldRodFiveMinLevelUpDown.TabIndex = 13; + this.oldRodFiveMinLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodFiveMinLevelUpDown_ValueChanged); + // + // label48 + // + this.label48.AutoSize = true; + this.label48.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label48.Location = new System.Drawing.Point(12, 127); + this.label48.Name = "label48"; + this.label48.Size = new System.Drawing.Size(27, 13); + this.label48.TabIndex = 12; + this.label48.Text = "15%"; + // + // oldRodThirtyMaxLevelUpDown + // + this.oldRodThirtyMaxLevelUpDown.Location = new System.Drawing.Point(265, 98); + this.oldRodThirtyMaxLevelUpDown.Name = "oldRodThirtyMaxLevelUpDown"; + this.oldRodThirtyMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.oldRodThirtyMaxLevelUpDown.TabIndex = 10; + this.oldRodThirtyMaxLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodThirtyMaxLevelUpDown_ValueChanged); + // + // oldRodThirtyMinLevelUpDown + // + this.oldRodThirtyMinLevelUpDown.Location = new System.Drawing.Point(217, 98); + this.oldRodThirtyMinLevelUpDown.Name = "oldRodThirtyMinLevelUpDown"; + this.oldRodThirtyMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.oldRodThirtyMinLevelUpDown.TabIndex = 9; + this.oldRodThirtyMinLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodThirtyMinLevelUpDown_ValueChanged); + // + // label49 + // + this.label49.AutoSize = true; + this.label49.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label49.Location = new System.Drawing.Point(12, 100); + this.label49.Name = "label49"; + this.label49.Size = new System.Drawing.Size(27, 13); + this.label49.TabIndex = 8; + this.label49.Text = "30%"; + // + // oldRodSixtyMaxLevelUpDown + // + this.oldRodSixtyMaxLevelUpDown.Location = new System.Drawing.Point(265, 71); + this.oldRodSixtyMaxLevelUpDown.Name = "oldRodSixtyMaxLevelUpDown"; + this.oldRodSixtyMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.oldRodSixtyMaxLevelUpDown.TabIndex = 6; + this.oldRodSixtyMaxLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodSixtyMaxLevelUpDown_ValueChanged); + // + // oldRodSixtyMinLevelUpDown + // + this.oldRodSixtyMinLevelUpDown.Location = new System.Drawing.Point(217, 71); + this.oldRodSixtyMinLevelUpDown.Name = "oldRodSixtyMinLevelUpDown"; + this.oldRodSixtyMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.oldRodSixtyMinLevelUpDown.TabIndex = 5; + this.oldRodSixtyMinLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodSixtyMinLevelUpDown_ValueChanged); + // + // label50 + // + this.label50.AutoSize = true; + this.label50.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label50.Location = new System.Drawing.Point(12, 73); + this.label50.Name = "label50"; + this.label50.Size = new System.Drawing.Size(27, 13); + this.label50.TabIndex = 4; + this.label50.Text = "40%"; + // + // surfGroupBox + // + this.surfGroupBox.Controls.Add(this.label68); + this.surfGroupBox.Controls.Add(this.label67); + this.surfGroupBox.Controls.Add(this.surfRateUpDown); + this.surfGroupBox.Controls.Add(this.label61); + this.surfGroupBox.Controls.Add(this.surfOneMaxLevelUpDown); + this.surfGroupBox.Controls.Add(this.surfOneMinLevelUpDown); + this.surfGroupBox.Controls.Add(this.label62); + this.surfGroupBox.Controls.Add(this.surfOneComboBox); + this.surfGroupBox.Controls.Add(this.surfFourMaxLevelUpDown); + this.surfGroupBox.Controls.Add(this.surfFourMinLevelUpDown); + this.surfGroupBox.Controls.Add(this.label63); + this.surfGroupBox.Controls.Add(this.surfFourComboBox); + this.surfGroupBox.Controls.Add(this.surfFiveMaxLevelUpDown); + this.surfGroupBox.Controls.Add(this.surfFiveMinLevelUpDown); + this.surfGroupBox.Controls.Add(this.label64); + this.surfGroupBox.Controls.Add(this.surfFiveComboBox); + this.surfGroupBox.Controls.Add(this.surfThirtyMaxLevelUpDown); + this.surfGroupBox.Controls.Add(this.surfThirtyMinLevelUpDown); + this.surfGroupBox.Controls.Add(this.label65); + this.surfGroupBox.Controls.Add(this.surfThirtyComboBox); + this.surfGroupBox.Controls.Add(this.surfSixtyMaxLevelUpDown); + this.surfGroupBox.Controls.Add(this.surfSixtyMinLevelUpDown); + this.surfGroupBox.Controls.Add(this.label66); + this.surfGroupBox.Controls.Add(this.surfSixtyComboBox); + this.surfGroupBox.Location = new System.Drawing.Point(17, 10); + this.surfGroupBox.Name = "surfGroupBox"; + this.surfGroupBox.Size = new System.Drawing.Size(325, 210); + this.surfGroupBox.TabIndex = 4; + this.surfGroupBox.TabStop = false; + this.surfGroupBox.Text = "Surfing"; + // + // label68 + // + this.label68.AutoSize = true; + this.label68.Location = new System.Drawing.Point(264, 50); + this.label68.Name = "label68"; + this.label68.Size = new System.Drawing.Size(47, 13); + this.label68.TabIndex = 41; + this.label68.Text = "Max Lvl."; + // + // label67 + // + this.label67.AutoSize = true; + this.label67.Location = new System.Drawing.Point(214, 50); + this.label67.Name = "label67"; + this.label67.Size = new System.Drawing.Size(44, 13); + this.label67.TabIndex = 40; + this.label67.Text = "Min Lvl."; + // + // surfRateUpDown + // + this.surfRateUpDown.Location = new System.Drawing.Point(265, 17); + this.surfRateUpDown.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.surfRateUpDown.Name = "surfRateUpDown"; + this.surfRateUpDown.Size = new System.Drawing.Size(42, 20); + this.surfRateUpDown.TabIndex = 39; + this.surfRateUpDown.ValueChanged += new System.EventHandler(this.surfRateUpDown_ValueChanged); + // + // label61 + // + this.label61.AutoSize = true; + this.label61.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label61.Location = new System.Drawing.Point(229, 19); + this.label61.Name = "label61"; + this.label61.Size = new System.Drawing.Size(30, 13); + this.label61.TabIndex = 38; + this.label61.Text = "Rate"; + // + // surfOneMaxLevelUpDown + // + this.surfOneMaxLevelUpDown.Location = new System.Drawing.Point(265, 179); + this.surfOneMaxLevelUpDown.Name = "surfOneMaxLevelUpDown"; + this.surfOneMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.surfOneMaxLevelUpDown.TabIndex = 22; + this.surfOneMaxLevelUpDown.ValueChanged += new System.EventHandler(this.surfOneMaxLevelUpDown_ValueChanged); + // + // surfOneMinLevelUpDown + // + this.surfOneMinLevelUpDown.Location = new System.Drawing.Point(217, 179); + this.surfOneMinLevelUpDown.Name = "surfOneMinLevelUpDown"; + this.surfOneMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.surfOneMinLevelUpDown.TabIndex = 21; + this.surfOneMinLevelUpDown.ValueChanged += new System.EventHandler(this.surfOneMinLevelUpDown_ValueChanged); + // + // label62 + // + this.label62.AutoSize = true; + this.label62.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label62.Location = new System.Drawing.Point(18, 181); + this.label62.Name = "label62"; + this.label62.Size = new System.Drawing.Size(21, 13); + this.label62.TabIndex = 20; + this.label62.Text = "1%"; + // + // surfFourMaxLevelUpDown + // + this.surfFourMaxLevelUpDown.Location = new System.Drawing.Point(265, 152); + this.surfFourMaxLevelUpDown.Name = "surfFourMaxLevelUpDown"; + this.surfFourMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.surfFourMaxLevelUpDown.TabIndex = 18; + this.surfFourMaxLevelUpDown.ValueChanged += new System.EventHandler(this.surfFourMaxLevelUpDown_ValueChanged); + // + // surfFourMinLevelUpDown + // + this.surfFourMinLevelUpDown.Location = new System.Drawing.Point(217, 152); + this.surfFourMinLevelUpDown.Name = "surfFourMinLevelUpDown"; + this.surfFourMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.surfFourMinLevelUpDown.TabIndex = 17; + this.surfFourMinLevelUpDown.ValueChanged += new System.EventHandler(this.surfFourMinLevelUpDown_ValueChanged); + // + // label63 + // + this.label63.AutoSize = true; + this.label63.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label63.Location = new System.Drawing.Point(18, 154); + this.label63.Name = "label63"; + this.label63.Size = new System.Drawing.Size(21, 13); + this.label63.TabIndex = 16; + this.label63.Text = "4%"; + // + // surfFiveMaxLevelUpDown + // + this.surfFiveMaxLevelUpDown.Location = new System.Drawing.Point(265, 125); + this.surfFiveMaxLevelUpDown.Name = "surfFiveMaxLevelUpDown"; + this.surfFiveMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.surfFiveMaxLevelUpDown.TabIndex = 14; + this.surfFiveMaxLevelUpDown.ValueChanged += new System.EventHandler(this.surfFiveMaxLevelUpDown_ValueChanged); + // + // surfFiveMinLevelUpDown + // + this.surfFiveMinLevelUpDown.Location = new System.Drawing.Point(217, 125); + this.surfFiveMinLevelUpDown.Name = "surfFiveMinLevelUpDown"; + this.surfFiveMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.surfFiveMinLevelUpDown.TabIndex = 13; + this.surfFiveMinLevelUpDown.ValueChanged += new System.EventHandler(this.surfFiveMinLevelUpDown_ValueChanged); + // + // label64 + // + this.label64.AutoSize = true; + this.label64.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label64.Location = new System.Drawing.Point(18, 127); + this.label64.Name = "label64"; + this.label64.Size = new System.Drawing.Size(21, 13); + this.label64.TabIndex = 12; + this.label64.Text = "5%"; + // + // surfThirtyMaxLevelUpDown + // + this.surfThirtyMaxLevelUpDown.Location = new System.Drawing.Point(265, 98); + this.surfThirtyMaxLevelUpDown.Name = "surfThirtyMaxLevelUpDown"; + this.surfThirtyMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.surfThirtyMaxLevelUpDown.TabIndex = 10; + this.surfThirtyMaxLevelUpDown.ValueChanged += new System.EventHandler(this.surfThirtyMaxLevelUpDown_ValueChanged); + // + // surfThirtyMinLevelUpDown + // + this.surfThirtyMinLevelUpDown.Location = new System.Drawing.Point(217, 98); + this.surfThirtyMinLevelUpDown.Name = "surfThirtyMinLevelUpDown"; + this.surfThirtyMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.surfThirtyMinLevelUpDown.TabIndex = 9; + this.surfThirtyMinLevelUpDown.ValueChanged += new System.EventHandler(this.surfThirtyMinLevelUpDown_ValueChanged); + // + // label65 + // + this.label65.AutoSize = true; + this.label65.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label65.Location = new System.Drawing.Point(12, 100); + this.label65.Name = "label65"; + this.label65.Size = new System.Drawing.Size(27, 13); + this.label65.TabIndex = 8; + this.label65.Text = "30%"; + // + // surfSixtyMaxLevelUpDown + // + this.surfSixtyMaxLevelUpDown.Location = new System.Drawing.Point(265, 71); + this.surfSixtyMaxLevelUpDown.Name = "surfSixtyMaxLevelUpDown"; + this.surfSixtyMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.surfSixtyMaxLevelUpDown.TabIndex = 6; + this.surfSixtyMaxLevelUpDown.ValueChanged += new System.EventHandler(this.surfSixtyMaxLevelUpDown_ValueChanged); + // + // surfSixtyMinLevelUpDown + // + this.surfSixtyMinLevelUpDown.Location = new System.Drawing.Point(217, 71); + this.surfSixtyMinLevelUpDown.Name = "surfSixtyMinLevelUpDown"; + this.surfSixtyMinLevelUpDown.Size = new System.Drawing.Size(42, 20); + this.surfSixtyMinLevelUpDown.TabIndex = 5; + this.surfSixtyMinLevelUpDown.ValueChanged += new System.EventHandler(this.surfSixtyMinLevelUpDown_ValueChanged); + // + // label66 + // + this.label66.AutoSize = true; + this.label66.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label66.Location = new System.Drawing.Point(12, 73); + this.label66.Name = "label66"; + this.label66.Size = new System.Drawing.Size(27, 13); + this.label66.TabIndex = 4; + this.label66.Text = "60%"; + // + // repairAllButton + // + this.repairAllButton.Image = global::DSPRE.Properties.Resources.wrenchIcon; + this.repairAllButton.Location = new System.Drawing.Point(590, 9); + this.repairAllButton.Name = "repairAllButton"; + this.repairAllButton.Size = new System.Drawing.Size(38, 40); + this.repairAllButton.TabIndex = 69; + this.repairAllButton.UseVisualStyleBackColor = true; + this.repairAllButton.Click += new System.EventHandler(this.repairAllButton_Click); + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.goodRodSwarmComboBox); + this.groupBox1.Location = new System.Drawing.Point(563, 445); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(223, 51); + this.groupBox1.TabIndex = 234; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Night Fishing"; + // + // goodRodSwarmComboBox + // + this.goodRodSwarmComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.goodRodSwarmComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.goodRodSwarmComboBox.FormattingEnabled = true; + this.goodRodSwarmComboBox.Location = new System.Drawing.Point(49, 19); + this.goodRodSwarmComboBox.Name = "goodRodSwarmComboBox"; + this.goodRodSwarmComboBox.Size = new System.Drawing.Size(121, 21); + this.goodRodSwarmComboBox.TabIndex = 48; + this.goodRodSwarmComboBox.SelectedIndexChanged += new System.EventHandler(this.goodRodSwarmComboBox_SelectedIndexChanged); + // + // rockSmashNinetyComboBox + // + this.rockSmashNinetyComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.rockSmashNinetyComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.rockSmashNinetyComboBox.FormattingEnabled = true; + this.rockSmashNinetyComboBox.Location = new System.Drawing.Point(7, 79); + this.rockSmashNinetyComboBox.Name = "rockSmashNinetyComboBox"; + this.rockSmashNinetyComboBox.Size = new System.Drawing.Size(121, 21); + this.rockSmashNinetyComboBox.TabIndex = 39; + this.rockSmashNinetyComboBox.SelectedIndexChanged += new System.EventHandler(this.rockSmashNinetyComboBox_SelectedIndexChanged); + // + // rockSmashTenComboBox + // + this.rockSmashTenComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.rockSmashTenComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.rockSmashTenComboBox.FormattingEnabled = true; + this.rockSmashTenComboBox.Location = new System.Drawing.Point(7, 128); + this.rockSmashTenComboBox.Name = "rockSmashTenComboBox"; + this.rockSmashTenComboBox.Size = new System.Drawing.Size(121, 21); + this.rockSmashTenComboBox.TabIndex = 42; + this.rockSmashTenComboBox.SelectedIndexChanged += new System.EventHandler(this.rockSmashTenComboBox_SelectedIndexChanged); + // + // sinnohSecondComboBox + // + this.sinnohSecondComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.sinnohSecondComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.sinnohSecondComboBox.FormattingEnabled = true; + this.sinnohSecondComboBox.Location = new System.Drawing.Point(42, 151); + this.sinnohSecondComboBox.Name = "sinnohSecondComboBox"; + this.sinnohSecondComboBox.Size = new System.Drawing.Size(150, 21); + this.sinnohSecondComboBox.TabIndex = 231; + this.sinnohSecondComboBox.SelectedIndexChanged += new System.EventHandler(this.sinnohSecondComboBox_SelectedIndexChanged); + // + // sinnohFirstComboBox + // + this.sinnohFirstComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.sinnohFirstComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.sinnohFirstComboBox.FormattingEnabled = true; + this.sinnohFirstComboBox.Location = new System.Drawing.Point(42, 124); + this.sinnohFirstComboBox.Name = "sinnohFirstComboBox"; + this.sinnohFirstComboBox.Size = new System.Drawing.Size(150, 21); + this.sinnohFirstComboBox.TabIndex = 229; + this.sinnohFirstComboBox.SelectedIndexChanged += new System.EventHandler(this.sinnohFirstComboBox_SelectedIndexChanged); + // + // hoennSecondComboBox + // + this.hoennSecondComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.hoennSecondComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.hoennSecondComboBox.FormattingEnabled = true; + this.hoennSecondComboBox.Location = new System.Drawing.Point(42, 72); + this.hoennSecondComboBox.Name = "hoennSecondComboBox"; + this.hoennSecondComboBox.Size = new System.Drawing.Size(150, 21); + this.hoennSecondComboBox.TabIndex = 228; + this.hoennSecondComboBox.SelectedIndexChanged += new System.EventHandler(this.hoennSecondComboBox_SelectedIndexChanged); + // + // hoennFirstComboBox + // + this.hoennFirstComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.hoennFirstComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.hoennFirstComboBox.FormattingEnabled = true; + this.hoennFirstComboBox.Location = new System.Drawing.Point(42, 45); + this.hoennFirstComboBox.Name = "hoennFirstComboBox"; + this.hoennFirstComboBox.Size = new System.Drawing.Size(150, 21); + this.hoennFirstComboBox.TabIndex = 226; + this.hoennFirstComboBox.SelectedIndexChanged += new System.EventHandler(this.hoennFirstComboBox_SelectedIndexChanged); + // + // superRodSwarmComboBox + // + this.superRodSwarmComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.superRodSwarmComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.superRodSwarmComboBox.FormattingEnabled = true; + this.superRodSwarmComboBox.Location = new System.Drawing.Point(388, 19); + this.superRodSwarmComboBox.Name = "superRodSwarmComboBox"; + this.superRodSwarmComboBox.Size = new System.Drawing.Size(121, 21); + this.superRodSwarmComboBox.TabIndex = 50; + this.superRodSwarmComboBox.SelectedIndexChanged += new System.EventHandler(this.superRodSwarmComboBox_SelectedIndexChanged); + // + // surfSwarmComboBox + // + this.surfSwarmComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.surfSwarmComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.surfSwarmComboBox.FormattingEnabled = true; + this.surfSwarmComboBox.Location = new System.Drawing.Point(207, 19); + this.surfSwarmComboBox.Name = "surfSwarmComboBox"; + this.surfSwarmComboBox.Size = new System.Drawing.Size(121, 21); + this.surfSwarmComboBox.TabIndex = 46; + this.surfSwarmComboBox.SelectedIndexChanged += new System.EventHandler(this.surfSwarmComboBox_SelectedIndexChanged); + // + // grassSwarmComboBox + // + this.grassSwarmComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.grassSwarmComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.grassSwarmComboBox.FormattingEnabled = true; + this.grassSwarmComboBox.Location = new System.Drawing.Point(48, 19); + this.grassSwarmComboBox.Name = "grassSwarmComboBox"; + this.grassSwarmComboBox.Size = new System.Drawing.Size(121, 21); + this.grassSwarmComboBox.TabIndex = 44; + this.grassSwarmComboBox.SelectedIndexChanged += new System.EventHandler(this.grassSwarmComboBox_SelectedIndexChanged); + // // nightOneSecondComboBox // this.nightOneSecondComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1169,24 +2266,6 @@ this.dayTwentyFirstComboBox.TabIndex = 198; this.dayTwentyFirstComboBox.SelectedIndexChanged += new System.EventHandler(this.dayTwentyFirstComboBox_SelectedIndexChanged); // - // oneSecondLevelUpDown - // - this.oneSecondLevelUpDown.Location = new System.Drawing.Point(418, 365); - this.oneSecondLevelUpDown.Name = "oneSecondLevelUpDown"; - this.oneSecondLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.oneSecondLevelUpDown.TabIndex = 197; - this.oneSecondLevelUpDown.ValueChanged += new System.EventHandler(this.oneSecondLevelUpDown_ValueChanged); - // - // label79 - // - this.label79.AutoSize = true; - this.label79.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label79.Location = new System.Drawing.Point(10, 367); - this.label79.Name = "label79"; - this.label79.Size = new System.Drawing.Size(21, 13); - this.label79.TabIndex = 196; - this.label79.Text = "1%"; - // // morningOneSecondComboBox // this.morningOneSecondComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1198,24 +2277,6 @@ this.morningOneSecondComboBox.TabIndex = 195; this.morningOneSecondComboBox.SelectedIndexChanged += new System.EventHandler(this.morningOneSecondComboBox_SelectedIndexChanged); // - // oneFirstLevelUpDown - // - this.oneFirstLevelUpDown.Location = new System.Drawing.Point(418, 338); - this.oneFirstLevelUpDown.Name = "oneFirstLevelUpDown"; - this.oneFirstLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.oneFirstLevelUpDown.TabIndex = 194; - this.oneFirstLevelUpDown.ValueChanged += new System.EventHandler(this.oneFirstLevelUpDown_ValueChanged); - // - // label80 - // - this.label80.AutoSize = true; - this.label80.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label80.Location = new System.Drawing.Point(10, 340); - this.label80.Name = "label80"; - this.label80.Size = new System.Drawing.Size(21, 13); - this.label80.TabIndex = 193; - this.label80.Text = "1%"; - // // morningOneFirstComboBox // this.morningOneFirstComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1227,24 +2288,6 @@ this.morningOneFirstComboBox.TabIndex = 192; this.morningOneFirstComboBox.SelectedIndexChanged += new System.EventHandler(this.morningOneFirstComboBox_SelectedIndexChanged); // - // fourSecondLevelUpDown - // - this.fourSecondLevelUpDown.Location = new System.Drawing.Point(418, 311); - this.fourSecondLevelUpDown.Name = "fourSecondLevelUpDown"; - this.fourSecondLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.fourSecondLevelUpDown.TabIndex = 191; - this.fourSecondLevelUpDown.ValueChanged += new System.EventHandler(this.fourSecondLevelUpDown_ValueChanged); - // - // label81 - // - this.label81.AutoSize = true; - this.label81.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label81.Location = new System.Drawing.Point(10, 313); - this.label81.Name = "label81"; - this.label81.Size = new System.Drawing.Size(21, 13); - this.label81.TabIndex = 190; - this.label81.Text = "4%"; - // // morningFourSecondComboBox // this.morningFourSecondComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1256,24 +2299,6 @@ this.morningFourSecondComboBox.TabIndex = 189; this.morningFourSecondComboBox.SelectedIndexChanged += new System.EventHandler(this.morningFourSecondComboBox_SelectedIndexChanged); // - // fourFirstLevelUpDown - // - this.fourFirstLevelUpDown.Location = new System.Drawing.Point(418, 284); - this.fourFirstLevelUpDown.Name = "fourFirstLevelUpDown"; - this.fourFirstLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.fourFirstLevelUpDown.TabIndex = 188; - this.fourFirstLevelUpDown.ValueChanged += new System.EventHandler(this.fourFirstLevelUpDown_ValueChanged); - // - // label82 - // - this.label82.AutoSize = true; - this.label82.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label82.Location = new System.Drawing.Point(10, 286); - this.label82.Name = "label82"; - this.label82.Size = new System.Drawing.Size(21, 13); - this.label82.TabIndex = 187; - this.label82.Text = "4%"; - // // morningFourFirstComboBox // this.morningFourFirstComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1285,24 +2310,6 @@ this.morningFourFirstComboBox.TabIndex = 186; this.morningFourFirstComboBox.SelectedIndexChanged += new System.EventHandler(this.morningFourFirstComboBox_SelectedIndexChanged); // - // fiveSecondLevelUpDown - // - this.fiveSecondLevelUpDown.Location = new System.Drawing.Point(418, 257); - this.fiveSecondLevelUpDown.Name = "fiveSecondLevelUpDown"; - this.fiveSecondLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.fiveSecondLevelUpDown.TabIndex = 185; - this.fiveSecondLevelUpDown.ValueChanged += new System.EventHandler(this.fiveSecondLevelUpDown_ValueChanged); - // - // label83 - // - this.label83.AutoSize = true; - this.label83.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label83.Location = new System.Drawing.Point(10, 259); - this.label83.Name = "label83"; - this.label83.Size = new System.Drawing.Size(21, 13); - this.label83.TabIndex = 184; - this.label83.Text = "5%"; - // // morningFiveSecondComboBox // this.morningFiveSecondComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1314,24 +2321,6 @@ this.morningFiveSecondComboBox.TabIndex = 183; this.morningFiveSecondComboBox.SelectedIndexChanged += new System.EventHandler(this.morningFiveSecondComboBox_SelectedIndexChanged); // - // fiveFirstLevelUpDown - // - this.fiveFirstLevelUpDown.Location = new System.Drawing.Point(418, 230); - this.fiveFirstLevelUpDown.Name = "fiveFirstLevelUpDown"; - this.fiveFirstLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.fiveFirstLevelUpDown.TabIndex = 182; - this.fiveFirstLevelUpDown.ValueChanged += new System.EventHandler(this.fiveFirstLevelUpDown_ValueChanged); - // - // label84 - // - this.label84.AutoSize = true; - this.label84.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label84.Location = new System.Drawing.Point(10, 232); - this.label84.Name = "label84"; - this.label84.Size = new System.Drawing.Size(21, 13); - this.label84.TabIndex = 181; - this.label84.Text = "5%"; - // // morningFiveFirstComboBox // this.morningFiveFirstComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1343,24 +2332,6 @@ this.morningFiveFirstComboBox.TabIndex = 180; this.morningFiveFirstComboBox.SelectedIndexChanged += new System.EventHandler(this.morningFiveFirstComboBox_SelectedIndexChanged); // - // tenFourthLevelUpDown - // - this.tenFourthLevelUpDown.Location = new System.Drawing.Point(418, 203); - this.tenFourthLevelUpDown.Name = "tenFourthLevelUpDown"; - this.tenFourthLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.tenFourthLevelUpDown.TabIndex = 179; - this.tenFourthLevelUpDown.ValueChanged += new System.EventHandler(this.tenFourthLevelUpDown_ValueChanged); - // - // label85 - // - this.label85.AutoSize = true; - this.label85.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label85.Location = new System.Drawing.Point(4, 205); - this.label85.Name = "label85"; - this.label85.Size = new System.Drawing.Size(27, 13); - this.label85.TabIndex = 178; - this.label85.Text = "10%"; - // // morningTenFourthComboBox // this.morningTenFourthComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1372,24 +2343,6 @@ this.morningTenFourthComboBox.TabIndex = 177; this.morningTenFourthComboBox.SelectedIndexChanged += new System.EventHandler(this.morningTenFourthComboBox_SelectedIndexChanged); // - // tenThirdLevelUpDown - // - this.tenThirdLevelUpDown.Location = new System.Drawing.Point(418, 176); - this.tenThirdLevelUpDown.Name = "tenThirdLevelUpDown"; - this.tenThirdLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.tenThirdLevelUpDown.TabIndex = 176; - this.tenThirdLevelUpDown.ValueChanged += new System.EventHandler(this.tenThirdLevelUpDown_ValueChanged); - // - // label86 - // - this.label86.AutoSize = true; - this.label86.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label86.Location = new System.Drawing.Point(4, 178); - this.label86.Name = "label86"; - this.label86.Size = new System.Drawing.Size(27, 13); - this.label86.TabIndex = 175; - this.label86.Text = "10%"; - // // morningTenThirdComboBox // this.morningTenThirdComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1401,24 +2354,6 @@ this.morningTenThirdComboBox.TabIndex = 174; this.morningTenThirdComboBox.SelectedIndexChanged += new System.EventHandler(this.morningTenThirdComboBox_SelectedIndexChanged); // - // tenSecondLevelUpDown - // - this.tenSecondLevelUpDown.Location = new System.Drawing.Point(418, 149); - this.tenSecondLevelUpDown.Name = "tenSecondLevelUpDown"; - this.tenSecondLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.tenSecondLevelUpDown.TabIndex = 173; - this.tenSecondLevelUpDown.ValueChanged += new System.EventHandler(this.tenSecondLevelUpDown_ValueChanged); - // - // label87 - // - this.label87.AutoSize = true; - this.label87.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label87.Location = new System.Drawing.Point(4, 151); - this.label87.Name = "label87"; - this.label87.Size = new System.Drawing.Size(27, 13); - this.label87.TabIndex = 172; - this.label87.Text = "10%"; - // // morningTenSecondComboBox // this.morningTenSecondComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1430,24 +2365,6 @@ this.morningTenSecondComboBox.TabIndex = 171; this.morningTenSecondComboBox.SelectedIndexChanged += new System.EventHandler(this.morningTenSecondComboBox_SelectedIndexChanged); // - // tenFirstLevelUpDown - // - this.tenFirstLevelUpDown.Location = new System.Drawing.Point(418, 122); - this.tenFirstLevelUpDown.Name = "tenFirstLevelUpDown"; - this.tenFirstLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.tenFirstLevelUpDown.TabIndex = 170; - this.tenFirstLevelUpDown.ValueChanged += new System.EventHandler(this.tenFirstLevelUpDown_ValueChanged); - // - // label88 - // - this.label88.AutoSize = true; - this.label88.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label88.Location = new System.Drawing.Point(4, 124); - this.label88.Name = "label88"; - this.label88.Size = new System.Drawing.Size(27, 13); - this.label88.TabIndex = 169; - this.label88.Text = "10%"; - // // morningTenFirstComboBox // this.morningTenFirstComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1459,24 +2376,6 @@ this.morningTenFirstComboBox.TabIndex = 168; this.morningTenFirstComboBox.SelectedIndexChanged += new System.EventHandler(this.morningTenFirstComboBox_SelectedIndexChanged); // - // twentySecondLevelUpDown - // - this.twentySecondLevelUpDown.Location = new System.Drawing.Point(418, 95); - this.twentySecondLevelUpDown.Name = "twentySecondLevelUpDown"; - this.twentySecondLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.twentySecondLevelUpDown.TabIndex = 167; - this.twentySecondLevelUpDown.ValueChanged += new System.EventHandler(this.twentySecondLevelUpDown_ValueChanged); - // - // label89 - // - this.label89.AutoSize = true; - this.label89.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label89.Location = new System.Drawing.Point(4, 97); - this.label89.Name = "label89"; - this.label89.Size = new System.Drawing.Size(27, 13); - this.label89.TabIndex = 166; - this.label89.Text = "20%"; - // // morningTwentySecondComboBox // this.morningTwentySecondComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1488,24 +2387,6 @@ this.morningTwentySecondComboBox.TabIndex = 165; this.morningTwentySecondComboBox.SelectedIndexChanged += new System.EventHandler(this.morningTwentySecondComboBox_SelectedIndexChanged); // - // twentyFirstLevelUpDown - // - this.twentyFirstLevelUpDown.Location = new System.Drawing.Point(418, 68); - this.twentyFirstLevelUpDown.Name = "twentyFirstLevelUpDown"; - this.twentyFirstLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.twentyFirstLevelUpDown.TabIndex = 164; - this.twentyFirstLevelUpDown.ValueChanged += new System.EventHandler(this.twentyFirstLevelUpDown_ValueChanged); - // - // label90 - // - this.label90.AutoSize = true; - this.label90.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label90.Location = new System.Drawing.Point(4, 70); - this.label90.Name = "label90"; - this.label90.Size = new System.Drawing.Size(27, 13); - this.label90.TabIndex = 163; - this.label90.Text = "20%"; - // // morningTwentyFirstComboBox // this.morningTwentyFirstComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1517,161 +2398,6 @@ this.morningTwentyFirstComboBox.TabIndex = 162; this.morningTwentyFirstComboBox.SelectedIndexChanged += new System.EventHandler(this.morningTwentyFirstComboBox_SelectedIndexChanged); // - // waterTabPage - // - this.waterTabPage.Controls.Add(this.surfPicture); - this.waterTabPage.Controls.Add(this.pictureBox7); - this.waterTabPage.Controls.Add(this.pictureBox6); - this.waterTabPage.Controls.Add(this.pictureBox5); - this.waterTabPage.Controls.Add(this.superRodGroupBox); - this.waterTabPage.Controls.Add(this.goodRodGroupBox); - this.waterTabPage.Controls.Add(this.oldRodGroupBox); - this.waterTabPage.Controls.Add(this.surfGroupBox); - this.waterTabPage.Location = new System.Drawing.Point(4, 22); - this.waterTabPage.Name = "waterTabPage"; - this.waterTabPage.Padding = new System.Windows.Forms.Padding(3); - this.waterTabPage.Size = new System.Drawing.Size(734, 464); - this.waterTabPage.TabIndex = 1; - this.waterTabPage.Text = "Water"; - this.waterTabPage.UseVisualStyleBackColor = true; - // - // surfPicture - // - this.surfPicture.Image = global::DSPRE.Properties.Resources.SurfIcon; - this.surfPicture.Location = new System.Drawing.Point(67, -1); - this.surfPicture.Name = "surfPicture"; - this.surfPicture.Size = new System.Drawing.Size(42, 42); - this.surfPicture.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.surfPicture.TabIndex = 200; - this.surfPicture.TabStop = false; - // - // pictureBox7 - // - this.pictureBox7.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox7.Image"))); - this.pictureBox7.Location = new System.Drawing.Point(452, 232); - this.pictureBox7.Name = "pictureBox7"; - this.pictureBox7.Size = new System.Drawing.Size(25, 26); - this.pictureBox7.TabIndex = 196; - this.pictureBox7.TabStop = false; - // - // pictureBox6 - // - this.pictureBox6.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox6.Image"))); - this.pictureBox6.Location = new System.Drawing.Point(79, 230); - this.pictureBox6.Name = "pictureBox6"; - this.pictureBox6.Size = new System.Drawing.Size(25, 26); - this.pictureBox6.TabIndex = 195; - this.pictureBox6.TabStop = false; - // - // pictureBox5 - // - this.pictureBox5.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox5.Image"))); - this.pictureBox5.Location = new System.Drawing.Point(442, 8); - this.pictureBox5.Name = "pictureBox5"; - this.pictureBox5.Size = new System.Drawing.Size(25, 26); - this.pictureBox5.TabIndex = 194; - this.pictureBox5.TabStop = false; - // - // superRodGroupBox - // - this.superRodGroupBox.Controls.Add(this.label59); - this.superRodGroupBox.Controls.Add(this.label60); - this.superRodGroupBox.Controls.Add(this.superRodRateUpDown); - this.superRodGroupBox.Controls.Add(this.label69); - this.superRodGroupBox.Controls.Add(this.superRodOneMaxLevelUpDown); - this.superRodGroupBox.Controls.Add(this.superRodOneMinLevelUpDown); - this.superRodGroupBox.Controls.Add(this.label70); - this.superRodGroupBox.Controls.Add(this.superRodOneComboBox); - this.superRodGroupBox.Controls.Add(this.superRodFourMaxLevelUpDown); - this.superRodGroupBox.Controls.Add(this.superRodFourMinLevelUpDown); - this.superRodGroupBox.Controls.Add(this.label71); - this.superRodGroupBox.Controls.Add(this.superRodFourComboBox); - this.superRodGroupBox.Controls.Add(this.superRodFifteenMaxLevelUpDown); - this.superRodGroupBox.Controls.Add(this.superRodFifteenMinLevelUpDown); - this.superRodGroupBox.Controls.Add(this.label72); - this.superRodGroupBox.Controls.Add(this.superRodFifteenComboBox); - this.superRodGroupBox.Controls.Add(this.superRodSecondFortyMaxLevelUpDown); - this.superRodGroupBox.Controls.Add(this.superRodSecondFortyMinLevelUpDown); - this.superRodGroupBox.Controls.Add(this.label73); - this.superRodGroupBox.Controls.Add(this.superRodSecondFortyComboBox); - this.superRodGroupBox.Controls.Add(this.superRodFirstFortyMaxLevelUpDown); - this.superRodGroupBox.Controls.Add(this.superRodFirstFortyMinLevelUpDown); - this.superRodGroupBox.Controls.Add(this.label74); - this.superRodGroupBox.Controls.Add(this.superRodFirstFortyComboBox); - this.superRodGroupBox.Location = new System.Drawing.Point(384, 234); - this.superRodGroupBox.Name = "superRodGroupBox"; - this.superRodGroupBox.Size = new System.Drawing.Size(325, 210); - this.superRodGroupBox.TabIndex = 44; - this.superRodGroupBox.TabStop = false; - this.superRodGroupBox.Text = "Super Rod"; - // - // label59 - // - this.label59.AutoSize = true; - this.label59.Location = new System.Drawing.Point(264, 50); - this.label59.Name = "label59"; - this.label59.Size = new System.Drawing.Size(47, 13); - this.label59.TabIndex = 41; - this.label59.Text = "Max Lvl."; - // - // label60 - // - this.label60.AutoSize = true; - this.label60.Location = new System.Drawing.Point(214, 50); - this.label60.Name = "label60"; - this.label60.Size = new System.Drawing.Size(44, 13); - this.label60.TabIndex = 40; - this.label60.Text = "Min Lvl."; - // - // superRodRateUpDown - // - this.superRodRateUpDown.Location = new System.Drawing.Point(265, 17); - this.superRodRateUpDown.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.superRodRateUpDown.Name = "superRodRateUpDown"; - this.superRodRateUpDown.Size = new System.Drawing.Size(42, 20); - this.superRodRateUpDown.TabIndex = 39; - this.superRodRateUpDown.ValueChanged += new System.EventHandler(this.superRodRateUpDown_ValueChanged); - // - // label69 - // - this.label69.AutoSize = true; - this.label69.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label69.Location = new System.Drawing.Point(229, 19); - this.label69.Name = "label69"; - this.label69.Size = new System.Drawing.Size(30, 13); - this.label69.TabIndex = 38; - this.label69.Text = "Rate"; - // - // superRodOneMaxLevelUpDown - // - this.superRodOneMaxLevelUpDown.Location = new System.Drawing.Point(265, 179); - this.superRodOneMaxLevelUpDown.Name = "superRodOneMaxLevelUpDown"; - this.superRodOneMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.superRodOneMaxLevelUpDown.TabIndex = 22; - this.superRodOneMaxLevelUpDown.ValueChanged += new System.EventHandler(this.superRodOneMaxLevelUpDown_ValueChanged); - // - // superRodOneMinLevelUpDown - // - this.superRodOneMinLevelUpDown.Location = new System.Drawing.Point(217, 179); - this.superRodOneMinLevelUpDown.Name = "superRodOneMinLevelUpDown"; - this.superRodOneMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.superRodOneMinLevelUpDown.TabIndex = 21; - this.superRodOneMinLevelUpDown.ValueChanged += new System.EventHandler(this.superRodOneMinLevelUpDown_ValueChanged); - // - // label70 - // - this.label70.AutoSize = true; - this.label70.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label70.Location = new System.Drawing.Point(18, 181); - this.label70.Name = "label70"; - this.label70.Size = new System.Drawing.Size(21, 13); - this.label70.TabIndex = 20; - this.label70.Text = "1%"; - // // superRodOneComboBox // this.superRodOneComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1683,32 +2409,6 @@ this.superRodOneComboBox.TabIndex = 19; this.superRodOneComboBox.SelectedIndexChanged += new System.EventHandler(this.superRodOneComboBox_SelectedIndexChanged); // - // superRodFourMaxLevelUpDown - // - this.superRodFourMaxLevelUpDown.Location = new System.Drawing.Point(265, 152); - this.superRodFourMaxLevelUpDown.Name = "superRodFourMaxLevelUpDown"; - this.superRodFourMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.superRodFourMaxLevelUpDown.TabIndex = 18; - this.superRodFourMaxLevelUpDown.ValueChanged += new System.EventHandler(this.superRodFourMaxLevelUpDown_ValueChanged); - // - // superRodFourMinLevelUpDown - // - this.superRodFourMinLevelUpDown.Location = new System.Drawing.Point(217, 152); - this.superRodFourMinLevelUpDown.Name = "superRodFourMinLevelUpDown"; - this.superRodFourMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.superRodFourMinLevelUpDown.TabIndex = 17; - this.superRodFourMinLevelUpDown.ValueChanged += new System.EventHandler(this.superRodFourMinLevelUpDown_ValueChanged); - // - // label71 - // - this.label71.AutoSize = true; - this.label71.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label71.Location = new System.Drawing.Point(18, 154); - this.label71.Name = "label71"; - this.label71.Size = new System.Drawing.Size(21, 13); - this.label71.TabIndex = 16; - this.label71.Text = "4%"; - // // superRodFourComboBox // this.superRodFourComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1720,32 +2420,6 @@ this.superRodFourComboBox.TabIndex = 15; this.superRodFourComboBox.SelectedIndexChanged += new System.EventHandler(this.superRodFourComboBox_SelectedIndexChanged); // - // superRodFifteenMaxLevelUpDown - // - this.superRodFifteenMaxLevelUpDown.Location = new System.Drawing.Point(265, 125); - this.superRodFifteenMaxLevelUpDown.Name = "superRodFifteenMaxLevelUpDown"; - this.superRodFifteenMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.superRodFifteenMaxLevelUpDown.TabIndex = 14; - this.superRodFifteenMaxLevelUpDown.ValueChanged += new System.EventHandler(this.superRodFifteenMaxLevelUpDown_ValueChanged); - // - // superRodFifteenMinLevelUpDown - // - this.superRodFifteenMinLevelUpDown.Location = new System.Drawing.Point(217, 125); - this.superRodFifteenMinLevelUpDown.Name = "superRodFifteenMinLevelUpDown"; - this.superRodFifteenMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.superRodFifteenMinLevelUpDown.TabIndex = 13; - this.superRodFifteenMinLevelUpDown.ValueChanged += new System.EventHandler(this.superRodFifteenMinLevelUpDown_ValueChanged); - // - // label72 - // - this.label72.AutoSize = true; - this.label72.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label72.Location = new System.Drawing.Point(12, 127); - this.label72.Name = "label72"; - this.label72.Size = new System.Drawing.Size(27, 13); - this.label72.TabIndex = 12; - this.label72.Text = "15%"; - // // superRodFifteenComboBox // this.superRodFifteenComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1757,32 +2431,6 @@ this.superRodFifteenComboBox.TabIndex = 11; this.superRodFifteenComboBox.SelectedIndexChanged += new System.EventHandler(this.superRodFifteenComboBox_SelectedIndexChanged); // - // superRodSecondFortyMaxLevelUpDown - // - this.superRodSecondFortyMaxLevelUpDown.Location = new System.Drawing.Point(265, 98); - this.superRodSecondFortyMaxLevelUpDown.Name = "superRodSecondFortyMaxLevelUpDown"; - this.superRodSecondFortyMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.superRodSecondFortyMaxLevelUpDown.TabIndex = 10; - this.superRodSecondFortyMaxLevelUpDown.ValueChanged += new System.EventHandler(this.superRodSecondFortyMaxLevelUpDown_ValueChanged); - // - // superRodSecondFortyMinLevelUpDown - // - this.superRodSecondFortyMinLevelUpDown.Location = new System.Drawing.Point(217, 98); - this.superRodSecondFortyMinLevelUpDown.Name = "superRodSecondFortyMinLevelUpDown"; - this.superRodSecondFortyMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.superRodSecondFortyMinLevelUpDown.TabIndex = 9; - this.superRodSecondFortyMinLevelUpDown.ValueChanged += new System.EventHandler(this.superRodSecondFortyMinLevelUpDown_ValueChanged); - // - // label73 - // - this.label73.AutoSize = true; - this.label73.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label73.Location = new System.Drawing.Point(12, 100); - this.label73.Name = "label73"; - this.label73.Size = new System.Drawing.Size(27, 13); - this.label73.TabIndex = 8; - this.label73.Text = "40%"; - // // superRodSecondFortyComboBox // this.superRodSecondFortyComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1794,32 +2442,6 @@ this.superRodSecondFortyComboBox.TabIndex = 7; this.superRodSecondFortyComboBox.SelectedIndexChanged += new System.EventHandler(this.superRodSecondFortyComboBox_SelectedIndexChanged); // - // superRodFirstFortyMaxLevelUpDown - // - this.superRodFirstFortyMaxLevelUpDown.Location = new System.Drawing.Point(265, 71); - this.superRodFirstFortyMaxLevelUpDown.Name = "superRodFirstFortyMaxLevelUpDown"; - this.superRodFirstFortyMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.superRodFirstFortyMaxLevelUpDown.TabIndex = 6; - this.superRodFirstFortyMaxLevelUpDown.ValueChanged += new System.EventHandler(this.superRodFirstFortyMaxLevelUpDown_ValueChanged); - // - // superRodFirstFortyMinLevelUpDown - // - this.superRodFirstFortyMinLevelUpDown.Location = new System.Drawing.Point(217, 71); - this.superRodFirstFortyMinLevelUpDown.Name = "superRodFirstFortyMinLevelUpDown"; - this.superRodFirstFortyMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.superRodFirstFortyMinLevelUpDown.TabIndex = 5; - this.superRodFirstFortyMinLevelUpDown.ValueChanged += new System.EventHandler(this.superRodFirstFortyMinLevelUpDown_ValueChanged); - // - // label74 - // - this.label74.AutoSize = true; - this.label74.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label74.Location = new System.Drawing.Point(12, 73); - this.label74.Name = "label74"; - this.label74.Size = new System.Drawing.Size(27, 13); - this.label74.TabIndex = 4; - this.label74.Text = "40%"; - // // superRodFirstFortyComboBox // this.superRodFirstFortyComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1831,106 +2453,6 @@ this.superRodFirstFortyComboBox.TabIndex = 3; this.superRodFirstFortyComboBox.SelectedIndexChanged += new System.EventHandler(this.superRodFirstFortyComboBox_SelectedIndexChanged); // - // goodRodGroupBox - // - this.goodRodGroupBox.Controls.Add(this.label51); - this.goodRodGroupBox.Controls.Add(this.label52); - this.goodRodGroupBox.Controls.Add(this.goodRodRateUpDown); - this.goodRodGroupBox.Controls.Add(this.label53); - this.goodRodGroupBox.Controls.Add(this.goodRodOneMaxLevelUpDown); - this.goodRodGroupBox.Controls.Add(this.goodRodOneMinLevelUpDown); - this.goodRodGroupBox.Controls.Add(this.label54); - this.goodRodGroupBox.Controls.Add(this.goodRodOneComboBox); - this.goodRodGroupBox.Controls.Add(this.goodRodFourMaxLevelUpDown); - this.goodRodGroupBox.Controls.Add(this.goodRodFourMinLevelUpDown); - this.goodRodGroupBox.Controls.Add(this.label55); - this.goodRodGroupBox.Controls.Add(this.goodRodFourComboBox); - this.goodRodGroupBox.Controls.Add(this.goodRodFifteenMaxLevelUpDown); - this.goodRodGroupBox.Controls.Add(this.goodRodFifteenMinLevelUpDown); - this.goodRodGroupBox.Controls.Add(this.label56); - this.goodRodGroupBox.Controls.Add(this.goodRodFifteenComboBox); - this.goodRodGroupBox.Controls.Add(this.goodRodSecondFortyMaxLevelUpDown); - this.goodRodGroupBox.Controls.Add(this.goodRodSecondFortyMinLevelUpDown); - this.goodRodGroupBox.Controls.Add(this.label57); - this.goodRodGroupBox.Controls.Add(this.goodRodSecondFortyComboBox); - this.goodRodGroupBox.Controls.Add(this.goodRodFirstFortyMaxLevelUpDown); - this.goodRodGroupBox.Controls.Add(this.goodRodFirstFortyMinLevelUpDown); - this.goodRodGroupBox.Controls.Add(this.label58); - this.goodRodGroupBox.Controls.Add(this.goodRodFirstFortyComboBox); - this.goodRodGroupBox.Location = new System.Drawing.Point(17, 234); - this.goodRodGroupBox.Name = "goodRodGroupBox"; - this.goodRodGroupBox.Size = new System.Drawing.Size(325, 210); - this.goodRodGroupBox.TabIndex = 43; - this.goodRodGroupBox.TabStop = false; - this.goodRodGroupBox.Text = "Good Rod"; - // - // label51 - // - this.label51.AutoSize = true; - this.label51.Location = new System.Drawing.Point(264, 50); - this.label51.Name = "label51"; - this.label51.Size = new System.Drawing.Size(47, 13); - this.label51.TabIndex = 41; - this.label51.Text = "Max Lvl."; - // - // label52 - // - this.label52.AutoSize = true; - this.label52.Location = new System.Drawing.Point(214, 50); - this.label52.Name = "label52"; - this.label52.Size = new System.Drawing.Size(44, 13); - this.label52.TabIndex = 40; - this.label52.Text = "Min Lvl."; - // - // goodRodRateUpDown - // - this.goodRodRateUpDown.Location = new System.Drawing.Point(265, 17); - this.goodRodRateUpDown.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.goodRodRateUpDown.Name = "goodRodRateUpDown"; - this.goodRodRateUpDown.Size = new System.Drawing.Size(42, 20); - this.goodRodRateUpDown.TabIndex = 39; - this.goodRodRateUpDown.ValueChanged += new System.EventHandler(this.goodRodRateUpDown_ValueChanged); - // - // label53 - // - this.label53.AutoSize = true; - this.label53.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label53.Location = new System.Drawing.Point(229, 19); - this.label53.Name = "label53"; - this.label53.Size = new System.Drawing.Size(30, 13); - this.label53.TabIndex = 38; - this.label53.Text = "Rate"; - // - // goodRodOneMaxLevelUpDown - // - this.goodRodOneMaxLevelUpDown.Location = new System.Drawing.Point(265, 179); - this.goodRodOneMaxLevelUpDown.Name = "goodRodOneMaxLevelUpDown"; - this.goodRodOneMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.goodRodOneMaxLevelUpDown.TabIndex = 22; - this.goodRodOneMaxLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodOneMaxLevelUpDown_ValueChanged); - // - // goodRodOneMinLevelUpDown - // - this.goodRodOneMinLevelUpDown.Location = new System.Drawing.Point(217, 179); - this.goodRodOneMinLevelUpDown.Name = "goodRodOneMinLevelUpDown"; - this.goodRodOneMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.goodRodOneMinLevelUpDown.TabIndex = 21; - this.goodRodOneMinLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodOneMinLevelUpDown_ValueChanged); - // - // label54 - // - this.label54.AutoSize = true; - this.label54.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label54.Location = new System.Drawing.Point(18, 181); - this.label54.Name = "label54"; - this.label54.Size = new System.Drawing.Size(21, 13); - this.label54.TabIndex = 20; - this.label54.Text = "1%"; - // // goodRodOneComboBox // this.goodRodOneComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1942,32 +2464,6 @@ this.goodRodOneComboBox.TabIndex = 19; this.goodRodOneComboBox.SelectedIndexChanged += new System.EventHandler(this.goodRodOneComboBox_SelectedIndexChanged); // - // goodRodFourMaxLevelUpDown - // - this.goodRodFourMaxLevelUpDown.Location = new System.Drawing.Point(265, 152); - this.goodRodFourMaxLevelUpDown.Name = "goodRodFourMaxLevelUpDown"; - this.goodRodFourMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.goodRodFourMaxLevelUpDown.TabIndex = 18; - this.goodRodFourMaxLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodFourMaxLevelUpDown_ValueChanged); - // - // goodRodFourMinLevelUpDown - // - this.goodRodFourMinLevelUpDown.Location = new System.Drawing.Point(217, 152); - this.goodRodFourMinLevelUpDown.Name = "goodRodFourMinLevelUpDown"; - this.goodRodFourMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.goodRodFourMinLevelUpDown.TabIndex = 17; - this.goodRodFourMinLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodFourMinLevelUpDown_ValueChanged); - // - // label55 - // - this.label55.AutoSize = true; - this.label55.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label55.Location = new System.Drawing.Point(18, 154); - this.label55.Name = "label55"; - this.label55.Size = new System.Drawing.Size(21, 13); - this.label55.TabIndex = 16; - this.label55.Text = "4%"; - // // goodRodFourComboBox // this.goodRodFourComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1979,32 +2475,6 @@ this.goodRodFourComboBox.TabIndex = 15; this.goodRodFourComboBox.SelectedIndexChanged += new System.EventHandler(this.goodRodFourComboBox_SelectedIndexChanged); // - // goodRodFifteenMaxLevelUpDown - // - this.goodRodFifteenMaxLevelUpDown.Location = new System.Drawing.Point(265, 125); - this.goodRodFifteenMaxLevelUpDown.Name = "goodRodFifteenMaxLevelUpDown"; - this.goodRodFifteenMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.goodRodFifteenMaxLevelUpDown.TabIndex = 14; - this.goodRodFifteenMaxLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodFifteenMaxLevelUpDown_ValueChanged); - // - // goodRodFifteenMinLevelUpDown - // - this.goodRodFifteenMinLevelUpDown.Location = new System.Drawing.Point(217, 125); - this.goodRodFifteenMinLevelUpDown.Name = "goodRodFifteenMinLevelUpDown"; - this.goodRodFifteenMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.goodRodFifteenMinLevelUpDown.TabIndex = 13; - this.goodRodFifteenMinLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodFifteenMinLevelUpDown_ValueChanged); - // - // label56 - // - this.label56.AutoSize = true; - this.label56.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label56.Location = new System.Drawing.Point(12, 127); - this.label56.Name = "label56"; - this.label56.Size = new System.Drawing.Size(27, 13); - this.label56.TabIndex = 12; - this.label56.Text = "15%"; - // // goodRodFifteenComboBox // this.goodRodFifteenComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -2016,32 +2486,6 @@ this.goodRodFifteenComboBox.TabIndex = 11; this.goodRodFifteenComboBox.SelectedIndexChanged += new System.EventHandler(this.goodRodFifteenComboBox_SelectedIndexChanged); // - // goodRodSecondFortyMaxLevelUpDown - // - this.goodRodSecondFortyMaxLevelUpDown.Location = new System.Drawing.Point(265, 98); - this.goodRodSecondFortyMaxLevelUpDown.Name = "goodRodSecondFortyMaxLevelUpDown"; - this.goodRodSecondFortyMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.goodRodSecondFortyMaxLevelUpDown.TabIndex = 10; - this.goodRodSecondFortyMaxLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodSecondFortyMaxLevelUpDown_ValueChanged); - // - // goodRodSecondFortyMinLevelUpDown - // - this.goodRodSecondFortyMinLevelUpDown.Location = new System.Drawing.Point(217, 98); - this.goodRodSecondFortyMinLevelUpDown.Name = "goodRodSecondFortyMinLevelUpDown"; - this.goodRodSecondFortyMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.goodRodSecondFortyMinLevelUpDown.TabIndex = 9; - this.goodRodSecondFortyMinLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodSecondFortyMinLevelUpDown_ValueChanged); - // - // label57 - // - this.label57.AutoSize = true; - this.label57.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label57.Location = new System.Drawing.Point(12, 100); - this.label57.Name = "label57"; - this.label57.Size = new System.Drawing.Size(27, 13); - this.label57.TabIndex = 8; - this.label57.Text = "40%"; - // // goodRodSecondFortyComboBox // this.goodRodSecondFortyComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -2053,32 +2497,6 @@ this.goodRodSecondFortyComboBox.TabIndex = 7; this.goodRodSecondFortyComboBox.SelectedIndexChanged += new System.EventHandler(this.goodRodSecondFortyComboBox_SelectedIndexChanged); // - // goodRodFirstFortyMaxLevelUpDown - // - this.goodRodFirstFortyMaxLevelUpDown.Location = new System.Drawing.Point(265, 71); - this.goodRodFirstFortyMaxLevelUpDown.Name = "goodRodFirstFortyMaxLevelUpDown"; - this.goodRodFirstFortyMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.goodRodFirstFortyMaxLevelUpDown.TabIndex = 6; - this.goodRodFirstFortyMaxLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodFirstFortyMaxLevelUpDown_ValueChanged); - // - // goodRodFirstFortyMinLevelUpDown - // - this.goodRodFirstFortyMinLevelUpDown.Location = new System.Drawing.Point(217, 71); - this.goodRodFirstFortyMinLevelUpDown.Name = "goodRodFirstFortyMinLevelUpDown"; - this.goodRodFirstFortyMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.goodRodFirstFortyMinLevelUpDown.TabIndex = 5; - this.goodRodFirstFortyMinLevelUpDown.ValueChanged += new System.EventHandler(this.goodRodFirstFortyMinLevelUpDown_ValueChanged); - // - // label58 - // - this.label58.AutoSize = true; - this.label58.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label58.Location = new System.Drawing.Point(12, 73); - this.label58.Name = "label58"; - this.label58.Size = new System.Drawing.Size(27, 13); - this.label58.TabIndex = 4; - this.label58.Text = "40%"; - // // goodRodFirstFortyComboBox // this.goodRodFirstFortyComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -2090,106 +2508,6 @@ this.goodRodFirstFortyComboBox.TabIndex = 3; this.goodRodFirstFortyComboBox.SelectedIndexChanged += new System.EventHandler(this.goodRodFirstFortyComboBox_SelectedIndexChanged); // - // oldRodGroupBox - // - this.oldRodGroupBox.Controls.Add(this.label43); - this.oldRodGroupBox.Controls.Add(this.label44); - this.oldRodGroupBox.Controls.Add(this.oldRodRateUpDown); - this.oldRodGroupBox.Controls.Add(this.label45); - this.oldRodGroupBox.Controls.Add(this.oldRodOneMaxLevelUpDown); - this.oldRodGroupBox.Controls.Add(this.oldRodOneMinLevelUpDown); - this.oldRodGroupBox.Controls.Add(this.label46); - this.oldRodGroupBox.Controls.Add(this.oldRodOneComboBox); - this.oldRodGroupBox.Controls.Add(this.oldRodFourMaxLevelUpDown); - this.oldRodGroupBox.Controls.Add(this.oldRodFourMinLevelUpDown); - this.oldRodGroupBox.Controls.Add(this.label47); - this.oldRodGroupBox.Controls.Add(this.oldRodFourComboBox); - this.oldRodGroupBox.Controls.Add(this.oldRodFiveMaxLevelUpDown); - this.oldRodGroupBox.Controls.Add(this.oldRodFiveMinLevelUpDown); - this.oldRodGroupBox.Controls.Add(this.label48); - this.oldRodGroupBox.Controls.Add(this.oldRodFiveComboBox); - this.oldRodGroupBox.Controls.Add(this.oldRodThirtyMaxLevelUpDown); - this.oldRodGroupBox.Controls.Add(this.oldRodThirtyMinLevelUpDown); - this.oldRodGroupBox.Controls.Add(this.label49); - this.oldRodGroupBox.Controls.Add(this.oldRodThirtyComboBox); - this.oldRodGroupBox.Controls.Add(this.oldRodSixtyMaxLevelUpDown); - this.oldRodGroupBox.Controls.Add(this.oldRodSixtyMinLevelUpDown); - this.oldRodGroupBox.Controls.Add(this.label50); - this.oldRodGroupBox.Controls.Add(this.oldRodSixtyComboBox); - this.oldRodGroupBox.Location = new System.Drawing.Point(384, 10); - this.oldRodGroupBox.Name = "oldRodGroupBox"; - this.oldRodGroupBox.Size = new System.Drawing.Size(325, 210); - this.oldRodGroupBox.TabIndex = 42; - this.oldRodGroupBox.TabStop = false; - this.oldRodGroupBox.Text = "Old Rod"; - // - // label43 - // - this.label43.AutoSize = true; - this.label43.Location = new System.Drawing.Point(264, 50); - this.label43.Name = "label43"; - this.label43.Size = new System.Drawing.Size(47, 13); - this.label43.TabIndex = 41; - this.label43.Text = "Max Lvl."; - // - // label44 - // - this.label44.AutoSize = true; - this.label44.Location = new System.Drawing.Point(214, 50); - this.label44.Name = "label44"; - this.label44.Size = new System.Drawing.Size(44, 13); - this.label44.TabIndex = 40; - this.label44.Text = "Min Lvl."; - // - // oldRodRateUpDown - // - this.oldRodRateUpDown.Location = new System.Drawing.Point(265, 17); - this.oldRodRateUpDown.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.oldRodRateUpDown.Name = "oldRodRateUpDown"; - this.oldRodRateUpDown.Size = new System.Drawing.Size(42, 20); - this.oldRodRateUpDown.TabIndex = 39; - this.oldRodRateUpDown.ValueChanged += new System.EventHandler(this.oldRodRateUpDown_ValueChanged); - // - // label45 - // - this.label45.AutoSize = true; - this.label45.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label45.Location = new System.Drawing.Point(229, 19); - this.label45.Name = "label45"; - this.label45.Size = new System.Drawing.Size(30, 13); - this.label45.TabIndex = 38; - this.label45.Text = "Rate"; - // - // oldRodOneMaxLevelUpDown - // - this.oldRodOneMaxLevelUpDown.Location = new System.Drawing.Point(265, 179); - this.oldRodOneMaxLevelUpDown.Name = "oldRodOneMaxLevelUpDown"; - this.oldRodOneMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.oldRodOneMaxLevelUpDown.TabIndex = 22; - this.oldRodOneMaxLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodOneMaxLevelUpDown_ValueChanged); - // - // oldRodOneMinLevelUpDown - // - this.oldRodOneMinLevelUpDown.Location = new System.Drawing.Point(217, 179); - this.oldRodOneMinLevelUpDown.Name = "oldRodOneMinLevelUpDown"; - this.oldRodOneMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.oldRodOneMinLevelUpDown.TabIndex = 21; - this.oldRodOneMinLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodOneMinLevelUpDown_ValueChanged); - // - // label46 - // - this.label46.AutoSize = true; - this.label46.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label46.Location = new System.Drawing.Point(18, 181); - this.label46.Name = "label46"; - this.label46.Size = new System.Drawing.Size(21, 13); - this.label46.TabIndex = 20; - this.label46.Text = "1%"; - // // oldRodOneComboBox // this.oldRodOneComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -2201,32 +2519,6 @@ this.oldRodOneComboBox.TabIndex = 19; this.oldRodOneComboBox.SelectedIndexChanged += new System.EventHandler(this.oldRodOneComboBox_SelectedIndexChanged); // - // oldRodFourMaxLevelUpDown - // - this.oldRodFourMaxLevelUpDown.Location = new System.Drawing.Point(265, 152); - this.oldRodFourMaxLevelUpDown.Name = "oldRodFourMaxLevelUpDown"; - this.oldRodFourMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.oldRodFourMaxLevelUpDown.TabIndex = 18; - this.oldRodFourMaxLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodFourMaxLevelUpDown_ValueChanged); - // - // oldRodFourMinLevelUpDown - // - this.oldRodFourMinLevelUpDown.Location = new System.Drawing.Point(217, 152); - this.oldRodFourMinLevelUpDown.Name = "oldRodFourMinLevelUpDown"; - this.oldRodFourMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.oldRodFourMinLevelUpDown.TabIndex = 17; - this.oldRodFourMinLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodFourMinLevelUpDown_ValueChanged); - // - // label47 - // - this.label47.AutoSize = true; - this.label47.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label47.Location = new System.Drawing.Point(18, 154); - this.label47.Name = "label47"; - this.label47.Size = new System.Drawing.Size(21, 13); - this.label47.TabIndex = 16; - this.label47.Text = "4%"; - // // oldRodFourComboBox // this.oldRodFourComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -2238,32 +2530,6 @@ this.oldRodFourComboBox.TabIndex = 15; this.oldRodFourComboBox.SelectedIndexChanged += new System.EventHandler(this.oldRodFourComboBox_SelectedIndexChanged); // - // oldRodFiveMaxLevelUpDown - // - this.oldRodFiveMaxLevelUpDown.Location = new System.Drawing.Point(265, 125); - this.oldRodFiveMaxLevelUpDown.Name = "oldRodFiveMaxLevelUpDown"; - this.oldRodFiveMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.oldRodFiveMaxLevelUpDown.TabIndex = 14; - this.oldRodFiveMaxLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodFiveMaxLevelUpDown_ValueChanged); - // - // oldRodFiveMinLevelUpDown - // - this.oldRodFiveMinLevelUpDown.Location = new System.Drawing.Point(217, 125); - this.oldRodFiveMinLevelUpDown.Name = "oldRodFiveMinLevelUpDown"; - this.oldRodFiveMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.oldRodFiveMinLevelUpDown.TabIndex = 13; - this.oldRodFiveMinLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodFiveMinLevelUpDown_ValueChanged); - // - // label48 - // - this.label48.AutoSize = true; - this.label48.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label48.Location = new System.Drawing.Point(18, 127); - this.label48.Name = "label48"; - this.label48.Size = new System.Drawing.Size(21, 13); - this.label48.TabIndex = 12; - this.label48.Text = "5%"; - // // oldRodFiveComboBox // this.oldRodFiveComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -2275,32 +2541,6 @@ this.oldRodFiveComboBox.TabIndex = 11; this.oldRodFiveComboBox.SelectedIndexChanged += new System.EventHandler(this.oldRodFiveComboBox_SelectedIndexChanged); // - // oldRodThirtyMaxLevelUpDown - // - this.oldRodThirtyMaxLevelUpDown.Location = new System.Drawing.Point(265, 98); - this.oldRodThirtyMaxLevelUpDown.Name = "oldRodThirtyMaxLevelUpDown"; - this.oldRodThirtyMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.oldRodThirtyMaxLevelUpDown.TabIndex = 10; - this.oldRodThirtyMaxLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodThirtyMaxLevelUpDown_ValueChanged); - // - // oldRodThirtyMinLevelUpDown - // - this.oldRodThirtyMinLevelUpDown.Location = new System.Drawing.Point(217, 98); - this.oldRodThirtyMinLevelUpDown.Name = "oldRodThirtyMinLevelUpDown"; - this.oldRodThirtyMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.oldRodThirtyMinLevelUpDown.TabIndex = 9; - this.oldRodThirtyMinLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodThirtyMinLevelUpDown_ValueChanged); - // - // label49 - // - this.label49.AutoSize = true; - this.label49.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label49.Location = new System.Drawing.Point(12, 100); - this.label49.Name = "label49"; - this.label49.Size = new System.Drawing.Size(27, 13); - this.label49.TabIndex = 8; - this.label49.Text = "30%"; - // // oldRodThirtyComboBox // this.oldRodThirtyComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -2312,32 +2552,6 @@ this.oldRodThirtyComboBox.TabIndex = 7; this.oldRodThirtyComboBox.SelectedIndexChanged += new System.EventHandler(this.oldRodThirtyComboBox_SelectedIndexChanged); // - // oldRodSixtyMaxLevelUpDown - // - this.oldRodSixtyMaxLevelUpDown.Location = new System.Drawing.Point(265, 71); - this.oldRodSixtyMaxLevelUpDown.Name = "oldRodSixtyMaxLevelUpDown"; - this.oldRodSixtyMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.oldRodSixtyMaxLevelUpDown.TabIndex = 6; - this.oldRodSixtyMaxLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodSixtyMaxLevelUpDown_ValueChanged); - // - // oldRodSixtyMinLevelUpDown - // - this.oldRodSixtyMinLevelUpDown.Location = new System.Drawing.Point(217, 71); - this.oldRodSixtyMinLevelUpDown.Name = "oldRodSixtyMinLevelUpDown"; - this.oldRodSixtyMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.oldRodSixtyMinLevelUpDown.TabIndex = 5; - this.oldRodSixtyMinLevelUpDown.ValueChanged += new System.EventHandler(this.oldRodSixtyMinLevelUpDown_ValueChanged); - // - // label50 - // - this.label50.AutoSize = true; - this.label50.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label50.Location = new System.Drawing.Point(12, 73); - this.label50.Name = "label50"; - this.label50.Size = new System.Drawing.Size(27, 13); - this.label50.TabIndex = 4; - this.label50.Text = "60%"; - // // oldRodSixtyComboBox // this.oldRodSixtyComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -2349,106 +2563,6 @@ this.oldRodSixtyComboBox.TabIndex = 3; this.oldRodSixtyComboBox.SelectedIndexChanged += new System.EventHandler(this.oldRodSixtyComboBox_SelectedIndexChanged); // - // surfGroupBox - // - this.surfGroupBox.Controls.Add(this.label68); - this.surfGroupBox.Controls.Add(this.label67); - this.surfGroupBox.Controls.Add(this.surfRateUpDown); - this.surfGroupBox.Controls.Add(this.label61); - this.surfGroupBox.Controls.Add(this.surfOneMaxLevelUpDown); - this.surfGroupBox.Controls.Add(this.surfOneMinLevelUpDown); - this.surfGroupBox.Controls.Add(this.label62); - this.surfGroupBox.Controls.Add(this.surfOneComboBox); - this.surfGroupBox.Controls.Add(this.surfFourMaxLevelUpDown); - this.surfGroupBox.Controls.Add(this.surfFourMinLevelUpDown); - this.surfGroupBox.Controls.Add(this.label63); - this.surfGroupBox.Controls.Add(this.surfFourComboBox); - this.surfGroupBox.Controls.Add(this.surfFiveMaxLevelUpDown); - this.surfGroupBox.Controls.Add(this.surfFiveMinLevelUpDown); - this.surfGroupBox.Controls.Add(this.label64); - this.surfGroupBox.Controls.Add(this.surfFiveComboBox); - this.surfGroupBox.Controls.Add(this.surfThirtyMaxLevelUpDown); - this.surfGroupBox.Controls.Add(this.surfThirtyMinLevelUpDown); - this.surfGroupBox.Controls.Add(this.label65); - this.surfGroupBox.Controls.Add(this.surfThirtyComboBox); - this.surfGroupBox.Controls.Add(this.surfSixtyMaxLevelUpDown); - this.surfGroupBox.Controls.Add(this.surfSixtyMinLevelUpDown); - this.surfGroupBox.Controls.Add(this.label66); - this.surfGroupBox.Controls.Add(this.surfSixtyComboBox); - this.surfGroupBox.Location = new System.Drawing.Point(17, 10); - this.surfGroupBox.Name = "surfGroupBox"; - this.surfGroupBox.Size = new System.Drawing.Size(325, 210); - this.surfGroupBox.TabIndex = 4; - this.surfGroupBox.TabStop = false; - this.surfGroupBox.Text = "Surfing"; - // - // label68 - // - this.label68.AutoSize = true; - this.label68.Location = new System.Drawing.Point(264, 50); - this.label68.Name = "label68"; - this.label68.Size = new System.Drawing.Size(47, 13); - this.label68.TabIndex = 41; - this.label68.Text = "Max Lvl."; - // - // label67 - // - this.label67.AutoSize = true; - this.label67.Location = new System.Drawing.Point(214, 50); - this.label67.Name = "label67"; - this.label67.Size = new System.Drawing.Size(44, 13); - this.label67.TabIndex = 40; - this.label67.Text = "Min Lvl."; - // - // surfRateUpDown - // - this.surfRateUpDown.Location = new System.Drawing.Point(265, 17); - this.surfRateUpDown.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.surfRateUpDown.Name = "surfRateUpDown"; - this.surfRateUpDown.Size = new System.Drawing.Size(42, 20); - this.surfRateUpDown.TabIndex = 39; - this.surfRateUpDown.ValueChanged += new System.EventHandler(this.surfRateUpDown_ValueChanged); - // - // label61 - // - this.label61.AutoSize = true; - this.label61.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label61.Location = new System.Drawing.Point(229, 19); - this.label61.Name = "label61"; - this.label61.Size = new System.Drawing.Size(30, 13); - this.label61.TabIndex = 38; - this.label61.Text = "Rate"; - // - // surfOneMaxLevelUpDown - // - this.surfOneMaxLevelUpDown.Location = new System.Drawing.Point(265, 179); - this.surfOneMaxLevelUpDown.Name = "surfOneMaxLevelUpDown"; - this.surfOneMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.surfOneMaxLevelUpDown.TabIndex = 22; - this.surfOneMaxLevelUpDown.ValueChanged += new System.EventHandler(this.surfOneMaxLevelUpDown_ValueChanged); - // - // surfOneMinLevelUpDown - // - this.surfOneMinLevelUpDown.Location = new System.Drawing.Point(217, 179); - this.surfOneMinLevelUpDown.Name = "surfOneMinLevelUpDown"; - this.surfOneMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.surfOneMinLevelUpDown.TabIndex = 21; - this.surfOneMinLevelUpDown.ValueChanged += new System.EventHandler(this.surfOneMinLevelUpDown_ValueChanged); - // - // label62 - // - this.label62.AutoSize = true; - this.label62.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label62.Location = new System.Drawing.Point(18, 181); - this.label62.Name = "label62"; - this.label62.Size = new System.Drawing.Size(21, 13); - this.label62.TabIndex = 20; - this.label62.Text = "1%"; - // // surfOneComboBox // this.surfOneComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -2460,32 +2574,6 @@ this.surfOneComboBox.TabIndex = 19; this.surfOneComboBox.SelectedIndexChanged += new System.EventHandler(this.surfOneComboBox_SelectedIndexChanged); // - // surfFourMaxLevelUpDown - // - this.surfFourMaxLevelUpDown.Location = new System.Drawing.Point(265, 152); - this.surfFourMaxLevelUpDown.Name = "surfFourMaxLevelUpDown"; - this.surfFourMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.surfFourMaxLevelUpDown.TabIndex = 18; - this.surfFourMaxLevelUpDown.ValueChanged += new System.EventHandler(this.surfFourMaxLevelUpDown_ValueChanged); - // - // surfFourMinLevelUpDown - // - this.surfFourMinLevelUpDown.Location = new System.Drawing.Point(217, 152); - this.surfFourMinLevelUpDown.Name = "surfFourMinLevelUpDown"; - this.surfFourMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.surfFourMinLevelUpDown.TabIndex = 17; - this.surfFourMinLevelUpDown.ValueChanged += new System.EventHandler(this.surfFourMinLevelUpDown_ValueChanged); - // - // label63 - // - this.label63.AutoSize = true; - this.label63.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label63.Location = new System.Drawing.Point(18, 154); - this.label63.Name = "label63"; - this.label63.Size = new System.Drawing.Size(21, 13); - this.label63.TabIndex = 16; - this.label63.Text = "4%"; - // // surfFourComboBox // this.surfFourComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -2497,32 +2585,6 @@ this.surfFourComboBox.TabIndex = 15; this.surfFourComboBox.SelectedIndexChanged += new System.EventHandler(this.surfFourComboBox_SelectedIndexChanged); // - // surfFiveMaxLevelUpDown - // - this.surfFiveMaxLevelUpDown.Location = new System.Drawing.Point(265, 125); - this.surfFiveMaxLevelUpDown.Name = "surfFiveMaxLevelUpDown"; - this.surfFiveMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.surfFiveMaxLevelUpDown.TabIndex = 14; - this.surfFiveMaxLevelUpDown.ValueChanged += new System.EventHandler(this.surfFiveMaxLevelUpDown_ValueChanged); - // - // surfFiveMinLevelUpDown - // - this.surfFiveMinLevelUpDown.Location = new System.Drawing.Point(217, 125); - this.surfFiveMinLevelUpDown.Name = "surfFiveMinLevelUpDown"; - this.surfFiveMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.surfFiveMinLevelUpDown.TabIndex = 13; - this.surfFiveMinLevelUpDown.ValueChanged += new System.EventHandler(this.surfFiveMinLevelUpDown_ValueChanged); - // - // label64 - // - this.label64.AutoSize = true; - this.label64.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label64.Location = new System.Drawing.Point(18, 127); - this.label64.Name = "label64"; - this.label64.Size = new System.Drawing.Size(21, 13); - this.label64.TabIndex = 12; - this.label64.Text = "5%"; - // // surfFiveComboBox // this.surfFiveComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -2534,32 +2596,6 @@ this.surfFiveComboBox.TabIndex = 11; this.surfFiveComboBox.SelectedIndexChanged += new System.EventHandler(this.surfFiveComboBox_SelectedIndexChanged); // - // surfThirtyMaxLevelUpDown - // - this.surfThirtyMaxLevelUpDown.Location = new System.Drawing.Point(265, 98); - this.surfThirtyMaxLevelUpDown.Name = "surfThirtyMaxLevelUpDown"; - this.surfThirtyMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.surfThirtyMaxLevelUpDown.TabIndex = 10; - this.surfThirtyMaxLevelUpDown.ValueChanged += new System.EventHandler(this.surfThirtyMaxLevelUpDown_ValueChanged); - // - // surfThirtyMinLevelUpDown - // - this.surfThirtyMinLevelUpDown.Location = new System.Drawing.Point(217, 98); - this.surfThirtyMinLevelUpDown.Name = "surfThirtyMinLevelUpDown"; - this.surfThirtyMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.surfThirtyMinLevelUpDown.TabIndex = 9; - this.surfThirtyMinLevelUpDown.ValueChanged += new System.EventHandler(this.surfThirtyMinLevelUpDown_ValueChanged); - // - // label65 - // - this.label65.AutoSize = true; - this.label65.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label65.Location = new System.Drawing.Point(12, 100); - this.label65.Name = "label65"; - this.label65.Size = new System.Drawing.Size(27, 13); - this.label65.TabIndex = 8; - this.label65.Text = "30%"; - // // surfThirtyComboBox // this.surfThirtyComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -2571,32 +2607,6 @@ this.surfThirtyComboBox.TabIndex = 7; this.surfThirtyComboBox.SelectedIndexChanged += new System.EventHandler(this.surfThirtyComboBox_SelectedIndexChanged); // - // surfSixtyMaxLevelUpDown - // - this.surfSixtyMaxLevelUpDown.Location = new System.Drawing.Point(265, 71); - this.surfSixtyMaxLevelUpDown.Name = "surfSixtyMaxLevelUpDown"; - this.surfSixtyMaxLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.surfSixtyMaxLevelUpDown.TabIndex = 6; - this.surfSixtyMaxLevelUpDown.ValueChanged += new System.EventHandler(this.surfSixtyMaxLevelUpDown_ValueChanged); - // - // surfSixtyMinLevelUpDown - // - this.surfSixtyMinLevelUpDown.Location = new System.Drawing.Point(217, 71); - this.surfSixtyMinLevelUpDown.Name = "surfSixtyMinLevelUpDown"; - this.surfSixtyMinLevelUpDown.Size = new System.Drawing.Size(42, 20); - this.surfSixtyMinLevelUpDown.TabIndex = 5; - this.surfSixtyMinLevelUpDown.ValueChanged += new System.EventHandler(this.surfSixtyMinLevelUpDown_ValueChanged); - // - // label66 - // - this.label66.AutoSize = true; - this.label66.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label66.Location = new System.Drawing.Point(12, 73); - this.label66.Name = "label66"; - this.label66.Size = new System.Drawing.Size(27, 13); - this.label66.TabIndex = 4; - this.label66.Text = "60%"; - // // surfSixtyComboBox // this.surfSixtyComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -2608,21 +2618,11 @@ this.surfSixtyComboBox.TabIndex = 3; this.surfSixtyComboBox.SelectedIndexChanged += new System.EventHandler(this.surfSixtyComboBox_SelectedIndexChanged); // - // repairAllButton - // - this.repairAllButton.Image = global::DSPRE.Properties.Resources.wrenchIcon; - this.repairAllButton.Location = new System.Drawing.Point(590, 9); - this.repairAllButton.Name = "repairAllButton"; - this.repairAllButton.Size = new System.Drawing.Size(38, 40); - this.repairAllButton.TabIndex = 69; - this.repairAllButton.UseVisualStyleBackColor = true; - this.repairAllButton.Click += new System.EventHandler(this.repairAllButton_Click); - // // WildEditorHGSS // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(758, 555); + this.ClientSize = new System.Drawing.Size(813, 583); this.Controls.Add(this.repairAllButton); this.Controls.Add(this.mainTabControl); this.Controls.Add(this.removeEncounterFileButton); @@ -2723,6 +2723,7 @@ ((System.ComponentModel.ISupportInitialize)(this.surfThirtyMinLevelUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.surfSixtyMaxLevelUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.surfSixtyMinLevelUpDown)).EndInit(); + this.groupBox1.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -2917,7 +2918,6 @@ private DSPRE.InputComboBox surfSwarmComboBox; private System.Windows.Forms.Label label6; private DSPRE.InputComboBox grassSwarmComboBox; - private System.Windows.Forms.Label label7; private System.Windows.Forms.Label label8; private System.Windows.Forms.GroupBox radioMusicComboBox; private DSPRE.InputComboBox sinnohSecondComboBox; @@ -2944,5 +2944,6 @@ private System.Windows.Forms.Button repairAllButton; private System.Windows.Forms.Label label15; private System.Windows.Forms.Label label16; + private System.Windows.Forms.GroupBox groupBox1; } } \ No newline at end of file diff --git a/DS_Map/WildEditorHGSS.cs b/DS_Map/WildEditorHGSS.cs index f3a0ce9..6fbe156 100644 --- a/DS_Map/WildEditorHGSS.cs +++ b/DS_Map/WildEditorHGSS.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.IO; +using System.Reflection; using System.Windows.Forms; using static DSPRE.RomInfo; @@ -16,7 +17,7 @@ namespace DSPRE { encounterFileFolder = dirPath; disableHandlers = true; - + Text = "DSPRE Reloaded " + GetDSPREVersion() + " - HGSS Encounters Editor"; MapHeader tempMapHeader; List locationNames = RomInfo.GetLocationNames(); Dictionary EncounterFileLocationName = new Dictionary(); @@ -86,6 +87,11 @@ namespace DSPRE { SetupControls(); } + public string GetDSPREVersion() { + return "" + Assembly.GetExecutingAssembly().GetName().Version.Major + "." + Assembly.GetExecutingAssembly().GetName().Version.Minor + + "." + Assembly.GetExecutingAssembly().GetName().Version.Build; + } + public void SetupControls() { disableHandlers = true; From 632c02dbfb0ef78e734c7e42f1647b6f29d36200 Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Sat, 2 Mar 2024 11:12:45 +0100 Subject: [PATCH 15/40] Merged mon editors into one. Needs testing --- DS_Map/DSPRE.csproj | 9 +++ DS_Map/EvolutionsEditor.cs | 7 +- DS_Map/LearnsetEditor.cs | 7 +- DS_Map/Main Window.Designer.cs | 4 +- DS_Map/Main Window.cs | 7 +- DS_Map/Main Window.resx | 90 ++++++++++++++++++++++ DS_Map/PersonalDataEditor.cs | 7 +- DS_Map/PokemonEditor.Designer.cs | 95 +++++++++++++++++++++++ DS_Map/PokemonEditor.cs | 41 ++++++++++ DS_Map/PokemonEditor.resx | 120 ++++++++++++++++++++++++++++++ DS_Map/Properties/AssemblyInfo.cs | 8 +- 11 files changed, 381 insertions(+), 14 deletions(-) create mode 100644 DS_Map/PokemonEditor.Designer.cs create mode 100644 DS_Map/PokemonEditor.cs create mode 100644 DS_Map/PokemonEditor.resx diff --git a/DS_Map/DSPRE.csproj b/DS_Map/DSPRE.csproj index 0ad65fd..edd7cf7 100644 --- a/DS_Map/DSPRE.csproj +++ b/DS_Map/DSPRE.csproj @@ -141,6 +141,12 @@ PersonalDataEditor.cs + + Form + + + PokemonEditor.cs + True True @@ -305,6 +311,9 @@ PersonalDataEditor.cs + + PokemonEditor.cs + ResXFileCodeGenerator BDHCAMPatchDB.Designer.cs diff --git a/DS_Map/EvolutionsEditor.cs b/DS_Map/EvolutionsEditor.cs index 57c6bee..00480e5 100644 --- a/DS_Map/EvolutionsEditor.cs +++ b/DS_Map/EvolutionsEditor.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Windows.Forms; +using static System.Windows.Forms.VisualStyles.VisualStyleElement.TextBox; namespace DSPRE { public partial class EvolutionsEditor : Form { @@ -19,7 +20,7 @@ namespace DSPRE { private static readonly string formName = "Evolutions Editor"; private (ComboBox m, Label l, NumericUpDown p, ComboBox t)[] evoRows; - public EvolutionsEditor() { + public EvolutionsEditor(Control parent = null) { this.pokeNames = RomInfo.GetPokemonNames(); this.moveNames = RomInfo.GetAttackNames(); this.itemNames = RomInfo.GetItemNames(); @@ -30,7 +31,9 @@ namespace DSPRE { this.fileNames = fileNames.ToArray(); InitializeComponent(); - + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.Size = parent.Size; + this.Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top | AnchorStyles.Bottom; disableHandlers = true; evoRows = new (ComboBox m, Label l, NumericUpDown p, ComboBox t)[EvolutionFile.numEvolutions] { diff --git a/DS_Map/LearnsetEditor.cs b/DS_Map/LearnsetEditor.cs index ae16a93..70984a7 100644 --- a/DS_Map/LearnsetEditor.cs +++ b/DS_Map/LearnsetEditor.cs @@ -6,6 +6,7 @@ using System.Linq; using System.Windows; using System.Windows.Forms; using static ScintillaNET.Style; +using static System.Windows.Forms.VisualStyles.VisualStyleElement.TextBox; using MessageBox = System.Windows.Forms.MessageBox; namespace DSPRE { @@ -33,11 +34,13 @@ namespace DSPRE { private static bool dirty = false; private static readonly string formName = "Learnset Editor"; - public LearnsetEditor(string[] moveNames) { + public LearnsetEditor(string[] moveNames, Control parent = null) { this.moveNames = moveNames; InitializeComponent(); - + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.Size = parent.Size; + this.Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top | AnchorStyles.Bottom; disableHandlers = true; BindingList listMoveNames = new BindingList(moveNames); diff --git a/DS_Map/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs index 4ec2aea..a8d37f9 100644 --- a/DS_Map/Main Window.Designer.cs +++ b/DS_Map/Main Window.Designer.cs @@ -11168,7 +11168,7 @@ // this.personalDataEditorToolStripMenuItem.Name = "personalDataEditorToolStripMenuItem"; this.personalDataEditorToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.personalDataEditorToolStripMenuItem.Text = "Personal Data Editor"; + this.personalDataEditorToolStripMenuItem.Text = "Pokemon Editor"; this.personalDataEditorToolStripMenuItem.Click += new System.EventHandler(this.personalDataEditorToolStripMenuItem_Click); // // learnsetsEditorToolStripMenuItem @@ -11176,6 +11176,7 @@ this.learnsetsEditorToolStripMenuItem.Name = "learnsetsEditorToolStripMenuItem"; this.learnsetsEditorToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.learnsetsEditorToolStripMenuItem.Text = "Learnsets Editor"; + this.learnsetsEditorToolStripMenuItem.Visible = false; this.learnsetsEditorToolStripMenuItem.Click += new System.EventHandler(this.learnsetsEditorToolStripMenuItem_Click); // // evolutionsEditorToolStripMenuItem @@ -11183,6 +11184,7 @@ this.evolutionsEditorToolStripMenuItem.Name = "evolutionsEditorToolStripMenuItem"; this.evolutionsEditorToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.evolutionsEditorToolStripMenuItem.Text = "Evolutions Editor"; + this.evolutionsEditorToolStripMenuItem.Visible = false; this.evolutionsEditorToolStripMenuItem.Click += new System.EventHandler(this.evolutionsEditorToolStripMenuItem_Click); // // menuViewToolStripMenuItem diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index 381770e..087f718 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -10739,14 +10739,15 @@ namespace DSPRE { private void personalDataEditorToolStripMenuItem_Click(object sender, EventArgs e) { string[] itemNames = RomInfo.GetItemNames(); string[] abilityNames = RomInfo.GetAbilityNames(); + string[] moveNames = RomInfo.GetAttackNames(); - statusLabelMessage("Setting up Personal Data Editor..."); + statusLabelMessage("Setting up Pokemon Data Editor..."); Update(); - DSUtils.TryUnpackNarcs(new List { DirNames.personalPokeData, DirNames.monIcons }); + DSUtils.TryUnpackNarcs(new List { DirNames.personalPokeData, DirNames.learnsets, DirNames.evolutions, DirNames.monIcons }); RomInfo.SetMonIconsPalTableAddress(); - PersonalDataEditor pde = new PersonalDataEditor(itemNames, abilityNames); + PokemonEditor pde = new PokemonEditor(itemNames, abilityNames, moveNames); pde.ShowDialog(); statusLabelMessage(); diff --git a/DS_Map/Main Window.resx b/DS_Map/Main Window.resx index 773342c..3281ac8 100644 --- a/DS_Map/Main Window.resx +++ b/DS_Map/Main Window.resx @@ -1036,6 +1036,96 @@ p3S+M+m1V1me9QgCUQNXX2YRT1sYHBiEP3wHVbp3PF3cB40GbrzN86xHENrScf1NDsl8FaI4jODMHOgS SOacfYAmbr5XeNYjGH7yDReXv+JeNIUhUYwFpmZjDz+nMLf5B3b2rcZ5tju4ntjtFw4T54j+v2g/t9NH 9AiCIPwGJelqUAd/T3AAAAAASUVORK5CYII= + + + + 239, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM + EgAAAk1TRnQBSQFMAgEBCgEAAaABGwGgARsBEAEAARABAAT/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/PersonalDataEditor.cs b/DS_Map/PersonalDataEditor.cs index 7a6d3e3..e8f8b17 100644 --- a/DS_Map/PersonalDataEditor.cs +++ b/DS_Map/PersonalDataEditor.cs @@ -6,6 +6,7 @@ using System.ComponentModel; using System.Linq; using System.Windows.Controls; using System.Windows.Forms; +using static System.Windows.Forms.VisualStyles.VisualStyleElement.TextBox; namespace DSPRE { public partial class PersonalDataEditor : Form { @@ -20,11 +21,13 @@ namespace DSPRE { private static bool dirty = false; private static readonly string formName = "Personal Data Editor"; - public PersonalDataEditor(string[] itemNames, string[] abilityNames) { + public PersonalDataEditor(string[] itemNames, string[] abilityNames, System.Windows.Forms.Control parent = null) { this.fileNames = RomInfo.GetPokemonNames().ToArray();; InitializeComponent(); - + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.Size = parent.Size; + this.Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top | AnchorStyles.Bottom; disableHandlers = true; BindingList listItemNames = new BindingList(itemNames); diff --git a/DS_Map/PokemonEditor.Designer.cs b/DS_Map/PokemonEditor.Designer.cs new file mode 100644 index 0000000..7982eeb --- /dev/null +++ b/DS_Map/PokemonEditor.Designer.cs @@ -0,0 +1,95 @@ +namespace DSPRE { + partial class PokemonEditor { + /// + /// 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.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.tabControl.SuspendLayout(); + this.SuspendLayout(); + // + // tabControl + // + this.tabControl.Controls.Add(this.personalPage); + this.tabControl.Controls.Add(this.learnsetPage); + this.tabControl.Controls.Add(this.evoPage); + this.tabControl.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControl.Location = new System.Drawing.Point(0, 0); + this.tabControl.Name = "tabControl"; + this.tabControl.SelectedIndex = 0; + this.tabControl.Size = new System.Drawing.Size(800, 450); + this.tabControl.TabIndex = 0; + // + // personalPage + // + 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(792, 424); + this.personalPage.TabIndex = 0; + this.personalPage.Text = "Personal Editor"; + this.personalPage.UseVisualStyleBackColor = true; + // + // learnsetPage + // + 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(792, 424); + this.learnsetPage.TabIndex = 1; + this.learnsetPage.Text = "Learnset Editor"; + this.learnsetPage.UseVisualStyleBackColor = true; + // + // evoPage + // + 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(792, 424); + this.evoPage.TabIndex = 2; + this.evoPage.Text = "Evolution Editor"; + this.evoPage.UseVisualStyleBackColor = true; + // + // PokemonEditor + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(800, 450); + this.Controls.Add(this.tabControl); + this.Name = "PokemonEditor"; + this.Text = "PokemonEditor"; + this.tabControl.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.TabControl tabControl; + private System.Windows.Forms.TabPage personalPage; + private System.Windows.Forms.TabPage learnsetPage; + private System.Windows.Forms.TabPage evoPage; + } +} \ No newline at end of file diff --git a/DS_Map/PokemonEditor.cs b/DS_Map/PokemonEditor.cs new file mode 100644 index 0000000..b0276c0 --- /dev/null +++ b/DS_Map/PokemonEditor.cs @@ -0,0 +1,41 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Controls.Primitives; +using System.Windows.Forms; +using static DSPRE.RomInfo; + +namespace DSPRE { + public partial class PokemonEditor : Form { + public PokemonEditor(string[] itemNames, string[] abilityNames, string[] moveNames) { + InitializeComponent(); + foreach (var cb in Controls.OfType()) { + cb.Resize += (sender, e) => { + if (!cb.Focused) + cb.SelectionLength = 0; + }; + } + IsMdiContainer = true; + + PersonalDataEditor personalEditor = new PersonalDataEditor(itemNames, abilityNames, evoPage); + personalEditor.TopLevel = false; + personalEditor.Show(); + personalPage.Controls.Add(personalEditor); + + LearnsetEditor learnsetEditor = new LearnsetEditor(moveNames, evoPage); + learnsetEditor.TopLevel = false; + learnsetEditor.Show(); + learnsetPage.Controls.Add(learnsetEditor); + + EvolutionsEditor evoEditor = new EvolutionsEditor(evoPage); + evoEditor.TopLevel = false; + evoEditor.Show(); + evoPage.Controls.Add(evoEditor); + } + } +} diff --git a/DS_Map/PokemonEditor.resx b/DS_Map/PokemonEditor.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/DS_Map/PokemonEditor.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/Properties/AssemblyInfo.cs b/DS_Map/Properties/AssemblyInfo.cs index ade54bb..5def708 100644 --- a/DS_Map/Properties/AssemblyInfo.cs +++ b/DS_Map/Properties/AssemblyInfo.cs @@ -4,11 +4,11 @@ using System.Runtime.InteropServices; // Le informazioni generali relative a un assembly sono controllate dal seguente // set di attributi. Modificare i valori di questi attributi per modificare le informazioni // associate a un assembly. -[assembly: AssemblyTitle("DSPRE Reloaded 1.11.1")] +[assembly: AssemblyTitle("DSPRE Reloaded 1.11.2")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("DSPRE Reloaded 1.11.1")] +[assembly: AssemblyProduct("DSPRE Reloaded 1.11.2")] [assembly: AssemblyCopyright("Copyright © 2023")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // È possibile specificare tutti i valori oppure impostare valori predefiniti per i numeri relativi alla revisione e alla build // usando l'asterisco '*' come illustrato di seguito: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.11.1")] -[assembly: AssemblyFileVersion("1.11.1")] +[assembly: AssemblyVersion("1.11.2")] +[assembly: AssemblyFileVersion("1.11.2")] From 12da61692f4348d8abe63feb31b7c9372a97fb75 Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Sun, 3 Mar 2024 14:07:40 +0100 Subject: [PATCH 16/40] Started merging changes Co-authored-by: Cuddlyogre --- DS_Map/BuildingEditor.cs | 2 +- DS_Map/DSPRE.csproj | 2 + DS_Map/DSUtils.cs | 2 +- DS_Map/Filesystem.cs | 245 ++++++ DS_Map/GameCamera.cs | 2 +- DS_Map/Helpers.cs | 397 ++++++++++ DS_Map/Main Window.Designer.cs | 14 +- DS_Map/Main Window.cs | 236 +++--- DS_Map/Main Window.resx | 90 --- DS_Map/PokemonEditor.cs | 6 - DS_Map/ROMFiles/AreaData.cs | 4 +- DS_Map/ROMFiles/MapFile.cs | 10 +- DS_Map/ROMFiles/MapHeader.cs | 12 +- DS_Map/ROMFiles/ScriptCommand.cs | 24 +- DS_Map/ROMFiles/ScriptFile.cs | 12 +- DS_Map/ROMFiles/TrainerFile.cs | 4 +- DS_Map/ROMToolboxDialog.cs | 26 +- DS_Map/Resources/PokeDatabase.cs | 64 +- DS_Map/Resources/ROMToolboxDB/ToolboxDB.cs | 84 +-- DS_Map/RomInfo.cs | 817 ++++++++------------- DS_Map/SpawnEditor.cs | 6 +- DS_Map/WildEditorDPPt.cs | 2 +- 22 files changed, 1204 insertions(+), 857 deletions(-) create mode 100644 DS_Map/Filesystem.cs create mode 100644 DS_Map/Helpers.cs diff --git a/DS_Map/BuildingEditor.cs b/DS_Map/BuildingEditor.cs index 3988b65..fcdfef9 100644 --- a/DS_Map/BuildingEditor.cs +++ b/DS_Map/BuildingEditor.cs @@ -45,7 +45,7 @@ namespace DSPRE { buildingOpenGLControl.MouseWheel += new MouseEventHandler(buildingOpenGLControl_MouseWheel); Gl.glEnable(Gl.GL_TEXTURE_2D); - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { interiorCheckBox.Enabled = true; } diff --git a/DS_Map/DSPRE.csproj b/DS_Map/DSPRE.csproj index edd7cf7..4c82d6f 100644 --- a/DS_Map/DSPRE.csproj +++ b/DS_Map/DSPRE.csproj @@ -125,7 +125,9 @@ EvolutionsEditor.cs + + Component diff --git a/DS_Map/DSUtils.cs b/DS_Map/DSUtils.cs index 6bf2848..3313457 100644 --- a/DS_Map/DSUtils.cs +++ b/DS_Map/DSUtils.cs @@ -70,7 +70,7 @@ namespace DSPRE { return new FileInfo(RomInfo.arm9Path).Length <= 0xBC000; } public static bool CheckCompressionMark() { - return BitConverter.ToInt32(DSUtils.ARM9.ReadBytes((uint)(RomInfo.gameFamily == gFamEnum.DP ? 0xB7C : 0xBB4), 4), 0) != 0; + return BitConverter.ToInt32(DSUtils.ARM9.ReadBytes((uint)(RomInfo.gameFamily == GameFamilies.DP ? 0xB7C : 0xBB4), 4), 0) != 0; } public static byte[] ReadBytes(uint startOffset, long numberOfBytes = 0) { return ReadFromFile(RomInfo.arm9Path, startOffset, numberOfBytes); diff --git a/DS_Map/Filesystem.cs b/DS_Map/Filesystem.cs new file mode 100644 index 0000000..3d503ab --- /dev/null +++ b/DS_Map/Filesystem.cs @@ -0,0 +1,245 @@ +using System.IO; + +namespace DSPRE { + public static class Filesystem { + public static string eventFiles { get { return RomInfo.gameDirs[RomInfo.DirNames.eventFiles].unpackedDir; } } + public static string OWSprites { get { return RomInfo.gameDirs[RomInfo.DirNames.OWSprites].unpackedDir; } } + public static string mapTextures { get { return RomInfo.gameDirs[RomInfo.DirNames.mapTextures].unpackedDir; } } + public static string buildingTextures { get { return RomInfo.gameDirs[RomInfo.DirNames.buildingTextures].unpackedDir; } } + public static string dynamicHeaders { get { return RomInfo.gameDirs[RomInfo.DirNames.dynamicHeaders].unpackedDir; } } + public static string dynamicHeadersPacked { get { return RomInfo.gameDirs[RomInfo.DirNames.dynamicHeaders].packedDir; } } + public static string scripts { get { return RomInfo.gameDirs[RomInfo.DirNames.scripts].unpackedDir; } } + public static string maps { get { return RomInfo.gameDirs[RomInfo.DirNames.maps].unpackedDir; } } + public static string matrices { get { return RomInfo.gameDirs[RomInfo.DirNames.matrices].unpackedDir; } } + public static string buildingConfigFiles { get { return RomInfo.gameDirs[RomInfo.DirNames.buildingConfigFiles].unpackedDir; } } + public static string areaData { get { return RomInfo.gameDirs[RomInfo.DirNames.areaData].unpackedDir; } } + public static string textArchives { get { return RomInfo.gameDirs[RomInfo.DirNames.textArchives].unpackedDir; } } + public static string trainerProperties { get { return RomInfo.gameDirs[RomInfo.DirNames.trainerProperties].unpackedDir; } } + public static string trainerParty { get { return RomInfo.gameDirs[RomInfo.DirNames.trainerParty].unpackedDir; } } + public static string trainerGraphics { get { return RomInfo.gameDirs[RomInfo.DirNames.trainerGraphics].unpackedDir; } } + public static string encounters { get { return RomInfo.gameDirs[RomInfo.DirNames.encounters].unpackedDir; } } + public static string headbutt { get { return RomInfo.gameDirs[RomInfo.DirNames.headbutt].unpackedDir; } } + public static string safariZone { get { return RomInfo.gameDirs[RomInfo.DirNames.safariZone].unpackedDir; } } + public static string monIcons { get { return RomInfo.gameDirs[RomInfo.DirNames.monIcons].unpackedDir; } } + public static string synthOverlay { get { return RomInfo.gameDirs[RomInfo.DirNames.synthOverlay].unpackedDir; } } + public static string interiorBuildingModels { get { return RomInfo.gameDirs[RomInfo.DirNames.interiorBuildingModels].unpackedDir; } } + public static string exteriorBuildingModels { get { return RomInfo.gameDirs[RomInfo.DirNames.exteriorBuildingModels].unpackedDir; } } + + public static string GetBuildingModelsDirPath(bool interior) { + if (interior) { + return interiorBuildingModels; + } else { + return exteriorBuildingModels; + } + } + + public static string expArmPath { get { return Path.Combine(synthOverlay, ROMToolboxDialog.expandedARMfileID.ToString("D4")); } } + + public static string GetPath(string path, int id, string format = "D4") { + return Path.Combine(path, id.ToString(format)); + } + + public static string GetPath(string path, string prefix, int id, string ext, string format = "D4") { + return Path.Combine(path, prefix + id.ToString(format) + "." + ext); + } + + static string[] GetBuildingModelFiles(bool interior) { + return Directory.GetFiles(Filesystem.GetBuildingModelsDirPath(interior)); + } + + public static string GetBuildingModelPath(bool interior, int id) { + return GetPath(Filesystem.GetBuildingModelsDirPath(interior), id); + } + + public static int GetBuildingCount(bool interior) { + return GetBuildingModelFiles(interior).Length; + } + + public static string[] GetAreaDataFiles() { + return Directory.GetFiles(Filesystem.areaData); + } + + public static string GetAreaDataPath(int id) { + return GetPath(Filesystem.areaData, id); + } + + public static int GetAreaDataCount() { + return GetAreaDataFiles().Length; + } + + public static string GetTexturePath(bool useMapTiles, int textureID) { + string path = Filesystem.GetMapTexturePath(textureID); + string path2 = Filesystem.GetBuildingTexturePath(textureID); + string tilesetPath = useMapTiles ? path : path2; + return tilesetPath; + } + + static string[] GetMapTextureFiles() { + return Directory.GetFiles(Filesystem.mapTextures); + } + + public static string GetMapTexturePath(int id) { + return GetPath(Filesystem.mapTextures, id); + } + + public static int GetMapTexturesCount() { + return GetMapTextureFiles().Length; + } + + static string[] GetBuildingTextureFiles() { + return Directory.GetFiles(Filesystem.buildingTextures); + } + + public static string GetBuildingTexturePath(int id) { + return GetPath(Filesystem.buildingTextures, id); + } + + public static int GetBuildingTexturesCount() { + return GetBuildingTextureFiles().Length; + } + + static string[] GetMatrixFiles() { + return Directory.GetFiles(Filesystem.matrices); + } + + public static string GetMatrixPath(int id) { + return GetPath(Filesystem.matrices, id); + } + + public static int GetMatrixCount() { + return GetMatrixFiles().Length; + } + + static string[] GetTextArchiveFiles() { + return Directory.GetFiles(Filesystem.textArchives); + } + + public static string GetTextArchivePath(int id) { + return GetPath(Filesystem.textArchives, id); + } + + public static int GetTextArchivesCount() { + return GetTextArchiveFiles().Length; + } + + static string[] GetMapFiles() { + return Directory.GetFiles(Filesystem.maps); + } + + public static string GetMapPath(int id) { + return GetPath(Filesystem.maps, id); + } + + public static int GetMapCount() { + return GetMapFiles().Length; + } + + static string[] GetScriptFiles() { + return Directory.GetFiles(Filesystem.scripts); + } + + public static string GetScriptPath(int id) { + return GetPath(Filesystem.scripts, id); + } + + public static int GetScriptCount() { + return GetScriptFiles().Length; + } + + static string[] GetEventFiles() { + return Directory.GetFiles(Filesystem.eventFiles); + } + + public static string GetEventPath(int id) { + return GetPath(Filesystem.eventFiles, id); + } + + public static int GetEventFileCount() { + return GetEventFiles().Length; + } + + static string[] GetTrainerPropertiesFiles() { + return Directory.GetFiles(Filesystem.trainerProperties); + } + + public static string GetTrainerPropertiesPath(int id) { + return GetPath(Filesystem.trainerProperties, id); + } + + public static int GetTrainerPropertiesCount() { + return GetTrainerPropertiesFiles().Length; + } + + static string[] GetDynamicHeaderFiles() { + return Directory.GetFiles(Filesystem.dynamicHeaders); + } + + public static string GetDynamicHeaderPath(int id) { + return GetPath(Filesystem.dynamicHeaders, id); + } + + public static int GetDynamicHeadersCount() { + return GetDynamicHeaderFiles().Length; + } + + static string[] GetEncounterFiles() { + return Directory.GetFiles(Filesystem.encounters); + } + + public static string GetEncounterPath(int id) { + return GetPath(Filesystem.encounters, id); + } + + public static int GetEncountersCount() { + return GetEncounterFiles().Length; + } + + static string[] GetSafariZoneFiles() { + return Directory.GetFiles(Filesystem.safariZone); + } + + public static string GetSafariZonePath(int id) { + return GetPath(Filesystem.safariZone, id); + } + + public static int GetSafariZoneCount() { + return GetSafariZoneFiles().Length; + } + + static string[] GetHeadbuttFiles() { + return Directory.GetFiles(Filesystem.headbutt); + } + + public static string GetHeadbuttPath(int id) { + return GetPath(Filesystem.headbutt, id); + } + + public static int GetHeadbuttCount() { + return GetHeadbuttFiles().Length; + } + + public static string GetOWSpritePath(int id) { + return GetPath(Filesystem.OWSprites, id); + } + + public static string GetBuildingConfigPath(int id) { + return GetPath(Filesystem.buildingConfigFiles, id); + } + + public static string GetTrainerPartyPath(int id) { + return GetPath(Filesystem.trainerParty, id); + } + + public static string GetTrainerGraphicsPath(int id) { + return GetPath(Filesystem.trainerGraphics, id); + } + + public static string GetMonIconPath(int id, string format = "D4") { + return GetPath(Filesystem.monIcons, id, format); + } + + public static string GetSynthOerlayPath(int id) { + return GetPath(Filesystem.synthOverlay, id); + } + } +} diff --git a/DS_Map/GameCamera.cs b/DS_Map/GameCamera.cs index 8aefe8e..f006233 100644 --- a/DS_Map/GameCamera.cs +++ b/DS_Map/GameCamera.cs @@ -146,7 +146,7 @@ public class GameCamera { nearClip = b.ReadUInt32(); farClip = b.ReadUInt32(); - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { xOffset = b.ReadInt32(); yOffset = b.ReadInt32(); zOffset = b.ReadInt32(); diff --git a/DS_Map/Helpers.cs b/DS_Map/Helpers.cs new file mode 100644 index 0000000..81d1b9a --- /dev/null +++ b/DS_Map/Helpers.cs @@ -0,0 +1,397 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Drawing; +using System.IO; +using System.Text; +using System.Windows.Forms; +using Tao.OpenGl; +using LibNDSFormats.NSBMD; +using LibNDSFormats.NSBTX; +using DSPRE.ROMFiles; +using Images; +using Ekona.Images; +using ScintillaNET; +using ScintillaNET.Utils; +using Tao.Platform.Windows; +using NSMBe4.DSFileSystem; + +namespace DSPRE { + public static class Helpers { + static MainProgram MainProgram; + + public static RomInfo romInfo; + public static bool hideBuildings = new bool(); + + public static NSBMDGlRenderer mapRenderer; + + public static ToolStripProgressBar toolStripProgressBar { get { return MainProgram.toolStripProgressBar; } } + + public static void Initialize(MainProgram mainProgram) { + MainProgram = mainProgram; + mapRenderer = new NSBMDGlRenderer(); + } + + static bool disableHandlersOld; + static bool disableHandlers; + + public static bool HandlersDisabled { get { return disableHandlers == true; } } + public static bool HandlersEnabled { get { return disableHandlers == false; } } + + public static void BackUpDisableHandler() { + disableHandlersOld = disableHandlers; + } + + public static void RestoreDisableHandler() { + disableHandlers = disableHandlersOld; + } + + public static void DisableHandlers() { + disableHandlers = true; + } + + public static void EnableHandlers() { + disableHandlers = false; + } + + public static void statusLabelMessage(string msg = "Ready") { + ToolStripStatusLabel statusLabel = MainProgram.statusLabel; + statusLabel.Text = msg; + statusLabel.Font = new Font(statusLabel.Font, FontStyle.Regular); + statusLabel.ForeColor = Color.Black; + statusLabel.Invalidate(); + } + + public static void statusLabelError(string errorMsg, bool severe = true) { + ToolStripStatusLabel statusLabel = MainProgram.statusLabel; + statusLabel.Text = errorMsg; + statusLabel.Font = new Font(statusLabel.Font, FontStyle.Bold); + statusLabel.ForeColor = severe ? Color.Red : Color.DarkOrange; + statusLabel.Invalidate(); + } + + //Locate File - buttons + public static void ExplorerSelect(string path) { + if (System.IO.File.Exists(path)) { + Process.Start("explorer.exe", "/select" + "," + "\"" + path + "\""); + } + } + + public static string[] GetTrainerNames() { + List trainerList = new List(); + + /* Store all trainer names and classes */ + TextArchive trainerClasses = new TextArchive(RomInfo.trainerClassMessageNumber); + TextArchive trainerNames = new TextArchive(RomInfo.trainerNamesMessageNumber); + + int trainerCount = Filesystem.GetTrainerPropertiesCount(); + for (int i = 0; i < trainerCount; i++) { + string path = Filesystem.GetTrainerPropertiesPath(i); + int classMessageID = BitConverter.ToUInt16(DSUtils.ReadFromFile(path, startOffset: 1, 2), 0); + string currentTrainerName; + + if (i < trainerNames.messages.Count) { + currentTrainerName = trainerNames.messages[i]; + } else { + currentTrainerName = TrainerFile.NAME_NOT_FOUND; + } + + trainerList.Add("[" + i.ToString("D2") + "] " + trainerClasses.messages[classMessageID] + " " + currentTrainerName); + } + + return trainerList.ToArray(); + } + + public static void MW_LoadModelTextures(NSBMD model, string textureFolder, int fileID) { + if (fileID < 0) { + return; + } + + string texturePath = Filesystem.GetPath(textureFolder, fileID); + model.materials = NSBTXLoader.LoadNsbtx(new MemoryStream(System.IO.File.ReadAllBytes(texturePath)), out model.Textures, out model.Palettes); + try { + model.MatchTextures(); + } catch { + } + } + + public static void MW_LoadModelTextures(MapFile mapFile, int fileID) { + MW_LoadModelTextures(mapFile.mapModel, Filesystem.mapTextures, fileID); + } + + public static void MW_LoadModelTextures(Building building, int fileID) { + MW_LoadModelTextures(building.NSBMDFile, Filesystem.buildingTextures, fileID); + } + + public static void SetupRenderer(float ang, float dist, float elev, float perspective, int width, int height) { + //TODO: improve this + Gl.glEnable(Gl.GL_RESCALE_NORMAL); + Gl.glEnable(Gl.GL_COLOR_MATERIAL); + Gl.glEnable(Gl.GL_DEPTH_TEST); + Gl.glEnable(Gl.GL_NORMALIZE); + Gl.glDisable(Gl.GL_CULL_FACE); + Gl.glFrontFace(Gl.GL_CCW); + Gl.glClearDepth(1); + Gl.glEnable(Gl.GL_ALPHA_TEST); + Gl.glBlendFunc(Gl.GL_SRC_ALPHA, Gl.GL_ONE_MINUS_SRC_ALPHA); + Gl.glEnable(Gl.GL_BLEND); + Gl.glAlphaFunc(Gl.GL_GREATER, 0f); + Gl.glClearColor(51f / 255f, 51f / 255f, 51f / 255f, 1f); + Gl.glViewport(0, 0, width, height); + float aspect = width / height; //(vp[2] - vp[0]) / (vp[3] - vp[1]); + Gl.glMatrixMode(Gl.GL_PROJECTION); + Gl.glLoadIdentity(); + Glu.gluPerspective(perspective, aspect, 0.2f, 500.0f); //0.02f, 32.0f); + Gl.glTranslatef(0, 0, -dist); + Gl.glRotatef(elev, 1, 0, 0); + Gl.glRotatef(ang, 0, 1, 0); + Gl.glMatrixMode(Gl.GL_MODELVIEW); + Gl.glLoadIdentity(); + Gl.glTranslatef(0, 0, -dist); + Gl.glRotatef(elev, 1, 0, 0); + Gl.glRotatef(-ang, 0, 1, 0); + Gl.glLightfv(Gl.GL_LIGHT0, Gl.GL_POSITION, new float[] { 1, 1, 1, 0 }); + Gl.glLightfv(Gl.GL_LIGHT1, Gl.GL_POSITION, new float[] { 1, 1, 1, 0 }); + Gl.glLightfv(Gl.GL_LIGHT2, Gl.GL_POSITION, new float[] { 1, 1, 1, 0 }); + Gl.glLightfv(Gl.GL_LIGHT3, Gl.GL_POSITION, new float[] { 1, 1, 1, 0 }); + Gl.glLoadIdentity(); + Gl.glBindTexture(Gl.GL_TEXTURE_2D, 0); + Gl.glColor3f(1.0f, 1.0f, 1.0f); + Gl.glDepthMask(Gl.GL_TRUE); + Gl.glClear(Gl.GL_COLOR_BUFFER_BIT | Gl.GL_DEPTH_BUFFER_BIT); + } + + public static void RenderMap(ref MapFile mapFile, int width, int height, float ang, float dist, float elev, float perspective, bool mapTexturesON = true, bool buildingTexturesON = true) { + #region Useless variables that the rendering API still needs + + MKDS_Course_Editor.NSBTA.NSBTA.NSBTA_File ani = new MKDS_Course_Editor.NSBTA.NSBTA.NSBTA_File(); + MKDS_Course_Editor.NSBTP.NSBTP.NSBTP_File tp = new MKDS_Course_Editor.NSBTP.NSBTP.NSBTP_File(); + MKDS_Course_Editor.NSBCA.NSBCA.NSBCA_File ca = new MKDS_Course_Editor.NSBCA.NSBCA.NSBCA_File(); + int[] aniframeS = new int[0]; + + #endregion + + /* Adjust rendering settings */ + SetupRenderer(ang, dist, elev, perspective, width, height); + + /* Render the map model */ + NSBMD model = mapFile.mapModel; + mapRenderer.Model = model.models[0]; + + // int scale = 64; + float scale = 0.015625f; + Gl.glScalef(mapRenderer.Model.modelScale * scale, mapRenderer.Model.modelScale * scale, mapRenderer.Model.modelScale * scale); + + /* Determine if map textures must be rendered */ + if (mapTexturesON) { + Gl.glEnable(Gl.GL_TEXTURE_2D); + } else { + Gl.glDisable(Gl.GL_TEXTURE_2D); + } + + // Render map model + mapRenderer.RenderModel("", ani, aniframeS, aniframeS, aniframeS, aniframeS, aniframeS, ca, false, -1, 0.0f, 0.0f, dist, elev, ang, true, tp, model); + + if (hideBuildings) { + return; + } + + if (buildingTexturesON) { + Gl.glEnable(Gl.GL_TEXTURE_2D); + } else { + Gl.glDisable(Gl.GL_TEXTURE_2D); + } + + for (int i = 0; i < mapFile.buildings.Count; i++) { + Building building = mapFile.buildings[i]; + model = building.NSBMDFile; + if (model is null) { + Console.WriteLine("Null building can't be rendered"); + } else { + mapRenderer.Model = model.models[0]; + ScaleTranslateRotateBuilding(building); + mapRenderer.RenderModel("", ani, aniframeS, aniframeS, aniframeS, aniframeS, aniframeS, ca, false, -1, 0.0f, 0.0f, dist, elev, ang, true, tp, model); + } + } + } + + public static Bitmap GrabMapScreenshot(int width, int height) { + Bitmap bmp = new Bitmap(width, height); + System.Drawing.Imaging.BitmapData data = bmp.LockBits(new Rectangle(0, 0, width, height), System.Drawing.Imaging.ImageLockMode.WriteOnly, System.Drawing.Imaging.PixelFormat.Format24bppRgb); + Gl.glReadPixels(0, 0, width, height, Gl.GL_BGR, Gl.GL_UNSIGNED_BYTE, data.Scan0); + bmp.UnlockBits(data); + bmp.RotateFlip(RotateFlipType.RotateNoneFlipY); + return bmp; + } + + private static void ScaleTranslateRotateBuilding(Building building) { + float fullXcoord = building.xPosition + building.xFraction / 65536f; + float fullYcoord = building.yPosition + building.yFraction / 65536f; + float fullZcoord = building.zPosition + building.zFraction / 65536f; + + float scaleFactor = building.NSBMDFile.models[0].modelScale / 1024; + float translateFactor = 256 / building.NSBMDFile.models[0].modelScale; + + Gl.glScalef(scaleFactor * building.width, scaleFactor * building.height, scaleFactor * building.length); + Gl.glTranslatef(fullXcoord * translateFactor / building.width, fullYcoord * translateFactor / building.height, fullZcoord * translateFactor / building.length); + Gl.glRotatef(Building.U16ToDeg(building.xRotation), 1, 0, 0); + Gl.glRotatef(Building.U16ToDeg(building.yRotation), 0, 1, 0); + Gl.glRotatef(Building.U16ToDeg(building.zRotation), 0, 0, 1); + } + + public static Image GetPokePic(int species, int w, int h, PaletteBase paletteBase, ImageBase imageBase, SpriteBase spriteBase) { + bool fiveDigits = false; // some extreme future proofing + try { + string path = Filesystem.GetMonIconPath(0); + paletteBase = new NCLR(path, 0, Path.GetFileName(path)); + } catch (FileNotFoundException) { + string path = Filesystem.GetMonIconPath(0, "D5"); + paletteBase = new NCLR(path, 0, Path.GetFileName(path)); + fiveDigits = true; + } + + // read arm9 table to grab pal ID + int paletteId = 0; + byte[] iconPalTableBuf; + + switch (RomInfo.gameFamily) { + case RomInfo.GameFamilies.DP: + iconPalTableBuf = DSUtils.ARM9.ReadBytes(0x6B838, 4); + break; + case RomInfo.GameFamilies.Plat: + iconPalTableBuf = DSUtils.ARM9.ReadBytes(0x79F80, 4); + break; + case RomInfo.GameFamilies.HGSS: + default: + iconPalTableBuf = DSUtils.ARM9.ReadBytes(0x74408, 4); + break; + } + + int iconPalTableAddress = (iconPalTableBuf[3] & 0xFF) << 24 | (iconPalTableBuf[2] & 0xFF) << 16 | (iconPalTableBuf[1] & 0xFF) << 8 | (iconPalTableBuf[0] & 0xFF) /* << 0 */; + string iconTablePath; + + int iconPalTableOffsetFromFileStart; + if (iconPalTableAddress >= RomInfo.synthOverlayLoadAddress) { + // if the pointer shows the table was moved to the synthetic overlay + iconPalTableOffsetFromFileStart = iconPalTableAddress - (int)RomInfo.synthOverlayLoadAddress; + iconTablePath = Filesystem.expArmPath; + } else { + iconPalTableOffsetFromFileStart = iconPalTableAddress - 0x02000000; + iconTablePath = RomInfo.arm9Path; + } + + using (DSUtils.EasyReader idReader = new DSUtils.EasyReader(iconTablePath, iconPalTableOffsetFromFileStart + species)) { + paletteId = idReader.ReadByte(); + } + + if (paletteId != 0) { + paletteBase.Palette[0] = paletteBase.Palette[paletteId]; // update pal 0 to be the new pal + } + + // grab tiles + int spriteFileID = species + 7; + if (fiveDigits) { + string path = Filesystem.GetMonIconPath(spriteFileID, "D5"); + imageBase = new NCGR(path, spriteFileID, Path.GetFileName(path)); + } else { + string path = Filesystem.GetMonIconPath(spriteFileID); + imageBase = new NCGR(path, spriteFileID, Path.GetFileName(path)); + } + + // grab sprite + const int ncerFileId = 2; + if (fiveDigits) { + string path = Filesystem.GetMonIconPath(ncerFileId, "D5"); + spriteBase = new NCER(path, ncerFileId, Path.GetFileName(path)); + } else { + string path = Filesystem.GetMonIconPath(ncerFileId); + spriteBase = new NCER(path, ncerFileId, Path.GetFileName(path)); + } + + // copy this from the trainer + int bank0OAMcount = spriteBase.Banks[0].oams.Length; + int[] OAMenabled = new int[bank0OAMcount]; + for (int i = 0; i < OAMenabled.Length; i++) { + OAMenabled[i] = i; + } + + // finally compose image + try { + return spriteBase.Get_Image(imageBase, paletteBase, 0, w, h, false, false, false, true, true, -1, OAMenabled); + } catch (FormatException) { + return Properties.Resources.IconPokeball; + } + // default: + //partyPokemonPictureBoxList[partyPos].Image = cb.SelectedIndex > 0 ? (Image)Properties.PokePics.ResourceManager.GetObject(FixPokenameString(PokeDatabase.System.pokeNames[(ushort)cb.SelectedIndex])) : global::DSPRE.Properties.Resources.IconPokeball; + } + + public static void GenerateKeystrokes(string keys, Scintilla textArea) { + //Example + //GenerateKeystrokes("+{TAB}"); + HotKeyManager.Enable = false; + textArea.Focus(); + SendKeys.Send(keys); + HotKeyManager.Enable = true; + } + + public static void PictureBoxDisable(object sender, PaintEventArgs e) { + if (sender is PictureBox pict && pict.Image != null && (!pict.Enabled)) { + using (Bitmap img = new Bitmap(pict.Image, pict.ClientSize)) { + ControlPaint.DrawImageDisabled(e.Graphics, img, 0, 0, pict.BackColor); + } + } + } + + public static List getHeaderListBoxNames() { + List headerListBoxNames = new List(); + + using (DSUtils.EasyReader reader = new DSUtils.EasyReader(RomInfo.internalNamesPath)) { + int headerCount = RomInfo.GetHeaderCount(); + for (int i = 0; i < headerCount; i++) { + byte[] row = reader.ReadBytes(RomInfo.internalNameLength); + string internalName = Encoding.ASCII.GetString(row); //.TrimEnd(); + headerListBoxNames.Add(MapHeader.BuildName(i, internalName)); + } + } + + return headerListBoxNames; + } + + public static List getInternalNames() { + List internalNames = new List(); + + using (DSUtils.EasyReader reader = new DSUtils.EasyReader(RomInfo.internalNamesPath)) { + int headerCount = RomInfo.GetHeaderCount(); + for (int i = 0; i < headerCount; i++) { + byte[] row = reader.ReadBytes(RomInfo.internalNameLength); + string internalName = Encoding.ASCII.GetString(row); //.TrimEnd(); + internalNames.Add(internalName.TrimEnd('\0')); + } + } + + return internalNames; + } + + public static void OpenWildEditor(int encToOpen = 0) { + Helpers.statusLabelMessage("Attempting to extract Wild Encounters NARC..."); + + DSUtils.TryUnpackNarcs(new List() { RomInfo.DirNames.encounters, RomInfo.DirNames.monIcons }); + + Helpers.statusLabelMessage("Passing control to Wild Pokémon Editor..."); + + switch (RomInfo.gameFamily) { + case RomInfo.GameFamilies.DP: + case RomInfo.GameFamilies.Plat: + using (WildEditorDPPt editor = new WildEditorDPPt(encToOpen)) + editor.ShowDialog(); + break; + default: + using (WildEditorHGSS editor = new WildEditorHGSS(encToOpen)) + editor.ShowDialog(); + break; + } + + Helpers.statusLabelMessage(); + } + } +} \ No newline at end of file diff --git a/DS_Map/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs index a8d37f9..47fcadb 100644 --- a/DS_Map/Main Window.Designer.cs +++ b/DS_Map/Main Window.Designer.cs @@ -11167,14 +11167,14 @@ // personalDataEditorToolStripMenuItem // this.personalDataEditorToolStripMenuItem.Name = "personalDataEditorToolStripMenuItem"; - this.personalDataEditorToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.personalDataEditorToolStripMenuItem.Size = new System.Drawing.Size(163, 22); this.personalDataEditorToolStripMenuItem.Text = "Pokemon Editor"; this.personalDataEditorToolStripMenuItem.Click += new System.EventHandler(this.personalDataEditorToolStripMenuItem_Click); // // learnsetsEditorToolStripMenuItem // this.learnsetsEditorToolStripMenuItem.Name = "learnsetsEditorToolStripMenuItem"; - this.learnsetsEditorToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.learnsetsEditorToolStripMenuItem.Size = new System.Drawing.Size(163, 22); this.learnsetsEditorToolStripMenuItem.Text = "Learnsets Editor"; this.learnsetsEditorToolStripMenuItem.Visible = false; this.learnsetsEditorToolStripMenuItem.Click += new System.EventHandler(this.learnsetsEditorToolStripMenuItem_Click); @@ -11182,7 +11182,7 @@ // evolutionsEditorToolStripMenuItem // this.evolutionsEditorToolStripMenuItem.Name = "evolutionsEditorToolStripMenuItem"; - this.evolutionsEditorToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.evolutionsEditorToolStripMenuItem.Size = new System.Drawing.Size(163, 22); this.evolutionsEditorToolStripMenuItem.Text = "Evolutions Editor"; this.evolutionsEditorToolStripMenuItem.Visible = false; this.evolutionsEditorToolStripMenuItem.Click += new System.EventHandler(this.evolutionsEditorToolStripMenuItem_Click); @@ -11241,16 +11241,16 @@ this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.statusLabel, this.toolStripProgressBar}); - this.statusStrip1.Location = new System.Drawing.Point(0, 739); + this.statusStrip1.Location = new System.Drawing.Point(0, 737); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(1214, 22); + this.statusStrip1.Size = new System.Drawing.Size(1214, 24); this.statusStrip1.TabIndex = 13; this.statusStrip1.Text = "statusStrip1"; // // statusLabel // this.statusLabel.Name = "statusLabel"; - this.statusLabel.Size = new System.Drawing.Size(39, 17); + this.statusLabel.Size = new System.Drawing.Size(39, 19); this.statusLabel.Text = "Ready"; // // toolStripProgressBar @@ -12016,7 +12016,6 @@ private System.Windows.Forms.RadioButton radio2D; private System.Windows.Forms.CheckBox wireframeCheckBox; private System.Windows.Forms.StatusStrip statusStrip1; - private System.Windows.Forms.ToolStripStatusLabel statusLabel; private System.Windows.Forms.PictureBox collisionPictureBox; private System.Windows.Forms.PictureBox typePictureBox; private System.Windows.Forms.Label typeLabel; @@ -12332,7 +12331,6 @@ private System.Windows.Forms.PictureBox rightClickPicture; private System.Windows.Forms.Label WheelClickLabel; private System.Windows.Forms.Label LeftClickLabel; - private System.Windows.Forms.ToolStripProgressBar toolStripProgressBar; private System.Windows.Forms.ToolStripButton unpackAllButton; private System.Windows.Forms.Button pasteHeaderButton; private System.Windows.Forms.Button copyHeaderButton; diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index 087f718..23b3a27 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -506,13 +506,13 @@ namespace DSPRE { if (forceUnpack) { DSUtils.ForceUnpackNarcs(toUnpack); - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { DSUtils.ForceUnpackNarcs(new List { DirNames.interiorBuildingModels });// Last = interior buildings dir } } else { DSUtils.TryUnpackNarcs(toUnpack); - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { DSUtils.TryUnpackNarcs(new List { DirNames.interiorBuildingModels }); } } @@ -594,7 +594,11 @@ namespace DSPRE { gameIcon.Refresh(); // Paint game icon statusLabelMessage("Attempting to unpack NARCs from folder..."); Update(); - + for (int i = 0; i < 128; i++) { + if (DSUtils.OverlayIsCompressed(i)) { + DSUtils.DecompressOverlay(i); + } + } ReadROMInitData(); } @@ -605,7 +609,7 @@ namespace DSPRE { versionLabel.Text = RomInfo.gameVersion.ToString() + " " + "[" + RomInfo.romID + "]"; languageLabel.Text = "Lang: " + RomInfo.gameLanguage; - if (RomInfo.gameLanguage == gLangEnum.English) { + if (RomInfo.gameLanguage == GameLanguages.English) { if (europeByte == 0x0A) { languageLabel.Text += " [Europe]"; } else { @@ -654,7 +658,7 @@ namespace DSPRE { private void ReadROMInitData() { if (DSUtils.ARM9.CheckCompressionMark()) { - if (!RomInfo.gameFamily.Equals(gFamEnum.HGSS)) { + if (!RomInfo.gameFamily.Equals(GameFamilies.HGSS)) { MessageBox.Show("Unexpected compressed ARM9. It is advised that you double check the ARM9."); } if (!DSUtils.ARM9.Decompress(RomInfo.arm9Path)) { @@ -724,7 +728,7 @@ namespace DSPRE { MessageBoxButtons.YesNo, MessageBoxIcon.Question); if (d == DialogResult.Yes) { - DSUtils.ARM9.WriteBytes(new byte[4] { 0, 0, 0, 0 }, (uint)(RomInfo.gameFamily == gFamEnum.DP ? 0xB7C : 0xBB4)); + DSUtils.ARM9.WriteBytes(new byte[4] { 0, 0, 0, 0 }, (uint)(RomInfo.gameFamily == GameFamilies.DP ? 0xB7C : 0xBB4)); } } @@ -749,9 +753,15 @@ namespace DSPRE { Update(); + for (int i = 0; i < 128; i++) { + if (!DSUtils.OverlayIsCompressed(i)) { + DSUtils.CompressOverlay(i); + } + } + DSUtils.RepackROM(saveRom.FileName); - if (RomInfo.gameFamily != gFamEnum.DP && RomInfo.gameFamily != gFamEnum.Plat) { + if (RomInfo.gameFamily != GameFamilies.DP && RomInfo.gameFamily != GameFamilies.Plat) { if (eventEditorIsReady) { if (DSUtils.OverlayIsCompressed(1)) { DSUtils.DecompressOverlay(1); @@ -819,16 +829,16 @@ namespace DSPRE { } } private void diamondAndPearlToolStripMenuItem_Click(object sender, EventArgs e) { - OpenCommandsDatabase(RomInfo.BuildCommandNamesDatabase(gFamEnum.DP), RomInfo.BuildCommandParametersDatabase(gFamEnum.DP), - RomInfo.BuildActionNamesDatabase(gFamEnum.DP), RomInfo.BuildComparisonOperatorsDatabase(gFamEnum.DP)); + OpenCommandsDatabase(RomInfo.BuildCommandNamesDatabase(GameFamilies.DP), RomInfo.BuildCommandParametersDatabase(GameFamilies.DP), + RomInfo.BuildActionNamesDatabase(GameFamilies.DP), RomInfo.BuildComparisonOperatorsDatabase(GameFamilies.DP)); } private void platinumToolStripMenuItem_Click(object sender, EventArgs e) { - OpenCommandsDatabase(RomInfo.BuildCommandNamesDatabase(gFamEnum.Plat), RomInfo.BuildCommandParametersDatabase(gFamEnum.Plat), - RomInfo.BuildActionNamesDatabase(gFamEnum.Plat), RomInfo.BuildComparisonOperatorsDatabase(gFamEnum.Plat)); + OpenCommandsDatabase(RomInfo.BuildCommandNamesDatabase(GameFamilies.Plat), RomInfo.BuildCommandParametersDatabase(GameFamilies.Plat), + RomInfo.BuildActionNamesDatabase(GameFamilies.Plat), RomInfo.BuildComparisonOperatorsDatabase(GameFamilies.Plat)); } private void heartGoldAndSoulSilverToolStripMenuItem_Click(object sender, EventArgs e) { - OpenCommandsDatabase(RomInfo.BuildCommandNamesDatabase(gFamEnum.HGSS), RomInfo.BuildCommandParametersDatabase(gFamEnum.HGSS), - RomInfo.BuildActionNamesDatabase(gFamEnum.HGSS), RomInfo.BuildComparisonOperatorsDatabase(gFamEnum.HGSS)); + OpenCommandsDatabase(RomInfo.BuildCommandNamesDatabase(GameFamilies.HGSS), RomInfo.BuildCommandParametersDatabase(GameFamilies.HGSS), + RomInfo.BuildActionNamesDatabase(GameFamilies.HGSS), RomInfo.BuildComparisonOperatorsDatabase(GameFamilies.HGSS)); } private void mainTabControl_SelectedIndexChanged(object sender, EventArgs e) { if (mainTabControl.SelectedTab == headerEditorTabPage) { @@ -915,8 +925,8 @@ namespace DSPRE { string wildPokeUnpackedPath = gameDirs[DirNames.encounters].unpackedDir; switch (RomInfo.gameFamily) { - case gFamEnum.DP: - case gFamEnum.Plat: + case GameFamilies.DP: + case GameFamilies.Plat: using (WildEditorDPPt editor = new WildEditorDPPt(wildPokeUnpackedPath, RomInfo.GetPokemonNames(), encToOpen, internalNames.Count)) editor.ShowDialog(); break; @@ -996,7 +1006,7 @@ namespace DSPRE { ReloadHeaderEditorLocationsList(currentTextArchive.messages); switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: areaIconComboBox.Enabled = false; areaIconPictureBox.Image = (Image)Properties.Resources.ResourceManager.GetObject("dpareaicon"); areaSettingsLabel.Text = "Show nametag:"; @@ -1014,7 +1024,7 @@ namespace DSPRE { battleBackgroundLabel.Location = new Point(battleBackgroundLabel.Location.X - 25, battleBackgroundLabel.Location.Y - 8); battleBackgroundUpDown.Location = new Point(battleBackgroundUpDown.Location.X - 25, battleBackgroundUpDown.Location.Y - 8); break; - case gFamEnum.Plat: + case GameFamilies.Plat: areaSettingsLabel.Text = "Show nametag:"; areaIconComboBox.Items.Clear(); cameraComboBox.Items.Clear(); @@ -1134,9 +1144,9 @@ namespace DSPRE { string imageName; switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: break; - case gFamEnum.Plat: + case GameFamilies.Plat: ((HeaderPt)currentHeader).areaIcon = (byte)areaIconComboBox.SelectedIndex; imageName = "areaicon0" + areaIconComboBox.SelectedIndex.ToString(); areaIconPictureBox.Image = (Image)Properties.Resources.ResourceManager.GetObject(imageName); @@ -1162,7 +1172,7 @@ namespace DSPRE { return; } - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { HeaderHGSS currentHeaderHGSS = (HeaderHGSS)currentHeader; currentHeaderHGSS.followMode = (byte)followModeComboBox.SelectedIndex; } @@ -1172,7 +1182,7 @@ namespace DSPRE { if (disableHandlers) { return; } - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { HeaderHGSS currentHeaderHGSS = (HeaderHGSS)currentHeader; currentHeaderHGSS.kantoFlag = kantoRadioButton.Checked; } @@ -1195,7 +1205,7 @@ namespace DSPRE { if (flag3CheckBox.Checked) flagVal += (byte)Math.Pow(2, 3); - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { if (flag4CheckBox.Checked) flagVal += (byte)Math.Pow(2, 4); if (flag5CheckBox.Checked) @@ -1243,7 +1253,7 @@ namespace DSPRE { cameraUpDown.Value = currentHeader.cameraAngleID; battleBackgroundUpDown.Value = currentHeader.battleBackground; - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { areaSettingsComboBox.SelectedIndex = ((HeaderHGSS)currentHeader).locationType; } @@ -1252,7 +1262,7 @@ namespace DSPRE { /* Setup controls for fields with version-specific differences */ try { switch (RomInfo.gameFamily) { - case gFamEnum.DP: { + case GameFamilies.DP: { HeaderDP h = (HeaderDP)currentHeader; locationNameComboBox.SelectedIndex = h.locationName; @@ -1261,7 +1271,7 @@ namespace DSPRE { areaSettingsComboBox.SelectedIndex = areaSettingsComboBox.FindString("[" + $"{currentHeader.locationSpecifier:D3}"); break; } - case gFamEnum.Plat: { + case GameFamilies.Plat: { HeaderPt h = (HeaderPt)currentHeader; areaIconComboBox.SelectedIndex = h.areaIcon; @@ -1301,7 +1311,7 @@ namespace DSPRE { flag2CheckBox.Checked = ba[2]; flag3CheckBox.Checked = ba[3]; - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { flag4CheckBox.Checked = ba[4]; flag5CheckBox.Checked = ba[5]; flag6CheckBox.Checked = ba[6]; @@ -1360,10 +1370,10 @@ namespace DSPRE { } switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: ((HeaderDP)currentHeader).locationName = (ushort)locationNameComboBox.SelectedIndex; break; - case gFamEnum.Plat: + case GameFamilies.Plat: ((HeaderPt)currentHeader).locationName = (byte)locationNameComboBox.SelectedIndex; break; default: @@ -1382,10 +1392,10 @@ namespace DSPRE { return; } switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: currentHeader.musicDayID = (ushort)(musicDayUpDown.Value = PokeDatabase.MusicDB.DPMusicDict.Keys.ElementAt(musicDayComboBox.SelectedIndex)); break; - case gFamEnum.Plat: + case GameFamilies.Plat: currentHeader.musicDayID = (ushort)(musicDayUpDown.Value = PokeDatabase.MusicDB.PtMusicDict.Keys.ElementAt(musicDayComboBox.SelectedIndex)); break; default: @@ -1399,10 +1409,10 @@ namespace DSPRE { } switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: currentHeader.musicNightID = (ushort)(musicNightUpDown.Value = PokeDatabase.MusicDB.DPMusicDict.Keys.ElementAt(musicNightComboBox.SelectedIndex)); break; - case gFamEnum.Plat: + case GameFamilies.Plat: currentHeader.musicNightID = (ushort)(musicNightUpDown.Value = PokeDatabase.MusicDB.PtMusicDict.Keys.ElementAt(musicNightComboBox.SelectedIndex)); break; default: @@ -1420,10 +1430,10 @@ namespace DSPRE { currentHeader.musicDayID = updValue; try { switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: musicDayComboBox.SelectedItem = PokeDatabase.MusicDB.DPMusicDict[updValue]; break; - case gFamEnum.Plat: + case GameFamilies.Plat: musicDayComboBox.SelectedItem = PokeDatabase.MusicDB.PtMusicDict[updValue]; break; default: @@ -1445,10 +1455,10 @@ namespace DSPRE { currentHeader.musicNightID = updValue; try { switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: musicNightComboBox.SelectedItem = PokeDatabase.MusicDB.DPMusicDict[updValue]; break; - case gFamEnum.Plat: + case GameFamilies.Plat: musicNightComboBox.SelectedItem = PokeDatabase.MusicDB.PtMusicDict[updValue]; break; default: @@ -1475,10 +1485,10 @@ namespace DSPRE { disableHandlers = true; try { switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: weatherComboBox.SelectedItem = PokeDatabase.Weather.DPWeatherDict[currentHeader.weatherID]; break; - case gFamEnum.Plat: + case GameFamilies.Plat: weatherComboBox.SelectedItem = PokeDatabase.Weather.PtWeatherDict[currentHeader.weatherID]; break; default: @@ -1494,10 +1504,10 @@ namespace DSPRE { try { Dictionary dict; switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: dict = PokeDatabase.System.WeatherPics.dpWeatherImageDict; break; - case gFamEnum.Plat: + case GameFamilies.Plat: dict = PokeDatabase.System.WeatherPics.ptWeatherImageDict; break; default: @@ -1528,10 +1538,10 @@ namespace DSPRE { disableHandlers = true; try { switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: cameraComboBox.SelectedItem = PokeDatabase.CameraAngles.DPPtCameraDict[currentHeader.cameraAngleID]; break; - case gFamEnum.Plat: + case GameFamilies.Plat: cameraComboBox.SelectedItem = PokeDatabase.CameraAngles.DPPtCameraDict[currentHeader.cameraAngleID]; break; default: @@ -1547,11 +1557,11 @@ namespace DSPRE { string imageName; try { switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: currentHeader.cameraAngleID = (byte)cameraComboBox.SelectedIndex; imageName = "dpcamera" + cameraUpDown.Value.ToString(); break; - case gFamEnum.Plat: + case GameFamilies.Plat: currentHeader.cameraAngleID = (byte)cameraComboBox.SelectedIndex; imageName = "ptcamera" + cameraUpDown.Value.ToString(); break; @@ -1572,10 +1582,10 @@ namespace DSPRE { } switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: weatherUpDown.Value = PokeDatabase.Weather.DPWeatherDict.Keys.ElementAt(weatherComboBox.SelectedIndex); break; - case gFamEnum.Plat: + case GameFamilies.Plat: weatherUpDown.Value = PokeDatabase.Weather.PtWeatherDict.Keys.ElementAt(weatherComboBox.SelectedIndex); break; default: @@ -1594,10 +1604,10 @@ namespace DSPRE { } switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: cameraUpDown.Value = PokeDatabase.CameraAngles.DPPtCameraDict.Keys.ElementAt(cameraComboBox.SelectedIndex); break; - case gFamEnum.Plat: + case GameFamilies.Plat: cameraUpDown.Value = PokeDatabase.CameraAngles.DPPtCameraDict.Keys.ElementAt(cameraComboBox.SelectedIndex); break; default: @@ -1751,13 +1761,13 @@ namespace DSPRE { string locationName = ""; switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: locationName = locationNameComboBox.Items[((HeaderDP)h).locationName].ToString(); break; - case gFamEnum.Plat: + case GameFamilies.Plat: locationName = locationNameComboBox.Items[((HeaderPt)h).locationName].ToString(); break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: locationName = locationNameComboBox.Items[((HeaderHGSS)h).locationName].ToString(); break; } @@ -1792,13 +1802,13 @@ namespace DSPRE { string[] locBuff = new string[2]; switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: locBuff[1] = locationNameComboBox.Items[((HeaderDP)hBuff[1]).locationName].ToString(); break; - case gFamEnum.Plat: + case GameFamilies.Plat: locBuff[1] = locationNameComboBox.Items[((HeaderPt)hBuff[1]).locationName].ToString(); break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: locBuff[1] = locationNameComboBox.Items[((HeaderHGSS)hBuff[1]).locationName].ToString(); break; } @@ -1810,13 +1820,13 @@ namespace DSPRE { string lastName = locBuff[0]; //Kind of a locBuff[-1] locBuff[0] = locBuff[1]; switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: locBuff[1] = locationNameComboBox.Items[((HeaderDP)hBuff[1]).locationName].ToString(); break; - case gFamEnum.Plat: + case GameFamilies.Plat: locBuff[1] = locationNameComboBox.Items[((HeaderPt)hBuff[1]).locationName].ToString(); break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: locBuff[1] = locationNameComboBox.Items[((HeaderHGSS)hBuff[1]).locationName].ToString(); break; } @@ -1854,11 +1864,11 @@ namespace DSPRE { } switch (RomInfo.gameFamily) { - case gFamEnum.DP: - case gFamEnum.Plat: + case GameFamilies.DP: + case GameFamilies.Plat: currentHeader.locationSpecifier = Byte.Parse(areaSettingsComboBox.SelectedItem.ToString().Substring(1, 3)); break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: HeaderHGSS ch = (HeaderHGSS)currentHeader; ch.locationType = (byte)areaSettingsComboBox.SelectedIndex; break; @@ -2124,11 +2134,11 @@ namespace DSPRE { wildPokeUpDown.Value = encountersIDCopy; switch (RomInfo.gameFamily) { - case gFamEnum.DP: - case gFamEnum.Plat: + case GameFamilies.DP: + case GameFamilies.Plat: areaSettingsComboBox.SelectedIndex = shownameCopy; break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: areaSettingsComboBox.SelectedIndex = areaSettingsCopy; break; } @@ -2614,7 +2624,7 @@ namespace DSPRE { statusLabelMessage("Multiple Headers are associated to this Matrix, including the last selected one [Header " + headerID + "]. Now using its textures."); } else { - if (gameFamily.Equals(gFamEnum.DP)) { + if (gameFamily.Equals(GameFamilies.DP)) { foreach (ushort r in result) { HeaderDP hdp; hdp = (HeaderDP)MapHeader.LoadFromARM9(r); @@ -2624,7 +2634,7 @@ namespace DSPRE { break; } } - } else if (gameFamily.Equals(gFamEnum.Plat)) { + } else if (gameFamily.Equals(GameFamilies.Plat)) { foreach (ushort r in result) { HeaderPt hpt; if (ROMToolboxDialog.flag_DynamicHeadersPatchApplied || ROMToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { @@ -3195,7 +3205,7 @@ namespace DSPRE { DirNames.areaData, }); - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { DSUtils.TryUnpackNarcs(new List { DirNames.interiorBuildingModels }); } @@ -3204,8 +3214,8 @@ namespace DSPRE { collisionPainterPictureBox.Image = new Bitmap(100, 100); typePainterPictureBox.Image = new Bitmap(100, 100); switch (RomInfo.gameFamily) { - case gFamEnum.DP: - case gFamEnum.Plat: + case GameFamilies.DP: + case GameFamilies.Plat: mapPartsTabControl.TabPages.Remove(bgsTabPage); break; default: @@ -3222,8 +3232,8 @@ namespace DSPRE { for (int i = 0; i < mapCount; i++) { using (DSUtils.EasyReader reader = new DSUtils.EasyReader(RomInfo.gameDirs[DirNames.maps].unpackedDir + "\\" + i.ToString("D4"))) { switch (RomInfo.gameFamily) { - case gFamEnum.DP: - case gFamEnum.Plat: + case GameFamilies.DP: + case GameFamilies.Plat: reader.BaseStream.Position = 0x10 + reader.ReadUInt32() + reader.ReadUInt32(); break; default: @@ -3288,12 +3298,12 @@ namespace DSPRE { selectMapComboBox.SelectedIndex = 0; exteriorbldRadioButton.Checked = true; switch (RomInfo.gameFamily) { - case gFamEnum.DP: - case gFamEnum.Plat: + case GameFamilies.DP: + case GameFamilies.Plat: mapTextureComboBox.SelectedIndex = 7; buildTextureComboBox.SelectedIndex = 1; break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: mapTextureComboBox.SelectedIndex = 3; buildTextureComboBox.SelectedIndex = 1; break; @@ -3328,12 +3338,12 @@ namespace DSPRE { UpdateMapBinAndRefresh(temp, "Map BIN imported successfully!"); return; } else { - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { //If HGSS didn't work try reading as Platinum Map - temp = new MapFile(of.FileName, gFamEnum.Plat, false); + temp = new MapFile(of.FileName, GameFamilies.Plat, false); } else { //If Plat didn't work try reading as HGSS Map - temp = new MapFile(of.FileName, gFamEnum.HGSS, false); + temp = new MapFile(of.FileName, GameFamilies.HGSS, false); } if (temp.correctnessFlag) { @@ -3723,7 +3733,7 @@ namespace DSPRE { modelSizeLBL.Text = currentMapFile.mapModelData.Length.ToString() + " B"; terrainSizeLBL.Text = currentMapFile.bdhc.Length.ToString() + " B"; - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { BGSSizeLBL.Text = currentMapFile.bgs.Length.ToString() + " B"; } } @@ -4715,7 +4725,7 @@ namespace DSPRE { #region BDHC I/O private void bdhcImportButton_Click(object sender, EventArgs e) { OpenFileDialog it = new OpenFileDialog() { - Filter = RomInfo.gameFamily == gFamEnum.DP ? MapFile.BDHCFilter : MapFile.BDHCamFilter + Filter = RomInfo.gameFamily == GameFamilies.DP ? MapFile.BDHCFilter : MapFile.BDHCamFilter }; if (it.ShowDialog(this) != DialogResult.OK) { @@ -4729,7 +4739,7 @@ namespace DSPRE { private void bdhcExportButton_Click(object sender, EventArgs e) { SaveFileDialog sf = new SaveFileDialog { FileName = selectMapComboBox.SelectedItem.ToString(), - Filter = RomInfo.gameFamily == gFamEnum.DP ? MapFile.BDHCFilter : MapFile.BDHCamFilter + Filter = RomInfo.gameFamily == GameFamilies.DP ? MapFile.BDHCFilter : MapFile.BDHCamFilter }; if (sf.ShowDialog(this) != DialogResult.OK) { @@ -4852,7 +4862,7 @@ namespace DSPRE { Dictionary dict = new Dictionary(); - if (gameFamily.Equals(gFamEnum.DP)) { + if (gameFamily.Equals(GameFamilies.DP)) { foreach (ushort headerID in result) { HeaderDP hdp = (HeaderDP)MapHeader.LoadFromARM9(headerID); @@ -5082,7 +5092,7 @@ namespace DSPRE { MW_LoadModelTextures(eventMapFile.mapModel, RomInfo.gameDirs[DirNames.mapTextures].unpackedDir, areaData.mapTileset); bool isInteriorMap = false; - if ((RomInfo.gameVersion == gVerEnum.HeartGold || RomInfo.gameVersion == gVerEnum.SoulSilver) && areaData.areaType == 0x0) + if ((RomInfo.gameVersion == GameVersions.HeartGold || RomInfo.gameVersion == GameVersions.SoulSilver) && areaData.areaType == 0x0) isInteriorMap = true; for (int i = 0; i < eventMapFile.buildings.Count; i++) { @@ -5303,15 +5313,15 @@ namespace DSPRE { RomInfo.SetOWtable(); RomInfo.Set3DOverworldsDict(); - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { DSUtils.TryUnpackNarcs(new List { DirNames.interiorBuildingModels }); } disableHandlers = true; if (File.Exists(RomInfo.OWtablePath)) { switch (RomInfo.gameFamily) { - case gFamEnum.DP: - case gFamEnum.Plat: + case GameFamilies.DP: + case GameFamilies.Plat: break; default: // HGSS Overlay 1 must be decompressed in order to read the overworld table @@ -6381,13 +6391,13 @@ namespace DSPRE { int locNum; switch (RomInfo.gameFamily) { - case gFamEnum.DP: { + case GameFamilies.DP: { HeaderDP h = (HeaderDP)destHeader; locNum = h.locationName; break; } - case gFamEnum.Plat: { + case GameFamilies.Plat: { HeaderPt h = (HeaderPt)destHeader; locNum = h.locationName; @@ -8134,8 +8144,8 @@ namespace DSPRE { string[] lightTypes; switch (RomInfo.gameFamily) { - case gFamEnum.DP: - case gFamEnum.Plat: + case GameFamilies.DP: + case GameFamilies.Plat: lightTypes = new string[3] { "Day/Night Light", "Model's light", "Unknown Light" }; break; default: @@ -8363,7 +8373,7 @@ namespace DSPRE { areaDataLightTypeComboBox.SelectedIndex = currentAreaData.lightType; disableHandlers = true; - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { areaDataDynamicTexturesNumericUpDown.Value = currentAreaData.dynamicTextureType; bool interior = currentAreaData.areaType == 0; @@ -8540,7 +8550,7 @@ namespace DSPRE { overlayCameraTblOffset = RAMaddresses[0] - DSUtils.GetOverlayRAMAddress(RomInfo.cameraTblOverlayNumber); using (DSUtils.EasyReader br = new DSUtils.EasyReader(camOverlayPath, overlayCameraTblOffset)) { - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { currentCameraTable = new GameCamera[17]; for (int i = 0; i < currentCameraTable.Length; i++) { currentCameraTable[i] = new GameCamera(br.ReadUInt32(), br.ReadInt16(), br.ReadInt16(), br.ReadInt16(), @@ -8690,7 +8700,7 @@ namespace DSPRE { uint entrySize = 4; uint tableSizeOffset = 10; - if (gameFamily == gFamEnum.HGSS) { + if (gameFamily == GameFamilies.HGSS) { entrySize += 2; tableSizeOffset += 2; encounterSSEQAltUpDown.Enabled = true; @@ -8702,7 +8712,7 @@ namespace DSPRE { uint entryOffset = (uint)ar.BaseStream.Position; byte tclass = (byte)ar.ReadUInt16(); ushort musicD = ar.ReadUInt16(); - ushort? musicN = gameFamily == gFamEnum.HGSS ? ar.ReadUInt16() : (ushort?)null; + ushort? musicN = gameFamily == GameFamilies.HGSS ? ar.ReadUInt16() : (ushort?)null; trainerClassEncounterMusicDict[tclass] = (entryOffset, musicD, musicN); } } @@ -8846,7 +8856,7 @@ namespace DSPRE { pokemonSpecies[i] = new SpeciesFile(new FileStream(RomInfo.gameDirs[DirNames.personalPokeData].unpackedDir + "\\" + i.ToString("D4"), FileMode.Open)); } - if (gameFamily == gFamEnum.HGSS) { + if (gameFamily == GameFamilies.HGSS) { foreach (ComboBox partyGenderComboBox in partyGenderComboBoxList) { partyGenderComboBox.Visible = true; partyGenderComboBox.Items.Add("Default Gender"); @@ -8858,7 +8868,7 @@ namespace DSPRE { partyGenderComboBox.Visible = false; } - if (gameFamily == gFamEnum.DP) { + if (gameFamily == GameFamilies.DP) { foreach (ComboBox partyFormComboBox in partyFormComboBoxList) partyFormComboBox.Visible = false; @@ -9165,7 +9175,7 @@ namespace DSPRE { currentTrainerFile.party[i].difficulty = (byte)partyIVUpdownList[i].Value; - if (hasMoreThanOneGender((int)currentTrainerFile.party[i].pokeID, pokemonSpecies) && gameFamily == gFamEnum.HGSS) { + if (hasMoreThanOneGender((int)currentTrainerFile.party[i].pokeID, pokemonSpecies) && gameFamily == GameFamilies.HGSS) { switch (partyGenderComboBoxList[i].SelectedIndex) { case TRAINER_PARTY_POKEMON_GENDER_DEFAULT_INDEX: currentTrainerFile.party[i].genderAndAbilityFlags = PartyPokemon.GenderAndAbilityFlags.NO_FLAGS; @@ -9280,7 +9290,7 @@ namespace DSPRE { encounterSSEQMainUpDown.Value = 0; } - eyeContactMusicAltLabel.Enabled = encounterSSEQAltUpDown.Enabled = (encounterSSEQMainUpDown.Enabled && gameFamily == gFamEnum.HGSS); + eyeContactMusicAltLabel.Enabled = encounterSSEQAltUpDown.Enabled = (encounterSSEQMainUpDown.Enabled && gameFamily == GameFamilies.HGSS); encounterSSEQAltUpDown.Value = output.musicN != null ? (ushort)output.musicN : 0; currentTrainerFile.trp.trainerClass = (byte)selection; } @@ -9294,7 +9304,7 @@ namespace DSPRE { string tilesFilename = tilesFileID.ToString("D4"); trainerTile = new NCGR(gameDirs[DirNames.trainerGraphics].unpackedDir + "\\" + tilesFilename, tilesFileID, tilesFilename); - if (gameFamily == gFamEnum.DP) { + if (gameFamily == GameFamilies.DP) { return 0; } @@ -9447,7 +9457,7 @@ namespace DSPRE { } disableHandlers = false; - if (gameFamily.Equals(gFamEnum.HGSS) && tableEditorIsReady) { + if (gameFamily.Equals(GameFamilies.HGSS) && tableEditorIsReady) { pbEffectsTrainerCombobox.Items[selectedTrClass] = trainerClassListBox.Items[selectedTrClass]; for (int i = 0; i < vsTrainerEffectsList.Count; i++) { if (vsTrainerEffectsList[i].trainerClass == selectedTrClass) { @@ -9483,7 +9493,7 @@ namespace DSPRE { partyAbilityComboBoxList[partyPokemonPosition].Items.Add(ability1); //if the name " -" is returned for ability 2 then there is no ability 2 - if (ability2.Equals(" -") || ability2.Equals(ability1) || gameFamily != gFamEnum.HGSS) { + if (ability2.Equals(" -") || ability2.Equals(ability1) || gameFamily != GameFamilies.HGSS) { partyAbilityComboBoxList[partyPokemonPosition].Enabled = false; } else { partyAbilityComboBoxList[partyPokemonPosition].Items.Add(ability2); @@ -9497,7 +9507,7 @@ namespace DSPRE { int currentPokemonGenderRatio = pokemonSpecies[partyPokemonComboboxList[partyPokemonPosition].SelectedIndex].GenderRatioMaleToFemale; PartyPokemon.GenderAndAbilityFlags currentPokemonGenderAndAbilityFlags = currentTrainerFile.party[partyPokemonPosition].genderAndAbilityFlags; - if (gameFamily == gFamEnum.HGSS) { + if (gameFamily == GameFamilies.HGSS) { switch (currentPokemonGenderRatio) { case GENDER_RATIO_MALE: partyGenderComboBoxList[partyPokemonPosition].SelectedIndex = TRAINER_PARTY_POKEMON_GENDER_MALE_INDEX; @@ -9530,7 +9540,7 @@ namespace DSPRE { switch (pokemonID) { case PICHU_ID_NUM: - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { pokemonFormNames.Add("Non-Spiky-Eared"); pokemonFormNames.Add("Spiky-Eared"); } else { @@ -9588,7 +9598,7 @@ namespace DSPRE { } private void setTrainerPartyPokemonForm(int partyPokemonPosition) { - if (gameFamily != gFamEnum.DP) { + if (gameFamily != GameFamilies.DP) { partyFormComboBoxList[partyPokemonPosition].Items.Clear(); List currentPokemonFormName = getPokemonFormNames(partyPokemonComboboxList[partyPokemonPosition].SelectedIndex); foreach (string formName in currentPokemonFormName) @@ -9627,7 +9637,7 @@ namespace DSPRE { private void SetupConditionalMusicTable() { switch (RomInfo.gameFamily) { - case gFamEnum.HGSS: + case GameFamilies.HGSS: RomInfo.SetConditionalMusicTableOffsetToRAMAddress(); conditionalMusicTable = new List<(ushort, ushort, ushort)>(); @@ -9656,7 +9666,7 @@ namespace DSPRE { } break; - case gFamEnum.Plat: + case GameFamilies.Plat: pbEffectsMonGroupBox.Enabled = false; pbEffectsTrainerGroupBox.Enabled = false; conditionalMusicGroupBox.Enabled = false; @@ -9671,7 +9681,7 @@ namespace DSPRE { } } private void SetupBattleEffectsTables() { - if (RomInfo.gameFamily == gFamEnum.HGSS || RomInfo.gameFamily == gFamEnum.Plat) { + if (RomInfo.gameFamily == GameFamilies.HGSS || RomInfo.gameFamily == GameFamilies.Plat) { DSUtils.TryUnpackNarcs(new List { DirNames.trainerGraphics, DirNames.textArchives, @@ -9688,7 +9698,7 @@ namespace DSPRE { byte comboTableEntriesCount; - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { comboTableEntriesCount = DSUtils.ARM9.ReadByte(RomInfo.effectsComboTableOffsetToSizeLimiter); vsPokemonEffectsList = new List<(int pokemonID, int comboID)>(); @@ -9721,7 +9731,7 @@ namespace DSPRE { String expArmPath = RomInfo.gameDirs[DirNames.synthOverlay].unpackedDir + '\\' + ROMToolboxDialog.expandedARMfileID.ToString("D4"); - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { using (DSUtils.EasyReader ar = new DSUtils.EasyReader(ROMToolboxDialog.flag_TrainerClassBattleTableRepointed ? expArmPath : RomInfo.arm9Path, vsTrainerTableStartAddress)) { byte trainerTableEntriesCount = DSUtils.ARM9.ReadByte(RomInfo.vsTrainerEntryTableOffsetToSizeLimiter); @@ -9763,7 +9773,7 @@ namespace DSPRE { } } - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { var items = pbEffectsCombosListbox.Items.Cast().ToArray(); pbEffectsPokemonChooseMainCombobox.Items.Clear(); @@ -9818,13 +9828,13 @@ namespace DSPRE { MapHeader selected = MapHeader.LoadFromARM9(newTuple.header); switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: locationNameConditionalMusicLBL.Text = RomInfo.GetLocationNames()[(selected as HeaderDP).locationName]; break; - case gFamEnum.Plat: + case GameFamilies.Plat: locationNameConditionalMusicLBL.Text = RomInfo.GetLocationNames()[(selected as HeaderPt).locationName]; break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: locationNameConditionalMusicLBL.Text = RomInfo.GetLocationNames()[(selected as HeaderHGSS).locationName]; break; } @@ -9880,7 +9890,7 @@ namespace DSPRE { string updatedEntry = "Combo " + index.ToString("D2") + " - " + "Effect #" + battleIntroEffect + ", " + "Music #" + battleMusic; pbEffectsCombosListbox.Items[index] = updatedEntry; - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { pbEffectsTrainerChooseMainCombobox.Items[index] = pbEffectsPokemonChooseMainCombobox.Items[index] = updatedEntry; } disableHandlers = false; @@ -9921,7 +9931,7 @@ namespace DSPRE { private void HOWpbEffectsTableButton_Click(object sender, EventArgs e) { MessageBox.Show("An entry of this table is a combination of VS. Graphics + Battle Theme.\n\n" + - (RomInfo.gameFamily.Equals(gFamEnum.HGSS) ? "Each entry can be \"inherited\" by one or more Pokémon or Trainer classes." : ""), + (RomInfo.gameFamily.Equals(GameFamilies.HGSS) ? "Each entry can be \"inherited\" by one or more Pokémon or Trainer classes." : ""), "How this table works", MessageBoxButtons.OK, MessageBoxIcon.Information); } diff --git a/DS_Map/Main Window.resx b/DS_Map/Main Window.resx index 3281ac8..773342c 100644 --- a/DS_Map/Main Window.resx +++ b/DS_Map/Main Window.resx @@ -1036,96 +1036,6 @@ p3S+M+m1V1me9QgCUQNXX2YRT1sYHBiEP3wHVbp3PF3cB40GbrzN86xHENrScf1NDsl8FaI4jODMHOgS SOacfYAmbr5XeNYjGH7yDReXv+JeNIUhUYwFpmZjDz+nMLf5B3b2rcZ5tju4ntjtFw4T54j+v2g/t9NH 9AiCIPwGJelqUAd/T3AAAAAASUVORK5CYII= - - - - 239, 17 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM - EgAAAk1TRnQBSQFMAgEBCgEAAaABGwGgARsBEAEAARABAAT/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/PokemonEditor.cs b/DS_Map/PokemonEditor.cs index b0276c0..b222a58 100644 --- a/DS_Map/PokemonEditor.cs +++ b/DS_Map/PokemonEditor.cs @@ -14,12 +14,6 @@ namespace DSPRE { public partial class PokemonEditor : Form { public PokemonEditor(string[] itemNames, string[] abilityNames, string[] moveNames) { InitializeComponent(); - foreach (var cb in Controls.OfType()) { - cb.Resize += (sender, e) => { - if (!cb.Focused) - cb.SelectionLength = 0; - }; - } IsMdiContainer = true; PersonalDataEditor personalEditor = new PersonalDataEditor(itemNames, abilityNames, evoPage); diff --git a/DS_Map/ROMFiles/AreaData.cs b/DS_Map/ROMFiles/AreaData.cs index cc2d400..a724da1 100644 --- a/DS_Map/ROMFiles/AreaData.cs +++ b/DS_Map/ROMFiles/AreaData.cs @@ -24,7 +24,7 @@ namespace DSPRE.ROMFiles { buildingsTileset = reader.ReadUInt16(); mapTileset = reader.ReadUInt16(); - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { dynamicTextureType = reader.ReadUInt16(); areaType = reader.ReadByte(); lightType = reader.ReadByte(); @@ -44,7 +44,7 @@ namespace DSPRE.ROMFiles { writer.Write(buildingsTileset); writer.Write(mapTileset); - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { writer.Write(dynamicTextureType); writer.Write(areaType); writer.Write((byte)lightType); diff --git a/DS_Map/ROMFiles/MapFile.cs b/DS_Map/ROMFiles/MapFile.cs index bced3aa..71f9d20 100644 --- a/DS_Map/ROMFiles/MapFile.cs +++ b/DS_Map/ROMFiles/MapFile.cs @@ -76,9 +76,9 @@ namespace DSPRE.ROMFiles { #endregion #region Constructors (1) - public MapFile(string path, gFamEnum gFamily, bool discardMoveperms = false, bool showMessages = true) : this (new FileStream(path, FileMode.Open), gFamily, discardMoveperms, showMessages) {} - public MapFile(int mapNumber, gFamEnum gFamily, bool discardMoveperms = false, bool showMessages = true) : this(RomInfo.gameDirs[DirNames.maps].unpackedDir + "\\" + mapNumber.ToString("D4"), gFamily, discardMoveperms, showMessages) { } - public MapFile(Stream data, gFamEnum gFamily, bool discardMoveperms = false, bool showMessages = true) { + public MapFile(string path, GameFamilies gFamily, bool discardMoveperms = false, bool showMessages = true) : this (new FileStream(path, FileMode.Open), gFamily, discardMoveperms, showMessages) {} + public MapFile(int mapNumber, GameFamilies gFamily, bool discardMoveperms = false, bool showMessages = true) : this(RomInfo.gameDirs[DirNames.maps].unpackedDir + "\\" + mapNumber.ToString("D4"), gFamily, discardMoveperms, showMessages) { } + public MapFile(Stream data, GameFamilies gFamily, bool discardMoveperms = false, bool showMessages = true) { using (BinaryReader reader = new BinaryReader(data)) { /* Read sections lengths */ int permissionsSectionLength = reader.ReadInt32(); @@ -87,7 +87,7 @@ namespace DSPRE.ROMFiles { int bdhcSectionLength = reader.ReadInt32(); /* Read background sounds section */ - if (gFamily == gFamEnum.HGSS) { //Map must be loaded as HGSS + if (gFamily == GameFamilies.HGSS) { //Map must be loaded as HGSS ushort bgsSignature = reader.ReadUInt16(); if (bgsSignature == 0x1234) { ushort bgsDataLength = reader.ReadUInt16(); @@ -227,7 +227,7 @@ namespace DSPRE.ROMFiles { writer.Write(bdhc.Length); /* Write soundplate section for HG/SS */ - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { writer.Write(bgs); } diff --git a/DS_Map/ROMFiles/MapHeader.cs b/DS_Map/ROMFiles/MapHeader.cs index 425f383..f0c19d3 100644 --- a/DS_Map/ROMFiles/MapHeader.cs +++ b/DS_Map/ROMFiles/MapHeader.cs @@ -128,32 +128,32 @@ namespace DSPRE.ROMFiles { #endregion Fields #region Methods (1) - public static MapHeader LoadFromByteArray(byte[] headerData, ushort headerNumber, gFamEnum gameFamily = gFamEnum.NULL) { + public static MapHeader LoadFromByteArray(byte[] headerData, ushort headerNumber, GameFamilies gameFamily = GameFamilies.NULL) { /* Encapsulate header data into the class appropriate for the gameVersion */ if (headerData.Length < MapHeader.length) { MessageBox.Show("File of header " + headerNumber + " is too small and can't store header data.", "Header file too small", MessageBoxButtons.OK, MessageBoxIcon.Error); return null; } - if (gameFamily == gFamEnum.NULL) { + if (gameFamily == GameFamilies.NULL) { gameFamily = RomInfo.gameFamily; } switch (gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: return new HeaderDP(headerNumber, new MemoryStream(headerData)); - case gFamEnum.Plat: + case GameFamilies.Plat: return new HeaderPt(headerNumber, new MemoryStream(headerData)); default: return new HeaderHGSS(headerNumber, new MemoryStream(headerData)); } } - public static MapHeader LoadFromFile(string filename, ushort headerNumber, long offsetInFile, gFamEnum gameFamily = gFamEnum.NULL) { + public static MapHeader LoadFromFile(string filename, ushort headerNumber, long offsetInFile, GameFamilies gameFamily = GameFamilies.NULL) { /* Calculate header offset and load data */ byte[] headerData = DSUtils.ReadFromFile(filename, offsetInFile, MapHeader.length); return LoadFromByteArray(headerData, headerNumber, gameFamily); } - public static MapHeader LoadFromARM9(ushort headerNumber, gFamEnum gameFamily = gFamEnum.NULL) { + public static MapHeader LoadFromARM9(ushort headerNumber, GameFamilies gameFamily = GameFamilies.NULL) { long headerOffset = RomInfo.headerTableOffset + MapHeader.length * headerNumber; return LoadFromFile(RomInfo.arm9Path, headerNumber, headerOffset, gameFamily); } diff --git a/DS_Map/ROMFiles/ScriptCommand.cs b/DS_Map/ROMFiles/ScriptCommand.cs index a847097..8472bb2 100644 --- a/DS_Map/ROMFiles/ScriptCommand.cs +++ b/DS_Map/ROMFiles/ScriptCommand.cs @@ -90,42 +90,42 @@ namespace DSPRE.ROMFiles { break; case 0x00B0: // Warp [HGSS] - if (RomInfo.gameFamily.Equals(RomInfo.gFamEnum.HGSS)) { + if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.HGSS)) { name += FormatCmd_Warp(parametersList); } else { goto default; } break; case 0x0152: // SetOverworldDefaultPosition [HGSS] - if (RomInfo.gameFamily.Equals(RomInfo.gFamEnum.HGSS)) { + if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.HGSS)) { name += FormatCmd_Overworld_TwoParams(parametersList); } else { goto default; } break; case 0x0153: // SetOverworldPosition [HGSS] - if (RomInfo.gameFamily.Equals(RomInfo.gFamEnum.HGSS)) { + if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.HGSS)) { name += FormatCmd_Overworld_3Coords_Dir(parametersList); } else { goto default; } break; case 0x0154: // SetOverworldDefaultMovement [HGSS] - if (RomInfo.gameFamily.Equals(RomInfo.gFamEnum.HGSS)) { + if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.HGSS)) { name += FormatCmd_Overworld_Move(parametersList); } else { goto default; } break; case 0x0155: // SetOverworldDefaultDirection [DPPt] - if (RomInfo.gameFamily.Equals(RomInfo.gFamEnum.HGSS)) { + if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.HGSS)) { name += FormatCmd_Overworld_Dir(parametersList); } else { goto default; } break; case 0x0158: // SetOverworldDirection [DPPt] - if (RomInfo.gameFamily.Equals(RomInfo.gFamEnum.HGSS)) { + if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.HGSS)) { name += FormatCmd_Overworld_Dir(parametersList); } else { goto default; @@ -133,42 +133,42 @@ namespace DSPRE.ROMFiles { break; case 0x00BE: // Warp [DPPt] - if (RomInfo.gameFamily.Equals(RomInfo.gFamEnum.DP) || RomInfo.gameFamily.Equals(RomInfo.gFamEnum.Plat)) { + if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.DP) || RomInfo.gameFamily.Equals(RomInfo.GameFamilies.Plat)) { name += FormatCmd_Warp(parametersList); } else { goto default; } break; case 0x0186: // SetOverworldDefaultPosition [DPPt] - if (RomInfo.gameFamily.Equals(RomInfo.gFamEnum.DP) || RomInfo.gameFamily.Equals(RomInfo.gFamEnum.Plat)) { + if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.DP) || RomInfo.gameFamily.Equals(RomInfo.GameFamilies.Plat)) { name += FormatCmd_Overworld_TwoParams(parametersList); } else { goto default; } break; case 0x0187: // SetOverworldPosition [DPPt] - if (RomInfo.gameFamily.Equals(RomInfo.gFamEnum.DP) || RomInfo.gameFamily.Equals(RomInfo.gFamEnum.Plat)) { + if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.DP) || RomInfo.gameFamily.Equals(RomInfo.GameFamilies.Plat)) { name += FormatCmd_Overworld_3Coords_Dir(parametersList); } else { goto default; } break; case 0x0188: // SetOverworldDefaultMovement [DPPt] - if (RomInfo.gameFamily.Equals(RomInfo.gFamEnum.DP) || RomInfo.gameFamily.Equals(RomInfo.gFamEnum.Plat)) { + if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.DP) || RomInfo.gameFamily.Equals(RomInfo.GameFamilies.Plat)) { name += FormatCmd_Overworld_Move(parametersList); } else { goto default; } break; case 0x0189: // SetOverworldDefaultDirection [DPPt] - if (RomInfo.gameFamily.Equals(RomInfo.gFamEnum.DP) || RomInfo.gameFamily.Equals(RomInfo.gFamEnum.Plat)) { + if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.DP) || RomInfo.gameFamily.Equals(RomInfo.GameFamilies.Plat)) { name += FormatCmd_Overworld_Dir(parametersList); } else { goto default; } break; case 0x018C: // SetOverworldDirection [DPPt] - if (RomInfo.gameFamily.Equals(RomInfo.gFamEnum.DP) || RomInfo.gameFamily.Equals(RomInfo.gFamEnum.Plat)) { + if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.DP) || RomInfo.gameFamily.Equals(RomInfo.GameFamilies.Plat)) { name += FormatCmd_Overworld_Dir(parametersList); } else { goto default; diff --git a/DS_Map/ROMFiles/ScriptFile.cs b/DS_Map/ROMFiles/ScriptFile.cs index ccdc1bb..864abdc 100644 --- a/DS_Map/ROMFiles/ScriptFile.cs +++ b/DS_Map/ROMFiles/ScriptFile.cs @@ -211,8 +211,8 @@ namespace DSPRE.ROMFiles { /* How to read parameters for different commands for DPPt*/ switch (RomInfo.gameFamily) { - case gFamEnum.DP: - case gFamEnum.Plat: + case GameFamilies.DP: + case GameFamilies.Plat: switch (id) { case 0x16: //Jump case 0x1A: //Call @@ -318,7 +318,7 @@ namespace DSPRE.ROMFiles { } break; case 0x2C5: { - if (RomInfo.gameVersion == gVerEnum.Platinum) { + if (RomInfo.gameVersion == GameVersions.Platinum) { parameterList.Add(dataReader.ReadBytes(2)); parameterList.Add(dataReader.ReadBytes(2)); } else { @@ -330,13 +330,13 @@ namespace DSPRE.ROMFiles { case 0x2C9: case 0x2CA: case 0x2CD: - if (RomInfo.gameVersion == gVerEnum.Platinum) { + if (RomInfo.gameVersion == GameVersions.Platinum) { break; } else { goto default; } case 0x2CF: - if (RomInfo.gameVersion == gVerEnum.Platinum) { + if (RomInfo.gameVersion == GameVersions.Platinum) { parameterList.Add(dataReader.ReadBytes(2)); parameterList.Add(dataReader.ReadBytes(2)); } else { @@ -348,7 +348,7 @@ namespace DSPRE.ROMFiles { break; } break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: switch (id) { case 0x16: //Jump case 0x1A: //Call diff --git a/DS_Map/ROMFiles/TrainerFile.cs b/DS_Map/ROMFiles/TrainerFile.cs index 567cf22..1aba11d 100644 --- a/DS_Map/ROMFiles/TrainerFile.cs +++ b/DS_Map/ROMFiles/TrainerFile.cs @@ -78,7 +78,7 @@ namespace DSPRE.ROMFiles { writer.Write(move); } } - if (RomInfo.gameFamily == RomInfo.gFamEnum.HGSS || RomInfo.gameFamily == RomInfo.gFamEnum.Plat) + if (RomInfo.gameFamily == RomInfo.GameFamilies.HGSS || RomInfo.gameFamily == RomInfo.GameFamilies.Plat) writer.Write(ballSeals); // Diamond and Pearl apparently dont save ball capsule data in enemy trainer pokedata!!! } return newData.ToArray(); @@ -249,7 +249,7 @@ namespace DSPRE.ROMFiles { } - if (RomInfo.gameFamily == RomInfo.gFamEnum.HGSS || RomInfo.gameFamily == RomInfo.gFamEnum.Plat) + if (RomInfo.gameFamily == RomInfo.GameFamilies.HGSS || RomInfo.gameFamily == RomInfo.GameFamilies.Plat) content[i] = new PartyPokemon(difficulty, genderAndAbilityFlags, level, pokemon, form_no, reader.ReadUInt16(), heldItem, moves); else content[i] = new PartyPokemon(difficulty, level, pokemon, heldItem, moves); // Diamond and Pearl apparently dont save ball capsule data in enemy trainer pokedata!!! diff --git a/DS_Map/ROMToolboxDialog.cs b/DS_Map/ROMToolboxDialog.cs index 882130e..d5b9b18 100644 --- a/DS_Map/ROMToolboxDialog.cs +++ b/DS_Map/ROMToolboxDialog.cs @@ -38,7 +38,7 @@ namespace DSPRE { CheckStandardizedItems(); - if (RomInfo.gameLanguage == gLangEnum.English || RomInfo.gameLanguage == gLangEnum.Spanish) { + if (RomInfo.gameLanguage == GameLanguages.English || RomInfo.gameLanguage == GameLanguages.Spanish) { CheckARM9ExpansionApplied(); } else { DisableARM9patch("Unsupported\nlanguage"); @@ -50,31 +50,31 @@ namespace DSPRE { switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: DisableOverlay1patch("Unsupported"); DisableDynamicHeadersPatch("Unsupported"); DisableMatrixExpansionPatch("Unsupported"); DisableScrcmdRepointPatch("Unsupported"); DisableKillTextureAnimationsPatch("Unsupported"); break; - case gFamEnum.Plat: + case GameFamilies.Plat: DisableOverlay1patch("Unsupported"); DisableMatrixExpansionPatch("Unsupported"); DisableScrcmdRepointPatch("Unsupported"); DisableKillTextureAnimationsPatch("Unsupported"); - if (RomInfo.gameLanguage == gLangEnum.English || RomInfo.gameLanguage == gLangEnum.Spanish) { + if (RomInfo.gameLanguage == GameLanguages.English || RomInfo.gameLanguage == GameLanguages.Spanish) { CheckBDHCamPatchApplied(); } CheckDynamicHeadersPatchApplied(); break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: if (!DSUtils.CheckOverlayHasCompressionFlag(1)) { DisableOverlay1patch("Already applied"); overlay1CB.Visible = true; } - if (RomInfo.gameLanguage == gLangEnum.English || RomInfo.gameLanguage == gLangEnum.Spanish) { + if (RomInfo.gameLanguage == GameLanguages.English || RomInfo.gameLanguage == GameLanguages.Spanish) { CheckBDHCamPatchApplied(); CheckMatrixExpansionApplied(); CheckScrcmdRepointPatchApplied(); @@ -264,8 +264,8 @@ namespace DSPRE { DisableARM9patch("Already applied"); switch (RomInfo.gameFamily) { - case gFamEnum.Plat: - case gFamEnum.HGSS: + case GameFamilies.Plat: + case GameFamilies.HGSS: BDHCamARM9requiredLBL.Visible = false; BDHCamPatchButton.Enabled = true; BDHCamPatchLBL.Enabled = true; @@ -364,7 +364,7 @@ namespace DSPRE { private void BDHCAMPatchButton_Click(object sender, EventArgs e) { BDHCAMPatchData data = new BDHCAMPatchData(); - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { if (DSUtils.CheckOverlayHasCompressionFlag(data.overlayNumber)) { DialogResult d1 = MessageBox.Show("It is STRONGLY recommended to configure Overlay1 as uncompressed before proceeding.\n\n" + "More details in the following dialog.\n\n" + "Do you want to know more?", @@ -513,7 +513,7 @@ namespace DSPRE { }; //Distortion world - turnback cave Griseous Orb fix - if (gameFamily.Equals(gFamEnum.Plat)) { + if (gameFamily.Equals(GameFamilies.Plat)) { string ow9path = DSUtils.GetOverlayPath(9); int ow9offs = 0x8E20 + 10; @@ -590,8 +590,8 @@ namespace DSPRE { ROMToolboxDialog.flag_arm9Expanded = true; switch (RomInfo.gameFamily) { - case gFamEnum.Plat: - case gFamEnum.HGSS: + case GameFamilies.Plat: + case GameFamilies.HGSS: BDHCamPatchButton.Text = "Apply Patch"; BDHCamPatchButton.Enabled = true; BDHCamPatchLBL.Enabled = true; @@ -660,7 +660,7 @@ namespace DSPRE { DynamicHeadersPatchData data = new DynamicHeadersPatchData(); var headersDir = RomInfo.gameDirs[DirNames.dynamicHeaders]; - bool specialCase = RomInfo.gameFamily == gFamEnum.HGSS && RomInfo.gameLanguage != gLangEnum.Japanese && RomInfo.gameLanguage != gLangEnum.Spanish; + bool specialCase = RomInfo.gameFamily == GameFamilies.HGSS && RomInfo.gameLanguage != GameLanguages.Japanese && RomInfo.gameLanguage != GameLanguages.Spanish; string specialCaseChanges = ""; if (specialCase) { diff --git a/DS_Map/Resources/PokeDatabase.cs b/DS_Map/Resources/PokeDatabase.cs index f938da6..2deb915 100644 --- a/DS_Map/Resources/PokeDatabase.cs +++ b/DS_Map/Resources/PokeDatabase.cs @@ -612,42 +612,42 @@ namespace DSPRE.Resources { } } public static class System { - public static Dictionary versionsDict = new Dictionary() { - ["ADAE"] = gVerEnum.Diamond, - ["ADAS"] = gVerEnum.Diamond, - ["ADAI"] = gVerEnum.Diamond, - ["ADAF"] = gVerEnum.Diamond, - ["ADAD"] = gVerEnum.Diamond, - ["ADAJ"] = gVerEnum.Diamond, + public static Dictionary versionsDict = new Dictionary() { + ["ADAE"] = GameVersions.Diamond, + ["ADAS"] = GameVersions.Diamond, + ["ADAI"] = GameVersions.Diamond, + ["ADAF"] = GameVersions.Diamond, + ["ADAD"] = GameVersions.Diamond, + ["ADAJ"] = GameVersions.Diamond, - ["APAE"] = gVerEnum.Pearl, - ["APAS"] = gVerEnum.Pearl, - ["APAI"] = gVerEnum.Pearl, - ["APAF"] = gVerEnum.Pearl, - ["APAD"] = gVerEnum.Pearl, - ["APAJ"] = gVerEnum.Pearl, + ["APAE"] = GameVersions.Pearl, + ["APAS"] = GameVersions.Pearl, + ["APAI"] = GameVersions.Pearl, + ["APAF"] = GameVersions.Pearl, + ["APAD"] = GameVersions.Pearl, + ["APAJ"] = GameVersions.Pearl, - ["CPUE"] = gVerEnum.Platinum, - ["CPUS"] = gVerEnum.Platinum, - ["CPUI"] = gVerEnum.Platinum, - ["CPUF"] = gVerEnum.Platinum, - ["CPUD"] = gVerEnum.Platinum, - ["CPUJ"] = gVerEnum.Platinum, - ["CPUP"] = gVerEnum.Platinum, + ["CPUE"] = GameVersions.Platinum, + ["CPUS"] = GameVersions.Platinum, + ["CPUI"] = GameVersions.Platinum, + ["CPUF"] = GameVersions.Platinum, + ["CPUD"] = GameVersions.Platinum, + ["CPUJ"] = GameVersions.Platinum, + ["CPUP"] = GameVersions.Platinum, - ["IPKE"] = gVerEnum.HeartGold, - ["IPKS"] = gVerEnum.HeartGold, - ["IPKI"] = gVerEnum.HeartGold, - ["IPKF"] = gVerEnum.HeartGold, - ["IPKD"] = gVerEnum.HeartGold, - ["IPKJ"] = gVerEnum.HeartGold, + ["IPKE"] = GameVersions.HeartGold, + ["IPKS"] = GameVersions.HeartGold, + ["IPKI"] = GameVersions.HeartGold, + ["IPKF"] = GameVersions.HeartGold, + ["IPKD"] = GameVersions.HeartGold, + ["IPKJ"] = GameVersions.HeartGold, - ["IPGE"] = gVerEnum.SoulSilver, - ["IPGS"] = gVerEnum.SoulSilver, - ["IPGI"] = gVerEnum.SoulSilver, - ["IPGF"] = gVerEnum.SoulSilver, - ["IPGD"] = gVerEnum.SoulSilver, - ["IPGJ"] = gVerEnum.SoulSilver + ["IPGE"] = GameVersions.SoulSilver, + ["IPGS"] = GameVersions.SoulSilver, + ["IPGI"] = GameVersions.SoulSilver, + ["IPGF"] = GameVersions.SoulSilver, + ["IPGD"] = GameVersions.SoulSilver, + ["IPGJ"] = GameVersions.SoulSilver }; public static Dictionary MapCollisionPainters = new Dictionary() { diff --git a/DS_Map/Resources/ROMToolboxDB/ToolboxDB.cs b/DS_Map/Resources/ROMToolboxDB/ToolboxDB.cs index e577255..d844273 100644 --- a/DS_Map/Resources/ROMToolboxDB/ToolboxDB.cs +++ b/DS_Map/Resources/ROMToolboxDB/ToolboxDB.cs @@ -14,36 +14,36 @@ namespace DSPRE.Resources.ROMToolboxDB { internal uint initOffset; public static Dictionary arm9ExpansionCodeDB = new Dictionary() { - ["branchString" + "_" + RomInfo.gFamEnum.DP + "_" + RomInfo.gLangEnum.English] = "05 F1 34 FC", - ["branchString" + "_" + RomInfo.gFamEnum.DP + "_" + RomInfo.gLangEnum.Spanish] = "05 F1 04 FD", - ["branchString" + "_" + RomInfo.gFamEnum.Plat + "_" + RomInfo.gLangEnum.English] = "00 F1 B4 F8", - ["branchString" + "_" + RomInfo.gFamEnum.Plat + "_" + RomInfo.gLangEnum.Spanish] = "00 F1 B2 F9", - ["branchString" + "_" + RomInfo.gFamEnum.HGSS + "_" + RomInfo.gLangEnum.English] = "0F F1 30 FB", - ["branchString" + "_" + RomInfo.gFamEnum.HGSS + "_" + RomInfo.gLangEnum.Spanish] = "0F F1 40 FB", + ["branchString" + "_" + RomInfo.GameFamilies.DP + "_" + RomInfo.GameLanguages.English] = "05 F1 34 FC", + ["branchString" + "_" + RomInfo.GameFamilies.DP + "_" + RomInfo.GameLanguages.Spanish] = "05 F1 04 FD", + ["branchString" + "_" + RomInfo.GameFamilies.Plat + "_" + RomInfo.GameLanguages.English] = "00 F1 B4 F8", + ["branchString" + "_" + RomInfo.GameFamilies.Plat + "_" + RomInfo.GameLanguages.Spanish] = "00 F1 B2 F9", + ["branchString" + "_" + RomInfo.GameFamilies.HGSS + "_" + RomInfo.GameLanguages.English] = "0F F1 30 FB", + ["branchString" + "_" + RomInfo.GameFamilies.HGSS + "_" + RomInfo.GameLanguages.Spanish] = "0F F1 40 FB", - ["initString" + "_" + RomInfo.gFamEnum.DP] = "FC B5 05 48 C0 46 41 21 09 22 02 4D A8 47 00 20 03 21 FC BD F1 64 00 02 00 80 3C 02", //Valid for ENG and ESP, also for P - ["initString" + "_" + RomInfo.gFamEnum.Plat + "_" + RomInfo.gLangEnum.English] = "FC B5 05 48 C0 46 41 21 09 22 02 4D A8 47 00 20 03 21 FC BD A5 6A 00 02 00 80 3C 02", - ["initString" + "_" + RomInfo.gFamEnum.Plat + "_" + RomInfo.gLangEnum.Spanish] = "FC B5 05 48 C0 46 41 21 09 22 02 4D A8 47 00 20 03 21 FC BD B9 6A 00 02 00 80 3C 02", - ["initString" + "_" + RomInfo.gFamEnum.HGSS] = "FC B5 05 48 C0 46 1C 21 00 22 02 4D A8 47 00 20 03 21 FC BD 09 75 00 02 00 80 3C 02" //Valid for ENG and ESP, also for SS + ["initString" + "_" + RomInfo.GameFamilies.DP] = "FC B5 05 48 C0 46 41 21 09 22 02 4D A8 47 00 20 03 21 FC BD F1 64 00 02 00 80 3C 02", //Valid for ENG and ESP, also for P + ["initString" + "_" + RomInfo.GameFamilies.Plat + "_" + RomInfo.GameLanguages.English] = "FC B5 05 48 C0 46 41 21 09 22 02 4D A8 47 00 20 03 21 FC BD A5 6A 00 02 00 80 3C 02", + ["initString" + "_" + RomInfo.GameFamilies.Plat + "_" + RomInfo.GameLanguages.Spanish] = "FC B5 05 48 C0 46 41 21 09 22 02 4D A8 47 00 20 03 21 FC BD B9 6A 00 02 00 80 3C 02", + ["initString" + "_" + RomInfo.GameFamilies.HGSS] = "FC B5 05 48 C0 46 1C 21 00 22 02 4D A8 47 00 20 03 21 FC BD 09 75 00 02 00 80 3C 02" //Valid for ENG and ESP, also for SS }; public static Dictionary arm9ExpansionOffsetsDB = new Dictionary() { - ["branchOffset" + "_" + RomInfo.gFamEnum.DP] = 0x02000C80, //Valid also for P - ["branchOffset" + "_" + RomInfo.gFamEnum.Plat] = 0x02000CB4, - ["branchOffset" + "_" + RomInfo.gFamEnum.HGSS] = 0x02000CD0, //Valid also for SS + ["branchOffset" + "_" + RomInfo.GameFamilies.DP] = 0x02000C80, //Valid also for P + ["branchOffset" + "_" + RomInfo.GameFamilies.Plat] = 0x02000CB4, + ["branchOffset" + "_" + RomInfo.GameFamilies.HGSS] = 0x02000CD0, //Valid also for SS - ["initOffset" + "_" + RomInfo.gFamEnum.DP + "_" + RomInfo.gLangEnum.English] = 0x021064EC, - ["initOffset" + "_" + RomInfo.gFamEnum.DP + "_" + RomInfo.gLangEnum.Spanish] = 0x0210668C, - ["initOffset" + "_" + RomInfo.gFamEnum.Plat + "_" + RomInfo.gLangEnum.English] = 0x02100E20, - ["initOffset" + "_" + RomInfo.gFamEnum.Plat + "_" + RomInfo.gLangEnum.Spanish] = 0x0210101C, - ["initOffset" + "_" + RomInfo.gFamEnum.HGSS + "_" + RomInfo.gLangEnum.English] = 0x02110334, - ["initOffset" + "_" + RomInfo.gFamEnum.HGSS + "_" + RomInfo.gLangEnum.Spanish] = 0x02110354 + ["initOffset" + "_" + RomInfo.GameFamilies.DP + "_" + RomInfo.GameLanguages.English] = 0x021064EC, + ["initOffset" + "_" + RomInfo.GameFamilies.DP + "_" + RomInfo.GameLanguages.Spanish] = 0x0210668C, + ["initOffset" + "_" + RomInfo.GameFamilies.Plat + "_" + RomInfo.GameLanguages.English] = 0x02100E20, + ["initOffset" + "_" + RomInfo.GameFamilies.Plat + "_" + RomInfo.GameLanguages.Spanish] = 0x0210101C, + ["initOffset" + "_" + RomInfo.GameFamilies.HGSS + "_" + RomInfo.GameLanguages.English] = 0x02110334, + ["initOffset" + "_" + RomInfo.GameFamilies.HGSS + "_" + RomInfo.GameLanguages.Spanish] = 0x02110354 }; internal ARM9PatchData() { branchOffset = arm9ExpansionOffsetsDB[nameof(branchOffset) + "_" + RomInfo.gameFamily] - DSUtils.ARM9.address; initOffset = arm9ExpansionOffsetsDB[nameof(initOffset) + "_" + RomInfo.gameFamily + "_" + RomInfo.gameLanguage] - DSUtils.ARM9.address; branchString = arm9ExpansionCodeDB[nameof(branchString) + "_" + RomInfo.gameFamily + "_" + RomInfo.gameLanguage]; - if (RomInfo.gameFamily == gFamEnum.Plat) { + if (RomInfo.gameFamily == GameFamilies.Plat) { initString = arm9ExpansionCodeDB[nameof(initString) + "_" + RomInfo.gameFamily + "_" + RomInfo.gameLanguage]; } else { initString = arm9ExpansionCodeDB[nameof(initString) + "_" + RomInfo.gameFamily]; @@ -65,32 +65,32 @@ namespace DSPRE.Resources.ROMToolboxDB { internal byte[] subroutine; public static Dictionary BDHCamCodeDB = new Dictionary() { - ["branchString" + "_" + RomInfo.gFamEnum.Plat + "_" + RomInfo.gLangEnum.English] = "B9 F3 E2 F8", - ["branchString" + "_" + RomInfo.gFamEnum.Plat + "_" + RomInfo.gLangEnum.Spanish] = "B9 F3 AA F8", - ["branchString" + "_" + RomInfo.gFamEnum.HGSS] = "B6 F3 2E FA", //Also valid for SS, both ESP and ENG + ["branchString" + "_" + RomInfo.GameFamilies.Plat + "_" + RomInfo.GameLanguages.English] = "B9 F3 E2 F8", + ["branchString" + "_" + RomInfo.GameFamilies.Plat + "_" + RomInfo.GameLanguages.Spanish] = "B9 F3 AA F8", + ["branchString" + "_" + RomInfo.GameFamilies.HGSS] = "B6 F3 2E FA", //Also valid for SS, both ESP and ENG ["overlayString1"] = "00 4B 18 47 41 9C 3D 02", ["overlayString2"] = "00 4B 18 47 01 9C 3D 02", }; public static Dictionary BDHCamOffsetsDB = new Dictionary() { - ["branchOffset" + "_" + RomInfo.gFamEnum.Plat + "_" + RomInfo.gLangEnum.English] = 0x0202040C, - ["branchOffset" + "_" + RomInfo.gFamEnum.Plat + "_" + RomInfo.gLangEnum.Spanish] = 0x0202047C, - ["branchOffset" + "_" + RomInfo.gFamEnum.HGSS] = 0x02023174, //Also valid for SS, both ESP and ENG + ["branchOffset" + "_" + RomInfo.GameFamilies.Plat + "_" + RomInfo.GameLanguages.English] = 0x0202040C, + ["branchOffset" + "_" + RomInfo.GameFamilies.Plat + "_" + RomInfo.GameLanguages.Spanish] = 0x0202047C, + ["branchOffset" + "_" + RomInfo.GameFamilies.HGSS] = 0x02023174, //Also valid for SS, both ESP and ENG - ["overlayOffset1" + "_" + RomInfo.gFamEnum.Plat + "_" + RomInfo.gLangEnum.English] = 0x0001E1B4, - ["overlayOffset1" + "_" + RomInfo.gFamEnum.Plat + "_" + RomInfo.gLangEnum.Spanish] = 0x0001E1BC, - ["overlayOffset1" + "_" + RomInfo.gFamEnum.HGSS] = 0x0001574C, + ["overlayOffset1" + "_" + RomInfo.GameFamilies.Plat + "_" + RomInfo.GameLanguages.English] = 0x0001E1B4, + ["overlayOffset1" + "_" + RomInfo.GameFamilies.Plat + "_" + RomInfo.GameLanguages.Spanish] = 0x0001E1BC, + ["overlayOffset1" + "_" + RomInfo.GameFamilies.HGSS] = 0x0001574C, - ["overlayOffset2" + "_" + RomInfo.gFamEnum.Plat + "_" + RomInfo.gLangEnum.English] = 0x0001E2CC, - ["overlayOffset2" + "_" + RomInfo.gFamEnum.Plat + "_" + RomInfo.gLangEnum.Spanish] = 0x0001E2D4, - ["overlayOffset2" + "_" + RomInfo.gFamEnum.HGSS] = 0x00015864, + ["overlayOffset2" + "_" + RomInfo.GameFamilies.Plat + "_" + RomInfo.GameLanguages.English] = 0x0001E2CC, + ["overlayOffset2" + "_" + RomInfo.GameFamilies.Plat + "_" + RomInfo.GameLanguages.Spanish] = 0x0001E2D4, + ["overlayOffset2" + "_" + RomInfo.GameFamilies.HGSS] = 0x00015864, }; public static uint BDHCamSubroutineOffset = 0x000115B0; internal BDHCAMPatchData() { switch (RomInfo.gameFamily) { - case gFamEnum.Plat: + case GameFamilies.Plat: overlayNumber = 5; branchString = BDHCamCodeDB[nameof(branchString) + "_" + RomInfo.gameFamily + "_" + RomInfo.gameLanguage]; @@ -98,7 +98,7 @@ namespace DSPRE.Resources.ROMToolboxDB { overlayOffset1 = BDHCamOffsetsDB[nameof(overlayOffset1) + "_" + RomInfo.gameFamily + "_" + RomInfo.gameLanguage]; overlayOffset2 = BDHCamOffsetsDB[nameof(overlayOffset2) + "_" + RomInfo.gameFamily + "_" + RomInfo.gameLanguage]; break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: overlayNumber = 1; branchString = BDHCamCodeDB[nameof(branchString) + "_" + RomInfo.gameFamily]; @@ -167,9 +167,9 @@ namespace DSPRE.Resources.ROMToolboxDB { return "00 B5 01 1C 32 20 00 22 CC F7 58 F9 03 1C DF F7 49 FC 00 BD"; } } - public static Dictionary[]> dynamicHeadersPointersDB = new Dictionary[]>() { + public static Dictionary[]> dynamicHeadersPointersDB = new Dictionary[]>() { // format: headerID*18 offset, (ARM9_HEADER_TABLE_OFFSET + n) offset - [gFamEnum.Plat] = new Tuple[] { + [GameFamilies.Plat] = new Tuple[] { new Tuple(0x3A03E, 0x3A048), new Tuple(0x3A052, 0x3A05C), new Tuple(0x3A066, 0x3A080), @@ -191,7 +191,7 @@ namespace DSPRE.Resources.ROMToolboxDB { new Tuple(0x3A1F6, 0x3A208), new Tuple(0x3A212, 0x3A224), }, - [gFamEnum.HGSS] = new Tuple[] { + [GameFamilies.HGSS] = new Tuple[] { new Tuple(0x3B282, 0x3B28C), new Tuple(0x3B296, 0x3B2A8), new Tuple(0x3B2B2, 0x3B2BC), @@ -225,7 +225,7 @@ namespace DSPRE.Resources.ROMToolboxDB { initOffset = getDynamicHeadersInitOffset(RomInfo.romID); initString = getDynamicHeadersInitString(RomInfo.romID); - if (RomInfo.gameFamily == gFamEnum.HGSS) { + if (RomInfo.gameFamily == GameFamilies.HGSS) { pointerDiff = (int)(initOffset - getDynamicHeadersInitOffset("IPKE")); } else { pointerDiff = (int)(initOffset - getDynamicHeadersInitOffset("CPUE")); @@ -233,10 +233,10 @@ namespace DSPRE.Resources.ROMToolboxDB { } } - public static Dictionary syntheticOverlayFileNumbersDB = new Dictionary() { - [gFamEnum.DP] = 9, - [gFamEnum.Plat] = 9, - [gFamEnum.HGSS] = 0, + public static Dictionary syntheticOverlayFileNumbersDB = new Dictionary() { + [GameFamilies.DP] = 9, + [GameFamilies.Plat] = 9, + [GameFamilies.HGSS] = 0, }; public static Dictionary matrixExpansionDB = new Dictionary() { diff --git a/DS_Map/RomInfo.cs b/DS_Map/RomInfo.cs index 8420125..a77297e 100644 --- a/DS_Map/RomInfo.cs +++ b/DS_Map/RomInfo.cs @@ -6,7 +6,6 @@ using System.Linq; using DSPRE.Resources; using System; using DSPRE.ROMFiles; -using static DSPRE.RomInfo; namespace DSPRE { @@ -15,49 +14,44 @@ namespace DSPRE { /// public class RomInfo { + public static readonly byte internalNameLength = 16; + public static uint synthOverlayLoadAddress = 0x023C8000; + public Dictionary, (Color background, Color foreground)> MapCellsColorDictionary; public static string folderSuffix = "_DSPRE_contents"; + const string dataFolderName = @"data"; + public static string romID { get; private set; } public static string fileName { get; private set; } public static string workDir { get; private set; } public static string arm9Path { get; private set; } + public static string arm7Path { get; private set; } public static string overlayTablePath { get; set; } + public static string y7Path { get; set; } + public static string dataPath { get; set; } public static string overlayPath { get; set; } - - public static gLangEnum gameLanguage { get; private set; } - public static gVerEnum gameVersion { get; private set; } - public static gFamEnum gameFamily { get; private set; } - - - public static uint synthOverlayLoadAddress = 0x023C8000; + public static string unpackedPath { get; set; } + public static string bannerPath { get; set; } + public static string headerPath { get; set; } + public static GameLanguages gameLanguage { get; private set; } + public static GameVersions gameVersion { get; private set; } + public static GameFamilies gameFamily { get; private set; } public static uint arm9spawnOffset { get; private set; } - public static int initialMoneyOverlayNumber { get; private set; } public static uint initialMoneyOverlayOffset { get; private set; } - public static int cameraTblOverlayNumber { get; private set; } public static uint[] cameraTblOffsetsToRAMaddress { get; private set; } - public static uint headerTableOffset { get; private set; } - public static uint conditionalMusicTableOffsetToRAMAddress { get; internal set; } public static uint encounterMusicTableOffsetToRAMAddress { get; internal set; } - public static uint vsTrainerEntryTableOffsetToRAMAddress { get; internal set; } public static uint vsPokemonEntryTableOffsetToRAMAddress { get; internal set; } public static uint effectsComboTableOffsetToRAMAddress { get; internal set; } - public static uint vsTrainerEntryTableOffsetToSizeLimiter { get; internal set; } public static uint vsPokemonEntryTableOffsetToSizeLimiter { get; internal set; } public static uint effectsComboTableOffsetToSizeLimiter { get; internal set; } - - public static uint OWTableOffset { get; internal set; } public static string OWtablePath { get; private set; } - - public static uint monIconPalTableAddress { get; private set; } - public static int nullEncounterID { get; private set; } - public static int abilityNamesTextNumber { get; private set; } public static int attackNamesTextNumber { get; private set; } public static int[] pokemonNamesTextNumbers { get; private set; } public static int itemNamesTextNumber { get; private set; } @@ -65,37 +59,26 @@ namespace DSPRE { public static int trainerClassMessageNumber { get; private set; } public static int trainerNamesMessageNumber { get; private set; } public static int locationNamesTextNumber { get; private set; } - public static int trainerNameLenOffset { get; private set; } - public static int trainerNameMaxLen { get; private set; } - - public static string internalNamesLocation { get; private set; } - public static readonly byte internalNameLength = 16; + public static string internalNamesPath { get; private set; } public static int cameraSize { get; private set; } - - public Dictionary, (Color background, Color foreground)> MapCellsColorDictionary; public static SortedDictionary OverworldTable { get; private set; } public static uint[] overworldTableKeys { get; private set; } public static Dictionary ow3DSpriteDict { get; private set; } - - public static Dictionary ScriptCommandNamesDict { get; private set; } public static Dictionary ScriptCommandNamesReverseDict { get; private set; } - public static Dictionary ScriptActionNamesDict { get; private set; } public static Dictionary ScriptActionNamesReverseDict { get; private set; } - public static Dictionary ScriptCommandParametersDict { get; private set; } - public static Dictionary ScriptComparisonOperatorsDict { get; private set; } public static Dictionary ScriptComparisonOperatorsReverseDict { get; private set; } - public enum gVerEnum : byte { + public enum GameVersions : byte { Diamond, Pearl, Platinum, HeartGold, SoulSilver, Black, White, Black2, White2 } - public enum gFamEnum : byte { + public enum GameFamilies : byte { NULL, DP, Plat, @@ -103,7 +86,7 @@ namespace DSPRE { BW, BW2 } - public enum gLangEnum : byte { + public enum GameLanguages : byte { English, Japanese, @@ -113,8 +96,6 @@ namespace DSPRE { German } public enum DirNames : byte { - personalPokeData, - synthOverlay, dynamicHeaders, @@ -132,7 +113,10 @@ namespace DSPRE { OWSprites, scripts, + encounters, + headbutt, + safariZone, trainerProperties, trainerParty, @@ -140,24 +124,29 @@ namespace DSPRE { monIcons, - interiorBuildingModels, - learnsets, - evolutions + interiorBuildingModels }; public static Dictionary gameDirs { get; private set; } - #region Constructors (1) public RomInfo(string id, string romName, bool useSuffix = true) { if (!useSuffix) { folderSuffix = ""; } - workDir = Path.GetDirectoryName(romName) + "\\" + Path.GetFileNameWithoutExtension(romName) + folderSuffix + "\\"; - arm9Path = workDir + @"arm9.bin"; - overlayTablePath = workDir + @"y9.bin"; - overlayPath = workDir + "overlay"; - internalNamesLocation = workDir + @"data\fielddata\maptable\mapname.bin"; + string path = Path.GetDirectoryName(romName) + "\\" + Path.GetFileNameWithoutExtension(romName) + folderSuffix + "\\"; + + workDir = path; + arm9Path = Path.Combine(workDir, @"arm9.bin"); + arm7Path = Path.Combine(workDir, @"arm7.bin"); + overlayTablePath = Path.Combine(workDir, @"y9.bin"); + y7Path = Path.Combine(workDir, @"y7.bin"); + dataPath = Path.Combine(workDir, dataFolderName); + overlayPath = Path.Combine(workDir, @"overlay"); + bannerPath = Path.Combine(workDir, @"banner.bin"); + headerPath = Path.Combine(workDir, @"header.bin"); + unpackedPath = Path.Combine(workDir, @"unpacked"); + internalNamesPath = Path.Combine(workDir, $@"{dataFolderName}\fielddata\maptable\mapname.bin"); try { gameVersion = PokeDatabase.System.versionsDict[id]; @@ -177,7 +166,6 @@ namespace DSPRE { SetHeaderTableOffset(); SetNullEncounterID(); - SetAbilityNamesTextNumber(); SetAttackNamesTextNumber(); SetPokemonNamesTextNumber(); SetItemNamesTextNumber(); @@ -185,7 +173,6 @@ namespace DSPRE { SetLocationNamesTextNumber(); SetTrainerNamesMessageNumber(); SetTrainerClassMessageNumber(); - SetTrainerNameLenOffset(); /* System */ ScriptCommandParametersDict = BuildCommandParametersDatabase(gameFamily); @@ -201,16 +188,16 @@ namespace DSPRE { #endregion #region Methods (22) - public static Dictionary BuildCommandNamesDatabase(gFamEnum gameFam) { + public static Dictionary BuildCommandNamesDatabase(GameFamilies gameFam) { Dictionary commonDictionaryNames; Dictionary specificDictionaryNames; switch (gameFam) { - case gFamEnum.DP: + case GameFamilies.DP: commonDictionaryNames = ScriptDatabase.DPPtScrCmdNames; specificDictionaryNames = ScriptDatabase.DPScrCmdNames; break; - case gFamEnum.Plat: + case GameFamilies.Plat: commonDictionaryNames = ScriptDatabase.DPPtScrCmdNames; specificDictionaryNames = ScriptDatabase.PlatScrCmdNames; break; @@ -225,16 +212,16 @@ namespace DSPRE { } return commonDictionaryNames.Concat(specificDictionaryNames).ToLookup(x => x.Key, x => x.Value).ToDictionary(x => x.Key, g => g.First()); } - public static Dictionary BuildCommandParametersDatabase(gFamEnum gameFam) { + public static Dictionary BuildCommandParametersDatabase(GameFamilies gameFam) { Dictionary commonDictionaryParams; Dictionary specificDictionaryParams; switch (gameFam) { - case gFamEnum.DP: + case GameFamilies.DP: commonDictionaryParams = ScriptDatabase.DPPtScrCmdParameters; specificDictionaryParams = ScriptDatabase.DPScrCmdParameters; break; - case gFamEnum.Plat: + case GameFamilies.Plat: commonDictionaryParams = ScriptDatabase.DPPtScrCmdParameters; specificDictionaryParams = ScriptDatabase.PlatScrCmdParameters; break; @@ -249,10 +236,10 @@ namespace DSPRE { } return commonDictionaryParams.Concat(specificDictionaryParams).ToLookup(x => x.Key, x => x.Value).ToDictionary(x => x.Key, g => g.First()); } - public static Dictionary BuildActionNamesDatabase(gFamEnum gameFam) { + public static Dictionary BuildActionNamesDatabase(GameFamilies gameFam) { switch (gameFam) { - case gFamEnum.DP: - case gFamEnum.Plat: + case GameFamilies.DP: + case GameFamilies.Plat: return ScriptDatabase.movementsDictIDName; default: #if false @@ -264,11 +251,11 @@ namespace DSPRE { #endif } } - public static Dictionary BuildComparisonOperatorsDatabase(gFamEnum gameFam) { + public static Dictionary BuildComparisonOperatorsDatabase(GameFamilies gameFam) { switch (gameFam) { - case gFamEnum.DP: - case gFamEnum.Plat: - case gFamEnum.HGSS: + case GameFamilies.DP: + case GameFamilies.Plat: + case GameFamilies.HGSS: return ScriptDatabase.comparisonOperatorsDict; default: var commonDict = ScriptDatabase.comparisonOperatorsDict; @@ -290,68 +277,68 @@ namespace DSPRE { } public static void SetHeaderTableOffset() { switch (gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: switch (gameLanguage) { - case gLangEnum.English: + case GameLanguages.English: headerTableOffset = 0xEEDBC; break; - case gLangEnum.Spanish: + case GameLanguages.Spanish: headerTableOffset = 0xEEE08; break; - case gLangEnum.Italian: + case GameLanguages.Italian: headerTableOffset = 0xEED70; break; - case gLangEnum.French: + case GameLanguages.French: headerTableOffset = 0xEEDFC; break; - case gLangEnum.German: + case GameLanguages.German: headerTableOffset = 0xEEDCC; break; - case gLangEnum.Japanese: - headerTableOffset = gameVersion == gVerEnum.Diamond ? (uint)0xF0D68 : 0xF0D6C; + case GameLanguages.Japanese: + headerTableOffset = gameVersion == GameVersions.Diamond ? (uint)0xF0D68 : 0xF0D6C; break; } break; - case gFamEnum.Plat: + case GameFamilies.Plat: switch (gameLanguage) { - case gLangEnum.English: + case GameLanguages.English: headerTableOffset = 0xE601C; break; - case gLangEnum.Spanish: + case GameLanguages.Spanish: headerTableOffset = 0xE60B0; break; - case gLangEnum.Italian: + case GameLanguages.Italian: headerTableOffset = 0xE6038; break; - case gLangEnum.French: + case GameLanguages.French: headerTableOffset = 0xE60A4; break; - case gLangEnum.German: + case GameLanguages.German: headerTableOffset = 0xE6074; break; - case gLangEnum.Japanese: + case GameLanguages.Japanese: headerTableOffset = 0xE56F0; break; } break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: switch (gameLanguage) { - case gLangEnum.English: + case GameLanguages.English: headerTableOffset = 0xF6BE0; break; - case gLangEnum.Spanish: - headerTableOffset = gameVersion == gVerEnum.HeartGold ? 0xF6BC8 : (uint)0xF6BD0; + case GameLanguages.Spanish: + headerTableOffset = gameVersion == GameVersions.HeartGold ? 0xF6BC8 : (uint)0xF6BD0; break; - case gLangEnum.Italian: + case GameLanguages.Italian: headerTableOffset = 0xF6B58; break; - case gLangEnum.French: + case GameLanguages.French: headerTableOffset = 0xF6BC4; break; - case gLangEnum.German: + case GameLanguages.German: headerTableOffset = 0xF6B94; break; - case gLangEnum.Japanese: + case GameLanguages.Japanese: headerTableOffset = 0xF6390; break; } @@ -360,74 +347,74 @@ namespace DSPRE { } public static void SetupSpawnSettings() { switch (gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: initialMoneyOverlayNumber = 52; initialMoneyOverlayOffset = 0x1E4; switch (gameLanguage) { - case gLangEnum.English: + case GameLanguages.English: arm9spawnOffset = 0xF2B9C; break; - case gLangEnum.Spanish: + case GameLanguages.Spanish: arm9spawnOffset = 0xF2BE8; break; - case gLangEnum.Italian: + case GameLanguages.Italian: arm9spawnOffset = 0xF2B50; break; - case gLangEnum.French: + case GameLanguages.French: arm9spawnOffset = 0xF2BDC; break; - case gLangEnum.German: + case GameLanguages.German: arm9spawnOffset = 0xF2BAC; break; - case gLangEnum.Japanese: + case GameLanguages.Japanese: arm9spawnOffset = 0xF4B48; break; } break; - case gFamEnum.Plat: + case GameFamilies.Plat: initialMoneyOverlayNumber = 57; initialMoneyOverlayOffset = 0x1EC; switch (gameLanguage) { - case gLangEnum.English: + case GameLanguages.English: arm9spawnOffset = 0xEA12C; break; - case gLangEnum.Spanish: + case GameLanguages.Spanish: arm9spawnOffset = 0xEA1C0; break; - case gLangEnum.Italian: + case GameLanguages.Italian: arm9spawnOffset = 0xEA148; break; - case gLangEnum.French: + case GameLanguages.French: arm9spawnOffset = 0xEA1B4; break; - case gLangEnum.German: + case GameLanguages.German: arm9spawnOffset = 0xEA184; break; - case gLangEnum.Japanese: + case GameLanguages.Japanese: arm9spawnOffset = 0xE9800; break; } break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: initialMoneyOverlayNumber = 36; initialMoneyOverlayOffset = 0x2FC; switch (gameLanguage) { - case gLangEnum.English: + case GameLanguages.English: arm9spawnOffset = 0xFA17C; break; - case gLangEnum.Spanish: - arm9spawnOffset = gameVersion == gVerEnum.HeartGold ? 0xFA164 : (uint)0xFA16C; + case GameLanguages.Spanish: + arm9spawnOffset = gameVersion == GameVersions.HeartGold ? 0xFA164 : (uint)0xFA16C; break; - case gLangEnum.Italian: + case GameLanguages.Italian: arm9spawnOffset = 0xFA0F4; break; - case gLangEnum.French: + case GameLanguages.French: arm9spawnOffset = 0xFA160; break; - case gLangEnum.German: + case GameLanguages.German: arm9spawnOffset = 0xFA130; break; - case gLangEnum.Japanese: + case GameLanguages.Japanese: arm9spawnOffset = 0xF992C; break; } @@ -436,28 +423,28 @@ namespace DSPRE { } public static void PrepareCameraData() { switch (gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: cameraTblOverlayNumber = 5; - cameraTblOffsetsToRAMaddress = gameLanguage.Equals(gLangEnum.Japanese) ? (new uint[] { 0x4C50 }) : (new uint[] { 0x4908 }); + cameraTblOffsetsToRAMaddress = gameLanguage.Equals(GameLanguages.Japanese) ? (new uint[] { 0x4C50 }) : (new uint[] { 0x4908 }); cameraSize = 24; break; - case gFamEnum.Plat: + case GameFamilies.Plat: cameraTblOverlayNumber = 5; cameraTblOffsetsToRAMaddress = new uint[] { 0x4E24 }; cameraSize = 24; break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: cameraTblOverlayNumber = 1; cameraSize = 36; switch (gameLanguage) { - case gLangEnum.English: - case gLangEnum.Spanish: - case gLangEnum.French: - case gLangEnum.German: - case gLangEnum.Italian: + case GameLanguages.English: + case GameLanguages.Spanish: + case GameLanguages.French: + case GameLanguages.German: + case GameLanguages.Italian: cameraTblOffsetsToRAMaddress = new uint[] { 0x532C, 0x547C }; break; - case gLangEnum.Japanese: + case GameLanguages.Japanese: cameraTblOffsetsToRAMaddress = new uint[] { 0x5324, 0x5474 }; break; } @@ -466,13 +453,13 @@ namespace DSPRE { } public static void SetOWtable() { switch (gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: OWtablePath = DSUtils.GetOverlayPath(5); switch (gameLanguage) { // Go to the beginning of the overworld table - case gLangEnum.English: + case GameLanguages.English: OWTableOffset = 0x22BCC; break; - case gLangEnum.Japanese: + case GameLanguages.Japanese: OWTableOffset = 0x23BB8; break; default: @@ -480,20 +467,20 @@ namespace DSPRE { break; } break; - case gFamEnum.Plat: + case GameFamilies.Plat: OWtablePath = DSUtils.GetOverlayPath(5); switch (gameLanguage) { // Go to the beginning of the overworld table - case gLangEnum.Italian: + case GameLanguages.Italian: OWTableOffset = 0x2BC44; break; - case gLangEnum.French: - case gLangEnum.Spanish: + case GameLanguages.French: + case GameLanguages.Spanish: OWTableOffset = 0x2BC3C; break; - case gLangEnum.German: + case GameLanguages.German: OWTableOffset = 0x2BC50; break; - case gLangEnum.Japanese: + case GameLanguages.Japanese: OWTableOffset = 0x2BA24; break; default: @@ -501,7 +488,7 @@ namespace DSPRE { break; } break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: if (DSUtils.CheckOverlayHasCompressionFlag(1)) { if (DSUtils.OverlayIsCompressed(1)) { if (DSUtils.DecompressOverlay(1) < 0) { @@ -516,17 +503,17 @@ namespace DSPRE { int ramAddrOfPointer; switch (gameLanguage) { - case gLangEnum.Italian: + case GameLanguages.Italian: ramAddrOfPointer = 0x021F929C; break; - case gLangEnum.French: - case gLangEnum.Spanish: + case GameLanguages.French: + case GameLanguages.Spanish: ramAddrOfPointer = 0x021F931C; break; - case gLangEnum.German: + case GameLanguages.German: ramAddrOfPointer = 0x021F92DC; break; - case gLangEnum.Japanese: + case GameLanguages.Japanese: ramAddrOfPointer = 0x021F86C4; break; default: @@ -536,21 +523,14 @@ namespace DSPRE { using (DSUtils.EasyReader bReader = new DSUtils.EasyReader(ov1Path, ramAddrOfPointer - ov1Address)) { // read the pointer at the specified ram address and adjust accordingly below uint ramAddressOfTable = bReader.ReadUInt32(); - if ((ramAddressOfTable >> 0x18) != 0x02) { + if (ramAddressOfTable >= 0x03000000) { MessageBox.Show("Something went wrong reading the Overworld configuration table.\nOverworld sprites in the Event Editor will be " + "displayed incorrectly or not displayed at all.", "Decompression error", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } - - string ov131path = DSUtils.GetOverlayPath(131); - if (File.Exists(ov131path)) { - // if HGE field extension overlay exists - OWTableOffset = ramAddressOfTable - DSUtils.GetOverlayRAMAddress(131); - OWtablePath = ov131path; - } else if (ramAddressOfTable >= RomInfo.synthOverlayLoadAddress) { - // if the pointer shows the table was moved to the synthetic overlay + if (ramAddressOfTable >= RomInfo.synthOverlayLoadAddress) { // if the pointer shows the table was moved to the synthetic overlay OWTableOffset = ramAddressOfTable - RomInfo.synthOverlayLoadAddress; - OWtablePath = gameDirs[DirNames.synthOverlay].unpackedDir + "\\" + ROMToolboxDialog.expandedARMfileID.ToString("D4"); + OWtablePath = Filesystem.expArmPath; } else { OWTableOffset = ramAddressOfTable - ov1Address; OWtablePath = ov1Path; @@ -561,18 +541,18 @@ namespace DSPRE { } public static void SetConditionalMusicTableOffsetToRAMAddress() { switch (gameFamily) { - case gFamEnum.HGSS: + case GameFamilies.HGSS: switch (gameLanguage) { - case gLangEnum.Spanish: - conditionalMusicTableOffsetToRAMAddress = gameVersion == gVerEnum.HeartGold ? (uint)0x667D0 : 0x667D8; + case GameLanguages.Spanish: + conditionalMusicTableOffsetToRAMAddress = gameVersion == GameVersions.HeartGold ? (uint)0x667D0 : 0x667D8; break; - case gLangEnum.English: - case gLangEnum.Italian: - case gLangEnum.French: - case gLangEnum.German: + case GameLanguages.English: + case GameLanguages.Italian: + case GameLanguages.French: + case GameLanguages.German: conditionalMusicTableOffsetToRAMAddress = 0x667D8; break; - case gLangEnum.Japanese: + case GameLanguages.Japanese: conditionalMusicTableOffsetToRAMAddress = 0x66238; break; } @@ -581,22 +561,22 @@ namespace DSPRE { } public static void SetBattleEffectsData() { switch (gameFamily) { - case gFamEnum.HGSS: + case GameFamilies.HGSS: switch (gameLanguage) { - case gLangEnum.Spanish: - vsPokemonEntryTableOffsetToRAMAddress = gameVersion == gVerEnum.HeartGold ? (uint)0x518CC : 0x518D4; - vsTrainerEntryTableOffsetToRAMAddress = gameVersion == gVerEnum.HeartGold ? (uint)0x51888 : 0x51890; - effectsComboTableOffsetToRAMAddress = gameVersion == gVerEnum.HeartGold ? (uint)0x517C0 : 0x517C8; + case GameLanguages.Spanish: + vsPokemonEntryTableOffsetToRAMAddress = gameVersion == GameVersions.HeartGold ? (uint)0x518CC : 0x518D4; + vsTrainerEntryTableOffsetToRAMAddress = gameVersion == GameVersions.HeartGold ? (uint)0x51888 : 0x51890; + effectsComboTableOffsetToRAMAddress = gameVersion == GameVersions.HeartGold ? (uint)0x517C0 : 0x517C8; break; - case gLangEnum.English: - case gLangEnum.Italian: - case gLangEnum.French: - case gLangEnum.German: + case GameLanguages.English: + case GameLanguages.Italian: + case GameLanguages.French: + case GameLanguages.German: vsPokemonEntryTableOffsetToRAMAddress = 0x518D4; vsTrainerEntryTableOffsetToRAMAddress = 0x51890; effectsComboTableOffsetToRAMAddress = 0x517C8; break; - case gLangEnum.Japanese: + case GameLanguages.Japanese: vsPokemonEntryTableOffsetToRAMAddress = 0x5136C; vsTrainerEntryTableOffsetToRAMAddress = 0x51328; effectsComboTableOffsetToRAMAddress = 0x51260; @@ -607,18 +587,18 @@ namespace DSPRE { effectsComboTableOffsetToSizeLimiter = effectsComboTableOffsetToRAMAddress - 0x1E; break; - case gFamEnum.Plat: + case GameFamilies.Plat: switch (gameLanguage) { - case gLangEnum.English: + case GameLanguages.English: effectsComboTableOffsetToRAMAddress = 0x51BE0; break; - case gLangEnum.Italian: - case gLangEnum.French: - case gLangEnum.Spanish: - case gLangEnum.German: + case GameLanguages.Italian: + case GameLanguages.French: + case GameLanguages.Spanish: + case GameLanguages.German: effectsComboTableOffsetToRAMAddress = 0x51C84; break; - case gLangEnum.Japanese: + case GameLanguages.Japanese: effectsComboTableOffsetToRAMAddress = 0x514C0; break; } @@ -627,130 +607,64 @@ namespace DSPRE { } public static void SetEncounterMusicTableOffsetToRAMAddress() { switch (gameFamily) { - case gFamEnum.HGSS: + case GameFamilies.HGSS: switch (gameLanguage) { - case gLangEnum.Spanish: - encounterMusicTableOffsetToRAMAddress = gameVersion == gVerEnum.HeartGold ? (uint)0x550D8 : 0x550E0; + case GameLanguages.Spanish: + encounterMusicTableOffsetToRAMAddress = gameVersion == GameVersions.HeartGold ? (uint)0x550D8 : 0x550E0; break; - case gLangEnum.English: - case gLangEnum.Italian: - case gLangEnum.French: - case gLangEnum.German: + case GameLanguages.English: + case GameLanguages.Italian: + case GameLanguages.French: + case GameLanguages.German: encounterMusicTableOffsetToRAMAddress = 0x550E0; break; - case gLangEnum.Japanese: + case GameLanguages.Japanese: encounterMusicTableOffsetToRAMAddress = 0x54B44; break; } break; - case gFamEnum.Plat: + case GameFamilies.Plat: switch (gameLanguage) { - case gLangEnum.English: + case GameLanguages.English: encounterMusicTableOffsetToRAMAddress = 0x5563C; break; - case gLangEnum.Italian: - case gLangEnum.French: - case gLangEnum.Spanish: - case gLangEnum.German: + case GameLanguages.Italian: + case GameLanguages.French: + case GameLanguages.Spanish: + case GameLanguages.German: encounterMusicTableOffsetToRAMAddress = 0x556E0; break; - case gLangEnum.Japanese: + case GameLanguages.Japanese: encounterMusicTableOffsetToRAMAddress = 0x54F04; break; } break; - case gFamEnum.DP: + case GameFamilies.DP: switch (gameLanguage) { - case gLangEnum.English: + case GameLanguages.English: encounterMusicTableOffsetToRAMAddress = 0x4AD3C; break; - case gLangEnum.Italian: - case gLangEnum.French: - case gLangEnum.Spanish: - case gLangEnum.German: + case GameLanguages.Italian: + case GameLanguages.French: + case GameLanguages.Spanish: + case GameLanguages.German: encounterMusicTableOffsetToRAMAddress = 0x4ADAC; break; - case gLangEnum.Japanese: + case GameLanguages.Japanese: encounterMusicTableOffsetToRAMAddress = 0x4D9AC; break; } break; } } - public static void SetMonIconsPalTableAddress() { - switch (RomInfo.gameFamily) { - case gFamEnum.DP: - switch (gameLanguage) { - case gLangEnum.English: - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x6B838, 4), 0); - break; - case gLangEnum.Italian: - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x6B874, 4), 0); - break; - case gLangEnum.German: - case gLangEnum.French: - case gLangEnum.Spanish: - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x6B894, 4), 0); - break; - case gLangEnum.Japanese: - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x6FDEC, 4), 0); - break; - } - break; - case gFamEnum.Plat: - switch (gameLanguage) { - case gLangEnum.English: - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x79F80, 4), 0); - break; - case gLangEnum.Italian: - case gLangEnum.German: - case gLangEnum.French: - case gLangEnum.Spanish: - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x7A020, 4), 0); - break; - case gLangEnum.Japanese: - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x79858, 4), 0); - break; - } - break; - case gFamEnum.HGSS: - default: - switch (gameLanguage) { - case gLangEnum.English: - case gLangEnum.Italian: - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x74408, 4), 0); - break; - case gLangEnum.German: - if (gameVersion == gVerEnum.HeartGold) { - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x74408, 4), 0); - } else { - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x74400, 4), 0); - } - break; - case gLangEnum.French: - case gLangEnum.Spanish: - if (gameVersion == gVerEnum.HeartGold) { - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x74400, 4), 0); - } else { - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x74408, 4), 0); - } - break; - case gLangEnum.Japanese: - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x73EA0, 4), 0); - break; - } - break; - } - } - - private static void SetItemScriptFileNumber() { + private void SetItemScriptFileNumber() { switch (gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: itemScriptFileNumber = 370; break; - case gFamEnum.Plat: + case GameFamilies.Plat: itemScriptFileNumber = 404; break; default: @@ -758,208 +672,110 @@ namespace DSPRE { break; } } - private static void SetNullEncounterID() { + private void SetNullEncounterID() { switch (gameFamily) { - case gFamEnum.DP: - case gFamEnum.Plat: + case GameFamilies.DP: + case GameFamilies.Plat: nullEncounterID = ushort.MaxValue; break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: nullEncounterID = Byte.MaxValue; break; } } - - private static void SetAbilityNamesTextNumber() { + private void SetAttackNamesTextNumber() { switch (gameFamily) { - case gFamEnum.DP: - abilityNamesTextNumber = 552; - break; - case gFamEnum.Plat: - abilityNamesTextNumber = 610; - break; - case gFamEnum.HGSS: - abilityNamesTextNumber = 720; - break; - default: - break; - } - } - - private static void SetAttackNamesTextNumber() { - switch (gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: attackNamesTextNumber = 588; break; - case gFamEnum.Plat: + case GameFamilies.Plat: attackNamesTextNumber = 647; break; default: - attackNamesTextNumber = gameLanguage == gLangEnum.Japanese ? 739 : 750; + attackNamesTextNumber = gameLanguage == GameLanguages.Japanese ? 739 : 750; break; } } - private static void SetItemNamesTextNumber() { + private void SetItemNamesTextNumber() { switch (gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: itemNamesTextNumber = 344; break; - case gFamEnum.Plat: + case GameFamilies.Plat: itemNamesTextNumber = 392; break; default: - itemNamesTextNumber = gameLanguage == gLangEnum.Japanese ? 219 : 222; + itemNamesTextNumber = gameLanguage == GameLanguages.Japanese ? 219 : 222; break; } } - private static void SetLocationNamesTextNumber() { + private void SetLocationNamesTextNumber() { switch (gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: locationNamesTextNumber = 382; break; - case gFamEnum.Plat: + case GameFamilies.Plat: locationNamesTextNumber = 433; break; default: - locationNamesTextNumber = gameLanguage == gLangEnum.Japanese ? 272 : 279; + locationNamesTextNumber = gameLanguage == GameLanguages.Japanese ? 272 : 279; break; } } - private static void SetPokemonNamesTextNumber() { + private void SetPokemonNamesTextNumber() { switch (gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: pokemonNamesTextNumbers = new int[2] { 362, 363 }; break; - case gFamEnum.Plat: + case GameFamilies.Plat: pokemonNamesTextNumbers = new int[7] { 412, 413, 712, 713, 714, 715, 716 }; //413? break; - case gFamEnum.HGSS: - pokemonNamesTextNumbers = gameLanguage.Equals(gLangEnum.Japanese) ? new int[1] { 232 } : new int[7] { 237, 238, 817, 818, 819, 820, 821 }; //238? + case GameFamilies.HGSS: + pokemonNamesTextNumbers = gameLanguage.Equals(GameLanguages.Japanese) ? new int[1] { 232 } : new int[7] { 237, 238, 817, 818, 819, 820, 821 }; //238? break; } } - private static void SetTrainerNamesMessageNumber() { + private void SetTrainerNamesMessageNumber() { switch (gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: trainerNamesMessageNumber = 559; - if (gameLanguage.Equals(gLangEnum.Japanese)) { + if (gameLanguage.Equals(GameLanguages.Japanese)) { trainerNamesMessageNumber -= 9; } break; - case gFamEnum.Plat: + case GameFamilies.Plat: trainerNamesMessageNumber = 618; break; default: trainerNamesMessageNumber = 729; - if (gameLanguage == gLangEnum.Japanese) { + if (gameLanguage == GameLanguages.Japanese) { trainerNamesMessageNumber -= 10; } break; } } - private static void SetTrainerClassMessageNumber() { + private void SetTrainerClassMessageNumber() { switch (gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: trainerClassMessageNumber = 560; - if (gameLanguage.Equals(gLangEnum.Japanese)) { + if (gameLanguage.Equals(GameLanguages.Japanese)) { trainerClassMessageNumber -= 9; } break; - case gFamEnum.Plat: + case GameFamilies.Plat: trainerClassMessageNumber = 619; break; default: trainerClassMessageNumber = 730; - if (gameLanguage.Equals(gLangEnum.Japanese)) { + if (gameLanguage.Equals(GameLanguages.Japanese)) { trainerClassMessageNumber -= 10; } break; } } - private static void SetTrainerNameLenOffset() { - switch (RomInfo.gameFamily) { - case gFamEnum.DP: - switch (RomInfo.gameLanguage) { - case gLangEnum.English: - trainerNameLenOffset = 0x6AC32; - break; - case gLangEnum.Italian: - trainerNameLenOffset = 0x6AC6E; - break; - case gLangEnum.Spanish: - case gLangEnum.German: - case gLangEnum.French: - trainerNameLenOffset = 0x6AC8E; - break; - - case gLangEnum.Japanese: //? - default: - trainerNameLenOffset = -1; - break; - } - break; - - case gFamEnum.Plat: - switch (RomInfo.gameLanguage) { - case gLangEnum.English: - trainerNameLenOffset = 0x791DE; - break; - case gLangEnum.Spanish: - case gLangEnum.Italian: - case gLangEnum.German: - case gLangEnum.French: - trainerNameLenOffset = 0x7927E; - break; - case gLangEnum.Japanese: - trainerNameLenOffset = 0x78AB6; - break; - - default: - trainerNameLenOffset = -1; - break; - } - break; - - case gFamEnum.HGSS: - if (RomInfo.gameLanguage.Equals(gLangEnum.Japanese)) { - //Jap HGSS - trainerNameLenOffset = 0x7342E; - } else if(gameVersion.Equals(gVerEnum.SoulSilver)){ - //All SS languages except Jap - trainerNameLenOffset = 0x72EC2; - } else { - //All HG languages except Jap - switch (RomInfo.gameLanguage) { - case gLangEnum.English: - case gLangEnum.Italian: - case gLangEnum.German: - case gLangEnum.French: - trainerNameLenOffset = 0x7342E; - break; - case gLangEnum.Spanish: - trainerNameLenOffset = 0x73426; - break; - } - } - break; - } - } - - public static int SetTrainerNameMaxLen() { - if(trainerNameLenOffset < 0) { - trainerNameMaxLen = TrainerFile.defaultNameLen; - } else { - using (DSUtils.ARM9.Reader ar = new DSUtils.ARM9.Reader(trainerNameLenOffset)) { - trainerNameMaxLen = ar.ReadByte(); - } - } - return trainerNameMaxLen; - } - - public string GetBuildingModelsDirPath(bool interior) => interior ? gameDirs[DirNames.interiorBuildingModels].unpackedDir : gameDirs[DirNames.exteriorBuildingModels].unpackedDir; public string GetRomNameFromWorkdir() => workDir.Substring(0, workDir.Length - folderSuffix.Length - 1); - public static int GetHeaderCount() => (int)new FileInfo(internalNamesLocation).Length / internalNameLength; + public static int GetHeaderCount() => (int)new FileInfo(internalNamesPath).Length / internalNameLength; public static List GetLocationNames() => new TextArchive(locationNamesTextNumber).messages; public static string[] GetSimpleTrainerNames() => new TextArchive(trainerNamesMessageNumber).messages.ToArray(); public static string[] GetTrainerClassNames() => new TextArchive(trainerClassMessageNumber).messages.ToArray(); @@ -969,23 +785,7 @@ namespace DSPRE { return itemNames.messages.GetRange(startIndex, count == null ? itemNames.messages.Count - 1 : (int)count).ToArray(); } public static string[] GetPokemonNames() => new TextArchive(pokemonNamesTextNumbers[0]).messages.ToArray(); - public static string[] GetAbilityNames() => new TextArchive(abilityNamesTextNumber).messages.ToArray(); public static string[] GetAttackNames() => new TextArchive(attackNamesTextNumber).messages.ToArray(); - public static int GetLearnsetFilesCount() => Directory.GetFiles(gameDirs[DirNames.learnsets].unpackedDir).Length; - public static int GetPersonalFilesCount() => Directory.GetFiles(gameDirs[DirNames.personalPokeData].unpackedDir).Length; - public static string[] GetEvolutionFilesList() => Directory.GetFiles(gameDirs[DirNames.evolutions].unpackedDir); - public static int GetEvolutionFilesCount() => GetEvolutionFilesList().Length; - - public int GetAreaDataCount() => Directory.GetFiles(gameDirs[DirNames.areaData].unpackedDir).Length; - public int GetMapTexturesCount() => Directory.GetFiles(gameDirs[DirNames.mapTextures].unpackedDir).Length; - public int GetBuildingTexturesCount() => Directory.GetFiles(gameDirs[DirNames.buildingTextures].unpackedDir).Length; - public int GetMatrixCount() => Directory.GetFiles(gameDirs[DirNames.matrices].unpackedDir).Length; - public int GetTextArchivesCount() => Directory.GetFiles(gameDirs[DirNames.textArchives].unpackedDir).Length; - public int GetMapCount() => Directory.GetFiles(gameDirs[DirNames.maps].unpackedDir).Length; - public int GetEventCount() => Directory.GetFiles(gameDirs[DirNames.eventFiles].unpackedDir).Length; - public int GetScriptCount() => Directory.GetFiles(gameDirs[DirNames.scripts].unpackedDir).Length; - public int GetBuildingCount(bool interior) => Directory.GetFiles(GetBuildingModelsDirPath(interior)).Length; - public static int GetEventFileCount() => Directory.GetFiles(RomInfo.gameDirs[DirNames.eventFiles].unpackedDir).Length; #endregion #region System Methods @@ -996,7 +796,7 @@ namespace DSPRE { case "CPUE": case "IPKE": case "IPGE": - gameLanguage = gLangEnum.English; + gameLanguage = GameLanguages.English; break; case "ADAS": @@ -1005,7 +805,7 @@ namespace DSPRE { case "IPKS": case "IPGS": case "LATA": - gameLanguage = gLangEnum.Spanish; + gameLanguage = GameLanguages.Spanish; break; case "ADAI": @@ -1013,7 +813,7 @@ namespace DSPRE { case "CPUI": case "IPKI": case "IPGI": - gameLanguage = gLangEnum.Italian; + gameLanguage = GameLanguages.Italian; break; case "ADAF": @@ -1021,7 +821,7 @@ namespace DSPRE { case "CPUF": case "IPKF": case "IPGF": - gameLanguage = gLangEnum.French; + gameLanguage = GameLanguages.French; break; case "ADAD": @@ -1029,161 +829,152 @@ namespace DSPRE { case "CPUD": case "IPKD": case "IPGD": - gameLanguage = gLangEnum.German; + gameLanguage = GameLanguages.German; break; default: - gameLanguage = gLangEnum.Japanese; + gameLanguage = GameLanguages.Japanese; break; } } private void LoadGameFamily() { switch (gameVersion) { - case gVerEnum.Diamond: - case gVerEnum.Pearl: - gameFamily = gFamEnum.DP; + case GameVersions.Diamond: + case GameVersions.Pearl: + gameFamily = GameFamilies.DP; break; - case gVerEnum.Platinum: - gameFamily = gFamEnum.Plat; + case GameVersions.Platinum: + gameFamily = GameFamilies.Plat; break; - case gVerEnum.HeartGold: - case gVerEnum.SoulSilver: - gameFamily = gFamEnum.HGSS; + case GameVersions.HeartGold: + case GameVersions.SoulSilver: + gameFamily = GameFamilies.HGSS; break; } } private void SetNarcDirs() { Dictionary packedDirsDict = null; switch (gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: string suffix = ""; - if (!gameLanguage.Equals(gLangEnum.Japanese)) { + if (!gameLanguage.Equals(GameLanguages.Japanese)) suffix = "_release"; - } packedDirsDict = new Dictionary() { - [DirNames.synthOverlay] = @"data\data\weather_sys.narc", - [DirNames.textArchives] = @"data\msgdata\msg.narc", + [DirNames.synthOverlay] = @"data\weather_sys.narc", + [DirNames.textArchives] = @"msgdata\msg.narc", - [DirNames.matrices] = @"data\fielddata\mapmatrix\map_matrix.narc", + [DirNames.matrices] = @"fielddata\mapmatrix\map_matrix.narc", - [DirNames.maps] = @"data\fielddata\land_data\land_data" + suffix + ".narc", - [DirNames.exteriorBuildingModels] = @"data\fielddata\build_model\build_model.narc", - [DirNames.buildingConfigFiles] = @"data\fielddata\areadata\area_build_model\area_build.narc", - [DirNames.buildingTextures] = @"data\fielddata\areadata\area_build_model\areabm_texset.narc", - [DirNames.mapTextures] = @"data\fielddata\areadata\area_map_tex\map_tex_set.narc", - [DirNames.areaData] = @"data\fielddata\areadata\area_data.narc", + [DirNames.maps] = @"fielddata\land_data\land_data" + suffix + ".narc", + [DirNames.exteriorBuildingModels] = @"fielddata\build_model\build_model.narc", + [DirNames.buildingConfigFiles] = @"fielddata\areadata\area_build_model\area_build.narc", + [DirNames.buildingTextures] = @"fielddata\areadata\area_build_model\areabm_texset.narc", + [DirNames.mapTextures] = @"fielddata\areadata\area_map_tex\map_tex_set.narc", + [DirNames.areaData] = @"fielddata\areadata\area_data.narc", - [DirNames.eventFiles] = @"data\fielddata\eventdata\zone_event" + suffix + ".narc", - [DirNames.OWSprites] = @"data\data\mmodel\mmodel.narc", + [DirNames.eventFiles] = @"fielddata\eventdata\zone_event" + suffix + ".narc", + [DirNames.OWSprites] = @"data\mmodel\mmodel.narc", - [DirNames.scripts] = @"data\fielddata\script\scr_seq" + suffix + ".narc", + [DirNames.scripts] = @"fielddata\script\scr_seq" + suffix + ".narc", - [DirNames.trainerProperties] = @"data\poketool\trainer\trdata.narc", - [DirNames.trainerParty] = @"data\poketool\trainer\trpoke.narc", - [DirNames.trainerGraphics] = @"data\poketool\trgra\trfgra.narc", + [DirNames.trainerProperties] = @"poketool\trainer\trdata.narc", + [DirNames.trainerParty] = @"poketool\trainer\trpoke.narc", + [DirNames.trainerGraphics] = @"poketool\trgra\trfgra.narc", - [DirNames.monIcons] = @"data\poketool\icongra\poke_icon.narc", + [DirNames.monIcons] = @"poketool\icongra\poke_icon.narc", - [DirNames.encounters] = @"data\fielddata\encountdata\" + char.ToLower(gameVersion.ToString()[0]) + '_' + "enc_data.narc", - [DirNames.learnsets] = @"data\poketool\personal\wotbl.narc", - [DirNames.evolutions] = @"data\poketool\personal\evo.narc", - }; - - //Personal Data archive is different for Pearl - string personal = @"data\poketool\personal"; - if (gameVersion == gVerEnum.Pearl) { - personal += ("_" + gameVersion.ToString().ToLower()); - } - personal += @"\personal.narc"; - packedDirsDict[DirNames.personalPokeData] = personal; - - break; - case gFamEnum.Plat: - suffix = gameVersion.ToString().Substring(0, 2).ToLower(); - - packedDirsDict = new Dictionary() { - [DirNames.personalPokeData] = @"data\poketool\personal\pl_personal.narc", - [DirNames.synthOverlay] = @"data\data\weather_sys.narc", - [DirNames.dynamicHeaders] = @"data\debug\cb_edit\d_test.narc", - - [DirNames.textArchives] = @"data\msgdata\" + suffix + '_' + "msg.narc", - - [DirNames.matrices] = @"data\fielddata\mapmatrix\map_matrix.narc", - - [DirNames.maps] = @"data\fielddata\land_data\land_data.narc", - [DirNames.exteriorBuildingModels] = @"data\fielddata\build_model\build_model.narc", - [DirNames.buildingConfigFiles] = @"data\fielddata\areadata\area_build_model\area_build.narc", - [DirNames.buildingTextures] = @"data\fielddata\areadata\area_build_model\areabm_texset.narc", - [DirNames.mapTextures] = @"data\fielddata\areadata\area_map_tex\map_tex_set.narc", - [DirNames.areaData] = @"data\fielddata\areadata\area_data.narc", - - [DirNames.eventFiles] = @"data\fielddata\eventdata\zone_event.narc", - [DirNames.OWSprites] = @"data\data\mmodel\mmodel.narc", - - [DirNames.scripts] = @"data\fielddata\script\scr_seq.narc", - - [DirNames.trainerProperties] = @"data\poketool\trainer\trdata.narc", - [DirNames.trainerParty] = @"data\poketool\trainer\trpoke.narc", - [DirNames.trainerGraphics] = @"data\poketool\trgra\trfgra.narc", - - [DirNames.monIcons] = @"data\poketool\icongra\pl_poke_icon.narc", - - [DirNames.encounters] = @"data\fielddata\encountdata\" + suffix + '_' + "enc_data.narc", - [DirNames.learnsets] = @"data\poketool\personal\wotbl.narc", - [DirNames.evolutions] = @"data\poketool\personal\evo.narc", + [DirNames.encounters] = @"fielddata\encountdata\" + char.ToLower(gameVersion.ToString()[0]) + '_' + "enc_data.narc" }; break; - case gFamEnum.HGSS: + case GameFamilies.Plat: packedDirsDict = new Dictionary() { - [DirNames.personalPokeData] = @"data\a\0\0\2", - [DirNames.synthOverlay] = @"data\a\0\2\8", - [DirNames.dynamicHeaders] = @"data\a\0\5\0", + [DirNames.synthOverlay] = @"data\weather_sys.narc", + [DirNames.dynamicHeaders] = @"debug\cb_edit\d_test.narc", - [DirNames.textArchives] = @"data\a\0\2\7", + [DirNames.textArchives] = @"msgdata\" + gameVersion.ToString().Substring(0, 2).ToLower() + '_' + "msg.narc", - [DirNames.matrices] = @"data\a\0\4\1", + [DirNames.matrices] = @"fielddata\mapmatrix\map_matrix.narc", - [DirNames.maps] = @"data\a\0\6\5", - [DirNames.exteriorBuildingModels] = @"data\a\0\4\0", - [DirNames.buildingConfigFiles] = @"data\a\0\4\3", - [DirNames.buildingTextures] = @"data\a\0\7\0", - [DirNames.mapTextures] = @"data\a\0\4\4", - [DirNames.areaData] = @"data\a\0\4\2", + [DirNames.maps] = @"fielddata\land_data\land_data.narc", + [DirNames.exteriorBuildingModels] = @"fielddata\build_model\build_model.narc", + [DirNames.buildingConfigFiles] = @"fielddata\areadata\area_build_model\area_build.narc", + [DirNames.buildingTextures] = @"fielddata\areadata\area_build_model\areabm_texset.narc", + [DirNames.mapTextures] = @"fielddata\areadata\area_map_tex\map_tex_set.narc", + [DirNames.areaData] = @"fielddata\areadata\area_data.narc", - [DirNames.eventFiles] = @"data\a\0\3\2", - [DirNames.OWSprites] = @"data\a\0\8\1", + [DirNames.eventFiles] = @"fielddata\eventdata\zone_event.narc", + [DirNames.OWSprites] = @"data\mmodel\mmodel.narc", + + [DirNames.scripts] = @"fielddata\script\scr_seq.narc", + + [DirNames.trainerProperties] = @"poketool\trainer\trdata.narc", + [DirNames.trainerParty] = @"poketool\trainer\trpoke.narc", + [DirNames.trainerGraphics] = @"poketool\trgra\trfgra.narc", + + [DirNames.monIcons] = @"poketool\icongra\pl_poke_icon.narc", + + [DirNames.encounters] = @"fielddata\encountdata\" + gameVersion.ToString().Substring(0, 2).ToLower() + '_' + "enc_data.narc" + }; + break; + case GameFamilies.HGSS: + packedDirsDict = new Dictionary() { + [DirNames.synthOverlay] = @"a\0\2\8", + [DirNames.dynamicHeaders] = @"a\0\5\0", + + [DirNames.textArchives] = @"a\0\2\7", + + [DirNames.matrices] = @"a\0\4\1", + + [DirNames.maps] = @"a\0\6\5", + [DirNames.exteriorBuildingModels] = @"a\0\4\0", + [DirNames.buildingConfigFiles] = @"a\0\4\3", + [DirNames.buildingTextures] = @"a\0\7\0", + [DirNames.mapTextures] = @"a\0\4\4", + [DirNames.areaData] = @"a\0\4\2", + + [DirNames.eventFiles] = @"a\0\3\2", + [DirNames.OWSprites] = @"a\0\8\1", + + [DirNames.scripts] = @"a\0\1\2", - [DirNames.scripts] = @"data\a\0\1\2", //ENCOUNTERS FOLDER DEPENDS ON VERSION - [DirNames.trainerProperties] = @"data\a\0\5\5", - [DirNames.trainerParty] = @"data\a\0\5\6", - [DirNames.trainerGraphics] = @"data\a\0\5\8", + [DirNames.trainerProperties] = @"a\0\5\5", + [DirNames.trainerParty] = @"a\0\5\6", + [DirNames.trainerGraphics] = @"a\0\5\8", - [DirNames.monIcons] = @"data\a\0\2\0", + [DirNames.monIcons] = @"a\0\2\0", - [DirNames.interiorBuildingModels] = @"data\a\1\4\8", - [DirNames.learnsets] = @"data\a\0\3\3", - [DirNames.evolutions] = @"data\a\0\3\4", + [DirNames.interiorBuildingModels] = @"a\1\4\8", + + [DirNames.safariZone] = @"a\2\3\0", + [DirNames.headbutt] = @"a\2\5\2", //both versions use the same folder with different data }; //Encounter archive is different for SS - packedDirsDict[DirNames.encounters] = gameVersion == gVerEnum.HeartGold ? @"data\a\0\3\7" : @"data\a\1\3\6"; + if (gameVersion == GameVersions.HeartGold) { + packedDirsDict[DirNames.encounters] = @"a\0\3\7"; + } else { + packedDirsDict[DirNames.encounters] = @"a\1\3\6"; + } + break; } gameDirs = new Dictionary(); foreach (KeyValuePair kvp in packedDirsDict) { - gameDirs.Add(kvp.Key, (workDir + kvp.Value, workDir + @"unpacked" + '\\' + kvp.Key.ToString())); + string _packedPath = Path.Combine(workDir, Path.Combine(dataFolderName, kvp.Value)); + string _unpackedPath = Path.Combine(unpackedPath, kvp.Key.ToString()); + gameDirs.Add(kvp.Key, (_packedPath, _unpackedPath)); } } public void ResetMapCellsColorDictionary() { switch (gameFamily) { - case gFamEnum.DP: - case gFamEnum.Plat: + case GameFamilies.DP: + case GameFamilies.Plat: MapCellsColorDictionary = PokeDatabase.System.MatrixCellColors.DPPtmatrixColorsDict; break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: MapCellsColorDictionary = PokeDatabase.System.MatrixCellColors.HGSSmatrixColorsDict; break; } @@ -1191,8 +982,8 @@ namespace DSPRE { public static void ReadOWTable() { OverworldTable = new SortedDictionary(); switch (gameFamily) { - case gFamEnum.DP: - case gFamEnum.Plat: + case GameFamilies.DP: + case GameFamilies.Plat: using (BinaryReader idReader = new BinaryReader(new FileStream(OWtablePath, FileMode.Open))) { idReader.BaseStream.Position = OWTableOffset; @@ -1205,7 +996,7 @@ namespace DSPRE { } } break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: using (BinaryReader idReader = new BinaryReader(new FileStream(OWtablePath, FileMode.Open))) { idReader.BaseStream.Position = OWTableOffset; diff --git a/DS_Map/SpawnEditor.cs b/DS_Map/SpawnEditor.cs index 12f8e60..998c790 100644 --- a/DS_Map/SpawnEditor.cs +++ b/DS_Map/SpawnEditor.cs @@ -120,13 +120,13 @@ namespace DSPRE { matrixyUpDown.Maximum = headerMatrix.maps.GetLength(0) - 1; switch (RomInfo.gameFamily) { - case gFamEnum.DP: + case GameFamilies.DP: locationNameLBL.Text = locations[((HeaderDP)currentHeader).locationName]; break; - case gFamEnum.Plat: + case GameFamilies.Plat: locationNameLBL.Text = locations[((HeaderPt)currentHeader).locationName]; break; - case gFamEnum.HGSS: + case GameFamilies.HGSS: locationNameLBL.Text = locations[((HeaderHGSS)currentHeader).locationName]; break; } diff --git a/DS_Map/WildEditorDPPt.cs b/DS_Map/WildEditorDPPt.cs index 713904a..895ed0d 100644 --- a/DS_Map/WildEditorDPPt.cs +++ b/DS_Map/WildEditorDPPt.cs @@ -30,7 +30,7 @@ namespace DSPRE { } if (tempMapHeader.wildPokemon != MapHeader.DPPT_NULL_ENCOUNTER_FILE_ID) { - if (RomInfo.gameFamily == gFamEnum.DP) { + if (RomInfo.gameFamily == GameFamilies.DP) { EncounterFileLocationName.Add(tempMapHeader.wildPokemon, locationNames[((HeaderDP)tempMapHeader).locationName]); } else { EncounterFileLocationName.Add(tempMapHeader.wildPokemon, locationNames[((HeaderPt)tempMapHeader).locationName]); From a136f18a34737a8eb16dbf6cd70a6862022648a8 Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Sun, 3 Mar 2024 14:10:42 +0100 Subject: [PATCH 17/40] Fixes --- DS_Map/RomInfo.cs | 425 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 317 insertions(+), 108 deletions(-) diff --git a/DS_Map/RomInfo.cs b/DS_Map/RomInfo.cs index a77297e..1559e97 100644 --- a/DS_Map/RomInfo.cs +++ b/DS_Map/RomInfo.cs @@ -6,6 +6,7 @@ using System.Linq; using DSPRE.Resources; using System; using DSPRE.ROMFiles; +using static DSPRE.RomInfo; namespace DSPRE { @@ -14,44 +15,49 @@ namespace DSPRE { /// public class RomInfo { - public static readonly byte internalNameLength = 16; - public static uint synthOverlayLoadAddress = 0x023C8000; - public Dictionary, (Color background, Color foreground)> MapCellsColorDictionary; public static string folderSuffix = "_DSPRE_contents"; - const string dataFolderName = @"data"; - public static string romID { get; private set; } public static string fileName { get; private set; } public static string workDir { get; private set; } public static string arm9Path { get; private set; } - public static string arm7Path { get; private set; } public static string overlayTablePath { get; set; } - public static string y7Path { get; set; } - public static string dataPath { get; set; } public static string overlayPath { get; set; } - public static string unpackedPath { get; set; } - public static string bannerPath { get; set; } - public static string headerPath { get; set; } + public static GameLanguages gameLanguage { get; private set; } public static GameVersions gameVersion { get; private set; } public static GameFamilies gameFamily { get; private set; } + + + public static uint synthOverlayLoadAddress = 0x023C8000; public static uint arm9spawnOffset { get; private set; } + public static int initialMoneyOverlayNumber { get; private set; } public static uint initialMoneyOverlayOffset { get; private set; } + public static int cameraTblOverlayNumber { get; private set; } public static uint[] cameraTblOffsetsToRAMaddress { get; private set; } + public static uint headerTableOffset { get; private set; } + public static uint conditionalMusicTableOffsetToRAMAddress { get; internal set; } public static uint encounterMusicTableOffsetToRAMAddress { get; internal set; } + public static uint vsTrainerEntryTableOffsetToRAMAddress { get; internal set; } public static uint vsPokemonEntryTableOffsetToRAMAddress { get; internal set; } public static uint effectsComboTableOffsetToRAMAddress { get; internal set; } + public static uint vsTrainerEntryTableOffsetToSizeLimiter { get; internal set; } public static uint vsPokemonEntryTableOffsetToSizeLimiter { get; internal set; } public static uint effectsComboTableOffsetToSizeLimiter { get; internal set; } + + public static uint OWTableOffset { get; internal set; } public static string OWtablePath { get; private set; } + + public static uint monIconPalTableAddress { get; private set; } + public static int nullEncounterID { get; private set; } + public static int abilityNamesTextNumber { get; private set; } public static int attackNamesTextNumber { get; private set; } public static int[] pokemonNamesTextNumbers { get; private set; } public static int itemNamesTextNumber { get; private set; } @@ -59,16 +65,27 @@ namespace DSPRE { public static int trainerClassMessageNumber { get; private set; } public static int trainerNamesMessageNumber { get; private set; } public static int locationNamesTextNumber { get; private set; } - public static string internalNamesPath { get; private set; } + public static int trainerNameLenOffset { get; private set; } + public static int trainerNameMaxLen { get; private set; } + + public static string internalNamesLocation { get; private set; } + public static readonly byte internalNameLength = 16; public static int cameraSize { get; private set; } + + public Dictionary, (Color background, Color foreground)> MapCellsColorDictionary; public static SortedDictionary OverworldTable { get; private set; } public static uint[] overworldTableKeys { get; private set; } public static Dictionary ow3DSpriteDict { get; private set; } + + public static Dictionary ScriptCommandNamesDict { get; private set; } public static Dictionary ScriptCommandNamesReverseDict { get; private set; } + public static Dictionary ScriptActionNamesDict { get; private set; } public static Dictionary ScriptActionNamesReverseDict { get; private set; } + public static Dictionary ScriptCommandParametersDict { get; private set; } + public static Dictionary ScriptComparisonOperatorsDict { get; private set; } public static Dictionary ScriptComparisonOperatorsReverseDict { get; private set; } @@ -96,6 +113,8 @@ namespace DSPRE { German } public enum DirNames : byte { + personalPokeData, + synthOverlay, dynamicHeaders, @@ -113,10 +132,7 @@ namespace DSPRE { OWSprites, scripts, - encounters, - headbutt, - safariZone, trainerProperties, trainerParty, @@ -124,29 +140,24 @@ namespace DSPRE { monIcons, - interiorBuildingModels + interiorBuildingModels, + learnsets, + evolutions }; public static Dictionary gameDirs { get; private set; } + #region Constructors (1) public RomInfo(string id, string romName, bool useSuffix = true) { if (!useSuffix) { folderSuffix = ""; } - string path = Path.GetDirectoryName(romName) + "\\" + Path.GetFileNameWithoutExtension(romName) + folderSuffix + "\\"; - - workDir = path; - arm9Path = Path.Combine(workDir, @"arm9.bin"); - arm7Path = Path.Combine(workDir, @"arm7.bin"); - overlayTablePath = Path.Combine(workDir, @"y9.bin"); - y7Path = Path.Combine(workDir, @"y7.bin"); - dataPath = Path.Combine(workDir, dataFolderName); - overlayPath = Path.Combine(workDir, @"overlay"); - bannerPath = Path.Combine(workDir, @"banner.bin"); - headerPath = Path.Combine(workDir, @"header.bin"); - unpackedPath = Path.Combine(workDir, @"unpacked"); - internalNamesPath = Path.Combine(workDir, $@"{dataFolderName}\fielddata\maptable\mapname.bin"); + workDir = Path.GetDirectoryName(romName) + "\\" + Path.GetFileNameWithoutExtension(romName) + folderSuffix + "\\"; + arm9Path = workDir + @"arm9.bin"; + overlayTablePath = workDir + @"y9.bin"; + overlayPath = workDir + "overlay"; + internalNamesLocation = workDir + @"data\fielddata\maptable\mapname.bin"; try { gameVersion = PokeDatabase.System.versionsDict[id]; @@ -166,6 +177,7 @@ namespace DSPRE { SetHeaderTableOffset(); SetNullEncounterID(); + SetAbilityNamesTextNumber(); SetAttackNamesTextNumber(); SetPokemonNamesTextNumber(); SetItemNamesTextNumber(); @@ -173,6 +185,7 @@ namespace DSPRE { SetLocationNamesTextNumber(); SetTrainerNamesMessageNumber(); SetTrainerClassMessageNumber(); + SetTrainerNameLenOffset(); /* System */ ScriptCommandParametersDict = BuildCommandParametersDatabase(gameFamily); @@ -523,14 +536,21 @@ namespace DSPRE { using (DSUtils.EasyReader bReader = new DSUtils.EasyReader(ov1Path, ramAddrOfPointer - ov1Address)) { // read the pointer at the specified ram address and adjust accordingly below uint ramAddressOfTable = bReader.ReadUInt32(); - if (ramAddressOfTable >= 0x03000000) { + if ((ramAddressOfTable >> 0x18) != 0x02) { MessageBox.Show("Something went wrong reading the Overworld configuration table.\nOverworld sprites in the Event Editor will be " + "displayed incorrectly or not displayed at all.", "Decompression error", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } - if (ramAddressOfTable >= RomInfo.synthOverlayLoadAddress) { // if the pointer shows the table was moved to the synthetic overlay + + string ov131path = DSUtils.GetOverlayPath(131); + if (File.Exists(ov131path)) { + // if HGE field extension overlay exists + OWTableOffset = ramAddressOfTable - DSUtils.GetOverlayRAMAddress(131); + OWtablePath = ov131path; + } else if (ramAddressOfTable >= RomInfo.synthOverlayLoadAddress) { + // if the pointer shows the table was moved to the synthetic overlay OWTableOffset = ramAddressOfTable - RomInfo.synthOverlayLoadAddress; - OWtablePath = Filesystem.expArmPath; + OWtablePath = gameDirs[DirNames.synthOverlay].unpackedDir + "\\" + ROMToolboxDialog.expandedARMfileID.ToString("D4"); } else { OWTableOffset = ramAddressOfTable - ov1Address; OWtablePath = ov1Path; @@ -659,7 +679,73 @@ namespace DSPRE { break; } } - private void SetItemScriptFileNumber() { + public static void SetMonIconsPalTableAddress() { + switch (RomInfo.gameFamily) { + case GameFamilies.DP: + switch (gameLanguage) { + case GameLanguages.English: + monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x6B838, 4), 0); + break; + case GameLanguages.Italian: + monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x6B874, 4), 0); + break; + case GameLanguages.German: + case GameLanguages.French: + case GameLanguages.Spanish: + monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x6B894, 4), 0); + break; + case GameLanguages.Japanese: + monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x6FDEC, 4), 0); + break; + } + break; + case GameFamilies.Plat: + switch (gameLanguage) { + case GameLanguages.English: + monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x79F80, 4), 0); + break; + case GameLanguages.Italian: + case GameLanguages.German: + case GameLanguages.French: + case GameLanguages.Spanish: + monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x7A020, 4), 0); + break; + case GameLanguages.Japanese: + monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x79858, 4), 0); + break; + } + break; + case GameFamilies.HGSS: + default: + switch (gameLanguage) { + case GameLanguages.English: + case GameLanguages.Italian: + monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x74408, 4), 0); + break; + case GameLanguages.German: + if (gameVersion == GameVersions.HeartGold) { + monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x74408, 4), 0); + } else { + monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x74400, 4), 0); + } + break; + case GameLanguages.French: + case GameLanguages.Spanish: + if (gameVersion == GameVersions.HeartGold) { + monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x74400, 4), 0); + } else { + monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x74408, 4), 0); + } + break; + case GameLanguages.Japanese: + monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x73EA0, 4), 0); + break; + } + break; + } + } + + private static void SetItemScriptFileNumber() { switch (gameFamily) { case GameFamilies.DP: itemScriptFileNumber = 370; @@ -672,7 +758,7 @@ namespace DSPRE { break; } } - private void SetNullEncounterID() { + private static void SetNullEncounterID() { switch (gameFamily) { case GameFamilies.DP: case GameFamilies.Plat: @@ -683,7 +769,24 @@ namespace DSPRE { break; } } - private void SetAttackNamesTextNumber() { + + private static void SetAbilityNamesTextNumber() { + switch (gameFamily) { + case GameFamilies.DP: + abilityNamesTextNumber = 552; + break; + case GameFamilies.Plat: + abilityNamesTextNumber = 610; + break; + case GameFamilies.HGSS: + abilityNamesTextNumber = 720; + break; + default: + break; + } + } + + private static void SetAttackNamesTextNumber() { switch (gameFamily) { case GameFamilies.DP: attackNamesTextNumber = 588; @@ -696,7 +799,7 @@ namespace DSPRE { break; } } - private void SetItemNamesTextNumber() { + private static void SetItemNamesTextNumber() { switch (gameFamily) { case GameFamilies.DP: itemNamesTextNumber = 344; @@ -709,7 +812,7 @@ namespace DSPRE { break; } } - private void SetLocationNamesTextNumber() { + private static void SetLocationNamesTextNumber() { switch (gameFamily) { case GameFamilies.DP: locationNamesTextNumber = 382; @@ -722,7 +825,7 @@ namespace DSPRE { break; } } - private void SetPokemonNamesTextNumber() { + private static void SetPokemonNamesTextNumber() { switch (gameFamily) { case GameFamilies.DP: pokemonNamesTextNumbers = new int[2] { 362, 363 }; @@ -735,7 +838,7 @@ namespace DSPRE { break; } } - private void SetTrainerNamesMessageNumber() { + private static void SetTrainerNamesMessageNumber() { switch (gameFamily) { case GameFamilies.DP: trainerNamesMessageNumber = 559; @@ -754,7 +857,7 @@ namespace DSPRE { break; } } - private void SetTrainerClassMessageNumber() { + private static void SetTrainerClassMessageNumber() { switch (gameFamily) { case GameFamilies.DP: trainerClassMessageNumber = 560; @@ -774,8 +877,89 @@ namespace DSPRE { } } + private static void SetTrainerNameLenOffset() { + switch (RomInfo.gameFamily) { + case GameFamilies.DP: + switch (RomInfo.gameLanguage) { + case GameLanguages.English: + trainerNameLenOffset = 0x6AC32; + break; + case GameLanguages.Italian: + trainerNameLenOffset = 0x6AC6E; + break; + case GameLanguages.Spanish: + case GameLanguages.German: + case GameLanguages.French: + trainerNameLenOffset = 0x6AC8E; + break; + + case GameLanguages.Japanese: //? + default: + trainerNameLenOffset = -1; + break; + } + break; + + case GameFamilies.Plat: + switch (RomInfo.gameLanguage) { + case GameLanguages.English: + trainerNameLenOffset = 0x791DE; + break; + case GameLanguages.Spanish: + case GameLanguages.Italian: + case GameLanguages.German: + case GameLanguages.French: + trainerNameLenOffset = 0x7927E; + break; + case GameLanguages.Japanese: + trainerNameLenOffset = 0x78AB6; + break; + + default: + trainerNameLenOffset = -1; + break; + } + break; + + case GameFamilies.HGSS: + if (RomInfo.gameLanguage.Equals(GameLanguages.Japanese)) { + //Jap HGSS + trainerNameLenOffset = 0x7342E; + } else if(gameVersion.Equals(GameVersions.SoulSilver)){ + //All SS languages except Jap + trainerNameLenOffset = 0x72EC2; + } else { + //All HG languages except Jap + switch (RomInfo.gameLanguage) { + case GameLanguages.English: + case GameLanguages.Italian: + case GameLanguages.German: + case GameLanguages.French: + trainerNameLenOffset = 0x7342E; + break; + case GameLanguages.Spanish: + trainerNameLenOffset = 0x73426; + break; + } + } + break; + } + } + + public static int SetTrainerNameMaxLen() { + if(trainerNameLenOffset < 0) { + trainerNameMaxLen = TrainerFile.defaultNameLen; + } else { + using (DSUtils.ARM9.Reader ar = new DSUtils.ARM9.Reader(trainerNameLenOffset)) { + trainerNameMaxLen = ar.ReadByte(); + } + } + return trainerNameMaxLen; + } + + public string GetBuildingModelsDirPath(bool interior) => interior ? gameDirs[DirNames.interiorBuildingModels].unpackedDir : gameDirs[DirNames.exteriorBuildingModels].unpackedDir; public string GetRomNameFromWorkdir() => workDir.Substring(0, workDir.Length - folderSuffix.Length - 1); - public static int GetHeaderCount() => (int)new FileInfo(internalNamesPath).Length / internalNameLength; + public static int GetHeaderCount() => (int)new FileInfo(internalNamesLocation).Length / internalNameLength; public static List GetLocationNames() => new TextArchive(locationNamesTextNumber).messages; public static string[] GetSimpleTrainerNames() => new TextArchive(trainerNamesMessageNumber).messages.ToArray(); public static string[] GetTrainerClassNames() => new TextArchive(trainerClassMessageNumber).messages.ToArray(); @@ -785,7 +969,23 @@ namespace DSPRE { return itemNames.messages.GetRange(startIndex, count == null ? itemNames.messages.Count - 1 : (int)count).ToArray(); } public static string[] GetPokemonNames() => new TextArchive(pokemonNamesTextNumbers[0]).messages.ToArray(); + public static string[] GetAbilityNames() => new TextArchive(abilityNamesTextNumber).messages.ToArray(); public static string[] GetAttackNames() => new TextArchive(attackNamesTextNumber).messages.ToArray(); + public static int GetLearnsetFilesCount() => Directory.GetFiles(gameDirs[DirNames.learnsets].unpackedDir).Length; + public static int GetPersonalFilesCount() => Directory.GetFiles(gameDirs[DirNames.personalPokeData].unpackedDir).Length; + public static string[] GetEvolutionFilesList() => Directory.GetFiles(gameDirs[DirNames.evolutions].unpackedDir); + public static int GetEvolutionFilesCount() => GetEvolutionFilesList().Length; + + public int GetAreaDataCount() => Directory.GetFiles(gameDirs[DirNames.areaData].unpackedDir).Length; + public int GetMapTexturesCount() => Directory.GetFiles(gameDirs[DirNames.mapTextures].unpackedDir).Length; + public int GetBuildingTexturesCount() => Directory.GetFiles(gameDirs[DirNames.buildingTextures].unpackedDir).Length; + public int GetMatrixCount() => Directory.GetFiles(gameDirs[DirNames.matrices].unpackedDir).Length; + public int GetTextArchivesCount() => Directory.GetFiles(gameDirs[DirNames.textArchives].unpackedDir).Length; + public int GetMapCount() => Directory.GetFiles(gameDirs[DirNames.maps].unpackedDir).Length; + public int GetEventCount() => Directory.GetFiles(gameDirs[DirNames.eventFiles].unpackedDir).Length; + public int GetScriptCount() => Directory.GetFiles(gameDirs[DirNames.scripts].unpackedDir).Length; + public int GetBuildingCount(bool interior) => Directory.GetFiles(GetBuildingModelsDirPath(interior)).Length; + public static int GetEventFileCount() => Directory.GetFiles(RomInfo.gameDirs[DirNames.eventFiles].unpackedDir).Length; #endregion #region System Methods @@ -857,115 +1057,124 @@ namespace DSPRE { switch (gameFamily) { case GameFamilies.DP: string suffix = ""; - if (!gameLanguage.Equals(GameLanguages.Japanese)) + if (!gameLanguage.Equals(GameLanguages.Japanese)) { suffix = "_release"; + } packedDirsDict = new Dictionary() { - [DirNames.synthOverlay] = @"data\weather_sys.narc", - [DirNames.textArchives] = @"msgdata\msg.narc", + [DirNames.synthOverlay] = @"data\data\weather_sys.narc", + [DirNames.textArchives] = @"data\msgdata\msg.narc", - [DirNames.matrices] = @"fielddata\mapmatrix\map_matrix.narc", + [DirNames.matrices] = @"data\fielddata\mapmatrix\map_matrix.narc", - [DirNames.maps] = @"fielddata\land_data\land_data" + suffix + ".narc", - [DirNames.exteriorBuildingModels] = @"fielddata\build_model\build_model.narc", - [DirNames.buildingConfigFiles] = @"fielddata\areadata\area_build_model\area_build.narc", - [DirNames.buildingTextures] = @"fielddata\areadata\area_build_model\areabm_texset.narc", - [DirNames.mapTextures] = @"fielddata\areadata\area_map_tex\map_tex_set.narc", - [DirNames.areaData] = @"fielddata\areadata\area_data.narc", + [DirNames.maps] = @"data\fielddata\land_data\land_data" + suffix + ".narc", + [DirNames.exteriorBuildingModels] = @"data\fielddata\build_model\build_model.narc", + [DirNames.buildingConfigFiles] = @"data\fielddata\areadata\area_build_model\area_build.narc", + [DirNames.buildingTextures] = @"data\fielddata\areadata\area_build_model\areabm_texset.narc", + [DirNames.mapTextures] = @"data\fielddata\areadata\area_map_tex\map_tex_set.narc", + [DirNames.areaData] = @"data\fielddata\areadata\area_data.narc", - [DirNames.eventFiles] = @"fielddata\eventdata\zone_event" + suffix + ".narc", - [DirNames.OWSprites] = @"data\mmodel\mmodel.narc", + [DirNames.eventFiles] = @"data\fielddata\eventdata\zone_event" + suffix + ".narc", + [DirNames.OWSprites] = @"data\data\mmodel\mmodel.narc", - [DirNames.scripts] = @"fielddata\script\scr_seq" + suffix + ".narc", + [DirNames.scripts] = @"data\fielddata\script\scr_seq" + suffix + ".narc", - [DirNames.trainerProperties] = @"poketool\trainer\trdata.narc", - [DirNames.trainerParty] = @"poketool\trainer\trpoke.narc", - [DirNames.trainerGraphics] = @"poketool\trgra\trfgra.narc", + [DirNames.trainerProperties] = @"data\poketool\trainer\trdata.narc", + [DirNames.trainerParty] = @"data\poketool\trainer\trpoke.narc", + [DirNames.trainerGraphics] = @"data\poketool\trgra\trfgra.narc", - [DirNames.monIcons] = @"poketool\icongra\poke_icon.narc", + [DirNames.monIcons] = @"data\poketool\icongra\poke_icon.narc", - [DirNames.encounters] = @"fielddata\encountdata\" + char.ToLower(gameVersion.ToString()[0]) + '_' + "enc_data.narc" + [DirNames.encounters] = @"data\fielddata\encountdata\" + char.ToLower(gameVersion.ToString()[0]) + '_' + "enc_data.narc", + [DirNames.learnsets] = @"data\poketool\personal\wotbl.narc", + [DirNames.evolutions] = @"data\poketool\personal\evo.narc", }; + + //Personal Data archive is different for Pearl + string personal = @"data\poketool\personal"; + if (gameVersion == GameVersions.Pearl) { + personal += ("_" + gameVersion.ToString().ToLower()); + } + personal += @"\personal.narc"; + packedDirsDict[DirNames.personalPokeData] = personal; + break; case GameFamilies.Plat: + suffix = gameVersion.ToString().Substring(0, 2).ToLower(); + packedDirsDict = new Dictionary() { - [DirNames.synthOverlay] = @"data\weather_sys.narc", - [DirNames.dynamicHeaders] = @"debug\cb_edit\d_test.narc", + [DirNames.personalPokeData] = @"data\poketool\personal\pl_personal.narc", + [DirNames.synthOverlay] = @"data\data\weather_sys.narc", + [DirNames.dynamicHeaders] = @"data\debug\cb_edit\d_test.narc", - [DirNames.textArchives] = @"msgdata\" + gameVersion.ToString().Substring(0, 2).ToLower() + '_' + "msg.narc", + [DirNames.textArchives] = @"data\msgdata\" + suffix + '_' + "msg.narc", - [DirNames.matrices] = @"fielddata\mapmatrix\map_matrix.narc", + [DirNames.matrices] = @"data\fielddata\mapmatrix\map_matrix.narc", - [DirNames.maps] = @"fielddata\land_data\land_data.narc", - [DirNames.exteriorBuildingModels] = @"fielddata\build_model\build_model.narc", - [DirNames.buildingConfigFiles] = @"fielddata\areadata\area_build_model\area_build.narc", - [DirNames.buildingTextures] = @"fielddata\areadata\area_build_model\areabm_texset.narc", - [DirNames.mapTextures] = @"fielddata\areadata\area_map_tex\map_tex_set.narc", - [DirNames.areaData] = @"fielddata\areadata\area_data.narc", + [DirNames.maps] = @"data\fielddata\land_data\land_data.narc", + [DirNames.exteriorBuildingModels] = @"data\fielddata\build_model\build_model.narc", + [DirNames.buildingConfigFiles] = @"data\fielddata\areadata\area_build_model\area_build.narc", + [DirNames.buildingTextures] = @"data\fielddata\areadata\area_build_model\areabm_texset.narc", + [DirNames.mapTextures] = @"data\fielddata\areadata\area_map_tex\map_tex_set.narc", + [DirNames.areaData] = @"data\fielddata\areadata\area_data.narc", - [DirNames.eventFiles] = @"fielddata\eventdata\zone_event.narc", - [DirNames.OWSprites] = @"data\mmodel\mmodel.narc", + [DirNames.eventFiles] = @"data\fielddata\eventdata\zone_event.narc", + [DirNames.OWSprites] = @"data\data\mmodel\mmodel.narc", - [DirNames.scripts] = @"fielddata\script\scr_seq.narc", + [DirNames.scripts] = @"data\fielddata\script\scr_seq.narc", - [DirNames.trainerProperties] = @"poketool\trainer\trdata.narc", - [DirNames.trainerParty] = @"poketool\trainer\trpoke.narc", - [DirNames.trainerGraphics] = @"poketool\trgra\trfgra.narc", + [DirNames.trainerProperties] = @"data\poketool\trainer\trdata.narc", + [DirNames.trainerParty] = @"data\poketool\trainer\trpoke.narc", + [DirNames.trainerGraphics] = @"data\poketool\trgra\trfgra.narc", - [DirNames.monIcons] = @"poketool\icongra\pl_poke_icon.narc", + [DirNames.monIcons] = @"data\poketool\icongra\pl_poke_icon.narc", - [DirNames.encounters] = @"fielddata\encountdata\" + gameVersion.ToString().Substring(0, 2).ToLower() + '_' + "enc_data.narc" + [DirNames.encounters] = @"data\fielddata\encountdata\" + suffix + '_' + "enc_data.narc", + [DirNames.learnsets] = @"data\poketool\personal\wotbl.narc", + [DirNames.evolutions] = @"data\poketool\personal\evo.narc", }; break; case GameFamilies.HGSS: packedDirsDict = new Dictionary() { - [DirNames.synthOverlay] = @"a\0\2\8", - [DirNames.dynamicHeaders] = @"a\0\5\0", + [DirNames.personalPokeData] = @"data\a\0\0\2", + [DirNames.synthOverlay] = @"data\a\0\2\8", + [DirNames.dynamicHeaders] = @"data\a\0\5\0", - [DirNames.textArchives] = @"a\0\2\7", + [DirNames.textArchives] = @"data\a\0\2\7", - [DirNames.matrices] = @"a\0\4\1", + [DirNames.matrices] = @"data\a\0\4\1", - [DirNames.maps] = @"a\0\6\5", - [DirNames.exteriorBuildingModels] = @"a\0\4\0", - [DirNames.buildingConfigFiles] = @"a\0\4\3", - [DirNames.buildingTextures] = @"a\0\7\0", - [DirNames.mapTextures] = @"a\0\4\4", - [DirNames.areaData] = @"a\0\4\2", + [DirNames.maps] = @"data\a\0\6\5", + [DirNames.exteriorBuildingModels] = @"data\a\0\4\0", + [DirNames.buildingConfigFiles] = @"data\a\0\4\3", + [DirNames.buildingTextures] = @"data\a\0\7\0", + [DirNames.mapTextures] = @"data\a\0\4\4", + [DirNames.areaData] = @"data\a\0\4\2", - [DirNames.eventFiles] = @"a\0\3\2", - [DirNames.OWSprites] = @"a\0\8\1", - - [DirNames.scripts] = @"a\0\1\2", + [DirNames.eventFiles] = @"data\a\0\3\2", + [DirNames.OWSprites] = @"data\a\0\8\1", + [DirNames.scripts] = @"data\a\0\1\2", //ENCOUNTERS FOLDER DEPENDS ON VERSION - [DirNames.trainerProperties] = @"a\0\5\5", - [DirNames.trainerParty] = @"a\0\5\6", - [DirNames.trainerGraphics] = @"a\0\5\8", + [DirNames.trainerProperties] = @"data\a\0\5\5", + [DirNames.trainerParty] = @"data\a\0\5\6", + [DirNames.trainerGraphics] = @"data\a\0\5\8", - [DirNames.monIcons] = @"a\0\2\0", + [DirNames.monIcons] = @"data\a\0\2\0", - [DirNames.interiorBuildingModels] = @"a\1\4\8", - - [DirNames.safariZone] = @"a\2\3\0", - [DirNames.headbutt] = @"a\2\5\2", //both versions use the same folder with different data + [DirNames.interiorBuildingModels] = @"data\a\1\4\8", + [DirNames.learnsets] = @"data\a\0\3\3", + [DirNames.evolutions] = @"data\a\0\3\4", }; //Encounter archive is different for SS - if (gameVersion == GameVersions.HeartGold) { - packedDirsDict[DirNames.encounters] = @"a\0\3\7"; - } else { - packedDirsDict[DirNames.encounters] = @"a\1\3\6"; - } - + packedDirsDict[DirNames.encounters] = gameVersion == GameVersions.HeartGold ? @"data\a\0\3\7" : @"data\a\1\3\6"; break; } gameDirs = new Dictionary(); foreach (KeyValuePair kvp in packedDirsDict) { - string _packedPath = Path.Combine(workDir, Path.Combine(dataFolderName, kvp.Value)); - string _unpackedPath = Path.Combine(unpackedPath, kvp.Key.ToString()); - gameDirs.Add(kvp.Key, (_packedPath, _unpackedPath)); + gameDirs.Add(kvp.Key, (workDir + kvp.Value, workDir + @"unpacked" + '\\' + kvp.Key.ToString())); } } public void ResetMapCellsColorDictionary() { From d63c35cd9288ac8218657a9bced0bacace0ada27 Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Sun, 3 Mar 2024 14:42:51 +0100 Subject: [PATCH 18/40] More changes with build success now Co-authored-by: Cuddlyogre --- DS_Map/BuildingEditor.cs | 12 +- DS_Map/EvolutionsEditor.cs | 21 +- DS_Map/Helpers.cs | 26 +- DS_Map/LearnsetEditor.cs | 17 +- DS_Map/Main Window.Designer.cs | 218 ++++++------ DS_Map/Main Window.cs | 630 ++++++++++++++++----------------- DS_Map/Main Window.resx | 183 +++++----- DS_Map/PersonalDataEditor.cs | 75 ++-- DS_Map/ROMFiles/MapHeader.cs | 61 +++- DS_Map/RomInfo.cs | 7 + DS_Map/WildEditorDPPt.cs | 229 ++++++------ DS_Map/WildEditorHGSS.cs | 271 +++++++------- 12 files changed, 881 insertions(+), 869 deletions(-) diff --git a/DS_Map/BuildingEditor.cs b/DS_Map/BuildingEditor.cs index fcdfef9..0587fe8 100644 --- a/DS_Map/BuildingEditor.cs +++ b/DS_Map/BuildingEditor.cs @@ -49,11 +49,11 @@ namespace DSPRE { interiorCheckBox.Enabled = true; } - disableHandlers = true; + Helpers.DisableHandlers(); FillListBox(false); FillTexturesBox(); textureComboBox.SelectedIndex = 0; - disableHandlers = false; + Helpers.EnableHandlers(); buildingEditorBldListBox.SelectedIndex = 0; } @@ -167,7 +167,7 @@ namespace DSPRE { RenderModel(); } private void buildingEditorListBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers || buildingEditorBldListBox.SelectedIndex < 0) { + if (Helpers.HandlersDisabled || buildingEditorBldListBox.SelectedIndex < 0) { return; } @@ -213,17 +213,17 @@ namespace DSPRE { } } private void interiorCheckBox_CheckedChanged(object sender, EventArgs e) { - disableHandlers = true; + Helpers.DisableHandlers(); buildingEditorBldListBox.Items.Clear(); FillListBox(interiorCheckBox.Checked); - disableHandlers = false; + Helpers.EnableHandlers(); buildingEditorBldListBox.SelectedIndex = 0; } private void textureComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } LoadModelTextures(textureComboBox.SelectedIndex - 1); diff --git a/DS_Map/EvolutionsEditor.cs b/DS_Map/EvolutionsEditor.cs index 00480e5..2d9229d 100644 --- a/DS_Map/EvolutionsEditor.cs +++ b/DS_Map/EvolutionsEditor.cs @@ -6,7 +6,6 @@ using static System.Windows.Forms.VisualStyles.VisualStyleElement.TextBox; namespace DSPRE { public partial class EvolutionsEditor : Form { - private bool disableHandlers = false; private readonly string[] fileNames; private readonly string[] pokeNames; @@ -34,7 +33,7 @@ namespace DSPRE { this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Size = parent.Size; this.Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top | AnchorStyles.Bottom; - disableHandlers = true; + Helpers.DisableHandlers(); evoRows = new (ComboBox m, Label l, NumericUpDown p, ComboBox t)[EvolutionFile.numEvolutions] { (evoMethodComboBox1, descLabel1, evoParamUpDown1, evoTargetMonComboBox1), @@ -59,32 +58,32 @@ namespace DSPRE { pokemonNameInputComboBox.Items.AddRange(this.fileNames); - disableHandlers = false; + Helpers.EnableHandlers(); pokemonNameInputComboBox.SelectedIndex = 1; } private void pokemonNameInputComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); if (CheckDiscardChanges()) { int newNumber = pokemonNameInputComboBox.SelectedIndex; monNumberNumericUpDown.Value = newNumber; ChangeLoadedFile(newNumber); } - disableHandlers = false; + Helpers.EnableHandlers(); } private void monNumberNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); if (CheckDiscardChanges()) { int newNumber = (int)monNumberNumericUpDown.Value; @@ -92,7 +91,7 @@ namespace DSPRE { ChangeLoadedFile(newNumber); } - disableHandlers = false; + Helpers.EnableHandlers(); } private void ChangeLoadedFile(int toLoad) { currentLoadedId = toLoad; @@ -236,7 +235,7 @@ namespace DSPRE { return; } - disableHandlers = true; + Helpers.DisableHandlers(); EvolutionMethod method = (EvolutionMethod)m.SelectedIndex; EvolutionParamMeaning type = EvolutionFile.evoDescriptions[method]; @@ -294,7 +293,7 @@ namespace DSPRE { throw new Exception("Unknown evolution parameter type: " + type); } - disableHandlers = false; + Helpers.EnableHandlers(); } private void evoParamUpDown1_ValueChanged(object sender, EventArgs e) { diff --git a/DS_Map/Helpers.cs b/DS_Map/Helpers.cs index 81d1b9a..f6d2aa0 100644 --- a/DS_Map/Helpers.cs +++ b/DS_Map/Helpers.cs @@ -47,11 +47,11 @@ namespace DSPRE { } public static void DisableHandlers() { - disableHandlers = true; + Helpers.DisableHandlers(); } public static void EnableHandlers() { - disableHandlers = false; + Helpers.EnableHandlers(); } public static void statusLabelMessage(string msg = "Ready") { @@ -371,27 +371,5 @@ namespace DSPRE { return internalNames; } - - public static void OpenWildEditor(int encToOpen = 0) { - Helpers.statusLabelMessage("Attempting to extract Wild Encounters NARC..."); - - DSUtils.TryUnpackNarcs(new List() { RomInfo.DirNames.encounters, RomInfo.DirNames.monIcons }); - - Helpers.statusLabelMessage("Passing control to Wild Pokémon Editor..."); - - switch (RomInfo.gameFamily) { - case RomInfo.GameFamilies.DP: - case RomInfo.GameFamilies.Plat: - using (WildEditorDPPt editor = new WildEditorDPPt(encToOpen)) - editor.ShowDialog(); - break; - default: - using (WildEditorHGSS editor = new WildEditorHGSS(encToOpen)) - editor.ShowDialog(); - break; - } - - Helpers.statusLabelMessage(); - } } } \ No newline at end of file diff --git a/DS_Map/LearnsetEditor.cs b/DS_Map/LearnsetEditor.cs index 70984a7..a0ef089 100644 --- a/DS_Map/LearnsetEditor.cs +++ b/DS_Map/LearnsetEditor.cs @@ -11,7 +11,6 @@ using MessageBox = System.Windows.Forms.MessageBox; namespace DSPRE { public partial class LearnsetEditor : Form { - private bool disableHandlers = false; private readonly string[] fileNames; private readonly string[] pokenames; @@ -41,7 +40,7 @@ namespace DSPRE { this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Size = parent.Size; this.Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top | AnchorStyles.Bottom; - disableHandlers = true; + Helpers.DisableHandlers(); BindingList listMoveNames = new BindingList(moveNames); moveInputComboBox.DataSource = listMoveNames; @@ -65,7 +64,7 @@ namespace DSPRE { descriptorLabel.Text = ""; statusLabel.Text = ""; - disableHandlers = false; + Helpers.EnableHandlers(); pokemonNameInputComboBox.SelectedIndex = 1; } @@ -128,26 +127,26 @@ namespace DSPRE { } private void pokemonNameInputComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); if (CheckDiscardChanges()) { int newNumber = pokemonNameInputComboBox.SelectedIndex; monNumberNumericUpDown.Value = newNumber; ChangeLoadedFile(newNumber); } - disableHandlers = false; + Helpers.EnableHandlers(); } private void monNumberNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); if (CheckDiscardChanges()) { int newNumber = (int)monNumberNumericUpDown.Value; @@ -155,7 +154,7 @@ namespace DSPRE { ChangeLoadedFile(newNumber); } - disableHandlers = false; + Helpers.EnableHandlers(); } private void moveInputComboBox_SelectedIndexChanged(object sender, EventArgs e) { diff --git a/DS_Map/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs index 47fcadb..c684a6a 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 dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = 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(); @@ -2827,40 +2827,40 @@ this.headersGridView.AllowUserToResizeColumns = false; this.headersGridView.AllowUserToResizeRows = false; this.headersGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - dataGridViewCellStyle17.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.Info; - dataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.headersGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle17; + 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; - dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle18.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle18.Format = "D4"; - dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.headersGridView.DefaultCellStyle = dataGridViewCellStyle18; + 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"; - dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle19.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.headersGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle19; + 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; - dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle20.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.headersGridView.RowsDefaultCellStyle = dataGridViewCellStyle20; + 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; @@ -2889,43 +2889,43 @@ this.heightsGridView.AllowUserToDeleteRows = false; this.heightsGridView.AllowUserToResizeColumns = false; this.heightsGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle21; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5; this.heightsGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle22.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.heightsGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle22; + 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; - dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle23.Font = new System.Drawing.Font("Tahoma", 8.25F); - dataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle23.Format = "D2"; - dataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle23; + 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"; - dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle24.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.heightsGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle24; + 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; - dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle25.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.heightsGridView.RowsDefaultCellStyle = dataGridViewCellStyle25; + 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; @@ -2952,43 +2952,43 @@ this.mapFilesGridView.AllowUserToDeleteRows = false; this.mapFilesGridView.AllowUserToResizeColumns = false; this.mapFilesGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle26; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10; this.mapFilesGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle27.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mapFilesGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle27; + 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; - dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle28.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle28.Format = "D4"; - dataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle28; + 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"; - dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle29.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mapFilesGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle29; + 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; - dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle30.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.mapFilesGridView.RowsDefaultCellStyle = dataGridViewCellStyle30; + 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; @@ -8147,8 +8147,8 @@ this.textEditorDataGridView.Location = new System.Drawing.Point(12, 77); this.textEditorDataGridView.Name = "textEditorDataGridView"; this.textEditorDataGridView.RowHeadersWidth = 68; - dataGridViewCellStyle31.Font = new System.Drawing.Font("Consolas", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textEditorDataGridView.RowsDefaultCellStyle = dataGridViewCellStyle31; + 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(873, 500); this.textEditorDataGridView.TabIndex = 24; this.textEditorDataGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.textEditorDataGridView_CellValueChanged); @@ -8251,9 +8251,9 @@ this.cameraEditorDataGridView.CausesValidation = false; this.cameraEditorDataGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised; this.cameraEditorDataGridView.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle32.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.cameraEditorDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle32; + 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, diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index 23b3a27..b1b7abc 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -37,7 +37,6 @@ namespace DSPRE { #region Program Window #region Variables - public bool disableHandlers = false; public bool iconON = false; /* Editors Setup */ @@ -104,18 +103,7 @@ namespace DSPRE { } return trainerList.ToArray(); } - private void statusLabelMessage(string msg = "Ready") { - statusLabel.Text = msg; - statusLabel.Font = new Font(statusLabel.Font, FontStyle.Regular); - statusLabel.ForeColor = Color.Black; - statusLabel.Invalidate(); - } - private void statusLabelError(string errorMsg, bool severe = true) { - statusLabel.Text = errorMsg; - statusLabel.Font = new Font(statusLabel.Font, FontStyle.Bold); - statusLabel.ForeColor = severe ? Color.Red : Color.DarkOrange; - statusLabel.Invalidate(); - } + private void PaintGameIcon(object sender, PaintEventArgs e) { if (iconON) { FileStream banner; @@ -223,7 +211,7 @@ namespace DSPRE { public void SetupScriptEditor() { /* Extract essential NARCs sub-archives*/ - statusLabelMessage("Setting up Script Editor..."); + Helpers.statusLabelMessage("Setting up Script Editor..."); Update(); DSUtils.TryUnpackNarcs(new List { DirNames.scripts }); //12 = scripts Narc Dir @@ -236,12 +224,12 @@ namespace DSPRE { UpdateScriptNumberCheckBox((NumberStyles)Properties.Settings.Default.scriptEditorFormatPreference); selectScriptFileComboBox.SelectedIndex = 0; - statusLabelMessage(); + Helpers.statusLabelMessage(); } private void SetupTextEditor() { DSUtils.TryUnpackNarcs(new List { DirNames.textArchives }); - statusLabelMessage("Setting up Text Editor..."); + Helpers.statusLabelMessage("Setting up Text Editor..."); Update(); selectTextFileComboBox.Items.Clear(); @@ -250,12 +238,12 @@ namespace DSPRE { selectTextFileComboBox.Items.Add("Text Archive " + i); } - disableHandlers = true; + Helpers.DisableHandlers(); hexRadiobutton.Checked = Properties.Settings.Default.textEditorPreferHex; - disableHandlers = false; + Helpers.EnableHandlers(); selectTextFileComboBox.SelectedIndex = 0; - statusLabelMessage(); + Helpers.statusLabelMessage(); } private int UnpackRomCheckUserChoice() { @@ -284,7 +272,7 @@ namespace DSPRE { } } private bool UnpackRom(string ndsFileName) { - statusLabelMessage("Unpacking ROM contents to " + RomInfo.workDir + " ..."); + Helpers.statusLabelMessage("Unpacking ROM contents to " + RomInfo.workDir + " ..."); Update(); Directory.CreateDirectory(RomInfo.workDir); @@ -466,11 +454,11 @@ namespace DSPRE { } private void OpenCommandsDatabase(Dictionary namesDict, Dictionary paramsDict, Dictionary actionsDict, Dictionary comparisonOPsDict) { - statusLabelMessage("Setting up Commands Database. Please wait..."); + Helpers.statusLabelMessage("Setting up Commands Database. Please wait..."); Update(); CommandsDatabase form = new CommandsDatabase(namesDict, paramsDict, actionsDict, comparisonOPsDict); form.Show(); - statusLabelMessage(); + Helpers.statusLabelMessage(); } private void headerSearchToolStripButton_Click(object sender, EventArgs e) { mainTabControl.SelectedIndex = 0; //Select Header Editor @@ -490,7 +478,7 @@ namespace DSPRE { private void unpackBuildingEditorNARCs(bool forceUnpack = false) { toolStripProgressBar.Visible = true; - statusLabelMessage("Attempting to unpack Building Editor NARCs... Please wait. This might take a while"); + Helpers.statusLabelMessage("Attempting to unpack Building Editor NARCs... Please wait. This might take a while"); toolStripProgressBar.Visible = true; toolStripProgressBar.Maximum = 4; toolStripProgressBar.Value = 0; @@ -519,7 +507,7 @@ namespace DSPRE { toolStripProgressBar.Value = 0; toolStripProgressBar.Visible = false; - statusLabelMessage(); + Helpers.statusLabelMessage(); Update(); } private void aboutToolStripMenuItem_Click(object sender, EventArgs e) { @@ -553,7 +541,7 @@ namespace DSPRE { int userchoice = UnpackRomCheckUserChoice(); switch (userchoice) { case -1: - statusLabelMessage("Loading aborted"); + Helpers.statusLabelMessage("Loading aborted"); Update(); return; case 0: @@ -562,7 +550,7 @@ namespace DSPRE { case 2: Application.DoEvents(); if (userchoice == 1) { - statusLabelMessage("Deleting old data..."); + Helpers.statusLabelMessage("Deleting old data..."); try { Directory.Delete(RomInfo.workDir, true); } catch (IOException) { @@ -575,7 +563,7 @@ namespace DSPRE { try { if (!UnpackRom(openRom.FileName)) { - statusLabelError("ERROR"); + Helpers.statusLabelError("ERROR"); languageLabel.Text = ""; versionLabel.Text = "Error"; return; @@ -583,7 +571,7 @@ namespace DSPRE { DSUtils.ARM9.EditSize(-12); } catch (IOException) { MessageBox.Show("Can't access temp directory: \n" + RomInfo.workDir + "\nThis might be a temporary issue.\nMake sure no other process is using it and try again.", "Open Error", MessageBoxButtons.OK, MessageBoxIcon.Error); - statusLabelError("ERROR: Concurrent access to " + RomInfo.workDir); + Helpers.statusLabelError("ERROR: Concurrent access to " + RomInfo.workDir); Update(); return; } @@ -592,7 +580,7 @@ namespace DSPRE { iconON = true; gameIcon.Refresh(); // Paint game icon - statusLabelMessage("Attempting to unpack NARCs from folder..."); + Helpers.statusLabelMessage("Attempting to unpack NARCs from folder..."); Update(); for (int i = 0; i < 128; i++) { if (DSUtils.OverlayIsCompressed(i)) { @@ -696,7 +684,7 @@ namespace DSPRE { monEditorToolStripMenuItem.Enabled = true; scriptCommandsButton.Enabled = true; - statusLabelMessage(); + Helpers.statusLabelMessage(); this.Text += " - " + RomInfo.fileName; } @@ -708,7 +696,7 @@ namespace DSPRE { return; } - statusLabelMessage("Repacking NARCS..."); + Helpers.statusLabelMessage("Repacking NARCS..."); Update(); // Repack NARCs @@ -721,7 +709,7 @@ namespace DSPRE { if (DSUtils.ARM9.CheckCompressionMark()) { - statusLabelMessage("Awaiting user response..."); + Helpers.statusLabelMessage("Awaiting user response..."); DialogResult d = MessageBox.Show("The ARM9 file of this ROM is currently uncompressed, but marked as compressed.\n" + "This will prevent your ROM from working on native hardware.\n\n" + "Do you want to mark the ARM9 as uncompressed?", "ARM9 compression mismatch detected", @@ -732,7 +720,7 @@ namespace DSPRE { } } - statusLabelMessage("Repacking ROM..."); + Helpers.statusLabelMessage("Repacking ROM..."); if (DSUtils.CheckOverlayHasCompressionFlag(1)) { if (ROMToolboxDialog.overlay1MustBeRestoredFromBackup) { @@ -770,10 +758,10 @@ namespace DSPRE { } Properties.Settings.Default.Save(); - statusLabelMessage(); + Helpers.statusLabelMessage(); } private void unpackAllButton_Click(object sender, EventArgs e) { - statusLabelMessage("Awaiting user response..."); + Helpers.statusLabelMessage("Awaiting user response..."); DialogResult d = MessageBox.Show("Do you wish to unpack all extracted NARCS?\n" + "This operation might be long and can't be interrupted.\n\n" + "Any unsaved changes made to the ROM in this session will be lost." + @@ -784,7 +772,7 @@ namespace DSPRE { toolStripProgressBar.Maximum = RomInfo.gameDirs.Count; toolStripProgressBar.Visible = true; toolStripProgressBar.Value = 0; - statusLabelMessage("Attempting to unpack all NARCs... Be patient. This might take a while..."); + Helpers.statusLabelMessage("Attempting to unpack all NARCs... Be patient. This might take a while..."); Update(); DSUtils.ForceUnpackNarcs(Enum.GetValues(typeof(DirNames)).Cast().ToList()); @@ -803,12 +791,12 @@ namespace DSPRE { SetupTextEditor(); SetupTrainerEditor(); - statusLabelMessage(); + Helpers.statusLabelMessage(); Update(); } } private void updateMapNarcsButton_Click(object sender, EventArgs e) { - statusLabelMessage("Awaiting user response..."); + Helpers.statusLabelMessage("Awaiting user response..."); DialogResult d = MessageBox.Show("Do you wish to unpack all NARC files necessary for the Building Editor ?\n" + "This operation might be long and can't be interrupted.\n\n" + "Any unsaved changes made to building models and textures in this session will be lost." + @@ -820,7 +808,7 @@ namespace DSPRE { MessageBox.Show("Operation completed.", "Success", MessageBoxButtons.OK, MessageBoxIcon.Information); - statusLabelMessage(); + Helpers.statusLabelMessage(); if (mapEditorIsReady) { updateBuildingListComboBox(interiorbldRadioButton.Checked); @@ -913,12 +901,12 @@ namespace DSPRE { openWildEditor(loadCurrent: true); } private void openWildEditor(bool loadCurrent) { - statusLabelMessage("Attempting to extract Wild Encounters NARC..."); + Helpers.statusLabelMessage("Attempting to extract Wild Encounters NARC..."); Update(); DSUtils.TryUnpackNarcs(new List() { DirNames.encounters, DirNames.monIcons }); - statusLabelMessage("Passing control to Wild Pokémon Editor..."); + Helpers.statusLabelMessage("Passing control to Wild Pokémon Editor..."); Update(); int encToOpen = loadCurrent ? (int)wildPokeUpDown.Value : 0; @@ -935,7 +923,7 @@ namespace DSPRE { editor.ShowDialog(); break; } - statusLabelMessage(); + Helpers.statusLabelMessage(); } #endregion @@ -949,12 +937,12 @@ namespace DSPRE { private void SetupHeaderEditor() { /* Extract essential NARCs sub-archives*/ - statusLabelMessage("Attempting to unpack Header Editor NARCs... Please wait."); + Helpers.statusLabelMessage("Attempting to unpack Header Editor NARCs... Please wait."); Update(); DSUtils.TryUnpackNarcs(new List { DirNames.synthOverlay, DirNames.textArchives, DirNames.dynamicHeaders }); - statusLabelMessage("Reading internal names... Please wait."); + Helpers.statusLabelMessage("Reading internal names... Please wait."); Update(); internalNames = new List(); @@ -1077,7 +1065,7 @@ namespace DSPRE { if (headerListBox.Items.Count > 0) { headerListBox.SelectedIndex = 0; } - statusLabelMessage(); + Helpers.statusLabelMessage(); } private void addHeaderBTN_Click(object sender, EventArgs e) { // Add new file in the dynamic headers directory @@ -1121,7 +1109,7 @@ namespace DSPRE { } } private void areaDataUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentHeader.areaDataID = (byte)areaDataUpDown.Value; @@ -1138,7 +1126,7 @@ namespace DSPRE { internalNameLenLabel.Text = "[ " + (internalNameBox.Text.Length) + " ]"; } private void areaIconComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -1159,7 +1147,7 @@ namespace DSPRE { } } private void eventFileUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentHeader.eventFileID = (ushort)eventFileUpDown.Value; @@ -1168,7 +1156,7 @@ namespace DSPRE { currentHeader.battleBackground = (byte)battleBackgroundUpDown.Value; } private void followModeComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -1179,7 +1167,7 @@ namespace DSPRE { } private void kantoRadioButton_CheckedChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } if (RomInfo.gameFamily == GameFamilies.HGSS) { @@ -1188,7 +1176,7 @@ namespace DSPRE { } } private void headerFlagsCheckBoxes_CheckedChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -1216,7 +1204,7 @@ namespace DSPRE { currentHeader.flags = flagVal; } private void headerListBox_SelectedValueChanged(object sender, EventArgs e) { - if (disableHandlers || headerListBox.SelectedIndex < 0) { + if (Helpers.HandlersDisabled || headerListBox.SelectedIndex < 0) { return; } @@ -1353,19 +1341,19 @@ namespace DSPRE { } } private void headerListBox_Leave(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } headerListBox.Refresh(); } private void levelScriptUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentHeader.levelScriptID = (ushort)levelScriptUpDown.Value; } private void mapNameComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -1382,13 +1370,13 @@ namespace DSPRE { } } private void matrixUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentHeader.matrixID = (ushort)matrixUpDown.Value; } private void musicDayComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } switch (RomInfo.gameFamily) { @@ -1404,7 +1392,7 @@ namespace DSPRE { } } private void musicNightComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -1421,11 +1409,11 @@ namespace DSPRE { } } private void musicDayUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); ushort updValue = (ushort)((NumericUpDown)sender).Value; currentHeader.musicDayID = updValue; try { @@ -1443,14 +1431,14 @@ namespace DSPRE { } catch (KeyNotFoundException) { musicDayComboBox.SelectedItem = null; } - disableHandlers = false; + Helpers.EnableHandlers(); } private void musicNightUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); ushort updValue = (ushort)((NumericUpDown)sender).Value; currentHeader.musicNightID = updValue; try { @@ -1468,7 +1456,7 @@ namespace DSPRE { } catch (KeyNotFoundException) { musicNightComboBox.SelectedItem = null; } - disableHandlers = false; + Helpers.EnableHandlers(); } private void worldmapXCoordUpDown_ValueChanged(object sender, EventArgs e) { ((HeaderHGSS)currentHeader).worldmapX = (byte)worldmapXCoordUpDown.Value; @@ -1477,12 +1465,12 @@ namespace DSPRE { ((HeaderHGSS)currentHeader).worldmapY = (byte)worldmapYCoordUpDown.Value; } private void updateWeatherPicAndComboBox() { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } /* Update Weather Combobox*/ - disableHandlers = true; + Helpers.DisableHandlers(); try { switch (RomInfo.gameFamily) { case GameFamilies.DP: @@ -1498,7 +1486,7 @@ namespace DSPRE { } catch (KeyNotFoundException) { weatherComboBox.SelectedItem = null; } - disableHandlers = false; + Helpers.EnableHandlers(); /* Update Weather Picture */ try { @@ -1530,12 +1518,12 @@ namespace DSPRE { } } private void updateCameraPicAndComboBox() { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } /* Update Camera Combobox*/ - disableHandlers = true; + Helpers.DisableHandlers(); try { switch (RomInfo.gameFamily) { case GameFamilies.DP: @@ -1551,7 +1539,7 @@ namespace DSPRE { } catch (KeyNotFoundException) { cameraComboBox.SelectedItem = null; } - disableHandlers = false; + Helpers.EnableHandlers(); /* Update Camera Picture */ string imageName; @@ -1577,7 +1565,7 @@ namespace DSPRE { } private void weatherComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers || weatherComboBox.SelectedIndex < 0) { + if (Helpers.HandlersDisabled || weatherComboBox.SelectedIndex < 0) { return; } @@ -1599,7 +1587,7 @@ namespace DSPRE { updateWeatherPicAndComboBox(); } private void cameraComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers || cameraComboBox.SelectedIndex < 0) { + if (Helpers.HandlersDisabled || cameraComboBox.SelectedIndex < 0) { return; } @@ -1690,12 +1678,12 @@ namespace DSPRE { uint headerOffset = (uint)(RomInfo.headerTableOffset + MapHeader.length * currentHeader.ID); DSUtils.ARM9.WriteBytes(currentHeader.ToByteArray(), headerOffset); } - disableHandlers = true; + Helpers.DisableHandlers(); updateCurrentInternalName(); updateHeaderNameShown(headerListBox.SelectedIndex); headerListBox.Focus(); - disableHandlers = false; + Helpers.EnableHandlers(); } private byte[] StringToInternalName(string text) { if (text.Length > internalNameLength) { @@ -1720,12 +1708,12 @@ namespace DSPRE { } } private void updateHeaderNameShown(int thisIndex) { - disableHandlers = true; + Helpers.DisableHandlers(); string val = (string)(headerListBox.Items[thisIndex] = headerListBoxNames[currentHeader.ID]); if (eventEditorIsReady) { eventEditorWarpHeaderListBox.Items[thisIndex] = val; } - disableHandlers = false; + Helpers.EnableHandlers(); } private void resetButton_Click(object sender, EventArgs e) { resetHeaderSearch(); @@ -1734,7 +1722,7 @@ namespace DSPRE { void resetHeaderSearch() { searchLocationTextBox.Clear(); HeaderSearch.ResetResults(headerListBox, headerListBoxNames, prependNumbers: false); - statusLabelMessage(); + Helpers.statusLabelMessage(); } private void searchHeaderTextBox_KeyPress(object sender, KeyEventArgs e) { @@ -1853,13 +1841,13 @@ namespace DSPRE { //File.WriteAllLines("dummy.txt", output); } private void scriptFileUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentHeader.scriptFileID = (ushort)scriptFileUpDown.Value; } private void areaSettingsComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers || areaSettingsComboBox.SelectedItem is null) { + if (Helpers.HandlersDisabled || areaSettingsComboBox.SelectedItem is null) { return; } @@ -1875,14 +1863,14 @@ namespace DSPRE { } } private void textFileUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentHeader.textArchiveID = (ushort)textFileUpDown.Value; } private void wildPokeUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -2302,12 +2290,12 @@ namespace DSPRE { } #endregion private void SetupMatrixEditor() { - statusLabelMessage("Setting up Matrix Editor..."); + Helpers.statusLabelMessage("Setting up Matrix Editor..."); Update(); DSUtils.TryUnpackNarcs(new List { DirNames.matrices }); - disableHandlers = true; + Helpers.DisableHandlers(); /* Add matrix entries to ComboBox */ selectMatrixComboBox.Items.Clear(); @@ -2321,9 +2309,9 @@ namespace DSPRE { } RomInfo.SetupSpawnSettings(); - disableHandlers = false; + Helpers.EnableHandlers(); selectMatrixComboBox.SelectedIndex = 0; - statusLabelMessage(); + Helpers.statusLabelMessage(); } private void addHeaderSectionButton_Click(object sender, EventArgs e) { if (!currentMatrix.hasHeadersSection) { @@ -2373,7 +2361,7 @@ namespace DSPRE { } private void DisplaySelection(DataGridViewSelectedCellCollection selectedCells) { if (selectedCells.Count > 0) { - statusLabelMessage("Selection: " + selectedCells[0].ColumnIndex + ", " + selectedCells[0].RowIndex); + Helpers.statusLabelMessage("Selection: " + selectedCells[0].ColumnIndex + ", " + selectedCells[0].RowIndex); } } private void headersGridView_CellMouseDoubleClick(object sender, DataGridViewCellMouseEventArgs e) { @@ -2388,7 +2376,7 @@ namespace DSPRE { } } private void headersGridView_CellValueChanged(object sender, DataGridViewCellEventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } if (e.RowIndex > -1 && e.ColumnIndex > -1) { @@ -2410,7 +2398,7 @@ namespace DSPRE { return; } - disableHandlers = true; + Helpers.DisableHandlers(); /* Format table cells corresponding to border maps or void */ if (!ushort.TryParse(mapFilesGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString(), out ushort colorValue)) { @@ -2426,11 +2414,11 @@ namespace DSPRE { e.Value = 0; } - disableHandlers = false; + Helpers.EnableHandlers(); } private void heightsGridView_CellValueChanged(object sender, DataGridViewCellEventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } if (e.RowIndex > -1 && e.ColumnIndex > -1) { @@ -2445,10 +2433,10 @@ namespace DSPRE { } } private void widthUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); /* Add or remove rows in DataGridView control */ int delta = (int)widthUpDown.Value - currentMatrix.width; @@ -2480,13 +2468,13 @@ namespace DSPRE { /* Modify matrix object */ currentMatrix.ResizeMatrix((int)heightUpDown.Value, (int)widthUpDown.Value); - disableHandlers = false; + Helpers.EnableHandlers(); } private void heightUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); /* Add or remove rows in DataGridView control */ int delta = (int)heightUpDown.Value - currentMatrix.height; @@ -2517,14 +2505,14 @@ namespace DSPRE { /* Modify matrix object */ currentMatrix.ResizeMatrix((int)heightUpDown.Value, (int)widthUpDown.Value); - disableHandlers = false; + Helpers.EnableHandlers(); } private void heightsGridView_CellFormatting(object sender, DataGridViewCellFormattingEventArgs e) { if (e.Value is null) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); /* Format table cells corresponding to border maps or void */ ushort colorValue = 0; @@ -2543,12 +2531,12 @@ namespace DSPRE { } catch { } e.Value = cellValue; - disableHandlers = false; + Helpers.EnableHandlers(); } private void importMatrixButton_Click(object sender, EventArgs e) { /* Prompt user to select .mtx file */ if (selectMatrixComboBox.SelectedIndex == 0) { - statusLabelMessage("Awaiting user response..."); + Helpers.statusLabelMessage("Awaiting user response..."); DialogResult d = MessageBox.Show("Replacing a matrix - especially Matrix 0 - with a new file is risky.\n" + "Do not do it unless you are absolutely sure.\nProceed?", "Risky operation", MessageBoxButtons.YesNo, MessageBoxIcon.Warning); @@ -2572,15 +2560,15 @@ namespace DSPRE { GenerateMatrixTables(); /* Setup matrix editor controls */ - disableHandlers = true; + Helpers.DisableHandlers(); matrixNameTextBox.Text = currentMatrix.name; widthUpDown.Value = currentMatrix.width; heightUpDown.Value = currentMatrix.height; - disableHandlers = false; + Helpers.EnableHandlers(); /* Display success message */ MessageBox.Show("Matrix imported successfully!", "", MessageBoxButtons.OK, MessageBoxIcon.Information); - statusLabelMessage(); + Helpers.statusLabelMessage(); } private void mapFilesGridView_CellMouseDoubleClick(object sender, DataGridViewCellEventArgs e) { if (e.RowIndex >= 0 && e.ColumnIndex >= 0) { @@ -2616,13 +2604,13 @@ namespace DSPRE { if (result.Length < 1) { headerID = currentHeader.ID; - statusLabelMessage("This Matrix is not linked to any Header. DSPRE can't determine the most appropriate AreaData (and textures) to use.\nDisplaying Textures from the last selected Header (" + headerID + ")'s AreaData..."); + Helpers.statusLabelMessage("This Matrix is not linked to any Header. DSPRE can't determine the most appropriate AreaData (and textures) to use.\nDisplaying Textures from the last selected Header (" + headerID + ")'s AreaData..."); } else { if (result.Length > 1) { if (result.Contains(currentHeader.ID)) { headerID = currentHeader.ID; - statusLabelMessage("Multiple Headers are associated to this Matrix, including the last selected one [Header " + headerID + "]. Now using its textures."); + Helpers.statusLabelMessage("Multiple Headers are associated to this Matrix, including the last selected one [Header " + headerID + "]. Now using its textures."); } else { if (gameFamily.Equals(GameFamilies.DP)) { foreach (ushort r in result) { @@ -2664,11 +2652,11 @@ namespace DSPRE { } } - statusLabelMessage("Multiple Headers are using this Matrix. Header " + headerID + "'s textures are currently being displayed."); + Helpers.statusLabelMessage("Multiple Headers are using this Matrix. Header " + headerID + "'s textures are currently being displayed."); } } else { headerID = result[0]; - statusLabelMessage("Loading Header " + headerID + "'s textures."); + Helpers.statusLabelMessage("Loading Header " + headerID + "'s textures."); } } } @@ -2689,7 +2677,7 @@ namespace DSPRE { } /* Load Map File and switch to Map Editor tab */ - disableHandlers = true; + Helpers.DisableHandlers(); AreaData areaData = new AreaData(h.areaDataID); selectMapComboBox.SelectedIndex = currentMatrix.maps[e.RowIndex, e.ColumnIndex]; @@ -2703,12 +2691,12 @@ namespace DSPRE { exteriorbldRadioButton.Checked = true; } - disableHandlers = false; + Helpers.EnableHandlers(); selectMapComboBox_SelectedIndexChanged(null, null); } } private void mapFilesGridView_CellValueChanged(object sender, DataGridViewCellEventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } if (e.RowIndex >= 0 && e.ColumnIndex >= 0) { @@ -2723,7 +2711,7 @@ namespace DSPRE { } } private void mapFilesGridView_CellFormatting(object sender, DataGridViewCellFormattingEventArgs e) { - disableHandlers = true; + Helpers.DisableHandlers(); /* Format table cells corresponding to border maps or void */ ushort colorValue = GameMatrix.EMPTY; @@ -2738,10 +2726,10 @@ namespace DSPRE { if (colorValue == GameMatrix.EMPTY) e.Value = '-'; - disableHandlers = false; + Helpers.EnableHandlers(); } private void matrixNameTextBox_TextChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentMatrix.name = matrixNameTextBox.Text; @@ -2828,7 +2816,7 @@ namespace DSPRE { } } private void selectMatrixComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } ClearMatrixTables(); @@ -2836,11 +2824,11 @@ namespace DSPRE { GenerateMatrixTables(); /* Setup matrix editor controls */ - disableHandlers = true; + Helpers.DisableHandlers(); matrixNameTextBox.Text = currentMatrix.name; widthUpDown.Value = currentMatrix.width; heightUpDown.Value = currentMatrix.height; - disableHandlers = false; + Helpers.EnableHandlers(); } private void importColorTableButton_Click(object sender, EventArgs e) { OpenFileDialog of = new OpenFileDialog { @@ -3194,7 +3182,7 @@ namespace DSPRE { toolStripProgressBar.Visible = true; toolStripProgressBar.Maximum = 9; toolStripProgressBar.Value = 0; - statusLabelMessage("Attempting to unpack Map Editor NARCs... Please wait."); + Helpers.statusLabelMessage("Attempting to unpack Map Editor NARCs... Please wait."); Update(); DSUtils.TryUnpackNarcs(new List { DirNames.maps, @@ -3209,7 +3197,7 @@ namespace DSPRE { DSUtils.TryUnpackNarcs(new List { DirNames.interiorBuildingModels }); } - disableHandlers = true; + Helpers.DisableHandlers(); collisionPainterPictureBox.Image = new Bitmap(100, 100); typePainterPictureBox.Image = new Bitmap(100, 100); @@ -3292,7 +3280,7 @@ namespace DSPRE { toolStripProgressBar.Value = 0; toolStripProgressBar.Visible = false; - disableHandlers = false; + Helpers.EnableHandlers(); //Default selections selectMapComboBox.SelectedIndex = 0; @@ -3313,7 +3301,7 @@ namespace DSPRE { break; }; - statusLabelMessage(); + Helpers.statusLabelMessage(); } private void addMapFileButton_Click(object sender, EventArgs e) { /* Add new map file to map folder */ @@ -3371,7 +3359,7 @@ namespace DSPRE { private void buildTextureComboBox_SelectedIndexChanged(object sender, EventArgs e) { int btIndex = buildTextureComboBox.SelectedIndex; - if (disableHandlers || btIndex < 0) { + if (Helpers.HandlersDisabled || btIndex < 0) { return; } @@ -3395,9 +3383,9 @@ namespace DSPRE { } catch { string itemAtIndex = buildTextureComboBox.Items[btIndex].ToString(); if (!itemAtIndex.StartsWith("Error!")) { - disableHandlers = true; + Helpers.DisableHandlers(); buildTextureComboBox.Items[btIndex] = itemAtIndex.Insert(0, "Error! - "); - disableHandlers = false; + Helpers.EnableHandlers(); } bldTexturesOn = false; } @@ -3409,7 +3397,7 @@ namespace DSPRE { RenderMap(ref mapRenderer, ref buildingsRenderer, ref currentMapFile, ang, dist, elev, perspective, mapOpenGlControl.Width, mapOpenGlControl.Height, mapTexturesOn, bldTexturesOn); } private void mapTextureComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -3686,7 +3674,7 @@ namespace DSPRE { currentMapFile.SaveToFileExplorePath(selectMapComboBox.SelectedItem.ToString()); } private void selectMapComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -3772,13 +3760,13 @@ namespace DSPRE { RenderMap(ref mapRenderer, ref buildingsRenderer, ref currentMapFile, ang, dist, elev, perspective, mapOpenGlControl.Width, mapOpenGlControl.Height, mapTexturesOn, bldTexturesOn); } private void buildIndexComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers || buildingsListBox.SelectedIndex < 0) { + if (Helpers.HandlersDisabled || buildingsListBox.SelectedIndex < 0) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); buildingsListBox.Items[buildingsListBox.SelectedIndex] = (buildingsListBox.SelectedIndex + 1).ToString("D2") + MapHeader.nameSeparator + buildIndexComboBox.SelectedItem; - disableHandlers = false; + Helpers.EnableHandlers(); currentMapFile.buildings[buildingsListBox.SelectedIndex].modelID = (uint)buildIndexComboBox.SelectedIndex; currentMapFile.buildings[buildingsListBox.SelectedIndex].LoadModelData(romInfo.GetBuildingModelsDirPath(interiorbldRadioButton.Checked)); @@ -3788,11 +3776,11 @@ namespace DSPRE { } private void buildingsListBox_SelectedIndexChanged(object sender, EventArgs e) { int buildingNumber = buildingsListBox.SelectedIndex; - if (disableHandlers || buildingNumber < 0) { + if (Helpers.HandlersDisabled || buildingNumber < 0) { return; } - bool oldStatus = disableHandlers; - disableHandlers = true; + Helpers.BackUpDisableHandler(); + Helpers.DisableHandlers(); Building selected = currentMapFile.buildings[buildingNumber]; if (selected.NSBMDFile != null) { @@ -3815,87 +3803,87 @@ namespace DSPRE { buildingLengthUpDown.Value = selected.length; } - disableHandlers = oldStatus; + Helpers.RestoreDisableHandler(); } private void xRotBuildUpDown_ValueChanged(object sender, EventArgs e) { int selection = buildingsListBox.SelectedIndex; - if (selection <= -1 || disableHandlers) { + if (selection <= -1 || Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); xRotDegBldUpDown.Value = (decimal)Building.U16ToDeg(currentMapFile.buildings[selection].xRotation = (ushort)((int)xRotBuildUpDown.Value & ushort.MaxValue)); RenderMap(ref mapRenderer, ref buildingsRenderer, ref currentMapFile, ang, dist, elev, perspective, mapOpenGlControl.Width, mapOpenGlControl.Height, mapTexturesOn, bldTexturesOn); - disableHandlers = false; + Helpers.EnableHandlers(); } private void yRotBuildUpDown_ValueChanged(object sender, EventArgs e) { int selection = buildingsListBox.SelectedIndex; - if (selection <= -1 || disableHandlers) { + if (selection <= -1 || Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); yRotDegBldUpDown.Value = (decimal)Building.U16ToDeg(currentMapFile.buildings[selection].yRotation = (ushort)((int)yRotBuildUpDown.Value & ushort.MaxValue)); RenderMap(ref mapRenderer, ref buildingsRenderer, ref currentMapFile, ang, dist, elev, perspective, mapOpenGlControl.Width, mapOpenGlControl.Height, mapTexturesOn, bldTexturesOn); - disableHandlers = false; + Helpers.EnableHandlers(); } private void zRotBuildUpDown_ValueChanged(object sender, EventArgs e) { int selection = buildingsListBox.SelectedIndex; - if (selection <= -1 || disableHandlers) { + if (selection <= -1 || Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); zRotDegBldUpDown.Value = (decimal)Building.U16ToDeg(currentMapFile.buildings[selection].zRotation = (ushort)((int)zRotBuildUpDown.Value & ushort.MaxValue)); RenderMap(ref mapRenderer, ref buildingsRenderer, ref currentMapFile, ang, dist, elev, perspective, mapOpenGlControl.Width, mapOpenGlControl.Height, mapTexturesOn, bldTexturesOn); - disableHandlers = false; + Helpers.EnableHandlers(); } private void xRotDegBldUpDown_ValueChanged(object sender, EventArgs e) { - if (buildingsListBox.SelectedIndex <= -1 || disableHandlers) { + if (buildingsListBox.SelectedIndex <= -1 || Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); currentMapFile.buildings[buildingsListBox.SelectedIndex].xRotation = (ushort)(xRotBuildUpDown.Value = Building.DegToU16((float)xRotDegBldUpDown.Value)); RenderMap(ref mapRenderer, ref buildingsRenderer, ref currentMapFile, ang, dist, elev, perspective, mapOpenGlControl.Width, mapOpenGlControl.Height, mapTexturesOn, bldTexturesOn); - disableHandlers = false; + Helpers.EnableHandlers(); } private void yRotDegBldUpDown_ValueChanged(object sender, EventArgs e) { - if (buildingsListBox.SelectedIndex <= -1 || disableHandlers) { + if (buildingsListBox.SelectedIndex <= -1 || Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); currentMapFile.buildings[buildingsListBox.SelectedIndex].yRotation = (ushort)(yRotBuildUpDown.Value = Building.DegToU16((float)yRotDegBldUpDown.Value)); RenderMap(ref mapRenderer, ref buildingsRenderer, ref currentMapFile, ang, dist, elev, perspective, mapOpenGlControl.Width, mapOpenGlControl.Height, mapTexturesOn, bldTexturesOn); - disableHandlers = false; + Helpers.EnableHandlers(); } private void zRotDegBldUpDown_ValueChanged(object sender, EventArgs e) { - if (buildingsListBox.SelectedIndex <= -1 || disableHandlers) { + if (buildingsListBox.SelectedIndex <= -1 || Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); currentMapFile.buildings[buildingsListBox.SelectedIndex].zRotation = (ushort)(zRotBuildUpDown.Value = Building.DegToU16((float)zRotDegBldUpDown.Value)); RenderMap(ref mapRenderer, ref buildingsRenderer, ref currentMapFile, ang, dist, elev, perspective, mapOpenGlControl.Width, mapOpenGlControl.Height, mapTexturesOn, bldTexturesOn); - disableHandlers = false; + Helpers.EnableHandlers(); } private void buildingHeightUpDown_ValueChanged(object sender, EventArgs e) { if (buildingsListBox.SelectedIndex > -1) { @@ -3949,7 +3937,7 @@ namespace DSPRE { MessageBox.Show("Buildings imported successfully!", "", MessageBoxButtons.OK, MessageBoxIcon.Information); } private void interiorRadioButton_CheckedChanged(object sender, EventArgs e) { - disableHandlers = true; + Helpers.DisableHandlers(); int index = buildIndexComboBox.SelectedIndex; buildIndexComboBox.Items.Clear(); @@ -3972,12 +3960,12 @@ namespace DSPRE { /* Render the map */ RenderMap(ref mapRenderer, ref buildingsRenderer, ref currentMapFile, ang, dist, elev, perspective, mapOpenGlControl.Width, mapOpenGlControl.Height, mapTexturesOn, bldTexturesOn); - disableHandlers = false; + Helpers.EnableHandlers(); } private void removeBuildingButton_Click(object sender, EventArgs e) { int toRemoveListBoxID = buildingsListBox.SelectedIndex; if (toRemoveListBoxID > -1) { - disableHandlers = true; + Helpers.DisableHandlers(); /* Remove building object from list and the corresponding entry in the ListBox */ @@ -3987,7 +3975,7 @@ namespace DSPRE { FillBuildingsBox(); // Update ListBox RenderMap(ref mapRenderer, ref buildingsRenderer, ref currentMapFile, ang, dist, elev, perspective, mapOpenGlControl.Width, mapOpenGlControl.Height, mapTexturesOn, bldTexturesOn); - disableHandlers = false; + Helpers.EnableHandlers(); if (buildingsListBox.Items.Count > 0) { if (toRemoveListBoxID > 0) { @@ -3999,7 +3987,7 @@ namespace DSPRE { } } private void xBuildUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers || buildingsListBox.SelectedIndex < 0) { + if (Helpers.HandlersDisabled || buildingsListBox.SelectedIndex < 0) { return; } @@ -4016,7 +4004,7 @@ namespace DSPRE { RenderMap(ref mapRenderer, ref buildingsRenderer, ref currentMapFile, ang, dist, elev, perspective, mapOpenGlControl.Width, mapOpenGlControl.Height, mapTexturesOn, bldTexturesOn); } private void zBuildUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers || buildingsListBox.SelectedIndex < 0) + if (Helpers.HandlersDisabled || buildingsListBox.SelectedIndex < 0) return; var wholePart = Math.Truncate(zBuildUpDown.Value); @@ -4032,7 +4020,7 @@ namespace DSPRE { RenderMap(ref mapRenderer, ref buildingsRenderer, ref currentMapFile, ang, dist, elev, perspective, mapOpenGlControl.Width, mapOpenGlControl.Height, mapTexturesOn, bldTexturesOn); } private void yBuildUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers || buildingsListBox.SelectedIndex < 0) + if (Helpers.HandlersDisabled || buildingsListBox.SelectedIndex < 0) return; var wholePart = Math.Truncate(yBuildUpDown.Value); @@ -4930,7 +4918,7 @@ namespace DSPRE { private void eventPictureBox_MouseMove(object sender, MouseEventArgs e) { Point coordinates = eventPictureBox.PointToClient(Cursor.Position); Point mouseTilePos = new Point(coordinates.X / (tileSize + 1), coordinates.Y / (tileSize + 1)); - statusLabelMessage("Local: " + mouseTilePos.X + ", " + mouseTilePos.Y + " | " + "Global: " + (eventMatrixXUpDown.Value * MapFile.mapSize + mouseTilePos.X).ToString() + ", " + (eventMatrixYUpDown.Value * MapFile.mapSize + mouseTilePos.Y).ToString()); + Helpers.statusLabelMessage("Local: " + mouseTilePos.X + ", " + mouseTilePos.Y + " | " + "Global: " + (eventMatrixXUpDown.Value * MapFile.mapSize + mouseTilePos.X).ToString() + ", " + (eventMatrixYUpDown.Value * MapFile.mapSize + mouseTilePos.Y).ToString()); } private void DisplayActiveEvents() { @@ -5076,10 +5064,10 @@ namespace DSPRE { areaDataID = h.areaDataID; - bool disableHandlersbackup = disableHandlers; - disableHandlers = true; + Helpers.BackUpDisableHandler(); + Helpers.DisableHandlers(); eventAreaDataUpDown.Value = h.areaDataID; - disableHandlers = disableHandlersbackup; + Helpers.RestoreDisableHandler(); } else { areaDataID = (byte)eventAreaDataUpDown.Value; } @@ -5289,7 +5277,7 @@ namespace DSPRE { private void SetupEventEditor() { /* Extract essential NARCs sub-archives*/ - statusLabelMessage("Attempting to unpack Event Editor NARCs... Please wait. This might take a while"); + Helpers.statusLabelMessage("Attempting to unpack Event Editor NARCs... Please wait. This might take a while"); toolStripProgressBar.Visible = true; toolStripProgressBar.Maximum = 12; toolStripProgressBar.Value = 0; @@ -5317,7 +5305,7 @@ namespace DSPRE { DSUtils.TryUnpackNarcs(new List { DirNames.interiorBuildingModels }); } - disableHandlers = true; + Helpers.DisableHandlers(); if (File.Exists(RomInfo.OWtablePath)) { switch (RomInfo.gameFamily) { case GameFamilies.DP: @@ -5339,7 +5327,7 @@ namespace DSPRE { } /* Add event file numbers to box */ - statusLabelMessage("Loading Events... Please wait."); + Helpers.statusLabelMessage("Loading Events... Please wait."); Update(); int eventCount = RomInfo.GetEventFileCount(); @@ -5414,7 +5402,7 @@ namespace DSPRE { eventMatrixUpDown.Maximum = romInfo.GetMatrixCount() - 1; eventAreaDataUpDown.Maximum = romInfo.GetAreaDataCount() - 1; - disableHandlers = false; + Helpers.EnableHandlers(); selectEventComboBox.SelectedIndex = 0; owItemComboBox.SelectedIndex = 0; @@ -5423,7 +5411,7 @@ namespace DSPRE { toolStripProgressBar.Value = 0; toolStripProgressBar.Visible = false; - statusLabelMessage(); + Helpers.statusLabelMessage(); } private void addEventFileButton_Click(object sender, EventArgs e) { /* Add copy of event 0 to event folder */ @@ -5446,17 +5434,17 @@ namespace DSPRE { eventMatrixYUpDown.Value = mouseTilePos.Y; } private void eventMatrixUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); eventMatrix = new GameMatrix((int)eventMatrixUpDown.Value); eventMatrixXUpDown.Maximum = eventMatrix.width - 1; eventMatrixYUpDown.Maximum = eventMatrix.height - 1; eventEditorFullMapReload((int)eventMatrixXUpDown.Value, (int)eventMatrixYUpDown.Value); - disableHandlers = false; + Helpers.EnableHandlers(); CenterEventViewOnEntities(); } @@ -5481,7 +5469,7 @@ namespace DSPRE { } } private void eventMatrixCoordsUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -5621,10 +5609,10 @@ namespace DSPRE { } } private void selectEventComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); /* Load events data into EventFile class instance */ currentEvFile = new EventFile(selectEventComboBox.SelectedIndex); @@ -5649,19 +5637,19 @@ namespace DSPRE { eventMatrixYUpDown.Maximum = eventMatrix.height - 1; eventAreaDataUpDown.Value = h.areaDataID; - statusLabelMessage($"Detected link between Event File {selectEventComboBox.SelectedIndex} and Header {mapHeader}"); + Helpers.statusLabelMessage($"Detected link between Event File {selectEventComboBox.SelectedIndex} and Header {mapHeader}"); } else { - statusLabelError($"Could not link Event File {selectEventComboBox.SelectedIndex} to any Header"); + Helpers.statusLabelError($"Could not link Event File {selectEventComboBox.SelectedIndex} to any Header"); } eventEditorFullMapReload((int)eventMatrixXUpDown.Value, (int)eventMatrixYUpDown.Value); - disableHandlers = false; + Helpers.EnableHandlers(); CenterEventViewOnEntities(); } private void showEventsCheckBoxes_CheckedChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -5805,7 +5793,7 @@ namespace DSPRE { return; } - disableHandlers = true; + Helpers.DisableHandlers(); /* Remove trigger object from list and the corresponding entry in the ListBox */ int spawnableNumber = spawnablesListBox.SelectedIndex; @@ -5814,7 +5802,7 @@ namespace DSPRE { FillSpawnablesBox(); // Update ListBox - disableHandlers = false; + Helpers.EnableHandlers(); if (spawnableNumber > 0) { spawnablesListBox.SelectedIndex = spawnableNumber - 1; @@ -5834,9 +5822,9 @@ namespace DSPRE { updateSelectedSpawnableName(); } private void spawnablesListBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers || spawnablesListBox.SelectedIndex < 0) + if (Helpers.HandlersDisabled || spawnablesListBox.SelectedIndex < 0) return; - disableHandlers = true; + Helpers.DisableHandlers(); /* Set Event */ selectedEvent = currentEvFile.spawnables[spawnablesListBox.SelectedIndex]; @@ -5853,11 +5841,11 @@ namespace DSPRE { spawnableYMatrixUpDown.Value = currentEvFile.spawnables[spawnablesListBox.SelectedIndex].yMatrixPosition; DisplayActiveEvents(); - disableHandlers = false; + Helpers.EnableHandlers(); } private void spawnableMatrixXUpDown_ValueChanged(object sender, EventArgs e) { int selectedSpawnable = spawnablesListBox.SelectedIndex; - if (disableHandlers || selectedSpawnable < 0) { + if (Helpers.HandlersDisabled || selectedSpawnable < 0) { return; } @@ -5866,7 +5854,7 @@ namespace DSPRE { } private void spawnableMatrixYUpDown_ValueChanged(object sender, EventArgs e) { int selectedSpawnable = spawnablesListBox.SelectedIndex; - if (disableHandlers || selectedSpawnable < 0) { + if (Helpers.HandlersDisabled || selectedSpawnable < 0) { return; } @@ -5875,7 +5863,7 @@ namespace DSPRE { } private void spawnableScriptUpDown_ValueChanged(object sender, EventArgs e) { int selectedSpawnable = spawnablesListBox.SelectedIndex; - if (disableHandlers || selectedSpawnable < 0) { + if (Helpers.HandlersDisabled || selectedSpawnable < 0) { return; } @@ -5884,7 +5872,7 @@ namespace DSPRE { } private void spawnableMapXUpDown_ValueChanged(object sender, EventArgs e) { int selectedSpawnable = spawnablesListBox.SelectedIndex; - if (disableHandlers || selectedSpawnable < 0) { + if (Helpers.HandlersDisabled || selectedSpawnable < 0) { return; } @@ -5893,7 +5881,7 @@ namespace DSPRE { } private void spawnableMapYUpDown_ValueChanged(object sender, EventArgs e) { int selectedSpawnable = spawnablesListBox.SelectedIndex; - if (disableHandlers || selectedSpawnable < 0) { + if (Helpers.HandlersDisabled || selectedSpawnable < 0) { return; } @@ -5902,7 +5890,7 @@ namespace DSPRE { } private void spawnableZUpDown_ValueChanged(object sender, EventArgs e) { int selectedSpawnable = spawnablesListBox.SelectedIndex; - if (disableHandlers || selectedSpawnable < 0) { + if (Helpers.HandlersDisabled || selectedSpawnable < 0) { return; } @@ -5911,7 +5899,7 @@ namespace DSPRE { } private void spawnableDirComboBox_SelectedIndexChanged(object sender, EventArgs e) { int selectedSpawnable = spawnablesListBox.SelectedIndex; - if (disableHandlers || selectedSpawnable < 0) { + if (Helpers.HandlersDisabled || selectedSpawnable < 0) { return; } @@ -5920,7 +5908,7 @@ namespace DSPRE { } private void spawnableTypeComboBox_SelectedIndexChanged(object sender, EventArgs e) { int selectedSpawnable = spawnablesListBox.SelectedIndex; - if (disableHandlers || selectedSpawnable < 0) { + if (Helpers.HandlersDisabled || selectedSpawnable < 0) { return; } @@ -5950,7 +5938,7 @@ namespace DSPRE { return; } - disableHandlers = true; + Helpers.DisableHandlers(); /* Remove overworld object from list and the corresponding entry in the ListBox */ int owNumber = overworldsListBox.SelectedIndex; @@ -5958,7 +5946,7 @@ namespace DSPRE { overworldsListBox.Items.RemoveAt(owNumber); FillOverworldsBox(); // Update ListBox - disableHandlers = false; + Helpers.EnableHandlers(); if (owNumber > 0) { overworldsListBox.SelectedIndex = owNumber - 1; @@ -5998,7 +5986,7 @@ namespace DSPRE { owScriptNumericUpDown.Enabled = true; owSpecialGroupBox.Enabled = false; - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentEvFile.overworlds[overworldsListBox.SelectedIndex].type = 0x0; @@ -6018,7 +6006,7 @@ namespace DSPRE { itemsSelectorHelpBtn.Enabled = true; owItemLabel.Enabled = true; - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentEvFile.overworlds[overworldsListBox.SelectedIndex].type = 0x3; @@ -6038,7 +6026,7 @@ namespace DSPRE { owItemComboBox.Enabled = false; itemsSelectorHelpBtn.Enabled = false; - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentEvFile.overworlds[overworldsListBox.SelectedIndex].type = 0x1; @@ -6048,7 +6036,7 @@ namespace DSPRE { } } private void owItemComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers || overworldsListBox.SelectedIndex < 0) { + if (Helpers.HandlersDisabled || overworldsListBox.SelectedIndex < 0) { return; } @@ -6057,10 +6045,10 @@ namespace DSPRE { private void overworldsListBox_SelectedIndexChanged(object sender, EventArgs e) { int index = overworldsListBox.SelectedIndex; - if (disableHandlers || index < 0) { + if (Helpers.HandlersDisabled || index < 0) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); selectedEvent = currentEvFile.overworlds[index]; Overworld selectedOw = (Overworld)selectedEvent; @@ -6126,12 +6114,12 @@ namespace DSPRE { MessageBox.Show(errorMsg, "Something went wrong", MessageBoxButtons.OK, MessageBoxIcon.Error); } - disableHandlers = false; + Helpers.EnableHandlers(); } private void owFlagNumericUpDown_ValueChanged(object sender, EventArgs e) { int selection = overworldsListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6140,7 +6128,7 @@ namespace DSPRE { private void owIDNumericUpDown_ValueChanged(object sender, EventArgs e) { int selection = overworldsListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6150,7 +6138,7 @@ namespace DSPRE { private void owMovementComboBox_SelectedIndexChanged(object sender, EventArgs e) { int selection = overworldsListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6166,7 +6154,7 @@ namespace DSPRE { if (selection >= 0) { owSpritePictureBox.BackgroundImage = GetOverworldImage(currentEvFile.overworlds[selection].overlayTableEntry, orientation); - if (!disableHandlers) { + if (Helpers.HandlersEnabled) { currentEvFile.overworlds[selection].orientation = orientation; DisplayActiveEvents(); } @@ -6179,7 +6167,7 @@ namespace DSPRE { private void owScriptNumericUpDown_ValueChanged(object sender, EventArgs e) { int selection = overworldsListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6189,7 +6177,7 @@ namespace DSPRE { private void owSightRangeUpDown_ValueChanged(object sender, EventArgs e) { int selection = overworldsListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6212,7 +6200,7 @@ namespace DSPRE { if (selection >= 0) { owSpritePictureBox.BackgroundImage = GetOverworldImage(overlayTableEntryID, currentEvFile.overworlds[selection].orientation); - if (!disableHandlers) { + if (Helpers.HandlersEnabled) { currentEvFile.overworlds[selection].overlayTableEntry = overlayTableEntryID; DisplayActiveEvents(); } @@ -6225,7 +6213,7 @@ namespace DSPRE { private void owPartnerTrainerCheckBox_CheckedChanged(object sender, EventArgs e) { int selection = overworldsListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6234,7 +6222,7 @@ namespace DSPRE { private void owTrainerComboBox_SelectedIndexChanged(object sender, EventArgs e) { int selection = overworldsListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6243,7 +6231,7 @@ namespace DSPRE { private void owXMapUpDown_ValueChanged(object sender, EventArgs e) { int selection = overworldsListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6253,7 +6241,7 @@ namespace DSPRE { private void owXRangeUpDown_ValueChanged(object sender, EventArgs e) { int selection = overworldsListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6262,7 +6250,7 @@ namespace DSPRE { private void owYRangeUpDown_ValueChanged(object sender, EventArgs e) { int selection = overworldsListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6271,7 +6259,7 @@ namespace DSPRE { private void owYMapUpDown_ValueChanged(object sender, EventArgs e) { int selection = overworldsListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6281,7 +6269,7 @@ namespace DSPRE { private void owZPositionUpDown_ValueChanged(object sender, EventArgs e) { int selection = overworldsListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6291,7 +6279,7 @@ namespace DSPRE { private void owXMatrixUpDown_ValueChanged(object sender, EventArgs e) { int selection = overworldsListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6302,7 +6290,7 @@ namespace DSPRE { } private void owYMatrixUpDown_ValueChanged(object sender, EventArgs e) { int selection = overworldsListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6332,7 +6320,7 @@ namespace DSPRE { return; } - disableHandlers = true; + Helpers.DisableHandlers(); /* Remove warp object from list and the corresponding entry in the ListBox */ int warpNumber = warpsListBox.SelectedIndex; @@ -6341,7 +6329,7 @@ namespace DSPRE { FillWarpsBox(); // Update ListBox - disableHandlers = false; + Helpers.EnableHandlers(); if (warpNumber > 0) { warpsListBox.SelectedIndex = warpNumber - 1; @@ -6366,7 +6354,7 @@ namespace DSPRE { eventEditorWarpHeaderListBox.SelectedIndex = n.header; } private void warpAnchorUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers || warpsListBox.SelectedIndex < 0) { + if (Helpers.HandlersDisabled || warpsListBox.SelectedIndex < 0) { return; } @@ -6414,7 +6402,7 @@ namespace DSPRE { eventEditorHeaderLocationNameLabel.Text = (string)locationNameComboBox.Items[locNum]; int warpSel = warpsListBox.SelectedIndex; - if (disableHandlers || warpSel < 0) { + if (Helpers.HandlersDisabled || warpSel < 0) { return; } currentEvFile.warps[warpSel].header = destHeaderID; @@ -6450,7 +6438,7 @@ namespace DSPRE { } private void warpsListBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers || warpsListBox.SelectedIndex < 0) { + if (Helpers.HandlersDisabled || warpsListBox.SelectedIndex < 0) { return; } @@ -6458,7 +6446,7 @@ namespace DSPRE { selectedEvent = currentEvFile.warps[warpsListBox.SelectedIndex]; eventEditorWarpHeaderListBox.SelectedIndex = currentEvFile.warps[warpsListBox.SelectedIndex].header; - disableHandlers = true; + Helpers.DisableHandlers(); warpAnchorUpDown.Value = currentEvFile.warps[warpsListBox.SelectedIndex].anchor; warpXMapUpDown.Value = currentEvFile.warps[warpsListBox.SelectedIndex].xMapPosition; @@ -6470,12 +6458,12 @@ namespace DSPRE { DisplayActiveEvents(); // Redraw events to show selection box #region Re-enable events - disableHandlers = false; + Helpers.EnableHandlers(); #endregion } private void warpMatrixXUpDown_ValueChanged(object sender, EventArgs e) { int index = warpsListBox.SelectedIndex; - if (disableHandlers || index < 0) { + if (Helpers.HandlersDisabled || index < 0) { return; } @@ -6484,7 +6472,7 @@ namespace DSPRE { } private void warpMatrixYUpDown_ValueChanged(object sender, EventArgs e) { int index = warpsListBox.SelectedIndex; - if (disableHandlers || index < 0) { + if (Helpers.HandlersDisabled || index < 0) { return; } @@ -6493,7 +6481,7 @@ namespace DSPRE { } private void warpXMapUpDown_ValueChanged(object sender, EventArgs e) { int index = warpsListBox.SelectedIndex; - if (disableHandlers || index < 0) { + if (Helpers.HandlersDisabled || index < 0) { return; } @@ -6502,7 +6490,7 @@ namespace DSPRE { } private void warpYMapUpDown_ValueChanged(object sender, EventArgs e) { int index = warpsListBox.SelectedIndex; - if (disableHandlers || index < 0) { + if (Helpers.HandlersDisabled || index < 0) { return; } @@ -6511,7 +6499,7 @@ namespace DSPRE { } private void warpZUpDown_ValueChanged(object sender, EventArgs e) { int index = warpsListBox.SelectedIndex; - if (disableHandlers || index < 0) { + if (Helpers.HandlersDisabled || index < 0) { return; } @@ -6571,7 +6559,7 @@ namespace DSPRE { return; } - disableHandlers = true; + Helpers.DisableHandlers(); /* Remove trigger object from list and the corresponding entry in the ListBox */ currentEvFile.triggers.RemoveAt(selection); @@ -6579,7 +6567,7 @@ namespace DSPRE { FillTriggersBox(); // Update ListBox - disableHandlers = false; + Helpers.EnableHandlers(); if (selection > 0) { triggersListBox.SelectedIndex = selection - 1; @@ -6601,10 +6589,10 @@ namespace DSPRE { private void triggersListBox_SelectedIndexChanged(object sender, EventArgs e) { int selectedIndex = triggersListBox.SelectedIndex; - if (disableHandlers || selectedIndex < 0) { + if (Helpers.HandlersDisabled || selectedIndex < 0) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); Trigger t = (selectedEvent = currentEvFile.triggers[selectedIndex]) as Trigger; @@ -6623,11 +6611,11 @@ namespace DSPRE { DisplayActiveEvents(); - disableHandlers = false; + Helpers.EnableHandlers(); } private void triggerVariableWatchedUpDown_ValueChanged(object sender, EventArgs e) { int selection = triggersListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6636,7 +6624,7 @@ namespace DSPRE { } private void expectedVarValueTriggerUpDown_ValueChanged(object sender, EventArgs e) { int selection = triggersListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6645,7 +6633,7 @@ namespace DSPRE { } private void triggerScriptUpDown_ValueChanged(object sender, EventArgs e) { int selection = triggersListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6654,7 +6642,7 @@ namespace DSPRE { } private void triggerXMapUpDown_ValueChanged(object sender, EventArgs e) { int selection = triggersListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6663,7 +6651,7 @@ namespace DSPRE { } private void triggerYMapUpDown_ValueChanged(object sender, EventArgs e) { int selection = triggersListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6672,7 +6660,7 @@ namespace DSPRE { } private void triggerZUpDown_ValueChanged(object sender, EventArgs e) { int selection = triggersListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6681,7 +6669,7 @@ namespace DSPRE { } private void triggerXMatrixUpDown_ValueChanged(object sender, EventArgs e) { int selection = triggersListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6690,7 +6678,7 @@ namespace DSPRE { } private void triggerYMatrixUpDown_ValueChanged(object sender, EventArgs e) { int selection = triggersListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6699,7 +6687,7 @@ namespace DSPRE { } private void triggerWidthUpDown_ValueChanged(object sender, EventArgs e) { int selection = triggersListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6708,7 +6696,7 @@ namespace DSPRE { } private void triggerLengthUpDown_ValueChanged(object sender, EventArgs e) { int selection = triggersListBox.SelectedIndex; - if (disableHandlers || selection < 0) { + if (Helpers.HandlersDisabled || selection < 0) { return; } @@ -6743,14 +6731,14 @@ namespace DSPRE { private Scintilla currentScintillaEditor; private SearchManager currentSearchManager; private void ScriptEditorSetClean() { - disableHandlers = true; + Helpers.DisableHandlers(); scriptsTabPage.Text = ScriptFile.containerTypes.Script.ToString() + "s"; functionsTabPage.Text = ScriptFile.containerTypes.Function.ToString() + "s"; actionsTabPage.Text = ScriptFile.containerTypes.Action.ToString() + "s"; scriptsDirty = functionsDirty = actionsDirty = false; - disableHandlers = false; + Helpers.EnableHandlers(); } private void scriptEditorTabControl_TabIndexChanged(object sender, EventArgs e) { if (scriptEditorTabControl.SelectedTab == scriptsTabPage) { @@ -7485,7 +7473,7 @@ namespace DSPRE { private bool ReloadScript() { Console.WriteLine("Script Reload has been requested"); /* clear controls */ - if (disableHandlers || selectScriptFileComboBox.SelectedIndex < 0) { + if (Helpers.HandlersDisabled || selectScriptFileComboBox.SelectedIndex < 0) { return false; } @@ -7493,9 +7481,9 @@ namespace DSPRE { DialogResult d = MessageBox.Show("There are unsaved changes in this Script File.\nDo you wish to discard them?", "Unsaved work", MessageBoxButtons.YesNo, MessageBoxIcon.Warning); if (!d.Equals(DialogResult.Yes)) { - disableHandlers = true; + Helpers.DisableHandlers(); selectScriptFileComboBox.SelectedIndex = (int)currentScriptFile.fileID; - disableHandlers = false; + Helpers.EnableHandlers(); return false; } } @@ -7516,7 +7504,7 @@ namespace DSPRE { clearCurrentLevelScriptButton.Visible = true; } else { - disableHandlers = true; + Helpers.DisableHandlers(); addScriptFileButton.Visible = true; removeScriptFileButton.Visible = true; @@ -7596,13 +7584,13 @@ namespace DSPRE { } ScriptEditorSetClean(); - statusLabelMessage(); - disableHandlers = false; + Helpers.statusLabelMessage(); + Helpers.EnableHandlers(); return true; } private void UpdateScriptNumberFormatDec(object sender, EventArgs e) { - if (!disableHandlers && scriptEditorNumberFormatDecimal.Checked) { + if (Helpers.HandlersEnabled && scriptEditorNumberFormatDecimal.Checked) { NumberStyles old = (NumberStyles)Properties.Settings.Default.scriptEditorFormatPreference; //Local Backup Properties.Settings.Default.scriptEditorFormatPreference = (int)NumberStyles.Integer; @@ -7613,7 +7601,7 @@ namespace DSPRE { } } private void UpdateScriptNumberFormatHex(object sender, EventArgs e) { - if (!disableHandlers && scriptEditorNumberFormatHex.Checked) { + if (Helpers.HandlersEnabled && scriptEditorNumberFormatHex.Checked) { NumberStyles old = (NumberStyles)Properties.Settings.Default.scriptEditorFormatPreference; //Local Backup Properties.Settings.Default.scriptEditorFormatPreference = (int)NumberStyles.HexNumber; @@ -7623,7 +7611,7 @@ namespace DSPRE { } } private void UpdateScriptNumberFormatNoPref(object sender, EventArgs e) { - if (!disableHandlers && scriptEditorNumberFormatNoPreference.Checked) { + if (Helpers.HandlersEnabled && scriptEditorNumberFormatNoPreference.Checked) { NumberStyles old = (NumberStyles)Properties.Settings.Default.scriptEditorFormatPreference; //Local Backup Properties.Settings.Default.scriptEditorFormatPreference = (int)NumberStyles.None; @@ -7635,7 +7623,7 @@ namespace DSPRE { private void UpdateScriptNumberCheckBox(NumberStyles toSet) { - disableHandlers = true; + Helpers.DisableHandlers(); Properties.Settings.Default.scriptEditorFormatPreference = (int)toSet; switch ((NumberStyles)Properties.Settings.Default.scriptEditorFormatPreference) { @@ -7650,7 +7638,7 @@ namespace DSPRE { break; } Console.WriteLine("changed style to " + Properties.Settings.Default.scriptEditorFormatPreference); - disableHandlers = false; + Helpers.EnableHandlers(); } private void scriptsNavListbox_SelectedIndexChanged(object sender, EventArgs e) { @@ -7703,7 +7691,7 @@ namespace DSPRE { int rowInd = textEditorDataGridView.RowCount - 1; - disableHandlers = true; + Helpers.DisableHandlers(); string format = "X"; string prefix = "0x"; @@ -7713,7 +7701,7 @@ namespace DSPRE { } textEditorDataGridView.Rows[rowInd].HeaderCell.Value = prefix + rowInd.ToString(format); - disableHandlers = false; + Helpers.EnableHandlers(); } private void exportTextFileButton_Click(object sender, EventArgs e) { @@ -7970,7 +7958,7 @@ namespace DSPRE { textSearchProgressBar.Value = cur; if (found) { - disableHandlers = true; + Helpers.DisableHandlers(); textSearchResultsListBox.Items.Add("Text archive (" + cur + ") - Succesfully edited"); currentTextArchive.SaveToFileDefaultDir(cur, showSuccessMessage: false); @@ -7979,7 +7967,7 @@ namespace DSPRE { UpdateTextEditorFileView(false); } - disableHandlers = false; + Helpers.EnableHandlers(); } //else searchMessageResultTextBox.AppendText(searchString + " not found in this file"); //this.saveMessageFileButton_Click(sender, e); @@ -7993,7 +7981,7 @@ namespace DSPRE { UpdateTextEditorFileView(true); } private void UpdateTextEditorFileView(bool readAgain) { - disableHandlers = true; + Helpers.DisableHandlers(); textEditorDataGridView.Rows.Clear(); if (currentTextArchive is null || readAgain) { @@ -8010,7 +7998,7 @@ namespace DSPRE { PrintTextEditorLinesDecimal(); } - disableHandlers = false; + Helpers.EnableHandlers(); textEditorDataGridView_CurrentCellChanged(textEditorDataGridView, null); } @@ -8029,7 +8017,7 @@ namespace DSPRE { } } private void textEditorDataGridView_CellValueChanged(object sender, DataGridViewCellEventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } if (e.RowIndex > -1 && e.ColumnIndex > -1) { @@ -8042,7 +8030,7 @@ namespace DSPRE { } private void textEditorDataGridView_CurrentCellChanged(object sender, EventArgs e) { DataGridView dgv = sender as DataGridView; - if (disableHandlers || dgv == null || dgv.CurrentCell == null) { + if (Helpers.HandlersDisabled || dgv == null || dgv.CurrentCell == null) { return; } @@ -8091,13 +8079,13 @@ namespace DSPRE { Properties.Settings.Default.textEditorPreferHex = hexRadiobutton.Checked; } private void updateTextEditorLineNumbers() { - disableHandlers = true; + Helpers.DisableHandlers(); if (hexRadiobutton.Checked) { PrintTextEditorLinesHex(); } else { PrintTextEditorLinesDecimal(); } - disableHandlers = false; + Helpers.EnableHandlers(); } #endregion @@ -8120,7 +8108,7 @@ namespace DSPRE { } } private void SetupNSBTXEditor() { - statusLabelMessage("Attempting to unpack Tileset Editor NARCs... Please wait."); + Helpers.statusLabelMessage("Attempting to unpack Tileset Editor NARCs... Please wait."); Update(); DSUtils.TryUnpackNarcs(new List { @@ -8173,7 +8161,7 @@ namespace DSPRE { if (palettesListBox.Items.Count > 0) { palettesListBox.SelectedIndex = 0; } - statusLabelMessage(); + Helpers.statusLabelMessage(); } private void buildingsTilesetRadioButton_CheckedChanged(object sender, EventArgs e) { FillTilesetBox(); @@ -8235,7 +8223,7 @@ namespace DSPRE { } } private void palettesListBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -8243,16 +8231,16 @@ namespace DSPRE { int ctrlCode = NSBTXRender(tex: texturesListBox.SelectedIndex, pal: palettesListBox.SelectedIndex, scale: nsbtxScaleFactor); if (ctrlCode > 0) { - statusLabelError($"ERROR! The selected palette doesn't have enough colors for this Palette{ctrlCode} texture."); + Helpers.statusLabelError($"ERROR! The selected palette doesn't have enough colors for this Palette{ctrlCode} texture."); } else { - statusLabelMessage(); + Helpers.statusLabelMessage(); } } private void texturePacksListBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); /* Clear ListBoxes */ texturesListBox.Items.Clear(); @@ -8271,47 +8259,47 @@ namespace DSPRE { texturePacksListBox.Items[texturePacksListBox.SelectedIndex] = "Error! - " + currentItemName; } - disableHandlers = false; + Helpers.EnableHandlers(); return; } /* Add textures and palette slot names to ListBoxes */ texturesListBox.Items.AddRange(currentNsbtx.texInfo.names.ToArray()); palettesListBox.Items.AddRange(currentNsbtx.palInfo.names.ToArray()); - disableHandlers = false; + Helpers.EnableHandlers(); if (texturesListBox.Items.Count > 0) { texturesListBox.SelectedIndex = 0; } } private void texturesListBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } - bool disableHandlersBackup = disableHandlers; - disableHandlers = true; + Helpers.BackUpDisableHandler(); + Helpers.DisableHandlers(); texturesLabel.Text = $"Textures [{texturesListBox.SelectedIndex + 1}/{texturesListBox.Items.Count}]"; string findThis = texturesListBox.SelectedItem.ToString(); string matchingPalette = findAndSelectMatchingPalette(findThis); if (matchingPalette == null) { - statusLabelError("Couldn't find a palette to match " + '"' + findThis + '"', severe: false); + Helpers.statusLabelError("Couldn't find a palette to match " + '"' + findThis + '"', severe: false); } else { palettesListBox.SelectedItem = matchingPalette; - statusLabelMessage("Ready"); + Helpers.statusLabelMessage("Ready"); } - disableHandlers = disableHandlersBackup; + Helpers.RestoreDisableHandler(); int ctrlCode = NSBTXRender(tex: Math.Max(0, texturesListBox.SelectedIndex), pal: Math.Max(0, palettesListBox.SelectedIndex), scale: nsbtxScaleFactor); if (matchingPalette != null && ctrlCode > 0) { - statusLabelError($"ERROR! The selected palette doesn't have enough colors for this Palette{ctrlCode} texture."); + Helpers.statusLabelError($"ERROR! The selected palette doesn't have enough colors for this Palette{ctrlCode} texture."); } } private string findAndSelectMatchingPalette(string findThis) { - statusLabelMessage("Searching palette..."); + Helpers.statusLabelMessage("Searching palette..."); string copy = findThis; while (copy.Length > 0) { @@ -8333,7 +8321,7 @@ namespace DSPRE { return null; } private void areaDataBuildingTilesetUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentAreaData.buildingsTileset = (ushort)areaDataBuildingTilesetUpDown.Value; @@ -8345,19 +8333,19 @@ namespace DSPRE { areaDataDynamicTexturesNumericUpDown.ForeColor = Color.Black; } - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentAreaData.dynamicTextureType = (ushort)areaDataDynamicTexturesNumericUpDown.Value; } private void areaDataLightTypeComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentAreaData.lightType = (byte)areaDataLightTypeComboBox.SelectedIndex; } private void areaDataMapTilesetUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentAreaData.mapTileset = (ushort)areaDataMapTilesetUpDown.Value; @@ -8372,7 +8360,7 @@ namespace DSPRE { areaDataMapTilesetUpDown.Value = currentAreaData.mapTileset; areaDataLightTypeComboBox.SelectedIndex = currentAreaData.lightType; - disableHandlers = true; + Helpers.DisableHandlers(); if (RomInfo.gameFamily == GameFamilies.HGSS) { areaDataDynamicTexturesNumericUpDown.Value = currentAreaData.dynamicTextureType; @@ -8380,7 +8368,7 @@ namespace DSPRE { indoorAreaRadioButton.Checked = interior; outdoorAreaRadioButton.Checked = !interior; } - disableHandlers = false; + Helpers.EnableHandlers(); } private void indoorAreaRadioButton_CheckedChanged(object sender, EventArgs e) { currentAreaData.areaType = indoorAreaRadioButton.Checked ? AreaData.TYPE_INDOOR : AreaData.TYPE_OUTDOOR; @@ -8718,12 +8706,12 @@ namespace DSPRE { } } private void SetupTrainerEditor() { - disableHandlers = true; + Helpers.DisableHandlers(); SetTrainerNameMaxLen(); SetupTrainerClassEncounterMusicTable(); /* Extract essential NARCs sub-archives*/ - statusLabelMessage("Setting up Trainer Editor..."); + Helpers.statusLabelMessage("Setting up Trainer Editor..."); Update(); DSUtils.TryUnpackNarcs(new List { @@ -8913,15 +8901,15 @@ namespace DSPRE { trainerComboBox.SelectedIndex = 0; - disableHandlers = false; + Helpers.EnableHandlers(); trainerComboBox_SelectedIndexChanged(null, null); - statusLabelMessage(); + Helpers.statusLabelMessage(); } private void trainerComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); int currentIndex = trainerComboBox.SelectedIndex; string suffix = "\\" + currentIndex.ToString("D4"); @@ -8939,7 +8927,7 @@ namespace DSPRE { RefreshTrainerPartyGUI(); RefreshTrainerPropertiesGUI(); - disableHandlers = false; + Helpers.EnableHandlers(); if (error) { MessageBox.Show("This Trainer File doesn't have a corresponding name.\n\n" + @@ -9124,7 +9112,7 @@ namespace DSPRE { } } private void partyMoveComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (!disableHandlers) { + if (Helpers.HandlersEnabled) { for (int i = 0; i < TrainerFile.POKE_IN_PARTY; i++) { ushort[] moves = currentTrainerFile.party[i].moves; @@ -9234,9 +9222,9 @@ namespace DSPRE { string editedTrainer = "[" + currentTrainerFile.trp.trainerID.ToString("D2") + "] " + trClass + " " + currentTrainerFile.name; - disableHandlers = true; + Helpers.DisableHandlers(); trainerComboBox.Items[trainerComboBox.SelectedIndex] = editedTrainer; - disableHandlers = false; + Helpers.EnableHandlers(); if (eventEditorIsReady) { owTrainerComboBox.Items[trainerComboBox.SelectedIndex] = editedTrainer; @@ -9436,7 +9424,7 @@ namespace DSPRE { } private void saveTrainerClassButton_Click(object sender, EventArgs e) { - disableHandlers = true; + Helpers.DisableHandlers(); int selectedTrClass = trainerClassListBox.SelectedIndex; @@ -9455,7 +9443,7 @@ namespace DSPRE { if (currentTrainerFile.trp.trainerClass == trainerClassListBox.SelectedIndex) { UpdateCurrentTrainerShownName(); } - disableHandlers = false; + Helpers.EnableHandlers(); if (gameFamily.Equals(GameFamilies.HGSS) && tableEditorIsReady) { pbEffectsTrainerCombobox.Items[selectedTrClass] = trainerClassListBox.Items[selectedTrClass]; @@ -9810,15 +9798,15 @@ namespace DSPRE { int selection = conditionalMusicTableListBox.SelectedIndex; headerConditionalMusicComboBox.SelectedIndex = conditionalMusicTable[selection].header; - disableHandlers = true; + Helpers.DisableHandlers(); flagConditionalMusicUpDown.Value = conditionalMusicTable[selection].flag; musicIDconditionalMusicUpDown.Value = conditionalMusicTable[selection].music; - disableHandlers = false; + Helpers.EnableHandlers(); } private void headerConditionalMusicComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -9840,7 +9828,7 @@ namespace DSPRE { } } private void flagConditionalMusicUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -9849,7 +9837,7 @@ namespace DSPRE { } private void musicIDconditionalMusicUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -9885,7 +9873,7 @@ namespace DSPRE { wr.Write(battleMusic); }; - disableHandlers = true; + Helpers.DisableHandlers(); string updatedEntry = "Combo " + index.ToString("D2") + " - " + "Effect #" + battleIntroEffect + ", " + "Music #" + battleMusic; pbEffectsCombosListbox.Items[index] = updatedEntry; @@ -9893,7 +9881,7 @@ namespace DSPRE { if (RomInfo.gameFamily == GameFamilies.HGSS) { pbEffectsTrainerChooseMainCombobox.Items[index] = pbEffectsPokemonChooseMainCombobox.Items[index] = updatedEntry; } - disableHandlers = false; + Helpers.EnableHandlers(); } private void saveVSPokemonEntryBTN_Click(object sender, EventArgs e) { @@ -9908,9 +9896,9 @@ namespace DSPRE { wr.Write((ushort)((pokemonID & 1023) + (comboID << 10))); //PokemonID }; - disableHandlers = true; + Helpers.DisableHandlers(); pbEffectsVsPokemonListbox.Items[index] = "[" + pokemonID.ToString("D3") + "]" + " " + pokeNames[pokemonID] + " uses Combo #" + comboID; - disableHandlers = false; + Helpers.EnableHandlers(); } private void saveVSTrainerEntryBTN_Click(object sender, EventArgs e) { @@ -9924,9 +9912,9 @@ namespace DSPRE { wr.Write((ushort)((trainerClass & 1023) + (comboID << 10))); }; - disableHandlers = true; + Helpers.DisableHandlers(); pbEffectsVsTrainerListbox.Items[index] = "[" + trainerClass.ToString("D3") + "]" + " " + trcNames[trainerClass] + " uses Combo #" + comboID; - disableHandlers = false; + Helpers.EnableHandlers(); } private void HOWpbEffectsTableButton_Click(object sender, EventArgs e) { @@ -9948,7 +9936,7 @@ namespace DSPRE { private void pbEffectsVsTrainerListbox_SelectedIndexChanged(object sender, EventArgs e) { int trainerSelection = pbEffectsVsTrainerListbox.SelectedIndex; - if (disableHandlers || trainerSelection < 0) { + if (Helpers.HandlersDisabled || trainerSelection < 0) { return; } @@ -9962,7 +9950,7 @@ namespace DSPRE { private void pbEffectsVsPokemonListbox_SelectedIndexChanged(object sender, EventArgs e) { int pokemonSelection = pbEffectsVsPokemonListbox.SelectedIndex; - if (disableHandlers || pokemonSelection < 0) { + if (Helpers.HandlersDisabled || pokemonSelection < 0) { return; } @@ -9979,7 +9967,7 @@ namespace DSPRE { private void pbEffectsCombosListbox_SelectedIndexChanged(object sender, EventArgs e) { int comboSelection = pbEffectsCombosListbox.SelectedIndex; - if (disableHandlers || comboSelection < 0) { + if (Helpers.HandlersDisabled || comboSelection < 0) { return; } @@ -10003,17 +9991,17 @@ namespace DSPRE { #endregion private void ExclusiveCBInvert(CheckBox cb) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); if (cb.Checked) { cb.Checked = !cb.Checked; } - disableHandlers = false; + Helpers.EnableHandlers(); } private void unpackToFolderToolStripMenuItem_Click(object sender, EventArgs e) { @@ -10751,7 +10739,7 @@ namespace DSPRE { string[] abilityNames = RomInfo.GetAbilityNames(); string[] moveNames = RomInfo.GetAttackNames(); - statusLabelMessage("Setting up Pokemon Data Editor..."); + Helpers.statusLabelMessage("Setting up Pokemon Data Editor..."); Update(); DSUtils.TryUnpackNarcs(new List { DirNames.personalPokeData, DirNames.learnsets, DirNames.evolutions, DirNames.monIcons }); @@ -10760,14 +10748,14 @@ namespace DSPRE { PokemonEditor pde = new PokemonEditor(itemNames, abilityNames, moveNames); pde.ShowDialog(); - statusLabelMessage(); + Helpers.statusLabelMessage(); Update(); } private void learnsetsEditorToolStripMenuItem_Click(object sender, EventArgs e) { string[] moveNames = RomInfo.GetAttackNames(); - statusLabelMessage("Setting up Learnsets Editor..."); + Helpers.statusLabelMessage("Setting up Learnsets Editor..."); Update(); DSUtils.TryUnpackNarcs(new List { DirNames.learnsets, DirNames.monIcons }); @@ -10776,12 +10764,12 @@ namespace DSPRE { LearnsetEditor le = new LearnsetEditor(moveNames); le.ShowDialog(); - statusLabelMessage(); + Helpers.statusLabelMessage(); Update(); } private void evolutionsEditorToolStripMenuItem_Click(object sender, EventArgs e) { - statusLabelMessage("Setting up Evolutions Editor..."); + Helpers.statusLabelMessage("Setting up Evolutions Editor..."); Update(); DSUtils.TryUnpackNarcs(new List { DirNames.evolutions, DirNames.monIcons }); @@ -10790,7 +10778,7 @@ namespace DSPRE { EvolutionsEditor eved = new EvolutionsEditor(); eved.ShowDialog(); - statusLabelMessage(); + Helpers.statusLabelMessage(); Update(); } } diff --git a/DS_Map/Main Window.resx b/DS_Map/Main Window.resx index 773342c..9b3572c 100644 --- a/DS_Map/Main Window.resx +++ b/DS_Map/Main Window.resx @@ -117,96 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 239, 17 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM - EgAAAk1TRnQBSQFMAgEBCgEAAagBGwGoARsBEAEAARABAAT/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== - - @@ -1036,6 +946,96 @@ p3S+M+m1V1me9QgCUQNXX2YRT1sYHBiEP3wHVbp3PF3cB40GbrzN86xHENrScf1NDsl8FaI4jODMHOgS SOacfYAmbr5XeNYjGH7yDReXv+JeNIUhUYwFpmZjDz+nMLf5B3b2rcZ5tju4ntjtFw4T54j+v2g/t9NH 9AiCIPwGJelqUAd/T3AAAAAASUVORK5CYII= + + + + 239, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM + EgAAAk1TRnQBSQFMAgEBCgEAAbABGwGwARsBEAEAARABAAT/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== @@ -1047,9 +1047,6 @@ 386, 19 - - 533, 20 - 62 diff --git a/DS_Map/PersonalDataEditor.cs b/DS_Map/PersonalDataEditor.cs index e8f8b17..034d446 100644 --- a/DS_Map/PersonalDataEditor.cs +++ b/DS_Map/PersonalDataEditor.cs @@ -10,7 +10,6 @@ using static System.Windows.Forms.VisualStyles.VisualStyleElement.TextBox; namespace DSPRE { public partial class PersonalDataEditor : Form { - private bool disableHandlers = false; private readonly string[] fileNames; private readonly string[] pokenames; @@ -28,7 +27,7 @@ namespace DSPRE { this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Size = parent.Size; this.Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top | AnchorStyles.Bottom; - disableHandlers = true; + Helpers.DisableHandlers(); BindingList listItemNames = new BindingList(itemNames); item1InputComboBox.DataSource = new BindingSource(listItemNames, string.Empty); @@ -68,7 +67,7 @@ namespace DSPRE { pokemonNameInputComboBox.Items.AddRange(this.fileNames); /* ---------------- */ - disableHandlers = false; + Helpers.EnableHandlers(); pokemonNameInputComboBox.SelectedIndex = 1; @@ -83,7 +82,7 @@ namespace DSPRE { } } private void baseHpNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.baseHP = (byte)baseHpNumericUpDown.Value; @@ -91,14 +90,14 @@ namespace DSPRE { } private void baseAtkNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.baseAtk = (byte)baseAtkNumericUpDown.Value; setDirty(true); } private void baseDefNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.baseDef = (byte)baseDefNumericUpDown.Value; @@ -106,7 +105,7 @@ namespace DSPRE { } private void baseSpAtkNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.baseSpAtk = (byte)baseSpAtkNumericUpDown.Value; @@ -114,7 +113,7 @@ namespace DSPRE { } private void baseSpDefNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.baseSpDef = (byte)baseSpDefNumericUpDown.Value; @@ -122,7 +121,7 @@ namespace DSPRE { } private void baseSpeedNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.baseSpeed = (byte)baseSpeedNumericUpDown.Value; @@ -130,7 +129,7 @@ namespace DSPRE { } private void evHpNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.evHP = (byte)evHpNumericUpDown.Value; @@ -138,7 +137,7 @@ namespace DSPRE { } private void evAtkNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.evAtk = (byte)evAtkNumericUpDown.Value; @@ -146,7 +145,7 @@ namespace DSPRE { } private void evDefNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.evDef = (byte)evDefNumericUpDown.Value; @@ -154,7 +153,7 @@ namespace DSPRE { } private void evSpAtkNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.evSpAtk = (byte)evSpAtkNumericUpDown.Value; @@ -162,7 +161,7 @@ namespace DSPRE { } private void evSpDefNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.evSpDef = (byte)evSpDefNumericUpDown.Value; @@ -170,7 +169,7 @@ namespace DSPRE { } private void evSpeedNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.evSpeed = (byte)evSpeedNumericUpDown.Value; @@ -179,7 +178,7 @@ namespace DSPRE { private void type1InputComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.type1 = (PokemonType)type1InputComboBox.SelectedIndex; @@ -187,7 +186,7 @@ namespace DSPRE { } private void type2InputComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.type2 = (PokemonType)type2InputComboBox.SelectedIndex; @@ -195,7 +194,7 @@ namespace DSPRE { } private void growthCurveInputComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.growthCurve = (PokemonGrowthCurve)growthCurveInputComboBox.SelectedIndex; @@ -203,7 +202,7 @@ namespace DSPRE { } private void baseExpYieldNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.givenExp = (byte)baseExpYieldNumericUpDown.Value; @@ -211,7 +210,7 @@ namespace DSPRE { } private void dexColorInputComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.color = (PokemonDexColor)dexColorInputComboBox.SelectedIndex; @@ -219,7 +218,7 @@ namespace DSPRE { } private void flipFlagCheckBox_CheckedChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.flip = flipFlagCheckBox.Checked; @@ -227,7 +226,7 @@ namespace DSPRE { } private void escapeRateNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.escapeRate = (byte)escapeRateNumericUpDown.Value; @@ -235,7 +234,7 @@ namespace DSPRE { } private void catchRateNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.catchRate = (byte)catchRateNumericUpDown.Value; @@ -243,7 +242,7 @@ namespace DSPRE { } private void genderProbabilityNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.genderVec = (byte)genderProbabilityNumericUpDown.Value; @@ -269,21 +268,21 @@ namespace DSPRE { } private void ability1InputComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.firstAbility = (byte)ability1InputComboBox.SelectedIndex; setDirty(true); } private void ability2InputComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.secondAbility = (byte)ability2InputComboBox.SelectedIndex; setDirty(true); } private void eggGroup1InputCombobox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.eggGroup1 = (byte)eggGroup1InputCombobox.SelectedIndex; @@ -291,7 +290,7 @@ namespace DSPRE { } private void eggGroup2InputCombobox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.eggGroup2 = (byte)eggGroup2InputCombobox.SelectedIndex; @@ -299,7 +298,7 @@ namespace DSPRE { } private void eggStepsNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.eggSteps = (byte)eggStepsNumericUpDown.Value; @@ -307,7 +306,7 @@ namespace DSPRE { } private void item1InputComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.item1 = (ushort)item1InputComboBox.SelectedIndex; @@ -315,7 +314,7 @@ namespace DSPRE { } private void item2InputComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.item2 = (ushort)item2InputComboBox.SelectedIndex; @@ -323,7 +322,7 @@ namespace DSPRE { } private void baseFriendshipNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentLoadedFile.baseFriendship = (byte)baseFriendshipNumericUpDown.Value; @@ -411,31 +410,31 @@ namespace DSPRE { } private void pokemonNameInputComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); if (CheckDiscardChanges()) { int newNumber = pokemonNameInputComboBox.SelectedIndex; monNumberNumericUpDown.Value = newNumber; ChangeLoadedFile(newNumber); } - disableHandlers = false; + Helpers.EnableHandlers(); } private void monNumberNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } - disableHandlers = true; + Helpers.DisableHandlers(); if (CheckDiscardChanges()) { int newNumber = (int)monNumberNumericUpDown.Value; pokemonNameInputComboBox.SelectedIndex = newNumber; ChangeLoadedFile(newNumber); } - disableHandlers = false; + Helpers.EnableHandlers(); } private void ChangeLoadedFile(int toLoad) { currentLoadedId = toLoad; diff --git a/DS_Map/ROMFiles/MapHeader.cs b/DS_Map/ROMFiles/MapHeader.cs index f0c19d3..3bd95af 100644 --- a/DS_Map/ROMFiles/MapHeader.cs +++ b/DS_Map/ROMFiles/MapHeader.cs @@ -128,37 +128,84 @@ namespace DSPRE.ROMFiles { #endregion Fields #region Methods (1) - public static MapHeader LoadFromByteArray(byte[] headerData, ushort headerNumber, GameFamilies gameFamily = GameFamilies.NULL) { + public static string BuildName(int headerID, string name) { + return headerID.ToString("D3") + MapHeader.nameSeparator + name; + } + + public static MapHeader LoadFromByteArray(byte[] headerData, ushort headerNumber, RomInfo.GameFamilies gameFamily = RomInfo.GameFamilies.NULL) { /* Encapsulate header data into the class appropriate for the gameVersion */ if (headerData.Length < MapHeader.length) { MessageBox.Show("File of header " + headerNumber + " is too small and can't store header data.", "Header file too small", MessageBoxButtons.OK, MessageBoxIcon.Error); return null; } - if (gameFamily == GameFamilies.NULL) { + if (gameFamily == RomInfo.GameFamilies.NULL) { gameFamily = RomInfo.gameFamily; } switch (gameFamily) { - case GameFamilies.DP: + case RomInfo.GameFamilies.DP: return new HeaderDP(headerNumber, new MemoryStream(headerData)); - case GameFamilies.Plat: + case RomInfo.GameFamilies.Plat: return new HeaderPt(headerNumber, new MemoryStream(headerData)); default: return new HeaderHGSS(headerNumber, new MemoryStream(headerData)); } } - public static MapHeader LoadFromFile(string filename, ushort headerNumber, long offsetInFile, GameFamilies gameFamily = GameFamilies.NULL) { + + public static MapHeader LoadFromFile(string filename, ushort headerNumber, long offsetInFile, RomInfo.GameFamilies gameFamily = RomInfo.GameFamilies.NULL) { /* Calculate header offset and load data */ byte[] headerData = DSUtils.ReadFromFile(filename, offsetInFile, MapHeader.length); return LoadFromByteArray(headerData, headerNumber, gameFamily); } - public static MapHeader LoadFromARM9(ushort headerNumber, GameFamilies gameFamily = GameFamilies.NULL) { + + public static MapHeader LoadFromARM9(ushort headerNumber, RomInfo.GameFamilies gameFamily = RomInfo.GameFamilies.NULL) { long headerOffset = RomInfo.headerTableOffset + MapHeader.length * headerNumber; return LoadFromFile(RomInfo.arm9Path, headerNumber, headerOffset, gameFamily); } - + public static MapHeader GetMapHeader(ushort headerNumber) { + MapHeader mapHeader; + + //Dynamic headers patch unsupported in DP + if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.DP)) { + return MapHeader.LoadFromARM9(headerNumber); + } + + /* Check if dynamic headers patch has been applied, and load header from arm9 or a/0/5/0 accordingly */ + if (ROMToolboxDialog.flag_DynamicHeadersPatchApplied) { + string path = Filesystem.GetDynamicHeaderPath(headerNumber); + mapHeader = MapHeader.LoadFromFile(path, headerNumber, 0); + } else { + mapHeader = MapHeader.LoadFromARM9(headerNumber); + } + + return mapHeader; + } + + public static int GetHeaderCount() { + int headerCount; + if (ROMToolboxDialog.flag_DynamicHeadersPatchApplied) { + headerCount = Filesystem.GetDynamicHeadersCount(); + } else { + headerCount = RomInfo.GetHeaderCount(); + } + + return headerCount; + } + + public void SaveFile() { + /* Check if dynamic headers patch has been applied, and save header to arm9 or a/0/5/0 accordingly */ + if (ROMToolboxDialog.flag_DynamicHeadersPatchApplied) { + string path = Filesystem.GetDynamicHeaderPath(ID); + DSUtils.WriteToFile(path, this.ToByteArray(), 0, 0, fmode: FileMode.Create); + } else { + uint headerOffset = (uint)(RomInfo.headerTableOffset + MapHeader.length * this.ID); + DSUtils.ARM9.WriteBytes(this.ToByteArray(), headerOffset); + } + } + + #endregion } diff --git a/DS_Map/RomInfo.cs b/DS_Map/RomInfo.cs index 1559e97..3c10a0d 100644 --- a/DS_Map/RomInfo.cs +++ b/DS_Map/RomInfo.cs @@ -16,6 +16,8 @@ namespace DSPRE { public class RomInfo { public static string folderSuffix = "_DSPRE_contents"; + const string dataFolderName = @"data"; + public static string romID { get; private set; } public static string fileName { get; private set; } public static string workDir { get; private set; } @@ -70,6 +72,8 @@ namespace DSPRE { public static string internalNamesLocation { get; private set; } public static readonly byte internalNameLength = 16; + public static string internalNamesPath { get; private set; } + public static int cameraSize { get; private set; } public Dictionary, (Color background, Color foreground)> MapCellsColorDictionary; @@ -132,7 +136,10 @@ namespace DSPRE { OWSprites, scripts, + encounters, + headbutt, + safariZone, trainerProperties, trainerParty, diff --git a/DS_Map/WildEditorDPPt.cs b/DS_Map/WildEditorDPPt.cs index 895ed0d..2c58ae4 100644 --- a/DS_Map/WildEditorDPPt.cs +++ b/DS_Map/WildEditorDPPt.cs @@ -10,13 +10,12 @@ namespace DSPRE { public partial class WildEditorDPPt : Form { public string encounterFileFolder { get; private set; } EncounterFileDPPt currentFile; - bool disableHandlers = false; public WildEditorDPPt(string dirPath, string[] names, int encToOpen, int totalNumHeaderFiles) { InitializeComponent(); encounterFileFolder = dirPath; Text = "DSPRE Reloaded " + GetDSPREVersion() + " - DPPt Encounters Editor"; - disableHandlers = true; + Helpers.DisableHandlers(); MapHeader tempMapHeader; List locationNames = RomInfo.GetLocationNames(); @@ -84,12 +83,12 @@ namespace DSPRE { } } - disableHandlers = false; + Helpers.EnableHandlers(); SetupControls(); } private void SetupControls() { - disableHandlers = true; + Helpers.DisableHandlers(); /* Setup encounter rates controls */ walkingRateUpDown.Value = currentFile.walkingRate; @@ -234,7 +233,7 @@ namespace DSPRE { superRodOneMinLevelUpDown.Value = currentFile.superRodMinLevels[4]; superRodOneMaxLevelUpDown.Value = currentFile.superRodMaxLevels[4]; - disableHandlers = false; + Helpers.EnableHandlers(); } public string GetDSPREVersion() { @@ -261,7 +260,7 @@ namespace DSPRE { SetupControls(); } private void selectEncounterComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -272,313 +271,313 @@ namespace DSPRE { currentFile.SaveToFileDefaultDir(selectEncounterComboBox.SelectedIndex); } private void walkingTwentyFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingPokemon[0] = (uint)walkingTwentyFirstComboBox.SelectedIndex; } private void walkingTwentySecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingPokemon[1] = (uint)walkingTwentySecondComboBox.SelectedIndex; } private void walkingTenFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingPokemon[2] = (uint)walkingTenFirstComboBox.SelectedIndex; } private void walkingTenSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingPokemon[3] = (uint)walkingTenSecondComboBox.SelectedIndex; } private void walkingTenThirdComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingPokemon[4] = (uint)walkingTenThirdComboBox.SelectedIndex; } private void walkingTenFourthComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingPokemon[5] = (uint)walkingTenFourthComboBox.SelectedIndex; } private void walkingFiveFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingPokemon[6] = (uint)walkingFiveFirstComboBox.SelectedIndex; } private void walkingFiveSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingPokemon[7] = (uint)walkingFiveSecondComboBox.SelectedIndex; } private void walkingFourFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingPokemon[8] = (uint)walkingFourFirstComboBox.SelectedIndex; } private void walkingFourSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingPokemon[9] = (uint)walkingFourSecondComboBox.SelectedIndex; } private void walkingOneFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingPokemon[10] = (uint)walkingOneFirstComboBox.SelectedIndex; } private void walkingOneSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingPokemon[11] = (uint)walkingOneSecondComboBox.SelectedIndex; } private void morningFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.morningPokemon[0] = (uint)morningFirstComboBox.SelectedIndex; } private void morningSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.morningPokemon[1] = (uint)morningSecondComboBox.SelectedIndex; } private void nightFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.nightPokemon[0] = (uint)nightFirstComboBox.SelectedIndex; } private void nightSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.nightPokemon[1] = (uint)nightSecondComboBox.SelectedIndex; } private void swarmFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.swarmPokemon[0] = (ushort)swarmFirstComboBox.SelectedIndex; } private void swarmSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.swarmPokemon[1] = (ushort)swarmSecondComboBox.SelectedIndex; } private void rubyFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.rubyPokemon[0] = (uint)rubyFirstComboBox.SelectedIndex; } private void rubySecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.rubyPokemon[1] = (uint)rubySecondComboBox.SelectedIndex; } private void sapphireFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.sapphirePokemon[0] = (uint)sapphireFirstComboBox.SelectedIndex; } private void sapphireSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.sapphirePokemon[1] = (uint)sapphireSecondComboBox.SelectedIndex; } private void emeraldFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.emeraldPokemon[0] = (uint)emeraldFirstComboBox.SelectedIndex; } private void emeraldSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.emeraldPokemon[1] = (uint)emeraldSecondComboBox.SelectedIndex; } private void fireRedFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.fireRedPokemon[0] = (uint)fireRedFirstComboBox.SelectedIndex; } private void fireRedSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.fireRedPokemon[1] = (uint)fireRedSecondComboBox.SelectedIndex; } private void leafGreenFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.leafGreenPokemon[0] = (uint)leafGreenFirstComboBox.SelectedIndex; } private void leafGreenSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.leafGreenPokemon[1] = (uint)leafGreenSecondComboBox.SelectedIndex; } private void radarFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.radarPokemon[0] = (uint)radarFirstComboBox.SelectedIndex; } private void radarSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.radarPokemon[1] = (uint)radarSecondComboBox.SelectedIndex; } private void radarThirdComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.radarPokemon[2] = (uint)radarThirdComboBox.SelectedIndex; } private void radarFourthComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.radarPokemon[3] = (uint)radarFourthComboBox.SelectedIndex; } private void surfSixtyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfPokemon[0] = (ushort)surfSixtyComboBox.SelectedIndex; } private void surfThirtyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfPokemon[1] = (ushort)surfThirtyComboBox.SelectedIndex; } private void surfFiveComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfPokemon[2] = (ushort)surfFiveComboBox.SelectedIndex; } private void surfFourComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfPokemon[3] = (ushort)surfFourComboBox.SelectedIndex; } private void surfOneComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfPokemon[4] = (ushort)surfOneComboBox.SelectedIndex; } private void oldRodSixtyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodPokemon[0] = (ushort)oldRodSixtyComboBox.SelectedIndex; } private void oldRodThirtyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodPokemon[1] = (ushort)oldRodThirtyComboBox.SelectedIndex; } private void oldRodFiveComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodPokemon[2] = (ushort)oldRodFiveComboBox.SelectedIndex; } private void oldRodFourComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodPokemon[3] = (ushort)oldRodFourComboBox.SelectedIndex; } private void oldRodOneComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodPokemon[4] = (ushort)oldRodOneComboBox.SelectedIndex; } private void goodRodFirstFortyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodPokemon[0] = (ushort)goodRodFirstFortyComboBox.SelectedIndex; } private void goodRodSecondFortyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodPokemon[1] = (ushort)goodRodSecondFortyComboBox.SelectedIndex; } private void goodRodFifteenComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodPokemon[2] = (ushort)goodRodFifteenComboBox.SelectedIndex; } private void goodRodFourComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodPokemon[3] = (ushort)goodRodFourComboBox.SelectedIndex; } private void goodRodOneComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodPokemon[4] = (ushort)goodRodOneComboBox.SelectedIndex; } private void superRodFirstFortyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodPokemon[0] = (ushort)superRodFirstFortyComboBox.SelectedIndex; } private void superRodSecondFortyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodPokemon[1] = (ushort)superRodSecondFortyComboBox.SelectedIndex; } private void superRodFifteenComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodPokemon[2] = (ushort)superRodFifteenComboBox.SelectedIndex; } private void superRodFourComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodPokemon[3] = (ushort)superRodFourComboBox.SelectedIndex; } private void superRodOneComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodPokemon[4] = (ushort)superRodOneComboBox.SelectedIndex; @@ -586,73 +585,73 @@ namespace DSPRE { /* Walking levels controls */ private void walkingTwentyFirstUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[0] = (byte)walkingTwentyFirstUpDown.Value; } private void walkingTwentySecondUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[1] = (byte)walkingTwentySecondUpDown.Value; } private void walkingTenFirstUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[2] = (byte)walkingTenFirstUpDown.Value; } private void walkingTenSecondUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[3] = (byte)walkingTenSecondUpDown.Value; } private void walkingTenThirdUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[4] = (byte)walkingTenThirdUpDown.Value; } private void walkingTenFourthUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[5] = (byte)walkingTenFourthUpDown.Value; } private void walkingFiveFirstUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[6] = (byte)walkingFiveFirstUpDown.Value; } private void walkingFiveSecondUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[7] = (byte)walkingFiveSecondUpDown.Value; } private void walkingFourFirstUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[8] = (byte)walkingFourFirstUpDown.Value; } private void walkingFourSecondUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[9] = (byte)walkingFourSecondUpDown.Value; } private void walkingOneFirstUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[10] = (byte)walkingOneFirstUpDown.Value; } private void walkingOneSecondUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[11] = (byte)walkingOneSecondUpDown.Value; @@ -660,244 +659,244 @@ namespace DSPRE { /* Water levels controls */ private void surfSixtyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMinLevels[0] = (byte)surfSixtyMinLevelUpDown.Value; } private void surfThirtyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMinLevels[1] = (byte)surfThirtyMinLevelUpDown.Value; } private void surfFiveMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMinLevels[2] = (byte)surfFiveMinLevelUpDown.Value; } private void surfFourMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMinLevels[3] = (byte)surfFourMinLevelUpDown.Value; } private void surfOneMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMinLevels[4] = (byte)surfOneMinLevelUpDown.Value; } private void surfSixtyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMaxLevels[0] = (byte)surfSixtyMaxLevelUpDown.Value; } private void surfThirtyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMaxLevels[1] = (byte)surfThirtyMaxLevelUpDown.Value; } private void surfFiveMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMaxLevels[2] = (byte)surfFiveMaxLevelUpDown.Value; } private void surfFourMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMaxLevels[3] = (byte)surfFourMaxLevelUpDown.Value; } private void surfOneMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMaxLevels[4] = (byte)surfOneMaxLevelUpDown.Value; } private void oldRodSixtyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMinLevels[0] = (byte)oldRodSixtyMinLevelUpDown.Value; } private void oldRodThirtyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMinLevels[1] = (byte)oldRodThirtyMinLevelUpDown.Value; } private void oldRodFiveMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMinLevels[2] = (byte)oldRodFiveMinLevelUpDown.Value; } private void oldRodFourMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMinLevels[3] = (byte)oldRodFourMinLevelUpDown.Value; } private void oldRodOneMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMinLevels[4] = (byte)oldRodOneMinLevelUpDown.Value; } private void oldRodSixtyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMaxLevels[0] = (byte)oldRodSixtyMaxLevelUpDown.Value; } private void oldRodThirtyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMaxLevels[1] = (byte)oldRodThirtyMaxLevelUpDown.Value; } private void oldRodFiveMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMaxLevels[2] = (byte)oldRodFiveMaxLevelUpDown.Value; } private void oldRodFourMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMaxLevels[3] = (byte)oldRodFourMaxLevelUpDown.Value; } private void oldRodOneMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMaxLevels[4] = (byte)oldRodOneMaxLevelUpDown.Value; } private void goodRodFirstFortyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMinLevels[0] = (byte)goodRodFirstFortyMinLevelUpDown.Value; } private void goodRodSecondFortyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMinLevels[1] = (byte)goodRodSecondFortyMinLevelUpDown.Value; } private void goodRodFifteenMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMinLevels[2] = (byte)goodRodFifteenMinLevelUpDown.Value; } private void goodRodFourMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMinLevels[3] = (byte)goodRodFourMinLevelUpDown.Value; } private void goodRodOneMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMinLevels[4] = (byte)goodRodOneMinLevelUpDown.Value; } private void goodRodFirstFortyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMaxLevels[0] = (byte)goodRodFirstFortyMaxLevelUpDown.Value; } private void goodRodSecondFortyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMaxLevels[1] = (byte)goodRodSecondFortyMaxLevelUpDown.Value; } private void goodRodFifteenMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMaxLevels[2] = (byte)goodRodFifteenMaxLevelUpDown.Value; } private void goodRodFourMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMaxLevels[3] = (byte)goodRodFourMaxLevelUpDown.Value; } private void goodRodOneMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMaxLevels[4] = (byte)goodRodOneMaxLevelUpDown.Value; } private void superRodFirstFortyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMinLevels[0] = (byte)superRodFirstFortyMinLevelUpDown.Value; } private void superRodSecondFortyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMinLevels[1] = (byte)superRodSecondFortyMinLevelUpDown.Value; } private void superRodFifteenMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMinLevels[2] = (byte)superRodFifteenMinLevelUpDown.Value; } private void superRodFourMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMinLevels[3] = (byte)superRodFourMinLevelUpDown.Value; } private void superRodOneMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMinLevels[4] = (byte)superRodOneMinLevelUpDown.Value; } private void superRodFirstFortyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMaxLevels[0] = (byte)superRodFirstFortyMaxLevelUpDown.Value; } private void superRodSecondFortyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMaxLevels[1] = (byte)superRodSecondFortyMaxLevelUpDown.Value; } private void superRodFifteenMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMaxLevels[2] = (byte)superRodFifteenMaxLevelUpDown.Value; } private void superRodFourMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMaxLevels[3] = (byte)superRodFourMaxLevelUpDown.Value; } private void superRodOneMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMaxLevels[4] = (byte)superRodOneMaxLevelUpDown.Value; @@ -905,32 +904,32 @@ namespace DSPRE { /* Encounter rate controls */ private void walkingRateUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingRate = (byte)walkingRateUpDown.Value; } private void surfRateUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfRate = (byte)surfRateUpDown.Value; } private void oldRodRateUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodRate = (byte)oldRodRateUpDown.Value; } private void goodRodRateUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodRate = (byte)goodRodRateUpDown.Value; } private void superRodRateUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodRate = (byte)superRodRateUpDown.Value; diff --git a/DS_Map/WildEditorHGSS.cs b/DS_Map/WildEditorHGSS.cs index 6fbe156..c592839 100644 --- a/DS_Map/WildEditorHGSS.cs +++ b/DS_Map/WildEditorHGSS.cs @@ -10,13 +10,12 @@ namespace DSPRE { public partial class WildEditorHGSS : Form { public string encounterFileFolder { get; private set; } EncounterFileHGSS currentFile; - bool disableHandlers = false; public WildEditorHGSS(string dirPath, string[] names, int encToOpen, int totalNumHeaderFiles) { InitializeComponent(); encounterFileFolder = dirPath; - disableHandlers = true; + Helpers.DisableHandlers(); Text = "DSPRE Reloaded " + GetDSPREVersion() + " - HGSS Encounters Editor"; MapHeader tempMapHeader; List locationNames = RomInfo.GetLocationNames(); @@ -82,7 +81,7 @@ namespace DSPRE { } } - disableHandlers = false; + Helpers.EnableHandlers(); SetupControls(); } @@ -93,7 +92,7 @@ namespace DSPRE { } public void SetupControls() { - disableHandlers = true; + Helpers.DisableHandlers(); /* Setup encounter rates controls */ walkingRateUpDown.Value = currentFile.walkingRate; @@ -261,7 +260,7 @@ namespace DSPRE { superRodOneMinLevelUpDown.Value = currentFile.superRodMinLevels[4]; superRodOneMaxLevelUpDown.Value = currentFile.superRodMaxLevels[4]; - disableHandlers = false; + Helpers.EnableHandlers(); } private void exportEncounterFileButton_Click(object sender, EventArgs e) { currentFile.SaveToFileExplorePath("Encounter File " + selectEncounterComboBox.SelectedIndex); @@ -282,7 +281,7 @@ namespace DSPRE { SetupControls(); } private void selectEncounterComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -294,546 +293,546 @@ namespace DSPRE { } private void walkingRateUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingRate = (byte)walkingRateUpDown.Value; } private void rockSmashRateUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.rockSmashRate = (byte)rockSmashRateUpDown.Value; } private void surfRateUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfRate = (byte)surfRateUpDown.Value; } private void oldRodRateUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodRate = (byte)oldRodRateUpDown.Value; } private void goodRodRateUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodRate = (byte)goodRodRateUpDown.Value; } private void superRodRateUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodRate = (byte)superRodRateUpDown.Value; } private void morningTwentyFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.morningPokemon[0] = (ushort)morningTwentyFirstComboBox.SelectedIndex; } private void morningTwentySecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.morningPokemon[1] = (ushort)morningTwentySecondComboBox.SelectedIndex; } private void morningTenFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.morningPokemon[2] = (ushort)morningTenFirstComboBox.SelectedIndex; } private void morningTenSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.morningPokemon[3] = (ushort)morningTenSecondComboBox.SelectedIndex; } private void morningTenThirdComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.morningPokemon[4] = (ushort)morningTenThirdComboBox.SelectedIndex; } private void morningTenFourthComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.morningPokemon[5] = (ushort)morningTenFourthComboBox.SelectedIndex; } private void morningFiveFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.morningPokemon[6] = (ushort)morningFiveFirstComboBox.SelectedIndex; } private void morningFiveSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.morningPokemon[7] = (ushort)morningFiveSecondComboBox.SelectedIndex; } private void morningFourFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.morningPokemon[8] = (ushort)morningFourFirstComboBox.SelectedIndex; } private void morningFourSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.morningPokemon[9] = (ushort)morningFourSecondComboBox.SelectedIndex; } private void morningOneFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.morningPokemon[10] = (ushort)morningOneFirstComboBox.SelectedIndex; } private void morningOneSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.morningPokemon[11] = (ushort)morningOneSecondComboBox.SelectedIndex; } private void dayTwentyFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.dayPokemon[0] = (ushort)dayTwentyFirstComboBox.SelectedIndex; } private void dayTwentySecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.dayPokemon[1] = (ushort)dayTwentySecondComboBox.SelectedIndex; } private void dayTenFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.dayPokemon[2] = (ushort)dayTenFirstComboBox.SelectedIndex; } private void dayTenSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.dayPokemon[3] = (ushort)dayTenSecondComboBox.SelectedIndex; } private void dayTenThirdComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.dayPokemon[4] = (ushort)dayTenThirdComboBox.SelectedIndex; } private void dayTenFourthComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.dayPokemon[5] = (ushort)dayTenFourthComboBox.SelectedIndex; } private void dayFiveFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.dayPokemon[6] = (ushort)dayFiveFirstComboBox.SelectedIndex; } private void dayFiveSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.dayPokemon[7] = (ushort)dayFiveSecondComboBox.SelectedIndex; } private void dayFourFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.dayPokemon[8] = (ushort)dayFourFirstComboBox.SelectedIndex; } private void dayFourSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.dayPokemon[9] = (ushort)dayFourSecondComboBox.SelectedIndex; } private void dayOneFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.dayPokemon[10] = (ushort)dayOneFirstComboBox.SelectedIndex; } private void dayOneSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.dayPokemon[11] = (ushort)dayOneSecondComboBox.SelectedIndex; } private void nightTwentyFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.nightPokemon[0] = (ushort)nightTwentyFirstComboBox.SelectedIndex; } private void nightTwentySecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.nightPokemon[1] = (ushort)nightTwentySecondComboBox.SelectedIndex; } private void nightTenFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.nightPokemon[2] = (ushort)nightTenFirstComboBox.SelectedIndex; } private void nightTenSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.nightPokemon[3] = (ushort)nightTenSecondComboBox.SelectedIndex; } private void nightTenThirdComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.nightPokemon[4] = (ushort)nightTenThirdComboBox.SelectedIndex; } private void nightTenFourthComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.nightPokemon[5] = (ushort)nightTenFourthComboBox.SelectedIndex; } private void nightFiveFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.nightPokemon[6] = (ushort)nightFiveFirstComboBox.SelectedIndex; } private void nightFiveSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.nightPokemon[7] = (ushort)nightFiveSecondComboBox.SelectedIndex; } private void nightFourFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.nightPokemon[8] = (ushort)nightFourFirstComboBox.SelectedIndex; } private void nightFourSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.nightPokemon[9] = (ushort)nightFourSecondComboBox.SelectedIndex; } private void nightOneFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.nightPokemon[10] = (ushort)nightOneFirstComboBox.SelectedIndex; } private void nightOneSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.nightPokemon[11] = (ushort)nightOneSecondComboBox.SelectedIndex; } private void twentyFirstLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[0] = (byte)twentyFirstLevelUpDown.Value; } private void twentySecondLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[1] = (byte)twentySecondLevelUpDown.Value; } private void tenFirstLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[2] = (byte)tenFirstLevelUpDown.Value; } private void tenSecondLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[3] = (byte)tenSecondLevelUpDown.Value; } private void tenThirdLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[4] = (byte)tenThirdLevelUpDown.Value; } private void tenFourthLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[5] = (byte)tenFourthLevelUpDown.Value; } private void fiveFirstLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[6] = (byte)fiveFirstLevelUpDown.Value; } private void fiveSecondLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[7] = (byte)fiveSecondLevelUpDown.Value; } private void fourFirstLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[8] = (byte)fourFirstLevelUpDown.Value; } private void fourSecondLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[9] = (byte)fourSecondLevelUpDown.Value; } private void oneFirstLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[10] = (byte)oneFirstLevelUpDown.Value; } private void oneSecondLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.walkingLevels[11] = (byte)oneSecondLevelUpDown.Value; } private void hoennFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.hoennMusicPokemon[0] = (ushort)hoennFirstComboBox.SelectedIndex; } private void hoennSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.hoennMusicPokemon[1] = (ushort)hoennSecondComboBox.SelectedIndex; } private void sinnohFirstComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.sinnohMusicPokemon[0] = (ushort)sinnohFirstComboBox.SelectedIndex; } private void sinnohSecondComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.sinnohMusicPokemon[1] = (ushort)sinnohSecondComboBox.SelectedIndex; } private void rockSmashNinetyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.rockSmashPokemon[0] = (ushort)rockSmashNinetyComboBox.SelectedIndex; } private void rockSmashTenComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.rockSmashPokemon[1] = (ushort)rockSmashTenComboBox.SelectedIndex; } private void rockSmashNinetyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.rockSmashMinLevels[0] = (byte)rockSmashNinetyMinLevelUpDown.Value; } private void rockSmashTenMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.rockSmashMinLevels[1] = (byte)rockSmashTenMinLevelUpDown.Value; } private void rockSmashNinetyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.rockSmashMaxLevels[0] = (byte)rockSmashNinetyMaxLevelUpDown.Value; } private void rockSmashTenMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.rockSmashMaxLevels[1] = (byte)rockSmashNinetyMaxLevelUpDown.Value; } private void rockSmashNinetyMaxLevelUpDown_ValueChanged_1(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.rockSmashMaxLevels[0] = (byte)rockSmashNinetyMaxLevelUpDown.Value; } private void rockSmashTenMaxLevelUpDown_ValueChanged_1(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.rockSmashMaxLevels[1] = (byte)rockSmashTenMaxLevelUpDown.Value; } private void grassSwarmComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.swarmPokemon[0] = (ushort)grassSwarmComboBox.SelectedIndex; } private void surfSwarmComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.swarmPokemon[1] = (ushort)surfSwarmComboBox.SelectedIndex; } private void goodRodSwarmComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.swarmPokemon[2] = (ushort)goodRodSwarmComboBox.SelectedIndex; } private void superRodSwarmComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.swarmPokemon[3] = (ushort)superRodSwarmComboBox.SelectedIndex; } private void surfSixtyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfPokemon[0] = (ushort)surfSixtyComboBox.SelectedIndex; } private void surfThirtyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfPokemon[1] = (ushort)surfThirtyComboBox.SelectedIndex; } private void surfFiveComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfPokemon[2] = (ushort)surfFiveComboBox.SelectedIndex; } private void surfFourComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfPokemon[3] = (ushort)surfFourComboBox.SelectedIndex; } private void surfOneComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfPokemon[4] = (ushort)surfOneComboBox.SelectedIndex; } private void oldRodSixtyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodPokemon[0] = (ushort)oldRodSixtyComboBox.SelectedIndex; } private void oldRodThirtyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodPokemon[1] = (ushort)oldRodThirtyComboBox.SelectedIndex; } private void oldRodFiveComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodPokemon[2] = (ushort)oldRodFiveComboBox.SelectedIndex; } private void oldRodFourComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodPokemon[3] = (ushort)oldRodFourComboBox.SelectedIndex; } private void oldRodOneComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodPokemon[4] = (ushort)oldRodOneComboBox.SelectedIndex; } private void goodRodFirstFortyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodPokemon[0] = (ushort)goodRodFirstFortyComboBox.SelectedIndex; } private void goodRodSecondFortyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodPokemon[1] = (ushort)goodRodSecondFortyComboBox.SelectedIndex; } private void goodRodFifteenComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodPokemon[2] = (ushort)goodRodFifteenComboBox.SelectedIndex; } private void goodRodFourComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodPokemon[3] = (ushort)goodRodFourComboBox.SelectedIndex; } private void goodRodOneComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodPokemon[4] = (ushort)goodRodOneComboBox.SelectedIndex; } private void superRodFirstFortyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodPokemon[0] = (ushort)superRodFirstFortyComboBox.SelectedIndex; } private void superRodSecondFortyComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodPokemon[1] = (ushort)superRodSecondFortyComboBox.SelectedIndex; } private void superRodFifteenComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodPokemon[2] = (ushort)superRodFifteenComboBox.SelectedIndex; } private void superRodFourComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodPokemon[3] = (ushort)superRodFourComboBox.SelectedIndex; } private void superRodOneComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodPokemon[4] = (ushort)superRodOneComboBox.SelectedIndex; @@ -841,129 +840,129 @@ namespace DSPRE { /* Water levels controls */ private void surfSixtyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMinLevels[0] = (byte)surfSixtyMinLevelUpDown.Value; } private void surfThirtyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMinLevels[1] = (byte)surfThirtyMinLevelUpDown.Value; } private void surfFiveMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMinLevels[2] = (byte)surfFiveMinLevelUpDown.Value; } private void surfFourMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMinLevels[3] = (byte)surfFourMinLevelUpDown.Value; } private void surfOneMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMinLevels[4] = (byte)surfOneMinLevelUpDown.Value; } private void surfSixtyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMaxLevels[0] = (byte)surfSixtyMaxLevelUpDown.Value; } private void surfThirtyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMaxLevels[1] = (byte)surfThirtyMaxLevelUpDown.Value; } private void surfFiveMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMaxLevels[2] = (byte)surfFiveMaxLevelUpDown.Value; } private void surfFourMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMaxLevels[3] = (byte)surfFourMaxLevelUpDown.Value; } private void surfOneMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.surfMaxLevels[4] = (byte)surfOneMaxLevelUpDown.Value; } private void oldRodSixtyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMinLevels[0] = (byte)oldRodSixtyMinLevelUpDown.Value; } private void oldRodThirtyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMinLevels[1] = (byte)oldRodThirtyMinLevelUpDown.Value; } private void oldRodFiveMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMinLevels[2] = (byte)oldRodFiveMinLevelUpDown.Value; } private void oldRodFourMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMinLevels[3] = (byte)oldRodFourMinLevelUpDown.Value; } private void oldRodOneMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMinLevels[4] = (byte)oldRodOneMinLevelUpDown.Value; } private void oldRodSixtyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMaxLevels[0] = (byte)oldRodSixtyMaxLevelUpDown.Value; } private void oldRodThirtyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMaxLevels[1] = (byte)oldRodThirtyMaxLevelUpDown.Value; } private void oldRodFiveMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMaxLevels[2] = (byte)oldRodFiveMaxLevelUpDown.Value; } private void oldRodFourMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMaxLevels[3] = (byte)oldRodFourMaxLevelUpDown.Value; } private void oldRodOneMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.oldRodMaxLevels[4] = (byte)oldRodOneMaxLevelUpDown.Value; } private void goodRodFirstFortyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } @@ -971,117 +970,117 @@ namespace DSPRE { } private void goodRodSecondFortyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMinLevels[1] = (byte)goodRodSecondFortyMinLevelUpDown.Value; } private void goodRodFifteenMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMinLevels[2] = (byte)goodRodFifteenMinLevelUpDown.Value; } private void goodRodFourMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMinLevels[3] = (byte)goodRodFourMinLevelUpDown.Value; } private void goodRodOneMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMinLevels[4] = (byte)goodRodOneMinLevelUpDown.Value; } private void goodRodFirstFortyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMaxLevels[0] = (byte)goodRodFirstFortyMaxLevelUpDown.Value; } private void goodRodSecondFortyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMaxLevels[1] = (byte)goodRodSecondFortyMaxLevelUpDown.Value; } private void goodRodFifteenMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMaxLevels[2] = (byte)goodRodFifteenMaxLevelUpDown.Value; } private void goodRodFourMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMaxLevels[3] = (byte)goodRodFourMaxLevelUpDown.Value; } private void goodRodOneMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.goodRodMaxLevels[4] = (byte)goodRodOneMaxLevelUpDown.Value; } private void superRodFirstFortyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMinLevels[0] = (byte)superRodFirstFortyMinLevelUpDown.Value; } private void superRodSecondFortyMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMinLevels[1] = (byte)superRodSecondFortyMinLevelUpDown.Value; } private void superRodFifteenMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMinLevels[2] = (byte)superRodFifteenMinLevelUpDown.Value; } private void superRodFourMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMinLevels[3] = (byte)superRodFourMinLevelUpDown.Value; } private void superRodOneMinLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMinLevels[4] = (byte)superRodOneMinLevelUpDown.Value; } private void superRodFirstFortyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMaxLevels[0] = (byte)superRodFirstFortyMaxLevelUpDown.Value; } private void superRodSecondFortyMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMaxLevels[1] = (byte)superRodSecondFortyMaxLevelUpDown.Value; } private void superRodFifteenMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMaxLevels[2] = (byte)superRodFifteenMaxLevelUpDown.Value; } private void superRodFourMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMaxLevels[3] = (byte)superRodFourMaxLevelUpDown.Value; } private void superRodOneMaxLevelUpDown_ValueChanged(object sender, EventArgs e) { - if (disableHandlers) { + if (Helpers.HandlersDisabled) { return; } currentFile.superRodMaxLevels[4] = (byte)superRodOneMaxLevelUpDown.Value; From 0408e2ba44145587176ecf2d9fbf4b8c58bb977f Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Sun, 3 Mar 2024 14:49:57 +0100 Subject: [PATCH 19/40] Migrated to nugets proper --- DS_Map/DSPRE.csproj | 32 ++++++++++++++------------------ DS_Map/packages.config | 7 ------- 2 files changed, 14 insertions(+), 25 deletions(-) delete mode 100644 DS_Map/packages.config diff --git a/DS_Map/DSPRE.csproj b/DS_Map/DSPRE.csproj index 4c82d6f..c991e02 100644 --- a/DS_Map/DSPRE.csproj +++ b/DS_Map/DSPRE.csproj @@ -64,30 +64,13 @@ False .\HelixToolkit.dll - - ..\packages\Microsoft.WindowsAPICodePack-Core.1.1.0.2\lib\Microsoft.WindowsAPICodePack.dll - - - ..\packages\Microsoft.WindowsAPICodePack-Shell.1.1.0.0\lib\Microsoft.WindowsAPICodePack.Shell.dll - - - ..\packages\Microsoft.WindowsAPICodePack-Shell.1.1.0.0\lib\Microsoft.WindowsAPICodePack.ShellExtensions.dll - False ..\..\..\..\..\Desktop\sdsme\Map_Editor\OpenTK.dll - - ..\packages\jacobslusser.ScintillaNET.3.6.3\lib\net40\ScintillaNET.dll - - - ..\packages\System.Collections.Specialized.4.3.0\lib\net46\System.Collections.Specialized.dll - True - True - @@ -354,7 +337,6 @@ WildEditorDPPt.cs - SettingsSingleFileGenerator Settings.Designer.cs @@ -611,5 +593,19 @@ Images + + + 3.6.3 + + + 1.1.0.2 + + + 1.1.0 + + + 4.3.0 + + \ No newline at end of file diff --git a/DS_Map/packages.config b/DS_Map/packages.config deleted file mode 100644 index 6eae2b6..0000000 --- a/DS_Map/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file From 5bfbde28e92095d5b1dbff4328c32376907bf41c Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Sun, 3 Mar 2024 17:35:34 +0100 Subject: [PATCH 20/40] Added the levelscript editor Co-authored-by: Cuddlyogre --- DS_Map/DSPRE.csproj | 36 + DS_Map/EditorPanels.cs | 20 + DS_Map/Editors/LevelScriptEditor.Designer.cs | 458 +++++++ DS_Map/Editors/LevelScriptEditor.cs | 387 ++++++ DS_Map/Editors/LevelScriptEditor.resx | 120 ++ DS_Map/Editors/ScriptEditor.Designer.cs | 917 +++++++++++++ DS_Map/Editors/ScriptEditor.cs | 1047 +++++++++++++++ DS_Map/Editors/ScriptEditor.resx | 120 ++ DS_Map/ExtensionMethods.cs | 71 + DS_Map/Extensions.cs | 31 + DS_Map/Helpers.cs | 4 +- DS_Map/Main Window.Designer.cs | 1186 +++-------------- DS_Map/Main Window.cs | 1004 +------------- DS_Map/Main Window.resx | 183 +-- DS_Map/ROMFiles/HeadbuttEncounter.cs | 27 + DS_Map/ROMFiles/HeadbuttEncounterFile.cs | 136 ++ DS_Map/ROMFiles/HeadbuttEncounterMap.cs | 36 + DS_Map/ROMFiles/HeadbuttTree.cs | 103 ++ DS_Map/ROMFiles/HeadbuttTreeGroup.cs | 32 + DS_Map/ROMFiles/LevelScriptFile.cs | 139 ++ DS_Map/ROMFiles/LevelScriptTrigger.cs | 31 + DS_Map/ROMFiles/MapScreenLoadTrigger.cs | 35 + DS_Map/ROMFiles/SafariZoneEncounter.cs | 35 + DS_Map/ROMFiles/SafariZoneEncounterFile.cs | 101 ++ DS_Map/ROMFiles/SafariZoneEncounterGroup.cs | 108 ++ .../ROMFiles/SafariZoneObjectRequirement.cs | 40 + DS_Map/ROMFiles/ScriptActionContainer.cs | 13 + DS_Map/ROMFiles/ScriptCommand.cs | 168 +-- DS_Map/ROMFiles/ScriptCommandContainer.cs | 25 + DS_Map/ROMFiles/ScriptFile.cs | 270 ++-- DS_Map/ROMFiles/ScriptReference.cs | 22 + DS_Map/ROMFiles/VariableValueTrigger.cs | 32 + DS_Map/ROMToolboxDialog.cs | 49 +- DS_Map/Resources/ScriptDatabase.cs | 4 + 34 files changed, 4643 insertions(+), 2347 deletions(-) create mode 100644 DS_Map/EditorPanels.cs create mode 100644 DS_Map/Editors/LevelScriptEditor.Designer.cs create mode 100644 DS_Map/Editors/LevelScriptEditor.cs create mode 100644 DS_Map/Editors/LevelScriptEditor.resx create mode 100644 DS_Map/Editors/ScriptEditor.Designer.cs create mode 100644 DS_Map/Editors/ScriptEditor.cs create mode 100644 DS_Map/Editors/ScriptEditor.resx create mode 100644 DS_Map/ExtensionMethods.cs create mode 100644 DS_Map/ROMFiles/HeadbuttEncounter.cs create mode 100644 DS_Map/ROMFiles/HeadbuttEncounterFile.cs create mode 100644 DS_Map/ROMFiles/HeadbuttEncounterMap.cs create mode 100644 DS_Map/ROMFiles/HeadbuttTree.cs create mode 100644 DS_Map/ROMFiles/HeadbuttTreeGroup.cs create mode 100644 DS_Map/ROMFiles/LevelScriptFile.cs create mode 100644 DS_Map/ROMFiles/LevelScriptTrigger.cs create mode 100644 DS_Map/ROMFiles/MapScreenLoadTrigger.cs create mode 100644 DS_Map/ROMFiles/SafariZoneEncounter.cs create mode 100644 DS_Map/ROMFiles/SafariZoneEncounterFile.cs create mode 100644 DS_Map/ROMFiles/SafariZoneEncounterGroup.cs create mode 100644 DS_Map/ROMFiles/SafariZoneObjectRequirement.cs create mode 100644 DS_Map/ROMFiles/ScriptActionContainer.cs create mode 100644 DS_Map/ROMFiles/ScriptCommandContainer.cs create mode 100644 DS_Map/ROMFiles/ScriptReference.cs create mode 100644 DS_Map/ROMFiles/VariableValueTrigger.cs diff --git a/DS_Map/DSPRE.csproj b/DS_Map/DSPRE.csproj index c991e02..dc0ef6e 100644 --- a/DS_Map/DSPRE.csproj +++ b/DS_Map/DSPRE.csproj @@ -95,6 +95,19 @@ + + + UserControl + + + LevelScriptEditor.cs + + + UserControl + + + ScriptEditor.cs + Form @@ -107,6 +120,7 @@ EvolutionsEditor.cs + @@ -164,12 +178,28 @@ Component + + + + + + + + + + + + + + + + Form @@ -281,6 +311,12 @@ + + LevelScriptEditor.cs + + + ScriptEditor.cs + EventFileImport.cs diff --git a/DS_Map/EditorPanels.cs b/DS_Map/EditorPanels.cs new file mode 100644 index 0000000..c61106c --- /dev/null +++ b/DS_Map/EditorPanels.cs @@ -0,0 +1,20 @@ +using System.Windows.Forms; +using DSPRE.Editors; + +namespace DSPRE { + public static class EditorPanels { + public static MainProgram MainProgram; + + public static void Initialize(MainProgram mainProgram) { + MainProgram = mainProgram; + } + + public static ScriptEditor scriptEditor { get { return MainProgram.scriptEditor; } } + public static LevelScriptEditor levelScriptEditor { get { return MainProgram.levelScriptEditor; } } + public static TabControl mainTabControl { get { return MainProgram.mainTabControl; } } + + public static TabPage scriptEditorTabPage { get { return MainProgram.tabPageScriptEditor; } } + public static TabPage levelScriptEditorTabPage { get { return MainProgram.tabPageLevelScriptEditor; } } + + } +} diff --git a/DS_Map/Editors/LevelScriptEditor.Designer.cs b/DS_Map/Editors/LevelScriptEditor.Designer.cs new file mode 100644 index 0000000..e17cade --- /dev/null +++ b/DS_Map/Editors/LevelScriptEditor.Designer.cs @@ -0,0 +1,458 @@ +using System.ComponentModel; + +namespace DSPRE.Editors { + partial class LevelScriptEditor { + /// + /// Required designer variable. + /// + private 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 Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() { + this.buttonSave = new System.Windows.Forms.Button(); + this.buttonExport = new System.Windows.Forms.Button(); + this.radioButtonVariableValue = new System.Windows.Forms.RadioButton(); + this.radioButtonMapChange = new System.Windows.Forms.RadioButton(); + this.radioButtonScreenReset = new System.Windows.Forms.RadioButton(); + this.radioButtonLoadGame = new System.Windows.Forms.RadioButton(); + this.textBoxScriptID = new System.Windows.Forms.TextBox(); + this.textBoxVariableName = new System.Windows.Forms.TextBox(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.groupBoxVariable = new System.Windows.Forms.GroupBox(); + this.groupBoxValue = new System.Windows.Forms.GroupBox(); + this.textBoxVariableValue = new System.Windows.Forms.TextBox(); + this.checkBoxPadding = new System.Windows.Forms.CheckBox(); + this.buttonAdd = new System.Windows.Forms.Button(); + this.buttonRemove = new System.Windows.Forms.Button(); + this.radioButtonDecimal = new System.Windows.Forms.RadioButton(); + this.radioButtonHex = new System.Windows.Forms.RadioButton(); + this.radioButtonAuto = new System.Windows.Forms.RadioButton(); + this.selectScriptFileComboBox = new System.Windows.Forms.ComboBox(); + this.listBoxTriggers = new DSPRE.ListBox2(); + this.buttonOpenHeaderScript = new System.Windows.Forms.Button(); + this.buttonOpenSelectedScript = new System.Windows.Forms.Button(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.buttonLocate = new System.Windows.Forms.Button(); + this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.buttonImport = new System.Windows.Forms.Button(); + this.groupBox5 = new System.Windows.Forms.GroupBox(); + this.groupBox6 = new System.Windows.Forms.GroupBox(); + this.groupBox7 = new System.Windows.Forms.GroupBox(); + this.groupBox1.SuspendLayout(); + this.groupBox2.SuspendLayout(); + this.groupBoxVariable.SuspendLayout(); + this.groupBoxValue.SuspendLayout(); + this.groupBox3.SuspendLayout(); + this.groupBox4.SuspendLayout(); + this.groupBox5.SuspendLayout(); + this.groupBox6.SuspendLayout(); + this.groupBox7.SuspendLayout(); + this.SuspendLayout(); + // + // buttonSave + // + this.buttonSave.Location = new System.Drawing.Point(70, 19); + this.buttonSave.Name = "buttonSave"; + this.buttonSave.Size = new System.Drawing.Size(53, 23); + this.buttonSave.TabIndex = 5; + this.buttonSave.Text = "Save"; + this.buttonSave.UseVisualStyleBackColor = true; + this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click); + // + // buttonExport + // + this.buttonExport.Location = new System.Drawing.Point(129, 19); + this.buttonExport.Name = "buttonExport"; + this.buttonExport.Size = new System.Drawing.Size(51, 23); + this.buttonExport.TabIndex = 6; + this.buttonExport.Text = "Export"; + this.buttonExport.UseVisualStyleBackColor = true; + this.buttonExport.Click += new System.EventHandler(this.buttonExport_Click); + // + // radioButtonVariableValue + // + this.radioButtonVariableValue.AutoSize = true; + this.radioButtonVariableValue.Checked = true; + this.radioButtonVariableValue.Location = new System.Drawing.Point(6, 19); + this.radioButtonVariableValue.Name = "radioButtonVariableValue"; + this.radioButtonVariableValue.Size = new System.Drawing.Size(107, 17); + this.radioButtonVariableValue.TabIndex = 12; + this.radioButtonVariableValue.TabStop = true; + this.radioButtonVariableValue.Text = "Variable == value"; + this.radioButtonVariableValue.UseVisualStyleBackColor = true; + this.radioButtonVariableValue.CheckedChanged += new System.EventHandler(this.radioButtonVariableValue_CheckedChanged); + // + // radioButtonMapChange + // + this.radioButtonMapChange.AutoSize = true; + this.radioButtonMapChange.Location = new System.Drawing.Point(119, 19); + this.radioButtonMapChange.Name = "radioButtonMapChange"; + this.radioButtonMapChange.Size = new System.Drawing.Size(86, 17); + this.radioButtonMapChange.TabIndex = 13; + this.radioButtonMapChange.Text = "Player enters"; + this.radioButtonMapChange.UseVisualStyleBackColor = true; + this.radioButtonMapChange.CheckedChanged += new System.EventHandler(this.radioButtonMapChange_CheckedChanged); + // + // radioButtonScreenReset + // + this.radioButtonScreenReset.AutoSize = true; + this.radioButtonScreenReset.Location = new System.Drawing.Point(211, 19); + this.radioButtonScreenReset.Name = "radioButtonScreenReset"; + this.radioButtonScreenReset.Size = new System.Drawing.Size(88, 17); + this.radioButtonScreenReset.TabIndex = 14; + this.radioButtonScreenReset.Text = "Screen fades"; + this.radioButtonScreenReset.UseVisualStyleBackColor = true; + this.radioButtonScreenReset.CheckedChanged += new System.EventHandler(this.radioButtonScreenReset_CheckedChanged); + // + // radioButtonLoadGame + // + this.radioButtonLoadGame.AutoSize = true; + this.radioButtonLoadGame.Location = new System.Drawing.Point(305, 19); + this.radioButtonLoadGame.Name = "radioButtonLoadGame"; + this.radioButtonLoadGame.Size = new System.Drawing.Size(81, 17); + this.radioButtonLoadGame.TabIndex = 15; + this.radioButtonLoadGame.Text = "Game loads"; + this.radioButtonLoadGame.UseVisualStyleBackColor = true; + this.radioButtonLoadGame.CheckedChanged += new System.EventHandler(this.radioButtonLoadGame_CheckedChanged); + // + // textBoxScriptID + // + this.textBoxScriptID.Location = new System.Drawing.Point(6, 19); + this.textBoxScriptID.Name = "textBoxScriptID"; + this.textBoxScriptID.Size = new System.Drawing.Size(116, 20); + this.textBoxScriptID.TabIndex = 16; + this.textBoxScriptID.TextChanged += new System.EventHandler(this.textBoxScriptID_TextChanged); + // + // textBoxVariableName + // + this.textBoxVariableName.Location = new System.Drawing.Point(6, 19); + this.textBoxVariableName.Name = "textBoxVariableName"; + this.textBoxVariableName.Size = new System.Drawing.Size(116, 20); + this.textBoxVariableName.TabIndex = 17; + this.textBoxVariableName.TextChanged += new System.EventHandler(this.textBoxVariableName_TextChanged); + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.radioButtonVariableValue); + this.groupBox1.Controls.Add(this.radioButtonMapChange); + this.groupBox1.Controls.Add(this.radioButtonScreenReset); + this.groupBox1.Controls.Add(this.radioButtonLoadGame); + this.groupBox1.Location = new System.Drawing.Point(3, 366); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(397, 48); + this.groupBox1.TabIndex = 11; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "When this happens in the map:"; + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.textBoxScriptID); + this.groupBox2.Location = new System.Drawing.Point(3, 420); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(128, 48); + this.groupBox2.TabIndex = 12; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "Run this script ID"; + // + // groupBoxVariable + // + this.groupBoxVariable.Controls.Add(this.textBoxVariableName); + this.groupBoxVariable.Location = new System.Drawing.Point(137, 420); + this.groupBoxVariable.Name = "groupBoxVariable"; + this.groupBoxVariable.Size = new System.Drawing.Size(128, 48); + this.groupBoxVariable.TabIndex = 13; + this.groupBoxVariable.TabStop = false; + this.groupBoxVariable.Text = "when this variable =="; + // + // groupBoxValue + // + this.groupBoxValue.Controls.Add(this.textBoxVariableValue); + this.groupBoxValue.Location = new System.Drawing.Point(271, 420); + this.groupBoxValue.Name = "groupBoxValue"; + this.groupBoxValue.Size = new System.Drawing.Size(129, 48); + this.groupBoxValue.TabIndex = 13; + this.groupBoxValue.TabStop = false; + this.groupBoxValue.Text = "this value"; + // + // textBoxVariableValue + // + this.textBoxVariableValue.Location = new System.Drawing.Point(6, 19); + this.textBoxVariableValue.Name = "textBoxVariableValue"; + this.textBoxVariableValue.Size = new System.Drawing.Size(117, 20); + this.textBoxVariableValue.TabIndex = 18; + this.textBoxVariableValue.TextChanged += new System.EventHandler(this.textBoxVariableValue_TextChanged); + // + // checkBoxPadding + // + this.checkBoxPadding.AutoSize = true; + this.checkBoxPadding.Location = new System.Drawing.Point(186, 23); + this.checkBoxPadding.Name = "checkBoxPadding"; + this.checkBoxPadding.Size = new System.Drawing.Size(141, 17); + this.checkBoxPadding.TabIndex = 7; + this.checkBoxPadding.Text = "Word-alignment padding"; + this.checkBoxPadding.UseVisualStyleBackColor = true; + // + // buttonAdd + // + this.buttonAdd.Location = new System.Drawing.Point(6, 19); + this.buttonAdd.Name = "buttonAdd"; + this.buttonAdd.Size = new System.Drawing.Size(75, 23); + this.buttonAdd.TabIndex = 19; + this.buttonAdd.Text = "Add"; + this.buttonAdd.UseVisualStyleBackColor = true; + this.buttonAdd.Click += new System.EventHandler(this.buttonAdd_Click); + // + // buttonRemove + // + this.buttonRemove.Location = new System.Drawing.Point(87, 19); + this.buttonRemove.Name = "buttonRemove"; + this.buttonRemove.Size = new System.Drawing.Size(75, 23); + this.buttonRemove.TabIndex = 20; + this.buttonRemove.Text = "Remove"; + this.buttonRemove.UseVisualStyleBackColor = true; + this.buttonRemove.Click += new System.EventHandler(this.buttonRemove_Click); + // + // radioButtonDecimal + // + this.radioButtonDecimal.AutoSize = true; + this.radioButtonDecimal.Location = new System.Drawing.Point(109, 19); + this.radioButtonDecimal.Name = "radioButtonDecimal"; + this.radioButtonDecimal.Size = new System.Drawing.Size(63, 17); + this.radioButtonDecimal.TabIndex = 10; + this.radioButtonDecimal.Text = "Decimal"; + this.radioButtonDecimal.UseVisualStyleBackColor = true; + this.radioButtonDecimal.CheckedChanged += new System.EventHandler(this.radioButtonDecimal_CheckedChanged); + // + // radioButtonHex + // + this.radioButtonHex.AutoSize = true; + this.radioButtonHex.Location = new System.Drawing.Point(59, 19); + this.radioButtonHex.Name = "radioButtonHex"; + this.radioButtonHex.Size = new System.Drawing.Size(44, 17); + this.radioButtonHex.TabIndex = 9; + this.radioButtonHex.Text = "Hex"; + this.radioButtonHex.UseVisualStyleBackColor = true; + this.radioButtonHex.CheckedChanged += new System.EventHandler(this.radioButtonHex_CheckedChanged); + // + // radioButtonAuto + // + this.radioButtonAuto.AutoSize = true; + this.radioButtonAuto.Checked = true; + this.radioButtonAuto.Location = new System.Drawing.Point(6, 19); + this.radioButtonAuto.Name = "radioButtonAuto"; + this.radioButtonAuto.Size = new System.Drawing.Size(47, 17); + this.radioButtonAuto.TabIndex = 8; + this.radioButtonAuto.TabStop = true; + this.radioButtonAuto.Text = "Auto"; + this.radioButtonAuto.UseVisualStyleBackColor = true; + this.radioButtonAuto.CheckedChanged += new System.EventHandler(this.radioButtonAuto_CheckedChanged); + // + // selectScriptFileComboBox + // + this.selectScriptFileComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.selectScriptFileComboBox.FormattingEnabled = true; + this.selectScriptFileComboBox.Location = new System.Drawing.Point(6, 19); + this.selectScriptFileComboBox.Name = "selectScriptFileComboBox"; + this.selectScriptFileComboBox.Size = new System.Drawing.Size(152, 21); + this.selectScriptFileComboBox.TabIndex = 1; + this.selectScriptFileComboBox.SelectedIndexChanged += new System.EventHandler(this.selectScriptFileComboBox_SelectedIndexChanged); + // + // listBoxTriggers + // + this.listBoxTriggers.FormattingEnabled = true; + this.listBoxTriggers.Location = new System.Drawing.Point(3, 226); + this.listBoxTriggers.Name = "listBoxTriggers"; + this.listBoxTriggers.Size = new System.Drawing.Size(397, 134); + this.listBoxTriggers.TabIndex = 11; + this.listBoxTriggers.SelectedValueChanged += new System.EventHandler(this.listBoxTriggers_SelectedValueChanged); + // + // buttonOpenHeaderScript + // + this.buttonOpenHeaderScript.Location = new System.Drawing.Point(6, 19); + this.buttonOpenHeaderScript.Name = "buttonOpenHeaderScript"; + this.buttonOpenHeaderScript.Size = new System.Drawing.Size(88, 23); + this.buttonOpenHeaderScript.TabIndex = 2; + this.buttonOpenHeaderScript.Text = "Header Script"; + this.buttonOpenHeaderScript.UseVisualStyleBackColor = true; + this.buttonOpenHeaderScript.Click += new System.EventHandler(this.buttonOpenHeaderScript_Click); + // + // buttonOpenSelectedScript + // + this.buttonOpenSelectedScript.Location = new System.Drawing.Point(100, 19); + this.buttonOpenSelectedScript.Name = "buttonOpenSelectedScript"; + this.buttonOpenSelectedScript.Size = new System.Drawing.Size(94, 23); + this.buttonOpenSelectedScript.TabIndex = 3; + this.buttonOpenSelectedScript.Text = "Selected Script"; + this.buttonOpenSelectedScript.UseVisualStyleBackColor = true; + this.buttonOpenSelectedScript.Click += new System.EventHandler(this.buttonOpenSelectedScript_Click); + // + // groupBox3 + // + this.groupBox3.Controls.Add(this.buttonLocate); + this.groupBox3.Controls.Add(this.buttonOpenSelectedScript); + this.groupBox3.Controls.Add(this.buttonOpenHeaderScript); + this.groupBox3.Location = new System.Drawing.Point(3, 61); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Size = new System.Drawing.Size(263, 52); + this.groupBox3.TabIndex = 18; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "Open"; + // + // buttonLocate + // + this.buttonLocate.Location = new System.Drawing.Point(200, 19); + this.buttonLocate.Name = "buttonLocate"; + this.buttonLocate.Size = new System.Drawing.Size(56, 23); + this.buttonLocate.TabIndex = 3; + this.buttonLocate.Text = "Locate"; + this.buttonLocate.UseVisualStyleBackColor = true; + this.buttonLocate.Click += new System.EventHandler(this.buttonLocate_Click); + // + // groupBox4 + // + this.groupBox4.Controls.Add(this.buttonImport); + this.groupBox4.Controls.Add(this.buttonSave); + this.groupBox4.Controls.Add(this.buttonExport); + this.groupBox4.Controls.Add(this.checkBoxPadding); + this.groupBox4.Location = new System.Drawing.Point(3, 119); + this.groupBox4.Name = "groupBox4"; + this.groupBox4.Size = new System.Drawing.Size(329, 53); + this.groupBox4.TabIndex = 20; + this.groupBox4.TabStop = false; + this.groupBox4.Text = "File"; + // + // buttonImport + // + this.buttonImport.Location = new System.Drawing.Point(6, 19); + this.buttonImport.Name = "buttonImport"; + this.buttonImport.Size = new System.Drawing.Size(58, 23); + this.buttonImport.TabIndex = 4; + this.buttonImport.Text = "Import"; + this.buttonImport.UseVisualStyleBackColor = true; + this.buttonImport.Click += new System.EventHandler(this.buttonImport_Click); + // + // groupBox5 + // + this.groupBox5.Controls.Add(this.buttonRemove); + this.groupBox5.Controls.Add(this.buttonAdd); + this.groupBox5.Location = new System.Drawing.Point(231, 474); + this.groupBox5.Name = "groupBox5"; + this.groupBox5.Size = new System.Drawing.Size(169, 52); + this.groupBox5.TabIndex = 21; + this.groupBox5.TabStop = false; + this.groupBox5.Text = "Trigger"; + // + // groupBox6 + // + this.groupBox6.Controls.Add(this.radioButtonAuto); + this.groupBox6.Controls.Add(this.radioButtonDecimal); + this.groupBox6.Controls.Add(this.radioButtonHex); + this.groupBox6.Location = new System.Drawing.Point(3, 178); + this.groupBox6.Name = "groupBox6"; + this.groupBox6.Size = new System.Drawing.Size(178, 42); + this.groupBox6.TabIndex = 22; + this.groupBox6.TabStop = false; + this.groupBox6.Text = "Number Format"; + // + // groupBox7 + // + this.groupBox7.Controls.Add(this.selectScriptFileComboBox); + this.groupBox7.Location = new System.Drawing.Point(3, 3); + this.groupBox7.Name = "groupBox7"; + this.groupBox7.Size = new System.Drawing.Size(164, 52); + this.groupBox7.TabIndex = 23; + this.groupBox7.TabStop = false; + this.groupBox7.Text = "Script File"; + // + // LevelScriptEditor + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.SystemColors.Control; + this.Controls.Add(this.groupBox7); + this.Controls.Add(this.groupBox6); + this.Controls.Add(this.groupBox5); + this.Controls.Add(this.groupBox4); + this.Controls.Add(this.groupBox3); + this.Controls.Add(this.groupBoxValue); + this.Controls.Add(this.groupBoxVariable); + this.Controls.Add(this.groupBox2); + this.Controls.Add(this.groupBox1); + this.Controls.Add(this.listBoxTriggers); + this.Location = new System.Drawing.Point(15, 15); + this.Name = "LevelScriptEditor"; + this.Size = new System.Drawing.Size(408, 622); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); + this.groupBox2.ResumeLayout(false); + this.groupBox2.PerformLayout(); + this.groupBoxVariable.ResumeLayout(false); + this.groupBoxVariable.PerformLayout(); + this.groupBoxValue.ResumeLayout(false); + this.groupBoxValue.PerformLayout(); + this.groupBox3.ResumeLayout(false); + this.groupBox4.ResumeLayout(false); + this.groupBox4.PerformLayout(); + this.groupBox5.ResumeLayout(false); + this.groupBox6.ResumeLayout(false); + this.groupBox6.PerformLayout(); + this.groupBox7.ResumeLayout(false); + this.ResumeLayout(false); + + } + + private System.Windows.Forms.Button buttonImport; + private System.Windows.Forms.GroupBox groupBox4; + private System.Windows.Forms.GroupBox groupBox5; + + private System.Windows.Forms.Button buttonOpenSelectedScript; + private System.Windows.Forms.GroupBox groupBox3; + + public System.Windows.Forms.ComboBox selectScriptFileComboBox; + + #endregion + private System.Windows.Forms.Button buttonSave; + private DSPRE.ListBox2 listBoxTriggers; + private System.Windows.Forms.Button buttonExport; + private System.Windows.Forms.RadioButton radioButtonVariableValue; + private System.Windows.Forms.RadioButton radioButtonMapChange; + private System.Windows.Forms.RadioButton radioButtonScreenReset; + private System.Windows.Forms.RadioButton radioButtonLoadGame; + private System.Windows.Forms.TextBox textBoxScriptID; + private System.Windows.Forms.TextBox textBoxVariableName; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.GroupBox groupBox2; + private System.Windows.Forms.GroupBox groupBoxVariable; + private System.Windows.Forms.GroupBox groupBoxValue; + private System.Windows.Forms.TextBox textBoxVariableValue; + private System.Windows.Forms.CheckBox checkBoxPadding; + private System.Windows.Forms.Button buttonAdd; + private System.Windows.Forms.Button buttonRemove; + private System.Windows.Forms.RadioButton radioButtonDecimal; + private System.Windows.Forms.RadioButton radioButtonHex; + private System.Windows.Forms.RadioButton radioButtonAuto; + private System.Windows.Forms.Button buttonOpenHeaderScript; + private System.Windows.Forms.GroupBox groupBox6; + private System.Windows.Forms.GroupBox groupBox7; + private System.Windows.Forms.Button buttonLocate; + } +} + diff --git a/DS_Map/Editors/LevelScriptEditor.cs b/DS_Map/Editors/LevelScriptEditor.cs new file mode 100644 index 0000000..0c8c424 --- /dev/null +++ b/DS_Map/Editors/LevelScriptEditor.cs @@ -0,0 +1,387 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Windows.Forms; +using DSPRE.ROMFiles; + +namespace DSPRE.Editors { + public partial class LevelScriptEditor : UserControl { + public bool levelScriptEditorIsReady { get; set; } = false; + LevelScriptFile _levelScriptFile; + MainProgram _parent; + + public LevelScriptEditor() { + InitializeComponent(); + + } + + public void SetUpLevelScriptEditor(MainProgram parent, bool force = false) { + if (levelScriptEditorIsReady && !force) return; + levelScriptEditorIsReady = true; + this._parent = parent; + DSUtils.TryUnpackNarcs(new List { RomInfo.DirNames.scripts }); //12 = scripts Narc Dir + populate_selectScriptFileComboBox(); + } + + public void OpenLevelScriptEditor(MainProgram parent, int levelScriptID) { + + SetUpLevelScriptEditor(parent); + + selectScriptFileComboBox.SelectedIndex = levelScriptID; + EditorPanels.mainTabControl.SelectedTab = EditorPanels.levelScriptEditorTabPage; + } + + private void populate_selectScriptFileComboBox(int selectedIndex = 0) { + selectScriptFileComboBox.Items.Clear(); + int scriptCount = Filesystem.GetScriptCount(); + for (int i = 0; i < scriptCount; i++) { + // ScriptFile currentScriptFile = new ScriptFile(i, true, true); + // selectScriptFileComboBox.Items.Add(currentScriptFile); + selectScriptFileComboBox.Items.Add($"Script File {i}"); + } + + selectScriptFileComboBox.SelectedIndex = selectedIndex; + } + + void disableButtons() { + listBoxTriggers.DataSource = null; + + textBoxScriptID.Clear(); + textBoxVariableName.Clear(); + textBoxVariableValue.Clear(); + + radioButtonVariableValue.Checked = false; + radioButtonMapChange.Checked = false; + radioButtonScreenReset.Checked = false; + radioButtonLoadGame.Checked = false; + + textBoxScriptID.Enabled = false; + textBoxVariableName.Enabled = false; + textBoxVariableValue.Enabled = false; + + radioButtonVariableValue.Enabled = false; + radioButtonMapChange.Enabled = false; + radioButtonScreenReset.Enabled = false; + radioButtonLoadGame.Enabled = false; + + radioButtonAuto.Enabled = false; + radioButtonHex.Enabled = false; + radioButtonDecimal.Enabled = false; + + buttonImport.Enabled = false; + buttonSave.Enabled = false; + buttonExport.Enabled = false; + checkBoxPadding.Enabled = false; + + buttonAdd.Enabled = false; + buttonRemove.Enabled = false; + } + + void enableButtons() { + // textBoxScriptID.Enabled = true; + // textBoxVariableName.Enabled = true; + // textBoxVariableValue.Enabled = true; + + radioButtonVariableValue.Enabled = true; + radioButtonMapChange.Enabled = true; + radioButtonScreenReset.Enabled = true; + radioButtonLoadGame.Enabled = true; + + radioButtonAuto.Enabled = true; + radioButtonHex.Enabled = true; + radioButtonDecimal.Enabled = true; + + buttonImport.Enabled = true; + buttonSave.Enabled = true; + buttonExport.Enabled = true; + checkBoxPadding.Enabled = true; + } + + void buttonAdd_logic() { + buttonAdd.Enabled = false; + + if (radioButtonVariableValue.Checked) { + if (!string.IsNullOrEmpty(textBoxScriptID.Text) && !string.IsNullOrEmpty(textBoxVariableName.Text) && !string.IsNullOrEmpty(textBoxVariableValue.Text)) { + buttonAdd.Enabled = true; + } + } + else if (radioButtonMapChange.Checked || radioButtonScreenReset.Checked || radioButtonLoadGame.Checked) { + if (!string.IsNullOrEmpty(textBoxScriptID.Text)) { + buttonAdd.Enabled = true; + } + } + } + + private void selectScriptFileComboBox_SelectedIndexChanged(object sender, EventArgs e) { + if (selectScriptFileComboBox.SelectedIndex == -1) { + buttonOpenSelectedScript.Enabled = false; + buttonOpenHeaderScript.Enabled = false; + buttonLocate.Enabled = false; + } + else { + buttonOpenSelectedScript.Enabled = true; + buttonOpenHeaderScript.Enabled = true; + buttonLocate.Enabled = true; + } + + disableButtons(); + + try { + _levelScriptFile = new LevelScriptFile(selectScriptFileComboBox.SelectedIndex); + + listBoxTriggers.DataSource = _levelScriptFile.bufferSet; + if (listBoxTriggers.Items.Count > 0) listBoxTriggers.SelectedIndex = 0; + + enableButtons(); + } + catch (InvalidDataException ex) { //not a level script + disableButtons(); + Console.WriteLine(ex.Message); + } + } + + void listBoxTriggers_SelectedValueChanged(object sender, EventArgs e) { + if (listBoxTriggers.SelectedItem == null) { + buttonRemove.Enabled = false; + return; + } + + if (listBoxTriggers.SelectedItem is MapScreenLoadTrigger mapScreenLoadTrigger) { + if (mapScreenLoadTrigger.triggerType == LevelScriptTrigger.LOADGAME) { + radioButtonLoadGame.Checked = true; + } + else if (mapScreenLoadTrigger.triggerType == LevelScriptTrigger.MAPCHANGE) { + radioButtonMapChange.Checked = true; + } + else if (mapScreenLoadTrigger.triggerType == LevelScriptTrigger.SCREENRESET) { + radioButtonScreenReset.Checked = true; + } + } + else if (listBoxTriggers.SelectedItem is VariableValueTrigger variableValueTrigger) { + if (variableValueTrigger.triggerType == LevelScriptTrigger.VARIABLEVALUE) { + radioButtonVariableValue.Checked = true; + } + } + + handleAutoFormat(); + handleHexFormat(); + handleDecimalFormat(); + + textBoxScriptID.Enabled = true; + buttonRemove.Enabled = true; + } + + private void buttonAdd_Click(object sender, EventArgs e) { + // try { + if (_levelScriptFile == null) { + _levelScriptFile = new LevelScriptFile(); + } + + int convertBase = 10; //decimal + if (radioButtonHex.Checked) { + convertBase = 16; //hex + } + + if (radioButtonVariableValue.Checked) { + int scriptID = Convert.ToInt16(textBoxScriptID.Text, convertBase); + int variableName = Convert.ToInt16(textBoxVariableName.Text, convertBase); + int variableValue = Convert.ToInt16(textBoxVariableValue.Text, convertBase); + VariableValueTrigger variableValueTrigger = new VariableValueTrigger(scriptID, variableName, variableValue); + _levelScriptFile.bufferSet.Add(variableValueTrigger); + } + else { + int scriptID = Convert.ToInt16(textBoxScriptID.Text, convertBase); + if (radioButtonMapChange.Checked) { + MapScreenLoadTrigger mapScreenLoadTrigger = new MapScreenLoadTrigger(LevelScriptTrigger.MAPCHANGE, scriptID); + _levelScriptFile.bufferSet.Add(mapScreenLoadTrigger); + } + else if (radioButtonScreenReset.Checked) { + MapScreenLoadTrigger mapScreenLoadTrigger = new MapScreenLoadTrigger(LevelScriptTrigger.SCREENRESET, scriptID); + _levelScriptFile.bufferSet.Add(mapScreenLoadTrigger); + } + else if (radioButtonLoadGame.Checked) { + MapScreenLoadTrigger mapScreenLoadTrigger = new MapScreenLoadTrigger(LevelScriptTrigger.LOADGAME, scriptID); + _levelScriptFile.bufferSet.Add(mapScreenLoadTrigger); + } + } + + textBoxScriptID.Clear(); + textBoxVariableName.Clear(); + textBoxVariableValue.Clear(); + // } + // catch (Exception exception) { + // MessageBox.Show(exception.Message); + // } + } + + private void buttonRemove_Click(object sender, EventArgs e) { + _levelScriptFile.bufferSet.RemoveAt(listBoxTriggers.SelectedIndex); + } + + private void buttonOpenHeaderScript_Click(object sender, EventArgs e) { + EditorPanels.scriptEditor.OpenScriptEditor(this._parent, (int)EditorPanels.MainProgram.scriptFileUpDown.Value); + } + + private void buttonOpenSelectedScript_Click(object sender, EventArgs e) { + EditorPanels.scriptEditor.OpenScriptEditor(this._parent, (int)EditorPanels.levelScriptEditor.selectScriptFileComboBox.SelectedIndex); + } + + void buttonLocate_Click(object sender, EventArgs e) { + if (_levelScriptFile == null) return; + string path = Filesystem.GetScriptPath(_levelScriptFile.ID); + Helpers.ExplorerSelect(path); + } + + void buttonImport_Click(object sender, EventArgs e) { + OpenFileDialog ofd = new OpenFileDialog(); + if (ofd.ShowDialog() == DialogResult.OK) { + try { + LevelScriptFile importedFile = new LevelScriptFile(); + importedFile.parse_file(ofd.FileName); + _levelScriptFile.bufferSet.Clear(); + foreach (LevelScriptTrigger trigger in importedFile.bufferSet) { + _levelScriptFile.bufferSet.Add(trigger); + } + } + catch (InvalidDataException ex) { + MessageBox.Show(ex.Message, ex.GetType().ToString()); + } + } + } + + private void buttonSave_Click(object sender, EventArgs e) { + string path = Filesystem.GetScriptPath(_levelScriptFile.ID); + saveFile(path); + } + + private void buttonExport_Click(object sender, EventArgs e) { + SaveFileDialog sfd = new SaveFileDialog(); + try { + sfd.InitialDirectory = Path.GetDirectoryName(sfd.FileName); + sfd.FileName = Path.GetFileName(sfd.FileName); + } + catch (Exception ex) { + sfd.InitialDirectory = Path.GetDirectoryName(Environment.SpecialFolder.UserProfile.ToString()); + sfd.FileName = Path.GetFileName(sfd.FileName); + } + + if (sfd.ShowDialog() == DialogResult.OK) { + saveFile(sfd.FileName); + } + } + + void saveFile(string path) { + try { + long bytes_written = _levelScriptFile.write_file(path); + if (bytes_written <= 4) { + MessageBox.Show("Empty level script file was correctly saved.", "Success!"); + } + else { + MessageBox.Show("File was correctly saved.", "Success!"); + } + } + catch (Exception ex) { + MessageBox.Show(ex.Message, ex.GetType().ToString()); + } + } + + private void handleAutoFormat() { + if (!radioButtonAuto.Checked) return; + + textBoxScriptID.Clear(); + textBoxVariableName.Clear(); + textBoxVariableValue.Clear(); + + if (listBoxTriggers.SelectedItem is MapScreenLoadTrigger mapScreenLoadTrigger) { + textBoxScriptID.Text = mapScreenLoadTrigger.scriptTriggered.ToString(); + } + else if (listBoxTriggers.SelectedItem is VariableValueTrigger variableValueTrigger) { + textBoxScriptID.Text = variableValueTrigger.scriptTriggered.ToString(); + textBoxVariableName.Text = "" + variableValueTrigger.variableToWatch.ToString("D"); + textBoxVariableValue.Text = "" + variableValueTrigger.expectedValue.ToString("D"); + } + } + + private void handleHexFormat() { + if (!radioButtonHex.Checked) return; + + textBoxScriptID.Clear(); + textBoxVariableName.Clear(); + textBoxVariableValue.Clear(); + + if (listBoxTriggers.SelectedItem is MapScreenLoadTrigger mapScreenLoadTrigger) { + textBoxScriptID.Text = mapScreenLoadTrigger.scriptTriggered.ToString(); + } + else if (listBoxTriggers.SelectedItem is VariableValueTrigger variableValueTrigger) { + textBoxScriptID.Text = variableValueTrigger.scriptTriggered.ToString(); + textBoxVariableName.Text = "0x" + variableValueTrigger.variableToWatch.ToString("X"); + textBoxVariableValue.Text = "0x" + variableValueTrigger.expectedValue.ToString("X"); + } + } + + private void handleDecimalFormat() { + if (!radioButtonDecimal.Checked) return; + + textBoxScriptID.Clear(); + textBoxVariableName.Clear(); + textBoxVariableValue.Clear(); + + if (listBoxTriggers.SelectedItem is MapScreenLoadTrigger mapScreenLoadTrigger) { + textBoxScriptID.Text = mapScreenLoadTrigger.scriptTriggered.ToString(); + } + else if (listBoxTriggers.SelectedItem is VariableValueTrigger variableValueTrigger) { + textBoxScriptID.Text = variableValueTrigger.scriptTriggered.ToString(); + textBoxVariableName.Text = "" + variableValueTrigger.variableToWatch.ToString("D"); + textBoxVariableValue.Text = "" + variableValueTrigger.expectedValue.ToString("D"); + } + } + + private void radioButtonAuto_CheckedChanged(object sender, EventArgs e) { + handleAutoFormat(); + } + + private void radioButtonHex_CheckedChanged(object sender, EventArgs e) { + handleHexFormat(); + } + + private void radioButtonDecimal_CheckedChanged(object sender, EventArgs e) { + handleDecimalFormat(); + } + + private void radioButtonVariableValue_CheckedChanged(object sender, EventArgs e) { + textBoxVariableName.Enabled = true; + textBoxVariableValue.Enabled = true; + buttonAdd_logic(); + } + + private void radioButtonMapChange_CheckedChanged(object sender, EventArgs e) { + textBoxVariableName.Enabled = false; + textBoxVariableValue.Enabled = false; + buttonAdd_logic(); + } + + private void radioButtonScreenReset_CheckedChanged(object sender, EventArgs e) { + textBoxVariableName.Enabled = false; + textBoxVariableValue.Enabled = false; + buttonAdd_logic(); + } + + private void radioButtonLoadGame_CheckedChanged(object sender, EventArgs e) { + textBoxVariableName.Enabled = false; + textBoxVariableValue.Enabled = false; + buttonAdd_logic(); + } + + void textBoxScriptID_TextChanged(object sender, EventArgs e) { + buttonAdd_logic(); + } + + void textBoxVariableName_TextChanged(object sender, EventArgs e) { + buttonAdd_logic(); + } + + void textBoxVariableValue_TextChanged(object sender, EventArgs e) { + buttonAdd_logic(); + } + } +} diff --git a/DS_Map/Editors/LevelScriptEditor.resx b/DS_Map/Editors/LevelScriptEditor.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/DS_Map/Editors/LevelScriptEditor.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/ScriptEditor.Designer.cs b/DS_Map/Editors/ScriptEditor.Designer.cs new file mode 100644 index 0000000..9d00b3a --- /dev/null +++ b/DS_Map/Editors/ScriptEditor.Designer.cs @@ -0,0 +1,917 @@ + +namespace DSPRE.Editors +{ + partial class ScriptEditor + { + /// + /// 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 Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() { + this.selectScriptFileComboBox = new System.Windows.Forms.ComboBox(); + this.label5 = new System.Windows.Forms.Label(); + this.scriptEditorTabControl = new System.Windows.Forms.TabControl(); + this.scriptsTabPage = new System.Windows.Forms.TabPage(); + this.PanelSearchScripts = new System.Windows.Forms.Panel(); + this.BtnNextFindScript = new System.Windows.Forms.Button(); + this.BtnPrevFindScript = new System.Windows.Forms.Button(); + this.BtnCloseFindScript = new System.Windows.Forms.Button(); + this.panelFindScriptTextBox = new System.Windows.Forms.TextBox(); + this.scintillaScriptsPanel = new System.Windows.Forms.Panel(); + this.functionsTabPage = new System.Windows.Forms.TabPage(); + this.PanelSearchFunctions = new System.Windows.Forms.Panel(); + this.BtnNextFindFunc = new System.Windows.Forms.Button(); + this.BtnPrevFindFunc = new System.Windows.Forms.Button(); + this.BtnCloseFindFunc = new System.Windows.Forms.Button(); + this.panelFindFunctionTextBox = new System.Windows.Forms.TextBox(); + this.scintillaFunctionsPanel = new System.Windows.Forms.Panel(); + this.actionsTabPage = new System.Windows.Forms.TabPage(); + this.PanelSearchActions = new System.Windows.Forms.Panel(); + this.BtnNextFindActions = new System.Windows.Forms.Button(); + this.BtnPrevFindActions = new System.Windows.Forms.Button(); + this.BtnCloseFindActions = new System.Windows.Forms.Button(); + this.panelFindActionTextBox = new System.Windows.Forms.TextBox(); + this.scintillaActionsPanel = new System.Windows.Forms.Panel(); + this.addScriptFileButton = new System.Windows.Forms.Button(); + this.removeScriptFileButton = new System.Windows.Forms.Button(); + this.saveScriptFileButton = new System.Windows.Forms.Button(); + this.exportScriptFileButton = new System.Windows.Forms.Button(); + this.importScriptFileButton = new System.Windows.Forms.Button(); + this.groupBox8 = new System.Windows.Forms.GroupBox(); + this.searchInScriptsButton = new System.Windows.Forms.Button(); + this.searchOnlyCurrentScriptCheckBox = new System.Windows.Forms.CheckBox(); + this.scrollToBlockStartcheckBox = new System.Windows.Forms.CheckBox(); + this.scriptSearchCaseSensitiveCheckBox = new System.Windows.Forms.CheckBox(); + this.searchInScriptsTextBox = new System.Windows.Forms.TextBox(); + this.label31 = new System.Windows.Forms.Label(); + this.searchProgressBar = new System.Windows.Forms.ProgressBar(); + this.label30 = new System.Windows.Forms.Label(); + this.label29 = new System.Windows.Forms.Label(); + this.searchInScriptsResultListBox = new System.Windows.Forms.ListBox(); + this.groupBox24 = new System.Windows.Forms.GroupBox(); + this.ScriptNavigatorTabControl = new System.Windows.Forms.TabControl(); + this.ScriptsNavTab = new System.Windows.Forms.TabPage(); + this.scriptsNavListbox = new System.Windows.Forms.ListBox(); + this.FunctionsNavTab = new System.Windows.Forms.TabPage(); + this.functionsNavListbox = new System.Windows.Forms.ListBox(); + this.ActionsNavTab = new System.Windows.Forms.TabPage(); + this.actionsNavListbox = new System.Windows.Forms.ListBox(); + this.openFindScriptEditorButton = new System.Windows.Forms.Button(); + this.expandScriptTextButton = new System.Windows.Forms.Button(); + this.compressScriptTextButton = new System.Windows.Forms.Button(); + this.scriptEditorWordWrapCheckbox = new System.Windows.Forms.CheckBox(); + this.scriptEditorWhitespacesCheckbox = new System.Windows.Forms.CheckBox(); + this.groupBox26 = new System.Windows.Forms.GroupBox(); + this.scriptEditorNumberFormatNoPreference = new System.Windows.Forms.RadioButton(); + this.scriptEditorNumberFormatDecimal = new System.Windows.Forms.RadioButton(); + this.scriptEditorNumberFormatHex = new System.Windows.Forms.RadioButton(); + this.viewLevelScriptButton = new System.Windows.Forms.Button(); + this.locateCurrentScriptFile = new System.Windows.Forms.Button(); + this.scriptEditorTabControl.SuspendLayout(); + this.scriptsTabPage.SuspendLayout(); + this.PanelSearchScripts.SuspendLayout(); + this.functionsTabPage.SuspendLayout(); + this.PanelSearchFunctions.SuspendLayout(); + this.actionsTabPage.SuspendLayout(); + this.PanelSearchActions.SuspendLayout(); + this.groupBox8.SuspendLayout(); + this.groupBox24.SuspendLayout(); + this.ScriptNavigatorTabControl.SuspendLayout(); + this.ScriptsNavTab.SuspendLayout(); + this.FunctionsNavTab.SuspendLayout(); + this.ActionsNavTab.SuspendLayout(); + this.groupBox26.SuspendLayout(); + this.SuspendLayout(); + // + // selectScriptFileComboBox + // + this.selectScriptFileComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.selectScriptFileComboBox.FormattingEnabled = true; + this.selectScriptFileComboBox.Location = new System.Drawing.Point(7, 24); + this.selectScriptFileComboBox.Name = "selectScriptFileComboBox"; + this.selectScriptFileComboBox.Size = new System.Drawing.Size(152, 21); + this.selectScriptFileComboBox.TabIndex = 0; + this.selectScriptFileComboBox.SelectedIndexChanged += new System.EventHandler(this.selectScriptFileComboBox_SelectedIndexChanged); + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(5, 8); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(53, 13); + this.label5.TabIndex = 1; + this.label5.Text = "Script File"; + // + // scriptEditorTabControl + // + this.scriptEditorTabControl.Controls.Add(this.scriptsTabPage); + this.scriptEditorTabControl.Controls.Add(this.functionsTabPage); + this.scriptEditorTabControl.Controls.Add(this.actionsTabPage); + this.scriptEditorTabControl.Location = new System.Drawing.Point(481, 22); + this.scriptEditorTabControl.Name = "scriptEditorTabControl"; + this.scriptEditorTabControl.SelectedIndex = 0; + this.scriptEditorTabControl.Size = new System.Drawing.Size(692, 591); + this.scriptEditorTabControl.TabIndex = 18; + this.scriptEditorTabControl.SelectedIndexChanged += new System.EventHandler(this.scriptEditorTabControl_TabIndexChanged); + // + // scriptsTabPage + // + this.scriptsTabPage.Controls.Add(this.PanelSearchScripts); + this.scriptsTabPage.Controls.Add(this.scintillaScriptsPanel); + this.scriptsTabPage.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.scriptsTabPage.Location = new System.Drawing.Point(4, 22); + this.scriptsTabPage.Name = "scriptsTabPage"; + this.scriptsTabPage.Padding = new System.Windows.Forms.Padding(3); + this.scriptsTabPage.Size = new System.Drawing.Size(684, 565); + this.scriptsTabPage.TabIndex = 0; + this.scriptsTabPage.Text = "Scripts"; + this.scriptsTabPage.UseVisualStyleBackColor = true; + // + // PanelSearchScripts + // + this.PanelSearchScripts.BackColor = System.Drawing.Color.White; + this.PanelSearchScripts.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.PanelSearchScripts.Controls.Add(this.BtnNextFindScript); + this.PanelSearchScripts.Controls.Add(this.BtnPrevFindScript); + this.PanelSearchScripts.Controls.Add(this.BtnCloseFindScript); + this.PanelSearchScripts.Controls.Add(this.panelFindScriptTextBox); + this.PanelSearchScripts.Location = new System.Drawing.Point(386, 3); + this.PanelSearchScripts.Name = "PanelSearchScripts"; + this.PanelSearchScripts.Size = new System.Drawing.Size(292, 40); + this.PanelSearchScripts.TabIndex = 14; + this.PanelSearchScripts.Visible = false; + // + // BtnNextFindScript + // + this.BtnNextFindScript.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.BtnNextFindScript.ForeColor = System.Drawing.Color.White; + this.BtnNextFindScript.Image = global::DSPRE.Properties.Resources.arrowdown; + this.BtnNextFindScript.Location = new System.Drawing.Point(233, 4); + this.BtnNextFindScript.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.BtnNextFindScript.Name = "BtnNextFindScript"; + this.BtnNextFindScript.Size = new System.Drawing.Size(25, 30); + this.BtnNextFindScript.TabIndex = 32; + this.BtnNextFindScript.Tag = "Find next (Enter)"; + this.BtnNextFindScript.UseVisualStyleBackColor = true; + this.BtnNextFindScript.Click += new System.EventHandler(this.BtnNextFindScript_Click); + // + // BtnPrevFindScript + // + this.BtnPrevFindScript.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.BtnPrevFindScript.ForeColor = System.Drawing.Color.White; + this.BtnPrevFindScript.Image = global::DSPRE.Properties.Resources.arrowup; + this.BtnPrevFindScript.Location = new System.Drawing.Point(205, 4); + this.BtnPrevFindScript.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.BtnPrevFindScript.Name = "BtnPrevFindScript"; + this.BtnPrevFindScript.Size = new System.Drawing.Size(25, 30); + this.BtnPrevFindScript.TabIndex = 31; + this.BtnPrevFindScript.Tag = "Find previous (Shift+Enter)"; + this.BtnPrevFindScript.UseVisualStyleBackColor = true; + this.BtnPrevFindScript.Click += new System.EventHandler(this.BtnPrevFindScript_Click); + // + // BtnCloseFindScript + // + this.BtnCloseFindScript.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.BtnCloseFindScript.ForeColor = System.Drawing.Color.White; + this.BtnCloseFindScript.Image = global::DSPRE.Properties.Resources.Cross; + this.BtnCloseFindScript.Location = new System.Drawing.Point(261, 4); + this.BtnCloseFindScript.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.BtnCloseFindScript.Name = "BtnCloseFindScript"; + this.BtnCloseFindScript.Size = new System.Drawing.Size(25, 30); + this.BtnCloseFindScript.TabIndex = 33; + this.BtnCloseFindScript.Tag = "Close (Esc)"; + this.BtnCloseFindScript.UseVisualStyleBackColor = true; + this.BtnCloseFindScript.Click += new System.EventHandler(this.BtnCloseFindScript_Click); + // + // panelFindScriptTextBox + // + this.panelFindScriptTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.panelFindScriptTextBox.Font = new System.Drawing.Font("Segoe UI", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.panelFindScriptTextBox.Location = new System.Drawing.Point(10, 6); + this.panelFindScriptTextBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panelFindScriptTextBox.Name = "panelFindScriptTextBox"; + this.panelFindScriptTextBox.Size = new System.Drawing.Size(189, 25); + this.panelFindScriptTextBox.TabIndex = 30; + this.panelFindScriptTextBox.TextChanged += new System.EventHandler(this.panelFindScriptTextBox_TextChanged); + this.panelFindScriptTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.scriptTxtFind_KeyDown); + // + // scintillaScriptsPanel + // + this.scintillaScriptsPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.scintillaScriptsPanel.Location = new System.Drawing.Point(3, 3); + this.scintillaScriptsPanel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.scintillaScriptsPanel.Name = "scintillaScriptsPanel"; + this.scintillaScriptsPanel.Size = new System.Drawing.Size(678, 559); + this.scintillaScriptsPanel.TabIndex = 19; + // + // functionsTabPage + // + this.functionsTabPage.Controls.Add(this.PanelSearchFunctions); + this.functionsTabPage.Controls.Add(this.scintillaFunctionsPanel); + this.functionsTabPage.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.functionsTabPage.Location = new System.Drawing.Point(4, 22); + this.functionsTabPage.Name = "functionsTabPage"; + this.functionsTabPage.Padding = new System.Windows.Forms.Padding(3); + this.functionsTabPage.Size = new System.Drawing.Size(684, 565); + this.functionsTabPage.TabIndex = 1; + this.functionsTabPage.Text = "Functions"; + this.functionsTabPage.UseVisualStyleBackColor = true; + // + // PanelSearchFunctions + // + this.PanelSearchFunctions.BackColor = System.Drawing.Color.White; + this.PanelSearchFunctions.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.PanelSearchFunctions.Controls.Add(this.BtnNextFindFunc); + this.PanelSearchFunctions.Controls.Add(this.BtnPrevFindFunc); + this.PanelSearchFunctions.Controls.Add(this.BtnCloseFindFunc); + this.PanelSearchFunctions.Controls.Add(this.panelFindFunctionTextBox); + this.PanelSearchFunctions.Location = new System.Drawing.Point(386, 3); + this.PanelSearchFunctions.Name = "PanelSearchFunctions"; + this.PanelSearchFunctions.Size = new System.Drawing.Size(292, 40); + this.PanelSearchFunctions.TabIndex = 16; + this.PanelSearchFunctions.Visible = false; + // + // BtnNextFindFunc + // + this.BtnNextFindFunc.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.BtnNextFindFunc.ForeColor = System.Drawing.Color.White; + this.BtnNextFindFunc.Image = global::DSPRE.Properties.Resources.arrowdown; + this.BtnNextFindFunc.Location = new System.Drawing.Point(233, 4); + this.BtnNextFindFunc.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.BtnNextFindFunc.Name = "BtnNextFindFunc"; + this.BtnNextFindFunc.Size = new System.Drawing.Size(25, 30); + this.BtnNextFindFunc.TabIndex = 36; + this.BtnNextFindFunc.Tag = "Find next (Enter)"; + this.BtnNextFindFunc.UseVisualStyleBackColor = true; + this.BtnNextFindFunc.Click += new System.EventHandler(this.BtnNextFindFunc_Click); + // + // BtnPrevFindFunc + // + this.BtnPrevFindFunc.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.BtnPrevFindFunc.ForeColor = System.Drawing.Color.White; + this.BtnPrevFindFunc.Image = global::DSPRE.Properties.Resources.arrowup; + this.BtnPrevFindFunc.Location = new System.Drawing.Point(205, 4); + this.BtnPrevFindFunc.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.BtnPrevFindFunc.Name = "BtnPrevFindFunc"; + this.BtnPrevFindFunc.Size = new System.Drawing.Size(25, 30); + this.BtnPrevFindFunc.TabIndex = 35; + this.BtnPrevFindFunc.Tag = "Find previous (Shift+Enter)"; + this.BtnPrevFindFunc.UseVisualStyleBackColor = true; + this.BtnPrevFindFunc.Click += new System.EventHandler(this.BtnPrevFindFunc_Click); + // + // BtnCloseFindFunc + // + this.BtnCloseFindFunc.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.BtnCloseFindFunc.ForeColor = System.Drawing.Color.White; + this.BtnCloseFindFunc.Image = global::DSPRE.Properties.Resources.Cross; + this.BtnCloseFindFunc.Location = new System.Drawing.Point(261, 4); + this.BtnCloseFindFunc.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.BtnCloseFindFunc.Name = "BtnCloseFindFunc"; + this.BtnCloseFindFunc.Size = new System.Drawing.Size(25, 30); + this.BtnCloseFindFunc.TabIndex = 37; + this.BtnCloseFindFunc.Tag = "Close (Esc)"; + this.BtnCloseFindFunc.UseVisualStyleBackColor = true; + this.BtnCloseFindFunc.Click += new System.EventHandler(this.BtnCloseFindFunc_Click); + // + // panelFindFunctionTextBox + // + this.panelFindFunctionTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.panelFindFunctionTextBox.Font = new System.Drawing.Font("Segoe UI", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.panelFindFunctionTextBox.Location = new System.Drawing.Point(10, 6); + this.panelFindFunctionTextBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panelFindFunctionTextBox.Name = "panelFindFunctionTextBox"; + this.panelFindFunctionTextBox.Size = new System.Drawing.Size(189, 25); + this.panelFindFunctionTextBox.TabIndex = 34; + this.panelFindFunctionTextBox.TextChanged += new System.EventHandler(this.panelFindFunctionTextBox_TextChanged); + this.panelFindFunctionTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.functionTxtFind_KeyDown); + // + // scintillaFunctionsPanel + // + this.scintillaFunctionsPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.scintillaFunctionsPanel.Location = new System.Drawing.Point(3, 3); + this.scintillaFunctionsPanel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.scintillaFunctionsPanel.Name = "scintillaFunctionsPanel"; + this.scintillaFunctionsPanel.Size = new System.Drawing.Size(678, 559); + this.scintillaFunctionsPanel.TabIndex = 20; + // + // actionsTabPage + // + this.actionsTabPage.Controls.Add(this.PanelSearchActions); + this.actionsTabPage.Controls.Add(this.scintillaActionsPanel); + this.actionsTabPage.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.actionsTabPage.Location = new System.Drawing.Point(4, 22); + this.actionsTabPage.Name = "actionsTabPage"; + this.actionsTabPage.Padding = new System.Windows.Forms.Padding(3); + this.actionsTabPage.Size = new System.Drawing.Size(684, 565); + this.actionsTabPage.TabIndex = 2; + this.actionsTabPage.Text = "Actions"; + this.actionsTabPage.UseVisualStyleBackColor = true; + // + // PanelSearchActions + // + this.PanelSearchActions.BackColor = System.Drawing.Color.White; + this.PanelSearchActions.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.PanelSearchActions.Controls.Add(this.BtnNextFindActions); + this.PanelSearchActions.Controls.Add(this.BtnPrevFindActions); + this.PanelSearchActions.Controls.Add(this.BtnCloseFindActions); + this.PanelSearchActions.Controls.Add(this.panelFindActionTextBox); + this.PanelSearchActions.Location = new System.Drawing.Point(386, 3); + this.PanelSearchActions.Name = "PanelSearchActions"; + this.PanelSearchActions.Size = new System.Drawing.Size(292, 40); + this.PanelSearchActions.TabIndex = 16; + this.PanelSearchActions.Visible = false; + // + // BtnNextFindActions + // + this.BtnNextFindActions.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.BtnNextFindActions.ForeColor = System.Drawing.Color.White; + this.BtnNextFindActions.Image = global::DSPRE.Properties.Resources.arrowdown; + this.BtnNextFindActions.Location = new System.Drawing.Point(233, 4); + this.BtnNextFindActions.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.BtnNextFindActions.Name = "BtnNextFindActions"; + this.BtnNextFindActions.Size = new System.Drawing.Size(25, 30); + this.BtnNextFindActions.TabIndex = 40; + this.BtnNextFindActions.Tag = "Find next (Enter)"; + this.BtnNextFindActions.UseVisualStyleBackColor = true; + this.BtnNextFindActions.Click += new System.EventHandler(this.BtnNextFindActions_Click); + // + // BtnPrevFindActions + // + this.BtnPrevFindActions.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.BtnPrevFindActions.ForeColor = System.Drawing.Color.White; + this.BtnPrevFindActions.Image = global::DSPRE.Properties.Resources.arrowup; + this.BtnPrevFindActions.Location = new System.Drawing.Point(205, 4); + this.BtnPrevFindActions.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.BtnPrevFindActions.Name = "BtnPrevFindActions"; + this.BtnPrevFindActions.Size = new System.Drawing.Size(25, 30); + this.BtnPrevFindActions.TabIndex = 39; + this.BtnPrevFindActions.Tag = "Find previous (Shift+Enter)"; + this.BtnPrevFindActions.UseVisualStyleBackColor = true; + this.BtnPrevFindActions.Click += new System.EventHandler(this.BtnPrevFindActions_Click); + // + // BtnCloseFindActions + // + this.BtnCloseFindActions.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.BtnCloseFindActions.ForeColor = System.Drawing.Color.White; + this.BtnCloseFindActions.Image = global::DSPRE.Properties.Resources.Cross; + this.BtnCloseFindActions.Location = new System.Drawing.Point(261, 4); + this.BtnCloseFindActions.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.BtnCloseFindActions.Name = "BtnCloseFindActions"; + this.BtnCloseFindActions.Size = new System.Drawing.Size(25, 30); + this.BtnCloseFindActions.TabIndex = 41; + this.BtnCloseFindActions.Tag = "Close (Esc)"; + this.BtnCloseFindActions.UseVisualStyleBackColor = true; + this.BtnCloseFindActions.Click += new System.EventHandler(this.BtnCloseFindActions_Click); + // + // panelFindActionTextBox + // + this.panelFindActionTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.panelFindActionTextBox.Font = new System.Drawing.Font("Segoe UI", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.panelFindActionTextBox.Location = new System.Drawing.Point(10, 6); + this.panelFindActionTextBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panelFindActionTextBox.Name = "panelFindActionTextBox"; + this.panelFindActionTextBox.Size = new System.Drawing.Size(189, 25); + this.panelFindActionTextBox.TabIndex = 38; + this.panelFindActionTextBox.TextChanged += new System.EventHandler(this.panelFindActionTextBox_TextChanged); + this.panelFindActionTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.actionTxtFind_KeyDown); + // + // scintillaActionsPanel + // + this.scintillaActionsPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.scintillaActionsPanel.Location = new System.Drawing.Point(3, 3); + this.scintillaActionsPanel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.scintillaActionsPanel.Name = "scintillaActionsPanel"; + this.scintillaActionsPanel.Size = new System.Drawing.Size(678, 559); + this.scintillaActionsPanel.TabIndex = 21; + // + // addScriptFileButton + // + this.addScriptFileButton.Image = global::DSPRE.Properties.Resources.addIcon; + this.addScriptFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.addScriptFileButton.Location = new System.Drawing.Point(369, 667); + this.addScriptFileButton.Name = "addScriptFileButton"; + this.addScriptFileButton.Size = new System.Drawing.Size(106, 25); + this.addScriptFileButton.TabIndex = 4; + this.addScriptFileButton.Text = "Add Script File"; + this.addScriptFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.addScriptFileButton.UseVisualStyleBackColor = true; + this.addScriptFileButton.Click += new System.EventHandler(this.addScriptFileButton_Click); + // + // removeScriptFileButton + // + this.removeScriptFileButton.Image = global::DSPRE.Properties.Resources.deleteIcon; + this.removeScriptFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.removeScriptFileButton.Location = new System.Drawing.Point(369, 694); + this.removeScriptFileButton.Name = "removeScriptFileButton"; + this.removeScriptFileButton.Size = new System.Drawing.Size(106, 25); + this.removeScriptFileButton.TabIndex = 5; + this.removeScriptFileButton.Text = "Remove Last"; + this.removeScriptFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.removeScriptFileButton.UseVisualStyleBackColor = true; + this.removeScriptFileButton.Click += new System.EventHandler(this.removeScriptFileButton_Click); + // + // saveScriptFileButton + // + this.saveScriptFileButton.Image = global::DSPRE.Properties.Resources.saveButton; + this.saveScriptFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.saveScriptFileButton.Location = new System.Drawing.Point(6, 50); + this.saveScriptFileButton.Name = "saveScriptFileButton"; + this.saveScriptFileButton.Size = new System.Drawing.Size(154, 23); + this.saveScriptFileButton.TabIndex = 1; + this.saveScriptFileButton.Text = "&Save Current File"; + this.saveScriptFileButton.UseVisualStyleBackColor = true; + this.saveScriptFileButton.Click += new System.EventHandler(this.saveScriptFileButton_Click); + // + // exportScriptFileButton + // + this.exportScriptFileButton.Image = global::DSPRE.Properties.Resources.exportArrow; + this.exportScriptFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.exportScriptFileButton.Location = new System.Drawing.Point(294, 667); + this.exportScriptFileButton.Name = "exportScriptFileButton"; + this.exportScriptFileButton.Size = new System.Drawing.Size(70, 52); + this.exportScriptFileButton.TabIndex = 3; + this.exportScriptFileButton.Text = "&Export \r\nFile"; + this.exportScriptFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.exportScriptFileButton.UseVisualStyleBackColor = true; + this.exportScriptFileButton.Click += new System.EventHandler(this.exportScriptFileButton_Click); + // + // importScriptFileButton + // + this.importScriptFileButton.Image = global::DSPRE.Properties.Resources.importArrow; + this.importScriptFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.importScriptFileButton.Location = new System.Drawing.Point(219, 667); + this.importScriptFileButton.Name = "importScriptFileButton"; + this.importScriptFileButton.Size = new System.Drawing.Size(70, 52); + this.importScriptFileButton.TabIndex = 2; + this.importScriptFileButton.Text = "&Import\r\nFile"; + this.importScriptFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.importScriptFileButton.UseVisualStyleBackColor = true; + this.importScriptFileButton.Click += new System.EventHandler(this.importScriptFileButton_Click); + // + // groupBox8 + // + this.groupBox8.Controls.Add(this.searchInScriptsButton); + this.groupBox8.Controls.Add(this.searchOnlyCurrentScriptCheckBox); + this.groupBox8.Controls.Add(this.scrollToBlockStartcheckBox); + this.groupBox8.Controls.Add(this.scriptSearchCaseSensitiveCheckBox); + this.groupBox8.Controls.Add(this.searchInScriptsTextBox); + this.groupBox8.Controls.Add(this.label31); + this.groupBox8.Controls.Add(this.searchProgressBar); + this.groupBox8.Controls.Add(this.label30); + this.groupBox8.Controls.Add(this.label29); + this.groupBox8.Controls.Add(this.searchInScriptsResultListBox); + this.groupBox8.Location = new System.Drawing.Point(2, 315); + this.groupBox8.Name = "groupBox8"; + this.groupBox8.Size = new System.Drawing.Size(472, 298); + this.groupBox8.TabIndex = 18; + this.groupBox8.TabStop = false; + this.groupBox8.Text = "Search for commands:"; + // + // searchInScriptsButton + // + this.searchInScriptsButton.Image = global::DSPRE.Properties.Resources.SearchMiniIcon; + this.searchInScriptsButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.searchInScriptsButton.Location = new System.Drawing.Point(272, 27); + this.searchInScriptsButton.Name = "searchInScriptsButton"; + this.searchInScriptsButton.Size = new System.Drawing.Size(69, 36); + this.searchInScriptsButton.TabIndex = 13; + this.searchInScriptsButton.Text = "Search"; + this.searchInScriptsButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.searchInScriptsButton.UseVisualStyleBackColor = true; + this.searchInScriptsButton.Click += new System.EventHandler(this.searchInScriptsButton_Click); + // + // searchOnlyCurrentScriptCheckBox + // + this.searchOnlyCurrentScriptCheckBox.AutoSize = true; + this.searchOnlyCurrentScriptCheckBox.Location = new System.Drawing.Point(347, 15); + this.searchOnlyCurrentScriptCheckBox.Name = "searchOnlyCurrentScriptCheckBox"; + this.searchOnlyCurrentScriptCheckBox.Size = new System.Drawing.Size(84, 17); + this.searchOnlyCurrentScriptCheckBox.TabIndex = 14; + this.searchOnlyCurrentScriptCheckBox.Text = "Only Current"; + this.searchOnlyCurrentScriptCheckBox.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.searchOnlyCurrentScriptCheckBox.UseVisualStyleBackColor = true; + // + // scrollToBlockStartcheckBox + // + this.scrollToBlockStartcheckBox.AutoSize = true; + this.scrollToBlockStartcheckBox.Location = new System.Drawing.Point(347, 61); + this.scrollToBlockStartcheckBox.Name = "scrollToBlockStartcheckBox"; + this.scrollToBlockStartcheckBox.Size = new System.Drawing.Size(116, 17); + this.scrollToBlockStartcheckBox.TabIndex = 16; + this.scrollToBlockStartcheckBox.Text = "Scroll to block start"; + this.scrollToBlockStartcheckBox.UseVisualStyleBackColor = true; + // + // scriptSearchCaseSensitiveCheckBox + // + this.scriptSearchCaseSensitiveCheckBox.AutoSize = true; + this.scriptSearchCaseSensitiveCheckBox.Location = new System.Drawing.Point(347, 38); + this.scriptSearchCaseSensitiveCheckBox.Name = "scriptSearchCaseSensitiveCheckBox"; + this.scriptSearchCaseSensitiveCheckBox.Size = new System.Drawing.Size(83, 17); + this.scriptSearchCaseSensitiveCheckBox.TabIndex = 15; + this.scriptSearchCaseSensitiveCheckBox.Text = "Match Case"; + this.scriptSearchCaseSensitiveCheckBox.UseVisualStyleBackColor = true; + // + // searchInScriptsTextBox + // + this.searchInScriptsTextBox.Location = new System.Drawing.Point(11, 36); + this.searchInScriptsTextBox.Name = "searchInScriptsTextBox"; + this.searchInScriptsTextBox.Size = new System.Drawing.Size(255, 20); + this.searchInScriptsTextBox.TabIndex = 12; + this.searchInScriptsTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.searchInScriptsTextBox_KeyDown); + // + // label31 + // + this.label31.AutoSize = true; + this.label31.Location = new System.Drawing.Point(11, 261); + this.label31.Name = "label31"; + this.label31.Size = new System.Drawing.Size(48, 13); + this.label31.TabIndex = 37; + this.label31.Text = "Progress"; + // + // searchProgressBar + // + this.searchProgressBar.Location = new System.Drawing.Point(11, 277); + this.searchProgressBar.Name = "searchProgressBar"; + this.searchProgressBar.Size = new System.Drawing.Size(452, 14); + this.searchProgressBar.TabIndex = 36; + // + // label30 + // + this.label30.AutoSize = true; + this.label30.Location = new System.Drawing.Point(11, 68); + this.label30.Name = "label30"; + this.label30.Size = new System.Drawing.Size(42, 13); + this.label30.TabIndex = 35; + this.label30.Text = "Results"; + // + // label29 + // + this.label29.AutoSize = true; + this.label29.Location = new System.Drawing.Point(11, 20); + this.label29.Name = "label29"; + this.label29.Size = new System.Drawing.Size(77, 13); + this.label29.TabIndex = 33; + this.label29.Text = "Line to search:"; + // + // searchInScriptsResultListBox + // + this.searchInScriptsResultListBox.Location = new System.Drawing.Point(11, 84); + this.searchInScriptsResultListBox.Name = "searchInScriptsResultListBox"; + this.searchInScriptsResultListBox.Size = new System.Drawing.Size(452, 173); + this.searchInScriptsResultListBox.TabIndex = 17; + this.searchInScriptsResultListBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.searchInScriptsResultListBox_KeyDown); + this.searchInScriptsResultListBox.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.searchInScripts_GoToEntryResult); + // + // groupBox24 + // + this.groupBox24.Controls.Add(this.ScriptNavigatorTabControl); + this.groupBox24.Location = new System.Drawing.Point(3, 75); + this.groupBox24.Name = "groupBox24"; + this.groupBox24.Size = new System.Drawing.Size(472, 234); + this.groupBox24.TabIndex = 42; + this.groupBox24.TabStop = false; + this.groupBox24.Text = "Navigator"; + // + // ScriptNavigatorTabControl + // + this.ScriptNavigatorTabControl.Controls.Add(this.ScriptsNavTab); + this.ScriptNavigatorTabControl.Controls.Add(this.FunctionsNavTab); + this.ScriptNavigatorTabControl.Controls.Add(this.ActionsNavTab); + this.ScriptNavigatorTabControl.Location = new System.Drawing.Point(6, 16); + this.ScriptNavigatorTabControl.Name = "ScriptNavigatorTabControl"; + this.ScriptNavigatorTabControl.SelectedIndex = 0; + this.ScriptNavigatorTabControl.Size = new System.Drawing.Size(456, 209); + this.ScriptNavigatorTabControl.TabIndex = 8; + // + // ScriptsNavTab + // + this.ScriptsNavTab.Controls.Add(this.scriptsNavListbox); + this.ScriptsNavTab.Location = new System.Drawing.Point(4, 22); + this.ScriptsNavTab.Name = "ScriptsNavTab"; + this.ScriptsNavTab.Padding = new System.Windows.Forms.Padding(3); + this.ScriptsNavTab.Size = new System.Drawing.Size(448, 183); + this.ScriptsNavTab.TabIndex = 0; + this.ScriptsNavTab.Text = "Scripts"; + this.ScriptsNavTab.UseVisualStyleBackColor = true; + // + // scriptsNavListbox + // + this.scriptsNavListbox.Dock = System.Windows.Forms.DockStyle.Fill; + this.scriptsNavListbox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.scriptsNavListbox.ItemHeight = 15; + this.scriptsNavListbox.Location = new System.Drawing.Point(3, 3); + this.scriptsNavListbox.Name = "scriptsNavListbox"; + this.scriptsNavListbox.Size = new System.Drawing.Size(442, 177); + this.scriptsNavListbox.TabIndex = 9; + this.scriptsNavListbox.SelectedIndexChanged += new System.EventHandler(this.scriptsNavListbox_SelectedIndexChanged); + // + // FunctionsNavTab + // + this.FunctionsNavTab.Controls.Add(this.functionsNavListbox); + this.FunctionsNavTab.Location = new System.Drawing.Point(4, 22); + this.FunctionsNavTab.Name = "FunctionsNavTab"; + this.FunctionsNavTab.Padding = new System.Windows.Forms.Padding(3); + this.FunctionsNavTab.Size = new System.Drawing.Size(448, 183); + this.FunctionsNavTab.TabIndex = 1; + this.FunctionsNavTab.Text = "Functions"; + this.FunctionsNavTab.UseVisualStyleBackColor = true; + // + // functionsNavListbox + // + this.functionsNavListbox.Dock = System.Windows.Forms.DockStyle.Fill; + this.functionsNavListbox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.functionsNavListbox.ItemHeight = 15; + this.functionsNavListbox.Location = new System.Drawing.Point(3, 3); + this.functionsNavListbox.Name = "functionsNavListbox"; + this.functionsNavListbox.Size = new System.Drawing.Size(442, 177); + this.functionsNavListbox.TabIndex = 10; + this.functionsNavListbox.SelectedIndexChanged += new System.EventHandler(this.functionsNavListbox_SelectedIndexChanged); + // + // ActionsNavTab + // + this.ActionsNavTab.Controls.Add(this.actionsNavListbox); + this.ActionsNavTab.Location = new System.Drawing.Point(4, 22); + this.ActionsNavTab.Name = "ActionsNavTab"; + this.ActionsNavTab.Padding = new System.Windows.Forms.Padding(3); + this.ActionsNavTab.Size = new System.Drawing.Size(448, 183); + this.ActionsNavTab.TabIndex = 2; + this.ActionsNavTab.Text = "Actions"; + this.ActionsNavTab.UseVisualStyleBackColor = true; + // + // actionsNavListbox + // + this.actionsNavListbox.Dock = System.Windows.Forms.DockStyle.Fill; + this.actionsNavListbox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.actionsNavListbox.ItemHeight = 15; + this.actionsNavListbox.Location = new System.Drawing.Point(3, 3); + this.actionsNavListbox.Name = "actionsNavListbox"; + this.actionsNavListbox.Size = new System.Drawing.Size(442, 177); + this.actionsNavListbox.TabIndex = 11; + this.actionsNavListbox.SelectedIndexChanged += new System.EventHandler(this.actionsNavListbox_SelectedIndexChanged); + // + // openFindScriptEditorButton + // + this.openFindScriptEditorButton.Image = global::DSPRE.Properties.Resources.SearchMiniIcon; + this.openFindScriptEditorButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.openFindScriptEditorButton.Location = new System.Drawing.Point(1079, 11); + this.openFindScriptEditorButton.Name = "openFindScriptEditorButton"; + this.openFindScriptEditorButton.Size = new System.Drawing.Size(24, 24); + this.openFindScriptEditorButton.TabIndex = 27; + this.openFindScriptEditorButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.openFindScriptEditorButton.UseVisualStyleBackColor = true; + this.openFindScriptEditorButton.Click += new System.EventHandler(this.openFindScriptEditorButton_Click); + // + // expandScriptTextButton + // + this.expandScriptTextButton.Image = global::DSPRE.Properties.Resources.expandArrow; + this.expandScriptTextButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.expandScriptTextButton.Location = new System.Drawing.Point(1107, 11); + this.expandScriptTextButton.Name = "expandScriptTextButton"; + this.expandScriptTextButton.Size = new System.Drawing.Size(24, 24); + this.expandScriptTextButton.TabIndex = 28; + this.expandScriptTextButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.expandScriptTextButton.UseVisualStyleBackColor = true; + this.expandScriptTextButton.Click += new System.EventHandler(this.ScriptEditorExpandButton_Click); + // + // compressScriptTextButton + // + this.compressScriptTextButton.Image = global::DSPRE.Properties.Resources.compressArrow; + this.compressScriptTextButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.compressScriptTextButton.Location = new System.Drawing.Point(1135, 11); + this.compressScriptTextButton.Name = "compressScriptTextButton"; + this.compressScriptTextButton.Size = new System.Drawing.Size(24, 24); + this.compressScriptTextButton.TabIndex = 29; + this.compressScriptTextButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.compressScriptTextButton.UseVisualStyleBackColor = true; + this.compressScriptTextButton.Click += new System.EventHandler(this.ScriptEditorCollapseButton_Click); + // + // scriptEditorWordWrapCheckbox + // + this.scriptEditorWordWrapCheckbox.Appearance = System.Windows.Forms.Appearance.Button; + this.scriptEditorWordWrapCheckbox.AutoSize = true; + this.scriptEditorWordWrapCheckbox.Checked = true; + this.scriptEditorWordWrapCheckbox.CheckState = System.Windows.Forms.CheckState.Checked; + this.scriptEditorWordWrapCheckbox.Location = new System.Drawing.Point(907, 12); + this.scriptEditorWordWrapCheckbox.Name = "scriptEditorWordWrapCheckbox"; + this.scriptEditorWordWrapCheckbox.Size = new System.Drawing.Size(72, 23); + this.scriptEditorWordWrapCheckbox.TabIndex = 25; + this.scriptEditorWordWrapCheckbox.Text = "Word Wrap"; + this.scriptEditorWordWrapCheckbox.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.scriptEditorWordWrapCheckbox.UseVisualStyleBackColor = true; + this.scriptEditorWordWrapCheckbox.CheckedChanged += new System.EventHandler(this.scriptEditorWordWrapCheckbox_CheckedChanged); + // + // scriptEditorWhitespacesCheckbox + // + this.scriptEditorWhitespacesCheckbox.Appearance = System.Windows.Forms.Appearance.Button; + this.scriptEditorWhitespacesCheckbox.AutoSize = true; + this.scriptEditorWhitespacesCheckbox.Location = new System.Drawing.Point(981, 12); + this.scriptEditorWhitespacesCheckbox.Name = "scriptEditorWhitespacesCheckbox"; + this.scriptEditorWhitespacesCheckbox.Size = new System.Drawing.Size(79, 23); + this.scriptEditorWhitespacesCheckbox.TabIndex = 26; + this.scriptEditorWhitespacesCheckbox.Text = "Whitespaces"; + this.scriptEditorWhitespacesCheckbox.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.scriptEditorWhitespacesCheckbox.UseVisualStyleBackColor = true; + this.scriptEditorWhitespacesCheckbox.CheckedChanged += new System.EventHandler(this.viewWhiteSpacesButton_Click); + // + // groupBox26 + // + this.groupBox26.Controls.Add(this.scriptEditorNumberFormatNoPreference); + this.groupBox26.Controls.Add(this.scriptEditorNumberFormatDecimal); + this.groupBox26.Controls.Add(this.scriptEditorNumberFormatHex); + this.groupBox26.Location = new System.Drawing.Point(700, 4); + this.groupBox26.Name = "groupBox26"; + this.groupBox26.Size = new System.Drawing.Size(190, 36); + this.groupBox26.TabIndex = 50; + this.groupBox26.TabStop = false; + this.groupBox26.Text = "Number Format Preference"; + // + // scriptEditorNumberFormatNoPreference + // + this.scriptEditorNumberFormatNoPreference.AutoSize = true; + this.scriptEditorNumberFormatNoPreference.Checked = true; + this.scriptEditorNumberFormatNoPreference.Location = new System.Drawing.Point(11, 14); + this.scriptEditorNumberFormatNoPreference.Name = "scriptEditorNumberFormatNoPreference"; + this.scriptEditorNumberFormatNoPreference.Size = new System.Drawing.Size(47, 17); + this.scriptEditorNumberFormatNoPreference.TabIndex = 22; + this.scriptEditorNumberFormatNoPreference.TabStop = true; + this.scriptEditorNumberFormatNoPreference.Text = "Auto"; + this.scriptEditorNumberFormatNoPreference.UseVisualStyleBackColor = true; + this.scriptEditorNumberFormatNoPreference.CheckedChanged += new System.EventHandler(this.UpdateScriptNumberFormatNoPref); + // + // scriptEditorNumberFormatDecimal + // + this.scriptEditorNumberFormatDecimal.AutoSize = true; + this.scriptEditorNumberFormatDecimal.Location = new System.Drawing.Point(121, 14); + this.scriptEditorNumberFormatDecimal.Name = "scriptEditorNumberFormatDecimal"; + this.scriptEditorNumberFormatDecimal.Size = new System.Drawing.Size(63, 17); + this.scriptEditorNumberFormatDecimal.TabIndex = 24; + this.scriptEditorNumberFormatDecimal.Text = "Decimal"; + this.scriptEditorNumberFormatDecimal.UseVisualStyleBackColor = true; + this.scriptEditorNumberFormatDecimal.CheckedChanged += new System.EventHandler(this.UpdateScriptNumberFormatDec); + // + // scriptEditorNumberFormatHex + // + this.scriptEditorNumberFormatHex.AutoSize = true; + this.scriptEditorNumberFormatHex.Location = new System.Drawing.Point(68, 14); + this.scriptEditorNumberFormatHex.Name = "scriptEditorNumberFormatHex"; + this.scriptEditorNumberFormatHex.Size = new System.Drawing.Size(44, 17); + this.scriptEditorNumberFormatHex.TabIndex = 23; + this.scriptEditorNumberFormatHex.Text = "Hex"; + this.scriptEditorNumberFormatHex.UseVisualStyleBackColor = true; + this.scriptEditorNumberFormatHex.CheckedChanged += new System.EventHandler(this.UpdateScriptNumberFormatHex); + // + // viewLevelScriptButton + // + this.viewLevelScriptButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.viewLevelScriptButton.Location = new System.Drawing.Point(481, 681); + this.viewLevelScriptButton.Name = "viewLevelScriptButton"; + this.viewLevelScriptButton.Size = new System.Drawing.Size(91, 25); + this.viewLevelScriptButton.TabIndex = 6; + this.viewLevelScriptButton.Text = "View level script"; + this.viewLevelScriptButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.viewLevelScriptButton.UseVisualStyleBackColor = true; + this.viewLevelScriptButton.Click += new System.EventHandler(this.viewLevelScriptButton_Click); + // + // locateCurrentScriptFile + // + this.locateCurrentScriptFile.Image = global::DSPRE.Properties.Resources.open_file; + this.locateCurrentScriptFile.Location = new System.Drawing.Point(423, 29); + this.locateCurrentScriptFile.Name = "locateCurrentScriptFile"; + this.locateCurrentScriptFile.Size = new System.Drawing.Size(42, 40); + this.locateCurrentScriptFile.TabIndex = 7; + this.locateCurrentScriptFile.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.locateCurrentScriptFile.UseVisualStyleBackColor = true; + this.locateCurrentScriptFile.Click += new System.EventHandler(this.locateCurrentScriptFile_Click); + // + // ScriptEditor + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.locateCurrentScriptFile); + this.Controls.Add(this.groupBox24); + this.Controls.Add(this.viewLevelScriptButton); + this.Controls.Add(this.selectScriptFileComboBox); + this.Controls.Add(this.groupBox26); + this.Controls.Add(this.label5); + this.Controls.Add(this.scriptEditorWhitespacesCheckbox); + this.Controls.Add(this.scriptEditorWordWrapCheckbox); + this.Controls.Add(this.addScriptFileButton); + this.Controls.Add(this.compressScriptTextButton); + this.Controls.Add(this.removeScriptFileButton); + this.Controls.Add(this.expandScriptTextButton); + this.Controls.Add(this.saveScriptFileButton); + this.Controls.Add(this.openFindScriptEditorButton); + this.Controls.Add(this.exportScriptFileButton); + this.Controls.Add(this.importScriptFileButton); + this.Controls.Add(this.groupBox8); + this.Controls.Add(this.scriptEditorTabControl); + this.Name = "ScriptEditor"; + this.Size = new System.Drawing.Size(1177, 735); + this.scriptEditorTabControl.ResumeLayout(false); + this.scriptsTabPage.ResumeLayout(false); + this.PanelSearchScripts.ResumeLayout(false); + this.PanelSearchScripts.PerformLayout(); + this.functionsTabPage.ResumeLayout(false); + this.PanelSearchFunctions.ResumeLayout(false); + this.PanelSearchFunctions.PerformLayout(); + this.actionsTabPage.ResumeLayout(false); + this.PanelSearchActions.ResumeLayout(false); + this.PanelSearchActions.PerformLayout(); + this.groupBox8.ResumeLayout(false); + this.groupBox8.PerformLayout(); + this.groupBox24.ResumeLayout(false); + this.ScriptNavigatorTabControl.ResumeLayout(false); + this.ScriptsNavTab.ResumeLayout(false); + this.FunctionsNavTab.ResumeLayout(false); + this.ActionsNavTab.ResumeLayout(false); + this.groupBox26.ResumeLayout(false); + this.groupBox26.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + private System.Windows.Forms.CheckBox scrollToBlockStartcheckBox; + + #endregion + + public System.Windows.Forms.ComboBox selectScriptFileComboBox; + private System.Windows.Forms.Label label5; + public System.Windows.Forms.TabControl scriptEditorTabControl; + private System.Windows.Forms.TabPage scriptsTabPage; + private System.Windows.Forms.Panel PanelSearchScripts; + private System.Windows.Forms.Button BtnNextFindScript; + private System.Windows.Forms.Button BtnPrevFindScript; + private System.Windows.Forms.Button BtnCloseFindScript; + private System.Windows.Forms.TextBox panelFindScriptTextBox; + private System.Windows.Forms.Panel scintillaScriptsPanel; + private System.Windows.Forms.TabPage functionsTabPage; + private System.Windows.Forms.Panel PanelSearchFunctions; + private System.Windows.Forms.Button BtnNextFindFunc; + private System.Windows.Forms.Button BtnPrevFindFunc; + private System.Windows.Forms.Button BtnCloseFindFunc; + private System.Windows.Forms.TextBox panelFindFunctionTextBox; + private System.Windows.Forms.Panel scintillaFunctionsPanel; + private System.Windows.Forms.TabPage actionsTabPage; + private System.Windows.Forms.Panel PanelSearchActions; + private System.Windows.Forms.Button BtnNextFindActions; + private System.Windows.Forms.Button BtnPrevFindActions; + private System.Windows.Forms.Button BtnCloseFindActions; + private System.Windows.Forms.TextBox panelFindActionTextBox; + private System.Windows.Forms.Panel scintillaActionsPanel; + private System.Windows.Forms.Button addScriptFileButton; + private System.Windows.Forms.Button removeScriptFileButton; + private System.Windows.Forms.Button saveScriptFileButton; + private System.Windows.Forms.Button exportScriptFileButton; + private System.Windows.Forms.Button importScriptFileButton; + private System.Windows.Forms.GroupBox groupBox8; + private System.Windows.Forms.CheckBox searchOnlyCurrentScriptCheckBox; + private System.Windows.Forms.CheckBox scriptSearchCaseSensitiveCheckBox; + private System.Windows.Forms.TextBox searchInScriptsTextBox; + private System.Windows.Forms.Label label31; + private System.Windows.Forms.ProgressBar searchProgressBar; + private System.Windows.Forms.Label label30; + private System.Windows.Forms.Label label29; + private System.Windows.Forms.Button searchInScriptsButton; + private System.Windows.Forms.ListBox searchInScriptsResultListBox; + private System.Windows.Forms.GroupBox groupBox24; + private System.Windows.Forms.TabControl ScriptNavigatorTabControl; + private System.Windows.Forms.TabPage ScriptsNavTab; + private System.Windows.Forms.ListBox scriptsNavListbox; + private System.Windows.Forms.TabPage FunctionsNavTab; + private System.Windows.Forms.ListBox functionsNavListbox; + private System.Windows.Forms.TabPage ActionsNavTab; + private System.Windows.Forms.ListBox actionsNavListbox; + private System.Windows.Forms.Button openFindScriptEditorButton; + private System.Windows.Forms.Button expandScriptTextButton; + private System.Windows.Forms.Button compressScriptTextButton; + private System.Windows.Forms.CheckBox scriptEditorWordWrapCheckbox; + private System.Windows.Forms.CheckBox scriptEditorWhitespacesCheckbox; + private System.Windows.Forms.GroupBox groupBox26; + private System.Windows.Forms.RadioButton scriptEditorNumberFormatNoPreference; + private System.Windows.Forms.RadioButton scriptEditorNumberFormatDecimal; + private System.Windows.Forms.RadioButton scriptEditorNumberFormatHex; + private System.Windows.Forms.Button viewLevelScriptButton; + private System.Windows.Forms.Button locateCurrentScriptFile; + } +} diff --git a/DS_Map/Editors/ScriptEditor.cs b/DS_Map/Editors/ScriptEditor.cs new file mode 100644 index 0000000..f13f14a --- /dev/null +++ b/DS_Map/Editors/ScriptEditor.cs @@ -0,0 +1,1047 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.IO; +using System.Windows.Forms; +using DSPRE.Resources; +using DSPRE.ROMFiles; +using ScintillaNET; +using ScintillaNET.Utils; +using System.Globalization; + +namespace DSPRE.Editors { + public partial class ScriptEditor : UserControl { + public bool scriptEditorIsReady { get; set; } = false; + private Scintilla ScriptTextArea; + private Scintilla FunctionTextArea; + private Scintilla ActionTextArea; + private SearchManager scriptSearchManager; + private SearchManager functionSearchManager; + private SearchManager actionSearchManager; + private Scintilla currentScintillaEditor; + private SearchManager currentSearchManager; + private bool scriptsDirty = false; + private bool functionsDirty = false; + private bool actionsDirty = false; + private string cmdKeyWords = ""; + private string secondaryKeyWords = ""; + private ScriptFile currentScriptFile; + MainProgram _parent; + /// + /// the background color of the text area + /// + private readonly Color BACK_COLOR = Color.FromArgb(0x2A211C); + + /// + /// default text color of the text area + /// + private readonly Color FORE_COLOR = Color.FromArgb(0xB7B7B7); + + /// + /// change this to whatever margin you want the line numbers to show in + /// + private const int NUMBER_MARGIN = 1; + + /// + /// change this to whatever margin you want the bookmarks/breakpoints to show in + /// + private const int BOOKMARK_MARGIN = 2; + + private const int BOOKMARK_MARKER = 2; + + /// + /// change this to whatever margin you want the code folding tree (+/-) to show in + /// + private const int FOLDING_MARGIN = 3; + + /// + /// set this true to show circular buttons for code folding (the [+] and [-] buttons on the margin) + /// + private const bool CODE_FOLDING_CIRCULAR = true; + + readonly Point initial_importScriptFileButton_location; + readonly Point initial_exportScriptFileButton_location; + readonly Point initial_addScriptFileButton_location; + readonly Point initial_removeScriptFileButton_location; + readonly Point initial_viewLevelScript_location; + + readonly Point new_importScriptFileButton_location; + readonly Point new_exportScriptFileButton_location; + readonly Point new_addScriptFileButton_location; + readonly Point new_removeScriptFileButton_location; + readonly Point new_viewLevelScript_location; + + public ScriptEditor() { + InitializeComponent(); + + + //initially, these buttons are off the canvas so they can be interacted with in the designer + //they are then moved as needed + initial_importScriptFileButton_location = importScriptFileButton.Location; + initial_exportScriptFileButton_location = exportScriptFileButton.Location; + initial_addScriptFileButton_location = addScriptFileButton.Location; + initial_removeScriptFileButton_location = removeScriptFileButton.Location; + initial_viewLevelScript_location = viewLevelScriptButton.Location; + + new_importScriptFileButton_location = new Point(164, 22); + new_exportScriptFileButton_location = new Point(239, 22); + new_addScriptFileButton_location = new Point(314, 22); + new_removeScriptFileButton_location = new Point(314, 49); + new_viewLevelScript_location = new Point(326, 37); + + importScriptFileButton.Enabled = false; + exportScriptFileButton.Enabled = false; + addScriptFileButton.Enabled = false; + removeScriptFileButton.Enabled = false; + viewLevelScriptButton.Enabled = false; + } + + public void SetupScriptEditor(MainProgram parent, bool force = false) { + if (scriptEditorIsReady && !force) return; + scriptEditorIsReady = true; + this._parent = parent; + SetupScriptEditorTextAreas(); + + /* Extract essential NARCs sub-archives*/ + Helpers.statusLabelMessage("Setting up Script Editor..."); + Update(); + + DSUtils.TryUnpackNarcs(new List { RomInfo.DirNames.scripts }); //12 = scripts Narc Dir + + populate_selectScriptFileComboBox(0); + + UpdateScriptNumberCheckBox((NumberStyles)Properties.Settings.Default.scriptEditorFormatPreference); + Helpers.statusLabelMessage(); + } + + public void OpenScriptEditor(MainProgram parent, int scriptFileID) { + SetupScriptEditor(parent); + + scriptEditorTabControl.SelectedIndex = 0; + selectScriptFileComboBox.SelectedIndex = scriptFileID; + EditorPanels.mainTabControl.SelectedTab = EditorPanels.scriptEditorTabPage; + } + + private void SetupScriptEditorTextAreas() { + //PREPARE SCRIPT EDITOR KEYWORDS + cmdKeyWords = String.Join(" ", RomInfo.ScriptCommandNamesDict.Values) + + " " + String.Join(" ", ScriptDatabase.movementsDictIDName.Values); + cmdKeyWords += " " + cmdKeyWords.ToUpper() + " " + cmdKeyWords.ToLower(); + + secondaryKeyWords = String.Join(" ", RomInfo.ScriptComparisonOperatorsDict.Values) + + " " + String.Join(" ", ScriptDatabase.specialOverworlds.Values) + + " " + String.Join(" ", ScriptDatabase.overworldDirections.Values) + + " " + ScriptFile.ContainerTypes.Script.ToString() + + " " + ScriptFile.ContainerTypes.Function.ToString() + + " " + ScriptFile.ContainerTypes.Action.ToString() + + " " + Event.EventType.Overworld + + " " + Overworld.MovementCodeKW; + secondaryKeyWords += " " + secondaryKeyWords.ToUpper() + " " + secondaryKeyWords.ToLower(); + + // CREATE CONTROLS + ScriptTextArea = new Scintilla(); + scriptSearchManager = new SearchManager(EditorPanels.MainProgram, ScriptTextArea, panelFindScriptTextBox, PanelSearchScripts); + scintillaScriptsPanel.Controls.Clear(); + scintillaScriptsPanel.Controls.Add(ScriptTextArea); + + FunctionTextArea = new Scintilla(); + functionSearchManager = new SearchManager(EditorPanels.MainProgram, FunctionTextArea, panelFindFunctionTextBox, PanelSearchFunctions); + scintillaFunctionsPanel.Controls.Clear(); + scintillaFunctionsPanel.Controls.Add(FunctionTextArea); + + ActionTextArea = new Scintilla(); + actionSearchManager = new SearchManager(EditorPanels.MainProgram, ActionTextArea, panelFindActionTextBox, PanelSearchActions); + scintillaActionsPanel.Controls.Clear(); + scintillaActionsPanel.Controls.Add(ActionTextArea); + + currentScintillaEditor = ScriptTextArea; + currentSearchManager = scriptSearchManager; + + // BASIC CONFIG + ScriptTextArea.TextChanged += (OnTextChangedScript); + FunctionTextArea.TextChanged += (OnTextChangedFunction); + ActionTextArea.TextChanged += (OnTextChangedAction); + + // INITIAL VIEW CONFIG + InitialViewConfig(ScriptTextArea); + InitialViewConfig(FunctionTextArea); + InitialViewConfig(ActionTextArea); + + InitSyntaxColoring(ScriptTextArea); + InitSyntaxColoring(FunctionTextArea); + InitSyntaxColoring(ActionTextArea); + + // NUMBER MARGIN + InitNumberMargin(ScriptTextArea, ScriptTextArea_MarginClick); + InitNumberMargin(FunctionTextArea, FunctionTextArea_MarginClick); + InitNumberMargin(ActionTextArea, ActionTextArea_MarginClick); + + // BOOKMARK MARGIN + InitBookmarkMargin(ScriptTextArea); + InitBookmarkMargin(FunctionTextArea); + InitBookmarkMargin(ActionTextArea); + + // CODE FOLDING MARGIN + InitCodeFolding(ScriptTextArea); + InitCodeFolding(FunctionTextArea); + InitCodeFolding(ActionTextArea); + + // INIT HOTKEYS + InitHotkeys(ScriptTextArea, scriptSearchManager); + InitHotkeys(FunctionTextArea, functionSearchManager); + InitHotkeys(ActionTextArea, actionSearchManager); + + // INIT TOOLTIPS DWELLING + /* + ScriptTextArea.MouseDwellTime = 300; + ScriptTextArea.DwellEnd += TextArea_DwellEnd; + ScriptTextArea.DwellStart += TextArea_DwellStart; + + FunctionTextArea.MouseDwellTime = 300; + FunctionTextArea.DwellEnd += TextArea_DwellEnd; + FunctionTextArea.DwellStart += TextArea_DwellStart; + */ + } + + private void populate_selectScriptFileComboBox(int selectedIndex = 0) { + selectScriptFileComboBox.Items.Clear(); + int scriptCount = Filesystem.GetScriptCount(); + for (int i = 0; i < scriptCount; i++) { + // ScriptFile currentScriptFile = new ScriptFile(i, true, true); + // selectScriptFileComboBox.Items.Add(currentScriptFile); + selectScriptFileComboBox.Items.Add($"Script File {i}"); + } + + selectScriptFileComboBox.SelectedIndex = selectedIndex; + } + + private void InitialViewConfig(Scintilla textArea) { + textArea.Dock = DockStyle.Fill; + textArea.WrapMode = WrapMode.Word; + textArea.IndentationGuides = IndentView.LookBoth; + textArea.CaretPeriod = 500; + textArea.CaretForeColor = Color.White; + textArea.SetSelectionBackColor(true, Color.FromArgb(0x114D9C)); + textArea.WrapIndentMode = WrapIndentMode.Same; + } + + private void InitSyntaxColoring(Scintilla textArea) { + // Configure the default style + textArea.StyleResetDefault(); + textArea.Styles[Style.Default].Font = "Consolas"; + textArea.Styles[Style.Default].Size = 12; + textArea.Styles[Style.Default].BackColor = Color.FromArgb(0x212121); + textArea.Styles[Style.Default].ForeColor = Color.FromArgb(0xFFFFFF); + textArea.StyleClearAll(); + + // Configure the lexer styles + textArea.Styles[Style.Python.Identifier].ForeColor = Color.FromArgb(0xD0DAE2); + textArea.Styles[Style.Python.CommentLine].ForeColor = Color.FromArgb(0x40BF57); + textArea.Styles[Style.Python.Number].ForeColor = Color.FromArgb(0xFFFF00); + textArea.Styles[Style.Python.String].ForeColor = Color.FromArgb(0xFF00FF); + textArea.Styles[Style.Python.Character].ForeColor = Color.FromArgb(0xE95454); + textArea.Styles[Style.Python.Operator].ForeColor = Color.FromArgb(0xFFFF00); + textArea.Styles[Style.Python.Word].ForeColor = Color.FromArgb(0x48A8EE); + textArea.Styles[Style.Python.Word2].ForeColor = Color.FromArgb(0xF98906); + + textArea.Lexer = Lexer.Python; + + textArea.SetKeywords(0, cmdKeyWords); + textArea.SetKeywords(1, secondaryKeyWords); + } + + private void InitNumberMargin(Scintilla textArea, EventHandler textArea_MarginClick) { + textArea.Styles[Style.LineNumber].BackColor = BACK_COLOR; + textArea.Styles[Style.LineNumber].ForeColor = FORE_COLOR; + textArea.Styles[Style.IndentGuide].ForeColor = FORE_COLOR; + textArea.Styles[Style.IndentGuide].BackColor = BACK_COLOR; + + Margin nums = textArea.Margins[NUMBER_MARGIN]; + nums.Type = MarginType.Number; + nums.Sensitive = true; + nums.Mask = 0; + + textArea.MarginClick += textArea_MarginClick; + } + + private void InitBookmarkMargin(Scintilla textArea) { + //TextArea.SetFoldMarginColor(true, IntToColor(BACK_COLOR)); + + Margin margin = textArea.Margins[BOOKMARK_MARGIN]; + margin.Width = 20; + margin.Sensitive = true; + margin.Type = MarginType.Symbol; + margin.Mask = (1 << BOOKMARK_MARKER); + //margin.Cursor = MarginCursor.Arrow; + + Marker marker = textArea.Markers[BOOKMARK_MARKER]; + marker.Symbol = MarkerSymbol.Circle; + marker.SetBackColor(Color.FromArgb(0xFF003B)); + marker.SetForeColor(Color.FromArgb(0x000000)); + marker.SetAlpha(100); + } + + private void InitCodeFolding(Scintilla textArea) { + textArea.SetFoldMarginColor(true, BACK_COLOR); + textArea.SetFoldMarginHighlightColor(true, BACK_COLOR); + + // Enable code folding + textArea.SetProperty("fold", "1"); + textArea.SetProperty("fold.compact", "1"); + + // Configure a margin to display folding symbols + textArea.Margins[FOLDING_MARGIN].Type = MarginType.Symbol; + textArea.Margins[FOLDING_MARGIN].Mask = Marker.MaskFolders; + textArea.Margins[FOLDING_MARGIN].Sensitive = true; + textArea.Margins[FOLDING_MARGIN].Width = 20; + + // Set colors for all folding markers + for (int i = 25; i <= 31; i++) { + textArea.Markers[i].SetForeColor(BACK_COLOR); // styles for [+] and [-] + textArea.Markers[i].SetBackColor(FORE_COLOR); // styles for [+] and [-] + } + + // Configure folding markers with respective symbols + textArea.Markers[Marker.Folder].Symbol = CODE_FOLDING_CIRCULAR ? MarkerSymbol.CirclePlus : MarkerSymbol.BoxPlus; + textArea.Markers[Marker.FolderOpen].Symbol = CODE_FOLDING_CIRCULAR ? MarkerSymbol.CircleMinus : MarkerSymbol.BoxMinus; + textArea.Markers[Marker.FolderEnd].Symbol = CODE_FOLDING_CIRCULAR ? MarkerSymbol.CirclePlusConnected : MarkerSymbol.BoxPlusConnected; + textArea.Markers[Marker.FolderMidTail].Symbol = MarkerSymbol.TCorner; + textArea.Markers[Marker.FolderOpenMid].Symbol = CODE_FOLDING_CIRCULAR ? MarkerSymbol.CircleMinusConnected : MarkerSymbol.BoxMinusConnected; + textArea.Markers[Marker.FolderSub].Symbol = MarkerSymbol.VLine; + textArea.Markers[Marker.FolderTail].Symbol = MarkerSymbol.LCorner; + + // Enable automatic folding + textArea.AutomaticFold = (AutomaticFold.Show|AutomaticFold.Click|AutomaticFold.Change); + } + + private void InitHotkeys(Scintilla scintillaTb, SearchManager sm) { + // register the hotkeys with the form + HotKeyManager.AddHotKey(scintillaTb, sm.OpenSearch, Keys.F, true); + HotKeyManager.AddHotKey(scintillaTb, () => Uppercase(scintillaTb), Keys.U, true); + HotKeyManager.AddHotKey(scintillaTb, () => Lowercase(scintillaTb), Keys.L, true); + HotKeyManager.AddHotKey(scintillaTb, () => ZoomIn(scintillaTb), Keys.Oemplus, true); + HotKeyManager.AddHotKey(scintillaTb, () => ZoomOut(scintillaTb), Keys.OemMinus, true); + HotKeyManager.AddHotKey(scintillaTb, () => ZoomDefault(scintillaTb), Keys.D0, true); + HotKeyManager.AddHotKey(scintillaTb, sm.CloseSearch, Keys.Escape); + + // remove conflicting hotkeys from scintilla + scintillaTb.ClearCmdKey(Keys.Control|Keys.F); + scintillaTb.ClearCmdKey(Keys.Control|Keys.R); + scintillaTb.ClearCmdKey(Keys.Control|Keys.H); + scintillaTb.ClearCmdKey(Keys.Control|Keys.L); + scintillaTb.ClearCmdKey(Keys.Control|Keys.U); + } + + private void Uppercase(Scintilla textArea) { + // save the selection + int start = textArea.SelectionStart; + int end = textArea.SelectionEnd; + + // modify the selected text + textArea.ReplaceSelection(textArea.GetTextRange(start, end - start).ToUpper()); + + // preserve the original selection + textArea.SetSelection(start, end); + } + + private void Lowercase(Scintilla textArea) { + // save the selection + int start = textArea.SelectionStart; + int end = textArea.SelectionEnd; + + // modify the selected text + textArea.ReplaceSelection(textArea.GetTextRange(start, end - start).ToLower()); + + // preserve the original selection + textArea.SetSelection(start, end); + } + + private void ZoomIn(Scintilla textArea) { + textArea.ZoomIn(); + } + + private void ZoomOut(Scintilla textArea) { + textArea.ZoomOut(); + } + + private void ZoomDefault(Scintilla textArea) { + textArea.Zoom = 0; + } + + private void ScriptEditorSetClean() { + Helpers.DisableHandlers(); + + scriptsTabPage.Text = ScriptFile.ContainerTypes.Script.ToString() + "s"; + functionsTabPage.Text = ScriptFile.ContainerTypes.Function.ToString() + "s"; + actionsTabPage.Text = ScriptFile.ContainerTypes.Action.ToString() + "s"; + scriptsDirty = functionsDirty = actionsDirty = false; + + Helpers.EnableHandlers(); + } + + private void OnTextChangedScript(object sender, EventArgs e) { + ScriptTextArea.Margins[NUMBER_MARGIN].Width = ScriptTextArea.Lines.Count.ToString().Length * 13; + scriptsDirty = true; + scriptsTabPage.Text = ScriptFile.ContainerTypes.Script.ToString() + "s" + "*"; + } + + private void OnTextChangedFunction(object sender, EventArgs e) { + FunctionTextArea.Margins[NUMBER_MARGIN].Width = FunctionTextArea.Lines.Count.ToString().Length * 13; + functionsDirty = true; + functionsTabPage.Text = ScriptFile.ContainerTypes.Function.ToString() + "s" + "*"; + } + + private void OnTextChangedAction(object sender, EventArgs e) { + ActionTextArea.Margins[NUMBER_MARGIN].Width = ActionTextArea.Lines.Count.ToString().Length * 13; + actionsDirty = true; + actionsTabPage.Text = ScriptFile.ContainerTypes.Action.ToString() + "s" + "*"; + } + + private void ScriptTextArea_MarginClick(object sender, MarginClickEventArgs e) { + MarginClick(ScriptTextArea, e); + } + + private void FunctionTextArea_MarginClick(object sender, MarginClickEventArgs e) { + MarginClick(FunctionTextArea, e); + } + + private void ActionTextArea_MarginClick(object sender, MarginClickEventArgs e) { + MarginClick(ActionTextArea, e); + } + + private void MarginClick(Scintilla textArea, MarginClickEventArgs e) { + if (e.Margin == BOOKMARK_MARGIN) { + // Do we have a marker for this line? + const uint mask = (1 << BOOKMARK_MARKER); + Line line = textArea.Lines[textArea.LineFromPosition(e.Position)]; + if ((line.MarkerGet()&mask) > 0) { + // Remove existing bookmark + line.MarkerDelete(BOOKMARK_MARKER); + } + else { + // Add bookmark + line.MarkerAdd(BOOKMARK_MARKER); + } + } + } + + private void selectScriptFileComboBox_SelectedIndexChanged(object sender, EventArgs e) { + DisplayScript(); + } + + public void UpdateScriptNumberCheckBox(NumberStyles toSet) { + Helpers.DisableHandlers(); + Properties.Settings.Default.scriptEditorFormatPreference = (int)toSet; + + switch ((NumberStyles)Properties.Settings.Default.scriptEditorFormatPreference) { + case NumberStyles.None: + scriptEditorNumberFormatNoPreference.Checked = true; + break; + case NumberStyles.HexNumber: + scriptEditorNumberFormatHex.Checked = true; + break; + case NumberStyles.Integer: + scriptEditorNumberFormatDecimal.Checked = true; + break; + } + + Console.WriteLine("changed style to " + Properties.Settings.Default.scriptEditorFormatPreference); + Helpers.EnableHandlers(); + } + + private void UpdateScriptNumberFormat(NumberStyles numberStyle) { + if (Helpers.HandlersEnabled) { + NumberStyles old = (NumberStyles)Properties.Settings.Default.scriptEditorFormatPreference; //Local Backup + Properties.Settings.Default.scriptEditorFormatPreference = (int)numberStyle; + + if (!DisplayScript()) { + UpdateScriptNumberCheckBox(old); //Restore old checkbox status! Script couldn't be redrawn + } + } + } + + private void UpdateScriptNumberFormatNoPref(object sender, EventArgs e) { + UpdateScriptNumberFormat(NumberStyles.None); + } + + private void UpdateScriptNumberFormatDec(object sender, EventArgs e) { + UpdateScriptNumberFormat(NumberStyles.Integer); + } + + private void UpdateScriptNumberFormatHex(object sender, EventArgs e) { + UpdateScriptNumberFormat(NumberStyles.HexNumber); + } + + private bool DisplayScript() { + Console.WriteLine("Script Reload has been requested"); + + /* clear controls */ + if (Helpers.HandlersDisabled || selectScriptFileComboBox.SelectedItem == null) { + return false; + } + + if (scriptsDirty || functionsDirty || actionsDirty) { + DialogResult d = MessageBox.Show("There are unsaved changes in this Script File.\nDo you wish to discard them?", "Unsaved work", MessageBoxButtons.YesNo, MessageBoxIcon.Warning); + + if (!d.Equals(DialogResult.Yes)) { + Helpers.DisableHandlers(); + // selectScriptFileComboBox.SelectedItem = currentScriptFile; + selectScriptFileComboBox.SelectedIndex = (int)currentScriptFile.fileID; + Helpers.EnableHandlers(); + return false; + } + } + + Helpers.DisableHandlers(); + + ScriptFile lastScriptFile = currentScriptFile; + // currentScriptFile = (ScriptFile)selectScriptFileComboBox.SelectedItem; + currentScriptFile = new ScriptFile(selectScriptFileComboBox.SelectedIndex); // Load script file + + ScriptTextArea.ClearAll(); + FunctionTextArea.ClearAll(); + ActionTextArea.ClearAll(); + + scriptsNavListbox.Items.Clear(); + functionsNavListbox.Items.Clear(); + actionsNavListbox.Items.Clear(); + + //prevent buttons from flickering when the combobox selection changes + bool typeChanged = true; + if (lastScriptFile != null) { + typeChanged = lastScriptFile.isLevelScript != currentScriptFile.isLevelScript; + } + + if (typeChanged) { + if (currentScriptFile.isLevelScript) { + importScriptFileButton.Location = initial_importScriptFileButton_location; + exportScriptFileButton.Location = initial_exportScriptFileButton_location; + addScriptFileButton.Location = initial_addScriptFileButton_location; + removeScriptFileButton.Location = initial_removeScriptFileButton_location; + + viewLevelScriptButton.Location = new_viewLevelScript_location; + + importScriptFileButton.Enabled = false; + exportScriptFileButton.Enabled = false; + addScriptFileButton.Enabled = false; + removeScriptFileButton.Enabled = false; + + viewLevelScriptButton.Enabled = true; + } + else { + importScriptFileButton.Location = new_importScriptFileButton_location; + exportScriptFileButton.Location = new_exportScriptFileButton_location; + addScriptFileButton.Location = new_addScriptFileButton_location; + removeScriptFileButton.Location = new_removeScriptFileButton_location; + + viewLevelScriptButton.Location = initial_viewLevelScript_location; + + importScriptFileButton.Enabled = true; + exportScriptFileButton.Enabled = true; + addScriptFileButton.Enabled = true; + removeScriptFileButton.Enabled = true; + + viewLevelScriptButton.Enabled = false; + } + } + + if (!currentScriptFile.isLevelScript) { + displayScriptFile(ScriptFile.ContainerTypes.Script, currentScriptFile.allScripts, scriptsNavListbox, ScriptTextArea); + displayScriptFile(ScriptFile.ContainerTypes.Function, currentScriptFile.allFunctions, functionsNavListbox, FunctionTextArea); + displayScriptFileActions(ScriptFile.ContainerTypes.Action, currentScriptFile.allActions, actionsNavListbox, ActionTextArea); + } + + ScriptEditorSetClean(); + + Helpers.statusLabelMessage(); + Helpers.EnableHandlers(); + + return true; + } + + static void displayScriptFile(ScriptFile.ContainerTypes containerType, List commandList, ListBox navListBox, Scintilla textArea) { + string buffer = ""; + /* Add commands */ + for (int i = 0; i < commandList.Count; i++) { + ScriptCommandContainer scriptCommandContainer = commandList[i]; + + /* Write header */ + string header = containerType + " " + (i + 1); + buffer += header + ':' + Environment.NewLine; + navListBox.Items.Add(header); + + /* If current command is identical to another, print UseScript instead of commands */ + if (scriptCommandContainer.usedScriptID < 0) { + for (int j = 0; j < scriptCommandContainer.commands.Count; j++) { + ScriptCommand command = scriptCommandContainer.commands[j]; + if (!ScriptDatabase.endCodes.Contains(command.id)) { + buffer += '\t'; + } + + buffer += command.name + Environment.NewLine; + } + } + else { + buffer += '\t' + "UseScript_#" + scriptCommandContainer.usedScriptID + Environment.NewLine; + } + + textArea.AppendText(buffer + Environment.NewLine); + buffer = ""; + } + } + + static void displayScriptFileActions(ScriptFile.ContainerTypes containerType, List commandList, ListBox navListBox, Scintilla textArea) { + /* Add movements */ + string buffer = ""; + for (int i = 0; i < commandList.Count; i++) { + ScriptActionContainer currentCommand = commandList[i]; + + string header = containerType + " " + (i + 1); + buffer += header + ':' + Environment.NewLine; + navListBox.Items.Add(header); + + for (int j = 0; j < currentCommand.commands.Count; j++) { + ScriptAction command = currentCommand.commands[j]; + if (!ScriptDatabase.movementEndCodes.Contains(command.id)) { + buffer += '\t'; + } + + buffer += command.name + Environment.NewLine; + } + + textArea.AppendText(buffer + Environment.NewLine); + buffer = ""; + } + } + + private void scriptEditorZoomInButton_Click(object sender, EventArgs e) { + ZoomIn(currentScintillaEditor); + } + + private void scriptEditorZoomOutButton_Click(object sender, EventArgs e) { + ZoomOut(currentScintillaEditor); + } + + private void scriptEditorZoomResetButton_Click(object sender, EventArgs e) { + ZoomDefault(currentScintillaEditor); + } + + private void scriptEditorTabControl_TabIndexChanged(object sender, EventArgs e) { + if (scriptEditorTabControl.SelectedTab == scriptsTabPage) { + currentSearchManager = scriptSearchManager; + currentScintillaEditor = ScriptTextArea; + } + else if (scriptEditorTabControl.SelectedTab == functionsTabPage) { + currentSearchManager = functionSearchManager; + currentScintillaEditor = FunctionTextArea; + } + else { + //Actions + currentSearchManager = actionSearchManager; + currentScintillaEditor = ActionTextArea; + } + } + + private void removeScriptFileButton_Click(object sender, EventArgs e) { + DialogResult d = MessageBox.Show("Are you sure you want to delete the last Script File?", "Confirm deletion", MessageBoxButtons.YesNo, MessageBoxIcon.Warning); + if (d.Equals(DialogResult.Yes)) { + /* Delete script file */ + string path = Filesystem.GetScriptPath(selectScriptFileComboBox.Items.Count - 1); + File.Delete(path); + + /* Check if currently selected file is the last one, and in that case select the one before it */ + int lastIndex = selectScriptFileComboBox.Items.Count - 1; + if (selectScriptFileComboBox.SelectedIndex == lastIndex) { + selectScriptFileComboBox.SelectedIndex--; + } + + /* Remove item from ComboBox */ + selectScriptFileComboBox.Items.RemoveAt(lastIndex); + } + } + + private void addScriptFileButton_Click(object sender, EventArgs e) { + /* Add new event file to event folder */ + int fileID = selectScriptFileComboBox.Items.Count; + + ScriptFile scriptFile = new ScriptFile( + scriptLines: new Scintilla { Text = "Script 1:\nEnd" }.Lines.ToStringsList(trim: true), + functionLines: null, + actionLines: null, + fileID + ); + + //check if ScriptFile instance was created successfully + if (scriptFile.SaveToFileDefaultDir(fileID, showSuccessMessage: false)) { + /* Update ComboBox and select new file */ + selectScriptFileComboBox.Items.Add(scriptFile); + selectScriptFileComboBox.SelectedItem = scriptFile; + } + } + + private void saveScriptFileButton_Click(object sender, EventArgs e) { + /* Create new ScriptFile object using the values in the script editor */ + int fileID = currentScriptFile.fileID; + + ScriptFile userEdited = new ScriptFile( + scriptLines: ScriptTextArea.Lines.ToStringsList(trim: true), + functionLines: FunctionTextArea.Lines.ToStringsList(trim: true), + actionLines: ActionTextArea.Lines.ToStringsList(trim: true), + fileID + ); + + if (userEdited.hasNoScripts) { + MessageBox.Show("This " + nameof(ScriptFile) + " couldn't be saved. A minimum of one script is required.", "Can't save", MessageBoxButtons.OK, MessageBoxIcon.Warning); + return; + } + + //check if ScriptFile instance was created successfully + if (userEdited.SaveToFileDefaultDir(fileID)) { + currentScriptFile = userEdited; + ScriptEditorSetClean(); + } + } + + private void exportScriptFileButton_Click(object sender, EventArgs e) { + currentScriptFile.SaveToFileExplorePath(currentScriptFile.ToString(), blindmode: true); + } + + private void importScriptFileButton_Click(object sender, EventArgs e) { + /* Prompt user to select .scr or .bin file */ + OpenFileDialog of = new OpenFileDialog { + Filter = "Script File (*.scr, *.bin)|*.scr;*.bin" + }; + if (of.ShowDialog(this) != DialogResult.OK) { + return; + } + + /* Update scriptFile object in memory */ + int i = selectScriptFileComboBox.SelectedIndex; + string path = Filesystem.GetScriptPath(i); + File.Copy(of.FileName, path, true); + + populate_selectScriptFileComboBox(i); + + /* Refresh controls */ + selectScriptFileComboBox_SelectedIndexChanged(null, null); + + /* Display success message */ + MessageBox.Show("Scripts imported successfully!", "", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + + private void viewLevelScriptButton_Click(object sender, EventArgs e) { + EditorPanels.levelScriptEditor.OpenLevelScriptEditor(this._parent, selectScriptFileComboBox.SelectedIndex); + } + + private void locateCurrentScriptFile_Click(object sender, EventArgs e) { + string path = Filesystem.GetScriptPath(selectScriptFileComboBox.SelectedIndex); + Helpers.ExplorerSelect(path); + } + + private void findNext(SearchManager searchManager) { + searchManager.Find(true, false); + scrollResultToTop(searchManager); + } + + private void findPrev(SearchManager searchManager) { + searchManager.Find(false, false); + scrollResultToTop(searchManager); + } + + private void findCurrent(SearchManager searchManager) { + searchManager.Find(true, true); + scrollResultToTop(searchManager); + } + + private void TxtFindKeyDown(SearchManager searchManager, KeyEventArgs e) { + if (HotKeyManager.IsHotkey(e, Keys.Enter)) { + findNext(searchManager); + } + + if (HotKeyManager.IsHotkey(e, Keys.Enter, true) || HotKeyManager.IsHotkey(e, Keys.Enter, false, true)) { + findPrev(searchManager); + } + } + + private void BtnNextFindScript_Click(object sender, EventArgs e) { + findNext(scriptSearchManager); + } + + private void BtnPrevFindScript_Click(object sender, EventArgs e) { + findPrev(scriptSearchManager); + } + + private void panelFindScriptTextBox_TextChanged(object sender, EventArgs e) { + findCurrent(scriptSearchManager); + } + + private void scriptTxtFind_KeyDown(object sender, KeyEventArgs e) { + TxtFindKeyDown(scriptSearchManager, e); + } + + private void BtnCloseFindScript_Click(object sender, EventArgs e) { + scriptSearchManager.CloseSearch(); + } + + private void BtnNextFindFunc_Click(object sender, EventArgs e) { + findNext(functionSearchManager); + } + + private void BtnPrevFindFunc_Click(object sender, EventArgs e) { + findNext(functionSearchManager); + } + + private void panelFindFunctionTextBox_TextChanged(object sender, EventArgs e) { + findNext(functionSearchManager); + } + + private void functionTxtFind_KeyDown(object sender, KeyEventArgs e) { + TxtFindKeyDown(functionSearchManager, e); + } + + private void BtnCloseFindFunc_Click(object sender, EventArgs e) { + functionSearchManager.CloseSearch(); + } + + private void BtnNextFindActions_Click(object sender, EventArgs e) { + findNext(actionSearchManager); + } + + private void BtnPrevFindActions_Click(object sender, EventArgs e) { + findNext(actionSearchManager); + } + + private void panelFindActionTextBox_TextChanged(object sender, EventArgs e) { + findNext(actionSearchManager); + } + + private void actionTxtFind_KeyDown(object sender, KeyEventArgs e) { + TxtFindKeyDown(actionSearchManager, e); + } + + private void BtnCloseFindActions_Click(object sender, EventArgs e) { + actionSearchManager.CloseSearch(); + } + + void scrollResultToTop(SearchManager searchManager) { + int resultStart = searchManager.textAreaScintilla.CurrentLine - ScriptEditorSearchResult.ResultsPadding; + searchManager.textAreaScintilla.FirstVisibleLine = resultStart; + } + + private void NavigatorGoTo(ListBox listBox, TabPage tabPage, SearchManager searchManager, ScriptFile.ContainerTypes containerType) { + if (listBox.SelectedIndex < 0) { + return; + } + + scriptEditorTabControl.SelectedTab = tabPage; + int commandNumber = listBox.SelectedIndex + 1; + string CommandBlockOpen = $"{containerType} {commandNumber}:"; + searchManager.Find(true, false, CommandBlockOpen); + + scrollResultToTop(searchManager); + } + + private void scriptsNavListbox_SelectedIndexChanged(object sender, EventArgs e) { + NavigatorGoTo((ListBox)sender, scriptsTabPage, scriptSearchManager, ScriptFile.ContainerTypes.Script); + } + + private void functionsNavListbox_SelectedIndexChanged(object sender, EventArgs e) { + NavigatorGoTo((ListBox)sender, functionsTabPage, functionSearchManager, ScriptFile.ContainerTypes.Function); + } + + private void actionsNavListbox_SelectedIndexChanged(object sender, EventArgs e) { + NavigatorGoTo((ListBox)sender, actionsTabPage, actionSearchManager, ScriptFile.ContainerTypes.Action); + } + + private void openFindScriptEditorButton_Click(object sender, EventArgs e) { + currentSearchManager.OpenSearch(); + } + + private void ScriptEditorExpandButton_Click(object sender, EventArgs e) { + currentScintillaEditor.FoldAll(FoldAction.Expand); + } + + private void ScriptEditorCollapseButton_Click(object sender, EventArgs e) { + currentScintillaEditor.FoldAll(FoldAction.Contract); + } + + private void scriptEditorWordWrapCheckbox_CheckedChanged(object sender, EventArgs e) { + ScriptTextArea.WrapMode = scriptEditorWordWrapCheckbox.Checked ? WrapMode.Word : WrapMode.None; + FunctionTextArea.WrapMode = scriptEditorWordWrapCheckbox.Checked ? WrapMode.Word : WrapMode.None; + ActionTextArea.WrapMode = scriptEditorWordWrapCheckbox.Checked ? WrapMode.Word : WrapMode.None; + } + + private void viewWhiteSpacesButton_Click(object sender, EventArgs e) { + ScriptTextArea.ViewWhitespace = scriptEditorWhitespacesCheckbox.Checked ? WhitespaceMode.VisibleAlways : WhitespaceMode.Invisible; + FunctionTextArea.ViewWhitespace = scriptEditorWhitespacesCheckbox.Checked ? WhitespaceMode.VisibleAlways : WhitespaceMode.Invisible; + ActionTextArea.ViewWhitespace = scriptEditorWhitespacesCheckbox.Checked ? WhitespaceMode.VisibleAlways : WhitespaceMode.Invisible; + } + + private void searchInScriptsTextBox_KeyDown(object sender, KeyEventArgs e) { + if (e.KeyCode == Keys.Enter) { + searchInScriptsButton_Click(null, null); + } + } + + public List getScriptsToSearch() { + List scriptsToSearch = new List(); + + if (searchOnlyCurrentScriptCheckBox.Checked) { + this.UIThread(() => { + searchProgressBar.Maximum = 1; + }); + int i = selectScriptFileComboBox.SelectedIndex; + ScriptFile scriptFile = new ScriptFile(i); + Console.WriteLine("Attempting to load script " + scriptFile.fileID); + scriptsToSearch.Add(scriptFile); + this.UIThread(() => { + searchProgressBar.IncrementNoAnimation(); + }); + } + else { + this.UIThread(() => { + searchProgressBar.Maximum = selectScriptFileComboBox.Items.Count; + }); + for (int i = 0; i < selectScriptFileComboBox.Items.Count; i++) { + ScriptFile scriptFile = new ScriptFile(i); + Console.WriteLine("Attempting to load script " + scriptFile.fileID); + scriptsToSearch.Add(scriptFile); + this.UIThread(() => { + searchProgressBar.IncrementNoAnimation(); + }); + } + } + + return scriptsToSearch; + } + + private void searchInScriptsButton_Click(object sender, EventArgs e) { + if (searchInScriptsTextBox.Text == "") { + return; + } + + BackgroundWorker bw = new BackgroundWorker(); + bw.DoWork += (_sender, args) => { + this.UIThread(() => { + searchInScriptsResultListBox.Items.Clear(); + searchProgressBar.Value = 0; + }); + + List scriptsToSearch = getScriptsToSearch(); + + string searchString = searchInScriptsTextBox.Text; + Func searchCriteriaCS = (string s) => s.IndexOf(searchString, StringComparison.InvariantCulture) >= 0; + Func searchCriteriaCI = (string s) => s.IndexOf(searchString, StringComparison.InvariantCultureIgnoreCase) >= 0; + Func searchCriteria = scriptSearchCaseSensitiveCheckBox.Checked ? searchCriteriaCS : searchCriteriaCI; + + List results = new List(); + foreach (ScriptFile scriptFile in scriptsToSearch) { + List scriptResults = SearchInScripts(scriptFile, scriptFile.allScripts, searchCriteria); + List functionResults = SearchInScripts(scriptFile, scriptFile.allFunctions, searchCriteria); + // List actionResults = SearchInScripts(scriptFile, scriptFile.allActions, searchCriteria); + results.AddRange(scriptResults); + results.AddRange(functionResults); + // results.AddRange(actionResults); + } + + this.UIThread(() => { + searchInScriptsResultListBox.Items.AddRange(results.ToArray()); + searchProgressBar.Value = 0; + }); + }; + + bw.RunWorkerAsync(); + } + + private List SearchInScripts(ScriptFile scriptFile, List commandContainers, Func criteria) { + List results = new List(); + + for (int j = 0; j < commandContainers.Count; j++) { + if (commandContainers[j].commands is null) { + continue; + } + + ScriptCommandContainer scriptCommandContainer = commandContainers[j]; + foreach (ScriptCommand scriptCommand in scriptCommandContainer.commands) { + if (criteria(scriptCommand.name)) { + results.Add(new ScriptEditorSearchResult(scriptFile, scriptCommandContainer.containerType, j + 1, scriptCommand)); + } + } + } + + return results; + } + + private void searchInScriptsResultListBox_KeyDown(object sender, KeyEventArgs e) { + if (e.KeyCode == Keys.Enter) { + goToSearchResult(); + } + } + + private void searchInScripts_GoToEntryResult(object sender, MouseEventArgs e) { + goToSearchResult(); + } + + private void goToSearchResult() { + if (searchInScriptsResultListBox.SelectedItem == null) return; + + ScriptEditorSearchResult searchResult = (ScriptEditorSearchResult)searchInScriptsResultListBox.SelectedItem; + ScriptFile scriptFile = searchResult.scriptFile; + ScriptFile.ContainerTypes containerType = searchResult.containerType; + + selectScriptFileComboBox.SelectedIndex = scriptFile.fileID; + + if (containerType == ScriptFile.ContainerTypes.Script) { + displaySearchResult(scriptsTabPage, scriptSearchManager, searchResult); + } + else if (containerType == ScriptFile.ContainerTypes.Function) { + displaySearchResult(functionsTabPage, functionSearchManager, searchResult); + } + else if (containerType == ScriptFile.ContainerTypes.Action) { + displaySearchResult(actionsTabPage, actionSearchManager, searchResult); + } + } + + private void displaySearchResult(TabPage tabPage, SearchManager searchManager, ScriptEditorSearchResult searchResult) { + if (scriptEditorTabControl.SelectedTab != tabPage) { + scriptEditorTabControl.SelectedTab = tabPage; + } + + searchManager.Find(true, false, searchResult.CommandBlockOpen); + int blockStart = searchManager.textAreaScintilla.CurrentLine - ScriptEditorSearchResult.ResultsPadding; + + searchManager.Find(true, false, searchResult.scriptCommand.name); + int resultStart = searchManager.textAreaScintilla.CurrentLine - ScriptEditorSearchResult.ResultsPadding; + + if (scrollToBlockStartcheckBox.Checked) { + searchManager.textAreaScintilla.FirstVisibleLine = blockStart; + } + else { + searchManager.textAreaScintilla.FirstVisibleLine = resultStart; + } + } + } + + public class ScriptEditorSearchResult { + public readonly ScriptFile scriptFile; + public readonly ScriptFile.ContainerTypes containerType; + public readonly int commandNumber; + public readonly ScriptCommand scriptCommand; + + public const int ResultsPadding = 1; + + public ScriptEditorSearchResult(ScriptFile scriptFile, ScriptFile.ContainerTypes containerType, int commandNumber, ScriptCommand scriptCommand) { + this.scriptFile = scriptFile; + this.containerType = containerType; + this.commandNumber = commandNumber; + this.scriptCommand = scriptCommand; + } + + public string CommandBlockOpen { get { return $"{containerType} {commandNumber}:"; } } + + public override string ToString() { + return $"File {scriptFile.fileID} - {CommandBlockOpen} {scriptCommand.name}"; + } + } +} diff --git a/DS_Map/Editors/ScriptEditor.resx b/DS_Map/Editors/ScriptEditor.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/DS_Map/Editors/ScriptEditor.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/ExtensionMethods.cs b/DS_Map/ExtensionMethods.cs new file mode 100644 index 0000000..b306b5a --- /dev/null +++ b/DS_Map/ExtensionMethods.cs @@ -0,0 +1,71 @@ +using System; +using System.Windows.Forms; + +namespace DSPRE { + public static class ExtensionMethods { + /// + /// Increment the progress bar value, without using Windows Aero animation + /// + public static void IncrementNoAnimation(this ProgressBar pb, int amount = 1) { + pb.Value += amount; + if (pb.Value != pb.Maximum) pb.Value++; + pb.Value--; + } + + //https://stackoverflow.com/a/10939890 + /// + /// Sets the progress bar value, without using Windows Aero animation + /// + public static void SetProgressNoAnimation(this ProgressBar pb, int value) { + // Don't redraw if nothing is changing. + if (value == pb.Value) + return; + + // To get around this animation, we need to move the progress bar backwards. + if (value == pb.Maximum) { + // Special case (can't set value > Maximum). + pb.Value = value; // Set the value + pb.Value = value - 1; // Move it backwards + } + else { + pb.Value = value + 1; // Move past + } + + pb.Value = value; // Move to correct value + } + + /* + searchInScriptsButton.BeginInvoke(new Action(() => { + })); + + BackgroundWorker bw = new BackgroundWorker(); + bw.DoWork += (_sender, args) => { + this.UIThread(() => { + }); + }; + + //easier to set up + searchInScriptsButton.BeginInvoke(new Action(() => { + searchProgressBar.Value += 1; + })); + + //smoother if you put the control updates in the UIThread + //same as BeginInvoke if you put the entire logic in UIThread + BackgroundWorker bw = new BackgroundWorker(); + bw.DoWork += (_sender, args) => { + this.UIThread(() => { + searchProgressBar.Value += 1; + }); + }; + bw.RunWorkerAsync(); + */ + public static void UIThread(this Control control, Action code) { + if (control.InvokeRequired) { + control.BeginInvoke(code); + return; + } + + code.Invoke(); + } + } +} diff --git a/DS_Map/Extensions.cs b/DS_Map/Extensions.cs index ee71c01..76d1a9c 100644 --- a/DS_Map/Extensions.cs +++ b/DS_Map/Extensions.cs @@ -7,6 +7,8 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; +using System.ComponentModel; +using Tao.Platform.Windows; namespace DSPRE { public static class Extensions { @@ -142,4 +144,33 @@ namespace DSPRE { } public static Bitmap Resize(this Bitmap source, float factor) => source.Resize((int)(source.Width * factor), (int)(source.Height * factor)); } + + public class ListBox2 : ListBox { + public new void RefreshItem(int index) { + base.RefreshItem(index); + } + } + + public class SimpleOpenGlControl2 : SimpleOpenGlControl { + private bool designMode; + + public SimpleOpenGlControl2() : base() { + designMode = LicenseManager.UsageMode == LicenseUsageMode.Designtime; + } + + public new bool DesignMode { get { return designMode; } } + + protected override void OnPaint(PaintEventArgs e) { + //if the control is allowed to paint in design mode, a message box prevents working with it + //"No device or rendering context available!" + if (DesignMode) { + e.Graphics.Clear(this.BackColor); + if (this.BackgroundImage != null) + e.Graphics.DrawImage(this.BackgroundImage, this.ClientRectangle, 0, 0, this.BackgroundImage.Width, this.BackgroundImage.Height, GraphicsUnit.Pixel); + e.Graphics.Flush(); + return; + }; + base.OnPaint(e); + } + } } diff --git a/DS_Map/Helpers.cs b/DS_Map/Helpers.cs index f6d2aa0..13fa6d0 100644 --- a/DS_Map/Helpers.cs +++ b/DS_Map/Helpers.cs @@ -47,11 +47,11 @@ namespace DSPRE { } public static void DisableHandlers() { - Helpers.DisableHandlers(); + disableHandlers = true; } public static void EnableHandlers() { - Helpers.EnableHandlers(); + disableHandlers = false; } public static void statusLabelMessage(string msg = "Ready") { diff --git a/DS_Map/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs index c684a6a..746d63e 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 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(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle43 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle44 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle45 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle46 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle47 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle48 = 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(); @@ -508,66 +508,6 @@ this.exportEventFileButton = new System.Windows.Forms.Button(); this.importEventFileButton = new System.Windows.Forms.Button(); this.saveEventsButton = new System.Windows.Forms.Button(); - this.scriptEditorTabPage = new System.Windows.Forms.TabPage(); - this.locateCurrentScriptFile = new System.Windows.Forms.Button(); - this.clearCurrentLevelScriptButton = new System.Windows.Forms.Button(); - this.groupBox26 = new System.Windows.Forms.GroupBox(); - this.scriptEditorNumberFormatNoPreference = new System.Windows.Forms.RadioButton(); - this.scriptEditorNumberFormatDecimal = new System.Windows.Forms.RadioButton(); - this.scriptEditorNumberFormatHex = new System.Windows.Forms.RadioButton(); - this.scriptEditorWhitespacesCheckbox = new System.Windows.Forms.CheckBox(); - this.scriptEditorWordWrapCheckbox = new System.Windows.Forms.CheckBox(); - this.compressScriptTextButton = new System.Windows.Forms.Button(); - this.expandScriptTextButton = new System.Windows.Forms.Button(); - this.openSearchScriptEditorButton = new System.Windows.Forms.Button(); - this.groupBox24 = new System.Windows.Forms.GroupBox(); - this.SyncNavigatorCB = new System.Windows.Forms.CheckBox(); - this.ScriptNavigatorTabControl = new System.Windows.Forms.TabControl(); - this.ScriptsNavTab = new System.Windows.Forms.TabPage(); - this.scriptsNavListbox = new System.Windows.Forms.ListBox(); - this.FunctionsNavTab = new System.Windows.Forms.TabPage(); - this.functionsNavListbox = new System.Windows.Forms.ListBox(); - this.ActionsNavTab = new System.Windows.Forms.TabPage(); - this.actionsNavListbox = new System.Windows.Forms.ListBox(); - this.groupBox8 = new System.Windows.Forms.GroupBox(); - this.searchOnlyCurrentScriptCheckBox = new System.Windows.Forms.CheckBox(); - this.scriptSearchCaseSensitiveCheckBox = new System.Windows.Forms.CheckBox(); - this.searchInScriptsTextBox = new System.Windows.Forms.TextBox(); - this.label31 = new System.Windows.Forms.Label(); - this.searchProgressBar = new System.Windows.Forms.ProgressBar(); - this.label30 = new System.Windows.Forms.Label(); - this.label29 = new System.Windows.Forms.Label(); - this.searchInScriptsButton = new System.Windows.Forms.Button(); - this.searchInScriptsResultListBox = new System.Windows.Forms.ListBox(); - this.importScriptFileButton = new System.Windows.Forms.Button(); - this.exportScriptFileButton = new System.Windows.Forms.Button(); - this.saveScriptFileButton = new System.Windows.Forms.Button(); - this.removeScriptFileButton = new System.Windows.Forms.Button(); - this.addScriptFileButton = new System.Windows.Forms.Button(); - this.scriptEditorTabControl = new System.Windows.Forms.TabControl(); - this.scriptsTabPage = new System.Windows.Forms.TabPage(); - this.PanelSearchScripts = new System.Windows.Forms.Panel(); - this.BtnNextSearchScript = new System.Windows.Forms.Button(); - this.BtnPrevSearchScript = new System.Windows.Forms.Button(); - this.BtnCloseSearchScript = new System.Windows.Forms.Button(); - this.panelSearchScriptTextBox = new System.Windows.Forms.TextBox(); - this.scintillaScriptsPanel = new System.Windows.Forms.Panel(); - this.functionsTabPage = new System.Windows.Forms.TabPage(); - this.PanelSearchFunctions = new System.Windows.Forms.Panel(); - this.BtnNextSearchFunc = new System.Windows.Forms.Button(); - this.BtnPrevSearchFunc = new System.Windows.Forms.Button(); - this.BtnCloseSearchFunc = new System.Windows.Forms.Button(); - this.panelSearchFunctionTextBox = new System.Windows.Forms.TextBox(); - this.scintillaFunctionsPanel = new System.Windows.Forms.Panel(); - this.actionsTabPage = new System.Windows.Forms.TabPage(); - this.PanelSearchActions = new System.Windows.Forms.Panel(); - this.BtnNextSearchActions = new System.Windows.Forms.Button(); - this.BtnPrevSearchActions = new System.Windows.Forms.Button(); - this.BtnCloseSearchActions = new System.Windows.Forms.Button(); - this.panelSearchActionTextBox = new System.Windows.Forms.TextBox(); - this.scintillaActionsPanel = new System.Windows.Forms.Panel(); - this.label5 = new System.Windows.Forms.Label(); - this.selectScriptFileComboBox = new System.Windows.Forms.ComboBox(); this.textEditorTabPage = new System.Windows.Forms.TabPage(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.label6 = new System.Windows.Forms.Label(); @@ -834,6 +774,8 @@ this.locationNameConditionalMusicLBL = new System.Windows.Forms.Label(); this.headerConditionalMusicComboBox = new System.Windows.Forms.ComboBox(); this.conditionalMusicTableListBox = new System.Windows.Forms.ListBox(); + this.tabPageScriptEditor = new System.Windows.Forms.TabPage(); + this.tabPageLevelScriptEditor = new System.Windows.Forms.TabPage(); this.mainTabImageList = new System.Windows.Forms.ImageList(this.components); this.gameIcon = new System.Windows.Forms.PictureBox(); this.languageLabel = new System.Windows.Forms.Label(); @@ -906,6 +848,8 @@ this.separator_afterMiscButtons = new System.Windows.Forms.ToolStripSeparator(); this.versionLabel = new System.Windows.Forms.Label(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); + this.scriptEditor = new DSPRE.Editors.ScriptEditor(); + this.levelScriptEditor = new DSPRE.Editors.LevelScriptEditor(); this.mainTabControl.SuspendLayout(); this.headerEditorTabPage.SuspendLayout(); this.worldmapCoordsGroupBox.SuspendLayout(); @@ -1061,21 +1005,6 @@ ((System.ComponentModel.ISupportInitialize)(this.rightClickPicture)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.wheelClickPicture)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.LeftClickPicture)).BeginInit(); - this.scriptEditorTabPage.SuspendLayout(); - this.groupBox26.SuspendLayout(); - this.groupBox24.SuspendLayout(); - this.ScriptNavigatorTabControl.SuspendLayout(); - this.ScriptsNavTab.SuspendLayout(); - this.FunctionsNavTab.SuspendLayout(); - this.ActionsNavTab.SuspendLayout(); - this.groupBox8.SuspendLayout(); - this.scriptEditorTabControl.SuspendLayout(); - this.scriptsTabPage.SuspendLayout(); - this.PanelSearchScripts.SuspendLayout(); - this.functionsTabPage.SuspendLayout(); - this.PanelSearchFunctions.SuspendLayout(); - this.actionsTabPage.SuspendLayout(); - this.PanelSearchActions.SuspendLayout(); this.textEditorTabPage.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); this.LineNumbersFormatgroupBox.SuspendLayout(); @@ -1152,6 +1081,8 @@ this.conditionalMusicGroupBox.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.musicIDconditionalMusicUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.flagConditionalMusicUpDown)).BeginInit(); + this.tabPageScriptEditor.SuspendLayout(); + this.tabPageLevelScriptEditor.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gameIcon)).BeginInit(); this.menuStrip1.SuspendLayout(); this.statusStrip1.SuspendLayout(); @@ -1166,11 +1097,12 @@ this.mainTabControl.Controls.Add(this.mapEditorTabPage); this.mainTabControl.Controls.Add(this.nsbtxEditorTabPage); this.mainTabControl.Controls.Add(this.eventEditorTabPage); - this.mainTabControl.Controls.Add(this.scriptEditorTabPage); this.mainTabControl.Controls.Add(this.textEditorTabPage); this.mainTabControl.Controls.Add(this.cameraEditorTabPage); this.mainTabControl.Controls.Add(this.trainerEditorTabPage); this.mainTabControl.Controls.Add(this.tableEditorTabPage); + this.mainTabControl.Controls.Add(this.tabPageScriptEditor); + this.mainTabControl.Controls.Add(this.tabPageLevelScriptEditor); this.mainTabControl.ImageList = this.mainTabImageList; this.mainTabControl.Location = new System.Drawing.Point(11, 72); this.mainTabControl.Name = "mainTabControl"; @@ -2827,40 +2759,40 @@ this.headersGridView.AllowUserToResizeColumns = false; this.headersGridView.AllowUserToResizeRows = false; this.headersGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - 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; + dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle33.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + dataGridViewCellStyle33.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle33.ForeColor = System.Drawing.SystemColors.Info; + dataGridViewCellStyle33.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle33.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.headersGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle33; this.headersGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - 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; + dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle34.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle34.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle34.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle34.Format = "D4"; + dataGridViewCellStyle34.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle34.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.headersGridView.DefaultCellStyle = dataGridViewCellStyle34; this.headersGridView.Location = new System.Drawing.Point(0, 0); this.headersGridView.MultiSelect = false; this.headersGridView.Name = "headersGridView"; - 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; + dataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle35.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle35.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle35.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle35.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle35.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.headersGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle35; this.headersGridView.RowHeadersWidth = 50; this.headersGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - 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; + dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle36.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.headersGridView.RowsDefaultCellStyle = dataGridViewCellStyle36; this.headersGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.headersGridView.RowTemplate.Height = 18; this.headersGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; @@ -2889,43 +2821,43 @@ this.heightsGridView.AllowUserToDeleteRows = false; this.heightsGridView.AllowUserToResizeColumns = false; this.heightsGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle37; this.heightsGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - 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; + dataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle38.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle38.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle38.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle38.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle38.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle38.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.heightsGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle38; this.heightsGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - 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; + dataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle39.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle39.Font = new System.Drawing.Font("Tahoma", 8.25F); + dataGridViewCellStyle39.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle39.Format = "D2"; + dataGridViewCellStyle39.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle39.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle39.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle39; this.heightsGridView.Location = new System.Drawing.Point(0, 0); this.heightsGridView.MultiSelect = false; this.heightsGridView.Name = "heightsGridView"; - 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; + dataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle40.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle40.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle40.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle40.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle40.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle40.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.heightsGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle40; this.heightsGridView.RowHeadersWidth = 50; this.heightsGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - 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; + dataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle41.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.heightsGridView.RowsDefaultCellStyle = dataGridViewCellStyle41; this.heightsGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.heightsGridView.RowTemplate.Height = 18; this.heightsGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; @@ -2952,43 +2884,43 @@ this.mapFilesGridView.AllowUserToDeleteRows = false; this.mapFilesGridView.AllowUserToResizeColumns = false; this.mapFilesGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle42.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle42; this.mapFilesGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - 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; + dataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle43.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle43.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle43.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle43.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle43.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle43.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.mapFilesGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle43; this.mapFilesGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - 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; + dataGridViewCellStyle44.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle44.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle44.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle44.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle44.Format = "D4"; + dataGridViewCellStyle44.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle44.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle44.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle44; this.mapFilesGridView.Location = new System.Drawing.Point(0, 0); this.mapFilesGridView.MultiSelect = false; this.mapFilesGridView.Name = "mapFilesGridView"; - 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; + dataGridViewCellStyle45.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle45.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle45.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle45.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle45.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle45.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle45.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.mapFilesGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle45; this.mapFilesGridView.RowHeadersWidth = 50; this.mapFilesGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - 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; + dataGridViewCellStyle46.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle46.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.mapFilesGridView.RowsDefaultCellStyle = dataGridViewCellStyle46; this.mapFilesGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.mapFilesGridView.RowTemplate.Height = 18; this.mapFilesGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; @@ -7010,758 +6942,6 @@ this.saveEventsButton.UseVisualStyleBackColor = true; this.saveEventsButton.Click += new System.EventHandler(this.saveEventsButton_Click); // - // scriptEditorTabPage - // - this.scriptEditorTabPage.Controls.Add(this.locateCurrentScriptFile); - this.scriptEditorTabPage.Controls.Add(this.clearCurrentLevelScriptButton); - this.scriptEditorTabPage.Controls.Add(this.groupBox26); - this.scriptEditorTabPage.Controls.Add(this.scriptEditorWhitespacesCheckbox); - this.scriptEditorTabPage.Controls.Add(this.scriptEditorWordWrapCheckbox); - this.scriptEditorTabPage.Controls.Add(this.compressScriptTextButton); - this.scriptEditorTabPage.Controls.Add(this.expandScriptTextButton); - this.scriptEditorTabPage.Controls.Add(this.openSearchScriptEditorButton); - this.scriptEditorTabPage.Controls.Add(this.groupBox24); - this.scriptEditorTabPage.Controls.Add(this.groupBox8); - this.scriptEditorTabPage.Controls.Add(this.importScriptFileButton); - this.scriptEditorTabPage.Controls.Add(this.exportScriptFileButton); - this.scriptEditorTabPage.Controls.Add(this.saveScriptFileButton); - this.scriptEditorTabPage.Controls.Add(this.removeScriptFileButton); - this.scriptEditorTabPage.Controls.Add(this.addScriptFileButton); - this.scriptEditorTabPage.Controls.Add(this.scriptEditorTabControl); - this.scriptEditorTabPage.Controls.Add(this.label5); - this.scriptEditorTabPage.Controls.Add(this.selectScriptFileComboBox); - this.scriptEditorTabPage.ImageIndex = 5; - this.scriptEditorTabPage.Location = new System.Drawing.Point(4, 23); - this.scriptEditorTabPage.Name = "scriptEditorTabPage"; - this.scriptEditorTabPage.Padding = new System.Windows.Forms.Padding(3); - this.scriptEditorTabPage.Size = new System.Drawing.Size(1185, 633); - this.scriptEditorTabPage.TabIndex = 4; - this.scriptEditorTabPage.Text = "Script Editor"; - this.scriptEditorTabPage.UseVisualStyleBackColor = true; - // - // locateCurrentScriptFile - // - this.locateCurrentScriptFile.Image = global::DSPRE.Properties.Resources.open_file; - this.locateCurrentScriptFile.Location = new System.Drawing.Point(429, 29); - this.locateCurrentScriptFile.Name = "locateCurrentScriptFile"; - this.locateCurrentScriptFile.Size = new System.Drawing.Size(42, 40); - this.locateCurrentScriptFile.TabIndex = 63; - this.locateCurrentScriptFile.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.locateCurrentScriptFile.UseVisualStyleBackColor = true; - this.locateCurrentScriptFile.Click += new System.EventHandler(this.locateCurrentScriptFile_Click); - // - // clearCurrentLevelScriptButton - // - this.clearCurrentLevelScriptButton.Image = global::DSPRE.Properties.Resources.destroyLevelScript; - this.clearCurrentLevelScriptButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.clearCurrentLevelScriptButton.Location = new System.Drawing.Point(320, 22); - this.clearCurrentLevelScriptButton.Name = "clearCurrentLevelScriptButton"; - this.clearCurrentLevelScriptButton.Size = new System.Drawing.Size(106, 52); - this.clearCurrentLevelScriptButton.TabIndex = 19; - this.clearCurrentLevelScriptButton.Text = "&Clear This\r\nLevel Script"; - this.clearCurrentLevelScriptButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.clearCurrentLevelScriptButton.UseVisualStyleBackColor = true; - this.clearCurrentLevelScriptButton.Visible = false; - this.clearCurrentLevelScriptButton.Click += new System.EventHandler(this.clearCurrentLevelScriptButton_Click); - // - // groupBox26 - // - this.groupBox26.Controls.Add(this.scriptEditorNumberFormatNoPreference); - this.groupBox26.Controls.Add(this.scriptEditorNumberFormatDecimal); - this.groupBox26.Controls.Add(this.scriptEditorNumberFormatHex); - this.groupBox26.Location = new System.Drawing.Point(693, 4); - this.groupBox26.Name = "groupBox26"; - this.groupBox26.Size = new System.Drawing.Size(190, 36); - this.groupBox26.TabIndex = 50; - this.groupBox26.TabStop = false; - this.groupBox26.Text = "Number Format Preference"; - // - // scriptEditorNumberFormatNoPreference - // - this.scriptEditorNumberFormatNoPreference.AutoSize = true; - this.scriptEditorNumberFormatNoPreference.Checked = true; - this.scriptEditorNumberFormatNoPreference.Location = new System.Drawing.Point(11, 14); - this.scriptEditorNumberFormatNoPreference.Name = "scriptEditorNumberFormatNoPreference"; - this.scriptEditorNumberFormatNoPreference.Size = new System.Drawing.Size(47, 17); - this.scriptEditorNumberFormatNoPreference.TabIndex = 36; - this.scriptEditorNumberFormatNoPreference.TabStop = true; - this.scriptEditorNumberFormatNoPreference.Text = "Auto"; - this.scriptEditorNumberFormatNoPreference.UseVisualStyleBackColor = true; - this.scriptEditorNumberFormatNoPreference.CheckedChanged += new System.EventHandler(this.UpdateScriptNumberFormatNoPref); - // - // scriptEditorNumberFormatDecimal - // - this.scriptEditorNumberFormatDecimal.AutoSize = true; - this.scriptEditorNumberFormatDecimal.Location = new System.Drawing.Point(121, 14); - this.scriptEditorNumberFormatDecimal.Name = "scriptEditorNumberFormatDecimal"; - this.scriptEditorNumberFormatDecimal.Size = new System.Drawing.Size(63, 17); - this.scriptEditorNumberFormatDecimal.TabIndex = 35; - this.scriptEditorNumberFormatDecimal.Text = "Decimal"; - this.scriptEditorNumberFormatDecimal.UseVisualStyleBackColor = true; - this.scriptEditorNumberFormatDecimal.CheckedChanged += new System.EventHandler(this.UpdateScriptNumberFormatDec); - // - // scriptEditorNumberFormatHex - // - this.scriptEditorNumberFormatHex.AutoSize = true; - this.scriptEditorNumberFormatHex.Location = new System.Drawing.Point(68, 14); - this.scriptEditorNumberFormatHex.Name = "scriptEditorNumberFormatHex"; - this.scriptEditorNumberFormatHex.Size = new System.Drawing.Size(44, 17); - this.scriptEditorNumberFormatHex.TabIndex = 34; - this.scriptEditorNumberFormatHex.Text = "Hex"; - this.scriptEditorNumberFormatHex.UseVisualStyleBackColor = true; - this.scriptEditorNumberFormatHex.CheckedChanged += new System.EventHandler(this.UpdateScriptNumberFormatHex); - // - // scriptEditorWhitespacesCheckbox - // - this.scriptEditorWhitespacesCheckbox.Appearance = System.Windows.Forms.Appearance.Button; - this.scriptEditorWhitespacesCheckbox.AutoSize = true; - this.scriptEditorWhitespacesCheckbox.Location = new System.Drawing.Point(987, 12); - this.scriptEditorWhitespacesCheckbox.Name = "scriptEditorWhitespacesCheckbox"; - this.scriptEditorWhitespacesCheckbox.Size = new System.Drawing.Size(79, 23); - this.scriptEditorWhitespacesCheckbox.TabIndex = 46; - this.scriptEditorWhitespacesCheckbox.Text = "Whitespaces"; - this.scriptEditorWhitespacesCheckbox.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.scriptEditorWhitespacesCheckbox.UseVisualStyleBackColor = true; - this.scriptEditorWhitespacesCheckbox.CheckedChanged += new System.EventHandler(this.viewWhiteSpacesButton_Click); - // - // scriptEditorWordWrapCheckbox - // - this.scriptEditorWordWrapCheckbox.Appearance = System.Windows.Forms.Appearance.Button; - this.scriptEditorWordWrapCheckbox.AutoSize = true; - this.scriptEditorWordWrapCheckbox.Checked = true; - this.scriptEditorWordWrapCheckbox.CheckState = System.Windows.Forms.CheckState.Checked; - this.scriptEditorWordWrapCheckbox.Location = new System.Drawing.Point(913, 12); - this.scriptEditorWordWrapCheckbox.Name = "scriptEditorWordWrapCheckbox"; - this.scriptEditorWordWrapCheckbox.Size = new System.Drawing.Size(72, 23); - this.scriptEditorWordWrapCheckbox.TabIndex = 43; - this.scriptEditorWordWrapCheckbox.Text = "Word Wrap"; - this.scriptEditorWordWrapCheckbox.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.scriptEditorWordWrapCheckbox.UseVisualStyleBackColor = true; - this.scriptEditorWordWrapCheckbox.CheckedChanged += new System.EventHandler(this.scriptEditorWordWrapCheckbox_CheckedChanged); - // - // compressScriptTextButton - // - this.compressScriptTextButton.Image = global::DSPRE.Properties.Resources.compressArrow; - this.compressScriptTextButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.compressScriptTextButton.Location = new System.Drawing.Point(1141, 11); - this.compressScriptTextButton.Name = "compressScriptTextButton"; - this.compressScriptTextButton.Size = new System.Drawing.Size(24, 24); - this.compressScriptTextButton.TabIndex = 49; - this.compressScriptTextButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.compressScriptTextButton.UseVisualStyleBackColor = true; - this.compressScriptTextButton.Click += new System.EventHandler(this.ScriptEditorCollapseButton_Click); - // - // expandScriptTextButton - // - this.expandScriptTextButton.Image = global::DSPRE.Properties.Resources.expandArrow; - this.expandScriptTextButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.expandScriptTextButton.Location = new System.Drawing.Point(1113, 11); - this.expandScriptTextButton.Name = "expandScriptTextButton"; - this.expandScriptTextButton.Size = new System.Drawing.Size(24, 24); - this.expandScriptTextButton.TabIndex = 48; - this.expandScriptTextButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.expandScriptTextButton.UseVisualStyleBackColor = true; - this.expandScriptTextButton.Click += new System.EventHandler(this.ScriptEditorExpandButton_Click); - // - // openSearchScriptEditorButton - // - this.openSearchScriptEditorButton.Image = global::DSPRE.Properties.Resources.SearchMiniIcon; - this.openSearchScriptEditorButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.openSearchScriptEditorButton.Location = new System.Drawing.Point(1085, 11); - this.openSearchScriptEditorButton.Name = "openSearchScriptEditorButton"; - this.openSearchScriptEditorButton.Size = new System.Drawing.Size(24, 24); - this.openSearchScriptEditorButton.TabIndex = 47; - this.openSearchScriptEditorButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.openSearchScriptEditorButton.UseVisualStyleBackColor = true; - this.openSearchScriptEditorButton.Click += new System.EventHandler(this.openSearchScriptEditorButton_Click); - // - // groupBox24 - // - this.groupBox24.Controls.Add(this.SyncNavigatorCB); - this.groupBox24.Controls.Add(this.ScriptNavigatorTabControl); - this.groupBox24.Location = new System.Drawing.Point(9, 75); - this.groupBox24.Name = "groupBox24"; - this.groupBox24.Size = new System.Drawing.Size(472, 234); - this.groupBox24.TabIndex = 42; - this.groupBox24.TabStop = false; - this.groupBox24.Text = "Navigator"; - // - // SyncNavigatorCB - // - this.SyncNavigatorCB.Appearance = System.Windows.Forms.Appearance.Button; - this.SyncNavigatorCB.AutoSize = true; - this.SyncNavigatorCB.Checked = true; - this.SyncNavigatorCB.CheckState = System.Windows.Forms.CheckState.Checked; - this.SyncNavigatorCB.Location = new System.Drawing.Point(417, 11); - this.SyncNavigatorCB.Name = "SyncNavigatorCB"; - this.SyncNavigatorCB.Size = new System.Drawing.Size(41, 23); - this.SyncNavigatorCB.TabIndex = 43; - this.SyncNavigatorCB.Text = "Sync"; - this.SyncNavigatorCB.UseVisualStyleBackColor = true; - // - // ScriptNavigatorTabControl - // - this.ScriptNavigatorTabControl.Controls.Add(this.ScriptsNavTab); - this.ScriptNavigatorTabControl.Controls.Add(this.FunctionsNavTab); - this.ScriptNavigatorTabControl.Controls.Add(this.ActionsNavTab); - this.ScriptNavigatorTabControl.Location = new System.Drawing.Point(6, 16); - this.ScriptNavigatorTabControl.Name = "ScriptNavigatorTabControl"; - this.ScriptNavigatorTabControl.SelectedIndex = 0; - this.ScriptNavigatorTabControl.Size = new System.Drawing.Size(456, 209); - this.ScriptNavigatorTabControl.TabIndex = 18; - // - // ScriptsNavTab - // - this.ScriptsNavTab.Controls.Add(this.scriptsNavListbox); - this.ScriptsNavTab.Location = new System.Drawing.Point(4, 22); - this.ScriptsNavTab.Name = "ScriptsNavTab"; - this.ScriptsNavTab.Padding = new System.Windows.Forms.Padding(3); - this.ScriptsNavTab.Size = new System.Drawing.Size(448, 183); - this.ScriptsNavTab.TabIndex = 0; - this.ScriptsNavTab.Text = "Scripts"; - this.ScriptsNavTab.UseVisualStyleBackColor = true; - // - // scriptsNavListbox - // - this.scriptsNavListbox.Dock = System.Windows.Forms.DockStyle.Fill; - this.scriptsNavListbox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.scriptsNavListbox.ItemHeight = 15; - this.scriptsNavListbox.Location = new System.Drawing.Point(3, 3); - this.scriptsNavListbox.Name = "scriptsNavListbox"; - this.scriptsNavListbox.Size = new System.Drawing.Size(442, 177); - this.scriptsNavListbox.TabIndex = 18; - this.scriptsNavListbox.SelectedIndexChanged += new System.EventHandler(this.scriptsNavListbox_SelectedIndexChanged); - // - // FunctionsNavTab - // - this.FunctionsNavTab.Controls.Add(this.functionsNavListbox); - this.FunctionsNavTab.Location = new System.Drawing.Point(4, 22); - this.FunctionsNavTab.Name = "FunctionsNavTab"; - this.FunctionsNavTab.Padding = new System.Windows.Forms.Padding(3); - this.FunctionsNavTab.Size = new System.Drawing.Size(448, 183); - this.FunctionsNavTab.TabIndex = 1; - this.FunctionsNavTab.Text = "Functions"; - this.FunctionsNavTab.UseVisualStyleBackColor = true; - // - // functionsNavListbox - // - this.functionsNavListbox.Dock = System.Windows.Forms.DockStyle.Fill; - this.functionsNavListbox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.functionsNavListbox.ItemHeight = 15; - this.functionsNavListbox.Location = new System.Drawing.Point(3, 3); - this.functionsNavListbox.Name = "functionsNavListbox"; - this.functionsNavListbox.Size = new System.Drawing.Size(442, 177); - this.functionsNavListbox.TabIndex = 19; - this.functionsNavListbox.SelectedIndexChanged += new System.EventHandler(this.functionsNavListbox_SelectedIndexChanged); - // - // ActionsNavTab - // - this.ActionsNavTab.Controls.Add(this.actionsNavListbox); - this.ActionsNavTab.Location = new System.Drawing.Point(4, 22); - this.ActionsNavTab.Name = "ActionsNavTab"; - this.ActionsNavTab.Padding = new System.Windows.Forms.Padding(3); - this.ActionsNavTab.Size = new System.Drawing.Size(448, 183); - this.ActionsNavTab.TabIndex = 2; - this.ActionsNavTab.Text = "Actions"; - this.ActionsNavTab.UseVisualStyleBackColor = true; - // - // actionsNavListbox - // - this.actionsNavListbox.Dock = System.Windows.Forms.DockStyle.Fill; - this.actionsNavListbox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.actionsNavListbox.ItemHeight = 15; - this.actionsNavListbox.Location = new System.Drawing.Point(3, 3); - this.actionsNavListbox.Name = "actionsNavListbox"; - this.actionsNavListbox.Size = new System.Drawing.Size(442, 177); - this.actionsNavListbox.TabIndex = 19; - this.actionsNavListbox.SelectedIndexChanged += new System.EventHandler(this.actionsNavListbox_SelectedIndexChanged); - // - // groupBox8 - // - this.groupBox8.Controls.Add(this.searchOnlyCurrentScriptCheckBox); - this.groupBox8.Controls.Add(this.scriptSearchCaseSensitiveCheckBox); - this.groupBox8.Controls.Add(this.searchInScriptsTextBox); - this.groupBox8.Controls.Add(this.label31); - this.groupBox8.Controls.Add(this.searchProgressBar); - this.groupBox8.Controls.Add(this.label30); - this.groupBox8.Controls.Add(this.label29); - this.groupBox8.Controls.Add(this.searchInScriptsButton); - this.groupBox8.Controls.Add(this.searchInScriptsResultListBox); - this.groupBox8.Location = new System.Drawing.Point(8, 315); - this.groupBox8.Name = "groupBox8"; - this.groupBox8.Size = new System.Drawing.Size(472, 298); - this.groupBox8.TabIndex = 18; - this.groupBox8.TabStop = false; - this.groupBox8.Text = "Search for commands:"; - // - // searchOnlyCurrentScriptCheckBox - // - this.searchOnlyCurrentScriptCheckBox.AutoSize = true; - this.searchOnlyCurrentScriptCheckBox.Location = new System.Drawing.Point(281, 48); - this.searchOnlyCurrentScriptCheckBox.Name = "searchOnlyCurrentScriptCheckBox"; - this.searchOnlyCurrentScriptCheckBox.Size = new System.Drawing.Size(84, 17); - this.searchOnlyCurrentScriptCheckBox.TabIndex = 41; - this.searchOnlyCurrentScriptCheckBox.Text = "Only Current"; - this.searchOnlyCurrentScriptCheckBox.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.searchOnlyCurrentScriptCheckBox.UseVisualStyleBackColor = true; - // - // scriptSearchCaseSensitiveCheckBox - // - this.scriptSearchCaseSensitiveCheckBox.AutoSize = true; - this.scriptSearchCaseSensitiveCheckBox.Location = new System.Drawing.Point(281, 26); - this.scriptSearchCaseSensitiveCheckBox.Name = "scriptSearchCaseSensitiveCheckBox"; - this.scriptSearchCaseSensitiveCheckBox.Size = new System.Drawing.Size(83, 17); - this.scriptSearchCaseSensitiveCheckBox.TabIndex = 39; - this.scriptSearchCaseSensitiveCheckBox.Text = "Match Case"; - this.scriptSearchCaseSensitiveCheckBox.UseVisualStyleBackColor = true; - // - // searchInScriptsTextBox - // - this.searchInScriptsTextBox.Location = new System.Drawing.Point(11, 35); - this.searchInScriptsTextBox.Name = "searchInScriptsTextBox"; - this.searchInScriptsTextBox.Size = new System.Drawing.Size(255, 20); - this.searchInScriptsTextBox.TabIndex = 38; - this.searchInScriptsTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.searchInScriptsTextBox_KeyDown); - // - // label31 - // - this.label31.AutoSize = true; - this.label31.Location = new System.Drawing.Point(7, 248); - this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(48, 13); - this.label31.TabIndex = 37; - this.label31.Text = "Progress"; - // - // searchProgressBar - // - this.searchProgressBar.Location = new System.Drawing.Point(9, 264); - this.searchProgressBar.Name = "searchProgressBar"; - this.searchProgressBar.Size = new System.Drawing.Size(453, 23); - this.searchProgressBar.TabIndex = 36; - // - // label30 - // - this.label30.AutoSize = true; - this.label30.Location = new System.Drawing.Point(7, 63); - this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(42, 13); - this.label30.TabIndex = 35; - this.label30.Text = "Results"; - // - // label29 - // - this.label29.AutoSize = true; - this.label29.Location = new System.Drawing.Point(8, 18); - this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(77, 13); - this.label29.TabIndex = 33; - this.label29.Text = "Line to search:"; - // - // searchInScriptsButton - // - this.searchInScriptsButton.Image = global::DSPRE.Properties.Resources.SearchMiniIcon; - this.searchInScriptsButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.searchInScriptsButton.Location = new System.Drawing.Point(371, 26); - this.searchInScriptsButton.Name = "searchInScriptsButton"; - this.searchInScriptsButton.Size = new System.Drawing.Size(91, 36); - this.searchInScriptsButton.TabIndex = 32; - this.searchInScriptsButton.Text = "Search"; - this.searchInScriptsButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.searchInScriptsButton.UseVisualStyleBackColor = true; - this.searchInScriptsButton.Click += new System.EventHandler(this.searchInScriptsButton_Click); - // - // searchInScriptsResultListBox - // - this.searchInScriptsResultListBox.Location = new System.Drawing.Point(10, 79); - this.searchInScriptsResultListBox.Name = "searchInScriptsResultListBox"; - this.searchInScriptsResultListBox.Size = new System.Drawing.Size(452, 160); - this.searchInScriptsResultListBox.TabIndex = 17; - this.searchInScriptsResultListBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.searchInScriptsResultListBox_KeyDown); - this.searchInScriptsResultListBox.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.searchInScripts_GoToEntryResult); - // - // importScriptFileButton - // - this.importScriptFileButton.Image = global::DSPRE.Properties.Resources.importArrow; - this.importScriptFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.importScriptFileButton.Location = new System.Drawing.Point(170, 22); - this.importScriptFileButton.Name = "importScriptFileButton"; - this.importScriptFileButton.Size = new System.Drawing.Size(70, 52); - this.importScriptFileButton.TabIndex = 16; - this.importScriptFileButton.Text = "&Import\r\nFile"; - this.importScriptFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.importScriptFileButton.UseVisualStyleBackColor = true; - this.importScriptFileButton.Click += new System.EventHandler(this.importScriptFileButton_Click); - // - // exportScriptFileButton - // - this.exportScriptFileButton.Image = global::DSPRE.Properties.Resources.exportArrow; - this.exportScriptFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.exportScriptFileButton.Location = new System.Drawing.Point(245, 22); - this.exportScriptFileButton.Name = "exportScriptFileButton"; - this.exportScriptFileButton.Size = new System.Drawing.Size(70, 52); - this.exportScriptFileButton.TabIndex = 15; - this.exportScriptFileButton.Text = "&Export \r\nFile"; - this.exportScriptFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.exportScriptFileButton.UseVisualStyleBackColor = true; - this.exportScriptFileButton.Click += new System.EventHandler(this.exportScriptFileButton_Click); - // - // saveScriptFileButton - // - this.saveScriptFileButton.Image = global::DSPRE.Properties.Resources.saveButton; - this.saveScriptFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.saveScriptFileButton.Location = new System.Drawing.Point(12, 50); - this.saveScriptFileButton.Name = "saveScriptFileButton"; - this.saveScriptFileButton.Size = new System.Drawing.Size(154, 23); - this.saveScriptFileButton.TabIndex = 14; - this.saveScriptFileButton.Text = "&Save Current File"; - this.saveScriptFileButton.UseVisualStyleBackColor = true; - this.saveScriptFileButton.Click += new System.EventHandler(this.saveScriptFileButton_Click); - // - // removeScriptFileButton - // - this.removeScriptFileButton.Image = global::DSPRE.Properties.Resources.deleteIcon; - this.removeScriptFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeScriptFileButton.Location = new System.Drawing.Point(320, 49); - this.removeScriptFileButton.Name = "removeScriptFileButton"; - this.removeScriptFileButton.Size = new System.Drawing.Size(106, 25); - this.removeScriptFileButton.TabIndex = 13; - this.removeScriptFileButton.Text = "Remove Last"; - this.removeScriptFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.removeScriptFileButton.UseVisualStyleBackColor = true; - this.removeScriptFileButton.Click += new System.EventHandler(this.removeScriptFileButton_Click); - // - // addScriptFileButton - // - this.addScriptFileButton.Image = global::DSPRE.Properties.Resources.addIcon; - this.addScriptFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addScriptFileButton.Location = new System.Drawing.Point(320, 22); - this.addScriptFileButton.Name = "addScriptFileButton"; - this.addScriptFileButton.Size = new System.Drawing.Size(106, 25); - this.addScriptFileButton.TabIndex = 10; - this.addScriptFileButton.Text = "Add Script File"; - this.addScriptFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.addScriptFileButton.UseVisualStyleBackColor = true; - this.addScriptFileButton.Click += new System.EventHandler(this.addScriptFileButton_Click); - // - // scriptEditorTabControl - // - this.scriptEditorTabControl.Controls.Add(this.scriptsTabPage); - this.scriptEditorTabControl.Controls.Add(this.functionsTabPage); - this.scriptEditorTabControl.Controls.Add(this.actionsTabPage); - this.scriptEditorTabControl.Location = new System.Drawing.Point(487, 22); - this.scriptEditorTabControl.Name = "scriptEditorTabControl"; - this.scriptEditorTabControl.SelectedIndex = 0; - this.scriptEditorTabControl.Size = new System.Drawing.Size(692, 591); - this.scriptEditorTabControl.TabIndex = 5; - this.scriptEditorTabControl.SelectedIndexChanged += new System.EventHandler(this.scriptEditorTabControl_TabIndexChanged); - // - // scriptsTabPage - // - this.scriptsTabPage.Controls.Add(this.PanelSearchScripts); - this.scriptsTabPage.Controls.Add(this.scintillaScriptsPanel); - this.scriptsTabPage.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.scriptsTabPage.Location = new System.Drawing.Point(4, 22); - this.scriptsTabPage.Name = "scriptsTabPage"; - this.scriptsTabPage.Padding = new System.Windows.Forms.Padding(3); - this.scriptsTabPage.Size = new System.Drawing.Size(684, 565); - this.scriptsTabPage.TabIndex = 0; - this.scriptsTabPage.Text = "Scripts"; - this.scriptsTabPage.UseVisualStyleBackColor = true; - // - // PanelSearchScripts - // - this.PanelSearchScripts.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.PanelSearchScripts.BackColor = System.Drawing.Color.White; - this.PanelSearchScripts.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.PanelSearchScripts.Controls.Add(this.BtnNextSearchScript); - this.PanelSearchScripts.Controls.Add(this.BtnPrevSearchScript); - this.PanelSearchScripts.Controls.Add(this.BtnCloseSearchScript); - this.PanelSearchScripts.Controls.Add(this.panelSearchScriptTextBox); - this.PanelSearchScripts.Location = new System.Drawing.Point(386, 3); - this.PanelSearchScripts.Name = "PanelSearchScripts"; - this.PanelSearchScripts.Size = new System.Drawing.Size(292, 40); - this.PanelSearchScripts.TabIndex = 14; - this.PanelSearchScripts.Visible = false; - // - // BtnNextSearchScript - // - this.BtnNextSearchScript.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.BtnNextSearchScript.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.BtnNextSearchScript.ForeColor = System.Drawing.Color.White; - this.BtnNextSearchScript.Image = global::DSPRE.Properties.Resources.arrowdown; - this.BtnNextSearchScript.Location = new System.Drawing.Point(233, 4); - this.BtnNextSearchScript.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.BtnNextSearchScript.Name = "BtnNextSearchScript"; - this.BtnNextSearchScript.Size = new System.Drawing.Size(25, 30); - this.BtnNextSearchScript.TabIndex = 9; - this.BtnNextSearchScript.Tag = "Find next (Enter)"; - this.BtnNextSearchScript.UseVisualStyleBackColor = true; - this.BtnNextSearchScript.Click += new System.EventHandler(this.BtnNextSearchScript_Click); - // - // BtnPrevSearchScript - // - this.BtnPrevSearchScript.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.BtnPrevSearchScript.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.BtnPrevSearchScript.ForeColor = System.Drawing.Color.White; - this.BtnPrevSearchScript.Image = global::DSPRE.Properties.Resources.arrowup; - this.BtnPrevSearchScript.Location = new System.Drawing.Point(205, 4); - this.BtnPrevSearchScript.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.BtnPrevSearchScript.Name = "BtnPrevSearchScript"; - this.BtnPrevSearchScript.Size = new System.Drawing.Size(25, 30); - this.BtnPrevSearchScript.TabIndex = 8; - this.BtnPrevSearchScript.Tag = "Find previous (Shift+Enter)"; - this.BtnPrevSearchScript.UseVisualStyleBackColor = true; - this.BtnPrevSearchScript.Click += new System.EventHandler(this.BtnPrevSearchScript_Click); - // - // BtnCloseSearchScript - // - this.BtnCloseSearchScript.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.BtnCloseSearchScript.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.BtnCloseSearchScript.ForeColor = System.Drawing.Color.White; - this.BtnCloseSearchScript.Image = global::DSPRE.Properties.Resources.Cross; - this.BtnCloseSearchScript.Location = new System.Drawing.Point(261, 4); - this.BtnCloseSearchScript.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.BtnCloseSearchScript.Name = "BtnCloseSearchScript"; - this.BtnCloseSearchScript.Size = new System.Drawing.Size(25, 30); - this.BtnCloseSearchScript.TabIndex = 7; - this.BtnCloseSearchScript.Tag = "Close (Esc)"; - this.BtnCloseSearchScript.UseVisualStyleBackColor = true; - this.BtnCloseSearchScript.Click += new System.EventHandler(this.BtnCloseSearchScript_Click); - // - // panelSearchScriptTextBox - // - this.panelSearchScriptTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.panelSearchScriptTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.panelSearchScriptTextBox.Font = new System.Drawing.Font("Segoe UI", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.panelSearchScriptTextBox.Location = new System.Drawing.Point(10, 6); - this.panelSearchScriptTextBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.panelSearchScriptTextBox.Name = "panelSearchScriptTextBox"; - this.panelSearchScriptTextBox.Size = new System.Drawing.Size(189, 25); - this.panelSearchScriptTextBox.TabIndex = 6; - this.panelSearchScriptTextBox.TextChanged += new System.EventHandler(this.panelSearchScriptTextBox_TextChanged); - this.panelSearchScriptTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.scriptTxtSearch_KeyDown); - // - // scintillaScriptsPanel - // - this.scintillaScriptsPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.scintillaScriptsPanel.Location = new System.Drawing.Point(3, 3); - this.scintillaScriptsPanel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.scintillaScriptsPanel.Name = "scintillaScriptsPanel"; - this.scintillaScriptsPanel.Size = new System.Drawing.Size(678, 559); - this.scintillaScriptsPanel.TabIndex = 13; - // - // functionsTabPage - // - this.functionsTabPage.Controls.Add(this.PanelSearchFunctions); - this.functionsTabPage.Controls.Add(this.scintillaFunctionsPanel); - this.functionsTabPage.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.functionsTabPage.Location = new System.Drawing.Point(4, 22); - this.functionsTabPage.Name = "functionsTabPage"; - this.functionsTabPage.Padding = new System.Windows.Forms.Padding(3); - this.functionsTabPage.Size = new System.Drawing.Size(684, 565); - this.functionsTabPage.TabIndex = 1; - this.functionsTabPage.Text = "Functions"; - this.functionsTabPage.UseVisualStyleBackColor = true; - // - // PanelSearchFunctions - // - this.PanelSearchFunctions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.PanelSearchFunctions.BackColor = System.Drawing.Color.White; - this.PanelSearchFunctions.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.PanelSearchFunctions.Controls.Add(this.BtnNextSearchFunc); - this.PanelSearchFunctions.Controls.Add(this.BtnPrevSearchFunc); - this.PanelSearchFunctions.Controls.Add(this.BtnCloseSearchFunc); - this.PanelSearchFunctions.Controls.Add(this.panelSearchFunctionTextBox); - this.PanelSearchFunctions.Location = new System.Drawing.Point(386, 3); - this.PanelSearchFunctions.Name = "PanelSearchFunctions"; - this.PanelSearchFunctions.Size = new System.Drawing.Size(292, 40); - this.PanelSearchFunctions.TabIndex = 16; - this.PanelSearchFunctions.Visible = false; - // - // BtnNextSearchFunc - // - this.BtnNextSearchFunc.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.BtnNextSearchFunc.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.BtnNextSearchFunc.ForeColor = System.Drawing.Color.White; - this.BtnNextSearchFunc.Image = global::DSPRE.Properties.Resources.arrowdown; - this.BtnNextSearchFunc.Location = new System.Drawing.Point(233, 4); - this.BtnNextSearchFunc.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.BtnNextSearchFunc.Name = "BtnNextSearchFunc"; - this.BtnNextSearchFunc.Size = new System.Drawing.Size(25, 30); - this.BtnNextSearchFunc.TabIndex = 9; - this.BtnNextSearchFunc.Tag = "Find next (Enter)"; - this.BtnNextSearchFunc.UseVisualStyleBackColor = true; - this.BtnNextSearchFunc.Click += new System.EventHandler(this.BtnNextSearchFunc_Click); - // - // BtnPrevSearchFunc - // - this.BtnPrevSearchFunc.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.BtnPrevSearchFunc.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.BtnPrevSearchFunc.ForeColor = System.Drawing.Color.White; - this.BtnPrevSearchFunc.Image = global::DSPRE.Properties.Resources.arrowup; - this.BtnPrevSearchFunc.Location = new System.Drawing.Point(205, 4); - this.BtnPrevSearchFunc.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.BtnPrevSearchFunc.Name = "BtnPrevSearchFunc"; - this.BtnPrevSearchFunc.Size = new System.Drawing.Size(25, 30); - this.BtnPrevSearchFunc.TabIndex = 8; - this.BtnPrevSearchFunc.Tag = "Find previous (Shift+Enter)"; - this.BtnPrevSearchFunc.UseVisualStyleBackColor = true; - this.BtnPrevSearchFunc.Click += new System.EventHandler(this.BtnPrevSearchFunc_Click); - // - // BtnCloseSearchFunc - // - this.BtnCloseSearchFunc.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.BtnCloseSearchFunc.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.BtnCloseSearchFunc.ForeColor = System.Drawing.Color.White; - this.BtnCloseSearchFunc.Image = global::DSPRE.Properties.Resources.Cross; - this.BtnCloseSearchFunc.Location = new System.Drawing.Point(261, 4); - this.BtnCloseSearchFunc.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.BtnCloseSearchFunc.Name = "BtnCloseSearchFunc"; - this.BtnCloseSearchFunc.Size = new System.Drawing.Size(25, 30); - this.BtnCloseSearchFunc.TabIndex = 7; - this.BtnCloseSearchFunc.Tag = "Close (Esc)"; - this.BtnCloseSearchFunc.UseVisualStyleBackColor = true; - this.BtnCloseSearchFunc.Click += new System.EventHandler(this.BtnCloseSearchFunc_Click); - // - // panelSearchFunctionTextBox - // - this.panelSearchFunctionTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.panelSearchFunctionTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.panelSearchFunctionTextBox.Font = new System.Drawing.Font("Segoe UI", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.panelSearchFunctionTextBox.Location = new System.Drawing.Point(10, 6); - this.panelSearchFunctionTextBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.panelSearchFunctionTextBox.Name = "panelSearchFunctionTextBox"; - this.panelSearchFunctionTextBox.Size = new System.Drawing.Size(189, 25); - this.panelSearchFunctionTextBox.TabIndex = 6; - this.panelSearchFunctionTextBox.TextChanged += new System.EventHandler(this.panelSearchFunctionTextBox_TextChanged); - this.panelSearchFunctionTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.functionTxtSearch_KeyDown); - // - // scintillaFunctionsPanel - // - this.scintillaFunctionsPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.scintillaFunctionsPanel.Location = new System.Drawing.Point(3, 3); - this.scintillaFunctionsPanel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.scintillaFunctionsPanel.Name = "scintillaFunctionsPanel"; - this.scintillaFunctionsPanel.Size = new System.Drawing.Size(678, 559); - this.scintillaFunctionsPanel.TabIndex = 15; - // - // actionsTabPage - // - this.actionsTabPage.Controls.Add(this.PanelSearchActions); - this.actionsTabPage.Controls.Add(this.scintillaActionsPanel); - this.actionsTabPage.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.actionsTabPage.Location = new System.Drawing.Point(4, 22); - this.actionsTabPage.Name = "actionsTabPage"; - this.actionsTabPage.Padding = new System.Windows.Forms.Padding(3); - this.actionsTabPage.Size = new System.Drawing.Size(684, 565); - this.actionsTabPage.TabIndex = 2; - this.actionsTabPage.Text = "Actions"; - this.actionsTabPage.UseVisualStyleBackColor = true; - // - // PanelSearchActions - // - this.PanelSearchActions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.PanelSearchActions.BackColor = System.Drawing.Color.White; - this.PanelSearchActions.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.PanelSearchActions.Controls.Add(this.BtnNextSearchActions); - this.PanelSearchActions.Controls.Add(this.BtnPrevSearchActions); - this.PanelSearchActions.Controls.Add(this.BtnCloseSearchActions); - this.PanelSearchActions.Controls.Add(this.panelSearchActionTextBox); - this.PanelSearchActions.Location = new System.Drawing.Point(386, 3); - this.PanelSearchActions.Name = "PanelSearchActions"; - this.PanelSearchActions.Size = new System.Drawing.Size(292, 40); - this.PanelSearchActions.TabIndex = 16; - this.PanelSearchActions.Visible = false; - // - // BtnNextSearchActions - // - this.BtnNextSearchActions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.BtnNextSearchActions.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.BtnNextSearchActions.ForeColor = System.Drawing.Color.White; - this.BtnNextSearchActions.Image = global::DSPRE.Properties.Resources.arrowdown; - this.BtnNextSearchActions.Location = new System.Drawing.Point(233, 4); - this.BtnNextSearchActions.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.BtnNextSearchActions.Name = "BtnNextSearchActions"; - this.BtnNextSearchActions.Size = new System.Drawing.Size(25, 30); - this.BtnNextSearchActions.TabIndex = 9; - this.BtnNextSearchActions.Tag = "Find next (Enter)"; - this.BtnNextSearchActions.UseVisualStyleBackColor = true; - this.BtnNextSearchActions.Click += new System.EventHandler(this.BtnNextSearchActions_Click); - // - // BtnPrevSearchActions - // - this.BtnPrevSearchActions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.BtnPrevSearchActions.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.BtnPrevSearchActions.ForeColor = System.Drawing.Color.White; - this.BtnPrevSearchActions.Image = global::DSPRE.Properties.Resources.arrowup; - this.BtnPrevSearchActions.Location = new System.Drawing.Point(205, 4); - this.BtnPrevSearchActions.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.BtnPrevSearchActions.Name = "BtnPrevSearchActions"; - this.BtnPrevSearchActions.Size = new System.Drawing.Size(25, 30); - this.BtnPrevSearchActions.TabIndex = 8; - this.BtnPrevSearchActions.Tag = "Find previous (Shift+Enter)"; - this.BtnPrevSearchActions.UseVisualStyleBackColor = true; - this.BtnPrevSearchActions.Click += new System.EventHandler(this.BtnPrevSearchActions_Click); - // - // BtnCloseSearchActions - // - this.BtnCloseSearchActions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.BtnCloseSearchActions.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.BtnCloseSearchActions.ForeColor = System.Drawing.Color.White; - this.BtnCloseSearchActions.Image = global::DSPRE.Properties.Resources.Cross; - this.BtnCloseSearchActions.Location = new System.Drawing.Point(261, 4); - this.BtnCloseSearchActions.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.BtnCloseSearchActions.Name = "BtnCloseSearchActions"; - this.BtnCloseSearchActions.Size = new System.Drawing.Size(25, 30); - this.BtnCloseSearchActions.TabIndex = 7; - this.BtnCloseSearchActions.Tag = "Close (Esc)"; - this.BtnCloseSearchActions.UseVisualStyleBackColor = true; - this.BtnCloseSearchActions.Click += new System.EventHandler(this.BtnCloseSearchActions_Click); - // - // panelSearchActionTextBox - // - this.panelSearchActionTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.panelSearchActionTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.panelSearchActionTextBox.Font = new System.Drawing.Font("Segoe UI", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.panelSearchActionTextBox.Location = new System.Drawing.Point(10, 6); - this.panelSearchActionTextBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.panelSearchActionTextBox.Name = "panelSearchActionTextBox"; - this.panelSearchActionTextBox.Size = new System.Drawing.Size(189, 25); - this.panelSearchActionTextBox.TabIndex = 6; - this.panelSearchActionTextBox.TextChanged += new System.EventHandler(this.panelSearchActionTextBox_TextChanged); - this.panelSearchActionTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.actiontTxtSearch_KeyDown); - // - // scintillaActionsPanel - // - this.scintillaActionsPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.scintillaActionsPanel.Location = new System.Drawing.Point(3, 3); - this.scintillaActionsPanel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.scintillaActionsPanel.Name = "scintillaActionsPanel"; - this.scintillaActionsPanel.Size = new System.Drawing.Size(678, 559); - this.scintillaActionsPanel.TabIndex = 15; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(11, 8); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(53, 13); - this.label5.TabIndex = 1; - this.label5.Text = "Script File"; - // - // selectScriptFileComboBox - // - this.selectScriptFileComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.selectScriptFileComboBox.FormattingEnabled = true; - this.selectScriptFileComboBox.Location = new System.Drawing.Point(13, 24); - this.selectScriptFileComboBox.Name = "selectScriptFileComboBox"; - this.selectScriptFileComboBox.Size = new System.Drawing.Size(152, 21); - this.selectScriptFileComboBox.TabIndex = 0; - this.selectScriptFileComboBox.SelectedIndexChanged += new System.EventHandler(this.selectScriptFileComboBox_SelectedIndexChanged); - // // textEditorTabPage // this.textEditorTabPage.Controls.Add(this.tableLayoutPanel1); @@ -8147,8 +7327,8 @@ this.textEditorDataGridView.Location = new System.Drawing.Point(12, 77); this.textEditorDataGridView.Name = "textEditorDataGridView"; this.textEditorDataGridView.RowHeadersWidth = 68; - dataGridViewCellStyle15.Font = new System.Drawing.Font("Consolas", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textEditorDataGridView.RowsDefaultCellStyle = dataGridViewCellStyle15; + dataGridViewCellStyle47.Font = new System.Drawing.Font("Consolas", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textEditorDataGridView.RowsDefaultCellStyle = dataGridViewCellStyle47; this.textEditorDataGridView.Size = new System.Drawing.Size(873, 500); this.textEditorDataGridView.TabIndex = 24; this.textEditorDataGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.textEditorDataGridView_CellValueChanged); @@ -8251,9 +7431,9 @@ this.cameraEditorDataGridView.CausesValidation = false; this.cameraEditorDataGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised; this.cameraEditorDataGridView.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - 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; + dataGridViewCellStyle48.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle48.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.cameraEditorDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle48; this.cameraEditorDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.cameraEditorDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.DistanceGVCol, @@ -10868,6 +10048,29 @@ this.conditionalMusicTableListBox.TabIndex = 0; this.conditionalMusicTableListBox.SelectedIndexChanged += new System.EventHandler(this.conditionalMusicTableListBox_SelectedIndexChanged); // + // tabPageScriptEditor + // + this.tabPageScriptEditor.Controls.Add(this.scriptEditor); + this.tabPageScriptEditor.ImageIndex = 5; + this.tabPageScriptEditor.Location = new System.Drawing.Point(4, 23); + this.tabPageScriptEditor.Name = "tabPageScriptEditor"; + this.tabPageScriptEditor.Padding = new System.Windows.Forms.Padding(3); + this.tabPageScriptEditor.Size = new System.Drawing.Size(1185, 633); + this.tabPageScriptEditor.TabIndex = 10; + this.tabPageScriptEditor.Text = "Script Editor New"; + this.tabPageScriptEditor.UseVisualStyleBackColor = true; + // + // tabPageLevelScriptEditor + // + this.tabPageLevelScriptEditor.Controls.Add(this.levelScriptEditor); + this.tabPageLevelScriptEditor.Location = new System.Drawing.Point(4, 23); + this.tabPageLevelScriptEditor.Name = "tabPageLevelScriptEditor"; + this.tabPageLevelScriptEditor.Padding = new System.Windows.Forms.Padding(3); + this.tabPageLevelScriptEditor.Size = new System.Drawing.Size(1185, 633); + this.tabPageLevelScriptEditor.TabIndex = 11; + this.tabPageLevelScriptEditor.Text = "Level Script Editor"; + this.tabPageLevelScriptEditor.UseVisualStyleBackColor = true; + // // mainTabImageList // this.mainTabImageList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("mainTabImageList.ImageStream"))); @@ -11241,16 +10444,16 @@ this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.statusLabel, this.toolStripProgressBar}); - this.statusStrip1.Location = new System.Drawing.Point(0, 737); + this.statusStrip1.Location = new System.Drawing.Point(0, 739); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(1214, 24); + this.statusStrip1.Size = new System.Drawing.Size(1214, 22); this.statusStrip1.TabIndex = 13; this.statusStrip1.Text = "statusStrip1"; // // statusLabel // this.statusLabel.Name = "statusLabel"; - this.statusLabel.Size = new System.Drawing.Size(39, 19); + this.statusLabel.Size = new System.Drawing.Size(39, 17); this.statusLabel.Text = "Ready"; // // toolStripProgressBar @@ -11600,6 +10803,23 @@ this.versionLabel.Text = "ROM:"; this.versionLabel.Visible = false; // + // scriptEditor + // + this.scriptEditor.Location = new System.Drawing.Point(2, 3); + this.scriptEditor.Name = "scriptEditor"; + this.scriptEditor.scriptEditorIsReady = false; + this.scriptEditor.Size = new System.Drawing.Size(1177, 735); + this.scriptEditor.TabIndex = 0; + // + // levelScriptEditor + // + this.levelScriptEditor.BackColor = System.Drawing.SystemColors.Control; + this.levelScriptEditor.levelScriptEditorIsReady = false; + this.levelScriptEditor.Location = new System.Drawing.Point(6, 8); + this.levelScriptEditor.Name = "levelScriptEditor"; + this.levelScriptEditor.Size = new System.Drawing.Size(408, 622); + this.levelScriptEditor.TabIndex = 0; + // // MainProgram // this.AllowDrop = true; @@ -11819,28 +11039,6 @@ ((System.ComponentModel.ISupportInitialize)(this.rightClickPicture)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.wheelClickPicture)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.LeftClickPicture)).EndInit(); - this.scriptEditorTabPage.ResumeLayout(false); - this.scriptEditorTabPage.PerformLayout(); - this.groupBox26.ResumeLayout(false); - this.groupBox26.PerformLayout(); - this.groupBox24.ResumeLayout(false); - this.groupBox24.PerformLayout(); - this.ScriptNavigatorTabControl.ResumeLayout(false); - this.ScriptsNavTab.ResumeLayout(false); - this.FunctionsNavTab.ResumeLayout(false); - this.ActionsNavTab.ResumeLayout(false); - this.groupBox8.ResumeLayout(false); - this.groupBox8.PerformLayout(); - this.scriptEditorTabControl.ResumeLayout(false); - this.scriptsTabPage.ResumeLayout(false); - this.PanelSearchScripts.ResumeLayout(false); - this.PanelSearchScripts.PerformLayout(); - this.functionsTabPage.ResumeLayout(false); - this.PanelSearchFunctions.ResumeLayout(false); - this.PanelSearchFunctions.PerformLayout(); - this.actionsTabPage.ResumeLayout(false); - this.PanelSearchActions.ResumeLayout(false); - this.PanelSearchActions.PerformLayout(); this.textEditorTabPage.ResumeLayout(false); this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); @@ -11936,6 +11134,8 @@ this.conditionalMusicGroupBox.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.musicIDconditionalMusicUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.flagConditionalMusicUpDown)).EndInit(); + this.tabPageScriptEditor.ResumeLayout(false); + this.tabPageLevelScriptEditor.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gameIcon)).EndInit(); this.menuStrip1.ResumeLayout(false); this.menuStrip1.PerformLayout(); @@ -11949,7 +11149,6 @@ } #endregion - private System.Windows.Forms.TabControl mainTabControl; private System.Windows.Forms.TabPage matrixEditorTabPage; private System.Windows.Forms.PictureBox gameIcon; private System.Windows.Forms.Label languageLabel; @@ -12062,7 +11261,6 @@ private System.Windows.Forms.ComboBox selectEventComboBox; private System.Windows.Forms.Label signScriptNumberLabel; private System.Windows.Forms.NumericUpDown spawnableScriptUpDown; - private System.Windows.Forms.TabPage scriptEditorTabPage; private System.Windows.Forms.TabPage textEditorTabPage; private System.Windows.Forms.ListBox warpsListBox; private System.Windows.Forms.ListBox triggersListBox; @@ -12107,17 +11305,6 @@ private System.Windows.Forms.NumericUpDown triggerScriptUpDown; private System.Windows.Forms.Label label28; private System.Windows.Forms.NumericUpDown triggerVariableWatchedUpDown; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.ComboBox selectScriptFileComboBox; - private System.Windows.Forms.TabControl scriptEditorTabControl; - private System.Windows.Forms.TabPage scriptsTabPage; - private System.Windows.Forms.TabPage functionsTabPage; - private System.Windows.Forms.TabPage actionsTabPage; - private System.Windows.Forms.Button addScriptFileButton; - private System.Windows.Forms.Button saveScriptFileButton; - private System.Windows.Forms.Button removeScriptFileButton; - private System.Windows.Forms.Button importScriptFileButton; - private System.Windows.Forms.Button exportScriptFileButton; private System.Windows.Forms.Button removeEventFileButton; private System.Windows.Forms.Button addEventFileButton; private System.Windows.Forms.Button removeMatrixButton; @@ -12141,13 +11328,6 @@ private System.Windows.Forms.CheckBox caseSensitiveTextSearchCheckbox; private System.Windows.Forms.ProgressBar textSearchProgressBar; private System.Windows.Forms.Label label8; - private System.Windows.Forms.ListBox searchInScriptsResultListBox; - private System.Windows.Forms.GroupBox groupBox8; - private System.Windows.Forms.Label label29; - private System.Windows.Forms.Button searchInScriptsButton; - private System.Windows.Forms.Label label30; - private System.Windows.Forms.Label label31; - private System.Windows.Forms.ProgressBar searchProgressBar; private System.Windows.Forms.ToolStripButton wildEditorButton; private System.Windows.Forms.TabPage nsbtxEditorTabPage; private System.Windows.Forms.GroupBox areaDataGroupBox; @@ -12185,7 +11365,6 @@ private System.Windows.Forms.Button addMapFileButton; private System.Windows.Forms.Label replaceTextLabel; private System.Windows.Forms.TextBox replaceMessageTextBox; - private System.Windows.Forms.TextBox searchInScriptsTextBox; private System.Windows.Forms.TabPage headerEditorTabPage; private System.Windows.Forms.GroupBox groupBox10; private System.Windows.Forms.Button openMessageFileButton; @@ -12226,7 +11405,6 @@ private System.Windows.Forms.Label levelScriptLabel; private System.Windows.Forms.Button openScriptButton; private System.Windows.Forms.Label scriptLabel; - private System.Windows.Forms.NumericUpDown scriptFileUpDown; private System.Windows.Forms.ListBox headerListBox; private System.Windows.Forms.Button saveHeaderButton; private System.Windows.Forms.GroupBox groupBox4; @@ -12384,7 +11562,6 @@ private System.Windows.Forms.Button resetColorTableButton; private System.Windows.Forms.Button duplicateBuildingButton; private System.Windows.Forms.Button replaceMapBinButton; - private System.Windows.Forms.CheckBox scriptSearchCaseSensitiveCheckBox; private System.Windows.Forms.GroupBox worldmapCoordsGroupBox; private System.Windows.Forms.Label label1; private System.Windows.Forms.NumericUpDown worldmapYCoordUpDown; @@ -12451,8 +11628,6 @@ private System.Windows.Forms.ToolStripButton nsbmdAddTexButton; private System.Windows.Forms.ToolStripSeparator separator_afterMiscButtons; private System.Windows.Forms.CheckBox embedTexturesInMapModelCheckBox; - private System.Windows.Forms.CheckBox searchOnlyCurrentScriptCheckBox; - private System.Windows.Forms.Button clearCurrentLevelScriptButton; private System.Windows.Forms.GroupBox bldRoundGroupbox; private System.Windows.Forms.RadioButton bldRoundDecmil; private System.Windows.Forms.RadioButton bldRoundMil; @@ -12478,15 +11653,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn ZDispGVCol; private System.Windows.Forms.DataGridViewButtonColumn ExportBTN; private System.Windows.Forms.DataGridViewButtonColumn ImportBTN; - private System.Windows.Forms.GroupBox groupBox24; - private System.Windows.Forms.TabControl ScriptNavigatorTabControl; - private System.Windows.Forms.TabPage ScriptsNavTab; - private System.Windows.Forms.ListBox scriptsNavListbox; - private System.Windows.Forms.TabPage FunctionsNavTab; - private System.Windows.Forms.ListBox functionsNavListbox; - private System.Windows.Forms.TabPage ActionsNavTab; - private System.Windows.Forms.ListBox actionsNavListbox; - private System.Windows.Forms.CheckBox SyncNavigatorCB; private System.Windows.Forms.Button removeLastHeaderBTN; private System.Windows.Forms.Button addHeaderBTN; private System.Windows.Forms.NumericUpDown cameraUpDown; @@ -12675,34 +11841,7 @@ private System.Windows.Forms.NumericUpDown tbEditorTrClassFramePreviewUpDown; private System.Windows.Forms.PictureBox tbEditorPokeminiPictureBox; private System.Windows.Forms.ToolStripMenuItem openFolderToolStripMenuItem; - private System.Windows.Forms.Panel PanelSearchScripts; - private System.Windows.Forms.Button BtnNextSearchScript; - private System.Windows.Forms.Button BtnPrevSearchScript; - private System.Windows.Forms.Button BtnCloseSearchScript; - private System.Windows.Forms.TextBox panelSearchScriptTextBox; - private System.Windows.Forms.Panel scintillaScriptsPanel; - private System.Windows.Forms.Panel PanelSearchFunctions; - private System.Windows.Forms.Button BtnNextSearchFunc; - private System.Windows.Forms.Button BtnPrevSearchFunc; - private System.Windows.Forms.Button BtnCloseSearchFunc; - private System.Windows.Forms.TextBox panelSearchFunctionTextBox; - private System.Windows.Forms.Panel scintillaFunctionsPanel; - private System.Windows.Forms.Panel PanelSearchActions; - private System.Windows.Forms.Button BtnNextSearchActions; - private System.Windows.Forms.Button BtnPrevSearchActions; - private System.Windows.Forms.Button BtnCloseSearchActions; - private System.Windows.Forms.TextBox panelSearchActionTextBox; - private System.Windows.Forms.Panel scintillaActionsPanel; - private System.Windows.Forms.CheckBox scriptEditorWhitespacesCheckbox; - private System.Windows.Forms.CheckBox scriptEditorWordWrapCheckbox; - private System.Windows.Forms.Button openSearchScriptEditorButton; - private System.Windows.Forms.Button compressScriptTextButton; - private System.Windows.Forms.Button expandScriptTextButton; private System.Windows.Forms.Button itemsSelectorHelpBtn; - private System.Windows.Forms.GroupBox groupBox26; - private System.Windows.Forms.RadioButton scriptEditorNumberFormatNoPreference; - private System.Windows.Forms.RadioButton scriptEditorNumberFormatDecimal; - private System.Windows.Forms.RadioButton scriptEditorNumberFormatHex; private System.Windows.Forms.Button deleteTrainerButton; private System.Windows.Forms.Label label67; private System.Windows.Forms.ToolStripMenuItem NarcUtilityToolStripMenuItem; @@ -12747,7 +11886,6 @@ private System.Windows.Forms.Button locateCurrentNsbtx; private System.Windows.Forms.Button locateCurrentAreaData; private System.Windows.Forms.Button locateCurrentEvFile; - private System.Windows.Forms.Button locateCurrentScriptFile; private System.Windows.Forms.Button locateCurrentTextArchive; private System.Windows.Forms.GroupBox groupBox31; private System.Windows.Forms.Label label75; diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index b1b7abc..dd4434b 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -25,11 +25,15 @@ using static DSPRE.ROMFiles.Event; using NSMBe4.NSBMD; using static DSPRE.ROMFiles.SpeciesFile; using System.Reflection; +using System.ComponentModel; +using DSPRE.Editors; namespace DSPRE { public partial class MainProgram : Form { public MainProgram() { InitializeComponent(); + EditorPanels.Initialize(this); + Helpers.Initialize(this); SetMenuLayout(Properties.Settings.Default.menuLayout); //Read user settings for menu layout Text = "DS Pokémon Rom Editor Reloaded " + GetDSPREVersion() + " (Nømura, AdAstra/LD3005, Mixone)"; } @@ -216,14 +220,14 @@ namespace DSPRE { DSUtils.TryUnpackNarcs(new List { DirNames.scripts }); //12 = scripts Narc Dir - selectScriptFileComboBox.Items.Clear(); + EditorPanels.scriptEditor.selectScriptFileComboBox.Items.Clear(); int scriptCount = Directory.GetFiles(RomInfo.gameDirs[DirNames.scripts].unpackedDir).Length; for (int i = 0; i < scriptCount; i++) { - selectScriptFileComboBox.Items.Add("Script File " + i); + EditorPanels.scriptEditor.selectScriptFileComboBox.Items.Add("Script File " + i); } - UpdateScriptNumberCheckBox((NumberStyles)Properties.Settings.Default.scriptEditorFormatPreference); - selectScriptFileComboBox.SelectedIndex = 0; + EditorPanels.scriptEditor.UpdateScriptNumberCheckBox((NumberStyles)Properties.Settings.Default.scriptEditorFormatPreference); + EditorPanels.scriptEditor.selectScriptFileComboBox.SelectedIndex = 0; Helpers.statusLabelMessage(); } private void SetupTextEditor() { @@ -531,6 +535,7 @@ namespace DSPRE { SetupROMLanguage(openRom.FileName); /* Set ROM gameVersion and language */ romInfo = new RomInfo(gameCode, openRom.FileName, useSuffix: true); + Helpers.romInfo = new RomInfo(gameCode, openRom.FileName, useSuffix: true); if (string.IsNullOrWhiteSpace(RomInfo.romID) || string.IsNullOrWhiteSpace(RomInfo.fileName)) { return; @@ -584,7 +589,7 @@ namespace DSPRE { Update(); for (int i = 0; i < 128; i++) { if (DSUtils.OverlayIsCompressed(i)) { - DSUtils.DecompressOverlay(i); + //DSUtils.DecompressOverlay(i); } } ReadROMInitData(); @@ -786,7 +791,6 @@ namespace DSPRE { SetupMapEditor(); SetupNSBTXEditor(); SetupEventEditor(); - SetupScriptEditorTextAreas(); SetupScriptEditor(); SetupTextEditor(); SetupTrainerEditor(); @@ -852,12 +856,6 @@ namespace DSPRE { SetupEventEditor(); eventEditorIsReady = true; } - } else if (mainTabControl.SelectedTab == scriptEditorTabPage) { - if (!scriptEditorIsReady) { - SetupScriptEditorTextAreas(); - SetupScriptEditor(); - scriptEditorIsReady = true; - } } else if (mainTabControl.SelectedTab == textEditorTabPage) { if (!textEditorIsReady) { SetupTextEditor(); @@ -883,6 +881,14 @@ namespace DSPRE { } } + private void tabPageScriptEditor_Enter(object sender, EventArgs e) { + scriptEditor.SetupScriptEditor(this); + } + + private void tabPageLevelScriptEditor_Enter(object sender, EventArgs e) { + levelScriptEditor.SetUpLevelScriptEditor(this); + } + private void spawnEditorToolStripButton_Click(object sender, EventArgs e) { if (!matrixEditorIsReady) { SetupMatrixEditor(); @@ -1375,6 +1381,15 @@ namespace DSPRE { } currentHeader.matrixID = (ushort)matrixUpDown.Value; } + + private void openScriptButton_Click(object sender, EventArgs e) { + EditorPanels.scriptEditor.OpenScriptEditor(this, (int)scriptFileUpDown.Value); + } + + private void openLevelScriptButton_Click(object sender, EventArgs e) { + EditorPanels.levelScriptEditor.OpenLevelScriptEditor(this, (int)levelScriptUpDown.Value); + } + private void musicDayComboBox_SelectedIndexChanged(object sender, EventArgs e) { if (Helpers.HandlersDisabled) { return; @@ -5367,7 +5382,7 @@ namespace DSPRE { } else { ScriptFile itemScript = new ScriptFile(RomInfo.itemScriptFileNumber); owItemComboBox.Items.Clear(); - foreach (CommandContainer cont in itemScript.allScripts) { + foreach (ScriptCommandContainer cont in itemScript.allScripts) { if (cont.commands.Count > 4) { continue; } @@ -6706,967 +6721,6 @@ namespace DSPRE { #endregion #endregion - #region Script Editor - #region Variables - //private static Mutex tooltipMutex = new Mutex(); - //private ScriptTooltip customTooltip; - - private bool scriptsDirty = false; - private bool functionsDirty = false; - private bool actionsDirty = false; - - private string cmdKeyWords = ""; - private string secondaryKeyWords = ""; - private ScriptFile currentScriptFile; - #endregion - #region Helper Methods - private ScintillaNET.Scintilla ScriptTextArea; - private ScintillaNET.Scintilla FunctionTextArea; - private ScintillaNET.Scintilla ActionTextArea; - - private SearchManager scriptSearchManager; - private SearchManager functionSearchManager; - private SearchManager actionSearchManager; - - private Scintilla currentScintillaEditor; - private SearchManager currentSearchManager; - private void ScriptEditorSetClean() { - Helpers.DisableHandlers(); - - scriptsTabPage.Text = ScriptFile.containerTypes.Script.ToString() + "s"; - functionsTabPage.Text = ScriptFile.containerTypes.Function.ToString() + "s"; - actionsTabPage.Text = ScriptFile.containerTypes.Action.ToString() + "s"; - scriptsDirty = functionsDirty = actionsDirty = false; - - Helpers.EnableHandlers(); - } - private void scriptEditorTabControl_TabIndexChanged(object sender, EventArgs e) { - if (scriptEditorTabControl.SelectedTab == scriptsTabPage) { - currentSearchManager = scriptSearchManager; - currentScintillaEditor = ScriptTextArea; - } else if (scriptEditorTabControl.SelectedTab == functionsTabPage) { - currentSearchManager = functionSearchManager; - currentScintillaEditor = FunctionTextArea; - } else { //Actions - currentSearchManager = actionSearchManager; - currentScintillaEditor = ActionTextArea; - } - } - private void SetupScriptEditorTextAreas() { - //PREPARE SCRIPT EDITOR KEYWORDS - cmdKeyWords = String.Join(" ", ScriptCommandNamesDict.Values) + - " " + String.Join(" ", ScriptDatabase.movementsDictIDName.Values); - cmdKeyWords += " " + cmdKeyWords.ToUpper() + " " + cmdKeyWords.ToLower(); - - secondaryKeyWords = String.Join(" ", RomInfo.ScriptComparisonOperatorsDict.Values) + - " " + String.Join(" ", ScriptDatabase.specialOverworlds.Values) + - " " + String.Join(" ", ScriptDatabase.overworldDirections.Values) + - " " + ScriptFile.containerTypes.Script.ToString() + - " " + ScriptFile.containerTypes.Function.ToString() + - " " + ScriptFile.containerTypes.Action.ToString() + - " " + EventType.Overworld + - " " + Overworld.MovementCodeKW; - secondaryKeyWords += " " + secondaryKeyWords.ToUpper() + " " + secondaryKeyWords.ToLower(); - - - // CREATE CONTROLS - ScriptTextArea = new ScintillaNET.Scintilla(); - scriptSearchManager = new SearchManager(this, ScriptTextArea, panelSearchScriptTextBox, PanelSearchScripts); - scintillaScriptsPanel.Controls.Clear(); - scintillaScriptsPanel.Controls.Add(ScriptTextArea); - - FunctionTextArea = new ScintillaNET.Scintilla(); - functionSearchManager = new SearchManager(this, FunctionTextArea, panelSearchFunctionTextBox, PanelSearchFunctions); - scintillaFunctionsPanel.Controls.Clear(); - scintillaFunctionsPanel.Controls.Add(FunctionTextArea); - - ActionTextArea = new ScintillaNET.Scintilla(); - actionSearchManager = new SearchManager(this, ActionTextArea, panelSearchActionTextBox, PanelSearchActions); - scintillaActionsPanel.Controls.Clear(); - scintillaActionsPanel.Controls.Add(ActionTextArea); - - currentScintillaEditor = ScriptTextArea; - currentSearchManager = scriptSearchManager; - - // BASIC CONFIG - ScriptTextArea.TextChanged += (this.OnTextChangedScript); - FunctionTextArea.TextChanged += (this.OnTextChangedFunction); - ActionTextArea.TextChanged += (this.OnTextChangedAction); - - // INITIAL VIEW CONFIG - InitialViewConfig(ScriptTextArea); - InitialViewConfig(FunctionTextArea); - InitialViewConfig(ActionTextArea); - - InitSyntaxColoring(ScriptTextArea); - InitSyntaxColoring(FunctionTextArea); - InitSyntaxColoring(ActionTextArea); - - // NUMBER MARGIN - InitNumberMargin(ScriptTextArea, ScriptTextArea_MarginClick); - InitNumberMargin(FunctionTextArea, FunctionTextArea_MarginClick); - InitNumberMargin(ActionTextArea, ActionTextArea_MarginClick); - - // BOOKMARK MARGIN - InitBookmarkMargin(ScriptTextArea); - InitBookmarkMargin(FunctionTextArea); - InitBookmarkMargin(ActionTextArea); - - // CODE FOLDING MARGIN - InitCodeFolding(ScriptTextArea); - InitCodeFolding(FunctionTextArea); - InitCodeFolding(ActionTextArea); - - // INIT HOTKEYS - InitHotkeys(ScriptTextArea, scriptSearchManager); - InitHotkeys(FunctionTextArea, functionSearchManager); - InitHotkeys(ActionTextArea, actionSearchManager); - - // INIT TOOLTIPS DWELLING - /* - ScriptTextArea.MouseDwellTime = 300; - ScriptTextArea.DwellEnd += TextArea_DwellEnd; - ScriptTextArea.DwellStart += TextArea_DwellStart; - - FunctionTextArea.MouseDwellTime = 300; - FunctionTextArea.DwellEnd += TextArea_DwellEnd; - FunctionTextArea.DwellStart += TextArea_DwellStart; - */ - } - - /* - private void TextArea_DwellStart(object sender, DwellEventArgs e) { - TextArea_DwellEnd(sender, e); - Scintilla ctr = sender as Scintilla; - string hoveredWord = ctr.GetWordFromPosition(e.Position); - ushort cmdID; - - string commandName = ""; - if (RomInfo.ScriptCommandNamesReverseDict.TryGetValue(hoveredWord, out cmdID)) { - commandName = hoveredWord; - } else { - if (!ushort.TryParse(hoveredWord, NumberStyles.HexNumber, new CultureInfo("en-US"), out cmdID)) { - return; - } - } - string tip = ""; - - tooltipMutex.WaitOne(); - tip += cmdID.ToString("X4") + ": " + commandName + "("; - byte[] parameters = ScriptCommandParametersDict[cmdID]; - for (int i = 0; i < parameters.Length; i++) { - if (parameters[i] == 0) { - break; - } else if (parameters[i] == 1) { - tip += "byte"; - } else { - tip += "uint" + 8 * parameters[i]; - } - if (i != parameters.Length - 1) { - tip += ", "; - } - } - tip += ")"; - tip += Environment.NewLine + "Command descriptions aren't available yet."; - - Point globalCtrCoords = ctr.PointToScreen(ctr.Location); - Point incrementedCoords = new Point(globalCtrCoords.X + e.X, globalCtrCoords.Y + e.Y); - - customTooltip = new ScriptTooltip(cmdKeyWords, tip); - customTooltip.Visible = false; - customTooltip.Show(); - - int newy = incrementedCoords.Y - customTooltip.Size.Height - 5; - customTooltip.Location = new Point(incrementedCoords.X, newy); - customTooltip.BringToFront(); - customTooltip.Visible = true; - Thread t = new Thread(() => { - customTooltip.Invoke((MethodInvoker)delegate { - customTooltip.ctrl.Visible = true; - customTooltip.FadeIn(16, 9); - customTooltip.WriteText(4); - }); - }); - t.Start(); - tooltipMutex.ReleaseMutex(); - } - private void TextArea_DwellEnd(object sender, DwellEventArgs e) { - if (customTooltip != null && !customTooltip.IsDisposed) { - tooltipMutex.WaitOne(); - Thread t = new Thread(() => { - customTooltip.Invoke((MethodInvoker)delegate { - customTooltip.FadeOut(16, 9); - customTooltip.Close(); - customTooltip.Dispose(); - }); - - }); - t.Start(); - tooltipMutex.ReleaseMutex(); - } - } - */ - - private void InitNumberMargin(Scintilla textArea, EventHandler textArea_MarginClick) { - textArea.Styles[Style.LineNumber].BackColor = BACK_COLOR; - textArea.Styles[Style.LineNumber].ForeColor = FORE_COLOR; - textArea.Styles[Style.IndentGuide].ForeColor = FORE_COLOR; - textArea.Styles[Style.IndentGuide].BackColor = BACK_COLOR; - - var nums = textArea.Margins[NUMBER_MARGIN]; - nums.Type = MarginType.Number; - nums.Sensitive = true; - nums.Mask = 0; - - textArea.MarginClick += textArea_MarginClick; - } - - private void InitHotkeys(Scintilla scintillaTb, SearchManager sm) { - // register the hotkeys with the form - HotKeyManager.AddHotKey(scintillaTb, sm.OpenSearch, Keys.F, true); - HotKeyManager.AddHotKey(scintillaTb, () => Uppercase(scintillaTb), Keys.U, true); - HotKeyManager.AddHotKey(scintillaTb, () => Lowercase(scintillaTb), Keys.L, true); - HotKeyManager.AddHotKey(scintillaTb, () => ZoomIn(scintillaTb), Keys.Oemplus, true); - HotKeyManager.AddHotKey(scintillaTb, () => ZoomOut(scintillaTb), Keys.OemMinus, true); - HotKeyManager.AddHotKey(scintillaTb, () => ZoomDefault(scintillaTb), Keys.D0, true); - HotKeyManager.AddHotKey(scintillaTb, sm.CloseSearch, Keys.Escape); - - // remove conflicting hotkeys from scintilla - scintillaTb.ClearCmdKey(Keys.Control | Keys.F); - scintillaTb.ClearCmdKey(Keys.Control | Keys.R); - scintillaTb.ClearCmdKey(Keys.Control | Keys.H); - scintillaTb.ClearCmdKey(Keys.Control | Keys.L); - scintillaTb.ClearCmdKey(Keys.Control | Keys.U); - } - - private void InitSyntaxColoring(Scintilla textArea) { - - // Configure the default style - textArea.StyleResetDefault(); - textArea.Styles[Style.Default].Font = "Consolas"; - textArea.Styles[Style.Default].Size = 12; - textArea.Styles[Style.Default].BackColor = Color.FromArgb(0x212121); - textArea.Styles[Style.Default].ForeColor = Color.FromArgb(0xFFFFFF); - textArea.StyleClearAll(); - - // Configure the lexer styles - textArea.Styles[Style.Python.Identifier].ForeColor = Color.FromArgb(0xD0DAE2); - textArea.Styles[Style.Python.CommentLine].ForeColor = Color.FromArgb(0x40BF57); - textArea.Styles[Style.Python.Number].ForeColor = Color.FromArgb(0xFFFF00); - textArea.Styles[Style.Python.String].ForeColor = Color.FromArgb(0xFF00FF); - textArea.Styles[Style.Python.Character].ForeColor = Color.FromArgb(0xE95454); - textArea.Styles[Style.Python.Operator].ForeColor = Color.FromArgb(0xFFFF00); - textArea.Styles[Style.Python.Word].ForeColor = Color.FromArgb(0x48A8EE); - textArea.Styles[Style.Python.Word2].ForeColor = Color.FromArgb(0xF98906); - - textArea.Lexer = Lexer.Python; - - textArea.SetKeywords(0, cmdKeyWords); - textArea.SetKeywords(1, secondaryKeyWords); - } - private void openSearchScriptEditorButton_Click(object sender, EventArgs e) { - currentSearchManager.OpenSearch(); - } - - private void OnTextChangedScript(object sender, EventArgs e) { - ScriptTextArea.Margins[NUMBER_MARGIN].Width = ScriptTextArea.Lines.Count.ToString().Length * 13; - scriptsDirty = true; - scriptsTabPage.Text = ScriptFile.containerTypes.Script.ToString() + "s" + "*"; - } - private void OnTextChangedFunction(object sender, EventArgs e) { - FunctionTextArea.Margins[NUMBER_MARGIN].Width = FunctionTextArea.Lines.Count.ToString().Length * 13; - functionsDirty = true; - functionsTabPage.Text = ScriptFile.containerTypes.Function.ToString() + "s" + "*"; - } - private void OnTextChangedAction(object sender, EventArgs e) { - ActionTextArea.Margins[NUMBER_MARGIN].Width = ActionTextArea.Lines.Count.ToString().Length * 13; - actionsDirty = true; - actionsTabPage.Text = ScriptFile.containerTypes.Action.ToString() + "s" + "*"; - } - - - #region Numbers, Bookmarks, Code Folding - - /// - /// the background color of the text area - /// - private readonly Color BACK_COLOR = Color.FromArgb(0x2A211C); - - /// - /// default text color of the text area - /// - private readonly Color FORE_COLOR = Color.FromArgb(0xB7B7B7); - - /// - /// change this to whatever margin you want the line numbers to show in - /// - private const int NUMBER_MARGIN = 1; - - /// - /// change this to whatever margin you want the bookmarks/breakpoints to show in - /// - private const int BOOKMARK_MARGIN = 2; - private const int BOOKMARK_MARKER = 2; - - /// - /// change this to whatever margin you want the code folding tree (+/-) to show in - /// - private const int FOLDING_MARGIN = 3; - - /// - /// set this true to show circular buttons for code folding (the [+] and [-] buttons on the margin) - /// - private const bool CODEFOLDING_CIRCULAR = true; - - - private void InitialViewConfig(Scintilla textArea) { - textArea.Dock = DockStyle.Fill; - textArea.WrapMode = ScintillaNET.WrapMode.Word; - textArea.IndentationGuides = IndentView.LookBoth; - textArea.CaretPeriod = 500; - textArea.CaretForeColor = Color.White; - textArea.SetSelectionBackColor(true, Color.FromArgb(0x114D9C)); - textArea.WrapIndentMode = WrapIndentMode.Same; - } - - private void InitBookmarkMargin(Scintilla textArea) { - - var margin = textArea.Margins[BOOKMARK_MARGIN]; - margin.Width = 20; - margin.Sensitive = true; - margin.Type = MarginType.Symbol; - margin.Mask = (1 << BOOKMARK_MARKER); - - var marker = textArea.Markers[BOOKMARK_MARKER]; - marker.Symbol = MarkerSymbol.Circle; - marker.SetBackColor(Color.FromArgb(0xFF003B)); - marker.SetForeColor(Color.FromArgb(0x000000)); - marker.SetAlpha(100); - } - - private void InitCodeFolding(Scintilla textArea) { - textArea.SetFoldMarginColor(true, BACK_COLOR); - textArea.SetFoldMarginHighlightColor(true, BACK_COLOR); - - // Enable code folding - textArea.SetProperty("fold", "1"); - textArea.SetProperty("fold.compact", "1"); - - // Configure a margin to display folding symbols - textArea.Margins[FOLDING_MARGIN].Type = MarginType.Symbol; - textArea.Margins[FOLDING_MARGIN].Mask = Marker.MaskFolders; - textArea.Margins[FOLDING_MARGIN].Sensitive = true; - textArea.Margins[FOLDING_MARGIN].Width = 20; - - // Set colors for all folding markers - for (int i = 25; i <= 31; i++) { - textArea.Markers[i].SetForeColor(BACK_COLOR); // styles for [+] and [-] - textArea.Markers[i].SetBackColor(FORE_COLOR); // styles for [+] and [-] - } - - // Configure folding markers with respective symbols - textArea.Markers[Marker.Folder].Symbol = CODEFOLDING_CIRCULAR ? MarkerSymbol.CirclePlus : MarkerSymbol.BoxPlus; - textArea.Markers[Marker.FolderOpen].Symbol = CODEFOLDING_CIRCULAR ? MarkerSymbol.CircleMinus : MarkerSymbol.BoxMinus; - textArea.Markers[Marker.FolderEnd].Symbol = CODEFOLDING_CIRCULAR ? MarkerSymbol.CirclePlusConnected : MarkerSymbol.BoxPlusConnected; - textArea.Markers[Marker.FolderMidTail].Symbol = MarkerSymbol.TCorner; - textArea.Markers[Marker.FolderOpenMid].Symbol = CODEFOLDING_CIRCULAR ? MarkerSymbol.CircleMinusConnected : MarkerSymbol.BoxMinusConnected; - textArea.Markers[Marker.FolderSub].Symbol = MarkerSymbol.VLine; - textArea.Markers[Marker.FolderTail].Symbol = MarkerSymbol.LCorner; - - // Enable automatic folding - textArea.AutomaticFold = (AutomaticFold.Show | AutomaticFold.Click | AutomaticFold.Change); - } - - private void ScriptTextArea_MarginClick(object sender, MarginClickEventArgs e) { - MarginClick(ScriptTextArea, e); - } - - private void FunctionTextArea_MarginClick(object sender, MarginClickEventArgs e) { - MarginClick(FunctionTextArea, e); - } - - private void ActionTextArea_MarginClick(object sender, MarginClickEventArgs e) { - MarginClick(ActionTextArea, e); - } - - private void MarginClick(Scintilla textArea, MarginClickEventArgs e) { - if (e.Margin == BOOKMARK_MARGIN) { - // Do we have a marker for this line? - const uint mask = (1 << BOOKMARK_MARKER); - var line = textArea.Lines[textArea.LineFromPosition(e.Position)]; - if ((line.MarkerGet() & mask) > 0) { - // Remove existing bookmark - line.MarkerDelete(BOOKMARK_MARKER); - } else { - // Add bookmark - line.MarkerAdd(BOOKMARK_MARKER); - } - } - } - - #endregion - - #region Main Menu Commands - - private void scriptEditorWordWrapCheckbox_CheckedChanged(object sender, EventArgs e) { - ScriptTextArea.WrapMode = scriptEditorWordWrapCheckbox.Checked ? ScintillaNET.WrapMode.Word : ScintillaNET.WrapMode.None; - FunctionTextArea.WrapMode = scriptEditorWordWrapCheckbox.Checked ? ScintillaNET.WrapMode.Word : ScintillaNET.WrapMode.None; - ActionTextArea.WrapMode = scriptEditorWordWrapCheckbox.Checked ? ScintillaNET.WrapMode.Word : ScintillaNET.WrapMode.None; - } - - - private void viewWhiteSpacesButton_Click(object sender, EventArgs e) { - ScriptTextArea.ViewWhitespace = scriptEditorWhitespacesCheckbox.Checked ? WhitespaceMode.VisibleAlways : WhitespaceMode.Invisible; - FunctionTextArea.ViewWhitespace = scriptEditorWhitespacesCheckbox.Checked ? WhitespaceMode.VisibleAlways : WhitespaceMode.Invisible; - ActionTextArea.ViewWhitespace = scriptEditorWhitespacesCheckbox.Checked ? WhitespaceMode.VisibleAlways : WhitespaceMode.Invisible; - } - - private void scriptEditorZoomInButton_Click(object sender, EventArgs e) { - ZoomIn(currentScintillaEditor); - } - - private void scriptEditorZoomOutButton_Click(object sender, EventArgs e) { - ZoomOut(currentScintillaEditor); - } - - private void scriptEditorZoomResetButton_Click(object sender, EventArgs e) { - ZoomDefault(currentScintillaEditor); - } - - private void ScriptEditorCollapseButton_Click(object sender, EventArgs e) { - currentScintillaEditor.FoldAll(FoldAction.Contract); - } - - private void ScriptEditorExpandButton_Click(object sender, EventArgs e) { - currentScintillaEditor.FoldAll(FoldAction.Expand); - } - - - #endregion - - #region Uppercase / Lowercase - - private void Lowercase(Scintilla textArea) { - - // save the selection - int start = textArea.SelectionStart; - int end = textArea.SelectionEnd; - - // modify the selected text - textArea.ReplaceSelection(textArea.GetTextRange(start, end - start).ToLower()); - - // preserve the original selection - textArea.SetSelection(start, end); - } - - private void Uppercase(Scintilla textArea) { - // save the selection - int start = textArea.SelectionStart; - int end = textArea.SelectionEnd; - - // modify the selected text - textArea.ReplaceSelection(textArea.GetTextRange(start, end - start).ToUpper()); - - // preserve the original selection - textArea.SetSelection(start, end); - } - - #endregion - - #region Indent / Outdent - - private void GenerateKeystrokes(string keys, Scintilla textArea) { - //Example - //GenerateKeystrokes("+{TAB}"); - HotKeyManager.Enable = false; - textArea.Focus(); - SendKeys.Send(keys); - HotKeyManager.Enable = true; - } - - #endregion - - #region Zoom - - private void ZoomIn(Scintilla textArea) { - textArea.ZoomIn(); - } - - private void ZoomOut(Scintilla textArea) { - textArea.ZoomOut(); - } - - private void ZoomDefault(Scintilla textArea) { - textArea.Zoom = 0; - } - #endregion - - #region Quick Search Bar - private void BtnPrevSearchScript_Click(object sender, EventArgs e) { - scriptSearchManager.Find(false, false); - } - - private void BtnNextSearchScript_Click(object sender, EventArgs e) { - scriptSearchManager.Find(true, false); - } - - private void BtnPrevSearchFunc_Click(object sender, EventArgs e) { - functionSearchManager.Find(false, false); - } - - private void BtnNextSearchFunc_Click(object sender, EventArgs e) { - functionSearchManager.Find(true, false); - } - - private void BtnPrevSearchActions_Click(object sender, EventArgs e) { - actionSearchManager.Find(false, false); - } - - private void BtnNextSearchActions_Click(object sender, EventArgs e) { - actionSearchManager.Find(true, false); - } - - private void BtnCloseSearchScript_Click(object sender, EventArgs e) { - scriptSearchManager.CloseSearch(); - } - - private void BtnCloseSearchFunc_Click(object sender, EventArgs e) { - functionSearchManager.CloseSearch(); - } - - private void BtnCloseSearchActions_Click(object sender, EventArgs e) { - actionSearchManager.CloseSearch(); - } - - private void scriptTxtSearch_KeyDown(object sender, KeyEventArgs e) { - TxtSearchKeyDown(scriptSearchManager, e); - } - private void functionTxtSearch_KeyDown(object sender, KeyEventArgs e) { - TxtSearchKeyDown(functionSearchManager, e); - } - private void actiontTxtSearch_KeyDown(object sender, KeyEventArgs e) { - TxtSearchKeyDown(actionSearchManager, e); - } - - private void TxtSearchKeyDown(SearchManager sm, KeyEventArgs e) { - if (HotKeyManager.IsHotkey(e, Keys.Enter)) { - sm.Find(true, false); - } - if (HotKeyManager.IsHotkey(e, Keys.Enter, true) || HotKeyManager.IsHotkey(e, Keys.Enter, false, true)) { - sm.Find(false, false); - } - } - - private void panelSearchScriptTextBox_TextChanged(object sender, EventArgs e) { - scriptSearchManager.Find(true, true); - } - private void panelSearchFunctionTextBox_TextChanged(object sender, EventArgs e) { - functionSearchManager.Find(true, true); - } - private void panelSearchActionTextBox_TextChanged(object sender, EventArgs e) { - actionSearchManager.Find(true, true); - } - - #endregion - private void addScriptFileButton_Click(object sender, EventArgs e) { - /* Add new event file to event folder */ - string scriptFilePath = RomInfo.gameDirs[DirNames.scripts].unpackedDir + "\\" + selectScriptFileComboBox.Items.Count.ToString("D4"); - File.WriteAllBytes(scriptFilePath, new ScriptFile(0).ToByteArray()); - - /* Update ComboBox and select new file */ - selectScriptFileComboBox.Items.Add("Script File " + selectScriptFileComboBox.Items.Count); - selectScriptFileComboBox.SelectedIndex = selectScriptFileComboBox.Items.Count - 1; - } - private void exportScriptFileButton_Click(object sender, EventArgs e) { - string suggestion = "Script File "; - if (currentScriptFile.isLevelScript) { - suggestion = "Level " + suggestion; - } - currentScriptFile.SaveToFileExplorePath(suggestion + selectScriptFileComboBox.SelectedIndex, blindmode: true); - } - private void saveScriptFileButton_Click(object sender, EventArgs e) { - /* Create new ScriptFile object */ - int idToAssign = selectScriptFileComboBox.SelectedIndex; - - ScriptFile userEdited = new ScriptFile( - scriptLines: ScriptTextArea.Lines.ToStringsList(trim: true), - functionLines: FunctionTextArea.Lines.ToStringsList(trim: true), - actionLines: ActionTextArea.Lines.ToStringsList(trim: true), - selectScriptFileComboBox.SelectedIndex - ); - - /* Write new scripts to file */ - if (userEdited.fileID == null) { - MessageBox.Show("This " + typeof(ScriptFile).Name + " couldn't be saved, due to a processing error.", "Can't save", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } else if (userEdited.fileID == int.MaxValue) { - MessageBox.Show("This " + typeof(ScriptFile).Name + " is couldn't be saved since it's empty.", "Can't save", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } else { //check if ScriptFile instance was created succesfully - if (userEdited.SaveToFileDefaultDir(selectScriptFileComboBox.SelectedIndex)) { - currentScriptFile = userEdited; - ScriptEditorSetClean(); - } - } - } - private void clearCurrentLevelScriptButton_Click(object sender, EventArgs e) { - string path = RomInfo.gameDirs[DirNames.scripts].unpackedDir + "\\" + selectScriptFileComboBox.SelectedIndex.ToString("D4"); - File.WriteAllBytes(path, new byte[4]); - MessageBox.Show("Level script correctly cleared.", "Success", MessageBoxButtons.OK, MessageBoxIcon.Information); - } - private void importScriptFileButton_Click(object sender, EventArgs e) { - /* Prompt user to select .scr or .bin file */ - OpenFileDialog of = new OpenFileDialog { - Filter = "Script File (*.scr, *.bin)|*.scr;*.bin" - }; - if (of.ShowDialog(this) != DialogResult.OK) { - return; - } - - /* Update scriptFile object in memory */ - string path = RomInfo.gameDirs[DirNames.scripts].unpackedDir + "\\" + selectScriptFileComboBox.SelectedIndex.ToString("D4"); - File.Copy(of.FileName, path, true); - - /* Refresh controls */ - selectScriptFileComboBox_SelectedIndexChanged(null, null); - - /* Display success message */ - MessageBox.Show("Scripts imported successfully!", "", MessageBoxButtons.OK, MessageBoxIcon.Information); - } - private void openScriptButton_Click(object sender, EventArgs e) { - if (!scriptEditorIsReady) { - SetupScriptEditorTextAreas(); - SetupScriptEditor(); - scriptEditorIsReady = true; - } - - scriptEditorTabControl.SelectedIndex = 0; - selectScriptFileComboBox.SelectedIndex = (int)scriptFileUpDown.Value; - mainTabControl.SelectedTab = scriptEditorTabPage; - } - private void openLevelScriptButton_Click(object sender, EventArgs e) { - if (!scriptEditorIsReady) { - SetupScriptEditorTextAreas(); - SetupScriptEditor(); - scriptEditorIsReady = true; - } - - selectScriptFileComboBox.SelectedIndex = (int)levelScriptUpDown.Value; - mainTabControl.SelectedTab = scriptEditorTabPage; - } - private void removeScriptFileButton_Click(object sender, EventArgs e) { - DialogResult d = MessageBox.Show("Are you sure you want to delete the last Script File?", "Confirm deletion", MessageBoxButtons.YesNo, MessageBoxIcon.Warning); - if (d.Equals(DialogResult.Yes)) { - /* Delete script file */ - File.Delete(RomInfo.gameDirs[DirNames.scripts].unpackedDir + "\\" + (selectScriptFileComboBox.Items.Count - 1).ToString("D4")); - - /* Check if currently selected file is the last one, and in that case select the one before it */ - int lastIndex = selectScriptFileComboBox.Items.Count - 1; - if (selectScriptFileComboBox.SelectedIndex == lastIndex) { - selectScriptFileComboBox.SelectedIndex--; - } - - /* Remove item from ComboBox */ - selectScriptFileComboBox.Items.RemoveAt(lastIndex); - } - } - private void searchInScriptsButton_Click(object sender, EventArgs e) { - if (searchInScriptsTextBox.Text == "") { - return; - } - - int firstArchive; - int lastArchive; - - if (searchOnlyCurrentScriptCheckBox.Checked) { - firstArchive = selectScriptFileComboBox.SelectedIndex; - lastArchive = firstArchive + 1; - } else { - firstArchive = 0; - lastArchive = romInfo.GetScriptCount(); - } - - searchInScriptsResultListBox.Items.Clear(); - string searchString = searchInScriptsTextBox.Text; - searchProgressBar.Maximum = selectScriptFileComboBox.Items.Count; - - List results = new List(); - - string scriptKw = ScriptFile.containerTypes.Script.ToString(); - string functionKw = ScriptFile.containerTypes.Function.ToString(); - - for (int i = firstArchive; i < lastArchive; i++) { - try { - Console.WriteLine("Attempting to load script " + i); - ScriptFile file = new ScriptFile(i, readActions: false); - - if (scriptSearchCaseSensitiveCheckBox.Checked) { - results.AddRange(SearchInScripts(i, file.allScripts, scriptKw, (string s) => s.Contains(searchString))); - results.AddRange(SearchInScripts(i, file.allFunctions, functionKw, (string s) => s.Contains(searchString))); - } else { - results.AddRange(SearchInScripts(i, file.allScripts, scriptKw, (string s) => s.IndexOf(searchString, StringComparison.InvariantCultureIgnoreCase) >= 0)); - results.AddRange(SearchInScripts(i, file.allFunctions, functionKw, (string s) => s.IndexOf(searchString, StringComparison.InvariantCultureIgnoreCase) >= 0)); - } - } catch { } - searchProgressBar.Value = i; - } - - searchProgressBar.Value = 0; - searchInScriptsResultListBox.Items.AddRange(results.ToArray()); - } - private List SearchInScripts(int fileID, List cmdList, string entryType, Func criteria) { - List results = new List(); - - for (int j = 0; j < cmdList.Count; j++) { - if (cmdList[j].commands is null) { - continue; - } - foreach (ScriptCommand cur in cmdList[j].commands) { - if (criteria(cur.name)) { - results.Add($"File {fileID} - {entryType} {j + 1}: {cur.name}{Environment.NewLine}"); - } - } - } - return results; - } - private void searchInScripts_GoToEntryResult(object sender, MouseEventArgs e) { - if (searchInScriptsResultListBox.SelectedIndex < 0) { - return; - } - - string[] split = searchInScriptsResultListBox.SelectedItem.ToString().Trim().Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries); - selectScriptFileComboBox.SelectedIndex = int.Parse(split[1]); - string cmdNameAndParams = String.Join(" ", split.Skip(5).Take(split.Length - 5)); - - if (split[3].StartsWith(ScriptFile.containerTypes.Script.ToString())) { - if (scriptEditorTabControl.SelectedTab != scriptsTabPage) { - scriptEditorTabControl.SelectedTab = scriptsTabPage; - } - scriptSearchManager.Find(true, false, ScriptFile.containerTypes.Script.ToString() + " " + split[4].Replace(":", "")); - scriptSearchManager.Find(true, false, cmdNameAndParams); - } else if (split[3].StartsWith(ScriptFile.containerTypes.Function.ToString())) { - if (scriptEditorTabControl.SelectedTab != functionsTabPage) { - scriptEditorTabControl.SelectedTab = functionsTabPage; - } - functionSearchManager.Find(true, false, ScriptFile.containerTypes.Function.ToString() + " " + split[4].Replace(":", "")); - functionSearchManager.Find(true, false, cmdNameAndParams); - } else if (split[3].StartsWith(ScriptFile.containerTypes.Action.ToString())) { - if (scriptEditorTabControl.SelectedTab != actionsTabPage) { - scriptEditorTabControl.SelectedTab = actionsTabPage; - } - actionSearchManager.Find(true, false, ScriptFile.containerTypes.Action.ToString() + " " + split[4].Replace(":", "")); - actionSearchManager.Find(true, false, cmdNameAndParams); - } - } - private void searchInScriptsResultListBox_KeyDown(object sender, KeyEventArgs e) { - if (e.KeyCode == Keys.Enter) { - searchInScripts_GoToEntryResult(null, null); - } - } - private void searchInScriptsTextBox_KeyDown(object sender, KeyEventArgs e) { - if (e.KeyCode == Keys.Enter) { - searchInScriptsButton_Click(null, null); - } - } - private void selectScriptFileComboBox_SelectedIndexChanged(object sender, EventArgs e) { - ReloadScript(); - } - - private bool ReloadScript() { - Console.WriteLine("Script Reload has been requested"); - /* clear controls */ - if (Helpers.HandlersDisabled || selectScriptFileComboBox.SelectedIndex < 0) { - return false; - } - - if (scriptsDirty || functionsDirty || actionsDirty) { - DialogResult d = MessageBox.Show("There are unsaved changes in this Script File.\nDo you wish to discard them?", "Unsaved work", MessageBoxButtons.YesNo, MessageBoxIcon.Warning); - - if (!d.Equals(DialogResult.Yes)) { - Helpers.DisableHandlers(); - selectScriptFileComboBox.SelectedIndex = (int)currentScriptFile.fileID; - Helpers.EnableHandlers(); - return false; - } - } - currentScriptFile = new ScriptFile(selectScriptFileComboBox.SelectedIndex); // Load script file - - ScriptTextArea.ClearAll(); - FunctionTextArea.ClearAll(); - ActionTextArea.ClearAll(); - - scriptsNavListbox.Items.Clear(); - functionsNavListbox.Items.Clear(); - actionsNavListbox.Items.Clear(); - - if (currentScriptFile.isLevelScript) { - ScriptTextArea.Text += "LevelScript files are currently not supported.\nYou can use AdAstra's Level Scripts Editor."; - addScriptFileButton.Visible = false; - removeScriptFileButton.Visible = false; - - clearCurrentLevelScriptButton.Visible = true; - } else { - Helpers.DisableHandlers(); - addScriptFileButton.Visible = true; - removeScriptFileButton.Visible = true; - - clearCurrentLevelScriptButton.Visible = false; - - string buffer = ""; - - /* Add scripts */ - for (int i = 0; i < currentScriptFile.allScripts.Count; i++) { - CommandContainer currentScript = currentScriptFile.allScripts[i]; - - /* Write header */ - string header = ScriptFile.containerTypes.Script.ToString() + " " + (i + 1); - buffer += header + ':' + Environment.NewLine; - scriptsNavListbox.Items.Add(header); - - /* If current script is identical to another, print UseScript instead of commands */ - if (currentScript.usedScript < 0) { - for (int j = 0; j < currentScript.commands.Count; j++) { - if (!ScriptDatabase.endCodes.Contains(currentScript.commands[j].id)) { - buffer += '\t'; - } - buffer += currentScript.commands[j].name + Environment.NewLine; - } - } else { - buffer += '\t' + "UseScript_#" + currentScript.usedScript + Environment.NewLine; - } - - ScriptTextArea.AppendText(buffer + Environment.NewLine); - buffer = ""; - } - - - /* Add functions */ - for (int i = 0; i < currentScriptFile.allFunctions.Count; i++) { - CommandContainer currentFunction = currentScriptFile.allFunctions[i]; - - /* Write Heaader */ - string header = ScriptFile.containerTypes.Function.ToString() + " " + (i + 1); - buffer += header + ':' + Environment.NewLine; - functionsNavListbox.Items.Add(header); - - /* If current function is identical to a script, print UseScript instead of commands */ - if (currentFunction.usedScript < 0) { - for (int j = 0; j < currentFunction.commands.Count; j++) { - if (!ScriptDatabase.endCodes.Contains(currentFunction.commands[j].id)) { - buffer += '\t'; - } - buffer += currentFunction.commands[j].name + Environment.NewLine; - } - } else { - buffer += '\t' + "UseScript_#" + currentFunction.usedScript + Environment.NewLine; - } - - FunctionTextArea.AppendText(buffer + Environment.NewLine); - buffer = ""; - } - - /* Add movements */ - for (int i = 0; i < currentScriptFile.allActions.Count; i++) { - ActionContainer currentAction = currentScriptFile.allActions[i]; - - string header = ScriptFile.containerTypes.Action.ToString() + " " + (i + 1); - buffer += header + ':' + Environment.NewLine; - actionsNavListbox.Items.Add(header); - - for (int j = 0; j < currentAction.actionCommandsList.Count; j++) { - if (currentAction.actionCommandsList[j].id != 0x00FE) { - buffer += '\t'; - } - buffer += currentAction.actionCommandsList[j].name + Environment.NewLine; - } - - ActionTextArea.AppendText(buffer + Environment.NewLine); - buffer = ""; - } - } - - ScriptEditorSetClean(); - Helpers.statusLabelMessage(); - Helpers.EnableHandlers(); - return true; - } - - private void UpdateScriptNumberFormatDec(object sender, EventArgs e) { - if (Helpers.HandlersEnabled && scriptEditorNumberFormatDecimal.Checked) { - NumberStyles old = (NumberStyles)Properties.Settings.Default.scriptEditorFormatPreference; //Local Backup - Properties.Settings.Default.scriptEditorFormatPreference = (int)NumberStyles.Integer; - - - if (!ReloadScript()) { - UpdateScriptNumberCheckBox(old); //Restore old checkbox status! Script couldn't be redrawn - } - } - } - private void UpdateScriptNumberFormatHex(object sender, EventArgs e) { - if (Helpers.HandlersEnabled && scriptEditorNumberFormatHex.Checked) { - NumberStyles old = (NumberStyles)Properties.Settings.Default.scriptEditorFormatPreference; //Local Backup - Properties.Settings.Default.scriptEditorFormatPreference = (int)NumberStyles.HexNumber; - - if (!ReloadScript()) { - UpdateScriptNumberCheckBox(old); //Restore old checkbox status! Script couldn't be redrawn - } - } - } - private void UpdateScriptNumberFormatNoPref(object sender, EventArgs e) { - if (Helpers.HandlersEnabled && scriptEditorNumberFormatNoPreference.Checked) { - NumberStyles old = (NumberStyles)Properties.Settings.Default.scriptEditorFormatPreference; //Local Backup - Properties.Settings.Default.scriptEditorFormatPreference = (int)NumberStyles.None; - - if (!ReloadScript()) { - UpdateScriptNumberCheckBox(old); //Restore old checkbox status! Script couldn't be redrawn - } - } - } - - private void UpdateScriptNumberCheckBox(NumberStyles toSet) { - - Helpers.DisableHandlers(); - Properties.Settings.Default.scriptEditorFormatPreference = (int)toSet; - - switch ((NumberStyles)Properties.Settings.Default.scriptEditorFormatPreference) { - case NumberStyles.None: - scriptEditorNumberFormatNoPreference.Checked = true; - break; - case NumberStyles.HexNumber: - scriptEditorNumberFormatHex.Checked = true; - break; - case NumberStyles.Integer: - scriptEditorNumberFormatDecimal.Checked = true; - break; - } - Console.WriteLine("changed style to " + Properties.Settings.Default.scriptEditorFormatPreference); - Helpers.EnableHandlers(); - } - - private void scriptsNavListbox_SelectedIndexChanged(object sender, EventArgs e) { - NavigatorGoTo((ListBox)sender, 0, scriptSearchManager, ScriptFile.containerTypes.Script.ToString()); - } - - private void functionsNavListbox_SelectedIndexChanged(object sender, EventArgs e) { - NavigatorGoTo((ListBox)sender, 1, functionSearchManager, ScriptFile.containerTypes.Function.ToString()); - } - - private void actionsNavListbox_SelectedIndexChanged(object sender, EventArgs e) { - NavigatorGoTo((ListBox)sender, 2, actionSearchManager, ScriptFile.containerTypes.Action.ToString()); - } - - private void NavigatorGoTo(ListBox currentLB, int indexToSwitchTo, SearchManager entrusted, string keyword) { - if (currentLB.SelectedIndex < 0) { - return; - } - - if (scriptEditorTabControl.SelectedIndex != indexToSwitchTo) { - scriptEditorTabControl.SelectedIndex = indexToSwitchTo; - } - - entrusted.Find(true, false, keyword + ' ' + (currentLB.SelectedIndex + 1) + ':'); - } - #endregion - #endregion - #region Text Editor #region Variables @@ -10581,7 +9635,7 @@ namespace DSPRE { ExplorerSelect(Path.Combine(gameDirs[DirNames.eventFiles].unpackedDir, selectEventComboBox.SelectedIndex.ToString("D4"))); } private void locateCurrentScriptFile_Click(object sender, EventArgs e) { - ExplorerSelect(Path.Combine(gameDirs[DirNames.scripts].unpackedDir, selectScriptFileComboBox.SelectedIndex.ToString("D4"))); + ExplorerSelect(Path.Combine(gameDirs[DirNames.scripts].unpackedDir, EditorPanels.scriptEditor.selectScriptFileComboBox.SelectedIndex.ToString("D4"))); } private void locateCurrentTextArchive_Click(object sender, EventArgs e) { ExplorerSelect(Path.Combine(gameDirs[DirNames.textArchives].unpackedDir, selectTextFileComboBox.SelectedIndex.ToString("D4"))); diff --git a/DS_Map/Main Window.resx b/DS_Map/Main Window.resx index 9b3572c..b263bbb 100644 --- a/DS_Map/Main Window.resx +++ b/DS_Map/Main Window.resx @@ -117,6 +117,96 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 239, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM + EgAAAk1TRnQBSQFMAgEBCgEAAegBGwHoARsBEAEAARABAAT/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== + + @@ -946,96 +1036,6 @@ p3S+M+m1V1me9QgCUQNXX2YRT1sYHBiEP3wHVbp3PF3cB40GbrzN86xHENrScf1NDsl8FaI4jODMHOgS SOacfYAmbr5XeNYjGH7yDReXv+JeNIUhUYwFpmZjDz+nMLf5B3b2rcZ5tju4ntjtFw4T54j+v2g/t9NH 9AiCIPwGJelqUAd/T3AAAAAASUVORK5CYII= - - - - 239, 17 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM - EgAAAk1TRnQBSQFMAgEBCgEAAbABGwGwARsBEAEAARABAAT/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== @@ -1047,6 +1047,9 @@ 386, 19 + + 533, 20 + 62 diff --git a/DS_Map/ROMFiles/HeadbuttEncounter.cs b/DS_Map/ROMFiles/HeadbuttEncounter.cs new file mode 100644 index 0000000..7398a19 --- /dev/null +++ b/DS_Map/ROMFiles/HeadbuttEncounter.cs @@ -0,0 +1,27 @@ +using System.IO; + +namespace DSPRE.ROMFiles { + public class HeadbuttEncounter { + public ushort pokemonID; + public byte minLevel; + public byte maxLevel; + + public HeadbuttEncounter() { + maxLevel = 0; + minLevel = 0; + pokemonID = 0; + } + + public HeadbuttEncounter(BinaryReader br) { + this.pokemonID = br.ReadUInt16(); + this.minLevel = br.ReadByte(); + this.maxLevel = br.ReadByte(); + } + + public override string ToString() { + string[] pokemonNames = RomInfo.GetPokemonNames(); + string pokemon = pokemonNames[pokemonID]; + return $"{pokemonID,4} {pokemon,10}: {minLevel,3} - {maxLevel,3}"; + } + } +} diff --git a/DS_Map/ROMFiles/HeadbuttEncounterFile.cs b/DS_Map/ROMFiles/HeadbuttEncounterFile.cs new file mode 100644 index 0000000..7c7d6c7 --- /dev/null +++ b/DS_Map/ROMFiles/HeadbuttEncounterFile.cs @@ -0,0 +1,136 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.IO; + +namespace DSPRE.ROMFiles { + //https://hirotdk.neocities.org/FileSpecs.html#Headbutt + public class HeadbuttEncounterFile { + public ushort ID; + + //get encounter tables, 12 normal pokemon definitions, 6 special pokemon definitions, 4 bytes per definition + const int normalEncountersCount = 12; + const int specialEncountersCount = 6; + + public byte normalTreeGroupsCount; + public byte specialTreeGroupsCount; + public List normalEncounters; + public List specialEncounters; + public BindingList normalTreeGroups; + public BindingList specialTreeGroups; + + public HeadbuttEncounterFile(ushort id) { + this.ID = id; + string path = Filesystem.GetHeadbuttPath(id); + parse_file(path); + } + + public HeadbuttEncounterFile(string path) { + parse_file(path); + } + + public void parse_file(string path) { + FileStream fs = new FileStream(path, FileMode.Open); + using (BinaryReader br = new BinaryReader(fs)) { + //get the number of tree group definitions + normalTreeGroupsCount = br.ReadByte(); + br.ReadByte(); //padding + specialTreeGroupsCount = br.ReadByte(); + br.ReadByte(); //padding + + normalEncounters = new List(); + specialEncounters = new List(); + + normalTreeGroups = new BindingList(); + specialTreeGroups = new BindingList(); + + //if there are no trees defined in either section, there are no encounters or trees defined + bool hasTrees = normalTreeGroupsCount > 0 || specialTreeGroupsCount > 0; + if (!hasTrees) { + for (int i = 0; i < normalEncountersCount; i++) { + normalEncounters.Add(new HeadbuttEncounter()); + } + + for (int i = 0; i < specialEncountersCount; i++) { + specialEncounters.Add(new HeadbuttEncounter()); + } + + return; + } + + for (int i = 0; i < normalEncountersCount; i++) { + normalEncounters.Add(new HeadbuttEncounter(br)); + } + + for (int i = 0; i < specialEncountersCount; i++) { + specialEncounters.Add(new HeadbuttEncounter(br)); + } + + //tree groups have 6 sets of xy global coordinates x treeGroupsCount + //coordinates need to be converted to matrix and local coordinates to be useful + for (int i = 0; i < normalTreeGroupsCount; i++) { + normalTreeGroups.Add(new HeadbuttTreeGroup(br)); + } + + for (int i = 0; i < specialTreeGroupsCount; i++) { + specialTreeGroups.Add(new HeadbuttTreeGroup(br)); + } + } + } + + public byte[] ToByteArray() { + MemoryStream newData = new MemoryStream(); + using (BinaryWriter writer = new BinaryWriter(newData)) { + writer.Write((byte)normalTreeGroups.Count); + writer.Write((byte)0); + writer.Write((byte)specialTreeGroups.Count); + writer.Write((byte)0); + + foreach (HeadbuttEncounter encounter in normalEncounters) { + writer.Write((UInt16)encounter.pokemonID); + writer.Write((byte)encounter.minLevel); + writer.Write((byte)encounter.maxLevel); + } + + foreach (HeadbuttEncounter encounter in specialEncounters) { + writer.Write((UInt16)encounter.pokemonID); + writer.Write((byte)encounter.minLevel); + writer.Write((byte)encounter.maxLevel); + } + + foreach (var treeGroup in normalTreeGroups) { + foreach (var tree in treeGroup.trees) { + writer.Write((UInt16)tree.globalX); + writer.Write((UInt16)tree.globalY); + } + } + + foreach (var treeGroup in specialTreeGroups) { + foreach (var tree in treeGroup.trees) { + writer.Write((UInt16)tree.globalX); + writer.Write((UInt16)tree.globalY); + } + } + } + + return newData.ToArray(); + } + + public bool SaveToFile() { + string path = Filesystem.GetHeadbuttPath(ID); + return SaveToFile(path); + } + + public bool SaveToFile(int id) { + string path = Filesystem.GetHeadbuttPath(id); + return SaveToFile(path); + } + + + public bool SaveToFile(string path, bool showSuccessMessage = true) { + byte[] romFileToByteArray = ToByteArray(); + File.WriteAllBytes(path, romFileToByteArray); + return true; + } + } +} diff --git a/DS_Map/ROMFiles/HeadbuttEncounterMap.cs b/DS_Map/ROMFiles/HeadbuttEncounterMap.cs new file mode 100644 index 0000000..7738473 --- /dev/null +++ b/DS_Map/ROMFiles/HeadbuttEncounterMap.cs @@ -0,0 +1,36 @@ +namespace DSPRE.ROMFiles { + //This class is in case a MapHeader uses the same MapFile more than once + //ToString is the matrix x,y and mapID + class HeadbuttEncounterMap { + public readonly int mapID; + public readonly int x; + public readonly int y; + + public HeadbuttEncounterMap(int mapID, int x, int y) { + this.mapID = mapID; + this.x = x; + this.y = y; + } + + public override string ToString() { + return $"{mapID} - {x},{y}"; + } + + public override bool Equals(object obj) { + // If the passed object is null + if (obj == null) { + return false; + } + + if (obj is HeadbuttEncounterMap) { + return this.ToString() == ((HeadbuttEncounterMap)obj).ToString(); + } + + return false; + } + + public override int GetHashCode() { + return this.x.GetHashCode() ^ y.GetHashCode() ^ mapID.GetHashCode(); + } + } +} diff --git a/DS_Map/ROMFiles/HeadbuttTree.cs b/DS_Map/ROMFiles/HeadbuttTree.cs new file mode 100644 index 0000000..224d0da --- /dev/null +++ b/DS_Map/ROMFiles/HeadbuttTree.cs @@ -0,0 +1,103 @@ +using System.IO; + +namespace DSPRE.ROMFiles { + public class HeadbuttTree { + public bool picked = false; + + private ushort _globalX; + private ushort _globalY; + private ushort _matrixX; + private ushort _matrixY; + private ushort _mapX; + private ushort _mapY; + + public bool unused { get { return globalX == ushort.MaxValue && globalY == ushort.MaxValue; } } + + public enum Types { + Normal, + Special, + } + + public HeadbuttTree(BinaryReader br) { + this.globalX = br.ReadUInt16(); + this.globalY = br.ReadUInt16(); + } + + public HeadbuttTree(ushort globalX = ushort.MaxValue, ushort globalY = ushort.MaxValue) { + this.globalX = globalX; + this.globalY = globalY; + } + + public HeadbuttTree(HeadbuttTree original) { + this.globalX = original.globalX; + this.globalY = original.globalY; + } + + public ushort globalX { + get { return _globalX; } + set { + _globalX = value; + _matrixX = (ushort)(_globalX / MapFile.mapSize); + _mapX = (ushort)(_globalX % MapFile.mapSize); + } + } + + public ushort globalY { + get { return _globalY; } + set { + _globalY = value; + _matrixY = (ushort)(_globalY / MapFile.mapSize); + _mapY = (ushort)(_globalY % MapFile.mapSize); + } + } + + public ushort matrixX { + get { + return _matrixX; + } + set { + _matrixX = value; + _globalX = (ushort)(_matrixX * MapFile.mapSize + _mapX); + _mapX = (ushort)(_globalX % MapFile.mapSize); + } + } + + public ushort matrixY { + get { + return _matrixY; + } + set { + _matrixY = value; + _globalY = (ushort)(_matrixY * MapFile.mapSize + _mapY); + _mapY = (ushort)(_globalY % MapFile.mapSize); + } + } + + public ushort mapX { + get { + return _mapX; + } + set { + _mapX = value; + _globalX = (ushort)(_matrixX * MapFile.mapSize + _mapX); + _matrixX = (ushort)(_globalX / MapFile.mapSize); + } + } + + public ushort mapY { + get { + return _mapY; + } + set { + _mapY = value; + _globalY = (ushort)(_matrixY * MapFile.mapSize + _mapY); + _matrixY = (ushort)(_globalY / MapFile.mapSize); + } + } + + public override string ToString() { + string suffix = unused ? "unused" : $"globalX: {globalX}, globalY: {globalY}"; + return $"{nameof(HeadbuttTree)} - {suffix}"; + } + } +} diff --git a/DS_Map/ROMFiles/HeadbuttTreeGroup.cs b/DS_Map/ROMFiles/HeadbuttTreeGroup.cs new file mode 100644 index 0000000..f012e70 --- /dev/null +++ b/DS_Map/ROMFiles/HeadbuttTreeGroup.cs @@ -0,0 +1,32 @@ +using System.Collections.Generic; +using System.IO; + +namespace DSPRE.ROMFiles { + public class HeadbuttTreeGroup { + const int treeCount = 6; //number of trees in each tree group + + public List trees = new List(); + + public HeadbuttTreeGroup(BinaryReader br) { + for (int j = 0; j < treeCount; j++) { + trees.Add(new HeadbuttTree(br)); + } + } + + public HeadbuttTreeGroup() { + for (int j = 0; j < treeCount; j++) { + trees.Add(new HeadbuttTree()); + } + } + + public HeadbuttTreeGroup(HeadbuttTreeGroup original) { + foreach (HeadbuttTree headbuttTree in original.trees) { + trees.Add(new HeadbuttTree(headbuttTree)); + } + } + + public override string ToString() { + return $"{nameof(HeadbuttTreeGroup)}"; + } + } +} diff --git a/DS_Map/ROMFiles/LevelScriptFile.cs b/DS_Map/ROMFiles/LevelScriptFile.cs new file mode 100644 index 0000000..bb208bf --- /dev/null +++ b/DS_Map/ROMFiles/LevelScriptFile.cs @@ -0,0 +1,139 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.IO; + +namespace DSPRE.ROMFiles { + public class LevelScriptFile { + public int ID; + public BindingList bufferSet = new BindingList(); + + public LevelScriptFile() { } + + public LevelScriptFile(int id) { + this.ID = id; + string path1 = Filesystem.scripts; + string path = Path.Combine(path1, this.ID.ToString("D4")); + parse_file(path); + } + + public void parse_file(string path) { + FileStream fs = new FileStream(path, FileMode.Open); + using (BinaryReader br = new BinaryReader(fs)) { + bool hasConditionalStructure = false; + + //conditionalStructureOffset is used to ensure the structure of the file is correct + int conditionalStructureOffset = -1; + + while (true) { + //first byte is the script type + //if not a valid script type, break loop + byte triggerType = br.ReadByte(); + if (!LevelScriptTrigger.IsValidTriggerType(triggerType)) break; + + //subtract triggerType length from conditionalStructureOffset + if (hasConditionalStructure) conditionalStructureOffset -= sizeof(byte); + + //if trigger type is a variable value, that doesn't immediately mean we're processing that trigger + //the trigger data is processed last if it is there + if (triggerType == LevelScriptTrigger.VARIABLEVALUE) { + hasConditionalStructure = true; + conditionalStructureOffset = (int)br.ReadUInt32(); + continue; + } + + //map screen load trigger doesn't have a value or variable + uint scriptToTrigger = br.ReadUInt32(); + bufferSet.Add(new MapScreenLoadTrigger(triggerType, (int)scriptToTrigger)); + + //subtract scriptToTrigger length from conditionalStructureOffset + if (hasConditionalStructure) conditionalStructureOffset -= sizeof(UInt32); + } + + //the earliest position a trigger can be + const int SMALLEST_TRIGGER_SIZE = 5; + + //if triggerType is invalid + //and next uint16 == 0 + //and the file stream length is shorter than the earliest position a trigger can be + if (br.BaseStream.Position == 1 && br.ReadUInt16() == 0 && fs.Length < SMALLEST_TRIGGER_SIZE) { + return; + throw new InvalidDataException("This level script does nothing."); // "Interesting..." + } + + //br.BaseStream.Position == 3 + //triggerType is valid, + //stream position is earlier than the first possible trigger, or + //there is no start script condition specified + if (br.BaseStream.Position < SMALLEST_TRIGGER_SIZE) { + throw new InvalidDataException("Parser failure: The input file you attempted to load is either malformed or not a Level Script file."); + } + + //there are no instances of a variable value trigger + if (!hasConditionalStructure) { + return; + } + + //if there's a variable value trigger but the offset is incorrect, the file is corrupt + if (conditionalStructureOffset != 1) { + throw new InvalidDataException($"Field error: The Level Script file you attempted to load is broken. {conditionalStructureOffset}"); + } + + //get the variable value trigger parts + while (true) { + //there are no variables below 1 + int variableID = br.ReadUInt16(); + if (variableID <= 0) break; + + int varExpectedValue = br.ReadUInt16(); + int scriptToTrigger = br.ReadUInt16(); + bufferSet.Add(new VariableValueTrigger(scriptToTrigger, variableID, varExpectedValue)); + } + } + } + + public long write_file(string path, bool word_alignment_padding = false) { + FileStream fs = new FileStream(path, FileMode.OpenOrCreate, FileAccess.Write); + using (BinaryWriter bw = new BinaryWriter(fs)) { + HashSet mapScreenLoadTriggers = new HashSet(); + HashSet variableValueTriggers = new HashSet(); + + foreach (LevelScriptTrigger item in bufferSet) { + if (item is VariableValueTrigger variableValueTrigger) { + variableValueTriggers.Add(variableValueTrigger); + } + else if (item is MapScreenLoadTrigger mapScreenLoadTrigger) { + mapScreenLoadTriggers.Add(mapScreenLoadTrigger); + } + } + + foreach (MapScreenLoadTrigger item in mapScreenLoadTriggers) { + bw.Write((byte)item.triggerType); + bw.Write((UInt32)item.scriptTriggered); + } + + if (variableValueTriggers.Count > 0) { + bw.Write((byte)LevelScriptTrigger.VARIABLEVALUE); + bw.Write((UInt32)1); + bw.Write((byte)0); + foreach (VariableValueTrigger item in variableValueTriggers) { + bw.Write((UInt16)item.variableToWatch); + bw.Write((UInt16)item.expectedValue); + bw.Write((UInt16)item.scriptTriggered); + } + } + + bw.Write((UInt16)0); + + if (word_alignment_padding) { + long missing_bytes = bw.BaseStream.Position % 4; + for (int i = 0; i < 4 - missing_bytes; i++) { + bw.Write((byte)0); + } + } + + return bw.BaseStream.Position; + } + } + } +} diff --git a/DS_Map/ROMFiles/LevelScriptTrigger.cs b/DS_Map/ROMFiles/LevelScriptTrigger.cs new file mode 100644 index 0000000..eaae9b7 --- /dev/null +++ b/DS_Map/ROMFiles/LevelScriptTrigger.cs @@ -0,0 +1,31 @@ +using System; + +namespace DSPRE.ROMFiles { + public class LevelScriptTrigger { + public const int VARIABLEVALUE = 1; + public const int MAPCHANGE = 2; + public const int SCREENRESET = 3; + public const int LOADGAME = 4; + + private static int[] _triggerTypes; + public int triggerType { get; set; } + public int scriptTriggered { get; set; } + + public LevelScriptTrigger(int triggerType, int scriptTriggered) { + this.triggerType = triggerType; + this.scriptTriggered = scriptTriggered; + } + + public static bool IsValidTriggerType(byte triggerType) { + if (_triggerTypes == null) { + _triggerTypes = new[] { VARIABLEVALUE, MAPCHANGE, SCREENRESET, LOADGAME }; + } + + return Array.IndexOf(_triggerTypes, triggerType) != -1; + } + + public override string ToString() { + return "Starts Script " + scriptTriggered; + } + } +} diff --git a/DS_Map/ROMFiles/MapScreenLoadTrigger.cs b/DS_Map/ROMFiles/MapScreenLoadTrigger.cs new file mode 100644 index 0000000..69543a7 --- /dev/null +++ b/DS_Map/ROMFiles/MapScreenLoadTrigger.cs @@ -0,0 +1,35 @@ +namespace DSPRE.ROMFiles { + public class MapScreenLoadTrigger : LevelScriptTrigger { + public MapScreenLoadTrigger(int type, int scriptTriggered) : base(type, scriptTriggered) { } + + public override string ToString() { + switch (triggerType) { + case LevelScriptTrigger.MAPCHANGE: + return base.ToString() + " upon entering the LS map."; + case LevelScriptTrigger.SCREENRESET: + return base.ToString() + " when a fadescreen happens in the LS map."; + case LevelScriptTrigger.LOADGAME: + return base.ToString() + " when the game resumes in the LS map."; + default: + return base.ToString() + " under unknown circumstances."; + } + } + + public override bool Equals(object obj) { + // If the passed object is null + if (obj == null) { + return false; + } + + if (obj is MapScreenLoadTrigger) { + return this.ToString() == ((MapScreenLoadTrigger)obj).ToString(); + } + + return false; + } + + public override int GetHashCode() { + return this.triggerType.GetHashCode() ^ scriptTriggered.GetHashCode(); + } + } +} diff --git a/DS_Map/ROMFiles/SafariZoneEncounter.cs b/DS_Map/ROMFiles/SafariZoneEncounter.cs new file mode 100644 index 0000000..52df80b --- /dev/null +++ b/DS_Map/ROMFiles/SafariZoneEncounter.cs @@ -0,0 +1,35 @@ +using System; +using System.IO; + +namespace DSPRE.ROMFiles +{ + public class SafariZoneEncounter + { + public ushort pokemonID; + public byte level; + public SafariZoneEncounter() { + level = 1; + pokemonID = 0; + } + + public SafariZoneEncounter(BinaryReader br) { + readEncounter(br); + } + + public void readEncounter(BinaryReader br) { + this.pokemonID = br.ReadUInt16(); + this.level = br.ReadByte(); + } + + public void writeEncounter(BinaryWriter bw) { + bw.Write((UInt16)pokemonID); + bw.Write((byte)level); + } + + public override string ToString() { + string[] pokemonNames = RomInfo.GetPokemonNames(); + string pokemon = pokemonNames[pokemonID]; + return $"{pokemonID,4} {pokemon,10}: {level,3}"; + } + } +} diff --git a/DS_Map/ROMFiles/SafariZoneEncounterFile.cs b/DS_Map/ROMFiles/SafariZoneEncounterFile.cs new file mode 100644 index 0000000..5e3ddd2 --- /dev/null +++ b/DS_Map/ROMFiles/SafariZoneEncounterFile.cs @@ -0,0 +1,101 @@ +using System.Collections.Generic; +using System.IO; + +namespace DSPRE.ROMFiles { + public class SafariZoneEncounterFile { + public static Dictionary Names = new Dictionary() { + {0, "Plains"}, + {1, "Meadow"}, + {2, "Savannah"}, + {3, "Peak"}, + {4, "Rocky Beach"}, + {5, "Wetland"}, + {6, "Forest"}, + {7, "Swamp"}, + {8, "Marshland"}, + {9, "Wasteland"}, + {10, "Mountain"}, + {11, "Desert"}, + }; + + public int ID; + + public SafariZoneEncounterGroup grassEncounterGroup = new SafariZoneEncounterGroup(); + public SafariZoneEncounterGroup surfEncounterGroup = new SafariZoneEncounterGroup(); + public SafariZoneEncounterGroup oldRodEncounterGroup = new SafariZoneEncounterGroup(); + public SafariZoneEncounterGroup goodRodEncounterGroup = new SafariZoneEncounterGroup(); + public SafariZoneEncounterGroup superRodEncounterGroup = new SafariZoneEncounterGroup(); + + public SafariZoneEncounterFile(int id) { + this.ID = id; + string path = Filesystem.GetSafariZonePath(id); + parse_file(path); + } + + public SafariZoneEncounterFile(string path) { + parse_file(path); + } + + public void parse_file(string path) { + FileStream fs = new FileStream(path, FileMode.Open); + using (BinaryReader br = new BinaryReader(fs)) { + if (br.BaseStream.Length < 5) return; + //#1 Section - Object Arrangement Allocation + grassEncounterGroup.readObjectSlots(br); + surfEncounterGroup.readObjectSlots(br); + oldRodEncounterGroup.readObjectSlots(br); + goodRodEncounterGroup.readObjectSlots(br); + superRodEncounterGroup.readObjectSlots(br); + + br.ReadByte(); + br.ReadByte(); + br.ReadByte(); + + grassEncounterGroup.readGroup(br); + surfEncounterGroup.readGroup(br); + oldRodEncounterGroup.readGroup(br); + goodRodEncounterGroup.readGroup(br); + superRodEncounterGroup.readGroup(br); + } + } + + public byte[] ToByteArray() { + MemoryStream newData = new MemoryStream(); + using (BinaryWriter bw = new BinaryWriter(newData)) { + grassEncounterGroup.writeObjectSlots(bw); + surfEncounterGroup.writeObjectSlots(bw); + oldRodEncounterGroup.writeObjectSlots(bw); + goodRodEncounterGroup.writeObjectSlots(bw); + superRodEncounterGroup.writeObjectSlots(bw); + + bw.Write((byte)0); + bw.Write((byte)0); + bw.Write((byte)0); + + grassEncounterGroup.writeGroup(bw); + surfEncounterGroup.writeGroup(bw); + oldRodEncounterGroup.writeGroup(bw); + goodRodEncounterGroup.writeGroup(bw); + superRodEncounterGroup.writeGroup(bw); + } + return newData.ToArray(); + } + + public bool SaveToFile() { + string path = Filesystem.GetSafariZonePath(ID); + return SaveToFile(path); + } + + public bool SaveToFile(int id) { + string path = Filesystem.GetSafariZonePath(id); + return SaveToFile(path); + } + + + public bool SaveToFile(string path, bool showSuccessMessage = true) { + byte[] romFileToByteArray = ToByteArray(); + File.WriteAllBytes(path, romFileToByteArray); + return true; + } + } +} diff --git a/DS_Map/ROMFiles/SafariZoneEncounterGroup.cs b/DS_Map/ROMFiles/SafariZoneEncounterGroup.cs new file mode 100644 index 0000000..f94be89 --- /dev/null +++ b/DS_Map/ROMFiles/SafariZoneEncounterGroup.cs @@ -0,0 +1,108 @@ +using System.ComponentModel; +using System.IO; + +namespace DSPRE.ROMFiles +{ + public class SafariZoneEncounterGroup + { + private const int EncounterSlots = 10; + + public byte ObjectSlots; + public BindingList MorningEncounters = new BindingList(); + public BindingList DayEncounters = new BindingList(); + public BindingList NightEncounters = new BindingList(); + public BindingList MorningEncountersObject = new BindingList(); + public BindingList DayEncountersObject = new BindingList(); + public BindingList NightEncountersObject = new BindingList(); + public BindingList ObjectRequirements = new BindingList(); + public BindingList OptionalObjectRequirements = new BindingList(); + + public void readObjectSlots(BinaryReader br) { + ObjectSlots = br.ReadByte(); + } + + public void writeObjectSlots(BinaryWriter bw) { + bw.Write((byte)ObjectSlots); + } + + public void readGroup(BinaryReader br) { + //#2 Section - Tall Grass Encounters + for (int i = 0; i < EncounterSlots; i++) { + MorningEncounters.Add(new SafariZoneEncounter(br)); + br.ReadByte(); + } + + for (int i = 0; i < EncounterSlots; i++) { + DayEncounters.Add(new SafariZoneEncounter(br)); + br.ReadByte(); + } + + for (int i = 0; i < EncounterSlots; i++) { + NightEncounters.Add(new SafariZoneEncounter(br)); + br.ReadByte(); + } + + //#3 Section - Tall Grass Encounters (Object Arrangement) + for (int i = 0; i < ObjectSlots; i++) { + MorningEncountersObject.Add(new SafariZoneEncounter(br)); + br.ReadByte(); + } + + for (int i = 0; i < ObjectSlots; i++) { + DayEncountersObject.Add(new SafariZoneEncounter(br)); + br.ReadByte(); + } + + for (int i = 0; i < ObjectSlots; i++) { + NightEncountersObject.Add(new SafariZoneEncounter(br)); + br.ReadByte(); + } + + //#4 Section - Object Arrangement Requirements (Tall Grass) + for (int i = 0; i < ObjectSlots; i++) { + ObjectRequirements.Add(new SafariZoneObjectRequirement(br)); + OptionalObjectRequirements.Add(new SafariZoneObjectRequirement(br)); + } + } + + public void writeGroup(BinaryWriter bw) { + //#2 Section - Tall Grass Encounters + for (int i = 0; i < MorningEncounters.Count; i++) { + MorningEncounters[i].writeEncounter(bw); + bw.Write((byte)0); + } + + for (int i = 0; i < EncounterSlots; i++) { + DayEncounters[i].writeEncounter(bw); + bw.Write((byte)0); + } + + for (int i = 0; i < EncounterSlots; i++) { + NightEncounters[i].writeEncounter(bw); + bw.Write((byte)0); + } + + //#3 Section - Tall Grass Encounters (Object Arrangement) + for (int i = 0; i < ObjectSlots; i++) { + MorningEncountersObject[i].writeEncounter(bw); + bw.Write((byte)0); + } + + for (int i = 0; i < ObjectSlots; i++) { + DayEncountersObject[i].writeEncounter(bw); + bw.Write((byte)0); + } + + for (int i = 0; i < ObjectSlots; i++) { + NightEncountersObject[i].writeEncounter(bw); + bw.Write((byte)0); + } + + //#4 Section - Object Arrangement Requirements (Tall Grass) + for (int i = 0; i < ObjectSlots; i++) { + ObjectRequirements[i].writeRequirement(bw); + OptionalObjectRequirements[i].writeRequirement(bw); + } + } + } +} diff --git a/DS_Map/ROMFiles/SafariZoneObjectRequirement.cs b/DS_Map/ROMFiles/SafariZoneObjectRequirement.cs new file mode 100644 index 0000000..8fbaf65 --- /dev/null +++ b/DS_Map/ROMFiles/SafariZoneObjectRequirement.cs @@ -0,0 +1,40 @@ +using System.Collections.Generic; +using System.IO; + +namespace DSPRE.ROMFiles { + public class SafariZoneObjectRequirement { + public static Dictionary ObjectTypes = new Dictionary() { + { 0, "No Requirement" }, + { 1, "Plains" }, + { 2, "Forest" }, + { 3, "Peak" }, + { 4, "Waterside" }, + }; + + public byte typeID; + public byte quantity; + + public SafariZoneObjectRequirement(byte typeID = 0, byte quantity = 0) { + this.typeID = typeID; + this.quantity = quantity; + } + + public SafariZoneObjectRequirement(BinaryReader br) { + readRequirement(br); + } + + public void readRequirement(BinaryReader br) { + typeID = br.ReadByte(); + quantity = br.ReadByte(); + } + + public void writeRequirement(BinaryWriter bw) { + bw.Write((byte)typeID); + bw.Write((byte)quantity); + } + + public override string ToString() { + return $"{typeID} {ObjectTypes[typeID]}: {quantity}"; + } + } +} diff --git a/DS_Map/ROMFiles/ScriptActionContainer.cs b/DS_Map/ROMFiles/ScriptActionContainer.cs new file mode 100644 index 0000000..a004d56 --- /dev/null +++ b/DS_Map/ROMFiles/ScriptActionContainer.cs @@ -0,0 +1,13 @@ +using System.Collections.Generic; + +namespace DSPRE.ROMFiles { + public class ScriptActionContainer { + public List commands; + public uint manualUserID; + + public ScriptActionContainer(uint actionNumber, List commands = null) { + manualUserID = actionNumber; + this.commands = commands; + } + } +} diff --git a/DS_Map/ROMFiles/ScriptCommand.cs b/DS_Map/ROMFiles/ScriptCommand.cs index 8472bb2..ddb7e68 100644 --- a/DS_Map/ROMFiles/ScriptCommand.cs +++ b/DS_Map/ROMFiles/ScriptCommand.cs @@ -4,41 +4,25 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; using System.Windows.Forms; -using static DSPRE.ROMFiles.Event; -using static DSPRE.ROMFiles.ScriptFile; namespace DSPRE.ROMFiles { - public enum ParamTypeEnum { INTEGER, VARIABLE, FLEX, OW_ID, OW_MOVEMENT_TYPE, OW_DIRECTION, FUNCTION_ID, ACTION_ID, CMD_NUMBER }; - public class CommandContainer { - public List commands; - public uint manualUserID; - public int usedScript; //useScript ID referenced by this Script/Function - public containerTypes containerType; - internal static readonly string functionStart; - - #region Constructors (2) - public CommandContainer(uint scriptNumber, containerTypes containerType, int useScript = -1, List commandList = null) { - manualUserID = scriptNumber; - this.usedScript = useScript; - this.containerType = containerType; - commands = commandList; - } - public CommandContainer(uint newID, CommandContainer toCopy) { - manualUserID = newID; - usedScript = toCopy.usedScript; - containerType = toCopy.containerType; - commands = new List(toCopy.commands); //command parameters need to be copied recursively - } - #endregion - } public class ScriptCommand { - #region Fields (4) + enum ParamTypeEnum { + INTEGER, + VARIABLE, + FLEX, + OW_ID, + OW_MOVEMENT_TYPE, + OW_DIRECTION, + FUNCTION_ID, + ACTION_ID, + CMD_NUMBER + }; + public ushort? id; public List cmdParams; public string name; - #endregion - #region Constructors (2) public ScriptCommand(ushort id, List parametersList) { if (parametersList is null) { this.id = null; @@ -50,20 +34,20 @@ namespace DSPRE.ROMFiles { } switch (id) { - case 0x0016: // Jump - case 0x001A: // Call + case 0x0016: // Jump + case 0x001A: // Call name += $" {FormatNumber(parametersList[0], ParamTypeEnum.FUNCTION_ID)}"; break; - case 0x0017: // JumpIfObjID - case 0x0018: // JumpIfEventID + case 0x0017: // JumpIfObjID + case 0x0018: // JumpIfEventID name += $" {FormatNumber(parametersList[0], ParamTypeEnum.OW_ID)} {FormatNumber(parametersList[1])}"; break; - case 0x0019: // JumpIfPlayerDir + case 0x0019: // JumpIfPlayerDir name += $" {FormatNumber(parametersList[0], ParamTypeEnum.OW_DIRECTION)} {FormatNumber(parametersList[1], ParamTypeEnum.ACTION_ID)}"; break; - case 0x001C: // JumpIf - case 0x001D: // CallIf - { + case 0x001C: // JumpIf + case 0x001D: // CallIf + { string number = FormatNumber(parametersList[1], ParamTypeEnum.FUNCTION_ID); if (RomInfo.ScriptComparisonOperatorsDict.TryGetValue(parametersList[0][0], out string v)) { @@ -71,131 +55,150 @@ namespace DSPRE.ROMFiles { } else { name += $" {parametersList[0][0]} {number}"; } + break; } - case 0x005E: // Movement + case 0x005E: // Movement name += $" {FormatNumber(parametersList[0], ParamTypeEnum.OW_ID)} {FormatNumber(parametersList[1], ParamTypeEnum.ACTION_ID)}"; break; - case 0x006A: // GetOverworldPosition + case 0x006A: // GetOverworldPosition name += FormatCmd_Overworld_TwoParams(parametersList); break; - case 0x0062: // Lock - case 0x0063: // Release - case 0x0064: // AddOW - case 0x0065: // RemoveOW + case 0x0062: // Lock + case 0x0063: // Release + case 0x0064: // AddOW + case 0x0065: // RemoveOW name += $" {FormatNumber(parametersList[0], ParamTypeEnum.OW_ID)}"; break; - case 0x006D: // SetOverworldMovement + case 0x006D: // SetOverworldMovement name += FormatCmd_Overworld_Move(parametersList); break; - case 0x00B0: // Warp [HGSS] + case 0x00B0: // Warp [HGSS] if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.HGSS)) { name += FormatCmd_Warp(parametersList); } else { goto default; } + break; - case 0x0152: // SetOverworldDefaultPosition [HGSS] + case 0x0152: // SetOverworldDefaultPosition [HGSS] if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.HGSS)) { name += FormatCmd_Overworld_TwoParams(parametersList); } else { goto default; } + break; - case 0x0153: // SetOverworldPosition [HGSS] + case 0x0153: // SetOverworldPosition [HGSS] if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.HGSS)) { name += FormatCmd_Overworld_3Coords_Dir(parametersList); } else { goto default; } + break; - case 0x0154: // SetOverworldDefaultMovement [HGSS] + case 0x0154: // SetOverworldDefaultMovement [HGSS] if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.HGSS)) { name += FormatCmd_Overworld_Move(parametersList); } else { goto default; } + break; - case 0x0155: // SetOverworldDefaultDirection [DPPt] + case 0x0155: // SetOverworldDefaultDirection [DPPt] if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.HGSS)) { name += FormatCmd_Overworld_Dir(parametersList); } else { goto default; } + break; - case 0x0158: // SetOverworldDirection [DPPt] + case 0x0158: // SetOverworldDirection [DPPt] if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.HGSS)) { name += FormatCmd_Overworld_Dir(parametersList); } else { goto default; } + break; - case 0x00BE: // Warp [DPPt] + case 0x00BE: // Warp [DPPt] if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.DP) || RomInfo.gameFamily.Equals(RomInfo.GameFamilies.Plat)) { name += FormatCmd_Warp(parametersList); } else { goto default; } + break; - case 0x0186: // SetOverworldDefaultPosition [DPPt] + case 0x0186: // SetOverworldDefaultPosition [DPPt] if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.DP) || RomInfo.gameFamily.Equals(RomInfo.GameFamilies.Plat)) { name += FormatCmd_Overworld_TwoParams(parametersList); } else { goto default; } + break; - case 0x0187: // SetOverworldPosition [DPPt] + case 0x0187: // SetOverworldPosition [DPPt] if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.DP) || RomInfo.gameFamily.Equals(RomInfo.GameFamilies.Plat)) { name += FormatCmd_Overworld_3Coords_Dir(parametersList); } else { goto default; } + break; - case 0x0188: // SetOverworldDefaultMovement [DPPt] + case 0x0188: // SetOverworldDefaultMovement [DPPt] if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.DP) || RomInfo.gameFamily.Equals(RomInfo.GameFamilies.Plat)) { name += FormatCmd_Overworld_Move(parametersList); } else { goto default; } + break; - case 0x0189: // SetOverworldDefaultDirection [DPPt] + case 0x0189: // SetOverworldDefaultDirection [DPPt] if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.DP) || RomInfo.gameFamily.Equals(RomInfo.GameFamilies.Plat)) { name += FormatCmd_Overworld_Dir(parametersList); } else { goto default; } + break; - case 0x018C: // SetOverworldDirection [DPPt] + case 0x018C: // SetOverworldDirection [DPPt] if (RomInfo.gameFamily.Equals(RomInfo.GameFamilies.DP) || RomInfo.gameFamily.Equals(RomInfo.GameFamilies.Plat)) { name += FormatCmd_Overworld_Dir(parametersList); } else { goto default; } + break; default: for (int i = 0; i < parametersList.Count; i++) { name += $" {FormatNumber(parametersList[i])}"; } - break; + break; } + this.id = id; this.cmdParams = parametersList; } + private string FormatCmd_Warp(List parametersList) { return $" {FormatNumber(parametersList[0])} {FormatNumber(parametersList[1])} {FormatNumber(parametersList[2])} {FormatNumber(parametersList[3])} {FormatNumber(parametersList[4], ParamTypeEnum.OW_DIRECTION)}"; } + private string FormatCmd_Overworld_TwoParams(List parametersList) { return $" {FormatNumber(parametersList[0], ParamTypeEnum.OW_ID)} {FormatNumber(parametersList[1])} {FormatNumber(parametersList[2])}"; } + private string FormatCmd_Overworld_Move(List parametersList) { return $" {FormatNumber(parametersList[0], ParamTypeEnum.OW_ID)} {FormatNumber(parametersList[1], ParamTypeEnum.OW_MOVEMENT_TYPE)}"; } + private string FormatCmd_Overworld_3Coords_Dir(List parametersList) { return $" {FormatNumber(parametersList[0], ParamTypeEnum.OW_ID)} {FormatNumber(parametersList[1])} {FormatNumber(parametersList[2])} {FormatNumber(parametersList[3])} {FormatNumber(parametersList[4], ParamTypeEnum.OW_DIRECTION)}"; } + private string FormatCmd_Overworld_Dir(List parametersList) { return $" {FormatNumber(parametersList[0], ParamTypeEnum.OW_ID)} {FormatNumber(parametersList[1], ParamTypeEnum.OW_DIRECTION)}"; } @@ -212,7 +215,6 @@ namespace DSPRE.ROMFiles { } else { try { id = ushort.Parse(nameParts[0].PurgeSpecial(ScriptFile.specialChars), nameParts[0].GetNumberStyle()); - //id = ushort.Parse(nameParts[0].Substring(nameParts[0].("_")+1), Properties.Settings.Default.scriptEditorFormatPreference, CultureInfo.InvariantCulture); } catch { string details; if (wholeLine.Contains(':') && wholeLine.ContainsNumber()) { @@ -223,7 +225,7 @@ namespace DSPRE.ROMFiles { } MessageBox.Show("This Script file could not be saved." + - $"\nParser failed to interpret line {lineNumber}: \"{wholeLine}\".\n\n{details}", "Parser error", MessageBoxButtons.OK, MessageBoxIcon.Error); + $"\nParser failed to interpret line {lineNumber}: \"{wholeLine}\".\n\n{details}", "Parser error", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } } @@ -235,7 +237,7 @@ namespace DSPRE.ROMFiles { int paramLength = 0; int paramsProcessed = 0; - if (parametersSizeArr.First() == 0xFF) { + if (parametersSizeArr.First() == 0xFF) { int firstParamValue = int.Parse(nameParts[1].PurgeSpecial(ScriptFile.specialChars), nameParts[1].GetNumberStyle()); byte firstParamSize = parametersSizeArr[1]; @@ -262,7 +264,7 @@ namespace DSPRE.ROMFiles { // 5, 3, (2, 2, 2) => this will be the parameters subarray // 6, 1, 2 // }, - byte[] subParametersSize = parametersSizeArr.SubArray(i + 2, paramLength++); + byte[] subParametersSize = parametersSizeArr.SubArray(i + 2, paramLength++); //Create a slightly bigger temp array byte[] temp = new byte[1 + subParametersSize.Length]; @@ -271,26 +273,28 @@ namespace DSPRE.ROMFiles { temp[0] = firstParamSize; //Then copy the whole subarray of parameter sizes - Array.Copy(subParametersSize, 0, temp, 1, temp.Length-1); + Array.Copy(subParametersSize, 0, temp, 1, temp.Length - 1); //Replace the original parametersSizeArr with the new array parametersSizeArr = temp; found = true; break; } + i += 2 + paramLength; optionsCount++; } + if (!found) { MessageBox.Show($"Command {nameParts[0]} is a special Script Command.\n" + - $"The value of the first parameter must be a number in the range [0 - {optionsCount}].\n\n" + - $"Line {lineNumber}: {wholeLine}", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + $"The value of the first parameter must be a number in the range [0 - {optionsCount}].\n\n" + + $"Line {lineNumber}: {wholeLine}", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); id = null; return; } } else if (parametersSizeArr.Length == 1 && parametersSizeArr.First() == 0) { paramLength = 0; - } else { + } else { paramLength = parametersSizeArr.Length; } @@ -304,7 +308,7 @@ namespace DSPRE.ROMFiles { /* Convert strings of parameters to the correct datatypes */ NumberStyles numStyle = nameParts[i + 1].GetNumberStyle(); nameParts[i + 1] = nameParts[i + 1].PurgeSpecial(ScriptFile.specialChars); - + int result = 0; try { @@ -312,9 +316,9 @@ namespace DSPRE.ROMFiles { } catch { if (string.IsNullOrWhiteSpace(nameParts[i + 1])) { MessageBox.Show($"You must specify an Overworld ID, Script, Function or Action number.\n\n" + - $"Line {lineNumber}: {wholeLine}", "Unspecified identifier", MessageBoxButtons.OK, MessageBoxIcon.Error); + $"Line {lineNumber}: {wholeLine}", "Unspecified identifier", MessageBoxButtons.OK, MessageBoxIcon.Error); id = null; - } else { + } else { var first = ScriptDatabase.specialOverworlds.FirstOrDefault(x => x.Value.IgnoreCaseEquals(nameParts[i + 1])); if (string.IsNullOrWhiteSpace(first.Value)) { @@ -322,7 +326,7 @@ namespace DSPRE.ROMFiles { if (string.IsNullOrWhiteSpace(res.Value)) { MessageBox.Show($"Argument {nameParts[i + 1]} couldn't be parsed as a valid Condition, Overworld ID, Direction ID, Script, Function or Action number.\n\n" + - $"Line {lineNumber}: {wholeLine}", "Invalid identifier", MessageBoxButtons.OK, MessageBoxIcon.Error); + $"Line {lineNumber}: {wholeLine}", "Invalid identifier", MessageBoxButtons.OK, MessageBoxIcon.Error); id = null; } else { result = res.Key; @@ -343,14 +347,12 @@ namespace DSPRE.ROMFiles { } } else { MessageBox.Show($"Wrong number of parameters for command {nameParts[0]} at line {lineNumber}.\n" + - $"Received: {nameParts.Length - 1}\n" + - $"Expected: {paramLength}", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + $"Received: {nameParts.Length - 1}\n" + + $"Expected: {paramLength}", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); id = null; } } - #endregion - #region Utilities private string FormatNumber(byte[] par, ParamTypeEnum paramType = ParamTypeEnum.INTEGER) { //number acquisition uint num; @@ -365,8 +367,10 @@ namespace DSPRE.ROMFiles { } else { throw new InvalidOperationException(); } + return FormatNumber(num, paramType); } + private string FormatNumber(uint num, ParamTypeEnum paramType = ParamTypeEnum.INTEGER) { //differentiate depending on param type string formatOverride; @@ -387,36 +391,37 @@ namespace DSPRE.ROMFiles { return "CMD_" + prefix + num.ToString(formatOverride + '3'); case ParamTypeEnum.FUNCTION_ID: - return containerTypes.Function.ToString() + "#" + num; + return ScriptFile.ContainerTypes.Function.ToString() + "#" + num; case ParamTypeEnum.ACTION_ID: - return containerTypes.Action.ToString() + "#" + num; + return ScriptFile.ContainerTypes.Action.ToString() + "#" + num; case ParamTypeEnum.OW_MOVEMENT_TYPE: if (num < 4000) { outp += "Move."; } + goto default; - case ParamTypeEnum.OW_ID: - { + case ParamTypeEnum.OW_ID: { if (ScriptDatabase.specialOverworlds.TryGetValue((ushort)num, out string output)) { return output; } else { if (num < 4000) { - outp += $"{EventType.Overworld}."; + outp += $"{Event.EventType.Overworld}."; } + goto default; } } - case ParamTypeEnum.OW_DIRECTION: - { + case ParamTypeEnum.OW_DIRECTION: { if (ScriptDatabase.overworldDirections.TryGetValue((byte)num, out string output)) { return output; } else { if (num < 4000) { outp += $"Direction."; } + goto default; } } @@ -427,15 +432,16 @@ namespace DSPRE.ROMFiles { prefix = "0x"; } } + outp += prefix + num.ToString(formatOverride); break; } - + return outp; } + public override string ToString() { return name + " (" + ((ushort)id).ToString("X") + ")"; } - #endregion } } diff --git a/DS_Map/ROMFiles/ScriptCommandContainer.cs b/DS_Map/ROMFiles/ScriptCommandContainer.cs new file mode 100644 index 0000000..e374cea --- /dev/null +++ b/DS_Map/ROMFiles/ScriptCommandContainer.cs @@ -0,0 +1,25 @@ +using System.Collections.Generic; + +namespace DSPRE.ROMFiles { + public class ScriptCommandContainer { + public List commands; + public uint manualUserID; + public int usedScriptID; //useScript ID referenced by this Script/Function + public ScriptFile.ContainerTypes containerType; + internal static readonly string functionStart; + + public ScriptCommandContainer(uint scriptNumber, ScriptFile.ContainerTypes containerType, int usedScriptID = -1, List commandList = null) { + manualUserID = scriptNumber; + this.usedScriptID = usedScriptID; + this.containerType = containerType; + commands = commandList; + } + + public ScriptCommandContainer(uint newID, ScriptCommandContainer toCopy) { + manualUserID = newID; + usedScriptID = toCopy.usedScriptID; + containerType = toCopy.containerType; + commands = new List(toCopy.commands); //command parameters need to be copied recursively + } + } +} diff --git a/DS_Map/ROMFiles/ScriptFile.cs b/DS_Map/ROMFiles/ScriptFile.cs index 864abdc..4e6f223 100644 --- a/DS_Map/ROMFiles/ScriptFile.cs +++ b/DS_Map/ROMFiles/ScriptFile.cs @@ -1,67 +1,64 @@ using DSPRE.Resources; -using ScintillaNET; using System; using System.Collections.Generic; -using System.Globalization; using System.IO; using System.Linq; using System.Windows.Forms; -using static DSPRE.ROMFiles.ScriptFile; -using static DSPRE.RomInfo; namespace DSPRE.ROMFiles { /// /// Class to store script file data in Pokémon NDS games /// public class ScriptFile : RomFile { - #region Constants //this enum doesn't really make much sense now but it will, once scripts can be called and jumped to - public enum containerTypes { Function, Action, Script }; + public enum ContainerTypes { + Function, + Action, + Script + }; public struct ContainerReference { public uint ID; public uint offsetInFile; } - #endregion - - #region Fields (3) - public List allScripts = new List(); - public List allFunctions = new List(); - public List allActions = new List(); - public int? fileID = null; + public List allScripts = new List(); + public List allFunctions = new List(); + public List allActions = new List(); + public int fileID = -1; public bool isLevelScript = new bool(); - public static readonly char[] specialChars = { 'x', 'X', '#', '.', '_' }; - #endregion + public bool hasNoScripts { get { return fileID == int.MaxValue; } } - #region Constructors (1) + public static readonly char[] specialChars = { 'x', 'X', '#', '.', '_' }; public ScriptFile(Stream fs, bool readFunctions = true, bool readActions = true) { List scriptOffsets = new List(); List functionOffsets = new List(); List movementOffsets = new List(); - using (BinaryReader scrReader = new BinaryReader(fs)) { + using (BinaryReader br = new BinaryReader(fs)) { /* Read script offsets from the header */ isLevelScript = true; // Is Level Script as long as magic number FD13 doesn't exist try { while (true) { - uint checker = scrReader.ReadUInt16(); - scrReader.BaseStream.Position -= 0x2; - uint value = scrReader.ReadUInt32(); + uint checker = br.ReadUInt16(); + br.BaseStream.Position -= 0x2; + uint value = br.ReadUInt32(); if (value == 0 && scriptOffsets.Count == 0) { isLevelScript = true; break; - } else if (checker == 0xFD13) { - scrReader.BaseStream.Position -= 0x4; + } + + if (checker == 0xFD13) { + br.BaseStream.Position -= 0x4; isLevelScript = false; break; - } else { - int offsetFromStart = (int)(value + scrReader.BaseStream.Position); // Don't change order of addition - scriptOffsets.Add(offsetFromStart); } + + int offsetFromStart = (int)(value + br.BaseStream.Position); // Don't change order of addition + scriptOffsets.Add(offsetFromStart); } } catch (EndOfStreamException) { if (!isLevelScript) { @@ -78,12 +75,12 @@ namespace DSPRE.ROMFiles { int index = scriptOffsets.FindIndex(x => x == scriptOffsets[(int)current]); // Check for UseScript if (index == current) { - scrReader.BaseStream.Position = scriptOffsets[(int)current]; + br.BaseStream.Position = scriptOffsets[(int)current]; List cmdList = new List(); bool endScript = new bool(); while (!endScript) { - ScriptCommand cmd = ReadCommand(scrReader, ref functionOffsets, ref movementOffsets); + ScriptCommand cmd = ReadCommand(br, ref functionOffsets, ref movementOffsets); if (cmd.cmdParams is null) { return; } @@ -94,23 +91,24 @@ namespace DSPRE.ROMFiles { endScript = true; } } - allScripts.Add(new CommandContainer(current + 1, containerTypes.Script, commandList: cmdList)); + + allScripts.Add(new ScriptCommandContainer(current + 1, ContainerTypes.Script, commandList: cmdList)); } else { - allScripts.Add(new CommandContainer(current + 1, containerTypes.Script, useScript: index + 1)); + allScripts.Add(new ScriptCommandContainer(current + 1, ContainerTypes.Script, usedScriptID: index + 1)); } } /* Read functions */ if (readFunctions) { for (uint current = 0; current < functionOffsets.Count; current++) { - scrReader.BaseStream.Position = functionOffsets[(int)current]; + br.BaseStream.Position = functionOffsets[(int)current]; int posInList = scriptOffsets.IndexOf(functionOffsets[(int)current]); // Check for UseScript if (posInList == -1) { List cmdList = new List(); bool endFunction = new bool(); while (!endFunction) { - ScriptCommand command = ReadCommand(scrReader, ref functionOffsets, ref movementOffsets); + ScriptCommand command = ReadCommand(br, ref functionOffsets, ref movementOffsets); if (command.cmdParams is null) { return; } @@ -120,9 +118,10 @@ namespace DSPRE.ROMFiles { endFunction = true; } } - allFunctions.Add(new CommandContainer(current + 1, containerTypes.Function, commandList: cmdList)); + + allFunctions.Add(new ScriptCommandContainer(current + 1, ContainerTypes.Function, commandList: cmdList)); } else { - allFunctions.Add(new CommandContainer(current + 1, containerTypes.Function, useScript: posInList + 1)); + allFunctions.Add(new ScriptCommandContainer(current + 1, ContainerTypes.Function, usedScriptID: posInList + 1)); } } } @@ -130,53 +129,65 @@ namespace DSPRE.ROMFiles { if (readActions) { /* Read movements */ for (uint current = 0; current < movementOffsets.Count; current++) { - scrReader.BaseStream.Position = movementOffsets[(int)current]; + br.BaseStream.Position = movementOffsets[(int)current]; List cmdList = new List(); bool endMovement = new bool(); while (!endMovement) { - ushort id = scrReader.ReadUInt16(); + ushort id = br.ReadUInt16(); if (id == 0xFE) { endMovement = true; cmdList.Add(new ScriptAction(id, 0)); } else { - cmdList.Add(new ScriptAction(id, scrReader.ReadUInt16())); + cmdList.Add(new ScriptAction(id, br.ReadUInt16())); } } - allActions.Add(new ActionContainer(current + 1, actionCommandsList: cmdList)); + + allActions.Add(new ScriptActionContainer(current + 1, commands: cmdList)); } } } } - public ScriptFile(int fileID, bool readFunctions = true, bool readActions = true) : - this(new FileStream(RomInfo.gameDirs[DirNames.scripts].unpackedDir + "\\" + fileID.ToString("D4"), FileMode.Open), readFunctions, readActions) { + public ScriptFile(int fileID, bool readFunctions = true, bool readActions = true) : this(getFileStream(fileID), readFunctions, readActions) { this.fileID = fileID; } - public ScriptFile(List scripts, List functions, List movements, int fileID = -1) { + + static FileStream getFileStream(int fileID) { + string path = Filesystem.GetScriptPath(fileID); + return new FileStream(path, FileMode.OpenOrCreate); + } + + public override string ToString() { + string prefix = isLevelScript ? "Level " : ""; + return $"{prefix}Script File " + this.fileID; + } + + public ScriptFile(List scripts, List functions, List movements, int fileID = -1) { allScripts = scripts; allFunctions = functions; allActions = movements; isLevelScript = false; } + public ScriptFile(IEnumerable scriptLines, IEnumerable functionLines, IEnumerable actionLines, int fileID = -1) { //TODO: give user the possibility to jump to/call a script //once it's done, this Predicate below will be the only one needed, since there will be no distinction between //a script and a function bool functionEndCondition(List<(int linenum, string text)> source, int x, ushort? id) { return source[x].text.TrimEnd().IgnoreCaseEquals(RomInfo.ScriptCommandNamesDict[0x0002]) //End - || source[x].text.IndexOf(RomInfo.ScriptCommandNamesDict[0x0016] + ' ' + containerTypes.Function.ToString(), StringComparison.InvariantCultureIgnoreCase) >= 0 //Jump Function_# - || source[x].text.TrimEnd().IgnoreCaseEquals(RomInfo.ScriptCommandNamesDict[0x001B]) - || ScriptDatabase.endCodes.Contains(id); - } //Return + || source[x].text.IndexOf(RomInfo.ScriptCommandNamesDict[0x0016] + ' ' + ContainerTypes.Function.ToString(), StringComparison.InvariantCultureIgnoreCase) >= 0 //Jump Function_# + || source[x].text.TrimEnd().IgnoreCaseEquals(RomInfo.ScriptCommandNamesDict[0x001B]) + || ScriptDatabase.endCodes.Contains(id); + } //Return bool scriptEndCondition(List<(int linenum, string text)> source, int x, ushort? id) { - return source[x].text.TrimEnd().IgnoreCaseEquals(RomInfo.ScriptCommandNamesDict[0x0002]) //End - || source[x].text.IndexOf(RomInfo.ScriptCommandNamesDict[0x0016] + ' ' + containerTypes.Function.ToString()) >= 0 //Jump Function_# - || ScriptDatabase.endCodes.Contains(id); + return source[x].text.TrimEnd().IgnoreCaseEquals(RomInfo.ScriptCommandNamesDict[0x0002]) //End + || source[x].text.IndexOf(RomInfo.ScriptCommandNamesDict[0x0016] + ' ' + ContainerTypes.Function.ToString()) >= 0 //Jump Function_# + || ScriptDatabase.endCodes.Contains(id); } - allScripts = ReadCommandsFromLines(scriptLines.ToList(), containerTypes.Script, scriptEndCondition); //Jump + whitespace + allScripts = ReadCommandsFromLines(scriptLines.ToList(), ContainerTypes.Script, scriptEndCondition); //Jump + whitespace if (allScripts is null) { return; } @@ -187,7 +198,7 @@ namespace DSPRE.ROMFiles { } if (functionLines != null) { - allFunctions = ReadCommandsFromLines(functionLines.ToList(), containerTypes.Function, functionEndCondition); //Jump + whitespace + allFunctions = ReadCommandsFromLines(functionLines.ToList(), ContainerTypes.Function, functionEndCondition); //Jump + whitespace if (allFunctions is null) { return; } @@ -202,17 +213,15 @@ namespace DSPRE.ROMFiles { this.fileID = fileID; } - #endregion - #region Methods (1) private ScriptCommand ReadCommand(BinaryReader dataReader, ref List functionOffsets, ref List actionOffsets) { ushort id = dataReader.ReadUInt16(); List parameterList = new List(); /* How to read parameters for different commands for DPPt*/ switch (RomInfo.gameFamily) { - case GameFamilies.DP: - case GameFamilies.Plat: + case RomInfo.GameFamilies.DP: + case RomInfo.GameFamilies.Plat: switch (id) { case 0x16: //Jump case 0x1A: //Call @@ -223,15 +232,15 @@ namespace DSPRE.ROMFiles { case 0x19: //JumpIfPlayerDir case 0x1C: //JumpIf case 0x1D: //CallIf - //in the case of JumpIf and CallIf, the first param is a comparisonOperator - //for JumpIfPlayerDir it's a directionID - //for JumpIfObjID, it's an EventID + //in the case of JumpIf and CallIf, the first param is a comparisonOperator + //for JumpIfPlayerDir it's a directionID + //for JumpIfObjID, it's an EventID parameterList.Add(new byte[] { dataReader.ReadByte() }); ProcessRelativeJump(dataReader, ref parameterList, ref functionOffsets); break; case 0x5E: // Movement case 0x2A1: // Movement2 - //in the case of Movement, the first param is an overworld ID + //in the case of Movement, the first param is an overworld ID parameterList.Add(BitConverter.GetBytes(dataReader.ReadUInt16())); ProcessRelativeJump(dataReader, ref parameterList, ref actionOffsets); break; @@ -318,7 +327,7 @@ namespace DSPRE.ROMFiles { } break; case 0x2C5: { - if (RomInfo.gameVersion == GameVersions.Platinum) { + if (RomInfo.gameVersion == RomInfo.GameVersions.Platinum) { parameterList.Add(dataReader.ReadBytes(2)); parameterList.Add(dataReader.ReadBytes(2)); } else { @@ -330,25 +339,27 @@ namespace DSPRE.ROMFiles { case 0x2C9: case 0x2CA: case 0x2CD: - if (RomInfo.gameVersion == GameVersions.Platinum) { + if (RomInfo.gameVersion == RomInfo.GameVersions.Platinum) { break; } else { goto default; } case 0x2CF: - if (RomInfo.gameVersion == GameVersions.Platinum) { + if (RomInfo.gameVersion == RomInfo.GameVersions.Platinum) { parameterList.Add(dataReader.ReadBytes(2)); parameterList.Add(dataReader.ReadBytes(2)); } else { goto default; } + break; default: addParametersToList(ref parameterList, id, dataReader); break; } + break; - case GameFamilies.HGSS: + case RomInfo.GameFamilies.HGSS: switch (id) { case 0x16: //Jump case 0x1A: //Call @@ -377,7 +388,7 @@ namespace DSPRE.ROMFiles { } break; case 0x1D1: // Number of parameters differ depending on the first parameter value - { + { short parameter1 = dataReader.ReadInt16(); parameterList.Add(BitConverter.GetBytes(parameter1)); switch (parameter1) { @@ -403,7 +414,7 @@ namespace DSPRE.ROMFiles { } break; case 0x1E9: // Number of parameters differ depending on the first parameter value - { + { short parameter1 = dataReader.ReadInt16(); parameterList.Add(BitConverter.GetBytes(parameter1)); switch (parameter1) { @@ -433,8 +444,10 @@ namespace DSPRE.ROMFiles { addParametersToList(ref parameterList, id, dataReader); break; } + break; } + return new ScriptCommand(id, parameterList); } @@ -462,28 +475,30 @@ namespace DSPRE.ROMFiles { } } catch (NullReferenceException) { MessageBox.Show("Script command " + id + "can't be handled for now." + - Environment.NewLine + "Reference offset 0x" + dataReader.BaseStream.Position.ToString("X"), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + Environment.NewLine + "Reference offset 0x" + dataReader.BaseStream.Position.ToString("X"), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); parameterList = null; return; } catch { MessageBox.Show("Error: ID Read - " + id + - Environment.NewLine + "Reference offset 0x" + dataReader.BaseStream.Position.ToString("X"), "Unrecognized script command", MessageBoxButtons.OK, MessageBoxIcon.Error); + Environment.NewLine + "Reference offset 0x" + dataReader.BaseStream.Position.ToString("X"), "Unrecognized script command", MessageBoxButtons.OK, MessageBoxIcon.Error); parameterList = null; return; } } - private void AddReference(ref List references, ushort commandID, List parameterList, int pos, CommandContainer cont) { + + private void AddReference(ref List references, ushort commandID, List parameterList, int pos, ScriptCommandContainer cont) { if (ScriptDatabase.commandsWithRelativeJump.TryGetValue(commandID, out int parameterWithRelativeJump)) { - uint invokedID = BitConverter.ToUInt32(parameterList[parameterWithRelativeJump], 0); // Jump, Call + uint invokedID = BitConverter.ToUInt32(parameterList[parameterWithRelativeJump], 0); // Jump, Call if (commandID == 0x005E) - references.Add(new ScriptReference(cont.containerType, cont.manualUserID, containerTypes.Action, invokedID, pos - 4)); + references.Add(new ScriptReference(cont.containerType, cont.manualUserID, ContainerTypes.Action, invokedID, pos - 4)); else { - references.Add(new ScriptReference(cont.containerType, cont.manualUserID, containerTypes.Function, invokedID, pos - 4)); + references.Add(new ScriptReference(cont.containerType, cont.manualUserID, ContainerTypes.Function, invokedID, pos - 4)); } } } - private List ReadCommandsFromLines(List linelist, containerTypes containerType, Func, int, ushort?, bool> endConditions) { + + private List ReadCommandsFromLines(List linelist, ContainerTypes containerType, Func, int, ushort?, bool> endConditions) { List<(int linenum, string text)> lineSource = new List<(int linenum, string text)>(); for (int l = 0; l < linelist.Count; l++) { @@ -493,7 +508,7 @@ namespace DSPRE.ROMFiles { } } - List ls = new List(); + List ls = new List(); int i = 0; try { @@ -516,12 +531,13 @@ namespace DSPRE.ROMFiles { return null; } } + scriptNumber = uint.Parse(lineSource[i++].text.Substring(positionOfScriptNumber).Split()[0].Replace(":", "")); } if (lineSource[i].text.IndexOf("UseScript", StringComparison.InvariantCultureIgnoreCase) >= 0) { int useScriptNumber = short.Parse(lineSource[i].text.Substring(1 + lineSource[i].text.IndexOf('#'))); - ls.Add(new CommandContainer(scriptNumber, containerType, useScriptNumber)); + ls.Add(new ScriptCommandContainer(scriptNumber, containerType, useScriptNumber)); i++; } else { /* Read script commands */ @@ -535,23 +551,25 @@ namespace DSPRE.ROMFiles { } cmdList.Add(lastRead); - } while (!endConditions(lineSource, i++, lastRead.id)); + } + while (!endConditions(lineSource, i++, lastRead.id)); - ls.Add(new CommandContainer(scriptNumber, containerType, commandList: cmdList)); + ls.Add(new ScriptCommandContainer(scriptNumber, containerType, commandList: cmdList)); } + scriptNumber = 0; } } catch (ArgumentOutOfRangeException) { MessageBox.Show($"Unexpectedly reached end of lines.\n\n" + - $"Last line index: {lineSource[i].linenum}.\n" + - $"Managed to parse {ls.Count} Command Containers.", "Fatal Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + $"Last line index: {lineSource[i].linenum}.\n" + + $"Managed to parse {ls.Count} Command Containers.", "Fatal Error", MessageBoxButtons.OK, MessageBoxIcon.Error); return null; } return ls; } - private List ReadActionsFromLines(List linelist) { + private List ReadActionsFromLines(List linelist) { List<(int linenum, string text)> lineSource = new List<(int linenum, string text)>(); for (int l = 0; l < linelist.Count; l++) { @@ -561,7 +579,7 @@ namespace DSPRE.ROMFiles { } } - List ls = new List(); + List ls = new List(); int i = 0; try { @@ -570,7 +588,7 @@ namespace DSPRE.ROMFiles { while (i < lineSource.Count) { if (actionNumber == 0) { int positionOfActionNumber; - int positionOfActionKeyword = lineSource[i].text.IndexOf(containerTypes.Action.ToString(), StringComparison.InvariantCultureIgnoreCase); + int positionOfActionKeyword = lineSource[i].text.IndexOf(ContainerTypes.Action.ToString(), StringComparison.InvariantCultureIgnoreCase); if (positionOfActionKeyword > 0) { MessageBox.Show("Unrecognized container keyword: \"" + lineSource[i] + '"', "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); @@ -584,6 +602,7 @@ namespace DSPRE.ROMFiles { return null; } } + actionNumber = uint.Parse(lineSource[i].text.Substring(positionOfActionNumber).Split()[0].Replace(":", "")); i++; } @@ -597,23 +616,22 @@ namespace DSPRE.ROMFiles { } cmdList.Add(toAdd); + } + while (!lineSource[i++].text.IgnoreCaseEquals(RomInfo.ScriptActionNamesDict[0x00FE])); - } while (!lineSource[i++].text.IgnoreCaseEquals(RomInfo.ScriptActionNamesDict[0x00FE])); - - ls.Add(new ActionContainer(actionNumber, actionCommandsList: cmdList)); + ls.Add(new ScriptActionContainer(actionNumber, commands: cmdList)); actionNumber = 0; } } catch (ArgumentOutOfRangeException) { MessageBox.Show($"Unexpectedly reached end of lines.\n\n" + - $"Last line index: {i}.\n" + - $"Managed to parse {ls.Count} Command Containers.", "Fatal Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + $"Last line index: {i}.\n" + + $"Managed to parse {ls.Count} Command Containers.", "Fatal Error", MessageBoxButtons.OK, MessageBoxIcon.Error); return null; } return ls; } - #region Output public override byte[] ToByteArray() { MemoryStream newData = new MemoryStream(); using (BinaryWriter writer = new BinaryWriter(newData)) { @@ -627,11 +645,11 @@ namespace DSPRE.ROMFiles { try { writer.BaseStream.Position += allScripts.Count * 0x4; writer.Write((ushort)0xFD13); // Signal the end of header section - List useScriptCallers = new List(); + List useScriptCallers = new List(); /* Write scripts */ - foreach (CommandContainer currentScript in allScripts) { - if (currentScript.usedScript == -1) { + foreach (ScriptCommandContainer currentScript in allScripts) { + if (currentScript.usedScriptID == -1) { scriptOffsets.Add(new ContainerReference() { ID = currentScript.manualUserID, offsetInFile = (uint)writer.BaseStream.Position @@ -657,22 +675,22 @@ namespace DSPRE.ROMFiles { } int scriptsCount = scriptOffsets.Count; - foreach (CommandContainer caller in useScriptCallers) { + foreach (ScriptCommandContainer caller in useScriptCallers) { for (int i = 0; i < scriptsCount; i++) { ContainerReference scriptReference = scriptOffsets[i]; - if (scriptReference.ID == caller.usedScript) { + if (scriptReference.ID == caller.usedScriptID) { scriptOffsets.Add(new ContainerReference() { ID = caller.manualUserID, offsetInFile = scriptReference.offsetInFile - });// If script has UseScript, copy offset + }); // If script has UseScript, copy offset } } } /* Write functions */ - foreach (CommandContainer currentFunction in allFunctions) { - if (currentFunction.usedScript == -1) { + foreach (ScriptCommandContainer currentFunction in allFunctions) { + if (currentFunction.usedScriptID == -1) { functionOffsets.Add(new ContainerReference() { ID = currentFunction.manualUserID, offsetInFile = (uint)writer.BaseStream.Position @@ -694,20 +712,16 @@ namespace DSPRE.ROMFiles { AddReference(ref refList, (ushort)currentCmd.id, parameterList, (int)writer.BaseStream.Position, currentFunction); } } else { - int functionUsescript = currentFunction.usedScript - 1; - - //Find script with same ID as the function's referenced UseScript - int scriptUsedByFunction = scriptOffsets.FindIndex(ind => ind.ID == currentFunction.usedScript); - - if (functionUsescript >= scriptOffsets.Count || scriptUsedByFunction < 0) { - MessageBox.Show($"Function #{currentFunction.manualUserID} refers to Script {currentFunction.usedScript}, which does not exist.\n" + - $"This Script File can't be saved.", "Can't resolve UseScript reference", MessageBoxButtons.OK, MessageBoxIcon.Error); + int functionUsescript = currentFunction.usedScriptID - 1; + if (functionUsescript >= scriptOffsets.Count) { + MessageBox.Show($"Function #{currentFunction.manualUserID} refers to Script {currentFunction.usedScriptID}, which does not exist.\n" + + $"This Script File can't be saved.", "Can't resolve UseScript reference", MessageBoxButtons.OK, MessageBoxIcon.Error); return null; } functionOffsets.Add(new ContainerReference() { ID = currentFunction.manualUserID, - offsetInFile = scriptOffsets[scriptUsedByFunction].offsetInFile + offsetInFile = scriptOffsets[currentFunction.usedScriptID - 1].offsetInFile }); } } @@ -718,13 +732,13 @@ namespace DSPRE.ROMFiles { } /* Write movements */ - foreach (ActionContainer currentAction in allActions) { + foreach (ScriptActionContainer currentAction in allActions) { actionOffsets.Add(new ContainerReference() { ID = currentAction.manualUserID, offsetInFile = (uint)writer.BaseStream.Position }); - foreach (ScriptAction currentCmd in currentAction.actionCommandsList) { + foreach (ScriptAction currentCmd in currentAction.commands) { writer.Write((ushort)currentCmd.id); writer.Write((ushort)currentCmd.repetitionCount); } @@ -738,7 +752,6 @@ namespace DSPRE.ROMFiles { writer.Write(scriptOffsets[i].offsetInFile - (uint)writer.BaseStream.Position - 0x4); } - SortedSet undeclaredFuncs = new SortedSet(); SortedSet undeclaredActions = new SortedSet(); @@ -751,7 +764,7 @@ namespace DSPRE.ROMFiles { writer.BaseStream.Position = refList[i].invokedAt; //place seek head on parameter that is supposed to store the jump address ContainerReference result; - if (refList[i].typeOfInvoked is containerTypes.Action) { //isApplyMovement + if (refList[i].typeOfInvoked is ContainerTypes.Action) { //isApplyMovement result = actionOffsets.Find(entry => entry.ID == refList[i].invokedID); if (result.Equals(default(ContainerReference))) { @@ -770,12 +783,10 @@ namespace DSPRE.ROMFiles { int relativeOffset = (int)(result.offsetInFile - refList[i].invokedAt - 4); writer.Write(relativeOffset); - if (FunctionIsInvoked(refList, uninvokedFuncs, refList[i].invokedID, 0)) { uninvokedFuncs.Remove(refList[i].invokedID); } - //if (refList[i].callerType != containerTypes.Function || // (refList[i].callerType == refList[i].invokedType && refList[i].callerID == refList[i].invokedID) || // !uninvokedFuncs.Contains(refList[i].callerID)) { //remove reference if caller is a script, or if caller calls itself, or if caller is a function that's been invoked already @@ -792,11 +803,13 @@ namespace DSPRE.ROMFiles { errorMsg += "These Functions have been invoked but not declared: " + Environment.NewLine + string.Join(separator: ",", errorFunctionsUndeclared); errorMsg += Environment.NewLine; } + if (undeclaredActions.Count > 0) { string[] errorActionsUndeclared = undeclaredActions.ToArray().Select(x => x.ToString()).ToArray(); errorMsg += "These Actions have been referenced but not declared: " + Environment.NewLine + string.Join(separator: ",", errorActionsUndeclared); errorMsg += Environment.NewLine; } + if (!string.IsNullOrEmpty(errorMsg)) { MessageBox.Show(errorMsg + Environment.NewLine + "This Script File has not been overwritten since it can not be saved.", "Error!", MessageBoxButtons.OK, MessageBoxIcon.Error); errorMsg = ""; @@ -811,6 +824,7 @@ namespace DSPRE.ROMFiles { errorMsg += Environment.NewLine; errorMsg += Environment.NewLine; } + if (unreferencedActions.Count > 0) { string[] orphanedActions = unreferencedActions.ToArray().Select(x => x.ToString()).ToArray(); errorMsg += "Unused Action IDs detected: " + Environment.NewLine + string.Join(", ", orphanedActions); @@ -819,6 +833,7 @@ namespace DSPRE.ROMFiles { errorMsg += Environment.NewLine; errorMsg += Environment.NewLine; } + if (!string.IsNullOrEmpty(errorMsg)) { MessageBox.Show(errorMsg + Environment.NewLine + "Remember that every unused Function or Action is always lost upon reloading the Script File.", "Warning!", MessageBoxButtons.OK, MessageBoxIcon.Information); errorMsg = ""; @@ -835,8 +850,8 @@ namespace DSPRE.ROMFiles { private bool FunctionIsInvoked(List refList, SortedSet uninvokedFuncsSet, uint funcID, int callCount = 0, uint? excludedCaller = null) { if (callCount >= 30) { MessageBox.Show("Something went very wrong saving this Script File!" + - "\nIt is recommended that you backup its code somewhere, to avoid losing progress.", - "Fatal error", MessageBoxButtons.OK, MessageBoxIcon.Error); + "\nIt is recommended that you backup its code somewhere, to avoid losing progress.", + "Fatal error", MessageBoxButtons.OK, MessageBoxIcon.Error); return false; } @@ -860,12 +875,12 @@ namespace DSPRE.ROMFiles { return false; } - if (sr.typeOfCaller is containerTypes.Script) { + if (sr.typeOfCaller is ContainerTypes.Script) { Console.WriteLine("Function " + funcID + " is directly called by Script " + sr.callerID); return true; } - if (sr.typeOfCaller is containerTypes.Function) { + if (sr.typeOfCaller is ContainerTypes.Function) { if (FunctionIsInvoked(refList, uninvokedFuncsSet, sr.callerID, ++callCount, excludedCaller: sr.invokedID)) { //check if caller function is invoked as well Console.WriteLine("Function " + funcID + " is called by Function " + sr.callerID); return true; @@ -877,8 +892,9 @@ namespace DSPRE.ROMFiles { } public bool SaveToFileDefaultDir(int IDtoReplace, bool showSuccessMessage = true) { - return SaveToFileDefaultDir(DirNames.scripts, IDtoReplace, showSuccessMessage); + return SaveToFileDefaultDir(RomInfo.DirNames.scripts, IDtoReplace, showSuccessMessage); } + public void SaveToFileExplorePath(string suggestedFileName, bool blindmode) { SaveFileDialog sf = new SaveFileDialog { Filter = "Gen IV Script File (*.scr)|*.scr" @@ -893,7 +909,8 @@ namespace DSPRE.ROMFiles { } if (blindmode) { - File.Copy(RomInfo.gameDirs[DirNames.scripts].unpackedDir + "\\" + ((int)fileID).ToString("D4"), sf.FileName, overwrite: true); + string path = Filesystem.GetScriptPath(fileID); + File.Copy(path, sf.FileName, overwrite: true); string msg = ""; if (!isLevelScript) { @@ -905,28 +922,5 @@ namespace DSPRE.ROMFiles { this.SaveToFile(sf.FileName, showSuccessMessage: true); } } - #endregion - #endregion } - - internal class ScriptReference { - public containerTypes typeOfCaller { get; private set; } - public uint callerID { get; private set; } - public containerTypes typeOfInvoked { get; private set; } - public uint invokedID { get; private set; } - public int invokedAt { get; private set; } - - public ScriptReference(containerTypes typeOfCaller, uint callerID, containerTypes invokedType, uint invokedID, int invokedAt) { - this.typeOfCaller = typeOfCaller; - this.callerID = callerID; - this.typeOfInvoked = invokedType; - this.invokedID = invokedID; - - this.invokedAt = invokedAt; - } - - public override string ToString() { - return typeOfCaller + " " + callerID + " invokes " + typeOfInvoked + " " + invokedID + " at " + invokedAt; - } - } -} \ No newline at end of file +} diff --git a/DS_Map/ROMFiles/ScriptReference.cs b/DS_Map/ROMFiles/ScriptReference.cs new file mode 100644 index 0000000..4b5eec1 --- /dev/null +++ b/DS_Map/ROMFiles/ScriptReference.cs @@ -0,0 +1,22 @@ +namespace DSPRE.ROMFiles { + internal class ScriptReference { + public ScriptFile.ContainerTypes typeOfCaller { get; private set; } + public uint callerID { get; private set; } + public ScriptFile.ContainerTypes typeOfInvoked { get; private set; } + public uint invokedID { get; private set; } + public int invokedAt { get; private set; } + + public ScriptReference(ScriptFile.ContainerTypes typeOfCaller, uint callerID, ScriptFile.ContainerTypes invokedType, uint invokedID, int invokedAt) { + this.typeOfCaller = typeOfCaller; + this.callerID = callerID; + this.typeOfInvoked = invokedType; + this.invokedID = invokedID; + + this.invokedAt = invokedAt; + } + + public override string ToString() { + return typeOfCaller + " " + callerID + " invokes " + typeOfInvoked + " " + invokedID + " at " + invokedAt; + } + } +} diff --git a/DS_Map/ROMFiles/VariableValueTrigger.cs b/DS_Map/ROMFiles/VariableValueTrigger.cs new file mode 100644 index 0000000..1c03c73 --- /dev/null +++ b/DS_Map/ROMFiles/VariableValueTrigger.cs @@ -0,0 +1,32 @@ +namespace DSPRE.ROMFiles { + public class VariableValueTrigger : LevelScriptTrigger { + public int variableToWatch { get; set; } + public int expectedValue { get; set; } + + public VariableValueTrigger(int scriptIDtoTrigger, int variableToWatch, int expectedValue) : base(VARIABLEVALUE, scriptIDtoTrigger) { + this.variableToWatch = variableToWatch; + this.expectedValue = expectedValue; + } + + public override string ToString() { + return base.ToString() + " when Var " + variableToWatch + " == " + expectedValue; + } + + public override bool Equals(object obj) { + // If the passed object is null + if (obj == null) { + return false; + } + + if (!(obj is VariableValueTrigger)) { + return false; + } + + return this.ToString() == ((VariableValueTrigger)obj).ToString(); + } + + public override int GetHashCode() { + return this.triggerType.GetHashCode() ^ variableToWatch.GetHashCode() ^ expectedValue.GetHashCode(); + } + } +} diff --git a/DS_Map/ROMToolboxDialog.cs b/DS_Map/ROMToolboxDialog.cs index d5b9b18..98f86ba 100644 --- a/DS_Map/ROMToolboxDialog.cs +++ b/DS_Map/ROMToolboxDialog.cs @@ -461,8 +461,7 @@ namespace DSPRE { private void ApplyItemStandardizeButton_Click(object sender, EventArgs e) { DialogResult d = MessageBox.Show("This process will apply the following changes:\n\n" + - "- Item scripts will be rearranged to follow the natural, ascending index order.\n\n" + - "- Any unsaved change to the current Event File will be discarded.\n\n", + "- Item scripts will be rearranged to follow the natural, ascending index order.\n\n", "Confirm to proceed", MessageBoxButtons.YesNo, MessageBoxIcon.Warning); if (d == DialogResult.Yes) { @@ -478,59 +477,35 @@ namespace DSPRE { ScriptFile itemScriptFile = new ScriptFile(RomInfo.itemScriptFileNumber); // Create map for: script no. -> vanilla item - int[] vanillaItemsArray = new int[itemScriptFile.allScripts.Count - 1]; + int[] vanillaItemsArray = new int[itemScriptFile.allScripts.Count]; for (int i = 0; i < itemScriptFile.allScripts.Count - 1; i++) { vanillaItemsArray[i] = BitConverter.ToInt16(itemScriptFile.allScripts[i].commands[0].cmdParams[1], 0); - }; + } // Parse all event files and fix instances of ground items according to the new order - int cnt = RomInfo.GetEventFileCount(); - (int min, int max) itemScriptRange = (7000, 8000); - - for (int i = 0; i < cnt; i++) { - bool dirty = false; - + for (int i = 0; i < Filesystem.GetEventFileCount(); i++) { EventFile eventFile = new EventFile(i); for (int j = 0; j < eventFile.overworlds.Count; j++) { // If ow is marked as an item, or in the rare case it is not but script no. falls within item script range: bool isItem = eventFile.overworlds[j].type == (ushort)Overworld.OwType.ITEM - || (eventFile.overworlds[j].scriptNumber >= itemScriptRange.min - && eventFile.overworlds[j].scriptNumber <= itemScriptRange.max); + || (eventFile.overworlds[j].scriptNumber >= 7000 + && eventFile.overworlds[j].scriptNumber <= 8000); if (isItem) { - int itemScriptID = eventFile.overworlds[j].scriptNumber - (itemScriptRange.min - 1); - eventFile.overworlds[j].scriptNumber = (ushort)(itemScriptRange.min + vanillaItemsArray[itemScriptID - 1]); - dirty = true; + int itemScriptID = eventFile.overworlds[j].scriptNumber - 6999; + eventFile.overworlds[j].scriptNumber = (ushort)(7000 + vanillaItemsArray[itemScriptID - 1]); } } // Save event file - if (dirty) { - eventFile.SaveToFileDefaultDir(i, showSuccessMessage: false); - } - }; - - //Distortion world - turnback cave Griseous Orb fix - if (gameFamily.Equals(GameFamilies.Plat)) { - string ow9path = DSUtils.GetOverlayPath(9); - int ow9offs = 0x8E20 + 10; - - int itemScriptID; - - using (DSUtils.EasyReader ewr = new DSUtils.EasyReader(ow9path, ow9offs)) { - itemScriptID = ewr.ReadUInt16() - (itemScriptRange.min - 1); - } - - using (DSUtils.EasyWriter ewr = new DSUtils.EasyWriter(ow9path, ow9offs)) { - ewr.Write((ushort)(itemScriptRange.min + vanillaItemsArray[itemScriptID - 1])); - } + eventFile.SaveToFileDefaultDir(i, showSuccessMessage: false); } // Sort scripts in the Script File according to item indices int itemCount = new TextArchive(RomInfo.itemNamesTextNumber).messages.Count; - CommandContainer executeGive = new CommandContainer((uint)itemCount + 1, itemScriptFile.allScripts[itemScriptFile.allScripts.Count - 1]); + ScriptCommandContainer executeGive = new ScriptCommandContainer((uint)itemCount, itemScriptFile.allScripts[itemScriptFile.allScripts.Count - 1]); itemScriptFile.allScripts.Clear(); @@ -542,11 +517,11 @@ namespace DSPRE { new ScriptCommand("Jump Function_#1") }; - itemScriptFile.allScripts.Add(new CommandContainer((ushort)(i + 1), ScriptFile.containerTypes.Script, commandList: cmdList)); + itemScriptFile.allScripts.Add(new ScriptCommandContainer((ushort)(i + 1), ScriptFile.ContainerTypes.Script, commandList: cmdList)); } itemScriptFile.allScripts.Add(executeGive); - itemScriptFile.allFunctions[0].usedScript = itemCount + 1; + itemScriptFile.allFunctions[0].usedScriptID = itemCount + 1; itemScriptFile.SaveToFileDefaultDir(RomInfo.itemScriptFileNumber, showSuccessMessage: false); MessageBox.Show("Operation successful.", "Process completed.", MessageBoxButtons.OK, MessageBoxIcon.Information); diff --git a/DS_Map/Resources/ScriptDatabase.cs b/DS_Map/Resources/ScriptDatabase.cs index a70e808..a402edc 100644 --- a/DS_Map/Resources/ScriptDatabase.cs +++ b/DS_Map/Resources/ScriptDatabase.cs @@ -156,6 +156,10 @@ namespace DSPRE.Resources { [0x00FE] = "End" }; + public static HashSet movementEndCodes = new HashSet() { + 0x00FE, + }; + public static Dictionary DPPtScrCmdNames = new Dictionary() { [0x0000] = "Nop", [0x0001] = "Dummy", From 1f759ef0f7cd85f9c9ca1c95b6431bf2b33efcd3 Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Sun, 3 Mar 2024 18:32:30 +0100 Subject: [PATCH 21/40] Incorporated Safari and Headbutt editors Co-authored-by: Cuddlyogre --- DS_Map/DSPRE.csproj | 54 ++ DS_Map/DSUtils.cs | 31 +- DS_Map/Editors/EncountersEditor.Designer.cs | 115 ++++ DS_Map/Editors/EncountersEditor.cs | 27 + DS_Map/Editors/EncountersEditor.resx | 120 +++++ .../HeadbuttEncounterEditor.Designer.cs | 459 ++++++++++++++++ DS_Map/Editors/HeadbuttEncounterEditor.cs | 491 ++++++++++++++++++ DS_Map/Editors/HeadbuttEncounterEditor.resx | 120 +++++ .../HeadbuttEncounterEditorTab.Designer.cs | 235 +++++++++ DS_Map/Editors/HeadbuttEncounterEditorTab.cs | 95 ++++ .../Editors/HeadbuttEncounterEditorTab.resx | 120 +++++ DS_Map/Editors/SafariZoneEditor.Designer.cs | 250 +++++++++ DS_Map/Editors/SafariZoneEditor.cs | 105 ++++ DS_Map/Editors/SafariZoneEditor.resx | 120 +++++ .../SafariZoneEncounterEditorTab.Designer.cs | 218 ++++++++ .../Editors/SafariZoneEncounterEditorTab.cs | 63 +++ .../Editors/SafariZoneEncounterEditorTab.resx | 120 +++++ ...SafariZoneEncounterGroupEditor.Designer.cs | 323 ++++++++++++ .../Editors/SafariZoneEncounterGroupEditor.cs | 143 +++++ .../SafariZoneEncounterGroupEditor.resx | 120 +++++ DS_Map/Main Window.Designer.cs | 337 ++++++------ DS_Map/Main Window.cs | 17 +- DS_Map/Main Window.resx | 183 ++++--- DS_Map/Properties/AssemblyInfo.cs | 8 +- DS_Map/ROMFiles/MapFile.cs | 18 + DS_Map/RomInfo.cs | 31 +- 26 files changed, 3640 insertions(+), 283 deletions(-) create mode 100644 DS_Map/Editors/EncountersEditor.Designer.cs create mode 100644 DS_Map/Editors/EncountersEditor.cs create mode 100644 DS_Map/Editors/EncountersEditor.resx create mode 100644 DS_Map/Editors/HeadbuttEncounterEditor.Designer.cs create mode 100644 DS_Map/Editors/HeadbuttEncounterEditor.cs create mode 100644 DS_Map/Editors/HeadbuttEncounterEditor.resx create mode 100644 DS_Map/Editors/HeadbuttEncounterEditorTab.Designer.cs create mode 100644 DS_Map/Editors/HeadbuttEncounterEditorTab.cs create mode 100644 DS_Map/Editors/HeadbuttEncounterEditorTab.resx create mode 100644 DS_Map/Editors/SafariZoneEditor.Designer.cs create mode 100644 DS_Map/Editors/SafariZoneEditor.cs create mode 100644 DS_Map/Editors/SafariZoneEditor.resx create mode 100644 DS_Map/Editors/SafariZoneEncounterEditorTab.Designer.cs create mode 100644 DS_Map/Editors/SafariZoneEncounterEditorTab.cs create mode 100644 DS_Map/Editors/SafariZoneEncounterEditorTab.resx create mode 100644 DS_Map/Editors/SafariZoneEncounterGroupEditor.Designer.cs create mode 100644 DS_Map/Editors/SafariZoneEncounterGroupEditor.cs create mode 100644 DS_Map/Editors/SafariZoneEncounterGroupEditor.resx diff --git a/DS_Map/DSPRE.csproj b/DS_Map/DSPRE.csproj index dc0ef6e..63ac31d 100644 --- a/DS_Map/DSPRE.csproj +++ b/DS_Map/DSPRE.csproj @@ -96,12 +96,48 @@ + + UserControl + + + EncountersEditor.cs + + + UserControl + + + HeadbuttEncounterEditor.cs + + + UserControl + + + HeadbuttEncounterEditorTab.cs + UserControl LevelScriptEditor.cs + + UserControl + + + SafariZoneEditor.cs + + + UserControl + + + SafariZoneEncounterEditorTab.cs + + + UserControl + + + SafariZoneEncounterGroupEditor.cs + UserControl @@ -311,9 +347,27 @@ + + EncountersEditor.cs + + + HeadbuttEncounterEditor.cs + + + HeadbuttEncounterEditorTab.cs + LevelScriptEditor.cs + + SafariZoneEditor.cs + + + SafariZoneEncounterEditorTab.cs + + + SafariZoneEncounterGroupEditor.cs + ScriptEditor.cs diff --git a/DS_Map/DSUtils.cs b/DS_Map/DSUtils.cs index 3313457..b001237 100644 --- a/DS_Map/DSUtils.cs +++ b/DS_Map/DSUtils.cs @@ -431,23 +431,28 @@ namespace DSPRE { return b; } - public static void TryUnpackNarcs(List IDs) { + public static void TryUnpackNarcs(List IDs) { Parallel.ForEach(IDs, id => { - if (gameDirs.TryGetValue(id, out (string packedPath, string unpackedPath) paths)) { - DirectoryInfo di = new DirectoryInfo(paths.unpackedPath); - - if (!di.Exists || di.GetFiles().Length == 0) { - Narc opened = Narc.Open(paths.packedPath); - - if (opened is null) { - throw new NullReferenceException(); - } - - opened.ExtractToFolder(paths.unpackedPath); - } + if (!RomInfo.gameDirs.TryGetValue(id, out (string packedPath, string unpackedPath) paths)) { + return; } + + DirectoryInfo di = new DirectoryInfo(paths.unpackedPath); + + if (di.Exists && di.GetFiles().Length != 0) { + return; + } + + Narc opened = Narc.Open(paths.packedPath); + + if (opened is null) { + throw new NullReferenceException(); + } + + opened.ExtractToFolder(paths.unpackedPath); }); } + public static void ForceUnpackNarcs(List IDs) { Parallel.ForEach(IDs, id => { if (gameDirs.TryGetValue(id, out (string packedPath, string unpackedPath) paths)) { diff --git a/DS_Map/Editors/EncountersEditor.Designer.cs b/DS_Map/Editors/EncountersEditor.Designer.cs new file mode 100644 index 0000000..842c2ff --- /dev/null +++ b/DS_Map/Editors/EncountersEditor.Designer.cs @@ -0,0 +1,115 @@ + +namespace DSPRE.Editors +{ + partial class EncountersEditor + { + /// + /// 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 Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.tabControl = new System.Windows.Forms.TabControl(); + this.tabPageHeadbuttEditor = new System.Windows.Forms.TabPage(); + this.headbuttEncounterEditor = new DSPRE.Editors.HeadbuttEncounterEditor(); + this.tabPageSafariZoneEditor = new System.Windows.Forms.TabPage(); + this.safariZoneEditor = new DSPRE.Editors.SafariZoneEditor(); + this.tabControl.SuspendLayout(); + this.tabPageHeadbuttEditor.SuspendLayout(); + this.tabPageSafariZoneEditor.SuspendLayout(); + this.SuspendLayout(); + // + // tabControl + // + this.tabControl.Controls.Add(this.tabPageHeadbuttEditor); + this.tabControl.Controls.Add(this.tabPageSafariZoneEditor); + this.tabControl.Location = new System.Drawing.Point(4, 4); + this.tabControl.Name = "tabControl"; + this.tabControl.SelectedIndex = 0; + this.tabControl.Size = new System.Drawing.Size(1103, 654); + this.tabControl.TabIndex = 2; + // + // tabPageHeadbuttEditor + // + this.tabPageHeadbuttEditor.Controls.Add(this.headbuttEncounterEditor); + this.tabPageHeadbuttEditor.Location = new System.Drawing.Point(4, 22); + this.tabPageHeadbuttEditor.Name = "tabPageHeadbuttEditor"; + this.tabPageHeadbuttEditor.Padding = new System.Windows.Forms.Padding(3); + this.tabPageHeadbuttEditor.Size = new System.Drawing.Size(1095, 628); + this.tabPageHeadbuttEditor.TabIndex = 0; + this.tabPageHeadbuttEditor.Text = "Headbutt"; + this.tabPageHeadbuttEditor.UseVisualStyleBackColor = true; + this.tabPageHeadbuttEditor.Enter += new System.EventHandler(this.tabPageHeadbuttEditor_Enter); + // + // headbuttEncounterEditor + // + this.headbuttEncounterEditor.BackColor = System.Drawing.SystemColors.Control; + this.headbuttEncounterEditor.headbuttEncounterEditorIsReady = false; + this.headbuttEncounterEditor.Location = new System.Drawing.Point(6, 6); + this.headbuttEncounterEditor.Name = "headbuttEncounterEditor"; + this.headbuttEncounterEditor.Size = new System.Drawing.Size(1081, 621); + this.headbuttEncounterEditor.TabIndex = 1; + // + // tabPageSafariZoneEditor + // + this.tabPageSafariZoneEditor.Controls.Add(this.safariZoneEditor); + this.tabPageSafariZoneEditor.Location = new System.Drawing.Point(4, 22); + this.tabPageSafariZoneEditor.Name = "tabPageSafariZoneEditor"; + this.tabPageSafariZoneEditor.Padding = new System.Windows.Forms.Padding(3); + this.tabPageSafariZoneEditor.Size = new System.Drawing.Size(1095, 628); + this.tabPageSafariZoneEditor.TabIndex = 1; + this.tabPageSafariZoneEditor.Text = "Safari Zone"; + this.tabPageSafariZoneEditor.UseVisualStyleBackColor = true; + this.tabPageSafariZoneEditor.Enter += new System.EventHandler(this.tabPageSafariZoneEditor_Enter); + // + // safariZoneEditor + // + this.safariZoneEditor.Location = new System.Drawing.Point(6, 6); + this.safariZoneEditor.Name = "safariZoneEditor"; + this.safariZoneEditor.safariZoneEditorIsReady = false; + this.safariZoneEditor.Size = new System.Drawing.Size(996, 341); + this.safariZoneEditor.TabIndex = 1; + // + // EncountersEditor + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.tabControl); + this.Name = "EncountersEditor"; + this.Size = new System.Drawing.Size(1111, 664); + this.tabControl.ResumeLayout(false); + this.tabPageHeadbuttEditor.ResumeLayout(false); + this.tabPageSafariZoneEditor.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + public HeadbuttEncounterEditor headbuttEncounterEditor; + private System.Windows.Forms.TabControl tabControl; + private System.Windows.Forms.TabPage tabPageHeadbuttEditor; + private System.Windows.Forms.TabPage tabPageSafariZoneEditor; + public SafariZoneEditor safariZoneEditor; + } +} diff --git a/DS_Map/Editors/EncountersEditor.cs b/DS_Map/Editors/EncountersEditor.cs new file mode 100644 index 0000000..f9bafb4 --- /dev/null +++ b/DS_Map/Editors/EncountersEditor.cs @@ -0,0 +1,27 @@ +using System.Windows.Forms; + +namespace DSPRE.Editors +{ + public partial class EncountersEditor : UserControl + { + public EncountersEditor() + { + InitializeComponent(); + } + + public void SetupEncountersEditor() { + tabPageHeadbuttEditor_Enter(null, null); + } + + private void tabPageHeadbuttEditor_Enter(object sender, System.EventArgs e) + { + headbuttEncounterEditor.SetupHeadbuttEncounterEditor(); + headbuttEncounterEditor.makeCurrent(); + } + + private void tabPageSafariZoneEditor_Enter(object sender, System.EventArgs e) + { + safariZoneEditor.SetupSafariZoneEditor(); + } + } +} diff --git a/DS_Map/Editors/EncountersEditor.resx b/DS_Map/Editors/EncountersEditor.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/DS_Map/Editors/EncountersEditor.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/HeadbuttEncounterEditor.Designer.cs b/DS_Map/Editors/HeadbuttEncounterEditor.Designer.cs new file mode 100644 index 0000000..b1842db --- /dev/null +++ b/DS_Map/Editors/HeadbuttEncounterEditor.Designer.cs @@ -0,0 +1,459 @@ +using System.ComponentModel; + +namespace DSPRE.Editors { + partial class HeadbuttEncounterEditor { + /// + /// Required designer variable. + /// + private 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 Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() { + this.buttonSaveAs = new System.Windows.Forms.Button(); + this.buttonSave = new System.Windows.Forms.Button(); + this.tabControl = new System.Windows.Forms.TabControl(); + this.tabPageNormal = new System.Windows.Forms.TabPage(); + this.headbuttEncounterEditorTabNormal = new DSPRE.Editors.HeadbuttEncounterEditorTab(); + this.tabPageSpecial = new System.Windows.Forms.TabPage(); + this.headbuttEncounterEditorTabSpecial = new DSPRE.Editors.HeadbuttEncounterEditorTab(); + this.mapRenderPanel = new System.Windows.Forms.Panel(); + this.openGlPictureBox = new System.Windows.Forms.PictureBox(); + this.mapScreenshotButton = new System.Windows.Forms.Button(); + this.comboBoxMapHeader = new System.Windows.Forms.ComboBox(); + this.comboBoxMapFile = new System.Windows.Forms.ComboBox(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.labelLocationName = new System.Windows.Forms.Label(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.numericUpDownTreeGlobalX = new System.Windows.Forms.NumericUpDown(); + this.numericUpDownTreeGlobalY = new System.Windows.Forms.NumericUpDown(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.numericUpDownTreeMatrixX = new System.Windows.Forms.NumericUpDown(); + this.numericUpDownTreeMatrixY = new System.Windows.Forms.NumericUpDown(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.numericUpDownTreeMapX = new System.Windows.Forms.NumericUpDown(); + this.numericUpDownTreeMapY = new System.Windows.Forms.NumericUpDown(); + this.RightClickLabel = new System.Windows.Forms.Label(); + this.LeftClickLabel = new System.Windows.Forms.Label(); + this.LeftClickPicture = new System.Windows.Forms.PictureBox(); + this.rightClickPicture = new System.Windows.Forms.PictureBox(); + this.buttonImport = new System.Windows.Forms.Button(); + this.tabControl.SuspendLayout(); + this.tabPageNormal.SuspendLayout(); + this.tabPageSpecial.SuspendLayout(); + this.mapRenderPanel.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.openGlPictureBox)).BeginInit(); + this.groupBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownTreeGlobalX)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownTreeGlobalY)).BeginInit(); + this.groupBox2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownTreeMatrixX)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownTreeMatrixY)).BeginInit(); + this.groupBox3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownTreeMapX)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownTreeMapY)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.LeftClickPicture)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.rightClickPicture)).BeginInit(); + this.SuspendLayout(); + // + // buttonSaveAs + // + this.buttonSaveAs.Location = new System.Drawing.Point(338, 29); + this.buttonSaveAs.Name = "buttonSaveAs"; + this.buttonSaveAs.Size = new System.Drawing.Size(75, 23); + this.buttonSaveAs.TabIndex = 9; + this.buttonSaveAs.Text = "Save As"; + this.buttonSaveAs.UseVisualStyleBackColor = true; + this.buttonSaveAs.Click += new System.EventHandler(this.buttonSaveAs_Click); + // + // buttonSave + // + this.buttonSave.Location = new System.Drawing.Point(338, 3); + this.buttonSave.Name = "buttonSave"; + this.buttonSave.Size = new System.Drawing.Size(75, 23); + this.buttonSave.TabIndex = 10; + this.buttonSave.Text = "Save"; + this.buttonSave.UseVisualStyleBackColor = true; + this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click); + // + // tabControl + // + this.tabControl.Controls.Add(this.tabPageNormal); + this.tabControl.Controls.Add(this.tabPageSpecial); + this.tabControl.Location = new System.Drawing.Point(3, 71); + this.tabControl.Name = "tabControl"; + this.tabControl.SelectedIndex = 0; + this.tabControl.Size = new System.Drawing.Size(274, 544); + this.tabControl.TabIndex = 21; + // + // tabPageNormal + // + this.tabPageNormal.Controls.Add(this.headbuttEncounterEditorTabNormal); + this.tabPageNormal.Location = new System.Drawing.Point(4, 22); + this.tabPageNormal.Name = "tabPageNormal"; + this.tabPageNormal.Padding = new System.Windows.Forms.Padding(3); + this.tabPageNormal.Size = new System.Drawing.Size(266, 518); + this.tabPageNormal.TabIndex = 0; + this.tabPageNormal.Text = "Normal"; + this.tabPageNormal.UseVisualStyleBackColor = true; + // + // headbuttEncounterEditorTabNormal + // + this.headbuttEncounterEditorTabNormal.Location = new System.Drawing.Point(2, 2); + this.headbuttEncounterEditorTabNormal.Name = "headbuttEncounterEditorTabNormal"; + this.headbuttEncounterEditorTabNormal.Size = new System.Drawing.Size(264, 519); + this.headbuttEncounterEditorTabNormal.TabIndex = 0; + // + // tabPageSpecial + // + this.tabPageSpecial.Controls.Add(this.headbuttEncounterEditorTabSpecial); + this.tabPageSpecial.Location = new System.Drawing.Point(4, 22); + this.tabPageSpecial.Name = "tabPageSpecial"; + this.tabPageSpecial.Padding = new System.Windows.Forms.Padding(3); + this.tabPageSpecial.Size = new System.Drawing.Size(266, 518); + this.tabPageSpecial.TabIndex = 1; + this.tabPageSpecial.Text = "Special"; + this.tabPageSpecial.UseVisualStyleBackColor = true; + // + // headbuttEncounterEditorTabSpecial + // + this.headbuttEncounterEditorTabSpecial.Location = new System.Drawing.Point(2, 2); + this.headbuttEncounterEditorTabSpecial.Name = "headbuttEncounterEditorTabSpecial"; + this.headbuttEncounterEditorTabSpecial.Size = new System.Drawing.Size(402, 518); + this.headbuttEncounterEditorTabSpecial.TabIndex = 0; + // + // mapRenderPanel + // + this.mapRenderPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.mapRenderPanel.Controls.Add(this.openGlPictureBox); + this.mapRenderPanel.Location = new System.Drawing.Point(419, 4); + this.mapRenderPanel.Name = "mapRenderPanel"; + this.mapRenderPanel.Size = new System.Drawing.Size(610, 610); + this.mapRenderPanel.TabIndex = 24; + // + // openGlPictureBox + // + this.openGlPictureBox.BackColor = System.Drawing.Color.White; + this.openGlPictureBox.Location = new System.Drawing.Point(0, 0); + this.openGlPictureBox.Name = "openGlPictureBox"; + this.openGlPictureBox.Size = new System.Drawing.Size(608, 608); + this.openGlPictureBox.TabIndex = 3; + this.openGlPictureBox.TabStop = false; + this.openGlPictureBox.Click += new System.EventHandler(this.openGlPictureBox_Click); + // + // mapScreenshotButton + // + this.mapScreenshotButton.Image = global::DSPRE.Properties.Resources.cameraIcon; + this.mapScreenshotButton.Location = new System.Drawing.Point(1034, 574); + 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); + // + // comboBoxMapHeader + // + this.comboBoxMapHeader.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBoxMapHeader.FormattingEnabled = true; + this.comboBoxMapHeader.Location = new System.Drawing.Point(54, 4); + this.comboBoxMapHeader.Name = "comboBoxMapHeader"; + this.comboBoxMapHeader.Size = new System.Drawing.Size(278, 21); + this.comboBoxMapHeader.TabIndex = 40; + this.comboBoxMapHeader.SelectedIndexChanged += new System.EventHandler(this.comboBoxMapHeader_SelectedIndexChanged); + // + // comboBoxMapFile + // + this.comboBoxMapFile.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBoxMapFile.FormattingEnabled = true; + this.comboBoxMapFile.Location = new System.Drawing.Point(54, 31); + this.comboBoxMapFile.Name = "comboBoxMapFile"; + this.comboBoxMapFile.Size = new System.Drawing.Size(278, 21); + this.comboBoxMapFile.TabIndex = 40; + this.comboBoxMapFile.SelectedIndexChanged += new System.EventHandler(this.comboBoxMapFile_SelectedIndexChanged); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(6, 7); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(42, 13); + this.label1.TabIndex = 41; + this.label1.Text = "Header"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(20, 36); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(28, 13); + this.label2.TabIndex = 41; + this.label2.Text = "Map"; + // + // labelLocationName + // + this.labelLocationName.AutoSize = true; + this.labelLocationName.Location = new System.Drawing.Point(51, 55); + this.labelLocationName.Name = "labelLocationName"; + this.labelLocationName.Size = new System.Drawing.Size(35, 13); + this.labelLocationName.TabIndex = 42; + this.labelLocationName.Text = "label3"; + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.numericUpDownTreeGlobalX); + this.groupBox1.Controls.Add(this.numericUpDownTreeGlobalY); + this.groupBox1.Location = new System.Drawing.Point(279, 452); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(134, 49); + this.groupBox1.TabIndex = 16; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Global"; + // + // numericUpDownTreeGlobalX + // + this.numericUpDownTreeGlobalX.Location = new System.Drawing.Point(6, 19); + this.numericUpDownTreeGlobalX.Maximum = new decimal(new int[] { + 65535, + 0, + 0, + 0}); + this.numericUpDownTreeGlobalX.Name = "numericUpDownTreeGlobalX"; + this.numericUpDownTreeGlobalX.Size = new System.Drawing.Size(58, 20); + this.numericUpDownTreeGlobalX.TabIndex = 15; + this.numericUpDownTreeGlobalX.ValueChanged += new System.EventHandler(this.numericUpDownTreeGlobalX_ValueChanged); + // + // numericUpDownTreeGlobalY + // + this.numericUpDownTreeGlobalY.Location = new System.Drawing.Point(70, 19); + this.numericUpDownTreeGlobalY.Maximum = new decimal(new int[] { + 65535, + 0, + 0, + 0}); + this.numericUpDownTreeGlobalY.Name = "numericUpDownTreeGlobalY"; + this.numericUpDownTreeGlobalY.Size = new System.Drawing.Size(58, 20); + this.numericUpDownTreeGlobalY.TabIndex = 15; + this.numericUpDownTreeGlobalY.ValueChanged += new System.EventHandler(this.numericUpDownTreeGlobalY_ValueChanged); + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.numericUpDownTreeMatrixX); + this.groupBox2.Controls.Add(this.numericUpDownTreeMatrixY); + this.groupBox2.Location = new System.Drawing.Point(279, 507); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(134, 49); + this.groupBox2.TabIndex = 16; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "Matrix"; + // + // numericUpDownTreeMatrixX + // + this.numericUpDownTreeMatrixX.Location = new System.Drawing.Point(6, 19); + this.numericUpDownTreeMatrixX.Maximum = new decimal(new int[] { + 65535, + 0, + 0, + 0}); + this.numericUpDownTreeMatrixX.Name = "numericUpDownTreeMatrixX"; + this.numericUpDownTreeMatrixX.Size = new System.Drawing.Size(58, 20); + this.numericUpDownTreeMatrixX.TabIndex = 15; + this.numericUpDownTreeMatrixX.ValueChanged += new System.EventHandler(this.numericUpDownTreeMatrixX_ValueChanged); + // + // numericUpDownTreeMatrixY + // + this.numericUpDownTreeMatrixY.Location = new System.Drawing.Point(70, 19); + this.numericUpDownTreeMatrixY.Maximum = new decimal(new int[] { + 65535, + 0, + 0, + 0}); + this.numericUpDownTreeMatrixY.Name = "numericUpDownTreeMatrixY"; + this.numericUpDownTreeMatrixY.Size = new System.Drawing.Size(58, 20); + this.numericUpDownTreeMatrixY.TabIndex = 15; + this.numericUpDownTreeMatrixY.ValueChanged += new System.EventHandler(this.numericUpDownTreeMatrixY_ValueChanged); + // + // groupBox3 + // + this.groupBox3.Controls.Add(this.numericUpDownTreeMapX); + this.groupBox3.Controls.Add(this.numericUpDownTreeMapY); + this.groupBox3.Location = new System.Drawing.Point(279, 562); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Size = new System.Drawing.Size(134, 49); + this.groupBox3.TabIndex = 16; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "Local"; + // + // numericUpDownTreeMapX + // + this.numericUpDownTreeMapX.Location = new System.Drawing.Point(6, 19); + this.numericUpDownTreeMapX.Maximum = new decimal(new int[] { + 31, + 0, + 0, + 0}); + this.numericUpDownTreeMapX.Name = "numericUpDownTreeMapX"; + this.numericUpDownTreeMapX.Size = new System.Drawing.Size(58, 20); + this.numericUpDownTreeMapX.TabIndex = 15; + this.numericUpDownTreeMapX.ValueChanged += new System.EventHandler(this.numericUpDownTreeMapX_ValueChanged); + // + // numericUpDownTreeMapY + // + this.numericUpDownTreeMapY.Location = new System.Drawing.Point(70, 19); + this.numericUpDownTreeMapY.Maximum = new decimal(new int[] { + 31, + 0, + 0, + 0}); + this.numericUpDownTreeMapY.Name = "numericUpDownTreeMapY"; + this.numericUpDownTreeMapY.Size = new System.Drawing.Size(58, 20); + this.numericUpDownTreeMapY.TabIndex = 15; + this.numericUpDownTreeMapY.ValueChanged += new System.EventHandler(this.numericUpDownTreeMapY_ValueChanged); + // + // RightClickLabel + // + this.RightClickLabel.AutoSize = true; + this.RightClickLabel.Location = new System.Drawing.Point(308, 425); + this.RightClickLabel.Name = "RightClickLabel"; + this.RightClickLabel.Size = new System.Drawing.Size(37, 13); + this.RightClickLabel.TabIndex = 66; + this.RightClickLabel.Text = "Select"; + // + // LeftClickLabel + // + this.LeftClickLabel.AutoSize = true; + this.LeftClickLabel.Location = new System.Drawing.Point(352, 425); + this.LeftClickLabel.Name = "LeftClickLabel"; + this.LeftClickLabel.Size = new System.Drawing.Size(34, 13); + this.LeftClickLabel.TabIndex = 63; + this.LeftClickLabel.Text = "Move"; + // + // LeftClickPicture + // + this.LeftClickPicture.Image = global::DSPRE.Properties.Resources.LeftClick; + this.LeftClickPicture.ImageLocation = ""; + this.LeftClickPicture.Location = new System.Drawing.Point(349, 387); + this.LeftClickPicture.Name = "LeftClickPicture"; + this.LeftClickPicture.Size = new System.Drawing.Size(38, 38); + this.LeftClickPicture.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.LeftClickPicture.TabIndex = 61; + this.LeftClickPicture.TabStop = false; + // + // rightClickPicture + // + this.rightClickPicture.Image = global::DSPRE.Properties.Resources.RightClick; + this.rightClickPicture.ImageLocation = ""; + this.rightClickPicture.Location = new System.Drawing.Point(307, 387); + this.rightClickPicture.Name = "rightClickPicture"; + this.rightClickPicture.Size = new System.Drawing.Size(38, 38); + this.rightClickPicture.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.rightClickPicture.TabIndex = 65; + this.rightClickPicture.TabStop = false; + // + // buttonImport + // + this.buttonImport.Location = new System.Drawing.Point(338, 55); + this.buttonImport.Name = "buttonImport"; + this.buttonImport.Size = new System.Drawing.Size(75, 23); + this.buttonImport.TabIndex = 9; + this.buttonImport.Text = "Import"; + this.buttonImport.UseVisualStyleBackColor = true; + this.buttonImport.Click += new System.EventHandler(this.buttonImport_Click); + // + // HeadbuttEncounterEditor + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.SystemColors.Control; + this.Controls.Add(this.RightClickLabel); + this.Controls.Add(this.LeftClickLabel); + this.Controls.Add(this.LeftClickPicture); + this.Controls.Add(this.rightClickPicture); + this.Controls.Add(this.labelLocationName); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Controls.Add(this.comboBoxMapFile); + this.Controls.Add(this.comboBoxMapHeader); + this.Controls.Add(this.groupBox3); + this.Controls.Add(this.mapRenderPanel); + this.Controls.Add(this.tabControl); + this.Controls.Add(this.mapScreenshotButton); + this.Controls.Add(this.groupBox2); + this.Controls.Add(this.buttonImport); + this.Controls.Add(this.buttonSaveAs); + this.Controls.Add(this.buttonSave); + this.Controls.Add(this.groupBox1); + this.Location = new System.Drawing.Point(15, 15); + this.Name = "HeadbuttEncounterEditor"; + this.Size = new System.Drawing.Size(1080, 620); + this.tabControl.ResumeLayout(false); + this.tabPageNormal.ResumeLayout(false); + this.tabPageSpecial.ResumeLayout(false); + this.mapRenderPanel.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.openGlPictureBox)).EndInit(); + this.groupBox1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownTreeGlobalX)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownTreeGlobalY)).EndInit(); + this.groupBox2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownTreeMatrixX)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownTreeMatrixY)).EndInit(); + this.groupBox3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownTreeMapX)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownTreeMapY)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.LeftClickPicture)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.rightClickPicture)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + private System.Windows.Forms.Button buttonSaveAs; + private System.Windows.Forms.Button buttonSave; + + #endregion + private System.Windows.Forms.TabControl tabControl; + private System.Windows.Forms.TabPage tabPageNormal; + private System.Windows.Forms.TabPage tabPageSpecial; + private HeadbuttEncounterEditorTab headbuttEncounterEditorTabNormal; + private HeadbuttEncounterEditorTab headbuttEncounterEditorTabSpecial; + private System.Windows.Forms.Panel mapRenderPanel; + private System.Windows.Forms.PictureBox openGlPictureBox; + private System.Windows.Forms.Button mapScreenshotButton; + private System.Windows.Forms.ComboBox comboBoxMapHeader; + private System.Windows.Forms.ComboBox comboBoxMapFile; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label labelLocationName; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.NumericUpDown numericUpDownTreeGlobalX; + private System.Windows.Forms.NumericUpDown numericUpDownTreeGlobalY; + private System.Windows.Forms.GroupBox groupBox2; + private System.Windows.Forms.NumericUpDown numericUpDownTreeMatrixX; + private System.Windows.Forms.NumericUpDown numericUpDownTreeMatrixY; + private System.Windows.Forms.GroupBox groupBox3; + private System.Windows.Forms.NumericUpDown numericUpDownTreeMapX; + private System.Windows.Forms.NumericUpDown numericUpDownTreeMapY; + private System.Windows.Forms.Label RightClickLabel; + private System.Windows.Forms.Label LeftClickLabel; + private System.Windows.Forms.PictureBox LeftClickPicture; + private System.Windows.Forms.PictureBox rightClickPicture; + private System.Windows.Forms.Button buttonImport; + } +} + diff --git a/DS_Map/Editors/HeadbuttEncounterEditor.cs b/DS_Map/Editors/HeadbuttEncounterEditor.cs new file mode 100644 index 0000000..e497ee5 --- /dev/null +++ b/DS_Map/Editors/HeadbuttEncounterEditor.cs @@ -0,0 +1,491 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Drawing.Drawing2D; +using System.IO; +using System.Windows.Forms; +using DSPRE.ROMFiles; + +namespace DSPRE.Editors { + public partial class HeadbuttEncounterEditor : UserControl { + public bool headbuttEncounterEditorIsReady { get; set; } = false; + + private ListBox2 listBoxTrees; + private HeadbuttTree headbuttTree; + + private HeaderHGSS mapHeader; + private HeadbuttEncounterFile headbuttEncounterFile; + private HeadbuttEncounterMap headbuttEncounterMap; + private GameMatrix gameMatrix; + private AreaData areaData; + private MapFile mapFile; + private string locationName; + + private int width; + private int height; + static SimpleOpenGlControl2 openGlControl; + + private Pen selectedPen; + private Pen normalPen; + private SolidBrush normalBrush; + private Pen specialPen; + private SolidBrush specialBrush; + + private static float perspective; + private static float ang; + private static float dist; + private static float elev; + + public HeadbuttEncounterEditor() { + InitializeComponent(); + } + + //TODO: refresh headers list if a header is added + public void SetupHeadbuttEncounterEditor(bool force = false) { + if (headbuttEncounterEditorIsReady && !force) return; + headbuttEncounterEditorIsReady = true; + + DSUtils.TryUnpackNarcs(new List() { + RomInfo.DirNames.dynamicHeaders, + RomInfo.DirNames.matrices, + RomInfo.DirNames.textArchives, + RomInfo.DirNames.areaData, + RomInfo.DirNames.headbutt, + RomInfo.DirNames.maps, + RomInfo.DirNames.mapTextures, + RomInfo.DirNames.exteriorBuildingModels, + RomInfo.DirNames.buildingTextures, + }); + + width = openGlPictureBox.Width; + height = openGlPictureBox.Height; + + openGlControl = new SimpleOpenGlControl2(); + openGlControl.InitializeContexts(); + openGlControl.Width = width; + openGlControl.Height = height; + openGlControl.Invalidate(); + openGlControl.MakeCurrent(); + + List headerListBoxNames = Helpers.getHeaderListBoxNames(); + + Color selectedColor = Color.FromArgb(255, Color.White); + selectedPen = new Pen(selectedColor); + + Color normalColor = Color.FromArgb(128, Color.DarkBlue); + normalPen = new Pen(normalColor); + normalBrush = new SolidBrush(normalColor); + + Color specialColor = Color.FromArgb(128, Color.DarkRed); + specialPen = new Pen(specialColor); + specialBrush = new SolidBrush(specialColor); + + Helpers.DisableHandlers(); + + for (int i = 0; i < Filesystem.GetHeadbuttCount(); i++) { + if (i < headerListBoxNames.Count) { + comboBoxMapHeader.Items.Add(headerListBoxNames[i]); + } + else { + i.ToString("D4"); + } + } + + string[] pokemonNames = RomInfo.GetPokemonNames(); + headbuttEncounterEditorTabNormal.comboBoxPokemon.Items.AddRange(pokemonNames); + headbuttEncounterEditorTabNormal.comboBoxPokemon.SelectedIndex = 0; + headbuttEncounterEditorTabNormal.listBoxTrees.SelectedIndexChanged += ListBoxTrees_SelectedIndexChanged; + + headbuttEncounterEditorTabSpecial.comboBoxPokemon.Items.AddRange(pokemonNames); + headbuttEncounterEditorTabSpecial.comboBoxPokemon.SelectedIndex = 0; + headbuttEncounterEditorTabSpecial.listBoxTrees.SelectedIndexChanged += ListBoxTrees_SelectedIndexChanged; + + openGlPictureBox.BringToFront(); + SetCam2DValues(); + + Helpers.EnableHandlers(); + + if (comboBoxMapHeader.Items.Count > 0) { + comboBoxMapHeader.SelectedIndex = 0; + } + } + + public void makeCurrent() { + openGlControl.MakeCurrent(); + } + + private void comboBoxMapHeader_SelectedIndexChanged(object sender, EventArgs e) { + ushort headbuttID = (ushort)comboBoxMapHeader.SelectedIndex; + this.headbuttEncounterFile = new HeadbuttEncounterFile(headbuttID); + setCurrentMap(headbuttEncounterFile); + } + + public void setCurrentMap(HeadbuttEncounterFile headbuttEncounterFile) { + this.mapFile = null; + this.headbuttEncounterMap = null; + + comboBoxMapFile.Items.Clear(); + labelLocationName.Text = ""; + + listBoxTrees = null; + if (headbuttTree != null) headbuttTree.picked = false; + headbuttTree = null; + + headbuttEncounterEditorTabNormal.Reset(); + headbuttEncounterEditorTabSpecial.Reset(); + + numericUpDownTreeGlobalX.Value = 0; + numericUpDownTreeGlobalY.Value = 0; + numericUpDownTreeMatrixX.Value = 0; + numericUpDownTreeMatrixY.Value = 0; + numericUpDownTreeMapX.Value = 0; + numericUpDownTreeMapY.Value = 0; + + RenderBackground(); + + try { + if (headbuttEncounterFile.ID == GameMatrix.EMPTY) return; + this.mapHeader = (HeaderHGSS)MapHeader.GetMapHeader(headbuttEncounterFile.ID); + } + catch (Exception ex) { + //most likely more headbutt files than map headers + //there should be the same amount + Console.WriteLine(ex); + return; + } + + this.gameMatrix = new GameMatrix(mapHeader.matrixID); + this.areaData = new AreaData(mapHeader.areaDataID); + + TextArchive currentTextArchive = new TextArchive(RomInfo.locationNamesTextNumber); + this.locationName = currentTextArchive.messages[mapHeader.locationName]; + labelLocationName.Text = locationName; + + headbuttEncounterEditorTabNormal.SetHeadbuttEncounter(headbuttEncounterFile.normalEncounters, headbuttEncounterFile.normalTreeGroups); + headbuttEncounterEditorTabSpecial.SetHeadbuttEncounter(headbuttEncounterFile.specialEncounters, headbuttEncounterFile.specialTreeGroups); + + List mapHeaderMapsIDsList = new List(); + + if (gameMatrix.hasHeadersSection) { + for (int y = 0; y < gameMatrix.height; y++) { + for (int x = 0; x < gameMatrix.width; x++) { + if (gameMatrix.headers[y, x] == mapHeader.ID) { + int mapID = gameMatrix.maps[y, x]; + if (mapID == GameMatrix.EMPTY) continue; + HeadbuttEncounterMap map = new HeadbuttEncounterMap(mapID, x, y); + if (mapHeaderMapsIDsList.Contains(map)) continue; + mapHeaderMapsIDsList.Add(map); + } + } + } + } + else { + for (int y = 0; y < gameMatrix.height; y++) { + for (int x = 0; x < gameMatrix.width; x++) { + int mapID = gameMatrix.maps[y, x]; + if (mapID == GameMatrix.EMPTY) continue; + HeadbuttEncounterMap map = new HeadbuttEncounterMap(mapID, x, y); + if (mapHeaderMapsIDsList.Contains(map)) continue; + mapHeaderMapsIDsList.Add(map); + } + } + } + + foreach (HeadbuttTreeGroup treeGroup in headbuttEncounterFile.normalTreeGroups) { + foreach (HeadbuttTree tree in treeGroup.trees) { + if (tree.unused) continue; + if (tree.matrixX >= gameMatrix.width || tree.matrixY >= gameMatrix.height) continue; + int x = tree.matrixX; + int y = tree.matrixY; + int mapID = gameMatrix.maps[y, x]; + if (mapID == GameMatrix.EMPTY) continue; + HeadbuttEncounterMap map = new HeadbuttEncounterMap(mapID, x, y); + if (mapHeaderMapsIDsList.Contains(map)) continue; + mapHeaderMapsIDsList.Add(map); + } + } + + foreach (HeadbuttTreeGroup treeGroup in headbuttEncounterFile.specialTreeGroups) { + foreach (HeadbuttTree tree in treeGroup.trees) { + if (tree.unused) continue; + if (tree.matrixX >= gameMatrix.width || tree.matrixY >= gameMatrix.height) continue; + int x = tree.matrixX; + int y = tree.matrixY; + int mapID = gameMatrix.maps[y, x]; + if (mapID == GameMatrix.EMPTY) continue; + HeadbuttEncounterMap map = new HeadbuttEncounterMap(mapID, x, y); + if (mapHeaderMapsIDsList.Contains(map)) continue; + mapHeaderMapsIDsList.Add(map); + } + } + + mapHeaderMapsIDsList.Sort((first, second) => { + int ret = first.mapID.CompareTo(second.mapID); + return ret != 0 ? ret : first.x.CompareTo(second.x); + }); + foreach (HeadbuttEncounterMap map in mapHeaderMapsIDsList) { + comboBoxMapFile.Items.Add(map); + } + + if (comboBoxMapFile.Items.Count > 0) { + comboBoxMapFile.SelectedIndex = 0; + } + } + + private void buttonSave_Click(object sender, EventArgs e) { + if (headbuttEncounterFile == null) return; + headbuttEncounterFile.SaveToFile(); + } + + private void buttonSaveAs_Click(object sender, EventArgs e) { + if (headbuttEncounterFile == null) return; + + SaveFileDialog sfd = new SaveFileDialog(); + try { + sfd.InitialDirectory = Path.GetDirectoryName(sfd.FileName); + sfd.FileName = Path.GetFileName(sfd.FileName); + } + catch (Exception ex) { + sfd.InitialDirectory = Path.GetDirectoryName(Environment.SpecialFolder.UserProfile.ToString()); + sfd.FileName = Path.GetFileName(sfd.FileName); + } + + if (sfd.ShowDialog() != DialogResult.OK) return; + + headbuttEncounterFile.SaveToFile(sfd.FileName); + } + + private void buttonImport_Click(object sender, EventArgs e) { + OpenFileDialog ofd = new OpenFileDialog(); + try { + ofd.InitialDirectory = Path.GetDirectoryName(ofd.FileName); + ofd.FileName = Path.GetFileName(ofd.FileName); + } + catch (Exception ex) { + ofd.InitialDirectory = Path.GetDirectoryName(Environment.SpecialFolder.UserProfile.ToString()); + ofd.FileName = Path.GetFileName(ofd.FileName); + } + + if (ofd.ShowDialog() != DialogResult.OK) return; + + this.headbuttEncounterFile = new HeadbuttEncounterFile(ofd.FileName); + headbuttEncounterFile.ID = (ushort)comboBoxMapHeader.SelectedIndex; + setCurrentMap(headbuttEncounterFile); + } + + private void comboBoxMapFile_SelectedIndexChanged(object sender, EventArgs e) { + HeadbuttEncounterMap map = comboBoxMapFile.SelectedItem as HeadbuttEncounterMap; + int mapID = gameMatrix.maps[map.y, map.x]; + this.mapFile = new MapFile(mapID, RomInfo.gameFamily, discardMoveperms: true); + this.headbuttEncounterMap = map; + RenderBackground(); + } + + private Bitmap GetMapBitmap() { + Bitmap bm = RenderMap(); + openGlControl.Invalidate(); + return bm; + } + + private void RenderBackground() { + Bitmap bm = GetMapBitmap(); + + if (headbuttEncounterFile != null) { + using (Graphics g = Graphics.FromImage(bm)) { + g.InterpolationMode = InterpolationMode.NearestNeighbor; + g.PixelOffsetMode = PixelOffsetMode.HighQuality; + MarkTrees(g, headbuttEncounterFile.normalTreeGroups, HeadbuttTree.Types.Normal); + MarkTrees(g, headbuttEncounterFile.specialTreeGroups, HeadbuttTree.Types.Special); + } + } + + openGlPictureBox.BackgroundImage = bm; + } + + private Bitmap RenderMap() { + MapFile currentMapFile = this.mapFile; + + if (currentMapFile == null) { + Bitmap blank = new Bitmap(openGlPictureBox.Width, openGlPictureBox.Height); + using (Graphics g = Graphics.FromImage(blank)) { + g.Clear(Color.Black); + } + + return blank; + } + + Helpers.MW_LoadModelTextures(currentMapFile, areaData.mapTileset); + + bool isInteriorMap = false; + if (RomInfo.gameFamily == RomInfo.GameFamilies.HGSS && areaData.areaType == AreaData.TYPE_INDOOR) { + isInteriorMap = true; + } + + for (int i = 0; i < currentMapFile.buildings.Count; i++) { + Building building = currentMapFile.buildings[i]; + building.LoadModelData(isInteriorMap); // Load building nsbmd + Helpers.MW_LoadModelTextures(building, areaData.buildingsTileset); // Load building textures + } + + Helpers.RenderMap(ref currentMapFile, openGlControl.Width, openGlControl.Height, ang, dist, elev, perspective); + return Helpers.GrabMapScreenshot(width, height); + } + + private void MarkTrees(Graphics g, BindingList treeGroups, HeadbuttTree.Types treeType) { + HeadbuttEncounterMap map = comboBoxMapFile.SelectedItem as HeadbuttEncounterMap; + if (map == null) return; + + foreach (HeadbuttTreeGroup treeGroup in treeGroups) { + foreach (HeadbuttTree tree in treeGroup.trees) { + if (tree.unused) continue; + if (tree.matrixX != map.x || tree.matrixY != map.y) continue; + MarkTree(g, tree, treeType); + } + } + } + + private void MarkTree(Graphics g, HeadbuttTree tree, HeadbuttTree.Types treeType) { + Pen paintPen; + SolidBrush paintBrush; + if (treeType == HeadbuttTree.Types.Normal) { + paintPen = normalPen; + paintBrush = normalBrush; + } + else { + paintPen = specialPen; + paintBrush = specialBrush; + } + + if (tree.picked) { + paintPen = selectedPen; + } + + int tileWidth = openGlControl.Width / MapFile.mapSize; + int tileHeight = openGlControl.Height / MapFile.mapSize; + int tileX = tree.mapX * tileWidth; + int tileY = tree.mapY * tileHeight; + + int padding = 1; + Rectangle rectangle = new Rectangle(tileX + padding, tileY + padding, tileWidth - padding, tileHeight - padding); + g.FillRectangle(paintBrush, rectangle); + g.DrawRectangle(paintPen, rectangle); + } + + private void ListBoxTrees_SelectedIndexChanged(object sender, EventArgs e) { + listBoxTrees = sender as ListBox2; + headbuttTree = listBoxTrees.SelectedItem as HeadbuttTree; + if (headbuttTree == null) return; + numericUpDownTreeGlobalX.Value = headbuttTree.globalX; + numericUpDownTreeGlobalY.Value = headbuttTree.globalY; + numericUpDownTreeMatrixX.Value = headbuttTree.matrixX; + numericUpDownTreeMatrixY.Value = headbuttTree.matrixY; + numericUpDownTreeMapX.Value = headbuttTree.mapX; + numericUpDownTreeMapY.Value = headbuttTree.mapY; + } + + private void openGlPictureBox_Click(object sender, EventArgs e) { + MouseEventArgs mea = (MouseEventArgs)e; + + int tileWidth = openGlControl.Width / MapFile.mapSize; + int tileHeight = openGlControl.Height / MapFile.mapSize; + int mouseX = openGlPictureBox.PointToClient(MousePosition).X / tileWidth; + int mouseY = openGlPictureBox.PointToClient(MousePosition).Y / tileHeight; + + + if (mea.Button == MouseButtons.Left) { + if (this.headbuttEncounterMap != null) { + numericUpDownTreeMatrixX.Value = headbuttEncounterMap.x; + numericUpDownTreeMatrixY.Value = headbuttEncounterMap.y; + numericUpDownTreeMapX.Value = mouseX; + numericUpDownTreeMapY.Value = mouseY; + } + } + else if (mea.Button == MouseButtons.Middle) { + //warp + } + else if (mea.Button == MouseButtons.Right) { + if (headbuttTree != null) headbuttTree.picked = false; + + if (FindTreeFromMap(headbuttEncounterEditorTabNormal.listBoxTreeGroups, headbuttEncounterEditorTabNormal.listBoxTrees, mouseX, mouseY)) { + tabControl.SelectedTab = tabPageNormal; + } + else if (FindTreeFromMap(headbuttEncounterEditorTabSpecial.listBoxTreeGroups, headbuttEncounterEditorTabSpecial.listBoxTrees, mouseX, mouseY)) { + tabControl.SelectedTab = tabPageSpecial; + } + else { + headbuttEncounterEditorTabNormal.listBoxTreeGroups.SelectedItem = null; + headbuttEncounterEditorTabNormal.listBoxTrees.SelectedItem = null; + headbuttEncounterEditorTabSpecial.listBoxTreeGroups.SelectedItem = null; + headbuttEncounterEditorTabSpecial.listBoxTrees.SelectedItem = null; + } + } + + RenderBackground(); + } + + private bool FindTreeFromMap(ListBox2 listBoxTreeGroups, ListBox2 listBoxTrees, int x, int y) { + foreach (HeadbuttTreeGroup headbuttTreeGroup in listBoxTreeGroups.Items) { + foreach (HeadbuttTree tree in headbuttTreeGroup.trees) { + if (tree.mapX != x || tree.mapY != y) continue; + listBoxTreeGroups.SelectedItem = headbuttTreeGroup; + listBoxTrees.SelectedItem = tree; + tree.picked = true; + return true; + } + } + + return false; + } + + private void numericUpDownTreeGlobalX_ValueChanged(object sender, EventArgs e) { + if (headbuttTree == null) return; + headbuttTree.globalX = (ushort)((NumericUpDown)sender).Value; + listBoxTrees.RefreshItem(listBoxTrees.SelectedIndex); + } + + private void numericUpDownTreeGlobalY_ValueChanged(object sender, EventArgs e) { + if (headbuttTree == null) return; + headbuttTree.globalY = (ushort)((NumericUpDown)sender).Value; + listBoxTrees.RefreshItem(listBoxTrees.SelectedIndex); + } + + private void numericUpDownTreeMatrixX_ValueChanged(object sender, EventArgs e) { + if (headbuttTree == null) return; + headbuttTree.matrixX = (ushort)((NumericUpDown)sender).Value; + listBoxTrees.RefreshItem(listBoxTrees.SelectedIndex); + } + + private void numericUpDownTreeMatrixY_ValueChanged(object sender, EventArgs e) { + if (headbuttTree == null) return; + headbuttTree.matrixY = (ushort)((NumericUpDown)sender).Value; + listBoxTrees.RefreshItem(listBoxTrees.SelectedIndex); + } + + private void numericUpDownTreeMapX_ValueChanged(object sender, EventArgs e) { + if (headbuttTree == null) return; + headbuttTree.mapX = (ushort)((NumericUpDown)sender).Value; + listBoxTrees.RefreshItem(listBoxTrees.SelectedIndex); + } + + private void numericUpDownTreeMapY_ValueChanged(object sender, EventArgs e) { + if (headbuttTree == null) return; + headbuttTree.mapY = (ushort)((NumericUpDown)sender).Value; + listBoxTrees.RefreshItem(listBoxTrees.SelectedIndex); + } + + private void mapScreenshotButton_Click(object sender, EventArgs e) { + SaveFileDialog imageSFD = new SaveFileDialog { Filter = "PNG File(*.png)|*.png", }; + if (imageSFD.ShowDialog() != DialogResult.OK) return; + openGlPictureBox.BackgroundImage.Save(imageSFD.FileName); + MessageBox.Show("Screenshot saved.", "Success", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + + private void SetCam2DValues() { + perspective = 4f; + ang = 0f; + dist = 115.2f; + elev = 90f; + } + } +} diff --git a/DS_Map/Editors/HeadbuttEncounterEditor.resx b/DS_Map/Editors/HeadbuttEncounterEditor.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/DS_Map/Editors/HeadbuttEncounterEditor.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/HeadbuttEncounterEditorTab.Designer.cs b/DS_Map/Editors/HeadbuttEncounterEditorTab.Designer.cs new file mode 100644 index 0000000..1735cbb --- /dev/null +++ b/DS_Map/Editors/HeadbuttEncounterEditorTab.Designer.cs @@ -0,0 +1,235 @@ + +namespace DSPRE.Editors +{ + partial class HeadbuttEncounterEditorTab + { + /// + /// 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 Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() { + this.buttonDuplicateTreeGroup = new System.Windows.Forms.Button(); + this.buttonRemoveTreeGroup = new System.Windows.Forms.Button(); + this.numericUpDownMaxLevel = new System.Windows.Forms.NumericUpDown(); + this.numericUpDownMinLevel = new System.Windows.Forms.NumericUpDown(); + this.buttonAddTreeGroup = new System.Windows.Forms.Button(); + this.label5 = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.comboBoxPokemon = new System.Windows.Forms.ComboBox(); + this.listBoxTreeGroups = new DSPRE.ListBox2(); + this.listBoxTrees = new DSPRE.ListBox2(); + this.listBoxEncounters = new DSPRE.ListBox2(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownMaxLevel)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownMinLevel)).BeginInit(); + this.SuspendLayout(); + // + // buttonDuplicateTreeGroup + // + this.buttonDuplicateTreeGroup.Location = new System.Drawing.Point(177, 389); + this.buttonDuplicateTreeGroup.Name = "buttonDuplicateTreeGroup"; + this.buttonDuplicateTreeGroup.Size = new System.Drawing.Size(81, 23); + this.buttonDuplicateTreeGroup.TabIndex = 17; + this.buttonDuplicateTreeGroup.Text = "Duplicate"; + this.buttonDuplicateTreeGroup.UseVisualStyleBackColor = true; + this.buttonDuplicateTreeGroup.Click += new System.EventHandler(this.buttonDuplicateTreeGroup_Click); + // + // buttonRemoveTreeGroup + // + this.buttonRemoveTreeGroup.Location = new System.Drawing.Point(90, 389); + this.buttonRemoveTreeGroup.Name = "buttonRemoveTreeGroup"; + this.buttonRemoveTreeGroup.Size = new System.Drawing.Size(81, 23); + this.buttonRemoveTreeGroup.TabIndex = 17; + this.buttonRemoveTreeGroup.Text = "Remove"; + this.buttonRemoveTreeGroup.UseVisualStyleBackColor = true; + this.buttonRemoveTreeGroup.Click += new System.EventHandler(this.buttonRemoveTreeGroup_Click); + // + // numericUpDownMaxLevel + // + this.numericUpDownMaxLevel.Location = new System.Drawing.Point(200, 210); + this.numericUpDownMaxLevel.Name = "numericUpDownMaxLevel"; + this.numericUpDownMaxLevel.Size = new System.Drawing.Size(58, 20); + this.numericUpDownMaxLevel.TabIndex = 15; + this.numericUpDownMaxLevel.ValueChanged += new System.EventHandler(this.numericUpDownMaxLevel_ValueChanged); + // + // numericUpDownMinLevel + // + this.numericUpDownMinLevel.Location = new System.Drawing.Point(136, 210); + this.numericUpDownMinLevel.Name = "numericUpDownMinLevel"; + this.numericUpDownMinLevel.Size = new System.Drawing.Size(58, 20); + this.numericUpDownMinLevel.TabIndex = 15; + this.numericUpDownMinLevel.ValueChanged += new System.EventHandler(this.numericUpDownMinLevel_ValueChanged); + // + // buttonAddTreeGroup + // + this.buttonAddTreeGroup.Location = new System.Drawing.Point(3, 389); + this.buttonAddTreeGroup.Name = "buttonAddTreeGroup"; + this.buttonAddTreeGroup.Size = new System.Drawing.Size(81, 23); + this.buttonAddTreeGroup.TabIndex = 17; + this.buttonAddTreeGroup.Text = "Add"; + this.buttonAddTreeGroup.UseVisualStyleBackColor = true; + this.buttonAddTreeGroup.Click += new System.EventHandler(this.buttonAddTreeGroup_Click); + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(0, 233); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(66, 13); + this.label5.TabIndex = 18; + this.label5.Text = "Tree Groups"; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(0, 415); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(34, 13); + this.label6.TabIndex = 18; + this.label6.Text = "Trees"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(0, 193); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(52, 13); + this.label2.TabIndex = 18; + this.label2.Text = "Pokemon"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(133, 193); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(53, 13); + this.label3.TabIndex = 18; + this.label3.Text = "Min Level"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(0, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(86, 13); + this.label1.TabIndex = 18; + this.label1.Text = "Encounter Table"; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(197, 193); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(56, 13); + this.label4.TabIndex = 18; + this.label4.Text = "Max Level"; + // + // comboBoxPokemon + // + this.comboBoxPokemon.FormattingEnabled = true; + this.comboBoxPokemon.Location = new System.Drawing.Point(3, 209); + this.comboBoxPokemon.Name = "comboBoxPokemon"; + this.comboBoxPokemon.Size = new System.Drawing.Size(127, 21); + this.comboBoxPokemon.TabIndex = 19; + this.comboBoxPokemon.SelectedIndexChanged += new System.EventHandler(this.comboBoxPokemon_SelectedIndexChanged); + // + // listBoxTreeGroups + // + this.listBoxTreeGroups.DisplayMember = "DisplayName"; + this.listBoxTreeGroups.FormattingEnabled = true; + this.listBoxTreeGroups.Location = new System.Drawing.Point(3, 249); + this.listBoxTreeGroups.Name = "listBoxTreeGroups"; + this.listBoxTreeGroups.Size = new System.Drawing.Size(255, 134); + this.listBoxTreeGroups.TabIndex = 11; + this.listBoxTreeGroups.SelectedIndexChanged += new System.EventHandler(this.listBoxTreeGroups_SelectedIndexChanged); + // + // listBoxTrees + // + this.listBoxTrees.DisplayMember = "DisplayName"; + this.listBoxTrees.FormattingEnabled = true; + this.listBoxTrees.Location = new System.Drawing.Point(3, 431); + this.listBoxTrees.Name = "listBoxTrees"; + this.listBoxTrees.Size = new System.Drawing.Size(255, 82); + this.listBoxTrees.TabIndex = 11; + // + // listBoxEncounters + // + this.listBoxEncounters.Font = new System.Drawing.Font("Consolas", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.listBoxEncounters.FormattingEnabled = true; + this.listBoxEncounters.ItemHeight = 14; + this.listBoxEncounters.Location = new System.Drawing.Point(3, 15); + this.listBoxEncounters.Name = "listBoxEncounters"; + this.listBoxEncounters.Size = new System.Drawing.Size(255, 172); + this.listBoxEncounters.TabIndex = 13; + this.listBoxEncounters.SelectedIndexChanged += new System.EventHandler(this.listBoxEncounters_SelectedIndexChanged); + // + // HeadbuttEncounterEditorTab + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.comboBoxPokemon); + this.Controls.Add(this.label4); + this.Controls.Add(this.label1); + this.Controls.Add(this.listBoxTreeGroups); + this.Controls.Add(this.label3); + this.Controls.Add(this.buttonDuplicateTreeGroup); + this.Controls.Add(this.label2); + this.Controls.Add(this.buttonRemoveTreeGroup); + this.Controls.Add(this.listBoxTrees); + this.Controls.Add(this.label6); + this.Controls.Add(this.numericUpDownMaxLevel); + this.Controls.Add(this.listBoxEncounters); + this.Controls.Add(this.label5); + this.Controls.Add(this.numericUpDownMinLevel); + this.Controls.Add(this.buttonAddTreeGroup); + this.Name = "HeadbuttEncounterEditorTab"; + this.Size = new System.Drawing.Size(262, 517); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownMaxLevel)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownMinLevel)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + public DSPRE.ListBox2 listBoxTreeGroups; + private System.Windows.Forms.Button buttonDuplicateTreeGroup; + private System.Windows.Forms.Button buttonRemoveTreeGroup; + public ListBox2 listBoxTrees; + public System.Windows.Forms.NumericUpDown numericUpDownMaxLevel; + public DSPRE.ListBox2 listBoxEncounters; + public System.Windows.Forms.NumericUpDown numericUpDownMinLevel; + private System.Windows.Forms.Button buttonAddTreeGroup; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label4; + public System.Windows.Forms.ComboBox comboBoxPokemon; + } +} diff --git a/DS_Map/Editors/HeadbuttEncounterEditorTab.cs b/DS_Map/Editors/HeadbuttEncounterEditorTab.cs new file mode 100644 index 0000000..2ce87e4 --- /dev/null +++ b/DS_Map/Editors/HeadbuttEncounterEditorTab.cs @@ -0,0 +1,95 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Windows.Forms; +using DSPRE.ROMFiles; + +namespace DSPRE.Editors { + public partial class HeadbuttEncounterEditorTab : UserControl { + private List encounters; + private BindingList treeGroups; + + public HeadbuttEncounterEditorTab() { + InitializeComponent(); + } + + public void Reset() { + Helpers.DisableHandlers(); + listBoxEncounters.DataSource = null; + listBoxTreeGroups.DataSource = null; + listBoxTrees.DataSource = null; + comboBoxPokemon.SelectedIndex = 0; + numericUpDownMinLevel.Value = 0; + numericUpDownMaxLevel.Value = 0; + Helpers.EnableHandlers(); + } + + public void SetHeadbuttEncounter(List encounters, BindingList treeGroups) { + Helpers.DisableHandlers(); + this.encounters = encounters; + this.treeGroups = treeGroups; + listBoxEncounters.DataSource = this.encounters; + listBoxTreeGroups.DataSource = this.treeGroups; + listBoxEncounters.SelectedIndex = -1; + listBoxTreeGroups.SelectedIndex = -1; + Helpers.EnableHandlers(); + } + + private void listBoxEncounters_SelectedIndexChanged(object sender, EventArgs e) { + if (Helpers.HandlersDisabled) return; + HeadbuttEncounter headbuttEncounter = (HeadbuttEncounter)listBoxEncounters.SelectedItem; + if (headbuttEncounter == null) return; + comboBoxPokemon.SelectedIndex = headbuttEncounter.pokemonID; + numericUpDownMinLevel.Value = headbuttEncounter.minLevel; + numericUpDownMaxLevel.Value = headbuttEncounter.maxLevel; + } + + private void comboBoxPokemon_SelectedIndexChanged(object sender, EventArgs e) + { + if (Helpers.HandlersDisabled) return; + HeadbuttEncounter headbuttEncounter = (HeadbuttEncounter)listBoxEncounters.SelectedItem; + if (headbuttEncounter == null) return; + headbuttEncounter.pokemonID = (ushort)comboBoxPokemon.SelectedIndex; + listBoxEncounters.RefreshItem(listBoxEncounters.SelectedIndex); + } + + private void numericUpDownMinLevel_ValueChanged(object sender, EventArgs e) { + if (Helpers.HandlersDisabled) return; + HeadbuttEncounter headbuttEncounter = (HeadbuttEncounter)listBoxEncounters.SelectedItem; + if (headbuttEncounter == null) return; + headbuttEncounter.minLevel = (byte)numericUpDownMinLevel.Value; + listBoxEncounters.RefreshItem(listBoxEncounters.SelectedIndex); + } + + private void numericUpDownMaxLevel_ValueChanged(object sender, EventArgs e) { + if (Helpers.HandlersDisabled) return; + HeadbuttEncounter headbuttEncounter = (HeadbuttEncounter)listBoxEncounters.SelectedItem; + if (headbuttEncounter == null) return; + headbuttEncounter.maxLevel = (byte)numericUpDownMaxLevel.Value; + listBoxEncounters.RefreshItem(listBoxEncounters.SelectedIndex); + } + + private void listBoxTreeGroups_SelectedIndexChanged(object sender, EventArgs e) { + if (Helpers.HandlersDisabled) return; + HeadbuttTreeGroup headbuttTreeGroup = (HeadbuttTreeGroup)listBoxTreeGroups.SelectedItem; + if (headbuttTreeGroup == null) return; + listBoxTrees.DataSource = headbuttTreeGroup.trees; + } + + private void buttonAddTreeGroup_Click(object sender, EventArgs e) { + treeGroups.Add(new HeadbuttTreeGroup()); + } + + private void buttonRemoveTreeGroup_Click(object sender, EventArgs e) { + int selectedIndex = listBoxTreeGroups.SelectedIndex; + if (selectedIndex == -1) return; + treeGroups.RemoveAt(selectedIndex); + } + + private void buttonDuplicateTreeGroup_Click(object sender, EventArgs e) { + HeadbuttTreeGroup headbuttTreeGroup = (HeadbuttTreeGroup)listBoxTreeGroups.SelectedItem; + if (headbuttTreeGroup == null) return; + treeGroups.Add(new HeadbuttTreeGroup(headbuttTreeGroup)); + } + } +} diff --git a/DS_Map/Editors/HeadbuttEncounterEditorTab.resx b/DS_Map/Editors/HeadbuttEncounterEditorTab.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/DS_Map/Editors/HeadbuttEncounterEditorTab.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/SafariZoneEditor.Designer.cs b/DS_Map/Editors/SafariZoneEditor.Designer.cs new file mode 100644 index 0000000..5a675f4 --- /dev/null +++ b/DS_Map/Editors/SafariZoneEditor.Designer.cs @@ -0,0 +1,250 @@ + +namespace DSPRE.Editors +{ + partial class SafariZoneEditor + { + /// + /// 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 Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.buttonSaveAs = new System.Windows.Forms.Button(); + this.buttonSave = new System.Windows.Forms.Button(); + this.tabPageSuperRod = new System.Windows.Forms.TabPage(); + this.safariZoneEncounterGroupEditorSuperRod = new DSPRE.Editors.SafariZoneEncounterGroupEditor(); + this.tabPageGoodRod = new System.Windows.Forms.TabPage(); + this.safariZoneEncounterGroupEditorGoodRod = new DSPRE.Editors.SafariZoneEncounterGroupEditor(); + this.tabPageOldRod = new System.Windows.Forms.TabPage(); + this.safariZoneEncounterGroupEditorOldRod = new DSPRE.Editors.SafariZoneEncounterGroupEditor(); + this.tabPageSurf = new System.Windows.Forms.TabPage(); + this.safariZoneEncounterGroupEditorSurf = new DSPRE.Editors.SafariZoneEncounterGroupEditor(); + this.tabPageGrass = new System.Windows.Forms.TabPage(); + this.safariZoneEncounterGroupEditorGrass = new DSPRE.Editors.SafariZoneEncounterGroupEditor(); + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.label1 = new System.Windows.Forms.Label(); + this.comboBoxFileID = new System.Windows.Forms.ComboBox(); + this.buttonImport = new System.Windows.Forms.Button(); + this.tabPageSuperRod.SuspendLayout(); + this.tabPageGoodRod.SuspendLayout(); + this.tabPageOldRod.SuspendLayout(); + this.tabPageSurf.SuspendLayout(); + this.tabPageGrass.SuspendLayout(); + this.tabControl1.SuspendLayout(); + this.SuspendLayout(); + // + // buttonSaveAs + // + this.buttonSaveAs.Location = new System.Drawing.Point(236, 14); + this.buttonSaveAs.Name = "buttonSaveAs"; + this.buttonSaveAs.Size = new System.Drawing.Size(75, 23); + this.buttonSaveAs.TabIndex = 28; + this.buttonSaveAs.Text = "Save As"; + this.buttonSaveAs.UseVisualStyleBackColor = true; + this.buttonSaveAs.Click += new System.EventHandler(this.buttonSaveAs_Click); + // + // buttonSave + // + this.buttonSave.Location = new System.Drawing.Point(155, 14); + this.buttonSave.Name = "buttonSave"; + this.buttonSave.Size = new System.Drawing.Size(75, 23); + this.buttonSave.TabIndex = 28; + this.buttonSave.Text = "Save"; + this.buttonSave.UseVisualStyleBackColor = true; + this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click); + // + // tabPageSuperRod + // + this.tabPageSuperRod.Controls.Add(this.safariZoneEncounterGroupEditorSuperRod); + this.tabPageSuperRod.Location = new System.Drawing.Point(4, 22); + this.tabPageSuperRod.Name = "tabPageSuperRod"; + this.tabPageSuperRod.Padding = new System.Windows.Forms.Padding(3); + this.tabPageSuperRod.Size = new System.Drawing.Size(935, 264); + this.tabPageSuperRod.TabIndex = 4; + this.tabPageSuperRod.Text = "Super Rod"; + this.tabPageSuperRod.UseVisualStyleBackColor = true; + // + // safariZoneEncounterGroupEditorSuperRod + // + this.safariZoneEncounterGroupEditorSuperRod.Location = new System.Drawing.Point(6, 6); + this.safariZoneEncounterGroupEditorSuperRod.Name = "safariZoneEncounterGroupEditorSuperRod"; + this.safariZoneEncounterGroupEditorSuperRod.Size = new System.Drawing.Size(969, 255); + this.safariZoneEncounterGroupEditorSuperRod.TabIndex = 25; + // + // tabPageGoodRod + // + this.tabPageGoodRod.Controls.Add(this.safariZoneEncounterGroupEditorGoodRod); + this.tabPageGoodRod.Location = new System.Drawing.Point(4, 22); + this.tabPageGoodRod.Name = "tabPageGoodRod"; + this.tabPageGoodRod.Padding = new System.Windows.Forms.Padding(3); + this.tabPageGoodRod.Size = new System.Drawing.Size(935, 264); + this.tabPageGoodRod.TabIndex = 3; + this.tabPageGoodRod.Text = "Good Rod"; + this.tabPageGoodRod.UseVisualStyleBackColor = true; + // + // safariZoneEncounterGroupEditorGoodRod + // + this.safariZoneEncounterGroupEditorGoodRod.Location = new System.Drawing.Point(6, 6); + this.safariZoneEncounterGroupEditorGoodRod.Name = "safariZoneEncounterGroupEditorGoodRod"; + this.safariZoneEncounterGroupEditorGoodRod.Size = new System.Drawing.Size(969, 255); + this.safariZoneEncounterGroupEditorGoodRod.TabIndex = 25; + // + // tabPageOldRod + // + this.tabPageOldRod.Controls.Add(this.safariZoneEncounterGroupEditorOldRod); + this.tabPageOldRod.Location = new System.Drawing.Point(4, 22); + this.tabPageOldRod.Name = "tabPageOldRod"; + this.tabPageOldRod.Padding = new System.Windows.Forms.Padding(3); + this.tabPageOldRod.Size = new System.Drawing.Size(935, 264); + this.tabPageOldRod.TabIndex = 2; + this.tabPageOldRod.Text = "Old Rod"; + this.tabPageOldRod.UseVisualStyleBackColor = true; + // + // safariZoneEncounterGroupEditorOldRod + // + this.safariZoneEncounterGroupEditorOldRod.Location = new System.Drawing.Point(6, 6); + this.safariZoneEncounterGroupEditorOldRod.Name = "safariZoneEncounterGroupEditorOldRod"; + this.safariZoneEncounterGroupEditorOldRod.Size = new System.Drawing.Size(969, 255); + this.safariZoneEncounterGroupEditorOldRod.TabIndex = 25; + // + // tabPageSurf + // + this.tabPageSurf.Controls.Add(this.safariZoneEncounterGroupEditorSurf); + this.tabPageSurf.Location = new System.Drawing.Point(4, 22); + this.tabPageSurf.Name = "tabPageSurf"; + this.tabPageSurf.Padding = new System.Windows.Forms.Padding(3); + this.tabPageSurf.Size = new System.Drawing.Size(935, 264); + this.tabPageSurf.TabIndex = 1; + this.tabPageSurf.Text = "Surf"; + this.tabPageSurf.UseVisualStyleBackColor = true; + // + // safariZoneEncounterGroupEditorSurf + // + this.safariZoneEncounterGroupEditorSurf.Location = new System.Drawing.Point(6, 6); + this.safariZoneEncounterGroupEditorSurf.Name = "safariZoneEncounterGroupEditorSurf"; + this.safariZoneEncounterGroupEditorSurf.Size = new System.Drawing.Size(969, 255); + this.safariZoneEncounterGroupEditorSurf.TabIndex = 25; + // + // tabPageGrass + // + this.tabPageGrass.Controls.Add(this.safariZoneEncounterGroupEditorGrass); + this.tabPageGrass.Location = new System.Drawing.Point(4, 22); + this.tabPageGrass.Name = "tabPageGrass"; + this.tabPageGrass.Padding = new System.Windows.Forms.Padding(3); + this.tabPageGrass.Size = new System.Drawing.Size(935, 264); + this.tabPageGrass.TabIndex = 0; + this.tabPageGrass.Text = "Grass"; + this.tabPageGrass.UseVisualStyleBackColor = true; + // + // safariZoneEncounterGroupEditorGrass + // + this.safariZoneEncounterGroupEditorGrass.Location = new System.Drawing.Point(6, 6); + this.safariZoneEncounterGroupEditorGrass.Name = "safariZoneEncounterGroupEditorGrass"; + this.safariZoneEncounterGroupEditorGrass.Size = new System.Drawing.Size(969, 255); + this.safariZoneEncounterGroupEditorGrass.TabIndex = 25; + // + // tabControl1 + // + this.tabControl1.Controls.Add(this.tabPageGrass); + this.tabControl1.Controls.Add(this.tabPageSurf); + this.tabControl1.Controls.Add(this.tabPageOldRod); + this.tabControl1.Controls.Add(this.tabPageGoodRod); + this.tabControl1.Controls.Add(this.tabPageSuperRod); + this.tabControl1.Location = new System.Drawing.Point(4, 44); + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + this.tabControl1.Size = new System.Drawing.Size(943, 290); + this.tabControl1.TabIndex = 27; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(3, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(59, 13); + this.label1.TabIndex = 26; + this.label1.Text = "Map Name"; + // + // comboBoxFileID + // + this.comboBoxFileID.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBoxFileID.FormattingEnabled = true; + this.comboBoxFileID.Location = new System.Drawing.Point(3, 16); + this.comboBoxFileID.Name = "comboBoxFileID"; + this.comboBoxFileID.Size = new System.Drawing.Size(146, 21); + this.comboBoxFileID.TabIndex = 0; + this.comboBoxFileID.SelectedIndexChanged += new System.EventHandler(this.comboBoxFileID_SelectedIndexChanged); + // + // buttonImport + // + this.buttonImport.Location = new System.Drawing.Point(317, 14); + this.buttonImport.Name = "buttonImport"; + this.buttonImport.Size = new System.Drawing.Size(75, 23); + this.buttonImport.TabIndex = 28; + this.buttonImport.Text = "Import"; + this.buttonImport.UseVisualStyleBackColor = true; + this.buttonImport.Click += new System.EventHandler(this.buttonImport_Click); + // + // SafariZoneEditor + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.buttonImport); + this.Controls.Add(this.buttonSaveAs); + this.Controls.Add(this.buttonSave); + this.Controls.Add(this.tabControl1); + this.Controls.Add(this.label1); + this.Controls.Add(this.comboBoxFileID); + this.Name = "SafariZoneEditor"; + this.Size = new System.Drawing.Size(953, 340); + this.tabPageSuperRod.ResumeLayout(false); + this.tabPageGoodRod.ResumeLayout(false); + this.tabPageOldRod.ResumeLayout(false); + this.tabPageSurf.ResumeLayout(false); + this.tabPageGrass.ResumeLayout(false); + this.tabControl1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Button buttonSaveAs; + private System.Windows.Forms.Button buttonSave; + private System.Windows.Forms.TabPage tabPageSuperRod; + private SafariZoneEncounterGroupEditor safariZoneEncounterGroupEditorSuperRod; + private System.Windows.Forms.TabPage tabPageGoodRod; + private SafariZoneEncounterGroupEditor safariZoneEncounterGroupEditorGoodRod; + private System.Windows.Forms.TabPage tabPageOldRod; + private SafariZoneEncounterGroupEditor safariZoneEncounterGroupEditorOldRod; + private System.Windows.Forms.TabPage tabPageSurf; + private SafariZoneEncounterGroupEditor safariZoneEncounterGroupEditorSurf; + private System.Windows.Forms.TabPage tabPageGrass; + private SafariZoneEncounterGroupEditor safariZoneEncounterGroupEditorGrass; + private System.Windows.Forms.TabControl tabControl1; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.ComboBox comboBoxFileID; + private System.Windows.Forms.Button buttonImport; + } +} diff --git a/DS_Map/Editors/SafariZoneEditor.cs b/DS_Map/Editors/SafariZoneEditor.cs new file mode 100644 index 0000000..fe11773 --- /dev/null +++ b/DS_Map/Editors/SafariZoneEditor.cs @@ -0,0 +1,105 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Windows.Forms; +using DSPRE.ROMFiles; + +namespace DSPRE.Editors { + public partial class SafariZoneEditor : UserControl { + public bool safariZoneEditorIsReady { get; set; } = false; + private SafariZoneEncounterFile safariZoneEncounterFile; + + public SafariZoneEditor() { + InitializeComponent(); + } + + public void SetupSafariZoneEditor(bool force = false) { + if (safariZoneEditorIsReady && !force) return; + safariZoneEditorIsReady = true; + + DSUtils.TryUnpackNarcs(new List() { + RomInfo.DirNames.safariZone, + RomInfo.DirNames.textArchives, + }); + + safariZoneEncounterGroupEditorGrass.SetPokemonNames(); + safariZoneEncounterGroupEditorSurf.SetPokemonNames(); + safariZoneEncounterGroupEditorOldRod.SetPokemonNames(); + safariZoneEncounterGroupEditorGoodRod.SetPokemonNames(); + safariZoneEncounterGroupEditorSuperRod.SetPokemonNames(); + + int safariZoneCount = Filesystem.GetSafariZoneCount(); + comboBoxFileID.Items.Clear(); + for (int i = 0; i < safariZoneCount; i++) { + comboBoxFileID.Items.Add(SafariZoneEncounterFile.Names[i]); + } + + if (comboBoxFileID.Items.Count > 0) { + comboBoxFileID.SelectedIndex = 0; + } + } + + private void comboBoxFileID_SelectedIndexChanged(object sender, EventArgs e) { + if (comboBoxFileID.SelectedIndex == -1) { + safariZoneEncounterFile = null; + safariZoneEncounterGroupEditorGrass.Reset(); + safariZoneEncounterGroupEditorSurf.Reset(); + safariZoneEncounterGroupEditorOldRod.Reset(); + safariZoneEncounterGroupEditorGoodRod.Reset(); + safariZoneEncounterGroupEditorSuperRod.Reset(); + return; + } + + safariZoneEncounterFile = new SafariZoneEncounterFile(comboBoxFileID.SelectedIndex); + safariZoneEncounterGroupEditorGrass.SetData(safariZoneEncounterFile.grassEncounterGroup); + safariZoneEncounterGroupEditorSurf.SetData(safariZoneEncounterFile.surfEncounterGroup); + safariZoneEncounterGroupEditorOldRod.SetData(safariZoneEncounterFile.oldRodEncounterGroup); + safariZoneEncounterGroupEditorGoodRod.SetData(safariZoneEncounterFile.goodRodEncounterGroup); + safariZoneEncounterGroupEditorSuperRod.SetData(safariZoneEncounterFile.superRodEncounterGroup); + } + + private void buttonSave_Click(object sender, EventArgs e) { + if (safariZoneEncounterFile == null) return; + safariZoneEncounterFile.SaveToFile(); + } + + private void buttonSaveAs_Click(object sender, EventArgs e) { + if (safariZoneEncounterFile == null) return; + + SaveFileDialog sfd = new SaveFileDialog(); + try { + sfd.InitialDirectory = Path.GetDirectoryName(sfd.FileName); + sfd.FileName = Path.GetFileName(sfd.FileName); + } + catch (Exception ex) { + sfd.InitialDirectory = Path.GetDirectoryName(Environment.SpecialFolder.UserProfile.ToString()); + sfd.FileName = Path.GetFileName(sfd.FileName); + } + if (sfd.ShowDialog() != DialogResult.OK) return; + + safariZoneEncounterFile.SaveToFile(sfd.FileName); + } + + private void buttonImport_Click(object sender, EventArgs e) { + if (safariZoneEncounterFile == null) return; + + OpenFileDialog ofd = new OpenFileDialog(); + try { + ofd.InitialDirectory = Path.GetDirectoryName(ofd.FileName); + ofd.FileName = Path.GetFileName(ofd.FileName); + } + catch (Exception ex) { + ofd.InitialDirectory = Path.GetDirectoryName(Environment.SpecialFolder.UserProfile.ToString()); + ofd.FileName = Path.GetFileName(ofd.FileName); + } + if (ofd.ShowDialog() != DialogResult.OK) return; + + safariZoneEncounterFile = new SafariZoneEncounterFile(ofd.FileName); + safariZoneEncounterGroupEditorGrass.SetData(safariZoneEncounterFile.grassEncounterGroup); + safariZoneEncounterGroupEditorSurf.SetData(safariZoneEncounterFile.surfEncounterGroup); + safariZoneEncounterGroupEditorOldRod.SetData(safariZoneEncounterFile.oldRodEncounterGroup); + safariZoneEncounterGroupEditorGoodRod.SetData(safariZoneEncounterFile.goodRodEncounterGroup); + safariZoneEncounterGroupEditorSuperRod.SetData(safariZoneEncounterFile.superRodEncounterGroup); + } + } +} diff --git a/DS_Map/Editors/SafariZoneEditor.resx b/DS_Map/Editors/SafariZoneEditor.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/DS_Map/Editors/SafariZoneEditor.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/SafariZoneEncounterEditorTab.Designer.cs b/DS_Map/Editors/SafariZoneEncounterEditorTab.Designer.cs new file mode 100644 index 0000000..bb6a6cb --- /dev/null +++ b/DS_Map/Editors/SafariZoneEncounterEditorTab.Designer.cs @@ -0,0 +1,218 @@ + +namespace DSPRE.Editors +{ + partial class SafariZoneEncounterEditorTab + { + /// + /// 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 Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.numericUpDownLevel = new System.Windows.Forms.NumericUpDown(); + this.comboBoxPokemon = new System.Windows.Forms.ComboBox(); + this.numericUpDownLevelObject = new System.Windows.Forms.NumericUpDown(); + this.comboBoxPokemonObject = new System.Windows.Forms.ComboBox(); + this.label2 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); + this.listBoxEncountersObject = new DSPRE.ListBox2(); + this.listBoxEncounters = new DSPRE.ListBox2(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownLevel)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownLevelObject)).BeginInit(); + this.SuspendLayout(); + // + // numericUpDownLevel + // + this.numericUpDownLevel.Location = new System.Drawing.Point(139, 180); + this.numericUpDownLevel.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDownLevel.Name = "numericUpDownLevel"; + this.numericUpDownLevel.Size = new System.Drawing.Size(58, 20); + this.numericUpDownLevel.TabIndex = 20; + this.numericUpDownLevel.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDownLevel.ValueChanged += new System.EventHandler(this.numericUpDownLevel_ValueChanged); + // + // comboBoxPokemon + // + this.comboBoxPokemon.FormattingEnabled = true; + this.comboBoxPokemon.Location = new System.Drawing.Point(6, 179); + this.comboBoxPokemon.Name = "comboBoxPokemon"; + this.comboBoxPokemon.Size = new System.Drawing.Size(127, 21); + this.comboBoxPokemon.TabIndex = 21; + this.comboBoxPokemon.SelectedIndexChanged += new System.EventHandler(this.comboBoxPokemon_SelectedIndexChanged); + // + // numericUpDownLevelObject + // + this.numericUpDownLevelObject.Location = new System.Drawing.Point(339, 180); + this.numericUpDownLevelObject.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDownLevelObject.Name = "numericUpDownLevelObject"; + this.numericUpDownLevelObject.Size = new System.Drawing.Size(58, 20); + this.numericUpDownLevelObject.TabIndex = 20; + this.numericUpDownLevelObject.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDownLevelObject.ValueChanged += new System.EventHandler(this.numericUpDownLevelObject_ValueChanged); + // + // comboBoxPokemonObject + // + this.comboBoxPokemonObject.FormattingEnabled = true; + this.comboBoxPokemonObject.Location = new System.Drawing.Point(206, 179); + this.comboBoxPokemonObject.Name = "comboBoxPokemonObject"; + this.comboBoxPokemonObject.Size = new System.Drawing.Size(127, 21); + this.comboBoxPokemonObject.TabIndex = 21; + this.comboBoxPokemonObject.SelectedIndexChanged += new System.EventHandler(this.comboBoxPokemonObject_SelectedIndexChanged); + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(3, 0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(86, 13); + this.label2.TabIndex = 22; + this.label2.Text = "Encounter Table"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(203, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(120, 13); + this.label1.TabIndex = 22; + this.label1.Text = "Object Encounter Table"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(136, 163); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(33, 13); + this.label3.TabIndex = 23; + this.label3.Text = "Level"; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(3, 163); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(52, 13); + this.label4.TabIndex = 24; + this.label4.Text = "Pokemon"; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(203, 163); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(52, 13); + this.label5.TabIndex = 24; + this.label5.Text = "Pokemon"; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(336, 163); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(33, 13); + this.label6.TabIndex = 23; + this.label6.Text = "Level"; + // + // listBoxEncountersObject + // + this.listBoxEncountersObject.Font = new System.Drawing.Font("Consolas", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.listBoxEncountersObject.FormattingEnabled = true; + this.listBoxEncountersObject.ItemHeight = 14; + this.listBoxEncountersObject.Location = new System.Drawing.Point(206, 16); + this.listBoxEncountersObject.Name = "listBoxEncountersObject"; + this.listBoxEncountersObject.Size = new System.Drawing.Size(191, 144); + this.listBoxEncountersObject.TabIndex = 1; + this.listBoxEncountersObject.SelectedIndexChanged += new System.EventHandler(this.listBoxEncountersObject_SelectedIndexChanged); + // + // listBoxEncounters + // + this.listBoxEncounters.Font = new System.Drawing.Font("Consolas", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.listBoxEncounters.FormattingEnabled = true; + this.listBoxEncounters.ItemHeight = 14; + this.listBoxEncounters.Location = new System.Drawing.Point(6, 16); + this.listBoxEncounters.Name = "listBoxEncounters"; + this.listBoxEncounters.Size = new System.Drawing.Size(191, 144); + this.listBoxEncounters.TabIndex = 1; + this.listBoxEncounters.SelectedIndexChanged += new System.EventHandler(this.listBoxEncounters_SelectedIndexChanged); + // + // SafariZoneEncounterEditorTab + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label6); + this.Controls.Add(this.label3); + this.Controls.Add(this.label5); + this.Controls.Add(this.label4); + this.Controls.Add(this.label1); + this.Controls.Add(this.label2); + this.Controls.Add(this.comboBoxPokemonObject); + this.Controls.Add(this.comboBoxPokemon); + this.Controls.Add(this.numericUpDownLevelObject); + this.Controls.Add(this.numericUpDownLevel); + this.Controls.Add(this.listBoxEncountersObject); + this.Controls.Add(this.listBoxEncounters); + this.Name = "SafariZoneEncounterEditorTab"; + this.Size = new System.Drawing.Size(404, 208); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownLevel)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownLevelObject)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + public ListBox2 listBoxEncounters; + public System.Windows.Forms.NumericUpDown numericUpDownLevel; + public System.Windows.Forms.ComboBox comboBoxPokemon; + public ListBox2 listBoxEncountersObject; + public System.Windows.Forms.NumericUpDown numericUpDownLevelObject; + public System.Windows.Forms.ComboBox comboBoxPokemonObject; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Label label6; + } +} diff --git a/DS_Map/Editors/SafariZoneEncounterEditorTab.cs b/DS_Map/Editors/SafariZoneEncounterEditorTab.cs new file mode 100644 index 0000000..59416ba --- /dev/null +++ b/DS_Map/Editors/SafariZoneEncounterEditorTab.cs @@ -0,0 +1,63 @@ +using System; +using System.Windows.Forms; +using DSPRE.ROMFiles; + +namespace DSPRE.Editors { + public partial class SafariZoneEncounterEditorTab : UserControl { + public SafariZoneEncounterEditorTab() { + InitializeComponent(); + } + + private void listBoxEncounters_SelectedIndexChanged(object sender, EventArgs e) { + if (Helpers.HandlersDisabled) return; + SafariZoneEncounter safariZoneEncounter = (SafariZoneEncounter)listBoxEncounters.SelectedItem; + if (safariZoneEncounter == null) return; + comboBoxPokemon.SelectedIndex = safariZoneEncounter.pokemonID; + numericUpDownLevel.Value = safariZoneEncounter.level; + } + + private void comboBoxPokemon_SelectedIndexChanged(object sender, EventArgs e) { + if (Helpers.HandlersDisabled) return; + SafariZoneEncounter safariZoneEncounter = (SafariZoneEncounter)listBoxEncounters.SelectedItem; + if (safariZoneEncounter == null) return; + safariZoneEncounter.pokemonID = (ushort)comboBoxPokemon.SelectedIndex; + listBoxEncounters.RefreshItem(listBoxEncounters.SelectedIndex); + } + + private void numericUpDownLevel_ValueChanged(object sender, EventArgs e) { + if (Helpers.HandlersDisabled) return; + SafariZoneEncounter safariZoneEncounter = (SafariZoneEncounter)listBoxEncounters.SelectedItem; + if (safariZoneEncounter == null) return; + safariZoneEncounter.level = (byte)numericUpDownLevel.Value; + listBoxEncounters.RefreshItem(listBoxEncounters.SelectedIndex); + } + + private void listBoxEncountersObject_SelectedIndexChanged(object sender, EventArgs e) + { + if (Helpers.HandlersDisabled) return; + SafariZoneEncounter safariZoneEncounter = (SafariZoneEncounter)listBoxEncountersObject.SelectedItem; + if (safariZoneEncounter == null) return; + + comboBoxPokemonObject.SelectedIndex = safariZoneEncounter.pokemonID; + numericUpDownLevelObject.Value = safariZoneEncounter.level; + } + + private void comboBoxPokemonObject_SelectedIndexChanged(object sender, EventArgs e) + { + if (Helpers.HandlersDisabled) return; + SafariZoneEncounter safariZoneEncounter = (SafariZoneEncounter)listBoxEncountersObject.SelectedItem; + if (safariZoneEncounter == null) return; + safariZoneEncounter.pokemonID = (ushort)comboBoxPokemonObject.SelectedIndex; + listBoxEncountersObject.RefreshItem(listBoxEncountersObject.SelectedIndex); + } + + private void numericUpDownLevelObject_ValueChanged(object sender, EventArgs e) + { + if (Helpers.HandlersDisabled) return; + SafariZoneEncounter safariZoneEncounter = (SafariZoneEncounter)listBoxEncountersObject.SelectedItem; + if (safariZoneEncounter == null) return; + safariZoneEncounter.level = (byte)numericUpDownLevelObject.Value; + listBoxEncountersObject.RefreshItem(listBoxEncountersObject.SelectedIndex); + } + } +} diff --git a/DS_Map/Editors/SafariZoneEncounterEditorTab.resx b/DS_Map/Editors/SafariZoneEncounterEditorTab.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/DS_Map/Editors/SafariZoneEncounterEditorTab.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/SafariZoneEncounterGroupEditor.Designer.cs b/DS_Map/Editors/SafariZoneEncounterGroupEditor.Designer.cs new file mode 100644 index 0000000..bf45296 --- /dev/null +++ b/DS_Map/Editors/SafariZoneEncounterGroupEditor.Designer.cs @@ -0,0 +1,323 @@ + +namespace DSPRE.Editors +{ + partial class SafariZoneEncounterGroupEditor + { + /// + /// 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 Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.tabControlEncounters = new System.Windows.Forms.TabControl(); + this.tabPageMorning = new System.Windows.Forms.TabPage(); + this.safariZoneEncounterEditorMorningTab = new DSPRE.Editors.SafariZoneEncounterEditorTab(); + this.tabPageDay = new System.Windows.Forms.TabPage(); + this.safariZoneEncounterEditorDayTab = new DSPRE.Editors.SafariZoneEncounterEditorTab(); + this.tabPageNight = new System.Windows.Forms.TabPage(); + this.safariZoneEncounterEditorNightTab = new DSPRE.Editors.SafariZoneEncounterEditorTab(); + this.label3 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.comboBoxObjectRequirementType = new System.Windows.Forms.ComboBox(); + this.numericUpDownObjectRequirementQty = new System.Windows.Forms.NumericUpDown(); + this.listBoxObjectRequirements = new DSPRE.ListBox2(); + this.listBoxObjectOptionalRequirements = new DSPRE.ListBox2(); + this.numericUpDownObjectOptionalRequirementQty = new System.Windows.Forms.NumericUpDown(); + this.comboBoxOptionalObjectRequirementType = new System.Windows.Forms.ComboBox(); + this.label5 = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); + this.label7 = new System.Windows.Forms.Label(); + this.buttonRemoveObjectEncounter = new System.Windows.Forms.Button(); + this.buttonAddObjectEncounter = new System.Windows.Forms.Button(); + this.tabControlEncounters.SuspendLayout(); + this.tabPageMorning.SuspendLayout(); + this.tabPageDay.SuspendLayout(); + this.tabPageNight.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownObjectRequirementQty)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownObjectOptionalRequirementQty)).BeginInit(); + this.SuspendLayout(); + // + // tabControlEncounters + // + this.tabControlEncounters.Controls.Add(this.tabPageMorning); + this.tabControlEncounters.Controls.Add(this.tabPageDay); + this.tabControlEncounters.Controls.Add(this.tabPageNight); + this.tabControlEncounters.Location = new System.Drawing.Point(4, 7); + this.tabControlEncounters.Name = "tabControlEncounters"; + this.tabControlEncounters.SelectedIndex = 0; + this.tabControlEncounters.Size = new System.Drawing.Size(418, 244); + this.tabControlEncounters.TabIndex = 2; + // + // tabPageMorning + // + this.tabPageMorning.Controls.Add(this.safariZoneEncounterEditorMorningTab); + this.tabPageMorning.Location = new System.Drawing.Point(4, 22); + this.tabPageMorning.Name = "tabPageMorning"; + this.tabPageMorning.Padding = new System.Windows.Forms.Padding(3); + this.tabPageMorning.Size = new System.Drawing.Size(410, 218); + this.tabPageMorning.TabIndex = 0; + this.tabPageMorning.Text = "Morning"; + this.tabPageMorning.UseVisualStyleBackColor = true; + // + // safariZoneEncounterEditorMorningTab + // + this.safariZoneEncounterEditorMorningTab.Location = new System.Drawing.Point(6, 6); + this.safariZoneEncounterEditorMorningTab.Name = "safariZoneEncounterEditorMorningTab"; + this.safariZoneEncounterEditorMorningTab.Size = new System.Drawing.Size(405, 209); + this.safariZoneEncounterEditorMorningTab.TabIndex = 1; + // + // tabPageDay + // + this.tabPageDay.Controls.Add(this.safariZoneEncounterEditorDayTab); + this.tabPageDay.Location = new System.Drawing.Point(4, 22); + this.tabPageDay.Name = "tabPageDay"; + this.tabPageDay.Padding = new System.Windows.Forms.Padding(3); + this.tabPageDay.Size = new System.Drawing.Size(410, 218); + this.tabPageDay.TabIndex = 1; + this.tabPageDay.Text = "Day"; + this.tabPageDay.UseVisualStyleBackColor = true; + // + // safariZoneEncounterEditorDayTab + // + this.safariZoneEncounterEditorDayTab.Location = new System.Drawing.Point(6, 6); + this.safariZoneEncounterEditorDayTab.Name = "safariZoneEncounterEditorDayTab"; + this.safariZoneEncounterEditorDayTab.Size = new System.Drawing.Size(401, 206); + this.safariZoneEncounterEditorDayTab.TabIndex = 1; + // + // tabPageNight + // + this.tabPageNight.Controls.Add(this.safariZoneEncounterEditorNightTab); + this.tabPageNight.Location = new System.Drawing.Point(4, 22); + this.tabPageNight.Name = "tabPageNight"; + this.tabPageNight.Padding = new System.Windows.Forms.Padding(3); + this.tabPageNight.Size = new System.Drawing.Size(410, 218); + this.tabPageNight.TabIndex = 2; + this.tabPageNight.Text = "Night"; + this.tabPageNight.UseVisualStyleBackColor = true; + // + // safariZoneEncounterEditorNightTab + // + this.safariZoneEncounterEditorNightTab.Location = new System.Drawing.Point(6, 6); + this.safariZoneEncounterEditorNightTab.Name = "safariZoneEncounterEditorNightTab"; + this.safariZoneEncounterEditorNightTab.Size = new System.Drawing.Size(401, 206); + this.safariZoneEncounterEditorNightTab.TabIndex = 1; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(657, 198); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(23, 13); + this.label3.TabIndex = 29; + this.label3.Text = "Qty"; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(524, 198); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(31, 13); + this.label4.TabIndex = 30; + this.label4.Text = "Type"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(524, 35); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(133, 13); + this.label2.TabIndex = 28; + this.label2.Text = "Object Type Requirements"; + // + // comboBoxObjectRequirementType + // + this.comboBoxObjectRequirementType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBoxObjectRequirementType.FormattingEnabled = true; + this.comboBoxObjectRequirementType.Location = new System.Drawing.Point(527, 214); + this.comboBoxObjectRequirementType.Name = "comboBoxObjectRequirementType"; + this.comboBoxObjectRequirementType.Size = new System.Drawing.Size(127, 21); + this.comboBoxObjectRequirementType.TabIndex = 27; + this.comboBoxObjectRequirementType.SelectedIndexChanged += new System.EventHandler(this.comboBoxObjectRequirementType_SelectedIndexChanged); + // + // numericUpDownObjectRequirementQty + // + this.numericUpDownObjectRequirementQty.Location = new System.Drawing.Point(660, 215); + this.numericUpDownObjectRequirementQty.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDownObjectRequirementQty.Name = "numericUpDownObjectRequirementQty"; + this.numericUpDownObjectRequirementQty.Size = new System.Drawing.Size(58, 20); + this.numericUpDownObjectRequirementQty.TabIndex = 26; + this.numericUpDownObjectRequirementQty.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDownObjectRequirementQty.ValueChanged += new System.EventHandler(this.numericUpDownObjectRequirementQty_ValueChanged); + // + // listBoxObjectRequirements + // + this.listBoxObjectRequirements.Font = new System.Drawing.Font("Consolas", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.listBoxObjectRequirements.FormattingEnabled = true; + this.listBoxObjectRequirements.ItemHeight = 14; + this.listBoxObjectRequirements.Location = new System.Drawing.Point(527, 51); + this.listBoxObjectRequirements.Name = "listBoxObjectRequirements"; + this.listBoxObjectRequirements.Size = new System.Drawing.Size(191, 144); + this.listBoxObjectRequirements.TabIndex = 25; + this.listBoxObjectRequirements.SelectedIndexChanged += new System.EventHandler(this.listBoxObjectRequirements_SelectedIndexChanged); + // + // listBoxObjectOptionalRequirements + // + this.listBoxObjectOptionalRequirements.Font = new System.Drawing.Font("Consolas", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.listBoxObjectOptionalRequirements.FormattingEnabled = true; + this.listBoxObjectOptionalRequirements.ItemHeight = 14; + this.listBoxObjectOptionalRequirements.Location = new System.Drawing.Point(724, 51); + this.listBoxObjectOptionalRequirements.Name = "listBoxObjectOptionalRequirements"; + this.listBoxObjectOptionalRequirements.Size = new System.Drawing.Size(191, 144); + this.listBoxObjectOptionalRequirements.TabIndex = 25; + this.listBoxObjectOptionalRequirements.SelectedIndexChanged += new System.EventHandler(this.listBoxObjectOptionalRequirements_SelectedIndexChanged); + // + // numericUpDownObjectOptionalRequirementQty + // + this.numericUpDownObjectOptionalRequirementQty.Location = new System.Drawing.Point(857, 215); + this.numericUpDownObjectOptionalRequirementQty.Name = "numericUpDownObjectOptionalRequirementQty"; + this.numericUpDownObjectOptionalRequirementQty.Size = new System.Drawing.Size(58, 20); + this.numericUpDownObjectOptionalRequirementQty.TabIndex = 26; + this.numericUpDownObjectOptionalRequirementQty.ValueChanged += new System.EventHandler(this.numericUpDownObjectOptionalRequirementQty_ValueChanged); + // + // comboBoxOptionalObjectRequirementType + // + this.comboBoxOptionalObjectRequirementType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBoxOptionalObjectRequirementType.FormattingEnabled = true; + this.comboBoxOptionalObjectRequirementType.Location = new System.Drawing.Point(724, 214); + this.comboBoxOptionalObjectRequirementType.Name = "comboBoxOptionalObjectRequirementType"; + this.comboBoxOptionalObjectRequirementType.Size = new System.Drawing.Size(127, 21); + this.comboBoxOptionalObjectRequirementType.TabIndex = 27; + this.comboBoxOptionalObjectRequirementType.SelectedIndexChanged += new System.EventHandler(this.comboBoxOptionalObjectRequirementType_SelectedIndexChanged); + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(721, 35); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(175, 13); + this.label5.TabIndex = 28; + this.label5.Text = "Optional Object Type Requirements"; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(721, 198); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(31, 13); + this.label6.TabIndex = 30; + this.label6.Text = "Type"; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(854, 198); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(23, 13); + this.label7.TabIndex = 29; + this.label7.Text = "Qty"; + // + // buttonRemoveObjectEncounter + // + this.buttonRemoveObjectEncounter.Location = new System.Drawing.Point(424, 77); + this.buttonRemoveObjectEncounter.Name = "buttonRemoveObjectEncounter"; + this.buttonRemoveObjectEncounter.Size = new System.Drawing.Size(97, 55); + this.buttonRemoveObjectEncounter.TabIndex = 31; + this.buttonRemoveObjectEncounter.Text = "Remove Last Object Encounter"; + this.buttonRemoveObjectEncounter.UseVisualStyleBackColor = true; + this.buttonRemoveObjectEncounter.Click += new System.EventHandler(this.buttonRemoveObjectEncounter_Click); + // + // buttonAddObjectEncounter + // + this.buttonAddObjectEncounter.Location = new System.Drawing.Point(424, 32); + this.buttonAddObjectEncounter.Name = "buttonAddObjectEncounter"; + this.buttonAddObjectEncounter.Size = new System.Drawing.Size(97, 39); + this.buttonAddObjectEncounter.TabIndex = 31; + this.buttonAddObjectEncounter.Text = "Add Object Encounter"; + this.buttonAddObjectEncounter.UseVisualStyleBackColor = true; + this.buttonAddObjectEncounter.Click += new System.EventHandler(this.buttonAddObjectEncounter_Click); + // + // SafariZoneEncounterGroupEditor + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.buttonAddObjectEncounter); + this.Controls.Add(this.buttonRemoveObjectEncounter); + this.Controls.Add(this.label7); + this.Controls.Add(this.label3); + this.Controls.Add(this.label6); + this.Controls.Add(this.label4); + this.Controls.Add(this.tabControlEncounters); + this.Controls.Add(this.label5); + this.Controls.Add(this.comboBoxOptionalObjectRequirementType); + this.Controls.Add(this.label2); + this.Controls.Add(this.comboBoxObjectRequirementType); + this.Controls.Add(this.numericUpDownObjectOptionalRequirementQty); + this.Controls.Add(this.listBoxObjectOptionalRequirements); + this.Controls.Add(this.numericUpDownObjectRequirementQty); + this.Controls.Add(this.listBoxObjectRequirements); + this.Name = "SafariZoneEncounterGroupEditor"; + this.Size = new System.Drawing.Size(927, 257); + this.tabControlEncounters.ResumeLayout(false); + this.tabPageMorning.ResumeLayout(false); + this.tabPageDay.ResumeLayout(false); + this.tabPageNight.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownObjectRequirementQty)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownObjectOptionalRequirementQty)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + private System.Windows.Forms.TabControl tabControlEncounters; + private System.Windows.Forms.TabPage tabPageMorning; + private System.Windows.Forms.TabPage tabPageDay; + private System.Windows.Forms.TabPage tabPageNight; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label2; + public System.Windows.Forms.ComboBox comboBoxObjectRequirementType; + public System.Windows.Forms.NumericUpDown numericUpDownObjectRequirementQty; + public ListBox2 listBoxObjectRequirements; + public ListBox2 listBoxObjectOptionalRequirements; + public System.Windows.Forms.NumericUpDown numericUpDownObjectOptionalRequirementQty; + public System.Windows.Forms.ComboBox comboBoxOptionalObjectRequirementType; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label label7; + public SafariZoneEncounterEditorTab safariZoneEncounterEditorMorningTab; + public SafariZoneEncounterEditorTab safariZoneEncounterEditorDayTab; + public SafariZoneEncounterEditorTab safariZoneEncounterEditorNightTab; + private System.Windows.Forms.Button buttonRemoveObjectEncounter; + private System.Windows.Forms.Button buttonAddObjectEncounter; + } +} diff --git a/DS_Map/Editors/SafariZoneEncounterGroupEditor.cs b/DS_Map/Editors/SafariZoneEncounterGroupEditor.cs new file mode 100644 index 0000000..32686ce --- /dev/null +++ b/DS_Map/Editors/SafariZoneEncounterGroupEditor.cs @@ -0,0 +1,143 @@ +using System; +using System.Windows.Forms; +using DSPRE.ROMFiles; + +namespace DSPRE.Editors { + public partial class SafariZoneEncounterGroupEditor : UserControl { + private SafariZoneEncounterGroup safariZoneEncounterGroup; + + public SafariZoneEncounterGroupEditor() { + InitializeComponent(); + safariZoneEncounterEditorMorningTab.listBoxEncountersObject.SelectedIndexChanged += ListBoxEncountersObject_SelectedIndexChanged; + safariZoneEncounterEditorDayTab.listBoxEncountersObject.SelectedIndexChanged += ListBoxEncountersObject_SelectedIndexChanged; + safariZoneEncounterEditorNightTab.listBoxEncountersObject.SelectedIndexChanged += ListBoxEncountersObject_SelectedIndexChanged; + listBoxObjectRequirements.SelectedIndexChanged += ListBoxEncountersObject_SelectedIndexChanged; + listBoxObjectOptionalRequirements.SelectedIndexChanged += ListBoxEncountersObject_SelectedIndexChanged; + } + + private void ListBoxEncountersObject_SelectedIndexChanged(object sender, EventArgs e) { + try { + ListBox2 s = sender as ListBox2; + safariZoneEncounterEditorMorningTab.listBoxEncountersObject.SelectedIndex = s.SelectedIndex; + safariZoneEncounterEditorDayTab.listBoxEncountersObject.SelectedIndex = s.SelectedIndex; + safariZoneEncounterEditorNightTab.listBoxEncountersObject.SelectedIndex = s.SelectedIndex; + listBoxObjectRequirements.SelectedIndex = s.SelectedIndex; + listBoxObjectOptionalRequirements.SelectedIndex = s.SelectedIndex; + } + catch (Exception ex) { + } + } + + public void SetPokemonNames() { + string[] pokemonNames = RomInfo.GetPokemonNames(); + safariZoneEncounterEditorMorningTab.comboBoxPokemon.Items.AddRange(pokemonNames); + safariZoneEncounterEditorMorningTab.comboBoxPokemonObject.Items.AddRange(pokemonNames); + safariZoneEncounterEditorDayTab.comboBoxPokemon.Items.AddRange(pokemonNames); + safariZoneEncounterEditorDayTab.comboBoxPokemonObject.Items.AddRange(pokemonNames); + safariZoneEncounterEditorNightTab.comboBoxPokemon.Items.AddRange(pokemonNames); + safariZoneEncounterEditorNightTab.comboBoxPokemonObject.Items.AddRange(pokemonNames); + + foreach (string type in SafariZoneObjectRequirement.ObjectTypes.Values) { + comboBoxObjectRequirementType.Items.Add(type); + comboBoxOptionalObjectRequirementType.Items.Add(type); + } + } + + public void Reset() { + this.safariZoneEncounterGroup = null; + safariZoneEncounterEditorMorningTab.listBoxEncounters.DataSource = null; + safariZoneEncounterEditorDayTab.listBoxEncounters.DataSource = null; + safariZoneEncounterEditorNightTab.listBoxEncounters.DataSource = null; + + safariZoneEncounterEditorMorningTab.listBoxEncountersObject.DataSource = null; + safariZoneEncounterEditorDayTab.listBoxEncountersObject.DataSource = null; + safariZoneEncounterEditorNightTab.listBoxEncountersObject.DataSource = null; + listBoxObjectRequirements.DataSource = null; + listBoxObjectOptionalRequirements.DataSource = null; + } + + public void SetData(SafariZoneEncounterGroup safariZoneEncounterGroup) { + this.safariZoneEncounterGroup = safariZoneEncounterGroup; + safariZoneEncounterEditorMorningTab.listBoxEncounters.DataSource = this.safariZoneEncounterGroup.MorningEncounters; + safariZoneEncounterEditorDayTab.listBoxEncounters.DataSource = this.safariZoneEncounterGroup.DayEncounters; + safariZoneEncounterEditorNightTab.listBoxEncounters.DataSource = this.safariZoneEncounterGroup.NightEncounters; + + safariZoneEncounterEditorMorningTab.listBoxEncountersObject.DataSource = this.safariZoneEncounterGroup.MorningEncountersObject; + safariZoneEncounterEditorDayTab.listBoxEncountersObject.DataSource = this.safariZoneEncounterGroup.DayEncountersObject; + safariZoneEncounterEditorNightTab.listBoxEncountersObject.DataSource = this.safariZoneEncounterGroup.NightEncountersObject; + listBoxObjectRequirements.DataSource = this.safariZoneEncounterGroup.ObjectRequirements; + listBoxObjectOptionalRequirements.DataSource = this.safariZoneEncounterGroup.OptionalObjectRequirements; + } + + private void listBoxObjectRequirements_SelectedIndexChanged(object sender, EventArgs e) { + if (Helpers.HandlersDisabled) return; + SafariZoneObjectRequirement safariZoneObjectRequirement = (SafariZoneObjectRequirement)listBoxObjectRequirements.SelectedItem; + if (safariZoneObjectRequirement == null) return; + comboBoxObjectRequirementType.SelectedIndex = safariZoneObjectRequirement.typeID; + numericUpDownObjectRequirementQty.Value = safariZoneObjectRequirement.quantity; + } + + private void comboBoxObjectRequirementType_SelectedIndexChanged(object sender, EventArgs e) { + if (Helpers.HandlersDisabled) return; + // if (comboBoxObjectRequirementType.SelectedIndex == 0) comboBoxObjectRequirementType.SelectedIndex = 1; //no requirement is not valid + SafariZoneObjectRequirement safariZoneObjectRequirement = (SafariZoneObjectRequirement)listBoxObjectRequirements.SelectedItem; + if (safariZoneObjectRequirement == null) return; + safariZoneObjectRequirement.typeID = (byte)comboBoxObjectRequirementType.SelectedIndex; + listBoxObjectRequirements.RefreshItem(listBoxObjectRequirements.SelectedIndex); + } + + private void numericUpDownObjectRequirementQty_ValueChanged(object sender, EventArgs e) { + if (Helpers.HandlersDisabled) return; + SafariZoneObjectRequirement safariZoneObjectRequirement = (SafariZoneObjectRequirement)listBoxObjectRequirements.SelectedItem; + if (safariZoneObjectRequirement == null) return; + safariZoneObjectRequirement.quantity = (byte)numericUpDownObjectRequirementQty.Value; + listBoxObjectRequirements.RefreshItem(listBoxObjectRequirements.SelectedIndex); + } + + private void listBoxObjectOptionalRequirements_SelectedIndexChanged(object sender, EventArgs e) { + if (Helpers.HandlersDisabled) return; + SafariZoneObjectRequirement safariZoneObjectRequirement = (SafariZoneObjectRequirement)listBoxObjectOptionalRequirements.SelectedItem; + if (safariZoneObjectRequirement == null) return; + comboBoxOptionalObjectRequirementType.SelectedIndex = safariZoneObjectRequirement.typeID; + numericUpDownObjectOptionalRequirementQty.Value = safariZoneObjectRequirement.quantity; + } + + private void comboBoxOptionalObjectRequirementType_SelectedIndexChanged(object sender, EventArgs e) { + if (Helpers.HandlersDisabled) return; + SafariZoneObjectRequirement safariZoneObjectRequirement = (SafariZoneObjectRequirement)listBoxObjectOptionalRequirements.SelectedItem; + if (safariZoneObjectRequirement == null) return; + safariZoneObjectRequirement.typeID = (byte)comboBoxOptionalObjectRequirementType.SelectedIndex; + listBoxObjectOptionalRequirements.RefreshItem(listBoxObjectOptionalRequirements.SelectedIndex); + } + + private void numericUpDownObjectOptionalRequirementQty_ValueChanged(object sender, EventArgs e) { + if (Helpers.HandlersDisabled) return; + SafariZoneObjectRequirement safariZoneObjectRequirement = (SafariZoneObjectRequirement)listBoxObjectOptionalRequirements.SelectedItem; + if (safariZoneObjectRequirement == null) return; + safariZoneObjectRequirement.quantity = (byte)numericUpDownObjectOptionalRequirementQty.Value; + listBoxObjectOptionalRequirements.RefreshItem(listBoxObjectOptionalRequirements.SelectedIndex); + } + + private void buttonAddObjectEncounter_Click(object sender, EventArgs e) { + if (this.safariZoneEncounterGroup == null) return; + if (listBoxObjectOptionalRequirements.SelectedIndex == -1) return; + safariZoneEncounterGroup.MorningEncountersObject.Add(new SafariZoneEncounter()); + safariZoneEncounterGroup.DayEncountersObject.Add(new SafariZoneEncounter()); + safariZoneEncounterGroup.NightEncountersObject.Add(new SafariZoneEncounter()); + safariZoneEncounterGroup.ObjectRequirements.Add(new SafariZoneObjectRequirement(1, 1)); + safariZoneEncounterGroup.OptionalObjectRequirements.Add(new SafariZoneObjectRequirement(0, 0)); + safariZoneEncounterGroup.ObjectSlots = (byte)safariZoneEncounterGroup.ObjectRequirements.Count; //all the list counts should be the same + } + + private void buttonRemoveObjectEncounter_Click(object sender, EventArgs e) { + if (this.safariZoneEncounterGroup == null) return; + if (listBoxObjectOptionalRequirements.SelectedIndex == -1) return; + safariZoneEncounterGroup.MorningEncountersObject.RemoveAt(safariZoneEncounterGroup.MorningEncountersObject.Count - 1); + safariZoneEncounterGroup.DayEncountersObject.RemoveAt(safariZoneEncounterGroup.DayEncountersObject.Count - 1); + safariZoneEncounterGroup.NightEncountersObject.RemoveAt(safariZoneEncounterGroup.NightEncountersObject.Count - 1); + safariZoneEncounterGroup.ObjectRequirements.RemoveAt(safariZoneEncounterGroup.ObjectRequirements.Count - 1); + safariZoneEncounterGroup.OptionalObjectRequirements.RemoveAt(safariZoneEncounterGroup.OptionalObjectRequirements.Count - 1); + safariZoneEncounterGroup.ObjectSlots = (byte)safariZoneEncounterGroup.ObjectRequirements.Count; //all the list counts should be the same + } + } +} diff --git a/DS_Map/Editors/SafariZoneEncounterGroupEditor.resx b/DS_Map/Editors/SafariZoneEncounterGroupEditor.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/DS_Map/Editors/SafariZoneEncounterGroupEditor.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/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs index 746d63e..a9f6ac5 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 dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle43 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle44 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle45 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle46 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle47 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle48 = 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(); @@ -775,7 +775,11 @@ this.headerConditionalMusicComboBox = new System.Windows.Forms.ComboBox(); this.conditionalMusicTableListBox = new System.Windows.Forms.ListBox(); this.tabPageScriptEditor = new System.Windows.Forms.TabPage(); + this.scriptEditor = new DSPRE.Editors.ScriptEditor(); this.tabPageLevelScriptEditor = new System.Windows.Forms.TabPage(); + this.levelScriptEditor = new DSPRE.Editors.LevelScriptEditor(); + this.tabPageEncountersEditor = new System.Windows.Forms.TabPage(); + this.encountersEditor = new DSPRE.Editors.EncountersEditor(); this.mainTabImageList = new System.Windows.Forms.ImageList(this.components); this.gameIcon = new System.Windows.Forms.PictureBox(); this.languageLabel = new System.Windows.Forms.Label(); @@ -848,8 +852,6 @@ this.separator_afterMiscButtons = new System.Windows.Forms.ToolStripSeparator(); this.versionLabel = new System.Windows.Forms.Label(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.scriptEditor = new DSPRE.Editors.ScriptEditor(); - this.levelScriptEditor = new DSPRE.Editors.LevelScriptEditor(); this.mainTabControl.SuspendLayout(); this.headerEditorTabPage.SuspendLayout(); this.worldmapCoordsGroupBox.SuspendLayout(); @@ -1083,6 +1085,7 @@ ((System.ComponentModel.ISupportInitialize)(this.flagConditionalMusicUpDown)).BeginInit(); this.tabPageScriptEditor.SuspendLayout(); this.tabPageLevelScriptEditor.SuspendLayout(); + this.tabPageEncountersEditor.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gameIcon)).BeginInit(); this.menuStrip1.SuspendLayout(); this.statusStrip1.SuspendLayout(); @@ -1103,11 +1106,12 @@ this.mainTabControl.Controls.Add(this.tableEditorTabPage); this.mainTabControl.Controls.Add(this.tabPageScriptEditor); this.mainTabControl.Controls.Add(this.tabPageLevelScriptEditor); + this.mainTabControl.Controls.Add(this.tabPageEncountersEditor); this.mainTabControl.ImageList = this.mainTabImageList; this.mainTabControl.Location = new System.Drawing.Point(11, 72); this.mainTabControl.Name = "mainTabControl"; this.mainTabControl.SelectedIndex = 0; - this.mainTabControl.Size = new System.Drawing.Size(1193, 660); + this.mainTabControl.Size = new System.Drawing.Size(1193, 702); this.mainTabControl.TabIndex = 5; this.mainTabControl.Visible = false; this.mainTabControl.SelectedIndexChanged += new System.EventHandler(this.mainTabControl_SelectedIndexChanged); @@ -1142,7 +1146,7 @@ this.headerEditorTabPage.Location = new System.Drawing.Point(4, 23); this.headerEditorTabPage.Name = "headerEditorTabPage"; this.headerEditorTabPage.Padding = new System.Windows.Forms.Padding(3); - this.headerEditorTabPage.Size = new System.Drawing.Size(1185, 633); + this.headerEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.headerEditorTabPage.TabIndex = 0; this.headerEditorTabPage.Text = "Header Editor"; // @@ -2530,7 +2534,7 @@ this.matrixEditorTabPage.Location = new System.Drawing.Point(4, 23); this.matrixEditorTabPage.Name = "matrixEditorTabPage"; this.matrixEditorTabPage.Padding = new System.Windows.Forms.Padding(3); - this.matrixEditorTabPage.Size = new System.Drawing.Size(1185, 633); + this.matrixEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.matrixEditorTabPage.TabIndex = 1; this.matrixEditorTabPage.Text = "Matrix Editor"; // @@ -2540,7 +2544,7 @@ this.setSpawnPointButton.Image = global::DSPRE.Properties.Resources.spawnCoordsMatrixeditorIcon; this.setSpawnPointButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.setSpawnPointButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.setSpawnPointButton.Location = new System.Drawing.Point(12, 522); + this.setSpawnPointButton.Location = new System.Drawing.Point(12, -2832); this.setSpawnPointButton.Name = "setSpawnPointButton"; this.setSpawnPointButton.Size = new System.Drawing.Size(117, 43); this.setSpawnPointButton.TabIndex = 35; @@ -2556,7 +2560,7 @@ this.saveMatrixButton.Image = global::DSPRE.Properties.Resources.save_rom; this.saveMatrixButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.saveMatrixButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.saveMatrixButton.Location = new System.Drawing.Point(12, 567); + this.saveMatrixButton.Location = new System.Drawing.Point(12, -2787); this.saveMatrixButton.Name = "saveMatrixButton"; this.saveMatrixButton.Size = new System.Drawing.Size(117, 43); this.saveMatrixButton.TabIndex = 34; @@ -2738,16 +2742,16 @@ this.matrixTabControl.Multiline = true; this.matrixTabControl.Name = "matrixTabControl"; this.matrixTabControl.SelectedIndex = 0; - this.matrixTabControl.Size = new System.Drawing.Size(1040, 616); + this.matrixTabControl.Size = new System.Drawing.Size(0, 0); this.matrixTabControl.TabIndex = 18; // // headersTabPage // this.headersTabPage.Controls.Add(this.headersGridView); - this.headersTabPage.Location = new System.Drawing.Point(4, 22); + this.headersTabPage.Location = new System.Drawing.Point(4, 58); this.headersTabPage.Name = "headersTabPage"; this.headersTabPage.Padding = new System.Windows.Forms.Padding(3); - this.headersTabPage.Size = new System.Drawing.Size(1032, 590); + this.headersTabPage.Size = new System.Drawing.Size(0, 0); this.headersTabPage.TabIndex = 1; this.headersTabPage.Text = "Map Headers"; this.headersTabPage.UseVisualStyleBackColor = true; @@ -2759,40 +2763,40 @@ this.headersGridView.AllowUserToResizeColumns = false; this.headersGridView.AllowUserToResizeRows = false; this.headersGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle33.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - dataGridViewCellStyle33.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle33.ForeColor = System.Drawing.SystemColors.Info; - dataGridViewCellStyle33.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle33.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.headersGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle33; + 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; - dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle34.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle34.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle34.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle34.Format = "D4"; - dataGridViewCellStyle34.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle34.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.headersGridView.DefaultCellStyle = dataGridViewCellStyle34; + 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"; - dataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle35.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle35.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle35.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle35.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle35.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.headersGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle35; + 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; - dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle36.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.headersGridView.RowsDefaultCellStyle = dataGridViewCellStyle36; + 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; @@ -2808,9 +2812,9 @@ // heightsTabPage // this.heightsTabPage.Controls.Add(this.heightsGridView); - this.heightsTabPage.Location = new System.Drawing.Point(4, 22); + this.heightsTabPage.Location = new System.Drawing.Point(4, 58); this.heightsTabPage.Name = "heightsTabPage"; - this.heightsTabPage.Size = new System.Drawing.Size(1032, 590); + this.heightsTabPage.Size = new System.Drawing.Size(0, 0); this.heightsTabPage.TabIndex = 2; this.heightsTabPage.Text = "Map Heights"; this.heightsTabPage.UseVisualStyleBackColor = true; @@ -2821,43 +2825,43 @@ this.heightsGridView.AllowUserToDeleteRows = false; this.heightsGridView.AllowUserToResizeColumns = false; this.heightsGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle37; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5; this.heightsGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle38.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle38.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle38.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle38.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle38.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle38.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.heightsGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle38; + 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; - dataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle39.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle39.Font = new System.Drawing.Font("Tahoma", 8.25F); - dataGridViewCellStyle39.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle39.Format = "D2"; - dataGridViewCellStyle39.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle39.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle39.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle39; + 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"; - dataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle40.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle40.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle40.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle40.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle40.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle40.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.heightsGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle40; + 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; - dataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle41.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.heightsGridView.RowsDefaultCellStyle = dataGridViewCellStyle41; + 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; @@ -2871,9 +2875,9 @@ // mapFilesTabPage // this.mapFilesTabPage.Controls.Add(this.mapFilesGridView); - this.mapFilesTabPage.Location = new System.Drawing.Point(4, 22); + this.mapFilesTabPage.Location = new System.Drawing.Point(4, 58); this.mapFilesTabPage.Name = "mapFilesTabPage"; - this.mapFilesTabPage.Size = new System.Drawing.Size(1032, 590); + this.mapFilesTabPage.Size = new System.Drawing.Size(0, 0); this.mapFilesTabPage.TabIndex = 3; this.mapFilesTabPage.Text = "Map Files"; this.mapFilesTabPage.UseVisualStyleBackColor = true; @@ -2884,43 +2888,43 @@ this.mapFilesGridView.AllowUserToDeleteRows = false; this.mapFilesGridView.AllowUserToResizeColumns = false; this.mapFilesGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle42.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle42; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10; this.mapFilesGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle43.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle43.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle43.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle43.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle43.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle43.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mapFilesGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle43; + 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; - dataGridViewCellStyle44.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle44.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle44.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle44.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle44.Format = "D4"; - dataGridViewCellStyle44.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle44.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle44.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle44; + 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"; - dataGridViewCellStyle45.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle45.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle45.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle45.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle45.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle45.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle45.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mapFilesGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle45; + 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; - dataGridViewCellStyle46.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle46.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.mapFilesGridView.RowsDefaultCellStyle = dataGridViewCellStyle46; + 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; @@ -3027,7 +3031,7 @@ this.mapEditorTabPage.Location = new System.Drawing.Point(4, 23); this.mapEditorTabPage.Name = "mapEditorTabPage"; this.mapEditorTabPage.Padding = new System.Windows.Forms.Padding(3); - this.mapEditorTabPage.Size = new System.Drawing.Size(1185, 633); + this.mapEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.mapEditorTabPage.TabIndex = 2; this.mapEditorTabPage.Text = "Map Editor"; this.mapEditorTabPage.Enter += new System.EventHandler(this.mapEditorTabPage_Enter); @@ -4335,7 +4339,7 @@ this.radio3D.AutoSize = true; this.radio3D.Checked = true; this.radio3D.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.radio3D.Location = new System.Drawing.Point(1140, 546); + this.radio3D.Location = new System.Drawing.Point(-4818, -2808); this.radio3D.Name = "radio3D"; this.radio3D.Size = new System.Drawing.Size(31, 23); this.radio3D.TabIndex = 26; @@ -4350,7 +4354,7 @@ 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(1140, 570); + this.radio2D.Location = new System.Drawing.Point(-4818, -2784); this.radio2D.Name = "radio2D"; this.radio2D.Size = new System.Drawing.Size(31, 23); this.radio2D.TabIndex = 25; @@ -4365,7 +4369,7 @@ 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(1140, 594); + this.wireframeCheckBox.Location = new System.Drawing.Point(1140, -2760); this.wireframeCheckBox.Name = "wireframeCheckBox"; this.wireframeCheckBox.Size = new System.Drawing.Size(31, 23); this.wireframeCheckBox.TabIndex = 27; @@ -4380,7 +4384,7 @@ this.nsbtxEditorTabPage.Location = new System.Drawing.Point(4, 23); this.nsbtxEditorTabPage.Name = "nsbtxEditorTabPage"; this.nsbtxEditorTabPage.Padding = new System.Windows.Forms.Padding(3); - this.nsbtxEditorTabPage.Size = new System.Drawing.Size(1185, 633); + this.nsbtxEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.nsbtxEditorTabPage.TabIndex = 6; this.nsbtxEditorTabPage.Text = "NSBTX Editor"; this.nsbtxEditorTabPage.UseVisualStyleBackColor = true; @@ -4921,7 +4925,7 @@ this.eventEditorTabPage.Location = new System.Drawing.Point(4, 23); this.eventEditorTabPage.Name = "eventEditorTabPage"; this.eventEditorTabPage.Padding = new System.Windows.Forms.Padding(3); - this.eventEditorTabPage.Size = new System.Drawing.Size(1185, 633); + this.eventEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.eventEditorTabPage.TabIndex = 3; this.eventEditorTabPage.Text = "Event Editor"; this.eventEditorTabPage.Enter += new System.EventHandler(this.eventEditorTabPage_Enter); @@ -6801,7 +6805,7 @@ this.rightClickPicture.ImageLocation = ""; this.rightClickPicture.Location = new System.Drawing.Point(468, 420); this.rightClickPicture.Name = "rightClickPicture"; - this.rightClickPicture.Size = new System.Drawing.Size(38, 38); + this.rightClickPicture.Size = new System.Drawing.Size(0, 38); this.rightClickPicture.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.rightClickPicture.TabIndex = 59; this.rightClickPicture.TabStop = false; @@ -6814,7 +6818,7 @@ this.wheelClickPicture.ImageLocation = ""; this.wheelClickPicture.Location = new System.Drawing.Point(552, 420); this.wheelClickPicture.Name = "wheelClickPicture"; - this.wheelClickPicture.Size = new System.Drawing.Size(38, 38); + this.wheelClickPicture.Size = new System.Drawing.Size(0, 38); this.wheelClickPicture.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.wheelClickPicture.TabIndex = 56; this.wheelClickPicture.TabStop = false; @@ -6827,7 +6831,7 @@ this.LeftClickPicture.ImageLocation = ""; this.LeftClickPicture.Location = new System.Drawing.Point(510, 420); this.LeftClickPicture.Name = "LeftClickPicture"; - this.LeftClickPicture.Size = new System.Drawing.Size(38, 38); + this.LeftClickPicture.Size = new System.Drawing.Size(0, 38); this.LeftClickPicture.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.LeftClickPicture.TabIndex = 55; this.LeftClickPicture.TabStop = false; @@ -6953,7 +6957,7 @@ this.textEditorTabPage.Location = new System.Drawing.Point(4, 23); this.textEditorTabPage.Name = "textEditorTabPage"; this.textEditorTabPage.Padding = new System.Windows.Forms.Padding(3); - this.textEditorTabPage.Size = new System.Drawing.Size(1185, 633); + this.textEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.textEditorTabPage.TabIndex = 5; this.textEditorTabPage.Text = "Text Editor"; this.textEditorTabPage.UseVisualStyleBackColor = true; @@ -7327,8 +7331,8 @@ this.textEditorDataGridView.Location = new System.Drawing.Point(12, 77); this.textEditorDataGridView.Name = "textEditorDataGridView"; this.textEditorDataGridView.RowHeadersWidth = 68; - dataGridViewCellStyle47.Font = new System.Drawing.Font("Consolas", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textEditorDataGridView.RowsDefaultCellStyle = dataGridViewCellStyle47; + 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(873, 500); this.textEditorDataGridView.TabIndex = 24; this.textEditorDataGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.textEditorDataGridView_CellValueChanged); @@ -7377,7 +7381,7 @@ this.cameraEditorTabPage.ImageIndex = 7; this.cameraEditorTabPage.Location = new System.Drawing.Point(4, 23); this.cameraEditorTabPage.Name = "cameraEditorTabPage"; - this.cameraEditorTabPage.Size = new System.Drawing.Size(1185, 633); + this.cameraEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.cameraEditorTabPage.TabIndex = 7; this.cameraEditorTabPage.Text = "Camera Editor"; this.cameraEditorTabPage.UseVisualStyleBackColor = true; @@ -7431,9 +7435,9 @@ this.cameraEditorDataGridView.CausesValidation = false; this.cameraEditorDataGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised; this.cameraEditorDataGridView.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle48.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle48.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.cameraEditorDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle48; + 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, @@ -7567,7 +7571,7 @@ this.trainerEditorTabPage.ImageIndex = 8; this.trainerEditorTabPage.Location = new System.Drawing.Point(4, 23); this.trainerEditorTabPage.Name = "trainerEditorTabPage"; - this.trainerEditorTabPage.Size = new System.Drawing.Size(1185, 633); + this.trainerEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.trainerEditorTabPage.TabIndex = 8; this.trainerEditorTabPage.Text = "Trainer Editor"; this.trainerEditorTabPage.UseVisualStyleBackColor = true; @@ -9577,7 +9581,7 @@ this.tableEditorTabPage.Location = new System.Drawing.Point(4, 23); this.tableEditorTabPage.Name = "tableEditorTabPage"; this.tableEditorTabPage.Padding = new System.Windows.Forms.Padding(3); - this.tableEditorTabPage.Size = new System.Drawing.Size(1185, 633); + this.tableEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.tableEditorTabPage.TabIndex = 9; this.tableEditorTabPage.Text = "Table Editor"; this.tableEditorTabPage.UseVisualStyleBackColor = true; @@ -10055,22 +10059,57 @@ this.tabPageScriptEditor.Location = new System.Drawing.Point(4, 23); this.tabPageScriptEditor.Name = "tabPageScriptEditor"; this.tabPageScriptEditor.Padding = new System.Windows.Forms.Padding(3); - this.tabPageScriptEditor.Size = new System.Drawing.Size(1185, 633); + this.tabPageScriptEditor.Size = new System.Drawing.Size(1185, 675); this.tabPageScriptEditor.TabIndex = 10; this.tabPageScriptEditor.Text = "Script Editor New"; this.tabPageScriptEditor.UseVisualStyleBackColor = true; // + // scriptEditor + // + this.scriptEditor.Location = new System.Drawing.Point(2, 3); + this.scriptEditor.Name = "scriptEditor"; + this.scriptEditor.scriptEditorIsReady = false; + this.scriptEditor.Size = new System.Drawing.Size(1177, 735); + this.scriptEditor.TabIndex = 0; + // // tabPageLevelScriptEditor // this.tabPageLevelScriptEditor.Controls.Add(this.levelScriptEditor); this.tabPageLevelScriptEditor.Location = new System.Drawing.Point(4, 23); this.tabPageLevelScriptEditor.Name = "tabPageLevelScriptEditor"; this.tabPageLevelScriptEditor.Padding = new System.Windows.Forms.Padding(3); - this.tabPageLevelScriptEditor.Size = new System.Drawing.Size(1185, 633); + this.tabPageLevelScriptEditor.Size = new System.Drawing.Size(1185, 675); this.tabPageLevelScriptEditor.TabIndex = 11; this.tabPageLevelScriptEditor.Text = "Level Script Editor"; this.tabPageLevelScriptEditor.UseVisualStyleBackColor = true; // + // levelScriptEditor + // + this.levelScriptEditor.BackColor = System.Drawing.SystemColors.Control; + this.levelScriptEditor.levelScriptEditorIsReady = false; + this.levelScriptEditor.Location = new System.Drawing.Point(6, 8); + this.levelScriptEditor.Name = "levelScriptEditor"; + this.levelScriptEditor.Size = new System.Drawing.Size(408, 622); + this.levelScriptEditor.TabIndex = 0; + // + // tabPageEncountersEditor + // + this.tabPageEncountersEditor.Controls.Add(this.encountersEditor); + this.tabPageEncountersEditor.Location = new System.Drawing.Point(4, 23); + this.tabPageEncountersEditor.Name = "tabPageEncountersEditor"; + this.tabPageEncountersEditor.Padding = new System.Windows.Forms.Padding(3); + this.tabPageEncountersEditor.Size = new System.Drawing.Size(1185, 675); + this.tabPageEncountersEditor.TabIndex = 12; + this.tabPageEncountersEditor.Text = "Encounters"; + this.tabPageEncountersEditor.UseVisualStyleBackColor = true; + // + // encountersEditor + // + this.encountersEditor.Location = new System.Drawing.Point(6, 3); + this.encountersEditor.Name = "encountersEditor"; + this.encountersEditor.Size = new System.Drawing.Size(1176, 672); + this.encountersEditor.TabIndex = 0; + // // mainTabImageList // this.mainTabImageList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("mainTabImageList.ImageStream"))); @@ -10444,7 +10483,7 @@ this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.statusLabel, this.toolStripProgressBar}); - this.statusStrip1.Location = new System.Drawing.Point(0, 739); + this.statusStrip1.Location = new System.Drawing.Point(0, 777); this.statusStrip1.Name = "statusStrip1"; this.statusStrip1.Size = new System.Drawing.Size(1214, 22); this.statusStrip1.TabIndex = 13; @@ -10803,29 +10842,12 @@ this.versionLabel.Text = "ROM:"; this.versionLabel.Visible = false; // - // scriptEditor - // - this.scriptEditor.Location = new System.Drawing.Point(2, 3); - this.scriptEditor.Name = "scriptEditor"; - this.scriptEditor.scriptEditorIsReady = false; - this.scriptEditor.Size = new System.Drawing.Size(1177, 735); - this.scriptEditor.TabIndex = 0; - // - // levelScriptEditor - // - this.levelScriptEditor.BackColor = System.Drawing.SystemColors.Control; - this.levelScriptEditor.levelScriptEditorIsReady = false; - this.levelScriptEditor.Location = new System.Drawing.Point(6, 8); - this.levelScriptEditor.Name = "levelScriptEditor"; - this.levelScriptEditor.Size = new System.Drawing.Size(408, 622); - this.levelScriptEditor.TabIndex = 0; - // // MainProgram // this.AllowDrop = true; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1214, 761); + this.ClientSize = new System.Drawing.Size(1214, 799); this.Controls.Add(this.versionLabel); this.Controls.Add(this.languageLabel); this.Controls.Add(this.gameIcon); @@ -11136,6 +11158,7 @@ ((System.ComponentModel.ISupportInitialize)(this.flagConditionalMusicUpDown)).EndInit(); this.tabPageScriptEditor.ResumeLayout(false); this.tabPageLevelScriptEditor.ResumeLayout(false); + this.tabPageEncountersEditor.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gameIcon)).EndInit(); this.menuStrip1.ResumeLayout(false); this.menuStrip1.PerformLayout(); diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index dd4434b..ce65725 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -889,6 +889,10 @@ namespace DSPRE { levelScriptEditor.SetUpLevelScriptEditor(this); } + private void tabPageEncountersEditor_Enter(object sender, EventArgs e) { + encountersEditor.SetupEncountersEditor(); + } + private void spawnEditorToolStripButton_Click(object sender, EventArgs e) { if (!matrixEditorIsReady) { SetupMatrixEditor(); @@ -964,20 +968,13 @@ namespace DSPRE { /* Read Header internal names */ try { - using (DSUtils.EasyReader reader = new DSUtils.EasyReader(RomInfo.internalNamesLocation)) { - for (int i = 0; i < headerCount; i++) { - byte[] row = reader.ReadBytes(RomInfo.internalNameLength); - - string internalName = Encoding.ASCII.GetString(row);//.TrimEnd(); - headerListBoxNames.Add(i.ToString("D3") + MapHeader.nameSeparator + internalName); - internalNames.Add(internalName.TrimEnd('\0')); - } - } + headerListBoxNames = Helpers.getHeaderListBoxNames(); + internalNames = Helpers.getInternalNames(); headerListBox.Items.Clear(); headerListBox.Items.AddRange(headerListBoxNames.ToArray()); } catch (FileNotFoundException) { - MessageBox.Show(RomInfo.internalNamesLocation + " doesn't exist.", "Couldn't read internal names", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show(RomInfo.internalNamesPath + " doesn't exist.", "Couldn't read internal names", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } diff --git a/DS_Map/Main Window.resx b/DS_Map/Main Window.resx index b263bbb..21880ec 100644 --- a/DS_Map/Main Window.resx +++ b/DS_Map/Main Window.resx @@ -117,96 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 239, 17 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM - EgAAAk1TRnQBSQFMAgEBCgEAAegBGwHoARsBEAEAARABAAT/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== - - @@ -1036,6 +946,96 @@ p3S+M+m1V1me9QgCUQNXX2YRT1sYHBiEP3wHVbp3PF3cB40GbrzN86xHENrScf1NDsl8FaI4jODMHOgS SOacfYAmbr5XeNYjGH7yDReXv+JeNIUhUYwFpmZjDz+nMLf5B3b2rcZ5tju4ntjtFw4T54j+v2g/t9NH 9AiCIPwGJelqUAd/T3AAAAAASUVORK5CYII= + + + + 239, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM + EgAAAk1TRnQBSQFMAgEBCgEAARgBHAEYARwBEAEAARABAAT/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== @@ -1047,9 +1047,6 @@ 386, 19 - - 533, 20 - 62 diff --git a/DS_Map/Properties/AssemblyInfo.cs b/DS_Map/Properties/AssemblyInfo.cs index 5def708..0f9c7d6 100644 --- a/DS_Map/Properties/AssemblyInfo.cs +++ b/DS_Map/Properties/AssemblyInfo.cs @@ -4,11 +4,11 @@ using System.Runtime.InteropServices; // Le informazioni generali relative a un assembly sono controllate dal seguente // set di attributi. Modificare i valori di questi attributi per modificare le informazioni // associate a un assembly. -[assembly: AssemblyTitle("DSPRE Reloaded 1.11.2")] +[assembly: AssemblyTitle("DSPRE Reloaded 1.12.0")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("DSPRE Reloaded 1.11.2")] +[assembly: AssemblyProduct("DSPRE Reloaded 1.12.0")] [assembly: AssemblyCopyright("Copyright © 2023")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // È possibile specificare tutti i valori oppure impostare valori predefiniti per i numeri relativi alla revisione e alla build // usando l'asterisco '*' come illustrato di seguito: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.11.2")] -[assembly: AssemblyFileVersion("1.11.2")] +[assembly: AssemblyVersion("1.12.0")] +[assembly: AssemblyFileVersion("1.12.0")] diff --git a/DS_Map/ROMFiles/MapFile.cs b/DS_Map/ROMFiles/MapFile.cs index 71f9d20..0f09af3 100644 --- a/DS_Map/ROMFiles/MapFile.cs +++ b/DS_Map/ROMFiles/MapFile.cs @@ -354,6 +354,24 @@ namespace DSPRE.ROMFiles { public void LoadModelData(string dir) { LoadModelDataFromID((int)modelID, dir); } + + public void LoadModelData(bool interior) { + string modelPath = Filesystem.GetBuildingModelPath(interior, (int)modelID); + + if (string.IsNullOrWhiteSpace(modelPath) || !File.Exists(modelPath)) { + MessageBox.Show("Building " + modelID + " could not be found in\n" + '"' + Path.GetDirectoryName(modelPath) + '"', "Building not found", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + + try { + using (Stream fs = new FileStream(modelPath, FileMode.Open)) { + this.NSBMDFile = NSBMDLoader.LoadNSBMD(fs); + } + } catch (FileNotFoundException) { + MessageBox.Show("Building " + modelID + " could not be found in\n" + '"' + Path.GetDirectoryName(modelPath) + '"', "Building not found", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + public void LoadModelDataFromID(int modelID, string bmDir) { string modelPath = bmDir + "\\" + modelID.ToString("D4"); diff --git a/DS_Map/RomInfo.cs b/DS_Map/RomInfo.cs index 3c10a0d..21746b6 100644 --- a/DS_Map/RomInfo.cs +++ b/DS_Map/RomInfo.cs @@ -7,6 +7,8 @@ using DSPRE.Resources; using System; using DSPRE.ROMFiles; using static DSPRE.RomInfo; +using System.Windows.Shapes; +using Path = System.IO.Path; namespace DSPRE { @@ -22,8 +24,14 @@ namespace DSPRE { public static string fileName { get; private set; } public static string workDir { get; private set; } public static string arm9Path { get; private set; } + public static string arm7Path { get; private set; } public static string overlayTablePath { get; set; } + public static string y7Path { get; set; } + public static string dataPath { get; set; } public static string overlayPath { get; set; } + public static string unpackedPath { get; set; } + public static string bannerPath { get; set; } + public static string headerPath { get; set; } public static GameLanguages gameLanguage { get; private set; } public static GameVersions gameVersion { get; private set; } @@ -160,11 +168,19 @@ namespace DSPRE { folderSuffix = ""; } - workDir = Path.GetDirectoryName(romName) + "\\" + Path.GetFileNameWithoutExtension(romName) + folderSuffix + "\\"; - arm9Path = workDir + @"arm9.bin"; - overlayTablePath = workDir + @"y9.bin"; - overlayPath = workDir + "overlay"; - internalNamesLocation = workDir + @"data\fielddata\maptable\mapname.bin"; + string path = System.IO.Path.GetDirectoryName(romName) + "\\" + Path.GetFileNameWithoutExtension(romName) + folderSuffix + "\\"; + + workDir = path; + arm9Path = Path.Combine(workDir, @"arm9.bin"); + arm7Path = Path.Combine(workDir, @"arm7.bin"); + overlayTablePath = Path.Combine(workDir, @"y9.bin"); + y7Path = Path.Combine(workDir, @"y7.bin"); + dataPath = Path.Combine(workDir, dataFolderName); + overlayPath = Path.Combine(workDir, @"overlay"); + bannerPath = Path.Combine(workDir, @"banner.bin"); + headerPath = Path.Combine(workDir, @"header.bin"); + unpackedPath = Path.Combine(workDir, @"unpacked"); + internalNamesPath = Path.Combine(workDir, $@"{dataFolderName}\fielddata\maptable\mapname.bin"); try { gameVersion = PokeDatabase.System.versionsDict[id]; @@ -966,7 +982,7 @@ namespace DSPRE { public string GetBuildingModelsDirPath(bool interior) => interior ? gameDirs[DirNames.interiorBuildingModels].unpackedDir : gameDirs[DirNames.exteriorBuildingModels].unpackedDir; public string GetRomNameFromWorkdir() => workDir.Substring(0, workDir.Length - folderSuffix.Length - 1); - public static int GetHeaderCount() => (int)new FileInfo(internalNamesLocation).Length / internalNameLength; + public static int GetHeaderCount() => (int)new FileInfo(internalNamesPath).Length / internalNameLength; public static List GetLocationNames() => new TextArchive(locationNamesTextNumber).messages; public static string[] GetSimpleTrainerNames() => new TextArchive(trainerNamesMessageNumber).messages.ToArray(); public static string[] GetTrainerClassNames() => new TextArchive(trainerClassMessageNumber).messages.ToArray(); @@ -1172,6 +1188,9 @@ namespace DSPRE { [DirNames.interiorBuildingModels] = @"data\a\1\4\8", [DirNames.learnsets] = @"data\a\0\3\3", [DirNames.evolutions] = @"data\a\0\3\4", + + [DirNames.safariZone] = @"data\a\2\3\0", + [DirNames.headbutt] = @"data\a\2\5\2", //both versions use the same folder with different data }; //Encounter archive is different for SS From e37bc952e77b158bbd730ba9155d45129e21db3b Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Sun, 3 Mar 2024 20:50:31 +0100 Subject: [PATCH 22/40] Added HGSS commands MD as test --- DS_Map/DSPRE.csproj | 1 + DS_Map/Main Window.cs | 3 + DS_Map/Resources/HGSSCommands.md | 857 +++++++++++++++++++++++++++++++ 3 files changed, 861 insertions(+) create mode 100644 DS_Map/Resources/HGSSCommands.md diff --git a/DS_Map/DSPRE.csproj b/DS_Map/DSPRE.csproj index 63ac31d..a50042e 100644 --- a/DS_Map/DSPRE.csproj +++ b/DS_Map/DSPRE.csproj @@ -436,6 +436,7 @@ Settings.settings True + diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index ce65725..1d7dc12 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -29,7 +29,10 @@ using System.ComponentModel; using DSPRE.Editors; namespace DSPRE { + + public partial class MainProgram : Form { + public MainProgram() { InitializeComponent(); EditorPanels.Initialize(this); diff --git a/DS_Map/Resources/HGSSCommands.md b/DS_Map/Resources/HGSSCommands.md new file mode 100644 index 0000000..005f04f --- /dev/null +++ b/DS_Map/Resources/HGSSCommands.md @@ -0,0 +1,857 @@ + Outer pipes Cell padding +No sorting +| | SDSME names | New proposed names | Parameters | Function | Notes | +| ---- | -------------------------- | ---------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| 0000 | Nop | Nop | \- | Nothing | | +| 0001 | Nop1 | Dummy | \- | Nothing | Has exactly the same ASM code as Nop. | +| 0002 | End | End | \- | End script execution | | +| 0003 | Return2 | WaitTime | u16: Time; Var: ??? | Stop script execution for Time frames | The Var's purpose is unknown. Command uses ScrReg 0 as countdown. | +| 0004 | | RegValueSet | u8: Script Register; u8: Value | Assigns Value to Script Register value | | +| 0005 | | RegDataSet | u8: Script Register; u32: Value | Assigns Value to Script Register value | | +| 0006 | | RegAdrsSet | u8: Script Register; u32: Address | Assigns data in Address offset to Script Register value | | +| 0007 | | AdrsValueSet | u32: Address; u8: Value | Assigns Value to the Address offset | | +| 0008 | | AdrsRegSet | u32: Address; u8: Script Register | Assigns Script Register value to the Address offset | | +| 0009 | | RegRegSet | u8: Script Register 1; u8: Script Register 2 | Assigns Script Register 2 value to Script Register 1 value | | +| 000A | | AdrsAdrsSet | u32: Address 1; u32: Address 2 | Assigns data in Address 2 to the Address 1 offset | | +| 000B | | CompareRegs | u8: Script Register; u8: Script Register | Compares two Script Register | | +| 000C | | CompareRegValue | u8: Script Register; u8: Value | Compares Script Register value with Value | | +| 000D | | CompareRegAdrs | u8: Script Register; u32: Address | Compares Script Register value with data in Address | | +| 000E | | CompareAdrsReg | u32: Address; u8: Script Register | Compares data in Address with Script Register value | | +| 000F | | CompareAdrsValue | u32: Address; u8: Value | Compares data in Address with Value | | +| 0010 | | CompareAdrsAdrs | u32: Address 1; u32: Address 2 | Compares data in Address 1 with data in Address 2 | | +| 0011 | If | CompareVarValue | Var: Variable; u16: Value | Compares Variable value with Value | | +| 0012 | If2 | CompareVars | Var: Variable 1; Var: Variable 2 | Compares Variable 1 value with Variable 2 value | | +| 0013 | | ParallelCommonScript | u16: ??? | ??? | Somehow related with parallel common script execution. | +| 0014 | CallStandard | CommonScript | u16: Global Script ID | Calls Global Script ID script | The Common Script table is located at 0xFA48C in IPKS arm9.bin, ordered from highest to lowest with structure: u16 Global Script ID | u16 Script file | u16 Text file. The executed script inside script file is determined as: used Global Script ID \- tabulated Global Script ID. | +| 0015 | | LocalScript | \- | Returns to the invoking script/function after a Common Script | | +| 0016 | Jump | Jump | u32: Relative Jump | Jumps to a function, Relative Jump bytes forward or backward | Relative Jump can have negative values (backward jump). | +| 0017 | | JumpIfObjID | u8: Event ID; u32: Relative Jump | Jumps to a function, Relative Jump bytes forward or backward, if invoking event has Event ID as ID | | +| 0018 | | JumpIfBgID | u8: ???; u32: Relative Jump | ??? | Maybe jumps to a function if invoking event has a specific ID. | +| 0019 | | JumpIfPlayerDir | u8: Player Direction; u32: Relative Jump | Jumps to a function, Relative Jump bytes forward or backward, if player is looking in Player Direction | Supposed. Needs to be tested in game. | +| 001A | Call | Call | u32: Relative Jump | Calls a function, Relative Jump bytes forward or backward | Can be used to make loops when calling the own invoking function. | +| 001B | Return | Return | \- | Returns to the invoking script/function after a Call | | +| 001C | CompareLastResultJump | JumpIf | u8: Condition; u32: Relative Jump | If Condition in the condition table, jumps to a function | Ask AdAstra for the condition list. Condition table is updated after a IfVarValue, IfVarVar, CheckFlag... | +| 001D | CompareLastResultCall | CallIf | u8: Condition; u32: Relative Jump | If Condition in the condition table, calls a function | | +| 001E | SetFlag | SetFlag | u16: Flag | Sets Flag to 1 | | +| 001F | ClearFlag | ClearFlag | u16: Flag | Sets Flag to 0 | | +| 0020 | CheckFlag | CheckFlag | u16: Flag | Checks if Flag is set | It updates the internal condition flag and maybe part of the condition table. | +| 0021 | | SetFlagFromVar | Var: Flag | Sets the flag whose ID is stored in Flag | | +| 0022 | | ClearFlagFromVar | Var: Flag | Clears the flag whose ID is stored in Flag | | +| 0023 | | FlagStatusToVar | Var: Flag; Var: Variable | Checks if Flag is set and store the result in Variable | | +| 0024 | | SetTrainerFlag | Flex: Trainer ID | Sets the flag of Trainer ID, so marks it as beaten trainer | So this trainer will not battle against you. Used in every Gym after the leader is beaten. | +| 0025 | | ClearTrainerFlag | Flex: Trainer ID | Clears the flag of Trainer ID, so marks it as unbeaten trainer | So this trainer can be challenged again. | +| 0026 | | CheckTrainerFlag | Flex: Trainer ID | Checks if Trainer ID has been beaten | It updates the internal condition flag and maybe part of the condition table. | +| 0027 | Copy | IncrementVar | Var: Variable; Flex: Operand | Stores the operation Variable \+ Operand in Variable | | +| 0028 | | DecrementVar | Var: Variable; Flex: Operand | Stores the operation Variable \- Operand in Variable | | +| 0029 | SetVar | SetVar | Var: Variable; u16: Value | Stores Value in Variable | | +| 002A | CopyVar | SetVarFromVariable | Var: Variable 1; Var: Variable 2 | Assigns value of Variable 2 to Variable 1 | | +| 002B | | SetVarFromFlexible | Var: Variable; Flex: Flexible Value | Stores Flexible Value (or its value if variable) in Variable | | +| 002C | | MessageAll | u8: Text Slot | Display line Text Slot from the text file, all at once | | +| 002D | Message | Message | u8: Text Slot | Display line Text Slot from the text file | | +| 002E | Message2 | MessageFlex | Flex: Text Slot | Display line Text Slot from the text file | Unlike 002D, this command also accepts a variable as the input field. | +| 002F | | MessageNoSkip | Flex: Text Slot | ??? | | +| 0030 | | | u8: Text Slot | ??? | | +| 0031 | | WaitAB | \- | Waits for button A or button B to be pressed | Somehow it uses ScrReg 0 as countdown. | +| 0032 | WaitButton | WaitButton | \- | Waits for a button to be pressed | It seems only A, B, X and direction pad buttons work. | +| 0033 | | WaitABPad | \- | Waits for button A, button B or pad buttons to be pressed | Supposed. Needs to be tested in game. | +| 0034 | | OpenMessage | \- | ??? | | +| 0035 | CloseMessageOnKeyPress | CloseMessage | \- | Closes message box | SDSME name is misleading, for no button is needed to be pressed. | +| 0036 | FreezeMessageBox | FreezeMessage | \- | ??? | Probably keeps the message box alive after a script. ASM differs with CloseMessage only in a BL instruction. | +| 0037 | CallMessageBox | SetIconBoard | u8: Text Slot; u8: Type; u16: Icon; u16: ??? | Prepares an icon board message box displaying Text Slot message, of Type type, and with Icon image if chosen type supports it | Type values from 0 to 3 are: brown (with icon), green (with icon), gray and blue. | +| 0038 | ColorMessageBox | SetTextBoard | u8: Type; u16: Icon | Prepares a text board message box of Type type, and with Icon image if chosen type supports it | Type values from 0 to 3 are: brown (with icon), green (with icon), gray and blue. | +| 0039 | TypeMessageBox | ShowBoard | u8: Process | Triggers different Process processes for the board | Process value 0 keeps the board, value 1 creates the board, value 2 hides the board, value 3 shows the board and value 4 deletes the board. | +| 003A | NoMapMessageBox | WaitBoard | \- | Waits the board last process to end | Supposed. | +| 003B | | BoardMessage | u8: Text Slot; u16: Variable | Displays Text Slot message in the current text box, stores the current text box status in Variable | | +| 003C | | CloseBoard | Var: Variable | Returns 1 to Variable if the player has pressed a button so the board must close, 0 otherwise | Variable is stored in ScrReg 0. Command waits for a button to be pressed and stores result in Variable. | +| 003D | | Menu | \- | | | +| 003E | | | u8: ???; u8: ???; u8: ???; u8: ???; u8: ???; u8: ??? | | | +| 003F | | YesNoBox | Var: Variable | Opens a Yes-No dialog and stores user response in Variable | Variable is stored in ScrReg 0. | +| 0040 | Multi | MultiStandardText | u8: X; u8: Y; u8: Cursor; u8: Cancel; Var: Selection | Prepares a multiple selection menu at X and Y screen position, with Cursor default selected option and possibility of cancelling depending on Cancel, with text bank #321, returns selected slot ID in Selection | If Cancel is 1, the user can select the last option by pressing B button. | +| 0041 | Multi2 | MultiLocalText | u8: X; u8: Y; u8: Cursor; u8: Cancel; Var: Selection | Prepares a multiple selection menu at X and Y screen position, with Cursor default selected option and possibility of cancelling depending on Cancel, with local texts, returns selected slot ID in Selection | If Cancel is 1, the user can select the last option by pressing B button. | +| 0042 | TextScriptMulti | AddMultiOption | u8: Text Slot; u8: Multi Slot | Adds an option with Multi Slot ID showing Text Slot text | | +| 0043 | CloseMulti | ShowMulti | \- | Shows the prepared multi in screen | The game will hide it when the player has selected an option. | +| 0044 | Multi3 | ListStandardText | u8: X; u8: Y; u8: Cursor; u8: Cancel; Var: Selection | Prepares a multiple selection list at X and Y screen position, with Cursor default selected option and possibility of cancelling depending on Cancel, with text bank #321, returns selected slot ID in Selection | If Cancel is 1, the user can select the last option by pressing B button. The difference between a Multi and a List seems to be that lists are scrollable. | +| 0045 | | ListLocalText | u8: X; u8: Y; u8: Cursor; u8: Cancel; Var: Selection | Prepares a multiple selection list at X and Y screen position, with Cursor default selected option and possibility of cancelling depending on Cancel, with local texts, returns selected slot ID in Selection | If Cancel is 1, the user can select the last option by pressing B button. The difference between a Multi and a List seems to be that lists are scrollable. | +| 0046 | | AddListOption | Flex: Option MSG; Flex: Highlight MSG; Flex: List Slot | Adds a new option to the list, with List Slot ID and showing text line Option MSG. It also displays text line Highlight MSG when that option is highlighted. | If Highlight MSG is set to 255 [0xFF], no message will be displayed when the option is highlighted.
This command relies on an open message box in order to display the highlight messages.

Trying to highlight an option with Highlight MSG different than 255 [0xFF] will result in a crash if no message box is already being displayed. | +| 0047 | | ShowList | \- | Shows the prepared list in screen | The game will hide it when the player has selected an option. | +| 0048 | MultiRow | MultiColumn | u8: Columns | Splits the multi window in Columns different columns | | +| 0049 | PlayFanfare | PlayFanfare | Flex: Sound | Plays Sound | | +| 004A | PlayFanfare2 | StopFanfare | Flex: Sound | Stops Sound | | +| 004B | WaitFanfare | WaitFanfare | Flex: Sound | Waits Sound to finish | | +| 004C | PlayCry | PlayCry | Flex: Pokémon; Flex: Unused | Plays a Pokémon cry | | +| 004D | WaitCry | WaitCry | \- | Waits the current cry to finish | | +| 004E | PlaySound | PlaySound | u16: Sound | Pauses current music, then Plays Sound | | +| 004F | FadeDefaultMusic | WaitSound | \- | Waits for Sound to finish, then resumes music | | +| 0050 | PlayMusic | PlayMusic | u16: Music | Plays Music | | +| 0051 | StopMusic | StopMusic | u16: Unused | Stops current music | Parameter is ignored because the game identifies what music is playing. | +| 0052 | RestartMusic | PlayDefaultMusic | \- | Plays map default music | | +| 0053 | | SetMusic | u16: Music | ??? | | +| 0054 | SwitchMusic | FadeOutMusic | u16: Volume; u16: Time | Fades out the current music to Volume in Time frames | | +| 0055 | | FadeInMusic | u16: Time | Fades in the current music to normal volume in Time frames | | +| 0056 | | SetMusicPauseStatus \* | u8: SSEQ Player ID; u8: Status | ??? | | +| 0057 | | TempMusic \* | u16: Music ID | ??? | | +| 0058 | | SetBGMFlag \* | u8: ??? | ??? | Seems to set a flag related to the music system. | +| 0059 | | CheckChatotCry | Var: Variable | Checks if Chatot has custom sound, stores answer in Variable | Returns 0 or 1 to the specified Variable. Not for a specific Chatot but for all (they share a custom sound). | +| 005A | SwitchMusic2 | StartChatotCry | Var: Variable | Starts Chatot microphone record, stores answer in Variable | Returns 0 or 1 to the specified Variable depending on successful recording. | +| 005B | | StopChatotCry | \- | Stops recording Chatot custom sound | | +| 005C | | SaveChatotCry | \- | ??? | Maybe saves the custom Chatot sound in the savegame. | +| 005D | | | \- | ??? | | +| 005E | ApplyMovement | Movement | Flex: Event ID; u32: Relative Jump | Applies movement at Relative Jump to Event ID | Movements must be halfword-aligned in the script file. If you're using an old tool which doesn't align them, force the alignment with a TextPlayerName 0x0 or some unnoticeable command of 3, 5, 7 or 9 bytes length. | +| 005F | WaitMovement | WaitMovement | \- | Waits for all movements to finish | | +| 0060 | LockAll | LockAll | \- | Locks every event in the map | | +| 0061 | ReleaseAll | ReleaseAll | \- | Releases every event in the map | | +| 0062 | Lock | Lock | u16: Event ID | Locks Event ID | | +| 0063 | Release | Release | u16: Event ID | Releases Event ID | | +| 0064 | AddPeople | AddOW | Flex: Event ID | Add Event ID overworld in the map | It is probable that, if executing this having Event ID overworld already in the map, it gets duplicated. | +| 0065 | RemovePeople | RemoveOW | Flex: Event ID | Removes Event ID overworld from the map | | +| 0066 | LockCam | LockCamera | Flex: X; Flex: Y | Locks the camera at position X and Y | Seems to place a invisible NPC at coords X and Y. It appears that both must be the current player position. | +| 0067 | | ReleaseCamera | \- | Releases the camera | | +| 0068 | FacePlayer | FacePlayer | \- | Makes the invoking event look at the player | In fact it simply takes the current player direction and makes the NPC look at the opposite direction. | +| 0069 | CheckSpritePosition | GetPlayerPosition | Var: X; Var: Y | Saves the current player position in X and Y | | +| 006A | | GetOWPosition | Flex: Event ID; Var: X; Var: Y | Saves the current Event ID position in X and Y | If Event ID is deleted (via RemoveOW) it gives 0xFF for both coordinates. | +| 006B | CheckPersonPosition | SetFollowingOverworld \* | Flex: X; Flex: Z; Flex: Y | ??? | Maybe teleports the player to other coords? | +| 006C | ContinueFollow | KeepOverworld | Flex: Event ID; u8: Value | If Value is 1, prevents Event ID from disappearing when entering on a new map header | | +| 006D | FollowHero | SetOWMovement | Flex: Event ID; u16: Movement | Changes the Event ID's movement number to Movement | | +| 006E | GiveMoney | GiveMoney | u32: Money | Adds Money to the player's money | | +| 006F | TakeMoney | TakeMoney | u32: Money | Subtracts Money from the player's money | | +| 0070 | CheckMoney | CompareMoney | Var: Variable; u32: Money | Stores 1 into Variable if the player has Money or more money. Stores 0 otherwise. | | +| 0071 | ShowMoney | ShowMoney | Flex: X; Flex: Y | Shows the money box at X and Y coordinates of the screen | Each X and Y unit implies 8 pixels. Values of 0 or higher than the screen may glitch the screen. | +| 0072 | HideMoney | HideMoney | \- | Hides the money box | | +| 0073 | | UpdateMoney | \- | Updates the current money in the money box | | +| 0074 | | ShowSpecialCurrency | u8: Currency; Flex: X Coord; Flex: Y Coord | Shows the Currency box at X and Y coordinates of the screen. | Currency:

0 = Coins
1 = Battle Points
2 = Athlete Points | +| 0075 | | HideSpecialCurrency | \- | Hides the currently displayed special currency box. | | +| 0076 | | UpdateSpecialCurrency | u16: Currency | Updates the current Currency in the currency box. | Currency types are the same as above [0074]. | +| 0077 | | CheckCoins | Var: Variable | Stores the current casino coin amount in Variable | | +| 0078 | | GiveCoins | Flex: Coins | Adds Coins to the player's casino coins | | +| 0079 | | TakeCoins | Flex: Coins | Subtracts Coins from the player's casino coins | | +| 007A | | GiveAthletePoints | Flex: Amount | Adds the given Amount to the player's Athlete Points | | +| 007B | | TakeAthletePoints | Flex: Amount | Subtracts the given Amount from the player's Athlete Points | | +| 007C | | CompareAthletePoints | Var: Result; Flex: Amount | Stores 1 into Variable if the player has the given Amount of Athlete Points or more. Stores 0 otherwise. | | +| 007D | | GiveItem | Flex: Item; Flex: Amount; Var: Variable | Adds Amount of Item item, stores 1 in Variable if the player had less than 1000 - Amount (100 - Amount if TM/HM), stores 0 otherwise | Both Item and Amount are flexible, but if you use CommonScript 0x7F1 after that (as it is meant to be) you must place these two values in 0x8004 and 0x8005 in order to make the script work properly. | +| 007E | TakeItem | TakeItem | Flex: Item; Flex: Amount; Var: Variable | Subs Amount of Item item, stores 1 in Variable if the player had at least Amount items in the bag, stores 0 otherwise | | +| 007F | GiveItem | CheckItemSpace | Flex: Item; Flex: Amount; Var: Variable | Stores 1 in Variable if the player has less than 1000 - Amount of Item items (100 - Amount if TM/HM), stores 0 otherwise | | +| 0080 | CheckItem | CheckItem | Flex: Item; Flex: Amount; Var: Variable | Stores 1 in Variable if the player has at least Amount of Item items in the bag, stores 0 otherwise | Even if the Amount to check for is 0, the check will return 0 if you don't have the item at all. | +| 0081 | | CheckItemIsMachine | Flex: Item; Var: Variable | Stores 1 in Variable if Item is TM or HM, stores 0 otherwise | | +| 0082 | | GetItemPocket | Flex: Item; Var: Variable | Stores the bag pocket of Item in Variable | | +| 0083 | | SetStarter | Flex: Pokémon | Stores Pokémon as the starting Pokémon in the game save data | | +| 0084 | DoubleMessage | GenderMessage | u8: Male Text; u8: Female Text | Displays Male Text or Female Text message depending on player's gender | | +| 0085 | | CheckSeals \* | Flex: Seal ID; Var: Number of Seals in Seal Case | Checks the number of a certain type of Ball Seals that the player has. The variable is the output of how many Seals you have. | Example: Farmhouse on Route 39 | +| 0086 | | GiveSeals \* | Flex: Seal ID; Flex: Number of Seals to be Given | Gives the player Ball Seals. | Example: Farmhouse on Route 39 | +| 0087 | | GiveRandomSeals \* | Var: Random Seal ID 1; Var: Random Seal ID 2; Var: Random Seal ID 3 | Generates three random types of Ball Seals and gives them to the player (repeats are possible). Each variable will yield a 0 if the player has no more room for the Seal(s) in the Seal Case. | Example: House in top right of Olivine City | +| 0088 | | CheckPokemonForm \* | Flex: Party Position; Var: Variable | Checks the form of the Pokemon in party slot Party Position and returns the form ID in Variable. | | +| 0089 | GiveStoredPokemon | GivePokemon | Flex: Pokémon; Flex: Level; Flex: Item ID; Flex: Form; Flex: Ability; Var: Variable | Gives Pokémon at level Level, store 1 in Variable if succeed and 0 otherwise | | +| 008A | | GivePokemonEgg | Flex: Pokémon; Flex: Location | Gives a Pokémon egg received from Location text slot at text bank #281 | | +| 008B | | ReplaceMove | Flex: Party Slot; Flex: Move Slot; u16: Move ID | Overwrites Move Slot of the Pokémon at the specified Party Slot with Move ID. | Party slot and move slot start at 0 rather than 1, so the ranges are 0-5 and 0-3 respectively.
[https://bulbapedia.bulbagarden.net/wiki/List_of_moves](https://bulbapedia.bulbagarden.net/wiki/List_of_moves) | +| 008C | | CheckPokemonHasMove | Var: Variable; Flex: Move ID; Flex: Party Slot | Checks if a Pokémon at the specified Party Slot knows a move with given Move ID.
Stores 1 into Variable if yes, 0 otherwise. | Example: Headbutt tutor in Ilex Forest (Script File 92, Script 3) | +| 008D | | CheckMoveInParty | Var: Variable; Flex: Move ID | Checks if any Pokémon in the party knows Move ID move, stores in Variable the position of the first Pokémon that knows it or stores 6 if no Pokémon in the party knows the move | | +| 008E | | CheckPokeGearRematch \* | Flex: Phone Number; Var: Variable | | Has something to do with rematches but not sure if it's checking if a rematch is active or the # the rematch is on. Gets used when deciding when to let Gym Leaders appear in the overworld for a photo shoot after they are defeated in the Dojo. | +| 008F | | ChooseRivalName | Var: Variable | Opens the keyboard for naming the rival, stores 1 in Variable if user cancels the proccess | | +| 0090 | | GetCounterpartSprite | Var: Variable | Stores 97 (Lyra sprite ID) into the Variable if you're playing as Ethan;
Stores 0 (Ethan sprite ID) into the Variable if you're playing as Lyra. | Remember that Overworld Entities with sprite IDs 101 to 116 refer to the value of vars 0x4020-0x402F for the sprite to display. | +| 0091 | | UpgradePokegear | u8: Module | Adds the worldmap to the Pokegear if Module is 1, adds the radio if Module is 2 | | +| 0092 | RecordPokegearNumber | RecordPokegearNumber | Flex: ??? | | | +| 0093 | | CheckPokegearNumberRegistered \* | Flex: Phone Number; Var: Variable | Stores 0 into Variable if Phone Number has not been registered, and 1 if it has been registered. | Example: Sabrina in Olivine Harbor (Script File 153, Script 7). Used frequently by Gym Leaders appearing in the overworld. | +| 0094 | | | | | | +| 0095 | | | | | | +| 0096 | CallEnd | ReturnScreen | \- | Restores the normal overworld screen | | +| 0097 | | | | | | +| 0098 | Wifi | | \- | | | +| 0099 | | DressPokemon \* | \- | | | +| 009A | OpenPokemonDress | ContestDressupScreen \* | \- | | | +| 009B | | DressUpArtworkScreen \* | \- | | | +| 009C | | SealCapsuleScreen \* | \- | | | +| 009D | OpenPokegearMap | WorldMapScreen | \- | Opens the worldmap screen | | +| 009E | | PCBoxScreen \* | \- | | | +| 009F | | DrawScreenUnion \* | \- | | | +| 00A0 | | TrainerCaseUnion \* | \- | | | +| 00A1 | CallEnd2 | TradeScreenUnion \* | \- | | | +| 00A2 | | RecordMixingUnion \* | \- | | | +| 00A3 | EndGame | EndGameScreen | \- | Opens the Hall of Fame and game ending screens | | +| 00A4 | | HallOfFameData \* | \- | | | +| 00A5 | | StoreGTSStatus \* | ??? | | | +| 00A6 | WFC | InitWFC \* | ??? | | | +| 00A7 | | StarterSelectionScreen | \- | Opens the starter Pokémon selection screen | | +| 00A8 | | GetTrainerPathToPlayer \* | Flex: ??? | | | +| 00A9 | | TrainerStepTowardsPlayer \* | Flex: ???; Var: Variable | | | +| 00AA | | GetTrainerEyeType \* | Var: Variable | | | +| 00AB | | GetEyeTrainerNum \* | Flex: ???; Var: Variable | | | +| 00AC | | WritePlayerName | Var: Variable | Opens the keyboard for naming the player, stores 1 in Variable if user cancels the proccess | | +| 00AD | GivePokemonNickname | WritePokemonName | Flex: Party Position; Var: Variable | Opens the keyboard for naming a Pokémon in Party Position, stores 1 in Variable if user cancels the proccess | | +| 00AE | FadeScreen | FadeScreen | u16: Frame Count; u16: Duration; u16: Fade Style; u16: Color | Fades screen to chosen 15-bit Color, using the chosen Fade Style. The transition will render Frame Count images, of Duration length each. | Type 0 for fade in, Type 1 for fade out. Color has 15-bit format. Transition is the number of color changes that the game does in the fading. | +| 00AF | ResetScreen | WaitFadeScreen | \- | Waits for the screen fade to end | | +| 00B0 | Warp | Warp | Flex: Map; u16: Door; Flex: X; Flex: Y; Flex: Dir | Warps to X and Y position of Map header with initial Dir direction, using Door warp | When Door is 0 it doesn't use any door animation. | +| 00B1 | HallFameData | RockClimbAnimation | Flex: Party Position | Uses rock climb with the Pokémon at Party Position position | | +| 00B2 | | SurfAnimation | Flex: Party Position | Uses surf with the Pokémon at Party Position position | | +| 00B3 | WFC1 | WaterfallAnimation | Flex: Party Position | Uses waterfall with the Pokémon at Party Position position | | +| 00B4 | | FlyAnimation | u16: Map; Flex: X; Flex: Y | Flies to Map header map, to coordinates X and Y | | +| 00B5 | | FlashAnimation | \- | Sets weather to 12 (darkness after flash) and then updates the weather graphics | | +| 00B6 | | WhirlpoolAnimation | Flex: Party Position | Uses whirlpool with the Pokémon at Party Position position | | +| 00B7 | | CutAnimation | Flex: Party Position | Uses cut with the Pokémon at Party Position position | | +| 00B8 | | CheckBike | Var: Variable | Stores 1 in Variable if player is riding the bike, stores 0 otherwise | | +| 00B9 | | RideBike | u8: Action | Changes player form from normal to riding the bike if Action is 1, otherwise it sets the normal form to the player | | +| 00BA | | CyclingRoad | u8: Action | If Action is 1, the game sets the cycling road flag and moves the player down. Otherwise the flag is deactivated. | | +| 00BB | | CheckPlayerForm | Var: Variable | Stores in Variable the current player form | Values 0 is for normal form, value 1 for riding the bike, value 2 for surfing, value 3 for Rocket clothing | +| 00BC | | SetPlayerForm | u16: Form | Activates the Form bit in the internal player form data | The purpose of the different bits still needs to be researched. | +| 00BD | | UpdatePlayerForm | \- | Updates changes in the internal player form data in the screen | | +| 00BE | SetVariableHero | TextPlayerName | u8: String Buffer | Stores player's name in String Buffer | | +| 00BF | SetVariableRival | TextRivalName | u8: String Buffer | Stores rival's name in String Buffer | | +| 00C0 | SetVariableAlter | TextCounterpart | u8: String Buffer | Stores counterpart's name in String Buffer | | +| 00C1 | SetVariablePokemon | TextPartyPokemon | u8: String Buffer; Flex: Party Position | Stores the name of the Pokémon in Party Position in String Buffer | | +| 00C2 | SetVariableItem | TextItem | u8: String Buffer; Flex: Item | Stores Item's name in String Buffer | | +| 00C3 | | TextPocket | u8: String Buffer; Flex: Pocket | Stores Pocket's name in String Buffer | | +| 00C4 | SetVariableAttackItem | TextMachineMove | u8: String Buffer; Flex: Item | Stores the name of the move contained in Item TM/HM in String Buffer | | +| 00C5 | SetVariableAttack | TextMove | u8: String Buffer; Flex: Move | Stores battle Move's name in String Buffer | | +| 00C6 | SetVariableNumber | TextNumber | u8: String Buffer; Flex: Number | Stores a Number in String Buffer | | +| 00C7 | SetVariablePokemonNickname | TextPokeNickname | u8: String Buffer; Flex: Party Position | Stores the nickname of the Pokémon in Party Position in String Buffer | | +| 00C8 | SetVariableObject | | | | | +| 00C9 | | TextPlayerTrainerType | u8: String Buffer | Stores player's Union Room trainer type in String Buffer | | +| 00CA | SetVariablePokemonStored | TextPokemon | u8: String Buffer; Flex: Pokémon; u16: Unused; u8: Unused | Stores Pokémon's name in String Buffer | The two Unused parameters are for defining male/female nouns and singular/plural nouns respectively. However both don't apply in this command. | +| 00CB | | TextStarterPokemon | u8: String Buffer | Stores the name of the player' starter Pokémon in String Buffer | | +| 00CC | | TextRivalStarter | u8: String Buffer | Stores the name of the rival' starter Pokémon in String Buffer | | +| 00CD | CheckStarter | TextCounterpartStarter | u8: String Buffer | Stores the name of the counterpart' starter Pokémon in String Buffer | | +| 00CE | | CheckStarter | Var: Variable | Stores the starter Pokémon ID in Variable | | +| 00CF | | DummyTextGoods | u8: String Buffer; Flex: Unused | Loads an empty string in String Buffer | | +| 00D0 | | DummyTextTrap | u8: Unused; Flex: Unused | Nothing | | +| 00D1 | | DummyTextTreasure | u8: Unused; Flex: Unused | Nothing | | +| 00D2 | | TextMapName | u8: String Buffer; Flex: Map | Stores Map header name in String Buffer | | +| 00D3 | | GetSwarmInfo | Var: Map; Var: Pokémon | Selects a zone depending on a random seed, then stores the zone ID in Map and the corresponding swarm Pokémon of that zone in Pokémon | Predicted. Needs to be checked. | +| 00D4 | | TrainerID | Var: Variable | Stores the trainer ID number in Variable depending on the script ID | This means you shouldn't use this command in a normal script. | +| 00D5 | TrainerBattle | TrainerBattle | Flex: Trainer 1; Flex: Trainer 2; u8: Result; u8: ??? | Starts a battle against Trainer 1 and, if Trainer 2 is neither 0 nor the same as Trainer 1, a double battle against both. Continues without warping to Pokemon Center/home if Result is equal to 1. | Your party will also be fully healed after the battle if Result is 1. Example: Cherrygrove City fight with Rival | +| 00D6 | | TrainerMessage | Flex: Trainer ID; Flex: Type | Displays the text of Trainer ID trainer at condition Type | The possible Type values are the following (expand the note for see them) | +| 00D7 | | TrainerMsgCheck | Var: Noticing; Var: Defeat; Var: One Pokémon | If the script ID corresponds to a single battle trainer, stores 0 in Noticing, 2 in Defeat and 0 in One Pokémon. If it corresponds to a double battle, stores 3, 5 and 6 or 7, 9 and 10 depending on whether it's the first or the second trainer | This means you shouldn't use this command in a normal script. | +| 00D8 | | TrainerRematchMsgCheck | Var: Noticing; Var: Defeat; Var: One Pokémon | If the script ID corresponds to a single battle trainer, stores 17 in Noticing, 0 in Defeat and 0 in One Pokémon. If it corresponds to a double battle, stores 18, 0 and 6 or 19, 0 and 10 depending on whether it's the first or the second trainer | This means you shouldn't use this command in a normal script. | +| 00D9 | | TrainerTypeCheck | Var: Variable | Stores 0 in Variable if the script ID corresponds to a single battle, stores 1 if it corresponds to a double battle | This means you shouldn't use this command in a normal script. | +| 00DA | | TrainerMusic | Flex: Trainer | Plays Trainer's overworld music | It checks if player is in Johto or Kanto for that. | +| 00DB | LostGoPokecenter | LostBattle | \- | Return to Pokémon Center or player's house after being defeated | | +| 00DC | CheckLost | CheckBattleIsLost | Var: Variable | Stores 0 in Variable if player has been defeated in battle, stores 1 otherwise | | +| 00DD | | CheckDefeatedPokemon | Var: Variable; u8: ??? | Stores 0 in Variable if player defeated or catched the wild Pokemon, stores 1 otherwise | | +| 00DE | StoreStarter | Check2vs2 | Var: Variable | Stores 1 in Variable if player has at least 2 not fainted Pokémon, stores 0 otherwise | | +| 00DF | | DummyTrainerBattle | \- | Starts a battle against trainer with ID 1 | | +| 00E0 | | DummyTrainerFlag | \- | Sets the trainer flag with the same ID as the invoking event | | +| 00E1 | | DummyTrainerFlagJump | u32: Relative Jump | Jumps to a function, Relative Jump bytes forward or backward, if trainer flag with the invoking event ID is set | | +| 00E2 | | | | | | +| 00E3 | | | | | | +| 00E4 | | | | | | +| 00E5 | | | | | | +| 00E6 | | | | | | +| 00E7 | | | | | | +| 00E8 | | | | | | +| 00E9 | | | | | | +| 00EA | | | | | | +| 00EB | | | | | | +| 00EC | | | | | | +| 00ED | | | | | | +| 00EE | | CheckPokerus | Var: Variable | Stores 1 in Variable if one or more Pokémon in the party are infected with the Pokérus | | +| 00EF | ChecPokemonGender | GetPokemonGender | Flex: Party Position; Var: Variable | Stores 0 in Variable if Pokémon at Party Position is male, 1 if is female and 2 if gender is unknown | Unknown gender value is supposed and should be checked. | +| 00F0 | WarpLift | SetElevatorWarp \* | Var: Variable | | | +| 00F1 | CheckFloor | GetElevatorFloor | Var: Variable | Stores in Variable the current floor in a elevator | | +| 00F2 | | ElevatorBox | u8: X; u8: Y; Var: Variable; Flex: Floor | Shows the current floor number in a box at X and Y coordinates in the screen | Each X and Y unit implies 8 pixels. Values of 0 or higher than the screen may glitch the screen. Variable and Floor parameters have not been tested. | +| 00F3 | WirelessBattleWait | CountJohtoDexSeen | Var: Variable | Stores in Variable the total seen Pokemon in the Johto Pokédex | | +| 00F4 | | CountJohtoDexObtained | Var: Variable | Stores in Variable the total obtained Pokemon in the Johto Pokédex | | +| 00F5 | | CountNationalDexSeen | Var: Variable | Stores in Variable the total seen Pokemon in the National Pokédex | | +| 00F6 | | CountNationalDexObtained | Var: Variable | Stores in Variable the total obtained Pokemon in the National Pokédex | | +| 00F7 | PokemonContest | DummyNationalDexCheck | \- | Nothing | | +| 00F8 | | GetDexProgressMsg | u8: Mode; Var: Message; Var: Unknown | Checks the number of seen Pokémon in the Johto Pokédex (if Mode is 0) or the number of obtained Pokémon in the National Pokédex (otherwise) and stores the corresponding Professor message in Message, also storing 0x4AA in Unknown | | +| 00F9 | | WildBattle | Flex: Pokémon; Flex: Level | Starts a wild battle against a Pokémon of level Level | | +| 00FA | | WildBattleNoButtons | Flex: Pokémon; Flex: Level | Starts a first wild battle against a Pokémon of level Level | The difference between this and other similar commands is that Bag, Run and Pokémon buttons are disabled. | +| 00FB | | CatchTutorial | \- | Starts the catch tutorial battle | | +| 00FC | | | | | | +| 00FD | | CheckSaveGame | Var: Variable | Stores 0 in Variable if a different savegame exists and it's not possible to save, stores 1 if no previous savegame exists, stores 2 if game has to save a lot of data and stores 3 if game can perform a quick save | | +| 00FE | | SaveGame \* | | | | +| 00FF | | CheckPortrait \* | | | | +| 0100 | | SetPortraitTitle \* | | | | +| 0101 | | | | | | +| 0102 | | | | | | +| 0103 | | | | | | +| 0104 | | | | | | +| 0105 | | | | | | +| 0106 | | | | | | +| 0107 | | | | | | +| 0108 | | | | | | +| 0109 | | | | | | +| 010A | | | | | | +| 010B | | | | | | +| 010C | | | | | | +| 010D | | | | | | +| 010E | | | | | | +| 010F | | | | | | +| 0110 | | | | | | +| 0111 | | | | | | +| 0112 | | | | | | +| 0113 | | MartScreen | Flex: Unused | Opens the common mart shopping screen | | +| 0114 | | SpMartScreen | Flex: Mart ID | Opens the Mart ID mart shopping screen | Used in the Departament Store for a shop with specific fixed items. At 0x48188 of arm9.bin (IPKS) is the pointer to the shops table, each entry of the table being a pointer to an item table. | +| 0115 | | GoodsMartScreen | Flex: Mart ID | Opens the Mart ID goods mart shopping screen | | +| 0116 | | SealMartScreen | Flex: Mart ID | Opens the Mart ID seal mart shopping screen | | +| 0117 | | DummyLostBattle | \- | Return to Pokémon Center or player's house after being defeated | Same code as LostBattle command. | +| 0118 | | SetLastWarp | Flex: Warp ID | Sets map's Warp ID warp as the last used warp | Supposed. This would affect actions like Escape Rope use. | +| 0119 | CheckGender | CheckPlayerGender | Var: Variable | Stores 0 in Variable if player is male, stores 1 if female | | +| 011A | HealPokemon | HealPokemon | \- | Heals every Pokémon in the player's party | That does not include the black fade nor the healing sound. | +| 011B | | EndWirelessComms \* | | | | +| 011C | | EnterBattleRoom \* | | | | +| 011D | | SetPlayerDirComm \* | | | | +| 011E | | UnionMapChange \* | | | | +| 011F | | UnionRoomSpriteScreen \* | | | | +| 0120 | | StoreUnionSprite \* | | | | +| 0121 | | SetUnionSprite \* | | | | +| 0122 | | CheckPokedex | Var: Variable | Stores 1 in Variable if player has the Pokédex, stores 0 otherwise | | +| 0123 | ActivatePokedex | GivePokedex | \- | Gives the Pokédex to the player | | +| 0124 | | CheckShoes | Var: Variable | Stores 1 in Variable if player has the running shoes, stores 0 otherwise | | +| 0125 | GiveRunningShoes | GiveShoes | \- | Gives the running shoes to the player | | +| 0126 | CheckBadge | CheckBadge | Flex: Badge ID; Var: Variable | Checks if player has Badge ID badge, stores result in Variable | | +| 0127 | EnableBadge | GiveBadge | Flex: Badge ID | Gives the player Badge ID badge | | +| 0128 | DisableBadge | CountBadges | Var: Variable | Stores in Variable the number of badges obtained | | +| 0129 | | DummyCheckBag | Var: Variable | Stores 1 in Variable if flag 0x960 is set, stores 0 otherwise | | +| 012A | | DummyGiveBag | \- | Sets flag 0x960 | | +| 012B | | CheckPartner | Var: Variable | Stores 1 in Variable if the following event flag is activated, stores 0 otherwise | | +| 012C | | SetPartner | \- | Activates the following event flag, so you can no longer use the bike, surf, rock climb... | | +| 012D | | ClearPartner | \- | Deactivates the following event flag, so you can use the bike, surf, rock climb... again | | +| 012E | | CheckStepFlag \* | | | | +| 012F | | SetStepFlag \* | | | | +| 0130 | | ClearStepFlag \* | | | | +| 0131 | | DummyCheckGameCompleted | Var: Variable | Stores 1 in Variable if flag 0x964 is set, stores 0 otherwise | This flag is not the one that HGSS uses when the player clears the game. | +| 0132 | | DummyGameCompleted | \- | Sets flag 0x964 | This flag is not the one that HGSS uses when the player clears the game. | +| 0133 | PrepareDoorAnimation | DoorAnimation | u16: Matrix X; u16: Matrix Y; Flex: Map X; Flex: Map Y; u8: Door ID | Prepares a building located at Map X and Map Y coordinates in a map located at Matrix X and Matrix Y in the current matrix for animation, with Door ID animation ID | | +| 0134 | CloseDoor | WaitDoor | u8: Door ID | Wait animation of building with Door ID animation ID | | +| 0135 | MoveDoor | FreeDoor | u8: Door ID | Free animation of building with Door ID animation ID | | +| 0136 | OpenDoor | OpenDoor | u8: Door ID | Triggers first animation of building with Door ID animation ID | | +| 0137 | WaitDoor | CloseDoor | u8: Door ID | Triggers second animation of building with Door ID animation ID | | +| 0138 | | GetDaycareNames | \- | Stores first daycare Pokémon nickname in string buffer 0, the second daycare Pokémon nickname in string buffer 1 and the first Pokémon trainer's name in buffer 2 | If there's only one Pokémon in the daycare, string buffer 1 does not change. If no Pokémon is in the daycare, commands does nothing. | +| 0139 | | GetDaycareStatus | Var: Variable | If daycare Pokémon have an egg, stores 1 in Variable. Otherwise it stores 0 if no Pokémon is in the daycare, 2 if only one Pokémon is in the daycare or 3 if there are two Pokémon | | +| 013A | | InitEcruteakGym \* | | | | +| 013B | | | | ??? Something to do with the Goldenrod Dept. Store Basement, probably moving around blocks or opening access to doors. | | +| 013C | | | | ??? | | +| 013D | | | | | | +| 013E | | CianwoodGymInit \* | | | | +| 013F | | CianwoodGymTurnWinch \* | | | | +| 0140 | | VermilionGymInit \* | | | | +| 0141 | VermillionGymAnimation | VermilionGymLockAction \* | | | | +| 0142 | VermillionGymBin | VermilionGymCanCheck \* | | | | +| 0143 | | ResetVermilionGymCans \* | | | | +| 0144 | | InitVioletGym | \- | Initializes Violet Gym internal data and 3D model animations | | +| 0145 | | VioletGymElevator | \- | Triggers model #111 to move up or down | | +| 0146 | | InitAzaleaGym \* | | | | +| 0147 | AzaleaGym | AzaleaGymSpinarak \* | | | | +| 0148 | AzaleaGym2 | AzaleaGymSwitch \* | | | | +| 0149 | | BlackthornGymInit \* | | | | +| 014A | | FuchsiaGymInit \* | | | | +| 014B | | ViridianGymInit \* | | | | +| 014C | CheckPartyNumber | GetPartyCount | Var: Variable | Stores in Variable the current number of Pokémon in the party | | +| 014D | | BagScreen \* | | | | +| 014E | | BagScreenSelection \* | | | | +| 014F | | CheckPocketItems \* | | | | +| 0150 | | DummyTextBerry \* | | | | +| 0151 | | TextNature? \* | | | | +| 0152 | | SetOWDefaultPosition | Flex: Event ID; Flex: X; Flex: Y | Sets Event ID spawn position to global coords X and Y | | +| 0153 | SetOverworldPosition | SetOWPosition | Flex: Event ID; Flex: X; Flex: Z; Flex: Y; Flex: Dir | Moves Event ID to global coords X, Y, Z with Dir direction | Even though some maps are higher, the Z parameter is often 0. Game seems to calculate the correct Z position if it is wrong. | +| 0154 | | SetOWDefaultMovement | Flex: Event ID; Flex: Movement ID | Sets Event ID's default move code to Movement ID | | +| 0155 | | SetOWDefaultDirection | Flex: Event ID; Flex: Direction ID | Sets Event ID's default direction to Direction ID | | +| 0156 | | SetWarpPosition | Flex: Warp ID; Flex: X; Flex: Y | Moves Warp ID to global coords X and Y | | +| 0157 | | SetSpawnablePosition | Flex: Spawnable ID; Flex: X; Flex: Y | Moves Spawnable ID to global coords X and Y | | +| 0158 | | SetOWDirection | Flex: Event ID; Flex: Direction ID | Sets Event ID's current direction to Direction ID | | +| 0159 | | AddWaitingIcon \* | | | | +| 015A | | RemoveWaitingIcon \* | | | | +| 015B | | ReturnScriptWkSet \* | | | | +| 015C | | WaitTimeOrAB | Flex: Time | Stops script execution until Time frames have passed or until user presses A or B buttons | | +| 015D | ChoosePokemonMenu | ChoosePKMNSelection \* | | | | +| 015E | ChoosePokemonMenu2 | UnionChoosePKMNSelection\* | | | | +| 015F | StorePokemonMenu | GetSelectedPartySlot | Var: Variable | Stores in Variable the selected party slot in a party Pokémon screen, or 0xFF is user cancelled the selection | | +| 0160 | | SelectMove \* | | | | +| 0161 | | GetMoveSelection \* | | | | +| 0162 | StorePokemonNumber | GetPartyPokemonID | Var: Party Position; Var: Variable | Stores in Variable the ID of the Pokémon at Party Position | It will return 0 if Pokémon is an egg. | +| 0163 | CheckIfPokemonTraded | CheckTradedPokemon | Var: Party Position; Var: Variable | Stores 0 in Variable if trainer ID and secret ID of the Pokémon at Party Position are the player's ones, stores 1 otherwise | | +| 0164 | | CountPartyBornPokemon | Var: Variable | Stores in Variable the number of Pokémon in the Pokémon party, excluding the eggs | | +| 0165 | | CountAlivePokemonExceptFirst | Var: Variable; Flex: Party Position | Stores in Variable how many alive Pokémon would remain in the Pokémon party if Pokémon at Party Position disappeared | Eggs are excluded from the count. | +| 0166 | | CountTotalAlivePokemon | Var: Variable | Stores in Variable the number of Pokémon in the Pokémon party and PC boxes, excluding the eggs and fainted Pokémon | As Pokémon can't be fainted in the PC boxes, only eggs are not taken into account in the PC boxes count. | +| 0167 | | CountPartyEggs | Var: Variable | Stores in Variable the number of eggs in the Pokémon party | | +| 0168 | | TakeMoneyFlex | Flex: Money | Subtracts Money from the player's money | | +| 0169 | | RetrieveDayCareMon \* | | | | +| 016A | | GiveLoanMon \* | | | | +| 016B | | CheckReturnLoanMon \* | | | | +| 016C | | DeletePartyPokemon | Flex: Party Position | Deletes the Pokémon at Party Position from the party | The Pokémon data is destroyed. | +| 016D | | RemoveDayCareEgg \* | | | | +| 016E | | GiveDayCareEgg \* | | | | +| 016F | | TextDayCareCost \* | | | | +| 0170 | CheckHiroMoneyNumber | CompareMoneyFlex | Var: Variable; Flex: Money | Returns 1 to Variable if the player has Money or more money, returns 0 otherwise | | +| 0171 | | EggHatchScreen | \- | Opens the egg hatching screen with an egg in the Pokémon party that has 0 steps left for hatching | This may crash if there's no ready egg in the Pokémon party. It's better not to use this command unless you know what are you doing. | +| 0172 | | | | | | +| 0173 | | CheckDaycareLevelGain \* | Var: Variable; Flex: Position | Stores the amount of levels a Pokémon in the Daycare has gained from being in the Daycare | | +| 0174 | | GetDayCareSpeciesandNick \* | | | | +| 0175 | | GiveDayCareMon \* | | | | +| 0176 | | UnvanishOverworld | Flex: Event ID | Makes Event ID visible again if it was invisible | Can be used on Following Pokémon. Useful for scripting events that happen as soon as the player walks into a buidling and their Following Pokémon hasn't spawned yet. The Following Pokémon will "unvanish" on the same tile as the player, so account for this in movement scripts. | +| 0177 | | VanishOverworld | Flex: Event ID | Makes Event ID invisible, but still collisionable | It's a great idea to use this command in a level script for blocking doors with invisible events. | +| 0178 | OpenMail | MailScreen | \- | Opens the mail screen | | +| 0179 | CheckMail | CountMail | Var: Variable | Stores in Variable the current amount of mails in the mailbox | | +| 017A | | RankingView \* | | | | +| 017B | | GetTimePeriod | Var: Variable | Stores in Variable the current time period of the day | The different values are:
0: From 04:00 AM to 09:59 AM (Morning)
1: From 10:00 AM to 04:59 PM (Noon)
2: From 05:00 PM to 07:59 PM (Evening)
3: From 08:00 PM to 11:59 PM (Night)
4: From 00:00 AM to 03:59 AM (Midnight) | +| 017C | | GetRandom | Var: Variable; Flex: Range | Generates a random number between 0 and Range \- 1, and stores it in Variable | | +| 017D | | DummyGetRandom | Var: Variable; Flex: Range | Generates a random number between 0 and Range \- 1, and stores it in Variable | Exactly the same code as the command above. | +| 017E | | GetPokemonHappiness | Var: Variable; Flex: Party Position | Stores in Variable the happiness of Pokémon in Party Position | | +| 017F | | AddHappiness | Flex: Happiness; Flex: Party Position | Adds Happiness to the happiness of Pokémon in Party Position | | +| 0180 | | SubHappiness | Flex: Happiness; Flex: Party Position | Subs Happiness to the happiness of Pokémon in Party Position | | +| 0181 | | TextDayCareMonStats \* | | | | +| 0182 | | GetPlayerDirection | Var: Variable | Stores in Variable the direction the player is looking at | Predicted. Seeing up gives 0, seeing down gives 1, seeing left gives 2 and seeing right gives 3. | +| 0183 | | GetDayCareMonCompatibility \* | | | | +| 0184 | | CheckDayCareEgg \* | | | | +| 0185 | | CheckBornPokemonInParty | Flex: Pokémon; Var: Variable | Stores 1 in Variable if Pokémon is currently in the Pokémon party, stores 0 otherwise | Eggs do not count as Pokémon, so they will be ignored. | +| 0186 | | CheckPokemonSizeRecord | Var: Variable; Flex: Party Position | Stores 0 in Variable if Pokémon at Party Position does not have a bigger relative size than player's record, stores 1 if it's the same size and stores 2 if it has a bigger relative size | | +| 0187 | | SetPokemonSizeRecord | Flex: Party Position | Stores the relative size of Pokémon at Party Position as player's record | | +| 0188 | ComparePokemonHeight | TextPartyPokemonSize | Flex: Integer String Buffer; Flex: Decimal String Buffer; Flex: Party Position | Stores the integer part of Pokémon at Party Position size in Integer String Buffer (1 to 3 digits) and the decimal part of the size in Decimal String Buffer (1 digit) | | +| 0189 | CheckPokemonHeight | TextPokemonRecordSize | Flex: Integer String Buffer; Flex: Decimal String Buffer; Flex: Pokémon ID | Stores the integer part of player's record size, normalized to Pokémon ID range, in Integer String Buffer (1 to 3 digits) and the decimal part of the size in Decimal String Buffer (1 digit) | | +| 018A | ChoosePokemonDelete | | | | | +| 018B | StoreDeleteMove | | | | | +| 018C | CheckMoveNumber | CountPokemonMoves | Var: Variable; Flex: Party Position | Stores in Variable the total amount of moves that the Pokémon at Party Position currently has | | +| 018D | DeleteMove | DeleteMove | Flex: Party Position; Flex: Move Slot | Deletes the move in Move Slot from the Pokémon at Party Position | | +| 018E | | GetPartyPokemonMove | Var: Variable; Flex: Party Position; Flex: Move Slot | Stores in Variable the ID of the move in Move Slot from the Pokémon at Party Position | | +| 018F | SetVariableDeleteMove | TextPartyPokemonMove | u8: String Buffer; Flex: Party Position; Flex: Move Slot | Stores the name of the move in Move Slot from the Pokémon at Party Position in String Buffer | | +| 0190 | | Strength | Command format depends on the first parameter:
u8: 0
u8: 1
u8: 2; Var: Variable | Function depends on the first parameter:
0: Disables Strength so player can no longer move boulders
1: Allows the player to automatically move Strength boulders
2: Checks if Strength is activated, store answer in Variable | | +| 0191 | | FlashAction \* | Command format depends on the first parameter:
u8: 0
u8: 1
u8: 2; Var: Variable | Function depends on the first parameter:
0: Clears the Flash system flag
1: Sets the Flash system flag
2: Checks if Flash is activated, store answer in Variable | | +| 0192 | | DefogAction \* | Command format depends on the first parameter:
u8: 0
u8: 1
u8: 2; Var: Variable | Function depends on the first parameter:
0: Clears the Defog system flag
1: Sets the Defog system flag
2: Checks if Defog is activated, store answer in Variable | | +| 0193 | | GiveAccessory \* | | | | +| 0194 | GiveItemStored | CheckGivenAccessory \* | | | | +| 0195 | | CheckAccessory \* | | | | +| 0196 | | GiveBGAccessory \* | | | | +| 0197 | | CheckBGAccessory \* | | | | +| 0198 | | | | | | +| 0199 | | | | | | +| 019A | | | | | | +| 019B | | | | | | +| 019C | | | | | | +| 019D | | | | | | +| 019E | | | | | | +| 019F | | | | | | +| 01A0 | | | | | | +| 01A1 | | | | | | +| 01A2 | | | | | | +| 01A3 | | | | | | +| 01A4 | | | | | | +| 01A5 | | | | | | +| 01A6 | | | | | | +| 01A7 | | CheckCompleteJohtoDex | Var: Variable | Stores 1 in Variable if every Pokémon in the Johto Pokédex has been seen, stores 0 otherwise | | +| 01A8 | | CheckCompleteNationalDex | Var: Variable | Stores 1 in Variable if every Pokémon in the National Pokédex has been caught, stores 0 otherwise | | +| 01A9 | | OpenPokedexScreen \* | | | | +| 01AA | | CheckPokemonMail \* | | | | +| 01AB | | | | | | +| 01AC | | TakePokemonMail \* | | | | +| 01AD | | CountFossils | Var: Variable | Stores in Variable the current amount of fossils in the bag | Technically it's the number of items in the bag whose ID is between 99 and 105. | +| 01AE | | PreparePokeGearCall | Var: ???; Var: ???; Var: ??? | | | +| 01AF | | StartPokeGearCall | \- | Starts the PokéGear phone call that was previously set. | | +| 01B0 | | CheckFossilPokemon | Var: Variable; Flex: Item ID | Stores in Variable the ID of the Pokémon to which Item ID fossil belongs | | +| 01B1 | | CheckFossil | Var: Position; Var: Item ID; Flex: Amount | Stores in Item ID the ID of the first fossil item in the bag that the player has at least Amount quantity of, and stores in Position the amount of fossils in the bag before the first fossil that met the quantity condition | Stores 0 in both variables if there's no fossil in the bag. | +| 01B2 | | CountPokemonUnderLevel | Var: Variable; Flex: Level | Stores in Variable the amount of Pokémon in party whose level is equal or lower than Level | Eggs are completely ignored. | +| 01B3 | | SurvivePoison | Var: Variable; Flex: Party Position | If Pokémon at Party Position is poisoned and at 1 HP, it cures the poison and stores 1 in Variable, otherwise it stores 0 | | +| 01B4 | | FinishOverworldScreen \* | | | | +| 01B5 | | DebugPoketch \* | | | | +| 01B6 | | MessageAllFromArchive \* | | | | +| 01B7 | | MessageFromArchive \* | | | | +| 01B8 | | MessageAllPutPMS \* | | | | +| 01B9 | | | | | | +| 01BA | | | | | | +| 01BB | | | | | | +| 01BC | | | | | | +| 01BD | | GetPreviousHeaderID | Var: Variable | Stores in Variable the header ID of the previous accessed map | | +| 01BE | | GetCurrentHeaderID | Var: Variable | Stores in Variable the header ID of the map the player is in | | +| 01BF | | SetSafariFlag | u8: Flag; u8: Mode | If Flag is 0 safari encounters are activated, if Flag is 1 safari encounters are deactivated, being the own safari encounters if Mode is 0 or using the Safari Zone link if 1 | | +| 01C0 | | BattleRoomWarp \* | | | | +| 01C1 | | ExitBattleRoom \* | | | | +| 01C2 | | GeonetScreen | \- | Opens the Geonet screen | | +| 01C3 | | | | | | +| 01C4 | | ShowPokemonPic | Flex: Pokémon; Flex: Gender | Opens a window with the picture of Pokémon with Gender gender and registers the Pokémon in the Pokédex as seen | 0 = Male or Genderless; 1 = Female | +| 01C5 | | HidePokemonPic | \- | Hides the window of a Pokémon picture | | +| 01C6 | | | | | | +| 01C7 | | | | | | +| 01C8 | | | | | | +| 01C9 | | GetPokemonNature \* | Var: Variable; Flex: Party Position | | | +| 01CA | | CheckPartyNature \* | Var: Variable; Flex: Nature ID | | | +| 01CB | | | | | | +| 01CC | | LoadPokegearData \* | | | | +| 01CD | | SetRebattleTrainerID \* | | | | +| 01CE | | SetRebattleGymLeaderID \* | | | | +| 01CF | | EnableMassOutbreaks \* | | | | +| 01D0 | | AddRoamingPokemon | u8: ID | Activates a roaming Pokemon depending on the ID | Uses ID to determine which roaming Pokémon must appear: 0 for Entei, 1 for Raikou, 2 for Latias and 3 for Latios. | +| 01D1 | | UnionGroup | Command format depends on the first parameter:
u16: 0; Flex: ID; Var: Variable
u16: 1; Flex: ID; Var: Variable
u16: 2; Flex: ID; Flex: String Buffer
u16: 3; Flex: ID; Flex: String Buffer
u16: 4; Var: Variable
u16: 5; Flex: ID
u16: 6
u16: 7; Var: Variable | Function depends on the first parameter:
0: Checks if group ID exists, returns answer in Variable
1: Checks if group ID is accesible, returns answer in Variable
2: Writes group ID name in String Buffer
3: Writes leader's name of Group ID in String Buffer
4: Opens keyboard, stores 1 in Variable if user cancels, 2 if group name already exists, 0 otherwise
5: Enter in group ID
6: Creates a group
7: ??? | This command is the devil. | +| 01D2 | | CheckEggMoves \* | | | | +| 01D3 | ChoosePokemonRem | RememberMoveScreen \* | | | | +| 01D4 | | TeachMovesScreen \* | | | | +| 01D5 | StoreMoveRem | ResponseTeachMove \* | | | | +| 01D6 | | InitTrade | u8: Trade ID | Initializes Trade ID trade data | | +| 01D7 | | GetOfferedPokemon | Var: Variable | Stores in Variable the ID of the offered Pokémon of the current trade data | | +| 01D8 | CheckPokemonTrade | GetRequestedPokemon | Var: Variable | Stores in Variable the ID of the requested Pokémon of the current trade data | | +| 01D9 | TradeChosenPokemon | TradePokemonScreen | Flex: Party Position | Opens the trade Pokémon screen, giving the Pokémon at Party Position and receiving the offered Pokémon of the current trade data | | +| 01DA | StopTrade | EndTrade | \- | Frees the current trade data from the memory | | +| 01DB | | DummyInternationalDex | \- | Nothing | | +| 01DC | | DummyDimorphismDex | \- | Nothing | In fact it does activate a dimorphism flag in the Pokédex data, but since the HGSS Pokédex has the gender comparision by default, command's actual purpose is not noticeable. | +| 01DD | | NationalDex | Command format depends on the first parameter:
u8: 1; Var: Unused
u8: 2; Var: Variable | Function depends on the first parameter:
1: Activates the National Pokédex mode
2: Stores 1 in Variable if player has the National Pokédex, otherwise it stores 0 | | +| 01DE | | CountPokemonRibbons | Var: Variable; Flex: Party Position | Stores in Variable the amount of ribbons that the Pokémon in Party Position has | | +| 01DF | | CountPartyRibbons | Var: Variable | Stores in Variable the total amount of different ribbons in the current Pokémon party | | +| 01E0 | CheckRibbon | CheckRibbon | Var: Variable; Flex: Party Position; Flex: Ribbon | Stores 1 in Variable if the Pokémon in Party Position has the Ribbon ribbon, stores 0 otherwise | | +| 01E1 | GiveRibbon | GiveRibbon | Flex: Party Position; Flex: Ribbon | Gives the Ribbon ribbon to Pokémon in Party Position | | +| 01E2 | | TextRibbon | u8: String Buffer; Flex: Ribbon | Stores the name of the Ribbon in String Buffer | | +| 01E3 | CheckPokemonRibbon | CountPokemonEVs | Var: Variable; Flex: Party Position | Stores in Variable the total amount of effort values of Pokémon in Party Position | Predicted. | +| 01E4 | | GetDayOfWeek | Var: Variable | Stores in Variable the current day of the week | Value 0 is the first possible value and it's for Sunday. | +| 01E5 | | ShowRulesList | Var: Variable | ??? | | +| 01E6 | RBattleRecorder | DummyGetPokemonFootprint | \- | Nothing | | +| 01E7 | | PCHealAnimation | Flex: PokéBalls | Triggers the Pokémon Center healing animation with PokéBalls number of player's Pokémon | | +| 01E8 | | ElevatorAnimation | Flex: Direction; Flex: Count | Triggers the animation of building #208 up (if Direction is 0) or down (if Direction is 1) Count consecutive times | | +| 01E9 | | MysteryGiftGive | Command format depends on the first parameter:
u16: 0
u16: 1; Var: Variable
u16: 2; Var: Variable
u16: 3; Var: Variable
u16: 4
u16: 5; Var: Text File; Var: Text Line
u16: 6; Var: Text File; Var: Text Line
u16: 7
u16: 8 | Function depends on the first parameter:
0: Initializes the data for receiving a Mystery Gift
1: Checks if there is a Mystery Gift, stores answer in Variable
2: Stores the Mystery Gift ID in Variable
3: Checks if player can receive the Mystery Gift, stores answer in Variable
4: Gives the Mystery Gift to the player
5: Shows the succeed text at Text File file and Text Line slot
6: Shows the unable text at Text File file and Text Line slot
7: Ends the Mystery Gift process
8: Saves data and ends the Mystery Gift process | This one too. | +| 01EA | | | | | | +| 01EB | | | | | | +| 01EC | | | | | | +| 01ED | | | | | | +| 01EE | | | | | | +| 01EF | CheckVersion | CheckVersion | Var: Variable | Returns 0x7 to Variable if game is HeartGold, 0x8 if SoulSilver | | +| 01F0 | | FirstPokemonInParty | Var: Variable | Stores in Variable the slot of the first Pokémon in the party that is not an egg | | +| 01F1 | | CheckPokemonType \* | | | | +| 01F2 | | FirstPrimoPassword \* | | | | +| 01F3 | | SecondPrimoPassword \* | | | | +| 01F4 | | PreparePCAnimation \* | | | | +| 01F5 | | OpenPCAnimation \* | | | | +| 01F6 | | ClosePCAnimation \* | | | | +| 01F7 | | GetLottoNumber | Var: Variable | Stores Lotto random number in Variable | Supposed by analogy with Platinum. | +| 01F8 | | CheckWinLotto | Var: MatchPos; Var: Digits; Var: PC; Flex: Winning Number | Takes a Winning Number as input and responds as follows.
If no matching Pokémon could be found or an error occurs:
MatchPos: 0; Digits: 0; PC: 0.

For all other cases:

If the matching Pokémon is in the Player's party, PC will be assigned 0.
Otherwise, if it's in the Player's Storage System, PC will be assigned 1.

MatchPos stores the zero-based position of the winning Pokémon (either as Party pos or Storage System pos, depending on the value of PC).

When there's a match, the Digits var is assigned the number of matching digits of the Winning Pokémon's PID.
In case of multiple matches, priority is always given to the one with the most matching digits. | Supposed by analogy with Platinum.

To retrieve the exact position of a winning Pokémon in the Storage System, first make sure PC equals 1.

The zero-based PC Page and Position indices can be calculated:

PC Page index = MatchPos / 30
Position in page = MatchPos % 30

where % is the modulo operator. | +| 01F9 | | InitLotto | \- | Generates two random numbers and assigns them to two system lottery variables. | Supposed by analogy with Platinum. | +| 01FA | | BufferBoxPokemonNick \* | | | | +| 01FB | CheckBoxesNumber | CountPCFreeSpace | Var: Variable | Stores in Variable the amount of free Pokémon slots in PC boxes | | +| 01FC | | PalParkControl \* | | | | +| 01FD | | PalParkDepositCountCheck \* | | | | +| 01FE | | PalParkBoxPokemonCaught \* | | | | +| 01FF | StoreFriendParkResult | PalParkScoreResult \* | | | | +| 0200 | | PlayerMovementSavingSet \* | | | | +| 0201 | | PlayerMovementSavingClear \* | | | | +| 0202 | | HallOfFameAnime \* | | | | +| 0203 | | AddTrainerScore \* | | | | +| 0204 | | TextAccessory | u8: String Buffer; Flex: Accesory | Stores Accesory's name in String Buffer | | +| 0205 | | CheckPokemonInParty | Flex: Pokémon; Var: Variable | Stores 1 in Variable if Pokémon (or its egg) is currently in the Pokémon party, stores 0 otherwise | | +| 0206 | | SetDeoxysForm | Flex: Form | Sets every Deoxys in the Pokémon party the Form form | Form 0 is Normal, form 1 is Attack, form 2 is Defense and form 3 is Speed. | +| 0207 | | CheckBurmyForms | Var: Variable | Stores in Variable the number of current different Burmy forms in the Pokémon party | Returns 0 if player has no Burmy in the party, 1 if only one different form, 2 if two different forms and 3 if has three or more Burmy with three different forms. | +| 0208 | | | \- | ??? | Sets a internal flag. | +| 0209 | | | \- | ??? | Resets a internal flag. | +| 020A | | GetHour | Var: Variable | Stores current hour from RTC in Variable | | +| 020B | | ShakeOverworld | Flex: Event ID; Flex: Count; Flex: Time; Flex: X; Flex: Y | Makes Event ID overworld shake Count times in Time frames, moving X horizontally and Y vertically each shake | Event ID must be released before this command in order to see the animation. | +| 020C | | BlinkOverworld | Flex: ???; Flex: ???; Flex: ???; Flex: ???; Flex: ??? | ??? | | +| 020D | | CheckRegis | Var: Variable | Stores 1 in Variable if player has the 3 Regis in the party, stores 0 otherwise | | +| 020E | | | | | | +| 020F | | MessageUnown | u16: Text Slot | Display line Text Slot from the text file with the Unown font | Predicted. | +| 0210 | | CheckGBACartidge | Var: Variable | Stores the current GBA cartridge ID in Variable | Stores 0 if no cartridge, 1 if Pokémon Sapphire, 2 if Pokémon Ruby, 3 if Pokémon Emerald, 4 if Pokémon FireRed and 5 if Pokémon LeafGreen. Somehow it could also set 7 if Pokémon Gold, 8 if Pokémon Silver, 10 if Pokémon Diamond, 11 if Pokémon Pearl, 12 if Pokémon Platinum and 15 if Pokémon Colosseum. | +| 0211 | | GetFirstAlivePokemonSlot | Var: Variable | Stores in Variable the slot of the first Pokémon in the party that is not an egg nor is fainted | Predicted. | +| 0212 | | SetMatrixAlternativeMap | Flex: Alternative ID; u8: Status | Permanently changes a worldmap matrix cell corresponding to Alternative ID if Status is 1, reverts the change if 0 | It only changes the map file value in the matrix, not the map header nor the map height. Seems that the only Alternative ID available values are 0 and 1, corresponding to Mahogany Town and to the Lake of Rage. | +| 0213 | | TextBackgroundName \* | | | | +| 0214 | | CheckCoinsImmediate \* | | | | +| 0215 | | CheckCoins \* | | | | +| 0216 | | AddCoins \* | | | | +| 0217 | | GetPokemonLevel | Var: Result; Flex: Party Slot | Stores into Result the level of the Pokémon at a given Party Slot. | | +| 0218 | | | | | | +| 0219 | | | | | | +| 021A | | | | | | +| 021B | | | | | | +| 021C | | | | | | +| 021D | | TextNumberSp | u8: String Buffer; Flex: Number; u8: Alignment Type; u8: Digits | Stores a Number in String Buffer with Alignment Type alignment and Digits length | Predicted. Alignment Type 0 is left-alignment, 1 is right alignment padded with spaces and 2 is right alignment padded with zeros. Digits is used only in these last two types. | +| 021E | | MonGetContestValue \* | | | | +| 021F | | CheckBirthday | Var: Variable | Stores 1 in Variable if the current day is the player's birthday, stores 0 otherwise | | +| 0220 | | MusicVolumeSet | Flex: Music ID; Flex: Volume | Identifies the BGM Player which is playing Music ID and sets its Volume | | +| 0221 | | CountSeenUnown | Var: Variable | Stores in Variable the number of different seen Unown forms | | +| 0222 | | | | | | +| 0223 | | | | | | +| 0224 | | | | | | +| 0225 | | | | | | +| 0226 | | CountHallOfFameEntries \* | | | | +| 0227 | | | | | | +| 0228 | | | | | | +| 0229 | | | | | | +| 022A | | | | | | +| 022B | | | | | | +| 022C | | | | | Related to move tutor? Possibly BP price check? | +| 022D | | CheckBattlePoints \* | | | | +| 022E | | GiveBP \* | | | | +| 022F | | TakeBP \* | | | | +| 0230 | | CompareBP \* | Flex: ???; Var: ??? | | | +| 0231 | | ShakeCamera | Flex: X Magnitude; Flex: Y Magnitude; Flex: Count; Flex: Time | Shakes the screen vertically and/or horizontally, moving the camera X Magnitude pixels horizontally and Y Magnitude pixels vertically in each shake, with Count total shakes of Time frames each one | Don't abuse this command, as it seems that camera might end up 1 pixel up or down in each animation, especially when Count is an odd number. | +| 0232 | | Battle2vs2 | Flex: Partner Trainer ID; Flex: Trainer 1 ID; Flex: Trainer 2 ID; u8: ??? | Starts a double battle with Partner Trainer ID versus Trainer 1 ID and Trainer 2 ID | Last parameter seems to always be 0x1. | +| 0233 | | | | | | +| 0234 | | | | | | +| 0235 | | | Var: ??? | ??? | | +| 0236 | ChoosePokemonMenuTrade | PartyPokemonTradeScreen | \- | Opens the party Pokémon screen for a trade | | +| 0237 | | GetDPPtPrizeItemIdAndCost \* | | | | +| 0238 | | | | | | +| 0239 | | | | | | +| 023A | | CheckCoinsVar \* | | | | +| 023B | | | | | | +| 023C | | GetUniqueSealsQuantity \* | | | | +| 023D | | DummyActivateMysteryGift \* | | | | +| 023E | | GetOWMovement \* | | | | +| 023F | | | | | | +| 0240 | | | | | | +| 0241 | | | | | | +| 0242 | | | | | | +| 0243 | | | | | | +| 0244 | | TextSealSingular \* | u8: String Buffer; Flex: Seal ID | Stores Seal's singular noun in String Buffer | International release exclusive(supposed). Text archive 15. | +| 0245 | | DummyLockAll \* | | | | +| 0246 | | | | | | +| 0247 | | | | | | +| 0248 | | PartyLegalCheck \* | var: Result | Checks legality of party, at least for WIFI stuff. If RESULT is 1, party check failed and you have an "illegal" mon | Used by the attendants in the PC to check your Pokemon before going into the Union Room, may be used elsewhere too | +| 0249 | | | | | | +| 024A | | | | | | +| 024B | | | \- | ??? | | +| 024C | | LastBattleCheckCaught \* | Var ??? | | | +| 024D | LegendaryBattle | WildBattleSp | Flex: Pokémon; Flex: Level; u8: Shiny Flag | Starts a wild battle against a Pokémon of level Level, and shiny if Shiny Flag is 1 | | +| 024E | | CheckTrainerCardLevel | Var: Variable | Stores in Variable the current trainer card level | | +| 024F | | DummyRideBike | \- | Nothing | Seems to allocate the bike music in the RAM but doesn't play it. | +| 0250 | | | | | | +| 0251 | | ShowSaveBox | \- | Displays the save data box (current map name, player's name, the amount of badges, the Pokédex counter and the play time) | | +| 0252 | | HideSaveBox | \- | Hides the save data box | | +| 0253 | | ScopeMode | u8: Mode | If Mode is 1, activates the scope mode, otherwise the command deactivates the scope mode | The scope mode prevents the game to do certain actions (like reseting system flags) when changing map, and probably it's related with more things. | +| 0254 | | GetFollowingPokeSize | Var: Variable | Stores 0 in Variable if the current following Pokémon is small and can follow the player indoors, stores 1 if it's big and can't follow the player indoors | In fact it returns the second byte of the following Pokémon data files, stored in a/1/4/1.narc, which is the one that the game reads for allowing Pokémon entering in buildings. This command will work even if a SendBackFollowingPoke is used and the following Pokémon is hidden at that moment. | +| 0255 | | | \- | ??? | Draws a heart icon above the following Pokémon. Maybe a dummy command? | +| 0256 | | | u16: ??? | ??? | Parameter must be 1 or 2, otherwise command won't do anything. Seems to trigger a default movement for switching current player's and following Pokémon positions (for example, when using a HM). | +| 0257 | | FollowingPokePCAnimation | \- | Triggers the animation of sending the current following Pokémon back to its PokéBall over the Pokémon Center healing counter | | +| 0258 | StartFriendPark | SendBackFollowingPoke | \- | Triggers the animation of sending the current following Pokémon back to its PokéBall and deactivates the following Pokémon until the game is reset or a warp is used | | +| 0259 | | FollowingPokeFacePlayer | \- | Makes the invoking event look at the player, but with a size limitation | When the following Pokemon has a big size, it won't turn to the player if there is an overworld on the opposite side so it would collide. The checked flag is the second byte of the Parameter 1 field, which could be called "double size overworlds" flag, as it is also used for drawing two grass patches in the tall grass for the following Pokemon. | +| 025A | | LockFollowingPoke | u16: Operation | Releases the following Pokemon animation if Operation is 0, locks the animation otherwise | Predicted comparing ASM with Lock and Release commands. | +| 025B | | WaitFollowingPoke | \- | Waits the following Pokemon to end its last movement | Predicted comparing ASM with Lock and Release commands. | +| 025C | | SetFollowingPokeMovement | u16: Move Code | Changes the following Pokemon default movement to Move Code | The most important movement IDs are 0x30 and 0x38 (following and ghost-following behaviours respectively). | +| 025D | | SetFollowingPokePosition | u8: Position; u8: Direction | Moves the following Pokémon to one tile Position next to player and facing at Direction | For both parameters, up is 0, down is 1, left is 2 and right is 3. | +| 025E | EndFriendPark | BallResetFollowingPoke | \- | Moves the following Pokémon to the current player's position, and triggers the animation of sending the Pokémon out of its PokéBall after the player walks a step | This is commonly used after a different event following the player, so the player sends out the following Pokémon in the next step (instead of forcing it automatically with SendOutFollowingPoke). | +| 025F | | NoBallResetFollowingPoke | \- | Moves the following Pokémon to the current player's position | Almost same as BallResetFollowingPoke, but without the PokéBall animation (exactly like when a small Pokémon spawns after the player uses a warp). | +| 0260 | | SendOutFollowingPoke | \- | Triggers the animation of sending the first non-fainted Pokémon out of its PokéBall and spawns it on the last player position | Seems to be needed for refreshing/forcing its apparition after a Warp on the same map. | +| 0261 | MecScript | | \- | ??? | It's used in a lot of scripts that involve following Pokémon movements, placed at the top of them. Seems that it resets a lot of following Pokémon movement parameters and data. | +| 0262 | | | | | | +| 0263 | | Pokeathlon \* | | | | +| 0264 | | | | | | +| 0265 | | GetPokegearContactRandomGiftBerry \* | | | | +| 0266 | | GetPokegearContactGiftItem \* | | | | +| 0267 | MakePhoto | CameronPhotoScreen \* | | | | +| 0268 | | | | | | +| 0269 | | | | | | +| 026A | CheckAlbumPhoto | CheckAlbumIfFull \* | | | | +| 026B | | CheckRocketCostume \* | | | | +| 026C | | ActivateRocketCostume \* | | | | +| 026D | | | | | | +| 026E | | GetOWDirection | u16: Event ID; Var: Variable | Stores in Variable the current direction which Event ID is facing | Up is 0, Down is 1, Left is 2 and Right is 3. | +| 026F | | ApricornTreeAnimation \* | | | | +| 0270 | | ApricornTreeGetApricorn \* | | | | +| 0271 | | GiveApricornFromTree \* | | | | +| 0272 | | TextApricornName \* | | | | +| 0273 | | | | | | +| 0274 | | | | | | +| 0275 | | | | | | +| 0276 | | | | | | +| 0277 | | | | | | +| 0278 | | CountPartyMonsOfSpecies \* | | | | +| 0279 | | | | | | +| 027A | | | | | | +| 027B | | | | | | +| 027C | | | | | | +| 027D | | | | | | +| 027E | | | | | | +| 027F | | | | | | +| 0280 | | | | | | +| 0281 | | SaveWipeExtraChunks \* | | | | +| 0282 | | | Var: Variable | ??? | | +| 0283 | | | | | | +| 0284 | | | | | | +| 0285 | | | | | | +| 0286 | | | | | | +| 0287 | | GetPartySlotWithSpecies \* | var: Slot; u16 or Flex(???): Pokemon ID | Checks party for the presence of a Pokemon, and returns which slot they are in. | Assume that it checks for the first instance and then stops, so if you have multiple of the same Pokemon, it stops at the first instance and returns which slot it is in (0-5). Used in Silph Co. for Rotom | +| 0288 | | | | | | +| 0289 | | OpenScratchCardScreen \* | | | | +| 028A | | CloseScratchCard \* | | | | +| 028B | | GetScratchCardPrize \* | | | | +| 028C | | | | | | +| 028D | | MoveTutorChooseMove \* | | | | +| 028E | | TutorMoveTeachInSlot \* | | | | +| 028F | | TutorMoveGetPrice \* | | | | +| 0290 | | CheckHeadbuttCompatibility | Flex: Party Slot; Var: Variable | Stores 1 into Variable if the Pokémon at the given Party Slot can learn Headbutt. | Ilex Forest Tutor: Script File 92, Script 3 | +| 0291 | | IVCheckerJudge \* | | | | +| 0292 | | BufferStatName \* | | | | +| 0293 | | SetMonForme \* | | | | +| 0294 | | TextTrainerName \* | | | | +| 0295 | | | | | | +| 0296 | | | | | | +| 0297 | | | | | | +| 0298 | | | | | | +| 0299 | | | | | | +| 029A | | | | | | +| 029B | | | | | | +| 029C | | TextTypeName \* | | | | +| 029D | | GetItemQuantity \* | | | | +| 029E | | GetHiddenPowerType \* | | | | +| 029F | | SetFavoriteMon \* | | | | +| 02A0 | | GetFavoriteMon \* | | | | +| 02A1 | | GetOwnedRotomFormes \* | | | | +| 02A2 | | CountTranformedRotomsInParty \* | | | | +| 02A3 | | UpdateRotomForme \* | | | | +| 02A4 | | GetPartyPokemonForm \* | | | | +| 02A5 | | | | | | +| 02A6 | | | | | | +| 02A7 | | | | | | +| 02A8 | | | | | | +| 02A9 | | | | | | +| 02AA | | | | | | +| 02AB | | | | | | +| 02AC | | GetCurrentWeather | Var: Variable | Stores the current weather in Variable | | +| 02AD | | GetPlayerCoordinates \* | | | | +| 02AE | | | | | | +| 02AF | | | | | | +| 02B0 | | CheckFatefulEncounter \* | | | | +| 02B1 | | CommSanitizeParty \* | | | | +| 02B2 | | DayCareSanitizeMon \* | | | | +| 02B3 | | | | | | +| 02B4 | | TextBattleHallStreak \* | | | | +| 02B5 | | BattleHallCountUsedSpecies \* | | | | +| 02B6 | | BattleHallGetTotalStreak \* | | | | +| 02B7 | | | | | | +| 02B8 | | | | | | +| 02B9 | | | | | | +| 02BA | | FollowingPokemonIsEventTrigger \* | | | | +| 02BB | | | | | | +| 02BC | CheckWildBattle2 | | | | | +| 02BD | WildBattle2 | PokemonHasItem \* | | | | +| 02BE | | BattleTowerSetUpMultiBattle \* | | | | +| 02BF | | SetPlayerVolume \* | | | | +| 02C0 | | | | | | +| 02C1 | | | | | | +| 02C2 | | | | | | +| 02C3 | | CheckPokemonIsSeen \* | | | | +| 02C4 | | FloorTrapAnimation | | Triggers Team Rocket HQ trap-floor's graphical effect in the player's current position | | +| 02C5 | | | | | | +| 02C6 | | | | | | +| 02C7 | | TalkFollowingPoke | \- | The following Pokémon triggers a random movement, and then a random following message | This seems to be the command that executes when the player talks to the following Pokémon (at script #163). Files in a/2/2/0.narc link map names to possible texts. The following Pokémon ends up locked, so a Release should be used after this command. | +| 02C8 | | | | | | +| 02C9 | | OpenAlphPuzzle \* | u8: Puzzle ID | Loads the stone-panel puzzle of Puzzle ID. | ID 0 = Kabuto, ID 1 = Aerodactyl, ID 2 = Omanyte, ID 3 = Ho-Oh
Appears to check Flag 2423, 2424, 2425, 2426 for the completion of puzzles 0 to 3 respectively. | +| 02CA | | OpenRuinsofAlphHiddenRoom \* | u8: Room ID | Something to do with the secret room, not the puzzle trapdoor. | ID 0 = Kabuto Room, ID 1 = Aerodactyl Room, ID 2 = Omanyte Room, ID 3 = Ho-Oh Room | +| 02CB | | UpdateDayCareMonOverworlds \* | | | | +| 02CC | | | | | | +| 02CD | | | | | | +| 02CE | | | | | | +| 02CF | | | | | | +| 02D0 | | | | | | +| 02D1 | | | | | | +| 02D2 | | | u8: ???; u8: ???; u16: ???; u16: ???; u16: ??? | ??? | | +| 02D3 | | BoatAnimation | u8: Animation; u8: ???; u16: Header; u16: X coord; u16: Y coord | Plays the S.S. Aqua animation of leaving the port. Animation is either 0 or 1, with 0 being Olivine and 1 being Vermilion. X and Y coordinates are for the destination map | | +| 02D4 | | | | | | +| 02D5 | | | | | | +| 02D6 | | | | | | +| 02D7 | | | Var: Variable | ??? | | +| 02D8 | | | u8: ???; u8: ??? | ??? | | +| 02D9 | | CheckAlivePokemon | Var: Variable | Checks if player has at least 1 not fainted Pokémon, stores the result in Variable | Predicted. | +| 02DA | | CheckFollowingPoke | Var: Variable | Checks if player has a following Pokémon, stores the result in Variable | Supposed. | +| 02DB | | | \- | ??? | | +| 02DC | | | u8: ??? | ??? | | +| 02DD | | | u8: ???; Var: ??? | ??? | | +| 02DE | | | | | | +| 02DF | | CheckKurtApricorn \* | | | If not 0, script continues to check if daily flag is reset, then gives you the apricorns | +| 02E0 | | ClearKurtApricorn \* | | | | +| 02E1 | | GiveApricornBalls \* | | | | +| 02E2 | | CheckApricornCount \* | | | | +| 02E3 | | KurtApricornMenuScreen \* | | | | +| 02E4 | | StoreApricornJuice \* | | | | +| 02E5 | | CheckJuice \* | | | | +| 02E6 | | | | | | +| 02E7 | | | | | | +| 02E8 | | CreatePokeathlonFriendshipRoomStatues \* | | | | +| 02E9 | | TextPokeathlonCourseName \* | | | | +| 02EA | OpenLowScreen | OpenTouchScreen | \- | Changes the low screen design to the green Pokéball background | | +| 02EB | CloseLowScreen | CloseTouchScreen | \- | Sets the default low screen design | | +| 02EC | OpenLowYesNoBox | YesNoTouchScreen | Var: Variable | Opens a Yes-No selection, stores player's answer in Variable | Crashes if OpenTouchScreen is not used previously. | +| 02ED | Multi4 | MultiTouchStandardText | u8: ???; u8: ???; u8: ???; u8: ???; Var: Selection | Prepares a multiple selection menu with text bank #191, returns selected slot ID in Selection | | +| 02EE | Multi5 | MultiTouchLocalText | u8: ???; u8: ???; u8: ???; u8: ???; Var: Selection | Prepares a multiple selection menu with local texts, returns selected slot ID in Selection | | +| 02EF | TextScriptMulti4 | CreateMultiTouchBox | Flex: Text Slot; Flex: Top Screen Text;
Flex: Multi Box Slot | Adds a box with Multi Box Slot ID showing Text Slot text on the bottom screen and Top Screen Text on the top in a message box. Text depends on whether you use MultiTouchStandardText or MultiTouchLocalText | | +| 02F0 | CloseMulti4 | CloseMultiTouch | \- | Closes the multiple selection boxes | | +| 02F1 | | RockSmashItemCheck \* | Flex: ???; Var: ???; Var: ??? | ??? | | +| 02F2 | | | Var: ??? | ??? | | +| 02F3 | | | | | | +| 02F4 | | | | | | +| 02F5 | | | | | | +| 02F6 | | | | | | +| 02F7 | | | | | | +| 02F8 | | | | | | +| 02F9 | | | | | | +| 02FA | | | | | | +| 02FB | | | | | | +| 02FC | | | | | | +| 02FD | | | | | | +| 02FE | | | | | | +| 02FF | | | \- | ??? | | +| 0300 | | | | | | +| 0301 | | | | | | +| 0302 | | | | | | +| 0303 | | | | | | +| 0304 | | | | | | +| 0305 | | RenderCutscene \* | ???: ??? | Renders a cutscene
2 = Arceus stock image cutscene | | +| 0306 | | | | | | +| 0307 | | | | | | +| 0308 | | GiveTogepiEgg \* | | | | +| 0309 | | | | | | +| 030A | | GiveSpikyEaredPichu \* | \- | ??? | | +| 030B | | | | | | +| 030C | | OpenVoltorbFlip \* | | | | +| 030D | | KenyaCheckPartyOrMailbox \* | | | | +| 030E | | MartSell \* | \- | ??? | Related with the mart interface. | +| 030F | | SetFollowPokeInhibitState \* | | | | +| 0310 | | ScriptOverlayCmd \* | | | | +| 0311 | | BugContestAction \* | | | | +| 0312 | | TextBugContestWinner \* | | | | +| 0313 | | JudgeBugContest \* | | | | +| 0314 | | TextBugContestMonNick \* | | | | +| 0315 | | BugContestGetTimeLeft \* | | | | +| 0316 | | IsBugContestantRegistered \* | | | | +| 0317 | | | | | | +| 0318 | | | | | | +| 0319 | TakeMomMoney | TakeMomMoney \* | | | | +| 031A | GiveMomMoney | CheckMomMoneyBalance \* | | | | +| 031B | OpenMomMoneyBox | ShowMomMoney | Flex: X; Flex: Y | Shows mom savings money box at X and Y coordinates of the screen | | +| 031C | CloseMomMoneyBox | HideMomMoney | \- | Hides mom savings money box | | +| 031D | | | | | | +| 031E | | TextRulesetName \* | | | | +| 031F | | | | | | +| 0320 | | | | | | +| 0321 | | | | | | +| 0322 | | | | | | +| 0323 | | | | | | +| 0324 | | UpdateTownMap \* | u8(?): Map Type | Updates the town map to include Kanto
1 = Normal, Johto-only view
2 = Whole map, Kanto included | | +| 0325 | | | | | | +| 0326 | | | | | | +| 0327 | | | | | | +| 0328 | | | | | | +| 0329 | | | | | | +| 032A | | CelebiTimeTravelAnimation \* | | | | +| 032B | | | | | | +| 032C | | | | | | +| 032D | | MomGiftCheck \* | | | | +| 032E | | | | | | +| 032F | | | | | | +| 0330 | | UnownCircle \* | | | | +| 0331 | | | | | | +| 0332 | | InitMystriStageAnimation \* | | | | +| 0333 | | | | | | +| 0334 | | | | | | +| 0335 | | GetBuenasPassword \* | | | | +| 0336 | | | | | | +| 0337 | | | | | | +| 0338 | | | | | | +| 0339 | | GetShinyLeafCount \* | | | | +| 033A | | TryGiveShinyLeafCrown \* | | | | +| 033B | | CheckPokemonNickname \* | Flex: Party Slot; Var: Variable | Checks to see if the Pokémon at Party Slot position has a nickname. The variable will return 0 if the Pokémon does have a nickname. | Example: Script File 913, Function 35 | +| 033C | | | | | | +| 033D | | | Var: ??? | ??? | | +| 033E | | | | | | +| 033F | | | | | | +| 0340 | | | | | | +| 0341 | | | | | | +| 0342 | | | Var: Variable | ??? | | +| 0343 | | | Var: Variable | ??? | | +| 0344 | | CheckJadeOrbRequirements | Var: Variable | Stores 1 in Variable if player has both Kyogre and Groudon in the Pokémon party and they have been caught in Johto, stores 0 otherwise | | +| 0345 | | | Var: Variable | ??? | | +| 0346 | CheckMomMoneyNumber | CheckMoneyFull | u16: Money Account; Var: Variable | Stores 1 in Variable if the chosen money account is full.
Money account 0 = Mom's savings;
Money account 1 = Player; | | +| 0347 | | SystemSetSleepFlag \* | | | | +| 0348 | | | | | | +| 0349 | | | | | | +| 034A | | | | | | +| 034B | | TextItemLowercase | u8: String Buffer; Flex: Item | Stores Item's lowercase name in String Buffer | International release exclusive. | +| 034C | | TextItemPlural | u8: String Buffer; Flex: Item | Stores Item's plural noun in String Buffer | International release exclusive. | +| 034D | | TextPartyPokemonDefault | u8: String Buffer; Flex: Party position | Stores the name of the Pokémon in Party Position in String Buffer with default color tags encoding | International release exclusive. Names stored at text file 238. | +| 034E | | | | | International release exclusive. | +| 034F | | | u8: String Buffer | ??? | International release exclusive. | +| 0350 | | | u8: String Buffer; Flex: Accesory | ??? | International release exclusive. | +| 0351 | | TextTrainerClass | u8: String Buffer; Flex: Trainer class | Stores Trainer class' lowercase noun in String Buffer | International release exclusive. | +| 0352 | | TextSealPlural | u8: String Buffer; Flex: Seal | Stores Seal's plural noun in String Buffer | International release exclusive. Text archive 16. | +| 0353 | | TextCapitalize | u8: String Buffer | Capitalizes the string currently stored in String Buffer | International release exclusive. | +| 0354 | | TextFloor | u8: String Buffer; u8: Floor | Stores Floor's name in String Buffer | International release exclusive. Names stored at text file 191, lines 0x74 to 0x7A. | \ No newline at end of file From 101b9a49b9faee385b2c4590bbd455626512f78c Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Sun, 3 Mar 2024 20:57:30 +0100 Subject: [PATCH 23/40] Better? --- DS_Map/Resources/HGSSCommands.md | 1712 +++++++++++++++--------------- 1 file changed, 855 insertions(+), 857 deletions(-) diff --git a/DS_Map/Resources/HGSSCommands.md b/DS_Map/Resources/HGSSCommands.md index 005f04f..e597fe1 100644 --- a/DS_Map/Resources/HGSSCommands.md +++ b/DS_Map/Resources/HGSSCommands.md @@ -1,857 +1,855 @@ - Outer pipes Cell padding -No sorting -| | SDSME names | New proposed names | Parameters | Function | Notes | -| ---- | -------------------------- | ---------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| 0000 | Nop | Nop | \- | Nothing | | -| 0001 | Nop1 | Dummy | \- | Nothing | Has exactly the same ASM code as Nop. | -| 0002 | End | End | \- | End script execution | | -| 0003 | Return2 | WaitTime | u16: Time; Var: ??? | Stop script execution for Time frames | The Var's purpose is unknown. Command uses ScrReg 0 as countdown. | -| 0004 | | RegValueSet | u8: Script Register; u8: Value | Assigns Value to Script Register value | | -| 0005 | | RegDataSet | u8: Script Register; u32: Value | Assigns Value to Script Register value | | -| 0006 | | RegAdrsSet | u8: Script Register; u32: Address | Assigns data in Address offset to Script Register value | | -| 0007 | | AdrsValueSet | u32: Address; u8: Value | Assigns Value to the Address offset | | -| 0008 | | AdrsRegSet | u32: Address; u8: Script Register | Assigns Script Register value to the Address offset | | -| 0009 | | RegRegSet | u8: Script Register 1; u8: Script Register 2 | Assigns Script Register 2 value to Script Register 1 value | | -| 000A | | AdrsAdrsSet | u32: Address 1; u32: Address 2 | Assigns data in Address 2 to the Address 1 offset | | -| 000B | | CompareRegs | u8: Script Register; u8: Script Register | Compares two Script Register | | -| 000C | | CompareRegValue | u8: Script Register; u8: Value | Compares Script Register value with Value | | -| 000D | | CompareRegAdrs | u8: Script Register; u32: Address | Compares Script Register value with data in Address | | -| 000E | | CompareAdrsReg | u32: Address; u8: Script Register | Compares data in Address with Script Register value | | -| 000F | | CompareAdrsValue | u32: Address; u8: Value | Compares data in Address with Value | | -| 0010 | | CompareAdrsAdrs | u32: Address 1; u32: Address 2 | Compares data in Address 1 with data in Address 2 | | -| 0011 | If | CompareVarValue | Var: Variable; u16: Value | Compares Variable value with Value | | -| 0012 | If2 | CompareVars | Var: Variable 1; Var: Variable 2 | Compares Variable 1 value with Variable 2 value | | -| 0013 | | ParallelCommonScript | u16: ??? | ??? | Somehow related with parallel common script execution. | -| 0014 | CallStandard | CommonScript | u16: Global Script ID | Calls Global Script ID script | The Common Script table is located at 0xFA48C in IPKS arm9.bin, ordered from highest to lowest with structure: u16 Global Script ID | u16 Script file | u16 Text file. The executed script inside script file is determined as: used Global Script ID \- tabulated Global Script ID. | -| 0015 | | LocalScript | \- | Returns to the invoking script/function after a Common Script | | -| 0016 | Jump | Jump | u32: Relative Jump | Jumps to a function, Relative Jump bytes forward or backward | Relative Jump can have negative values (backward jump). | -| 0017 | | JumpIfObjID | u8: Event ID; u32: Relative Jump | Jumps to a function, Relative Jump bytes forward or backward, if invoking event has Event ID as ID | | -| 0018 | | JumpIfBgID | u8: ???; u32: Relative Jump | ??? | Maybe jumps to a function if invoking event has a specific ID. | -| 0019 | | JumpIfPlayerDir | u8: Player Direction; u32: Relative Jump | Jumps to a function, Relative Jump bytes forward or backward, if player is looking in Player Direction | Supposed. Needs to be tested in game. | -| 001A | Call | Call | u32: Relative Jump | Calls a function, Relative Jump bytes forward or backward | Can be used to make loops when calling the own invoking function. | -| 001B | Return | Return | \- | Returns to the invoking script/function after a Call | | -| 001C | CompareLastResultJump | JumpIf | u8: Condition; u32: Relative Jump | If Condition in the condition table, jumps to a function | Ask AdAstra for the condition list. Condition table is updated after a IfVarValue, IfVarVar, CheckFlag... | -| 001D | CompareLastResultCall | CallIf | u8: Condition; u32: Relative Jump | If Condition in the condition table, calls a function | | -| 001E | SetFlag | SetFlag | u16: Flag | Sets Flag to 1 | | -| 001F | ClearFlag | ClearFlag | u16: Flag | Sets Flag to 0 | | -| 0020 | CheckFlag | CheckFlag | u16: Flag | Checks if Flag is set | It updates the internal condition flag and maybe part of the condition table. | -| 0021 | | SetFlagFromVar | Var: Flag | Sets the flag whose ID is stored in Flag | | -| 0022 | | ClearFlagFromVar | Var: Flag | Clears the flag whose ID is stored in Flag | | -| 0023 | | FlagStatusToVar | Var: Flag; Var: Variable | Checks if Flag is set and store the result in Variable | | -| 0024 | | SetTrainerFlag | Flex: Trainer ID | Sets the flag of Trainer ID, so marks it as beaten trainer | So this trainer will not battle against you. Used in every Gym after the leader is beaten. | -| 0025 | | ClearTrainerFlag | Flex: Trainer ID | Clears the flag of Trainer ID, so marks it as unbeaten trainer | So this trainer can be challenged again. | -| 0026 | | CheckTrainerFlag | Flex: Trainer ID | Checks if Trainer ID has been beaten | It updates the internal condition flag and maybe part of the condition table. | -| 0027 | Copy | IncrementVar | Var: Variable; Flex: Operand | Stores the operation Variable \+ Operand in Variable | | -| 0028 | | DecrementVar | Var: Variable; Flex: Operand | Stores the operation Variable \- Operand in Variable | | -| 0029 | SetVar | SetVar | Var: Variable; u16: Value | Stores Value in Variable | | -| 002A | CopyVar | SetVarFromVariable | Var: Variable 1; Var: Variable 2 | Assigns value of Variable 2 to Variable 1 | | -| 002B | | SetVarFromFlexible | Var: Variable; Flex: Flexible Value | Stores Flexible Value (or its value if variable) in Variable | | -| 002C | | MessageAll | u8: Text Slot | Display line Text Slot from the text file, all at once | | -| 002D | Message | Message | u8: Text Slot | Display line Text Slot from the text file | | -| 002E | Message2 | MessageFlex | Flex: Text Slot | Display line Text Slot from the text file | Unlike 002D, this command also accepts a variable as the input field. | -| 002F | | MessageNoSkip | Flex: Text Slot | ??? | | -| 0030 | | | u8: Text Slot | ??? | | -| 0031 | | WaitAB | \- | Waits for button A or button B to be pressed | Somehow it uses ScrReg 0 as countdown. | -| 0032 | WaitButton | WaitButton | \- | Waits for a button to be pressed | It seems only A, B, X and direction pad buttons work. | -| 0033 | | WaitABPad | \- | Waits for button A, button B or pad buttons to be pressed | Supposed. Needs to be tested in game. | -| 0034 | | OpenMessage | \- | ??? | | -| 0035 | CloseMessageOnKeyPress | CloseMessage | \- | Closes message box | SDSME name is misleading, for no button is needed to be pressed. | -| 0036 | FreezeMessageBox | FreezeMessage | \- | ??? | Probably keeps the message box alive after a script. ASM differs with CloseMessage only in a BL instruction. | -| 0037 | CallMessageBox | SetIconBoard | u8: Text Slot; u8: Type; u16: Icon; u16: ??? | Prepares an icon board message box displaying Text Slot message, of Type type, and with Icon image if chosen type supports it | Type values from 0 to 3 are: brown (with icon), green (with icon), gray and blue. | -| 0038 | ColorMessageBox | SetTextBoard | u8: Type; u16: Icon | Prepares a text board message box of Type type, and with Icon image if chosen type supports it | Type values from 0 to 3 are: brown (with icon), green (with icon), gray and blue. | -| 0039 | TypeMessageBox | ShowBoard | u8: Process | Triggers different Process processes for the board | Process value 0 keeps the board, value 1 creates the board, value 2 hides the board, value 3 shows the board and value 4 deletes the board. | -| 003A | NoMapMessageBox | WaitBoard | \- | Waits the board last process to end | Supposed. | -| 003B | | BoardMessage | u8: Text Slot; u16: Variable | Displays Text Slot message in the current text box, stores the current text box status in Variable | | -| 003C | | CloseBoard | Var: Variable | Returns 1 to Variable if the player has pressed a button so the board must close, 0 otherwise | Variable is stored in ScrReg 0. Command waits for a button to be pressed and stores result in Variable. | -| 003D | | Menu | \- | | | -| 003E | | | u8: ???; u8: ???; u8: ???; u8: ???; u8: ???; u8: ??? | | | -| 003F | | YesNoBox | Var: Variable | Opens a Yes-No dialog and stores user response in Variable | Variable is stored in ScrReg 0. | -| 0040 | Multi | MultiStandardText | u8: X; u8: Y; u8: Cursor; u8: Cancel; Var: Selection | Prepares a multiple selection menu at X and Y screen position, with Cursor default selected option and possibility of cancelling depending on Cancel, with text bank #321, returns selected slot ID in Selection | If Cancel is 1, the user can select the last option by pressing B button. | -| 0041 | Multi2 | MultiLocalText | u8: X; u8: Y; u8: Cursor; u8: Cancel; Var: Selection | Prepares a multiple selection menu at X and Y screen position, with Cursor default selected option and possibility of cancelling depending on Cancel, with local texts, returns selected slot ID in Selection | If Cancel is 1, the user can select the last option by pressing B button. | -| 0042 | TextScriptMulti | AddMultiOption | u8: Text Slot; u8: Multi Slot | Adds an option with Multi Slot ID showing Text Slot text | | -| 0043 | CloseMulti | ShowMulti | \- | Shows the prepared multi in screen | The game will hide it when the player has selected an option. | -| 0044 | Multi3 | ListStandardText | u8: X; u8: Y; u8: Cursor; u8: Cancel; Var: Selection | Prepares a multiple selection list at X and Y screen position, with Cursor default selected option and possibility of cancelling depending on Cancel, with text bank #321, returns selected slot ID in Selection | If Cancel is 1, the user can select the last option by pressing B button. The difference between a Multi and a List seems to be that lists are scrollable. | -| 0045 | | ListLocalText | u8: X; u8: Y; u8: Cursor; u8: Cancel; Var: Selection | Prepares a multiple selection list at X and Y screen position, with Cursor default selected option and possibility of cancelling depending on Cancel, with local texts, returns selected slot ID in Selection | If Cancel is 1, the user can select the last option by pressing B button. The difference between a Multi and a List seems to be that lists are scrollable. | -| 0046 | | AddListOption | Flex: Option MSG; Flex: Highlight MSG; Flex: List Slot | Adds a new option to the list, with List Slot ID and showing text line Option MSG. It also displays text line Highlight MSG when that option is highlighted. | If Highlight MSG is set to 255 [0xFF], no message will be displayed when the option is highlighted.
This command relies on an open message box in order to display the highlight messages.

Trying to highlight an option with Highlight MSG different than 255 [0xFF] will result in a crash if no message box is already being displayed. | -| 0047 | | ShowList | \- | Shows the prepared list in screen | The game will hide it when the player has selected an option. | -| 0048 | MultiRow | MultiColumn | u8: Columns | Splits the multi window in Columns different columns | | -| 0049 | PlayFanfare | PlayFanfare | Flex: Sound | Plays Sound | | -| 004A | PlayFanfare2 | StopFanfare | Flex: Sound | Stops Sound | | -| 004B | WaitFanfare | WaitFanfare | Flex: Sound | Waits Sound to finish | | -| 004C | PlayCry | PlayCry | Flex: Pokémon; Flex: Unused | Plays a Pokémon cry | | -| 004D | WaitCry | WaitCry | \- | Waits the current cry to finish | | -| 004E | PlaySound | PlaySound | u16: Sound | Pauses current music, then Plays Sound | | -| 004F | FadeDefaultMusic | WaitSound | \- | Waits for Sound to finish, then resumes music | | -| 0050 | PlayMusic | PlayMusic | u16: Music | Plays Music | | -| 0051 | StopMusic | StopMusic | u16: Unused | Stops current music | Parameter is ignored because the game identifies what music is playing. | -| 0052 | RestartMusic | PlayDefaultMusic | \- | Plays map default music | | -| 0053 | | SetMusic | u16: Music | ??? | | -| 0054 | SwitchMusic | FadeOutMusic | u16: Volume; u16: Time | Fades out the current music to Volume in Time frames | | -| 0055 | | FadeInMusic | u16: Time | Fades in the current music to normal volume in Time frames | | -| 0056 | | SetMusicPauseStatus \* | u8: SSEQ Player ID; u8: Status | ??? | | -| 0057 | | TempMusic \* | u16: Music ID | ??? | | -| 0058 | | SetBGMFlag \* | u8: ??? | ??? | Seems to set a flag related to the music system. | -| 0059 | | CheckChatotCry | Var: Variable | Checks if Chatot has custom sound, stores answer in Variable | Returns 0 or 1 to the specified Variable. Not for a specific Chatot but for all (they share a custom sound). | -| 005A | SwitchMusic2 | StartChatotCry | Var: Variable | Starts Chatot microphone record, stores answer in Variable | Returns 0 or 1 to the specified Variable depending on successful recording. | -| 005B | | StopChatotCry | \- | Stops recording Chatot custom sound | | -| 005C | | SaveChatotCry | \- | ??? | Maybe saves the custom Chatot sound in the savegame. | -| 005D | | | \- | ??? | | -| 005E | ApplyMovement | Movement | Flex: Event ID; u32: Relative Jump | Applies movement at Relative Jump to Event ID | Movements must be halfword-aligned in the script file. If you're using an old tool which doesn't align them, force the alignment with a TextPlayerName 0x0 or some unnoticeable command of 3, 5, 7 or 9 bytes length. | -| 005F | WaitMovement | WaitMovement | \- | Waits for all movements to finish | | -| 0060 | LockAll | LockAll | \- | Locks every event in the map | | -| 0061 | ReleaseAll | ReleaseAll | \- | Releases every event in the map | | -| 0062 | Lock | Lock | u16: Event ID | Locks Event ID | | -| 0063 | Release | Release | u16: Event ID | Releases Event ID | | -| 0064 | AddPeople | AddOW | Flex: Event ID | Add Event ID overworld in the map | It is probable that, if executing this having Event ID overworld already in the map, it gets duplicated. | -| 0065 | RemovePeople | RemoveOW | Flex: Event ID | Removes Event ID overworld from the map | | -| 0066 | LockCam | LockCamera | Flex: X; Flex: Y | Locks the camera at position X and Y | Seems to place a invisible NPC at coords X and Y. It appears that both must be the current player position. | -| 0067 | | ReleaseCamera | \- | Releases the camera | | -| 0068 | FacePlayer | FacePlayer | \- | Makes the invoking event look at the player | In fact it simply takes the current player direction and makes the NPC look at the opposite direction. | -| 0069 | CheckSpritePosition | GetPlayerPosition | Var: X; Var: Y | Saves the current player position in X and Y | | -| 006A | | GetOWPosition | Flex: Event ID; Var: X; Var: Y | Saves the current Event ID position in X and Y | If Event ID is deleted (via RemoveOW) it gives 0xFF for both coordinates. | -| 006B | CheckPersonPosition | SetFollowingOverworld \* | Flex: X; Flex: Z; Flex: Y | ??? | Maybe teleports the player to other coords? | -| 006C | ContinueFollow | KeepOverworld | Flex: Event ID; u8: Value | If Value is 1, prevents Event ID from disappearing when entering on a new map header | | -| 006D | FollowHero | SetOWMovement | Flex: Event ID; u16: Movement | Changes the Event ID's movement number to Movement | | -| 006E | GiveMoney | GiveMoney | u32: Money | Adds Money to the player's money | | -| 006F | TakeMoney | TakeMoney | u32: Money | Subtracts Money from the player's money | | -| 0070 | CheckMoney | CompareMoney | Var: Variable; u32: Money | Stores 1 into Variable if the player has Money or more money. Stores 0 otherwise. | | -| 0071 | ShowMoney | ShowMoney | Flex: X; Flex: Y | Shows the money box at X and Y coordinates of the screen | Each X and Y unit implies 8 pixels. Values of 0 or higher than the screen may glitch the screen. | -| 0072 | HideMoney | HideMoney | \- | Hides the money box | | -| 0073 | | UpdateMoney | \- | Updates the current money in the money box | | -| 0074 | | ShowSpecialCurrency | u8: Currency; Flex: X Coord; Flex: Y Coord | Shows the Currency box at X and Y coordinates of the screen. | Currency:

0 = Coins
1 = Battle Points
2 = Athlete Points | -| 0075 | | HideSpecialCurrency | \- | Hides the currently displayed special currency box. | | -| 0076 | | UpdateSpecialCurrency | u16: Currency | Updates the current Currency in the currency box. | Currency types are the same as above [0074]. | -| 0077 | | CheckCoins | Var: Variable | Stores the current casino coin amount in Variable | | -| 0078 | | GiveCoins | Flex: Coins | Adds Coins to the player's casino coins | | -| 0079 | | TakeCoins | Flex: Coins | Subtracts Coins from the player's casino coins | | -| 007A | | GiveAthletePoints | Flex: Amount | Adds the given Amount to the player's Athlete Points | | -| 007B | | TakeAthletePoints | Flex: Amount | Subtracts the given Amount from the player's Athlete Points | | -| 007C | | CompareAthletePoints | Var: Result; Flex: Amount | Stores 1 into Variable if the player has the given Amount of Athlete Points or more. Stores 0 otherwise. | | -| 007D | | GiveItem | Flex: Item; Flex: Amount; Var: Variable | Adds Amount of Item item, stores 1 in Variable if the player had less than 1000 - Amount (100 - Amount if TM/HM), stores 0 otherwise | Both Item and Amount are flexible, but if you use CommonScript 0x7F1 after that (as it is meant to be) you must place these two values in 0x8004 and 0x8005 in order to make the script work properly. | -| 007E | TakeItem | TakeItem | Flex: Item; Flex: Amount; Var: Variable | Subs Amount of Item item, stores 1 in Variable if the player had at least Amount items in the bag, stores 0 otherwise | | -| 007F | GiveItem | CheckItemSpace | Flex: Item; Flex: Amount; Var: Variable | Stores 1 in Variable if the player has less than 1000 - Amount of Item items (100 - Amount if TM/HM), stores 0 otherwise | | -| 0080 | CheckItem | CheckItem | Flex: Item; Flex: Amount; Var: Variable | Stores 1 in Variable if the player has at least Amount of Item items in the bag, stores 0 otherwise | Even if the Amount to check for is 0, the check will return 0 if you don't have the item at all. | -| 0081 | | CheckItemIsMachine | Flex: Item; Var: Variable | Stores 1 in Variable if Item is TM or HM, stores 0 otherwise | | -| 0082 | | GetItemPocket | Flex: Item; Var: Variable | Stores the bag pocket of Item in Variable | | -| 0083 | | SetStarter | Flex: Pokémon | Stores Pokémon as the starting Pokémon in the game save data | | -| 0084 | DoubleMessage | GenderMessage | u8: Male Text; u8: Female Text | Displays Male Text or Female Text message depending on player's gender | | -| 0085 | | CheckSeals \* | Flex: Seal ID; Var: Number of Seals in Seal Case | Checks the number of a certain type of Ball Seals that the player has. The variable is the output of how many Seals you have. | Example: Farmhouse on Route 39 | -| 0086 | | GiveSeals \* | Flex: Seal ID; Flex: Number of Seals to be Given | Gives the player Ball Seals. | Example: Farmhouse on Route 39 | -| 0087 | | GiveRandomSeals \* | Var: Random Seal ID 1; Var: Random Seal ID 2; Var: Random Seal ID 3 | Generates three random types of Ball Seals and gives them to the player (repeats are possible). Each variable will yield a 0 if the player has no more room for the Seal(s) in the Seal Case. | Example: House in top right of Olivine City | -| 0088 | | CheckPokemonForm \* | Flex: Party Position; Var: Variable | Checks the form of the Pokemon in party slot Party Position and returns the form ID in Variable. | | -| 0089 | GiveStoredPokemon | GivePokemon | Flex: Pokémon; Flex: Level; Flex: Item ID; Flex: Form; Flex: Ability; Var: Variable | Gives Pokémon at level Level, store 1 in Variable if succeed and 0 otherwise | | -| 008A | | GivePokemonEgg | Flex: Pokémon; Flex: Location | Gives a Pokémon egg received from Location text slot at text bank #281 | | -| 008B | | ReplaceMove | Flex: Party Slot; Flex: Move Slot; u16: Move ID | Overwrites Move Slot of the Pokémon at the specified Party Slot with Move ID. | Party slot and move slot start at 0 rather than 1, so the ranges are 0-5 and 0-3 respectively.
[https://bulbapedia.bulbagarden.net/wiki/List_of_moves](https://bulbapedia.bulbagarden.net/wiki/List_of_moves) | -| 008C | | CheckPokemonHasMove | Var: Variable; Flex: Move ID; Flex: Party Slot | Checks if a Pokémon at the specified Party Slot knows a move with given Move ID.
Stores 1 into Variable if yes, 0 otherwise. | Example: Headbutt tutor in Ilex Forest (Script File 92, Script 3) | -| 008D | | CheckMoveInParty | Var: Variable; Flex: Move ID | Checks if any Pokémon in the party knows Move ID move, stores in Variable the position of the first Pokémon that knows it or stores 6 if no Pokémon in the party knows the move | | -| 008E | | CheckPokeGearRematch \* | Flex: Phone Number; Var: Variable | | Has something to do with rematches but not sure if it's checking if a rematch is active or the # the rematch is on. Gets used when deciding when to let Gym Leaders appear in the overworld for a photo shoot after they are defeated in the Dojo. | -| 008F | | ChooseRivalName | Var: Variable | Opens the keyboard for naming the rival, stores 1 in Variable if user cancels the proccess | | -| 0090 | | GetCounterpartSprite | Var: Variable | Stores 97 (Lyra sprite ID) into the Variable if you're playing as Ethan;
Stores 0 (Ethan sprite ID) into the Variable if you're playing as Lyra. | Remember that Overworld Entities with sprite IDs 101 to 116 refer to the value of vars 0x4020-0x402F for the sprite to display. | -| 0091 | | UpgradePokegear | u8: Module | Adds the worldmap to the Pokegear if Module is 1, adds the radio if Module is 2 | | -| 0092 | RecordPokegearNumber | RecordPokegearNumber | Flex: ??? | | | -| 0093 | | CheckPokegearNumberRegistered \* | Flex: Phone Number; Var: Variable | Stores 0 into Variable if Phone Number has not been registered, and 1 if it has been registered. | Example: Sabrina in Olivine Harbor (Script File 153, Script 7). Used frequently by Gym Leaders appearing in the overworld. | -| 0094 | | | | | | -| 0095 | | | | | | -| 0096 | CallEnd | ReturnScreen | \- | Restores the normal overworld screen | | -| 0097 | | | | | | -| 0098 | Wifi | | \- | | | -| 0099 | | DressPokemon \* | \- | | | -| 009A | OpenPokemonDress | ContestDressupScreen \* | \- | | | -| 009B | | DressUpArtworkScreen \* | \- | | | -| 009C | | SealCapsuleScreen \* | \- | | | -| 009D | OpenPokegearMap | WorldMapScreen | \- | Opens the worldmap screen | | -| 009E | | PCBoxScreen \* | \- | | | -| 009F | | DrawScreenUnion \* | \- | | | -| 00A0 | | TrainerCaseUnion \* | \- | | | -| 00A1 | CallEnd2 | TradeScreenUnion \* | \- | | | -| 00A2 | | RecordMixingUnion \* | \- | | | -| 00A3 | EndGame | EndGameScreen | \- | Opens the Hall of Fame and game ending screens | | -| 00A4 | | HallOfFameData \* | \- | | | -| 00A5 | | StoreGTSStatus \* | ??? | | | -| 00A6 | WFC | InitWFC \* | ??? | | | -| 00A7 | | StarterSelectionScreen | \- | Opens the starter Pokémon selection screen | | -| 00A8 | | GetTrainerPathToPlayer \* | Flex: ??? | | | -| 00A9 | | TrainerStepTowardsPlayer \* | Flex: ???; Var: Variable | | | -| 00AA | | GetTrainerEyeType \* | Var: Variable | | | -| 00AB | | GetEyeTrainerNum \* | Flex: ???; Var: Variable | | | -| 00AC | | WritePlayerName | Var: Variable | Opens the keyboard for naming the player, stores 1 in Variable if user cancels the proccess | | -| 00AD | GivePokemonNickname | WritePokemonName | Flex: Party Position; Var: Variable | Opens the keyboard for naming a Pokémon in Party Position, stores 1 in Variable if user cancels the proccess | | -| 00AE | FadeScreen | FadeScreen | u16: Frame Count; u16: Duration; u16: Fade Style; u16: Color | Fades screen to chosen 15-bit Color, using the chosen Fade Style. The transition will render Frame Count images, of Duration length each. | Type 0 for fade in, Type 1 for fade out. Color has 15-bit format. Transition is the number of color changes that the game does in the fading. | -| 00AF | ResetScreen | WaitFadeScreen | \- | Waits for the screen fade to end | | -| 00B0 | Warp | Warp | Flex: Map; u16: Door; Flex: X; Flex: Y; Flex: Dir | Warps to X and Y position of Map header with initial Dir direction, using Door warp | When Door is 0 it doesn't use any door animation. | -| 00B1 | HallFameData | RockClimbAnimation | Flex: Party Position | Uses rock climb with the Pokémon at Party Position position | | -| 00B2 | | SurfAnimation | Flex: Party Position | Uses surf with the Pokémon at Party Position position | | -| 00B3 | WFC1 | WaterfallAnimation | Flex: Party Position | Uses waterfall with the Pokémon at Party Position position | | -| 00B4 | | FlyAnimation | u16: Map; Flex: X; Flex: Y | Flies to Map header map, to coordinates X and Y | | -| 00B5 | | FlashAnimation | \- | Sets weather to 12 (darkness after flash) and then updates the weather graphics | | -| 00B6 | | WhirlpoolAnimation | Flex: Party Position | Uses whirlpool with the Pokémon at Party Position position | | -| 00B7 | | CutAnimation | Flex: Party Position | Uses cut with the Pokémon at Party Position position | | -| 00B8 | | CheckBike | Var: Variable | Stores 1 in Variable if player is riding the bike, stores 0 otherwise | | -| 00B9 | | RideBike | u8: Action | Changes player form from normal to riding the bike if Action is 1, otherwise it sets the normal form to the player | | -| 00BA | | CyclingRoad | u8: Action | If Action is 1, the game sets the cycling road flag and moves the player down. Otherwise the flag is deactivated. | | -| 00BB | | CheckPlayerForm | Var: Variable | Stores in Variable the current player form | Values 0 is for normal form, value 1 for riding the bike, value 2 for surfing, value 3 for Rocket clothing | -| 00BC | | SetPlayerForm | u16: Form | Activates the Form bit in the internal player form data | The purpose of the different bits still needs to be researched. | -| 00BD | | UpdatePlayerForm | \- | Updates changes in the internal player form data in the screen | | -| 00BE | SetVariableHero | TextPlayerName | u8: String Buffer | Stores player's name in String Buffer | | -| 00BF | SetVariableRival | TextRivalName | u8: String Buffer | Stores rival's name in String Buffer | | -| 00C0 | SetVariableAlter | TextCounterpart | u8: String Buffer | Stores counterpart's name in String Buffer | | -| 00C1 | SetVariablePokemon | TextPartyPokemon | u8: String Buffer; Flex: Party Position | Stores the name of the Pokémon in Party Position in String Buffer | | -| 00C2 | SetVariableItem | TextItem | u8: String Buffer; Flex: Item | Stores Item's name in String Buffer | | -| 00C3 | | TextPocket | u8: String Buffer; Flex: Pocket | Stores Pocket's name in String Buffer | | -| 00C4 | SetVariableAttackItem | TextMachineMove | u8: String Buffer; Flex: Item | Stores the name of the move contained in Item TM/HM in String Buffer | | -| 00C5 | SetVariableAttack | TextMove | u8: String Buffer; Flex: Move | Stores battle Move's name in String Buffer | | -| 00C6 | SetVariableNumber | TextNumber | u8: String Buffer; Flex: Number | Stores a Number in String Buffer | | -| 00C7 | SetVariablePokemonNickname | TextPokeNickname | u8: String Buffer; Flex: Party Position | Stores the nickname of the Pokémon in Party Position in String Buffer | | -| 00C8 | SetVariableObject | | | | | -| 00C9 | | TextPlayerTrainerType | u8: String Buffer | Stores player's Union Room trainer type in String Buffer | | -| 00CA | SetVariablePokemonStored | TextPokemon | u8: String Buffer; Flex: Pokémon; u16: Unused; u8: Unused | Stores Pokémon's name in String Buffer | The two Unused parameters are for defining male/female nouns and singular/plural nouns respectively. However both don't apply in this command. | -| 00CB | | TextStarterPokemon | u8: String Buffer | Stores the name of the player' starter Pokémon in String Buffer | | -| 00CC | | TextRivalStarter | u8: String Buffer | Stores the name of the rival' starter Pokémon in String Buffer | | -| 00CD | CheckStarter | TextCounterpartStarter | u8: String Buffer | Stores the name of the counterpart' starter Pokémon in String Buffer | | -| 00CE | | CheckStarter | Var: Variable | Stores the starter Pokémon ID in Variable | | -| 00CF | | DummyTextGoods | u8: String Buffer; Flex: Unused | Loads an empty string in String Buffer | | -| 00D0 | | DummyTextTrap | u8: Unused; Flex: Unused | Nothing | | -| 00D1 | | DummyTextTreasure | u8: Unused; Flex: Unused | Nothing | | -| 00D2 | | TextMapName | u8: String Buffer; Flex: Map | Stores Map header name in String Buffer | | -| 00D3 | | GetSwarmInfo | Var: Map; Var: Pokémon | Selects a zone depending on a random seed, then stores the zone ID in Map and the corresponding swarm Pokémon of that zone in Pokémon | Predicted. Needs to be checked. | -| 00D4 | | TrainerID | Var: Variable | Stores the trainer ID number in Variable depending on the script ID | This means you shouldn't use this command in a normal script. | -| 00D5 | TrainerBattle | TrainerBattle | Flex: Trainer 1; Flex: Trainer 2; u8: Result; u8: ??? | Starts a battle against Trainer 1 and, if Trainer 2 is neither 0 nor the same as Trainer 1, a double battle against both. Continues without warping to Pokemon Center/home if Result is equal to 1. | Your party will also be fully healed after the battle if Result is 1. Example: Cherrygrove City fight with Rival | -| 00D6 | | TrainerMessage | Flex: Trainer ID; Flex: Type | Displays the text of Trainer ID trainer at condition Type | The possible Type values are the following (expand the note for see them) | -| 00D7 | | TrainerMsgCheck | Var: Noticing; Var: Defeat; Var: One Pokémon | If the script ID corresponds to a single battle trainer, stores 0 in Noticing, 2 in Defeat and 0 in One Pokémon. If it corresponds to a double battle, stores 3, 5 and 6 or 7, 9 and 10 depending on whether it's the first or the second trainer | This means you shouldn't use this command in a normal script. | -| 00D8 | | TrainerRematchMsgCheck | Var: Noticing; Var: Defeat; Var: One Pokémon | If the script ID corresponds to a single battle trainer, stores 17 in Noticing, 0 in Defeat and 0 in One Pokémon. If it corresponds to a double battle, stores 18, 0 and 6 or 19, 0 and 10 depending on whether it's the first or the second trainer | This means you shouldn't use this command in a normal script. | -| 00D9 | | TrainerTypeCheck | Var: Variable | Stores 0 in Variable if the script ID corresponds to a single battle, stores 1 if it corresponds to a double battle | This means you shouldn't use this command in a normal script. | -| 00DA | | TrainerMusic | Flex: Trainer | Plays Trainer's overworld music | It checks if player is in Johto or Kanto for that. | -| 00DB | LostGoPokecenter | LostBattle | \- | Return to Pokémon Center or player's house after being defeated | | -| 00DC | CheckLost | CheckBattleIsLost | Var: Variable | Stores 0 in Variable if player has been defeated in battle, stores 1 otherwise | | -| 00DD | | CheckDefeatedPokemon | Var: Variable; u8: ??? | Stores 0 in Variable if player defeated or catched the wild Pokemon, stores 1 otherwise | | -| 00DE | StoreStarter | Check2vs2 | Var: Variable | Stores 1 in Variable if player has at least 2 not fainted Pokémon, stores 0 otherwise | | -| 00DF | | DummyTrainerBattle | \- | Starts a battle against trainer with ID 1 | | -| 00E0 | | DummyTrainerFlag | \- | Sets the trainer flag with the same ID as the invoking event | | -| 00E1 | | DummyTrainerFlagJump | u32: Relative Jump | Jumps to a function, Relative Jump bytes forward or backward, if trainer flag with the invoking event ID is set | | -| 00E2 | | | | | | -| 00E3 | | | | | | -| 00E4 | | | | | | -| 00E5 | | | | | | -| 00E6 | | | | | | -| 00E7 | | | | | | -| 00E8 | | | | | | -| 00E9 | | | | | | -| 00EA | | | | | | -| 00EB | | | | | | -| 00EC | | | | | | -| 00ED | | | | | | -| 00EE | | CheckPokerus | Var: Variable | Stores 1 in Variable if one or more Pokémon in the party are infected with the Pokérus | | -| 00EF | ChecPokemonGender | GetPokemonGender | Flex: Party Position; Var: Variable | Stores 0 in Variable if Pokémon at Party Position is male, 1 if is female and 2 if gender is unknown | Unknown gender value is supposed and should be checked. | -| 00F0 | WarpLift | SetElevatorWarp \* | Var: Variable | | | -| 00F1 | CheckFloor | GetElevatorFloor | Var: Variable | Stores in Variable the current floor in a elevator | | -| 00F2 | | ElevatorBox | u8: X; u8: Y; Var: Variable; Flex: Floor | Shows the current floor number in a box at X and Y coordinates in the screen | Each X and Y unit implies 8 pixels. Values of 0 or higher than the screen may glitch the screen. Variable and Floor parameters have not been tested. | -| 00F3 | WirelessBattleWait | CountJohtoDexSeen | Var: Variable | Stores in Variable the total seen Pokemon in the Johto Pokédex | | -| 00F4 | | CountJohtoDexObtained | Var: Variable | Stores in Variable the total obtained Pokemon in the Johto Pokédex | | -| 00F5 | | CountNationalDexSeen | Var: Variable | Stores in Variable the total seen Pokemon in the National Pokédex | | -| 00F6 | | CountNationalDexObtained | Var: Variable | Stores in Variable the total obtained Pokemon in the National Pokédex | | -| 00F7 | PokemonContest | DummyNationalDexCheck | \- | Nothing | | -| 00F8 | | GetDexProgressMsg | u8: Mode; Var: Message; Var: Unknown | Checks the number of seen Pokémon in the Johto Pokédex (if Mode is 0) or the number of obtained Pokémon in the National Pokédex (otherwise) and stores the corresponding Professor message in Message, also storing 0x4AA in Unknown | | -| 00F9 | | WildBattle | Flex: Pokémon; Flex: Level | Starts a wild battle against a Pokémon of level Level | | -| 00FA | | WildBattleNoButtons | Flex: Pokémon; Flex: Level | Starts a first wild battle against a Pokémon of level Level | The difference between this and other similar commands is that Bag, Run and Pokémon buttons are disabled. | -| 00FB | | CatchTutorial | \- | Starts the catch tutorial battle | | -| 00FC | | | | | | -| 00FD | | CheckSaveGame | Var: Variable | Stores 0 in Variable if a different savegame exists and it's not possible to save, stores 1 if no previous savegame exists, stores 2 if game has to save a lot of data and stores 3 if game can perform a quick save | | -| 00FE | | SaveGame \* | | | | -| 00FF | | CheckPortrait \* | | | | -| 0100 | | SetPortraitTitle \* | | | | -| 0101 | | | | | | -| 0102 | | | | | | -| 0103 | | | | | | -| 0104 | | | | | | -| 0105 | | | | | | -| 0106 | | | | | | -| 0107 | | | | | | -| 0108 | | | | | | -| 0109 | | | | | | -| 010A | | | | | | -| 010B | | | | | | -| 010C | | | | | | -| 010D | | | | | | -| 010E | | | | | | -| 010F | | | | | | -| 0110 | | | | | | -| 0111 | | | | | | -| 0112 | | | | | | -| 0113 | | MartScreen | Flex: Unused | Opens the common mart shopping screen | | -| 0114 | | SpMartScreen | Flex: Mart ID | Opens the Mart ID mart shopping screen | Used in the Departament Store for a shop with specific fixed items. At 0x48188 of arm9.bin (IPKS) is the pointer to the shops table, each entry of the table being a pointer to an item table. | -| 0115 | | GoodsMartScreen | Flex: Mart ID | Opens the Mart ID goods mart shopping screen | | -| 0116 | | SealMartScreen | Flex: Mart ID | Opens the Mart ID seal mart shopping screen | | -| 0117 | | DummyLostBattle | \- | Return to Pokémon Center or player's house after being defeated | Same code as LostBattle command. | -| 0118 | | SetLastWarp | Flex: Warp ID | Sets map's Warp ID warp as the last used warp | Supposed. This would affect actions like Escape Rope use. | -| 0119 | CheckGender | CheckPlayerGender | Var: Variable | Stores 0 in Variable if player is male, stores 1 if female | | -| 011A | HealPokemon | HealPokemon | \- | Heals every Pokémon in the player's party | That does not include the black fade nor the healing sound. | -| 011B | | EndWirelessComms \* | | | | -| 011C | | EnterBattleRoom \* | | | | -| 011D | | SetPlayerDirComm \* | | | | -| 011E | | UnionMapChange \* | | | | -| 011F | | UnionRoomSpriteScreen \* | | | | -| 0120 | | StoreUnionSprite \* | | | | -| 0121 | | SetUnionSprite \* | | | | -| 0122 | | CheckPokedex | Var: Variable | Stores 1 in Variable if player has the Pokédex, stores 0 otherwise | | -| 0123 | ActivatePokedex | GivePokedex | \- | Gives the Pokédex to the player | | -| 0124 | | CheckShoes | Var: Variable | Stores 1 in Variable if player has the running shoes, stores 0 otherwise | | -| 0125 | GiveRunningShoes | GiveShoes | \- | Gives the running shoes to the player | | -| 0126 | CheckBadge | CheckBadge | Flex: Badge ID; Var: Variable | Checks if player has Badge ID badge, stores result in Variable | | -| 0127 | EnableBadge | GiveBadge | Flex: Badge ID | Gives the player Badge ID badge | | -| 0128 | DisableBadge | CountBadges | Var: Variable | Stores in Variable the number of badges obtained | | -| 0129 | | DummyCheckBag | Var: Variable | Stores 1 in Variable if flag 0x960 is set, stores 0 otherwise | | -| 012A | | DummyGiveBag | \- | Sets flag 0x960 | | -| 012B | | CheckPartner | Var: Variable | Stores 1 in Variable if the following event flag is activated, stores 0 otherwise | | -| 012C | | SetPartner | \- | Activates the following event flag, so you can no longer use the bike, surf, rock climb... | | -| 012D | | ClearPartner | \- | Deactivates the following event flag, so you can use the bike, surf, rock climb... again | | -| 012E | | CheckStepFlag \* | | | | -| 012F | | SetStepFlag \* | | | | -| 0130 | | ClearStepFlag \* | | | | -| 0131 | | DummyCheckGameCompleted | Var: Variable | Stores 1 in Variable if flag 0x964 is set, stores 0 otherwise | This flag is not the one that HGSS uses when the player clears the game. | -| 0132 | | DummyGameCompleted | \- | Sets flag 0x964 | This flag is not the one that HGSS uses when the player clears the game. | -| 0133 | PrepareDoorAnimation | DoorAnimation | u16: Matrix X; u16: Matrix Y; Flex: Map X; Flex: Map Y; u8: Door ID | Prepares a building located at Map X and Map Y coordinates in a map located at Matrix X and Matrix Y in the current matrix for animation, with Door ID animation ID | | -| 0134 | CloseDoor | WaitDoor | u8: Door ID | Wait animation of building with Door ID animation ID | | -| 0135 | MoveDoor | FreeDoor | u8: Door ID | Free animation of building with Door ID animation ID | | -| 0136 | OpenDoor | OpenDoor | u8: Door ID | Triggers first animation of building with Door ID animation ID | | -| 0137 | WaitDoor | CloseDoor | u8: Door ID | Triggers second animation of building with Door ID animation ID | | -| 0138 | | GetDaycareNames | \- | Stores first daycare Pokémon nickname in string buffer 0, the second daycare Pokémon nickname in string buffer 1 and the first Pokémon trainer's name in buffer 2 | If there's only one Pokémon in the daycare, string buffer 1 does not change. If no Pokémon is in the daycare, commands does nothing. | -| 0139 | | GetDaycareStatus | Var: Variable | If daycare Pokémon have an egg, stores 1 in Variable. Otherwise it stores 0 if no Pokémon is in the daycare, 2 if only one Pokémon is in the daycare or 3 if there are two Pokémon | | -| 013A | | InitEcruteakGym \* | | | | -| 013B | | | | ??? Something to do with the Goldenrod Dept. Store Basement, probably moving around blocks or opening access to doors. | | -| 013C | | | | ??? | | -| 013D | | | | | | -| 013E | | CianwoodGymInit \* | | | | -| 013F | | CianwoodGymTurnWinch \* | | | | -| 0140 | | VermilionGymInit \* | | | | -| 0141 | VermillionGymAnimation | VermilionGymLockAction \* | | | | -| 0142 | VermillionGymBin | VermilionGymCanCheck \* | | | | -| 0143 | | ResetVermilionGymCans \* | | | | -| 0144 | | InitVioletGym | \- | Initializes Violet Gym internal data and 3D model animations | | -| 0145 | | VioletGymElevator | \- | Triggers model #111 to move up or down | | -| 0146 | | InitAzaleaGym \* | | | | -| 0147 | AzaleaGym | AzaleaGymSpinarak \* | | | | -| 0148 | AzaleaGym2 | AzaleaGymSwitch \* | | | | -| 0149 | | BlackthornGymInit \* | | | | -| 014A | | FuchsiaGymInit \* | | | | -| 014B | | ViridianGymInit \* | | | | -| 014C | CheckPartyNumber | GetPartyCount | Var: Variable | Stores in Variable the current number of Pokémon in the party | | -| 014D | | BagScreen \* | | | | -| 014E | | BagScreenSelection \* | | | | -| 014F | | CheckPocketItems \* | | | | -| 0150 | | DummyTextBerry \* | | | | -| 0151 | | TextNature? \* | | | | -| 0152 | | SetOWDefaultPosition | Flex: Event ID; Flex: X; Flex: Y | Sets Event ID spawn position to global coords X and Y | | -| 0153 | SetOverworldPosition | SetOWPosition | Flex: Event ID; Flex: X; Flex: Z; Flex: Y; Flex: Dir | Moves Event ID to global coords X, Y, Z with Dir direction | Even though some maps are higher, the Z parameter is often 0. Game seems to calculate the correct Z position if it is wrong. | -| 0154 | | SetOWDefaultMovement | Flex: Event ID; Flex: Movement ID | Sets Event ID's default move code to Movement ID | | -| 0155 | | SetOWDefaultDirection | Flex: Event ID; Flex: Direction ID | Sets Event ID's default direction to Direction ID | | -| 0156 | | SetWarpPosition | Flex: Warp ID; Flex: X; Flex: Y | Moves Warp ID to global coords X and Y | | -| 0157 | | SetSpawnablePosition | Flex: Spawnable ID; Flex: X; Flex: Y | Moves Spawnable ID to global coords X and Y | | -| 0158 | | SetOWDirection | Flex: Event ID; Flex: Direction ID | Sets Event ID's current direction to Direction ID | | -| 0159 | | AddWaitingIcon \* | | | | -| 015A | | RemoveWaitingIcon \* | | | | -| 015B | | ReturnScriptWkSet \* | | | | -| 015C | | WaitTimeOrAB | Flex: Time | Stops script execution until Time frames have passed or until user presses A or B buttons | | -| 015D | ChoosePokemonMenu | ChoosePKMNSelection \* | | | | -| 015E | ChoosePokemonMenu2 | UnionChoosePKMNSelection\* | | | | -| 015F | StorePokemonMenu | GetSelectedPartySlot | Var: Variable | Stores in Variable the selected party slot in a party Pokémon screen, or 0xFF is user cancelled the selection | | -| 0160 | | SelectMove \* | | | | -| 0161 | | GetMoveSelection \* | | | | -| 0162 | StorePokemonNumber | GetPartyPokemonID | Var: Party Position; Var: Variable | Stores in Variable the ID of the Pokémon at Party Position | It will return 0 if Pokémon is an egg. | -| 0163 | CheckIfPokemonTraded | CheckTradedPokemon | Var: Party Position; Var: Variable | Stores 0 in Variable if trainer ID and secret ID of the Pokémon at Party Position are the player's ones, stores 1 otherwise | | -| 0164 | | CountPartyBornPokemon | Var: Variable | Stores in Variable the number of Pokémon in the Pokémon party, excluding the eggs | | -| 0165 | | CountAlivePokemonExceptFirst | Var: Variable; Flex: Party Position | Stores in Variable how many alive Pokémon would remain in the Pokémon party if Pokémon at Party Position disappeared | Eggs are excluded from the count. | -| 0166 | | CountTotalAlivePokemon | Var: Variable | Stores in Variable the number of Pokémon in the Pokémon party and PC boxes, excluding the eggs and fainted Pokémon | As Pokémon can't be fainted in the PC boxes, only eggs are not taken into account in the PC boxes count. | -| 0167 | | CountPartyEggs | Var: Variable | Stores in Variable the number of eggs in the Pokémon party | | -| 0168 | | TakeMoneyFlex | Flex: Money | Subtracts Money from the player's money | | -| 0169 | | RetrieveDayCareMon \* | | | | -| 016A | | GiveLoanMon \* | | | | -| 016B | | CheckReturnLoanMon \* | | | | -| 016C | | DeletePartyPokemon | Flex: Party Position | Deletes the Pokémon at Party Position from the party | The Pokémon data is destroyed. | -| 016D | | RemoveDayCareEgg \* | | | | -| 016E | | GiveDayCareEgg \* | | | | -| 016F | | TextDayCareCost \* | | | | -| 0170 | CheckHiroMoneyNumber | CompareMoneyFlex | Var: Variable; Flex: Money | Returns 1 to Variable if the player has Money or more money, returns 0 otherwise | | -| 0171 | | EggHatchScreen | \- | Opens the egg hatching screen with an egg in the Pokémon party that has 0 steps left for hatching | This may crash if there's no ready egg in the Pokémon party. It's better not to use this command unless you know what are you doing. | -| 0172 | | | | | | -| 0173 | | CheckDaycareLevelGain \* | Var: Variable; Flex: Position | Stores the amount of levels a Pokémon in the Daycare has gained from being in the Daycare | | -| 0174 | | GetDayCareSpeciesandNick \* | | | | -| 0175 | | GiveDayCareMon \* | | | | -| 0176 | | UnvanishOverworld | Flex: Event ID | Makes Event ID visible again if it was invisible | Can be used on Following Pokémon. Useful for scripting events that happen as soon as the player walks into a buidling and their Following Pokémon hasn't spawned yet. The Following Pokémon will "unvanish" on the same tile as the player, so account for this in movement scripts. | -| 0177 | | VanishOverworld | Flex: Event ID | Makes Event ID invisible, but still collisionable | It's a great idea to use this command in a level script for blocking doors with invisible events. | -| 0178 | OpenMail | MailScreen | \- | Opens the mail screen | | -| 0179 | CheckMail | CountMail | Var: Variable | Stores in Variable the current amount of mails in the mailbox | | -| 017A | | RankingView \* | | | | -| 017B | | GetTimePeriod | Var: Variable | Stores in Variable the current time period of the day | The different values are:
0: From 04:00 AM to 09:59 AM (Morning)
1: From 10:00 AM to 04:59 PM (Noon)
2: From 05:00 PM to 07:59 PM (Evening)
3: From 08:00 PM to 11:59 PM (Night)
4: From 00:00 AM to 03:59 AM (Midnight) | -| 017C | | GetRandom | Var: Variable; Flex: Range | Generates a random number between 0 and Range \- 1, and stores it in Variable | | -| 017D | | DummyGetRandom | Var: Variable; Flex: Range | Generates a random number between 0 and Range \- 1, and stores it in Variable | Exactly the same code as the command above. | -| 017E | | GetPokemonHappiness | Var: Variable; Flex: Party Position | Stores in Variable the happiness of Pokémon in Party Position | | -| 017F | | AddHappiness | Flex: Happiness; Flex: Party Position | Adds Happiness to the happiness of Pokémon in Party Position | | -| 0180 | | SubHappiness | Flex: Happiness; Flex: Party Position | Subs Happiness to the happiness of Pokémon in Party Position | | -| 0181 | | TextDayCareMonStats \* | | | | -| 0182 | | GetPlayerDirection | Var: Variable | Stores in Variable the direction the player is looking at | Predicted. Seeing up gives 0, seeing down gives 1, seeing left gives 2 and seeing right gives 3. | -| 0183 | | GetDayCareMonCompatibility \* | | | | -| 0184 | | CheckDayCareEgg \* | | | | -| 0185 | | CheckBornPokemonInParty | Flex: Pokémon; Var: Variable | Stores 1 in Variable if Pokémon is currently in the Pokémon party, stores 0 otherwise | Eggs do not count as Pokémon, so they will be ignored. | -| 0186 | | CheckPokemonSizeRecord | Var: Variable; Flex: Party Position | Stores 0 in Variable if Pokémon at Party Position does not have a bigger relative size than player's record, stores 1 if it's the same size and stores 2 if it has a bigger relative size | | -| 0187 | | SetPokemonSizeRecord | Flex: Party Position | Stores the relative size of Pokémon at Party Position as player's record | | -| 0188 | ComparePokemonHeight | TextPartyPokemonSize | Flex: Integer String Buffer; Flex: Decimal String Buffer; Flex: Party Position | Stores the integer part of Pokémon at Party Position size in Integer String Buffer (1 to 3 digits) and the decimal part of the size in Decimal String Buffer (1 digit) | | -| 0189 | CheckPokemonHeight | TextPokemonRecordSize | Flex: Integer String Buffer; Flex: Decimal String Buffer; Flex: Pokémon ID | Stores the integer part of player's record size, normalized to Pokémon ID range, in Integer String Buffer (1 to 3 digits) and the decimal part of the size in Decimal String Buffer (1 digit) | | -| 018A | ChoosePokemonDelete | | | | | -| 018B | StoreDeleteMove | | | | | -| 018C | CheckMoveNumber | CountPokemonMoves | Var: Variable; Flex: Party Position | Stores in Variable the total amount of moves that the Pokémon at Party Position currently has | | -| 018D | DeleteMove | DeleteMove | Flex: Party Position; Flex: Move Slot | Deletes the move in Move Slot from the Pokémon at Party Position | | -| 018E | | GetPartyPokemonMove | Var: Variable; Flex: Party Position; Flex: Move Slot | Stores in Variable the ID of the move in Move Slot from the Pokémon at Party Position | | -| 018F | SetVariableDeleteMove | TextPartyPokemonMove | u8: String Buffer; Flex: Party Position; Flex: Move Slot | Stores the name of the move in Move Slot from the Pokémon at Party Position in String Buffer | | -| 0190 | | Strength | Command format depends on the first parameter:
u8: 0
u8: 1
u8: 2; Var: Variable | Function depends on the first parameter:
0: Disables Strength so player can no longer move boulders
1: Allows the player to automatically move Strength boulders
2: Checks if Strength is activated, store answer in Variable | | -| 0191 | | FlashAction \* | Command format depends on the first parameter:
u8: 0
u8: 1
u8: 2; Var: Variable | Function depends on the first parameter:
0: Clears the Flash system flag
1: Sets the Flash system flag
2: Checks if Flash is activated, store answer in Variable | | -| 0192 | | DefogAction \* | Command format depends on the first parameter:
u8: 0
u8: 1
u8: 2; Var: Variable | Function depends on the first parameter:
0: Clears the Defog system flag
1: Sets the Defog system flag
2: Checks if Defog is activated, store answer in Variable | | -| 0193 | | GiveAccessory \* | | | | -| 0194 | GiveItemStored | CheckGivenAccessory \* | | | | -| 0195 | | CheckAccessory \* | | | | -| 0196 | | GiveBGAccessory \* | | | | -| 0197 | | CheckBGAccessory \* | | | | -| 0198 | | | | | | -| 0199 | | | | | | -| 019A | | | | | | -| 019B | | | | | | -| 019C | | | | | | -| 019D | | | | | | -| 019E | | | | | | -| 019F | | | | | | -| 01A0 | | | | | | -| 01A1 | | | | | | -| 01A2 | | | | | | -| 01A3 | | | | | | -| 01A4 | | | | | | -| 01A5 | | | | | | -| 01A6 | | | | | | -| 01A7 | | CheckCompleteJohtoDex | Var: Variable | Stores 1 in Variable if every Pokémon in the Johto Pokédex has been seen, stores 0 otherwise | | -| 01A8 | | CheckCompleteNationalDex | Var: Variable | Stores 1 in Variable if every Pokémon in the National Pokédex has been caught, stores 0 otherwise | | -| 01A9 | | OpenPokedexScreen \* | | | | -| 01AA | | CheckPokemonMail \* | | | | -| 01AB | | | | | | -| 01AC | | TakePokemonMail \* | | | | -| 01AD | | CountFossils | Var: Variable | Stores in Variable the current amount of fossils in the bag | Technically it's the number of items in the bag whose ID is between 99 and 105. | -| 01AE | | PreparePokeGearCall | Var: ???; Var: ???; Var: ??? | | | -| 01AF | | StartPokeGearCall | \- | Starts the PokéGear phone call that was previously set. | | -| 01B0 | | CheckFossilPokemon | Var: Variable; Flex: Item ID | Stores in Variable the ID of the Pokémon to which Item ID fossil belongs | | -| 01B1 | | CheckFossil | Var: Position; Var: Item ID; Flex: Amount | Stores in Item ID the ID of the first fossil item in the bag that the player has at least Amount quantity of, and stores in Position the amount of fossils in the bag before the first fossil that met the quantity condition | Stores 0 in both variables if there's no fossil in the bag. | -| 01B2 | | CountPokemonUnderLevel | Var: Variable; Flex: Level | Stores in Variable the amount of Pokémon in party whose level is equal or lower than Level | Eggs are completely ignored. | -| 01B3 | | SurvivePoison | Var: Variable; Flex: Party Position | If Pokémon at Party Position is poisoned and at 1 HP, it cures the poison and stores 1 in Variable, otherwise it stores 0 | | -| 01B4 | | FinishOverworldScreen \* | | | | -| 01B5 | | DebugPoketch \* | | | | -| 01B6 | | MessageAllFromArchive \* | | | | -| 01B7 | | MessageFromArchive \* | | | | -| 01B8 | | MessageAllPutPMS \* | | | | -| 01B9 | | | | | | -| 01BA | | | | | | -| 01BB | | | | | | -| 01BC | | | | | | -| 01BD | | GetPreviousHeaderID | Var: Variable | Stores in Variable the header ID of the previous accessed map | | -| 01BE | | GetCurrentHeaderID | Var: Variable | Stores in Variable the header ID of the map the player is in | | -| 01BF | | SetSafariFlag | u8: Flag; u8: Mode | If Flag is 0 safari encounters are activated, if Flag is 1 safari encounters are deactivated, being the own safari encounters if Mode is 0 or using the Safari Zone link if 1 | | -| 01C0 | | BattleRoomWarp \* | | | | -| 01C1 | | ExitBattleRoom \* | | | | -| 01C2 | | GeonetScreen | \- | Opens the Geonet screen | | -| 01C3 | | | | | | -| 01C4 | | ShowPokemonPic | Flex: Pokémon; Flex: Gender | Opens a window with the picture of Pokémon with Gender gender and registers the Pokémon in the Pokédex as seen | 0 = Male or Genderless; 1 = Female | -| 01C5 | | HidePokemonPic | \- | Hides the window of a Pokémon picture | | -| 01C6 | | | | | | -| 01C7 | | | | | | -| 01C8 | | | | | | -| 01C9 | | GetPokemonNature \* | Var: Variable; Flex: Party Position | | | -| 01CA | | CheckPartyNature \* | Var: Variable; Flex: Nature ID | | | -| 01CB | | | | | | -| 01CC | | LoadPokegearData \* | | | | -| 01CD | | SetRebattleTrainerID \* | | | | -| 01CE | | SetRebattleGymLeaderID \* | | | | -| 01CF | | EnableMassOutbreaks \* | | | | -| 01D0 | | AddRoamingPokemon | u8: ID | Activates a roaming Pokemon depending on the ID | Uses ID to determine which roaming Pokémon must appear: 0 for Entei, 1 for Raikou, 2 for Latias and 3 for Latios. | -| 01D1 | | UnionGroup | Command format depends on the first parameter:
u16: 0; Flex: ID; Var: Variable
u16: 1; Flex: ID; Var: Variable
u16: 2; Flex: ID; Flex: String Buffer
u16: 3; Flex: ID; Flex: String Buffer
u16: 4; Var: Variable
u16: 5; Flex: ID
u16: 6
u16: 7; Var: Variable | Function depends on the first parameter:
0: Checks if group ID exists, returns answer in Variable
1: Checks if group ID is accesible, returns answer in Variable
2: Writes group ID name in String Buffer
3: Writes leader's name of Group ID in String Buffer
4: Opens keyboard, stores 1 in Variable if user cancels, 2 if group name already exists, 0 otherwise
5: Enter in group ID
6: Creates a group
7: ??? | This command is the devil. | -| 01D2 | | CheckEggMoves \* | | | | -| 01D3 | ChoosePokemonRem | RememberMoveScreen \* | | | | -| 01D4 | | TeachMovesScreen \* | | | | -| 01D5 | StoreMoveRem | ResponseTeachMove \* | | | | -| 01D6 | | InitTrade | u8: Trade ID | Initializes Trade ID trade data | | -| 01D7 | | GetOfferedPokemon | Var: Variable | Stores in Variable the ID of the offered Pokémon of the current trade data | | -| 01D8 | CheckPokemonTrade | GetRequestedPokemon | Var: Variable | Stores in Variable the ID of the requested Pokémon of the current trade data | | -| 01D9 | TradeChosenPokemon | TradePokemonScreen | Flex: Party Position | Opens the trade Pokémon screen, giving the Pokémon at Party Position and receiving the offered Pokémon of the current trade data | | -| 01DA | StopTrade | EndTrade | \- | Frees the current trade data from the memory | | -| 01DB | | DummyInternationalDex | \- | Nothing | | -| 01DC | | DummyDimorphismDex | \- | Nothing | In fact it does activate a dimorphism flag in the Pokédex data, but since the HGSS Pokédex has the gender comparision by default, command's actual purpose is not noticeable. | -| 01DD | | NationalDex | Command format depends on the first parameter:
u8: 1; Var: Unused
u8: 2; Var: Variable | Function depends on the first parameter:
1: Activates the National Pokédex mode
2: Stores 1 in Variable if player has the National Pokédex, otherwise it stores 0 | | -| 01DE | | CountPokemonRibbons | Var: Variable; Flex: Party Position | Stores in Variable the amount of ribbons that the Pokémon in Party Position has | | -| 01DF | | CountPartyRibbons | Var: Variable | Stores in Variable the total amount of different ribbons in the current Pokémon party | | -| 01E0 | CheckRibbon | CheckRibbon | Var: Variable; Flex: Party Position; Flex: Ribbon | Stores 1 in Variable if the Pokémon in Party Position has the Ribbon ribbon, stores 0 otherwise | | -| 01E1 | GiveRibbon | GiveRibbon | Flex: Party Position; Flex: Ribbon | Gives the Ribbon ribbon to Pokémon in Party Position | | -| 01E2 | | TextRibbon | u8: String Buffer; Flex: Ribbon | Stores the name of the Ribbon in String Buffer | | -| 01E3 | CheckPokemonRibbon | CountPokemonEVs | Var: Variable; Flex: Party Position | Stores in Variable the total amount of effort values of Pokémon in Party Position | Predicted. | -| 01E4 | | GetDayOfWeek | Var: Variable | Stores in Variable the current day of the week | Value 0 is the first possible value and it's for Sunday. | -| 01E5 | | ShowRulesList | Var: Variable | ??? | | -| 01E6 | RBattleRecorder | DummyGetPokemonFootprint | \- | Nothing | | -| 01E7 | | PCHealAnimation | Flex: PokéBalls | Triggers the Pokémon Center healing animation with PokéBalls number of player's Pokémon | | -| 01E8 | | ElevatorAnimation | Flex: Direction; Flex: Count | Triggers the animation of building #208 up (if Direction is 0) or down (if Direction is 1) Count consecutive times | | -| 01E9 | | MysteryGiftGive | Command format depends on the first parameter:
u16: 0
u16: 1; Var: Variable
u16: 2; Var: Variable
u16: 3; Var: Variable
u16: 4
u16: 5; Var: Text File; Var: Text Line
u16: 6; Var: Text File; Var: Text Line
u16: 7
u16: 8 | Function depends on the first parameter:
0: Initializes the data for receiving a Mystery Gift
1: Checks if there is a Mystery Gift, stores answer in Variable
2: Stores the Mystery Gift ID in Variable
3: Checks if player can receive the Mystery Gift, stores answer in Variable
4: Gives the Mystery Gift to the player
5: Shows the succeed text at Text File file and Text Line slot
6: Shows the unable text at Text File file and Text Line slot
7: Ends the Mystery Gift process
8: Saves data and ends the Mystery Gift process | This one too. | -| 01EA | | | | | | -| 01EB | | | | | | -| 01EC | | | | | | -| 01ED | | | | | | -| 01EE | | | | | | -| 01EF | CheckVersion | CheckVersion | Var: Variable | Returns 0x7 to Variable if game is HeartGold, 0x8 if SoulSilver | | -| 01F0 | | FirstPokemonInParty | Var: Variable | Stores in Variable the slot of the first Pokémon in the party that is not an egg | | -| 01F1 | | CheckPokemonType \* | | | | -| 01F2 | | FirstPrimoPassword \* | | | | -| 01F3 | | SecondPrimoPassword \* | | | | -| 01F4 | | PreparePCAnimation \* | | | | -| 01F5 | | OpenPCAnimation \* | | | | -| 01F6 | | ClosePCAnimation \* | | | | -| 01F7 | | GetLottoNumber | Var: Variable | Stores Lotto random number in Variable | Supposed by analogy with Platinum. | -| 01F8 | | CheckWinLotto | Var: MatchPos; Var: Digits; Var: PC; Flex: Winning Number | Takes a Winning Number as input and responds as follows.
If no matching Pokémon could be found or an error occurs:
MatchPos: 0; Digits: 0; PC: 0.

For all other cases:

If the matching Pokémon is in the Player's party, PC will be assigned 0.
Otherwise, if it's in the Player's Storage System, PC will be assigned 1.

MatchPos stores the zero-based position of the winning Pokémon (either as Party pos or Storage System pos, depending on the value of PC).

When there's a match, the Digits var is assigned the number of matching digits of the Winning Pokémon's PID.
In case of multiple matches, priority is always given to the one with the most matching digits. | Supposed by analogy with Platinum.

To retrieve the exact position of a winning Pokémon in the Storage System, first make sure PC equals 1.

The zero-based PC Page and Position indices can be calculated:

PC Page index = MatchPos / 30
Position in page = MatchPos % 30

where % is the modulo operator. | -| 01F9 | | InitLotto | \- | Generates two random numbers and assigns them to two system lottery variables. | Supposed by analogy with Platinum. | -| 01FA | | BufferBoxPokemonNick \* | | | | -| 01FB | CheckBoxesNumber | CountPCFreeSpace | Var: Variable | Stores in Variable the amount of free Pokémon slots in PC boxes | | -| 01FC | | PalParkControl \* | | | | -| 01FD | | PalParkDepositCountCheck \* | | | | -| 01FE | | PalParkBoxPokemonCaught \* | | | | -| 01FF | StoreFriendParkResult | PalParkScoreResult \* | | | | -| 0200 | | PlayerMovementSavingSet \* | | | | -| 0201 | | PlayerMovementSavingClear \* | | | | -| 0202 | | HallOfFameAnime \* | | | | -| 0203 | | AddTrainerScore \* | | | | -| 0204 | | TextAccessory | u8: String Buffer; Flex: Accesory | Stores Accesory's name in String Buffer | | -| 0205 | | CheckPokemonInParty | Flex: Pokémon; Var: Variable | Stores 1 in Variable if Pokémon (or its egg) is currently in the Pokémon party, stores 0 otherwise | | -| 0206 | | SetDeoxysForm | Flex: Form | Sets every Deoxys in the Pokémon party the Form form | Form 0 is Normal, form 1 is Attack, form 2 is Defense and form 3 is Speed. | -| 0207 | | CheckBurmyForms | Var: Variable | Stores in Variable the number of current different Burmy forms in the Pokémon party | Returns 0 if player has no Burmy in the party, 1 if only one different form, 2 if two different forms and 3 if has three or more Burmy with three different forms. | -| 0208 | | | \- | ??? | Sets a internal flag. | -| 0209 | | | \- | ??? | Resets a internal flag. | -| 020A | | GetHour | Var: Variable | Stores current hour from RTC in Variable | | -| 020B | | ShakeOverworld | Flex: Event ID; Flex: Count; Flex: Time; Flex: X; Flex: Y | Makes Event ID overworld shake Count times in Time frames, moving X horizontally and Y vertically each shake | Event ID must be released before this command in order to see the animation. | -| 020C | | BlinkOverworld | Flex: ???; Flex: ???; Flex: ???; Flex: ???; Flex: ??? | ??? | | -| 020D | | CheckRegis | Var: Variable | Stores 1 in Variable if player has the 3 Regis in the party, stores 0 otherwise | | -| 020E | | | | | | -| 020F | | MessageUnown | u16: Text Slot | Display line Text Slot from the text file with the Unown font | Predicted. | -| 0210 | | CheckGBACartidge | Var: Variable | Stores the current GBA cartridge ID in Variable | Stores 0 if no cartridge, 1 if Pokémon Sapphire, 2 if Pokémon Ruby, 3 if Pokémon Emerald, 4 if Pokémon FireRed and 5 if Pokémon LeafGreen. Somehow it could also set 7 if Pokémon Gold, 8 if Pokémon Silver, 10 if Pokémon Diamond, 11 if Pokémon Pearl, 12 if Pokémon Platinum and 15 if Pokémon Colosseum. | -| 0211 | | GetFirstAlivePokemonSlot | Var: Variable | Stores in Variable the slot of the first Pokémon in the party that is not an egg nor is fainted | Predicted. | -| 0212 | | SetMatrixAlternativeMap | Flex: Alternative ID; u8: Status | Permanently changes a worldmap matrix cell corresponding to Alternative ID if Status is 1, reverts the change if 0 | It only changes the map file value in the matrix, not the map header nor the map height. Seems that the only Alternative ID available values are 0 and 1, corresponding to Mahogany Town and to the Lake of Rage. | -| 0213 | | TextBackgroundName \* | | | | -| 0214 | | CheckCoinsImmediate \* | | | | -| 0215 | | CheckCoins \* | | | | -| 0216 | | AddCoins \* | | | | -| 0217 | | GetPokemonLevel | Var: Result; Flex: Party Slot | Stores into Result the level of the Pokémon at a given Party Slot. | | -| 0218 | | | | | | -| 0219 | | | | | | -| 021A | | | | | | -| 021B | | | | | | -| 021C | | | | | | -| 021D | | TextNumberSp | u8: String Buffer; Flex: Number; u8: Alignment Type; u8: Digits | Stores a Number in String Buffer with Alignment Type alignment and Digits length | Predicted. Alignment Type 0 is left-alignment, 1 is right alignment padded with spaces and 2 is right alignment padded with zeros. Digits is used only in these last two types. | -| 021E | | MonGetContestValue \* | | | | -| 021F | | CheckBirthday | Var: Variable | Stores 1 in Variable if the current day is the player's birthday, stores 0 otherwise | | -| 0220 | | MusicVolumeSet | Flex: Music ID; Flex: Volume | Identifies the BGM Player which is playing Music ID and sets its Volume | | -| 0221 | | CountSeenUnown | Var: Variable | Stores in Variable the number of different seen Unown forms | | -| 0222 | | | | | | -| 0223 | | | | | | -| 0224 | | | | | | -| 0225 | | | | | | -| 0226 | | CountHallOfFameEntries \* | | | | -| 0227 | | | | | | -| 0228 | | | | | | -| 0229 | | | | | | -| 022A | | | | | | -| 022B | | | | | | -| 022C | | | | | Related to move tutor? Possibly BP price check? | -| 022D | | CheckBattlePoints \* | | | | -| 022E | | GiveBP \* | | | | -| 022F | | TakeBP \* | | | | -| 0230 | | CompareBP \* | Flex: ???; Var: ??? | | | -| 0231 | | ShakeCamera | Flex: X Magnitude; Flex: Y Magnitude; Flex: Count; Flex: Time | Shakes the screen vertically and/or horizontally, moving the camera X Magnitude pixels horizontally and Y Magnitude pixels vertically in each shake, with Count total shakes of Time frames each one | Don't abuse this command, as it seems that camera might end up 1 pixel up or down in each animation, especially when Count is an odd number. | -| 0232 | | Battle2vs2 | Flex: Partner Trainer ID; Flex: Trainer 1 ID; Flex: Trainer 2 ID; u8: ??? | Starts a double battle with Partner Trainer ID versus Trainer 1 ID and Trainer 2 ID | Last parameter seems to always be 0x1. | -| 0233 | | | | | | -| 0234 | | | | | | -| 0235 | | | Var: ??? | ??? | | -| 0236 | ChoosePokemonMenuTrade | PartyPokemonTradeScreen | \- | Opens the party Pokémon screen for a trade | | -| 0237 | | GetDPPtPrizeItemIdAndCost \* | | | | -| 0238 | | | | | | -| 0239 | | | | | | -| 023A | | CheckCoinsVar \* | | | | -| 023B | | | | | | -| 023C | | GetUniqueSealsQuantity \* | | | | -| 023D | | DummyActivateMysteryGift \* | | | | -| 023E | | GetOWMovement \* | | | | -| 023F | | | | | | -| 0240 | | | | | | -| 0241 | | | | | | -| 0242 | | | | | | -| 0243 | | | | | | -| 0244 | | TextSealSingular \* | u8: String Buffer; Flex: Seal ID | Stores Seal's singular noun in String Buffer | International release exclusive(supposed). Text archive 15. | -| 0245 | | DummyLockAll \* | | | | -| 0246 | | | | | | -| 0247 | | | | | | -| 0248 | | PartyLegalCheck \* | var: Result | Checks legality of party, at least for WIFI stuff. If RESULT is 1, party check failed and you have an "illegal" mon | Used by the attendants in the PC to check your Pokemon before going into the Union Room, may be used elsewhere too | -| 0249 | | | | | | -| 024A | | | | | | -| 024B | | | \- | ??? | | -| 024C | | LastBattleCheckCaught \* | Var ??? | | | -| 024D | LegendaryBattle | WildBattleSp | Flex: Pokémon; Flex: Level; u8: Shiny Flag | Starts a wild battle against a Pokémon of level Level, and shiny if Shiny Flag is 1 | | -| 024E | | CheckTrainerCardLevel | Var: Variable | Stores in Variable the current trainer card level | | -| 024F | | DummyRideBike | \- | Nothing | Seems to allocate the bike music in the RAM but doesn't play it. | -| 0250 | | | | | | -| 0251 | | ShowSaveBox | \- | Displays the save data box (current map name, player's name, the amount of badges, the Pokédex counter and the play time) | | -| 0252 | | HideSaveBox | \- | Hides the save data box | | -| 0253 | | ScopeMode | u8: Mode | If Mode is 1, activates the scope mode, otherwise the command deactivates the scope mode | The scope mode prevents the game to do certain actions (like reseting system flags) when changing map, and probably it's related with more things. | -| 0254 | | GetFollowingPokeSize | Var: Variable | Stores 0 in Variable if the current following Pokémon is small and can follow the player indoors, stores 1 if it's big and can't follow the player indoors | In fact it returns the second byte of the following Pokémon data files, stored in a/1/4/1.narc, which is the one that the game reads for allowing Pokémon entering in buildings. This command will work even if a SendBackFollowingPoke is used and the following Pokémon is hidden at that moment. | -| 0255 | | | \- | ??? | Draws a heart icon above the following Pokémon. Maybe a dummy command? | -| 0256 | | | u16: ??? | ??? | Parameter must be 1 or 2, otherwise command won't do anything. Seems to trigger a default movement for switching current player's and following Pokémon positions (for example, when using a HM). | -| 0257 | | FollowingPokePCAnimation | \- | Triggers the animation of sending the current following Pokémon back to its PokéBall over the Pokémon Center healing counter | | -| 0258 | StartFriendPark | SendBackFollowingPoke | \- | Triggers the animation of sending the current following Pokémon back to its PokéBall and deactivates the following Pokémon until the game is reset or a warp is used | | -| 0259 | | FollowingPokeFacePlayer | \- | Makes the invoking event look at the player, but with a size limitation | When the following Pokemon has a big size, it won't turn to the player if there is an overworld on the opposite side so it would collide. The checked flag is the second byte of the Parameter 1 field, which could be called "double size overworlds" flag, as it is also used for drawing two grass patches in the tall grass for the following Pokemon. | -| 025A | | LockFollowingPoke | u16: Operation | Releases the following Pokemon animation if Operation is 0, locks the animation otherwise | Predicted comparing ASM with Lock and Release commands. | -| 025B | | WaitFollowingPoke | \- | Waits the following Pokemon to end its last movement | Predicted comparing ASM with Lock and Release commands. | -| 025C | | SetFollowingPokeMovement | u16: Move Code | Changes the following Pokemon default movement to Move Code | The most important movement IDs are 0x30 and 0x38 (following and ghost-following behaviours respectively). | -| 025D | | SetFollowingPokePosition | u8: Position; u8: Direction | Moves the following Pokémon to one tile Position next to player and facing at Direction | For both parameters, up is 0, down is 1, left is 2 and right is 3. | -| 025E | EndFriendPark | BallResetFollowingPoke | \- | Moves the following Pokémon to the current player's position, and triggers the animation of sending the Pokémon out of its PokéBall after the player walks a step | This is commonly used after a different event following the player, so the player sends out the following Pokémon in the next step (instead of forcing it automatically with SendOutFollowingPoke). | -| 025F | | NoBallResetFollowingPoke | \- | Moves the following Pokémon to the current player's position | Almost same as BallResetFollowingPoke, but without the PokéBall animation (exactly like when a small Pokémon spawns after the player uses a warp). | -| 0260 | | SendOutFollowingPoke | \- | Triggers the animation of sending the first non-fainted Pokémon out of its PokéBall and spawns it on the last player position | Seems to be needed for refreshing/forcing its apparition after a Warp on the same map. | -| 0261 | MecScript | | \- | ??? | It's used in a lot of scripts that involve following Pokémon movements, placed at the top of them. Seems that it resets a lot of following Pokémon movement parameters and data. | -| 0262 | | | | | | -| 0263 | | Pokeathlon \* | | | | -| 0264 | | | | | | -| 0265 | | GetPokegearContactRandomGiftBerry \* | | | | -| 0266 | | GetPokegearContactGiftItem \* | | | | -| 0267 | MakePhoto | CameronPhotoScreen \* | | | | -| 0268 | | | | | | -| 0269 | | | | | | -| 026A | CheckAlbumPhoto | CheckAlbumIfFull \* | | | | -| 026B | | CheckRocketCostume \* | | | | -| 026C | | ActivateRocketCostume \* | | | | -| 026D | | | | | | -| 026E | | GetOWDirection | u16: Event ID; Var: Variable | Stores in Variable the current direction which Event ID is facing | Up is 0, Down is 1, Left is 2 and Right is 3. | -| 026F | | ApricornTreeAnimation \* | | | | -| 0270 | | ApricornTreeGetApricorn \* | | | | -| 0271 | | GiveApricornFromTree \* | | | | -| 0272 | | TextApricornName \* | | | | -| 0273 | | | | | | -| 0274 | | | | | | -| 0275 | | | | | | -| 0276 | | | | | | -| 0277 | | | | | | -| 0278 | | CountPartyMonsOfSpecies \* | | | | -| 0279 | | | | | | -| 027A | | | | | | -| 027B | | | | | | -| 027C | | | | | | -| 027D | | | | | | -| 027E | | | | | | -| 027F | | | | | | -| 0280 | | | | | | -| 0281 | | SaveWipeExtraChunks \* | | | | -| 0282 | | | Var: Variable | ??? | | -| 0283 | | | | | | -| 0284 | | | | | | -| 0285 | | | | | | -| 0286 | | | | | | -| 0287 | | GetPartySlotWithSpecies \* | var: Slot; u16 or Flex(???): Pokemon ID | Checks party for the presence of a Pokemon, and returns which slot they are in. | Assume that it checks for the first instance and then stops, so if you have multiple of the same Pokemon, it stops at the first instance and returns which slot it is in (0-5). Used in Silph Co. for Rotom | -| 0288 | | | | | | -| 0289 | | OpenScratchCardScreen \* | | | | -| 028A | | CloseScratchCard \* | | | | -| 028B | | GetScratchCardPrize \* | | | | -| 028C | | | | | | -| 028D | | MoveTutorChooseMove \* | | | | -| 028E | | TutorMoveTeachInSlot \* | | | | -| 028F | | TutorMoveGetPrice \* | | | | -| 0290 | | CheckHeadbuttCompatibility | Flex: Party Slot; Var: Variable | Stores 1 into Variable if the Pokémon at the given Party Slot can learn Headbutt. | Ilex Forest Tutor: Script File 92, Script 3 | -| 0291 | | IVCheckerJudge \* | | | | -| 0292 | | BufferStatName \* | | | | -| 0293 | | SetMonForme \* | | | | -| 0294 | | TextTrainerName \* | | | | -| 0295 | | | | | | -| 0296 | | | | | | -| 0297 | | | | | | -| 0298 | | | | | | -| 0299 | | | | | | -| 029A | | | | | | -| 029B | | | | | | -| 029C | | TextTypeName \* | | | | -| 029D | | GetItemQuantity \* | | | | -| 029E | | GetHiddenPowerType \* | | | | -| 029F | | SetFavoriteMon \* | | | | -| 02A0 | | GetFavoriteMon \* | | | | -| 02A1 | | GetOwnedRotomFormes \* | | | | -| 02A2 | | CountTranformedRotomsInParty \* | | | | -| 02A3 | | UpdateRotomForme \* | | | | -| 02A4 | | GetPartyPokemonForm \* | | | | -| 02A5 | | | | | | -| 02A6 | | | | | | -| 02A7 | | | | | | -| 02A8 | | | | | | -| 02A9 | | | | | | -| 02AA | | | | | | -| 02AB | | | | | | -| 02AC | | GetCurrentWeather | Var: Variable | Stores the current weather in Variable | | -| 02AD | | GetPlayerCoordinates \* | | | | -| 02AE | | | | | | -| 02AF | | | | | | -| 02B0 | | CheckFatefulEncounter \* | | | | -| 02B1 | | CommSanitizeParty \* | | | | -| 02B2 | | DayCareSanitizeMon \* | | | | -| 02B3 | | | | | | -| 02B4 | | TextBattleHallStreak \* | | | | -| 02B5 | | BattleHallCountUsedSpecies \* | | | | -| 02B6 | | BattleHallGetTotalStreak \* | | | | -| 02B7 | | | | | | -| 02B8 | | | | | | -| 02B9 | | | | | | -| 02BA | | FollowingPokemonIsEventTrigger \* | | | | -| 02BB | | | | | | -| 02BC | CheckWildBattle2 | | | | | -| 02BD | WildBattle2 | PokemonHasItem \* | | | | -| 02BE | | BattleTowerSetUpMultiBattle \* | | | | -| 02BF | | SetPlayerVolume \* | | | | -| 02C0 | | | | | | -| 02C1 | | | | | | -| 02C2 | | | | | | -| 02C3 | | CheckPokemonIsSeen \* | | | | -| 02C4 | | FloorTrapAnimation | | Triggers Team Rocket HQ trap-floor's graphical effect in the player's current position | | -| 02C5 | | | | | | -| 02C6 | | | | | | -| 02C7 | | TalkFollowingPoke | \- | The following Pokémon triggers a random movement, and then a random following message | This seems to be the command that executes when the player talks to the following Pokémon (at script #163). Files in a/2/2/0.narc link map names to possible texts. The following Pokémon ends up locked, so a Release should be used after this command. | -| 02C8 | | | | | | -| 02C9 | | OpenAlphPuzzle \* | u8: Puzzle ID | Loads the stone-panel puzzle of Puzzle ID. | ID 0 = Kabuto, ID 1 = Aerodactyl, ID 2 = Omanyte, ID 3 = Ho-Oh
Appears to check Flag 2423, 2424, 2425, 2426 for the completion of puzzles 0 to 3 respectively. | -| 02CA | | OpenRuinsofAlphHiddenRoom \* | u8: Room ID | Something to do with the secret room, not the puzzle trapdoor. | ID 0 = Kabuto Room, ID 1 = Aerodactyl Room, ID 2 = Omanyte Room, ID 3 = Ho-Oh Room | -| 02CB | | UpdateDayCareMonOverworlds \* | | | | -| 02CC | | | | | | -| 02CD | | | | | | -| 02CE | | | | | | -| 02CF | | | | | | -| 02D0 | | | | | | -| 02D1 | | | | | | -| 02D2 | | | u8: ???; u8: ???; u16: ???; u16: ???; u16: ??? | ??? | | -| 02D3 | | BoatAnimation | u8: Animation; u8: ???; u16: Header; u16: X coord; u16: Y coord | Plays the S.S. Aqua animation of leaving the port. Animation is either 0 or 1, with 0 being Olivine and 1 being Vermilion. X and Y coordinates are for the destination map | | -| 02D4 | | | | | | -| 02D5 | | | | | | -| 02D6 | | | | | | -| 02D7 | | | Var: Variable | ??? | | -| 02D8 | | | u8: ???; u8: ??? | ??? | | -| 02D9 | | CheckAlivePokemon | Var: Variable | Checks if player has at least 1 not fainted Pokémon, stores the result in Variable | Predicted. | -| 02DA | | CheckFollowingPoke | Var: Variable | Checks if player has a following Pokémon, stores the result in Variable | Supposed. | -| 02DB | | | \- | ??? | | -| 02DC | | | u8: ??? | ??? | | -| 02DD | | | u8: ???; Var: ??? | ??? | | -| 02DE | | | | | | -| 02DF | | CheckKurtApricorn \* | | | If not 0, script continues to check if daily flag is reset, then gives you the apricorns | -| 02E0 | | ClearKurtApricorn \* | | | | -| 02E1 | | GiveApricornBalls \* | | | | -| 02E2 | | CheckApricornCount \* | | | | -| 02E3 | | KurtApricornMenuScreen \* | | | | -| 02E4 | | StoreApricornJuice \* | | | | -| 02E5 | | CheckJuice \* | | | | -| 02E6 | | | | | | -| 02E7 | | | | | | -| 02E8 | | CreatePokeathlonFriendshipRoomStatues \* | | | | -| 02E9 | | TextPokeathlonCourseName \* | | | | -| 02EA | OpenLowScreen | OpenTouchScreen | \- | Changes the low screen design to the green Pokéball background | | -| 02EB | CloseLowScreen | CloseTouchScreen | \- | Sets the default low screen design | | -| 02EC | OpenLowYesNoBox | YesNoTouchScreen | Var: Variable | Opens a Yes-No selection, stores player's answer in Variable | Crashes if OpenTouchScreen is not used previously. | -| 02ED | Multi4 | MultiTouchStandardText | u8: ???; u8: ???; u8: ???; u8: ???; Var: Selection | Prepares a multiple selection menu with text bank #191, returns selected slot ID in Selection | | -| 02EE | Multi5 | MultiTouchLocalText | u8: ???; u8: ???; u8: ???; u8: ???; Var: Selection | Prepares a multiple selection menu with local texts, returns selected slot ID in Selection | | -| 02EF | TextScriptMulti4 | CreateMultiTouchBox | Flex: Text Slot; Flex: Top Screen Text;
Flex: Multi Box Slot | Adds a box with Multi Box Slot ID showing Text Slot text on the bottom screen and Top Screen Text on the top in a message box. Text depends on whether you use MultiTouchStandardText or MultiTouchLocalText | | -| 02F0 | CloseMulti4 | CloseMultiTouch | \- | Closes the multiple selection boxes | | -| 02F1 | | RockSmashItemCheck \* | Flex: ???; Var: ???; Var: ??? | ??? | | -| 02F2 | | | Var: ??? | ??? | | -| 02F3 | | | | | | -| 02F4 | | | | | | -| 02F5 | | | | | | -| 02F6 | | | | | | -| 02F7 | | | | | | -| 02F8 | | | | | | -| 02F9 | | | | | | -| 02FA | | | | | | -| 02FB | | | | | | -| 02FC | | | | | | -| 02FD | | | | | | -| 02FE | | | | | | -| 02FF | | | \- | ??? | | -| 0300 | | | | | | -| 0301 | | | | | | -| 0302 | | | | | | -| 0303 | | | | | | -| 0304 | | | | | | -| 0305 | | RenderCutscene \* | ???: ??? | Renders a cutscene
2 = Arceus stock image cutscene | | -| 0306 | | | | | | -| 0307 | | | | | | -| 0308 | | GiveTogepiEgg \* | | | | -| 0309 | | | | | | -| 030A | | GiveSpikyEaredPichu \* | \- | ??? | | -| 030B | | | | | | -| 030C | | OpenVoltorbFlip \* | | | | -| 030D | | KenyaCheckPartyOrMailbox \* | | | | -| 030E | | MartSell \* | \- | ??? | Related with the mart interface. | -| 030F | | SetFollowPokeInhibitState \* | | | | -| 0310 | | ScriptOverlayCmd \* | | | | -| 0311 | | BugContestAction \* | | | | -| 0312 | | TextBugContestWinner \* | | | | -| 0313 | | JudgeBugContest \* | | | | -| 0314 | | TextBugContestMonNick \* | | | | -| 0315 | | BugContestGetTimeLeft \* | | | | -| 0316 | | IsBugContestantRegistered \* | | | | -| 0317 | | | | | | -| 0318 | | | | | | -| 0319 | TakeMomMoney | TakeMomMoney \* | | | | -| 031A | GiveMomMoney | CheckMomMoneyBalance \* | | | | -| 031B | OpenMomMoneyBox | ShowMomMoney | Flex: X; Flex: Y | Shows mom savings money box at X and Y coordinates of the screen | | -| 031C | CloseMomMoneyBox | HideMomMoney | \- | Hides mom savings money box | | -| 031D | | | | | | -| 031E | | TextRulesetName \* | | | | -| 031F | | | | | | -| 0320 | | | | | | -| 0321 | | | | | | -| 0322 | | | | | | -| 0323 | | | | | | -| 0324 | | UpdateTownMap \* | u8(?): Map Type | Updates the town map to include Kanto
1 = Normal, Johto-only view
2 = Whole map, Kanto included | | -| 0325 | | | | | | -| 0326 | | | | | | -| 0327 | | | | | | -| 0328 | | | | | | -| 0329 | | | | | | -| 032A | | CelebiTimeTravelAnimation \* | | | | -| 032B | | | | | | -| 032C | | | | | | -| 032D | | MomGiftCheck \* | | | | -| 032E | | | | | | -| 032F | | | | | | -| 0330 | | UnownCircle \* | | | | -| 0331 | | | | | | -| 0332 | | InitMystriStageAnimation \* | | | | -| 0333 | | | | | | -| 0334 | | | | | | -| 0335 | | GetBuenasPassword \* | | | | -| 0336 | | | | | | -| 0337 | | | | | | -| 0338 | | | | | | -| 0339 | | GetShinyLeafCount \* | | | | -| 033A | | TryGiveShinyLeafCrown \* | | | | -| 033B | | CheckPokemonNickname \* | Flex: Party Slot; Var: Variable | Checks to see if the Pokémon at Party Slot position has a nickname. The variable will return 0 if the Pokémon does have a nickname. | Example: Script File 913, Function 35 | -| 033C | | | | | | -| 033D | | | Var: ??? | ??? | | -| 033E | | | | | | -| 033F | | | | | | -| 0340 | | | | | | -| 0341 | | | | | | -| 0342 | | | Var: Variable | ??? | | -| 0343 | | | Var: Variable | ??? | | -| 0344 | | CheckJadeOrbRequirements | Var: Variable | Stores 1 in Variable if player has both Kyogre and Groudon in the Pokémon party and they have been caught in Johto, stores 0 otherwise | | -| 0345 | | | Var: Variable | ??? | | -| 0346 | CheckMomMoneyNumber | CheckMoneyFull | u16: Money Account; Var: Variable | Stores 1 in Variable if the chosen money account is full.
Money account 0 = Mom's savings;
Money account 1 = Player; | | -| 0347 | | SystemSetSleepFlag \* | | | | -| 0348 | | | | | | -| 0349 | | | | | | -| 034A | | | | | | -| 034B | | TextItemLowercase | u8: String Buffer; Flex: Item | Stores Item's lowercase name in String Buffer | International release exclusive. | -| 034C | | TextItemPlural | u8: String Buffer; Flex: Item | Stores Item's plural noun in String Buffer | International release exclusive. | -| 034D | | TextPartyPokemonDefault | u8: String Buffer; Flex: Party position | Stores the name of the Pokémon in Party Position in String Buffer with default color tags encoding | International release exclusive. Names stored at text file 238. | -| 034E | | | | | International release exclusive. | -| 034F | | | u8: String Buffer | ??? | International release exclusive. | -| 0350 | | | u8: String Buffer; Flex: Accesory | ??? | International release exclusive. | -| 0351 | | TextTrainerClass | u8: String Buffer; Flex: Trainer class | Stores Trainer class' lowercase noun in String Buffer | International release exclusive. | -| 0352 | | TextSealPlural | u8: String Buffer; Flex: Seal | Stores Seal's plural noun in String Buffer | International release exclusive. Text archive 16. | -| 0353 | | TextCapitalize | u8: String Buffer | Capitalizes the string currently stored in String Buffer | International release exclusive. | -| 0354 | | TextFloor | u8: String Buffer; u8: Floor | Stores Floor's name in String Buffer | International release exclusive. Names stored at text file 191, lines 0x74 to 0x7A. | \ No newline at end of file +| | New proposed names | Parameters | Function | Notes | +| ---- | ---------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| 0000 | Nop | \- | Nothing | | +| 0001 | Dummy | \- | Nothing | Has exactly the same ASM code as Nop. | +| 0002 | End | \- | End script execution | | +| 0003 | WaitTime | u16: Time; Var: ??? | Stop script execution for Time frames | The Var's purpose is unknown. Command uses ScrReg 0 as countdown. | +| 0004 | RegValueSet | u8: Script Register; u8: Value | Assigns Value to Script Register value | | +| 0005 | RegDataSet | u8: Script Register; u32: Value | Assigns Value to Script Register value | | +| 0006 | RegAdrsSet | u8: Script Register; u32: Address | Assigns data in Address offset to Script Register value | | +| 0007 | AdrsValueSet | u32: Address; u8: Value | Assigns Value to the Address offset | | +| 0008 | AdrsRegSet | u32: Address; u8: Script Register | Assigns Script Register value to the Address offset | | +| 0009 | RegRegSet | u8: Script Register 1; u8: Script Register 2 | Assigns Script Register 2 value to Script Register 1 value | | +| 000A | AdrsAdrsSet | u32: Address 1; u32: Address 2 | Assigns data in Address 2 to the Address 1 offset | | +| 000B | CompareRegs | u8: Script Register; u8: Script Register | Compares two Script Register | | +| 000C | CompareRegValue | u8: Script Register; u8: Value | Compares Script Register value with Value | | +| 000D | CompareRegAdrs | u8: Script Register; u32: Address | Compares Script Register value with data in Address | | +| 000E | CompareAdrsReg | u32: Address; u8: Script Register | Compares data in Address with Script Register value | | +| 000F | CompareAdrsValue | u32: Address; u8: Value | Compares data in Address with Value | | +| 0010 | CompareAdrsAdrs | u32: Address 1; u32: Address 2 | Compares data in Address 1 with data in Address 2 | | +| 0011 | CompareVarValue | Var: Variable; u16: Value | Compares Variable value with Value | | +| 0012 | CompareVars | Var: Variable 1; Var: Variable 2 | Compares Variable 1 value with Variable 2 value | | +| 0013 | ParallelCommonScript | u16: ??? | ??? | Somehow related with parallel common script execution. | +| 0014 | CommonScript | u16: Global Script ID | Calls Global Script ID script | The Common Script table is located at 0xFA48C in IPKS arm9.bin, ordered from highest to lowest with structure: u16 Global Script ID | u16 Script file | u16 Text file. The executed script inside script file is determined as: used Global Script ID \- tabulated Global Script ID. | +| 0015 | LocalScript | \- | Returns to the invoking script/function after a Common Script | | +| 0016 | Jump | u32: Relative Jump | Jumps to a function, Relative Jump bytes forward or backward | Relative Jump can have negative values (backward jump). | +| 0017 | JumpIfObjID | u8: Event ID; u32: Relative Jump | Jumps to a function, Relative Jump bytes forward or backward, if invoking event has Event ID as ID | | +| 0018 | JumpIfBgID | u8: ???; u32: Relative Jump | ??? | Maybe jumps to a function if invoking event has a specific ID. | +| 0019 | JumpIfPlayerDir | u8: Player Direction; u32: Relative Jump | Jumps to a function, Relative Jump bytes forward or backward, if player is looking in Player Direction | Supposed. Needs to be tested in game. | +| 001A | Call | u32: Relative Jump | Calls a function, Relative Jump bytes forward or backward | Can be used to make loops when calling the own invoking function. | +| 001B | Return | \- | Returns to the invoking script/function after a Call | | +| 001C | JumpIf | u8: Condition; u32: Relative Jump | If Condition in the condition table, jumps to a function | Ask AdAstra for the condition list. Condition table is updated after a IfVarValue, IfVarVar, CheckFlag... | +| 001D | CallIf | u8: Condition; u32: Relative Jump | If Condition in the condition table, calls a function | | +| 001E | SetFlag | u16: Flag | Sets Flag to 1 | | +| 001F | ClearFlag | u16: Flag | Sets Flag to 0 | | +| 0020 | CheckFlag | u16: Flag | Checks if Flag is set | It updates the internal condition flag and maybe part of the condition table. | +| 0021 | SetFlagFromVar | Var: Flag | Sets the flag whose ID is stored in Flag | | +| 0022 | ClearFlagFromVar | Var: Flag | Clears the flag whose ID is stored in Flag | | +| 0023 | FlagStatusToVar | Var: Flag; Var: Variable | Checks if Flag is set and store the result in Variable | | +| 0024 | SetTrainerFlag | Flex: Trainer ID | Sets the flag of Trainer ID, so marks it as beaten trainer | So this trainer will not battle against you. Used in every Gym after the leader is beaten. | +| 0025 | ClearTrainerFlag | Flex: Trainer ID | Clears the flag of Trainer ID, so marks it as unbeaten trainer | So this trainer can be challenged again. | +| 0026 | CheckTrainerFlag | Flex: Trainer ID | Checks if Trainer ID has been beaten | It updates the internal condition flag and maybe part of the condition table. | +| 0027 | IncrementVar | Var: Variable; Flex: Operand | Stores the operation Variable \+ Operand in Variable | | +| 0028 | DecrementVar | Var: Variable; Flex: Operand | Stores the operation Variable \- Operand in Variable | | +| 0029 | SetVar | Var: Variable; u16: Value | Stores Value in Variable | | +| 002A | SetVarFromVariable | Var: Variable 1; Var: Variable 2 | Assigns value of Variable 2 to Variable 1 | | +| 002B | SetVarFromFlexible | Var: Variable; Flex: Flexible Value | Stores Flexible Value (or its value if variable) in Variable | | +| 002C | MessageAll | u8: Text Slot | Display line Text Slot from the text file, all at once | | +| 002D | Message | u8: Text Slot | Display line Text Slot from the text file | | +| 002E | MessageFlex | Flex: Text Slot | Display line Text Slot from the text file | Unlike 002D, this command also accepts a variable as the input field. | +| 002F | MessageNoSkip | Flex: Text Slot | ??? | | +| 0030 | | u8: Text Slot | ??? | | +| 0031 | WaitAB | \- | Waits for button A or button B to be pressed | Somehow it uses ScrReg 0 as countdown. | +| 0032 | WaitButton | \- | Waits for a button to be pressed | It seems only A, B, X and direction pad buttons work. | +| 0033 | WaitABPad | \- | Waits for button A, button B or pad buttons to be pressed | Supposed. Needs to be tested in game. | +| 0034 | OpenMessage | \- | ??? | | +| 0035 | CloseMessage | \- | Closes message box | SDSME name is misleading, for no button is needed to be pressed. | +| 0036 | FreezeMessage | \- | ??? | Probably keeps the message box alive after a script. ASM differs with CloseMessage only in a BL instruction. | +| 0037 | SetIconBoard | u8: Text Slot; u8: Type; u16: Icon; u16: ??? | Prepares an icon board message box displaying Text Slot message, of Type type, and with Icon image if chosen type supports it | Type values from 0 to 3 are: brown (with icon), green (with icon), gray and blue. | +| 0038 | SetTextBoard | u8: Type; u16: Icon | Prepares a text board message box of Type type, and with Icon image if chosen type supports it | Type values from 0 to 3 are: brown (with icon), green (with icon), gray and blue. | +| 0039 | ShowBoard | u8: Process | Triggers different Process processes for the board | Process value 0 keeps the board, value 1 creates the board, value 2 hides the board, value 3 shows the board and value 4 deletes the board. | +| 003A | WaitBoard | \- | Waits the board last process to end | Supposed. | +| 003B | BoardMessage | u8: Text Slot; u16: Variable | Displays Text Slot message in the current text box, stores the current text box status in Variable | | +| 003C | CloseBoard | Var: Variable | Returns 1 to Variable if the player has pressed a button so the board must close, 0 otherwise | Variable is stored in ScrReg 0. Command waits for a button to be pressed and stores result in Variable. | +| 003D | Menu | \- | | | +| 003E | | u8: ???; u8: ???; u8: ???; u8: ???; u8: ???; u8: ??? | | | +| 003F | YesNoBox | Var: Variable | Opens a Yes-No dialog and stores user response in Variable | Variable is stored in ScrReg 0. | +| 0040 | MultiStandardText | u8: X; u8: Y; u8: Cursor; u8: Cancel; Var: Selection | Prepares a multiple selection menu at X and Y screen position, with Cursor default selected option and possibility of cancelling depending on Cancel, with text bank #321, returns selected slot ID in Selection | If Cancel is 1, the user can select the last option by pressing B button. | +| 0041 | MultiLocalText | u8: X; u8: Y; u8: Cursor; u8: Cancel; Var: Selection | Prepares a multiple selection menu at X and Y screen position, with Cursor default selected option and possibility of cancelling depending on Cancel, with local texts, returns selected slot ID in Selection | If Cancel is 1, the user can select the last option by pressing B button. | +| 0042 | AddMultiOption | u8: Text Slot; u8: Multi Slot | Adds an option with Multi Slot ID showing Text Slot text | | +| 0043 | ShowMulti | \- | Shows the prepared multi in screen | The game will hide it when the player has selected an option. | +| 0044 | ListStandardText | u8: X; u8: Y; u8: Cursor; u8: Cancel; Var: Selection | Prepares a multiple selection list at X and Y screen position, with Cursor default selected option and possibility of cancelling depending on Cancel, with text bank #321, returns selected slot ID in Selection | If Cancel is 1, the user can select the last option by pressing B button. The difference between a Multi and a List seems to be that lists are scrollable. | +| 0045 | ListLocalText | u8: X; u8: Y; u8: Cursor; u8: Cancel; Var: Selection | Prepares a multiple selection list at X and Y screen position, with Cursor default selected option and possibility of cancelling depending on Cancel, with local texts, returns selected slot ID in Selection | If Cancel is 1, the user can select the last option by pressing B button. The difference between a Multi and a List seems to be that lists are scrollable. | +| 0046 | AddListOption | Flex: Option MSG; Flex: Highlight MSG; Flex: List Slot | Adds a new option to the list, with List Slot ID and showing text line Option MSG. It also displays text line Highlight MSG when that option is highlighted. | If Highlight MSG is set to 255 [0xFF], no message will be displayed when the option is highlighted.
This command relies on an open message box in order to display the highlight messages.

Trying to highlight an option with Highlight MSG different than 255 [0xFF] will result in a crash if no message box is already being displayed. | +| 0047 | ShowList | \- | Shows the prepared list in screen | The game will hide it when the player has selected an option. | +| 0048 | MultiColumn | u8: Columns | Splits the multi window in Columns different columns | | +| 0049 | PlayFanfare | Flex: Sound | Plays Sound | | +| 004A | StopFanfare | Flex: Sound | Stops Sound | | +| 004B | WaitFanfare | Flex: Sound | Waits Sound to finish | | +| 004C | PlayCry | Flex: Pokémon; Flex: Unused | Plays a Pokémon cry | | +| 004D | WaitCry | \- | Waits the current cry to finish | | +| 004E | PlaySound | u16: Sound | Pauses current music, then Plays Sound | | +| 004F | WaitSound | \- | Waits for Sound to finish, then resumes music | | +| 0050 | PlayMusic | u16: Music | Plays Music | | +| 0051 | StopMusic | u16: Unused | Stops current music | Parameter is ignored because the game identifies what music is playing. | +| 0052 | PlayDefaultMusic | \- | Plays map default music | | +| 0053 | SetMusic | u16: Music | ??? | | +| 0054 | FadeOutMusic | u16: Volume; u16: Time | Fades out the current music to Volume in Time frames | | +| 0055 | FadeInMusic | u16: Time | Fades in the current music to normal volume in Time frames | | +| 0056 | SetMusicPauseStatus \* | u8: SSEQ Player ID; u8: Status | ??? | | +| 0057 | TempMusic \* | u16: Music ID | ??? | | +| 0058 | SetBGMFlag \* | u8: ??? | ??? | Seems to set a flag related to the music system. | +| 0059 | CheckChatotCry | Var: Variable | Checks if Chatot has custom sound, stores answer in Variable | Returns 0 or 1 to the specified Variable. Not for a specific Chatot but for all (they share a custom sound). | +| 005A | StartChatotCry | Var: Variable | Starts Chatot microphone record, stores answer in Variable | Returns 0 or 1 to the specified Variable depending on successful recording. | +| 005B | StopChatotCry | \- | Stops recording Chatot custom sound | | +| 005C | SaveChatotCry | \- | ??? | Maybe saves the custom Chatot sound in the savegame. | +| 005D | | \- | ??? | | +| 005E | Movement | Flex: Event ID; u32: Relative Jump | Applies movement at Relative Jump to Event ID | Movements must be halfword-aligned in the script file. If you're using an old tool which doesn't align them, force the alignment with a TextPlayerName 0x0 or some unnoticeable command of 3, 5, 7 or 9 bytes length. | +| 005F | WaitMovement | \- | Waits for all movements to finish | | +| 0060 | LockAll | \- | Locks every event in the map | | +| 0061 | ReleaseAll | \- | Releases every event in the map | | +| 0062 | Lock | u16: Event ID | Locks Event ID | | +| 0063 | Release | u16: Event ID | Releases Event ID | | +| 0064 | AddOW | Flex: Event ID | Add Event ID overworld in the map | It is probable that, if executing this having Event ID overworld already in the map, it gets duplicated. | +| 0065 | RemoveOW | Flex: Event ID | Removes Event ID overworld from the map | | +| 0066 | LockCamera | Flex: X; Flex: Y | Locks the camera at position X and Y | Seems to place a invisible NPC at coords X and Y. It appears that both must be the current player position. | +| 0067 | ReleaseCamera | \- | Releases the camera | | +| 0068 | FacePlayer | \- | Makes the invoking event look at the player | In fact it simply takes the current player direction and makes the NPC look at the opposite direction. | +| 0069 | GetPlayerPosition | Var: X; Var: Y | Saves the current player position in X and Y | | +| 006A | GetOWPosition | Flex: Event ID; Var: X; Var: Y | Saves the current Event ID position in X and Y | If Event ID is deleted (via RemoveOW) it gives 0xFF for both coordinates. | +| 006B | SetFollowingOverworld \* | Flex: X; Flex: Z; Flex: Y | ??? | Maybe teleports the player to other coords? | +| 006C | KeepOverworld | Flex: Event ID; u8: Value | If Value is 1, prevents Event ID from disappearing when entering on a new map header | | +| 006D | SetOWMovement | Flex: Event ID; u16: Movement | Changes the Event ID's movement number to Movement | | +| 006E | GiveMoney | u32: Money | Adds Money to the player's money | | +| 006F | TakeMoney | u32: Money | Subtracts Money from the player's money | | +| 0070 | CompareMoney | Var: Variable; u32: Money | Stores 1 into Variable if the player has Money or more money. Stores 0 otherwise. | | +| 0071 | ShowMoney | Flex: X; Flex: Y | Shows the money box at X and Y coordinates of the screen | Each X and Y unit implies 8 pixels. Values of 0 or higher than the screen may glitch the screen. | +| 0072 | HideMoney | \- | Hides the money box | | +| 0073 | UpdateMoney | \- | Updates the current money in the money box | | +| 0074 | ShowSpecialCurrency | u8: Currency; Flex: X Coord; Flex: Y Coord | Shows the Currency box at X and Y coordinates of the screen. | Currency:

0 = Coins
1 = Battle Points
2 = Athlete Points | +| 0075 | HideSpecialCurrency | \- | Hides the currently displayed special currency box. | | +| 0076 | UpdateSpecialCurrency | u16: Currency | Updates the current Currency in the currency box. | Currency types are the same as above [0074]. | +| 0077 | CheckCoins | Var: Variable | Stores the current casino coin amount in Variable | | +| 0078 | GiveCoins | Flex: Coins | Adds Coins to the player's casino coins | | +| 0079 | TakeCoins | Flex: Coins | Subtracts Coins from the player's casino coins | | +| 007A | GiveAthletePoints | Flex: Amount | Adds the given Amount to the player's Athlete Points | | +| 007B | TakeAthletePoints | Flex: Amount | Subtracts the given Amount from the player's Athlete Points | | +| 007C | CompareAthletePoints | Var: Result; Flex: Amount | Stores 1 into Variable if the player has the given Amount of Athlete Points or more. Stores 0 otherwise. | | +| 007D | GiveItem | Flex: Item; Flex: Amount; Var: Variable | Adds Amount of Item item, stores 1 in Variable if the player had less than 1000 - Amount (100 - Amount if TM/HM), stores 0 otherwise | Both Item and Amount are flexible, but if you use CommonScript 0x7F1 after that (as it is meant to be) you must place these two values in 0x8004 and 0x8005 in order to make the script work properly. | +| 007E | TakeItem | Flex: Item; Flex: Amount; Var: Variable | Subs Amount of Item item, stores 1 in Variable if the player had at least Amount items in the bag, stores 0 otherwise | | +| 007F | CheckItemSpace | Flex: Item; Flex: Amount; Var: Variable | Stores 1 in Variable if the player has less than 1000 - Amount of Item items (100 - Amount if TM/HM), stores 0 otherwise | | +| 0080 | CheckItem | Flex: Item; Flex: Amount; Var: Variable | Stores 1 in Variable if the player has at least Amount of Item items in the bag, stores 0 otherwise | Even if the Amount to check for is 0, the check will return 0 if you don't have the item at all. | +| 0081 | CheckItemIsMachine | Flex: Item; Var: Variable | Stores 1 in Variable if Item is TM or HM, stores 0 otherwise | | +| 0082 | GetItemPocket | Flex: Item; Var: Variable | Stores the bag pocket of Item in Variable | | +| 0083 | SetStarter | Flex: Pokémon | Stores Pokémon as the starting Pokémon in the game save data | | +| 0084 | GenderMessage | u8: Male Text; u8: Female Text | Displays Male Text or Female Text message depending on player's gender | | +| 0085 | CheckSeals \* | Flex: Seal ID; Var: Number of Seals in Seal Case | Checks the number of a certain type of Ball Seals that the player has. The variable is the output of how many Seals you have. | Example: Farmhouse on Route 39 | +| 0086 | GiveSeals \* | Flex: Seal ID; Flex: Number of Seals to be Given | Gives the player Ball Seals. | Example: Farmhouse on Route 39 | +| 0087 | GiveRandomSeals \* | Var: Random Seal ID 1; Var: Random Seal ID 2; Var: Random Seal ID 3 | Generates three random types of Ball Seals and gives them to the player (repeats are possible). Each variable will yield a 0 if the player has no more room for the Seal(s) in the Seal Case. | Example: House in top right of Olivine City | +| 0088 | CheckPokemonForm \* | Flex: Party Position; Var: Variable | Checks the form of the Pokemon in party slot Party Position and returns the form ID in Variable. | | +| 0089 | GivePokemon | Flex: Pokémon; Flex: Level; Flex: Item ID; Flex: Form; Flex: Ability; Var: Variable | Gives Pokémon at level Level, store 1 in Variable if succeed and 0 otherwise | | +| 008A | GivePokemonEgg | Flex: Pokémon; Flex: Location | Gives a Pokémon egg received from Location text slot at text bank #281 | | +| 008B | ReplaceMove | Flex: Party Slot; Flex: Move Slot; u16: Move ID | Overwrites Move Slot of the Pokémon at the specified Party Slot with Move ID. | Party slot and move slot start at 0 rather than 1, so the ranges are 0-5 and 0-3 respectively.
[https://bulbapedia.bulbagarden.net/wiki/List_of_moves](https://bulbapedia.bulbagarden.net/wiki/List_of_moves) | +| 008C | CheckPokemonHasMove | Var: Variable; Flex: Move ID; Flex: Party Slot | Checks if a Pokémon at the specified Party Slot knows a move with given Move ID.
Stores 1 into Variable if yes, 0 otherwise. | Example: Headbutt tutor in Ilex Forest (Script File 92, Script 3) | +| 008D | CheckMoveInParty | Var: Variable; Flex: Move ID | Checks if any Pokémon in the party knows Move ID move, stores in Variable the position of the first Pokémon that knows it or stores 6 if no Pokémon in the party knows the move | | +| 008E | CheckPokeGearRematch \* | Flex: Phone Number; Var: Variable | | Has something to do with rematches but not sure if it's checking if a rematch is active or the # the rematch is on. Gets used when deciding when to let Gym Leaders appear in the overworld for a photo shoot after they are defeated in the Dojo. | +| 008F | ChooseRivalName | Var: Variable | Opens the keyboard for naming the rival, stores 1 in Variable if user cancels the proccess | | +| 0090 | GetCounterpartSprite | Var: Variable | Stores 97 (Lyra sprite ID) into the Variable if you're playing as Ethan;
Stores 0 (Ethan sprite ID) into the Variable if you're playing as Lyra. | Remember that Overworld Entities with sprite IDs 101 to 116 refer to the value of vars 0x4020-0x402F for the sprite to display. | +| 0091 | UpgradePokegear | u8: Module | Adds the worldmap to the Pokegear if Module is 1, adds the radio if Module is 2 | | +| 0092 | RecordPokegearNumber | Flex: ??? | | | +| 0093 | CheckPokegearNumberRegistered \* | Flex: Phone Number; Var: Variable | Stores 0 into Variable if Phone Number has not been registered, and 1 if it has been registered. | Example: Sabrina in Olivine Harbor (Script File 153, Script 7). Used frequently by Gym Leaders appearing in the overworld. | +| 0094 | | | | | +| 0095 | | | | | +| 0096 | ReturnScreen | \- | Restores the normal overworld screen | | +| 0097 | | | | | +| 0098 | | \- | | | +| 0099 | DressPokemon \* | \- | | | +| 009A | ContestDressupScreen \* | \- | | | +| 009B | DressUpArtworkScreen \* | \- | | | +| 009C | SealCapsuleScreen \* | \- | | | +| 009D | WorldMapScreen | \- | Opens the worldmap screen | | +| 009E | PCBoxScreen \* | \- | | | +| 009F | DrawScreenUnion \* | \- | | | +| 00A0 | TrainerCaseUnion \* | \- | | | +| 00A1 | TradeScreenUnion \* | \- | | | +| 00A2 | RecordMixingUnion \* | \- | | | +| 00A3 | EndGameScreen | \- | Opens the Hall of Fame and game ending screens | | +| 00A4 | HallOfFameData \* | \- | | | +| 00A5 | StoreGTSStatus \* | ??? | | | +| 00A6 | InitWFC \* | ??? | | | +| 00A7 | StarterSelectionScreen | \- | Opens the starter Pokémon selection screen | | +| 00A8 | GetTrainerPathToPlayer \* | Flex: ??? | | | +| 00A9 | TrainerStepTowardsPlayer \* | Flex: ???; Var: Variable | | | +| 00AA | GetTrainerEyeType \* | Var: Variable | | | +| 00AB | GetEyeTrainerNum \* | Flex: ???; Var: Variable | | | +| 00AC | WritePlayerName | Var: Variable | Opens the keyboard for naming the player, stores 1 in Variable if user cancels the proccess | | +| 00AD | WritePokemonName | Flex: Party Position; Var: Variable | Opens the keyboard for naming a Pokémon in Party Position, stores 1 in Variable if user cancels the proccess | | +| 00AE | FadeScreen | u16: Frame Count; u16: Duration; u16: Fade Style; u16: Color | Fades screen to chosen 15-bit Color, using the chosen Fade Style. The transition will render Frame Count images, of Duration length each. | Type 0 for fade in, Type 1 for fade out. Color has 15-bit format. Transition is the number of color changes that the game does in the fading. | +| 00AF | WaitFadeScreen | \- | Waits for the screen fade to end | | +| 00B0 | Warp | Flex: Map; u16: Door; Flex: X; Flex: Y; Flex: Dir | Warps to X and Y position of Map header with initial Dir direction, using Door warp | When Door is 0 it doesn't use any door animation. | +| 00B1 | RockClimbAnimation | Flex: Party Position | Uses rock climb with the Pokémon at Party Position position | | +| 00B2 | SurfAnimation | Flex: Party Position | Uses surf with the Pokémon at Party Position position | | +| 00B3 | WaterfallAnimation | Flex: Party Position | Uses waterfall with the Pokémon at Party Position position | | +| 00B4 | FlyAnimation | u16: Map; Flex: X; Flex: Y | Flies to Map header map, to coordinates X and Y | | +| 00B5 | FlashAnimation | \- | Sets weather to 12 (darkness after flash) and then updates the weather graphics | | +| 00B6 | WhirlpoolAnimation | Flex: Party Position | Uses whirlpool with the Pokémon at Party Position position | | +| 00B7 | CutAnimation | Flex: Party Position | Uses cut with the Pokémon at Party Position position | | +| 00B8 | CheckBike | Var: Variable | Stores 1 in Variable if player is riding the bike, stores 0 otherwise | | +| 00B9 | RideBike | u8: Action | Changes player form from normal to riding the bike if Action is 1, otherwise it sets the normal form to the player | | +| 00BA | CyclingRoad | u8: Action | If Action is 1, the game sets the cycling road flag and moves the player down. Otherwise the flag is deactivated. | | +| 00BB | CheckPlayerForm | Var: Variable | Stores in Variable the current player form | Values 0 is for normal form, value 1 for riding the bike, value 2 for surfing, value 3 for Rocket clothing | +| 00BC | SetPlayerForm | u16: Form | Activates the Form bit in the internal player form data | The purpose of the different bits still needs to be researched. | +| 00BD | UpdatePlayerForm | \- | Updates changes in the internal player form data in the screen | | +| 00BE | TextPlayerName | u8: String Buffer | Stores player's name in String Buffer | | +| 00BF | TextRivalName | u8: String Buffer | Stores rival's name in String Buffer | | +| 00C0 | TextCounterpart | u8: String Buffer | Stores counterpart's name in String Buffer | | +| 00C1 | TextPartyPokemon | u8: String Buffer; Flex: Party Position | Stores the name of the Pokémon in Party Position in String Buffer | | +| 00C2 | TextItem | u8: String Buffer; Flex: Item | Stores Item's name in String Buffer | | +| 00C3 | TextPocket | u8: String Buffer; Flex: Pocket | Stores Pocket's name in String Buffer | | +| 00C4 | TextMachineMove | u8: String Buffer; Flex: Item | Stores the name of the move contained in Item TM/HM in String Buffer | | +| 00C5 | TextMove | u8: String Buffer; Flex: Move | Stores battle Move's name in String Buffer | | +| 00C6 | TextNumber | u8: String Buffer; Flex: Number | Stores a Number in String Buffer | | +| 00C7 | TextPokeNickname | u8: String Buffer; Flex: Party Position | Stores the nickname of the Pokémon in Party Position in String Buffer | | +| 00C8 | | | | | +| 00C9 | TextPlayerTrainerType | u8: String Buffer | Stores player's Union Room trainer type in String Buffer | | +| 00CA | TextPokemon | u8: String Buffer; Flex: Pokémon; u16: Unused; u8: Unused | Stores Pokémon's name in String Buffer | The two Unused parameters are for defining male/female nouns and singular/plural nouns respectively. However both don't apply in this command. | +| 00CB | TextStarterPokemon | u8: String Buffer | Stores the name of the player' starter Pokémon in String Buffer | | +| 00CC | TextRivalStarter | u8: String Buffer | Stores the name of the rival' starter Pokémon in String Buffer | | +| 00CD | TextCounterpartStarter | u8: String Buffer | Stores the name of the counterpart' starter Pokémon in String Buffer | | +| 00CE | CheckStarter | Var: Variable | Stores the starter Pokémon ID in Variable | | +| 00CF | DummyTextGoods | u8: String Buffer; Flex: Unused | Loads an empty string in String Buffer | | +| 00D0 | DummyTextTrap | u8: Unused; Flex: Unused | Nothing | | +| 00D1 | DummyTextTreasure | u8: Unused; Flex: Unused | Nothing | | +| 00D2 | TextMapName | u8: String Buffer; Flex: Map | Stores Map header name in String Buffer | | +| 00D3 | GetSwarmInfo | Var: Map; Var: Pokémon | Selects a zone depending on a random seed, then stores the zone ID in Map and the corresponding swarm Pokémon of that zone in Pokémon | Predicted. Needs to be checked. | +| 00D4 | TrainerID | Var: Variable | Stores the trainer ID number in Variable depending on the script ID | This means you shouldn't use this command in a normal script. | +| 00D5 | TrainerBattle | Flex: Trainer 1; Flex: Trainer 2; u8: Result; u8: ??? | Starts a battle against Trainer 1 and, if Trainer 2 is neither 0 nor the same as Trainer 1, a double battle against both. Continues without warping to Pokemon Center/home if Result is equal to 1. | Your party will also be fully healed after the battle if Result is 1. Example: Cherrygrove City fight with Rival | +| 00D6 | TrainerMessage | Flex: Trainer ID; Flex: Type | Displays the text of Trainer ID trainer at condition Type | The possible Type values are the following (expand the note for see them) | +| 00D7 | TrainerMsgCheck | Var: Noticing; Var: Defeat; Var: One Pokémon | If the script ID corresponds to a single battle trainer, stores 0 in Noticing, 2 in Defeat and 0 in One Pokémon. If it corresponds to a double battle, stores 3, 5 and 6 or 7, 9 and 10 depending on whether it's the first or the second trainer | This means you shouldn't use this command in a normal script. | +| 00D8 | TrainerRematchMsgCheck | Var: Noticing; Var: Defeat; Var: One Pokémon | If the script ID corresponds to a single battle trainer, stores 17 in Noticing, 0 in Defeat and 0 in One Pokémon. If it corresponds to a double battle, stores 18, 0 and 6 or 19, 0 and 10 depending on whether it's the first or the second trainer | This means you shouldn't use this command in a normal script. | +| 00D9 | TrainerTypeCheck | Var: Variable | Stores 0 in Variable if the script ID corresponds to a single battle, stores 1 if it corresponds to a double battle | This means you shouldn't use this command in a normal script. | +| 00DA | TrainerMusic | Flex: Trainer | Plays Trainer's overworld music | It checks if player is in Johto or Kanto for that. | +| 00DB | LostBattle | \- | Return to Pokémon Center or player's house after being defeated | | +| 00DC | CheckBattleIsLost | Var: Variable | Stores 0 in Variable if player has been defeated in battle, stores 1 otherwise | | +| 00DD | CheckDefeatedPokemon | Var: Variable; u8: ??? | Stores 0 in Variable if player defeated or catched the wild Pokemon, stores 1 otherwise | | +| 00DE | Check2vs2 | Var: Variable | Stores 1 in Variable if player has at least 2 not fainted Pokémon, stores 0 otherwise | | +| 00DF | DummyTrainerBattle | \- | Starts a battle against trainer with ID 1 | | +| 00E0 | DummyTrainerFlag | \- | Sets the trainer flag with the same ID as the invoking event | | +| 00E1 | DummyTrainerFlagJump | u32: Relative Jump | Jumps to a function, Relative Jump bytes forward or backward, if trainer flag with the invoking event ID is set | | +| 00E2 | | | | | +| 00E3 | | | | | +| 00E4 | | | | | +| 00E5 | | | | | +| 00E6 | | | | | +| 00E7 | | | | | +| 00E8 | | | | | +| 00E9 | | | | | +| 00EA | | | | | +| 00EB | | | | | +| 00EC | | | | | +| 00ED | | | | | +| 00EE | CheckPokerus | Var: Variable | Stores 1 in Variable if one or more Pokémon in the party are infected with the Pokérus | | +| 00EF | GetPokemonGender | Flex: Party Position; Var: Variable | Stores 0 in Variable if Pokémon at Party Position is male, 1 if is female and 2 if gender is unknown | Unknown gender value is supposed and should be checked. | +| 00F0 | SetElevatorWarp \* | Var: Variable | | | +| 00F1 | GetElevatorFloor | Var: Variable | Stores in Variable the current floor in a elevator | | +| 00F2 | ElevatorBox | u8: X; u8: Y; Var: Variable; Flex: Floor | Shows the current floor number in a box at X and Y coordinates in the screen | Each X and Y unit implies 8 pixels. Values of 0 or higher than the screen may glitch the screen. Variable and Floor parameters have not been tested. | +| 00F3 | CountJohtoDexSeen | Var: Variable | Stores in Variable the total seen Pokemon in the Johto Pokédex | | +| 00F4 | CountJohtoDexObtained | Var: Variable | Stores in Variable the total obtained Pokemon in the Johto Pokédex | | +| 00F5 | CountNationalDexSeen | Var: Variable | Stores in Variable the total seen Pokemon in the National Pokédex | | +| 00F6 | CountNationalDexObtained | Var: Variable | Stores in Variable the total obtained Pokemon in the National Pokédex | | +| 00F7 | DummyNationalDexCheck | \- | Nothing | | +| 00F8 | GetDexProgressMsg | u8: Mode; Var: Message; Var: Unknown | Checks the number of seen Pokémon in the Johto Pokédex (if Mode is 0) or the number of obtained Pokémon in the National Pokédex (otherwise) and stores the corresponding Professor message in Message, also storing 0x4AA in Unknown | | +| 00F9 | WildBattle | Flex: Pokémon; Flex: Level | Starts a wild battle against a Pokémon of level Level | | +| 00FA | WildBattleNoButtons | Flex: Pokémon; Flex: Level | Starts a first wild battle against a Pokémon of level Level | The difference between this and other similar commands is that Bag, Run and Pokémon buttons are disabled. | +| 00FB | CatchTutorial | \- | Starts the catch tutorial battle | | +| 00FC | | | | | +| 00FD | CheckSaveGame | Var: Variable | Stores 0 in Variable if a different savegame exists and it's not possible to save, stores 1 if no previous savegame exists, stores 2 if game has to save a lot of data and stores 3 if game can perform a quick save | | +| 00FE | SaveGame \* | | | | +| 00FF | CheckPortrait \* | | | | +| 0100 | SetPortraitTitle \* | | | | +| 0101 | | | | | +| 0102 | | | | | +| 0103 | | | | | +| 0104 | | | | | +| 0105 | | | | | +| 0106 | | | | | +| 0107 | | | | | +| 0108 | | | | | +| 0109 | | | | | +| 010A | | | | | +| 010B | | | | | +| 010C | | | | | +| 010D | | | | | +| 010E | | | | | +| 010F | | | | | +| 0110 | | | | | +| 0111 | | | | | +| 0112 | | | | | +| 0113 | MartScreen | Flex: Unused | Opens the common mart shopping screen | | +| 0114 | SpMartScreen | Flex: Mart ID | Opens the Mart ID mart shopping screen | Used in the Departament Store for a shop with specific fixed items. At 0x48188 of arm9.bin (IPKS) is the pointer to the shops table, each entry of the table being a pointer to an item table. | +| 0115 | GoodsMartScreen | Flex: Mart ID | Opens the Mart ID goods mart shopping screen | | +| 0116 | SealMartScreen | Flex: Mart ID | Opens the Mart ID seal mart shopping screen | | +| 0117 | DummyLostBattle | \- | Return to Pokémon Center or player's house after being defeated | Same code as LostBattle command. | +| 0118 | SetLastWarp | Flex: Warp ID | Sets map's Warp ID warp as the last used warp | Supposed. This would affect actions like Escape Rope use. | +| 0119 | CheckPlayerGender | Var: Variable | Stores 0 in Variable if player is male, stores 1 if female | | +| 011A | HealPokemon | \- | Heals every Pokémon in the player's party | That does not include the black fade nor the healing sound. | +| 011B | EndWirelessComms \* | | | | +| 011C | EnterBattleRoom \* | | | | +| 011D | SetPlayerDirComm \* | | | | +| 011E | UnionMapChange \* | | | | +| 011F | UnionRoomSpriteScreen \* | | | | +| 0120 | StoreUnionSprite \* | | | | +| 0121 | SetUnionSprite \* | | | | +| 0122 | CheckPokedex | Var: Variable | Stores 1 in Variable if player has the Pokédex, stores 0 otherwise | | +| 0123 | GivePokedex | \- | Gives the Pokédex to the player | | +| 0124 | CheckShoes | Var: Variable | Stores 1 in Variable if player has the running shoes, stores 0 otherwise | | +| 0125 | GiveShoes | \- | Gives the running shoes to the player | | +| 0126 | CheckBadge | Flex: Badge ID; Var: Variable | Checks if player has Badge ID badge, stores result in Variable | | +| 0127 | GiveBadge | Flex: Badge ID | Gives the player Badge ID badge | | +| 0128 | CountBadges | Var: Variable | Stores in Variable the number of badges obtained | | +| 0129 | DummyCheckBag | Var: Variable | Stores 1 in Variable if flag 0x960 is set, stores 0 otherwise | | +| 012A | DummyGiveBag | \- | Sets flag 0x960 | | +| 012B | CheckPartner | Var: Variable | Stores 1 in Variable if the following event flag is activated, stores 0 otherwise | | +| 012C | SetPartner | \- | Activates the following event flag, so you can no longer use the bike, surf, rock climb... | | +| 012D | ClearPartner | \- | Deactivates the following event flag, so you can use the bike, surf, rock climb... again | | +| 012E | CheckStepFlag \* | | | | +| 012F | SetStepFlag \* | | | | +| 0130 | ClearStepFlag \* | | | | +| 0131 | DummyCheckGameCompleted | Var: Variable | Stores 1 in Variable if flag 0x964 is set, stores 0 otherwise | This flag is not the one that HGSS uses when the player clears the game. | +| 0132 | DummyGameCompleted | \- | Sets flag 0x964 | This flag is not the one that HGSS uses when the player clears the game. | +| 0133 | DoorAnimation | u16: Matrix X; u16: Matrix Y; Flex: Map X; Flex: Map Y; u8: Door ID | Prepares a building located at Map X and Map Y coordinates in a map located at Matrix X and Matrix Y in the current matrix for animation, with Door ID animation ID | | +| 0134 | WaitDoor | u8: Door ID | Wait animation of building with Door ID animation ID | | +| 0135 | FreeDoor | u8: Door ID | Free animation of building with Door ID animation ID | | +| 0136 | OpenDoor | u8: Door ID | Triggers first animation of building with Door ID animation ID | | +| 0137 | CloseDoor | u8: Door ID | Triggers second animation of building with Door ID animation ID | | +| 0138 | GetDaycareNames | \- | Stores first daycare Pokémon nickname in string buffer 0, the second daycare Pokémon nickname in string buffer 1 and the first Pokémon trainer's name in buffer 2 | If there's only one Pokémon in the daycare, string buffer 1 does not change. If no Pokémon is in the daycare, commands does nothing. | +| 0139 | GetDaycareStatus | Var: Variable | If daycare Pokémon have an egg, stores 1 in Variable. Otherwise it stores 0 if no Pokémon is in the daycare, 2 if only one Pokémon is in the daycare or 3 if there are two Pokémon | | +| 013A | InitEcruteakGym \* | | | | +| 013B | | | ??? Something to do with the Goldenrod Dept. Store Basement, probably moving around blocks or opening access to doors. | | +| 013C | | | ??? | | +| 013D | | | | | +| 013E | CianwoodGymInit \* | | | | +| 013F | CianwoodGymTurnWinch \* | | | | +| 0140 | VermilionGymInit \* | | | | +| 0141 | VermilionGymLockAction \* | | | | +| 0142 | VermilionGymCanCheck \* | | | | +| 0143 | ResetVermilionGymCans \* | | | | +| 0144 | InitVioletGym | \- | Initializes Violet Gym internal data and 3D model animations | | +| 0145 | VioletGymElevator | \- | Triggers model #111 to move up or down | | +| 0146 | InitAzaleaGym \* | | | | +| 0147 | AzaleaGymSpinarak \* | | | | +| 0148 | AzaleaGymSwitch \* | | | | +| 0149 | BlackthornGymInit \* | | | | +| 014A | FuchsiaGymInit \* | | | | +| 014B | ViridianGymInit \* | | | | +| 014C | GetPartyCount | Var: Variable | Stores in Variable the current number of Pokémon in the party | | +| 014D | BagScreen \* | | | | +| 014E | BagScreenSelection \* | | | | +| 014F | CheckPocketItems \* | | | | +| 0150 | DummyTextBerry \* | | | | +| 0151 | TextNature? \* | | | | +| 0152 | SetOWDefaultPosition | Flex: Event ID; Flex: X; Flex: Y | Sets Event ID spawn position to global coords X and Y | | +| 0153 | SetOWPosition | Flex: Event ID; Flex: X; Flex: Z; Flex: Y; Flex: Dir | Moves Event ID to global coords X, Y, Z with Dir direction | Even though some maps are higher, the Z parameter is often 0. Game seems to calculate the correct Z position if it is wrong. | +| 0154 | SetOWDefaultMovement | Flex: Event ID; Flex: Movement ID | Sets Event ID's default move code to Movement ID | | +| 0155 | SetOWDefaultDirection | Flex: Event ID; Flex: Direction ID | Sets Event ID's default direction to Direction ID | | +| 0156 | SetWarpPosition | Flex: Warp ID; Flex: X; Flex: Y | Moves Warp ID to global coords X and Y | | +| 0157 | SetSpawnablePosition | Flex: Spawnable ID; Flex: X; Flex: Y | Moves Spawnable ID to global coords X and Y | | +| 0158 | SetOWDirection | Flex: Event ID; Flex: Direction ID | Sets Event ID's current direction to Direction ID | | +| 0159 | AddWaitingIcon \* | | | | +| 015A | RemoveWaitingIcon \* | | | | +| 015B | ReturnScriptWkSet \* | | | | +| 015C | WaitTimeOrAB | Flex: Time | Stops script execution until Time frames have passed or until user presses A or B buttons | | +| 015D | ChoosePKMNSelection \* | | | | +| 015E | UnionChoosePKMNSelection\* | | | | +| 015F | GetSelectedPartySlot | Var: Variable | Stores in Variable the selected party slot in a party Pokémon screen, or 0xFF is user cancelled the selection | | +| 0160 | SelectMove \* | | | | +| 0161 | GetMoveSelection \* | | | | +| 0162 | GetPartyPokemonID | Var: Party Position; Var: Variable | Stores in Variable the ID of the Pokémon at Party Position | It will return 0 if Pokémon is an egg. | +| 0163 | CheckTradedPokemon | Var: Party Position; Var: Variable | Stores 0 in Variable if trainer ID and secret ID of the Pokémon at Party Position are the player's ones, stores 1 otherwise | | +| 0164 | CountPartyBornPokemon | Var: Variable | Stores in Variable the number of Pokémon in the Pokémon party, excluding the eggs | | +| 0165 | CountAlivePokemonExceptFirst | Var: Variable; Flex: Party Position | Stores in Variable how many alive Pokémon would remain in the Pokémon party if Pokémon at Party Position disappeared | Eggs are excluded from the count. | +| 0166 | CountTotalAlivePokemon | Var: Variable | Stores in Variable the number of Pokémon in the Pokémon party and PC boxes, excluding the eggs and fainted Pokémon | As Pokémon can't be fainted in the PC boxes, only eggs are not taken into account in the PC boxes count. | +| 0167 | CountPartyEggs | Var: Variable | Stores in Variable the number of eggs in the Pokémon party | | +| 0168 | TakeMoneyFlex | Flex: Money | Subtracts Money from the player's money | | +| 0169 | RetrieveDayCareMon \* | | | | +| 016A | GiveLoanMon \* | | | | +| 016B | CheckReturnLoanMon \* | | | | +| 016C | DeletePartyPokemon | Flex: Party Position | Deletes the Pokémon at Party Position from the party | The Pokémon data is destroyed. | +| 016D | RemoveDayCareEgg \* | | | | +| 016E | GiveDayCareEgg \* | | | | +| 016F | TextDayCareCost \* | | | | +| 0170 | CompareMoneyFlex | Var: Variable; Flex: Money | Returns 1 to Variable if the player has Money or more money, returns 0 otherwise | | +| 0171 | EggHatchScreen | \- | Opens the egg hatching screen with an egg in the Pokémon party that has 0 steps left for hatching | This may crash if there's no ready egg in the Pokémon party. It's better not to use this command unless you know what are you doing. | +| 0172 | | | | | +| 0173 | CheckDaycareLevelGain \* | Var: Variable; Flex: Position | Stores the amount of levels a Pokémon in the Daycare has gained from being in the Daycare | | +| 0174 | GetDayCareSpeciesandNick \* | | | | +| 0175 | GiveDayCareMon \* | | | | +| 0176 | UnvanishOverworld | Flex: Event ID | Makes Event ID visible again if it was invisible | Can be used on Following Pokémon. Useful for scripting events that happen as soon as the player walks into a buidling and their Following Pokémon hasn't spawned yet. The Following Pokémon will "unvanish" on the same tile as the player, so account for this in movement scripts. | +| 0177 | VanishOverworld | Flex: Event ID | Makes Event ID invisible, but still collisionable | It's a great idea to use this command in a level script for blocking doors with invisible events. | +| 0178 | MailScreen | \- | Opens the mail screen | | +| 0179 | CountMail | Var: Variable | Stores in Variable the current amount of mails in the mailbox | | +| 017A | RankingView \* | | | | +| 017B | GetTimePeriod | Var: Variable | Stores in Variable the current time period of the day | The different values are:
0: From 04:00 AM to 09:59 AM (Morning)
1: From 10:00 AM to 04:59 PM (Noon)
2: From 05:00 PM to 07:59 PM (Evening)
3: From 08:00 PM to 11:59 PM (Night)
4: From 00:00 AM to 03:59 AM (Midnight) | +| 017C | GetRandom | Var: Variable; Flex: Range | Generates a random number between 0 and Range \- 1, and stores it in Variable | | +| 017D | DummyGetRandom | Var: Variable; Flex: Range | Generates a random number between 0 and Range \- 1, and stores it in Variable | Exactly the same code as the command above. | +| 017E | GetPokemonHappiness | Var: Variable; Flex: Party Position | Stores in Variable the happiness of Pokémon in Party Position | | +| 017F | AddHappiness | Flex: Happiness; Flex: Party Position | Adds Happiness to the happiness of Pokémon in Party Position | | +| 0180 | SubHappiness | Flex: Happiness; Flex: Party Position | Subs Happiness to the happiness of Pokémon in Party Position | | +| 0181 | TextDayCareMonStats \* | | | | +| 0182 | GetPlayerDirection | Var: Variable | Stores in Variable the direction the player is looking at | Predicted. Seeing up gives 0, seeing down gives 1, seeing left gives 2 and seeing right gives 3. | +| 0183 | GetDayCareMonCompatibility \* | | | | +| 0184 | CheckDayCareEgg \* | | | | +| 0185 | CheckBornPokemonInParty | Flex: Pokémon; Var: Variable | Stores 1 in Variable if Pokémon is currently in the Pokémon party, stores 0 otherwise | Eggs do not count as Pokémon, so they will be ignored. | +| 0186 | CheckPokemonSizeRecord | Var: Variable; Flex: Party Position | Stores 0 in Variable if Pokémon at Party Position does not have a bigger relative size than player's record, stores 1 if it's the same size and stores 2 if it has a bigger relative size | | +| 0187 | SetPokemonSizeRecord | Flex: Party Position | Stores the relative size of Pokémon at Party Position as player's record | | +| 0188 | TextPartyPokemonSize | Flex: Integer String Buffer; Flex: Decimal String Buffer; Flex: Party Position | Stores the integer part of Pokémon at Party Position size in Integer String Buffer (1 to 3 digits) and the decimal part of the size in Decimal String Buffer (1 digit) | | +| 0189 | TextPokemonRecordSize | Flex: Integer String Buffer; Flex: Decimal String Buffer; Flex: Pokémon ID | Stores the integer part of player's record size, normalized to Pokémon ID range, in Integer String Buffer (1 to 3 digits) and the decimal part of the size in Decimal String Buffer (1 digit) | | +| 018A | | | | | +| 018B | | | | | +| 018C | CountPokemonMoves | Var: Variable; Flex: Party Position | Stores in Variable the total amount of moves that the Pokémon at Party Position currently has | | +| 018D | DeleteMove | Flex: Party Position; Flex: Move Slot | Deletes the move in Move Slot from the Pokémon at Party Position | | +| 018E | GetPartyPokemonMove | Var: Variable; Flex: Party Position; Flex: Move Slot | Stores in Variable the ID of the move in Move Slot from the Pokémon at Party Position | | +| 018F | TextPartyPokemonMove | u8: String Buffer; Flex: Party Position; Flex: Move Slot | Stores the name of the move in Move Slot from the Pokémon at Party Position in String Buffer | | +| 0190 | Strength | Command format depends on the first parameter:
u8: 0
u8: 1
u8: 2; Var: Variable | Function depends on the first parameter:
0: Disables Strength so player can no longer move boulders
1: Allows the player to automatically move Strength boulders
2: Checks if Strength is activated, store answer in Variable | | +| 0191 | FlashAction \* | Command format depends on the first parameter:
u8: 0
u8: 1
u8: 2; Var: Variable | Function depends on the first parameter:
0: Clears the Flash system flag
1: Sets the Flash system flag
2: Checks if Flash is activated, store answer in Variable | | +| 0192 | DefogAction \* | Command format depends on the first parameter:
u8: 0
u8: 1
u8: 2; Var: Variable | Function depends on the first parameter:
0: Clears the Defog system flag
1: Sets the Defog system flag
2: Checks if Defog is activated, store answer in Variable | | +| 0193 | GiveAccessory \* | | | | +| 0194 | CheckGivenAccessory \* | | | | +| 0195 | CheckAccessory \* | | | | +| 0196 | GiveBGAccessory \* | | | | +| 0197 | CheckBGAccessory \* | | | | +| 0198 | | | | | +| 0199 | | | | | +| 019A | | | | | +| 019B | | | | | +| 019C | | | | | +| 019D | | | | | +| 019E | | | | | +| 019F | | | | | +| 01A0 | | | | | +| 01A1 | | | | | +| 01A2 | | | | | +| 01A3 | | | | | +| 01A4 | | | | | +| 01A5 | | | | | +| 01A6 | | | | | +| 01A7 | CheckCompleteJohtoDex | Var: Variable | Stores 1 in Variable if every Pokémon in the Johto Pokédex has been seen, stores 0 otherwise | | +| 01A8 | CheckCompleteNationalDex | Var: Variable | Stores 1 in Variable if every Pokémon in the National Pokédex has been caught, stores 0 otherwise | | +| 01A9 | OpenPokedexScreen \* | | | | +| 01AA | CheckPokemonMail \* | | | | +| 01AB | | | | | +| 01AC | TakePokemonMail \* | | | | +| 01AD | CountFossils | Var: Variable | Stores in Variable the current amount of fossils in the bag | Technically it's the number of items in the bag whose ID is between 99 and 105. | +| 01AE | PreparePokeGearCall | Var: ???; Var: ???; Var: ??? | | | +| 01AF | StartPokeGearCall | \- | Starts the PokéGear phone call that was previously set. | | +| 01B0 | CheckFossilPokemon | Var: Variable; Flex: Item ID | Stores in Variable the ID of the Pokémon to which Item ID fossil belongs | | +| 01B1 | CheckFossil | Var: Position; Var: Item ID; Flex: Amount | Stores in Item ID the ID of the first fossil item in the bag that the player has at least Amount quantity of, and stores in Position the amount of fossils in the bag before the first fossil that met the quantity condition | Stores 0 in both variables if there's no fossil in the bag. | +| 01B2 | CountPokemonUnderLevel | Var: Variable; Flex: Level | Stores in Variable the amount of Pokémon in party whose level is equal or lower than Level | Eggs are completely ignored. | +| 01B3 | SurvivePoison | Var: Variable; Flex: Party Position | If Pokémon at Party Position is poisoned and at 1 HP, it cures the poison and stores 1 in Variable, otherwise it stores 0 | | +| 01B4 | FinishOverworldScreen \* | | | | +| 01B5 | DebugPoketch \* | | | | +| 01B6 | MessageAllFromArchive \* | | | | +| 01B7 | MessageFromArchive \* | | | | +| 01B8 | MessageAllPutPMS \* | | | | +| 01B9 | | | | | +| 01BA | | | | | +| 01BB | | | | | +| 01BC | | | | | +| 01BD | GetPreviousHeaderID | Var: Variable | Stores in Variable the header ID of the previous accessed map | | +| 01BE | GetCurrentHeaderID | Var: Variable | Stores in Variable the header ID of the map the player is in | | +| 01BF | SetSafariFlag | u8: Flag; u8: Mode | If Flag is 0 safari encounters are activated, if Flag is 1 safari encounters are deactivated, being the own safari encounters if Mode is 0 or using the Safari Zone link if 1 | | +| 01C0 | BattleRoomWarp \* | | | | +| 01C1 | ExitBattleRoom \* | | | | +| 01C2 | GeonetScreen | \- | Opens the Geonet screen | | +| 01C3 | | | | | +| 01C4 | ShowPokemonPic | Flex: Pokémon; Flex: Gender | Opens a window with the picture of Pokémon with Gender gender and registers the Pokémon in the Pokédex as seen | 0 = Male or Genderless; 1 = Female | +| 01C5 | HidePokemonPic | \- | Hides the window of a Pokémon picture | | +| 01C6 | | | | | +| 01C7 | | | | | +| 01C8 | | | | | +| 01C9 | GetPokemonNature \* | Var: Variable; Flex: Party Position | | | +| 01CA | CheckPartyNature \* | Var: Variable; Flex: Nature ID | | | +| 01CB | | | | | +| 01CC | LoadPokegearData \* | | | | +| 01CD | SetRebattleTrainerID \* | | | | +| 01CE | SetRebattleGymLeaderID \* | | | | +| 01CF | EnableMassOutbreaks \* | | | | +| 01D0 | AddRoamingPokemon | u8: ID | Activates a roaming Pokemon depending on the ID | Uses ID to determine which roaming Pokémon must appear: 0 for Entei, 1 for Raikou, 2 for Latias and 3 for Latios. | +| 01D1 | UnionGroup | Command format depends on the first parameter:
u16: 0; Flex: ID; Var: Variable
u16: 1; Flex: ID; Var: Variable
u16: 2; Flex: ID; Flex: String Buffer
u16: 3; Flex: ID; Flex: String Buffer
u16: 4; Var: Variable
u16: 5; Flex: ID
u16: 6
u16: 7; Var: Variable | Function depends on the first parameter:
0: Checks if group ID exists, returns answer in Variable
1: Checks if group ID is accesible, returns answer in Variable
2: Writes group ID name in String Buffer
3: Writes leader's name of Group ID in String Buffer
4: Opens keyboard, stores 1 in Variable if user cancels, 2 if group name already exists, 0 otherwise
5: Enter in group ID
6: Creates a group
7: ??? | This command is the devil. | +| 01D2 | CheckEggMoves \* | | | | +| 01D3 | RememberMoveScreen \* | | | | +| 01D4 | TeachMovesScreen \* | | | | +| 01D5 | ResponseTeachMove \* | | | | +| 01D6 | InitTrade | u8: Trade ID | Initializes Trade ID trade data | | +| 01D7 | GetOfferedPokemon | Var: Variable | Stores in Variable the ID of the offered Pokémon of the current trade data | | +| 01D8 | GetRequestedPokemon | Var: Variable | Stores in Variable the ID of the requested Pokémon of the current trade data | | +| 01D9 | TradePokemonScreen | Flex: Party Position | Opens the trade Pokémon screen, giving the Pokémon at Party Position and receiving the offered Pokémon of the current trade data | | +| 01DA | EndTrade | \- | Frees the current trade data from the memory | | +| 01DB | DummyInternationalDex | \- | Nothing | | +| 01DC | DummyDimorphismDex | \- | Nothing | In fact it does activate a dimorphism flag in the Pokédex data, but since the HGSS Pokédex has the gender comparision by default, command's actual purpose is not noticeable. | +| 01DD | NationalDex | Command format depends on the first parameter:
u8: 1; Var: Unused
u8: 2; Var: Variable | Function depends on the first parameter:
1: Activates the National Pokédex mode
2: Stores 1 in Variable if player has the National Pokédex, otherwise it stores 0 | | +| 01DE | CountPokemonRibbons | Var: Variable; Flex: Party Position | Stores in Variable the amount of ribbons that the Pokémon in Party Position has | | +| 01DF | CountPartyRibbons | Var: Variable | Stores in Variable the total amount of different ribbons in the current Pokémon party | | +| 01E0 | CheckRibbon | Var: Variable; Flex: Party Position; Flex: Ribbon | Stores 1 in Variable if the Pokémon in Party Position has the Ribbon ribbon, stores 0 otherwise | | +| 01E1 | GiveRibbon | Flex: Party Position; Flex: Ribbon | Gives the Ribbon ribbon to Pokémon in Party Position | | +| 01E2 | TextRibbon | u8: String Buffer; Flex: Ribbon | Stores the name of the Ribbon in String Buffer | | +| 01E3 | CountPokemonEVs | Var: Variable; Flex: Party Position | Stores in Variable the total amount of effort values of Pokémon in Party Position | Predicted. | +| 01E4 | GetDayOfWeek | Var: Variable | Stores in Variable the current day of the week | Value 0 is the first possible value and it's for Sunday. | +| 01E5 | ShowRulesList | Var: Variable | ??? | | +| 01E6 | DummyGetPokemonFootprint | \- | Nothing | | +| 01E7 | PCHealAnimation | Flex: PokéBalls | Triggers the Pokémon Center healing animation with PokéBalls number of player's Pokémon | | +| 01E8 | ElevatorAnimation | Flex: Direction; Flex: Count | Triggers the animation of building #208 up (if Direction is 0) or down (if Direction is 1) Count consecutive times | | +| 01E9 | MysteryGiftGive | Command format depends on the first parameter:
u16: 0
u16: 1; Var: Variable
u16: 2; Var: Variable
u16: 3; Var: Variable
u16: 4
u16: 5; Var: Text File; Var: Text Line
u16: 6; Var: Text File; Var: Text Line
u16: 7
u16: 8 | Function depends on the first parameter:
0: Initializes the data for receiving a Mystery Gift
1: Checks if there is a Mystery Gift, stores answer in Variable
2: Stores the Mystery Gift ID in Variable
3: Checks if player can receive the Mystery Gift, stores answer in Variable
4: Gives the Mystery Gift to the player
5: Shows the succeed text at Text File file and Text Line slot
6: Shows the unable text at Text File file and Text Line slot
7: Ends the Mystery Gift process
8: Saves data and ends the Mystery Gift process | This one too. | +| 01EA | | | | | +| 01EB | | | | | +| 01EC | | | | | +| 01ED | | | | | +| 01EE | | | | | +| 01EF | CheckVersion | Var: Variable | Returns 0x7 to Variable if game is HeartGold, 0x8 if SoulSilver | | +| 01F0 | FirstPokemonInParty | Var: Variable | Stores in Variable the slot of the first Pokémon in the party that is not an egg | | +| 01F1 | CheckPokemonType \* | | | | +| 01F2 | FirstPrimoPassword \* | | | | +| 01F3 | SecondPrimoPassword \* | | | | +| 01F4 | PreparePCAnimation \* | | | | +| 01F5 | OpenPCAnimation \* | | | | +| 01F6 | ClosePCAnimation \* | | | | +| 01F7 | GetLottoNumber | Var: Variable | Stores Lotto random number in Variable | Supposed by analogy with Platinum. | +| 01F8 | CheckWinLotto | Var: MatchPos; Var: Digits; Var: PC; Flex: Winning Number | Takes a Winning Number as input and responds as follows.
If no matching Pokémon could be found or an error occurs:
MatchPos: 0; Digits: 0; PC: 0.

For all other cases:

If the matching Pokémon is in the Player's party, PC will be assigned 0.
Otherwise, if it's in the Player's Storage System, PC will be assigned 1.

MatchPos stores the zero-based position of the winning Pokémon (either as Party pos or Storage System pos, depending on the value of PC).

When there's a match, the Digits var is assigned the number of matching digits of the Winning Pokémon's PID.
In case of multiple matches, priority is always given to the one with the most matching digits. | Supposed by analogy with Platinum.

To retrieve the exact position of a winning Pokémon in the Storage System, first make sure PC equals 1.

The zero-based PC Page and Position indices can be calculated:

PC Page index = MatchPos / 30
Position in page = MatchPos % 30

where % is the modulo operator. | +| 01F9 | InitLotto | \- | Generates two random numbers and assigns them to two system lottery variables. | Supposed by analogy with Platinum. | +| 01FA | BufferBoxPokemonNick \* | | | | +| 01FB | CountPCFreeSpace | Var: Variable | Stores in Variable the amount of free Pokémon slots in PC boxes | | +| 01FC | PalParkControl \* | | | | +| 01FD | PalParkDepositCountCheck \* | | | | +| 01FE | PalParkBoxPokemonCaught \* | | | | +| 01FF | PalParkScoreResult \* | | | | +| 0200 | PlayerMovementSavingSet \* | | | | +| 0201 | PlayerMovementSavingClear \* | | | | +| 0202 | HallOfFameAnime \* | | | | +| 0203 | AddTrainerScore \* | | | | +| 0204 | TextAccessory | u8: String Buffer; Flex: Accesory | Stores Accesory's name in String Buffer | | +| 0205 | CheckPokemonInParty | Flex: Pokémon; Var: Variable | Stores 1 in Variable if Pokémon (or its egg) is currently in the Pokémon party, stores 0 otherwise | | +| 0206 | SetDeoxysForm | Flex: Form | Sets every Deoxys in the Pokémon party the Form form | Form 0 is Normal, form 1 is Attack, form 2 is Defense and form 3 is Speed. | +| 0207 | CheckBurmyForms | Var: Variable | Stores in Variable the number of current different Burmy forms in the Pokémon party | Returns 0 if player has no Burmy in the party, 1 if only one different form, 2 if two different forms and 3 if has three or more Burmy with three different forms. | +| 0208 | | \- | ??? | Sets a internal flag. | +| 0209 | | \- | ??? | Resets a internal flag. | +| 020A | GetHour | Var: Variable | Stores current hour from RTC in Variable | | +| 020B | ShakeOverworld | Flex: Event ID; Flex: Count; Flex: Time; Flex: X; Flex: Y | Makes Event ID overworld shake Count times in Time frames, moving X horizontally and Y vertically each shake | Event ID must be released before this command in order to see the animation. | +| 020C | BlinkOverworld | Flex: ???; Flex: ???; Flex: ???; Flex: ???; Flex: ??? | ??? | | +| 020D | CheckRegis | Var: Variable | Stores 1 in Variable if player has the 3 Regis in the party, stores 0 otherwise | | +| 020E | | | | | +| 020F | MessageUnown | u16: Text Slot | Display line Text Slot from the text file with the Unown font | Predicted. | +| 0210 | CheckGBACartidge | Var: Variable | Stores the current GBA cartridge ID in Variable | Stores 0 if no cartridge, 1 if Pokémon Sapphire, 2 if Pokémon Ruby, 3 if Pokémon Emerald, 4 if Pokémon FireRed and 5 if Pokémon LeafGreen. Somehow it could also set 7 if Pokémon Gold, 8 if Pokémon Silver, 10 if Pokémon Diamond, 11 if Pokémon Pearl, 12 if Pokémon Platinum and 15 if Pokémon Colosseum. | +| 0211 | GetFirstAlivePokemonSlot | Var: Variable | Stores in Variable the slot of the first Pokémon in the party that is not an egg nor is fainted | Predicted. | +| 0212 | SetMatrixAlternativeMap | Flex: Alternative ID; u8: Status | Permanently changes a worldmap matrix cell corresponding to Alternative ID if Status is 1, reverts the change if 0 | It only changes the map file value in the matrix, not the map header nor the map height. Seems that the only Alternative ID available values are 0 and 1, corresponding to Mahogany Town and to the Lake of Rage. | +| 0213 | TextBackgroundName \* | | | | +| 0214 | CheckCoinsImmediate \* | | | | +| 0215 | CheckCoins \* | | | | +| 0216 | AddCoins \* | | | | +| 0217 | GetPokemonLevel | Var: Result; Flex: Party Slot | Stores into Result the level of the Pokémon at a given Party Slot. | | +| 0218 | | | | | +| 0219 | | | | | +| 021A | | | | | +| 021B | | | | | +| 021C | | | | | +| 021D | TextNumberSp | u8: String Buffer; Flex: Number; u8: Alignment Type; u8: Digits | Stores a Number in String Buffer with Alignment Type alignment and Digits length | Predicted. Alignment Type 0 is left-alignment, 1 is right alignment padded with spaces and 2 is right alignment padded with zeros. Digits is used only in these last two types. | +| 021E | MonGetContestValue \* | | | | +| 021F | CheckBirthday | Var: Variable | Stores 1 in Variable if the current day is the player's birthday, stores 0 otherwise | | +| 0220 | MusicVolumeSet | Flex: Music ID; Flex: Volume | Identifies the BGM Player which is playing Music ID and sets its Volume | | +| 0221 | CountSeenUnown | Var: Variable | Stores in Variable the number of different seen Unown forms | | +| 0222 | | | | | +| 0223 | | | | | +| 0224 | | | | | +| 0225 | | | | | +| 0226 | CountHallOfFameEntries \* | | | | +| 0227 | | | | | +| 0228 | | | | | +| 0229 | | | | | +| 022A | | | | | +| 022B | | | | | +| 022C | | | | Related to move tutor? Possibly BP price check? | +| 022D | CheckBattlePoints \* | | | | +| 022E | GiveBP \* | | | | +| 022F | TakeBP \* | | | | +| 0230 | CompareBP \* | Flex: ???; Var: ??? | | | +| 0231 | ShakeCamera | Flex: X Magnitude; Flex: Y Magnitude; Flex: Count; Flex: Time | Shakes the screen vertically and/or horizontally, moving the camera X Magnitude pixels horizontally and Y Magnitude pixels vertically in each shake, with Count total shakes of Time frames each one | Don't abuse this command, as it seems that camera might end up 1 pixel up or down in each animation, especially when Count is an odd number. | +| 0232 | Battle2vs2 | Flex: Partner Trainer ID; Flex: Trainer 1 ID; Flex: Trainer 2 ID; u8: ??? | Starts a double battle with Partner Trainer ID versus Trainer 1 ID and Trainer 2 ID | Last parameter seems to always be 0x1. | +| 0233 | | | | | +| 0234 | | | | | +| 0235 | | Var: ??? | ??? | | +| 0236 | PartyPokemonTradeScreen | \- | Opens the party Pokémon screen for a trade | | +| 0237 | GetDPPtPrizeItemIdAndCost \* | | | | +| 0238 | | | | | +| 0239 | | | | | +| 023A | CheckCoinsVar \* | | | | +| 023B | | | | | +| 023C | GetUniqueSealsQuantity \* | | | | +| 023D | DummyActivateMysteryGift \* | | | | +| 023E | GetOWMovement \* | | | | +| 023F | | | | | +| 0240 | | | | | +| 0241 | | | | | +| 0242 | | | | | +| 0243 | | | | | +| 0244 | TextSealSingular \* | u8: String Buffer; Flex: Seal ID | Stores Seal's singular noun in String Buffer | International release exclusive(supposed). Text archive 15. | +| 0245 | DummyLockAll \* | | | | +| 0246 | | | | | +| 0247 | | | | | +| 0248 | PartyLegalCheck \* | var: Result | Checks legality of party, at least for WIFI stuff. If RESULT is 1, party check failed and you have an "illegal" mon | Used by the attendants in the PC to check your Pokemon before going into the Union Room, may be used elsewhere too | +| 0249 | | | | | +| 024A | | | | | +| 024B | | \- | ??? | | +| 024C | LastBattleCheckCaught \* | Var ??? | | | +| 024D | WildBattleSp | Flex: Pokémon; Flex: Level; u8: Shiny Flag | Starts a wild battle against a Pokémon of level Level, and shiny if Shiny Flag is 1 | | +| 024E | CheckTrainerCardLevel | Var: Variable | Stores in Variable the current trainer card level | | +| 024F | DummyRideBike | \- | Nothing | Seems to allocate the bike music in the RAM but doesn't play it. | +| 0250 | | | | | +| 0251 | ShowSaveBox | \- | Displays the save data box (current map name, player's name, the amount of badges, the Pokédex counter and the play time) | | +| 0252 | HideSaveBox | \- | Hides the save data box | | +| 0253 | ScopeMode | u8: Mode | If Mode is 1, activates the scope mode, otherwise the command deactivates the scope mode | The scope mode prevents the game to do certain actions (like reseting system flags) when changing map, and probably it's related with more things. | +| 0254 | GetFollowingPokeSize | Var: Variable | Stores 0 in Variable if the current following Pokémon is small and can follow the player indoors, stores 1 if it's big and can't follow the player indoors | In fact it returns the second byte of the following Pokémon data files, stored in a/1/4/1.narc, which is the one that the game reads for allowing Pokémon entering in buildings. This command will work even if a SendBackFollowingPoke is used and the following Pokémon is hidden at that moment. | +| 0255 | | \- | ??? | Draws a heart icon above the following Pokémon. Maybe a dummy command? | +| 0256 | | u16: ??? | ??? | Parameter must be 1 or 2, otherwise command won't do anything. Seems to trigger a default movement for switching current player's and following Pokémon positions (for example, when using a HM). | +| 0257 | FollowingPokePCAnimation | \- | Triggers the animation of sending the current following Pokémon back to its PokéBall over the Pokémon Center healing counter | | +| 0258 | SendBackFollowingPoke | \- | Triggers the animation of sending the current following Pokémon back to its PokéBall and deactivates the following Pokémon until the game is reset or a warp is used | | +| 0259 | FollowingPokeFacePlayer | \- | Makes the invoking event look at the player, but with a size limitation | When the following Pokemon has a big size, it won't turn to the player if there is an overworld on the opposite side so it would collide. The checked flag is the second byte of the Parameter 1 field, which could be called "double size overworlds" flag, as it is also used for drawing two grass patches in the tall grass for the following Pokemon. | +| 025A | LockFollowingPoke | u16: Operation | Releases the following Pokemon animation if Operation is 0, locks the animation otherwise | Predicted comparing ASM with Lock and Release commands. | +| 025B | WaitFollowingPoke | \- | Waits the following Pokemon to end its last movement | Predicted comparing ASM with Lock and Release commands. | +| 025C | SetFollowingPokeMovement | u16: Move Code | Changes the following Pokemon default movement to Move Code | The most important movement IDs are 0x30 and 0x38 (following and ghost-following behaviours respectively). | +| 025D | SetFollowingPokePosition | u8: Position; u8: Direction | Moves the following Pokémon to one tile Position next to player and facing at Direction | For both parameters, up is 0, down is 1, left is 2 and right is 3. | +| 025E | BallResetFollowingPoke | \- | Moves the following Pokémon to the current player's position, and triggers the animation of sending the Pokémon out of its PokéBall after the player walks a step | This is commonly used after a different event following the player, so the player sends out the following Pokémon in the next step (instead of forcing it automatically with SendOutFollowingPoke). | +| 025F | NoBallResetFollowingPoke | \- | Moves the following Pokémon to the current player's position | Almost same as BallResetFollowingPoke, but without the PokéBall animation (exactly like when a small Pokémon spawns after the player uses a warp). | +| 0260 | SendOutFollowingPoke | \- | Triggers the animation of sending the first non-fainted Pokémon out of its PokéBall and spawns it on the last player position | Seems to be needed for refreshing/forcing its apparition after a Warp on the same map. | +| 0261 | | \- | ??? | It's used in a lot of scripts that involve following Pokémon movements, placed at the top of them. Seems that it resets a lot of following Pokémon movement parameters and data. | +| 0262 | | | | | +| 0263 | Pokeathlon \* | | | | +| 0264 | | | | | +| 0265 | GetPokegearContactRandomGiftBerry \* | | | | +| 0266 | GetPokegearContactGiftItem \* | | | | +| 0267 | CameronPhotoScreen \* | | | | +| 0268 | | | | | +| 0269 | | | | | +| 026A | CheckAlbumIfFull \* | | | | +| 026B | CheckRocketCostume \* | | | | +| 026C | ActivateRocketCostume \* | | | | +| 026D | | | | | +| 026E | GetOWDirection | u16: Event ID; Var: Variable | Stores in Variable the current direction which Event ID is facing | Up is 0, Down is 1, Left is 2 and Right is 3. | +| 026F | ApricornTreeAnimation \* | | | | +| 0270 | ApricornTreeGetApricorn \* | | | | +| 0271 | GiveApricornFromTree \* | | | | +| 0272 | TextApricornName \* | | | | +| 0273 | | | | | +| 0274 | | | | | +| 0275 | | | | | +| 0276 | | | | | +| 0277 | | | | | +| 0278 | CountPartyMonsOfSpecies \* | | | | +| 0279 | | | | | +| 027A | | | | | +| 027B | | | | | +| 027C | | | | | +| 027D | | | | | +| 027E | | | | | +| 027F | | | | | +| 0280 | | | | | +| 0281 | SaveWipeExtraChunks \* | | | | +| 0282 | | Var: Variable | ??? | | +| 0283 | | | | | +| 0284 | | | | | +| 0285 | | | | | +| 0286 | | | | | +| 0287 | GetPartySlotWithSpecies \* | var: Slot; u16 or Flex(???): Pokemon ID | Checks party for the presence of a Pokemon, and returns which slot they are in. | Assume that it checks for the first instance and then stops, so if you have multiple of the same Pokemon, it stops at the first instance and returns which slot it is in (0-5). Used in Silph Co. for Rotom | +| 0288 | | | | | +| 0289 | OpenScratchCardScreen \* | | | | +| 028A | CloseScratchCard \* | | | | +| 028B | GetScratchCardPrize \* | | | | +| 028C | | | | | +| 028D | MoveTutorChooseMove \* | | | | +| 028E | TutorMoveTeachInSlot \* | | | | +| 028F | TutorMoveGetPrice \* | | | | +| 0290 | CheckHeadbuttCompatibility | Flex: Party Slot; Var: Variable | Stores 1 into Variable if the Pokémon at the given Party Slot can learn Headbutt. | Ilex Forest Tutor: Script File 92, Script 3 | +| 0291 | IVCheckerJudge \* | | | | +| 0292 | BufferStatName \* | | | | +| 0293 | SetMonForme \* | | | | +| 0294 | TextTrainerName \* | | | | +| 0295 | | | | | +| 0296 | | | | | +| 0297 | | | | | +| 0298 | | | | | +| 0299 | | | | | +| 029A | | | | | +| 029B | | | | | +| 029C | TextTypeName \* | | | | +| 029D | GetItemQuantity \* | | | | +| 029E | GetHiddenPowerType \* | | | | +| 029F | SetFavoriteMon \* | | | | +| 02A0 | GetFavoriteMon \* | | | | +| 02A1 | GetOwnedRotomFormes \* | | | | +| 02A2 | CountTranformedRotomsInParty \* | | | | +| 02A3 | UpdateRotomForme \* | | | | +| 02A4 | GetPartyPokemonForm \* | | | | +| 02A5 | | | | | +| 02A6 | | | | | +| 02A7 | | | | | +| 02A8 | | | | | +| 02A9 | | | | | +| 02AA | | | | | +| 02AB | | | | | +| 02AC | GetCurrentWeather | Var: Variable | Stores the current weather in Variable | | +| 02AD | GetPlayerCoordinates \* | | | | +| 02AE | | | | | +| 02AF | | | | | +| 02B0 | CheckFatefulEncounter \* | | | | +| 02B1 | CommSanitizeParty \* | | | | +| 02B2 | DayCareSanitizeMon \* | | | | +| 02B3 | | | | | +| 02B4 | TextBattleHallStreak \* | | | | +| 02B5 | BattleHallCountUsedSpecies \* | | | | +| 02B6 | BattleHallGetTotalStreak \* | | | | +| 02B7 | | | | | +| 02B8 | | | | | +| 02B9 | | | | | +| 02BA | FollowingPokemonIsEventTrigger \* | | | | +| 02BB | | | | | +| 02BC | | | | | +| 02BD | PokemonHasItem \* | | | | +| 02BE | BattleTowerSetUpMultiBattle \* | | | | +| 02BF | SetPlayerVolume \* | | | | +| 02C0 | | | | | +| 02C1 | | | | | +| 02C2 | | | | | +| 02C3 | CheckPokemonIsSeen \* | | | | +| 02C4 | FloorTrapAnimation | | Triggers Team Rocket HQ trap-floor's graphical effect in the player's current position | | +| 02C5 | | | | | +| 02C6 | | | | | +| 02C7 | TalkFollowingPoke | \- | The following Pokémon triggers a random movement, and then a random following message | This seems to be the command that executes when the player talks to the following Pokémon (at script #163). Files in a/2/2/0.narc link map names to possible texts. The following Pokémon ends up locked, so a Release should be used after this command. | +| 02C8 | | | | | +| 02C9 | OpenAlphPuzzle \* | u8: Puzzle ID | Loads the stone-panel puzzle of Puzzle ID. | ID 0 = Kabuto, ID 1 = Aerodactyl, ID 2 = Omanyte, ID 3 = Ho-Oh
Appears to check Flag 2423, 2424, 2425, 2426 for the completion of puzzles 0 to 3 respectively. | +| 02CA | OpenRuinsofAlphHiddenRoom \* | u8: Room ID | Something to do with the secret room, not the puzzle trapdoor. | ID 0 = Kabuto Room, ID 1 = Aerodactyl Room, ID 2 = Omanyte Room, ID 3 = Ho-Oh Room | +| 02CB | UpdateDayCareMonOverworlds \* | | | | +| 02CC | | | | | +| 02CD | | | | | +| 02CE | | | | | +| 02CF | | | | | +| 02D0 | | | | | +| 02D1 | | | | | +| 02D2 | | u8: ???; u8: ???; u16: ???; u16: ???; u16: ??? | ??? | | +| 02D3 | BoatAnimation | u8: Animation; u8: ???; u16: Header; u16: X coord; u16: Y coord | Plays the S.S. Aqua animation of leaving the port. Animation is either 0 or 1, with 0 being Olivine and 1 being Vermilion. X and Y coordinates are for the destination map | | +| 02D4 | | | | | +| 02D5 | | | | | +| 02D6 | | | | | +| 02D7 | | Var: Variable | ??? | | +| 02D8 | | u8: ???; u8: ??? | ??? | | +| 02D9 | CheckAlivePokemon | Var: Variable | Checks if player has at least 1 not fainted Pokémon, stores the result in Variable | Predicted. | +| 02DA | CheckFollowingPoke | Var: Variable | Checks if player has a following Pokémon, stores the result in Variable | Supposed. | +| 02DB | | \- | ??? | | +| 02DC | | u8: ??? | ??? | | +| 02DD | | u8: ???; Var: ??? | ??? | | +| 02DE | | | | | +| 02DF | CheckKurtApricorn \* | | | If not 0, script continues to check if daily flag is reset, then gives you the apricorns | +| 02E0 | ClearKurtApricorn \* | | | | +| 02E1 | GiveApricornBalls \* | | | | +| 02E2 | CheckApricornCount \* | | | | +| 02E3 | KurtApricornMenuScreen \* | | | | +| 02E4 | StoreApricornJuice \* | | | | +| 02E5 | CheckJuice \* | | | | +| 02E6 | | | | | +| 02E7 | | | | | +| 02E8 | CreatePokeathlonFriendshipRoomStatues \* | | | | +| 02E9 | TextPokeathlonCourseName \* | | | | +| 02EA | OpenTouchScreen | \- | Changes the low screen design to the green Pokéball background | | +| 02EB | CloseTouchScreen | \- | Sets the default low screen design | | +| 02EC | YesNoTouchScreen | Var: Variable | Opens a Yes-No selection, stores player's answer in Variable | Crashes if OpenTouchScreen is not used previously. | +| 02ED | MultiTouchStandardText | u8: ???; u8: ???; u8: ???; u8: ???; Var: Selection | Prepares a multiple selection menu with text bank #191, returns selected slot ID in Selection | | +| 02EE | MultiTouchLocalText | u8: ???; u8: ???; u8: ???; u8: ???; Var: Selection | Prepares a multiple selection menu with local texts, returns selected slot ID in Selection | | +| 02EF | CreateMultiTouchBox | Flex: Text Slot; Flex: Top Screen Text;
Flex: Multi Box Slot | Adds a box with Multi Box Slot ID showing Text Slot text on the bottom screen and Top Screen Text on the top in a message box. Text depends on whether you use MultiTouchStandardText or MultiTouchLocalText | | +| 02F0 | CloseMultiTouch | \- | Closes the multiple selection boxes | | +| 02F1 | RockSmashItemCheck \* | Flex: ???; Var: ???; Var: ??? | ??? | | +| 02F2 | | Var: ??? | ??? | | +| 02F3 | | | | | +| 02F4 | | | | | +| 02F5 | | | | | +| 02F6 | | | | | +| 02F7 | | | | | +| 02F8 | | | | | +| 02F9 | | | | | +| 02FA | | | | | +| 02FB | | | | | +| 02FC | | | | | +| 02FD | | | | | +| 02FE | | | | | +| 02FF | | \- | ??? | | +| 0300 | | | | | +| 0301 | | | | | +| 0302 | | | | | +| 0303 | | | | | +| 0304 | | | | | +| 0305 | RenderCutscene \* | ???: ??? | Renders a cutscene
2 = Arceus stock image cutscene | | +| 0306 | | | | | +| 0307 | | | | | +| 0308 | GiveTogepiEgg \* | | | | +| 0309 | | | | | +| 030A | GiveSpikyEaredPichu \* | \- | ??? | | +| 030B | | | | | +| 030C | OpenVoltorbFlip \* | | | | +| 030D | KenyaCheckPartyOrMailbox \* | | | | +| 030E | MartSell \* | \- | ??? | Related with the mart interface. | +| 030F | SetFollowPokeInhibitState \* | | | | +| 0310 | ScriptOverlayCmd \* | | | | +| 0311 | BugContestAction \* | | | | +| 0312 | TextBugContestWinner \* | | | | +| 0313 | JudgeBugContest \* | | | | +| 0314 | TextBugContestMonNick \* | | | | +| 0315 | BugContestGetTimeLeft \* | | | | +| 0316 | IsBugContestantRegistered \* | | | | +| 0317 | | | | | +| 0318 | | | | | +| 0319 | TakeMomMoney \* | | | | +| 031A | CheckMomMoneyBalance \* | | | | +| 031B | ShowMomMoney | Flex: X; Flex: Y | Shows mom savings money box at X and Y coordinates of the screen | | +| 031C | HideMomMoney | \- | Hides mom savings money box | | +| 031D | | | | | +| 031E | TextRulesetName \* | | | | +| 031F | | | | | +| 0320 | | | | | +| 0321 | | | | | +| 0322 | | | | | +| 0323 | | | | | +| 0324 | UpdateTownMap \* | u8(?): Map Type | Updates the town map to include Kanto
1 = Normal, Johto-only view
2 = Whole map, Kanto included | | +| 0325 | | | | | +| 0326 | | | | | +| 0327 | | | | | +| 0328 | | | | | +| 0329 | | | | | +| 032A | CelebiTimeTravelAnimation \* | | | | +| 032B | | | | | +| 032C | | | | | +| 032D | MomGiftCheck \* | | | | +| 032E | | | | | +| 032F | | | | | +| 0330 | UnownCircle \* | | | | +| 0331 | | | | | +| 0332 | InitMystriStageAnimation \* | | | | +| 0333 | | | | | +| 0334 | | | | | +| 0335 | GetBuenasPassword \* | | | | +| 0336 | | | | | +| 0337 | | | | | +| 0338 | | | | | +| 0339 | GetShinyLeafCount \* | | | | +| 033A | TryGiveShinyLeafCrown \* | | | | +| 033B | CheckPokemonNickname \* | Flex: Party Slot; Var: Variable | Checks to see if the Pokémon at Party Slot position has a nickname. The variable will return 0 if the Pokémon does have a nickname. | Example: Script File 913, Function 35 | +| 033C | | | | | +| 033D | | Var: ??? | ??? | | +| 033E | | | | | +| 033F | | | | | +| 0340 | | | | | +| 0341 | | | | | +| 0342 | | Var: Variable | ??? | | +| 0343 | | Var: Variable | ??? | | +| 0344 | CheckJadeOrbRequirements | Var: Variable | Stores 1 in Variable if player has both Kyogre and Groudon in the Pokémon party and they have been caught in Johto, stores 0 otherwise | | +| 0345 | | Var: Variable | ??? | | +| 0346 | CheckMoneyFull | u16: Money Account; Var: Variable | Stores 1 in Variable if the chosen money account is full.
Money account 0 = Mom's savings;
Money account 1 = Player; | | +| 0347 | SystemSetSleepFlag \* | | | | +| 0348 | | | | | +| 0349 | | | | | +| 034A | | | | | +| 034B | TextItemLowercase | u8: String Buffer; Flex: Item | Stores Item's lowercase name in String Buffer | International release exclusive. | +| 034C | TextItemPlural | u8: String Buffer; Flex: Item | Stores Item's plural noun in String Buffer | International release exclusive. | +| 034D | TextPartyPokemonDefault | u8: String Buffer; Flex: Party position | Stores the name of the Pokémon in Party Position in String Buffer with default color tags encoding | International release exclusive. Names stored at text file 238. | +| 034E | | | | International release exclusive. | +| 034F | | u8: String Buffer | ??? | International release exclusive. | +| 0350 | | u8: String Buffer; Flex: Accesory | ??? | International release exclusive. | +| 0351 | TextTrainerClass | u8: String Buffer; Flex: Trainer class | Stores Trainer class' lowercase noun in String Buffer | International release exclusive. | +| 0352 | TextSealPlural | u8: String Buffer; Flex: Seal | Stores Seal's plural noun in String Buffer | International release exclusive. Text archive 16. | +| 0353 | TextCapitalize | u8: String Buffer | Capitalizes the string currently stored in String Buffer | International release exclusive. | +| 0354 | TextFloor | u8: String Buffer; u8: Floor | Stores Floor's name in String Buffer | International release exclusive. Names stored at text file 191, lines 0x74 to 0x7A. | \ No newline at end of file From 7959f05912df65943ee152a45077ab8be5b8bcf5 Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Sun, 3 Mar 2024 21:42:26 +0100 Subject: [PATCH 24/40] added alpha ruin command names. needs checking asm --- DS_Map/Resources/ScriptDatabase.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DS_Map/Resources/ScriptDatabase.cs b/DS_Map/Resources/ScriptDatabase.cs index a402edc..1b89c37 100644 --- a/DS_Map/Resources/ScriptDatabase.cs +++ b/DS_Map/Resources/ScriptDatabase.cs @@ -2094,6 +2094,9 @@ namespace DSPRE.Resources { [0x02C7] = "TalkFollowingPoke", + [0x02C9] = "OpenAlphaPuzzle", + [0x02CA] = "OpenRuinsofAlphHiddenRoom", + [0x02D3] = "BoatAnimation", From 01e9ea269ce4c89bdbcf8ee1ba71ca13bd7dfad7 Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Tue, 5 Mar 2024 13:53:48 +0100 Subject: [PATCH 25/40] Some more fixes to the new tabs and an arm9 issue (force it uncompressed) --- DS_Map/EditorPanels.cs | 12 +- DS_Map/Editors/LevelScriptEditor.cs | 654 ++++++++++++++-------------- DS_Map/Main Window.Designer.cs | 228 +++++----- DS_Map/Main Window.cs | 10 +- DS_Map/Main Window.resx | 183 ++++---- 5 files changed, 543 insertions(+), 544 deletions(-) diff --git a/DS_Map/EditorPanels.cs b/DS_Map/EditorPanels.cs index c61106c..6693a0e 100644 --- a/DS_Map/EditorPanels.cs +++ b/DS_Map/EditorPanels.cs @@ -8,13 +8,17 @@ namespace DSPRE { public static void Initialize(MainProgram mainProgram) { MainProgram = mainProgram; } + public static TabControl mainTabControl { get { return MainProgram.mainTabControl; } } public static ScriptEditor scriptEditor { get { return MainProgram.scriptEditor; } } public static LevelScriptEditor levelScriptEditor { get { return MainProgram.levelScriptEditor; } } - public static TabControl mainTabControl { get { return MainProgram.mainTabControl; } } + + public static EncountersEditor encountersEditor { get { return MainProgram.encountersEditor; } } public static TabPage scriptEditorTabPage { get { return MainProgram.tabPageScriptEditor; } } - public static TabPage levelScriptEditorTabPage { get { return MainProgram.tabPageLevelScriptEditor; } } - - } + public static TabPage levelScriptEditorTabPage { get { return MainProgram.tabPageLevelScriptEditor; } } + public static TabPage tabPageEncountersEditor { get { return MainProgram.tabPageEncountersEditor; } } + + + } } diff --git a/DS_Map/Editors/LevelScriptEditor.cs b/DS_Map/Editors/LevelScriptEditor.cs index 0c8c424..a980078 100644 --- a/DS_Map/Editors/LevelScriptEditor.cs +++ b/DS_Map/Editors/LevelScriptEditor.cs @@ -5,218 +5,209 @@ using System.Windows.Forms; using DSPRE.ROMFiles; namespace DSPRE.Editors { - public partial class LevelScriptEditor : UserControl { - public bool levelScriptEditorIsReady { get; set; } = false; - LevelScriptFile _levelScriptFile; + public partial class LevelScriptEditor : UserControl { + public bool levelScriptEditorIsReady { get; set; } = false; + LevelScriptFile _levelScriptFile; MainProgram _parent; - public LevelScriptEditor() { - InitializeComponent(); - - } + public LevelScriptEditor() { + InitializeComponent(); - public void SetUpLevelScriptEditor(MainProgram parent, bool force = false) { - if (levelScriptEditorIsReady && !force) return; - levelScriptEditorIsReady = true; + } + + public void SetUpLevelScriptEditor(MainProgram parent, bool force = false) { + if (levelScriptEditorIsReady && !force) return; + levelScriptEditorIsReady = true; this._parent = parent; DSUtils.TryUnpackNarcs(new List { RomInfo.DirNames.scripts }); //12 = scripts Narc Dir - populate_selectScriptFileComboBox(); - } + populate_selectScriptFileComboBox(); + } + + public void OpenLevelScriptEditor(MainProgram parent, int levelScriptID) { - public void OpenLevelScriptEditor(MainProgram parent, int levelScriptID) { - SetUpLevelScriptEditor(parent); - selectScriptFileComboBox.SelectedIndex = levelScriptID; - EditorPanels.mainTabControl.SelectedTab = EditorPanels.levelScriptEditorTabPage; - } - - private void populate_selectScriptFileComboBox(int selectedIndex = 0) { - selectScriptFileComboBox.Items.Clear(); - int scriptCount = Filesystem.GetScriptCount(); - for (int i = 0; i < scriptCount; i++) { - // ScriptFile currentScriptFile = new ScriptFile(i, true, true); - // selectScriptFileComboBox.Items.Add(currentScriptFile); - selectScriptFileComboBox.Items.Add($"Script File {i}"); - } - - selectScriptFileComboBox.SelectedIndex = selectedIndex; - } - - void disableButtons() { - listBoxTriggers.DataSource = null; - - textBoxScriptID.Clear(); - textBoxVariableName.Clear(); - textBoxVariableValue.Clear(); - - radioButtonVariableValue.Checked = false; - radioButtonMapChange.Checked = false; - radioButtonScreenReset.Checked = false; - radioButtonLoadGame.Checked = false; - - textBoxScriptID.Enabled = false; - textBoxVariableName.Enabled = false; - textBoxVariableValue.Enabled = false; - - radioButtonVariableValue.Enabled = false; - radioButtonMapChange.Enabled = false; - radioButtonScreenReset.Enabled = false; - radioButtonLoadGame.Enabled = false; - - radioButtonAuto.Enabled = false; - radioButtonHex.Enabled = false; - radioButtonDecimal.Enabled = false; - - buttonImport.Enabled = false; - buttonSave.Enabled = false; - buttonExport.Enabled = false; - checkBoxPadding.Enabled = false; - - buttonAdd.Enabled = false; - buttonRemove.Enabled = false; - } - - void enableButtons() { - // textBoxScriptID.Enabled = true; - // textBoxVariableName.Enabled = true; - // textBoxVariableValue.Enabled = true; - - radioButtonVariableValue.Enabled = true; - radioButtonMapChange.Enabled = true; - radioButtonScreenReset.Enabled = true; - radioButtonLoadGame.Enabled = true; - - radioButtonAuto.Enabled = true; - radioButtonHex.Enabled = true; - radioButtonDecimal.Enabled = true; - - buttonImport.Enabled = true; - buttonSave.Enabled = true; - buttonExport.Enabled = true; - checkBoxPadding.Enabled = true; - } - - void buttonAdd_logic() { - buttonAdd.Enabled = false; - - if (radioButtonVariableValue.Checked) { - if (!string.IsNullOrEmpty(textBoxScriptID.Text) && !string.IsNullOrEmpty(textBoxVariableName.Text) && !string.IsNullOrEmpty(textBoxVariableValue.Text)) { - buttonAdd.Enabled = true; + selectScriptFileComboBox.SelectedIndex = levelScriptID; + EditorPanels.mainTabControl.SelectedTab = EditorPanels.levelScriptEditorTabPage; } - } - else if (radioButtonMapChange.Checked || radioButtonScreenReset.Checked || radioButtonLoadGame.Checked) { - if (!string.IsNullOrEmpty(textBoxScriptID.Text)) { - buttonAdd.Enabled = true; + + private void populate_selectScriptFileComboBox(int selectedIndex = 0) { + selectScriptFileComboBox.Items.Clear(); + int scriptCount = Filesystem.GetScriptCount(); + for (int i = 0; i < scriptCount; i++) { + // ScriptFile currentScriptFile = new ScriptFile(i, true, true); + // selectScriptFileComboBox.Items.Add(currentScriptFile); + selectScriptFileComboBox.Items.Add($"Script File {i}"); + } + + selectScriptFileComboBox.SelectedIndex = selectedIndex; } - } - } - private void selectScriptFileComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (selectScriptFileComboBox.SelectedIndex == -1) { - buttonOpenSelectedScript.Enabled = false; - buttonOpenHeaderScript.Enabled = false; - buttonLocate.Enabled = false; - } - else { - buttonOpenSelectedScript.Enabled = true; - buttonOpenHeaderScript.Enabled = true; - buttonLocate.Enabled = true; - } + void disableButtons() { + listBoxTriggers.DataSource = null; - disableButtons(); + textBoxScriptID.Clear(); + textBoxVariableName.Clear(); + textBoxVariableValue.Clear(); - try { - _levelScriptFile = new LevelScriptFile(selectScriptFileComboBox.SelectedIndex); + radioButtonVariableValue.Checked = false; + radioButtonMapChange.Checked = false; + radioButtonScreenReset.Checked = false; + radioButtonLoadGame.Checked = false; - listBoxTriggers.DataSource = _levelScriptFile.bufferSet; - if (listBoxTriggers.Items.Count > 0) listBoxTriggers.SelectedIndex = 0; + textBoxScriptID.Enabled = false; + textBoxVariableName.Enabled = false; + textBoxVariableValue.Enabled = false; - enableButtons(); - } - catch (InvalidDataException ex) { //not a level script - disableButtons(); - Console.WriteLine(ex.Message); - } - } + radioButtonVariableValue.Enabled = false; + radioButtonMapChange.Enabled = false; + radioButtonScreenReset.Enabled = false; + radioButtonLoadGame.Enabled = false; - void listBoxTriggers_SelectedValueChanged(object sender, EventArgs e) { - if (listBoxTriggers.SelectedItem == null) { - buttonRemove.Enabled = false; - return; - } + radioButtonAuto.Enabled = false; + radioButtonHex.Enabled = false; + radioButtonDecimal.Enabled = false; - if (listBoxTriggers.SelectedItem is MapScreenLoadTrigger mapScreenLoadTrigger) { - if (mapScreenLoadTrigger.triggerType == LevelScriptTrigger.LOADGAME) { - radioButtonLoadGame.Checked = true; + buttonImport.Enabled = false; + buttonSave.Enabled = false; + buttonExport.Enabled = false; + checkBoxPadding.Enabled = false; + + buttonAdd.Enabled = false; + buttonRemove.Enabled = false; } - else if (mapScreenLoadTrigger.triggerType == LevelScriptTrigger.MAPCHANGE) { - radioButtonMapChange.Checked = true; + + void enableButtons() { + // textBoxScriptID.Enabled = true; + // textBoxVariableName.Enabled = true; + // textBoxVariableValue.Enabled = true; + + radioButtonVariableValue.Enabled = true; + radioButtonMapChange.Enabled = true; + radioButtonScreenReset.Enabled = true; + radioButtonLoadGame.Enabled = true; + + radioButtonAuto.Enabled = true; + radioButtonHex.Enabled = true; + radioButtonDecimal.Enabled = true; + + buttonImport.Enabled = true; + buttonSave.Enabled = true; + buttonExport.Enabled = true; + checkBoxPadding.Enabled = true; } - else if (mapScreenLoadTrigger.triggerType == LevelScriptTrigger.SCREENRESET) { - radioButtonScreenReset.Checked = true; + + void buttonAdd_logic() { + buttonAdd.Enabled = false; + + if (radioButtonVariableValue.Checked) { + if (!string.IsNullOrEmpty(textBoxScriptID.Text) && !string.IsNullOrEmpty(textBoxVariableName.Text) && !string.IsNullOrEmpty(textBoxVariableValue.Text)) { + buttonAdd.Enabled = true; + } + } else if (radioButtonMapChange.Checked || radioButtonScreenReset.Checked || radioButtonLoadGame.Checked) { + if (!string.IsNullOrEmpty(textBoxScriptID.Text)) { + buttonAdd.Enabled = true; + } + } } - } - else if (listBoxTriggers.SelectedItem is VariableValueTrigger variableValueTrigger) { - if (variableValueTrigger.triggerType == LevelScriptTrigger.VARIABLEVALUE) { - radioButtonVariableValue.Checked = true; + + private void selectScriptFileComboBox_SelectedIndexChanged(object sender, EventArgs e) { + if (selectScriptFileComboBox.SelectedIndex == -1) { + buttonOpenSelectedScript.Enabled = false; + buttonOpenHeaderScript.Enabled = false; + buttonLocate.Enabled = false; + } else { + buttonOpenSelectedScript.Enabled = true; + buttonOpenHeaderScript.Enabled = true; + buttonLocate.Enabled = true; + } + + disableButtons(); + + try { + _levelScriptFile = new LevelScriptFile(selectScriptFileComboBox.SelectedIndex); + + listBoxTriggers.DataSource = _levelScriptFile.bufferSet; + if (listBoxTriggers.Items.Count > 0) listBoxTriggers.SelectedIndex = 0; + + enableButtons(); + } catch (InvalidDataException ex) { //not a level script + disableButtons(); + Console.WriteLine(ex.Message); + } } - } - handleAutoFormat(); - handleHexFormat(); - handleDecimalFormat(); + void listBoxTriggers_SelectedValueChanged(object sender, EventArgs e) { + if (listBoxTriggers.SelectedItem == null) { + buttonRemove.Enabled = false; + return; + } - textBoxScriptID.Enabled = true; - buttonRemove.Enabled = true; - } + if (listBoxTriggers.SelectedItem is MapScreenLoadTrigger mapScreenLoadTrigger) { + if (mapScreenLoadTrigger.triggerType == LevelScriptTrigger.LOADGAME) { + radioButtonLoadGame.Checked = true; + } else if (mapScreenLoadTrigger.triggerType == LevelScriptTrigger.MAPCHANGE) { + radioButtonMapChange.Checked = true; + } else if (mapScreenLoadTrigger.triggerType == LevelScriptTrigger.SCREENRESET) { + radioButtonScreenReset.Checked = true; + } + } else if (listBoxTriggers.SelectedItem is VariableValueTrigger variableValueTrigger) { + if (variableValueTrigger.triggerType == LevelScriptTrigger.VARIABLEVALUE) { + radioButtonVariableValue.Checked = true; + } + } - private void buttonAdd_Click(object sender, EventArgs e) { - // try { - if (_levelScriptFile == null) { - _levelScriptFile = new LevelScriptFile(); - } + handleAutoFormat(); + handleHexFormat(); + handleDecimalFormat(); - int convertBase = 10; //decimal - if (radioButtonHex.Checked) { - convertBase = 16; //hex - } - - if (radioButtonVariableValue.Checked) { - int scriptID = Convert.ToInt16(textBoxScriptID.Text, convertBase); - int variableName = Convert.ToInt16(textBoxVariableName.Text, convertBase); - int variableValue = Convert.ToInt16(textBoxVariableValue.Text, convertBase); - VariableValueTrigger variableValueTrigger = new VariableValueTrigger(scriptID, variableName, variableValue); - _levelScriptFile.bufferSet.Add(variableValueTrigger); - } - else { - int scriptID = Convert.ToInt16(textBoxScriptID.Text, convertBase); - if (radioButtonMapChange.Checked) { - MapScreenLoadTrigger mapScreenLoadTrigger = new MapScreenLoadTrigger(LevelScriptTrigger.MAPCHANGE, scriptID); - _levelScriptFile.bufferSet.Add(mapScreenLoadTrigger); + textBoxScriptID.Enabled = true; + buttonRemove.Enabled = true; } - else if (radioButtonScreenReset.Checked) { - MapScreenLoadTrigger mapScreenLoadTrigger = new MapScreenLoadTrigger(LevelScriptTrigger.SCREENRESET, scriptID); - _levelScriptFile.bufferSet.Add(mapScreenLoadTrigger); - } - else if (radioButtonLoadGame.Checked) { - MapScreenLoadTrigger mapScreenLoadTrigger = new MapScreenLoadTrigger(LevelScriptTrigger.LOADGAME, scriptID); - _levelScriptFile.bufferSet.Add(mapScreenLoadTrigger); - } - } - textBoxScriptID.Clear(); - textBoxVariableName.Clear(); - textBoxVariableValue.Clear(); - // } - // catch (Exception exception) { - // MessageBox.Show(exception.Message); - // } - } + private void buttonAdd_Click(object sender, EventArgs e) { + // try { + if (_levelScriptFile == null) { + _levelScriptFile = new LevelScriptFile(); + } - private void buttonRemove_Click(object sender, EventArgs e) { - _levelScriptFile.bufferSet.RemoveAt(listBoxTriggers.SelectedIndex); - } + int convertBase = 10; //decimal + if (radioButtonHex.Checked) { + convertBase = 16; //hex + } + + if (radioButtonVariableValue.Checked) { + int scriptID = Convert.ToInt16(textBoxScriptID.Text, convertBase); + int variableName = Convert.ToInt16(textBoxVariableName.Text, convertBase); + int variableValue = Convert.ToInt16(textBoxVariableValue.Text, convertBase); + VariableValueTrigger variableValueTrigger = new VariableValueTrigger(scriptID, variableName, variableValue); + _levelScriptFile.bufferSet.Add(variableValueTrigger); + } else { + int scriptID = Convert.ToInt16(textBoxScriptID.Text, convertBase); + if (radioButtonMapChange.Checked) { + MapScreenLoadTrigger mapScreenLoadTrigger = new MapScreenLoadTrigger(LevelScriptTrigger.MAPCHANGE, scriptID); + _levelScriptFile.bufferSet.Add(mapScreenLoadTrigger); + } else if (radioButtonScreenReset.Checked) { + MapScreenLoadTrigger mapScreenLoadTrigger = new MapScreenLoadTrigger(LevelScriptTrigger.SCREENRESET, scriptID); + _levelScriptFile.bufferSet.Add(mapScreenLoadTrigger); + } else if (radioButtonLoadGame.Checked) { + MapScreenLoadTrigger mapScreenLoadTrigger = new MapScreenLoadTrigger(LevelScriptTrigger.LOADGAME, scriptID); + _levelScriptFile.bufferSet.Add(mapScreenLoadTrigger); + } + } + + textBoxScriptID.Clear(); + textBoxVariableName.Clear(); + textBoxVariableValue.Clear(); + // } + // catch (Exception exception) { + // MessageBox.Show(exception.Message); + // } + } + + private void buttonRemove_Click(object sender, EventArgs e) { + _levelScriptFile.bufferSet.RemoveAt(listBoxTriggers.SelectedIndex); + } private void buttonOpenHeaderScript_Click(object sender, EventArgs e) { EditorPanels.scriptEditor.OpenScriptEditor(this._parent, (int)EditorPanels.MainProgram.scriptFileUpDown.Value); @@ -227,161 +218,154 @@ namespace DSPRE.Editors { } void buttonLocate_Click(object sender, EventArgs e) { - if (_levelScriptFile == null) return; - string path = Filesystem.GetScriptPath(_levelScriptFile.ID); - Helpers.ExplorerSelect(path); - } - - void buttonImport_Click(object sender, EventArgs e) { - OpenFileDialog ofd = new OpenFileDialog(); - if (ofd.ShowDialog() == DialogResult.OK) { - try { - LevelScriptFile importedFile = new LevelScriptFile(); - importedFile.parse_file(ofd.FileName); - _levelScriptFile.bufferSet.Clear(); - foreach (LevelScriptTrigger trigger in importedFile.bufferSet) { - _levelScriptFile.bufferSet.Add(trigger); - } + if (_levelScriptFile == null) return; + string path = Filesystem.GetScriptPath(_levelScriptFile.ID); + Helpers.ExplorerSelect(path); } - catch (InvalidDataException ex) { - MessageBox.Show(ex.Message, ex.GetType().ToString()); + + void buttonImport_Click(object sender, EventArgs e) { + OpenFileDialog ofd = new OpenFileDialog(); + if (ofd.ShowDialog() == DialogResult.OK) { + try { + LevelScriptFile importedFile = new LevelScriptFile(); + importedFile.parse_file(ofd.FileName); + _levelScriptFile.bufferSet.Clear(); + foreach (LevelScriptTrigger trigger in importedFile.bufferSet) { + _levelScriptFile.bufferSet.Add(trigger); + } + } catch (InvalidDataException ex) { + MessageBox.Show(ex.Message, ex.GetType().ToString()); + } + } } - } - } - private void buttonSave_Click(object sender, EventArgs e) { - string path = Filesystem.GetScriptPath(_levelScriptFile.ID); - saveFile(path); - } - - private void buttonExport_Click(object sender, EventArgs e) { - SaveFileDialog sfd = new SaveFileDialog(); - try { - sfd.InitialDirectory = Path.GetDirectoryName(sfd.FileName); - sfd.FileName = Path.GetFileName(sfd.FileName); - } - catch (Exception ex) { - sfd.InitialDirectory = Path.GetDirectoryName(Environment.SpecialFolder.UserProfile.ToString()); - sfd.FileName = Path.GetFileName(sfd.FileName); - } - - if (sfd.ShowDialog() == DialogResult.OK) { - saveFile(sfd.FileName); - } - } - - void saveFile(string path) { - try { - long bytes_written = _levelScriptFile.write_file(path); - if (bytes_written <= 4) { - MessageBox.Show("Empty level script file was correctly saved.", "Success!"); + private void buttonSave_Click(object sender, EventArgs e) { + string path = Filesystem.GetScriptPath(_levelScriptFile.ID); + saveFile(path); } - else { - MessageBox.Show("File was correctly saved.", "Success!"); + + private void buttonExport_Click(object sender, EventArgs e) { + SaveFileDialog sfd = new SaveFileDialog(); + try { + sfd.InitialDirectory = Path.GetDirectoryName(sfd.FileName); + sfd.FileName = Path.GetFileName(sfd.FileName); + } catch (Exception ex) { + sfd.InitialDirectory = Path.GetDirectoryName(Environment.SpecialFolder.UserProfile.ToString()); + sfd.FileName = Path.GetFileName(sfd.FileName); + } + + if (sfd.ShowDialog() == DialogResult.OK) { + saveFile(sfd.FileName); + } + } + + void saveFile(string path) { + try { + long bytes_written = _levelScriptFile.write_file(path); + if (bytes_written <= 4) { + MessageBox.Show("Empty level script file was correctly saved.", "Success!"); + } else { + MessageBox.Show("File was correctly saved.", "Success!"); + } + } catch (Exception ex) { + MessageBox.Show(ex.Message, ex.GetType().ToString()); + } + } + + private void handleAutoFormat() { + if (!radioButtonAuto.Checked) return; + + textBoxScriptID.Clear(); + textBoxVariableName.Clear(); + textBoxVariableValue.Clear(); + + if (listBoxTriggers.SelectedItem is MapScreenLoadTrigger mapScreenLoadTrigger) { + textBoxScriptID.Text = mapScreenLoadTrigger.scriptTriggered.ToString(); + } else if (listBoxTriggers.SelectedItem is VariableValueTrigger variableValueTrigger) { + textBoxScriptID.Text = variableValueTrigger.scriptTriggered.ToString(); + textBoxVariableName.Text = "" + variableValueTrigger.variableToWatch.ToString("D"); + textBoxVariableValue.Text = "" + variableValueTrigger.expectedValue.ToString("D"); + } + } + + private void handleHexFormat() { + if (!radioButtonHex.Checked) return; + + textBoxScriptID.Clear(); + textBoxVariableName.Clear(); + textBoxVariableValue.Clear(); + + if (listBoxTriggers.SelectedItem is MapScreenLoadTrigger mapScreenLoadTrigger) { + textBoxScriptID.Text = mapScreenLoadTrigger.scriptTriggered.ToString(); + } else if (listBoxTriggers.SelectedItem is VariableValueTrigger variableValueTrigger) { + textBoxScriptID.Text = variableValueTrigger.scriptTriggered.ToString(); + textBoxVariableName.Text = "0x" + variableValueTrigger.variableToWatch.ToString("X"); + textBoxVariableValue.Text = "0x" + variableValueTrigger.expectedValue.ToString("X"); + } + } + + private void handleDecimalFormat() { + if (!radioButtonDecimal.Checked) return; + + textBoxScriptID.Clear(); + textBoxVariableName.Clear(); + textBoxVariableValue.Clear(); + + if (listBoxTriggers.SelectedItem is MapScreenLoadTrigger mapScreenLoadTrigger) { + textBoxScriptID.Text = mapScreenLoadTrigger.scriptTriggered.ToString(); + } else if (listBoxTriggers.SelectedItem is VariableValueTrigger variableValueTrigger) { + textBoxScriptID.Text = variableValueTrigger.scriptTriggered.ToString(); + textBoxVariableName.Text = "" + variableValueTrigger.variableToWatch.ToString("D"); + textBoxVariableValue.Text = "" + variableValueTrigger.expectedValue.ToString("D"); + } + } + + private void radioButtonAuto_CheckedChanged(object sender, EventArgs e) { + handleAutoFormat(); + } + + private void radioButtonHex_CheckedChanged(object sender, EventArgs e) { + handleHexFormat(); + } + + private void radioButtonDecimal_CheckedChanged(object sender, EventArgs e) { + handleDecimalFormat(); + } + + private void radioButtonVariableValue_CheckedChanged(object sender, EventArgs e) { + textBoxVariableName.Enabled = true; + textBoxVariableValue.Enabled = true; + buttonAdd_logic(); + } + + private void radioButtonMapChange_CheckedChanged(object sender, EventArgs e) { + textBoxVariableName.Enabled = false; + textBoxVariableValue.Enabled = false; + buttonAdd_logic(); + } + + private void radioButtonScreenReset_CheckedChanged(object sender, EventArgs e) { + textBoxVariableName.Enabled = false; + textBoxVariableValue.Enabled = false; + buttonAdd_logic(); + } + + private void radioButtonLoadGame_CheckedChanged(object sender, EventArgs e) { + textBoxVariableName.Enabled = false; + textBoxVariableValue.Enabled = false; + buttonAdd_logic(); + } + + void textBoxScriptID_TextChanged(object sender, EventArgs e) { + buttonAdd_logic(); + } + + void textBoxVariableName_TextChanged(object sender, EventArgs e) { + buttonAdd_logic(); + } + + void textBoxVariableValue_TextChanged(object sender, EventArgs e) { + buttonAdd_logic(); } - } - catch (Exception ex) { - MessageBox.Show(ex.Message, ex.GetType().ToString()); - } } - - private void handleAutoFormat() { - if (!radioButtonAuto.Checked) return; - - textBoxScriptID.Clear(); - textBoxVariableName.Clear(); - textBoxVariableValue.Clear(); - - if (listBoxTriggers.SelectedItem is MapScreenLoadTrigger mapScreenLoadTrigger) { - textBoxScriptID.Text = mapScreenLoadTrigger.scriptTriggered.ToString(); - } - else if (listBoxTriggers.SelectedItem is VariableValueTrigger variableValueTrigger) { - textBoxScriptID.Text = variableValueTrigger.scriptTriggered.ToString(); - textBoxVariableName.Text = "" + variableValueTrigger.variableToWatch.ToString("D"); - textBoxVariableValue.Text = "" + variableValueTrigger.expectedValue.ToString("D"); - } - } - - private void handleHexFormat() { - if (!radioButtonHex.Checked) return; - - textBoxScriptID.Clear(); - textBoxVariableName.Clear(); - textBoxVariableValue.Clear(); - - if (listBoxTriggers.SelectedItem is MapScreenLoadTrigger mapScreenLoadTrigger) { - textBoxScriptID.Text = mapScreenLoadTrigger.scriptTriggered.ToString(); - } - else if (listBoxTriggers.SelectedItem is VariableValueTrigger variableValueTrigger) { - textBoxScriptID.Text = variableValueTrigger.scriptTriggered.ToString(); - textBoxVariableName.Text = "0x" + variableValueTrigger.variableToWatch.ToString("X"); - textBoxVariableValue.Text = "0x" + variableValueTrigger.expectedValue.ToString("X"); - } - } - - private void handleDecimalFormat() { - if (!radioButtonDecimal.Checked) return; - - textBoxScriptID.Clear(); - textBoxVariableName.Clear(); - textBoxVariableValue.Clear(); - - if (listBoxTriggers.SelectedItem is MapScreenLoadTrigger mapScreenLoadTrigger) { - textBoxScriptID.Text = mapScreenLoadTrigger.scriptTriggered.ToString(); - } - else if (listBoxTriggers.SelectedItem is VariableValueTrigger variableValueTrigger) { - textBoxScriptID.Text = variableValueTrigger.scriptTriggered.ToString(); - textBoxVariableName.Text = "" + variableValueTrigger.variableToWatch.ToString("D"); - textBoxVariableValue.Text = "" + variableValueTrigger.expectedValue.ToString("D"); - } - } - - private void radioButtonAuto_CheckedChanged(object sender, EventArgs e) { - handleAutoFormat(); - } - - private void radioButtonHex_CheckedChanged(object sender, EventArgs e) { - handleHexFormat(); - } - - private void radioButtonDecimal_CheckedChanged(object sender, EventArgs e) { - handleDecimalFormat(); - } - - private void radioButtonVariableValue_CheckedChanged(object sender, EventArgs e) { - textBoxVariableName.Enabled = true; - textBoxVariableValue.Enabled = true; - buttonAdd_logic(); - } - - private void radioButtonMapChange_CheckedChanged(object sender, EventArgs e) { - textBoxVariableName.Enabled = false; - textBoxVariableValue.Enabled = false; - buttonAdd_logic(); - } - - private void radioButtonScreenReset_CheckedChanged(object sender, EventArgs e) { - textBoxVariableName.Enabled = false; - textBoxVariableValue.Enabled = false; - buttonAdd_logic(); - } - - private void radioButtonLoadGame_CheckedChanged(object sender, EventArgs e) { - textBoxVariableName.Enabled = false; - textBoxVariableValue.Enabled = false; - buttonAdd_logic(); - } - - void textBoxScriptID_TextChanged(object sender, EventArgs e) { - buttonAdd_logic(); - } - - void textBoxVariableName_TextChanged(object sender, EventArgs e) { - buttonAdd_logic(); - } - - void textBoxVariableValue_TextChanged(object sender, EventArgs e) { - buttonAdd_logic(); - } - } } diff --git a/DS_Map/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs index a9f6ac5..590e80b 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 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(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = 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(); @@ -2544,7 +2544,7 @@ this.setSpawnPointButton.Image = global::DSPRE.Properties.Resources.spawnCoordsMatrixeditorIcon; this.setSpawnPointButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.setSpawnPointButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.setSpawnPointButton.Location = new System.Drawing.Point(12, -2832); + this.setSpawnPointButton.Location = new System.Drawing.Point(12, -4034); this.setSpawnPointButton.Name = "setSpawnPointButton"; this.setSpawnPointButton.Size = new System.Drawing.Size(117, 43); this.setSpawnPointButton.TabIndex = 35; @@ -2560,7 +2560,7 @@ this.saveMatrixButton.Image = global::DSPRE.Properties.Resources.save_rom; this.saveMatrixButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.saveMatrixButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.saveMatrixButton.Location = new System.Drawing.Point(12, -2787); + this.saveMatrixButton.Location = new System.Drawing.Point(12, -3989); this.saveMatrixButton.Name = "saveMatrixButton"; this.saveMatrixButton.Size = new System.Drawing.Size(117, 43); this.saveMatrixButton.TabIndex = 34; @@ -2763,40 +2763,40 @@ this.headersGridView.AllowUserToResizeColumns = false; this.headersGridView.AllowUserToResizeRows = false; this.headersGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - 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; + dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + dataGridViewCellStyle17.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.Info; + dataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.headersGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle17; this.headersGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - 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; + dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle18.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle18.Format = "D4"; + dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.headersGridView.DefaultCellStyle = dataGridViewCellStyle18; this.headersGridView.Location = new System.Drawing.Point(0, 0); this.headersGridView.MultiSelect = false; this.headersGridView.Name = "headersGridView"; - 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; + dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle19.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.headersGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle19; this.headersGridView.RowHeadersWidth = 50; this.headersGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - 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; + dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle20.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.headersGridView.RowsDefaultCellStyle = dataGridViewCellStyle20; this.headersGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.headersGridView.RowTemplate.Height = 18; this.headersGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; @@ -2825,43 +2825,43 @@ this.heightsGridView.AllowUserToDeleteRows = false; this.heightsGridView.AllowUserToResizeColumns = false; this.heightsGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle21; this.heightsGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - 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; + dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle22.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.heightsGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle22; this.heightsGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - 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; + dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle23.Font = new System.Drawing.Font("Tahoma", 8.25F); + dataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle23.Format = "D2"; + dataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle23; this.heightsGridView.Location = new System.Drawing.Point(0, 0); this.heightsGridView.MultiSelect = false; this.heightsGridView.Name = "heightsGridView"; - 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; + dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle24.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.heightsGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle24; this.heightsGridView.RowHeadersWidth = 50; this.heightsGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - 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; + dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle25.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.heightsGridView.RowsDefaultCellStyle = dataGridViewCellStyle25; this.heightsGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.heightsGridView.RowTemplate.Height = 18; this.heightsGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; @@ -2888,43 +2888,43 @@ this.mapFilesGridView.AllowUserToDeleteRows = false; this.mapFilesGridView.AllowUserToResizeColumns = false; this.mapFilesGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle26; this.mapFilesGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - 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; + dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle27.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.mapFilesGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle27; this.mapFilesGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - 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; + dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle28.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle28.Format = "D4"; + dataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle28; this.mapFilesGridView.Location = new System.Drawing.Point(0, 0); this.mapFilesGridView.MultiSelect = false; this.mapFilesGridView.Name = "mapFilesGridView"; - 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; + dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle29.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.mapFilesGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle29; this.mapFilesGridView.RowHeadersWidth = 50; this.mapFilesGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - 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; + dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle30.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.mapFilesGridView.RowsDefaultCellStyle = dataGridViewCellStyle30; this.mapFilesGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.mapFilesGridView.RowTemplate.Height = 18; this.mapFilesGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; @@ -4339,7 +4339,7 @@ this.radio3D.AutoSize = true; this.radio3D.Checked = true; this.radio3D.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.radio3D.Location = new System.Drawing.Point(-4818, -2808); + this.radio3D.Location = new System.Drawing.Point(-6804, -4010); this.radio3D.Name = "radio3D"; this.radio3D.Size = new System.Drawing.Size(31, 23); this.radio3D.TabIndex = 26; @@ -4354,7 +4354,7 @@ 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(-4818, -2784); + this.radio2D.Location = new System.Drawing.Point(-6804, -3986); this.radio2D.Name = "radio2D"; this.radio2D.Size = new System.Drawing.Size(31, 23); this.radio2D.TabIndex = 25; @@ -4369,7 +4369,7 @@ 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(1140, -2760); + this.wireframeCheckBox.Location = new System.Drawing.Point(1140, -3962); this.wireframeCheckBox.Name = "wireframeCheckBox"; this.wireframeCheckBox.Size = new System.Drawing.Size(31, 23); this.wireframeCheckBox.TabIndex = 27; @@ -7331,8 +7331,8 @@ this.textEditorDataGridView.Location = new System.Drawing.Point(12, 77); this.textEditorDataGridView.Name = "textEditorDataGridView"; this.textEditorDataGridView.RowHeadersWidth = 68; - dataGridViewCellStyle15.Font = new System.Drawing.Font("Consolas", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textEditorDataGridView.RowsDefaultCellStyle = dataGridViewCellStyle15; + dataGridViewCellStyle31.Font = new System.Drawing.Font("Consolas", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textEditorDataGridView.RowsDefaultCellStyle = dataGridViewCellStyle31; this.textEditorDataGridView.Size = new System.Drawing.Size(873, 500); this.textEditorDataGridView.TabIndex = 24; this.textEditorDataGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.textEditorDataGridView_CellValueChanged); @@ -7435,9 +7435,9 @@ this.cameraEditorDataGridView.CausesValidation = false; this.cameraEditorDataGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised; this.cameraEditorDataGridView.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - 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; + dataGridViewCellStyle32.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.cameraEditorDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle32; this.cameraEditorDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.cameraEditorDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.DistanceGVCol, diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index 1d7dc12..5c1cd34 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -728,6 +728,8 @@ namespace DSPRE { } } + DSUtils.ARM9.WriteBytes(new byte[4] { 0, 0, 0, 0 }, (uint)(RomInfo.gameFamily == GameFamilies.DP ? 0xB7C : 0xBB4)); + Helpers.statusLabelMessage("Repacking ROM..."); if (DSUtils.CheckOverlayHasCompressionFlag(1)) { @@ -751,7 +753,7 @@ namespace DSPRE { for (int i = 0; i < 128; i++) { if (!DSUtils.OverlayIsCompressed(i)) { - DSUtils.CompressOverlay(i); + //DSUtils.CompressOverlay(i); } } @@ -881,6 +883,12 @@ namespace DSPRE { SetupBattleEffectsTables(); tableEditorIsReady = true; } + } else if (mainTabControl.SelectedTab == EditorPanels.scriptEditorTabPage) { + scriptEditor.SetupScriptEditor(this); + } else if (mainTabControl.SelectedTab == EditorPanels.levelScriptEditorTabPage) { + levelScriptEditor.SetUpLevelScriptEditor(this); + } else if (mainTabControl.SelectedTab == EditorPanels.tabPageEncountersEditor) { + encountersEditor.SetupEncountersEditor(); } } diff --git a/DS_Map/Main Window.resx b/DS_Map/Main Window.resx index 21880ec..ce1c91c 100644 --- a/DS_Map/Main Window.resx +++ b/DS_Map/Main Window.resx @@ -117,6 +117,96 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 239, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM + EgAAAk1TRnQBSQFMAgEBCgEAASgBHAEoARwBEAEAARABAAT/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== + + @@ -946,96 +1036,6 @@ p3S+M+m1V1me9QgCUQNXX2YRT1sYHBiEP3wHVbp3PF3cB40GbrzN86xHENrScf1NDsl8FaI4jODMHOgS SOacfYAmbr5XeNYjGH7yDReXv+JeNIUhUYwFpmZjDz+nMLf5B3b2rcZ5tju4ntjtFw4T54j+v2g/t9NH 9AiCIPwGJelqUAd/T3AAAAAASUVORK5CYII= - - - - 239, 17 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM - EgAAAk1TRnQBSQFMAgEBCgEAARgBHAEYARwBEAEAARABAAT/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== @@ -1047,6 +1047,9 @@ 386, 19 + + 533, 20 + 62 From ec46206f61cacbd57e532a5076c9eb9e59798458 Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Wed, 6 Mar 2024 00:30:04 +0100 Subject: [PATCH 26/40] fixed dummy --- DS_Map/Main Window.Designer.cs | 234 ++++++++++++++++----------------- DS_Map/Main Window.resx | 183 +++++++++++++------------- 2 files changed, 207 insertions(+), 210 deletions(-) diff --git a/DS_Map/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs index 590e80b..81a4216 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 dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = 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(); @@ -2544,7 +2544,7 @@ this.setSpawnPointButton.Image = global::DSPRE.Properties.Resources.spawnCoordsMatrixeditorIcon; this.setSpawnPointButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.setSpawnPointButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.setSpawnPointButton.Location = new System.Drawing.Point(12, -4034); + this.setSpawnPointButton.Location = new System.Drawing.Point(12, -4635); this.setSpawnPointButton.Name = "setSpawnPointButton"; this.setSpawnPointButton.Size = new System.Drawing.Size(117, 43); this.setSpawnPointButton.TabIndex = 35; @@ -2560,7 +2560,7 @@ this.saveMatrixButton.Image = global::DSPRE.Properties.Resources.save_rom; this.saveMatrixButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.saveMatrixButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.saveMatrixButton.Location = new System.Drawing.Point(12, -3989); + this.saveMatrixButton.Location = new System.Drawing.Point(12, -4590); this.saveMatrixButton.Name = "saveMatrixButton"; this.saveMatrixButton.Size = new System.Drawing.Size(117, 43); this.saveMatrixButton.TabIndex = 34; @@ -2742,16 +2742,16 @@ this.matrixTabControl.Multiline = true; this.matrixTabControl.Name = "matrixTabControl"; this.matrixTabControl.SelectedIndex = 0; - this.matrixTabControl.Size = new System.Drawing.Size(0, 0); + this.matrixTabControl.Size = new System.Drawing.Size(1040, 610); this.matrixTabControl.TabIndex = 18; // // headersTabPage // this.headersTabPage.Controls.Add(this.headersGridView); - this.headersTabPage.Location = new System.Drawing.Point(4, 58); + this.headersTabPage.Location = new System.Drawing.Point(4, 22); this.headersTabPage.Name = "headersTabPage"; this.headersTabPage.Padding = new System.Windows.Forms.Padding(3); - this.headersTabPage.Size = new System.Drawing.Size(0, 0); + this.headersTabPage.Size = new System.Drawing.Size(1032, 584); this.headersTabPage.TabIndex = 1; this.headersTabPage.Text = "Map Headers"; this.headersTabPage.UseVisualStyleBackColor = true; @@ -2763,40 +2763,40 @@ this.headersGridView.AllowUserToResizeColumns = false; this.headersGridView.AllowUserToResizeRows = false; this.headersGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - dataGridViewCellStyle17.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.Info; - dataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.headersGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle17; + 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; - dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle18.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle18.Format = "D4"; - dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.headersGridView.DefaultCellStyle = dataGridViewCellStyle18; + 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"; - dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle19.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.headersGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle19; + 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; - dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle20.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.headersGridView.RowsDefaultCellStyle = dataGridViewCellStyle20; + 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; @@ -2825,43 +2825,43 @@ this.heightsGridView.AllowUserToDeleteRows = false; this.heightsGridView.AllowUserToResizeColumns = false; this.heightsGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle21; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5; this.heightsGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle22.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.heightsGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle22; + 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; - dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle23.Font = new System.Drawing.Font("Tahoma", 8.25F); - dataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle23.Format = "D2"; - dataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle23; + 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"; - dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle24.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.heightsGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle24; + 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; - dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle25.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.heightsGridView.RowsDefaultCellStyle = dataGridViewCellStyle25; + 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; @@ -2888,43 +2888,43 @@ this.mapFilesGridView.AllowUserToDeleteRows = false; this.mapFilesGridView.AllowUserToResizeColumns = false; this.mapFilesGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle26; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10; this.mapFilesGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle27.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mapFilesGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle27; + 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; - dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle28.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle28.Format = "D4"; - dataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle28; + 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"; - dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle29.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mapFilesGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle29; + 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; - dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle30.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.mapFilesGridView.RowsDefaultCellStyle = dataGridViewCellStyle30; + 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; @@ -4339,7 +4339,7 @@ this.radio3D.AutoSize = true; this.radio3D.Checked = true; this.radio3D.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.radio3D.Location = new System.Drawing.Point(-6804, -4010); + this.radio3D.Location = new System.Drawing.Point(-7797, -4611); this.radio3D.Name = "radio3D"; this.radio3D.Size = new System.Drawing.Size(31, 23); this.radio3D.TabIndex = 26; @@ -4354,7 +4354,7 @@ 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(-6804, -3986); + this.radio2D.Location = new System.Drawing.Point(-7797, -4587); this.radio2D.Name = "radio2D"; this.radio2D.Size = new System.Drawing.Size(31, 23); this.radio2D.TabIndex = 25; @@ -4369,7 +4369,7 @@ 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(1140, -3962); + this.wireframeCheckBox.Location = new System.Drawing.Point(1140, -4563); this.wireframeCheckBox.Name = "wireframeCheckBox"; this.wireframeCheckBox.Size = new System.Drawing.Size(31, 23); this.wireframeCheckBox.TabIndex = 27; @@ -7331,8 +7331,8 @@ this.textEditorDataGridView.Location = new System.Drawing.Point(12, 77); this.textEditorDataGridView.Name = "textEditorDataGridView"; this.textEditorDataGridView.RowHeadersWidth = 68; - dataGridViewCellStyle31.Font = new System.Drawing.Font("Consolas", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textEditorDataGridView.RowsDefaultCellStyle = dataGridViewCellStyle31; + 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(873, 500); this.textEditorDataGridView.TabIndex = 24; this.textEditorDataGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.textEditorDataGridView_CellValueChanged); @@ -7435,9 +7435,9 @@ this.cameraEditorDataGridView.CausesValidation = false; this.cameraEditorDataGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised; this.cameraEditorDataGridView.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle32.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.cameraEditorDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle32; + 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, diff --git a/DS_Map/Main Window.resx b/DS_Map/Main Window.resx index ce1c91c..77dace1 100644 --- a/DS_Map/Main Window.resx +++ b/DS_Map/Main Window.resx @@ -117,96 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 239, 17 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM - EgAAAk1TRnQBSQFMAgEBCgEAASgBHAEoARwBEAEAARABAAT/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== - - @@ -1036,6 +946,96 @@ p3S+M+m1V1me9QgCUQNXX2YRT1sYHBiEP3wHVbp3PF3cB40GbrzN86xHENrScf1NDsl8FaI4jODMHOgS SOacfYAmbr5XeNYjGH7yDReXv+JeNIUhUYwFpmZjDz+nMLf5B3b2rcZ5tju4ntjtFw4T54j+v2g/t9NH 9AiCIPwGJelqUAd/T3AAAAAASUVORK5CYII= + + + + 239, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM + EgAAAk1TRnQBSQFMAgEBCgEAATABHAEwARwBEAEAARABAAT/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== @@ -1047,9 +1047,6 @@ 386, 19 - - 533, 20 - 62 From 61eb214274dcce08e021ef2baf3037356c8c9304 Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Sun, 10 Mar 2024 15:52:12 +0100 Subject: [PATCH 27/40] Fixed bug DPPt. Improved PokeEditor --- DS_Map/EvolutionsEditor.cs | 7 ++- DS_Map/EvolutionsEditor.designer.cs | 2 +- DS_Map/LearnsetEditor.Designer.cs | 2 +- DS_Map/LearnsetEditor.cs | 9 ++-- DS_Map/Main Window.cs | 46 ++++++-------------- DS_Map/PersonalDataEditor.Designer.cs | 2 +- DS_Map/PersonalDataEditor.cs | 9 ++-- DS_Map/PokemonEditor.Designer.cs | 62 ++++++++++++++++++++++++--- DS_Map/PokemonEditor.cs | 24 +++++++++-- 9 files changed, 107 insertions(+), 56 deletions(-) diff --git a/DS_Map/EvolutionsEditor.cs b/DS_Map/EvolutionsEditor.cs index 2d9229d..6f87f99 100644 --- a/DS_Map/EvolutionsEditor.cs +++ b/DS_Map/EvolutionsEditor.cs @@ -8,6 +8,7 @@ namespace DSPRE { public partial class EvolutionsEditor : Form { private readonly string[] fileNames; + private PokemonEditor _parent; private readonly string[] pokeNames; private readonly string[] moveNames; private readonly string[] itemNames; @@ -19,7 +20,8 @@ namespace DSPRE { private static readonly string formName = "Evolutions Editor"; private (ComboBox m, Label l, NumericUpDown p, ComboBox t)[] evoRows; - public EvolutionsEditor(Control parent = null) { + public EvolutionsEditor(Control parent, PokemonEditor pokeEditor) { + this._parent = pokeEditor; this.pokeNames = RomInfo.GetPokemonNames(); this.moveNames = RomInfo.GetAttackNames(); this.itemNames = RomInfo.GetItemNames(); @@ -64,10 +66,11 @@ namespace DSPRE { } private void pokemonNameInputComboBox_SelectedIndexChanged(object sender, EventArgs e) { + Update(); if (Helpers.HandlersDisabled) { return; } - + this._parent.TrySyncIndices((ComboBox)sender); Helpers.DisableHandlers(); if (CheckDiscardChanges()) { int newNumber = pokemonNameInputComboBox.SelectedIndex; diff --git a/DS_Map/EvolutionsEditor.designer.cs b/DS_Map/EvolutionsEditor.designer.cs index baf5737..0b5d741 100644 --- a/DS_Map/EvolutionsEditor.designer.cs +++ b/DS_Map/EvolutionsEditor.designer.cs @@ -586,7 +586,6 @@ private System.Windows.Forms.Button saveDataButton; private System.Windows.Forms.PictureBox pokemonPictureBox; private System.Windows.Forms.NumericUpDown monNumberNumericUpDown; - private InputComboBox pokemonNameInputComboBox; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label paramLabel; @@ -619,5 +618,6 @@ private System.Windows.Forms.Label descLabel5; private System.Windows.Forms.Label descLabel6; private System.Windows.Forms.Label descLabel7; + public InputComboBox pokemonNameInputComboBox; } } \ No newline at end of file diff --git a/DS_Map/LearnsetEditor.Designer.cs b/DS_Map/LearnsetEditor.Designer.cs index ea09c1a..a0de3ea 100644 --- a/DS_Map/LearnsetEditor.Designer.cs +++ b/DS_Map/LearnsetEditor.Designer.cs @@ -335,7 +335,6 @@ private System.Windows.Forms.PictureBox pokemonPictureBox; private System.Windows.Forms.NumericUpDown monNumberNumericUpDown; private System.Windows.Forms.Button saveDataButton; - private InputComboBox pokemonNameInputComboBox; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.GroupBox groupBox3; @@ -349,5 +348,6 @@ private InputComboBox moveInputComboBox; private System.Windows.Forms.Label descriptorLabel; private System.Windows.Forms.Label statusLabel; + public InputComboBox pokemonNameInputComboBox; } } \ No newline at end of file diff --git a/DS_Map/LearnsetEditor.cs b/DS_Map/LearnsetEditor.cs index a0ef089..0e55cff 100644 --- a/DS_Map/LearnsetEditor.cs +++ b/DS_Map/LearnsetEditor.cs @@ -15,7 +15,7 @@ namespace DSPRE { private readonly string[] fileNames; private readonly string[] pokenames; private readonly string[] moveNames; - + private PokemonEditor _parent; private readonly string[] editButtonNames = new string[] { "Edit", "Confirm" @@ -33,9 +33,9 @@ namespace DSPRE { private static bool dirty = false; private static readonly string formName = "Learnset Editor"; - public LearnsetEditor(string[] moveNames, Control parent = null) { + public LearnsetEditor(string[] moveNames, Control parent, PokemonEditor pokeEditor) { this.moveNames = moveNames; - + this._parent = pokeEditor; InitializeComponent(); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Size = parent.Size; @@ -127,10 +127,11 @@ namespace DSPRE { } private void pokemonNameInputComboBox_SelectedIndexChanged(object sender, EventArgs e) { + Update(); if (Helpers.HandlersDisabled) { return; } - + this._parent.TrySyncIndices((ComboBox)sender); Helpers.DisableHandlers(); if (CheckDiscardChanges()) { int newNumber = pokemonNameInputComboBox.SelectedIndex; diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index 5c1cd34..cae167c 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -590,11 +590,11 @@ namespace DSPRE { gameIcon.Refresh(); // Paint game icon Helpers.statusLabelMessage("Attempting to unpack NARCs from folder..."); Update(); - for (int i = 0; i < 128; i++) { - if (DSUtils.OverlayIsCompressed(i)) { - //DSUtils.DecompressOverlay(i); - } - } + //for (int i = 0; i < 128; i++) { + // if (DSUtils.OverlayIsCompressed(i)) { + // DSUtils.DecompressOverlay(i); + // } + //} ReadROMInitData(); } @@ -751,11 +751,11 @@ namespace DSPRE { Update(); - for (int i = 0; i < 128; i++) { - if (!DSUtils.OverlayIsCompressed(i)) { - //DSUtils.CompressOverlay(i); - } - } + //for (int i = 0; i < 128; i++) { + // if (!DSUtils.OverlayIsCompressed(i)) { + // DSUtils.CompressOverlay(i); + // } + //} DSUtils.RepackROM(saveRom.FileName); @@ -9815,33 +9815,11 @@ namespace DSPRE { } private void learnsetsEditorToolStripMenuItem_Click(object sender, EventArgs e) { - string[] moveNames = RomInfo.GetAttackNames(); - - Helpers.statusLabelMessage("Setting up Learnsets Editor..."); - Update(); - - DSUtils.TryUnpackNarcs(new List { DirNames.learnsets, DirNames.monIcons }); - RomInfo.SetMonIconsPalTableAddress(); - - LearnsetEditor le = new LearnsetEditor(moveNames); - le.ShowDialog(); - - Helpers.statusLabelMessage(); - Update(); + // Dummy func, to be deleted from MainWIndow } private void evolutionsEditorToolStripMenuItem_Click(object sender, EventArgs e) { - Helpers.statusLabelMessage("Setting up Evolutions Editor..."); - Update(); - - DSUtils.TryUnpackNarcs(new List { DirNames.evolutions, DirNames.monIcons }); - RomInfo.SetMonIconsPalTableAddress(); - - EvolutionsEditor eved = new EvolutionsEditor(); - eved.ShowDialog(); - - Helpers.statusLabelMessage(); - Update(); + // Dummy func, to be deleted from MainWIndow } } } diff --git a/DS_Map/PersonalDataEditor.Designer.cs b/DS_Map/PersonalDataEditor.Designer.cs index 5118804..61fec9c 100644 --- a/DS_Map/PersonalDataEditor.Designer.cs +++ b/DS_Map/PersonalDataEditor.Designer.cs @@ -1515,7 +1515,6 @@ private System.Windows.Forms.PictureBox pokemonPictureBox; private System.Windows.Forms.NumericUpDown monNumberNumericUpDown; private System.Windows.Forms.Button saveDataButton; - private InputComboBox pokemonNameInputComboBox; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel11; @@ -1605,5 +1604,6 @@ private System.Windows.Forms.TableLayoutPanel tableLayoutPanel10; private InputComboBox type2InputComboBox; private InputComboBox type1InputComboBox; + public InputComboBox pokemonNameInputComboBox; } } \ No newline at end of file diff --git a/DS_Map/PersonalDataEditor.cs b/DS_Map/PersonalDataEditor.cs index 034d446..e0cd00b 100644 --- a/DS_Map/PersonalDataEditor.cs +++ b/DS_Map/PersonalDataEditor.cs @@ -20,9 +20,11 @@ namespace DSPRE { private static bool dirty = false; private static readonly string formName = "Personal Data Editor"; - public PersonalDataEditor(string[] itemNames, string[] abilityNames, System.Windows.Forms.Control parent = null) { - this.fileNames = RomInfo.GetPokemonNames().ToArray();; + PokemonEditor _parent; + public PersonalDataEditor(string[] itemNames, string[] abilityNames, System.Windows.Forms.Control parent, PokemonEditor pokeEditor) { + this.fileNames = RomInfo.GetPokemonNames().ToArray();; + this._parent = pokeEditor; InitializeComponent(); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Size = parent.Size; @@ -410,10 +412,11 @@ namespace DSPRE { } private void pokemonNameInputComboBox_SelectedIndexChanged(object sender, EventArgs e) { + Update(); if (Helpers.HandlersDisabled) { return; } - + this._parent.TrySyncIndices((System.Windows.Forms.ComboBox)sender); Helpers.DisableHandlers(); if (CheckDiscardChanges()) { int newNumber = pokemonNameInputComboBox.SelectedIndex; diff --git a/DS_Map/PokemonEditor.Designer.cs b/DS_Map/PokemonEditor.Designer.cs index 7982eeb..28d8745 100644 --- a/DS_Map/PokemonEditor.Designer.cs +++ b/DS_Map/PokemonEditor.Designer.cs @@ -27,7 +27,11 @@ 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.tabControl.SuspendLayout(); + this.flowLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // tabControl @@ -35,11 +39,11 @@ this.tabControl.Controls.Add(this.personalPage); this.tabControl.Controls.Add(this.learnsetPage); this.tabControl.Controls.Add(this.evoPage); - this.tabControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControl.Location = new System.Drawing.Point(0, 0); + this.tabControl.Dock = System.Windows.Forms.DockStyle.Bottom; + this.tabControl.Location = new System.Drawing.Point(0, 29); this.tabControl.Name = "tabControl"; this.tabControl.SelectedIndex = 0; - this.tabControl.Size = new System.Drawing.Size(800, 450); + this.tabControl.Size = new System.Drawing.Size(1032, 552); this.tabControl.TabIndex = 0; // // personalPage @@ -47,7 +51,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(792, 424); + this.personalPage.Size = new System.Drawing.Size(1024, 526); this.personalPage.TabIndex = 0; this.personalPage.Text = "Personal Editor"; this.personalPage.UseVisualStyleBackColor = true; @@ -57,7 +61,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(792, 424); + this.learnsetPage.Size = new System.Drawing.Size(792, 387); this.learnsetPage.TabIndex = 1; this.learnsetPage.Text = "Learnset Editor"; this.learnsetPage.UseVisualStyleBackColor = true; @@ -67,21 +71,62 @@ 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(792, 424); + this.evoPage.Size = new System.Drawing.Size(792, 387); this.evoPage.TabIndex = 2; this.evoPage.Text = "Evolution Editor"; this.evoPage.UseVisualStyleBackColor = true; // + // syncChangesCheckbox + // + this.syncChangesCheckbox.AutoSize = true; + this.syncChangesCheckbox.Dock = System.Windows.Forms.DockStyle.Bottom; + this.syncChangesCheckbox.Location = new System.Drawing.Point(3, 3); + this.syncChangesCheckbox.Name = "syncChangesCheckbox"; + this.syncChangesCheckbox.Size = new System.Drawing.Size(171, 17); + this.syncChangesCheckbox.TabIndex = 1; + this.syncChangesCheckbox.Text = "Synchronize Chosen Pokemon"; + this.syncChangesCheckbox.UseVisualStyleBackColor = true; + // + // syncChangesLabel + // + 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.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.syncChangesLabel.ForeColor = System.Drawing.SystemColors.Highlight; + this.syncChangesLabel.Location = new System.Drawing.Point(180, 10); + this.syncChangesLabel.Name = "syncChangesLabel"; + this.syncChangesLabel.Size = new System.Drawing.Size(555, 13); + this.syncChangesLabel.TabIndex = 2; + this.syncChangesLabel.Text = "When this checkbox is marked changinging the pokemon in any of the tabs will sync" + + "hronize it accross the other tabs"; + // + // 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; + // // PokemonEditor // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); + this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.ClientSize = new System.Drawing.Size(1032, 581); + this.Controls.Add(this.flowLayoutPanel1); this.Controls.Add(this.tabControl); + this.DoubleBuffered = true; this.Name = "PokemonEditor"; this.Text = "PokemonEditor"; this.tabControl.ResumeLayout(false); + this.flowLayoutPanel1.ResumeLayout(false); + this.flowLayoutPanel1.PerformLayout(); this.ResumeLayout(false); + this.PerformLayout(); } @@ -91,5 +136,8 @@ private System.Windows.Forms.TabPage personalPage; 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; } } \ No newline at end of file diff --git a/DS_Map/PokemonEditor.cs b/DS_Map/PokemonEditor.cs index b222a58..6311372 100644 --- a/DS_Map/PokemonEditor.cs +++ b/DS_Map/PokemonEditor.cs @@ -12,24 +12,42 @@ using static DSPRE.RomInfo; namespace DSPRE { public partial class PokemonEditor : Form { + PersonalDataEditor personalEditor; + LearnsetEditor learnsetEditor; + EvolutionsEditor evoEditor; + public PokemonEditor(string[] itemNames, string[] abilityNames, string[] moveNames) { InitializeComponent(); IsMdiContainer = true; - PersonalDataEditor personalEditor = new PersonalDataEditor(itemNames, abilityNames, evoPage); + personalEditor = new PersonalDataEditor(itemNames, abilityNames, personalPage, this); personalEditor.TopLevel = false; personalEditor.Show(); personalPage.Controls.Add(personalEditor); - LearnsetEditor learnsetEditor = new LearnsetEditor(moveNames, evoPage); + learnsetEditor = new LearnsetEditor(moveNames, learnsetPage, this); learnsetEditor.TopLevel = false; learnsetEditor.Show(); learnsetPage.Controls.Add(learnsetEditor); - EvolutionsEditor evoEditor = new EvolutionsEditor(evoPage); + evoEditor = new EvolutionsEditor(evoPage, this); evoEditor.TopLevel = false; evoEditor.Show(); evoPage.Controls.Add(evoEditor); } + + public void TrySyncIndices(ComboBox sender) { + if(!syncChangesCheckbox.Checked) { + return; + } + + Helpers.BackUpDisableHandler(); + //Helpers.DisableHandlers(); + personalEditor.pokemonNameInputComboBox.SelectedIndex = sender.SelectedIndex; + learnsetEditor.pokemonNameInputComboBox.SelectedIndex = sender.SelectedIndex; + evoEditor.pokemonNameInputComboBox.SelectedItem = sender.SelectedItem; + + Helpers.RestoreDisableHandler(); + } } } From 3f2f5c073175d89055a6ed6023ca0219988b7835 Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Sun, 17 Mar 2024 14:04:45 +0100 Subject: [PATCH 28/40] Synchronize merged Pokemon Editor --- DS_Map/EvolutionsEditor.cs | 13 ++++---- DS_Map/EvolutionsEditor.designer.cs | 2 +- DS_Map/LearnsetEditor.Designer.cs | 2 +- DS_Map/LearnsetEditor.cs | 23 +++++++------- DS_Map/PersonalDataEditor.Designer.cs | 2 +- DS_Map/PersonalDataEditor.cs | 14 +++++---- DS_Map/PokemonEditor.cs | 44 ++++++++++++++++++++++++--- 7 files changed, 69 insertions(+), 31 deletions(-) diff --git a/DS_Map/EvolutionsEditor.cs b/DS_Map/EvolutionsEditor.cs index 6f87f99..04d2f0e 100644 --- a/DS_Map/EvolutionsEditor.cs +++ b/DS_Map/EvolutionsEditor.cs @@ -76,27 +76,26 @@ namespace DSPRE { int newNumber = pokemonNameInputComboBox.SelectedIndex; monNumberNumericUpDown.Value = newNumber; ChangeLoadedFile(newNumber); - } Helpers.EnableHandlers(); } private void monNumberNumericUpDown_ValueChanged(object sender, EventArgs e) { + Update(); if (Helpers.HandlersDisabled) { return; } - + this._parent.TrySyncIndices((NumericUpDown)sender); Helpers.DisableHandlers(); if (CheckDiscardChanges()) { - int newNumber = (int)monNumberNumericUpDown.Value; pokemonNameInputComboBox.SelectedIndex = newNumber; ChangeLoadedFile(newNumber); - } Helpers.EnableHandlers(); } - private void ChangeLoadedFile(int toLoad) { + + public void ChangeLoadedFile(int toLoad) { currentLoadedId = toLoad; currentLoadedFile = new EvolutionFile(currentLoadedId); @@ -158,12 +157,12 @@ namespace DSPRE { return ed; } - private bool CheckDiscardChanges() { + public bool CheckDiscardChanges() { if (!dirty) { return true; } - DialogResult res = MessageBox.Show("There are unsaved changes to the current Evolution data.\nDiscard and proceed?", "Unsaved changes", MessageBoxButtons.YesNo, MessageBoxIcon.Question); + DialogResult res = MessageBox.Show("Evolutions Editor\nThere are unsaved changes to the current Evolution data.\nDiscard and proceed?", "Evolutions Editor - Unsaved changes", MessageBoxButtons.YesNo, MessageBoxIcon.Question); if (res.Equals(DialogResult.Yes)) { return true; } diff --git a/DS_Map/EvolutionsEditor.designer.cs b/DS_Map/EvolutionsEditor.designer.cs index 0b5d741..1972033 100644 --- a/DS_Map/EvolutionsEditor.designer.cs +++ b/DS_Map/EvolutionsEditor.designer.cs @@ -585,7 +585,6 @@ private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; private System.Windows.Forms.Button saveDataButton; private System.Windows.Forms.PictureBox pokemonPictureBox; - private System.Windows.Forms.NumericUpDown monNumberNumericUpDown; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label paramLabel; @@ -619,5 +618,6 @@ private System.Windows.Forms.Label descLabel6; private System.Windows.Forms.Label descLabel7; public InputComboBox pokemonNameInputComboBox; + public System.Windows.Forms.NumericUpDown monNumberNumericUpDown; } } \ No newline at end of file diff --git a/DS_Map/LearnsetEditor.Designer.cs b/DS_Map/LearnsetEditor.Designer.cs index a0de3ea..ed87fc6 100644 --- a/DS_Map/LearnsetEditor.Designer.cs +++ b/DS_Map/LearnsetEditor.Designer.cs @@ -333,7 +333,6 @@ private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; private System.Windows.Forms.PictureBox pokemonPictureBox; - private System.Windows.Forms.NumericUpDown monNumberNumericUpDown; private System.Windows.Forms.Button saveDataButton; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; private System.Windows.Forms.GroupBox groupBox2; @@ -349,5 +348,6 @@ private System.Windows.Forms.Label descriptorLabel; private System.Windows.Forms.Label statusLabel; public InputComboBox pokemonNameInputComboBox; + public System.Windows.Forms.NumericUpDown monNumberNumericUpDown; } } \ No newline at end of file diff --git a/DS_Map/LearnsetEditor.cs b/DS_Map/LearnsetEditor.cs index 0e55cff..52da789 100644 --- a/DS_Map/LearnsetEditor.cs +++ b/DS_Map/LearnsetEditor.cs @@ -77,12 +77,12 @@ namespace DSPRE { this.Text = formName; } } - private bool CheckDiscardChanges() { + public bool CheckDiscardChanges() { if (!dirty) { return true; } - DialogResult res = MessageBox.Show(this, "There are unsaved changes to the current Pokémon data.\nDiscard and proceed?", "Unsaved changes", MessageBoxButtons.YesNo, MessageBoxIcon.Question); + DialogResult res = MessageBox.Show(this, "Learnsets Editor\nThere are unsaved changes to the current Learnset data.\nDiscard and proceed?", "Learnset Editor - Unsaved changes", MessageBoxButtons.YesNo, MessageBoxIcon.Question); if (res.Equals(DialogResult.Yes)) { return true; } @@ -96,7 +96,7 @@ namespace DSPRE { private string ElemToString((ushort level, ushort move) elem) { return $"Lv. {elem.level}: {moveNames[elem.move]}"; } - private void ChangeLoadedFile(int toLoad) { + public void ChangeLoadedFile(int toLoad) { currentLoadedId = toLoad; currentLoadedFile = new LearnsetData(currentLoadedId); PopulateAllFromCurrentFile(); @@ -136,24 +136,22 @@ namespace DSPRE { if (CheckDiscardChanges()) { int newNumber = pokemonNameInputComboBox.SelectedIndex; monNumberNumericUpDown.Value = newNumber; - ChangeLoadedFile(newNumber); - + ChangeLoadedFile(newNumber); } Helpers.EnableHandlers(); } private void monNumberNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (Helpers.HandlersDisabled) { - return; + Update(); + if (Helpers.HandlersDisabled) { + return; } - + this._parent.TrySyncIndices((NumericUpDown)sender); Helpers.DisableHandlers(); if (CheckDiscardChanges()) { - int newNumber = (int)monNumberNumericUpDown.Value; pokemonNameInputComboBox.SelectedIndex = newNumber; - ChangeLoadedFile(newNumber); - + ChangeLoadedFile(newNumber); } Helpers.EnableHandlers(); } @@ -212,6 +210,7 @@ namespace DSPRE { PopulateAllFromCurrentFile(); movesListBox.SelectedIndex = currentLoadedFile.list.FindIndex(x => x == newEntry); UpdateAddEditStatus(); + setDirty(true); } private void deleteMoveButton_Click(object sender, EventArgs e) { @@ -235,6 +234,7 @@ namespace DSPRE { } UpdateByEditMode(); + setDirty(true); } private void editMoveButton_Click(object sender, EventArgs e) { @@ -275,6 +275,7 @@ namespace DSPRE { } UpdateByEditMode(); addMoveButton.Enabled = (editMode == false && CheckValidEntry()); + setDirty(true); } private void UpdateByEditMode() { diff --git a/DS_Map/PersonalDataEditor.Designer.cs b/DS_Map/PersonalDataEditor.Designer.cs index 61fec9c..22e02c5 100644 --- a/DS_Map/PersonalDataEditor.Designer.cs +++ b/DS_Map/PersonalDataEditor.Designer.cs @@ -1513,7 +1513,6 @@ private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; private System.Windows.Forms.PictureBox pokemonPictureBox; - private System.Windows.Forms.NumericUpDown monNumberNumericUpDown; private System.Windows.Forms.Button saveDataButton; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; private System.Windows.Forms.GroupBox groupBox1; @@ -1605,5 +1604,6 @@ private InputComboBox type2InputComboBox; private InputComboBox type1InputComboBox; public InputComboBox pokemonNameInputComboBox; + public System.Windows.Forms.NumericUpDown monNumberNumericUpDown; } } \ No newline at end of file diff --git a/DS_Map/PersonalDataEditor.cs b/DS_Map/PersonalDataEditor.cs index e0cd00b..e3ce08c 100644 --- a/DS_Map/PersonalDataEditor.cs +++ b/DS_Map/PersonalDataEditor.cs @@ -394,12 +394,12 @@ namespace DSPRE { setDirty(false); } //------------------------------- - private bool CheckDiscardChanges() { + public bool CheckDiscardChanges() { if (!dirty) { return true; } - DialogResult res = MessageBox.Show("There are unsaved changes to the current Pokémon data.\nDiscard and proceed?", "Unsaved changes", MessageBoxButtons.YesNo, MessageBoxIcon.Question); + DialogResult res = MessageBox.Show("Personal Editor\nThere are unsaved changes to the current Personal data.\nDiscard and proceed?", "Personal Editor - Unsaved changes", MessageBoxButtons.YesNo, MessageBoxIcon.Question); if (res.Equals(DialogResult.Yes)) { return true; } @@ -427,10 +427,11 @@ namespace DSPRE { } private void monNumberNumericUpDown_ValueChanged(object sender, EventArgs e) { - if (Helpers.HandlersDisabled) { - return; + Update(); + if (Helpers.HandlersDisabled) { + return; } - + this._parent.TrySyncIndices((NumericUpDown)sender); Helpers.DisableHandlers(); if (CheckDiscardChanges()) { int newNumber = (int)monNumberNumericUpDown.Value; @@ -439,7 +440,8 @@ namespace DSPRE { } Helpers.EnableHandlers(); } - private void ChangeLoadedFile(int toLoad) { + + public void ChangeLoadedFile(int toLoad) { currentLoadedId = toLoad; currentLoadedFile = new PokemonPersonalData(currentLoadedId); diff --git a/DS_Map/PokemonEditor.cs b/DS_Map/PokemonEditor.cs index 6311372..f3950d5 100644 --- a/DS_Map/PokemonEditor.cs +++ b/DS_Map/PokemonEditor.cs @@ -42,11 +42,47 @@ namespace DSPRE { } Helpers.BackUpDisableHandler(); - //Helpers.DisableHandlers(); - personalEditor.pokemonNameInputComboBox.SelectedIndex = sender.SelectedIndex; - learnsetEditor.pokemonNameInputComboBox.SelectedIndex = sender.SelectedIndex; - evoEditor.pokemonNameInputComboBox.SelectedItem = sender.SelectedItem; + Helpers.DisableHandlers(); + if (personalEditor.CheckDiscardChanges()) { + personalEditor.pokemonNameInputComboBox.SelectedIndex = sender.SelectedIndex; + personalEditor.monNumberNumericUpDown.Value = sender.SelectedIndex; + personalEditor.ChangeLoadedFile(sender.SelectedIndex); + } + if (learnsetEditor.CheckDiscardChanges()) { + learnsetEditor.pokemonNameInputComboBox.SelectedIndex = sender.SelectedIndex; + learnsetEditor.monNumberNumericUpDown.Value = sender.SelectedIndex; + learnsetEditor.ChangeLoadedFile(sender.SelectedIndex); + } + if (evoEditor.CheckDiscardChanges()) { + evoEditor.pokemonNameInputComboBox.SelectedIndex = sender.SelectedIndex; + evoEditor.monNumberNumericUpDown.Value = sender.SelectedIndex; + evoEditor.ChangeLoadedFile(sender.SelectedIndex); + } + Helpers.RestoreDisableHandler(); + } + public void TrySyncIndices(NumericUpDown sender) { + if (!syncChangesCheckbox.Checked) { + return; + } + + Helpers.BackUpDisableHandler(); + Helpers.DisableHandlers(); + if (personalEditor.CheckDiscardChanges()) { + personalEditor.pokemonNameInputComboBox.SelectedIndex = (int)sender.Value; + personalEditor.monNumberNumericUpDown.Value = sender.Value; + personalEditor.ChangeLoadedFile((int)sender.Value); + } + if (learnsetEditor.CheckDiscardChanges()) { + learnsetEditor.pokemonNameInputComboBox.SelectedIndex = (int)sender.Value; + learnsetEditor.monNumberNumericUpDown.Value = sender.Value; + learnsetEditor.ChangeLoadedFile((int)sender.Value); + } + if (evoEditor.CheckDiscardChanges()) { + evoEditor.pokemonNameInputComboBox.SelectedIndex = (int)sender.Value; + evoEditor.monNumberNumericUpDown.Value = sender.Value; + evoEditor.ChangeLoadedFile((int)sender.Value); + } Helpers.RestoreDisableHandler(); } } From 2e8a44343e5be8d80ca4a25897a2aa38b422f5a4 Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Sun, 17 Mar 2024 14:52:09 +0100 Subject: [PATCH 29/40] Refresh Trainer Editor on ability change --- DS_Map/Main Window.cs | 10 ++++++++++ DS_Map/PersonalDataEditor.cs | 7 +++++++ 2 files changed, 17 insertions(+) diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index cae167c..7e7b400 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -7767,6 +7767,16 @@ namespace DSPRE { } } } + + public void RefreshAbilities(int forPokemon) { + DialogResult res = MessageBox.Show("You have modified a Pokemon's ability.\nDo you wish to refresh the Trainer Editor so your changes are available?", "Refresh Trainer Editor", MessageBoxButtons.YesNo, MessageBoxIcon.Question); + if (res.Equals(DialogResult.Yes)) { + int currentIndex = trainerComboBox.SelectedIndex; + SetupTrainerEditor(); + trainerComboBox.SelectedIndex = currentIndex; + } + } + private void SetupTrainerEditor() { Helpers.DisableHandlers(); diff --git a/DS_Map/PersonalDataEditor.cs b/DS_Map/PersonalDataEditor.cs index e3ce08c..d0bdec8 100644 --- a/DS_Map/PersonalDataEditor.cs +++ b/DS_Map/PersonalDataEditor.cs @@ -18,6 +18,7 @@ namespace DSPRE { private PokemonPersonalData currentLoadedFile = null; private static bool dirty = false; + private bool modifiedAbilities = false; private static readonly string formName = "Personal Data Editor"; PokemonEditor _parent; @@ -275,6 +276,7 @@ namespace DSPRE { } currentLoadedFile.firstAbility = (byte)ability1InputComboBox.SelectedIndex; setDirty(true); + modifiedAbilities = true; } private void ability2InputComboBox_SelectedIndexChanged(object sender, EventArgs e) { if (Helpers.HandlersDisabled) { @@ -282,6 +284,7 @@ namespace DSPRE { } currentLoadedFile.secondAbility = (byte)ability2InputComboBox.SelectedIndex; setDirty(true); + modifiedAbilities = true; } private void eggGroup1InputCombobox_SelectedIndexChanged(object sender, EventArgs e) { if (Helpers.HandlersDisabled) { @@ -391,6 +394,10 @@ namespace DSPRE { } private void saveDataButton_Click(object sender, EventArgs e) { currentLoadedFile.SaveToFileDefaultDir(currentLoadedId, true); + if (modifiedAbilities) { + EditorPanels.MainProgram.RefreshAbilities(currentLoadedId); + modifiedAbilities = false; + } setDirty(false); } //------------------------------- From e4552f0dd5aa26e75f3f9da22af91dd5f4dfeb07 Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Sun, 17 Mar 2024 21:07:53 +0100 Subject: [PATCH 30/40] Populate learnsets on Trainer Moves check --- DS_Map/Main Window.cs | 31 +++++++++++++++++++++++++++---- DS_Map/ROMFiles/LearnsetData.cs | 26 ++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 4 deletions(-) diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index 7e7b400..ec9fd25 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -7792,7 +7792,8 @@ namespace DSPRE { DirNames.trainerGraphics, DirNames.textArchives, DirNames.monIcons, - DirNames.personalPokeData + DirNames.personalPokeData, + DirNames.learnsets }); int numPokemonSpecies = Directory.GetFiles(RomInfo.gameDirs[DirNames.personalPokeData].unpackedDir, "*").Count(); @@ -8171,12 +8172,34 @@ namespace DSPRE { } private void trainerMovesCheckBox_CheckedChanged(object sender, EventArgs e) { - for (int i = 0; i < TrainerFile.POKE_IN_PARTY; i++) { + for (int i = 0; i < TrainerFile.POKE_IN_PARTY; i++) { for (int j = 0; j < Party.MOVES_PER_POKE; j++) { - (partyMovesGroupboxList[i].Controls[j] as ComboBox).Enabled = trainerMovesCheckBox.Checked; + (partyMovesGroupboxList[i].Controls[j] as ComboBox).Enabled = trainerMovesCheckBox.Checked; + } + if (trainerMovesCheckBox.Checked && i < currentTrainerFile.trp.partyCount) { + Helpers.BackUpDisableHandler(); + Helpers.DisableHandlers(); + LearnsetData learnset = new LearnsetData((int)currentTrainerFile.party[i].pokeID); + int level = currentTrainerFile.party[i].level; + currentTrainerFile.party[i].moves = learnset.GetLearnsetAtLevel(level); + Debug.Print("Changing the moves of Pokemon " + i.ToString() + " which is Pokemon " + currentTrainerFile.party[i].pokeID); + Debug.Print("The new moves will be: " + string.Join(", ", currentTrainerFile.party[i].moves)); + for (int j = 0; j < Party.MOVES_PER_POKE; j++) { + (partyMovesGroupboxList[i].Controls[j] as ComboBox).SelectedIndex = currentTrainerFile.party[i].moves[j]; + Debug.Print("Move for dropdwon " + j.ToString() + " is " + currentTrainerFile.party[i].moves[j].ToString()); + } + Helpers.EnableHandlers(); + RefreshTrainerPartyGUI(); + Helpers.RestoreDisableHandler(); + } else { + currentTrainerFile.party[i].moves = null; } - currentTrainerFile.party[i].moves = trainerMovesCheckBox.Checked ? new ushort[Party.MOVES_PER_POKE] : null; } + Helpers.BackUpDisableHandler(); + Helpers.EnableHandlers(); + RefreshTrainerPartyGUI(); + Helpers.RestoreDisableHandler(); + } private void trainerItemsCheckBox_CheckedChanged(object sender, EventArgs e) { for (int i = 0; i < TrainerFile.POKE_IN_PARTY; i++) { diff --git a/DS_Map/ROMFiles/LearnsetData.cs b/DS_Map/ROMFiles/LearnsetData.cs index dc4c95b..ade3efb 100644 --- a/DS_Map/ROMFiles/LearnsetData.cs +++ b/DS_Map/ROMFiles/LearnsetData.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using System.Diagnostics; using System.IO; using DSPRE.ROMFiles; using static DSPRE.RomInfo; @@ -10,6 +11,31 @@ namespace DSPRE { public readonly UniqueList<(byte level, ushort move)> list; + public ushort[] GetLearnsetAtLevel(int atLevel) { + ushort[] learnset = new ushort[4] {0, 0 , 0, 0}; + foreach ((ushort level, ushort move) in list) + { + if (level <= atLevel) + { + if (learnset[0] == 0) { + learnset[0] = move; + } else if (learnset[1] == 0) { + learnset[1] = move; + } else if (learnset[2] == 0) { + learnset[2] = move; + } else if (learnset[3] == 0) { + learnset[3] = move; + } else { + learnset[0] = learnset[1]; + learnset[1] = learnset[2]; + learnset[2] = learnset[3]; + learnset[3] = move; + } + } + } + return learnset; + } + public LearnsetData(Stream stream) { int numEntries = (int)(stream.Length / sizeof(ushort)); list = new UniqueList<(byte level, ushort move)>(numEntries - 1); From 7f79ab80c89b97feba119f03598f20700b5dc1c9 Mon Sep 17 00:00:00 2001 From: Yako Date: Wed, 27 Mar 2024 23:12:48 +0100 Subject: [PATCH 31/40] Add Difficulty Value Calculator --- DS_Map/DSPRE.csproj | 11 + DS_Map/DVCalculator/DVCalc.Designer.cs | 52 + DS_Map/DVCalculator/DVCalc.cs | 372 ++ DS_Map/DVCalculator/DVCalc.resx | 120 + .../DVCalcNatureViewerForm.Designer.cs | 78 + DS_Map/DVCalculator/DVCalcNatureViewerForm.cs | 40 + .../DVCalculator/DVCalcNatureViewerForm.resx | 120 + DS_Map/DVCalculator/DVCalculator.cs | 143 + DS_Map/Main Window.Designer.cs | 3853 ++++++++++------- DS_Map/Main Window.cs | 7 +- DS_Map/Main Window.resx | 2 +- 11 files changed, 3274 insertions(+), 1524 deletions(-) create mode 100644 DS_Map/DVCalculator/DVCalc.Designer.cs create mode 100644 DS_Map/DVCalculator/DVCalc.cs create mode 100644 DS_Map/DVCalculator/DVCalc.resx create mode 100644 DS_Map/DVCalculator/DVCalcNatureViewerForm.Designer.cs create mode 100644 DS_Map/DVCalculator/DVCalcNatureViewerForm.cs create mode 100644 DS_Map/DVCalculator/DVCalcNatureViewerForm.resx create mode 100644 DS_Map/DVCalculator/DVCalculator.cs diff --git a/DS_Map/DSPRE.csproj b/DS_Map/DSPRE.csproj index a50042e..86d7dd3 100644 --- a/DS_Map/DSPRE.csproj +++ b/DS_Map/DSPRE.csproj @@ -95,6 +95,15 @@ + + Form + + + + Form + + + UserControl @@ -347,6 +356,8 @@ + + EncountersEditor.cs diff --git a/DS_Map/DVCalculator/DVCalc.Designer.cs b/DS_Map/DVCalculator/DVCalc.Designer.cs new file mode 100644 index 0000000..4e51b01 --- /dev/null +++ b/DS_Map/DVCalculator/DVCalc.Designer.cs @@ -0,0 +1,52 @@ +using System.Windows.Forms; + +namespace DSPRE +{ + partial class DVCalc + { + /// + /// 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. + /// + + #endregion + + private Label poke_label; + private Label trainerClassIdx_label; + private Label trainerIdx_label; + private Label pokeLVL_label; + private NumericUpDown pokeLevel; + private NumericUpDown trainerClassIdx; + private NumericUpDown trainerIdx; + private ComboBox natureSelect; + private Label nature_label; + private Label DV_label; + private Button calcButton; + private CheckBox maleCheck; + private Label maxDVNature_label; + private Label IV_label; + private ComboBox pokemonSelector; + private Button showAllButton; + private Button helpButton; + } +} diff --git a/DS_Map/DVCalculator/DVCalc.cs b/DS_Map/DVCalculator/DVCalc.cs new file mode 100644 index 0000000..6b823b1 --- /dev/null +++ b/DS_Map/DVCalculator/DVCalc.cs @@ -0,0 +1,372 @@ +using System; +using System.Collections.Generic; +using System.Windows.Forms; +using System.Xml.Linq; + +namespace DSPRE +{ + public partial class DVCalc : Form + { + public DVCalc(int TrainerIndex, int TrainerClassIndex) + { + InitializeComponent(); + PopulateComboBox(); + SetTrainerData(TrainerIndex, TrainerClassIndex); + + //make Pokemon searchable + pokemonSelector.TextChanged += PokemonSelector_TextChanged; + pokemonSelector.AutoCompleteMode = AutoCompleteMode.Suggest; + pokemonSelector.AutoCompleteSource = AutoCompleteSource.CustomSource; + + AutoCompleteStringCollection autoCompleteSource = new AutoCompleteStringCollection(); + foreach (KeyValuePair item in pokemonSelector.Items) + { + autoCompleteSource.Add(item.Value); + } + + pokemonSelector.AutoCompleteCustomSource = autoCompleteSource; + + } + + private void MainForm_Load(object sender, EventArgs e) + { + + } + + private void InitializeComponent() + { + this.poke_label = new System.Windows.Forms.Label(); + this.trainerClassIdx_label = new System.Windows.Forms.Label(); + this.trainerIdx_label = new System.Windows.Forms.Label(); + this.pokeLVL_label = new System.Windows.Forms.Label(); + this.pokeLevel = new System.Windows.Forms.NumericUpDown(); + this.trainerClassIdx = new System.Windows.Forms.NumericUpDown(); + this.trainerIdx = new System.Windows.Forms.NumericUpDown(); + this.natureSelect = new System.Windows.Forms.ComboBox(); + this.nature_label = new System.Windows.Forms.Label(); + this.DV_label = new System.Windows.Forms.Label(); + this.calcButton = new System.Windows.Forms.Button(); + this.maleCheck = new System.Windows.Forms.CheckBox(); + this.maxDVNature_label = new System.Windows.Forms.Label(); + this.IV_label = new System.Windows.Forms.Label(); + this.pokemonSelector = new System.Windows.Forms.ComboBox(); + this.showAllButton = new System.Windows.Forms.Button(); + this.helpButton = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.pokeLevel)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.trainerClassIdx)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.trainerIdx)).BeginInit(); + this.SuspendLayout(); + // + // poke_label + // + this.poke_label.AutoSize = true; + this.poke_label.Location = new System.Drawing.Point(28, 154); + this.poke_label.Name = "poke_label"; + this.poke_label.Size = new System.Drawing.Size(65, 16); + this.poke_label.TabIndex = 3; + this.poke_label.Text = "Pokémon"; + // + // trainerClassIdx_label + // + this.trainerClassIdx_label.AutoSize = true; + this.trainerClassIdx_label.Location = new System.Drawing.Point(28, 87); + this.trainerClassIdx_label.Name = "trainerClassIdx_label"; + this.trainerClassIdx_label.Size = new System.Drawing.Size(122, 16); + this.trainerClassIdx_label.TabIndex = 4; + this.trainerClassIdx_label.Text = "Trainer Class Index"; + // + // trainerIdx_label + // + this.trainerIdx_label.AutoSize = true; + this.trainerIdx_label.Location = new System.Drawing.Point(28, 21); + this.trainerIdx_label.Name = "trainerIdx_label"; + this.trainerIdx_label.Size = new System.Drawing.Size(85, 16); + this.trainerIdx_label.TabIndex = 5; + this.trainerIdx_label.Text = "Trainer Index"; + // + // pokeLVL_label + // + this.pokeLVL_label.AutoSize = true; + this.pokeLVL_label.Location = new System.Drawing.Point(278, 179); + this.pokeLVL_label.Name = "pokeLVL_label"; + this.pokeLVL_label.Size = new System.Drawing.Size(33, 16); + this.pokeLVL_label.TabIndex = 6; + this.pokeLVL_label.Text = "LVL."; + // + // pokeLevel + // + this.pokeLevel.Location = new System.Drawing.Point(318, 177); + this.pokeLevel.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.pokeLevel.Name = "pokeLevel"; + this.pokeLevel.Size = new System.Drawing.Size(46, 22); + this.pokeLevel.TabIndex = 7; + this.pokeLevel.Value = new decimal(new int[] { + 50, + 0, + 0, + 0}); + // + // trainerClassIdx + // + this.trainerClassIdx.Location = new System.Drawing.Point(28, 110); + this.trainerClassIdx.Maximum = new decimal(new int[] { + 120, + 0, + 0, + 0}); + this.trainerClassIdx.Name = "trainerClassIdx"; + this.trainerClassIdx.Size = new System.Drawing.Size(125, 22); + this.trainerClassIdx.TabIndex = 9; + // + // trainerIdx + // + this.trainerIdx.Location = new System.Drawing.Point(28, 44); + this.trainerIdx.Maximum = new decimal(new int[] { + 1000, + 0, + 0, + 0}); + this.trainerIdx.Name = "trainerIdx"; + this.trainerIdx.Size = new System.Drawing.Size(125, 22); + this.trainerIdx.TabIndex = 10; + // + // natureSelect + // + this.natureSelect.FormattingEnabled = true; + this.natureSelect.Location = new System.Drawing.Point(192, 44); + this.natureSelect.Name = "natureSelect"; + this.natureSelect.Size = new System.Drawing.Size(207, 24); + this.natureSelect.TabIndex = 11; + // + // nature_label + // + this.nature_label.AutoSize = true; + this.nature_label.Location = new System.Drawing.Point(192, 21); + this.nature_label.Name = "nature_label"; + this.nature_label.Size = new System.Drawing.Size(47, 16); + this.nature_label.TabIndex = 12; + this.nature_label.Text = "Nature"; + // + // DV_label + // + this.DV_label.AutoSize = true; + this.DV_label.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.DV_label.Location = new System.Drawing.Point(443, 44); + this.DV_label.Name = "DV_label"; + this.DV_label.Size = new System.Drawing.Size(162, 25); + this.DV_label.TabIndex = 13; + this.DV_label.Text = "Difficulty Value: 0"; + // + // calcButton + // + this.calcButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.calcButton.Location = new System.Drawing.Point(491, 179); + this.calcButton.Name = "calcButton"; + this.calcButton.Size = new System.Drawing.Size(114, 51); + this.calcButton.TabIndex = 14; + this.calcButton.Text = "Calculate"; + this.calcButton.UseVisualStyleBackColor = true; + this.calcButton.Click += new System.EventHandler(this.CalcButton_Click); + // + // maleCheck + // + this.maleCheck.AutoSize = true; + this.maleCheck.Checked = true; + this.maleCheck.CheckState = System.Windows.Forms.CheckState.Checked; + this.maleCheck.Location = new System.Drawing.Point(192, 111); + this.maleCheck.Name = "maleCheck"; + this.maleCheck.Size = new System.Drawing.Size(112, 20); + this.maleCheck.TabIndex = 15; + this.maleCheck.Text = "Trainer Male?"; + this.maleCheck.UseVisualStyleBackColor = true; + // + // maxDVNature_label + // + this.maxDVNature_label.AutoSize = true; + this.maxDVNature_label.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.maxDVNature_label.Location = new System.Drawing.Point(323, 127); + this.maxDVNature_label.Name = "maxDVNature_label"; + this.maxDVNature_label.Size = new System.Drawing.Size(125, 20); + this.maxDVNature_label.TabIndex = 16; + this.maxDVNature_label.Text = "DV 255 Nature:"; + // + // IV_label + // + this.IV_label.AutoSize = true; + this.IV_label.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.IV_label.Location = new System.Drawing.Point(323, 87); + this.IV_label.Name = "IV_label"; + this.IV_label.Size = new System.Drawing.Size(113, 20); + this.IV_label.TabIndex = 17; + this.IV_label.Text = "Resulting IVs:"; + // + // pokemonSelector + // + this.pokemonSelector.FormattingEnabled = true; + this.pokemonSelector.Location = new System.Drawing.Point(28, 176); + this.pokemonSelector.Name = "pokemonSelector"; + this.pokemonSelector.Size = new System.Drawing.Size(244, 24); + this.pokemonSelector.TabIndex = 18; + // + // showAllButton + // + this.showAllButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.showAllButton.Location = new System.Drawing.Point(391, 192); + this.showAllButton.Name = "showAllButton"; + this.showAllButton.Size = new System.Drawing.Size(94, 29); + this.showAllButton.TabIndex = 19; + this.showAllButton.Text = "Show All"; + this.showAllButton.UseVisualStyleBackColor = true; + this.showAllButton.Click += new System.EventHandler(this.ShowAllButton_Click); + // + // helpButton + // + this.helpButton.Location = new System.Drawing.Point(541, 2); + this.helpButton.Name = "helpButton"; + this.helpButton.Size = new System.Drawing.Size(75, 23); + this.helpButton.TabIndex = 20; + this.helpButton.Text = "Help"; + this.helpButton.UseVisualStyleBackColor = true; + this.helpButton.Click += new System.EventHandler(this.buttonHelp_Click); + // + // DVCalc + // + this.ClientSize = new System.Drawing.Size(628, 242); + this.Controls.Add(this.helpButton); + this.Controls.Add(this.showAllButton); + this.Controls.Add(this.pokemonSelector); + this.Controls.Add(this.IV_label); + this.Controls.Add(this.maxDVNature_label); + this.Controls.Add(this.maleCheck); + this.Controls.Add(this.calcButton); + this.Controls.Add(this.DV_label); + this.Controls.Add(this.nature_label); + this.Controls.Add(this.natureSelect); + this.Controls.Add(this.trainerIdx); + this.Controls.Add(this.trainerClassIdx); + this.Controls.Add(this.pokeLevel); + this.Controls.Add(this.pokeLVL_label); + this.Controls.Add(this.trainerIdx_label); + this.Controls.Add(this.trainerClassIdx_label); + this.Controls.Add(this.poke_label); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.MaximizeBox = false; + this.Name = "DVCalc"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "DVCalc"; + ((System.ComponentModel.ISupportInitialize)(this.pokeLevel)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.trainerClassIdx)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.trainerIdx)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + + private void PopulateComboBox() + { + // Populate Nature ComboBox (static readonly List) + natureSelect.DataSource = DVCalculator.Natures; + + // Fill the pokemon selector combo box with pokemon names from the ROM + string[] pokeNames = RomInfo.GetPokemonNames(); + + pokemonSelector.Items.Clear(); + + for (int id = 0; id < pokeNames.Length; id++) + { + pokemonSelector.Items.Add(new KeyValuePair(id, pokeNames[id])); + } + + pokemonSelector.SelectedIndex = 0; + + } + + private void SetTrainerData(int TrainerIndex, int TrainerClassIndex) + { + trainerIdx.Value = TrainerIndex; + trainerClassIdx.Value = TrainerClassIndex; + } + + private void CalcButton_Click(object sender, EventArgs e) + { + // Natures are sorted by their index so this works + uint nature = (uint)natureSelect.SelectedIndex; + + int pokemonIndex = 1; + + if (pokemonSelector.SelectedItem != null) + { + KeyValuePair selectedPokemon = (KeyValuePair)pokemonSelector.SelectedItem; + + pokemonIndex = (int)selectedPokemon.Key; + } + + int DV = DVCalculator.findHighestDV((int)trainerIdx.Value, (int)trainerClassIdx.Value, maleCheck.Checked, pokemonIndex, (int)pokeLevel.Value, nature); + + // Determine nature for max DV (max IV) for convenience + uint maxDVNature = DVCalculator.getNatureFromPID(DVCalculator.generatePID((int)trainerIdx.Value, (int)trainerClassIdx.Value, maleCheck.Checked, pokemonIndex, (int)pokeLevel.Value, 255)); + + // Display results + DV_label.Text = "Difficulty Value: " + DV; + IV_label.Text = "Resulting IVs: " + (DV * 31 / 255); + maxDVNature_label.Text = "DV 255 Nature: " + DVCalculator.Natures[(int)maxDVNature]; + + + } + + private void ShowAllButton_Click(object sender, EventArgs e) + { + int pokemonIndex = 1; + + if (pokemonSelector.SelectedItem != null) + { + KeyValuePair selectedPokemon = (KeyValuePair)pokemonSelector.SelectedItem; + + pokemonIndex = (int)selectedPokemon.Key; + + } + + // Create a list of DV-IV-Nature Triplets + List natureDict = DVCalculator.getAllNatures((int)trainerIdx.Value, (int)trainerClassIdx.Value, maleCheck.Checked, pokemonIndex, (int)pokeLevel.Value); + + // Create an instance of the view form and pass the data + // There might be a better way to do this? + DVCalcNatureViewerForm natureViewer = new DVCalcNatureViewerForm(natureDict); + natureViewer.ShowDialog(); + } + + private void PokemonSelector_TextChanged(object sender, EventArgs e) + { + if (sender == null || !(sender is ComboBox)) { return; } + + ComboBox comboBox = (ComboBox)sender; + string enteredText = comboBox.Text.ToLower(); + + // If name of pokemon is typed select that item + foreach (KeyValuePair item in comboBox.Items) + { + if (item.Value.ToLower().Equals(enteredText)) + { + comboBox.SelectedItem = item; + return; + } + } + } + + private void buttonHelp_Click(object sender, EventArgs e) + { + MessageBox.Show("DV, or \"Difficulty Value\", is used by the game engine to calculate how tough an opponent Pokemon should be.\n" + + "The DV affects a Pokemon's Nature and IVs - the higher the value, the stronger the Pokemon.\n" + + "DVs will go from 0 (0 IVs) to 255 (31 IVs). Natures are chosen semi-randomly." + + "\nIVs will be the same value for all Stats at any DV, so Hidden Power will only be Fighting or Dark Type." + + "\nThis calculator allows you to choose a desired Nature and then find the highest possible DV that will yield that Nature." + + "\nIf you want a specific combination of IVs and Nature instead, please click the \"Show All\" button and find the one you want." + , "Difficulty Value", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + } +} diff --git a/DS_Map/DVCalculator/DVCalc.resx b/DS_Map/DVCalculator/DVCalc.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/DS_Map/DVCalculator/DVCalc.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/DVCalculator/DVCalcNatureViewerForm.Designer.cs b/DS_Map/DVCalculator/DVCalcNatureViewerForm.Designer.cs new file mode 100644 index 0000000..7115dc2 --- /dev/null +++ b/DS_Map/DVCalculator/DVCalcNatureViewerForm.Designer.cs @@ -0,0 +1,78 @@ +using System.Drawing; +using System.Windows.Forms; + +namespace DSPRE +{ + partial class DVCalcNatureViewerForm + { + /// + /// 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.natureGridView = new System.Windows.Forms.DataGridView(); + ((System.ComponentModel.ISupportInitialize)(this.natureGridView)).BeginInit(); + this.SuspendLayout(); + // + // natureGridView + // + this.natureGridView.AllowUserToAddRows = false; + this.natureGridView.AllowUserToDeleteRows = false; + this.natureGridView.AllowUserToOrderColumns = true; + this.natureGridView.AllowUserToResizeRows = false; + this.natureGridView.BackgroundColor = System.Drawing.SystemColors.Menu; + this.natureGridView.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.natureGridView.ColumnHeadersHeight = 29; + this.natureGridView.Location = new System.Drawing.Point(16, 10); + this.natureGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.natureGridView.Name = "natureGridView"; + this.natureGridView.ReadOnly = true; + this.natureGridView.RowHeadersWidth = 51; + this.natureGridView.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; + this.natureGridView.Size = new System.Drawing.Size(387, 333); + this.natureGridView.TabIndex = 0; + // + // DVCalcNatureViewerForm + // + this.AllowDrop = true; + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(415, 352); + this.Controls.Add(this.natureGridView); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.MaximizeBox = false; + this.Name = "DVCalcNatureViewerForm"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "Full List"; + ((System.ComponentModel.ISupportInitialize)(this.natureGridView)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DataGridView natureGridView; + } +} \ No newline at end of file diff --git a/DS_Map/DVCalculator/DVCalcNatureViewerForm.cs b/DS_Map/DVCalculator/DVCalcNatureViewerForm.cs new file mode 100644 index 0000000..a547741 --- /dev/null +++ b/DS_Map/DVCalculator/DVCalcNatureViewerForm.cs @@ -0,0 +1,40 @@ +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Windows.Forms; + +namespace DSPRE +{ + public partial class DVCalcNatureViewerForm : Form + { + + private List data; + + public DVCalcNatureViewerForm(List data) + { + InitializeComponent(); + this.data = data; + PopulateDataGridView(); + } + + private void PopulateDataGridView() + { + // Create a BindingList to bind to the DataGridView + var bindingList = new BindingList(data.ToList()); + + // Set the DataSource of the DataGridView + natureGridView.DataSource = bindingList; + + // Set the columns + natureGridView.Columns[0].HeaderText = "IV"; + natureGridView.Columns[0].DataPropertyName = "IV"; + natureGridView.Columns[1].HeaderText = "Nature"; + natureGridView.Columns[1].DataPropertyName = "Nature"; + natureGridView.Columns[2].HeaderText = "DV"; + natureGridView.Columns[2].DataPropertyName = "DV"; + + // Adjust column widths + natureGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + } + } +} diff --git a/DS_Map/DVCalculator/DVCalcNatureViewerForm.resx b/DS_Map/DVCalculator/DVCalcNatureViewerForm.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/DS_Map/DVCalculator/DVCalcNatureViewerForm.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/DVCalculator/DVCalculator.cs b/DS_Map/DVCalculator/DVCalculator.cs new file mode 100644 index 0000000..a1a27dc --- /dev/null +++ b/DS_Map/DVCalculator/DVCalculator.cs @@ -0,0 +1,143 @@ +using System.Collections.Generic; + +namespace DSPRE +{ + // Putting this class here is bad practice, however it's just a really small utility class + public class DVIVNatureTriplet + { + public int DV { get; set; } + public int IV { get; set; } + public string Nature { get; set; } + + public DVIVNatureTriplet(int DV, int IV, string Nature) + { + this.DV = DV; + this.IV = IV; + this.Nature = Nature; + } + } + + internal static class DVCalculator + { + private static long seed; + + public static void setSeed(long seed) + { + DVCalculator.seed = seed; + } + + public static long getSeed() + { + return DVCalculator.seed; + } + + + // This function is lifted from turtleisaac's Pokeditor (with permission) + // See https://github.com/turtleisaac/PokEditor-v2/blob/72ca6ab641f616b8be9a87624b81896baa45f947/src/com/turtleisaac/pokeditor/utilities/TrainerPersonalityCalculator.java + public static long getNextRandom() + { + long random = 0x41c64e6d * seed + 0x6073; + + //last 32 bits is new seed + seed = random & 0xFFFFFFFFL; + + return random; + } + + public static int findHighestDV(int trainerIdx, int trainerClassIdx, bool trainerClassMale, int pokeIdx, int pokeLevel, uint nature) + { + int DV; + + // Iterate over all possible PIDs and return highest DV that yields the desired nature + for (DV = 255; DV >= 0; DV--) + { + if (getNatureFromPID(generatePID(trainerIdx, trainerClassIdx, trainerClassMale, pokeIdx, pokeLevel, DV)) == nature) + { return DV; } + } + + return -1; + + } + + // this function is lifted from turtleisaac's Pokeditor (with permission) + // See https://github.com/turtleisaac/PokEditor-v2/blob/72ca6ab641f616b8be9a87624b81896baa45f947/src/com/turtleisaac/pokeditor/utilities/TrainerPersonalityCalculator.java + public static uint generatePID(int trainerIdx, int trainerClassIdx, bool trainerClassMale, int pokeIdx, int pokeLevel, int difficultyValue) + { + long newSeed = trainerIdx + pokeIdx + pokeLevel + difficultyValue; + + long random = 0; + + setSeed(newSeed); + + while (trainerClassIdx > 0) + { + trainerClassIdx--; + random = getNextRandom(); + } + + // Don't really get this part? Why are we shifting to the right then left again? + long PID = (random >> 16) & 0xffff; + PID = PID * 256; + + // This seems super arbitrary (wtf GameFreak?) + PID += trainerClassMale ? 136 : 120; + + return (uint)PID; + } + + public static uint getNatureFromPID(uint PID) + { + return (PID % 100) % 25; + } + + public static List getAllNatures(int trainerIdx, int trainerClassIdx, bool trainerClassMale, int pokeIdx, int pokeLevel) + { + List natureList = new List(); + + int DV; + uint natureIdx; + + // Iterate over all possible PIDs and store the DV IV and Nature String in the custom data type + for (DV = 255; DV >= 0; DV--) + { + natureIdx = getNatureFromPID(generatePID(trainerIdx, trainerClassIdx, trainerClassMale, pokeIdx, pokeLevel, DV)); + + natureList.Add(new DVIVNatureTriplet(DV, DV*31/255 , Natures[(int)natureIdx])); + + } + + return natureList; + } + + public static readonly List Natures = new List + { + "Hardy: Neutral", + "Lonely: +Atk, -Def", + "Brave: +Atk, -Spe", + "Adamant: +Atk, -SpA", + "Naughty: +Atk, -SpD", + "Bold: +Def, -Atk", + "Docile: Neutral", + "Relaxed: +Def, -Spe", + "Impish: +Def, -SpA", + "Lax: +Def, -SpD", + "Timid: +Spe, -Atk", + "Hasty: +Spe, -Def", + "Serious: Neutral", + "Jolly: +Spe, -SpA", + "Naive: +Spe, -SpD", + "Modest: +SpA, -Atk", + "Mild: +SpA, -Def", + "Quiet: +SpA, -Spe", + "Bashful: Neutral", + "Rash: +SpA, -SpD", + "Calm: +SpD, -Atk", + "Gentle: +SpD, -Def", + "Sassy: +SpD, -Spe", + "Careful: +SpD, -SpA", + "Quirky: Neutral" + }; + + + } +} \ No newline at end of file diff --git a/DS_Map/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs index 6eeb70f..c5edf0c 100644 --- a/DS_Map/Main Window.Designer.cs +++ b/DS_Map/Main Window.Designer.cs @@ -1108,10 +1108,11 @@ this.mainTabControl.Controls.Add(this.tabPageLevelScriptEditor); this.mainTabControl.Controls.Add(this.tabPageEncountersEditor); this.mainTabControl.ImageList = this.mainTabImageList; - this.mainTabControl.Location = new System.Drawing.Point(11, 72); + this.mainTabControl.Location = new System.Drawing.Point(15, 89); + this.mainTabControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.mainTabControl.Name = "mainTabControl"; this.mainTabControl.SelectedIndex = 0; - this.mainTabControl.Size = new System.Drawing.Size(1193, 702); + this.mainTabControl.Size = new System.Drawing.Size(1591, 864); this.mainTabControl.TabIndex = 5; this.mainTabControl.Visible = false; this.mainTabControl.SelectedIndexChanged += new System.EventHandler(this.mainTabControl_SelectedIndexChanged); @@ -1143,10 +1144,11 @@ this.headerEditorTabPage.Controls.Add(this.weatherPicLabel); this.headerEditorTabPage.Controls.Add(this.weatherPictureBox); this.headerEditorTabPage.ImageIndex = 0; - this.headerEditorTabPage.Location = new System.Drawing.Point(4, 23); + this.headerEditorTabPage.Location = new System.Drawing.Point(4, 25); + this.headerEditorTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.headerEditorTabPage.Name = "headerEditorTabPage"; - this.headerEditorTabPage.Padding = new System.Windows.Forms.Padding(3); - this.headerEditorTabPage.Size = new System.Drawing.Size(1185, 675); + this.headerEditorTabPage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.headerEditorTabPage.Size = new System.Drawing.Size(1583, 835); this.headerEditorTabPage.TabIndex = 0; this.headerEditorTabPage.Text = "Header Editor"; // @@ -1155,9 +1157,10 @@ this.removeLastHeaderBTN.Enabled = false; this.removeLastHeaderBTN.Image = global::DSPRE.Properties.Resources.deleteIcon; this.removeLastHeaderBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeLastHeaderBTN.Location = new System.Drawing.Point(13, 578); + this.removeLastHeaderBTN.Location = new System.Drawing.Point(17, 711); + this.removeLastHeaderBTN.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.removeLastHeaderBTN.Name = "removeLastHeaderBTN"; - this.removeLastHeaderBTN.Size = new System.Drawing.Size(214, 26); + this.removeLastHeaderBTN.Size = new System.Drawing.Size(285, 32); this.removeLastHeaderBTN.TabIndex = 52; this.removeLastHeaderBTN.Text = "Remove Last"; this.removeLastHeaderBTN.UseVisualStyleBackColor = true; @@ -1168,9 +1171,10 @@ this.addHeaderBTN.Enabled = false; this.addHeaderBTN.Image = global::DSPRE.Properties.Resources.addIcon; this.addHeaderBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addHeaderBTN.Location = new System.Drawing.Point(13, 552); + this.addHeaderBTN.Location = new System.Drawing.Point(17, 679); + this.addHeaderBTN.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.addHeaderBTN.Name = "addHeaderBTN"; - this.addHeaderBTN.Size = new System.Drawing.Size(214, 26); + this.addHeaderBTN.Size = new System.Drawing.Size(285, 32); this.addHeaderBTN.TabIndex = 48; this.addHeaderBTN.Text = "Add Header"; this.addHeaderBTN.UseVisualStyleBackColor = true; @@ -1185,9 +1189,11 @@ this.worldmapCoordsGroupBox.Controls.Add(this.label36); this.worldmapCoordsGroupBox.Controls.Add(this.worldmapXCoordUpDown); this.worldmapCoordsGroupBox.Enabled = false; - this.worldmapCoordsGroupBox.Location = new System.Drawing.Point(238, 468); + this.worldmapCoordsGroupBox.Location = new System.Drawing.Point(317, 576); + this.worldmapCoordsGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.worldmapCoordsGroupBox.Name = "worldmapCoordsGroupBox"; - this.worldmapCoordsGroupBox.Size = new System.Drawing.Size(84, 136); + this.worldmapCoordsGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.worldmapCoordsGroupBox.Size = new System.Drawing.Size(112, 167); this.worldmapCoordsGroupBox.TabIndex = 34; this.worldmapCoordsGroupBox.TabStop = false; this.worldmapCoordsGroupBox.Text = "Worldmap"; @@ -1196,9 +1202,10 @@ // this.worldmapCoordsPasteButton.Enabled = false; this.worldmapCoordsPasteButton.Image = ((System.Drawing.Image)(resources.GetObject("worldmapCoordsPasteButton.Image"))); - this.worldmapCoordsPasteButton.Location = new System.Drawing.Point(43, 93); + this.worldmapCoordsPasteButton.Location = new System.Drawing.Point(57, 114); + this.worldmapCoordsPasteButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.worldmapCoordsPasteButton.Name = "worldmapCoordsPasteButton"; - this.worldmapCoordsPasteButton.Size = new System.Drawing.Size(35, 37); + this.worldmapCoordsPasteButton.Size = new System.Drawing.Size(47, 46); this.worldmapCoordsPasteButton.TabIndex = 49; this.worldmapCoordsPasteButton.UseVisualStyleBackColor = true; this.worldmapCoordsPasteButton.Click += new System.EventHandler(this.worldmapCoordsPasteButton_Click); @@ -1206,54 +1213,59 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(22, 52); + this.label1.Location = new System.Drawing.Point(29, 64); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(14, 13); + this.label1.Size = new System.Drawing.Size(16, 16); this.label1.TabIndex = 27; this.label1.Text = "Y"; // // worldmapCoordsCopyButton // this.worldmapCoordsCopyButton.Image = ((System.Drawing.Image)(resources.GetObject("worldmapCoordsCopyButton.Image"))); - this.worldmapCoordsCopyButton.Location = new System.Drawing.Point(6, 93); + this.worldmapCoordsCopyButton.Location = new System.Drawing.Point(8, 114); + this.worldmapCoordsCopyButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.worldmapCoordsCopyButton.Name = "worldmapCoordsCopyButton"; - this.worldmapCoordsCopyButton.Size = new System.Drawing.Size(35, 37); + this.worldmapCoordsCopyButton.Size = new System.Drawing.Size(47, 46); this.worldmapCoordsCopyButton.TabIndex = 50; this.worldmapCoordsCopyButton.UseVisualStyleBackColor = true; this.worldmapCoordsCopyButton.Click += new System.EventHandler(this.worldmapCoordsCopyButton_Click); // // worldmapYCoordUpDown // - this.worldmapYCoordUpDown.Location = new System.Drawing.Point(25, 67); + this.worldmapYCoordUpDown.Location = new System.Drawing.Point(33, 82); + this.worldmapYCoordUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.worldmapYCoordUpDown.Maximum = new decimal(new int[] { 63, 0, 0, 0}); this.worldmapYCoordUpDown.Name = "worldmapYCoordUpDown"; - this.worldmapYCoordUpDown.Size = new System.Drawing.Size(38, 20); + this.worldmapYCoordUpDown.Size = new System.Drawing.Size(51, 22); this.worldmapYCoordUpDown.TabIndex = 26; this.worldmapYCoordUpDown.ValueChanged += new System.EventHandler(this.worldmapYCoordUpDown_ValueChanged); // // label36 // this.label36.AutoSize = true; - this.label36.Location = new System.Drawing.Point(22, 14); + this.label36.Location = new System.Drawing.Point(29, 17); + this.label36.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label36.Name = "label36"; - this.label36.Size = new System.Drawing.Size(14, 13); + this.label36.Size = new System.Drawing.Size(15, 16); this.label36.TabIndex = 25; this.label36.Text = "X"; // // worldmapXCoordUpDown // - this.worldmapXCoordUpDown.Location = new System.Drawing.Point(25, 29); + this.worldmapXCoordUpDown.Location = new System.Drawing.Point(33, 36); + this.worldmapXCoordUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.worldmapXCoordUpDown.Maximum = new decimal(new int[] { 63, 0, 0, 0}); this.worldmapXCoordUpDown.Name = "worldmapXCoordUpDown"; - this.worldmapXCoordUpDown.Size = new System.Drawing.Size(38, 20); + this.worldmapXCoordUpDown.Size = new System.Drawing.Size(51, 22); this.worldmapXCoordUpDown.TabIndex = 24; this.worldmapXCoordUpDown.ValueChanged += new System.EventHandler(this.worldmapXCoordUpDown_ValueChanged); // @@ -1263,18 +1275,21 @@ this.groupBox18.Controls.Add(this.pasteWildEncountersButton); this.groupBox18.Controls.Add(this.wildPokeUpDown); this.groupBox18.Controls.Add(this.copyWildEncountersButton); - this.groupBox18.Location = new System.Drawing.Point(806, 12); + this.groupBox18.Location = new System.Drawing.Point(1075, 15); + this.groupBox18.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox18.Name = "groupBox18"; - this.groupBox18.Size = new System.Drawing.Size(94, 140); + this.groupBox18.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox18.Size = new System.Drawing.Size(125, 172); this.groupBox18.TabIndex = 51; this.groupBox18.TabStop = false; this.groupBox18.Text = "Wild Pokémon"; // // openWildEditorWithIdButton // - this.openWildEditorWithIdButton.Location = new System.Drawing.Point(10, 46); + this.openWildEditorWithIdButton.Location = new System.Drawing.Point(13, 57); + this.openWildEditorWithIdButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.openWildEditorWithIdButton.Name = "openWildEditorWithIdButton"; - this.openWildEditorWithIdButton.Size = new System.Drawing.Size(73, 41); + this.openWildEditorWithIdButton.Size = new System.Drawing.Size(97, 50); this.openWildEditorWithIdButton.TabIndex = 24; this.openWildEditorWithIdButton.Text = "Open Editor"; this.openWildEditorWithIdButton.UseVisualStyleBackColor = true; @@ -1284,32 +1299,35 @@ // this.pasteWildEncountersButton.Enabled = false; this.pasteWildEncountersButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteWildEncountersButton.Image"))); - this.pasteWildEncountersButton.Location = new System.Drawing.Point(48, 91); + this.pasteWildEncountersButton.Location = new System.Drawing.Point(64, 112); + this.pasteWildEncountersButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pasteWildEncountersButton.Name = "pasteWildEncountersButton"; - this.pasteWildEncountersButton.Size = new System.Drawing.Size(35, 37); + this.pasteWildEncountersButton.Size = new System.Drawing.Size(47, 46); this.pasteWildEncountersButton.TabIndex = 42; this.pasteWildEncountersButton.UseVisualStyleBackColor = true; this.pasteWildEncountersButton.Click += new System.EventHandler(this.pasteWildEncountersButton_Click); // // wildPokeUpDown // - this.wildPokeUpDown.Location = new System.Drawing.Point(11, 20); + this.wildPokeUpDown.Location = new System.Drawing.Point(15, 25); + this.wildPokeUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.wildPokeUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.wildPokeUpDown.Name = "wildPokeUpDown"; - this.wildPokeUpDown.Size = new System.Drawing.Size(72, 20); + this.wildPokeUpDown.Size = new System.Drawing.Size(96, 22); this.wildPokeUpDown.TabIndex = 24; this.wildPokeUpDown.ValueChanged += new System.EventHandler(this.wildPokeUpDown_ValueChanged); // // copyWildEncountersButton // this.copyWildEncountersButton.Image = ((System.Drawing.Image)(resources.GetObject("copyWildEncountersButton.Image"))); - this.copyWildEncountersButton.Location = new System.Drawing.Point(10, 91); + this.copyWildEncountersButton.Location = new System.Drawing.Point(13, 112); + this.copyWildEncountersButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.copyWildEncountersButton.Name = "copyWildEncountersButton"; - this.copyWildEncountersButton.Size = new System.Drawing.Size(35, 37); + this.copyWildEncountersButton.Size = new System.Drawing.Size(47, 46); this.copyWildEncountersButton.TabIndex = 41; this.copyWildEncountersButton.UseVisualStyleBackColor = true; this.copyWildEncountersButton.Click += new System.EventHandler(this.copyWildEncountersButton_Click); @@ -1318,9 +1336,10 @@ // this.importHeaderFromFileButton.Image = global::DSPRE.Properties.Resources.importArrow; this.importHeaderFromFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.importHeaderFromFileButton.Location = new System.Drawing.Point(912, 518); + this.importHeaderFromFileButton.Location = new System.Drawing.Point(1216, 638); + this.importHeaderFromFileButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.importHeaderFromFileButton.Name = "importHeaderFromFileButton"; - this.importHeaderFromFileButton.Size = new System.Drawing.Size(74, 40); + this.importHeaderFromFileButton.Size = new System.Drawing.Size(99, 49); this.importHeaderFromFileButton.TabIndex = 50; this.importHeaderFromFileButton.Text = "Import"; this.importHeaderFromFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1332,9 +1351,10 @@ // this.exportHeaderToFileButton.Image = global::DSPRE.Properties.Resources.exportArrow; this.exportHeaderToFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.exportHeaderToFileButton.Location = new System.Drawing.Point(992, 518); + this.exportHeaderToFileButton.Location = new System.Drawing.Point(1323, 638); + this.exportHeaderToFileButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.exportHeaderToFileButton.Name = "exportHeaderToFileButton"; - this.exportHeaderToFileButton.Size = new System.Drawing.Size(74, 40); + this.exportHeaderToFileButton.Size = new System.Drawing.Size(99, 49); this.exportHeaderToFileButton.TabIndex = 49; this.exportHeaderToFileButton.Text = "Export"; this.exportHeaderToFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1347,9 +1367,10 @@ this.pasteHeaderButton.Enabled = false; this.pasteHeaderButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteHeaderButton.Image"))); this.pasteHeaderButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.pasteHeaderButton.Location = new System.Drawing.Point(992, 563); + this.pasteHeaderButton.Location = new System.Drawing.Point(1323, 693); + this.pasteHeaderButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pasteHeaderButton.Name = "pasteHeaderButton"; - this.pasteHeaderButton.Size = new System.Drawing.Size(74, 40); + this.pasteHeaderButton.Size = new System.Drawing.Size(99, 49); this.pasteHeaderButton.TabIndex = 37; this.pasteHeaderButton.Text = "Paste"; this.pasteHeaderButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1369,9 +1390,11 @@ this.groupBox10.Controls.Add(this.openEventsButton); this.groupBox10.Controls.Add(this.eventLabel); this.groupBox10.Controls.Add(this.eventFileUpDown); - this.groupBox10.Location = new System.Drawing.Point(238, 389); + this.groupBox10.Location = new System.Drawing.Point(317, 479); + this.groupBox10.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox10.Name = "groupBox10"; - this.groupBox10.Size = new System.Drawing.Size(662, 76); + this.groupBox10.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox10.Size = new System.Drawing.Size(883, 94); this.groupBox10.TabIndex = 31; this.groupBox10.TabStop = false; this.groupBox10.Text = "Events && Texts"; @@ -1380,18 +1403,20 @@ // this.pasteTextsButton.Enabled = false; this.pasteTextsButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteTextsButton.Image"))); - this.pasteTextsButton.Location = new System.Drawing.Point(616, 28); + this.pasteTextsButton.Location = new System.Drawing.Point(821, 34); + this.pasteTextsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pasteTextsButton.Name = "pasteTextsButton"; - this.pasteTextsButton.Size = new System.Drawing.Size(35, 37); + this.pasteTextsButton.Size = new System.Drawing.Size(47, 46); this.pasteTextsButton.TabIndex = 33; this.pasteTextsButton.UseVisualStyleBackColor = true; this.pasteTextsButton.Click += new System.EventHandler(this.pasteTextsButton_Click); // // openMessageFileButton // - this.openMessageFileButton.Location = new System.Drawing.Point(495, 27); + this.openMessageFileButton.Location = new System.Drawing.Point(660, 33); + this.openMessageFileButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.openMessageFileButton.Name = "openMessageFileButton"; - this.openMessageFileButton.Size = new System.Drawing.Size(79, 40); + this.openMessageFileButton.Size = new System.Drawing.Size(105, 49); this.openMessageFileButton.TabIndex = 46; this.openMessageFileButton.Text = "Open &Texts"; this.openMessageFileButton.UseVisualStyleBackColor = true; @@ -1400,9 +1425,10 @@ // copyTextsButton // this.copyTextsButton.Image = ((System.Drawing.Image)(resources.GetObject("copyTextsButton.Image"))); - this.copyTextsButton.Location = new System.Drawing.Point(578, 29); + this.copyTextsButton.Location = new System.Drawing.Point(771, 36); + this.copyTextsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.copyTextsButton.Name = "copyTextsButton"; - this.copyTextsButton.Size = new System.Drawing.Size(35, 37); + this.copyTextsButton.Size = new System.Drawing.Size(47, 46); this.copyTextsButton.TabIndex = 32; this.copyTextsButton.UseVisualStyleBackColor = true; this.copyTextsButton.Click += new System.EventHandler(this.copyTextsButton_Click); @@ -1411,32 +1437,35 @@ // this.pasteEventsButton.Enabled = false; this.pasteEventsButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteEventsButton.Image"))); - this.pasteEventsButton.Location = new System.Drawing.Point(252, 29); + this.pasteEventsButton.Location = new System.Drawing.Point(336, 36); + this.pasteEventsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pasteEventsButton.Name = "pasteEventsButton"; - this.pasteEventsButton.Size = new System.Drawing.Size(35, 37); + this.pasteEventsButton.Size = new System.Drawing.Size(47, 46); this.pasteEventsButton.TabIndex = 31; this.pasteEventsButton.UseVisualStyleBackColor = true; this.pasteEventsButton.Click += new System.EventHandler(this.pasteEventsButton_Click); // // textFileUpDown // - this.textFileUpDown.Location = new System.Drawing.Point(376, 36); + this.textFileUpDown.Location = new System.Drawing.Point(501, 44); + this.textFileUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textFileUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.textFileUpDown.Name = "textFileUpDown"; - this.textFileUpDown.Size = new System.Drawing.Size(107, 20); + this.textFileUpDown.Size = new System.Drawing.Size(143, 22); this.textFileUpDown.TabIndex = 47; this.textFileUpDown.ValueChanged += new System.EventHandler(this.textFileUpDown_ValueChanged); // // copyEventsButton // this.copyEventsButton.Image = ((System.Drawing.Image)(resources.GetObject("copyEventsButton.Image"))); - this.copyEventsButton.Location = new System.Drawing.Point(215, 29); + this.copyEventsButton.Location = new System.Drawing.Point(287, 36); + this.copyEventsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.copyEventsButton.Name = "copyEventsButton"; - this.copyEventsButton.Size = new System.Drawing.Size(35, 37); + this.copyEventsButton.Size = new System.Drawing.Size(47, 46); this.copyEventsButton.TabIndex = 30; this.copyEventsButton.UseVisualStyleBackColor = true; this.copyEventsButton.Click += new System.EventHandler(this.copyEventsButton_Click); @@ -1444,17 +1473,19 @@ // textLabel // this.textLabel.AutoSize = true; - this.textLabel.Location = new System.Drawing.Point(374, 20); + this.textLabel.Location = new System.Drawing.Point(499, 25); + this.textLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.textLabel.Name = "textLabel"; - this.textLabel.Size = new System.Drawing.Size(80, 13); + this.textLabel.Size = new System.Drawing.Size(94, 16); this.textLabel.TabIndex = 45; this.textLabel.Text = "Text Archive #:"; // // openEventsButton // - this.openEventsButton.Location = new System.Drawing.Point(133, 28); + this.openEventsButton.Location = new System.Drawing.Point(177, 34); + this.openEventsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.openEventsButton.Name = "openEventsButton"; - this.openEventsButton.Size = new System.Drawing.Size(79, 40); + this.openEventsButton.Size = new System.Drawing.Size(105, 49); this.openEventsButton.TabIndex = 44; this.openEventsButton.Text = "Open &Events"; this.openEventsButton.UseVisualStyleBackColor = true; @@ -1463,22 +1494,24 @@ // eventLabel // this.eventLabel.AutoSize = true; - this.eventLabel.Location = new System.Drawing.Point(12, 20); + this.eventLabel.Location = new System.Drawing.Point(16, 25); + this.eventLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.eventLabel.Name = "eventLabel"; - this.eventLabel.Size = new System.Drawing.Size(67, 13); + this.eventLabel.Size = new System.Drawing.Size(79, 16); this.eventLabel.TabIndex = 43; this.eventLabel.Text = "Event File #:"; // // eventFileUpDown // - this.eventFileUpDown.Location = new System.Drawing.Point(14, 39); + this.eventFileUpDown.Location = new System.Drawing.Point(19, 48); + this.eventFileUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.eventFileUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.eventFileUpDown.Name = "eventFileUpDown"; - this.eventFileUpDown.Size = new System.Drawing.Size(107, 20); + this.eventFileUpDown.Size = new System.Drawing.Size(143, 22); this.eventFileUpDown.TabIndex = 42; this.eventFileUpDown.ValueChanged += new System.EventHandler(this.eventFileUpDown_ValueChanged); // @@ -1494,9 +1527,11 @@ this.groupBox4.Controls.Add(this.areaDataUpDown); this.groupBox4.Controls.Add(this.matrixLabel); this.groupBox4.Controls.Add(this.matrixUpDown); - this.groupBox4.Location = new System.Drawing.Point(615, 468); + this.groupBox4.Location = new System.Drawing.Point(820, 576); + this.groupBox4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(285, 136); + this.groupBox4.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox4.Size = new System.Drawing.Size(380, 167); this.groupBox4.TabIndex = 31; this.groupBox4.TabStop = false; this.groupBox4.Text = "Map matrix && Tileset"; @@ -1505,9 +1540,10 @@ // this.pasteAreaDataButton.Enabled = false; this.pasteAreaDataButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteAreaDataButton.Image"))); - this.pasteAreaDataButton.Location = new System.Drawing.Point(239, 87); + this.pasteAreaDataButton.Location = new System.Drawing.Point(319, 107); + this.pasteAreaDataButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pasteAreaDataButton.Name = "pasteAreaDataButton"; - this.pasteAreaDataButton.Size = new System.Drawing.Size(35, 37); + this.pasteAreaDataButton.Size = new System.Drawing.Size(47, 46); this.pasteAreaDataButton.TabIndex = 33; this.pasteAreaDataButton.UseVisualStyleBackColor = true; this.pasteAreaDataButton.Click += new System.EventHandler(this.pasteAreaDataButton_Click); @@ -1515,9 +1551,10 @@ // copyAreaDataButton // this.copyAreaDataButton.Image = ((System.Drawing.Image)(resources.GetObject("copyAreaDataButton.Image"))); - this.copyAreaDataButton.Location = new System.Drawing.Point(201, 87); + this.copyAreaDataButton.Location = new System.Drawing.Point(268, 107); + this.copyAreaDataButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.copyAreaDataButton.Name = "copyAreaDataButton"; - this.copyAreaDataButton.Size = new System.Drawing.Size(35, 37); + this.copyAreaDataButton.Size = new System.Drawing.Size(47, 46); this.copyAreaDataButton.TabIndex = 32; this.copyAreaDataButton.UseVisualStyleBackColor = true; this.copyAreaDataButton.Click += new System.EventHandler(this.copyAreaDataButton_Click); @@ -1526,18 +1563,20 @@ // this.pasteMatrixButton.Enabled = false; this.pasteMatrixButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteMatrixButton.Image"))); - this.pasteMatrixButton.Location = new System.Drawing.Point(239, 29); + this.pasteMatrixButton.Location = new System.Drawing.Point(319, 36); + this.pasteMatrixButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pasteMatrixButton.Name = "pasteMatrixButton"; - this.pasteMatrixButton.Size = new System.Drawing.Size(35, 37); + this.pasteMatrixButton.Size = new System.Drawing.Size(47, 46); this.pasteMatrixButton.TabIndex = 31; this.pasteMatrixButton.UseVisualStyleBackColor = true; this.pasteMatrixButton.Click += new System.EventHandler(this.pasteMatrixButton_Click); // // openAreaDataButton // - this.openAreaDataButton.Location = new System.Drawing.Point(118, 85); + this.openAreaDataButton.Location = new System.Drawing.Point(157, 105); + this.openAreaDataButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.openAreaDataButton.Name = "openAreaDataButton"; - this.openAreaDataButton.Size = new System.Drawing.Size(79, 40); + this.openAreaDataButton.Size = new System.Drawing.Size(105, 49); this.openAreaDataButton.TabIndex = 28; this.openAreaDataButton.Text = "Open &Area Data"; this.openAreaDataButton.UseVisualStyleBackColor = true; @@ -1546,18 +1585,20 @@ // copyMatrixButton // this.copyMatrixButton.Image = ((System.Drawing.Image)(resources.GetObject("copyMatrixButton.Image"))); - this.copyMatrixButton.Location = new System.Drawing.Point(201, 29); + this.copyMatrixButton.Location = new System.Drawing.Point(268, 36); + this.copyMatrixButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.copyMatrixButton.Name = "copyMatrixButton"; - this.copyMatrixButton.Size = new System.Drawing.Size(35, 37); + this.copyMatrixButton.Size = new System.Drawing.Size(47, 46); this.copyMatrixButton.TabIndex = 30; this.copyMatrixButton.UseVisualStyleBackColor = true; this.copyMatrixButton.Click += new System.EventHandler(this.copyMatrixButton_Click); // // openMatrixButton // - this.openMatrixButton.Location = new System.Drawing.Point(118, 28); + this.openMatrixButton.Location = new System.Drawing.Point(157, 34); + this.openMatrixButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.openMatrixButton.Name = "openMatrixButton"; - this.openMatrixButton.Size = new System.Drawing.Size(79, 39); + this.openMatrixButton.Size = new System.Drawing.Size(105, 48); this.openMatrixButton.TabIndex = 27; this.openMatrixButton.Text = "Open &Matrix"; this.openMatrixButton.UseVisualStyleBackColor = true; @@ -1566,44 +1607,48 @@ // areaDataLabel // this.areaDataLabel.AutoSize = true; - this.areaDataLabel.Location = new System.Drawing.Point(10, 80); + this.areaDataLabel.Location = new System.Drawing.Point(13, 98); + this.areaDataLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.areaDataLabel.Name = "areaDataLabel"; - this.areaDataLabel.Size = new System.Drawing.Size(56, 13); + this.areaDataLabel.Size = new System.Drawing.Size(69, 16); this.areaDataLabel.TabIndex = 27; this.areaDataLabel.Text = "Area data:"; // // areaDataUpDown // - this.areaDataUpDown.Location = new System.Drawing.Point(13, 98); + this.areaDataUpDown.Location = new System.Drawing.Point(17, 121); + this.areaDataUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.areaDataUpDown.Maximum = new decimal(new int[] { 255, 0, 0, 0}); this.areaDataUpDown.Name = "areaDataUpDown"; - this.areaDataUpDown.Size = new System.Drawing.Size(93, 20); + this.areaDataUpDown.Size = new System.Drawing.Size(124, 22); this.areaDataUpDown.TabIndex = 26; this.areaDataUpDown.ValueChanged += new System.EventHandler(this.areaDataUpDown_ValueChanged); // // matrixLabel // this.matrixLabel.AutoSize = true; - this.matrixLabel.Location = new System.Drawing.Point(10, 23); + this.matrixLabel.Location = new System.Drawing.Point(13, 28); + this.matrixLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.matrixLabel.Name = "matrixLabel"; - this.matrixLabel.Size = new System.Drawing.Size(53, 13); + this.matrixLabel.Size = new System.Drawing.Size(63, 16); this.matrixLabel.TabIndex = 25; this.matrixLabel.Text = "Matrix no."; // // matrixUpDown // - this.matrixUpDown.Location = new System.Drawing.Point(13, 40); + this.matrixUpDown.Location = new System.Drawing.Point(17, 49); + this.matrixUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.matrixUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.matrixUpDown.Name = "matrixUpDown"; - this.matrixUpDown.Size = new System.Drawing.Size(93, 20); + this.matrixUpDown.Size = new System.Drawing.Size(124, 22); this.matrixUpDown.TabIndex = 24; this.matrixUpDown.ValueChanged += new System.EventHandler(this.matrixUpDown_ValueChanged); // @@ -1612,18 +1657,21 @@ this.groupBox9.Controls.Add(this.resetButton); this.groupBox9.Controls.Add(this.searchHeaderButton); this.groupBox9.Controls.Add(this.searchLocationTextBox); - this.groupBox9.Location = new System.Drawing.Point(13, 12); + this.groupBox9.Location = new System.Drawing.Point(17, 15); + this.groupBox9.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox9.Name = "groupBox9"; - this.groupBox9.Size = new System.Drawing.Size(214, 49); + this.groupBox9.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox9.Size = new System.Drawing.Size(285, 60); this.groupBox9.TabIndex = 29; this.groupBox9.TabStop = false; this.groupBox9.Text = "Search Location Name:"; // // resetButton // - this.resetButton.Location = new System.Drawing.Point(161, 17); + this.resetButton.Location = new System.Drawing.Point(215, 21); + this.resetButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.resetButton.Name = "resetButton"; - this.resetButton.Size = new System.Drawing.Size(47, 23); + this.resetButton.Size = new System.Drawing.Size(63, 28); this.resetButton.TabIndex = 2; this.resetButton.Text = "Reset"; this.resetButton.UseVisualStyleBackColor = true; @@ -1631,9 +1679,10 @@ // // searchHeaderButton // - this.searchHeaderButton.Location = new System.Drawing.Point(131, 17); + this.searchHeaderButton.Location = new System.Drawing.Point(175, 21); + this.searchHeaderButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.searchHeaderButton.Name = "searchHeaderButton"; - this.searchHeaderButton.Size = new System.Drawing.Size(29, 23); + this.searchHeaderButton.Size = new System.Drawing.Size(39, 28); this.searchHeaderButton.TabIndex = 1; this.searchHeaderButton.Text = "Go"; this.searchHeaderButton.UseVisualStyleBackColor = true; @@ -1641,9 +1690,10 @@ // // searchLocationTextBox // - this.searchLocationTextBox.Location = new System.Drawing.Point(8, 19); + this.searchLocationTextBox.Location = new System.Drawing.Point(11, 23); + this.searchLocationTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.searchLocationTextBox.Name = "searchLocationTextBox"; - this.searchLocationTextBox.Size = new System.Drawing.Size(119, 20); + this.searchLocationTextBox.Size = new System.Drawing.Size(157, 22); this.searchLocationTextBox.TabIndex = 0; this.searchLocationTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.searchHeaderTextBox_KeyPress); // @@ -1651,9 +1701,10 @@ // this.copyHeaderButton.Image = ((System.Drawing.Image)(resources.GetObject("copyHeaderButton.Image"))); this.copyHeaderButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.copyHeaderButton.Location = new System.Drawing.Point(912, 563); + this.copyHeaderButton.Location = new System.Drawing.Point(1216, 693); + this.copyHeaderButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.copyHeaderButton.Name = "copyHeaderButton"; - this.copyHeaderButton.Size = new System.Drawing.Size(74, 40); + this.copyHeaderButton.Size = new System.Drawing.Size(99, 49); this.copyHeaderButton.TabIndex = 36; this.copyHeaderButton.Text = "Copy"; this.copyHeaderButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1664,9 +1715,10 @@ // areaIconPictureBox // this.areaIconPictureBox.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.areaIconPictureBox.Location = new System.Drawing.Point(912, 28); + this.areaIconPictureBox.Location = new System.Drawing.Point(1216, 34); + this.areaIconPictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.areaIconPictureBox.Name = "areaIconPictureBox"; - this.areaIconPictureBox.Size = new System.Drawing.Size(256, 55); + this.areaIconPictureBox.Size = new System.Drawing.Size(340, 67); this.areaIconPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.areaIconPictureBox.TabIndex = 35; this.areaIconPictureBox.TabStop = false; @@ -1674,9 +1726,10 @@ // areaImageLabel // this.areaImageLabel.AutoSize = true; - this.areaImageLabel.Location = new System.Drawing.Point(909, 13); + this.areaImageLabel.Location = new System.Drawing.Point(1212, 16); + this.areaImageLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.areaImageLabel.Name = "areaImageLabel"; - this.areaImageLabel.Size = new System.Drawing.Size(52, 13); + this.areaImageLabel.Size = new System.Drawing.Size(64, 16); this.areaImageLabel.TabIndex = 34; this.areaImageLabel.Text = "Area icon"; // @@ -1699,9 +1752,11 @@ this.nameGroupBox.Controls.Add(this.areaIconComboBox); this.nameGroupBox.Controls.Add(this.areaSettingsComboBox); this.nameGroupBox.Controls.Add(this.locationNameComboBox); - this.nameGroupBox.Location = new System.Drawing.Point(238, 12); + this.nameGroupBox.Location = new System.Drawing.Point(317, 15); + this.nameGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.nameGroupBox.Name = "nameGroupBox"; - this.nameGroupBox.Size = new System.Drawing.Size(562, 140); + this.nameGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.nameGroupBox.Size = new System.Drawing.Size(749, 172); this.nameGroupBox.TabIndex = 28; this.nameGroupBox.TabStop = false; this.nameGroupBox.Text = "Location Info"; @@ -1709,9 +1764,10 @@ // internalNameLenLabel // this.internalNameLenLabel.ForeColor = System.Drawing.Color.Green; - this.internalNameLenLabel.Location = new System.Drawing.Point(434, 41); + this.internalNameLenLabel.Location = new System.Drawing.Point(579, 50); + this.internalNameLenLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.internalNameLenLabel.Name = "internalNameLenLabel"; - this.internalNameLenLabel.Size = new System.Drawing.Size(32, 16); + this.internalNameLenLabel.Size = new System.Drawing.Size(43, 20); this.internalNameLenLabel.TabIndex = 44; this.internalNameLenLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // @@ -1719,9 +1775,10 @@ // this.pasteLocationNameButton.Enabled = false; this.pasteLocationNameButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteLocationNameButton.Image"))); - this.pasteLocationNameButton.Location = new System.Drawing.Point(215, 32); + this.pasteLocationNameButton.Location = new System.Drawing.Point(287, 39); + this.pasteLocationNameButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pasteLocationNameButton.Name = "pasteLocationNameButton"; - this.pasteLocationNameButton.Size = new System.Drawing.Size(35, 37); + this.pasteLocationNameButton.Size = new System.Drawing.Size(47, 46); this.pasteLocationNameButton.TabIndex = 43; this.pasteLocationNameButton.UseVisualStyleBackColor = true; this.pasteLocationNameButton.Click += new System.EventHandler(this.pasteLocationNameButton_Click); @@ -1729,9 +1786,10 @@ // copyLocationNameButton // this.copyLocationNameButton.Image = global::DSPRE.Properties.Resources.copyIcon; - this.copyLocationNameButton.Location = new System.Drawing.Point(178, 32); + this.copyLocationNameButton.Location = new System.Drawing.Point(237, 39); + this.copyLocationNameButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.copyLocationNameButton.Name = "copyLocationNameButton"; - this.copyLocationNameButton.Size = new System.Drawing.Size(35, 37); + this.copyLocationNameButton.Size = new System.Drawing.Size(47, 46); this.copyLocationNameButton.TabIndex = 42; this.copyLocationNameButton.UseVisualStyleBackColor = true; this.copyLocationNameButton.Click += new System.EventHandler(this.copyLocationNameButton_Click); @@ -1740,9 +1798,10 @@ // this.pasteInternalNameButton.Enabled = false; this.pasteInternalNameButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteInternalNameButton.Image"))); - this.pasteInternalNameButton.Location = new System.Drawing.Point(511, 31); + this.pasteInternalNameButton.Location = new System.Drawing.Point(681, 38); + this.pasteInternalNameButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pasteInternalNameButton.Name = "pasteInternalNameButton"; - this.pasteInternalNameButton.Size = new System.Drawing.Size(35, 37); + this.pasteInternalNameButton.Size = new System.Drawing.Size(47, 46); this.pasteInternalNameButton.TabIndex = 41; this.pasteInternalNameButton.UseVisualStyleBackColor = true; this.pasteInternalNameButton.Click += new System.EventHandler(this.pasteInternalNameButton_Click); @@ -1750,9 +1809,10 @@ // copyInternalNameButton // this.copyInternalNameButton.Image = ((System.Drawing.Image)(resources.GetObject("copyInternalNameButton.Image"))); - this.copyInternalNameButton.Location = new System.Drawing.Point(474, 31); + this.copyInternalNameButton.Location = new System.Drawing.Point(632, 38); + this.copyInternalNameButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.copyInternalNameButton.Name = "copyInternalNameButton"; - this.copyInternalNameButton.Size = new System.Drawing.Size(35, 37); + this.copyInternalNameButton.Size = new System.Drawing.Size(47, 46); this.copyInternalNameButton.TabIndex = 40; this.copyInternalNameButton.UseVisualStyleBackColor = true; this.copyInternalNameButton.Click += new System.EventHandler(this.copyInternalNameButton_Click); @@ -1761,9 +1821,10 @@ // this.pasteAreaIconButton.Enabled = false; this.pasteAreaIconButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteAreaIconButton.Image"))); - this.pasteAreaIconButton.Location = new System.Drawing.Point(511, 91); + this.pasteAreaIconButton.Location = new System.Drawing.Point(681, 112); + this.pasteAreaIconButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pasteAreaIconButton.Name = "pasteAreaIconButton"; - this.pasteAreaIconButton.Size = new System.Drawing.Size(35, 37); + this.pasteAreaIconButton.Size = new System.Drawing.Size(47, 46); this.pasteAreaIconButton.TabIndex = 39; this.pasteAreaIconButton.UseVisualStyleBackColor = true; this.pasteAreaIconButton.Click += new System.EventHandler(this.pasteAreaIconButton_Click); @@ -1771,9 +1832,10 @@ // copyAreaIconButton // this.copyAreaIconButton.Image = ((System.Drawing.Image)(resources.GetObject("copyAreaIconButton.Image"))); - this.copyAreaIconButton.Location = new System.Drawing.Point(474, 91); + this.copyAreaIconButton.Location = new System.Drawing.Point(632, 112); + this.copyAreaIconButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.copyAreaIconButton.Name = "copyAreaIconButton"; - this.copyAreaIconButton.Size = new System.Drawing.Size(35, 37); + this.copyAreaIconButton.Size = new System.Drawing.Size(47, 46); this.copyAreaIconButton.TabIndex = 38; this.copyAreaIconButton.UseVisualStyleBackColor = true; this.copyAreaIconButton.Click += new System.EventHandler(this.copyAreaIconButton_Click); @@ -1782,9 +1844,10 @@ // this.pasteAreaSettingsButton.Enabled = false; this.pasteAreaSettingsButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteAreaSettingsButton.Image"))); - this.pasteAreaSettingsButton.Location = new System.Drawing.Point(215, 91); + this.pasteAreaSettingsButton.Location = new System.Drawing.Point(287, 112); + this.pasteAreaSettingsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pasteAreaSettingsButton.Name = "pasteAreaSettingsButton"; - this.pasteAreaSettingsButton.Size = new System.Drawing.Size(35, 37); + this.pasteAreaSettingsButton.Size = new System.Drawing.Size(47, 46); this.pasteAreaSettingsButton.TabIndex = 37; this.pasteAreaSettingsButton.UseVisualStyleBackColor = true; this.pasteAreaSettingsButton.Click += new System.EventHandler(this.pasteAreaSettingsButton_Click); @@ -1792,18 +1855,20 @@ // areaSettingsLabel // this.areaSettingsLabel.AutoSize = true; - this.areaSettingsLabel.Location = new System.Drawing.Point(11, 86); + this.areaSettingsLabel.Location = new System.Drawing.Point(15, 106); + this.areaSettingsLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.areaSettingsLabel.Name = "areaSettingsLabel"; - this.areaSettingsLabel.Size = new System.Drawing.Size(73, 13); + this.areaSettingsLabel.Size = new System.Drawing.Size(90, 16); this.areaSettingsLabel.TabIndex = 27; this.areaSettingsLabel.Text = "Area Settings:"; // // copyAreaSettingsButton // this.copyAreaSettingsButton.Image = ((System.Drawing.Image)(resources.GetObject("copyAreaSettingsButton.Image"))); - this.copyAreaSettingsButton.Location = new System.Drawing.Point(178, 91); + this.copyAreaSettingsButton.Location = new System.Drawing.Point(237, 112); + this.copyAreaSettingsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.copyAreaSettingsButton.Name = "copyAreaSettingsButton"; - this.copyAreaSettingsButton.Size = new System.Drawing.Size(35, 37); + this.copyAreaSettingsButton.Size = new System.Drawing.Size(47, 46); this.copyAreaSettingsButton.TabIndex = 36; this.copyAreaSettingsButton.UseVisualStyleBackColor = true; this.copyAreaSettingsButton.Click += new System.EventHandler(this.copyAreaSettingsButton_Click); @@ -1811,36 +1876,40 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(11, 24); + this.label3.Location = new System.Drawing.Point(15, 30); + this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(79, 13); + this.label3.Size = new System.Drawing.Size(98, 16); this.label3.TabIndex = 28; this.label3.Text = "Location Name"; // // label14 // this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(307, 24); + this.label14.Location = new System.Drawing.Point(409, 30); + this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(71, 13); + this.label14.Size = new System.Drawing.Size(87, 16); this.label14.TabIndex = 27; this.label14.Text = "Internal name"; // // internalNameBox // - this.internalNameBox.Location = new System.Drawing.Point(310, 40); + this.internalNameBox.Location = new System.Drawing.Point(413, 49); + this.internalNameBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.internalNameBox.MaxLength = 16; this.internalNameBox.Name = "internalNameBox"; - this.internalNameBox.Size = new System.Drawing.Size(157, 20); + this.internalNameBox.Size = new System.Drawing.Size(208, 22); this.internalNameBox.TabIndex = 6; this.internalNameBox.TextChanged += new System.EventHandler(this.internalNameBox_TextChanged); // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(307, 86); + this.label2.Location = new System.Drawing.Point(409, 106); + this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(55, 13); + this.label2.Size = new System.Drawing.Size(67, 16); this.label2.TabIndex = 4; this.label2.Text = "Area icon:"; // @@ -1849,9 +1918,10 @@ this.areaIconComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.areaIconComboBox.FormattingEnabled = true; this.areaIconComboBox.IntegralHeight = false; - this.areaIconComboBox.Location = new System.Drawing.Point(310, 102); + this.areaIconComboBox.Location = new System.Drawing.Point(413, 126); + this.areaIconComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.areaIconComboBox.Name = "areaIconComboBox"; - this.areaIconComboBox.Size = new System.Drawing.Size(157, 21); + this.areaIconComboBox.Size = new System.Drawing.Size(208, 24); this.areaIconComboBox.TabIndex = 3; this.areaIconComboBox.SelectedIndexChanged += new System.EventHandler(this.areaIconComboBox_SelectedIndexChanged); // @@ -1860,9 +1930,10 @@ this.areaSettingsComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.areaSettingsComboBox.FormattingEnabled = true; this.areaSettingsComboBox.IntegralHeight = false; - this.areaSettingsComboBox.Location = new System.Drawing.Point(14, 102); + this.areaSettingsComboBox.Location = new System.Drawing.Point(19, 126); + this.areaSettingsComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.areaSettingsComboBox.Name = "areaSettingsComboBox"; - this.areaSettingsComboBox.Size = new System.Drawing.Size(157, 21); + this.areaSettingsComboBox.Size = new System.Drawing.Size(208, 24); this.areaSettingsComboBox.TabIndex = 1; this.areaSettingsComboBox.SelectedIndexChanged += new System.EventHandler(this.areaSettingsComboBox_SelectedIndexChanged); // @@ -1870,9 +1941,10 @@ // this.locationNameComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.locationNameComboBox.FormattingEnabled = true; - this.locationNameComboBox.Location = new System.Drawing.Point(14, 40); + this.locationNameComboBox.Location = new System.Drawing.Point(19, 49); + this.locationNameComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.locationNameComboBox.Name = "locationNameComboBox"; - this.locationNameComboBox.Size = new System.Drawing.Size(157, 21); + this.locationNameComboBox.Size = new System.Drawing.Size(208, 24); this.locationNameComboBox.TabIndex = 0; this.locationNameComboBox.SelectedIndexChanged += new System.EventHandler(this.mapNameComboBox_SelectedIndexChanged); // @@ -1899,62 +1971,68 @@ this.groupBox2.Controls.Add(this.cameraComboBox); this.groupBox2.Controls.Add(this.musicDayLabel); this.groupBox2.Controls.Add(this.musicDayComboBox); - this.groupBox2.Location = new System.Drawing.Point(238, 157); + this.groupBox2.Location = new System.Drawing.Point(317, 193); + this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(662, 149); + this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox2.Size = new System.Drawing.Size(883, 183); this.groupBox2.TabIndex = 29; this.groupBox2.TabStop = false; this.groupBox2.Text = "Appearance && Sound"; // // cameraUpDown // - this.cameraUpDown.Location = new System.Drawing.Point(376, 108); + this.cameraUpDown.Location = new System.Drawing.Point(501, 133); + this.cameraUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.cameraUpDown.Maximum = new decimal(new int[] { 255, 0, 0, 0}); this.cameraUpDown.Name = "cameraUpDown"; - this.cameraUpDown.Size = new System.Drawing.Size(45, 20); + this.cameraUpDown.Size = new System.Drawing.Size(60, 22); this.cameraUpDown.TabIndex = 41; this.cameraUpDown.ValueChanged += new System.EventHandler(this.cameraUpDown_ValueChanged); // // weatherUpDown // - this.weatherUpDown.Location = new System.Drawing.Point(14, 108); + this.weatherUpDown.Location = new System.Drawing.Point(19, 133); + this.weatherUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.weatherUpDown.Maximum = new decimal(new int[] { 255, 0, 0, 0}); this.weatherUpDown.Name = "weatherUpDown"; - this.weatherUpDown.Size = new System.Drawing.Size(45, 20); + this.weatherUpDown.Size = new System.Drawing.Size(60, 22); this.weatherUpDown.TabIndex = 40; this.weatherUpDown.ValueChanged += new System.EventHandler(this.weatherUpDown_ValueChanged); // // musicNightUpDown // - this.musicNightUpDown.Location = new System.Drawing.Point(376, 40); + this.musicNightUpDown.Location = new System.Drawing.Point(501, 49); + this.musicNightUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.musicNightUpDown.Maximum = new decimal(new int[] { 9999, 0, 0, 0}); this.musicNightUpDown.Name = "musicNightUpDown"; - this.musicNightUpDown.Size = new System.Drawing.Size(45, 20); + this.musicNightUpDown.Size = new System.Drawing.Size(60, 22); this.musicNightUpDown.TabIndex = 39; this.musicNightUpDown.ValueChanged += new System.EventHandler(this.musicNightUpDown_ValueChanged); // // musicDayUpDown // - this.musicDayUpDown.Location = new System.Drawing.Point(14, 41); + this.musicDayUpDown.Location = new System.Drawing.Point(19, 50); + this.musicDayUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.musicDayUpDown.Maximum = new decimal(new int[] { 9999, 0, 0, 0}); this.musicDayUpDown.Name = "musicDayUpDown"; - this.musicDayUpDown.Size = new System.Drawing.Size(45, 20); + this.musicDayUpDown.Size = new System.Drawing.Size(60, 22); this.musicDayUpDown.TabIndex = 38; this.musicDayUpDown.ValueChanged += new System.EventHandler(this.musicDayUpDown_ValueChanged); // @@ -1962,9 +2040,10 @@ // this.pasteCameraAngleButton.Enabled = false; this.pasteCameraAngleButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteCameraAngleButton.Image"))); - this.pasteCameraAngleButton.Location = new System.Drawing.Point(616, 97); + this.pasteCameraAngleButton.Location = new System.Drawing.Point(821, 119); + this.pasteCameraAngleButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pasteCameraAngleButton.Name = "pasteCameraAngleButton"; - this.pasteCameraAngleButton.Size = new System.Drawing.Size(35, 37); + this.pasteCameraAngleButton.Size = new System.Drawing.Size(47, 46); this.pasteCameraAngleButton.TabIndex = 37; this.pasteCameraAngleButton.UseVisualStyleBackColor = true; this.pasteCameraAngleButton.Click += new System.EventHandler(this.pasteCameraAngleButton_Click); @@ -1972,9 +2051,10 @@ // copyCameraAngleButton // this.copyCameraAngleButton.Image = ((System.Drawing.Image)(resources.GetObject("copyCameraAngleButton.Image"))); - this.copyCameraAngleButton.Location = new System.Drawing.Point(578, 97); + this.copyCameraAngleButton.Location = new System.Drawing.Point(771, 119); + this.copyCameraAngleButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.copyCameraAngleButton.Name = "copyCameraAngleButton"; - this.copyCameraAngleButton.Size = new System.Drawing.Size(35, 37); + this.copyCameraAngleButton.Size = new System.Drawing.Size(47, 46); this.copyCameraAngleButton.TabIndex = 36; this.copyCameraAngleButton.UseVisualStyleBackColor = true; this.copyCameraAngleButton.Click += new System.EventHandler(this.copyCameraAngleButton_Click); @@ -1983,9 +2063,10 @@ // this.pasteWeatherButton.Enabled = false; this.pasteWeatherButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteWeatherButton.Image"))); - this.pasteWeatherButton.Location = new System.Drawing.Point(252, 99); + this.pasteWeatherButton.Location = new System.Drawing.Point(336, 122); + this.pasteWeatherButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pasteWeatherButton.Name = "pasteWeatherButton"; - this.pasteWeatherButton.Size = new System.Drawing.Size(35, 37); + this.pasteWeatherButton.Size = new System.Drawing.Size(47, 46); this.pasteWeatherButton.TabIndex = 35; this.pasteWeatherButton.UseVisualStyleBackColor = true; this.pasteWeatherButton.Click += new System.EventHandler(this.pasteWeatherButton_Click); @@ -1993,9 +2074,10 @@ // copyWeatherButton // this.copyWeatherButton.Image = ((System.Drawing.Image)(resources.GetObject("copyWeatherButton.Image"))); - this.copyWeatherButton.Location = new System.Drawing.Point(215, 99); + this.copyWeatherButton.Location = new System.Drawing.Point(287, 122); + this.copyWeatherButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.copyWeatherButton.Name = "copyWeatherButton"; - this.copyWeatherButton.Size = new System.Drawing.Size(35, 37); + this.copyWeatherButton.Size = new System.Drawing.Size(47, 46); this.copyWeatherButton.TabIndex = 34; this.copyWeatherButton.UseVisualStyleBackColor = true; this.copyWeatherButton.Click += new System.EventHandler(this.copyWeatherButton_Click); @@ -2004,9 +2086,10 @@ // this.pasteMusicNightButton.Enabled = false; this.pasteMusicNightButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteMusicNightButton.Image"))); - this.pasteMusicNightButton.Location = new System.Drawing.Point(616, 31); + this.pasteMusicNightButton.Location = new System.Drawing.Point(821, 38); + this.pasteMusicNightButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pasteMusicNightButton.Name = "pasteMusicNightButton"; - this.pasteMusicNightButton.Size = new System.Drawing.Size(35, 37); + this.pasteMusicNightButton.Size = new System.Drawing.Size(47, 46); this.pasteMusicNightButton.TabIndex = 33; this.pasteMusicNightButton.UseVisualStyleBackColor = true; this.pasteMusicNightButton.Click += new System.EventHandler(this.pasteMusicNightButton_Click); @@ -2014,9 +2097,10 @@ // copyMusicNightButton // this.copyMusicNightButton.Image = ((System.Drawing.Image)(resources.GetObject("copyMusicNightButton.Image"))); - this.copyMusicNightButton.Location = new System.Drawing.Point(578, 31); + this.copyMusicNightButton.Location = new System.Drawing.Point(771, 38); + this.copyMusicNightButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.copyMusicNightButton.Name = "copyMusicNightButton"; - this.copyMusicNightButton.Size = new System.Drawing.Size(35, 37); + this.copyMusicNightButton.Size = new System.Drawing.Size(47, 46); this.copyMusicNightButton.TabIndex = 32; this.copyMusicNightButton.UseVisualStyleBackColor = true; this.copyMusicNightButton.Click += new System.EventHandler(this.copyMusicNightButton_Click); @@ -2025,9 +2109,10 @@ // this.pasteMusicDayButton.Enabled = false; this.pasteMusicDayButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteMusicDayButton.Image"))); - this.pasteMusicDayButton.Location = new System.Drawing.Point(252, 32); + this.pasteMusicDayButton.Location = new System.Drawing.Point(336, 39); + this.pasteMusicDayButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pasteMusicDayButton.Name = "pasteMusicDayButton"; - this.pasteMusicDayButton.Size = new System.Drawing.Size(35, 37); + this.pasteMusicDayButton.Size = new System.Drawing.Size(47, 46); this.pasteMusicDayButton.TabIndex = 31; this.pasteMusicDayButton.UseVisualStyleBackColor = true; this.pasteMusicDayButton.Click += new System.EventHandler(this.pasteMusicDayButton_Click); @@ -2035,9 +2120,10 @@ // copyMusicDayButton // this.copyMusicDayButton.Image = ((System.Drawing.Image)(resources.GetObject("copyMusicDayButton.Image"))); - this.copyMusicDayButton.Location = new System.Drawing.Point(215, 32); + this.copyMusicDayButton.Location = new System.Drawing.Point(287, 39); + this.copyMusicDayButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.copyMusicDayButton.Name = "copyMusicDayButton"; - this.copyMusicDayButton.Size = new System.Drawing.Size(35, 37); + this.copyMusicDayButton.Size = new System.Drawing.Size(47, 46); this.copyMusicDayButton.TabIndex = 30; this.copyMusicDayButton.UseVisualStyleBackColor = true; this.copyMusicDayButton.Click += new System.EventHandler(this.copyMusicDayButton_Click); @@ -2047,10 +2133,11 @@ this.weatherComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.weatherComboBox.FormattingEnabled = true; this.weatherComboBox.IntegralHeight = false; - this.weatherComboBox.Location = new System.Drawing.Point(65, 107); + this.weatherComboBox.Location = new System.Drawing.Point(87, 132); + this.weatherComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.weatherComboBox.MaxDropDownItems = 20; this.weatherComboBox.Name = "weatherComboBox"; - this.weatherComboBox.Size = new System.Drawing.Size(145, 21); + this.weatherComboBox.Size = new System.Drawing.Size(192, 24); this.weatherComboBox.TabIndex = 26; this.weatherComboBox.SelectedIndexChanged += new System.EventHandler(this.weatherComboBox_SelectedIndexChanged); // @@ -2059,37 +2146,41 @@ this.musicNightComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.musicNightComboBox.FormattingEnabled = true; this.musicNightComboBox.IntegralHeight = false; - this.musicNightComboBox.Location = new System.Drawing.Point(427, 39); + this.musicNightComboBox.Location = new System.Drawing.Point(569, 48); + this.musicNightComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.musicNightComboBox.MaxDropDownItems = 20; this.musicNightComboBox.Name = "musicNightComboBox"; - this.musicNightComboBox.Size = new System.Drawing.Size(145, 21); + this.musicNightComboBox.Size = new System.Drawing.Size(192, 24); this.musicNightComboBox.TabIndex = 25; this.musicNightComboBox.SelectedIndexChanged += new System.EventHandler(this.musicNightComboBox_SelectedIndexChanged); // // weatherLabel // this.weatherLabel.AutoSize = true; - this.weatherLabel.Location = new System.Drawing.Point(11, 88); + this.weatherLabel.Location = new System.Drawing.Point(15, 108); + this.weatherLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.weatherLabel.Name = "weatherLabel"; - this.weatherLabel.Size = new System.Drawing.Size(51, 13); + this.weatherLabel.Size = new System.Drawing.Size(61, 16); this.weatherLabel.TabIndex = 12; this.weatherLabel.Text = "Weather:"; // // cameraLabel // this.cameraLabel.AutoSize = true; - this.cameraLabel.Location = new System.Drawing.Point(373, 88); + this.cameraLabel.Location = new System.Drawing.Point(497, 108); + this.cameraLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.cameraLabel.Name = "cameraLabel"; - this.cameraLabel.Size = new System.Drawing.Size(76, 13); + this.cameraLabel.Size = new System.Drawing.Size(96, 16); this.cameraLabel.TabIndex = 10; this.cameraLabel.Text = "Camera Angle:"; // // musicNightLabel // this.musicNightLabel.AutoSize = true; - this.musicNightLabel.Location = new System.Drawing.Point(373, 21); + this.musicNightLabel.Location = new System.Drawing.Point(497, 26); + this.musicNightLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.musicNightLabel.Name = "musicNightLabel"; - this.musicNightLabel.Size = new System.Drawing.Size(72, 13); + this.musicNightLabel.Size = new System.Drawing.Size(87, 16); this.musicNightLabel.TabIndex = 8; this.musicNightLabel.Text = "Music (Night):"; // @@ -2097,18 +2188,20 @@ // this.cameraComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cameraComboBox.FormattingEnabled = true; - this.cameraComboBox.Location = new System.Drawing.Point(427, 107); + this.cameraComboBox.Location = new System.Drawing.Point(569, 132); + this.cameraComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.cameraComboBox.Name = "cameraComboBox"; - this.cameraComboBox.Size = new System.Drawing.Size(145, 21); + this.cameraComboBox.Size = new System.Drawing.Size(192, 24); this.cameraComboBox.TabIndex = 9; this.cameraComboBox.SelectedIndexChanged += new System.EventHandler(this.cameraComboBox_SelectedIndexChanged); // // musicDayLabel // this.musicDayLabel.AutoSize = true; - this.musicDayLabel.Location = new System.Drawing.Point(11, 22); + this.musicDayLabel.Location = new System.Drawing.Point(15, 27); + this.musicDayLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.musicDayLabel.Name = "musicDayLabel"; - this.musicDayLabel.Size = new System.Drawing.Size(66, 13); + this.musicDayLabel.Size = new System.Drawing.Size(81, 16); this.musicDayLabel.TabIndex = 6; this.musicDayLabel.Text = "Music (Day):"; // @@ -2117,10 +2210,11 @@ this.musicDayComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.musicDayComboBox.FormattingEnabled = true; this.musicDayComboBox.IntegralHeight = false; - this.musicDayComboBox.Location = new System.Drawing.Point(65, 40); + this.musicDayComboBox.Location = new System.Drawing.Point(87, 49); + this.musicDayComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.musicDayComboBox.MaxDropDownItems = 20; this.musicDayComboBox.Name = "musicDayComboBox"; - this.musicDayComboBox.Size = new System.Drawing.Size(145, 21); + this.musicDayComboBox.Size = new System.Drawing.Size(192, 24); this.musicDayComboBox.TabIndex = 0; this.musicDayComboBox.SelectedIndexChanged += new System.EventHandler(this.musicDayComboBox_SelectedIndexChanged); // @@ -2136,9 +2230,11 @@ this.groupBox3.Controls.Add(this.openScriptButton); this.groupBox3.Controls.Add(this.scriptLabel); this.groupBox3.Controls.Add(this.scriptFileUpDown); - this.groupBox3.Location = new System.Drawing.Point(238, 310); + this.groupBox3.Location = new System.Drawing.Point(317, 382); + this.groupBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(662, 76); + this.groupBox3.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox3.Size = new System.Drawing.Size(883, 94); this.groupBox3.TabIndex = 30; this.groupBox3.TabStop = false; this.groupBox3.Text = "Scripts"; @@ -2147,9 +2243,10 @@ // this.pasteLevelScriptsButton.Enabled = false; this.pasteLevelScriptsButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteLevelScriptsButton.Image"))); - this.pasteLevelScriptsButton.Location = new System.Drawing.Point(616, 30); + this.pasteLevelScriptsButton.Location = new System.Drawing.Point(821, 37); + this.pasteLevelScriptsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pasteLevelScriptsButton.Name = "pasteLevelScriptsButton"; - this.pasteLevelScriptsButton.Size = new System.Drawing.Size(35, 37); + this.pasteLevelScriptsButton.Size = new System.Drawing.Size(47, 46); this.pasteLevelScriptsButton.TabIndex = 29; this.pasteLevelScriptsButton.UseVisualStyleBackColor = true; this.pasteLevelScriptsButton.Click += new System.EventHandler(this.pasteLevelScriptsButton_Click); @@ -2157,9 +2254,10 @@ // copyLevelScriptsButton // this.copyLevelScriptsButton.Image = ((System.Drawing.Image)(resources.GetObject("copyLevelScriptsButton.Image"))); - this.copyLevelScriptsButton.Location = new System.Drawing.Point(578, 30); + this.copyLevelScriptsButton.Location = new System.Drawing.Point(771, 37); + this.copyLevelScriptsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.copyLevelScriptsButton.Name = "copyLevelScriptsButton"; - this.copyLevelScriptsButton.Size = new System.Drawing.Size(35, 37); + this.copyLevelScriptsButton.Size = new System.Drawing.Size(47, 46); this.copyLevelScriptsButton.TabIndex = 28; this.copyLevelScriptsButton.UseVisualStyleBackColor = true; this.copyLevelScriptsButton.Click += new System.EventHandler(this.copyLevelScriptsButton_Click); @@ -2168,9 +2266,10 @@ // this.pasteScriptsButton.Enabled = false; this.pasteScriptsButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteScriptsButton.Image"))); - this.pasteScriptsButton.Location = new System.Drawing.Point(252, 30); + this.pasteScriptsButton.Location = new System.Drawing.Point(336, 37); + this.pasteScriptsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pasteScriptsButton.Name = "pasteScriptsButton"; - this.pasteScriptsButton.Size = new System.Drawing.Size(35, 37); + this.pasteScriptsButton.Size = new System.Drawing.Size(47, 46); this.pasteScriptsButton.TabIndex = 27; this.pasteScriptsButton.UseVisualStyleBackColor = true; this.pasteScriptsButton.Click += new System.EventHandler(this.pasteScriptsButton_Click); @@ -2178,31 +2277,34 @@ // copyScriptsButton // this.copyScriptsButton.Image = ((System.Drawing.Image)(resources.GetObject("copyScriptsButton.Image"))); - this.copyScriptsButton.Location = new System.Drawing.Point(215, 30); + this.copyScriptsButton.Location = new System.Drawing.Point(287, 37); + this.copyScriptsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.copyScriptsButton.Name = "copyScriptsButton"; - this.copyScriptsButton.Size = new System.Drawing.Size(35, 37); + this.copyScriptsButton.Size = new System.Drawing.Size(47, 46); this.copyScriptsButton.TabIndex = 26; this.copyScriptsButton.UseVisualStyleBackColor = true; this.copyScriptsButton.Click += new System.EventHandler(this.copyScriptsButton_Click); // // levelScriptUpDown // - this.levelScriptUpDown.Location = new System.Drawing.Point(377, 39); + this.levelScriptUpDown.Location = new System.Drawing.Point(503, 48); + this.levelScriptUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.levelScriptUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.levelScriptUpDown.Name = "levelScriptUpDown"; - this.levelScriptUpDown.Size = new System.Drawing.Size(107, 20); + this.levelScriptUpDown.Size = new System.Drawing.Size(143, 22); this.levelScriptUpDown.TabIndex = 25; this.levelScriptUpDown.ValueChanged += new System.EventHandler(this.levelScriptUpDown_ValueChanged); // // openLevelScriptButton // - this.openLevelScriptButton.Location = new System.Drawing.Point(495, 28); + this.openLevelScriptButton.Location = new System.Drawing.Point(660, 34); + this.openLevelScriptButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.openLevelScriptButton.Name = "openLevelScriptButton"; - this.openLevelScriptButton.Size = new System.Drawing.Size(79, 40); + this.openLevelScriptButton.Size = new System.Drawing.Size(105, 49); this.openLevelScriptButton.TabIndex = 17; this.openLevelScriptButton.Text = "Open Level Scripts"; this.openLevelScriptButton.UseVisualStyleBackColor = true; @@ -2211,17 +2313,19 @@ // levelScriptLabel // this.levelScriptLabel.AutoSize = true; - this.levelScriptLabel.Location = new System.Drawing.Point(374, 21); + this.levelScriptLabel.Location = new System.Drawing.Point(499, 26); + this.levelScriptLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.levelScriptLabel.Name = "levelScriptLabel"; - this.levelScriptLabel.Size = new System.Drawing.Size(95, 13); + this.levelScriptLabel.Size = new System.Drawing.Size(115, 16); this.levelScriptLabel.TabIndex = 16; this.levelScriptLabel.Text = "Level Script File #:"; // // openScriptButton // - this.openScriptButton.Location = new System.Drawing.Point(133, 28); + this.openScriptButton.Location = new System.Drawing.Point(177, 34); + this.openScriptButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.openScriptButton.Name = "openScriptButton"; - this.openScriptButton.Size = new System.Drawing.Size(79, 40); + this.openScriptButton.Size = new System.Drawing.Size(105, 49); this.openScriptButton.TabIndex = 14; this.openScriptButton.Text = "Open &Scripts"; this.openScriptButton.UseVisualStyleBackColor = true; @@ -2230,22 +2334,24 @@ // scriptLabel // this.scriptLabel.AutoSize = true; - this.scriptLabel.Location = new System.Drawing.Point(12, 21); + this.scriptLabel.Location = new System.Drawing.Point(16, 26); + this.scriptLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.scriptLabel.Name = "scriptLabel"; - this.scriptLabel.Size = new System.Drawing.Size(66, 13); + this.scriptLabel.Size = new System.Drawing.Size(79, 16); this.scriptLabel.TabIndex = 13; this.scriptLabel.Text = "Script File #:"; // // scriptFileUpDown // - this.scriptFileUpDown.Location = new System.Drawing.Point(14, 39); + this.scriptFileUpDown.Location = new System.Drawing.Point(19, 48); + this.scriptFileUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.scriptFileUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.scriptFileUpDown.Name = "scriptFileUpDown"; - this.scriptFileUpDown.Size = new System.Drawing.Size(107, 20); + this.scriptFileUpDown.Size = new System.Drawing.Size(143, 22); this.scriptFileUpDown.TabIndex = 0; this.scriptFileUpDown.ValueChanged += new System.EventHandler(this.scriptFileUpDown_ValueChanged); // @@ -2253,10 +2359,11 @@ // this.headerListBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.headerListBox.FormattingEnabled = true; - this.headerListBox.ItemHeight = 15; - this.headerListBox.Location = new System.Drawing.Point(13, 67); + this.headerListBox.ItemHeight = 18; + this.headerListBox.Location = new System.Drawing.Point(17, 82); + this.headerListBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.headerListBox.Name = "headerListBox"; - this.headerListBox.Size = new System.Drawing.Size(214, 484); + this.headerListBox.Size = new System.Drawing.Size(284, 580); this.headerListBox.TabIndex = 2; this.headerListBox.SelectedValueChanged += new System.EventHandler(this.headerListBox_SelectedValueChanged); this.headerListBox.Leave += new System.EventHandler(this.headerListBox_Leave); @@ -2265,9 +2372,10 @@ // this.saveHeaderButton.Image = global::DSPRE.Properties.Resources.save_rom; this.saveHeaderButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.saveHeaderButton.Location = new System.Drawing.Point(1072, 517); + this.saveHeaderButton.Location = new System.Drawing.Point(1429, 636); + this.saveHeaderButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.saveHeaderButton.Name = "saveHeaderButton"; - this.saveHeaderButton.Size = new System.Drawing.Size(96, 86); + this.saveHeaderButton.Size = new System.Drawing.Size(128, 106); this.saveHeaderButton.TabIndex = 33; this.saveHeaderButton.Text = "Save &This Header"; this.saveHeaderButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2291,9 +2399,11 @@ this.flagsGroupBox.Controls.Add(this.flag6CheckBox); this.flagsGroupBox.Controls.Add(this.flag5CheckBox); this.flagsGroupBox.Controls.Add(this.flag4CheckBox); - this.flagsGroupBox.Location = new System.Drawing.Point(328, 468); + this.flagsGroupBox.Location = new System.Drawing.Point(437, 576); + this.flagsGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.flagsGroupBox.Name = "flagsGroupBox"; - this.flagsGroupBox.Size = new System.Drawing.Size(281, 136); + this.flagsGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.flagsGroupBox.Size = new System.Drawing.Size(375, 167); this.flagsGroupBox.TabIndex = 32; this.flagsGroupBox.TabStop = false; this.flagsGroupBox.Text = "Map Settings"; @@ -2307,10 +2417,11 @@ "Unallowed", "Small only", "All"}); - this.followModeComboBox.Location = new System.Drawing.Point(153, 29); + this.followModeComboBox.Location = new System.Drawing.Point(204, 36); + this.followModeComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.followModeComboBox.MaxDropDownItems = 20; this.followModeComboBox.Name = "followModeComboBox"; - this.followModeComboBox.Size = new System.Drawing.Size(76, 21); + this.followModeComboBox.Size = new System.Drawing.Size(100, 24); this.followModeComboBox.TabIndex = 57; this.followModeComboBox.Visible = false; this.followModeComboBox.SelectedIndexChanged += new System.EventHandler(this.followModeComboBox_SelectedIndexChanged); @@ -2318,9 +2429,10 @@ // johtoRadioButton // this.johtoRadioButton.AutoSize = true; - this.johtoRadioButton.Location = new System.Drawing.Point(148, 105); + this.johtoRadioButton.Location = new System.Drawing.Point(197, 129); + this.johtoRadioButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.johtoRadioButton.Name = "johtoRadioButton"; - this.johtoRadioButton.Size = new System.Drawing.Size(51, 17); + this.johtoRadioButton.Size = new System.Drawing.Size(61, 20); this.johtoRadioButton.TabIndex = 60; this.johtoRadioButton.TabStop = true; this.johtoRadioButton.Text = "Johto"; @@ -2330,9 +2442,10 @@ // kantoRadioButton // this.kantoRadioButton.AutoSize = true; - this.kantoRadioButton.Location = new System.Drawing.Point(92, 105); + this.kantoRadioButton.Location = new System.Drawing.Point(123, 129); + this.kantoRadioButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kantoRadioButton.Name = "kantoRadioButton"; - this.kantoRadioButton.Size = new System.Drawing.Size(53, 17); + this.kantoRadioButton.Size = new System.Drawing.Size(62, 20); this.kantoRadioButton.TabIndex = 59; this.kantoRadioButton.TabStop = true; this.kantoRadioButton.Text = "Kanto"; @@ -2343,9 +2456,10 @@ // followModeLabel // this.followModeLabel.AutoSize = true; - this.followModeLabel.Location = new System.Drawing.Point(150, 13); + this.followModeLabel.Location = new System.Drawing.Point(200, 16); + this.followModeLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.followModeLabel.Name = "followModeLabel"; - this.followModeLabel.Size = new System.Drawing.Size(102, 13); + this.followModeLabel.Size = new System.Drawing.Size(128, 16); this.followModeLabel.TabIndex = 58; this.followModeLabel.Text = "Following Pokemon:"; this.followModeLabel.Visible = false; @@ -2354,9 +2468,10 @@ // this.pasteMapSettingsButton.Enabled = false; this.pasteMapSettingsButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteMapSettingsButton.Image"))); - this.pasteMapSettingsButton.Location = new System.Drawing.Point(239, 74); + this.pasteMapSettingsButton.Location = new System.Drawing.Point(319, 91); + this.pasteMapSettingsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pasteMapSettingsButton.Name = "pasteMapSettingsButton"; - this.pasteMapSettingsButton.Size = new System.Drawing.Size(35, 37); + this.pasteMapSettingsButton.Size = new System.Drawing.Size(47, 46); this.pasteMapSettingsButton.TabIndex = 52; this.pasteMapSettingsButton.UseVisualStyleBackColor = true; this.pasteMapSettingsButton.Click += new System.EventHandler(this.pasteMapSettingsButton_Click); @@ -2364,41 +2479,45 @@ // battleBackgroundLabel // this.battleBackgroundLabel.AutoSize = true; - this.battleBackgroundLabel.Location = new System.Drawing.Point(151, 58); + this.battleBackgroundLabel.Location = new System.Drawing.Point(201, 71); + this.battleBackgroundLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.battleBackgroundLabel.Name = "battleBackgroundLabel"; - this.battleBackgroundLabel.Size = new System.Drawing.Size(52, 13); + this.battleBackgroundLabel.Size = new System.Drawing.Size(63, 16); this.battleBackgroundLabel.TabIndex = 37; this.battleBackgroundLabel.Text = "Battle BG"; // // copyFlagsButton // this.copyFlagsButton.Image = ((System.Drawing.Image)(resources.GetObject("copyFlagsButton.Image"))); - this.copyFlagsButton.Location = new System.Drawing.Point(239, 31); + this.copyFlagsButton.Location = new System.Drawing.Point(319, 38); + this.copyFlagsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.copyFlagsButton.Name = "copyFlagsButton"; - this.copyFlagsButton.Size = new System.Drawing.Size(35, 37); + this.copyFlagsButton.Size = new System.Drawing.Size(47, 46); this.copyFlagsButton.TabIndex = 53; this.copyFlagsButton.UseVisualStyleBackColor = true; this.copyFlagsButton.Click += new System.EventHandler(this.copyMapSettingsButton_Click); // // battleBackgroundUpDown // - this.battleBackgroundUpDown.Location = new System.Drawing.Point(154, 73); + this.battleBackgroundUpDown.Location = new System.Drawing.Point(205, 90); + this.battleBackgroundUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.battleBackgroundUpDown.Maximum = new decimal(new int[] { 31, 0, 0, 0}); this.battleBackgroundUpDown.Name = "battleBackgroundUpDown"; - this.battleBackgroundUpDown.Size = new System.Drawing.Size(75, 20); + this.battleBackgroundUpDown.Size = new System.Drawing.Size(100, 22); this.battleBackgroundUpDown.TabIndex = 36; this.battleBackgroundUpDown.ValueChanged += new System.EventHandler(this.battleBackgroundUpDown_ValueChanged); // // flag3CheckBox // this.flag3CheckBox.AutoSize = true; - this.flag3CheckBox.Location = new System.Drawing.Point(11, 26); + this.flag3CheckBox.Location = new System.Drawing.Point(15, 32); + this.flag3CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.flag3CheckBox.Name = "flag3CheckBox"; - this.flag3CheckBox.Size = new System.Drawing.Size(39, 17); + this.flag3CheckBox.Size = new System.Drawing.Size(47, 20); this.flag3CheckBox.TabIndex = 28; this.flag3CheckBox.Text = "Fly"; this.flag3CheckBox.UseVisualStyleBackColor = true; @@ -2407,9 +2526,10 @@ // flag2CheckBox // this.flag2CheckBox.AutoSize = true; - this.flag2CheckBox.Location = new System.Drawing.Point(11, 53); + this.flag2CheckBox.Location = new System.Drawing.Point(15, 65); + this.flag2CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.flag2CheckBox.Name = "flag2CheckBox"; - this.flag2CheckBox.Size = new System.Drawing.Size(76, 17); + this.flag2CheckBox.Size = new System.Drawing.Size(92, 20); this.flag2CheckBox.TabIndex = 29; this.flag2CheckBox.Text = "Esc. Rope"; this.flag2CheckBox.UseVisualStyleBackColor = true; @@ -2418,9 +2538,10 @@ // flag1CheckBox // this.flag1CheckBox.AutoSize = true; - this.flag1CheckBox.Location = new System.Drawing.Point(11, 79); + this.flag1CheckBox.Location = new System.Drawing.Point(15, 97); + this.flag1CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.flag1CheckBox.Name = "flag1CheckBox"; - this.flag1CheckBox.Size = new System.Drawing.Size(46, 17); + this.flag1CheckBox.Size = new System.Drawing.Size(53, 20); this.flag1CheckBox.TabIndex = 30; this.flag1CheckBox.Text = "Run"; this.flag1CheckBox.UseVisualStyleBackColor = true; @@ -2429,9 +2550,10 @@ // flag0CheckBox // this.flag0CheckBox.AutoSize = true; - this.flag0CheckBox.Location = new System.Drawing.Point(11, 105); + this.flag0CheckBox.Location = new System.Drawing.Point(15, 129); + this.flag0CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.flag0CheckBox.Name = "flag0CheckBox"; - this.flag0CheckBox.Size = new System.Drawing.Size(60, 17); + this.flag0CheckBox.Size = new System.Drawing.Size(73, 20); this.flag0CheckBox.TabIndex = 31; this.flag0CheckBox.Text = "Bicycle"; this.flag0CheckBox.UseVisualStyleBackColor = true; @@ -2440,9 +2562,10 @@ // flag6CheckBox // this.flag6CheckBox.AutoSize = true; - this.flag6CheckBox.Location = new System.Drawing.Point(92, 28); + this.flag6CheckBox.Location = new System.Drawing.Point(123, 34); + this.flag6CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.flag6CheckBox.Name = "flag6CheckBox"; - this.flag6CheckBox.Size = new System.Drawing.Size(15, 14); + this.flag6CheckBox.Size = new System.Drawing.Size(18, 17); this.flag6CheckBox.TabIndex = 35; this.flag6CheckBox.UseVisualStyleBackColor = true; this.flag6CheckBox.Visible = false; @@ -2451,9 +2574,10 @@ // flag5CheckBox // this.flag5CheckBox.AutoSize = true; - this.flag5CheckBox.Location = new System.Drawing.Point(92, 54); + this.flag5CheckBox.Location = new System.Drawing.Point(123, 66); + this.flag5CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.flag5CheckBox.Name = "flag5CheckBox"; - this.flag5CheckBox.Size = new System.Drawing.Size(15, 14); + this.flag5CheckBox.Size = new System.Drawing.Size(18, 17); this.flag5CheckBox.TabIndex = 32; this.flag5CheckBox.UseVisualStyleBackColor = true; this.flag5CheckBox.Visible = false; @@ -2462,9 +2586,10 @@ // flag4CheckBox // this.flag4CheckBox.AutoSize = true; - this.flag4CheckBox.Location = new System.Drawing.Point(92, 80); + this.flag4CheckBox.Location = new System.Drawing.Point(123, 98); + this.flag4CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.flag4CheckBox.Name = "flag4CheckBox"; - this.flag4CheckBox.Size = new System.Drawing.Size(15, 14); + this.flag4CheckBox.Size = new System.Drawing.Size(18, 17); this.flag4CheckBox.TabIndex = 33; this.flag4CheckBox.UseVisualStyleBackColor = true; this.flag4CheckBox.Visible = false; @@ -2473,36 +2598,40 @@ // cameraPicLabel // this.cameraPicLabel.AutoSize = true; - this.cameraPicLabel.Location = new System.Drawing.Point(909, 304); + this.cameraPicLabel.Location = new System.Drawing.Point(1212, 374); + this.cameraPicLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.cameraPicLabel.Name = "cameraPicLabel"; - this.cameraPicLabel.Size = new System.Drawing.Size(72, 13); + this.cameraPicLabel.Size = new System.Drawing.Size(92, 16); this.cameraPicLabel.TabIndex = 3; this.cameraPicLabel.Text = "Camera angle"; // // cameraPictureBox // this.cameraPictureBox.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.cameraPictureBox.Location = new System.Drawing.Point(912, 320); + this.cameraPictureBox.Location = new System.Drawing.Point(1216, 394); + this.cameraPictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.cameraPictureBox.Name = "cameraPictureBox"; - this.cameraPictureBox.Size = new System.Drawing.Size(256, 192); + this.cameraPictureBox.Size = new System.Drawing.Size(340, 235); this.cameraPictureBox.TabIndex = 2; this.cameraPictureBox.TabStop = false; // // weatherPicLabel // this.weatherPicLabel.AutoSize = true; - this.weatherPicLabel.Location = new System.Drawing.Point(909, 90); + this.weatherPicLabel.Location = new System.Drawing.Point(1212, 111); + this.weatherPicLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.weatherPicLabel.Name = "weatherPicLabel"; - this.weatherPicLabel.Size = new System.Drawing.Size(48, 13); + this.weatherPicLabel.Size = new System.Drawing.Size(58, 16); this.weatherPicLabel.TabIndex = 1; this.weatherPicLabel.Text = "Weather"; // // weatherPictureBox // this.weatherPictureBox.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.weatherPictureBox.Location = new System.Drawing.Point(912, 106); + this.weatherPictureBox.Location = new System.Drawing.Point(1216, 130); + this.weatherPictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.weatherPictureBox.Name = "weatherPictureBox"; - this.weatherPictureBox.Size = new System.Drawing.Size(256, 192); + this.weatherPictureBox.Size = new System.Drawing.Size(340, 235); this.weatherPictureBox.TabIndex = 0; this.weatherPictureBox.TabStop = false; // @@ -2531,10 +2660,11 @@ this.matrixEditorTabPage.Controls.Add(this.widthLabel); this.matrixEditorTabPage.Controls.Add(this.selectMatrixComboBox); this.matrixEditorTabPage.ImageIndex = 1; - this.matrixEditorTabPage.Location = new System.Drawing.Point(4, 23); + this.matrixEditorTabPage.Location = new System.Drawing.Point(4, 25); + this.matrixEditorTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.matrixEditorTabPage.Name = "matrixEditorTabPage"; - this.matrixEditorTabPage.Padding = new System.Windows.Forms.Padding(3); - this.matrixEditorTabPage.Size = new System.Drawing.Size(1185, 675); + this.matrixEditorTabPage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.matrixEditorTabPage.Size = new System.Drawing.Size(1583, 835); this.matrixEditorTabPage.TabIndex = 1; this.matrixEditorTabPage.Text = "Matrix Editor"; // @@ -2544,9 +2674,10 @@ this.setSpawnPointButton.Image = global::DSPRE.Properties.Resources.spawnCoordsMatrixeditorIcon; this.setSpawnPointButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.setSpawnPointButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.setSpawnPointButton.Location = new System.Drawing.Point(12, -4635); + this.setSpawnPointButton.Location = new System.Drawing.Point(16, -6448); + this.setSpawnPointButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.setSpawnPointButton.Name = "setSpawnPointButton"; - this.setSpawnPointButton.Size = new System.Drawing.Size(117, 43); + this.setSpawnPointButton.Size = new System.Drawing.Size(156, 53); this.setSpawnPointButton.TabIndex = 35; this.setSpawnPointButton.Text = "Set Spawn\r\nto Selection"; this.setSpawnPointButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2560,9 +2691,10 @@ this.saveMatrixButton.Image = global::DSPRE.Properties.Resources.save_rom; this.saveMatrixButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.saveMatrixButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.saveMatrixButton.Location = new System.Drawing.Point(12, -4590); + this.saveMatrixButton.Location = new System.Drawing.Point(16, -6393); + this.saveMatrixButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.saveMatrixButton.Name = "saveMatrixButton"; - this.saveMatrixButton.Size = new System.Drawing.Size(117, 43); + this.saveMatrixButton.Size = new System.Drawing.Size(156, 53); this.saveMatrixButton.TabIndex = 34; this.saveMatrixButton.Text = "Save Matrix"; this.saveMatrixButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2573,9 +2705,10 @@ // this.locateCurrentMatrixFile.Image = global::DSPRE.Properties.Resources.open_file; this.locateCurrentMatrixFile.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.locateCurrentMatrixFile.Location = new System.Drawing.Point(50, 232); + this.locateCurrentMatrixFile.Location = new System.Drawing.Point(67, 286); + this.locateCurrentMatrixFile.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.locateCurrentMatrixFile.Name = "locateCurrentMatrixFile"; - this.locateCurrentMatrixFile.Size = new System.Drawing.Size(41, 38); + this.locateCurrentMatrixFile.Size = new System.Drawing.Size(55, 47); this.locateCurrentMatrixFile.TabIndex = 33; this.locateCurrentMatrixFile.UseVisualStyleBackColor = true; this.locateCurrentMatrixFile.Click += new System.EventHandler(this.locateCurrentMatrixFile_Click); @@ -2584,9 +2717,10 @@ // this.resetColorTableButton.Image = global::DSPRE.Properties.Resources.resetColorTable; this.resetColorTableButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.resetColorTableButton.Location = new System.Drawing.Point(11, 446); + this.resetColorTableButton.Location = new System.Drawing.Point(15, 549); + this.resetColorTableButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.resetColorTableButton.Name = "resetColorTableButton"; - this.resetColorTableButton.Size = new System.Drawing.Size(117, 32); + this.resetColorTableButton.Size = new System.Drawing.Size(156, 39); this.resetColorTableButton.TabIndex = 31; this.resetColorTableButton.Text = "Reset Color Table"; this.resetColorTableButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2597,9 +2731,10 @@ // this.importColorTableButton.Image = global::DSPRE.Properties.Resources.loadColorTable; this.importColorTableButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.importColorTableButton.Location = new System.Drawing.Point(11, 479); + this.importColorTableButton.Location = new System.Drawing.Point(15, 590); + this.importColorTableButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.importColorTableButton.Name = "importColorTableButton"; - this.importColorTableButton.Size = new System.Drawing.Size(117, 32); + this.importColorTableButton.Size = new System.Drawing.Size(156, 39); this.importColorTableButton.TabIndex = 30; this.importColorTableButton.Text = "Import Color Table"; this.importColorTableButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2610,9 +2745,10 @@ // this.importMatrixButton.Image = global::DSPRE.Properties.Resources.importArrow; this.importMatrixButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.importMatrixButton.Location = new System.Drawing.Point(11, 152); + this.importMatrixButton.Location = new System.Drawing.Point(15, 187); + this.importMatrixButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.importMatrixButton.Name = "importMatrixButton"; - this.importMatrixButton.Size = new System.Drawing.Size(117, 29); + this.importMatrixButton.Size = new System.Drawing.Size(156, 36); this.importMatrixButton.TabIndex = 29; this.importMatrixButton.Text = "Replace Matrix"; this.importMatrixButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2623,9 +2759,10 @@ // this.exportMatrixButton.Image = global::DSPRE.Properties.Resources.exportArrow; this.exportMatrixButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.exportMatrixButton.Location = new System.Drawing.Point(11, 122); + this.exportMatrixButton.Location = new System.Drawing.Point(15, 150); + this.exportMatrixButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.exportMatrixButton.Name = "exportMatrixButton"; - this.exportMatrixButton.Size = new System.Drawing.Size(117, 29); + this.exportMatrixButton.Size = new System.Drawing.Size(156, 36); this.exportMatrixButton.TabIndex = 28; this.exportMatrixButton.Text = "Export Matrix"; this.exportMatrixButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2636,9 +2773,10 @@ // this.removeMatrixButton.Image = ((System.Drawing.Image)(resources.GetObject("removeMatrixButton.Image"))); this.removeMatrixButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeMatrixButton.Location = new System.Drawing.Point(64, 183); + this.removeMatrixButton.Location = new System.Drawing.Point(85, 225); + this.removeMatrixButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.removeMatrixButton.Name = "removeMatrixButton"; - this.removeMatrixButton.Size = new System.Drawing.Size(64, 35); + this.removeMatrixButton.Size = new System.Drawing.Size(85, 43); this.removeMatrixButton.TabIndex = 27; this.removeMatrixButton.Text = "Delete Last"; this.removeMatrixButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2649,9 +2787,10 @@ // this.addMatrixButton.Image = ((System.Drawing.Image)(resources.GetObject("addMatrixButton.Image"))); this.addMatrixButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addMatrixButton.Location = new System.Drawing.Point(11, 183); + this.addMatrixButton.Location = new System.Drawing.Point(15, 225); + this.addMatrixButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.addMatrixButton.Name = "addMatrixButton"; - this.addMatrixButton.Size = new System.Drawing.Size(51, 35); + this.addMatrixButton.Size = new System.Drawing.Size(68, 43); this.addMatrixButton.TabIndex = 2; this.addMatrixButton.Text = "Add"; this.addMatrixButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2662,9 +2801,10 @@ // this.removeHeightsButton.Image = ((System.Drawing.Image)(resources.GetObject("removeHeightsButton.Image"))); this.removeHeightsButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeHeightsButton.Location = new System.Drawing.Point(11, 402); + this.removeHeightsButton.Location = new System.Drawing.Point(15, 495); + this.removeHeightsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.removeHeightsButton.Name = "removeHeightsButton"; - this.removeHeightsButton.Size = new System.Drawing.Size(117, 35); + this.removeHeightsButton.Size = new System.Drawing.Size(156, 43); this.removeHeightsButton.TabIndex = 26; this.removeHeightsButton.Text = "Remove Heights"; this.removeHeightsButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2675,9 +2815,10 @@ // this.removeHeadersButton.Image = ((System.Drawing.Image)(resources.GetObject("removeHeadersButton.Image"))); this.removeHeadersButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeHeadersButton.Location = new System.Drawing.Point(11, 319); + this.removeHeadersButton.Location = new System.Drawing.Point(15, 393); + this.removeHeadersButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.removeHeadersButton.Name = "removeHeadersButton"; - this.removeHeadersButton.Size = new System.Drawing.Size(117, 35); + this.removeHeadersButton.Size = new System.Drawing.Size(156, 43); this.removeHeadersButton.TabIndex = 25; this.removeHeadersButton.Text = "Remove Headers"; this.removeHeadersButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2688,9 +2829,10 @@ // this.addHeightsButton.Image = ((System.Drawing.Image)(resources.GetObject("addHeightsButton.Image"))); this.addHeightsButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addHeightsButton.Location = new System.Drawing.Point(11, 366); + this.addHeightsButton.Location = new System.Drawing.Point(15, 450); + this.addHeightsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.addHeightsButton.Name = "addHeightsButton"; - this.addHeightsButton.Size = new System.Drawing.Size(117, 35); + this.addHeightsButton.Size = new System.Drawing.Size(156, 43); this.addHeightsButton.TabIndex = 24; this.addHeightsButton.Text = "Add Heights Tab"; this.addHeightsButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2701,9 +2843,10 @@ // this.addHeadersButton.Image = ((System.Drawing.Image)(resources.GetObject("addHeadersButton.Image"))); this.addHeadersButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addHeadersButton.Location = new System.Drawing.Point(11, 283); + this.addHeadersButton.Location = new System.Drawing.Point(15, 348); + this.addHeadersButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.addHeadersButton.Name = "addHeadersButton"; - this.addHeadersButton.Size = new System.Drawing.Size(117, 35); + this.addHeadersButton.Size = new System.Drawing.Size(156, 43); this.addHeadersButton.TabIndex = 23; this.addHeadersButton.Text = "Add Header Tab"; this.addHeadersButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2714,9 +2857,10 @@ // this.labelMatrices.AutoSize = true; this.labelMatrices.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.labelMatrices.Location = new System.Drawing.Point(9, 11); + this.labelMatrices.Location = new System.Drawing.Point(12, 14); + this.labelMatrices.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelMatrices.Name = "labelMatrices"; - this.labelMatrices.Size = new System.Drawing.Size(47, 13); + this.labelMatrices.Size = new System.Drawing.Size(58, 16); this.labelMatrices.TabIndex = 21; this.labelMatrices.Text = "Matrices"; // @@ -2724,9 +2868,10 @@ // this.matrixNameLabel.AutoSize = true; this.matrixNameLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.matrixNameLabel.Location = new System.Drawing.Point(10, 55); + this.matrixNameLabel.Location = new System.Drawing.Point(13, 68); + this.matrixNameLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.matrixNameLabel.Name = "matrixNameLabel"; - this.matrixNameLabel.Size = new System.Drawing.Size(64, 13); + this.matrixNameLabel.Size = new System.Drawing.Size(79, 16); this.matrixNameLabel.TabIndex = 20; this.matrixNameLabel.Text = "Matrix name"; // @@ -2738,20 +2883,22 @@ this.matrixTabControl.Controls.Add(this.headersTabPage); this.matrixTabControl.Controls.Add(this.heightsTabPage); this.matrixTabControl.Controls.Add(this.mapFilesTabPage); - this.matrixTabControl.Location = new System.Drawing.Point(139, 11); + this.matrixTabControl.Location = new System.Drawing.Point(185, 14); + this.matrixTabControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.matrixTabControl.Multiline = true; this.matrixTabControl.Name = "matrixTabControl"; this.matrixTabControl.SelectedIndex = 0; - this.matrixTabControl.Size = new System.Drawing.Size(1040, 610); + this.matrixTabControl.Size = new System.Drawing.Size(63, 7); this.matrixTabControl.TabIndex = 18; // // headersTabPage // this.headersTabPage.Controls.Add(this.headersGridView); - this.headersTabPage.Location = new System.Drawing.Point(4, 22); + this.headersTabPage.Location = new System.Drawing.Point(4, 67); + this.headersTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.headersTabPage.Name = "headersTabPage"; - this.headersTabPage.Padding = new System.Windows.Forms.Padding(3); - this.headersTabPage.Size = new System.Drawing.Size(1032, 584); + this.headersTabPage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.headersTabPage.Size = new System.Drawing.Size(55, 0); this.headersTabPage.TabIndex = 1; this.headersTabPage.Text = "Map Headers"; this.headersTabPage.UseVisualStyleBackColor = true; @@ -2782,6 +2929,7 @@ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.headersGridView.DefaultCellStyle = dataGridViewCellStyle2; this.headersGridView.Location = new System.Drawing.Point(0, 0); + this.headersGridView.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.headersGridView.MultiSelect = false; this.headersGridView.Name = "headersGridView"; dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; @@ -2802,7 +2950,7 @@ this.headersGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; this.headersGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; this.headersGridView.ShowCellErrors = false; - this.headersGridView.Size = new System.Drawing.Size(1032, 576); + this.headersGridView.Size = new System.Drawing.Size(1376, 709); this.headersGridView.TabIndex = 1; this.headersGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.headersGridView_CellFormatting); this.headersGridView.CellMouseDoubleClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.headersGridView_CellMouseDoubleClick); @@ -2812,9 +2960,10 @@ // heightsTabPage // this.heightsTabPage.Controls.Add(this.heightsGridView); - this.heightsTabPage.Location = new System.Drawing.Point(4, 58); + this.heightsTabPage.Location = new System.Drawing.Point(4, 67); + this.heightsTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.heightsTabPage.Name = "heightsTabPage"; - this.heightsTabPage.Size = new System.Drawing.Size(0, 0); + this.heightsTabPage.Size = new System.Drawing.Size(55, 0); this.heightsTabPage.TabIndex = 2; this.heightsTabPage.Text = "Map Heights"; this.heightsTabPage.UseVisualStyleBackColor = true; @@ -2847,6 +2996,7 @@ dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle7; this.heightsGridView.Location = new System.Drawing.Point(0, 0); + this.heightsGridView.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.heightsGridView.MultiSelect = false; this.heightsGridView.Name = "heightsGridView"; dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; @@ -2866,7 +3016,7 @@ this.heightsGridView.RowTemplate.Height = 18; this.heightsGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; this.heightsGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.heightsGridView.Size = new System.Drawing.Size(1032, 576); + this.heightsGridView.Size = new System.Drawing.Size(1376, 709); this.heightsGridView.TabIndex = 2; this.heightsGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.heightsGridView_CellFormatting); this.heightsGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.heightsGridView_CellValueChanged); @@ -2875,9 +3025,10 @@ // mapFilesTabPage // this.mapFilesTabPage.Controls.Add(this.mapFilesGridView); - this.mapFilesTabPage.Location = new System.Drawing.Point(4, 58); + this.mapFilesTabPage.Location = new System.Drawing.Point(4, 67); + this.mapFilesTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.mapFilesTabPage.Name = "mapFilesTabPage"; - this.mapFilesTabPage.Size = new System.Drawing.Size(0, 0); + this.mapFilesTabPage.Size = new System.Drawing.Size(55, 0); this.mapFilesTabPage.TabIndex = 3; this.mapFilesTabPage.Text = "Map Files"; this.mapFilesTabPage.UseVisualStyleBackColor = true; @@ -2910,6 +3061,7 @@ dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle12; this.mapFilesGridView.Location = new System.Drawing.Point(0, 0); + this.mapFilesGridView.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.mapFilesGridView.MultiSelect = false; this.mapFilesGridView.Name = "mapFilesGridView"; dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; @@ -2929,7 +3081,7 @@ this.mapFilesGridView.RowTemplate.Height = 18; this.mapFilesGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; this.mapFilesGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.mapFilesGridView.Size = new System.Drawing.Size(1032, 576); + this.mapFilesGridView.Size = new System.Drawing.Size(1376, 709); this.mapFilesGridView.TabIndex = 2; this.mapFilesGridView.CellContentDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.mapFilesGridView_CellMouseDoubleClick); this.mapFilesGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.mapFilesGridView_CellFormatting); @@ -2938,16 +3090,18 @@ // // matrixNameTextBox // - this.matrixNameTextBox.Location = new System.Drawing.Point(13, 69); + this.matrixNameTextBox.Location = new System.Drawing.Point(17, 85); + this.matrixNameTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.matrixNameTextBox.MaxLength = 16; this.matrixNameTextBox.Name = "matrixNameTextBox"; - this.matrixNameTextBox.Size = new System.Drawing.Size(112, 20); + this.matrixNameTextBox.Size = new System.Drawing.Size(148, 22); this.matrixNameTextBox.TabIndex = 17; this.matrixNameTextBox.TextChanged += new System.EventHandler(this.matrixNameTextBox_TextChanged); // // heightUpDown // - this.heightUpDown.Location = new System.Drawing.Point(84, 98); + this.heightUpDown.Location = new System.Drawing.Point(112, 121); + this.heightUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.heightUpDown.Maximum = new decimal(new int[] { 255, 0, @@ -2959,7 +3113,7 @@ 0, 0}); this.heightUpDown.Name = "heightUpDown"; - this.heightUpDown.Size = new System.Drawing.Size(37, 20); + this.heightUpDown.Size = new System.Drawing.Size(49, 22); this.heightUpDown.TabIndex = 16; this.heightUpDown.Value = new decimal(new int[] { 1, @@ -2970,7 +3124,8 @@ // // widthUpDown // - this.widthUpDown.Location = new System.Drawing.Point(41, 98); + this.widthUpDown.Location = new System.Drawing.Point(55, 121); + this.widthUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.widthUpDown.Maximum = new decimal(new int[] { 255, 0, @@ -2982,7 +3137,7 @@ 0, 0}); this.widthUpDown.Name = "widthUpDown"; - this.widthUpDown.Size = new System.Drawing.Size(37, 20); + this.widthUpDown.Size = new System.Drawing.Size(49, 22); this.widthUpDown.TabIndex = 15; this.widthUpDown.Value = new decimal(new int[] { 1, @@ -2995,9 +3150,10 @@ // this.widthLabel.AutoSize = true; this.widthLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.widthLabel.Location = new System.Drawing.Point(10, 101); + this.widthLabel.Location = new System.Drawing.Point(13, 124); + this.widthLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.widthLabel.Name = "widthLabel"; - this.widthLabel.Size = new System.Drawing.Size(27, 13); + this.widthLabel.Size = new System.Drawing.Size(33, 16); this.widthLabel.TabIndex = 13; this.widthLabel.Text = "Size"; // @@ -3005,9 +3161,10 @@ // this.selectMatrixComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.selectMatrixComboBox.FormattingEnabled = true; - this.selectMatrixComboBox.Location = new System.Drawing.Point(13, 27); + this.selectMatrixComboBox.Location = new System.Drawing.Point(17, 33); + this.selectMatrixComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.selectMatrixComboBox.Name = "selectMatrixComboBox"; - this.selectMatrixComboBox.Size = new System.Drawing.Size(112, 21); + this.selectMatrixComboBox.Size = new System.Drawing.Size(148, 24); this.selectMatrixComboBox.TabIndex = 12; this.selectMatrixComboBox.SelectedIndexChanged += new System.EventHandler(this.selectMatrixComboBox_SelectedIndexChanged); // @@ -3028,10 +3185,11 @@ this.mapEditorTabPage.Controls.Add(this.radio2D); this.mapEditorTabPage.Controls.Add(this.wireframeCheckBox); this.mapEditorTabPage.ImageIndex = 2; - this.mapEditorTabPage.Location = new System.Drawing.Point(4, 23); + this.mapEditorTabPage.Location = new System.Drawing.Point(4, 25); + this.mapEditorTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.mapEditorTabPage.Name = "mapEditorTabPage"; - this.mapEditorTabPage.Padding = new System.Windows.Forms.Padding(3); - this.mapEditorTabPage.Size = new System.Drawing.Size(1185, 675); + this.mapEditorTabPage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.mapEditorTabPage.Size = new System.Drawing.Size(1583, 835); this.mapEditorTabPage.TabIndex = 2; this.mapEditorTabPage.Text = "Map Editor"; this.mapEditorTabPage.Enter += new System.EventHandler(this.mapEditorTabPage_Enter); @@ -3049,13 +3207,14 @@ this.tableLayoutPanel3.Controls.Add(this.replaceMapBinButton, 0, 1); this.tableLayoutPanel3.Controls.Add(this.exportCurrentMapBinButton, 2, 1); this.tableLayoutPanel3.Controls.Add(this.saveMapButton, 0, 2); - this.tableLayoutPanel3.Location = new System.Drawing.Point(271, 486); + this.tableLayoutPanel3.Location = new System.Drawing.Point(361, 598); + this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tableLayoutPanel3.Name = "tableLayoutPanel3"; this.tableLayoutPanel3.RowCount = 3; this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(199, 129); + this.tableLayoutPanel3.Size = new System.Drawing.Size(265, 159); this.tableLayoutPanel3.TabIndex = 41; // // addMapFileButton @@ -3064,9 +3223,10 @@ this.addMapFileButton.Dock = System.Windows.Forms.DockStyle.Fill; this.addMapFileButton.Image = ((System.Drawing.Image)(resources.GetObject("addMapFileButton.Image"))); this.addMapFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addMapFileButton.Location = new System.Drawing.Point(3, 3); + this.addMapFileButton.Location = new System.Drawing.Point(4, 4); + this.addMapFileButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.addMapFileButton.Name = "addMapFileButton"; - this.addMapFileButton.Size = new System.Drawing.Size(92, 37); + this.addMapFileButton.Size = new System.Drawing.Size(124, 45); this.addMapFileButton.TabIndex = 36; this.addMapFileButton.Text = "Add \r\nMap File"; this.addMapFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -3077,9 +3237,10 @@ // this.locateCurrentMapBin.Dock = System.Windows.Forms.DockStyle.Fill; this.locateCurrentMapBin.Image = global::DSPRE.Properties.Resources.open_file; - this.locateCurrentMapBin.Location = new System.Drawing.Point(150, 89); + this.locateCurrentMapBin.Location = new System.Drawing.Point(202, 110); + this.locateCurrentMapBin.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.locateCurrentMapBin.Name = "locateCurrentMapBin"; - this.locateCurrentMapBin.Size = new System.Drawing.Size(46, 37); + this.locateCurrentMapBin.Size = new System.Drawing.Size(59, 45); this.locateCurrentMapBin.TabIndex = 40; this.locateCurrentMapBin.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.locateCurrentMapBin.UseVisualStyleBackColor = true; @@ -3091,9 +3252,10 @@ this.removeMapFileButton.Dock = System.Windows.Forms.DockStyle.Fill; this.removeMapFileButton.Image = global::DSPRE.Properties.Resources.deleteIcon; this.removeMapFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeMapFileButton.Location = new System.Drawing.Point(101, 3); + this.removeMapFileButton.Location = new System.Drawing.Point(136, 4); + this.removeMapFileButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.removeMapFileButton.Name = "removeMapFileButton"; - this.removeMapFileButton.Size = new System.Drawing.Size(95, 37); + this.removeMapFileButton.Size = new System.Drawing.Size(125, 45); this.removeMapFileButton.TabIndex = 35; this.removeMapFileButton.Text = "Remove \r\nLast Map"; this.removeMapFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -3106,9 +3268,10 @@ this.replaceMapBinButton.Dock = System.Windows.Forms.DockStyle.Fill; this.replaceMapBinButton.Image = ((System.Drawing.Image)(resources.GetObject("replaceMapBinButton.Image"))); this.replaceMapBinButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.replaceMapBinButton.Location = new System.Drawing.Point(3, 46); + this.replaceMapBinButton.Location = new System.Drawing.Point(4, 57); + this.replaceMapBinButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.replaceMapBinButton.Name = "replaceMapBinButton"; - this.replaceMapBinButton.Size = new System.Drawing.Size(92, 37); + this.replaceMapBinButton.Size = new System.Drawing.Size(124, 45); this.replaceMapBinButton.TabIndex = 37; this.replaceMapBinButton.Text = "Replace \r\nMap BIN"; this.replaceMapBinButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -3121,9 +3284,10 @@ this.exportCurrentMapBinButton.Dock = System.Windows.Forms.DockStyle.Fill; this.exportCurrentMapBinButton.Image = ((System.Drawing.Image)(resources.GetObject("exportCurrentMapBinButton.Image"))); this.exportCurrentMapBinButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.exportCurrentMapBinButton.Location = new System.Drawing.Point(101, 46); + this.exportCurrentMapBinButton.Location = new System.Drawing.Point(136, 57); + this.exportCurrentMapBinButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.exportCurrentMapBinButton.Name = "exportCurrentMapBinButton"; - this.exportCurrentMapBinButton.Size = new System.Drawing.Size(95, 37); + this.exportCurrentMapBinButton.Size = new System.Drawing.Size(125, 45); this.exportCurrentMapBinButton.TabIndex = 38; this.exportCurrentMapBinButton.Text = "Export \r\nMap BIN"; this.exportCurrentMapBinButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -3136,9 +3300,10 @@ this.saveMapButton.Dock = System.Windows.Forms.DockStyle.Fill; this.saveMapButton.Image = global::DSPRE.Properties.Resources.save_rom; this.saveMapButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.saveMapButton.Location = new System.Drawing.Point(3, 89); + this.saveMapButton.Location = new System.Drawing.Point(4, 110); + this.saveMapButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.saveMapButton.Name = "saveMapButton"; - this.saveMapButton.Size = new System.Drawing.Size(141, 37); + this.saveMapButton.Size = new System.Drawing.Size(190, 45); this.saveMapButton.TabIndex = 34; this.saveMapButton.Text = "Save This\r\nMap BIN\r\n"; this.saveMapButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -3148,9 +3313,10 @@ // mapScreenshotButton // this.mapScreenshotButton.Image = global::DSPRE.Properties.Resources.cameraIcon; - this.mapScreenshotButton.Location = new System.Drawing.Point(1135, 499); + this.mapScreenshotButton.Location = new System.Drawing.Point(1513, 614); + this.mapScreenshotButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.mapScreenshotButton.Name = "mapScreenshotButton"; - this.mapScreenshotButton.Size = new System.Drawing.Size(41, 40); + this.mapScreenshotButton.Size = new System.Drawing.Size(55, 49); this.mapScreenshotButton.TabIndex = 39; this.mapScreenshotButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.mapScreenshotButton.UseVisualStyleBackColor = true; @@ -3161,9 +3327,10 @@ this.mapRenderPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.mapRenderPanel.Controls.Add(this.mapOpenGlControl); this.mapRenderPanel.Controls.Add(this.movPictureBox); - this.mapRenderPanel.Location = new System.Drawing.Point(519, 3); + this.mapRenderPanel.Location = new System.Drawing.Point(692, 4); + this.mapRenderPanel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.mapRenderPanel.Name = "mapRenderPanel"; - this.mapRenderPanel.Size = new System.Drawing.Size(610, 610); + this.mapRenderPanel.Size = new System.Drawing.Size(813, 750); this.mapRenderPanel.TabIndex = 23; // // mapOpenGlControl @@ -3179,8 +3346,9 @@ this.mapOpenGlControl.Dock = System.Windows.Forms.DockStyle.Fill; this.mapOpenGlControl.ForeColor = System.Drawing.Color.Black; this.mapOpenGlControl.Location = new System.Drawing.Point(0, 0); + this.mapOpenGlControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.mapOpenGlControl.Name = "mapOpenGlControl"; - this.mapOpenGlControl.Size = new System.Drawing.Size(608, 608); + this.mapOpenGlControl.Size = new System.Drawing.Size(811, 748); this.mapOpenGlControl.StencilBits = ((byte)(0)); this.mapOpenGlControl.TabIndex = 2; this.mapOpenGlControl.Click += new System.EventHandler(this.mapOpenGlControl_Click); @@ -3191,8 +3359,9 @@ // this.movPictureBox.BackColor = System.Drawing.Color.White; this.movPictureBox.Location = new System.Drawing.Point(0, 0); + this.movPictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.movPictureBox.Name = "movPictureBox"; - this.movPictureBox.Size = new System.Drawing.Size(608, 608); + this.movPictureBox.Size = new System.Drawing.Size(811, 748); this.movPictureBox.TabIndex = 3; this.movPictureBox.TabStop = false; this.movPictureBox.Click += new System.EventHandler(this.movPictureBox_Click); @@ -3201,9 +3370,10 @@ // label26 // this.label26.AutoSize = true; - this.label26.Location = new System.Drawing.Point(16, 574); + this.label26.Location = new System.Drawing.Point(21, 706); + this.label26.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(84, 13); + this.label26.Size = new System.Drawing.Size(104, 16); this.label26.TabIndex = 33; this.label26.Text = "Buildings texture"; // @@ -3211,18 +3381,20 @@ // this.buildTextureComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.buildTextureComboBox.FormattingEnabled = true; - this.buildTextureComboBox.Location = new System.Drawing.Point(19, 588); + this.buildTextureComboBox.Location = new System.Drawing.Point(25, 724); + this.buildTextureComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buildTextureComboBox.Name = "buildTextureComboBox"; - this.buildTextureComboBox.Size = new System.Drawing.Size(233, 21); + this.buildTextureComboBox.Size = new System.Drawing.Size(309, 24); this.buildTextureComboBox.TabIndex = 32; this.buildTextureComboBox.SelectedIndexChanged += new System.EventHandler(this.buildTextureComboBox_SelectedIndexChanged); // // mapFileLabel // this.mapFileLabel.AutoSize = true; - this.mapFileLabel.Location = new System.Drawing.Point(16, 486); + this.mapFileLabel.Location = new System.Drawing.Point(21, 598); + this.mapFileLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.mapFileLabel.Name = "mapFileLabel"; - this.mapFileLabel.Size = new System.Drawing.Size(44, 13); + this.mapFileLabel.Size = new System.Drawing.Size(54, 16); this.mapFileLabel.TabIndex = 31; this.mapFileLabel.Text = "Map file"; // @@ -3230,18 +3402,20 @@ // this.mapTextureComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.mapTextureComboBox.FormattingEnabled = true; - this.mapTextureComboBox.Location = new System.Drawing.Point(19, 544); + this.mapTextureComboBox.Location = new System.Drawing.Point(25, 670); + this.mapTextureComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.mapTextureComboBox.Name = "mapTextureComboBox"; - this.mapTextureComboBox.Size = new System.Drawing.Size(233, 21); + this.mapTextureComboBox.Size = new System.Drawing.Size(309, 24); this.mapTextureComboBox.TabIndex = 30; this.mapTextureComboBox.SelectedIndexChanged += new System.EventHandler(this.mapTextureComboBox_SelectedIndexChanged); // // mapTextureLabel // this.mapTextureLabel.AutoSize = true; - this.mapTextureLabel.Location = new System.Drawing.Point(16, 530); + this.mapTextureLabel.Location = new System.Drawing.Point(21, 652); + this.mapTextureLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.mapTextureLabel.Name = "mapTextureLabel"; - this.mapTextureLabel.Size = new System.Drawing.Size(63, 13); + this.mapTextureLabel.Size = new System.Drawing.Size(76, 16); this.mapTextureLabel.TabIndex = 29; this.mapTextureLabel.Text = "Map texture"; // @@ -3249,9 +3423,10 @@ // this.selectMapComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.selectMapComboBox.FormattingEnabled = true; - this.selectMapComboBox.Location = new System.Drawing.Point(19, 500); + this.selectMapComboBox.Location = new System.Drawing.Point(25, 615); + this.selectMapComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.selectMapComboBox.Name = "selectMapComboBox"; - this.selectMapComboBox.Size = new System.Drawing.Size(233, 21); + this.selectMapComboBox.Size = new System.Drawing.Size(309, 24); this.selectMapComboBox.TabIndex = 28; this.selectMapComboBox.SelectedIndexChanged += new System.EventHandler(this.selectMapComboBox_SelectedIndexChanged); // @@ -3262,10 +3437,11 @@ this.mapPartsTabControl.Controls.Add(this.modelTabPage); this.mapPartsTabControl.Controls.Add(this.terrainTabPage); this.mapPartsTabControl.Controls.Add(this.bgsTabPage); - this.mapPartsTabControl.Location = new System.Drawing.Point(15, 6); + this.mapPartsTabControl.Location = new System.Drawing.Point(20, 7); + this.mapPartsTabControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.mapPartsTabControl.Name = "mapPartsTabControl"; this.mapPartsTabControl.SelectedIndex = 0; - this.mapPartsTabControl.Size = new System.Drawing.Size(489, 476); + this.mapPartsTabControl.Size = new System.Drawing.Size(652, 586); this.mapPartsTabControl.TabIndex = 24; this.mapPartsTabControl.SelectedIndexChanged += new System.EventHandler(this.mapPartsTabControl_SelectedIndexChanged); // @@ -3287,10 +3463,11 @@ this.buildingsTabPage.Controls.Add(this.addBuildingButton); this.buildingsTabPage.Controls.Add(this.buildPositionGroupBox); this.buildingsTabPage.Controls.Add(this.buildingsListBox); - this.buildingsTabPage.Location = new System.Drawing.Point(4, 22); + this.buildingsTabPage.Location = new System.Drawing.Point(4, 25); + this.buildingsTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buildingsTabPage.Name = "buildingsTabPage"; - this.buildingsTabPage.Padding = new System.Windows.Forms.Padding(3); - this.buildingsTabPage.Size = new System.Drawing.Size(481, 450); + this.buildingsTabPage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.buildingsTabPage.Size = new System.Drawing.Size(644, 557); this.buildingsTabPage.TabIndex = 0; this.buildingsTabPage.Text = "Buildings"; this.buildingsTabPage.UseVisualStyleBackColor = true; @@ -3304,9 +3481,11 @@ this.groupBox33.Controls.Add(this.xRotBuildUpDown); this.groupBox33.Controls.Add(this.zRotBuildUpDown); this.groupBox33.Enabled = false; - this.groupBox33.Location = new System.Drawing.Point(339, 141); + this.groupBox33.Location = new System.Drawing.Point(452, 174); + this.groupBox33.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox33.Name = "groupBox33"; - this.groupBox33.Size = new System.Drawing.Size(131, 123); + this.groupBox33.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox33.Size = new System.Drawing.Size(175, 151); this.groupBox33.TabIndex = 44; this.groupBox33.TabStop = false; this.groupBox33.Text = "Rotation"; @@ -3314,81 +3493,87 @@ // yRotDegBldUpDown // this.yRotDegBldUpDown.DecimalPlaces = 2; - this.yRotDegBldUpDown.Location = new System.Drawing.Point(66, 56); + this.yRotDegBldUpDown.Location = new System.Drawing.Point(88, 69); + this.yRotDegBldUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.yRotDegBldUpDown.Maximum = new decimal(new int[] { 360, 0, 0, 0}); this.yRotDegBldUpDown.Name = "yRotDegBldUpDown"; - this.yRotDegBldUpDown.Size = new System.Drawing.Size(58, 20); + this.yRotDegBldUpDown.Size = new System.Drawing.Size(77, 22); this.yRotDegBldUpDown.TabIndex = 27; this.yRotDegBldUpDown.ValueChanged += new System.EventHandler(this.yRotDegBldUpDown_ValueChanged); // // xRotDegBldUpDown // this.xRotDegBldUpDown.DecimalPlaces = 2; - this.xRotDegBldUpDown.Location = new System.Drawing.Point(66, 20); + this.xRotDegBldUpDown.Location = new System.Drawing.Point(88, 25); + this.xRotDegBldUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.xRotDegBldUpDown.Maximum = new decimal(new int[] { 360, 0, 0, 0}); this.xRotDegBldUpDown.Name = "xRotDegBldUpDown"; - this.xRotDegBldUpDown.Size = new System.Drawing.Size(58, 20); + this.xRotDegBldUpDown.Size = new System.Drawing.Size(77, 22); this.xRotDegBldUpDown.TabIndex = 25; this.xRotDegBldUpDown.ValueChanged += new System.EventHandler(this.xRotDegBldUpDown_ValueChanged); // // zRotDegBldUpDown // this.zRotDegBldUpDown.DecimalPlaces = 2; - this.zRotDegBldUpDown.Location = new System.Drawing.Point(66, 93); + this.zRotDegBldUpDown.Location = new System.Drawing.Point(88, 114); + this.zRotDegBldUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.zRotDegBldUpDown.Maximum = new decimal(new int[] { 360, 0, 0, 0}); this.zRotDegBldUpDown.Name = "zRotDegBldUpDown"; - this.zRotDegBldUpDown.Size = new System.Drawing.Size(58, 20); + this.zRotDegBldUpDown.Size = new System.Drawing.Size(77, 22); this.zRotDegBldUpDown.TabIndex = 26; this.zRotDegBldUpDown.ValueChanged += new System.EventHandler(this.zRotDegBldUpDown_ValueChanged); // // yRotBuildUpDown // - this.yRotBuildUpDown.Location = new System.Drawing.Point(6, 56); + this.yRotBuildUpDown.Location = new System.Drawing.Point(8, 69); + this.yRotBuildUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.yRotBuildUpDown.Maximum = new decimal(new int[] { 65536, 0, 0, 0}); this.yRotBuildUpDown.Name = "yRotBuildUpDown"; - this.yRotBuildUpDown.Size = new System.Drawing.Size(56, 20); + this.yRotBuildUpDown.Size = new System.Drawing.Size(75, 22); this.yRotBuildUpDown.TabIndex = 24; this.yRotBuildUpDown.ValueChanged += new System.EventHandler(this.yRotBuildUpDown_ValueChanged); // // xRotBuildUpDown // - this.xRotBuildUpDown.Location = new System.Drawing.Point(6, 20); + this.xRotBuildUpDown.Location = new System.Drawing.Point(8, 25); + this.xRotBuildUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.xRotBuildUpDown.Maximum = new decimal(new int[] { 65536, 0, 0, 0}); this.xRotBuildUpDown.Name = "xRotBuildUpDown"; - this.xRotBuildUpDown.Size = new System.Drawing.Size(56, 20); + this.xRotBuildUpDown.Size = new System.Drawing.Size(75, 22); this.xRotBuildUpDown.TabIndex = 22; this.xRotBuildUpDown.ValueChanged += new System.EventHandler(this.xRotBuildUpDown_ValueChanged); // // zRotBuildUpDown // - this.zRotBuildUpDown.Location = new System.Drawing.Point(6, 93); + this.zRotBuildUpDown.Location = new System.Drawing.Point(8, 114); + this.zRotBuildUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.zRotBuildUpDown.Maximum = new decimal(new int[] { 65536, 0, 0, 0}); this.zRotBuildUpDown.Name = "zRotBuildUpDown"; - this.zRotBuildUpDown.Size = new System.Drawing.Size(56, 20); + this.zRotBuildUpDown.Size = new System.Drawing.Size(75, 22); this.zRotBuildUpDown.TabIndex = 23; this.zRotBuildUpDown.ValueChanged += new System.EventHandler(this.zRotBuildUpDown_ValueChanged); // @@ -3397,9 +3582,10 @@ this.yLabel.AutoSize = true; this.yLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.yLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); - this.yLabel.Location = new System.Drawing.Point(183, 198); + this.yLabel.Location = new System.Drawing.Point(244, 244); + this.yLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.yLabel.Name = "yLabel"; - this.yLabel.Size = new System.Drawing.Size(15, 15); + this.yLabel.Size = new System.Drawing.Size(18, 18); this.yLabel.TabIndex = 10; this.yLabel.Text = "Y"; // @@ -3408,9 +3594,11 @@ this.lockXZgroupbox.Controls.Add(this.bldPlaceLockXcheckbox); this.lockXZgroupbox.Controls.Add(this.bldPlaceLockZcheckbox); this.lockXZgroupbox.Enabled = false; - this.lockXZgroupbox.Location = new System.Drawing.Point(272, 271); + this.lockXZgroupbox.Location = new System.Drawing.Point(363, 334); + this.lockXZgroupbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.lockXZgroupbox.Name = "lockXZgroupbox"; - this.lockXZgroupbox.Size = new System.Drawing.Size(154, 36); + this.lockXZgroupbox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.lockXZgroupbox.Size = new System.Drawing.Size(205, 44); this.lockXZgroupbox.TabIndex = 43; this.lockXZgroupbox.TabStop = false; // @@ -3421,9 +3609,10 @@ this.bldPlaceLockXcheckbox.Enabled = false; this.bldPlaceLockXcheckbox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.bldPlaceLockXcheckbox.ForeColor = System.Drawing.Color.Red; - this.bldPlaceLockXcheckbox.Location = new System.Drawing.Point(10, 9); + this.bldPlaceLockXcheckbox.Location = new System.Drawing.Point(13, 11); + this.bldPlaceLockXcheckbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.bldPlaceLockXcheckbox.Name = "bldPlaceLockXcheckbox"; - this.bldPlaceLockXcheckbox.Size = new System.Drawing.Size(57, 23); + this.bldPlaceLockXcheckbox.Size = new System.Drawing.Size(67, 27); this.bldPlaceLockXcheckbox.TabIndex = 41; this.bldPlaceLockXcheckbox.Text = "Lock X"; this.bldPlaceLockXcheckbox.UseVisualStyleBackColor = true; @@ -3436,9 +3625,10 @@ this.bldPlaceLockZcheckbox.Enabled = false; this.bldPlaceLockZcheckbox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.bldPlaceLockZcheckbox.ForeColor = System.Drawing.Color.Blue; - this.bldPlaceLockZcheckbox.Location = new System.Drawing.Point(85, 9); + this.bldPlaceLockZcheckbox.Location = new System.Drawing.Point(113, 11); + this.bldPlaceLockZcheckbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.bldPlaceLockZcheckbox.Name = "bldPlaceLockZcheckbox"; - this.bldPlaceLockZcheckbox.Size = new System.Drawing.Size(57, 23); + this.bldPlaceLockZcheckbox.Size = new System.Drawing.Size(67, 27); this.bldPlaceLockZcheckbox.TabIndex = 42; this.bldPlaceLockZcheckbox.Text = "Lock Z"; this.bldPlaceLockZcheckbox.UseVisualStyleBackColor = true; @@ -3449,9 +3639,10 @@ this.zLabel.AutoSize = true; this.zLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.zLabel.ForeColor = System.Drawing.Color.Blue; - this.zLabel.Location = new System.Drawing.Point(183, 233); + this.zLabel.Location = new System.Drawing.Point(244, 287); + this.zLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.zLabel.Name = "zLabel"; - this.zLabel.Size = new System.Drawing.Size(15, 15); + this.zLabel.Size = new System.Drawing.Size(18, 18); this.zLabel.TabIndex = 9; this.zLabel.Text = "Z"; // @@ -3460,9 +3651,10 @@ this.xLabel.AutoSize = true; this.xLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xLabel.ForeColor = System.Drawing.Color.Red; - this.xLabel.Location = new System.Drawing.Point(182, 162); + this.xLabel.Location = new System.Drawing.Point(243, 199); + this.xLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.xLabel.Name = "xLabel"; - this.xLabel.Size = new System.Drawing.Size(16, 15); + this.xLabel.Size = new System.Drawing.Size(19, 18); this.xLabel.TabIndex = 8; this.xLabel.Text = "X"; // @@ -3470,9 +3662,11 @@ // this.bldRoundGroupbox.Controls.Add(this.tableLayoutPanel2); this.bldRoundGroupbox.Enabled = false; - this.bldRoundGroupbox.Location = new System.Drawing.Point(195, 316); + this.bldRoundGroupbox.Location = new System.Drawing.Point(260, 389); + this.bldRoundGroupbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.bldRoundGroupbox.Name = "bldRoundGroupbox"; - this.bldRoundGroupbox.Size = new System.Drawing.Size(269, 83); + this.bldRoundGroupbox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.bldRoundGroupbox.Size = new System.Drawing.Size(359, 102); this.bldRoundGroupbox.TabIndex = 40; this.bldRoundGroupbox.TabStop = false; this.bldRoundGroupbox.Text = "Round"; @@ -3490,21 +3684,23 @@ this.tableLayoutPanel2.Controls.Add(this.bldRoundCent, 2, 0); this.tableLayoutPanel2.Controls.Add(this.bldRoundMil, 0, 1); this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 16); + this.tableLayoutPanel2.Location = new System.Drawing.Point(4, 19); + this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.RowCount = 2; this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(263, 64); + this.tableLayoutPanel2.Size = new System.Drawing.Size(351, 79); this.tableLayoutPanel2.TabIndex = 45; // // bldRoundDecmil // this.bldRoundDecmil.Appearance = System.Windows.Forms.Appearance.Button; this.bldRoundDecmil.Dock = System.Windows.Forms.DockStyle.Fill; - this.bldRoundDecmil.Location = new System.Drawing.Point(90, 35); + this.bldRoundDecmil.Location = new System.Drawing.Point(121, 43); + this.bldRoundDecmil.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.bldRoundDecmil.Name = "bldRoundDecmil"; - this.bldRoundDecmil.Size = new System.Drawing.Size(81, 26); + this.bldRoundDecmil.Size = new System.Drawing.Size(109, 32); this.bldRoundDecmil.TabIndex = 4; this.bldRoundDecmil.Text = ".0001"; this.bldRoundDecmil.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -3515,9 +3711,10 @@ // this.bldRoundCentMil.Appearance = System.Windows.Forms.Appearance.Button; this.bldRoundCentMil.Dock = System.Windows.Forms.DockStyle.Fill; - this.bldRoundCentMil.Location = new System.Drawing.Point(177, 35); + this.bldRoundCentMil.Location = new System.Drawing.Point(238, 43); + this.bldRoundCentMil.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.bldRoundCentMil.Name = "bldRoundCentMil"; - this.bldRoundCentMil.Size = new System.Drawing.Size(83, 26); + this.bldRoundCentMil.Size = new System.Drawing.Size(109, 32); this.bldRoundCentMil.TabIndex = 5; this.bldRoundCentMil.Text = ".00001"; this.bldRoundCentMil.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -3528,9 +3725,10 @@ // this.bldRoundWhole.Appearance = System.Windows.Forms.Appearance.Button; this.bldRoundWhole.Dock = System.Windows.Forms.DockStyle.Fill; - this.bldRoundWhole.Location = new System.Drawing.Point(3, 3); + this.bldRoundWhole.Location = new System.Drawing.Point(4, 4); + this.bldRoundWhole.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.bldRoundWhole.Name = "bldRoundWhole"; - this.bldRoundWhole.Size = new System.Drawing.Size(81, 26); + this.bldRoundWhole.Size = new System.Drawing.Size(109, 31); this.bldRoundWhole.TabIndex = 0; this.bldRoundWhole.Text = "Whole"; this.bldRoundWhole.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -3542,9 +3740,10 @@ this.bldRoundDec.Appearance = System.Windows.Forms.Appearance.Button; this.bldRoundDec.Checked = true; this.bldRoundDec.Dock = System.Windows.Forms.DockStyle.Fill; - this.bldRoundDec.Location = new System.Drawing.Point(90, 3); + this.bldRoundDec.Location = new System.Drawing.Point(121, 4); + this.bldRoundDec.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.bldRoundDec.Name = "bldRoundDec"; - this.bldRoundDec.Size = new System.Drawing.Size(81, 26); + this.bldRoundDec.Size = new System.Drawing.Size(109, 31); this.bldRoundDec.TabIndex = 1; this.bldRoundDec.TabStop = true; this.bldRoundDec.Text = ".1"; @@ -3556,9 +3755,10 @@ // this.bldRoundCent.Appearance = System.Windows.Forms.Appearance.Button; this.bldRoundCent.Dock = System.Windows.Forms.DockStyle.Fill; - this.bldRoundCent.Location = new System.Drawing.Point(177, 3); + this.bldRoundCent.Location = new System.Drawing.Point(238, 4); + this.bldRoundCent.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.bldRoundCent.Name = "bldRoundCent"; - this.bldRoundCent.Size = new System.Drawing.Size(83, 26); + this.bldRoundCent.Size = new System.Drawing.Size(109, 31); this.bldRoundCent.TabIndex = 2; this.bldRoundCent.Text = ".01"; this.bldRoundCent.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -3569,9 +3769,10 @@ // this.bldRoundMil.Appearance = System.Windows.Forms.Appearance.Button; this.bldRoundMil.Dock = System.Windows.Forms.DockStyle.Fill; - this.bldRoundMil.Location = new System.Drawing.Point(3, 35); + this.bldRoundMil.Location = new System.Drawing.Point(4, 43); + this.bldRoundMil.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.bldRoundMil.Name = "bldRoundMil"; - this.bldRoundMil.Size = new System.Drawing.Size(81, 26); + this.bldRoundMil.Size = new System.Drawing.Size(109, 32); this.bldRoundMil.TabIndex = 3; this.bldRoundMil.Text = ".001"; this.bldRoundMil.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -3583,9 +3784,10 @@ this.bldPlaceWithMouseCheckbox.Appearance = System.Windows.Forms.Appearance.Button; this.bldPlaceWithMouseCheckbox.Enabled = false; this.bldPlaceWithMouseCheckbox.Image = global::DSPRE.Properties.Resources.selectBldWithMouse; - this.bldPlaceWithMouseCheckbox.Location = new System.Drawing.Point(227, 271); + this.bldPlaceWithMouseCheckbox.Location = new System.Drawing.Point(303, 334); + this.bldPlaceWithMouseCheckbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.bldPlaceWithMouseCheckbox.Name = "bldPlaceWithMouseCheckbox"; - this.bldPlaceWithMouseCheckbox.Size = new System.Drawing.Size(39, 40); + this.bldPlaceWithMouseCheckbox.Size = new System.Drawing.Size(52, 49); this.bldPlaceWithMouseCheckbox.TabIndex = 40; this.bldPlaceWithMouseCheckbox.UseVisualStyleBackColor = true; this.bldPlaceWithMouseCheckbox.CheckedChanged += new System.EventHandler(this.bldPlaceWithMouseCheckbox_CheckedChanged); @@ -3594,9 +3796,10 @@ // this.importBuildingsButton.Image = ((System.Drawing.Image)(resources.GetObject("importBuildingsButton.Image"))); this.importBuildingsButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.importBuildingsButton.Location = new System.Drawing.Point(193, 11); + this.importBuildingsButton.Location = new System.Drawing.Point(257, 14); + this.importBuildingsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.importBuildingsButton.Name = "importBuildingsButton"; - this.importBuildingsButton.Size = new System.Drawing.Size(102, 40); + this.importBuildingsButton.Size = new System.Drawing.Size(136, 49); this.importBuildingsButton.TabIndex = 21; this.importBuildingsButton.Text = "Import\r\nBuildings"; this.importBuildingsButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -3608,9 +3811,11 @@ this.groupBox20.Controls.Add(this.interiorbldRadioButton); this.groupBox20.Controls.Add(this.exteriorbldRadioButton); this.groupBox20.Controls.Add(this.buildIndexComboBox); - this.groupBox20.Location = new System.Drawing.Point(189, 57); + this.groupBox20.Location = new System.Drawing.Point(252, 70); + this.groupBox20.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox20.Name = "groupBox20"; - this.groupBox20.Size = new System.Drawing.Size(284, 81); + this.groupBox20.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox20.Size = new System.Drawing.Size(379, 100); this.groupBox20.TabIndex = 26; this.groupBox20.TabStop = false; this.groupBox20.Text = "Building Selector"; @@ -3620,9 +3825,10 @@ this.interiorbldRadioButton.Appearance = System.Windows.Forms.Appearance.Button; this.interiorbldRadioButton.AutoSize = true; this.interiorbldRadioButton.Enabled = false; - this.interiorbldRadioButton.Location = new System.Drawing.Point(9, 18); + this.interiorbldRadioButton.Location = new System.Drawing.Point(12, 22); + this.interiorbldRadioButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.interiorbldRadioButton.Name = "interiorbldRadioButton"; - this.interiorbldRadioButton.Size = new System.Drawing.Size(68, 23); + this.interiorbldRadioButton.Size = new System.Drawing.Size(80, 26); this.interiorbldRadioButton.TabIndex = 3; this.interiorbldRadioButton.Text = "Interior List"; this.interiorbldRadioButton.UseVisualStyleBackColor = true; @@ -3634,9 +3840,10 @@ this.exteriorbldRadioButton.AutoSize = true; this.exteriorbldRadioButton.Checked = true; this.exteriorbldRadioButton.Enabled = false; - this.exteriorbldRadioButton.Location = new System.Drawing.Point(83, 18); + this.exteriorbldRadioButton.Location = new System.Drawing.Point(111, 22); + this.exteriorbldRadioButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.exteriorbldRadioButton.Name = "exteriorbldRadioButton"; - this.exteriorbldRadioButton.Size = new System.Drawing.Size(71, 23); + this.exteriorbldRadioButton.Size = new System.Drawing.Size(85, 26); this.exteriorbldRadioButton.TabIndex = 4; this.exteriorbldRadioButton.TabStop = true; this.exteriorbldRadioButton.Text = "Exterior List"; @@ -3646,9 +3853,10 @@ // this.buildIndexComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.buildIndexComboBox.FormattingEnabled = true; - this.buildIndexComboBox.Location = new System.Drawing.Point(9, 48); + this.buildIndexComboBox.Location = new System.Drawing.Point(12, 59); + this.buildIndexComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buildIndexComboBox.Name = "buildIndexComboBox"; - this.buildIndexComboBox.Size = new System.Drawing.Size(264, 21); + this.buildIndexComboBox.Size = new System.Drawing.Size(351, 24); this.buildIndexComboBox.TabIndex = 1; this.buildIndexComboBox.SelectedIndexChanged += new System.EventHandler(this.buildIndexComboBox_SelectedIndexChanged); // @@ -3657,34 +3865,39 @@ this.groupBox19.Controls.Add(this.buildingHeightUpDown); this.groupBox19.Controls.Add(this.buildingWidthUpDown); this.groupBox19.Controls.Add(this.buildingLengthUpDown); - this.groupBox19.Location = new System.Drawing.Point(283, 141); + this.groupBox19.Location = new System.Drawing.Point(377, 174); + this.groupBox19.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox19.Name = "groupBox19"; - this.groupBox19.Size = new System.Drawing.Size(53, 123); + this.groupBox19.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox19.Size = new System.Drawing.Size(71, 151); this.groupBox19.TabIndex = 12; this.groupBox19.TabStop = false; this.groupBox19.Text = "Scale"; // // buildingHeightUpDown // - this.buildingHeightUpDown.Location = new System.Drawing.Point(4, 56); + this.buildingHeightUpDown.Location = new System.Drawing.Point(5, 69); + this.buildingHeightUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buildingHeightUpDown.Name = "buildingHeightUpDown"; - this.buildingHeightUpDown.Size = new System.Drawing.Size(43, 20); + this.buildingHeightUpDown.Size = new System.Drawing.Size(57, 22); this.buildingHeightUpDown.TabIndex = 24; this.buildingHeightUpDown.ValueChanged += new System.EventHandler(this.buildingHeightUpDown_ValueChanged); // // buildingWidthUpDown // - this.buildingWidthUpDown.Location = new System.Drawing.Point(4, 20); + this.buildingWidthUpDown.Location = new System.Drawing.Point(5, 25); + this.buildingWidthUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buildingWidthUpDown.Name = "buildingWidthUpDown"; - this.buildingWidthUpDown.Size = new System.Drawing.Size(43, 20); + this.buildingWidthUpDown.Size = new System.Drawing.Size(57, 22); this.buildingWidthUpDown.TabIndex = 22; this.buildingWidthUpDown.ValueChanged += new System.EventHandler(this.buildingWidthUpDown_ValueChanged); // // buildingLengthUpDown // - this.buildingLengthUpDown.Location = new System.Drawing.Point(4, 93); + this.buildingLengthUpDown.Location = new System.Drawing.Point(5, 114); + this.buildingLengthUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buildingLengthUpDown.Name = "buildingLengthUpDown"; - this.buildingLengthUpDown.Size = new System.Drawing.Size(43, 20); + this.buildingLengthUpDown.Size = new System.Drawing.Size(57, 22); this.buildingLengthUpDown.TabIndex = 23; this.buildingLengthUpDown.ValueChanged += new System.EventHandler(this.buildingLengthUpDown_ValueChanged); // @@ -3692,9 +3905,10 @@ // this.duplicateBuildingButton.Image = global::DSPRE.Properties.Resources.copyIcon_small; this.duplicateBuildingButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.duplicateBuildingButton.Location = new System.Drawing.Point(352, 405); + this.duplicateBuildingButton.Location = new System.Drawing.Point(469, 498); + this.duplicateBuildingButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.duplicateBuildingButton.Name = "duplicateBuildingButton"; - this.duplicateBuildingButton.Size = new System.Drawing.Size(80, 32); + this.duplicateBuildingButton.Size = new System.Drawing.Size(107, 39); this.duplicateBuildingButton.TabIndex = 25; this.duplicateBuildingButton.Text = "Duplicate"; this.duplicateBuildingButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -3705,9 +3919,10 @@ // this.exportBuildingsButton.Image = ((System.Drawing.Image)(resources.GetObject("exportBuildingsButton.Image"))); this.exportBuildingsButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.exportBuildingsButton.Location = new System.Drawing.Point(298, 11); + this.exportBuildingsButton.Location = new System.Drawing.Point(397, 14); + this.exportBuildingsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.exportBuildingsButton.Name = "exportBuildingsButton"; - this.exportBuildingsButton.Size = new System.Drawing.Size(102, 40); + this.exportBuildingsButton.Size = new System.Drawing.Size(136, 49); this.exportBuildingsButton.TabIndex = 20; this.exportBuildingsButton.Text = "Export\r\nBuildings"; this.exportBuildingsButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -3718,9 +3933,10 @@ // this.removeBuildingButton.Image = global::DSPRE.Properties.Resources.deleteIcon; this.removeBuildingButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeBuildingButton.Location = new System.Drawing.Point(281, 405); + this.removeBuildingButton.Location = new System.Drawing.Point(375, 498); + this.removeBuildingButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.removeBuildingButton.Name = "removeBuildingButton"; - this.removeBuildingButton.Size = new System.Drawing.Size(70, 32); + this.removeBuildingButton.Size = new System.Drawing.Size(93, 39); this.removeBuildingButton.TabIndex = 13; this.removeBuildingButton.Text = "Delete"; this.removeBuildingButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -3731,9 +3947,10 @@ // this.addBuildingButton.Image = ((System.Drawing.Image)(resources.GetObject("addBuildingButton.Image"))); this.addBuildingButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addBuildingButton.Location = new System.Drawing.Point(224, 405); + this.addBuildingButton.Location = new System.Drawing.Point(299, 498); + this.addBuildingButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.addBuildingButton.Name = "addBuildingButton"; - this.addBuildingButton.Size = new System.Drawing.Size(56, 32); + this.addBuildingButton.Size = new System.Drawing.Size(75, 39); this.addBuildingButton.TabIndex = 12; this.addBuildingButton.Text = "Add"; this.addBuildingButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -3745,9 +3962,11 @@ this.buildPositionGroupBox.Controls.Add(this.yBuildUpDown); this.buildPositionGroupBox.Controls.Add(this.xBuildUpDown); this.buildPositionGroupBox.Controls.Add(this.zBuildUpDown); - this.buildPositionGroupBox.Location = new System.Drawing.Point(198, 141); + this.buildPositionGroupBox.Location = new System.Drawing.Point(264, 174); + this.buildPositionGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buildPositionGroupBox.Name = "buildPositionGroupBox"; - this.buildPositionGroupBox.Size = new System.Drawing.Size(81, 123); + this.buildPositionGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.buildPositionGroupBox.Size = new System.Drawing.Size(108, 151); this.buildPositionGroupBox.TabIndex = 11; this.buildPositionGroupBox.TabStop = false; this.buildPositionGroupBox.Text = "Position"; @@ -3755,7 +3974,8 @@ // yBuildUpDown // this.yBuildUpDown.DecimalPlaces = 5; - this.yBuildUpDown.Location = new System.Drawing.Point(6, 56); + this.yBuildUpDown.Location = new System.Drawing.Point(8, 69); + this.yBuildUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.yBuildUpDown.Maximum = new decimal(new int[] { 255, 0, @@ -3767,14 +3987,15 @@ 0, -2147483648}); this.yBuildUpDown.Name = "yBuildUpDown"; - this.yBuildUpDown.Size = new System.Drawing.Size(69, 20); + this.yBuildUpDown.Size = new System.Drawing.Size(92, 22); this.yBuildUpDown.TabIndex = 7; this.yBuildUpDown.ValueChanged += new System.EventHandler(this.yBuildUpDown_ValueChanged); // // xBuildUpDown // this.xBuildUpDown.DecimalPlaces = 5; - this.xBuildUpDown.Location = new System.Drawing.Point(6, 20); + this.xBuildUpDown.Location = new System.Drawing.Point(8, 25); + this.xBuildUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.xBuildUpDown.Maximum = new decimal(new int[] { 255, 0, @@ -3786,14 +4007,15 @@ 0, -2147483648}); this.xBuildUpDown.Name = "xBuildUpDown"; - this.xBuildUpDown.Size = new System.Drawing.Size(69, 20); + this.xBuildUpDown.Size = new System.Drawing.Size(92, 22); this.xBuildUpDown.TabIndex = 5; this.xBuildUpDown.ValueChanged += new System.EventHandler(this.xBuildUpDown_ValueChanged); // // zBuildUpDown // this.zBuildUpDown.DecimalPlaces = 5; - this.zBuildUpDown.Location = new System.Drawing.Point(6, 93); + this.zBuildUpDown.Location = new System.Drawing.Point(8, 114); + this.zBuildUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.zBuildUpDown.Maximum = new decimal(new int[] { 255, 0, @@ -3805,16 +4027,18 @@ 0, -2147483648}); this.zBuildUpDown.Name = "zBuildUpDown"; - this.zBuildUpDown.Size = new System.Drawing.Size(69, 20); + this.zBuildUpDown.Size = new System.Drawing.Size(92, 22); this.zBuildUpDown.TabIndex = 6; this.zBuildUpDown.ValueChanged += new System.EventHandler(this.zBuildUpDown_ValueChanged); // // buildingsListBox // this.buildingsListBox.FormattingEnabled = true; - this.buildingsListBox.Location = new System.Drawing.Point(9, 7); + this.buildingsListBox.ItemHeight = 16; + this.buildingsListBox.Location = new System.Drawing.Point(12, 9); + this.buildingsListBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buildingsListBox.Name = "buildingsListBox"; - this.buildingsListBox.Size = new System.Drawing.Size(168, 433); + this.buildingsListBox.Size = new System.Drawing.Size(223, 532); this.buildingsListBox.TabIndex = 0; this.buildingsListBox.SelectedIndexChanged += new System.EventHandler(this.buildingsListBox_SelectedIndexChanged); // @@ -3830,10 +4054,11 @@ this.permissionsTabPage.Controls.Add(this.selectTypePanel); this.permissionsTabPage.Controls.Add(this.ImportMovButton); this.permissionsTabPage.Controls.Add(this.exportMovButton); - this.permissionsTabPage.Location = new System.Drawing.Point(4, 22); + this.permissionsTabPage.Location = new System.Drawing.Point(4, 25); + this.permissionsTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.permissionsTabPage.Name = "permissionsTabPage"; - this.permissionsTabPage.Padding = new System.Windows.Forms.Padding(3); - this.permissionsTabPage.Size = new System.Drawing.Size(481, 450); + this.permissionsTabPage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.permissionsTabPage.Size = new System.Drawing.Size(644, 557); this.permissionsTabPage.TabIndex = 1; this.permissionsTabPage.Text = "Move Permissions"; this.permissionsTabPage.UseVisualStyleBackColor = true; @@ -3842,9 +4067,10 @@ // this.scanUnusedCollisionTypesButton.Image = global::DSPRE.Properties.Resources.SearchMiniIcon; this.scanUnusedCollisionTypesButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.scanUnusedCollisionTypesButton.Location = new System.Drawing.Point(345, 110); + this.scanUnusedCollisionTypesButton.Location = new System.Drawing.Point(460, 135); + this.scanUnusedCollisionTypesButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.scanUnusedCollisionTypesButton.Name = "scanUnusedCollisionTypesButton"; - this.scanUnusedCollisionTypesButton.Size = new System.Drawing.Size(111, 27); + this.scanUnusedCollisionTypesButton.Size = new System.Drawing.Size(148, 33); this.scanUnusedCollisionTypesButton.TabIndex = 33; this.scanUnusedCollisionTypesButton.Text = "Scan used types"; this.scanUnusedCollisionTypesButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -3853,9 +4079,10 @@ // // clearCurrentButton // - this.clearCurrentButton.Location = new System.Drawing.Point(11, 134); + this.clearCurrentButton.Location = new System.Drawing.Point(15, 165); + this.clearCurrentButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.clearCurrentButton.Name = "clearCurrentButton"; - this.clearCurrentButton.Size = new System.Drawing.Size(212, 23); + this.clearCurrentButton.Size = new System.Drawing.Size(283, 28); this.clearCurrentButton.TabIndex = 32; this.clearCurrentButton.Text = "Clear current"; this.clearCurrentButton.UseVisualStyleBackColor = true; @@ -3865,9 +4092,10 @@ // this.typeLabel.AutoSize = true; this.typeLabel.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.typeLabel.Location = new System.Drawing.Point(155, 9); + this.typeLabel.Location = new System.Drawing.Point(207, 11); + this.typeLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.typeLabel.Name = "typeLabel"; - this.typeLabel.Size = new System.Drawing.Size(31, 13); + this.typeLabel.Size = new System.Drawing.Size(39, 16); this.typeLabel.TabIndex = 29; this.typeLabel.Text = "Type"; // @@ -3875,9 +4103,10 @@ // this.collisionLabel.AutoSize = true; this.collisionLabel.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.collisionLabel.Location = new System.Drawing.Point(40, 9); + this.collisionLabel.Location = new System.Drawing.Point(53, 11); + this.collisionLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.collisionLabel.Name = "collisionLabel"; - this.collisionLabel.Size = new System.Drawing.Size(45, 13); + this.collisionLabel.Size = new System.Drawing.Size(58, 16); this.collisionLabel.TabIndex = 28; this.collisionLabel.Text = "Collision"; // @@ -3889,9 +4118,11 @@ this.typeGroupBox.Controls.Add(this.collisionTypePainterComboBox); this.typeGroupBox.Controls.Add(this.typePainterPictureBox); this.typeGroupBox.Enabled = false; - this.typeGroupBox.Location = new System.Drawing.Point(12, 301); + this.typeGroupBox.Location = new System.Drawing.Point(16, 370); + this.typeGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.typeGroupBox.Name = "typeGroupBox"; - this.typeGroupBox.Size = new System.Drawing.Size(444, 134); + this.typeGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.typeGroupBox.Size = new System.Drawing.Size(592, 165); this.typeGroupBox.TabIndex = 25; this.typeGroupBox.TabStop = false; this.typeGroupBox.Text = "Type Painter"; @@ -3900,9 +4131,10 @@ // this.knownTypesRadioButton.AutoSize = true; this.knownTypesRadioButton.Checked = true; - this.knownTypesRadioButton.Location = new System.Drawing.Point(135, 21); + this.knownTypesRadioButton.Location = new System.Drawing.Point(180, 26); + this.knownTypesRadioButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.knownTypesRadioButton.Name = "knownTypesRadioButton"; - this.knownTypesRadioButton.Size = new System.Drawing.Size(90, 17); + this.knownTypesRadioButton.Size = new System.Drawing.Size(109, 20); this.knownTypesRadioButton.TabIndex = 5; this.knownTypesRadioButton.TabStop = true; this.knownTypesRadioButton.Text = "Known Types"; @@ -3912,9 +4144,10 @@ // valueTypeRadioButton // this.valueTypeRadioButton.AutoSize = true; - this.valueTypeRadioButton.Location = new System.Drawing.Point(135, 78); + this.valueTypeRadioButton.Location = new System.Drawing.Point(180, 96); + this.valueTypeRadioButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.valueTypeRadioButton.Name = "valueTypeRadioButton"; - this.valueTypeRadioButton.Size = new System.Drawing.Size(52, 17); + this.valueTypeRadioButton.Size = new System.Drawing.Size(63, 20); this.valueTypeRadioButton.TabIndex = 4; this.valueTypeRadioButton.Text = "Value"; this.valueTypeRadioButton.UseVisualStyleBackColor = true; @@ -3924,14 +4157,15 @@ // this.typePainterUpDown.Enabled = false; this.typePainterUpDown.Hexadecimal = true; - this.typePainterUpDown.Location = new System.Drawing.Point(134, 101); + this.typePainterUpDown.Location = new System.Drawing.Point(179, 124); + this.typePainterUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.typePainterUpDown.Maximum = new decimal(new int[] { 255, 0, 0, 0}); this.typePainterUpDown.Name = "typePainterUpDown"; - this.typePainterUpDown.Size = new System.Drawing.Size(78, 20); + this.typePainterUpDown.Size = new System.Drawing.Size(104, 22); this.typePainterUpDown.TabIndex = 3; this.typePainterUpDown.ValueChanged += new System.EventHandler(this.typePainterUpDown_ValueChanged); // @@ -3940,10 +4174,11 @@ this.collisionTypePainterComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.collisionTypePainterComboBox.FormattingEnabled = true; this.collisionTypePainterComboBox.IntegralHeight = false; - this.collisionTypePainterComboBox.Location = new System.Drawing.Point(135, 44); + this.collisionTypePainterComboBox.Location = new System.Drawing.Point(180, 54); + this.collisionTypePainterComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.collisionTypePainterComboBox.MaxDropDownItems = 10; this.collisionTypePainterComboBox.Name = "collisionTypePainterComboBox"; - this.collisionTypePainterComboBox.Size = new System.Drawing.Size(283, 21); + this.collisionTypePainterComboBox.Size = new System.Drawing.Size(376, 24); this.collisionTypePainterComboBox.TabIndex = 2; this.collisionTypePainterComboBox.SelectedIndexChanged += new System.EventHandler(this.typePainterComboBox_SelectedIndexChanged); // @@ -3951,9 +4186,10 @@ // this.typePainterPictureBox.BackColor = System.Drawing.Color.White; this.typePainterPictureBox.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.typePainterPictureBox.Location = new System.Drawing.Point(18, 31); + this.typePainterPictureBox.Location = new System.Drawing.Point(24, 38); + this.typePainterPictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.typePainterPictureBox.Name = "typePainterPictureBox"; - this.typePainterPictureBox.Size = new System.Drawing.Size(80, 80); + this.typePainterPictureBox.Size = new System.Drawing.Size(105, 98); this.typePainterPictureBox.TabIndex = 1; this.typePainterPictureBox.TabStop = false; // @@ -3961,9 +4197,11 @@ // this.collisionGroupBox.Controls.Add(this.collisionPainterComboBox); this.collisionGroupBox.Controls.Add(this.collisionPainterPictureBox); - this.collisionGroupBox.Location = new System.Drawing.Point(12, 167); + this.collisionGroupBox.Location = new System.Drawing.Point(16, 206); + this.collisionGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.collisionGroupBox.Name = "collisionGroupBox"; - this.collisionGroupBox.Size = new System.Drawing.Size(444, 118); + this.collisionGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.collisionGroupBox.Size = new System.Drawing.Size(592, 145); this.collisionGroupBox.TabIndex = 24; this.collisionGroupBox.TabStop = false; this.collisionGroupBox.Text = "Collision Painter"; @@ -3972,9 +4210,10 @@ // this.collisionPainterComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.collisionPainterComboBox.FormattingEnabled = true; - this.collisionPainterComboBox.Location = new System.Drawing.Point(134, 50); + this.collisionPainterComboBox.Location = new System.Drawing.Point(179, 62); + this.collisionPainterComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.collisionPainterComboBox.Name = "collisionPainterComboBox"; - this.collisionPainterComboBox.Size = new System.Drawing.Size(284, 21); + this.collisionPainterComboBox.Size = new System.Drawing.Size(377, 24); this.collisionPainterComboBox.TabIndex = 1; this.collisionPainterComboBox.SelectedIndexChanged += new System.EventHandler(this.collisionPainterComboBox_SelectedIndexChange); // @@ -3982,27 +4221,30 @@ // this.collisionPainterPictureBox.BackColor = System.Drawing.Color.White; this.collisionPainterPictureBox.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.collisionPainterPictureBox.Location = new System.Drawing.Point(18, 23); + this.collisionPainterPictureBox.Location = new System.Drawing.Point(24, 28); + this.collisionPainterPictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.collisionPainterPictureBox.Name = "collisionPainterPictureBox"; - this.collisionPainterPictureBox.Size = new System.Drawing.Size(80, 80); + this.collisionPainterPictureBox.Size = new System.Drawing.Size(105, 98); this.collisionPainterPictureBox.TabIndex = 0; this.collisionPainterPictureBox.TabStop = false; // // selectCollisionPanel // this.selectCollisionPanel.Controls.Add(this.collisionPictureBox); - this.selectCollisionPanel.Location = new System.Drawing.Point(10, 23); + this.selectCollisionPanel.Location = new System.Drawing.Point(13, 28); + this.selectCollisionPanel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.selectCollisionPanel.Name = "selectCollisionPanel"; - this.selectCollisionPanel.Size = new System.Drawing.Size(102, 102); + this.selectCollisionPanel.Size = new System.Drawing.Size(136, 126); this.selectCollisionPanel.TabIndex = 30; // // collisionPictureBox // this.collisionPictureBox.BackColor = System.Drawing.Color.White; this.collisionPictureBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.collisionPictureBox.Location = new System.Drawing.Point(3, 3); + this.collisionPictureBox.Location = new System.Drawing.Point(4, 4); + this.collisionPictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.collisionPictureBox.Name = "collisionPictureBox"; - this.collisionPictureBox.Size = new System.Drawing.Size(96, 96); + this.collisionPictureBox.Size = new System.Drawing.Size(127, 118); this.collisionPictureBox.TabIndex = 26; this.collisionPictureBox.TabStop = false; this.collisionPictureBox.Click += new System.EventHandler(this.collisionPictureBox_Click); @@ -4010,18 +4252,20 @@ // selectTypePanel // this.selectTypePanel.Controls.Add(this.typePictureBox); - this.selectTypePanel.Location = new System.Drawing.Point(122, 23); + this.selectTypePanel.Location = new System.Drawing.Point(163, 28); + this.selectTypePanel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.selectTypePanel.Name = "selectTypePanel"; - this.selectTypePanel.Size = new System.Drawing.Size(102, 102); + this.selectTypePanel.Size = new System.Drawing.Size(136, 126); this.selectTypePanel.TabIndex = 31; // // typePictureBox // this.typePictureBox.BackColor = System.Drawing.Color.White; this.typePictureBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.typePictureBox.Location = new System.Drawing.Point(3, 3); + this.typePictureBox.Location = new System.Drawing.Point(4, 4); + this.typePictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.typePictureBox.Name = "typePictureBox"; - this.typePictureBox.Size = new System.Drawing.Size(96, 96); + this.typePictureBox.Size = new System.Drawing.Size(127, 118); this.typePictureBox.TabIndex = 27; this.typePictureBox.TabStop = false; this.typePictureBox.Click += new System.EventHandler(this.typePictureBox_Click); @@ -4030,9 +4274,10 @@ // this.ImportMovButton.Image = global::DSPRE.Properties.Resources.importArrow; this.ImportMovButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.ImportMovButton.Location = new System.Drawing.Point(318, 22); + this.ImportMovButton.Location = new System.Drawing.Point(424, 27); + this.ImportMovButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.ImportMovButton.Name = "ImportMovButton"; - this.ImportMovButton.Size = new System.Drawing.Size(138, 38); + this.ImportMovButton.Size = new System.Drawing.Size(184, 47); this.ImportMovButton.TabIndex = 23; this.ImportMovButton.Text = "Import Permissions"; this.ImportMovButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4043,9 +4288,10 @@ // this.exportMovButton.Image = global::DSPRE.Properties.Resources.exportArrow; this.exportMovButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.exportMovButton.Location = new System.Drawing.Point(318, 64); + this.exportMovButton.Location = new System.Drawing.Point(424, 79); + this.exportMovButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.exportMovButton.Name = "exportMovButton"; - this.exportMovButton.Size = new System.Drawing.Size(138, 38); + this.exportMovButton.Size = new System.Drawing.Size(184, 47); this.exportMovButton.TabIndex = 22; this.exportMovButton.Text = "Export Permissions"; this.exportMovButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4062,10 +4308,11 @@ this.modelTabPage.Controls.Add(this.unsupported3DModelEditLBL); this.modelTabPage.Controls.Add(this.importMapButton); this.modelTabPage.Controls.Add(this.exportMapButton); - this.modelTabPage.Location = new System.Drawing.Point(4, 22); + this.modelTabPage.Location = new System.Drawing.Point(4, 25); + this.modelTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.modelTabPage.Name = "modelTabPage"; - this.modelTabPage.Padding = new System.Windows.Forms.Padding(3); - this.modelTabPage.Size = new System.Drawing.Size(481, 450); + this.modelTabPage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.modelTabPage.Size = new System.Drawing.Size(644, 557); this.modelTabPage.TabIndex = 2; this.modelTabPage.Text = "3D Model"; this.modelTabPage.UseVisualStyleBackColor = true; @@ -4074,10 +4321,10 @@ // this.glbExportButton.Image = global::DSPRE.Properties.Resources.exportArrow; this.glbExportButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.glbExportButton.Location = new System.Drawing.Point(351, 156); - this.glbExportButton.Margin = new System.Windows.Forms.Padding(4); + this.glbExportButton.Location = new System.Drawing.Point(468, 192); + this.glbExportButton.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.glbExportButton.Name = "glbExportButton"; - this.glbExportButton.Size = new System.Drawing.Size(120, 38); + this.glbExportButton.Size = new System.Drawing.Size(160, 47); this.glbExportButton.TabIndex = 31; this.glbExportButton.Text = "Export GLB"; this.glbExportButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4088,9 +4335,10 @@ // this.daeExportButton.Image = global::DSPRE.Properties.Resources.exportArrow; this.daeExportButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.daeExportButton.Location = new System.Drawing.Point(351, 111); + this.daeExportButton.Location = new System.Drawing.Point(468, 137); + this.daeExportButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.daeExportButton.Name = "daeExportButton"; - this.daeExportButton.Size = new System.Drawing.Size(120, 38); + this.daeExportButton.Size = new System.Drawing.Size(160, 47); this.daeExportButton.TabIndex = 30; this.daeExportButton.Text = "Export DAE"; this.daeExportButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4102,9 +4350,10 @@ this.embedTexturesInMapModelCheckBox.AutoSize = true; this.embedTexturesInMapModelCheckBox.Checked = true; this.embedTexturesInMapModelCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; - this.embedTexturesInMapModelCheckBox.Location = new System.Drawing.Point(284, 66); + this.embedTexturesInMapModelCheckBox.Location = new System.Drawing.Point(379, 81); + this.embedTexturesInMapModelCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.embedTexturesInMapModelCheckBox.Name = "embedTexturesInMapModelCheckBox"; - this.embedTexturesInMapModelCheckBox.Size = new System.Drawing.Size(68, 17); + this.embedTexturesInMapModelCheckBox.Size = new System.Drawing.Size(82, 20); this.embedTexturesInMapModelCheckBox.TabIndex = 29; this.embedTexturesInMapModelCheckBox.Text = "Textured"; this.embedTexturesInMapModelCheckBox.UseVisualStyleBackColor = true; @@ -4114,9 +4363,10 @@ this.modelSizeLBL.AutoSize = true; this.modelSizeLBL.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.modelSizeLBL.ForeColor = System.Drawing.SystemColors.ControlText; - this.modelSizeLBL.Location = new System.Drawing.Point(104, 9); + this.modelSizeLBL.Location = new System.Drawing.Point(139, 11); + this.modelSizeLBL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.modelSizeLBL.Name = "modelSizeLBL"; - this.modelSizeLBL.Size = new System.Drawing.Size(97, 16); + this.modelSizeLBL.Size = new System.Drawing.Size(118, 20); this.modelSizeLBL.TabIndex = 28; this.modelSizeLBL.Text = "ModelSizeTXT"; // @@ -4126,9 +4376,10 @@ this.nsbmdSizeLabel.BackColor = System.Drawing.Color.Transparent; this.nsbmdSizeLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.nsbmdSizeLabel.ForeColor = System.Drawing.SystemColors.ControlText; - this.nsbmdSizeLabel.Location = new System.Drawing.Point(6, 9); + this.nsbmdSizeLabel.Location = new System.Drawing.Point(8, 11); + this.nsbmdSizeLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.nsbmdSizeLabel.Name = "nsbmdSizeLabel"; - this.nsbmdSizeLabel.Size = new System.Drawing.Size(100, 16); + this.nsbmdSizeLabel.Size = new System.Drawing.Size(129, 20); this.nsbmdSizeLabel.TabIndex = 27; this.nsbmdSizeLabel.Text = "3D Model Size: "; // @@ -4137,9 +4388,10 @@ this.unsupported3DModelEditLBL.AutoSize = true; this.unsupported3DModelEditLBL.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F); this.unsupported3DModelEditLBL.ForeColor = System.Drawing.SystemColors.ControlText; - this.unsupported3DModelEditLBL.Location = new System.Drawing.Point(132, 248); + this.unsupported3DModelEditLBL.Location = new System.Drawing.Point(176, 305); + this.unsupported3DModelEditLBL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.unsupported3DModelEditLBL.Name = "unsupported3DModelEditLBL"; - this.unsupported3DModelEditLBL.Size = new System.Drawing.Size(256, 48); + this.unsupported3DModelEditLBL.Size = new System.Drawing.Size(325, 60); this.unsupported3DModelEditLBL.TabIndex = 26; this.unsupported3DModelEditLBL.Text = "DSPRE cannot edit nor create 3D models.\r\nPlease use Blender, Sketchup, or \r\nTrifi" + "ndo\'s Pokemon DS Map Studio."; @@ -4149,9 +4401,10 @@ // this.importMapButton.Image = global::DSPRE.Properties.Resources.importArrow; this.importMapButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.importMapButton.Location = new System.Drawing.Point(351, 9); + this.importMapButton.Location = new System.Drawing.Point(468, 11); + this.importMapButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.importMapButton.Name = "importMapButton"; - this.importMapButton.Size = new System.Drawing.Size(120, 38); + this.importMapButton.Size = new System.Drawing.Size(160, 47); this.importMapButton.TabIndex = 25; this.importMapButton.Text = "Import NSBMD"; this.importMapButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4162,9 +4415,10 @@ // this.exportMapButton.Image = global::DSPRE.Properties.Resources.exportArrow; this.exportMapButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.exportMapButton.Location = new System.Drawing.Point(351, 54); + this.exportMapButton.Location = new System.Drawing.Point(468, 66); + this.exportMapButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.exportMapButton.Name = "exportMapButton"; - this.exportMapButton.Size = new System.Drawing.Size(120, 38); + this.exportMapButton.Size = new System.Drawing.Size(160, 47); this.exportMapButton.TabIndex = 24; this.exportMapButton.Text = "Export NSBMD"; this.exportMapButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4178,10 +4432,11 @@ this.terrainTabPage.Controls.Add(this.unsupportedBDHCEditLBL); this.terrainTabPage.Controls.Add(this.bdhcImportButton); this.terrainTabPage.Controls.Add(this.bdhcExportButton); - this.terrainTabPage.Location = new System.Drawing.Point(4, 22); + this.terrainTabPage.Location = new System.Drawing.Point(4, 25); + this.terrainTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.terrainTabPage.Name = "terrainTabPage"; - this.terrainTabPage.Padding = new System.Windows.Forms.Padding(3); - this.terrainTabPage.Size = new System.Drawing.Size(481, 450); + this.terrainTabPage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.terrainTabPage.Size = new System.Drawing.Size(644, 557); this.terrainTabPage.TabIndex = 3; this.terrainTabPage.Text = "Terrain Data"; this.terrainTabPage.UseVisualStyleBackColor = true; @@ -4190,9 +4445,10 @@ // this.terrainSizeLBL.AutoSize = true; this.terrainSizeLBL.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.terrainSizeLBL.Location = new System.Drawing.Point(124, 9); + this.terrainSizeLBL.Location = new System.Drawing.Point(165, 11); + this.terrainSizeLBL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.terrainSizeLBL.Name = "terrainSizeLBL"; - this.terrainSizeLBL.Size = new System.Drawing.Size(102, 16); + this.terrainSizeLBL.Size = new System.Drawing.Size(126, 20); this.terrainSizeLBL.TabIndex = 30; this.terrainSizeLBL.Text = "TerrainSizeTXT"; // @@ -4200,9 +4456,10 @@ // this.terrainDataLBL.AutoSize = true; this.terrainDataLBL.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.terrainDataLBL.Location = new System.Drawing.Point(6, 9); + this.terrainDataLBL.Location = new System.Drawing.Point(8, 11); + this.terrainDataLBL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.terrainDataLBL.Name = "terrainDataLBL"; - this.terrainDataLBL.Size = new System.Drawing.Size(117, 16); + this.terrainDataLBL.Size = new System.Drawing.Size(151, 20); this.terrainDataLBL.TabIndex = 29; this.terrainDataLBL.Text = "Terrain Data Size: "; // @@ -4210,9 +4467,10 @@ // this.unsupportedBDHCEditLBL.AutoSize = true; this.unsupportedBDHCEditLBL.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.unsupportedBDHCEditLBL.Location = new System.Drawing.Point(113, 257); + this.unsupportedBDHCEditLBL.Location = new System.Drawing.Point(151, 316); + this.unsupportedBDHCEditLBL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.unsupportedBDHCEditLBL.Name = "unsupportedBDHCEditLBL"; - this.unsupportedBDHCEditLBL.Size = new System.Drawing.Size(290, 32); + this.unsupportedBDHCEditLBL.Size = new System.Drawing.Size(362, 40); this.unsupportedBDHCEditLBL.TabIndex = 28; this.unsupportedBDHCEditLBL.Text = "DSPRE cannot edit nor create BDHC data.\r\nPlease use Trifindo\'s Pokemon DS Map Stu" + "dio."; @@ -4222,9 +4480,10 @@ // this.bdhcImportButton.Image = global::DSPRE.Properties.Resources.importArrow; this.bdhcImportButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.bdhcImportButton.Location = new System.Drawing.Point(351, 9); + this.bdhcImportButton.Location = new System.Drawing.Point(468, 11); + this.bdhcImportButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.bdhcImportButton.Name = "bdhcImportButton"; - this.bdhcImportButton.Size = new System.Drawing.Size(120, 38); + this.bdhcImportButton.Size = new System.Drawing.Size(160, 47); this.bdhcImportButton.TabIndex = 27; this.bdhcImportButton.Text = "Import BDHC"; this.bdhcImportButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4235,9 +4494,10 @@ // this.bdhcExportButton.Image = global::DSPRE.Properties.Resources.exportArrow; this.bdhcExportButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.bdhcExportButton.Location = new System.Drawing.Point(351, 54); + this.bdhcExportButton.Location = new System.Drawing.Point(468, 66); + this.bdhcExportButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.bdhcExportButton.Name = "bdhcExportButton"; - this.bdhcExportButton.Size = new System.Drawing.Size(120, 38); + this.bdhcExportButton.Size = new System.Drawing.Size(160, 47); this.bdhcExportButton.TabIndex = 26; this.bdhcExportButton.Text = "Export BDHC"; this.bdhcExportButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4252,9 +4512,10 @@ this.bgsTabPage.Controls.Add(this.unsupportedBGSEditLBL); this.bgsTabPage.Controls.Add(this.soundPlatesImportButton); this.bgsTabPage.Controls.Add(this.soundPlatesExportButton); - this.bgsTabPage.Location = new System.Drawing.Point(4, 22); + this.bgsTabPage.Location = new System.Drawing.Point(4, 25); + this.bgsTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.bgsTabPage.Name = "bgsTabPage"; - this.bgsTabPage.Size = new System.Drawing.Size(481, 450); + this.bgsTabPage.Size = new System.Drawing.Size(644, 557); this.bgsTabPage.TabIndex = 4; this.bgsTabPage.Text = "Sound Plates"; this.bgsTabPage.UseVisualStyleBackColor = true; @@ -4263,9 +4524,10 @@ // this.blankBGSButton.Image = global::DSPRE.Properties.Resources.muteIcon; this.blankBGSButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.blankBGSButton.Location = new System.Drawing.Point(344, 112); + this.blankBGSButton.Location = new System.Drawing.Point(459, 138); + this.blankBGSButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.blankBGSButton.Name = "blankBGSButton"; - this.blankBGSButton.Size = new System.Drawing.Size(120, 38); + this.blankBGSButton.Size = new System.Drawing.Size(160, 47); this.blankBGSButton.TabIndex = 34; this.blankBGSButton.Text = "Blank BGS"; this.blankBGSButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4278,9 +4540,10 @@ this.BGSSizeLBL.BackColor = System.Drawing.Color.Transparent; this.BGSSizeLBL.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.BGSSizeLBL.ForeColor = System.Drawing.SystemColors.ControlText; - this.BGSSizeLBL.Location = new System.Drawing.Point(73, 9); + this.BGSSizeLBL.Location = new System.Drawing.Point(97, 11); + this.BGSSizeLBL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.BGSSizeLBL.Name = "BGSSizeLBL"; - this.BGSSizeLBL.Size = new System.Drawing.Size(84, 16); + this.BGSSizeLBL.Size = new System.Drawing.Size(110, 20); this.BGSSizeLBL.TabIndex = 33; this.BGSSizeLBL.Text = "BGSSizeLBL"; // @@ -4288,9 +4551,10 @@ // this.bgsDataLBL.AutoSize = true; this.bgsDataLBL.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.bgsDataLBL.Location = new System.Drawing.Point(7, 9); + this.bgsDataLBL.Location = new System.Drawing.Point(9, 11); + this.bgsDataLBL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.bgsDataLBL.Name = "bgsDataLBL"; - this.bgsDataLBL.Size = new System.Drawing.Size(73, 16); + this.bgsDataLBL.Size = new System.Drawing.Size(96, 20); this.bgsDataLBL.TabIndex = 32; this.bgsDataLBL.Text = "BGS Data: "; // @@ -4298,9 +4562,10 @@ // this.unsupportedBGSEditLBL.AutoSize = true; this.unsupportedBGSEditLBL.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.unsupportedBGSEditLBL.Location = new System.Drawing.Point(73, 266); + this.unsupportedBGSEditLBL.Location = new System.Drawing.Point(97, 327); + this.unsupportedBGSEditLBL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.unsupportedBGSEditLBL.Name = "unsupportedBGSEditLBL"; - this.unsupportedBGSEditLBL.Size = new System.Drawing.Size(338, 32); + this.unsupportedBGSEditLBL.Size = new System.Drawing.Size(426, 40); this.unsupportedBGSEditLBL.TabIndex = 31; this.unsupportedBGSEditLBL.Text = "DSPRE cannot edit nor create Background Sound Files.\r\nPlease use Trifindo\'s Pokem" + "on DS Map Studio.\r\n"; @@ -4310,9 +4575,10 @@ // this.soundPlatesImportButton.Image = global::DSPRE.Properties.Resources.importArrow; this.soundPlatesImportButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.soundPlatesImportButton.Location = new System.Drawing.Point(344, 10); + this.soundPlatesImportButton.Location = new System.Drawing.Point(459, 12); + this.soundPlatesImportButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.soundPlatesImportButton.Name = "soundPlatesImportButton"; - this.soundPlatesImportButton.Size = new System.Drawing.Size(120, 38); + this.soundPlatesImportButton.Size = new System.Drawing.Size(160, 47); this.soundPlatesImportButton.TabIndex = 30; this.soundPlatesImportButton.Text = "Import BGS"; this.soundPlatesImportButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4323,9 +4589,10 @@ // this.soundPlatesExportButton.Image = global::DSPRE.Properties.Resources.exportArrow; this.soundPlatesExportButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.soundPlatesExportButton.Location = new System.Drawing.Point(344, 55); + this.soundPlatesExportButton.Location = new System.Drawing.Point(459, 68); + this.soundPlatesExportButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.soundPlatesExportButton.Name = "soundPlatesExportButton"; - this.soundPlatesExportButton.Size = new System.Drawing.Size(120, 38); + this.soundPlatesExportButton.Size = new System.Drawing.Size(160, 47); this.soundPlatesExportButton.TabIndex = 29; this.soundPlatesExportButton.Text = "Export BGS"; this.soundPlatesExportButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4339,9 +4606,10 @@ this.radio3D.AutoSize = true; this.radio3D.Checked = true; this.radio3D.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.radio3D.Location = new System.Drawing.Point(-7797, -4611); + this.radio3D.Location = new System.Drawing.Point(-11713, -6416); + this.radio3D.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.radio3D.Name = "radio3D"; - this.radio3D.Size = new System.Drawing.Size(31, 23); + this.radio3D.Size = new System.Drawing.Size(34, 26); this.radio3D.TabIndex = 26; this.radio3D.TabStop = true; this.radio3D.Text = "3D"; @@ -4354,9 +4622,10 @@ 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(-7797, -4587); + this.radio2D.Location = new System.Drawing.Point(-11713, -6387); + this.radio2D.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.radio2D.Name = "radio2D"; - this.radio2D.Size = new System.Drawing.Size(31, 23); + this.radio2D.Size = new System.Drawing.Size(34, 26); this.radio2D.TabIndex = 25; this.radio2D.Text = "2D"; this.radio2D.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -4369,9 +4638,10 @@ 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(1140, -4563); + this.wireframeCheckBox.Location = new System.Drawing.Point(1520, -6357); + this.wireframeCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.wireframeCheckBox.Name = "wireframeCheckBox"; - this.wireframeCheckBox.Size = new System.Drawing.Size(31, 23); + this.wireframeCheckBox.Size = new System.Drawing.Size(33, 26); this.wireframeCheckBox.TabIndex = 27; this.wireframeCheckBox.Text = " W"; this.wireframeCheckBox.UseVisualStyleBackColor = true; @@ -4381,10 +4651,11 @@ // this.nsbtxEditorTabPage.Controls.Add(this.groupBox7); this.nsbtxEditorTabPage.ImageIndex = 6; - this.nsbtxEditorTabPage.Location = new System.Drawing.Point(4, 23); + this.nsbtxEditorTabPage.Location = new System.Drawing.Point(4, 25); + this.nsbtxEditorTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.nsbtxEditorTabPage.Name = "nsbtxEditorTabPage"; - this.nsbtxEditorTabPage.Padding = new System.Windows.Forms.Padding(3); - this.nsbtxEditorTabPage.Size = new System.Drawing.Size(1185, 675); + this.nsbtxEditorTabPage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.nsbtxEditorTabPage.Size = new System.Drawing.Size(1583, 835); this.nsbtxEditorTabPage.TabIndex = 6; this.nsbtxEditorTabPage.Text = "NSBTX Editor"; this.nsbtxEditorTabPage.UseVisualStyleBackColor = true; @@ -4406,9 +4677,11 @@ this.groupBox7.Controls.Add(this.buildingsTilesetRadioButton); this.groupBox7.Controls.Add(this.mapTilesetRadioButton); this.groupBox7.Controls.Add(this.texturePacksListBox); - this.groupBox7.Location = new System.Drawing.Point(6, 6); + this.groupBox7.Location = new System.Drawing.Point(8, 7); + this.groupBox7.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox7.Name = "groupBox7"; - this.groupBox7.Size = new System.Drawing.Size(1171, 599); + this.groupBox7.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox7.Size = new System.Drawing.Size(1561, 737); this.groupBox7.TabIndex = 1; this.groupBox7.TabStop = false; this.groupBox7.Text = "Texture Packs"; @@ -4420,24 +4693,26 @@ this.tableLayoutPanel37.Controls.Add(this.groupBox35, 0, 2); this.tableLayoutPanel37.Controls.Add(this.repositionImageButton, 0, 0); this.tableLayoutPanel37.Controls.Add(this.invertDragCheckbox, 0, 1); - this.tableLayoutPanel37.Location = new System.Drawing.Point(1007, 52); + this.tableLayoutPanel37.Location = new System.Drawing.Point(1343, 64); + this.tableLayoutPanel37.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tableLayoutPanel37.Name = "tableLayoutPanel37"; this.tableLayoutPanel37.RowCount = 3; this.tableLayoutPanel37.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel37.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel37.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel37.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel37.Size = new System.Drawing.Size(85, 256); + this.tableLayoutPanel37.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); + this.tableLayoutPanel37.Size = new System.Drawing.Size(113, 315); this.tableLayoutPanel37.TabIndex = 42; // // groupBox35 // this.groupBox35.Controls.Add(this.tableLayoutPanel38); this.groupBox35.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox35.Location = new System.Drawing.Point(3, 78); + this.groupBox35.Location = new System.Drawing.Point(4, 95); + this.groupBox35.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox35.Name = "groupBox35"; - this.groupBox35.Padding = new System.Windows.Forms.Padding(4); - this.groupBox35.Size = new System.Drawing.Size(79, 175); + this.groupBox35.Padding = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.groupBox35.Size = new System.Drawing.Size(105, 216); this.groupBox35.TabIndex = 23; this.groupBox35.TabStop = false; this.groupBox35.Text = "Scaling"; @@ -4451,21 +4726,23 @@ this.tableLayoutPanel38.Controls.Add(this.scalingLabel, 1, 0); this.tableLayoutPanel38.Controls.Add(this.scalingTrackBar, 0, 0); this.tableLayoutPanel38.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel38.Location = new System.Drawing.Point(4, 17); + this.tableLayoutPanel38.Location = new System.Drawing.Point(5, 20); + this.tableLayoutPanel38.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tableLayoutPanel38.Name = "tableLayoutPanel38"; - this.tableLayoutPanel38.Padding = new System.Windows.Forms.Padding(4); + this.tableLayoutPanel38.Padding = new System.Windows.Forms.Padding(5, 5, 5, 5); this.tableLayoutPanel38.RowCount = 1; this.tableLayoutPanel38.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel38.Size = new System.Drawing.Size(71, 154); + this.tableLayoutPanel38.Size = new System.Drawing.Size(95, 191); this.tableLayoutPanel38.TabIndex = 0; // // scalingLabel // this.scalingLabel.AutoSize = true; this.scalingLabel.Dock = System.Windows.Forms.DockStyle.Fill; - this.scalingLabel.Location = new System.Drawing.Point(40, 4); + this.scalingLabel.Location = new System.Drawing.Point(53, 5); + this.scalingLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.scalingLabel.Name = "scalingLabel"; - this.scalingLabel.Size = new System.Drawing.Size(24, 146); + this.scalingLabel.Size = new System.Drawing.Size(33, 181); this.scalingLabel.TabIndex = 3; this.scalingLabel.Text = "x1"; this.scalingLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -4475,21 +4752,23 @@ this.scalingTrackBar.AutoSize = false; this.scalingTrackBar.Dock = System.Windows.Forms.DockStyle.Fill; this.scalingTrackBar.LargeChange = 1; - this.scalingTrackBar.Location = new System.Drawing.Point(7, 7); + this.scalingTrackBar.Location = new System.Drawing.Point(9, 9); + this.scalingTrackBar.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.scalingTrackBar.Maximum = 5; this.scalingTrackBar.Minimum = -1; this.scalingTrackBar.Name = "scalingTrackBar"; this.scalingTrackBar.Orientation = System.Windows.Forms.Orientation.Vertical; - this.scalingTrackBar.Size = new System.Drawing.Size(27, 140); + this.scalingTrackBar.Size = new System.Drawing.Size(36, 173); this.scalingTrackBar.TabIndex = 2; this.scalingTrackBar.Scroll += new System.EventHandler(this.scalingTrackBar_Scroll); // // repositionImageButton // this.repositionImageButton.Dock = System.Windows.Forms.DockStyle.Fill; - this.repositionImageButton.Location = new System.Drawing.Point(3, 3); + this.repositionImageButton.Location = new System.Drawing.Point(4, 4); + this.repositionImageButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.repositionImageButton.Name = "repositionImageButton"; - this.repositionImageButton.Size = new System.Drawing.Size(79, 40); + this.repositionImageButton.Size = new System.Drawing.Size(105, 49); this.repositionImageButton.TabIndex = 21; this.repositionImageButton.Text = "Reposition"; this.repositionImageButton.UseVisualStyleBackColor = true; @@ -4502,9 +4781,10 @@ this.invertDragCheckbox.Checked = true; this.invertDragCheckbox.CheckState = System.Windows.Forms.CheckState.Checked; this.invertDragCheckbox.Dock = System.Windows.Forms.DockStyle.Fill; - this.invertDragCheckbox.Location = new System.Drawing.Point(3, 49); + this.invertDragCheckbox.Location = new System.Drawing.Point(4, 61); + this.invertDragCheckbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.invertDragCheckbox.Name = "invertDragCheckbox"; - this.invertDragCheckbox.Size = new System.Drawing.Size(79, 23); + this.invertDragCheckbox.Size = new System.Drawing.Size(105, 26); this.invertDragCheckbox.TabIndex = 22; this.invertDragCheckbox.Text = "Invert Drag"; this.invertDragCheckbox.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -4514,9 +4794,10 @@ // locateCurrentNsbtx // this.locateCurrentNsbtx.Image = global::DSPRE.Properties.Resources.open_file; - this.locateCurrentNsbtx.Location = new System.Drawing.Point(438, 20); + this.locateCurrentNsbtx.Location = new System.Drawing.Point(584, 25); + this.locateCurrentNsbtx.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.locateCurrentNsbtx.Name = "locateCurrentNsbtx"; - this.locateCurrentNsbtx.Size = new System.Drawing.Size(42, 40); + this.locateCurrentNsbtx.Size = new System.Drawing.Size(56, 49); this.locateCurrentNsbtx.TabIndex = 41; this.locateCurrentNsbtx.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.locateCurrentNsbtx.UseVisualStyleBackColor = true; @@ -4526,9 +4807,10 @@ // this.removeNSBTXButton.Image = ((System.Drawing.Image)(resources.GetObject("removeNSBTXButton.Image"))); this.removeNSBTXButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeNSBTXButton.Location = new System.Drawing.Point(331, 18); + this.removeNSBTXButton.Location = new System.Drawing.Point(441, 22); + this.removeNSBTXButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.removeNSBTXButton.Name = "removeNSBTXButton"; - this.removeNSBTXButton.Size = new System.Drawing.Size(94, 44); + this.removeNSBTXButton.Size = new System.Drawing.Size(125, 54); this.removeNSBTXButton.TabIndex = 11; this.removeNSBTXButton.Text = "Remove Last"; this.removeNSBTXButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4553,9 +4835,11 @@ this.areaDataGroupBox.Controls.Add(this.label32); this.areaDataGroupBox.Controls.Add(this.areaDataBuildingTilesetUpDown); this.areaDataGroupBox.Controls.Add(this.selectAreaDataListBox); - this.areaDataGroupBox.Location = new System.Drawing.Point(641, 333); + this.areaDataGroupBox.Location = new System.Drawing.Point(855, 410); + this.areaDataGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.areaDataGroupBox.Name = "areaDataGroupBox"; - this.areaDataGroupBox.Size = new System.Drawing.Size(511, 249); + this.areaDataGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.areaDataGroupBox.Size = new System.Drawing.Size(681, 306); this.areaDataGroupBox.TabIndex = 0; this.areaDataGroupBox.TabStop = false; this.areaDataGroupBox.Text = "Area Data"; @@ -4563,9 +4847,10 @@ // locateCurrentAreaData // this.locateCurrentAreaData.Image = global::DSPRE.Properties.Resources.open_file; - this.locateCurrentAreaData.Location = new System.Drawing.Point(395, 74); + this.locateCurrentAreaData.Location = new System.Drawing.Point(527, 91); + this.locateCurrentAreaData.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.locateCurrentAreaData.Name = "locateCurrentAreaData"; - this.locateCurrentAreaData.Size = new System.Drawing.Size(42, 40); + this.locateCurrentAreaData.Size = new System.Drawing.Size(56, 49); this.locateCurrentAreaData.TabIndex = 42; this.locateCurrentAreaData.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.locateCurrentAreaData.UseVisualStyleBackColor = true; @@ -4575,9 +4860,10 @@ // this.exportAreaDataButton.Image = ((System.Drawing.Image)(resources.GetObject("exportAreaDataButton.Image"))); this.exportAreaDataButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.exportAreaDataButton.Location = new System.Drawing.Point(177, 72); + this.exportAreaDataButton.Location = new System.Drawing.Point(236, 89); + this.exportAreaDataButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.exportAreaDataButton.Name = "exportAreaDataButton"; - this.exportAreaDataButton.Size = new System.Drawing.Size(107, 45); + this.exportAreaDataButton.Size = new System.Drawing.Size(143, 55); this.exportAreaDataButton.TabIndex = 13; this.exportAreaDataButton.Text = "Export \r\nSelected"; this.exportAreaDataButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4589,9 +4875,11 @@ this.areaTypeGroupbox.Controls.Add(this.outdoorAreaRadioButton); this.areaTypeGroupbox.Controls.Add(this.indoorAreaRadioButton); this.areaTypeGroupbox.Enabled = false; - this.areaTypeGroupbox.Location = new System.Drawing.Point(188, 185); + this.areaTypeGroupbox.Location = new System.Drawing.Point(251, 228); + this.areaTypeGroupbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.areaTypeGroupbox.Name = "areaTypeGroupbox"; - this.areaTypeGroupbox.Size = new System.Drawing.Size(154, 52); + this.areaTypeGroupbox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.areaTypeGroupbox.Size = new System.Drawing.Size(205, 64); this.areaTypeGroupbox.TabIndex = 15; this.areaTypeGroupbox.TabStop = false; this.areaTypeGroupbox.Text = "Area Type"; @@ -4600,9 +4888,10 @@ // this.outdoorAreaRadioButton.Appearance = System.Windows.Forms.Appearance.Button; this.outdoorAreaRadioButton.Checked = true; - this.outdoorAreaRadioButton.Location = new System.Drawing.Point(80, 19); + this.outdoorAreaRadioButton.Location = new System.Drawing.Point(107, 23); + this.outdoorAreaRadioButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.outdoorAreaRadioButton.Name = "outdoorAreaRadioButton"; - this.outdoorAreaRadioButton.Size = new System.Drawing.Size(61, 25); + this.outdoorAreaRadioButton.Size = new System.Drawing.Size(81, 31); this.outdoorAreaRadioButton.TabIndex = 1; this.outdoorAreaRadioButton.TabStop = true; this.outdoorAreaRadioButton.Text = "Outdoor"; @@ -4612,9 +4901,10 @@ // indoorAreaRadioButton // this.indoorAreaRadioButton.Appearance = System.Windows.Forms.Appearance.Button; - this.indoorAreaRadioButton.Location = new System.Drawing.Point(13, 19); + this.indoorAreaRadioButton.Location = new System.Drawing.Point(17, 23); + this.indoorAreaRadioButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.indoorAreaRadioButton.Name = "indoorAreaRadioButton"; - this.indoorAreaRadioButton.Size = new System.Drawing.Size(61, 25); + this.indoorAreaRadioButton.Size = new System.Drawing.Size(81, 31); this.indoorAreaRadioButton.TabIndex = 0; this.indoorAreaRadioButton.Text = "Indoor"; this.indoorAreaRadioButton.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -4625,9 +4915,10 @@ // this.importAreaDataButton.Image = ((System.Drawing.Image)(resources.GetObject("importAreaDataButton.Image"))); this.importAreaDataButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.importAreaDataButton.Location = new System.Drawing.Point(286, 72); + this.importAreaDataButton.Location = new System.Drawing.Point(381, 89); + this.importAreaDataButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.importAreaDataButton.Name = "importAreaDataButton"; - this.importAreaDataButton.Size = new System.Drawing.Size(107, 45); + this.importAreaDataButton.Size = new System.Drawing.Size(143, 55); this.importAreaDataButton.TabIndex = 12; this.importAreaDataButton.Text = "Import and\r\nReplace"; this.importAreaDataButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4638,9 +4929,10 @@ // this.removeAreaDataButton.Image = ((System.Drawing.Image)(resources.GetObject("removeAreaDataButton.Image"))); this.removeAreaDataButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeAreaDataButton.Location = new System.Drawing.Point(395, 23); + this.removeAreaDataButton.Location = new System.Drawing.Point(527, 28); + this.removeAreaDataButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.removeAreaDataButton.Name = "removeAreaDataButton"; - this.removeAreaDataButton.Size = new System.Drawing.Size(107, 45); + this.removeAreaDataButton.Size = new System.Drawing.Size(143, 55); this.removeAreaDataButton.TabIndex = 14; this.removeAreaDataButton.Text = "Remove Last"; this.removeAreaDataButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4651,9 +4943,10 @@ // this.addAreaDataButton.Image = ((System.Drawing.Image)(resources.GetObject("addAreaDataButton.Image"))); this.addAreaDataButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addAreaDataButton.Location = new System.Drawing.Point(286, 23); + this.addAreaDataButton.Location = new System.Drawing.Point(381, 28); + this.addAreaDataButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.addAreaDataButton.Name = "addAreaDataButton"; - this.addAreaDataButton.Size = new System.Drawing.Size(107, 45); + this.addAreaDataButton.Size = new System.Drawing.Size(143, 55); this.addAreaDataButton.TabIndex = 13; this.addAreaDataButton.Text = "Add Area Data"; this.addAreaDataButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4664,9 +4957,10 @@ // this.saveAreaDataButton.Image = global::DSPRE.Properties.Resources.save_rom; this.saveAreaDataButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.saveAreaDataButton.Location = new System.Drawing.Point(177, 23); + this.saveAreaDataButton.Location = new System.Drawing.Point(236, 28); + this.saveAreaDataButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.saveAreaDataButton.Name = "saveAreaDataButton"; - this.saveAreaDataButton.Size = new System.Drawing.Size(107, 45); + this.saveAreaDataButton.Size = new System.Drawing.Size(143, 55); this.saveAreaDataButton.TabIndex = 12; this.saveAreaDataButton.Text = "&Save \r\nArea Data"; this.saveAreaDataButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4676,32 +4970,35 @@ // label35 // this.label35.AutoSize = true; - this.label35.Location = new System.Drawing.Point(397, 141); + this.label35.Location = new System.Drawing.Point(529, 174); + this.label35.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label35.Name = "label35"; - this.label35.Size = new System.Drawing.Size(76, 13); + this.label35.Size = new System.Drawing.Size(96, 16); this.label35.TabIndex = 8; this.label35.Text = "Global NSBTA"; // // areaDataDynamicTexturesNumericUpDown // this.areaDataDynamicTexturesNumericUpDown.Enabled = false; - this.areaDataDynamicTexturesNumericUpDown.Location = new System.Drawing.Point(400, 157); + this.areaDataDynamicTexturesNumericUpDown.Location = new System.Drawing.Point(533, 193); + this.areaDataDynamicTexturesNumericUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.areaDataDynamicTexturesNumericUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.areaDataDynamicTexturesNumericUpDown.Name = "areaDataDynamicTexturesNumericUpDown"; - this.areaDataDynamicTexturesNumericUpDown.Size = new System.Drawing.Size(82, 20); + this.areaDataDynamicTexturesNumericUpDown.Size = new System.Drawing.Size(109, 22); this.areaDataDynamicTexturesNumericUpDown.TabIndex = 7; this.areaDataDynamicTexturesNumericUpDown.ValueChanged += new System.EventHandler(this.areaDataDynamicTexturesUpDown_ValueChanged); // // label34 // this.label34.AutoSize = true; - this.label34.Location = new System.Drawing.Point(352, 191); + this.label34.Location = new System.Drawing.Point(469, 235); + this.label34.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label34.Name = "label34"; - this.label34.Size = new System.Drawing.Size(53, 13); + this.label34.Size = new System.Drawing.Size(64, 16); this.label34.TabIndex = 6; this.label34.Text = "Light type"; // @@ -4709,62 +5006,69 @@ // this.areaDataLightTypeComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.areaDataLightTypeComboBox.FormattingEnabled = true; - this.areaDataLightTypeComboBox.Location = new System.Drawing.Point(355, 207); + this.areaDataLightTypeComboBox.Location = new System.Drawing.Point(473, 255); + this.areaDataLightTypeComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.areaDataLightTypeComboBox.Name = "areaDataLightTypeComboBox"; - this.areaDataLightTypeComboBox.Size = new System.Drawing.Size(137, 21); + this.areaDataLightTypeComboBox.Size = new System.Drawing.Size(181, 24); this.areaDataLightTypeComboBox.TabIndex = 5; this.areaDataLightTypeComboBox.SelectedIndexChanged += new System.EventHandler(this.areaDataLightTypeComboBox_SelectedIndexChanged); // // label33 // this.label33.AutoSize = true; - this.label33.Location = new System.Drawing.Point(187, 141); + this.label33.Location = new System.Drawing.Point(249, 174); + this.label33.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label33.Name = "label33"; - this.label33.Size = new System.Drawing.Size(72, 13); + this.label33.Size = new System.Drawing.Size(89, 16); this.label33.TabIndex = 4; this.label33.Text = "Map Textures"; // // areaDataMapTilesetUpDown // - this.areaDataMapTilesetUpDown.Location = new System.Drawing.Point(191, 157); + this.areaDataMapTilesetUpDown.Location = new System.Drawing.Point(255, 193); + this.areaDataMapTilesetUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.areaDataMapTilesetUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.areaDataMapTilesetUpDown.Name = "areaDataMapTilesetUpDown"; - this.areaDataMapTilesetUpDown.Size = new System.Drawing.Size(82, 20); + this.areaDataMapTilesetUpDown.Size = new System.Drawing.Size(109, 22); this.areaDataMapTilesetUpDown.TabIndex = 3; this.areaDataMapTilesetUpDown.ValueChanged += new System.EventHandler(this.areaDataMapTilesetUpDown_ValueChanged); // // label32 // this.label32.AutoSize = true; - this.label32.Location = new System.Drawing.Point(293, 141); + this.label32.Location = new System.Drawing.Point(391, 174); + this.label32.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label32.Name = "label32"; - this.label32.Size = new System.Drawing.Size(88, 13); + this.label32.Size = new System.Drawing.Size(110, 16); this.label32.TabIndex = 2; this.label32.Text = "Building Textures"; // // areaDataBuildingTilesetUpDown // - this.areaDataBuildingTilesetUpDown.Location = new System.Drawing.Point(296, 157); + this.areaDataBuildingTilesetUpDown.Location = new System.Drawing.Point(395, 193); + this.areaDataBuildingTilesetUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.areaDataBuildingTilesetUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.areaDataBuildingTilesetUpDown.Name = "areaDataBuildingTilesetUpDown"; - this.areaDataBuildingTilesetUpDown.Size = new System.Drawing.Size(82, 20); + this.areaDataBuildingTilesetUpDown.Size = new System.Drawing.Size(109, 22); this.areaDataBuildingTilesetUpDown.TabIndex = 1; this.areaDataBuildingTilesetUpDown.ValueChanged += new System.EventHandler(this.areaDataBuildingTilesetUpDown_ValueChanged); // // selectAreaDataListBox // this.selectAreaDataListBox.FormattingEnabled = true; - this.selectAreaDataListBox.Location = new System.Drawing.Point(12, 24); + this.selectAreaDataListBox.ItemHeight = 16; + this.selectAreaDataListBox.Location = new System.Drawing.Point(16, 30); + this.selectAreaDataListBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.selectAreaDataListBox.Name = "selectAreaDataListBox"; - this.selectAreaDataListBox.Size = new System.Drawing.Size(156, 212); + this.selectAreaDataListBox.Size = new System.Drawing.Size(207, 260); this.selectAreaDataListBox.TabIndex = 0; this.selectAreaDataListBox.SelectedIndexChanged += new System.EventHandler(this.selectAreaDataListBox_SelectedIndexChanged); // @@ -4772,9 +5076,10 @@ // this.addNSBTXButton.Image = ((System.Drawing.Image)(resources.GetObject("addNSBTXButton.Image"))); this.addNSBTXButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addNSBTXButton.Location = new System.Drawing.Point(240, 18); + this.addNSBTXButton.Location = new System.Drawing.Point(320, 22); + this.addNSBTXButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.addNSBTXButton.Name = "addNSBTXButton"; - this.addNSBTXButton.Size = new System.Drawing.Size(88, 44); + this.addNSBTXButton.Size = new System.Drawing.Size(117, 54); this.addNSBTXButton.TabIndex = 10; this.addNSBTXButton.Text = "Add NSBTX"; this.addNSBTXButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4785,9 +5090,10 @@ // this.exportNSBTXButton.Image = ((System.Drawing.Image)(resources.GetObject("exportNSBTXButton.Image"))); this.exportNSBTXButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.exportNSBTXButton.Location = new System.Drawing.Point(125, 18); + this.exportNSBTXButton.Location = new System.Drawing.Point(167, 22); + this.exportNSBTXButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.exportNSBTXButton.Name = "exportNSBTXButton"; - this.exportNSBTXButton.Size = new System.Drawing.Size(92, 44); + this.exportNSBTXButton.Size = new System.Drawing.Size(123, 54); this.exportNSBTXButton.TabIndex = 9; this.exportNSBTXButton.Text = "&Export\r\nSelected"; this.exportNSBTXButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4798,9 +5104,10 @@ // this.importNSBTXButton.Image = ((System.Drawing.Image)(resources.GetObject("importNSBTXButton.Image"))); this.importNSBTXButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.importNSBTXButton.Location = new System.Drawing.Point(21, 18); + this.importNSBTXButton.Location = new System.Drawing.Point(28, 22); + this.importNSBTXButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.importNSBTXButton.Name = "importNSBTXButton"; - this.importNSBTXButton.Size = new System.Drawing.Size(100, 44); + this.importNSBTXButton.Size = new System.Drawing.Size(133, 54); this.importNSBTXButton.TabIndex = 8; this.importNSBTXButton.Text = "&Replace\r\nSelected..."; this.importNSBTXButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4814,9 +5121,10 @@ this.texturePictureBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.texturePictureBox.Image = global::DSPRE.Properties.Resources.alphabgCheckerboard; this.texturePictureBox.invertDrag = true; - this.texturePictureBox.Location = new System.Drawing.Point(732, 52); + this.texturePictureBox.Location = new System.Drawing.Point(976, 64); + this.texturePictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.texturePictureBox.Name = "texturePictureBox"; - this.texturePictureBox.Size = new System.Drawing.Size(256, 256); + this.texturePictureBox.Size = new System.Drawing.Size(341, 315); this.texturePictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.texturePictureBox.TabIndex = 7; this.texturePictureBox.TabStop = false; @@ -4824,45 +5132,52 @@ // palettesLabel // this.palettesLabel.AutoSize = true; - this.palettesLabel.Location = new System.Drawing.Point(435, 68); + this.palettesLabel.Location = new System.Drawing.Point(580, 84); + this.palettesLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.palettesLabel.Name = "palettesLabel"; - this.palettesLabel.Size = new System.Drawing.Size(45, 13); + this.palettesLabel.Size = new System.Drawing.Size(56, 16); this.palettesLabel.TabIndex = 6; this.palettesLabel.Text = "Palettes"; // // texturesLabel // this.texturesLabel.AutoSize = true; - this.texturesLabel.Location = new System.Drawing.Point(237, 68); + this.texturesLabel.Location = new System.Drawing.Point(316, 84); + this.texturesLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.texturesLabel.Name = "texturesLabel"; - this.texturesLabel.Size = new System.Drawing.Size(48, 13); + this.texturesLabel.Size = new System.Drawing.Size(59, 16); this.texturesLabel.TabIndex = 5; this.texturesLabel.Text = "Textures"; // // palettesListBox // this.palettesListBox.FormattingEnabled = true; - this.palettesListBox.Location = new System.Drawing.Point(438, 84); + this.palettesListBox.ItemHeight = 16; + this.palettesListBox.Location = new System.Drawing.Point(584, 103); + this.palettesListBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.palettesListBox.Name = "palettesListBox"; - this.palettesListBox.Size = new System.Drawing.Size(185, 498); + this.palettesListBox.Size = new System.Drawing.Size(245, 612); this.palettesListBox.TabIndex = 4; this.palettesListBox.SelectedIndexChanged += new System.EventHandler(this.palettesListBox_SelectedIndexChanged); // // texturesListBox // this.texturesListBox.FormattingEnabled = true; - this.texturesListBox.Location = new System.Drawing.Point(240, 84); + this.texturesListBox.ItemHeight = 16; + this.texturesListBox.Location = new System.Drawing.Point(320, 103); + this.texturesListBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.texturesListBox.Name = "texturesListBox"; - this.texturesListBox.Size = new System.Drawing.Size(185, 498); + this.texturesListBox.Size = new System.Drawing.Size(245, 612); this.texturesListBox.TabIndex = 3; this.texturesListBox.SelectedIndexChanged += new System.EventHandler(this.texturesListBox_SelectedIndexChanged); // // buildingsTilesetRadioButton // this.buildingsTilesetRadioButton.AutoSize = true; - this.buildingsTilesetRadioButton.Location = new System.Drawing.Point(115, 66); + this.buildingsTilesetRadioButton.Location = new System.Drawing.Point(153, 81); + this.buildingsTilesetRadioButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buildingsTilesetRadioButton.Name = "buildingsTilesetRadioButton"; - this.buildingsTilesetRadioButton.Size = new System.Drawing.Size(106, 17); + this.buildingsTilesetRadioButton.Size = new System.Drawing.Size(131, 20); this.buildingsTilesetRadioButton.TabIndex = 2; this.buildingsTilesetRadioButton.Text = "Buildings NSBTX"; this.buildingsTilesetRadioButton.UseVisualStyleBackColor = true; @@ -4872,9 +5187,10 @@ // this.mapTilesetRadioButton.AutoSize = true; this.mapTilesetRadioButton.Checked = true; - this.mapTilesetRadioButton.Location = new System.Drawing.Point(21, 66); + this.mapTilesetRadioButton.Location = new System.Drawing.Point(28, 81); + this.mapTilesetRadioButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.mapTilesetRadioButton.Name = "mapTilesetRadioButton"; - this.mapTilesetRadioButton.Size = new System.Drawing.Size(90, 17); + this.mapTilesetRadioButton.Size = new System.Drawing.Size(110, 20); this.mapTilesetRadioButton.TabIndex = 1; this.mapTilesetRadioButton.TabStop = true; this.mapTilesetRadioButton.Text = "Maps NSBTX"; @@ -4884,9 +5200,11 @@ // texturePacksListBox // this.texturePacksListBox.FormattingEnabled = true; - this.texturePacksListBox.Location = new System.Drawing.Point(21, 84); + this.texturePacksListBox.ItemHeight = 16; + this.texturePacksListBox.Location = new System.Drawing.Point(28, 103); + this.texturePacksListBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.texturePacksListBox.Name = "texturePacksListBox"; - this.texturePacksListBox.Size = new System.Drawing.Size(196, 498); + this.texturePacksListBox.Size = new System.Drawing.Size(260, 612); this.texturePacksListBox.TabIndex = 0; this.texturePacksListBox.SelectedIndexChanged += new System.EventHandler(this.texturePacksListBox_SelectedIndexChanged); // @@ -4922,10 +5240,11 @@ this.eventEditorTabPage.Controls.Add(this.importEventFileButton); this.eventEditorTabPage.Controls.Add(this.saveEventsButton); this.eventEditorTabPage.ImageIndex = 3; - this.eventEditorTabPage.Location = new System.Drawing.Point(4, 23); + this.eventEditorTabPage.Location = new System.Drawing.Point(4, 25); + this.eventEditorTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.eventEditorTabPage.Name = "eventEditorTabPage"; - this.eventEditorTabPage.Padding = new System.Windows.Forms.Padding(3); - this.eventEditorTabPage.Size = new System.Drawing.Size(1185, 675); + this.eventEditorTabPage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.eventEditorTabPage.Size = new System.Drawing.Size(1583, 835); this.eventEditorTabPage.TabIndex = 3; this.eventEditorTabPage.Text = "Event Editor"; this.eventEditorTabPage.Enter += new System.EventHandler(this.eventEditorTabPage_Enter); @@ -4933,9 +5252,10 @@ // locateCurrentEvFile // this.locateCurrentEvFile.Image = global::DSPRE.Properties.Resources.open_file; - this.locateCurrentEvFile.Location = new System.Drawing.Point(461, 14); + this.locateCurrentEvFile.Location = new System.Drawing.Point(615, 17); + this.locateCurrentEvFile.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.locateCurrentEvFile.Name = "locateCurrentEvFile"; - this.locateCurrentEvFile.Size = new System.Drawing.Size(42, 40); + this.locateCurrentEvFile.Size = new System.Drawing.Size(56, 49); this.locateCurrentEvFile.TabIndex = 62; this.locateCurrentEvFile.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.locateCurrentEvFile.UseVisualStyleBackColor = true; @@ -4949,9 +5269,11 @@ this.groupBox21.Controls.Add(this.showSpawnablesCheckBox); this.groupBox21.Controls.Add(this.eventAreaDataUpDown); this.groupBox21.Controls.Add(this.eventMapTextureLabel); - this.groupBox21.Location = new System.Drawing.Point(463, 477); + this.groupBox21.Location = new System.Drawing.Point(617, 587); + this.groupBox21.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox21.Name = "groupBox21"; - this.groupBox21.Size = new System.Drawing.Size(128, 135); + this.groupBox21.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox21.Size = new System.Drawing.Size(171, 166); this.groupBox21.TabIndex = 61; this.groupBox21.TabStop = false; this.groupBox21.Text = "Renderer Settings"; @@ -4961,9 +5283,10 @@ this.showTriggersCheckBox.AutoSize = true; this.showTriggersCheckBox.Checked = true; this.showTriggersCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; - this.showTriggersCheckBox.Location = new System.Drawing.Point(9, 86); + this.showTriggersCheckBox.Location = new System.Drawing.Point(12, 106); + this.showTriggersCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.showTriggersCheckBox.Name = "showTriggersCheckBox"; - this.showTriggersCheckBox.Size = new System.Drawing.Size(94, 17); + this.showTriggersCheckBox.Size = new System.Drawing.Size(116, 20); this.showTriggersCheckBox.TabIndex = 44; this.showTriggersCheckBox.Text = "Show Triggers"; this.showTriggersCheckBox.UseVisualStyleBackColor = true; @@ -4974,9 +5297,10 @@ this.showWarpsCheckBox.AutoSize = true; this.showWarpsCheckBox.Checked = true; this.showWarpsCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; - this.showWarpsCheckBox.Location = new System.Drawing.Point(9, 64); + this.showWarpsCheckBox.Location = new System.Drawing.Point(12, 79); + this.showWarpsCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.showWarpsCheckBox.Name = "showWarpsCheckBox"; - this.showWarpsCheckBox.Size = new System.Drawing.Size(87, 17); + this.showWarpsCheckBox.Size = new System.Drawing.Size(105, 20); this.showWarpsCheckBox.TabIndex = 43; this.showWarpsCheckBox.Text = "Show Warps"; this.showWarpsCheckBox.UseVisualStyleBackColor = true; @@ -4987,9 +5311,10 @@ this.showOwsCheckBox.AutoSize = true; this.showOwsCheckBox.Checked = true; this.showOwsCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; - this.showOwsCheckBox.Location = new System.Drawing.Point(9, 42); + this.showOwsCheckBox.Location = new System.Drawing.Point(12, 52); + this.showOwsCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.showOwsCheckBox.Name = "showOwsCheckBox"; - this.showOwsCheckBox.Size = new System.Drawing.Size(109, 17); + this.showOwsCheckBox.Size = new System.Drawing.Size(133, 20); this.showOwsCheckBox.TabIndex = 42; this.showOwsCheckBox.Text = "Show Overworlds"; this.showOwsCheckBox.UseVisualStyleBackColor = true; @@ -5000,9 +5325,10 @@ this.showSpawnablesCheckBox.AutoSize = true; this.showSpawnablesCheckBox.Checked = true; this.showSpawnablesCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; - this.showSpawnablesCheckBox.Location = new System.Drawing.Point(9, 20); + this.showSpawnablesCheckBox.Location = new System.Drawing.Point(12, 25); + this.showSpawnablesCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.showSpawnablesCheckBox.Name = "showSpawnablesCheckBox"; - this.showSpawnablesCheckBox.Size = new System.Drawing.Size(114, 17); + this.showSpawnablesCheckBox.Size = new System.Drawing.Size(140, 20); this.showSpawnablesCheckBox.TabIndex = 41; this.showSpawnablesCheckBox.Text = "Show Spawnables"; this.showSpawnablesCheckBox.UseVisualStyleBackColor = true; @@ -5010,14 +5336,15 @@ // // eventAreaDataUpDown // - this.eventAreaDataUpDown.Location = new System.Drawing.Point(9, 108); + this.eventAreaDataUpDown.Location = new System.Drawing.Point(12, 133); + this.eventAreaDataUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.eventAreaDataUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.eventAreaDataUpDown.Name = "eventAreaDataUpDown"; - this.eventAreaDataUpDown.Size = new System.Drawing.Size(40, 20); + this.eventAreaDataUpDown.Size = new System.Drawing.Size(53, 22); this.eventAreaDataUpDown.TabIndex = 30; this.eventAreaDataUpDown.ValueChanged += new System.EventHandler(this.eventAreaDataUpDown_ValueChanged); // @@ -5025,52 +5352,58 @@ // this.eventMapTextureLabel.AutoSize = true; this.eventMapTextureLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.eventMapTextureLabel.Location = new System.Drawing.Point(51, 110); + this.eventMapTextureLabel.Location = new System.Drawing.Point(68, 135); + this.eventMapTextureLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.eventMapTextureLabel.Name = "eventMapTextureLabel"; - this.eventMapTextureLabel.Size = new System.Drawing.Size(70, 15); + this.eventMapTextureLabel.Size = new System.Drawing.Size(82, 18); this.eventMapTextureLabel.TabIndex = 31; this.eventMapTextureLabel.Text = "Area Data"; // // RightClickLabel // this.RightClickLabel.AutoSize = true; - this.RightClickLabel.Location = new System.Drawing.Point(469, 458); + this.RightClickLabel.Location = new System.Drawing.Point(625, 564); + this.RightClickLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.RightClickLabel.Name = "RightClickLabel"; - this.RightClickLabel.Size = new System.Drawing.Size(37, 13); + this.RightClickLabel.Size = new System.Drawing.Size(45, 16); this.RightClickLabel.TabIndex = 60; this.RightClickLabel.Text = "Select"; // // WheelClickLabel // this.WheelClickLabel.AutoSize = true; - this.WheelClickLabel.Location = new System.Drawing.Point(555, 458); + this.WheelClickLabel.Location = new System.Drawing.Point(740, 564); + this.WheelClickLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.WheelClickLabel.Name = "WheelClickLabel"; - this.WheelClickLabel.Size = new System.Drawing.Size(33, 13); + this.WheelClickLabel.Size = new System.Drawing.Size(40, 16); this.WheelClickLabel.TabIndex = 58; this.WheelClickLabel.Text = "Warp"; // // LeftClickLabel // this.LeftClickLabel.AutoSize = true; - this.LeftClickLabel.Location = new System.Drawing.Point(513, 458); + this.LeftClickLabel.Location = new System.Drawing.Point(684, 564); + this.LeftClickLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.LeftClickLabel.Name = "LeftClickLabel"; - this.LeftClickLabel.Size = new System.Drawing.Size(34, 13); + this.LeftClickLabel.Size = new System.Drawing.Size(41, 16); this.LeftClickLabel.TabIndex = 57; this.LeftClickLabel.Text = "Move"; // // eventMatrixYUpDown // - this.eventMatrixYUpDown.Location = new System.Drawing.Point(466, 173); + this.eventMatrixYUpDown.Location = new System.Drawing.Point(621, 213); + this.eventMatrixYUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.eventMatrixYUpDown.Name = "eventMatrixYUpDown"; - this.eventMatrixYUpDown.Size = new System.Drawing.Size(40, 20); + this.eventMatrixYUpDown.Size = new System.Drawing.Size(53, 22); this.eventMatrixYUpDown.TabIndex = 52; this.eventMatrixYUpDown.ValueChanged += new System.EventHandler(this.eventMatrixCoordsUpDown_ValueChanged); // // eventMatrixXUpDown // - this.eventMatrixXUpDown.Location = new System.Drawing.Point(466, 147); + this.eventMatrixXUpDown.Location = new System.Drawing.Point(621, 181); + this.eventMatrixXUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.eventMatrixXUpDown.Name = "eventMatrixXUpDown"; - this.eventMatrixXUpDown.Size = new System.Drawing.Size(40, 20); + this.eventMatrixXUpDown.Size = new System.Drawing.Size(53, 22); this.eventMatrixXUpDown.TabIndex = 51; this.eventMatrixXUpDown.ValueChanged += new System.EventHandler(this.eventMatrixCoordsUpDown_ValueChanged); // @@ -5079,9 +5412,10 @@ this.eventMatrixYLabel.AutoSize = true; this.eventMatrixYLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.eventMatrixYLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); - this.eventMatrixYLabel.Location = new System.Drawing.Point(512, 174); + this.eventMatrixYLabel.Location = new System.Drawing.Point(683, 214); + this.eventMatrixYLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.eventMatrixYLabel.Name = "eventMatrixYLabel"; - this.eventMatrixYLabel.Size = new System.Drawing.Size(60, 13); + this.eventMatrixYLabel.Size = new System.Drawing.Size(77, 17); this.eventMatrixYLabel.TabIndex = 50; this.eventMatrixYLabel.Text = "Current Y"; // @@ -5090,18 +5424,20 @@ this.eventMatrixXLabel.AutoSize = true; this.eventMatrixXLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.eventMatrixXLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.eventMatrixXLabel.Location = new System.Drawing.Point(512, 149); + this.eventMatrixXLabel.Location = new System.Drawing.Point(683, 183); + this.eventMatrixXLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.eventMatrixXLabel.Name = "eventMatrixXLabel"; - this.eventMatrixXLabel.Size = new System.Drawing.Size(60, 13); + this.eventMatrixXLabel.Size = new System.Drawing.Size(77, 17); this.eventMatrixXLabel.TabIndex = 49; this.eventMatrixXLabel.Text = "Current X"; // // matrixNavigatorLabel // this.matrixNavigatorLabel.AutoSize = true; - this.matrixNavigatorLabel.Location = new System.Drawing.Point(8, 68); + this.matrixNavigatorLabel.Location = new System.Drawing.Point(11, 84); + this.matrixNavigatorLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.matrixNavigatorLabel.Name = "matrixNavigatorLabel"; - this.matrixNavigatorLabel.Size = new System.Drawing.Size(84, 13); + this.matrixNavigatorLabel.Size = new System.Drawing.Size(104, 16); this.matrixNavigatorLabel.TabIndex = 48; this.matrixNavigatorLabel.Text = "Matrix Navigator"; // @@ -5111,14 +5447,16 @@ this.eventMatrixPanel.BackColor = System.Drawing.SystemColors.Menu; this.eventMatrixPanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.eventMatrixPanel.Controls.Add(this.eventMatrixPictureBox); - this.eventMatrixPanel.Location = new System.Drawing.Point(9, 82); + this.eventMatrixPanel.Location = new System.Drawing.Point(12, 101); + this.eventMatrixPanel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.eventMatrixPanel.Name = "eventMatrixPanel"; - this.eventMatrixPanel.Size = new System.Drawing.Size(448, 149); + this.eventMatrixPanel.Size = new System.Drawing.Size(596, 182); this.eventMatrixPanel.TabIndex = 47; // // eventMatrixPictureBox // this.eventMatrixPictureBox.Location = new System.Drawing.Point(0, -1); + this.eventMatrixPictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.eventMatrixPictureBox.Name = "eventMatrixPictureBox"; this.eventMatrixPictureBox.Size = new System.Drawing.Size(440, 150); this.eventMatrixPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; @@ -5130,9 +5468,10 @@ // this.selectEventComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.selectEventComboBox.FormattingEnabled = true; - this.selectEventComboBox.Location = new System.Drawing.Point(10, 11); + this.selectEventComboBox.Location = new System.Drawing.Point(13, 14); + this.selectEventComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.selectEventComboBox.Name = "selectEventComboBox"; - this.selectEventComboBox.Size = new System.Drawing.Size(164, 21); + this.selectEventComboBox.Size = new System.Drawing.Size(217, 24); this.selectEventComboBox.TabIndex = 41; this.selectEventComboBox.SelectedIndexChanged += new System.EventHandler(this.selectEventComboBox_SelectedIndexChanged); // @@ -5140,22 +5479,24 @@ // this.backgroundMapLabel.AutoSize = true; this.backgroundMapLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.backgroundMapLabel.Location = new System.Drawing.Point(510, 103); + this.backgroundMapLabel.Location = new System.Drawing.Point(680, 127); + this.backgroundMapLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.backgroundMapLabel.Name = "backgroundMapLabel"; - this.backgroundMapLabel.Size = new System.Drawing.Size(79, 15); + this.backgroundMapLabel.Size = new System.Drawing.Size(91, 18); this.backgroundMapLabel.TabIndex = 29; this.backgroundMapLabel.Text = "Map Matrix"; // // eventMatrixUpDown // - this.eventMatrixUpDown.Location = new System.Drawing.Point(466, 101); + this.eventMatrixUpDown.Location = new System.Drawing.Point(621, 124); + this.eventMatrixUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.eventMatrixUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.eventMatrixUpDown.Name = "eventMatrixUpDown"; - this.eventMatrixUpDown.Size = new System.Drawing.Size(40, 20); + this.eventMatrixUpDown.Size = new System.Drawing.Size(53, 22); this.eventMatrixUpDown.TabIndex = 28; this.eventMatrixUpDown.ValueChanged += new System.EventHandler(this.eventMatrixUpDown_ValueChanged); // @@ -5165,10 +5506,11 @@ this.eventsTabControl.Controls.Add(this.overworldsTabPage); this.eventsTabControl.Controls.Add(this.warpsTabPage); this.eventsTabControl.Controls.Add(this.triggersTabPage); - this.eventsTabControl.Location = new System.Drawing.Point(9, 236); + this.eventsTabControl.Location = new System.Drawing.Point(12, 290); + this.eventsTabControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.eventsTabControl.Name = "eventsTabControl"; this.eventsTabControl.SelectedIndex = 0; - this.eventsTabControl.Size = new System.Drawing.Size(452, 378); + this.eventsTabControl.Size = new System.Drawing.Size(603, 465); this.eventsTabControl.TabIndex = 25; this.eventsTabControl.SelectedIndexChanged += new System.EventHandler(this.eventsTabControl_SelectedIndexChanged); // @@ -5185,10 +5527,11 @@ this.signsTabPage.Controls.Add(this.signScriptNumberLabel); this.signsTabPage.Controls.Add(this.spawnableScriptUpDown); this.signsTabPage.Controls.Add(this.spawnablesListBox); - this.signsTabPage.Location = new System.Drawing.Point(4, 22); + this.signsTabPage.Location = new System.Drawing.Point(4, 25); + this.signsTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.signsTabPage.Name = "signsTabPage"; - this.signsTabPage.Padding = new System.Windows.Forms.Padding(3); - this.signsTabPage.Size = new System.Drawing.Size(444, 352); + this.signsTabPage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.signsTabPage.Size = new System.Drawing.Size(595, 436); this.signsTabPage.TabIndex = 0; this.signsTabPage.Text = "Spawnables"; this.signsTabPage.UseVisualStyleBackColor = true; @@ -5197,18 +5540,20 @@ // this.spawnableTypeComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.spawnableTypeComboBox.FormattingEnabled = true; - this.spawnableTypeComboBox.Location = new System.Drawing.Point(229, 71); + this.spawnableTypeComboBox.Location = new System.Drawing.Point(305, 87); + this.spawnableTypeComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.spawnableTypeComboBox.Name = "spawnableTypeComboBox"; - this.spawnableTypeComboBox.Size = new System.Drawing.Size(205, 21); + this.spawnableTypeComboBox.Size = new System.Drawing.Size(272, 24); this.spawnableTypeComboBox.TabIndex = 25; this.spawnableTypeComboBox.SelectedIndexChanged += new System.EventHandler(this.spawnableTypeComboBox_SelectedIndexChanged); // // label18 // this.label18.AutoSize = true; - this.label18.Location = new System.Drawing.Point(226, 55); + this.label18.Location = new System.Drawing.Point(301, 68); + this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(87, 13); + this.label18.Size = new System.Drawing.Size(110, 16); this.label18.TabIndex = 24; this.label18.Text = "Spawnable Type"; // @@ -5216,9 +5561,10 @@ // this.duplicateSpawnableButton.Image = global::DSPRE.Properties.Resources.copyIcon_small; this.duplicateSpawnableButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.duplicateSpawnableButton.Location = new System.Drawing.Point(139, 318); + this.duplicateSpawnableButton.Location = new System.Drawing.Point(185, 391); + this.duplicateSpawnableButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.duplicateSpawnableButton.Name = "duplicateSpawnableButton"; - this.duplicateSpawnableButton.Size = new System.Drawing.Size(79, 28); + this.duplicateSpawnableButton.Size = new System.Drawing.Size(105, 34); this.duplicateSpawnableButton.TabIndex = 23; this.duplicateSpawnableButton.Text = "Duplicate"; this.duplicateSpawnableButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -5238,9 +5584,11 @@ this.groupBox5.Controls.Add(this.signMapXLabel); this.groupBox5.Controls.Add(this.spawnableYMapUpDown); this.groupBox5.Controls.Add(this.signMapYLabel); - this.groupBox5.Location = new System.Drawing.Point(229, 150); + this.groupBox5.Location = new System.Drawing.Point(305, 185); + this.groupBox5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox5.Name = "groupBox5"; - this.groupBox5.Size = new System.Drawing.Size(205, 190); + this.groupBox5.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox5.Size = new System.Drawing.Size(273, 234); this.groupBox5.TabIndex = 22; this.groupBox5.TabStop = false; this.groupBox5.Text = "Position"; @@ -5249,9 +5597,10 @@ // this.goToSignButton.Image = global::DSPRE.Properties.Resources.goToSpawnable; this.goToSignButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.goToSignButton.Location = new System.Drawing.Point(30, 137); + this.goToSignButton.Location = new System.Drawing.Point(40, 169); + this.goToSignButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.goToSignButton.Name = "goToSignButton"; - this.goToSignButton.Size = new System.Drawing.Size(141, 39); + this.goToSignButton.Size = new System.Drawing.Size(188, 48); this.goToSignButton.TabIndex = 20; this.goToSignButton.Text = "Find this Spawnable"; this.goToSignButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -5261,59 +5610,65 @@ // signMatrixYLabel // this.signMatrixYLabel.AutoSize = true; - this.signMatrixYLabel.Location = new System.Drawing.Point(25, 107); + this.signMatrixYLabel.Location = new System.Drawing.Point(33, 132); + this.signMatrixYLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.signMatrixYLabel.Name = "signMatrixYLabel"; - this.signMatrixYLabel.Size = new System.Drawing.Size(45, 13); + this.signMatrixYLabel.Size = new System.Drawing.Size(54, 16); this.signMatrixYLabel.TabIndex = 19; this.signMatrixYLabel.Text = "Matrix Y"; // // spawnableXMatrixUpDown // - this.spawnableXMatrixUpDown.Location = new System.Drawing.Point(74, 74); + this.spawnableXMatrixUpDown.Location = new System.Drawing.Point(99, 91); + this.spawnableXMatrixUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.spawnableXMatrixUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.spawnableXMatrixUpDown.Name = "spawnableXMatrixUpDown"; - this.spawnableXMatrixUpDown.Size = new System.Drawing.Size(101, 20); + this.spawnableXMatrixUpDown.Size = new System.Drawing.Size(135, 22); this.spawnableXMatrixUpDown.TabIndex = 16; this.spawnableXMatrixUpDown.ValueChanged += new System.EventHandler(this.spawnableMatrixXUpDown_ValueChanged); // // signMatrixXLabel // this.signMatrixXLabel.AutoSize = true; - this.signMatrixXLabel.Location = new System.Drawing.Point(25, 76); + this.signMatrixXLabel.Location = new System.Drawing.Point(33, 94); + this.signMatrixXLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.signMatrixXLabel.Name = "signMatrixXLabel"; - this.signMatrixXLabel.Size = new System.Drawing.Size(45, 13); + this.signMatrixXLabel.Size = new System.Drawing.Size(53, 16); this.signMatrixXLabel.TabIndex = 17; this.signMatrixXLabel.Text = "Matrix X"; // // spawnableYMatrixUpDown // - this.spawnableYMatrixUpDown.Location = new System.Drawing.Point(74, 104); + this.spawnableYMatrixUpDown.Location = new System.Drawing.Point(99, 128); + this.spawnableYMatrixUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.spawnableYMatrixUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.spawnableYMatrixUpDown.Name = "spawnableYMatrixUpDown"; - this.spawnableYMatrixUpDown.Size = new System.Drawing.Size(101, 20); + this.spawnableYMatrixUpDown.Size = new System.Drawing.Size(135, 22); this.spawnableYMatrixUpDown.TabIndex = 18; this.spawnableYMatrixUpDown.ValueChanged += new System.EventHandler(this.spawnableMatrixYUpDown_ValueChanged); // // signZLabel // this.signZLabel.AutoSize = true; - this.signZLabel.Location = new System.Drawing.Point(137, 22); + this.signZLabel.Location = new System.Drawing.Point(183, 27); + this.signZLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.signZLabel.Name = "signZLabel"; - this.signZLabel.Size = new System.Drawing.Size(38, 13); + this.signZLabel.Size = new System.Drawing.Size(45, 16); this.signZLabel.TabIndex = 15; this.signZLabel.Text = "Map Z"; // // spawnablexMapUpDown // - this.spawnablexMapUpDown.Location = new System.Drawing.Point(28, 38); + this.spawnablexMapUpDown.Location = new System.Drawing.Point(37, 47); + this.spawnablexMapUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.spawnablexMapUpDown.Maximum = new decimal(new int[] { 32768, 0, @@ -5325,13 +5680,14 @@ 0, -2147483648}); this.spawnablexMapUpDown.Name = "spawnablexMapUpDown"; - this.spawnablexMapUpDown.Size = new System.Drawing.Size(36, 20); + this.spawnablexMapUpDown.Size = new System.Drawing.Size(48, 22); this.spawnablexMapUpDown.TabIndex = 10; this.spawnablexMapUpDown.ValueChanged += new System.EventHandler(this.spawnableMapXUpDown_ValueChanged); // // spawnableUpDown // - this.spawnableUpDown.Location = new System.Drawing.Point(138, 38); + this.spawnableUpDown.Location = new System.Drawing.Point(184, 47); + this.spawnableUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.spawnableUpDown.Maximum = new decimal(new int[] { 32768, 0, @@ -5343,38 +5699,41 @@ 0, -2147483648}); this.spawnableUpDown.Name = "spawnableUpDown"; - this.spawnableUpDown.Size = new System.Drawing.Size(36, 20); + this.spawnableUpDown.Size = new System.Drawing.Size(48, 22); this.spawnableUpDown.TabIndex = 14; this.spawnableUpDown.ValueChanged += new System.EventHandler(this.spawnableZUpDown_ValueChanged); // // signMapXLabel // this.signMapXLabel.AutoSize = true; - this.signMapXLabel.Location = new System.Drawing.Point(27, 22); + this.signMapXLabel.Location = new System.Drawing.Point(36, 27); + this.signMapXLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.signMapXLabel.Name = "signMapXLabel"; - this.signMapXLabel.Size = new System.Drawing.Size(38, 13); + this.signMapXLabel.Size = new System.Drawing.Size(45, 16); this.signMapXLabel.TabIndex = 11; this.signMapXLabel.Text = "Map X"; // // spawnableYMapUpDown // - this.spawnableYMapUpDown.Location = new System.Drawing.Point(83, 38); + this.spawnableYMapUpDown.Location = new System.Drawing.Point(111, 47); + this.spawnableYMapUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.spawnableYMapUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.spawnableYMapUpDown.Name = "spawnableYMapUpDown"; - this.spawnableYMapUpDown.Size = new System.Drawing.Size(36, 20); + this.spawnableYMapUpDown.Size = new System.Drawing.Size(48, 22); this.spawnableYMapUpDown.TabIndex = 12; this.spawnableYMapUpDown.ValueChanged += new System.EventHandler(this.spawnableMapYUpDown_ValueChanged); // // signMapYLabel // this.signMapYLabel.AutoSize = true; - this.signMapYLabel.Location = new System.Drawing.Point(82, 22); + this.signMapYLabel.Location = new System.Drawing.Point(109, 27); + this.signMapYLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.signMapYLabel.Name = "signMapYLabel"; - this.signMapYLabel.Size = new System.Drawing.Size(38, 13); + this.signMapYLabel.Size = new System.Drawing.Size(46, 16); this.signMapYLabel.TabIndex = 13; this.signMapYLabel.Text = "Map Y"; // @@ -5382,9 +5741,10 @@ // this.removeSpawnableButton.Image = ((System.Drawing.Image)(resources.GetObject("removeSpawnableButton.Image"))); this.removeSpawnableButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeSpawnableButton.Location = new System.Drawing.Point(68, 317); + this.removeSpawnableButton.Location = new System.Drawing.Point(91, 390); + this.removeSpawnableButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.removeSpawnableButton.Name = "removeSpawnableButton"; - this.removeSpawnableButton.Size = new System.Drawing.Size(67, 28); + this.removeSpawnableButton.Size = new System.Drawing.Size(89, 34); this.removeSpawnableButton.TabIndex = 8; this.removeSpawnableButton.Text = "Delete"; this.removeSpawnableButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -5395,9 +5755,10 @@ // this.addSpawnableButton.Image = ((System.Drawing.Image)(resources.GetObject("addSpawnableButton.Image"))); this.addSpawnableButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addSpawnableButton.Location = new System.Drawing.Point(10, 317); + this.addSpawnableButton.Location = new System.Drawing.Point(13, 390); + this.addSpawnableButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.addSpawnableButton.Name = "addSpawnableButton"; - this.addSpawnableButton.Size = new System.Drawing.Size(54, 28); + this.addSpawnableButton.Size = new System.Drawing.Size(72, 34); this.addSpawnableButton.TabIndex = 7; this.addSpawnableButton.Text = "Add"; this.addSpawnableButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -5408,49 +5769,55 @@ // this.spawnableDirComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.spawnableDirComboBox.FormattingEnabled = true; - this.spawnableDirComboBox.Location = new System.Drawing.Point(229, 121); + this.spawnableDirComboBox.Location = new System.Drawing.Point(305, 149); + this.spawnableDirComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.spawnableDirComboBox.Name = "spawnableDirComboBox"; - this.spawnableDirComboBox.Size = new System.Drawing.Size(205, 21); + this.spawnableDirComboBox.Size = new System.Drawing.Size(272, 24); this.spawnableDirComboBox.TabIndex = 6; this.spawnableDirComboBox.SelectedIndexChanged += new System.EventHandler(this.spawnableDirComboBox_SelectedIndexChanged); // // signOrientationLabel // this.signOrientationLabel.AutoSize = true; - this.signOrientationLabel.Location = new System.Drawing.Point(226, 105); + this.signOrientationLabel.Location = new System.Drawing.Point(301, 129); + this.signOrientationLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.signOrientationLabel.Name = "signOrientationLabel"; - this.signOrientationLabel.Size = new System.Drawing.Size(89, 13); + this.signOrientationLabel.Size = new System.Drawing.Size(110, 16); this.signOrientationLabel.TabIndex = 5; this.signOrientationLabel.Text = "Activation Criteria"; // // signScriptNumberLabel // this.signScriptNumberLabel.AutoSize = true; - this.signScriptNumberLabel.Location = new System.Drawing.Point(224, 25); + this.signScriptNumberLabel.Location = new System.Drawing.Point(299, 31); + this.signScriptNumberLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.signScriptNumberLabel.Name = "signScriptNumberLabel"; - this.signScriptNumberLabel.Size = new System.Drawing.Size(87, 13); + this.signScriptNumberLabel.Size = new System.Drawing.Size(105, 16); this.signScriptNumberLabel.TabIndex = 4; this.signScriptNumberLabel.Text = "Script to activate"; // // spawnableScriptUpDown // - this.spawnableScriptUpDown.Location = new System.Drawing.Point(325, 22); + this.spawnableScriptUpDown.Location = new System.Drawing.Point(433, 27); + this.spawnableScriptUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.spawnableScriptUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.spawnableScriptUpDown.Name = "spawnableScriptUpDown"; - this.spawnableScriptUpDown.Size = new System.Drawing.Size(108, 20); + this.spawnableScriptUpDown.Size = new System.Drawing.Size(144, 22); this.spawnableScriptUpDown.TabIndex = 3; this.spawnableScriptUpDown.ValueChanged += new System.EventHandler(this.spawnableScriptUpDown_ValueChanged); // // spawnablesListBox // this.spawnablesListBox.FormattingEnabled = true; - this.spawnablesListBox.Location = new System.Drawing.Point(10, 11); + this.spawnablesListBox.ItemHeight = 16; + this.spawnablesListBox.Location = new System.Drawing.Point(13, 14); + this.spawnablesListBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.spawnablesListBox.Name = "spawnablesListBox"; - this.spawnablesListBox.Size = new System.Drawing.Size(208, 303); + this.spawnablesListBox.Size = new System.Drawing.Size(276, 372); this.spawnablesListBox.TabIndex = 0; this.spawnablesListBox.SelectedIndexChanged += new System.EventHandler(this.spawnablesListBox_SelectedIndexChanged); // @@ -5477,10 +5844,11 @@ this.overworldsTabPage.Controls.Add(this.removeOverworldButton); this.overworldsTabPage.Controls.Add(this.addOverworldButton); this.overworldsTabPage.Controls.Add(this.overworldsListBox); - this.overworldsTabPage.Location = new System.Drawing.Point(4, 22); + this.overworldsTabPage.Location = new System.Drawing.Point(4, 25); + this.overworldsTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.overworldsTabPage.Name = "overworldsTabPage"; - this.overworldsTabPage.Padding = new System.Windows.Forms.Padding(3); - this.overworldsTabPage.Size = new System.Drawing.Size(444, 352); + this.overworldsTabPage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.overworldsTabPage.Size = new System.Drawing.Size(595, 436); this.overworldsTabPage.TabIndex = 1; this.overworldsTabPage.Text = "Overworlds"; this.overworldsTabPage.UseVisualStyleBackColor = true; @@ -5489,9 +5857,10 @@ // this.sortOWsByIDDescButton.Image = global::DSPRE.Properties.Resources.sortDescending; this.sortOWsByIDDescButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.sortOWsByIDDescButton.Location = new System.Drawing.Point(102, 9); + this.sortOWsByIDDescButton.Location = new System.Drawing.Point(136, 11); + this.sortOWsByIDDescButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.sortOWsByIDDescButton.Name = "sortOWsByIDDescButton"; - this.sortOWsByIDDescButton.Size = new System.Drawing.Size(86, 28); + this.sortOWsByIDDescButton.Size = new System.Drawing.Size(115, 34); this.sortOWsByIDDescButton.TabIndex = 30; this.sortOWsByIDDescButton.Text = "Sort Desc"; this.sortOWsByIDDescButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -5502,9 +5871,10 @@ // this.sortOWsByIDAscButton.Image = global::DSPRE.Properties.Resources.sortAscending; this.sortOWsByIDAscButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.sortOWsByIDAscButton.Location = new System.Drawing.Point(8, 9); + this.sortOWsByIDAscButton.Location = new System.Drawing.Point(11, 11); + this.sortOWsByIDAscButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.sortOWsByIDAscButton.Name = "sortOWsByIDAscButton"; - this.sortOWsByIDAscButton.Size = new System.Drawing.Size(86, 28); + this.sortOWsByIDAscButton.Size = new System.Drawing.Size(115, 34); this.sortOWsByIDAscButton.TabIndex = 29; this.sortOWsByIDAscButton.Text = "Sort Asc"; this.sortOWsByIDAscButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -5516,9 +5886,11 @@ this.groupBox22.Controls.Add(this.normalRadioButton); this.groupBox22.Controls.Add(this.isTrainerRadioButton); this.groupBox22.Controls.Add(this.isItemRadioButton); - this.groupBox22.Location = new System.Drawing.Point(197, 98); + this.groupBox22.Location = new System.Drawing.Point(263, 121); + this.groupBox22.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox22.Name = "groupBox22"; - this.groupBox22.Size = new System.Drawing.Size(162, 45); + this.groupBox22.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox22.Size = new System.Drawing.Size(216, 55); this.groupBox22.TabIndex = 28; this.groupBox22.TabStop = false; this.groupBox22.Text = "Overworld Properties"; @@ -5527,9 +5899,10 @@ // this.normalRadioButton.AutoSize = true; this.normalRadioButton.Checked = true; - this.normalRadioButton.Location = new System.Drawing.Point(6, 19); + this.normalRadioButton.Location = new System.Drawing.Point(8, 23); + this.normalRadioButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.normalRadioButton.Name = "normalRadioButton"; - this.normalRadioButton.Size = new System.Drawing.Size(51, 17); + this.normalRadioButton.Size = new System.Drawing.Size(61, 20); this.normalRadioButton.TabIndex = 15; this.normalRadioButton.TabStop = true; this.normalRadioButton.Text = "None"; @@ -5539,9 +5912,10 @@ // isTrainerRadioButton // this.isTrainerRadioButton.AutoSize = true; - this.isTrainerRadioButton.Location = new System.Drawing.Point(57, 19); + this.isTrainerRadioButton.Location = new System.Drawing.Point(76, 23); + this.isTrainerRadioButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.isTrainerRadioButton.Name = "isTrainerRadioButton"; - this.isTrainerRadioButton.Size = new System.Drawing.Size(58, 17); + this.isTrainerRadioButton.Size = new System.Drawing.Size(71, 20); this.isTrainerRadioButton.TabIndex = 16; this.isTrainerRadioButton.Text = "Trainer"; this.isTrainerRadioButton.UseVisualStyleBackColor = true; @@ -5550,9 +5924,10 @@ // isItemRadioButton // this.isItemRadioButton.AutoSize = true; - this.isItemRadioButton.Location = new System.Drawing.Point(115, 19); + this.isItemRadioButton.Location = new System.Drawing.Point(153, 23); + this.isItemRadioButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.isItemRadioButton.Name = "isItemRadioButton"; - this.isItemRadioButton.Size = new System.Drawing.Size(45, 17); + this.isItemRadioButton.Size = new System.Drawing.Size(53, 20); this.isItemRadioButton.TabIndex = 21; this.isItemRadioButton.Text = "Item"; this.isItemRadioButton.UseVisualStyleBackColor = true; @@ -5561,9 +5936,10 @@ // spriteIDlabel // this.spriteIDlabel.AutoSize = true; - this.spriteIDlabel.Location = new System.Drawing.Point(359, 122); + this.spriteIDlabel.Location = new System.Drawing.Point(479, 150); + this.spriteIDlabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.spriteIDlabel.Name = "spriteIDlabel"; - this.spriteIDlabel.Size = new System.Drawing.Size(0, 13); + this.spriteIDlabel.Size = new System.Drawing.Size(0, 16); this.spriteIDlabel.TabIndex = 27; // // groupBox17 @@ -5573,9 +5949,11 @@ this.groupBox17.Controls.Add(this.label12); this.groupBox17.Controls.Add(this.owXMatrixUpDown); this.groupBox17.Controls.Add(this.label11); - this.groupBox17.Location = new System.Drawing.Point(9, 287); + this.groupBox17.Location = new System.Drawing.Point(12, 353); + this.groupBox17.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox17.Name = "groupBox17"; - this.groupBox17.Size = new System.Drawing.Size(179, 59); + this.groupBox17.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox17.Size = new System.Drawing.Size(239, 73); this.groupBox17.TabIndex = 20; this.groupBox17.TabStop = false; this.groupBox17.Text = "Global Coordinates [Matrix]"; @@ -5584,9 +5962,10 @@ // this.button14.Image = global::DSPRE.Properties.Resources.goToOW; this.button14.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.button14.Location = new System.Drawing.Point(108, 15); + this.button14.Location = new System.Drawing.Point(144, 18); + this.button14.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button14.Name = "button14"; - this.button14.Size = new System.Drawing.Size(63, 39); + this.button14.Size = new System.Drawing.Size(84, 48); this.button14.TabIndex = 5; this.button14.Text = "Find"; this.button14.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -5595,45 +5974,49 @@ // // owYMatrixUpDown // - this.owYMatrixUpDown.Location = new System.Drawing.Point(67, 25); + this.owYMatrixUpDown.Location = new System.Drawing.Point(89, 31); + this.owYMatrixUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.owYMatrixUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.owYMatrixUpDown.Name = "owYMatrixUpDown"; - this.owYMatrixUpDown.Size = new System.Drawing.Size(35, 20); + this.owYMatrixUpDown.Size = new System.Drawing.Size(47, 22); this.owYMatrixUpDown.TabIndex = 6; this.owYMatrixUpDown.ValueChanged += new System.EventHandler(this.owYMatrixUpDown_ValueChanged); // // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(3, 27); + this.label12.Location = new System.Drawing.Point(4, 33); + this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(14, 13); + this.label12.Size = new System.Drawing.Size(15, 16); this.label12.TabIndex = 5; this.label12.Text = "X"; // // owXMatrixUpDown // - this.owXMatrixUpDown.Location = new System.Drawing.Point(18, 24); + this.owXMatrixUpDown.Location = new System.Drawing.Point(24, 30); + this.owXMatrixUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.owXMatrixUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.owXMatrixUpDown.Name = "owXMatrixUpDown"; - this.owXMatrixUpDown.Size = new System.Drawing.Size(33, 20); + this.owXMatrixUpDown.Size = new System.Drawing.Size(44, 22); this.owXMatrixUpDown.TabIndex = 4; this.owXMatrixUpDown.ValueChanged += new System.EventHandler(this.owXMatrixUpDown_ValueChanged); // // label11 // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(54, 28); + this.label11.Location = new System.Drawing.Point(72, 34); + this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(14, 13); + this.label11.Size = new System.Drawing.Size(16, 16); this.label11.TabIndex = 7; this.label11.Text = "Y"; // @@ -5643,9 +6026,11 @@ this.owMovementGroupBox.Controls.Add(this.label4); this.owMovementGroupBox.Controls.Add(this.owOrientationComboBox); this.owMovementGroupBox.Controls.Add(this.owMovementComboBox); - this.owMovementGroupBox.Location = new System.Drawing.Point(197, 256); + this.owMovementGroupBox.Location = new System.Drawing.Point(263, 315); + this.owMovementGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.owMovementGroupBox.Name = "owMovementGroupBox"; - this.owMovementGroupBox.Size = new System.Drawing.Size(232, 90); + this.owMovementGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.owMovementGroupBox.Size = new System.Drawing.Size(309, 111); this.owMovementGroupBox.TabIndex = 18; this.owMovementGroupBox.TabStop = false; this.owMovementGroupBox.Text = "Movement"; @@ -5656,9 +6041,11 @@ this.groupBox23.Controls.Add(this.label20); this.groupBox23.Controls.Add(this.owXRangeUpDown); this.groupBox23.Controls.Add(this.owYRangeUpDown); - this.groupBox23.Location = new System.Drawing.Point(99, 41); + this.groupBox23.Location = new System.Drawing.Point(132, 50); + this.groupBox23.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox23.Name = "groupBox23"; - this.groupBox23.Size = new System.Drawing.Size(123, 45); + this.groupBox23.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox23.Size = new System.Drawing.Size(164, 55); this.groupBox23.TabIndex = 7; this.groupBox23.TabStop = false; this.groupBox23.Text = "Movement Range"; @@ -5666,53 +6053,58 @@ // label39 // this.label39.AutoSize = true; - this.label39.Location = new System.Drawing.Point(63, 20); + this.label39.Location = new System.Drawing.Point(84, 25); + this.label39.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label39.Name = "label39"; - this.label39.Size = new System.Drawing.Size(14, 13); + this.label39.Size = new System.Drawing.Size(16, 16); this.label39.TabIndex = 4; this.label39.Text = "Y"; // // label20 // this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(4, 20); + this.label20.Location = new System.Drawing.Point(5, 25); + this.label20.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(14, 13); + this.label20.Size = new System.Drawing.Size(15, 16); this.label20.TabIndex = 3; this.label20.Text = "X"; // // owXRangeUpDown // - this.owXRangeUpDown.Location = new System.Drawing.Point(18, 17); + this.owXRangeUpDown.Location = new System.Drawing.Point(24, 21); + this.owXRangeUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.owXRangeUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.owXRangeUpDown.Name = "owXRangeUpDown"; - this.owXRangeUpDown.Size = new System.Drawing.Size(38, 20); + this.owXRangeUpDown.Size = new System.Drawing.Size(51, 22); this.owXRangeUpDown.TabIndex = 1; this.owXRangeUpDown.ValueChanged += new System.EventHandler(this.owXRangeUpDown_ValueChanged); // // owYRangeUpDown // - this.owYRangeUpDown.Location = new System.Drawing.Point(77, 17); + this.owYRangeUpDown.Location = new System.Drawing.Point(103, 21); + this.owYRangeUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.owYRangeUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.owYRangeUpDown.Name = "owYRangeUpDown"; - this.owYRangeUpDown.Size = new System.Drawing.Size(38, 20); + this.owYRangeUpDown.Size = new System.Drawing.Size(51, 22); this.owYRangeUpDown.TabIndex = 2; this.owYRangeUpDown.ValueChanged += new System.EventHandler(this.owYRangeUpDown_ValueChanged); // // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(8, 46); + this.label4.Location = new System.Drawing.Point(11, 57); + this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(80, 13); + this.label4.Size = new System.Drawing.Size(99, 16); this.label4.TabIndex = 6; this.label4.Text = "First Orientation"; // @@ -5725,9 +6117,10 @@ "Down", "Left", "Right"}); - this.owOrientationComboBox.Location = new System.Drawing.Point(11, 61); + this.owOrientationComboBox.Location = new System.Drawing.Point(15, 75); + this.owOrientationComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.owOrientationComboBox.Name = "owOrientationComboBox"; - this.owOrientationComboBox.Size = new System.Drawing.Size(82, 21); + this.owOrientationComboBox.Size = new System.Drawing.Size(108, 24); this.owOrientationComboBox.TabIndex = 5; this.owOrientationComboBox.SelectedIndexChanged += new System.EventHandler(this.owOrientationComboBox_SelectedIndexChanged); // @@ -5735,9 +6128,10 @@ // this.owMovementComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.owMovementComboBox.FormattingEnabled = true; - this.owMovementComboBox.Location = new System.Drawing.Point(11, 16); + this.owMovementComboBox.Location = new System.Drawing.Point(15, 20); + this.owMovementComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.owMovementComboBox.Name = "owMovementComboBox"; - this.owMovementComboBox.Size = new System.Drawing.Size(211, 21); + this.owMovementComboBox.Size = new System.Drawing.Size(280, 24); this.owMovementComboBox.TabIndex = 0; this.owMovementComboBox.SelectedIndexChanged += new System.EventHandler(this.owMovementComboBox_SelectedIndexChanged); // @@ -5749,9 +6143,11 @@ this.positionGroupBox.Controls.Add(this.owXPositionLabel); this.positionGroupBox.Controls.Add(this.owYMapUpDown); this.positionGroupBox.Controls.Add(this.label10); - this.positionGroupBox.Location = new System.Drawing.Point(8, 231); + this.positionGroupBox.Location = new System.Drawing.Point(11, 284); + this.positionGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.positionGroupBox.Name = "positionGroupBox"; - this.positionGroupBox.Size = new System.Drawing.Size(180, 57); + this.positionGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.positionGroupBox.Size = new System.Drawing.Size(240, 70); this.positionGroupBox.TabIndex = 19; this.positionGroupBox.TabStop = false; this.positionGroupBox.Text = "Local Coordinates [Map]"; @@ -5759,15 +6155,17 @@ // label13 // this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(122, 27); + this.label13.Location = new System.Drawing.Point(163, 33); + this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(14, 13); + this.label13.Size = new System.Drawing.Size(15, 16); this.label13.TabIndex = 9; this.label13.Text = "Z"; // // owXMapUpDown // - this.owXMapUpDown.Location = new System.Drawing.Point(18, 24); + this.owXMapUpDown.Location = new System.Drawing.Point(24, 30); + this.owXMapUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.owXMapUpDown.Maximum = new decimal(new int[] { 32768, 0, @@ -5779,13 +6177,14 @@ 0, -2147483648}); this.owXMapUpDown.Name = "owXMapUpDown"; - this.owXMapUpDown.Size = new System.Drawing.Size(35, 20); + this.owXMapUpDown.Size = new System.Drawing.Size(47, 22); this.owXMapUpDown.TabIndex = 0; this.owXMapUpDown.ValueChanged += new System.EventHandler(this.owXMapUpDown_ValueChanged); // // owZPositionUpDown // - this.owZPositionUpDown.Location = new System.Drawing.Point(136, 24); + this.owZPositionUpDown.Location = new System.Drawing.Point(181, 30); + this.owZPositionUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.owZPositionUpDown.Maximum = new decimal(new int[] { 32768, 0, @@ -5797,22 +6196,24 @@ 0, -2147483648}); this.owZPositionUpDown.Name = "owZPositionUpDown"; - this.owZPositionUpDown.Size = new System.Drawing.Size(35, 20); + this.owZPositionUpDown.Size = new System.Drawing.Size(47, 22); this.owZPositionUpDown.TabIndex = 8; this.owZPositionUpDown.ValueChanged += new System.EventHandler(this.owZPositionUpDown_ValueChanged); // // owXPositionLabel // this.owXPositionLabel.AutoSize = true; - this.owXPositionLabel.Location = new System.Drawing.Point(3, 27); + this.owXPositionLabel.Location = new System.Drawing.Point(4, 33); + this.owXPositionLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.owXPositionLabel.Name = "owXPositionLabel"; - this.owXPositionLabel.Size = new System.Drawing.Size(14, 13); + this.owXPositionLabel.Size = new System.Drawing.Size(15, 16); this.owXPositionLabel.TabIndex = 1; this.owXPositionLabel.Text = "X"; // // owYMapUpDown // - this.owYMapUpDown.Location = new System.Drawing.Point(77, 24); + this.owYMapUpDown.Location = new System.Drawing.Point(103, 30); + this.owYMapUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.owYMapUpDown.Maximum = new decimal(new int[] { 32768, 0, @@ -5824,16 +6225,17 @@ 0, -2147483648}); this.owYMapUpDown.Name = "owYMapUpDown"; - this.owYMapUpDown.Size = new System.Drawing.Size(35, 20); + this.owYMapUpDown.Size = new System.Drawing.Size(47, 22); this.owYMapUpDown.TabIndex = 2; this.owYMapUpDown.ValueChanged += new System.EventHandler(this.owYMapUpDown_ValueChanged); // // label10 // this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(63, 27); + this.label10.Location = new System.Drawing.Point(84, 33); + this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(14, 13); + this.label10.Size = new System.Drawing.Size(16, 16); this.label10.TabIndex = 3; this.label10.Text = "Y"; // @@ -5848,9 +6250,11 @@ this.owSpecialGroupBox.Controls.Add(this.owSightRangeUpDown); this.owSpecialGroupBox.Controls.Add(this.owTrainerLabel); this.owSpecialGroupBox.Enabled = false; - this.owSpecialGroupBox.Location = new System.Drawing.Point(197, 150); + this.owSpecialGroupBox.Location = new System.Drawing.Point(263, 185); + this.owSpecialGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.owSpecialGroupBox.Name = "owSpecialGroupBox"; - this.owSpecialGroupBox.Size = new System.Drawing.Size(232, 102); + this.owSpecialGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.owSpecialGroupBox.Size = new System.Drawing.Size(309, 126); this.owSpecialGroupBox.TabIndex = 14; this.owSpecialGroupBox.TabStop = false; this.owSpecialGroupBox.Text = "Special Settings"; @@ -5858,9 +6262,10 @@ // itemsSelectorHelpBtn // this.itemsSelectorHelpBtn.Image = global::DSPRE.Properties.Resources.questionMark; - this.itemsSelectorHelpBtn.Location = new System.Drawing.Point(194, 67); + this.itemsSelectorHelpBtn.Location = new System.Drawing.Point(259, 82); + this.itemsSelectorHelpBtn.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.itemsSelectorHelpBtn.Name = "itemsSelectorHelpBtn"; - this.itemsSelectorHelpBtn.Size = new System.Drawing.Size(28, 29); + this.itemsSelectorHelpBtn.Size = new System.Drawing.Size(37, 36); this.itemsSelectorHelpBtn.TabIndex = 45; this.itemsSelectorHelpBtn.UseVisualStyleBackColor = true; this.itemsSelectorHelpBtn.Click += new System.EventHandler(this.itemsSelectorHelpBtn_Click); @@ -5868,9 +6273,10 @@ // owPartnerTrainerCheckBox // this.owPartnerTrainerCheckBox.AutoSize = true; - this.owPartnerTrainerCheckBox.Location = new System.Drawing.Point(168, 49); + this.owPartnerTrainerCheckBox.Location = new System.Drawing.Point(224, 60); + this.owPartnerTrainerCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.owPartnerTrainerCheckBox.Name = "owPartnerTrainerCheckBox"; - this.owPartnerTrainerCheckBox.Size = new System.Drawing.Size(60, 17); + this.owPartnerTrainerCheckBox.Size = new System.Drawing.Size(72, 20); this.owPartnerTrainerCheckBox.TabIndex = 7; this.owPartnerTrainerCheckBox.Text = "Partner"; this.owPartnerTrainerCheckBox.UseVisualStyleBackColor = true; @@ -5880,9 +6286,10 @@ // this.owItemComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.owItemComboBox.FormattingEnabled = true; - this.owItemComboBox.Location = new System.Drawing.Point(49, 72); + this.owItemComboBox.Location = new System.Drawing.Point(65, 89); + this.owItemComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.owItemComboBox.Name = "owItemComboBox"; - this.owItemComboBox.Size = new System.Drawing.Size(142, 21); + this.owItemComboBox.Size = new System.Drawing.Size(188, 24); this.owItemComboBox.TabIndex = 6; this.owItemComboBox.SelectedIndexChanged += new System.EventHandler(this.owItemComboBox_SelectedIndexChanged); // @@ -5890,9 +6297,10 @@ // this.owItemLabel.AutoSize = true; this.owItemLabel.Enabled = false; - this.owItemLabel.Location = new System.Drawing.Point(7, 78); + this.owItemLabel.Location = new System.Drawing.Point(9, 96); + this.owItemLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.owItemLabel.Name = "owItemLabel"; - this.owItemLabel.Size = new System.Drawing.Size(27, 13); + this.owItemLabel.Size = new System.Drawing.Size(32, 16); this.owItemLabel.TabIndex = 5; this.owItemLabel.Text = "Item"; // @@ -5901,9 +6309,10 @@ this.owTrainerComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.owTrainerComboBox.Enabled = false; this.owTrainerComboBox.FormattingEnabled = true; - this.owTrainerComboBox.Location = new System.Drawing.Point(49, 19); + this.owTrainerComboBox.Location = new System.Drawing.Point(65, 23); + this.owTrainerComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.owTrainerComboBox.Name = "owTrainerComboBox"; - this.owTrainerComboBox.Size = new System.Drawing.Size(173, 21); + this.owTrainerComboBox.Size = new System.Drawing.Size(229, 24); this.owTrainerComboBox.TabIndex = 4; this.owTrainerComboBox.SelectedIndexChanged += new System.EventHandler(this.owTrainerComboBox_SelectedIndexChanged); // @@ -5911,23 +6320,25 @@ // this.owSightRangeLabel.AutoSize = true; this.owSightRangeLabel.Enabled = false; - this.owSightRangeLabel.Location = new System.Drawing.Point(6, 50); + this.owSightRangeLabel.Location = new System.Drawing.Point(8, 62); + this.owSightRangeLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.owSightRangeLabel.Name = "owSightRangeLabel"; - this.owSightRangeLabel.Size = new System.Drawing.Size(97, 13); + this.owSightRangeLabel.Size = new System.Drawing.Size(122, 16); this.owSightRangeLabel.TabIndex = 3; this.owSightRangeLabel.Text = "Sight Range (Tiles)"; // // owSightRangeUpDown // this.owSightRangeUpDown.Enabled = false; - this.owSightRangeUpDown.Location = new System.Drawing.Point(108, 46); + this.owSightRangeUpDown.Location = new System.Drawing.Point(144, 57); + this.owSightRangeUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.owSightRangeUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.owSightRangeUpDown.Name = "owSightRangeUpDown"; - this.owSightRangeUpDown.Size = new System.Drawing.Size(48, 20); + this.owSightRangeUpDown.Size = new System.Drawing.Size(64, 22); this.owSightRangeUpDown.TabIndex = 2; this.owSightRangeUpDown.ValueChanged += new System.EventHandler(this.owSightRangeUpDown_ValueChanged); // @@ -5935,62 +6346,68 @@ // this.owTrainerLabel.AutoSize = true; this.owTrainerLabel.Enabled = false; - this.owTrainerLabel.Location = new System.Drawing.Point(5, 22); + this.owTrainerLabel.Location = new System.Drawing.Point(7, 27); + this.owTrainerLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.owTrainerLabel.Name = "owTrainerLabel"; - this.owTrainerLabel.Size = new System.Drawing.Size(40, 13); + this.owTrainerLabel.Size = new System.Drawing.Size(50, 16); this.owTrainerLabel.TabIndex = 1; this.owTrainerLabel.Text = "Trainer"; // // owScriptLabel // this.owScriptLabel.AutoSize = true; - this.owScriptLabel.Location = new System.Drawing.Point(365, 6); + this.owScriptLabel.Location = new System.Drawing.Point(487, 7); + this.owScriptLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.owScriptLabel.Name = "owScriptLabel"; - this.owScriptLabel.Size = new System.Drawing.Size(34, 13); + this.owScriptLabel.Size = new System.Drawing.Size(41, 16); this.owScriptLabel.TabIndex = 13; this.owScriptLabel.Text = "Script"; // // owScriptNumericUpDown // - this.owScriptNumericUpDown.Location = new System.Drawing.Point(368, 22); + this.owScriptNumericUpDown.Location = new System.Drawing.Point(491, 27); + this.owScriptNumericUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.owScriptNumericUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.owScriptNumericUpDown.Name = "owScriptNumericUpDown"; - this.owScriptNumericUpDown.Size = new System.Drawing.Size(54, 20); + this.owScriptNumericUpDown.Size = new System.Drawing.Size(72, 22); this.owScriptNumericUpDown.TabIndex = 12; this.owScriptNumericUpDown.ValueChanged += new System.EventHandler(this.owScriptNumericUpDown_ValueChanged); // // owFlagLabel // this.owFlagLabel.AutoSize = true; - this.owFlagLabel.Location = new System.Drawing.Point(283, 6); + this.owFlagLabel.Location = new System.Drawing.Point(377, 7); + this.owFlagLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.owFlagLabel.Name = "owFlagLabel"; - this.owFlagLabel.Size = new System.Drawing.Size(27, 13); + this.owFlagLabel.Size = new System.Drawing.Size(34, 16); this.owFlagLabel.TabIndex = 11; this.owFlagLabel.Text = "Flag"; // // owFlagNumericUpDown // - this.owFlagNumericUpDown.Location = new System.Drawing.Point(286, 22); + this.owFlagNumericUpDown.Location = new System.Drawing.Point(381, 27); + this.owFlagNumericUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.owFlagNumericUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.owFlagNumericUpDown.Name = "owFlagNumericUpDown"; - this.owFlagNumericUpDown.Size = new System.Drawing.Size(60, 20); + this.owFlagNumericUpDown.Size = new System.Drawing.Size(80, 22); this.owFlagNumericUpDown.TabIndex = 10; this.owFlagNumericUpDown.ValueChanged += new System.EventHandler(this.owFlagNumericUpDown_ValueChanged); // // owSpriteLabel // this.owSpriteLabel.AutoSize = true; - this.owSpriteLabel.Location = new System.Drawing.Point(197, 51); + this.owSpriteLabel.Location = new System.Drawing.Point(263, 63); + this.owSpriteLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.owSpriteLabel.Name = "owSpriteLabel"; - this.owSpriteLabel.Size = new System.Drawing.Size(45, 13); + this.owSpriteLabel.Size = new System.Drawing.Size(53, 16); this.owSpriteLabel.TabIndex = 9; this.owSpriteLabel.Text = "Entry ID"; // @@ -5998,31 +6415,34 @@ // this.owSpriteComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.owSpriteComboBox.FormattingEnabled = true; - this.owSpriteComboBox.Location = new System.Drawing.Point(200, 67); + this.owSpriteComboBox.Location = new System.Drawing.Point(267, 82); + this.owSpriteComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.owSpriteComboBox.Name = "owSpriteComboBox"; - this.owSpriteComboBox.Size = new System.Drawing.Size(159, 21); + this.owSpriteComboBox.Size = new System.Drawing.Size(211, 24); this.owSpriteComboBox.TabIndex = 8; this.owSpriteComboBox.SelectedIndexChanged += new System.EventHandler(this.owSpriteComboBox_SelectedIndexChanged); // // owIDLabel // this.owIDLabel.AutoSize = true; - this.owIDLabel.Location = new System.Drawing.Point(198, 6); + this.owIDLabel.Location = new System.Drawing.Point(264, 7); + this.owIDLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.owIDLabel.Name = "owIDLabel"; - this.owIDLabel.Size = new System.Drawing.Size(58, 13); + this.owIDLabel.Size = new System.Drawing.Size(71, 16); this.owIDLabel.TabIndex = 7; this.owIDLabel.Text = "ID Number"; // // owIDNumericUpDown // - this.owIDNumericUpDown.Location = new System.Drawing.Point(201, 22); + this.owIDNumericUpDown.Location = new System.Drawing.Point(268, 27); + this.owIDNumericUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.owIDNumericUpDown.Maximum = new decimal(new int[] { 255, 0, 0, 0}); this.owIDNumericUpDown.Name = "owIDNumericUpDown"; - this.owIDNumericUpDown.Size = new System.Drawing.Size(63, 20); + this.owIDNumericUpDown.Size = new System.Drawing.Size(84, 22); this.owIDNumericUpDown.TabIndex = 6; this.owIDNumericUpDown.ValueChanged += new System.EventHandler(this.owIDNumericUpDown_ValueChanged); // @@ -6030,9 +6450,10 @@ // this.duplicateOverworldsButton.Image = global::DSPRE.Properties.Resources.copyIcon_small; this.duplicateOverworldsButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.duplicateOverworldsButton.Location = new System.Drawing.Point(116, 202); + this.duplicateOverworldsButton.Location = new System.Drawing.Point(155, 249); + this.duplicateOverworldsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.duplicateOverworldsButton.Name = "duplicateOverworldsButton"; - this.duplicateOverworldsButton.Size = new System.Drawing.Size(72, 25); + this.duplicateOverworldsButton.Size = new System.Drawing.Size(96, 31); this.duplicateOverworldsButton.TabIndex = 26; this.duplicateOverworldsButton.Text = "Duplicate"; this.duplicateOverworldsButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -6043,9 +6464,10 @@ // this.owSpritePictureBox.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; this.owSpritePictureBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.owSpritePictureBox.Location = new System.Drawing.Point(367, 53); + this.owSpritePictureBox.Location = new System.Drawing.Point(489, 65); + this.owSpritePictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.owSpritePictureBox.Name = "owSpritePictureBox"; - this.owSpritePictureBox.Size = new System.Drawing.Size(66, 66); + this.owSpritePictureBox.Size = new System.Drawing.Size(87, 81); this.owSpritePictureBox.TabIndex = 20; this.owSpritePictureBox.TabStop = false; // @@ -6053,9 +6475,10 @@ // this.removeOverworldButton.Image = global::DSPRE.Properties.Resources.deleteIcon; this.removeOverworldButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeOverworldButton.Location = new System.Drawing.Point(56, 202); + this.removeOverworldButton.Location = new System.Drawing.Point(75, 249); + this.removeOverworldButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.removeOverworldButton.Name = "removeOverworldButton"; - this.removeOverworldButton.Size = new System.Drawing.Size(60, 25); + this.removeOverworldButton.Size = new System.Drawing.Size(80, 31); this.removeOverworldButton.TabIndex = 5; this.removeOverworldButton.Text = "Delete"; this.removeOverworldButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -6066,9 +6489,10 @@ // this.addOverworldButton.Image = global::DSPRE.Properties.Resources.addIcon; this.addOverworldButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addOverworldButton.Location = new System.Drawing.Point(8, 202); + this.addOverworldButton.Location = new System.Drawing.Point(11, 249); + this.addOverworldButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.addOverworldButton.Name = "addOverworldButton"; - this.addOverworldButton.Size = new System.Drawing.Size(48, 25); + this.addOverworldButton.Size = new System.Drawing.Size(64, 31); this.addOverworldButton.TabIndex = 4; this.addOverworldButton.Text = "Add"; this.addOverworldButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -6078,9 +6502,11 @@ // overworldsListBox // this.overworldsListBox.FormattingEnabled = true; - this.overworldsListBox.Location = new System.Drawing.Point(8, 41); + this.overworldsListBox.ItemHeight = 16; + this.overworldsListBox.Location = new System.Drawing.Point(11, 50); + this.overworldsListBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.overworldsListBox.Name = "overworldsListBox"; - this.overworldsListBox.Size = new System.Drawing.Size(180, 160); + this.overworldsListBox.Size = new System.Drawing.Size(239, 196); this.overworldsListBox.TabIndex = 3; this.overworldsListBox.SelectedIndexChanged += new System.EventHandler(this.overworldsListBox_SelectedIndexChanged); // @@ -6092,10 +6518,11 @@ this.warpsTabPage.Controls.Add(this.removeWarpButton); this.warpsTabPage.Controls.Add(this.addWarpButton); this.warpsTabPage.Controls.Add(this.warpsListBox); - this.warpsTabPage.Location = new System.Drawing.Point(4, 22); + this.warpsTabPage.Location = new System.Drawing.Point(4, 25); + this.warpsTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.warpsTabPage.Name = "warpsTabPage"; - this.warpsTabPage.Padding = new System.Windows.Forms.Padding(3); - this.warpsTabPage.Size = new System.Drawing.Size(444, 352); + this.warpsTabPage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.warpsTabPage.Size = new System.Drawing.Size(595, 436); this.warpsTabPage.TabIndex = 2; this.warpsTabPage.Text = "Warps"; this.warpsTabPage.UseVisualStyleBackColor = true; @@ -6104,9 +6531,10 @@ // this.duplicateWarpsButton.Image = global::DSPRE.Properties.Resources.copyIcon_small; this.duplicateWarpsButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.duplicateWarpsButton.Location = new System.Drawing.Point(112, 308); + this.duplicateWarpsButton.Location = new System.Drawing.Point(149, 379); + this.duplicateWarpsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.duplicateWarpsButton.Name = "duplicateWarpsButton"; - this.duplicateWarpsButton.Size = new System.Drawing.Size(74, 32); + this.duplicateWarpsButton.Size = new System.Drawing.Size(99, 39); this.duplicateWarpsButton.TabIndex = 23; this.duplicateWarpsButton.Text = "Duplicate"; this.duplicateWarpsButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -6120,27 +6548,32 @@ this.groupBox11.Controls.Add(this.destinationWarpGoToButton); this.groupBox11.Controls.Add(this.warpAnchorUpDown); this.groupBox11.Controls.Add(this.warpAnchorLabel); - this.groupBox11.Location = new System.Drawing.Point(193, 193); + this.groupBox11.Location = new System.Drawing.Point(257, 238); + this.groupBox11.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox11.Name = "groupBox11"; - this.groupBox11.Size = new System.Drawing.Size(242, 150); + this.groupBox11.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox11.Size = new System.Drawing.Size(323, 185); this.groupBox11.TabIndex = 22; this.groupBox11.TabStop = false; this.groupBox11.Text = "Destination"; // // eventEditorHeaderLocationNameLabel // - this.eventEditorHeaderLocationNameLabel.Location = new System.Drawing.Point(135, 20); + this.eventEditorHeaderLocationNameLabel.Location = new System.Drawing.Point(180, 25); + this.eventEditorHeaderLocationNameLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.eventEditorHeaderLocationNameLabel.Name = "eventEditorHeaderLocationNameLabel"; - this.eventEditorHeaderLocationNameLabel.Size = new System.Drawing.Size(97, 35); + this.eventEditorHeaderLocationNameLabel.Size = new System.Drawing.Size(129, 43); this.eventEditorHeaderLocationNameLabel.TabIndex = 31; this.eventEditorHeaderLocationNameLabel.Text = "LOCATION NAME"; // // eventEditorWarpHeaderListBox // this.eventEditorWarpHeaderListBox.FormattingEnabled = true; - this.eventEditorWarpHeaderListBox.Location = new System.Drawing.Point(7, 20); + this.eventEditorWarpHeaderListBox.ItemHeight = 16; + this.eventEditorWarpHeaderListBox.Location = new System.Drawing.Point(9, 25); + this.eventEditorWarpHeaderListBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.eventEditorWarpHeaderListBox.Name = "eventEditorWarpHeaderListBox"; - this.eventEditorWarpHeaderListBox.Size = new System.Drawing.Size(125, 121); + this.eventEditorWarpHeaderListBox.Size = new System.Drawing.Size(165, 148); this.eventEditorWarpHeaderListBox.TabIndex = 30; this.eventEditorWarpHeaderListBox.SelectedIndexChanged += new System.EventHandler(this.eventEditorWarpHeaderListBox_SelectedIndexChanged); // @@ -6148,9 +6581,10 @@ // this.destinationWarpGoToButton.Image = global::DSPRE.Properties.Resources.warpGo; this.destinationWarpGoToButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.destinationWarpGoToButton.Location = new System.Drawing.Point(138, 98); + this.destinationWarpGoToButton.Location = new System.Drawing.Point(184, 121); + this.destinationWarpGoToButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.destinationWarpGoToButton.Name = "destinationWarpGoToButton"; - this.destinationWarpGoToButton.Size = new System.Drawing.Size(94, 41); + this.destinationWarpGoToButton.Size = new System.Drawing.Size(125, 50); this.destinationWarpGoToButton.TabIndex = 26; this.destinationWarpGoToButton.Text = "Test\r\nWarp"; this.destinationWarpGoToButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -6159,23 +6593,25 @@ // // warpAnchorUpDown // - this.warpAnchorUpDown.Location = new System.Drawing.Point(138, 73); + this.warpAnchorUpDown.Location = new System.Drawing.Point(184, 90); + this.warpAnchorUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.warpAnchorUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.warpAnchorUpDown.Name = "warpAnchorUpDown"; - this.warpAnchorUpDown.Size = new System.Drawing.Size(94, 20); + this.warpAnchorUpDown.Size = new System.Drawing.Size(125, 22); this.warpAnchorUpDown.TabIndex = 29; this.warpAnchorUpDown.ValueChanged += new System.EventHandler(this.warpAnchorUpDown_ValueChanged); // // warpAnchorLabel // this.warpAnchorLabel.AutoSize = true; - this.warpAnchorLabel.Location = new System.Drawing.Point(159, 57); + this.warpAnchorLabel.Location = new System.Drawing.Point(212, 70); + this.warpAnchorLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.warpAnchorLabel.Name = "warpAnchorLabel"; - this.warpAnchorLabel.Size = new System.Drawing.Size(47, 13); + this.warpAnchorLabel.Size = new System.Drawing.Size(56, 16); this.warpAnchorLabel.TabIndex = 27; this.warpAnchorLabel.Text = "Hook ID"; // @@ -6183,9 +6619,11 @@ // this.groupBox1.Controls.Add(this.groupBox14); this.groupBox1.Controls.Add(this.groupBox12); - this.groupBox1.Location = new System.Drawing.Point(193, 6); + this.groupBox1.Location = new System.Drawing.Point(257, 7); + this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(242, 182); + this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox1.Size = new System.Drawing.Size(323, 224); this.groupBox1.TabIndex = 21; this.groupBox1.TabStop = false; this.groupBox1.Text = "Start coordinates"; @@ -6197,9 +6635,11 @@ this.groupBox14.Controls.Add(this.warpXMatrixUpDown); this.groupBox14.Controls.Add(this.label15); this.groupBox14.Controls.Add(this.warpYMatrixUpDown); - this.groupBox14.Location = new System.Drawing.Point(9, 74); + this.groupBox14.Location = new System.Drawing.Point(12, 91); + this.groupBox14.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox14.Name = "groupBox14"; - this.groupBox14.Size = new System.Drawing.Size(223, 97); + this.groupBox14.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox14.Size = new System.Drawing.Size(297, 119); this.groupBox14.TabIndex = 23; this.groupBox14.TabStop = false; this.groupBox14.Text = "Matrix coordinates"; @@ -6208,9 +6648,10 @@ // this.goToWarpButton.Image = global::DSPRE.Properties.Resources.goToWarp; this.goToWarpButton.ImageAlign = System.Drawing.ContentAlignment.BottomRight; - this.goToWarpButton.Location = new System.Drawing.Point(63, 51); + this.goToWarpButton.Location = new System.Drawing.Point(84, 63); + this.goToWarpButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.goToWarpButton.Name = "goToWarpButton"; - this.goToWarpButton.Size = new System.Drawing.Size(102, 39); + this.goToWarpButton.Size = new System.Drawing.Size(136, 48); this.goToWarpButton.TabIndex = 25; this.goToWarpButton.Text = "Go to start \r\ncoordinates"; this.goToWarpButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -6220,44 +6661,48 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(117, 27); + this.label9.Location = new System.Drawing.Point(156, 33); + this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(38, 13); + this.label9.Size = new System.Drawing.Size(44, 16); this.label9.TabIndex = 24; this.label9.Text = "Mat. Y"; // // warpXMatrixUpDown // - this.warpXMatrixUpDown.Location = new System.Drawing.Point(49, 23); + this.warpXMatrixUpDown.Location = new System.Drawing.Point(65, 28); + this.warpXMatrixUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.warpXMatrixUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.warpXMatrixUpDown.Name = "warpXMatrixUpDown"; - this.warpXMatrixUpDown.Size = new System.Drawing.Size(47, 20); + this.warpXMatrixUpDown.Size = new System.Drawing.Size(63, 22); this.warpXMatrixUpDown.TabIndex = 21; this.warpXMatrixUpDown.ValueChanged += new System.EventHandler(this.warpMatrixXUpDown_ValueChanged); // // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(10, 27); + this.label15.Location = new System.Drawing.Point(13, 33); + this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(38, 13); + this.label15.Size = new System.Drawing.Size(43, 16); this.label15.TabIndex = 22; this.label15.Text = "Mat. X"; // // warpYMatrixUpDown // - this.warpYMatrixUpDown.Location = new System.Drawing.Point(157, 23); + this.warpYMatrixUpDown.Location = new System.Drawing.Point(209, 28); + this.warpYMatrixUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.warpYMatrixUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.warpYMatrixUpDown.Name = "warpYMatrixUpDown"; - this.warpYMatrixUpDown.Size = new System.Drawing.Size(47, 20); + this.warpYMatrixUpDown.Size = new System.Drawing.Size(63, 22); this.warpYMatrixUpDown.TabIndex = 23; this.warpYMatrixUpDown.ValueChanged += new System.EventHandler(this.warpMatrixYUpDown_ValueChanged); // @@ -6269,16 +6714,19 @@ this.groupBox12.Controls.Add(this.warpYMapUpDown); this.groupBox12.Controls.Add(this.warpZUpDown); this.groupBox12.Controls.Add(this.label16); - this.groupBox12.Location = new System.Drawing.Point(9, 19); + this.groupBox12.Location = new System.Drawing.Point(12, 23); + this.groupBox12.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox12.Name = "groupBox12"; - this.groupBox12.Size = new System.Drawing.Size(223, 49); + this.groupBox12.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox12.Size = new System.Drawing.Size(297, 60); this.groupBox12.TabIndex = 22; this.groupBox12.TabStop = false; this.groupBox12.Text = "Map coordinates"; // // warpXMapUpDown // - this.warpXMapUpDown.Location = new System.Drawing.Point(25, 19); + this.warpXMapUpDown.Location = new System.Drawing.Point(33, 23); + this.warpXMapUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.warpXMapUpDown.Maximum = new decimal(new int[] { 32768, 0, @@ -6290,31 +6738,34 @@ 0, -2147483648}); this.warpXMapUpDown.Name = "warpXMapUpDown"; - this.warpXMapUpDown.Size = new System.Drawing.Size(34, 20); + this.warpXMapUpDown.Size = new System.Drawing.Size(45, 22); this.warpXMapUpDown.TabIndex = 10; this.warpXMapUpDown.ValueChanged += new System.EventHandler(this.warpXMapUpDown_ValueChanged); // // label24 // this.label24.AutoSize = true; - this.label24.Location = new System.Drawing.Point(86, 22); + this.label24.Location = new System.Drawing.Point(115, 27); + this.label24.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(14, 13); + this.label24.Size = new System.Drawing.Size(16, 16); this.label24.TabIndex = 21; this.label24.Text = "Y"; // // label25 // this.label25.AutoSize = true; - this.label25.Location = new System.Drawing.Point(10, 22); + this.label25.Location = new System.Drawing.Point(13, 27); + this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(14, 13); + this.label25.Size = new System.Drawing.Size(15, 16); this.label25.TabIndex = 13; this.label25.Text = "X"; // // warpYMapUpDown // - this.warpYMapUpDown.Location = new System.Drawing.Point(100, 19); + this.warpYMapUpDown.Location = new System.Drawing.Point(133, 23); + this.warpYMapUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.warpYMapUpDown.Maximum = new decimal(new int[] { 32768, 0, @@ -6326,13 +6777,14 @@ 0, -2147483648}); this.warpYMapUpDown.Name = "warpYMapUpDown"; - this.warpYMapUpDown.Size = new System.Drawing.Size(34, 20); + this.warpYMapUpDown.Size = new System.Drawing.Size(45, 22); this.warpYMapUpDown.TabIndex = 12; this.warpYMapUpDown.ValueChanged += new System.EventHandler(this.warpYMapUpDown_ValueChanged); // // warpZUpDown // - this.warpZUpDown.Location = new System.Drawing.Point(175, 19); + this.warpZUpDown.Location = new System.Drawing.Point(233, 23); + this.warpZUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.warpZUpDown.Maximum = new decimal(new int[] { 32768, 0, @@ -6344,16 +6796,17 @@ 0, -2147483648}); this.warpZUpDown.Name = "warpZUpDown"; - this.warpZUpDown.Size = new System.Drawing.Size(34, 20); + this.warpZUpDown.Size = new System.Drawing.Size(45, 22); this.warpZUpDown.TabIndex = 14; this.warpZUpDown.ValueChanged += new System.EventHandler(this.warpZUpDown_ValueChanged); // // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(160, 22); + this.label16.Location = new System.Drawing.Point(213, 27); + this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(14, 13); + this.label16.Size = new System.Drawing.Size(15, 16); this.label16.TabIndex = 15; this.label16.Text = "Z"; // @@ -6361,9 +6814,10 @@ // this.removeWarpButton.Image = global::DSPRE.Properties.Resources.deleteIcon; this.removeWarpButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeWarpButton.Location = new System.Drawing.Point(60, 308); + this.removeWarpButton.Location = new System.Drawing.Point(80, 379); + this.removeWarpButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.removeWarpButton.Name = "removeWarpButton"; - this.removeWarpButton.Size = new System.Drawing.Size(52, 32); + this.removeWarpButton.Size = new System.Drawing.Size(69, 39); this.removeWarpButton.TabIndex = 10; this.removeWarpButton.Text = "Rem"; this.removeWarpButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -6374,9 +6828,10 @@ // this.addWarpButton.Image = global::DSPRE.Properties.Resources.addIcon; this.addWarpButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addWarpButton.Location = new System.Drawing.Point(8, 308); + this.addWarpButton.Location = new System.Drawing.Point(11, 379); + this.addWarpButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.addWarpButton.Name = "addWarpButton"; - this.addWarpButton.Size = new System.Drawing.Size(52, 32); + this.addWarpButton.Size = new System.Drawing.Size(69, 39); this.addWarpButton.TabIndex = 9; this.addWarpButton.Text = "Add"; this.addWarpButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -6386,9 +6841,11 @@ // warpsListBox // this.warpsListBox.FormattingEnabled = true; - this.warpsListBox.Location = new System.Drawing.Point(9, 12); + this.warpsListBox.ItemHeight = 16; + this.warpsListBox.Location = new System.Drawing.Point(12, 15); + this.warpsListBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.warpsListBox.Name = "warpsListBox"; - this.warpsListBox.Size = new System.Drawing.Size(177, 290); + this.warpsListBox.Size = new System.Drawing.Size(235, 356); this.warpsListBox.TabIndex = 4; this.warpsListBox.SelectedIndexChanged += new System.EventHandler(this.warpsListBox_SelectedIndexChanged); // @@ -6402,10 +6859,11 @@ this.triggersTabPage.Controls.Add(this.removeTriggerButton); this.triggersTabPage.Controls.Add(this.addTriggerButton); this.triggersTabPage.Controls.Add(this.triggersListBox); - this.triggersTabPage.Location = new System.Drawing.Point(4, 22); + this.triggersTabPage.Location = new System.Drawing.Point(4, 25); + this.triggersTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.triggersTabPage.Name = "triggersTabPage"; - this.triggersTabPage.Padding = new System.Windows.Forms.Padding(3); - this.triggersTabPage.Size = new System.Drawing.Size(444, 352); + this.triggersTabPage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.triggersTabPage.Size = new System.Drawing.Size(595, 436); this.triggersTabPage.TabIndex = 3; this.triggersTabPage.Text = "Triggers"; this.triggersTabPage.UseVisualStyleBackColor = true; @@ -6418,76 +6876,84 @@ this.triggerLogicGroupBox.Controls.Add(this.label28); this.triggerLogicGroupBox.Controls.Add(this.triggerScriptUpDown); this.triggerLogicGroupBox.Controls.Add(this.label27); - this.triggerLogicGroupBox.Location = new System.Drawing.Point(225, 9); + this.triggerLogicGroupBox.Location = new System.Drawing.Point(300, 11); + this.triggerLogicGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.triggerLogicGroupBox.Name = "triggerLogicGroupBox"; - this.triggerLogicGroupBox.Size = new System.Drawing.Size(200, 108); + this.triggerLogicGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.triggerLogicGroupBox.Size = new System.Drawing.Size(267, 133); this.triggerLogicGroupBox.TabIndex = 39; this.triggerLogicGroupBox.TabStop = false; this.triggerLogicGroupBox.Text = "Logic"; // // expectedVarValueTriggerUpDown // - this.expectedVarValueTriggerUpDown.Location = new System.Drawing.Point(112, 36); + this.expectedVarValueTriggerUpDown.Location = new System.Drawing.Point(149, 44); + this.expectedVarValueTriggerUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.expectedVarValueTriggerUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.expectedVarValueTriggerUpDown.Name = "expectedVarValueTriggerUpDown"; - this.expectedVarValueTriggerUpDown.Size = new System.Drawing.Size(71, 20); + this.expectedVarValueTriggerUpDown.Size = new System.Drawing.Size(95, 22); this.expectedVarValueTriggerUpDown.TabIndex = 37; this.expectedVarValueTriggerUpDown.ValueChanged += new System.EventHandler(this.expectedVarValueTriggerUpDown_ValueChanged); // // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(107, 20); + this.label19.Location = new System.Drawing.Point(143, 25); + this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(82, 13); + this.label19.Size = new System.Drawing.Size(102, 16); this.label19.TabIndex = 38; this.label19.Text = "Expected Value"; // // triggerVariableWatchedUpDown // - this.triggerVariableWatchedUpDown.Location = new System.Drawing.Point(17, 36); + this.triggerVariableWatchedUpDown.Location = new System.Drawing.Point(23, 44); + this.triggerVariableWatchedUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.triggerVariableWatchedUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.triggerVariableWatchedUpDown.Name = "triggerVariableWatchedUpDown"; - this.triggerVariableWatchedUpDown.Size = new System.Drawing.Size(71, 20); + this.triggerVariableWatchedUpDown.Size = new System.Drawing.Size(95, 22); this.triggerVariableWatchedUpDown.TabIndex = 26; this.triggerVariableWatchedUpDown.ValueChanged += new System.EventHandler(this.triggerVariableWatchedUpDown_ValueChanged); // // label28 // this.label28.AutoSize = true; - this.label28.Location = new System.Drawing.Point(9, 20); + this.label28.Location = new System.Drawing.Point(12, 25); + this.label28.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(89, 13); + this.label28.Size = new System.Drawing.Size(111, 16); this.label28.TabIndex = 27; this.label28.Text = "Variable watched"; // // triggerScriptUpDown // - this.triggerScriptUpDown.Location = new System.Drawing.Point(68, 77); + this.triggerScriptUpDown.Location = new System.Drawing.Point(91, 95); + this.triggerScriptUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.triggerScriptUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.triggerScriptUpDown.Name = "triggerScriptUpDown"; - this.triggerScriptUpDown.Size = new System.Drawing.Size(66, 20); + this.triggerScriptUpDown.Size = new System.Drawing.Size(88, 22); this.triggerScriptUpDown.TabIndex = 23; this.triggerScriptUpDown.ValueChanged += new System.EventHandler(this.triggerScriptUpDown_ValueChanged); // // label27 // this.label27.AutoSize = true; - this.label27.Location = new System.Drawing.Point(58, 62); + this.label27.Location = new System.Drawing.Point(77, 76); + this.label27.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(78, 13); + this.label27.Size = new System.Drawing.Size(96, 16); this.label27.TabIndex = 24; this.label27.Text = "Script to trigger"; // @@ -6497,9 +6963,11 @@ this.groupBox16.Controls.Add(this.triggerLengthUpDown); this.groupBox16.Controls.Add(this.triggerWidthLabel); this.groupBox16.Controls.Add(this.triggerWidthUpDown); - this.groupBox16.Location = new System.Drawing.Point(225, 119); + this.groupBox16.Location = new System.Drawing.Point(300, 146); + this.groupBox16.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox16.Name = "groupBox16"; - this.groupBox16.Size = new System.Drawing.Size(200, 67); + this.groupBox16.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox16.Size = new System.Drawing.Size(267, 82); this.groupBox16.TabIndex = 33; this.groupBox16.TabStop = false; this.groupBox16.Text = "Trigger Size"; @@ -6507,44 +6975,48 @@ // triggerLengthLabel // this.triggerLengthLabel.AutoSize = true; - this.triggerLengthLabel.Location = new System.Drawing.Point(116, 19); + this.triggerLengthLabel.Location = new System.Drawing.Point(155, 23); + this.triggerLengthLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.triggerLengthLabel.Name = "triggerLengthLabel"; - this.triggerLengthLabel.Size = new System.Drawing.Size(56, 13); + this.triggerLengthLabel.Size = new System.Drawing.Size(67, 16); this.triggerLengthLabel.TabIndex = 35; this.triggerLengthLabel.Text = "Length [Y]"; // // triggerLengthUpDown // - this.triggerLengthUpDown.Location = new System.Drawing.Point(119, 36); + this.triggerLengthUpDown.Location = new System.Drawing.Point(159, 44); + this.triggerLengthUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.triggerLengthUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.triggerLengthUpDown.Name = "triggerLengthUpDown"; - this.triggerLengthUpDown.Size = new System.Drawing.Size(64, 20); + this.triggerLengthUpDown.Size = new System.Drawing.Size(85, 22); this.triggerLengthUpDown.TabIndex = 34; this.triggerLengthUpDown.ValueChanged += new System.EventHandler(this.triggerLengthUpDown_ValueChanged); // // triggerWidthLabel // this.triggerWidthLabel.AutoSize = true; - this.triggerWidthLabel.Location = new System.Drawing.Point(15, 19); + this.triggerWidthLabel.Location = new System.Drawing.Point(20, 23); + this.triggerWidthLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.triggerWidthLabel.Name = "triggerWidthLabel"; - this.triggerWidthLabel.Size = new System.Drawing.Size(51, 13); + this.triggerWidthLabel.Size = new System.Drawing.Size(60, 16); this.triggerWidthLabel.TabIndex = 33; this.triggerWidthLabel.Text = "Width [X]"; // // triggerWidthUpDown // - this.triggerWidthUpDown.Location = new System.Drawing.Point(18, 36); + this.triggerWidthUpDown.Location = new System.Drawing.Point(24, 44); + this.triggerWidthUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.triggerWidthUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.triggerWidthUpDown.Name = "triggerWidthUpDown"; - this.triggerWidthUpDown.Size = new System.Drawing.Size(62, 20); + this.triggerWidthUpDown.Size = new System.Drawing.Size(83, 22); this.triggerWidthUpDown.TabIndex = 32; this.triggerWidthUpDown.ValueChanged += new System.EventHandler(this.triggerWidthUpDown_ValueChanged); // @@ -6556,9 +7028,11 @@ this.groupBox15.Controls.Add(this.triggerMapXLabel); this.groupBox15.Controls.Add(this.triggerYMapUpDown); this.groupBox15.Controls.Add(this.triggerYMapLabel); - this.groupBox15.Location = new System.Drawing.Point(225, 191); + this.groupBox15.Location = new System.Drawing.Point(300, 235); + this.groupBox15.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox15.Name = "groupBox15"; - this.groupBox15.Size = new System.Drawing.Size(200, 54); + this.groupBox15.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox15.Size = new System.Drawing.Size(267, 66); this.groupBox15.TabIndex = 32; this.groupBox15.TabStop = false; this.groupBox15.Text = "Map Coordinates"; @@ -6566,15 +7040,17 @@ // triggerZLabel // this.triggerZLabel.AutoSize = true; - this.triggerZLabel.Location = new System.Drawing.Point(141, 27); + this.triggerZLabel.Location = new System.Drawing.Point(188, 33); + this.triggerZLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.triggerZLabel.Name = "triggerZLabel"; - this.triggerZLabel.Size = new System.Drawing.Size(14, 13); + this.triggerZLabel.Size = new System.Drawing.Size(15, 16); this.triggerZLabel.TabIndex = 21; this.triggerZLabel.Text = "Z"; // // triggerXMapUpDown // - this.triggerXMapUpDown.Location = new System.Drawing.Point(28, 23); + this.triggerXMapUpDown.Location = new System.Drawing.Point(37, 28); + this.triggerXMapUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.triggerXMapUpDown.Maximum = new decimal(new int[] { 32768, 0, @@ -6586,13 +7062,14 @@ 0, -2147483648}); this.triggerXMapUpDown.Name = "triggerXMapUpDown"; - this.triggerXMapUpDown.Size = new System.Drawing.Size(34, 20); + this.triggerXMapUpDown.Size = new System.Drawing.Size(45, 22); this.triggerXMapUpDown.TabIndex = 16; this.triggerXMapUpDown.ValueChanged += new System.EventHandler(this.triggerXMapUpDown_ValueChanged); // // triggerZUpDown // - this.triggerZUpDown.Location = new System.Drawing.Point(156, 23); + this.triggerZUpDown.Location = new System.Drawing.Point(208, 28); + this.triggerZUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.triggerZUpDown.Maximum = new decimal(new int[] { 32768, 0, @@ -6604,38 +7081,41 @@ 0, -2147483648}); this.triggerZUpDown.Name = "triggerZUpDown"; - this.triggerZUpDown.Size = new System.Drawing.Size(34, 20); + this.triggerZUpDown.Size = new System.Drawing.Size(45, 22); this.triggerZUpDown.TabIndex = 20; this.triggerZUpDown.ValueChanged += new System.EventHandler(this.triggerZUpDown_ValueChanged); // // triggerMapXLabel // this.triggerMapXLabel.AutoSize = true; - this.triggerMapXLabel.Location = new System.Drawing.Point(11, 27); + this.triggerMapXLabel.Location = new System.Drawing.Point(15, 33); + this.triggerMapXLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.triggerMapXLabel.Name = "triggerMapXLabel"; - this.triggerMapXLabel.Size = new System.Drawing.Size(14, 13); + this.triggerMapXLabel.Size = new System.Drawing.Size(15, 16); this.triggerMapXLabel.TabIndex = 17; this.triggerMapXLabel.Text = "X"; // // triggerYMapUpDown // - this.triggerYMapUpDown.Location = new System.Drawing.Point(91, 23); + this.triggerYMapUpDown.Location = new System.Drawing.Point(121, 28); + this.triggerYMapUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.triggerYMapUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.triggerYMapUpDown.Name = "triggerYMapUpDown"; - this.triggerYMapUpDown.Size = new System.Drawing.Size(34, 20); + this.triggerYMapUpDown.Size = new System.Drawing.Size(45, 22); this.triggerYMapUpDown.TabIndex = 18; this.triggerYMapUpDown.ValueChanged += new System.EventHandler(this.triggerYMapUpDown_ValueChanged); // // triggerYMapLabel // this.triggerYMapLabel.AutoSize = true; - this.triggerYMapLabel.Location = new System.Drawing.Point(76, 27); + this.triggerYMapLabel.Location = new System.Drawing.Point(101, 33); + this.triggerYMapLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.triggerYMapLabel.Name = "triggerYMapLabel"; - this.triggerYMapLabel.Size = new System.Drawing.Size(14, 13); + this.triggerYMapLabel.Size = new System.Drawing.Size(16, 16); this.triggerYMapLabel.TabIndex = 19; this.triggerYMapLabel.Text = "Y"; // @@ -6646,9 +7126,11 @@ this.groupBox6.Controls.Add(this.triggerXMatrixUpDown); this.groupBox6.Controls.Add(this.triggerXMatrixLabel); this.groupBox6.Controls.Add(this.triggerYMatrixUpDown); - this.groupBox6.Location = new System.Drawing.Point(225, 248); + this.groupBox6.Location = new System.Drawing.Point(300, 305); + this.groupBox6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox6.Name = "groupBox6"; - this.groupBox6.Size = new System.Drawing.Size(200, 94); + this.groupBox6.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox6.Size = new System.Drawing.Size(267, 116); this.groupBox6.TabIndex = 25; this.groupBox6.TabStop = false; this.groupBox6.Text = "Matrix Coordinates"; @@ -6657,9 +7139,10 @@ // this.goToTriggerButton.Image = global::DSPRE.Properties.Resources.goToTrigger; this.goToTriggerButton.ImageAlign = System.Drawing.ContentAlignment.BottomRight; - this.goToTriggerButton.Location = new System.Drawing.Point(44, 47); + this.goToTriggerButton.Location = new System.Drawing.Point(59, 58); + this.goToTriggerButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.goToTriggerButton.Name = "goToTriggerButton"; - this.goToTriggerButton.Size = new System.Drawing.Size(120, 39); + this.goToTriggerButton.Size = new System.Drawing.Size(160, 48); this.goToTriggerButton.TabIndex = 20; this.goToTriggerButton.Text = "Find this trigger"; this.goToTriggerButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -6669,44 +7152,48 @@ // triggerYMatrixLabel // this.triggerYMatrixLabel.AutoSize = true; - this.triggerYMatrixLabel.Location = new System.Drawing.Point(105, 24); + this.triggerYMatrixLabel.Location = new System.Drawing.Point(140, 30); + this.triggerYMatrixLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.triggerYMatrixLabel.Name = "triggerYMatrixLabel"; - this.triggerYMatrixLabel.Size = new System.Drawing.Size(45, 13); + this.triggerYMatrixLabel.Size = new System.Drawing.Size(54, 16); this.triggerYMatrixLabel.TabIndex = 19; this.triggerYMatrixLabel.Text = "Matrix Y"; // // triggerXMatrixUpDown // - this.triggerXMatrixUpDown.Location = new System.Drawing.Point(52, 21); + this.triggerXMatrixUpDown.Location = new System.Drawing.Point(69, 26); + this.triggerXMatrixUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.triggerXMatrixUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.triggerXMatrixUpDown.Name = "triggerXMatrixUpDown"; - this.triggerXMatrixUpDown.Size = new System.Drawing.Size(37, 20); + this.triggerXMatrixUpDown.Size = new System.Drawing.Size(49, 22); this.triggerXMatrixUpDown.TabIndex = 16; this.triggerXMatrixUpDown.ValueChanged += new System.EventHandler(this.triggerXMatrixUpDown_ValueChanged); // // triggerXMatrixLabel // this.triggerXMatrixLabel.AutoSize = true; - this.triggerXMatrixLabel.Location = new System.Drawing.Point(6, 24); + this.triggerXMatrixLabel.Location = new System.Drawing.Point(8, 30); + this.triggerXMatrixLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.triggerXMatrixLabel.Name = "triggerXMatrixLabel"; - this.triggerXMatrixLabel.Size = new System.Drawing.Size(45, 13); + this.triggerXMatrixLabel.Size = new System.Drawing.Size(53, 16); this.triggerXMatrixLabel.TabIndex = 17; this.triggerXMatrixLabel.Text = "Matrix X"; // // triggerYMatrixUpDown // - this.triggerYMatrixUpDown.Location = new System.Drawing.Point(152, 21); + this.triggerYMatrixUpDown.Location = new System.Drawing.Point(203, 26); + this.triggerYMatrixUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.triggerYMatrixUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.triggerYMatrixUpDown.Name = "triggerYMatrixUpDown"; - this.triggerYMatrixUpDown.Size = new System.Drawing.Size(37, 20); + this.triggerYMatrixUpDown.Size = new System.Drawing.Size(49, 22); this.triggerYMatrixUpDown.TabIndex = 18; this.triggerYMatrixUpDown.ValueChanged += new System.EventHandler(this.triggerYMatrixUpDown_ValueChanged); // @@ -6714,9 +7201,10 @@ // this.duplicateTriggersButton.Image = global::DSPRE.Properties.Resources.copyIcon_small; this.duplicateTriggersButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.duplicateTriggersButton.Location = new System.Drawing.Point(130, 308); + this.duplicateTriggersButton.Location = new System.Drawing.Point(173, 379); + this.duplicateTriggersButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.duplicateTriggersButton.Name = "duplicateTriggersButton"; - this.duplicateTriggersButton.Size = new System.Drawing.Size(74, 32); + this.duplicateTriggersButton.Size = new System.Drawing.Size(99, 39); this.duplicateTriggersButton.TabIndex = 36; this.duplicateTriggersButton.Text = "Duplicate"; this.duplicateTriggersButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -6727,9 +7215,10 @@ // this.removeTriggerButton.Image = global::DSPRE.Properties.Resources.deleteIcon; this.removeTriggerButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeTriggerButton.Location = new System.Drawing.Point(66, 308); + this.removeTriggerButton.Location = new System.Drawing.Point(88, 379); + this.removeTriggerButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.removeTriggerButton.Name = "removeTriggerButton"; - this.removeTriggerButton.Size = new System.Drawing.Size(63, 32); + this.removeTriggerButton.Size = new System.Drawing.Size(84, 39); this.removeTriggerButton.TabIndex = 10; this.removeTriggerButton.Text = "Delete"; this.removeTriggerButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -6740,9 +7229,10 @@ // this.addTriggerButton.Image = global::DSPRE.Properties.Resources.addIcon; this.addTriggerButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addTriggerButton.Location = new System.Drawing.Point(14, 308); + this.addTriggerButton.Location = new System.Drawing.Point(19, 379); + this.addTriggerButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.addTriggerButton.Name = "addTriggerButton"; - this.addTriggerButton.Size = new System.Drawing.Size(51, 32); + this.addTriggerButton.Size = new System.Drawing.Size(68, 39); this.addTriggerButton.TabIndex = 9; this.addTriggerButton.Text = "Add"; this.addTriggerButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -6752,9 +7242,11 @@ // triggersListBox // this.triggersListBox.FormattingEnabled = true; - this.triggersListBox.Location = new System.Drawing.Point(14, 12); + this.triggersListBox.ItemHeight = 16; + this.triggersListBox.Location = new System.Drawing.Point(19, 15); + this.triggersListBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.triggersListBox.Name = "triggersListBox"; - this.triggersListBox.Size = new System.Drawing.Size(190, 290); + this.triggersListBox.Size = new System.Drawing.Size(252, 356); this.triggersListBox.TabIndex = 4; this.triggersListBox.SelectedIndexChanged += new System.EventHandler(this.triggersListBox_SelectedIndexChanged); // @@ -6763,17 +7255,19 @@ this.eventPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.eventPanel.Controls.Add(this.eventPictureBox); this.eventPanel.Controls.Add(this.eventOpenGlControl); - this.eventPanel.Location = new System.Drawing.Point(601, 39); + this.eventPanel.Location = new System.Drawing.Point(801, 48); + this.eventPanel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.eventPanel.Name = "eventPanel"; - this.eventPanel.Size = new System.Drawing.Size(546, 546); + this.eventPanel.Size = new System.Drawing.Size(727, 672); this.eventPanel.TabIndex = 24; // // eventPictureBox // this.eventPictureBox.BackColor = System.Drawing.Color.White; this.eventPictureBox.Location = new System.Drawing.Point(0, 0); + this.eventPictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.eventPictureBox.Name = "eventPictureBox"; - this.eventPictureBox.Size = new System.Drawing.Size(544, 544); + this.eventPictureBox.Size = new System.Drawing.Size(725, 670); this.eventPictureBox.TabIndex = 3; this.eventPictureBox.TabStop = false; this.eventPictureBox.Click += new System.EventHandler(this.eventPictureBox_Click); @@ -6792,8 +7286,9 @@ this.eventOpenGlControl.Dock = System.Windows.Forms.DockStyle.Fill; this.eventOpenGlControl.ForeColor = System.Drawing.Color.Black; this.eventOpenGlControl.Location = new System.Drawing.Point(0, 0); + this.eventOpenGlControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.eventOpenGlControl.Name = "eventOpenGlControl"; - this.eventOpenGlControl.Size = new System.Drawing.Size(544, 544); + this.eventOpenGlControl.Size = new System.Drawing.Size(725, 670); this.eventOpenGlControl.StencilBits = ((byte)(0)); this.eventOpenGlControl.TabIndex = 2; // @@ -6803,9 +7298,10 @@ | System.Windows.Forms.AnchorStyles.Right))); this.rightClickPicture.Image = global::DSPRE.Properties.Resources.RightClick; this.rightClickPicture.ImageLocation = ""; - this.rightClickPicture.Location = new System.Drawing.Point(468, 420); + this.rightClickPicture.Location = new System.Drawing.Point(624, 517); + this.rightClickPicture.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.rightClickPicture.Name = "rightClickPicture"; - this.rightClickPicture.Size = new System.Drawing.Size(0, 38); + this.rightClickPicture.Size = new System.Drawing.Size(0, 47); this.rightClickPicture.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.rightClickPicture.TabIndex = 59; this.rightClickPicture.TabStop = false; @@ -6816,9 +7312,10 @@ | System.Windows.Forms.AnchorStyles.Right))); this.wheelClickPicture.Image = global::DSPRE.Properties.Resources.WheelClick; this.wheelClickPicture.ImageLocation = ""; - this.wheelClickPicture.Location = new System.Drawing.Point(552, 420); + this.wheelClickPicture.Location = new System.Drawing.Point(736, 517); + this.wheelClickPicture.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.wheelClickPicture.Name = "wheelClickPicture"; - this.wheelClickPicture.Size = new System.Drawing.Size(0, 38); + this.wheelClickPicture.Size = new System.Drawing.Size(0, 47); this.wheelClickPicture.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.wheelClickPicture.TabIndex = 56; this.wheelClickPicture.TabStop = false; @@ -6829,9 +7326,10 @@ | System.Windows.Forms.AnchorStyles.Right))); this.LeftClickPicture.Image = global::DSPRE.Properties.Resources.LeftClick; this.LeftClickPicture.ImageLocation = ""; - this.LeftClickPicture.Location = new System.Drawing.Point(510, 420); + this.LeftClickPicture.Location = new System.Drawing.Point(680, 517); + this.LeftClickPicture.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.LeftClickPicture.Name = "LeftClickPicture"; - this.LeftClickPicture.Size = new System.Drawing.Size(0, 38); + this.LeftClickPicture.Size = new System.Drawing.Size(0, 47); this.LeftClickPicture.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.LeftClickPicture.TabIndex = 55; this.LeftClickPicture.TabStop = false; @@ -6840,9 +7338,10 @@ // this.removeEventFileButton.Image = ((System.Drawing.Image)(resources.GetObject("removeEventFileButton.Image"))); this.removeEventFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeEventFileButton.Location = new System.Drawing.Point(354, 36); + this.removeEventFileButton.Location = new System.Drawing.Point(472, 44); + this.removeEventFileButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.removeEventFileButton.Name = "removeEventFileButton"; - this.removeEventFileButton.Size = new System.Drawing.Size(101, 25); + this.removeEventFileButton.Size = new System.Drawing.Size(135, 31); this.removeEventFileButton.TabIndex = 54; this.removeEventFileButton.Text = "Remove Last"; this.removeEventFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -6853,9 +7352,10 @@ // this.addEventFileButton.Image = ((System.Drawing.Image)(resources.GetObject("addEventFileButton.Image"))); this.addEventFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addEventFileButton.Location = new System.Drawing.Point(354, 9); + this.addEventFileButton.Location = new System.Drawing.Point(472, 11); + this.addEventFileButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.addEventFileButton.Name = "addEventFileButton"; - this.addEventFileButton.Size = new System.Drawing.Size(101, 25); + this.addEventFileButton.Size = new System.Drawing.Size(135, 31); this.addEventFileButton.TabIndex = 53; this.addEventFileButton.Text = "Add Event File"; this.addEventFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -6866,9 +7366,10 @@ // this.eventShiftRightButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; this.eventShiftRightButton.Image = global::DSPRE.Properties.Resources.arrowright; - this.eventShiftRightButton.Location = new System.Drawing.Point(1152, 233); + this.eventShiftRightButton.Location = new System.Drawing.Point(1536, 287); + this.eventShiftRightButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.eventShiftRightButton.Name = "eventShiftRightButton"; - this.eventShiftRightButton.Size = new System.Drawing.Size(25, 156); + this.eventShiftRightButton.Size = new System.Drawing.Size(33, 192); this.eventShiftRightButton.TabIndex = 45; this.eventShiftRightButton.UseVisualStyleBackColor = true; this.eventShiftRightButton.Click += new System.EventHandler(this.eventShiftRightButton_Click); @@ -6877,9 +7378,10 @@ // this.eventShiftLeftButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; this.eventShiftLeftButton.Image = global::DSPRE.Properties.Resources.arrowleft; - this.eventShiftLeftButton.Location = new System.Drawing.Point(570, 233); + this.eventShiftLeftButton.Location = new System.Drawing.Point(760, 287); + this.eventShiftLeftButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.eventShiftLeftButton.Name = "eventShiftLeftButton"; - this.eventShiftLeftButton.Size = new System.Drawing.Size(25, 156); + this.eventShiftLeftButton.Size = new System.Drawing.Size(33, 192); this.eventShiftLeftButton.TabIndex = 44; this.eventShiftLeftButton.UseVisualStyleBackColor = true; this.eventShiftLeftButton.Click += new System.EventHandler(this.eventShiftLeftButton_Click); @@ -6888,9 +7390,10 @@ // this.eventShiftUpButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; this.eventShiftUpButton.Image = global::DSPRE.Properties.Resources.arrowup; - this.eventShiftUpButton.Location = new System.Drawing.Point(795, 8); + this.eventShiftUpButton.Location = new System.Drawing.Point(1060, 10); + this.eventShiftUpButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.eventShiftUpButton.Name = "eventShiftUpButton"; - this.eventShiftUpButton.Size = new System.Drawing.Size(156, 25); + this.eventShiftUpButton.Size = new System.Drawing.Size(208, 31); this.eventShiftUpButton.TabIndex = 43; this.eventShiftUpButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.eventShiftUpButton.UseVisualStyleBackColor = true; @@ -6900,9 +7403,10 @@ // this.eventShiftDownButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; this.eventShiftDownButton.Image = global::DSPRE.Properties.Resources.arrowdown; - this.eventShiftDownButton.Location = new System.Drawing.Point(795, 589); + this.eventShiftDownButton.Location = new System.Drawing.Point(1060, 725); + this.eventShiftDownButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.eventShiftDownButton.Name = "eventShiftDownButton"; - this.eventShiftDownButton.Size = new System.Drawing.Size(156, 25); + this.eventShiftDownButton.Size = new System.Drawing.Size(208, 31); this.eventShiftDownButton.TabIndex = 42; this.eventShiftDownButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.eventShiftDownButton.UseVisualStyleBackColor = true; @@ -6912,9 +7416,10 @@ // this.exportEventFileButton.Image = global::DSPRE.Properties.Resources.exportArrow; this.exportEventFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.exportEventFileButton.Location = new System.Drawing.Point(266, 9); + this.exportEventFileButton.Location = new System.Drawing.Point(355, 11); + this.exportEventFileButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.exportEventFileButton.Name = "exportEventFileButton"; - this.exportEventFileButton.Size = new System.Drawing.Size(84, 52); + this.exportEventFileButton.Size = new System.Drawing.Size(112, 64); this.exportEventFileButton.TabIndex = 36; this.exportEventFileButton.Text = "Export"; this.exportEventFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -6925,9 +7430,10 @@ // this.importEventFileButton.Image = global::DSPRE.Properties.Resources.importArrow; this.importEventFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.importEventFileButton.Location = new System.Drawing.Point(178, 9); + this.importEventFileButton.Location = new System.Drawing.Point(237, 11); + this.importEventFileButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.importEventFileButton.Name = "importEventFileButton"; - this.importEventFileButton.Size = new System.Drawing.Size(84, 52); + this.importEventFileButton.Size = new System.Drawing.Size(112, 64); this.importEventFileButton.TabIndex = 35; this.importEventFileButton.Text = "Import"; this.importEventFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -6938,9 +7444,10 @@ // this.saveEventsButton.Image = global::DSPRE.Properties.Resources.saveButton; this.saveEventsButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.saveEventsButton.Location = new System.Drawing.Point(9, 36); + this.saveEventsButton.Location = new System.Drawing.Point(12, 44); + this.saveEventsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.saveEventsButton.Name = "saveEventsButton"; - this.saveEventsButton.Size = new System.Drawing.Size(166, 25); + this.saveEventsButton.Size = new System.Drawing.Size(221, 31); this.saveEventsButton.TabIndex = 34; this.saveEventsButton.Text = "Save Event File"; this.saveEventsButton.UseVisualStyleBackColor = true; @@ -6954,10 +7461,11 @@ this.textEditorTabPage.Controls.Add(this.removeStringButton); this.textEditorTabPage.Controls.Add(this.addStringButton); this.textEditorTabPage.ImageIndex = 4; - this.textEditorTabPage.Location = new System.Drawing.Point(4, 23); + this.textEditorTabPage.Location = new System.Drawing.Point(4, 25); + this.textEditorTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textEditorTabPage.Name = "textEditorTabPage"; - this.textEditorTabPage.Padding = new System.Windows.Forms.Padding(3); - this.textEditorTabPage.Size = new System.Drawing.Size(1185, 675); + this.textEditorTabPage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textEditorTabPage.Size = new System.Drawing.Size(1583, 835); this.textEditorTabPage.TabIndex = 5; this.textEditorTabPage.Text = "Text Editor"; this.textEditorTabPage.UseVisualStyleBackColor = true; @@ -6968,14 +7476,14 @@ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanel1.Controls.Add(this.label6, 0, 0); this.tableLayoutPanel1.Controls.Add(this.selectedLineMoveUpButton, 8, 1); @@ -6988,31 +7496,34 @@ this.tableLayoutPanel1.Controls.Add(this.removeMessageFileButton, 5, 1); this.tableLayoutPanel1.Controls.Add(this.selectedLineMoveDownButton, 9, 1); this.tableLayoutPanel1.Controls.Add(this.LineNumbersFormatgroupBox, 11, 1); - this.tableLayoutPanel1.Location = new System.Drawing.Point(12, 4); + this.tableLayoutPanel1.Location = new System.Drawing.Point(16, 5); + this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 3; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.Size = new System.Drawing.Size(1161, 70); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1548, 86); this.tableLayoutPanel1.TabIndex = 66; // // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(3, 0); + this.label6.Location = new System.Drawing.Point(4, 0); + this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(67, 13); + this.label6.Size = new System.Drawing.Size(81, 16); this.label6.TabIndex = 18; this.label6.Text = "Text Archive"; // // selectedLineMoveUpButton // this.selectedLineMoveUpButton.Image = global::DSPRE.Properties.Resources.arrowup; - this.selectedLineMoveUpButton.Location = new System.Drawing.Point(681, 16); + this.selectedLineMoveUpButton.Location = new System.Drawing.Point(907, 20); + this.selectedLineMoveUpButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.selectedLineMoveUpButton.Name = "selectedLineMoveUpButton"; this.tableLayoutPanel1.SetRowSpan(this.selectedLineMoveUpButton, 2); - this.selectedLineMoveUpButton.Size = new System.Drawing.Size(42, 40); + this.selectedLineMoveUpButton.Size = new System.Drawing.Size(56, 49); this.selectedLineMoveUpButton.TabIndex = 65; this.selectedLineMoveUpButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.toolTip1.SetToolTip(this.selectedLineMoveUpButton, "Shift up selected line"); @@ -7023,19 +7534,21 @@ // this.selectTextFileComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.selectTextFileComboBox.FormattingEnabled = true; - this.selectTextFileComboBox.Location = new System.Drawing.Point(3, 16); + this.selectTextFileComboBox.Location = new System.Drawing.Point(4, 20); + this.selectTextFileComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.selectTextFileComboBox.Name = "selectTextFileComboBox"; - this.selectTextFileComboBox.Size = new System.Drawing.Size(184, 21); + this.selectTextFileComboBox.Size = new System.Drawing.Size(244, 24); this.selectTextFileComboBox.TabIndex = 17; this.selectTextFileComboBox.SelectedIndexChanged += new System.EventHandler(this.selectTextFileComboBox_SelectedIndexChanged); // // locateCurrentTextArchive // this.locateCurrentTextArchive.Image = global::DSPRE.Properties.Resources.open_file; - this.locateCurrentTextArchive.Location = new System.Drawing.Point(613, 16); + this.locateCurrentTextArchive.Location = new System.Drawing.Point(816, 20); + this.locateCurrentTextArchive.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.locateCurrentTextArchive.Name = "locateCurrentTextArchive"; this.tableLayoutPanel1.SetRowSpan(this.locateCurrentTextArchive, 2); - this.locateCurrentTextArchive.Size = new System.Drawing.Size(42, 40); + this.locateCurrentTextArchive.Size = new System.Drawing.Size(56, 49); this.locateCurrentTextArchive.TabIndex = 64; this.locateCurrentTextArchive.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.locateCurrentTextArchive.UseVisualStyleBackColor = true; @@ -7046,9 +7559,10 @@ this.saveTextArchiveButton.Dock = System.Windows.Forms.DockStyle.Fill; this.saveTextArchiveButton.Image = global::DSPRE.Properties.Resources.saveButton; this.saveTextArchiveButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.saveTextArchiveButton.Location = new System.Drawing.Point(3, 43); + this.saveTextArchiveButton.Location = new System.Drawing.Point(4, 52); + this.saveTextArchiveButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.saveTextArchiveButton.Name = "saveTextArchiveButton"; - this.saveTextArchiveButton.Size = new System.Drawing.Size(184, 24); + this.saveTextArchiveButton.Size = new System.Drawing.Size(245, 34); this.saveTextArchiveButton.TabIndex = 21; this.saveTextArchiveButton.Text = "&Save Current Archive"; this.saveTextArchiveButton.UseVisualStyleBackColor = true; @@ -7059,10 +7573,11 @@ this.importTextFileButton.Dock = System.Windows.Forms.DockStyle.Fill; this.importTextFileButton.Image = global::DSPRE.Properties.Resources.importArrow; this.importTextFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.importTextFileButton.Location = new System.Drawing.Point(193, 16); + this.importTextFileButton.Location = new System.Drawing.Point(257, 20); + this.importTextFileButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.importTextFileButton.Name = "importTextFileButton"; this.tableLayoutPanel1.SetRowSpan(this.importTextFileButton, 2); - this.importTextFileButton.Size = new System.Drawing.Size(94, 51); + this.importTextFileButton.Size = new System.Drawing.Size(125, 66); this.importTextFileButton.TabIndex = 22; this.importTextFileButton.Text = "&Replace\r\nCurrent"; this.importTextFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -7074,10 +7589,11 @@ this.exportTextFileButton.Dock = System.Windows.Forms.DockStyle.Fill; this.exportTextFileButton.Image = global::DSPRE.Properties.Resources.exportArrow; this.exportTextFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.exportTextFileButton.Location = new System.Drawing.Point(293, 16); + this.exportTextFileButton.Location = new System.Drawing.Point(390, 20); + this.exportTextFileButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.exportTextFileButton.Name = "exportTextFileButton"; this.tableLayoutPanel1.SetRowSpan(this.exportTextFileButton, 2); - this.exportTextFileButton.Size = new System.Drawing.Size(94, 51); + this.exportTextFileButton.Size = new System.Drawing.Size(125, 66); this.exportTextFileButton.TabIndex = 23; this.exportTextFileButton.Text = "&Export File"; this.exportTextFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -7089,10 +7605,11 @@ this.addTextArchiveButton.Dock = System.Windows.Forms.DockStyle.Fill; this.addTextArchiveButton.Image = global::DSPRE.Properties.Resources.addIcon; this.addTextArchiveButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addTextArchiveButton.Location = new System.Drawing.Point(413, 16); + this.addTextArchiveButton.Location = new System.Drawing.Point(550, 20); + this.addTextArchiveButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.addTextArchiveButton.Name = "addTextArchiveButton"; this.tableLayoutPanel1.SetRowSpan(this.addTextArchiveButton, 2); - this.addTextArchiveButton.Size = new System.Drawing.Size(91, 51); + this.addTextArchiveButton.Size = new System.Drawing.Size(121, 66); this.addTextArchiveButton.TabIndex = 19; this.addTextArchiveButton.Text = "Add Text \r\nArchive"; this.addTextArchiveButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -7104,10 +7621,11 @@ this.removeMessageFileButton.Dock = System.Windows.Forms.DockStyle.Fill; this.removeMessageFileButton.Image = global::DSPRE.Properties.Resources.deleteIcon; this.removeMessageFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeMessageFileButton.Location = new System.Drawing.Point(510, 16); + this.removeMessageFileButton.Location = new System.Drawing.Point(679, 20); + this.removeMessageFileButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.removeMessageFileButton.Name = "removeMessageFileButton"; this.tableLayoutPanel1.SetRowSpan(this.removeMessageFileButton, 2); - this.removeMessageFileButton.Size = new System.Drawing.Size(97, 51); + this.removeMessageFileButton.Size = new System.Drawing.Size(129, 66); this.removeMessageFileButton.TabIndex = 20; this.removeMessageFileButton.Text = "Remove \r\nLast Archive"; this.removeMessageFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -7117,10 +7635,11 @@ // selectedLineMoveDownButton // this.selectedLineMoveDownButton.Image = global::DSPRE.Properties.Resources.arrowdown; - this.selectedLineMoveDownButton.Location = new System.Drawing.Point(729, 16); + this.selectedLineMoveDownButton.Location = new System.Drawing.Point(971, 20); + this.selectedLineMoveDownButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.selectedLineMoveDownButton.Name = "selectedLineMoveDownButton"; this.tableLayoutPanel1.SetRowSpan(this.selectedLineMoveDownButton, 2); - this.selectedLineMoveDownButton.Size = new System.Drawing.Size(42, 40); + this.selectedLineMoveDownButton.Size = new System.Drawing.Size(56, 49); this.selectedLineMoveDownButton.TabIndex = 66; this.selectedLineMoveDownButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.toolTip1.SetToolTip(this.selectedLineMoveDownButton, "Shift down selected line"); @@ -7131,10 +7650,12 @@ // this.LineNumbersFormatgroupBox.Controls.Add(this.decimalRadioButton); this.LineNumbersFormatgroupBox.Controls.Add(this.hexRadiobutton); - this.LineNumbersFormatgroupBox.Location = new System.Drawing.Point(797, 16); + this.LineNumbersFormatgroupBox.Location = new System.Drawing.Point(1062, 20); + this.LineNumbersFormatgroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.LineNumbersFormatgroupBox.Name = "LineNumbersFormatgroupBox"; + this.LineNumbersFormatgroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tableLayoutPanel1.SetRowSpan(this.LineNumbersFormatgroupBox, 2); - this.LineNumbersFormatgroupBox.Size = new System.Drawing.Size(134, 35); + this.LineNumbersFormatgroupBox.Size = new System.Drawing.Size(179, 43); this.LineNumbersFormatgroupBox.TabIndex = 34; this.LineNumbersFormatgroupBox.TabStop = false; this.LineNumbersFormatgroupBox.Text = "Line Number Format"; @@ -7143,9 +7664,10 @@ // this.decimalRadioButton.AutoSize = true; this.decimalRadioButton.Checked = true; - this.decimalRadioButton.Location = new System.Drawing.Point(68, 14); + this.decimalRadioButton.Location = new System.Drawing.Point(91, 17); + this.decimalRadioButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.decimalRadioButton.Name = "decimalRadioButton"; - this.decimalRadioButton.Size = new System.Drawing.Size(63, 17); + this.decimalRadioButton.Size = new System.Drawing.Size(78, 20); this.decimalRadioButton.TabIndex = 35; this.decimalRadioButton.TabStop = true; this.decimalRadioButton.Text = "Decimal"; @@ -7154,9 +7676,10 @@ // hexRadiobutton // this.hexRadiobutton.AutoSize = true; - this.hexRadiobutton.Location = new System.Drawing.Point(6, 14); + this.hexRadiobutton.Location = new System.Drawing.Point(8, 17); + this.hexRadiobutton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.hexRadiobutton.Name = "hexRadiobutton"; - this.hexRadiobutton.Size = new System.Drawing.Size(44, 17); + this.hexRadiobutton.Size = new System.Drawing.Size(52, 20); this.hexRadiobutton.TabIndex = 34; this.hexRadiobutton.Text = "Hex"; this.hexRadiobutton.UseVisualStyleBackColor = true; @@ -7177,9 +7700,11 @@ this.groupBox13.Controls.Add(this.searchMessageTextBox); this.groupBox13.Controls.Add(this.searchMessageButton); this.groupBox13.Controls.Add(this.replaceMessageButton); - this.groupBox13.Location = new System.Drawing.Point(891, 75); + this.groupBox13.Location = new System.Drawing.Point(1188, 92); + this.groupBox13.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox13.Name = "groupBox13"; - this.groupBox13.Size = new System.Drawing.Size(282, 502); + this.groupBox13.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox13.Size = new System.Drawing.Size(376, 618); this.groupBox13.TabIndex = 31; this.groupBox13.TabStop = false; this.groupBox13.Text = "Search / Replace"; @@ -7189,9 +7714,10 @@ this.label67.AutoSize = true; this.label67.Enabled = false; this.label67.ForeColor = System.Drawing.SystemColors.ControlDark; - this.label67.Location = new System.Drawing.Point(190, 133); + this.label67.Location = new System.Drawing.Point(253, 164); + this.label67.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label67.Name = "label67"; - this.label67.Size = new System.Drawing.Size(74, 13); + this.label67.Size = new System.Drawing.Size(94, 16); this.label67.TabIndex = 41; this.label67.Text = "[Coming soon]"; // @@ -7200,9 +7726,10 @@ this.searchAllArchivesCheckBox.AutoSize = true; this.searchAllArchivesCheckBox.Checked = true; this.searchAllArchivesCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; - this.searchAllArchivesCheckBox.Location = new System.Drawing.Point(190, 22); + this.searchAllArchivesCheckBox.Location = new System.Drawing.Point(253, 27); + this.searchAllArchivesCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.searchAllArchivesCheckBox.Name = "searchAllArchivesCheckBox"; - this.searchAllArchivesCheckBox.Size = new System.Drawing.Size(81, 17); + this.searchAllArchivesCheckBox.Size = new System.Drawing.Size(99, 20); this.searchAllArchivesCheckBox.TabIndex = 40; this.searchAllArchivesCheckBox.Text = "All Archives"; this.searchAllArchivesCheckBox.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -7212,9 +7739,10 @@ // this.caseSensitiveTextReplaceCheckbox.AutoSize = true; this.caseSensitiveTextReplaceCheckbox.Enabled = false; - this.caseSensitiveTextReplaceCheckbox.Location = new System.Drawing.Point(190, 115); + this.caseSensitiveTextReplaceCheckbox.Location = new System.Drawing.Point(253, 142); + this.caseSensitiveTextReplaceCheckbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.caseSensitiveTextReplaceCheckbox.Name = "caseSensitiveTextReplaceCheckbox"; - this.caseSensitiveTextReplaceCheckbox.Size = new System.Drawing.Size(77, 17); + this.caseSensitiveTextReplaceCheckbox.Size = new System.Drawing.Size(96, 20); this.caseSensitiveTextReplaceCheckbox.TabIndex = 39; this.caseSensitiveTextReplaceCheckbox.Text = "Copy Case"; this.caseSensitiveTextReplaceCheckbox.UseVisualStyleBackColor = true; @@ -7222,10 +7750,11 @@ // textSearchResultsListBox // this.textSearchResultsListBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textSearchResultsListBox.ItemHeight = 15; - this.textSearchResultsListBox.Location = new System.Drawing.Point(9, 182); + this.textSearchResultsListBox.ItemHeight = 18; + this.textSearchResultsListBox.Location = new System.Drawing.Point(12, 224); + this.textSearchResultsListBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textSearchResultsListBox.Name = "textSearchResultsListBox"; - this.textSearchResultsListBox.Size = new System.Drawing.Size(267, 259); + this.textSearchResultsListBox.Size = new System.Drawing.Size(355, 310); this.textSearchResultsListBox.TabIndex = 38; this.textSearchResultsListBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textSearchResultsListBox_KeyDown); this.textSearchResultsListBox.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.textSearchResultsListBox_GoToEntryResult); @@ -7233,43 +7762,48 @@ // replaceTextLabel // this.replaceTextLabel.AutoSize = true; - this.replaceTextLabel.Location = new System.Drawing.Point(6, 87); + this.replaceTextLabel.Location = new System.Drawing.Point(8, 107); + this.replaceTextLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.replaceTextLabel.Name = "replaceTextLabel"; - this.replaceTextLabel.Size = new System.Drawing.Size(93, 13); + this.replaceTextLabel.Size = new System.Drawing.Size(114, 16); this.replaceTextLabel.TabIndex = 37; this.replaceTextLabel.Text = "Replacement text:"; // // replaceMessageTextBox // - this.replaceMessageTextBox.Location = new System.Drawing.Point(8, 103); + this.replaceMessageTextBox.Location = new System.Drawing.Point(11, 127); + this.replaceMessageTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.replaceMessageTextBox.MaxLength = 100; this.replaceMessageTextBox.Name = "replaceMessageTextBox"; - this.replaceMessageTextBox.Size = new System.Drawing.Size(173, 20); + this.replaceMessageTextBox.Size = new System.Drawing.Size(229, 22); this.replaceMessageTextBox.TabIndex = 36; // // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(6, 450); + this.label8.Location = new System.Drawing.Point(8, 554); + this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(48, 13); + this.label8.Size = new System.Drawing.Size(62, 16); this.label8.TabIndex = 35; this.label8.Text = "Progress"; // // textSearchProgressBar // - this.textSearchProgressBar.Location = new System.Drawing.Point(9, 466); + this.textSearchProgressBar.Location = new System.Drawing.Point(12, 574); + this.textSearchProgressBar.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textSearchProgressBar.Name = "textSearchProgressBar"; - this.textSearchProgressBar.Size = new System.Drawing.Size(267, 27); + this.textSearchProgressBar.Size = new System.Drawing.Size(356, 33); this.textSearchProgressBar.Style = System.Windows.Forms.ProgressBarStyle.Continuous; this.textSearchProgressBar.TabIndex = 34; // // caseSensitiveTextSearchCheckbox // this.caseSensitiveTextSearchCheckbox.AutoSize = true; - this.caseSensitiveTextSearchCheckbox.Location = new System.Drawing.Point(190, 50); + this.caseSensitiveTextSearchCheckbox.Location = new System.Drawing.Point(253, 62); + this.caseSensitiveTextSearchCheckbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.caseSensitiveTextSearchCheckbox.Name = "caseSensitiveTextSearchCheckbox"; - this.caseSensitiveTextSearchCheckbox.Size = new System.Drawing.Size(83, 17); + this.caseSensitiveTextSearchCheckbox.Size = new System.Drawing.Size(100, 20); this.caseSensitiveTextSearchCheckbox.TabIndex = 33; this.caseSensitiveTextSearchCheckbox.Text = "Match Case"; this.caseSensitiveTextSearchCheckbox.UseVisualStyleBackColor = true; @@ -7277,18 +7811,20 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(5, 166); + this.label7.Location = new System.Drawing.Point(7, 204); + this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(42, 13); + this.label7.Size = new System.Drawing.Size(52, 16); this.label7.TabIndex = 32; this.label7.Text = "Results"; // // searchMessageTextBox // - this.searchMessageTextBox.Location = new System.Drawing.Point(6, 20); + this.searchMessageTextBox.Location = new System.Drawing.Point(8, 25); + this.searchMessageTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.searchMessageTextBox.MaxLength = 100; this.searchMessageTextBox.Name = "searchMessageTextBox"; - this.searchMessageTextBox.Size = new System.Drawing.Size(175, 20); + this.searchMessageTextBox.Size = new System.Drawing.Size(232, 22); this.searchMessageTextBox.TabIndex = 27; this.searchMessageTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.searchMessageTextBox_KeyDown); // @@ -7296,9 +7832,10 @@ // this.searchMessageButton.Image = global::DSPRE.Properties.Resources.SearchMiniIcon; this.searchMessageButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.searchMessageButton.Location = new System.Drawing.Point(6, 44); + this.searchMessageButton.Location = new System.Drawing.Point(8, 54); + this.searchMessageButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.searchMessageButton.Name = "searchMessageButton"; - this.searchMessageButton.Size = new System.Drawing.Size(175, 27); + this.searchMessageButton.Size = new System.Drawing.Size(233, 33); this.searchMessageButton.TabIndex = 30; this.searchMessageButton.Text = "Search"; this.searchMessageButton.UseVisualStyleBackColor = true; @@ -7306,9 +7843,10 @@ // // replaceMessageButton // - this.replaceMessageButton.Location = new System.Drawing.Point(8, 127); + this.replaceMessageButton.Location = new System.Drawing.Point(11, 156); + this.replaceMessageButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.replaceMessageButton.Name = "replaceMessageButton"; - this.replaceMessageButton.Size = new System.Drawing.Size(173, 27); + this.replaceMessageButton.Size = new System.Drawing.Size(231, 33); this.replaceMessageButton.TabIndex = 30; this.replaceMessageButton.Text = "Search and Replace All"; this.replaceMessageButton.UseVisualStyleBackColor = true; @@ -7325,15 +7863,17 @@ this.textEditorDataGridView.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells; this.textEditorDataGridView.BackgroundColor = System.Drawing.SystemColors.ButtonHighlight; this.textEditorDataGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + this.textEditorDataGridView.ColumnHeadersHeight = 29; this.textEditorDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; this.textEditorDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.messageColumn}); - this.textEditorDataGridView.Location = new System.Drawing.Point(12, 77); + this.textEditorDataGridView.Location = new System.Drawing.Point(16, 95); + this.textEditorDataGridView.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textEditorDataGridView.Name = "textEditorDataGridView"; this.textEditorDataGridView.RowHeadersWidth = 68; 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(873, 500); + this.textEditorDataGridView.Size = new System.Drawing.Size(1164, 615); this.textEditorDataGridView.TabIndex = 24; this.textEditorDataGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.textEditorDataGridView_CellValueChanged); this.textEditorDataGridView.CurrentCellChanged += new System.EventHandler(this.textEditorDataGridView_CurrentCellChanged); @@ -7342,17 +7882,19 @@ // this.messageColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells; this.messageColumn.HeaderText = "Message"; + this.messageColumn.MinimumWidth = 6; this.messageColumn.Name = "messageColumn"; this.messageColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.messageColumn.Width = 56; + this.messageColumn.Width = 70; // // removeStringButton // this.removeStringButton.Image = global::DSPRE.Properties.Resources.deleteIcon; this.removeStringButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeStringButton.Location = new System.Drawing.Point(113, 580); + this.removeStringButton.Location = new System.Drawing.Point(151, 714); + this.removeStringButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.removeStringButton.Name = "removeStringButton"; - this.removeStringButton.Size = new System.Drawing.Size(124, 34); + this.removeStringButton.Size = new System.Drawing.Size(165, 42); this.removeStringButton.TabIndex = 26; this.removeStringButton.Text = "Remove Last Line"; this.removeStringButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -7363,9 +7905,10 @@ // this.addStringButton.Image = global::DSPRE.Properties.Resources.addIcon; this.addStringButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addStringButton.Location = new System.Drawing.Point(12, 580); + this.addStringButton.Location = new System.Drawing.Point(16, 714); + this.addStringButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.addStringButton.Name = "addStringButton"; - this.addStringButton.Size = new System.Drawing.Size(95, 34); + this.addStringButton.Size = new System.Drawing.Size(127, 42); this.addStringButton.TabIndex = 25; this.addStringButton.Text = "&Append Line"; this.addStringButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -7379,9 +7922,10 @@ this.cameraEditorTabPage.Controls.Add(this.saveCameraTableButton); this.cameraEditorTabPage.Controls.Add(this.cameraEditorDataGridView); this.cameraEditorTabPage.ImageIndex = 7; - this.cameraEditorTabPage.Location = new System.Drawing.Point(4, 23); + this.cameraEditorTabPage.Location = new System.Drawing.Point(4, 25); + this.cameraEditorTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.cameraEditorTabPage.Name = "cameraEditorTabPage"; - this.cameraEditorTabPage.Size = new System.Drawing.Size(1185, 675); + this.cameraEditorTabPage.Size = new System.Drawing.Size(1583, 835); this.cameraEditorTabPage.TabIndex = 7; this.cameraEditorTabPage.Text = "Camera Editor"; this.cameraEditorTabPage.UseVisualStyleBackColor = true; @@ -7390,9 +7934,10 @@ // this.exportCameraTableButton.Image = global::DSPRE.Properties.Resources.exportArrow; this.exportCameraTableButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.exportCameraTableButton.Location = new System.Drawing.Point(3, 563); + this.exportCameraTableButton.Location = new System.Drawing.Point(4, 693); + this.exportCameraTableButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.exportCameraTableButton.Name = "exportCameraTableButton"; - this.exportCameraTableButton.Size = new System.Drawing.Size(115, 45); + this.exportCameraTableButton.Size = new System.Drawing.Size(153, 55); this.exportCameraTableButton.TabIndex = 16; this.exportCameraTableButton.Text = "Export \r\nCamera Table"; this.exportCameraTableButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -7403,9 +7948,10 @@ // this.importCameraTableButton.Image = global::DSPRE.Properties.Resources.importArrow; this.importCameraTableButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.importCameraTableButton.Location = new System.Drawing.Point(123, 563); + this.importCameraTableButton.Location = new System.Drawing.Point(164, 693); + this.importCameraTableButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.importCameraTableButton.Name = "importCameraTableButton"; - this.importCameraTableButton.Size = new System.Drawing.Size(115, 45); + this.importCameraTableButton.Size = new System.Drawing.Size(153, 55); this.importCameraTableButton.TabIndex = 14; this.importCameraTableButton.Text = "Import\r\nCamera Table"; this.importCameraTableButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -7416,9 +7962,10 @@ // this.saveCameraTableButton.Image = global::DSPRE.Properties.Resources.save_rom; this.saveCameraTableButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.saveCameraTableButton.Location = new System.Drawing.Point(1060, 563); + this.saveCameraTableButton.Location = new System.Drawing.Point(1413, 693); + this.saveCameraTableButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.saveCameraTableButton.Name = "saveCameraTableButton"; - this.saveCameraTableButton.Size = new System.Drawing.Size(115, 45); + this.saveCameraTableButton.Size = new System.Drawing.Size(153, 55); this.saveCameraTableButton.TabIndex = 15; this.saveCameraTableButton.Text = "&Save \r\nCam Table"; this.saveCameraTableButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -7453,14 +8000,15 @@ this.ZDispGVCol, this.ExportBTN, this.ImportBTN}); - this.cameraEditorDataGridView.Location = new System.Drawing.Point(5, 4); + this.cameraEditorDataGridView.Location = new System.Drawing.Point(7, 5); + this.cameraEditorDataGridView.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.cameraEditorDataGridView.MultiSelect = false; this.cameraEditorDataGridView.Name = "cameraEditorDataGridView"; this.cameraEditorDataGridView.RowHeadersWidth = 60; this.cameraEditorDataGridView.RowTemplate.DividerHeight = 1; this.cameraEditorDataGridView.RowTemplate.Height = 32; this.cameraEditorDataGridView.ScrollBars = System.Windows.Forms.ScrollBars.None; - this.cameraEditorDataGridView.Size = new System.Drawing.Size(1172, 551); + this.cameraEditorDataGridView.Size = new System.Drawing.Size(1563, 678); this.cameraEditorDataGridView.TabIndex = 0; this.cameraEditorDataGridView.TabStop = false; this.cameraEditorDataGridView.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.cameraEditorDataGridView_CellContentClick); @@ -7470,6 +8018,7 @@ // this.DistanceGVCol.FillWeight = 44.49141F; this.DistanceGVCol.HeaderText = "Distance"; + this.DistanceGVCol.MinimumWidth = 6; this.DistanceGVCol.Name = "DistanceGVCol"; this.DistanceGVCol.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; // @@ -7477,6 +8026,7 @@ // this.VertRotGVCol.FillWeight = 28.66745F; this.VertRotGVCol.HeaderText = "Vertical Rotation"; + this.VertRotGVCol.MinimumWidth = 6; this.VertRotGVCol.Name = "VertRotGVCol"; this.VertRotGVCol.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; // @@ -7484,6 +8034,7 @@ // this.HoriRotGVCol.FillWeight = 28.66745F; this.HoriRotGVCol.HeaderText = "Horizontal Rotation"; + this.HoriRotGVCol.MinimumWidth = 6; this.HoriRotGVCol.Name = "HoriRotGVCol"; this.HoriRotGVCol.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; // @@ -7491,6 +8042,7 @@ // this.zRotGVCol.FillWeight = 28F; this.zRotGVCol.HeaderText = "Z Rotation"; + this.zRotGVCol.MinimumWidth = 6; this.zRotGVCol.Name = "zRotGVCol"; this.zRotGVCol.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; // @@ -7498,12 +8050,14 @@ // this.OrthoGVCol.FillWeight = 44.49141F; this.OrthoGVCol.HeaderText = "Orthographic"; + this.OrthoGVCol.MinimumWidth = 6; this.OrthoGVCol.Name = "OrthoGVCol"; // // FovGVCol // this.FovGVCol.FillWeight = 19.11163F; this.FovGVCol.HeaderText = "FOV"; + this.FovGVCol.MinimumWidth = 6; this.FovGVCol.Name = "FovGVCol"; this.FovGVCol.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.FovGVCol.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; @@ -7512,6 +8066,7 @@ // this.NearClipGVCol.FillWeight = 44.49141F; this.NearClipGVCol.HeaderText = "Near Clip Distance"; + this.NearClipGVCol.MinimumWidth = 6; this.NearClipGVCol.Name = "NearClipGVCol"; this.NearClipGVCol.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; // @@ -7519,6 +8074,7 @@ // this.FarClipGVCol.FillWeight = 44.49141F; this.FarClipGVCol.HeaderText = "Far Clip Distance"; + this.FarClipGVCol.MinimumWidth = 6; this.FarClipGVCol.Name = "FarClipGVCol"; this.FarClipGVCol.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; // @@ -7526,6 +8082,7 @@ // this.XDispGVCol.FillWeight = 44.49141F; this.XDispGVCol.HeaderText = "X Displacement"; + this.XDispGVCol.MinimumWidth = 6; this.XDispGVCol.Name = "XDispGVCol"; this.XDispGVCol.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; // @@ -7533,6 +8090,7 @@ // this.YDispGVCol.FillWeight = 44.49141F; this.YDispGVCol.HeaderText = "Y Displacement"; + this.YDispGVCol.MinimumWidth = 6; this.YDispGVCol.Name = "YDispGVCol"; this.YDispGVCol.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; // @@ -7540,6 +8098,7 @@ // this.ZDispGVCol.FillWeight = 44.49141F; this.ZDispGVCol.HeaderText = "Z Displacement"; + this.ZDispGVCol.MinimumWidth = 6; this.ZDispGVCol.Name = "ZDispGVCol"; this.ZDispGVCol.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; // @@ -7547,6 +8106,7 @@ // this.ExportBTN.FillWeight = 44.49141F; this.ExportBTN.HeaderText = ""; + this.ExportBTN.MinimumWidth = 6; this.ExportBTN.Name = "ExportBTN"; this.ExportBTN.Text = "Export"; this.ExportBTN.UseColumnTextForButtonValue = true; @@ -7555,6 +8115,7 @@ // this.ImportBTN.FillWeight = 44.49141F; this.ImportBTN.HeaderText = ""; + this.ImportBTN.MinimumWidth = 6; this.ImportBTN.Name = "ImportBTN"; this.ImportBTN.Text = "Import"; this.ImportBTN.UseColumnTextForButtonValue = true; @@ -7569,9 +8130,10 @@ this.trainerEditorTabPage.Controls.Add(this.trainerComboBox); this.trainerEditorTabPage.Controls.Add(this.trainerSaveCurrentButton); this.trainerEditorTabPage.ImageIndex = 8; - this.trainerEditorTabPage.Location = new System.Drawing.Point(4, 23); + this.trainerEditorTabPage.Location = new System.Drawing.Point(4, 25); + this.trainerEditorTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.trainerEditorTabPage.Name = "trainerEditorTabPage"; - this.trainerEditorTabPage.Size = new System.Drawing.Size(1185, 675); + this.trainerEditorTabPage.Size = new System.Drawing.Size(1583, 835); this.trainerEditorTabPage.TabIndex = 8; this.trainerEditorTabPage.Text = "Trainer Editor"; this.trainerEditorTabPage.UseVisualStyleBackColor = true; @@ -7580,15 +8142,16 @@ // this.tableLayoutPanel4.ColumnCount = 1; this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 47.0167F)); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27F)); this.tableLayoutPanel4.Controls.Add(this.exportTrainerButton, 0, 0); this.tableLayoutPanel4.Controls.Add(this.importTrainerButton, 0, 1); - this.tableLayoutPanel4.Location = new System.Drawing.Point(219, 15); + this.tableLayoutPanel4.Location = new System.Drawing.Point(292, 18); + this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tableLayoutPanel4.Name = "tableLayoutPanel4"; this.tableLayoutPanel4.RowCount = 2; this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel4.Size = new System.Drawing.Size(128, 62); + this.tableLayoutPanel4.Size = new System.Drawing.Size(171, 76); this.tableLayoutPanel4.TabIndex = 47; // // exportTrainerButton @@ -7596,9 +8159,10 @@ this.exportTrainerButton.Dock = System.Windows.Forms.DockStyle.Fill; this.exportTrainerButton.Image = global::DSPRE.Properties.Resources.exportArrow; this.exportTrainerButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.exportTrainerButton.Location = new System.Drawing.Point(3, 3); + this.exportTrainerButton.Location = new System.Drawing.Point(4, 4); + this.exportTrainerButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.exportTrainerButton.Name = "exportTrainerButton"; - this.exportTrainerButton.Size = new System.Drawing.Size(122, 25); + this.exportTrainerButton.Size = new System.Drawing.Size(163, 30); this.exportTrainerButton.TabIndex = 42; this.exportTrainerButton.Text = "Export Full"; this.exportTrainerButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -7610,9 +8174,10 @@ this.importTrainerButton.Dock = System.Windows.Forms.DockStyle.Fill; this.importTrainerButton.Image = global::DSPRE.Properties.Resources.importArrow; this.importTrainerButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.importTrainerButton.Location = new System.Drawing.Point(3, 34); + this.importTrainerButton.Location = new System.Drawing.Point(4, 42); + this.importTrainerButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.importTrainerButton.Name = "importTrainerButton"; - this.importTrainerButton.Size = new System.Drawing.Size(122, 25); + this.importTrainerButton.Size = new System.Drawing.Size(163, 30); this.importTrainerButton.TabIndex = 43; this.importTrainerButton.Text = "Replace Full"; this.importTrainerButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -7630,9 +8195,11 @@ this.groupBox28.Controls.Add(this.party3GroupBox); this.groupBox28.Controls.Add(this.party2GroupBox); this.groupBox28.Controls.Add(this.party1GroupBox); - this.groupBox28.Location = new System.Drawing.Point(439, 3); + this.groupBox28.Location = new System.Drawing.Point(585, 4); + this.groupBox28.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox28.Name = "groupBox28"; - this.groupBox28.Size = new System.Drawing.Size(731, 609); + this.groupBox28.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox28.Size = new System.Drawing.Size(975, 750); this.groupBox28.TabIndex = 32; this.groupBox28.TabStop = false; this.groupBox28.Text = "Party"; @@ -7642,15 +8209,16 @@ this.tableLayoutPanel6.ColumnCount = 2; this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.00001F)); - this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27F)); + this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27F)); this.tableLayoutPanel6.Controls.Add(this.button3, 1, 0); this.tableLayoutPanel6.Controls.Add(this.button4, 0, 0); - this.tableLayoutPanel6.Location = new System.Drawing.Point(471, 10); + this.tableLayoutPanel6.Location = new System.Drawing.Point(628, 12); + this.tableLayoutPanel6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tableLayoutPanel6.Name = "tableLayoutPanel6"; this.tableLayoutPanel6.RowCount = 1; this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel6.Size = new System.Drawing.Size(237, 29); + this.tableLayoutPanel6.Size = new System.Drawing.Size(316, 36); this.tableLayoutPanel6.TabIndex = 48; // // button3 @@ -7658,9 +8226,10 @@ this.button3.Dock = System.Windows.Forms.DockStyle.Fill; this.button3.Image = ((System.Drawing.Image)(resources.GetObject("button3.Image"))); this.button3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.button3.Location = new System.Drawing.Point(121, 3); + this.button3.Location = new System.Drawing.Point(161, 4); + this.button3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(113, 23); + this.button3.Size = new System.Drawing.Size(151, 28); this.button3.TabIndex = 41; this.button3.Text = "Replace Party"; this.button3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -7671,9 +8240,10 @@ this.button4.Dock = System.Windows.Forms.DockStyle.Fill; this.button4.Image = ((System.Drawing.Image)(resources.GetObject("button4.Image"))); this.button4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.button4.Location = new System.Drawing.Point(3, 3); + this.button4.Location = new System.Drawing.Point(4, 4); + this.button4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(112, 23); + this.button4.Size = new System.Drawing.Size(149, 28); this.button4.TabIndex = 38; this.button4.Text = "Export Party"; this.button4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -7683,11 +8253,12 @@ // this.DVExplainButton.Image = ((System.Drawing.Image)(resources.GetObject("DVExplainButton.Image"))); this.DVExplainButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.DVExplainButton.Location = new System.Drawing.Point(251, 11); + this.DVExplainButton.Location = new System.Drawing.Point(323, 14); + this.DVExplainButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.DVExplainButton.Name = "DVExplainButton"; - this.DVExplainButton.Size = new System.Drawing.Size(109, 29); + this.DVExplainButton.Size = new System.Drawing.Size(157, 36); this.DVExplainButton.TabIndex = 45; - this.DVExplainButton.Text = "Info about DVs"; + this.DVExplainButton.Text = "Open DV Calculator"; this.DVExplainButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.DVExplainButton.UseVisualStyleBackColor = true; this.DVExplainButton.Click += new System.EventHandler(this.DVExplainButton_Click); @@ -7695,9 +8266,10 @@ // label74 // this.label74.AutoSize = true; - this.label74.Location = new System.Drawing.Point(247, 16); + this.label74.Location = new System.Drawing.Point(329, 20); + this.label74.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label74.Name = "label74"; - this.label74.Size = new System.Drawing.Size(0, 13); + this.label74.Size = new System.Drawing.Size(0, 16); this.label74.TabIndex = 46; // // party6GroupBox @@ -7717,9 +8289,11 @@ this.party6GroupBox.Controls.Add(this.partyPokemon6PictureBox); this.party6GroupBox.Controls.Add(this.partyPokemon6ComboBox); this.party6GroupBox.Enabled = false; - this.party6GroupBox.Location = new System.Drawing.Point(371, 408); + this.party6GroupBox.Location = new System.Drawing.Point(495, 502); + this.party6GroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.party6GroupBox.Name = "party6GroupBox"; - this.party6GroupBox.Size = new System.Drawing.Size(343, 183); + this.party6GroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.party6GroupBox.Size = new System.Drawing.Size(457, 225); this.party6GroupBox.TabIndex = 13; this.party6GroupBox.TabStop = false; this.party6GroupBox.Text = "Pokemon 6"; @@ -7730,35 +8304,39 @@ this.partyForm6ComboBox.FormattingEnabled = true; this.partyForm6ComboBox.Items.AddRange(new object[] { "Defense form"}); - this.partyForm6ComboBox.Location = new System.Drawing.Point(228, 151); + this.partyForm6ComboBox.Location = new System.Drawing.Point(304, 186); + this.partyForm6ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyForm6ComboBox.Name = "partyForm6ComboBox"; - this.partyForm6ComboBox.Size = new System.Drawing.Size(103, 21); + this.partyForm6ComboBox.Size = new System.Drawing.Size(136, 24); this.partyForm6ComboBox.TabIndex = 20; // // partyAbility6ComboBox // this.partyAbility6ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.partyAbility6ComboBox.FormattingEnabled = true; - this.partyAbility6ComboBox.Location = new System.Drawing.Point(15, 151); + this.partyAbility6ComboBox.Location = new System.Drawing.Point(20, 186); + this.partyAbility6ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyAbility6ComboBox.Name = "partyAbility6ComboBox"; - this.partyAbility6ComboBox.Size = new System.Drawing.Size(105, 21); + this.partyAbility6ComboBox.Size = new System.Drawing.Size(139, 24); this.partyAbility6ComboBox.TabIndex = 19; // // partyGender6ComboBox // this.partyGender6ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.partyGender6ComboBox.FormattingEnabled = true; - this.partyGender6ComboBox.Location = new System.Drawing.Point(126, 151); + this.partyGender6ComboBox.Location = new System.Drawing.Point(168, 186); + this.partyGender6ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyGender6ComboBox.Name = "partyGender6ComboBox"; - this.partyGender6ComboBox.Size = new System.Drawing.Size(95, 21); + this.partyGender6ComboBox.Size = new System.Drawing.Size(125, 24); this.partyGender6ComboBox.TabIndex = 15; // // partyPokemonItemPictureBox6 // this.partyPokemonItemPictureBox6.Image = global::DSPRE.Properties.Resources.IconItem; - this.partyPokemonItemPictureBox6.Location = new System.Drawing.Point(198, 26); + this.partyPokemonItemPictureBox6.Location = new System.Drawing.Point(264, 32); + this.partyPokemonItemPictureBox6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyPokemonItemPictureBox6.Name = "partyPokemonItemPictureBox6"; - this.partyPokemonItemPictureBox6.Size = new System.Drawing.Size(24, 25); + this.partyPokemonItemPictureBox6.Size = new System.Drawing.Size(32, 31); this.partyPokemonItemPictureBox6.TabIndex = 13; this.partyPokemonItemPictureBox6.TabStop = false; this.partyPokemonItemPictureBox6.Visible = false; @@ -7766,27 +8344,30 @@ // label60 // this.label60.AutoSize = true; - this.label60.Location = new System.Drawing.Point(12, 118); + this.label60.Location = new System.Drawing.Point(16, 145); + this.label60.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label60.Name = "label60"; - this.label60.Size = new System.Drawing.Size(28, 26); + this.label60.Size = new System.Drawing.Size(35, 32); this.label60.TabIndex = 9; this.label60.Text = "Ball\r\nSeal"; // // label61 // this.label61.AutoSize = true; - this.label61.Location = new System.Drawing.Point(12, 94); + this.label61.Location = new System.Drawing.Point(16, 116); + this.label61.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label61.Name = "label61"; - this.label61.Size = new System.Drawing.Size(22, 13); + this.label61.Size = new System.Drawing.Size(26, 16); this.label61.TabIndex = 8; this.label61.Text = "DV"; // // label62 // this.label62.AutoSize = true; - this.label62.Location = new System.Drawing.Point(12, 67); + this.label62.Location = new System.Drawing.Point(16, 82); + this.label62.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label62.Name = "label62"; - this.label62.Size = new System.Drawing.Size(22, 13); + this.label62.Size = new System.Drawing.Size(24, 16); this.label62.TabIndex = 7; this.label62.Text = "Lv."; // @@ -7796,9 +8377,11 @@ this.poke6MovesGroupBox.Controls.Add(this.partyMove6_2ComboBox); this.poke6MovesGroupBox.Controls.Add(this.partyMove6_3ComboBox); this.poke6MovesGroupBox.Controls.Add(this.partyMove6_4ComboBox); - this.poke6MovesGroupBox.Location = new System.Drawing.Point(110, 57); + this.poke6MovesGroupBox.Location = new System.Drawing.Point(147, 70); + this.poke6MovesGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.poke6MovesGroupBox.Name = "poke6MovesGroupBox"; - this.poke6MovesGroupBox.Size = new System.Drawing.Size(227, 85); + this.poke6MovesGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.poke6MovesGroupBox.Size = new System.Drawing.Size(303, 105); this.poke6MovesGroupBox.TabIndex = 6; this.poke6MovesGroupBox.TabStop = false; this.poke6MovesGroupBox.Text = "Moves"; @@ -7809,9 +8392,10 @@ this.partyMove6_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove6_1ComboBox.Enabled = false; this.partyMove6_1ComboBox.FormattingEnabled = true; - this.partyMove6_1ComboBox.Location = new System.Drawing.Point(10, 21); + this.partyMove6_1ComboBox.Location = new System.Drawing.Point(13, 26); + this.partyMove6_1ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyMove6_1ComboBox.Name = "partyMove6_1ComboBox"; - this.partyMove6_1ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove6_1ComboBox.Size = new System.Drawing.Size(132, 24); this.partyMove6_1ComboBox.TabIndex = 3; this.partyMove6_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -7821,9 +8405,10 @@ this.partyMove6_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove6_2ComboBox.Enabled = false; this.partyMove6_2ComboBox.FormattingEnabled = true; - this.partyMove6_2ComboBox.Location = new System.Drawing.Point(116, 21); + this.partyMove6_2ComboBox.Location = new System.Drawing.Point(155, 26); + this.partyMove6_2ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyMove6_2ComboBox.Name = "partyMove6_2ComboBox"; - this.partyMove6_2ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove6_2ComboBox.Size = new System.Drawing.Size(132, 24); this.partyMove6_2ComboBox.TabIndex = 6; this.partyMove6_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -7833,9 +8418,10 @@ this.partyMove6_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove6_3ComboBox.Enabled = false; this.partyMove6_3ComboBox.FormattingEnabled = true; - this.partyMove6_3ComboBox.Location = new System.Drawing.Point(10, 48); + this.partyMove6_3ComboBox.Location = new System.Drawing.Point(13, 59); + this.partyMove6_3ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyMove6_3ComboBox.Name = "partyMove6_3ComboBox"; - this.partyMove6_3ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove6_3ComboBox.Size = new System.Drawing.Size(132, 24); this.partyMove6_3ComboBox.TabIndex = 5; this.partyMove6_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -7845,34 +8431,37 @@ this.partyMove6_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove6_4ComboBox.Enabled = false; this.partyMove6_4ComboBox.FormattingEnabled = true; - this.partyMove6_4ComboBox.Location = new System.Drawing.Point(116, 48); + this.partyMove6_4ComboBox.Location = new System.Drawing.Point(155, 59); + this.partyMove6_4ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyMove6_4ComboBox.Name = "partyMove6_4ComboBox"; - this.partyMove6_4ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove6_4ComboBox.Size = new System.Drawing.Size(132, 24); this.partyMove6_4ComboBox.TabIndex = 7; this.partyMove6_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // // partyIV6UpDown // - this.partyIV6UpDown.Location = new System.Drawing.Point(48, 92); + this.partyIV6UpDown.Location = new System.Drawing.Point(64, 113); + this.partyIV6UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyIV6UpDown.Maximum = new decimal(new int[] { 255, 0, 0, 0}); this.partyIV6UpDown.Name = "partyIV6UpDown"; - this.partyIV6UpDown.Size = new System.Drawing.Size(49, 20); + this.partyIV6UpDown.Size = new System.Drawing.Size(65, 22); this.partyIV6UpDown.TabIndex = 5; // // partyLevel6UpDown // - this.partyLevel6UpDown.Location = new System.Drawing.Point(48, 63); + this.partyLevel6UpDown.Location = new System.Drawing.Point(64, 78); + this.partyLevel6UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyLevel6UpDown.Minimum = new decimal(new int[] { 1, 0, 0, 0}); this.partyLevel6UpDown.Name = "partyLevel6UpDown"; - this.partyLevel6UpDown.Size = new System.Drawing.Size(49, 20); + this.partyLevel6UpDown.Size = new System.Drawing.Size(65, 22); this.partyLevel6UpDown.TabIndex = 4; this.partyLevel6UpDown.Value = new decimal(new int[] { 1, @@ -7882,14 +8471,15 @@ // // partyBall6UpDown // - this.partyBall6UpDown.Location = new System.Drawing.Point(48, 121); + this.partyBall6UpDown.Location = new System.Drawing.Point(64, 149); + this.partyBall6UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyBall6UpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.partyBall6UpDown.Name = "partyBall6UpDown"; - this.partyBall6UpDown.Size = new System.Drawing.Size(49, 20); + this.partyBall6UpDown.Size = new System.Drawing.Size(65, 22); this.partyBall6UpDown.TabIndex = 3; // // partyItem6ComboBox @@ -7898,17 +8488,19 @@ this.partyItem6ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyItem6ComboBox.Enabled = false; this.partyItem6ComboBox.FormattingEnabled = true; - this.partyItem6ComboBox.Location = new System.Drawing.Point(228, 28); + this.partyItem6ComboBox.Location = new System.Drawing.Point(304, 34); + this.partyItem6ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyItem6ComboBox.Name = "partyItem6ComboBox"; - this.partyItem6ComboBox.Size = new System.Drawing.Size(103, 21); + this.partyItem6ComboBox.Size = new System.Drawing.Size(136, 24); this.partyItem6ComboBox.TabIndex = 2; this.partyItem6ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem6ComboBox_SelectedIndexChanged); // // partyPokemon6PictureBox // - this.partyPokemon6PictureBox.Location = new System.Drawing.Point(11, 23); + this.partyPokemon6PictureBox.Location = new System.Drawing.Point(15, 28); + this.partyPokemon6PictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyPokemon6PictureBox.Name = "partyPokemon6PictureBox"; - this.partyPokemon6PictureBox.Size = new System.Drawing.Size(40, 30); + this.partyPokemon6PictureBox.Size = new System.Drawing.Size(53, 37); this.partyPokemon6PictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.partyPokemon6PictureBox.TabIndex = 1; this.partyPokemon6PictureBox.TabStop = false; @@ -7918,9 +8510,10 @@ this.partyPokemon6ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.partyPokemon6ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyPokemon6ComboBox.FormattingEnabled = true; - this.partyPokemon6ComboBox.Location = new System.Drawing.Point(58, 28); + this.partyPokemon6ComboBox.Location = new System.Drawing.Point(77, 34); + this.partyPokemon6ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyPokemon6ComboBox.Name = "partyPokemon6ComboBox"; - this.partyPokemon6ComboBox.Size = new System.Drawing.Size(126, 21); + this.partyPokemon6ComboBox.Size = new System.Drawing.Size(167, 24); this.partyPokemon6ComboBox.TabIndex = 0; this.partyPokemon6ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon6ComboBox_SelectedIndexChanged); // @@ -7941,9 +8534,11 @@ this.party5GroupBox.Controls.Add(this.partyPokemon5PictureBox); this.party5GroupBox.Controls.Add(this.partyPokemon5ComboBox); this.party5GroupBox.Enabled = false; - this.party5GroupBox.Location = new System.Drawing.Point(16, 408); + this.party5GroupBox.Location = new System.Drawing.Point(21, 502); + this.party5GroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.party5GroupBox.Name = "party5GroupBox"; - this.party5GroupBox.Size = new System.Drawing.Size(343, 183); + this.party5GroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.party5GroupBox.Size = new System.Drawing.Size(457, 225); this.party5GroupBox.TabIndex = 12; this.party5GroupBox.TabStop = false; this.party5GroupBox.Text = "Pokemon 5"; @@ -7954,35 +8549,39 @@ this.partyForm5ComboBox.FormattingEnabled = true; this.partyForm5ComboBox.Items.AddRange(new object[] { "Defense form"}); - this.partyForm5ComboBox.Location = new System.Drawing.Point(228, 151); + this.partyForm5ComboBox.Location = new System.Drawing.Point(304, 186); + this.partyForm5ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyForm5ComboBox.Name = "partyForm5ComboBox"; - this.partyForm5ComboBox.Size = new System.Drawing.Size(103, 21); + this.partyForm5ComboBox.Size = new System.Drawing.Size(136, 24); this.partyForm5ComboBox.TabIndex = 19; // // partyAbility5ComboBox // this.partyAbility5ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.partyAbility5ComboBox.FormattingEnabled = true; - this.partyAbility5ComboBox.Location = new System.Drawing.Point(15, 151); + this.partyAbility5ComboBox.Location = new System.Drawing.Point(20, 186); + this.partyAbility5ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyAbility5ComboBox.Name = "partyAbility5ComboBox"; - this.partyAbility5ComboBox.Size = new System.Drawing.Size(105, 21); + this.partyAbility5ComboBox.Size = new System.Drawing.Size(139, 24); this.partyAbility5ComboBox.TabIndex = 18; // // partyGender5ComboBox // this.partyGender5ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.partyGender5ComboBox.FormattingEnabled = true; - this.partyGender5ComboBox.Location = new System.Drawing.Point(126, 151); + this.partyGender5ComboBox.Location = new System.Drawing.Point(168, 186); + this.partyGender5ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyGender5ComboBox.Name = "partyGender5ComboBox"; - this.partyGender5ComboBox.Size = new System.Drawing.Size(95, 21); + this.partyGender5ComboBox.Size = new System.Drawing.Size(125, 24); this.partyGender5ComboBox.TabIndex = 14; // // partyPokemonItemPictureBox5 // this.partyPokemonItemPictureBox5.Image = global::DSPRE.Properties.Resources.IconItem; - this.partyPokemonItemPictureBox5.Location = new System.Drawing.Point(198, 26); + this.partyPokemonItemPictureBox5.Location = new System.Drawing.Point(264, 32); + this.partyPokemonItemPictureBox5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyPokemonItemPictureBox5.Name = "partyPokemonItemPictureBox5"; - this.partyPokemonItemPictureBox5.Size = new System.Drawing.Size(24, 25); + this.partyPokemonItemPictureBox5.Size = new System.Drawing.Size(32, 31); this.partyPokemonItemPictureBox5.TabIndex = 12; this.partyPokemonItemPictureBox5.TabStop = false; this.partyPokemonItemPictureBox5.Visible = false; @@ -7990,27 +8589,30 @@ // label57 // this.label57.AutoSize = true; - this.label57.Location = new System.Drawing.Point(12, 118); + this.label57.Location = new System.Drawing.Point(16, 145); + this.label57.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label57.Name = "label57"; - this.label57.Size = new System.Drawing.Size(28, 26); + this.label57.Size = new System.Drawing.Size(35, 32); this.label57.TabIndex = 9; this.label57.Text = "Ball\r\nSeal"; // // label58 // this.label58.AutoSize = true; - this.label58.Location = new System.Drawing.Point(12, 94); + this.label58.Location = new System.Drawing.Point(16, 116); + this.label58.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label58.Name = "label58"; - this.label58.Size = new System.Drawing.Size(22, 13); + this.label58.Size = new System.Drawing.Size(26, 16); this.label58.TabIndex = 8; this.label58.Text = "DV"; // // label59 // this.label59.AutoSize = true; - this.label59.Location = new System.Drawing.Point(12, 67); + this.label59.Location = new System.Drawing.Point(16, 82); + this.label59.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label59.Name = "label59"; - this.label59.Size = new System.Drawing.Size(22, 13); + this.label59.Size = new System.Drawing.Size(24, 16); this.label59.TabIndex = 7; this.label59.Text = "Lv."; // @@ -8020,9 +8622,11 @@ this.poke5MovesGroupBox.Controls.Add(this.partyMove5_2ComboBox); this.poke5MovesGroupBox.Controls.Add(this.partyMove5_3ComboBox); this.poke5MovesGroupBox.Controls.Add(this.partyMove5_4ComboBox); - this.poke5MovesGroupBox.Location = new System.Drawing.Point(110, 57); + this.poke5MovesGroupBox.Location = new System.Drawing.Point(147, 70); + this.poke5MovesGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.poke5MovesGroupBox.Name = "poke5MovesGroupBox"; - this.poke5MovesGroupBox.Size = new System.Drawing.Size(227, 85); + this.poke5MovesGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.poke5MovesGroupBox.Size = new System.Drawing.Size(303, 105); this.poke5MovesGroupBox.TabIndex = 6; this.poke5MovesGroupBox.TabStop = false; this.poke5MovesGroupBox.Text = "Moves"; @@ -8033,9 +8637,10 @@ this.partyMove5_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove5_1ComboBox.Enabled = false; this.partyMove5_1ComboBox.FormattingEnabled = true; - this.partyMove5_1ComboBox.Location = new System.Drawing.Point(10, 21); + this.partyMove5_1ComboBox.Location = new System.Drawing.Point(13, 26); + this.partyMove5_1ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyMove5_1ComboBox.Name = "partyMove5_1ComboBox"; - this.partyMove5_1ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove5_1ComboBox.Size = new System.Drawing.Size(132, 24); this.partyMove5_1ComboBox.TabIndex = 3; this.partyMove5_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -8045,9 +8650,10 @@ this.partyMove5_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove5_2ComboBox.Enabled = false; this.partyMove5_2ComboBox.FormattingEnabled = true; - this.partyMove5_2ComboBox.Location = new System.Drawing.Point(116, 21); + this.partyMove5_2ComboBox.Location = new System.Drawing.Point(155, 26); + this.partyMove5_2ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyMove5_2ComboBox.Name = "partyMove5_2ComboBox"; - this.partyMove5_2ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove5_2ComboBox.Size = new System.Drawing.Size(132, 24); this.partyMove5_2ComboBox.TabIndex = 6; this.partyMove5_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -8057,9 +8663,10 @@ this.partyMove5_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove5_3ComboBox.Enabled = false; this.partyMove5_3ComboBox.FormattingEnabled = true; - this.partyMove5_3ComboBox.Location = new System.Drawing.Point(10, 48); + this.partyMove5_3ComboBox.Location = new System.Drawing.Point(13, 59); + this.partyMove5_3ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyMove5_3ComboBox.Name = "partyMove5_3ComboBox"; - this.partyMove5_3ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove5_3ComboBox.Size = new System.Drawing.Size(132, 24); this.partyMove5_3ComboBox.TabIndex = 5; this.partyMove5_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -8069,34 +8676,37 @@ this.partyMove5_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove5_4ComboBox.Enabled = false; this.partyMove5_4ComboBox.FormattingEnabled = true; - this.partyMove5_4ComboBox.Location = new System.Drawing.Point(116, 48); + this.partyMove5_4ComboBox.Location = new System.Drawing.Point(155, 59); + this.partyMove5_4ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyMove5_4ComboBox.Name = "partyMove5_4ComboBox"; - this.partyMove5_4ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove5_4ComboBox.Size = new System.Drawing.Size(132, 24); this.partyMove5_4ComboBox.TabIndex = 7; this.partyMove5_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // // partyIV5UpDown // - this.partyIV5UpDown.Location = new System.Drawing.Point(48, 92); + this.partyIV5UpDown.Location = new System.Drawing.Point(64, 113); + this.partyIV5UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyIV5UpDown.Maximum = new decimal(new int[] { 255, 0, 0, 0}); this.partyIV5UpDown.Name = "partyIV5UpDown"; - this.partyIV5UpDown.Size = new System.Drawing.Size(49, 20); + this.partyIV5UpDown.Size = new System.Drawing.Size(65, 22); this.partyIV5UpDown.TabIndex = 5; // // partyLevel5UpDown // - this.partyLevel5UpDown.Location = new System.Drawing.Point(48, 63); + this.partyLevel5UpDown.Location = new System.Drawing.Point(64, 78); + this.partyLevel5UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyLevel5UpDown.Minimum = new decimal(new int[] { 1, 0, 0, 0}); this.partyLevel5UpDown.Name = "partyLevel5UpDown"; - this.partyLevel5UpDown.Size = new System.Drawing.Size(49, 20); + this.partyLevel5UpDown.Size = new System.Drawing.Size(65, 22); this.partyLevel5UpDown.TabIndex = 4; this.partyLevel5UpDown.Value = new decimal(new int[] { 1, @@ -8106,14 +8716,15 @@ // // partyBall5UpDown // - this.partyBall5UpDown.Location = new System.Drawing.Point(48, 121); + this.partyBall5UpDown.Location = new System.Drawing.Point(64, 149); + this.partyBall5UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyBall5UpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.partyBall5UpDown.Name = "partyBall5UpDown"; - this.partyBall5UpDown.Size = new System.Drawing.Size(49, 20); + this.partyBall5UpDown.Size = new System.Drawing.Size(65, 22); this.partyBall5UpDown.TabIndex = 3; // // partyItem5ComboBox @@ -8122,17 +8733,19 @@ this.partyItem5ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyItem5ComboBox.Enabled = false; this.partyItem5ComboBox.FormattingEnabled = true; - this.partyItem5ComboBox.Location = new System.Drawing.Point(228, 28); + this.partyItem5ComboBox.Location = new System.Drawing.Point(304, 34); + this.partyItem5ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyItem5ComboBox.Name = "partyItem5ComboBox"; - this.partyItem5ComboBox.Size = new System.Drawing.Size(103, 21); + this.partyItem5ComboBox.Size = new System.Drawing.Size(136, 24); this.partyItem5ComboBox.TabIndex = 2; this.partyItem5ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem5ComboBox_SelectedIndexChanged); // // partyPokemon5PictureBox // - this.partyPokemon5PictureBox.Location = new System.Drawing.Point(11, 23); + this.partyPokemon5PictureBox.Location = new System.Drawing.Point(15, 28); + this.partyPokemon5PictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyPokemon5PictureBox.Name = "partyPokemon5PictureBox"; - this.partyPokemon5PictureBox.Size = new System.Drawing.Size(40, 30); + this.partyPokemon5PictureBox.Size = new System.Drawing.Size(53, 37); this.partyPokemon5PictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.partyPokemon5PictureBox.TabIndex = 1; this.partyPokemon5PictureBox.TabStop = false; @@ -8142,9 +8755,10 @@ this.partyPokemon5ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.partyPokemon5ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyPokemon5ComboBox.FormattingEnabled = true; - this.partyPokemon5ComboBox.Location = new System.Drawing.Point(58, 28); + this.partyPokemon5ComboBox.Location = new System.Drawing.Point(77, 34); + this.partyPokemon5ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyPokemon5ComboBox.Name = "partyPokemon5ComboBox"; - this.partyPokemon5ComboBox.Size = new System.Drawing.Size(126, 21); + this.partyPokemon5ComboBox.Size = new System.Drawing.Size(167, 24); this.partyPokemon5ComboBox.TabIndex = 0; this.partyPokemon5ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon5ComboBox_SelectedIndexChanged); // @@ -8165,9 +8779,11 @@ this.party4GroupBox.Controls.Add(this.partyPokemon4PictureBox); this.party4GroupBox.Controls.Add(this.partyPokemon4ComboBox); this.party4GroupBox.Enabled = false; - this.party4GroupBox.Location = new System.Drawing.Point(371, 223); + this.party4GroupBox.Location = new System.Drawing.Point(495, 274); + this.party4GroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.party4GroupBox.Name = "party4GroupBox"; - this.party4GroupBox.Size = new System.Drawing.Size(343, 183); + this.party4GroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.party4GroupBox.Size = new System.Drawing.Size(457, 225); this.party4GroupBox.TabIndex = 11; this.party4GroupBox.TabStop = false; this.party4GroupBox.Text = "Pokemon 4"; @@ -8178,35 +8794,39 @@ this.partyForm4ComboBox.FormattingEnabled = true; this.partyForm4ComboBox.Items.AddRange(new object[] { "Defense form"}); - this.partyForm4ComboBox.Location = new System.Drawing.Point(228, 151); + this.partyForm4ComboBox.Location = new System.Drawing.Point(304, 186); + this.partyForm4ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyForm4ComboBox.Name = "partyForm4ComboBox"; - this.partyForm4ComboBox.Size = new System.Drawing.Size(103, 21); + this.partyForm4ComboBox.Size = new System.Drawing.Size(136, 24); this.partyForm4ComboBox.TabIndex = 18; // // partyAbility4ComboBox // this.partyAbility4ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.partyAbility4ComboBox.FormattingEnabled = true; - this.partyAbility4ComboBox.Location = new System.Drawing.Point(15, 151); + this.partyAbility4ComboBox.Location = new System.Drawing.Point(20, 186); + this.partyAbility4ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyAbility4ComboBox.Name = "partyAbility4ComboBox"; - this.partyAbility4ComboBox.Size = new System.Drawing.Size(105, 21); + this.partyAbility4ComboBox.Size = new System.Drawing.Size(139, 24); this.partyAbility4ComboBox.TabIndex = 17; // // partyGender4ComboBox // this.partyGender4ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.partyGender4ComboBox.FormattingEnabled = true; - this.partyGender4ComboBox.Location = new System.Drawing.Point(126, 151); + this.partyGender4ComboBox.Location = new System.Drawing.Point(168, 186); + this.partyGender4ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyGender4ComboBox.Name = "partyGender4ComboBox"; - this.partyGender4ComboBox.Size = new System.Drawing.Size(95, 21); + this.partyGender4ComboBox.Size = new System.Drawing.Size(125, 24); this.partyGender4ComboBox.TabIndex = 16; // // partyPokemonItemPictureBox4 // this.partyPokemonItemPictureBox4.Image = global::DSPRE.Properties.Resources.IconItem; - this.partyPokemonItemPictureBox4.Location = new System.Drawing.Point(198, 26); + this.partyPokemonItemPictureBox4.Location = new System.Drawing.Point(264, 32); + this.partyPokemonItemPictureBox4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyPokemonItemPictureBox4.Name = "partyPokemonItemPictureBox4"; - this.partyPokemonItemPictureBox4.Size = new System.Drawing.Size(24, 25); + this.partyPokemonItemPictureBox4.Size = new System.Drawing.Size(32, 31); this.partyPokemonItemPictureBox4.TabIndex = 14; this.partyPokemonItemPictureBox4.TabStop = false; this.partyPokemonItemPictureBox4.Visible = false; @@ -8214,27 +8834,30 @@ // label54 // this.label54.AutoSize = true; - this.label54.Location = new System.Drawing.Point(12, 118); + this.label54.Location = new System.Drawing.Point(16, 145); + this.label54.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label54.Name = "label54"; - this.label54.Size = new System.Drawing.Size(28, 26); + this.label54.Size = new System.Drawing.Size(35, 32); this.label54.TabIndex = 9; this.label54.Text = "Ball\r\nSeal"; // // label55 // this.label55.AutoSize = true; - this.label55.Location = new System.Drawing.Point(12, 94); + this.label55.Location = new System.Drawing.Point(16, 116); + this.label55.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label55.Name = "label55"; - this.label55.Size = new System.Drawing.Size(22, 13); + this.label55.Size = new System.Drawing.Size(26, 16); this.label55.TabIndex = 8; this.label55.Text = "DV"; // // label56 // this.label56.AutoSize = true; - this.label56.Location = new System.Drawing.Point(12, 67); + this.label56.Location = new System.Drawing.Point(16, 82); + this.label56.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label56.Name = "label56"; - this.label56.Size = new System.Drawing.Size(22, 13); + this.label56.Size = new System.Drawing.Size(24, 16); this.label56.TabIndex = 7; this.label56.Text = "Lv."; // @@ -8244,9 +8867,11 @@ this.poke4MovesGroupBox.Controls.Add(this.partyMove4_2ComboBox); this.poke4MovesGroupBox.Controls.Add(this.partyMove4_3ComboBox); this.poke4MovesGroupBox.Controls.Add(this.partyMove4_4ComboBox); - this.poke4MovesGroupBox.Location = new System.Drawing.Point(110, 57); + this.poke4MovesGroupBox.Location = new System.Drawing.Point(147, 70); + this.poke4MovesGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.poke4MovesGroupBox.Name = "poke4MovesGroupBox"; - this.poke4MovesGroupBox.Size = new System.Drawing.Size(227, 85); + this.poke4MovesGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.poke4MovesGroupBox.Size = new System.Drawing.Size(303, 105); this.poke4MovesGroupBox.TabIndex = 6; this.poke4MovesGroupBox.TabStop = false; this.poke4MovesGroupBox.Text = "Moves"; @@ -8257,9 +8882,10 @@ this.partyMove4_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove4_1ComboBox.Enabled = false; this.partyMove4_1ComboBox.FormattingEnabled = true; - this.partyMove4_1ComboBox.Location = new System.Drawing.Point(10, 21); + this.partyMove4_1ComboBox.Location = new System.Drawing.Point(13, 26); + this.partyMove4_1ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyMove4_1ComboBox.Name = "partyMove4_1ComboBox"; - this.partyMove4_1ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove4_1ComboBox.Size = new System.Drawing.Size(132, 24); this.partyMove4_1ComboBox.TabIndex = 3; this.partyMove4_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -8269,9 +8895,10 @@ this.partyMove4_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove4_2ComboBox.Enabled = false; this.partyMove4_2ComboBox.FormattingEnabled = true; - this.partyMove4_2ComboBox.Location = new System.Drawing.Point(116, 21); + this.partyMove4_2ComboBox.Location = new System.Drawing.Point(155, 26); + this.partyMove4_2ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyMove4_2ComboBox.Name = "partyMove4_2ComboBox"; - this.partyMove4_2ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove4_2ComboBox.Size = new System.Drawing.Size(132, 24); this.partyMove4_2ComboBox.TabIndex = 6; this.partyMove4_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -8281,9 +8908,10 @@ this.partyMove4_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove4_3ComboBox.Enabled = false; this.partyMove4_3ComboBox.FormattingEnabled = true; - this.partyMove4_3ComboBox.Location = new System.Drawing.Point(10, 48); + this.partyMove4_3ComboBox.Location = new System.Drawing.Point(13, 59); + this.partyMove4_3ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyMove4_3ComboBox.Name = "partyMove4_3ComboBox"; - this.partyMove4_3ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove4_3ComboBox.Size = new System.Drawing.Size(132, 24); this.partyMove4_3ComboBox.TabIndex = 5; this.partyMove4_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -8293,34 +8921,37 @@ this.partyMove4_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove4_4ComboBox.Enabled = false; this.partyMove4_4ComboBox.FormattingEnabled = true; - this.partyMove4_4ComboBox.Location = new System.Drawing.Point(116, 48); + this.partyMove4_4ComboBox.Location = new System.Drawing.Point(155, 59); + this.partyMove4_4ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyMove4_4ComboBox.Name = "partyMove4_4ComboBox"; - this.partyMove4_4ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove4_4ComboBox.Size = new System.Drawing.Size(132, 24); this.partyMove4_4ComboBox.TabIndex = 7; this.partyMove4_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // // partyIV4UpDown // - this.partyIV4UpDown.Location = new System.Drawing.Point(48, 92); + this.partyIV4UpDown.Location = new System.Drawing.Point(64, 113); + this.partyIV4UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyIV4UpDown.Maximum = new decimal(new int[] { 255, 0, 0, 0}); this.partyIV4UpDown.Name = "partyIV4UpDown"; - this.partyIV4UpDown.Size = new System.Drawing.Size(49, 20); + this.partyIV4UpDown.Size = new System.Drawing.Size(65, 22); this.partyIV4UpDown.TabIndex = 5; // // partyLevel4UpDown // - this.partyLevel4UpDown.Location = new System.Drawing.Point(48, 63); + this.partyLevel4UpDown.Location = new System.Drawing.Point(64, 78); + this.partyLevel4UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyLevel4UpDown.Minimum = new decimal(new int[] { 1, 0, 0, 0}); this.partyLevel4UpDown.Name = "partyLevel4UpDown"; - this.partyLevel4UpDown.Size = new System.Drawing.Size(49, 20); + this.partyLevel4UpDown.Size = new System.Drawing.Size(65, 22); this.partyLevel4UpDown.TabIndex = 4; this.partyLevel4UpDown.Value = new decimal(new int[] { 1, @@ -8330,14 +8961,15 @@ // // partyBall4UpDown // - this.partyBall4UpDown.Location = new System.Drawing.Point(48, 121); + this.partyBall4UpDown.Location = new System.Drawing.Point(64, 149); + this.partyBall4UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyBall4UpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.partyBall4UpDown.Name = "partyBall4UpDown"; - this.partyBall4UpDown.Size = new System.Drawing.Size(49, 20); + this.partyBall4UpDown.Size = new System.Drawing.Size(65, 22); this.partyBall4UpDown.TabIndex = 3; // // partyItem4ComboBox @@ -8346,17 +8978,19 @@ this.partyItem4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyItem4ComboBox.Enabled = false; this.partyItem4ComboBox.FormattingEnabled = true; - this.partyItem4ComboBox.Location = new System.Drawing.Point(228, 28); + this.partyItem4ComboBox.Location = new System.Drawing.Point(304, 34); + this.partyItem4ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyItem4ComboBox.Name = "partyItem4ComboBox"; - this.partyItem4ComboBox.Size = new System.Drawing.Size(103, 21); + this.partyItem4ComboBox.Size = new System.Drawing.Size(136, 24); this.partyItem4ComboBox.TabIndex = 2; this.partyItem4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem4ComboBox_SelectedIndexChanged); // // partyPokemon4PictureBox // - this.partyPokemon4PictureBox.Location = new System.Drawing.Point(11, 23); + this.partyPokemon4PictureBox.Location = new System.Drawing.Point(15, 28); + this.partyPokemon4PictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyPokemon4PictureBox.Name = "partyPokemon4PictureBox"; - this.partyPokemon4PictureBox.Size = new System.Drawing.Size(40, 30); + this.partyPokemon4PictureBox.Size = new System.Drawing.Size(53, 37); this.partyPokemon4PictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.partyPokemon4PictureBox.TabIndex = 1; this.partyPokemon4PictureBox.TabStop = false; @@ -8366,9 +9000,10 @@ this.partyPokemon4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.partyPokemon4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyPokemon4ComboBox.FormattingEnabled = true; - this.partyPokemon4ComboBox.Location = new System.Drawing.Point(58, 28); + this.partyPokemon4ComboBox.Location = new System.Drawing.Point(77, 34); + this.partyPokemon4ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyPokemon4ComboBox.Name = "partyPokemon4ComboBox"; - this.partyPokemon4ComboBox.Size = new System.Drawing.Size(126, 21); + this.partyPokemon4ComboBox.Size = new System.Drawing.Size(167, 24); this.partyPokemon4ComboBox.TabIndex = 0; this.partyPokemon4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon4ComboBox_SelectedIndexChanged); // @@ -8389,9 +9024,11 @@ this.party3GroupBox.Controls.Add(this.partyPokemon3PictureBox); this.party3GroupBox.Controls.Add(this.partyPokemon3ComboBox); this.party3GroupBox.Enabled = false; - this.party3GroupBox.Location = new System.Drawing.Point(16, 223); + this.party3GroupBox.Location = new System.Drawing.Point(21, 274); + this.party3GroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.party3GroupBox.Name = "party3GroupBox"; - this.party3GroupBox.Size = new System.Drawing.Size(343, 183); + this.party3GroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.party3GroupBox.Size = new System.Drawing.Size(457, 225); this.party3GroupBox.TabIndex = 10; this.party3GroupBox.TabStop = false; this.party3GroupBox.Text = "Pokemon 3"; @@ -8402,35 +9039,39 @@ this.partyForm3ComboBox.FormattingEnabled = true; this.partyForm3ComboBox.Items.AddRange(new object[] { "Defense form"}); - this.partyForm3ComboBox.Location = new System.Drawing.Point(228, 151); + this.partyForm3ComboBox.Location = new System.Drawing.Point(304, 186); + this.partyForm3ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyForm3ComboBox.Name = "partyForm3ComboBox"; - this.partyForm3ComboBox.Size = new System.Drawing.Size(103, 21); + this.partyForm3ComboBox.Size = new System.Drawing.Size(136, 24); this.partyForm3ComboBox.TabIndex = 15; // // partyAbility3ComboBox // this.partyAbility3ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.partyAbility3ComboBox.FormattingEnabled = true; - this.partyAbility3ComboBox.Location = new System.Drawing.Point(15, 151); + this.partyAbility3ComboBox.Location = new System.Drawing.Point(20, 186); + this.partyAbility3ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyAbility3ComboBox.Name = "partyAbility3ComboBox"; - this.partyAbility3ComboBox.Size = new System.Drawing.Size(105, 21); + this.partyAbility3ComboBox.Size = new System.Drawing.Size(139, 24); this.partyAbility3ComboBox.TabIndex = 14; // // partyGender3ComboBox // this.partyGender3ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.partyGender3ComboBox.FormattingEnabled = true; - this.partyGender3ComboBox.Location = new System.Drawing.Point(126, 151); + this.partyGender3ComboBox.Location = new System.Drawing.Point(168, 186); + this.partyGender3ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyGender3ComboBox.Name = "partyGender3ComboBox"; - this.partyGender3ComboBox.Size = new System.Drawing.Size(95, 21); + this.partyGender3ComboBox.Size = new System.Drawing.Size(125, 24); this.partyGender3ComboBox.TabIndex = 13; // // partyPokemonItemPictureBox3 // this.partyPokemonItemPictureBox3.Image = global::DSPRE.Properties.Resources.IconItem; - this.partyPokemonItemPictureBox3.Location = new System.Drawing.Point(198, 26); + this.partyPokemonItemPictureBox3.Location = new System.Drawing.Point(264, 32); + this.partyPokemonItemPictureBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyPokemonItemPictureBox3.Name = "partyPokemonItemPictureBox3"; - this.partyPokemonItemPictureBox3.Size = new System.Drawing.Size(24, 25); + this.partyPokemonItemPictureBox3.Size = new System.Drawing.Size(32, 31); this.partyPokemonItemPictureBox3.TabIndex = 11; this.partyPokemonItemPictureBox3.TabStop = false; this.partyPokemonItemPictureBox3.Visible = false; @@ -8438,27 +9079,30 @@ // label51 // this.label51.AutoSize = true; - this.label51.Location = new System.Drawing.Point(12, 118); + this.label51.Location = new System.Drawing.Point(16, 145); + this.label51.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label51.Name = "label51"; - this.label51.Size = new System.Drawing.Size(28, 26); + this.label51.Size = new System.Drawing.Size(35, 32); this.label51.TabIndex = 9; this.label51.Text = "Ball\r\nSeal"; // // label52 // this.label52.AutoSize = true; - this.label52.Location = new System.Drawing.Point(12, 94); + this.label52.Location = new System.Drawing.Point(16, 116); + this.label52.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label52.Name = "label52"; - this.label52.Size = new System.Drawing.Size(22, 13); + this.label52.Size = new System.Drawing.Size(26, 16); this.label52.TabIndex = 8; this.label52.Text = "DV"; // // label53 // this.label53.AutoSize = true; - this.label53.Location = new System.Drawing.Point(12, 67); + this.label53.Location = new System.Drawing.Point(16, 82); + this.label53.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label53.Name = "label53"; - this.label53.Size = new System.Drawing.Size(22, 13); + this.label53.Size = new System.Drawing.Size(24, 16); this.label53.TabIndex = 7; this.label53.Text = "Lv."; // @@ -8468,9 +9112,11 @@ this.poke3MovesGroupBox.Controls.Add(this.partyMove3_2ComboBox); this.poke3MovesGroupBox.Controls.Add(this.partyMove3_3ComboBox); this.poke3MovesGroupBox.Controls.Add(this.partyMove3_4ComboBox); - this.poke3MovesGroupBox.Location = new System.Drawing.Point(110, 57); + this.poke3MovesGroupBox.Location = new System.Drawing.Point(147, 70); + this.poke3MovesGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.poke3MovesGroupBox.Name = "poke3MovesGroupBox"; - this.poke3MovesGroupBox.Size = new System.Drawing.Size(227, 85); + this.poke3MovesGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.poke3MovesGroupBox.Size = new System.Drawing.Size(303, 105); this.poke3MovesGroupBox.TabIndex = 6; this.poke3MovesGroupBox.TabStop = false; this.poke3MovesGroupBox.Text = "Moves"; @@ -8481,9 +9127,10 @@ this.partyMove3_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove3_1ComboBox.Enabled = false; this.partyMove3_1ComboBox.FormattingEnabled = true; - this.partyMove3_1ComboBox.Location = new System.Drawing.Point(10, 21); + this.partyMove3_1ComboBox.Location = new System.Drawing.Point(13, 26); + this.partyMove3_1ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyMove3_1ComboBox.Name = "partyMove3_1ComboBox"; - this.partyMove3_1ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove3_1ComboBox.Size = new System.Drawing.Size(132, 24); this.partyMove3_1ComboBox.TabIndex = 3; this.partyMove3_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -8493,9 +9140,10 @@ this.partyMove3_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove3_2ComboBox.Enabled = false; this.partyMove3_2ComboBox.FormattingEnabled = true; - this.partyMove3_2ComboBox.Location = new System.Drawing.Point(116, 21); + this.partyMove3_2ComboBox.Location = new System.Drawing.Point(155, 26); + this.partyMove3_2ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyMove3_2ComboBox.Name = "partyMove3_2ComboBox"; - this.partyMove3_2ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove3_2ComboBox.Size = new System.Drawing.Size(132, 24); this.partyMove3_2ComboBox.TabIndex = 6; this.partyMove3_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -8505,9 +9153,10 @@ this.partyMove3_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove3_3ComboBox.Enabled = false; this.partyMove3_3ComboBox.FormattingEnabled = true; - this.partyMove3_3ComboBox.Location = new System.Drawing.Point(10, 48); + this.partyMove3_3ComboBox.Location = new System.Drawing.Point(13, 59); + this.partyMove3_3ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyMove3_3ComboBox.Name = "partyMove3_3ComboBox"; - this.partyMove3_3ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove3_3ComboBox.Size = new System.Drawing.Size(132, 24); this.partyMove3_3ComboBox.TabIndex = 5; this.partyMove3_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -8517,34 +9166,37 @@ this.partyMove3_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove3_4ComboBox.Enabled = false; this.partyMove3_4ComboBox.FormattingEnabled = true; - this.partyMove3_4ComboBox.Location = new System.Drawing.Point(116, 48); + this.partyMove3_4ComboBox.Location = new System.Drawing.Point(155, 59); + this.partyMove3_4ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyMove3_4ComboBox.Name = "partyMove3_4ComboBox"; - this.partyMove3_4ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove3_4ComboBox.Size = new System.Drawing.Size(132, 24); this.partyMove3_4ComboBox.TabIndex = 7; this.partyMove3_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // // partyIV3UpDown // - this.partyIV3UpDown.Location = new System.Drawing.Point(48, 92); + this.partyIV3UpDown.Location = new System.Drawing.Point(64, 113); + this.partyIV3UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyIV3UpDown.Maximum = new decimal(new int[] { 255, 0, 0, 0}); this.partyIV3UpDown.Name = "partyIV3UpDown"; - this.partyIV3UpDown.Size = new System.Drawing.Size(49, 20); + this.partyIV3UpDown.Size = new System.Drawing.Size(65, 22); this.partyIV3UpDown.TabIndex = 5; // // partyLevel3UpDown // - this.partyLevel3UpDown.Location = new System.Drawing.Point(48, 63); + this.partyLevel3UpDown.Location = new System.Drawing.Point(64, 78); + this.partyLevel3UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyLevel3UpDown.Minimum = new decimal(new int[] { 1, 0, 0, 0}); this.partyLevel3UpDown.Name = "partyLevel3UpDown"; - this.partyLevel3UpDown.Size = new System.Drawing.Size(49, 20); + this.partyLevel3UpDown.Size = new System.Drawing.Size(65, 22); this.partyLevel3UpDown.TabIndex = 4; this.partyLevel3UpDown.Value = new decimal(new int[] { 1, @@ -8554,14 +9206,15 @@ // // partyBall3UpDown // - this.partyBall3UpDown.Location = new System.Drawing.Point(48, 121); + this.partyBall3UpDown.Location = new System.Drawing.Point(64, 149); + this.partyBall3UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyBall3UpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.partyBall3UpDown.Name = "partyBall3UpDown"; - this.partyBall3UpDown.Size = new System.Drawing.Size(49, 20); + this.partyBall3UpDown.Size = new System.Drawing.Size(65, 22); this.partyBall3UpDown.TabIndex = 3; // // partyItem3ComboBox @@ -8570,17 +9223,19 @@ this.partyItem3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyItem3ComboBox.Enabled = false; this.partyItem3ComboBox.FormattingEnabled = true; - this.partyItem3ComboBox.Location = new System.Drawing.Point(228, 28); + this.partyItem3ComboBox.Location = new System.Drawing.Point(304, 34); + this.partyItem3ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyItem3ComboBox.Name = "partyItem3ComboBox"; - this.partyItem3ComboBox.Size = new System.Drawing.Size(103, 21); + this.partyItem3ComboBox.Size = new System.Drawing.Size(136, 24); this.partyItem3ComboBox.TabIndex = 2; this.partyItem3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem3ComboBox_SelectedIndexChanged); // // partyPokemon3PictureBox // - this.partyPokemon3PictureBox.Location = new System.Drawing.Point(11, 23); + this.partyPokemon3PictureBox.Location = new System.Drawing.Point(15, 28); + this.partyPokemon3PictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyPokemon3PictureBox.Name = "partyPokemon3PictureBox"; - this.partyPokemon3PictureBox.Size = new System.Drawing.Size(40, 30); + this.partyPokemon3PictureBox.Size = new System.Drawing.Size(53, 37); this.partyPokemon3PictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.partyPokemon3PictureBox.TabIndex = 1; this.partyPokemon3PictureBox.TabStop = false; @@ -8590,9 +9245,10 @@ this.partyPokemon3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.partyPokemon3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyPokemon3ComboBox.FormattingEnabled = true; - this.partyPokemon3ComboBox.Location = new System.Drawing.Point(58, 28); + this.partyPokemon3ComboBox.Location = new System.Drawing.Point(77, 34); + this.partyPokemon3ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyPokemon3ComboBox.Name = "partyPokemon3ComboBox"; - this.partyPokemon3ComboBox.Size = new System.Drawing.Size(126, 21); + this.partyPokemon3ComboBox.Size = new System.Drawing.Size(167, 24); this.partyPokemon3ComboBox.TabIndex = 0; this.partyPokemon3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon3ComboBox_SelectedIndexChanged); // @@ -8613,9 +9269,11 @@ this.party2GroupBox.Controls.Add(this.partyPokemon2PictureBox); this.party2GroupBox.Controls.Add(this.partyPokemon2ComboBox); this.party2GroupBox.Enabled = false; - this.party2GroupBox.Location = new System.Drawing.Point(371, 37); + this.party2GroupBox.Location = new System.Drawing.Point(495, 46); + this.party2GroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.party2GroupBox.Name = "party2GroupBox"; - this.party2GroupBox.Size = new System.Drawing.Size(343, 183); + this.party2GroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.party2GroupBox.Size = new System.Drawing.Size(457, 225); this.party2GroupBox.TabIndex = 10; this.party2GroupBox.TabStop = false; this.party2GroupBox.Text = "Pokemon 2"; @@ -8626,35 +9284,39 @@ this.partyForm2ComboBox.FormattingEnabled = true; this.partyForm2ComboBox.Items.AddRange(new object[] { "Defense form"}); - this.partyForm2ComboBox.Location = new System.Drawing.Point(228, 151); + this.partyForm2ComboBox.Location = new System.Drawing.Point(304, 186); + this.partyForm2ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyForm2ComboBox.Name = "partyForm2ComboBox"; - this.partyForm2ComboBox.Size = new System.Drawing.Size(103, 21); + this.partyForm2ComboBox.Size = new System.Drawing.Size(136, 24); this.partyForm2ComboBox.TabIndex = 20; // // partyAbility2ComboBox // this.partyAbility2ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.partyAbility2ComboBox.FormattingEnabled = true; - this.partyAbility2ComboBox.Location = new System.Drawing.Point(15, 151); + this.partyAbility2ComboBox.Location = new System.Drawing.Point(20, 186); + this.partyAbility2ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyAbility2ComboBox.Name = "partyAbility2ComboBox"; - this.partyAbility2ComboBox.Size = new System.Drawing.Size(105, 21); + this.partyAbility2ComboBox.Size = new System.Drawing.Size(139, 24); this.partyAbility2ComboBox.TabIndex = 18; // // partyGender2ComboBox // this.partyGender2ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.partyGender2ComboBox.FormattingEnabled = true; - this.partyGender2ComboBox.Location = new System.Drawing.Point(126, 151); + this.partyGender2ComboBox.Location = new System.Drawing.Point(168, 186); + this.partyGender2ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyGender2ComboBox.Name = "partyGender2ComboBox"; - this.partyGender2ComboBox.Size = new System.Drawing.Size(95, 21); + this.partyGender2ComboBox.Size = new System.Drawing.Size(125, 24); this.partyGender2ComboBox.TabIndex = 17; // // partyPokemonItemPictureBox2 // this.partyPokemonItemPictureBox2.Image = global::DSPRE.Properties.Resources.IconItem; - this.partyPokemonItemPictureBox2.Location = new System.Drawing.Point(198, 26); + this.partyPokemonItemPictureBox2.Location = new System.Drawing.Point(264, 32); + this.partyPokemonItemPictureBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyPokemonItemPictureBox2.Name = "partyPokemonItemPictureBox2"; - this.partyPokemonItemPictureBox2.Size = new System.Drawing.Size(24, 25); + this.partyPokemonItemPictureBox2.Size = new System.Drawing.Size(32, 31); this.partyPokemonItemPictureBox2.TabIndex = 15; this.partyPokemonItemPictureBox2.TabStop = false; this.partyPokemonItemPictureBox2.Visible = false; @@ -8662,27 +9324,30 @@ // label48 // this.label48.AutoSize = true; - this.label48.Location = new System.Drawing.Point(12, 118); + this.label48.Location = new System.Drawing.Point(16, 145); + this.label48.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label48.Name = "label48"; - this.label48.Size = new System.Drawing.Size(28, 26); + this.label48.Size = new System.Drawing.Size(35, 32); this.label48.TabIndex = 9; this.label48.Text = "Ball\r\nSeal"; // // label49 // this.label49.AutoSize = true; - this.label49.Location = new System.Drawing.Point(12, 94); + this.label49.Location = new System.Drawing.Point(16, 116); + this.label49.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label49.Name = "label49"; - this.label49.Size = new System.Drawing.Size(22, 13); + this.label49.Size = new System.Drawing.Size(26, 16); this.label49.TabIndex = 8; this.label49.Text = "DV"; // // label50 // this.label50.AutoSize = true; - this.label50.Location = new System.Drawing.Point(12, 67); + this.label50.Location = new System.Drawing.Point(16, 82); + this.label50.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label50.Name = "label50"; - this.label50.Size = new System.Drawing.Size(22, 13); + this.label50.Size = new System.Drawing.Size(24, 16); this.label50.TabIndex = 7; this.label50.Text = "Lv."; // @@ -8692,9 +9357,11 @@ this.poke2MovesGroupBox.Controls.Add(this.partyMove2_2ComboBox); this.poke2MovesGroupBox.Controls.Add(this.partyMove2_3ComboBox); this.poke2MovesGroupBox.Controls.Add(this.partyMove2_4ComboBox); - this.poke2MovesGroupBox.Location = new System.Drawing.Point(110, 57); + this.poke2MovesGroupBox.Location = new System.Drawing.Point(147, 70); + this.poke2MovesGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.poke2MovesGroupBox.Name = "poke2MovesGroupBox"; - this.poke2MovesGroupBox.Size = new System.Drawing.Size(227, 85); + this.poke2MovesGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.poke2MovesGroupBox.Size = new System.Drawing.Size(303, 105); this.poke2MovesGroupBox.TabIndex = 6; this.poke2MovesGroupBox.TabStop = false; this.poke2MovesGroupBox.Text = "Moves"; @@ -8705,9 +9372,10 @@ this.partyMove2_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove2_1ComboBox.Enabled = false; this.partyMove2_1ComboBox.FormattingEnabled = true; - this.partyMove2_1ComboBox.Location = new System.Drawing.Point(10, 21); + this.partyMove2_1ComboBox.Location = new System.Drawing.Point(13, 26); + this.partyMove2_1ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyMove2_1ComboBox.Name = "partyMove2_1ComboBox"; - this.partyMove2_1ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove2_1ComboBox.Size = new System.Drawing.Size(132, 24); this.partyMove2_1ComboBox.TabIndex = 3; this.partyMove2_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -8717,9 +9385,10 @@ this.partyMove2_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove2_2ComboBox.Enabled = false; this.partyMove2_2ComboBox.FormattingEnabled = true; - this.partyMove2_2ComboBox.Location = new System.Drawing.Point(116, 21); + this.partyMove2_2ComboBox.Location = new System.Drawing.Point(155, 26); + this.partyMove2_2ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyMove2_2ComboBox.Name = "partyMove2_2ComboBox"; - this.partyMove2_2ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove2_2ComboBox.Size = new System.Drawing.Size(132, 24); this.partyMove2_2ComboBox.TabIndex = 6; this.partyMove2_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -8729,9 +9398,10 @@ this.partyMove2_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove2_3ComboBox.Enabled = false; this.partyMove2_3ComboBox.FormattingEnabled = true; - this.partyMove2_3ComboBox.Location = new System.Drawing.Point(10, 48); + this.partyMove2_3ComboBox.Location = new System.Drawing.Point(13, 59); + this.partyMove2_3ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyMove2_3ComboBox.Name = "partyMove2_3ComboBox"; - this.partyMove2_3ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove2_3ComboBox.Size = new System.Drawing.Size(132, 24); this.partyMove2_3ComboBox.TabIndex = 5; this.partyMove2_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -8741,34 +9411,37 @@ this.partyMove2_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove2_4ComboBox.Enabled = false; this.partyMove2_4ComboBox.FormattingEnabled = true; - this.partyMove2_4ComboBox.Location = new System.Drawing.Point(116, 48); + this.partyMove2_4ComboBox.Location = new System.Drawing.Point(155, 59); + this.partyMove2_4ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyMove2_4ComboBox.Name = "partyMove2_4ComboBox"; - this.partyMove2_4ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove2_4ComboBox.Size = new System.Drawing.Size(132, 24); this.partyMove2_4ComboBox.TabIndex = 7; this.partyMove2_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // // partyIV2UpDown // - this.partyIV2UpDown.Location = new System.Drawing.Point(48, 92); + this.partyIV2UpDown.Location = new System.Drawing.Point(64, 113); + this.partyIV2UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyIV2UpDown.Maximum = new decimal(new int[] { 255, 0, 0, 0}); this.partyIV2UpDown.Name = "partyIV2UpDown"; - this.partyIV2UpDown.Size = new System.Drawing.Size(49, 20); + this.partyIV2UpDown.Size = new System.Drawing.Size(65, 22); this.partyIV2UpDown.TabIndex = 5; // // partyLevel2UpDown // - this.partyLevel2UpDown.Location = new System.Drawing.Point(48, 63); + this.partyLevel2UpDown.Location = new System.Drawing.Point(64, 78); + this.partyLevel2UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyLevel2UpDown.Minimum = new decimal(new int[] { 1, 0, 0, 0}); this.partyLevel2UpDown.Name = "partyLevel2UpDown"; - this.partyLevel2UpDown.Size = new System.Drawing.Size(49, 20); + this.partyLevel2UpDown.Size = new System.Drawing.Size(65, 22); this.partyLevel2UpDown.TabIndex = 4; this.partyLevel2UpDown.Value = new decimal(new int[] { 1, @@ -8778,14 +9451,15 @@ // // partyBall2UpDown // - this.partyBall2UpDown.Location = new System.Drawing.Point(48, 121); + this.partyBall2UpDown.Location = new System.Drawing.Point(64, 149); + this.partyBall2UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyBall2UpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.partyBall2UpDown.Name = "partyBall2UpDown"; - this.partyBall2UpDown.Size = new System.Drawing.Size(49, 20); + this.partyBall2UpDown.Size = new System.Drawing.Size(65, 22); this.partyBall2UpDown.TabIndex = 3; // // partyItem2ComboBox @@ -8794,17 +9468,19 @@ this.partyItem2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyItem2ComboBox.Enabled = false; this.partyItem2ComboBox.FormattingEnabled = true; - this.partyItem2ComboBox.Location = new System.Drawing.Point(228, 28); + this.partyItem2ComboBox.Location = new System.Drawing.Point(304, 34); + this.partyItem2ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyItem2ComboBox.Name = "partyItem2ComboBox"; - this.partyItem2ComboBox.Size = new System.Drawing.Size(103, 21); + this.partyItem2ComboBox.Size = new System.Drawing.Size(136, 24); this.partyItem2ComboBox.TabIndex = 2; this.partyItem2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem2ComboBox_SelectedIndexChanged); // // partyPokemon2PictureBox // - this.partyPokemon2PictureBox.Location = new System.Drawing.Point(11, 23); + this.partyPokemon2PictureBox.Location = new System.Drawing.Point(15, 28); + this.partyPokemon2PictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyPokemon2PictureBox.Name = "partyPokemon2PictureBox"; - this.partyPokemon2PictureBox.Size = new System.Drawing.Size(40, 30); + this.partyPokemon2PictureBox.Size = new System.Drawing.Size(53, 37); this.partyPokemon2PictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.partyPokemon2PictureBox.TabIndex = 1; this.partyPokemon2PictureBox.TabStop = false; @@ -8814,9 +9490,10 @@ this.partyPokemon2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.partyPokemon2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyPokemon2ComboBox.FormattingEnabled = true; - this.partyPokemon2ComboBox.Location = new System.Drawing.Point(58, 28); + this.partyPokemon2ComboBox.Location = new System.Drawing.Point(77, 34); + this.partyPokemon2ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyPokemon2ComboBox.Name = "partyPokemon2ComboBox"; - this.partyPokemon2ComboBox.Size = new System.Drawing.Size(126, 21); + this.partyPokemon2ComboBox.Size = new System.Drawing.Size(167, 24); this.partyPokemon2ComboBox.TabIndex = 0; this.partyPokemon2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon2ComboBox_SelectedIndexChanged); // @@ -8837,9 +9514,11 @@ this.party1GroupBox.Controls.Add(this.partyPokemon1PictureBox); this.party1GroupBox.Controls.Add(this.partyPokemon1ComboBox); this.party1GroupBox.Enabled = false; - this.party1GroupBox.Location = new System.Drawing.Point(16, 37); + this.party1GroupBox.Location = new System.Drawing.Point(21, 46); + this.party1GroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.party1GroupBox.Name = "party1GroupBox"; - this.party1GroupBox.Size = new System.Drawing.Size(343, 183); + this.party1GroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.party1GroupBox.Size = new System.Drawing.Size(457, 225); this.party1GroupBox.TabIndex = 0; this.party1GroupBox.TabStop = false; this.party1GroupBox.Text = "Pokemon 1"; @@ -8850,35 +9529,39 @@ this.partyForm1ComboBox.FormattingEnabled = true; this.partyForm1ComboBox.Items.AddRange(new object[] { "Defense form"}); - this.partyForm1ComboBox.Location = new System.Drawing.Point(228, 151); + this.partyForm1ComboBox.Location = new System.Drawing.Point(304, 186); + this.partyForm1ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyForm1ComboBox.Name = "partyForm1ComboBox"; - this.partyForm1ComboBox.Size = new System.Drawing.Size(103, 21); + this.partyForm1ComboBox.Size = new System.Drawing.Size(136, 24); this.partyForm1ComboBox.TabIndex = 14; // // partyAbility1ComboBox // this.partyAbility1ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.partyAbility1ComboBox.FormattingEnabled = true; - this.partyAbility1ComboBox.Location = new System.Drawing.Point(15, 151); + this.partyAbility1ComboBox.Location = new System.Drawing.Point(20, 186); + this.partyAbility1ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyAbility1ComboBox.Name = "partyAbility1ComboBox"; - this.partyAbility1ComboBox.Size = new System.Drawing.Size(105, 21); + this.partyAbility1ComboBox.Size = new System.Drawing.Size(139, 24); this.partyAbility1ComboBox.TabIndex = 13; // // partyGender1ComboBox // this.partyGender1ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.partyGender1ComboBox.FormattingEnabled = true; - this.partyGender1ComboBox.Location = new System.Drawing.Point(126, 151); + this.partyGender1ComboBox.Location = new System.Drawing.Point(168, 186); + this.partyGender1ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyGender1ComboBox.Name = "partyGender1ComboBox"; - this.partyGender1ComboBox.Size = new System.Drawing.Size(95, 21); + this.partyGender1ComboBox.Size = new System.Drawing.Size(125, 24); this.partyGender1ComboBox.TabIndex = 12; // // partyPokemonItemPictureBox1 // this.partyPokemonItemPictureBox1.Image = global::DSPRE.Properties.Resources.IconItem; - this.partyPokemonItemPictureBox1.Location = new System.Drawing.Point(198, 26); + this.partyPokemonItemPictureBox1.Location = new System.Drawing.Point(264, 32); + this.partyPokemonItemPictureBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyPokemonItemPictureBox1.Name = "partyPokemonItemPictureBox1"; - this.partyPokemonItemPictureBox1.Size = new System.Drawing.Size(24, 25); + this.partyPokemonItemPictureBox1.Size = new System.Drawing.Size(32, 31); this.partyPokemonItemPictureBox1.TabIndex = 10; this.partyPokemonItemPictureBox1.TabStop = false; this.partyPokemonItemPictureBox1.Visible = false; @@ -8886,27 +9569,30 @@ // label47 // this.label47.AutoSize = true; - this.label47.Location = new System.Drawing.Point(12, 118); + this.label47.Location = new System.Drawing.Point(16, 145); + this.label47.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label47.Name = "label47"; - this.label47.Size = new System.Drawing.Size(28, 26); + this.label47.Size = new System.Drawing.Size(35, 32); this.label47.TabIndex = 9; this.label47.Text = "Ball\r\nSeal"; // // label46 // this.label46.AutoSize = true; - this.label46.Location = new System.Drawing.Point(12, 94); + this.label46.Location = new System.Drawing.Point(16, 116); + this.label46.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label46.Name = "label46"; - this.label46.Size = new System.Drawing.Size(22, 13); + this.label46.Size = new System.Drawing.Size(26, 16); this.label46.TabIndex = 8; this.label46.Text = "DV"; // // label45 // this.label45.AutoSize = true; - this.label45.Location = new System.Drawing.Point(12, 67); + this.label45.Location = new System.Drawing.Point(16, 82); + this.label45.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label45.Name = "label45"; - this.label45.Size = new System.Drawing.Size(22, 13); + this.label45.Size = new System.Drawing.Size(24, 16); this.label45.TabIndex = 7; this.label45.Text = "Lv."; // @@ -8916,9 +9602,11 @@ this.poke1MovesGroupBox.Controls.Add(this.partyMove1_2ComboBox); this.poke1MovesGroupBox.Controls.Add(this.partyMove1_3ComboBox); this.poke1MovesGroupBox.Controls.Add(this.partyMove1_4ComboBox); - this.poke1MovesGroupBox.Location = new System.Drawing.Point(110, 57); + this.poke1MovesGroupBox.Location = new System.Drawing.Point(147, 70); + this.poke1MovesGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.poke1MovesGroupBox.Name = "poke1MovesGroupBox"; - this.poke1MovesGroupBox.Size = new System.Drawing.Size(227, 85); + this.poke1MovesGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.poke1MovesGroupBox.Size = new System.Drawing.Size(303, 105); this.poke1MovesGroupBox.TabIndex = 6; this.poke1MovesGroupBox.TabStop = false; this.poke1MovesGroupBox.Text = "Moves"; @@ -8929,9 +9617,10 @@ this.partyMove1_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove1_1ComboBox.Enabled = false; this.partyMove1_1ComboBox.FormattingEnabled = true; - this.partyMove1_1ComboBox.Location = new System.Drawing.Point(10, 21); + this.partyMove1_1ComboBox.Location = new System.Drawing.Point(13, 26); + this.partyMove1_1ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyMove1_1ComboBox.Name = "partyMove1_1ComboBox"; - this.partyMove1_1ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove1_1ComboBox.Size = new System.Drawing.Size(132, 24); this.partyMove1_1ComboBox.TabIndex = 3; this.partyMove1_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -8941,9 +9630,10 @@ this.partyMove1_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove1_2ComboBox.Enabled = false; this.partyMove1_2ComboBox.FormattingEnabled = true; - this.partyMove1_2ComboBox.Location = new System.Drawing.Point(116, 21); + this.partyMove1_2ComboBox.Location = new System.Drawing.Point(155, 26); + this.partyMove1_2ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyMove1_2ComboBox.Name = "partyMove1_2ComboBox"; - this.partyMove1_2ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove1_2ComboBox.Size = new System.Drawing.Size(132, 24); this.partyMove1_2ComboBox.TabIndex = 6; this.partyMove1_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -8953,9 +9643,10 @@ this.partyMove1_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove1_3ComboBox.Enabled = false; this.partyMove1_3ComboBox.FormattingEnabled = true; - this.partyMove1_3ComboBox.Location = new System.Drawing.Point(10, 48); + this.partyMove1_3ComboBox.Location = new System.Drawing.Point(13, 59); + this.partyMove1_3ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyMove1_3ComboBox.Name = "partyMove1_3ComboBox"; - this.partyMove1_3ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove1_3ComboBox.Size = new System.Drawing.Size(132, 24); this.partyMove1_3ComboBox.TabIndex = 5; this.partyMove1_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -8965,34 +9656,37 @@ this.partyMove1_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove1_4ComboBox.Enabled = false; this.partyMove1_4ComboBox.FormattingEnabled = true; - this.partyMove1_4ComboBox.Location = new System.Drawing.Point(116, 48); + this.partyMove1_4ComboBox.Location = new System.Drawing.Point(155, 59); + this.partyMove1_4ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyMove1_4ComboBox.Name = "partyMove1_4ComboBox"; - this.partyMove1_4ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove1_4ComboBox.Size = new System.Drawing.Size(132, 24); this.partyMove1_4ComboBox.TabIndex = 7; this.partyMove1_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // // partyIV1UpDown // - this.partyIV1UpDown.Location = new System.Drawing.Point(48, 92); + this.partyIV1UpDown.Location = new System.Drawing.Point(64, 113); + this.partyIV1UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyIV1UpDown.Maximum = new decimal(new int[] { 255, 0, 0, 0}); this.partyIV1UpDown.Name = "partyIV1UpDown"; - this.partyIV1UpDown.Size = new System.Drawing.Size(49, 20); + this.partyIV1UpDown.Size = new System.Drawing.Size(65, 22); this.partyIV1UpDown.TabIndex = 5; // // partyLevel1UpDown // - this.partyLevel1UpDown.Location = new System.Drawing.Point(48, 63); + this.partyLevel1UpDown.Location = new System.Drawing.Point(64, 78); + this.partyLevel1UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyLevel1UpDown.Minimum = new decimal(new int[] { 1, 0, 0, 0}); this.partyLevel1UpDown.Name = "partyLevel1UpDown"; - this.partyLevel1UpDown.Size = new System.Drawing.Size(49, 20); + this.partyLevel1UpDown.Size = new System.Drawing.Size(65, 22); this.partyLevel1UpDown.TabIndex = 4; this.partyLevel1UpDown.Value = new decimal(new int[] { 1, @@ -9002,14 +9696,15 @@ // // partyBall1UpDown // - this.partyBall1UpDown.Location = new System.Drawing.Point(48, 121); + this.partyBall1UpDown.Location = new System.Drawing.Point(64, 149); + this.partyBall1UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyBall1UpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.partyBall1UpDown.Name = "partyBall1UpDown"; - this.partyBall1UpDown.Size = new System.Drawing.Size(49, 20); + this.partyBall1UpDown.Size = new System.Drawing.Size(65, 22); this.partyBall1UpDown.TabIndex = 3; // // partyItem1ComboBox @@ -9018,17 +9713,19 @@ this.partyItem1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyItem1ComboBox.Enabled = false; this.partyItem1ComboBox.FormattingEnabled = true; - this.partyItem1ComboBox.Location = new System.Drawing.Point(228, 28); + this.partyItem1ComboBox.Location = new System.Drawing.Point(304, 34); + this.partyItem1ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyItem1ComboBox.Name = "partyItem1ComboBox"; - this.partyItem1ComboBox.Size = new System.Drawing.Size(103, 21); + this.partyItem1ComboBox.Size = new System.Drawing.Size(136, 24); this.partyItem1ComboBox.TabIndex = 2; this.partyItem1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem1ComboBox_SelectedIndexChanged); // // partyPokemon1PictureBox // - this.partyPokemon1PictureBox.Location = new System.Drawing.Point(11, 23); + this.partyPokemon1PictureBox.Location = new System.Drawing.Point(15, 28); + this.partyPokemon1PictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyPokemon1PictureBox.Name = "partyPokemon1PictureBox"; - this.partyPokemon1PictureBox.Size = new System.Drawing.Size(40, 30); + this.partyPokemon1PictureBox.Size = new System.Drawing.Size(53, 37); this.partyPokemon1PictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.partyPokemon1PictureBox.TabIndex = 1; this.partyPokemon1PictureBox.TabStop = false; @@ -9038,9 +9735,10 @@ this.partyPokemon1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.partyPokemon1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyPokemon1ComboBox.FormattingEnabled = true; - this.partyPokemon1ComboBox.Location = new System.Drawing.Point(58, 28); + this.partyPokemon1ComboBox.Location = new System.Drawing.Point(77, 34); + this.partyPokemon1ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyPokemon1ComboBox.Name = "partyPokemon1ComboBox"; - this.partyPokemon1ComboBox.Size = new System.Drawing.Size(126, 21); + this.partyPokemon1ComboBox.Size = new System.Drawing.Size(167, 24); this.partyPokemon1ComboBox.TabIndex = 0; this.partyPokemon1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon1ComboBox_SelectedIndexChanged); // @@ -9057,9 +9755,11 @@ this.groupBox27.Controls.Add(this.trainerClassNameTextbox); this.groupBox27.Controls.Add(this.label17); this.groupBox27.Controls.Add(this.trainerClassPicBox); - this.groupBox27.Location = new System.Drawing.Point(15, 489); + this.groupBox27.Location = new System.Drawing.Point(20, 602); + this.groupBox27.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox27.Name = "groupBox27"; - this.groupBox27.Size = new System.Drawing.Size(414, 123); + this.groupBox27.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox27.Size = new System.Drawing.Size(552, 151); this.groupBox27.TabIndex = 30; this.groupBox27.TabStop = false; this.groupBox27.Text = "Trainer Class Editor"; @@ -9067,69 +9767,76 @@ // eyeContactMusicAltLabel // this.eyeContactMusicAltLabel.AutoSize = true; - this.eyeContactMusicAltLabel.Location = new System.Drawing.Point(286, 69); + this.eyeContactMusicAltLabel.Location = new System.Drawing.Point(381, 85); + this.eyeContactMusicAltLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.eyeContactMusicAltLabel.Name = "eyeContactMusicAltLabel"; - this.eyeContactMusicAltLabel.Size = new System.Drawing.Size(117, 13); + this.eyeContactMusicAltLabel.Size = new System.Drawing.Size(143, 16); this.eyeContactMusicAltLabel.TabIndex = 36; this.eyeContactMusicAltLabel.Text = "Eye Contact Music [Alt]"; // // encounterSSEQAltUpDown // this.encounterSSEQAltUpDown.Enabled = false; - this.encounterSSEQAltUpDown.Location = new System.Drawing.Point(290, 85); + this.encounterSSEQAltUpDown.Location = new System.Drawing.Point(387, 105); + this.encounterSSEQAltUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.encounterSSEQAltUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.encounterSSEQAltUpDown.Name = "encounterSSEQAltUpDown"; - this.encounterSSEQAltUpDown.Size = new System.Drawing.Size(81, 20); + this.encounterSSEQAltUpDown.Size = new System.Drawing.Size(108, 22); this.encounterSSEQAltUpDown.TabIndex = 35; // // eyeContactMusicLabel // this.eyeContactMusicLabel.AutoSize = true; - this.eyeContactMusicLabel.Location = new System.Drawing.Point(143, 69); + this.eyeContactMusicLabel.Location = new System.Drawing.Point(191, 85); + this.eyeContactMusicLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.eyeContactMusicLabel.Name = "eyeContactMusicLabel"; - this.eyeContactMusicLabel.Size = new System.Drawing.Size(128, 13); + this.eyeContactMusicLabel.Size = new System.Drawing.Size(157, 16); this.eyeContactMusicLabel.TabIndex = 34; this.eyeContactMusicLabel.Text = "Eye Contact Music [Main]"; // // encounterSSEQMainUpDown // - this.encounterSSEQMainUpDown.Location = new System.Drawing.Point(146, 85); + this.encounterSSEQMainUpDown.Location = new System.Drawing.Point(195, 105); + this.encounterSSEQMainUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.encounterSSEQMainUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.encounterSSEQMainUpDown.Name = "encounterSSEQMainUpDown"; - this.encounterSSEQMainUpDown.Size = new System.Drawing.Size(81, 20); + this.encounterSSEQMainUpDown.Size = new System.Drawing.Size(108, 22); this.encounterSSEQMainUpDown.TabIndex = 33; // // trainerClassFrameMaxLabel // this.trainerClassFrameMaxLabel.AutoSize = true; - this.trainerClassFrameMaxLabel.Location = new System.Drawing.Point(180, 33); + this.trainerClassFrameMaxLabel.Location = new System.Drawing.Point(240, 41); + this.trainerClassFrameMaxLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.trainerClassFrameMaxLabel.Name = "trainerClassFrameMaxLabel"; - this.trainerClassFrameMaxLabel.Size = new System.Drawing.Size(18, 13); + this.trainerClassFrameMaxLabel.Size = new System.Drawing.Size(18, 16); this.trainerClassFrameMaxLabel.TabIndex = 32; this.trainerClassFrameMaxLabel.Text = "/0"; // // label40 // this.label40.AutoSize = true; - this.label40.Location = new System.Drawing.Point(143, 14); + this.label40.Location = new System.Drawing.Point(191, 17); + this.label40.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label40.Name = "label40"; - this.label40.Size = new System.Drawing.Size(45, 13); + this.label40.Size = new System.Drawing.Size(55, 16); this.label40.TabIndex = 31; this.label40.Text = "Preview"; // // trClassFramePreviewUpDown // - this.trClassFramePreviewUpDown.Location = new System.Drawing.Point(146, 30); + this.trClassFramePreviewUpDown.Location = new System.Drawing.Point(195, 37); + this.trClassFramePreviewUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.trClassFramePreviewUpDown.Name = "trClassFramePreviewUpDown"; - this.trClassFramePreviewUpDown.Size = new System.Drawing.Size(34, 20); + this.trClassFramePreviewUpDown.Size = new System.Drawing.Size(45, 22); this.trClassFramePreviewUpDown.TabIndex = 30; this.trClassFramePreviewUpDown.ValueChanged += new System.EventHandler(this.trClassFramePreviewUpDown_ValueChanged); // @@ -9137,9 +9844,10 @@ // this.saveTrainerClassButton.Image = global::DSPRE.Properties.Resources.save_rom; this.saveTrainerClassButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.saveTrainerClassButton.Location = new System.Drawing.Point(322, 15); + this.saveTrainerClassButton.Location = new System.Drawing.Point(429, 18); + this.saveTrainerClassButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.saveTrainerClassButton.Name = "saveTrainerClassButton"; - this.saveTrainerClassButton.Size = new System.Drawing.Size(80, 45); + this.saveTrainerClassButton.Size = new System.Drawing.Size(107, 55); this.saveTrainerClassButton.TabIndex = 29; this.saveTrainerClassButton.Text = "&Save\r\nClass"; this.saveTrainerClassButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -9148,26 +9856,29 @@ // // trainerClassNameTextbox // - this.trainerClassNameTextbox.Location = new System.Drawing.Point(213, 29); + this.trainerClassNameTextbox.Location = new System.Drawing.Point(284, 36); + this.trainerClassNameTextbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.trainerClassNameTextbox.Name = "trainerClassNameTextbox"; - this.trainerClassNameTextbox.Size = new System.Drawing.Size(99, 20); + this.trainerClassNameTextbox.Size = new System.Drawing.Size(131, 22); this.trainerClassNameTextbox.TabIndex = 24; // // label17 // this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(210, 13); + this.label17.Location = new System.Drawing.Point(280, 16); + this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(63, 13); + this.label17.Size = new System.Drawing.Size(81, 16); this.label17.TabIndex = 23; this.label17.Text = "Class Name"; // // trainerClassPicBox // this.trainerClassPicBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.trainerClassPicBox.Location = new System.Drawing.Point(9, 17); + this.trainerClassPicBox.Location = new System.Drawing.Point(12, 21); + this.trainerClassPicBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.trainerClassPicBox.Name = "trainerClassPicBox"; - this.trainerClassPicBox.Size = new System.Drawing.Size(128, 96); + this.trainerClassPicBox.Size = new System.Drawing.Size(170, 118); this.trainerClassPicBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.trainerClassPicBox.TabIndex = 0; this.trainerClassPicBox.TabStop = false; @@ -9188,9 +9899,11 @@ this.groupBox25.Controls.Add(this.label63); this.groupBox25.Controls.Add(this.label43); this.groupBox25.Controls.Add(this.trainerClassListBox); - this.groupBox25.Location = new System.Drawing.Point(15, 80); + this.groupBox25.Location = new System.Drawing.Point(20, 98); + this.groupBox25.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox25.Name = "groupBox25"; - this.groupBox25.Size = new System.Drawing.Size(414, 405); + this.groupBox25.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox25.Size = new System.Drawing.Size(552, 498); this.groupBox25.TabIndex = 29; this.groupBox25.TabStop = false; this.groupBox25.Text = "Trainer Properties [TRP]"; @@ -9199,18 +9912,19 @@ // this.tableLayoutPanel5.ColumnCount = 1; this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27F)); + this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27F)); + this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27F)); this.tableLayoutPanel5.Controls.Add(this.replacePropertiesButton, 0, 1); this.tableLayoutPanel5.Controls.Add(this.exportPropertiesButton, 0, 0); - this.tableLayoutPanel5.Location = new System.Drawing.Point(288, 304); + this.tableLayoutPanel5.Location = new System.Drawing.Point(384, 374); + this.tableLayoutPanel5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tableLayoutPanel5.Name = "tableLayoutPanel5"; this.tableLayoutPanel5.RowCount = 2; this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel5.Size = new System.Drawing.Size(121, 62); + this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); + this.tableLayoutPanel5.Size = new System.Drawing.Size(161, 76); this.tableLayoutPanel5.TabIndex = 48; // // replacePropertiesButton @@ -9218,9 +9932,10 @@ this.replacePropertiesButton.Dock = System.Windows.Forms.DockStyle.Fill; this.replacePropertiesButton.Image = ((System.Drawing.Image)(resources.GetObject("replacePropertiesButton.Image"))); this.replacePropertiesButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.replacePropertiesButton.Location = new System.Drawing.Point(3, 34); + this.replacePropertiesButton.Location = new System.Drawing.Point(4, 42); + this.replacePropertiesButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.replacePropertiesButton.Name = "replacePropertiesButton"; - this.replacePropertiesButton.Size = new System.Drawing.Size(115, 25); + this.replacePropertiesButton.Size = new System.Drawing.Size(153, 30); this.replacePropertiesButton.TabIndex = 42; this.replacePropertiesButton.Text = "Replace TRP"; this.replacePropertiesButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -9232,9 +9947,10 @@ this.exportPropertiesButton.Dock = System.Windows.Forms.DockStyle.Fill; this.exportPropertiesButton.Image = ((System.Drawing.Image)(resources.GetObject("exportPropertiesButton.Image"))); this.exportPropertiesButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.exportPropertiesButton.Location = new System.Drawing.Point(3, 3); + this.exportPropertiesButton.Location = new System.Drawing.Point(4, 4); + this.exportPropertiesButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.exportPropertiesButton.Name = "exportPropertiesButton"; - this.exportPropertiesButton.Size = new System.Drawing.Size(115, 25); + this.exportPropertiesButton.Size = new System.Drawing.Size(153, 30); this.exportPropertiesButton.TabIndex = 41; this.exportPropertiesButton.Text = "Export TRP"; this.exportPropertiesButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -9254,9 +9970,11 @@ this.TrainerAIGroupBox.Controls.Add(this.trainerAI9CheckBox); this.TrainerAIGroupBox.Controls.Add(this.trainerAI10CheckBox); this.TrainerAIGroupBox.Controls.Add(this.trainerAI11CheckBox); - this.TrainerAIGroupBox.Location = new System.Drawing.Point(9, 282); + this.TrainerAIGroupBox.Location = new System.Drawing.Point(12, 347); + this.TrainerAIGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.TrainerAIGroupBox.Name = "TrainerAIGroupBox"; - this.TrainerAIGroupBox.Size = new System.Drawing.Size(272, 116); + this.TrainerAIGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.TrainerAIGroupBox.Size = new System.Drawing.Size(363, 143); this.TrainerAIGroupBox.TabIndex = 27; this.TrainerAIGroupBox.TabStop = false; this.TrainerAIGroupBox.Text = "AI"; @@ -9264,9 +9982,10 @@ // trainerAI1CheckBox // this.trainerAI1CheckBox.AutoSize = true; - this.trainerAI1CheckBox.Location = new System.Drawing.Point(10, 21); + this.trainerAI1CheckBox.Location = new System.Drawing.Point(13, 26); + this.trainerAI1CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.trainerAI1CheckBox.Name = "trainerAI1CheckBox"; - this.trainerAI1CheckBox.Size = new System.Drawing.Size(52, 17); + this.trainerAI1CheckBox.Size = new System.Drawing.Size(63, 20); this.trainerAI1CheckBox.TabIndex = 0; this.trainerAI1CheckBox.Text = "Basic"; this.trainerAI1CheckBox.UseVisualStyleBackColor = true; @@ -9274,9 +9993,10 @@ // trainerAI2CheckBox // this.trainerAI2CheckBox.AutoSize = true; - this.trainerAI2CheckBox.Location = new System.Drawing.Point(80, 21); + this.trainerAI2CheckBox.Location = new System.Drawing.Point(107, 26); + this.trainerAI2CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.trainerAI2CheckBox.Name = "trainerAI2CheckBox"; - this.trainerAI2CheckBox.Size = new System.Drawing.Size(102, 17); + this.trainerAI2CheckBox.Size = new System.Drawing.Size(122, 20); this.trainerAI2CheckBox.TabIndex = 1; this.trainerAI2CheckBox.Text = "Evaluate Attack"; this.trainerAI2CheckBox.UseVisualStyleBackColor = true; @@ -9284,9 +10004,10 @@ // trainerAI3CheckBox // this.trainerAI3CheckBox.AutoSize = true; - this.trainerAI3CheckBox.Location = new System.Drawing.Point(10, 44); + this.trainerAI3CheckBox.Location = new System.Drawing.Point(13, 54); + this.trainerAI3CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.trainerAI3CheckBox.Name = "trainerAI3CheckBox"; - this.trainerAI3CheckBox.Size = new System.Drawing.Size(56, 17); + this.trainerAI3CheckBox.Size = new System.Drawing.Size(67, 20); this.trainerAI3CheckBox.TabIndex = 2; this.trainerAI3CheckBox.Text = "Expert"; this.trainerAI3CheckBox.UseVisualStyleBackColor = true; @@ -9294,9 +10015,10 @@ // trainerAI4CheckBox // this.trainerAI4CheckBox.AutoSize = true; - this.trainerAI4CheckBox.Location = new System.Drawing.Point(10, 90); + this.trainerAI4CheckBox.Location = new System.Drawing.Point(13, 111); + this.trainerAI4CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.trainerAI4CheckBox.Name = "trainerAI4CheckBox"; - this.trainerAI4CheckBox.Size = new System.Drawing.Size(56, 17); + this.trainerAI4CheckBox.Size = new System.Drawing.Size(66, 20); this.trainerAI4CheckBox.TabIndex = 3; this.trainerAI4CheckBox.Text = "Status"; this.trainerAI4CheckBox.UseVisualStyleBackColor = true; @@ -9304,9 +10026,10 @@ // trainerAI5CheckBox // this.trainerAI5CheckBox.AutoSize = true; - this.trainerAI5CheckBox.Location = new System.Drawing.Point(10, 67); + this.trainerAI5CheckBox.Location = new System.Drawing.Point(13, 82); + this.trainerAI5CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.trainerAI5CheckBox.Name = "trainerAI5CheckBox"; - this.trainerAI5CheckBox.Size = new System.Drawing.Size(47, 17); + this.trainerAI5CheckBox.Size = new System.Drawing.Size(56, 20); this.trainerAI5CheckBox.TabIndex = 4; this.trainerAI5CheckBox.Text = "Risk"; this.trainerAI5CheckBox.UseVisualStyleBackColor = true; @@ -9314,9 +10037,10 @@ // trainerAI6CheckBox // this.trainerAI6CheckBox.AutoSize = true; - this.trainerAI6CheckBox.Location = new System.Drawing.Point(80, 44); + this.trainerAI6CheckBox.Location = new System.Drawing.Point(107, 54); + this.trainerAI6CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.trainerAI6CheckBox.Name = "trainerAI6CheckBox"; - this.trainerAI6CheckBox.Size = new System.Drawing.Size(100, 17); + this.trainerAI6CheckBox.Size = new System.Drawing.Size(126, 20); this.trainerAI6CheckBox.TabIndex = 5; this.trainerAI6CheckBox.Text = "Damage Priority"; this.trainerAI6CheckBox.UseVisualStyleBackColor = true; @@ -9324,9 +10048,10 @@ // trainerAI7CheckBox // this.trainerAI7CheckBox.AutoSize = true; - this.trainerAI7CheckBox.Location = new System.Drawing.Point(80, 67); + this.trainerAI7CheckBox.Location = new System.Drawing.Point(107, 82); + this.trainerAI7CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.trainerAI7CheckBox.Name = "trainerAI7CheckBox"; - this.trainerAI7CheckBox.Size = new System.Drawing.Size(80, 17); + this.trainerAI7CheckBox.Size = new System.Drawing.Size(98, 20); this.trainerAI7CheckBox.TabIndex = 6; this.trainerAI7CheckBox.Text = "Baton Pass"; this.trainerAI7CheckBox.UseVisualStyleBackColor = true; @@ -9334,9 +10059,10 @@ // trainerAI8CheckBox // this.trainerAI8CheckBox.AutoSize = true; - this.trainerAI8CheckBox.Location = new System.Drawing.Point(80, 90); + this.trainerAI8CheckBox.Location = new System.Drawing.Point(107, 111); + this.trainerAI8CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.trainerAI8CheckBox.Name = "trainerAI8CheckBox"; - this.trainerAI8CheckBox.Size = new System.Drawing.Size(87, 17); + this.trainerAI8CheckBox.Size = new System.Drawing.Size(107, 20); this.trainerAI8CheckBox.TabIndex = 7; this.trainerAI8CheckBox.Text = "Tag Strategy"; this.trainerAI8CheckBox.UseVisualStyleBackColor = true; @@ -9344,9 +10070,10 @@ // trainerAI9CheckBox // this.trainerAI9CheckBox.AutoSize = true; - this.trainerAI9CheckBox.Location = new System.Drawing.Point(191, 21); + this.trainerAI9CheckBox.Location = new System.Drawing.Point(255, 26); + this.trainerAI9CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.trainerAI9CheckBox.Name = "trainerAI9CheckBox"; - this.trainerAI9CheckBox.Size = new System.Drawing.Size(75, 17); + this.trainerAI9CheckBox.Size = new System.Drawing.Size(89, 20); this.trainerAI9CheckBox.TabIndex = 8; this.trainerAI9CheckBox.Text = "Check HP"; this.trainerAI9CheckBox.UseVisualStyleBackColor = true; @@ -9354,9 +10081,10 @@ // trainerAI10CheckBox // this.trainerAI10CheckBox.AutoSize = true; - this.trainerAI10CheckBox.Location = new System.Drawing.Point(191, 44); + this.trainerAI10CheckBox.Location = new System.Drawing.Point(255, 54); + this.trainerAI10CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.trainerAI10CheckBox.Name = "trainerAI10CheckBox"; - this.trainerAI10CheckBox.Size = new System.Drawing.Size(67, 17); + this.trainerAI10CheckBox.Size = new System.Drawing.Size(80, 20); this.trainerAI10CheckBox.TabIndex = 9; this.trainerAI10CheckBox.Text = "Weather"; this.trainerAI10CheckBox.UseVisualStyleBackColor = true; @@ -9364,9 +10092,10 @@ // trainerAI11CheckBox // this.trainerAI11CheckBox.AutoSize = true; - this.trainerAI11CheckBox.Location = new System.Drawing.Point(191, 67); + this.trainerAI11CheckBox.Location = new System.Drawing.Point(255, 82); + this.trainerAI11CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.trainerAI11CheckBox.Name = "trainerAI11CheckBox"; - this.trainerAI11CheckBox.Size = new System.Drawing.Size(44, 17); + this.trainerAI11CheckBox.Size = new System.Drawing.Size(50, 20); this.trainerAI11CheckBox.TabIndex = 10; this.trainerAI11CheckBox.Text = "???"; this.trainerAI11CheckBox.UseVisualStyleBackColor = true; @@ -9377,9 +10106,11 @@ this.trainerItemsGroupBox.Controls.Add(this.trainerItem2ComboBox); this.trainerItemsGroupBox.Controls.Add(this.trainerItem3ComboBox); this.trainerItemsGroupBox.Controls.Add(this.trainerItem4ComboBox); - this.trainerItemsGroupBox.Location = new System.Drawing.Point(211, 146); + this.trainerItemsGroupBox.Location = new System.Drawing.Point(281, 180); + this.trainerItemsGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.trainerItemsGroupBox.Name = "trainerItemsGroupBox"; - this.trainerItemsGroupBox.Size = new System.Drawing.Size(191, 130); + this.trainerItemsGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.trainerItemsGroupBox.Size = new System.Drawing.Size(255, 160); this.trainerItemsGroupBox.TabIndex = 26; this.trainerItemsGroupBox.TabStop = false; this.trainerItemsGroupBox.Text = "Trainer Items"; @@ -9389,9 +10120,10 @@ this.trainerItem1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.trainerItem1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.trainerItem1ComboBox.FormattingEnabled = true; - this.trainerItem1ComboBox.Location = new System.Drawing.Point(9, 20); + this.trainerItem1ComboBox.Location = new System.Drawing.Point(12, 25); + this.trainerItem1ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.trainerItem1ComboBox.Name = "trainerItem1ComboBox"; - this.trainerItem1ComboBox.Size = new System.Drawing.Size(171, 21); + this.trainerItem1ComboBox.Size = new System.Drawing.Size(227, 24); this.trainerItem1ComboBox.TabIndex = 0; // // trainerItem2ComboBox @@ -9399,9 +10131,10 @@ this.trainerItem2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.trainerItem2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.trainerItem2ComboBox.FormattingEnabled = true; - this.trainerItem2ComboBox.Location = new System.Drawing.Point(9, 47); + this.trainerItem2ComboBox.Location = new System.Drawing.Point(12, 58); + this.trainerItem2ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.trainerItem2ComboBox.Name = "trainerItem2ComboBox"; - this.trainerItem2ComboBox.Size = new System.Drawing.Size(171, 21); + this.trainerItem2ComboBox.Size = new System.Drawing.Size(227, 24); this.trainerItem2ComboBox.TabIndex = 1; // // trainerItem3ComboBox @@ -9409,9 +10142,10 @@ this.trainerItem3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.trainerItem3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.trainerItem3ComboBox.FormattingEnabled = true; - this.trainerItem3ComboBox.Location = new System.Drawing.Point(9, 74); + this.trainerItem3ComboBox.Location = new System.Drawing.Point(12, 91); + this.trainerItem3ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.trainerItem3ComboBox.Name = "trainerItem3ComboBox"; - this.trainerItem3ComboBox.Size = new System.Drawing.Size(171, 21); + this.trainerItem3ComboBox.Size = new System.Drawing.Size(227, 24); this.trainerItem3ComboBox.TabIndex = 2; // // trainerItem4ComboBox @@ -9419,9 +10153,10 @@ this.trainerItem4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.trainerItem4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.trainerItem4ComboBox.FormattingEnabled = true; - this.trainerItem4ComboBox.Location = new System.Drawing.Point(9, 101); + this.trainerItem4ComboBox.Location = new System.Drawing.Point(12, 124); + this.trainerItem4ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.trainerItem4ComboBox.Name = "trainerItem4ComboBox"; - this.trainerItem4ComboBox.Size = new System.Drawing.Size(171, 21); + this.trainerItem4ComboBox.Size = new System.Drawing.Size(227, 24); this.trainerItem4ComboBox.TabIndex = 3; // // deleteTrainerButton @@ -9429,9 +10164,10 @@ this.deleteTrainerButton.Enabled = false; this.deleteTrainerButton.Image = global::DSPRE.Properties.Resources.deleteIcon; this.deleteTrainerButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.deleteTrainerButton.Location = new System.Drawing.Point(289, 372); + this.deleteTrainerButton.Location = new System.Drawing.Point(385, 458); + this.deleteTrainerButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.deleteTrainerButton.Name = "deleteTrainerButton"; - this.deleteTrainerButton.Size = new System.Drawing.Size(102, 23); + this.deleteTrainerButton.Size = new System.Drawing.Size(136, 28); this.deleteTrainerButton.TabIndex = 44; this.deleteTrainerButton.Text = "Delete Trainer"; this.deleteTrainerButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -9441,9 +10177,10 @@ // trainerItemsCheckBox // this.trainerItemsCheckBox.AutoSize = true; - this.trainerItemsCheckBox.Location = new System.Drawing.Point(215, 115); + this.trainerItemsCheckBox.Location = new System.Drawing.Point(287, 142); + this.trainerItemsCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.trainerItemsCheckBox.Name = "trainerItemsCheckBox"; - this.trainerItemsCheckBox.Size = new System.Drawing.Size(117, 17); + this.trainerItemsCheckBox.Size = new System.Drawing.Size(145, 20); this.trainerItemsCheckBox.TabIndex = 25; this.trainerItemsCheckBox.Text = "Choose Party Items"; this.trainerItemsCheckBox.UseVisualStyleBackColor = true; @@ -9454,9 +10191,10 @@ this.addTrainerButton.Enabled = false; this.addTrainerButton.Image = global::DSPRE.Properties.Resources.addIcon; this.addTrainerButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addTrainerButton.Location = new System.Drawing.Point(294, 275); + this.addTrainerButton.Location = new System.Drawing.Point(392, 338); + this.addTrainerButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.addTrainerButton.Name = "addTrainerButton"; - this.addTrainerButton.Size = new System.Drawing.Size(102, 23); + this.addTrainerButton.Size = new System.Drawing.Size(136, 28); this.addTrainerButton.TabIndex = 35; this.addTrainerButton.Text = "Add Trainer"; this.addTrainerButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -9467,9 +10205,10 @@ // trainerMovesCheckBox // this.trainerMovesCheckBox.AutoSize = true; - this.trainerMovesCheckBox.Location = new System.Drawing.Point(215, 94); + this.trainerMovesCheckBox.Location = new System.Drawing.Point(287, 116); + this.trainerMovesCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.trainerMovesCheckBox.Name = "trainerMovesCheckBox"; - this.trainerMovesCheckBox.Size = new System.Drawing.Size(97, 17); + this.trainerMovesCheckBox.Size = new System.Drawing.Size(120, 20); this.trainerMovesCheckBox.TabIndex = 24; this.trainerMovesCheckBox.Text = "Choose Moves"; this.trainerMovesCheckBox.UseVisualStyleBackColor = true; @@ -9478,75 +10217,84 @@ // trainerDoubleCheckBox // this.trainerDoubleCheckBox.AutoSize = true; - this.trainerDoubleCheckBox.Location = new System.Drawing.Point(215, 72); + this.trainerDoubleCheckBox.Location = new System.Drawing.Point(287, 89); + this.trainerDoubleCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.trainerDoubleCheckBox.Name = "trainerDoubleCheckBox"; - this.trainerDoubleCheckBox.Size = new System.Drawing.Size(90, 17); + this.trainerDoubleCheckBox.Size = new System.Drawing.Size(110, 20); this.trainerDoubleCheckBox.TabIndex = 23; this.trainerDoubleCheckBox.Text = "Double Battle"; this.trainerDoubleCheckBox.UseVisualStyleBackColor = true; // // trainerNameTextBox // - this.trainerNameTextBox.Location = new System.Drawing.Point(215, 39); + this.trainerNameTextBox.Location = new System.Drawing.Point(287, 48); + this.trainerNameTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.trainerNameTextBox.Name = "trainerNameTextBox"; - this.trainerNameTextBox.Size = new System.Drawing.Size(148, 20); + this.trainerNameTextBox.Size = new System.Drawing.Size(196, 22); this.trainerNameTextBox.TabIndex = 22; // // partyCountUpDown // - this.partyCountUpDown.Location = new System.Drawing.Point(346, 99); + this.partyCountUpDown.Location = new System.Drawing.Point(461, 122); + this.partyCountUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.partyCountUpDown.Maximum = new decimal(new int[] { 6, 0, 0, 0}); this.partyCountUpDown.Name = "partyCountUpDown"; - this.partyCountUpDown.Size = new System.Drawing.Size(41, 20); + this.partyCountUpDown.Size = new System.Drawing.Size(55, 22); this.partyCountUpDown.TabIndex = 33; this.partyCountUpDown.ValueChanged += new System.EventHandler(this.partyCountUpDown_ValueChanged); // // label44 // this.label44.AutoSize = true; - this.label44.Location = new System.Drawing.Point(212, 23); + this.label44.Location = new System.Drawing.Point(283, 28); + this.label44.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label44.Name = "label44"; - this.label44.Size = new System.Drawing.Size(71, 13); + this.label44.Size = new System.Drawing.Size(90, 16); this.label44.TabIndex = 21; this.label44.Text = "Trainer Name"; // // label63 // this.label63.AutoSize = true; - this.label63.Location = new System.Drawing.Point(339, 83); + this.label63.Location = new System.Drawing.Point(452, 102); + this.label63.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label63.Name = "label63"; - this.label63.Size = new System.Drawing.Size(57, 13); + this.label63.Size = new System.Drawing.Size(71, 16); this.label63.TabIndex = 34; this.label63.Text = "Party Slots"; // // label43 // this.label43.AutoSize = true; - this.label43.Location = new System.Drawing.Point(10, 23); + this.label43.Location = new System.Drawing.Point(13, 28); + this.label43.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label43.Name = "label43"; - this.label43.Size = new System.Drawing.Size(68, 13); + this.label43.Size = new System.Drawing.Size(87, 16); this.label43.TabIndex = 20; this.label43.Text = "Trainer Class"; // // trainerClassListBox // this.trainerClassListBox.FormattingEnabled = true; - this.trainerClassListBox.Location = new System.Drawing.Point(11, 39); + this.trainerClassListBox.ItemHeight = 16; + this.trainerClassListBox.Location = new System.Drawing.Point(15, 48); + this.trainerClassListBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.trainerClassListBox.Name = "trainerClassListBox"; - this.trainerClassListBox.Size = new System.Drawing.Size(193, 238); + this.trainerClassListBox.Size = new System.Drawing.Size(256, 292); this.trainerClassListBox.TabIndex = 0; this.trainerClassListBox.SelectedIndexChanged += new System.EventHandler(this.trainerClassListBox_SelectedIndexChanged); // // label42 // this.label42.AutoSize = true; - this.label42.Location = new System.Drawing.Point(12, 7); + this.label42.Location = new System.Drawing.Point(16, 9); + this.label42.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label42.Name = "label42"; - this.label42.Size = new System.Drawing.Size(59, 13); + this.label42.Size = new System.Drawing.Size(75, 16); this.label42.TabIndex = 28; this.label42.Text = "Trainer File"; // @@ -9554,9 +10302,10 @@ // this.trainerComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.trainerComboBox.FormattingEnabled = true; - this.trainerComboBox.Location = new System.Drawing.Point(15, 22); + this.trainerComboBox.Location = new System.Drawing.Point(20, 27); + this.trainerComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.trainerComboBox.Name = "trainerComboBox"; - this.trainerComboBox.Size = new System.Drawing.Size(199, 21); + this.trainerComboBox.Size = new System.Drawing.Size(264, 24); this.trainerComboBox.TabIndex = 27; this.trainerComboBox.SelectedIndexChanged += new System.EventHandler(this.trainerComboBox_SelectedIndexChanged); // @@ -9564,9 +10313,10 @@ // this.trainerSaveCurrentButton.Image = global::DSPRE.Properties.Resources.saveButton; this.trainerSaveCurrentButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.trainerSaveCurrentButton.Location = new System.Drawing.Point(15, 49); + this.trainerSaveCurrentButton.Location = new System.Drawing.Point(20, 60); + this.trainerSaveCurrentButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.trainerSaveCurrentButton.Name = "trainerSaveCurrentButton"; - this.trainerSaveCurrentButton.Size = new System.Drawing.Size(199, 23); + this.trainerSaveCurrentButton.Size = new System.Drawing.Size(265, 28); this.trainerSaveCurrentButton.TabIndex = 31; this.trainerSaveCurrentButton.Text = "&Save Full Trainer File"; this.trainerSaveCurrentButton.UseVisualStyleBackColor = true; @@ -9578,10 +10328,11 @@ this.tableEditorTabPage.Controls.Add(this.pbEffectsGroupBox); this.tableEditorTabPage.Controls.Add(this.conditionalMusicGroupBox); this.tableEditorTabPage.ImageIndex = 9; - this.tableEditorTabPage.Location = new System.Drawing.Point(4, 23); + this.tableEditorTabPage.Location = new System.Drawing.Point(4, 25); + this.tableEditorTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tableEditorTabPage.Name = "tableEditorTabPage"; - this.tableEditorTabPage.Padding = new System.Windows.Forms.Padding(3); - this.tableEditorTabPage.Size = new System.Drawing.Size(1185, 675); + this.tableEditorTabPage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tableEditorTabPage.Size = new System.Drawing.Size(1583, 835); this.tableEditorTabPage.TabIndex = 9; this.tableEditorTabPage.Text = "Table Editor"; this.tableEditorTabPage.UseVisualStyleBackColor = true; @@ -9591,9 +10342,10 @@ this.label73.AutoSize = true; this.label73.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label73.ForeColor = System.Drawing.SystemColors.GradientInactiveCaption; - this.label73.Location = new System.Drawing.Point(414, 598); + this.label73.Location = new System.Drawing.Point(552, 736); + this.label73.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label73.Name = "label73"; - this.label73.Size = new System.Drawing.Size(314, 18); + this.label73.Size = new System.Drawing.Size(400, 24); this.label73.TabIndex = 12; this.label73.Text = "This Editor Tab is currently under construction."; this.label73.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -9603,9 +10355,11 @@ this.pbEffectsGroupBox.Controls.Add(this.groupBox31); this.pbEffectsGroupBox.Controls.Add(this.pbEffectsTrainerGroupBox); this.pbEffectsGroupBox.Controls.Add(this.pbEffectsMonGroupBox); - this.pbEffectsGroupBox.Location = new System.Drawing.Point(382, 9); + this.pbEffectsGroupBox.Location = new System.Drawing.Point(509, 11); + this.pbEffectsGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pbEffectsGroupBox.Name = "pbEffectsGroupBox"; - this.pbEffectsGroupBox.Size = new System.Drawing.Size(788, 451); + this.pbEffectsGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pbEffectsGroupBox.Size = new System.Drawing.Size(1051, 555); this.pbEffectsGroupBox.TabIndex = 11; this.pbEffectsGroupBox.TabStop = false; this.pbEffectsGroupBox.Text = "Pre-Battle Effects"; @@ -9619,9 +10373,11 @@ this.groupBox31.Controls.Add(this.pbEffectsVSAnimationUpDown); this.groupBox31.Controls.Add(this.pbEffectsCombosListbox); this.groupBox31.Controls.Add(this.label22); - this.groupBox31.Location = new System.Drawing.Point(6, 24); + this.groupBox31.Location = new System.Drawing.Point(8, 30); + this.groupBox31.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox31.Name = "groupBox31"; - this.groupBox31.Size = new System.Drawing.Size(274, 415); + this.groupBox31.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox31.Size = new System.Drawing.Size(365, 511); this.groupBox31.TabIndex = 45; this.groupBox31.TabStop = false; this.groupBox31.Text = "Maintable Effect Combos"; @@ -9629,31 +10385,34 @@ // HOWpbEffectsTableButton // this.HOWpbEffectsTableButton.Image = ((System.Drawing.Image)(resources.GetObject("HOWpbEffectsTableButton.Image"))); - this.HOWpbEffectsTableButton.Location = new System.Drawing.Point(154, 376); + this.HOWpbEffectsTableButton.Location = new System.Drawing.Point(205, 463); + this.HOWpbEffectsTableButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.HOWpbEffectsTableButton.Name = "HOWpbEffectsTableButton"; - this.HOWpbEffectsTableButton.Size = new System.Drawing.Size(28, 29); + this.HOWpbEffectsTableButton.Size = new System.Drawing.Size(37, 36); this.HOWpbEffectsTableButton.TabIndex = 44; this.HOWpbEffectsTableButton.UseVisualStyleBackColor = true; this.HOWpbEffectsTableButton.Click += new System.EventHandler(this.HOWpbEffectsTableButton_Click); // // pbEffectsBattleSSEQUpDown // - this.pbEffectsBattleSSEQUpDown.Location = new System.Drawing.Point(86, 382); + this.pbEffectsBattleSSEQUpDown.Location = new System.Drawing.Point(115, 470); + this.pbEffectsBattleSSEQUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pbEffectsBattleSSEQUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.pbEffectsBattleSSEQUpDown.Name = "pbEffectsBattleSSEQUpDown"; - this.pbEffectsBattleSSEQUpDown.Size = new System.Drawing.Size(54, 20); + this.pbEffectsBattleSSEQUpDown.Size = new System.Drawing.Size(72, 22); this.pbEffectsBattleSSEQUpDown.TabIndex = 29; // // label21 // this.label21.AutoSize = true; - this.label21.Location = new System.Drawing.Point(82, 367); + this.label21.Location = new System.Drawing.Point(109, 452); + this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(66, 13); + this.label21.Size = new System.Drawing.Size(81, 16); this.label21.TabIndex = 30; this.label21.Text = "Battle SSEQ"; // @@ -9661,9 +10420,10 @@ // this.saveEffectCombosTableBTN.Image = ((System.Drawing.Image)(resources.GetObject("saveEffectCombosTableBTN.Image"))); this.saveEffectCombosTableBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.saveEffectCombosTableBTN.Location = new System.Drawing.Point(184, 372); + this.saveEffectCombosTableBTN.Location = new System.Drawing.Point(245, 458); + this.saveEffectCombosTableBTN.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.saveEffectCombosTableBTN.Name = "saveEffectCombosTableBTN"; - this.saveEffectCombosTableBTN.Size = new System.Drawing.Size(78, 37); + this.saveEffectCombosTableBTN.Size = new System.Drawing.Size(104, 46); this.saveEffectCombosTableBTN.TabIndex = 43; this.saveEffectCombosTableBTN.Text = "Save This Combo"; this.saveEffectCombosTableBTN.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -9672,31 +10432,35 @@ // // pbEffectsVSAnimationUpDown // - this.pbEffectsVSAnimationUpDown.Location = new System.Drawing.Point(14, 382); + this.pbEffectsVSAnimationUpDown.Location = new System.Drawing.Point(19, 470); + this.pbEffectsVSAnimationUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pbEffectsVSAnimationUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.pbEffectsVSAnimationUpDown.Name = "pbEffectsVSAnimationUpDown"; - this.pbEffectsVSAnimationUpDown.Size = new System.Drawing.Size(58, 20); + this.pbEffectsVSAnimationUpDown.Size = new System.Drawing.Size(77, 22); this.pbEffectsVSAnimationUpDown.TabIndex = 31; // // pbEffectsCombosListbox // this.pbEffectsCombosListbox.FormattingEnabled = true; - this.pbEffectsCombosListbox.Location = new System.Drawing.Point(9, 18); + this.pbEffectsCombosListbox.ItemHeight = 16; + this.pbEffectsCombosListbox.Location = new System.Drawing.Point(12, 22); + this.pbEffectsCombosListbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pbEffectsCombosListbox.Name = "pbEffectsCombosListbox"; - this.pbEffectsCombosListbox.Size = new System.Drawing.Size(259, 342); + this.pbEffectsCombosListbox.Size = new System.Drawing.Size(344, 420); this.pbEffectsCombosListbox.TabIndex = 43; this.pbEffectsCombosListbox.SelectedIndexChanged += new System.EventHandler(this.pbEffectsCombosListbox_SelectedIndexChanged); // // label22 // this.label22.AutoSize = true; - this.label22.Location = new System.Drawing.Point(9, 367); + this.label22.Location = new System.Drawing.Point(12, 452); + this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(70, 13); + this.label22.Size = new System.Drawing.Size(87, 16); this.label22.TabIndex = 32; this.label22.Text = "VS Animation"; // @@ -9713,9 +10477,11 @@ this.pbEffectsTrainerGroupBox.Controls.Add(this.label70); this.pbEffectsTrainerGroupBox.Controls.Add(this.pbEffectsTrainerCombobox); this.pbEffectsTrainerGroupBox.Controls.Add(this.pbEffectsVsTrainerListbox); - this.pbEffectsTrainerGroupBox.Location = new System.Drawing.Point(286, 14); + this.pbEffectsTrainerGroupBox.Location = new System.Drawing.Point(381, 17); + this.pbEffectsTrainerGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pbEffectsTrainerGroupBox.Name = "pbEffectsTrainerGroupBox"; - this.pbEffectsTrainerGroupBox.Size = new System.Drawing.Size(481, 250); + this.pbEffectsTrainerGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pbEffectsTrainerGroupBox.Size = new System.Drawing.Size(641, 308); this.pbEffectsTrainerGroupBox.TabIndex = 34; this.pbEffectsTrainerGroupBox.TabStop = false; this.pbEffectsTrainerGroupBox.Text = "VS. Trainer"; @@ -9723,44 +10489,49 @@ // label75 // this.label75.AutoSize = true; - this.label75.Location = new System.Drawing.Point(390, 84); + this.label75.Location = new System.Drawing.Point(520, 103); + this.label75.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label75.Name = "label75"; - this.label75.Size = new System.Drawing.Size(79, 13); + this.label75.Size = new System.Drawing.Size(99, 16); this.label75.TabIndex = 46; this.label75.Text = "Preview frames"; // // tbEditortrainerClassFrameMaxLabel // this.tbEditortrainerClassFrameMaxLabel.AutoSize = true; - this.tbEditortrainerClassFrameMaxLabel.Location = new System.Drawing.Point(440, 103); + this.tbEditortrainerClassFrameMaxLabel.Location = new System.Drawing.Point(587, 127); + this.tbEditortrainerClassFrameMaxLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.tbEditortrainerClassFrameMaxLabel.Name = "tbEditortrainerClassFrameMaxLabel"; - this.tbEditortrainerClassFrameMaxLabel.Size = new System.Drawing.Size(18, 13); + this.tbEditortrainerClassFrameMaxLabel.Size = new System.Drawing.Size(18, 16); this.tbEditortrainerClassFrameMaxLabel.TabIndex = 45; this.tbEditortrainerClassFrameMaxLabel.Text = "/0"; // // tbEditorTrClassFramePreviewUpDown // - this.tbEditorTrClassFramePreviewUpDown.Location = new System.Drawing.Point(402, 100); + this.tbEditorTrClassFramePreviewUpDown.Location = new System.Drawing.Point(536, 123); + this.tbEditorTrClassFramePreviewUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tbEditorTrClassFramePreviewUpDown.Name = "tbEditorTrClassFramePreviewUpDown"; - this.tbEditorTrClassFramePreviewUpDown.Size = new System.Drawing.Size(38, 20); + this.tbEditorTrClassFramePreviewUpDown.Size = new System.Drawing.Size(51, 22); this.tbEditorTrClassFramePreviewUpDown.TabIndex = 44; this.tbEditorTrClassFramePreviewUpDown.ValueChanged += new System.EventHandler(this.TBLEditortrainerClassPreviewPic_ValueChanged); // // tbEditorTrClassPictureBox // this.tbEditorTrClassPictureBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbEditorTrClassPictureBox.Location = new System.Drawing.Point(253, 59); + this.tbEditorTrClassPictureBox.Location = new System.Drawing.Point(337, 73); + this.tbEditorTrClassPictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tbEditorTrClassPictureBox.Name = "tbEditorTrClassPictureBox"; - this.tbEditorTrClassPictureBox.Size = new System.Drawing.Size(128, 96); + this.tbEditorTrClassPictureBox.Size = new System.Drawing.Size(170, 118); this.tbEditorTrClassPictureBox.TabIndex = 43; this.tbEditorTrClassPictureBox.TabStop = false; // // label68 // this.label68.AutoSize = true; - this.label68.Location = new System.Drawing.Point(249, 164); + this.label68.Location = new System.Drawing.Point(332, 202); + this.label68.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label68.Name = "label68"; - this.label68.Size = new System.Drawing.Size(120, 13); + this.label68.Size = new System.Drawing.Size(149, 16); this.label68.TabIndex = 42; this.label68.Text = "Maintable Effect Combo"; // @@ -9768,17 +10539,19 @@ // this.pbEffectsTrainerChooseMainCombobox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.pbEffectsTrainerChooseMainCombobox.FormattingEnabled = true; - this.pbEffectsTrainerChooseMainCombobox.Location = new System.Drawing.Point(252, 178); + this.pbEffectsTrainerChooseMainCombobox.Location = new System.Drawing.Point(336, 219); + this.pbEffectsTrainerChooseMainCombobox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pbEffectsTrainerChooseMainCombobox.Name = "pbEffectsTrainerChooseMainCombobox"; - this.pbEffectsTrainerChooseMainCombobox.Size = new System.Drawing.Size(218, 21); + this.pbEffectsTrainerChooseMainCombobox.Size = new System.Drawing.Size(289, 24); this.pbEffectsTrainerChooseMainCombobox.TabIndex = 41; // // HOWVsTrainerButton // this.HOWVsTrainerButton.Image = ((System.Drawing.Image)(resources.GetObject("HOWVsTrainerButton.Image"))); - this.HOWVsTrainerButton.Location = new System.Drawing.Point(307, 209); + this.HOWVsTrainerButton.Location = new System.Drawing.Point(409, 257); + this.HOWVsTrainerButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.HOWVsTrainerButton.Name = "HOWVsTrainerButton"; - this.HOWVsTrainerButton.Size = new System.Drawing.Size(28, 29); + this.HOWVsTrainerButton.Size = new System.Drawing.Size(37, 36); this.HOWVsTrainerButton.TabIndex = 39; this.HOWVsTrainerButton.UseVisualStyleBackColor = true; this.HOWVsTrainerButton.Click += new System.EventHandler(this.HOWVsTrainerButton_Click); @@ -9787,9 +10560,10 @@ // this.saveVSTrainerTableBTN.Image = ((System.Drawing.Image)(resources.GetObject("saveVSTrainerTableBTN.Image"))); this.saveVSTrainerTableBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.saveVSTrainerTableBTN.Location = new System.Drawing.Point(337, 205); + this.saveVSTrainerTableBTN.Location = new System.Drawing.Point(449, 252); + this.saveVSTrainerTableBTN.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.saveVSTrainerTableBTN.Name = "saveVSTrainerTableBTN"; - this.saveVSTrainerTableBTN.Size = new System.Drawing.Size(80, 37); + this.saveVSTrainerTableBTN.Size = new System.Drawing.Size(107, 46); this.saveVSTrainerTableBTN.TabIndex = 38; this.saveVSTrainerTableBTN.Text = "Save This Entry"; this.saveVSTrainerTableBTN.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -9799,9 +10573,10 @@ // label70 // this.label70.AutoSize = true; - this.label70.Location = new System.Drawing.Point(248, 14); + this.label70.Location = new System.Drawing.Point(331, 17); + this.label70.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label70.Name = "label70"; - this.label70.Size = new System.Drawing.Size(68, 13); + this.label70.Size = new System.Drawing.Size(87, 16); this.label70.TabIndex = 37; this.label70.Text = "Trainer Class"; // @@ -9809,18 +10584,21 @@ // this.pbEffectsTrainerCombobox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.pbEffectsTrainerCombobox.FormattingEnabled = true; - this.pbEffectsTrainerCombobox.Location = new System.Drawing.Point(252, 29); + this.pbEffectsTrainerCombobox.Location = new System.Drawing.Point(336, 36); + this.pbEffectsTrainerCombobox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pbEffectsTrainerCombobox.Name = "pbEffectsTrainerCombobox"; - this.pbEffectsTrainerCombobox.Size = new System.Drawing.Size(218, 21); + this.pbEffectsTrainerCombobox.Size = new System.Drawing.Size(289, 24); this.pbEffectsTrainerCombobox.TabIndex = 36; this.pbEffectsTrainerCombobox.SelectedIndexChanged += new System.EventHandler(this.pbEffectsTrainerCombobox_SelectedIndexChanged); // // pbEffectsVsTrainerListbox // this.pbEffectsVsTrainerListbox.FormattingEnabled = true; - this.pbEffectsVsTrainerListbox.Location = new System.Drawing.Point(9, 18); + this.pbEffectsVsTrainerListbox.ItemHeight = 16; + this.pbEffectsVsTrainerListbox.Location = new System.Drawing.Point(12, 22); + this.pbEffectsVsTrainerListbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pbEffectsVsTrainerListbox.Name = "pbEffectsVsTrainerListbox"; - this.pbEffectsVsTrainerListbox.Size = new System.Drawing.Size(234, 225); + this.pbEffectsVsTrainerListbox.Size = new System.Drawing.Size(311, 276); this.pbEffectsVsTrainerListbox.TabIndex = 35; this.pbEffectsVsTrainerListbox.SelectedIndexChanged += new System.EventHandler(this.pbEffectsVsTrainerListbox_SelectedIndexChanged); // @@ -9834,18 +10612,21 @@ this.pbEffectsMonGroupBox.Controls.Add(this.label71); this.pbEffectsMonGroupBox.Controls.Add(this.pbEffectsPokemonCombobox); this.pbEffectsMonGroupBox.Controls.Add(this.pbEffectsVsPokemonListbox); - this.pbEffectsMonGroupBox.Location = new System.Drawing.Point(286, 265); + this.pbEffectsMonGroupBox.Location = new System.Drawing.Point(381, 326); + this.pbEffectsMonGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pbEffectsMonGroupBox.Name = "pbEffectsMonGroupBox"; - this.pbEffectsMonGroupBox.Size = new System.Drawing.Size(481, 174); + this.pbEffectsMonGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pbEffectsMonGroupBox.Size = new System.Drawing.Size(641, 214); this.pbEffectsMonGroupBox.TabIndex = 33; this.pbEffectsMonGroupBox.TabStop = false; this.pbEffectsMonGroupBox.Text = "VS. Pokémon"; // // tbEditorPokeminiPictureBox // - this.tbEditorPokeminiPictureBox.Location = new System.Drawing.Point(297, 12); + this.tbEditorPokeminiPictureBox.Location = new System.Drawing.Point(396, 15); + this.tbEditorPokeminiPictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tbEditorPokeminiPictureBox.Name = "tbEditorPokeminiPictureBox"; - this.tbEditorPokeminiPictureBox.Size = new System.Drawing.Size(40, 30); + this.tbEditorPokeminiPictureBox.Size = new System.Drawing.Size(53, 37); this.tbEditorPokeminiPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.tbEditorPokeminiPictureBox.TabIndex = 43; this.tbEditorPokeminiPictureBox.TabStop = false; @@ -9853,9 +10634,10 @@ // label69 // this.label69.AutoSize = true; - this.label69.Location = new System.Drawing.Point(249, 80); + this.label69.Location = new System.Drawing.Point(332, 98); + this.label69.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label69.Name = "label69"; - this.label69.Size = new System.Drawing.Size(120, 13); + this.label69.Size = new System.Drawing.Size(149, 16); this.label69.TabIndex = 42; this.label69.Text = "Maintable Effect Combo"; // @@ -9863,17 +10645,19 @@ // this.pbEffectsPokemonChooseMainCombobox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.pbEffectsPokemonChooseMainCombobox.FormattingEnabled = true; - this.pbEffectsPokemonChooseMainCombobox.Location = new System.Drawing.Point(252, 96); + this.pbEffectsPokemonChooseMainCombobox.Location = new System.Drawing.Point(336, 118); + this.pbEffectsPokemonChooseMainCombobox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pbEffectsPokemonChooseMainCombobox.Name = "pbEffectsPokemonChooseMainCombobox"; - this.pbEffectsPokemonChooseMainCombobox.Size = new System.Drawing.Size(218, 21); + this.pbEffectsPokemonChooseMainCombobox.Size = new System.Drawing.Size(289, 24); this.pbEffectsPokemonChooseMainCombobox.TabIndex = 41; // // HOWvsPokemonButton // this.HOWvsPokemonButton.Image = ((System.Drawing.Image)(resources.GetObject("HOWvsPokemonButton.Image"))); - this.HOWvsPokemonButton.Location = new System.Drawing.Point(307, 127); + this.HOWvsPokemonButton.Location = new System.Drawing.Point(409, 156); + this.HOWvsPokemonButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.HOWvsPokemonButton.Name = "HOWvsPokemonButton"; - this.HOWvsPokemonButton.Size = new System.Drawing.Size(28, 29); + this.HOWvsPokemonButton.Size = new System.Drawing.Size(37, 36); this.HOWvsPokemonButton.TabIndex = 39; this.HOWvsPokemonButton.UseVisualStyleBackColor = true; this.HOWvsPokemonButton.Click += new System.EventHandler(this.HOWvsPokemonButton_Click); @@ -9882,9 +10666,10 @@ // this.saveVSPokemonTableBTN.Image = ((System.Drawing.Image)(resources.GetObject("saveVSPokemonTableBTN.Image"))); this.saveVSPokemonTableBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.saveVSPokemonTableBTN.Location = new System.Drawing.Point(337, 123); + this.saveVSPokemonTableBTN.Location = new System.Drawing.Point(449, 151); + this.saveVSPokemonTableBTN.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.saveVSPokemonTableBTN.Name = "saveVSPokemonTableBTN"; - this.saveVSPokemonTableBTN.Size = new System.Drawing.Size(80, 37); + this.saveVSPokemonTableBTN.Size = new System.Drawing.Size(107, 46); this.saveVSPokemonTableBTN.TabIndex = 38; this.saveVSPokemonTableBTN.Text = "Save This Entry"; this.saveVSPokemonTableBTN.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -9894,9 +10679,10 @@ // label71 // this.label71.AutoSize = true; - this.label71.Location = new System.Drawing.Point(249, 29); + this.label71.Location = new System.Drawing.Point(332, 36); + this.label71.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label71.Name = "label71"; - this.label71.Size = new System.Drawing.Size(52, 13); + this.label71.Size = new System.Drawing.Size(65, 16); this.label71.TabIndex = 37; this.label71.Text = "Pokémon"; // @@ -9904,18 +10690,21 @@ // this.pbEffectsPokemonCombobox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.pbEffectsPokemonCombobox.FormattingEnabled = true; - this.pbEffectsPokemonCombobox.Location = new System.Drawing.Point(252, 45); + this.pbEffectsPokemonCombobox.Location = new System.Drawing.Point(336, 55); + this.pbEffectsPokemonCombobox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pbEffectsPokemonCombobox.Name = "pbEffectsPokemonCombobox"; - this.pbEffectsPokemonCombobox.Size = new System.Drawing.Size(218, 21); + this.pbEffectsPokemonCombobox.Size = new System.Drawing.Size(289, 24); this.pbEffectsPokemonCombobox.TabIndex = 36; this.pbEffectsPokemonCombobox.SelectedIndexChanged += new System.EventHandler(this.pbEffectsPokemonCombobox_SelectedIndexChanged); // // pbEffectsVsPokemonListbox // this.pbEffectsVsPokemonListbox.FormattingEnabled = true; - this.pbEffectsVsPokemonListbox.Location = new System.Drawing.Point(9, 17); + this.pbEffectsVsPokemonListbox.ItemHeight = 16; + this.pbEffectsVsPokemonListbox.Location = new System.Drawing.Point(12, 21); + this.pbEffectsVsPokemonListbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pbEffectsVsPokemonListbox.Name = "pbEffectsVsPokemonListbox"; - this.pbEffectsVsPokemonListbox.Size = new System.Drawing.Size(234, 147); + this.pbEffectsVsPokemonListbox.Size = new System.Drawing.Size(311, 180); this.pbEffectsVsPokemonListbox.TabIndex = 35; this.pbEffectsVsPokemonListbox.SelectedIndexChanged += new System.EventHandler(this.pbEffectsVsPokemonListbox_SelectedIndexChanged); // @@ -9932,9 +10721,11 @@ this.conditionalMusicGroupBox.Controls.Add(this.locationNameConditionalMusicLBL); this.conditionalMusicGroupBox.Controls.Add(this.headerConditionalMusicComboBox); this.conditionalMusicGroupBox.Controls.Add(this.conditionalMusicTableListBox); - this.conditionalMusicGroupBox.Location = new System.Drawing.Point(16, 9); + this.conditionalMusicGroupBox.Location = new System.Drawing.Point(21, 11); + this.conditionalMusicGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.conditionalMusicGroupBox.Name = "conditionalMusicGroupBox"; - this.conditionalMusicGroupBox.Size = new System.Drawing.Size(360, 190); + this.conditionalMusicGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.conditionalMusicGroupBox.Size = new System.Drawing.Size(480, 234); this.conditionalMusicGroupBox.TabIndex = 0; this.conditionalMusicGroupBox.TabStop = false; this.conditionalMusicGroupBox.Text = "Conditional Music Table"; @@ -9942,18 +10733,20 @@ // label66 // this.label66.AutoSize = true; - this.label66.Location = new System.Drawing.Point(5, 20); + this.label66.Location = new System.Drawing.Point(7, 25); + this.label66.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label66.Name = "label66"; - this.label66.Size = new System.Drawing.Size(72, 13); + this.label66.Size = new System.Drawing.Size(88, 16); this.label66.TabIndex = 10; this.label66.Text = "Locations List"; // // HOWconditionalMusicTableButton // this.HOWconditionalMusicTableButton.Image = ((System.Drawing.Image)(resources.GetObject("HOWconditionalMusicTableButton.Image"))); - this.HOWconditionalMusicTableButton.Location = new System.Drawing.Point(232, 146); + this.HOWconditionalMusicTableButton.Location = new System.Drawing.Point(309, 180); + this.HOWconditionalMusicTableButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.HOWconditionalMusicTableButton.Name = "HOWconditionalMusicTableButton"; - this.HOWconditionalMusicTableButton.Size = new System.Drawing.Size(28, 29); + this.HOWconditionalMusicTableButton.Size = new System.Drawing.Size(37, 36); this.HOWconditionalMusicTableButton.TabIndex = 9; this.HOWconditionalMusicTableButton.UseVisualStyleBackColor = true; this.HOWconditionalMusicTableButton.Click += new System.EventHandler(this.HOWconditionalMusicTableButton_Click); @@ -9962,9 +10755,10 @@ // this.saveConditionalMusicTableBTN.Image = ((System.Drawing.Image)(resources.GetObject("saveConditionalMusicTableBTN.Image"))); this.saveConditionalMusicTableBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.saveConditionalMusicTableBTN.Location = new System.Drawing.Point(262, 142); + this.saveConditionalMusicTableBTN.Location = new System.Drawing.Point(349, 175); + this.saveConditionalMusicTableBTN.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.saveConditionalMusicTableBTN.Name = "saveConditionalMusicTableBTN"; - this.saveConditionalMusicTableBTN.Size = new System.Drawing.Size(89, 37); + this.saveConditionalMusicTableBTN.Size = new System.Drawing.Size(119, 46); this.saveConditionalMusicTableBTN.TabIndex = 8; this.saveConditionalMusicTableBTN.Text = "Save Table"; this.saveConditionalMusicTableBTN.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -9974,62 +10768,68 @@ // label65 // this.label65.AutoSize = true; - this.label65.Location = new System.Drawing.Point(262, 83); + this.label65.Location = new System.Drawing.Point(349, 102); + this.label65.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label65.Name = "label65"; - this.label65.Size = new System.Drawing.Size(49, 13); + this.label65.Size = new System.Drawing.Size(58, 16); this.label65.TabIndex = 7; this.label65.Text = "Music ID"; // // musicIDconditionalMusicUpDown // - this.musicIDconditionalMusicUpDown.Location = new System.Drawing.Point(265, 99); + this.musicIDconditionalMusicUpDown.Location = new System.Drawing.Point(353, 122); + this.musicIDconditionalMusicUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.musicIDconditionalMusicUpDown.Maximum = new decimal(new int[] { 32767, 0, 0, 0}); this.musicIDconditionalMusicUpDown.Name = "musicIDconditionalMusicUpDown"; - this.musicIDconditionalMusicUpDown.Size = new System.Drawing.Size(67, 20); + this.musicIDconditionalMusicUpDown.Size = new System.Drawing.Size(89, 22); this.musicIDconditionalMusicUpDown.TabIndex = 6; this.musicIDconditionalMusicUpDown.ValueChanged += new System.EventHandler(this.musicIDconditionalMusicUpDown_ValueChanged); // // label64 // this.label64.AutoSize = true; - this.label64.Location = new System.Drawing.Point(179, 83); + this.label64.Location = new System.Drawing.Point(239, 102); + this.label64.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label64.Name = "label64"; - this.label64.Size = new System.Drawing.Size(27, 13); + this.label64.Size = new System.Drawing.Size(34, 16); this.label64.TabIndex = 5; this.label64.Text = "Flag"; // // flagConditionalMusicUpDown // - this.flagConditionalMusicUpDown.Location = new System.Drawing.Point(182, 99); + this.flagConditionalMusicUpDown.Location = new System.Drawing.Point(243, 122); + this.flagConditionalMusicUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.flagConditionalMusicUpDown.Maximum = new decimal(new int[] { 32767, 0, 0, 0}); this.flagConditionalMusicUpDown.Name = "flagConditionalMusicUpDown"; - this.flagConditionalMusicUpDown.Size = new System.Drawing.Size(67, 20); + this.flagConditionalMusicUpDown.Size = new System.Drawing.Size(89, 22); this.flagConditionalMusicUpDown.TabIndex = 4; this.flagConditionalMusicUpDown.ValueChanged += new System.EventHandler(this.flagConditionalMusicUpDown_ValueChanged); // // label41 // this.label41.AutoSize = true; - this.label41.Location = new System.Drawing.Point(175, 20); + this.label41.Location = new System.Drawing.Point(233, 25); + this.label41.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label41.Name = "label41"; - this.label41.Size = new System.Drawing.Size(42, 13); + this.label41.Size = new System.Drawing.Size(53, 16); this.label41.TabIndex = 3; this.label41.Text = "Header"; // // locationNameConditionalMusicLBL // this.locationNameConditionalMusicLBL.AutoSize = true; - this.locationNameConditionalMusicLBL.Location = new System.Drawing.Point(175, 59); + this.locationNameConditionalMusicLBL.Location = new System.Drawing.Point(233, 73); + this.locationNameConditionalMusicLBL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.locationNameConditionalMusicLBL.Name = "locationNameConditionalMusicLBL"; - this.locationNameConditionalMusicLBL.Size = new System.Drawing.Size(79, 13); + this.locationNameConditionalMusicLBL.Size = new System.Drawing.Size(98, 16); this.locationNameConditionalMusicLBL.TabIndex = 2; this.locationNameConditionalMusicLBL.Text = "Location Name"; // @@ -10037,18 +10837,21 @@ // this.headerConditionalMusicComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.headerConditionalMusicComboBox.FormattingEnabled = true; - this.headerConditionalMusicComboBox.Location = new System.Drawing.Point(178, 35); + this.headerConditionalMusicComboBox.Location = new System.Drawing.Point(237, 43); + this.headerConditionalMusicComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.headerConditionalMusicComboBox.Name = "headerConditionalMusicComboBox"; - this.headerConditionalMusicComboBox.Size = new System.Drawing.Size(173, 21); + this.headerConditionalMusicComboBox.Size = new System.Drawing.Size(229, 24); this.headerConditionalMusicComboBox.TabIndex = 1; this.headerConditionalMusicComboBox.SelectedIndexChanged += new System.EventHandler(this.headerConditionalMusicComboBox_SelectedIndexChanged); // // conditionalMusicTableListBox // this.conditionalMusicTableListBox.FormattingEnabled = true; - this.conditionalMusicTableListBox.Location = new System.Drawing.Point(6, 34); + this.conditionalMusicTableListBox.ItemHeight = 16; + this.conditionalMusicTableListBox.Location = new System.Drawing.Point(8, 42); + this.conditionalMusicTableListBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.conditionalMusicTableListBox.Name = "conditionalMusicTableListBox"; - this.conditionalMusicTableListBox.Size = new System.Drawing.Size(165, 147); + this.conditionalMusicTableListBox.Size = new System.Drawing.Size(219, 180); this.conditionalMusicTableListBox.TabIndex = 0; this.conditionalMusicTableListBox.SelectedIndexChanged += new System.EventHandler(this.conditionalMusicTableListBox_SelectedIndexChanged); // @@ -10056,29 +10859,32 @@ // this.tabPageScriptEditor.Controls.Add(this.scriptEditor); this.tabPageScriptEditor.ImageIndex = 5; - this.tabPageScriptEditor.Location = new System.Drawing.Point(4, 23); + this.tabPageScriptEditor.Location = new System.Drawing.Point(4, 25); + this.tabPageScriptEditor.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabPageScriptEditor.Name = "tabPageScriptEditor"; - this.tabPageScriptEditor.Padding = new System.Windows.Forms.Padding(3); - this.tabPageScriptEditor.Size = new System.Drawing.Size(1185, 675); + this.tabPageScriptEditor.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabPageScriptEditor.Size = new System.Drawing.Size(1583, 835); this.tabPageScriptEditor.TabIndex = 10; this.tabPageScriptEditor.Text = "Script Editor New"; this.tabPageScriptEditor.UseVisualStyleBackColor = true; // // scriptEditor // - this.scriptEditor.Location = new System.Drawing.Point(2, 3); + this.scriptEditor.Location = new System.Drawing.Point(3, 4); + this.scriptEditor.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.scriptEditor.Name = "scriptEditor"; this.scriptEditor.scriptEditorIsReady = false; - this.scriptEditor.Size = new System.Drawing.Size(1177, 735); + this.scriptEditor.Size = new System.Drawing.Size(1569, 905); this.scriptEditor.TabIndex = 0; // // tabPageLevelScriptEditor // this.tabPageLevelScriptEditor.Controls.Add(this.levelScriptEditor); - this.tabPageLevelScriptEditor.Location = new System.Drawing.Point(4, 23); + this.tabPageLevelScriptEditor.Location = new System.Drawing.Point(4, 25); + this.tabPageLevelScriptEditor.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabPageLevelScriptEditor.Name = "tabPageLevelScriptEditor"; - this.tabPageLevelScriptEditor.Padding = new System.Windows.Forms.Padding(3); - this.tabPageLevelScriptEditor.Size = new System.Drawing.Size(1185, 675); + this.tabPageLevelScriptEditor.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabPageLevelScriptEditor.Size = new System.Drawing.Size(1583, 835); this.tabPageLevelScriptEditor.TabIndex = 11; this.tabPageLevelScriptEditor.Text = "Level Script Editor"; this.tabPageLevelScriptEditor.UseVisualStyleBackColor = true; @@ -10087,27 +10893,30 @@ // this.levelScriptEditor.BackColor = System.Drawing.SystemColors.Control; this.levelScriptEditor.levelScriptEditorIsReady = false; - this.levelScriptEditor.Location = new System.Drawing.Point(6, 8); + this.levelScriptEditor.Location = new System.Drawing.Point(8, 10); + this.levelScriptEditor.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.levelScriptEditor.Name = "levelScriptEditor"; - this.levelScriptEditor.Size = new System.Drawing.Size(408, 622); + this.levelScriptEditor.Size = new System.Drawing.Size(544, 766); this.levelScriptEditor.TabIndex = 0; // // tabPageEncountersEditor // this.tabPageEncountersEditor.Controls.Add(this.encountersEditor); - this.tabPageEncountersEditor.Location = new System.Drawing.Point(4, 23); + this.tabPageEncountersEditor.Location = new System.Drawing.Point(4, 25); + this.tabPageEncountersEditor.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabPageEncountersEditor.Name = "tabPageEncountersEditor"; - this.tabPageEncountersEditor.Padding = new System.Windows.Forms.Padding(3); - this.tabPageEncountersEditor.Size = new System.Drawing.Size(1185, 675); + this.tabPageEncountersEditor.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabPageEncountersEditor.Size = new System.Drawing.Size(1583, 835); this.tabPageEncountersEditor.TabIndex = 12; this.tabPageEncountersEditor.Text = "Encounters"; this.tabPageEncountersEditor.UseVisualStyleBackColor = true; // // encountersEditor // - this.encountersEditor.Location = new System.Drawing.Point(6, 3); + this.encountersEditor.Location = new System.Drawing.Point(8, 4); + this.encountersEditor.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.encountersEditor.Name = "encountersEditor"; - this.encountersEditor.Size = new System.Drawing.Size(1176, 672); + this.encountersEditor.Size = new System.Drawing.Size(1568, 827); this.encountersEditor.TabIndex = 0; // // mainTabImageList @@ -10130,9 +10939,10 @@ this.gameIcon.ErrorImage = null; this.gameIcon.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.gameIcon.InitialImage = null; - this.gameIcon.Location = new System.Drawing.Point(1167, 35); + this.gameIcon.Location = new System.Drawing.Point(1556, 43); + this.gameIcon.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.gameIcon.Name = "gameIcon"; - this.gameIcon.Size = new System.Drawing.Size(32, 32); + this.gameIcon.Size = new System.Drawing.Size(43, 39); this.gameIcon.TabIndex = 8; this.gameIcon.TabStop = false; this.gameIcon.Paint += new System.Windows.Forms.PaintEventHandler(this.PaintGameIcon); @@ -10140,9 +10950,10 @@ // languageLabel // this.languageLabel.AutoSize = true; - this.languageLabel.Location = new System.Drawing.Point(1042, 52); + this.languageLabel.Location = new System.Drawing.Point(1389, 64); + this.languageLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.languageLabel.Name = "languageLabel"; - this.languageLabel.Size = new System.Drawing.Size(58, 13); + this.languageLabel.Size = new System.Drawing.Size(71, 16); this.languageLabel.TabIndex = 10; this.languageLabel.Text = "Language:"; this.languageLabel.Visible = false; @@ -10151,6 +10962,7 @@ // this.menuStrip1.BackColor = System.Drawing.SystemColors.Window; this.menuStrip1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.menuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, this.aboutToolStripMenuItem, @@ -10159,7 +10971,7 @@ this.aboutToolStripMenuItem1}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(1214, 24); + this.menuStrip1.Size = new System.Drawing.Size(1619, 28); this.menuStrip1.TabIndex = 12; this.menuStrip1.Text = "menuStrip1"; // @@ -10170,7 +10982,7 @@ this.openFolderToolStripMenuItem, this.saveROMToolStripMenuItem}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); + this.fileToolStripMenuItem.Size = new System.Drawing.Size(46, 24); this.fileToolStripMenuItem.Text = "File"; // // openROMToolStripMenuItem @@ -10178,7 +10990,7 @@ this.openROMToolStripMenuItem.Image = global::DSPRE.Properties.Resources.open_rom; this.openROMToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.openROMToolStripMenuItem.Name = "openROMToolStripMenuItem"; - this.openROMToolStripMenuItem.Size = new System.Drawing.Size(155, 38); + this.openROMToolStripMenuItem.Size = new System.Drawing.Size(186, 38); this.openROMToolStripMenuItem.Text = "Open ROM"; this.openROMToolStripMenuItem.Click += new System.EventHandler(this.loadRom_Click); // @@ -10187,7 +10999,7 @@ this.openFolderToolStripMenuItem.Image = global::DSPRE.Properties.Resources.open_file; this.openFolderToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.openFolderToolStripMenuItem.Name = "openFolderToolStripMenuItem"; - this.openFolderToolStripMenuItem.Size = new System.Drawing.Size(155, 38); + this.openFolderToolStripMenuItem.Size = new System.Drawing.Size(186, 38); this.openFolderToolStripMenuItem.Text = "Open Folder"; this.openFolderToolStripMenuItem.Click += new System.EventHandler(this.readDataFromFolderButton_Click); // @@ -10197,7 +11009,7 @@ this.saveROMToolStripMenuItem.Image = global::DSPRE.Properties.Resources.save_rom; this.saveROMToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.saveROMToolStripMenuItem.Name = "saveROMToolStripMenuItem"; - this.saveROMToolStripMenuItem.Size = new System.Drawing.Size(155, 38); + this.saveROMToolStripMenuItem.Size = new System.Drawing.Size(186, 38); this.saveROMToolStripMenuItem.Text = "Save ROM"; this.saveROMToolStripMenuItem.Click += new System.EventHandler(this.saveRom_Click); // @@ -10213,14 +11025,14 @@ this.listBuilderToolStripMenuItem, this.nSBMDUtilityToolStripMenuItem}); this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(46, 20); + this.aboutToolStripMenuItem.Size = new System.Drawing.Size(58, 24); this.aboutToolStripMenuItem.Text = "Tools"; // // romToolboxToolStripMenuItem // this.romToolboxToolStripMenuItem.Enabled = false; this.romToolboxToolStripMenuItem.Name = "romToolboxToolStripMenuItem"; - this.romToolboxToolStripMenuItem.Size = new System.Drawing.Size(220, 22); + this.romToolboxToolStripMenuItem.Size = new System.Drawing.Size(276, 26); this.romToolboxToolStripMenuItem.Text = "ROM Toolbox"; this.romToolboxToolStripMenuItem.Click += new System.EventHandler(this.romToolBoxToolStripMenuItem_Click); // @@ -10228,7 +11040,7 @@ // this.headerSearchToolStripMenuItem.Enabled = false; this.headerSearchToolStripMenuItem.Name = "headerSearchToolStripMenuItem"; - this.headerSearchToolStripMenuItem.Size = new System.Drawing.Size(220, 22); + this.headerSearchToolStripMenuItem.Size = new System.Drawing.Size(276, 26); this.headerSearchToolStripMenuItem.Text = "Advanced Header Search"; this.headerSearchToolStripMenuItem.Click += new System.EventHandler(this.advancedHeaderSearchToolStripMenuItem_Click); // @@ -10239,7 +11051,7 @@ this.platinumToolStripMenuItem, this.heartGoldAndSoulSilverToolStripMenuItem}); this.scriptCommandsDatabaseToolStripMenuItem.Name = "scriptCommandsDatabaseToolStripMenuItem"; - this.scriptCommandsDatabaseToolStripMenuItem.Size = new System.Drawing.Size(220, 22); + this.scriptCommandsDatabaseToolStripMenuItem.Size = new System.Drawing.Size(276, 26); this.scriptCommandsDatabaseToolStripMenuItem.Text = "Script Commands Database"; // // diamondAndPearlToolStripMenuItem @@ -10247,7 +11059,7 @@ this.diamondAndPearlToolStripMenuItem.Image = global::DSPRE.Properties.Resources.scriptDBIconDP; this.diamondAndPearlToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.diamondAndPearlToolStripMenuItem.Name = "diamondAndPearlToolStripMenuItem"; - this.diamondAndPearlToolStripMenuItem.Size = new System.Drawing.Size(211, 38); + this.diamondAndPearlToolStripMenuItem.Size = new System.Drawing.Size(258, 38); this.diamondAndPearlToolStripMenuItem.Text = "Diamond && Pearl"; this.diamondAndPearlToolStripMenuItem.Click += new System.EventHandler(this.diamondAndPearlToolStripMenuItem_Click); // @@ -10256,7 +11068,7 @@ this.platinumToolStripMenuItem.Image = global::DSPRE.Properties.Resources.scriptDBIconPt; this.platinumToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.platinumToolStripMenuItem.Name = "platinumToolStripMenuItem"; - this.platinumToolStripMenuItem.Size = new System.Drawing.Size(211, 38); + this.platinumToolStripMenuItem.Size = new System.Drawing.Size(258, 38); this.platinumToolStripMenuItem.Text = "Platinum"; this.platinumToolStripMenuItem.Click += new System.EventHandler(this.platinumToolStripMenuItem_Click); // @@ -10265,7 +11077,7 @@ this.heartGoldAndSoulSilverToolStripMenuItem.Image = global::DSPRE.Properties.Resources.scriptDBIconHGSS; this.heartGoldAndSoulSilverToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.heartGoldAndSoulSilverToolStripMenuItem.Name = "heartGoldAndSoulSilverToolStripMenuItem"; - this.heartGoldAndSoulSilverToolStripMenuItem.Size = new System.Drawing.Size(211, 38); + this.heartGoldAndSoulSilverToolStripMenuItem.Size = new System.Drawing.Size(258, 38); this.heartGoldAndSoulSilverToolStripMenuItem.Text = "HeartGold && SoulSilver"; this.heartGoldAndSoulSilverToolStripMenuItem.Click += new System.EventHandler(this.heartGoldAndSoulSilverToolStripMenuItem_Click); // @@ -10273,7 +11085,7 @@ // this.spawnEditorToolStripMenuItem.Enabled = false; this.spawnEditorToolStripMenuItem.Name = "spawnEditorToolStripMenuItem"; - this.spawnEditorToolStripMenuItem.Size = new System.Drawing.Size(220, 22); + this.spawnEditorToolStripMenuItem.Size = new System.Drawing.Size(276, 26); this.spawnEditorToolStripMenuItem.Text = "Spawn Point Editor"; this.spawnEditorToolStripMenuItem.Click += new System.EventHandler(this.spawnEditorToolStripMenuItem_Click); // @@ -10283,7 +11095,7 @@ this.buildFomFolderToolStripMenuItem, this.unpackToFolderToolStripMenuItem}); this.NarcUtilityToolStripMenuItem.Name = "NarcUtilityToolStripMenuItem"; - this.NarcUtilityToolStripMenuItem.Size = new System.Drawing.Size(220, 22); + this.NarcUtilityToolStripMenuItem.Size = new System.Drawing.Size(276, 26); this.NarcUtilityToolStripMenuItem.Text = "NARC Utility"; // // buildFomFolderToolStripMenuItem @@ -10291,7 +11103,7 @@ this.buildFomFolderToolStripMenuItem.Image = global::DSPRE.Properties.Resources.folderToNarcIcon; this.buildFomFolderToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.buildFomFolderToolStripMenuItem.Name = "buildFomFolderToolStripMenuItem"; - this.buildFomFolderToolStripMenuItem.Size = new System.Drawing.Size(214, 38); + this.buildFomFolderToolStripMenuItem.Size = new System.Drawing.Size(252, 38); this.buildFomFolderToolStripMenuItem.Text = "Build from Folder"; this.buildFomFolderToolStripMenuItem.Click += new System.EventHandler(this.buildFromFolderToolStripMenuItem_Click); // @@ -10300,7 +11112,7 @@ this.unpackToFolderToolStripMenuItem.Image = global::DSPRE.Properties.Resources.narcToFolderIcon; this.unpackToFolderToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.unpackToFolderToolStripMenuItem.Name = "unpackToFolderToolStripMenuItem"; - this.unpackToFolderToolStripMenuItem.Size = new System.Drawing.Size(214, 38); + this.unpackToFolderToolStripMenuItem.Size = new System.Drawing.Size(252, 38); this.unpackToFolderToolStripMenuItem.Text = "Unpack to Folder"; this.unpackToFolderToolStripMenuItem.Click += new System.EventHandler(this.unpackToFolderToolStripMenuItem_Click); // @@ -10310,7 +11122,7 @@ this.listBasedToolStripMenuItem, this.contentBasedToolStripMenuItem}); this.listBasedBatchRenameToolStripMenuItem.Name = "listBasedBatchRenameToolStripMenuItem"; - this.listBasedBatchRenameToolStripMenuItem.Size = new System.Drawing.Size(220, 22); + this.listBasedBatchRenameToolStripMenuItem.Size = new System.Drawing.Size(276, 26); this.listBasedBatchRenameToolStripMenuItem.Text = "Batch Rename Utility"; // // listBasedToolStripMenuItem @@ -10318,7 +11130,7 @@ this.listBasedToolStripMenuItem.Image = global::DSPRE.Properties.Resources.listbasedRenameIcon; this.listBasedToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.listBasedToolStripMenuItem.Name = "listBasedToolStripMenuItem"; - this.listBasedToolStripMenuItem.Size = new System.Drawing.Size(185, 38); + this.listBasedToolStripMenuItem.Size = new System.Drawing.Size(218, 38); this.listBasedToolStripMenuItem.Text = "List-Based"; this.listBasedToolStripMenuItem.Click += new System.EventHandler(this.listBasedToolStripMenuItem_Click); // @@ -10327,7 +11139,7 @@ this.contentBasedToolStripMenuItem.Image = global::DSPRE.Properties.Resources.contentbasedRenameIcon; this.contentBasedToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.contentBasedToolStripMenuItem.Name = "contentBasedToolStripMenuItem"; - this.contentBasedToolStripMenuItem.Size = new System.Drawing.Size(185, 38); + this.contentBasedToolStripMenuItem.Size = new System.Drawing.Size(218, 38); this.contentBasedToolStripMenuItem.Text = "Content-Based"; this.contentBasedToolStripMenuItem.Click += new System.EventHandler(this.contentBasedToolStripMenuItem_Click); // @@ -10337,7 +11149,7 @@ this.fromCEnumToolStripMenuItem, this.fromFolderContentsToolStripMenuItem}); this.listBuilderToolStripMenuItem.Name = "listBuilderToolStripMenuItem"; - this.listBuilderToolStripMenuItem.Size = new System.Drawing.Size(220, 22); + this.listBuilderToolStripMenuItem.Size = new System.Drawing.Size(276, 26); this.listBuilderToolStripMenuItem.Text = "Folder-Based List Builder"; // // fromCEnumToolStripMenuItem @@ -10345,7 +11157,7 @@ this.fromCEnumToolStripMenuItem.Image = global::DSPRE.Properties.Resources.enumToListIcon; this.fromCEnumToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.fromCEnumToolStripMenuItem.Name = "fromCEnumToolStripMenuItem"; - this.fromCEnumToolStripMenuItem.Size = new System.Drawing.Size(237, 38); + this.fromCEnumToolStripMenuItem.Size = new System.Drawing.Size(278, 38); this.fromCEnumToolStripMenuItem.Text = "From C Enum"; this.fromCEnumToolStripMenuItem.Click += new System.EventHandler(this.enumBasedListBuilderToolStripButton_Click); // @@ -10354,7 +11166,7 @@ this.fromFolderContentsToolStripMenuItem.Image = global::DSPRE.Properties.Resources.folderToListIcon; this.fromFolderContentsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.fromFolderContentsToolStripMenuItem.Name = "fromFolderContentsToolStripMenuItem"; - this.fromFolderContentsToolStripMenuItem.Size = new System.Drawing.Size(237, 38); + this.fromFolderContentsToolStripMenuItem.Size = new System.Drawing.Size(278, 38); this.fromFolderContentsToolStripMenuItem.Text = "From Folder Contents"; this.fromFolderContentsToolStripMenuItem.Click += new System.EventHandler(this.fromFolderContentsToolStripMenuItem_Click); // @@ -10365,7 +11177,7 @@ this.untexturizeToolStripMenuItem, this.extractNSBTXFromNSBMDToolStripMenuItem}); this.nSBMDUtilityToolStripMenuItem.Name = "nSBMDUtilityToolStripMenuItem"; - this.nSBMDUtilityToolStripMenuItem.Size = new System.Drawing.Size(220, 22); + this.nSBMDUtilityToolStripMenuItem.Size = new System.Drawing.Size(276, 26); this.nSBMDUtilityToolStripMenuItem.Text = "NSBMD Utility"; // // texturizeNSBMDToolStripMenuItem @@ -10373,7 +11185,7 @@ this.texturizeNSBMDToolStripMenuItem.Image = global::DSPRE.Properties.Resources.addTextureToNSBMD; this.texturizeNSBMDToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.texturizeNSBMDToolStripMenuItem.Name = "texturizeNSBMDToolStripMenuItem"; - this.texturizeNSBMDToolStripMenuItem.Size = new System.Drawing.Size(251, 38); + this.texturizeNSBMDToolStripMenuItem.Size = new System.Drawing.Size(306, 38); this.texturizeNSBMDToolStripMenuItem.Text = "Add/Replace NSBMD textures"; this.texturizeNSBMDToolStripMenuItem.Click += new System.EventHandler(this.nsbmdAddTexButton_Click); // @@ -10382,7 +11194,7 @@ this.untexturizeToolStripMenuItem.Image = global::DSPRE.Properties.Resources.removeTextureNSBMD; this.untexturizeToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.untexturizeToolStripMenuItem.Name = "untexturizeToolStripMenuItem"; - this.untexturizeToolStripMenuItem.Size = new System.Drawing.Size(251, 38); + this.untexturizeToolStripMenuItem.Size = new System.Drawing.Size(306, 38); this.untexturizeToolStripMenuItem.Text = "Remove textures from NSBMD"; this.untexturizeToolStripMenuItem.Click += new System.EventHandler(this.nsbmdRemoveTexButton_Click); // @@ -10391,7 +11203,7 @@ this.extractNSBTXFromNSBMDToolStripMenuItem.Image = global::DSPRE.Properties.Resources.saveTextureFromNSBMD; this.extractNSBTXFromNSBMDToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.extractNSBTXFromNSBMDToolStripMenuItem.Name = "extractNSBTXFromNSBMDToolStripMenuItem"; - this.extractNSBTXFromNSBMDToolStripMenuItem.Size = new System.Drawing.Size(251, 38); + this.extractNSBTXFromNSBMDToolStripMenuItem.Size = new System.Drawing.Size(306, 38); this.extractNSBTXFromNSBMDToolStripMenuItem.Text = "Save textures from NSBMD"; this.extractNSBTXFromNSBMDToolStripMenuItem.Click += new System.EventHandler(this.nsbmdExportTexButton_Click); // @@ -10403,20 +11215,20 @@ this.evolutionsEditorToolStripMenuItem}); this.monEditorToolStripMenuItem.Enabled = false; this.monEditorToolStripMenuItem.Name = "monEditorToolStripMenuItem"; - this.monEditorToolStripMenuItem.Size = new System.Drawing.Size(78, 20); + this.monEditorToolStripMenuItem.Size = new System.Drawing.Size(97, 24); this.monEditorToolStripMenuItem.Text = "Mon Editor"; // // personalDataEditorToolStripMenuItem // this.personalDataEditorToolStripMenuItem.Name = "personalDataEditorToolStripMenuItem"; - this.personalDataEditorToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.personalDataEditorToolStripMenuItem.Size = new System.Drawing.Size(204, 26); this.personalDataEditorToolStripMenuItem.Text = "Pokemon Editor"; this.personalDataEditorToolStripMenuItem.Click += new System.EventHandler(this.personalDataEditorToolStripMenuItem_Click); // // learnsetsEditorToolStripMenuItem // this.learnsetsEditorToolStripMenuItem.Name = "learnsetsEditorToolStripMenuItem"; - this.learnsetsEditorToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.learnsetsEditorToolStripMenuItem.Size = new System.Drawing.Size(204, 26); this.learnsetsEditorToolStripMenuItem.Text = "Learnsets Editor"; this.learnsetsEditorToolStripMenuItem.Visible = false; this.learnsetsEditorToolStripMenuItem.Click += new System.EventHandler(this.learnsetsEditorToolStripMenuItem_Click); @@ -10424,7 +11236,7 @@ // evolutionsEditorToolStripMenuItem // this.evolutionsEditorToolStripMenuItem.Name = "evolutionsEditorToolStripMenuItem"; - this.evolutionsEditorToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.evolutionsEditorToolStripMenuItem.Size = new System.Drawing.Size(204, 26); this.evolutionsEditorToolStripMenuItem.Text = "Evolutions Editor"; this.evolutionsEditorToolStripMenuItem.Visible = false; this.evolutionsEditorToolStripMenuItem.Click += new System.EventHandler(this.evolutionsEditorToolStripMenuItem_Click); @@ -10437,20 +11249,20 @@ this.advancedStripMenuItem, this.fullViewToolStripMenuItem}); this.menuViewToolStripMenuItem.Name = "menuViewToolStripMenuItem"; - this.menuViewToolStripMenuItem.Size = new System.Drawing.Size(78, 20); + this.menuViewToolStripMenuItem.Size = new System.Drawing.Size(96, 24); this.menuViewToolStripMenuItem.Text = "Menu View"; // // essentialToolStripMenuItem // this.essentialToolStripMenuItem.Name = "essentialToolStripMenuItem"; - this.essentialToolStripMenuItem.Size = new System.Drawing.Size(127, 22); + this.essentialToolStripMenuItem.Size = new System.Drawing.Size(158, 26); 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(127, 22); + this.simpleToolStripMenuItem.Size = new System.Drawing.Size(158, 26); this.simpleToolStripMenuItem.Text = "Simple"; this.simpleToolStripMenuItem.MouseDown += new System.Windows.Forms.MouseEventHandler(this.simpleToolStripMenuItem_MouseDown); // @@ -10459,46 +11271,48 @@ this.advancedStripMenuItem.Checked = true; this.advancedStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.advancedStripMenuItem.Name = "advancedStripMenuItem"; - this.advancedStripMenuItem.Size = new System.Drawing.Size(127, 22); + this.advancedStripMenuItem.Size = new System.Drawing.Size(158, 26); 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(127, 22); + this.fullViewToolStripMenuItem.Size = new System.Drawing.Size(158, 26); this.fullViewToolStripMenuItem.Text = "Complete"; this.fullViewToolStripMenuItem.MouseDown += new System.Windows.Forms.MouseEventHandler(this.simpleToolStripMenuItem_MouseDown); // // aboutToolStripMenuItem1 // this.aboutToolStripMenuItem1.Name = "aboutToolStripMenuItem1"; - this.aboutToolStripMenuItem1.Size = new System.Drawing.Size(52, 20); + this.aboutToolStripMenuItem1.Size = new System.Drawing.Size(64, 24); this.aboutToolStripMenuItem1.Text = "About"; this.aboutToolStripMenuItem1.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); // // statusStrip1 // this.statusStrip1.BackColor = System.Drawing.SystemColors.Control; + this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.statusLabel, this.toolStripProgressBar}); - this.statusStrip1.Location = new System.Drawing.Point(0, 777); + this.statusStrip1.Location = new System.Drawing.Point(0, 957); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(1214, 22); + this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 19, 0); + this.statusStrip1.Size = new System.Drawing.Size(1619, 26); this.statusStrip1.TabIndex = 13; this.statusStrip1.Text = "statusStrip1"; // // statusLabel // this.statusLabel.Name = "statusLabel"; - this.statusLabel.Size = new System.Drawing.Size(39, 17); + this.statusLabel.Size = new System.Drawing.Size(50, 20); this.statusLabel.Text = "Ready"; // // toolStripProgressBar // this.toolStripProgressBar.Name = "toolStripProgressBar"; - this.toolStripProgressBar.Size = new System.Drawing.Size(180, 18); + this.toolStripProgressBar.Size = new System.Drawing.Size(240, 18); this.toolStripProgressBar.Visible = false; // // mainToolStrip @@ -10506,6 +11320,7 @@ this.mainToolStrip.AllowMerge = false; this.mainToolStrip.BackColor = System.Drawing.SystemColors.Menu; this.mainToolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; + this.mainToolStrip.ImageScalingSize = new System.Drawing.Size(20, 20); this.mainToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.loadRomButton, this.readDataFromFolderButton, @@ -10534,9 +11349,9 @@ this.headerSearchToolStripButton, this.spawnEditorToolStripButton, this.separator_afterMiscButtons}); - this.mainToolStrip.Location = new System.Drawing.Point(0, 24); + this.mainToolStrip.Location = new System.Drawing.Point(0, 28); this.mainToolStrip.Name = "mainToolStrip"; - this.mainToolStrip.Size = new System.Drawing.Size(1214, 44); + this.mainToolStrip.Size = new System.Drawing.Size(1619, 44); this.mainToolStrip.TabIndex = 16; this.mainToolStrip.Text = "mainToolStrip"; // @@ -10835,9 +11650,10 @@ // versionLabel // this.versionLabel.AutoSize = true; - this.versionLabel.Location = new System.Drawing.Point(1042, 36); + this.versionLabel.Location = new System.Drawing.Point(1389, 44); + this.versionLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.versionLabel.Name = "versionLabel"; - this.versionLabel.Size = new System.Drawing.Size(35, 13); + this.versionLabel.Size = new System.Drawing.Size(41, 16); this.versionLabel.TabIndex = 9; this.versionLabel.Text = "ROM:"; this.versionLabel.Visible = false; @@ -10845,9 +11661,9 @@ // MainProgram // this.AllowDrop = true; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1214, 799); + this.ClientSize = new System.Drawing.Size(1619, 983); this.Controls.Add(this.versionLabel); this.Controls.Add(this.languageLabel); this.Controls.Add(this.gameIcon); @@ -10859,6 +11675,7 @@ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MainMenuStrip = this.menuStrip1; + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MaximizeBox = false; this.Name = "MainProgram"; this.Text = "DS Pokémon Rom Editor Reloaded 1.11.1 (Nømura, AdAstra/LD3005, Mixone)"; diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index ec9fd25..e48d11d 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -8154,11 +8154,8 @@ namespace DSPRE { } private void DVExplainButton_Click(object sender, EventArgs e) { - MessageBox.Show("DV, or \"Difficulty Value\", is used by the game engine to calculate how tough an opponent Pokemon should be.\n" + - "The DV affects a Pokemon's Nature and IVs - the higher the value, the stronger the Pokemon.\n" + - "DVs will go from 1 (0 IVs) to 255 (31 IVs). Natures are chosen semi-randomly." + - "\nIVs will be the same value for all Stats at any DV, so Hidden Power will only be Fighting or Dark Type." + - "\n\nFor the time being, DSPRE Reloaded is unable to calculate the target DV of a Pokémon for a given Nature and set of IVs.", "Difficulty Value", MessageBoxButtons.OK, MessageBoxIcon.Information); + DVCalc DVcalcForm = new DVCalc(trainerComboBox.SelectedIndex, trainerClassListBox.SelectedIndex); + DVcalcForm.ShowDialog(); } private void partyCountUpDown_ValueChanged(object sender, EventArgs e) { diff --git a/DS_Map/Main Window.resx b/DS_Map/Main Window.resx index 3b5da39..28f0954 100644 --- a/DS_Map/Main Window.resx +++ b/DS_Map/Main Window.resx @@ -956,7 +956,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM - EgAAAk1TRnQBSQFMAgEBCgEAATABHAEwARwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + EgAAAk1TRnQBSQFMAgEBCgEAATgBHAE4ARwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA From 96fc7f334d8651a65a9856ce1305380899348ecc Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Thu, 28 Mar 2024 09:09:07 +0100 Subject: [PATCH 32/40] Fix dor internal names --- DS_Map/Main Window.cs | 6 +- DS_Map/Properties/AssemblyInfo.cs | 8 +- DS_Map/WildEditorDPPt.Designer.cs | 140 ++++++++++++++++++------------ DS_Map/WildEditorDPPt.resx | 10 +-- 4 files changed, 97 insertions(+), 67 deletions(-) diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index ec9fd25..97863b7 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -1089,7 +1089,7 @@ namespace DSPRE { // Add row to internal names table const string newmap = "NEWMAP"; - DSUtils.WriteToFile(RomInfo.internalNamesLocation, StringToInternalName(newmap), (uint)RomInfo.GetHeaderCount() * RomInfo.internalNameLength); + DSUtils.WriteToFile(RomInfo.internalNamesPath, StringToInternalName(newmap), (uint)RomInfo.GetHeaderCount() * RomInfo.internalNameLength); // Update headers ListBox and internal names list headerListBox.Items.Add(headerListBox.Items.Count + MapHeader.nameSeparator + " " + newmap); @@ -1110,7 +1110,7 @@ namespace DSPRE { /* Physically delete last header file */ File.Delete(RomInfo.gameDirs[DirNames.dynamicHeaders].unpackedDir + "\\" + lastIndex.ToString("D4")); - using (DSUtils.EasyWriter ew = new DSUtils.EasyWriter(RomInfo.internalNamesLocation)) { + using (DSUtils.EasyWriter ew = new DSUtils.EasyWriter(RomInfo.internalNamesPath)) { ew.EditSize(-internalNameLength); //Delete internalNameLength amount of bytes from file end } @@ -1718,7 +1718,7 @@ namespace DSPRE { /* Update internal name according to internalNameBox text*/ ushort headerID = currentHeader.ID; - using (DSUtils.EasyWriter writer = new DSUtils.EasyWriter(RomInfo.internalNamesLocation, headerID * RomInfo.internalNameLength)) { + using (DSUtils.EasyWriter writer = new DSUtils.EasyWriter(RomInfo.internalNamesPath, headerID * RomInfo.internalNameLength)) { writer.Write(StringToInternalName(internalNameBox.Text)); } diff --git a/DS_Map/Properties/AssemblyInfo.cs b/DS_Map/Properties/AssemblyInfo.cs index 0f9c7d6..c1ff88d 100644 --- a/DS_Map/Properties/AssemblyInfo.cs +++ b/DS_Map/Properties/AssemblyInfo.cs @@ -4,11 +4,11 @@ using System.Runtime.InteropServices; // Le informazioni generali relative a un assembly sono controllate dal seguente // set di attributi. Modificare i valori di questi attributi per modificare le informazioni // associate a un assembly. -[assembly: AssemblyTitle("DSPRE Reloaded 1.12.0")] +[assembly: AssemblyTitle("DSPRE Reloaded 1.12.2")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("DSPRE Reloaded 1.12.0")] +[assembly: AssemblyProduct("DSPRE Reloaded 1.12.2")] [assembly: AssemblyCopyright("Copyright © 2023")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // È possibile specificare tutti i valori oppure impostare valori predefiniti per i numeri relativi alla revisione e alla build // usando l'asterisco '*' come illustrato di seguito: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.12.0")] -[assembly: AssemblyFileVersion("1.12.0")] +[assembly: AssemblyVersion("1.12.2")] +[assembly: AssemblyFileVersion("1.12.2")] diff --git a/DS_Map/WildEditorDPPt.Designer.cs b/DS_Map/WildEditorDPPt.Designer.cs index e43b179..813d03a 100644 --- a/DS_Map/WildEditorDPPt.Designer.cs +++ b/DS_Map/WildEditorDPPt.Designer.cs @@ -239,6 +239,7 @@ this.label66 = new System.Windows.Forms.Label(); this.surfSixtyComboBox = new DSPRE.InputComboBox(); this.repairAllButton = new System.Windows.Forms.Button(); + this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); this.mainTabControl.SuspendLayout(); this.grassGroundTabPage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); @@ -316,6 +317,7 @@ ((System.ComponentModel.ISupportInitialize)(this.surfThirtyMinLevelUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.surfSixtyMaxLevelUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.surfSixtyMinLevelUpDown)).BeginInit(); + this.tableLayoutPanel3.SuspendLayout(); this.SuspendLayout(); // // encounterFileLabel @@ -557,34 +559,10 @@ // // dualSlotGroupBox // - this.dualSlotGroupBox.Controls.Add(this.leafGreenFirstComboBox); - this.dualSlotGroupBox.Controls.Add(this.label33); - this.dualSlotGroupBox.Controls.Add(this.fireRedSecondComboBox); - this.dualSlotGroupBox.Controls.Add(this.label35); - this.dualSlotGroupBox.Controls.Add(this.fireRedFirstComboBox); - this.dualSlotGroupBox.Controls.Add(this.label36); - this.dualSlotGroupBox.Controls.Add(this.label37); - this.dualSlotGroupBox.Controls.Add(this.label38); - this.dualSlotGroupBox.Controls.Add(this.leafGreenSecondComboBox); - this.dualSlotGroupBox.Controls.Add(this.label39); - this.dualSlotGroupBox.Controls.Add(this.sapphireFirstComboBox); - this.dualSlotGroupBox.Controls.Add(this.rubyFirstComboBox); - this.dualSlotGroupBox.Controls.Add(this.label24); - this.dualSlotGroupBox.Controls.Add(this.emeraldSecondComboBox); - this.dualSlotGroupBox.Controls.Add(this.label25); - this.dualSlotGroupBox.Controls.Add(this.label32); - this.dualSlotGroupBox.Controls.Add(this.rubySecondComboBox); - this.dualSlotGroupBox.Controls.Add(this.label31); - this.dualSlotGroupBox.Controls.Add(this.label26); - this.dualSlotGroupBox.Controls.Add(this.label30); - this.dualSlotGroupBox.Controls.Add(this.emeraldFirstComboBox); - this.dualSlotGroupBox.Controls.Add(this.label27); - this.dualSlotGroupBox.Controls.Add(this.sapphireSecondComboBox); - this.dualSlotGroupBox.Controls.Add(this.label28); - this.dualSlotGroupBox.Controls.Add(this.label29); + this.dualSlotGroupBox.Controls.Add(this.tableLayoutPanel3); this.dualSlotGroupBox.Location = new System.Drawing.Point(15, 307); this.dualSlotGroupBox.Name = "dualSlotGroupBox"; - this.dualSlotGroupBox.Size = new System.Drawing.Size(721, 179); + this.dualSlotGroupBox.Size = new System.Drawing.Size(721, 182); this.dualSlotGroupBox.TabIndex = 190; this.dualSlotGroupBox.TabStop = false; this.dualSlotGroupBox.Text = "Dual Slot"; @@ -594,7 +572,7 @@ this.leafGreenFirstComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.leafGreenFirstComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.leafGreenFirstComboBox.FormattingEnabled = true; - this.leafGreenFirstComboBox.Location = new System.Drawing.Point(278, 119); + this.leafGreenFirstComboBox.Location = new System.Drawing.Point(277, 104); this.leafGreenFirstComboBox.Name = "leafGreenFirstComboBox"; this.leafGreenFirstComboBox.Size = new System.Drawing.Size(184, 21); this.leafGreenFirstComboBox.TabIndex = 207; @@ -603,7 +581,7 @@ // label33 // this.label33.AutoSize = true; - this.label33.Location = new System.Drawing.Point(16, 150); + this.label33.Location = new System.Drawing.Point(3, 131); this.label33.Name = "label33"; this.label33.Size = new System.Drawing.Size(21, 13); this.label33.TabIndex = 206; @@ -614,7 +592,7 @@ this.fireRedSecondComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.fireRedSecondComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.fireRedSecondComboBox.FormattingEnabled = true; - this.fireRedSecondComboBox.Location = new System.Drawing.Point(43, 146); + this.fireRedSecondComboBox.Location = new System.Drawing.Point(40, 134); this.fireRedSecondComboBox.Name = "fireRedSecondComboBox"; this.fireRedSecondComboBox.Size = new System.Drawing.Size(182, 21); this.fireRedSecondComboBox.TabIndex = 205; @@ -623,7 +601,7 @@ // label35 // this.label35.AutoSize = true; - this.label35.Location = new System.Drawing.Point(16, 123); + this.label35.Location = new System.Drawing.Point(3, 101); this.label35.Name = "label35"; this.label35.Size = new System.Drawing.Size(21, 13); this.label35.TabIndex = 204; @@ -634,7 +612,7 @@ this.fireRedFirstComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.fireRedFirstComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.fireRedFirstComboBox.FormattingEnabled = true; - this.fireRedFirstComboBox.Location = new System.Drawing.Point(43, 119); + this.fireRedFirstComboBox.Location = new System.Drawing.Point(40, 104); this.fireRedFirstComboBox.Name = "fireRedFirstComboBox"; this.fireRedFirstComboBox.Size = new System.Drawing.Size(182, 21); this.fireRedFirstComboBox.TabIndex = 203; @@ -643,7 +621,7 @@ // label36 // this.label36.AutoSize = true; - this.label36.Location = new System.Drawing.Point(275, 101); + this.label36.Location = new System.Drawing.Point(277, 84); this.label36.Name = "label36"; this.label36.Size = new System.Drawing.Size(60, 13); this.label36.TabIndex = 216; @@ -652,7 +630,7 @@ // label37 // this.label37.AutoSize = true; - this.label37.Location = new System.Drawing.Point(249, 150); + this.label37.Location = new System.Drawing.Point(250, 131); this.label37.Name = "label37"; this.label37.Size = new System.Drawing.Size(21, 13); this.label37.TabIndex = 210; @@ -661,7 +639,7 @@ // label38 // this.label38.AutoSize = true; - this.label38.Location = new System.Drawing.Point(40, 101); + this.label38.Location = new System.Drawing.Point(40, 84); this.label38.Name = "label38"; this.label38.Size = new System.Drawing.Size(47, 13); this.label38.TabIndex = 215; @@ -672,7 +650,7 @@ this.leafGreenSecondComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.leafGreenSecondComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.leafGreenSecondComboBox.FormattingEnabled = true; - this.leafGreenSecondComboBox.Location = new System.Drawing.Point(278, 146); + this.leafGreenSecondComboBox.Location = new System.Drawing.Point(277, 134); this.leafGreenSecondComboBox.Name = "leafGreenSecondComboBox"; this.leafGreenSecondComboBox.Size = new System.Drawing.Size(183, 21); this.leafGreenSecondComboBox.TabIndex = 209; @@ -681,7 +659,7 @@ // label39 // this.label39.AutoSize = true; - this.label39.Location = new System.Drawing.Point(249, 123); + this.label39.Location = new System.Drawing.Point(250, 101); this.label39.Name = "label39"; this.label39.Size = new System.Drawing.Size(21, 13); this.label39.TabIndex = 208; @@ -692,7 +670,7 @@ this.sapphireFirstComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.sapphireFirstComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.sapphireFirstComboBox.FormattingEnabled = true; - this.sapphireFirstComboBox.Location = new System.Drawing.Point(279, 42); + this.sapphireFirstComboBox.Location = new System.Drawing.Point(277, 12); this.sapphireFirstComboBox.Name = "sapphireFirstComboBox"; this.sapphireFirstComboBox.Size = new System.Drawing.Size(184, 21); this.sapphireFirstComboBox.TabIndex = 192; @@ -703,7 +681,7 @@ this.rubyFirstComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.rubyFirstComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.rubyFirstComboBox.FormattingEnabled = true; - this.rubyFirstComboBox.Location = new System.Drawing.Point(44, 42); + this.rubyFirstComboBox.Location = new System.Drawing.Point(40, 12); this.rubyFirstComboBox.Name = "rubyFirstComboBox"; this.rubyFirstComboBox.Size = new System.Drawing.Size(182, 21); this.rubyFirstComboBox.TabIndex = 188; @@ -712,7 +690,7 @@ // label24 // this.label24.AutoSize = true; - this.label24.Location = new System.Drawing.Point(16, 73); + this.label24.Location = new System.Drawing.Point(3, 45); this.label24.Name = "label24"; this.label24.Size = new System.Drawing.Size(21, 13); this.label24.TabIndex = 191; @@ -723,7 +701,7 @@ this.emeraldSecondComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.emeraldSecondComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.emeraldSecondComboBox.FormattingEnabled = true; - this.emeraldSecondComboBox.Location = new System.Drawing.Point(515, 69); + this.emeraldSecondComboBox.Location = new System.Drawing.Point(521, 48); this.emeraldSecondComboBox.Name = "emeraldSecondComboBox"; this.emeraldSecondComboBox.Size = new System.Drawing.Size(184, 21); this.emeraldSecondComboBox.TabIndex = 198; @@ -732,16 +710,16 @@ // label25 // this.label25.AutoSize = true; - this.label25.Location = new System.Drawing.Point(512, 23); + this.label25.Location = new System.Drawing.Point(521, 0); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(45, 13); + this.label25.Size = new System.Drawing.Size(45, 9); this.label25.TabIndex = 202; this.label25.Text = "Emerald"; // // label32 // this.label32.AutoSize = true; - this.label32.Location = new System.Drawing.Point(488, 73); + this.label32.Location = new System.Drawing.Point(482, 45); this.label32.Name = "label32"; this.label32.Size = new System.Drawing.Size(21, 13); this.label32.TabIndex = 199; @@ -752,7 +730,7 @@ this.rubySecondComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.rubySecondComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.rubySecondComboBox.FormattingEnabled = true; - this.rubySecondComboBox.Location = new System.Drawing.Point(44, 69); + this.rubySecondComboBox.Location = new System.Drawing.Point(40, 48); this.rubySecondComboBox.Name = "rubySecondComboBox"; this.rubySecondComboBox.Size = new System.Drawing.Size(182, 21); this.rubySecondComboBox.TabIndex = 190; @@ -761,7 +739,7 @@ // label31 // this.label31.AutoSize = true; - this.label31.Location = new System.Drawing.Point(488, 46); + this.label31.Location = new System.Drawing.Point(482, 9); this.label31.Name = "label31"; this.label31.Size = new System.Drawing.Size(21, 13); this.label31.TabIndex = 197; @@ -770,7 +748,7 @@ // label26 // this.label26.AutoSize = true; - this.label26.Location = new System.Drawing.Point(16, 46); + this.label26.Location = new System.Drawing.Point(3, 9); this.label26.Name = "label26"; this.label26.Size = new System.Drawing.Size(21, 13); this.label26.TabIndex = 189; @@ -779,7 +757,7 @@ // label30 // this.label30.AutoSize = true; - this.label30.Location = new System.Drawing.Point(251, 46); + this.label30.Location = new System.Drawing.Point(250, 9); this.label30.Name = "label30"; this.label30.Size = new System.Drawing.Size(21, 13); this.label30.TabIndex = 193; @@ -790,7 +768,7 @@ this.emeraldFirstComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.emeraldFirstComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.emeraldFirstComboBox.FormattingEnabled = true; - this.emeraldFirstComboBox.Location = new System.Drawing.Point(515, 42); + this.emeraldFirstComboBox.Location = new System.Drawing.Point(521, 12); this.emeraldFirstComboBox.Name = "emeraldFirstComboBox"; this.emeraldFirstComboBox.Size = new System.Drawing.Size(184, 21); this.emeraldFirstComboBox.TabIndex = 196; @@ -799,9 +777,9 @@ // label27 // this.label27.AutoSize = true; - this.label27.Location = new System.Drawing.Point(276, 24); + this.label27.Location = new System.Drawing.Point(277, 0); this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(49, 13); + this.label27.Size = new System.Drawing.Size(49, 9); this.label27.TabIndex = 201; this.label27.Text = "Sapphire"; // @@ -810,7 +788,7 @@ this.sapphireSecondComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.sapphireSecondComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.sapphireSecondComboBox.FormattingEnabled = true; - this.sapphireSecondComboBox.Location = new System.Drawing.Point(279, 69); + this.sapphireSecondComboBox.Location = new System.Drawing.Point(277, 48); this.sapphireSecondComboBox.Name = "sapphireSecondComboBox"; this.sapphireSecondComboBox.Size = new System.Drawing.Size(183, 21); this.sapphireSecondComboBox.TabIndex = 194; @@ -819,7 +797,7 @@ // label28 // this.label28.AutoSize = true; - this.label28.Location = new System.Drawing.Point(251, 73); + this.label28.Location = new System.Drawing.Point(250, 45); this.label28.Name = "label28"; this.label28.Size = new System.Drawing.Size(21, 13); this.label28.TabIndex = 195; @@ -828,9 +806,9 @@ // label29 // this.label29.AutoSize = true; - this.label29.Location = new System.Drawing.Point(41, 24); + this.label29.Location = new System.Drawing.Point(40, 0); this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(32, 13); + this.label29.Size = new System.Drawing.Size(32, 9); this.label29.TabIndex = 200; this.label29.Text = "Ruby"; // @@ -2623,6 +2601,56 @@ this.repairAllButton.UseVisualStyleBackColor = true; this.repairAllButton.Click += new System.EventHandler(this.repairAllButton_Click); // + // tableLayoutPanel3 + // + this.tableLayoutPanel3.ColumnCount = 8; + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 15.91356F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 84.08644F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 15F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 193F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 12F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 39F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 196F)); + this.tableLayoutPanel3.Controls.Add(this.label33, 0, 6); + this.tableLayoutPanel3.Controls.Add(this.leafGreenFirstComboBox, 4, 5); + this.tableLayoutPanel3.Controls.Add(this.fireRedSecondComboBox, 1, 6); + this.tableLayoutPanel3.Controls.Add(this.label29, 1, 0); + this.tableLayoutPanel3.Controls.Add(this.label37, 3, 6); + this.tableLayoutPanel3.Controls.Add(this.label26, 0, 1); + this.tableLayoutPanel3.Controls.Add(this.leafGreenSecondComboBox, 4, 6); + this.tableLayoutPanel3.Controls.Add(this.label24, 0, 2); + this.tableLayoutPanel3.Controls.Add(this.label35, 0, 5); + this.tableLayoutPanel3.Controls.Add(this.rubyFirstComboBox, 1, 1); + this.tableLayoutPanel3.Controls.Add(this.label39, 3, 5); + this.tableLayoutPanel3.Controls.Add(this.fireRedFirstComboBox, 1, 5); + this.tableLayoutPanel3.Controls.Add(this.rubySecondComboBox, 1, 2); + this.tableLayoutPanel3.Controls.Add(this.label36, 4, 4); + this.tableLayoutPanel3.Controls.Add(this.label38, 1, 4); + this.tableLayoutPanel3.Controls.Add(this.label27, 4, 0); + this.tableLayoutPanel3.Controls.Add(this.label30, 3, 1); + this.tableLayoutPanel3.Controls.Add(this.label28, 3, 2); + this.tableLayoutPanel3.Controls.Add(this.sapphireFirstComboBox, 4, 1); + this.tableLayoutPanel3.Controls.Add(this.sapphireSecondComboBox, 4, 2); + this.tableLayoutPanel3.Controls.Add(this.label32, 6, 2); + this.tableLayoutPanel3.Controls.Add(this.emeraldSecondComboBox, 7, 2); + this.tableLayoutPanel3.Controls.Add(this.label31, 6, 1); + this.tableLayoutPanel3.Controls.Add(this.emeraldFirstComboBox, 7, 1); + this.tableLayoutPanel3.Controls.Add(this.label25, 7, 0); + this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel3.Location = new System.Drawing.Point(3, 16); + this.tableLayoutPanel3.Name = "tableLayoutPanel3"; + this.tableLayoutPanel3.RowCount = 7; + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 80F)); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 19F)); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); + this.tableLayoutPanel3.Size = new System.Drawing.Size(715, 163); + this.tableLayoutPanel3.TabIndex = 217; + // // WildEditorDPPt // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -2649,7 +2677,6 @@ this.radarGroupBox.ResumeLayout(false); this.radarGroupBox.PerformLayout(); this.dualSlotGroupBox.ResumeLayout(false); - this.dualSlotGroupBox.PerformLayout(); this.timeGroupBox.ResumeLayout(false); this.tableLayoutPanel2.ResumeLayout(false); this.tableLayoutPanel2.PerformLayout(); @@ -2726,6 +2753,8 @@ ((System.ComponentModel.ISupportInitialize)(this.surfThirtyMinLevelUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.surfSixtyMaxLevelUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.surfSixtyMinLevelUpDown)).EndInit(); + this.tableLayoutPanel3.ResumeLayout(false); + this.tableLayoutPanel3.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -2942,5 +2971,6 @@ private System.Windows.Forms.Button repairAllButton; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3; } } \ No newline at end of file diff --git a/DS_Map/WildEditorDPPt.resx b/DS_Map/WildEditorDPPt.resx index 3879d32..832553e 100644 --- a/DS_Map/WildEditorDPPt.resx +++ b/DS_Map/WildEditorDPPt.resx @@ -121,7 +121,7 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAdCAYAAADLnm6HAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vgAADr4B6kKxwAAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC41ZYUyZQAAAPBJREFUSEvtkkEK + vQAADr0BR/uQrQAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC41ZYUyZQAAAPBJREFUSEvtkkEK wjAURHOEHkFw1WWv5dalV/Eqnq0y+qeM32iaNgkUMvAIbfIzr2Lo6TlMzsMwE3vVLih9TNNCUxEtv4/j i6YiKGAxuZ3eVBfBpfrlnqoivny+XhZUAhQX+VeuqAQoIrK23ONFsGaLbC0nnAOUACpiVd9h+R4Bwnkl KYGNmASIlaxB7wBJAfxsJUV0FvBuq/wMN/lP5rOXALEyj57Xu7FaZTx6eKuInvF3WU06LM4V0fec56xd @@ -132,7 +132,7 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAXCAYAAAARIY8tAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vQAADr0BR/uQrQAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC41ZYUyZQAAA95JREFUSEutlN1P + vAAADrwBlbxySQAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC41ZYUyZQAAA95JREFUSEutlN1P U3cYx3+ZjBcdirhCi1Rooe2v7Tmnp7RnVkUSTRR8i9FoBibuhmxTb4wXxt0srXOsM6DUFwxJFSFGeVES fEGLL6QGozDdINuy7M7/wItlN7vZ43menv56KiSS6C/5htPn+3w/z++c8zuwxS4+xEZ0AcozxPYb5Y+z dGB/U2r5662PPweUNlaSxpphf/jCXbc8sUDrdC0pcncZ3Ylhv3/xQTas63+zDIvWYga8m897jPyybYQn @@ -166,7 +166,7 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAK - 6wAACusBgosNWgAAACB0RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgTVi7kSokAAABOElE + 6gAACuoBUMzvvgAAACB0RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgTVi7kSokAAABOElE QVRIS7WToRLCMBBE+aRKPiOyks9AViKRfAYSWcknIJFIZF1gM7OZzeUKDVPEm1w2e7dNC5sY419xxTWp hK7rYh9CxMr6OAzvo9K3lGKDgawxmMNZ86yFXOhwRUPmPJ/IxadmnCHkOo7NIbn41qghLd+k2CwNaXld lYBGxZ7zmyx9Xa6o2CHYt4S4osUL8VAPqQQPbUZ97bfxOewS4+2eOJ0vbkixsXhPhj2HA+w53PPnQvGM @@ -178,7 +178,7 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAe - vQAAHr0BPAOvEwAAAAd0SU1FB9UDGhMWCY0H+k0AAAEJSURBVEhLtZKxEcIwDEUZhzIlJSOkpGQEyoyQ + vAAAHrwB7kRN9wAAAAd0SU1FB9UDGhMWCY0H+k0AAAEJSURBVEhLtZKxEcIwDEUZhzIlJSOkpGQEyoyQ ERgjJSVlRkjJCJTpzH3fSafYki3nQvGOb1nRi4BTCOGvqMUjUYtd14XHeA74pAzSPg9ZAQMp0+Bpvkbk nZfNwRpAkuV7b5ZsDqWHcbdHwsHz0B4JB+8DrRIOXoH80UHt38XBKwAtW3BoEQCvhMNeQe1r4mAJUC/d 1bbgoDWgtq5rmG8XdQAJSltwSAfgjMESSzIMU0S73zRSpvN7+cQ3w/Dn9DIFfT9GigJgSazhBEm0LbJG @@ -189,7 +189,7 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAK - 6wAACusBgosNWgAAACB0RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgTVi7kSokAAABFElE + 6gAACuoBUMzvvgAAACB0RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgTVi7kSokAAABFElE QVRIS7WUvQ3CMBSEKSkZJSVlxmCElIxAyQgZgzJlSkagzBjpjC7SWc+PI/4RFJ+cd7bvU4LEIYTwV2RI uq4LxO+VIkOA0mUaNq79qVkiQ0DBPPabYLjdmyQyJChk+fxamiQytKBwfExRUvu5ZEhYhBWCcTjGT1Yq kSHwBZhRTgnWEokMv12kBG+AFeQkH0HuAvbtW+QkyZArJzWSZCgVgFJJcoHPpeAOfw+sEPme5DCfa7AS From dfb52c779263a6dc5a4df82f153002956cd4f041 Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Thu, 28 Mar 2024 23:49:15 +0100 Subject: [PATCH 33/40] Trainer Moves checks handler --- DS_Map/Main Window.cs | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index 92fc89a..533e32f 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -8168,12 +8168,12 @@ namespace DSPRE { } } - private void trainerMovesCheckBox_CheckedChanged(object sender, EventArgs e) { + private void trainerMovesCheckBox_CheckedChanged(object sender, EventArgs e) { for (int i = 0; i < TrainerFile.POKE_IN_PARTY; i++) { for (int j = 0; j < Party.MOVES_PER_POKE; j++) { (partyMovesGroupboxList[i].Controls[j] as ComboBox).Enabled = trainerMovesCheckBox.Checked; } - if (trainerMovesCheckBox.Checked && i < currentTrainerFile.trp.partyCount) { + if (trainerMovesCheckBox.Checked && i < currentTrainerFile.trp.partyCount && Helpers.HandlersEnabled) { Helpers.BackUpDisableHandler(); Helpers.DisableHandlers(); LearnsetData learnset = new LearnsetData((int)currentTrainerFile.party[i].pokeID); @@ -8184,19 +8184,13 @@ namespace DSPRE { for (int j = 0; j < Party.MOVES_PER_POKE; j++) { (partyMovesGroupboxList[i].Controls[j] as ComboBox).SelectedIndex = currentTrainerFile.party[i].moves[j]; Debug.Print("Move for dropdwon " + j.ToString() + " is " + currentTrainerFile.party[i].moves[j].ToString()); - } - Helpers.EnableHandlers(); - RefreshTrainerPartyGUI(); + } Helpers.RestoreDisableHandler(); } else { - currentTrainerFile.party[i].moves = null; + //currentTrainerFile.party[i].moves = null; } } - Helpers.BackUpDisableHandler(); - Helpers.EnableHandlers(); - RefreshTrainerPartyGUI(); - Helpers.RestoreDisableHandler(); - + RefreshTrainerPartyGUI(); } private void trainerItemsCheckBox_CheckedChanged(object sender, EventArgs e) { for (int i = 0; i < TrainerFile.POKE_IN_PARTY; i++) { From e570157aaa6631f8d7e715200d3dbbe2eec69fa9 Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Fri, 29 Mar 2024 11:06:52 +0100 Subject: [PATCH 34/40] Matrix height got fucked up --- DS_Map/Main Window.Designer.cs | 3837 +++++++++++++------------------- DS_Map/Main Window.resx | 2 +- 2 files changed, 1522 insertions(+), 2317 deletions(-) diff --git a/DS_Map/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs index c5edf0c..80db602 100644 --- a/DS_Map/Main Window.Designer.cs +++ b/DS_Map/Main Window.Designer.cs @@ -1108,11 +1108,10 @@ this.mainTabControl.Controls.Add(this.tabPageLevelScriptEditor); this.mainTabControl.Controls.Add(this.tabPageEncountersEditor); this.mainTabControl.ImageList = this.mainTabImageList; - this.mainTabControl.Location = new System.Drawing.Point(15, 89); - this.mainTabControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.mainTabControl.Location = new System.Drawing.Point(11, 72); this.mainTabControl.Name = "mainTabControl"; this.mainTabControl.SelectedIndex = 0; - this.mainTabControl.Size = new System.Drawing.Size(1591, 864); + this.mainTabControl.Size = new System.Drawing.Size(1193, 702); this.mainTabControl.TabIndex = 5; this.mainTabControl.Visible = false; this.mainTabControl.SelectedIndexChanged += new System.EventHandler(this.mainTabControl_SelectedIndexChanged); @@ -1144,11 +1143,10 @@ this.headerEditorTabPage.Controls.Add(this.weatherPicLabel); this.headerEditorTabPage.Controls.Add(this.weatherPictureBox); this.headerEditorTabPage.ImageIndex = 0; - this.headerEditorTabPage.Location = new System.Drawing.Point(4, 25); - this.headerEditorTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.headerEditorTabPage.Location = new System.Drawing.Point(4, 23); this.headerEditorTabPage.Name = "headerEditorTabPage"; - this.headerEditorTabPage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.headerEditorTabPage.Size = new System.Drawing.Size(1583, 835); + this.headerEditorTabPage.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.headerEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.headerEditorTabPage.TabIndex = 0; this.headerEditorTabPage.Text = "Header Editor"; // @@ -1157,10 +1155,9 @@ this.removeLastHeaderBTN.Enabled = false; this.removeLastHeaderBTN.Image = global::DSPRE.Properties.Resources.deleteIcon; this.removeLastHeaderBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeLastHeaderBTN.Location = new System.Drawing.Point(17, 711); - this.removeLastHeaderBTN.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.removeLastHeaderBTN.Location = new System.Drawing.Point(13, 578); this.removeLastHeaderBTN.Name = "removeLastHeaderBTN"; - this.removeLastHeaderBTN.Size = new System.Drawing.Size(285, 32); + this.removeLastHeaderBTN.Size = new System.Drawing.Size(214, 26); this.removeLastHeaderBTN.TabIndex = 52; this.removeLastHeaderBTN.Text = "Remove Last"; this.removeLastHeaderBTN.UseVisualStyleBackColor = true; @@ -1171,10 +1168,9 @@ this.addHeaderBTN.Enabled = false; this.addHeaderBTN.Image = global::DSPRE.Properties.Resources.addIcon; this.addHeaderBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addHeaderBTN.Location = new System.Drawing.Point(17, 679); - this.addHeaderBTN.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.addHeaderBTN.Location = new System.Drawing.Point(13, 552); this.addHeaderBTN.Name = "addHeaderBTN"; - this.addHeaderBTN.Size = new System.Drawing.Size(285, 32); + this.addHeaderBTN.Size = new System.Drawing.Size(214, 26); this.addHeaderBTN.TabIndex = 48; this.addHeaderBTN.Text = "Add Header"; this.addHeaderBTN.UseVisualStyleBackColor = true; @@ -1189,11 +1185,9 @@ this.worldmapCoordsGroupBox.Controls.Add(this.label36); this.worldmapCoordsGroupBox.Controls.Add(this.worldmapXCoordUpDown); this.worldmapCoordsGroupBox.Enabled = false; - this.worldmapCoordsGroupBox.Location = new System.Drawing.Point(317, 576); - this.worldmapCoordsGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.worldmapCoordsGroupBox.Location = new System.Drawing.Point(238, 468); this.worldmapCoordsGroupBox.Name = "worldmapCoordsGroupBox"; - this.worldmapCoordsGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.worldmapCoordsGroupBox.Size = new System.Drawing.Size(112, 167); + this.worldmapCoordsGroupBox.Size = new System.Drawing.Size(84, 136); this.worldmapCoordsGroupBox.TabIndex = 34; this.worldmapCoordsGroupBox.TabStop = false; this.worldmapCoordsGroupBox.Text = "Worldmap"; @@ -1202,10 +1196,9 @@ // this.worldmapCoordsPasteButton.Enabled = false; this.worldmapCoordsPasteButton.Image = ((System.Drawing.Image)(resources.GetObject("worldmapCoordsPasteButton.Image"))); - this.worldmapCoordsPasteButton.Location = new System.Drawing.Point(57, 114); - this.worldmapCoordsPasteButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.worldmapCoordsPasteButton.Location = new System.Drawing.Point(43, 93); this.worldmapCoordsPasteButton.Name = "worldmapCoordsPasteButton"; - this.worldmapCoordsPasteButton.Size = new System.Drawing.Size(47, 46); + this.worldmapCoordsPasteButton.Size = new System.Drawing.Size(35, 37); this.worldmapCoordsPasteButton.TabIndex = 49; this.worldmapCoordsPasteButton.UseVisualStyleBackColor = true; this.worldmapCoordsPasteButton.Click += new System.EventHandler(this.worldmapCoordsPasteButton_Click); @@ -1213,59 +1206,54 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(29, 64); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Location = new System.Drawing.Point(22, 52); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(16, 16); + this.label1.Size = new System.Drawing.Size(14, 13); this.label1.TabIndex = 27; this.label1.Text = "Y"; // // worldmapCoordsCopyButton // this.worldmapCoordsCopyButton.Image = ((System.Drawing.Image)(resources.GetObject("worldmapCoordsCopyButton.Image"))); - this.worldmapCoordsCopyButton.Location = new System.Drawing.Point(8, 114); - this.worldmapCoordsCopyButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.worldmapCoordsCopyButton.Location = new System.Drawing.Point(6, 93); this.worldmapCoordsCopyButton.Name = "worldmapCoordsCopyButton"; - this.worldmapCoordsCopyButton.Size = new System.Drawing.Size(47, 46); + this.worldmapCoordsCopyButton.Size = new System.Drawing.Size(35, 37); this.worldmapCoordsCopyButton.TabIndex = 50; this.worldmapCoordsCopyButton.UseVisualStyleBackColor = true; this.worldmapCoordsCopyButton.Click += new System.EventHandler(this.worldmapCoordsCopyButton_Click); // // worldmapYCoordUpDown // - this.worldmapYCoordUpDown.Location = new System.Drawing.Point(33, 82); - this.worldmapYCoordUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.worldmapYCoordUpDown.Location = new System.Drawing.Point(25, 67); this.worldmapYCoordUpDown.Maximum = new decimal(new int[] { 63, 0, 0, 0}); this.worldmapYCoordUpDown.Name = "worldmapYCoordUpDown"; - this.worldmapYCoordUpDown.Size = new System.Drawing.Size(51, 22); + this.worldmapYCoordUpDown.Size = new System.Drawing.Size(38, 20); this.worldmapYCoordUpDown.TabIndex = 26; this.worldmapYCoordUpDown.ValueChanged += new System.EventHandler(this.worldmapYCoordUpDown_ValueChanged); // // label36 // this.label36.AutoSize = true; - this.label36.Location = new System.Drawing.Point(29, 17); - this.label36.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label36.Location = new System.Drawing.Point(22, 14); this.label36.Name = "label36"; - this.label36.Size = new System.Drawing.Size(15, 16); + this.label36.Size = new System.Drawing.Size(14, 13); this.label36.TabIndex = 25; this.label36.Text = "X"; // // worldmapXCoordUpDown // - this.worldmapXCoordUpDown.Location = new System.Drawing.Point(33, 36); - this.worldmapXCoordUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.worldmapXCoordUpDown.Location = new System.Drawing.Point(25, 29); this.worldmapXCoordUpDown.Maximum = new decimal(new int[] { 63, 0, 0, 0}); this.worldmapXCoordUpDown.Name = "worldmapXCoordUpDown"; - this.worldmapXCoordUpDown.Size = new System.Drawing.Size(51, 22); + this.worldmapXCoordUpDown.Size = new System.Drawing.Size(38, 20); this.worldmapXCoordUpDown.TabIndex = 24; this.worldmapXCoordUpDown.ValueChanged += new System.EventHandler(this.worldmapXCoordUpDown_ValueChanged); // @@ -1275,21 +1263,18 @@ this.groupBox18.Controls.Add(this.pasteWildEncountersButton); this.groupBox18.Controls.Add(this.wildPokeUpDown); this.groupBox18.Controls.Add(this.copyWildEncountersButton); - this.groupBox18.Location = new System.Drawing.Point(1075, 15); - this.groupBox18.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox18.Location = new System.Drawing.Point(806, 12); this.groupBox18.Name = "groupBox18"; - this.groupBox18.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox18.Size = new System.Drawing.Size(125, 172); + this.groupBox18.Size = new System.Drawing.Size(94, 140); this.groupBox18.TabIndex = 51; this.groupBox18.TabStop = false; this.groupBox18.Text = "Wild Pokémon"; // // openWildEditorWithIdButton // - this.openWildEditorWithIdButton.Location = new System.Drawing.Point(13, 57); - this.openWildEditorWithIdButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.openWildEditorWithIdButton.Location = new System.Drawing.Point(10, 46); this.openWildEditorWithIdButton.Name = "openWildEditorWithIdButton"; - this.openWildEditorWithIdButton.Size = new System.Drawing.Size(97, 50); + this.openWildEditorWithIdButton.Size = new System.Drawing.Size(73, 41); this.openWildEditorWithIdButton.TabIndex = 24; this.openWildEditorWithIdButton.Text = "Open Editor"; this.openWildEditorWithIdButton.UseVisualStyleBackColor = true; @@ -1299,35 +1284,32 @@ // this.pasteWildEncountersButton.Enabled = false; this.pasteWildEncountersButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteWildEncountersButton.Image"))); - this.pasteWildEncountersButton.Location = new System.Drawing.Point(64, 112); - this.pasteWildEncountersButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pasteWildEncountersButton.Location = new System.Drawing.Point(48, 91); this.pasteWildEncountersButton.Name = "pasteWildEncountersButton"; - this.pasteWildEncountersButton.Size = new System.Drawing.Size(47, 46); + this.pasteWildEncountersButton.Size = new System.Drawing.Size(35, 37); this.pasteWildEncountersButton.TabIndex = 42; this.pasteWildEncountersButton.UseVisualStyleBackColor = true; this.pasteWildEncountersButton.Click += new System.EventHandler(this.pasteWildEncountersButton_Click); // // wildPokeUpDown // - this.wildPokeUpDown.Location = new System.Drawing.Point(15, 25); - this.wildPokeUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.wildPokeUpDown.Location = new System.Drawing.Point(11, 20); this.wildPokeUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.wildPokeUpDown.Name = "wildPokeUpDown"; - this.wildPokeUpDown.Size = new System.Drawing.Size(96, 22); + this.wildPokeUpDown.Size = new System.Drawing.Size(72, 20); this.wildPokeUpDown.TabIndex = 24; this.wildPokeUpDown.ValueChanged += new System.EventHandler(this.wildPokeUpDown_ValueChanged); // // copyWildEncountersButton // this.copyWildEncountersButton.Image = ((System.Drawing.Image)(resources.GetObject("copyWildEncountersButton.Image"))); - this.copyWildEncountersButton.Location = new System.Drawing.Point(13, 112); - this.copyWildEncountersButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.copyWildEncountersButton.Location = new System.Drawing.Point(10, 91); this.copyWildEncountersButton.Name = "copyWildEncountersButton"; - this.copyWildEncountersButton.Size = new System.Drawing.Size(47, 46); + this.copyWildEncountersButton.Size = new System.Drawing.Size(35, 37); this.copyWildEncountersButton.TabIndex = 41; this.copyWildEncountersButton.UseVisualStyleBackColor = true; this.copyWildEncountersButton.Click += new System.EventHandler(this.copyWildEncountersButton_Click); @@ -1336,10 +1318,9 @@ // this.importHeaderFromFileButton.Image = global::DSPRE.Properties.Resources.importArrow; this.importHeaderFromFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.importHeaderFromFileButton.Location = new System.Drawing.Point(1216, 638); - this.importHeaderFromFileButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.importHeaderFromFileButton.Location = new System.Drawing.Point(912, 518); this.importHeaderFromFileButton.Name = "importHeaderFromFileButton"; - this.importHeaderFromFileButton.Size = new System.Drawing.Size(99, 49); + this.importHeaderFromFileButton.Size = new System.Drawing.Size(74, 40); this.importHeaderFromFileButton.TabIndex = 50; this.importHeaderFromFileButton.Text = "Import"; this.importHeaderFromFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1351,10 +1332,9 @@ // this.exportHeaderToFileButton.Image = global::DSPRE.Properties.Resources.exportArrow; this.exportHeaderToFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.exportHeaderToFileButton.Location = new System.Drawing.Point(1323, 638); - this.exportHeaderToFileButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.exportHeaderToFileButton.Location = new System.Drawing.Point(992, 518); this.exportHeaderToFileButton.Name = "exportHeaderToFileButton"; - this.exportHeaderToFileButton.Size = new System.Drawing.Size(99, 49); + this.exportHeaderToFileButton.Size = new System.Drawing.Size(74, 40); this.exportHeaderToFileButton.TabIndex = 49; this.exportHeaderToFileButton.Text = "Export"; this.exportHeaderToFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1367,10 +1347,9 @@ this.pasteHeaderButton.Enabled = false; this.pasteHeaderButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteHeaderButton.Image"))); this.pasteHeaderButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.pasteHeaderButton.Location = new System.Drawing.Point(1323, 693); - this.pasteHeaderButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pasteHeaderButton.Location = new System.Drawing.Point(992, 563); this.pasteHeaderButton.Name = "pasteHeaderButton"; - this.pasteHeaderButton.Size = new System.Drawing.Size(99, 49); + this.pasteHeaderButton.Size = new System.Drawing.Size(74, 40); this.pasteHeaderButton.TabIndex = 37; this.pasteHeaderButton.Text = "Paste"; this.pasteHeaderButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1390,11 +1369,9 @@ this.groupBox10.Controls.Add(this.openEventsButton); this.groupBox10.Controls.Add(this.eventLabel); this.groupBox10.Controls.Add(this.eventFileUpDown); - this.groupBox10.Location = new System.Drawing.Point(317, 479); - this.groupBox10.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox10.Location = new System.Drawing.Point(238, 389); this.groupBox10.Name = "groupBox10"; - this.groupBox10.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox10.Size = new System.Drawing.Size(883, 94); + this.groupBox10.Size = new System.Drawing.Size(662, 76); this.groupBox10.TabIndex = 31; this.groupBox10.TabStop = false; this.groupBox10.Text = "Events && Texts"; @@ -1403,20 +1380,18 @@ // this.pasteTextsButton.Enabled = false; this.pasteTextsButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteTextsButton.Image"))); - this.pasteTextsButton.Location = new System.Drawing.Point(821, 34); - this.pasteTextsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pasteTextsButton.Location = new System.Drawing.Point(616, 28); this.pasteTextsButton.Name = "pasteTextsButton"; - this.pasteTextsButton.Size = new System.Drawing.Size(47, 46); + this.pasteTextsButton.Size = new System.Drawing.Size(35, 37); this.pasteTextsButton.TabIndex = 33; this.pasteTextsButton.UseVisualStyleBackColor = true; this.pasteTextsButton.Click += new System.EventHandler(this.pasteTextsButton_Click); // // openMessageFileButton // - this.openMessageFileButton.Location = new System.Drawing.Point(660, 33); - this.openMessageFileButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.openMessageFileButton.Location = new System.Drawing.Point(495, 27); this.openMessageFileButton.Name = "openMessageFileButton"; - this.openMessageFileButton.Size = new System.Drawing.Size(105, 49); + this.openMessageFileButton.Size = new System.Drawing.Size(79, 40); this.openMessageFileButton.TabIndex = 46; this.openMessageFileButton.Text = "Open &Texts"; this.openMessageFileButton.UseVisualStyleBackColor = true; @@ -1425,10 +1400,9 @@ // copyTextsButton // this.copyTextsButton.Image = ((System.Drawing.Image)(resources.GetObject("copyTextsButton.Image"))); - this.copyTextsButton.Location = new System.Drawing.Point(771, 36); - this.copyTextsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.copyTextsButton.Location = new System.Drawing.Point(578, 29); this.copyTextsButton.Name = "copyTextsButton"; - this.copyTextsButton.Size = new System.Drawing.Size(47, 46); + this.copyTextsButton.Size = new System.Drawing.Size(35, 37); this.copyTextsButton.TabIndex = 32; this.copyTextsButton.UseVisualStyleBackColor = true; this.copyTextsButton.Click += new System.EventHandler(this.copyTextsButton_Click); @@ -1437,35 +1411,32 @@ // this.pasteEventsButton.Enabled = false; this.pasteEventsButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteEventsButton.Image"))); - this.pasteEventsButton.Location = new System.Drawing.Point(336, 36); - this.pasteEventsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pasteEventsButton.Location = new System.Drawing.Point(252, 29); this.pasteEventsButton.Name = "pasteEventsButton"; - this.pasteEventsButton.Size = new System.Drawing.Size(47, 46); + this.pasteEventsButton.Size = new System.Drawing.Size(35, 37); this.pasteEventsButton.TabIndex = 31; this.pasteEventsButton.UseVisualStyleBackColor = true; this.pasteEventsButton.Click += new System.EventHandler(this.pasteEventsButton_Click); // // textFileUpDown // - this.textFileUpDown.Location = new System.Drawing.Point(501, 44); - this.textFileUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textFileUpDown.Location = new System.Drawing.Point(376, 36); this.textFileUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.textFileUpDown.Name = "textFileUpDown"; - this.textFileUpDown.Size = new System.Drawing.Size(143, 22); + this.textFileUpDown.Size = new System.Drawing.Size(107, 20); this.textFileUpDown.TabIndex = 47; this.textFileUpDown.ValueChanged += new System.EventHandler(this.textFileUpDown_ValueChanged); // // copyEventsButton // this.copyEventsButton.Image = ((System.Drawing.Image)(resources.GetObject("copyEventsButton.Image"))); - this.copyEventsButton.Location = new System.Drawing.Point(287, 36); - this.copyEventsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.copyEventsButton.Location = new System.Drawing.Point(215, 29); this.copyEventsButton.Name = "copyEventsButton"; - this.copyEventsButton.Size = new System.Drawing.Size(47, 46); + this.copyEventsButton.Size = new System.Drawing.Size(35, 37); this.copyEventsButton.TabIndex = 30; this.copyEventsButton.UseVisualStyleBackColor = true; this.copyEventsButton.Click += new System.EventHandler(this.copyEventsButton_Click); @@ -1473,19 +1444,17 @@ // textLabel // this.textLabel.AutoSize = true; - this.textLabel.Location = new System.Drawing.Point(499, 25); - this.textLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.textLabel.Location = new System.Drawing.Point(374, 20); this.textLabel.Name = "textLabel"; - this.textLabel.Size = new System.Drawing.Size(94, 16); + this.textLabel.Size = new System.Drawing.Size(80, 13); this.textLabel.TabIndex = 45; this.textLabel.Text = "Text Archive #:"; // // openEventsButton // - this.openEventsButton.Location = new System.Drawing.Point(177, 34); - this.openEventsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.openEventsButton.Location = new System.Drawing.Point(133, 28); this.openEventsButton.Name = "openEventsButton"; - this.openEventsButton.Size = new System.Drawing.Size(105, 49); + this.openEventsButton.Size = new System.Drawing.Size(79, 40); this.openEventsButton.TabIndex = 44; this.openEventsButton.Text = "Open &Events"; this.openEventsButton.UseVisualStyleBackColor = true; @@ -1494,24 +1463,22 @@ // eventLabel // this.eventLabel.AutoSize = true; - this.eventLabel.Location = new System.Drawing.Point(16, 25); - this.eventLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.eventLabel.Location = new System.Drawing.Point(12, 20); this.eventLabel.Name = "eventLabel"; - this.eventLabel.Size = new System.Drawing.Size(79, 16); + this.eventLabel.Size = new System.Drawing.Size(67, 13); this.eventLabel.TabIndex = 43; this.eventLabel.Text = "Event File #:"; // // eventFileUpDown // - this.eventFileUpDown.Location = new System.Drawing.Point(19, 48); - this.eventFileUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.eventFileUpDown.Location = new System.Drawing.Point(14, 39); this.eventFileUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.eventFileUpDown.Name = "eventFileUpDown"; - this.eventFileUpDown.Size = new System.Drawing.Size(143, 22); + this.eventFileUpDown.Size = new System.Drawing.Size(107, 20); this.eventFileUpDown.TabIndex = 42; this.eventFileUpDown.ValueChanged += new System.EventHandler(this.eventFileUpDown_ValueChanged); // @@ -1527,11 +1494,9 @@ this.groupBox4.Controls.Add(this.areaDataUpDown); this.groupBox4.Controls.Add(this.matrixLabel); this.groupBox4.Controls.Add(this.matrixUpDown); - this.groupBox4.Location = new System.Drawing.Point(820, 576); - this.groupBox4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox4.Location = new System.Drawing.Point(615, 468); this.groupBox4.Name = "groupBox4"; - this.groupBox4.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox4.Size = new System.Drawing.Size(380, 167); + this.groupBox4.Size = new System.Drawing.Size(285, 136); this.groupBox4.TabIndex = 31; this.groupBox4.TabStop = false; this.groupBox4.Text = "Map matrix && Tileset"; @@ -1540,10 +1505,9 @@ // this.pasteAreaDataButton.Enabled = false; this.pasteAreaDataButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteAreaDataButton.Image"))); - this.pasteAreaDataButton.Location = new System.Drawing.Point(319, 107); - this.pasteAreaDataButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pasteAreaDataButton.Location = new System.Drawing.Point(239, 87); this.pasteAreaDataButton.Name = "pasteAreaDataButton"; - this.pasteAreaDataButton.Size = new System.Drawing.Size(47, 46); + this.pasteAreaDataButton.Size = new System.Drawing.Size(35, 37); this.pasteAreaDataButton.TabIndex = 33; this.pasteAreaDataButton.UseVisualStyleBackColor = true; this.pasteAreaDataButton.Click += new System.EventHandler(this.pasteAreaDataButton_Click); @@ -1551,10 +1515,9 @@ // copyAreaDataButton // this.copyAreaDataButton.Image = ((System.Drawing.Image)(resources.GetObject("copyAreaDataButton.Image"))); - this.copyAreaDataButton.Location = new System.Drawing.Point(268, 107); - this.copyAreaDataButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.copyAreaDataButton.Location = new System.Drawing.Point(201, 87); this.copyAreaDataButton.Name = "copyAreaDataButton"; - this.copyAreaDataButton.Size = new System.Drawing.Size(47, 46); + this.copyAreaDataButton.Size = new System.Drawing.Size(35, 37); this.copyAreaDataButton.TabIndex = 32; this.copyAreaDataButton.UseVisualStyleBackColor = true; this.copyAreaDataButton.Click += new System.EventHandler(this.copyAreaDataButton_Click); @@ -1563,20 +1526,18 @@ // this.pasteMatrixButton.Enabled = false; this.pasteMatrixButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteMatrixButton.Image"))); - this.pasteMatrixButton.Location = new System.Drawing.Point(319, 36); - this.pasteMatrixButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pasteMatrixButton.Location = new System.Drawing.Point(239, 29); this.pasteMatrixButton.Name = "pasteMatrixButton"; - this.pasteMatrixButton.Size = new System.Drawing.Size(47, 46); + this.pasteMatrixButton.Size = new System.Drawing.Size(35, 37); this.pasteMatrixButton.TabIndex = 31; this.pasteMatrixButton.UseVisualStyleBackColor = true; this.pasteMatrixButton.Click += new System.EventHandler(this.pasteMatrixButton_Click); // // openAreaDataButton // - this.openAreaDataButton.Location = new System.Drawing.Point(157, 105); - this.openAreaDataButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.openAreaDataButton.Location = new System.Drawing.Point(118, 85); this.openAreaDataButton.Name = "openAreaDataButton"; - this.openAreaDataButton.Size = new System.Drawing.Size(105, 49); + this.openAreaDataButton.Size = new System.Drawing.Size(79, 40); this.openAreaDataButton.TabIndex = 28; this.openAreaDataButton.Text = "Open &Area Data"; this.openAreaDataButton.UseVisualStyleBackColor = true; @@ -1585,20 +1546,18 @@ // copyMatrixButton // this.copyMatrixButton.Image = ((System.Drawing.Image)(resources.GetObject("copyMatrixButton.Image"))); - this.copyMatrixButton.Location = new System.Drawing.Point(268, 36); - this.copyMatrixButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.copyMatrixButton.Location = new System.Drawing.Point(201, 29); this.copyMatrixButton.Name = "copyMatrixButton"; - this.copyMatrixButton.Size = new System.Drawing.Size(47, 46); + this.copyMatrixButton.Size = new System.Drawing.Size(35, 37); this.copyMatrixButton.TabIndex = 30; this.copyMatrixButton.UseVisualStyleBackColor = true; this.copyMatrixButton.Click += new System.EventHandler(this.copyMatrixButton_Click); // // openMatrixButton // - this.openMatrixButton.Location = new System.Drawing.Point(157, 34); - this.openMatrixButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.openMatrixButton.Location = new System.Drawing.Point(118, 28); this.openMatrixButton.Name = "openMatrixButton"; - this.openMatrixButton.Size = new System.Drawing.Size(105, 48); + this.openMatrixButton.Size = new System.Drawing.Size(79, 39); this.openMatrixButton.TabIndex = 27; this.openMatrixButton.Text = "Open &Matrix"; this.openMatrixButton.UseVisualStyleBackColor = true; @@ -1607,48 +1566,44 @@ // areaDataLabel // this.areaDataLabel.AutoSize = true; - this.areaDataLabel.Location = new System.Drawing.Point(13, 98); - this.areaDataLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.areaDataLabel.Location = new System.Drawing.Point(10, 80); this.areaDataLabel.Name = "areaDataLabel"; - this.areaDataLabel.Size = new System.Drawing.Size(69, 16); + this.areaDataLabel.Size = new System.Drawing.Size(56, 13); this.areaDataLabel.TabIndex = 27; this.areaDataLabel.Text = "Area data:"; // // areaDataUpDown // - this.areaDataUpDown.Location = new System.Drawing.Point(17, 121); - this.areaDataUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.areaDataUpDown.Location = new System.Drawing.Point(13, 98); this.areaDataUpDown.Maximum = new decimal(new int[] { 255, 0, 0, 0}); this.areaDataUpDown.Name = "areaDataUpDown"; - this.areaDataUpDown.Size = new System.Drawing.Size(124, 22); + this.areaDataUpDown.Size = new System.Drawing.Size(93, 20); this.areaDataUpDown.TabIndex = 26; this.areaDataUpDown.ValueChanged += new System.EventHandler(this.areaDataUpDown_ValueChanged); // // matrixLabel // this.matrixLabel.AutoSize = true; - this.matrixLabel.Location = new System.Drawing.Point(13, 28); - this.matrixLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.matrixLabel.Location = new System.Drawing.Point(10, 23); this.matrixLabel.Name = "matrixLabel"; - this.matrixLabel.Size = new System.Drawing.Size(63, 16); + this.matrixLabel.Size = new System.Drawing.Size(53, 13); this.matrixLabel.TabIndex = 25; this.matrixLabel.Text = "Matrix no."; // // matrixUpDown // - this.matrixUpDown.Location = new System.Drawing.Point(17, 49); - this.matrixUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.matrixUpDown.Location = new System.Drawing.Point(13, 40); this.matrixUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.matrixUpDown.Name = "matrixUpDown"; - this.matrixUpDown.Size = new System.Drawing.Size(124, 22); + this.matrixUpDown.Size = new System.Drawing.Size(93, 20); this.matrixUpDown.TabIndex = 24; this.matrixUpDown.ValueChanged += new System.EventHandler(this.matrixUpDown_ValueChanged); // @@ -1657,21 +1612,18 @@ this.groupBox9.Controls.Add(this.resetButton); this.groupBox9.Controls.Add(this.searchHeaderButton); this.groupBox9.Controls.Add(this.searchLocationTextBox); - this.groupBox9.Location = new System.Drawing.Point(17, 15); - this.groupBox9.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox9.Location = new System.Drawing.Point(13, 12); this.groupBox9.Name = "groupBox9"; - this.groupBox9.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox9.Size = new System.Drawing.Size(285, 60); + this.groupBox9.Size = new System.Drawing.Size(214, 49); this.groupBox9.TabIndex = 29; this.groupBox9.TabStop = false; this.groupBox9.Text = "Search Location Name:"; // // resetButton // - this.resetButton.Location = new System.Drawing.Point(215, 21); - this.resetButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.resetButton.Location = new System.Drawing.Point(161, 17); this.resetButton.Name = "resetButton"; - this.resetButton.Size = new System.Drawing.Size(63, 28); + this.resetButton.Size = new System.Drawing.Size(47, 23); this.resetButton.TabIndex = 2; this.resetButton.Text = "Reset"; this.resetButton.UseVisualStyleBackColor = true; @@ -1679,10 +1631,9 @@ // // searchHeaderButton // - this.searchHeaderButton.Location = new System.Drawing.Point(175, 21); - this.searchHeaderButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.searchHeaderButton.Location = new System.Drawing.Point(131, 17); this.searchHeaderButton.Name = "searchHeaderButton"; - this.searchHeaderButton.Size = new System.Drawing.Size(39, 28); + this.searchHeaderButton.Size = new System.Drawing.Size(29, 23); this.searchHeaderButton.TabIndex = 1; this.searchHeaderButton.Text = "Go"; this.searchHeaderButton.UseVisualStyleBackColor = true; @@ -1690,10 +1641,9 @@ // // searchLocationTextBox // - this.searchLocationTextBox.Location = new System.Drawing.Point(11, 23); - this.searchLocationTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.searchLocationTextBox.Location = new System.Drawing.Point(8, 19); this.searchLocationTextBox.Name = "searchLocationTextBox"; - this.searchLocationTextBox.Size = new System.Drawing.Size(157, 22); + this.searchLocationTextBox.Size = new System.Drawing.Size(119, 20); this.searchLocationTextBox.TabIndex = 0; this.searchLocationTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.searchHeaderTextBox_KeyPress); // @@ -1701,10 +1651,9 @@ // this.copyHeaderButton.Image = ((System.Drawing.Image)(resources.GetObject("copyHeaderButton.Image"))); this.copyHeaderButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.copyHeaderButton.Location = new System.Drawing.Point(1216, 693); - this.copyHeaderButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.copyHeaderButton.Location = new System.Drawing.Point(912, 563); this.copyHeaderButton.Name = "copyHeaderButton"; - this.copyHeaderButton.Size = new System.Drawing.Size(99, 49); + this.copyHeaderButton.Size = new System.Drawing.Size(74, 40); this.copyHeaderButton.TabIndex = 36; this.copyHeaderButton.Text = "Copy"; this.copyHeaderButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1715,10 +1664,9 @@ // areaIconPictureBox // this.areaIconPictureBox.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.areaIconPictureBox.Location = new System.Drawing.Point(1216, 34); - this.areaIconPictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.areaIconPictureBox.Location = new System.Drawing.Point(912, 28); this.areaIconPictureBox.Name = "areaIconPictureBox"; - this.areaIconPictureBox.Size = new System.Drawing.Size(340, 67); + this.areaIconPictureBox.Size = new System.Drawing.Size(256, 55); this.areaIconPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.areaIconPictureBox.TabIndex = 35; this.areaIconPictureBox.TabStop = false; @@ -1726,10 +1674,9 @@ // areaImageLabel // this.areaImageLabel.AutoSize = true; - this.areaImageLabel.Location = new System.Drawing.Point(1212, 16); - this.areaImageLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.areaImageLabel.Location = new System.Drawing.Point(909, 13); this.areaImageLabel.Name = "areaImageLabel"; - this.areaImageLabel.Size = new System.Drawing.Size(64, 16); + this.areaImageLabel.Size = new System.Drawing.Size(52, 13); this.areaImageLabel.TabIndex = 34; this.areaImageLabel.Text = "Area icon"; // @@ -1752,11 +1699,9 @@ this.nameGroupBox.Controls.Add(this.areaIconComboBox); this.nameGroupBox.Controls.Add(this.areaSettingsComboBox); this.nameGroupBox.Controls.Add(this.locationNameComboBox); - this.nameGroupBox.Location = new System.Drawing.Point(317, 15); - this.nameGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.nameGroupBox.Location = new System.Drawing.Point(238, 12); this.nameGroupBox.Name = "nameGroupBox"; - this.nameGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.nameGroupBox.Size = new System.Drawing.Size(749, 172); + this.nameGroupBox.Size = new System.Drawing.Size(562, 140); this.nameGroupBox.TabIndex = 28; this.nameGroupBox.TabStop = false; this.nameGroupBox.Text = "Location Info"; @@ -1764,10 +1709,9 @@ // internalNameLenLabel // this.internalNameLenLabel.ForeColor = System.Drawing.Color.Green; - this.internalNameLenLabel.Location = new System.Drawing.Point(579, 50); - this.internalNameLenLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.internalNameLenLabel.Location = new System.Drawing.Point(434, 41); this.internalNameLenLabel.Name = "internalNameLenLabel"; - this.internalNameLenLabel.Size = new System.Drawing.Size(43, 20); + this.internalNameLenLabel.Size = new System.Drawing.Size(32, 16); this.internalNameLenLabel.TabIndex = 44; this.internalNameLenLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // @@ -1775,10 +1719,9 @@ // this.pasteLocationNameButton.Enabled = false; this.pasteLocationNameButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteLocationNameButton.Image"))); - this.pasteLocationNameButton.Location = new System.Drawing.Point(287, 39); - this.pasteLocationNameButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pasteLocationNameButton.Location = new System.Drawing.Point(215, 32); this.pasteLocationNameButton.Name = "pasteLocationNameButton"; - this.pasteLocationNameButton.Size = new System.Drawing.Size(47, 46); + this.pasteLocationNameButton.Size = new System.Drawing.Size(35, 37); this.pasteLocationNameButton.TabIndex = 43; this.pasteLocationNameButton.UseVisualStyleBackColor = true; this.pasteLocationNameButton.Click += new System.EventHandler(this.pasteLocationNameButton_Click); @@ -1786,10 +1729,9 @@ // copyLocationNameButton // this.copyLocationNameButton.Image = global::DSPRE.Properties.Resources.copyIcon; - this.copyLocationNameButton.Location = new System.Drawing.Point(237, 39); - this.copyLocationNameButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.copyLocationNameButton.Location = new System.Drawing.Point(178, 32); this.copyLocationNameButton.Name = "copyLocationNameButton"; - this.copyLocationNameButton.Size = new System.Drawing.Size(47, 46); + this.copyLocationNameButton.Size = new System.Drawing.Size(35, 37); this.copyLocationNameButton.TabIndex = 42; this.copyLocationNameButton.UseVisualStyleBackColor = true; this.copyLocationNameButton.Click += new System.EventHandler(this.copyLocationNameButton_Click); @@ -1798,10 +1740,9 @@ // this.pasteInternalNameButton.Enabled = false; this.pasteInternalNameButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteInternalNameButton.Image"))); - this.pasteInternalNameButton.Location = new System.Drawing.Point(681, 38); - this.pasteInternalNameButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pasteInternalNameButton.Location = new System.Drawing.Point(511, 31); this.pasteInternalNameButton.Name = "pasteInternalNameButton"; - this.pasteInternalNameButton.Size = new System.Drawing.Size(47, 46); + this.pasteInternalNameButton.Size = new System.Drawing.Size(35, 37); this.pasteInternalNameButton.TabIndex = 41; this.pasteInternalNameButton.UseVisualStyleBackColor = true; this.pasteInternalNameButton.Click += new System.EventHandler(this.pasteInternalNameButton_Click); @@ -1809,10 +1750,9 @@ // copyInternalNameButton // this.copyInternalNameButton.Image = ((System.Drawing.Image)(resources.GetObject("copyInternalNameButton.Image"))); - this.copyInternalNameButton.Location = new System.Drawing.Point(632, 38); - this.copyInternalNameButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.copyInternalNameButton.Location = new System.Drawing.Point(474, 31); this.copyInternalNameButton.Name = "copyInternalNameButton"; - this.copyInternalNameButton.Size = new System.Drawing.Size(47, 46); + this.copyInternalNameButton.Size = new System.Drawing.Size(35, 37); this.copyInternalNameButton.TabIndex = 40; this.copyInternalNameButton.UseVisualStyleBackColor = true; this.copyInternalNameButton.Click += new System.EventHandler(this.copyInternalNameButton_Click); @@ -1821,10 +1761,9 @@ // this.pasteAreaIconButton.Enabled = false; this.pasteAreaIconButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteAreaIconButton.Image"))); - this.pasteAreaIconButton.Location = new System.Drawing.Point(681, 112); - this.pasteAreaIconButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pasteAreaIconButton.Location = new System.Drawing.Point(511, 91); this.pasteAreaIconButton.Name = "pasteAreaIconButton"; - this.pasteAreaIconButton.Size = new System.Drawing.Size(47, 46); + this.pasteAreaIconButton.Size = new System.Drawing.Size(35, 37); this.pasteAreaIconButton.TabIndex = 39; this.pasteAreaIconButton.UseVisualStyleBackColor = true; this.pasteAreaIconButton.Click += new System.EventHandler(this.pasteAreaIconButton_Click); @@ -1832,10 +1771,9 @@ // copyAreaIconButton // this.copyAreaIconButton.Image = ((System.Drawing.Image)(resources.GetObject("copyAreaIconButton.Image"))); - this.copyAreaIconButton.Location = new System.Drawing.Point(632, 112); - this.copyAreaIconButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.copyAreaIconButton.Location = new System.Drawing.Point(474, 91); this.copyAreaIconButton.Name = "copyAreaIconButton"; - this.copyAreaIconButton.Size = new System.Drawing.Size(47, 46); + this.copyAreaIconButton.Size = new System.Drawing.Size(35, 37); this.copyAreaIconButton.TabIndex = 38; this.copyAreaIconButton.UseVisualStyleBackColor = true; this.copyAreaIconButton.Click += new System.EventHandler(this.copyAreaIconButton_Click); @@ -1844,10 +1782,9 @@ // this.pasteAreaSettingsButton.Enabled = false; this.pasteAreaSettingsButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteAreaSettingsButton.Image"))); - this.pasteAreaSettingsButton.Location = new System.Drawing.Point(287, 112); - this.pasteAreaSettingsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pasteAreaSettingsButton.Location = new System.Drawing.Point(215, 91); this.pasteAreaSettingsButton.Name = "pasteAreaSettingsButton"; - this.pasteAreaSettingsButton.Size = new System.Drawing.Size(47, 46); + this.pasteAreaSettingsButton.Size = new System.Drawing.Size(35, 37); this.pasteAreaSettingsButton.TabIndex = 37; this.pasteAreaSettingsButton.UseVisualStyleBackColor = true; this.pasteAreaSettingsButton.Click += new System.EventHandler(this.pasteAreaSettingsButton_Click); @@ -1855,20 +1792,18 @@ // areaSettingsLabel // this.areaSettingsLabel.AutoSize = true; - this.areaSettingsLabel.Location = new System.Drawing.Point(15, 106); - this.areaSettingsLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.areaSettingsLabel.Location = new System.Drawing.Point(11, 86); this.areaSettingsLabel.Name = "areaSettingsLabel"; - this.areaSettingsLabel.Size = new System.Drawing.Size(90, 16); + this.areaSettingsLabel.Size = new System.Drawing.Size(73, 13); this.areaSettingsLabel.TabIndex = 27; this.areaSettingsLabel.Text = "Area Settings:"; // // copyAreaSettingsButton // this.copyAreaSettingsButton.Image = ((System.Drawing.Image)(resources.GetObject("copyAreaSettingsButton.Image"))); - this.copyAreaSettingsButton.Location = new System.Drawing.Point(237, 112); - this.copyAreaSettingsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.copyAreaSettingsButton.Location = new System.Drawing.Point(178, 91); this.copyAreaSettingsButton.Name = "copyAreaSettingsButton"; - this.copyAreaSettingsButton.Size = new System.Drawing.Size(47, 46); + this.copyAreaSettingsButton.Size = new System.Drawing.Size(35, 37); this.copyAreaSettingsButton.TabIndex = 36; this.copyAreaSettingsButton.UseVisualStyleBackColor = true; this.copyAreaSettingsButton.Click += new System.EventHandler(this.copyAreaSettingsButton_Click); @@ -1876,40 +1811,36 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(15, 30); - this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label3.Location = new System.Drawing.Point(11, 24); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(98, 16); + this.label3.Size = new System.Drawing.Size(79, 13); this.label3.TabIndex = 28; this.label3.Text = "Location Name"; // // label14 // this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(409, 30); - this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label14.Location = new System.Drawing.Point(307, 24); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(87, 16); + this.label14.Size = new System.Drawing.Size(71, 13); this.label14.TabIndex = 27; this.label14.Text = "Internal name"; // // internalNameBox // - this.internalNameBox.Location = new System.Drawing.Point(413, 49); - this.internalNameBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.internalNameBox.Location = new System.Drawing.Point(310, 40); this.internalNameBox.MaxLength = 16; this.internalNameBox.Name = "internalNameBox"; - this.internalNameBox.Size = new System.Drawing.Size(208, 22); + this.internalNameBox.Size = new System.Drawing.Size(157, 20); this.internalNameBox.TabIndex = 6; this.internalNameBox.TextChanged += new System.EventHandler(this.internalNameBox_TextChanged); // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(409, 106); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(307, 86); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(67, 16); + this.label2.Size = new System.Drawing.Size(55, 13); this.label2.TabIndex = 4; this.label2.Text = "Area icon:"; // @@ -1918,10 +1849,9 @@ this.areaIconComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.areaIconComboBox.FormattingEnabled = true; this.areaIconComboBox.IntegralHeight = false; - this.areaIconComboBox.Location = new System.Drawing.Point(413, 126); - this.areaIconComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.areaIconComboBox.Location = new System.Drawing.Point(310, 102); this.areaIconComboBox.Name = "areaIconComboBox"; - this.areaIconComboBox.Size = new System.Drawing.Size(208, 24); + this.areaIconComboBox.Size = new System.Drawing.Size(157, 21); this.areaIconComboBox.TabIndex = 3; this.areaIconComboBox.SelectedIndexChanged += new System.EventHandler(this.areaIconComboBox_SelectedIndexChanged); // @@ -1930,10 +1860,9 @@ this.areaSettingsComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.areaSettingsComboBox.FormattingEnabled = true; this.areaSettingsComboBox.IntegralHeight = false; - this.areaSettingsComboBox.Location = new System.Drawing.Point(19, 126); - this.areaSettingsComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.areaSettingsComboBox.Location = new System.Drawing.Point(14, 102); this.areaSettingsComboBox.Name = "areaSettingsComboBox"; - this.areaSettingsComboBox.Size = new System.Drawing.Size(208, 24); + this.areaSettingsComboBox.Size = new System.Drawing.Size(157, 21); this.areaSettingsComboBox.TabIndex = 1; this.areaSettingsComboBox.SelectedIndexChanged += new System.EventHandler(this.areaSettingsComboBox_SelectedIndexChanged); // @@ -1941,10 +1870,9 @@ // this.locationNameComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.locationNameComboBox.FormattingEnabled = true; - this.locationNameComboBox.Location = new System.Drawing.Point(19, 49); - this.locationNameComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.locationNameComboBox.Location = new System.Drawing.Point(14, 40); this.locationNameComboBox.Name = "locationNameComboBox"; - this.locationNameComboBox.Size = new System.Drawing.Size(208, 24); + this.locationNameComboBox.Size = new System.Drawing.Size(157, 21); this.locationNameComboBox.TabIndex = 0; this.locationNameComboBox.SelectedIndexChanged += new System.EventHandler(this.mapNameComboBox_SelectedIndexChanged); // @@ -1971,68 +1899,62 @@ this.groupBox2.Controls.Add(this.cameraComboBox); this.groupBox2.Controls.Add(this.musicDayLabel); this.groupBox2.Controls.Add(this.musicDayComboBox); - this.groupBox2.Location = new System.Drawing.Point(317, 193); - this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox2.Location = new System.Drawing.Point(238, 157); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox2.Size = new System.Drawing.Size(883, 183); + this.groupBox2.Size = new System.Drawing.Size(662, 149); this.groupBox2.TabIndex = 29; this.groupBox2.TabStop = false; this.groupBox2.Text = "Appearance && Sound"; // // cameraUpDown // - this.cameraUpDown.Location = new System.Drawing.Point(501, 133); - this.cameraUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.cameraUpDown.Location = new System.Drawing.Point(376, 108); this.cameraUpDown.Maximum = new decimal(new int[] { 255, 0, 0, 0}); this.cameraUpDown.Name = "cameraUpDown"; - this.cameraUpDown.Size = new System.Drawing.Size(60, 22); + this.cameraUpDown.Size = new System.Drawing.Size(45, 20); this.cameraUpDown.TabIndex = 41; this.cameraUpDown.ValueChanged += new System.EventHandler(this.cameraUpDown_ValueChanged); // // weatherUpDown // - this.weatherUpDown.Location = new System.Drawing.Point(19, 133); - this.weatherUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.weatherUpDown.Location = new System.Drawing.Point(14, 108); this.weatherUpDown.Maximum = new decimal(new int[] { 255, 0, 0, 0}); this.weatherUpDown.Name = "weatherUpDown"; - this.weatherUpDown.Size = new System.Drawing.Size(60, 22); + this.weatherUpDown.Size = new System.Drawing.Size(45, 20); this.weatherUpDown.TabIndex = 40; this.weatherUpDown.ValueChanged += new System.EventHandler(this.weatherUpDown_ValueChanged); // // musicNightUpDown // - this.musicNightUpDown.Location = new System.Drawing.Point(501, 49); - this.musicNightUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.musicNightUpDown.Location = new System.Drawing.Point(376, 40); this.musicNightUpDown.Maximum = new decimal(new int[] { 9999, 0, 0, 0}); this.musicNightUpDown.Name = "musicNightUpDown"; - this.musicNightUpDown.Size = new System.Drawing.Size(60, 22); + this.musicNightUpDown.Size = new System.Drawing.Size(45, 20); this.musicNightUpDown.TabIndex = 39; this.musicNightUpDown.ValueChanged += new System.EventHandler(this.musicNightUpDown_ValueChanged); // // musicDayUpDown // - this.musicDayUpDown.Location = new System.Drawing.Point(19, 50); - this.musicDayUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.musicDayUpDown.Location = new System.Drawing.Point(14, 41); this.musicDayUpDown.Maximum = new decimal(new int[] { 9999, 0, 0, 0}); this.musicDayUpDown.Name = "musicDayUpDown"; - this.musicDayUpDown.Size = new System.Drawing.Size(60, 22); + this.musicDayUpDown.Size = new System.Drawing.Size(45, 20); this.musicDayUpDown.TabIndex = 38; this.musicDayUpDown.ValueChanged += new System.EventHandler(this.musicDayUpDown_ValueChanged); // @@ -2040,10 +1962,9 @@ // this.pasteCameraAngleButton.Enabled = false; this.pasteCameraAngleButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteCameraAngleButton.Image"))); - this.pasteCameraAngleButton.Location = new System.Drawing.Point(821, 119); - this.pasteCameraAngleButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pasteCameraAngleButton.Location = new System.Drawing.Point(616, 97); this.pasteCameraAngleButton.Name = "pasteCameraAngleButton"; - this.pasteCameraAngleButton.Size = new System.Drawing.Size(47, 46); + this.pasteCameraAngleButton.Size = new System.Drawing.Size(35, 37); this.pasteCameraAngleButton.TabIndex = 37; this.pasteCameraAngleButton.UseVisualStyleBackColor = true; this.pasteCameraAngleButton.Click += new System.EventHandler(this.pasteCameraAngleButton_Click); @@ -2051,10 +1972,9 @@ // copyCameraAngleButton // this.copyCameraAngleButton.Image = ((System.Drawing.Image)(resources.GetObject("copyCameraAngleButton.Image"))); - this.copyCameraAngleButton.Location = new System.Drawing.Point(771, 119); - this.copyCameraAngleButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.copyCameraAngleButton.Location = new System.Drawing.Point(578, 97); this.copyCameraAngleButton.Name = "copyCameraAngleButton"; - this.copyCameraAngleButton.Size = new System.Drawing.Size(47, 46); + this.copyCameraAngleButton.Size = new System.Drawing.Size(35, 37); this.copyCameraAngleButton.TabIndex = 36; this.copyCameraAngleButton.UseVisualStyleBackColor = true; this.copyCameraAngleButton.Click += new System.EventHandler(this.copyCameraAngleButton_Click); @@ -2063,10 +1983,9 @@ // this.pasteWeatherButton.Enabled = false; this.pasteWeatherButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteWeatherButton.Image"))); - this.pasteWeatherButton.Location = new System.Drawing.Point(336, 122); - this.pasteWeatherButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pasteWeatherButton.Location = new System.Drawing.Point(252, 99); this.pasteWeatherButton.Name = "pasteWeatherButton"; - this.pasteWeatherButton.Size = new System.Drawing.Size(47, 46); + this.pasteWeatherButton.Size = new System.Drawing.Size(35, 37); this.pasteWeatherButton.TabIndex = 35; this.pasteWeatherButton.UseVisualStyleBackColor = true; this.pasteWeatherButton.Click += new System.EventHandler(this.pasteWeatherButton_Click); @@ -2074,10 +1993,9 @@ // copyWeatherButton // this.copyWeatherButton.Image = ((System.Drawing.Image)(resources.GetObject("copyWeatherButton.Image"))); - this.copyWeatherButton.Location = new System.Drawing.Point(287, 122); - this.copyWeatherButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.copyWeatherButton.Location = new System.Drawing.Point(215, 99); this.copyWeatherButton.Name = "copyWeatherButton"; - this.copyWeatherButton.Size = new System.Drawing.Size(47, 46); + this.copyWeatherButton.Size = new System.Drawing.Size(35, 37); this.copyWeatherButton.TabIndex = 34; this.copyWeatherButton.UseVisualStyleBackColor = true; this.copyWeatherButton.Click += new System.EventHandler(this.copyWeatherButton_Click); @@ -2086,10 +2004,9 @@ // this.pasteMusicNightButton.Enabled = false; this.pasteMusicNightButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteMusicNightButton.Image"))); - this.pasteMusicNightButton.Location = new System.Drawing.Point(821, 38); - this.pasteMusicNightButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pasteMusicNightButton.Location = new System.Drawing.Point(616, 31); this.pasteMusicNightButton.Name = "pasteMusicNightButton"; - this.pasteMusicNightButton.Size = new System.Drawing.Size(47, 46); + this.pasteMusicNightButton.Size = new System.Drawing.Size(35, 37); this.pasteMusicNightButton.TabIndex = 33; this.pasteMusicNightButton.UseVisualStyleBackColor = true; this.pasteMusicNightButton.Click += new System.EventHandler(this.pasteMusicNightButton_Click); @@ -2097,10 +2014,9 @@ // copyMusicNightButton // this.copyMusicNightButton.Image = ((System.Drawing.Image)(resources.GetObject("copyMusicNightButton.Image"))); - this.copyMusicNightButton.Location = new System.Drawing.Point(771, 38); - this.copyMusicNightButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.copyMusicNightButton.Location = new System.Drawing.Point(578, 31); this.copyMusicNightButton.Name = "copyMusicNightButton"; - this.copyMusicNightButton.Size = new System.Drawing.Size(47, 46); + this.copyMusicNightButton.Size = new System.Drawing.Size(35, 37); this.copyMusicNightButton.TabIndex = 32; this.copyMusicNightButton.UseVisualStyleBackColor = true; this.copyMusicNightButton.Click += new System.EventHandler(this.copyMusicNightButton_Click); @@ -2109,10 +2025,9 @@ // this.pasteMusicDayButton.Enabled = false; this.pasteMusicDayButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteMusicDayButton.Image"))); - this.pasteMusicDayButton.Location = new System.Drawing.Point(336, 39); - this.pasteMusicDayButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pasteMusicDayButton.Location = new System.Drawing.Point(252, 32); this.pasteMusicDayButton.Name = "pasteMusicDayButton"; - this.pasteMusicDayButton.Size = new System.Drawing.Size(47, 46); + this.pasteMusicDayButton.Size = new System.Drawing.Size(35, 37); this.pasteMusicDayButton.TabIndex = 31; this.pasteMusicDayButton.UseVisualStyleBackColor = true; this.pasteMusicDayButton.Click += new System.EventHandler(this.pasteMusicDayButton_Click); @@ -2120,10 +2035,9 @@ // copyMusicDayButton // this.copyMusicDayButton.Image = ((System.Drawing.Image)(resources.GetObject("copyMusicDayButton.Image"))); - this.copyMusicDayButton.Location = new System.Drawing.Point(287, 39); - this.copyMusicDayButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.copyMusicDayButton.Location = new System.Drawing.Point(215, 32); this.copyMusicDayButton.Name = "copyMusicDayButton"; - this.copyMusicDayButton.Size = new System.Drawing.Size(47, 46); + this.copyMusicDayButton.Size = new System.Drawing.Size(35, 37); this.copyMusicDayButton.TabIndex = 30; this.copyMusicDayButton.UseVisualStyleBackColor = true; this.copyMusicDayButton.Click += new System.EventHandler(this.copyMusicDayButton_Click); @@ -2133,11 +2047,10 @@ this.weatherComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.weatherComboBox.FormattingEnabled = true; this.weatherComboBox.IntegralHeight = false; - this.weatherComboBox.Location = new System.Drawing.Point(87, 132); - this.weatherComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.weatherComboBox.Location = new System.Drawing.Point(65, 107); this.weatherComboBox.MaxDropDownItems = 20; this.weatherComboBox.Name = "weatherComboBox"; - this.weatherComboBox.Size = new System.Drawing.Size(192, 24); + this.weatherComboBox.Size = new System.Drawing.Size(145, 21); this.weatherComboBox.TabIndex = 26; this.weatherComboBox.SelectedIndexChanged += new System.EventHandler(this.weatherComboBox_SelectedIndexChanged); // @@ -2146,41 +2059,37 @@ this.musicNightComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.musicNightComboBox.FormattingEnabled = true; this.musicNightComboBox.IntegralHeight = false; - this.musicNightComboBox.Location = new System.Drawing.Point(569, 48); - this.musicNightComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.musicNightComboBox.Location = new System.Drawing.Point(427, 39); this.musicNightComboBox.MaxDropDownItems = 20; this.musicNightComboBox.Name = "musicNightComboBox"; - this.musicNightComboBox.Size = new System.Drawing.Size(192, 24); + this.musicNightComboBox.Size = new System.Drawing.Size(145, 21); this.musicNightComboBox.TabIndex = 25; this.musicNightComboBox.SelectedIndexChanged += new System.EventHandler(this.musicNightComboBox_SelectedIndexChanged); // // weatherLabel // this.weatherLabel.AutoSize = true; - this.weatherLabel.Location = new System.Drawing.Point(15, 108); - this.weatherLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.weatherLabel.Location = new System.Drawing.Point(11, 88); this.weatherLabel.Name = "weatherLabel"; - this.weatherLabel.Size = new System.Drawing.Size(61, 16); + this.weatherLabel.Size = new System.Drawing.Size(51, 13); this.weatherLabel.TabIndex = 12; this.weatherLabel.Text = "Weather:"; // // cameraLabel // this.cameraLabel.AutoSize = true; - this.cameraLabel.Location = new System.Drawing.Point(497, 108); - this.cameraLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.cameraLabel.Location = new System.Drawing.Point(373, 88); this.cameraLabel.Name = "cameraLabel"; - this.cameraLabel.Size = new System.Drawing.Size(96, 16); + this.cameraLabel.Size = new System.Drawing.Size(76, 13); this.cameraLabel.TabIndex = 10; this.cameraLabel.Text = "Camera Angle:"; // // musicNightLabel // this.musicNightLabel.AutoSize = true; - this.musicNightLabel.Location = new System.Drawing.Point(497, 26); - this.musicNightLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.musicNightLabel.Location = new System.Drawing.Point(373, 21); this.musicNightLabel.Name = "musicNightLabel"; - this.musicNightLabel.Size = new System.Drawing.Size(87, 16); + this.musicNightLabel.Size = new System.Drawing.Size(72, 13); this.musicNightLabel.TabIndex = 8; this.musicNightLabel.Text = "Music (Night):"; // @@ -2188,20 +2097,18 @@ // this.cameraComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cameraComboBox.FormattingEnabled = true; - this.cameraComboBox.Location = new System.Drawing.Point(569, 132); - this.cameraComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.cameraComboBox.Location = new System.Drawing.Point(427, 107); this.cameraComboBox.Name = "cameraComboBox"; - this.cameraComboBox.Size = new System.Drawing.Size(192, 24); + this.cameraComboBox.Size = new System.Drawing.Size(145, 21); this.cameraComboBox.TabIndex = 9; this.cameraComboBox.SelectedIndexChanged += new System.EventHandler(this.cameraComboBox_SelectedIndexChanged); // // musicDayLabel // this.musicDayLabel.AutoSize = true; - this.musicDayLabel.Location = new System.Drawing.Point(15, 27); - this.musicDayLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.musicDayLabel.Location = new System.Drawing.Point(11, 22); this.musicDayLabel.Name = "musicDayLabel"; - this.musicDayLabel.Size = new System.Drawing.Size(81, 16); + this.musicDayLabel.Size = new System.Drawing.Size(66, 13); this.musicDayLabel.TabIndex = 6; this.musicDayLabel.Text = "Music (Day):"; // @@ -2210,11 +2117,10 @@ this.musicDayComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.musicDayComboBox.FormattingEnabled = true; this.musicDayComboBox.IntegralHeight = false; - this.musicDayComboBox.Location = new System.Drawing.Point(87, 49); - this.musicDayComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.musicDayComboBox.Location = new System.Drawing.Point(65, 40); this.musicDayComboBox.MaxDropDownItems = 20; this.musicDayComboBox.Name = "musicDayComboBox"; - this.musicDayComboBox.Size = new System.Drawing.Size(192, 24); + this.musicDayComboBox.Size = new System.Drawing.Size(145, 21); this.musicDayComboBox.TabIndex = 0; this.musicDayComboBox.SelectedIndexChanged += new System.EventHandler(this.musicDayComboBox_SelectedIndexChanged); // @@ -2230,11 +2136,9 @@ this.groupBox3.Controls.Add(this.openScriptButton); this.groupBox3.Controls.Add(this.scriptLabel); this.groupBox3.Controls.Add(this.scriptFileUpDown); - this.groupBox3.Location = new System.Drawing.Point(317, 382); - this.groupBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox3.Location = new System.Drawing.Point(238, 310); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox3.Size = new System.Drawing.Size(883, 94); + this.groupBox3.Size = new System.Drawing.Size(662, 76); this.groupBox3.TabIndex = 30; this.groupBox3.TabStop = false; this.groupBox3.Text = "Scripts"; @@ -2243,10 +2147,9 @@ // this.pasteLevelScriptsButton.Enabled = false; this.pasteLevelScriptsButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteLevelScriptsButton.Image"))); - this.pasteLevelScriptsButton.Location = new System.Drawing.Point(821, 37); - this.pasteLevelScriptsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pasteLevelScriptsButton.Location = new System.Drawing.Point(616, 30); this.pasteLevelScriptsButton.Name = "pasteLevelScriptsButton"; - this.pasteLevelScriptsButton.Size = new System.Drawing.Size(47, 46); + this.pasteLevelScriptsButton.Size = new System.Drawing.Size(35, 37); this.pasteLevelScriptsButton.TabIndex = 29; this.pasteLevelScriptsButton.UseVisualStyleBackColor = true; this.pasteLevelScriptsButton.Click += new System.EventHandler(this.pasteLevelScriptsButton_Click); @@ -2254,10 +2157,9 @@ // copyLevelScriptsButton // this.copyLevelScriptsButton.Image = ((System.Drawing.Image)(resources.GetObject("copyLevelScriptsButton.Image"))); - this.copyLevelScriptsButton.Location = new System.Drawing.Point(771, 37); - this.copyLevelScriptsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.copyLevelScriptsButton.Location = new System.Drawing.Point(578, 30); this.copyLevelScriptsButton.Name = "copyLevelScriptsButton"; - this.copyLevelScriptsButton.Size = new System.Drawing.Size(47, 46); + this.copyLevelScriptsButton.Size = new System.Drawing.Size(35, 37); this.copyLevelScriptsButton.TabIndex = 28; this.copyLevelScriptsButton.UseVisualStyleBackColor = true; this.copyLevelScriptsButton.Click += new System.EventHandler(this.copyLevelScriptsButton_Click); @@ -2266,10 +2168,9 @@ // this.pasteScriptsButton.Enabled = false; this.pasteScriptsButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteScriptsButton.Image"))); - this.pasteScriptsButton.Location = new System.Drawing.Point(336, 37); - this.pasteScriptsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pasteScriptsButton.Location = new System.Drawing.Point(252, 30); this.pasteScriptsButton.Name = "pasteScriptsButton"; - this.pasteScriptsButton.Size = new System.Drawing.Size(47, 46); + this.pasteScriptsButton.Size = new System.Drawing.Size(35, 37); this.pasteScriptsButton.TabIndex = 27; this.pasteScriptsButton.UseVisualStyleBackColor = true; this.pasteScriptsButton.Click += new System.EventHandler(this.pasteScriptsButton_Click); @@ -2277,34 +2178,31 @@ // copyScriptsButton // this.copyScriptsButton.Image = ((System.Drawing.Image)(resources.GetObject("copyScriptsButton.Image"))); - this.copyScriptsButton.Location = new System.Drawing.Point(287, 37); - this.copyScriptsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.copyScriptsButton.Location = new System.Drawing.Point(215, 30); this.copyScriptsButton.Name = "copyScriptsButton"; - this.copyScriptsButton.Size = new System.Drawing.Size(47, 46); + this.copyScriptsButton.Size = new System.Drawing.Size(35, 37); this.copyScriptsButton.TabIndex = 26; this.copyScriptsButton.UseVisualStyleBackColor = true; this.copyScriptsButton.Click += new System.EventHandler(this.copyScriptsButton_Click); // // levelScriptUpDown // - this.levelScriptUpDown.Location = new System.Drawing.Point(503, 48); - this.levelScriptUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.levelScriptUpDown.Location = new System.Drawing.Point(377, 39); this.levelScriptUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.levelScriptUpDown.Name = "levelScriptUpDown"; - this.levelScriptUpDown.Size = new System.Drawing.Size(143, 22); + this.levelScriptUpDown.Size = new System.Drawing.Size(107, 20); this.levelScriptUpDown.TabIndex = 25; this.levelScriptUpDown.ValueChanged += new System.EventHandler(this.levelScriptUpDown_ValueChanged); // // openLevelScriptButton // - this.openLevelScriptButton.Location = new System.Drawing.Point(660, 34); - this.openLevelScriptButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.openLevelScriptButton.Location = new System.Drawing.Point(495, 28); this.openLevelScriptButton.Name = "openLevelScriptButton"; - this.openLevelScriptButton.Size = new System.Drawing.Size(105, 49); + this.openLevelScriptButton.Size = new System.Drawing.Size(79, 40); this.openLevelScriptButton.TabIndex = 17; this.openLevelScriptButton.Text = "Open Level Scripts"; this.openLevelScriptButton.UseVisualStyleBackColor = true; @@ -2313,19 +2211,17 @@ // levelScriptLabel // this.levelScriptLabel.AutoSize = true; - this.levelScriptLabel.Location = new System.Drawing.Point(499, 26); - this.levelScriptLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.levelScriptLabel.Location = new System.Drawing.Point(374, 21); this.levelScriptLabel.Name = "levelScriptLabel"; - this.levelScriptLabel.Size = new System.Drawing.Size(115, 16); + this.levelScriptLabel.Size = new System.Drawing.Size(95, 13); this.levelScriptLabel.TabIndex = 16; this.levelScriptLabel.Text = "Level Script File #:"; // // openScriptButton // - this.openScriptButton.Location = new System.Drawing.Point(177, 34); - this.openScriptButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.openScriptButton.Location = new System.Drawing.Point(133, 28); this.openScriptButton.Name = "openScriptButton"; - this.openScriptButton.Size = new System.Drawing.Size(105, 49); + this.openScriptButton.Size = new System.Drawing.Size(79, 40); this.openScriptButton.TabIndex = 14; this.openScriptButton.Text = "Open &Scripts"; this.openScriptButton.UseVisualStyleBackColor = true; @@ -2334,24 +2230,22 @@ // scriptLabel // this.scriptLabel.AutoSize = true; - this.scriptLabel.Location = new System.Drawing.Point(16, 26); - this.scriptLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.scriptLabel.Location = new System.Drawing.Point(12, 21); this.scriptLabel.Name = "scriptLabel"; - this.scriptLabel.Size = new System.Drawing.Size(79, 16); + this.scriptLabel.Size = new System.Drawing.Size(66, 13); this.scriptLabel.TabIndex = 13; this.scriptLabel.Text = "Script File #:"; // // scriptFileUpDown // - this.scriptFileUpDown.Location = new System.Drawing.Point(19, 48); - this.scriptFileUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.scriptFileUpDown.Location = new System.Drawing.Point(14, 39); this.scriptFileUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.scriptFileUpDown.Name = "scriptFileUpDown"; - this.scriptFileUpDown.Size = new System.Drawing.Size(143, 22); + this.scriptFileUpDown.Size = new System.Drawing.Size(107, 20); this.scriptFileUpDown.TabIndex = 0; this.scriptFileUpDown.ValueChanged += new System.EventHandler(this.scriptFileUpDown_ValueChanged); // @@ -2359,11 +2253,10 @@ // this.headerListBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.headerListBox.FormattingEnabled = true; - this.headerListBox.ItemHeight = 18; - this.headerListBox.Location = new System.Drawing.Point(17, 82); - this.headerListBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.headerListBox.ItemHeight = 15; + this.headerListBox.Location = new System.Drawing.Point(13, 67); this.headerListBox.Name = "headerListBox"; - this.headerListBox.Size = new System.Drawing.Size(284, 580); + this.headerListBox.Size = new System.Drawing.Size(214, 469); this.headerListBox.TabIndex = 2; this.headerListBox.SelectedValueChanged += new System.EventHandler(this.headerListBox_SelectedValueChanged); this.headerListBox.Leave += new System.EventHandler(this.headerListBox_Leave); @@ -2372,10 +2265,9 @@ // this.saveHeaderButton.Image = global::DSPRE.Properties.Resources.save_rom; this.saveHeaderButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.saveHeaderButton.Location = new System.Drawing.Point(1429, 636); - this.saveHeaderButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.saveHeaderButton.Location = new System.Drawing.Point(1072, 517); this.saveHeaderButton.Name = "saveHeaderButton"; - this.saveHeaderButton.Size = new System.Drawing.Size(128, 106); + this.saveHeaderButton.Size = new System.Drawing.Size(96, 86); this.saveHeaderButton.TabIndex = 33; this.saveHeaderButton.Text = "Save &This Header"; this.saveHeaderButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2399,11 +2291,9 @@ this.flagsGroupBox.Controls.Add(this.flag6CheckBox); this.flagsGroupBox.Controls.Add(this.flag5CheckBox); this.flagsGroupBox.Controls.Add(this.flag4CheckBox); - this.flagsGroupBox.Location = new System.Drawing.Point(437, 576); - this.flagsGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.flagsGroupBox.Location = new System.Drawing.Point(328, 468); this.flagsGroupBox.Name = "flagsGroupBox"; - this.flagsGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.flagsGroupBox.Size = new System.Drawing.Size(375, 167); + this.flagsGroupBox.Size = new System.Drawing.Size(281, 136); this.flagsGroupBox.TabIndex = 32; this.flagsGroupBox.TabStop = false; this.flagsGroupBox.Text = "Map Settings"; @@ -2417,11 +2307,10 @@ "Unallowed", "Small only", "All"}); - this.followModeComboBox.Location = new System.Drawing.Point(204, 36); - this.followModeComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.followModeComboBox.Location = new System.Drawing.Point(153, 29); this.followModeComboBox.MaxDropDownItems = 20; this.followModeComboBox.Name = "followModeComboBox"; - this.followModeComboBox.Size = new System.Drawing.Size(100, 24); + this.followModeComboBox.Size = new System.Drawing.Size(76, 21); this.followModeComboBox.TabIndex = 57; this.followModeComboBox.Visible = false; this.followModeComboBox.SelectedIndexChanged += new System.EventHandler(this.followModeComboBox_SelectedIndexChanged); @@ -2429,10 +2318,9 @@ // johtoRadioButton // this.johtoRadioButton.AutoSize = true; - this.johtoRadioButton.Location = new System.Drawing.Point(197, 129); - this.johtoRadioButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.johtoRadioButton.Location = new System.Drawing.Point(148, 105); this.johtoRadioButton.Name = "johtoRadioButton"; - this.johtoRadioButton.Size = new System.Drawing.Size(61, 20); + this.johtoRadioButton.Size = new System.Drawing.Size(51, 17); this.johtoRadioButton.TabIndex = 60; this.johtoRadioButton.TabStop = true; this.johtoRadioButton.Text = "Johto"; @@ -2442,10 +2330,9 @@ // kantoRadioButton // this.kantoRadioButton.AutoSize = true; - this.kantoRadioButton.Location = new System.Drawing.Point(123, 129); - this.kantoRadioButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.kantoRadioButton.Location = new System.Drawing.Point(92, 105); this.kantoRadioButton.Name = "kantoRadioButton"; - this.kantoRadioButton.Size = new System.Drawing.Size(62, 20); + this.kantoRadioButton.Size = new System.Drawing.Size(53, 17); this.kantoRadioButton.TabIndex = 59; this.kantoRadioButton.TabStop = true; this.kantoRadioButton.Text = "Kanto"; @@ -2456,10 +2343,9 @@ // followModeLabel // this.followModeLabel.AutoSize = true; - this.followModeLabel.Location = new System.Drawing.Point(200, 16); - this.followModeLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.followModeLabel.Location = new System.Drawing.Point(150, 13); this.followModeLabel.Name = "followModeLabel"; - this.followModeLabel.Size = new System.Drawing.Size(128, 16); + this.followModeLabel.Size = new System.Drawing.Size(102, 13); this.followModeLabel.TabIndex = 58; this.followModeLabel.Text = "Following Pokemon:"; this.followModeLabel.Visible = false; @@ -2468,10 +2354,9 @@ // this.pasteMapSettingsButton.Enabled = false; this.pasteMapSettingsButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteMapSettingsButton.Image"))); - this.pasteMapSettingsButton.Location = new System.Drawing.Point(319, 91); - this.pasteMapSettingsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pasteMapSettingsButton.Location = new System.Drawing.Point(239, 74); this.pasteMapSettingsButton.Name = "pasteMapSettingsButton"; - this.pasteMapSettingsButton.Size = new System.Drawing.Size(47, 46); + this.pasteMapSettingsButton.Size = new System.Drawing.Size(35, 37); this.pasteMapSettingsButton.TabIndex = 52; this.pasteMapSettingsButton.UseVisualStyleBackColor = true; this.pasteMapSettingsButton.Click += new System.EventHandler(this.pasteMapSettingsButton_Click); @@ -2479,45 +2364,41 @@ // battleBackgroundLabel // this.battleBackgroundLabel.AutoSize = true; - this.battleBackgroundLabel.Location = new System.Drawing.Point(201, 71); - this.battleBackgroundLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.battleBackgroundLabel.Location = new System.Drawing.Point(151, 58); this.battleBackgroundLabel.Name = "battleBackgroundLabel"; - this.battleBackgroundLabel.Size = new System.Drawing.Size(63, 16); + this.battleBackgroundLabel.Size = new System.Drawing.Size(52, 13); this.battleBackgroundLabel.TabIndex = 37; this.battleBackgroundLabel.Text = "Battle BG"; // // copyFlagsButton // this.copyFlagsButton.Image = ((System.Drawing.Image)(resources.GetObject("copyFlagsButton.Image"))); - this.copyFlagsButton.Location = new System.Drawing.Point(319, 38); - this.copyFlagsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.copyFlagsButton.Location = new System.Drawing.Point(239, 31); this.copyFlagsButton.Name = "copyFlagsButton"; - this.copyFlagsButton.Size = new System.Drawing.Size(47, 46); + this.copyFlagsButton.Size = new System.Drawing.Size(35, 37); this.copyFlagsButton.TabIndex = 53; this.copyFlagsButton.UseVisualStyleBackColor = true; this.copyFlagsButton.Click += new System.EventHandler(this.copyMapSettingsButton_Click); // // battleBackgroundUpDown // - this.battleBackgroundUpDown.Location = new System.Drawing.Point(205, 90); - this.battleBackgroundUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.battleBackgroundUpDown.Location = new System.Drawing.Point(154, 73); this.battleBackgroundUpDown.Maximum = new decimal(new int[] { 31, 0, 0, 0}); this.battleBackgroundUpDown.Name = "battleBackgroundUpDown"; - this.battleBackgroundUpDown.Size = new System.Drawing.Size(100, 22); + this.battleBackgroundUpDown.Size = new System.Drawing.Size(75, 20); this.battleBackgroundUpDown.TabIndex = 36; this.battleBackgroundUpDown.ValueChanged += new System.EventHandler(this.battleBackgroundUpDown_ValueChanged); // // flag3CheckBox // this.flag3CheckBox.AutoSize = true; - this.flag3CheckBox.Location = new System.Drawing.Point(15, 32); - this.flag3CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.flag3CheckBox.Location = new System.Drawing.Point(11, 26); this.flag3CheckBox.Name = "flag3CheckBox"; - this.flag3CheckBox.Size = new System.Drawing.Size(47, 20); + this.flag3CheckBox.Size = new System.Drawing.Size(39, 17); this.flag3CheckBox.TabIndex = 28; this.flag3CheckBox.Text = "Fly"; this.flag3CheckBox.UseVisualStyleBackColor = true; @@ -2526,10 +2407,9 @@ // flag2CheckBox // this.flag2CheckBox.AutoSize = true; - this.flag2CheckBox.Location = new System.Drawing.Point(15, 65); - this.flag2CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.flag2CheckBox.Location = new System.Drawing.Point(11, 53); this.flag2CheckBox.Name = "flag2CheckBox"; - this.flag2CheckBox.Size = new System.Drawing.Size(92, 20); + this.flag2CheckBox.Size = new System.Drawing.Size(76, 17); this.flag2CheckBox.TabIndex = 29; this.flag2CheckBox.Text = "Esc. Rope"; this.flag2CheckBox.UseVisualStyleBackColor = true; @@ -2538,10 +2418,9 @@ // flag1CheckBox // this.flag1CheckBox.AutoSize = true; - this.flag1CheckBox.Location = new System.Drawing.Point(15, 97); - this.flag1CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.flag1CheckBox.Location = new System.Drawing.Point(11, 79); this.flag1CheckBox.Name = "flag1CheckBox"; - this.flag1CheckBox.Size = new System.Drawing.Size(53, 20); + this.flag1CheckBox.Size = new System.Drawing.Size(46, 17); this.flag1CheckBox.TabIndex = 30; this.flag1CheckBox.Text = "Run"; this.flag1CheckBox.UseVisualStyleBackColor = true; @@ -2550,10 +2429,9 @@ // flag0CheckBox // this.flag0CheckBox.AutoSize = true; - this.flag0CheckBox.Location = new System.Drawing.Point(15, 129); - this.flag0CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.flag0CheckBox.Location = new System.Drawing.Point(11, 105); this.flag0CheckBox.Name = "flag0CheckBox"; - this.flag0CheckBox.Size = new System.Drawing.Size(73, 20); + this.flag0CheckBox.Size = new System.Drawing.Size(60, 17); this.flag0CheckBox.TabIndex = 31; this.flag0CheckBox.Text = "Bicycle"; this.flag0CheckBox.UseVisualStyleBackColor = true; @@ -2562,10 +2440,9 @@ // flag6CheckBox // this.flag6CheckBox.AutoSize = true; - this.flag6CheckBox.Location = new System.Drawing.Point(123, 34); - this.flag6CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.flag6CheckBox.Location = new System.Drawing.Point(92, 28); this.flag6CheckBox.Name = "flag6CheckBox"; - this.flag6CheckBox.Size = new System.Drawing.Size(18, 17); + this.flag6CheckBox.Size = new System.Drawing.Size(15, 14); this.flag6CheckBox.TabIndex = 35; this.flag6CheckBox.UseVisualStyleBackColor = true; this.flag6CheckBox.Visible = false; @@ -2574,10 +2451,9 @@ // flag5CheckBox // this.flag5CheckBox.AutoSize = true; - this.flag5CheckBox.Location = new System.Drawing.Point(123, 66); - this.flag5CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.flag5CheckBox.Location = new System.Drawing.Point(92, 54); this.flag5CheckBox.Name = "flag5CheckBox"; - this.flag5CheckBox.Size = new System.Drawing.Size(18, 17); + this.flag5CheckBox.Size = new System.Drawing.Size(15, 14); this.flag5CheckBox.TabIndex = 32; this.flag5CheckBox.UseVisualStyleBackColor = true; this.flag5CheckBox.Visible = false; @@ -2586,10 +2462,9 @@ // flag4CheckBox // this.flag4CheckBox.AutoSize = true; - this.flag4CheckBox.Location = new System.Drawing.Point(123, 98); - this.flag4CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.flag4CheckBox.Location = new System.Drawing.Point(92, 80); this.flag4CheckBox.Name = "flag4CheckBox"; - this.flag4CheckBox.Size = new System.Drawing.Size(18, 17); + this.flag4CheckBox.Size = new System.Drawing.Size(15, 14); this.flag4CheckBox.TabIndex = 33; this.flag4CheckBox.UseVisualStyleBackColor = true; this.flag4CheckBox.Visible = false; @@ -2598,40 +2473,36 @@ // cameraPicLabel // this.cameraPicLabel.AutoSize = true; - this.cameraPicLabel.Location = new System.Drawing.Point(1212, 374); - this.cameraPicLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.cameraPicLabel.Location = new System.Drawing.Point(909, 304); this.cameraPicLabel.Name = "cameraPicLabel"; - this.cameraPicLabel.Size = new System.Drawing.Size(92, 16); + this.cameraPicLabel.Size = new System.Drawing.Size(72, 13); this.cameraPicLabel.TabIndex = 3; this.cameraPicLabel.Text = "Camera angle"; // // cameraPictureBox // this.cameraPictureBox.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.cameraPictureBox.Location = new System.Drawing.Point(1216, 394); - this.cameraPictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.cameraPictureBox.Location = new System.Drawing.Point(912, 320); this.cameraPictureBox.Name = "cameraPictureBox"; - this.cameraPictureBox.Size = new System.Drawing.Size(340, 235); + this.cameraPictureBox.Size = new System.Drawing.Size(256, 192); this.cameraPictureBox.TabIndex = 2; this.cameraPictureBox.TabStop = false; // // weatherPicLabel // this.weatherPicLabel.AutoSize = true; - this.weatherPicLabel.Location = new System.Drawing.Point(1212, 111); - this.weatherPicLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.weatherPicLabel.Location = new System.Drawing.Point(909, 90); this.weatherPicLabel.Name = "weatherPicLabel"; - this.weatherPicLabel.Size = new System.Drawing.Size(58, 16); + this.weatherPicLabel.Size = new System.Drawing.Size(48, 13); this.weatherPicLabel.TabIndex = 1; this.weatherPicLabel.Text = "Weather"; // // weatherPictureBox // this.weatherPictureBox.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.weatherPictureBox.Location = new System.Drawing.Point(1216, 130); - this.weatherPictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.weatherPictureBox.Location = new System.Drawing.Point(912, 106); this.weatherPictureBox.Name = "weatherPictureBox"; - this.weatherPictureBox.Size = new System.Drawing.Size(340, 235); + this.weatherPictureBox.Size = new System.Drawing.Size(256, 192); this.weatherPictureBox.TabIndex = 0; this.weatherPictureBox.TabStop = false; // @@ -2660,11 +2531,10 @@ this.matrixEditorTabPage.Controls.Add(this.widthLabel); this.matrixEditorTabPage.Controls.Add(this.selectMatrixComboBox); this.matrixEditorTabPage.ImageIndex = 1; - this.matrixEditorTabPage.Location = new System.Drawing.Point(4, 25); - this.matrixEditorTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.matrixEditorTabPage.Location = new System.Drawing.Point(4, 23); this.matrixEditorTabPage.Name = "matrixEditorTabPage"; - this.matrixEditorTabPage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.matrixEditorTabPage.Size = new System.Drawing.Size(1583, 835); + this.matrixEditorTabPage.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.matrixEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.matrixEditorTabPage.TabIndex = 1; this.matrixEditorTabPage.Text = "Matrix Editor"; // @@ -2674,10 +2544,9 @@ this.setSpawnPointButton.Image = global::DSPRE.Properties.Resources.spawnCoordsMatrixeditorIcon; this.setSpawnPointButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.setSpawnPointButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.setSpawnPointButton.Location = new System.Drawing.Point(16, -6448); - this.setSpawnPointButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.setSpawnPointButton.Location = new System.Drawing.Point(12, -5857); this.setSpawnPointButton.Name = "setSpawnPointButton"; - this.setSpawnPointButton.Size = new System.Drawing.Size(156, 53); + this.setSpawnPointButton.Size = new System.Drawing.Size(117, 43); this.setSpawnPointButton.TabIndex = 35; this.setSpawnPointButton.Text = "Set Spawn\r\nto Selection"; this.setSpawnPointButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2691,10 +2560,9 @@ this.saveMatrixButton.Image = global::DSPRE.Properties.Resources.save_rom; this.saveMatrixButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.saveMatrixButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.saveMatrixButton.Location = new System.Drawing.Point(16, -6393); - this.saveMatrixButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.saveMatrixButton.Location = new System.Drawing.Point(12, -5813); this.saveMatrixButton.Name = "saveMatrixButton"; - this.saveMatrixButton.Size = new System.Drawing.Size(156, 53); + this.saveMatrixButton.Size = new System.Drawing.Size(117, 43); this.saveMatrixButton.TabIndex = 34; this.saveMatrixButton.Text = "Save Matrix"; this.saveMatrixButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2705,10 +2573,9 @@ // this.locateCurrentMatrixFile.Image = global::DSPRE.Properties.Resources.open_file; this.locateCurrentMatrixFile.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.locateCurrentMatrixFile.Location = new System.Drawing.Point(67, 286); - this.locateCurrentMatrixFile.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.locateCurrentMatrixFile.Location = new System.Drawing.Point(50, 232); this.locateCurrentMatrixFile.Name = "locateCurrentMatrixFile"; - this.locateCurrentMatrixFile.Size = new System.Drawing.Size(55, 47); + this.locateCurrentMatrixFile.Size = new System.Drawing.Size(41, 38); this.locateCurrentMatrixFile.TabIndex = 33; this.locateCurrentMatrixFile.UseVisualStyleBackColor = true; this.locateCurrentMatrixFile.Click += new System.EventHandler(this.locateCurrentMatrixFile_Click); @@ -2717,10 +2584,9 @@ // this.resetColorTableButton.Image = global::DSPRE.Properties.Resources.resetColorTable; this.resetColorTableButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.resetColorTableButton.Location = new System.Drawing.Point(15, 549); - this.resetColorTableButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.resetColorTableButton.Location = new System.Drawing.Point(11, 446); this.resetColorTableButton.Name = "resetColorTableButton"; - this.resetColorTableButton.Size = new System.Drawing.Size(156, 39); + this.resetColorTableButton.Size = new System.Drawing.Size(117, 32); this.resetColorTableButton.TabIndex = 31; this.resetColorTableButton.Text = "Reset Color Table"; this.resetColorTableButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2731,10 +2597,9 @@ // this.importColorTableButton.Image = global::DSPRE.Properties.Resources.loadColorTable; this.importColorTableButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.importColorTableButton.Location = new System.Drawing.Point(15, 590); - this.importColorTableButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.importColorTableButton.Location = new System.Drawing.Point(11, 479); this.importColorTableButton.Name = "importColorTableButton"; - this.importColorTableButton.Size = new System.Drawing.Size(156, 39); + this.importColorTableButton.Size = new System.Drawing.Size(117, 32); this.importColorTableButton.TabIndex = 30; this.importColorTableButton.Text = "Import Color Table"; this.importColorTableButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2745,10 +2610,9 @@ // this.importMatrixButton.Image = global::DSPRE.Properties.Resources.importArrow; this.importMatrixButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.importMatrixButton.Location = new System.Drawing.Point(15, 187); - this.importMatrixButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.importMatrixButton.Location = new System.Drawing.Point(11, 152); this.importMatrixButton.Name = "importMatrixButton"; - this.importMatrixButton.Size = new System.Drawing.Size(156, 36); + this.importMatrixButton.Size = new System.Drawing.Size(117, 29); this.importMatrixButton.TabIndex = 29; this.importMatrixButton.Text = "Replace Matrix"; this.importMatrixButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2759,10 +2623,9 @@ // this.exportMatrixButton.Image = global::DSPRE.Properties.Resources.exportArrow; this.exportMatrixButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.exportMatrixButton.Location = new System.Drawing.Point(15, 150); - this.exportMatrixButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.exportMatrixButton.Location = new System.Drawing.Point(11, 122); this.exportMatrixButton.Name = "exportMatrixButton"; - this.exportMatrixButton.Size = new System.Drawing.Size(156, 36); + this.exportMatrixButton.Size = new System.Drawing.Size(117, 29); this.exportMatrixButton.TabIndex = 28; this.exportMatrixButton.Text = "Export Matrix"; this.exportMatrixButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2773,10 +2636,9 @@ // this.removeMatrixButton.Image = ((System.Drawing.Image)(resources.GetObject("removeMatrixButton.Image"))); this.removeMatrixButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeMatrixButton.Location = new System.Drawing.Point(85, 225); - this.removeMatrixButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.removeMatrixButton.Location = new System.Drawing.Point(64, 183); this.removeMatrixButton.Name = "removeMatrixButton"; - this.removeMatrixButton.Size = new System.Drawing.Size(85, 43); + this.removeMatrixButton.Size = new System.Drawing.Size(64, 35); this.removeMatrixButton.TabIndex = 27; this.removeMatrixButton.Text = "Delete Last"; this.removeMatrixButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2787,10 +2649,9 @@ // this.addMatrixButton.Image = ((System.Drawing.Image)(resources.GetObject("addMatrixButton.Image"))); this.addMatrixButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addMatrixButton.Location = new System.Drawing.Point(15, 225); - this.addMatrixButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.addMatrixButton.Location = new System.Drawing.Point(11, 183); this.addMatrixButton.Name = "addMatrixButton"; - this.addMatrixButton.Size = new System.Drawing.Size(68, 43); + this.addMatrixButton.Size = new System.Drawing.Size(51, 35); this.addMatrixButton.TabIndex = 2; this.addMatrixButton.Text = "Add"; this.addMatrixButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2801,10 +2662,9 @@ // this.removeHeightsButton.Image = ((System.Drawing.Image)(resources.GetObject("removeHeightsButton.Image"))); this.removeHeightsButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeHeightsButton.Location = new System.Drawing.Point(15, 495); - this.removeHeightsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.removeHeightsButton.Location = new System.Drawing.Point(11, 402); this.removeHeightsButton.Name = "removeHeightsButton"; - this.removeHeightsButton.Size = new System.Drawing.Size(156, 43); + 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; @@ -2815,10 +2675,9 @@ // this.removeHeadersButton.Image = ((System.Drawing.Image)(resources.GetObject("removeHeadersButton.Image"))); this.removeHeadersButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeHeadersButton.Location = new System.Drawing.Point(15, 393); - this.removeHeadersButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.removeHeadersButton.Location = new System.Drawing.Point(11, 319); this.removeHeadersButton.Name = "removeHeadersButton"; - this.removeHeadersButton.Size = new System.Drawing.Size(156, 43); + 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; @@ -2829,10 +2688,9 @@ // this.addHeightsButton.Image = ((System.Drawing.Image)(resources.GetObject("addHeightsButton.Image"))); this.addHeightsButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addHeightsButton.Location = new System.Drawing.Point(15, 450); - this.addHeightsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.addHeightsButton.Location = new System.Drawing.Point(11, 366); this.addHeightsButton.Name = "addHeightsButton"; - this.addHeightsButton.Size = new System.Drawing.Size(156, 43); + this.addHeightsButton.Size = new System.Drawing.Size(117, 35); this.addHeightsButton.TabIndex = 24; this.addHeightsButton.Text = "Add Heights Tab"; this.addHeightsButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2843,10 +2701,9 @@ // this.addHeadersButton.Image = ((System.Drawing.Image)(resources.GetObject("addHeadersButton.Image"))); this.addHeadersButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addHeadersButton.Location = new System.Drawing.Point(15, 348); - this.addHeadersButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.addHeadersButton.Location = new System.Drawing.Point(11, 283); this.addHeadersButton.Name = "addHeadersButton"; - this.addHeadersButton.Size = new System.Drawing.Size(156, 43); + 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; @@ -2857,10 +2714,9 @@ // this.labelMatrices.AutoSize = true; this.labelMatrices.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.labelMatrices.Location = new System.Drawing.Point(12, 14); - this.labelMatrices.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelMatrices.Location = new System.Drawing.Point(9, 11); this.labelMatrices.Name = "labelMatrices"; - this.labelMatrices.Size = new System.Drawing.Size(58, 16); + this.labelMatrices.Size = new System.Drawing.Size(47, 13); this.labelMatrices.TabIndex = 21; this.labelMatrices.Text = "Matrices"; // @@ -2868,10 +2724,9 @@ // this.matrixNameLabel.AutoSize = true; this.matrixNameLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.matrixNameLabel.Location = new System.Drawing.Point(13, 68); - this.matrixNameLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.matrixNameLabel.Location = new System.Drawing.Point(10, 55); this.matrixNameLabel.Name = "matrixNameLabel"; - this.matrixNameLabel.Size = new System.Drawing.Size(79, 16); + this.matrixNameLabel.Size = new System.Drawing.Size(64, 13); this.matrixNameLabel.TabIndex = 20; this.matrixNameLabel.Text = "Matrix name"; // @@ -2883,22 +2738,20 @@ this.matrixTabControl.Controls.Add(this.headersTabPage); this.matrixTabControl.Controls.Add(this.heightsTabPage); this.matrixTabControl.Controls.Add(this.mapFilesTabPage); - this.matrixTabControl.Location = new System.Drawing.Point(185, 14); - this.matrixTabControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.matrixTabControl.Location = new System.Drawing.Point(139, 11); this.matrixTabControl.Multiline = true; this.matrixTabControl.Name = "matrixTabControl"; this.matrixTabControl.SelectedIndex = 0; - this.matrixTabControl.Size = new System.Drawing.Size(63, 7); + this.matrixTabControl.Size = new System.Drawing.Size(1040, 610); this.matrixTabControl.TabIndex = 18; // // headersTabPage // this.headersTabPage.Controls.Add(this.headersGridView); - this.headersTabPage.Location = new System.Drawing.Point(4, 67); - this.headersTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.headersTabPage.Location = new System.Drawing.Point(4, 22); this.headersTabPage.Name = "headersTabPage"; - this.headersTabPage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.headersTabPage.Size = new System.Drawing.Size(55, 0); + this.headersTabPage.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.headersTabPage.Size = new System.Drawing.Size(1032, 584); this.headersTabPage.TabIndex = 1; this.headersTabPage.Text = "Map Headers"; this.headersTabPage.UseVisualStyleBackColor = true; @@ -2929,7 +2782,6 @@ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.headersGridView.DefaultCellStyle = dataGridViewCellStyle2; this.headersGridView.Location = new System.Drawing.Point(0, 0); - this.headersGridView.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.headersGridView.MultiSelect = false; this.headersGridView.Name = "headersGridView"; dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; @@ -2950,7 +2802,7 @@ this.headersGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; this.headersGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; this.headersGridView.ShowCellErrors = false; - this.headersGridView.Size = new System.Drawing.Size(1376, 709); + this.headersGridView.Size = new System.Drawing.Size(1032, 576); this.headersGridView.TabIndex = 1; this.headersGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.headersGridView_CellFormatting); this.headersGridView.CellMouseDoubleClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.headersGridView_CellMouseDoubleClick); @@ -2960,10 +2812,9 @@ // heightsTabPage // this.heightsTabPage.Controls.Add(this.heightsGridView); - this.heightsTabPage.Location = new System.Drawing.Point(4, 67); - this.heightsTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.heightsTabPage.Location = new System.Drawing.Point(4, 58); this.heightsTabPage.Name = "heightsTabPage"; - this.heightsTabPage.Size = new System.Drawing.Size(55, 0); + this.heightsTabPage.Size = new System.Drawing.Size(0, 0); this.heightsTabPage.TabIndex = 2; this.heightsTabPage.Text = "Map Heights"; this.heightsTabPage.UseVisualStyleBackColor = true; @@ -2996,7 +2847,6 @@ dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle7; this.heightsGridView.Location = new System.Drawing.Point(0, 0); - this.heightsGridView.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.heightsGridView.MultiSelect = false; this.heightsGridView.Name = "heightsGridView"; dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; @@ -3016,7 +2866,7 @@ this.heightsGridView.RowTemplate.Height = 18; this.heightsGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; this.heightsGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.heightsGridView.Size = new System.Drawing.Size(1376, 709); + this.heightsGridView.Size = new System.Drawing.Size(1032, 576); this.heightsGridView.TabIndex = 2; this.heightsGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.heightsGridView_CellFormatting); this.heightsGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.heightsGridView_CellValueChanged); @@ -3025,10 +2875,9 @@ // mapFilesTabPage // this.mapFilesTabPage.Controls.Add(this.mapFilesGridView); - this.mapFilesTabPage.Location = new System.Drawing.Point(4, 67); - this.mapFilesTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.mapFilesTabPage.Location = new System.Drawing.Point(4, 58); this.mapFilesTabPage.Name = "mapFilesTabPage"; - this.mapFilesTabPage.Size = new System.Drawing.Size(55, 0); + this.mapFilesTabPage.Size = new System.Drawing.Size(0, 0); this.mapFilesTabPage.TabIndex = 3; this.mapFilesTabPage.Text = "Map Files"; this.mapFilesTabPage.UseVisualStyleBackColor = true; @@ -3061,7 +2910,6 @@ dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle12; this.mapFilesGridView.Location = new System.Drawing.Point(0, 0); - this.mapFilesGridView.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.mapFilesGridView.MultiSelect = false; this.mapFilesGridView.Name = "mapFilesGridView"; dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; @@ -3081,7 +2929,7 @@ this.mapFilesGridView.RowTemplate.Height = 18; this.mapFilesGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; this.mapFilesGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.mapFilesGridView.Size = new System.Drawing.Size(1376, 709); + this.mapFilesGridView.Size = new System.Drawing.Size(1032, 576); this.mapFilesGridView.TabIndex = 2; this.mapFilesGridView.CellContentDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.mapFilesGridView_CellMouseDoubleClick); this.mapFilesGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.mapFilesGridView_CellFormatting); @@ -3090,18 +2938,16 @@ // // matrixNameTextBox // - this.matrixNameTextBox.Location = new System.Drawing.Point(17, 85); - this.matrixNameTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.matrixNameTextBox.Location = new System.Drawing.Point(13, 69); this.matrixNameTextBox.MaxLength = 16; this.matrixNameTextBox.Name = "matrixNameTextBox"; - this.matrixNameTextBox.Size = new System.Drawing.Size(148, 22); + 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(112, 121); - this.heightUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.heightUpDown.Location = new System.Drawing.Point(84, 98); this.heightUpDown.Maximum = new decimal(new int[] { 255, 0, @@ -3113,7 +2959,7 @@ 0, 0}); this.heightUpDown.Name = "heightUpDown"; - this.heightUpDown.Size = new System.Drawing.Size(49, 22); + this.heightUpDown.Size = new System.Drawing.Size(37, 20); this.heightUpDown.TabIndex = 16; this.heightUpDown.Value = new decimal(new int[] { 1, @@ -3124,8 +2970,7 @@ // // widthUpDown // - this.widthUpDown.Location = new System.Drawing.Point(55, 121); - this.widthUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.widthUpDown.Location = new System.Drawing.Point(41, 98); this.widthUpDown.Maximum = new decimal(new int[] { 255, 0, @@ -3137,7 +2982,7 @@ 0, 0}); this.widthUpDown.Name = "widthUpDown"; - this.widthUpDown.Size = new System.Drawing.Size(49, 22); + this.widthUpDown.Size = new System.Drawing.Size(37, 20); this.widthUpDown.TabIndex = 15; this.widthUpDown.Value = new decimal(new int[] { 1, @@ -3150,10 +2995,9 @@ // this.widthLabel.AutoSize = true; this.widthLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.widthLabel.Location = new System.Drawing.Point(13, 124); - this.widthLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.widthLabel.Location = new System.Drawing.Point(10, 101); this.widthLabel.Name = "widthLabel"; - this.widthLabel.Size = new System.Drawing.Size(33, 16); + this.widthLabel.Size = new System.Drawing.Size(27, 13); this.widthLabel.TabIndex = 13; this.widthLabel.Text = "Size"; // @@ -3161,10 +3005,9 @@ // this.selectMatrixComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.selectMatrixComboBox.FormattingEnabled = true; - this.selectMatrixComboBox.Location = new System.Drawing.Point(17, 33); - this.selectMatrixComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.selectMatrixComboBox.Location = new System.Drawing.Point(13, 27); this.selectMatrixComboBox.Name = "selectMatrixComboBox"; - this.selectMatrixComboBox.Size = new System.Drawing.Size(148, 24); + this.selectMatrixComboBox.Size = new System.Drawing.Size(112, 21); this.selectMatrixComboBox.TabIndex = 12; this.selectMatrixComboBox.SelectedIndexChanged += new System.EventHandler(this.selectMatrixComboBox_SelectedIndexChanged); // @@ -3185,11 +3028,10 @@ this.mapEditorTabPage.Controls.Add(this.radio2D); this.mapEditorTabPage.Controls.Add(this.wireframeCheckBox); this.mapEditorTabPage.ImageIndex = 2; - this.mapEditorTabPage.Location = new System.Drawing.Point(4, 25); - this.mapEditorTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.mapEditorTabPage.Location = new System.Drawing.Point(4, 23); this.mapEditorTabPage.Name = "mapEditorTabPage"; - this.mapEditorTabPage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.mapEditorTabPage.Size = new System.Drawing.Size(1583, 835); + this.mapEditorTabPage.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.mapEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.mapEditorTabPage.TabIndex = 2; this.mapEditorTabPage.Text = "Map Editor"; this.mapEditorTabPage.Enter += new System.EventHandler(this.mapEditorTabPage_Enter); @@ -3207,14 +3049,13 @@ this.tableLayoutPanel3.Controls.Add(this.replaceMapBinButton, 0, 1); this.tableLayoutPanel3.Controls.Add(this.exportCurrentMapBinButton, 2, 1); this.tableLayoutPanel3.Controls.Add(this.saveMapButton, 0, 2); - this.tableLayoutPanel3.Location = new System.Drawing.Point(361, 598); - this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tableLayoutPanel3.Location = new System.Drawing.Point(271, 486); this.tableLayoutPanel3.Name = "tableLayoutPanel3"; this.tableLayoutPanel3.RowCount = 3; this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(265, 159); + this.tableLayoutPanel3.Size = new System.Drawing.Size(199, 129); this.tableLayoutPanel3.TabIndex = 41; // // addMapFileButton @@ -3223,10 +3064,9 @@ this.addMapFileButton.Dock = System.Windows.Forms.DockStyle.Fill; this.addMapFileButton.Image = ((System.Drawing.Image)(resources.GetObject("addMapFileButton.Image"))); this.addMapFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addMapFileButton.Location = new System.Drawing.Point(4, 4); - this.addMapFileButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.addMapFileButton.Location = new System.Drawing.Point(3, 3); this.addMapFileButton.Name = "addMapFileButton"; - this.addMapFileButton.Size = new System.Drawing.Size(124, 45); + this.addMapFileButton.Size = new System.Drawing.Size(92, 37); this.addMapFileButton.TabIndex = 36; this.addMapFileButton.Text = "Add \r\nMap File"; this.addMapFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -3237,10 +3077,9 @@ // this.locateCurrentMapBin.Dock = System.Windows.Forms.DockStyle.Fill; this.locateCurrentMapBin.Image = global::DSPRE.Properties.Resources.open_file; - this.locateCurrentMapBin.Location = new System.Drawing.Point(202, 110); - this.locateCurrentMapBin.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.locateCurrentMapBin.Location = new System.Drawing.Point(150, 89); this.locateCurrentMapBin.Name = "locateCurrentMapBin"; - this.locateCurrentMapBin.Size = new System.Drawing.Size(59, 45); + this.locateCurrentMapBin.Size = new System.Drawing.Size(46, 37); this.locateCurrentMapBin.TabIndex = 40; this.locateCurrentMapBin.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.locateCurrentMapBin.UseVisualStyleBackColor = true; @@ -3252,10 +3091,9 @@ this.removeMapFileButton.Dock = System.Windows.Forms.DockStyle.Fill; this.removeMapFileButton.Image = global::DSPRE.Properties.Resources.deleteIcon; this.removeMapFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeMapFileButton.Location = new System.Drawing.Point(136, 4); - this.removeMapFileButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.removeMapFileButton.Location = new System.Drawing.Point(101, 3); this.removeMapFileButton.Name = "removeMapFileButton"; - this.removeMapFileButton.Size = new System.Drawing.Size(125, 45); + this.removeMapFileButton.Size = new System.Drawing.Size(95, 37); this.removeMapFileButton.TabIndex = 35; this.removeMapFileButton.Text = "Remove \r\nLast Map"; this.removeMapFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -3268,10 +3106,9 @@ this.replaceMapBinButton.Dock = System.Windows.Forms.DockStyle.Fill; this.replaceMapBinButton.Image = ((System.Drawing.Image)(resources.GetObject("replaceMapBinButton.Image"))); this.replaceMapBinButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.replaceMapBinButton.Location = new System.Drawing.Point(4, 57); - this.replaceMapBinButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.replaceMapBinButton.Location = new System.Drawing.Point(3, 46); this.replaceMapBinButton.Name = "replaceMapBinButton"; - this.replaceMapBinButton.Size = new System.Drawing.Size(124, 45); + this.replaceMapBinButton.Size = new System.Drawing.Size(92, 37); this.replaceMapBinButton.TabIndex = 37; this.replaceMapBinButton.Text = "Replace \r\nMap BIN"; this.replaceMapBinButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -3284,10 +3121,9 @@ this.exportCurrentMapBinButton.Dock = System.Windows.Forms.DockStyle.Fill; this.exportCurrentMapBinButton.Image = ((System.Drawing.Image)(resources.GetObject("exportCurrentMapBinButton.Image"))); this.exportCurrentMapBinButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.exportCurrentMapBinButton.Location = new System.Drawing.Point(136, 57); - this.exportCurrentMapBinButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.exportCurrentMapBinButton.Location = new System.Drawing.Point(101, 46); this.exportCurrentMapBinButton.Name = "exportCurrentMapBinButton"; - this.exportCurrentMapBinButton.Size = new System.Drawing.Size(125, 45); + this.exportCurrentMapBinButton.Size = new System.Drawing.Size(95, 37); this.exportCurrentMapBinButton.TabIndex = 38; this.exportCurrentMapBinButton.Text = "Export \r\nMap BIN"; this.exportCurrentMapBinButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -3300,10 +3136,9 @@ this.saveMapButton.Dock = System.Windows.Forms.DockStyle.Fill; this.saveMapButton.Image = global::DSPRE.Properties.Resources.save_rom; this.saveMapButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.saveMapButton.Location = new System.Drawing.Point(4, 110); - this.saveMapButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.saveMapButton.Location = new System.Drawing.Point(3, 89); this.saveMapButton.Name = "saveMapButton"; - this.saveMapButton.Size = new System.Drawing.Size(190, 45); + this.saveMapButton.Size = new System.Drawing.Size(141, 37); this.saveMapButton.TabIndex = 34; this.saveMapButton.Text = "Save This\r\nMap BIN\r\n"; this.saveMapButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -3313,10 +3148,9 @@ // mapScreenshotButton // this.mapScreenshotButton.Image = global::DSPRE.Properties.Resources.cameraIcon; - this.mapScreenshotButton.Location = new System.Drawing.Point(1513, 614); - this.mapScreenshotButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.mapScreenshotButton.Location = new System.Drawing.Point(1135, 499); this.mapScreenshotButton.Name = "mapScreenshotButton"; - this.mapScreenshotButton.Size = new System.Drawing.Size(55, 49); + this.mapScreenshotButton.Size = new System.Drawing.Size(41, 40); this.mapScreenshotButton.TabIndex = 39; this.mapScreenshotButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.mapScreenshotButton.UseVisualStyleBackColor = true; @@ -3327,10 +3161,9 @@ this.mapRenderPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.mapRenderPanel.Controls.Add(this.mapOpenGlControl); this.mapRenderPanel.Controls.Add(this.movPictureBox); - this.mapRenderPanel.Location = new System.Drawing.Point(692, 4); - this.mapRenderPanel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.mapRenderPanel.Location = new System.Drawing.Point(519, 3); this.mapRenderPanel.Name = "mapRenderPanel"; - this.mapRenderPanel.Size = new System.Drawing.Size(813, 750); + this.mapRenderPanel.Size = new System.Drawing.Size(610, 610); this.mapRenderPanel.TabIndex = 23; // // mapOpenGlControl @@ -3346,9 +3179,8 @@ this.mapOpenGlControl.Dock = System.Windows.Forms.DockStyle.Fill; this.mapOpenGlControl.ForeColor = System.Drawing.Color.Black; this.mapOpenGlControl.Location = new System.Drawing.Point(0, 0); - this.mapOpenGlControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.mapOpenGlControl.Name = "mapOpenGlControl"; - this.mapOpenGlControl.Size = new System.Drawing.Size(811, 748); + this.mapOpenGlControl.Size = new System.Drawing.Size(608, 608); this.mapOpenGlControl.StencilBits = ((byte)(0)); this.mapOpenGlControl.TabIndex = 2; this.mapOpenGlControl.Click += new System.EventHandler(this.mapOpenGlControl_Click); @@ -3359,9 +3191,8 @@ // this.movPictureBox.BackColor = System.Drawing.Color.White; this.movPictureBox.Location = new System.Drawing.Point(0, 0); - this.movPictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.movPictureBox.Name = "movPictureBox"; - this.movPictureBox.Size = new System.Drawing.Size(811, 748); + this.movPictureBox.Size = new System.Drawing.Size(608, 608); this.movPictureBox.TabIndex = 3; this.movPictureBox.TabStop = false; this.movPictureBox.Click += new System.EventHandler(this.movPictureBox_Click); @@ -3370,10 +3201,9 @@ // label26 // this.label26.AutoSize = true; - this.label26.Location = new System.Drawing.Point(21, 706); - this.label26.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label26.Location = new System.Drawing.Point(16, 574); this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(104, 16); + this.label26.Size = new System.Drawing.Size(84, 13); this.label26.TabIndex = 33; this.label26.Text = "Buildings texture"; // @@ -3381,20 +3211,18 @@ // this.buildTextureComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.buildTextureComboBox.FormattingEnabled = true; - this.buildTextureComboBox.Location = new System.Drawing.Point(25, 724); - this.buildTextureComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.buildTextureComboBox.Location = new System.Drawing.Point(19, 588); this.buildTextureComboBox.Name = "buildTextureComboBox"; - this.buildTextureComboBox.Size = new System.Drawing.Size(309, 24); + this.buildTextureComboBox.Size = new System.Drawing.Size(233, 21); this.buildTextureComboBox.TabIndex = 32; this.buildTextureComboBox.SelectedIndexChanged += new System.EventHandler(this.buildTextureComboBox_SelectedIndexChanged); // // mapFileLabel // this.mapFileLabel.AutoSize = true; - this.mapFileLabel.Location = new System.Drawing.Point(21, 598); - this.mapFileLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.mapFileLabel.Location = new System.Drawing.Point(16, 486); this.mapFileLabel.Name = "mapFileLabel"; - this.mapFileLabel.Size = new System.Drawing.Size(54, 16); + this.mapFileLabel.Size = new System.Drawing.Size(44, 13); this.mapFileLabel.TabIndex = 31; this.mapFileLabel.Text = "Map file"; // @@ -3402,20 +3230,18 @@ // this.mapTextureComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.mapTextureComboBox.FormattingEnabled = true; - this.mapTextureComboBox.Location = new System.Drawing.Point(25, 670); - this.mapTextureComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.mapTextureComboBox.Location = new System.Drawing.Point(19, 544); this.mapTextureComboBox.Name = "mapTextureComboBox"; - this.mapTextureComboBox.Size = new System.Drawing.Size(309, 24); + this.mapTextureComboBox.Size = new System.Drawing.Size(233, 21); this.mapTextureComboBox.TabIndex = 30; this.mapTextureComboBox.SelectedIndexChanged += new System.EventHandler(this.mapTextureComboBox_SelectedIndexChanged); // // mapTextureLabel // this.mapTextureLabel.AutoSize = true; - this.mapTextureLabel.Location = new System.Drawing.Point(21, 652); - this.mapTextureLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.mapTextureLabel.Location = new System.Drawing.Point(16, 530); this.mapTextureLabel.Name = "mapTextureLabel"; - this.mapTextureLabel.Size = new System.Drawing.Size(76, 16); + this.mapTextureLabel.Size = new System.Drawing.Size(63, 13); this.mapTextureLabel.TabIndex = 29; this.mapTextureLabel.Text = "Map texture"; // @@ -3423,10 +3249,9 @@ // this.selectMapComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.selectMapComboBox.FormattingEnabled = true; - this.selectMapComboBox.Location = new System.Drawing.Point(25, 615); - this.selectMapComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.selectMapComboBox.Location = new System.Drawing.Point(19, 500); this.selectMapComboBox.Name = "selectMapComboBox"; - this.selectMapComboBox.Size = new System.Drawing.Size(309, 24); + this.selectMapComboBox.Size = new System.Drawing.Size(233, 21); this.selectMapComboBox.TabIndex = 28; this.selectMapComboBox.SelectedIndexChanged += new System.EventHandler(this.selectMapComboBox_SelectedIndexChanged); // @@ -3437,11 +3262,10 @@ this.mapPartsTabControl.Controls.Add(this.modelTabPage); this.mapPartsTabControl.Controls.Add(this.terrainTabPage); this.mapPartsTabControl.Controls.Add(this.bgsTabPage); - this.mapPartsTabControl.Location = new System.Drawing.Point(20, 7); - this.mapPartsTabControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.mapPartsTabControl.Location = new System.Drawing.Point(15, 6); this.mapPartsTabControl.Name = "mapPartsTabControl"; this.mapPartsTabControl.SelectedIndex = 0; - this.mapPartsTabControl.Size = new System.Drawing.Size(652, 586); + this.mapPartsTabControl.Size = new System.Drawing.Size(489, 476); this.mapPartsTabControl.TabIndex = 24; this.mapPartsTabControl.SelectedIndexChanged += new System.EventHandler(this.mapPartsTabControl_SelectedIndexChanged); // @@ -3463,11 +3287,10 @@ this.buildingsTabPage.Controls.Add(this.addBuildingButton); this.buildingsTabPage.Controls.Add(this.buildPositionGroupBox); this.buildingsTabPage.Controls.Add(this.buildingsListBox); - this.buildingsTabPage.Location = new System.Drawing.Point(4, 25); - this.buildingsTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.buildingsTabPage.Location = new System.Drawing.Point(4, 22); this.buildingsTabPage.Name = "buildingsTabPage"; - this.buildingsTabPage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.buildingsTabPage.Size = new System.Drawing.Size(644, 557); + this.buildingsTabPage.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.buildingsTabPage.Size = new System.Drawing.Size(481, 450); this.buildingsTabPage.TabIndex = 0; this.buildingsTabPage.Text = "Buildings"; this.buildingsTabPage.UseVisualStyleBackColor = true; @@ -3481,11 +3304,9 @@ this.groupBox33.Controls.Add(this.xRotBuildUpDown); this.groupBox33.Controls.Add(this.zRotBuildUpDown); this.groupBox33.Enabled = false; - this.groupBox33.Location = new System.Drawing.Point(452, 174); - this.groupBox33.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox33.Location = new System.Drawing.Point(339, 141); this.groupBox33.Name = "groupBox33"; - this.groupBox33.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox33.Size = new System.Drawing.Size(175, 151); + this.groupBox33.Size = new System.Drawing.Size(131, 123); this.groupBox33.TabIndex = 44; this.groupBox33.TabStop = false; this.groupBox33.Text = "Rotation"; @@ -3493,87 +3314,81 @@ // yRotDegBldUpDown // this.yRotDegBldUpDown.DecimalPlaces = 2; - this.yRotDegBldUpDown.Location = new System.Drawing.Point(88, 69); - this.yRotDegBldUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.yRotDegBldUpDown.Location = new System.Drawing.Point(66, 56); this.yRotDegBldUpDown.Maximum = new decimal(new int[] { 360, 0, 0, 0}); this.yRotDegBldUpDown.Name = "yRotDegBldUpDown"; - this.yRotDegBldUpDown.Size = new System.Drawing.Size(77, 22); + this.yRotDegBldUpDown.Size = new System.Drawing.Size(58, 20); this.yRotDegBldUpDown.TabIndex = 27; this.yRotDegBldUpDown.ValueChanged += new System.EventHandler(this.yRotDegBldUpDown_ValueChanged); // // xRotDegBldUpDown // this.xRotDegBldUpDown.DecimalPlaces = 2; - this.xRotDegBldUpDown.Location = new System.Drawing.Point(88, 25); - this.xRotDegBldUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.xRotDegBldUpDown.Location = new System.Drawing.Point(66, 20); this.xRotDegBldUpDown.Maximum = new decimal(new int[] { 360, 0, 0, 0}); this.xRotDegBldUpDown.Name = "xRotDegBldUpDown"; - this.xRotDegBldUpDown.Size = new System.Drawing.Size(77, 22); + this.xRotDegBldUpDown.Size = new System.Drawing.Size(58, 20); this.xRotDegBldUpDown.TabIndex = 25; this.xRotDegBldUpDown.ValueChanged += new System.EventHandler(this.xRotDegBldUpDown_ValueChanged); // // zRotDegBldUpDown // this.zRotDegBldUpDown.DecimalPlaces = 2; - this.zRotDegBldUpDown.Location = new System.Drawing.Point(88, 114); - this.zRotDegBldUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.zRotDegBldUpDown.Location = new System.Drawing.Point(66, 93); this.zRotDegBldUpDown.Maximum = new decimal(new int[] { 360, 0, 0, 0}); this.zRotDegBldUpDown.Name = "zRotDegBldUpDown"; - this.zRotDegBldUpDown.Size = new System.Drawing.Size(77, 22); + this.zRotDegBldUpDown.Size = new System.Drawing.Size(58, 20); this.zRotDegBldUpDown.TabIndex = 26; this.zRotDegBldUpDown.ValueChanged += new System.EventHandler(this.zRotDegBldUpDown_ValueChanged); // // yRotBuildUpDown // - this.yRotBuildUpDown.Location = new System.Drawing.Point(8, 69); - this.yRotBuildUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.yRotBuildUpDown.Location = new System.Drawing.Point(6, 56); this.yRotBuildUpDown.Maximum = new decimal(new int[] { 65536, 0, 0, 0}); this.yRotBuildUpDown.Name = "yRotBuildUpDown"; - this.yRotBuildUpDown.Size = new System.Drawing.Size(75, 22); + this.yRotBuildUpDown.Size = new System.Drawing.Size(56, 20); this.yRotBuildUpDown.TabIndex = 24; this.yRotBuildUpDown.ValueChanged += new System.EventHandler(this.yRotBuildUpDown_ValueChanged); // // xRotBuildUpDown // - this.xRotBuildUpDown.Location = new System.Drawing.Point(8, 25); - this.xRotBuildUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.xRotBuildUpDown.Location = new System.Drawing.Point(6, 20); this.xRotBuildUpDown.Maximum = new decimal(new int[] { 65536, 0, 0, 0}); this.xRotBuildUpDown.Name = "xRotBuildUpDown"; - this.xRotBuildUpDown.Size = new System.Drawing.Size(75, 22); + this.xRotBuildUpDown.Size = new System.Drawing.Size(56, 20); this.xRotBuildUpDown.TabIndex = 22; this.xRotBuildUpDown.ValueChanged += new System.EventHandler(this.xRotBuildUpDown_ValueChanged); // // zRotBuildUpDown // - this.zRotBuildUpDown.Location = new System.Drawing.Point(8, 114); - this.zRotBuildUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.zRotBuildUpDown.Location = new System.Drawing.Point(6, 93); this.zRotBuildUpDown.Maximum = new decimal(new int[] { 65536, 0, 0, 0}); this.zRotBuildUpDown.Name = "zRotBuildUpDown"; - this.zRotBuildUpDown.Size = new System.Drawing.Size(75, 22); + this.zRotBuildUpDown.Size = new System.Drawing.Size(56, 20); this.zRotBuildUpDown.TabIndex = 23; this.zRotBuildUpDown.ValueChanged += new System.EventHandler(this.zRotBuildUpDown_ValueChanged); // @@ -3582,10 +3397,9 @@ this.yLabel.AutoSize = true; this.yLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.yLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); - this.yLabel.Location = new System.Drawing.Point(244, 244); - this.yLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.yLabel.Location = new System.Drawing.Point(183, 198); this.yLabel.Name = "yLabel"; - this.yLabel.Size = new System.Drawing.Size(18, 18); + this.yLabel.Size = new System.Drawing.Size(15, 15); this.yLabel.TabIndex = 10; this.yLabel.Text = "Y"; // @@ -3594,11 +3408,9 @@ this.lockXZgroupbox.Controls.Add(this.bldPlaceLockXcheckbox); this.lockXZgroupbox.Controls.Add(this.bldPlaceLockZcheckbox); this.lockXZgroupbox.Enabled = false; - this.lockXZgroupbox.Location = new System.Drawing.Point(363, 334); - this.lockXZgroupbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.lockXZgroupbox.Location = new System.Drawing.Point(272, 271); this.lockXZgroupbox.Name = "lockXZgroupbox"; - this.lockXZgroupbox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.lockXZgroupbox.Size = new System.Drawing.Size(205, 44); + this.lockXZgroupbox.Size = new System.Drawing.Size(154, 36); this.lockXZgroupbox.TabIndex = 43; this.lockXZgroupbox.TabStop = false; // @@ -3609,10 +3421,9 @@ this.bldPlaceLockXcheckbox.Enabled = false; this.bldPlaceLockXcheckbox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.bldPlaceLockXcheckbox.ForeColor = System.Drawing.Color.Red; - this.bldPlaceLockXcheckbox.Location = new System.Drawing.Point(13, 11); - this.bldPlaceLockXcheckbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.bldPlaceLockXcheckbox.Location = new System.Drawing.Point(10, 9); this.bldPlaceLockXcheckbox.Name = "bldPlaceLockXcheckbox"; - this.bldPlaceLockXcheckbox.Size = new System.Drawing.Size(67, 27); + this.bldPlaceLockXcheckbox.Size = new System.Drawing.Size(57, 23); this.bldPlaceLockXcheckbox.TabIndex = 41; this.bldPlaceLockXcheckbox.Text = "Lock X"; this.bldPlaceLockXcheckbox.UseVisualStyleBackColor = true; @@ -3625,10 +3436,9 @@ this.bldPlaceLockZcheckbox.Enabled = false; this.bldPlaceLockZcheckbox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.bldPlaceLockZcheckbox.ForeColor = System.Drawing.Color.Blue; - this.bldPlaceLockZcheckbox.Location = new System.Drawing.Point(113, 11); - this.bldPlaceLockZcheckbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.bldPlaceLockZcheckbox.Location = new System.Drawing.Point(85, 9); this.bldPlaceLockZcheckbox.Name = "bldPlaceLockZcheckbox"; - this.bldPlaceLockZcheckbox.Size = new System.Drawing.Size(67, 27); + this.bldPlaceLockZcheckbox.Size = new System.Drawing.Size(57, 23); this.bldPlaceLockZcheckbox.TabIndex = 42; this.bldPlaceLockZcheckbox.Text = "Lock Z"; this.bldPlaceLockZcheckbox.UseVisualStyleBackColor = true; @@ -3639,10 +3449,9 @@ this.zLabel.AutoSize = true; this.zLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.zLabel.ForeColor = System.Drawing.Color.Blue; - this.zLabel.Location = new System.Drawing.Point(244, 287); - this.zLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.zLabel.Location = new System.Drawing.Point(183, 233); this.zLabel.Name = "zLabel"; - this.zLabel.Size = new System.Drawing.Size(18, 18); + this.zLabel.Size = new System.Drawing.Size(15, 15); this.zLabel.TabIndex = 9; this.zLabel.Text = "Z"; // @@ -3651,10 +3460,9 @@ this.xLabel.AutoSize = true; this.xLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xLabel.ForeColor = System.Drawing.Color.Red; - this.xLabel.Location = new System.Drawing.Point(243, 199); - this.xLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.xLabel.Location = new System.Drawing.Point(182, 162); this.xLabel.Name = "xLabel"; - this.xLabel.Size = new System.Drawing.Size(19, 18); + this.xLabel.Size = new System.Drawing.Size(16, 15); this.xLabel.TabIndex = 8; this.xLabel.Text = "X"; // @@ -3662,11 +3470,9 @@ // this.bldRoundGroupbox.Controls.Add(this.tableLayoutPanel2); this.bldRoundGroupbox.Enabled = false; - this.bldRoundGroupbox.Location = new System.Drawing.Point(260, 389); - this.bldRoundGroupbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.bldRoundGroupbox.Location = new System.Drawing.Point(195, 316); this.bldRoundGroupbox.Name = "bldRoundGroupbox"; - this.bldRoundGroupbox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.bldRoundGroupbox.Size = new System.Drawing.Size(359, 102); + this.bldRoundGroupbox.Size = new System.Drawing.Size(269, 83); this.bldRoundGroupbox.TabIndex = 40; this.bldRoundGroupbox.TabStop = false; this.bldRoundGroupbox.Text = "Round"; @@ -3684,23 +3490,21 @@ this.tableLayoutPanel2.Controls.Add(this.bldRoundCent, 2, 0); this.tableLayoutPanel2.Controls.Add(this.bldRoundMil, 0, 1); this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel2.Location = new System.Drawing.Point(4, 19); - this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 16); this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.RowCount = 2; this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(351, 79); + this.tableLayoutPanel2.Size = new System.Drawing.Size(263, 64); this.tableLayoutPanel2.TabIndex = 45; // // bldRoundDecmil // this.bldRoundDecmil.Appearance = System.Windows.Forms.Appearance.Button; this.bldRoundDecmil.Dock = System.Windows.Forms.DockStyle.Fill; - this.bldRoundDecmil.Location = new System.Drawing.Point(121, 43); - this.bldRoundDecmil.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.bldRoundDecmil.Location = new System.Drawing.Point(90, 35); this.bldRoundDecmil.Name = "bldRoundDecmil"; - this.bldRoundDecmil.Size = new System.Drawing.Size(109, 32); + this.bldRoundDecmil.Size = new System.Drawing.Size(81, 26); this.bldRoundDecmil.TabIndex = 4; this.bldRoundDecmil.Text = ".0001"; this.bldRoundDecmil.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -3711,10 +3515,9 @@ // this.bldRoundCentMil.Appearance = System.Windows.Forms.Appearance.Button; this.bldRoundCentMil.Dock = System.Windows.Forms.DockStyle.Fill; - this.bldRoundCentMil.Location = new System.Drawing.Point(238, 43); - this.bldRoundCentMil.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.bldRoundCentMil.Location = new System.Drawing.Point(177, 35); this.bldRoundCentMil.Name = "bldRoundCentMil"; - this.bldRoundCentMil.Size = new System.Drawing.Size(109, 32); + this.bldRoundCentMil.Size = new System.Drawing.Size(83, 26); this.bldRoundCentMil.TabIndex = 5; this.bldRoundCentMil.Text = ".00001"; this.bldRoundCentMil.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -3725,10 +3528,9 @@ // this.bldRoundWhole.Appearance = System.Windows.Forms.Appearance.Button; this.bldRoundWhole.Dock = System.Windows.Forms.DockStyle.Fill; - this.bldRoundWhole.Location = new System.Drawing.Point(4, 4); - this.bldRoundWhole.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.bldRoundWhole.Location = new System.Drawing.Point(3, 3); this.bldRoundWhole.Name = "bldRoundWhole"; - this.bldRoundWhole.Size = new System.Drawing.Size(109, 31); + this.bldRoundWhole.Size = new System.Drawing.Size(81, 26); this.bldRoundWhole.TabIndex = 0; this.bldRoundWhole.Text = "Whole"; this.bldRoundWhole.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -3740,10 +3542,9 @@ this.bldRoundDec.Appearance = System.Windows.Forms.Appearance.Button; this.bldRoundDec.Checked = true; this.bldRoundDec.Dock = System.Windows.Forms.DockStyle.Fill; - this.bldRoundDec.Location = new System.Drawing.Point(121, 4); - this.bldRoundDec.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.bldRoundDec.Location = new System.Drawing.Point(90, 3); this.bldRoundDec.Name = "bldRoundDec"; - this.bldRoundDec.Size = new System.Drawing.Size(109, 31); + this.bldRoundDec.Size = new System.Drawing.Size(81, 26); this.bldRoundDec.TabIndex = 1; this.bldRoundDec.TabStop = true; this.bldRoundDec.Text = ".1"; @@ -3755,10 +3556,9 @@ // this.bldRoundCent.Appearance = System.Windows.Forms.Appearance.Button; this.bldRoundCent.Dock = System.Windows.Forms.DockStyle.Fill; - this.bldRoundCent.Location = new System.Drawing.Point(238, 4); - this.bldRoundCent.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.bldRoundCent.Location = new System.Drawing.Point(177, 3); this.bldRoundCent.Name = "bldRoundCent"; - this.bldRoundCent.Size = new System.Drawing.Size(109, 31); + this.bldRoundCent.Size = new System.Drawing.Size(83, 26); this.bldRoundCent.TabIndex = 2; this.bldRoundCent.Text = ".01"; this.bldRoundCent.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -3769,10 +3569,9 @@ // this.bldRoundMil.Appearance = System.Windows.Forms.Appearance.Button; this.bldRoundMil.Dock = System.Windows.Forms.DockStyle.Fill; - this.bldRoundMil.Location = new System.Drawing.Point(4, 43); - this.bldRoundMil.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.bldRoundMil.Location = new System.Drawing.Point(3, 35); this.bldRoundMil.Name = "bldRoundMil"; - this.bldRoundMil.Size = new System.Drawing.Size(109, 32); + this.bldRoundMil.Size = new System.Drawing.Size(81, 26); this.bldRoundMil.TabIndex = 3; this.bldRoundMil.Text = ".001"; this.bldRoundMil.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -3784,10 +3583,9 @@ this.bldPlaceWithMouseCheckbox.Appearance = System.Windows.Forms.Appearance.Button; this.bldPlaceWithMouseCheckbox.Enabled = false; this.bldPlaceWithMouseCheckbox.Image = global::DSPRE.Properties.Resources.selectBldWithMouse; - this.bldPlaceWithMouseCheckbox.Location = new System.Drawing.Point(303, 334); - this.bldPlaceWithMouseCheckbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.bldPlaceWithMouseCheckbox.Location = new System.Drawing.Point(227, 271); this.bldPlaceWithMouseCheckbox.Name = "bldPlaceWithMouseCheckbox"; - this.bldPlaceWithMouseCheckbox.Size = new System.Drawing.Size(52, 49); + this.bldPlaceWithMouseCheckbox.Size = new System.Drawing.Size(39, 40); this.bldPlaceWithMouseCheckbox.TabIndex = 40; this.bldPlaceWithMouseCheckbox.UseVisualStyleBackColor = true; this.bldPlaceWithMouseCheckbox.CheckedChanged += new System.EventHandler(this.bldPlaceWithMouseCheckbox_CheckedChanged); @@ -3796,10 +3594,9 @@ // this.importBuildingsButton.Image = ((System.Drawing.Image)(resources.GetObject("importBuildingsButton.Image"))); this.importBuildingsButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.importBuildingsButton.Location = new System.Drawing.Point(257, 14); - this.importBuildingsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.importBuildingsButton.Location = new System.Drawing.Point(193, 11); this.importBuildingsButton.Name = "importBuildingsButton"; - this.importBuildingsButton.Size = new System.Drawing.Size(136, 49); + this.importBuildingsButton.Size = new System.Drawing.Size(102, 40); this.importBuildingsButton.TabIndex = 21; this.importBuildingsButton.Text = "Import\r\nBuildings"; this.importBuildingsButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -3811,11 +3608,9 @@ this.groupBox20.Controls.Add(this.interiorbldRadioButton); this.groupBox20.Controls.Add(this.exteriorbldRadioButton); this.groupBox20.Controls.Add(this.buildIndexComboBox); - this.groupBox20.Location = new System.Drawing.Point(252, 70); - this.groupBox20.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox20.Location = new System.Drawing.Point(189, 57); this.groupBox20.Name = "groupBox20"; - this.groupBox20.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox20.Size = new System.Drawing.Size(379, 100); + this.groupBox20.Size = new System.Drawing.Size(284, 81); this.groupBox20.TabIndex = 26; this.groupBox20.TabStop = false; this.groupBox20.Text = "Building Selector"; @@ -3825,10 +3620,9 @@ this.interiorbldRadioButton.Appearance = System.Windows.Forms.Appearance.Button; this.interiorbldRadioButton.AutoSize = true; this.interiorbldRadioButton.Enabled = false; - this.interiorbldRadioButton.Location = new System.Drawing.Point(12, 22); - this.interiorbldRadioButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.interiorbldRadioButton.Location = new System.Drawing.Point(9, 18); this.interiorbldRadioButton.Name = "interiorbldRadioButton"; - this.interiorbldRadioButton.Size = new System.Drawing.Size(80, 26); + this.interiorbldRadioButton.Size = new System.Drawing.Size(68, 23); this.interiorbldRadioButton.TabIndex = 3; this.interiorbldRadioButton.Text = "Interior List"; this.interiorbldRadioButton.UseVisualStyleBackColor = true; @@ -3840,10 +3634,9 @@ this.exteriorbldRadioButton.AutoSize = true; this.exteriorbldRadioButton.Checked = true; this.exteriorbldRadioButton.Enabled = false; - this.exteriorbldRadioButton.Location = new System.Drawing.Point(111, 22); - this.exteriorbldRadioButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.exteriorbldRadioButton.Location = new System.Drawing.Point(83, 18); this.exteriorbldRadioButton.Name = "exteriorbldRadioButton"; - this.exteriorbldRadioButton.Size = new System.Drawing.Size(85, 26); + this.exteriorbldRadioButton.Size = new System.Drawing.Size(71, 23); this.exteriorbldRadioButton.TabIndex = 4; this.exteriorbldRadioButton.TabStop = true; this.exteriorbldRadioButton.Text = "Exterior List"; @@ -3853,10 +3646,9 @@ // this.buildIndexComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.buildIndexComboBox.FormattingEnabled = true; - this.buildIndexComboBox.Location = new System.Drawing.Point(12, 59); - this.buildIndexComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.buildIndexComboBox.Location = new System.Drawing.Point(9, 48); this.buildIndexComboBox.Name = "buildIndexComboBox"; - this.buildIndexComboBox.Size = new System.Drawing.Size(351, 24); + this.buildIndexComboBox.Size = new System.Drawing.Size(264, 21); this.buildIndexComboBox.TabIndex = 1; this.buildIndexComboBox.SelectedIndexChanged += new System.EventHandler(this.buildIndexComboBox_SelectedIndexChanged); // @@ -3865,39 +3657,34 @@ this.groupBox19.Controls.Add(this.buildingHeightUpDown); this.groupBox19.Controls.Add(this.buildingWidthUpDown); this.groupBox19.Controls.Add(this.buildingLengthUpDown); - this.groupBox19.Location = new System.Drawing.Point(377, 174); - this.groupBox19.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox19.Location = new System.Drawing.Point(283, 141); this.groupBox19.Name = "groupBox19"; - this.groupBox19.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox19.Size = new System.Drawing.Size(71, 151); + this.groupBox19.Size = new System.Drawing.Size(53, 123); this.groupBox19.TabIndex = 12; this.groupBox19.TabStop = false; this.groupBox19.Text = "Scale"; // // buildingHeightUpDown // - this.buildingHeightUpDown.Location = new System.Drawing.Point(5, 69); - this.buildingHeightUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.buildingHeightUpDown.Location = new System.Drawing.Point(4, 56); this.buildingHeightUpDown.Name = "buildingHeightUpDown"; - this.buildingHeightUpDown.Size = new System.Drawing.Size(57, 22); + this.buildingHeightUpDown.Size = new System.Drawing.Size(43, 20); this.buildingHeightUpDown.TabIndex = 24; this.buildingHeightUpDown.ValueChanged += new System.EventHandler(this.buildingHeightUpDown_ValueChanged); // // buildingWidthUpDown // - this.buildingWidthUpDown.Location = new System.Drawing.Point(5, 25); - this.buildingWidthUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.buildingWidthUpDown.Location = new System.Drawing.Point(4, 20); this.buildingWidthUpDown.Name = "buildingWidthUpDown"; - this.buildingWidthUpDown.Size = new System.Drawing.Size(57, 22); + this.buildingWidthUpDown.Size = new System.Drawing.Size(43, 20); this.buildingWidthUpDown.TabIndex = 22; this.buildingWidthUpDown.ValueChanged += new System.EventHandler(this.buildingWidthUpDown_ValueChanged); // // buildingLengthUpDown // - this.buildingLengthUpDown.Location = new System.Drawing.Point(5, 114); - this.buildingLengthUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.buildingLengthUpDown.Location = new System.Drawing.Point(4, 93); this.buildingLengthUpDown.Name = "buildingLengthUpDown"; - this.buildingLengthUpDown.Size = new System.Drawing.Size(57, 22); + this.buildingLengthUpDown.Size = new System.Drawing.Size(43, 20); this.buildingLengthUpDown.TabIndex = 23; this.buildingLengthUpDown.ValueChanged += new System.EventHandler(this.buildingLengthUpDown_ValueChanged); // @@ -3905,10 +3692,9 @@ // this.duplicateBuildingButton.Image = global::DSPRE.Properties.Resources.copyIcon_small; this.duplicateBuildingButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.duplicateBuildingButton.Location = new System.Drawing.Point(469, 498); - this.duplicateBuildingButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.duplicateBuildingButton.Location = new System.Drawing.Point(352, 405); this.duplicateBuildingButton.Name = "duplicateBuildingButton"; - this.duplicateBuildingButton.Size = new System.Drawing.Size(107, 39); + this.duplicateBuildingButton.Size = new System.Drawing.Size(80, 32); this.duplicateBuildingButton.TabIndex = 25; this.duplicateBuildingButton.Text = "Duplicate"; this.duplicateBuildingButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -3919,10 +3705,9 @@ // this.exportBuildingsButton.Image = ((System.Drawing.Image)(resources.GetObject("exportBuildingsButton.Image"))); this.exportBuildingsButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.exportBuildingsButton.Location = new System.Drawing.Point(397, 14); - this.exportBuildingsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.exportBuildingsButton.Location = new System.Drawing.Point(298, 11); this.exportBuildingsButton.Name = "exportBuildingsButton"; - this.exportBuildingsButton.Size = new System.Drawing.Size(136, 49); + this.exportBuildingsButton.Size = new System.Drawing.Size(102, 40); this.exportBuildingsButton.TabIndex = 20; this.exportBuildingsButton.Text = "Export\r\nBuildings"; this.exportBuildingsButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -3933,10 +3718,9 @@ // this.removeBuildingButton.Image = global::DSPRE.Properties.Resources.deleteIcon; this.removeBuildingButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeBuildingButton.Location = new System.Drawing.Point(375, 498); - this.removeBuildingButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.removeBuildingButton.Location = new System.Drawing.Point(281, 405); this.removeBuildingButton.Name = "removeBuildingButton"; - this.removeBuildingButton.Size = new System.Drawing.Size(93, 39); + this.removeBuildingButton.Size = new System.Drawing.Size(70, 32); this.removeBuildingButton.TabIndex = 13; this.removeBuildingButton.Text = "Delete"; this.removeBuildingButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -3947,10 +3731,9 @@ // this.addBuildingButton.Image = ((System.Drawing.Image)(resources.GetObject("addBuildingButton.Image"))); this.addBuildingButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addBuildingButton.Location = new System.Drawing.Point(299, 498); - this.addBuildingButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.addBuildingButton.Location = new System.Drawing.Point(224, 405); this.addBuildingButton.Name = "addBuildingButton"; - this.addBuildingButton.Size = new System.Drawing.Size(75, 39); + this.addBuildingButton.Size = new System.Drawing.Size(56, 32); this.addBuildingButton.TabIndex = 12; this.addBuildingButton.Text = "Add"; this.addBuildingButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -3962,11 +3745,9 @@ this.buildPositionGroupBox.Controls.Add(this.yBuildUpDown); this.buildPositionGroupBox.Controls.Add(this.xBuildUpDown); this.buildPositionGroupBox.Controls.Add(this.zBuildUpDown); - this.buildPositionGroupBox.Location = new System.Drawing.Point(264, 174); - this.buildPositionGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.buildPositionGroupBox.Location = new System.Drawing.Point(198, 141); this.buildPositionGroupBox.Name = "buildPositionGroupBox"; - this.buildPositionGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.buildPositionGroupBox.Size = new System.Drawing.Size(108, 151); + this.buildPositionGroupBox.Size = new System.Drawing.Size(81, 123); this.buildPositionGroupBox.TabIndex = 11; this.buildPositionGroupBox.TabStop = false; this.buildPositionGroupBox.Text = "Position"; @@ -3974,8 +3755,7 @@ // yBuildUpDown // this.yBuildUpDown.DecimalPlaces = 5; - this.yBuildUpDown.Location = new System.Drawing.Point(8, 69); - this.yBuildUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.yBuildUpDown.Location = new System.Drawing.Point(6, 56); this.yBuildUpDown.Maximum = new decimal(new int[] { 255, 0, @@ -3987,15 +3767,14 @@ 0, -2147483648}); this.yBuildUpDown.Name = "yBuildUpDown"; - this.yBuildUpDown.Size = new System.Drawing.Size(92, 22); + this.yBuildUpDown.Size = new System.Drawing.Size(69, 20); this.yBuildUpDown.TabIndex = 7; this.yBuildUpDown.ValueChanged += new System.EventHandler(this.yBuildUpDown_ValueChanged); // // xBuildUpDown // this.xBuildUpDown.DecimalPlaces = 5; - this.xBuildUpDown.Location = new System.Drawing.Point(8, 25); - this.xBuildUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.xBuildUpDown.Location = new System.Drawing.Point(6, 20); this.xBuildUpDown.Maximum = new decimal(new int[] { 255, 0, @@ -4007,15 +3786,14 @@ 0, -2147483648}); this.xBuildUpDown.Name = "xBuildUpDown"; - this.xBuildUpDown.Size = new System.Drawing.Size(92, 22); + this.xBuildUpDown.Size = new System.Drawing.Size(69, 20); this.xBuildUpDown.TabIndex = 5; this.xBuildUpDown.ValueChanged += new System.EventHandler(this.xBuildUpDown_ValueChanged); // // zBuildUpDown // this.zBuildUpDown.DecimalPlaces = 5; - this.zBuildUpDown.Location = new System.Drawing.Point(8, 114); - this.zBuildUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.zBuildUpDown.Location = new System.Drawing.Point(6, 93); this.zBuildUpDown.Maximum = new decimal(new int[] { 255, 0, @@ -4027,18 +3805,16 @@ 0, -2147483648}); this.zBuildUpDown.Name = "zBuildUpDown"; - this.zBuildUpDown.Size = new System.Drawing.Size(92, 22); + this.zBuildUpDown.Size = new System.Drawing.Size(69, 20); this.zBuildUpDown.TabIndex = 6; this.zBuildUpDown.ValueChanged += new System.EventHandler(this.zBuildUpDown_ValueChanged); // // buildingsListBox // this.buildingsListBox.FormattingEnabled = true; - this.buildingsListBox.ItemHeight = 16; - this.buildingsListBox.Location = new System.Drawing.Point(12, 9); - this.buildingsListBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.buildingsListBox.Location = new System.Drawing.Point(9, 7); this.buildingsListBox.Name = "buildingsListBox"; - this.buildingsListBox.Size = new System.Drawing.Size(223, 532); + this.buildingsListBox.Size = new System.Drawing.Size(168, 433); this.buildingsListBox.TabIndex = 0; this.buildingsListBox.SelectedIndexChanged += new System.EventHandler(this.buildingsListBox_SelectedIndexChanged); // @@ -4054,11 +3830,10 @@ this.permissionsTabPage.Controls.Add(this.selectTypePanel); this.permissionsTabPage.Controls.Add(this.ImportMovButton); this.permissionsTabPage.Controls.Add(this.exportMovButton); - this.permissionsTabPage.Location = new System.Drawing.Point(4, 25); - this.permissionsTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.permissionsTabPage.Location = new System.Drawing.Point(4, 22); this.permissionsTabPage.Name = "permissionsTabPage"; - this.permissionsTabPage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.permissionsTabPage.Size = new System.Drawing.Size(644, 557); + this.permissionsTabPage.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.permissionsTabPage.Size = new System.Drawing.Size(481, 450); this.permissionsTabPage.TabIndex = 1; this.permissionsTabPage.Text = "Move Permissions"; this.permissionsTabPage.UseVisualStyleBackColor = true; @@ -4067,10 +3842,9 @@ // this.scanUnusedCollisionTypesButton.Image = global::DSPRE.Properties.Resources.SearchMiniIcon; this.scanUnusedCollisionTypesButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.scanUnusedCollisionTypesButton.Location = new System.Drawing.Point(460, 135); - this.scanUnusedCollisionTypesButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.scanUnusedCollisionTypesButton.Location = new System.Drawing.Point(345, 110); this.scanUnusedCollisionTypesButton.Name = "scanUnusedCollisionTypesButton"; - this.scanUnusedCollisionTypesButton.Size = new System.Drawing.Size(148, 33); + this.scanUnusedCollisionTypesButton.Size = new System.Drawing.Size(111, 27); this.scanUnusedCollisionTypesButton.TabIndex = 33; this.scanUnusedCollisionTypesButton.Text = "Scan used types"; this.scanUnusedCollisionTypesButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4079,10 +3853,9 @@ // // clearCurrentButton // - this.clearCurrentButton.Location = new System.Drawing.Point(15, 165); - this.clearCurrentButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.clearCurrentButton.Location = new System.Drawing.Point(11, 134); this.clearCurrentButton.Name = "clearCurrentButton"; - this.clearCurrentButton.Size = new System.Drawing.Size(283, 28); + this.clearCurrentButton.Size = new System.Drawing.Size(212, 23); this.clearCurrentButton.TabIndex = 32; this.clearCurrentButton.Text = "Clear current"; this.clearCurrentButton.UseVisualStyleBackColor = true; @@ -4092,10 +3865,9 @@ // this.typeLabel.AutoSize = true; this.typeLabel.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.typeLabel.Location = new System.Drawing.Point(207, 11); - this.typeLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.typeLabel.Location = new System.Drawing.Point(155, 9); this.typeLabel.Name = "typeLabel"; - this.typeLabel.Size = new System.Drawing.Size(39, 16); + this.typeLabel.Size = new System.Drawing.Size(31, 13); this.typeLabel.TabIndex = 29; this.typeLabel.Text = "Type"; // @@ -4103,10 +3875,9 @@ // this.collisionLabel.AutoSize = true; this.collisionLabel.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.collisionLabel.Location = new System.Drawing.Point(53, 11); - this.collisionLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.collisionLabel.Location = new System.Drawing.Point(40, 9); this.collisionLabel.Name = "collisionLabel"; - this.collisionLabel.Size = new System.Drawing.Size(58, 16); + this.collisionLabel.Size = new System.Drawing.Size(45, 13); this.collisionLabel.TabIndex = 28; this.collisionLabel.Text = "Collision"; // @@ -4118,11 +3889,9 @@ this.typeGroupBox.Controls.Add(this.collisionTypePainterComboBox); this.typeGroupBox.Controls.Add(this.typePainterPictureBox); this.typeGroupBox.Enabled = false; - this.typeGroupBox.Location = new System.Drawing.Point(16, 370); - this.typeGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.typeGroupBox.Location = new System.Drawing.Point(12, 301); this.typeGroupBox.Name = "typeGroupBox"; - this.typeGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.typeGroupBox.Size = new System.Drawing.Size(592, 165); + this.typeGroupBox.Size = new System.Drawing.Size(444, 134); this.typeGroupBox.TabIndex = 25; this.typeGroupBox.TabStop = false; this.typeGroupBox.Text = "Type Painter"; @@ -4131,10 +3900,9 @@ // this.knownTypesRadioButton.AutoSize = true; this.knownTypesRadioButton.Checked = true; - this.knownTypesRadioButton.Location = new System.Drawing.Point(180, 26); - this.knownTypesRadioButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.knownTypesRadioButton.Location = new System.Drawing.Point(135, 21); this.knownTypesRadioButton.Name = "knownTypesRadioButton"; - this.knownTypesRadioButton.Size = new System.Drawing.Size(109, 20); + this.knownTypesRadioButton.Size = new System.Drawing.Size(90, 17); this.knownTypesRadioButton.TabIndex = 5; this.knownTypesRadioButton.TabStop = true; this.knownTypesRadioButton.Text = "Known Types"; @@ -4144,10 +3912,9 @@ // valueTypeRadioButton // this.valueTypeRadioButton.AutoSize = true; - this.valueTypeRadioButton.Location = new System.Drawing.Point(180, 96); - this.valueTypeRadioButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.valueTypeRadioButton.Location = new System.Drawing.Point(135, 78); this.valueTypeRadioButton.Name = "valueTypeRadioButton"; - this.valueTypeRadioButton.Size = new System.Drawing.Size(63, 20); + this.valueTypeRadioButton.Size = new System.Drawing.Size(52, 17); this.valueTypeRadioButton.TabIndex = 4; this.valueTypeRadioButton.Text = "Value"; this.valueTypeRadioButton.UseVisualStyleBackColor = true; @@ -4157,15 +3924,14 @@ // this.typePainterUpDown.Enabled = false; this.typePainterUpDown.Hexadecimal = true; - this.typePainterUpDown.Location = new System.Drawing.Point(179, 124); - this.typePainterUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.typePainterUpDown.Location = new System.Drawing.Point(134, 101); this.typePainterUpDown.Maximum = new decimal(new int[] { 255, 0, 0, 0}); this.typePainterUpDown.Name = "typePainterUpDown"; - this.typePainterUpDown.Size = new System.Drawing.Size(104, 22); + this.typePainterUpDown.Size = new System.Drawing.Size(78, 20); this.typePainterUpDown.TabIndex = 3; this.typePainterUpDown.ValueChanged += new System.EventHandler(this.typePainterUpDown_ValueChanged); // @@ -4174,11 +3940,10 @@ this.collisionTypePainterComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.collisionTypePainterComboBox.FormattingEnabled = true; this.collisionTypePainterComboBox.IntegralHeight = false; - this.collisionTypePainterComboBox.Location = new System.Drawing.Point(180, 54); - this.collisionTypePainterComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.collisionTypePainterComboBox.Location = new System.Drawing.Point(135, 44); this.collisionTypePainterComboBox.MaxDropDownItems = 10; this.collisionTypePainterComboBox.Name = "collisionTypePainterComboBox"; - this.collisionTypePainterComboBox.Size = new System.Drawing.Size(376, 24); + this.collisionTypePainterComboBox.Size = new System.Drawing.Size(283, 21); this.collisionTypePainterComboBox.TabIndex = 2; this.collisionTypePainterComboBox.SelectedIndexChanged += new System.EventHandler(this.typePainterComboBox_SelectedIndexChanged); // @@ -4186,10 +3951,9 @@ // this.typePainterPictureBox.BackColor = System.Drawing.Color.White; this.typePainterPictureBox.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.typePainterPictureBox.Location = new System.Drawing.Point(24, 38); - this.typePainterPictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.typePainterPictureBox.Location = new System.Drawing.Point(18, 31); this.typePainterPictureBox.Name = "typePainterPictureBox"; - this.typePainterPictureBox.Size = new System.Drawing.Size(105, 98); + this.typePainterPictureBox.Size = new System.Drawing.Size(80, 80); this.typePainterPictureBox.TabIndex = 1; this.typePainterPictureBox.TabStop = false; // @@ -4197,11 +3961,9 @@ // this.collisionGroupBox.Controls.Add(this.collisionPainterComboBox); this.collisionGroupBox.Controls.Add(this.collisionPainterPictureBox); - this.collisionGroupBox.Location = new System.Drawing.Point(16, 206); - this.collisionGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.collisionGroupBox.Location = new System.Drawing.Point(12, 167); this.collisionGroupBox.Name = "collisionGroupBox"; - this.collisionGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.collisionGroupBox.Size = new System.Drawing.Size(592, 145); + this.collisionGroupBox.Size = new System.Drawing.Size(444, 118); this.collisionGroupBox.TabIndex = 24; this.collisionGroupBox.TabStop = false; this.collisionGroupBox.Text = "Collision Painter"; @@ -4210,10 +3972,9 @@ // this.collisionPainterComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.collisionPainterComboBox.FormattingEnabled = true; - this.collisionPainterComboBox.Location = new System.Drawing.Point(179, 62); - this.collisionPainterComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.collisionPainterComboBox.Location = new System.Drawing.Point(134, 50); this.collisionPainterComboBox.Name = "collisionPainterComboBox"; - this.collisionPainterComboBox.Size = new System.Drawing.Size(377, 24); + this.collisionPainterComboBox.Size = new System.Drawing.Size(284, 21); this.collisionPainterComboBox.TabIndex = 1; this.collisionPainterComboBox.SelectedIndexChanged += new System.EventHandler(this.collisionPainterComboBox_SelectedIndexChange); // @@ -4221,30 +3982,27 @@ // this.collisionPainterPictureBox.BackColor = System.Drawing.Color.White; this.collisionPainterPictureBox.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.collisionPainterPictureBox.Location = new System.Drawing.Point(24, 28); - this.collisionPainterPictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.collisionPainterPictureBox.Location = new System.Drawing.Point(18, 23); this.collisionPainterPictureBox.Name = "collisionPainterPictureBox"; - this.collisionPainterPictureBox.Size = new System.Drawing.Size(105, 98); + this.collisionPainterPictureBox.Size = new System.Drawing.Size(80, 80); this.collisionPainterPictureBox.TabIndex = 0; this.collisionPainterPictureBox.TabStop = false; // // selectCollisionPanel // this.selectCollisionPanel.Controls.Add(this.collisionPictureBox); - this.selectCollisionPanel.Location = new System.Drawing.Point(13, 28); - this.selectCollisionPanel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.selectCollisionPanel.Location = new System.Drawing.Point(10, 23); this.selectCollisionPanel.Name = "selectCollisionPanel"; - this.selectCollisionPanel.Size = new System.Drawing.Size(136, 126); + this.selectCollisionPanel.Size = new System.Drawing.Size(102, 102); this.selectCollisionPanel.TabIndex = 30; // // collisionPictureBox // this.collisionPictureBox.BackColor = System.Drawing.Color.White; this.collisionPictureBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.collisionPictureBox.Location = new System.Drawing.Point(4, 4); - this.collisionPictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.collisionPictureBox.Location = new System.Drawing.Point(3, 3); this.collisionPictureBox.Name = "collisionPictureBox"; - this.collisionPictureBox.Size = new System.Drawing.Size(127, 118); + this.collisionPictureBox.Size = new System.Drawing.Size(96, 96); this.collisionPictureBox.TabIndex = 26; this.collisionPictureBox.TabStop = false; this.collisionPictureBox.Click += new System.EventHandler(this.collisionPictureBox_Click); @@ -4252,20 +4010,18 @@ // selectTypePanel // this.selectTypePanel.Controls.Add(this.typePictureBox); - this.selectTypePanel.Location = new System.Drawing.Point(163, 28); - this.selectTypePanel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.selectTypePanel.Location = new System.Drawing.Point(122, 23); this.selectTypePanel.Name = "selectTypePanel"; - this.selectTypePanel.Size = new System.Drawing.Size(136, 126); + this.selectTypePanel.Size = new System.Drawing.Size(102, 102); this.selectTypePanel.TabIndex = 31; // // typePictureBox // this.typePictureBox.BackColor = System.Drawing.Color.White; this.typePictureBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.typePictureBox.Location = new System.Drawing.Point(4, 4); - this.typePictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.typePictureBox.Location = new System.Drawing.Point(3, 3); this.typePictureBox.Name = "typePictureBox"; - this.typePictureBox.Size = new System.Drawing.Size(127, 118); + this.typePictureBox.Size = new System.Drawing.Size(96, 96); this.typePictureBox.TabIndex = 27; this.typePictureBox.TabStop = false; this.typePictureBox.Click += new System.EventHandler(this.typePictureBox_Click); @@ -4274,10 +4030,9 @@ // this.ImportMovButton.Image = global::DSPRE.Properties.Resources.importArrow; this.ImportMovButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.ImportMovButton.Location = new System.Drawing.Point(424, 27); - this.ImportMovButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.ImportMovButton.Location = new System.Drawing.Point(318, 22); this.ImportMovButton.Name = "ImportMovButton"; - this.ImportMovButton.Size = new System.Drawing.Size(184, 47); + this.ImportMovButton.Size = new System.Drawing.Size(138, 38); this.ImportMovButton.TabIndex = 23; this.ImportMovButton.Text = "Import Permissions"; this.ImportMovButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4288,10 +4043,9 @@ // this.exportMovButton.Image = global::DSPRE.Properties.Resources.exportArrow; this.exportMovButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.exportMovButton.Location = new System.Drawing.Point(424, 79); - this.exportMovButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.exportMovButton.Location = new System.Drawing.Point(318, 64); this.exportMovButton.Name = "exportMovButton"; - this.exportMovButton.Size = new System.Drawing.Size(184, 47); + this.exportMovButton.Size = new System.Drawing.Size(138, 38); this.exportMovButton.TabIndex = 22; this.exportMovButton.Text = "Export Permissions"; this.exportMovButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4308,11 +4062,10 @@ this.modelTabPage.Controls.Add(this.unsupported3DModelEditLBL); this.modelTabPage.Controls.Add(this.importMapButton); this.modelTabPage.Controls.Add(this.exportMapButton); - this.modelTabPage.Location = new System.Drawing.Point(4, 25); - this.modelTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.modelTabPage.Location = new System.Drawing.Point(4, 22); this.modelTabPage.Name = "modelTabPage"; - this.modelTabPage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.modelTabPage.Size = new System.Drawing.Size(644, 557); + this.modelTabPage.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.modelTabPage.Size = new System.Drawing.Size(481, 450); this.modelTabPage.TabIndex = 2; this.modelTabPage.Text = "3D Model"; this.modelTabPage.UseVisualStyleBackColor = true; @@ -4321,10 +4074,10 @@ // this.glbExportButton.Image = global::DSPRE.Properties.Resources.exportArrow; this.glbExportButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.glbExportButton.Location = new System.Drawing.Point(468, 192); - this.glbExportButton.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.glbExportButton.Location = new System.Drawing.Point(351, 156); + this.glbExportButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.glbExportButton.Name = "glbExportButton"; - this.glbExportButton.Size = new System.Drawing.Size(160, 47); + this.glbExportButton.Size = new System.Drawing.Size(120, 38); this.glbExportButton.TabIndex = 31; this.glbExportButton.Text = "Export GLB"; this.glbExportButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4335,10 +4088,9 @@ // this.daeExportButton.Image = global::DSPRE.Properties.Resources.exportArrow; this.daeExportButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.daeExportButton.Location = new System.Drawing.Point(468, 137); - this.daeExportButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.daeExportButton.Location = new System.Drawing.Point(351, 111); this.daeExportButton.Name = "daeExportButton"; - this.daeExportButton.Size = new System.Drawing.Size(160, 47); + this.daeExportButton.Size = new System.Drawing.Size(120, 38); this.daeExportButton.TabIndex = 30; this.daeExportButton.Text = "Export DAE"; this.daeExportButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4350,10 +4102,9 @@ this.embedTexturesInMapModelCheckBox.AutoSize = true; this.embedTexturesInMapModelCheckBox.Checked = true; this.embedTexturesInMapModelCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; - this.embedTexturesInMapModelCheckBox.Location = new System.Drawing.Point(379, 81); - this.embedTexturesInMapModelCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.embedTexturesInMapModelCheckBox.Location = new System.Drawing.Point(284, 66); this.embedTexturesInMapModelCheckBox.Name = "embedTexturesInMapModelCheckBox"; - this.embedTexturesInMapModelCheckBox.Size = new System.Drawing.Size(82, 20); + this.embedTexturesInMapModelCheckBox.Size = new System.Drawing.Size(68, 17); this.embedTexturesInMapModelCheckBox.TabIndex = 29; this.embedTexturesInMapModelCheckBox.Text = "Textured"; this.embedTexturesInMapModelCheckBox.UseVisualStyleBackColor = true; @@ -4363,10 +4114,9 @@ this.modelSizeLBL.AutoSize = true; this.modelSizeLBL.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.modelSizeLBL.ForeColor = System.Drawing.SystemColors.ControlText; - this.modelSizeLBL.Location = new System.Drawing.Point(139, 11); - this.modelSizeLBL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.modelSizeLBL.Location = new System.Drawing.Point(104, 9); this.modelSizeLBL.Name = "modelSizeLBL"; - this.modelSizeLBL.Size = new System.Drawing.Size(118, 20); + this.modelSizeLBL.Size = new System.Drawing.Size(97, 16); this.modelSizeLBL.TabIndex = 28; this.modelSizeLBL.Text = "ModelSizeTXT"; // @@ -4376,10 +4126,9 @@ this.nsbmdSizeLabel.BackColor = System.Drawing.Color.Transparent; this.nsbmdSizeLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.nsbmdSizeLabel.ForeColor = System.Drawing.SystemColors.ControlText; - this.nsbmdSizeLabel.Location = new System.Drawing.Point(8, 11); - this.nsbmdSizeLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.nsbmdSizeLabel.Location = new System.Drawing.Point(6, 9); this.nsbmdSizeLabel.Name = "nsbmdSizeLabel"; - this.nsbmdSizeLabel.Size = new System.Drawing.Size(129, 20); + this.nsbmdSizeLabel.Size = new System.Drawing.Size(100, 16); this.nsbmdSizeLabel.TabIndex = 27; this.nsbmdSizeLabel.Text = "3D Model Size: "; // @@ -4388,10 +4137,9 @@ this.unsupported3DModelEditLBL.AutoSize = true; this.unsupported3DModelEditLBL.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F); this.unsupported3DModelEditLBL.ForeColor = System.Drawing.SystemColors.ControlText; - this.unsupported3DModelEditLBL.Location = new System.Drawing.Point(176, 305); - this.unsupported3DModelEditLBL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.unsupported3DModelEditLBL.Location = new System.Drawing.Point(132, 248); this.unsupported3DModelEditLBL.Name = "unsupported3DModelEditLBL"; - this.unsupported3DModelEditLBL.Size = new System.Drawing.Size(325, 60); + this.unsupported3DModelEditLBL.Size = new System.Drawing.Size(256, 48); this.unsupported3DModelEditLBL.TabIndex = 26; this.unsupported3DModelEditLBL.Text = "DSPRE cannot edit nor create 3D models.\r\nPlease use Blender, Sketchup, or \r\nTrifi" + "ndo\'s Pokemon DS Map Studio."; @@ -4401,10 +4149,9 @@ // this.importMapButton.Image = global::DSPRE.Properties.Resources.importArrow; this.importMapButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.importMapButton.Location = new System.Drawing.Point(468, 11); - this.importMapButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.importMapButton.Location = new System.Drawing.Point(351, 9); this.importMapButton.Name = "importMapButton"; - this.importMapButton.Size = new System.Drawing.Size(160, 47); + this.importMapButton.Size = new System.Drawing.Size(120, 38); this.importMapButton.TabIndex = 25; this.importMapButton.Text = "Import NSBMD"; this.importMapButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4415,10 +4162,9 @@ // this.exportMapButton.Image = global::DSPRE.Properties.Resources.exportArrow; this.exportMapButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.exportMapButton.Location = new System.Drawing.Point(468, 66); - this.exportMapButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.exportMapButton.Location = new System.Drawing.Point(351, 54); this.exportMapButton.Name = "exportMapButton"; - this.exportMapButton.Size = new System.Drawing.Size(160, 47); + this.exportMapButton.Size = new System.Drawing.Size(120, 38); this.exportMapButton.TabIndex = 24; this.exportMapButton.Text = "Export NSBMD"; this.exportMapButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4432,11 +4178,10 @@ this.terrainTabPage.Controls.Add(this.unsupportedBDHCEditLBL); this.terrainTabPage.Controls.Add(this.bdhcImportButton); this.terrainTabPage.Controls.Add(this.bdhcExportButton); - this.terrainTabPage.Location = new System.Drawing.Point(4, 25); - this.terrainTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.terrainTabPage.Location = new System.Drawing.Point(4, 22); this.terrainTabPage.Name = "terrainTabPage"; - this.terrainTabPage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.terrainTabPage.Size = new System.Drawing.Size(644, 557); + this.terrainTabPage.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.terrainTabPage.Size = new System.Drawing.Size(481, 450); this.terrainTabPage.TabIndex = 3; this.terrainTabPage.Text = "Terrain Data"; this.terrainTabPage.UseVisualStyleBackColor = true; @@ -4445,10 +4190,9 @@ // this.terrainSizeLBL.AutoSize = true; this.terrainSizeLBL.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.terrainSizeLBL.Location = new System.Drawing.Point(165, 11); - this.terrainSizeLBL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.terrainSizeLBL.Location = new System.Drawing.Point(124, 9); this.terrainSizeLBL.Name = "terrainSizeLBL"; - this.terrainSizeLBL.Size = new System.Drawing.Size(126, 20); + this.terrainSizeLBL.Size = new System.Drawing.Size(102, 16); this.terrainSizeLBL.TabIndex = 30; this.terrainSizeLBL.Text = "TerrainSizeTXT"; // @@ -4456,10 +4200,9 @@ // this.terrainDataLBL.AutoSize = true; this.terrainDataLBL.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.terrainDataLBL.Location = new System.Drawing.Point(8, 11); - this.terrainDataLBL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.terrainDataLBL.Location = new System.Drawing.Point(6, 9); this.terrainDataLBL.Name = "terrainDataLBL"; - this.terrainDataLBL.Size = new System.Drawing.Size(151, 20); + this.terrainDataLBL.Size = new System.Drawing.Size(117, 16); this.terrainDataLBL.TabIndex = 29; this.terrainDataLBL.Text = "Terrain Data Size: "; // @@ -4467,10 +4210,9 @@ // this.unsupportedBDHCEditLBL.AutoSize = true; this.unsupportedBDHCEditLBL.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.unsupportedBDHCEditLBL.Location = new System.Drawing.Point(151, 316); - this.unsupportedBDHCEditLBL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.unsupportedBDHCEditLBL.Location = new System.Drawing.Point(113, 257); this.unsupportedBDHCEditLBL.Name = "unsupportedBDHCEditLBL"; - this.unsupportedBDHCEditLBL.Size = new System.Drawing.Size(362, 40); + this.unsupportedBDHCEditLBL.Size = new System.Drawing.Size(290, 32); this.unsupportedBDHCEditLBL.TabIndex = 28; this.unsupportedBDHCEditLBL.Text = "DSPRE cannot edit nor create BDHC data.\r\nPlease use Trifindo\'s Pokemon DS Map Stu" + "dio."; @@ -4480,10 +4222,9 @@ // this.bdhcImportButton.Image = global::DSPRE.Properties.Resources.importArrow; this.bdhcImportButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.bdhcImportButton.Location = new System.Drawing.Point(468, 11); - this.bdhcImportButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.bdhcImportButton.Location = new System.Drawing.Point(351, 9); this.bdhcImportButton.Name = "bdhcImportButton"; - this.bdhcImportButton.Size = new System.Drawing.Size(160, 47); + this.bdhcImportButton.Size = new System.Drawing.Size(120, 38); this.bdhcImportButton.TabIndex = 27; this.bdhcImportButton.Text = "Import BDHC"; this.bdhcImportButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4494,10 +4235,9 @@ // this.bdhcExportButton.Image = global::DSPRE.Properties.Resources.exportArrow; this.bdhcExportButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.bdhcExportButton.Location = new System.Drawing.Point(468, 66); - this.bdhcExportButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.bdhcExportButton.Location = new System.Drawing.Point(351, 54); this.bdhcExportButton.Name = "bdhcExportButton"; - this.bdhcExportButton.Size = new System.Drawing.Size(160, 47); + this.bdhcExportButton.Size = new System.Drawing.Size(120, 38); this.bdhcExportButton.TabIndex = 26; this.bdhcExportButton.Text = "Export BDHC"; this.bdhcExportButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4512,10 +4252,9 @@ this.bgsTabPage.Controls.Add(this.unsupportedBGSEditLBL); this.bgsTabPage.Controls.Add(this.soundPlatesImportButton); this.bgsTabPage.Controls.Add(this.soundPlatesExportButton); - this.bgsTabPage.Location = new System.Drawing.Point(4, 25); - this.bgsTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.bgsTabPage.Location = new System.Drawing.Point(4, 22); this.bgsTabPage.Name = "bgsTabPage"; - this.bgsTabPage.Size = new System.Drawing.Size(644, 557); + this.bgsTabPage.Size = new System.Drawing.Size(481, 450); this.bgsTabPage.TabIndex = 4; this.bgsTabPage.Text = "Sound Plates"; this.bgsTabPage.UseVisualStyleBackColor = true; @@ -4524,10 +4263,9 @@ // this.blankBGSButton.Image = global::DSPRE.Properties.Resources.muteIcon; this.blankBGSButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.blankBGSButton.Location = new System.Drawing.Point(459, 138); - this.blankBGSButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.blankBGSButton.Location = new System.Drawing.Point(344, 112); this.blankBGSButton.Name = "blankBGSButton"; - this.blankBGSButton.Size = new System.Drawing.Size(160, 47); + this.blankBGSButton.Size = new System.Drawing.Size(120, 38); this.blankBGSButton.TabIndex = 34; this.blankBGSButton.Text = "Blank BGS"; this.blankBGSButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4540,10 +4278,9 @@ this.BGSSizeLBL.BackColor = System.Drawing.Color.Transparent; this.BGSSizeLBL.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.BGSSizeLBL.ForeColor = System.Drawing.SystemColors.ControlText; - this.BGSSizeLBL.Location = new System.Drawing.Point(97, 11); - this.BGSSizeLBL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.BGSSizeLBL.Location = new System.Drawing.Point(73, 9); this.BGSSizeLBL.Name = "BGSSizeLBL"; - this.BGSSizeLBL.Size = new System.Drawing.Size(110, 20); + this.BGSSizeLBL.Size = new System.Drawing.Size(84, 16); this.BGSSizeLBL.TabIndex = 33; this.BGSSizeLBL.Text = "BGSSizeLBL"; // @@ -4551,10 +4288,9 @@ // this.bgsDataLBL.AutoSize = true; this.bgsDataLBL.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.bgsDataLBL.Location = new System.Drawing.Point(9, 11); - this.bgsDataLBL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.bgsDataLBL.Location = new System.Drawing.Point(7, 9); this.bgsDataLBL.Name = "bgsDataLBL"; - this.bgsDataLBL.Size = new System.Drawing.Size(96, 20); + this.bgsDataLBL.Size = new System.Drawing.Size(73, 16); this.bgsDataLBL.TabIndex = 32; this.bgsDataLBL.Text = "BGS Data: "; // @@ -4562,10 +4298,9 @@ // this.unsupportedBGSEditLBL.AutoSize = true; this.unsupportedBGSEditLBL.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.unsupportedBGSEditLBL.Location = new System.Drawing.Point(97, 327); - this.unsupportedBGSEditLBL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.unsupportedBGSEditLBL.Location = new System.Drawing.Point(73, 266); this.unsupportedBGSEditLBL.Name = "unsupportedBGSEditLBL"; - this.unsupportedBGSEditLBL.Size = new System.Drawing.Size(426, 40); + this.unsupportedBGSEditLBL.Size = new System.Drawing.Size(338, 32); this.unsupportedBGSEditLBL.TabIndex = 31; this.unsupportedBGSEditLBL.Text = "DSPRE cannot edit nor create Background Sound Files.\r\nPlease use Trifindo\'s Pokem" + "on DS Map Studio.\r\n"; @@ -4575,10 +4310,9 @@ // this.soundPlatesImportButton.Image = global::DSPRE.Properties.Resources.importArrow; this.soundPlatesImportButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.soundPlatesImportButton.Location = new System.Drawing.Point(459, 12); - this.soundPlatesImportButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.soundPlatesImportButton.Location = new System.Drawing.Point(344, 10); this.soundPlatesImportButton.Name = "soundPlatesImportButton"; - this.soundPlatesImportButton.Size = new System.Drawing.Size(160, 47); + this.soundPlatesImportButton.Size = new System.Drawing.Size(120, 38); this.soundPlatesImportButton.TabIndex = 30; this.soundPlatesImportButton.Text = "Import BGS"; this.soundPlatesImportButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4589,10 +4323,9 @@ // this.soundPlatesExportButton.Image = global::DSPRE.Properties.Resources.exportArrow; this.soundPlatesExportButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.soundPlatesExportButton.Location = new System.Drawing.Point(459, 68); - this.soundPlatesExportButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.soundPlatesExportButton.Location = new System.Drawing.Point(344, 55); this.soundPlatesExportButton.Name = "soundPlatesExportButton"; - this.soundPlatesExportButton.Size = new System.Drawing.Size(160, 47); + this.soundPlatesExportButton.Size = new System.Drawing.Size(120, 38); this.soundPlatesExportButton.TabIndex = 29; this.soundPlatesExportButton.Text = "Export BGS"; this.soundPlatesExportButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4606,10 +4339,9 @@ this.radio3D.AutoSize = true; this.radio3D.Checked = true; this.radio3D.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.radio3D.Location = new System.Drawing.Point(-11713, -6416); - this.radio3D.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.radio3D.Location = new System.Drawing.Point(-9834, -5833); this.radio3D.Name = "radio3D"; - this.radio3D.Size = new System.Drawing.Size(34, 26); + this.radio3D.Size = new System.Drawing.Size(31, 23); this.radio3D.TabIndex = 26; this.radio3D.TabStop = true; this.radio3D.Text = "3D"; @@ -4622,10 +4354,9 @@ 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(-11713, -6387); - this.radio2D.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.radio2D.Location = new System.Drawing.Point(-9834, -5809); this.radio2D.Name = "radio2D"; - this.radio2D.Size = new System.Drawing.Size(34, 26); + this.radio2D.Size = new System.Drawing.Size(31, 23); this.radio2D.TabIndex = 25; this.radio2D.Text = "2D"; this.radio2D.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -4638,10 +4369,9 @@ 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(1520, -6357); - this.wireframeCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.wireframeCheckBox.Location = new System.Drawing.Point(1140, -5785); this.wireframeCheckBox.Name = "wireframeCheckBox"; - this.wireframeCheckBox.Size = new System.Drawing.Size(33, 26); + this.wireframeCheckBox.Size = new System.Drawing.Size(31, 23); this.wireframeCheckBox.TabIndex = 27; this.wireframeCheckBox.Text = " W"; this.wireframeCheckBox.UseVisualStyleBackColor = true; @@ -4651,11 +4381,10 @@ // this.nsbtxEditorTabPage.Controls.Add(this.groupBox7); this.nsbtxEditorTabPage.ImageIndex = 6; - this.nsbtxEditorTabPage.Location = new System.Drawing.Point(4, 25); - this.nsbtxEditorTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.nsbtxEditorTabPage.Location = new System.Drawing.Point(4, 23); this.nsbtxEditorTabPage.Name = "nsbtxEditorTabPage"; - this.nsbtxEditorTabPage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.nsbtxEditorTabPage.Size = new System.Drawing.Size(1583, 835); + this.nsbtxEditorTabPage.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.nsbtxEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.nsbtxEditorTabPage.TabIndex = 6; this.nsbtxEditorTabPage.Text = "NSBTX Editor"; this.nsbtxEditorTabPage.UseVisualStyleBackColor = true; @@ -4677,11 +4406,9 @@ this.groupBox7.Controls.Add(this.buildingsTilesetRadioButton); this.groupBox7.Controls.Add(this.mapTilesetRadioButton); this.groupBox7.Controls.Add(this.texturePacksListBox); - this.groupBox7.Location = new System.Drawing.Point(8, 7); - this.groupBox7.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox7.Location = new System.Drawing.Point(6, 6); this.groupBox7.Name = "groupBox7"; - this.groupBox7.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox7.Size = new System.Drawing.Size(1561, 737); + this.groupBox7.Size = new System.Drawing.Size(1171, 599); this.groupBox7.TabIndex = 1; this.groupBox7.TabStop = false; this.groupBox7.Text = "Texture Packs"; @@ -4693,26 +4420,24 @@ this.tableLayoutPanel37.Controls.Add(this.groupBox35, 0, 2); this.tableLayoutPanel37.Controls.Add(this.repositionImageButton, 0, 0); this.tableLayoutPanel37.Controls.Add(this.invertDragCheckbox, 0, 1); - this.tableLayoutPanel37.Location = new System.Drawing.Point(1343, 64); - this.tableLayoutPanel37.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tableLayoutPanel37.Location = new System.Drawing.Point(1007, 52); this.tableLayoutPanel37.Name = "tableLayoutPanel37"; this.tableLayoutPanel37.RowCount = 3; this.tableLayoutPanel37.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel37.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel37.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel37.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); - this.tableLayoutPanel37.Size = new System.Drawing.Size(113, 315); + this.tableLayoutPanel37.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel37.Size = new System.Drawing.Size(85, 256); this.tableLayoutPanel37.TabIndex = 42; // // groupBox35 // this.groupBox35.Controls.Add(this.tableLayoutPanel38); this.groupBox35.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox35.Location = new System.Drawing.Point(4, 95); - this.groupBox35.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox35.Location = new System.Drawing.Point(3, 78); this.groupBox35.Name = "groupBox35"; - this.groupBox35.Padding = new System.Windows.Forms.Padding(5, 5, 5, 5); - this.groupBox35.Size = new System.Drawing.Size(105, 216); + this.groupBox35.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox35.Size = new System.Drawing.Size(79, 178); this.groupBox35.TabIndex = 23; this.groupBox35.TabStop = false; this.groupBox35.Text = "Scaling"; @@ -4726,23 +4451,21 @@ this.tableLayoutPanel38.Controls.Add(this.scalingLabel, 1, 0); this.tableLayoutPanel38.Controls.Add(this.scalingTrackBar, 0, 0); this.tableLayoutPanel38.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel38.Location = new System.Drawing.Point(5, 20); - this.tableLayoutPanel38.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tableLayoutPanel38.Location = new System.Drawing.Point(4, 17); this.tableLayoutPanel38.Name = "tableLayoutPanel38"; - this.tableLayoutPanel38.Padding = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.tableLayoutPanel38.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tableLayoutPanel38.RowCount = 1; this.tableLayoutPanel38.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel38.Size = new System.Drawing.Size(95, 191); + this.tableLayoutPanel38.Size = new System.Drawing.Size(71, 157); this.tableLayoutPanel38.TabIndex = 0; // // scalingLabel // this.scalingLabel.AutoSize = true; this.scalingLabel.Dock = System.Windows.Forms.DockStyle.Fill; - this.scalingLabel.Location = new System.Drawing.Point(53, 5); - this.scalingLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.scalingLabel.Location = new System.Drawing.Point(40, 4); this.scalingLabel.Name = "scalingLabel"; - this.scalingLabel.Size = new System.Drawing.Size(33, 181); + this.scalingLabel.Size = new System.Drawing.Size(24, 149); this.scalingLabel.TabIndex = 3; this.scalingLabel.Text = "x1"; this.scalingLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -4752,23 +4475,21 @@ this.scalingTrackBar.AutoSize = false; this.scalingTrackBar.Dock = System.Windows.Forms.DockStyle.Fill; this.scalingTrackBar.LargeChange = 1; - this.scalingTrackBar.Location = new System.Drawing.Point(9, 9); - this.scalingTrackBar.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.scalingTrackBar.Location = new System.Drawing.Point(7, 7); this.scalingTrackBar.Maximum = 5; this.scalingTrackBar.Minimum = -1; this.scalingTrackBar.Name = "scalingTrackBar"; this.scalingTrackBar.Orientation = System.Windows.Forms.Orientation.Vertical; - this.scalingTrackBar.Size = new System.Drawing.Size(36, 173); + this.scalingTrackBar.Size = new System.Drawing.Size(27, 143); this.scalingTrackBar.TabIndex = 2; this.scalingTrackBar.Scroll += new System.EventHandler(this.scalingTrackBar_Scroll); // // repositionImageButton // this.repositionImageButton.Dock = System.Windows.Forms.DockStyle.Fill; - this.repositionImageButton.Location = new System.Drawing.Point(4, 4); - this.repositionImageButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.repositionImageButton.Location = new System.Drawing.Point(3, 3); this.repositionImageButton.Name = "repositionImageButton"; - this.repositionImageButton.Size = new System.Drawing.Size(105, 49); + this.repositionImageButton.Size = new System.Drawing.Size(79, 40); this.repositionImageButton.TabIndex = 21; this.repositionImageButton.Text = "Reposition"; this.repositionImageButton.UseVisualStyleBackColor = true; @@ -4781,10 +4502,9 @@ this.invertDragCheckbox.Checked = true; this.invertDragCheckbox.CheckState = System.Windows.Forms.CheckState.Checked; this.invertDragCheckbox.Dock = System.Windows.Forms.DockStyle.Fill; - this.invertDragCheckbox.Location = new System.Drawing.Point(4, 61); - this.invertDragCheckbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.invertDragCheckbox.Location = new System.Drawing.Point(3, 49); this.invertDragCheckbox.Name = "invertDragCheckbox"; - this.invertDragCheckbox.Size = new System.Drawing.Size(105, 26); + this.invertDragCheckbox.Size = new System.Drawing.Size(79, 23); this.invertDragCheckbox.TabIndex = 22; this.invertDragCheckbox.Text = "Invert Drag"; this.invertDragCheckbox.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -4794,10 +4514,9 @@ // locateCurrentNsbtx // this.locateCurrentNsbtx.Image = global::DSPRE.Properties.Resources.open_file; - this.locateCurrentNsbtx.Location = new System.Drawing.Point(584, 25); - this.locateCurrentNsbtx.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.locateCurrentNsbtx.Location = new System.Drawing.Point(438, 20); this.locateCurrentNsbtx.Name = "locateCurrentNsbtx"; - this.locateCurrentNsbtx.Size = new System.Drawing.Size(56, 49); + this.locateCurrentNsbtx.Size = new System.Drawing.Size(42, 40); this.locateCurrentNsbtx.TabIndex = 41; this.locateCurrentNsbtx.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.locateCurrentNsbtx.UseVisualStyleBackColor = true; @@ -4807,10 +4526,9 @@ // this.removeNSBTXButton.Image = ((System.Drawing.Image)(resources.GetObject("removeNSBTXButton.Image"))); this.removeNSBTXButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeNSBTXButton.Location = new System.Drawing.Point(441, 22); - this.removeNSBTXButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.removeNSBTXButton.Location = new System.Drawing.Point(331, 18); this.removeNSBTXButton.Name = "removeNSBTXButton"; - this.removeNSBTXButton.Size = new System.Drawing.Size(125, 54); + this.removeNSBTXButton.Size = new System.Drawing.Size(94, 44); this.removeNSBTXButton.TabIndex = 11; this.removeNSBTXButton.Text = "Remove Last"; this.removeNSBTXButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4835,11 +4553,9 @@ this.areaDataGroupBox.Controls.Add(this.label32); this.areaDataGroupBox.Controls.Add(this.areaDataBuildingTilesetUpDown); this.areaDataGroupBox.Controls.Add(this.selectAreaDataListBox); - this.areaDataGroupBox.Location = new System.Drawing.Point(855, 410); - this.areaDataGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.areaDataGroupBox.Location = new System.Drawing.Point(641, 333); this.areaDataGroupBox.Name = "areaDataGroupBox"; - this.areaDataGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.areaDataGroupBox.Size = new System.Drawing.Size(681, 306); + this.areaDataGroupBox.Size = new System.Drawing.Size(511, 249); this.areaDataGroupBox.TabIndex = 0; this.areaDataGroupBox.TabStop = false; this.areaDataGroupBox.Text = "Area Data"; @@ -4847,10 +4563,9 @@ // locateCurrentAreaData // this.locateCurrentAreaData.Image = global::DSPRE.Properties.Resources.open_file; - this.locateCurrentAreaData.Location = new System.Drawing.Point(527, 91); - this.locateCurrentAreaData.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.locateCurrentAreaData.Location = new System.Drawing.Point(395, 74); this.locateCurrentAreaData.Name = "locateCurrentAreaData"; - this.locateCurrentAreaData.Size = new System.Drawing.Size(56, 49); + this.locateCurrentAreaData.Size = new System.Drawing.Size(42, 40); this.locateCurrentAreaData.TabIndex = 42; this.locateCurrentAreaData.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.locateCurrentAreaData.UseVisualStyleBackColor = true; @@ -4860,10 +4575,9 @@ // this.exportAreaDataButton.Image = ((System.Drawing.Image)(resources.GetObject("exportAreaDataButton.Image"))); this.exportAreaDataButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.exportAreaDataButton.Location = new System.Drawing.Point(236, 89); - this.exportAreaDataButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.exportAreaDataButton.Location = new System.Drawing.Point(177, 72); this.exportAreaDataButton.Name = "exportAreaDataButton"; - this.exportAreaDataButton.Size = new System.Drawing.Size(143, 55); + this.exportAreaDataButton.Size = new System.Drawing.Size(107, 45); this.exportAreaDataButton.TabIndex = 13; this.exportAreaDataButton.Text = "Export \r\nSelected"; this.exportAreaDataButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4875,11 +4589,9 @@ this.areaTypeGroupbox.Controls.Add(this.outdoorAreaRadioButton); this.areaTypeGroupbox.Controls.Add(this.indoorAreaRadioButton); this.areaTypeGroupbox.Enabled = false; - this.areaTypeGroupbox.Location = new System.Drawing.Point(251, 228); - this.areaTypeGroupbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.areaTypeGroupbox.Location = new System.Drawing.Point(188, 185); this.areaTypeGroupbox.Name = "areaTypeGroupbox"; - this.areaTypeGroupbox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.areaTypeGroupbox.Size = new System.Drawing.Size(205, 64); + this.areaTypeGroupbox.Size = new System.Drawing.Size(154, 52); this.areaTypeGroupbox.TabIndex = 15; this.areaTypeGroupbox.TabStop = false; this.areaTypeGroupbox.Text = "Area Type"; @@ -4888,10 +4600,9 @@ // this.outdoorAreaRadioButton.Appearance = System.Windows.Forms.Appearance.Button; this.outdoorAreaRadioButton.Checked = true; - this.outdoorAreaRadioButton.Location = new System.Drawing.Point(107, 23); - this.outdoorAreaRadioButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.outdoorAreaRadioButton.Location = new System.Drawing.Point(80, 19); this.outdoorAreaRadioButton.Name = "outdoorAreaRadioButton"; - this.outdoorAreaRadioButton.Size = new System.Drawing.Size(81, 31); + this.outdoorAreaRadioButton.Size = new System.Drawing.Size(61, 25); this.outdoorAreaRadioButton.TabIndex = 1; this.outdoorAreaRadioButton.TabStop = true; this.outdoorAreaRadioButton.Text = "Outdoor"; @@ -4901,10 +4612,9 @@ // indoorAreaRadioButton // this.indoorAreaRadioButton.Appearance = System.Windows.Forms.Appearance.Button; - this.indoorAreaRadioButton.Location = new System.Drawing.Point(17, 23); - this.indoorAreaRadioButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.indoorAreaRadioButton.Location = new System.Drawing.Point(13, 19); this.indoorAreaRadioButton.Name = "indoorAreaRadioButton"; - this.indoorAreaRadioButton.Size = new System.Drawing.Size(81, 31); + this.indoorAreaRadioButton.Size = new System.Drawing.Size(61, 25); this.indoorAreaRadioButton.TabIndex = 0; this.indoorAreaRadioButton.Text = "Indoor"; this.indoorAreaRadioButton.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -4915,10 +4625,9 @@ // this.importAreaDataButton.Image = ((System.Drawing.Image)(resources.GetObject("importAreaDataButton.Image"))); this.importAreaDataButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.importAreaDataButton.Location = new System.Drawing.Point(381, 89); - this.importAreaDataButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.importAreaDataButton.Location = new System.Drawing.Point(286, 72); this.importAreaDataButton.Name = "importAreaDataButton"; - this.importAreaDataButton.Size = new System.Drawing.Size(143, 55); + this.importAreaDataButton.Size = new System.Drawing.Size(107, 45); this.importAreaDataButton.TabIndex = 12; this.importAreaDataButton.Text = "Import and\r\nReplace"; this.importAreaDataButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4929,10 +4638,9 @@ // this.removeAreaDataButton.Image = ((System.Drawing.Image)(resources.GetObject("removeAreaDataButton.Image"))); this.removeAreaDataButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeAreaDataButton.Location = new System.Drawing.Point(527, 28); - this.removeAreaDataButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.removeAreaDataButton.Location = new System.Drawing.Point(395, 23); this.removeAreaDataButton.Name = "removeAreaDataButton"; - this.removeAreaDataButton.Size = new System.Drawing.Size(143, 55); + this.removeAreaDataButton.Size = new System.Drawing.Size(107, 45); this.removeAreaDataButton.TabIndex = 14; this.removeAreaDataButton.Text = "Remove Last"; this.removeAreaDataButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4943,10 +4651,9 @@ // this.addAreaDataButton.Image = ((System.Drawing.Image)(resources.GetObject("addAreaDataButton.Image"))); this.addAreaDataButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addAreaDataButton.Location = new System.Drawing.Point(381, 28); - this.addAreaDataButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.addAreaDataButton.Location = new System.Drawing.Point(286, 23); this.addAreaDataButton.Name = "addAreaDataButton"; - this.addAreaDataButton.Size = new System.Drawing.Size(143, 55); + this.addAreaDataButton.Size = new System.Drawing.Size(107, 45); this.addAreaDataButton.TabIndex = 13; this.addAreaDataButton.Text = "Add Area Data"; this.addAreaDataButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4957,10 +4664,9 @@ // this.saveAreaDataButton.Image = global::DSPRE.Properties.Resources.save_rom; this.saveAreaDataButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.saveAreaDataButton.Location = new System.Drawing.Point(236, 28); - this.saveAreaDataButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.saveAreaDataButton.Location = new System.Drawing.Point(177, 23); this.saveAreaDataButton.Name = "saveAreaDataButton"; - this.saveAreaDataButton.Size = new System.Drawing.Size(143, 55); + this.saveAreaDataButton.Size = new System.Drawing.Size(107, 45); this.saveAreaDataButton.TabIndex = 12; this.saveAreaDataButton.Text = "&Save \r\nArea Data"; this.saveAreaDataButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -4970,35 +4676,32 @@ // label35 // this.label35.AutoSize = true; - this.label35.Location = new System.Drawing.Point(529, 174); - this.label35.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label35.Location = new System.Drawing.Point(397, 141); this.label35.Name = "label35"; - this.label35.Size = new System.Drawing.Size(96, 16); + this.label35.Size = new System.Drawing.Size(76, 13); this.label35.TabIndex = 8; this.label35.Text = "Global NSBTA"; // // areaDataDynamicTexturesNumericUpDown // this.areaDataDynamicTexturesNumericUpDown.Enabled = false; - this.areaDataDynamicTexturesNumericUpDown.Location = new System.Drawing.Point(533, 193); - this.areaDataDynamicTexturesNumericUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.areaDataDynamicTexturesNumericUpDown.Location = new System.Drawing.Point(400, 157); this.areaDataDynamicTexturesNumericUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.areaDataDynamicTexturesNumericUpDown.Name = "areaDataDynamicTexturesNumericUpDown"; - this.areaDataDynamicTexturesNumericUpDown.Size = new System.Drawing.Size(109, 22); + this.areaDataDynamicTexturesNumericUpDown.Size = new System.Drawing.Size(82, 20); this.areaDataDynamicTexturesNumericUpDown.TabIndex = 7; this.areaDataDynamicTexturesNumericUpDown.ValueChanged += new System.EventHandler(this.areaDataDynamicTexturesUpDown_ValueChanged); // // label34 // this.label34.AutoSize = true; - this.label34.Location = new System.Drawing.Point(469, 235); - this.label34.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label34.Location = new System.Drawing.Point(352, 191); this.label34.Name = "label34"; - this.label34.Size = new System.Drawing.Size(64, 16); + this.label34.Size = new System.Drawing.Size(53, 13); this.label34.TabIndex = 6; this.label34.Text = "Light type"; // @@ -5006,69 +4709,62 @@ // this.areaDataLightTypeComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.areaDataLightTypeComboBox.FormattingEnabled = true; - this.areaDataLightTypeComboBox.Location = new System.Drawing.Point(473, 255); - this.areaDataLightTypeComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.areaDataLightTypeComboBox.Location = new System.Drawing.Point(355, 207); this.areaDataLightTypeComboBox.Name = "areaDataLightTypeComboBox"; - this.areaDataLightTypeComboBox.Size = new System.Drawing.Size(181, 24); + this.areaDataLightTypeComboBox.Size = new System.Drawing.Size(137, 21); this.areaDataLightTypeComboBox.TabIndex = 5; this.areaDataLightTypeComboBox.SelectedIndexChanged += new System.EventHandler(this.areaDataLightTypeComboBox_SelectedIndexChanged); // // label33 // this.label33.AutoSize = true; - this.label33.Location = new System.Drawing.Point(249, 174); - this.label33.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label33.Location = new System.Drawing.Point(187, 141); this.label33.Name = "label33"; - this.label33.Size = new System.Drawing.Size(89, 16); + this.label33.Size = new System.Drawing.Size(72, 13); this.label33.TabIndex = 4; this.label33.Text = "Map Textures"; // // areaDataMapTilesetUpDown // - this.areaDataMapTilesetUpDown.Location = new System.Drawing.Point(255, 193); - this.areaDataMapTilesetUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.areaDataMapTilesetUpDown.Location = new System.Drawing.Point(191, 157); this.areaDataMapTilesetUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.areaDataMapTilesetUpDown.Name = "areaDataMapTilesetUpDown"; - this.areaDataMapTilesetUpDown.Size = new System.Drawing.Size(109, 22); + this.areaDataMapTilesetUpDown.Size = new System.Drawing.Size(82, 20); this.areaDataMapTilesetUpDown.TabIndex = 3; this.areaDataMapTilesetUpDown.ValueChanged += new System.EventHandler(this.areaDataMapTilesetUpDown_ValueChanged); // // label32 // this.label32.AutoSize = true; - this.label32.Location = new System.Drawing.Point(391, 174); - this.label32.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label32.Location = new System.Drawing.Point(293, 141); this.label32.Name = "label32"; - this.label32.Size = new System.Drawing.Size(110, 16); + this.label32.Size = new System.Drawing.Size(88, 13); this.label32.TabIndex = 2; this.label32.Text = "Building Textures"; // // areaDataBuildingTilesetUpDown // - this.areaDataBuildingTilesetUpDown.Location = new System.Drawing.Point(395, 193); - this.areaDataBuildingTilesetUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.areaDataBuildingTilesetUpDown.Location = new System.Drawing.Point(296, 157); this.areaDataBuildingTilesetUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.areaDataBuildingTilesetUpDown.Name = "areaDataBuildingTilesetUpDown"; - this.areaDataBuildingTilesetUpDown.Size = new System.Drawing.Size(109, 22); + this.areaDataBuildingTilesetUpDown.Size = new System.Drawing.Size(82, 20); this.areaDataBuildingTilesetUpDown.TabIndex = 1; this.areaDataBuildingTilesetUpDown.ValueChanged += new System.EventHandler(this.areaDataBuildingTilesetUpDown_ValueChanged); // // selectAreaDataListBox // this.selectAreaDataListBox.FormattingEnabled = true; - this.selectAreaDataListBox.ItemHeight = 16; - this.selectAreaDataListBox.Location = new System.Drawing.Point(16, 30); - this.selectAreaDataListBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.selectAreaDataListBox.Location = new System.Drawing.Point(12, 24); this.selectAreaDataListBox.Name = "selectAreaDataListBox"; - this.selectAreaDataListBox.Size = new System.Drawing.Size(207, 260); + this.selectAreaDataListBox.Size = new System.Drawing.Size(156, 212); this.selectAreaDataListBox.TabIndex = 0; this.selectAreaDataListBox.SelectedIndexChanged += new System.EventHandler(this.selectAreaDataListBox_SelectedIndexChanged); // @@ -5076,10 +4772,9 @@ // this.addNSBTXButton.Image = ((System.Drawing.Image)(resources.GetObject("addNSBTXButton.Image"))); this.addNSBTXButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addNSBTXButton.Location = new System.Drawing.Point(320, 22); - this.addNSBTXButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.addNSBTXButton.Location = new System.Drawing.Point(240, 18); this.addNSBTXButton.Name = "addNSBTXButton"; - this.addNSBTXButton.Size = new System.Drawing.Size(117, 54); + this.addNSBTXButton.Size = new System.Drawing.Size(88, 44); this.addNSBTXButton.TabIndex = 10; this.addNSBTXButton.Text = "Add NSBTX"; this.addNSBTXButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -5090,10 +4785,9 @@ // this.exportNSBTXButton.Image = ((System.Drawing.Image)(resources.GetObject("exportNSBTXButton.Image"))); this.exportNSBTXButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.exportNSBTXButton.Location = new System.Drawing.Point(167, 22); - this.exportNSBTXButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.exportNSBTXButton.Location = new System.Drawing.Point(125, 18); this.exportNSBTXButton.Name = "exportNSBTXButton"; - this.exportNSBTXButton.Size = new System.Drawing.Size(123, 54); + this.exportNSBTXButton.Size = new System.Drawing.Size(92, 44); this.exportNSBTXButton.TabIndex = 9; this.exportNSBTXButton.Text = "&Export\r\nSelected"; this.exportNSBTXButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -5104,10 +4798,9 @@ // this.importNSBTXButton.Image = ((System.Drawing.Image)(resources.GetObject("importNSBTXButton.Image"))); this.importNSBTXButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.importNSBTXButton.Location = new System.Drawing.Point(28, 22); - this.importNSBTXButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.importNSBTXButton.Location = new System.Drawing.Point(21, 18); this.importNSBTXButton.Name = "importNSBTXButton"; - this.importNSBTXButton.Size = new System.Drawing.Size(133, 54); + this.importNSBTXButton.Size = new System.Drawing.Size(100, 44); this.importNSBTXButton.TabIndex = 8; this.importNSBTXButton.Text = "&Replace\r\nSelected..."; this.importNSBTXButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -5121,10 +4814,9 @@ this.texturePictureBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.texturePictureBox.Image = global::DSPRE.Properties.Resources.alphabgCheckerboard; this.texturePictureBox.invertDrag = true; - this.texturePictureBox.Location = new System.Drawing.Point(976, 64); - this.texturePictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.texturePictureBox.Location = new System.Drawing.Point(732, 52); this.texturePictureBox.Name = "texturePictureBox"; - this.texturePictureBox.Size = new System.Drawing.Size(341, 315); + this.texturePictureBox.Size = new System.Drawing.Size(256, 256); this.texturePictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.texturePictureBox.TabIndex = 7; this.texturePictureBox.TabStop = false; @@ -5132,52 +4824,45 @@ // palettesLabel // this.palettesLabel.AutoSize = true; - this.palettesLabel.Location = new System.Drawing.Point(580, 84); - this.palettesLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.palettesLabel.Location = new System.Drawing.Point(435, 68); this.palettesLabel.Name = "palettesLabel"; - this.palettesLabel.Size = new System.Drawing.Size(56, 16); + this.palettesLabel.Size = new System.Drawing.Size(45, 13); this.palettesLabel.TabIndex = 6; this.palettesLabel.Text = "Palettes"; // // texturesLabel // this.texturesLabel.AutoSize = true; - this.texturesLabel.Location = new System.Drawing.Point(316, 84); - this.texturesLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.texturesLabel.Location = new System.Drawing.Point(237, 68); this.texturesLabel.Name = "texturesLabel"; - this.texturesLabel.Size = new System.Drawing.Size(59, 16); + this.texturesLabel.Size = new System.Drawing.Size(48, 13); this.texturesLabel.TabIndex = 5; this.texturesLabel.Text = "Textures"; // // palettesListBox // this.palettesListBox.FormattingEnabled = true; - this.palettesListBox.ItemHeight = 16; - this.palettesListBox.Location = new System.Drawing.Point(584, 103); - this.palettesListBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.palettesListBox.Location = new System.Drawing.Point(438, 84); this.palettesListBox.Name = "palettesListBox"; - this.palettesListBox.Size = new System.Drawing.Size(245, 612); + this.palettesListBox.Size = new System.Drawing.Size(185, 498); this.palettesListBox.TabIndex = 4; this.palettesListBox.SelectedIndexChanged += new System.EventHandler(this.palettesListBox_SelectedIndexChanged); // // texturesListBox // this.texturesListBox.FormattingEnabled = true; - this.texturesListBox.ItemHeight = 16; - this.texturesListBox.Location = new System.Drawing.Point(320, 103); - this.texturesListBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.texturesListBox.Location = new System.Drawing.Point(240, 84); this.texturesListBox.Name = "texturesListBox"; - this.texturesListBox.Size = new System.Drawing.Size(245, 612); + this.texturesListBox.Size = new System.Drawing.Size(185, 498); this.texturesListBox.TabIndex = 3; this.texturesListBox.SelectedIndexChanged += new System.EventHandler(this.texturesListBox_SelectedIndexChanged); // // buildingsTilesetRadioButton // this.buildingsTilesetRadioButton.AutoSize = true; - this.buildingsTilesetRadioButton.Location = new System.Drawing.Point(153, 81); - this.buildingsTilesetRadioButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.buildingsTilesetRadioButton.Location = new System.Drawing.Point(115, 66); this.buildingsTilesetRadioButton.Name = "buildingsTilesetRadioButton"; - this.buildingsTilesetRadioButton.Size = new System.Drawing.Size(131, 20); + this.buildingsTilesetRadioButton.Size = new System.Drawing.Size(106, 17); this.buildingsTilesetRadioButton.TabIndex = 2; this.buildingsTilesetRadioButton.Text = "Buildings NSBTX"; this.buildingsTilesetRadioButton.UseVisualStyleBackColor = true; @@ -5187,10 +4872,9 @@ // this.mapTilesetRadioButton.AutoSize = true; this.mapTilesetRadioButton.Checked = true; - this.mapTilesetRadioButton.Location = new System.Drawing.Point(28, 81); - this.mapTilesetRadioButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.mapTilesetRadioButton.Location = new System.Drawing.Point(21, 66); this.mapTilesetRadioButton.Name = "mapTilesetRadioButton"; - this.mapTilesetRadioButton.Size = new System.Drawing.Size(110, 20); + this.mapTilesetRadioButton.Size = new System.Drawing.Size(90, 17); this.mapTilesetRadioButton.TabIndex = 1; this.mapTilesetRadioButton.TabStop = true; this.mapTilesetRadioButton.Text = "Maps NSBTX"; @@ -5200,11 +4884,9 @@ // texturePacksListBox // this.texturePacksListBox.FormattingEnabled = true; - this.texturePacksListBox.ItemHeight = 16; - this.texturePacksListBox.Location = new System.Drawing.Point(28, 103); - this.texturePacksListBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.texturePacksListBox.Location = new System.Drawing.Point(21, 84); this.texturePacksListBox.Name = "texturePacksListBox"; - this.texturePacksListBox.Size = new System.Drawing.Size(260, 612); + this.texturePacksListBox.Size = new System.Drawing.Size(196, 498); this.texturePacksListBox.TabIndex = 0; this.texturePacksListBox.SelectedIndexChanged += new System.EventHandler(this.texturePacksListBox_SelectedIndexChanged); // @@ -5240,11 +4922,10 @@ this.eventEditorTabPage.Controls.Add(this.importEventFileButton); this.eventEditorTabPage.Controls.Add(this.saveEventsButton); this.eventEditorTabPage.ImageIndex = 3; - this.eventEditorTabPage.Location = new System.Drawing.Point(4, 25); - this.eventEditorTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.eventEditorTabPage.Location = new System.Drawing.Point(4, 23); this.eventEditorTabPage.Name = "eventEditorTabPage"; - this.eventEditorTabPage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.eventEditorTabPage.Size = new System.Drawing.Size(1583, 835); + this.eventEditorTabPage.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.eventEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.eventEditorTabPage.TabIndex = 3; this.eventEditorTabPage.Text = "Event Editor"; this.eventEditorTabPage.Enter += new System.EventHandler(this.eventEditorTabPage_Enter); @@ -5252,10 +4933,9 @@ // locateCurrentEvFile // this.locateCurrentEvFile.Image = global::DSPRE.Properties.Resources.open_file; - this.locateCurrentEvFile.Location = new System.Drawing.Point(615, 17); - this.locateCurrentEvFile.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.locateCurrentEvFile.Location = new System.Drawing.Point(461, 14); this.locateCurrentEvFile.Name = "locateCurrentEvFile"; - this.locateCurrentEvFile.Size = new System.Drawing.Size(56, 49); + this.locateCurrentEvFile.Size = new System.Drawing.Size(42, 40); this.locateCurrentEvFile.TabIndex = 62; this.locateCurrentEvFile.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.locateCurrentEvFile.UseVisualStyleBackColor = true; @@ -5269,11 +4949,9 @@ this.groupBox21.Controls.Add(this.showSpawnablesCheckBox); this.groupBox21.Controls.Add(this.eventAreaDataUpDown); this.groupBox21.Controls.Add(this.eventMapTextureLabel); - this.groupBox21.Location = new System.Drawing.Point(617, 587); - this.groupBox21.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox21.Location = new System.Drawing.Point(463, 477); this.groupBox21.Name = "groupBox21"; - this.groupBox21.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox21.Size = new System.Drawing.Size(171, 166); + this.groupBox21.Size = new System.Drawing.Size(128, 135); this.groupBox21.TabIndex = 61; this.groupBox21.TabStop = false; this.groupBox21.Text = "Renderer Settings"; @@ -5283,10 +4961,9 @@ this.showTriggersCheckBox.AutoSize = true; this.showTriggersCheckBox.Checked = true; this.showTriggersCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; - this.showTriggersCheckBox.Location = new System.Drawing.Point(12, 106); - this.showTriggersCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.showTriggersCheckBox.Location = new System.Drawing.Point(9, 86); this.showTriggersCheckBox.Name = "showTriggersCheckBox"; - this.showTriggersCheckBox.Size = new System.Drawing.Size(116, 20); + this.showTriggersCheckBox.Size = new System.Drawing.Size(94, 17); this.showTriggersCheckBox.TabIndex = 44; this.showTriggersCheckBox.Text = "Show Triggers"; this.showTriggersCheckBox.UseVisualStyleBackColor = true; @@ -5297,10 +4974,9 @@ this.showWarpsCheckBox.AutoSize = true; this.showWarpsCheckBox.Checked = true; this.showWarpsCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; - this.showWarpsCheckBox.Location = new System.Drawing.Point(12, 79); - this.showWarpsCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.showWarpsCheckBox.Location = new System.Drawing.Point(9, 64); this.showWarpsCheckBox.Name = "showWarpsCheckBox"; - this.showWarpsCheckBox.Size = new System.Drawing.Size(105, 20); + this.showWarpsCheckBox.Size = new System.Drawing.Size(87, 17); this.showWarpsCheckBox.TabIndex = 43; this.showWarpsCheckBox.Text = "Show Warps"; this.showWarpsCheckBox.UseVisualStyleBackColor = true; @@ -5311,10 +4987,9 @@ this.showOwsCheckBox.AutoSize = true; this.showOwsCheckBox.Checked = true; this.showOwsCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; - this.showOwsCheckBox.Location = new System.Drawing.Point(12, 52); - this.showOwsCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.showOwsCheckBox.Location = new System.Drawing.Point(9, 42); this.showOwsCheckBox.Name = "showOwsCheckBox"; - this.showOwsCheckBox.Size = new System.Drawing.Size(133, 20); + this.showOwsCheckBox.Size = new System.Drawing.Size(109, 17); this.showOwsCheckBox.TabIndex = 42; this.showOwsCheckBox.Text = "Show Overworlds"; this.showOwsCheckBox.UseVisualStyleBackColor = true; @@ -5325,10 +5000,9 @@ this.showSpawnablesCheckBox.AutoSize = true; this.showSpawnablesCheckBox.Checked = true; this.showSpawnablesCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; - this.showSpawnablesCheckBox.Location = new System.Drawing.Point(12, 25); - this.showSpawnablesCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.showSpawnablesCheckBox.Location = new System.Drawing.Point(9, 20); this.showSpawnablesCheckBox.Name = "showSpawnablesCheckBox"; - this.showSpawnablesCheckBox.Size = new System.Drawing.Size(140, 20); + this.showSpawnablesCheckBox.Size = new System.Drawing.Size(114, 17); this.showSpawnablesCheckBox.TabIndex = 41; this.showSpawnablesCheckBox.Text = "Show Spawnables"; this.showSpawnablesCheckBox.UseVisualStyleBackColor = true; @@ -5336,15 +5010,14 @@ // // eventAreaDataUpDown // - this.eventAreaDataUpDown.Location = new System.Drawing.Point(12, 133); - this.eventAreaDataUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.eventAreaDataUpDown.Location = new System.Drawing.Point(9, 108); this.eventAreaDataUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.eventAreaDataUpDown.Name = "eventAreaDataUpDown"; - this.eventAreaDataUpDown.Size = new System.Drawing.Size(53, 22); + this.eventAreaDataUpDown.Size = new System.Drawing.Size(40, 20); this.eventAreaDataUpDown.TabIndex = 30; this.eventAreaDataUpDown.ValueChanged += new System.EventHandler(this.eventAreaDataUpDown_ValueChanged); // @@ -5352,58 +5025,52 @@ // this.eventMapTextureLabel.AutoSize = true; this.eventMapTextureLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.eventMapTextureLabel.Location = new System.Drawing.Point(68, 135); - this.eventMapTextureLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.eventMapTextureLabel.Location = new System.Drawing.Point(51, 110); this.eventMapTextureLabel.Name = "eventMapTextureLabel"; - this.eventMapTextureLabel.Size = new System.Drawing.Size(82, 18); + this.eventMapTextureLabel.Size = new System.Drawing.Size(70, 15); this.eventMapTextureLabel.TabIndex = 31; this.eventMapTextureLabel.Text = "Area Data"; // // RightClickLabel // this.RightClickLabel.AutoSize = true; - this.RightClickLabel.Location = new System.Drawing.Point(625, 564); - this.RightClickLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.RightClickLabel.Location = new System.Drawing.Point(469, 458); this.RightClickLabel.Name = "RightClickLabel"; - this.RightClickLabel.Size = new System.Drawing.Size(45, 16); + this.RightClickLabel.Size = new System.Drawing.Size(37, 13); this.RightClickLabel.TabIndex = 60; this.RightClickLabel.Text = "Select"; // // WheelClickLabel // this.WheelClickLabel.AutoSize = true; - this.WheelClickLabel.Location = new System.Drawing.Point(740, 564); - this.WheelClickLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.WheelClickLabel.Location = new System.Drawing.Point(555, 458); this.WheelClickLabel.Name = "WheelClickLabel"; - this.WheelClickLabel.Size = new System.Drawing.Size(40, 16); + this.WheelClickLabel.Size = new System.Drawing.Size(33, 13); this.WheelClickLabel.TabIndex = 58; this.WheelClickLabel.Text = "Warp"; // // LeftClickLabel // this.LeftClickLabel.AutoSize = true; - this.LeftClickLabel.Location = new System.Drawing.Point(684, 564); - this.LeftClickLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.LeftClickLabel.Location = new System.Drawing.Point(513, 458); this.LeftClickLabel.Name = "LeftClickLabel"; - this.LeftClickLabel.Size = new System.Drawing.Size(41, 16); + this.LeftClickLabel.Size = new System.Drawing.Size(34, 13); this.LeftClickLabel.TabIndex = 57; this.LeftClickLabel.Text = "Move"; // // eventMatrixYUpDown // - this.eventMatrixYUpDown.Location = new System.Drawing.Point(621, 213); - this.eventMatrixYUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.eventMatrixYUpDown.Location = new System.Drawing.Point(466, 173); this.eventMatrixYUpDown.Name = "eventMatrixYUpDown"; - this.eventMatrixYUpDown.Size = new System.Drawing.Size(53, 22); + this.eventMatrixYUpDown.Size = new System.Drawing.Size(40, 20); this.eventMatrixYUpDown.TabIndex = 52; this.eventMatrixYUpDown.ValueChanged += new System.EventHandler(this.eventMatrixCoordsUpDown_ValueChanged); // // eventMatrixXUpDown // - this.eventMatrixXUpDown.Location = new System.Drawing.Point(621, 181); - this.eventMatrixXUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.eventMatrixXUpDown.Location = new System.Drawing.Point(466, 147); this.eventMatrixXUpDown.Name = "eventMatrixXUpDown"; - this.eventMatrixXUpDown.Size = new System.Drawing.Size(53, 22); + this.eventMatrixXUpDown.Size = new System.Drawing.Size(40, 20); this.eventMatrixXUpDown.TabIndex = 51; this.eventMatrixXUpDown.ValueChanged += new System.EventHandler(this.eventMatrixCoordsUpDown_ValueChanged); // @@ -5412,10 +5079,9 @@ this.eventMatrixYLabel.AutoSize = true; this.eventMatrixYLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.eventMatrixYLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); - this.eventMatrixYLabel.Location = new System.Drawing.Point(683, 214); - this.eventMatrixYLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.eventMatrixYLabel.Location = new System.Drawing.Point(512, 174); this.eventMatrixYLabel.Name = "eventMatrixYLabel"; - this.eventMatrixYLabel.Size = new System.Drawing.Size(77, 17); + this.eventMatrixYLabel.Size = new System.Drawing.Size(60, 13); this.eventMatrixYLabel.TabIndex = 50; this.eventMatrixYLabel.Text = "Current Y"; // @@ -5424,20 +5090,18 @@ this.eventMatrixXLabel.AutoSize = true; this.eventMatrixXLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.eventMatrixXLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.eventMatrixXLabel.Location = new System.Drawing.Point(683, 183); - this.eventMatrixXLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.eventMatrixXLabel.Location = new System.Drawing.Point(512, 149); this.eventMatrixXLabel.Name = "eventMatrixXLabel"; - this.eventMatrixXLabel.Size = new System.Drawing.Size(77, 17); + this.eventMatrixXLabel.Size = new System.Drawing.Size(60, 13); this.eventMatrixXLabel.TabIndex = 49; this.eventMatrixXLabel.Text = "Current X"; // // matrixNavigatorLabel // this.matrixNavigatorLabel.AutoSize = true; - this.matrixNavigatorLabel.Location = new System.Drawing.Point(11, 84); - this.matrixNavigatorLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.matrixNavigatorLabel.Location = new System.Drawing.Point(8, 68); this.matrixNavigatorLabel.Name = "matrixNavigatorLabel"; - this.matrixNavigatorLabel.Size = new System.Drawing.Size(104, 16); + this.matrixNavigatorLabel.Size = new System.Drawing.Size(84, 13); this.matrixNavigatorLabel.TabIndex = 48; this.matrixNavigatorLabel.Text = "Matrix Navigator"; // @@ -5447,16 +5111,14 @@ this.eventMatrixPanel.BackColor = System.Drawing.SystemColors.Menu; this.eventMatrixPanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.eventMatrixPanel.Controls.Add(this.eventMatrixPictureBox); - this.eventMatrixPanel.Location = new System.Drawing.Point(12, 101); - this.eventMatrixPanel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.eventMatrixPanel.Location = new System.Drawing.Point(9, 82); this.eventMatrixPanel.Name = "eventMatrixPanel"; - this.eventMatrixPanel.Size = new System.Drawing.Size(596, 182); + this.eventMatrixPanel.Size = new System.Drawing.Size(448, 149); this.eventMatrixPanel.TabIndex = 47; // // eventMatrixPictureBox // this.eventMatrixPictureBox.Location = new System.Drawing.Point(0, -1); - this.eventMatrixPictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.eventMatrixPictureBox.Name = "eventMatrixPictureBox"; this.eventMatrixPictureBox.Size = new System.Drawing.Size(440, 150); this.eventMatrixPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; @@ -5468,10 +5130,9 @@ // this.selectEventComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.selectEventComboBox.FormattingEnabled = true; - this.selectEventComboBox.Location = new System.Drawing.Point(13, 14); - this.selectEventComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.selectEventComboBox.Location = new System.Drawing.Point(10, 11); this.selectEventComboBox.Name = "selectEventComboBox"; - this.selectEventComboBox.Size = new System.Drawing.Size(217, 24); + this.selectEventComboBox.Size = new System.Drawing.Size(164, 21); this.selectEventComboBox.TabIndex = 41; this.selectEventComboBox.SelectedIndexChanged += new System.EventHandler(this.selectEventComboBox_SelectedIndexChanged); // @@ -5479,24 +5140,22 @@ // this.backgroundMapLabel.AutoSize = true; this.backgroundMapLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.backgroundMapLabel.Location = new System.Drawing.Point(680, 127); - this.backgroundMapLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.backgroundMapLabel.Location = new System.Drawing.Point(510, 103); this.backgroundMapLabel.Name = "backgroundMapLabel"; - this.backgroundMapLabel.Size = new System.Drawing.Size(91, 18); + this.backgroundMapLabel.Size = new System.Drawing.Size(79, 15); this.backgroundMapLabel.TabIndex = 29; this.backgroundMapLabel.Text = "Map Matrix"; // // eventMatrixUpDown // - this.eventMatrixUpDown.Location = new System.Drawing.Point(621, 124); - this.eventMatrixUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.eventMatrixUpDown.Location = new System.Drawing.Point(466, 101); this.eventMatrixUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.eventMatrixUpDown.Name = "eventMatrixUpDown"; - this.eventMatrixUpDown.Size = new System.Drawing.Size(53, 22); + this.eventMatrixUpDown.Size = new System.Drawing.Size(40, 20); this.eventMatrixUpDown.TabIndex = 28; this.eventMatrixUpDown.ValueChanged += new System.EventHandler(this.eventMatrixUpDown_ValueChanged); // @@ -5506,11 +5165,10 @@ this.eventsTabControl.Controls.Add(this.overworldsTabPage); this.eventsTabControl.Controls.Add(this.warpsTabPage); this.eventsTabControl.Controls.Add(this.triggersTabPage); - this.eventsTabControl.Location = new System.Drawing.Point(12, 290); - this.eventsTabControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.eventsTabControl.Location = new System.Drawing.Point(9, 236); this.eventsTabControl.Name = "eventsTabControl"; this.eventsTabControl.SelectedIndex = 0; - this.eventsTabControl.Size = new System.Drawing.Size(603, 465); + this.eventsTabControl.Size = new System.Drawing.Size(452, 378); this.eventsTabControl.TabIndex = 25; this.eventsTabControl.SelectedIndexChanged += new System.EventHandler(this.eventsTabControl_SelectedIndexChanged); // @@ -5527,11 +5185,10 @@ this.signsTabPage.Controls.Add(this.signScriptNumberLabel); this.signsTabPage.Controls.Add(this.spawnableScriptUpDown); this.signsTabPage.Controls.Add(this.spawnablesListBox); - this.signsTabPage.Location = new System.Drawing.Point(4, 25); - this.signsTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.signsTabPage.Location = new System.Drawing.Point(4, 22); this.signsTabPage.Name = "signsTabPage"; - this.signsTabPage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.signsTabPage.Size = new System.Drawing.Size(595, 436); + this.signsTabPage.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.signsTabPage.Size = new System.Drawing.Size(444, 352); this.signsTabPage.TabIndex = 0; this.signsTabPage.Text = "Spawnables"; this.signsTabPage.UseVisualStyleBackColor = true; @@ -5540,20 +5197,18 @@ // this.spawnableTypeComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.spawnableTypeComboBox.FormattingEnabled = true; - this.spawnableTypeComboBox.Location = new System.Drawing.Point(305, 87); - this.spawnableTypeComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.spawnableTypeComboBox.Location = new System.Drawing.Point(229, 71); this.spawnableTypeComboBox.Name = "spawnableTypeComboBox"; - this.spawnableTypeComboBox.Size = new System.Drawing.Size(272, 24); + this.spawnableTypeComboBox.Size = new System.Drawing.Size(205, 21); this.spawnableTypeComboBox.TabIndex = 25; this.spawnableTypeComboBox.SelectedIndexChanged += new System.EventHandler(this.spawnableTypeComboBox_SelectedIndexChanged); // // label18 // this.label18.AutoSize = true; - this.label18.Location = new System.Drawing.Point(301, 68); - this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label18.Location = new System.Drawing.Point(226, 55); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(110, 16); + this.label18.Size = new System.Drawing.Size(87, 13); this.label18.TabIndex = 24; this.label18.Text = "Spawnable Type"; // @@ -5561,10 +5216,9 @@ // this.duplicateSpawnableButton.Image = global::DSPRE.Properties.Resources.copyIcon_small; this.duplicateSpawnableButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.duplicateSpawnableButton.Location = new System.Drawing.Point(185, 391); - this.duplicateSpawnableButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.duplicateSpawnableButton.Location = new System.Drawing.Point(139, 318); this.duplicateSpawnableButton.Name = "duplicateSpawnableButton"; - this.duplicateSpawnableButton.Size = new System.Drawing.Size(105, 34); + this.duplicateSpawnableButton.Size = new System.Drawing.Size(79, 28); this.duplicateSpawnableButton.TabIndex = 23; this.duplicateSpawnableButton.Text = "Duplicate"; this.duplicateSpawnableButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -5584,11 +5238,9 @@ this.groupBox5.Controls.Add(this.signMapXLabel); this.groupBox5.Controls.Add(this.spawnableYMapUpDown); this.groupBox5.Controls.Add(this.signMapYLabel); - this.groupBox5.Location = new System.Drawing.Point(305, 185); - this.groupBox5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox5.Location = new System.Drawing.Point(229, 150); this.groupBox5.Name = "groupBox5"; - this.groupBox5.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox5.Size = new System.Drawing.Size(273, 234); + this.groupBox5.Size = new System.Drawing.Size(205, 190); this.groupBox5.TabIndex = 22; this.groupBox5.TabStop = false; this.groupBox5.Text = "Position"; @@ -5597,10 +5249,9 @@ // this.goToSignButton.Image = global::DSPRE.Properties.Resources.goToSpawnable; this.goToSignButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.goToSignButton.Location = new System.Drawing.Point(40, 169); - this.goToSignButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.goToSignButton.Location = new System.Drawing.Point(30, 137); this.goToSignButton.Name = "goToSignButton"; - this.goToSignButton.Size = new System.Drawing.Size(188, 48); + this.goToSignButton.Size = new System.Drawing.Size(141, 39); this.goToSignButton.TabIndex = 20; this.goToSignButton.Text = "Find this Spawnable"; this.goToSignButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -5610,65 +5261,59 @@ // signMatrixYLabel // this.signMatrixYLabel.AutoSize = true; - this.signMatrixYLabel.Location = new System.Drawing.Point(33, 132); - this.signMatrixYLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.signMatrixYLabel.Location = new System.Drawing.Point(25, 107); this.signMatrixYLabel.Name = "signMatrixYLabel"; - this.signMatrixYLabel.Size = new System.Drawing.Size(54, 16); + this.signMatrixYLabel.Size = new System.Drawing.Size(45, 13); this.signMatrixYLabel.TabIndex = 19; this.signMatrixYLabel.Text = "Matrix Y"; // // spawnableXMatrixUpDown // - this.spawnableXMatrixUpDown.Location = new System.Drawing.Point(99, 91); - this.spawnableXMatrixUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.spawnableXMatrixUpDown.Location = new System.Drawing.Point(74, 74); this.spawnableXMatrixUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.spawnableXMatrixUpDown.Name = "spawnableXMatrixUpDown"; - this.spawnableXMatrixUpDown.Size = new System.Drawing.Size(135, 22); + this.spawnableXMatrixUpDown.Size = new System.Drawing.Size(101, 20); this.spawnableXMatrixUpDown.TabIndex = 16; this.spawnableXMatrixUpDown.ValueChanged += new System.EventHandler(this.spawnableMatrixXUpDown_ValueChanged); // // signMatrixXLabel // this.signMatrixXLabel.AutoSize = true; - this.signMatrixXLabel.Location = new System.Drawing.Point(33, 94); - this.signMatrixXLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.signMatrixXLabel.Location = new System.Drawing.Point(25, 76); this.signMatrixXLabel.Name = "signMatrixXLabel"; - this.signMatrixXLabel.Size = new System.Drawing.Size(53, 16); + this.signMatrixXLabel.Size = new System.Drawing.Size(45, 13); this.signMatrixXLabel.TabIndex = 17; this.signMatrixXLabel.Text = "Matrix X"; // // spawnableYMatrixUpDown // - this.spawnableYMatrixUpDown.Location = new System.Drawing.Point(99, 128); - this.spawnableYMatrixUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.spawnableYMatrixUpDown.Location = new System.Drawing.Point(74, 104); this.spawnableYMatrixUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.spawnableYMatrixUpDown.Name = "spawnableYMatrixUpDown"; - this.spawnableYMatrixUpDown.Size = new System.Drawing.Size(135, 22); + this.spawnableYMatrixUpDown.Size = new System.Drawing.Size(101, 20); this.spawnableYMatrixUpDown.TabIndex = 18; this.spawnableYMatrixUpDown.ValueChanged += new System.EventHandler(this.spawnableMatrixYUpDown_ValueChanged); // // signZLabel // this.signZLabel.AutoSize = true; - this.signZLabel.Location = new System.Drawing.Point(183, 27); - this.signZLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.signZLabel.Location = new System.Drawing.Point(137, 22); this.signZLabel.Name = "signZLabel"; - this.signZLabel.Size = new System.Drawing.Size(45, 16); + this.signZLabel.Size = new System.Drawing.Size(38, 13); this.signZLabel.TabIndex = 15; this.signZLabel.Text = "Map Z"; // // spawnablexMapUpDown // - this.spawnablexMapUpDown.Location = new System.Drawing.Point(37, 47); - this.spawnablexMapUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.spawnablexMapUpDown.Location = new System.Drawing.Point(28, 38); this.spawnablexMapUpDown.Maximum = new decimal(new int[] { 32768, 0, @@ -5680,14 +5325,13 @@ 0, -2147483648}); this.spawnablexMapUpDown.Name = "spawnablexMapUpDown"; - this.spawnablexMapUpDown.Size = new System.Drawing.Size(48, 22); + this.spawnablexMapUpDown.Size = new System.Drawing.Size(36, 20); this.spawnablexMapUpDown.TabIndex = 10; this.spawnablexMapUpDown.ValueChanged += new System.EventHandler(this.spawnableMapXUpDown_ValueChanged); // // spawnableUpDown // - this.spawnableUpDown.Location = new System.Drawing.Point(184, 47); - this.spawnableUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.spawnableUpDown.Location = new System.Drawing.Point(138, 38); this.spawnableUpDown.Maximum = new decimal(new int[] { 32768, 0, @@ -5699,41 +5343,38 @@ 0, -2147483648}); this.spawnableUpDown.Name = "spawnableUpDown"; - this.spawnableUpDown.Size = new System.Drawing.Size(48, 22); + this.spawnableUpDown.Size = new System.Drawing.Size(36, 20); this.spawnableUpDown.TabIndex = 14; this.spawnableUpDown.ValueChanged += new System.EventHandler(this.spawnableZUpDown_ValueChanged); // // signMapXLabel // this.signMapXLabel.AutoSize = true; - this.signMapXLabel.Location = new System.Drawing.Point(36, 27); - this.signMapXLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.signMapXLabel.Location = new System.Drawing.Point(27, 22); this.signMapXLabel.Name = "signMapXLabel"; - this.signMapXLabel.Size = new System.Drawing.Size(45, 16); + this.signMapXLabel.Size = new System.Drawing.Size(38, 13); this.signMapXLabel.TabIndex = 11; this.signMapXLabel.Text = "Map X"; // // spawnableYMapUpDown // - this.spawnableYMapUpDown.Location = new System.Drawing.Point(111, 47); - this.spawnableYMapUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.spawnableYMapUpDown.Location = new System.Drawing.Point(83, 38); this.spawnableYMapUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.spawnableYMapUpDown.Name = "spawnableYMapUpDown"; - this.spawnableYMapUpDown.Size = new System.Drawing.Size(48, 22); + this.spawnableYMapUpDown.Size = new System.Drawing.Size(36, 20); this.spawnableYMapUpDown.TabIndex = 12; this.spawnableYMapUpDown.ValueChanged += new System.EventHandler(this.spawnableMapYUpDown_ValueChanged); // // signMapYLabel // this.signMapYLabel.AutoSize = true; - this.signMapYLabel.Location = new System.Drawing.Point(109, 27); - this.signMapYLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.signMapYLabel.Location = new System.Drawing.Point(82, 22); this.signMapYLabel.Name = "signMapYLabel"; - this.signMapYLabel.Size = new System.Drawing.Size(46, 16); + this.signMapYLabel.Size = new System.Drawing.Size(38, 13); this.signMapYLabel.TabIndex = 13; this.signMapYLabel.Text = "Map Y"; // @@ -5741,10 +5382,9 @@ // this.removeSpawnableButton.Image = ((System.Drawing.Image)(resources.GetObject("removeSpawnableButton.Image"))); this.removeSpawnableButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeSpawnableButton.Location = new System.Drawing.Point(91, 390); - this.removeSpawnableButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.removeSpawnableButton.Location = new System.Drawing.Point(68, 317); this.removeSpawnableButton.Name = "removeSpawnableButton"; - this.removeSpawnableButton.Size = new System.Drawing.Size(89, 34); + this.removeSpawnableButton.Size = new System.Drawing.Size(67, 28); this.removeSpawnableButton.TabIndex = 8; this.removeSpawnableButton.Text = "Delete"; this.removeSpawnableButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -5755,10 +5395,9 @@ // this.addSpawnableButton.Image = ((System.Drawing.Image)(resources.GetObject("addSpawnableButton.Image"))); this.addSpawnableButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addSpawnableButton.Location = new System.Drawing.Point(13, 390); - this.addSpawnableButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.addSpawnableButton.Location = new System.Drawing.Point(10, 317); this.addSpawnableButton.Name = "addSpawnableButton"; - this.addSpawnableButton.Size = new System.Drawing.Size(72, 34); + this.addSpawnableButton.Size = new System.Drawing.Size(54, 28); this.addSpawnableButton.TabIndex = 7; this.addSpawnableButton.Text = "Add"; this.addSpawnableButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -5769,55 +5408,49 @@ // this.spawnableDirComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.spawnableDirComboBox.FormattingEnabled = true; - this.spawnableDirComboBox.Location = new System.Drawing.Point(305, 149); - this.spawnableDirComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.spawnableDirComboBox.Location = new System.Drawing.Point(229, 121); this.spawnableDirComboBox.Name = "spawnableDirComboBox"; - this.spawnableDirComboBox.Size = new System.Drawing.Size(272, 24); + this.spawnableDirComboBox.Size = new System.Drawing.Size(205, 21); this.spawnableDirComboBox.TabIndex = 6; this.spawnableDirComboBox.SelectedIndexChanged += new System.EventHandler(this.spawnableDirComboBox_SelectedIndexChanged); // // signOrientationLabel // this.signOrientationLabel.AutoSize = true; - this.signOrientationLabel.Location = new System.Drawing.Point(301, 129); - this.signOrientationLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.signOrientationLabel.Location = new System.Drawing.Point(226, 105); this.signOrientationLabel.Name = "signOrientationLabel"; - this.signOrientationLabel.Size = new System.Drawing.Size(110, 16); + this.signOrientationLabel.Size = new System.Drawing.Size(89, 13); this.signOrientationLabel.TabIndex = 5; this.signOrientationLabel.Text = "Activation Criteria"; // // signScriptNumberLabel // this.signScriptNumberLabel.AutoSize = true; - this.signScriptNumberLabel.Location = new System.Drawing.Point(299, 31); - this.signScriptNumberLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.signScriptNumberLabel.Location = new System.Drawing.Point(224, 25); this.signScriptNumberLabel.Name = "signScriptNumberLabel"; - this.signScriptNumberLabel.Size = new System.Drawing.Size(105, 16); + this.signScriptNumberLabel.Size = new System.Drawing.Size(87, 13); this.signScriptNumberLabel.TabIndex = 4; this.signScriptNumberLabel.Text = "Script to activate"; // // spawnableScriptUpDown // - this.spawnableScriptUpDown.Location = new System.Drawing.Point(433, 27); - this.spawnableScriptUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.spawnableScriptUpDown.Location = new System.Drawing.Point(325, 22); this.spawnableScriptUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.spawnableScriptUpDown.Name = "spawnableScriptUpDown"; - this.spawnableScriptUpDown.Size = new System.Drawing.Size(144, 22); + this.spawnableScriptUpDown.Size = new System.Drawing.Size(108, 20); this.spawnableScriptUpDown.TabIndex = 3; this.spawnableScriptUpDown.ValueChanged += new System.EventHandler(this.spawnableScriptUpDown_ValueChanged); // // spawnablesListBox // this.spawnablesListBox.FormattingEnabled = true; - this.spawnablesListBox.ItemHeight = 16; - this.spawnablesListBox.Location = new System.Drawing.Point(13, 14); - this.spawnablesListBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.spawnablesListBox.Location = new System.Drawing.Point(10, 11); this.spawnablesListBox.Name = "spawnablesListBox"; - this.spawnablesListBox.Size = new System.Drawing.Size(276, 372); + this.spawnablesListBox.Size = new System.Drawing.Size(208, 303); this.spawnablesListBox.TabIndex = 0; this.spawnablesListBox.SelectedIndexChanged += new System.EventHandler(this.spawnablesListBox_SelectedIndexChanged); // @@ -5844,11 +5477,10 @@ this.overworldsTabPage.Controls.Add(this.removeOverworldButton); this.overworldsTabPage.Controls.Add(this.addOverworldButton); this.overworldsTabPage.Controls.Add(this.overworldsListBox); - this.overworldsTabPage.Location = new System.Drawing.Point(4, 25); - this.overworldsTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.overworldsTabPage.Location = new System.Drawing.Point(4, 22); this.overworldsTabPage.Name = "overworldsTabPage"; - this.overworldsTabPage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.overworldsTabPage.Size = new System.Drawing.Size(595, 436); + this.overworldsTabPage.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.overworldsTabPage.Size = new System.Drawing.Size(444, 352); this.overworldsTabPage.TabIndex = 1; this.overworldsTabPage.Text = "Overworlds"; this.overworldsTabPage.UseVisualStyleBackColor = true; @@ -5857,10 +5489,9 @@ // this.sortOWsByIDDescButton.Image = global::DSPRE.Properties.Resources.sortDescending; this.sortOWsByIDDescButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.sortOWsByIDDescButton.Location = new System.Drawing.Point(136, 11); - this.sortOWsByIDDescButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.sortOWsByIDDescButton.Location = new System.Drawing.Point(102, 9); this.sortOWsByIDDescButton.Name = "sortOWsByIDDescButton"; - this.sortOWsByIDDescButton.Size = new System.Drawing.Size(115, 34); + this.sortOWsByIDDescButton.Size = new System.Drawing.Size(86, 28); this.sortOWsByIDDescButton.TabIndex = 30; this.sortOWsByIDDescButton.Text = "Sort Desc"; this.sortOWsByIDDescButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -5871,10 +5502,9 @@ // this.sortOWsByIDAscButton.Image = global::DSPRE.Properties.Resources.sortAscending; this.sortOWsByIDAscButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.sortOWsByIDAscButton.Location = new System.Drawing.Point(11, 11); - this.sortOWsByIDAscButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.sortOWsByIDAscButton.Location = new System.Drawing.Point(8, 9); this.sortOWsByIDAscButton.Name = "sortOWsByIDAscButton"; - this.sortOWsByIDAscButton.Size = new System.Drawing.Size(115, 34); + this.sortOWsByIDAscButton.Size = new System.Drawing.Size(86, 28); this.sortOWsByIDAscButton.TabIndex = 29; this.sortOWsByIDAscButton.Text = "Sort Asc"; this.sortOWsByIDAscButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -5886,11 +5516,9 @@ this.groupBox22.Controls.Add(this.normalRadioButton); this.groupBox22.Controls.Add(this.isTrainerRadioButton); this.groupBox22.Controls.Add(this.isItemRadioButton); - this.groupBox22.Location = new System.Drawing.Point(263, 121); - this.groupBox22.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox22.Location = new System.Drawing.Point(197, 98); this.groupBox22.Name = "groupBox22"; - this.groupBox22.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox22.Size = new System.Drawing.Size(216, 55); + this.groupBox22.Size = new System.Drawing.Size(162, 45); this.groupBox22.TabIndex = 28; this.groupBox22.TabStop = false; this.groupBox22.Text = "Overworld Properties"; @@ -5899,10 +5527,9 @@ // this.normalRadioButton.AutoSize = true; this.normalRadioButton.Checked = true; - this.normalRadioButton.Location = new System.Drawing.Point(8, 23); - this.normalRadioButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.normalRadioButton.Location = new System.Drawing.Point(6, 19); this.normalRadioButton.Name = "normalRadioButton"; - this.normalRadioButton.Size = new System.Drawing.Size(61, 20); + this.normalRadioButton.Size = new System.Drawing.Size(51, 17); this.normalRadioButton.TabIndex = 15; this.normalRadioButton.TabStop = true; this.normalRadioButton.Text = "None"; @@ -5912,10 +5539,9 @@ // isTrainerRadioButton // this.isTrainerRadioButton.AutoSize = true; - this.isTrainerRadioButton.Location = new System.Drawing.Point(76, 23); - this.isTrainerRadioButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.isTrainerRadioButton.Location = new System.Drawing.Point(57, 19); this.isTrainerRadioButton.Name = "isTrainerRadioButton"; - this.isTrainerRadioButton.Size = new System.Drawing.Size(71, 20); + this.isTrainerRadioButton.Size = new System.Drawing.Size(58, 17); this.isTrainerRadioButton.TabIndex = 16; this.isTrainerRadioButton.Text = "Trainer"; this.isTrainerRadioButton.UseVisualStyleBackColor = true; @@ -5924,10 +5550,9 @@ // isItemRadioButton // this.isItemRadioButton.AutoSize = true; - this.isItemRadioButton.Location = new System.Drawing.Point(153, 23); - this.isItemRadioButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.isItemRadioButton.Location = new System.Drawing.Point(115, 19); this.isItemRadioButton.Name = "isItemRadioButton"; - this.isItemRadioButton.Size = new System.Drawing.Size(53, 20); + this.isItemRadioButton.Size = new System.Drawing.Size(45, 17); this.isItemRadioButton.TabIndex = 21; this.isItemRadioButton.Text = "Item"; this.isItemRadioButton.UseVisualStyleBackColor = true; @@ -5936,10 +5561,9 @@ // spriteIDlabel // this.spriteIDlabel.AutoSize = true; - this.spriteIDlabel.Location = new System.Drawing.Point(479, 150); - this.spriteIDlabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.spriteIDlabel.Location = new System.Drawing.Point(359, 122); this.spriteIDlabel.Name = "spriteIDlabel"; - this.spriteIDlabel.Size = new System.Drawing.Size(0, 16); + this.spriteIDlabel.Size = new System.Drawing.Size(0, 13); this.spriteIDlabel.TabIndex = 27; // // groupBox17 @@ -5949,11 +5573,9 @@ this.groupBox17.Controls.Add(this.label12); this.groupBox17.Controls.Add(this.owXMatrixUpDown); this.groupBox17.Controls.Add(this.label11); - this.groupBox17.Location = new System.Drawing.Point(12, 353); - this.groupBox17.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox17.Location = new System.Drawing.Point(9, 287); this.groupBox17.Name = "groupBox17"; - this.groupBox17.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox17.Size = new System.Drawing.Size(239, 73); + this.groupBox17.Size = new System.Drawing.Size(179, 59); this.groupBox17.TabIndex = 20; this.groupBox17.TabStop = false; this.groupBox17.Text = "Global Coordinates [Matrix]"; @@ -5962,10 +5584,9 @@ // this.button14.Image = global::DSPRE.Properties.Resources.goToOW; this.button14.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.button14.Location = new System.Drawing.Point(144, 18); - this.button14.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.button14.Location = new System.Drawing.Point(108, 15); this.button14.Name = "button14"; - this.button14.Size = new System.Drawing.Size(84, 48); + this.button14.Size = new System.Drawing.Size(63, 39); this.button14.TabIndex = 5; this.button14.Text = "Find"; this.button14.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -5974,49 +5595,45 @@ // // owYMatrixUpDown // - this.owYMatrixUpDown.Location = new System.Drawing.Point(89, 31); - this.owYMatrixUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.owYMatrixUpDown.Location = new System.Drawing.Point(67, 25); this.owYMatrixUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.owYMatrixUpDown.Name = "owYMatrixUpDown"; - this.owYMatrixUpDown.Size = new System.Drawing.Size(47, 22); + this.owYMatrixUpDown.Size = new System.Drawing.Size(35, 20); this.owYMatrixUpDown.TabIndex = 6; this.owYMatrixUpDown.ValueChanged += new System.EventHandler(this.owYMatrixUpDown_ValueChanged); // // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(4, 33); - this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label12.Location = new System.Drawing.Point(3, 27); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(15, 16); + this.label12.Size = new System.Drawing.Size(14, 13); this.label12.TabIndex = 5; this.label12.Text = "X"; // // owXMatrixUpDown // - this.owXMatrixUpDown.Location = new System.Drawing.Point(24, 30); - this.owXMatrixUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.owXMatrixUpDown.Location = new System.Drawing.Point(18, 24); this.owXMatrixUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.owXMatrixUpDown.Name = "owXMatrixUpDown"; - this.owXMatrixUpDown.Size = new System.Drawing.Size(44, 22); + this.owXMatrixUpDown.Size = new System.Drawing.Size(33, 20); this.owXMatrixUpDown.TabIndex = 4; this.owXMatrixUpDown.ValueChanged += new System.EventHandler(this.owXMatrixUpDown_ValueChanged); // // label11 // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(72, 34); - this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label11.Location = new System.Drawing.Point(54, 28); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(16, 16); + this.label11.Size = new System.Drawing.Size(14, 13); this.label11.TabIndex = 7; this.label11.Text = "Y"; // @@ -6026,11 +5643,9 @@ this.owMovementGroupBox.Controls.Add(this.label4); this.owMovementGroupBox.Controls.Add(this.owOrientationComboBox); this.owMovementGroupBox.Controls.Add(this.owMovementComboBox); - this.owMovementGroupBox.Location = new System.Drawing.Point(263, 315); - this.owMovementGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.owMovementGroupBox.Location = new System.Drawing.Point(197, 256); this.owMovementGroupBox.Name = "owMovementGroupBox"; - this.owMovementGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.owMovementGroupBox.Size = new System.Drawing.Size(309, 111); + this.owMovementGroupBox.Size = new System.Drawing.Size(232, 90); this.owMovementGroupBox.TabIndex = 18; this.owMovementGroupBox.TabStop = false; this.owMovementGroupBox.Text = "Movement"; @@ -6041,11 +5656,9 @@ this.groupBox23.Controls.Add(this.label20); this.groupBox23.Controls.Add(this.owXRangeUpDown); this.groupBox23.Controls.Add(this.owYRangeUpDown); - this.groupBox23.Location = new System.Drawing.Point(132, 50); - this.groupBox23.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox23.Location = new System.Drawing.Point(99, 41); this.groupBox23.Name = "groupBox23"; - this.groupBox23.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox23.Size = new System.Drawing.Size(164, 55); + this.groupBox23.Size = new System.Drawing.Size(123, 45); this.groupBox23.TabIndex = 7; this.groupBox23.TabStop = false; this.groupBox23.Text = "Movement Range"; @@ -6053,58 +5666,53 @@ // label39 // this.label39.AutoSize = true; - this.label39.Location = new System.Drawing.Point(84, 25); - this.label39.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label39.Location = new System.Drawing.Point(63, 20); this.label39.Name = "label39"; - this.label39.Size = new System.Drawing.Size(16, 16); + this.label39.Size = new System.Drawing.Size(14, 13); this.label39.TabIndex = 4; this.label39.Text = "Y"; // // label20 // this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(5, 25); - this.label20.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label20.Location = new System.Drawing.Point(4, 20); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(15, 16); + this.label20.Size = new System.Drawing.Size(14, 13); this.label20.TabIndex = 3; this.label20.Text = "X"; // // owXRangeUpDown // - this.owXRangeUpDown.Location = new System.Drawing.Point(24, 21); - this.owXRangeUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.owXRangeUpDown.Location = new System.Drawing.Point(18, 17); this.owXRangeUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.owXRangeUpDown.Name = "owXRangeUpDown"; - this.owXRangeUpDown.Size = new System.Drawing.Size(51, 22); + this.owXRangeUpDown.Size = new System.Drawing.Size(38, 20); this.owXRangeUpDown.TabIndex = 1; this.owXRangeUpDown.ValueChanged += new System.EventHandler(this.owXRangeUpDown_ValueChanged); // // owYRangeUpDown // - this.owYRangeUpDown.Location = new System.Drawing.Point(103, 21); - this.owYRangeUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.owYRangeUpDown.Location = new System.Drawing.Point(77, 17); this.owYRangeUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.owYRangeUpDown.Name = "owYRangeUpDown"; - this.owYRangeUpDown.Size = new System.Drawing.Size(51, 22); + this.owYRangeUpDown.Size = new System.Drawing.Size(38, 20); this.owYRangeUpDown.TabIndex = 2; this.owYRangeUpDown.ValueChanged += new System.EventHandler(this.owYRangeUpDown_ValueChanged); // // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(11, 57); - this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label4.Location = new System.Drawing.Point(8, 46); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(99, 16); + this.label4.Size = new System.Drawing.Size(80, 13); this.label4.TabIndex = 6; this.label4.Text = "First Orientation"; // @@ -6117,10 +5725,9 @@ "Down", "Left", "Right"}); - this.owOrientationComboBox.Location = new System.Drawing.Point(15, 75); - this.owOrientationComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.owOrientationComboBox.Location = new System.Drawing.Point(11, 61); this.owOrientationComboBox.Name = "owOrientationComboBox"; - this.owOrientationComboBox.Size = new System.Drawing.Size(108, 24); + this.owOrientationComboBox.Size = new System.Drawing.Size(82, 21); this.owOrientationComboBox.TabIndex = 5; this.owOrientationComboBox.SelectedIndexChanged += new System.EventHandler(this.owOrientationComboBox_SelectedIndexChanged); // @@ -6128,10 +5735,9 @@ // this.owMovementComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.owMovementComboBox.FormattingEnabled = true; - this.owMovementComboBox.Location = new System.Drawing.Point(15, 20); - this.owMovementComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.owMovementComboBox.Location = new System.Drawing.Point(11, 16); this.owMovementComboBox.Name = "owMovementComboBox"; - this.owMovementComboBox.Size = new System.Drawing.Size(280, 24); + this.owMovementComboBox.Size = new System.Drawing.Size(211, 21); this.owMovementComboBox.TabIndex = 0; this.owMovementComboBox.SelectedIndexChanged += new System.EventHandler(this.owMovementComboBox_SelectedIndexChanged); // @@ -6143,11 +5749,9 @@ this.positionGroupBox.Controls.Add(this.owXPositionLabel); this.positionGroupBox.Controls.Add(this.owYMapUpDown); this.positionGroupBox.Controls.Add(this.label10); - this.positionGroupBox.Location = new System.Drawing.Point(11, 284); - this.positionGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.positionGroupBox.Location = new System.Drawing.Point(8, 231); this.positionGroupBox.Name = "positionGroupBox"; - this.positionGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.positionGroupBox.Size = new System.Drawing.Size(240, 70); + this.positionGroupBox.Size = new System.Drawing.Size(180, 57); this.positionGroupBox.TabIndex = 19; this.positionGroupBox.TabStop = false; this.positionGroupBox.Text = "Local Coordinates [Map]"; @@ -6155,17 +5759,15 @@ // label13 // this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(163, 33); - this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label13.Location = new System.Drawing.Point(122, 27); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(15, 16); + this.label13.Size = new System.Drawing.Size(14, 13); this.label13.TabIndex = 9; this.label13.Text = "Z"; // // owXMapUpDown // - this.owXMapUpDown.Location = new System.Drawing.Point(24, 30); - this.owXMapUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.owXMapUpDown.Location = new System.Drawing.Point(18, 24); this.owXMapUpDown.Maximum = new decimal(new int[] { 32768, 0, @@ -6177,14 +5779,13 @@ 0, -2147483648}); this.owXMapUpDown.Name = "owXMapUpDown"; - this.owXMapUpDown.Size = new System.Drawing.Size(47, 22); + this.owXMapUpDown.Size = new System.Drawing.Size(35, 20); this.owXMapUpDown.TabIndex = 0; this.owXMapUpDown.ValueChanged += new System.EventHandler(this.owXMapUpDown_ValueChanged); // // owZPositionUpDown // - this.owZPositionUpDown.Location = new System.Drawing.Point(181, 30); - this.owZPositionUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.owZPositionUpDown.Location = new System.Drawing.Point(136, 24); this.owZPositionUpDown.Maximum = new decimal(new int[] { 32768, 0, @@ -6196,24 +5797,22 @@ 0, -2147483648}); this.owZPositionUpDown.Name = "owZPositionUpDown"; - this.owZPositionUpDown.Size = new System.Drawing.Size(47, 22); + this.owZPositionUpDown.Size = new System.Drawing.Size(35, 20); this.owZPositionUpDown.TabIndex = 8; this.owZPositionUpDown.ValueChanged += new System.EventHandler(this.owZPositionUpDown_ValueChanged); // // owXPositionLabel // this.owXPositionLabel.AutoSize = true; - this.owXPositionLabel.Location = new System.Drawing.Point(4, 33); - this.owXPositionLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.owXPositionLabel.Location = new System.Drawing.Point(3, 27); this.owXPositionLabel.Name = "owXPositionLabel"; - this.owXPositionLabel.Size = new System.Drawing.Size(15, 16); + this.owXPositionLabel.Size = new System.Drawing.Size(14, 13); this.owXPositionLabel.TabIndex = 1; this.owXPositionLabel.Text = "X"; // // owYMapUpDown // - this.owYMapUpDown.Location = new System.Drawing.Point(103, 30); - this.owYMapUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.owYMapUpDown.Location = new System.Drawing.Point(77, 24); this.owYMapUpDown.Maximum = new decimal(new int[] { 32768, 0, @@ -6225,17 +5824,16 @@ 0, -2147483648}); this.owYMapUpDown.Name = "owYMapUpDown"; - this.owYMapUpDown.Size = new System.Drawing.Size(47, 22); + this.owYMapUpDown.Size = new System.Drawing.Size(35, 20); this.owYMapUpDown.TabIndex = 2; this.owYMapUpDown.ValueChanged += new System.EventHandler(this.owYMapUpDown_ValueChanged); // // label10 // this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(84, 33); - this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label10.Location = new System.Drawing.Point(63, 27); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(16, 16); + this.label10.Size = new System.Drawing.Size(14, 13); this.label10.TabIndex = 3; this.label10.Text = "Y"; // @@ -6250,11 +5848,9 @@ this.owSpecialGroupBox.Controls.Add(this.owSightRangeUpDown); this.owSpecialGroupBox.Controls.Add(this.owTrainerLabel); this.owSpecialGroupBox.Enabled = false; - this.owSpecialGroupBox.Location = new System.Drawing.Point(263, 185); - this.owSpecialGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.owSpecialGroupBox.Location = new System.Drawing.Point(197, 150); this.owSpecialGroupBox.Name = "owSpecialGroupBox"; - this.owSpecialGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.owSpecialGroupBox.Size = new System.Drawing.Size(309, 126); + this.owSpecialGroupBox.Size = new System.Drawing.Size(232, 102); this.owSpecialGroupBox.TabIndex = 14; this.owSpecialGroupBox.TabStop = false; this.owSpecialGroupBox.Text = "Special Settings"; @@ -6262,10 +5858,9 @@ // itemsSelectorHelpBtn // this.itemsSelectorHelpBtn.Image = global::DSPRE.Properties.Resources.questionMark; - this.itemsSelectorHelpBtn.Location = new System.Drawing.Point(259, 82); - this.itemsSelectorHelpBtn.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.itemsSelectorHelpBtn.Location = new System.Drawing.Point(194, 67); this.itemsSelectorHelpBtn.Name = "itemsSelectorHelpBtn"; - this.itemsSelectorHelpBtn.Size = new System.Drawing.Size(37, 36); + this.itemsSelectorHelpBtn.Size = new System.Drawing.Size(28, 29); this.itemsSelectorHelpBtn.TabIndex = 45; this.itemsSelectorHelpBtn.UseVisualStyleBackColor = true; this.itemsSelectorHelpBtn.Click += new System.EventHandler(this.itemsSelectorHelpBtn_Click); @@ -6273,10 +5868,9 @@ // owPartnerTrainerCheckBox // this.owPartnerTrainerCheckBox.AutoSize = true; - this.owPartnerTrainerCheckBox.Location = new System.Drawing.Point(224, 60); - this.owPartnerTrainerCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.owPartnerTrainerCheckBox.Location = new System.Drawing.Point(168, 49); this.owPartnerTrainerCheckBox.Name = "owPartnerTrainerCheckBox"; - this.owPartnerTrainerCheckBox.Size = new System.Drawing.Size(72, 20); + this.owPartnerTrainerCheckBox.Size = new System.Drawing.Size(60, 17); this.owPartnerTrainerCheckBox.TabIndex = 7; this.owPartnerTrainerCheckBox.Text = "Partner"; this.owPartnerTrainerCheckBox.UseVisualStyleBackColor = true; @@ -6286,10 +5880,9 @@ // this.owItemComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.owItemComboBox.FormattingEnabled = true; - this.owItemComboBox.Location = new System.Drawing.Point(65, 89); - this.owItemComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.owItemComboBox.Location = new System.Drawing.Point(49, 72); this.owItemComboBox.Name = "owItemComboBox"; - this.owItemComboBox.Size = new System.Drawing.Size(188, 24); + this.owItemComboBox.Size = new System.Drawing.Size(142, 21); this.owItemComboBox.TabIndex = 6; this.owItemComboBox.SelectedIndexChanged += new System.EventHandler(this.owItemComboBox_SelectedIndexChanged); // @@ -6297,10 +5890,9 @@ // this.owItemLabel.AutoSize = true; this.owItemLabel.Enabled = false; - this.owItemLabel.Location = new System.Drawing.Point(9, 96); - this.owItemLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.owItemLabel.Location = new System.Drawing.Point(7, 78); this.owItemLabel.Name = "owItemLabel"; - this.owItemLabel.Size = new System.Drawing.Size(32, 16); + this.owItemLabel.Size = new System.Drawing.Size(27, 13); this.owItemLabel.TabIndex = 5; this.owItemLabel.Text = "Item"; // @@ -6309,10 +5901,9 @@ this.owTrainerComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.owTrainerComboBox.Enabled = false; this.owTrainerComboBox.FormattingEnabled = true; - this.owTrainerComboBox.Location = new System.Drawing.Point(65, 23); - this.owTrainerComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.owTrainerComboBox.Location = new System.Drawing.Point(49, 19); this.owTrainerComboBox.Name = "owTrainerComboBox"; - this.owTrainerComboBox.Size = new System.Drawing.Size(229, 24); + this.owTrainerComboBox.Size = new System.Drawing.Size(173, 21); this.owTrainerComboBox.TabIndex = 4; this.owTrainerComboBox.SelectedIndexChanged += new System.EventHandler(this.owTrainerComboBox_SelectedIndexChanged); // @@ -6320,25 +5911,23 @@ // this.owSightRangeLabel.AutoSize = true; this.owSightRangeLabel.Enabled = false; - this.owSightRangeLabel.Location = new System.Drawing.Point(8, 62); - this.owSightRangeLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.owSightRangeLabel.Location = new System.Drawing.Point(6, 50); this.owSightRangeLabel.Name = "owSightRangeLabel"; - this.owSightRangeLabel.Size = new System.Drawing.Size(122, 16); + this.owSightRangeLabel.Size = new System.Drawing.Size(97, 13); this.owSightRangeLabel.TabIndex = 3; this.owSightRangeLabel.Text = "Sight Range (Tiles)"; // // owSightRangeUpDown // this.owSightRangeUpDown.Enabled = false; - this.owSightRangeUpDown.Location = new System.Drawing.Point(144, 57); - this.owSightRangeUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.owSightRangeUpDown.Location = new System.Drawing.Point(108, 46); this.owSightRangeUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.owSightRangeUpDown.Name = "owSightRangeUpDown"; - this.owSightRangeUpDown.Size = new System.Drawing.Size(64, 22); + this.owSightRangeUpDown.Size = new System.Drawing.Size(48, 20); this.owSightRangeUpDown.TabIndex = 2; this.owSightRangeUpDown.ValueChanged += new System.EventHandler(this.owSightRangeUpDown_ValueChanged); // @@ -6346,68 +5935,62 @@ // this.owTrainerLabel.AutoSize = true; this.owTrainerLabel.Enabled = false; - this.owTrainerLabel.Location = new System.Drawing.Point(7, 27); - this.owTrainerLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.owTrainerLabel.Location = new System.Drawing.Point(5, 22); this.owTrainerLabel.Name = "owTrainerLabel"; - this.owTrainerLabel.Size = new System.Drawing.Size(50, 16); + this.owTrainerLabel.Size = new System.Drawing.Size(40, 13); this.owTrainerLabel.TabIndex = 1; this.owTrainerLabel.Text = "Trainer"; // // owScriptLabel // this.owScriptLabel.AutoSize = true; - this.owScriptLabel.Location = new System.Drawing.Point(487, 7); - this.owScriptLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.owScriptLabel.Location = new System.Drawing.Point(365, 6); this.owScriptLabel.Name = "owScriptLabel"; - this.owScriptLabel.Size = new System.Drawing.Size(41, 16); + this.owScriptLabel.Size = new System.Drawing.Size(34, 13); this.owScriptLabel.TabIndex = 13; this.owScriptLabel.Text = "Script"; // // owScriptNumericUpDown // - this.owScriptNumericUpDown.Location = new System.Drawing.Point(491, 27); - this.owScriptNumericUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.owScriptNumericUpDown.Location = new System.Drawing.Point(368, 22); this.owScriptNumericUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.owScriptNumericUpDown.Name = "owScriptNumericUpDown"; - this.owScriptNumericUpDown.Size = new System.Drawing.Size(72, 22); + this.owScriptNumericUpDown.Size = new System.Drawing.Size(54, 20); this.owScriptNumericUpDown.TabIndex = 12; this.owScriptNumericUpDown.ValueChanged += new System.EventHandler(this.owScriptNumericUpDown_ValueChanged); // // owFlagLabel // this.owFlagLabel.AutoSize = true; - this.owFlagLabel.Location = new System.Drawing.Point(377, 7); - this.owFlagLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.owFlagLabel.Location = new System.Drawing.Point(283, 6); this.owFlagLabel.Name = "owFlagLabel"; - this.owFlagLabel.Size = new System.Drawing.Size(34, 16); + this.owFlagLabel.Size = new System.Drawing.Size(27, 13); this.owFlagLabel.TabIndex = 11; this.owFlagLabel.Text = "Flag"; // // owFlagNumericUpDown // - this.owFlagNumericUpDown.Location = new System.Drawing.Point(381, 27); - this.owFlagNumericUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.owFlagNumericUpDown.Location = new System.Drawing.Point(286, 22); this.owFlagNumericUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.owFlagNumericUpDown.Name = "owFlagNumericUpDown"; - this.owFlagNumericUpDown.Size = new System.Drawing.Size(80, 22); + this.owFlagNumericUpDown.Size = new System.Drawing.Size(60, 20); this.owFlagNumericUpDown.TabIndex = 10; this.owFlagNumericUpDown.ValueChanged += new System.EventHandler(this.owFlagNumericUpDown_ValueChanged); // // owSpriteLabel // this.owSpriteLabel.AutoSize = true; - this.owSpriteLabel.Location = new System.Drawing.Point(263, 63); - this.owSpriteLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.owSpriteLabel.Location = new System.Drawing.Point(197, 51); this.owSpriteLabel.Name = "owSpriteLabel"; - this.owSpriteLabel.Size = new System.Drawing.Size(53, 16); + this.owSpriteLabel.Size = new System.Drawing.Size(45, 13); this.owSpriteLabel.TabIndex = 9; this.owSpriteLabel.Text = "Entry ID"; // @@ -6415,34 +5998,31 @@ // this.owSpriteComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.owSpriteComboBox.FormattingEnabled = true; - this.owSpriteComboBox.Location = new System.Drawing.Point(267, 82); - this.owSpriteComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.owSpriteComboBox.Location = new System.Drawing.Point(200, 67); this.owSpriteComboBox.Name = "owSpriteComboBox"; - this.owSpriteComboBox.Size = new System.Drawing.Size(211, 24); + this.owSpriteComboBox.Size = new System.Drawing.Size(159, 21); this.owSpriteComboBox.TabIndex = 8; this.owSpriteComboBox.SelectedIndexChanged += new System.EventHandler(this.owSpriteComboBox_SelectedIndexChanged); // // owIDLabel // this.owIDLabel.AutoSize = true; - this.owIDLabel.Location = new System.Drawing.Point(264, 7); - this.owIDLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.owIDLabel.Location = new System.Drawing.Point(198, 6); this.owIDLabel.Name = "owIDLabel"; - this.owIDLabel.Size = new System.Drawing.Size(71, 16); + this.owIDLabel.Size = new System.Drawing.Size(58, 13); this.owIDLabel.TabIndex = 7; this.owIDLabel.Text = "ID Number"; // // owIDNumericUpDown // - this.owIDNumericUpDown.Location = new System.Drawing.Point(268, 27); - this.owIDNumericUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.owIDNumericUpDown.Location = new System.Drawing.Point(201, 22); this.owIDNumericUpDown.Maximum = new decimal(new int[] { 255, 0, 0, 0}); this.owIDNumericUpDown.Name = "owIDNumericUpDown"; - this.owIDNumericUpDown.Size = new System.Drawing.Size(84, 22); + this.owIDNumericUpDown.Size = new System.Drawing.Size(63, 20); this.owIDNumericUpDown.TabIndex = 6; this.owIDNumericUpDown.ValueChanged += new System.EventHandler(this.owIDNumericUpDown_ValueChanged); // @@ -6450,10 +6030,9 @@ // this.duplicateOverworldsButton.Image = global::DSPRE.Properties.Resources.copyIcon_small; this.duplicateOverworldsButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.duplicateOverworldsButton.Location = new System.Drawing.Point(155, 249); - this.duplicateOverworldsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.duplicateOverworldsButton.Location = new System.Drawing.Point(116, 202); this.duplicateOverworldsButton.Name = "duplicateOverworldsButton"; - this.duplicateOverworldsButton.Size = new System.Drawing.Size(96, 31); + this.duplicateOverworldsButton.Size = new System.Drawing.Size(72, 25); this.duplicateOverworldsButton.TabIndex = 26; this.duplicateOverworldsButton.Text = "Duplicate"; this.duplicateOverworldsButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -6464,10 +6043,9 @@ // this.owSpritePictureBox.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; this.owSpritePictureBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.owSpritePictureBox.Location = new System.Drawing.Point(489, 65); - this.owSpritePictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.owSpritePictureBox.Location = new System.Drawing.Point(367, 53); this.owSpritePictureBox.Name = "owSpritePictureBox"; - this.owSpritePictureBox.Size = new System.Drawing.Size(87, 81); + this.owSpritePictureBox.Size = new System.Drawing.Size(66, 66); this.owSpritePictureBox.TabIndex = 20; this.owSpritePictureBox.TabStop = false; // @@ -6475,10 +6053,9 @@ // this.removeOverworldButton.Image = global::DSPRE.Properties.Resources.deleteIcon; this.removeOverworldButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeOverworldButton.Location = new System.Drawing.Point(75, 249); - this.removeOverworldButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.removeOverworldButton.Location = new System.Drawing.Point(56, 202); this.removeOverworldButton.Name = "removeOverworldButton"; - this.removeOverworldButton.Size = new System.Drawing.Size(80, 31); + this.removeOverworldButton.Size = new System.Drawing.Size(60, 25); this.removeOverworldButton.TabIndex = 5; this.removeOverworldButton.Text = "Delete"; this.removeOverworldButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -6489,10 +6066,9 @@ // this.addOverworldButton.Image = global::DSPRE.Properties.Resources.addIcon; this.addOverworldButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addOverworldButton.Location = new System.Drawing.Point(11, 249); - this.addOverworldButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.addOverworldButton.Location = new System.Drawing.Point(8, 202); this.addOverworldButton.Name = "addOverworldButton"; - this.addOverworldButton.Size = new System.Drawing.Size(64, 31); + this.addOverworldButton.Size = new System.Drawing.Size(48, 25); this.addOverworldButton.TabIndex = 4; this.addOverworldButton.Text = "Add"; this.addOverworldButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -6502,11 +6078,9 @@ // overworldsListBox // this.overworldsListBox.FormattingEnabled = true; - this.overworldsListBox.ItemHeight = 16; - this.overworldsListBox.Location = new System.Drawing.Point(11, 50); - this.overworldsListBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.overworldsListBox.Location = new System.Drawing.Point(8, 41); this.overworldsListBox.Name = "overworldsListBox"; - this.overworldsListBox.Size = new System.Drawing.Size(239, 196); + this.overworldsListBox.Size = new System.Drawing.Size(180, 160); this.overworldsListBox.TabIndex = 3; this.overworldsListBox.SelectedIndexChanged += new System.EventHandler(this.overworldsListBox_SelectedIndexChanged); // @@ -6518,11 +6092,10 @@ this.warpsTabPage.Controls.Add(this.removeWarpButton); this.warpsTabPage.Controls.Add(this.addWarpButton); this.warpsTabPage.Controls.Add(this.warpsListBox); - this.warpsTabPage.Location = new System.Drawing.Point(4, 25); - this.warpsTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.warpsTabPage.Location = new System.Drawing.Point(4, 22); this.warpsTabPage.Name = "warpsTabPage"; - this.warpsTabPage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.warpsTabPage.Size = new System.Drawing.Size(595, 436); + this.warpsTabPage.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.warpsTabPage.Size = new System.Drawing.Size(444, 352); this.warpsTabPage.TabIndex = 2; this.warpsTabPage.Text = "Warps"; this.warpsTabPage.UseVisualStyleBackColor = true; @@ -6531,10 +6104,9 @@ // this.duplicateWarpsButton.Image = global::DSPRE.Properties.Resources.copyIcon_small; this.duplicateWarpsButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.duplicateWarpsButton.Location = new System.Drawing.Point(149, 379); - this.duplicateWarpsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.duplicateWarpsButton.Location = new System.Drawing.Point(112, 308); this.duplicateWarpsButton.Name = "duplicateWarpsButton"; - this.duplicateWarpsButton.Size = new System.Drawing.Size(99, 39); + this.duplicateWarpsButton.Size = new System.Drawing.Size(74, 32); this.duplicateWarpsButton.TabIndex = 23; this.duplicateWarpsButton.Text = "Duplicate"; this.duplicateWarpsButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -6548,32 +6120,27 @@ this.groupBox11.Controls.Add(this.destinationWarpGoToButton); this.groupBox11.Controls.Add(this.warpAnchorUpDown); this.groupBox11.Controls.Add(this.warpAnchorLabel); - this.groupBox11.Location = new System.Drawing.Point(257, 238); - this.groupBox11.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox11.Location = new System.Drawing.Point(193, 193); this.groupBox11.Name = "groupBox11"; - this.groupBox11.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox11.Size = new System.Drawing.Size(323, 185); + this.groupBox11.Size = new System.Drawing.Size(242, 150); this.groupBox11.TabIndex = 22; this.groupBox11.TabStop = false; this.groupBox11.Text = "Destination"; // // eventEditorHeaderLocationNameLabel // - this.eventEditorHeaderLocationNameLabel.Location = new System.Drawing.Point(180, 25); - this.eventEditorHeaderLocationNameLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.eventEditorHeaderLocationNameLabel.Location = new System.Drawing.Point(135, 20); this.eventEditorHeaderLocationNameLabel.Name = "eventEditorHeaderLocationNameLabel"; - this.eventEditorHeaderLocationNameLabel.Size = new System.Drawing.Size(129, 43); + this.eventEditorHeaderLocationNameLabel.Size = new System.Drawing.Size(97, 35); this.eventEditorHeaderLocationNameLabel.TabIndex = 31; this.eventEditorHeaderLocationNameLabel.Text = "LOCATION NAME"; // // eventEditorWarpHeaderListBox // this.eventEditorWarpHeaderListBox.FormattingEnabled = true; - this.eventEditorWarpHeaderListBox.ItemHeight = 16; - this.eventEditorWarpHeaderListBox.Location = new System.Drawing.Point(9, 25); - this.eventEditorWarpHeaderListBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.eventEditorWarpHeaderListBox.Location = new System.Drawing.Point(7, 20); this.eventEditorWarpHeaderListBox.Name = "eventEditorWarpHeaderListBox"; - this.eventEditorWarpHeaderListBox.Size = new System.Drawing.Size(165, 148); + this.eventEditorWarpHeaderListBox.Size = new System.Drawing.Size(125, 121); this.eventEditorWarpHeaderListBox.TabIndex = 30; this.eventEditorWarpHeaderListBox.SelectedIndexChanged += new System.EventHandler(this.eventEditorWarpHeaderListBox_SelectedIndexChanged); // @@ -6581,10 +6148,9 @@ // this.destinationWarpGoToButton.Image = global::DSPRE.Properties.Resources.warpGo; this.destinationWarpGoToButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.destinationWarpGoToButton.Location = new System.Drawing.Point(184, 121); - this.destinationWarpGoToButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.destinationWarpGoToButton.Location = new System.Drawing.Point(138, 98); this.destinationWarpGoToButton.Name = "destinationWarpGoToButton"; - this.destinationWarpGoToButton.Size = new System.Drawing.Size(125, 50); + this.destinationWarpGoToButton.Size = new System.Drawing.Size(94, 41); this.destinationWarpGoToButton.TabIndex = 26; this.destinationWarpGoToButton.Text = "Test\r\nWarp"; this.destinationWarpGoToButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -6593,25 +6159,23 @@ // // warpAnchorUpDown // - this.warpAnchorUpDown.Location = new System.Drawing.Point(184, 90); - this.warpAnchorUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.warpAnchorUpDown.Location = new System.Drawing.Point(138, 73); this.warpAnchorUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.warpAnchorUpDown.Name = "warpAnchorUpDown"; - this.warpAnchorUpDown.Size = new System.Drawing.Size(125, 22); + this.warpAnchorUpDown.Size = new System.Drawing.Size(94, 20); this.warpAnchorUpDown.TabIndex = 29; this.warpAnchorUpDown.ValueChanged += new System.EventHandler(this.warpAnchorUpDown_ValueChanged); // // warpAnchorLabel // this.warpAnchorLabel.AutoSize = true; - this.warpAnchorLabel.Location = new System.Drawing.Point(212, 70); - this.warpAnchorLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.warpAnchorLabel.Location = new System.Drawing.Point(159, 57); this.warpAnchorLabel.Name = "warpAnchorLabel"; - this.warpAnchorLabel.Size = new System.Drawing.Size(56, 16); + this.warpAnchorLabel.Size = new System.Drawing.Size(47, 13); this.warpAnchorLabel.TabIndex = 27; this.warpAnchorLabel.Text = "Hook ID"; // @@ -6619,11 +6183,9 @@ // this.groupBox1.Controls.Add(this.groupBox14); this.groupBox1.Controls.Add(this.groupBox12); - this.groupBox1.Location = new System.Drawing.Point(257, 7); - this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox1.Location = new System.Drawing.Point(193, 6); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox1.Size = new System.Drawing.Size(323, 224); + this.groupBox1.Size = new System.Drawing.Size(242, 182); this.groupBox1.TabIndex = 21; this.groupBox1.TabStop = false; this.groupBox1.Text = "Start coordinates"; @@ -6635,11 +6197,9 @@ this.groupBox14.Controls.Add(this.warpXMatrixUpDown); this.groupBox14.Controls.Add(this.label15); this.groupBox14.Controls.Add(this.warpYMatrixUpDown); - this.groupBox14.Location = new System.Drawing.Point(12, 91); - this.groupBox14.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox14.Location = new System.Drawing.Point(9, 74); this.groupBox14.Name = "groupBox14"; - this.groupBox14.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox14.Size = new System.Drawing.Size(297, 119); + this.groupBox14.Size = new System.Drawing.Size(223, 97); this.groupBox14.TabIndex = 23; this.groupBox14.TabStop = false; this.groupBox14.Text = "Matrix coordinates"; @@ -6648,10 +6208,9 @@ // this.goToWarpButton.Image = global::DSPRE.Properties.Resources.goToWarp; this.goToWarpButton.ImageAlign = System.Drawing.ContentAlignment.BottomRight; - this.goToWarpButton.Location = new System.Drawing.Point(84, 63); - this.goToWarpButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.goToWarpButton.Location = new System.Drawing.Point(63, 51); this.goToWarpButton.Name = "goToWarpButton"; - this.goToWarpButton.Size = new System.Drawing.Size(136, 48); + this.goToWarpButton.Size = new System.Drawing.Size(102, 39); this.goToWarpButton.TabIndex = 25; this.goToWarpButton.Text = "Go to start \r\ncoordinates"; this.goToWarpButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -6661,48 +6220,44 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(156, 33); - this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label9.Location = new System.Drawing.Point(117, 27); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(44, 16); + this.label9.Size = new System.Drawing.Size(38, 13); this.label9.TabIndex = 24; this.label9.Text = "Mat. Y"; // // warpXMatrixUpDown // - this.warpXMatrixUpDown.Location = new System.Drawing.Point(65, 28); - this.warpXMatrixUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.warpXMatrixUpDown.Location = new System.Drawing.Point(49, 23); this.warpXMatrixUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.warpXMatrixUpDown.Name = "warpXMatrixUpDown"; - this.warpXMatrixUpDown.Size = new System.Drawing.Size(63, 22); + this.warpXMatrixUpDown.Size = new System.Drawing.Size(47, 20); this.warpXMatrixUpDown.TabIndex = 21; this.warpXMatrixUpDown.ValueChanged += new System.EventHandler(this.warpMatrixXUpDown_ValueChanged); // // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(13, 33); - this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label15.Location = new System.Drawing.Point(10, 27); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(43, 16); + this.label15.Size = new System.Drawing.Size(38, 13); this.label15.TabIndex = 22; this.label15.Text = "Mat. X"; // // warpYMatrixUpDown // - this.warpYMatrixUpDown.Location = new System.Drawing.Point(209, 28); - this.warpYMatrixUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.warpYMatrixUpDown.Location = new System.Drawing.Point(157, 23); this.warpYMatrixUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.warpYMatrixUpDown.Name = "warpYMatrixUpDown"; - this.warpYMatrixUpDown.Size = new System.Drawing.Size(63, 22); + this.warpYMatrixUpDown.Size = new System.Drawing.Size(47, 20); this.warpYMatrixUpDown.TabIndex = 23; this.warpYMatrixUpDown.ValueChanged += new System.EventHandler(this.warpMatrixYUpDown_ValueChanged); // @@ -6714,19 +6269,16 @@ this.groupBox12.Controls.Add(this.warpYMapUpDown); this.groupBox12.Controls.Add(this.warpZUpDown); this.groupBox12.Controls.Add(this.label16); - this.groupBox12.Location = new System.Drawing.Point(12, 23); - this.groupBox12.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox12.Location = new System.Drawing.Point(9, 19); this.groupBox12.Name = "groupBox12"; - this.groupBox12.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox12.Size = new System.Drawing.Size(297, 60); + this.groupBox12.Size = new System.Drawing.Size(223, 49); this.groupBox12.TabIndex = 22; this.groupBox12.TabStop = false; this.groupBox12.Text = "Map coordinates"; // // warpXMapUpDown // - this.warpXMapUpDown.Location = new System.Drawing.Point(33, 23); - this.warpXMapUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.warpXMapUpDown.Location = new System.Drawing.Point(25, 19); this.warpXMapUpDown.Maximum = new decimal(new int[] { 32768, 0, @@ -6738,34 +6290,31 @@ 0, -2147483648}); this.warpXMapUpDown.Name = "warpXMapUpDown"; - this.warpXMapUpDown.Size = new System.Drawing.Size(45, 22); + this.warpXMapUpDown.Size = new System.Drawing.Size(34, 20); this.warpXMapUpDown.TabIndex = 10; this.warpXMapUpDown.ValueChanged += new System.EventHandler(this.warpXMapUpDown_ValueChanged); // // label24 // this.label24.AutoSize = true; - this.label24.Location = new System.Drawing.Point(115, 27); - this.label24.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label24.Location = new System.Drawing.Point(86, 22); this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(16, 16); + this.label24.Size = new System.Drawing.Size(14, 13); this.label24.TabIndex = 21; this.label24.Text = "Y"; // // label25 // this.label25.AutoSize = true; - this.label25.Location = new System.Drawing.Point(13, 27); - this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label25.Location = new System.Drawing.Point(10, 22); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(15, 16); + this.label25.Size = new System.Drawing.Size(14, 13); this.label25.TabIndex = 13; this.label25.Text = "X"; // // warpYMapUpDown // - this.warpYMapUpDown.Location = new System.Drawing.Point(133, 23); - this.warpYMapUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.warpYMapUpDown.Location = new System.Drawing.Point(100, 19); this.warpYMapUpDown.Maximum = new decimal(new int[] { 32768, 0, @@ -6777,14 +6326,13 @@ 0, -2147483648}); this.warpYMapUpDown.Name = "warpYMapUpDown"; - this.warpYMapUpDown.Size = new System.Drawing.Size(45, 22); + this.warpYMapUpDown.Size = new System.Drawing.Size(34, 20); this.warpYMapUpDown.TabIndex = 12; this.warpYMapUpDown.ValueChanged += new System.EventHandler(this.warpYMapUpDown_ValueChanged); // // warpZUpDown // - this.warpZUpDown.Location = new System.Drawing.Point(233, 23); - this.warpZUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.warpZUpDown.Location = new System.Drawing.Point(175, 19); this.warpZUpDown.Maximum = new decimal(new int[] { 32768, 0, @@ -6796,17 +6344,16 @@ 0, -2147483648}); this.warpZUpDown.Name = "warpZUpDown"; - this.warpZUpDown.Size = new System.Drawing.Size(45, 22); + this.warpZUpDown.Size = new System.Drawing.Size(34, 20); this.warpZUpDown.TabIndex = 14; this.warpZUpDown.ValueChanged += new System.EventHandler(this.warpZUpDown_ValueChanged); // // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(213, 27); - this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label16.Location = new System.Drawing.Point(160, 22); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(15, 16); + this.label16.Size = new System.Drawing.Size(14, 13); this.label16.TabIndex = 15; this.label16.Text = "Z"; // @@ -6814,10 +6361,9 @@ // this.removeWarpButton.Image = global::DSPRE.Properties.Resources.deleteIcon; this.removeWarpButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeWarpButton.Location = new System.Drawing.Point(80, 379); - this.removeWarpButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.removeWarpButton.Location = new System.Drawing.Point(60, 308); this.removeWarpButton.Name = "removeWarpButton"; - this.removeWarpButton.Size = new System.Drawing.Size(69, 39); + this.removeWarpButton.Size = new System.Drawing.Size(52, 32); this.removeWarpButton.TabIndex = 10; this.removeWarpButton.Text = "Rem"; this.removeWarpButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -6828,10 +6374,9 @@ // this.addWarpButton.Image = global::DSPRE.Properties.Resources.addIcon; this.addWarpButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addWarpButton.Location = new System.Drawing.Point(11, 379); - this.addWarpButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.addWarpButton.Location = new System.Drawing.Point(8, 308); this.addWarpButton.Name = "addWarpButton"; - this.addWarpButton.Size = new System.Drawing.Size(69, 39); + this.addWarpButton.Size = new System.Drawing.Size(52, 32); this.addWarpButton.TabIndex = 9; this.addWarpButton.Text = "Add"; this.addWarpButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -6841,11 +6386,9 @@ // warpsListBox // this.warpsListBox.FormattingEnabled = true; - this.warpsListBox.ItemHeight = 16; - this.warpsListBox.Location = new System.Drawing.Point(12, 15); - this.warpsListBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.warpsListBox.Location = new System.Drawing.Point(9, 12); this.warpsListBox.Name = "warpsListBox"; - this.warpsListBox.Size = new System.Drawing.Size(235, 356); + this.warpsListBox.Size = new System.Drawing.Size(177, 290); this.warpsListBox.TabIndex = 4; this.warpsListBox.SelectedIndexChanged += new System.EventHandler(this.warpsListBox_SelectedIndexChanged); // @@ -6859,11 +6402,10 @@ this.triggersTabPage.Controls.Add(this.removeTriggerButton); this.triggersTabPage.Controls.Add(this.addTriggerButton); this.triggersTabPage.Controls.Add(this.triggersListBox); - this.triggersTabPage.Location = new System.Drawing.Point(4, 25); - this.triggersTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.triggersTabPage.Location = new System.Drawing.Point(4, 22); this.triggersTabPage.Name = "triggersTabPage"; - this.triggersTabPage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.triggersTabPage.Size = new System.Drawing.Size(595, 436); + this.triggersTabPage.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.triggersTabPage.Size = new System.Drawing.Size(444, 352); this.triggersTabPage.TabIndex = 3; this.triggersTabPage.Text = "Triggers"; this.triggersTabPage.UseVisualStyleBackColor = true; @@ -6876,84 +6418,76 @@ this.triggerLogicGroupBox.Controls.Add(this.label28); this.triggerLogicGroupBox.Controls.Add(this.triggerScriptUpDown); this.triggerLogicGroupBox.Controls.Add(this.label27); - this.triggerLogicGroupBox.Location = new System.Drawing.Point(300, 11); - this.triggerLogicGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.triggerLogicGroupBox.Location = new System.Drawing.Point(225, 9); this.triggerLogicGroupBox.Name = "triggerLogicGroupBox"; - this.triggerLogicGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.triggerLogicGroupBox.Size = new System.Drawing.Size(267, 133); + this.triggerLogicGroupBox.Size = new System.Drawing.Size(200, 108); this.triggerLogicGroupBox.TabIndex = 39; this.triggerLogicGroupBox.TabStop = false; this.triggerLogicGroupBox.Text = "Logic"; // // expectedVarValueTriggerUpDown // - this.expectedVarValueTriggerUpDown.Location = new System.Drawing.Point(149, 44); - this.expectedVarValueTriggerUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.expectedVarValueTriggerUpDown.Location = new System.Drawing.Point(112, 36); this.expectedVarValueTriggerUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.expectedVarValueTriggerUpDown.Name = "expectedVarValueTriggerUpDown"; - this.expectedVarValueTriggerUpDown.Size = new System.Drawing.Size(95, 22); + this.expectedVarValueTriggerUpDown.Size = new System.Drawing.Size(71, 20); this.expectedVarValueTriggerUpDown.TabIndex = 37; this.expectedVarValueTriggerUpDown.ValueChanged += new System.EventHandler(this.expectedVarValueTriggerUpDown_ValueChanged); // // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(143, 25); - this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label19.Location = new System.Drawing.Point(107, 20); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(102, 16); + this.label19.Size = new System.Drawing.Size(82, 13); this.label19.TabIndex = 38; this.label19.Text = "Expected Value"; // // triggerVariableWatchedUpDown // - this.triggerVariableWatchedUpDown.Location = new System.Drawing.Point(23, 44); - this.triggerVariableWatchedUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.triggerVariableWatchedUpDown.Location = new System.Drawing.Point(17, 36); this.triggerVariableWatchedUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.triggerVariableWatchedUpDown.Name = "triggerVariableWatchedUpDown"; - this.triggerVariableWatchedUpDown.Size = new System.Drawing.Size(95, 22); + this.triggerVariableWatchedUpDown.Size = new System.Drawing.Size(71, 20); this.triggerVariableWatchedUpDown.TabIndex = 26; this.triggerVariableWatchedUpDown.ValueChanged += new System.EventHandler(this.triggerVariableWatchedUpDown_ValueChanged); // // label28 // this.label28.AutoSize = true; - this.label28.Location = new System.Drawing.Point(12, 25); - this.label28.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label28.Location = new System.Drawing.Point(9, 20); this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(111, 16); + this.label28.Size = new System.Drawing.Size(89, 13); this.label28.TabIndex = 27; this.label28.Text = "Variable watched"; // // triggerScriptUpDown // - this.triggerScriptUpDown.Location = new System.Drawing.Point(91, 95); - this.triggerScriptUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.triggerScriptUpDown.Location = new System.Drawing.Point(68, 77); this.triggerScriptUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.triggerScriptUpDown.Name = "triggerScriptUpDown"; - this.triggerScriptUpDown.Size = new System.Drawing.Size(88, 22); + this.triggerScriptUpDown.Size = new System.Drawing.Size(66, 20); this.triggerScriptUpDown.TabIndex = 23; this.triggerScriptUpDown.ValueChanged += new System.EventHandler(this.triggerScriptUpDown_ValueChanged); // // label27 // this.label27.AutoSize = true; - this.label27.Location = new System.Drawing.Point(77, 76); - this.label27.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label27.Location = new System.Drawing.Point(58, 62); this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(96, 16); + this.label27.Size = new System.Drawing.Size(78, 13); this.label27.TabIndex = 24; this.label27.Text = "Script to trigger"; // @@ -6963,11 +6497,9 @@ this.groupBox16.Controls.Add(this.triggerLengthUpDown); this.groupBox16.Controls.Add(this.triggerWidthLabel); this.groupBox16.Controls.Add(this.triggerWidthUpDown); - this.groupBox16.Location = new System.Drawing.Point(300, 146); - this.groupBox16.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox16.Location = new System.Drawing.Point(225, 119); this.groupBox16.Name = "groupBox16"; - this.groupBox16.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox16.Size = new System.Drawing.Size(267, 82); + this.groupBox16.Size = new System.Drawing.Size(200, 67); this.groupBox16.TabIndex = 33; this.groupBox16.TabStop = false; this.groupBox16.Text = "Trigger Size"; @@ -6975,48 +6507,44 @@ // triggerLengthLabel // this.triggerLengthLabel.AutoSize = true; - this.triggerLengthLabel.Location = new System.Drawing.Point(155, 23); - this.triggerLengthLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.triggerLengthLabel.Location = new System.Drawing.Point(116, 19); this.triggerLengthLabel.Name = "triggerLengthLabel"; - this.triggerLengthLabel.Size = new System.Drawing.Size(67, 16); + this.triggerLengthLabel.Size = new System.Drawing.Size(56, 13); this.triggerLengthLabel.TabIndex = 35; this.triggerLengthLabel.Text = "Length [Y]"; // // triggerLengthUpDown // - this.triggerLengthUpDown.Location = new System.Drawing.Point(159, 44); - this.triggerLengthUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.triggerLengthUpDown.Location = new System.Drawing.Point(119, 36); this.triggerLengthUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.triggerLengthUpDown.Name = "triggerLengthUpDown"; - this.triggerLengthUpDown.Size = new System.Drawing.Size(85, 22); + this.triggerLengthUpDown.Size = new System.Drawing.Size(64, 20); this.triggerLengthUpDown.TabIndex = 34; this.triggerLengthUpDown.ValueChanged += new System.EventHandler(this.triggerLengthUpDown_ValueChanged); // // triggerWidthLabel // this.triggerWidthLabel.AutoSize = true; - this.triggerWidthLabel.Location = new System.Drawing.Point(20, 23); - this.triggerWidthLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.triggerWidthLabel.Location = new System.Drawing.Point(15, 19); this.triggerWidthLabel.Name = "triggerWidthLabel"; - this.triggerWidthLabel.Size = new System.Drawing.Size(60, 16); + this.triggerWidthLabel.Size = new System.Drawing.Size(51, 13); this.triggerWidthLabel.TabIndex = 33; this.triggerWidthLabel.Text = "Width [X]"; // // triggerWidthUpDown // - this.triggerWidthUpDown.Location = new System.Drawing.Point(24, 44); - this.triggerWidthUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.triggerWidthUpDown.Location = new System.Drawing.Point(18, 36); this.triggerWidthUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.triggerWidthUpDown.Name = "triggerWidthUpDown"; - this.triggerWidthUpDown.Size = new System.Drawing.Size(83, 22); + this.triggerWidthUpDown.Size = new System.Drawing.Size(62, 20); this.triggerWidthUpDown.TabIndex = 32; this.triggerWidthUpDown.ValueChanged += new System.EventHandler(this.triggerWidthUpDown_ValueChanged); // @@ -7028,11 +6556,9 @@ this.groupBox15.Controls.Add(this.triggerMapXLabel); this.groupBox15.Controls.Add(this.triggerYMapUpDown); this.groupBox15.Controls.Add(this.triggerYMapLabel); - this.groupBox15.Location = new System.Drawing.Point(300, 235); - this.groupBox15.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox15.Location = new System.Drawing.Point(225, 191); this.groupBox15.Name = "groupBox15"; - this.groupBox15.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox15.Size = new System.Drawing.Size(267, 66); + this.groupBox15.Size = new System.Drawing.Size(200, 54); this.groupBox15.TabIndex = 32; this.groupBox15.TabStop = false; this.groupBox15.Text = "Map Coordinates"; @@ -7040,17 +6566,15 @@ // triggerZLabel // this.triggerZLabel.AutoSize = true; - this.triggerZLabel.Location = new System.Drawing.Point(188, 33); - this.triggerZLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.triggerZLabel.Location = new System.Drawing.Point(141, 27); this.triggerZLabel.Name = "triggerZLabel"; - this.triggerZLabel.Size = new System.Drawing.Size(15, 16); + this.triggerZLabel.Size = new System.Drawing.Size(14, 13); this.triggerZLabel.TabIndex = 21; this.triggerZLabel.Text = "Z"; // // triggerXMapUpDown // - this.triggerXMapUpDown.Location = new System.Drawing.Point(37, 28); - this.triggerXMapUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.triggerXMapUpDown.Location = new System.Drawing.Point(28, 23); this.triggerXMapUpDown.Maximum = new decimal(new int[] { 32768, 0, @@ -7062,14 +6586,13 @@ 0, -2147483648}); this.triggerXMapUpDown.Name = "triggerXMapUpDown"; - this.triggerXMapUpDown.Size = new System.Drawing.Size(45, 22); + this.triggerXMapUpDown.Size = new System.Drawing.Size(34, 20); this.triggerXMapUpDown.TabIndex = 16; this.triggerXMapUpDown.ValueChanged += new System.EventHandler(this.triggerXMapUpDown_ValueChanged); // // triggerZUpDown // - this.triggerZUpDown.Location = new System.Drawing.Point(208, 28); - this.triggerZUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.triggerZUpDown.Location = new System.Drawing.Point(156, 23); this.triggerZUpDown.Maximum = new decimal(new int[] { 32768, 0, @@ -7081,41 +6604,38 @@ 0, -2147483648}); this.triggerZUpDown.Name = "triggerZUpDown"; - this.triggerZUpDown.Size = new System.Drawing.Size(45, 22); + this.triggerZUpDown.Size = new System.Drawing.Size(34, 20); this.triggerZUpDown.TabIndex = 20; this.triggerZUpDown.ValueChanged += new System.EventHandler(this.triggerZUpDown_ValueChanged); // // triggerMapXLabel // this.triggerMapXLabel.AutoSize = true; - this.triggerMapXLabel.Location = new System.Drawing.Point(15, 33); - this.triggerMapXLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.triggerMapXLabel.Location = new System.Drawing.Point(11, 27); this.triggerMapXLabel.Name = "triggerMapXLabel"; - this.triggerMapXLabel.Size = new System.Drawing.Size(15, 16); + this.triggerMapXLabel.Size = new System.Drawing.Size(14, 13); this.triggerMapXLabel.TabIndex = 17; this.triggerMapXLabel.Text = "X"; // // triggerYMapUpDown // - this.triggerYMapUpDown.Location = new System.Drawing.Point(121, 28); - this.triggerYMapUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.triggerYMapUpDown.Location = new System.Drawing.Point(91, 23); this.triggerYMapUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.triggerYMapUpDown.Name = "triggerYMapUpDown"; - this.triggerYMapUpDown.Size = new System.Drawing.Size(45, 22); + this.triggerYMapUpDown.Size = new System.Drawing.Size(34, 20); this.triggerYMapUpDown.TabIndex = 18; this.triggerYMapUpDown.ValueChanged += new System.EventHandler(this.triggerYMapUpDown_ValueChanged); // // triggerYMapLabel // this.triggerYMapLabel.AutoSize = true; - this.triggerYMapLabel.Location = new System.Drawing.Point(101, 33); - this.triggerYMapLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.triggerYMapLabel.Location = new System.Drawing.Point(76, 27); this.triggerYMapLabel.Name = "triggerYMapLabel"; - this.triggerYMapLabel.Size = new System.Drawing.Size(16, 16); + this.triggerYMapLabel.Size = new System.Drawing.Size(14, 13); this.triggerYMapLabel.TabIndex = 19; this.triggerYMapLabel.Text = "Y"; // @@ -7126,11 +6646,9 @@ this.groupBox6.Controls.Add(this.triggerXMatrixUpDown); this.groupBox6.Controls.Add(this.triggerXMatrixLabel); this.groupBox6.Controls.Add(this.triggerYMatrixUpDown); - this.groupBox6.Location = new System.Drawing.Point(300, 305); - this.groupBox6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox6.Location = new System.Drawing.Point(225, 248); this.groupBox6.Name = "groupBox6"; - this.groupBox6.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox6.Size = new System.Drawing.Size(267, 116); + this.groupBox6.Size = new System.Drawing.Size(200, 94); this.groupBox6.TabIndex = 25; this.groupBox6.TabStop = false; this.groupBox6.Text = "Matrix Coordinates"; @@ -7139,10 +6657,9 @@ // this.goToTriggerButton.Image = global::DSPRE.Properties.Resources.goToTrigger; this.goToTriggerButton.ImageAlign = System.Drawing.ContentAlignment.BottomRight; - this.goToTriggerButton.Location = new System.Drawing.Point(59, 58); - this.goToTriggerButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.goToTriggerButton.Location = new System.Drawing.Point(44, 47); this.goToTriggerButton.Name = "goToTriggerButton"; - this.goToTriggerButton.Size = new System.Drawing.Size(160, 48); + this.goToTriggerButton.Size = new System.Drawing.Size(120, 39); this.goToTriggerButton.TabIndex = 20; this.goToTriggerButton.Text = "Find this trigger"; this.goToTriggerButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -7152,48 +6669,44 @@ // triggerYMatrixLabel // this.triggerYMatrixLabel.AutoSize = true; - this.triggerYMatrixLabel.Location = new System.Drawing.Point(140, 30); - this.triggerYMatrixLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.triggerYMatrixLabel.Location = new System.Drawing.Point(105, 24); this.triggerYMatrixLabel.Name = "triggerYMatrixLabel"; - this.triggerYMatrixLabel.Size = new System.Drawing.Size(54, 16); + this.triggerYMatrixLabel.Size = new System.Drawing.Size(45, 13); this.triggerYMatrixLabel.TabIndex = 19; this.triggerYMatrixLabel.Text = "Matrix Y"; // // triggerXMatrixUpDown // - this.triggerXMatrixUpDown.Location = new System.Drawing.Point(69, 26); - this.triggerXMatrixUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.triggerXMatrixUpDown.Location = new System.Drawing.Point(52, 21); this.triggerXMatrixUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.triggerXMatrixUpDown.Name = "triggerXMatrixUpDown"; - this.triggerXMatrixUpDown.Size = new System.Drawing.Size(49, 22); + this.triggerXMatrixUpDown.Size = new System.Drawing.Size(37, 20); this.triggerXMatrixUpDown.TabIndex = 16; this.triggerXMatrixUpDown.ValueChanged += new System.EventHandler(this.triggerXMatrixUpDown_ValueChanged); // // triggerXMatrixLabel // this.triggerXMatrixLabel.AutoSize = true; - this.triggerXMatrixLabel.Location = new System.Drawing.Point(8, 30); - this.triggerXMatrixLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.triggerXMatrixLabel.Location = new System.Drawing.Point(6, 24); this.triggerXMatrixLabel.Name = "triggerXMatrixLabel"; - this.triggerXMatrixLabel.Size = new System.Drawing.Size(53, 16); + this.triggerXMatrixLabel.Size = new System.Drawing.Size(45, 13); this.triggerXMatrixLabel.TabIndex = 17; this.triggerXMatrixLabel.Text = "Matrix X"; // // triggerYMatrixUpDown // - this.triggerYMatrixUpDown.Location = new System.Drawing.Point(203, 26); - this.triggerYMatrixUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.triggerYMatrixUpDown.Location = new System.Drawing.Point(152, 21); this.triggerYMatrixUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.triggerYMatrixUpDown.Name = "triggerYMatrixUpDown"; - this.triggerYMatrixUpDown.Size = new System.Drawing.Size(49, 22); + this.triggerYMatrixUpDown.Size = new System.Drawing.Size(37, 20); this.triggerYMatrixUpDown.TabIndex = 18; this.triggerYMatrixUpDown.ValueChanged += new System.EventHandler(this.triggerYMatrixUpDown_ValueChanged); // @@ -7201,10 +6714,9 @@ // this.duplicateTriggersButton.Image = global::DSPRE.Properties.Resources.copyIcon_small; this.duplicateTriggersButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.duplicateTriggersButton.Location = new System.Drawing.Point(173, 379); - this.duplicateTriggersButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.duplicateTriggersButton.Location = new System.Drawing.Point(130, 308); this.duplicateTriggersButton.Name = "duplicateTriggersButton"; - this.duplicateTriggersButton.Size = new System.Drawing.Size(99, 39); + this.duplicateTriggersButton.Size = new System.Drawing.Size(74, 32); this.duplicateTriggersButton.TabIndex = 36; this.duplicateTriggersButton.Text = "Duplicate"; this.duplicateTriggersButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -7215,10 +6727,9 @@ // this.removeTriggerButton.Image = global::DSPRE.Properties.Resources.deleteIcon; this.removeTriggerButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeTriggerButton.Location = new System.Drawing.Point(88, 379); - this.removeTriggerButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.removeTriggerButton.Location = new System.Drawing.Point(66, 308); this.removeTriggerButton.Name = "removeTriggerButton"; - this.removeTriggerButton.Size = new System.Drawing.Size(84, 39); + this.removeTriggerButton.Size = new System.Drawing.Size(63, 32); this.removeTriggerButton.TabIndex = 10; this.removeTriggerButton.Text = "Delete"; this.removeTriggerButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -7229,10 +6740,9 @@ // this.addTriggerButton.Image = global::DSPRE.Properties.Resources.addIcon; this.addTriggerButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addTriggerButton.Location = new System.Drawing.Point(19, 379); - this.addTriggerButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.addTriggerButton.Location = new System.Drawing.Point(14, 308); this.addTriggerButton.Name = "addTriggerButton"; - this.addTriggerButton.Size = new System.Drawing.Size(68, 39); + this.addTriggerButton.Size = new System.Drawing.Size(51, 32); this.addTriggerButton.TabIndex = 9; this.addTriggerButton.Text = "Add"; this.addTriggerButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -7242,11 +6752,9 @@ // triggersListBox // this.triggersListBox.FormattingEnabled = true; - this.triggersListBox.ItemHeight = 16; - this.triggersListBox.Location = new System.Drawing.Point(19, 15); - this.triggersListBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.triggersListBox.Location = new System.Drawing.Point(14, 12); this.triggersListBox.Name = "triggersListBox"; - this.triggersListBox.Size = new System.Drawing.Size(252, 356); + this.triggersListBox.Size = new System.Drawing.Size(190, 290); this.triggersListBox.TabIndex = 4; this.triggersListBox.SelectedIndexChanged += new System.EventHandler(this.triggersListBox_SelectedIndexChanged); // @@ -7255,19 +6763,17 @@ this.eventPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.eventPanel.Controls.Add(this.eventPictureBox); this.eventPanel.Controls.Add(this.eventOpenGlControl); - this.eventPanel.Location = new System.Drawing.Point(801, 48); - this.eventPanel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.eventPanel.Location = new System.Drawing.Point(601, 39); this.eventPanel.Name = "eventPanel"; - this.eventPanel.Size = new System.Drawing.Size(727, 672); + this.eventPanel.Size = new System.Drawing.Size(546, 546); this.eventPanel.TabIndex = 24; // // eventPictureBox // this.eventPictureBox.BackColor = System.Drawing.Color.White; this.eventPictureBox.Location = new System.Drawing.Point(0, 0); - this.eventPictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.eventPictureBox.Name = "eventPictureBox"; - this.eventPictureBox.Size = new System.Drawing.Size(725, 670); + this.eventPictureBox.Size = new System.Drawing.Size(544, 544); this.eventPictureBox.TabIndex = 3; this.eventPictureBox.TabStop = false; this.eventPictureBox.Click += new System.EventHandler(this.eventPictureBox_Click); @@ -7286,9 +6792,8 @@ this.eventOpenGlControl.Dock = System.Windows.Forms.DockStyle.Fill; this.eventOpenGlControl.ForeColor = System.Drawing.Color.Black; this.eventOpenGlControl.Location = new System.Drawing.Point(0, 0); - this.eventOpenGlControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.eventOpenGlControl.Name = "eventOpenGlControl"; - this.eventOpenGlControl.Size = new System.Drawing.Size(725, 670); + this.eventOpenGlControl.Size = new System.Drawing.Size(544, 544); this.eventOpenGlControl.StencilBits = ((byte)(0)); this.eventOpenGlControl.TabIndex = 2; // @@ -7298,10 +6803,9 @@ | System.Windows.Forms.AnchorStyles.Right))); this.rightClickPicture.Image = global::DSPRE.Properties.Resources.RightClick; this.rightClickPicture.ImageLocation = ""; - this.rightClickPicture.Location = new System.Drawing.Point(624, 517); - this.rightClickPicture.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.rightClickPicture.Location = new System.Drawing.Point(468, 420); this.rightClickPicture.Name = "rightClickPicture"; - this.rightClickPicture.Size = new System.Drawing.Size(0, 47); + this.rightClickPicture.Size = new System.Drawing.Size(0, 38); this.rightClickPicture.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.rightClickPicture.TabIndex = 59; this.rightClickPicture.TabStop = false; @@ -7312,10 +6816,9 @@ | System.Windows.Forms.AnchorStyles.Right))); this.wheelClickPicture.Image = global::DSPRE.Properties.Resources.WheelClick; this.wheelClickPicture.ImageLocation = ""; - this.wheelClickPicture.Location = new System.Drawing.Point(736, 517); - this.wheelClickPicture.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.wheelClickPicture.Location = new System.Drawing.Point(552, 420); this.wheelClickPicture.Name = "wheelClickPicture"; - this.wheelClickPicture.Size = new System.Drawing.Size(0, 47); + this.wheelClickPicture.Size = new System.Drawing.Size(0, 38); this.wheelClickPicture.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.wheelClickPicture.TabIndex = 56; this.wheelClickPicture.TabStop = false; @@ -7326,10 +6829,9 @@ | System.Windows.Forms.AnchorStyles.Right))); this.LeftClickPicture.Image = global::DSPRE.Properties.Resources.LeftClick; this.LeftClickPicture.ImageLocation = ""; - this.LeftClickPicture.Location = new System.Drawing.Point(680, 517); - this.LeftClickPicture.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.LeftClickPicture.Location = new System.Drawing.Point(510, 420); this.LeftClickPicture.Name = "LeftClickPicture"; - this.LeftClickPicture.Size = new System.Drawing.Size(0, 47); + this.LeftClickPicture.Size = new System.Drawing.Size(0, 38); this.LeftClickPicture.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.LeftClickPicture.TabIndex = 55; this.LeftClickPicture.TabStop = false; @@ -7338,10 +6840,9 @@ // this.removeEventFileButton.Image = ((System.Drawing.Image)(resources.GetObject("removeEventFileButton.Image"))); this.removeEventFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeEventFileButton.Location = new System.Drawing.Point(472, 44); - this.removeEventFileButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.removeEventFileButton.Location = new System.Drawing.Point(354, 36); this.removeEventFileButton.Name = "removeEventFileButton"; - this.removeEventFileButton.Size = new System.Drawing.Size(135, 31); + this.removeEventFileButton.Size = new System.Drawing.Size(101, 25); this.removeEventFileButton.TabIndex = 54; this.removeEventFileButton.Text = "Remove Last"; this.removeEventFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -7352,10 +6853,9 @@ // this.addEventFileButton.Image = ((System.Drawing.Image)(resources.GetObject("addEventFileButton.Image"))); this.addEventFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addEventFileButton.Location = new System.Drawing.Point(472, 11); - this.addEventFileButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.addEventFileButton.Location = new System.Drawing.Point(354, 9); this.addEventFileButton.Name = "addEventFileButton"; - this.addEventFileButton.Size = new System.Drawing.Size(135, 31); + this.addEventFileButton.Size = new System.Drawing.Size(101, 25); this.addEventFileButton.TabIndex = 53; this.addEventFileButton.Text = "Add Event File"; this.addEventFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -7366,10 +6866,9 @@ // this.eventShiftRightButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; this.eventShiftRightButton.Image = global::DSPRE.Properties.Resources.arrowright; - this.eventShiftRightButton.Location = new System.Drawing.Point(1536, 287); - this.eventShiftRightButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.eventShiftRightButton.Location = new System.Drawing.Point(1152, 233); this.eventShiftRightButton.Name = "eventShiftRightButton"; - this.eventShiftRightButton.Size = new System.Drawing.Size(33, 192); + this.eventShiftRightButton.Size = new System.Drawing.Size(25, 156); this.eventShiftRightButton.TabIndex = 45; this.eventShiftRightButton.UseVisualStyleBackColor = true; this.eventShiftRightButton.Click += new System.EventHandler(this.eventShiftRightButton_Click); @@ -7378,10 +6877,9 @@ // this.eventShiftLeftButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; this.eventShiftLeftButton.Image = global::DSPRE.Properties.Resources.arrowleft; - this.eventShiftLeftButton.Location = new System.Drawing.Point(760, 287); - this.eventShiftLeftButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.eventShiftLeftButton.Location = new System.Drawing.Point(570, 233); this.eventShiftLeftButton.Name = "eventShiftLeftButton"; - this.eventShiftLeftButton.Size = new System.Drawing.Size(33, 192); + this.eventShiftLeftButton.Size = new System.Drawing.Size(25, 156); this.eventShiftLeftButton.TabIndex = 44; this.eventShiftLeftButton.UseVisualStyleBackColor = true; this.eventShiftLeftButton.Click += new System.EventHandler(this.eventShiftLeftButton_Click); @@ -7390,10 +6888,9 @@ // this.eventShiftUpButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; this.eventShiftUpButton.Image = global::DSPRE.Properties.Resources.arrowup; - this.eventShiftUpButton.Location = new System.Drawing.Point(1060, 10); - this.eventShiftUpButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.eventShiftUpButton.Location = new System.Drawing.Point(795, 8); this.eventShiftUpButton.Name = "eventShiftUpButton"; - this.eventShiftUpButton.Size = new System.Drawing.Size(208, 31); + this.eventShiftUpButton.Size = new System.Drawing.Size(156, 25); this.eventShiftUpButton.TabIndex = 43; this.eventShiftUpButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.eventShiftUpButton.UseVisualStyleBackColor = true; @@ -7403,10 +6900,9 @@ // this.eventShiftDownButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; this.eventShiftDownButton.Image = global::DSPRE.Properties.Resources.arrowdown; - this.eventShiftDownButton.Location = new System.Drawing.Point(1060, 725); - this.eventShiftDownButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.eventShiftDownButton.Location = new System.Drawing.Point(795, 589); this.eventShiftDownButton.Name = "eventShiftDownButton"; - this.eventShiftDownButton.Size = new System.Drawing.Size(208, 31); + this.eventShiftDownButton.Size = new System.Drawing.Size(156, 25); this.eventShiftDownButton.TabIndex = 42; this.eventShiftDownButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.eventShiftDownButton.UseVisualStyleBackColor = true; @@ -7416,10 +6912,9 @@ // this.exportEventFileButton.Image = global::DSPRE.Properties.Resources.exportArrow; this.exportEventFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.exportEventFileButton.Location = new System.Drawing.Point(355, 11); - this.exportEventFileButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.exportEventFileButton.Location = new System.Drawing.Point(266, 9); this.exportEventFileButton.Name = "exportEventFileButton"; - this.exportEventFileButton.Size = new System.Drawing.Size(112, 64); + this.exportEventFileButton.Size = new System.Drawing.Size(84, 52); this.exportEventFileButton.TabIndex = 36; this.exportEventFileButton.Text = "Export"; this.exportEventFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -7430,10 +6925,9 @@ // this.importEventFileButton.Image = global::DSPRE.Properties.Resources.importArrow; this.importEventFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.importEventFileButton.Location = new System.Drawing.Point(237, 11); - this.importEventFileButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.importEventFileButton.Location = new System.Drawing.Point(178, 9); this.importEventFileButton.Name = "importEventFileButton"; - this.importEventFileButton.Size = new System.Drawing.Size(112, 64); + this.importEventFileButton.Size = new System.Drawing.Size(84, 52); this.importEventFileButton.TabIndex = 35; this.importEventFileButton.Text = "Import"; this.importEventFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -7444,10 +6938,9 @@ // this.saveEventsButton.Image = global::DSPRE.Properties.Resources.saveButton; this.saveEventsButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.saveEventsButton.Location = new System.Drawing.Point(12, 44); - this.saveEventsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.saveEventsButton.Location = new System.Drawing.Point(9, 36); this.saveEventsButton.Name = "saveEventsButton"; - this.saveEventsButton.Size = new System.Drawing.Size(221, 31); + this.saveEventsButton.Size = new System.Drawing.Size(166, 25); this.saveEventsButton.TabIndex = 34; this.saveEventsButton.Text = "Save Event File"; this.saveEventsButton.UseVisualStyleBackColor = true; @@ -7461,11 +6954,10 @@ this.textEditorTabPage.Controls.Add(this.removeStringButton); this.textEditorTabPage.Controls.Add(this.addStringButton); this.textEditorTabPage.ImageIndex = 4; - this.textEditorTabPage.Location = new System.Drawing.Point(4, 25); - this.textEditorTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textEditorTabPage.Location = new System.Drawing.Point(4, 23); this.textEditorTabPage.Name = "textEditorTabPage"; - this.textEditorTabPage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.textEditorTabPage.Size = new System.Drawing.Size(1583, 835); + this.textEditorTabPage.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.textEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.textEditorTabPage.TabIndex = 5; this.textEditorTabPage.Text = "Text Editor"; this.textEditorTabPage.UseVisualStyleBackColor = true; @@ -7476,14 +6968,14 @@ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanel1.Controls.Add(this.label6, 0, 0); this.tableLayoutPanel1.Controls.Add(this.selectedLineMoveUpButton, 8, 1); @@ -7496,34 +6988,31 @@ this.tableLayoutPanel1.Controls.Add(this.removeMessageFileButton, 5, 1); this.tableLayoutPanel1.Controls.Add(this.selectedLineMoveDownButton, 9, 1); this.tableLayoutPanel1.Controls.Add(this.LineNumbersFormatgroupBox, 11, 1); - this.tableLayoutPanel1.Location = new System.Drawing.Point(16, 5); - this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tableLayoutPanel1.Location = new System.Drawing.Point(12, 4); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 3; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.Size = new System.Drawing.Size(1548, 86); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1161, 70); this.tableLayoutPanel1.TabIndex = 66; // // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(4, 0); - this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label6.Location = new System.Drawing.Point(3, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(81, 16); + this.label6.Size = new System.Drawing.Size(67, 13); this.label6.TabIndex = 18; this.label6.Text = "Text Archive"; // // selectedLineMoveUpButton // this.selectedLineMoveUpButton.Image = global::DSPRE.Properties.Resources.arrowup; - this.selectedLineMoveUpButton.Location = new System.Drawing.Point(907, 20); - this.selectedLineMoveUpButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.selectedLineMoveUpButton.Location = new System.Drawing.Point(681, 16); this.selectedLineMoveUpButton.Name = "selectedLineMoveUpButton"; this.tableLayoutPanel1.SetRowSpan(this.selectedLineMoveUpButton, 2); - this.selectedLineMoveUpButton.Size = new System.Drawing.Size(56, 49); + this.selectedLineMoveUpButton.Size = new System.Drawing.Size(42, 40); this.selectedLineMoveUpButton.TabIndex = 65; this.selectedLineMoveUpButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.toolTip1.SetToolTip(this.selectedLineMoveUpButton, "Shift up selected line"); @@ -7534,21 +7023,19 @@ // this.selectTextFileComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.selectTextFileComboBox.FormattingEnabled = true; - this.selectTextFileComboBox.Location = new System.Drawing.Point(4, 20); - this.selectTextFileComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.selectTextFileComboBox.Location = new System.Drawing.Point(3, 16); this.selectTextFileComboBox.Name = "selectTextFileComboBox"; - this.selectTextFileComboBox.Size = new System.Drawing.Size(244, 24); + this.selectTextFileComboBox.Size = new System.Drawing.Size(184, 21); this.selectTextFileComboBox.TabIndex = 17; this.selectTextFileComboBox.SelectedIndexChanged += new System.EventHandler(this.selectTextFileComboBox_SelectedIndexChanged); // // locateCurrentTextArchive // this.locateCurrentTextArchive.Image = global::DSPRE.Properties.Resources.open_file; - this.locateCurrentTextArchive.Location = new System.Drawing.Point(816, 20); - this.locateCurrentTextArchive.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.locateCurrentTextArchive.Location = new System.Drawing.Point(613, 16); this.locateCurrentTextArchive.Name = "locateCurrentTextArchive"; this.tableLayoutPanel1.SetRowSpan(this.locateCurrentTextArchive, 2); - this.locateCurrentTextArchive.Size = new System.Drawing.Size(56, 49); + this.locateCurrentTextArchive.Size = new System.Drawing.Size(42, 40); this.locateCurrentTextArchive.TabIndex = 64; this.locateCurrentTextArchive.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.locateCurrentTextArchive.UseVisualStyleBackColor = true; @@ -7559,10 +7046,9 @@ this.saveTextArchiveButton.Dock = System.Windows.Forms.DockStyle.Fill; this.saveTextArchiveButton.Image = global::DSPRE.Properties.Resources.saveButton; this.saveTextArchiveButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.saveTextArchiveButton.Location = new System.Drawing.Point(4, 52); - this.saveTextArchiveButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.saveTextArchiveButton.Location = new System.Drawing.Point(3, 43); this.saveTextArchiveButton.Name = "saveTextArchiveButton"; - this.saveTextArchiveButton.Size = new System.Drawing.Size(245, 34); + this.saveTextArchiveButton.Size = new System.Drawing.Size(184, 30); this.saveTextArchiveButton.TabIndex = 21; this.saveTextArchiveButton.Text = "&Save Current Archive"; this.saveTextArchiveButton.UseVisualStyleBackColor = true; @@ -7573,11 +7059,10 @@ this.importTextFileButton.Dock = System.Windows.Forms.DockStyle.Fill; this.importTextFileButton.Image = global::DSPRE.Properties.Resources.importArrow; this.importTextFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.importTextFileButton.Location = new System.Drawing.Point(257, 20); - this.importTextFileButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.importTextFileButton.Location = new System.Drawing.Point(193, 16); this.importTextFileButton.Name = "importTextFileButton"; this.tableLayoutPanel1.SetRowSpan(this.importTextFileButton, 2); - this.importTextFileButton.Size = new System.Drawing.Size(125, 66); + this.importTextFileButton.Size = new System.Drawing.Size(94, 57); this.importTextFileButton.TabIndex = 22; this.importTextFileButton.Text = "&Replace\r\nCurrent"; this.importTextFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -7589,11 +7074,10 @@ this.exportTextFileButton.Dock = System.Windows.Forms.DockStyle.Fill; this.exportTextFileButton.Image = global::DSPRE.Properties.Resources.exportArrow; this.exportTextFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.exportTextFileButton.Location = new System.Drawing.Point(390, 20); - this.exportTextFileButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.exportTextFileButton.Location = new System.Drawing.Point(293, 16); this.exportTextFileButton.Name = "exportTextFileButton"; this.tableLayoutPanel1.SetRowSpan(this.exportTextFileButton, 2); - this.exportTextFileButton.Size = new System.Drawing.Size(125, 66); + this.exportTextFileButton.Size = new System.Drawing.Size(94, 57); this.exportTextFileButton.TabIndex = 23; this.exportTextFileButton.Text = "&Export File"; this.exportTextFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -7605,11 +7089,10 @@ this.addTextArchiveButton.Dock = System.Windows.Forms.DockStyle.Fill; this.addTextArchiveButton.Image = global::DSPRE.Properties.Resources.addIcon; this.addTextArchiveButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addTextArchiveButton.Location = new System.Drawing.Point(550, 20); - this.addTextArchiveButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.addTextArchiveButton.Location = new System.Drawing.Point(413, 16); this.addTextArchiveButton.Name = "addTextArchiveButton"; this.tableLayoutPanel1.SetRowSpan(this.addTextArchiveButton, 2); - this.addTextArchiveButton.Size = new System.Drawing.Size(121, 66); + this.addTextArchiveButton.Size = new System.Drawing.Size(91, 57); this.addTextArchiveButton.TabIndex = 19; this.addTextArchiveButton.Text = "Add Text \r\nArchive"; this.addTextArchiveButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -7621,11 +7104,10 @@ this.removeMessageFileButton.Dock = System.Windows.Forms.DockStyle.Fill; this.removeMessageFileButton.Image = global::DSPRE.Properties.Resources.deleteIcon; this.removeMessageFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeMessageFileButton.Location = new System.Drawing.Point(679, 20); - this.removeMessageFileButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.removeMessageFileButton.Location = new System.Drawing.Point(510, 16); this.removeMessageFileButton.Name = "removeMessageFileButton"; this.tableLayoutPanel1.SetRowSpan(this.removeMessageFileButton, 2); - this.removeMessageFileButton.Size = new System.Drawing.Size(129, 66); + this.removeMessageFileButton.Size = new System.Drawing.Size(97, 57); this.removeMessageFileButton.TabIndex = 20; this.removeMessageFileButton.Text = "Remove \r\nLast Archive"; this.removeMessageFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -7635,11 +7117,10 @@ // selectedLineMoveDownButton // this.selectedLineMoveDownButton.Image = global::DSPRE.Properties.Resources.arrowdown; - this.selectedLineMoveDownButton.Location = new System.Drawing.Point(971, 20); - this.selectedLineMoveDownButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.selectedLineMoveDownButton.Location = new System.Drawing.Point(729, 16); this.selectedLineMoveDownButton.Name = "selectedLineMoveDownButton"; this.tableLayoutPanel1.SetRowSpan(this.selectedLineMoveDownButton, 2); - this.selectedLineMoveDownButton.Size = new System.Drawing.Size(56, 49); + this.selectedLineMoveDownButton.Size = new System.Drawing.Size(42, 40); this.selectedLineMoveDownButton.TabIndex = 66; this.selectedLineMoveDownButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.toolTip1.SetToolTip(this.selectedLineMoveDownButton, "Shift down selected line"); @@ -7650,12 +7131,10 @@ // this.LineNumbersFormatgroupBox.Controls.Add(this.decimalRadioButton); this.LineNumbersFormatgroupBox.Controls.Add(this.hexRadiobutton); - this.LineNumbersFormatgroupBox.Location = new System.Drawing.Point(1062, 20); - this.LineNumbersFormatgroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.LineNumbersFormatgroupBox.Location = new System.Drawing.Point(797, 16); this.LineNumbersFormatgroupBox.Name = "LineNumbersFormatgroupBox"; - this.LineNumbersFormatgroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tableLayoutPanel1.SetRowSpan(this.LineNumbersFormatgroupBox, 2); - this.LineNumbersFormatgroupBox.Size = new System.Drawing.Size(179, 43); + this.LineNumbersFormatgroupBox.Size = new System.Drawing.Size(134, 35); this.LineNumbersFormatgroupBox.TabIndex = 34; this.LineNumbersFormatgroupBox.TabStop = false; this.LineNumbersFormatgroupBox.Text = "Line Number Format"; @@ -7664,10 +7143,9 @@ // this.decimalRadioButton.AutoSize = true; this.decimalRadioButton.Checked = true; - this.decimalRadioButton.Location = new System.Drawing.Point(91, 17); - this.decimalRadioButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.decimalRadioButton.Location = new System.Drawing.Point(68, 14); this.decimalRadioButton.Name = "decimalRadioButton"; - this.decimalRadioButton.Size = new System.Drawing.Size(78, 20); + this.decimalRadioButton.Size = new System.Drawing.Size(63, 17); this.decimalRadioButton.TabIndex = 35; this.decimalRadioButton.TabStop = true; this.decimalRadioButton.Text = "Decimal"; @@ -7676,10 +7154,9 @@ // hexRadiobutton // this.hexRadiobutton.AutoSize = true; - this.hexRadiobutton.Location = new System.Drawing.Point(8, 17); - this.hexRadiobutton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.hexRadiobutton.Location = new System.Drawing.Point(6, 14); this.hexRadiobutton.Name = "hexRadiobutton"; - this.hexRadiobutton.Size = new System.Drawing.Size(52, 20); + this.hexRadiobutton.Size = new System.Drawing.Size(44, 17); this.hexRadiobutton.TabIndex = 34; this.hexRadiobutton.Text = "Hex"; this.hexRadiobutton.UseVisualStyleBackColor = true; @@ -7700,11 +7177,9 @@ this.groupBox13.Controls.Add(this.searchMessageTextBox); this.groupBox13.Controls.Add(this.searchMessageButton); this.groupBox13.Controls.Add(this.replaceMessageButton); - this.groupBox13.Location = new System.Drawing.Point(1188, 92); - this.groupBox13.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox13.Location = new System.Drawing.Point(891, 75); this.groupBox13.Name = "groupBox13"; - this.groupBox13.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox13.Size = new System.Drawing.Size(376, 618); + this.groupBox13.Size = new System.Drawing.Size(282, 502); this.groupBox13.TabIndex = 31; this.groupBox13.TabStop = false; this.groupBox13.Text = "Search / Replace"; @@ -7714,10 +7189,9 @@ this.label67.AutoSize = true; this.label67.Enabled = false; this.label67.ForeColor = System.Drawing.SystemColors.ControlDark; - this.label67.Location = new System.Drawing.Point(253, 164); - this.label67.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label67.Location = new System.Drawing.Point(190, 133); this.label67.Name = "label67"; - this.label67.Size = new System.Drawing.Size(94, 16); + this.label67.Size = new System.Drawing.Size(74, 13); this.label67.TabIndex = 41; this.label67.Text = "[Coming soon]"; // @@ -7726,10 +7200,9 @@ this.searchAllArchivesCheckBox.AutoSize = true; this.searchAllArchivesCheckBox.Checked = true; this.searchAllArchivesCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; - this.searchAllArchivesCheckBox.Location = new System.Drawing.Point(253, 27); - this.searchAllArchivesCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.searchAllArchivesCheckBox.Location = new System.Drawing.Point(190, 22); this.searchAllArchivesCheckBox.Name = "searchAllArchivesCheckBox"; - this.searchAllArchivesCheckBox.Size = new System.Drawing.Size(99, 20); + this.searchAllArchivesCheckBox.Size = new System.Drawing.Size(81, 17); this.searchAllArchivesCheckBox.TabIndex = 40; this.searchAllArchivesCheckBox.Text = "All Archives"; this.searchAllArchivesCheckBox.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -7739,10 +7212,9 @@ // this.caseSensitiveTextReplaceCheckbox.AutoSize = true; this.caseSensitiveTextReplaceCheckbox.Enabled = false; - this.caseSensitiveTextReplaceCheckbox.Location = new System.Drawing.Point(253, 142); - this.caseSensitiveTextReplaceCheckbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.caseSensitiveTextReplaceCheckbox.Location = new System.Drawing.Point(190, 115); this.caseSensitiveTextReplaceCheckbox.Name = "caseSensitiveTextReplaceCheckbox"; - this.caseSensitiveTextReplaceCheckbox.Size = new System.Drawing.Size(96, 20); + this.caseSensitiveTextReplaceCheckbox.Size = new System.Drawing.Size(77, 17); this.caseSensitiveTextReplaceCheckbox.TabIndex = 39; this.caseSensitiveTextReplaceCheckbox.Text = "Copy Case"; this.caseSensitiveTextReplaceCheckbox.UseVisualStyleBackColor = true; @@ -7750,11 +7222,10 @@ // textSearchResultsListBox // this.textSearchResultsListBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textSearchResultsListBox.ItemHeight = 18; - this.textSearchResultsListBox.Location = new System.Drawing.Point(12, 224); - this.textSearchResultsListBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textSearchResultsListBox.ItemHeight = 15; + this.textSearchResultsListBox.Location = new System.Drawing.Point(9, 182); this.textSearchResultsListBox.Name = "textSearchResultsListBox"; - this.textSearchResultsListBox.Size = new System.Drawing.Size(355, 310); + this.textSearchResultsListBox.Size = new System.Drawing.Size(267, 244); this.textSearchResultsListBox.TabIndex = 38; this.textSearchResultsListBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textSearchResultsListBox_KeyDown); this.textSearchResultsListBox.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.textSearchResultsListBox_GoToEntryResult); @@ -7762,48 +7233,43 @@ // replaceTextLabel // this.replaceTextLabel.AutoSize = true; - this.replaceTextLabel.Location = new System.Drawing.Point(8, 107); - this.replaceTextLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.replaceTextLabel.Location = new System.Drawing.Point(6, 87); this.replaceTextLabel.Name = "replaceTextLabel"; - this.replaceTextLabel.Size = new System.Drawing.Size(114, 16); + this.replaceTextLabel.Size = new System.Drawing.Size(93, 13); this.replaceTextLabel.TabIndex = 37; this.replaceTextLabel.Text = "Replacement text:"; // // replaceMessageTextBox // - this.replaceMessageTextBox.Location = new System.Drawing.Point(11, 127); - this.replaceMessageTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.replaceMessageTextBox.Location = new System.Drawing.Point(8, 103); this.replaceMessageTextBox.MaxLength = 100; this.replaceMessageTextBox.Name = "replaceMessageTextBox"; - this.replaceMessageTextBox.Size = new System.Drawing.Size(229, 22); + this.replaceMessageTextBox.Size = new System.Drawing.Size(173, 20); this.replaceMessageTextBox.TabIndex = 36; // // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(8, 554); - this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label8.Location = new System.Drawing.Point(6, 450); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(62, 16); + this.label8.Size = new System.Drawing.Size(48, 13); this.label8.TabIndex = 35; this.label8.Text = "Progress"; // // textSearchProgressBar // - this.textSearchProgressBar.Location = new System.Drawing.Point(12, 574); - this.textSearchProgressBar.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textSearchProgressBar.Location = new System.Drawing.Point(9, 466); this.textSearchProgressBar.Name = "textSearchProgressBar"; - this.textSearchProgressBar.Size = new System.Drawing.Size(356, 33); + this.textSearchProgressBar.Size = new System.Drawing.Size(267, 27); this.textSearchProgressBar.Style = System.Windows.Forms.ProgressBarStyle.Continuous; this.textSearchProgressBar.TabIndex = 34; // // caseSensitiveTextSearchCheckbox // this.caseSensitiveTextSearchCheckbox.AutoSize = true; - this.caseSensitiveTextSearchCheckbox.Location = new System.Drawing.Point(253, 62); - this.caseSensitiveTextSearchCheckbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.caseSensitiveTextSearchCheckbox.Location = new System.Drawing.Point(190, 50); this.caseSensitiveTextSearchCheckbox.Name = "caseSensitiveTextSearchCheckbox"; - this.caseSensitiveTextSearchCheckbox.Size = new System.Drawing.Size(100, 20); + this.caseSensitiveTextSearchCheckbox.Size = new System.Drawing.Size(83, 17); this.caseSensitiveTextSearchCheckbox.TabIndex = 33; this.caseSensitiveTextSearchCheckbox.Text = "Match Case"; this.caseSensitiveTextSearchCheckbox.UseVisualStyleBackColor = true; @@ -7811,20 +7277,18 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(7, 204); - this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label7.Location = new System.Drawing.Point(5, 166); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(52, 16); + this.label7.Size = new System.Drawing.Size(42, 13); this.label7.TabIndex = 32; this.label7.Text = "Results"; // // searchMessageTextBox // - this.searchMessageTextBox.Location = new System.Drawing.Point(8, 25); - this.searchMessageTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.searchMessageTextBox.Location = new System.Drawing.Point(6, 20); this.searchMessageTextBox.MaxLength = 100; this.searchMessageTextBox.Name = "searchMessageTextBox"; - this.searchMessageTextBox.Size = new System.Drawing.Size(232, 22); + this.searchMessageTextBox.Size = new System.Drawing.Size(175, 20); this.searchMessageTextBox.TabIndex = 27; this.searchMessageTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.searchMessageTextBox_KeyDown); // @@ -7832,10 +7296,9 @@ // this.searchMessageButton.Image = global::DSPRE.Properties.Resources.SearchMiniIcon; this.searchMessageButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.searchMessageButton.Location = new System.Drawing.Point(8, 54); - this.searchMessageButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.searchMessageButton.Location = new System.Drawing.Point(6, 44); this.searchMessageButton.Name = "searchMessageButton"; - this.searchMessageButton.Size = new System.Drawing.Size(233, 33); + this.searchMessageButton.Size = new System.Drawing.Size(175, 27); this.searchMessageButton.TabIndex = 30; this.searchMessageButton.Text = "Search"; this.searchMessageButton.UseVisualStyleBackColor = true; @@ -7843,10 +7306,9 @@ // // replaceMessageButton // - this.replaceMessageButton.Location = new System.Drawing.Point(11, 156); - this.replaceMessageButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.replaceMessageButton.Location = new System.Drawing.Point(8, 127); this.replaceMessageButton.Name = "replaceMessageButton"; - this.replaceMessageButton.Size = new System.Drawing.Size(231, 33); + this.replaceMessageButton.Size = new System.Drawing.Size(173, 27); this.replaceMessageButton.TabIndex = 30; this.replaceMessageButton.Text = "Search and Replace All"; this.replaceMessageButton.UseVisualStyleBackColor = true; @@ -7867,13 +7329,12 @@ this.textEditorDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; this.textEditorDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.messageColumn}); - this.textEditorDataGridView.Location = new System.Drawing.Point(16, 95); - this.textEditorDataGridView.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textEditorDataGridView.Location = new System.Drawing.Point(12, 77); this.textEditorDataGridView.Name = "textEditorDataGridView"; this.textEditorDataGridView.RowHeadersWidth = 68; 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(1164, 615); + this.textEditorDataGridView.Size = new System.Drawing.Size(873, 500); this.textEditorDataGridView.TabIndex = 24; this.textEditorDataGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.textEditorDataGridView_CellValueChanged); this.textEditorDataGridView.CurrentCellChanged += new System.EventHandler(this.textEditorDataGridView_CurrentCellChanged); @@ -7885,16 +7346,15 @@ this.messageColumn.MinimumWidth = 6; this.messageColumn.Name = "messageColumn"; this.messageColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.messageColumn.Width = 70; + this.messageColumn.Width = 56; // // removeStringButton // this.removeStringButton.Image = global::DSPRE.Properties.Resources.deleteIcon; this.removeStringButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeStringButton.Location = new System.Drawing.Point(151, 714); - this.removeStringButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.removeStringButton.Location = new System.Drawing.Point(113, 580); this.removeStringButton.Name = "removeStringButton"; - this.removeStringButton.Size = new System.Drawing.Size(165, 42); + this.removeStringButton.Size = new System.Drawing.Size(124, 34); this.removeStringButton.TabIndex = 26; this.removeStringButton.Text = "Remove Last Line"; this.removeStringButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -7905,10 +7365,9 @@ // this.addStringButton.Image = global::DSPRE.Properties.Resources.addIcon; this.addStringButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addStringButton.Location = new System.Drawing.Point(16, 714); - this.addStringButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.addStringButton.Location = new System.Drawing.Point(12, 580); this.addStringButton.Name = "addStringButton"; - this.addStringButton.Size = new System.Drawing.Size(127, 42); + this.addStringButton.Size = new System.Drawing.Size(95, 34); this.addStringButton.TabIndex = 25; this.addStringButton.Text = "&Append Line"; this.addStringButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -7922,10 +7381,9 @@ this.cameraEditorTabPage.Controls.Add(this.saveCameraTableButton); this.cameraEditorTabPage.Controls.Add(this.cameraEditorDataGridView); this.cameraEditorTabPage.ImageIndex = 7; - this.cameraEditorTabPage.Location = new System.Drawing.Point(4, 25); - this.cameraEditorTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.cameraEditorTabPage.Location = new System.Drawing.Point(4, 23); this.cameraEditorTabPage.Name = "cameraEditorTabPage"; - this.cameraEditorTabPage.Size = new System.Drawing.Size(1583, 835); + this.cameraEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.cameraEditorTabPage.TabIndex = 7; this.cameraEditorTabPage.Text = "Camera Editor"; this.cameraEditorTabPage.UseVisualStyleBackColor = true; @@ -7934,10 +7392,9 @@ // this.exportCameraTableButton.Image = global::DSPRE.Properties.Resources.exportArrow; this.exportCameraTableButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.exportCameraTableButton.Location = new System.Drawing.Point(4, 693); - this.exportCameraTableButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.exportCameraTableButton.Location = new System.Drawing.Point(3, 563); this.exportCameraTableButton.Name = "exportCameraTableButton"; - this.exportCameraTableButton.Size = new System.Drawing.Size(153, 55); + this.exportCameraTableButton.Size = new System.Drawing.Size(115, 45); this.exportCameraTableButton.TabIndex = 16; this.exportCameraTableButton.Text = "Export \r\nCamera Table"; this.exportCameraTableButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -7948,10 +7405,9 @@ // this.importCameraTableButton.Image = global::DSPRE.Properties.Resources.importArrow; this.importCameraTableButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.importCameraTableButton.Location = new System.Drawing.Point(164, 693); - this.importCameraTableButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.importCameraTableButton.Location = new System.Drawing.Point(123, 563); this.importCameraTableButton.Name = "importCameraTableButton"; - this.importCameraTableButton.Size = new System.Drawing.Size(153, 55); + this.importCameraTableButton.Size = new System.Drawing.Size(115, 45); this.importCameraTableButton.TabIndex = 14; this.importCameraTableButton.Text = "Import\r\nCamera Table"; this.importCameraTableButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -7962,10 +7418,9 @@ // this.saveCameraTableButton.Image = global::DSPRE.Properties.Resources.save_rom; this.saveCameraTableButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.saveCameraTableButton.Location = new System.Drawing.Point(1413, 693); - this.saveCameraTableButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.saveCameraTableButton.Location = new System.Drawing.Point(1060, 563); this.saveCameraTableButton.Name = "saveCameraTableButton"; - this.saveCameraTableButton.Size = new System.Drawing.Size(153, 55); + this.saveCameraTableButton.Size = new System.Drawing.Size(115, 45); this.saveCameraTableButton.TabIndex = 15; this.saveCameraTableButton.Text = "&Save \r\nCam Table"; this.saveCameraTableButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -8000,15 +7455,14 @@ this.ZDispGVCol, this.ExportBTN, this.ImportBTN}); - this.cameraEditorDataGridView.Location = new System.Drawing.Point(7, 5); - this.cameraEditorDataGridView.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.cameraEditorDataGridView.Location = new System.Drawing.Point(5, 4); this.cameraEditorDataGridView.MultiSelect = false; this.cameraEditorDataGridView.Name = "cameraEditorDataGridView"; this.cameraEditorDataGridView.RowHeadersWidth = 60; this.cameraEditorDataGridView.RowTemplate.DividerHeight = 1; this.cameraEditorDataGridView.RowTemplate.Height = 32; this.cameraEditorDataGridView.ScrollBars = System.Windows.Forms.ScrollBars.None; - this.cameraEditorDataGridView.Size = new System.Drawing.Size(1563, 678); + this.cameraEditorDataGridView.Size = new System.Drawing.Size(1172, 551); this.cameraEditorDataGridView.TabIndex = 0; this.cameraEditorDataGridView.TabStop = false; this.cameraEditorDataGridView.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.cameraEditorDataGridView_CellContentClick); @@ -8130,10 +7584,9 @@ this.trainerEditorTabPage.Controls.Add(this.trainerComboBox); this.trainerEditorTabPage.Controls.Add(this.trainerSaveCurrentButton); this.trainerEditorTabPage.ImageIndex = 8; - this.trainerEditorTabPage.Location = new System.Drawing.Point(4, 25); - this.trainerEditorTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.trainerEditorTabPage.Location = new System.Drawing.Point(4, 23); this.trainerEditorTabPage.Name = "trainerEditorTabPage"; - this.trainerEditorTabPage.Size = new System.Drawing.Size(1583, 835); + this.trainerEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.trainerEditorTabPage.TabIndex = 8; this.trainerEditorTabPage.Text = "Trainer Editor"; this.trainerEditorTabPage.UseVisualStyleBackColor = true; @@ -8142,16 +7595,15 @@ // this.tableLayoutPanel4.ColumnCount = 1; this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 47.0167F)); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27F)); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tableLayoutPanel4.Controls.Add(this.exportTrainerButton, 0, 0); this.tableLayoutPanel4.Controls.Add(this.importTrainerButton, 0, 1); - this.tableLayoutPanel4.Location = new System.Drawing.Point(292, 18); - this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tableLayoutPanel4.Location = new System.Drawing.Point(219, 15); this.tableLayoutPanel4.Name = "tableLayoutPanel4"; this.tableLayoutPanel4.RowCount = 2; this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel4.Size = new System.Drawing.Size(171, 76); + this.tableLayoutPanel4.Size = new System.Drawing.Size(128, 62); this.tableLayoutPanel4.TabIndex = 47; // // exportTrainerButton @@ -8159,10 +7611,9 @@ this.exportTrainerButton.Dock = System.Windows.Forms.DockStyle.Fill; this.exportTrainerButton.Image = global::DSPRE.Properties.Resources.exportArrow; this.exportTrainerButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.exportTrainerButton.Location = new System.Drawing.Point(4, 4); - this.exportTrainerButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.exportTrainerButton.Location = new System.Drawing.Point(3, 3); this.exportTrainerButton.Name = "exportTrainerButton"; - this.exportTrainerButton.Size = new System.Drawing.Size(163, 30); + this.exportTrainerButton.Size = new System.Drawing.Size(122, 25); this.exportTrainerButton.TabIndex = 42; this.exportTrainerButton.Text = "Export Full"; this.exportTrainerButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -8174,10 +7625,9 @@ this.importTrainerButton.Dock = System.Windows.Forms.DockStyle.Fill; this.importTrainerButton.Image = global::DSPRE.Properties.Resources.importArrow; this.importTrainerButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.importTrainerButton.Location = new System.Drawing.Point(4, 42); - this.importTrainerButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.importTrainerButton.Location = new System.Drawing.Point(3, 34); this.importTrainerButton.Name = "importTrainerButton"; - this.importTrainerButton.Size = new System.Drawing.Size(163, 30); + this.importTrainerButton.Size = new System.Drawing.Size(122, 25); this.importTrainerButton.TabIndex = 43; this.importTrainerButton.Text = "Replace Full"; this.importTrainerButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -8195,11 +7645,9 @@ this.groupBox28.Controls.Add(this.party3GroupBox); this.groupBox28.Controls.Add(this.party2GroupBox); this.groupBox28.Controls.Add(this.party1GroupBox); - this.groupBox28.Location = new System.Drawing.Point(585, 4); - this.groupBox28.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox28.Location = new System.Drawing.Point(439, 3); this.groupBox28.Name = "groupBox28"; - this.groupBox28.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox28.Size = new System.Drawing.Size(975, 750); + this.groupBox28.Size = new System.Drawing.Size(731, 609); this.groupBox28.TabIndex = 32; this.groupBox28.TabStop = false; this.groupBox28.Text = "Party"; @@ -8209,16 +7657,15 @@ this.tableLayoutPanel6.ColumnCount = 2; this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.00001F)); - this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27F)); - this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27F)); + this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tableLayoutPanel6.Controls.Add(this.button3, 1, 0); this.tableLayoutPanel6.Controls.Add(this.button4, 0, 0); - this.tableLayoutPanel6.Location = new System.Drawing.Point(628, 12); - this.tableLayoutPanel6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tableLayoutPanel6.Location = new System.Drawing.Point(471, 10); this.tableLayoutPanel6.Name = "tableLayoutPanel6"; this.tableLayoutPanel6.RowCount = 1; this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel6.Size = new System.Drawing.Size(316, 36); + this.tableLayoutPanel6.Size = new System.Drawing.Size(237, 29); this.tableLayoutPanel6.TabIndex = 48; // // button3 @@ -8226,10 +7673,9 @@ this.button3.Dock = System.Windows.Forms.DockStyle.Fill; this.button3.Image = ((System.Drawing.Image)(resources.GetObject("button3.Image"))); this.button3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.button3.Location = new System.Drawing.Point(161, 4); - this.button3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.button3.Location = new System.Drawing.Point(121, 3); this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(151, 28); + this.button3.Size = new System.Drawing.Size(113, 23); this.button3.TabIndex = 41; this.button3.Text = "Replace Party"; this.button3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -8240,10 +7686,9 @@ this.button4.Dock = System.Windows.Forms.DockStyle.Fill; this.button4.Image = ((System.Drawing.Image)(resources.GetObject("button4.Image"))); this.button4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.button4.Location = new System.Drawing.Point(4, 4); - this.button4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.button4.Location = new System.Drawing.Point(3, 3); this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(149, 28); + this.button4.Size = new System.Drawing.Size(112, 23); this.button4.TabIndex = 38; this.button4.Text = "Export Party"; this.button4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -8253,10 +7698,9 @@ // this.DVExplainButton.Image = ((System.Drawing.Image)(resources.GetObject("DVExplainButton.Image"))); this.DVExplainButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.DVExplainButton.Location = new System.Drawing.Point(323, 14); - this.DVExplainButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.DVExplainButton.Location = new System.Drawing.Point(242, 11); this.DVExplainButton.Name = "DVExplainButton"; - this.DVExplainButton.Size = new System.Drawing.Size(157, 36); + this.DVExplainButton.Size = new System.Drawing.Size(118, 29); this.DVExplainButton.TabIndex = 45; this.DVExplainButton.Text = "Open DV Calculator"; this.DVExplainButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -8266,10 +7710,9 @@ // label74 // this.label74.AutoSize = true; - this.label74.Location = new System.Drawing.Point(329, 20); - this.label74.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label74.Location = new System.Drawing.Point(247, 16); this.label74.Name = "label74"; - this.label74.Size = new System.Drawing.Size(0, 16); + this.label74.Size = new System.Drawing.Size(0, 13); this.label74.TabIndex = 46; // // party6GroupBox @@ -8289,11 +7732,9 @@ this.party6GroupBox.Controls.Add(this.partyPokemon6PictureBox); this.party6GroupBox.Controls.Add(this.partyPokemon6ComboBox); this.party6GroupBox.Enabled = false; - this.party6GroupBox.Location = new System.Drawing.Point(495, 502); - this.party6GroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.party6GroupBox.Location = new System.Drawing.Point(371, 408); this.party6GroupBox.Name = "party6GroupBox"; - this.party6GroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.party6GroupBox.Size = new System.Drawing.Size(457, 225); + this.party6GroupBox.Size = new System.Drawing.Size(343, 183); this.party6GroupBox.TabIndex = 13; this.party6GroupBox.TabStop = false; this.party6GroupBox.Text = "Pokemon 6"; @@ -8304,39 +7745,35 @@ this.partyForm6ComboBox.FormattingEnabled = true; this.partyForm6ComboBox.Items.AddRange(new object[] { "Defense form"}); - this.partyForm6ComboBox.Location = new System.Drawing.Point(304, 186); - this.partyForm6ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyForm6ComboBox.Location = new System.Drawing.Point(228, 151); this.partyForm6ComboBox.Name = "partyForm6ComboBox"; - this.partyForm6ComboBox.Size = new System.Drawing.Size(136, 24); + this.partyForm6ComboBox.Size = new System.Drawing.Size(103, 21); this.partyForm6ComboBox.TabIndex = 20; // // partyAbility6ComboBox // this.partyAbility6ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.partyAbility6ComboBox.FormattingEnabled = true; - this.partyAbility6ComboBox.Location = new System.Drawing.Point(20, 186); - this.partyAbility6ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyAbility6ComboBox.Location = new System.Drawing.Point(15, 151); this.partyAbility6ComboBox.Name = "partyAbility6ComboBox"; - this.partyAbility6ComboBox.Size = new System.Drawing.Size(139, 24); + this.partyAbility6ComboBox.Size = new System.Drawing.Size(105, 21); this.partyAbility6ComboBox.TabIndex = 19; // // partyGender6ComboBox // this.partyGender6ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.partyGender6ComboBox.FormattingEnabled = true; - this.partyGender6ComboBox.Location = new System.Drawing.Point(168, 186); - this.partyGender6ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyGender6ComboBox.Location = new System.Drawing.Point(126, 151); this.partyGender6ComboBox.Name = "partyGender6ComboBox"; - this.partyGender6ComboBox.Size = new System.Drawing.Size(125, 24); + this.partyGender6ComboBox.Size = new System.Drawing.Size(95, 21); this.partyGender6ComboBox.TabIndex = 15; // // partyPokemonItemPictureBox6 // this.partyPokemonItemPictureBox6.Image = global::DSPRE.Properties.Resources.IconItem; - this.partyPokemonItemPictureBox6.Location = new System.Drawing.Point(264, 32); - this.partyPokemonItemPictureBox6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyPokemonItemPictureBox6.Location = new System.Drawing.Point(198, 26); this.partyPokemonItemPictureBox6.Name = "partyPokemonItemPictureBox6"; - this.partyPokemonItemPictureBox6.Size = new System.Drawing.Size(32, 31); + this.partyPokemonItemPictureBox6.Size = new System.Drawing.Size(24, 25); this.partyPokemonItemPictureBox6.TabIndex = 13; this.partyPokemonItemPictureBox6.TabStop = false; this.partyPokemonItemPictureBox6.Visible = false; @@ -8344,30 +7781,27 @@ // label60 // this.label60.AutoSize = true; - this.label60.Location = new System.Drawing.Point(16, 145); - this.label60.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label60.Location = new System.Drawing.Point(12, 118); this.label60.Name = "label60"; - this.label60.Size = new System.Drawing.Size(35, 32); + this.label60.Size = new System.Drawing.Size(28, 26); this.label60.TabIndex = 9; this.label60.Text = "Ball\r\nSeal"; // // label61 // this.label61.AutoSize = true; - this.label61.Location = new System.Drawing.Point(16, 116); - this.label61.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label61.Location = new System.Drawing.Point(12, 94); this.label61.Name = "label61"; - this.label61.Size = new System.Drawing.Size(26, 16); + this.label61.Size = new System.Drawing.Size(22, 13); this.label61.TabIndex = 8; this.label61.Text = "DV"; // // label62 // this.label62.AutoSize = true; - this.label62.Location = new System.Drawing.Point(16, 82); - this.label62.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label62.Location = new System.Drawing.Point(12, 67); this.label62.Name = "label62"; - this.label62.Size = new System.Drawing.Size(24, 16); + this.label62.Size = new System.Drawing.Size(22, 13); this.label62.TabIndex = 7; this.label62.Text = "Lv."; // @@ -8377,11 +7811,9 @@ this.poke6MovesGroupBox.Controls.Add(this.partyMove6_2ComboBox); this.poke6MovesGroupBox.Controls.Add(this.partyMove6_3ComboBox); this.poke6MovesGroupBox.Controls.Add(this.partyMove6_4ComboBox); - this.poke6MovesGroupBox.Location = new System.Drawing.Point(147, 70); - this.poke6MovesGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.poke6MovesGroupBox.Location = new System.Drawing.Point(110, 57); this.poke6MovesGroupBox.Name = "poke6MovesGroupBox"; - this.poke6MovesGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.poke6MovesGroupBox.Size = new System.Drawing.Size(303, 105); + this.poke6MovesGroupBox.Size = new System.Drawing.Size(227, 85); this.poke6MovesGroupBox.TabIndex = 6; this.poke6MovesGroupBox.TabStop = false; this.poke6MovesGroupBox.Text = "Moves"; @@ -8392,10 +7824,9 @@ this.partyMove6_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove6_1ComboBox.Enabled = false; this.partyMove6_1ComboBox.FormattingEnabled = true; - this.partyMove6_1ComboBox.Location = new System.Drawing.Point(13, 26); - this.partyMove6_1ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyMove6_1ComboBox.Location = new System.Drawing.Point(10, 21); this.partyMove6_1ComboBox.Name = "partyMove6_1ComboBox"; - this.partyMove6_1ComboBox.Size = new System.Drawing.Size(132, 24); + this.partyMove6_1ComboBox.Size = new System.Drawing.Size(100, 21); this.partyMove6_1ComboBox.TabIndex = 3; this.partyMove6_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -8405,10 +7836,9 @@ this.partyMove6_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove6_2ComboBox.Enabled = false; this.partyMove6_2ComboBox.FormattingEnabled = true; - this.partyMove6_2ComboBox.Location = new System.Drawing.Point(155, 26); - this.partyMove6_2ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyMove6_2ComboBox.Location = new System.Drawing.Point(116, 21); this.partyMove6_2ComboBox.Name = "partyMove6_2ComboBox"; - this.partyMove6_2ComboBox.Size = new System.Drawing.Size(132, 24); + this.partyMove6_2ComboBox.Size = new System.Drawing.Size(100, 21); this.partyMove6_2ComboBox.TabIndex = 6; this.partyMove6_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -8418,10 +7848,9 @@ this.partyMove6_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove6_3ComboBox.Enabled = false; this.partyMove6_3ComboBox.FormattingEnabled = true; - this.partyMove6_3ComboBox.Location = new System.Drawing.Point(13, 59); - this.partyMove6_3ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyMove6_3ComboBox.Location = new System.Drawing.Point(10, 48); this.partyMove6_3ComboBox.Name = "partyMove6_3ComboBox"; - this.partyMove6_3ComboBox.Size = new System.Drawing.Size(132, 24); + this.partyMove6_3ComboBox.Size = new System.Drawing.Size(100, 21); this.partyMove6_3ComboBox.TabIndex = 5; this.partyMove6_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -8431,37 +7860,34 @@ this.partyMove6_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove6_4ComboBox.Enabled = false; this.partyMove6_4ComboBox.FormattingEnabled = true; - this.partyMove6_4ComboBox.Location = new System.Drawing.Point(155, 59); - this.partyMove6_4ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyMove6_4ComboBox.Location = new System.Drawing.Point(116, 48); this.partyMove6_4ComboBox.Name = "partyMove6_4ComboBox"; - this.partyMove6_4ComboBox.Size = new System.Drawing.Size(132, 24); + this.partyMove6_4ComboBox.Size = new System.Drawing.Size(100, 21); this.partyMove6_4ComboBox.TabIndex = 7; this.partyMove6_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // // partyIV6UpDown // - this.partyIV6UpDown.Location = new System.Drawing.Point(64, 113); - this.partyIV6UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyIV6UpDown.Location = new System.Drawing.Point(48, 92); this.partyIV6UpDown.Maximum = new decimal(new int[] { 255, 0, 0, 0}); this.partyIV6UpDown.Name = "partyIV6UpDown"; - this.partyIV6UpDown.Size = new System.Drawing.Size(65, 22); + this.partyIV6UpDown.Size = new System.Drawing.Size(49, 20); this.partyIV6UpDown.TabIndex = 5; // // partyLevel6UpDown // - this.partyLevel6UpDown.Location = new System.Drawing.Point(64, 78); - this.partyLevel6UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyLevel6UpDown.Location = new System.Drawing.Point(48, 63); this.partyLevel6UpDown.Minimum = new decimal(new int[] { 1, 0, 0, 0}); this.partyLevel6UpDown.Name = "partyLevel6UpDown"; - this.partyLevel6UpDown.Size = new System.Drawing.Size(65, 22); + this.partyLevel6UpDown.Size = new System.Drawing.Size(49, 20); this.partyLevel6UpDown.TabIndex = 4; this.partyLevel6UpDown.Value = new decimal(new int[] { 1, @@ -8471,15 +7897,14 @@ // // partyBall6UpDown // - this.partyBall6UpDown.Location = new System.Drawing.Point(64, 149); - this.partyBall6UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyBall6UpDown.Location = new System.Drawing.Point(48, 121); this.partyBall6UpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.partyBall6UpDown.Name = "partyBall6UpDown"; - this.partyBall6UpDown.Size = new System.Drawing.Size(65, 22); + this.partyBall6UpDown.Size = new System.Drawing.Size(49, 20); this.partyBall6UpDown.TabIndex = 3; // // partyItem6ComboBox @@ -8488,19 +7913,17 @@ this.partyItem6ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyItem6ComboBox.Enabled = false; this.partyItem6ComboBox.FormattingEnabled = true; - this.partyItem6ComboBox.Location = new System.Drawing.Point(304, 34); - this.partyItem6ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyItem6ComboBox.Location = new System.Drawing.Point(228, 28); this.partyItem6ComboBox.Name = "partyItem6ComboBox"; - this.partyItem6ComboBox.Size = new System.Drawing.Size(136, 24); + this.partyItem6ComboBox.Size = new System.Drawing.Size(103, 21); this.partyItem6ComboBox.TabIndex = 2; this.partyItem6ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem6ComboBox_SelectedIndexChanged); // // partyPokemon6PictureBox // - this.partyPokemon6PictureBox.Location = new System.Drawing.Point(15, 28); - this.partyPokemon6PictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyPokemon6PictureBox.Location = new System.Drawing.Point(11, 23); this.partyPokemon6PictureBox.Name = "partyPokemon6PictureBox"; - this.partyPokemon6PictureBox.Size = new System.Drawing.Size(53, 37); + this.partyPokemon6PictureBox.Size = new System.Drawing.Size(40, 30); this.partyPokemon6PictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.partyPokemon6PictureBox.TabIndex = 1; this.partyPokemon6PictureBox.TabStop = false; @@ -8510,10 +7933,9 @@ this.partyPokemon6ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.partyPokemon6ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyPokemon6ComboBox.FormattingEnabled = true; - this.partyPokemon6ComboBox.Location = new System.Drawing.Point(77, 34); - this.partyPokemon6ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyPokemon6ComboBox.Location = new System.Drawing.Point(58, 28); this.partyPokemon6ComboBox.Name = "partyPokemon6ComboBox"; - this.partyPokemon6ComboBox.Size = new System.Drawing.Size(167, 24); + this.partyPokemon6ComboBox.Size = new System.Drawing.Size(126, 21); this.partyPokemon6ComboBox.TabIndex = 0; this.partyPokemon6ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon6ComboBox_SelectedIndexChanged); // @@ -8534,11 +7956,9 @@ this.party5GroupBox.Controls.Add(this.partyPokemon5PictureBox); this.party5GroupBox.Controls.Add(this.partyPokemon5ComboBox); this.party5GroupBox.Enabled = false; - this.party5GroupBox.Location = new System.Drawing.Point(21, 502); - this.party5GroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.party5GroupBox.Location = new System.Drawing.Point(16, 408); this.party5GroupBox.Name = "party5GroupBox"; - this.party5GroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.party5GroupBox.Size = new System.Drawing.Size(457, 225); + this.party5GroupBox.Size = new System.Drawing.Size(343, 183); this.party5GroupBox.TabIndex = 12; this.party5GroupBox.TabStop = false; this.party5GroupBox.Text = "Pokemon 5"; @@ -8549,39 +7969,35 @@ this.partyForm5ComboBox.FormattingEnabled = true; this.partyForm5ComboBox.Items.AddRange(new object[] { "Defense form"}); - this.partyForm5ComboBox.Location = new System.Drawing.Point(304, 186); - this.partyForm5ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyForm5ComboBox.Location = new System.Drawing.Point(228, 151); this.partyForm5ComboBox.Name = "partyForm5ComboBox"; - this.partyForm5ComboBox.Size = new System.Drawing.Size(136, 24); + this.partyForm5ComboBox.Size = new System.Drawing.Size(103, 21); this.partyForm5ComboBox.TabIndex = 19; // // partyAbility5ComboBox // this.partyAbility5ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.partyAbility5ComboBox.FormattingEnabled = true; - this.partyAbility5ComboBox.Location = new System.Drawing.Point(20, 186); - this.partyAbility5ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyAbility5ComboBox.Location = new System.Drawing.Point(15, 151); this.partyAbility5ComboBox.Name = "partyAbility5ComboBox"; - this.partyAbility5ComboBox.Size = new System.Drawing.Size(139, 24); + this.partyAbility5ComboBox.Size = new System.Drawing.Size(105, 21); this.partyAbility5ComboBox.TabIndex = 18; // // partyGender5ComboBox // this.partyGender5ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.partyGender5ComboBox.FormattingEnabled = true; - this.partyGender5ComboBox.Location = new System.Drawing.Point(168, 186); - this.partyGender5ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyGender5ComboBox.Location = new System.Drawing.Point(126, 151); this.partyGender5ComboBox.Name = "partyGender5ComboBox"; - this.partyGender5ComboBox.Size = new System.Drawing.Size(125, 24); + this.partyGender5ComboBox.Size = new System.Drawing.Size(95, 21); this.partyGender5ComboBox.TabIndex = 14; // // partyPokemonItemPictureBox5 // this.partyPokemonItemPictureBox5.Image = global::DSPRE.Properties.Resources.IconItem; - this.partyPokemonItemPictureBox5.Location = new System.Drawing.Point(264, 32); - this.partyPokemonItemPictureBox5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyPokemonItemPictureBox5.Location = new System.Drawing.Point(198, 26); this.partyPokemonItemPictureBox5.Name = "partyPokemonItemPictureBox5"; - this.partyPokemonItemPictureBox5.Size = new System.Drawing.Size(32, 31); + this.partyPokemonItemPictureBox5.Size = new System.Drawing.Size(24, 25); this.partyPokemonItemPictureBox5.TabIndex = 12; this.partyPokemonItemPictureBox5.TabStop = false; this.partyPokemonItemPictureBox5.Visible = false; @@ -8589,30 +8005,27 @@ // label57 // this.label57.AutoSize = true; - this.label57.Location = new System.Drawing.Point(16, 145); - this.label57.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label57.Location = new System.Drawing.Point(12, 118); this.label57.Name = "label57"; - this.label57.Size = new System.Drawing.Size(35, 32); + this.label57.Size = new System.Drawing.Size(28, 26); this.label57.TabIndex = 9; this.label57.Text = "Ball\r\nSeal"; // // label58 // this.label58.AutoSize = true; - this.label58.Location = new System.Drawing.Point(16, 116); - this.label58.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label58.Location = new System.Drawing.Point(12, 94); this.label58.Name = "label58"; - this.label58.Size = new System.Drawing.Size(26, 16); + this.label58.Size = new System.Drawing.Size(22, 13); this.label58.TabIndex = 8; this.label58.Text = "DV"; // // label59 // this.label59.AutoSize = true; - this.label59.Location = new System.Drawing.Point(16, 82); - this.label59.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label59.Location = new System.Drawing.Point(12, 67); this.label59.Name = "label59"; - this.label59.Size = new System.Drawing.Size(24, 16); + this.label59.Size = new System.Drawing.Size(22, 13); this.label59.TabIndex = 7; this.label59.Text = "Lv."; // @@ -8622,11 +8035,9 @@ this.poke5MovesGroupBox.Controls.Add(this.partyMove5_2ComboBox); this.poke5MovesGroupBox.Controls.Add(this.partyMove5_3ComboBox); this.poke5MovesGroupBox.Controls.Add(this.partyMove5_4ComboBox); - this.poke5MovesGroupBox.Location = new System.Drawing.Point(147, 70); - this.poke5MovesGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.poke5MovesGroupBox.Location = new System.Drawing.Point(110, 57); this.poke5MovesGroupBox.Name = "poke5MovesGroupBox"; - this.poke5MovesGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.poke5MovesGroupBox.Size = new System.Drawing.Size(303, 105); + this.poke5MovesGroupBox.Size = new System.Drawing.Size(227, 85); this.poke5MovesGroupBox.TabIndex = 6; this.poke5MovesGroupBox.TabStop = false; this.poke5MovesGroupBox.Text = "Moves"; @@ -8637,10 +8048,9 @@ this.partyMove5_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove5_1ComboBox.Enabled = false; this.partyMove5_1ComboBox.FormattingEnabled = true; - this.partyMove5_1ComboBox.Location = new System.Drawing.Point(13, 26); - this.partyMove5_1ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyMove5_1ComboBox.Location = new System.Drawing.Point(10, 21); this.partyMove5_1ComboBox.Name = "partyMove5_1ComboBox"; - this.partyMove5_1ComboBox.Size = new System.Drawing.Size(132, 24); + this.partyMove5_1ComboBox.Size = new System.Drawing.Size(100, 21); this.partyMove5_1ComboBox.TabIndex = 3; this.partyMove5_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -8650,10 +8060,9 @@ this.partyMove5_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove5_2ComboBox.Enabled = false; this.partyMove5_2ComboBox.FormattingEnabled = true; - this.partyMove5_2ComboBox.Location = new System.Drawing.Point(155, 26); - this.partyMove5_2ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyMove5_2ComboBox.Location = new System.Drawing.Point(116, 21); this.partyMove5_2ComboBox.Name = "partyMove5_2ComboBox"; - this.partyMove5_2ComboBox.Size = new System.Drawing.Size(132, 24); + this.partyMove5_2ComboBox.Size = new System.Drawing.Size(100, 21); this.partyMove5_2ComboBox.TabIndex = 6; this.partyMove5_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -8663,10 +8072,9 @@ this.partyMove5_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove5_3ComboBox.Enabled = false; this.partyMove5_3ComboBox.FormattingEnabled = true; - this.partyMove5_3ComboBox.Location = new System.Drawing.Point(13, 59); - this.partyMove5_3ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyMove5_3ComboBox.Location = new System.Drawing.Point(10, 48); this.partyMove5_3ComboBox.Name = "partyMove5_3ComboBox"; - this.partyMove5_3ComboBox.Size = new System.Drawing.Size(132, 24); + this.partyMove5_3ComboBox.Size = new System.Drawing.Size(100, 21); this.partyMove5_3ComboBox.TabIndex = 5; this.partyMove5_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -8676,37 +8084,34 @@ this.partyMove5_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove5_4ComboBox.Enabled = false; this.partyMove5_4ComboBox.FormattingEnabled = true; - this.partyMove5_4ComboBox.Location = new System.Drawing.Point(155, 59); - this.partyMove5_4ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyMove5_4ComboBox.Location = new System.Drawing.Point(116, 48); this.partyMove5_4ComboBox.Name = "partyMove5_4ComboBox"; - this.partyMove5_4ComboBox.Size = new System.Drawing.Size(132, 24); + this.partyMove5_4ComboBox.Size = new System.Drawing.Size(100, 21); this.partyMove5_4ComboBox.TabIndex = 7; this.partyMove5_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // // partyIV5UpDown // - this.partyIV5UpDown.Location = new System.Drawing.Point(64, 113); - this.partyIV5UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyIV5UpDown.Location = new System.Drawing.Point(48, 92); this.partyIV5UpDown.Maximum = new decimal(new int[] { 255, 0, 0, 0}); this.partyIV5UpDown.Name = "partyIV5UpDown"; - this.partyIV5UpDown.Size = new System.Drawing.Size(65, 22); + this.partyIV5UpDown.Size = new System.Drawing.Size(49, 20); this.partyIV5UpDown.TabIndex = 5; // // partyLevel5UpDown // - this.partyLevel5UpDown.Location = new System.Drawing.Point(64, 78); - this.partyLevel5UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyLevel5UpDown.Location = new System.Drawing.Point(48, 63); this.partyLevel5UpDown.Minimum = new decimal(new int[] { 1, 0, 0, 0}); this.partyLevel5UpDown.Name = "partyLevel5UpDown"; - this.partyLevel5UpDown.Size = new System.Drawing.Size(65, 22); + this.partyLevel5UpDown.Size = new System.Drawing.Size(49, 20); this.partyLevel5UpDown.TabIndex = 4; this.partyLevel5UpDown.Value = new decimal(new int[] { 1, @@ -8716,15 +8121,14 @@ // // partyBall5UpDown // - this.partyBall5UpDown.Location = new System.Drawing.Point(64, 149); - this.partyBall5UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyBall5UpDown.Location = new System.Drawing.Point(48, 121); this.partyBall5UpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.partyBall5UpDown.Name = "partyBall5UpDown"; - this.partyBall5UpDown.Size = new System.Drawing.Size(65, 22); + this.partyBall5UpDown.Size = new System.Drawing.Size(49, 20); this.partyBall5UpDown.TabIndex = 3; // // partyItem5ComboBox @@ -8733,19 +8137,17 @@ this.partyItem5ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyItem5ComboBox.Enabled = false; this.partyItem5ComboBox.FormattingEnabled = true; - this.partyItem5ComboBox.Location = new System.Drawing.Point(304, 34); - this.partyItem5ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyItem5ComboBox.Location = new System.Drawing.Point(228, 28); this.partyItem5ComboBox.Name = "partyItem5ComboBox"; - this.partyItem5ComboBox.Size = new System.Drawing.Size(136, 24); + this.partyItem5ComboBox.Size = new System.Drawing.Size(103, 21); this.partyItem5ComboBox.TabIndex = 2; this.partyItem5ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem5ComboBox_SelectedIndexChanged); // // partyPokemon5PictureBox // - this.partyPokemon5PictureBox.Location = new System.Drawing.Point(15, 28); - this.partyPokemon5PictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyPokemon5PictureBox.Location = new System.Drawing.Point(11, 23); this.partyPokemon5PictureBox.Name = "partyPokemon5PictureBox"; - this.partyPokemon5PictureBox.Size = new System.Drawing.Size(53, 37); + this.partyPokemon5PictureBox.Size = new System.Drawing.Size(40, 30); this.partyPokemon5PictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.partyPokemon5PictureBox.TabIndex = 1; this.partyPokemon5PictureBox.TabStop = false; @@ -8755,10 +8157,9 @@ this.partyPokemon5ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.partyPokemon5ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyPokemon5ComboBox.FormattingEnabled = true; - this.partyPokemon5ComboBox.Location = new System.Drawing.Point(77, 34); - this.partyPokemon5ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyPokemon5ComboBox.Location = new System.Drawing.Point(58, 28); this.partyPokemon5ComboBox.Name = "partyPokemon5ComboBox"; - this.partyPokemon5ComboBox.Size = new System.Drawing.Size(167, 24); + this.partyPokemon5ComboBox.Size = new System.Drawing.Size(126, 21); this.partyPokemon5ComboBox.TabIndex = 0; this.partyPokemon5ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon5ComboBox_SelectedIndexChanged); // @@ -8779,11 +8180,9 @@ this.party4GroupBox.Controls.Add(this.partyPokemon4PictureBox); this.party4GroupBox.Controls.Add(this.partyPokemon4ComboBox); this.party4GroupBox.Enabled = false; - this.party4GroupBox.Location = new System.Drawing.Point(495, 274); - this.party4GroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.party4GroupBox.Location = new System.Drawing.Point(371, 223); this.party4GroupBox.Name = "party4GroupBox"; - this.party4GroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.party4GroupBox.Size = new System.Drawing.Size(457, 225); + this.party4GroupBox.Size = new System.Drawing.Size(343, 183); this.party4GroupBox.TabIndex = 11; this.party4GroupBox.TabStop = false; this.party4GroupBox.Text = "Pokemon 4"; @@ -8794,39 +8193,35 @@ this.partyForm4ComboBox.FormattingEnabled = true; this.partyForm4ComboBox.Items.AddRange(new object[] { "Defense form"}); - this.partyForm4ComboBox.Location = new System.Drawing.Point(304, 186); - this.partyForm4ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyForm4ComboBox.Location = new System.Drawing.Point(228, 151); this.partyForm4ComboBox.Name = "partyForm4ComboBox"; - this.partyForm4ComboBox.Size = new System.Drawing.Size(136, 24); + this.partyForm4ComboBox.Size = new System.Drawing.Size(103, 21); this.partyForm4ComboBox.TabIndex = 18; // // partyAbility4ComboBox // this.partyAbility4ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.partyAbility4ComboBox.FormattingEnabled = true; - this.partyAbility4ComboBox.Location = new System.Drawing.Point(20, 186); - this.partyAbility4ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyAbility4ComboBox.Location = new System.Drawing.Point(15, 151); this.partyAbility4ComboBox.Name = "partyAbility4ComboBox"; - this.partyAbility4ComboBox.Size = new System.Drawing.Size(139, 24); + this.partyAbility4ComboBox.Size = new System.Drawing.Size(105, 21); this.partyAbility4ComboBox.TabIndex = 17; // // partyGender4ComboBox // this.partyGender4ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.partyGender4ComboBox.FormattingEnabled = true; - this.partyGender4ComboBox.Location = new System.Drawing.Point(168, 186); - this.partyGender4ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyGender4ComboBox.Location = new System.Drawing.Point(126, 151); this.partyGender4ComboBox.Name = "partyGender4ComboBox"; - this.partyGender4ComboBox.Size = new System.Drawing.Size(125, 24); + this.partyGender4ComboBox.Size = new System.Drawing.Size(95, 21); this.partyGender4ComboBox.TabIndex = 16; // // partyPokemonItemPictureBox4 // this.partyPokemonItemPictureBox4.Image = global::DSPRE.Properties.Resources.IconItem; - this.partyPokemonItemPictureBox4.Location = new System.Drawing.Point(264, 32); - this.partyPokemonItemPictureBox4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyPokemonItemPictureBox4.Location = new System.Drawing.Point(198, 26); this.partyPokemonItemPictureBox4.Name = "partyPokemonItemPictureBox4"; - this.partyPokemonItemPictureBox4.Size = new System.Drawing.Size(32, 31); + this.partyPokemonItemPictureBox4.Size = new System.Drawing.Size(24, 25); this.partyPokemonItemPictureBox4.TabIndex = 14; this.partyPokemonItemPictureBox4.TabStop = false; this.partyPokemonItemPictureBox4.Visible = false; @@ -8834,30 +8229,27 @@ // label54 // this.label54.AutoSize = true; - this.label54.Location = new System.Drawing.Point(16, 145); - this.label54.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label54.Location = new System.Drawing.Point(12, 118); this.label54.Name = "label54"; - this.label54.Size = new System.Drawing.Size(35, 32); + this.label54.Size = new System.Drawing.Size(28, 26); this.label54.TabIndex = 9; this.label54.Text = "Ball\r\nSeal"; // // label55 // this.label55.AutoSize = true; - this.label55.Location = new System.Drawing.Point(16, 116); - this.label55.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label55.Location = new System.Drawing.Point(12, 94); this.label55.Name = "label55"; - this.label55.Size = new System.Drawing.Size(26, 16); + this.label55.Size = new System.Drawing.Size(22, 13); this.label55.TabIndex = 8; this.label55.Text = "DV"; // // label56 // this.label56.AutoSize = true; - this.label56.Location = new System.Drawing.Point(16, 82); - this.label56.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label56.Location = new System.Drawing.Point(12, 67); this.label56.Name = "label56"; - this.label56.Size = new System.Drawing.Size(24, 16); + this.label56.Size = new System.Drawing.Size(22, 13); this.label56.TabIndex = 7; this.label56.Text = "Lv."; // @@ -8867,11 +8259,9 @@ this.poke4MovesGroupBox.Controls.Add(this.partyMove4_2ComboBox); this.poke4MovesGroupBox.Controls.Add(this.partyMove4_3ComboBox); this.poke4MovesGroupBox.Controls.Add(this.partyMove4_4ComboBox); - this.poke4MovesGroupBox.Location = new System.Drawing.Point(147, 70); - this.poke4MovesGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.poke4MovesGroupBox.Location = new System.Drawing.Point(110, 57); this.poke4MovesGroupBox.Name = "poke4MovesGroupBox"; - this.poke4MovesGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.poke4MovesGroupBox.Size = new System.Drawing.Size(303, 105); + this.poke4MovesGroupBox.Size = new System.Drawing.Size(227, 85); this.poke4MovesGroupBox.TabIndex = 6; this.poke4MovesGroupBox.TabStop = false; this.poke4MovesGroupBox.Text = "Moves"; @@ -8882,10 +8272,9 @@ this.partyMove4_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove4_1ComboBox.Enabled = false; this.partyMove4_1ComboBox.FormattingEnabled = true; - this.partyMove4_1ComboBox.Location = new System.Drawing.Point(13, 26); - this.partyMove4_1ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyMove4_1ComboBox.Location = new System.Drawing.Point(10, 21); this.partyMove4_1ComboBox.Name = "partyMove4_1ComboBox"; - this.partyMove4_1ComboBox.Size = new System.Drawing.Size(132, 24); + this.partyMove4_1ComboBox.Size = new System.Drawing.Size(100, 21); this.partyMove4_1ComboBox.TabIndex = 3; this.partyMove4_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -8895,10 +8284,9 @@ this.partyMove4_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove4_2ComboBox.Enabled = false; this.partyMove4_2ComboBox.FormattingEnabled = true; - this.partyMove4_2ComboBox.Location = new System.Drawing.Point(155, 26); - this.partyMove4_2ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyMove4_2ComboBox.Location = new System.Drawing.Point(116, 21); this.partyMove4_2ComboBox.Name = "partyMove4_2ComboBox"; - this.partyMove4_2ComboBox.Size = new System.Drawing.Size(132, 24); + this.partyMove4_2ComboBox.Size = new System.Drawing.Size(100, 21); this.partyMove4_2ComboBox.TabIndex = 6; this.partyMove4_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -8908,10 +8296,9 @@ this.partyMove4_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove4_3ComboBox.Enabled = false; this.partyMove4_3ComboBox.FormattingEnabled = true; - this.partyMove4_3ComboBox.Location = new System.Drawing.Point(13, 59); - this.partyMove4_3ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyMove4_3ComboBox.Location = new System.Drawing.Point(10, 48); this.partyMove4_3ComboBox.Name = "partyMove4_3ComboBox"; - this.partyMove4_3ComboBox.Size = new System.Drawing.Size(132, 24); + this.partyMove4_3ComboBox.Size = new System.Drawing.Size(100, 21); this.partyMove4_3ComboBox.TabIndex = 5; this.partyMove4_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -8921,37 +8308,34 @@ this.partyMove4_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove4_4ComboBox.Enabled = false; this.partyMove4_4ComboBox.FormattingEnabled = true; - this.partyMove4_4ComboBox.Location = new System.Drawing.Point(155, 59); - this.partyMove4_4ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyMove4_4ComboBox.Location = new System.Drawing.Point(116, 48); this.partyMove4_4ComboBox.Name = "partyMove4_4ComboBox"; - this.partyMove4_4ComboBox.Size = new System.Drawing.Size(132, 24); + this.partyMove4_4ComboBox.Size = new System.Drawing.Size(100, 21); this.partyMove4_4ComboBox.TabIndex = 7; this.partyMove4_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // // partyIV4UpDown // - this.partyIV4UpDown.Location = new System.Drawing.Point(64, 113); - this.partyIV4UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyIV4UpDown.Location = new System.Drawing.Point(48, 92); this.partyIV4UpDown.Maximum = new decimal(new int[] { 255, 0, 0, 0}); this.partyIV4UpDown.Name = "partyIV4UpDown"; - this.partyIV4UpDown.Size = new System.Drawing.Size(65, 22); + this.partyIV4UpDown.Size = new System.Drawing.Size(49, 20); this.partyIV4UpDown.TabIndex = 5; // // partyLevel4UpDown // - this.partyLevel4UpDown.Location = new System.Drawing.Point(64, 78); - this.partyLevel4UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyLevel4UpDown.Location = new System.Drawing.Point(48, 63); this.partyLevel4UpDown.Minimum = new decimal(new int[] { 1, 0, 0, 0}); this.partyLevel4UpDown.Name = "partyLevel4UpDown"; - this.partyLevel4UpDown.Size = new System.Drawing.Size(65, 22); + this.partyLevel4UpDown.Size = new System.Drawing.Size(49, 20); this.partyLevel4UpDown.TabIndex = 4; this.partyLevel4UpDown.Value = new decimal(new int[] { 1, @@ -8961,15 +8345,14 @@ // // partyBall4UpDown // - this.partyBall4UpDown.Location = new System.Drawing.Point(64, 149); - this.partyBall4UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyBall4UpDown.Location = new System.Drawing.Point(48, 121); this.partyBall4UpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.partyBall4UpDown.Name = "partyBall4UpDown"; - this.partyBall4UpDown.Size = new System.Drawing.Size(65, 22); + this.partyBall4UpDown.Size = new System.Drawing.Size(49, 20); this.partyBall4UpDown.TabIndex = 3; // // partyItem4ComboBox @@ -8978,19 +8361,17 @@ this.partyItem4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyItem4ComboBox.Enabled = false; this.partyItem4ComboBox.FormattingEnabled = true; - this.partyItem4ComboBox.Location = new System.Drawing.Point(304, 34); - this.partyItem4ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyItem4ComboBox.Location = new System.Drawing.Point(228, 28); this.partyItem4ComboBox.Name = "partyItem4ComboBox"; - this.partyItem4ComboBox.Size = new System.Drawing.Size(136, 24); + this.partyItem4ComboBox.Size = new System.Drawing.Size(103, 21); this.partyItem4ComboBox.TabIndex = 2; this.partyItem4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem4ComboBox_SelectedIndexChanged); // // partyPokemon4PictureBox // - this.partyPokemon4PictureBox.Location = new System.Drawing.Point(15, 28); - this.partyPokemon4PictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyPokemon4PictureBox.Location = new System.Drawing.Point(11, 23); this.partyPokemon4PictureBox.Name = "partyPokemon4PictureBox"; - this.partyPokemon4PictureBox.Size = new System.Drawing.Size(53, 37); + this.partyPokemon4PictureBox.Size = new System.Drawing.Size(40, 30); this.partyPokemon4PictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.partyPokemon4PictureBox.TabIndex = 1; this.partyPokemon4PictureBox.TabStop = false; @@ -9000,10 +8381,9 @@ this.partyPokemon4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.partyPokemon4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyPokemon4ComboBox.FormattingEnabled = true; - this.partyPokemon4ComboBox.Location = new System.Drawing.Point(77, 34); - this.partyPokemon4ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyPokemon4ComboBox.Location = new System.Drawing.Point(58, 28); this.partyPokemon4ComboBox.Name = "partyPokemon4ComboBox"; - this.partyPokemon4ComboBox.Size = new System.Drawing.Size(167, 24); + this.partyPokemon4ComboBox.Size = new System.Drawing.Size(126, 21); this.partyPokemon4ComboBox.TabIndex = 0; this.partyPokemon4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon4ComboBox_SelectedIndexChanged); // @@ -9024,11 +8404,9 @@ this.party3GroupBox.Controls.Add(this.partyPokemon3PictureBox); this.party3GroupBox.Controls.Add(this.partyPokemon3ComboBox); this.party3GroupBox.Enabled = false; - this.party3GroupBox.Location = new System.Drawing.Point(21, 274); - this.party3GroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.party3GroupBox.Location = new System.Drawing.Point(16, 223); this.party3GroupBox.Name = "party3GroupBox"; - this.party3GroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.party3GroupBox.Size = new System.Drawing.Size(457, 225); + this.party3GroupBox.Size = new System.Drawing.Size(343, 183); this.party3GroupBox.TabIndex = 10; this.party3GroupBox.TabStop = false; this.party3GroupBox.Text = "Pokemon 3"; @@ -9039,39 +8417,35 @@ this.partyForm3ComboBox.FormattingEnabled = true; this.partyForm3ComboBox.Items.AddRange(new object[] { "Defense form"}); - this.partyForm3ComboBox.Location = new System.Drawing.Point(304, 186); - this.partyForm3ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyForm3ComboBox.Location = new System.Drawing.Point(228, 151); this.partyForm3ComboBox.Name = "partyForm3ComboBox"; - this.partyForm3ComboBox.Size = new System.Drawing.Size(136, 24); + this.partyForm3ComboBox.Size = new System.Drawing.Size(103, 21); this.partyForm3ComboBox.TabIndex = 15; // // partyAbility3ComboBox // this.partyAbility3ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.partyAbility3ComboBox.FormattingEnabled = true; - this.partyAbility3ComboBox.Location = new System.Drawing.Point(20, 186); - this.partyAbility3ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyAbility3ComboBox.Location = new System.Drawing.Point(15, 151); this.partyAbility3ComboBox.Name = "partyAbility3ComboBox"; - this.partyAbility3ComboBox.Size = new System.Drawing.Size(139, 24); + this.partyAbility3ComboBox.Size = new System.Drawing.Size(105, 21); this.partyAbility3ComboBox.TabIndex = 14; // // partyGender3ComboBox // this.partyGender3ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.partyGender3ComboBox.FormattingEnabled = true; - this.partyGender3ComboBox.Location = new System.Drawing.Point(168, 186); - this.partyGender3ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyGender3ComboBox.Location = new System.Drawing.Point(126, 151); this.partyGender3ComboBox.Name = "partyGender3ComboBox"; - this.partyGender3ComboBox.Size = new System.Drawing.Size(125, 24); + this.partyGender3ComboBox.Size = new System.Drawing.Size(95, 21); this.partyGender3ComboBox.TabIndex = 13; // // partyPokemonItemPictureBox3 // this.partyPokemonItemPictureBox3.Image = global::DSPRE.Properties.Resources.IconItem; - this.partyPokemonItemPictureBox3.Location = new System.Drawing.Point(264, 32); - this.partyPokemonItemPictureBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyPokemonItemPictureBox3.Location = new System.Drawing.Point(198, 26); this.partyPokemonItemPictureBox3.Name = "partyPokemonItemPictureBox3"; - this.partyPokemonItemPictureBox3.Size = new System.Drawing.Size(32, 31); + this.partyPokemonItemPictureBox3.Size = new System.Drawing.Size(24, 25); this.partyPokemonItemPictureBox3.TabIndex = 11; this.partyPokemonItemPictureBox3.TabStop = false; this.partyPokemonItemPictureBox3.Visible = false; @@ -9079,30 +8453,27 @@ // label51 // this.label51.AutoSize = true; - this.label51.Location = new System.Drawing.Point(16, 145); - this.label51.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label51.Location = new System.Drawing.Point(12, 118); this.label51.Name = "label51"; - this.label51.Size = new System.Drawing.Size(35, 32); + this.label51.Size = new System.Drawing.Size(28, 26); this.label51.TabIndex = 9; this.label51.Text = "Ball\r\nSeal"; // // label52 // this.label52.AutoSize = true; - this.label52.Location = new System.Drawing.Point(16, 116); - this.label52.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label52.Location = new System.Drawing.Point(12, 94); this.label52.Name = "label52"; - this.label52.Size = new System.Drawing.Size(26, 16); + this.label52.Size = new System.Drawing.Size(22, 13); this.label52.TabIndex = 8; this.label52.Text = "DV"; // // label53 // this.label53.AutoSize = true; - this.label53.Location = new System.Drawing.Point(16, 82); - this.label53.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label53.Location = new System.Drawing.Point(12, 67); this.label53.Name = "label53"; - this.label53.Size = new System.Drawing.Size(24, 16); + this.label53.Size = new System.Drawing.Size(22, 13); this.label53.TabIndex = 7; this.label53.Text = "Lv."; // @@ -9112,11 +8483,9 @@ this.poke3MovesGroupBox.Controls.Add(this.partyMove3_2ComboBox); this.poke3MovesGroupBox.Controls.Add(this.partyMove3_3ComboBox); this.poke3MovesGroupBox.Controls.Add(this.partyMove3_4ComboBox); - this.poke3MovesGroupBox.Location = new System.Drawing.Point(147, 70); - this.poke3MovesGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.poke3MovesGroupBox.Location = new System.Drawing.Point(110, 57); this.poke3MovesGroupBox.Name = "poke3MovesGroupBox"; - this.poke3MovesGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.poke3MovesGroupBox.Size = new System.Drawing.Size(303, 105); + this.poke3MovesGroupBox.Size = new System.Drawing.Size(227, 85); this.poke3MovesGroupBox.TabIndex = 6; this.poke3MovesGroupBox.TabStop = false; this.poke3MovesGroupBox.Text = "Moves"; @@ -9127,10 +8496,9 @@ this.partyMove3_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove3_1ComboBox.Enabled = false; this.partyMove3_1ComboBox.FormattingEnabled = true; - this.partyMove3_1ComboBox.Location = new System.Drawing.Point(13, 26); - this.partyMove3_1ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyMove3_1ComboBox.Location = new System.Drawing.Point(10, 21); this.partyMove3_1ComboBox.Name = "partyMove3_1ComboBox"; - this.partyMove3_1ComboBox.Size = new System.Drawing.Size(132, 24); + this.partyMove3_1ComboBox.Size = new System.Drawing.Size(100, 21); this.partyMove3_1ComboBox.TabIndex = 3; this.partyMove3_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -9140,10 +8508,9 @@ this.partyMove3_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove3_2ComboBox.Enabled = false; this.partyMove3_2ComboBox.FormattingEnabled = true; - this.partyMove3_2ComboBox.Location = new System.Drawing.Point(155, 26); - this.partyMove3_2ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyMove3_2ComboBox.Location = new System.Drawing.Point(116, 21); this.partyMove3_2ComboBox.Name = "partyMove3_2ComboBox"; - this.partyMove3_2ComboBox.Size = new System.Drawing.Size(132, 24); + this.partyMove3_2ComboBox.Size = new System.Drawing.Size(100, 21); this.partyMove3_2ComboBox.TabIndex = 6; this.partyMove3_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -9153,10 +8520,9 @@ this.partyMove3_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove3_3ComboBox.Enabled = false; this.partyMove3_3ComboBox.FormattingEnabled = true; - this.partyMove3_3ComboBox.Location = new System.Drawing.Point(13, 59); - this.partyMove3_3ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyMove3_3ComboBox.Location = new System.Drawing.Point(10, 48); this.partyMove3_3ComboBox.Name = "partyMove3_3ComboBox"; - this.partyMove3_3ComboBox.Size = new System.Drawing.Size(132, 24); + this.partyMove3_3ComboBox.Size = new System.Drawing.Size(100, 21); this.partyMove3_3ComboBox.TabIndex = 5; this.partyMove3_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -9166,37 +8532,34 @@ this.partyMove3_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove3_4ComboBox.Enabled = false; this.partyMove3_4ComboBox.FormattingEnabled = true; - this.partyMove3_4ComboBox.Location = new System.Drawing.Point(155, 59); - this.partyMove3_4ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyMove3_4ComboBox.Location = new System.Drawing.Point(116, 48); this.partyMove3_4ComboBox.Name = "partyMove3_4ComboBox"; - this.partyMove3_4ComboBox.Size = new System.Drawing.Size(132, 24); + this.partyMove3_4ComboBox.Size = new System.Drawing.Size(100, 21); this.partyMove3_4ComboBox.TabIndex = 7; this.partyMove3_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // // partyIV3UpDown // - this.partyIV3UpDown.Location = new System.Drawing.Point(64, 113); - this.partyIV3UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyIV3UpDown.Location = new System.Drawing.Point(48, 92); this.partyIV3UpDown.Maximum = new decimal(new int[] { 255, 0, 0, 0}); this.partyIV3UpDown.Name = "partyIV3UpDown"; - this.partyIV3UpDown.Size = new System.Drawing.Size(65, 22); + this.partyIV3UpDown.Size = new System.Drawing.Size(49, 20); this.partyIV3UpDown.TabIndex = 5; // // partyLevel3UpDown // - this.partyLevel3UpDown.Location = new System.Drawing.Point(64, 78); - this.partyLevel3UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyLevel3UpDown.Location = new System.Drawing.Point(48, 63); this.partyLevel3UpDown.Minimum = new decimal(new int[] { 1, 0, 0, 0}); this.partyLevel3UpDown.Name = "partyLevel3UpDown"; - this.partyLevel3UpDown.Size = new System.Drawing.Size(65, 22); + this.partyLevel3UpDown.Size = new System.Drawing.Size(49, 20); this.partyLevel3UpDown.TabIndex = 4; this.partyLevel3UpDown.Value = new decimal(new int[] { 1, @@ -9206,15 +8569,14 @@ // // partyBall3UpDown // - this.partyBall3UpDown.Location = new System.Drawing.Point(64, 149); - this.partyBall3UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyBall3UpDown.Location = new System.Drawing.Point(48, 121); this.partyBall3UpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.partyBall3UpDown.Name = "partyBall3UpDown"; - this.partyBall3UpDown.Size = new System.Drawing.Size(65, 22); + this.partyBall3UpDown.Size = new System.Drawing.Size(49, 20); this.partyBall3UpDown.TabIndex = 3; // // partyItem3ComboBox @@ -9223,19 +8585,17 @@ this.partyItem3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyItem3ComboBox.Enabled = false; this.partyItem3ComboBox.FormattingEnabled = true; - this.partyItem3ComboBox.Location = new System.Drawing.Point(304, 34); - this.partyItem3ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyItem3ComboBox.Location = new System.Drawing.Point(228, 28); this.partyItem3ComboBox.Name = "partyItem3ComboBox"; - this.partyItem3ComboBox.Size = new System.Drawing.Size(136, 24); + this.partyItem3ComboBox.Size = new System.Drawing.Size(103, 21); this.partyItem3ComboBox.TabIndex = 2; this.partyItem3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem3ComboBox_SelectedIndexChanged); // // partyPokemon3PictureBox // - this.partyPokemon3PictureBox.Location = new System.Drawing.Point(15, 28); - this.partyPokemon3PictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyPokemon3PictureBox.Location = new System.Drawing.Point(11, 23); this.partyPokemon3PictureBox.Name = "partyPokemon3PictureBox"; - this.partyPokemon3PictureBox.Size = new System.Drawing.Size(53, 37); + this.partyPokemon3PictureBox.Size = new System.Drawing.Size(40, 30); this.partyPokemon3PictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.partyPokemon3PictureBox.TabIndex = 1; this.partyPokemon3PictureBox.TabStop = false; @@ -9245,10 +8605,9 @@ this.partyPokemon3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.partyPokemon3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyPokemon3ComboBox.FormattingEnabled = true; - this.partyPokemon3ComboBox.Location = new System.Drawing.Point(77, 34); - this.partyPokemon3ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyPokemon3ComboBox.Location = new System.Drawing.Point(58, 28); this.partyPokemon3ComboBox.Name = "partyPokemon3ComboBox"; - this.partyPokemon3ComboBox.Size = new System.Drawing.Size(167, 24); + this.partyPokemon3ComboBox.Size = new System.Drawing.Size(126, 21); this.partyPokemon3ComboBox.TabIndex = 0; this.partyPokemon3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon3ComboBox_SelectedIndexChanged); // @@ -9269,11 +8628,9 @@ this.party2GroupBox.Controls.Add(this.partyPokemon2PictureBox); this.party2GroupBox.Controls.Add(this.partyPokemon2ComboBox); this.party2GroupBox.Enabled = false; - this.party2GroupBox.Location = new System.Drawing.Point(495, 46); - this.party2GroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.party2GroupBox.Location = new System.Drawing.Point(371, 37); this.party2GroupBox.Name = "party2GroupBox"; - this.party2GroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.party2GroupBox.Size = new System.Drawing.Size(457, 225); + this.party2GroupBox.Size = new System.Drawing.Size(343, 183); this.party2GroupBox.TabIndex = 10; this.party2GroupBox.TabStop = false; this.party2GroupBox.Text = "Pokemon 2"; @@ -9284,39 +8641,35 @@ this.partyForm2ComboBox.FormattingEnabled = true; this.partyForm2ComboBox.Items.AddRange(new object[] { "Defense form"}); - this.partyForm2ComboBox.Location = new System.Drawing.Point(304, 186); - this.partyForm2ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyForm2ComboBox.Location = new System.Drawing.Point(228, 151); this.partyForm2ComboBox.Name = "partyForm2ComboBox"; - this.partyForm2ComboBox.Size = new System.Drawing.Size(136, 24); + this.partyForm2ComboBox.Size = new System.Drawing.Size(103, 21); this.partyForm2ComboBox.TabIndex = 20; // // partyAbility2ComboBox // this.partyAbility2ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.partyAbility2ComboBox.FormattingEnabled = true; - this.partyAbility2ComboBox.Location = new System.Drawing.Point(20, 186); - this.partyAbility2ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyAbility2ComboBox.Location = new System.Drawing.Point(15, 151); this.partyAbility2ComboBox.Name = "partyAbility2ComboBox"; - this.partyAbility2ComboBox.Size = new System.Drawing.Size(139, 24); + this.partyAbility2ComboBox.Size = new System.Drawing.Size(105, 21); this.partyAbility2ComboBox.TabIndex = 18; // // partyGender2ComboBox // this.partyGender2ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.partyGender2ComboBox.FormattingEnabled = true; - this.partyGender2ComboBox.Location = new System.Drawing.Point(168, 186); - this.partyGender2ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyGender2ComboBox.Location = new System.Drawing.Point(126, 151); this.partyGender2ComboBox.Name = "partyGender2ComboBox"; - this.partyGender2ComboBox.Size = new System.Drawing.Size(125, 24); + this.partyGender2ComboBox.Size = new System.Drawing.Size(95, 21); this.partyGender2ComboBox.TabIndex = 17; // // partyPokemonItemPictureBox2 // this.partyPokemonItemPictureBox2.Image = global::DSPRE.Properties.Resources.IconItem; - this.partyPokemonItemPictureBox2.Location = new System.Drawing.Point(264, 32); - this.partyPokemonItemPictureBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyPokemonItemPictureBox2.Location = new System.Drawing.Point(198, 26); this.partyPokemonItemPictureBox2.Name = "partyPokemonItemPictureBox2"; - this.partyPokemonItemPictureBox2.Size = new System.Drawing.Size(32, 31); + this.partyPokemonItemPictureBox2.Size = new System.Drawing.Size(24, 25); this.partyPokemonItemPictureBox2.TabIndex = 15; this.partyPokemonItemPictureBox2.TabStop = false; this.partyPokemonItemPictureBox2.Visible = false; @@ -9324,30 +8677,27 @@ // label48 // this.label48.AutoSize = true; - this.label48.Location = new System.Drawing.Point(16, 145); - this.label48.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label48.Location = new System.Drawing.Point(12, 118); this.label48.Name = "label48"; - this.label48.Size = new System.Drawing.Size(35, 32); + this.label48.Size = new System.Drawing.Size(28, 26); this.label48.TabIndex = 9; this.label48.Text = "Ball\r\nSeal"; // // label49 // this.label49.AutoSize = true; - this.label49.Location = new System.Drawing.Point(16, 116); - this.label49.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label49.Location = new System.Drawing.Point(12, 94); this.label49.Name = "label49"; - this.label49.Size = new System.Drawing.Size(26, 16); + this.label49.Size = new System.Drawing.Size(22, 13); this.label49.TabIndex = 8; this.label49.Text = "DV"; // // label50 // this.label50.AutoSize = true; - this.label50.Location = new System.Drawing.Point(16, 82); - this.label50.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label50.Location = new System.Drawing.Point(12, 67); this.label50.Name = "label50"; - this.label50.Size = new System.Drawing.Size(24, 16); + this.label50.Size = new System.Drawing.Size(22, 13); this.label50.TabIndex = 7; this.label50.Text = "Lv."; // @@ -9357,11 +8707,9 @@ this.poke2MovesGroupBox.Controls.Add(this.partyMove2_2ComboBox); this.poke2MovesGroupBox.Controls.Add(this.partyMove2_3ComboBox); this.poke2MovesGroupBox.Controls.Add(this.partyMove2_4ComboBox); - this.poke2MovesGroupBox.Location = new System.Drawing.Point(147, 70); - this.poke2MovesGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.poke2MovesGroupBox.Location = new System.Drawing.Point(110, 57); this.poke2MovesGroupBox.Name = "poke2MovesGroupBox"; - this.poke2MovesGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.poke2MovesGroupBox.Size = new System.Drawing.Size(303, 105); + this.poke2MovesGroupBox.Size = new System.Drawing.Size(227, 85); this.poke2MovesGroupBox.TabIndex = 6; this.poke2MovesGroupBox.TabStop = false; this.poke2MovesGroupBox.Text = "Moves"; @@ -9372,10 +8720,9 @@ this.partyMove2_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove2_1ComboBox.Enabled = false; this.partyMove2_1ComboBox.FormattingEnabled = true; - this.partyMove2_1ComboBox.Location = new System.Drawing.Point(13, 26); - this.partyMove2_1ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyMove2_1ComboBox.Location = new System.Drawing.Point(10, 21); this.partyMove2_1ComboBox.Name = "partyMove2_1ComboBox"; - this.partyMove2_1ComboBox.Size = new System.Drawing.Size(132, 24); + this.partyMove2_1ComboBox.Size = new System.Drawing.Size(100, 21); this.partyMove2_1ComboBox.TabIndex = 3; this.partyMove2_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -9385,10 +8732,9 @@ this.partyMove2_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove2_2ComboBox.Enabled = false; this.partyMove2_2ComboBox.FormattingEnabled = true; - this.partyMove2_2ComboBox.Location = new System.Drawing.Point(155, 26); - this.partyMove2_2ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyMove2_2ComboBox.Location = new System.Drawing.Point(116, 21); this.partyMove2_2ComboBox.Name = "partyMove2_2ComboBox"; - this.partyMove2_2ComboBox.Size = new System.Drawing.Size(132, 24); + this.partyMove2_2ComboBox.Size = new System.Drawing.Size(100, 21); this.partyMove2_2ComboBox.TabIndex = 6; this.partyMove2_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -9398,10 +8744,9 @@ this.partyMove2_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove2_3ComboBox.Enabled = false; this.partyMove2_3ComboBox.FormattingEnabled = true; - this.partyMove2_3ComboBox.Location = new System.Drawing.Point(13, 59); - this.partyMove2_3ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyMove2_3ComboBox.Location = new System.Drawing.Point(10, 48); this.partyMove2_3ComboBox.Name = "partyMove2_3ComboBox"; - this.partyMove2_3ComboBox.Size = new System.Drawing.Size(132, 24); + this.partyMove2_3ComboBox.Size = new System.Drawing.Size(100, 21); this.partyMove2_3ComboBox.TabIndex = 5; this.partyMove2_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -9411,37 +8756,34 @@ this.partyMove2_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove2_4ComboBox.Enabled = false; this.partyMove2_4ComboBox.FormattingEnabled = true; - this.partyMove2_4ComboBox.Location = new System.Drawing.Point(155, 59); - this.partyMove2_4ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyMove2_4ComboBox.Location = new System.Drawing.Point(116, 48); this.partyMove2_4ComboBox.Name = "partyMove2_4ComboBox"; - this.partyMove2_4ComboBox.Size = new System.Drawing.Size(132, 24); + this.partyMove2_4ComboBox.Size = new System.Drawing.Size(100, 21); this.partyMove2_4ComboBox.TabIndex = 7; this.partyMove2_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // // partyIV2UpDown // - this.partyIV2UpDown.Location = new System.Drawing.Point(64, 113); - this.partyIV2UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyIV2UpDown.Location = new System.Drawing.Point(48, 92); this.partyIV2UpDown.Maximum = new decimal(new int[] { 255, 0, 0, 0}); this.partyIV2UpDown.Name = "partyIV2UpDown"; - this.partyIV2UpDown.Size = new System.Drawing.Size(65, 22); + this.partyIV2UpDown.Size = new System.Drawing.Size(49, 20); this.partyIV2UpDown.TabIndex = 5; // // partyLevel2UpDown // - this.partyLevel2UpDown.Location = new System.Drawing.Point(64, 78); - this.partyLevel2UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyLevel2UpDown.Location = new System.Drawing.Point(48, 63); this.partyLevel2UpDown.Minimum = new decimal(new int[] { 1, 0, 0, 0}); this.partyLevel2UpDown.Name = "partyLevel2UpDown"; - this.partyLevel2UpDown.Size = new System.Drawing.Size(65, 22); + this.partyLevel2UpDown.Size = new System.Drawing.Size(49, 20); this.partyLevel2UpDown.TabIndex = 4; this.partyLevel2UpDown.Value = new decimal(new int[] { 1, @@ -9451,15 +8793,14 @@ // // partyBall2UpDown // - this.partyBall2UpDown.Location = new System.Drawing.Point(64, 149); - this.partyBall2UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyBall2UpDown.Location = new System.Drawing.Point(48, 121); this.partyBall2UpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.partyBall2UpDown.Name = "partyBall2UpDown"; - this.partyBall2UpDown.Size = new System.Drawing.Size(65, 22); + this.partyBall2UpDown.Size = new System.Drawing.Size(49, 20); this.partyBall2UpDown.TabIndex = 3; // // partyItem2ComboBox @@ -9468,19 +8809,17 @@ this.partyItem2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyItem2ComboBox.Enabled = false; this.partyItem2ComboBox.FormattingEnabled = true; - this.partyItem2ComboBox.Location = new System.Drawing.Point(304, 34); - this.partyItem2ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyItem2ComboBox.Location = new System.Drawing.Point(228, 28); this.partyItem2ComboBox.Name = "partyItem2ComboBox"; - this.partyItem2ComboBox.Size = new System.Drawing.Size(136, 24); + this.partyItem2ComboBox.Size = new System.Drawing.Size(103, 21); this.partyItem2ComboBox.TabIndex = 2; this.partyItem2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem2ComboBox_SelectedIndexChanged); // // partyPokemon2PictureBox // - this.partyPokemon2PictureBox.Location = new System.Drawing.Point(15, 28); - this.partyPokemon2PictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyPokemon2PictureBox.Location = new System.Drawing.Point(11, 23); this.partyPokemon2PictureBox.Name = "partyPokemon2PictureBox"; - this.partyPokemon2PictureBox.Size = new System.Drawing.Size(53, 37); + this.partyPokemon2PictureBox.Size = new System.Drawing.Size(40, 30); this.partyPokemon2PictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.partyPokemon2PictureBox.TabIndex = 1; this.partyPokemon2PictureBox.TabStop = false; @@ -9490,10 +8829,9 @@ this.partyPokemon2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.partyPokemon2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyPokemon2ComboBox.FormattingEnabled = true; - this.partyPokemon2ComboBox.Location = new System.Drawing.Point(77, 34); - this.partyPokemon2ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyPokemon2ComboBox.Location = new System.Drawing.Point(58, 28); this.partyPokemon2ComboBox.Name = "partyPokemon2ComboBox"; - this.partyPokemon2ComboBox.Size = new System.Drawing.Size(167, 24); + this.partyPokemon2ComboBox.Size = new System.Drawing.Size(126, 21); this.partyPokemon2ComboBox.TabIndex = 0; this.partyPokemon2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon2ComboBox_SelectedIndexChanged); // @@ -9514,11 +8852,9 @@ this.party1GroupBox.Controls.Add(this.partyPokemon1PictureBox); this.party1GroupBox.Controls.Add(this.partyPokemon1ComboBox); this.party1GroupBox.Enabled = false; - this.party1GroupBox.Location = new System.Drawing.Point(21, 46); - this.party1GroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.party1GroupBox.Location = new System.Drawing.Point(16, 37); this.party1GroupBox.Name = "party1GroupBox"; - this.party1GroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.party1GroupBox.Size = new System.Drawing.Size(457, 225); + this.party1GroupBox.Size = new System.Drawing.Size(343, 183); this.party1GroupBox.TabIndex = 0; this.party1GroupBox.TabStop = false; this.party1GroupBox.Text = "Pokemon 1"; @@ -9529,39 +8865,35 @@ this.partyForm1ComboBox.FormattingEnabled = true; this.partyForm1ComboBox.Items.AddRange(new object[] { "Defense form"}); - this.partyForm1ComboBox.Location = new System.Drawing.Point(304, 186); - this.partyForm1ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyForm1ComboBox.Location = new System.Drawing.Point(228, 151); this.partyForm1ComboBox.Name = "partyForm1ComboBox"; - this.partyForm1ComboBox.Size = new System.Drawing.Size(136, 24); + this.partyForm1ComboBox.Size = new System.Drawing.Size(103, 21); this.partyForm1ComboBox.TabIndex = 14; // // partyAbility1ComboBox // this.partyAbility1ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.partyAbility1ComboBox.FormattingEnabled = true; - this.partyAbility1ComboBox.Location = new System.Drawing.Point(20, 186); - this.partyAbility1ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyAbility1ComboBox.Location = new System.Drawing.Point(15, 151); this.partyAbility1ComboBox.Name = "partyAbility1ComboBox"; - this.partyAbility1ComboBox.Size = new System.Drawing.Size(139, 24); + this.partyAbility1ComboBox.Size = new System.Drawing.Size(105, 21); this.partyAbility1ComboBox.TabIndex = 13; // // partyGender1ComboBox // this.partyGender1ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.partyGender1ComboBox.FormattingEnabled = true; - this.partyGender1ComboBox.Location = new System.Drawing.Point(168, 186); - this.partyGender1ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyGender1ComboBox.Location = new System.Drawing.Point(126, 151); this.partyGender1ComboBox.Name = "partyGender1ComboBox"; - this.partyGender1ComboBox.Size = new System.Drawing.Size(125, 24); + this.partyGender1ComboBox.Size = new System.Drawing.Size(95, 21); this.partyGender1ComboBox.TabIndex = 12; // // partyPokemonItemPictureBox1 // this.partyPokemonItemPictureBox1.Image = global::DSPRE.Properties.Resources.IconItem; - this.partyPokemonItemPictureBox1.Location = new System.Drawing.Point(264, 32); - this.partyPokemonItemPictureBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyPokemonItemPictureBox1.Location = new System.Drawing.Point(198, 26); this.partyPokemonItemPictureBox1.Name = "partyPokemonItemPictureBox1"; - this.partyPokemonItemPictureBox1.Size = new System.Drawing.Size(32, 31); + this.partyPokemonItemPictureBox1.Size = new System.Drawing.Size(24, 25); this.partyPokemonItemPictureBox1.TabIndex = 10; this.partyPokemonItemPictureBox1.TabStop = false; this.partyPokemonItemPictureBox1.Visible = false; @@ -9569,30 +8901,27 @@ // label47 // this.label47.AutoSize = true; - this.label47.Location = new System.Drawing.Point(16, 145); - this.label47.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label47.Location = new System.Drawing.Point(12, 118); this.label47.Name = "label47"; - this.label47.Size = new System.Drawing.Size(35, 32); + this.label47.Size = new System.Drawing.Size(28, 26); this.label47.TabIndex = 9; this.label47.Text = "Ball\r\nSeal"; // // label46 // this.label46.AutoSize = true; - this.label46.Location = new System.Drawing.Point(16, 116); - this.label46.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label46.Location = new System.Drawing.Point(12, 94); this.label46.Name = "label46"; - this.label46.Size = new System.Drawing.Size(26, 16); + this.label46.Size = new System.Drawing.Size(22, 13); this.label46.TabIndex = 8; this.label46.Text = "DV"; // // label45 // this.label45.AutoSize = true; - this.label45.Location = new System.Drawing.Point(16, 82); - this.label45.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label45.Location = new System.Drawing.Point(12, 67); this.label45.Name = "label45"; - this.label45.Size = new System.Drawing.Size(24, 16); + this.label45.Size = new System.Drawing.Size(22, 13); this.label45.TabIndex = 7; this.label45.Text = "Lv."; // @@ -9602,11 +8931,9 @@ this.poke1MovesGroupBox.Controls.Add(this.partyMove1_2ComboBox); this.poke1MovesGroupBox.Controls.Add(this.partyMove1_3ComboBox); this.poke1MovesGroupBox.Controls.Add(this.partyMove1_4ComboBox); - this.poke1MovesGroupBox.Location = new System.Drawing.Point(147, 70); - this.poke1MovesGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.poke1MovesGroupBox.Location = new System.Drawing.Point(110, 57); this.poke1MovesGroupBox.Name = "poke1MovesGroupBox"; - this.poke1MovesGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.poke1MovesGroupBox.Size = new System.Drawing.Size(303, 105); + this.poke1MovesGroupBox.Size = new System.Drawing.Size(227, 85); this.poke1MovesGroupBox.TabIndex = 6; this.poke1MovesGroupBox.TabStop = false; this.poke1MovesGroupBox.Text = "Moves"; @@ -9617,10 +8944,9 @@ this.partyMove1_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove1_1ComboBox.Enabled = false; this.partyMove1_1ComboBox.FormattingEnabled = true; - this.partyMove1_1ComboBox.Location = new System.Drawing.Point(13, 26); - this.partyMove1_1ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyMove1_1ComboBox.Location = new System.Drawing.Point(10, 21); this.partyMove1_1ComboBox.Name = "partyMove1_1ComboBox"; - this.partyMove1_1ComboBox.Size = new System.Drawing.Size(132, 24); + this.partyMove1_1ComboBox.Size = new System.Drawing.Size(100, 21); this.partyMove1_1ComboBox.TabIndex = 3; this.partyMove1_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -9630,10 +8956,9 @@ this.partyMove1_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove1_2ComboBox.Enabled = false; this.partyMove1_2ComboBox.FormattingEnabled = true; - this.partyMove1_2ComboBox.Location = new System.Drawing.Point(155, 26); - this.partyMove1_2ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyMove1_2ComboBox.Location = new System.Drawing.Point(116, 21); this.partyMove1_2ComboBox.Name = "partyMove1_2ComboBox"; - this.partyMove1_2ComboBox.Size = new System.Drawing.Size(132, 24); + this.partyMove1_2ComboBox.Size = new System.Drawing.Size(100, 21); this.partyMove1_2ComboBox.TabIndex = 6; this.partyMove1_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -9643,10 +8968,9 @@ this.partyMove1_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove1_3ComboBox.Enabled = false; this.partyMove1_3ComboBox.FormattingEnabled = true; - this.partyMove1_3ComboBox.Location = new System.Drawing.Point(13, 59); - this.partyMove1_3ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyMove1_3ComboBox.Location = new System.Drawing.Point(10, 48); this.partyMove1_3ComboBox.Name = "partyMove1_3ComboBox"; - this.partyMove1_3ComboBox.Size = new System.Drawing.Size(132, 24); + this.partyMove1_3ComboBox.Size = new System.Drawing.Size(100, 21); this.partyMove1_3ComboBox.TabIndex = 5; this.partyMove1_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // @@ -9656,37 +8980,34 @@ this.partyMove1_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyMove1_4ComboBox.Enabled = false; this.partyMove1_4ComboBox.FormattingEnabled = true; - this.partyMove1_4ComboBox.Location = new System.Drawing.Point(155, 59); - this.partyMove1_4ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyMove1_4ComboBox.Location = new System.Drawing.Point(116, 48); this.partyMove1_4ComboBox.Name = "partyMove1_4ComboBox"; - this.partyMove1_4ComboBox.Size = new System.Drawing.Size(132, 24); + this.partyMove1_4ComboBox.Size = new System.Drawing.Size(100, 21); this.partyMove1_4ComboBox.TabIndex = 7; this.partyMove1_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); // // partyIV1UpDown // - this.partyIV1UpDown.Location = new System.Drawing.Point(64, 113); - this.partyIV1UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyIV1UpDown.Location = new System.Drawing.Point(48, 92); this.partyIV1UpDown.Maximum = new decimal(new int[] { 255, 0, 0, 0}); this.partyIV1UpDown.Name = "partyIV1UpDown"; - this.partyIV1UpDown.Size = new System.Drawing.Size(65, 22); + this.partyIV1UpDown.Size = new System.Drawing.Size(49, 20); this.partyIV1UpDown.TabIndex = 5; // // partyLevel1UpDown // - this.partyLevel1UpDown.Location = new System.Drawing.Point(64, 78); - this.partyLevel1UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyLevel1UpDown.Location = new System.Drawing.Point(48, 63); this.partyLevel1UpDown.Minimum = new decimal(new int[] { 1, 0, 0, 0}); this.partyLevel1UpDown.Name = "partyLevel1UpDown"; - this.partyLevel1UpDown.Size = new System.Drawing.Size(65, 22); + this.partyLevel1UpDown.Size = new System.Drawing.Size(49, 20); this.partyLevel1UpDown.TabIndex = 4; this.partyLevel1UpDown.Value = new decimal(new int[] { 1, @@ -9696,15 +9017,14 @@ // // partyBall1UpDown // - this.partyBall1UpDown.Location = new System.Drawing.Point(64, 149); - this.partyBall1UpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyBall1UpDown.Location = new System.Drawing.Point(48, 121); this.partyBall1UpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.partyBall1UpDown.Name = "partyBall1UpDown"; - this.partyBall1UpDown.Size = new System.Drawing.Size(65, 22); + this.partyBall1UpDown.Size = new System.Drawing.Size(49, 20); this.partyBall1UpDown.TabIndex = 3; // // partyItem1ComboBox @@ -9713,19 +9033,17 @@ this.partyItem1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyItem1ComboBox.Enabled = false; this.partyItem1ComboBox.FormattingEnabled = true; - this.partyItem1ComboBox.Location = new System.Drawing.Point(304, 34); - this.partyItem1ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyItem1ComboBox.Location = new System.Drawing.Point(228, 28); this.partyItem1ComboBox.Name = "partyItem1ComboBox"; - this.partyItem1ComboBox.Size = new System.Drawing.Size(136, 24); + this.partyItem1ComboBox.Size = new System.Drawing.Size(103, 21); this.partyItem1ComboBox.TabIndex = 2; this.partyItem1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem1ComboBox_SelectedIndexChanged); // // partyPokemon1PictureBox // - this.partyPokemon1PictureBox.Location = new System.Drawing.Point(15, 28); - this.partyPokemon1PictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyPokemon1PictureBox.Location = new System.Drawing.Point(11, 23); this.partyPokemon1PictureBox.Name = "partyPokemon1PictureBox"; - this.partyPokemon1PictureBox.Size = new System.Drawing.Size(53, 37); + this.partyPokemon1PictureBox.Size = new System.Drawing.Size(40, 30); this.partyPokemon1PictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.partyPokemon1PictureBox.TabIndex = 1; this.partyPokemon1PictureBox.TabStop = false; @@ -9735,10 +9053,9 @@ this.partyPokemon1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.partyPokemon1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.partyPokemon1ComboBox.FormattingEnabled = true; - this.partyPokemon1ComboBox.Location = new System.Drawing.Point(77, 34); - this.partyPokemon1ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyPokemon1ComboBox.Location = new System.Drawing.Point(58, 28); this.partyPokemon1ComboBox.Name = "partyPokemon1ComboBox"; - this.partyPokemon1ComboBox.Size = new System.Drawing.Size(167, 24); + this.partyPokemon1ComboBox.Size = new System.Drawing.Size(126, 21); this.partyPokemon1ComboBox.TabIndex = 0; this.partyPokemon1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon1ComboBox_SelectedIndexChanged); // @@ -9755,11 +9072,9 @@ this.groupBox27.Controls.Add(this.trainerClassNameTextbox); this.groupBox27.Controls.Add(this.label17); this.groupBox27.Controls.Add(this.trainerClassPicBox); - this.groupBox27.Location = new System.Drawing.Point(20, 602); - this.groupBox27.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox27.Location = new System.Drawing.Point(15, 489); this.groupBox27.Name = "groupBox27"; - this.groupBox27.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox27.Size = new System.Drawing.Size(552, 151); + this.groupBox27.Size = new System.Drawing.Size(414, 123); this.groupBox27.TabIndex = 30; this.groupBox27.TabStop = false; this.groupBox27.Text = "Trainer Class Editor"; @@ -9767,76 +9082,69 @@ // eyeContactMusicAltLabel // this.eyeContactMusicAltLabel.AutoSize = true; - this.eyeContactMusicAltLabel.Location = new System.Drawing.Point(381, 85); - this.eyeContactMusicAltLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.eyeContactMusicAltLabel.Location = new System.Drawing.Point(286, 69); this.eyeContactMusicAltLabel.Name = "eyeContactMusicAltLabel"; - this.eyeContactMusicAltLabel.Size = new System.Drawing.Size(143, 16); + this.eyeContactMusicAltLabel.Size = new System.Drawing.Size(117, 13); this.eyeContactMusicAltLabel.TabIndex = 36; this.eyeContactMusicAltLabel.Text = "Eye Contact Music [Alt]"; // // encounterSSEQAltUpDown // this.encounterSSEQAltUpDown.Enabled = false; - this.encounterSSEQAltUpDown.Location = new System.Drawing.Point(387, 105); - this.encounterSSEQAltUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.encounterSSEQAltUpDown.Location = new System.Drawing.Point(290, 85); this.encounterSSEQAltUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.encounterSSEQAltUpDown.Name = "encounterSSEQAltUpDown"; - this.encounterSSEQAltUpDown.Size = new System.Drawing.Size(108, 22); + this.encounterSSEQAltUpDown.Size = new System.Drawing.Size(81, 20); this.encounterSSEQAltUpDown.TabIndex = 35; // // eyeContactMusicLabel // this.eyeContactMusicLabel.AutoSize = true; - this.eyeContactMusicLabel.Location = new System.Drawing.Point(191, 85); - this.eyeContactMusicLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.eyeContactMusicLabel.Location = new System.Drawing.Point(143, 69); this.eyeContactMusicLabel.Name = "eyeContactMusicLabel"; - this.eyeContactMusicLabel.Size = new System.Drawing.Size(157, 16); + this.eyeContactMusicLabel.Size = new System.Drawing.Size(128, 13); this.eyeContactMusicLabel.TabIndex = 34; this.eyeContactMusicLabel.Text = "Eye Contact Music [Main]"; // // encounterSSEQMainUpDown // - this.encounterSSEQMainUpDown.Location = new System.Drawing.Point(195, 105); - this.encounterSSEQMainUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.encounterSSEQMainUpDown.Location = new System.Drawing.Point(146, 85); this.encounterSSEQMainUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.encounterSSEQMainUpDown.Name = "encounterSSEQMainUpDown"; - this.encounterSSEQMainUpDown.Size = new System.Drawing.Size(108, 22); + this.encounterSSEQMainUpDown.Size = new System.Drawing.Size(81, 20); this.encounterSSEQMainUpDown.TabIndex = 33; // // trainerClassFrameMaxLabel // this.trainerClassFrameMaxLabel.AutoSize = true; - this.trainerClassFrameMaxLabel.Location = new System.Drawing.Point(240, 41); - this.trainerClassFrameMaxLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.trainerClassFrameMaxLabel.Location = new System.Drawing.Point(180, 33); this.trainerClassFrameMaxLabel.Name = "trainerClassFrameMaxLabel"; - this.trainerClassFrameMaxLabel.Size = new System.Drawing.Size(18, 16); + this.trainerClassFrameMaxLabel.Size = new System.Drawing.Size(18, 13); this.trainerClassFrameMaxLabel.TabIndex = 32; this.trainerClassFrameMaxLabel.Text = "/0"; // // label40 // this.label40.AutoSize = true; - this.label40.Location = new System.Drawing.Point(191, 17); - this.label40.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label40.Location = new System.Drawing.Point(143, 14); this.label40.Name = "label40"; - this.label40.Size = new System.Drawing.Size(55, 16); + this.label40.Size = new System.Drawing.Size(45, 13); this.label40.TabIndex = 31; this.label40.Text = "Preview"; // // trClassFramePreviewUpDown // - this.trClassFramePreviewUpDown.Location = new System.Drawing.Point(195, 37); - this.trClassFramePreviewUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.trClassFramePreviewUpDown.Location = new System.Drawing.Point(146, 30); this.trClassFramePreviewUpDown.Name = "trClassFramePreviewUpDown"; - this.trClassFramePreviewUpDown.Size = new System.Drawing.Size(45, 22); + this.trClassFramePreviewUpDown.Size = new System.Drawing.Size(34, 20); this.trClassFramePreviewUpDown.TabIndex = 30; this.trClassFramePreviewUpDown.ValueChanged += new System.EventHandler(this.trClassFramePreviewUpDown_ValueChanged); // @@ -9844,10 +9152,9 @@ // this.saveTrainerClassButton.Image = global::DSPRE.Properties.Resources.save_rom; this.saveTrainerClassButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.saveTrainerClassButton.Location = new System.Drawing.Point(429, 18); - this.saveTrainerClassButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.saveTrainerClassButton.Location = new System.Drawing.Point(322, 15); this.saveTrainerClassButton.Name = "saveTrainerClassButton"; - this.saveTrainerClassButton.Size = new System.Drawing.Size(107, 55); + this.saveTrainerClassButton.Size = new System.Drawing.Size(80, 45); this.saveTrainerClassButton.TabIndex = 29; this.saveTrainerClassButton.Text = "&Save\r\nClass"; this.saveTrainerClassButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -9856,29 +9163,26 @@ // // trainerClassNameTextbox // - this.trainerClassNameTextbox.Location = new System.Drawing.Point(284, 36); - this.trainerClassNameTextbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.trainerClassNameTextbox.Location = new System.Drawing.Point(213, 29); this.trainerClassNameTextbox.Name = "trainerClassNameTextbox"; - this.trainerClassNameTextbox.Size = new System.Drawing.Size(131, 22); + this.trainerClassNameTextbox.Size = new System.Drawing.Size(99, 20); this.trainerClassNameTextbox.TabIndex = 24; // // label17 // this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(280, 16); - this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label17.Location = new System.Drawing.Point(210, 13); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(81, 16); + this.label17.Size = new System.Drawing.Size(63, 13); this.label17.TabIndex = 23; this.label17.Text = "Class Name"; // // trainerClassPicBox // this.trainerClassPicBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.trainerClassPicBox.Location = new System.Drawing.Point(12, 21); - this.trainerClassPicBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.trainerClassPicBox.Location = new System.Drawing.Point(9, 17); this.trainerClassPicBox.Name = "trainerClassPicBox"; - this.trainerClassPicBox.Size = new System.Drawing.Size(170, 118); + this.trainerClassPicBox.Size = new System.Drawing.Size(128, 96); this.trainerClassPicBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.trainerClassPicBox.TabIndex = 0; this.trainerClassPicBox.TabStop = false; @@ -9899,11 +9203,9 @@ this.groupBox25.Controls.Add(this.label63); this.groupBox25.Controls.Add(this.label43); this.groupBox25.Controls.Add(this.trainerClassListBox); - this.groupBox25.Location = new System.Drawing.Point(20, 98); - this.groupBox25.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox25.Location = new System.Drawing.Point(15, 80); this.groupBox25.Name = "groupBox25"; - this.groupBox25.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox25.Size = new System.Drawing.Size(552, 498); + this.groupBox25.Size = new System.Drawing.Size(414, 405); this.groupBox25.TabIndex = 29; this.groupBox25.TabStop = false; this.groupBox25.Text = "Trainer Properties [TRP]"; @@ -9912,19 +9214,18 @@ // this.tableLayoutPanel5.ColumnCount = 1; this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27F)); - this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27F)); - this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27F)); + this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tableLayoutPanel5.Controls.Add(this.replacePropertiesButton, 0, 1); this.tableLayoutPanel5.Controls.Add(this.exportPropertiesButton, 0, 0); - this.tableLayoutPanel5.Location = new System.Drawing.Point(384, 374); - this.tableLayoutPanel5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tableLayoutPanel5.Location = new System.Drawing.Point(288, 304); this.tableLayoutPanel5.Name = "tableLayoutPanel5"; this.tableLayoutPanel5.RowCount = 2; this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); - this.tableLayoutPanel5.Size = new System.Drawing.Size(161, 76); + this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel5.Size = new System.Drawing.Size(121, 62); this.tableLayoutPanel5.TabIndex = 48; // // replacePropertiesButton @@ -9932,10 +9233,9 @@ this.replacePropertiesButton.Dock = System.Windows.Forms.DockStyle.Fill; this.replacePropertiesButton.Image = ((System.Drawing.Image)(resources.GetObject("replacePropertiesButton.Image"))); this.replacePropertiesButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.replacePropertiesButton.Location = new System.Drawing.Point(4, 42); - this.replacePropertiesButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.replacePropertiesButton.Location = new System.Drawing.Point(3, 34); this.replacePropertiesButton.Name = "replacePropertiesButton"; - this.replacePropertiesButton.Size = new System.Drawing.Size(153, 30); + this.replacePropertiesButton.Size = new System.Drawing.Size(115, 25); this.replacePropertiesButton.TabIndex = 42; this.replacePropertiesButton.Text = "Replace TRP"; this.replacePropertiesButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -9947,10 +9247,9 @@ this.exportPropertiesButton.Dock = System.Windows.Forms.DockStyle.Fill; this.exportPropertiesButton.Image = ((System.Drawing.Image)(resources.GetObject("exportPropertiesButton.Image"))); this.exportPropertiesButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.exportPropertiesButton.Location = new System.Drawing.Point(4, 4); - this.exportPropertiesButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.exportPropertiesButton.Location = new System.Drawing.Point(3, 3); this.exportPropertiesButton.Name = "exportPropertiesButton"; - this.exportPropertiesButton.Size = new System.Drawing.Size(153, 30); + this.exportPropertiesButton.Size = new System.Drawing.Size(115, 25); this.exportPropertiesButton.TabIndex = 41; this.exportPropertiesButton.Text = "Export TRP"; this.exportPropertiesButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -9970,11 +9269,9 @@ this.TrainerAIGroupBox.Controls.Add(this.trainerAI9CheckBox); this.TrainerAIGroupBox.Controls.Add(this.trainerAI10CheckBox); this.TrainerAIGroupBox.Controls.Add(this.trainerAI11CheckBox); - this.TrainerAIGroupBox.Location = new System.Drawing.Point(12, 347); - this.TrainerAIGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.TrainerAIGroupBox.Location = new System.Drawing.Point(9, 282); this.TrainerAIGroupBox.Name = "TrainerAIGroupBox"; - this.TrainerAIGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.TrainerAIGroupBox.Size = new System.Drawing.Size(363, 143); + this.TrainerAIGroupBox.Size = new System.Drawing.Size(272, 116); this.TrainerAIGroupBox.TabIndex = 27; this.TrainerAIGroupBox.TabStop = false; this.TrainerAIGroupBox.Text = "AI"; @@ -9982,10 +9279,9 @@ // trainerAI1CheckBox // this.trainerAI1CheckBox.AutoSize = true; - this.trainerAI1CheckBox.Location = new System.Drawing.Point(13, 26); - this.trainerAI1CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.trainerAI1CheckBox.Location = new System.Drawing.Point(10, 21); this.trainerAI1CheckBox.Name = "trainerAI1CheckBox"; - this.trainerAI1CheckBox.Size = new System.Drawing.Size(63, 20); + this.trainerAI1CheckBox.Size = new System.Drawing.Size(52, 17); this.trainerAI1CheckBox.TabIndex = 0; this.trainerAI1CheckBox.Text = "Basic"; this.trainerAI1CheckBox.UseVisualStyleBackColor = true; @@ -9993,10 +9289,9 @@ // trainerAI2CheckBox // this.trainerAI2CheckBox.AutoSize = true; - this.trainerAI2CheckBox.Location = new System.Drawing.Point(107, 26); - this.trainerAI2CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.trainerAI2CheckBox.Location = new System.Drawing.Point(80, 21); this.trainerAI2CheckBox.Name = "trainerAI2CheckBox"; - this.trainerAI2CheckBox.Size = new System.Drawing.Size(122, 20); + this.trainerAI2CheckBox.Size = new System.Drawing.Size(102, 17); this.trainerAI2CheckBox.TabIndex = 1; this.trainerAI2CheckBox.Text = "Evaluate Attack"; this.trainerAI2CheckBox.UseVisualStyleBackColor = true; @@ -10004,10 +9299,9 @@ // trainerAI3CheckBox // this.trainerAI3CheckBox.AutoSize = true; - this.trainerAI3CheckBox.Location = new System.Drawing.Point(13, 54); - this.trainerAI3CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.trainerAI3CheckBox.Location = new System.Drawing.Point(10, 44); this.trainerAI3CheckBox.Name = "trainerAI3CheckBox"; - this.trainerAI3CheckBox.Size = new System.Drawing.Size(67, 20); + this.trainerAI3CheckBox.Size = new System.Drawing.Size(56, 17); this.trainerAI3CheckBox.TabIndex = 2; this.trainerAI3CheckBox.Text = "Expert"; this.trainerAI3CheckBox.UseVisualStyleBackColor = true; @@ -10015,10 +9309,9 @@ // trainerAI4CheckBox // this.trainerAI4CheckBox.AutoSize = true; - this.trainerAI4CheckBox.Location = new System.Drawing.Point(13, 111); - this.trainerAI4CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.trainerAI4CheckBox.Location = new System.Drawing.Point(10, 90); this.trainerAI4CheckBox.Name = "trainerAI4CheckBox"; - this.trainerAI4CheckBox.Size = new System.Drawing.Size(66, 20); + this.trainerAI4CheckBox.Size = new System.Drawing.Size(56, 17); this.trainerAI4CheckBox.TabIndex = 3; this.trainerAI4CheckBox.Text = "Status"; this.trainerAI4CheckBox.UseVisualStyleBackColor = true; @@ -10026,10 +9319,9 @@ // trainerAI5CheckBox // this.trainerAI5CheckBox.AutoSize = true; - this.trainerAI5CheckBox.Location = new System.Drawing.Point(13, 82); - this.trainerAI5CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.trainerAI5CheckBox.Location = new System.Drawing.Point(10, 67); this.trainerAI5CheckBox.Name = "trainerAI5CheckBox"; - this.trainerAI5CheckBox.Size = new System.Drawing.Size(56, 20); + this.trainerAI5CheckBox.Size = new System.Drawing.Size(47, 17); this.trainerAI5CheckBox.TabIndex = 4; this.trainerAI5CheckBox.Text = "Risk"; this.trainerAI5CheckBox.UseVisualStyleBackColor = true; @@ -10037,10 +9329,9 @@ // trainerAI6CheckBox // this.trainerAI6CheckBox.AutoSize = true; - this.trainerAI6CheckBox.Location = new System.Drawing.Point(107, 54); - this.trainerAI6CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.trainerAI6CheckBox.Location = new System.Drawing.Point(80, 44); this.trainerAI6CheckBox.Name = "trainerAI6CheckBox"; - this.trainerAI6CheckBox.Size = new System.Drawing.Size(126, 20); + this.trainerAI6CheckBox.Size = new System.Drawing.Size(100, 17); this.trainerAI6CheckBox.TabIndex = 5; this.trainerAI6CheckBox.Text = "Damage Priority"; this.trainerAI6CheckBox.UseVisualStyleBackColor = true; @@ -10048,10 +9339,9 @@ // trainerAI7CheckBox // this.trainerAI7CheckBox.AutoSize = true; - this.trainerAI7CheckBox.Location = new System.Drawing.Point(107, 82); - this.trainerAI7CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.trainerAI7CheckBox.Location = new System.Drawing.Point(80, 67); this.trainerAI7CheckBox.Name = "trainerAI7CheckBox"; - this.trainerAI7CheckBox.Size = new System.Drawing.Size(98, 20); + this.trainerAI7CheckBox.Size = new System.Drawing.Size(80, 17); this.trainerAI7CheckBox.TabIndex = 6; this.trainerAI7CheckBox.Text = "Baton Pass"; this.trainerAI7CheckBox.UseVisualStyleBackColor = true; @@ -10059,10 +9349,9 @@ // trainerAI8CheckBox // this.trainerAI8CheckBox.AutoSize = true; - this.trainerAI8CheckBox.Location = new System.Drawing.Point(107, 111); - this.trainerAI8CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.trainerAI8CheckBox.Location = new System.Drawing.Point(80, 90); this.trainerAI8CheckBox.Name = "trainerAI8CheckBox"; - this.trainerAI8CheckBox.Size = new System.Drawing.Size(107, 20); + this.trainerAI8CheckBox.Size = new System.Drawing.Size(87, 17); this.trainerAI8CheckBox.TabIndex = 7; this.trainerAI8CheckBox.Text = "Tag Strategy"; this.trainerAI8CheckBox.UseVisualStyleBackColor = true; @@ -10070,10 +9359,9 @@ // trainerAI9CheckBox // this.trainerAI9CheckBox.AutoSize = true; - this.trainerAI9CheckBox.Location = new System.Drawing.Point(255, 26); - this.trainerAI9CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.trainerAI9CheckBox.Location = new System.Drawing.Point(191, 21); this.trainerAI9CheckBox.Name = "trainerAI9CheckBox"; - this.trainerAI9CheckBox.Size = new System.Drawing.Size(89, 20); + this.trainerAI9CheckBox.Size = new System.Drawing.Size(75, 17); this.trainerAI9CheckBox.TabIndex = 8; this.trainerAI9CheckBox.Text = "Check HP"; this.trainerAI9CheckBox.UseVisualStyleBackColor = true; @@ -10081,10 +9369,9 @@ // trainerAI10CheckBox // this.trainerAI10CheckBox.AutoSize = true; - this.trainerAI10CheckBox.Location = new System.Drawing.Point(255, 54); - this.trainerAI10CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.trainerAI10CheckBox.Location = new System.Drawing.Point(191, 44); this.trainerAI10CheckBox.Name = "trainerAI10CheckBox"; - this.trainerAI10CheckBox.Size = new System.Drawing.Size(80, 20); + this.trainerAI10CheckBox.Size = new System.Drawing.Size(67, 17); this.trainerAI10CheckBox.TabIndex = 9; this.trainerAI10CheckBox.Text = "Weather"; this.trainerAI10CheckBox.UseVisualStyleBackColor = true; @@ -10092,10 +9379,9 @@ // trainerAI11CheckBox // this.trainerAI11CheckBox.AutoSize = true; - this.trainerAI11CheckBox.Location = new System.Drawing.Point(255, 82); - this.trainerAI11CheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.trainerAI11CheckBox.Location = new System.Drawing.Point(191, 67); this.trainerAI11CheckBox.Name = "trainerAI11CheckBox"; - this.trainerAI11CheckBox.Size = new System.Drawing.Size(50, 20); + this.trainerAI11CheckBox.Size = new System.Drawing.Size(44, 17); this.trainerAI11CheckBox.TabIndex = 10; this.trainerAI11CheckBox.Text = "???"; this.trainerAI11CheckBox.UseVisualStyleBackColor = true; @@ -10106,11 +9392,9 @@ this.trainerItemsGroupBox.Controls.Add(this.trainerItem2ComboBox); this.trainerItemsGroupBox.Controls.Add(this.trainerItem3ComboBox); this.trainerItemsGroupBox.Controls.Add(this.trainerItem4ComboBox); - this.trainerItemsGroupBox.Location = new System.Drawing.Point(281, 180); - this.trainerItemsGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.trainerItemsGroupBox.Location = new System.Drawing.Point(211, 146); this.trainerItemsGroupBox.Name = "trainerItemsGroupBox"; - this.trainerItemsGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.trainerItemsGroupBox.Size = new System.Drawing.Size(255, 160); + this.trainerItemsGroupBox.Size = new System.Drawing.Size(191, 130); this.trainerItemsGroupBox.TabIndex = 26; this.trainerItemsGroupBox.TabStop = false; this.trainerItemsGroupBox.Text = "Trainer Items"; @@ -10120,10 +9404,9 @@ this.trainerItem1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.trainerItem1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.trainerItem1ComboBox.FormattingEnabled = true; - this.trainerItem1ComboBox.Location = new System.Drawing.Point(12, 25); - this.trainerItem1ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.trainerItem1ComboBox.Location = new System.Drawing.Point(9, 20); this.trainerItem1ComboBox.Name = "trainerItem1ComboBox"; - this.trainerItem1ComboBox.Size = new System.Drawing.Size(227, 24); + this.trainerItem1ComboBox.Size = new System.Drawing.Size(171, 21); this.trainerItem1ComboBox.TabIndex = 0; // // trainerItem2ComboBox @@ -10131,10 +9414,9 @@ this.trainerItem2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.trainerItem2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.trainerItem2ComboBox.FormattingEnabled = true; - this.trainerItem2ComboBox.Location = new System.Drawing.Point(12, 58); - this.trainerItem2ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.trainerItem2ComboBox.Location = new System.Drawing.Point(9, 47); this.trainerItem2ComboBox.Name = "trainerItem2ComboBox"; - this.trainerItem2ComboBox.Size = new System.Drawing.Size(227, 24); + this.trainerItem2ComboBox.Size = new System.Drawing.Size(171, 21); this.trainerItem2ComboBox.TabIndex = 1; // // trainerItem3ComboBox @@ -10142,10 +9424,9 @@ this.trainerItem3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.trainerItem3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.trainerItem3ComboBox.FormattingEnabled = true; - this.trainerItem3ComboBox.Location = new System.Drawing.Point(12, 91); - this.trainerItem3ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.trainerItem3ComboBox.Location = new System.Drawing.Point(9, 74); this.trainerItem3ComboBox.Name = "trainerItem3ComboBox"; - this.trainerItem3ComboBox.Size = new System.Drawing.Size(227, 24); + this.trainerItem3ComboBox.Size = new System.Drawing.Size(171, 21); this.trainerItem3ComboBox.TabIndex = 2; // // trainerItem4ComboBox @@ -10153,10 +9434,9 @@ this.trainerItem4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.trainerItem4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.trainerItem4ComboBox.FormattingEnabled = true; - this.trainerItem4ComboBox.Location = new System.Drawing.Point(12, 124); - this.trainerItem4ComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.trainerItem4ComboBox.Location = new System.Drawing.Point(9, 101); this.trainerItem4ComboBox.Name = "trainerItem4ComboBox"; - this.trainerItem4ComboBox.Size = new System.Drawing.Size(227, 24); + this.trainerItem4ComboBox.Size = new System.Drawing.Size(171, 21); this.trainerItem4ComboBox.TabIndex = 3; // // deleteTrainerButton @@ -10164,10 +9444,9 @@ this.deleteTrainerButton.Enabled = false; this.deleteTrainerButton.Image = global::DSPRE.Properties.Resources.deleteIcon; this.deleteTrainerButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.deleteTrainerButton.Location = new System.Drawing.Point(385, 458); - this.deleteTrainerButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.deleteTrainerButton.Location = new System.Drawing.Point(289, 372); this.deleteTrainerButton.Name = "deleteTrainerButton"; - this.deleteTrainerButton.Size = new System.Drawing.Size(136, 28); + this.deleteTrainerButton.Size = new System.Drawing.Size(102, 23); this.deleteTrainerButton.TabIndex = 44; this.deleteTrainerButton.Text = "Delete Trainer"; this.deleteTrainerButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -10177,10 +9456,9 @@ // trainerItemsCheckBox // this.trainerItemsCheckBox.AutoSize = true; - this.trainerItemsCheckBox.Location = new System.Drawing.Point(287, 142); - this.trainerItemsCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.trainerItemsCheckBox.Location = new System.Drawing.Point(215, 115); this.trainerItemsCheckBox.Name = "trainerItemsCheckBox"; - this.trainerItemsCheckBox.Size = new System.Drawing.Size(145, 20); + this.trainerItemsCheckBox.Size = new System.Drawing.Size(117, 17); this.trainerItemsCheckBox.TabIndex = 25; this.trainerItemsCheckBox.Text = "Choose Party Items"; this.trainerItemsCheckBox.UseVisualStyleBackColor = true; @@ -10191,10 +9469,9 @@ this.addTrainerButton.Enabled = false; this.addTrainerButton.Image = global::DSPRE.Properties.Resources.addIcon; this.addTrainerButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addTrainerButton.Location = new System.Drawing.Point(392, 338); - this.addTrainerButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.addTrainerButton.Location = new System.Drawing.Point(294, 275); this.addTrainerButton.Name = "addTrainerButton"; - this.addTrainerButton.Size = new System.Drawing.Size(136, 28); + this.addTrainerButton.Size = new System.Drawing.Size(102, 23); this.addTrainerButton.TabIndex = 35; this.addTrainerButton.Text = "Add Trainer"; this.addTrainerButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -10205,10 +9482,9 @@ // trainerMovesCheckBox // this.trainerMovesCheckBox.AutoSize = true; - this.trainerMovesCheckBox.Location = new System.Drawing.Point(287, 116); - this.trainerMovesCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.trainerMovesCheckBox.Location = new System.Drawing.Point(215, 94); this.trainerMovesCheckBox.Name = "trainerMovesCheckBox"; - this.trainerMovesCheckBox.Size = new System.Drawing.Size(120, 20); + this.trainerMovesCheckBox.Size = new System.Drawing.Size(97, 17); this.trainerMovesCheckBox.TabIndex = 24; this.trainerMovesCheckBox.Text = "Choose Moves"; this.trainerMovesCheckBox.UseVisualStyleBackColor = true; @@ -10217,84 +9493,75 @@ // trainerDoubleCheckBox // this.trainerDoubleCheckBox.AutoSize = true; - this.trainerDoubleCheckBox.Location = new System.Drawing.Point(287, 89); - this.trainerDoubleCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.trainerDoubleCheckBox.Location = new System.Drawing.Point(215, 72); this.trainerDoubleCheckBox.Name = "trainerDoubleCheckBox"; - this.trainerDoubleCheckBox.Size = new System.Drawing.Size(110, 20); + this.trainerDoubleCheckBox.Size = new System.Drawing.Size(90, 17); this.trainerDoubleCheckBox.TabIndex = 23; this.trainerDoubleCheckBox.Text = "Double Battle"; this.trainerDoubleCheckBox.UseVisualStyleBackColor = true; // // trainerNameTextBox // - this.trainerNameTextBox.Location = new System.Drawing.Point(287, 48); - this.trainerNameTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.trainerNameTextBox.Location = new System.Drawing.Point(215, 39); this.trainerNameTextBox.Name = "trainerNameTextBox"; - this.trainerNameTextBox.Size = new System.Drawing.Size(196, 22); + this.trainerNameTextBox.Size = new System.Drawing.Size(148, 20); this.trainerNameTextBox.TabIndex = 22; // // partyCountUpDown // - this.partyCountUpDown.Location = new System.Drawing.Point(461, 122); - this.partyCountUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.partyCountUpDown.Location = new System.Drawing.Point(346, 99); this.partyCountUpDown.Maximum = new decimal(new int[] { 6, 0, 0, 0}); this.partyCountUpDown.Name = "partyCountUpDown"; - this.partyCountUpDown.Size = new System.Drawing.Size(55, 22); + this.partyCountUpDown.Size = new System.Drawing.Size(41, 20); this.partyCountUpDown.TabIndex = 33; this.partyCountUpDown.ValueChanged += new System.EventHandler(this.partyCountUpDown_ValueChanged); // // label44 // this.label44.AutoSize = true; - this.label44.Location = new System.Drawing.Point(283, 28); - this.label44.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label44.Location = new System.Drawing.Point(212, 23); this.label44.Name = "label44"; - this.label44.Size = new System.Drawing.Size(90, 16); + this.label44.Size = new System.Drawing.Size(71, 13); this.label44.TabIndex = 21; this.label44.Text = "Trainer Name"; // // label63 // this.label63.AutoSize = true; - this.label63.Location = new System.Drawing.Point(452, 102); - this.label63.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label63.Location = new System.Drawing.Point(339, 83); this.label63.Name = "label63"; - this.label63.Size = new System.Drawing.Size(71, 16); + this.label63.Size = new System.Drawing.Size(57, 13); this.label63.TabIndex = 34; this.label63.Text = "Party Slots"; // // label43 // this.label43.AutoSize = true; - this.label43.Location = new System.Drawing.Point(13, 28); - this.label43.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label43.Location = new System.Drawing.Point(10, 23); this.label43.Name = "label43"; - this.label43.Size = new System.Drawing.Size(87, 16); + this.label43.Size = new System.Drawing.Size(68, 13); this.label43.TabIndex = 20; this.label43.Text = "Trainer Class"; // // trainerClassListBox // this.trainerClassListBox.FormattingEnabled = true; - this.trainerClassListBox.ItemHeight = 16; - this.trainerClassListBox.Location = new System.Drawing.Point(15, 48); - this.trainerClassListBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.trainerClassListBox.Location = new System.Drawing.Point(11, 39); this.trainerClassListBox.Name = "trainerClassListBox"; - this.trainerClassListBox.Size = new System.Drawing.Size(256, 292); + this.trainerClassListBox.Size = new System.Drawing.Size(193, 238); this.trainerClassListBox.TabIndex = 0; this.trainerClassListBox.SelectedIndexChanged += new System.EventHandler(this.trainerClassListBox_SelectedIndexChanged); // // label42 // this.label42.AutoSize = true; - this.label42.Location = new System.Drawing.Point(16, 9); - this.label42.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label42.Location = new System.Drawing.Point(12, 7); this.label42.Name = "label42"; - this.label42.Size = new System.Drawing.Size(75, 16); + this.label42.Size = new System.Drawing.Size(59, 13); this.label42.TabIndex = 28; this.label42.Text = "Trainer File"; // @@ -10302,10 +9569,9 @@ // this.trainerComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.trainerComboBox.FormattingEnabled = true; - this.trainerComboBox.Location = new System.Drawing.Point(20, 27); - this.trainerComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.trainerComboBox.Location = new System.Drawing.Point(15, 22); this.trainerComboBox.Name = "trainerComboBox"; - this.trainerComboBox.Size = new System.Drawing.Size(264, 24); + this.trainerComboBox.Size = new System.Drawing.Size(199, 21); this.trainerComboBox.TabIndex = 27; this.trainerComboBox.SelectedIndexChanged += new System.EventHandler(this.trainerComboBox_SelectedIndexChanged); // @@ -10313,10 +9579,9 @@ // this.trainerSaveCurrentButton.Image = global::DSPRE.Properties.Resources.saveButton; this.trainerSaveCurrentButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.trainerSaveCurrentButton.Location = new System.Drawing.Point(20, 60); - this.trainerSaveCurrentButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.trainerSaveCurrentButton.Location = new System.Drawing.Point(15, 49); this.trainerSaveCurrentButton.Name = "trainerSaveCurrentButton"; - this.trainerSaveCurrentButton.Size = new System.Drawing.Size(265, 28); + this.trainerSaveCurrentButton.Size = new System.Drawing.Size(199, 23); this.trainerSaveCurrentButton.TabIndex = 31; this.trainerSaveCurrentButton.Text = "&Save Full Trainer File"; this.trainerSaveCurrentButton.UseVisualStyleBackColor = true; @@ -10328,11 +9593,10 @@ this.tableEditorTabPage.Controls.Add(this.pbEffectsGroupBox); this.tableEditorTabPage.Controls.Add(this.conditionalMusicGroupBox); this.tableEditorTabPage.ImageIndex = 9; - this.tableEditorTabPage.Location = new System.Drawing.Point(4, 25); - this.tableEditorTabPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tableEditorTabPage.Location = new System.Drawing.Point(4, 23); this.tableEditorTabPage.Name = "tableEditorTabPage"; - this.tableEditorTabPage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.tableEditorTabPage.Size = new System.Drawing.Size(1583, 835); + this.tableEditorTabPage.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.tableEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.tableEditorTabPage.TabIndex = 9; this.tableEditorTabPage.Text = "Table Editor"; this.tableEditorTabPage.UseVisualStyleBackColor = true; @@ -10342,10 +9606,9 @@ this.label73.AutoSize = true; this.label73.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label73.ForeColor = System.Drawing.SystemColors.GradientInactiveCaption; - this.label73.Location = new System.Drawing.Point(552, 736); - this.label73.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label73.Location = new System.Drawing.Point(414, 598); this.label73.Name = "label73"; - this.label73.Size = new System.Drawing.Size(400, 24); + this.label73.Size = new System.Drawing.Size(314, 18); this.label73.TabIndex = 12; this.label73.Text = "This Editor Tab is currently under construction."; this.label73.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -10355,11 +9618,9 @@ this.pbEffectsGroupBox.Controls.Add(this.groupBox31); this.pbEffectsGroupBox.Controls.Add(this.pbEffectsTrainerGroupBox); this.pbEffectsGroupBox.Controls.Add(this.pbEffectsMonGroupBox); - this.pbEffectsGroupBox.Location = new System.Drawing.Point(509, 11); - this.pbEffectsGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pbEffectsGroupBox.Location = new System.Drawing.Point(382, 9); this.pbEffectsGroupBox.Name = "pbEffectsGroupBox"; - this.pbEffectsGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.pbEffectsGroupBox.Size = new System.Drawing.Size(1051, 555); + this.pbEffectsGroupBox.Size = new System.Drawing.Size(788, 451); this.pbEffectsGroupBox.TabIndex = 11; this.pbEffectsGroupBox.TabStop = false; this.pbEffectsGroupBox.Text = "Pre-Battle Effects"; @@ -10373,11 +9634,9 @@ this.groupBox31.Controls.Add(this.pbEffectsVSAnimationUpDown); this.groupBox31.Controls.Add(this.pbEffectsCombosListbox); this.groupBox31.Controls.Add(this.label22); - this.groupBox31.Location = new System.Drawing.Point(8, 30); - this.groupBox31.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox31.Location = new System.Drawing.Point(6, 24); this.groupBox31.Name = "groupBox31"; - this.groupBox31.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox31.Size = new System.Drawing.Size(365, 511); + this.groupBox31.Size = new System.Drawing.Size(274, 415); this.groupBox31.TabIndex = 45; this.groupBox31.TabStop = false; this.groupBox31.Text = "Maintable Effect Combos"; @@ -10385,34 +9644,31 @@ // HOWpbEffectsTableButton // this.HOWpbEffectsTableButton.Image = ((System.Drawing.Image)(resources.GetObject("HOWpbEffectsTableButton.Image"))); - this.HOWpbEffectsTableButton.Location = new System.Drawing.Point(205, 463); - this.HOWpbEffectsTableButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.HOWpbEffectsTableButton.Location = new System.Drawing.Point(154, 376); this.HOWpbEffectsTableButton.Name = "HOWpbEffectsTableButton"; - this.HOWpbEffectsTableButton.Size = new System.Drawing.Size(37, 36); + this.HOWpbEffectsTableButton.Size = new System.Drawing.Size(28, 29); this.HOWpbEffectsTableButton.TabIndex = 44; this.HOWpbEffectsTableButton.UseVisualStyleBackColor = true; this.HOWpbEffectsTableButton.Click += new System.EventHandler(this.HOWpbEffectsTableButton_Click); // // pbEffectsBattleSSEQUpDown // - this.pbEffectsBattleSSEQUpDown.Location = new System.Drawing.Point(115, 470); - this.pbEffectsBattleSSEQUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pbEffectsBattleSSEQUpDown.Location = new System.Drawing.Point(86, 382); this.pbEffectsBattleSSEQUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.pbEffectsBattleSSEQUpDown.Name = "pbEffectsBattleSSEQUpDown"; - this.pbEffectsBattleSSEQUpDown.Size = new System.Drawing.Size(72, 22); + this.pbEffectsBattleSSEQUpDown.Size = new System.Drawing.Size(54, 20); this.pbEffectsBattleSSEQUpDown.TabIndex = 29; // // label21 // this.label21.AutoSize = true; - this.label21.Location = new System.Drawing.Point(109, 452); - this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label21.Location = new System.Drawing.Point(82, 367); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(81, 16); + this.label21.Size = new System.Drawing.Size(66, 13); this.label21.TabIndex = 30; this.label21.Text = "Battle SSEQ"; // @@ -10420,10 +9676,9 @@ // this.saveEffectCombosTableBTN.Image = ((System.Drawing.Image)(resources.GetObject("saveEffectCombosTableBTN.Image"))); this.saveEffectCombosTableBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.saveEffectCombosTableBTN.Location = new System.Drawing.Point(245, 458); - this.saveEffectCombosTableBTN.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.saveEffectCombosTableBTN.Location = new System.Drawing.Point(184, 372); this.saveEffectCombosTableBTN.Name = "saveEffectCombosTableBTN"; - this.saveEffectCombosTableBTN.Size = new System.Drawing.Size(104, 46); + this.saveEffectCombosTableBTN.Size = new System.Drawing.Size(78, 37); this.saveEffectCombosTableBTN.TabIndex = 43; this.saveEffectCombosTableBTN.Text = "Save This Combo"; this.saveEffectCombosTableBTN.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -10432,35 +9687,31 @@ // // pbEffectsVSAnimationUpDown // - this.pbEffectsVSAnimationUpDown.Location = new System.Drawing.Point(19, 470); - this.pbEffectsVSAnimationUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pbEffectsVSAnimationUpDown.Location = new System.Drawing.Point(14, 382); this.pbEffectsVSAnimationUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.pbEffectsVSAnimationUpDown.Name = "pbEffectsVSAnimationUpDown"; - this.pbEffectsVSAnimationUpDown.Size = new System.Drawing.Size(77, 22); + this.pbEffectsVSAnimationUpDown.Size = new System.Drawing.Size(58, 20); this.pbEffectsVSAnimationUpDown.TabIndex = 31; // // pbEffectsCombosListbox // this.pbEffectsCombosListbox.FormattingEnabled = true; - this.pbEffectsCombosListbox.ItemHeight = 16; - this.pbEffectsCombosListbox.Location = new System.Drawing.Point(12, 22); - this.pbEffectsCombosListbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pbEffectsCombosListbox.Location = new System.Drawing.Point(9, 18); this.pbEffectsCombosListbox.Name = "pbEffectsCombosListbox"; - this.pbEffectsCombosListbox.Size = new System.Drawing.Size(344, 420); + this.pbEffectsCombosListbox.Size = new System.Drawing.Size(259, 342); this.pbEffectsCombosListbox.TabIndex = 43; this.pbEffectsCombosListbox.SelectedIndexChanged += new System.EventHandler(this.pbEffectsCombosListbox_SelectedIndexChanged); // // label22 // this.label22.AutoSize = true; - this.label22.Location = new System.Drawing.Point(12, 452); - this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label22.Location = new System.Drawing.Point(9, 367); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(87, 16); + this.label22.Size = new System.Drawing.Size(70, 13); this.label22.TabIndex = 32; this.label22.Text = "VS Animation"; // @@ -10477,11 +9728,9 @@ this.pbEffectsTrainerGroupBox.Controls.Add(this.label70); this.pbEffectsTrainerGroupBox.Controls.Add(this.pbEffectsTrainerCombobox); this.pbEffectsTrainerGroupBox.Controls.Add(this.pbEffectsVsTrainerListbox); - this.pbEffectsTrainerGroupBox.Location = new System.Drawing.Point(381, 17); - this.pbEffectsTrainerGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pbEffectsTrainerGroupBox.Location = new System.Drawing.Point(286, 14); this.pbEffectsTrainerGroupBox.Name = "pbEffectsTrainerGroupBox"; - this.pbEffectsTrainerGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.pbEffectsTrainerGroupBox.Size = new System.Drawing.Size(641, 308); + this.pbEffectsTrainerGroupBox.Size = new System.Drawing.Size(481, 250); this.pbEffectsTrainerGroupBox.TabIndex = 34; this.pbEffectsTrainerGroupBox.TabStop = false; this.pbEffectsTrainerGroupBox.Text = "VS. Trainer"; @@ -10489,49 +9738,44 @@ // label75 // this.label75.AutoSize = true; - this.label75.Location = new System.Drawing.Point(520, 103); - this.label75.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label75.Location = new System.Drawing.Point(390, 84); this.label75.Name = "label75"; - this.label75.Size = new System.Drawing.Size(99, 16); + this.label75.Size = new System.Drawing.Size(79, 13); this.label75.TabIndex = 46; this.label75.Text = "Preview frames"; // // tbEditortrainerClassFrameMaxLabel // this.tbEditortrainerClassFrameMaxLabel.AutoSize = true; - this.tbEditortrainerClassFrameMaxLabel.Location = new System.Drawing.Point(587, 127); - this.tbEditortrainerClassFrameMaxLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.tbEditortrainerClassFrameMaxLabel.Location = new System.Drawing.Point(440, 103); this.tbEditortrainerClassFrameMaxLabel.Name = "tbEditortrainerClassFrameMaxLabel"; - this.tbEditortrainerClassFrameMaxLabel.Size = new System.Drawing.Size(18, 16); + this.tbEditortrainerClassFrameMaxLabel.Size = new System.Drawing.Size(18, 13); this.tbEditortrainerClassFrameMaxLabel.TabIndex = 45; this.tbEditortrainerClassFrameMaxLabel.Text = "/0"; // // tbEditorTrClassFramePreviewUpDown // - this.tbEditorTrClassFramePreviewUpDown.Location = new System.Drawing.Point(536, 123); - this.tbEditorTrClassFramePreviewUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tbEditorTrClassFramePreviewUpDown.Location = new System.Drawing.Point(402, 100); this.tbEditorTrClassFramePreviewUpDown.Name = "tbEditorTrClassFramePreviewUpDown"; - this.tbEditorTrClassFramePreviewUpDown.Size = new System.Drawing.Size(51, 22); + this.tbEditorTrClassFramePreviewUpDown.Size = new System.Drawing.Size(38, 20); this.tbEditorTrClassFramePreviewUpDown.TabIndex = 44; this.tbEditorTrClassFramePreviewUpDown.ValueChanged += new System.EventHandler(this.TBLEditortrainerClassPreviewPic_ValueChanged); // // tbEditorTrClassPictureBox // this.tbEditorTrClassPictureBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbEditorTrClassPictureBox.Location = new System.Drawing.Point(337, 73); - this.tbEditorTrClassPictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tbEditorTrClassPictureBox.Location = new System.Drawing.Point(253, 59); this.tbEditorTrClassPictureBox.Name = "tbEditorTrClassPictureBox"; - this.tbEditorTrClassPictureBox.Size = new System.Drawing.Size(170, 118); + this.tbEditorTrClassPictureBox.Size = new System.Drawing.Size(128, 96); this.tbEditorTrClassPictureBox.TabIndex = 43; this.tbEditorTrClassPictureBox.TabStop = false; // // label68 // this.label68.AutoSize = true; - this.label68.Location = new System.Drawing.Point(332, 202); - this.label68.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label68.Location = new System.Drawing.Point(249, 164); this.label68.Name = "label68"; - this.label68.Size = new System.Drawing.Size(149, 16); + this.label68.Size = new System.Drawing.Size(120, 13); this.label68.TabIndex = 42; this.label68.Text = "Maintable Effect Combo"; // @@ -10539,19 +9783,17 @@ // this.pbEffectsTrainerChooseMainCombobox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.pbEffectsTrainerChooseMainCombobox.FormattingEnabled = true; - this.pbEffectsTrainerChooseMainCombobox.Location = new System.Drawing.Point(336, 219); - this.pbEffectsTrainerChooseMainCombobox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pbEffectsTrainerChooseMainCombobox.Location = new System.Drawing.Point(252, 178); this.pbEffectsTrainerChooseMainCombobox.Name = "pbEffectsTrainerChooseMainCombobox"; - this.pbEffectsTrainerChooseMainCombobox.Size = new System.Drawing.Size(289, 24); + this.pbEffectsTrainerChooseMainCombobox.Size = new System.Drawing.Size(218, 21); this.pbEffectsTrainerChooseMainCombobox.TabIndex = 41; // // HOWVsTrainerButton // this.HOWVsTrainerButton.Image = ((System.Drawing.Image)(resources.GetObject("HOWVsTrainerButton.Image"))); - this.HOWVsTrainerButton.Location = new System.Drawing.Point(409, 257); - this.HOWVsTrainerButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.HOWVsTrainerButton.Location = new System.Drawing.Point(307, 209); this.HOWVsTrainerButton.Name = "HOWVsTrainerButton"; - this.HOWVsTrainerButton.Size = new System.Drawing.Size(37, 36); + this.HOWVsTrainerButton.Size = new System.Drawing.Size(28, 29); this.HOWVsTrainerButton.TabIndex = 39; this.HOWVsTrainerButton.UseVisualStyleBackColor = true; this.HOWVsTrainerButton.Click += new System.EventHandler(this.HOWVsTrainerButton_Click); @@ -10560,10 +9802,9 @@ // this.saveVSTrainerTableBTN.Image = ((System.Drawing.Image)(resources.GetObject("saveVSTrainerTableBTN.Image"))); this.saveVSTrainerTableBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.saveVSTrainerTableBTN.Location = new System.Drawing.Point(449, 252); - this.saveVSTrainerTableBTN.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.saveVSTrainerTableBTN.Location = new System.Drawing.Point(337, 205); this.saveVSTrainerTableBTN.Name = "saveVSTrainerTableBTN"; - this.saveVSTrainerTableBTN.Size = new System.Drawing.Size(107, 46); + this.saveVSTrainerTableBTN.Size = new System.Drawing.Size(80, 37); this.saveVSTrainerTableBTN.TabIndex = 38; this.saveVSTrainerTableBTN.Text = "Save This Entry"; this.saveVSTrainerTableBTN.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -10573,10 +9814,9 @@ // label70 // this.label70.AutoSize = true; - this.label70.Location = new System.Drawing.Point(331, 17); - this.label70.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label70.Location = new System.Drawing.Point(248, 14); this.label70.Name = "label70"; - this.label70.Size = new System.Drawing.Size(87, 16); + this.label70.Size = new System.Drawing.Size(68, 13); this.label70.TabIndex = 37; this.label70.Text = "Trainer Class"; // @@ -10584,21 +9824,18 @@ // this.pbEffectsTrainerCombobox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.pbEffectsTrainerCombobox.FormattingEnabled = true; - this.pbEffectsTrainerCombobox.Location = new System.Drawing.Point(336, 36); - this.pbEffectsTrainerCombobox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pbEffectsTrainerCombobox.Location = new System.Drawing.Point(252, 29); this.pbEffectsTrainerCombobox.Name = "pbEffectsTrainerCombobox"; - this.pbEffectsTrainerCombobox.Size = new System.Drawing.Size(289, 24); + this.pbEffectsTrainerCombobox.Size = new System.Drawing.Size(218, 21); this.pbEffectsTrainerCombobox.TabIndex = 36; this.pbEffectsTrainerCombobox.SelectedIndexChanged += new System.EventHandler(this.pbEffectsTrainerCombobox_SelectedIndexChanged); // // pbEffectsVsTrainerListbox // this.pbEffectsVsTrainerListbox.FormattingEnabled = true; - this.pbEffectsVsTrainerListbox.ItemHeight = 16; - this.pbEffectsVsTrainerListbox.Location = new System.Drawing.Point(12, 22); - this.pbEffectsVsTrainerListbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pbEffectsVsTrainerListbox.Location = new System.Drawing.Point(9, 18); this.pbEffectsVsTrainerListbox.Name = "pbEffectsVsTrainerListbox"; - this.pbEffectsVsTrainerListbox.Size = new System.Drawing.Size(311, 276); + this.pbEffectsVsTrainerListbox.Size = new System.Drawing.Size(234, 225); this.pbEffectsVsTrainerListbox.TabIndex = 35; this.pbEffectsVsTrainerListbox.SelectedIndexChanged += new System.EventHandler(this.pbEffectsVsTrainerListbox_SelectedIndexChanged); // @@ -10612,21 +9849,18 @@ this.pbEffectsMonGroupBox.Controls.Add(this.label71); this.pbEffectsMonGroupBox.Controls.Add(this.pbEffectsPokemonCombobox); this.pbEffectsMonGroupBox.Controls.Add(this.pbEffectsVsPokemonListbox); - this.pbEffectsMonGroupBox.Location = new System.Drawing.Point(381, 326); - this.pbEffectsMonGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pbEffectsMonGroupBox.Location = new System.Drawing.Point(286, 265); this.pbEffectsMonGroupBox.Name = "pbEffectsMonGroupBox"; - this.pbEffectsMonGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.pbEffectsMonGroupBox.Size = new System.Drawing.Size(641, 214); + this.pbEffectsMonGroupBox.Size = new System.Drawing.Size(481, 174); this.pbEffectsMonGroupBox.TabIndex = 33; this.pbEffectsMonGroupBox.TabStop = false; this.pbEffectsMonGroupBox.Text = "VS. Pokémon"; // // tbEditorPokeminiPictureBox // - this.tbEditorPokeminiPictureBox.Location = new System.Drawing.Point(396, 15); - this.tbEditorPokeminiPictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tbEditorPokeminiPictureBox.Location = new System.Drawing.Point(297, 12); this.tbEditorPokeminiPictureBox.Name = "tbEditorPokeminiPictureBox"; - this.tbEditorPokeminiPictureBox.Size = new System.Drawing.Size(53, 37); + this.tbEditorPokeminiPictureBox.Size = new System.Drawing.Size(40, 30); this.tbEditorPokeminiPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.tbEditorPokeminiPictureBox.TabIndex = 43; this.tbEditorPokeminiPictureBox.TabStop = false; @@ -10634,10 +9868,9 @@ // label69 // this.label69.AutoSize = true; - this.label69.Location = new System.Drawing.Point(332, 98); - this.label69.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label69.Location = new System.Drawing.Point(249, 80); this.label69.Name = "label69"; - this.label69.Size = new System.Drawing.Size(149, 16); + this.label69.Size = new System.Drawing.Size(120, 13); this.label69.TabIndex = 42; this.label69.Text = "Maintable Effect Combo"; // @@ -10645,19 +9878,17 @@ // this.pbEffectsPokemonChooseMainCombobox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.pbEffectsPokemonChooseMainCombobox.FormattingEnabled = true; - this.pbEffectsPokemonChooseMainCombobox.Location = new System.Drawing.Point(336, 118); - this.pbEffectsPokemonChooseMainCombobox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pbEffectsPokemonChooseMainCombobox.Location = new System.Drawing.Point(252, 96); this.pbEffectsPokemonChooseMainCombobox.Name = "pbEffectsPokemonChooseMainCombobox"; - this.pbEffectsPokemonChooseMainCombobox.Size = new System.Drawing.Size(289, 24); + this.pbEffectsPokemonChooseMainCombobox.Size = new System.Drawing.Size(218, 21); this.pbEffectsPokemonChooseMainCombobox.TabIndex = 41; // // HOWvsPokemonButton // this.HOWvsPokemonButton.Image = ((System.Drawing.Image)(resources.GetObject("HOWvsPokemonButton.Image"))); - this.HOWvsPokemonButton.Location = new System.Drawing.Point(409, 156); - this.HOWvsPokemonButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.HOWvsPokemonButton.Location = new System.Drawing.Point(307, 127); this.HOWvsPokemonButton.Name = "HOWvsPokemonButton"; - this.HOWvsPokemonButton.Size = new System.Drawing.Size(37, 36); + this.HOWvsPokemonButton.Size = new System.Drawing.Size(28, 29); this.HOWvsPokemonButton.TabIndex = 39; this.HOWvsPokemonButton.UseVisualStyleBackColor = true; this.HOWvsPokemonButton.Click += new System.EventHandler(this.HOWvsPokemonButton_Click); @@ -10666,10 +9897,9 @@ // this.saveVSPokemonTableBTN.Image = ((System.Drawing.Image)(resources.GetObject("saveVSPokemonTableBTN.Image"))); this.saveVSPokemonTableBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.saveVSPokemonTableBTN.Location = new System.Drawing.Point(449, 151); - this.saveVSPokemonTableBTN.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.saveVSPokemonTableBTN.Location = new System.Drawing.Point(337, 123); this.saveVSPokemonTableBTN.Name = "saveVSPokemonTableBTN"; - this.saveVSPokemonTableBTN.Size = new System.Drawing.Size(107, 46); + this.saveVSPokemonTableBTN.Size = new System.Drawing.Size(80, 37); this.saveVSPokemonTableBTN.TabIndex = 38; this.saveVSPokemonTableBTN.Text = "Save This Entry"; this.saveVSPokemonTableBTN.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -10679,10 +9909,9 @@ // label71 // this.label71.AutoSize = true; - this.label71.Location = new System.Drawing.Point(332, 36); - this.label71.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label71.Location = new System.Drawing.Point(249, 29); this.label71.Name = "label71"; - this.label71.Size = new System.Drawing.Size(65, 16); + this.label71.Size = new System.Drawing.Size(52, 13); this.label71.TabIndex = 37; this.label71.Text = "Pokémon"; // @@ -10690,21 +9919,18 @@ // this.pbEffectsPokemonCombobox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.pbEffectsPokemonCombobox.FormattingEnabled = true; - this.pbEffectsPokemonCombobox.Location = new System.Drawing.Point(336, 55); - this.pbEffectsPokemonCombobox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pbEffectsPokemonCombobox.Location = new System.Drawing.Point(252, 45); this.pbEffectsPokemonCombobox.Name = "pbEffectsPokemonCombobox"; - this.pbEffectsPokemonCombobox.Size = new System.Drawing.Size(289, 24); + this.pbEffectsPokemonCombobox.Size = new System.Drawing.Size(218, 21); this.pbEffectsPokemonCombobox.TabIndex = 36; this.pbEffectsPokemonCombobox.SelectedIndexChanged += new System.EventHandler(this.pbEffectsPokemonCombobox_SelectedIndexChanged); // // pbEffectsVsPokemonListbox // this.pbEffectsVsPokemonListbox.FormattingEnabled = true; - this.pbEffectsVsPokemonListbox.ItemHeight = 16; - this.pbEffectsVsPokemonListbox.Location = new System.Drawing.Point(12, 21); - this.pbEffectsVsPokemonListbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pbEffectsVsPokemonListbox.Location = new System.Drawing.Point(9, 17); this.pbEffectsVsPokemonListbox.Name = "pbEffectsVsPokemonListbox"; - this.pbEffectsVsPokemonListbox.Size = new System.Drawing.Size(311, 180); + this.pbEffectsVsPokemonListbox.Size = new System.Drawing.Size(234, 147); this.pbEffectsVsPokemonListbox.TabIndex = 35; this.pbEffectsVsPokemonListbox.SelectedIndexChanged += new System.EventHandler(this.pbEffectsVsPokemonListbox_SelectedIndexChanged); // @@ -10721,11 +9947,9 @@ this.conditionalMusicGroupBox.Controls.Add(this.locationNameConditionalMusicLBL); this.conditionalMusicGroupBox.Controls.Add(this.headerConditionalMusicComboBox); this.conditionalMusicGroupBox.Controls.Add(this.conditionalMusicTableListBox); - this.conditionalMusicGroupBox.Location = new System.Drawing.Point(21, 11); - this.conditionalMusicGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.conditionalMusicGroupBox.Location = new System.Drawing.Point(16, 9); this.conditionalMusicGroupBox.Name = "conditionalMusicGroupBox"; - this.conditionalMusicGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.conditionalMusicGroupBox.Size = new System.Drawing.Size(480, 234); + this.conditionalMusicGroupBox.Size = new System.Drawing.Size(360, 190); this.conditionalMusicGroupBox.TabIndex = 0; this.conditionalMusicGroupBox.TabStop = false; this.conditionalMusicGroupBox.Text = "Conditional Music Table"; @@ -10733,20 +9957,18 @@ // label66 // this.label66.AutoSize = true; - this.label66.Location = new System.Drawing.Point(7, 25); - this.label66.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label66.Location = new System.Drawing.Point(5, 20); this.label66.Name = "label66"; - this.label66.Size = new System.Drawing.Size(88, 16); + this.label66.Size = new System.Drawing.Size(72, 13); this.label66.TabIndex = 10; this.label66.Text = "Locations List"; // // HOWconditionalMusicTableButton // this.HOWconditionalMusicTableButton.Image = ((System.Drawing.Image)(resources.GetObject("HOWconditionalMusicTableButton.Image"))); - this.HOWconditionalMusicTableButton.Location = new System.Drawing.Point(309, 180); - this.HOWconditionalMusicTableButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.HOWconditionalMusicTableButton.Location = new System.Drawing.Point(232, 146); this.HOWconditionalMusicTableButton.Name = "HOWconditionalMusicTableButton"; - this.HOWconditionalMusicTableButton.Size = new System.Drawing.Size(37, 36); + this.HOWconditionalMusicTableButton.Size = new System.Drawing.Size(28, 29); this.HOWconditionalMusicTableButton.TabIndex = 9; this.HOWconditionalMusicTableButton.UseVisualStyleBackColor = true; this.HOWconditionalMusicTableButton.Click += new System.EventHandler(this.HOWconditionalMusicTableButton_Click); @@ -10755,10 +9977,9 @@ // this.saveConditionalMusicTableBTN.Image = ((System.Drawing.Image)(resources.GetObject("saveConditionalMusicTableBTN.Image"))); this.saveConditionalMusicTableBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.saveConditionalMusicTableBTN.Location = new System.Drawing.Point(349, 175); - this.saveConditionalMusicTableBTN.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.saveConditionalMusicTableBTN.Location = new System.Drawing.Point(262, 142); this.saveConditionalMusicTableBTN.Name = "saveConditionalMusicTableBTN"; - this.saveConditionalMusicTableBTN.Size = new System.Drawing.Size(119, 46); + this.saveConditionalMusicTableBTN.Size = new System.Drawing.Size(89, 37); this.saveConditionalMusicTableBTN.TabIndex = 8; this.saveConditionalMusicTableBTN.Text = "Save Table"; this.saveConditionalMusicTableBTN.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -10768,68 +9989,62 @@ // label65 // this.label65.AutoSize = true; - this.label65.Location = new System.Drawing.Point(349, 102); - this.label65.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label65.Location = new System.Drawing.Point(262, 83); this.label65.Name = "label65"; - this.label65.Size = new System.Drawing.Size(58, 16); + this.label65.Size = new System.Drawing.Size(49, 13); this.label65.TabIndex = 7; this.label65.Text = "Music ID"; // // musicIDconditionalMusicUpDown // - this.musicIDconditionalMusicUpDown.Location = new System.Drawing.Point(353, 122); - this.musicIDconditionalMusicUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.musicIDconditionalMusicUpDown.Location = new System.Drawing.Point(265, 99); this.musicIDconditionalMusicUpDown.Maximum = new decimal(new int[] { 32767, 0, 0, 0}); this.musicIDconditionalMusicUpDown.Name = "musicIDconditionalMusicUpDown"; - this.musicIDconditionalMusicUpDown.Size = new System.Drawing.Size(89, 22); + this.musicIDconditionalMusicUpDown.Size = new System.Drawing.Size(67, 20); this.musicIDconditionalMusicUpDown.TabIndex = 6; this.musicIDconditionalMusicUpDown.ValueChanged += new System.EventHandler(this.musicIDconditionalMusicUpDown_ValueChanged); // // label64 // this.label64.AutoSize = true; - this.label64.Location = new System.Drawing.Point(239, 102); - this.label64.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label64.Location = new System.Drawing.Point(179, 83); this.label64.Name = "label64"; - this.label64.Size = new System.Drawing.Size(34, 16); + this.label64.Size = new System.Drawing.Size(27, 13); this.label64.TabIndex = 5; this.label64.Text = "Flag"; // // flagConditionalMusicUpDown // - this.flagConditionalMusicUpDown.Location = new System.Drawing.Point(243, 122); - this.flagConditionalMusicUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.flagConditionalMusicUpDown.Location = new System.Drawing.Point(182, 99); this.flagConditionalMusicUpDown.Maximum = new decimal(new int[] { 32767, 0, 0, 0}); this.flagConditionalMusicUpDown.Name = "flagConditionalMusicUpDown"; - this.flagConditionalMusicUpDown.Size = new System.Drawing.Size(89, 22); + this.flagConditionalMusicUpDown.Size = new System.Drawing.Size(67, 20); this.flagConditionalMusicUpDown.TabIndex = 4; this.flagConditionalMusicUpDown.ValueChanged += new System.EventHandler(this.flagConditionalMusicUpDown_ValueChanged); // // label41 // this.label41.AutoSize = true; - this.label41.Location = new System.Drawing.Point(233, 25); - this.label41.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label41.Location = new System.Drawing.Point(175, 20); this.label41.Name = "label41"; - this.label41.Size = new System.Drawing.Size(53, 16); + this.label41.Size = new System.Drawing.Size(42, 13); this.label41.TabIndex = 3; this.label41.Text = "Header"; // // locationNameConditionalMusicLBL // this.locationNameConditionalMusicLBL.AutoSize = true; - this.locationNameConditionalMusicLBL.Location = new System.Drawing.Point(233, 73); - this.locationNameConditionalMusicLBL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.locationNameConditionalMusicLBL.Location = new System.Drawing.Point(175, 59); this.locationNameConditionalMusicLBL.Name = "locationNameConditionalMusicLBL"; - this.locationNameConditionalMusicLBL.Size = new System.Drawing.Size(98, 16); + this.locationNameConditionalMusicLBL.Size = new System.Drawing.Size(79, 13); this.locationNameConditionalMusicLBL.TabIndex = 2; this.locationNameConditionalMusicLBL.Text = "Location Name"; // @@ -10837,21 +10052,18 @@ // this.headerConditionalMusicComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.headerConditionalMusicComboBox.FormattingEnabled = true; - this.headerConditionalMusicComboBox.Location = new System.Drawing.Point(237, 43); - this.headerConditionalMusicComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.headerConditionalMusicComboBox.Location = new System.Drawing.Point(178, 35); this.headerConditionalMusicComboBox.Name = "headerConditionalMusicComboBox"; - this.headerConditionalMusicComboBox.Size = new System.Drawing.Size(229, 24); + this.headerConditionalMusicComboBox.Size = new System.Drawing.Size(173, 21); this.headerConditionalMusicComboBox.TabIndex = 1; this.headerConditionalMusicComboBox.SelectedIndexChanged += new System.EventHandler(this.headerConditionalMusicComboBox_SelectedIndexChanged); // // conditionalMusicTableListBox // this.conditionalMusicTableListBox.FormattingEnabled = true; - this.conditionalMusicTableListBox.ItemHeight = 16; - this.conditionalMusicTableListBox.Location = new System.Drawing.Point(8, 42); - this.conditionalMusicTableListBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.conditionalMusicTableListBox.Location = new System.Drawing.Point(6, 34); this.conditionalMusicTableListBox.Name = "conditionalMusicTableListBox"; - this.conditionalMusicTableListBox.Size = new System.Drawing.Size(219, 180); + this.conditionalMusicTableListBox.Size = new System.Drawing.Size(165, 147); this.conditionalMusicTableListBox.TabIndex = 0; this.conditionalMusicTableListBox.SelectedIndexChanged += new System.EventHandler(this.conditionalMusicTableListBox_SelectedIndexChanged); // @@ -10859,32 +10071,30 @@ // this.tabPageScriptEditor.Controls.Add(this.scriptEditor); this.tabPageScriptEditor.ImageIndex = 5; - this.tabPageScriptEditor.Location = new System.Drawing.Point(4, 25); - this.tabPageScriptEditor.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabPageScriptEditor.Location = new System.Drawing.Point(4, 23); this.tabPageScriptEditor.Name = "tabPageScriptEditor"; - this.tabPageScriptEditor.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.tabPageScriptEditor.Size = new System.Drawing.Size(1583, 835); + this.tabPageScriptEditor.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.tabPageScriptEditor.Size = new System.Drawing.Size(1185, 675); this.tabPageScriptEditor.TabIndex = 10; this.tabPageScriptEditor.Text = "Script Editor New"; this.tabPageScriptEditor.UseVisualStyleBackColor = true; // // scriptEditor // - this.scriptEditor.Location = new System.Drawing.Point(3, 4); - this.scriptEditor.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.scriptEditor.Location = new System.Drawing.Point(2, 3); + this.scriptEditor.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.scriptEditor.Name = "scriptEditor"; this.scriptEditor.scriptEditorIsReady = false; - this.scriptEditor.Size = new System.Drawing.Size(1569, 905); + this.scriptEditor.Size = new System.Drawing.Size(1177, 735); this.scriptEditor.TabIndex = 0; // // tabPageLevelScriptEditor // this.tabPageLevelScriptEditor.Controls.Add(this.levelScriptEditor); - this.tabPageLevelScriptEditor.Location = new System.Drawing.Point(4, 25); - this.tabPageLevelScriptEditor.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabPageLevelScriptEditor.Location = new System.Drawing.Point(4, 23); this.tabPageLevelScriptEditor.Name = "tabPageLevelScriptEditor"; - this.tabPageLevelScriptEditor.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.tabPageLevelScriptEditor.Size = new System.Drawing.Size(1583, 835); + this.tabPageLevelScriptEditor.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.tabPageLevelScriptEditor.Size = new System.Drawing.Size(1185, 675); this.tabPageLevelScriptEditor.TabIndex = 11; this.tabPageLevelScriptEditor.Text = "Level Script Editor"; this.tabPageLevelScriptEditor.UseVisualStyleBackColor = true; @@ -10893,30 +10103,29 @@ // this.levelScriptEditor.BackColor = System.Drawing.SystemColors.Control; this.levelScriptEditor.levelScriptEditorIsReady = false; - this.levelScriptEditor.Location = new System.Drawing.Point(8, 10); - this.levelScriptEditor.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.levelScriptEditor.Location = new System.Drawing.Point(6, 8); + this.levelScriptEditor.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.levelScriptEditor.Name = "levelScriptEditor"; - this.levelScriptEditor.Size = new System.Drawing.Size(544, 766); + this.levelScriptEditor.Size = new System.Drawing.Size(408, 622); this.levelScriptEditor.TabIndex = 0; // // tabPageEncountersEditor // this.tabPageEncountersEditor.Controls.Add(this.encountersEditor); - this.tabPageEncountersEditor.Location = new System.Drawing.Point(4, 25); - this.tabPageEncountersEditor.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabPageEncountersEditor.Location = new System.Drawing.Point(4, 23); this.tabPageEncountersEditor.Name = "tabPageEncountersEditor"; - this.tabPageEncountersEditor.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.tabPageEncountersEditor.Size = new System.Drawing.Size(1583, 835); + this.tabPageEncountersEditor.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.tabPageEncountersEditor.Size = new System.Drawing.Size(1185, 675); this.tabPageEncountersEditor.TabIndex = 12; this.tabPageEncountersEditor.Text = "Encounters"; this.tabPageEncountersEditor.UseVisualStyleBackColor = true; // // encountersEditor // - this.encountersEditor.Location = new System.Drawing.Point(8, 4); - this.encountersEditor.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.encountersEditor.Location = new System.Drawing.Point(6, 3); + this.encountersEditor.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.encountersEditor.Name = "encountersEditor"; - this.encountersEditor.Size = new System.Drawing.Size(1568, 827); + this.encountersEditor.Size = new System.Drawing.Size(1176, 672); this.encountersEditor.TabIndex = 0; // // mainTabImageList @@ -10939,10 +10148,9 @@ this.gameIcon.ErrorImage = null; this.gameIcon.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.gameIcon.InitialImage = null; - this.gameIcon.Location = new System.Drawing.Point(1556, 43); - this.gameIcon.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.gameIcon.Location = new System.Drawing.Point(1167, 35); this.gameIcon.Name = "gameIcon"; - this.gameIcon.Size = new System.Drawing.Size(43, 39); + this.gameIcon.Size = new System.Drawing.Size(32, 32); this.gameIcon.TabIndex = 8; this.gameIcon.TabStop = false; this.gameIcon.Paint += new System.Windows.Forms.PaintEventHandler(this.PaintGameIcon); @@ -10950,10 +10158,9 @@ // languageLabel // this.languageLabel.AutoSize = true; - this.languageLabel.Location = new System.Drawing.Point(1389, 64); - this.languageLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.languageLabel.Location = new System.Drawing.Point(1042, 52); this.languageLabel.Name = "languageLabel"; - this.languageLabel.Size = new System.Drawing.Size(71, 16); + this.languageLabel.Size = new System.Drawing.Size(58, 13); this.languageLabel.TabIndex = 10; this.languageLabel.Text = "Language:"; this.languageLabel.Visible = false; @@ -10971,7 +10178,8 @@ this.aboutToolStripMenuItem1}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(1619, 28); + this.menuStrip1.Padding = new System.Windows.Forms.Padding(4, 2, 0, 2); + this.menuStrip1.Size = new System.Drawing.Size(1214, 24); this.menuStrip1.TabIndex = 12; this.menuStrip1.Text = "menuStrip1"; // @@ -10982,7 +10190,7 @@ this.openFolderToolStripMenuItem, this.saveROMToolStripMenuItem}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(46, 24); + this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); this.fileToolStripMenuItem.Text = "File"; // // openROMToolStripMenuItem @@ -10990,7 +10198,7 @@ this.openROMToolStripMenuItem.Image = global::DSPRE.Properties.Resources.open_rom; this.openROMToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.openROMToolStripMenuItem.Name = "openROMToolStripMenuItem"; - this.openROMToolStripMenuItem.Size = new System.Drawing.Size(186, 38); + this.openROMToolStripMenuItem.Size = new System.Drawing.Size(155, 38); this.openROMToolStripMenuItem.Text = "Open ROM"; this.openROMToolStripMenuItem.Click += new System.EventHandler(this.loadRom_Click); // @@ -10999,7 +10207,7 @@ this.openFolderToolStripMenuItem.Image = global::DSPRE.Properties.Resources.open_file; this.openFolderToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.openFolderToolStripMenuItem.Name = "openFolderToolStripMenuItem"; - this.openFolderToolStripMenuItem.Size = new System.Drawing.Size(186, 38); + this.openFolderToolStripMenuItem.Size = new System.Drawing.Size(155, 38); this.openFolderToolStripMenuItem.Text = "Open Folder"; this.openFolderToolStripMenuItem.Click += new System.EventHandler(this.readDataFromFolderButton_Click); // @@ -11009,7 +10217,7 @@ this.saveROMToolStripMenuItem.Image = global::DSPRE.Properties.Resources.save_rom; this.saveROMToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.saveROMToolStripMenuItem.Name = "saveROMToolStripMenuItem"; - this.saveROMToolStripMenuItem.Size = new System.Drawing.Size(186, 38); + this.saveROMToolStripMenuItem.Size = new System.Drawing.Size(155, 38); this.saveROMToolStripMenuItem.Text = "Save ROM"; this.saveROMToolStripMenuItem.Click += new System.EventHandler(this.saveRom_Click); // @@ -11025,14 +10233,14 @@ this.listBuilderToolStripMenuItem, this.nSBMDUtilityToolStripMenuItem}); this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(58, 24); + this.aboutToolStripMenuItem.Size = new System.Drawing.Size(46, 20); this.aboutToolStripMenuItem.Text = "Tools"; // // romToolboxToolStripMenuItem // this.romToolboxToolStripMenuItem.Enabled = false; this.romToolboxToolStripMenuItem.Name = "romToolboxToolStripMenuItem"; - this.romToolboxToolStripMenuItem.Size = new System.Drawing.Size(276, 26); + this.romToolboxToolStripMenuItem.Size = new System.Drawing.Size(220, 22); this.romToolboxToolStripMenuItem.Text = "ROM Toolbox"; this.romToolboxToolStripMenuItem.Click += new System.EventHandler(this.romToolBoxToolStripMenuItem_Click); // @@ -11040,7 +10248,7 @@ // this.headerSearchToolStripMenuItem.Enabled = false; this.headerSearchToolStripMenuItem.Name = "headerSearchToolStripMenuItem"; - this.headerSearchToolStripMenuItem.Size = new System.Drawing.Size(276, 26); + this.headerSearchToolStripMenuItem.Size = new System.Drawing.Size(220, 22); this.headerSearchToolStripMenuItem.Text = "Advanced Header Search"; this.headerSearchToolStripMenuItem.Click += new System.EventHandler(this.advancedHeaderSearchToolStripMenuItem_Click); // @@ -11051,7 +10259,7 @@ this.platinumToolStripMenuItem, this.heartGoldAndSoulSilverToolStripMenuItem}); this.scriptCommandsDatabaseToolStripMenuItem.Name = "scriptCommandsDatabaseToolStripMenuItem"; - this.scriptCommandsDatabaseToolStripMenuItem.Size = new System.Drawing.Size(276, 26); + this.scriptCommandsDatabaseToolStripMenuItem.Size = new System.Drawing.Size(220, 22); this.scriptCommandsDatabaseToolStripMenuItem.Text = "Script Commands Database"; // // diamondAndPearlToolStripMenuItem @@ -11059,7 +10267,7 @@ this.diamondAndPearlToolStripMenuItem.Image = global::DSPRE.Properties.Resources.scriptDBIconDP; this.diamondAndPearlToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.diamondAndPearlToolStripMenuItem.Name = "diamondAndPearlToolStripMenuItem"; - this.diamondAndPearlToolStripMenuItem.Size = new System.Drawing.Size(258, 38); + this.diamondAndPearlToolStripMenuItem.Size = new System.Drawing.Size(211, 38); this.diamondAndPearlToolStripMenuItem.Text = "Diamond && Pearl"; this.diamondAndPearlToolStripMenuItem.Click += new System.EventHandler(this.diamondAndPearlToolStripMenuItem_Click); // @@ -11068,7 +10276,7 @@ this.platinumToolStripMenuItem.Image = global::DSPRE.Properties.Resources.scriptDBIconPt; this.platinumToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.platinumToolStripMenuItem.Name = "platinumToolStripMenuItem"; - this.platinumToolStripMenuItem.Size = new System.Drawing.Size(258, 38); + this.platinumToolStripMenuItem.Size = new System.Drawing.Size(211, 38); this.platinumToolStripMenuItem.Text = "Platinum"; this.platinumToolStripMenuItem.Click += new System.EventHandler(this.platinumToolStripMenuItem_Click); // @@ -11077,7 +10285,7 @@ this.heartGoldAndSoulSilverToolStripMenuItem.Image = global::DSPRE.Properties.Resources.scriptDBIconHGSS; this.heartGoldAndSoulSilverToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.heartGoldAndSoulSilverToolStripMenuItem.Name = "heartGoldAndSoulSilverToolStripMenuItem"; - this.heartGoldAndSoulSilverToolStripMenuItem.Size = new System.Drawing.Size(258, 38); + this.heartGoldAndSoulSilverToolStripMenuItem.Size = new System.Drawing.Size(211, 38); this.heartGoldAndSoulSilverToolStripMenuItem.Text = "HeartGold && SoulSilver"; this.heartGoldAndSoulSilverToolStripMenuItem.Click += new System.EventHandler(this.heartGoldAndSoulSilverToolStripMenuItem_Click); // @@ -11085,7 +10293,7 @@ // this.spawnEditorToolStripMenuItem.Enabled = false; this.spawnEditorToolStripMenuItem.Name = "spawnEditorToolStripMenuItem"; - this.spawnEditorToolStripMenuItem.Size = new System.Drawing.Size(276, 26); + this.spawnEditorToolStripMenuItem.Size = new System.Drawing.Size(220, 22); this.spawnEditorToolStripMenuItem.Text = "Spawn Point Editor"; this.spawnEditorToolStripMenuItem.Click += new System.EventHandler(this.spawnEditorToolStripMenuItem_Click); // @@ -11095,7 +10303,7 @@ this.buildFomFolderToolStripMenuItem, this.unpackToFolderToolStripMenuItem}); this.NarcUtilityToolStripMenuItem.Name = "NarcUtilityToolStripMenuItem"; - this.NarcUtilityToolStripMenuItem.Size = new System.Drawing.Size(276, 26); + this.NarcUtilityToolStripMenuItem.Size = new System.Drawing.Size(220, 22); this.NarcUtilityToolStripMenuItem.Text = "NARC Utility"; // // buildFomFolderToolStripMenuItem @@ -11103,7 +10311,7 @@ this.buildFomFolderToolStripMenuItem.Image = global::DSPRE.Properties.Resources.folderToNarcIcon; this.buildFomFolderToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.buildFomFolderToolStripMenuItem.Name = "buildFomFolderToolStripMenuItem"; - this.buildFomFolderToolStripMenuItem.Size = new System.Drawing.Size(252, 38); + this.buildFomFolderToolStripMenuItem.Size = new System.Drawing.Size(214, 38); this.buildFomFolderToolStripMenuItem.Text = "Build from Folder"; this.buildFomFolderToolStripMenuItem.Click += new System.EventHandler(this.buildFromFolderToolStripMenuItem_Click); // @@ -11112,7 +10320,7 @@ this.unpackToFolderToolStripMenuItem.Image = global::DSPRE.Properties.Resources.narcToFolderIcon; this.unpackToFolderToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.unpackToFolderToolStripMenuItem.Name = "unpackToFolderToolStripMenuItem"; - this.unpackToFolderToolStripMenuItem.Size = new System.Drawing.Size(252, 38); + this.unpackToFolderToolStripMenuItem.Size = new System.Drawing.Size(214, 38); this.unpackToFolderToolStripMenuItem.Text = "Unpack to Folder"; this.unpackToFolderToolStripMenuItem.Click += new System.EventHandler(this.unpackToFolderToolStripMenuItem_Click); // @@ -11122,7 +10330,7 @@ this.listBasedToolStripMenuItem, this.contentBasedToolStripMenuItem}); this.listBasedBatchRenameToolStripMenuItem.Name = "listBasedBatchRenameToolStripMenuItem"; - this.listBasedBatchRenameToolStripMenuItem.Size = new System.Drawing.Size(276, 26); + this.listBasedBatchRenameToolStripMenuItem.Size = new System.Drawing.Size(220, 22); this.listBasedBatchRenameToolStripMenuItem.Text = "Batch Rename Utility"; // // listBasedToolStripMenuItem @@ -11130,7 +10338,7 @@ this.listBasedToolStripMenuItem.Image = global::DSPRE.Properties.Resources.listbasedRenameIcon; this.listBasedToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.listBasedToolStripMenuItem.Name = "listBasedToolStripMenuItem"; - this.listBasedToolStripMenuItem.Size = new System.Drawing.Size(218, 38); + this.listBasedToolStripMenuItem.Size = new System.Drawing.Size(185, 38); this.listBasedToolStripMenuItem.Text = "List-Based"; this.listBasedToolStripMenuItem.Click += new System.EventHandler(this.listBasedToolStripMenuItem_Click); // @@ -11139,7 +10347,7 @@ this.contentBasedToolStripMenuItem.Image = global::DSPRE.Properties.Resources.contentbasedRenameIcon; this.contentBasedToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.contentBasedToolStripMenuItem.Name = "contentBasedToolStripMenuItem"; - this.contentBasedToolStripMenuItem.Size = new System.Drawing.Size(218, 38); + this.contentBasedToolStripMenuItem.Size = new System.Drawing.Size(185, 38); this.contentBasedToolStripMenuItem.Text = "Content-Based"; this.contentBasedToolStripMenuItem.Click += new System.EventHandler(this.contentBasedToolStripMenuItem_Click); // @@ -11149,7 +10357,7 @@ this.fromCEnumToolStripMenuItem, this.fromFolderContentsToolStripMenuItem}); this.listBuilderToolStripMenuItem.Name = "listBuilderToolStripMenuItem"; - this.listBuilderToolStripMenuItem.Size = new System.Drawing.Size(276, 26); + this.listBuilderToolStripMenuItem.Size = new System.Drawing.Size(220, 22); this.listBuilderToolStripMenuItem.Text = "Folder-Based List Builder"; // // fromCEnumToolStripMenuItem @@ -11157,7 +10365,7 @@ this.fromCEnumToolStripMenuItem.Image = global::DSPRE.Properties.Resources.enumToListIcon; this.fromCEnumToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.fromCEnumToolStripMenuItem.Name = "fromCEnumToolStripMenuItem"; - this.fromCEnumToolStripMenuItem.Size = new System.Drawing.Size(278, 38); + this.fromCEnumToolStripMenuItem.Size = new System.Drawing.Size(237, 38); this.fromCEnumToolStripMenuItem.Text = "From C Enum"; this.fromCEnumToolStripMenuItem.Click += new System.EventHandler(this.enumBasedListBuilderToolStripButton_Click); // @@ -11166,7 +10374,7 @@ this.fromFolderContentsToolStripMenuItem.Image = global::DSPRE.Properties.Resources.folderToListIcon; this.fromFolderContentsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.fromFolderContentsToolStripMenuItem.Name = "fromFolderContentsToolStripMenuItem"; - this.fromFolderContentsToolStripMenuItem.Size = new System.Drawing.Size(278, 38); + this.fromFolderContentsToolStripMenuItem.Size = new System.Drawing.Size(237, 38); this.fromFolderContentsToolStripMenuItem.Text = "From Folder Contents"; this.fromFolderContentsToolStripMenuItem.Click += new System.EventHandler(this.fromFolderContentsToolStripMenuItem_Click); // @@ -11177,7 +10385,7 @@ this.untexturizeToolStripMenuItem, this.extractNSBTXFromNSBMDToolStripMenuItem}); this.nSBMDUtilityToolStripMenuItem.Name = "nSBMDUtilityToolStripMenuItem"; - this.nSBMDUtilityToolStripMenuItem.Size = new System.Drawing.Size(276, 26); + this.nSBMDUtilityToolStripMenuItem.Size = new System.Drawing.Size(220, 22); this.nSBMDUtilityToolStripMenuItem.Text = "NSBMD Utility"; // // texturizeNSBMDToolStripMenuItem @@ -11185,7 +10393,7 @@ this.texturizeNSBMDToolStripMenuItem.Image = global::DSPRE.Properties.Resources.addTextureToNSBMD; this.texturizeNSBMDToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.texturizeNSBMDToolStripMenuItem.Name = "texturizeNSBMDToolStripMenuItem"; - this.texturizeNSBMDToolStripMenuItem.Size = new System.Drawing.Size(306, 38); + this.texturizeNSBMDToolStripMenuItem.Size = new System.Drawing.Size(251, 38); this.texturizeNSBMDToolStripMenuItem.Text = "Add/Replace NSBMD textures"; this.texturizeNSBMDToolStripMenuItem.Click += new System.EventHandler(this.nsbmdAddTexButton_Click); // @@ -11194,7 +10402,7 @@ this.untexturizeToolStripMenuItem.Image = global::DSPRE.Properties.Resources.removeTextureNSBMD; this.untexturizeToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.untexturizeToolStripMenuItem.Name = "untexturizeToolStripMenuItem"; - this.untexturizeToolStripMenuItem.Size = new System.Drawing.Size(306, 38); + this.untexturizeToolStripMenuItem.Size = new System.Drawing.Size(251, 38); this.untexturizeToolStripMenuItem.Text = "Remove textures from NSBMD"; this.untexturizeToolStripMenuItem.Click += new System.EventHandler(this.nsbmdRemoveTexButton_Click); // @@ -11203,7 +10411,7 @@ this.extractNSBTXFromNSBMDToolStripMenuItem.Image = global::DSPRE.Properties.Resources.saveTextureFromNSBMD; this.extractNSBTXFromNSBMDToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.extractNSBTXFromNSBMDToolStripMenuItem.Name = "extractNSBTXFromNSBMDToolStripMenuItem"; - this.extractNSBTXFromNSBMDToolStripMenuItem.Size = new System.Drawing.Size(306, 38); + this.extractNSBTXFromNSBMDToolStripMenuItem.Size = new System.Drawing.Size(251, 38); this.extractNSBTXFromNSBMDToolStripMenuItem.Text = "Save textures from NSBMD"; this.extractNSBTXFromNSBMDToolStripMenuItem.Click += new System.EventHandler(this.nsbmdExportTexButton_Click); // @@ -11215,20 +10423,20 @@ this.evolutionsEditorToolStripMenuItem}); this.monEditorToolStripMenuItem.Enabled = false; this.monEditorToolStripMenuItem.Name = "monEditorToolStripMenuItem"; - this.monEditorToolStripMenuItem.Size = new System.Drawing.Size(97, 24); + this.monEditorToolStripMenuItem.Size = new System.Drawing.Size(78, 20); this.monEditorToolStripMenuItem.Text = "Mon Editor"; // // personalDataEditorToolStripMenuItem // this.personalDataEditorToolStripMenuItem.Name = "personalDataEditorToolStripMenuItem"; - this.personalDataEditorToolStripMenuItem.Size = new System.Drawing.Size(204, 26); + this.personalDataEditorToolStripMenuItem.Size = new System.Drawing.Size(163, 22); this.personalDataEditorToolStripMenuItem.Text = "Pokemon Editor"; this.personalDataEditorToolStripMenuItem.Click += new System.EventHandler(this.personalDataEditorToolStripMenuItem_Click); // // learnsetsEditorToolStripMenuItem // this.learnsetsEditorToolStripMenuItem.Name = "learnsetsEditorToolStripMenuItem"; - this.learnsetsEditorToolStripMenuItem.Size = new System.Drawing.Size(204, 26); + this.learnsetsEditorToolStripMenuItem.Size = new System.Drawing.Size(163, 22); this.learnsetsEditorToolStripMenuItem.Text = "Learnsets Editor"; this.learnsetsEditorToolStripMenuItem.Visible = false; this.learnsetsEditorToolStripMenuItem.Click += new System.EventHandler(this.learnsetsEditorToolStripMenuItem_Click); @@ -11236,7 +10444,7 @@ // evolutionsEditorToolStripMenuItem // this.evolutionsEditorToolStripMenuItem.Name = "evolutionsEditorToolStripMenuItem"; - this.evolutionsEditorToolStripMenuItem.Size = new System.Drawing.Size(204, 26); + this.evolutionsEditorToolStripMenuItem.Size = new System.Drawing.Size(163, 22); this.evolutionsEditorToolStripMenuItem.Text = "Evolutions Editor"; this.evolutionsEditorToolStripMenuItem.Visible = false; this.evolutionsEditorToolStripMenuItem.Click += new System.EventHandler(this.evolutionsEditorToolStripMenuItem_Click); @@ -11249,20 +10457,20 @@ this.advancedStripMenuItem, this.fullViewToolStripMenuItem}); this.menuViewToolStripMenuItem.Name = "menuViewToolStripMenuItem"; - this.menuViewToolStripMenuItem.Size = new System.Drawing.Size(96, 24); + this.menuViewToolStripMenuItem.Size = new System.Drawing.Size(78, 20); this.menuViewToolStripMenuItem.Text = "Menu View"; // // essentialToolStripMenuItem // this.essentialToolStripMenuItem.Name = "essentialToolStripMenuItem"; - this.essentialToolStripMenuItem.Size = new System.Drawing.Size(158, 26); + 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(158, 26); + this.simpleToolStripMenuItem.Size = new System.Drawing.Size(127, 22); this.simpleToolStripMenuItem.Text = "Simple"; this.simpleToolStripMenuItem.MouseDown += new System.Windows.Forms.MouseEventHandler(this.simpleToolStripMenuItem_MouseDown); // @@ -11271,21 +10479,21 @@ this.advancedStripMenuItem.Checked = true; this.advancedStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.advancedStripMenuItem.Name = "advancedStripMenuItem"; - this.advancedStripMenuItem.Size = new System.Drawing.Size(158, 26); + 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(158, 26); + this.fullViewToolStripMenuItem.Size = new System.Drawing.Size(127, 22); this.fullViewToolStripMenuItem.Text = "Complete"; this.fullViewToolStripMenuItem.MouseDown += new System.Windows.Forms.MouseEventHandler(this.simpleToolStripMenuItem_MouseDown); // // aboutToolStripMenuItem1 // this.aboutToolStripMenuItem1.Name = "aboutToolStripMenuItem1"; - this.aboutToolStripMenuItem1.Size = new System.Drawing.Size(64, 24); + this.aboutToolStripMenuItem1.Size = new System.Drawing.Size(52, 20); this.aboutToolStripMenuItem1.Text = "About"; this.aboutToolStripMenuItem1.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); // @@ -11296,23 +10504,22 @@ this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.statusLabel, this.toolStripProgressBar}); - this.statusStrip1.Location = new System.Drawing.Point(0, 957); + this.statusStrip1.Location = new System.Drawing.Point(0, 777); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 19, 0); - this.statusStrip1.Size = new System.Drawing.Size(1619, 26); + this.statusStrip1.Size = new System.Drawing.Size(1214, 22); this.statusStrip1.TabIndex = 13; this.statusStrip1.Text = "statusStrip1"; // // statusLabel // this.statusLabel.Name = "statusLabel"; - this.statusLabel.Size = new System.Drawing.Size(50, 20); + this.statusLabel.Size = new System.Drawing.Size(39, 17); this.statusLabel.Text = "Ready"; // // toolStripProgressBar // this.toolStripProgressBar.Name = "toolStripProgressBar"; - this.toolStripProgressBar.Size = new System.Drawing.Size(240, 18); + this.toolStripProgressBar.Size = new System.Drawing.Size(180, 16); this.toolStripProgressBar.Visible = false; // // mainToolStrip @@ -11349,9 +10556,9 @@ this.headerSearchToolStripButton, this.spawnEditorToolStripButton, this.separator_afterMiscButtons}); - this.mainToolStrip.Location = new System.Drawing.Point(0, 28); + this.mainToolStrip.Location = new System.Drawing.Point(0, 24); this.mainToolStrip.Name = "mainToolStrip"; - this.mainToolStrip.Size = new System.Drawing.Size(1619, 44); + this.mainToolStrip.Size = new System.Drawing.Size(1214, 44); this.mainToolStrip.TabIndex = 16; this.mainToolStrip.Text = "mainToolStrip"; // @@ -11650,10 +10857,9 @@ // versionLabel // this.versionLabel.AutoSize = true; - this.versionLabel.Location = new System.Drawing.Point(1389, 44); - this.versionLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.versionLabel.Location = new System.Drawing.Point(1042, 36); this.versionLabel.Name = "versionLabel"; - this.versionLabel.Size = new System.Drawing.Size(41, 16); + this.versionLabel.Size = new System.Drawing.Size(35, 13); this.versionLabel.TabIndex = 9; this.versionLabel.Text = "ROM:"; this.versionLabel.Visible = false; @@ -11661,9 +10867,9 @@ // MainProgram // this.AllowDrop = true; - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1619, 983); + this.ClientSize = new System.Drawing.Size(1214, 799); this.Controls.Add(this.versionLabel); this.Controls.Add(this.languageLabel); this.Controls.Add(this.gameIcon); @@ -11675,7 +10881,6 @@ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MainMenuStrip = this.menuStrip1; - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MaximizeBox = false; this.Name = "MainProgram"; this.Text = "DS Pokémon Rom Editor Reloaded 1.11.1 (Nømura, AdAstra/LD3005, Mixone)"; diff --git a/DS_Map/Main Window.resx b/DS_Map/Main Window.resx index 28f0954..7854c16 100644 --- a/DS_Map/Main Window.resx +++ b/DS_Map/Main Window.resx @@ -956,7 +956,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM - EgAAAk1TRnQBSQFMAgEBCgEAATgBHAE4ARwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + EgAAAk1TRnQBSQFMAgEBCgEAAUABHAFAARwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA From d70c336e341cc00c1a6d5bc924be9ace71b3c28b Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Thu, 4 Apr 2024 09:51:25 +0200 Subject: [PATCH 35/40] some changes --- DS_Map/Main Window.Designer.cs | 61 ++-- DS_Map/Main Window.cs | 17 + DS_Map/Main Window.resx | 2 +- DS_Map/WildEditorDPPt.Designer.cs | 510 +++++++++++++++--------------- DS_Map/WildEditorDPPt.resx | 6 +- 5 files changed, 306 insertions(+), 290 deletions(-) diff --git a/DS_Map/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs index 80db602..951cb44 100644 --- a/DS_Map/Main Window.Designer.cs +++ b/DS_Map/Main Window.Designer.cs @@ -1145,7 +1145,7 @@ this.headerEditorTabPage.ImageIndex = 0; this.headerEditorTabPage.Location = new System.Drawing.Point(4, 23); this.headerEditorTabPage.Name = "headerEditorTabPage"; - this.headerEditorTabPage.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.headerEditorTabPage.Padding = new System.Windows.Forms.Padding(3); this.headerEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.headerEditorTabPage.TabIndex = 0; this.headerEditorTabPage.Text = "Header Editor"; @@ -2533,7 +2533,7 @@ this.matrixEditorTabPage.ImageIndex = 1; this.matrixEditorTabPage.Location = new System.Drawing.Point(4, 23); this.matrixEditorTabPage.Name = "matrixEditorTabPage"; - this.matrixEditorTabPage.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.matrixEditorTabPage.Padding = new System.Windows.Forms.Padding(3); this.matrixEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.matrixEditorTabPage.TabIndex = 1; this.matrixEditorTabPage.Text = "Matrix Editor"; @@ -2544,7 +2544,7 @@ this.setSpawnPointButton.Image = global::DSPRE.Properties.Resources.spawnCoordsMatrixeditorIcon; this.setSpawnPointButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.setSpawnPointButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.setSpawnPointButton.Location = new System.Drawing.Point(12, -5857); + this.setSpawnPointButton.Location = new System.Drawing.Point(12, -7059); this.setSpawnPointButton.Name = "setSpawnPointButton"; this.setSpawnPointButton.Size = new System.Drawing.Size(117, 43); this.setSpawnPointButton.TabIndex = 35; @@ -2560,7 +2560,7 @@ this.saveMatrixButton.Image = global::DSPRE.Properties.Resources.save_rom; this.saveMatrixButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.saveMatrixButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.saveMatrixButton.Location = new System.Drawing.Point(12, -5813); + this.saveMatrixButton.Location = new System.Drawing.Point(12, -7015); this.saveMatrixButton.Name = "saveMatrixButton"; this.saveMatrixButton.Size = new System.Drawing.Size(117, 43); this.saveMatrixButton.TabIndex = 34; @@ -2750,7 +2750,7 @@ this.headersTabPage.Controls.Add(this.headersGridView); this.headersTabPage.Location = new System.Drawing.Point(4, 22); this.headersTabPage.Name = "headersTabPage"; - this.headersTabPage.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.headersTabPage.Padding = new System.Windows.Forms.Padding(3); this.headersTabPage.Size = new System.Drawing.Size(1032, 584); this.headersTabPage.TabIndex = 1; this.headersTabPage.Text = "Map Headers"; @@ -3030,7 +3030,7 @@ this.mapEditorTabPage.ImageIndex = 2; this.mapEditorTabPage.Location = new System.Drawing.Point(4, 23); this.mapEditorTabPage.Name = "mapEditorTabPage"; - this.mapEditorTabPage.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.mapEditorTabPage.Padding = new System.Windows.Forms.Padding(3); this.mapEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.mapEditorTabPage.TabIndex = 2; this.mapEditorTabPage.Text = "Map Editor"; @@ -3289,7 +3289,7 @@ this.buildingsTabPage.Controls.Add(this.buildingsListBox); this.buildingsTabPage.Location = new System.Drawing.Point(4, 22); this.buildingsTabPage.Name = "buildingsTabPage"; - this.buildingsTabPage.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.buildingsTabPage.Padding = new System.Windows.Forms.Padding(3); this.buildingsTabPage.Size = new System.Drawing.Size(481, 450); this.buildingsTabPage.TabIndex = 0; this.buildingsTabPage.Text = "Buildings"; @@ -3303,7 +3303,6 @@ this.groupBox33.Controls.Add(this.yRotBuildUpDown); this.groupBox33.Controls.Add(this.xRotBuildUpDown); this.groupBox33.Controls.Add(this.zRotBuildUpDown); - this.groupBox33.Enabled = false; this.groupBox33.Location = new System.Drawing.Point(339, 141); this.groupBox33.Name = "groupBox33"; this.groupBox33.Size = new System.Drawing.Size(131, 123); @@ -3832,7 +3831,7 @@ this.permissionsTabPage.Controls.Add(this.exportMovButton); this.permissionsTabPage.Location = new System.Drawing.Point(4, 22); this.permissionsTabPage.Name = "permissionsTabPage"; - this.permissionsTabPage.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.permissionsTabPage.Padding = new System.Windows.Forms.Padding(3); this.permissionsTabPage.Size = new System.Drawing.Size(481, 450); this.permissionsTabPage.TabIndex = 1; this.permissionsTabPage.Text = "Move Permissions"; @@ -4064,7 +4063,7 @@ this.modelTabPage.Controls.Add(this.exportMapButton); this.modelTabPage.Location = new System.Drawing.Point(4, 22); this.modelTabPage.Name = "modelTabPage"; - this.modelTabPage.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.modelTabPage.Padding = new System.Windows.Forms.Padding(3); this.modelTabPage.Size = new System.Drawing.Size(481, 450); this.modelTabPage.TabIndex = 2; this.modelTabPage.Text = "3D Model"; @@ -4075,7 +4074,7 @@ this.glbExportButton.Image = global::DSPRE.Properties.Resources.exportArrow; this.glbExportButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.glbExportButton.Location = new System.Drawing.Point(351, 156); - this.glbExportButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.glbExportButton.Margin = new System.Windows.Forms.Padding(4); this.glbExportButton.Name = "glbExportButton"; this.glbExportButton.Size = new System.Drawing.Size(120, 38); this.glbExportButton.TabIndex = 31; @@ -4180,7 +4179,7 @@ this.terrainTabPage.Controls.Add(this.bdhcExportButton); this.terrainTabPage.Location = new System.Drawing.Point(4, 22); this.terrainTabPage.Name = "terrainTabPage"; - this.terrainTabPage.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.terrainTabPage.Padding = new System.Windows.Forms.Padding(3); this.terrainTabPage.Size = new System.Drawing.Size(481, 450); this.terrainTabPage.TabIndex = 3; this.terrainTabPage.Text = "Terrain Data"; @@ -4339,7 +4338,7 @@ this.radio3D.AutoSize = true; this.radio3D.Checked = true; this.radio3D.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.radio3D.Location = new System.Drawing.Point(-9834, -5833); + this.radio3D.Location = new System.Drawing.Point(-11820, -7035); this.radio3D.Name = "radio3D"; this.radio3D.Size = new System.Drawing.Size(31, 23); this.radio3D.TabIndex = 26; @@ -4354,7 +4353,7 @@ 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(-9834, -5809); + this.radio2D.Location = new System.Drawing.Point(-11820, -7011); this.radio2D.Name = "radio2D"; this.radio2D.Size = new System.Drawing.Size(31, 23); this.radio2D.TabIndex = 25; @@ -4369,7 +4368,7 @@ 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(1140, -5785); + this.wireframeCheckBox.Location = new System.Drawing.Point(1140, -6987); this.wireframeCheckBox.Name = "wireframeCheckBox"; this.wireframeCheckBox.Size = new System.Drawing.Size(31, 23); this.wireframeCheckBox.TabIndex = 27; @@ -4383,7 +4382,7 @@ this.nsbtxEditorTabPage.ImageIndex = 6; this.nsbtxEditorTabPage.Location = new System.Drawing.Point(4, 23); this.nsbtxEditorTabPage.Name = "nsbtxEditorTabPage"; - this.nsbtxEditorTabPage.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.nsbtxEditorTabPage.Padding = new System.Windows.Forms.Padding(3); this.nsbtxEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.nsbtxEditorTabPage.TabIndex = 6; this.nsbtxEditorTabPage.Text = "NSBTX Editor"; @@ -4436,7 +4435,7 @@ this.groupBox35.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox35.Location = new System.Drawing.Point(3, 78); this.groupBox35.Name = "groupBox35"; - this.groupBox35.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox35.Padding = new System.Windows.Forms.Padding(4); this.groupBox35.Size = new System.Drawing.Size(79, 178); this.groupBox35.TabIndex = 23; this.groupBox35.TabStop = false; @@ -4453,7 +4452,7 @@ this.tableLayoutPanel38.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel38.Location = new System.Drawing.Point(4, 17); this.tableLayoutPanel38.Name = "tableLayoutPanel38"; - this.tableLayoutPanel38.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tableLayoutPanel38.Padding = new System.Windows.Forms.Padding(4); this.tableLayoutPanel38.RowCount = 1; this.tableLayoutPanel38.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel38.Size = new System.Drawing.Size(71, 157); @@ -4924,7 +4923,7 @@ this.eventEditorTabPage.ImageIndex = 3; this.eventEditorTabPage.Location = new System.Drawing.Point(4, 23); this.eventEditorTabPage.Name = "eventEditorTabPage"; - this.eventEditorTabPage.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.eventEditorTabPage.Padding = new System.Windows.Forms.Padding(3); this.eventEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.eventEditorTabPage.TabIndex = 3; this.eventEditorTabPage.Text = "Event Editor"; @@ -5187,7 +5186,7 @@ this.signsTabPage.Controls.Add(this.spawnablesListBox); this.signsTabPage.Location = new System.Drawing.Point(4, 22); this.signsTabPage.Name = "signsTabPage"; - this.signsTabPage.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.signsTabPage.Padding = new System.Windows.Forms.Padding(3); this.signsTabPage.Size = new System.Drawing.Size(444, 352); this.signsTabPage.TabIndex = 0; this.signsTabPage.Text = "Spawnables"; @@ -5479,7 +5478,7 @@ this.overworldsTabPage.Controls.Add(this.overworldsListBox); this.overworldsTabPage.Location = new System.Drawing.Point(4, 22); this.overworldsTabPage.Name = "overworldsTabPage"; - this.overworldsTabPage.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.overworldsTabPage.Padding = new System.Windows.Forms.Padding(3); this.overworldsTabPage.Size = new System.Drawing.Size(444, 352); this.overworldsTabPage.TabIndex = 1; this.overworldsTabPage.Text = "Overworlds"; @@ -6094,7 +6093,7 @@ this.warpsTabPage.Controls.Add(this.warpsListBox); this.warpsTabPage.Location = new System.Drawing.Point(4, 22); this.warpsTabPage.Name = "warpsTabPage"; - this.warpsTabPage.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.warpsTabPage.Padding = new System.Windows.Forms.Padding(3); this.warpsTabPage.Size = new System.Drawing.Size(444, 352); this.warpsTabPage.TabIndex = 2; this.warpsTabPage.Text = "Warps"; @@ -6404,7 +6403,7 @@ this.triggersTabPage.Controls.Add(this.triggersListBox); this.triggersTabPage.Location = new System.Drawing.Point(4, 22); this.triggersTabPage.Name = "triggersTabPage"; - this.triggersTabPage.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.triggersTabPage.Padding = new System.Windows.Forms.Padding(3); this.triggersTabPage.Size = new System.Drawing.Size(444, 352); this.triggersTabPage.TabIndex = 3; this.triggersTabPage.Text = "Triggers"; @@ -6956,7 +6955,7 @@ this.textEditorTabPage.ImageIndex = 4; this.textEditorTabPage.Location = new System.Drawing.Point(4, 23); this.textEditorTabPage.Name = "textEditorTabPage"; - this.textEditorTabPage.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.textEditorTabPage.Padding = new System.Windows.Forms.Padding(3); this.textEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.textEditorTabPage.TabIndex = 5; this.textEditorTabPage.Text = "Text Editor"; @@ -9595,7 +9594,7 @@ this.tableEditorTabPage.ImageIndex = 9; this.tableEditorTabPage.Location = new System.Drawing.Point(4, 23); this.tableEditorTabPage.Name = "tableEditorTabPage"; - this.tableEditorTabPage.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.tableEditorTabPage.Padding = new System.Windows.Forms.Padding(3); this.tableEditorTabPage.Size = new System.Drawing.Size(1185, 675); this.tableEditorTabPage.TabIndex = 9; this.tableEditorTabPage.Text = "Table Editor"; @@ -10073,7 +10072,7 @@ this.tabPageScriptEditor.ImageIndex = 5; this.tabPageScriptEditor.Location = new System.Drawing.Point(4, 23); this.tabPageScriptEditor.Name = "tabPageScriptEditor"; - this.tabPageScriptEditor.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.tabPageScriptEditor.Padding = new System.Windows.Forms.Padding(3); this.tabPageScriptEditor.Size = new System.Drawing.Size(1185, 675); this.tabPageScriptEditor.TabIndex = 10; this.tabPageScriptEditor.Text = "Script Editor New"; @@ -10082,7 +10081,7 @@ // scriptEditor // this.scriptEditor.Location = new System.Drawing.Point(2, 3); - this.scriptEditor.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.scriptEditor.Margin = new System.Windows.Forms.Padding(4); this.scriptEditor.Name = "scriptEditor"; this.scriptEditor.scriptEditorIsReady = false; this.scriptEditor.Size = new System.Drawing.Size(1177, 735); @@ -10093,7 +10092,7 @@ this.tabPageLevelScriptEditor.Controls.Add(this.levelScriptEditor); this.tabPageLevelScriptEditor.Location = new System.Drawing.Point(4, 23); this.tabPageLevelScriptEditor.Name = "tabPageLevelScriptEditor"; - this.tabPageLevelScriptEditor.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.tabPageLevelScriptEditor.Padding = new System.Windows.Forms.Padding(3); this.tabPageLevelScriptEditor.Size = new System.Drawing.Size(1185, 675); this.tabPageLevelScriptEditor.TabIndex = 11; this.tabPageLevelScriptEditor.Text = "Level Script Editor"; @@ -10104,7 +10103,7 @@ this.levelScriptEditor.BackColor = System.Drawing.SystemColors.Control; this.levelScriptEditor.levelScriptEditorIsReady = false; this.levelScriptEditor.Location = new System.Drawing.Point(6, 8); - this.levelScriptEditor.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.levelScriptEditor.Margin = new System.Windows.Forms.Padding(4); this.levelScriptEditor.Name = "levelScriptEditor"; this.levelScriptEditor.Size = new System.Drawing.Size(408, 622); this.levelScriptEditor.TabIndex = 0; @@ -10114,7 +10113,7 @@ this.tabPageEncountersEditor.Controls.Add(this.encountersEditor); this.tabPageEncountersEditor.Location = new System.Drawing.Point(4, 23); this.tabPageEncountersEditor.Name = "tabPageEncountersEditor"; - this.tabPageEncountersEditor.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.tabPageEncountersEditor.Padding = new System.Windows.Forms.Padding(3); this.tabPageEncountersEditor.Size = new System.Drawing.Size(1185, 675); this.tabPageEncountersEditor.TabIndex = 12; this.tabPageEncountersEditor.Text = "Encounters"; @@ -10123,7 +10122,7 @@ // encountersEditor // this.encountersEditor.Location = new System.Drawing.Point(6, 3); - this.encountersEditor.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.encountersEditor.Margin = new System.Windows.Forms.Padding(4); this.encountersEditor.Name = "encountersEditor"; this.encountersEditor.Size = new System.Drawing.Size(1176, 672); this.encountersEditor.TabIndex = 0; diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index 533e32f..1cfcaef 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -3762,11 +3762,13 @@ namespace DSPRE { private void addBuildingButton_Click(object sender, EventArgs e) { AddBuildingToMap(new Building()); } + private void duplicateBuildingButton_Click(object sender, EventArgs e) { if (buildingsListBox.SelectedIndex > -1) { AddBuildingToMap(new Building(currentMapFile.buildings[buildingsListBox.SelectedIndex])); } } + private void AddBuildingToMap(Building b) { currentMapFile.buildings.Add(b); @@ -3782,6 +3784,7 @@ namespace DSPRE { /* Redraw scene with new building */ RenderMap(ref mapRenderer, ref buildingsRenderer, ref currentMapFile, ang, dist, elev, perspective, mapOpenGlControl.Width, mapOpenGlControl.Height, mapTexturesOn, bldTexturesOn); } + private void buildIndexComboBox_SelectedIndexChanged(object sender, EventArgs e) { if (Helpers.HandlersDisabled || buildingsListBox.SelectedIndex < 0) { return; @@ -3797,6 +3800,7 @@ namespace DSPRE { RenderMap(ref mapRenderer, ref buildingsRenderer, ref currentMapFile, ang, dist, elev, perspective, mapOpenGlControl.Width, mapOpenGlControl.Height, mapTexturesOn, bldTexturesOn); } + private void buildingsListBox_SelectedIndexChanged(object sender, EventArgs e) { int buildingNumber = buildingsListBox.SelectedIndex; if (Helpers.HandlersDisabled || buildingNumber < 0) { @@ -3828,6 +3832,7 @@ namespace DSPRE { Helpers.RestoreDisableHandler(); } + private void xRotBuildUpDown_ValueChanged(object sender, EventArgs e) { int selection = buildingsListBox.SelectedIndex; @@ -3908,24 +3913,28 @@ namespace DSPRE { Helpers.EnableHandlers(); } + private void buildingHeightUpDown_ValueChanged(object sender, EventArgs e) { if (buildingsListBox.SelectedIndex > -1) { currentMapFile.buildings[buildingsListBox.SelectedIndex].height = (uint)buildingHeightUpDown.Value; RenderMap(ref mapRenderer, ref buildingsRenderer, ref currentMapFile, ang, dist, elev, perspective, mapOpenGlControl.Width, mapOpenGlControl.Height, mapTexturesOn, bldTexturesOn); } } + private void buildingLengthUpDown_ValueChanged(object sender, EventArgs e) { if (buildingsListBox.SelectedIndex > -1) { currentMapFile.buildings[buildingsListBox.SelectedIndex].length = (uint)buildingLengthUpDown.Value; RenderMap(ref mapRenderer, ref buildingsRenderer, ref currentMapFile, ang, dist, elev, perspective, mapOpenGlControl.Width, mapOpenGlControl.Height, mapTexturesOn, bldTexturesOn); } } + private void buildingWidthUpDown_ValueChanged(object sender, EventArgs e) { if (buildingsListBox.SelectedIndex > -1) { currentMapFile.buildings[buildingsListBox.SelectedIndex].width = (uint)buildingWidthUpDown.Value; RenderMap(ref mapRenderer, ref buildingsRenderer, ref currentMapFile, ang, dist, elev, perspective, mapOpenGlControl.Width, mapOpenGlControl.Height, mapTexturesOn, bldTexturesOn); } } + private void exportBuildingsButton_Click(object sender, EventArgs e) { SaveFileDialog sf = new SaveFileDialog { Filter = MapFile.BuildingsFilter, @@ -3939,6 +3948,7 @@ namespace DSPRE { MessageBox.Show("Buildings exported successfully!", "", MessageBoxButtons.OK, MessageBoxIcon.Information); } + private void importBuildingsButton_Click(object sender, EventArgs e) { OpenFileDialog ib = new OpenFileDialog { Filter = MapFile.BuildingsFilter @@ -3959,6 +3969,7 @@ namespace DSPRE { RenderMap(ref mapRenderer, ref buildingsRenderer, ref currentMapFile, ang, dist, elev, perspective, mapOpenGlControl.Width, mapOpenGlControl.Height, mapTexturesOn, bldTexturesOn); MessageBox.Show("Buildings imported successfully!", "", MessageBoxButtons.OK, MessageBoxIcon.Information); } + private void interiorRadioButton_CheckedChanged(object sender, EventArgs e) { Helpers.DisableHandlers(); int index = buildIndexComboBox.SelectedIndex; @@ -3985,6 +3996,7 @@ namespace DSPRE { RenderMap(ref mapRenderer, ref buildingsRenderer, ref currentMapFile, ang, dist, elev, perspective, mapOpenGlControl.Width, mapOpenGlControl.Height, mapTexturesOn, bldTexturesOn); Helpers.EnableHandlers(); } + private void removeBuildingButton_Click(object sender, EventArgs e) { int toRemoveListBoxID = buildingsListBox.SelectedIndex; if (toRemoveListBoxID > -1) { @@ -4009,6 +4021,7 @@ namespace DSPRE { } } } + private void xBuildUpDown_ValueChanged(object sender, EventArgs e) { if (Helpers.HandlersDisabled || buildingsListBox.SelectedIndex < 0) { return; @@ -4026,6 +4039,7 @@ namespace DSPRE { currentMapFile.buildings[buildingsListBox.SelectedIndex].xFraction = (ushort)(decPart * 65535); RenderMap(ref mapRenderer, ref buildingsRenderer, ref currentMapFile, ang, dist, elev, perspective, mapOpenGlControl.Width, mapOpenGlControl.Height, mapTexturesOn, bldTexturesOn); } + private void zBuildUpDown_ValueChanged(object sender, EventArgs e) { if (Helpers.HandlersDisabled || buildingsListBox.SelectedIndex < 0) return; @@ -4042,6 +4056,7 @@ namespace DSPRE { currentMapFile.buildings[buildingsListBox.SelectedIndex].zFraction = (ushort)(decPart * 65535); RenderMap(ref mapRenderer, ref buildingsRenderer, ref currentMapFile, ang, dist, elev, perspective, mapOpenGlControl.Width, mapOpenGlControl.Height, mapTexturesOn, bldTexturesOn); } + private void yBuildUpDown_ValueChanged(object sender, EventArgs e) { if (Helpers.HandlersDisabled || buildingsListBox.SelectedIndex < 0) return; @@ -4658,6 +4673,7 @@ namespace DSPRE { #region 3D Model Editor public const ushort MAPMODEL_CRITICALSIZE = 61000; + private void importMapButton_Click(object sender, EventArgs e) { OpenFileDialog im = new OpenFileDialog { Filter = MapFile.NSBMDFilter @@ -4687,6 +4703,7 @@ namespace DSPRE { } MessageBox.Show(message, title, MessageBoxButtons.OK, MessageBoxIcon.Information); } + private void exportMapButton_Click(object sender, EventArgs e) { SaveFileDialog em = new SaveFileDialog { FileName = selectMapComboBox.SelectedItem.ToString() diff --git a/DS_Map/Main Window.resx b/DS_Map/Main Window.resx index 7854c16..aac40e2 100644 --- a/DS_Map/Main Window.resx +++ b/DS_Map/Main Window.resx @@ -956,7 +956,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM - EgAAAk1TRnQBSQFMAgEBCgEAAUABHAFAARwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + EgAAAk1TRnQBSQFMAgEBCgEAAVABHAFQARwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/DS_Map/WildEditorDPPt.Designer.cs b/DS_Map/WildEditorDPPt.Designer.cs index 813d03a..c712e05 100644 --- a/DS_Map/WildEditorDPPt.Designer.cs +++ b/DS_Map/WildEditorDPPt.Designer.cs @@ -51,31 +51,32 @@ this.label34 = new System.Windows.Forms.Label(); this.radarFirstComboBox = new DSPRE.InputComboBox(); this.dualSlotGroupBox = new System.Windows.Forms.GroupBox(); - this.leafGreenFirstComboBox = new DSPRE.InputComboBox(); + this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); this.label33 = new System.Windows.Forms.Label(); + this.leafGreenFirstComboBox = new DSPRE.InputComboBox(); this.fireRedSecondComboBox = new DSPRE.InputComboBox(); - this.label35 = new System.Windows.Forms.Label(); - this.fireRedFirstComboBox = new DSPRE.InputComboBox(); - this.label36 = new System.Windows.Forms.Label(); - this.label37 = new System.Windows.Forms.Label(); - this.label38 = new System.Windows.Forms.Label(); - this.leafGreenSecondComboBox = new DSPRE.InputComboBox(); - this.label39 = new System.Windows.Forms.Label(); - this.sapphireFirstComboBox = new DSPRE.InputComboBox(); - this.rubyFirstComboBox = new DSPRE.InputComboBox(); - this.label24 = new System.Windows.Forms.Label(); - this.emeraldSecondComboBox = new DSPRE.InputComboBox(); - this.label25 = new System.Windows.Forms.Label(); - this.label32 = new System.Windows.Forms.Label(); - this.rubySecondComboBox = new DSPRE.InputComboBox(); - this.label31 = new System.Windows.Forms.Label(); - this.label26 = new System.Windows.Forms.Label(); - this.label30 = new System.Windows.Forms.Label(); - this.emeraldFirstComboBox = new DSPRE.InputComboBox(); - this.label27 = new System.Windows.Forms.Label(); - this.sapphireSecondComboBox = new DSPRE.InputComboBox(); - this.label28 = new System.Windows.Forms.Label(); this.label29 = new System.Windows.Forms.Label(); + this.label37 = new System.Windows.Forms.Label(); + this.label26 = new System.Windows.Forms.Label(); + this.leafGreenSecondComboBox = new DSPRE.InputComboBox(); + this.label24 = new System.Windows.Forms.Label(); + this.label35 = new System.Windows.Forms.Label(); + this.rubyFirstComboBox = new DSPRE.InputComboBox(); + this.label39 = new System.Windows.Forms.Label(); + this.fireRedFirstComboBox = new DSPRE.InputComboBox(); + this.rubySecondComboBox = new DSPRE.InputComboBox(); + this.label36 = new System.Windows.Forms.Label(); + this.label38 = new System.Windows.Forms.Label(); + this.label27 = new System.Windows.Forms.Label(); + this.label30 = new System.Windows.Forms.Label(); + this.label28 = new System.Windows.Forms.Label(); + this.sapphireFirstComboBox = new DSPRE.InputComboBox(); + this.sapphireSecondComboBox = new DSPRE.InputComboBox(); + this.label32 = new System.Windows.Forms.Label(); + this.emeraldSecondComboBox = new DSPRE.InputComboBox(); + this.label31 = new System.Windows.Forms.Label(); + this.emeraldFirstComboBox = new DSPRE.InputComboBox(); + this.label25 = new System.Windows.Forms.Label(); this.timeGroupBox = new System.Windows.Forms.GroupBox(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); this.label16 = new System.Windows.Forms.Label(); @@ -239,7 +240,6 @@ this.label66 = new System.Windows.Forms.Label(); this.surfSixtyComboBox = new DSPRE.InputComboBox(); this.repairAllButton = new System.Windows.Forms.Button(); - this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); this.mainTabControl.SuspendLayout(); this.grassGroundTabPage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); @@ -247,6 +247,7 @@ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.radarGroupBox.SuspendLayout(); this.dualSlotGroupBox.SuspendLayout(); + this.tableLayoutPanel3.SuspendLayout(); this.timeGroupBox.SuspendLayout(); this.tableLayoutPanel2.SuspendLayout(); this.walkingGroupBox.SuspendLayout(); @@ -317,7 +318,6 @@ ((System.ComponentModel.ISupportInitialize)(this.surfThirtyMinLevelUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.surfSixtyMaxLevelUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.surfSixtyMinLevelUpDown)).BeginInit(); - this.tableLayoutPanel3.SuspendLayout(); this.SuspendLayout(); // // encounterFileLabel @@ -567,16 +567,55 @@ this.dualSlotGroupBox.TabStop = false; this.dualSlotGroupBox.Text = "Dual Slot"; // - // leafGreenFirstComboBox + // tableLayoutPanel3 // - this.leafGreenFirstComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.leafGreenFirstComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.leafGreenFirstComboBox.FormattingEnabled = true; - this.leafGreenFirstComboBox.Location = new System.Drawing.Point(277, 104); - this.leafGreenFirstComboBox.Name = "leafGreenFirstComboBox"; - this.leafGreenFirstComboBox.Size = new System.Drawing.Size(184, 21); - this.leafGreenFirstComboBox.TabIndex = 207; - this.leafGreenFirstComboBox.SelectedIndexChanged += new System.EventHandler(this.leafGreenFirstComboBox_SelectedIndexChanged); + this.tableLayoutPanel3.ColumnCount = 8; + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 15.91356F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 84.08644F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 15F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 193F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 12F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 39F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 197F)); + this.tableLayoutPanel3.Controls.Add(this.label33, 0, 6); + this.tableLayoutPanel3.Controls.Add(this.leafGreenFirstComboBox, 4, 5); + this.tableLayoutPanel3.Controls.Add(this.fireRedSecondComboBox, 1, 6); + this.tableLayoutPanel3.Controls.Add(this.label29, 1, 0); + this.tableLayoutPanel3.Controls.Add(this.label37, 3, 6); + this.tableLayoutPanel3.Controls.Add(this.label26, 0, 1); + this.tableLayoutPanel3.Controls.Add(this.leafGreenSecondComboBox, 4, 6); + this.tableLayoutPanel3.Controls.Add(this.label24, 0, 2); + this.tableLayoutPanel3.Controls.Add(this.label35, 0, 5); + this.tableLayoutPanel3.Controls.Add(this.rubyFirstComboBox, 1, 1); + this.tableLayoutPanel3.Controls.Add(this.label39, 3, 5); + this.tableLayoutPanel3.Controls.Add(this.fireRedFirstComboBox, 1, 5); + this.tableLayoutPanel3.Controls.Add(this.rubySecondComboBox, 1, 2); + this.tableLayoutPanel3.Controls.Add(this.label36, 4, 4); + this.tableLayoutPanel3.Controls.Add(this.label38, 1, 4); + this.tableLayoutPanel3.Controls.Add(this.label27, 4, 0); + this.tableLayoutPanel3.Controls.Add(this.label30, 3, 1); + this.tableLayoutPanel3.Controls.Add(this.label28, 3, 2); + this.tableLayoutPanel3.Controls.Add(this.sapphireFirstComboBox, 4, 1); + this.tableLayoutPanel3.Controls.Add(this.sapphireSecondComboBox, 4, 2); + this.tableLayoutPanel3.Controls.Add(this.label32, 6, 2); + this.tableLayoutPanel3.Controls.Add(this.emeraldSecondComboBox, 7, 2); + this.tableLayoutPanel3.Controls.Add(this.label31, 6, 1); + this.tableLayoutPanel3.Controls.Add(this.emeraldFirstComboBox, 7, 1); + this.tableLayoutPanel3.Controls.Add(this.label25, 7, 0); + this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel3.Location = new System.Drawing.Point(3, 16); + this.tableLayoutPanel3.Name = "tableLayoutPanel3"; + this.tableLayoutPanel3.RowCount = 7; + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 80F)); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 19F)); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); + this.tableLayoutPanel3.Size = new System.Drawing.Size(715, 163); + this.tableLayoutPanel3.TabIndex = 217; // // label33 // @@ -587,164 +626,46 @@ this.label33.TabIndex = 206; this.label33.Text = "4%"; // + // leafGreenFirstComboBox + // + this.leafGreenFirstComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.leafGreenFirstComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.leafGreenFirstComboBox.FormattingEnabled = true; + this.leafGreenFirstComboBox.Location = new System.Drawing.Point(276, 104); + this.leafGreenFirstComboBox.Name = "leafGreenFirstComboBox"; + this.leafGreenFirstComboBox.Size = new System.Drawing.Size(184, 21); + this.leafGreenFirstComboBox.TabIndex = 207; + this.leafGreenFirstComboBox.SelectedIndexChanged += new System.EventHandler(this.leafGreenFirstComboBox_SelectedIndexChanged); + // // fireRedSecondComboBox // this.fireRedSecondComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.fireRedSecondComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.fireRedSecondComboBox.FormattingEnabled = true; - this.fireRedSecondComboBox.Location = new System.Drawing.Point(40, 134); + this.fireRedSecondComboBox.Location = new System.Drawing.Point(39, 134); this.fireRedSecondComboBox.Name = "fireRedSecondComboBox"; this.fireRedSecondComboBox.Size = new System.Drawing.Size(182, 21); this.fireRedSecondComboBox.TabIndex = 205; this.fireRedSecondComboBox.SelectedIndexChanged += new System.EventHandler(this.fireRedSecondComboBox_SelectedIndexChanged); // - // label35 + // label29 // - this.label35.AutoSize = true; - this.label35.Location = new System.Drawing.Point(3, 101); - this.label35.Name = "label35"; - this.label35.Size = new System.Drawing.Size(21, 13); - this.label35.TabIndex = 204; - this.label35.Text = "4%"; - // - // fireRedFirstComboBox - // - this.fireRedFirstComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.fireRedFirstComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.fireRedFirstComboBox.FormattingEnabled = true; - this.fireRedFirstComboBox.Location = new System.Drawing.Point(40, 104); - this.fireRedFirstComboBox.Name = "fireRedFirstComboBox"; - this.fireRedFirstComboBox.Size = new System.Drawing.Size(182, 21); - this.fireRedFirstComboBox.TabIndex = 203; - this.fireRedFirstComboBox.SelectedIndexChanged += new System.EventHandler(this.fireRedFirstComboBox_SelectedIndexChanged); - // - // label36 - // - this.label36.AutoSize = true; - this.label36.Location = new System.Drawing.Point(277, 84); - this.label36.Name = "label36"; - this.label36.Size = new System.Drawing.Size(60, 13); - this.label36.TabIndex = 216; - this.label36.Text = "Leaf Green"; + this.label29.AutoSize = true; + this.label29.Location = new System.Drawing.Point(39, 0); + this.label29.Name = "label29"; + this.label29.Size = new System.Drawing.Size(32, 9); + this.label29.TabIndex = 200; + this.label29.Text = "Ruby"; // // label37 // this.label37.AutoSize = true; - this.label37.Location = new System.Drawing.Point(250, 131); + this.label37.Location = new System.Drawing.Point(249, 131); this.label37.Name = "label37"; this.label37.Size = new System.Drawing.Size(21, 13); this.label37.TabIndex = 210; this.label37.Text = "4%"; // - // label38 - // - this.label38.AutoSize = true; - this.label38.Location = new System.Drawing.Point(40, 84); - this.label38.Name = "label38"; - this.label38.Size = new System.Drawing.Size(47, 13); - this.label38.TabIndex = 215; - this.label38.Text = "Fire Red"; - // - // leafGreenSecondComboBox - // - this.leafGreenSecondComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.leafGreenSecondComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.leafGreenSecondComboBox.FormattingEnabled = true; - this.leafGreenSecondComboBox.Location = new System.Drawing.Point(277, 134); - this.leafGreenSecondComboBox.Name = "leafGreenSecondComboBox"; - this.leafGreenSecondComboBox.Size = new System.Drawing.Size(183, 21); - this.leafGreenSecondComboBox.TabIndex = 209; - this.leafGreenSecondComboBox.SelectedIndexChanged += new System.EventHandler(this.leafGreenSecondComboBox_SelectedIndexChanged); - // - // label39 - // - this.label39.AutoSize = true; - this.label39.Location = new System.Drawing.Point(250, 101); - this.label39.Name = "label39"; - this.label39.Size = new System.Drawing.Size(21, 13); - this.label39.TabIndex = 208; - this.label39.Text = "4%"; - // - // sapphireFirstComboBox - // - this.sapphireFirstComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.sapphireFirstComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.sapphireFirstComboBox.FormattingEnabled = true; - this.sapphireFirstComboBox.Location = new System.Drawing.Point(277, 12); - this.sapphireFirstComboBox.Name = "sapphireFirstComboBox"; - this.sapphireFirstComboBox.Size = new System.Drawing.Size(184, 21); - this.sapphireFirstComboBox.TabIndex = 192; - this.sapphireFirstComboBox.SelectedIndexChanged += new System.EventHandler(this.sapphireFirstComboBox_SelectedIndexChanged); - // - // rubyFirstComboBox - // - this.rubyFirstComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.rubyFirstComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.rubyFirstComboBox.FormattingEnabled = true; - this.rubyFirstComboBox.Location = new System.Drawing.Point(40, 12); - this.rubyFirstComboBox.Name = "rubyFirstComboBox"; - this.rubyFirstComboBox.Size = new System.Drawing.Size(182, 21); - this.rubyFirstComboBox.TabIndex = 188; - this.rubyFirstComboBox.SelectedIndexChanged += new System.EventHandler(this.rubyFirstComboBox_SelectedIndexChanged); - // - // label24 - // - this.label24.AutoSize = true; - this.label24.Location = new System.Drawing.Point(3, 45); - this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(21, 13); - this.label24.TabIndex = 191; - this.label24.Text = "4%"; - // - // emeraldSecondComboBox - // - this.emeraldSecondComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.emeraldSecondComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.emeraldSecondComboBox.FormattingEnabled = true; - this.emeraldSecondComboBox.Location = new System.Drawing.Point(521, 48); - this.emeraldSecondComboBox.Name = "emeraldSecondComboBox"; - this.emeraldSecondComboBox.Size = new System.Drawing.Size(184, 21); - this.emeraldSecondComboBox.TabIndex = 198; - this.emeraldSecondComboBox.SelectedIndexChanged += new System.EventHandler(this.emeraldSecondComboBox_SelectedIndexChanged); - // - // label25 - // - this.label25.AutoSize = true; - this.label25.Location = new System.Drawing.Point(521, 0); - this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(45, 9); - this.label25.TabIndex = 202; - this.label25.Text = "Emerald"; - // - // label32 - // - this.label32.AutoSize = true; - this.label32.Location = new System.Drawing.Point(482, 45); - this.label32.Name = "label32"; - this.label32.Size = new System.Drawing.Size(21, 13); - this.label32.TabIndex = 199; - this.label32.Text = "4%"; - // - // rubySecondComboBox - // - this.rubySecondComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.rubySecondComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.rubySecondComboBox.FormattingEnabled = true; - this.rubySecondComboBox.Location = new System.Drawing.Point(40, 48); - this.rubySecondComboBox.Name = "rubySecondComboBox"; - this.rubySecondComboBox.Size = new System.Drawing.Size(182, 21); - this.rubySecondComboBox.TabIndex = 190; - this.rubySecondComboBox.SelectedIndexChanged += new System.EventHandler(this.rubySecondComboBox_SelectedIndexChanged); - // - // label31 - // - this.label31.AutoSize = true; - this.label31.Location = new System.Drawing.Point(482, 9); - this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(21, 13); - this.label31.TabIndex = 197; - this.label31.Text = "4%"; - // // label26 // this.label26.AutoSize = true; @@ -754,63 +675,192 @@ this.label26.TabIndex = 189; this.label26.Text = "4%"; // + // leafGreenSecondComboBox + // + this.leafGreenSecondComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.leafGreenSecondComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.leafGreenSecondComboBox.FormattingEnabled = true; + this.leafGreenSecondComboBox.Location = new System.Drawing.Point(276, 134); + this.leafGreenSecondComboBox.Name = "leafGreenSecondComboBox"; + this.leafGreenSecondComboBox.Size = new System.Drawing.Size(183, 21); + this.leafGreenSecondComboBox.TabIndex = 209; + this.leafGreenSecondComboBox.SelectedIndexChanged += new System.EventHandler(this.leafGreenSecondComboBox_SelectedIndexChanged); + // + // label24 + // + this.label24.AutoSize = true; + this.label24.Location = new System.Drawing.Point(3, 45); + this.label24.Name = "label24"; + this.label24.Size = new System.Drawing.Size(21, 13); + this.label24.TabIndex = 191; + this.label24.Text = "4%"; + // + // label35 + // + this.label35.AutoSize = true; + this.label35.Location = new System.Drawing.Point(3, 101); + this.label35.Name = "label35"; + this.label35.Size = new System.Drawing.Size(21, 13); + this.label35.TabIndex = 204; + this.label35.Text = "4%"; + // + // rubyFirstComboBox + // + this.rubyFirstComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.rubyFirstComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.rubyFirstComboBox.FormattingEnabled = true; + this.rubyFirstComboBox.Location = new System.Drawing.Point(39, 12); + this.rubyFirstComboBox.Name = "rubyFirstComboBox"; + this.rubyFirstComboBox.Size = new System.Drawing.Size(182, 21); + this.rubyFirstComboBox.TabIndex = 188; + this.rubyFirstComboBox.SelectedIndexChanged += new System.EventHandler(this.rubyFirstComboBox_SelectedIndexChanged); + // + // label39 + // + this.label39.AutoSize = true; + this.label39.Location = new System.Drawing.Point(249, 101); + this.label39.Name = "label39"; + this.label39.Size = new System.Drawing.Size(21, 13); + this.label39.TabIndex = 208; + this.label39.Text = "4%"; + // + // fireRedFirstComboBox + // + this.fireRedFirstComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.fireRedFirstComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.fireRedFirstComboBox.FormattingEnabled = true; + this.fireRedFirstComboBox.Location = new System.Drawing.Point(39, 104); + this.fireRedFirstComboBox.Name = "fireRedFirstComboBox"; + this.fireRedFirstComboBox.Size = new System.Drawing.Size(182, 21); + this.fireRedFirstComboBox.TabIndex = 203; + this.fireRedFirstComboBox.SelectedIndexChanged += new System.EventHandler(this.fireRedFirstComboBox_SelectedIndexChanged); + // + // rubySecondComboBox + // + this.rubySecondComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.rubySecondComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.rubySecondComboBox.FormattingEnabled = true; + this.rubySecondComboBox.Location = new System.Drawing.Point(39, 48); + this.rubySecondComboBox.Name = "rubySecondComboBox"; + this.rubySecondComboBox.Size = new System.Drawing.Size(182, 21); + this.rubySecondComboBox.TabIndex = 190; + this.rubySecondComboBox.SelectedIndexChanged += new System.EventHandler(this.rubySecondComboBox_SelectedIndexChanged); + // + // label36 + // + this.label36.AutoSize = true; + this.label36.Location = new System.Drawing.Point(276, 84); + this.label36.Name = "label36"; + this.label36.Size = new System.Drawing.Size(60, 13); + this.label36.TabIndex = 216; + this.label36.Text = "Leaf Green"; + // + // label38 + // + this.label38.AutoSize = true; + this.label38.Location = new System.Drawing.Point(39, 84); + this.label38.Name = "label38"; + this.label38.Size = new System.Drawing.Size(47, 13); + this.label38.TabIndex = 215; + this.label38.Text = "Fire Red"; + // + // label27 + // + this.label27.AutoSize = true; + this.label27.Location = new System.Drawing.Point(276, 0); + this.label27.Name = "label27"; + this.label27.Size = new System.Drawing.Size(49, 9); + this.label27.TabIndex = 201; + this.label27.Text = "Sapphire"; + // // label30 // this.label30.AutoSize = true; - this.label30.Location = new System.Drawing.Point(250, 9); + this.label30.Location = new System.Drawing.Point(249, 9); this.label30.Name = "label30"; this.label30.Size = new System.Drawing.Size(21, 13); this.label30.TabIndex = 193; this.label30.Text = "4%"; // - // emeraldFirstComboBox + // label28 // - this.emeraldFirstComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.emeraldFirstComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.emeraldFirstComboBox.FormattingEnabled = true; - this.emeraldFirstComboBox.Location = new System.Drawing.Point(521, 12); - this.emeraldFirstComboBox.Name = "emeraldFirstComboBox"; - this.emeraldFirstComboBox.Size = new System.Drawing.Size(184, 21); - this.emeraldFirstComboBox.TabIndex = 196; - this.emeraldFirstComboBox.SelectedIndexChanged += new System.EventHandler(this.emeraldFirstComboBox_SelectedIndexChanged); + this.label28.AutoSize = true; + this.label28.Location = new System.Drawing.Point(249, 45); + this.label28.Name = "label28"; + this.label28.Size = new System.Drawing.Size(21, 13); + this.label28.TabIndex = 195; + this.label28.Text = "4%"; // - // label27 + // sapphireFirstComboBox // - this.label27.AutoSize = true; - this.label27.Location = new System.Drawing.Point(277, 0); - this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(49, 9); - this.label27.TabIndex = 201; - this.label27.Text = "Sapphire"; + this.sapphireFirstComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.sapphireFirstComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.sapphireFirstComboBox.FormattingEnabled = true; + this.sapphireFirstComboBox.Location = new System.Drawing.Point(276, 12); + this.sapphireFirstComboBox.Name = "sapphireFirstComboBox"; + this.sapphireFirstComboBox.Size = new System.Drawing.Size(184, 21); + this.sapphireFirstComboBox.TabIndex = 192; + this.sapphireFirstComboBox.SelectedIndexChanged += new System.EventHandler(this.sapphireFirstComboBox_SelectedIndexChanged); // // sapphireSecondComboBox // this.sapphireSecondComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.sapphireSecondComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.sapphireSecondComboBox.FormattingEnabled = true; - this.sapphireSecondComboBox.Location = new System.Drawing.Point(277, 48); + this.sapphireSecondComboBox.Location = new System.Drawing.Point(276, 48); this.sapphireSecondComboBox.Name = "sapphireSecondComboBox"; this.sapphireSecondComboBox.Size = new System.Drawing.Size(183, 21); this.sapphireSecondComboBox.TabIndex = 194; this.sapphireSecondComboBox.SelectedIndexChanged += new System.EventHandler(this.sapphireSecondComboBox_SelectedIndexChanged); // - // label28 + // label32 // - this.label28.AutoSize = true; - this.label28.Location = new System.Drawing.Point(250, 45); - this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(21, 13); - this.label28.TabIndex = 195; - this.label28.Text = "4%"; + this.label32.AutoSize = true; + this.label32.Location = new System.Drawing.Point(481, 45); + this.label32.Name = "label32"; + this.label32.Size = new System.Drawing.Size(21, 13); + this.label32.TabIndex = 199; + this.label32.Text = "4%"; // - // label29 + // emeraldSecondComboBox // - this.label29.AutoSize = true; - this.label29.Location = new System.Drawing.Point(40, 0); - this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(32, 9); - this.label29.TabIndex = 200; - this.label29.Text = "Ruby"; + this.emeraldSecondComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.emeraldSecondComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.emeraldSecondComboBox.FormattingEnabled = true; + this.emeraldSecondComboBox.Location = new System.Drawing.Point(520, 48); + this.emeraldSecondComboBox.Name = "emeraldSecondComboBox"; + this.emeraldSecondComboBox.Size = new System.Drawing.Size(184, 21); + this.emeraldSecondComboBox.TabIndex = 198; + this.emeraldSecondComboBox.SelectedIndexChanged += new System.EventHandler(this.emeraldSecondComboBox_SelectedIndexChanged); + // + // label31 + // + this.label31.AutoSize = true; + this.label31.Location = new System.Drawing.Point(481, 9); + this.label31.Name = "label31"; + this.label31.Size = new System.Drawing.Size(21, 13); + this.label31.TabIndex = 197; + this.label31.Text = "4%"; + // + // emeraldFirstComboBox + // + this.emeraldFirstComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.emeraldFirstComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.emeraldFirstComboBox.FormattingEnabled = true; + this.emeraldFirstComboBox.Location = new System.Drawing.Point(520, 12); + this.emeraldFirstComboBox.Name = "emeraldFirstComboBox"; + this.emeraldFirstComboBox.Size = new System.Drawing.Size(184, 21); + this.emeraldFirstComboBox.TabIndex = 196; + this.emeraldFirstComboBox.SelectedIndexChanged += new System.EventHandler(this.emeraldFirstComboBox_SelectedIndexChanged); + // + // label25 + // + this.label25.AutoSize = true; + this.label25.Location = new System.Drawing.Point(520, 0); + this.label25.Name = "label25"; + this.label25.Size = new System.Drawing.Size(45, 9); + this.label25.TabIndex = 202; + this.label25.Text = "Emerald"; // // timeGroupBox // @@ -2601,56 +2651,6 @@ this.repairAllButton.UseVisualStyleBackColor = true; this.repairAllButton.Click += new System.EventHandler(this.repairAllButton_Click); // - // tableLayoutPanel3 - // - this.tableLayoutPanel3.ColumnCount = 8; - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 15.91356F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 84.08644F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 15F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 193F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 12F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 39F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 196F)); - this.tableLayoutPanel3.Controls.Add(this.label33, 0, 6); - this.tableLayoutPanel3.Controls.Add(this.leafGreenFirstComboBox, 4, 5); - this.tableLayoutPanel3.Controls.Add(this.fireRedSecondComboBox, 1, 6); - this.tableLayoutPanel3.Controls.Add(this.label29, 1, 0); - this.tableLayoutPanel3.Controls.Add(this.label37, 3, 6); - this.tableLayoutPanel3.Controls.Add(this.label26, 0, 1); - this.tableLayoutPanel3.Controls.Add(this.leafGreenSecondComboBox, 4, 6); - this.tableLayoutPanel3.Controls.Add(this.label24, 0, 2); - this.tableLayoutPanel3.Controls.Add(this.label35, 0, 5); - this.tableLayoutPanel3.Controls.Add(this.rubyFirstComboBox, 1, 1); - this.tableLayoutPanel3.Controls.Add(this.label39, 3, 5); - this.tableLayoutPanel3.Controls.Add(this.fireRedFirstComboBox, 1, 5); - this.tableLayoutPanel3.Controls.Add(this.rubySecondComboBox, 1, 2); - this.tableLayoutPanel3.Controls.Add(this.label36, 4, 4); - this.tableLayoutPanel3.Controls.Add(this.label38, 1, 4); - this.tableLayoutPanel3.Controls.Add(this.label27, 4, 0); - this.tableLayoutPanel3.Controls.Add(this.label30, 3, 1); - this.tableLayoutPanel3.Controls.Add(this.label28, 3, 2); - this.tableLayoutPanel3.Controls.Add(this.sapphireFirstComboBox, 4, 1); - this.tableLayoutPanel3.Controls.Add(this.sapphireSecondComboBox, 4, 2); - this.tableLayoutPanel3.Controls.Add(this.label32, 6, 2); - this.tableLayoutPanel3.Controls.Add(this.emeraldSecondComboBox, 7, 2); - this.tableLayoutPanel3.Controls.Add(this.label31, 6, 1); - this.tableLayoutPanel3.Controls.Add(this.emeraldFirstComboBox, 7, 1); - this.tableLayoutPanel3.Controls.Add(this.label25, 7, 0); - this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel3.Location = new System.Drawing.Point(3, 16); - this.tableLayoutPanel3.Name = "tableLayoutPanel3"; - this.tableLayoutPanel3.RowCount = 7; - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 80F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 19F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(715, 163); - this.tableLayoutPanel3.TabIndex = 217; - // // WildEditorDPPt // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -2677,6 +2677,8 @@ this.radarGroupBox.ResumeLayout(false); this.radarGroupBox.PerformLayout(); this.dualSlotGroupBox.ResumeLayout(false); + this.tableLayoutPanel3.ResumeLayout(false); + this.tableLayoutPanel3.PerformLayout(); this.timeGroupBox.ResumeLayout(false); this.tableLayoutPanel2.ResumeLayout(false); this.tableLayoutPanel2.PerformLayout(); @@ -2753,8 +2755,6 @@ ((System.ComponentModel.ISupportInitialize)(this.surfThirtyMinLevelUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.surfSixtyMaxLevelUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.surfSixtyMinLevelUpDown)).EndInit(); - this.tableLayoutPanel3.ResumeLayout(false); - this.tableLayoutPanel3.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/DS_Map/WildEditorDPPt.resx b/DS_Map/WildEditorDPPt.resx index 832553e..6492483 100644 --- a/DS_Map/WildEditorDPPt.resx +++ b/DS_Map/WildEditorDPPt.resx @@ -121,7 +121,7 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAdCAYAAADLnm6HAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vQAADr0BR/uQrQAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC41ZYUyZQAAAPBJREFUSEvtkkEK + vAAADrwBlbxySQAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC41ZYUyZQAAAPBJREFUSEvtkkEK wjAURHOEHkFw1WWv5dalV/Eqnq0y+qeM32iaNgkUMvAIbfIzr2Lo6TlMzsMwE3vVLih9TNNCUxEtv4/j i6YiKGAxuZ3eVBfBpfrlnqoivny+XhZUAhQX+VeuqAQoIrK23ONFsGaLbC0nnAOUACpiVd9h+R4Bwnkl KYGNmASIlaxB7wBJAfxsJUV0FvBuq/wMN/lP5rOXALEyj57Xu7FaZTx6eKuInvF3WU06LM4V0fec56xd @@ -166,7 +166,7 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAK - 6gAACuoBUMzvvgAAACB0RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgTVi7kSokAAABOElE + 6QAACukB/XXO0wAAACB0RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgTVi7kSokAAABOElE QVRIS7WToRLCMBBE+aRKPiOyks9AViKRfAYSWcknIJFIZF1gM7OZzeUKDVPEm1w2e7dNC5sY419xxTWp hK7rYh9CxMr6OAzvo9K3lGKDgawxmMNZ86yFXOhwRUPmPJ/IxadmnCHkOo7NIbn41qghLd+k2CwNaXld lYBGxZ7zmyx9Xa6o2CHYt4S4osUL8VAPqQQPbUZ97bfxOewS4+2eOJ0vbkixsXhPhj2HA+w53PPnQvGM @@ -189,7 +189,7 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAK - 6gAACuoBUMzvvgAAACB0RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgTVi7kSokAAABFElE + 6QAACukB/XXO0wAAACB0RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgTVi7kSokAAABFElE QVRIS7WUvQ3CMBSEKSkZJSVlxmCElIxAyQgZgzJlSkagzBjpjC7SWc+PI/4RFJ+cd7bvU4LEIYTwV2RI uq4LxO+VIkOA0mUaNq79qVkiQ0DBPPabYLjdmyQyJChk+fxamiQytKBwfExRUvu5ZEhYhBWCcTjGT1Yq kSHwBZhRTgnWEokMv12kBG+AFeQkH0HuAvbtW+QkyZArJzWSZCgVgFJJcoHPpeAOfw+sEPme5DCfa7AS From 146fb95f3df3e83ae29b460213612bb416fef960 Mon Sep 17 00:00:00 2001 From: Mixone-FinallyHere Date: Mon, 29 Apr 2024 19:41:17 +0200 Subject: [PATCH 36/40] Some fixes --- DS_Map/Main Window.Designer.cs | 4 ++-- DS_Map/Main Window.cs | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/DS_Map/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs index 951cb44..b1ed7b0 100644 --- a/DS_Map/Main Window.Designer.cs +++ b/DS_Map/Main Window.Designer.cs @@ -728,7 +728,7 @@ this.label43 = new System.Windows.Forms.Label(); this.trainerClassListBox = new System.Windows.Forms.ListBox(); this.label42 = new System.Windows.Forms.Label(); - this.trainerComboBox = new System.Windows.Forms.ComboBox(); + this.trainerComboBox = new DSPRE.InputComboBox(); this.trainerSaveCurrentButton = new System.Windows.Forms.Button(); this.tableEditorTabPage = new System.Windows.Forms.TabPage(); this.label73 = new System.Windows.Forms.Label(); @@ -11823,7 +11823,7 @@ private System.Windows.Forms.Label label43; private System.Windows.Forms.ListBox trainerClassListBox; private System.Windows.Forms.Label label42; - private System.Windows.Forms.ComboBox trainerComboBox; + private DSPRE.InputComboBox trainerComboBox; private System.Windows.Forms.ComboBox followModeComboBox; private System.Windows.Forms.RadioButton johtoRadioButton; private System.Windows.Forms.RadioButton kantoRadioButton; diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index 1cfcaef..76638bc 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -105,7 +105,7 @@ namespace DSPRE { currentTrainerName = TrainerFile.NAME_NOT_FOUND; } - trainerList.Add("[" + i.ToString("D2") + "] " + trainerClasses.messages[classMessageID] + " " + currentTrainerName); + trainerList.Add(currentTrainerName + " - " + trainerClasses.messages[classMessageID] + " [" + i.ToString("D2") + "] "); } return trainerList.ToArray(); @@ -692,6 +692,10 @@ namespace DSPRE { monEditorToolStripMenuItem.Enabled = true; scriptCommandsButton.Enabled = true; + if(RomInfo.gameFamily == RomInfo.GameFamilies.Plat || RomInfo.gameFamily == RomInfo.GameFamilies.DP) + { + EditorPanels.tabPageEncountersEditor.Hide(); + } Helpers.statusLabelMessage(); this.Text += " - " + RomInfo.fileName; } From 4ce324d8221efa033a8877c96f53eb48328f5f5e Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Sat, 4 May 2024 20:50:29 +0200 Subject: [PATCH 37/40] Initiate Moves. Fix DPPt bug for ENcounters tab. --- DS_Map/DSPRE.csproj | 7 ++ DS_Map/Main Window.cs | 3 + DS_Map/MoveEditor.Designer.cs | 34 +++++++ DS_Map/MoveEditor.cs | 17 ++++ DS_Map/Properties/AssemblyInfo.cs | 8 +- DS_Map/ROMFiles/MoveFile.cs | 145 ++++++++++++++++++++++++++++++ 6 files changed, 210 insertions(+), 4 deletions(-) create mode 100644 DS_Map/MoveEditor.Designer.cs create mode 100644 DS_Map/MoveEditor.cs create mode 100644 DS_Map/ROMFiles/MoveFile.cs diff --git a/DS_Map/DSPRE.csproj b/DS_Map/DSPRE.csproj index 86d7dd3..8452f29 100644 --- a/DS_Map/DSPRE.csproj +++ b/DS_Map/DSPRE.csproj @@ -179,6 +179,12 @@ LearnsetEditor.cs + + Form + + + MoveEditor.cs + Form @@ -232,6 +238,7 @@ + diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index 1cfcaef..1fc2c45 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -692,6 +692,9 @@ namespace DSPRE { monEditorToolStripMenuItem.Enabled = true; scriptCommandsButton.Enabled = true; + if (!RomInfo.gameFamily.Equals(GameFamilies.HGSS)) { + mainTabControl.TabPages.Remove(tabPageEncountersEditor); + } Helpers.statusLabelMessage(); this.Text += " - " + RomInfo.fileName; } diff --git a/DS_Map/MoveEditor.Designer.cs b/DS_Map/MoveEditor.Designer.cs new file mode 100644 index 0000000..e859e04 --- /dev/null +++ b/DS_Map/MoveEditor.Designer.cs @@ -0,0 +1,34 @@ +namespace DSPRE { + partial class MoveEditor { + /// + /// 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.components = new System.ComponentModel.Container(); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(800, 450); + this.Text = "MoveEditor"; + } + + #endregion + } +} \ No newline at end of file diff --git a/DS_Map/MoveEditor.cs b/DS_Map/MoveEditor.cs new file mode 100644 index 0000000..451ea9c --- /dev/null +++ b/DS_Map/MoveEditor.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace DSPRE { + public partial class MoveEditor : Form { + public MoveEditor() { + InitializeComponent(); + } + } +} diff --git a/DS_Map/Properties/AssemblyInfo.cs b/DS_Map/Properties/AssemblyInfo.cs index c1ff88d..7b045be 100644 --- a/DS_Map/Properties/AssemblyInfo.cs +++ b/DS_Map/Properties/AssemblyInfo.cs @@ -4,11 +4,11 @@ using System.Runtime.InteropServices; // Le informazioni generali relative a un assembly sono controllate dal seguente // set di attributi. Modificare i valori di questi attributi per modificare le informazioni // associate a un assembly. -[assembly: AssemblyTitle("DSPRE Reloaded 1.12.2")] +[assembly: AssemblyTitle("DSPRE Reloaded 1.12.3")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("DSPRE Reloaded 1.12.2")] +[assembly: AssemblyProduct("DSPRE Reloaded 1.12.3")] [assembly: AssemblyCopyright("Copyright © 2023")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // È possibile specificare tutti i valori oppure impostare valori predefiniti per i numeri relativi alla revisione e alla build // usando l'asterisco '*' come illustrato di seguito: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.12.2")] -[assembly: AssemblyFileVersion("1.12.2")] +[assembly: AssemblyVersion("1.12.3")] +[assembly: AssemblyFileVersion("1.12.3")] diff --git a/DS_Map/ROMFiles/MoveFile.cs b/DS_Map/ROMFiles/MoveFile.cs new file mode 100644 index 0000000..f681eaf --- /dev/null +++ b/DS_Map/ROMFiles/MoveFile.cs @@ -0,0 +1,145 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DSPRE.ROMFiles { + + public enum MoveTypes : short { + Normal, + Fighting, + Flying, + Poison, + Ground, + Rock, + Bug, + Ghost, + Steel, + Unknown, + Fire, + Water, + Grass, + Electric, + Psychic, + Ice, + Dragon, + Dark + } + + public enum MoveCategory { + Physical, + Special, + Status + } + + public enum ContestCategories { + One = 1, + Two = 2, + Three = 3, + Four = 4, + Five = 5, + Six = 6, + Seven = 7, + Eight = 8, + Nine = 9, + Ten = 10, + Eleven = 11, + Twelve = 12 + } + + [Flags] + public enum MoveTargets { + OneOpponent = 1, + Automatic = 2, + Random = 4, + BothOpponents = 16, + BothOpponentsAndAlly = 8, + User = 32, + UsersSideOfField = 64, + EntireField = 128, + OpponentsSideOfField = 256, + AutomaticWithAlly = 512, + UserOrAlly = 1024, + OneOpponentFailsIfTargetFaints = 2048 + } + + + public struct MoveData { + public ushort Effect; // u16 + public byte Category; // u8 + public byte Power; // u8 + + public byte Type; // u8 + public byte Accuracy; // u8 + public byte PP; // u8 + public byte EffectChance; // u8 + + public ushort Target; // u16 + public sbyte Priority; // s8 + public bool[] Flags; // u8 + + public byte ContestEffect; // u8 + public byte ContestType; // u8 + } + + public class MoveFile : RomFile{ + + public MoveData moveData; + + public MoveFile(Stream stream) { + moveData = new MoveData(); + using (BinaryReader reader = new BinaryReader(stream)) { + moveData.Effect = reader.ReadUInt16(); + moveData.Category = reader.ReadByte(); + moveData.Power = reader.ReadByte(); + moveData.Type = reader.ReadByte(); + moveData.Accuracy = reader.ReadByte(); + moveData.PP = reader.ReadByte(); + moveData.EffectChance = reader.ReadByte(); + moveData.Target = reader.ReadUInt16(); + moveData.Priority = reader.ReadSByte(); + + // Reading flags + byte flagsByte = reader.ReadByte(); + moveData.Flags = new bool[8]; + for (int i = 0; i < 8; i++) { + moveData.Flags[i] = (flagsByte & (1 << i)) != 0; + } + + moveData.ContestEffect = reader.ReadByte(); + moveData.ContestType = reader.ReadByte(); + } + } + + public override byte[] ToByteArray() { + using (MemoryStream stream = new MemoryStream()) { + using (BinaryWriter writer = new BinaryWriter(stream)) { + writer.Write(moveData.Effect); + writer.Write(moveData.Category); + writer.Write(moveData.Power); + writer.Write(moveData.Type); + writer.Write(moveData.Accuracy); + writer.Write(moveData.PP); + writer.Write(moveData.EffectChance); + writer.Write(moveData.Target); + writer.Write(moveData.Priority); + + // Writing flags + byte flagsByte = 0; + for (int i = 0; i < 8; i++) { + if (moveData.Flags[i]) + flagsByte |= (byte)(1 << i); + } + writer.Write(flagsByte); + + writer.Write(moveData.ContestEffect); + writer.Write(moveData.ContestType); + } + + return stream.ToArray(); + } + } + } +} From 9e20cebee07a3d1c5964890c88742d1448191edc Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Sat, 4 May 2024 22:43:10 +0200 Subject: [PATCH 38/40] Other stuff sorted --- DS_Map/Main Window.Designer.cs | 1195 ++++++++++++++++---------------- DS_Map/Main Window.resx | 2 +- 2 files changed, 600 insertions(+), 597 deletions(-) diff --git a/DS_Map/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs index 951cb44..0a776d1 100644 --- a/DS_Map/Main Window.Designer.cs +++ b/DS_Map/Main Window.Designer.cs @@ -332,7 +332,6 @@ this.addNSBTXButton = new System.Windows.Forms.Button(); this.exportNSBTXButton = new System.Windows.Forms.Button(); this.importNSBTXButton = new System.Windows.Forms.Button(); - this.texturePictureBox = new DSPRE.OffsetPictureBox(); this.palettesLabel = new System.Windows.Forms.Label(); this.texturesLabel = new System.Windows.Forms.Label(); this.palettesListBox = new System.Windows.Forms.ListBox(); @@ -508,6 +507,8 @@ this.exportEventFileButton = new System.Windows.Forms.Button(); this.importEventFileButton = new System.Windows.Forms.Button(); this.saveEventsButton = new System.Windows.Forms.Button(); + this.tabPageScriptEditor = new System.Windows.Forms.TabPage(); + this.tabPageLevelScriptEditor = new System.Windows.Forms.TabPage(); this.textEditorTabPage = new System.Windows.Forms.TabPage(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.label6 = new System.Windows.Forms.Label(); @@ -578,16 +579,10 @@ this.label61 = new System.Windows.Forms.Label(); this.label62 = new System.Windows.Forms.Label(); this.poke6MovesGroupBox = new System.Windows.Forms.GroupBox(); - this.partyMove6_1ComboBox = new DSPRE.InputComboBox(); - this.partyMove6_2ComboBox = new DSPRE.InputComboBox(); - this.partyMove6_3ComboBox = new DSPRE.InputComboBox(); - this.partyMove6_4ComboBox = new DSPRE.InputComboBox(); this.partyIV6UpDown = new System.Windows.Forms.NumericUpDown(); this.partyLevel6UpDown = new System.Windows.Forms.NumericUpDown(); this.partyBall6UpDown = new System.Windows.Forms.NumericUpDown(); - this.partyItem6ComboBox = new DSPRE.InputComboBox(); this.partyPokemon6PictureBox = new System.Windows.Forms.PictureBox(); - this.partyPokemon6ComboBox = new DSPRE.InputComboBox(); this.party5GroupBox = new System.Windows.Forms.GroupBox(); this.partyForm5ComboBox = new System.Windows.Forms.ComboBox(); this.partyAbility5ComboBox = new System.Windows.Forms.ComboBox(); @@ -597,16 +592,10 @@ this.label58 = new System.Windows.Forms.Label(); this.label59 = new System.Windows.Forms.Label(); this.poke5MovesGroupBox = new System.Windows.Forms.GroupBox(); - this.partyMove5_1ComboBox = new DSPRE.InputComboBox(); - this.partyMove5_2ComboBox = new DSPRE.InputComboBox(); - this.partyMove5_3ComboBox = new DSPRE.InputComboBox(); - this.partyMove5_4ComboBox = new DSPRE.InputComboBox(); this.partyIV5UpDown = new System.Windows.Forms.NumericUpDown(); this.partyLevel5UpDown = new System.Windows.Forms.NumericUpDown(); this.partyBall5UpDown = new System.Windows.Forms.NumericUpDown(); - this.partyItem5ComboBox = new DSPRE.InputComboBox(); this.partyPokemon5PictureBox = new System.Windows.Forms.PictureBox(); - this.partyPokemon5ComboBox = new DSPRE.InputComboBox(); this.party4GroupBox = new System.Windows.Forms.GroupBox(); this.partyForm4ComboBox = new System.Windows.Forms.ComboBox(); this.partyAbility4ComboBox = new System.Windows.Forms.ComboBox(); @@ -616,16 +605,10 @@ this.label55 = new System.Windows.Forms.Label(); this.label56 = new System.Windows.Forms.Label(); this.poke4MovesGroupBox = new System.Windows.Forms.GroupBox(); - this.partyMove4_1ComboBox = new DSPRE.InputComboBox(); - this.partyMove4_2ComboBox = new DSPRE.InputComboBox(); - this.partyMove4_3ComboBox = new DSPRE.InputComboBox(); - this.partyMove4_4ComboBox = new DSPRE.InputComboBox(); this.partyIV4UpDown = new System.Windows.Forms.NumericUpDown(); this.partyLevel4UpDown = new System.Windows.Forms.NumericUpDown(); this.partyBall4UpDown = new System.Windows.Forms.NumericUpDown(); - this.partyItem4ComboBox = new DSPRE.InputComboBox(); this.partyPokemon4PictureBox = new System.Windows.Forms.PictureBox(); - this.partyPokemon4ComboBox = new DSPRE.InputComboBox(); this.party3GroupBox = new System.Windows.Forms.GroupBox(); this.partyForm3ComboBox = new System.Windows.Forms.ComboBox(); this.partyAbility3ComboBox = new System.Windows.Forms.ComboBox(); @@ -635,16 +618,10 @@ this.label52 = new System.Windows.Forms.Label(); this.label53 = new System.Windows.Forms.Label(); this.poke3MovesGroupBox = new System.Windows.Forms.GroupBox(); - this.partyMove3_1ComboBox = new DSPRE.InputComboBox(); - this.partyMove3_2ComboBox = new DSPRE.InputComboBox(); - this.partyMove3_3ComboBox = new DSPRE.InputComboBox(); - this.partyMove3_4ComboBox = new DSPRE.InputComboBox(); this.partyIV3UpDown = new System.Windows.Forms.NumericUpDown(); this.partyLevel3UpDown = new System.Windows.Forms.NumericUpDown(); this.partyBall3UpDown = new System.Windows.Forms.NumericUpDown(); - this.partyItem3ComboBox = new DSPRE.InputComboBox(); this.partyPokemon3PictureBox = new System.Windows.Forms.PictureBox(); - this.partyPokemon3ComboBox = new DSPRE.InputComboBox(); this.party2GroupBox = new System.Windows.Forms.GroupBox(); this.partyForm2ComboBox = new System.Windows.Forms.ComboBox(); this.partyAbility2ComboBox = new System.Windows.Forms.ComboBox(); @@ -654,16 +631,10 @@ this.label49 = new System.Windows.Forms.Label(); this.label50 = new System.Windows.Forms.Label(); this.poke2MovesGroupBox = new System.Windows.Forms.GroupBox(); - this.partyMove2_1ComboBox = new DSPRE.InputComboBox(); - this.partyMove2_2ComboBox = new DSPRE.InputComboBox(); - this.partyMove2_3ComboBox = new DSPRE.InputComboBox(); - this.partyMove2_4ComboBox = new DSPRE.InputComboBox(); this.partyIV2UpDown = new System.Windows.Forms.NumericUpDown(); this.partyLevel2UpDown = new System.Windows.Forms.NumericUpDown(); this.partyBall2UpDown = new System.Windows.Forms.NumericUpDown(); - this.partyItem2ComboBox = new DSPRE.InputComboBox(); this.partyPokemon2PictureBox = new System.Windows.Forms.PictureBox(); - this.partyPokemon2ComboBox = new DSPRE.InputComboBox(); this.party1GroupBox = new System.Windows.Forms.GroupBox(); this.partyForm1ComboBox = new System.Windows.Forms.ComboBox(); this.partyAbility1ComboBox = new System.Windows.Forms.ComboBox(); @@ -673,16 +644,10 @@ this.label46 = new System.Windows.Forms.Label(); this.label45 = new System.Windows.Forms.Label(); this.poke1MovesGroupBox = new System.Windows.Forms.GroupBox(); - this.partyMove1_1ComboBox = new DSPRE.InputComboBox(); - this.partyMove1_2ComboBox = new DSPRE.InputComboBox(); - this.partyMove1_3ComboBox = new DSPRE.InputComboBox(); - this.partyMove1_4ComboBox = new DSPRE.InputComboBox(); this.partyIV1UpDown = new System.Windows.Forms.NumericUpDown(); this.partyLevel1UpDown = new System.Windows.Forms.NumericUpDown(); this.partyBall1UpDown = new System.Windows.Forms.NumericUpDown(); - this.partyItem1ComboBox = new DSPRE.InputComboBox(); this.partyPokemon1PictureBox = new System.Windows.Forms.PictureBox(); - this.partyPokemon1ComboBox = new DSPRE.InputComboBox(); this.groupBox27 = new System.Windows.Forms.GroupBox(); this.eyeContactMusicAltLabel = new System.Windows.Forms.Label(); this.encounterSSEQAltUpDown = new System.Windows.Forms.NumericUpDown(); @@ -712,10 +677,6 @@ this.trainerAI10CheckBox = new System.Windows.Forms.CheckBox(); this.trainerAI11CheckBox = new System.Windows.Forms.CheckBox(); this.trainerItemsGroupBox = new System.Windows.Forms.GroupBox(); - this.trainerItem1ComboBox = new DSPRE.InputComboBox(); - this.trainerItem2ComboBox = new DSPRE.InputComboBox(); - this.trainerItem3ComboBox = new DSPRE.InputComboBox(); - this.trainerItem4ComboBox = new DSPRE.InputComboBox(); this.deleteTrainerButton = new System.Windows.Forms.Button(); this.trainerItemsCheckBox = new System.Windows.Forms.CheckBox(); this.addTrainerButton = new System.Windows.Forms.Button(); @@ -774,12 +735,7 @@ this.locationNameConditionalMusicLBL = new System.Windows.Forms.Label(); this.headerConditionalMusicComboBox = new System.Windows.Forms.ComboBox(); this.conditionalMusicTableListBox = new System.Windows.Forms.ListBox(); - this.tabPageScriptEditor = new System.Windows.Forms.TabPage(); - this.scriptEditor = new DSPRE.Editors.ScriptEditor(); - this.tabPageLevelScriptEditor = new System.Windows.Forms.TabPage(); - this.levelScriptEditor = new DSPRE.Editors.LevelScriptEditor(); this.tabPageEncountersEditor = new System.Windows.Forms.TabPage(); - this.encountersEditor = new DSPRE.Editors.EncountersEditor(); this.mainTabImageList = new System.Windows.Forms.ImageList(this.components); this.gameIcon = new System.Windows.Forms.PictureBox(); this.languageLabel = new System.Windows.Forms.Label(); @@ -852,6 +808,50 @@ this.separator_afterMiscButtons = new System.Windows.Forms.ToolStripSeparator(); this.versionLabel = new System.Windows.Forms.Label(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); + this.texturePictureBox = new DSPRE.OffsetPictureBox(); + this.scriptEditor = new DSPRE.Editors.ScriptEditor(); + this.levelScriptEditor = new DSPRE.Editors.LevelScriptEditor(); + this.partyMove6_1ComboBox = new DSPRE.InputComboBox(); + this.partyMove6_2ComboBox = new DSPRE.InputComboBox(); + this.partyMove6_3ComboBox = new DSPRE.InputComboBox(); + this.partyMove6_4ComboBox = new DSPRE.InputComboBox(); + this.partyItem6ComboBox = new DSPRE.InputComboBox(); + this.partyPokemon6ComboBox = new DSPRE.InputComboBox(); + this.partyMove5_1ComboBox = new DSPRE.InputComboBox(); + this.partyMove5_2ComboBox = new DSPRE.InputComboBox(); + this.partyMove5_3ComboBox = new DSPRE.InputComboBox(); + this.partyMove5_4ComboBox = new DSPRE.InputComboBox(); + this.partyItem5ComboBox = new DSPRE.InputComboBox(); + this.partyPokemon5ComboBox = new DSPRE.InputComboBox(); + this.partyMove4_1ComboBox = new DSPRE.InputComboBox(); + this.partyMove4_2ComboBox = new DSPRE.InputComboBox(); + this.partyMove4_3ComboBox = new DSPRE.InputComboBox(); + this.partyMove4_4ComboBox = new DSPRE.InputComboBox(); + this.partyItem4ComboBox = new DSPRE.InputComboBox(); + this.partyPokemon4ComboBox = new DSPRE.InputComboBox(); + this.partyMove3_1ComboBox = new DSPRE.InputComboBox(); + this.partyMove3_2ComboBox = new DSPRE.InputComboBox(); + this.partyMove3_3ComboBox = new DSPRE.InputComboBox(); + this.partyMove3_4ComboBox = new DSPRE.InputComboBox(); + this.partyItem3ComboBox = new DSPRE.InputComboBox(); + this.partyPokemon3ComboBox = new DSPRE.InputComboBox(); + this.partyMove2_1ComboBox = new DSPRE.InputComboBox(); + this.partyMove2_2ComboBox = new DSPRE.InputComboBox(); + this.partyMove2_3ComboBox = new DSPRE.InputComboBox(); + this.partyMove2_4ComboBox = new DSPRE.InputComboBox(); + this.partyItem2ComboBox = new DSPRE.InputComboBox(); + this.partyPokemon2ComboBox = new DSPRE.InputComboBox(); + this.partyMove1_1ComboBox = new DSPRE.InputComboBox(); + this.partyMove1_2ComboBox = new DSPRE.InputComboBox(); + this.partyMove1_3ComboBox = new DSPRE.InputComboBox(); + this.partyMove1_4ComboBox = new DSPRE.InputComboBox(); + this.partyItem1ComboBox = new DSPRE.InputComboBox(); + this.partyPokemon1ComboBox = new DSPRE.InputComboBox(); + this.trainerItem1ComboBox = new DSPRE.InputComboBox(); + this.trainerItem2ComboBox = new DSPRE.InputComboBox(); + this.trainerItem3ComboBox = new DSPRE.InputComboBox(); + this.trainerItem4ComboBox = new DSPRE.InputComboBox(); + this.encountersEditor = new DSPRE.Editors.EncountersEditor(); this.mainTabControl.SuspendLayout(); this.headerEditorTabPage.SuspendLayout(); this.worldmapCoordsGroupBox.SuspendLayout(); @@ -939,7 +939,6 @@ ((System.ComponentModel.ISupportInitialize)(this.areaDataDynamicTexturesNumericUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.areaDataMapTilesetUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.areaDataBuildingTilesetUpDown)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.texturePictureBox)).BeginInit(); this.eventEditorTabPage.SuspendLayout(); this.groupBox21.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.eventAreaDataUpDown)).BeginInit(); @@ -1007,6 +1006,8 @@ ((System.ComponentModel.ISupportInitialize)(this.rightClickPicture)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.wheelClickPicture)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.LeftClickPicture)).BeginInit(); + this.tabPageScriptEditor.SuspendLayout(); + this.tabPageLevelScriptEditor.SuspendLayout(); this.textEditorTabPage.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); this.LineNumbersFormatgroupBox.SuspendLayout(); @@ -1083,13 +1084,12 @@ this.conditionalMusicGroupBox.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.musicIDconditionalMusicUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.flagConditionalMusicUpDown)).BeginInit(); - this.tabPageScriptEditor.SuspendLayout(); - this.tabPageLevelScriptEditor.SuspendLayout(); this.tabPageEncountersEditor.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gameIcon)).BeginInit(); this.menuStrip1.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.mainToolStrip.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.texturePictureBox)).BeginInit(); this.SuspendLayout(); // // mainTabControl @@ -1100,12 +1100,12 @@ this.mainTabControl.Controls.Add(this.mapEditorTabPage); this.mainTabControl.Controls.Add(this.nsbtxEditorTabPage); this.mainTabControl.Controls.Add(this.eventEditorTabPage); + this.mainTabControl.Controls.Add(this.tabPageScriptEditor); + this.mainTabControl.Controls.Add(this.tabPageLevelScriptEditor); this.mainTabControl.Controls.Add(this.textEditorTabPage); this.mainTabControl.Controls.Add(this.cameraEditorTabPage); this.mainTabControl.Controls.Add(this.trainerEditorTabPage); this.mainTabControl.Controls.Add(this.tableEditorTabPage); - this.mainTabControl.Controls.Add(this.tabPageScriptEditor); - this.mainTabControl.Controls.Add(this.tabPageLevelScriptEditor); this.mainTabControl.Controls.Add(this.tabPageEncountersEditor); this.mainTabControl.ImageList = this.mainTabImageList; this.mainTabControl.Location = new System.Drawing.Point(11, 72); @@ -2544,7 +2544,7 @@ this.setSpawnPointButton.Image = global::DSPRE.Properties.Resources.spawnCoordsMatrixeditorIcon; this.setSpawnPointButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.setSpawnPointButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.setSpawnPointButton.Location = new System.Drawing.Point(12, -7059); + this.setSpawnPointButton.Location = new System.Drawing.Point(12, -8261); this.setSpawnPointButton.Name = "setSpawnPointButton"; this.setSpawnPointButton.Size = new System.Drawing.Size(117, 43); this.setSpawnPointButton.TabIndex = 35; @@ -2560,7 +2560,7 @@ this.saveMatrixButton.Image = global::DSPRE.Properties.Resources.save_rom; this.saveMatrixButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.saveMatrixButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.saveMatrixButton.Location = new System.Drawing.Point(12, -7015); + this.saveMatrixButton.Location = new System.Drawing.Point(12, -8217); this.saveMatrixButton.Name = "saveMatrixButton"; this.saveMatrixButton.Size = new System.Drawing.Size(117, 43); this.saveMatrixButton.TabIndex = 34; @@ -2739,10 +2739,12 @@ this.matrixTabControl.Controls.Add(this.heightsTabPage); this.matrixTabControl.Controls.Add(this.mapFilesTabPage); this.matrixTabControl.Location = new System.Drawing.Point(139, 11); + this.matrixTabControl.MaximumSize = new System.Drawing.Size(1185, 675); + this.matrixTabControl.MinimumSize = new System.Drawing.Size(1000, 625); this.matrixTabControl.Multiline = true; this.matrixTabControl.Name = "matrixTabControl"; this.matrixTabControl.SelectedIndex = 0; - this.matrixTabControl.Size = new System.Drawing.Size(1040, 610); + this.matrixTabControl.Size = new System.Drawing.Size(1040, 658); this.matrixTabControl.TabIndex = 18; // // headersTabPage @@ -2751,7 +2753,7 @@ this.headersTabPage.Location = new System.Drawing.Point(4, 22); this.headersTabPage.Name = "headersTabPage"; this.headersTabPage.Padding = new System.Windows.Forms.Padding(3); - this.headersTabPage.Size = new System.Drawing.Size(1032, 584); + this.headersTabPage.Size = new System.Drawing.Size(1032, 632); this.headersTabPage.TabIndex = 1; this.headersTabPage.Text = "Map Headers"; this.headersTabPage.UseVisualStyleBackColor = true; @@ -2802,7 +2804,7 @@ this.headersGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; this.headersGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; this.headersGridView.ShowCellErrors = false; - this.headersGridView.Size = new System.Drawing.Size(1032, 576); + this.headersGridView.Size = new System.Drawing.Size(1026, 593); this.headersGridView.TabIndex = 1; this.headersGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.headersGridView_CellFormatting); this.headersGridView.CellMouseDoubleClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.headersGridView_CellMouseDoubleClick); @@ -2812,9 +2814,9 @@ // heightsTabPage // this.heightsTabPage.Controls.Add(this.heightsGridView); - this.heightsTabPage.Location = new System.Drawing.Point(4, 58); + this.heightsTabPage.Location = new System.Drawing.Point(4, 22); this.heightsTabPage.Name = "heightsTabPage"; - this.heightsTabPage.Size = new System.Drawing.Size(0, 0); + this.heightsTabPage.Size = new System.Drawing.Size(992, 624); this.heightsTabPage.TabIndex = 2; this.heightsTabPage.Text = "Map Heights"; this.heightsTabPage.UseVisualStyleBackColor = true; @@ -2875,9 +2877,9 @@ // mapFilesTabPage // this.mapFilesTabPage.Controls.Add(this.mapFilesGridView); - this.mapFilesTabPage.Location = new System.Drawing.Point(4, 58); + this.mapFilesTabPage.Location = new System.Drawing.Point(4, 22); this.mapFilesTabPage.Name = "mapFilesTabPage"; - this.mapFilesTabPage.Size = new System.Drawing.Size(0, 0); + this.mapFilesTabPage.Size = new System.Drawing.Size(992, 624); this.mapFilesTabPage.TabIndex = 3; this.mapFilesTabPage.Text = "Map Files"; this.mapFilesTabPage.UseVisualStyleBackColor = true; @@ -4338,7 +4340,7 @@ this.radio3D.AutoSize = true; this.radio3D.Checked = true; this.radio3D.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.radio3D.Location = new System.Drawing.Point(-11820, -7035); + this.radio3D.Location = new System.Drawing.Point(-13806, -8237); this.radio3D.Name = "radio3D"; this.radio3D.Size = new System.Drawing.Size(31, 23); this.radio3D.TabIndex = 26; @@ -4353,7 +4355,7 @@ 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(-11820, -7011); + this.radio2D.Location = new System.Drawing.Point(-13806, -8213); this.radio2D.Name = "radio2D"; this.radio2D.Size = new System.Drawing.Size(31, 23); this.radio2D.TabIndex = 25; @@ -4368,7 +4370,7 @@ 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(1140, -6987); + this.wireframeCheckBox.Location = new System.Drawing.Point(1140, -8189); this.wireframeCheckBox.Name = "wireframeCheckBox"; this.wireframeCheckBox.Size = new System.Drawing.Size(31, 23); this.wireframeCheckBox.TabIndex = 27; @@ -4806,20 +4808,6 @@ this.importNSBTXButton.UseVisualStyleBackColor = true; this.importNSBTXButton.Click += new System.EventHandler(this.importNSBTXButton_Click); // - // texturePictureBox - // - this.texturePictureBox.BackColor = System.Drawing.Color.White; - this.texturePictureBox.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.texturePictureBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.texturePictureBox.Image = global::DSPRE.Properties.Resources.alphabgCheckerboard; - this.texturePictureBox.invertDrag = true; - this.texturePictureBox.Location = new System.Drawing.Point(732, 52); - this.texturePictureBox.Name = "texturePictureBox"; - this.texturePictureBox.Size = new System.Drawing.Size(256, 256); - this.texturePictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.texturePictureBox.TabIndex = 7; - this.texturePictureBox.TabStop = false; - // // palettesLabel // this.palettesLabel.AutoSize = true; @@ -6945,6 +6933,30 @@ this.saveEventsButton.UseVisualStyleBackColor = true; this.saveEventsButton.Click += new System.EventHandler(this.saveEventsButton_Click); // + // tabPageScriptEditor + // + this.tabPageScriptEditor.Controls.Add(this.scriptEditor); + this.tabPageScriptEditor.ImageIndex = 5; + this.tabPageScriptEditor.Location = new System.Drawing.Point(4, 23); + this.tabPageScriptEditor.Name = "tabPageScriptEditor"; + this.tabPageScriptEditor.Padding = new System.Windows.Forms.Padding(3); + this.tabPageScriptEditor.Size = new System.Drawing.Size(1185, 675); + this.tabPageScriptEditor.TabIndex = 10; + this.tabPageScriptEditor.Text = "Script Editor"; + this.tabPageScriptEditor.UseVisualStyleBackColor = true; + // + // tabPageLevelScriptEditor + // + this.tabPageLevelScriptEditor.Controls.Add(this.levelScriptEditor); + this.tabPageLevelScriptEditor.ImageIndex = 5; + this.tabPageLevelScriptEditor.Location = new System.Drawing.Point(4, 23); + this.tabPageLevelScriptEditor.Name = "tabPageLevelScriptEditor"; + this.tabPageLevelScriptEditor.Padding = new System.Windows.Forms.Padding(3); + this.tabPageLevelScriptEditor.Size = new System.Drawing.Size(1185, 675); + this.tabPageLevelScriptEditor.TabIndex = 11; + this.tabPageLevelScriptEditor.Text = "Level Script Editor"; + this.tabPageLevelScriptEditor.UseVisualStyleBackColor = true; + // // textEditorTabPage // this.textEditorTabPage.Controls.Add(this.tableLayoutPanel1); @@ -7817,54 +7829,6 @@ this.poke6MovesGroupBox.TabStop = false; this.poke6MovesGroupBox.Text = "Moves"; // - // partyMove6_1ComboBox - // - this.partyMove6_1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove6_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove6_1ComboBox.Enabled = false; - this.partyMove6_1ComboBox.FormattingEnabled = true; - this.partyMove6_1ComboBox.Location = new System.Drawing.Point(10, 21); - this.partyMove6_1ComboBox.Name = "partyMove6_1ComboBox"; - this.partyMove6_1ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove6_1ComboBox.TabIndex = 3; - this.partyMove6_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove6_2ComboBox - // - this.partyMove6_2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove6_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove6_2ComboBox.Enabled = false; - this.partyMove6_2ComboBox.FormattingEnabled = true; - this.partyMove6_2ComboBox.Location = new System.Drawing.Point(116, 21); - this.partyMove6_2ComboBox.Name = "partyMove6_2ComboBox"; - this.partyMove6_2ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove6_2ComboBox.TabIndex = 6; - this.partyMove6_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove6_3ComboBox - // - this.partyMove6_3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove6_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove6_3ComboBox.Enabled = false; - this.partyMove6_3ComboBox.FormattingEnabled = true; - this.partyMove6_3ComboBox.Location = new System.Drawing.Point(10, 48); - this.partyMove6_3ComboBox.Name = "partyMove6_3ComboBox"; - this.partyMove6_3ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove6_3ComboBox.TabIndex = 5; - this.partyMove6_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove6_4ComboBox - // - this.partyMove6_4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove6_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove6_4ComboBox.Enabled = false; - this.partyMove6_4ComboBox.FormattingEnabled = true; - this.partyMove6_4ComboBox.Location = new System.Drawing.Point(116, 48); - this.partyMove6_4ComboBox.Name = "partyMove6_4ComboBox"; - this.partyMove6_4ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove6_4ComboBox.TabIndex = 7; - this.partyMove6_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // // partyIV6UpDown // this.partyIV6UpDown.Location = new System.Drawing.Point(48, 92); @@ -7906,18 +7870,6 @@ this.partyBall6UpDown.Size = new System.Drawing.Size(49, 20); this.partyBall6UpDown.TabIndex = 3; // - // partyItem6ComboBox - // - this.partyItem6ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyItem6ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyItem6ComboBox.Enabled = false; - this.partyItem6ComboBox.FormattingEnabled = true; - this.partyItem6ComboBox.Location = new System.Drawing.Point(228, 28); - this.partyItem6ComboBox.Name = "partyItem6ComboBox"; - this.partyItem6ComboBox.Size = new System.Drawing.Size(103, 21); - this.partyItem6ComboBox.TabIndex = 2; - this.partyItem6ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem6ComboBox_SelectedIndexChanged); - // // partyPokemon6PictureBox // this.partyPokemon6PictureBox.Location = new System.Drawing.Point(11, 23); @@ -7927,17 +7879,6 @@ this.partyPokemon6PictureBox.TabIndex = 1; this.partyPokemon6PictureBox.TabStop = false; // - // partyPokemon6ComboBox - // - this.partyPokemon6ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyPokemon6ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyPokemon6ComboBox.FormattingEnabled = true; - this.partyPokemon6ComboBox.Location = new System.Drawing.Point(58, 28); - this.partyPokemon6ComboBox.Name = "partyPokemon6ComboBox"; - this.partyPokemon6ComboBox.Size = new System.Drawing.Size(126, 21); - this.partyPokemon6ComboBox.TabIndex = 0; - this.partyPokemon6ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon6ComboBox_SelectedIndexChanged); - // // party5GroupBox // this.party5GroupBox.Controls.Add(this.partyForm5ComboBox); @@ -8041,54 +7982,6 @@ this.poke5MovesGroupBox.TabStop = false; this.poke5MovesGroupBox.Text = "Moves"; // - // partyMove5_1ComboBox - // - this.partyMove5_1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove5_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove5_1ComboBox.Enabled = false; - this.partyMove5_1ComboBox.FormattingEnabled = true; - this.partyMove5_1ComboBox.Location = new System.Drawing.Point(10, 21); - this.partyMove5_1ComboBox.Name = "partyMove5_1ComboBox"; - this.partyMove5_1ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove5_1ComboBox.TabIndex = 3; - this.partyMove5_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove5_2ComboBox - // - this.partyMove5_2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove5_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove5_2ComboBox.Enabled = false; - this.partyMove5_2ComboBox.FormattingEnabled = true; - this.partyMove5_2ComboBox.Location = new System.Drawing.Point(116, 21); - this.partyMove5_2ComboBox.Name = "partyMove5_2ComboBox"; - this.partyMove5_2ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove5_2ComboBox.TabIndex = 6; - this.partyMove5_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove5_3ComboBox - // - this.partyMove5_3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove5_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove5_3ComboBox.Enabled = false; - this.partyMove5_3ComboBox.FormattingEnabled = true; - this.partyMove5_3ComboBox.Location = new System.Drawing.Point(10, 48); - this.partyMove5_3ComboBox.Name = "partyMove5_3ComboBox"; - this.partyMove5_3ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove5_3ComboBox.TabIndex = 5; - this.partyMove5_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove5_4ComboBox - // - this.partyMove5_4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove5_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove5_4ComboBox.Enabled = false; - this.partyMove5_4ComboBox.FormattingEnabled = true; - this.partyMove5_4ComboBox.Location = new System.Drawing.Point(116, 48); - this.partyMove5_4ComboBox.Name = "partyMove5_4ComboBox"; - this.partyMove5_4ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove5_4ComboBox.TabIndex = 7; - this.partyMove5_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // // partyIV5UpDown // this.partyIV5UpDown.Location = new System.Drawing.Point(48, 92); @@ -8130,18 +8023,6 @@ this.partyBall5UpDown.Size = new System.Drawing.Size(49, 20); this.partyBall5UpDown.TabIndex = 3; // - // partyItem5ComboBox - // - this.partyItem5ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyItem5ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyItem5ComboBox.Enabled = false; - this.partyItem5ComboBox.FormattingEnabled = true; - this.partyItem5ComboBox.Location = new System.Drawing.Point(228, 28); - this.partyItem5ComboBox.Name = "partyItem5ComboBox"; - this.partyItem5ComboBox.Size = new System.Drawing.Size(103, 21); - this.partyItem5ComboBox.TabIndex = 2; - this.partyItem5ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem5ComboBox_SelectedIndexChanged); - // // partyPokemon5PictureBox // this.partyPokemon5PictureBox.Location = new System.Drawing.Point(11, 23); @@ -8151,17 +8032,6 @@ this.partyPokemon5PictureBox.TabIndex = 1; this.partyPokemon5PictureBox.TabStop = false; // - // partyPokemon5ComboBox - // - this.partyPokemon5ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyPokemon5ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyPokemon5ComboBox.FormattingEnabled = true; - this.partyPokemon5ComboBox.Location = new System.Drawing.Point(58, 28); - this.partyPokemon5ComboBox.Name = "partyPokemon5ComboBox"; - this.partyPokemon5ComboBox.Size = new System.Drawing.Size(126, 21); - this.partyPokemon5ComboBox.TabIndex = 0; - this.partyPokemon5ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon5ComboBox_SelectedIndexChanged); - // // party4GroupBox // this.party4GroupBox.Controls.Add(this.partyForm4ComboBox); @@ -8265,54 +8135,6 @@ this.poke4MovesGroupBox.TabStop = false; this.poke4MovesGroupBox.Text = "Moves"; // - // partyMove4_1ComboBox - // - this.partyMove4_1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove4_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove4_1ComboBox.Enabled = false; - this.partyMove4_1ComboBox.FormattingEnabled = true; - this.partyMove4_1ComboBox.Location = new System.Drawing.Point(10, 21); - this.partyMove4_1ComboBox.Name = "partyMove4_1ComboBox"; - this.partyMove4_1ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove4_1ComboBox.TabIndex = 3; - this.partyMove4_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove4_2ComboBox - // - this.partyMove4_2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove4_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove4_2ComboBox.Enabled = false; - this.partyMove4_2ComboBox.FormattingEnabled = true; - this.partyMove4_2ComboBox.Location = new System.Drawing.Point(116, 21); - this.partyMove4_2ComboBox.Name = "partyMove4_2ComboBox"; - this.partyMove4_2ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove4_2ComboBox.TabIndex = 6; - this.partyMove4_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove4_3ComboBox - // - this.partyMove4_3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove4_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove4_3ComboBox.Enabled = false; - this.partyMove4_3ComboBox.FormattingEnabled = true; - this.partyMove4_3ComboBox.Location = new System.Drawing.Point(10, 48); - this.partyMove4_3ComboBox.Name = "partyMove4_3ComboBox"; - this.partyMove4_3ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove4_3ComboBox.TabIndex = 5; - this.partyMove4_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove4_4ComboBox - // - this.partyMove4_4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove4_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove4_4ComboBox.Enabled = false; - this.partyMove4_4ComboBox.FormattingEnabled = true; - this.partyMove4_4ComboBox.Location = new System.Drawing.Point(116, 48); - this.partyMove4_4ComboBox.Name = "partyMove4_4ComboBox"; - this.partyMove4_4ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove4_4ComboBox.TabIndex = 7; - this.partyMove4_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // // partyIV4UpDown // this.partyIV4UpDown.Location = new System.Drawing.Point(48, 92); @@ -8354,18 +8176,6 @@ this.partyBall4UpDown.Size = new System.Drawing.Size(49, 20); this.partyBall4UpDown.TabIndex = 3; // - // partyItem4ComboBox - // - this.partyItem4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyItem4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyItem4ComboBox.Enabled = false; - this.partyItem4ComboBox.FormattingEnabled = true; - this.partyItem4ComboBox.Location = new System.Drawing.Point(228, 28); - this.partyItem4ComboBox.Name = "partyItem4ComboBox"; - this.partyItem4ComboBox.Size = new System.Drawing.Size(103, 21); - this.partyItem4ComboBox.TabIndex = 2; - this.partyItem4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem4ComboBox_SelectedIndexChanged); - // // partyPokemon4PictureBox // this.partyPokemon4PictureBox.Location = new System.Drawing.Point(11, 23); @@ -8375,17 +8185,6 @@ this.partyPokemon4PictureBox.TabIndex = 1; this.partyPokemon4PictureBox.TabStop = false; // - // partyPokemon4ComboBox - // - this.partyPokemon4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyPokemon4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyPokemon4ComboBox.FormattingEnabled = true; - this.partyPokemon4ComboBox.Location = new System.Drawing.Point(58, 28); - this.partyPokemon4ComboBox.Name = "partyPokemon4ComboBox"; - this.partyPokemon4ComboBox.Size = new System.Drawing.Size(126, 21); - this.partyPokemon4ComboBox.TabIndex = 0; - this.partyPokemon4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon4ComboBox_SelectedIndexChanged); - // // party3GroupBox // this.party3GroupBox.Controls.Add(this.partyForm3ComboBox); @@ -8489,54 +8288,6 @@ this.poke3MovesGroupBox.TabStop = false; this.poke3MovesGroupBox.Text = "Moves"; // - // partyMove3_1ComboBox - // - this.partyMove3_1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove3_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove3_1ComboBox.Enabled = false; - this.partyMove3_1ComboBox.FormattingEnabled = true; - this.partyMove3_1ComboBox.Location = new System.Drawing.Point(10, 21); - this.partyMove3_1ComboBox.Name = "partyMove3_1ComboBox"; - this.partyMove3_1ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove3_1ComboBox.TabIndex = 3; - this.partyMove3_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove3_2ComboBox - // - this.partyMove3_2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove3_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove3_2ComboBox.Enabled = false; - this.partyMove3_2ComboBox.FormattingEnabled = true; - this.partyMove3_2ComboBox.Location = new System.Drawing.Point(116, 21); - this.partyMove3_2ComboBox.Name = "partyMove3_2ComboBox"; - this.partyMove3_2ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove3_2ComboBox.TabIndex = 6; - this.partyMove3_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove3_3ComboBox - // - this.partyMove3_3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove3_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove3_3ComboBox.Enabled = false; - this.partyMove3_3ComboBox.FormattingEnabled = true; - this.partyMove3_3ComboBox.Location = new System.Drawing.Point(10, 48); - this.partyMove3_3ComboBox.Name = "partyMove3_3ComboBox"; - this.partyMove3_3ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove3_3ComboBox.TabIndex = 5; - this.partyMove3_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove3_4ComboBox - // - this.partyMove3_4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove3_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove3_4ComboBox.Enabled = false; - this.partyMove3_4ComboBox.FormattingEnabled = true; - this.partyMove3_4ComboBox.Location = new System.Drawing.Point(116, 48); - this.partyMove3_4ComboBox.Name = "partyMove3_4ComboBox"; - this.partyMove3_4ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove3_4ComboBox.TabIndex = 7; - this.partyMove3_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // // partyIV3UpDown // this.partyIV3UpDown.Location = new System.Drawing.Point(48, 92); @@ -8578,18 +8329,6 @@ this.partyBall3UpDown.Size = new System.Drawing.Size(49, 20); this.partyBall3UpDown.TabIndex = 3; // - // partyItem3ComboBox - // - this.partyItem3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyItem3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyItem3ComboBox.Enabled = false; - this.partyItem3ComboBox.FormattingEnabled = true; - this.partyItem3ComboBox.Location = new System.Drawing.Point(228, 28); - this.partyItem3ComboBox.Name = "partyItem3ComboBox"; - this.partyItem3ComboBox.Size = new System.Drawing.Size(103, 21); - this.partyItem3ComboBox.TabIndex = 2; - this.partyItem3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem3ComboBox_SelectedIndexChanged); - // // partyPokemon3PictureBox // this.partyPokemon3PictureBox.Location = new System.Drawing.Point(11, 23); @@ -8599,17 +8338,6 @@ this.partyPokemon3PictureBox.TabIndex = 1; this.partyPokemon3PictureBox.TabStop = false; // - // partyPokemon3ComboBox - // - this.partyPokemon3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyPokemon3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyPokemon3ComboBox.FormattingEnabled = true; - this.partyPokemon3ComboBox.Location = new System.Drawing.Point(58, 28); - this.partyPokemon3ComboBox.Name = "partyPokemon3ComboBox"; - this.partyPokemon3ComboBox.Size = new System.Drawing.Size(126, 21); - this.partyPokemon3ComboBox.TabIndex = 0; - this.partyPokemon3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon3ComboBox_SelectedIndexChanged); - // // party2GroupBox // this.party2GroupBox.Controls.Add(this.partyForm2ComboBox); @@ -8713,54 +8441,6 @@ this.poke2MovesGroupBox.TabStop = false; this.poke2MovesGroupBox.Text = "Moves"; // - // partyMove2_1ComboBox - // - this.partyMove2_1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove2_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove2_1ComboBox.Enabled = false; - this.partyMove2_1ComboBox.FormattingEnabled = true; - this.partyMove2_1ComboBox.Location = new System.Drawing.Point(10, 21); - this.partyMove2_1ComboBox.Name = "partyMove2_1ComboBox"; - this.partyMove2_1ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove2_1ComboBox.TabIndex = 3; - this.partyMove2_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove2_2ComboBox - // - this.partyMove2_2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove2_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove2_2ComboBox.Enabled = false; - this.partyMove2_2ComboBox.FormattingEnabled = true; - this.partyMove2_2ComboBox.Location = new System.Drawing.Point(116, 21); - this.partyMove2_2ComboBox.Name = "partyMove2_2ComboBox"; - this.partyMove2_2ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove2_2ComboBox.TabIndex = 6; - this.partyMove2_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove2_3ComboBox - // - this.partyMove2_3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove2_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove2_3ComboBox.Enabled = false; - this.partyMove2_3ComboBox.FormattingEnabled = true; - this.partyMove2_3ComboBox.Location = new System.Drawing.Point(10, 48); - this.partyMove2_3ComboBox.Name = "partyMove2_3ComboBox"; - this.partyMove2_3ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove2_3ComboBox.TabIndex = 5; - this.partyMove2_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove2_4ComboBox - // - this.partyMove2_4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove2_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove2_4ComboBox.Enabled = false; - this.partyMove2_4ComboBox.FormattingEnabled = true; - this.partyMove2_4ComboBox.Location = new System.Drawing.Point(116, 48); - this.partyMove2_4ComboBox.Name = "partyMove2_4ComboBox"; - this.partyMove2_4ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove2_4ComboBox.TabIndex = 7; - this.partyMove2_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // // partyIV2UpDown // this.partyIV2UpDown.Location = new System.Drawing.Point(48, 92); @@ -8802,18 +8482,6 @@ this.partyBall2UpDown.Size = new System.Drawing.Size(49, 20); this.partyBall2UpDown.TabIndex = 3; // - // partyItem2ComboBox - // - this.partyItem2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyItem2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyItem2ComboBox.Enabled = false; - this.partyItem2ComboBox.FormattingEnabled = true; - this.partyItem2ComboBox.Location = new System.Drawing.Point(228, 28); - this.partyItem2ComboBox.Name = "partyItem2ComboBox"; - this.partyItem2ComboBox.Size = new System.Drawing.Size(103, 21); - this.partyItem2ComboBox.TabIndex = 2; - this.partyItem2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem2ComboBox_SelectedIndexChanged); - // // partyPokemon2PictureBox // this.partyPokemon2PictureBox.Location = new System.Drawing.Point(11, 23); @@ -8823,17 +8491,6 @@ this.partyPokemon2PictureBox.TabIndex = 1; this.partyPokemon2PictureBox.TabStop = false; // - // partyPokemon2ComboBox - // - this.partyPokemon2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyPokemon2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyPokemon2ComboBox.FormattingEnabled = true; - this.partyPokemon2ComboBox.Location = new System.Drawing.Point(58, 28); - this.partyPokemon2ComboBox.Name = "partyPokemon2ComboBox"; - this.partyPokemon2ComboBox.Size = new System.Drawing.Size(126, 21); - this.partyPokemon2ComboBox.TabIndex = 0; - this.partyPokemon2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon2ComboBox_SelectedIndexChanged); - // // party1GroupBox // this.party1GroupBox.Controls.Add(this.partyForm1ComboBox); @@ -8937,54 +8594,6 @@ this.poke1MovesGroupBox.TabStop = false; this.poke1MovesGroupBox.Text = "Moves"; // - // partyMove1_1ComboBox - // - this.partyMove1_1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove1_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove1_1ComboBox.Enabled = false; - this.partyMove1_1ComboBox.FormattingEnabled = true; - this.partyMove1_1ComboBox.Location = new System.Drawing.Point(10, 21); - this.partyMove1_1ComboBox.Name = "partyMove1_1ComboBox"; - this.partyMove1_1ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove1_1ComboBox.TabIndex = 3; - this.partyMove1_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove1_2ComboBox - // - this.partyMove1_2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove1_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove1_2ComboBox.Enabled = false; - this.partyMove1_2ComboBox.FormattingEnabled = true; - this.partyMove1_2ComboBox.Location = new System.Drawing.Point(116, 21); - this.partyMove1_2ComboBox.Name = "partyMove1_2ComboBox"; - this.partyMove1_2ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove1_2ComboBox.TabIndex = 6; - this.partyMove1_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove1_3ComboBox - // - this.partyMove1_3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove1_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove1_3ComboBox.Enabled = false; - this.partyMove1_3ComboBox.FormattingEnabled = true; - this.partyMove1_3ComboBox.Location = new System.Drawing.Point(10, 48); - this.partyMove1_3ComboBox.Name = "partyMove1_3ComboBox"; - this.partyMove1_3ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove1_3ComboBox.TabIndex = 5; - this.partyMove1_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove1_4ComboBox - // - this.partyMove1_4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove1_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove1_4ComboBox.Enabled = false; - this.partyMove1_4ComboBox.FormattingEnabled = true; - this.partyMove1_4ComboBox.Location = new System.Drawing.Point(116, 48); - this.partyMove1_4ComboBox.Name = "partyMove1_4ComboBox"; - this.partyMove1_4ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove1_4ComboBox.TabIndex = 7; - this.partyMove1_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // // partyIV1UpDown // this.partyIV1UpDown.Location = new System.Drawing.Point(48, 92); @@ -9026,18 +8635,6 @@ this.partyBall1UpDown.Size = new System.Drawing.Size(49, 20); this.partyBall1UpDown.TabIndex = 3; // - // partyItem1ComboBox - // - this.partyItem1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyItem1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyItem1ComboBox.Enabled = false; - this.partyItem1ComboBox.FormattingEnabled = true; - this.partyItem1ComboBox.Location = new System.Drawing.Point(228, 28); - this.partyItem1ComboBox.Name = "partyItem1ComboBox"; - this.partyItem1ComboBox.Size = new System.Drawing.Size(103, 21); - this.partyItem1ComboBox.TabIndex = 2; - this.partyItem1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem1ComboBox_SelectedIndexChanged); - // // partyPokemon1PictureBox // this.partyPokemon1PictureBox.Location = new System.Drawing.Point(11, 23); @@ -9047,17 +8644,6 @@ this.partyPokemon1PictureBox.TabIndex = 1; this.partyPokemon1PictureBox.TabStop = false; // - // partyPokemon1ComboBox - // - this.partyPokemon1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyPokemon1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyPokemon1ComboBox.FormattingEnabled = true; - this.partyPokemon1ComboBox.Location = new System.Drawing.Point(58, 28); - this.partyPokemon1ComboBox.Name = "partyPokemon1ComboBox"; - this.partyPokemon1ComboBox.Size = new System.Drawing.Size(126, 21); - this.partyPokemon1ComboBox.TabIndex = 0; - this.partyPokemon1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon1ComboBox_SelectedIndexChanged); - // // groupBox27 // this.groupBox27.Controls.Add(this.eyeContactMusicAltLabel); @@ -9398,46 +8984,6 @@ this.trainerItemsGroupBox.TabStop = false; this.trainerItemsGroupBox.Text = "Trainer Items"; // - // trainerItem1ComboBox - // - this.trainerItem1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.trainerItem1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.trainerItem1ComboBox.FormattingEnabled = true; - this.trainerItem1ComboBox.Location = new System.Drawing.Point(9, 20); - this.trainerItem1ComboBox.Name = "trainerItem1ComboBox"; - this.trainerItem1ComboBox.Size = new System.Drawing.Size(171, 21); - this.trainerItem1ComboBox.TabIndex = 0; - // - // trainerItem2ComboBox - // - this.trainerItem2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.trainerItem2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.trainerItem2ComboBox.FormattingEnabled = true; - this.trainerItem2ComboBox.Location = new System.Drawing.Point(9, 47); - this.trainerItem2ComboBox.Name = "trainerItem2ComboBox"; - this.trainerItem2ComboBox.Size = new System.Drawing.Size(171, 21); - this.trainerItem2ComboBox.TabIndex = 1; - // - // trainerItem3ComboBox - // - this.trainerItem3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.trainerItem3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.trainerItem3ComboBox.FormattingEnabled = true; - this.trainerItem3ComboBox.Location = new System.Drawing.Point(9, 74); - this.trainerItem3ComboBox.Name = "trainerItem3ComboBox"; - this.trainerItem3ComboBox.Size = new System.Drawing.Size(171, 21); - this.trainerItem3ComboBox.TabIndex = 2; - // - // trainerItem4ComboBox - // - this.trainerItem4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.trainerItem4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.trainerItem4ComboBox.FormattingEnabled = true; - this.trainerItem4ComboBox.Location = new System.Drawing.Point(9, 101); - this.trainerItem4ComboBox.Name = "trainerItem4ComboBox"; - this.trainerItem4ComboBox.Size = new System.Drawing.Size(171, 21); - this.trainerItem4ComboBox.TabIndex = 3; - // // deleteTrainerButton // this.deleteTrainerButton.Enabled = false; @@ -10066,48 +9612,6 @@ this.conditionalMusicTableListBox.TabIndex = 0; this.conditionalMusicTableListBox.SelectedIndexChanged += new System.EventHandler(this.conditionalMusicTableListBox_SelectedIndexChanged); // - // tabPageScriptEditor - // - this.tabPageScriptEditor.Controls.Add(this.scriptEditor); - this.tabPageScriptEditor.ImageIndex = 5; - this.tabPageScriptEditor.Location = new System.Drawing.Point(4, 23); - this.tabPageScriptEditor.Name = "tabPageScriptEditor"; - this.tabPageScriptEditor.Padding = new System.Windows.Forms.Padding(3); - this.tabPageScriptEditor.Size = new System.Drawing.Size(1185, 675); - this.tabPageScriptEditor.TabIndex = 10; - this.tabPageScriptEditor.Text = "Script Editor New"; - this.tabPageScriptEditor.UseVisualStyleBackColor = true; - // - // scriptEditor - // - this.scriptEditor.Location = new System.Drawing.Point(2, 3); - this.scriptEditor.Margin = new System.Windows.Forms.Padding(4); - this.scriptEditor.Name = "scriptEditor"; - this.scriptEditor.scriptEditorIsReady = false; - this.scriptEditor.Size = new System.Drawing.Size(1177, 735); - this.scriptEditor.TabIndex = 0; - // - // tabPageLevelScriptEditor - // - this.tabPageLevelScriptEditor.Controls.Add(this.levelScriptEditor); - this.tabPageLevelScriptEditor.Location = new System.Drawing.Point(4, 23); - this.tabPageLevelScriptEditor.Name = "tabPageLevelScriptEditor"; - this.tabPageLevelScriptEditor.Padding = new System.Windows.Forms.Padding(3); - this.tabPageLevelScriptEditor.Size = new System.Drawing.Size(1185, 675); - this.tabPageLevelScriptEditor.TabIndex = 11; - this.tabPageLevelScriptEditor.Text = "Level Script Editor"; - this.tabPageLevelScriptEditor.UseVisualStyleBackColor = true; - // - // levelScriptEditor - // - this.levelScriptEditor.BackColor = System.Drawing.SystemColors.Control; - this.levelScriptEditor.levelScriptEditorIsReady = false; - this.levelScriptEditor.Location = new System.Drawing.Point(6, 8); - this.levelScriptEditor.Margin = new System.Windows.Forms.Padding(4); - this.levelScriptEditor.Name = "levelScriptEditor"; - this.levelScriptEditor.Size = new System.Drawing.Size(408, 622); - this.levelScriptEditor.TabIndex = 0; - // // tabPageEncountersEditor // this.tabPageEncountersEditor.Controls.Add(this.encountersEditor); @@ -10119,14 +9623,6 @@ this.tabPageEncountersEditor.Text = "Encounters"; this.tabPageEncountersEditor.UseVisualStyleBackColor = true; // - // encountersEditor - // - this.encountersEditor.Location = new System.Drawing.Point(6, 3); - this.encountersEditor.Margin = new System.Windows.Forms.Padding(4); - this.encountersEditor.Name = "encountersEditor"; - this.encountersEditor.Size = new System.Drawing.Size(1176, 672); - this.encountersEditor.TabIndex = 0; - // // mainTabImageList // this.mainTabImageList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("mainTabImageList.ImageStream"))); @@ -10863,6 +10359,513 @@ this.versionLabel.Text = "ROM:"; this.versionLabel.Visible = false; // + // texturePictureBox + // + this.texturePictureBox.BackColor = System.Drawing.Color.White; + this.texturePictureBox.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.texturePictureBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.texturePictureBox.Image = global::DSPRE.Properties.Resources.alphabgCheckerboard; + this.texturePictureBox.invertDrag = true; + this.texturePictureBox.Location = new System.Drawing.Point(732, 52); + this.texturePictureBox.Name = "texturePictureBox"; + this.texturePictureBox.Size = new System.Drawing.Size(256, 256); + this.texturePictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.texturePictureBox.TabIndex = 7; + this.texturePictureBox.TabStop = false; + // + // scriptEditor + // + this.scriptEditor.Location = new System.Drawing.Point(2, 3); + this.scriptEditor.Margin = new System.Windows.Forms.Padding(4); + this.scriptEditor.Name = "scriptEditor"; + this.scriptEditor.scriptEditorIsReady = false; + this.scriptEditor.Size = new System.Drawing.Size(1177, 735); + this.scriptEditor.TabIndex = 0; + // + // levelScriptEditor + // + this.levelScriptEditor.BackColor = System.Drawing.SystemColors.Control; + this.levelScriptEditor.levelScriptEditorIsReady = false; + this.levelScriptEditor.Location = new System.Drawing.Point(6, 8); + this.levelScriptEditor.Margin = new System.Windows.Forms.Padding(4); + this.levelScriptEditor.Name = "levelScriptEditor"; + this.levelScriptEditor.Size = new System.Drawing.Size(408, 622); + this.levelScriptEditor.TabIndex = 0; + // + // partyMove6_1ComboBox + // + this.partyMove6_1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove6_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove6_1ComboBox.Enabled = false; + this.partyMove6_1ComboBox.FormattingEnabled = true; + this.partyMove6_1ComboBox.Location = new System.Drawing.Point(10, 21); + this.partyMove6_1ComboBox.Name = "partyMove6_1ComboBox"; + this.partyMove6_1ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove6_1ComboBox.TabIndex = 3; + this.partyMove6_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove6_2ComboBox + // + this.partyMove6_2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove6_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove6_2ComboBox.Enabled = false; + this.partyMove6_2ComboBox.FormattingEnabled = true; + this.partyMove6_2ComboBox.Location = new System.Drawing.Point(116, 21); + this.partyMove6_2ComboBox.Name = "partyMove6_2ComboBox"; + this.partyMove6_2ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove6_2ComboBox.TabIndex = 6; + this.partyMove6_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove6_3ComboBox + // + this.partyMove6_3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove6_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove6_3ComboBox.Enabled = false; + this.partyMove6_3ComboBox.FormattingEnabled = true; + this.partyMove6_3ComboBox.Location = new System.Drawing.Point(10, 48); + this.partyMove6_3ComboBox.Name = "partyMove6_3ComboBox"; + this.partyMove6_3ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove6_3ComboBox.TabIndex = 5; + this.partyMove6_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove6_4ComboBox + // + this.partyMove6_4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove6_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove6_4ComboBox.Enabled = false; + this.partyMove6_4ComboBox.FormattingEnabled = true; + this.partyMove6_4ComboBox.Location = new System.Drawing.Point(116, 48); + this.partyMove6_4ComboBox.Name = "partyMove6_4ComboBox"; + this.partyMove6_4ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove6_4ComboBox.TabIndex = 7; + this.partyMove6_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyItem6ComboBox + // + this.partyItem6ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyItem6ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyItem6ComboBox.Enabled = false; + this.partyItem6ComboBox.FormattingEnabled = true; + this.partyItem6ComboBox.Location = new System.Drawing.Point(228, 28); + this.partyItem6ComboBox.Name = "partyItem6ComboBox"; + this.partyItem6ComboBox.Size = new System.Drawing.Size(103, 21); + this.partyItem6ComboBox.TabIndex = 2; + this.partyItem6ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem6ComboBox_SelectedIndexChanged); + // + // partyPokemon6ComboBox + // + this.partyPokemon6ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyPokemon6ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyPokemon6ComboBox.FormattingEnabled = true; + this.partyPokemon6ComboBox.Location = new System.Drawing.Point(58, 28); + this.partyPokemon6ComboBox.Name = "partyPokemon6ComboBox"; + this.partyPokemon6ComboBox.Size = new System.Drawing.Size(126, 21); + this.partyPokemon6ComboBox.TabIndex = 0; + this.partyPokemon6ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon6ComboBox_SelectedIndexChanged); + // + // partyMove5_1ComboBox + // + this.partyMove5_1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove5_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove5_1ComboBox.Enabled = false; + this.partyMove5_1ComboBox.FormattingEnabled = true; + this.partyMove5_1ComboBox.Location = new System.Drawing.Point(10, 21); + this.partyMove5_1ComboBox.Name = "partyMove5_1ComboBox"; + this.partyMove5_1ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove5_1ComboBox.TabIndex = 3; + this.partyMove5_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove5_2ComboBox + // + this.partyMove5_2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove5_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove5_2ComboBox.Enabled = false; + this.partyMove5_2ComboBox.FormattingEnabled = true; + this.partyMove5_2ComboBox.Location = new System.Drawing.Point(116, 21); + this.partyMove5_2ComboBox.Name = "partyMove5_2ComboBox"; + this.partyMove5_2ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove5_2ComboBox.TabIndex = 6; + this.partyMove5_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove5_3ComboBox + // + this.partyMove5_3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove5_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove5_3ComboBox.Enabled = false; + this.partyMove5_3ComboBox.FormattingEnabled = true; + this.partyMove5_3ComboBox.Location = new System.Drawing.Point(10, 48); + this.partyMove5_3ComboBox.Name = "partyMove5_3ComboBox"; + this.partyMove5_3ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove5_3ComboBox.TabIndex = 5; + this.partyMove5_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove5_4ComboBox + // + this.partyMove5_4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove5_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove5_4ComboBox.Enabled = false; + this.partyMove5_4ComboBox.FormattingEnabled = true; + this.partyMove5_4ComboBox.Location = new System.Drawing.Point(116, 48); + this.partyMove5_4ComboBox.Name = "partyMove5_4ComboBox"; + this.partyMove5_4ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove5_4ComboBox.TabIndex = 7; + this.partyMove5_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyItem5ComboBox + // + this.partyItem5ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyItem5ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyItem5ComboBox.Enabled = false; + this.partyItem5ComboBox.FormattingEnabled = true; + this.partyItem5ComboBox.Location = new System.Drawing.Point(228, 28); + this.partyItem5ComboBox.Name = "partyItem5ComboBox"; + this.partyItem5ComboBox.Size = new System.Drawing.Size(103, 21); + this.partyItem5ComboBox.TabIndex = 2; + this.partyItem5ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem5ComboBox_SelectedIndexChanged); + // + // partyPokemon5ComboBox + // + this.partyPokemon5ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyPokemon5ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyPokemon5ComboBox.FormattingEnabled = true; + this.partyPokemon5ComboBox.Location = new System.Drawing.Point(58, 28); + this.partyPokemon5ComboBox.Name = "partyPokemon5ComboBox"; + this.partyPokemon5ComboBox.Size = new System.Drawing.Size(126, 21); + this.partyPokemon5ComboBox.TabIndex = 0; + this.partyPokemon5ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon5ComboBox_SelectedIndexChanged); + // + // partyMove4_1ComboBox + // + this.partyMove4_1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove4_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove4_1ComboBox.Enabled = false; + this.partyMove4_1ComboBox.FormattingEnabled = true; + this.partyMove4_1ComboBox.Location = new System.Drawing.Point(10, 21); + this.partyMove4_1ComboBox.Name = "partyMove4_1ComboBox"; + this.partyMove4_1ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove4_1ComboBox.TabIndex = 3; + this.partyMove4_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove4_2ComboBox + // + this.partyMove4_2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove4_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove4_2ComboBox.Enabled = false; + this.partyMove4_2ComboBox.FormattingEnabled = true; + this.partyMove4_2ComboBox.Location = new System.Drawing.Point(116, 21); + this.partyMove4_2ComboBox.Name = "partyMove4_2ComboBox"; + this.partyMove4_2ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove4_2ComboBox.TabIndex = 6; + this.partyMove4_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove4_3ComboBox + // + this.partyMove4_3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove4_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove4_3ComboBox.Enabled = false; + this.partyMove4_3ComboBox.FormattingEnabled = true; + this.partyMove4_3ComboBox.Location = new System.Drawing.Point(10, 48); + this.partyMove4_3ComboBox.Name = "partyMove4_3ComboBox"; + this.partyMove4_3ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove4_3ComboBox.TabIndex = 5; + this.partyMove4_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove4_4ComboBox + // + this.partyMove4_4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove4_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove4_4ComboBox.Enabled = false; + this.partyMove4_4ComboBox.FormattingEnabled = true; + this.partyMove4_4ComboBox.Location = new System.Drawing.Point(116, 48); + this.partyMove4_4ComboBox.Name = "partyMove4_4ComboBox"; + this.partyMove4_4ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove4_4ComboBox.TabIndex = 7; + this.partyMove4_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyItem4ComboBox + // + this.partyItem4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyItem4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyItem4ComboBox.Enabled = false; + this.partyItem4ComboBox.FormattingEnabled = true; + this.partyItem4ComboBox.Location = new System.Drawing.Point(228, 28); + this.partyItem4ComboBox.Name = "partyItem4ComboBox"; + this.partyItem4ComboBox.Size = new System.Drawing.Size(103, 21); + this.partyItem4ComboBox.TabIndex = 2; + this.partyItem4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem4ComboBox_SelectedIndexChanged); + // + // partyPokemon4ComboBox + // + this.partyPokemon4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyPokemon4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyPokemon4ComboBox.FormattingEnabled = true; + this.partyPokemon4ComboBox.Location = new System.Drawing.Point(58, 28); + this.partyPokemon4ComboBox.Name = "partyPokemon4ComboBox"; + this.partyPokemon4ComboBox.Size = new System.Drawing.Size(126, 21); + this.partyPokemon4ComboBox.TabIndex = 0; + this.partyPokemon4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon4ComboBox_SelectedIndexChanged); + // + // partyMove3_1ComboBox + // + this.partyMove3_1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove3_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove3_1ComboBox.Enabled = false; + this.partyMove3_1ComboBox.FormattingEnabled = true; + this.partyMove3_1ComboBox.Location = new System.Drawing.Point(10, 21); + this.partyMove3_1ComboBox.Name = "partyMove3_1ComboBox"; + this.partyMove3_1ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove3_1ComboBox.TabIndex = 3; + this.partyMove3_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove3_2ComboBox + // + this.partyMove3_2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove3_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove3_2ComboBox.Enabled = false; + this.partyMove3_2ComboBox.FormattingEnabled = true; + this.partyMove3_2ComboBox.Location = new System.Drawing.Point(116, 21); + this.partyMove3_2ComboBox.Name = "partyMove3_2ComboBox"; + this.partyMove3_2ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove3_2ComboBox.TabIndex = 6; + this.partyMove3_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove3_3ComboBox + // + this.partyMove3_3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove3_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove3_3ComboBox.Enabled = false; + this.partyMove3_3ComboBox.FormattingEnabled = true; + this.partyMove3_3ComboBox.Location = new System.Drawing.Point(10, 48); + this.partyMove3_3ComboBox.Name = "partyMove3_3ComboBox"; + this.partyMove3_3ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove3_3ComboBox.TabIndex = 5; + this.partyMove3_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove3_4ComboBox + // + this.partyMove3_4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove3_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove3_4ComboBox.Enabled = false; + this.partyMove3_4ComboBox.FormattingEnabled = true; + this.partyMove3_4ComboBox.Location = new System.Drawing.Point(116, 48); + this.partyMove3_4ComboBox.Name = "partyMove3_4ComboBox"; + this.partyMove3_4ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove3_4ComboBox.TabIndex = 7; + this.partyMove3_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyItem3ComboBox + // + this.partyItem3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyItem3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyItem3ComboBox.Enabled = false; + this.partyItem3ComboBox.FormattingEnabled = true; + this.partyItem3ComboBox.Location = new System.Drawing.Point(228, 28); + this.partyItem3ComboBox.Name = "partyItem3ComboBox"; + this.partyItem3ComboBox.Size = new System.Drawing.Size(103, 21); + this.partyItem3ComboBox.TabIndex = 2; + this.partyItem3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem3ComboBox_SelectedIndexChanged); + // + // partyPokemon3ComboBox + // + this.partyPokemon3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyPokemon3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyPokemon3ComboBox.FormattingEnabled = true; + this.partyPokemon3ComboBox.Location = new System.Drawing.Point(58, 28); + this.partyPokemon3ComboBox.Name = "partyPokemon3ComboBox"; + this.partyPokemon3ComboBox.Size = new System.Drawing.Size(126, 21); + this.partyPokemon3ComboBox.TabIndex = 0; + this.partyPokemon3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon3ComboBox_SelectedIndexChanged); + // + // partyMove2_1ComboBox + // + this.partyMove2_1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove2_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove2_1ComboBox.Enabled = false; + this.partyMove2_1ComboBox.FormattingEnabled = true; + this.partyMove2_1ComboBox.Location = new System.Drawing.Point(10, 21); + this.partyMove2_1ComboBox.Name = "partyMove2_1ComboBox"; + this.partyMove2_1ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove2_1ComboBox.TabIndex = 3; + this.partyMove2_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove2_2ComboBox + // + this.partyMove2_2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove2_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove2_2ComboBox.Enabled = false; + this.partyMove2_2ComboBox.FormattingEnabled = true; + this.partyMove2_2ComboBox.Location = new System.Drawing.Point(116, 21); + this.partyMove2_2ComboBox.Name = "partyMove2_2ComboBox"; + this.partyMove2_2ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove2_2ComboBox.TabIndex = 6; + this.partyMove2_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove2_3ComboBox + // + this.partyMove2_3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove2_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove2_3ComboBox.Enabled = false; + this.partyMove2_3ComboBox.FormattingEnabled = true; + this.partyMove2_3ComboBox.Location = new System.Drawing.Point(10, 48); + this.partyMove2_3ComboBox.Name = "partyMove2_3ComboBox"; + this.partyMove2_3ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove2_3ComboBox.TabIndex = 5; + this.partyMove2_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove2_4ComboBox + // + this.partyMove2_4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove2_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove2_4ComboBox.Enabled = false; + this.partyMove2_4ComboBox.FormattingEnabled = true; + this.partyMove2_4ComboBox.Location = new System.Drawing.Point(116, 48); + this.partyMove2_4ComboBox.Name = "partyMove2_4ComboBox"; + this.partyMove2_4ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove2_4ComboBox.TabIndex = 7; + this.partyMove2_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyItem2ComboBox + // + this.partyItem2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyItem2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyItem2ComboBox.Enabled = false; + this.partyItem2ComboBox.FormattingEnabled = true; + this.partyItem2ComboBox.Location = new System.Drawing.Point(228, 28); + this.partyItem2ComboBox.Name = "partyItem2ComboBox"; + this.partyItem2ComboBox.Size = new System.Drawing.Size(103, 21); + this.partyItem2ComboBox.TabIndex = 2; + this.partyItem2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem2ComboBox_SelectedIndexChanged); + // + // partyPokemon2ComboBox + // + this.partyPokemon2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyPokemon2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyPokemon2ComboBox.FormattingEnabled = true; + this.partyPokemon2ComboBox.Location = new System.Drawing.Point(58, 28); + this.partyPokemon2ComboBox.Name = "partyPokemon2ComboBox"; + this.partyPokemon2ComboBox.Size = new System.Drawing.Size(126, 21); + this.partyPokemon2ComboBox.TabIndex = 0; + this.partyPokemon2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon2ComboBox_SelectedIndexChanged); + // + // partyMove1_1ComboBox + // + this.partyMove1_1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove1_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove1_1ComboBox.Enabled = false; + this.partyMove1_1ComboBox.FormattingEnabled = true; + this.partyMove1_1ComboBox.Location = new System.Drawing.Point(10, 21); + this.partyMove1_1ComboBox.Name = "partyMove1_1ComboBox"; + this.partyMove1_1ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove1_1ComboBox.TabIndex = 3; + this.partyMove1_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove1_2ComboBox + // + this.partyMove1_2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove1_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove1_2ComboBox.Enabled = false; + this.partyMove1_2ComboBox.FormattingEnabled = true; + this.partyMove1_2ComboBox.Location = new System.Drawing.Point(116, 21); + this.partyMove1_2ComboBox.Name = "partyMove1_2ComboBox"; + this.partyMove1_2ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove1_2ComboBox.TabIndex = 6; + this.partyMove1_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove1_3ComboBox + // + this.partyMove1_3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove1_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove1_3ComboBox.Enabled = false; + this.partyMove1_3ComboBox.FormattingEnabled = true; + this.partyMove1_3ComboBox.Location = new System.Drawing.Point(10, 48); + this.partyMove1_3ComboBox.Name = "partyMove1_3ComboBox"; + this.partyMove1_3ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove1_3ComboBox.TabIndex = 5; + this.partyMove1_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove1_4ComboBox + // + this.partyMove1_4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove1_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove1_4ComboBox.Enabled = false; + this.partyMove1_4ComboBox.FormattingEnabled = true; + this.partyMove1_4ComboBox.Location = new System.Drawing.Point(116, 48); + this.partyMove1_4ComboBox.Name = "partyMove1_4ComboBox"; + this.partyMove1_4ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove1_4ComboBox.TabIndex = 7; + this.partyMove1_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyItem1ComboBox + // + this.partyItem1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyItem1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyItem1ComboBox.Enabled = false; + this.partyItem1ComboBox.FormattingEnabled = true; + this.partyItem1ComboBox.Location = new System.Drawing.Point(228, 28); + this.partyItem1ComboBox.Name = "partyItem1ComboBox"; + this.partyItem1ComboBox.Size = new System.Drawing.Size(103, 21); + this.partyItem1ComboBox.TabIndex = 2; + this.partyItem1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem1ComboBox_SelectedIndexChanged); + // + // partyPokemon1ComboBox + // + this.partyPokemon1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyPokemon1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyPokemon1ComboBox.FormattingEnabled = true; + this.partyPokemon1ComboBox.Location = new System.Drawing.Point(58, 28); + this.partyPokemon1ComboBox.Name = "partyPokemon1ComboBox"; + this.partyPokemon1ComboBox.Size = new System.Drawing.Size(126, 21); + this.partyPokemon1ComboBox.TabIndex = 0; + this.partyPokemon1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon1ComboBox_SelectedIndexChanged); + // + // trainerItem1ComboBox + // + this.trainerItem1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.trainerItem1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.trainerItem1ComboBox.FormattingEnabled = true; + this.trainerItem1ComboBox.Location = new System.Drawing.Point(9, 20); + this.trainerItem1ComboBox.Name = "trainerItem1ComboBox"; + this.trainerItem1ComboBox.Size = new System.Drawing.Size(171, 21); + this.trainerItem1ComboBox.TabIndex = 0; + // + // trainerItem2ComboBox + // + this.trainerItem2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.trainerItem2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.trainerItem2ComboBox.FormattingEnabled = true; + this.trainerItem2ComboBox.Location = new System.Drawing.Point(9, 47); + this.trainerItem2ComboBox.Name = "trainerItem2ComboBox"; + this.trainerItem2ComboBox.Size = new System.Drawing.Size(171, 21); + this.trainerItem2ComboBox.TabIndex = 1; + // + // trainerItem3ComboBox + // + this.trainerItem3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.trainerItem3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.trainerItem3ComboBox.FormattingEnabled = true; + this.trainerItem3ComboBox.Location = new System.Drawing.Point(9, 74); + this.trainerItem3ComboBox.Name = "trainerItem3ComboBox"; + this.trainerItem3ComboBox.Size = new System.Drawing.Size(171, 21); + this.trainerItem3ComboBox.TabIndex = 2; + // + // trainerItem4ComboBox + // + this.trainerItem4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.trainerItem4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.trainerItem4ComboBox.FormattingEnabled = true; + this.trainerItem4ComboBox.Location = new System.Drawing.Point(9, 101); + this.trainerItem4ComboBox.Name = "trainerItem4ComboBox"; + this.trainerItem4ComboBox.Size = new System.Drawing.Size(171, 21); + this.trainerItem4ComboBox.TabIndex = 3; + // + // encountersEditor + // + this.encountersEditor.Location = new System.Drawing.Point(6, 3); + this.encountersEditor.Margin = new System.Windows.Forms.Padding(4); + this.encountersEditor.Name = "encountersEditor"; + this.encountersEditor.Size = new System.Drawing.Size(1176, 672); + this.encountersEditor.TabIndex = 0; + // // MainProgram // this.AllowDrop = true; @@ -10995,7 +10998,6 @@ ((System.ComponentModel.ISupportInitialize)(this.areaDataDynamicTexturesNumericUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.areaDataMapTilesetUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.areaDataBuildingTilesetUpDown)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.texturePictureBox)).EndInit(); this.eventEditorTabPage.ResumeLayout(false); this.eventEditorTabPage.PerformLayout(); this.groupBox21.ResumeLayout(false); @@ -11082,6 +11084,8 @@ ((System.ComponentModel.ISupportInitialize)(this.rightClickPicture)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.wheelClickPicture)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.LeftClickPicture)).EndInit(); + this.tabPageScriptEditor.ResumeLayout(false); + this.tabPageLevelScriptEditor.ResumeLayout(false); this.textEditorTabPage.ResumeLayout(false); this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); @@ -11177,8 +11181,6 @@ this.conditionalMusicGroupBox.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.musicIDconditionalMusicUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.flagConditionalMusicUpDown)).EndInit(); - this.tabPageScriptEditor.ResumeLayout(false); - this.tabPageLevelScriptEditor.ResumeLayout(false); this.tabPageEncountersEditor.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gameIcon)).EndInit(); this.menuStrip1.ResumeLayout(false); @@ -11187,6 +11189,7 @@ this.statusStrip1.PerformLayout(); this.mainToolStrip.ResumeLayout(false); this.mainToolStrip.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.texturePictureBox)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/DS_Map/Main Window.resx b/DS_Map/Main Window.resx index aac40e2..1242269 100644 --- a/DS_Map/Main Window.resx +++ b/DS_Map/Main Window.resx @@ -956,7 +956,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM - EgAAAk1TRnQBSQFMAgEBCgEAAVABHAFQARwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + EgAAAk1TRnQBSQFMAgEBCgEAAWgBHAFoARwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA From 8f1a2a003a8e7cb6d22fb1aa7e7deca0c19a8e11 Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Thu, 9 May 2024 12:43:05 +0200 Subject: [PATCH 39/40] Started adding the DSUtils changes Co-authored-by: AdAstra-LD <> --- DS_Map/BuildingEditor.cs | 8 +- DS_Map/DSPRE.csproj | 16 +- DS_Map/DSUtils.cs | 652 ------------------ DS_Map/DSUtils/ARM9.cs | 62 ++ DS_Map/DSUtils/DSUtils.cs | 232 +++++++ DS_Map/DSUtils/ModelUtils.cs | 139 ++++ DS_Map/DSUtils/NSBUtils.cs | 142 ++++ DS_Map/DSUtils/OverlayUtils.cs | 123 ++++ DS_Map/Filesystem.cs | 2 +- DS_Map/HeaderSearch.cs | 2 +- DS_Map/Helpers.cs | 6 +- DS_Map/Main Window.cs | 156 ++--- ...gner.cs => PatchToolboxDialog.Designer.cs} | 4 +- ...ToolboxDialog.cs => PatchToolboxDialog.cs} | 112 +-- ...boxDialog.resx => PatchToolboxDialog.resx} | 0 DS_Map/ROMFiles/MapHeader.cs | 8 +- DS_Map/Resources/ROMToolboxDB/ToolboxDB.cs | 6 +- DS_Map/RomInfo.cs | 44 +- DS_Map/SpawnEditor.cs | 28 +- DS_Map/WildEditorDPPt.cs | 2 +- DS_Map/WildEditorHGSS.cs | 2 +- 21 files changed, 898 insertions(+), 848 deletions(-) delete mode 100644 DS_Map/DSUtils.cs create mode 100644 DS_Map/DSUtils/ARM9.cs create mode 100644 DS_Map/DSUtils/DSUtils.cs create mode 100644 DS_Map/DSUtils/ModelUtils.cs create mode 100644 DS_Map/DSUtils/NSBUtils.cs create mode 100644 DS_Map/DSUtils/OverlayUtils.cs rename DS_Map/{ROMToolboxDialog.Designer.cs => PatchToolboxDialog.Designer.cs} (99%) rename DS_Map/{ROMToolboxDialog.cs => PatchToolboxDialog.cs} (90%) rename DS_Map/{ROMToolboxDialog.resx => PatchToolboxDialog.resx} (100%) diff --git a/DS_Map/BuildingEditor.cs b/DS_Map/BuildingEditor.cs index 0587fe8..6444e42 100644 --- a/DS_Map/BuildingEditor.cs +++ b/DS_Map/BuildingEditor.cs @@ -62,7 +62,7 @@ namespace DSPRE { string readingPath = folder + rom.GetBuildingModelsDirPath(interior) + "\\" + modelID.ToString("D4"); byte[] txFile = File.ReadAllBytes(readingPath); - byte[] texData = DSUtils.GetTexturesFromTexturedNSBMD(txFile); + byte[] texData = NSBUtils.GetTexturesFromTexturedNSBMD(txFile); if (texData.Length <= 4) { Console.WriteLine("No textures found"); @@ -76,7 +76,7 @@ namespace DSPRE { string filePath = folder + rom.GetBuildingModelsDirPath(interior) + "\\" + currentIndex.ToString("D4"); using (DSUtils.EasyReader reader = new DSUtils.EasyReader(filePath, 0x14)) { - string nsbmdName = DSUtils.ReadNSBMDname(reader); + string nsbmdName = NSBUtils.ReadNSBMDname(reader); buildingEditorBldListBox.Items.Add("[" + currentIndex.ToString("D3") + "] " + nsbmdName); } } @@ -207,7 +207,7 @@ namespace DSPRE { int currentIndex = buildingEditorBldListBox.SelectedIndex; File.Copy(im.FileName, folder + rom.GetBuildingModelsDirPath(interiorCheckBox.Checked) + "\\" + currentIndex.ToString("D4"), true); - buildingEditorBldListBox.Items[currentIndex] = "[" + currentIndex.ToString("D3") + "] " + DSUtils.ReadNSBMDname(reader, 0x14); + buildingEditorBldListBox.Items[currentIndex] = "[" + currentIndex.ToString("D3") + "] " + NSBUtils.ReadNSBMDname(reader, 0x14); buildingEditorListBox_SelectedIndexChanged(null, null); } } @@ -275,7 +275,7 @@ namespace DSPRE { } private void bldExportDAEbutton_Click(object sender, EventArgs e) { - DSUtils.ModelToDAE( + ModelUtils.ModelToDAE( modelName: buildingEditorBldListBox.SelectedItem.ToString().TrimEnd('\0'), modelData: currentModelData, textureData: textureComboBox.SelectedIndex < 1 ? null : File.ReadAllBytes(RomInfo.gameDirs[DirNames.buildingTextures].unpackedDir + "\\" + (textureComboBox.SelectedIndex - 1).ToString("D4")) diff --git a/DS_Map/DSPRE.csproj b/DS_Map/DSPRE.csproj index 8452f29..394e6e8 100644 --- a/DS_Map/DSPRE.csproj +++ b/DS_Map/DSPRE.csproj @@ -95,6 +95,11 @@ + + + + + Form @@ -205,7 +210,6 @@ - Form @@ -252,11 +256,11 @@ - + Form - - ROMToolboxDialog.cs + + PatchToolboxDialog.cs Form @@ -417,8 +421,8 @@ CommandsDatabase.cs Designer - - ROMToolboxDialog.cs + + PatchToolboxDialog.cs BuildingEditor.cs diff --git a/DS_Map/DSUtils.cs b/DS_Map/DSUtils.cs deleted file mode 100644 index b001237..0000000 --- a/DS_Map/DSUtils.cs +++ /dev/null @@ -1,652 +0,0 @@ -using Ekona.Images; -using Images; -using LibNDSFormats.NSBMD; -using Microsoft.WindowsAPICodePack.Dialogs; -using NarcAPI; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Drawing; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; -using static DSPRE.RomInfo; - -namespace DSPRE { - public static class DSUtils { - public static readonly string NDSRomFilter = "NDS File (*.nds)|*.nds"; - public class EasyReader : BinaryReader { - public EasyReader(string path, long pos = 0) : base(File.OpenRead(path)) { - this.BaseStream.Position = pos; - } - } - public class EasyWriter : BinaryWriter { - public EasyWriter(string path, long pos = 0, FileMode fmode = FileMode.OpenOrCreate) : base(new FileStream(path, fmode, FileAccess.Write, FileShare.None)) { - this.BaseStream.Position = pos; - } - public void EditSize(int increment) { - this.BaseStream.SetLength(this.BaseStream.Length + increment); - } - } - public static class ARM9 { - public static readonly uint address = 0x02000000; - public class Reader : EasyReader { - public Reader(long pos = 0) : base(arm9Path, pos) { - this.BaseStream.Position = pos; - } - } - public class Writer : EasyWriter { - public Writer(long pos = 0) : base(arm9Path, pos) { - this.BaseStream.Position = pos; - } - } - public static void EditSize(int increment) { - using (Writer w = new Writer()) { - w.EditSize(increment); - } - } - public static bool Decompress(string path) { - Process decompress = new Process(); - decompress.StartInfo.FileName = @"Tools\blz.exe"; - decompress.StartInfo.Arguments = @" -d " + '"' + path + '"'; - decompress.StartInfo.WindowStyle = ProcessWindowStyle.Hidden; - decompress.StartInfo.CreateNoWindow = true; - decompress.Start(); - decompress.WaitForExit(); - - return new FileInfo(RomInfo.arm9Path).Length > 0xBC000; - } - public static bool Compress(string path) { - Process compress = new Process(); - compress.StartInfo.FileName = @"Tools\blz.exe"; - compress.StartInfo.Arguments = @" -en9 " + '"' + path + '"'; - compress.StartInfo.WindowStyle = ProcessWindowStyle.Hidden; - compress.StartInfo.CreateNoWindow = true; - compress.Start(); - compress.WaitForExit(); - - return new FileInfo(RomInfo.arm9Path).Length <= 0xBC000; - } - public static bool CheckCompressionMark() { - return BitConverter.ToInt32(DSUtils.ARM9.ReadBytes((uint)(RomInfo.gameFamily == GameFamilies.DP ? 0xB7C : 0xBB4), 4), 0) != 0; - } - public static byte[] ReadBytes(uint startOffset, long numberOfBytes = 0) { - return ReadFromFile(RomInfo.arm9Path, startOffset, numberOfBytes); - } - public static void WriteBytes(byte[] bytesToWrite, uint destOffset, int indexFirstByteToWrite = 0, int? indexLastByteToWrite = null) { - WriteToFile(RomInfo.arm9Path, bytesToWrite, destOffset, indexFirstByteToWrite, indexLastByteToWrite); - } - public static byte ReadByte(uint startOffset) { - return ReadFromFile(RomInfo.arm9Path, startOffset, 1)[0]; - } - public static void WriteByte(byte value, uint destOffset) { - WriteToFile(RomInfo.arm9Path, BitConverter.GetBytes(value), destOffset, 0); - } - } - - public const int NSBMD_DOESNTHAVE_TEXTURE = 0; - public const int NSBMD_HAS_TEXTURE = 1; - - public const int ERR_OVERLAY_NOTFOUND = -1; - public const int ERR_OVERLAY_ALREADY_UNCOMPRESSED = -2; - - public const string backupSuffix = ".backup"; - - public static string ReadNSBMDname(BinaryReader reader, long? startPos = null) { - if (startPos != null) { - reader.BaseStream.Position = (long)startPos; - } - - if (reader.ReadUInt32() == NSBMD.NDS_TYPE_MDL0) { //MDL0 - reader.BaseStream.Position += 0x1c; - } else { - reader.BaseStream.Position += 0x1c + 4; - } - - return Encoding.UTF8.GetString(reader.ReadBytes(16)); - } - - public static void ModelToDAE(string modelName, byte[] modelData, byte[] textureData) { - MessageBox.Show("Choose output folder.\nDSPRE will automatically create a sub-folder in it.", "Awaiting user input", MessageBoxButtons.OK, MessageBoxIcon.Information); - - CommonOpenFileDialog cofd = new CommonOpenFileDialog { - IsFolderPicker = true, - Multiselect = false - }; - if (cofd.ShowDialog() != CommonFileDialogResult.Ok) { - return; - } - - string outDir = Path.Combine(cofd.FileName, modelName); - - if (Directory.Exists(outDir)) { - if (Directory.GetFiles(outDir).Length > 0) { - DialogResult d = MessageBox.Show($"Directory \"{outDir}\" already exists and is not empty.\nIts contents will be lost.\n\nDo you want to proceed?", "Directory not empty", MessageBoxButtons.YesNo, MessageBoxIcon.Question); - - if (d.Equals(DialogResult.No)) { - return; - } else { - Directory.Delete(outDir, recursive: true); - } - } else { - Directory.Delete(outDir, recursive: true); - } - } - string tempNSBMDPath = outDir + "_temp.nsbmd"; - - if (textureData != null && textureData.Length > 0) { - modelData = DSUtils.BuildNSBMDwithTextures(modelData, textureData); - } - - File.WriteAllBytes(tempNSBMDPath, modelData); - - /* Check correct creation of temp NSBMD file*/ - if (!File.Exists(tempNSBMDPath)) { - MessageBox.Show("NSBMD file corresponding to this map could not be found.\nAborting", "Error", MessageBoxButtons.OK, MessageBoxIcon.Information); - return; - } - - Process apicula = new Process(); - apicula.StartInfo.FileName = @"Tools\apicula.exe"; - apicula.StartInfo.Arguments = $" convert \"{tempNSBMDPath}\" --output \"{outDir}\""; - apicula.StartInfo.WindowStyle = ProcessWindowStyle.Hidden; - apicula.StartInfo.CreateNoWindow = true; - apicula.Start(); - apicula.WaitForExit(); - - if (File.Exists(tempNSBMDPath)) { - File.Delete(tempNSBMDPath); - - if (File.Exists(tempNSBMDPath)) { - MessageBox.Show("Temporary NSBMD file deletion failed.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } - } else { - MessageBox.Show("Temporary NSBMD file corresponding to this map disappeared.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } - - if (apicula.ExitCode == 0) { - MessageBox.Show("NSBMD was exported and converted successfully!", "Operation successful", MessageBoxButtons.OK, MessageBoxIcon.Information); - } else { - MessageBox.Show("NSBMD to DAE conversion failed.", "Apicula error", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - - public static void ModelToGLB(string modelName, byte[] modelData, byte[] textureData) { - MessageBox.Show("Choose output folder.\nDSPRE will automatically create a sub-folder in it.", "Awaiting user input", MessageBoxButtons.OK, MessageBoxIcon.Information); - - CommonOpenFileDialog cofd = new CommonOpenFileDialog { - IsFolderPicker = true, - Multiselect = false - }; - if (cofd.ShowDialog() != CommonFileDialogResult.Ok) { - return; - } - - string outDir = Path.Combine(cofd.FileName, modelName); - - if (Directory.Exists(outDir)) { - if (Directory.GetFiles(outDir).Length > 0) { - DialogResult d = MessageBox.Show($"Directory \"{outDir}\" already exists and is not empty.\nIts contents will be lost.\n\nDo you want to proceed?", "Directory not empty", MessageBoxButtons.YesNo, MessageBoxIcon.Question); - - if (d.Equals(DialogResult.No)) { - return; - } else { - Directory.Delete(outDir, recursive: true); - } - } else { - Directory.Delete(outDir, recursive: true); - } - } - string tempNSBMDPath = outDir + "_temp.nsbmd"; - - if (textureData != null && textureData.Length > 0) { - modelData = DSUtils.BuildNSBMDwithTextures(modelData, textureData); - } - - File.WriteAllBytes(tempNSBMDPath, modelData); - - /* Check correct creation of temp NSBMD file*/ - if (!File.Exists(tempNSBMDPath)) { - MessageBox.Show("NSBMD file corresponding to this map could not be found.\nAborting", "Error", MessageBoxButtons.OK, MessageBoxIcon.Information); - return; - } - - Process apicula = new Process(); - apicula.StartInfo.FileName = @"Tools\apicula.exe"; - apicula.StartInfo.Arguments = $" convert \"{tempNSBMDPath}\" -f glb --output \"{outDir}\""; - apicula.StartInfo.WindowStyle = ProcessWindowStyle.Hidden; - apicula.StartInfo.CreateNoWindow = true; - apicula.Start(); - apicula.WaitForExit(); - - if (File.Exists(tempNSBMDPath)) { - File.Delete(tempNSBMDPath); - - if (File.Exists(tempNSBMDPath)) { - MessageBox.Show("Temporary NSBMD file deletion failed.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } - } else { - MessageBox.Show("Temporary NSBMD file corresponding to this map disappeared.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } - - if (apicula.ExitCode == 0) { - MessageBox.Show("NSBMD was exported and converted successfully!", "Operation successful", MessageBoxButtons.OK, MessageBoxIcon.Information); - } else { - MessageBox.Show("NSBMD to GLB conversion failed.", "Apicula error", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - - public static void WriteToFile(string filepath, byte[] toOutput, uint writeAt = 0, int indexFirstByteToWrite = 0, int? indexLastByteToWrite = null, FileMode fmode = FileMode.OpenOrCreate) { - using (EasyWriter writer = new EasyWriter(filepath, writeAt, fmode)) { - writer.Write(toOutput, indexFirstByteToWrite, indexLastByteToWrite is null ? toOutput.Length - indexFirstByteToWrite : (int)indexLastByteToWrite); - } - } - public static byte[] ReadFromFile(string filepath, long startOffset = 0, long numberOfBytes = 0) { - byte[] buffer = null; - - using (EasyReader reader = new EasyReader(filepath, startOffset)) { - try { - buffer = reader.ReadBytes(numberOfBytes == 0 ? (int)(reader.BaseStream.Length - reader.BaseStream.Position) : (int)numberOfBytes); - } catch (EndOfStreamException) { - Console.WriteLine("Stream ended"); - } - } - - return buffer; - } - public static byte[] ReadFromByteArray(byte[] input, long readFrom = 0, long numberOfBytes = 0) { - byte[] buffer = null; - - using (BinaryReader reader = new BinaryReader(new MemoryStream(input))) { - reader.BaseStream.Position = readFrom; - - try { - if (numberOfBytes == 0) { - buffer = reader.ReadBytes((int)(input.Length - reader.BaseStream.Position)); - } else { - buffer = reader.ReadBytes((int)numberOfBytes); - } - } catch (EndOfStreamException) { - Console.WriteLine("Stream ended"); - } - } - return buffer; - } - public static int DecompressOverlay(int overlayNumber, bool makeBackup = true) { - string overlayFilePath = GetOverlayPath(overlayNumber); - - if (!File.Exists(overlayFilePath)) { - MessageBox.Show("Overlay to decompress #" + overlayNumber + " doesn't exist", - "Overlay not found", MessageBoxButtons.OK, MessageBoxIcon.Error); - return ERR_OVERLAY_NOTFOUND; - } - - if (makeBackup) { - if (File.Exists(overlayFilePath + backupSuffix)) { - File.Delete(overlayFilePath + backupSuffix); - } - File.Copy(overlayFilePath, overlayFilePath + backupSuffix); - } - - Process unpack = new Process(); - unpack.StartInfo.FileName = @"Tools\blz.exe"; - String arguments = "-d " + '"' + overlayFilePath + '"'; - unpack.StartInfo.Arguments = arguments; - Application.DoEvents(); - unpack.StartInfo.WindowStyle = ProcessWindowStyle.Normal; - unpack.StartInfo.CreateNoWindow = false; - unpack.Start(); - unpack.WaitForExit(); - return unpack.ExitCode; - } - public static int CompressOverlay(int overlayNumber) { - string overlayFilePath = GetOverlayPath(overlayNumber); - - if (!File.Exists(overlayFilePath)) { - MessageBox.Show("Overlay to decompress #" + overlayNumber + " doesn't exist", - "Overlay not found", MessageBoxButtons.OK, MessageBoxIcon.Error); - return ERR_OVERLAY_NOTFOUND; - } - - Process compress = new Process(); - compress.StartInfo.FileName = @"Tools\blz.exe"; - compress.StartInfo.Arguments = "-en " + '"' + overlayFilePath + '"'; - Application.DoEvents(); - compress.StartInfo.WindowStyle = ProcessWindowStyle.Hidden; - compress.StartInfo.CreateNoWindow = true; - compress.Start(); - compress.WaitForExit(); - return compress.ExitCode; - } - public static string GetOverlayPath(int overlayNumber) { - return RomInfo.workDir + "overlay" + "\\" + "overlay_" + overlayNumber.ToString("D4") + ".bin"; - } - public static void RestoreOverlayFromCompressedBackup(int overlayNumber, bool eventEditorIsReady) { - String overlayFilePath = GetOverlayPath(overlayNumber); - - if (File.Exists(overlayFilePath + backupSuffix)) { - if (new FileInfo(overlayFilePath).Length <= new FileInfo(overlayFilePath + backupSuffix).Length) { //if overlay is bigger than its backup - Console.WriteLine("Overlay " + overlayNumber + " is already compressed."); - return; - } else { - File.Delete(overlayFilePath); - File.Move(overlayFilePath + backupSuffix, overlayFilePath); - } - } else { - string msg = "Overlay File " + '"' + overlayFilePath + backupSuffix + '"' + " couldn't be found and restored."; - Console.WriteLine(msg); - - if (eventEditorIsReady) { - MessageBox.Show(msg, "Can't restore overlay from backup", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - } - - /** - * Only checks if the overlay is CONFIGURED as compressed - **/ - public static bool CheckOverlayHasCompressionFlag(int ovNumber) { - using (BinaryReader f = new BinaryReader(File.OpenRead(RomInfo.overlayTablePath))) { - f.BaseStream.Position = ovNumber * 32 + 31; //overlayNumber * size of entry + offset - return f.ReadByte() % 2 != 0; - } - } - - /** - * Checks the actual size of the overlay file - **/ - public static bool OverlayIsCompressed(int ovNumber) { - return (new FileInfo(GetOverlayPath(ovNumber)).Length < GetOverlayUncompressedSize(ovNumber)); - } - public static uint GetOverlayUncompressedSize(int ovNumber) { - using (BinaryReader f = new BinaryReader(File.OpenRead(RomInfo.overlayTablePath))) { - f.BaseStream.Position = ovNumber * 32 + 8; //overlayNumber * size of entry + offset - return f.ReadUInt32(); - } - } - public static uint GetOverlayRAMAddress(int ovNumber) { - using (BinaryReader f = new BinaryReader(File.OpenRead(RomInfo.overlayTablePath))) { - f.BaseStream.Position = ovNumber * 32 + 4; //overlayNumber * size of entry + offset - return f.ReadUInt32(); - } - } - public static void SetOverlayCompressionInTable(int ovNumber, byte compressStatus) { - if (compressStatus < 0 || compressStatus > 3) { - Console.WriteLine("Compression status " + compressStatus + " is invalid. No operation performed."); - return; - } - using (BinaryWriter f = new BinaryWriter(File.OpenWrite(RomInfo.overlayTablePath))) { - f.BaseStream.Position = ovNumber * 32 + 31; //overlayNumber * size of entry + offset - f.Write(compressStatus); - } - } - public static void RepackROM(string ndsFileName) { - Process repack = new Process(); - repack.StartInfo.FileName = @"Tools\ndstool.exe"; - repack.StartInfo.Arguments = "-c " + '"' + ndsFileName + '"' - + " -9 " + '"' + RomInfo.arm9Path + '"' - + " -7 " + '"' + RomInfo.workDir + "arm7.bin" + '"' - + " -y9 " + '"' + RomInfo.workDir + "y9.bin" + '"' - + " -y7 " + '"' + RomInfo.workDir + "y7.bin" + '"' - + " -d " + '"' + RomInfo.workDir + "data" + '"' - + " -y " + '"' + RomInfo.workDir + "overlay" + '"' - + " -t " + '"' + RomInfo.workDir + "banner.bin" + '"' - + " -h " + '"' + RomInfo.workDir + "header.bin" + '"'; - - Application.DoEvents(); - repack.StartInfo.WindowStyle = ProcessWindowStyle.Hidden; - repack.StartInfo.CreateNoWindow = true; - repack.Start(); - repack.WaitForExit(); - } - - public static byte[] StringToByteArray(String hex) { - //Ummm what? - int NumberChars = hex.Length; - byte[] bytes = new byte[NumberChars / 2]; - for (int i = 0; i < NumberChars; i += 2) - bytes[i / 2] = Convert.ToByte(hex.Substring(i, 2), 16); - return bytes; - } - public static byte[] HexStringToByteArray(string hexString) { - //FC B5 05 48 C0 46 41 21 - //09 22 02 4D A8 47 00 20 - //03 21 FC BD F1 64 00 02 - //00 80 3C 02 - if (hexString is null) - return null; - - hexString = hexString.Trim(); - - byte[] b = new byte[hexString.Length / 3 + 1]; - for (int i = 0; i < hexString.Length; i += 2) { - if (hexString[i] == ' ') { - hexString = hexString.Substring(1, hexString.Length - 1); - } - - b[i / 2] = Convert.ToByte(hexString.Substring(i, 2), 16); - } - return b; - } - - public static void TryUnpackNarcs(List IDs) { - Parallel.ForEach(IDs, id => { - if (!RomInfo.gameDirs.TryGetValue(id, out (string packedPath, string unpackedPath) paths)) { - return; - } - - DirectoryInfo di = new DirectoryInfo(paths.unpackedPath); - - if (di.Exists && di.GetFiles().Length != 0) { - return; - } - - Narc opened = Narc.Open(paths.packedPath); - - if (opened is null) { - throw new NullReferenceException(); - } - - opened.ExtractToFolder(paths.unpackedPath); - }); - } - - public static void ForceUnpackNarcs(List IDs) { - Parallel.ForEach(IDs, id => { - if (gameDirs.TryGetValue(id, out (string packedPath, string unpackedPath) paths)) { - Narc opened = Narc.Open(paths.packedPath); - - if (opened is null) { - throw new NullReferenceException(); - } - - opened.ExtractToFolder(paths.unpackedPath); - } - }); - } - - public static byte[] GetModelWithoutTextures(byte[] modelFile) { - byte[] nsbmdHeaderData; - uint mdl0Size; - byte[] mdl0Data; - - using (BinaryReader modelReader = new BinaryReader(new MemoryStream(modelFile))) { - modelReader.BaseStream.Position = 0x0; - nsbmdHeaderData = modelReader.ReadBytes(0x8); - - modelReader.BaseStream.Position = 0x1C; - mdl0Size = modelReader.ReadUInt32(); // Read mdl0 file size - - modelReader.BaseStream.Position = 0x18; - mdl0Data = modelReader.ReadBytes((int)mdl0Size); - } - - MemoryStream output = new MemoryStream(); - using (BinaryWriter writer = new BinaryWriter(output)) { - - writer.Write(nsbmdHeaderData); // Write first header bytes, same for all NSBMD. - writer.Write(mdl0Size + 0x14); - writer.Write((short)0x10); // Writes BMD0 header size (always 16) - writer.Write((short)0x1); // Write new number of sub-files, since embedded textures are removed - writer.Write((uint)0x14); // Writes new start offset of MDL0 - - writer.Write(mdl0Data); // Writes MDL0; - } - return output.ToArray(); - } - - public static byte[] GetTexturesFromTexturedNSBMD(byte[] modelFile) { - using (BinaryReader byteArrReader = new BinaryReader(new MemoryStream(modelFile))) { - byteArrReader.BaseStream.Position = 14; - if (byteArrReader.ReadUInt16() < 2) //No textures - return new byte[0]; - - byteArrReader.BaseStream.Position = 20; - int texAbsoluteOffset = byteArrReader.ReadInt32(); - - byteArrReader.BaseStream.Position = texAbsoluteOffset + 4; - uint textureSize = byteArrReader.ReadUInt32(); - - byte[] nsbtxHeader = DSUtils.BuildNSBTXHeader(20 + textureSize); - byte[] texData = DSUtils.ReadFromByteArray(modelFile, readFrom: texAbsoluteOffset); - - byte[] output = new byte[nsbtxHeader.Length + texData.Length]; - Buffer.BlockCopy(nsbtxHeader, 0, output, 0, nsbtxHeader.Length); - Buffer.BlockCopy(texData, 0, output, nsbtxHeader.Length, texData.Length); - return output; - } - } - public static int CheckNSBMDHeader(byte[] modelFile) { - using (BinaryReader byteArrReader = new BinaryReader(new MemoryStream(modelFile))) { - if (byteArrReader.ReadUInt32() != NSBMD.NDS_TYPE_BMD0) { - MessageBox.Show("Please select an NSBMD file.", "Invalid File", MessageBoxButtons.OK, MessageBoxIcon.Error); - return -1; - } - - byteArrReader.BaseStream.Position = 0xE; - return byteArrReader.ReadInt16() >= 2 ? NSBMD_HAS_TEXTURE : NSBMD_DOESNTHAVE_TEXTURE; - } - } - public static byte[] BuildNSBTXHeader(uint texturesSize) { - MemoryStream ms = new MemoryStream(); - - using (BinaryWriter bw = new BinaryWriter(ms)) { - bw.Write(Encoding.UTF8.GetBytes("BTX0")); // Write magic code BTX0 - bw.Write((ushort)0xFEFF); // Byte order - bw.Write((ushort)0x0001); // ??? - bw.Write(texturesSize); // Write size of textures block - bw.Write((short)0x10); //Header size - bw.Write((short)0x01); //Number of sub-files??? - bw.Write((uint)0x14); // Offset to sub-file - } - return ms.ToArray(); - } - public static byte[] BuildNSBMDwithTextures(byte[] nsbmd, byte[] nsbtx) { - byte[] wholeMDL0 = GetFirstBlock(nsbmd); - byte[] wholeTEX0 = GetFirstBlock(nsbtx); - - MemoryStream ms = new MemoryStream(); - using (BinaryWriter msWriter = new BinaryWriter(ms)) { - msWriter.Write(NSBMD.NDS_TYPE_BMD0); - msWriter.Write(NSBMD.NDS_TYPE_BYTEORDER); - msWriter.Write(NSBMD.NDS_TYPE_UNK2); - - ushort nBlocks = 2; - uint modelLength = (uint)(wholeMDL0.Length + NSBMD.HEADERSIZE + 4 * nBlocks); - msWriter.Write((uint)(modelLength + wholeTEX0.Length)); - msWriter.Write(NSBMD.HEADERSIZE); //Header size, always 16 - msWriter.Write(nBlocks); //Number of blocks, now it's 2 because we are inserting textures - - msWriter.Write((uint)(msWriter.BaseStream.Position + 4 * nBlocks)); //Absolute offset to model data. We are gonna have to write two offsets - - msWriter.Write(modelLength); //Copy offset to TEX0 - msWriter.Write(wholeMDL0); - msWriter.Write(wholeTEX0); - } - return ms.ToArray(); - } - private static byte[] GetFirstBlock(byte[] NSBFile) { - int blockSize; - uint offsetToMainBlock; - using (BinaryReader reader = new BinaryReader(new MemoryStream(NSBFile))) { - reader.BaseStream.Position = 16; - offsetToMainBlock = reader.ReadUInt32(); - - reader.BaseStream.Position = offsetToMainBlock + 4; - blockSize = reader.ReadInt32(); - } - byte[] blockData = new byte[blockSize]; - Buffer.BlockCopy(NSBFile, (int)offsetToMainBlock, blockData, 0, blockSize); - - return blockData; - } - - public static Image GetPokePic(int species, int w, int h) { - PaletteBase paletteBase; - bool fiveDigits = false; // some extreme future proofing - string filename = "0000"; - - try { - paletteBase = new NCLR(gameDirs[DirNames.monIcons].unpackedDir + "\\" + filename, 0, filename); - } catch (FileNotFoundException) { - filename += '0'; - paletteBase = new NCLR(gameDirs[DirNames.monIcons].unpackedDir + "\\" + filename, 0, filename); - fiveDigits = true; - } - - // read arm9 table to grab pal ID - int paletteId = 0; - string iconTablePath; - - int iconPalTableOffsetFromFileStart; - string ov129path = DSUtils.GetOverlayPath(129); - if (File.Exists(ov129path)) { - // if overlay 129 exists, read it from there - iconPalTableOffsetFromFileStart = (int)(RomInfo.monIconPalTableAddress - DSUtils.GetOverlayRAMAddress(129)); - iconTablePath = ov129path; - } else if ((int)(RomInfo.monIconPalTableAddress - RomInfo.synthOverlayLoadAddress) >= 0) { - // if there is a synthetic overlay, read it from there - iconPalTableOffsetFromFileStart = (int)(RomInfo.monIconPalTableAddress - RomInfo.synthOverlayLoadAddress); - iconTablePath = gameDirs[DirNames.synthOverlay].unpackedDir + "\\" + ROMToolboxDialog.expandedARMfileID.ToString("D4"); - } else { - // default handling - iconPalTableOffsetFromFileStart = (int)(RomInfo.monIconPalTableAddress - DSUtils.ARM9.address); - iconTablePath = RomInfo.arm9Path; - } - - using (DSUtils.EasyReader idReader = new DSUtils.EasyReader(iconTablePath, iconPalTableOffsetFromFileStart + species)) { - paletteId = idReader.ReadByte(); - } - - if (paletteId != 0) { - paletteBase.Palette[0] = paletteBase.Palette[paletteId]; // update pal 0 to be the new pal - } - - // grab tiles - int spriteFileID = species + 7; - string spriteFilename = spriteFileID.ToString("D" + (fiveDigits ? "5" : "4")); - ImageBase imageBase = new NCGR(gameDirs[DirNames.monIcons].unpackedDir + "\\" + spriteFilename, spriteFileID, spriteFilename); - - // grab sprite - int ncerFileId = 2; - string ncerFileName = ncerFileId.ToString("D" + (fiveDigits ? "5" : "4")); - SpriteBase spriteBase = new NCER(gameDirs[DirNames.monIcons].unpackedDir + "\\" + ncerFileName, 2, ncerFileName); - - // copy this from the trainer - int bank0OAMcount = spriteBase.Banks[0].oams.Length; - int[] OAMenabled = new int[bank0OAMcount]; - for (int i = 0; i < OAMenabled.Length; i++) { - OAMenabled[i] = i; - } - - // finally compose image - try { - return spriteBase.Get_Image(imageBase, paletteBase, 0, w, h, false, false, false, true, true, -1, OAMenabled); - } catch (FormatException) { - return Properties.Resources.IconPokeball; - } - } - } -} diff --git a/DS_Map/DSUtils/ARM9.cs b/DS_Map/DSUtils/ARM9.cs new file mode 100644 index 0000000..7590d2d --- /dev/null +++ b/DS_Map/DSUtils/ARM9.cs @@ -0,0 +1,62 @@ +using System; +using System.Diagnostics; +using System.IO; +using static DSPRE.RomInfo; + +namespace DSPRE { + public static class ARM9 { + private const int MAX_SIZE = 0xBC000; + public static readonly uint address = 0x02000000; + public class Reader : DSUtils.EasyReader { + public Reader(long pos = 0) : base(arm9Path, pos) { + this.BaseStream.Position = pos; + } + } + public class Writer : DSUtils.EasyWriter { + public Writer(long pos = 0) : base(arm9Path, pos) { + this.BaseStream.Position = pos; + } + } + public static void EditSize(int increment) { + using (Writer w = new Writer()) { + w.EditSize(increment); + } + } + public static bool Decompress(string path) { + Process decompress = DSUtils.CreateDecompressProcess(path); + decompress.Start(); + decompress.WaitForExit(); + + return new FileInfo(path).Length > MAX_SIZE; + } + + public static bool Compress(string path) { + Process compress = new Process(); + compress.StartInfo.FileName = @"Tools\blz.exe"; + compress.StartInfo.Arguments = @" -en9 " + '"' + path + '"'; + compress.StartInfo.WindowStyle = ProcessWindowStyle.Hidden; + compress.StartInfo.CreateNoWindow = true; + compress.Start(); + compress.WaitForExit(); + + return new FileInfo(path).Length <= MAX_SIZE; + } + public static bool CheckCompressionMark() { + return BitConverter.ToInt32(ReadBytes((uint)(RomInfo.gameFamily == gFamEnum.DP ? 0xB7C : 0xBB4), 4), 0) != 0; + } + + public static byte[] ReadBytes(uint startOffset, long numberOfBytes = 0) { + return DSUtils.ReadFromFile(RomInfo.arm9Path, startOffset, numberOfBytes); + } + public static void WriteBytes(byte[] bytesToWrite, uint destOffset, int indexFirstByteToWrite = 0, int? indexLastByteToWrite = null) { + DSUtils.WriteToFile(RomInfo.arm9Path, bytesToWrite, destOffset, indexFirstByteToWrite, indexLastByteToWrite); + } + + public static byte ReadByte(uint startOffset) { + return DSUtils.ReadFromFile(RomInfo.arm9Path, startOffset, 1)[0]; + } + public static void WriteByte(byte value, uint destOffset) { + DSUtils.WriteToFile(RomInfo.arm9Path, BitConverter.GetBytes(value), destOffset, 0); + } + } +} \ No newline at end of file diff --git a/DS_Map/DSUtils/DSUtils.cs b/DS_Map/DSUtils/DSUtils.cs new file mode 100644 index 0000000..7322932 --- /dev/null +++ b/DS_Map/DSUtils/DSUtils.cs @@ -0,0 +1,232 @@ +using Ekona.Images; +using Images; +using LibNDSFormats.NSBMD; +using Microsoft.WindowsAPICodePack.Dialogs; +using NarcAPI; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Drawing; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using static DSPRE.RomInfo; + +namespace DSPRE { + public static class DSUtils { + + public const int ERR_OVERLAY_NOTFOUND = -1; + public const int ERR_OVERLAY_ALREADY_UNCOMPRESSED = -2; + + public const string backupSuffix = ".backup"; + + public static readonly string NDSRomFilter = "NDS File (*.nds)|*.nds"; + public class EasyReader : BinaryReader { + public EasyReader(string path, long pos = 0) : base(File.OpenRead(path)) { + this.BaseStream.Position = pos; + } + } + public class EasyWriter : BinaryWriter { + public EasyWriter(string path, long pos = 0, FileMode fmode = FileMode.OpenOrCreate) : base(new FileStream(path, fmode, FileAccess.Write, FileShare.None)) { + this.BaseStream.Position = pos; + } + public void EditSize(int increment) { + this.BaseStream.SetLength(this.BaseStream.Length + increment); + } + } + + public static void WriteToFile(string filepath, byte[] toOutput, uint writeAt = 0, int indexFirstByteToWrite = 0, int? indexLastByteToWrite = null, FileMode fmode = FileMode.OpenOrCreate) { + using (EasyWriter writer = new EasyWriter(filepath, writeAt, fmode)) { + writer.Write(toOutput, indexFirstByteToWrite, indexLastByteToWrite is null ? toOutput.Length - indexFirstByteToWrite : (int)indexLastByteToWrite); + } + } + public static byte[] ReadFromFile(string filepath, long startOffset = 0, long numberOfBytes = 0) { + byte[] buffer = null; + + using (EasyReader reader = new EasyReader(filepath, startOffset)) { + try { + buffer = reader.ReadBytes(numberOfBytes == 0 ? (int)(reader.BaseStream.Length - reader.BaseStream.Position) : (int)numberOfBytes); + } catch (EndOfStreamException) { + Console.WriteLine("Stream ended"); + } + } + + return buffer; + } + public static byte[] ReadFromByteArray(byte[] input, long readFrom = 0, long numberOfBytes = 0) { + byte[] buffer = null; + + using (BinaryReader reader = new BinaryReader(new MemoryStream(input))) { + reader.BaseStream.Position = readFrom; + + try { + if (numberOfBytes == 0) { + buffer = reader.ReadBytes((int)(input.Length - reader.BaseStream.Position)); + } else { + buffer = reader.ReadBytes((int)numberOfBytes); + } + } catch (EndOfStreamException) { + Console.WriteLine("Stream ended"); + } + } + return buffer; + } + public static Process CreateDecompressProcess(string path) { + Process decompress = new Process(); + decompress.StartInfo.FileName = @"Tools\blz.exe"; + decompress.StartInfo.Arguments = @" -d " + '"' + path + '"'; + decompress.StartInfo.WindowStyle = ProcessWindowStyle.Hidden; + decompress.StartInfo.CreateNoWindow = true; + return decompress; + + } + + public static void RepackROM(string ndsFileName) { + Process repack = new Process(); + repack.StartInfo.FileName = @"Tools\ndstool.exe"; + repack.StartInfo.Arguments = "-c " + '"' + ndsFileName + '"' + + " -9 " + '"' + RomInfo.arm9Path + '"' + + " -7 " + '"' + RomInfo.workDir + "arm7.bin" + '"' + + " -y9 " + '"' + RomInfo.workDir + "y9.bin" + '"' + + " -y7 " + '"' + RomInfo.workDir + "y7.bin" + '"' + + " -d " + '"' + RomInfo.workDir + "data" + '"' + + " -y " + '"' + RomInfo.workDir + "overlay" + '"' + + " -t " + '"' + RomInfo.workDir + "banner.bin" + '"' + + " -h " + '"' + RomInfo.workDir + "header.bin" + '"'; + + Application.DoEvents(); + repack.StartInfo.WindowStyle = ProcessWindowStyle.Hidden; + repack.StartInfo.CreateNoWindow = true; + repack.Start(); + repack.WaitForExit(); + } + + public static byte[] StringToByteArray(String hex) { + //Ummm what? + int NumberChars = hex.Length; + byte[] bytes = new byte[NumberChars / 2]; + for (int i = 0; i < NumberChars; i += 2) + bytes[i / 2] = Convert.ToByte(hex.Substring(i, 2), 16); + return bytes; + } + public static byte[] HexStringToByteArray(string hexString) { + //FC B5 05 48 C0 46 41 21 + //09 22 02 4D A8 47 00 20 + //03 21 FC BD F1 64 00 02 + //00 80 3C 02 + if (hexString is null) + return null; + + hexString = hexString.Trim(); + + byte[] b = new byte[hexString.Length / 3 + 1]; + for (int i = 0; i < hexString.Length; i += 2) { + if (hexString[i] == ' ') { + hexString = hexString.Substring(1, hexString.Length - 1); + } + + b[i / 2] = Convert.ToByte(hexString.Substring(i, 2), 16); + } + return b; + } + + public static void TryUnpackNarcs(List IDs) { + Parallel.ForEach(IDs, id => { + if (gameDirs.TryGetValue(id, out (string packedPath, string unpackedPath) paths)) { + DirectoryInfo di = new DirectoryInfo(paths.unpackedPath); + + if (!di.Exists || di.GetFiles().Length == 0) { + Narc opened = Narc.Open(paths.packedPath); + + if (opened is null) { + throw new NullReferenceException(); + } + + opened.ExtractToFolder(paths.unpackedPath); + } + } + }); + } + public static void ForceUnpackNarcs(List IDs) { + Parallel.ForEach(IDs, id => { + if (gameDirs.TryGetValue(id, out (string packedPath, string unpackedPath) paths)) { + Narc opened = Narc.Open(paths.packedPath); + + if (opened is null) { + throw new NullReferenceException(); + } + + opened.ExtractToFolder(paths.unpackedPath); + } + }); + } + + public static Image GetPokePic(int species, int w, int h) { + PaletteBase paletteBase; + bool fiveDigits = false; // some extreme future proofing + string filename = "0000"; + + try { + paletteBase = new NCLR(gameDirs[DirNames.monIcons].unpackedDir + "\\" + filename, 0, filename); + } catch (FileNotFoundException) { + filename += '0'; + paletteBase = new NCLR(gameDirs[DirNames.monIcons].unpackedDir + "\\" + filename, 0, filename); + fiveDigits = true; + } + + // read arm9 table to grab pal ID + int paletteId = 0; + string iconTablePath; + + int iconPalTableOffsetFromFileStart; + string ov129path = OverlayUtils.GetPath(129); + if (File.Exists(ov129path)) { + // if overlay 129 exists, read it from there + iconPalTableOffsetFromFileStart = (int)(RomInfo.monIconPalTableAddress - OverlayUtils.OverlayTable.GetRAMAddress(129)); + iconTablePath = ov129path; + } else if ((int)(RomInfo.monIconPalTableAddress - RomInfo.synthOverlayLoadAddress) >= 0) { + // if there is a synthetic overlay, read it from there + iconPalTableOffsetFromFileStart = (int)(RomInfo.monIconPalTableAddress - RomInfo.synthOverlayLoadAddress); + iconTablePath = gameDirs[DirNames.synthOverlay].unpackedDir + "\\" + PatchToolboxDialog.expandedARMfileID.ToString("D4"); + } else { + // default handling + iconPalTableOffsetFromFileStart = (int)(RomInfo.monIconPalTableAddress - ARM9.address); + iconTablePath = RomInfo.arm9Path; + } + + using (DSUtils.EasyReader idReader = new DSUtils.EasyReader(iconTablePath, iconPalTableOffsetFromFileStart + species)) { + paletteId = idReader.ReadByte(); + } + + if (paletteId != 0) { + paletteBase.Palette[0] = paletteBase.Palette[paletteId]; // update pal 0 to be the new pal + } + + // grab tiles + int spriteFileID = species + 7; + string spriteFilename = spriteFileID.ToString("D" + (fiveDigits ? "5" : "4")); + ImageBase imageBase = new NCGR(gameDirs[DirNames.monIcons].unpackedDir + "\\" + spriteFilename, spriteFileID, spriteFilename); + + // grab sprite + int ncerFileId = 2; + string ncerFileName = ncerFileId.ToString("D" + (fiveDigits ? "5" : "4")); + SpriteBase spriteBase = new NCER(gameDirs[DirNames.monIcons].unpackedDir + "\\" + ncerFileName, 2, ncerFileName); + + // copy this from the trainer + int bank0OAMcount = spriteBase.Banks[0].oams.Length; + int[] OAMenabled = new int[bank0OAMcount]; + for (int i = 0; i < OAMenabled.Length; i++) { + OAMenabled[i] = i; + } + + // finally compose image + try { + return spriteBase.Get_Image(imageBase, paletteBase, 0, w, h, false, false, false, true, true, -1, OAMenabled); + } catch (FormatException) { + return Properties.Resources.IconPokeball; + } + } + } +} \ No newline at end of file diff --git a/DS_Map/DSUtils/ModelUtils.cs b/DS_Map/DSUtils/ModelUtils.cs new file mode 100644 index 0000000..b9232bc --- /dev/null +++ b/DS_Map/DSUtils/ModelUtils.cs @@ -0,0 +1,139 @@ +using Microsoft.WindowsAPICodePack.Dialogs; +using System.Diagnostics; +using System.IO; +using System.Windows.Forms; + +namespace DSPRE { + public static class ModelUtils { + + public static void ModelToDAE(string modelName, byte[] modelData, byte[] textureData) { + MessageBox.Show("Choose output folder.\nDSPRE will automatically create a sub-folder in it.", "Awaiting user input", MessageBoxButtons.OK, MessageBoxIcon.Information); + + CommonOpenFileDialog cofd = new CommonOpenFileDialog { + IsFolderPicker = true, + Multiselect = false + }; + if (cofd.ShowDialog() != CommonFileDialogResult.Ok) { + return; + } + + string outDir = Path.Combine(cofd.FileName, modelName); + + if (Directory.Exists(outDir)) { + if (Directory.GetFiles(outDir).Length > 0) { + DialogResult d = MessageBox.Show($"Directory \"{outDir}\" already exists and is not empty.\nIts contents will be lost.\n\nDo you want to proceed?", "Directory not empty", MessageBoxButtons.YesNo, MessageBoxIcon.Question); + + if (d.Equals(DialogResult.No)) { + return; + } else { + Directory.Delete(outDir, recursive: true); + } + } else { + Directory.Delete(outDir, recursive: true); + } + } + string tempNSBMDPath = outDir + "_temp.nsbmd"; + + if (textureData != null && textureData.Length > 0) { + modelData = NSBUtils.BuildNSBMDwithTextures(modelData, textureData); + } + + File.WriteAllBytes(tempNSBMDPath, modelData); + + /* Check correct creation of temp NSBMD file*/ + if (!File.Exists(tempNSBMDPath)) { + MessageBox.Show("Expected NSBMD file could not be found.\nAborting", "Error", MessageBoxButtons.OK, MessageBoxIcon.Information); + return; + } + + Process apicula = new Process(); + apicula.StartInfo.FileName = @"Tools\apicula.exe"; + apicula.StartInfo.Arguments = $" convert \"{tempNSBMDPath}\" --output \"{outDir}\""; + apicula.StartInfo.WindowStyle = ProcessWindowStyle.Hidden; + apicula.StartInfo.CreateNoWindow = true; + apicula.Start(); + apicula.WaitForExit(); + + if (File.Exists(tempNSBMDPath)) { + File.Delete(tempNSBMDPath); + + if (File.Exists(tempNSBMDPath)) { + MessageBox.Show("Temporary NSBMD file deletion failed.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); + } + } else { + MessageBox.Show("Temporary NSBMD file corresponding to this map disappeared.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Warning); + } + + if (apicula.ExitCode == 0) { + MessageBox.Show("NSBMD was exported and converted successfully!", "Operation successful", MessageBoxButtons.OK, MessageBoxIcon.Information); + } else { + MessageBox.Show("NSBMD to DAE conversion failed.", "Apicula error", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + public static void ModelToGLB(string modelName, byte[] modelData, byte[] textureData) { + MessageBox.Show("Choose output folder.\nDSPRE will automatically create a sub-folder in it.", "Awaiting user input", MessageBoxButtons.OK, MessageBoxIcon.Information); + + CommonOpenFileDialog cofd = new CommonOpenFileDialog { + IsFolderPicker = true, + Multiselect = false + }; + if (cofd.ShowDialog() != CommonFileDialogResult.Ok) { + return; + } + + string outDir = Path.Combine(cofd.FileName, modelName); + + if (Directory.Exists(outDir)) { + if (Directory.GetFiles(outDir).Length > 0) { + DialogResult d = MessageBox.Show($"Directory \"{outDir}\" already exists and is not empty.\nIts contents will be lost.\n\nDo you want to proceed?", "Directory not empty", MessageBoxButtons.YesNo, MessageBoxIcon.Question); + + if (d.Equals(DialogResult.No)) { + return; + } else { + Directory.Delete(outDir, recursive: true); + } + } else { + Directory.Delete(outDir, recursive: true); + } + } + string tempNSBMDPath = outDir + "_temp.nsbmd"; + + if (textureData != null && textureData.Length > 0) { + modelData = NSBUtils.BuildNSBMDwithTextures(modelData, textureData); + } + + File.WriteAllBytes(tempNSBMDPath, modelData); + + /* Check correct creation of temp NSBMD file*/ + if (!File.Exists(tempNSBMDPath)) { + MessageBox.Show("NSBMD file corresponding to this map could not be found.\nAborting", "Error", MessageBoxButtons.OK, MessageBoxIcon.Information); + return; + } + + Process apicula = new Process(); + apicula.StartInfo.FileName = @"Tools\apicula.exe"; + apicula.StartInfo.Arguments = $" convert \"{tempNSBMDPath}\" -f glb --output \"{outDir}\""; + apicula.StartInfo.WindowStyle = ProcessWindowStyle.Hidden; + apicula.StartInfo.CreateNoWindow = true; + apicula.Start(); + apicula.WaitForExit(); + + if (File.Exists(tempNSBMDPath)) { + File.Delete(tempNSBMDPath); + + if (File.Exists(tempNSBMDPath)) { + MessageBox.Show("Temporary NSBMD file deletion failed.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); + } + } else { + MessageBox.Show("Temporary NSBMD file corresponding to this map disappeared.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Warning); + } + + if (apicula.ExitCode == 0) { + MessageBox.Show("NSBMD was exported and converted successfully!", "Operation successful", MessageBoxButtons.OK, MessageBoxIcon.Information); + } else { + MessageBox.Show("NSBMD to GLB conversion failed.", "Apicula error", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } +} \ No newline at end of file diff --git a/DS_Map/DSUtils/NSBUtils.cs b/DS_Map/DSUtils/NSBUtils.cs new file mode 100644 index 0000000..3026d8e --- /dev/null +++ b/DS_Map/DSUtils/NSBUtils.cs @@ -0,0 +1,142 @@ +using LibNDSFormats.NSBMD; +using System; +using System.IO; +using System.Text; +using System.Windows.Forms; + +namespace DSPRE { + public static class NSBUtils { + public const int NSBMD_DOESNTHAVE_TEXTURE = 0; + public const int NSBMD_HAS_TEXTURE = 1; + + public static string ReadNSBMDname(BinaryReader reader, long? startPos = null) { + if (startPos != null) { + reader.BaseStream.Position = (long)startPos; + } + + if (reader.ReadUInt32() == NSBMD.NDS_TYPE_MDL0) { //MDL0 + reader.BaseStream.Position += 0x1c; + } else { + reader.BaseStream.Position += 0x1c + 4; + } + + return Encoding.UTF8.GetString(reader.ReadBytes(16)); + } + public static byte[] BuildNSBMDwithTextures(byte[] nsbmd, byte[] nsbtx) { + byte[] wholeMDL0 = GetFirstBlock(nsbmd); + byte[] wholeTEX0 = GetFirstBlock(nsbtx); + + MemoryStream ms = new MemoryStream(); + using (BinaryWriter msWriter = new BinaryWriter(ms)) { + msWriter.Write(NSBMD.NDS_TYPE_BMD0); + msWriter.Write(NSBMD.NDS_TYPE_BYTEORDER); + msWriter.Write(NSBMD.NDS_TYPE_UNK2); + + ushort nBlocks = 2; + uint modelLength = (uint)(wholeMDL0.Length + NSBMD.HEADERSIZE + 4 * nBlocks); + msWriter.Write((uint)(modelLength + wholeTEX0.Length)); + msWriter.Write(NSBMD.HEADERSIZE); //Header size, always 16 + msWriter.Write(nBlocks); //Number of blocks, now it's 2 because we are inserting textures + + msWriter.Write((uint)(msWriter.BaseStream.Position + 4 * nBlocks)); //Absolute offset to model data. We are gonna have to write two offsets + + msWriter.Write(modelLength); //Copy offset to TEX0 + msWriter.Write(wholeMDL0); + msWriter.Write(wholeTEX0); + } + return ms.ToArray(); + } + public static byte[] BuildNSBTXHeader(uint texturesSize) { + MemoryStream ms = new MemoryStream(); + + using (BinaryWriter bw = new BinaryWriter(ms)) { + bw.Write(Encoding.UTF8.GetBytes("BTX0")); // Write magic code BTX0 + bw.Write((ushort)0xFEFF); // Byte order + bw.Write((ushort)0x0001); // ??? + bw.Write(texturesSize); // Write size of textures block + bw.Write((short)0x10); //Header size + bw.Write((short)0x01); //Number of sub-files??? + bw.Write((uint)0x14); // Offset to sub-file + } + return ms.ToArray(); + } + public static int CheckNSBMDHeader(byte[] modelFile) { + using (BinaryReader byteArrReader = new BinaryReader(new MemoryStream(modelFile))) { + if (byteArrReader.ReadUInt32() != NSBMD.NDS_TYPE_BMD0) { + MessageBox.Show("Please select an NSBMD file.", "Invalid File", MessageBoxButtons.OK, MessageBoxIcon.Error); + return -1; + } + + byteArrReader.BaseStream.Position = 0xE; + return byteArrReader.ReadInt16() >= 2 ? NSBMD_HAS_TEXTURE : NSBMD_DOESNTHAVE_TEXTURE; + } + } + + public static byte[] GetModelWithoutTextures(byte[] modelFile) { + byte[] nsbmdHeaderData; + uint mdl0Size; + byte[] mdl0Data; + + using (BinaryReader modelReader = new BinaryReader(new MemoryStream(modelFile))) { + modelReader.BaseStream.Position = 0x0; + nsbmdHeaderData = modelReader.ReadBytes(0x8); + + modelReader.BaseStream.Position = 0x1C; + mdl0Size = modelReader.ReadUInt32(); // Read mdl0 file size + + modelReader.BaseStream.Position = 0x18; + mdl0Data = modelReader.ReadBytes((int)mdl0Size); + } + + MemoryStream output = new MemoryStream(); + using (BinaryWriter writer = new BinaryWriter(output)) { + + writer.Write(nsbmdHeaderData); // Write first header bytes, same for all NSBMD. + writer.Write(mdl0Size + 0x14); + writer.Write((short)0x10); // Writes BMD0 header size (always 16) + writer.Write((short)0x1); // Write new number of sub-files, since embedded textures are removed + writer.Write((uint)0x14); // Writes new start offset of MDL0 + + writer.Write(mdl0Data); // Writes MDL0; + } + return output.ToArray(); + } + + public static byte[] GetTexturesFromTexturedNSBMD(byte[] modelFile) { + using (BinaryReader byteArrReader = new BinaryReader(new MemoryStream(modelFile))) { + byteArrReader.BaseStream.Position = 14; + if (byteArrReader.ReadUInt16() < 2) //No textures + return new byte[0]; + + byteArrReader.BaseStream.Position = 20; + int texAbsoluteOffset = byteArrReader.ReadInt32(); + + byteArrReader.BaseStream.Position = texAbsoluteOffset + 4; + uint textureSize = byteArrReader.ReadUInt32(); + + byte[] nsbtxHeader = NSBUtils.BuildNSBTXHeader(20 + textureSize); + byte[] texData = DSUtils.ReadFromByteArray(modelFile, readFrom: texAbsoluteOffset); + + byte[] output = new byte[nsbtxHeader.Length + texData.Length]; + Buffer.BlockCopy(nsbtxHeader, 0, output, 0, nsbtxHeader.Length); + Buffer.BlockCopy(texData, 0, output, nsbtxHeader.Length, texData.Length); + return output; + } + } + private static byte[] GetFirstBlock(byte[] NSBFile) { + int blockSize; + uint offsetToMainBlock; + using (BinaryReader reader = new BinaryReader(new MemoryStream(NSBFile))) { + reader.BaseStream.Position = 16; + offsetToMainBlock = reader.ReadUInt32(); + + reader.BaseStream.Position = offsetToMainBlock + 4; + blockSize = reader.ReadInt32(); + } + byte[] blockData = new byte[blockSize]; + Buffer.BlockCopy(NSBFile, (int)offsetToMainBlock, blockData, 0, blockSize); + + return blockData; + } + } +} \ No newline at end of file diff --git a/DS_Map/DSUtils/OverlayUtils.cs b/DS_Map/DSUtils/OverlayUtils.cs new file mode 100644 index 0000000..0ad2b11 --- /dev/null +++ b/DS_Map/DSUtils/OverlayUtils.cs @@ -0,0 +1,123 @@ +using System; +using System.Diagnostics; +using System.IO; +using System.Windows.Forms; +using static DSPRE.DSUtils; +using static DSPRE.RomInfo; + +namespace DSPRE { + public static class OverlayUtils { + public static class OverlayTable { + private const int ENTRY_LEN = 32; + + /** + * Only checks if the overlay is CONFIGURED as compressed + **/ + public static bool IsDefaultCompressed(int ovNumber) { + using (DSUtils.EasyReader f = new EasyReader(RomInfo.overlayTablePath, ovNumber * ENTRY_LEN + 31)) { + return (f.ReadByte() & 1) == 1; + } + } + public static void SetDefaultCompressed(int ovNumber, bool compressStatus) { + DSUtils.WriteToFile(RomInfo.overlayTablePath, new byte[] { compressStatus ? (byte)1 : (byte)0 }, (uint)(ovNumber * ENTRY_LEN + 31)); //overlayNumber * size of entry + offset + } + + public static uint GetRAMAddress(int ovNumber) { + using (DSUtils.EasyReader f = new EasyReader(RomInfo.overlayTablePath, ovNumber * ENTRY_LEN + 4)) { + return f.ReadUInt32(); + } + } + public static uint GetUncompressedSize(int ovNumber) { + using (DSUtils.EasyReader f = new EasyReader(RomInfo.overlayTablePath, ovNumber * ENTRY_LEN + 8)) { + return f.ReadUInt32(); + } + } + } + + + public static string GetPath(int overlayNumber) { + return $"{workDir}overlay\\overlay_{overlayNumber:D4}.bin"; + } + + /** + * Checks the actual size of the overlay file + **/ + public static bool IsCompressed(int ovNumber) { + return (new FileInfo(GetPath(ovNumber)).Length < OverlayTable.GetUncompressedSize(ovNumber)); + } + + /** + * Gets number of overlays + **/ + public static long GetNumberOfOverlays() { + using (FileStream fileStream = File.OpenRead(RomInfo.overlayTablePath)) { + // Get the length of the file in bytes + return fileStream.Length / 32; + } + } + + public static void RestoreFromCompressedBackup(int overlayNumber, bool eventEditorIsReady) { + String overlayFilePath = GetPath(overlayNumber); + + if (File.Exists(overlayFilePath + DSUtils.backupSuffix)) { + if (new FileInfo(overlayFilePath).Length <= new FileInfo(overlayFilePath + DSUtils.backupSuffix).Length) { //if overlay is bigger than its backup + Console.WriteLine($"Overlay {overlayNumber} is already compressed."); + return; + } else { + File.Delete(overlayFilePath); + File.Move(overlayFilePath + DSUtils.backupSuffix, overlayFilePath); + } + } else { + string msg = $"Overlay File {overlayFilePath}{DSUtils.backupSuffix} couldn't be found and restored."; + Console.WriteLine(msg); + + if (eventEditorIsReady) { + MessageBox.Show(msg, "Can't restore overlay from backup", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + public static int Compress(int overlayNumber) { + string overlayFilePath = GetPath(overlayNumber); + + if (!File.Exists(overlayFilePath)) { + MessageBox.Show("Overlay to decompress #" + overlayNumber + " doesn't exist", + "Overlay not found", MessageBoxButtons.OK, MessageBoxIcon.Error); + return ERR_OVERLAY_NOTFOUND; + } + + Process compress = new Process(); + compress.StartInfo.FileName = @"Tools\blz.exe"; + compress.StartInfo.Arguments = "-en " + '"' + overlayFilePath + '"'; + Application.DoEvents(); + compress.StartInfo.WindowStyle = ProcessWindowStyle.Hidden; + compress.StartInfo.CreateNoWindow = true; + compress.Start(); + compress.WaitForExit(); + return compress.ExitCode; + } + + public static int Decompress(string overlayFilePath, bool makeBackup = true) { + if (!File.Exists(overlayFilePath)) { + MessageBox.Show($"File to decompress \"{overlayFilePath}\" doesn't exist", + "Overlay not found", MessageBoxButtons.OK, MessageBoxIcon.Error); + return ERR_OVERLAY_NOTFOUND; + } + + if (makeBackup) { + if (File.Exists(overlayFilePath + backupSuffix)) { + File.Delete(overlayFilePath + backupSuffix); + } + File.Copy(overlayFilePath, overlayFilePath + backupSuffix); + } + + Process decompress = DSUtils.CreateDecompressProcess(overlayFilePath); + decompress.Start(); + decompress.WaitForExit(); + return decompress.ExitCode; + } + public static int Decompress(int overlayNumber, bool makeBackup = true) { + return Decompress(GetPath(overlayNumber), makeBackup); + } + + } +} \ No newline at end of file diff --git a/DS_Map/Filesystem.cs b/DS_Map/Filesystem.cs index 3d503ab..53db149 100644 --- a/DS_Map/Filesystem.cs +++ b/DS_Map/Filesystem.cs @@ -33,7 +33,7 @@ namespace DSPRE { } } - public static string expArmPath { get { return Path.Combine(synthOverlay, ROMToolboxDialog.expandedARMfileID.ToString("D4")); } } + public static string expArmPath { get { return Path.Combine(synthOverlay, PatchToolboxDialog.expandedARMfileID.ToString("D4")); } } public static string GetPath(string path, int id, string format = "D4") { return Path.Combine(path, id.ToString(format)); diff --git a/DS_Map/HeaderSearch.cs b/DS_Map/HeaderSearch.cs index ae4d32a..e913965 100644 --- a/DS_Map/HeaderSearch.cs +++ b/DS_Map/HeaderSearch.cs @@ -180,7 +180,7 @@ namespace DSPRE { for (ushort i = startID; i < finalID; i++) { MapHeader h; - if (ROMToolboxDialog.flag_DynamicHeadersPatchApplied || ROMToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { + if (PatchToolboxDialog.flag_DynamicHeadersPatchApplied || PatchToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { h = MapHeader.LoadFromFile(RomInfo.gameDirs[DirNames.dynamicHeaders].unpackedDir + "\\" + i.ToString("D4"), i, 0); } else { h = MapHeader.LoadFromARM9(i); diff --git a/DS_Map/Helpers.cs b/DS_Map/Helpers.cs index 13fa6d0..911cdf9 100644 --- a/DS_Map/Helpers.cs +++ b/DS_Map/Helpers.cs @@ -256,14 +256,14 @@ namespace DSPRE { switch (RomInfo.gameFamily) { case RomInfo.GameFamilies.DP: - iconPalTableBuf = DSUtils.ARM9.ReadBytes(0x6B838, 4); + iconPalTableBuf = ARM9.ReadBytes(0x6B838, 4); break; case RomInfo.GameFamilies.Plat: - iconPalTableBuf = DSUtils.ARM9.ReadBytes(0x79F80, 4); + iconPalTableBuf = ARM9.ReadBytes(0x79F80, 4); break; case RomInfo.GameFamilies.HGSS: default: - iconPalTableBuf = DSUtils.ARM9.ReadBytes(0x74408, 4); + iconPalTableBuf = ARM9.ReadBytes(0x74408, 4); break; } diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index 1fc2c45..ee02185 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -315,13 +315,13 @@ namespace DSPRE { } private void romToolBoxToolStripMenuItem_Click(object sender, EventArgs e) { - using (ROMToolboxDialog window = new ROMToolboxDialog()) { + using (PatchToolboxDialog window = new PatchToolboxDialog()) { window.ShowDialog(); - if (ROMToolboxDialog.flag_standardizedItems && eventEditorIsReady) { + if (PatchToolboxDialog.flag_standardizedItems && eventEditorIsReady) { selectEventComboBox_SelectedIndexChanged(null, null); UpdateItemComboBox(RomInfo.GetItemNames()); } - if (ROMToolboxDialog.flag_DynamicHeadersPatchApplied) { + if (PatchToolboxDialog.flag_DynamicHeadersPatchApplied) { addHeaderBTN.Enabled = true; removeLastHeaderBTN.Enabled = true; } @@ -576,7 +576,7 @@ namespace DSPRE { versionLabel.Text = "Error"; return; } - DSUtils.ARM9.EditSize(-12); + ARM9.EditSize(-12); } catch (IOException) { MessageBox.Show("Can't access temp directory: \n" + RomInfo.workDir + "\nThis might be a temporary issue.\nMake sure no other process is using it and try again.", "Open Error", MessageBoxButtons.OK, MessageBoxIcon.Error); Helpers.statusLabelError("ERROR: Concurrent access to " + RomInfo.workDir); @@ -591,8 +591,8 @@ namespace DSPRE { Helpers.statusLabelMessage("Attempting to unpack NARCs from folder..."); Update(); //for (int i = 0; i < 128; i++) { - // if (DSUtils.OverlayIsCompressed(i)) { - // DSUtils.DecompressOverlay(i); + // if (OverlayUtils.IsCompressed(i)) { + // OverlayUtils.Decompress(i); // } //} ReadROMInitData(); @@ -653,11 +653,11 @@ namespace DSPRE { } private void ReadROMInitData() { - if (DSUtils.ARM9.CheckCompressionMark()) { + if (ARM9.CheckCompressionMark()) { if (!RomInfo.gameFamily.Equals(GameFamilies.HGSS)) { MessageBox.Show("Unexpected compressed ARM9. It is advised that you double check the ARM9."); } - if (!DSUtils.ARM9.Decompress(RomInfo.arm9Path)) { + if (!ARM9.Decompress(RomInfo.arm9Path)) { MessageBox.Show("ARM9 decompression failed. The program can't proceed.\nAborting.", "Error with ARM9 decompression", MessageBoxButtons.OK, MessageBoxIcon.Error); return; @@ -719,7 +719,7 @@ namespace DSPRE { } - if (DSUtils.ARM9.CheckCompressionMark()) { + if (ARM9.CheckCompressionMark()) { Helpers.statusLabelMessage("Awaiting user response..."); DialogResult d = MessageBox.Show("The ARM9 file of this ROM is currently uncompressed, but marked as compressed.\n" + "This will prevent your ROM from working on native hardware.\n\n" + @@ -727,26 +727,26 @@ namespace DSPRE { MessageBoxButtons.YesNo, MessageBoxIcon.Question); if (d == DialogResult.Yes) { - DSUtils.ARM9.WriteBytes(new byte[4] { 0, 0, 0, 0 }, (uint)(RomInfo.gameFamily == GameFamilies.DP ? 0xB7C : 0xBB4)); + ARM9.WriteBytes(new byte[4] { 0, 0, 0, 0 }, (uint)(RomInfo.gameFamily == GameFamilies.DP ? 0xB7C : 0xBB4)); } } - DSUtils.ARM9.WriteBytes(new byte[4] { 0, 0, 0, 0 }, (uint)(RomInfo.gameFamily == GameFamilies.DP ? 0xB7C : 0xBB4)); + ARM9.WriteBytes(new byte[4] { 0, 0, 0, 0 }, (uint)(RomInfo.gameFamily == GameFamilies.DP ? 0xB7C : 0xBB4)); Helpers.statusLabelMessage("Repacking ROM..."); - if (DSUtils.CheckOverlayHasCompressionFlag(1)) { - if (ROMToolboxDialog.overlay1MustBeRestoredFromBackup) { + if (OverlayUtils.OverlayTable.IsDefaultCompressed(1)) { + if (PatchToolboxDialog.overlay1MustBeRestoredFromBackup) { DSUtils.RestoreOverlayFromCompressedBackup(1, eventEditorIsReady); } else { - if (!DSUtils.OverlayIsCompressed(1)) { + if (!OverlayUtils.IsCompressed(1)) { DSUtils.CompressOverlay(1); } } } - if (DSUtils.CheckOverlayHasCompressionFlag(RomInfo.initialMoneyOverlayNumber)) { - if (!DSUtils.OverlayIsCompressed(RomInfo.initialMoneyOverlayNumber)) { + if (OverlayUtils.OverlayTable.IsDefaultCompressed(RomInfo.initialMoneyOverlayNumber)) { + if (!OverlayUtils.IsCompressed(RomInfo.initialMoneyOverlayNumber)) { DSUtils.CompressOverlay(RomInfo.initialMoneyOverlayNumber); } } @@ -755,7 +755,7 @@ namespace DSPRE { Update(); //for (int i = 0; i < 128; i++) { - // if (!DSUtils.OverlayIsCompressed(i)) { + // if (!OverlayUtils.IsCompressed(i)) { // DSUtils.CompressOverlay(i); // } //} @@ -764,8 +764,8 @@ namespace DSPRE { if (RomInfo.gameFamily != GameFamilies.DP && RomInfo.gameFamily != GameFamilies.Plat) { if (eventEditorIsReady) { - if (DSUtils.OverlayIsCompressed(1)) { - DSUtils.DecompressOverlay(1); + if (OverlayUtils.IsCompressed(1)) { + OverlayUtils.Decompress(1); } } } @@ -972,7 +972,7 @@ namespace DSPRE { internalNames = new List(); headerListBoxNames = new List(); int headerCount; - if (ROMToolboxDialog.flag_DynamicHeadersPatchApplied || ROMToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { + if (PatchToolboxDialog.flag_DynamicHeadersPatchApplied || PatchToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { addHeaderBTN.Enabled = true; removeLastHeaderBTN.Enabled = true; headerCount = Directory.GetFiles(RomInfo.gameDirs[DirNames.dynamicHeaders].unpackedDir).Length; @@ -993,7 +993,7 @@ namespace DSPRE { } // Creating a dictionary linking events to headers to fetch header data for Event Editor - if (ROMToolboxDialog.flag_DynamicHeadersPatchApplied || ROMToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { + if (PatchToolboxDialog.flag_DynamicHeadersPatchApplied || PatchToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { for (ushort i = 0; i < internalNames.Count; i++) { MapHeader h = MapHeader.LoadFromFile(RomInfo.gameDirs[DirNames.dynamicHeaders].unpackedDir + "\\" + i.ToString("D4"), i, 0); eventToHeader[h.eventFileID] = i; @@ -1232,7 +1232,7 @@ namespace DSPRE { } /* Check if dynamic headers patch has been applied, and load header from arm9 or a/0/5/0 accordingly */ - if (ROMToolboxDialog.flag_DynamicHeadersPatchApplied || ROMToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { + if (PatchToolboxDialog.flag_DynamicHeadersPatchApplied || PatchToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { currentHeader = MapHeader.LoadFromFile(RomInfo.gameDirs[DirNames.dynamicHeaders].unpackedDir + "\\" + headerNumber.ToString("D4"), headerNumber, 0); } else { currentHeader = MapHeader.LoadFromARM9(headerNumber); @@ -1698,11 +1698,11 @@ namespace DSPRE { } private void saveHeaderButton_Click(object sender, EventArgs e) { /* Check if dynamic headers patch has been applied, and save header to arm9 or a/0/5/0 accordingly */ - if (ROMToolboxDialog.flag_DynamicHeadersPatchApplied || ROMToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { + if (PatchToolboxDialog.flag_DynamicHeadersPatchApplied || PatchToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { DSUtils.WriteToFile(RomInfo.gameDirs[DirNames.dynamicHeaders].unpackedDir + "\\" + currentHeader.ID.ToString("D4"), currentHeader.ToByteArray(), 0, 0, fmode: FileMode.Create); } else { uint headerOffset = (uint)(RomInfo.headerTableOffset + MapHeader.length * currentHeader.ID); - DSUtils.ARM9.WriteBytes(currentHeader.ToByteArray(), headerOffset); + ARM9.WriteBytes(currentHeader.ToByteArray(), headerOffset); } Helpers.DisableHandlers(); @@ -1767,7 +1767,7 @@ namespace DSPRE { /* Check if dynamic headers patch has been applied, and load header from arm9 or a/0/5/0 accordingly */ for (ushort i = 0; i < internalNames.Count; i++) { MapHeader h; - if (ROMToolboxDialog.flag_DynamicHeadersPatchApplied || ROMToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { + if (PatchToolboxDialog.flag_DynamicHeadersPatchApplied || PatchToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { h = MapHeader.LoadFromFile(RomInfo.gameDirs[DirNames.dynamicHeaders].unpackedDir + "\\" + i.ToString("D4"), i, 0); } else { h = MapHeader.LoadFromARM9(i); @@ -1937,11 +1937,11 @@ namespace DSPRE { currentHeader = h; /* Check if dynamic headers patch has been applied, and save header to arm9 or a/0/5/0 accordingly */ - if (ROMToolboxDialog.flag_DynamicHeadersPatchApplied || ROMToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { + if (PatchToolboxDialog.flag_DynamicHeadersPatchApplied || PatchToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { DSUtils.WriteToFile(RomInfo.gameDirs[DirNames.dynamicHeaders].unpackedDir + "\\" + currentHeader.ID.ToString("D4"), currentHeader.ToByteArray(), 0, 0, fmode: FileMode.Create); } else { uint headerOffset = (uint)(RomInfo.headerTableOffset + MapHeader.length * currentHeader.ID); - DSUtils.ARM9.WriteBytes(currentHeader.ToByteArray(), headerOffset); + ARM9.WriteBytes(currentHeader.ToByteArray(), headerOffset); } try { @@ -2651,7 +2651,7 @@ namespace DSPRE { } else if (gameFamily.Equals(GameFamilies.Plat)) { foreach (ushort r in result) { HeaderPt hpt; - if (ROMToolboxDialog.flag_DynamicHeadersPatchApplied || ROMToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { + if (PatchToolboxDialog.flag_DynamicHeadersPatchApplied || PatchToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { hpt = (HeaderPt)MapHeader.LoadFromFile(RomInfo.gameDirs[DirNames.dynamicHeaders].unpackedDir + "\\" + r.ToString("D4"), r, 0); } else { hpt = (HeaderPt)MapHeader.LoadFromARM9(r); @@ -2665,7 +2665,7 @@ namespace DSPRE { } else { foreach (ushort r in result) { HeaderHGSS hgss; - if (ROMToolboxDialog.flag_DynamicHeadersPatchApplied || ROMToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { + if (PatchToolboxDialog.flag_DynamicHeadersPatchApplied || PatchToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { hgss = (HeaderHGSS)MapHeader.LoadFromFile(RomInfo.gameDirs[DirNames.dynamicHeaders].unpackedDir + "\\" + r.ToString("D4"), r, 0); } else { hgss = (HeaderHGSS)MapHeader.LoadFromARM9(r); @@ -2696,7 +2696,7 @@ namespace DSPRE { /* get texture file numbers from area data */ MapHeader h; - if (ROMToolboxDialog.flag_DynamicHeadersPatchApplied || ROMToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { + if (PatchToolboxDialog.flag_DynamicHeadersPatchApplied || PatchToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { h = MapHeader.LoadFromFile(RomInfo.gameDirs[DirNames.dynamicHeaders].unpackedDir + "\\" + headerID.ToString("D4"), headerID, 0); } else { h = MapHeader.LoadFromARM9(headerID); @@ -4905,7 +4905,7 @@ namespace DSPRE { foreach (ushort headerID in result) { HeaderPt hpt; - if (ROMToolboxDialog.flag_DynamicHeadersPatchApplied || ROMToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { + if (PatchToolboxDialog.flag_DynamicHeadersPatchApplied || PatchToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { hpt = (HeaderPt)MapHeader.LoadFromFile(RomInfo.gameDirs[DirNames.dynamicHeaders].unpackedDir + "\\" + headerID.ToString("D4"), headerID, 0); } else { hpt = (HeaderPt)MapHeader.LoadFromARM9(headerID); @@ -5099,7 +5099,7 @@ namespace DSPRE { if (eventMatrix.hasHeadersSection && readGraphicsFromHeader) { ushort headerID = (ushort)eventMatrix.headers[(short)eventMatrixYUpDown.Value, (short)eventMatrixXUpDown.Value]; MapHeader h; - if (ROMToolboxDialog.flag_DynamicHeadersPatchApplied || ROMToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { + if (PatchToolboxDialog.flag_DynamicHeadersPatchApplied || PatchToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { h = MapHeader.LoadFromFile(RomInfo.gameDirs[DirNames.dynamicHeaders].unpackedDir + "\\" + headerID.ToString("D4"), headerID, 0); } else { h = MapHeader.LoadFromARM9(headerID); @@ -5356,9 +5356,9 @@ namespace DSPRE { break; default: // HGSS Overlay 1 must be decompressed in order to read the overworld table - if (DSUtils.CheckOverlayHasCompressionFlag(1)) { - if (DSUtils.OverlayIsCompressed(1)) { - if (DSUtils.DecompressOverlay(1) < 0) { + if (OverlayUtils.OverlayTable.IsDefaultCompressed(1)) { + if (OverlayUtils.IsCompressed(1)) { + if (OverlayUtils.Decompress(1) < 0) { MessageBox.Show("Overlay 1 couldn't be decompressed.\nOverworld sprites in the Event Editor will be " + "displayed incorrectly or not displayed at all.", "Unexpected EOF", MessageBoxButtons.OK, MessageBoxIcon.Error); } @@ -5405,7 +5405,7 @@ namespace DSPRE { /* Add item list to ow item box */ string[] itemNames = RomInfo.GetItemNames(); - if (ROMToolboxDialog.CheckScriptsStandardizedItemNumbers()) { + if (PatchToolboxDialog.CheckScriptsStandardizedItemNumbers()) { UpdateItemComboBox(itemNames); } else { ScriptFile itemScript = new ScriptFile(RomInfo.itemScriptFileNumber); @@ -5668,7 +5668,7 @@ namespace DSPRE { if (eventToHeader.TryGetValue((ushort)selectEventComboBox.SelectedIndex, out ushort mapHeader)) { MapHeader h; - if (ROMToolboxDialog.flag_DynamicHeadersPatchApplied || ROMToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { + if (PatchToolboxDialog.flag_DynamicHeadersPatchApplied || PatchToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { h = MapHeader.LoadFromFile(RomInfo.gameDirs[DirNames.dynamicHeaders].unpackedDir + "\\" + mapHeader.ToString("D4"), mapHeader, 0); } else { h = MapHeader.LoadFromARM9(mapHeader); @@ -6414,7 +6414,7 @@ namespace DSPRE { ushort destHeaderID = (ushort)eventEditorWarpHeaderListBox.SelectedIndex; MapHeader destHeader; - if (ROMToolboxDialog.flag_DynamicHeadersPatchApplied || ROMToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { + if (PatchToolboxDialog.flag_DynamicHeadersPatchApplied || PatchToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { destHeader = MapHeader.LoadFromFile(RomInfo.gameDirs[DirNames.dynamicHeaders].unpackedDir + "\\" + destHeaderID.ToString("D4"), destHeaderID, 0); } else { destHeader = MapHeader.LoadFromARM9(destHeaderID); @@ -6558,7 +6558,7 @@ namespace DSPRE { ushort destHeaderID = (ushort)eventEditorWarpHeaderListBox.SelectedIndex; MapHeader destHeader; - if (ROMToolboxDialog.flag_DynamicHeadersPatchApplied || ROMToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { + if (PatchToolboxDialog.flag_DynamicHeadersPatchApplied || PatchToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { destHeader = MapHeader.LoadFromFile(RomInfo.gameDirs[DirNames.dynamicHeaders].unpackedDir + "\\" + destHeaderID.ToString("D4"), destHeaderID, 0); } else { destHeader = MapHeader.LoadFromARM9(destHeaderID); @@ -7580,12 +7580,12 @@ namespace DSPRE { RomInfo.PrepareCameraData(); cameraEditorDataGridView.Rows.Clear(); - if (DSUtils.CheckOverlayHasCompressionFlag(RomInfo.cameraTblOverlayNumber)) { + if (OverlayUtils.OverlayTable.IsDefaultCompressed(RomInfo.cameraTblOverlayNumber)) { DialogResult d1 = MessageBox.Show("It is STRONGLY recommended to configure Overlay1 as uncompressed before proceeding.\n\n" + "More details in the following dialog.\n\n" + "Do you want to know more?", "Confirm to proceed", MessageBoxButtons.YesNo, MessageBoxIcon.Warning); - bool userConfirmed = (d1 == DialogResult.Yes && ROMToolboxDialog.ConfigureOverlay1Uncompressed()); + bool userConfirmed = (d1 == DialogResult.Yes && PatchToolboxDialog.ConfigureOverlay1Uncompressed()); if (!userConfirmed) { @@ -7593,15 +7593,15 @@ namespace DSPRE { "If you change your mind, you can apply it later by accessing the ROM Toolbox.", "Caution", MessageBoxButtons.OK, MessageBoxIcon.Information); - if (DSUtils.OverlayIsCompressed(RomInfo.cameraTblOverlayNumber)) { - DSUtils.DecompressOverlay(RomInfo.cameraTblOverlayNumber); + if (OverlayUtils.IsCompressed(RomInfo.cameraTblOverlayNumber)) { + OverlayUtils.Decompress(RomInfo.cameraTblOverlayNumber); } } } uint[] RAMaddresses = new uint[RomInfo.cameraTblOffsetsToRAMaddress.Length]; - string camOverlayPath = DSUtils.GetOverlayPath(RomInfo.cameraTblOverlayNumber); + string camOverlayPath = OverlayUtils.GetPath(RomInfo.cameraTblOverlayNumber); using (DSUtils.EasyReader br = new DSUtils.EasyReader(camOverlayPath)) { for (int i = 0; i < RomInfo.cameraTblOffsetsToRAMaddress.Length; i++) { br.BaseStream.Position = RomInfo.cameraTblOffsetsToRAMaddress[i]; @@ -7648,7 +7648,7 @@ namespace DSPRE { } } private void saveCameraTableButton_Click(object sender, EventArgs e) { - SaveCameraTable(DSUtils.GetOverlayPath(RomInfo.cameraTblOverlayNumber), overlayCameraTblOffset); + SaveCameraTable(OverlayUtils.GetPath(RomInfo.cameraTblOverlayNumber), overlayCameraTblOffset); } private void cameraEditorDataGridView_CellValidated(object sender, DataGridViewCellEventArgs e) { currentCameraTable[e.RowIndex][e.ColumnIndex] = cameraEditorDataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].Value; @@ -7766,7 +7766,7 @@ namespace DSPRE { RomInfo.SetEncounterMusicTableOffsetToRAMAddress(); trainerClassEncounterMusicDict = new Dictionary(); - uint encounterMusicTableTableStartAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(RomInfo.encounterMusicTableOffsetToRAMAddress, 4), 0) - DSUtils.ARM9.address; + uint encounterMusicTableTableStartAddress = BitConverter.ToUInt32(ARM9.ReadBytes(RomInfo.encounterMusicTableOffsetToRAMAddress, 4), 0) - ARM9.address; uint entrySize = 4; uint tableSizeOffset = 10; @@ -7776,8 +7776,8 @@ namespace DSPRE { encounterSSEQAltUpDown.Enabled = true; } - byte tableEntriesCount = DSUtils.ARM9.ReadByte(RomInfo.encounterMusicTableOffsetToRAMAddress - tableSizeOffset); - using (DSUtils.ARM9.Reader ar = new DSUtils.ARM9.Reader(encounterMusicTableTableStartAddress)) { + byte tableEntriesCount = ARM9.ReadByte(RomInfo.encounterMusicTableOffsetToRAMAddress - tableSizeOffset); + using (ARM9.Reader ar = new ARM9.Reader(encounterMusicTableTableStartAddress)) { for (int i = 0; i < tableEntriesCount; i++) { uint entryOffset = (uint)ar.BaseStream.Position; byte tclass = (byte)ar.ReadUInt16(); @@ -8311,7 +8311,7 @@ namespace DSPRE { //Expose a smaller limit to the user if (RomInfo.trainerNameLenOffset >= 0) { MessageBox.Show($"Trainer File saved successfully. However:\nYou attempted to save a Trainer whose name exceeds {RomInfo.trainerNameMaxLen-1} characters.\nThis may lead to issues in game." + - (ROMToolboxDialog.flag_TrainerNamesExpanded ? "\n\nIt's recommended that you use a shorter name." : "\n\nRefer to the ROM Toolbox to extend Trainer names."), + (PatchToolboxDialog.flag_TrainerNamesExpanded ? "\n\nIt's recommended that you use a shorter name." : "\n\nRefer to the ROM Toolbox to extend Trainer names."), "Saved successfully, but...", MessageBoxButtons.OK, MessageBoxIcon.Warning); } else { MessageBox.Show($"Trainer File saved successfully. However:\nThe Trainer name length could not be safely determined for this ROM.\n" + @@ -8538,7 +8538,7 @@ namespace DSPRE { ushort eyeMusicID = (ushort)encounterSSEQMainUpDown.Value; if (trainerClassEncounterMusicDict.TryGetValue(b_selectedTrClass, out var dictEntry)) { - DSUtils.ARM9.WriteBytes(BitConverter.GetBytes(eyeMusicID), dictEntry.entryOffset); + ARM9.WriteBytes(BitConverter.GetBytes(eyeMusicID), dictEntry.entryOffset); trainerClassEncounterMusicDict[b_selectedTrClass] = (dictEntry.entryOffset, eyeMusicID, dictEntry.musicN); } @@ -8735,11 +8735,11 @@ namespace DSPRE { RomInfo.SetConditionalMusicTableOffsetToRAMAddress(); conditionalMusicTable = new List<(ushort, ushort, ushort)>(); - conditionalMusicTableStartAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(RomInfo.conditionalMusicTableOffsetToRAMAddress, 4), 0) - DSUtils.ARM9.address; - byte tableEntriesCount = DSUtils.ARM9.ReadByte(RomInfo.conditionalMusicTableOffsetToRAMAddress - 8); + conditionalMusicTableStartAddress = BitConverter.ToUInt32(ARM9.ReadBytes(RomInfo.conditionalMusicTableOffsetToRAMAddress, 4), 0) - ARM9.address; + byte tableEntriesCount = ARM9.ReadByte(RomInfo.conditionalMusicTableOffsetToRAMAddress - 8); conditionalMusicTableListBox.Items.Clear(); - using (DSUtils.ARM9.Reader ar = new DSUtils.ARM9.Reader(conditionalMusicTableStartAddress)) { + using (ARM9.Reader ar = new ARM9.Reader(conditionalMusicTableStartAddress)) { for (int i = 0; i < tableEntriesCount; i++) { ushort header = ar.ReadUInt16(); ushort flag = ar.ReadUInt16(); @@ -8786,25 +8786,25 @@ namespace DSPRE { effectsComboTable = new List<(ushort vsGraph, ushort battleSSEQ)>(); - effectsComboMainTableStartAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(RomInfo.effectsComboTableOffsetToRAMAddress, 4), 0); - ROMToolboxDialog.flag_MainComboTableRepointed = (effectsComboMainTableStartAddress >= RomInfo.synthOverlayLoadAddress); - effectsComboMainTableStartAddress -= ROMToolboxDialog.flag_MainComboTableRepointed ? RomInfo.synthOverlayLoadAddress : DSUtils.ARM9.address; + effectsComboMainTableStartAddress = BitConverter.ToUInt32(ARM9.ReadBytes(RomInfo.effectsComboTableOffsetToRAMAddress, 4), 0); + PatchToolboxDialog.flag_MainComboTableRepointed = (effectsComboMainTableStartAddress >= RomInfo.synthOverlayLoadAddress); + effectsComboMainTableStartAddress -= PatchToolboxDialog.flag_MainComboTableRepointed ? RomInfo.synthOverlayLoadAddress : ARM9.address; byte comboTableEntriesCount; if (RomInfo.gameFamily == GameFamilies.HGSS) { - comboTableEntriesCount = DSUtils.ARM9.ReadByte(RomInfo.effectsComboTableOffsetToSizeLimiter); + comboTableEntriesCount = ARM9.ReadByte(RomInfo.effectsComboTableOffsetToSizeLimiter); vsPokemonEffectsList = new List<(int pokemonID, int comboID)>(); vsTrainerEffectsList = new List<(int trainerClass, int comboID)>(); - vsPokemonTableStartAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(RomInfo.vsPokemonEntryTableOffsetToRAMAddress, 4), 0); - ROMToolboxDialog.flag_PokemonBattleTableRepointed = (vsPokemonTableStartAddress >= RomInfo.synthOverlayLoadAddress); - vsPokemonTableStartAddress -= ROMToolboxDialog.flag_PokemonBattleTableRepointed ? RomInfo.synthOverlayLoadAddress : DSUtils.ARM9.address; + vsPokemonTableStartAddress = BitConverter.ToUInt32(ARM9.ReadBytes(RomInfo.vsPokemonEntryTableOffsetToRAMAddress, 4), 0); + PatchToolboxDialog.flag_PokemonBattleTableRepointed = (vsPokemonTableStartAddress >= RomInfo.synthOverlayLoadAddress); + vsPokemonTableStartAddress -= PatchToolboxDialog.flag_PokemonBattleTableRepointed ? RomInfo.synthOverlayLoadAddress : ARM9.address; - vsTrainerTableStartAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(RomInfo.vsTrainerEntryTableOffsetToRAMAddress, 4), 0); - ROMToolboxDialog.flag_TrainerClassBattleTableRepointed = (vsTrainerTableStartAddress >= RomInfo.synthOverlayLoadAddress); - vsTrainerTableStartAddress -= ROMToolboxDialog.flag_TrainerClassBattleTableRepointed ? RomInfo.synthOverlayLoadAddress : DSUtils.ARM9.address; + vsTrainerTableStartAddress = BitConverter.ToUInt32(ARM9.ReadBytes(RomInfo.vsTrainerEntryTableOffsetToRAMAddress, 4), 0); + PatchToolboxDialog.flag_TrainerClassBattleTableRepointed = (vsTrainerTableStartAddress >= RomInfo.synthOverlayLoadAddress); + vsTrainerTableStartAddress -= PatchToolboxDialog.flag_TrainerClassBattleTableRepointed ? RomInfo.synthOverlayLoadAddress : ARM9.address; pbEffectsPokemonCombobox.Items.Clear(); @@ -8823,11 +8823,11 @@ namespace DSPRE { pbEffectsCombosListbox.Items.Clear(); - String expArmPath = RomInfo.gameDirs[DirNames.synthOverlay].unpackedDir + '\\' + ROMToolboxDialog.expandedARMfileID.ToString("D4"); + String expArmPath = RomInfo.gameDirs[DirNames.synthOverlay].unpackedDir + '\\' + PatchToolboxDialog.expandedARMfileID.ToString("D4"); if (RomInfo.gameFamily == GameFamilies.HGSS) { - using (DSUtils.EasyReader ar = new DSUtils.EasyReader(ROMToolboxDialog.flag_TrainerClassBattleTableRepointed ? expArmPath : RomInfo.arm9Path, vsTrainerTableStartAddress)) { - byte trainerTableEntriesCount = DSUtils.ARM9.ReadByte(RomInfo.vsTrainerEntryTableOffsetToSizeLimiter); + using (DSUtils.EasyReader ar = new DSUtils.EasyReader(PatchToolboxDialog.flag_TrainerClassBattleTableRepointed ? expArmPath : RomInfo.arm9Path, vsTrainerTableStartAddress)) { + byte trainerTableEntriesCount = ARM9.ReadByte(RomInfo.vsTrainerEntryTableOffsetToSizeLimiter); for (int i = 0; i < trainerTableEntriesCount; i++) { ushort entry = ar.ReadUInt16(); @@ -8838,8 +8838,8 @@ namespace DSPRE { } } - using (DSUtils.EasyReader ar = new DSUtils.EasyReader(ROMToolboxDialog.flag_PokemonBattleTableRepointed ? expArmPath : RomInfo.arm9Path, vsPokemonTableStartAddress)) { - byte pokemonTableEntriesCount = DSUtils.ARM9.ReadByte(RomInfo.vsPokemonEntryTableOffsetToSizeLimiter); + using (DSUtils.EasyReader ar = new DSUtils.EasyReader(PatchToolboxDialog.flag_PokemonBattleTableRepointed ? expArmPath : RomInfo.arm9Path, vsPokemonTableStartAddress)) { + byte pokemonTableEntriesCount = ARM9.ReadByte(RomInfo.vsPokemonEntryTableOffsetToSizeLimiter); for (int i = 0; i < pokemonTableEntriesCount; i++) { ushort entry = ar.ReadUInt16(); @@ -8858,7 +8858,7 @@ namespace DSPRE { } } - using (DSUtils.EasyReader ar = new DSUtils.EasyReader(ROMToolboxDialog.flag_MainComboTableRepointed ? expArmPath : RomInfo.arm9Path, effectsComboMainTableStartAddress)) { + using (DSUtils.EasyReader ar = new DSUtils.EasyReader(PatchToolboxDialog.flag_MainComboTableRepointed ? expArmPath : RomInfo.arm9Path, effectsComboMainTableStartAddress)) { for (int i = 0; i < comboTableEntriesCount; i++) { ushort battleIntroEffect = ar.ReadUInt16(); ushort battleMusic = ar.ReadUInt16(); @@ -8956,9 +8956,9 @@ namespace DSPRE { private void saveConditionalMusicTableBTN_Click(object sender, EventArgs e) { for (int i = 0; i < conditionalMusicTable.Count; i++) { - DSUtils.ARM9.WriteBytes(BitConverter.GetBytes(conditionalMusicTable[i].header), (uint)(conditionalMusicTableStartAddress + 6 * i)); - DSUtils.ARM9.WriteBytes(BitConverter.GetBytes(conditionalMusicTable[i].flag), (uint)(conditionalMusicTableStartAddress + 6 * i + 2)); - DSUtils.ARM9.WriteBytes(BitConverter.GetBytes(conditionalMusicTable[i].music), (uint)(conditionalMusicTableStartAddress + 6 * i + 4)); + ARM9.WriteBytes(BitConverter.GetBytes(conditionalMusicTable[i].header), (uint)(conditionalMusicTableStartAddress + 6 * i)); + ARM9.WriteBytes(BitConverter.GetBytes(conditionalMusicTable[i].flag), (uint)(conditionalMusicTableStartAddress + 6 * i + 2)); + ARM9.WriteBytes(BitConverter.GetBytes(conditionalMusicTable[i].music), (uint)(conditionalMusicTableStartAddress + 6 * i + 4)); } } @@ -8973,8 +8973,8 @@ namespace DSPRE { effectsComboTable[index] = (battleIntroEffect, battleMusic); - String expArmPath = RomInfo.gameDirs[DirNames.synthOverlay].unpackedDir + '\\' + ROMToolboxDialog.expandedARMfileID.ToString("D4"); - using (DSUtils.EasyWriter wr = new DSUtils.EasyWriter(ROMToolboxDialog.flag_MainComboTableRepointed ? expArmPath : RomInfo.arm9Path, effectsComboMainTableStartAddress + 4 * index)) { + String expArmPath = RomInfo.gameDirs[DirNames.synthOverlay].unpackedDir + '\\' + PatchToolboxDialog.expandedARMfileID.ToString("D4"); + using (DSUtils.EasyWriter wr = new DSUtils.EasyWriter(PatchToolboxDialog.flag_MainComboTableRepointed ? expArmPath : RomInfo.arm9Path, effectsComboMainTableStartAddress + 4 * index)) { wr.Write(battleIntroEffect); wr.Write(battleMusic); }; @@ -8997,8 +8997,8 @@ namespace DSPRE { vsPokemonEffectsList[index] = (pokemonID, comboID); - String expArmPath = RomInfo.gameDirs[DirNames.synthOverlay].unpackedDir + '\\' + ROMToolboxDialog.expandedARMfileID.ToString("D4"); - using (DSUtils.EasyWriter wr = new DSUtils.EasyWriter(ROMToolboxDialog.flag_PokemonBattleTableRepointed ? expArmPath : RomInfo.arm9Path, vsPokemonTableStartAddress + 2 * index)) { + String expArmPath = RomInfo.gameDirs[DirNames.synthOverlay].unpackedDir + '\\' + PatchToolboxDialog.expandedARMfileID.ToString("D4"); + using (DSUtils.EasyWriter wr = new DSUtils.EasyWriter(PatchToolboxDialog.flag_PokemonBattleTableRepointed ? expArmPath : RomInfo.arm9Path, vsPokemonTableStartAddress + 2 * index)) { wr.Write((ushort)((pokemonID & 1023) + (comboID << 10))); //PokemonID }; @@ -9013,8 +9013,8 @@ namespace DSPRE { ushort comboID = (ushort)pbEffectsTrainerChooseMainCombobox.SelectedIndex; vsTrainerEffectsList[index] = (trainerClass, comboID); - String expArmPath = RomInfo.gameDirs[DirNames.synthOverlay].unpackedDir + '\\' + ROMToolboxDialog.expandedARMfileID.ToString("D4"); - using (DSUtils.EasyWriter wr = new DSUtils.EasyWriter(ROMToolboxDialog.flag_TrainerClassBattleTableRepointed ? expArmPath : RomInfo.arm9Path, vsTrainerTableStartAddress + 2 * index)) { + String expArmPath = RomInfo.gameDirs[DirNames.synthOverlay].unpackedDir + '\\' + PatchToolboxDialog.expandedARMfileID.ToString("D4"); + using (DSUtils.EasyWriter wr = new DSUtils.EasyWriter(PatchToolboxDialog.flag_TrainerClassBattleTableRepointed ? expArmPath : RomInfo.arm9Path, vsTrainerTableStartAddress + 2 * index)) { wr.Write((ushort)((trainerClass & 1023) + (comboID << 10))); }; diff --git a/DS_Map/ROMToolboxDialog.Designer.cs b/DS_Map/PatchToolboxDialog.Designer.cs similarity index 99% rename from DS_Map/ROMToolboxDialog.Designer.cs rename to DS_Map/PatchToolboxDialog.Designer.cs index 3d5abf9..a4a1d06 100644 --- a/DS_Map/ROMToolboxDialog.Designer.cs +++ b/DS_Map/PatchToolboxDialog.Designer.cs @@ -1,6 +1,6 @@ namespace DSPRE { - partial class ROMToolboxDialog + partial class PatchToolboxDialog { /// /// Required designer variable. @@ -27,7 +27,7 @@ /// the contents of this method with the code editor. /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ROMToolboxDialog)); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PatchToolboxDialog)); this.applyItemStandardizeButton = new System.Windows.Forms.Button(); this.arm9expansionTextLBL = new System.Windows.Forms.Label(); this.arm9expansionLBL = new System.Windows.Forms.Label(); diff --git a/DS_Map/ROMToolboxDialog.cs b/DS_Map/PatchToolboxDialog.cs similarity index 90% rename from DS_Map/ROMToolboxDialog.cs rename to DS_Map/PatchToolboxDialog.cs index 98f86ba..7a9bb83 100644 --- a/DS_Map/ROMToolboxDialog.cs +++ b/DS_Map/PatchToolboxDialog.cs @@ -14,7 +14,7 @@ using static DSPRE.Resources.ROMToolboxDB.ToolboxDB; using static NSMBe4.ROM; namespace DSPRE { - public partial class ROMToolboxDialog : Form { + public partial class PatchToolboxDialog : Form { public static uint expandedARMfileID = ToolboxDB.syntheticOverlayFileNumbersDB[RomInfo.gameFamily]; public static bool flag_standardizedItems { get; private set; } = false; @@ -33,7 +33,7 @@ namespace DSPRE { public static readonly int expandedTrainerNameLength = 12; #region Constructor - public ROMToolboxDialog() { + public PatchToolboxDialog() { InitializeComponent(); CheckStandardizedItems(); @@ -69,7 +69,7 @@ namespace DSPRE { CheckDynamicHeadersPatchApplied(); break; case GameFamilies.HGSS: - if (!DSUtils.CheckOverlayHasCompressionFlag(1)) { + if (!OverlayUtils.OverlayTable.IsDefaultCompressed(1)) { DisableOverlay1patch("Already applied"); overlay1CB.Visible = true; } @@ -153,12 +153,12 @@ namespace DSPRE { ARM9PatchData data = new ARM9PatchData(); byte[] branchCode = DSUtils.HexStringToByteArray(data.branchString); - byte[] branchCodeRead = DSUtils.ARM9.ReadBytes(data.branchOffset, data.branchString.Length / 3 + 1); //Read branchCode + byte[] branchCodeRead = ARM9.ReadBytes(data.branchOffset, data.branchString.Length / 3 + 1); //Read branchCode if (branchCodeRead.Length != branchCode.Length || !branchCodeRead.SequenceEqual(branchCode)) return false; byte[] initCode = DSUtils.HexStringToByteArray(data.initString); - byte[] initCodeRead = DSUtils.ARM9.ReadBytes(data.initOffset, data.initString.Length / 3 + 1); //Read initCode + byte[] initCodeRead = ARM9.ReadBytes(data.initOffset, data.initString.Length / 3 + 1); //Read initCode if (initCodeRead.Length != initCode.Length || !initCodeRead.SequenceEqual(initCode)) return false; @@ -168,14 +168,14 @@ namespace DSPRE { BDHCAMPatchData data = new BDHCAMPatchData(); byte[] branchCode = DSUtils.HexStringToByteArray(data.branchString); - byte[] branchCodeRead = DSUtils.ARM9.ReadBytes(data.branchOffset, branchCode.Length); + byte[] branchCodeRead = ARM9.ReadBytes(data.branchOffset, branchCode.Length); if (branchCode.Length != branchCodeRead.Length || !branchCode.SequenceEqual(branchCodeRead)) { return false; } - string overlayFilePath = DSUtils.GetOverlayPath(data.overlayNumber); - DSUtils.DecompressOverlay(data.overlayNumber); + string overlayFilePath = OverlayUtils.GetPath(data.overlayNumber); + OverlayUtils.Decompress(data.overlayNumber); byte[] overlayCode1 = DSUtils.HexStringToByteArray(data.overlayString1); byte[] overlayCode1Read = DSUtils.ReadFromFile(overlayFilePath, data.overlayOffset1, overlayCode1.Length); @@ -188,7 +188,7 @@ namespace DSPRE { if (overlayCode2.Length != overlayCode2Read.Length || !overlayCode2.SequenceEqual(overlayCode2Read)) return false; //0 means BDHCAM patch has not been applied - String fullFilePath = RomInfo.gameDirs[DirNames.synthOverlay].unpackedDir + '\\' + ROMToolboxDialog.expandedARMfileID.ToString("D4"); + String fullFilePath = RomInfo.gameDirs[DirNames.synthOverlay].unpackedDir + '\\' + PatchToolboxDialog.expandedARMfileID.ToString("D4"); byte[] subroutineRead = DSUtils.ReadFromFile(fullFilePath, BDHCAMPatchData.BDHCamSubroutineOffset, data.subroutine.Length); //Write new overlayCode1 if (data.subroutine.Length != subroutineRead.Length || !data.subroutine.SequenceEqual(subroutineRead)) return false; //0 means BDHCAM patch has not been applied @@ -203,7 +203,7 @@ namespace DSPRE { languageOffset = +8; } - byte[] read = DSUtils.ARM9.ReadBytes((uint)(offset - DSUtils.ARM9.address + languageOffset), kv.Value.Length / 3 + 1); + byte[] read = ARM9.ReadBytes((uint)(offset - ARM9.address + languageOffset), kv.Value.Length / 3 + 1); byte[] code = DSUtils.HexStringToByteArray(kv.Value); if (read.Length != code.Length || !read.SequenceEqual(code)) return false; @@ -227,39 +227,39 @@ namespace DSPRE { public bool CheckStandardizedItems() { DSUtils.TryUnpackNarcs(new List { RomInfo.DirNames.scripts }); - if (!ROMToolboxDialog.flag_standardizedItems) { - if (!ROMToolboxDialog.CheckScriptsStandardizedItemNumbers()) { + if (!PatchToolboxDialog.flag_standardizedItems) { + if (!PatchToolboxDialog.CheckScriptsStandardizedItemNumbers()) { return false; } } itemNumbersCB.Visible = true; - ROMToolboxDialog.flag_standardizedItems = true; + PatchToolboxDialog.flag_standardizedItems = true; DisableStandardizeItemsPatch("Already applied"); return true; } public bool CheckMatrixExpansionApplied() { - if (!ROMToolboxDialog.flag_MatrixExpansionApplied) { - if (!ROMToolboxDialog.CheckFilesMatrixExpansionApplied()) { + if (!PatchToolboxDialog.flag_MatrixExpansionApplied) { + if (!PatchToolboxDialog.CheckFilesMatrixExpansionApplied()) { return false; } } DisableMatrixExpansionPatch("Already applied"); - ROMToolboxDialog.flag_MatrixExpansionApplied = true; + PatchToolboxDialog.flag_MatrixExpansionApplied = true; expandedMatrixCB.Visible = true; return true; } public string backupSuffix = ".backup"; private bool CheckARM9ExpansionApplied() { - if (!ROMToolboxDialog.flag_arm9Expanded) { - if (!ROMToolboxDialog.CheckFilesArm9ExpansionApplied()) { + if (!PatchToolboxDialog.flag_arm9Expanded) { + if (!PatchToolboxDialog.CheckFilesArm9ExpansionApplied()) { return false; } } - ROMToolboxDialog.flag_arm9Expanded = true; + PatchToolboxDialog.flag_arm9Expanded = true; arm9patchCB.Visible = true; DisableARM9patch("Already applied"); @@ -277,12 +277,12 @@ namespace DSPRE { } public bool CheckDynamicHeadersPatchApplied() { if (!flag_DynamicHeadersPatchApplied) { - if (!ROMToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { + if (!PatchToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { return false; } } - ROMToolboxDialog.flag_DynamicHeadersPatchApplied = true; + PatchToolboxDialog.flag_DynamicHeadersPatchApplied = true; dynamicHeadersPatchCB.Visible = true; DisableDynamicHeadersPatch("Already applied"); @@ -291,7 +291,7 @@ namespace DSPRE { public static bool CheckFilesDynamicHeadersPatchApplied() { DynamicHeadersPatchData data = new DynamicHeadersPatchData(); - ushort initValue = BitConverter.ToUInt16(DSUtils.ARM9.ReadBytes(data.initOffset, 0x2), 0); + ushort initValue = BitConverter.ToUInt16(ARM9.ReadBytes(data.initOffset, 0x2), 0); return initValue == 0xB500; } @@ -302,12 +302,12 @@ namespace DSPRE { return false; } - if (!ROMToolboxDialog.flag_BDHCamPatchApplied) { - if (!ROMToolboxDialog.CheckFilesBDHCamPatchApplied()) { + if (!PatchToolboxDialog.flag_BDHCamPatchApplied) { + if (!PatchToolboxDialog.CheckFilesBDHCamPatchApplied()) { return false; } } - ROMToolboxDialog.flag_BDHCamPatchApplied = true; + PatchToolboxDialog.flag_BDHCamPatchApplied = true; BDHCamCB.Visible = true; DisableBDHCamPatch("Already applied"); @@ -328,7 +328,7 @@ namespace DSPRE { if (v > TrainerFile.defaultNameLen+1) { DisableTrainerNameExpansionPatch("Already\nApplied"); - ROMToolboxDialog.flag_TrainerNamesExpanded = true; + PatchToolboxDialog.flag_TrainerNamesExpanded = true; } } } @@ -365,7 +365,7 @@ namespace DSPRE { BDHCAMPatchData data = new BDHCAMPatchData(); if (RomInfo.gameFamily == GameFamilies.HGSS) { - if (DSUtils.CheckOverlayHasCompressionFlag(data.overlayNumber)) { + if (OverlayUtils.OverlayTable.IsDefaultCompressed(data.overlayNumber)) { DialogResult d1 = MessageBox.Show("It is STRONGLY recommended to configure Overlay1 as uncompressed before proceeding.\n\n" + "More details in the following dialog.\n\n" + "Do you want to know more?", "Confirm to proceed", MessageBoxButtons.YesNo, MessageBoxIcon.Warning); @@ -391,12 +391,12 @@ namespace DSPRE { File.Copy(RomInfo.arm9Path, RomInfo.arm9Path + backupSuffix, overwrite: true); try { - DSUtils.ARM9.WriteBytes(DSUtils.HexStringToByteArray(data.branchString), data.branchOffset); //Write new branchOffset + ARM9.WriteBytes(DSUtils.HexStringToByteArray(data.branchString), data.branchOffset); //Write new branchOffset /* Write to overlayfile */ - string overlayFilePath = DSUtils.GetOverlayPath(data.overlayNumber); - if (DSUtils.OverlayIsCompressed(data.overlayNumber)) { - DSUtils.DecompressOverlay(data.overlayNumber); + string overlayFilePath = OverlayUtils.GetPath(data.overlayNumber); + if (OverlayUtils.IsCompressed(data.overlayNumber)) { + OverlayUtils.Decompress(data.overlayNumber); } DSUtils.WriteToFile(overlayFilePath, DSUtils.HexStringToByteArray(data.overlayString1), data.overlayOffset1); //Write new overlayCode1 @@ -415,7 +415,7 @@ namespace DSPRE { overlay1MustBeRestoredFromBackup = false; DisableBDHCamPatch("Already applied"); - ROMToolboxDialog.flag_BDHCamPatchApplied = true; + PatchToolboxDialog.flag_BDHCamPatchApplied = true; BDHCamCB.Visible = true; MessageBox.Show("The BDHCAM patch has been applied.", "Operation successful.", MessageBoxButtons.OK, MessageBoxIcon.Information); @@ -434,7 +434,7 @@ namespace DSPRE { bool isCompressed = false; string stringDecompressOverlay = ""; - if (DSUtils.OverlayIsCompressed(1)) { + if (OverlayUtils.IsCompressed(1)) { isCompressed = true; stringDecompressOverlay = "- Overlay 1 will be decompressed.\n\n"; } @@ -448,7 +448,7 @@ namespace DSPRE { if (d == DialogResult.Yes) { DSUtils.SetOverlayCompressionInTable(1, 0); if (isCompressed) { - DSUtils.DecompressOverlay(1); + OverlayUtils.Decompress(1); } MessageBox.Show("Overlay1 is now configured as uncompressed.", "Operation successful", MessageBoxButtons.OK, MessageBoxIcon.Information); @@ -469,7 +469,7 @@ namespace DSPRE { DSUtils.TryUnpackNarcs(new List { RomInfo.DirNames.scripts }); DSUtils.TryUnpackNarcs(new List { RomInfo.DirNames.eventFiles }); - if (ROMToolboxDialog.flag_standardizedItems) { + if (PatchToolboxDialog.flag_standardizedItems) { AlreadyApplied(); } else { @@ -529,7 +529,7 @@ namespace DSPRE { DisableStandardizeItemsPatch("Already applied"); itemNumbersCB.Visible = true; - ROMToolboxDialog.flag_standardizedItems = true; + PatchToolboxDialog.flag_standardizedItems = true; } } else { MessageBox.Show("No changes have been made.", "Operation canceled", MessageBoxButtons.OK, MessageBoxIcon.Information); @@ -550,8 +550,8 @@ namespace DSPRE { File.Copy(RomInfo.arm9Path, RomInfo.arm9Path + backupSuffix, overwrite: true); try { - DSUtils.ARM9.WriteBytes(DSUtils.HexStringToByteArray(data.branchString), data.branchOffset); //Write new branchOffset - DSUtils.ARM9.WriteBytes(DSUtils.HexStringToByteArray(data.initString), data.initOffset); //Write new initOffset + ARM9.WriteBytes(DSUtils.HexStringToByteArray(data.branchString), data.branchOffset); //Write new branchOffset + ARM9.WriteBytes(DSUtils.HexStringToByteArray(data.initString), data.initOffset); //Write new initOffset string fullFilePath = RomInfo.gameDirs[DirNames.synthOverlay].unpackedDir + '\\' + expandedARMfileID.ToString("D4"); File.Delete(fullFilePath); @@ -562,7 +562,7 @@ namespace DSPRE { DisableARM9patch("Already applied"); arm9patchCB.Visible = true; - ROMToolboxDialog.flag_arm9Expanded = true; + PatchToolboxDialog.flag_arm9Expanded = true; switch (RomInfo.gameFamily) { case GameFamilies.Plat: @@ -598,7 +598,7 @@ namespace DSPRE { listOfChanges += "s"; for (int i = 0; i < kv.Key.Length; i++) { - listOfChanges += " 0x" + (kv.Key[i] - DSUtils.ARM9.address + languageOffset).ToString("X"); + listOfChanges += " 0x" + (kv.Key[i] - ARM9.address + languageOffset).ToString("X"); if (i < kv.Key.Length - 1) listOfChanges += ","; @@ -616,7 +616,7 @@ namespace DSPRE { try { foreach (KeyValuePair kv in ToolboxDB.matrixExpansionDB) { foreach (uint offset in kv.Key) { - DSUtils.ARM9.WriteBytes(DSUtils.HexStringToByteArray(kv.Value), (uint)(offset - DSUtils.ARM9.address + languageOffset)); + ARM9.WriteBytes(DSUtils.HexStringToByteArray(kv.Value), (uint)(offset - ARM9.address + languageOffset)); } } } catch { @@ -625,7 +625,7 @@ namespace DSPRE { } DisableMatrixExpansionPatch("Already applied"); expandedMatrixCB.Visible = true; - ROMToolboxDialog.flag_MatrixExpansionApplied = true; + PatchToolboxDialog.flag_MatrixExpansionApplied = true; MessageBox.Show("Matrix 0 can now be freely expanded up to twice its size.", "Operation successful.", MessageBoxButtons.OK, MessageBoxIcon.Information); } else { MessageBox.Show("No changes have been made.", "Operation canceled", MessageBoxButtons.OK, MessageBoxIcon.Information); @@ -697,7 +697,7 @@ namespace DSPRE { DE F7 3D F9 bl 0x02017E6C @Free_Memory */ - DSUtils.ARM9.WriteBytes(DSUtils.HexStringToByteArray(data.initString), data.initOffset); + ARM9.WriteBytes(DSUtils.HexStringToByteArray(data.initString), data.initOffset); /* - Neutralize instances of (HeaderID * 0x18) so the base offset which the data is read from is always 0x0: @@ -719,18 +719,18 @@ namespace DSPRE { */ foreach (Tuple reference in DynamicHeadersPatchData.dynamicHeadersPointersDB[RomInfo.gameFamily]) { - DSUtils.ARM9.WriteBytes(DSUtils.HexStringToByteArray(data.REFERENCE_STRING), (uint)(reference.Item1 + data.pointerDiff)); - uint pointerValue = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes((uint)(reference.Item2 + data.pointerDiff), 4), 0) - RomInfo.headerTableOffset - DSUtils.ARM9.address; - DSUtils.ARM9.WriteBytes(BitConverter.GetBytes(pointerValue), (uint)(reference.Item2 + data.pointerDiff)); + ARM9.WriteBytes(DSUtils.HexStringToByteArray(data.REFERENCE_STRING), (uint)(reference.Item1 + data.pointerDiff)); + uint pointerValue = BitConverter.ToUInt32(ARM9.ReadBytes((uint)(reference.Item2 + data.pointerDiff), 4), 0) - RomInfo.headerTableOffset - ARM9.address; + ARM9.WriteBytes(BitConverter.GetBytes(pointerValue), (uint)(reference.Item2 + data.pointerDiff)); } if (specialCase) { /* Special case: at 0x3B522 (non-JAP and non-Spanish HG offset) there is an instruction between the (mov r1, #0x18) and (mul r1, r0) commands, so we must handle this separately */ - DSUtils.ARM9.WriteBytes(DSUtils.HexStringToByteArray(data.specialCaseData1), (uint)(data.specialCaseOffset1 + data.pointerDiff)); - DSUtils.ARM9.WriteBytes(DSUtils.HexStringToByteArray(data.specialCaseData2), (uint)(data.specialCaseOffset2 + data.pointerDiff)); - DSUtils.ARM9.WriteBytes(DSUtils.HexStringToByteArray(data.specialCaseData3), (uint)(data.specialCaseOffset3 + data.pointerDiff)); + ARM9.WriteBytes(DSUtils.HexStringToByteArray(data.specialCaseData1), (uint)(data.specialCaseOffset1 + data.pointerDiff)); + ARM9.WriteBytes(DSUtils.HexStringToByteArray(data.specialCaseData2), (uint)(data.specialCaseOffset2 + data.pointerDiff)); + ARM9.WriteBytes(DSUtils.HexStringToByteArray(data.specialCaseData3), (uint)(data.specialCaseOffset3 + data.pointerDiff)); } // Clear the dynamic headers directory in 'unpacked' @@ -749,7 +749,7 @@ namespace DSPRE { DisableDynamicHeadersPatch("Already applied"); dynamicHeadersPatchCB.Visible = true; - ROMToolboxDialog.flag_DynamicHeadersPatchApplied = true; + PatchToolboxDialog.flag_DynamicHeadersPatchApplied = true; MessageBox.Show("The headers are now dynamically allocated in memory.", "Operation successful.", MessageBoxButtons.OK, MessageBoxIcon.Information); } catch { @@ -797,17 +797,17 @@ namespace DSPRE { // SoulSilver USA ARM9 at 0x7342E // SoulSilver Spain ARM9 at 0x7342E // TODO: Verify - DialogResult d = MessageBox.Show($"Applying this patch will set the Trainer Name max length to {ROMToolboxDialog.expandedTrainerNameLength-1} usable characters.\n" + + DialogResult d = MessageBox.Show($"Applying this patch will set the Trainer Name max length to {PatchToolboxDialog.expandedTrainerNameLength-1} usable characters.\n" + "Are you sure you want to proceed?", "Confirm to proceed", MessageBoxButtons.YesNo, MessageBoxIcon.Warning); if (d == DialogResult.Yes) { try { - using (DSUtils.ARM9.Writer wr = new DSUtils.ARM9.Writer(RomInfo.trainerNameLenOffset)) { - wr.Write((byte)ROMToolboxDialog.expandedTrainerNameLength); + using (ARM9.Writer wr = new ARM9.Writer(RomInfo.trainerNameLenOffset)) { + wr.Write((byte)PatchToolboxDialog.expandedTrainerNameLength); } - ROMToolboxDialog.flag_TrainerNamesExpanded = true; + PatchToolboxDialog.flag_TrainerNamesExpanded = true; DisableTrainerNameExpansionPatch("Already applied"); expandTrainerNamesCB.Visible = true; RomInfo.SetTrainerNameMaxLen(); @@ -847,7 +847,7 @@ namespace DSPRE { private int GetCommandTableOffset() { // Checks if command table is repointed IN THE EXPANDED ARM9 FILE, returns pointer inside this file ResourceManager customcmdDB = new ResourceManager("DSPRE.Resources.ROMToolboxDB.CustomScrCmdDB", Assembly.GetExecutingAssembly()); int pointerOffset = int.Parse(customcmdDB.GetString("pointerOffset" + "_" + RomInfo.gameVersion + "_" + RomInfo.gameLanguage)); - using (DSUtils.ARM9.Reader r = new DSUtils.ARM9.Reader(pointerOffset)) { + using (ARM9.Reader r = new ARM9.Reader(pointerOffset)) { uint cmdTable = r.ReadUInt32(); uint offset = cmdTable - synthOverlayLoadAddress; @@ -873,7 +873,7 @@ namespace DSPRE { arm9FileStream.Close(); - using (DSUtils.ARM9.Writer wr = new DSUtils.ARM9.Writer()) { // Change both the pointer and the limit + using (ARM9.Writer wr = new ARM9.Writer()) { // Change both the pointer and the limit wr.BaseStream.Position = int.Parse(customcmdDB.GetString("pointerOffset" + "_" + RomInfo.gameVersion + "_" + RomInfo.gameLanguage)); wr.Write((uint)0x023C8200); diff --git a/DS_Map/ROMToolboxDialog.resx b/DS_Map/PatchToolboxDialog.resx similarity index 100% rename from DS_Map/ROMToolboxDialog.resx rename to DS_Map/PatchToolboxDialog.resx diff --git a/DS_Map/ROMFiles/MapHeader.cs b/DS_Map/ROMFiles/MapHeader.cs index 3bd95af..26a4ddb 100644 --- a/DS_Map/ROMFiles/MapHeader.cs +++ b/DS_Map/ROMFiles/MapHeader.cs @@ -173,7 +173,7 @@ namespace DSPRE.ROMFiles { } /* Check if dynamic headers patch has been applied, and load header from arm9 or a/0/5/0 accordingly */ - if (ROMToolboxDialog.flag_DynamicHeadersPatchApplied) { + if (PatchToolboxDialog.flag_DynamicHeadersPatchApplied) { string path = Filesystem.GetDynamicHeaderPath(headerNumber); mapHeader = MapHeader.LoadFromFile(path, headerNumber, 0); } else { @@ -185,7 +185,7 @@ namespace DSPRE.ROMFiles { public static int GetHeaderCount() { int headerCount; - if (ROMToolboxDialog.flag_DynamicHeadersPatchApplied) { + if (PatchToolboxDialog.flag_DynamicHeadersPatchApplied) { headerCount = Filesystem.GetDynamicHeadersCount(); } else { headerCount = RomInfo.GetHeaderCount(); @@ -196,12 +196,12 @@ namespace DSPRE.ROMFiles { public void SaveFile() { /* Check if dynamic headers patch has been applied, and save header to arm9 or a/0/5/0 accordingly */ - if (ROMToolboxDialog.flag_DynamicHeadersPatchApplied) { + if (PatchToolboxDialog.flag_DynamicHeadersPatchApplied) { string path = Filesystem.GetDynamicHeaderPath(ID); DSUtils.WriteToFile(path, this.ToByteArray(), 0, 0, fmode: FileMode.Create); } else { uint headerOffset = (uint)(RomInfo.headerTableOffset + MapHeader.length * this.ID); - DSUtils.ARM9.WriteBytes(this.ToByteArray(), headerOffset); + ARM9.WriteBytes(this.ToByteArray(), headerOffset); } } diff --git a/DS_Map/Resources/ROMToolboxDB/ToolboxDB.cs b/DS_Map/Resources/ROMToolboxDB/ToolboxDB.cs index d844273..fec026c 100644 --- a/DS_Map/Resources/ROMToolboxDB/ToolboxDB.cs +++ b/DS_Map/Resources/ROMToolboxDB/ToolboxDB.cs @@ -39,8 +39,8 @@ namespace DSPRE.Resources.ROMToolboxDB { ["initOffset" + "_" + RomInfo.GameFamilies.HGSS + "_" + RomInfo.GameLanguages.Spanish] = 0x02110354 }; internal ARM9PatchData() { - branchOffset = arm9ExpansionOffsetsDB[nameof(branchOffset) + "_" + RomInfo.gameFamily] - DSUtils.ARM9.address; - initOffset = arm9ExpansionOffsetsDB[nameof(initOffset) + "_" + RomInfo.gameFamily + "_" + RomInfo.gameLanguage] - DSUtils.ARM9.address; + branchOffset = arm9ExpansionOffsetsDB[nameof(branchOffset) + "_" + RomInfo.gameFamily] - ARM9.address; + initOffset = arm9ExpansionOffsetsDB[nameof(initOffset) + "_" + RomInfo.gameFamily + "_" + RomInfo.gameLanguage] - ARM9.address; branchString = arm9ExpansionCodeDB[nameof(branchString) + "_" + RomInfo.gameFamily + "_" + RomInfo.gameLanguage]; if (RomInfo.gameFamily == GameFamilies.Plat) { @@ -107,7 +107,7 @@ namespace DSPRE.Resources.ROMToolboxDB { overlayOffset2 = BDHCamOffsetsDB[nameof(overlayOffset2) + "_" + RomInfo.gameFamily]; break; } - branchOffset -= DSUtils.ARM9.address; + branchOffset -= ARM9.address; overlayString1 = BDHCamCodeDB[nameof(overlayString1)]; overlayString2 = BDHCamCodeDB[nameof(overlayString2)]; subroutine = (byte[])new ResourceManager("DSPRE.Resources.ROMToolboxDB.BDHCAMPatchDB", Assembly.GetExecutingAssembly()).GetObject(RomInfo.romID + "_cam"); diff --git a/DS_Map/RomInfo.cs b/DS_Map/RomInfo.cs index 21746b6..c2681fe 100644 --- a/DS_Map/RomInfo.cs +++ b/DS_Map/RomInfo.cs @@ -490,7 +490,7 @@ namespace DSPRE { public static void SetOWtable() { switch (gameFamily) { case GameFamilies.DP: - OWtablePath = DSUtils.GetOverlayPath(5); + OWtablePath = OverlayUtils.GetPath(5); switch (gameLanguage) { // Go to the beginning of the overworld table case GameLanguages.English: OWTableOffset = 0x22BCC; @@ -504,7 +504,7 @@ namespace DSPRE { } break; case GameFamilies.Plat: - OWtablePath = DSUtils.GetOverlayPath(5); + OWtablePath = OverlayUtils.GetPath(5); switch (gameLanguage) { // Go to the beginning of the overworld table case GameLanguages.Italian: OWTableOffset = 0x2BC44; @@ -525,16 +525,16 @@ namespace DSPRE { } break; case GameFamilies.HGSS: - if (DSUtils.CheckOverlayHasCompressionFlag(1)) { - if (DSUtils.OverlayIsCompressed(1)) { - if (DSUtils.DecompressOverlay(1) < 0) { + if (OverlayUtils.OverlayTable.IsDefaultCompressed(1)) { + if (OverlayUtils.IsCompressed(1)) { + if (OverlayUtils.Decompress(1) < 0) { MessageBox.Show("Overlay 1 couldn't be decompressed.\nOverworld sprites in the Event Editor will be " + "displayed incorrectly or not displayed at all.", "Decompression error", MessageBoxButtons.OK, MessageBoxIcon.Error); } } } - string ov1Path = DSUtils.GetOverlayPath(1); + string ov1Path = OverlayUtils.GetPath(1); uint ov1Address = DSUtils.GetOverlayRAMAddress(1); int ramAddrOfPointer; @@ -565,7 +565,7 @@ namespace DSPRE { return; } - string ov131path = DSUtils.GetOverlayPath(131); + string ov131path = OverlayUtils.GetPath(131); if (File.Exists(ov131path)) { // if HGE field extension overlay exists OWTableOffset = ramAddressOfTable - DSUtils.GetOverlayRAMAddress(131); @@ -573,7 +573,7 @@ namespace DSPRE { } else if (ramAddressOfTable >= RomInfo.synthOverlayLoadAddress) { // if the pointer shows the table was moved to the synthetic overlay OWTableOffset = ramAddressOfTable - RomInfo.synthOverlayLoadAddress; - OWtablePath = gameDirs[DirNames.synthOverlay].unpackedDir + "\\" + ROMToolboxDialog.expandedARMfileID.ToString("D4"); + OWtablePath = gameDirs[DirNames.synthOverlay].unpackedDir + "\\" + PatchToolboxDialog.expandedARMfileID.ToString("D4"); } else { OWTableOffset = ramAddressOfTable - ov1Address; OWtablePath = ov1Path; @@ -707,34 +707,34 @@ namespace DSPRE { case GameFamilies.DP: switch (gameLanguage) { case GameLanguages.English: - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x6B838, 4), 0); + monIconPalTableAddress = BitConverter.ToUInt32(ARM9.ReadBytes(0x6B838, 4), 0); break; case GameLanguages.Italian: - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x6B874, 4), 0); + monIconPalTableAddress = BitConverter.ToUInt32(ARM9.ReadBytes(0x6B874, 4), 0); break; case GameLanguages.German: case GameLanguages.French: case GameLanguages.Spanish: - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x6B894, 4), 0); + monIconPalTableAddress = BitConverter.ToUInt32(ARM9.ReadBytes(0x6B894, 4), 0); break; case GameLanguages.Japanese: - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x6FDEC, 4), 0); + monIconPalTableAddress = BitConverter.ToUInt32(ARM9.ReadBytes(0x6FDEC, 4), 0); break; } break; case GameFamilies.Plat: switch (gameLanguage) { case GameLanguages.English: - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x79F80, 4), 0); + monIconPalTableAddress = BitConverter.ToUInt32(ARM9.ReadBytes(0x79F80, 4), 0); break; case GameLanguages.Italian: case GameLanguages.German: case GameLanguages.French: case GameLanguages.Spanish: - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x7A020, 4), 0); + monIconPalTableAddress = BitConverter.ToUInt32(ARM9.ReadBytes(0x7A020, 4), 0); break; case GameLanguages.Japanese: - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x79858, 4), 0); + monIconPalTableAddress = BitConverter.ToUInt32(ARM9.ReadBytes(0x79858, 4), 0); break; } break; @@ -743,25 +743,25 @@ namespace DSPRE { switch (gameLanguage) { case GameLanguages.English: case GameLanguages.Italian: - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x74408, 4), 0); + monIconPalTableAddress = BitConverter.ToUInt32(ARM9.ReadBytes(0x74408, 4), 0); break; case GameLanguages.German: if (gameVersion == GameVersions.HeartGold) { - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x74408, 4), 0); + monIconPalTableAddress = BitConverter.ToUInt32(ARM9.ReadBytes(0x74408, 4), 0); } else { - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x74400, 4), 0); + monIconPalTableAddress = BitConverter.ToUInt32(ARM9.ReadBytes(0x74400, 4), 0); } break; case GameLanguages.French: case GameLanguages.Spanish: if (gameVersion == GameVersions.HeartGold) { - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x74400, 4), 0); + monIconPalTableAddress = BitConverter.ToUInt32(ARM9.ReadBytes(0x74400, 4), 0); } else { - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x74408, 4), 0); + monIconPalTableAddress = BitConverter.ToUInt32(ARM9.ReadBytes(0x74408, 4), 0); } break; case GameLanguages.Japanese: - monIconPalTableAddress = BitConverter.ToUInt32(DSUtils.ARM9.ReadBytes(0x73EA0, 4), 0); + monIconPalTableAddress = BitConverter.ToUInt32(ARM9.ReadBytes(0x73EA0, 4), 0); break; } break; @@ -973,7 +973,7 @@ namespace DSPRE { if(trainerNameLenOffset < 0) { trainerNameMaxLen = TrainerFile.defaultNameLen; } else { - using (DSUtils.ARM9.Reader ar = new DSUtils.ARM9.Reader(trainerNameLenOffset)) { + using (ARM9.Reader ar = new ARM9.Reader(trainerNameLenOffset)) { trainerNameMaxLen = ar.ReadByte(); } } diff --git a/DS_Map/SpawnEditor.cs b/DS_Map/SpawnEditor.cs index 998c790..109dcbf 100644 --- a/DS_Map/SpawnEditor.cs +++ b/DS_Map/SpawnEditor.cs @@ -52,13 +52,13 @@ namespace DSPRE { Environment.NewLine + "\nProceed?", "Confirmation required", MessageBoxButtons.YesNo, MessageBoxIcon.Question); if (d == DialogResult.Yes) { - string moneyOverlayPath = DSUtils.GetOverlayPath(RomInfo.initialMoneyOverlayNumber); + string moneyOverlayPath = OverlayUtils.GetPath(RomInfo.initialMoneyOverlayNumber); ushort headerNumber = ushort.Parse(spawnHeaderComboBox.SelectedItem.ToString().Split()[0]); - DSUtils.ARM9.WriteBytes(BitConverter.GetBytes(headerNumber), RomInfo.arm9spawnOffset); - DSUtils.ARM9.WriteBytes(BitConverter.GetBytes((short)(matrixxUpDown.Value * 32 + localmapxUpDown.Value)), RomInfo.arm9spawnOffset + 8); - DSUtils.ARM9.WriteBytes(BitConverter.GetBytes((short)(matrixyUpDown.Value * 32 + localmapyUpDown.Value)), RomInfo.arm9spawnOffset + 12); - DSUtils.ARM9.WriteBytes(BitConverter.GetBytes((short)playerDirCombobox.SelectedIndex), RomInfo.arm9spawnOffset + 16); + ARM9.WriteBytes(BitConverter.GetBytes(headerNumber), RomInfo.arm9spawnOffset); + ARM9.WriteBytes(BitConverter.GetBytes((short)(matrixxUpDown.Value * 32 + localmapxUpDown.Value)), RomInfo.arm9spawnOffset + 8); + ARM9.WriteBytes(BitConverter.GetBytes((short)(matrixyUpDown.Value * 32 + localmapyUpDown.Value)), RomInfo.arm9spawnOffset + 12); + ARM9.WriteBytes(BitConverter.GetBytes((short)playerDirCombobox.SelectedIndex), RomInfo.arm9spawnOffset + 16); DSUtils.WriteToFile(moneyOverlayPath, BitConverter.GetBytes((int)initialMoneyUpDown.Value), RomInfo.initialMoneyOverlayOffset); MessageBox.Show("Your spawn settings have been changed.", "Operation successful", MessageBoxButtons.OK, MessageBoxIcon.Information); @@ -69,9 +69,9 @@ namespace DSPRE { private void readDefaultSpawnPosButton_Click(object sender, EventArgs e) {; SetupFields(names); - ushort headerNumber = BitConverter.ToUInt16(DSUtils.ARM9.ReadBytes(RomInfo.arm9spawnOffset, 2), 0); - ushort globalX = BitConverter.ToUInt16(DSUtils.ARM9.ReadBytes(RomInfo.arm9spawnOffset + 8, 2), 0); - ushort globalY = BitConverter.ToUInt16(DSUtils.ARM9.ReadBytes(RomInfo.arm9spawnOffset + 12, 2), 0); + ushort headerNumber = BitConverter.ToUInt16(ARM9.ReadBytes(RomInfo.arm9spawnOffset, 2), 0); + ushort globalX = BitConverter.ToUInt16(ARM9.ReadBytes(RomInfo.arm9spawnOffset + 8, 2), 0); + ushort globalY = BitConverter.ToUInt16(ARM9.ReadBytes(RomInfo.arm9spawnOffset + 12, 2), 0); spawnHeaderComboBox.SelectedIndex = headerNumber; @@ -92,16 +92,16 @@ namespace DSPRE { } ReadDefaultMoney(); - playerDirCombobox.SelectedIndex = BitConverter.ToUInt16(DSUtils.ARM9.ReadBytes(RomInfo.arm9spawnOffset + 16, 2), 0); + playerDirCombobox.SelectedIndex = BitConverter.ToUInt16(ARM9.ReadBytes(RomInfo.arm9spawnOffset + 16, 2), 0); } private void ReadDefaultMoney() { - if (DSUtils.CheckOverlayHasCompressionFlag(RomInfo.initialMoneyOverlayNumber)) { - if (DSUtils.OverlayIsCompressed(RomInfo.initialMoneyOverlayNumber)) { - DSUtils.DecompressOverlay(RomInfo.initialMoneyOverlayNumber); + if (OverlayUtils.OverlayTable.IsDefaultCompressed(RomInfo.initialMoneyOverlayNumber)) { + if (OverlayUtils.IsCompressed(RomInfo.initialMoneyOverlayNumber)) { + OverlayUtils.Decompress(RomInfo.initialMoneyOverlayNumber); } } - string pathToMoneyOverlay = DSUtils.GetOverlayPath(RomInfo.initialMoneyOverlayNumber); + string pathToMoneyOverlay = OverlayUtils.GetPath(RomInfo.initialMoneyOverlayNumber); initialMoneyUpDown.Value = BitConverter.ToUInt32(DSUtils.ReadFromFile(pathToMoneyOverlay, RomInfo.initialMoneyOverlayOffset, 4), 0); } @@ -109,7 +109,7 @@ namespace DSPRE { ushort headerNumber = ushort.Parse(spawnHeaderComboBox.SelectedItem.ToString().Split()[0]); MapHeader currentHeader; - if (ROMToolboxDialog.flag_DynamicHeadersPatchApplied || ROMToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { + if (PatchToolboxDialog.flag_DynamicHeadersPatchApplied || PatchToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { currentHeader = MapHeader.LoadFromFile(RomInfo.gameDirs[DirNames.dynamicHeaders].unpackedDir + "\\" + headerNumber.ToString("D4"), headerNumber, 0); } else { currentHeader = MapHeader.LoadFromARM9(headerNumber); diff --git a/DS_Map/WildEditorDPPt.cs b/DS_Map/WildEditorDPPt.cs index 2c58ae4..0412ebc 100644 --- a/DS_Map/WildEditorDPPt.cs +++ b/DS_Map/WildEditorDPPt.cs @@ -22,7 +22,7 @@ namespace DSPRE { Dictionary EncounterFileLocationName = new Dictionary(); for (ushort i = 0; i < totalNumHeaderFiles; i++) { - if (ROMToolboxDialog.flag_DynamicHeadersPatchApplied || ROMToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { + if (PatchToolboxDialog.flag_DynamicHeadersPatchApplied || PatchToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { tempMapHeader = MapHeader.LoadFromFile(RomInfo.gameDirs[DirNames.dynamicHeaders].unpackedDir + "\\" + i.ToString("D4"), i, 0); } else { tempMapHeader = MapHeader.LoadFromARM9(i); diff --git a/DS_Map/WildEditorHGSS.cs b/DS_Map/WildEditorHGSS.cs index c592839..858b912 100644 --- a/DS_Map/WildEditorHGSS.cs +++ b/DS_Map/WildEditorHGSS.cs @@ -23,7 +23,7 @@ namespace DSPRE { for (ushort i = 0; i < totalNumHeaderFiles; i++) { - if (ROMToolboxDialog.flag_DynamicHeadersPatchApplied || ROMToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) + if (PatchToolboxDialog.flag_DynamicHeadersPatchApplied || PatchToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { tempMapHeader = MapHeader.LoadFromFile(RomInfo.gameDirs[DirNames.dynamicHeaders].unpackedDir + "\\" + i.ToString("D4"), i, 0); } From 156f9ec409466d4f4f853c6382fc8d78133e9a7e Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Thu, 9 May 2024 13:06:33 +0200 Subject: [PATCH 40/40] Fully Added all DSUtils changes Co-authored-by: AdAstra-LD --- DS_Map/DSUtils/ARM9.cs | 2 +- DS_Map/Main Window.Designer.cs | 1135 +++++++++++++------------ DS_Map/Main Window.cs | 38 +- DS_Map/Main Window.resx | 2 +- DS_Map/PatchToolboxDialog.Designer.cs | 2 +- DS_Map/PatchToolboxDialog.cs | 2 +- DS_Map/ROMFiles/MapFile.cs | 2 +- DS_Map/RomInfo.cs | 4 +- 8 files changed, 594 insertions(+), 593 deletions(-) diff --git a/DS_Map/DSUtils/ARM9.cs b/DS_Map/DSUtils/ARM9.cs index 7590d2d..50e85d0 100644 --- a/DS_Map/DSUtils/ARM9.cs +++ b/DS_Map/DSUtils/ARM9.cs @@ -42,7 +42,7 @@ namespace DSPRE { return new FileInfo(path).Length <= MAX_SIZE; } public static bool CheckCompressionMark() { - return BitConverter.ToInt32(ReadBytes((uint)(RomInfo.gameFamily == gFamEnum.DP ? 0xB7C : 0xBB4), 4), 0) != 0; + return BitConverter.ToInt32(ReadBytes((uint)(RomInfo.gameFamily == GameFamilies.DP ? 0xB7C : 0xBB4), 4), 0) != 0; } public static byte[] ReadBytes(uint startOffset, long numberOfBytes = 0) { diff --git a/DS_Map/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs index 94a1084..36c66a0 100644 --- a/DS_Map/Main Window.Designer.cs +++ b/DS_Map/Main Window.Designer.cs @@ -332,6 +332,7 @@ this.addNSBTXButton = new System.Windows.Forms.Button(); this.exportNSBTXButton = new System.Windows.Forms.Button(); this.importNSBTXButton = new System.Windows.Forms.Button(); + this.texturePictureBox = new DSPRE.OffsetPictureBox(); this.palettesLabel = new System.Windows.Forms.Label(); this.texturesLabel = new System.Windows.Forms.Label(); this.palettesListBox = new System.Windows.Forms.ListBox(); @@ -508,7 +509,9 @@ this.importEventFileButton = new System.Windows.Forms.Button(); this.saveEventsButton = new System.Windows.Forms.Button(); this.tabPageScriptEditor = new System.Windows.Forms.TabPage(); + this.scriptEditor = new DSPRE.Editors.ScriptEditor(); this.tabPageLevelScriptEditor = new System.Windows.Forms.TabPage(); + this.levelScriptEditor = new DSPRE.Editors.LevelScriptEditor(); this.textEditorTabPage = new System.Windows.Forms.TabPage(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.label6 = new System.Windows.Forms.Label(); @@ -579,10 +582,16 @@ this.label61 = new System.Windows.Forms.Label(); this.label62 = new System.Windows.Forms.Label(); this.poke6MovesGroupBox = new System.Windows.Forms.GroupBox(); + this.partyMove6_1ComboBox = new DSPRE.InputComboBox(); + this.partyMove6_2ComboBox = new DSPRE.InputComboBox(); + this.partyMove6_3ComboBox = new DSPRE.InputComboBox(); + this.partyMove6_4ComboBox = new DSPRE.InputComboBox(); this.partyIV6UpDown = new System.Windows.Forms.NumericUpDown(); this.partyLevel6UpDown = new System.Windows.Forms.NumericUpDown(); this.partyBall6UpDown = new System.Windows.Forms.NumericUpDown(); + this.partyItem6ComboBox = new DSPRE.InputComboBox(); this.partyPokemon6PictureBox = new System.Windows.Forms.PictureBox(); + this.partyPokemon6ComboBox = new DSPRE.InputComboBox(); this.party5GroupBox = new System.Windows.Forms.GroupBox(); this.partyForm5ComboBox = new System.Windows.Forms.ComboBox(); this.partyAbility5ComboBox = new System.Windows.Forms.ComboBox(); @@ -592,10 +601,16 @@ this.label58 = new System.Windows.Forms.Label(); this.label59 = new System.Windows.Forms.Label(); this.poke5MovesGroupBox = new System.Windows.Forms.GroupBox(); + this.partyMove5_1ComboBox = new DSPRE.InputComboBox(); + this.partyMove5_2ComboBox = new DSPRE.InputComboBox(); + this.partyMove5_3ComboBox = new DSPRE.InputComboBox(); + this.partyMove5_4ComboBox = new DSPRE.InputComboBox(); this.partyIV5UpDown = new System.Windows.Forms.NumericUpDown(); this.partyLevel5UpDown = new System.Windows.Forms.NumericUpDown(); this.partyBall5UpDown = new System.Windows.Forms.NumericUpDown(); + this.partyItem5ComboBox = new DSPRE.InputComboBox(); this.partyPokemon5PictureBox = new System.Windows.Forms.PictureBox(); + this.partyPokemon5ComboBox = new DSPRE.InputComboBox(); this.party4GroupBox = new System.Windows.Forms.GroupBox(); this.partyForm4ComboBox = new System.Windows.Forms.ComboBox(); this.partyAbility4ComboBox = new System.Windows.Forms.ComboBox(); @@ -605,10 +620,16 @@ this.label55 = new System.Windows.Forms.Label(); this.label56 = new System.Windows.Forms.Label(); this.poke4MovesGroupBox = new System.Windows.Forms.GroupBox(); + this.partyMove4_1ComboBox = new DSPRE.InputComboBox(); + this.partyMove4_2ComboBox = new DSPRE.InputComboBox(); + this.partyMove4_3ComboBox = new DSPRE.InputComboBox(); + this.partyMove4_4ComboBox = new DSPRE.InputComboBox(); this.partyIV4UpDown = new System.Windows.Forms.NumericUpDown(); this.partyLevel4UpDown = new System.Windows.Forms.NumericUpDown(); this.partyBall4UpDown = new System.Windows.Forms.NumericUpDown(); + this.partyItem4ComboBox = new DSPRE.InputComboBox(); this.partyPokemon4PictureBox = new System.Windows.Forms.PictureBox(); + this.partyPokemon4ComboBox = new DSPRE.InputComboBox(); this.party3GroupBox = new System.Windows.Forms.GroupBox(); this.partyForm3ComboBox = new System.Windows.Forms.ComboBox(); this.partyAbility3ComboBox = new System.Windows.Forms.ComboBox(); @@ -618,10 +639,16 @@ this.label52 = new System.Windows.Forms.Label(); this.label53 = new System.Windows.Forms.Label(); this.poke3MovesGroupBox = new System.Windows.Forms.GroupBox(); + this.partyMove3_1ComboBox = new DSPRE.InputComboBox(); + this.partyMove3_2ComboBox = new DSPRE.InputComboBox(); + this.partyMove3_3ComboBox = new DSPRE.InputComboBox(); + this.partyMove3_4ComboBox = new DSPRE.InputComboBox(); this.partyIV3UpDown = new System.Windows.Forms.NumericUpDown(); this.partyLevel3UpDown = new System.Windows.Forms.NumericUpDown(); this.partyBall3UpDown = new System.Windows.Forms.NumericUpDown(); + this.partyItem3ComboBox = new DSPRE.InputComboBox(); this.partyPokemon3PictureBox = new System.Windows.Forms.PictureBox(); + this.partyPokemon3ComboBox = new DSPRE.InputComboBox(); this.party2GroupBox = new System.Windows.Forms.GroupBox(); this.partyForm2ComboBox = new System.Windows.Forms.ComboBox(); this.partyAbility2ComboBox = new System.Windows.Forms.ComboBox(); @@ -631,10 +658,16 @@ this.label49 = new System.Windows.Forms.Label(); this.label50 = new System.Windows.Forms.Label(); this.poke2MovesGroupBox = new System.Windows.Forms.GroupBox(); + this.partyMove2_1ComboBox = new DSPRE.InputComboBox(); + this.partyMove2_2ComboBox = new DSPRE.InputComboBox(); + this.partyMove2_3ComboBox = new DSPRE.InputComboBox(); + this.partyMove2_4ComboBox = new DSPRE.InputComboBox(); this.partyIV2UpDown = new System.Windows.Forms.NumericUpDown(); this.partyLevel2UpDown = new System.Windows.Forms.NumericUpDown(); this.partyBall2UpDown = new System.Windows.Forms.NumericUpDown(); + this.partyItem2ComboBox = new DSPRE.InputComboBox(); this.partyPokemon2PictureBox = new System.Windows.Forms.PictureBox(); + this.partyPokemon2ComboBox = new DSPRE.InputComboBox(); this.party1GroupBox = new System.Windows.Forms.GroupBox(); this.partyForm1ComboBox = new System.Windows.Forms.ComboBox(); this.partyAbility1ComboBox = new System.Windows.Forms.ComboBox(); @@ -644,10 +677,16 @@ this.label46 = new System.Windows.Forms.Label(); this.label45 = new System.Windows.Forms.Label(); this.poke1MovesGroupBox = new System.Windows.Forms.GroupBox(); + this.partyMove1_1ComboBox = new DSPRE.InputComboBox(); + this.partyMove1_2ComboBox = new DSPRE.InputComboBox(); + this.partyMove1_3ComboBox = new DSPRE.InputComboBox(); + this.partyMove1_4ComboBox = new DSPRE.InputComboBox(); this.partyIV1UpDown = new System.Windows.Forms.NumericUpDown(); this.partyLevel1UpDown = new System.Windows.Forms.NumericUpDown(); this.partyBall1UpDown = new System.Windows.Forms.NumericUpDown(); + this.partyItem1ComboBox = new DSPRE.InputComboBox(); this.partyPokemon1PictureBox = new System.Windows.Forms.PictureBox(); + this.partyPokemon1ComboBox = new DSPRE.InputComboBox(); this.groupBox27 = new System.Windows.Forms.GroupBox(); this.eyeContactMusicAltLabel = new System.Windows.Forms.Label(); this.encounterSSEQAltUpDown = new System.Windows.Forms.NumericUpDown(); @@ -677,6 +716,10 @@ this.trainerAI10CheckBox = new System.Windows.Forms.CheckBox(); this.trainerAI11CheckBox = new System.Windows.Forms.CheckBox(); this.trainerItemsGroupBox = new System.Windows.Forms.GroupBox(); + this.trainerItem1ComboBox = new DSPRE.InputComboBox(); + this.trainerItem2ComboBox = new DSPRE.InputComboBox(); + this.trainerItem3ComboBox = new DSPRE.InputComboBox(); + this.trainerItem4ComboBox = new DSPRE.InputComboBox(); this.deleteTrainerButton = new System.Windows.Forms.Button(); this.trainerItemsCheckBox = new System.Windows.Forms.CheckBox(); this.addTrainerButton = new System.Windows.Forms.Button(); @@ -736,6 +779,7 @@ this.headerConditionalMusicComboBox = new System.Windows.Forms.ComboBox(); this.conditionalMusicTableListBox = new System.Windows.Forms.ListBox(); this.tabPageEncountersEditor = new System.Windows.Forms.TabPage(); + this.encountersEditor = new DSPRE.Editors.EncountersEditor(); this.mainTabImageList = new System.Windows.Forms.ImageList(this.components); this.gameIcon = new System.Windows.Forms.PictureBox(); this.languageLabel = new System.Windows.Forms.Label(); @@ -808,50 +852,6 @@ this.separator_afterMiscButtons = new System.Windows.Forms.ToolStripSeparator(); this.versionLabel = new System.Windows.Forms.Label(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.texturePictureBox = new DSPRE.OffsetPictureBox(); - this.scriptEditor = new DSPRE.Editors.ScriptEditor(); - this.levelScriptEditor = new DSPRE.Editors.LevelScriptEditor(); - this.partyMove6_1ComboBox = new DSPRE.InputComboBox(); - this.partyMove6_2ComboBox = new DSPRE.InputComboBox(); - this.partyMove6_3ComboBox = new DSPRE.InputComboBox(); - this.partyMove6_4ComboBox = new DSPRE.InputComboBox(); - this.partyItem6ComboBox = new DSPRE.InputComboBox(); - this.partyPokemon6ComboBox = new DSPRE.InputComboBox(); - this.partyMove5_1ComboBox = new DSPRE.InputComboBox(); - this.partyMove5_2ComboBox = new DSPRE.InputComboBox(); - this.partyMove5_3ComboBox = new DSPRE.InputComboBox(); - this.partyMove5_4ComboBox = new DSPRE.InputComboBox(); - this.partyItem5ComboBox = new DSPRE.InputComboBox(); - this.partyPokemon5ComboBox = new DSPRE.InputComboBox(); - this.partyMove4_1ComboBox = new DSPRE.InputComboBox(); - this.partyMove4_2ComboBox = new DSPRE.InputComboBox(); - this.partyMove4_3ComboBox = new DSPRE.InputComboBox(); - this.partyMove4_4ComboBox = new DSPRE.InputComboBox(); - this.partyItem4ComboBox = new DSPRE.InputComboBox(); - this.partyPokemon4ComboBox = new DSPRE.InputComboBox(); - this.partyMove3_1ComboBox = new DSPRE.InputComboBox(); - this.partyMove3_2ComboBox = new DSPRE.InputComboBox(); - this.partyMove3_3ComboBox = new DSPRE.InputComboBox(); - this.partyMove3_4ComboBox = new DSPRE.InputComboBox(); - this.partyItem3ComboBox = new DSPRE.InputComboBox(); - this.partyPokemon3ComboBox = new DSPRE.InputComboBox(); - this.partyMove2_1ComboBox = new DSPRE.InputComboBox(); - this.partyMove2_2ComboBox = new DSPRE.InputComboBox(); - this.partyMove2_3ComboBox = new DSPRE.InputComboBox(); - this.partyMove2_4ComboBox = new DSPRE.InputComboBox(); - this.partyItem2ComboBox = new DSPRE.InputComboBox(); - this.partyPokemon2ComboBox = new DSPRE.InputComboBox(); - this.partyMove1_1ComboBox = new DSPRE.InputComboBox(); - this.partyMove1_2ComboBox = new DSPRE.InputComboBox(); - this.partyMove1_3ComboBox = new DSPRE.InputComboBox(); - this.partyMove1_4ComboBox = new DSPRE.InputComboBox(); - this.partyItem1ComboBox = new DSPRE.InputComboBox(); - this.partyPokemon1ComboBox = new DSPRE.InputComboBox(); - this.trainerItem1ComboBox = new DSPRE.InputComboBox(); - this.trainerItem2ComboBox = new DSPRE.InputComboBox(); - this.trainerItem3ComboBox = new DSPRE.InputComboBox(); - this.trainerItem4ComboBox = new DSPRE.InputComboBox(); - this.encountersEditor = new DSPRE.Editors.EncountersEditor(); this.mainTabControl.SuspendLayout(); this.headerEditorTabPage.SuspendLayout(); this.worldmapCoordsGroupBox.SuspendLayout(); @@ -939,6 +939,7 @@ ((System.ComponentModel.ISupportInitialize)(this.areaDataDynamicTexturesNumericUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.areaDataMapTilesetUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.areaDataBuildingTilesetUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.texturePictureBox)).BeginInit(); this.eventEditorTabPage.SuspendLayout(); this.groupBox21.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.eventAreaDataUpDown)).BeginInit(); @@ -1089,7 +1090,6 @@ this.menuStrip1.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.mainToolStrip.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.texturePictureBox)).BeginInit(); this.SuspendLayout(); // // mainTabControl @@ -2544,7 +2544,7 @@ this.setSpawnPointButton.Image = global::DSPRE.Properties.Resources.spawnCoordsMatrixeditorIcon; this.setSpawnPointButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.setSpawnPointButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.setSpawnPointButton.Location = new System.Drawing.Point(12, -8261); + this.setSpawnPointButton.Location = new System.Drawing.Point(12, -9463); this.setSpawnPointButton.Name = "setSpawnPointButton"; this.setSpawnPointButton.Size = new System.Drawing.Size(117, 43); this.setSpawnPointButton.TabIndex = 35; @@ -2560,7 +2560,7 @@ this.saveMatrixButton.Image = global::DSPRE.Properties.Resources.save_rom; this.saveMatrixButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.saveMatrixButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.saveMatrixButton.Location = new System.Drawing.Point(12, -8217); + this.saveMatrixButton.Location = new System.Drawing.Point(12, -9419); this.saveMatrixButton.Name = "saveMatrixButton"; this.saveMatrixButton.Size = new System.Drawing.Size(117, 43); this.saveMatrixButton.TabIndex = 34; @@ -2744,7 +2744,7 @@ this.matrixTabControl.Multiline = true; this.matrixTabControl.Name = "matrixTabControl"; this.matrixTabControl.SelectedIndex = 0; - this.matrixTabControl.Size = new System.Drawing.Size(1040, 658); + this.matrixTabControl.Size = new System.Drawing.Size(1040, 625); this.matrixTabControl.TabIndex = 18; // // headersTabPage @@ -2753,7 +2753,7 @@ this.headersTabPage.Location = new System.Drawing.Point(4, 22); this.headersTabPage.Name = "headersTabPage"; this.headersTabPage.Padding = new System.Windows.Forms.Padding(3); - this.headersTabPage.Size = new System.Drawing.Size(1032, 632); + this.headersTabPage.Size = new System.Drawing.Size(1032, 599); this.headersTabPage.TabIndex = 1; this.headersTabPage.Text = "Map Headers"; this.headersTabPage.UseVisualStyleBackColor = true; @@ -2804,7 +2804,7 @@ this.headersGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; this.headersGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; this.headersGridView.ShowCellErrors = false; - this.headersGridView.Size = new System.Drawing.Size(1026, 593); + this.headersGridView.Size = new System.Drawing.Size(1032, 576); this.headersGridView.TabIndex = 1; this.headersGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.headersGridView_CellFormatting); this.headersGridView.CellMouseDoubleClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.headersGridView_CellMouseDoubleClick); @@ -2816,7 +2816,7 @@ this.heightsTabPage.Controls.Add(this.heightsGridView); this.heightsTabPage.Location = new System.Drawing.Point(4, 22); this.heightsTabPage.Name = "heightsTabPage"; - this.heightsTabPage.Size = new System.Drawing.Size(992, 624); + this.heightsTabPage.Size = new System.Drawing.Size(1032, 599); this.heightsTabPage.TabIndex = 2; this.heightsTabPage.Text = "Map Heights"; this.heightsTabPage.UseVisualStyleBackColor = true; @@ -2879,7 +2879,7 @@ this.mapFilesTabPage.Controls.Add(this.mapFilesGridView); this.mapFilesTabPage.Location = new System.Drawing.Point(4, 22); this.mapFilesTabPage.Name = "mapFilesTabPage"; - this.mapFilesTabPage.Size = new System.Drawing.Size(992, 624); + this.mapFilesTabPage.Size = new System.Drawing.Size(1032, 599); this.mapFilesTabPage.TabIndex = 3; this.mapFilesTabPage.Text = "Map Files"; this.mapFilesTabPage.UseVisualStyleBackColor = true; @@ -4340,7 +4340,7 @@ this.radio3D.AutoSize = true; this.radio3D.Checked = true; this.radio3D.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.radio3D.Location = new System.Drawing.Point(-13806, -8237); + this.radio3D.Location = new System.Drawing.Point(-15792, -9439); this.radio3D.Name = "radio3D"; this.radio3D.Size = new System.Drawing.Size(31, 23); this.radio3D.TabIndex = 26; @@ -4355,7 +4355,7 @@ 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(-13806, -8213); + this.radio2D.Location = new System.Drawing.Point(-15792, -9415); this.radio2D.Name = "radio2D"; this.radio2D.Size = new System.Drawing.Size(31, 23); this.radio2D.TabIndex = 25; @@ -4370,7 +4370,7 @@ 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(1140, -8189); + this.wireframeCheckBox.Location = new System.Drawing.Point(1140, -9391); this.wireframeCheckBox.Name = "wireframeCheckBox"; this.wireframeCheckBox.Size = new System.Drawing.Size(31, 23); this.wireframeCheckBox.TabIndex = 27; @@ -4808,6 +4808,20 @@ this.importNSBTXButton.UseVisualStyleBackColor = true; this.importNSBTXButton.Click += new System.EventHandler(this.importNSBTXButton_Click); // + // texturePictureBox + // + this.texturePictureBox.BackColor = System.Drawing.Color.White; + this.texturePictureBox.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.texturePictureBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.texturePictureBox.Image = global::DSPRE.Properties.Resources.alphabgCheckerboard; + this.texturePictureBox.invertDrag = true; + this.texturePictureBox.Location = new System.Drawing.Point(732, 52); + this.texturePictureBox.Name = "texturePictureBox"; + this.texturePictureBox.Size = new System.Drawing.Size(256, 256); + this.texturePictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.texturePictureBox.TabIndex = 7; + this.texturePictureBox.TabStop = false; + // // palettesLabel // this.palettesLabel.AutoSize = true; @@ -6945,6 +6959,15 @@ this.tabPageScriptEditor.Text = "Script Editor"; this.tabPageScriptEditor.UseVisualStyleBackColor = true; // + // scriptEditor + // + this.scriptEditor.Location = new System.Drawing.Point(2, 3); + this.scriptEditor.Margin = new System.Windows.Forms.Padding(4); + this.scriptEditor.Name = "scriptEditor"; + this.scriptEditor.scriptEditorIsReady = false; + this.scriptEditor.Size = new System.Drawing.Size(1177, 735); + this.scriptEditor.TabIndex = 0; + // // tabPageLevelScriptEditor // this.tabPageLevelScriptEditor.Controls.Add(this.levelScriptEditor); @@ -6957,6 +6980,16 @@ this.tabPageLevelScriptEditor.Text = "Level Script Editor"; this.tabPageLevelScriptEditor.UseVisualStyleBackColor = true; // + // levelScriptEditor + // + this.levelScriptEditor.BackColor = System.Drawing.SystemColors.Control; + this.levelScriptEditor.levelScriptEditorIsReady = false; + this.levelScriptEditor.Location = new System.Drawing.Point(6, 8); + this.levelScriptEditor.Margin = new System.Windows.Forms.Padding(4); + this.levelScriptEditor.Name = "levelScriptEditor"; + this.levelScriptEditor.Size = new System.Drawing.Size(408, 622); + this.levelScriptEditor.TabIndex = 0; + // // textEditorTabPage // this.textEditorTabPage.Controls.Add(this.tableLayoutPanel1); @@ -7829,6 +7862,54 @@ this.poke6MovesGroupBox.TabStop = false; this.poke6MovesGroupBox.Text = "Moves"; // + // partyMove6_1ComboBox + // + this.partyMove6_1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove6_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove6_1ComboBox.Enabled = false; + this.partyMove6_1ComboBox.FormattingEnabled = true; + this.partyMove6_1ComboBox.Location = new System.Drawing.Point(10, 21); + this.partyMove6_1ComboBox.Name = "partyMove6_1ComboBox"; + this.partyMove6_1ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove6_1ComboBox.TabIndex = 3; + this.partyMove6_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove6_2ComboBox + // + this.partyMove6_2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove6_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove6_2ComboBox.Enabled = false; + this.partyMove6_2ComboBox.FormattingEnabled = true; + this.partyMove6_2ComboBox.Location = new System.Drawing.Point(116, 21); + this.partyMove6_2ComboBox.Name = "partyMove6_2ComboBox"; + this.partyMove6_2ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove6_2ComboBox.TabIndex = 6; + this.partyMove6_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove6_3ComboBox + // + this.partyMove6_3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove6_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove6_3ComboBox.Enabled = false; + this.partyMove6_3ComboBox.FormattingEnabled = true; + this.partyMove6_3ComboBox.Location = new System.Drawing.Point(10, 48); + this.partyMove6_3ComboBox.Name = "partyMove6_3ComboBox"; + this.partyMove6_3ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove6_3ComboBox.TabIndex = 5; + this.partyMove6_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove6_4ComboBox + // + this.partyMove6_4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove6_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove6_4ComboBox.Enabled = false; + this.partyMove6_4ComboBox.FormattingEnabled = true; + this.partyMove6_4ComboBox.Location = new System.Drawing.Point(116, 48); + this.partyMove6_4ComboBox.Name = "partyMove6_4ComboBox"; + this.partyMove6_4ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove6_4ComboBox.TabIndex = 7; + this.partyMove6_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // // partyIV6UpDown // this.partyIV6UpDown.Location = new System.Drawing.Point(48, 92); @@ -7870,6 +7951,18 @@ this.partyBall6UpDown.Size = new System.Drawing.Size(49, 20); this.partyBall6UpDown.TabIndex = 3; // + // partyItem6ComboBox + // + this.partyItem6ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyItem6ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyItem6ComboBox.Enabled = false; + this.partyItem6ComboBox.FormattingEnabled = true; + this.partyItem6ComboBox.Location = new System.Drawing.Point(228, 28); + this.partyItem6ComboBox.Name = "partyItem6ComboBox"; + this.partyItem6ComboBox.Size = new System.Drawing.Size(103, 21); + this.partyItem6ComboBox.TabIndex = 2; + this.partyItem6ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem6ComboBox_SelectedIndexChanged); + // // partyPokemon6PictureBox // this.partyPokemon6PictureBox.Location = new System.Drawing.Point(11, 23); @@ -7879,6 +7972,17 @@ this.partyPokemon6PictureBox.TabIndex = 1; this.partyPokemon6PictureBox.TabStop = false; // + // partyPokemon6ComboBox + // + this.partyPokemon6ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyPokemon6ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyPokemon6ComboBox.FormattingEnabled = true; + this.partyPokemon6ComboBox.Location = new System.Drawing.Point(58, 28); + this.partyPokemon6ComboBox.Name = "partyPokemon6ComboBox"; + this.partyPokemon6ComboBox.Size = new System.Drawing.Size(126, 21); + this.partyPokemon6ComboBox.TabIndex = 0; + this.partyPokemon6ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon6ComboBox_SelectedIndexChanged); + // // party5GroupBox // this.party5GroupBox.Controls.Add(this.partyForm5ComboBox); @@ -7982,6 +8086,54 @@ this.poke5MovesGroupBox.TabStop = false; this.poke5MovesGroupBox.Text = "Moves"; // + // partyMove5_1ComboBox + // + this.partyMove5_1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove5_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove5_1ComboBox.Enabled = false; + this.partyMove5_1ComboBox.FormattingEnabled = true; + this.partyMove5_1ComboBox.Location = new System.Drawing.Point(10, 21); + this.partyMove5_1ComboBox.Name = "partyMove5_1ComboBox"; + this.partyMove5_1ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove5_1ComboBox.TabIndex = 3; + this.partyMove5_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove5_2ComboBox + // + this.partyMove5_2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove5_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove5_2ComboBox.Enabled = false; + this.partyMove5_2ComboBox.FormattingEnabled = true; + this.partyMove5_2ComboBox.Location = new System.Drawing.Point(116, 21); + this.partyMove5_2ComboBox.Name = "partyMove5_2ComboBox"; + this.partyMove5_2ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove5_2ComboBox.TabIndex = 6; + this.partyMove5_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove5_3ComboBox + // + this.partyMove5_3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove5_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove5_3ComboBox.Enabled = false; + this.partyMove5_3ComboBox.FormattingEnabled = true; + this.partyMove5_3ComboBox.Location = new System.Drawing.Point(10, 48); + this.partyMove5_3ComboBox.Name = "partyMove5_3ComboBox"; + this.partyMove5_3ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove5_3ComboBox.TabIndex = 5; + this.partyMove5_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove5_4ComboBox + // + this.partyMove5_4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove5_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove5_4ComboBox.Enabled = false; + this.partyMove5_4ComboBox.FormattingEnabled = true; + this.partyMove5_4ComboBox.Location = new System.Drawing.Point(116, 48); + this.partyMove5_4ComboBox.Name = "partyMove5_4ComboBox"; + this.partyMove5_4ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove5_4ComboBox.TabIndex = 7; + this.partyMove5_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // // partyIV5UpDown // this.partyIV5UpDown.Location = new System.Drawing.Point(48, 92); @@ -8023,6 +8175,18 @@ this.partyBall5UpDown.Size = new System.Drawing.Size(49, 20); this.partyBall5UpDown.TabIndex = 3; // + // partyItem5ComboBox + // + this.partyItem5ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyItem5ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyItem5ComboBox.Enabled = false; + this.partyItem5ComboBox.FormattingEnabled = true; + this.partyItem5ComboBox.Location = new System.Drawing.Point(228, 28); + this.partyItem5ComboBox.Name = "partyItem5ComboBox"; + this.partyItem5ComboBox.Size = new System.Drawing.Size(103, 21); + this.partyItem5ComboBox.TabIndex = 2; + this.partyItem5ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem5ComboBox_SelectedIndexChanged); + // // partyPokemon5PictureBox // this.partyPokemon5PictureBox.Location = new System.Drawing.Point(11, 23); @@ -8032,6 +8196,17 @@ this.partyPokemon5PictureBox.TabIndex = 1; this.partyPokemon5PictureBox.TabStop = false; // + // partyPokemon5ComboBox + // + this.partyPokemon5ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyPokemon5ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyPokemon5ComboBox.FormattingEnabled = true; + this.partyPokemon5ComboBox.Location = new System.Drawing.Point(58, 28); + this.partyPokemon5ComboBox.Name = "partyPokemon5ComboBox"; + this.partyPokemon5ComboBox.Size = new System.Drawing.Size(126, 21); + this.partyPokemon5ComboBox.TabIndex = 0; + this.partyPokemon5ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon5ComboBox_SelectedIndexChanged); + // // party4GroupBox // this.party4GroupBox.Controls.Add(this.partyForm4ComboBox); @@ -8135,6 +8310,54 @@ this.poke4MovesGroupBox.TabStop = false; this.poke4MovesGroupBox.Text = "Moves"; // + // partyMove4_1ComboBox + // + this.partyMove4_1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove4_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove4_1ComboBox.Enabled = false; + this.partyMove4_1ComboBox.FormattingEnabled = true; + this.partyMove4_1ComboBox.Location = new System.Drawing.Point(10, 21); + this.partyMove4_1ComboBox.Name = "partyMove4_1ComboBox"; + this.partyMove4_1ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove4_1ComboBox.TabIndex = 3; + this.partyMove4_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove4_2ComboBox + // + this.partyMove4_2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove4_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove4_2ComboBox.Enabled = false; + this.partyMove4_2ComboBox.FormattingEnabled = true; + this.partyMove4_2ComboBox.Location = new System.Drawing.Point(116, 21); + this.partyMove4_2ComboBox.Name = "partyMove4_2ComboBox"; + this.partyMove4_2ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove4_2ComboBox.TabIndex = 6; + this.partyMove4_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove4_3ComboBox + // + this.partyMove4_3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove4_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove4_3ComboBox.Enabled = false; + this.partyMove4_3ComboBox.FormattingEnabled = true; + this.partyMove4_3ComboBox.Location = new System.Drawing.Point(10, 48); + this.partyMove4_3ComboBox.Name = "partyMove4_3ComboBox"; + this.partyMove4_3ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove4_3ComboBox.TabIndex = 5; + this.partyMove4_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove4_4ComboBox + // + this.partyMove4_4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove4_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove4_4ComboBox.Enabled = false; + this.partyMove4_4ComboBox.FormattingEnabled = true; + this.partyMove4_4ComboBox.Location = new System.Drawing.Point(116, 48); + this.partyMove4_4ComboBox.Name = "partyMove4_4ComboBox"; + this.partyMove4_4ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove4_4ComboBox.TabIndex = 7; + this.partyMove4_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // // partyIV4UpDown // this.partyIV4UpDown.Location = new System.Drawing.Point(48, 92); @@ -8176,6 +8399,18 @@ this.partyBall4UpDown.Size = new System.Drawing.Size(49, 20); this.partyBall4UpDown.TabIndex = 3; // + // partyItem4ComboBox + // + this.partyItem4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyItem4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyItem4ComboBox.Enabled = false; + this.partyItem4ComboBox.FormattingEnabled = true; + this.partyItem4ComboBox.Location = new System.Drawing.Point(228, 28); + this.partyItem4ComboBox.Name = "partyItem4ComboBox"; + this.partyItem4ComboBox.Size = new System.Drawing.Size(103, 21); + this.partyItem4ComboBox.TabIndex = 2; + this.partyItem4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem4ComboBox_SelectedIndexChanged); + // // partyPokemon4PictureBox // this.partyPokemon4PictureBox.Location = new System.Drawing.Point(11, 23); @@ -8185,6 +8420,17 @@ this.partyPokemon4PictureBox.TabIndex = 1; this.partyPokemon4PictureBox.TabStop = false; // + // partyPokemon4ComboBox + // + this.partyPokemon4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyPokemon4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyPokemon4ComboBox.FormattingEnabled = true; + this.partyPokemon4ComboBox.Location = new System.Drawing.Point(58, 28); + this.partyPokemon4ComboBox.Name = "partyPokemon4ComboBox"; + this.partyPokemon4ComboBox.Size = new System.Drawing.Size(126, 21); + this.partyPokemon4ComboBox.TabIndex = 0; + this.partyPokemon4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon4ComboBox_SelectedIndexChanged); + // // party3GroupBox // this.party3GroupBox.Controls.Add(this.partyForm3ComboBox); @@ -8288,6 +8534,54 @@ this.poke3MovesGroupBox.TabStop = false; this.poke3MovesGroupBox.Text = "Moves"; // + // partyMove3_1ComboBox + // + this.partyMove3_1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove3_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove3_1ComboBox.Enabled = false; + this.partyMove3_1ComboBox.FormattingEnabled = true; + this.partyMove3_1ComboBox.Location = new System.Drawing.Point(10, 21); + this.partyMove3_1ComboBox.Name = "partyMove3_1ComboBox"; + this.partyMove3_1ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove3_1ComboBox.TabIndex = 3; + this.partyMove3_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove3_2ComboBox + // + this.partyMove3_2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove3_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove3_2ComboBox.Enabled = false; + this.partyMove3_2ComboBox.FormattingEnabled = true; + this.partyMove3_2ComboBox.Location = new System.Drawing.Point(116, 21); + this.partyMove3_2ComboBox.Name = "partyMove3_2ComboBox"; + this.partyMove3_2ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove3_2ComboBox.TabIndex = 6; + this.partyMove3_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove3_3ComboBox + // + this.partyMove3_3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove3_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove3_3ComboBox.Enabled = false; + this.partyMove3_3ComboBox.FormattingEnabled = true; + this.partyMove3_3ComboBox.Location = new System.Drawing.Point(10, 48); + this.partyMove3_3ComboBox.Name = "partyMove3_3ComboBox"; + this.partyMove3_3ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove3_3ComboBox.TabIndex = 5; + this.partyMove3_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove3_4ComboBox + // + this.partyMove3_4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove3_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove3_4ComboBox.Enabled = false; + this.partyMove3_4ComboBox.FormattingEnabled = true; + this.partyMove3_4ComboBox.Location = new System.Drawing.Point(116, 48); + this.partyMove3_4ComboBox.Name = "partyMove3_4ComboBox"; + this.partyMove3_4ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove3_4ComboBox.TabIndex = 7; + this.partyMove3_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // // partyIV3UpDown // this.partyIV3UpDown.Location = new System.Drawing.Point(48, 92); @@ -8329,6 +8623,18 @@ this.partyBall3UpDown.Size = new System.Drawing.Size(49, 20); this.partyBall3UpDown.TabIndex = 3; // + // partyItem3ComboBox + // + this.partyItem3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyItem3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyItem3ComboBox.Enabled = false; + this.partyItem3ComboBox.FormattingEnabled = true; + this.partyItem3ComboBox.Location = new System.Drawing.Point(228, 28); + this.partyItem3ComboBox.Name = "partyItem3ComboBox"; + this.partyItem3ComboBox.Size = new System.Drawing.Size(103, 21); + this.partyItem3ComboBox.TabIndex = 2; + this.partyItem3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem3ComboBox_SelectedIndexChanged); + // // partyPokemon3PictureBox // this.partyPokemon3PictureBox.Location = new System.Drawing.Point(11, 23); @@ -8338,6 +8644,17 @@ this.partyPokemon3PictureBox.TabIndex = 1; this.partyPokemon3PictureBox.TabStop = false; // + // partyPokemon3ComboBox + // + this.partyPokemon3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyPokemon3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyPokemon3ComboBox.FormattingEnabled = true; + this.partyPokemon3ComboBox.Location = new System.Drawing.Point(58, 28); + this.partyPokemon3ComboBox.Name = "partyPokemon3ComboBox"; + this.partyPokemon3ComboBox.Size = new System.Drawing.Size(126, 21); + this.partyPokemon3ComboBox.TabIndex = 0; + this.partyPokemon3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon3ComboBox_SelectedIndexChanged); + // // party2GroupBox // this.party2GroupBox.Controls.Add(this.partyForm2ComboBox); @@ -8441,6 +8758,54 @@ this.poke2MovesGroupBox.TabStop = false; this.poke2MovesGroupBox.Text = "Moves"; // + // partyMove2_1ComboBox + // + this.partyMove2_1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove2_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove2_1ComboBox.Enabled = false; + this.partyMove2_1ComboBox.FormattingEnabled = true; + this.partyMove2_1ComboBox.Location = new System.Drawing.Point(10, 21); + this.partyMove2_1ComboBox.Name = "partyMove2_1ComboBox"; + this.partyMove2_1ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove2_1ComboBox.TabIndex = 3; + this.partyMove2_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove2_2ComboBox + // + this.partyMove2_2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove2_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove2_2ComboBox.Enabled = false; + this.partyMove2_2ComboBox.FormattingEnabled = true; + this.partyMove2_2ComboBox.Location = new System.Drawing.Point(116, 21); + this.partyMove2_2ComboBox.Name = "partyMove2_2ComboBox"; + this.partyMove2_2ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove2_2ComboBox.TabIndex = 6; + this.partyMove2_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove2_3ComboBox + // + this.partyMove2_3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove2_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove2_3ComboBox.Enabled = false; + this.partyMove2_3ComboBox.FormattingEnabled = true; + this.partyMove2_3ComboBox.Location = new System.Drawing.Point(10, 48); + this.partyMove2_3ComboBox.Name = "partyMove2_3ComboBox"; + this.partyMove2_3ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove2_3ComboBox.TabIndex = 5; + this.partyMove2_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove2_4ComboBox + // + this.partyMove2_4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove2_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove2_4ComboBox.Enabled = false; + this.partyMove2_4ComboBox.FormattingEnabled = true; + this.partyMove2_4ComboBox.Location = new System.Drawing.Point(116, 48); + this.partyMove2_4ComboBox.Name = "partyMove2_4ComboBox"; + this.partyMove2_4ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove2_4ComboBox.TabIndex = 7; + this.partyMove2_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // // partyIV2UpDown // this.partyIV2UpDown.Location = new System.Drawing.Point(48, 92); @@ -8482,6 +8847,18 @@ this.partyBall2UpDown.Size = new System.Drawing.Size(49, 20); this.partyBall2UpDown.TabIndex = 3; // + // partyItem2ComboBox + // + this.partyItem2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyItem2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyItem2ComboBox.Enabled = false; + this.partyItem2ComboBox.FormattingEnabled = true; + this.partyItem2ComboBox.Location = new System.Drawing.Point(228, 28); + this.partyItem2ComboBox.Name = "partyItem2ComboBox"; + this.partyItem2ComboBox.Size = new System.Drawing.Size(103, 21); + this.partyItem2ComboBox.TabIndex = 2; + this.partyItem2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem2ComboBox_SelectedIndexChanged); + // // partyPokemon2PictureBox // this.partyPokemon2PictureBox.Location = new System.Drawing.Point(11, 23); @@ -8491,6 +8868,17 @@ this.partyPokemon2PictureBox.TabIndex = 1; this.partyPokemon2PictureBox.TabStop = false; // + // partyPokemon2ComboBox + // + this.partyPokemon2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyPokemon2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyPokemon2ComboBox.FormattingEnabled = true; + this.partyPokemon2ComboBox.Location = new System.Drawing.Point(58, 28); + this.partyPokemon2ComboBox.Name = "partyPokemon2ComboBox"; + this.partyPokemon2ComboBox.Size = new System.Drawing.Size(126, 21); + this.partyPokemon2ComboBox.TabIndex = 0; + this.partyPokemon2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon2ComboBox_SelectedIndexChanged); + // // party1GroupBox // this.party1GroupBox.Controls.Add(this.partyForm1ComboBox); @@ -8594,6 +8982,54 @@ this.poke1MovesGroupBox.TabStop = false; this.poke1MovesGroupBox.Text = "Moves"; // + // partyMove1_1ComboBox + // + this.partyMove1_1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove1_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove1_1ComboBox.Enabled = false; + this.partyMove1_1ComboBox.FormattingEnabled = true; + this.partyMove1_1ComboBox.Location = new System.Drawing.Point(10, 21); + this.partyMove1_1ComboBox.Name = "partyMove1_1ComboBox"; + this.partyMove1_1ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove1_1ComboBox.TabIndex = 3; + this.partyMove1_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove1_2ComboBox + // + this.partyMove1_2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove1_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove1_2ComboBox.Enabled = false; + this.partyMove1_2ComboBox.FormattingEnabled = true; + this.partyMove1_2ComboBox.Location = new System.Drawing.Point(116, 21); + this.partyMove1_2ComboBox.Name = "partyMove1_2ComboBox"; + this.partyMove1_2ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove1_2ComboBox.TabIndex = 6; + this.partyMove1_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove1_3ComboBox + // + this.partyMove1_3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove1_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove1_3ComboBox.Enabled = false; + this.partyMove1_3ComboBox.FormattingEnabled = true; + this.partyMove1_3ComboBox.Location = new System.Drawing.Point(10, 48); + this.partyMove1_3ComboBox.Name = "partyMove1_3ComboBox"; + this.partyMove1_3ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove1_3ComboBox.TabIndex = 5; + this.partyMove1_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // + // partyMove1_4ComboBox + // + this.partyMove1_4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyMove1_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyMove1_4ComboBox.Enabled = false; + this.partyMove1_4ComboBox.FormattingEnabled = true; + this.partyMove1_4ComboBox.Location = new System.Drawing.Point(116, 48); + this.partyMove1_4ComboBox.Name = "partyMove1_4ComboBox"; + this.partyMove1_4ComboBox.Size = new System.Drawing.Size(100, 21); + this.partyMove1_4ComboBox.TabIndex = 7; + this.partyMove1_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); + // // partyIV1UpDown // this.partyIV1UpDown.Location = new System.Drawing.Point(48, 92); @@ -8635,6 +9071,18 @@ this.partyBall1UpDown.Size = new System.Drawing.Size(49, 20); this.partyBall1UpDown.TabIndex = 3; // + // partyItem1ComboBox + // + this.partyItem1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyItem1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyItem1ComboBox.Enabled = false; + this.partyItem1ComboBox.FormattingEnabled = true; + this.partyItem1ComboBox.Location = new System.Drawing.Point(228, 28); + this.partyItem1ComboBox.Name = "partyItem1ComboBox"; + this.partyItem1ComboBox.Size = new System.Drawing.Size(103, 21); + this.partyItem1ComboBox.TabIndex = 2; + this.partyItem1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem1ComboBox_SelectedIndexChanged); + // // partyPokemon1PictureBox // this.partyPokemon1PictureBox.Location = new System.Drawing.Point(11, 23); @@ -8644,6 +9092,17 @@ this.partyPokemon1PictureBox.TabIndex = 1; this.partyPokemon1PictureBox.TabStop = false; // + // partyPokemon1ComboBox + // + this.partyPokemon1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.partyPokemon1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.partyPokemon1ComboBox.FormattingEnabled = true; + this.partyPokemon1ComboBox.Location = new System.Drawing.Point(58, 28); + this.partyPokemon1ComboBox.Name = "partyPokemon1ComboBox"; + this.partyPokemon1ComboBox.Size = new System.Drawing.Size(126, 21); + this.partyPokemon1ComboBox.TabIndex = 0; + this.partyPokemon1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon1ComboBox_SelectedIndexChanged); + // // groupBox27 // this.groupBox27.Controls.Add(this.eyeContactMusicAltLabel); @@ -8984,6 +9443,46 @@ this.trainerItemsGroupBox.TabStop = false; this.trainerItemsGroupBox.Text = "Trainer Items"; // + // trainerItem1ComboBox + // + this.trainerItem1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.trainerItem1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.trainerItem1ComboBox.FormattingEnabled = true; + this.trainerItem1ComboBox.Location = new System.Drawing.Point(9, 20); + this.trainerItem1ComboBox.Name = "trainerItem1ComboBox"; + this.trainerItem1ComboBox.Size = new System.Drawing.Size(171, 21); + this.trainerItem1ComboBox.TabIndex = 0; + // + // trainerItem2ComboBox + // + this.trainerItem2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.trainerItem2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.trainerItem2ComboBox.FormattingEnabled = true; + this.trainerItem2ComboBox.Location = new System.Drawing.Point(9, 47); + this.trainerItem2ComboBox.Name = "trainerItem2ComboBox"; + this.trainerItem2ComboBox.Size = new System.Drawing.Size(171, 21); + this.trainerItem2ComboBox.TabIndex = 1; + // + // trainerItem3ComboBox + // + this.trainerItem3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.trainerItem3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.trainerItem3ComboBox.FormattingEnabled = true; + this.trainerItem3ComboBox.Location = new System.Drawing.Point(9, 74); + this.trainerItem3ComboBox.Name = "trainerItem3ComboBox"; + this.trainerItem3ComboBox.Size = new System.Drawing.Size(171, 21); + this.trainerItem3ComboBox.TabIndex = 2; + // + // trainerItem4ComboBox + // + this.trainerItem4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.trainerItem4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.trainerItem4ComboBox.FormattingEnabled = true; + this.trainerItem4ComboBox.Location = new System.Drawing.Point(9, 101); + this.trainerItem4ComboBox.Name = "trainerItem4ComboBox"; + this.trainerItem4ComboBox.Size = new System.Drawing.Size(171, 21); + this.trainerItem4ComboBox.TabIndex = 3; + // // deleteTrainerButton // this.deleteTrainerButton.Enabled = false; @@ -9112,7 +9611,8 @@ // // trainerComboBox // - this.trainerComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.trainerComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.trainerComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.trainerComboBox.FormattingEnabled = true; this.trainerComboBox.Location = new System.Drawing.Point(15, 22); this.trainerComboBox.Name = "trainerComboBox"; @@ -9623,6 +10123,14 @@ this.tabPageEncountersEditor.Text = "Encounters"; this.tabPageEncountersEditor.UseVisualStyleBackColor = true; // + // encountersEditor + // + this.encountersEditor.Location = new System.Drawing.Point(6, 3); + this.encountersEditor.Margin = new System.Windows.Forms.Padding(4); + this.encountersEditor.Name = "encountersEditor"; + this.encountersEditor.Size = new System.Drawing.Size(1176, 672); + this.encountersEditor.TabIndex = 0; + // // mainTabImageList // this.mainTabImageList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("mainTabImageList.ImageStream"))); @@ -9736,7 +10244,7 @@ this.romToolboxToolStripMenuItem.Enabled = false; this.romToolboxToolStripMenuItem.Name = "romToolboxToolStripMenuItem"; this.romToolboxToolStripMenuItem.Size = new System.Drawing.Size(220, 22); - this.romToolboxToolStripMenuItem.Text = "ROM Toolbox"; + this.romToolboxToolStripMenuItem.Text = "Patch Toolbox"; this.romToolboxToolStripMenuItem.Click += new System.EventHandler(this.romToolBoxToolStripMenuItem_Click); // // headerSearchToolStripMenuItem @@ -10313,8 +10821,8 @@ this.romToolboxToolStripButton.Margin = new System.Windows.Forms.Padding(4, 6, 0, 2); this.romToolboxToolStripButton.Name = "romToolboxToolStripButton"; this.romToolboxToolStripButton.Size = new System.Drawing.Size(36, 36); - this.romToolboxToolStripButton.Text = "ROM Toolbox"; - this.romToolboxToolStripButton.ToolTipText = "ROM Toolbox"; + this.romToolboxToolStripButton.Text = "Patch Toolbox"; + this.romToolboxToolStripButton.ToolTipText = "Patch Toolbox"; this.romToolboxToolStripButton.Click += new System.EventHandler(this.romToolBoxToolStripMenuItem_Click); // // headerSearchToolStripButton @@ -10359,513 +10867,6 @@ this.versionLabel.Text = "ROM:"; this.versionLabel.Visible = false; // - // texturePictureBox - // - this.texturePictureBox.BackColor = System.Drawing.Color.White; - this.texturePictureBox.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.texturePictureBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.texturePictureBox.Image = global::DSPRE.Properties.Resources.alphabgCheckerboard; - this.texturePictureBox.invertDrag = true; - this.texturePictureBox.Location = new System.Drawing.Point(732, 52); - this.texturePictureBox.Name = "texturePictureBox"; - this.texturePictureBox.Size = new System.Drawing.Size(256, 256); - this.texturePictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.texturePictureBox.TabIndex = 7; - this.texturePictureBox.TabStop = false; - // - // scriptEditor - // - this.scriptEditor.Location = new System.Drawing.Point(2, 3); - this.scriptEditor.Margin = new System.Windows.Forms.Padding(4); - this.scriptEditor.Name = "scriptEditor"; - this.scriptEditor.scriptEditorIsReady = false; - this.scriptEditor.Size = new System.Drawing.Size(1177, 735); - this.scriptEditor.TabIndex = 0; - // - // levelScriptEditor - // - this.levelScriptEditor.BackColor = System.Drawing.SystemColors.Control; - this.levelScriptEditor.levelScriptEditorIsReady = false; - this.levelScriptEditor.Location = new System.Drawing.Point(6, 8); - this.levelScriptEditor.Margin = new System.Windows.Forms.Padding(4); - this.levelScriptEditor.Name = "levelScriptEditor"; - this.levelScriptEditor.Size = new System.Drawing.Size(408, 622); - this.levelScriptEditor.TabIndex = 0; - // - // partyMove6_1ComboBox - // - this.partyMove6_1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove6_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove6_1ComboBox.Enabled = false; - this.partyMove6_1ComboBox.FormattingEnabled = true; - this.partyMove6_1ComboBox.Location = new System.Drawing.Point(10, 21); - this.partyMove6_1ComboBox.Name = "partyMove6_1ComboBox"; - this.partyMove6_1ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove6_1ComboBox.TabIndex = 3; - this.partyMove6_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove6_2ComboBox - // - this.partyMove6_2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove6_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove6_2ComboBox.Enabled = false; - this.partyMove6_2ComboBox.FormattingEnabled = true; - this.partyMove6_2ComboBox.Location = new System.Drawing.Point(116, 21); - this.partyMove6_2ComboBox.Name = "partyMove6_2ComboBox"; - this.partyMove6_2ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove6_2ComboBox.TabIndex = 6; - this.partyMove6_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove6_3ComboBox - // - this.partyMove6_3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove6_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove6_3ComboBox.Enabled = false; - this.partyMove6_3ComboBox.FormattingEnabled = true; - this.partyMove6_3ComboBox.Location = new System.Drawing.Point(10, 48); - this.partyMove6_3ComboBox.Name = "partyMove6_3ComboBox"; - this.partyMove6_3ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove6_3ComboBox.TabIndex = 5; - this.partyMove6_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove6_4ComboBox - // - this.partyMove6_4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove6_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove6_4ComboBox.Enabled = false; - this.partyMove6_4ComboBox.FormattingEnabled = true; - this.partyMove6_4ComboBox.Location = new System.Drawing.Point(116, 48); - this.partyMove6_4ComboBox.Name = "partyMove6_4ComboBox"; - this.partyMove6_4ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove6_4ComboBox.TabIndex = 7; - this.partyMove6_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyItem6ComboBox - // - this.partyItem6ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyItem6ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyItem6ComboBox.Enabled = false; - this.partyItem6ComboBox.FormattingEnabled = true; - this.partyItem6ComboBox.Location = new System.Drawing.Point(228, 28); - this.partyItem6ComboBox.Name = "partyItem6ComboBox"; - this.partyItem6ComboBox.Size = new System.Drawing.Size(103, 21); - this.partyItem6ComboBox.TabIndex = 2; - this.partyItem6ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem6ComboBox_SelectedIndexChanged); - // - // partyPokemon6ComboBox - // - this.partyPokemon6ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyPokemon6ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyPokemon6ComboBox.FormattingEnabled = true; - this.partyPokemon6ComboBox.Location = new System.Drawing.Point(58, 28); - this.partyPokemon6ComboBox.Name = "partyPokemon6ComboBox"; - this.partyPokemon6ComboBox.Size = new System.Drawing.Size(126, 21); - this.partyPokemon6ComboBox.TabIndex = 0; - this.partyPokemon6ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon6ComboBox_SelectedIndexChanged); - // - // partyMove5_1ComboBox - // - this.partyMove5_1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove5_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove5_1ComboBox.Enabled = false; - this.partyMove5_1ComboBox.FormattingEnabled = true; - this.partyMove5_1ComboBox.Location = new System.Drawing.Point(10, 21); - this.partyMove5_1ComboBox.Name = "partyMove5_1ComboBox"; - this.partyMove5_1ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove5_1ComboBox.TabIndex = 3; - this.partyMove5_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove5_2ComboBox - // - this.partyMove5_2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove5_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove5_2ComboBox.Enabled = false; - this.partyMove5_2ComboBox.FormattingEnabled = true; - this.partyMove5_2ComboBox.Location = new System.Drawing.Point(116, 21); - this.partyMove5_2ComboBox.Name = "partyMove5_2ComboBox"; - this.partyMove5_2ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove5_2ComboBox.TabIndex = 6; - this.partyMove5_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove5_3ComboBox - // - this.partyMove5_3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove5_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove5_3ComboBox.Enabled = false; - this.partyMove5_3ComboBox.FormattingEnabled = true; - this.partyMove5_3ComboBox.Location = new System.Drawing.Point(10, 48); - this.partyMove5_3ComboBox.Name = "partyMove5_3ComboBox"; - this.partyMove5_3ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove5_3ComboBox.TabIndex = 5; - this.partyMove5_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove5_4ComboBox - // - this.partyMove5_4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove5_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove5_4ComboBox.Enabled = false; - this.partyMove5_4ComboBox.FormattingEnabled = true; - this.partyMove5_4ComboBox.Location = new System.Drawing.Point(116, 48); - this.partyMove5_4ComboBox.Name = "partyMove5_4ComboBox"; - this.partyMove5_4ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove5_4ComboBox.TabIndex = 7; - this.partyMove5_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyItem5ComboBox - // - this.partyItem5ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyItem5ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyItem5ComboBox.Enabled = false; - this.partyItem5ComboBox.FormattingEnabled = true; - this.partyItem5ComboBox.Location = new System.Drawing.Point(228, 28); - this.partyItem5ComboBox.Name = "partyItem5ComboBox"; - this.partyItem5ComboBox.Size = new System.Drawing.Size(103, 21); - this.partyItem5ComboBox.TabIndex = 2; - this.partyItem5ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem5ComboBox_SelectedIndexChanged); - // - // partyPokemon5ComboBox - // - this.partyPokemon5ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyPokemon5ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyPokemon5ComboBox.FormattingEnabled = true; - this.partyPokemon5ComboBox.Location = new System.Drawing.Point(58, 28); - this.partyPokemon5ComboBox.Name = "partyPokemon5ComboBox"; - this.partyPokemon5ComboBox.Size = new System.Drawing.Size(126, 21); - this.partyPokemon5ComboBox.TabIndex = 0; - this.partyPokemon5ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon5ComboBox_SelectedIndexChanged); - // - // partyMove4_1ComboBox - // - this.partyMove4_1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove4_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove4_1ComboBox.Enabled = false; - this.partyMove4_1ComboBox.FormattingEnabled = true; - this.partyMove4_1ComboBox.Location = new System.Drawing.Point(10, 21); - this.partyMove4_1ComboBox.Name = "partyMove4_1ComboBox"; - this.partyMove4_1ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove4_1ComboBox.TabIndex = 3; - this.partyMove4_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove4_2ComboBox - // - this.partyMove4_2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove4_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove4_2ComboBox.Enabled = false; - this.partyMove4_2ComboBox.FormattingEnabled = true; - this.partyMove4_2ComboBox.Location = new System.Drawing.Point(116, 21); - this.partyMove4_2ComboBox.Name = "partyMove4_2ComboBox"; - this.partyMove4_2ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove4_2ComboBox.TabIndex = 6; - this.partyMove4_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove4_3ComboBox - // - this.partyMove4_3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove4_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove4_3ComboBox.Enabled = false; - this.partyMove4_3ComboBox.FormattingEnabled = true; - this.partyMove4_3ComboBox.Location = new System.Drawing.Point(10, 48); - this.partyMove4_3ComboBox.Name = "partyMove4_3ComboBox"; - this.partyMove4_3ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove4_3ComboBox.TabIndex = 5; - this.partyMove4_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove4_4ComboBox - // - this.partyMove4_4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove4_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove4_4ComboBox.Enabled = false; - this.partyMove4_4ComboBox.FormattingEnabled = true; - this.partyMove4_4ComboBox.Location = new System.Drawing.Point(116, 48); - this.partyMove4_4ComboBox.Name = "partyMove4_4ComboBox"; - this.partyMove4_4ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove4_4ComboBox.TabIndex = 7; - this.partyMove4_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyItem4ComboBox - // - this.partyItem4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyItem4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyItem4ComboBox.Enabled = false; - this.partyItem4ComboBox.FormattingEnabled = true; - this.partyItem4ComboBox.Location = new System.Drawing.Point(228, 28); - this.partyItem4ComboBox.Name = "partyItem4ComboBox"; - this.partyItem4ComboBox.Size = new System.Drawing.Size(103, 21); - this.partyItem4ComboBox.TabIndex = 2; - this.partyItem4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem4ComboBox_SelectedIndexChanged); - // - // partyPokemon4ComboBox - // - this.partyPokemon4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyPokemon4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyPokemon4ComboBox.FormattingEnabled = true; - this.partyPokemon4ComboBox.Location = new System.Drawing.Point(58, 28); - this.partyPokemon4ComboBox.Name = "partyPokemon4ComboBox"; - this.partyPokemon4ComboBox.Size = new System.Drawing.Size(126, 21); - this.partyPokemon4ComboBox.TabIndex = 0; - this.partyPokemon4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon4ComboBox_SelectedIndexChanged); - // - // partyMove3_1ComboBox - // - this.partyMove3_1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove3_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove3_1ComboBox.Enabled = false; - this.partyMove3_1ComboBox.FormattingEnabled = true; - this.partyMove3_1ComboBox.Location = new System.Drawing.Point(10, 21); - this.partyMove3_1ComboBox.Name = "partyMove3_1ComboBox"; - this.partyMove3_1ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove3_1ComboBox.TabIndex = 3; - this.partyMove3_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove3_2ComboBox - // - this.partyMove3_2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove3_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove3_2ComboBox.Enabled = false; - this.partyMove3_2ComboBox.FormattingEnabled = true; - this.partyMove3_2ComboBox.Location = new System.Drawing.Point(116, 21); - this.partyMove3_2ComboBox.Name = "partyMove3_2ComboBox"; - this.partyMove3_2ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove3_2ComboBox.TabIndex = 6; - this.partyMove3_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove3_3ComboBox - // - this.partyMove3_3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove3_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove3_3ComboBox.Enabled = false; - this.partyMove3_3ComboBox.FormattingEnabled = true; - this.partyMove3_3ComboBox.Location = new System.Drawing.Point(10, 48); - this.partyMove3_3ComboBox.Name = "partyMove3_3ComboBox"; - this.partyMove3_3ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove3_3ComboBox.TabIndex = 5; - this.partyMove3_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove3_4ComboBox - // - this.partyMove3_4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove3_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove3_4ComboBox.Enabled = false; - this.partyMove3_4ComboBox.FormattingEnabled = true; - this.partyMove3_4ComboBox.Location = new System.Drawing.Point(116, 48); - this.partyMove3_4ComboBox.Name = "partyMove3_4ComboBox"; - this.partyMove3_4ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove3_4ComboBox.TabIndex = 7; - this.partyMove3_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyItem3ComboBox - // - this.partyItem3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyItem3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyItem3ComboBox.Enabled = false; - this.partyItem3ComboBox.FormattingEnabled = true; - this.partyItem3ComboBox.Location = new System.Drawing.Point(228, 28); - this.partyItem3ComboBox.Name = "partyItem3ComboBox"; - this.partyItem3ComboBox.Size = new System.Drawing.Size(103, 21); - this.partyItem3ComboBox.TabIndex = 2; - this.partyItem3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem3ComboBox_SelectedIndexChanged); - // - // partyPokemon3ComboBox - // - this.partyPokemon3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyPokemon3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyPokemon3ComboBox.FormattingEnabled = true; - this.partyPokemon3ComboBox.Location = new System.Drawing.Point(58, 28); - this.partyPokemon3ComboBox.Name = "partyPokemon3ComboBox"; - this.partyPokemon3ComboBox.Size = new System.Drawing.Size(126, 21); - this.partyPokemon3ComboBox.TabIndex = 0; - this.partyPokemon3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon3ComboBox_SelectedIndexChanged); - // - // partyMove2_1ComboBox - // - this.partyMove2_1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove2_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove2_1ComboBox.Enabled = false; - this.partyMove2_1ComboBox.FormattingEnabled = true; - this.partyMove2_1ComboBox.Location = new System.Drawing.Point(10, 21); - this.partyMove2_1ComboBox.Name = "partyMove2_1ComboBox"; - this.partyMove2_1ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove2_1ComboBox.TabIndex = 3; - this.partyMove2_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove2_2ComboBox - // - this.partyMove2_2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove2_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove2_2ComboBox.Enabled = false; - this.partyMove2_2ComboBox.FormattingEnabled = true; - this.partyMove2_2ComboBox.Location = new System.Drawing.Point(116, 21); - this.partyMove2_2ComboBox.Name = "partyMove2_2ComboBox"; - this.partyMove2_2ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove2_2ComboBox.TabIndex = 6; - this.partyMove2_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove2_3ComboBox - // - this.partyMove2_3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove2_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove2_3ComboBox.Enabled = false; - this.partyMove2_3ComboBox.FormattingEnabled = true; - this.partyMove2_3ComboBox.Location = new System.Drawing.Point(10, 48); - this.partyMove2_3ComboBox.Name = "partyMove2_3ComboBox"; - this.partyMove2_3ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove2_3ComboBox.TabIndex = 5; - this.partyMove2_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove2_4ComboBox - // - this.partyMove2_4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove2_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove2_4ComboBox.Enabled = false; - this.partyMove2_4ComboBox.FormattingEnabled = true; - this.partyMove2_4ComboBox.Location = new System.Drawing.Point(116, 48); - this.partyMove2_4ComboBox.Name = "partyMove2_4ComboBox"; - this.partyMove2_4ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove2_4ComboBox.TabIndex = 7; - this.partyMove2_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyItem2ComboBox - // - this.partyItem2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyItem2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyItem2ComboBox.Enabled = false; - this.partyItem2ComboBox.FormattingEnabled = true; - this.partyItem2ComboBox.Location = new System.Drawing.Point(228, 28); - this.partyItem2ComboBox.Name = "partyItem2ComboBox"; - this.partyItem2ComboBox.Size = new System.Drawing.Size(103, 21); - this.partyItem2ComboBox.TabIndex = 2; - this.partyItem2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem2ComboBox_SelectedIndexChanged); - // - // partyPokemon2ComboBox - // - this.partyPokemon2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyPokemon2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyPokemon2ComboBox.FormattingEnabled = true; - this.partyPokemon2ComboBox.Location = new System.Drawing.Point(58, 28); - this.partyPokemon2ComboBox.Name = "partyPokemon2ComboBox"; - this.partyPokemon2ComboBox.Size = new System.Drawing.Size(126, 21); - this.partyPokemon2ComboBox.TabIndex = 0; - this.partyPokemon2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon2ComboBox_SelectedIndexChanged); - // - // partyMove1_1ComboBox - // - this.partyMove1_1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove1_1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove1_1ComboBox.Enabled = false; - this.partyMove1_1ComboBox.FormattingEnabled = true; - this.partyMove1_1ComboBox.Location = new System.Drawing.Point(10, 21); - this.partyMove1_1ComboBox.Name = "partyMove1_1ComboBox"; - this.partyMove1_1ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove1_1ComboBox.TabIndex = 3; - this.partyMove1_1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove1_2ComboBox - // - this.partyMove1_2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove1_2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove1_2ComboBox.Enabled = false; - this.partyMove1_2ComboBox.FormattingEnabled = true; - this.partyMove1_2ComboBox.Location = new System.Drawing.Point(116, 21); - this.partyMove1_2ComboBox.Name = "partyMove1_2ComboBox"; - this.partyMove1_2ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove1_2ComboBox.TabIndex = 6; - this.partyMove1_2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove1_3ComboBox - // - this.partyMove1_3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove1_3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove1_3ComboBox.Enabled = false; - this.partyMove1_3ComboBox.FormattingEnabled = true; - this.partyMove1_3ComboBox.Location = new System.Drawing.Point(10, 48); - this.partyMove1_3ComboBox.Name = "partyMove1_3ComboBox"; - this.partyMove1_3ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove1_3ComboBox.TabIndex = 5; - this.partyMove1_3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyMove1_4ComboBox - // - this.partyMove1_4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyMove1_4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyMove1_4ComboBox.Enabled = false; - this.partyMove1_4ComboBox.FormattingEnabled = true; - this.partyMove1_4ComboBox.Location = new System.Drawing.Point(116, 48); - this.partyMove1_4ComboBox.Name = "partyMove1_4ComboBox"; - this.partyMove1_4ComboBox.Size = new System.Drawing.Size(100, 21); - this.partyMove1_4ComboBox.TabIndex = 7; - this.partyMove1_4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyMoveComboBox_SelectedIndexChanged); - // - // partyItem1ComboBox - // - this.partyItem1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyItem1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyItem1ComboBox.Enabled = false; - this.partyItem1ComboBox.FormattingEnabled = true; - this.partyItem1ComboBox.Location = new System.Drawing.Point(228, 28); - this.partyItem1ComboBox.Name = "partyItem1ComboBox"; - this.partyItem1ComboBox.Size = new System.Drawing.Size(103, 21); - this.partyItem1ComboBox.TabIndex = 2; - this.partyItem1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem1ComboBox_SelectedIndexChanged); - // - // partyPokemon1ComboBox - // - this.partyPokemon1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.partyPokemon1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.partyPokemon1ComboBox.FormattingEnabled = true; - this.partyPokemon1ComboBox.Location = new System.Drawing.Point(58, 28); - this.partyPokemon1ComboBox.Name = "partyPokemon1ComboBox"; - this.partyPokemon1ComboBox.Size = new System.Drawing.Size(126, 21); - this.partyPokemon1ComboBox.TabIndex = 0; - this.partyPokemon1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon1ComboBox_SelectedIndexChanged); - // - // trainerItem1ComboBox - // - this.trainerItem1ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.trainerItem1ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.trainerItem1ComboBox.FormattingEnabled = true; - this.trainerItem1ComboBox.Location = new System.Drawing.Point(9, 20); - this.trainerItem1ComboBox.Name = "trainerItem1ComboBox"; - this.trainerItem1ComboBox.Size = new System.Drawing.Size(171, 21); - this.trainerItem1ComboBox.TabIndex = 0; - // - // trainerItem2ComboBox - // - this.trainerItem2ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.trainerItem2ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.trainerItem2ComboBox.FormattingEnabled = true; - this.trainerItem2ComboBox.Location = new System.Drawing.Point(9, 47); - this.trainerItem2ComboBox.Name = "trainerItem2ComboBox"; - this.trainerItem2ComboBox.Size = new System.Drawing.Size(171, 21); - this.trainerItem2ComboBox.TabIndex = 1; - // - // trainerItem3ComboBox - // - this.trainerItem3ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.trainerItem3ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.trainerItem3ComboBox.FormattingEnabled = true; - this.trainerItem3ComboBox.Location = new System.Drawing.Point(9, 74); - this.trainerItem3ComboBox.Name = "trainerItem3ComboBox"; - this.trainerItem3ComboBox.Size = new System.Drawing.Size(171, 21); - this.trainerItem3ComboBox.TabIndex = 2; - // - // trainerItem4ComboBox - // - this.trainerItem4ComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.trainerItem4ComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.trainerItem4ComboBox.FormattingEnabled = true; - this.trainerItem4ComboBox.Location = new System.Drawing.Point(9, 101); - this.trainerItem4ComboBox.Name = "trainerItem4ComboBox"; - this.trainerItem4ComboBox.Size = new System.Drawing.Size(171, 21); - this.trainerItem4ComboBox.TabIndex = 3; - // - // encountersEditor - // - this.encountersEditor.Location = new System.Drawing.Point(6, 3); - this.encountersEditor.Margin = new System.Windows.Forms.Padding(4); - this.encountersEditor.Name = "encountersEditor"; - this.encountersEditor.Size = new System.Drawing.Size(1176, 672); - this.encountersEditor.TabIndex = 0; - // // MainProgram // this.AllowDrop = true; @@ -10998,6 +10999,7 @@ ((System.ComponentModel.ISupportInitialize)(this.areaDataDynamicTexturesNumericUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.areaDataMapTilesetUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.areaDataBuildingTilesetUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.texturePictureBox)).EndInit(); this.eventEditorTabPage.ResumeLayout(false); this.eventEditorTabPage.PerformLayout(); this.groupBox21.ResumeLayout(false); @@ -11189,7 +11191,6 @@ this.statusStrip1.PerformLayout(); this.mainToolStrip.ResumeLayout(false); this.mainToolStrip.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.texturePictureBox)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index 57d8088..5be7e73 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -350,7 +350,7 @@ namespace DSPRE { } byte[] modelFile = DSUtils.ReadFromFile(of.FileName); - if (DSUtils.CheckNSBMDHeader(modelFile) == DSUtils.NSBMD_DOESNTHAVE_TEXTURE) { + if (NSBUtils.CheckNSBMDHeader(modelFile) == NSBUtils.NSBMD_DOESNTHAVE_TEXTURE) { MessageBox.Show("This NSBMD file is untextured.", "No textures to extract", MessageBoxButtons.OK, MessageBoxIcon.Information); return; } @@ -365,7 +365,7 @@ namespace DSPRE { return; } - DSUtils.WriteToFile(texSf.FileName, DSUtils.GetTexturesFromTexturedNSBMD(modelFile)); + DSUtils.WriteToFile(texSf.FileName, NSBUtils.GetTexturesFromTexturedNSBMD(modelFile)); MessageBox.Show("The textures of " + of.FileName + " have been extracted and saved.", "Textures saved", MessageBoxButtons.OK, MessageBoxIcon.Information); } @@ -379,7 +379,7 @@ namespace DSPRE { } byte[] modelFile = DSUtils.ReadFromFile(of.FileName); - if (DSUtils.CheckNSBMDHeader(modelFile) == DSUtils.NSBMD_DOESNTHAVE_TEXTURE) { + if (NSBUtils.CheckNSBMDHeader(modelFile) == NSBUtils.NSBMD_DOESNTHAVE_TEXTURE) { MessageBox.Show("This NSBMD file is already untextured.", "No textures to remove", MessageBoxButtons.OK, MessageBoxIcon.Information); return; } @@ -395,7 +395,7 @@ namespace DSPRE { }; if (texSf.ShowDialog() == DialogResult.OK) { - DSUtils.WriteToFile(texSf.FileName, DSUtils.GetTexturesFromTexturedNSBMD(modelFile)); + DSUtils.WriteToFile(texSf.FileName, NSBUtils.GetTexturesFromTexturedNSBMD(modelFile)); extramsg = " exported and"; } } @@ -410,7 +410,7 @@ namespace DSPRE { return; } - DSUtils.WriteToFile(sf.FileName, DSUtils.GetModelWithoutTextures(modelFile)); + DSUtils.WriteToFile(sf.FileName, NSBUtils.GetModelWithoutTextures(modelFile)); MessageBox.Show("Textures correctly" + extramsg + " removed!", "Success!", MessageBoxButtons.OK, MessageBoxIcon.Information); } private void nsbmdAddTexButton_Click(object sender, EventArgs e) { @@ -421,7 +421,7 @@ namespace DSPRE { return; byte[] modelFile = File.ReadAllBytes(of.FileName); - if (DSUtils.CheckNSBMDHeader(modelFile) == DSUtils.NSBMD_HAS_TEXTURE) { + if (NSBUtils.CheckNSBMDHeader(modelFile) == NSBUtils.NSBMD_HAS_TEXTURE) { DialogResult d = MessageBox.Show("This NSBMD file is already textured.\nDo you want to overwrite its textures?", "Textures found", MessageBoxButtons.YesNo, MessageBoxIcon.Question); if (d.Equals(DialogResult.No)) { return; @@ -456,7 +456,7 @@ namespace DSPRE { if (sf.ShowDialog(this) != DialogResult.OK) return; - DSUtils.WriteToFile(sf.FileName, DSUtils.BuildNSBMDwithTextures(modelFile, textureFile), fmode: FileMode.Create); + DSUtils.WriteToFile(sf.FileName, NSBUtils.BuildNSBMDwithTextures(modelFile, textureFile), fmode: FileMode.Create); MessageBox.Show("Textures correctly written to NSBMD file.", "Success!", MessageBoxButtons.OK, MessageBoxIcon.Information); } private void OpenCommandsDatabase(Dictionary namesDict, Dictionary paramsDict, Dictionary actionsDict, @@ -737,17 +737,17 @@ namespace DSPRE { if (OverlayUtils.OverlayTable.IsDefaultCompressed(1)) { if (PatchToolboxDialog.overlay1MustBeRestoredFromBackup) { - DSUtils.RestoreOverlayFromCompressedBackup(1, eventEditorIsReady); + OverlayUtils.RestoreFromCompressedBackup(1, eventEditorIsReady); } else { if (!OverlayUtils.IsCompressed(1)) { - DSUtils.CompressOverlay(1); + OverlayUtils.Compress(1); } } } if (OverlayUtils.OverlayTable.IsDefaultCompressed(RomInfo.initialMoneyOverlayNumber)) { if (!OverlayUtils.IsCompressed(RomInfo.initialMoneyOverlayNumber)) { - DSUtils.CompressOverlay(RomInfo.initialMoneyOverlayNumber); + OverlayUtils.Compress(RomInfo.initialMoneyOverlayNumber); } } @@ -756,7 +756,7 @@ namespace DSPRE { //for (int i = 0; i < 128; i++) { // if (!OverlayUtils.IsCompressed(i)) { - // DSUtils.CompressOverlay(i); + // OverlayUtils.Compress(i); // } //} @@ -3261,7 +3261,7 @@ namespace DSPRE { }; reader.BaseStream.Position += 0x14; - selectMapComboBox.Items.Add(i.ToString("D3") + MapHeader.nameSeparator + DSUtils.ReadNSBMDname(reader)); + selectMapComboBox.Items.Add(i.ToString("D3") + MapHeader.nameSeparator + NSBUtils.ReadNSBMDname(reader)); } } @@ -4722,7 +4722,7 @@ namespace DSPRE { string texturePath = RomInfo.gameDirs[DirNames.mapTextures].unpackedDir + "\\" + (mapTextureComboBox.SelectedIndex - 1).ToString("D4"); byte[] texturesToEmbed = File.ReadAllBytes(texturePath); - modelToWrite = DSUtils.BuildNSBMDwithTextures(currentMapFile.mapModelData, texturesToEmbed); + modelToWrite = NSBUtils.BuildNSBMDwithTextures(currentMapFile.mapModelData, texturesToEmbed); } else { /* Untextured NSBMD file */ em.Filter = MapFile.UntexturedNSBMDFilter; if (em.ShowDialog(this) != DialogResult.OK) { @@ -4737,7 +4737,7 @@ namespace DSPRE { } private void daeExportButton_Click(object sender, EventArgs e) { - DSUtils.ModelToDAE( + ModelUtils.ModelToDAE( modelName: selectMapComboBox.SelectedItem.ToString().TrimEnd('\0'), modelData: currentMapFile.mapModelData, textureData: mapTextureComboBox.SelectedIndex < 0 ? null : File.ReadAllBytes(RomInfo.gameDirs[DirNames.mapTextures].unpackedDir + "\\" + (mapTextureComboBox.SelectedIndex - 1).ToString("D4")) @@ -4745,7 +4745,7 @@ namespace DSPRE { } private void glbExportButton_Click(object sender, EventArgs e) { - DSUtils.ModelToGLB( + ModelUtils.ModelToGLB( modelName: selectMapComboBox.SelectedItem.ToString().TrimEnd('\0'), modelData: currentMapFile.mapModelData, textureData: mapTextureComboBox.SelectedIndex < 0 ? null : File.ReadAllBytes(RomInfo.gameDirs[DirNames.mapTextures].unpackedDir + "\\" + (mapTextureComboBox.SelectedIndex - 1).ToString("D4")) @@ -4846,7 +4846,7 @@ namespace DSPRE { #region Subroutines private void itemsSelectorHelpBtn_Click(object sender, EventArgs e) { MessageBox.Show("This selector allows you to pick a preset Ground Item script from the game data.\n" + - "Unlike in previous DSPRE versions, you can now change the Ground Item to be obtained even if you decided not to apply the Standardize Items patch from the Rom ToolBox.\n\n" + + "Unlike in previous DSPRE versions, you can now change the Ground Item to be obtained even if you decided not to apply the Standardize Items patch from the Patch ToolBox.\n\n" + "However, some items are unavailable by default. The aforementioned patch can neutralize this limitation.\n\n", "About Ground Items", MessageBoxButtons.OK, MessageBoxIcon.Information); } @@ -7590,7 +7590,7 @@ namespace DSPRE { if (!userConfirmed) { MessageBox.Show("You chose not to apply the patch. Use this editor responsibly.\n\n" + - "If you change your mind, you can apply it later by accessing the ROM Toolbox.", + "If you change your mind, you can apply it later by accessing the Patch Toolbox.", "Caution", MessageBoxButtons.OK, MessageBoxIcon.Information); if (OverlayUtils.IsCompressed(RomInfo.cameraTblOverlayNumber)) { @@ -7618,7 +7618,7 @@ namespace DSPRE { } } - overlayCameraTblOffset = RAMaddresses[0] - DSUtils.GetOverlayRAMAddress(RomInfo.cameraTblOverlayNumber); + overlayCameraTblOffset = RAMaddresses[0] - OverlayUtils.OverlayTable.GetRAMAddress(RomInfo.cameraTblOverlayNumber); using (DSUtils.EasyReader br = new DSUtils.EasyReader(camOverlayPath, overlayCameraTblOffset)) { if (RomInfo.gameFamily == GameFamilies.HGSS) { currentCameraTable = new GameCamera[17]; @@ -8311,7 +8311,7 @@ namespace DSPRE { //Expose a smaller limit to the user if (RomInfo.trainerNameLenOffset >= 0) { MessageBox.Show($"Trainer File saved successfully. However:\nYou attempted to save a Trainer whose name exceeds {RomInfo.trainerNameMaxLen-1} characters.\nThis may lead to issues in game." + - (PatchToolboxDialog.flag_TrainerNamesExpanded ? "\n\nIt's recommended that you use a shorter name." : "\n\nRefer to the ROM Toolbox to extend Trainer names."), + (PatchToolboxDialog.flag_TrainerNamesExpanded ? "\n\nIt's recommended that you use a shorter name." : "\n\nRefer to the Patch Toolbox to extend Trainer names."), "Saved successfully, but...", MessageBoxButtons.OK, MessageBoxIcon.Warning); } else { MessageBox.Show($"Trainer File saved successfully. However:\nThe Trainer name length could not be safely determined for this ROM.\n" + diff --git a/DS_Map/Main Window.resx b/DS_Map/Main Window.resx index 1242269..d9845d5 100644 --- a/DS_Map/Main Window.resx +++ b/DS_Map/Main Window.resx @@ -956,7 +956,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM - EgAAAk1TRnQBSQFMAgEBCgEAAWgBHAFoARwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + EgAAAk1TRnQBSQFMAgEBCgEAAXgBHAF4ARwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/DS_Map/PatchToolboxDialog.Designer.cs b/DS_Map/PatchToolboxDialog.Designer.cs index a4a1d06..47eaac5 100644 --- a/DS_Map/PatchToolboxDialog.Designer.cs +++ b/DS_Map/PatchToolboxDialog.Designer.cs @@ -583,7 +583,7 @@ this.MinimizeBox = false; this.Name = "ROMToolboxDialog"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "ROM Toolbox"; + this.Text = "Patch Toolbox"; ((System.ComponentModel.ISupportInitialize)(this.arm9patchCB)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.overlay1CB)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.BDHCamCB)).EndInit(); diff --git a/DS_Map/PatchToolboxDialog.cs b/DS_Map/PatchToolboxDialog.cs index 7a9bb83..14054cc 100644 --- a/DS_Map/PatchToolboxDialog.cs +++ b/DS_Map/PatchToolboxDialog.cs @@ -446,7 +446,7 @@ namespace DSPRE { "Confirm to proceed", MessageBoxButtons.YesNo, MessageBoxIcon.Warning); if (d == DialogResult.Yes) { - DSUtils.SetOverlayCompressionInTable(1, 0); + OverlayUtils.OverlayTable.SetDefaultCompressed(1, false); if (isCompressed) { OverlayUtils.Decompress(1); } diff --git a/DS_Map/ROMFiles/MapFile.cs b/DS_Map/ROMFiles/MapFile.cs index 0f09af3..903047b 100644 --- a/DS_Map/ROMFiles/MapFile.cs +++ b/DS_Map/ROMFiles/MapFile.cs @@ -185,7 +185,7 @@ namespace DSPRE.ROMFiles { modelReader.BaseStream.Position = 0xE; if (modelReader.ReadInt16() > 1) { // If NSBMD contains more than one segment, it means there are embedded textures we must remove - mapModelData = DSUtils.GetModelWithoutTextures(newData); + mapModelData = NSBUtils.GetModelWithoutTextures(newData); } else { modelReader.BaseStream.Position = 0x0; mapModelData = modelReader.ReadBytes((int)modelReader.BaseStream.Length); diff --git a/DS_Map/RomInfo.cs b/DS_Map/RomInfo.cs index c2681fe..9f738cc 100644 --- a/DS_Map/RomInfo.cs +++ b/DS_Map/RomInfo.cs @@ -535,7 +535,7 @@ namespace DSPRE { } string ov1Path = OverlayUtils.GetPath(1); - uint ov1Address = DSUtils.GetOverlayRAMAddress(1); + uint ov1Address = OverlayUtils.OverlayTable.GetRAMAddress(1); int ramAddrOfPointer; switch (gameLanguage) { @@ -568,7 +568,7 @@ namespace DSPRE { string ov131path = OverlayUtils.GetPath(131); if (File.Exists(ov131path)) { // if HGE field extension overlay exists - OWTableOffset = ramAddressOfTable - DSUtils.GetOverlayRAMAddress(131); + OWTableOffset = ramAddressOfTable - OverlayUtils.OverlayTable.GetRAMAddress(131); OWtablePath = ov131path; } else if (ramAddressOfTable >= RomInfo.synthOverlayLoadAddress) { // if the pointer shows the table was moved to the synthetic overlay