Skip to content
Permalink
Browse files

Remove Flower from Floette Eternal's forme name

  • Loading branch information...
Marty-D committed Jan 1, 2016
1 parent 9751793 commit adcde565a858b4a352ad3aca9139347b6b45b615
Showing with 8 additions and 10 deletions.
  1. +3 −3 data/aliases.js
  2. +1 −1 data/formats-data.js
  3. +1 −1 data/learnsets.js
  4. +3 −5 data/pokedex.js
@@ -121,7 +121,7 @@ exports.BattleAliases = {
"deod": "Deoxys-Defense",
"deoxyss": "Deoxys-Speed",
"deos": "Deoxys-Speed",
"eternalfloette": "Floette-Eternal-Flower",
"eternalfloette": "Floette-Eternal",
"giratinao": "Giratina-Origin",
"gourgeists": "Gourgeist-Small",
"gourgeistl": "Gourgeist-Large",
@@ -155,8 +155,8 @@ exports.BattleAliases = {
"wormadamground": "Wormadam-Sandy",
"wormadams": "Wormadam-Trash",
"wormadamsteel": "Wormadam-Trash",
"floettee": "Floette-Eternal-Flower",
"floetteeternal": "Floette-Eternal-Flower",
"floettee": "Floette-Eternal",
"floetteeternalflower": "Floette-Eternal",

// base formes
"nidoranfemale": "Nidoran-F",
@@ -5034,7 +5034,7 @@ exports.BattleFormatsData = {
randomBattleMoves: ["moonblast", "toxic", "wish", "psychic", "aromatherapy", "protect", "calmmind"],
tier: "NFE",
},
floetteeternalflower: {
floetteeternal: {
randomBattleMoves: ["lightofruin", "psychic", "hiddenpowerfire", "hiddenpowerground", "moonblast"],
randomDoubleBattleMoves: ["lightofruin", "dazzlinggleam", "wish", "psychic", "aromatherapy", "protect", "calmmind"],
isUnreleased: true,
wish: ["6L20"],
worryseed: ["6T"],
}},
floetteeternalflower: {learnset: {
floetteeternal: {learnset: {
aromatherapy: ["6L38"],
attract: ["6M"],
calmmind: ["6M"],
@@ -10272,13 +10272,13 @@ exports.BattlePokedex = {
evos: ["florges"],
evoLevel: 19,
eggGroups: ["Fairy"],
otherForms: ["floetteeternalflower"],
otherFormes: ["floetteeternal"],
},
floetteeternalflower: {
num: 670,
species: "Floette-Eternal-Flower",
species: "Floette-Eternal",
baseSpecies: "Floette",
forme: "Eternal-Flower",
forme: "Eternal",
formeLetter: "E",
types: ["Fairy"],
gender: "F",
@@ -10287,8 +10287,6 @@ exports.BattlePokedex = {
heightm: 0.2,
weightkg: 0.9,
color: "White",
prevo: "flabebe",
evoLevel: 19,
eggGroups: ["Undiscovered"],
},
florges: {

3 comments on commit adcde56

@TheImmortal

This comment has been minimized.

Copy link
Collaborator

replied Jan 1, 2016

Basculin?

@Marty-D

This comment has been minimized.

Copy link
Collaborator Author

replied Jan 1, 2016

I didn't touch Basculin because '-Striped' is part of its form name without 'Form': 'Basculin Blue-Striped Form'. The 'Flower' in the Florges line's names is their version of 'Form(e)' in others, like 'Cloak' is in 'Wormadam Sandy Cloak', 'Sea' in 'Gastrodon East Sea', 'Mode' in 'Darmanitan Zen Mode', 'Size' in 'Gourgeist Super Size', etc.
Citation!

@TheImmortal

This comment has been minimized.

Copy link
Collaborator

replied Jan 1, 2016

I see

Please sign in to comment.
You can’t perform that action at this time.