diff --git a/SAV/SAV_EventFlags.Designer.cs b/SAV/SAV_EventFlags.Designer.cs index 72f02de2a..313da9263 100644 --- a/SAV/SAV_EventFlags.Designer.cs +++ b/SAV/SAV_EventFlags.Designer.cs @@ -58,17 +58,18 @@ private void InitializeComponent() this.flag_0114 = new System.Windows.Forms.CheckBox(); this.flag_0790 = new System.Windows.Forms.CheckBox(); this.groupBox3 = new System.Windows.Forms.GroupBox(); - this.flag_0285 = new System.Windows.Forms.CheckBox(); - this.flag_0286 = new System.Windows.Forms.CheckBox(); - this.flag_0675 = new System.Windows.Forms.CheckBox(); - this.flag_0290 = new System.Windows.Forms.CheckBox(); - this.flag_0291 = new System.Windows.Forms.CheckBox(); - this.flag_0292 = new System.Windows.Forms.CheckBox(); - this.flag_0293 = new System.Windows.Forms.CheckBox(); - this.flag_0294 = new System.Windows.Forms.CheckBox(); - this.flag_0287 = new System.Windows.Forms.CheckBox(); - this.flag_0288 = new System.Windows.Forms.CheckBox(); this.flag_0289 = new System.Windows.Forms.CheckBox(); + this.flag_0288 = new System.Windows.Forms.CheckBox(); + this.flag_0287 = new System.Windows.Forms.CheckBox(); + this.flag_0294 = new System.Windows.Forms.CheckBox(); + this.flag_0293 = new System.Windows.Forms.CheckBox(); + this.flag_0292 = new System.Windows.Forms.CheckBox(); + this.flag_0291 = new System.Windows.Forms.CheckBox(); + this.flag_0290 = new System.Windows.Forms.CheckBox(); + this.flag_0675 = new System.Windows.Forms.CheckBox(); + this.flag_0286 = new System.Windows.Forms.CheckBox(); + this.flag_0285 = new System.Windows.Forms.CheckBox(); + this.flag_2546 = new System.Windows.Forms.CheckBox(); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.nud)).BeginInit(); this.groupBox2.SuspendLayout(); @@ -412,113 +413,17 @@ private void InitializeComponent() this.groupBox3.TabStop = false; this.groupBox3.Text = "Misc"; // - // flag_0285 + // flag_0289 // - this.flag_0285.AutoSize = true; - this.flag_0285.CheckAlign = System.Drawing.ContentAlignment.TopLeft; - this.flag_0285.Location = new System.Drawing.Point(6, 19); - this.flag_0285.Name = "flag_0285"; - this.flag_0285.Size = new System.Drawing.Size(106, 17); - this.flag_0285.TabIndex = 15; - this.flag_0285.Text = "Singles Statuette"; - this.flag_0285.UseVisualStyleBackColor = true; - this.flag_0285.Click += new System.EventHandler(this.toggleFlag); - // - // flag_0286 - // - this.flag_0286.AutoSize = true; - this.flag_0286.CheckAlign = System.Drawing.ContentAlignment.TopLeft; - this.flag_0286.Location = new System.Drawing.Point(6, 34); - this.flag_0286.Name = "flag_0286"; - this.flag_0286.Size = new System.Drawing.Size(111, 17); - this.flag_0286.TabIndex = 16; - this.flag_0286.Text = "Doubles Statuette"; - this.flag_0286.UseVisualStyleBackColor = true; - this.flag_0286.Click += new System.EventHandler(this.toggleFlag); - // - // flag_0675 - // - this.flag_0675.AutoSize = true; - this.flag_0675.CheckAlign = System.Drawing.ContentAlignment.TopLeft; - this.flag_0675.Location = new System.Drawing.Point(15, 243); - this.flag_0675.Name = "flag_0675"; - this.flag_0675.Size = new System.Drawing.Size(119, 17); - this.flag_0675.TabIndex = 17; - this.flag_0675.Text = "50: Beat Chatelaine"; - this.flag_0675.UseVisualStyleBackColor = true; - this.flag_0675.Click += new System.EventHandler(this.toggleFlag); - // - // flag_0290 - // - this.flag_0290.AutoSize = true; - this.flag_0290.CheckAlign = System.Drawing.ContentAlignment.TopLeft; - this.flag_0290.Location = new System.Drawing.Point(6, 99); - this.flag_0290.Name = "flag_0290"; - this.flag_0290.Size = new System.Drawing.Size(140, 17); - this.flag_0290.TabIndex = 18; - this.flag_0290.Text = "Super Singles Unlocked"; - this.flag_0290.UseVisualStyleBackColor = true; - this.flag_0290.Click += new System.EventHandler(this.toggleFlag); - // - // flag_0291 - // - this.flag_0291.AutoSize = true; - this.flag_0291.CheckAlign = System.Drawing.ContentAlignment.TopLeft; - this.flag_0291.Location = new System.Drawing.Point(6, 114); - this.flag_0291.Name = "flag_0291"; - this.flag_0291.Size = new System.Drawing.Size(145, 17); - this.flag_0291.TabIndex = 19; - this.flag_0291.Text = "Super Doubles Unlocked"; - this.flag_0291.UseVisualStyleBackColor = true; - this.flag_0291.Click += new System.EventHandler(this.toggleFlag); - // - // flag_0292 - // - this.flag_0292.AutoSize = true; - this.flag_0292.CheckAlign = System.Drawing.ContentAlignment.TopLeft; - this.flag_0292.Location = new System.Drawing.Point(6, 129); - this.flag_0292.Name = "flag_0292"; - this.flag_0292.Size = new System.Drawing.Size(137, 17); - this.flag_0292.TabIndex = 20; - this.flag_0292.Text = "Super Triples Unlocked"; - this.flag_0292.UseVisualStyleBackColor = true; - this.flag_0292.Click += new System.EventHandler(this.toggleFlag); - // - // flag_0293 - // - this.flag_0293.AutoSize = true; - this.flag_0293.CheckAlign = System.Drawing.ContentAlignment.TopLeft; - this.flag_0293.Location = new System.Drawing.Point(6, 144); - this.flag_0293.Name = "flag_0293"; - this.flag_0293.Size = new System.Drawing.Size(146, 17); - this.flag_0293.TabIndex = 21; - this.flag_0293.Text = "Super Rotation Unlocked"; - this.flag_0293.UseVisualStyleBackColor = true; - this.flag_0293.Click += new System.EventHandler(this.toggleFlag); - // - // flag_0294 - // - this.flag_0294.AutoSize = true; - this.flag_0294.CheckAlign = System.Drawing.ContentAlignment.TopLeft; - this.flag_0294.Location = new System.Drawing.Point(6, 159); - this.flag_0294.Name = "flag_0294"; - this.flag_0294.Size = new System.Drawing.Size(128, 17); - this.flag_0294.TabIndex = 22; - this.flag_0294.Text = "Super Multi Unlocked"; - this.flag_0294.UseVisualStyleBackColor = true; - this.flag_0294.Click += new System.EventHandler(this.toggleFlag); - // - // flag_0287 - // - this.flag_0287.AutoSize = true; - this.flag_0287.CheckAlign = System.Drawing.ContentAlignment.TopLeft; - this.flag_0287.Location = new System.Drawing.Point(6, 49); - this.flag_0287.Name = "flag_0287"; - this.flag_0287.Size = new System.Drawing.Size(103, 17); - this.flag_0287.TabIndex = 23; - this.flag_0287.Text = "Triples Statuette"; - this.flag_0287.UseVisualStyleBackColor = true; - this.flag_0287.Click += new System.EventHandler(this.toggleFlag); + this.flag_0289.AutoSize = true; + this.flag_0289.CheckAlign = System.Drawing.ContentAlignment.TopLeft; + this.flag_0289.Location = new System.Drawing.Point(6, 79); + this.flag_0289.Name = "flag_0289"; + this.flag_0289.Size = new System.Drawing.Size(94, 17); + this.flag_0289.TabIndex = 25; + this.flag_0289.Text = "Multi Statuette"; + this.flag_0289.UseVisualStyleBackColor = true; + this.flag_0289.Click += new System.EventHandler(this.toggleFlag); // // flag_0288 // @@ -532,23 +437,131 @@ private void InitializeComponent() this.flag_0288.UseVisualStyleBackColor = true; this.flag_0288.Click += new System.EventHandler(this.toggleFlag); // - // flag_0289 + // flag_0287 // - this.flag_0289.AutoSize = true; - this.flag_0289.CheckAlign = System.Drawing.ContentAlignment.TopLeft; - this.flag_0289.Location = new System.Drawing.Point(6, 79); - this.flag_0289.Name = "flag_0289"; - this.flag_0289.Size = new System.Drawing.Size(94, 17); - this.flag_0289.TabIndex = 25; - this.flag_0289.Text = "Multi Statuette"; - this.flag_0289.UseVisualStyleBackColor = true; - this.flag_0289.Click += new System.EventHandler(this.toggleFlag); + this.flag_0287.AutoSize = true; + this.flag_0287.CheckAlign = System.Drawing.ContentAlignment.TopLeft; + this.flag_0287.Location = new System.Drawing.Point(6, 49); + this.flag_0287.Name = "flag_0287"; + this.flag_0287.Size = new System.Drawing.Size(103, 17); + this.flag_0287.TabIndex = 23; + this.flag_0287.Text = "Triples Statuette"; + this.flag_0287.UseVisualStyleBackColor = true; + this.flag_0287.Click += new System.EventHandler(this.toggleFlag); + // + // flag_0294 + // + this.flag_0294.AutoSize = true; + this.flag_0294.CheckAlign = System.Drawing.ContentAlignment.TopLeft; + this.flag_0294.Location = new System.Drawing.Point(6, 159); + this.flag_0294.Name = "flag_0294"; + this.flag_0294.Size = new System.Drawing.Size(128, 17); + this.flag_0294.TabIndex = 22; + this.flag_0294.Text = "Super Multi Unlocked"; + this.flag_0294.UseVisualStyleBackColor = true; + this.flag_0294.Click += new System.EventHandler(this.toggleFlag); + // + // flag_0293 + // + this.flag_0293.AutoSize = true; + this.flag_0293.CheckAlign = System.Drawing.ContentAlignment.TopLeft; + this.flag_0293.Location = new System.Drawing.Point(6, 144); + this.flag_0293.Name = "flag_0293"; + this.flag_0293.Size = new System.Drawing.Size(146, 17); + this.flag_0293.TabIndex = 21; + this.flag_0293.Text = "Super Rotation Unlocked"; + this.flag_0293.UseVisualStyleBackColor = true; + this.flag_0293.Click += new System.EventHandler(this.toggleFlag); + // + // flag_0292 + // + this.flag_0292.AutoSize = true; + this.flag_0292.CheckAlign = System.Drawing.ContentAlignment.TopLeft; + this.flag_0292.Location = new System.Drawing.Point(6, 129); + this.flag_0292.Name = "flag_0292"; + this.flag_0292.Size = new System.Drawing.Size(137, 17); + this.flag_0292.TabIndex = 20; + this.flag_0292.Text = "Super Triples Unlocked"; + this.flag_0292.UseVisualStyleBackColor = true; + this.flag_0292.Click += new System.EventHandler(this.toggleFlag); + // + // flag_0291 + // + this.flag_0291.AutoSize = true; + this.flag_0291.CheckAlign = System.Drawing.ContentAlignment.TopLeft; + this.flag_0291.Location = new System.Drawing.Point(6, 114); + this.flag_0291.Name = "flag_0291"; + this.flag_0291.Size = new System.Drawing.Size(145, 17); + this.flag_0291.TabIndex = 19; + this.flag_0291.Text = "Super Doubles Unlocked"; + this.flag_0291.UseVisualStyleBackColor = true; + this.flag_0291.Click += new System.EventHandler(this.toggleFlag); + // + // flag_0290 + // + this.flag_0290.AutoSize = true; + this.flag_0290.CheckAlign = System.Drawing.ContentAlignment.TopLeft; + this.flag_0290.Location = new System.Drawing.Point(6, 99); + this.flag_0290.Name = "flag_0290"; + this.flag_0290.Size = new System.Drawing.Size(140, 17); + this.flag_0290.TabIndex = 18; + this.flag_0290.Text = "Super Singles Unlocked"; + this.flag_0290.UseVisualStyleBackColor = true; + this.flag_0290.Click += new System.EventHandler(this.toggleFlag); + // + // flag_0675 + // + this.flag_0675.AutoSize = true; + this.flag_0675.CheckAlign = System.Drawing.ContentAlignment.TopLeft; + this.flag_0675.Location = new System.Drawing.Point(15, 243); + this.flag_0675.Name = "flag_0675"; + this.flag_0675.Size = new System.Drawing.Size(119, 17); + this.flag_0675.TabIndex = 17; + this.flag_0675.Text = "50: Beat Chatelaine"; + this.flag_0675.UseVisualStyleBackColor = true; + this.flag_0675.Click += new System.EventHandler(this.toggleFlag); + // + // flag_0286 + // + this.flag_0286.AutoSize = true; + this.flag_0286.CheckAlign = System.Drawing.ContentAlignment.TopLeft; + this.flag_0286.Location = new System.Drawing.Point(6, 34); + this.flag_0286.Name = "flag_0286"; + this.flag_0286.Size = new System.Drawing.Size(111, 17); + this.flag_0286.TabIndex = 16; + this.flag_0286.Text = "Doubles Statuette"; + this.flag_0286.UseVisualStyleBackColor = true; + this.flag_0286.Click += new System.EventHandler(this.toggleFlag); + // + // flag_0285 + // + this.flag_0285.AutoSize = true; + this.flag_0285.CheckAlign = System.Drawing.ContentAlignment.TopLeft; + this.flag_0285.Location = new System.Drawing.Point(6, 19); + this.flag_0285.Name = "flag_0285"; + this.flag_0285.Size = new System.Drawing.Size(106, 17); + this.flag_0285.TabIndex = 15; + this.flag_0285.Text = "Singles Statuette"; + this.flag_0285.UseVisualStyleBackColor = true; + this.flag_0285.Click += new System.EventHandler(this.toggleFlag); + // + // flag_2546 + // + this.flag_2546.AutoSize = true; + this.flag_2546.Location = new System.Drawing.Point(13, 112); + this.flag_2546.Name = "flag_2546"; + this.flag_2546.Size = new System.Drawing.Size(114, 17); + this.flag_2546.TabIndex = 18; + this.flag_2546.Text = "Pokédex Obtained"; + this.flag_2546.UseVisualStyleBackColor = true; + this.flag_2546.Click += new System.EventHandler(this.toggleFlag); // // SAV_EventFlags // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(449, 342); + this.Controls.Add(this.flag_2546); this.Controls.Add(this.groupBox3); this.Controls.Add(this.GB_Rebattle); this.Controls.Add(this.groupBox2); @@ -626,5 +639,6 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox flag_0675; private System.Windows.Forms.CheckBox flag_0286; private System.Windows.Forms.CheckBox flag_0285; + private System.Windows.Forms.CheckBox flag_2546; } } \ No newline at end of file diff --git a/SAV/SAV_EventFlags.cs b/SAV/SAV_EventFlags.cs index dcbb80597..380a93c85 100644 --- a/SAV/SAV_EventFlags.cs +++ b/SAV/SAV_EventFlags.cs @@ -60,6 +60,7 @@ private void Setup() flag_0285,flag_0286,flag_0287,flag_0288,flag_0289, // Statuettes flag_0290,flag_0291,flag_0292,flag_0293,flag_0294, // Super Unlocks flag_0675, // Chatelaine 50 + flag_2546, // Pokedex }; int offset = 0x1A0FC + savshift; byte[] data = new Byte[0x180];