From 41ed00002fabe4653db8c14a518f238f6f5a47c2 Mon Sep 17 00:00:00 2001 From: Kris Johnson <11083252+KrisXV@users.noreply.github.com> Date: Thu, 22 Oct 2020 21:45:12 -0600 Subject: [PATCH] Fix oversights from adding Crown Tundra DLC (#7559) --- config/formats.ts | 10 ++-- data/formats-data.ts | 22 ++++---- data/mods/gen7/formats-data.ts | 4 ++ data/mods/gen7/moves.ts | 100 --------------------------------- data/moves.ts | 30 +--------- data/pokedex.ts | 6 +- 6 files changed, 26 insertions(+), 146 deletions(-) diff --git a/config/formats.ts b/config/formats.ts index 63cfe140c760..1d5f19bbd6fd 100644 --- a/config/formats.ts +++ b/config/formats.ts @@ -55,7 +55,7 @@ export const Formats: FormatList = [ mod: 'gen8', ruleset: ['Standard', 'Dynamax Clause'], - banlist: ['Uber', 'Arena Trap', 'Moody', 'Shadow Tag', 'Baton Pass'], + banlist: ['Uber', 'Arena Trap', 'Moody', 'Power Construct', 'Shadow Tag', 'Baton Pass'], }, { name: "[Gen 8] OU (Blitz)", @@ -149,9 +149,9 @@ export const Formats: FormatList = [ mod: 'gen8', ruleset: ['Same Type Clause', 'Standard', 'Dynamax Clause'], banlist: [ - 'Eternatus', 'Kyurem-Black', 'Kyurem-White', 'Lunala', 'Magearna', 'Marshadow', 'Melmetal', 'Mewtwo', 'Necrozma-Dawn-Wings', - 'Necrozma-Dusk-Mane', 'Reshiram', 'Solgaleo', 'Urshifu-Rapid-Strike', 'Zacian', 'Zamazenta', 'Zekrom', - 'Damp Rock', 'Smooth Rock', 'Moody', 'Shadow Tag', 'Baton Pass', + 'Dialga', 'Eternatus', 'Giratina', 'Groudon', 'Ho-Oh', 'Kyogre', 'Kyurem-White', 'Lugia', 'Lunala', 'Marshadow', 'Mewtwo', 'Necrozma-Dawn-Wings', + 'Necrozma-Dusk-Mane', 'Palkia', 'Rayquaza', 'Reshiram', 'Solgaleo', 'Xerneas', 'Yveltal', 'Zacian', 'Zamazenta', 'Zekrom', + 'Moody', 'Shadow Tag', 'Baton Pass', ], }, { @@ -267,7 +267,7 @@ export const Formats: FormatList = [ mod: 'gen8', gameType: 'doubles', ruleset: ['Standard Doubles', 'Dynamax Clause'], - banlist: ['DUber', 'Beat Up'], + banlist: ['DUber', 'Power Construct'], }, { name: "[Gen 8] Doubles Ubers", diff --git a/data/formats-data.ts b/data/formats-data.ts index 879a6a0ef341..e0f1cdcce004 100644 --- a/data/formats-data.ts +++ b/data/formats-data.ts @@ -2592,6 +2592,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { }, kyogreprimal: { isNonstandard: "Past", + tier: "Illegal", }, groudon: { randomBattleMoves: ["earthquake", "heatcrash", "heavyslam", "stealthrock", "stoneedge", "swordsdance", "thunderwave"], @@ -2601,6 +2602,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { }, groudonprimal: { isNonstandard: "Past", + tier: "Illegal", }, rayquaza: { randomBattleMoves: ["dragondance", "earthquake", "extremespeed", "outrage", "vcreate"], @@ -2618,7 +2620,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { randomDoubleBattleMoves: ["firepunch", "followme", "ironhead", "lifedew", "protect", "thunderwave"], randomDoubleBattleLevel: 76, tier: "OU", - doublesTier: "DUber", + doublesTier: "DOU", }, deoxys: { isNonstandard: "Past", @@ -3931,7 +3933,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { randomDoubleBattleMoves: ["bugbuzz", "gigadrain", "heatwave", "hurricane", "protect", "quiverdance"], randomDoubleBattleLevel: 80, tier: "OU", - doublesTier: "DUber", + doublesTier: "DOU", }, cobalion: { randomBattleMoves: ["closecombat", "ironhead", "stealthrock", "stoneedge", "swordsdance", "voltswitch"], @@ -4023,7 +4025,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { randomDoubleBattleMoves: ["dragonclaw", "dragondance", "fusionbolt", "iciclespear", "protect", "roost"], randomDoubleBattleLevel: 72, tier: "OU", - doublesTier: "DUber", + doublesTier: "DOU", }, kyuremwhite: { randomBattleMoves: ["dracometeor", "earthpower", "freezedry", "fusionflare", "icebeam"], @@ -4354,8 +4356,8 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { carbink: { randomBattleMoves: ["bodypress", "lightscreen", "moonblast", "reflect", "stealthrock"], randomBattleLevel: 88, - isNonstandard: "Past", - tier: "Illegal", + tier: "OU", + doublesTier: "DOU", }, goomy: { tier: "LC", @@ -5206,7 +5208,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { randomDoubleBattleMoves: ["closecombat", "protect", "rocktomb", "shadowsneak", "spectralthief"], randomDoubleBattleLevel: 72, tier: "Uber", - doublesTier: "DUber", + doublesTier: "DOU", }, poipole: { tier: "NFE", @@ -5248,7 +5250,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { randomDoubleBattleLevel: 76, gmaxUnreleased: true, tier: "OU", - doublesTier: "DUber", + doublesTier: "DOU", }, melmetalgmax: { // isNonstandard: "Gigantamax", @@ -5294,7 +5296,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { }, cinderacegmax: { isNonstandard: "Gigantamax", - tier: "Uber", + tier: "(Uber)", doublesTier: "(DUber)", }, sobble: { @@ -5843,7 +5845,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { randomDoubleBattleMoves: ["closecombat", "ironhead", "protect", "suckerpunch", "wickedblow"], randomDoubleBattleLevel: 76, tier: "OU", - doublesTier: "DUber", + doublesTier: "DOU", }, urshifurapidstrike: { randomBattleMoves: ["bulkup", "drainpunch", "substitute", "surgingstrikes"], @@ -5858,7 +5860,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { randomBattleLevel: 80, isNonstandard: "Gigantamax", tier: "(Uber)", - doublesTier: "DUber", + doublesTier: "(DUber)", }, urshifurapidstrikegmax: { randomBattleMoves: ["bulkup", "closecombat", "surgingstrikes", "thunderpunch", "uturn"], diff --git a/data/mods/gen7/formats-data.ts b/data/mods/gen7/formats-data.ts index eca1a2b70497..bd35f4bf1aef 100644 --- a/data/mods/gen7/formats-data.ts +++ b/data/mods/gen7/formats-data.ts @@ -2267,6 +2267,8 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = { kyogreprimal: { randomBattleMoves: ["calmmind", "originpulse", "scald", "thunder", "icebeam", "toxic", "rest", "sleeptalk"], randomDoubleBattleMoves: ["originpulse", "thunder", "icebeam", "calmmind", "protect"], + tier: "Uber", + doublesTier: "DUber", }, groudon: { randomBattleMoves: ["dragonclaw", "earthquake", "firepunch", "lavaplume", "roar", "stealthrock", "stoneedge", "thunderwave"], @@ -2277,6 +2279,8 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = { groudonprimal: { randomBattleMoves: ["firepunch", "lavaplume", "precipiceblades", "rockpolish", "stealthrock", "stoneedge", "swordsdance", "toxic"], randomDoubleBattleMoves: ["precipiceblades", "rockslide", "stoneedge", "swordsdance", "rockpolish", "firepunch", "protect"], + tier: "Uber", + doublesTier: "DUber", }, rayquaza: { randomBattleMoves: ["dracometeor", "dragondance", "earthquake", "extremespeed", "outrage", "vcreate"], diff --git a/data/mods/gen7/moves.ts b/data/mods/gen7/moves.ts index 456b2da3092d..cc1140c6ba6c 100644 --- a/data/mods/gen7/moves.ts +++ b/data/mods/gen7/moves.ts @@ -11,10 +11,6 @@ export const Moves: {[k: string]: ModdedMoveData} = { inherit: true, isNonstandard: null, }, - aeroblast: { - inherit: true, - isNonstandard: null, - }, assist: { inherit: true, isNonstandard: null, @@ -114,18 +110,10 @@ export const Moves: {[k: string]: ModdedMoveData} = { inherit: true, isNonstandard: null, }, - coreenforcer: { - inherit: true, - isNonstandard: null, - }, corkscrewcrash: { inherit: true, isNonstandard: null, }, - crushgrip: { - inherit: true, - isNonstandard: null, - }, curse: { inherit: true, target: "normal", @@ -163,10 +151,6 @@ export const Moves: {[k: string]: ModdedMoveData} = { inherit: true, isNonstandard: null, }, - diamondstorm: { - inherit: true, - isNonstandard: null, - }, dizzypunch: { inherit: true, isNonstandard: null, @@ -179,10 +163,6 @@ export const Moves: {[k: string]: ModdedMoveData} = { inherit: true, isNonstandard: null, }, - dragonascent: { - inherit: true, - isNonstandard: null, - }, dragonrage: { inherit: true, isNonstandard: null, @@ -274,10 +254,6 @@ export const Moves: {[k: string]: ModdedMoveData} = { inherit: true, isNonstandard: null, }, - geomancy: { - inherit: true, - isNonstandard: null, - }, gigavolthavoc: { inherit: true, isNonstandard: null, @@ -549,10 +525,6 @@ export const Moves: {[k: string]: ModdedMoveData} = { }, }, }, - landswrath: { - inherit: true, - isNonstandard: null, - }, letssnuggleforever: { inherit: true, isNonstandard: null, @@ -565,10 +537,6 @@ export const Moves: {[k: string]: ModdedMoveData} = { inherit: true, isNonstandard: null, }, - lovelykiss: { - inherit: true, - isNonstandard: null, - }, lowkick: { inherit: true, onTryHit() {}, @@ -577,18 +545,6 @@ export const Moves: {[k: string]: ModdedMoveData} = { inherit: true, isNonstandard: null, }, - lunardance: { - inherit: true, - isNonstandard: null, - }, - lusterpurge: { - inherit: true, - isNonstandard: null, - }, - magmastorm: { - inherit: true, - isNonstandard: null, - }, magnetbomb: { inherit: true, isNonstandard: null, @@ -619,10 +575,6 @@ export const Moves: {[k: string]: ModdedMoveData} = { "After You", "Assist", "Baneful Bunker", "Beak Blast", "Belch", "Bestow", "Celebrate", "Chatter", "Copycat", "Counter", "Covet", "Crafty Shield", "Destiny Bond", "Detect", "Diamond Storm", "Dragon Ascent", "Endure", "Feint", "Fleur Cannon", "Focus Punch", "Follow Me", "Freeze Shock", "Helping Hand", "Hold Hands", "Hyperspace Fury", "Hyperspace Hole", "Ice Burn", "Instruct", "King's Shield", "Light of Ruin", "Mat Block", "Me First", "Metronome", "Mimic", "Mind Blown", "Mirror Coat", "Mirror Move", "Nature Power", "Origin Pulse", "Photon Geyser", "Plasma Fists", "Precipice Blades", "Protect", "Quash", "Quick Guard", "Rage Powder", "Relic Song", "Secret Sword", "Shell Trap", "Sketch", "Sleep Talk", "Snarl", "Snatch", "Snore", "Spectral Thief", "Spiky Shield", "Spotlight", "Steam Eruption", "Struggle", "Switcheroo", "Techno Blast", "Thief", "Thousand Arrows", "Thousand Waves", "Transform", "Trick", "V-create", "Wide Guard", ], }, - mindblown: { - inherit: true, - isNonstandard: null, - }, miracleeye: { inherit: true, isNonstandard: null, @@ -635,10 +587,6 @@ export const Moves: {[k: string]: ModdedMoveData} = { inherit: true, isNonstandard: null, }, - mistball: { - inherit: true, - isNonstandard: null, - }, mudbomb: { inherit: true, isNonstandard: null, @@ -655,10 +603,6 @@ export const Moves: {[k: string]: ModdedMoveData} = { inherit: true, isNonstandard: null, }, - naturesmadness: { - inherit: true, - isNonstandard: null, - }, needlearm: { inherit: true, isNonstandard: null, @@ -671,10 +615,6 @@ export const Moves: {[k: string]: ModdedMoveData} = { inherit: true, isNonstandard: null, }, - oblivionwing: { - inherit: true, - isNonstandard: null, - }, oceanicoperetta: { inherit: true, isNonstandard: null, @@ -687,10 +627,6 @@ export const Moves: {[k: string]: ModdedMoveData} = { inherit: true, isNonstandard: null, }, - originpulse: { - inherit: true, - isNonstandard: null, - }, powder: { inherit: true, isNonstandard: null, @@ -805,10 +741,6 @@ export const Moves: {[k: string]: ModdedMoveData} = { inherit: true, isNonstandard: null, }, - roaroftime: { - inherit: true, - isNonstandard: null, - }, rockclimb: { inherit: true, isNonstandard: null, @@ -821,10 +753,6 @@ export const Moves: {[k: string]: ModdedMoveData} = { inherit: true, isNonstandard: null, }, - sacredfire: { - inherit: true, - isNonstandard: null, - }, sappyseed: { inherit: true, accuracy: 100, @@ -835,10 +763,6 @@ export const Moves: {[k: string]: ModdedMoveData} = { inherit: true, isNonstandard: null, }, - searingshot: { - inherit: true, - isNonstandard: null, - }, searingsunrazesmash: { inherit: true, isNonstandard: null, @@ -851,10 +775,6 @@ export const Moves: {[k: string]: ModdedMoveData} = { inherit: true, isNonstandard: null, }, - shadowforce: { - inherit: true, - isNonstandard: null, - }, sharpen: { inherit: true, isNonstandard: null, @@ -908,10 +828,6 @@ export const Moves: {[k: string]: ModdedMoveData} = { inherit: true, isNonstandard: null, }, - spacialrend: { - inherit: true, - isNonstandard: null, - }, sparklyswirl: { inherit: true, accuracy: 100, @@ -934,10 +850,6 @@ export const Moves: {[k: string]: ModdedMoveData} = { inherit: true, isNonstandard: null, }, - steameruption: { - inherit: true, - isNonstandard: null, - }, steamroller: { inherit: true, isNonstandard: null, @@ -962,10 +874,6 @@ export const Moves: {[k: string]: ModdedMoveData} = { inherit: true, isNonstandard: null, }, - technoblast: { - inherit: true, - isNonstandard: null, - }, tectonicrage: { inherit: true, isNonstandard: null, @@ -980,14 +888,6 @@ export const Moves: {[k: string]: ModdedMoveData} = { selfSwitch: false, onTryHit: false, }, - thousandarrows: { - inherit: true, - isNonstandard: null, - }, - thousandwaves: { - inherit: true, - isNonstandard: null, - }, toxicthread: { inherit: true, isNonstandard: null, diff --git a/data/moves.ts b/data/moves.ts index 77645aa7bc4b..1fb3f46ed558 100644 --- a/data/moves.ts +++ b/data/moves.ts @@ -217,7 +217,6 @@ export const Moves: {[moveid: string]: MoveData} = { accuracy: 95, basePower: 100, category: "Special", - isNonstandard: "Past", name: "Aeroblast", pp: 5, priority: 0, @@ -618,7 +617,7 @@ export const Moves: {[moveid: string]: MoveData} = { num: 825, accuracy: 100, basePower: 120, - category: "Physical", + category: "Special", name: "Astral Barrage", pp: 5, priority: 0, @@ -2499,7 +2498,6 @@ export const Moves: {[moveid: string]: MoveData} = { accuracy: 100, basePower: 100, category: "Special", - isNonstandard: "Past", name: "Core Enforcer", pp: 10, priority: 0, @@ -2869,7 +2867,6 @@ export const Moves: {[moveid: string]: MoveData} = { return Math.floor(Math.floor((120 * (100 * Math.floor(target.hp * 4096 / target.maxhp)) + 2048 - 1) / 4096) / 100) || 1; }, category: "Physical", - isNonstandard: "Past", name: "Crush Grip", pp: 5, priority: 0, @@ -3196,7 +3193,6 @@ export const Moves: {[moveid: string]: MoveData} = { accuracy: 95, basePower: 100, category: "Physical", - isNonstandard: "Past", name: "Diamond Storm", pp: 5, priority: 0, @@ -3586,7 +3582,6 @@ export const Moves: {[moveid: string]: MoveData} = { accuracy: 100, basePower: 120, category: "Physical", - isNonstandard: "Past", name: "Dragon Ascent", pp: 5, priority: 0, @@ -5999,7 +5994,6 @@ export const Moves: {[moveid: string]: MoveData} = { accuracy: true, basePower: 0, category: "Status", - isNonstandard: "Past", name: "Geomancy", pp: 10, priority: 0, @@ -9312,7 +9306,6 @@ export const Moves: {[moveid: string]: MoveData} = { accuracy: 100, basePower: 90, category: "Physical", - isNonstandard: "Past", name: "Land's Wrath", pp: 10, priority: 0, @@ -9739,7 +9732,6 @@ export const Moves: {[moveid: string]: MoveData} = { accuracy: 75, basePower: 0, category: "Status", - isNonstandard: "Past", name: "Lovely Kiss", pp: 10, priority: 0, @@ -9845,7 +9837,6 @@ export const Moves: {[moveid: string]: MoveData} = { accuracy: true, basePower: 0, category: "Status", - isNonstandard: "Past", name: "Lunar Dance", pp: 10, priority: 0, @@ -9920,7 +9911,6 @@ export const Moves: {[moveid: string]: MoveData} = { accuracy: 100, basePower: 70, category: "Special", - isNonstandard: "Past", name: "Luster Purge", pp: 5, priority: 0, @@ -10068,7 +10058,6 @@ export const Moves: {[moveid: string]: MoveData} = { accuracy: 75, basePower: 100, category: "Special", - isNonstandard: "Past", name: "Magma Storm", pp: 5, priority: 0, @@ -11020,7 +11009,7 @@ export const Moves: {[moveid: string]: MoveData} = { priority: 0, flags: {}, noMetronome: [ - "After You", "Apple Acid", "Assist", "Aura Wheel", "Baneful Bunker", "Beak Blast", "Behemoth Bash", "Behemoth Blade", "Belch", "Bestow", "Body Press", "Branch Poke", "Breaking Swipe", "Celebrate", "Chatter", "Clangorous Soul", "Copycat", "Counter", "Covet", "Crafty Shield", "Decorate", "Destiny Bond", "Detect", "Diamond Storm", "Double Iron Bash", "Dragon Ascent", "Drum Beating", "Dynamax Cannon", "Endure", "Eternabeam", "False Surrender", "Feint", "Fleur Cannon", "Focus Punch", "Follow Me", "Freeze Shock", "Grav Apple", "Helping Hand", "Hold Hands", "Hyperspace Fury", "Hyperspace Hole", "Ice Burn", "Instruct", "Jungle Healing", "King's Shield", "Life Dew", "Light of Ruin", "Mat Block", "Me First", "Meteor Assault", "Metronome", "Mimic", "Mind Blown", "Mirror Coat", "Mirror Move", "Moongeist Beam", "Nature Power", "Nature's Madness", "Obstruct", "Origin Pulse", "Overdrive", "Photon Geyser", "Plasma Fists", "Precipice Blades", "Protect", "Pyro Ball", "Quash", "Quick Guard", "Rage Powder", "Relic Song", "Secret Sword", "Shell Trap", "Sketch", "Sleep Talk", "Snap Trap", "Snarl", "Snatch", "Snore", "Spectral Thief", "Spiky Shield", "Spirit Break", "Spotlight", "Steam Eruption", "Steel Beam", "Strange Steam", "Struggle", "Sunsteel Strike", "Surging Strikes", "Switcheroo", "Techno Blast", "Thief", "Thousand Arrows", "Thousand Waves", "Transform", "Trick", "V-create", "Wicked Blow", "Wide Guard", + "After You", "Apple Acid", "Assist", "Astral Barrage", "Aura Wheel", "Baneful Bunker", "Beak Blast", "Behemoth Bash", "Behemoth Blade", "Belch", "Bestow", "Body Press", "Branch Poke", "Breaking Swipe", "Celebrate", "Chatter", "Clangorous Soul", "Copycat", "Counter", "Covet", "Crafty Shield", "Decorate", "Destiny Bond", "Detect", "Diamond Storm", "Double Iron Bash", "Dragon Ascent", "Dragon Energy", "Drum Beating", "Dynamax Cannon", "Endure", "Eternabeam", "False Surrender", "Feint", "Fiery Wrath", "Fleur Cannon", "Focus Punch", "Follow Me", "Freeze Shock", "Freezing Glare", "Glacial Lance", "Grav Apple", "Helping Hand", "Hold Hands", "Hyperspace Fury", "Hyperspace Hole", "Ice Burn", "Instruct", "Jungle Healing", "King's Shield", "Life Dew", "Light of Ruin", "Mat Block", "Me First", "Meteor Assault", "Metronome", "Mimic", "Mind Blown", "Mirror Coat", "Mirror Move", "Moongeist Beam", "Nature Power", "Nature's Madness", "Obstruct", "Origin Pulse", "Overdrive", "Photon Geyser", "Plasma Fists", "Precipice Blades", "Protect", "Pyro Ball", "Quash", "Quick Guard", "Rage Powder", "Relic Song", "Secret Sword", "Shell Trap", "Sketch", "Sleep Talk", "Snap Trap", "Snarl", "Snatch", "Snore", "Spectral Thief", "Spiky Shield", "Spirit Break", "Spotlight", "Steam Eruption", "Steel Beam", "Strange Steam", "Struggle", "Sunsteel Strike", "Surging Strikes", "Switcheroo", "Techno Blast", "Thief", "Thousand Arrows", "Thousand Waves", "Thunder Cage", "Thunderous Kick", "Transform", "Trick", "V-create", "Wicked Blow", "Wide Guard", ], onHit(target, source, effect) { const moves: MoveData[] = []; @@ -11105,7 +11094,6 @@ export const Moves: {[moveid: string]: MoveData} = { accuracy: 100, basePower: 150, category: "Special", - isNonstandard: "Past", name: "Mind Blown", pp: 5, priority: 0, @@ -11352,7 +11340,6 @@ export const Moves: {[moveid: string]: MoveData} = { accuracy: 100, basePower: 70, category: "Special", - isNonstandard: "Past", name: "Mist Ball", pp: 5, priority: 0, @@ -11778,7 +11765,6 @@ export const Moves: {[moveid: string]: MoveData} = { return this.clampIntRange(Math.floor(target.getUndynamaxedHP() / 2), 1); }, category: "Special", - isNonstandard: "Past", name: "Nature's Madness", pp: 10, priority: 0, @@ -11977,7 +11963,6 @@ export const Moves: {[moveid: string]: MoveData} = { accuracy: 100, basePower: 80, category: "Special", - isNonstandard: "Past", name: "Oblivion Wing", pp: 10, priority: 0, @@ -12164,7 +12149,6 @@ export const Moves: {[moveid: string]: MoveData} = { accuracy: 85, basePower: 110, category: "Special", - isNonstandard: "Past", name: "Origin Pulse", pp: 10, priority: 0, @@ -12981,7 +12965,6 @@ export const Moves: {[moveid: string]: MoveData} = { accuracy: 85, basePower: 120, category: "Physical", - isNonstandard: "Past", name: "Precipice Blades", pp: 10, priority: 0, @@ -14126,7 +14109,6 @@ export const Moves: {[moveid: string]: MoveData} = { accuracy: 90, basePower: 150, category: "Special", - isNonstandard: "Past", name: "Roar of Time", pp: 5, priority: 0, @@ -14477,7 +14459,6 @@ export const Moves: {[moveid: string]: MoveData} = { accuracy: 95, basePower: 100, category: "Physical", - isNonstandard: "Past", name: "Sacred Fire", pp: 5, priority: 0, @@ -14756,7 +14737,6 @@ export const Moves: {[moveid: string]: MoveData} = { accuracy: 100, basePower: 100, category: "Special", - isNonstandard: "Past", name: "Searing Shot", pp: 5, priority: 0, @@ -14971,7 +14951,6 @@ export const Moves: {[moveid: string]: MoveData} = { accuracy: 100, basePower: 120, category: "Physical", - isNonstandard: "Past", name: "Shadow Force", pp: 5, priority: 0, @@ -16172,7 +16151,6 @@ export const Moves: {[moveid: string]: MoveData} = { accuracy: 95, basePower: 100, category: "Special", - isNonstandard: "Past", name: "Spacial Rend", pp: 5, priority: 0, @@ -16633,7 +16611,6 @@ export const Moves: {[moveid: string]: MoveData} = { accuracy: 95, basePower: 110, category: "Special", - isNonstandard: "Past", name: "Steam Eruption", pp: 5, priority: 0, @@ -17770,7 +17747,6 @@ export const Moves: {[moveid: string]: MoveData} = { accuracy: 100, basePower: 120, category: "Special", - isNonstandard: "Past", name: "Techno Blast", pp: 5, priority: 0, @@ -17951,7 +17927,6 @@ export const Moves: {[moveid: string]: MoveData} = { accuracy: 100, basePower: 90, category: "Physical", - isNonstandard: "Past", name: "Thousand Arrows", pp: 10, priority: 0, @@ -17977,7 +17952,6 @@ export const Moves: {[moveid: string]: MoveData} = { accuracy: 100, basePower: 90, category: "Physical", - isNonstandard: "Past", name: "Thousand Waves", pp: 10, priority: 0, diff --git a/data/pokedex.ts b/data/pokedex.ts index 39ce9cf3055c..c73f7fcbb9b1 100644 --- a/data/pokedex.ts +++ b/data/pokedex.ts @@ -15794,7 +15794,7 @@ export const Pokedex: {[speciesid: string]: SpeciesData} = { regieleki: { num: 894, name: "Regieleki", - types: ["Electic"], + types: ["Electric"], gender: "N", baseStats: {hp: 80, atk: 100, def: 50, spa: 100, spd: 50, spe: 200}, abilities: {0: "Transistor"}, @@ -15848,7 +15848,7 @@ export const Pokedex: {[speciesid: string]: SpeciesData} = { abilities: {0: "Unnerve"}, heightm: 1.1, weightkg: 7.7, - color: "Green", + color: "White", eggGroups: ["Undiscovered"], otherFormes: ["Calyrex-Ice", "Calyrex-Shadow"], formeOrder: ["Calyrex", "Calyrex-Ice", "Calyrex-Shadow"], @@ -15872,7 +15872,7 @@ export const Pokedex: {[speciesid: string]: SpeciesData} = { num: 898, name: "Calyrex-Shadow", baseSpecies: "Calyrex", - forme: "Ice", + forme: "Shadow", types: ["Psychic", "Ghost"], gender: "N", baseStats: {hp: 100, atk: 85, def: 80, spa: 165, spd: 100, spe: 150},