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

Update all level up learnsets to Indigo Disk #5023

Merged
merged 4 commits into from
Jul 24, 2024
Merged

Update all level up learnsets to Indigo Disk #5023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e86c246
Update all movesets to Indigo Disk
kittenchilly Jul 23, 2024
c2b218a
Merge branch 'master' into levelup-indigo-disk
kittenchilly Jul 23, 2024
73be2aa
Also update past gens for gen 9 mons
kittenchilly Jul 23, 2024
584073f
Update gen_1.h
kittenchilly Jul 23, 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
48 changes: 44 additions & 4 deletions src/data/pokemon/level_up_learnsets/gen_1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5048,7 +5048,7 @@ static const struct LevelUpMove sSwampertLevelUpLearnset[] = {
LEVEL_UP_MOVE(46, MOVE_PROTECT),
LEVEL_UP_MOVE(52, MOVE_EARTHQUAKE),
LEVEL_UP_MOVE(61, MOVE_ENDEAVOR),
LEVEL_UP_END
LEVEL_UP_END
};
#endif //P_FAMILY_MUDKIP

Expand Down Expand Up @@ -17587,6 +17587,8 @@ static const struct LevelUpMove sFloragatoLevelUpLearnset[] = {

static const struct LevelUpMove sMeowscaradaLevelUpLearnset[] = {
LEVEL_UP_MOVE( 0, MOVE_FLOWER_TRICK),
LEVEL_UP_MOVE( 1, MOVE_DOUBLE_TEAM),
LEVEL_UP_MOVE( 1, MOVE_TRICK),
LEVEL_UP_MOVE( 1, MOVE_LEAFAGE),
LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP),
Expand Down Expand Up @@ -17645,6 +17647,8 @@ static const struct LevelUpMove sCrocalorLevelUpLearnset[] = {

static const struct LevelUpMove sSkeledirgeLevelUpLearnset[] = {
LEVEL_UP_MOVE( 0, MOVE_TORCH_SONG),
LEVEL_UP_MOVE( 1, MOVE_SING),
LEVEL_UP_MOVE( 1, MOVE_YAWN),
LEVEL_UP_MOVE( 1, MOVE_EMBER),
LEVEL_UP_MOVE( 1, MOVE_TACKLE),
LEVEL_UP_MOVE( 1, MOVE_LEER),
Expand Down Expand Up @@ -17704,6 +17708,7 @@ static const struct LevelUpMove sQuaxwellLevelUpLearnset[] = {

static const struct LevelUpMove sQuaquavalLevelUpLearnset[] = {
LEVEL_UP_MOVE( 0, MOVE_AQUA_STEP),
LEVEL_UP_MOVE( 1, MOVE_COUNTER),
LEVEL_UP_MOVE( 1, MOVE_POUND),
LEVEL_UP_MOVE( 1, MOVE_GROWL),
LEVEL_UP_MOVE( 1, MOVE_WATER_GUN),
Expand Down Expand Up @@ -18188,6 +18193,10 @@ static const struct LevelUpMove sArmarougeLevelUpLearnset[] = {

static const struct LevelUpMove sCeruledgeLevelUpLearnset[] = {
LEVEL_UP_MOVE( 0, MOVE_SHADOW_CLAW),
LEVEL_UP_MOVE( 1, MOVE_NIGHT_SLASH),
LEVEL_UP_MOVE( 1, MOVE_SHADOW_SNEAK),
LEVEL_UP_MOVE( 1, MOVE_QUICK_GUARD),
LEVEL_UP_MOVE( 1, MOVE_SOLAR_BLADE),
LEVEL_UP_MOVE( 1, MOVE_LEER),
LEVEL_UP_MOVE( 1, MOVE_EMBER),
LEVEL_UP_MOVE( 1, MOVE_ASTONISH),
Expand Down Expand Up @@ -18524,6 +18533,8 @@ static const struct LevelUpMove sRellorLevelUpLearnset[] = {

static const struct LevelUpMove sRabscaLevelUpLearnset[] = {
LEVEL_UP_MOVE( 0, MOVE_REVIVAL_BLESSING),
LEVEL_UP_MOVE( 1, MOVE_SAFEGUARD),
LEVEL_UP_MOVE( 1, MOVE_PSYCH_UP),
LEVEL_UP_MOVE( 1, MOVE_TACKLE),
LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL),
LEVEL_UP_MOVE( 1, MOVE_CONFUSION),
Expand Down Expand Up @@ -19050,6 +19061,7 @@ static const struct LevelUpMove sGreatTuskLevelUpLearnset[] = {

#if P_FAMILY_SCREAM_TAIL
static const struct LevelUpMove sScreamTailLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_SUNNY_DAY),
LEVEL_UP_MOVE( 1, MOVE_POUND),
LEVEL_UP_MOVE( 1, MOVE_SING),
LEVEL_UP_MOVE( 1, MOVE_DISABLE),
Expand All @@ -19072,6 +19084,7 @@ static const struct LevelUpMove sScreamTailLevelUpLearnset[] = {

#if P_FAMILY_BRUTE_BONNET
static const struct LevelUpMove sBruteBonnetLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_SUNNY_DAY),
LEVEL_UP_MOVE( 1, MOVE_ABSORB),
LEVEL_UP_MOVE( 1, MOVE_GROWTH),
LEVEL_UP_MOVE( 1, MOVE_ASTONISH),
Expand All @@ -19093,6 +19106,7 @@ static const struct LevelUpMove sBruteBonnetLevelUpLearnset[] = {

#if P_FAMILY_FLUTTER_MANE
static const struct LevelUpMove sFlutterManeLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_SUNNY_DAY),
LEVEL_UP_MOVE( 1, MOVE_CONFUSE_RAY),
LEVEL_UP_MOVE( 1, MOVE_SPITE),
LEVEL_UP_MOVE( 1, MOVE_ASTONISH),
Expand All @@ -19115,6 +19129,7 @@ static const struct LevelUpMove sFlutterManeLevelUpLearnset[] = {

#if P_FAMILY_SLITHER_WING
static const struct LevelUpMove sSlitherWingLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_SUNNY_DAY),
LEVEL_UP_MOVE( 1, MOVE_GUST),
LEVEL_UP_MOVE( 1, MOVE_EMBER),
LEVEL_UP_MOVE( 1, MOVE_BUG_BITE),
Expand All @@ -19138,6 +19153,7 @@ static const struct LevelUpMove sSlitherWingLevelUpLearnset[] = {

#if P_FAMILY_SANDY_SHOCKS
static const struct LevelUpMove sSandyShocksLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_SUNNY_DAY),
LEVEL_UP_MOVE( 1, MOVE_THUNDER_WAVE),
LEVEL_UP_MOVE( 1, MOVE_ELECTRIC_TERRAIN),
LEVEL_UP_MOVE( 1, MOVE_SUPERSONIC),
Expand Down Expand Up @@ -19183,6 +19199,7 @@ static const struct LevelUpMove sIronTreadsLevelUpLearnset[] = {

#if P_FAMILY_IRON_BUNDLE
static const struct LevelUpMove sIronBundleLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_ELECTRIC_TERRAIN),
LEVEL_UP_MOVE( 1, MOVE_PRESENT),
LEVEL_UP_MOVE( 7, MOVE_POWDER_SNOW),
LEVEL_UP_MOVE(14, MOVE_WHIRLPOOL),
Expand All @@ -19203,6 +19220,7 @@ static const struct LevelUpMove sIronBundleLevelUpLearnset[] = {

#if P_FAMILY_IRON_HANDS
static const struct LevelUpMove sIronHandsLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_ELECTRIC_TERRAIN),
LEVEL_UP_MOVE( 1, MOVE_SAND_ATTACK),
LEVEL_UP_MOVE( 1, MOVE_TACKLE),
LEVEL_UP_MOVE( 1, MOVE_FOCUS_ENERGY),
Expand Down Expand Up @@ -19249,6 +19267,7 @@ static const struct LevelUpMove sIronJugulisLevelUpLearnset[] = {

#if P_FAMILY_IRON_MOTH
static const struct LevelUpMove sIronMothLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_ELECTRIC_TERRAIN),
LEVEL_UP_MOVE( 1, MOVE_GUST),
LEVEL_UP_MOVE( 1, MOVE_WHIRLWIND),
LEVEL_UP_MOVE( 1, MOVE_EMBER),
Expand All @@ -19272,11 +19291,12 @@ static const struct LevelUpMove sIronMothLevelUpLearnset[] = {

#if P_FAMILY_IRON_THORNS
static const struct LevelUpMove sIronThornsLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_ELECTRIC_TERRAIN),
LEVEL_UP_MOVE( 1, MOVE_ROCK_THROW),
LEVEL_UP_MOVE( 1, MOVE_FIRE_FANG),
LEVEL_UP_MOVE( 1, MOVE_ICE_FANG),
LEVEL_UP_MOVE( 1, MOVE_THUNDER_FANG),
LEVEL_UP_MOVE( 1, MOVE_IRON_DEFENSE),
LEVEL_UP_MOVE( 1, MOVE_THUNDER_FANG),
LEVEL_UP_MOVE( 7, MOVE_SCREECH),
LEVEL_UP_MOVE(21, MOVE_ROCK_TOMB),
LEVEL_UP_MOVE(28, MOVE_BITE),
Expand Down Expand Up @@ -19473,6 +19493,10 @@ static const struct LevelUpMove sChiYuLevelUpLearnset[] = {

#if P_FAMILY_ROARING_MOON
static const struct LevelUpMove sRoaringMoonLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_SUNNY_DAY),
LEVEL_UP_MOVE( 1, MOVE_JAW_LOCK),
LEVEL_UP_MOVE( 1, MOVE_BREAKING_SWIPE),
LEVEL_UP_MOVE( 1, MOVE_SCALE_SHOT),
LEVEL_UP_MOVE( 1, MOVE_DRAGON_BREATH),
LEVEL_UP_MOVE( 1, MOVE_LEER),
LEVEL_UP_MOVE( 1, MOVE_BITE),
Expand All @@ -19496,6 +19520,7 @@ static const struct LevelUpMove sRoaringMoonLevelUpLearnset[] = {

#if P_FAMILY_IRON_VALIANT
static const struct LevelUpMove sIronValiantLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_ELECTRIC_TERRAIN),
LEVEL_UP_MOVE( 1, MOVE_DISABLE),
LEVEL_UP_MOVE( 1, MOVE_DOUBLE_TEAM),
LEVEL_UP_MOVE( 1, MOVE_SHADOW_SNEAK),
Expand All @@ -19511,8 +19536,8 @@ static const struct LevelUpMove sIronValiantLevelUpLearnset[] = {
LEVEL_UP_MOVE(63, MOVE_CLOSE_COMBAT),
LEVEL_UP_MOVE(70, MOVE_KNOCK_OFF),
LEVEL_UP_MOVE(77, MOVE_DESTINY_BOND),
LEVEL_UP_MOVE(84, MOVE_QUICK_GUARD),
LEVEL_UP_MOVE(84, MOVE_WIDE_GUARD),
LEVEL_UP_MOVE(84, MOVE_QUICK_GUARD),
LEVEL_UP_MOVE(91, MOVE_SPIRIT_BREAK),
LEVEL_UP_END
};
Expand Down Expand Up @@ -19564,6 +19589,8 @@ static const struct LevelUpMove sMiraidonLevelUpLearnset[] = {

#if P_FAMILY_WALKING_WAKE
static const struct LevelUpMove sWalkingWakeLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_SUNNY_DAY),
LEVEL_UP_MOVE( 1, MOVE_HONE_CLAWS),
LEVEL_UP_MOVE( 1, MOVE_LEER),
LEVEL_UP_MOVE( 1, MOVE_ROAR),
LEVEL_UP_MOVE( 1, MOVE_TWISTER),
Expand All @@ -19585,6 +19612,8 @@ static const struct LevelUpMove sWalkingWakeLevelUpLearnset[] = {

#if P_FAMILY_IRON_LEAVES
static const struct LevelUpMove sIronLeavesLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_QUASH),
LEVEL_UP_MOVE( 1, MOVE_ELECTRIC_TERRAIN),
LEVEL_UP_MOVE( 1, MOVE_LEER),
LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK),
LEVEL_UP_MOVE( 1, MOVE_HELPING_HAND),
Expand Down Expand Up @@ -19692,8 +19721,8 @@ static const struct LevelUpMove sFezandipitiLevelUpLearnset[] = {
LEVEL_UP_MOVE(32, MOVE_CROSS_POISON),
LEVEL_UP_MOVE(40, MOVE_TAIL_SLAP),
LEVEL_UP_MOVE(48, MOVE_BEAT_UP),
LEVEL_UP_MOVE(56, MOVE_FLATTER),
LEVEL_UP_MOVE(56, MOVE_SWAGGER),
LEVEL_UP_MOVE(56, MOVE_FLATTER),
LEVEL_UP_MOVE(64, MOVE_ROOST),
LEVEL_UP_MOVE(72, MOVE_MOONBLAST),
LEVEL_UP_END
Expand All @@ -19702,6 +19731,10 @@ static const struct LevelUpMove sFezandipitiLevelUpLearnset[] = {

#if P_FAMILY_OGERPON
static const struct LevelUpMove sOgerponLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_DOUBLE_KICK),
LEVEL_UP_MOVE( 1, MOVE_COUNTER),
LEVEL_UP_MOVE( 1, MOVE_RETALIATE),
LEVEL_UP_MOVE( 1, MOVE_HORN_LEECH),
LEVEL_UP_MOVE( 1, MOVE_VINE_WHIP),
LEVEL_UP_MOVE( 1, MOVE_LEECH_SEED),
LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK),
Expand All @@ -19723,6 +19756,9 @@ static const struct LevelUpMove sOgerponLevelUpLearnset[] = {

#if P_FAMILY_GOUGING_FIRE
static const struct LevelUpMove sGougingFireLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_DOUBLE_KICK),
LEVEL_UP_MOVE( 1, MOVE_ANCIENT_POWER),
LEVEL_UP_MOVE( 1, MOVE_NOBLE_ROAR),
LEVEL_UP_MOVE( 1, MOVE_STOMP),
LEVEL_UP_MOVE( 1, MOVE_LEER),
LEVEL_UP_MOVE( 1, MOVE_INCINERATE),
Expand All @@ -19746,6 +19782,7 @@ static const struct LevelUpMove sGougingFireLevelUpLearnset[] = {

#if P_FAMILY_RAGING_BOLT
static const struct LevelUpMove sRagingBoltLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_ANCIENT_POWER),
LEVEL_UP_MOVE( 1, MOVE_TWISTER),
LEVEL_UP_MOVE( 1, MOVE_SUNNY_DAY),
LEVEL_UP_MOVE( 1, MOVE_SHOCK_WAVE),
Expand Down Expand Up @@ -19833,6 +19870,9 @@ static const struct LevelUpMove sTerapagosLevelUpLearnset[] = {

#if P_FAMILY_PECHARUNT
static const struct LevelUpMove sPecharuntLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL),
LEVEL_UP_MOVE( 1, MOVE_ROLLOUT),
LEVEL_UP_MOVE( 1, MOVE_MEAN_LOOK),
LEVEL_UP_MOVE( 1, MOVE_SMOG),
LEVEL_UP_MOVE( 1, MOVE_POISON_GAS),
LEVEL_UP_MOVE( 1, MOVE_MEMENTO),
Expand Down
Loading
Loading