More Learnset Updates + Fix Shinies

This commit is contained in:
Skeli
2020-10-29 09:22:21 -04:00
parent d86a14ec6d
commit 3b07dd98a6
4 changed files with 1845 additions and 1744 deletions

View File

@@ -137,7 +137,8 @@ const u16 gEggMoves[] =
MOVE_POISONTAIL,
MOVE_ENDURE,
MOVE_CHIPAWAY,
MOVE_VENOMDRENCH),
MOVE_VENOMDRENCH,
MOVE_SUCKERPUNCH),
egg_moves(NIDORAN_M,
MOVE_COUNTER,
@@ -399,7 +400,8 @@ const u16 gEggMoves[] =
MOVE_ROCKCLIMB,
MOVE_ENDURE,
MOVE_AUTOTOMIZE,
MOVE_WIDEGUARD),
MOVE_WIDEGUARD,
MOVE_SUCKERPUNCH),
egg_moves(PONYTA,
MOVE_FLAMEWHEEL,
@@ -799,7 +801,9 @@ const u16 gEggMoves[] =
MOVE_BIDE,
MOVE_WATERPULSE,
MOVE_WHIRLPOOL,
MOVE_REFLECTTYPE),
MOVE_REFLECTTYPE,
MOVE_BITE,
MOVE_TICKLE),
egg_moves(KABUTO,
MOVE_BUBBLEBEAM,
@@ -808,12 +812,13 @@ const u16 gEggMoves[] =
MOVE_FLAIL,
MOVE_KNOCKOFF,
MOVE_CONFUSERAY,
MOVE_MUDSHOT,
MOVE_ICYWIND,
MOVE_SCREECH,
MOVE_GIGADRAIN,
MOVE_FORESIGHT,
MOVE_TAKEDOWN),
MOVE_TAKEDOWN,
MOVE_MEGADRAIN,
MOVE_WRINGOUT),
egg_moves(AERODACTYL,
MOVE_WHIRLWIND,
@@ -1555,7 +1560,8 @@ const u16 gEggMoves[] =
MOVE_IRONTAIL,
MOVE_FOCUSENERGY,
MOVE_POWERSWAP,
MOVE_BELCH),
MOVE_BELCH,
MOVE_FIRESPIN),
egg_moves(MILTANK,
MOVE_PRESENT,
@@ -1604,7 +1610,10 @@ const u16 gEggMoves[] =
MOVE_RAZORWIND,
MOVE_BULLETSEED,
MOVE_NATURALGIFT,
MOVE_GRASSYTERRAIN),
MOVE_GRASSYTERRAIN,
MOVE_ABSORB,
MOVE_PURSUIT,
MOVE_AGILITY),
egg_moves(TORCHIC,
MOVE_COUNTER,
@@ -1619,7 +1628,9 @@ const u16 gEggMoves[] =
MOVE_FEATHERDANCE,
MOVE_CURSE,
MOVE_FLAMEBURST,
MOVE_LOWKICK),
MOVE_LOWKICK,
MOVE_FIRESPIN,
MOVE_SANDATTACK),
egg_moves(MUDKIP,
MOVE_REFRESH,
@@ -1638,7 +1649,11 @@ const u16 gEggMoves[] =
MOVE_SLUDGE,
MOVE_AVALANCHE,
MOVE_WIDEGUARD,
MOVE_BARRIER),
MOVE_BARRIER,
MOVE_MUDSLAP,
MOVE_FORESIGHT,
MOVE_BIDE,
MOVE_MUDSPORT),
egg_moves(POOCHYENA,
MOVE_ASTONISH,
@@ -2169,7 +2184,8 @@ const u16 gEggMoves[] =
MOVE_HAMMERARM,
MOVE_NIGHTSLASH,
MOVE_AFTERYOU,
MOVE_TICKLE),
MOVE_TICKLE,
MOVE_SUCKERPUNCH),
egg_moves(GULPIN,
MOVE_ACIDARMOR,
@@ -2261,7 +2277,8 @@ const u16 gEggMoves[] =
MOVE_IRONTAIL,
MOVE_WRINGOUT,
MOVE_PUNISHMENT,
MOVE_FINALGAMBIT),
MOVE_FINALGAMBIT,
MOVE_SUCKERPUNCH),
egg_moves(ZANGOOSE,
MOVE_FLAIL,
@@ -2653,7 +2670,8 @@ const u16 gEggMoves[] =
MOVE_ASSURANCE,
MOVE_FLAIL,
MOVE_SNATCH,
MOVE_METALCLAW),
MOVE_METALCLAW,
MOVE_SUCKERPUNCH),
egg_moves(CHINGLING,
MOVE_DISABLE,
@@ -3291,7 +3309,9 @@ const u16 gEggMoves[] =
MOVE_BODYSLAM,
MOVE_BIDE,
MOVE_GUARDSWAP,
MOVE_LIQUIDATION),
MOVE_LIQUIDATION,
MOVE_ROLLOUT,
MOVE_BLOCK),
egg_moves(ARCHEN,
MOVE_STEELWING,
@@ -3892,7 +3912,8 @@ const u16 gEggMoves[] =
MOVE_BARRIER,
MOVE_MIRRORCOAT,
MOVE_MAGNETRISE,
MOVE_DISCHARGE),
MOVE_DISCHARGE,
MOVE_TAKEDOWN),
egg_moves(HAWLUCHA,
MOVE_AGILITY,
@@ -4348,7 +4369,8 @@ const u16 gEggMoves[] =
MOVE_WIDEGUARD,
MOVE_COUNTER,
MOVE_CURSE,
MOVE_SCREECH),
MOVE_SCREECH,
MOVE_SUCKERPUNCH),
egg_moves(GRIMER_A,
MOVE_CLEARSMOG,

File diff suppressed because it is too large Load Diff

View File

@@ -113,6 +113,7 @@ BASCULIN_RED
BASCULIN_BLUE
TIRTOUGA
CARRACOSTA
SWANNA
FRILLISH
FRILLISH_F
JELLICENT

View File

@@ -162,7 +162,7 @@ const u32* GetFrontSpritePalFromSpeciesAndPersonality(u16 species, u32 otId, u32
return (u32*) gMonPaletteTable[0].data;
shinyValue = HIHALF(otId) ^ LOHALF(otId) ^ HIHALF(personality) ^ LOHALF(personality);
if (shinyValue < 8)
if (shinyValue < 16)
return (u32*) gMonShinyPaletteTable[species].data;
else
return (u32*) gMonPaletteTable[species].data;
@@ -174,7 +174,7 @@ const struct CompressedSpritePalette* GetMonSpritePalStructFromOtIdPersonality(u
species = TryGetFemaleGenderedSpecies(species, personality);
shinyValue = HIHALF(otId) ^ LOHALF(otId) ^ HIHALF(personality) ^ LOHALF(personality);
if (shinyValue < 8)
if (shinyValue < 16)
return &gMonShinyPaletteTable[species];
else
return &gMonPaletteTable[species];