Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-26 22:10:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Misc4 updates

Browse source
This commit is contained in:
sora10pls 2017-06-23 15:47:52 -04:00
parent 5b5c9d0017
commit 9cd85bf1db
3 changed files with 45 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PKHeX.Core/Saves/SAV4.cs
View file

@ -506,7 +506,7 @@ namespace PKHeX.Core
}
public override int SecondsToStart { get => BitConverter.ToInt32(Data, AdventureInfo + 0x34); set => BitConverter.GetBytes(value).CopyTo(Data, AdventureInfo + 0x34); }
public override int SecondsToFame { get => BitConverter.ToInt32(Data, AdventureInfo + 0x3C); set => BitConverter.GetBytes(value).CopyTo(Data, AdventureInfo + 0x3C); }
public int CurrentPokeTchApp { get => Data[0x1162]; set => Data[0x1162] = (byte)Math.Min(24, value); /* Alarm Clock */ }
public int CurrentPoketchApp { get => Data[0x1162]; set => Data[0x1162] = (byte)Math.Min(24, value); /* Alarm Clock */ }
// Storage
public override int CurrentBox

54
PKHeX.WinForms/Subforms/Save Editors/Gen4/SAV_Misc4.Designer.cs generated
View file

@ -95,6 +95,7 @@
this.NUD_CastleRankItem = new System.Windows.Forms.NumericUpDown();
this.NUD_CastleRankInfo = new System.Windows.Forms.NumericUpDown();
this.L_CastleRank01 = new System.Windows.Forms.Label();
this.L_CurrentMap = new System.Windows.Forms.Label();
this.TC_Misc.SuspendLayout();
this.TAB_Main.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.NUD_UGFlags)).BeginInit();
@ -168,6 +169,7 @@
//
// TAB_Main
//
this.TAB_Main.Controls.Add(this.L_CurrentMap);
this.TAB_Main.Controls.Add(this.L_UGFlags);
this.TAB_Main.Controls.Add(this.NUD_UGFlags);
this.TAB_Main.Controls.Add(this.NUD_BP);
@ -186,16 +188,16 @@
//
// L_UGFlags
//
this.L_UGFlags.Location = new System.Drawing.Point(3, 33);
this.L_UGFlags.Location = new System.Drawing.Point(-10, 28);
this.L_UGFlags.Name = "L_UGFlags";
this.L_UGFlags.Size = new System.Drawing.Size(100, 25);
this.L_UGFlags.TabIndex = 7;
this.L_UGFlags.Text = "Flags Obtained";
this.L_UGFlags.Text = "Flags Obtained:";
this.L_UGFlags.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// NUD_UGFlags
//
this.NUD_UGFlags.Location = new System.Drawing.Point(109, 36);
this.NUD_UGFlags.Location = new System.Drawing.Point(91, 31);
this.NUD_UGFlags.Maximum = new decimal(new int[] {
999999,
0,
@ -212,7 +214,7 @@
//
// NUD_BP
//
this.NUD_BP.Location = new System.Drawing.Point(90, 9);
this.NUD_BP.Location = new System.Drawing.Point(34, 8);
this.NUD_BP.Maximum = new decimal(new int[] {
9999,
0,
@ -229,9 +231,9 @@
//
// L_BP
//
this.L_BP.Location = new System.Drawing.Point(3, 7);
this.L_BP.Location = new System.Drawing.Point(3, 6);
this.L_BP.Name = "L_BP";
this.L_BP.Size = new System.Drawing.Size(81, 22);
this.L_BP.Size = new System.Drawing.Size(30, 22);
this.L_BP.TabIndex = 1;
this.L_BP.Text = "BP:";
this.L_BP.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@ -240,7 +242,7 @@
//
this.CB_UpgradeMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.CB_UpgradeMap.FormattingEnabled = true;
this.CB_UpgradeMap.Location = new System.Drawing.Point(6, 67);
this.CB_UpgradeMap.Location = new System.Drawing.Point(9, 76);
this.CB_UpgradeMap.Name = "CB_UpgradeMap";
this.CB_UpgradeMap.Size = new System.Drawing.Size(131, 21);
this.CB_UpgradeMap.TabIndex = 3;
@ -249,7 +251,7 @@
//
this.GB_FlyDest.Controls.Add(this.B_AllFlyDest);
this.GB_FlyDest.Controls.Add(this.CLB_FlyDest);
this.GB_FlyDest.Location = new System.Drawing.Point(3, 95);
this.GB_FlyDest.Location = new System.Drawing.Point(3, 101);
this.GB_FlyDest.Name = "GB_FlyDest";
this.GB_FlyDest.Size = new System.Drawing.Size(140, 138);
this.GB_FlyDest.TabIndex = 4;
@ -258,7 +260,7 @@
//
// B_AllFlyDest
//
this.B_AllFlyDest.Location = new System.Drawing.Point(6, 20);
this.B_AllFlyDest.Location = new System.Drawing.Point(5, 21);
this.B_AllFlyDest.Name = "B_AllFlyDest";
this.B_AllFlyDest.Size = new System.Drawing.Size(75, 25);
this.B_AllFlyDest.TabIndex = 0;
@ -270,7 +272,7 @@
//
this.CLB_FlyDest.CheckOnClick = true;
this.CLB_FlyDest.FormattingEnabled = true;
this.CLB_FlyDest.Location = new System.Drawing.Point(6, 51);
this.CLB_FlyDest.Location = new System.Drawing.Point(6, 54);
this.CLB_FlyDest.Name = "CLB_FlyDest";
this.CLB_FlyDest.Size = new System.Drawing.Size(128, 79);
this.CLB_FlyDest.TabIndex = 1;
@ -287,7 +289,7 @@
this.GB_Poketch.Size = new System.Drawing.Size(194, 231);
this.GB_Poketch.TabIndex = 5;
this.GB_Poketch.TabStop = false;
this.GB_Poketch.Text = "Poketch";
this.GB_Poketch.Text = "Pokétch";
//
// L_CurrentApp
//
@ -329,7 +331,7 @@
// PB_DotArtist
//
this.PB_DotArtist.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.PB_DotArtist.Location = new System.Drawing.Point(6, 138);
this.PB_DotArtist.Location = new System.Drawing.Point(6, 144);
this.PB_DotArtist.Name = "PB_DotArtist";
this.PB_DotArtist.Size = new System.Drawing.Size(96, 87);
this.PB_DotArtist.TabIndex = 2;
@ -346,7 +348,7 @@
this.TAB_BF.Name = "TAB_BF";
this.TAB_BF.Size = new System.Drawing.Size(373, 239);
this.TAB_BF.TabIndex = 1;
this.TAB_BF.Text = "B.Frontier";
this.TAB_BF.Text = "Battle Frontier";
this.TAB_BF.UseVisualStyleBackColor = true;
//
// GB_Prints
@ -465,17 +467,17 @@
this.RB_Stats3_01.AutoSize = true;
this.RB_Stats3_01.Location = new System.Drawing.Point(6, 76);
this.RB_Stats3_01.Name = "RB_Stats3_01";
this.RB_Stats3_01.Size = new System.Drawing.Size(49, 17);
this.RB_Stats3_01.Size = new System.Drawing.Size(55, 17);
this.RB_Stats3_01.TabIndex = 2;
this.RB_Stats3_01.TabStop = true;
this.RB_Stats3_01.Text = "Lv50";
this.RB_Stats3_01.Text = "Lv. 50";
this.RB_Stats3_01.UseVisualStyleBackColor = true;
this.RB_Stats3_01.CheckedChanged += new System.EventHandler(this.ChangeStat);
//
// RB_Stats3_02
//
this.RB_Stats3_02.AutoSize = true;
this.RB_Stats3_02.Location = new System.Drawing.Point(59, 76);
this.RB_Stats3_02.Location = new System.Drawing.Point(64, 76);
this.RB_Stats3_02.Name = "RB_Stats3_02";
this.RB_Stats3_02.Size = new System.Drawing.Size(51, 17);
this.RB_Stats3_02.TabIndex = 3;
@ -572,9 +574,9 @@
this.L_Stat0.AutoSize = true;
this.L_Stat0.Location = new System.Drawing.Point(6, 126);
this.L_Stat0.Name = "L_Stat0";
this.L_Stat0.Size = new System.Drawing.Size(41, 13);
this.L_Stat0.Size = new System.Drawing.Size(48, 13);
this.L_Stat0.TabIndex = 9;
this.L_Stat0.Text = "Current";
this.L_Stat0.Text = "Previous";
//
// L_Stat1
//
@ -588,11 +590,11 @@
// L_Stat2
//
this.L_Stat2.AutoSize = true;
this.L_Stat2.Location = new System.Drawing.Point(4, 178);
this.L_Stat2.Location = new System.Drawing.Point(6, 178);
this.L_Stat2.Name = "L_Stat2";
this.L_Stat2.Size = new System.Drawing.Size(27, 13);
this.L_Stat2.Size = new System.Drawing.Size(42, 13);
this.L_Stat2.TabIndex = 11;
this.L_Stat2.Text = "Max";
this.L_Stat2.Text = "Record";
//
// L_Stat3
//
@ -1082,6 +1084,15 @@
this.L_CastleRank01.Text = "Recovery / Item / Info";
this.L_CastleRank01.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// L_CurrentMap
//
this.L_CurrentMap.Location = new System.Drawing.Point(4, 51);
this.L_CurrentMap.Name = "L_CurrentMap";
this.L_CurrentMap.Size = new System.Drawing.Size(71, 25);
this.L_CurrentMap.TabIndex = 8;
this.L_CurrentMap.Text = "Current Map";
this.L_CurrentMap.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// SAV_Misc4
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -1206,5 +1217,6 @@
private System.Windows.Forms.NumericUpDown NUD_UGFlags;
private System.Windows.Forms.ComboBox CB_CurrentApp;
private System.Windows.Forms.Label L_CurrentApp;
private System.Windows.Forms.Label L_CurrentMap;
}
}

22
PKHeX.WinForms/Subforms/Save Editors/Gen4/SAV_Misc4.cs
View file

@ -28,7 +28,7 @@ namespace PKHeX.WinForms
ofsBP = GBO + 0x65F8;
ofsUGFlagCount = GBO + 0x3A60;
ofsPoketch = GBO + 0x114F;
CB_UpgradeMap.Visible = false;
L_CurrentMap.Visible = CB_UpgradeMap.Visible = false;
GB_Prints.Visible = GB_Prints.Enabled = GB_Hall.Visible = GB_Hall.Enabled = GB_Castle.Visible = GB_Castle.Enabled = false;
BFF = new[] { new[] { 0, 1, 0x5FCA, 0x04, 0x6601 }, };
break;
@ -37,7 +37,7 @@ namespace PKHeX.WinForms
ofsBP = GBO + 0x7234;
ofsUGFlagCount = GBO + 0x3CE8;
ofsPoketch = GBO + 0x1163;
CB_UpgradeMap.Visible = false;
L_CurrentMap.Visible = CB_UpgradeMap.Visible = false;
ofsPrints = GBO + 0xE4A;
BFF = new[] {
new[] { 0, 1, 0x68E0, 0x04, 0x723D },
@ -53,7 +53,7 @@ namespace PKHeX.WinForms
case GameVersion.HGSS:
ofsFlag = GBO + 0x10C4;
ofsBP = GBO + 0x5BB8;
NUD_UGFlags.Visible = false;
L_UGFlags.Visible = NUD_UGFlags.Visible = false;
GB_Poketch.Visible = false;
ofsMap = GBO + 0xBAE7;
ofsPrints = GBO + 0xE7E;
@ -180,14 +180,14 @@ namespace PKHeX.WinForms
private void ReadPoketch()
{
string[] PoketchTitle = new[] {
"01 Digital Watch", "02 Calculator", "03 Memo Pad", "04 Pedometer", "05 Pokemon List",
"06 Friendship Checker", "07 Dowsing Machine", "08 Berry Searcher", "09 Day Care Checker", "10 Pokemon History",
"11 Counter", "12 Analog Watch", "13 Marking Map", "14 Link Searcher", "15 Coin Toss",
"16 Move Tester", "17 Calendar", "18 Dot Artist", "19 Roulette", "20 Trainer Counter",
"21 Kitchen Timer", "22 Color Changer", "23 Matchup Checker", "24 Stopwatch", "25 Alarm Clock"
"01 - Digital Watch", "02 - Calculator", "03 - Memo Pad", "04 - Pedometer", "05 - Pokémon List",
"06 - Friendship Checker", "07 - Dowsing Machine", "08 - Berry Searcher", "09 - Day Care Checker", "10 - Pokémon History",
"11 - Counter", "12 - Analog Watch", "13 - Marking Map", "14 - Link Searcher", "15 - Coin Toss",
"16 - Move Tester", "17 - Calendar", "18 - Dot Artist", "19 - Roulette", "20 - Trainer Counter",
"21 - Kitchen Timer", "22 - Color Changer", "23 - Matchup Checker", "24 - Stopwatch", "25 - Alarm Clock"
};
CB_CurrentApp.Items.AddRange(PoketchTitle);
CB_CurrentApp.SelectedIndex = SAV.CurrentPokeTchApp;
CB_CurrentApp.SelectedIndex = SAV.CurrentPoketchApp;
oldPoketchVal = new bool[PoketchTitle.Length];
CLB_Poketch.Items.Clear();
for (int i = 0; i < PoketchTitle.Length; i++)
@ -227,7 +227,7 @@ namespace PKHeX.WinForms
SAV.Data[ofsPoketch - 1] = 0;
DotArtistByte.CopyTo(SAV.Data, ofsPoketch + 0x27);
SAV.Data[ofsPoketch - 3] |= 0x04; // "Touch!"
SAV.CurrentPokeTchApp = CB_CurrentApp.SelectedIndex;
SAV.CurrentPoketchApp = CB_CurrentApp.SelectedIndex;
}
private void SetPictureBoxFromFlags(byte[] inp)
@ -412,7 +412,7 @@ namespace PKHeX.WinForms
};
BFT = new[] {
new[] { "Singles", "Doubles", "Multi" },
new[] { "Singles", "Doubles", "Multi(Trainer)", "Multi(friend)", "WiFi" },
new[] { "Singles", "Doubles", "Multi (Trainer)", "Multi (Friend)", "Wi-Fi" },
};
BFN = new[] { "Tower", "Factory", "Hall", "Castle", "Arcade" };
if (SAV.DP) BFN = BFN.Take(1).ToArray();