Coded Pre-Battle effects tables + bugfixing & various improvements

!!! Still missing pre-battle effects tables offsets for all languages except Spanish
This commit is contained in:
AdAstra-LD
2021-08-02 05:06:32 +02:00
parent a9de70df49
commit 559b287718
9 changed files with 4160 additions and 3600 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -30,23 +30,23 @@
{
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();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = 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();
@@ -672,17 +672,14 @@
this.partyPokemon1ComboBox = new System.Windows.Forms.ComboBox();
this.trainerSaveCurrentButton = new System.Windows.Forms.Button();
this.groupBox27 = new System.Windows.Forms.GroupBox();
this.encounterSSEQNupDown = new System.Windows.Forms.NumericUpDown();
this.label73 = new System.Windows.Forms.Label();
this.encounterSSEQAltUpDown = new System.Windows.Forms.NumericUpDown();
this.label67 = new System.Windows.Forms.Label();
this.encounterSSEQDupDown = new System.Windows.Forms.NumericUpDown();
this.encounterSSEQMainUpDown = new System.Windows.Forms.NumericUpDown();
this.trainerClassFrameMaxLabel = new System.Windows.Forms.Label();
this.label40 = new System.Windows.Forms.Label();
this.trClassFramePreviewUpDown = new System.Windows.Forms.NumericUpDown();
this.saveTrainerClassButton = new System.Windows.Forms.Button();
this.label22 = new System.Windows.Forms.Label();
this.trClassVSAnimationUpDown = new System.Windows.Forms.NumericUpDown();
this.label21 = new System.Windows.Forms.Label();
this.trClassBattleSSEQUpDown = new System.Windows.Forms.NumericUpDown();
this.trainerClassNameTextbox = new System.Windows.Forms.TextBox();
this.label17 = new System.Windows.Forms.Label();
this.trainerClassPicBox = new System.Windows.Forms.PictureBox();
@@ -716,6 +713,34 @@
this.label42 = new System.Windows.Forms.Label();
this.trainerComboBox = new System.Windows.Forms.ComboBox();
this.tableEditorTabPage = new System.Windows.Forms.TabPage();
this.pbEffectsGroupBox = new System.Windows.Forms.GroupBox();
this.HOWpbEffectsTableButton = new System.Windows.Forms.Button();
this.label72 = new System.Windows.Forms.Label();
this.saveEffectCombosTableBTN = new System.Windows.Forms.Button();
this.pbEffectsCombosListbox = new System.Windows.Forms.ListBox();
this.groupBox30 = new System.Windows.Forms.GroupBox();
this.tbEditortrainerClassFrameMaxLabel = new System.Windows.Forms.Label();
this.tbEditorTrClassFramePreviewUpDown = new System.Windows.Forms.NumericUpDown();
this.tbEditorTrClassPictureBox = new System.Windows.Forms.PictureBox();
this.label68 = new System.Windows.Forms.Label();
this.pbEffectsTrainerChooseMainCombobox = new System.Windows.Forms.ComboBox();
this.HOWVsTrainerButton = new System.Windows.Forms.Button();
this.saveVSTrainerTableBTN = new System.Windows.Forms.Button();
this.label70 = new System.Windows.Forms.Label();
this.pbEffectsTrainerCombobox = new System.Windows.Forms.ComboBox();
this.pbEffectsVsTrainerListbox = new System.Windows.Forms.ListBox();
this.groupBox29 = new System.Windows.Forms.GroupBox();
this.label69 = new System.Windows.Forms.Label();
this.pbEffectsPokemonChooseMainCombobox = new System.Windows.Forms.ComboBox();
this.HOWvsPokemonButton = new System.Windows.Forms.Button();
this.saveVSPokemonTableBTN = new System.Windows.Forms.Button();
this.label71 = new System.Windows.Forms.Label();
this.pbEffectsPokemonCombobox = new System.Windows.Forms.ComboBox();
this.pbEffectsVsPokemonListbox = new System.Windows.Forms.ListBox();
this.label22 = new System.Windows.Forms.Label();
this.pbEffectsVSAnimationUpDown = new System.Windows.Forms.NumericUpDown();
this.label21 = new System.Windows.Forms.Label();
this.pbEffectsBattleSSEQUpDown = new System.Windows.Forms.NumericUpDown();
this.conditionalMusicGroupBox = new System.Windows.Forms.GroupBox();
this.label66 = new System.Windows.Forms.Label();
this.HOWconditionalMusicTableButton = new System.Windows.Forms.Button();
@@ -769,6 +794,7 @@
this.spawnEditorToolStripButton = new System.Windows.Forms.ToolStripButton();
this.versionLabel = new System.Windows.Forms.Label();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.tbEditorPokeminiPictureBox = new System.Windows.Forms.PictureBox();
this.mainTabControl.SuspendLayout();
this.headerEditorTabPage.SuspendLayout();
this.worldmapCoordsGroupBox.SuspendLayout();
@@ -968,17 +994,22 @@
((System.ComponentModel.ISupportInitialize)(this.partyBall1UpDown)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.partyPokemon1PictureBox)).BeginInit();
this.groupBox27.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.encounterSSEQNupDown)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.encounterSSEQDupDown)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.encounterSSEQAltUpDown)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.encounterSSEQMainUpDown)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.trClassFramePreviewUpDown)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.trClassVSAnimationUpDown)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.trClassBattleSSEQUpDown)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.trainerClassPicBox)).BeginInit();
this.groupBox25.SuspendLayout();
this.TrainerAIGroupBox.SuspendLayout();
this.trainerItemsGroupBox.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.partyCountUpDown)).BeginInit();
this.tableEditorTabPage.SuspendLayout();
this.pbEffectsGroupBox.SuspendLayout();
this.groupBox30.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.tbEditorTrClassFramePreviewUpDown)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tbEditorTrClassPictureBox)).BeginInit();
this.groupBox29.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pbEffectsVSAnimationUpDown)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pbEffectsBattleSSEQUpDown)).BeginInit();
this.conditionalMusicGroupBox.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.musicIDconditionalMusicUpDown)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.flagConditionalMusicUpDown)).BeginInit();
@@ -986,6 +1017,7 @@
this.menuStrip1.SuspendLayout();
this.statusStrip1.SuspendLayout();
this.mainToolStrip.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.tbEditorPokeminiPictureBox)).BeginInit();
this.SuspendLayout();
//
// mainTabControl
@@ -2629,43 +2661,43 @@
this.headersGridView.AllowUserToDeleteRows = false;
this.headersGridView.AllowUserToResizeColumns = false;
this.headersGridView.AllowUserToResizeRows = false;
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.headersGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.headersGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle18;
this.headersGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None;
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F);
dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.headersGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
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.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle19;
this.headersGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window;
dataGridViewCellStyle3.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle3.Format = "D4";
dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.headersGridView.DefaultCellStyle = dataGridViewCellStyle3;
dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Window;
dataGridViewCellStyle20.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
dataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle20.Format = "D4";
dataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.headersGridView.DefaultCellStyle = dataGridViewCellStyle20;
this.headersGridView.Location = new System.Drawing.Point(0, 0);
this.headersGridView.MultiSelect = false;
this.headersGridView.Name = "headersGridView";
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F);
dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.headersGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle4;
dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle21.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F);
dataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.headersGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle21;
this.headersGridView.RowHeadersWidth = 50;
this.headersGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle5.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.headersGridView.RowsDefaultCellStyle = dataGridViewCellStyle5;
dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle22.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.headersGridView.RowsDefaultCellStyle = dataGridViewCellStyle22;
this.headersGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.headersGridView.RowTemplate.Height = 18;
this.headersGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -2694,43 +2726,43 @@
this.heightsGridView.AllowUserToDeleteRows = false;
this.heightsGridView.AllowUserToResizeColumns = false;
this.heightsGridView.AllowUserToResizeRows = false;
dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6;
dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle23;
this.heightsGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None;
dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle7.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F);
dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.heightsGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
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.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle24;
this.heightsGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window;
dataGridViewCellStyle8.Font = new System.Drawing.Font("Tahoma", 8.25F);
dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle8.Format = "D2";
dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle8;
dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Window;
dataGridViewCellStyle25.Font = new System.Drawing.Font("Tahoma", 8.25F);
dataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle25.Format = "D2";
dataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle25;
this.heightsGridView.Location = new System.Drawing.Point(0, 0);
this.heightsGridView.MultiSelect = false;
this.heightsGridView.Name = "heightsGridView";
dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle9.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F);
dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.heightsGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle9;
dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle26.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F);
dataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.heightsGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle26;
this.heightsGridView.RowHeadersWidth = 50;
this.heightsGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle10.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.heightsGridView.RowsDefaultCellStyle = dataGridViewCellStyle10;
dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle27.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.heightsGridView.RowsDefaultCellStyle = dataGridViewCellStyle27;
this.heightsGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.heightsGridView.RowTemplate.Height = 18;
this.heightsGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -2757,43 +2789,43 @@
this.mapFilesGridView.AllowUserToDeleteRows = false;
this.mapFilesGridView.AllowUserToResizeColumns = false;
this.mapFilesGridView.AllowUserToResizeRows = false;
dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11;
dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle28;
this.mapFilesGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None;
dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle12.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F);
dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.mapFilesGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12;
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.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle29;
this.mapFilesGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window;
dataGridViewCellStyle13.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle13.Format = "D4";
dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle13;
dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle30.BackColor = System.Drawing.SystemColors.Window;
dataGridViewCellStyle30.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
dataGridViewCellStyle30.ForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle30.Format = "D4";
dataGridViewCellStyle30.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle30.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle30;
this.mapFilesGridView.Location = new System.Drawing.Point(0, 0);
this.mapFilesGridView.MultiSelect = false;
this.mapFilesGridView.Name = "mapFilesGridView";
dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle14.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F);
dataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.mapFilesGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle14;
dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle31.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle31.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F);
dataGridViewCellStyle31.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle31.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle31.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.mapFilesGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle31;
this.mapFilesGridView.RowHeadersWidth = 50;
this.mapFilesGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle15.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.mapFilesGridView.RowsDefaultCellStyle = dataGridViewCellStyle15;
dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle32.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.mapFilesGridView.RowsDefaultCellStyle = dataGridViewCellStyle32;
this.mapFilesGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.mapFilesGridView.RowTemplate.Height = 18;
this.mapFilesGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -7263,8 +7295,8 @@
this.textEditorDataGridView.Location = new System.Drawing.Point(12, 77);
this.textEditorDataGridView.Name = "textEditorDataGridView";
this.textEditorDataGridView.RowHeadersWidth = 68;
dataGridViewCellStyle16.Font = new System.Drawing.Font("Consolas", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.textEditorDataGridView.RowsDefaultCellStyle = dataGridViewCellStyle16;
dataGridViewCellStyle33.Font = new System.Drawing.Font("Consolas", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.textEditorDataGridView.RowsDefaultCellStyle = dataGridViewCellStyle33;
this.textEditorDataGridView.Size = new System.Drawing.Size(873, 496);
this.textEditorDataGridView.TabIndex = 24;
this.textEditorDataGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.textEditorDataGridView_CellValueChanged);
@@ -7423,14 +7455,14 @@
this.cameraEditorDataGridView.CausesValidation = false;
this.cameraEditorDataGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised;
this.cameraEditorDataGridView.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
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.cameraEditorDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle17;
dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle34.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
dataGridViewCellStyle34.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
dataGridViewCellStyle34.ForeColor = System.Drawing.SystemColors.Info;
dataGridViewCellStyle34.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle34.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.cameraEditorDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle34;
this.cameraEditorDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.cameraEditorDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.DistanceGVCol,
@@ -8661,17 +8693,14 @@
//
// groupBox27
//
this.groupBox27.Controls.Add(this.encounterSSEQNupDown);
this.groupBox27.Controls.Add(this.label73);
this.groupBox27.Controls.Add(this.encounterSSEQAltUpDown);
this.groupBox27.Controls.Add(this.label67);
this.groupBox27.Controls.Add(this.encounterSSEQDupDown);
this.groupBox27.Controls.Add(this.encounterSSEQMainUpDown);
this.groupBox27.Controls.Add(this.trainerClassFrameMaxLabel);
this.groupBox27.Controls.Add(this.label40);
this.groupBox27.Controls.Add(this.trClassFramePreviewUpDown);
this.groupBox27.Controls.Add(this.saveTrainerClassButton);
this.groupBox27.Controls.Add(this.label22);
this.groupBox27.Controls.Add(this.trClassVSAnimationUpDown);
this.groupBox27.Controls.Add(this.label21);
this.groupBox27.Controls.Add(this.trClassBattleSSEQUpDown);
this.groupBox27.Controls.Add(this.trainerClassNameTextbox);
this.groupBox27.Controls.Add(this.label17);
this.groupBox27.Controls.Add(this.trainerClassPicBox);
@@ -8682,39 +8711,48 @@
this.groupBox27.TabStop = false;
this.groupBox27.Text = "Trainer Class";
//
// encounterSSEQNupDown
// label73
//
this.encounterSSEQNupDown.Enabled = false;
this.encounterSSEQNupDown.Location = new System.Drawing.Point(199, 85);
this.encounterSSEQNupDown.Maximum = new decimal(new int[] {
this.label73.AutoSize = true;
this.label73.Location = new System.Drawing.Point(278, 69);
this.label73.Name = "label73";
this.label73.Size = new System.Drawing.Size(117, 13);
this.label73.TabIndex = 36;
this.label73.Text = "Eye Contact Music [Alt]";
//
// encounterSSEQAltUpDown
//
this.encounterSSEQAltUpDown.Enabled = false;
this.encounterSSEQAltUpDown.Location = new System.Drawing.Point(282, 85);
this.encounterSSEQAltUpDown.Maximum = new decimal(new int[] {
65535,
0,
0,
0});
this.encounterSSEQNupDown.Name = "encounterSSEQNupDown";
this.encounterSSEQNupDown.Size = new System.Drawing.Size(49, 20);
this.encounterSSEQNupDown.TabIndex = 35;
this.encounterSSEQAltUpDown.Name = "encounterSSEQAltUpDown";
this.encounterSSEQAltUpDown.Size = new System.Drawing.Size(81, 20);
this.encounterSSEQAltUpDown.TabIndex = 35;
//
// label67
//
this.label67.AutoSize = true;
this.label67.Location = new System.Drawing.Point(149, 69);
this.label67.Location = new System.Drawing.Point(143, 69);
this.label67.Name = "label67";
this.label67.Size = new System.Drawing.Size(93, 13);
this.label67.Size = new System.Drawing.Size(128, 13);
this.label67.TabIndex = 34;
this.label67.Text = "Encounter SSEQs";
this.label67.Text = "Eye Contact Music [Main]";
//
// encounterSSEQDupDown
// encounterSSEQMainUpDown
//
this.encounterSSEQDupDown.Location = new System.Drawing.Point(146, 85);
this.encounterSSEQDupDown.Maximum = new decimal(new int[] {
this.encounterSSEQMainUpDown.Location = new System.Drawing.Point(146, 85);
this.encounterSSEQMainUpDown.Maximum = new decimal(new int[] {
65535,
0,
0,
0});
this.encounterSSEQDupDown.Name = "encounterSSEQDupDown";
this.encounterSSEQDupDown.Size = new System.Drawing.Size(49, 20);
this.encounterSSEQDupDown.TabIndex = 33;
this.encounterSSEQMainUpDown.Name = "encounterSSEQMainUpDown";
this.encounterSSEQMainUpDown.Size = new System.Drawing.Size(81, 20);
this.encounterSSEQMainUpDown.TabIndex = 33;
//
// trainerClassFrameMaxLabel
//
@@ -8755,47 +8793,6 @@
this.saveTrainerClassButton.UseVisualStyleBackColor = true;
this.saveTrainerClassButton.Click += new System.EventHandler(this.saveTrainerClassButton_Click);
//
// label22
//
this.label22.AutoSize = true;
this.label22.Enabled = false;
this.label22.Location = new System.Drawing.Point(326, 69);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(70, 13);
this.label22.TabIndex = 28;
this.label22.Text = "VS Animation";
//
// trClassVSAnimationUpDown
//
this.trClassVSAnimationUpDown.Enabled = false;
this.trClassVSAnimationUpDown.Location = new System.Drawing.Point(332, 85);
this.trClassVSAnimationUpDown.Name = "trClassVSAnimationUpDown";
this.trClassVSAnimationUpDown.Size = new System.Drawing.Size(54, 20);
this.trClassVSAnimationUpDown.TabIndex = 27;
//
// label21
//
this.label21.AutoSize = true;
this.label21.Enabled = false;
this.label21.Location = new System.Drawing.Point(258, 69);
this.label21.Name = "label21";
this.label21.Size = new System.Drawing.Size(66, 13);
this.label21.TabIndex = 26;
this.label21.Text = "Battle SSEQ";
//
// trClassBattleSSEQUpDown
//
this.trClassBattleSSEQUpDown.Enabled = false;
this.trClassBattleSSEQUpDown.Location = new System.Drawing.Point(263, 85);
this.trClassBattleSSEQUpDown.Maximum = new decimal(new int[] {
65535,
0,
0,
0});
this.trClassBattleSSEQUpDown.Name = "trClassBattleSSEQUpDown";
this.trClassBattleSSEQUpDown.Size = new System.Drawing.Size(54, 20);
this.trClassBattleSSEQUpDown.TabIndex = 25;
//
// trainerClassNameTextbox
//
this.trainerClassNameTextbox.Location = new System.Drawing.Point(213, 29);
@@ -9141,6 +9138,7 @@
//
// tableEditorTabPage
//
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);
@@ -9151,6 +9149,308 @@
this.tableEditorTabPage.Text = "Table Editor";
this.tableEditorTabPage.UseVisualStyleBackColor = true;
//
// pbEffectsGroupBox
//
this.pbEffectsGroupBox.Controls.Add(this.HOWpbEffectsTableButton);
this.pbEffectsGroupBox.Controls.Add(this.label72);
this.pbEffectsGroupBox.Controls.Add(this.saveEffectCombosTableBTN);
this.pbEffectsGroupBox.Controls.Add(this.pbEffectsCombosListbox);
this.pbEffectsGroupBox.Controls.Add(this.groupBox30);
this.pbEffectsGroupBox.Controls.Add(this.groupBox29);
this.pbEffectsGroupBox.Controls.Add(this.label22);
this.pbEffectsGroupBox.Controls.Add(this.pbEffectsVSAnimationUpDown);
this.pbEffectsGroupBox.Controls.Add(this.label21);
this.pbEffectsGroupBox.Controls.Add(this.pbEffectsBattleSSEQUpDown);
this.pbEffectsGroupBox.Location = new System.Drawing.Point(423, 9);
this.pbEffectsGroupBox.Name = "pbEffectsGroupBox";
this.pbEffectsGroupBox.Size = new System.Drawing.Size(747, 440);
this.pbEffectsGroupBox.TabIndex = 11;
this.pbEffectsGroupBox.TabStop = false;
this.pbEffectsGroupBox.Text = "Pre-Battle Effects";
//
// HOWpbEffectsTableButton
//
this.HOWpbEffectsTableButton.Image = global::DSPRE.Properties.Resources.questionMark;
this.HOWpbEffectsTableButton.Location = new System.Drawing.Point(151, 396);
this.HOWpbEffectsTableButton.Name = "HOWpbEffectsTableButton";
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);
//
// label72
//
this.label72.AutoSize = true;
this.label72.Location = new System.Drawing.Point(6, 20);
this.label72.Name = "label72";
this.label72.Size = new System.Drawing.Size(76, 13);
this.label72.TabIndex = 43;
this.label72.Text = "Effect Combos";
//
// saveEffectCombosTableBTN
//
this.saveEffectCombosTableBTN.Image = global::DSPRE.Properties.Resources.saveButton;
this.saveEffectCombosTableBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.saveEffectCombosTableBTN.Location = new System.Drawing.Point(182, 392);
this.saveEffectCombosTableBTN.Name = "saveEffectCombosTableBTN";
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;
this.saveEffectCombosTableBTN.UseVisualStyleBackColor = true;
this.saveEffectCombosTableBTN.Click += new System.EventHandler(this.saveEffectComboBTN_Click);
//
// pbEffectsCombosListbox
//
this.pbEffectsCombosListbox.FormattingEnabled = true;
this.pbEffectsCombosListbox.Location = new System.Drawing.Point(9, 40);
this.pbEffectsCombosListbox.Name = "pbEffectsCombosListbox";
this.pbEffectsCombosListbox.Size = new System.Drawing.Size(251, 342);
this.pbEffectsCombosListbox.TabIndex = 43;
this.pbEffectsCombosListbox.SelectedIndexChanged += new System.EventHandler(this.pbEffectsCombosListbox_SelectedIndexChanged);
//
// groupBox30
//
this.groupBox30.Controls.Add(this.tbEditortrainerClassFrameMaxLabel);
this.groupBox30.Controls.Add(this.tbEditorTrClassFramePreviewUpDown);
this.groupBox30.Controls.Add(this.tbEditorTrClassPictureBox);
this.groupBox30.Controls.Add(this.label68);
this.groupBox30.Controls.Add(this.pbEffectsTrainerChooseMainCombobox);
this.groupBox30.Controls.Add(this.HOWVsTrainerButton);
this.groupBox30.Controls.Add(this.saveVSTrainerTableBTN);
this.groupBox30.Controls.Add(this.label70);
this.groupBox30.Controls.Add(this.pbEffectsTrainerCombobox);
this.groupBox30.Controls.Add(this.pbEffectsVsTrainerListbox);
this.groupBox30.Location = new System.Drawing.Point(265, 14);
this.groupBox30.Name = "groupBox30";
this.groupBox30.Size = new System.Drawing.Size(472, 250);
this.groupBox30.TabIndex = 34;
this.groupBox30.TabStop = false;
this.groupBox30.Text = "VS. Trainer";
//
// tbEditortrainerClassFrameMaxLabel
//
this.tbEditortrainerClassFrameMaxLabel.AutoSize = true;
this.tbEditortrainerClassFrameMaxLabel.Location = new System.Drawing.Point(436, 101);
this.tbEditortrainerClassFrameMaxLabel.Name = "tbEditortrainerClassFrameMaxLabel";
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(402, 98);
this.tbEditorTrClassFramePreviewUpDown.Name = "tbEditorTrClassFramePreviewUpDown";
this.tbEditorTrClassFramePreviewUpDown.Size = new System.Drawing.Size(34, 20);
this.tbEditorTrClassFramePreviewUpDown.TabIndex = 44;
this.tbEditorTrClassFramePreviewUpDown.ValueChanged += new System.EventHandler(this.numericUpDown1_ValueChanged);
//
// tbEditorTrClassPictureBox
//
this.tbEditorTrClassPictureBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tbEditorTrClassPictureBox.Location = new System.Drawing.Point(256, 59);
this.tbEditorTrClassPictureBox.Name = "tbEditorTrClassPictureBox";
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(252, 164);
this.label68.Name = "label68";
this.label68.Size = new System.Drawing.Size(124, 13);
this.label68.TabIndex = 42;
this.label68.Text = "MainTable Effect Combo";
//
// pbEffectsTrainerChooseMainCombobox
//
this.pbEffectsTrainerChooseMainCombobox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.pbEffectsTrainerChooseMainCombobox.FormattingEnabled = true;
this.pbEffectsTrainerChooseMainCombobox.Location = new System.Drawing.Point(255, 178);
this.pbEffectsTrainerChooseMainCombobox.Name = "pbEffectsTrainerChooseMainCombobox";
this.pbEffectsTrainerChooseMainCombobox.Size = new System.Drawing.Size(205, 21);
this.pbEffectsTrainerChooseMainCombobox.TabIndex = 41;
//
// HOWVsTrainerButton
//
this.HOWVsTrainerButton.Image = global::DSPRE.Properties.Resources.questionMark;
this.HOWVsTrainerButton.Location = new System.Drawing.Point(307, 209);
this.HOWVsTrainerButton.Name = "HOWVsTrainerButton";
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);
//
// saveVSTrainerTableBTN
//
this.saveVSTrainerTableBTN.Image = global::DSPRE.Properties.Resources.saveButton;
this.saveVSTrainerTableBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.saveVSTrainerTableBTN.Location = new System.Drawing.Point(340, 205);
this.saveVSTrainerTableBTN.Name = "saveVSTrainerTableBTN";
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;
this.saveVSTrainerTableBTN.UseVisualStyleBackColor = true;
this.saveVSTrainerTableBTN.Click += new System.EventHandler(this.saveVSTrainerEntryBTN_Click);
//
// label70
//
this.label70.AutoSize = true;
this.label70.Location = new System.Drawing.Point(251, 14);
this.label70.Name = "label70";
this.label70.Size = new System.Drawing.Size(68, 13);
this.label70.TabIndex = 37;
this.label70.Text = "Trainer Class";
//
// pbEffectsTrainerCombobox
//
this.pbEffectsTrainerCombobox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.pbEffectsTrainerCombobox.FormattingEnabled = true;
this.pbEffectsTrainerCombobox.Location = new System.Drawing.Point(255, 29);
this.pbEffectsTrainerCombobox.Name = "pbEffectsTrainerCombobox";
this.pbEffectsTrainerCombobox.Size = new System.Drawing.Size(205, 21);
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(11, 18);
this.pbEffectsVsTrainerListbox.Name = "pbEffectsVsTrainerListbox";
this.pbEffectsVsTrainerListbox.Size = new System.Drawing.Size(234, 225);
this.pbEffectsVsTrainerListbox.TabIndex = 35;
this.pbEffectsVsTrainerListbox.SelectedIndexChanged += new System.EventHandler(this.pbEffectsVsTrainerListbox_SelectedIndexChanged);
//
// groupBox29
//
this.groupBox29.Controls.Add(this.tbEditorPokeminiPictureBox);
this.groupBox29.Controls.Add(this.label69);
this.groupBox29.Controls.Add(this.pbEffectsPokemonChooseMainCombobox);
this.groupBox29.Controls.Add(this.HOWvsPokemonButton);
this.groupBox29.Controls.Add(this.saveVSPokemonTableBTN);
this.groupBox29.Controls.Add(this.label71);
this.groupBox29.Controls.Add(this.pbEffectsPokemonCombobox);
this.groupBox29.Controls.Add(this.pbEffectsVsPokemonListbox);
this.groupBox29.Location = new System.Drawing.Point(265, 270);
this.groupBox29.Name = "groupBox29";
this.groupBox29.Size = new System.Drawing.Size(472, 164);
this.groupBox29.TabIndex = 33;
this.groupBox29.TabStop = false;
this.groupBox29.Text = "VS. Pokémon";
//
// label69
//
this.label69.AutoSize = true;
this.label69.Location = new System.Drawing.Point(252, 80);
this.label69.Name = "label69";
this.label69.Size = new System.Drawing.Size(124, 13);
this.label69.TabIndex = 42;
this.label69.Text = "MainTable Effect Combo";
//
// pbEffectsPokemonChooseMainCombobox
//
this.pbEffectsPokemonChooseMainCombobox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.pbEffectsPokemonChooseMainCombobox.FormattingEnabled = true;
this.pbEffectsPokemonChooseMainCombobox.Location = new System.Drawing.Point(255, 96);
this.pbEffectsPokemonChooseMainCombobox.Name = "pbEffectsPokemonChooseMainCombobox";
this.pbEffectsPokemonChooseMainCombobox.Size = new System.Drawing.Size(205, 21);
this.pbEffectsPokemonChooseMainCombobox.TabIndex = 41;
//
// HOWvsPokemonButton
//
this.HOWvsPokemonButton.Image = global::DSPRE.Properties.Resources.questionMark;
this.HOWvsPokemonButton.Location = new System.Drawing.Point(307, 127);
this.HOWvsPokemonButton.Name = "HOWvsPokemonButton";
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);
//
// saveVSPokemonTableBTN
//
this.saveVSPokemonTableBTN.Image = global::DSPRE.Properties.Resources.saveButton;
this.saveVSPokemonTableBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.saveVSPokemonTableBTN.Location = new System.Drawing.Point(340, 123);
this.saveVSPokemonTableBTN.Name = "saveVSPokemonTableBTN";
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;
this.saveVSPokemonTableBTN.UseVisualStyleBackColor = true;
this.saveVSPokemonTableBTN.Click += new System.EventHandler(this.saveVSPokemonEntryBTN_Click);
//
// label71
//
this.label71.AutoSize = true;
this.label71.Location = new System.Drawing.Point(252, 29);
this.label71.Name = "label71";
this.label71.Size = new System.Drawing.Size(52, 13);
this.label71.TabIndex = 37;
this.label71.Text = "Pokémon";
//
// pbEffectsPokemonCombobox
//
this.pbEffectsPokemonCombobox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.pbEffectsPokemonCombobox.FormattingEnabled = true;
this.pbEffectsPokemonCombobox.Location = new System.Drawing.Point(255, 45);
this.pbEffectsPokemonCombobox.Name = "pbEffectsPokemonCombobox";
this.pbEffectsPokemonCombobox.Size = new System.Drawing.Size(205, 21);
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(11, 21);
this.pbEffectsVsPokemonListbox.Name = "pbEffectsVsPokemonListbox";
this.pbEffectsVsPokemonListbox.Size = new System.Drawing.Size(234, 134);
this.pbEffectsVsPokemonListbox.TabIndex = 35;
this.pbEffectsVsPokemonListbox.SelectedIndexChanged += new System.EventHandler(this.pbEffectsVsPokemonListbox_SelectedIndexChanged);
//
// label22
//
this.label22.AutoSize = true;
this.label22.Location = new System.Drawing.Point(76, 389);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(70, 13);
this.label22.TabIndex = 32;
this.label22.Text = "VS Animation";
//
// pbEffectsVSAnimationUpDown
//
this.pbEffectsVSAnimationUpDown.Location = new System.Drawing.Point(81, 405);
this.pbEffectsVSAnimationUpDown.Maximum = new decimal(new int[] {
65535,
0,
0,
0});
this.pbEffectsVSAnimationUpDown.Name = "pbEffectsVSAnimationUpDown";
this.pbEffectsVSAnimationUpDown.Size = new System.Drawing.Size(54, 20);
this.pbEffectsVSAnimationUpDown.TabIndex = 31;
//
// label21
//
this.label21.AutoSize = true;
this.label21.Location = new System.Drawing.Point(6, 390);
this.label21.Name = "label21";
this.label21.Size = new System.Drawing.Size(66, 13);
this.label21.TabIndex = 30;
this.label21.Text = "Battle SSEQ";
//
// pbEffectsBattleSSEQUpDown
//
this.pbEffectsBattleSSEQUpDown.Location = new System.Drawing.Point(9, 405);
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.TabIndex = 29;
//
// conditionalMusicGroupBox
//
this.conditionalMusicGroupBox.Controls.Add(this.label66);
@@ -9183,7 +9483,7 @@
// HOWconditionalMusicTableButton
//
this.HOWconditionalMusicTableButton.Image = global::DSPRE.Properties.Resources.questionMark;
this.HOWconditionalMusicTableButton.Location = new System.Drawing.Point(348, 93);
this.HOWconditionalMusicTableButton.Location = new System.Drawing.Point(353, 93);
this.HOWconditionalMusicTableButton.Name = "HOWconditionalMusicTableButton";
this.HOWconditionalMusicTableButton.Size = new System.Drawing.Size(28, 29);
this.HOWconditionalMusicTableButton.TabIndex = 9;
@@ -9206,7 +9506,7 @@
// label65
//
this.label65.AutoSize = true;
this.label65.Location = new System.Drawing.Point(262, 83);
this.label65.Location = new System.Drawing.Point(264, 83);
this.label65.Name = "label65";
this.label65.Size = new System.Drawing.Size(49, 13);
this.label65.TabIndex = 7;
@@ -9214,7 +9514,7 @@
//
// musicIDconditionalMusicUpDown
//
this.musicIDconditionalMusicUpDown.Location = new System.Drawing.Point(265, 99);
this.musicIDconditionalMusicUpDown.Location = new System.Drawing.Point(267, 99);
this.musicIDconditionalMusicUpDown.Maximum = new decimal(new int[] {
32767,
0,
@@ -9724,6 +10024,14 @@
this.versionLabel.TabIndex = 9;
this.versionLabel.Text = "ROM:";
//
// tbEditorPokeminiPictureBox
//
this.tbEditorPokeminiPictureBox.Location = new System.Drawing.Point(303, 12);
this.tbEditorPokeminiPictureBox.Name = "tbEditorPokeminiPictureBox";
this.tbEditorPokeminiPictureBox.Size = new System.Drawing.Size(40, 30);
this.tbEditorPokeminiPictureBox.TabIndex = 43;
this.tbEditorPokeminiPictureBox.TabStop = false;
//
// MainProgram
//
this.AllowDrop = true;
@@ -9999,11 +10307,9 @@
((System.ComponentModel.ISupportInitialize)(this.partyPokemon1PictureBox)).EndInit();
this.groupBox27.ResumeLayout(false);
this.groupBox27.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.encounterSSEQNupDown)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.encounterSSEQDupDown)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.encounterSSEQAltUpDown)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.encounterSSEQMainUpDown)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.trClassFramePreviewUpDown)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.trClassVSAnimationUpDown)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.trClassBattleSSEQUpDown)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.trainerClassPicBox)).EndInit();
this.groupBox25.ResumeLayout(false);
this.groupBox25.PerformLayout();
@@ -10012,6 +10318,16 @@
this.trainerItemsGroupBox.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.partyCountUpDown)).EndInit();
this.tableEditorTabPage.ResumeLayout(false);
this.pbEffectsGroupBox.ResumeLayout(false);
this.pbEffectsGroupBox.PerformLayout();
this.groupBox30.ResumeLayout(false);
this.groupBox30.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.tbEditorTrClassFramePreviewUpDown)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tbEditorTrClassPictureBox)).EndInit();
this.groupBox29.ResumeLayout(false);
this.groupBox29.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pbEffectsVSAnimationUpDown)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pbEffectsBattleSSEQUpDown)).EndInit();
this.conditionalMusicGroupBox.ResumeLayout(false);
this.conditionalMusicGroupBox.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.musicIDconditionalMusicUpDown)).EndInit();
@@ -10023,6 +10339,7 @@
this.statusStrip1.PerformLayout();
this.mainToolStrip.ResumeLayout(false);
this.mainToolStrip.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.tbEditorPokeminiPictureBox)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -10725,10 +11042,6 @@
private System.Windows.Forms.PictureBox trainerClassPicBox;
private System.Windows.Forms.TextBox trainerClassNameTextbox;
private System.Windows.Forms.Label label17;
private System.Windows.Forms.NumericUpDown trClassBattleSSEQUpDown;
private System.Windows.Forms.Label label22;
private System.Windows.Forms.NumericUpDown trClassVSAnimationUpDown;
private System.Windows.Forms.Label label21;
private System.Windows.Forms.Button saveTrainerClassButton;
private System.Windows.Forms.Label label40;
private System.Windows.Forms.NumericUpDown trClassFramePreviewUpDown;
@@ -10748,9 +11061,39 @@
private System.Windows.Forms.Button HOWconditionalMusicTableButton;
private System.Windows.Forms.Label label66;
private System.Windows.Forms.Button mapScreenshotButton;
private System.Windows.Forms.NumericUpDown encounterSSEQNupDown;
private System.Windows.Forms.NumericUpDown encounterSSEQAltUpDown;
private System.Windows.Forms.Label label67;
private System.Windows.Forms.NumericUpDown encounterSSEQDupDown;
private System.Windows.Forms.NumericUpDown encounterSSEQMainUpDown;
private System.Windows.Forms.GroupBox pbEffectsGroupBox;
private System.Windows.Forms.Label label22;
private System.Windows.Forms.NumericUpDown pbEffectsVSAnimationUpDown;
private System.Windows.Forms.Label label21;
private System.Windows.Forms.NumericUpDown pbEffectsBattleSSEQUpDown;
private System.Windows.Forms.Button HOWpbEffectsTableButton;
private System.Windows.Forms.Label label72;
private System.Windows.Forms.Button saveEffectCombosTableBTN;
private System.Windows.Forms.ListBox pbEffectsCombosListbox;
private System.Windows.Forms.GroupBox groupBox30;
private System.Windows.Forms.Label label68;
private System.Windows.Forms.ComboBox pbEffectsTrainerChooseMainCombobox;
private System.Windows.Forms.Button HOWVsTrainerButton;
private System.Windows.Forms.Button saveVSTrainerTableBTN;
private System.Windows.Forms.Label label70;
private System.Windows.Forms.ComboBox pbEffectsTrainerCombobox;
private System.Windows.Forms.ListBox pbEffectsVsTrainerListbox;
private System.Windows.Forms.GroupBox groupBox29;
private System.Windows.Forms.Label label69;
private System.Windows.Forms.ComboBox pbEffectsPokemonChooseMainCombobox;
private System.Windows.Forms.Button HOWvsPokemonButton;
private System.Windows.Forms.Button saveVSPokemonTableBTN;
private System.Windows.Forms.Label label71;
private System.Windows.Forms.ComboBox pbEffectsPokemonCombobox;
private System.Windows.Forms.ListBox pbEffectsVsPokemonListbox;
private System.Windows.Forms.Label label73;
private System.Windows.Forms.PictureBox tbEditorTrClassPictureBox;
private System.Windows.Forms.Label tbEditortrainerClassFrameMaxLabel;
private System.Windows.Forms.NumericUpDown tbEditorTrClassFramePreviewUpDown;
private System.Windows.Forms.PictureBox tbEditorPokeminiPictureBox;
}
}

View File

@@ -19,6 +19,8 @@ using System.Globalization;
using Images;
using Ekona.Images;
using Microsoft.WindowsAPICodePack.Dialogs;
using System.Collections.Specialized;
using System.Threading.Tasks;
namespace DSPRE {
public partial class MainProgram : Form {
@@ -776,13 +778,14 @@ namespace DSPRE {
}
} else if (mainTabControl.SelectedTab == trainerEditorTabPage) {
if (!trainerEditorIsReady) {
SetupTrainerEditor();
SetupTrainerClassEncounterMusicTable();
SetupTrainerEditor();
trainerEditorIsReady = true;
}
} else if (mainTabControl.SelectedTab == tableEditorTabPage) {
if(!tableEditorIsReady) {
SetupTableEditor();
SetupConditionalMusicTable();
SetupBattleEffectsTables();
tableEditorIsReady = true;
}
}
@@ -829,11 +832,11 @@ namespace DSPRE {
switch (RomInfo.gameFamily) {
case gFamEnum.DP:
case gFamEnum.Plat:
using (WildEditorDPPt editor = new WildEditorDPPt(wildPokeUnpackedPath, romInfo.GetPokémonNames(), encToOpen))
using (WildEditorDPPt editor = new WildEditorDPPt(wildPokeUnpackedPath, RomInfo.GetPokémonNames(), encToOpen))
editor.ShowDialog();
break;
default:
using (WildEditorHGSS editor = new WildEditorHGSS(wildPokeUnpackedPath, romInfo.GetPokémonNames(), encToOpen))
using (WildEditorHGSS editor = new WildEditorHGSS(wildPokeUnpackedPath, RomInfo.GetPokémonNames(), encToOpen))
editor.ShowDialog();
break;
}
@@ -4589,7 +4592,7 @@ namespace DSPRE {
owTrainerComboBox.Items.AddRange(trainerNames);
/* Add item list to ow item box */
owItemComboBox.Items.AddRange(romInfo.GetItemNames(0, new TextArchive(RomInfo.itemNamesTextNumber).messages.Count - 1));
owItemComboBox.Items.AddRange(RomInfo.GetItemNames(0, new TextArchive(RomInfo.itemNamesTextNumber).messages.Count - 1));
/* Add ow movement list to box */
owMovementComboBox.Items.AddRange(PokeDatabase.EventEditor.Overworlds.movementsArray);
@@ -6718,25 +6721,26 @@ namespace DSPRE {
if (gameFamily == gFamEnum.HGSS) {
entrySize += 2;
tableSizeOffset += 2;
encounterSSEQNupDown.Enabled = true;
encounterSSEQAltUpDown.Enabled = true;
}
byte tableEntriesCount = DSUtils.ReadByteFromArm9(RomInfo.encounterMusicTableOffsetToRAMAddress - tableSizeOffset);
using (BinaryReader br = new BinaryReader(File.OpenRead(arm9Path))) {
br.BaseStream.Position = encounterMusicTableTableStartAddress;
for (int i = 0; i < tableEntriesCount; i++) {
uint entryOffset = (uint)br.BaseStream.Position;
byte tclass = (byte)br.ReadUInt16();
ushort musicD = br.ReadUInt16();
ushort? musicN;
for (uint i = 0; i < tableEntriesCount; i++) {
uint entryOffset = encounterMusicTableTableStartAddress + entrySize * i;
if (gameFamily == gFamEnum.HGSS) {
musicN = br.ReadUInt16();
} else {
musicN = null;
}
byte tclass = DSUtils.ReadByteFromArm9(entryOffset);
ushort musicD = BitConverter.ToUInt16(DSUtils.ReadBytesFromArm9(entryOffset + 2, 2), 0);
ushort? musicN;
if (gameFamily == gFamEnum.HGSS) {
musicN = BitConverter.ToUInt16(DSUtils.ReadBytesFromArm9(entryOffset + 4, 2), 0);
} else {
musicN = null;
trainerClassEncounterMusicDict[tclass] = (entryOffset, musicD, musicN);
}
trainerClassEncounterMusicDict[tclass] = (entryOffset, musicD, musicN);
}
}
private void SetupTrainerEditor() {
@@ -6829,14 +6833,14 @@ namespace DSPRE {
int trainerCount = Directory.GetFiles(RomInfo.gameDirs[DirNames.trainerProperties].unpackedDir).Length;
trainerComboBox.Items.AddRange(GetTrainerNames());
string[] classNames = romInfo.GetTrainerClassNames();
string[] classNames = RomInfo.GetTrainerClassNames();
for (int i = 0; i < classNames.Length; i++) {
trainerClassListBox.Items.Add("[" + i.ToString("D3") + "]" + " " + classNames[i]);
}
string[] itemNames = romInfo.GetItemNames();
string[] pokeNames = romInfo.GetPokémonNames();
string[] moveNames = romInfo.GetAttackNames();
string[] itemNames = RomInfo.GetItemNames();
string[] pokeNames = RomInfo.GetPokémonNames();
string[] moveNames = RomInfo.GetAttackNames();
trainerItem1ComboBox.Items.AddRange(itemNames);
trainerItem2ComboBox.Items.AddRange(itemNames);
@@ -6880,7 +6884,7 @@ namespace DSPRE {
new FileStream(RomInfo.gameDirs[DirNames.trainerProperties].unpackedDir + suffix, FileMode.Open)
),
new FileStream(RomInfo.gameDirs[DirNames.trainerParty].unpackedDir + suffix, FileMode.Open),
romInfo.GetSimpleTrainerNames()[trainerComboBox.SelectedIndex]
RomInfo.GetSimpleTrainerNames()[trainerComboBox.SelectedIndex]
);
RefreshTrainerPartyGUI();
RefreshTrainerPropertiesGUI();
@@ -6922,17 +6926,17 @@ namespace DSPRE {
}
}
private string FixPokenameString(string toFix) {
TextInfo txtInfo = new CultureInfo("en-US", false).TextInfo;
string pokeName = txtInfo.ToTitleCase(toFix.ToLower());
pokeName = pokeName.Replace(" ", "_");
pokeName = pokeName.Replace("'", "_");
pokeName = pokeName.Replace("’", "_");
pokeName = pokeName.Replace(":", "_");
pokeName = pokeName.Replace("_D", "_d"); //Fix Farfetch'd
toFix = toFix.ToLower();
toFix = toFix.Replace(" ", "_");
toFix = toFix.Replace("'", "_");
toFix = toFix.Replace("’", "_");
toFix = toFix.Replace(":", "_");
toFix = toFix.Replace("-", "_");
toFix = toFix.Replace("_D", "_d"); //Fix Farfetch'd
pokeName = pokeName.Replace("♀", "F");
pokeName = pokeName.Replace("♂", "M");
return pokeName;
toFix = toFix.Replace("♀", "F");
toFix = toFix.Replace("♂", "M");
return toFix;
}
private void partyPokemon1ComboBox_SelectedIndexChanged(object sender, EventArgs e) {
if (!disableHandlers) {
@@ -7269,8 +7273,11 @@ namespace DSPRE {
}
try {
LoadTrainerClassPic();
UpdateTrainerClassPic();
int maxFrames = LoadTrainerClassPic(trainerClassListBox.SelectedIndex);
UpdateTrainerClassPic(trainerClassPicBox);
trClassFramePreviewUpDown.Maximum = maxFrames - 1;
trainerClassFrameMaxLabel.Text = "/" + maxFrames;
} catch {
trClassFramePreviewUpDown.Maximum = 0;
}
@@ -7279,14 +7286,20 @@ namespace DSPRE {
(uint entryOffset, ushort musicD, ushort? musicN) output;
if (trainerClassEncounterMusicDict.TryGetValue(currentTrainerFile.trp.trainerClass, out output)) {
encounterSSEQDupDown.Value = output.musicD;
encounterSSEQMainUpDown.Enabled = true;
encounterSSEQAltUpDown.Enabled = true;
encounterSSEQMainUpDown.Value = output.musicD;
if (gameFamily == gFamEnum.HGSS) {
encounterSSEQNupDown.Value = (ushort)output.musicN;
encounterSSEQAltUpDown.Value = (ushort)output.musicN;
}
} else {
encounterSSEQDupDown.Value = 0;
encounterSSEQNupDown.Value = 0;
encounterSSEQMainUpDown.Enabled = false;
encounterSSEQAltUpDown.Enabled = false;
encounterSSEQMainUpDown.Value = 0;
encounterSSEQAltUpDown.Value = 0;
}
if (disableHandlers) {
@@ -7295,25 +7308,24 @@ namespace DSPRE {
currentTrainerFile.trp.trainerClass = (byte)trainerClassListBox.SelectedIndex;
}
private void LoadTrainerClassPic() {
int paletteFileID = (trainerClassListBox.SelectedIndex * 5 + 1);
private int LoadTrainerClassPic(int trClassID) {
int paletteFileID = (trClassID * 5 + 1);
string paletteFilename = paletteFileID.ToString("D4");
pal = new NCLR(gameDirs[DirNames.trainerGraphics].unpackedDir + "\\" + paletteFilename, paletteFileID, paletteFilename);
int tilesFileID = trainerClassListBox.SelectedIndex * 5;
int tilesFileID = trClassID * 5;
string tilesFilename = tilesFileID.ToString("D4");
tiles = new NCGR(gameDirs[DirNames.trainerGraphics].unpackedDir + "\\" + tilesFilename, tilesFileID, tilesFilename);
if (gameFamily == gFamEnum.HGSS) {
int spriteFileID = (trainerClassListBox.SelectedIndex * 5 + 2);
int spriteFileID = (trClassID* 5 + 2);
string spriteFilename = spriteFileID.ToString("D4");
sprite = new NCER(gameDirs[DirNames.trainerGraphics].unpackedDir + "\\" + spriteFilename, spriteFileID, spriteFilename);
}
trClassFramePreviewUpDown.Maximum = sprite.Banks.Length - 1;
trainerClassFrameMaxLabel.Text = "/" + trClassFramePreviewUpDown.Maximum;
return sprite.Banks.Length - 1;
}
private void UpdateTrainerClassPic(int frameNumber = 0) {
private void UpdateTrainerClassPic(PictureBox pb, int frameNumber = 0) {
int bank0OAMcount = sprite.Banks[0].oams.Length;
int[] OAMenabled = new int[bank0OAMcount];
for (int i = 0; i < OAMenabled.Length; i++) {
@@ -7322,8 +7334,8 @@ namespace DSPRE {
frameNumber = Math.Min(sprite.Banks.Length, frameNumber);
Image trSprite = sprite.Get_Image(tiles, pal, frameNumber, trainerClassPicBox.Width, trainerClassPicBox.Height, false, false, false, true, true, -1, OAMenabled);
trainerClassPicBox.Image = trSprite;
trainerClassPicBox.Update();
pb.Image = trSprite;
pb.Update();
}
private void addTrainerButton_Click(object sender, EventArgs e) {
@@ -7441,7 +7453,7 @@ namespace DSPRE {
string trClass = GetTrainerClassNameFromListbox(trainerClassListBox.SelectedItem);
trainerClassListBox.Items[currentClassID] = "[" + currentClassID + "]" + " " + newName;
DSUtils.WriteBytesToArm9(BitConverter.GetBytes((ushort)encounterSSEQDupDown.Value), trainerClassEncounterMusicDict[(byte)currentClassID].entryOffset, 0);
DSUtils.WriteBytesToArm9(BitConverter.GetBytes((ushort)encounterSSEQMainUpDown.Value), trainerClassEncounterMusicDict[(byte)currentClassID].entryOffset, 0);
disableHandlers = false;
trainerClassListBox_SelectedIndexChanged(null, null);
@@ -7449,14 +7461,23 @@ namespace DSPRE {
}
private void trClassFramePreviewUpDown_ValueChanged(object sender, EventArgs e) {
UpdateTrainerClassPic((int)((NumericUpDown)sender).Value);
UpdateTrainerClassPic(trainerClassPicBox, (int)((NumericUpDown)sender).Value);
}
#endregion
#region Table Editor
List<(ushort header, ushort flag, ushort music)> conditionalMusicTable;
uint conditionalMusicTableStartAddress;
private void SetupTableEditor() {
OrderedDictionary vsTrainerEffectsDict;
OrderedDictionary vsPokemonEffectsDict;
List<(ushort vsGraph, ushort battleSSEQ)> effectsComboTable;
uint vsTrainerTableStartAddress;
uint vsPokemonTableStartAddress;
uint effectsComboMainTableStartAddress;
private void SetupConditionalMusicTable() {
if (RomInfo.gameFamily == gFamEnum.HGSS) {
RomInfo.SetConditionalMusicTableOffsetToRAMAddress();
conditionalMusicTable = new List<(ushort, ushort, ushort)>();
@@ -7464,13 +7485,17 @@ namespace DSPRE {
conditionalMusicTableStartAddress = BitConverter.ToUInt32(DSUtils.ReadBytesFromArm9(RomInfo.conditionalMusicTableOffsetToRAMAddress, 4), 0) - 0x02000000;
byte tableEntriesCount = DSUtils.ReadByteFromArm9(RomInfo.conditionalMusicTableOffsetToRAMAddress - 8);
for (uint i = 0; i < tableEntriesCount; i++) {
ushort header = BitConverter.ToUInt16(DSUtils.ReadBytesFromArm9(conditionalMusicTableStartAddress + 6 * i, 2), 0);
ushort flag = BitConverter.ToUInt16(DSUtils.ReadBytesFromArm9(conditionalMusicTableStartAddress + 6 * i + 2, 2), 0);
ushort musicID = BitConverter.ToUInt16(DSUtils.ReadBytesFromArm9(conditionalMusicTableStartAddress + 6 * i + 4, 2), 0);
using (BinaryReader br = new BinaryReader(File.OpenRead(arm9Path))) {
for (int i = 0; i < tableEntriesCount; i++) {
br.BaseStream.Position = conditionalMusicTableStartAddress;
conditionalMusicTable.Add((header, flag, musicID));
conditionalMusicTableListBox.Items.Add(headerListBox.Items[header]);
ushort header = br.ReadUInt16();
ushort flag = br.ReadUInt16();
ushort musicID = br.ReadUInt16();
conditionalMusicTable.Add((header, flag, musicID));
conditionalMusicTableListBox.Items.Add(headerListBox.Items[header]);
}
}
foreach (string location in headerListBox.Items) {
@@ -7481,15 +7506,87 @@ namespace DSPRE {
conditionalMusicTableListBox.SelectedIndex = 0;
}
} else {
pbEffectsGroupBox.Enabled = false;
conditionalMusicGroupBox.Enabled = false;
}
}
private void SetupBattleEffectsTables() {
if (RomInfo.gameFamily == gFamEnum.HGSS) {
RomInfo.SetBattleEffectsData();
vsTrainerEffectsDict = new OrderedDictionary();
vsPokemonEffectsDict = new OrderedDictionary();
effectsComboTable = new List<(ushort vsGraph, ushort battleSSEQ)>();
vsTrainerTableStartAddress = BitConverter.ToUInt32(DSUtils.ReadBytesFromArm9(RomInfo.vsTrainerEntryTableOffsetToRAMAddress, 4), 0) - 0x02000000;
vsPokemonTableStartAddress = BitConverter.ToUInt32(DSUtils.ReadBytesFromArm9(RomInfo.vsPokemonEntryTableOffsetToRAMAddress, 4), 0) - 0x02000000;
effectsComboMainTableStartAddress = BitConverter.ToUInt32(DSUtils.ReadBytesFromArm9(RomInfo.effectsComboTableOffsetToRAMAddress, 4), 0) - 0x02000000;
byte trainerTableEntriesCount = DSUtils.ReadByteFromArm9(RomInfo.vsTrainerEntryTableOffsetToSizeLimiter);
byte pokemonTableEntriesCount = DSUtils.ReadByteFromArm9(RomInfo.vsPokemonEntryTableOffsetToSizeLimiter);
byte comboTableEntriesCount = DSUtils.ReadByteFromArm9(RomInfo.effectsComboTableOffsetToSizeLimiter);
string[] pokeNames = RomInfo.GetPokémonNames();
for (int i = 0; i < pokeNames.Length; i++) {
pbEffectsPokemonCombobox.Items.Add("[" + i + "]" + " " + pokeNames[i]);
}
string[] trCnames = RomInfo.GetTrainerClassNames();
for (int i = 0; i < trCnames.Length; i++) {
pbEffectsTrainerCombobox.Items.Add("[" + i + "]" + " " + trCnames[i]);
}
using (BinaryReader br = new BinaryReader(File.OpenRead(arm9Path))) {
br.BaseStream.Position = vsTrainerTableStartAddress;
for (int i = 0; i < trainerTableEntriesCount; i++) {
ushort entry = br.ReadUInt16();
int comboID = entry >> 10;
int classID = entry & 1023;
vsTrainerEffectsDict.Insert(i, classID, comboID);
pbEffectsVsTrainerListbox.Items.Add("[" + classID.ToString("D3") + "]" + " " + trCnames[classID] + " uses Combo #" + comboID);
}
br.BaseStream.Position = vsPokemonTableStartAddress;
for (int i = 0; i < pokemonTableEntriesCount; i++) {
ushort entry = br.ReadUInt16();
int comboID = entry >> 10;
int pokeID = entry & 1023;
vsPokemonEffectsDict.Insert(i, pokeID, comboID);
pbEffectsVsPokemonListbox.Items.Add("[" + pokeID.ToString("D3") + "]" + " " + pokeNames[pokeID] + " uses Combo #" + comboID);
}
br.BaseStream.Position = effectsComboMainTableStartAddress;
for (int i = 0; i < comboTableEntriesCount; i++) {
ushort battleIntroEffect = br.ReadUInt16();
ushort battleMusic = br.ReadUInt16();
effectsComboTable.Add((battleIntroEffect, battleMusic));
pbEffectsCombosListbox.Items.Add("Combo " + i.ToString("D2") + " - " + "Effect #" + battleIntroEffect + ", " + "Music #" + battleMusic);
}
}
var items = pbEffectsCombosListbox.Items.Cast<Object>().ToArray();
pbEffectsPokemonChooseMainCombobox.Items.AddRange(items);
pbEffectsTrainerChooseMainCombobox.Items.AddRange(items);
if (pbEffectsCombosListbox.Items.Count > 0) {
pbEffectsCombosListbox.SelectedIndex = 0;
}
if (pbEffectsVsTrainerListbox.Items.Count > 0) {
pbEffectsVsTrainerListbox.SelectedIndex = 0;
}
if (pbEffectsVsPokemonListbox.Items.Count > 0) {
pbEffectsVsPokemonListbox.SelectedIndex = 0;
}
} else {
pbEffectsGroupBox.Enabled = false;
}
}
private void conditionalMusicTableListBox_SelectedIndexChanged(object sender, EventArgs e) {
int selection = conditionalMusicTableListBox.SelectedIndex;
headerConditionalMusicComboBox.SelectedIndex = conditionalMusicTable[selection].header;
disableHandlers = true;
int selection = conditionalMusicTableListBox.SelectedIndex;
headerConditionalMusicComboBox.SelectedIndex = conditionalMusicTable[selection].header;
flagConditionalMusicUpDown.Value = conditionalMusicTable[selection].flag;
musicIDconditionalMusicUpDown.Value = conditionalMusicTable[selection].music;
@@ -7516,7 +7613,6 @@ namespace DSPRE {
locationNameConditionalMusicLBL.Text = RomInfo.GetLocationNames()[(selected as HeaderHGSS).locationName];
break;
}
}
private void flagConditionalMusicUpDown_ValueChanged(object sender, EventArgs e) {
if (disableHandlers) {
@@ -7546,6 +7642,65 @@ namespace DSPRE {
}
}
private void numericUpDown1_ValueChanged(object sender, EventArgs e) {
UpdateTrainerClassPic(tbEditorTrClassPictureBox, (int)((NumericUpDown)sender).Value);
}
private void saveEffectComboBTN_Click(object sender, EventArgs e) {
}
private void saveVSPokemonEntryBTN_Click(object sender, EventArgs e) {
}
private void saveVSTrainerEntryBTN_Click(object sender, EventArgs e) {
}
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" +
"Each entry can be \"inherited\" by one or more Pokémon or Trainer classes.", "How this table works", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
private void HOWvsPokemonButton_Click(object sender, EventArgs e) {
MessageBox.Show("Each entry of this table links a \"Wild\" Pokémon to an Effect Combo from the Combos Table.\n\n" +
"Whenever that Pokémon is encountered in the tall grass or via script command, its VS. Sequence and Battle Theme will be automatically triggered.",
"How this table works", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
private void HOWVsTrainerButton_Click(object sender, EventArgs e) {
MessageBox.Show("Each entry of this table links a Trainer Class to an Effect Combo from the Combos Table.\n\n" +
"Every Trainer Class with a given combo will start the same VS. Sequence and Battle Theme.", "How this table works", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
private void pbEffectsVsTrainerListbox_SelectedIndexChanged(object sender, EventArgs e) {
DictionaryEntry ent = vsTrainerEffectsDict.Cast<DictionaryEntry>().ElementAt(pbEffectsVsTrainerListbox.SelectedIndex);
pbEffectsTrainerCombobox.SelectedIndex = (int)ent.Key;
pbEffectsCombosListbox.SelectedIndex = pbEffectsTrainerChooseMainCombobox.SelectedIndex = (int)ent.Value;
tbEditorTrClassFramePreviewUpDown.Value = 0;
}
private void pbEffectsVsPokemonListbox_SelectedIndexChanged(object sender, EventArgs e) {
DictionaryEntry ent = vsPokemonEffectsDict.Cast<DictionaryEntry>().ElementAt(pbEffectsVsPokemonListbox.SelectedIndex);
pbEffectsPokemonCombobox.SelectedIndex = (int)ent.Key;
pbEffectsCombosListbox.SelectedIndex = pbEffectsPokemonChooseMainCombobox.SelectedIndex = (int)ent.Value;
}
private void pbEffectsCombosListbox_SelectedIndexChanged(object sender, EventArgs e) {
var entry = effectsComboTable.ElementAt(pbEffectsCombosListbox.SelectedIndex);
pbEffectsBattleSSEQUpDown.Value = entry.battleSSEQ;
pbEffectsVSAnimationUpDown.Value = entry.vsGraph;
}
private void pbEffectsTrainerCombobox_SelectedIndexChanged(object sender, EventArgs e) {
int maxFrames = LoadTrainerClassPic((sender as ComboBox).SelectedIndex);
UpdateTrainerClassPic(tbEditorTrClassPictureBox);
tbEditorTrClassFramePreviewUpDown.Maximum = maxFrames;
tbEditortrainerClassFrameMaxLabel.Text = "/" + maxFrames;
}
#endregion
private void ExclusiveCBInvert(CheckBox cb) {
if (disableHandlers)
@@ -7559,5 +7714,12 @@ namespace DSPRE {
disableHandlers = false;
}
private void pbEffectsPokemonCombobox_SelectedIndexChanged(object sender, EventArgs e) {
ComboBox cb = sender as ComboBox;
Image pokeIcon = cb.SelectedIndex > 0 ? (Image)Properties.PokePics.ResourceManager.GetObject(FixPokenameString(PokeDatabase.System.pokeNames[(ushort)cb.SelectedIndex])) : null;
tbEditorPokeminiPictureBox.Image = pokeIcon;
tbEditorPokeminiPictureBox.Update();
}
}
}

View File

@@ -117,6 +117,96 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="mainTabImageList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>239, 17</value>
</metadata>
<data name="mainTabImageList.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM
EgAAAk1TRnQBSQFMAgEBCgEAAVwBFgFcARYBEAEAARABAAT/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==
</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="worldmapCoordsPasteButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@@ -845,99 +935,6 @@
<metadata name="ImportBTN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="headerConditionalMusicComboBox.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="mainTabImageList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>239, 17</value>
</metadata>
<data name="mainTabImageList.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM
EgAAAk1TRnQBSQFMAgEBCgEAAbwBFQG8ARUBEAEAARABAAT/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==
</value>
</data>
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
@@ -1032,6 +1029,9 @@
qcnkDWXJtp9DVaw7AAAAAElFTkSuQmCC
</value>
</data>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>533, 20</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>25</value>
</metadata>

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -3842,7 +3842,7 @@ namespace DSPRE.Resources {
[247] = "Pupitar",
[248] = "Tyranitar",
[249] = "Lugia",
[250] = "Ho-oh",
[250] = "Ho-Oh",
[251] = "Celebi",
[252] = "Treecko",
[253] = "Grovyle",

View File

@@ -33,8 +33,19 @@ namespace DSPRE {
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; }
@@ -449,6 +460,44 @@ namespace DSPRE {
break;
}
}
public static void SetBattleEffectsData() {
switch (gameFamily) {
case gFamEnum.HGSS:
switch (gameLanguage) {
case "ESP":
vsPokemonEntryTableOffsetToRAMAddress = gameVersion == gVerEnum.HeartGold ? (uint)0x518CC : 0x0;
vsTrainerEntryTableOffsetToRAMAddress = gameVersion == gVerEnum.HeartGold ? (uint)0x51888 : 0x0;
effectsComboTableOffsetToRAMAddress = gameVersion == gVerEnum.HeartGold ? (uint)0x517C0 : 0x0;
vsPokemonEntryTableOffsetToSizeLimiter = gameVersion == gVerEnum.HeartGold ? (uint)0x518C2 : 0x0;
vsTrainerEntryTableOffsetToSizeLimiter = gameVersion == gVerEnum.HeartGold ? (uint)0x5187E : 0x0;
effectsComboTableOffsetToSizeLimiter = gameVersion == gVerEnum.HeartGold ? (uint)0x517A2 : 0x0;
break;
case "ENG":
case "ITA":
case "FRA":
case "GER":
vsPokemonEntryTableOffsetToRAMAddress = 0x0;
vsTrainerEntryTableOffsetToRAMAddress = 0x0;
effectsComboTableOffsetToRAMAddress = 0x0;
vsPokemonEntryTableOffsetToSizeLimiter = 0x0;
vsTrainerEntryTableOffsetToSizeLimiter = 0x0;
effectsComboTableOffsetToSizeLimiter = 0x0;
break;
case "JAP":
vsPokemonEntryTableOffsetToRAMAddress = 0x0;
vsTrainerEntryTableOffsetToRAMAddress = 0x0;
effectsComboTableOffsetToRAMAddress = 0x0;
vsPokemonEntryTableOffsetToSizeLimiter = 0x0;
vsTrainerEntryTableOffsetToSizeLimiter = 0x0;
effectsComboTableOffsetToSizeLimiter = 0x0;
break;
}
break;
}
}
public static void SetEncounterMusicTableOffsetToRAMAddress() {
switch (gameFamily) {
case gFamEnum.HGSS:
@@ -622,12 +671,12 @@ namespace DSPRE {
public string GetRomNameFromWorkdir() => workDir.Substring(0, workDir.Length - folderSuffix.Length - 1);
public static int GetHeaderCount() => (int)new FileInfo(internalNamesLocation).Length / internalNameLength;
public static List<string> GetLocationNames() => new TextArchive(locationNamesTextNumber).messages;
public string[] GetSimpleTrainerNames() => new TextArchive(trainerNamesMessageNumber).messages.ToArray();
public string[] GetTrainerClassNames() => new TextArchive(trainerClassMessageNumber).messages.ToArray();
public string[] GetItemNames() => new TextArchive(itemNamesTextNumber).messages.ToArray();
public string[] GetItemNames(int startIndex, int count) => new TextArchive(itemNamesTextNumber).messages.GetRange(startIndex, count).ToArray();
public string[] GetPok<EFBFBD>monNames() => new TextArchive(pokemonNamesTextNumbers[0]).messages.ToArray();
public string[] GetAttackNames() => new TextArchive(attackNamesTextNumber).messages.ToArray();
public static string[] GetSimpleTrainerNames() => new TextArchive(trainerNamesMessageNumber).messages.ToArray();
public static string[] GetTrainerClassNames() => new TextArchive(trainerClassMessageNumber).messages.ToArray();
public static string[] GetItemNames() => new TextArchive(itemNamesTextNumber).messages.ToArray();
public static string[] GetItemNames(int startIndex, int count) => new TextArchive(itemNamesTextNumber).messages.GetRange(startIndex, count).ToArray();
public static string[] GetPok<EFBFBD>monNames() => new TextArchive(pokemonNamesTextNumbers[0]).messages.ToArray();
public static string[] GetAttackNames() => new TextArchive(attackNamesTextNumber).messages.ToArray();
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;

View File

@@ -2,4 +2,5 @@
<packages>
<package id="Microsoft.WindowsAPICodePack-Core" version="1.1.0.0" targetFramework="net48" />
<package id="Microsoft.WindowsAPICodePack-Shell" version="1.1.0.0" targetFramework="net48" />
<package id="System.Collections.Specialized" version="4.3.0" targetFramework="net48" />
</packages>