From a86856489b6d51212b2249f474456137a11cfaae Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Wed, 28 Sep 2022 14:14:24 -0300 Subject: [PATCH] Eternal Flower Floette uses the same learnset as the other forms --- .../pokemon/teachable_learnset_pointers.h | 2 +- src/data/pokemon/teachable_learnsets.h | 21 ------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/src/data/pokemon/teachable_learnset_pointers.h b/src/data/pokemon/teachable_learnset_pointers.h index affe74a2c7..09c4e95572 100644 --- a/src/data/pokemon/teachable_learnset_pointers.h +++ b/src/data/pokemon/teachable_learnset_pointers.h @@ -943,7 +943,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_FLOETTE_ORANGE_FLOWER] = sFloetteTeachableLearnset, [SPECIES_FLOETTE_BLUE_FLOWER] = sFloetteTeachableLearnset, [SPECIES_FLOETTE_WHITE_FLOWER] = sFloetteTeachableLearnset, - [SPECIES_FLOETTE_ETERNAL_FLOWER] = sFloetteEternalFlowerTeachableLearnset, + [SPECIES_FLOETTE_ETERNAL_FLOWER] = sFloetteTeachableLearnset, [SPECIES_FLORGES_RED_FLOWER] = sFlorgesTeachableLearnset, [SPECIES_FLORGES_YELLOW_FLOWER] = sFlorgesTeachableLearnset, [SPECIES_FLORGES_ORANGE_FLOWER] = sFlorgesTeachableLearnset, diff --git a/src/data/pokemon/teachable_learnsets.h b/src/data/pokemon/teachable_learnsets.h index 3eebe708b3..a1fab6d71e 100644 --- a/src/data/pokemon/teachable_learnsets.h +++ b/src/data/pokemon/teachable_learnsets.h @@ -33222,27 +33222,6 @@ static const u16 sDecidueyeHisuianTeachableLearnset[] = { #endif #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[] = { MOVE_BRICK_BREAK,