diff --git a/BW_tool/Editors/Entralink.Designer.cs b/BW_tool/Editors/Entralink.Designer.cs index d6df407..475cf73 100644 --- a/BW_tool/Editors/Entralink.Designer.cs +++ b/BW_tool/Editors/Entralink.Designer.cs @@ -87,6 +87,7 @@ namespace BW_tool private System.Windows.Forms.Button spark_but; private System.Windows.Forms.Button wind_but; private System.Windows.Forms.Button pleasant_but; + private System.Windows.Forms.Button pgl_but; /// /// Disposes resources used by the form. @@ -180,6 +181,7 @@ namespace BW_tool this.spark_but = new System.Windows.Forms.Button(); this.wind_but = new System.Windows.Forms.Button(); this.pleasant_but = new System.Windows.Forms.Button(); + this.pgl_but = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.slot)).BeginInit(); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); @@ -2031,14 +2033,14 @@ namespace BW_tool // this.animbox1.FormattingEnabled = true; this.animbox1.Items.AddRange(new object[] { - "Randomly turning around", - "Randomly walking", - "Randomly walking", - "Walking up/down", - "Walking left/right", - "Walking left/right and randomly looking up/down", - "Turning around clockwise", - "Turning around counterclockwise", + "00- Randomly turning around", + "02- Randomly walking", + "04- Randomly walking", + "06- Walking up/down", + "08- Walking left/right", + "10- Walking left/right and randomly looking up/down", + "12- Turning around clockwise", + "14- Turning around counterclockwise", "--- Randomize ---"}); this.animbox1.Location = new System.Drawing.Point(762, 60); this.animbox1.Name = "animbox1"; @@ -2136,7 +2138,7 @@ namespace BW_tool this.groupBox2.Controls.Add(this.pleasant_but); this.groupBox2.Location = new System.Drawing.Point(864, 187); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(141, 256); + this.groupBox2.Size = new System.Drawing.Size(141, 250); this.groupBox2.TabIndex = 207; this.groupBox2.TabStop = false; this.groupBox2.Text = "Dream World"; @@ -2221,11 +2223,22 @@ namespace BW_tool this.pleasant_but.UseVisualStyleBackColor = true; this.pleasant_but.Click += new System.EventHandler(this.Pleasant_butClick); // + // pgl_but + // + this.pgl_but.Location = new System.Drawing.Point(870, 438); + this.pgl_but.Name = "pgl_but"; + this.pgl_but.Size = new System.Drawing.Size(129, 23); + this.pgl_but.TabIndex = 208; + this.pgl_but.Text = "PGL Promotions"; + this.pgl_but.UseVisualStyleBackColor = true; + this.pgl_but.Click += new System.EventHandler(this.Pgl_butClick); + // // Entralink // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1014, 552); + this.Controls.Add(this.pgl_but); this.Controls.Add(this.groupBox2); this.Controls.Add(this.formbox1); this.Controls.Add(this.sprite_warning); diff --git a/BW_tool/Editors/Entralink.cs b/BW_tool/Editors/Entralink.cs index b049013..ebbd989 100644 --- a/BW_tool/Editors/Entralink.cs +++ b/BW_tool/Editors/Entralink.cs @@ -250,9 +250,52 @@ namespace BW_tool { dataGridView1.Rows[i].Cells[0].Value = TEXT.pkmlist[forest.Species]; dataGridView1.Rows[i].Cells[1].Value = TEXT.movelist[forest.Move]; - dataGridView1.Rows[i].Cells[2].Value = forest.Gender; + switch(forest.Gender) + { + case 0: + dataGridView1.Rows[i].Cells[2].Value = "Male"; + break; + case 1: + dataGridView1.Rows[i].Cells[2].Value = "Female"; + break; + case 2: + dataGridView1.Rows[i].Cells[2].Value = "Genderless"; + break; + } dataGridView1.Rows[i].Cells[3].Value = forest.Form; - dataGridView1.Rows[i].Cells[4].Value = forest.Animation; + //dataGridView1.Rows[i].Cells[4].Value = forest.Animation; + switch(forest.Animation) + { + case 0: + dataGridView1.Rows[i].Cells[4].Value = "0"+forest.Animation.ToString()+"- "+"Randomly turning around"; + + break; + case 2: + dataGridView1.Rows[i].Cells[4].Value = "0"+forest.Animation.ToString()+"- "+"Randomly walking"; + break; + case 4: + dataGridView1.Rows[i].Cells[4].Value = "0"+forest.Animation.ToString()+"- "+"Randomly walking"; + break; + case 6: + dataGridView1.Rows[i].Cells[4].Value = "0"+forest.Animation.ToString()+"- "+"Walking up/down"; + break; + case 8: + dataGridView1.Rows[i].Cells[4].Value = "0"+forest.Animation.ToString()+"- "+"Walking left/right"; + break; + case 10: + dataGridView1.Rows[i].Cells[4].Value = forest.Animation.ToString()+"- "+"Walking left/right and randomly looking up/down"; + break; + case 12: + dataGridView1.Rows[i].Cells[4].Value = forest.Animation.ToString()+"- "+"Turning around clockwise"; + break; + case 14: + dataGridView1.Rows[i].Cells[4].Value = forest.Animation.ToString()+"- "+"Turning around counterclockwise"; + break; + default: + dataGridView1.Rows[i].Cells[4].Value = forest.Animation.ToString()+"- "+"Invalid (odd)"; + break; + } + } } @@ -265,10 +308,13 @@ namespace BW_tool } int animation() { + //MessageBox.Show(animbox1.SelectedIndex.ToString()); if (animbox1.SelectedIndex > 7) return Entralink_DreamWorld.random_form_anim(); - else + else{ + //MessageBox.Show((animbox1.SelectedIndex*2).ToString()); return (int)(animbox1.SelectedIndex*2); + } } void Add_pkmClick(object sender, EventArgs e) { @@ -421,6 +467,7 @@ namespace BW_tool { //Only genderless special_gender = true; + genderbox1.Items.Clear(); genderbox1.Items.AddRange(new object[] { "Male", "Female", @@ -434,6 +481,7 @@ namespace BW_tool { //Re-enable list genderbox1.Enabled = true; + genderbox1.Items.Clear(); genderbox1.Items.AddRange(new object[] { "Male", "Female"}); @@ -649,6 +697,12 @@ namespace BW_tool dreamworld.ShowDialog(); add_dw_pkm(); } + void Pgl_butClick(object sender, EventArgs e) + { + Form dreamworld = new Entralink_DreamWorld(8, "PGL Promotions"); + dreamworld.ShowDialog(); + add_dw_pkm(); + } public class FOREST @@ -806,7 +860,7 @@ Bits get { return (int)((BitConverter.ToInt32(Data, get_pkmoffset()) & 0xF800000) >> 23); } set { form = value; } } public int Animation { - get { return (int)((BitConverter.ToInt32(Data, get_pkmoffset()) & 0xF0000000) >> 27); } + get { return (int)((BitConverter.ToInt32(Data, get_pkmoffset()) & 0xF0000000) >> 28); } set { animation = value; } } //Just return if there's a valid pkm in current slot @@ -824,7 +878,7 @@ Bits //Build a u32 pkm for entralink forest public UInt32 create_pkm(int sp, int mv, int gdr, int frm, int anim) { - return (UInt32) ( (sp&0x7FF) | ((mv&0x3FF) << 11) | ((gdr&0x3) << 21) | ((frm&0x1F) << 23) | ((anim&0xF) << 27) ); + return unchecked((UInt32) ( (sp&0x7FF) | ((mv&0x3FF) << 11) | ((gdr&0x3) << 21) | ((frm&0x1F) << 23) | ((anim&0xF) << 28) )); } //Sets pkm data to current slot public void edit_pkm(UInt32 pkm) diff --git a/BW_tool/Editors/Entralink_DreamWorld.Designer.cs b/BW_tool/Editors/Entralink_DreamWorld.Designer.cs index ba4d122..2d8493e 100644 --- a/BW_tool/Editors/Entralink_DreamWorld.Designer.cs +++ b/BW_tool/Editors/Entralink_DreamWorld.Designer.cs @@ -31,6 +31,9 @@ namespace BW_tool private System.Windows.Forms.Label exclusive_label; private System.Windows.Forms.ComboBox moveboxC; private System.Windows.Forms.ComboBox moveboxA; + private System.Windows.Forms.ComboBox pgl_region_box; + private System.Windows.Forms.Label move_lab; + private System.Windows.Forms.Label region_lab; /// /// Disposes resources used by the form. @@ -56,9 +59,12 @@ namespace BW_tool this.speciesbox = new System.Windows.Forms.ComboBox(); this.label1 = new System.Windows.Forms.Label(); this.Move = new System.Windows.Forms.GroupBox(); + this.move_lab = new System.Windows.Forms.Label(); + this.region_lab = new System.Windows.Forms.Label(); + this.pgl_region_box = new System.Windows.Forms.ComboBox(); + this.movebox = new System.Windows.Forms.ComboBox(); this.moveboxC = new System.Windows.Forms.ComboBox(); this.moveboxA = new System.Windows.Forms.ComboBox(); - this.movebox = new System.Windows.Forms.ComboBox(); this.atkC = new System.Windows.Forms.RadioButton(); this.atkB = new System.Windows.Forms.RadioButton(); this.atkA = new System.Windows.Forms.RadioButton(); @@ -94,9 +100,12 @@ namespace BW_tool // // Move // + this.Move.Controls.Add(this.move_lab); + this.Move.Controls.Add(this.region_lab); + this.Move.Controls.Add(this.pgl_region_box); + this.Move.Controls.Add(this.movebox); this.Move.Controls.Add(this.moveboxC); this.Move.Controls.Add(this.moveboxA); - this.Move.Controls.Add(this.movebox); this.Move.Controls.Add(this.atkC); this.Move.Controls.Add(this.atkB); this.Move.Controls.Add(this.atkA); @@ -107,6 +116,645 @@ namespace BW_tool this.Move.TabStop = false; this.Move.Text = "Move"; // + // move_lab + // + this.move_lab.Location = new System.Drawing.Point(7, 45); + this.move_lab.Name = "move_lab"; + this.move_lab.Size = new System.Drawing.Size(42, 23); + this.move_lab.TabIndex = 8; + this.move_lab.Text = "Move"; + // + // region_lab + // + this.region_lab.Location = new System.Drawing.Point(7, 25); + this.region_lab.Name = "region_lab"; + this.region_lab.Size = new System.Drawing.Size(42, 23); + this.region_lab.TabIndex = 7; + this.region_lab.Text = "Region"; + // + // pgl_region_box + // + this.pgl_region_box.DropDownStyle = System.Windows.Forms.ComboBoxStyle.Simple; + this.pgl_region_box.FormattingEnabled = true; + this.pgl_region_box.Items.AddRange(new object[] { + "ALL", + "ALL", + "ALL", + "ALL", + "ALL", + "ALL", + "ALL", + "JAP and KOR", + "JAP and KOR", + "JAP and KOR", + "JAP and KOR", + "JAP and KOR", + "JAP and KOR", + "JAP and KOR", + "JAP, USA, EUR", + "JAP", + "JAP", + "JAP", + "ALL", + "ALL", + "ALL", + "KOR", + "ALL", + "EUR", + "JAP", + "JAP and KOR", + "ALL", + "ALL", + "JAP, USA and EUR", + "KOR", + "JAP", + "JAP", + "JAP", + "USA and EUR", + "USA and EUR", + "USA and EUR", + "JAP", + "USA and EUR", + "USA and EUR", + "JAP and KOR", + "USA and EUR", + "USA and EUR", + "USA and EUR"}); + this.pgl_region_box.Location = new System.Drawing.Point(52, 19); + this.pgl_region_box.Name = "pgl_region_box"; + this.pgl_region_box.Size = new System.Drawing.Size(119, 21); + this.pgl_region_box.TabIndex = 6; + // + // movebox + // + this.movebox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.Simple; + this.movebox.FormattingEnabled = true; + this.movebox.Items.AddRange(new object[] { + "----------------------", + "Pound", + "Karate Chop", + "Double Slap", + "Comet Punch", + "Mega Punch", + "Pay Day", + "Fire Punch", + "Ice Punch", + "Thunder Punch", + "Scratch", + "Vice Grip", + "Guillotine", + "Razor Wind", + "Swords Dance", + "Cut", + "Gust", + "Wing Attack", + "Whirlwind", + "Fly", + "Bind", + "Slam", + "Vine Whip", + "Stomp", + "Double Kick", + "Mega Kick", + "Jump Kick", + "Rolling Kick", + "Sand Attack", + "Headbutt", + "Horn Attack", + "Fury Attack", + "Horn Drill", + "Tackle", + "Body Slam", + "Wrap", + "Take Down", + "Thrash", + "Double-Edge", + "Tail Whip", + "Poison Sting", + "Twineedle", + "Pin Missile", + "Leer", + "Bite", + "Growl", + "Roar", + "Sing", + "Supersonic", + "Sonic Boom", + "Disable", + "Acid", + "Ember", + "Flamethrower", + "Mist", + "Water Gun", + "Hydro Pump", + "Surf", + "Ice Beam", + "Blizzard", + "Psybeam", + "Bubble Beam", + "Aurora Beam", + "Hyper Beam", + "Peck", + "Drill Peck", + "Submission", + "Low Kick", + "Counter", + "Seismic Toss", + "Strength", + "Absorb", + "Mega Drain", + "Leech Seed", + "Growth", + "Razor Leaf", + "Solar Beam", + "Poison Powder", + "Stun Spore", + "Sleep Powder", + "Petal Dance", + "String Shot", + "Dragon Rage", + "Fire Spin", + "Thunder Shock", + "Thunderbolt", + "Thunder Wave", + "Thunder", + "Rock Throw", + "Earthquake", + "Fissure", + "Dig", + "Toxic", + "Confusion", + "Psychic", + "Hypnosis", + "Meditate", + "Agility", + "Quick Attack", + "Rage", + "Teleport", + "Night Shade", + "Mimic", + "Screech", + "Double Team", + "Recover", + "Harden", + "Minimize", + "Smokescreen", + "Confuse Ray", + "Withdraw", + "Defense Curl", + "Barrier", + "Light Screen", + "Haze", + "Reflect", + "Focus Energy", + "Bide", + "Metronome", + "Mirror Move", + "Self-Destruct", + "Egg Bomb", + "Lick", + "Smog", + "Sludge", + "Bone Club", + "Fire Blast", + "Waterfall", + "Clamp", + "Swift", + "Skull Bash", + "Spike Cannon", + "Constrict", + "Amnesia", + "Kinesis", + "Soft-Boiled", + "High Jump Kick", + "Glare", + "Dream Eater", + "Poison Gas", + "Barrage", + "Leech Life", + "Lovely Kiss", + "Sky Attack", + "Transform", + "Bubble", + "Dizzy Punch", + "Spore", + "Flash", + "Psywave", + "Splash", + "Acid Armor", + "Crabhammer", + "Explosion", + "Fury Swipes", + "Bonemerang", + "Rest", + "Rock Slide", + "Hyper Fang", + "Sharpen", + "Conversion", + "Tri Attack", + "Super Fang", + "Slash", + "Substitute", + "Struggle", + "Sketch", + "Triple Kick", + "Thief", + "Spider Web", + "Mind Reader", + "Nightmare", + "Flame Wheel", + "Snore", + "Curse", + "Flail", + "Conversion 2", + "Aeroblast", + "Cotton Spore", + "Reversal", + "Spite", + "Powder Snow", + "Protect", + "Mach Punch", + "Scary Face", + "Feint Attack", + "Sweet Kiss", + "Belly Drum", + "Sludge Bomb", + "Mud-Slap", + "Octazooka", + "Spikes", + "Zap Cannon", + "Foresight", + "Destiny Bond", + "Perish Song", + "Icy Wind", + "Detect", + "Bone Rush", + "Lock-On", + "Outrage", + "Sandstorm", + "Giga Drain", + "Endure", + "Charm", + "Rollout", + "False Swipe", + "Swagger", + "Milk Drink", + "Spark", + "Fury Cutter", + "Steel Wing", + "Mean Look", + "Attract", + "Sleep Talk", + "Heal Bell", + "Return", + "Present", + "Frustration", + "Safeguard", + "Pain Split", + "Sacred Fire", + "Magnitude", + "Dynamic Punch", + "Megahorn", + "Dragon Breath", + "Baton Pass", + "Encore", + "Pursuit", + "Rapid Spin", + "Sweet Scent", + "Iron Tail", + "Metal Claw", + "Vital Throw", + "Morning Sun", + "Synthesis", + "Moonlight", + "Hidden Power", + "Cross Chop", + "Twister", + "Rain Dance", + "Sunny Day", + "Crunch", + "Mirror Coat", + "Psych Up", + "Extreme Speed", + "Ancient Power", + "Shadow Ball", + "Future Sight", + "Rock Smash", + "Whirlpool", + "Beat Up", + "Fake Out", + "Uproar", + "Stockpile", + "Spit Up", + "Swallow", + "Heat Wave", + "Hail", + "Torment", + "Flatter", + "Will-O-Wisp", + "Memento", + "Facade", + "Focus Punch", + "Smelling Salts", + "Follow Me", + "Nature Power", + "Charge", + "Taunt", + "Helping Hand", + "Trick", + "Role Play", + "Wish", + "Assist", + "Ingrain", + "Superpower", + "Magic Coat", + "Recycle", + "Revenge", + "Brick Break", + "Yawn", + "Knock Off", + "Endeavor", + "Eruption", + "Skill Swap", + "Imprison", + "Refresh", + "Grudge", + "Snatch", + "Secret Power", + "Dive", + "Arm Thrust", + "Camouflage", + "Tail Glow", + "Luster Purge", + "Mist Ball", + "Feather Dance", + "Teeter Dance", + "Blaze Kick", + "Mud Sport", + "Ice Ball", + "Needle Arm", + "Slack Off", + "Hyper Voice", + "Poison Fang", + "Crush Claw", + "Blast Burn", + "Hydro Cannon", + "Meteor Mash", + "Astonish", + "Weather Ball", + "Aromatherapy", + "Fake Tears", + "Air Cutter", + "Overheat", + "Odor Sleuth", + "Rock Tomb", + "Silver Wind", + "Metal Sound", + "Grass Whistle", + "Tickle", + "Cosmic Power", + "Water Spout", + "Signal Beam", + "Shadow Punch", + "Extrasensory", + "Sky Uppercut", + "Sand Tomb", + "Sheer Cold", + "Muddy Water", + "Bullet Seed", + "Aerial Ace", + "Icicle Spear", + "Iron Defense", + "Block", + "Howl", + "Dragon Claw", + "Frenzy Plant", + "Bulk Up", + "Bounce", + "Mud Shot", + "Poison Tail", + "Covet", + "Volt Tackle", + "Magical Leaf", + "Water Sport", + "Calm Mind", + "Leaf Blade", + "Dragon Dance", + "Rock Blast", + "Shock Wave", + "Water Pulse", + "Doom Desire", + "Psycho Boost", + "Roost", + "Gravity", + "Miracle Eye", + "Wake-Up Slap", + "Hammer Arm", + "Gyro Ball", + "Healing Wish", + "Brine", + "Natural Gift", + "Feint", + "Pluck", + "Tailwind", + "Acupressure", + "Metal Burst", + "U-turn", + "Close Combat", + "Payback", + "Assurance", + "Embargo", + "Fling", + "Psycho Shift", + "Trump Card", + "Heal Block", + "Wring Out", + "Power Trick", + "Gastro Acid", + "Lucky Chant", + "Me First", + "Copycat", + "Power Swap", + "Guard Swap", + "Punishment", + "Last Resort", + "Worry Seed", + "Sucker Punch", + "Toxic Spikes", + "Heart Swap", + "Aqua Ring", + "Magnet Rise", + "Flare Blitz", + "Force Palm", + "Aura Sphere", + "Rock Polish", + "Poison Jab", + "Dark Pulse", + "Night Slash", + "Aqua Tail", + "Seed Bomb", + "Air Slash", + "X-Scissor", + "Bug Buzz", + "Dragon Pulse", + "Dragon Rush", + "Power Gem", + "Drain Punch", + "Vacuum Wave", + "Focus Blast", + "Energy Ball", + "Brave Bird", + "Earth Power", + "Switcheroo", + "Giga Impact", + "Nasty Plot", + "Bullet Punch", + "Avalanche", + "Ice Shard", + "Shadow Claw", + "Thunder Fang", + "Ice Fang", + "Fire Fang", + "Shadow Sneak", + "Mud Bomb", + "Psycho Cut", + "Zen Headbutt", + "Mirror Shot", + "Flash Cannon", + "Rock Climb", + "Defog", + "Trick Room", + "Draco Meteor", + "Discharge", + "Lava Plume", + "Leaf Storm", + "Power Whip", + "Rock Wrecker", + "Cross Poison", + "Gunk Shot", + "Iron Head", + "Magnet Bomb", + "Stone Edge", + "Captivate", + "Stealth Rock", + "Grass Knot", + "Chatter", + "Judgment", + "Bug Bite", + "Charge Beam", + "Wood Hammer", + "Aqua Jet", + "Attack Order", + "Defend Order", + "Heal Order", + "Head Smash", + "Double Hit", + "Roar of Time", + "Spacial Rend", + "Lunar Dance", + "Crush Grip", + "Magma Storm", + "Dark Void", + "Seed Flare", + "Ominous Wind", + "Shadow Force", + "Hone Claws", + "Wide Guard", + "Guard Split", + "Power Split", + "Wonder Room", + "Psyshock", + "Venoshock", + "Autotomize", + "Rage Powder", + "Telekinesis", + "Magic Room", + "Smack Down", + "Storm Throw", + "Flame Burst", + "Sludge Wave", + "Quiver Dance", + "Heavy Slam", + "Synchronoise", + "Electro Ball", + "Soak", + "Flame Charge", + "Coil", + "Low Sweep", + "Acid Spray", + "Foul Play", + "Simple Beam", + "Entrainment", + "After You", + "Round", + "Echoed Voice", + "Chip Away", + "Clear Smog", + "Stored Power", + "Quick Guard", + "Ally Switch", + "Scald", + "Shell Smash", + "Heal Pulse", + "Hex", + "Sky Drop", + "Shift Gear", + "Circle Throw", + "Incinerate", + "Quash", + "Acrobatics", + "Reflect Type", + "Retaliate", + "Final Gambit", + "Bestow", + "Inferno", + "Water Pledge", + "Fire Pledge", + "Grass Pledge", + "Volt Switch", + "Struggle Bug", + "Bulldoze", + "Frost Breath", + "Dragon Tail", + "Work Up", + "Electroweb", + "Wild Charge", + "Drill Run", + "Dual Chop", + "Heart Stamp", + "Horn Leech", + "Sacred Sword", + "Razor Shell", + "Heat Crash", + "Leaf Tornado", + "Steamroller", + "Cotton Guard", + "Night Daze", + "Psystrike", + "Tail Slap", + "Hurricane", + "Head Charge", + "Gear Grind", + "Searing Shot", + "Techno Blast", + "Relic Song", + "Secret Sword", + "Glaciate", + "Bolt Strike", + "Blue Flare", + "Fiery Dance", + "Freeze Shock", + "Ice Burn", + "Snarl", + "Icicle Crash", + "V-create", + "Fusion Flare", + "Fusion Bolt"}); + this.movebox.Location = new System.Drawing.Point(52, 42); + this.movebox.Name = "movebox"; + this.movebox.Size = new System.Drawing.Size(119, 21); + this.movebox.TabIndex = 3; + // // moveboxC // this.moveboxC.DropDownStyle = System.Windows.Forms.ComboBoxStyle.Simple; @@ -1247,576 +1895,6 @@ namespace BW_tool this.moveboxA.Size = new System.Drawing.Size(119, 21); this.moveboxA.TabIndex = 4; // - // movebox - // - this.movebox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.Simple; - this.movebox.FormattingEnabled = true; - this.movebox.Items.AddRange(new object[] { - "----------------------", - "Pound", - "Karate Chop", - "Double Slap", - "Comet Punch", - "Mega Punch", - "Pay Day", - "Fire Punch", - "Ice Punch", - "Thunder Punch", - "Scratch", - "Vice Grip", - "Guillotine", - "Razor Wind", - "Swords Dance", - "Cut", - "Gust", - "Wing Attack", - "Whirlwind", - "Fly", - "Bind", - "Slam", - "Vine Whip", - "Stomp", - "Double Kick", - "Mega Kick", - "Jump Kick", - "Rolling Kick", - "Sand Attack", - "Headbutt", - "Horn Attack", - "Fury Attack", - "Horn Drill", - "Tackle", - "Body Slam", - "Wrap", - "Take Down", - "Thrash", - "Double-Edge", - "Tail Whip", - "Poison Sting", - "Twineedle", - "Pin Missile", - "Leer", - "Bite", - "Growl", - "Roar", - "Sing", - "Supersonic", - "Sonic Boom", - "Disable", - "Acid", - "Ember", - "Flamethrower", - "Mist", - "Water Gun", - "Hydro Pump", - "Surf", - "Ice Beam", - "Blizzard", - "Psybeam", - "Bubble Beam", - "Aurora Beam", - "Hyper Beam", - "Peck", - "Drill Peck", - "Submission", - "Low Kick", - "Counter", - "Seismic Toss", - "Strength", - "Absorb", - "Mega Drain", - "Leech Seed", - "Growth", - "Razor Leaf", - "Solar Beam", - "Poison Powder", - "Stun Spore", - "Sleep Powder", - "Petal Dance", - "String Shot", - "Dragon Rage", - "Fire Spin", - "Thunder Shock", - "Thunderbolt", - "Thunder Wave", - "Thunder", - "Rock Throw", - "Earthquake", - "Fissure", - "Dig", - "Toxic", - "Confusion", - "Psychic", - "Hypnosis", - "Meditate", - "Agility", - "Quick Attack", - "Rage", - "Teleport", - "Night Shade", - "Mimic", - "Screech", - "Double Team", - "Recover", - "Harden", - "Minimize", - "Smokescreen", - "Confuse Ray", - "Withdraw", - "Defense Curl", - "Barrier", - "Light Screen", - "Haze", - "Reflect", - "Focus Energy", - "Bide", - "Metronome", - "Mirror Move", - "Self-Destruct", - "Egg Bomb", - "Lick", - "Smog", - "Sludge", - "Bone Club", - "Fire Blast", - "Waterfall", - "Clamp", - "Swift", - "Skull Bash", - "Spike Cannon", - "Constrict", - "Amnesia", - "Kinesis", - "Soft-Boiled", - "High Jump Kick", - "Glare", - "Dream Eater", - "Poison Gas", - "Barrage", - "Leech Life", - "Lovely Kiss", - "Sky Attack", - "Transform", - "Bubble", - "Dizzy Punch", - "Spore", - "Flash", - "Psywave", - "Splash", - "Acid Armor", - "Crabhammer", - "Explosion", - "Fury Swipes", - "Bonemerang", - "Rest", - "Rock Slide", - "Hyper Fang", - "Sharpen", - "Conversion", - "Tri Attack", - "Super Fang", - "Slash", - "Substitute", - "Struggle", - "Sketch", - "Triple Kick", - "Thief", - "Spider Web", - "Mind Reader", - "Nightmare", - "Flame Wheel", - "Snore", - "Curse", - "Flail", - "Conversion 2", - "Aeroblast", - "Cotton Spore", - "Reversal", - "Spite", - "Powder Snow", - "Protect", - "Mach Punch", - "Scary Face", - "Feint Attack", - "Sweet Kiss", - "Belly Drum", - "Sludge Bomb", - "Mud-Slap", - "Octazooka", - "Spikes", - "Zap Cannon", - "Foresight", - "Destiny Bond", - "Perish Song", - "Icy Wind", - "Detect", - "Bone Rush", - "Lock-On", - "Outrage", - "Sandstorm", - "Giga Drain", - "Endure", - "Charm", - "Rollout", - "False Swipe", - "Swagger", - "Milk Drink", - "Spark", - "Fury Cutter", - "Steel Wing", - "Mean Look", - "Attract", - "Sleep Talk", - "Heal Bell", - "Return", - "Present", - "Frustration", - "Safeguard", - "Pain Split", - "Sacred Fire", - "Magnitude", - "Dynamic Punch", - "Megahorn", - "Dragon Breath", - "Baton Pass", - "Encore", - "Pursuit", - "Rapid Spin", - "Sweet Scent", - "Iron Tail", - "Metal Claw", - "Vital Throw", - "Morning Sun", - "Synthesis", - "Moonlight", - "Hidden Power", - "Cross Chop", - "Twister", - "Rain Dance", - "Sunny Day", - "Crunch", - "Mirror Coat", - "Psych Up", - "Extreme Speed", - "Ancient Power", - "Shadow Ball", - "Future Sight", - "Rock Smash", - "Whirlpool", - "Beat Up", - "Fake Out", - "Uproar", - "Stockpile", - "Spit Up", - "Swallow", - "Heat Wave", - "Hail", - "Torment", - "Flatter", - "Will-O-Wisp", - "Memento", - "Facade", - "Focus Punch", - "Smelling Salts", - "Follow Me", - "Nature Power", - "Charge", - "Taunt", - "Helping Hand", - "Trick", - "Role Play", - "Wish", - "Assist", - "Ingrain", - "Superpower", - "Magic Coat", - "Recycle", - "Revenge", - "Brick Break", - "Yawn", - "Knock Off", - "Endeavor", - "Eruption", - "Skill Swap", - "Imprison", - "Refresh", - "Grudge", - "Snatch", - "Secret Power", - "Dive", - "Arm Thrust", - "Camouflage", - "Tail Glow", - "Luster Purge", - "Mist Ball", - "Feather Dance", - "Teeter Dance", - "Blaze Kick", - "Mud Sport", - "Ice Ball", - "Needle Arm", - "Slack Off", - "Hyper Voice", - "Poison Fang", - "Crush Claw", - "Blast Burn", - "Hydro Cannon", - "Meteor Mash", - "Astonish", - "Weather Ball", - "Aromatherapy", - "Fake Tears", - "Air Cutter", - "Overheat", - "Odor Sleuth", - "Rock Tomb", - "Silver Wind", - "Metal Sound", - "Grass Whistle", - "Tickle", - "Cosmic Power", - "Water Spout", - "Signal Beam", - "Shadow Punch", - "Extrasensory", - "Sky Uppercut", - "Sand Tomb", - "Sheer Cold", - "Muddy Water", - "Bullet Seed", - "Aerial Ace", - "Icicle Spear", - "Iron Defense", - "Block", - "Howl", - "Dragon Claw", - "Frenzy Plant", - "Bulk Up", - "Bounce", - "Mud Shot", - "Poison Tail", - "Covet", - "Volt Tackle", - "Magical Leaf", - "Water Sport", - "Calm Mind", - "Leaf Blade", - "Dragon Dance", - "Rock Blast", - "Shock Wave", - "Water Pulse", - "Doom Desire", - "Psycho Boost", - "Roost", - "Gravity", - "Miracle Eye", - "Wake-Up Slap", - "Hammer Arm", - "Gyro Ball", - "Healing Wish", - "Brine", - "Natural Gift", - "Feint", - "Pluck", - "Tailwind", - "Acupressure", - "Metal Burst", - "U-turn", - "Close Combat", - "Payback", - "Assurance", - "Embargo", - "Fling", - "Psycho Shift", - "Trump Card", - "Heal Block", - "Wring Out", - "Power Trick", - "Gastro Acid", - "Lucky Chant", - "Me First", - "Copycat", - "Power Swap", - "Guard Swap", - "Punishment", - "Last Resort", - "Worry Seed", - "Sucker Punch", - "Toxic Spikes", - "Heart Swap", - "Aqua Ring", - "Magnet Rise", - "Flare Blitz", - "Force Palm", - "Aura Sphere", - "Rock Polish", - "Poison Jab", - "Dark Pulse", - "Night Slash", - "Aqua Tail", - "Seed Bomb", - "Air Slash", - "X-Scissor", - "Bug Buzz", - "Dragon Pulse", - "Dragon Rush", - "Power Gem", - "Drain Punch", - "Vacuum Wave", - "Focus Blast", - "Energy Ball", - "Brave Bird", - "Earth Power", - "Switcheroo", - "Giga Impact", - "Nasty Plot", - "Bullet Punch", - "Avalanche", - "Ice Shard", - "Shadow Claw", - "Thunder Fang", - "Ice Fang", - "Fire Fang", - "Shadow Sneak", - "Mud Bomb", - "Psycho Cut", - "Zen Headbutt", - "Mirror Shot", - "Flash Cannon", - "Rock Climb", - "Defog", - "Trick Room", - "Draco Meteor", - "Discharge", - "Lava Plume", - "Leaf Storm", - "Power Whip", - "Rock Wrecker", - "Cross Poison", - "Gunk Shot", - "Iron Head", - "Magnet Bomb", - "Stone Edge", - "Captivate", - "Stealth Rock", - "Grass Knot", - "Chatter", - "Judgment", - "Bug Bite", - "Charge Beam", - "Wood Hammer", - "Aqua Jet", - "Attack Order", - "Defend Order", - "Heal Order", - "Head Smash", - "Double Hit", - "Roar of Time", - "Spacial Rend", - "Lunar Dance", - "Crush Grip", - "Magma Storm", - "Dark Void", - "Seed Flare", - "Ominous Wind", - "Shadow Force", - "Hone Claws", - "Wide Guard", - "Guard Split", - "Power Split", - "Wonder Room", - "Psyshock", - "Venoshock", - "Autotomize", - "Rage Powder", - "Telekinesis", - "Magic Room", - "Smack Down", - "Storm Throw", - "Flame Burst", - "Sludge Wave", - "Quiver Dance", - "Heavy Slam", - "Synchronoise", - "Electro Ball", - "Soak", - "Flame Charge", - "Coil", - "Low Sweep", - "Acid Spray", - "Foul Play", - "Simple Beam", - "Entrainment", - "After You", - "Round", - "Echoed Voice", - "Chip Away", - "Clear Smog", - "Stored Power", - "Quick Guard", - "Ally Switch", - "Scald", - "Shell Smash", - "Heal Pulse", - "Hex", - "Sky Drop", - "Shift Gear", - "Circle Throw", - "Incinerate", - "Quash", - "Acrobatics", - "Reflect Type", - "Retaliate", - "Final Gambit", - "Bestow", - "Inferno", - "Water Pledge", - "Fire Pledge", - "Grass Pledge", - "Volt Switch", - "Struggle Bug", - "Bulldoze", - "Frost Breath", - "Dragon Tail", - "Work Up", - "Electroweb", - "Wild Charge", - "Drill Run", - "Dual Chop", - "Heart Stamp", - "Horn Leech", - "Sacred Sword", - "Razor Shell", - "Heat Crash", - "Leaf Tornado", - "Steamroller", - "Cotton Guard", - "Night Daze", - "Psystrike", - "Tail Slap", - "Hurricane", - "Head Charge", - "Gear Grind", - "Searing Shot", - "Techno Blast", - "Relic Song", - "Secret Sword", - "Glaciate", - "Bolt Strike", - "Blue Flare", - "Fiery Dance", - "Freeze Shock", - "Ice Burn", - "Snarl", - "Icicle Crash", - "V-create", - "Fusion Flare", - "Fusion Bolt"}); - this.movebox.Location = new System.Drawing.Point(52, 42); - this.movebox.Name = "movebox"; - this.movebox.Size = new System.Drawing.Size(119, 21); - this.movebox.TabIndex = 3; - // // atkC // this.atkC.Location = new System.Drawing.Point(6, 61); diff --git a/BW_tool/Editors/Entralink_DreamWorld.cs b/BW_tool/Editors/Entralink_DreamWorld.cs index 2f22b2b..ffd8b40 100644 --- a/BW_tool/Editors/Entralink_DreamWorld.cs +++ b/BW_tool/Editors/Entralink_DreamWorld.cs @@ -27,6 +27,34 @@ namespace BW_tool exclusive_label.Text = ""; world = DW; setup_world(); + if (DW < 8) + { + moveboxA.Visible = true; + moveboxC.Visible = true; + atkA.Visible = true; + atkB.Visible = true; + atkC.Visible = true; + + Move.Text = "Move"; + + pgl_region_box.Visible = false; + region_lab.Visible = false; + move_lab.Visible = false; + } + else if (DW == 8) + { + moveboxA.Visible = false; + moveboxC.Visible = false; + atkA.Visible = false; + atkB.Visible = false; + atkC.Visible = false; + + Move.Text = "Info"; + + pgl_region_box.Visible = true; + region_lab.Visible = true; + move_lab.Visible = true; + } // // TODO: Add constructor code after the InitializeComponent() call. @@ -320,17 +348,72 @@ namespace BW_tool "Burmy"}); speciesbox.SelectedIndex = 0; break; + case 8://PGL Promotions + speciesbox.Items.Clear(); + speciesbox.Items.AddRange(new object[] { + "Vaporeon", + "Jolteon", + "Flareon", + "Espeon", + "Umbreon", + "Leafeon", + "Glaceon", + "Bulbasaur", + "Charmander", + "Squirtle", + "Croagunk", + "Turtwig", + "Chimchar", + "Piplup", + "Arceus", + "Treecko", + "Torchic", + "Mudkip", + "Togekiss", + "Mamoswine", + "Porygon", + "Rayquaza", + "Banette", + "Croagunk", + "Altaria", + "Blissey", + "Lucario", + "Gothorita", + "Pikachu", + "Jumpluff", + "Pansage", + "Pansear", + "Panpour", + "Turtwig", + "Chimchar", + "Piplup", + "Gothorita", + "Scizor", + "Garchomp", + "Dragonite", + "Tyranitar", + "Dragonite", + "Metagross"}); + speciesbox.SelectedIndex = 0; + break; } atkA.Checked = true; update_atk(); } void Ok_butClick(object sender, EventArgs e) { - //Handle forms - if (world == 2 && (speciesbox.SelectedIndex == 25 || speciesbox.SelectedIndex == 36 )) //Blue basculin, East Sea shellos - Entralink.dream_pkm = Entralink.forest.create_pkm(world_species[world][speciesbox.SelectedIndex], world_attacks[world][speciesbox.SelectedIndex][atk], gender, 1, random_form_anim()); - else - Entralink.dream_pkm = Entralink.forest.create_pkm(world_species[world][speciesbox.SelectedIndex], world_attacks[world][speciesbox.SelectedIndex][atk], gender, 0, random_form_anim()); + if (world < 8) + { + //Handle forms + if (world == 2 && (speciesbox.SelectedIndex == 25 || speciesbox.SelectedIndex == 36 )) //Blue basculin, East Sea shellos + Entralink.dream_pkm = Entralink.forest.create_pkm(world_species[world][speciesbox.SelectedIndex], world_attacks[world][speciesbox.SelectedIndex][atk], gender, 1, random_form_anim()); + else + Entralink.dream_pkm = Entralink.forest.create_pkm(world_species[world][speciesbox.SelectedIndex], world_attacks[world][speciesbox.SelectedIndex][atk], gender, 0, random_form_anim()); + } + else if (world == 8) + { + Entralink.dream_pkm = Entralink.forest.create_pkm(world_species[world][speciesbox.SelectedIndex], PGL_attacks[speciesbox.SelectedIndex], gender, 0, random_form_anim()); + } this.Close(); } void Cancel_butClick(object sender, EventArgs e) @@ -343,44 +426,71 @@ namespace BW_tool update_atk(); update_gnd(); - int i=0; bool exclusive = false; - if (MainForm.save.B2W2 == true) + if(world < 8) { - for(i=0;i