Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Condense Oinkologne teachable learnsets #4026

Merged
merged 2 commits into from
Jan 19, 2024
Merged

Condense Oinkologne teachable learnsets #4026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b19c9a2
Condense Oinkologne teachable learnsets
Bassoonian Jan 19, 2024
5ecf611
Fix redundant backslash
Bassoonian Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/data/pokemon/species_info/gen_9.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.pokemonOffset = 17, \
.trainerScale = 256, \
.trainerOffset = 0, \
.teachableLearnset = sOinkologneTeachableLearnset, \
.formSpeciesIdTable = sOinkologneFormSpeciesIdTable

[SPECIES_OINKOLOGNE_MALE] =
Expand Down Expand Up @@ -535,8 +536,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
PALETTES(OinkologneMale),
ICON(OinkologneMale, 1),
//.footprint = gMonFootprint_Oinkologne,
LEARNSETS(OinkologneMale),

.levelUpLearnset = sOinkologneMaleLevelUpLearnset,
},

[SPECIES_OINKOLOGNE_FEMALE] =
Expand Down Expand Up @@ -566,7 +566,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
PALETTES(OinkologneFemale),
ICON(OinkologneFemale, 2),
//.footprint = gMonFootprint_Oinkologne,
LEARNSETS(OinkologneFemale),
.levelUpLearnset = sOinkologneFemaleLevelUpLearnset,
},
#endif //P_FAMILY_LECHONK

Expand Down
38 changes: 1 addition & 37 deletions src/data/pokemon/teachable_learnsets.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading