diff --git a/PKHeX.csproj b/PKHeX.csproj index 2cc90abe7..890803b3c 100644 --- a/PKHeX.csproj +++ b/PKHeX.csproj @@ -301,6 +301,13 @@ + + + + + + + diff --git a/PKX/f1-Main.Designer.cs b/PKX/f1-Main.Designer.cs index e3d8498bb..db06bfec7 100644 --- a/PKX/f1-Main.Designer.cs +++ b/PKX/f1-Main.Designer.cs @@ -3049,7 +3049,7 @@ public void InitializeComponent() // B_BoxRight // this.B_BoxRight.FlatStyle = System.Windows.Forms.FlatStyle.System; - this.B_BoxRight.Location = new System.Drawing.Point(220, 9); + this.B_BoxRight.Location = new System.Drawing.Point(219, 9); this.B_BoxRight.Name = "B_BoxRight"; this.B_BoxRight.Size = new System.Drawing.Size(27, 23); this.B_BoxRight.TabIndex = 61; @@ -3060,7 +3060,7 @@ public void InitializeComponent() // B_BoxLeft // this.B_BoxLeft.FlatStyle = System.Windows.Forms.FlatStyle.System; - this.B_BoxLeft.Location = new System.Drawing.Point(58, 9); + this.B_BoxLeft.Location = new System.Drawing.Point(57, 9); this.B_BoxLeft.Name = "B_BoxLeft"; this.B_BoxLeft.Size = new System.Drawing.Size(27, 23); this.B_BoxLeft.TabIndex = 60; @@ -3104,7 +3104,7 @@ public void InitializeComponent() "Box 29", "Box 30", "Box 31"}); - this.C_BoxSelect.Location = new System.Drawing.Point(89, 10); + this.C_BoxSelect.Location = new System.Drawing.Point(88, 10); this.C_BoxSelect.Name = "C_BoxSelect"; this.C_BoxSelect.Size = new System.Drawing.Size(127, 21); this.C_BoxSelect.TabIndex = 0; @@ -4134,7 +4134,6 @@ public void InitializeComponent() private System.Windows.Forms.Button B_OpenPokedex; private System.Windows.Forms.GroupBox GB_SAVtools; private System.Windows.Forms.TabPage Tab_Other; - private System.Windows.Forms.ComboBox C_BoxSelect; private System.Windows.Forms.Label L_BattleBox; private System.Windows.Forms.Label L_Party; private System.Windows.Forms.Label L_DaycareSeed; @@ -4257,6 +4256,7 @@ public void InitializeComponent() private System.Windows.Forms.Button B_OpenSuperTraining; private System.Windows.Forms.Button B_OutAHK; private System.Windows.Forms.Panel PAN_Box; + public System.Windows.Forms.ComboBox C_BoxSelect; } } diff --git a/PKX/f1-Main.cs b/PKX/f1-Main.cs index 6a50a6fd7..a6fd47ff1 100644 --- a/PKX/f1-Main.cs +++ b/PKX/f1-Main.cs @@ -203,6 +203,7 @@ public Form1() public string[] metXY_60000 = { }; public string[] trainingbags = { }; public string[] trainingstage = { }; + public string[] wallpapernames = { }; public string[] puffs = { }; public string[] ribbonlist = { }; public string[] itempouch = { }; @@ -8452,6 +8453,7 @@ private void InitializeStrings() puffs = getStringList("Puff", l); ribbonlist = getStringList("Ribbon", l); itempouch = getStringList("ItemPouch", l); + wallpapernames = getStringList("Wallpaper", l); // Get the Egg Name and then replace it with --- for the comboboxes. eggname = specieslist[0]; diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index 1b0253cf3..d4eb24e7e 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -17066,6 +17066,230 @@ internal class Resources { } } + /// + /// Looks up a localized string similar to Wald + ///Stadt + ///Wüste + ///Steppe + ///Geröll + ///Vulkan + ///Schnee + ///Höhle + ///Strand + ///Tiefsee + ///Fluss + ///Himmel + ///Poké-Center + ///Metall + ///Kariert + ///Weiß + ///Spezialmotiv 1 + ///Spezialmotiv 2 + ///Spezialmotiv 3 + ///Spezialmotiv 4 + ///Spezialmotiv 5 + ///Spezialmotiv 6 + ///Spezialmotiv 7 + ///Spezialmotiv 8. + /// + internal static string text_Wallpaper_de { + get { + return ResourceManager.GetString("text_Wallpaper_de", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to FOREST + ///CITY + ///DESERT + ///SAVANNA + ///CRAG + ///VOLCANO + ///SNOW + ///CAVE + ///BEACH + ///SEAFLOOR + ///RIVER + ///SKY + ///POKÉ CENTER + ///MACHINE + ///CHECKS + ///SIMPLE + ///SPECIAL 1 + ///SPECIAL 2 + ///SPECIAL 3 + ///SPECIAL 4 + ///SPECIAL 5 + ///SPECIAL 6 + ///SPECIAL 7 + ///SPECIAL 8. + /// + internal static string text_Wallpaper_en { + get { + return ResourceManager.GetString("text_Wallpaper_en", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Bosque + ///Ciudad + ///Desierto + ///Sabana + ///Montaña + ///Volcán + ///Nieve + ///Cueva + ///Playa + ///Mar + ///Río + ///Cielo + ///Centro Pokémon + ///Máquina + ///Cuadros + ///Sencillo + ///Especial 1 + ///Especial 2 + ///Especial 3 + ///Especial 4 + ///Especial 5 + ///Especial 6 + ///Especial 7 + ///Especial 8. + /// + internal static string text_Wallpaper_es { + get { + return ResourceManager.GetString("text_Wallpaper_es", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Forêt + ///Ville + ///Désert + ///Savane + ///Rochers + ///Volcan + ///Neige + ///Grotte + ///Plage + ///Mer + ///Rivière + ///Ciel + ///Centre Pokémon + ///Métal + ///Vichy + ///Uni + ///Spécial 1 + ///Spécial 2 + ///Spécial 3 + ///Spécial 4 + ///Spécial 5 + ///Spécial 6 + ///Spécial 7 + ///Spécial 8. + /// + internal static string text_Wallpaper_fr { + get { + return ResourceManager.GetString("text_Wallpaper_fr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Foresta + ///Città + ///Deserto + ///Savana + ///Rocce + ///Vulcano + ///Neve + ///Grotta + ///Spiaggia + ///Fondale + ///Fiume + ///Cielo + ///Centro Pokémon + ///Metallo + ///Quadretti + ///Semplice + ///Speciale 1 + ///Speciale 2 + ///Speciale 3 + ///Speciale 4 + ///Speciale 5 + ///Speciale 6 + ///Speciale 7 + ///Speciale 8. + /// + internal static string text_Wallpaper_it { + get { + return ResourceManager.GetString("text_Wallpaper_it", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to もり + ///シティ + ///さばく + ///サバンナ + ///いわやま + ///かざん + ///ゆきやま + ///どうくつ + ///うみべ + ///かいてい + ///かわ + ///そら + ///ポケセン + ///きんぞく + ///チェック + ///シンプル + ///スペシャル１ + ///スペシャル２ + ///スペシャル３ + ///スペシャル４ + ///スペシャル５ + ///スペシャル６ + ///スペシャル７ + ///スペシャル８. + /// + internal static string text_Wallpaper_ja { + get { + return ResourceManager.GetString("text_Wallpaper_ja", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to 숲 + ///시티 + ///사막 + ///사바나 + ///바위산 + ///화산 + ///설산 + ///동굴 + ///바닷가 + ///해저 + ///강 + ///하늘 + ///포켓센 + ///금속 + ///체크 + ///심플 + ///스페셜1 + ///스페셜2 + ///스페셜3 + ///스페셜4 + ///스페셜5 + ///스페셜6 + ///스페셜7 + ///스페셜8. + /// + internal static string text_Wallpaper_ko { + get { + return ResourceManager.GetString("text_Wallpaper_ko", resourceCulture); + } + } + /// /// Looks up a localized string similar to －－－－－－－－－－ /// diff --git a/Properties/Resources.resx b/Properties/Resources.resx index 4f69b30ea..2b7d6a3bf 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -3793,4 +3793,25 @@ ..\Resources\text\ko\text_TrainingBag_ko.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + + ..\Resources\text\de\text_Wallpaper_de.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + + + ..\Resources\text\en\text_Wallpaper_en.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + + + ..\Resources\text\es\text_Wallpaper_es.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + + + ..\Resources\text\fr\text_Wallpaper_fr.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + + + ..\Resources\text\it\text_Wallpaper_it.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + + + ..\Resources\text\ja\text_Wallpaper_ja.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + + + ..\Resources\text\ko\text_Wallpaper_ko.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + \ No newline at end of file diff --git a/Resources/text/changelog.txt b/Resources/text/changelog.txt index cfcb3e61f..e13d21254 100644 --- a/Resources/text/changelog.txt +++ b/Resources/text/changelog.txt @@ -244,7 +244,7 @@ - Changed: Party / Battle Box now has a spiffy layout. - Changed: Program width to assist those on Wine / foreign languages. -07/31/14 - New Update: +07/31/14 - New Update: (---) - Added: Code Generator now displays how many lines there are if the split checkbox is set. - Added: Translation text for Item Pouches - Added: Translation text for Pokepuffs @@ -256,7 +256,7 @@ - Changed: Can no longer set an egg into the first Party Slot. This is to prevent players from entering battles with no valid Pokemon. - Added: Image Layering to display Held Items for Party/Box/etc slots. -08/01/14 - New Update: +08/01/14 - New Update: (300) - Added: Spanish translation (beta) -- thanks Glitch! - Added: Zygarde Rebattle Flags. - Added: Detecting/Browser opening of Cyber Gadget data folder if it exists. Access via Tools->Open Temp 3DSSE. @@ -267,4 +267,6 @@ - Added: Box Backgrounds now appear. - Changed: Selection colors (View/Set/Delete) are now semi-transparent backgrounds. - Fixed: Venonat's background not being transparent. - - Fixed: Cyber SAV opening/saving will actually find the folder if it exists. \ No newline at end of file + - Fixed: Cyber SAV opening/saving will actually find the folder if it exists. + - Added: Active Super Training Bag & Hits Remaining can be changed in the Ribbon/Medal Editor. 0x16&0x17 Extra Bytes have been removed from the list. + - Added: Box Background Selection in [Box Layout]. \ No newline at end of file diff --git a/Resources/text/de/text_Wallpaper_de.txt b/Resources/text/de/text_Wallpaper_de.txt new file mode 100644 index 000000000..fe77c8b7c --- /dev/null +++ b/Resources/text/de/text_Wallpaper_de.txt @@ -0,0 +1,24 @@ +Wald +Stadt +Wüste +Steppe +Geröll +Vulkan +Schnee +Höhle +Strand +Tiefsee +Fluss +Himmel +Poké-Center +Metall +Kariert +Weiß +Spezialmotiv 1 +Spezialmotiv 2 +Spezialmotiv 3 +Spezialmotiv 4 +Spezialmotiv 5 +Spezialmotiv 6 +Spezialmotiv 7 +Spezialmotiv 8 \ No newline at end of file diff --git a/Resources/text/en/text_Wallpaper_en.txt b/Resources/text/en/text_Wallpaper_en.txt new file mode 100644 index 000000000..08ab29b67 --- /dev/null +++ b/Resources/text/en/text_Wallpaper_en.txt @@ -0,0 +1,24 @@ +FOREST +CITY +DESERT +SAVANNA +CRAG +VOLCANO +SNOW +CAVE +BEACH +SEAFLOOR +RIVER +SKY +POKÉ CENTER +MACHINE +CHECKS +SIMPLE +SPECIAL 1 +SPECIAL 2 +SPECIAL 3 +SPECIAL 4 +SPECIAL 5 +SPECIAL 6 +SPECIAL 7 +SPECIAL 8 \ No newline at end of file diff --git a/Resources/text/es/text_Wallpaper_es.txt b/Resources/text/es/text_Wallpaper_es.txt new file mode 100644 index 000000000..1f573b099 --- /dev/null +++ b/Resources/text/es/text_Wallpaper_es.txt @@ -0,0 +1,24 @@ +Bosque +Ciudad +Desierto +Sabana +Montaña +Volcán +Nieve +Cueva +Playa +Mar +Río +Cielo +Centro Pokémon +Máquina +Cuadros +Sencillo +Especial 1 +Especial 2 +Especial 3 +Especial 4 +Especial 5 +Especial 6 +Especial 7 +Especial 8 \ No newline at end of file diff --git a/Resources/text/fr/text_Wallpaper_fr.txt b/Resources/text/fr/text_Wallpaper_fr.txt new file mode 100644 index 000000000..0f5119559 --- /dev/null +++ b/Resources/text/fr/text_Wallpaper_fr.txt @@ -0,0 +1,24 @@ +Forêt +Ville +Désert +Savane +Rochers +Volcan +Neige +Grotte +Plage +Mer +Rivière +Ciel +Centre Pokémon +Métal +Vichy +Uni +Spécial 1 +Spécial 2 +Spécial 3 +Spécial 4 +Spécial 5 +Spécial 6 +Spécial 7 +Spécial 8 \ No newline at end of file diff --git a/Resources/text/it/text_Wallpaper_it.txt b/Resources/text/it/text_Wallpaper_it.txt new file mode 100644 index 000000000..11f0d3b95 --- /dev/null +++ b/Resources/text/it/text_Wallpaper_it.txt @@ -0,0 +1,24 @@ +Foresta +Città +Deserto +Savana +Rocce +Vulcano +Neve +Grotta +Spiaggia +Fondale +Fiume +Cielo +Centro Pokémon +Metallo +Quadretti +Semplice +Speciale 1 +Speciale 2 +Speciale 3 +Speciale 4 +Speciale 5 +Speciale 6 +Speciale 7 +Speciale 8 \ No newline at end of file diff --git a/Resources/text/ja/text_Wallpaper_ja.txt b/Resources/text/ja/text_Wallpaper_ja.txt new file mode 100644 index 000000000..73e2c63fc --- /dev/null +++ b/Resources/text/ja/text_Wallpaper_ja.txt @@ -0,0 +1,24 @@ +もり +シティ +さばく +サバンナ +いわやま +かざん +ゆきやま +どうくつ +うみべ +かいてい +かわ +そら +ポケセン +きんぞく +チェック +シンプル +スペシャル１ +スペシャル２ +スペシャル３ +スペシャル４ +スペシャル５ +スペシャル６ +スペシャル７ +スペシャル８ \ No newline at end of file diff --git a/Resources/text/ko/text_Wallpaper_ko.txt b/Resources/text/ko/text_Wallpaper_ko.txt new file mode 100644 index 000000000..8b53b02df --- /dev/null +++ b/Resources/text/ko/text_Wallpaper_ko.txt @@ -0,0 +1,24 @@ +숲 +시티 +사막 +사바나 +바위산 +화산 +설산 +동굴 +바닷가 +해저 +강 +하늘 +포켓센 +금속 +체크 +심플 +스페셜1 +스페셜2 +스페셜3 +스페셜4 +스페셜5 +스페셜6 +스페셜7 +스페셜8 \ No newline at end of file diff --git a/SAV/SAV_BoxLayout.Designer.cs b/SAV/SAV_BoxLayout.Designer.cs index 38d64ef53..52c2829c3 100644 --- a/SAV/SAV_BoxLayout.Designer.cs +++ b/SAV/SAV_BoxLayout.Designer.cs @@ -32,7 +32,6 @@ private void InitializeComponent() this.LB_BoxSelect = new System.Windows.Forms.ListBox(); this.TB_BoxName = new System.Windows.Forms.TextBox(); this.L_BoxName = new System.Windows.Forms.Label(); - this.MT_BG = new System.Windows.Forms.MaskedTextBox(); this.L_BG = new System.Windows.Forms.Label(); this.L_Flags = new System.Windows.Forms.Label(); this.MT_BG1 = new System.Windows.Forms.MaskedTextBox(); @@ -41,10 +40,14 @@ private void InitializeComponent() this.B_Cancel = new System.Windows.Forms.Button(); this.label1 = new System.Windows.Forms.Label(); this.CB_Unlocked = new System.Windows.Forms.ComboBox(); + this.CB_BG = new System.Windows.Forms.ComboBox(); + this.PAN_BG = new System.Windows.Forms.Panel(); this.SuspendLayout(); // // LB_BoxSelect // + this.LB_BoxSelect.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left))); this.LB_BoxSelect.FormattingEnabled = true; this.LB_BoxSelect.Items.AddRange(new object[] { "Box 1", @@ -80,7 +83,7 @@ private void InitializeComponent() "Box 31"}); this.LB_BoxSelect.Location = new System.Drawing.Point(12, 14); this.LB_BoxSelect.Name = "LB_BoxSelect"; - this.LB_BoxSelect.Size = new System.Drawing.Size(78, 212); + this.LB_BoxSelect.Size = new System.Drawing.Size(78, 264); this.LB_BoxSelect.TabIndex = 0; this.LB_BoxSelect.SelectedIndexChanged += new System.EventHandler(this.changeBox); // @@ -89,7 +92,7 @@ private void InitializeComponent() this.TB_BoxName.Location = new System.Drawing.Point(106, 35); this.TB_BoxName.MaxLength = 15; this.TB_BoxName.Name = "TB_BoxName"; - this.TB_BoxName.Size = new System.Drawing.Size(100, 20); + this.TB_BoxName.Size = new System.Drawing.Size(130, 20); this.TB_BoxName.TabIndex = 1; this.TB_BoxName.WordWrap = false; this.TB_BoxName.TextChanged += new System.EventHandler(this.changeBoxDetails); @@ -103,29 +106,20 @@ private void InitializeComponent() this.L_BoxName.TabIndex = 2; this.L_BoxName.Text = "Box Name:"; // - // MT_BG - // - this.MT_BG.Location = new System.Drawing.Point(177, 61); - this.MT_BG.Mask = "00"; - this.MT_BG.Name = "MT_BG"; - this.MT_BG.Size = new System.Drawing.Size(29, 20); - this.MT_BG.TabIndex = 3; - this.MT_BG.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.MT_BG.TextChanged += new System.EventHandler(this.changeBoxDetails); - // // L_BG // this.L_BG.AutoSize = true; this.L_BG.Location = new System.Drawing.Point(104, 64); this.L_BG.Name = "L_BG"; - this.L_BG.Size = new System.Drawing.Size(68, 13); + this.L_BG.Size = new System.Drawing.Size(25, 13); this.L_BG.TabIndex = 4; - this.L_BG.Text = "Background:"; + this.L_BG.Text = "BG:"; // // L_Flags // + this.L_Flags.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.L_Flags.AutoSize = true; - this.L_Flags.Location = new System.Drawing.Point(103, 112); + this.L_Flags.Location = new System.Drawing.Point(122, 186); this.L_Flags.Name = "L_Flags"; this.L_Flags.Size = new System.Drawing.Size(102, 13); this.L_Flags.TabIndex = 5; @@ -133,7 +127,8 @@ private void InitializeComponent() // // MT_BG1 // - this.MT_BG1.Location = new System.Drawing.Point(117, 128); + this.MT_BG1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.MT_BG1.Location = new System.Drawing.Point(136, 202); this.MT_BG1.Mask = "00"; this.MT_BG1.Name = "MT_BG1"; this.MT_BG1.Size = new System.Drawing.Size(29, 20); @@ -143,7 +138,8 @@ private void InitializeComponent() // // MT_BG2 // - this.MT_BG2.Location = new System.Drawing.Point(157, 128); + this.MT_BG2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.MT_BG2.Location = new System.Drawing.Point(176, 202); this.MT_BG2.Mask = "00"; this.MT_BG2.Name = "MT_BG2"; this.MT_BG2.Size = new System.Drawing.Size(29, 20); @@ -153,9 +149,10 @@ private void InitializeComponent() // // B_Save // - this.B_Save.Location = new System.Drawing.Point(157, 203); + this.B_Save.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.B_Save.Location = new System.Drawing.Point(169, 255); this.B_Save.Name = "B_Save"; - this.B_Save.Size = new System.Drawing.Size(50, 23); + this.B_Save.Size = new System.Drawing.Size(67, 23); this.B_Save.TabIndex = 9; this.B_Save.Text = "Save"; this.B_Save.UseVisualStyleBackColor = true; @@ -163,9 +160,10 @@ private void InitializeComponent() // // B_Cancel // - this.B_Cancel.Location = new System.Drawing.Point(96, 203); + this.B_Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.B_Cancel.Location = new System.Drawing.Point(96, 255); this.B_Cancel.Name = "B_Cancel"; - this.B_Cancel.Size = new System.Drawing.Size(50, 23); + this.B_Cancel.Size = new System.Drawing.Size(67, 23); this.B_Cancel.TabIndex = 10; this.B_Cancel.Text = "Cancel"; this.B_Cancel.UseVisualStyleBackColor = true; @@ -173,8 +171,9 @@ private void InitializeComponent() // // label1 // + this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(103, 179); + this.label1.Location = new System.Drawing.Point(103, 231); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(56, 13); this.label1.TabIndex = 11; @@ -182,6 +181,7 @@ private void InitializeComponent() // // CB_Unlocked // + this.CB_Unlocked.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.CB_Unlocked.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CB_Unlocked.FormattingEnabled = true; this.CB_Unlocked.Items.AddRange(new object[] { @@ -216,17 +216,38 @@ private void InitializeComponent() "29", "30", "31"}); - this.CB_Unlocked.Location = new System.Drawing.Point(165, 176); + this.CB_Unlocked.Location = new System.Drawing.Point(165, 228); this.CB_Unlocked.Name = "CB_Unlocked"; this.CB_Unlocked.Size = new System.Drawing.Size(40, 21); this.CB_Unlocked.TabIndex = 12; this.CB_Unlocked.TextChanged += new System.EventHandler(this.changeBoxDetails); // + // CB_BG + // + this.CB_BG.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CB_BG.FormattingEnabled = true; + this.CB_BG.Location = new System.Drawing.Point(135, 61); + this.CB_BG.Name = "CB_BG"; + this.CB_BG.Size = new System.Drawing.Size(101, 21); + this.CB_BG.TabIndex = 13; + this.CB_BG.SelectedIndexChanged += new System.EventHandler(this.changeBoxBG); + this.CB_BG.TextChanged += new System.EventHandler(this.changeBoxDetails); + // + // PAN_BG + // + this.PAN_BG.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.PAN_BG.Location = new System.Drawing.Point(100, 88); + this.PAN_BG.Name = "PAN_BG"; + this.PAN_BG.Size = new System.Drawing.Size(140, 95); + this.PAN_BG.TabIndex = 14; + // // SAV_BoxLayout // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(219, 239); + this.ClientSize = new System.Drawing.Size(249, 291); + this.Controls.Add(this.PAN_BG); + this.Controls.Add(this.CB_BG); this.Controls.Add(this.CB_Unlocked); this.Controls.Add(this.label1); this.Controls.Add(this.B_Cancel); @@ -235,7 +256,6 @@ private void InitializeComponent() this.Controls.Add(this.MT_BG1); this.Controls.Add(this.L_Flags); this.Controls.Add(this.L_BG); - this.Controls.Add(this.MT_BG); this.Controls.Add(this.L_BoxName); this.Controls.Add(this.TB_BoxName); this.Controls.Add(this.LB_BoxSelect); @@ -256,7 +276,6 @@ private void InitializeComponent() private System.Windows.Forms.ListBox LB_BoxSelect; private System.Windows.Forms.TextBox TB_BoxName; private System.Windows.Forms.Label L_BoxName; - private System.Windows.Forms.MaskedTextBox MT_BG; private System.Windows.Forms.Label L_BG; private System.Windows.Forms.Label L_Flags; private System.Windows.Forms.MaskedTextBox MT_BG1; @@ -265,5 +284,7 @@ private void InitializeComponent() private System.Windows.Forms.Button B_Cancel; private System.Windows.Forms.Label label1; private System.Windows.Forms.ComboBox CB_Unlocked; + private System.Windows.Forms.ComboBox CB_BG; + private System.Windows.Forms.Panel PAN_BG; } } \ No newline at end of file diff --git a/SAV/SAV_BoxLayout.cs b/SAV/SAV_BoxLayout.cs index e2348433a..866a05040 100644 --- a/SAV/SAV_BoxLayout.cs +++ b/SAV/SAV_BoxLayout.cs @@ -18,7 +18,14 @@ public SAV_BoxLayout(Form1 frm1) editing = true; Array.Copy(m_parent.savefile, sav, 0x100000); savindex = m_parent.savindex; - LB_BoxSelect.SelectedIndex = 0; + + // Repopulate Wallpaper names + CB_BG.Items.Clear(); + for (int i = 0; i < m_parent.wallpapernames.Length; i++) + CB_BG.Items.Add(m_parent.wallpapernames[i]); + + // Go + LB_BoxSelect.SelectedIndex = m_parent.C_BoxSelect.SelectedIndex; } Form1 m_parent; @@ -37,15 +44,16 @@ private void changeBox(object sender, EventArgs e) editing = true; int index = LB_BoxSelect.SelectedIndex; int offset = 0x9800 + savindex * 0x7F000; - + int bgoff = (0x7F000 * savindex) + 0x9C1E + LB_BoxSelect.SelectedIndex; + CB_BG.SelectedIndex = sav[bgoff]; + changeBoxBG(null, null); TB_BoxName.Text = Encoding.Unicode.GetString(sav, offset + 0x22 * index, 0x22); - MT_BG.Text = sav[0x9C1E + savindex * 0x7F000 + index].ToString(); + CB_BG.SelectedIndex = sav[0x9C1E + savindex * 0x7F000 + index]; MT_BG1.Text = sav[0x9C3D + savindex * 0x7F000].ToString(); MT_BG2.Text = sav[0x9C3F + savindex * 0x7F000].ToString(); CB_Unlocked.SelectedIndex = sav[0x9C3E + savindex * 0x7F000] - 1; - editing = false; } private void changeBoxDetails(object sender, EventArgs e) @@ -55,13 +63,15 @@ private void changeBoxDetails(object sender, EventArgs e) int index = LB_BoxSelect.SelectedIndex; int offset = 0x9800 + savindex * 0x7F000; + sav[(0x7F000 * savindex) + 0x9C1E + LB_BoxSelect.SelectedIndex] = (byte)CB_BG.SelectedIndex; + // Get Sender Index byte[] boxname = Encoding.Unicode.GetBytes(TB_BoxName.Text); Array.Resize(ref boxname, 0x22); Array.Copy(boxname, 0, sav, offset + 0x22 * index, boxname.Length); - sav[0x9C1E + savindex * 0x7F000 + index] = (byte)ToUInt32(MT_BG.Text); + sav[0x9C1E + savindex * 0x7F000 + index] = (byte)CB_BG.SelectedIndex; sav[0x9C3D + savindex * 0x7F000] = (byte)ToUInt32(MT_BG1.Text); sav[0x9C3F + savindex * 0x7F000] = (byte)ToUInt32(MT_BG2.Text); @@ -80,5 +90,11 @@ private void B_Save_Click(object sender, EventArgs e) m_parent.getPKXBoxes(); Close(); } + + private void changeBoxBG(object sender, EventArgs e) + { + sav[(0x7F000 * savindex) + 0x9C1E + LB_BoxSelect.SelectedIndex] = (byte)CB_BG.SelectedIndex; + PAN_BG.BackgroundImage = (Image)Properties.Resources.ResourceManager.GetObject("box_wp" + (CB_BG.SelectedIndex+1).ToString("00")); + } } } \ No newline at end of file diff --git a/SAV/SAV_BoxLayout.resx b/SAV/SAV_BoxLayout.resx index 84d1fbe93..e783cb733 100644 --- a/SAV/SAV_BoxLayout.resx +++ b/SAV/SAV_BoxLayout.resx @@ -123,27 +123,9 @@ True - - True - True - - True - - - True - - - True - - - True - - - True - True