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

Couple More Ability Changes + Learnset Changes

Browse Source 
-Give Spheal and Sealeo Oblivious back
-Give Crabominable Crabby Tactics (Gorilla Tactics)
This commit is contained in:
Skeli 2021-11-04 22:35:25 +02:00
parent 6eafad0c19
commit 655737d18c
3 changed files with 95 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Base_Stats.c
View File

@ -10473,7 +10473,7 @@ const struct BaseStats gBaseStats[] =
.ability1 = ABILITY_THICKFAT,
.ability2 = ABILITY_ICEBODY,
.safariZoneFleeRate = 0,
.hiddenAbility = ABILITY_ICESCALES,
.hiddenAbility = ABILITY_OBLIVIOUS,
.noFlip = TRUE,
},
@ -10506,7 +10506,7 @@ const struct BaseStats gBaseStats[] =
.ability1 = ABILITY_THICKFAT,
.ability2 = ABILITY_ICEBODY,
.safariZoneFleeRate = 0,
.hiddenAbility = ABILITY_ICESCALES,
.hiddenAbility = ABILITY_OBLIVIOUS,
.noFlip = TRUE,
},
@ -30868,7 +30868,7 @@ const struct BaseStats gBaseStats[] =
.ability1 = ABILITY_HYPERCUTTER,
.ability2 = ABILITY_IRONFIST,
.safariZoneFleeRate = 0,
.hiddenAbility = ABILITY_ANGERPOINT,
.hiddenAbility = ABILITY_GORILLATACTICS, //-ABILITY_CRABBYTACTICS
.noFlip = TRUE,
},

14
src/Egg_Moves.c
View File

@ -600,7 +600,7 @@ const u16 gEggMoves[] =
egg_moves(LICKITUNG,
MOVE_MAGNITUDE,
MOVE_BODYSLAM,
MOVE_SLAM,
MOVE_CURSE,
MOVE_SMELLINGSALTS,
MOVE_SLEEPTALK,
@ -612,7 +612,9 @@ const u16 gEggMoves[] =
MOVE_BELCH,
MOVE_THRASH,
MOVE_HEALBELL,
MOVE_WISH),
MOVE_WISH,
MOVE_CHIPAWAY,
MOVE_MEFIRST),
egg_moves(KOFFING,
MOVE_SCREECH,
@ -1223,7 +1225,9 @@ const u16 gEggMoves[] =
MOVE_SECRETPOWER,
MOVE_MEANLOOK,
MOVE_PSYCHICTERRAIN,
MOVE_PSYCHICFANGS),
MOVE_PSYCHICFANGS,
MOVE_PSYWAVE,
MOVE_RETALIATE),
egg_moves(PINECO,
MOVE_PINMISSILE,
@ -2430,7 +2434,8 @@ const u16 gEggMoves[] =
MOVE_SLEEPTALK,
MOVE_ENDURE,
MOVE_SKULLBASH,
MOVE_MUDSPORT),
MOVE_MUDSPORT,
MOVE_NORETREAT),
egg_moves(SHINX,
MOVE_ICEFANG,
@ -2883,6 +2888,7 @@ const u16 gEggMoves[] =
MOVE_IRONTAIL,
MOVE_SCREECH,
MOVE_ASSURANCE,
MOVE_PURSUIT,
MOVE_REVENGE,
MOVE_FLAIL,
MOVE_TEARFULLOOK,

168
src/Learnsets.c
View File

@ -601,6 +601,7 @@ static const struct LevelUpMove sNidoqueenLevelUpLearnset[] = {
LEVEL_UP_MOVE( 0, MOVE_CHIPAWAY),
LEVEL_UP_MOVE( 1, MOVE_SUPERPOWER),
LEVEL_UP_MOVE( 1, MOVE_BODYSLAM),
LEVEL_UP_MOVE( 1, MOVE_SHELLSIDEARM),
LEVEL_UP_MOVE( 1, MOVE_GROWL),
LEVEL_UP_MOVE( 1, MOVE_POISONSTING),
LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
@ -2386,18 +2387,18 @@ static const struct LevelUpMove sLickitungLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL),
LEVEL_UP_MOVE( 6, MOVE_WRAP),
LEVEL_UP_MOVE(12, MOVE_SUPERSONIC),
LEVEL_UP_MOVE(16, MOVE_STOMP),
LEVEL_UP_MOVE(20, MOVE_DISABLE),
LEVEL_UP_MOVE(24, MOVE_REFRESH),
LEVEL_UP_MOVE(28, MOVE_CHIPAWAY),
LEVEL_UP_MOVE(33, MOVE_ROLLOUT),
LEVEL_UP_MOVE(38, MOVE_KNOCKOFF),
LEVEL_UP_MOVE(43, MOVE_SCREECH),
LEVEL_UP_MOVE(48, MOVE_MEFIRST),
LEVEL_UP_MOVE(53, MOVE_SLAM),
LEVEL_UP_MOVE(58, MOVE_POWERWHIP),
LEVEL_UP_MOVE(63, MOVE_BELLYDRUM),
LEVEL_UP_MOVE(68, MOVE_WRINGOUT),
LEVEL_UP_MOVE(15, MOVE_STOMP),
LEVEL_UP_MOVE(19, MOVE_DISABLE),
LEVEL_UP_MOVE(22, MOVE_SUBMISSION),
LEVEL_UP_MOVE(26, MOVE_SCREECH),
LEVEL_UP_MOVE(29, MOVE_ROLLOUT),
LEVEL_UP_MOVE(33, MOVE_KNOCKOFF),
LEVEL_UP_MOVE(37, MOVE_BODYSLAM),
LEVEL_UP_MOVE(40, MOVE_REFRESH),
LEVEL_UP_MOVE(44, MOVE_BODYPRESS),
LEVEL_UP_MOVE(48, MOVE_POWERWHIP),
LEVEL_UP_MOVE(52, MOVE_WRINGOUT),
LEVEL_UP_MOVE(55, MOVE_BELLYDRUM),
LEVEL_UP_END
};
@ -9728,7 +9729,7 @@ static const struct LevelUpMove sRioluLevelUpLearnset[] = {
LEVEL_UP_MOVE( 8, MOVE_METALCLAW),
LEVEL_UP_MOVE(12, MOVE_COUNTER),
LEVEL_UP_MOVE(16, MOVE_WORKUP),
LEVEL_UP_MOVE(20, MOVE_ROCKSMASH),
LEVEL_UP_MOVE(20, MOVE_LOWKICK),
LEVEL_UP_MOVE(24, MOVE_NASTYPLOT),
LEVEL_UP_MOVE(28, MOVE_SCREECH),
LEVEL_UP_MOVE(32, MOVE_QUICKGUARD),
@ -9746,7 +9747,7 @@ static const struct LevelUpMove sLucarioLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_FORESIGHT),
LEVEL_UP_MOVE( 1, MOVE_LIFEDEW),
LEVEL_UP_MOVE( 1, MOVE_WORKUP),
LEVEL_UP_MOVE( 1, MOVE_ROCKSMASH),
LEVEL_UP_MOVE( 1, MOVE_LOWKICK),
LEVEL_UP_MOVE( 1, MOVE_NASTYPLOT),
LEVEL_UP_MOVE( 1, MOVE_SCREECH),
LEVEL_UP_MOVE( 1, MOVE_FORCEPALM),
@ -9768,9 +9769,9 @@ static const struct LevelUpMove sLucarioLevelUpLearnset[] = {
LEVEL_UP_MOVE(40, MOVE_SWORDSDANCE),
LEVEL_UP_MOVE(44, MOVE_AURASPHERE),
LEVEL_UP_MOVE(48, MOVE_HEALPULSE),
LEVEL_UP_MOVE(52, MOVE_METEORMASH),
LEVEL_UP_MOVE(56, MOVE_DRAGONPULSE),
LEVEL_UP_MOVE(60, MOVE_EXTREMESPEED),
LEVEL_UP_MOVE(52, MOVE_DRAGONPULSE),
LEVEL_UP_MOVE(56, MOVE_EXTREMESPEED),
LEVEL_UP_MOVE(60, MOVE_METEORMASH),
LEVEL_UP_MOVE(64, MOVE_CLOSECOMBAT),
LEVEL_UP_END
};
@ -10079,23 +10080,23 @@ static const struct LevelUpMove sMagnezoneLevelUpLearnset[] = {
};
static const struct LevelUpMove sLickilickyLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_GYROBALL),
LEVEL_UP_MOVE( 1, MOVE_LICK),
LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL),
LEVEL_UP_MOVE( 6, MOVE_WRAP),
LEVEL_UP_MOVE(12, MOVE_SUPERSONIC),
LEVEL_UP_MOVE(16, MOVE_STOMP),
LEVEL_UP_MOVE(20, MOVE_DISABLE),
LEVEL_UP_MOVE(24, MOVE_REFRESH),
LEVEL_UP_MOVE(28, MOVE_CHIPAWAY),
LEVEL_UP_MOVE(33, MOVE_ROLLOUT),
LEVEL_UP_MOVE(38, MOVE_KNOCKOFF),
LEVEL_UP_MOVE(43, MOVE_SCREECH),
LEVEL_UP_MOVE(48, MOVE_MEFIRST),
LEVEL_UP_MOVE(53, MOVE_SLAM),
LEVEL_UP_MOVE(58, MOVE_POWERWHIP),
LEVEL_UP_MOVE(63, MOVE_BELLYDRUM),
LEVEL_UP_MOVE(68, MOVE_WRINGOUT),
LEVEL_UP_MOVE(74, MOVE_GYROBALL),
LEVEL_UP_MOVE( 1, MOVE_WRAP),
LEVEL_UP_MOVE( 1, MOVE_SUPERSONIC),
LEVEL_UP_MOVE(15, MOVE_STOMP),
LEVEL_UP_MOVE(19, MOVE_DISABLE),
LEVEL_UP_MOVE(22, MOVE_SUBMISSION),
LEVEL_UP_MOVE(26, MOVE_SCREECH),
LEVEL_UP_MOVE(29, MOVE_ROLLOUT),
LEVEL_UP_MOVE(34, MOVE_KNOCKOFF),
LEVEL_UP_MOVE(39, MOVE_BODYSLAM),
LEVEL_UP_MOVE(43, MOVE_REFRESH),
LEVEL_UP_MOVE(48, MOVE_BODYPRESS),
LEVEL_UP_MOVE(53, MOVE_POWERWHIP),
LEVEL_UP_MOVE(58, MOVE_WRINGOUT),
LEVEL_UP_MOVE(62, MOVE_BELLYDRUM),
LEVEL_UP_END
};
@ -11008,22 +11009,21 @@ static const struct LevelUpMove sSamurottLevelUpLearnset[] = {
static const struct LevelUpMove sPatratLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_TACKLE),
LEVEL_UP_MOVE( 3, MOVE_LEER),
LEVEL_UP_MOVE( 6, MOVE_PURSUIT),
LEVEL_UP_MOVE( 6, MOVE_BITE),
LEVEL_UP_MOVE( 8, MOVE_SANDATTACK),
LEVEL_UP_MOVE(10, MOVE_COVET),
LEVEL_UP_MOVE(13, MOVE_DETECT),
LEVEL_UP_MOVE(15, MOVE_BITE),
LEVEL_UP_MOVE(15, MOVE_CRUNCH),
LEVEL_UP_MOVE(18, MOVE_HYPNOSIS),
LEVEL_UP_MOVE(20, MOVE_SLAM),
LEVEL_UP_MOVE(23, MOVE_FOCUSENERGY),
LEVEL_UP_MOVE(25, MOVE_CRUNCH),
LEVEL_UP_MOVE(28, MOVE_WORKUP),
LEVEL_UP_MOVE(30, MOVE_AFTERYOU),
LEVEL_UP_MOVE(32, MOVE_HYPERFANG),
LEVEL_UP_MOVE(35, MOVE_NASTYPLOT),
LEVEL_UP_MOVE(37, MOVE_MEANLOOK),
LEVEL_UP_MOVE(39, MOVE_BATONPASS),
LEVEL_UP_MOVE(42, MOVE_SUPERFANG),
LEVEL_UP_MOVE(25, MOVE_WORKUP),
LEVEL_UP_MOVE(27, MOVE_AFTERYOU),
LEVEL_UP_MOVE(29, MOVE_HYPERFANG),
LEVEL_UP_MOVE(32, MOVE_NASTYPLOT),
LEVEL_UP_MOVE(34, MOVE_MEANLOOK),
LEVEL_UP_MOVE(36, MOVE_BATONPASS),
LEVEL_UP_MOVE(39, MOVE_SUPERFANG),
LEVEL_UP_END
};
@ -11032,24 +11032,23 @@ static const struct LevelUpMove sWatchogLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_ROTOTILLER),
LEVEL_UP_MOVE( 1, MOVE_TACKLE),
LEVEL_UP_MOVE( 1, MOVE_LEER),
LEVEL_UP_MOVE( 1, MOVE_PURSUIT),
LEVEL_UP_MOVE( 1, MOVE_BITE),
LEVEL_UP_MOVE( 8, MOVE_SANDATTACK),
LEVEL_UP_MOVE(10, MOVE_COVET),
LEVEL_UP_MOVE(13, MOVE_DETECT),
LEVEL_UP_MOVE(15, MOVE_BITE),
LEVEL_UP_MOVE(15, MOVE_CRUNCH),
LEVEL_UP_MOVE(18, MOVE_HYPNOSIS),
LEVEL_UP_MOVE(20, MOVE_SLAM),
LEVEL_UP_MOVE(19, MOVE_CONFUSERAY),
LEVEL_UP_MOVE(20, MOVE_SLAM),
LEVEL_UP_MOVE(24, MOVE_FOCUSENERGY),
LEVEL_UP_MOVE(27, MOVE_CRUNCH),
LEVEL_UP_MOVE(31, MOVE_WORKUP),
LEVEL_UP_MOVE(34, MOVE_AFTERYOU),
LEVEL_UP_MOVE(37, MOVE_HYPERFANG),
LEVEL_UP_MOVE(41, MOVE_PSYCHUP),
LEVEL_UP_MOVE(44, MOVE_NASTYPLOT),
LEVEL_UP_MOVE(47, MOVE_MEANLOOK),
LEVEL_UP_MOVE(50, MOVE_BATONPASS),
LEVEL_UP_MOVE(53, MOVE_SUPERFANG),
LEVEL_UP_MOVE(27, MOVE_WORKUP),
LEVEL_UP_MOVE(30, MOVE_AFTERYOU),
LEVEL_UP_MOVE(33, MOVE_HYPERFANG),
LEVEL_UP_MOVE(37, MOVE_PSYCHUP),
LEVEL_UP_MOVE(40, MOVE_NASTYPLOT),
LEVEL_UP_MOVE(43, MOVE_MEANLOOK),
LEVEL_UP_MOVE(46, MOVE_BATONPASS),
LEVEL_UP_MOVE(49, MOVE_SUPERFANG),
LEVEL_UP_END
};
@ -14684,13 +14683,13 @@ static const struct LevelUpMove sFlabebeLevelUpLearnset[] = {
LEVEL_UP_MOVE(18, MOVE_GRASSYTERRAIN),
LEVEL_UP_MOVE(21, MOVE_SPIRITBREAK),
LEVEL_UP_MOVE(25, MOVE_MAGICALLEAF),
LEVEL_UP_MOVE(29, MOVE_AROMATHERAPY),
LEVEL_UP_MOVE(33, MOVE_PETALBLIZZARD),
LEVEL_UP_MOVE(37, MOVE_DAZZLINGGLEAM),
LEVEL_UP_MOVE(29, MOVE_PETALBLIZZARD),
LEVEL_UP_MOVE(33, MOVE_DAZZLINGGLEAM),
LEVEL_UP_MOVE(37, MOVE_AROMATHERAPY),
LEVEL_UP_MOVE(41, MOVE_MISTYTERRAIN),
LEVEL_UP_MOVE(44, MOVE_PETALDANCE),
LEVEL_UP_MOVE(48, MOVE_WISH),
LEVEL_UP_MOVE(51, MOVE_MOONBLAST),
LEVEL_UP_MOVE(48, MOVE_MOONBLAST),
LEVEL_UP_MOVE(51, MOVE_WISH),
LEVEL_UP_END
};
@ -14703,13 +14702,13 @@ static const struct LevelUpMove sFloetteLevelUpLearnset[] = {
LEVEL_UP_MOVE(18, MOVE_GRASSYTERRAIN),
LEVEL_UP_MOVE(23, MOVE_SPIRITBREAK),
LEVEL_UP_MOVE(28, MOVE_MAGICALLEAF),
LEVEL_UP_MOVE(33, MOVE_AROMATHERAPY),
LEVEL_UP_MOVE(38, MOVE_PETALBLIZZARD),
LEVEL_UP_MOVE(43, MOVE_DAZZLINGGLEAM),
LEVEL_UP_MOVE(33, MOVE_PETALBLIZZARD),
LEVEL_UP_MOVE(38, MOVE_DAZZLINGGLEAM),
LEVEL_UP_MOVE(43, MOVE_AROMATHERAPY),
LEVEL_UP_MOVE(48, MOVE_MISTYTERRAIN),
LEVEL_UP_MOVE(52, MOVE_PETALDANCE),
LEVEL_UP_MOVE(57, MOVE_WISH),
LEVEL_UP_MOVE(61, MOVE_MOONBLAST),
LEVEL_UP_MOVE(57, MOVE_MOONBLAST),
LEVEL_UP_MOVE(61, MOVE_WISH),
LEVEL_UP_END
};
@ -14728,9 +14727,9 @@ static const struct LevelUpMove sFlorgesLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_MISTYTERRAIN),
LEVEL_UP_MOVE( 1, MOVE_PETALDANCE),
LEVEL_UP_MOVE( 1, MOVE_MOONBLAST),
LEVEL_UP_MOVE( 1, MOVE_AROMATHERAPY),
LEVEL_UP_MOVE( 1, MOVE_PETALBLIZZARD),
LEVEL_UP_MOVE( 1, MOVE_DAZZLINGGLEAM),
LEVEL_UP_MOVE( 1, MOVE_AROMATHERAPY),
LEVEL_UP_MOVE( 1, MOVE_WISH),
LEVEL_UP_END
};
@ -16157,15 +16156,15 @@ static const struct LevelUpMove sYungoosLevelUpLearnset[] = {
LEVEL_UP_MOVE( 7, MOVE_PURSUIT),
LEVEL_UP_MOVE(10, MOVE_SANDATTACK),
LEVEL_UP_MOVE(13, MOVE_ODORSLEUTH),
LEVEL_UP_MOVE(16, MOVE_BIDE),
LEVEL_UP_MOVE(19, MOVE_BITE),
LEVEL_UP_MOVE(22, MOVE_MUDSLAP),
LEVEL_UP_MOVE(25, MOVE_SUPERFANG),
LEVEL_UP_MOVE(28, MOVE_TAKEDOWN),
LEVEL_UP_MOVE(31, MOVE_SCARYFACE),
LEVEL_UP_MOVE(34, MOVE_CRUNCH),
LEVEL_UP_MOVE(37, MOVE_HYPERFANG),
LEVEL_UP_MOVE(40, MOVE_YAWN),
LEVEL_UP_MOVE(16, MOVE_BITE),
LEVEL_UP_MOVE(19, MOVE_MUDSLAP),
LEVEL_UP_MOVE(22, MOVE_HYPERFANG),
LEVEL_UP_MOVE(25, MOVE_YAWN),
LEVEL_UP_MOVE(28, MOVE_SUPERFANG),
LEVEL_UP_MOVE(31, MOVE_BIDE),
LEVEL_UP_MOVE(34, MOVE_TAKEDOWN),
LEVEL_UP_MOVE(37, MOVE_CRUNCH),
LEVEL_UP_MOVE(40, MOVE_SCARYFACE),
LEVEL_UP_MOVE(43, MOVE_THRASH),
LEVEL_UP_MOVE(46, MOVE_REST),
LEVEL_UP_END
@ -16176,19 +16175,16 @@ static const struct LevelUpMove sGumshoosLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_LEER),
LEVEL_UP_MOVE( 1, MOVE_PURSUIT),
LEVEL_UP_MOVE( 1, MOVE_SANDATTACK),
LEVEL_UP_MOVE( 3, MOVE_LEER),
LEVEL_UP_MOVE( 7, MOVE_PURSUIT),
LEVEL_UP_MOVE(10, MOVE_SANDATTACK),
LEVEL_UP_MOVE(13, MOVE_ODORSLEUTH),
LEVEL_UP_MOVE(16, MOVE_BIDE),
LEVEL_UP_MOVE(19, MOVE_BITE),
LEVEL_UP_MOVE(23, MOVE_MUDSLAP),
LEVEL_UP_MOVE(27, MOVE_SUPERFANG),
LEVEL_UP_MOVE(31, MOVE_TAKEDOWN),
LEVEL_UP_MOVE(35, MOVE_SCARYFACE),
LEVEL_UP_MOVE(39, MOVE_CRUNCH),
LEVEL_UP_MOVE(43, MOVE_HYPERFANG),
LEVEL_UP_MOVE(47, MOVE_YAWN),
LEVEL_UP_MOVE(16, MOVE_BITE),
LEVEL_UP_MOVE(19, MOVE_MUDSLAP),
LEVEL_UP_MOVE(23, MOVE_HYPERFANG),
LEVEL_UP_MOVE(27, MOVE_YAWN),
LEVEL_UP_MOVE(31, MOVE_SUPERFANG),
LEVEL_UP_MOVE(35, MOVE_BIDE),
LEVEL_UP_MOVE(39, MOVE_TAKEDOWN),
LEVEL_UP_MOVE(43, MOVE_CRUNCH),
LEVEL_UP_MOVE(47, MOVE_SCARYFACE),
LEVEL_UP_MOVE(51, MOVE_THRASH),
LEVEL_UP_MOVE(55, MOVE_REST),
LEVEL_UP_END