From 3fd376826913c76ddd0bdc3a776db8a8d6544053 Mon Sep 17 00:00:00 2001
From: AdAstra-LD <76622070+AdAstra-LD@users.noreply.github.com>
Date: Wed, 20 Oct 2021 03:46:28 +0200
Subject: [PATCH] Fixed AI flags and SEQ_EYE music bug
---
DS_Map/Main Window.Designer.cs | 254 ++++++++++++++++-----------------
DS_Map/Main Window.cs | 22 +--
DS_Map/Main Window.resx | 60 ++++----
3 files changed, 171 insertions(+), 165 deletions(-)
diff --git a/DS_Map/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs
index ea8b376..8d3b356 100644
--- a/DS_Map/Main Window.Designer.cs
+++ b/DS_Map/Main Window.Designer.cs
@@ -700,17 +700,17 @@
this.trainerClassPicBox = new System.Windows.Forms.PictureBox();
this.groupBox25 = new System.Windows.Forms.GroupBox();
this.TrainerAIGroupBox = new System.Windows.Forms.GroupBox();
- this.trainerAI11CheckBox = new System.Windows.Forms.CheckBox();
- this.trainerAI10CheckBox = new System.Windows.Forms.CheckBox();
- this.trainerAI9CheckBox = new System.Windows.Forms.CheckBox();
- this.trainerAI8CheckBox = new System.Windows.Forms.CheckBox();
- this.trainerAI7CheckBox = new System.Windows.Forms.CheckBox();
- this.trainerAI6CheckBox = new System.Windows.Forms.CheckBox();
- this.trainerAI5CheckBox = new System.Windows.Forms.CheckBox();
- this.trainerAI4CheckBox = new System.Windows.Forms.CheckBox();
- this.trainerAI3CheckBox = new System.Windows.Forms.CheckBox();
- this.trainerAI2CheckBox = new System.Windows.Forms.CheckBox();
this.trainerAI1CheckBox = new System.Windows.Forms.CheckBox();
+ this.trainerAI2CheckBox = new System.Windows.Forms.CheckBox();
+ this.trainerAI3CheckBox = new System.Windows.Forms.CheckBox();
+ this.trainerAI4CheckBox = new System.Windows.Forms.CheckBox();
+ this.trainerAI5CheckBox = new System.Windows.Forms.CheckBox();
+ this.trainerAI6CheckBox = new System.Windows.Forms.CheckBox();
+ this.trainerAI7CheckBox = new System.Windows.Forms.CheckBox();
+ this.trainerAI8CheckBox = new System.Windows.Forms.CheckBox();
+ this.trainerAI9CheckBox = new System.Windows.Forms.CheckBox();
+ this.trainerAI10CheckBox = new System.Windows.Forms.CheckBox();
+ this.trainerAI11CheckBox = new System.Windows.Forms.CheckBox();
this.trainerItemsGroupBox = new System.Windows.Forms.GroupBox();
this.trainerItem4ComboBox = new System.Windows.Forms.ComboBox();
this.trainerItem3ComboBox = new System.Windows.Forms.ComboBox();
@@ -9055,17 +9055,17 @@
//
// TrainerAIGroupBox
//
- this.TrainerAIGroupBox.Controls.Add(this.trainerAI11CheckBox);
- this.TrainerAIGroupBox.Controls.Add(this.trainerAI10CheckBox);
- this.TrainerAIGroupBox.Controls.Add(this.trainerAI9CheckBox);
- this.TrainerAIGroupBox.Controls.Add(this.trainerAI8CheckBox);
- this.TrainerAIGroupBox.Controls.Add(this.trainerAI7CheckBox);
- this.TrainerAIGroupBox.Controls.Add(this.trainerAI6CheckBox);
- this.TrainerAIGroupBox.Controls.Add(this.trainerAI5CheckBox);
- this.TrainerAIGroupBox.Controls.Add(this.trainerAI4CheckBox);
- this.TrainerAIGroupBox.Controls.Add(this.trainerAI3CheckBox);
- this.TrainerAIGroupBox.Controls.Add(this.trainerAI2CheckBox);
this.TrainerAIGroupBox.Controls.Add(this.trainerAI1CheckBox);
+ this.TrainerAIGroupBox.Controls.Add(this.trainerAI2CheckBox);
+ this.TrainerAIGroupBox.Controls.Add(this.trainerAI3CheckBox);
+ this.TrainerAIGroupBox.Controls.Add(this.trainerAI4CheckBox);
+ this.TrainerAIGroupBox.Controls.Add(this.trainerAI5CheckBox);
+ this.TrainerAIGroupBox.Controls.Add(this.trainerAI6CheckBox);
+ this.TrainerAIGroupBox.Controls.Add(this.trainerAI7CheckBox);
+ this.TrainerAIGroupBox.Controls.Add(this.trainerAI8CheckBox);
+ this.TrainerAIGroupBox.Controls.Add(this.trainerAI9CheckBox);
+ this.TrainerAIGroupBox.Controls.Add(this.trainerAI10CheckBox);
+ this.TrainerAIGroupBox.Controls.Add(this.trainerAI11CheckBox);
this.TrainerAIGroupBox.Location = new System.Drawing.Point(9, 282);
this.TrainerAIGroupBox.Name = "TrainerAIGroupBox";
this.TrainerAIGroupBox.Size = new System.Drawing.Size(384, 116);
@@ -9073,104 +9073,16 @@
this.TrainerAIGroupBox.TabStop = false;
this.TrainerAIGroupBox.Text = "AI";
//
- // trainerAI11CheckBox
+ // trainerAI1CheckBox
//
- this.trainerAI11CheckBox.AutoSize = true;
- this.trainerAI11CheckBox.Location = new System.Drawing.Point(271, 67);
- this.trainerAI11CheckBox.Name = "trainerAI11CheckBox";
- this.trainerAI11CheckBox.Size = new System.Drawing.Size(44, 17);
- this.trainerAI11CheckBox.TabIndex = 10;
- this.trainerAI11CheckBox.Text = "???";
- this.trainerAI11CheckBox.UseVisualStyleBackColor = true;
- this.trainerAI11CheckBox.CheckedChanged += new System.EventHandler(this.trainerAICheckBox_CheckedChanged);
- //
- // trainerAI10CheckBox
- //
- this.trainerAI10CheckBox.AutoSize = true;
- this.trainerAI10CheckBox.Location = new System.Drawing.Point(271, 44);
- this.trainerAI10CheckBox.Name = "trainerAI10CheckBox";
- this.trainerAI10CheckBox.Size = new System.Drawing.Size(67, 17);
- this.trainerAI10CheckBox.TabIndex = 9;
- this.trainerAI10CheckBox.Text = "Weather";
- this.trainerAI10CheckBox.UseVisualStyleBackColor = true;
- this.trainerAI10CheckBox.CheckedChanged += new System.EventHandler(this.trainerAICheckBox_CheckedChanged);
- //
- // trainerAI9CheckBox
- //
- this.trainerAI9CheckBox.AutoSize = true;
- this.trainerAI9CheckBox.Location = new System.Drawing.Point(271, 21);
- this.trainerAI9CheckBox.Name = "trainerAI9CheckBox";
- this.trainerAI9CheckBox.Size = new System.Drawing.Size(75, 17);
- this.trainerAI9CheckBox.TabIndex = 8;
- this.trainerAI9CheckBox.Text = "Check HP";
- this.trainerAI9CheckBox.UseVisualStyleBackColor = true;
- this.trainerAI9CheckBox.CheckedChanged += new System.EventHandler(this.trainerAICheckBox_CheckedChanged);
- //
- // trainerAI8CheckBox
- //
- this.trainerAI8CheckBox.AutoSize = true;
- this.trainerAI8CheckBox.Location = new System.Drawing.Point(138, 90);
- this.trainerAI8CheckBox.Name = "trainerAI8CheckBox";
- this.trainerAI8CheckBox.Size = new System.Drawing.Size(87, 17);
- this.trainerAI8CheckBox.TabIndex = 7;
- this.trainerAI8CheckBox.Text = "Tag Strategy";
- this.trainerAI8CheckBox.UseVisualStyleBackColor = true;
- this.trainerAI8CheckBox.CheckedChanged += new System.EventHandler(this.trainerAICheckBox_CheckedChanged);
- //
- // trainerAI7CheckBox
- //
- this.trainerAI7CheckBox.AutoSize = true;
- this.trainerAI7CheckBox.Location = new System.Drawing.Point(138, 67);
- this.trainerAI7CheckBox.Name = "trainerAI7CheckBox";
- this.trainerAI7CheckBox.Size = new System.Drawing.Size(80, 17);
- this.trainerAI7CheckBox.TabIndex = 6;
- this.trainerAI7CheckBox.Text = "Baton Pass";
- this.trainerAI7CheckBox.UseVisualStyleBackColor = true;
- this.trainerAI7CheckBox.CheckedChanged += new System.EventHandler(this.trainerAICheckBox_CheckedChanged);
- //
- // trainerAI6CheckBox
- //
- this.trainerAI6CheckBox.AutoSize = true;
- this.trainerAI6CheckBox.Location = new System.Drawing.Point(138, 44);
- this.trainerAI6CheckBox.Name = "trainerAI6CheckBox";
- this.trainerAI6CheckBox.Size = new System.Drawing.Size(100, 17);
- this.trainerAI6CheckBox.TabIndex = 5;
- this.trainerAI6CheckBox.Text = "Damage Priority";
- this.trainerAI6CheckBox.UseVisualStyleBackColor = true;
- this.trainerAI6CheckBox.CheckedChanged += new System.EventHandler(this.trainerAICheckBox_CheckedChanged);
- //
- // trainerAI5CheckBox
- //
- this.trainerAI5CheckBox.AutoSize = true;
- this.trainerAI5CheckBox.Location = new System.Drawing.Point(138, 21);
- this.trainerAI5CheckBox.Name = "trainerAI5CheckBox";
- this.trainerAI5CheckBox.Size = new System.Drawing.Size(47, 17);
- this.trainerAI5CheckBox.TabIndex = 4;
- this.trainerAI5CheckBox.Text = "Risk";
- this.trainerAI5CheckBox.UseVisualStyleBackColor = true;
- this.trainerAI5CheckBox.CheckedChanged += new System.EventHandler(this.trainerAICheckBox_CheckedChanged);
- //
- // trainerAI4CheckBox
- //
- this.trainerAI4CheckBox.AutoSize = true;
- this.trainerAI4CheckBox.Location = new System.Drawing.Point(16, 90);
- this.trainerAI4CheckBox.Name = "trainerAI4CheckBox";
- this.trainerAI4CheckBox.Size = new System.Drawing.Size(51, 17);
- this.trainerAI4CheckBox.TabIndex = 3;
- this.trainerAI4CheckBox.Text = "State";
- this.trainerAI4CheckBox.UseVisualStyleBackColor = true;
- this.trainerAI4CheckBox.CheckedChanged += new System.EventHandler(this.trainerAICheckBox_CheckedChanged);
- //
- // trainerAI3CheckBox
- //
- this.trainerAI3CheckBox.AutoSize = true;
- this.trainerAI3CheckBox.Location = new System.Drawing.Point(16, 67);
- this.trainerAI3CheckBox.Name = "trainerAI3CheckBox";
- this.trainerAI3CheckBox.Size = new System.Drawing.Size(56, 17);
- this.trainerAI3CheckBox.TabIndex = 2;
- this.trainerAI3CheckBox.Text = "Expert";
- this.trainerAI3CheckBox.UseVisualStyleBackColor = true;
- this.trainerAI3CheckBox.CheckedChanged += new System.EventHandler(this.trainerAICheckBox_CheckedChanged);
+ this.trainerAI1CheckBox.AutoSize = true;
+ this.trainerAI1CheckBox.Location = new System.Drawing.Point(16, 21);
+ this.trainerAI1CheckBox.Name = "trainerAI1CheckBox";
+ this.trainerAI1CheckBox.Size = new System.Drawing.Size(52, 17);
+ this.trainerAI1CheckBox.TabIndex = 0;
+ this.trainerAI1CheckBox.Text = "Basic";
+ this.trainerAI1CheckBox.UseVisualStyleBackColor = true;
+ this.trainerAI1CheckBox.CheckedChanged += new System.EventHandler(this.trainerAICheckBox_CheckedChanged);
//
// trainerAI2CheckBox
//
@@ -9183,16 +9095,104 @@
this.trainerAI2CheckBox.UseVisualStyleBackColor = true;
this.trainerAI2CheckBox.CheckedChanged += new System.EventHandler(this.trainerAICheckBox_CheckedChanged);
//
- // trainerAI1CheckBox
+ // trainerAI3CheckBox
//
- this.trainerAI1CheckBox.AutoSize = true;
- this.trainerAI1CheckBox.Location = new System.Drawing.Point(16, 21);
- this.trainerAI1CheckBox.Name = "trainerAI1CheckBox";
- this.trainerAI1CheckBox.Size = new System.Drawing.Size(52, 17);
- this.trainerAI1CheckBox.TabIndex = 0;
- this.trainerAI1CheckBox.Text = "Basic";
- this.trainerAI1CheckBox.UseVisualStyleBackColor = true;
- this.trainerAI1CheckBox.CheckedChanged += new System.EventHandler(this.trainerAICheckBox_CheckedChanged);
+ this.trainerAI3CheckBox.AutoSize = true;
+ this.trainerAI3CheckBox.Location = new System.Drawing.Point(16, 67);
+ this.trainerAI3CheckBox.Name = "trainerAI3CheckBox";
+ this.trainerAI3CheckBox.Size = new System.Drawing.Size(56, 17);
+ this.trainerAI3CheckBox.TabIndex = 2;
+ this.trainerAI3CheckBox.Text = "Expert";
+ this.trainerAI3CheckBox.UseVisualStyleBackColor = true;
+ this.trainerAI3CheckBox.CheckedChanged += new System.EventHandler(this.trainerAICheckBox_CheckedChanged);
+ //
+ // trainerAI4CheckBox
+ //
+ this.trainerAI4CheckBox.AutoSize = true;
+ this.trainerAI4CheckBox.Location = new System.Drawing.Point(16, 90);
+ this.trainerAI4CheckBox.Name = "trainerAI4CheckBox";
+ this.trainerAI4CheckBox.Size = new System.Drawing.Size(51, 17);
+ this.trainerAI4CheckBox.TabIndex = 3;
+ this.trainerAI4CheckBox.Text = "State";
+ this.trainerAI4CheckBox.UseVisualStyleBackColor = true;
+ this.trainerAI4CheckBox.CheckedChanged += new System.EventHandler(this.trainerAICheckBox_CheckedChanged);
+ //
+ // trainerAI5CheckBox
+ //
+ this.trainerAI5CheckBox.AutoSize = true;
+ this.trainerAI5CheckBox.Location = new System.Drawing.Point(138, 21);
+ this.trainerAI5CheckBox.Name = "trainerAI5CheckBox";
+ this.trainerAI5CheckBox.Size = new System.Drawing.Size(47, 17);
+ this.trainerAI5CheckBox.TabIndex = 4;
+ this.trainerAI5CheckBox.Text = "Risk";
+ this.trainerAI5CheckBox.UseVisualStyleBackColor = true;
+ this.trainerAI5CheckBox.CheckedChanged += new System.EventHandler(this.trainerAICheckBox_CheckedChanged);
+ //
+ // trainerAI6CheckBox
+ //
+ this.trainerAI6CheckBox.AutoSize = true;
+ this.trainerAI6CheckBox.Location = new System.Drawing.Point(138, 44);
+ this.trainerAI6CheckBox.Name = "trainerAI6CheckBox";
+ this.trainerAI6CheckBox.Size = new System.Drawing.Size(100, 17);
+ this.trainerAI6CheckBox.TabIndex = 5;
+ this.trainerAI6CheckBox.Text = "Damage Priority";
+ this.trainerAI6CheckBox.UseVisualStyleBackColor = true;
+ this.trainerAI6CheckBox.CheckedChanged += new System.EventHandler(this.trainerAICheckBox_CheckedChanged);
+ //
+ // trainerAI7CheckBox
+ //
+ this.trainerAI7CheckBox.AutoSize = true;
+ this.trainerAI7CheckBox.Location = new System.Drawing.Point(138, 67);
+ this.trainerAI7CheckBox.Name = "trainerAI7CheckBox";
+ this.trainerAI7CheckBox.Size = new System.Drawing.Size(80, 17);
+ this.trainerAI7CheckBox.TabIndex = 6;
+ this.trainerAI7CheckBox.Text = "Baton Pass";
+ this.trainerAI7CheckBox.UseVisualStyleBackColor = true;
+ this.trainerAI7CheckBox.CheckedChanged += new System.EventHandler(this.trainerAICheckBox_CheckedChanged);
+ //
+ // trainerAI8CheckBox
+ //
+ this.trainerAI8CheckBox.AutoSize = true;
+ this.trainerAI8CheckBox.Location = new System.Drawing.Point(138, 90);
+ this.trainerAI8CheckBox.Name = "trainerAI8CheckBox";
+ this.trainerAI8CheckBox.Size = new System.Drawing.Size(87, 17);
+ this.trainerAI8CheckBox.TabIndex = 7;
+ this.trainerAI8CheckBox.Text = "Tag Strategy";
+ this.trainerAI8CheckBox.UseVisualStyleBackColor = true;
+ this.trainerAI8CheckBox.CheckedChanged += new System.EventHandler(this.trainerAICheckBox_CheckedChanged);
+ //
+ // trainerAI9CheckBox
+ //
+ this.trainerAI9CheckBox.AutoSize = true;
+ this.trainerAI9CheckBox.Location = new System.Drawing.Point(271, 21);
+ this.trainerAI9CheckBox.Name = "trainerAI9CheckBox";
+ this.trainerAI9CheckBox.Size = new System.Drawing.Size(75, 17);
+ this.trainerAI9CheckBox.TabIndex = 8;
+ this.trainerAI9CheckBox.Text = "Check HP";
+ this.trainerAI9CheckBox.UseVisualStyleBackColor = true;
+ this.trainerAI9CheckBox.CheckedChanged += new System.EventHandler(this.trainerAICheckBox_CheckedChanged);
+ //
+ // trainerAI10CheckBox
+ //
+ this.trainerAI10CheckBox.AutoSize = true;
+ this.trainerAI10CheckBox.Location = new System.Drawing.Point(271, 44);
+ this.trainerAI10CheckBox.Name = "trainerAI10CheckBox";
+ this.trainerAI10CheckBox.Size = new System.Drawing.Size(67, 17);
+ this.trainerAI10CheckBox.TabIndex = 9;
+ this.trainerAI10CheckBox.Text = "Weather";
+ this.trainerAI10CheckBox.UseVisualStyleBackColor = true;
+ this.trainerAI10CheckBox.CheckedChanged += new System.EventHandler(this.trainerAICheckBox_CheckedChanged);
+ //
+ // trainerAI11CheckBox
+ //
+ this.trainerAI11CheckBox.AutoSize = true;
+ this.trainerAI11CheckBox.Location = new System.Drawing.Point(271, 67);
+ this.trainerAI11CheckBox.Name = "trainerAI11CheckBox";
+ this.trainerAI11CheckBox.Size = new System.Drawing.Size(44, 17);
+ this.trainerAI11CheckBox.TabIndex = 10;
+ this.trainerAI11CheckBox.Text = "???";
+ this.trainerAI11CheckBox.UseVisualStyleBackColor = true;
+ this.trainerAI11CheckBox.CheckedChanged += new System.EventHandler(this.trainerAICheckBox_CheckedChanged);
//
// trainerItemsGroupBox
//
@@ -9326,7 +9326,7 @@
// trainerClassListBox
//
this.trainerClassListBox.FormattingEnabled = true;
- this.trainerClassListBox.Location = new System.Drawing.Point(12, 39);
+ this.trainerClassListBox.Location = new System.Drawing.Point(11, 39);
this.trainerClassListBox.Name = "trainerClassListBox";
this.trainerClassListBox.Size = new System.Drawing.Size(181, 238);
this.trainerClassListBox.TabIndex = 0;
diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs
index be6b036..c30a546 100644
--- a/DS_Map/Main Window.cs
+++ b/DS_Map/Main Window.cs
@@ -8010,7 +8010,7 @@ namespace DSPRE {
trainerClassNameTextbox.Text = GetTrainerClassNameFromListbox(trainerClassListBox.SelectedItem);
(uint entryOffset, ushort musicD, ushort? musicN) output;
- if (trainerClassEncounterMusicDict.TryGetValue(currentTrainerFile.trp.trainerClass, out output)) {
+ if ( trainerClassEncounterMusicDict.TryGetValue((byte)trainerClassListBox.SelectedIndex, out output) ) {
encounterSSEQMainUpDown.Enabled = true;
encounterSSEQAltUpDown.Enabled = true;
@@ -8172,16 +8172,22 @@ namespace DSPRE {
private void saveTrainerClassButton_Click(object sender, EventArgs e) {
disableHandlers = true;
- int currentClassID = trainerClassListBox.SelectedIndex;
+ int selectedTrClass = trainerClassListBox.SelectedIndex;
+
+ byte b_selectedTrClass = (byte)selectedTrClass;
+ ushort eyeMusicID = (ushort)encounterSSEQMainUpDown.Value;
+ DSUtils.ARM9.WriteBytes( BitConverter.GetBytes(eyeMusicID), trainerClassEncounterMusicDict[b_selectedTrClass].entryOffset);
+ var dictEntry = trainerClassEncounterMusicDict[b_selectedTrClass];
+ trainerClassEncounterMusicDict[b_selectedTrClass] = (dictEntry.entryOffset, eyeMusicID, dictEntry.musicN);
+
string newName = trainerClassNameTextbox.Text;
UpdateCurrentTrainerClassName(newName);
-
- string trClass = GetTrainerClassNameFromListbox(trainerClassListBox.SelectedItem);
- trainerClassListBox.Items[currentClassID] = "[" + currentClassID + "]" + " " + newName;
- DSUtils.ARM9.WriteBytes(BitConverter.GetBytes((ushort)encounterSSEQMainUpDown.Value), trainerClassEncounterMusicDict[(byte)currentClassID].entryOffset, 0);
-
+ GetTrainerClassNameFromListbox(trainerClassListBox.SelectedItem);
disableHandlers = false;
- trainerClassListBox_SelectedIndexChanged(null, null);
+
+ trainerClassListBox.Items[selectedTrClass] = "[" + selectedTrClass.ToString("D3") + "]" + " " + newName;
+
+ //trainerClassListBox_SelectedIndexChanged(null, null);
MessageBox.Show("Trainer Class settings saved.", "Success", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
diff --git a/DS_Map/Main Window.resx b/DS_Map/Main Window.resx
index 41be1b6..4cf65fc 100644
--- a/DS_Map/Main Window.resx
+++ b/DS_Map/Main Window.resx
@@ -1958,7 +1958,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM
- EgAAAk1TRnQBSQFMAgEBCgEAAVwBFwFcARcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ EgAAAk1TRnQBSQFMAgEBCgEAAWQBFwFkARcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -2136,40 +2136,40 @@
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALuSURBVFhH7ZfNbxJBGMb5ixqj9/Zi6sWzh2pShF7sgcRT
- C0E3xehFY9UgBT34Ub0ViCBFsbbGg5AaKU3Ar1ApUJI2mtZoDfKxO8477NvuLsMsxdakiU/yCyz77jzP
- vrMzgOWwa0B9PXiVZsb6k16Xoh6iCKXZemuxZCPuZiXirquH+6P12MX51G2XUgq7CJD0OjEEvEIA4CWY
- Yw2rC1plKOpZqbBV1g6IFENONNVh7+9rqwUg/MasNE5rzPUt43PAHfIGQophJ2Mt6t4xx88gHO8aAIJA
- l5iRUfnghW1tm82AkIV7Iw16KQRQ9nItkAwO707P5vzlAV4RDzBKJzzy0kNJ+frqyk4H5MwUKc9KCu1A
- vdswyVCXIWDAVMgqpx9IysbcJYIYAyClGK1LeH7BiuGNB+jMUcYQMMDa09Hau/t6Y7MACHRkZVFqGjvC
- NUdBiFabJ1ibecaIWQAtZdqV8rTrt9ActBugNc88Y2QvAWBaytNOGkCwN/CmoBIbraX/YgoqEantoeSG
- 6OYhNHZknbL15jppGoxXo3Q1RN0/RPuJLoTI3Ah0JftCauKK+E4DaO+4GByndyzeyBBdiN42IlsjNyMp
- hbe3Gt2aItmQk78jwlbMu6AThecTSkmw/eqgdYtPbOJVAKpm/AQQ7etAddlPVhMe5X3gLBucV8Og5/KP
- HATqVAuxqssBOrgKDcIbFMzhPAbghqDHOX/rHKJaiKULgNAgm6+v6swBbQCAhWDGVp0xolqIpTM2wRjA
- DNVCLJ5RJ/4H0AWgD9zHOzbSd3yIvdcaI6qFWDyjTmCA+KSdHB0cYmSnrIyTp86QYydomH8RIHLNRnLU
- FDpwhHYAjG+OnW7rhGphrq2lyepKXFJ4plq0AbADbAkajBd8g+Y7IE/1bOB8nn6X88wBDPDshp11QGs6
- J1mVT3eH4Yfr/ujLQkDuFEBLghqXHp87uL9sPz/4tnF6tAF6bnOvqpfjDvg2/OwdqakfHUZZLH8AUX9d
- oYJg9XUAAAAASUVORK5CYII=
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALvSURBVFhH7ZfNbxJBGMb5ixqj9/bix8Wzh2oEihd7IPHU
+ QtC1NXrRWLUNBT1UUz1ZINLST22NB4gfKE22fqKEpSRtNK3RGiywO8477NvuLsMsxdakiU/yCyz77jzP
+ vrMzgGO/q0N/3XspYz3tyUG/ph+iCKVae+twyPFAtRgPlPXD3dFK4sJ8asivKTE/AZKDPgwBrxAAeALm
+ WMPqIk4VilpWKuZUjQMi+agPTU142tvqagEIvzop9dIae33LBL1wh7yBkHzMx1geD2yZ42cQjncNAEGg
+ S8zIqmzk/IaxzXZAyNyIp0IvhQDaTq4FkpHT29OzNn+5g1fEA4zSs/3q63uS9vXpla0OqJlhoiQkjXag
+ 3GyYZLTJEDBgKupU03clbfXxJYJYAyD5CVo32/8LVgxvPMBkjrKGgAGWJ7o3X42Yje0CINCR7Aupau0I
+ 1xwFIWpt7mNt5hkjdgGMKLQrhVH/b6E5aDtAbZ55xshOAsC0FEZ9NIBgb+BNQTHRvZn+iykoxqW6h5Ib
+ opmH0NqRFcp68jqpWoxzcboaxgM/RPuJKYTI3Ap0RZ6TqrgivtMAxjvOR3rpHYs3MsQUorWNyF2RH0pa
+ 7uWtSrOmiBz18XdE2Ip5FzTiy/RFTRFsvyZo3fNHbvEqAJUyIQKI9nWgtBgiuZk+7W3YzQbn1TDouex9
+ L4E63UKs0mKYDq5Dg/AGBXM4jwG4IejxUqh2DtEtxDIFQGiQtWdXTeaAMQDAQjBjl8kY0S3EMhnbYA1g
+ h24hFs+oEf8DmALQB+797S7SdriTvTcaI7qFWDyjRmCAqQEPOXi0kyEPuxjHT5wih47RMP8iQPxaF1mi
+ ptCBA7QDYHyz52RdJ3QLe62/GShlJyWNZ2rEGAA7wJagxXgheMR+B+SpLIfPfaLf5TxzAANM3/CwDhhN
+ 5ySX9uGOE3647o4+L4TVRgGMzFBj5cHZvfvL9vNdcAOnxxig5Ta3qnJhygvfhh+HzmzqH+1HORx/AE+d
+ XPF2h8qVAAAAAElFTkSuQmCC
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAM0SURBVFhH7ZVfSFNRHMf32FPPPRYUdBMijXwVliiMROzB
- 4mY4N+mPl4bLSDezm7b+QIJZ/ptJRCU9TUmy1bCEXiY9qMHsH/ZPkxDCHhJMa/d0fmfnXO+9OzvTaUHQ
- Dz7cs3v+fD/33O3MlklJ9TKSAm5Cdk+NDu3+c7WnuigRnEIAyLl4bH1FcutL9DCphgYLBLIDin7N6T6x
- dhk9HFilAFzpMquvkX5nfKrfvxwOZCAw0u7XZh+qdXRZcX0d7/BE23waBDP0cCADAbYOiMQGzvyiUeaa
- DDXMwwBjMEMPB9YgYCQaKo/TaJtt7umFPN4ghh4OGAS2ekrRFtmBil0OtN13eFUCQLRvhRI8AQjOx1y/
- 5CJAG+6tVMAUzsoqEW3za58fVC0aBbYd3U+CTlY4UPheA+ppVgjnqg+iptMlpE/ylpkErK+WG84KJGDC
- aKQxPnZb1WaHzqOsUwfIwl9GQ0mEbtYReH0wJytQieLjnWh6UNWm7/h/CMOhlgWadAGgOSBnBIQDU1gg
- 8fRO8dObtgq/gpnBqsXRW6omKXak4CdSvUVItm8iOLI3EKCt1pShBu8RQq3iImOlSjuaGVCXkl8BR0L0
- JYQFdih7yaKXz5YiZ+FmQnHuRgK0W6+1o0DgCVKUUOKKx1rPEyMmCVG4FdjWetlOcDskArR7Qz0kWFUj
- RII314pJQnQQ8bAKsHfOG8sj1ufjn4hwFPMmiAAB3v0k+nzo+X2X+FcAtTDehYBPeAJ3IQMfI03ay2AF
- WZzXT8B9k3c9CMbRCHEtvAgiHSzCXRQD/UyAK4E/T3Ql+hg0QlwmAQYWmXt2xRQOGAUAIkGCnaZgBo0Q
- lyk4DVaBdNAIcfGCUvFfwCSAv3Cvu11oZ75M2sZgBo0QFy8oFUwg3OJGOQUyIdbpJOwrLUO7C7HM3xAY
- aHahCRwKO7AL7wAEt9YeStoJGpG+vo21LLwLqxov1IhRgO0A+Qlagoc7CtKfgLxaigW9k/i/nBcOMIFH
- V91kB4yhQ6pTe3Oj/Cddau31fjgYTyVgJIKDp3qP59Fp61/fX3XMs9djFMh4mzOtpemw58PjRu1tW+Ui
- vfUvls32G0dqJ12tKZ1WAAAAAElFTkSuQmCC
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAM2SURBVFhH7ZVfSFNRHMf32FPPPRYUdBMijXwVliWMROzB
+ YlnOTfrjpeEy0s3sqq0/kGCmqTMpoqSnKYn5rz9CD5MeNINp/6xQkxDCHhJMa/d0fmfnXO+9OzvTaUHQ
+ Dz7cs3v+fD/33O3MkkxJFXYk+V2E1LZSDdr952pPSXY0OI4AkHb55PqKpFfkamFSKQ0WCKT6Ze2a1np6
+ 7TJaOLBKAbjSZVZfQ50FkalO33I4kITAUKNPne1Ryumy4vo62uQONXhVCGZo4UASAmwdEAl3nf9Fo4w1
+ EaychwH6YIYWDqxBQE8oeCxCoy2WuWeXMniDGFo4oBPY6s5DW+w2lOO0oe3eo6sSAEIdK5TgCUBwJqbh
+ ipMAbbi3UgFDOCuzRKjBp37uLl7UC2w7cZAEnSm0od4HlaitViZUlRxGNedySZ/kyTcImF8tN5wVSMCE
+ 4YHqyMhdRZ19chGlnD1EFv4yEowheLucwOuDOSn+IhQZbUZT3Yo6fc/3QxgOtSxQowkAtX57UkA4MIkF
+ ok9fIH56w1bhVzDzqHhx+I6iSrIVyfiJFE82sls3EWypGwjQVkrzUaXnOKFMdpKxUpEVzXQpS7GvgCMh
+ +hLCAjvkvWTRqxfykCNrMyEnfSMB2vU3biK//ymS5WD0iseazxM9BglRuBnY1gq7leCySQRotwfbSLCi
+ DBAJ3lwzBgnRQcTDLMDeOW8sj3CHl38iwlHMmyACBHj3Y+jwohcPC8W/AqiF0RYETOIJ3IV0fOqvVscD
+ hWRxXj8B903cdyMYRyPEtfAqgDSwCHdRDPQzAa4E/jzWEu1j0AhxGQQYWGTu+TVDOKAXAIgECXYYghk0
+ QlyG4ASYBRJBI8TFC4rHfwGDAP7CvWl1op2ZdtLWBzNohLh4QfFgAr11LpS2304INzsIB/Ly0e4sLPM3
+ BLpqnWgMh8IO7MI7AMH1ZUdidoJGJK5vL+sWJnoUlReqRy/AdoD8BE3Bg037Ep+AvFoKBzzv8X85Lxxg
+ An3XXWQH9KGPFYf69lbBT7rU2uvDYCAST0BPPw6eaj+VQaetf31/3TTPXo9eIOltTraWpnvdH/uq1HeN
+ RYv01r9YFstv/Kom7B6lWSUAAAAASUVORK5CYII=