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

Condense Oinkologne teachable learnsets (#4026)

Browse source 
* Condense Oinkologne teachable learnsets

* Fix redundant backslash
This commit is contained in:
Bassoonian 2024-01-19 17:01:14 +01:00 committed by GitHub
parent fd5d5cd055
commit f3342de00b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/data/pokemon/species_info/gen_9.h
View file

@ -507,6 +507,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.pokemonOffset = 17, \ .pokemonOffset = 17, \
.trainerScale = 256, \ .trainerScale = 256, \
.trainerOffset = 0, \ .trainerOffset = 0, \
.teachableLearnset = sOinkologneTeachableLearnset, \
.formSpeciesIdTable = sOinkologneFormSpeciesIdTable .formSpeciesIdTable = sOinkologneFormSpeciesIdTable
[SPECIES_OINKOLOGNE_MALE] = [SPECIES_OINKOLOGNE_MALE] =
@ -535,8 +536,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
PALETTES(OinkologneMale), PALETTES(OinkologneMale),
ICON(OinkologneMale, 1), ICON(OinkologneMale, 1),
//.footprint = gMonFootprint_Oinkologne, //.footprint = gMonFootprint_Oinkologne,
LEARNSETS(OinkologneMale), .levelUpLearnset = sOinkologneMaleLevelUpLearnset,
}, },
[SPECIES_OINKOLOGNE_FEMALE] = [SPECIES_OINKOLOGNE_FEMALE] =
@ -566,7 +566,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
PALETTES(OinkologneFemale), PALETTES(OinkologneFemale),
ICON(OinkologneFemale, 2), ICON(OinkologneFemale, 2),
//.footprint = gMonFootprint_Oinkologne, //.footprint = gMonFootprint_Oinkologne,
LEARNSETS(OinkologneFemale), .levelUpLearnset = sOinkologneFemaleLevelUpLearnset,
}, },
#endif //P_FAMILY_LECHONK #endif //P_FAMILY_LECHONK

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

@ -35492,43 +35492,7 @@ static const u16 sLechonkTeachableLearnset[] = {
MOVE_UNAVAILABLE, MOVE_UNAVAILABLE,
}; };
static const u16 sOinkologneMaleTeachableLearnset[] = { static const u16 sOinkologneTeachableLearnset[] = {
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[] = {
MOVE_BODY_PRESS, MOVE_BODY_PRESS,
MOVE_BODY_SLAM, MOVE_BODY_SLAM,
MOVE_BULLDOZE, MOVE_BULLDOZE,