From f3342de00bae76116d557a214dbe630b78469d1d Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Fri, 19 Jan 2024 17:01:14 +0100 Subject: [PATCH] Condense Oinkologne teachable learnsets (#4026) * Condense Oinkologne teachable learnsets * Fix redundant backslash --- src/data/pokemon/species_info/gen_9.h | 6 ++-- src/data/pokemon/teachable_learnsets.h | 38 +------------------------- 2 files changed, 4 insertions(+), 40 deletions(-) diff --git a/src/data/pokemon/species_info/gen_9.h b/src/data/pokemon/species_info/gen_9.h index e7846ec90a..7a45fc66e4 100644 --- a/src/data/pokemon/species_info/gen_9.h +++ b/src/data/pokemon/species_info/gen_9.h @@ -507,6 +507,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, \ .trainerScale = 256, \ .trainerOffset = 0, \ + .teachableLearnset = sOinkologneTeachableLearnset, \ .formSpeciesIdTable = sOinkologneFormSpeciesIdTable [SPECIES_OINKOLOGNE_MALE] = @@ -535,8 +536,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = PALETTES(OinkologneMale), ICON(OinkologneMale, 1), //.footprint = gMonFootprint_Oinkologne, - LEARNSETS(OinkologneMale), - + .levelUpLearnset = sOinkologneMaleLevelUpLearnset, }, [SPECIES_OINKOLOGNE_FEMALE] = @@ -566,7 +566,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = PALETTES(OinkologneFemale), ICON(OinkologneFemale, 2), //.footprint = gMonFootprint_Oinkologne, - LEARNSETS(OinkologneFemale), + .levelUpLearnset = sOinkologneFemaleLevelUpLearnset, }, #endif //P_FAMILY_LECHONK diff --git a/src/data/pokemon/teachable_learnsets.h b/src/data/pokemon/teachable_learnsets.h index f274363f61..4d51cf8280 100644 --- a/src/data/pokemon/teachable_learnsets.h +++ b/src/data/pokemon/teachable_learnsets.h @@ -35492,43 +35492,7 @@ static const u16 sLechonkTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sOinkologneMaleTeachableLearnset[] = { - MOVE_BODY_PRESS, - MOVE_BODY_SLAM, - MOVE_BULLDOZE, - MOVE_BULLET_SEED, - MOVE_CHILLING_WATER, - MOVE_DIG, - MOVE_DISARMING_VOICE, - MOVE_EARTH_POWER, - MOVE_ENDURE, - MOVE_ENERGY_BALL, - MOVE_FACADE, - MOVE_GIGA_IMPACT, - MOVE_HELPING_HAND, - MOVE_HYPER_BEAM, - MOVE_HYPER_VOICE, - MOVE_IRON_HEAD, - MOVE_MUD_SHOT, - MOVE_MUD_SLAP, - MOVE_PLAY_ROUGH, - MOVE_PROTECT, - MOVE_RAIN_DANCE, - MOVE_REST, - MOVE_SEED_BOMB, - MOVE_SLEEP_TALK, - MOVE_STOMPING_TANTRUM, - MOVE_SUBSTITUTE, - MOVE_SUNNY_DAY, - MOVE_TAKE_DOWN, - MOVE_TERA_BLAST, - MOVE_THIEF, - MOVE_TRAILBLAZE, - MOVE_ZEN_HEADBUTT, - MOVE_UNAVAILABLE, -}; - -static const u16 sOinkologneFemaleTeachableLearnset[] = { +static const u16 sOinkologneTeachableLearnset[] = { MOVE_BODY_PRESS, MOVE_BODY_SLAM, MOVE_BULLDOZE,