Leahnaya/Dynamic-Pokemon-Expansion
1
0
Fork 0
mirror of https://github.com/Skeli789/Dynamic-Pokemon-Expansion.git synced 2026-04-24 07:06:59 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update Some Learnsets + More Ability Mods

Browse Source
This commit is contained in:
Skeli 2021-07-27 14:55:02 -04:00
parent 846b20fa5e
commit e4e73f4a61
3 changed files with 60 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/Base_Stats.c
View File

@ -700,7 +700,7 @@ const struct BaseStats gBaseStats[] =
.ability1 = ABILITY_KEENEYE,
.ability2 = ABILITY_SNIPER,
.safariZoneFleeRate = 0,
.hiddenAbility = ABILITY_DEFIANT,
.hiddenAbility = ABILITY_SUPERLUCK,
.noFlip = TRUE,
},
@ -733,7 +733,7 @@ const struct BaseStats gBaseStats[] =
.ability1 = ABILITY_KEENEYE,
.ability2 = ABILITY_SNIPER,
.safariZoneFleeRate = 0,
.hiddenAbility = ABILITY_DEFIANT,
.hiddenAbility = ABILITY_SUPERLUCK,
.noFlip = TRUE,
},
@ -896,7 +896,7 @@ const struct BaseStats gBaseStats[] =
.eggGroup1 = EGG_GROUP_FIELD,
.eggGroup2 = EGG_GROUP_FIELD,
.ability1 = ABILITY_SANDVEIL,
.ability2 = ABILITY_SANDFORCE,
.ability2 = ABILITY_NONE,
.safariZoneFleeRate = 0,
.hiddenAbility = ABILITY_SANDRUSH,
.noFlip = TRUE,
@ -929,7 +929,7 @@ const struct BaseStats gBaseStats[] =
.eggGroup1 = EGG_GROUP_FIELD,
.eggGroup2 = EGG_GROUP_FIELD,
.ability1 = ABILITY_SANDVEIL,
.ability2 = ABILITY_SANDFORCE,
.ability2 = ABILITY_NONE,
.safariZoneFleeRate = 0,
.hiddenAbility = ABILITY_SANDRUSH,
.noFlip = TRUE,
@ -2743,7 +2743,7 @@ const struct BaseStats gBaseStats[] =
.growthRate = GROWTH_MEDIUM_FAST,
.eggGroup1 = EGG_GROUP_FLYING,
.eggGroup2 = EGG_GROUP_FIELD,
.ability1 = ABILITY_SCRAPPY,
.ability1 = ABILITY_KEENEYE,
.ability2 = ABILITY_INNERFOCUS,
.safariZoneFleeRate = 0,
.hiddenAbility = ABILITY_DEFIANT,
@ -3571,7 +3571,7 @@ const struct BaseStats gBaseStats[] =
.ability1 = ABILITY_OWNTEMPO,
.ability2 = ABILITY_OBLIVIOUS,
.safariZoneFleeRate = 0,
.hiddenAbility = ABILITY_THICKFAT,
.hiddenAbility = ABILITY_CLOUDNINE,
.noFlip = TRUE,
},
@ -4757,7 +4757,7 @@ const struct BaseStats gBaseStats[] =
.eggGroup1 = EGG_GROUP_UNDISCOVERED,
.eggGroup2 = EGG_GROUP_UNDISCOVERED,
.ability1 = ABILITY_PRESSURE,
.ability2 = ABILITY_NONE,
.ability2 = ABILITY_SNOWCLOAK,
.safariZoneFleeRate = 0,
.hiddenAbility = ABILITY_COMPETITIVE,
.noFlip = TRUE,
@ -4790,7 +4790,7 @@ const struct BaseStats gBaseStats[] =
.eggGroup1 = EGG_GROUP_UNDISCOVERED,
.eggGroup2 = EGG_GROUP_UNDISCOVERED,
.ability1 = ABILITY_PRESSURE,
.ability2 = ABILITY_NONE,
.ability2 = ABILITY_STATIC,
.safariZoneFleeRate = 0,
.hiddenAbility = ABILITY_DEFIANT,
.noFlip = TRUE,
@ -4823,7 +4823,7 @@ const struct BaseStats gBaseStats[] =
.eggGroup1 = EGG_GROUP_UNDISCOVERED,
.eggGroup2 = EGG_GROUP_UNDISCOVERED,
.ability1 = ABILITY_PRESSURE,
.ability2 = ABILITY_NONE,
.ability2 = ABILITY_FLAMEBODY,
.safariZoneFleeRate = 0,
.hiddenAbility = ABILITY_BERSERK,
.noFlip = TRUE,
@ -6176,9 +6176,9 @@ const struct BaseStats gBaseStats[] =
.eggGroup1 = EGG_GROUP_FAIRY,
.eggGroup2 = EGG_GROUP_GRASS,
.ability1 = ABILITY_CHLOROPHYLL,
.ability2 = ABILITY_INFILTRATOR,
.ability2 = ABILITY_LEAFGUARD,
.safariZoneFleeRate = 0,
.hiddenAbility = ABILITY_LEAFGUARD,
.hiddenAbility = ABILITY_INFILTRATOR,
.noFlip = TRUE,
},
@ -6209,9 +6209,9 @@ const struct BaseStats gBaseStats[] =
.eggGroup1 = EGG_GROUP_FAIRY,
.eggGroup2 = EGG_GROUP_GRASS,
.ability1 = ABILITY_CHLOROPHYLL,
.ability2 = ABILITY_INFILTRATOR,
.ability2 = ABILITY_LEAFGUARD,
.safariZoneFleeRate = 0,
.hiddenAbility = ABILITY_LEAFGUARD,
.hiddenAbility = ABILITY_INFILTRATOR,
.noFlip = TRUE,
},
@ -6242,9 +6242,9 @@ const struct BaseStats gBaseStats[] =
.eggGroup1 = EGG_GROUP_FAIRY,
.eggGroup2 = EGG_GROUP_GRASS,
.ability1 = ABILITY_CHLOROPHYLL,
.ability2 = ABILITY_INFILTRATOR,
.ability2 = ABILITY_LEAFGUARD,
.safariZoneFleeRate = 0,
.hiddenAbility = ABILITY_COTTONDOWN,
.hiddenAbility = ABILITY_INFILTRATOR,
.noFlip = TRUE,
},
@ -6704,9 +6704,9 @@ const struct BaseStats gBaseStats[] =
.eggGroup1 = EGG_GROUP_FIELD,
.eggGroup2 = EGG_GROUP_FIELD,
.ability1 = ABILITY_INNERFOCUS,
.ability2 = ABILITY_SAPSIPPER,
.ability2 = ABILITY_EARLYBIRD,
.safariZoneFleeRate = 0,
.hiddenAbility = ABILITY_SPEEDBOOST,
.hiddenAbility = ABILITY_SAPSIPPER,
.noFlip = TRUE,
},
@ -16349,7 +16349,7 @@ const struct BaseStats gBaseStats[] =
.ability1 = ABILITY_OWNTEMPO,
.ability2 = ABILITY_OBLIVIOUS,
.safariZoneFleeRate = 0,
.hiddenAbility = ABILITY_THICKFAT,
.hiddenAbility = ABILITY_CLOUDNINE,
.noFlip = TRUE,
},
@ -29578,8 +29578,8 @@ const struct BaseStats gBaseStats[] =
.growthRate = GROWTH_FAST,
.eggGroup1 = EGG_GROUP_FAIRY,
.eggGroup2 = EGG_GROUP_FAIRY,
.ability1 = ABILITY_REGENERATOR,
.ability2 = ABILITY_REGENERATOR,
.ability1 = ABILITY_TRIAGE,
.ability2 = ABILITY_TRIAGE,
.safariZoneFleeRate = 0,
.hiddenAbility = ABILITY_NONE,
.noFlip = TRUE,
@ -33011,7 +33011,7 @@ const struct BaseStats gBaseStats[] =
.eggGroup1 = EGG_GROUP_FIELD,
.eggGroup2 = EGG_GROUP_FIELD,
.ability1 = ABILITY_SNOWCLOAK,
.ability2 = ABILITY_ICEBODY,
.ability2 = ABILITY_NONE,
.safariZoneFleeRate = 0,
.hiddenAbility = ABILITY_SLUSHRUSH,
.noFlip = TRUE,
@ -33044,7 +33044,7 @@ const struct BaseStats gBaseStats[] =
.eggGroup1 = EGG_GROUP_FIELD,
.eggGroup2 = EGG_GROUP_FIELD,
.ability1 = ABILITY_SNOWCLOAK,
.ability2 = ABILITY_ICEBODY,
.ability2 = ABILITY_NONE,
.safariZoneFleeRate = 0,
.hiddenAbility = ABILITY_SLUSHRUSH,
.noFlip = TRUE,

3
src/Egg_Moves.c
View File

@ -974,7 +974,8 @@ const u16 gEggMoves[] =
MOVE_BESTOW,
MOVE_DISARMINGVOICE,
MOVE_ELECTRICTERRAIN,
MOVE_CELEBRATE),
MOVE_CELEBRATE,
MOVE_EXTREMESPEED),
egg_moves(CLEFFA,
MOVE_PRESENT,

69
src/Learnsets.c
View File

@ -1937,9 +1937,9 @@ static const struct LevelUpMove sGrimerLevelUpLearnset[] = {
LEVEL_UP_MOVE(15, MOVE_SLUDGE),
LEVEL_UP_MOVE(18, MOVE_MUDBOMB),
LEVEL_UP_MOVE(21, MOVE_MINIMIZE),
LEVEL_UP_MOVE(26, MOVE_SLUDGEBOMB),
LEVEL_UP_MOVE(26, MOVE_SLUDGEWAVE),
LEVEL_UP_MOVE(29, MOVE_FLING),
LEVEL_UP_MOVE(32, MOVE_SLUDGEWAVE),
LEVEL_UP_MOVE(32, MOVE_POISONJAB),
LEVEL_UP_MOVE(37, MOVE_SCREECH),
LEVEL_UP_MOVE(40, MOVE_GUNKSHOT),
LEVEL_UP_MOVE(43, MOVE_ACIDARMOR),
@ -1959,9 +1959,9 @@ static const struct LevelUpMove sMukLevelUpLearnset[] = {
LEVEL_UP_MOVE(15, MOVE_SLUDGE),
LEVEL_UP_MOVE(18, MOVE_MUDBOMB),
LEVEL_UP_MOVE(21, MOVE_MINIMIZE),
LEVEL_UP_MOVE(26, MOVE_SLUDGEBOMB),
LEVEL_UP_MOVE(26, MOVE_SLUDGEWAVE),
LEVEL_UP_MOVE(29, MOVE_FLING),
LEVEL_UP_MOVE(32, MOVE_SLUDGEWAVE),
LEVEL_UP_MOVE(32, MOVE_POISONJAB),
LEVEL_UP_MOVE(37, MOVE_SCREECH),
LEVEL_UP_MOVE(37, MOVE_VENOMDRENCH),
LEVEL_UP_MOVE(40, MOVE_GUNKSHOT),
@ -4850,11 +4850,11 @@ static const struct LevelUpMove sSwinubLevelUpLearnset[] = {
LEVEL_UP_MOVE( 4, MOVE_MUDSLAP),
LEVEL_UP_MOVE( 8, MOVE_POWDERSNOW),
LEVEL_UP_MOVE(11, MOVE_FLAIL),
LEVEL_UP_MOVE(15, MOVE_ICESHARD),
LEVEL_UP_MOVE(15, MOVE_ICYWIND),
LEVEL_UP_MOVE(19, MOVE_MUDBOMB),
LEVEL_UP_MOVE(23, MOVE_MIST),
LEVEL_UP_MOVE(25, MOVE_ENDURE),
LEVEL_UP_MOVE(29, MOVE_ICYWIND),
LEVEL_UP_MOVE(25, MOVE_ICESHARD),
LEVEL_UP_MOVE(29, MOVE_ENDURE),
LEVEL_UP_MOVE(33, MOVE_BULLDOZE),
LEVEL_UP_MOVE(38, MOVE_AMNESIA),
LEVEL_UP_MOVE(43, MOVE_TAKEDOWN),
@ -4872,11 +4872,11 @@ static const struct LevelUpMove sPiloswineLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_MUDSLAP),
LEVEL_UP_MOVE( 1, MOVE_POWDERSNOW),
LEVEL_UP_MOVE(11, MOVE_FLAIL),
LEVEL_UP_MOVE(15, MOVE_ICESHARD),
LEVEL_UP_MOVE(15, MOVE_ICYWIND),
LEVEL_UP_MOVE(19, MOVE_MUDBOMB),
LEVEL_UP_MOVE(23, MOVE_MIST),
LEVEL_UP_MOVE(25, MOVE_ENDURE),
LEVEL_UP_MOVE(29, MOVE_ICYWIND),
LEVEL_UP_MOVE(25, MOVE_ICESHARD),
LEVEL_UP_MOVE(29, MOVE_ENDURE),
LEVEL_UP_MOVE(32, MOVE_FURYATTACK),
LEVEL_UP_MOVE(32, MOVE_ICEFANG),
LEVEL_UP_MOVE(33, MOVE_BULLDOZE),
@ -9806,12 +9806,12 @@ static const struct LevelUpMove sSkorupiLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_LEER),
LEVEL_UP_MOVE( 3, MOVE_HONECLAWS),
LEVEL_UP_MOVE( 6, MOVE_FELLSTINGER),
LEVEL_UP_MOVE( 9, MOVE_POISONFANG),
LEVEL_UP_MOVE( 9, MOVE_VENOSHOCK),
LEVEL_UP_MOVE(12, MOVE_PURSUIT),
LEVEL_UP_MOVE(15, MOVE_TOXICSPIKES),
LEVEL_UP_MOVE(17, MOVE_BITE),
LEVEL_UP_MOVE(20, MOVE_BUGBITE),
LEVEL_UP_MOVE(23, MOVE_VENOSHOCK),
LEVEL_UP_MOVE(15, MOVE_BUGBITE),
LEVEL_UP_MOVE(18, MOVE_POISONFANG),
LEVEL_UP_MOVE(21, MOVE_BITE),
LEVEL_UP_MOVE(24, MOVE_TOXICSPIKES),
LEVEL_UP_MOVE(26, MOVE_KNOCKOFF),
LEVEL_UP_MOVE(29, MOVE_CROSSPOISON),
LEVEL_UP_MOVE(31, MOVE_SCARYFACE),
@ -9820,8 +9820,8 @@ static const struct LevelUpMove sSkorupiLevelUpLearnset[] = {
LEVEL_UP_MOVE(39, MOVE_NIGHTSLASH),
LEVEL_UP_MOVE(42, MOVE_XSCISSOR),
LEVEL_UP_MOVE(45, MOVE_ACUPRESSURE),
LEVEL_UP_MOVE(48, MOVE_CRUNCH),
LEVEL_UP_MOVE(51, MOVE_POISONJAB),
LEVEL_UP_MOVE(48, MOVE_POISONJAB),
LEVEL_UP_MOVE(51, MOVE_CRUNCH),
LEVEL_UP_END
};
@ -9833,12 +9833,12 @@ static const struct LevelUpMove sDrapionLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_LEER),
LEVEL_UP_MOVE( 1, MOVE_HONECLAWS),
LEVEL_UP_MOVE( 1, MOVE_FELLSTINGER),
LEVEL_UP_MOVE( 9, MOVE_POISONFANG),
LEVEL_UP_MOVE( 1, MOVE_VENOSHOCK),
LEVEL_UP_MOVE(12, MOVE_PURSUIT),
LEVEL_UP_MOVE(15, MOVE_TOXICSPIKES),
LEVEL_UP_MOVE(17, MOVE_BITE),
LEVEL_UP_MOVE(20, MOVE_BUGBITE),
LEVEL_UP_MOVE(23, MOVE_VENOSHOCK),
LEVEL_UP_MOVE(15, MOVE_BUGBITE),
LEVEL_UP_MOVE(18, MOVE_POISONFANG),
LEVEL_UP_MOVE(21, MOVE_BITE),
LEVEL_UP_MOVE(24, MOVE_TOXICSPIKES),
LEVEL_UP_MOVE(26, MOVE_KNOCKOFF),
LEVEL_UP_MOVE(29, MOVE_CROSSPOISON),
LEVEL_UP_MOVE(31, MOVE_SCARYFACE),
@ -9847,8 +9847,8 @@ static const struct LevelUpMove sDrapionLevelUpLearnset[] = {
LEVEL_UP_MOVE(39, MOVE_NIGHTSLASH),
LEVEL_UP_MOVE(44, MOVE_XSCISSOR),
LEVEL_UP_MOVE(49, MOVE_ACUPRESSURE),
LEVEL_UP_MOVE(54, MOVE_CRUNCH),
LEVEL_UP_MOVE(61, MOVE_POISONJAB),
LEVEL_UP_MOVE(54, MOVE_POISONJAB),
LEVEL_UP_MOVE(61, MOVE_CRUNCH),
LEVEL_UP_END
};
@ -10332,11 +10332,11 @@ static const struct LevelUpMove sMamoswineLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_MUDSLAP),
LEVEL_UP_MOVE( 1, MOVE_POWDERSNOW),
LEVEL_UP_MOVE(11, MOVE_FLAIL),
LEVEL_UP_MOVE(15, MOVE_ICESHARD),
LEVEL_UP_MOVE(15, MOVE_ICYWIND),
LEVEL_UP_MOVE(19, MOVE_MUDBOMB),
LEVEL_UP_MOVE(23, MOVE_HAIL),
LEVEL_UP_MOVE(25, MOVE_ENDURE),
LEVEL_UP_MOVE(29, MOVE_ICYWIND),
LEVEL_UP_MOVE(23, MOVE_MIST),
LEVEL_UP_MOVE(25, MOVE_ICESHARD),
LEVEL_UP_MOVE(29, MOVE_ENDURE),
LEVEL_UP_MOVE(32, MOVE_FURYATTACK),
LEVEL_UP_MOVE(32, MOVE_ICEFANG),
LEVEL_UP_MOVE(33, MOVE_BULLDOZE),
@ -10781,8 +10781,11 @@ static const struct LevelUpMove sArceusLevelUpLearnset[] = {
static const struct LevelUpMove sVictiniLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_CELEBRATE),
LEVEL_UP_MOVE( 1, MOVE_VCREATE),
LEVEL_UP_MOVE( 1, MOVE_BOLTSTRIKE),
LEVEL_UP_MOVE( 1, MOVE_FUSIONFLARE),
LEVEL_UP_MOVE( 1, MOVE_FUSIONBOLT),
LEVEL_UP_MOVE( 1, MOVE_GLACIATE),
LEVEL_UP_MOVE( 1, MOVE_BLUEFLARE),
LEVEL_UP_MOVE( 1, MOVE_BOLTSTRIKE),
LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK),
LEVEL_UP_MOVE( 1, MOVE_FLAMECHARGE),
LEVEL_UP_MOVE( 1, MOVE_CONFUSION),
@ -17869,8 +17872,8 @@ static const struct LevelUpMove sGrimerALevelUpLearnset[] = {
LEVEL_UP_MOVE( 7, MOVE_BITE),
LEVEL_UP_MOVE(12, MOVE_DISABLE),
LEVEL_UP_MOVE(15, MOVE_ACIDSPRAY),
LEVEL_UP_MOVE(18, MOVE_POISONFANG),
LEVEL_UP_MOVE(21, MOVE_MINIMIZE),
LEVEL_UP_MOVE(18, MOVE_MINIMIZE),
LEVEL_UP_MOVE(21, MOVE_POISONFANG),
LEVEL_UP_MOVE(26, MOVE_KNOCKOFF),
LEVEL_UP_MOVE(29, MOVE_FLING),
LEVEL_UP_MOVE(32, MOVE_CRUNCH),
@ -17892,8 +17895,8 @@ static const struct LevelUpMove sMukALevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_BITE),
LEVEL_UP_MOVE(12, MOVE_DISABLE),
LEVEL_UP_MOVE(15, MOVE_ACIDSPRAY),
LEVEL_UP_MOVE(18, MOVE_POISONFANG),
LEVEL_UP_MOVE(21, MOVE_MINIMIZE),
LEVEL_UP_MOVE(18, MOVE_MINIMIZE),
LEVEL_UP_MOVE(21, MOVE_POISONFANG),
LEVEL_UP_MOVE(26, MOVE_KNOCKOFF),
LEVEL_UP_MOVE(29, MOVE_FLING),
LEVEL_UP_MOVE(32, MOVE_CRUNCH),