Skip to content

Commit

Permalink
Remove Flower from Floette Eternal's forme name
Browse files Browse the repository at this point in the history
  • Loading branch information
@Marty-D
Marty-D committed Jan 1, 2016
1 parent 9751793 commit adcde56
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 10 deletions.
6 changes: 3 additions & 3 deletions data/aliases.js
View file
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion data/formats-data.js
View file
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion data/learnsets.js
View file
Expand Up @@ -49424,7 +49424,7 @@ exports.BattleLearnsets = {
wish: ["6L20"],
worryseed: ["6T"],
}},
floetteeternalflower: {learnset: {
floetteeternal: {learnset: {
aromatherapy: ["6L38"],
attract: ["6M"],
calmmind: ["6M"],
Expand Down
8 changes: 3 additions & 5 deletions data/pokedex.js
View file
Expand Up @@ -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",
Expand All @@ -10287,8 +10287,6 @@ exports.BattlePokedex = {
heightm: 0.2,
weightkg: 0.9,
color: "White",
prevo: "flabebe",
evoLevel: 19,
eggGroups: ["Undiscovered"],
},
florges: {
Expand Down

3 comments on commit adcde56

@TheImmortal
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Basculin?

@Marty-D
Copy link
Collaborator Author

@Marty-D Marty-D commented on adcde56 Jan 1, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see

Please sign in to comment.