atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Eternal Flower Floette uses the same learnset as the other forms

Browse source
This commit is contained in:
Eduardo Quezada 2022-09-28 14:14:24 -03:00
parent aa49ed3d18
commit a86856489b
2 changed files with 1 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/data/pokemon/teachable_learnset_pointers.h
View file

@ -943,7 +943,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] =
[SPECIES_FLOETTE_ORANGE_FLOWER] = sFloetteTeachableLearnset, [SPECIES_FLOETTE_ORANGE_FLOWER] = sFloetteTeachableLearnset,
[SPECIES_FLOETTE_BLUE_FLOWER] = sFloetteTeachableLearnset, [SPECIES_FLOETTE_BLUE_FLOWER] = sFloetteTeachableLearnset,
[SPECIES_FLOETTE_WHITE_FLOWER] = sFloetteTeachableLearnset, [SPECIES_FLOETTE_WHITE_FLOWER] = sFloetteTeachableLearnset,
[SPECIES_FLOETTE_ETERNAL_FLOWER] = sFloetteEternalFlowerTeachableLearnset, [SPECIES_FLOETTE_ETERNAL_FLOWER] = sFloetteTeachableLearnset,
[SPECIES_FLORGES_RED_FLOWER] = sFlorgesTeachableLearnset, [SPECIES_FLORGES_RED_FLOWER] = sFlorgesTeachableLearnset,
[SPECIES_FLORGES_YELLOW_FLOWER] = sFlorgesTeachableLearnset, [SPECIES_FLORGES_YELLOW_FLOWER] = sFlorgesTeachableLearnset,
[SPECIES_FLORGES_ORANGE_FLOWER] = sFlorgesTeachableLearnset, [SPECIES_FLORGES_ORANGE_FLOWER] = sFlorgesTeachableLearnset,

21
src/data/pokemon/teachable_learnsets.h
View file

@ -33222,27 +33222,6 @@ static const u16 sDecidueyeHisuianTeachableLearnset[] = {
#endif #endif
#if P_GEN_6_POKEMON == TRUE #if P_GEN_6_POKEMON == TRUE
static const u16 sFloetteEternalFlowerTeachableLearnset[] = {
MOVE_ATTRACT,
MOVE_CALM_MIND,
MOVE_DOUBLE_TEAM,
MOVE_FACADE,
MOVE_FLASH,
MOVE_FRUSTRATION,
MOVE_GIGA_DRAIN,
MOVE_HIDDEN_POWER,
MOVE_PROTECT,
MOVE_PSYCHIC,
MOVE_RAIN_DANCE,
MOVE_REST,
MOVE_RETURN,
MOVE_SAFEGUARD,
MOVE_SECRET_POWER,
MOVE_SOLAR_BEAM,
MOVE_SUNNY_DAY,
MOVE_TOXIC,
MOVE_UNAVAILABLE,
};
static const u16 sHoopaUnboundTeachableLearnset[] = { static const u16 sHoopaUnboundTeachableLearnset[] = {
MOVE_BRICK_BREAK, MOVE_BRICK_BREAK,