diff --git a/graphics/backspr/gBackShinySprite015Beedrill.png b/graphics/backspr/gBackShinySprite015Beedrill.png index 3dddac9..1a49b77 100644 Binary files a/graphics/backspr/gBackShinySprite015Beedrill.png and b/graphics/backspr/gBackShinySprite015Beedrill.png differ diff --git a/graphics/backspr/gBackShinySprite1015Kartana.png b/graphics/backspr/gBackShinySprite1015Kartana.png index 83edb78..9d5ca40 100644 Binary files a/graphics/backspr/gBackShinySprite1015Kartana.png and b/graphics/backspr/gBackShinySprite1015Kartana.png differ diff --git a/graphics/backspr/gBackShinySprite1023SandshrewA.png b/graphics/backspr/gBackShinySprite1023SandshrewA.png index a8e6520..9b60fcf 100644 Binary files a/graphics/backspr/gBackShinySprite1023SandshrewA.png and b/graphics/backspr/gBackShinySprite1023SandshrewA.png differ diff --git a/graphics/backspr/gBackShinySprite392Ralts.png b/graphics/backspr/gBackShinySprite392Ralts.png index 3c0e71d..d290307 100644 Binary files a/graphics/backspr/gBackShinySprite392Ralts.png and b/graphics/backspr/gBackShinySprite392Ralts.png differ diff --git a/graphics/backspr/gBackShinySprite766Greninja.png b/graphics/backspr/gBackShinySprite766Greninja.png index 6e7ef53..c2878c0 100644 Binary files a/graphics/backspr/gBackShinySprite766Greninja.png and b/graphics/backspr/gBackShinySprite766Greninja.png differ diff --git a/graphics/backspr/gBackShinySprite769Fletchling.png b/graphics/backspr/gBackShinySprite769Fletchling.png index 6488cbc..d04ac0e 100644 Binary files a/graphics/backspr/gBackShinySprite769Fletchling.png and b/graphics/backspr/gBackShinySprite769Fletchling.png differ diff --git a/graphics/backspr/gBackShinySprite821Avalugg.png b/graphics/backspr/gBackShinySprite821Avalugg.png index 5b2bcdd..e79455e 100644 Binary files a/graphics/backspr/gBackShinySprite821Avalugg.png and b/graphics/backspr/gBackShinySprite821Avalugg.png differ diff --git a/graphics/backspr/gBackShinySprite822Noibat.png b/graphics/backspr/gBackShinySprite822Noibat.png index ba05575..94b212f 100644 Binary files a/graphics/backspr/gBackShinySprite822Noibat.png and b/graphics/backspr/gBackShinySprite822Noibat.png differ diff --git a/graphics/backspr/gBackShinySprite826Zygarde.png b/graphics/backspr/gBackShinySprite826Zygarde.png index 948c8a6..17f8733 100644 Binary files a/graphics/backspr/gBackShinySprite826Zygarde.png and b/graphics/backspr/gBackShinySprite826Zygarde.png differ diff --git a/graphics/backspr/gBackShinySprite837Zygarde10.png b/graphics/backspr/gBackShinySprite837Zygarde10.png index 782993a..6bdca1f 100644 Binary files a/graphics/backspr/gBackShinySprite837Zygarde10.png and b/graphics/backspr/gBackShinySprite837Zygarde10.png differ diff --git a/graphics/backspr/gBackShinySprite838ZygardeComplete.png b/graphics/backspr/gBackShinySprite838ZygardeComplete.png index c2f9cbe..2a99b10 100644 Binary files a/graphics/backspr/gBackShinySprite838ZygardeComplete.png and b/graphics/backspr/gBackShinySprite838ZygardeComplete.png differ diff --git a/graphics/backspr/gBackShinySprite873BeedrillMega.png b/graphics/backspr/gBackShinySprite873BeedrillMega.png index 61596a5..ac5efbb 100644 Binary files a/graphics/backspr/gBackShinySprite873BeedrillMega.png and b/graphics/backspr/gBackShinySprite873BeedrillMega.png differ diff --git a/graphics/frontspr/gFrontSprite1001KommoO.png b/graphics/frontspr/gFrontSprite1001KommoO.png index 682162e..192d8f1 100644 Binary files a/graphics/frontspr/gFrontSprite1001KommoO.png and b/graphics/frontspr/gFrontSprite1001KommoO.png differ diff --git a/graphics/frontspr/gFrontSprite1015Kartana.png b/graphics/frontspr/gFrontSprite1015Kartana.png index a12ccfc..eb052a9 100644 Binary files a/graphics/frontspr/gFrontSprite1015Kartana.png and b/graphics/frontspr/gFrontSprite1015Kartana.png differ diff --git a/graphics/frontspr/gFrontSprite1022RaichuA.png b/graphics/frontspr/gFrontSprite1022RaichuA.png index b199122..0a3060c 100644 Binary files a/graphics/frontspr/gFrontSprite1022RaichuA.png and b/graphics/frontspr/gFrontSprite1022RaichuA.png differ diff --git a/graphics/frontspr/gFrontSprite1023SandshrewA.png b/graphics/frontspr/gFrontSprite1023SandshrewA.png index 3671c3e..5b5f512 100644 Binary files a/graphics/frontspr/gFrontSprite1023SandshrewA.png and b/graphics/frontspr/gFrontSprite1023SandshrewA.png differ diff --git a/graphics/frontspr/gFrontSprite766Greninja.png b/graphics/frontspr/gFrontSprite766Greninja.png index 16b2feb..bc74f55 100644 Binary files a/graphics/frontspr/gFrontSprite766Greninja.png and b/graphics/frontspr/gFrontSprite766Greninja.png differ diff --git a/graphics/frontspr/gFrontSprite821Avalugg.png b/graphics/frontspr/gFrontSprite821Avalugg.png index c7d8bd6..ca013e6 100644 Binary files a/graphics/frontspr/gFrontSprite821Avalugg.png and b/graphics/frontspr/gFrontSprite821Avalugg.png differ diff --git a/graphics/frontspr/gFrontSprite822Noibat.png b/graphics/frontspr/gFrontSprite822Noibat.png index 3b489c5..4e5ffd5 100644 Binary files a/graphics/frontspr/gFrontSprite822Noibat.png and b/graphics/frontspr/gFrontSprite822Noibat.png differ diff --git a/graphics/frontspr/gFrontSprite837Zygarde10.png b/graphics/frontspr/gFrontSprite837Zygarde10.png index 4d87a44..20648a3 100644 Binary files a/graphics/frontspr/gFrontSprite837Zygarde10.png and b/graphics/frontspr/gFrontSprite837Zygarde10.png differ diff --git a/graphics/frontspr/gFrontSprite838ZygardeComplete.png b/graphics/frontspr/gFrontSprite838ZygardeComplete.png index bb790ed..cdbbc6f 100644 Binary files a/graphics/frontspr/gFrontSprite838ZygardeComplete.png and b/graphics/frontspr/gFrontSprite838ZygardeComplete.png differ diff --git a/graphics/frontspr/gFrontSprite839Ashgreninja.png b/graphics/frontspr/gFrontSprite839Ashgreninja.png index 5096be7..6d07fd8 100644 Binary files a/graphics/frontspr/gFrontSprite839Ashgreninja.png and b/graphics/frontspr/gFrontSprite839Ashgreninja.png differ diff --git a/graphics/frontspr/gSpriteShadowWarrior.png b/graphics/frontspr/gSpriteShadowWarrior.png index fe6bcbb..0efcafb 100644 Binary files a/graphics/frontspr/gSpriteShadowWarrior.png and b/graphics/frontspr/gSpriteShadowWarrior.png differ diff --git a/graphics/pokeicon/gIconSprite1040DeoxysAttack.png b/graphics/pokeicon/gIconSprite1040DeoxysAttack.png index a6b01d0..8deb949 100644 Binary files a/graphics/pokeicon/gIconSprite1040DeoxysAttack.png and b/graphics/pokeicon/gIconSprite1040DeoxysAttack.png differ diff --git a/graphics/pokeicon/gIconSprite991MiniorShield.png b/graphics/pokeicon/gIconSprite991MiniorShield.png index 77de0f7..d2f6134 100644 Binary files a/graphics/pokeicon/gIconSprite991MiniorShield.png and b/graphics/pokeicon/gIconSprite991MiniorShield.png differ diff --git a/include/moves.h b/include/moves.h index 336405f..0c7ef04 100644 --- a/include/moves.h +++ b/include/moves.h @@ -742,172 +742,175 @@ #define MOVE_FREEZINGGLARE 0x2DF #define MOVE_THUNDEROUSKICK 0x2E0 #define MOVE_FIERYWRATH 0x2E1 -#define MOVE_THUNDERCAGE 0x2E2 -#define MOVE_DRAGONENERGY 0x2E3 +#define MOVE_EERIESPELL 0x2E2 +#define MOVE_THUNDERCAGE 0x2E3 +#define MOVE_DRAGONENERGY 0x2E4 +#define MOVE_ASTRALBARRAGE 0x2E5 +#define MOVE_GLACIALLANCE 0x2E6 //Z-Moves -#define MOVE_BREAKNECK_BLITZ_P 0x2E4 -#define MOVE_BREAKNECK_BLITZ_S 0x2E5 -#define MOVE_ALL_OUT_PUMMELING_P 0x2E6 -#define MOVE_ALL_OUT_PUMMELING_S 0x2E7 -#define MOVE_SUPERSONIC_SKYSTRIKE_P 0x2E8 -#define MOVE_SUPERSONIC_SKYSTRIKE_S 0x2E9 -#define MOVE_ACID_DOWNPOUR_P 0x2EA -#define MOVE_ACID_DOWNPOUR_S 0x2EB -#define MOVE_TECTONIC_RAGE_P 0x2EC -#define MOVE_TECTONIC_RAGE_S 0x2ED -#define MOVE_CONTINENTAL_CRUSH_P 0x2EE -#define MOVE_CONTINENTAL_CRUSH_S 0x2EF -#define MOVE_SAVAGE_SPIN_OUT_P 0x2F0 -#define MOVE_SAVAGE_SPIN_OUT_S 0x2F1 -#define MOVE_NEVER_ENDING_NIGHTMARE_P 0x2F2 -#define MOVE_NEVER_ENDING_NIGHTMARE_S 0x2F3 -#define MOVE_CORKSCREW_CRASH_P 0x2F4 -#define MOVE_CORKSCREW_CRASH_S 0x2F5 -#define MOVE_INFERNO_OVERDRIVE_P 0x2F6 -#define MOVE_INFERNO_OVERDRIVE_S 0x2F7 -#define MOVE_HYDRO_VORTEX_P 0x2F8 -#define MOVE_HYDRO_VORTEX_S 0x2F9 -#define MOVE_BLOOM_DOOM_P 0x2FA -#define MOVE_BLOOM_DOOM_S 0x2FB -#define MOVE_GIGAVOLT_HAVOC_P 0x2FC -#define MOVE_GIGAVOLT_HAVOC_S 0x2FD -#define MOVE_SHATTERED_PSYCHE_P 0x2FE -#define MOVE_SHATTERED_PSYCHE_S 0x2FF -#define MOVE_SUBZERO_SLAMMER_P 0x300 -#define MOVE_SUBZERO_SLAMMER_S 0x301 -#define MOVE_DEVASTATING_DRAKE_P 0x302 -#define MOVE_DEVASTATING_DRAKE_S 0x303 -#define MOVE_BLACK_HOLE_ECLIPSE_P 0x304 -#define MOVE_BLACK_HOLE_ECLIPSE_S 0x305 -#define MOVE_TWINKLE_TACKLE_P 0x306 -#define MOVE_TWINKLE_TACKLE_S 0x307 +#define MOVE_BREAKNECK_BLITZ_P 0x2E7 +#define MOVE_BREAKNECK_BLITZ_S 0x2E8 +#define MOVE_ALL_OUT_PUMMELING_P 0x2E9 +#define MOVE_ALL_OUT_PUMMELING_S 0x2EA +#define MOVE_SUPERSONIC_SKYSTRIKE_P 0x2EB +#define MOVE_SUPERSONIC_SKYSTRIKE_S 0x2EC +#define MOVE_ACID_DOWNPOUR_P 0x2ED +#define MOVE_ACID_DOWNPOUR_S 0x2EE +#define MOVE_TECTONIC_RAGE_P 0x2EF +#define MOVE_TECTONIC_RAGE_S 0x2F0 +#define MOVE_CONTINENTAL_CRUSH_P 0x2F1 +#define MOVE_CONTINENTAL_CRUSH_S 0x2F2 +#define MOVE_SAVAGE_SPIN_OUT_P 0x2F3 +#define MOVE_SAVAGE_SPIN_OUT_S 0x2F4 +#define MOVE_NEVER_ENDING_NIGHTMARE_P 0x2F5 +#define MOVE_NEVER_ENDING_NIGHTMARE_S 0x2F6 +#define MOVE_CORKSCREW_CRASH_P 0x2F7 +#define MOVE_CORKSCREW_CRASH_S 0x2F8 +#define MOVE_INFERNO_OVERDRIVE_P 0x2F9 +#define MOVE_INFERNO_OVERDRIVE_S 0x2FA +#define MOVE_HYDRO_VORTEX_P 0x2FB +#define MOVE_HYDRO_VORTEX_S 0x2FC +#define MOVE_BLOOM_DOOM_P 0x2FD +#define MOVE_BLOOM_DOOM_S 0x2FE +#define MOVE_GIGAVOLT_HAVOC_P 0x2FF +#define MOVE_GIGAVOLT_HAVOC_S 0x300 +#define MOVE_SHATTERED_PSYCHE_P 0x301 +#define MOVE_SHATTERED_PSYCHE_S 0x302 +#define MOVE_SUBZERO_SLAMMER_P 0x303 +#define MOVE_SUBZERO_SLAMMER_S 0x304 +#define MOVE_DEVASTATING_DRAKE_P 0x305 +#define MOVE_DEVASTATING_DRAKE_S 0x306 +#define MOVE_BLACK_HOLE_ECLIPSE_P 0x307 +#define MOVE_BLACK_HOLE_ECLIPSE_S 0x308 +#define MOVE_TWINKLE_TACKLE_P 0x309 +#define MOVE_TWINKLE_TACKLE_S 0x30A -#define MOVE_CATASTROPIKA 0x308 -#define MOVE_10000000_VOLT_THUNDERBOLT 0x309 -#define MOVE_STOKED_SPARKSURFER 0x30A //Paralyze Target -#define MOVE_EXTREME_EVOBOOST 0x30B //Double Ancient Power -#define MOVE_PULVERIZING_PANCAKE 0x30C -#define MOVE_GENESIS_SUPERNOVA 0x30D //Sets up Psychic Terrain -#define MOVE_SINISTER_ARROW_RAID 0x30E -#define MOVE_MALICIOUS_MOONSAULT 0x30F -#define MOVE_OCEANIC_OPERETTA 0x310 -#define MOVE_SPLINTERED_STORMSHARDS 0x311 //Removes Terrain -#define MOVE_LETS_SNUGGLE_FOREVER 0x312 -#define MOVE_CLANGOROUS_SOULBLAZE 0x313 //Ancient Power -#define MOVE_GUARDIAN_OF_ALOLA 0x314 -#define MOVE_SEARING_SUNRAZE_SMASH 0x315 -#define MOVE_MENACING_MOONRAZE_MAELSTROM 0x316 -#define MOVE_LIGHT_THAT_BURNS_THE_SKY 0x317 -#define MOVE_SOUL_STEALING_7_STAR_STRIKE 0x318 +#define MOVE_CATASTROPIKA 0x30B +#define MOVE_10000000_VOLT_THUNDERBOLT 0x30C +#define MOVE_STOKED_SPARKSURFER 0x30D //Paralyze Target +#define MOVE_EXTREME_EVOBOOST 0x30E //Double Ancient Power +#define MOVE_PULVERIZING_PANCAKE 0x30F +#define MOVE_GENESIS_SUPERNOVA 0x310 //Sets up Psychic Terrain +#define MOVE_SINISTER_ARROW_RAID 0x311 +#define MOVE_MALICIOUS_MOONSAULT 0x312 +#define MOVE_OCEANIC_OPERETTA 0x313 +#define MOVE_SPLINTERED_STORMSHARDS 0x314 //Removes Terrain +#define MOVE_LETS_SNUGGLE_FOREVER 0x315 +#define MOVE_CLANGOROUS_SOULBLAZE 0x316 //Ancient Power +#define MOVE_GUARDIAN_OF_ALOLA 0x317 +#define MOVE_SEARING_SUNRAZE_SMASH 0x318 +#define MOVE_MENACING_MOONRAZE_MAELSTROM 0x319 +#define MOVE_LIGHT_THAT_BURNS_THE_SKY 0x31A +#define MOVE_SOUL_STEALING_7_STAR_STRIKE 0x31B #define FIRST_Z_MOVE MOVE_BREAKNECK_BLITZ_P #define LAST_Z_MOVE MOVE_SOUL_STEALING_7_STAR_STRIKE //Max Moves -#define MOVE_MAX_GUARD 0x319 -#define MOVE_MAX_STRIKE_P 0x31A -#define MOVE_MAX_STRIKE_S 0x31B -#define MOVE_MAX_KNUCKLE_P 0x31C -#define MOVE_MAX_KNUCKLE_S 0x31D -#define MOVE_MAX_AIRSTREAM_P 0x31E -#define MOVE_MAX_AIRSTREAM_S 0x31F -#define MOVE_MAX_OOZE_P 0x320 -#define MOVE_MAX_OOZE_S 0x321 -#define MOVE_MAX_QUAKE_P 0x322 -#define MOVE_MAX_QUAKE_S 0x323 -#define MOVE_MAX_ROCKFALL_P 0x324 -#define MOVE_MAX_ROCKFALL_S 0x325 -#define MOVE_MAX_FLUTTERBY_P 0x326 -#define MOVE_MAX_FLUTTERBY_S 0x327 -#define MOVE_MAX_PHANTASM_P 0x328 -#define MOVE_MAX_PHANTASM_S 0x329 -#define MOVE_MAX_STEELSPIKE_P 0x32A -#define MOVE_MAX_STEELSPIKE_S 0x32B -#define MOVE_MAX_FLARE_P 0x32C -#define MOVE_MAX_FLARE_S 0x32D -#define MOVE_MAX_GEYSER_P 0x32E -#define MOVE_MAX_GEYSER_S 0x32F -#define MOVE_MAX_OVERGROWTH_P 0x330 -#define MOVE_MAX_OVERGROWTH_S 0x331 -#define MOVE_MAX_LIGHTNING_P 0x332 -#define MOVE_MAX_LIGHTNING_S 0x333 -#define MOVE_MAX_MINDSTORM_P 0x334 -#define MOVE_MAX_MINDSTORM_S 0x335 -#define MOVE_MAX_HAILSTORM_P 0x336 -#define MOVE_MAX_HAILSTORM_S 0x337 -#define MOVE_MAX_WYRMWIND_P 0x338 -#define MOVE_MAX_WYRMWIND_S 0x339 -#define MOVE_MAX_DARKNESS_P 0x33A -#define MOVE_MAX_DARKNESS_S 0x33B -#define MOVE_MAX_STARFALL_P 0x33C -#define MOVE_MAX_STARFALL_S 0x33D -#define MOVE_G_MAX_VINE_LASH_P 0x33E -#define MOVE_G_MAX_VINE_LASH_S 0x33F -#define MOVE_G_MAX_WILDFIRE_P 0x340 -#define MOVE_G_MAX_WILDFIRE_S 0x341 -#define MOVE_G_MAX_CANNONADE_P 0x342 -#define MOVE_G_MAX_CANNONADE_S 0x343 -#define MOVE_G_MAX_BEFUDDLE_P 0x344 -#define MOVE_G_MAX_BEFUDDLE_S 0x345 -#define MOVE_G_MAX_VOLT_CRASH_P 0x346 -#define MOVE_G_MAX_VOLT_CRASH_S 0x347 -#define MOVE_G_MAX_GOLD_RUSH_P 0x348 -#define MOVE_G_MAX_GOLD_RUSH_S 0x349 -#define MOVE_G_MAX_CHI_STRIKE_P 0x34A -#define MOVE_G_MAX_CHI_STRIKE_S 0x34B -#define MOVE_G_MAX_TERROR_P 0x34C -#define MOVE_G_MAX_TERROR_S 0x34D -#define MOVE_G_MAX_FOAM_BURST_P 0x34E -#define MOVE_G_MAX_FOAM_BURST_S 0x34F -#define MOVE_G_MAX_RESONANCE_P 0x350 -#define MOVE_G_MAX_RESONANCE_S 0x351 -#define MOVE_G_MAX_CUDDLE_P 0x352 -#define MOVE_G_MAX_CUDDLE_S 0x353 -#define MOVE_G_MAX_REPLENISH_P 0x354 -#define MOVE_G_MAX_REPLENISH_S 0x355 -#define MOVE_G_MAX_MALODOR_P 0x356 -#define MOVE_G_MAX_MALODOR_S 0x357 -#define MOVE_G_MAX_MELTDOWN_P 0x358 -#define MOVE_G_MAX_MELTDOWN_S 0x359 -#define MOVE_G_MAX_DRUM_SOLO_P 0x35A -#define MOVE_G_MAX_DRUM_SOLO_S 0x35B -#define MOVE_G_MAX_FIREBALL_P 0x35C -#define MOVE_G_MAX_FIREBALL_S 0x35D -#define MOVE_G_MAX_HYDROSNIPE_P 0x35E -#define MOVE_G_MAX_HYDROSNIPE_S 0x35F -#define MOVE_G_MAX_WIND_RAGE_P 0x360 -#define MOVE_G_MAX_WIND_RAGE_S 0x361 -#define MOVE_G_MAX_GRAVITAS_P 0x362 -#define MOVE_G_MAX_GRAVITAS_S 0x363 -#define MOVE_G_MAX_STONESURGE_P 0x364 -#define MOVE_G_MAX_STONESURGE_S 0x365 -#define MOVE_G_MAX_VOLCALITH_P 0x366 -#define MOVE_G_MAX_VOLCALITH_S 0x367 -#define MOVE_G_MAX_TARTNESS_P 0x368 -#define MOVE_G_MAX_TARTNESS_S 0x369 -#define MOVE_G_MAX_SWEETNESS_P 0x36A -#define MOVE_G_MAX_SWEETNESS_S 0x36B -#define MOVE_G_MAX_SANDBLAST_P 0x36C -#define MOVE_G_MAX_SANDBLAST_S 0x36D -#define MOVE_G_MAX_STUN_SHOCK_P 0x36E -#define MOVE_G_MAX_STUN_SHOCK_S 0x36F -#define MOVE_G_MAX_CENTIFERNO_P 0x370 -#define MOVE_G_MAX_CENTIFERNO_S 0x371 -#define MOVE_G_MAX_SMITE_P 0x372 -#define MOVE_G_MAX_SMITE_S 0x373 -#define MOVE_G_MAX_SNOOZE_P 0x374 -#define MOVE_G_MAX_SNOOZE_S 0x375 -#define MOVE_G_MAX_FINALE_P 0x376 -#define MOVE_G_MAX_FINALE_S 0x377 -#define MOVE_G_MAX_STEELSURGE_P 0x378 -#define MOVE_G_MAX_STEELSURGE_S 0x379 -#define MOVE_G_MAX_DEPLETION_P 0x37A -#define MOVE_G_MAX_DEPLETION_S 0x37B -#define MOVE_G_MAX_ONE_BLOW_P 0x37C -#define MOVE_G_MAX_ONE_BLOW_S 0x37D -#define MOVE_G_MAX_RAPID_FLOW_P 0x37E -#define MOVE_G_MAX_RAPID_FLOW_S 0x37F +#define MOVE_MAX_GUARD 0x31C +#define MOVE_MAX_STRIKE_P 0x31D +#define MOVE_MAX_STRIKE_S 0x31E +#define MOVE_MAX_KNUCKLE_P 0x31F +#define MOVE_MAX_KNUCKLE_S 0x320 +#define MOVE_MAX_AIRSTREAM_P 0x321 +#define MOVE_MAX_AIRSTREAM_S 0x322 +#define MOVE_MAX_OOZE_P 0x323 +#define MOVE_MAX_OOZE_S 0x324 +#define MOVE_MAX_QUAKE_P 0x325 +#define MOVE_MAX_QUAKE_S 0x326 +#define MOVE_MAX_ROCKFALL_P 0x327 +#define MOVE_MAX_ROCKFALL_S 0x328 +#define MOVE_MAX_FLUTTERBY_P 0x329 +#define MOVE_MAX_FLUTTERBY_S 0x32A +#define MOVE_MAX_PHANTASM_P 0x32B +#define MOVE_MAX_PHANTASM_S 0x32C +#define MOVE_MAX_STEELSPIKE_P 0x32D +#define MOVE_MAX_STEELSPIKE_S 0x32E +#define MOVE_MAX_FLARE_P 0x32F +#define MOVE_MAX_FLARE_S 0x330 +#define MOVE_MAX_GEYSER_P 0x331 +#define MOVE_MAX_GEYSER_S 0x332 +#define MOVE_MAX_OVERGROWTH_P 0x333 +#define MOVE_MAX_OVERGROWTH_S 0x334 +#define MOVE_MAX_LIGHTNING_P 0x335 +#define MOVE_MAX_LIGHTNING_S 0x336 +#define MOVE_MAX_MINDSTORM_P 0x337 +#define MOVE_MAX_MINDSTORM_S 0x338 +#define MOVE_MAX_HAILSTORM_P 0x339 +#define MOVE_MAX_HAILSTORM_S 0x33A +#define MOVE_MAX_WYRMWIND_P 0x33B +#define MOVE_MAX_WYRMWIND_S 0x33C +#define MOVE_MAX_DARKNESS_P 0x33D +#define MOVE_MAX_DARKNESS_S 0x33E +#define MOVE_MAX_STARFALL_P 0x33F +#define MOVE_MAX_STARFALL_S 0x340 +#define MOVE_G_MAX_VINE_LASH_P 0x341 +#define MOVE_G_MAX_VINE_LASH_S 0x342 +#define MOVE_G_MAX_WILDFIRE_P 0x343 +#define MOVE_G_MAX_WILDFIRE_S 0x344 +#define MOVE_G_MAX_CANNONADE_P 0x345 +#define MOVE_G_MAX_CANNONADE_S 0x346 +#define MOVE_G_MAX_BEFUDDLE_P 0x347 +#define MOVE_G_MAX_BEFUDDLE_S 0x348 +#define MOVE_G_MAX_VOLT_CRASH_P 0x349 +#define MOVE_G_MAX_VOLT_CRASH_S 0x34A +#define MOVE_G_MAX_GOLD_RUSH_P 0x34B +#define MOVE_G_MAX_GOLD_RUSH_S 0x34C +#define MOVE_G_MAX_CHI_STRIKE_P 0x34D +#define MOVE_G_MAX_CHI_STRIKE_S 0x34E +#define MOVE_G_MAX_TERROR_P 0x34F +#define MOVE_G_MAX_TERROR_S 0x350 +#define MOVE_G_MAX_FOAM_BURST_P 0x351 +#define MOVE_G_MAX_FOAM_BURST_S 0x352 +#define MOVE_G_MAX_RESONANCE_P 0x353 +#define MOVE_G_MAX_RESONANCE_S 0x354 +#define MOVE_G_MAX_CUDDLE_P 0x355 +#define MOVE_G_MAX_CUDDLE_S 0x356 +#define MOVE_G_MAX_REPLENISH_P 0x357 +#define MOVE_G_MAX_REPLENISH_S 0x358 +#define MOVE_G_MAX_MALODOR_P 0x359 +#define MOVE_G_MAX_MALODOR_S 0x35A +#define MOVE_G_MAX_MELTDOWN_P 0x35B +#define MOVE_G_MAX_MELTDOWN_S 0x35C +#define MOVE_G_MAX_DRUM_SOLO_P 0x35D +#define MOVE_G_MAX_DRUM_SOLO_S 0x35E +#define MOVE_G_MAX_FIREBALL_P 0x35F +#define MOVE_G_MAX_FIREBALL_S 0x360 +#define MOVE_G_MAX_HYDROSNIPE_P 0x361 +#define MOVE_G_MAX_HYDROSNIPE_S 0x362 +#define MOVE_G_MAX_WIND_RAGE_P 0x363 +#define MOVE_G_MAX_WIND_RAGE_S 0x364 +#define MOVE_G_MAX_GRAVITAS_P 0x365 +#define MOVE_G_MAX_GRAVITAS_S 0x366 +#define MOVE_G_MAX_STONESURGE_P 0x367 +#define MOVE_G_MAX_STONESURGE_S 0x368 +#define MOVE_G_MAX_VOLCALITH_P 0x369 +#define MOVE_G_MAX_VOLCALITH_S 0x36A +#define MOVE_G_MAX_TARTNESS_P 0x36B +#define MOVE_G_MAX_TARTNESS_S 0x36C +#define MOVE_G_MAX_SWEETNESS_P 0x36D +#define MOVE_G_MAX_SWEETNESS_S 0x36E +#define MOVE_G_MAX_SANDBLAST_P 0x36F +#define MOVE_G_MAX_SANDBLAST_S 0x370 +#define MOVE_G_MAX_STUN_SHOCK_P 0x371 +#define MOVE_G_MAX_STUN_SHOCK_S 0x372 +#define MOVE_G_MAX_CENTIFERNO_P 0x373 +#define MOVE_G_MAX_CENTIFERNO_S 0x374 +#define MOVE_G_MAX_SMITE_P 0x375 +#define MOVE_G_MAX_SMITE_S 0x376 +#define MOVE_G_MAX_SNOOZE_P 0x377 +#define MOVE_G_MAX_SNOOZE_S 0x378 +#define MOVE_G_MAX_FINALE_P 0x379 +#define MOVE_G_MAX_FINALE_S 0x37A +#define MOVE_G_MAX_STEELSURGE_P 0x37B +#define MOVE_G_MAX_STEELSURGE_S 0x37C +#define MOVE_G_MAX_DEPLETION_P 0x37D +#define MOVE_G_MAX_DEPLETION_S 0x37E +#define MOVE_G_MAX_ONE_BLOW_P 0x37F +#define MOVE_G_MAX_ONE_BLOW_S 0x380 +#define MOVE_G_MAX_RAPID_FLOW_P 0x381 +#define MOVE_G_MAX_RAPID_FLOW_S 0x382 #define FIRST_MAX_MOVE MOVE_MAX_GUARD #define LAST_MAX_MOVE MOVE_MAX_STARFALL_S @@ -916,4 +919,4 @@ #define LAST_MOVE_INDEX MOVE_G_MAX_RAPID_FLOW_S #define MOVES_COUNT (MOVE_G_MAX_RAPID_FLOW_S + 1) -#define NON_Z_MOVE_COUNT (MOVE_DRAGONENERGY + 1) +#define NON_Z_MOVE_COUNT (MOVE_GLACIALLANCE + 1) diff --git a/include/species.h b/include/species.h index c05bf21..3e623ff 100644 --- a/include/species.h +++ b/include/species.h @@ -1177,86 +1177,89 @@ #define SPECIES_KUBFU 0x49F #define SPECIES_URSHIFU_SINGLE 0x4A0 #define SPECIES_ZARUDE 0x4A1 -#define SPECIES_UNKNOWN_MYTHICAL 0x4A2 -#define SPECIES_CALYREX 0x4A3 -#define SPECIES_REGIELEKI 0x4A4 -#define SPECIES_REGIDRAGO 0x4A5 +#define SPECIES_REGIELEKI 0x4A2 +#define SPECIES_REGIDRAGO 0x4A3 +#define SPECIES_GLASTRIER 0x4A4 +#define SPECIES_SPECTRIER 0x4A5 +#define SPECIES_CALYREX 0x4A6 -#define SPECIES_CRAMORANT_GULPING 0x4A6 -#define SPECIES_CRAMORANT_GORGING 0x4A7 -#define SPECIES_TOXTRICITY_LOW_KEY 0x4A8 -#define SPECIES_SINISTEA_CHIPPED 0x4A9 -#define SPECIES_POLTEAGEIST_CHIPPED 0x4AA -#define SPECIES_ALCREMIE_BERRY 0x4AB -#define SPECIES_ALCREMIE_CLOVER 0x4AC -#define SPECIES_ALCREMIE_FLOWER 0x4AD -#define SPECIES_ALCREMIE_LOVE 0x4AE -#define SPECIES_ALCREMIE_RIBBON 0x4AF -#define SPECIES_ALCREMIE_STAR 0x4B0 -#define SPECIES_EISCUE_NOICE 0x4B1 -#define SPECIES_INDEEDEE_FEMALE 0x4B2 -#define SPECIES_MORPEKO_HANGRY 0x4B3 -#define SPECIES_ZACIAN_CROWNED 0x4B4 -#define SPECIES_ZAMAZENTA_CROWNED 0x4B5 -#define SPECIES_ETERNATUS_ETERNAMAX 0x4B6 -#define SPECIES_URSHIFU_RAPID 0x4B7 +#define SPECIES_CRAMORANT_GULPING 0x4A7 +#define SPECIES_CRAMORANT_GORGING 0x4A8 +#define SPECIES_TOXTRICITY_LOW_KEY 0x4A9 +#define SPECIES_SINISTEA_CHIPPED 0x4AA +#define SPECIES_POLTEAGEIST_CHIPPED 0x4AB +#define SPECIES_ALCREMIE_BERRY 0x4AC +#define SPECIES_ALCREMIE_CLOVER 0x4AD +#define SPECIES_ALCREMIE_FLOWER 0x4AE +#define SPECIES_ALCREMIE_LOVE 0x4AF +#define SPECIES_ALCREMIE_RIBBON 0x4B0 +#define SPECIES_ALCREMIE_STAR 0x4B1 +#define SPECIES_EISCUE_NOICE 0x4B2 +#define SPECIES_INDEEDEE_FEMALE 0x4B3 +#define SPECIES_MORPEKO_HANGRY 0x4B4 +#define SPECIES_ZACIAN_CROWNED 0x4B5 +#define SPECIES_ZAMAZENTA_CROWNED 0x4B6 +#define SPECIES_ETERNATUS_ETERNAMAX 0x4B7 +#define SPECIES_URSHIFU_RAPID 0x4B8 +#define SPECIES_CALYREX_ICE_RIDER 0x4B9 +#define SPECIES_CALYREX_SHADOW_RIDER 0x4BA -#define SPECIES_MEOWTH_G 0x4B8 -#define SPECIES_PONYTA_G 0x4B9 -#define SPECIES_RAPIDASH_G 0x4BA -#define SPECIES_SLOWPOKE_G 0x4BB -#define SPECIES_SLOWBRO_G 0x4BC -#define SPECIES_FARFETCHD_G 0x4BD -#define SPECIES_KOFFING_G 0x4BE -#define SPECIES_WEEZING_G 0x4BF -#define SPECIES_MR_MIME_G 0x4C0 -#define SPECIES_ARTICUNO_G 0x4C1 -#define SPECIES_ZAPDOS_G 0x4C2 -#define SPECIES_MOLTRES_G 0x4C3 -#define SPECIES_SLOWKING_G 0x4C4 -#define SPECIES_CORSOLA_G 0x4C5 -#define SPECIES_ZIGZAGOON_G 0x4C6 -#define SPECIES_LINOONE_G 0x4C7 -#define SPECIES_MIME_JR_G 0x4C8 -#define SPECIES_DARUMAKA_G 0x4C9 -#define SPECIES_DARMANITAN_G 0x4CA -#define SPECIES_DARMANITAN_G_ZEN 0x4CB -#define SPECIES_YAMASK_G 0x4CC -#define SPECIES_STUNFISK_G 0x4CD +#define SPECIES_MEOWTH_G 0x4BB +#define SPECIES_PONYTA_G 0x4BC +#define SPECIES_RAPIDASH_G 0x4BD +#define SPECIES_SLOWPOKE_G 0x4BE +#define SPECIES_SLOWBRO_G 0x4BF +#define SPECIES_FARFETCHD_G 0x4C0 +#define SPECIES_KOFFING_G 0x4C1 +#define SPECIES_WEEZING_G 0x4C2 +#define SPECIES_MR_MIME_G 0x4C3 +#define SPECIES_ARTICUNO_G 0x4C4 +#define SPECIES_ZAPDOS_G 0x4C5 +#define SPECIES_MOLTRES_G 0x4C6 +#define SPECIES_SLOWKING_G 0x4C7 +#define SPECIES_CORSOLA_G 0x4C8 +#define SPECIES_ZIGZAGOON_G 0x4C9 +#define SPECIES_LINOONE_G 0x4CA +#define SPECIES_MIME_JR_G 0x4CB +#define SPECIES_DARUMAKA_G 0x4CC +#define SPECIES_DARMANITAN_G 0x4CD +#define SPECIES_DARMANITAN_G_ZEN 0x4CE +#define SPECIES_YAMASK_G 0x4CF +#define SPECIES_STUNFISK_G 0x4D0 -#define SPECIES_VENUSAUR_GIGA 0x4CE -#define SPECIES_CHARIZARD_GIGA 0x4CF -#define SPECIES_BLASTOISE_GIGA 0x4D0 -#define SPECIES_BUTTERFREE_GIGA 0x4D1 -#define SPECIES_PIKACHU_GIGA 0x4D2 -#define SPECIES_MEOWTH_GIGA 0x4D3 -#define SPECIES_MACHAMP_GIGA 0x4D4 -#define SPECIES_GENGAR_GIGA 0x4D5 -#define SPECIES_KINGLER_GIGA 0x4D6 -#define SPECIES_LAPRAS_GIGA 0x4D7 -#define SPECIES_EEVEE_GIGA 0x4D8 -#define SPECIES_SNORLAX_GIGA 0x4D9 -#define SPECIES_GARBODOR_GIGA 0x4DA -#define SPECIES_MELMETAL_GIGA 0x4DB -#define SPECIES_RILLABOOM_GIGA 0x4DC -#define SPECIES_CINDERACE_GIGA 0x4DD -#define SPECIES_INTELEON_GIGA 0x4DE -#define SPECIES_CORVIKNIGHT_GIGA 0x4DF -#define SPECIES_ORBEETLE_GIGA 0x4E0 -#define SPECIES_DREDNAW_GIGA 0x4E1 -#define SPECIES_COALOSSAL_GIGA 0x4E2 -#define SPECIES_FLAPPLE_GIGA 0x4E3 -#define SPECIES_APPLETUN_GIGA 0x4E4 -#define SPECIES_SANDACONDA_GIGA 0x4E5 -#define SPECIES_TOXTRICITY_GIGA 0x4E6 -#define SPECIES_TOXTRICITY_LOW_KEY_GIGA 0x4E7 -#define SPECIES_CENTISKORCH_GIGA 0x4E8 -#define SPECIES_HATTERENE_GIGA 0x4E9 -#define SPECIES_GRIMMSNARL_GIGA 0x4EA -#define SPECIES_ALCREMIE_GIGA 0x4EB -#define SPECIES_COPPERAJAH_GIGA 0x4EC -#define SPECIES_DURALUDON_GIGA 0x4ED -#define SPECIES_URSHIFU_SINGLE_GIGA 0x4EE -#define SPECIES_URSHIFU_RAPID_GIGA 0x4EF +#define SPECIES_VENUSAUR_GIGA 0x4D1 +#define SPECIES_CHARIZARD_GIGA 0x4D2 +#define SPECIES_BLASTOISE_GIGA 0x4D3 +#define SPECIES_BUTTERFREE_GIGA 0x4D4 +#define SPECIES_PIKACHU_GIGA 0x4D5 +#define SPECIES_MEOWTH_GIGA 0x4D6 +#define SPECIES_MACHAMP_GIGA 0x4D7 +#define SPECIES_GENGAR_GIGA 0x4D8 +#define SPECIES_KINGLER_GIGA 0x4D9 +#define SPECIES_LAPRAS_GIGA 0x4DA +#define SPECIES_EEVEE_GIGA 0x4DB +#define SPECIES_SNORLAX_GIGA 0x4DC +#define SPECIES_GARBODOR_GIGA 0x4DD +#define SPECIES_MELMETAL_GIGA 0x4DE +#define SPECIES_RILLABOOM_GIGA 0x4DF +#define SPECIES_CINDERACE_GIGA 0x4E0 +#define SPECIES_INTELEON_GIGA 0x4E1 +#define SPECIES_CORVIKNIGHT_GIGA 0x4E2 +#define SPECIES_ORBEETLE_GIGA 0x4E3 +#define SPECIES_DREDNAW_GIGA 0x4E4 +#define SPECIES_COALOSSAL_GIGA 0x4E5 +#define SPECIES_FLAPPLE_GIGA 0x4E6 +#define SPECIES_APPLETUN_GIGA 0x4E7 +#define SPECIES_SANDACONDA_GIGA 0x4E8 +#define SPECIES_TOXTRICITY_GIGA 0x4E9 +#define SPECIES_TOXTRICITY_LOW_KEY_GIGA 0x4EA +#define SPECIES_CENTISKORCH_GIGA 0x4EB +#define SPECIES_HATTERENE_GIGA 0x4EC +#define SPECIES_GRIMMSNARL_GIGA 0x4ED +#define SPECIES_ALCREMIE_GIGA 0x4EE +#define SPECIES_COPPERAJAH_GIGA 0x4EF +#define SPECIES_DURALUDON_GIGA 0x4F0 +#define SPECIES_URSHIFU_SINGLE_GIGA 0x4F1 +#define SPECIES_URSHIFU_RAPID_GIGA 0x4F2 #define NUM_SPECIES (SPECIES_URSHIFU_RAPID_GIGA + 1) diff --git a/src/Back_Pic_Coords_Table.c b/src/Back_Pic_Coords_Table.c index 5ee82b2..dda8540 100644 --- a/src/Back_Pic_Coords_Table.c +++ b/src/Back_Pic_Coords_Table.c @@ -4191,12 +4191,12 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES] = [SPECIES_ZYGARDE_10] = { .size = 0x0, - .y_offset = 0x5, + .y_offset = 0x8, }, [SPECIES_ZYGARDE_COMPLETE] = { .size = 0x0, - .y_offset = 0x0, + .y_offset = 0x3, }, [SPECIES_ASHGRENINJA] = { @@ -5081,7 +5081,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES] = [SPECIES_KARTANA] = { .size = 0x0, - .y_offset = 0xd, + .y_offset = 0xB, }, [SPECIES_GUZZLORD] = { @@ -5928,17 +5928,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES] = .size = 0x0, .y_offset = 0x0, }, - [SPECIES_ZARUDE] = - { - .size = 0x0, - .y_offset = 0x0, - }, - [SPECIES_UNKNOWN_MYTHICAL] = - { - .size = 0x0, - .y_offset = 0x0, - }, - [SPECIES_CALYREX] = + [SPECIES_ZARUDE] = { .size = 0x0, .y_offset = 0x0, @@ -5953,6 +5943,21 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES] = .size = 0x0, .y_offset = 0x0, }, + [SPECIES_GLASTRIER] = + { + .size = 0x0, + .y_offset = 0x0, + }, + [SPECIES_SPECTRIER] = + { + .size = 0x0, + .y_offset = 0x0, + }, + [SPECIES_CALYREX] = + { + .size = 0x0, + .y_offset = 0x0, + }, [SPECIES_CRAMORANT_GULPING] = { .size = 0x0, diff --git a/src/Base_Stats.c b/src/Base_Stats.c index 6ac2e1e..9dcc30a 100644 --- a/src/Base_Stats.c +++ b/src/Base_Stats.c @@ -337,7 +337,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_SHIELDDUST, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_RUNAWAY, + .hiddenAbility = ABILITY_TECHNICIAN, .noFlip = TRUE, }, @@ -434,9 +434,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_BUG, .eggGroup2 = EGG_GROUP_BUG, .ability1 = ABILITY_SHIELDDUST, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_SHIELDDUST, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_RUNAWAY, + .hiddenAbility = ABILITY_TECHNICIAN, .noFlip = TRUE, }, @@ -467,7 +467,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_BUG, .eggGroup2 = EGG_GROUP_BUG, .ability1 = ABILITY_SHEDSKIN, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_SHEDSKIN, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_SHEDSKIN, .noFlip = TRUE, @@ -500,9 +500,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_BUG, .eggGroup2 = EGG_GROUP_BUG, .ability1 = ABILITY_SWARM, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_SNIPER, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_SNIPER, + .hiddenAbility = ABILITY_TECHNICIAN, .noFlip = TRUE, }, @@ -535,7 +535,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_KEENEYE, .ability2 = ABILITY_TANGLEDFEET, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_BIGPECKS, + .hiddenAbility = ABILITY_GALEWINGS, .noFlip = TRUE, }, @@ -568,7 +568,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_KEENEYE, .ability2 = ABILITY_TANGLEDFEET, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_BIGPECKS, + .hiddenAbility = ABILITY_GALEWINGS, .noFlip = TRUE, }, @@ -601,7 +601,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_KEENEYE, .ability2 = ABILITY_TANGLEDFEET, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_BIGPECKS, + .hiddenAbility = ABILITY_GALEWINGS, .noFlip = TRUE, }, @@ -631,10 +631,10 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, - .ability1 = ABILITY_RUNAWAY, + .ability1 = ABILITY_HUSTLE, .ability2 = ABILITY_GUTS, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_HUSTLE, + .hiddenAbility = ABILITY_STRONGJAW, .noFlip = TRUE, }, @@ -664,10 +664,10 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, - .ability1 = ABILITY_RUNAWAY, + .ability1 = ABILITY_HUSTLE, .ability2 = ABILITY_GUTS, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_HUSTLE, + .hiddenAbility = ABILITY_STRONGJAW, .noFlip = TRUE, }, @@ -698,9 +698,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FLYING, .eggGroup2 = EGG_GROUP_FLYING, .ability1 = ABILITY_KEENEYE, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_SNIPER, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_SNIPER, + .hiddenAbility = ABILITY_DEFIANT, .noFlip = TRUE, }, @@ -731,9 +731,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FLYING, .eggGroup2 = EGG_GROUP_FLYING, .ability1 = ABILITY_KEENEYE, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_SNIPER, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_SNIPER, + .hiddenAbility = ABILITY_DEFIANT, .noFlip = TRUE, }, @@ -766,7 +766,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_INTIMIDATE, .ability2 = ABILITY_SHEDSKIN, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_UNNERVE, + .hiddenAbility = ABILITY_MERCILESS, .noFlip = TRUE, }, @@ -799,7 +799,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_INTIMIDATE, .ability2 = ABILITY_SHEDSKIN, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_UNNERVE, + .hiddenAbility = ABILITY_MERCILESS, .noFlip = TRUE, }, @@ -896,7 +896,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, .ability1 = ABILITY_SANDVEIL, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_SANDFORCE, .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_NONE, + .ability2 = ABILITY_SANDFORCE, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_SANDRUSH, .noFlip = TRUE, @@ -1294,7 +1294,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_CUTECHARM, .ability2 = ABILITY_COMPETITIVE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_FRIENDGUARD, + .hiddenAbility = ABILITY_DAZZLING, .noFlip = TRUE, }, @@ -1327,7 +1327,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_CUTECHARM, .ability2 = ABILITY_COMPETITIVE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_FRISK, + .hiddenAbility = ABILITY_DAZZLING, .noFlip = TRUE, }, @@ -1525,7 +1525,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_EFFECTSPORE, .ability2 = ABILITY_DRYSKIN, .safariZoneFleeRate = 50, - .hiddenAbility = ABILITY_DAMP, + .hiddenAbility = ABILITY_TOXICBOOST, .noFlip = TRUE, }, @@ -1558,7 +1558,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_EFFECTSPORE, .ability2 = ABILITY_DRYSKIN, .safariZoneFleeRate = 75, - .hiddenAbility = ABILITY_DAMP, + .hiddenAbility = ABILITY_TOXICBOOST, .noFlip = TRUE, }, @@ -1756,7 +1756,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_LIMBER, .ability2 = ABILITY_TECHNICIAN, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_UNNERVE, + .hiddenAbility = ABILITY_FURCOAT, .noFlip = TRUE, }, @@ -1786,10 +1786,10 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_WATER_1, .eggGroup2 = EGG_GROUP_FIELD, - .ability1 = ABILITY_DAMP, + .ability1 = ABILITY_SWIFTSWIM, .ability2 = ABILITY_CLOUDNINE, .safariZoneFleeRate = 50, - .hiddenAbility = ABILITY_SWIFTSWIM, + .hiddenAbility = ABILITY_DAMP, .noFlip = TRUE, }, @@ -1819,10 +1819,10 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_WATER_1, .eggGroup2 = EGG_GROUP_FIELD, - .ability1 = ABILITY_DAMP, + .ability1 = ABILITY_SWIFTSWIM, .ability2 = ABILITY_CLOUDNINE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_SWIFTSWIM, + .hiddenAbility = ABILITY_NEUROFORCE, .noFlip = TRUE, }, @@ -2168,7 +2168,7 @@ const struct BaseStats gBaseStats[] = .type2 = TYPE_FIGHTING, .catchRate = 180, .expYield = 75, - .evYield_HP = 1, + .evYield_HP = 0, .evYield_Attack = 1, .evYield_Defense = 0, .evYield_SpAttack = 0, @@ -2185,7 +2185,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_GUTS, .ability2 = ABILITY_NOGUARD, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_STEADFAST, + .hiddenAbility = ABILITY_IRONFIST, .noFlip = TRUE, }, @@ -2218,7 +2218,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_GUTS, .ability2 = ABILITY_NOGUARD, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_STEADFAST, + .hiddenAbility = ABILITY_IRONFIST, .noFlip = TRUE, }, @@ -2251,7 +2251,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_GUTS, .ability2 = ABILITY_NOGUARD, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_STEADFAST, + .hiddenAbility = ABILITY_IRONFIST, .noFlip = TRUE, }, @@ -2282,9 +2282,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_GRASS, .eggGroup2 = EGG_GROUP_GRASS, .ability1 = ABILITY_CHLOROPHYLL, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_GLUTTONY, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_GLUTTONY, + .hiddenAbility = ABILITY_UNNERVE, .noFlip = TRUE, }, @@ -2315,9 +2315,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_GRASS, .eggGroup2 = EGG_GROUP_GRASS, .ability1 = ABILITY_CHLOROPHYLL, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_GLUTTONY, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_GLUTTONY, + .hiddenAbility = ABILITY_UNNERVE, .noFlip = TRUE, }, @@ -2348,9 +2348,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_GRASS, .eggGroup2 = EGG_GROUP_GRASS, .ability1 = ABILITY_CHLOROPHYLL, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_GLUTTONY, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_GLUTTONY, + .hiddenAbility = ABILITY_CORROSION, .noFlip = TRUE, }, @@ -2449,7 +2449,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_ROCKHEAD, .ability2 = ABILITY_STURDY, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_SANDVEIL, + .hiddenAbility = ABILITY_SANDSPIT, .noFlip = TRUE, }, @@ -2482,7 +2482,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_ROCKHEAD, .ability2 = ABILITY_STURDY, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_SANDVEIL, + .hiddenAbility = ABILITY_SANDSPIT, .noFlip = TRUE, }, @@ -2515,7 +2515,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_ROCKHEAD, .ability2 = ABILITY_STURDY, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_SANDVEIL, + .hiddenAbility = ABILITY_SANDSPIT, .noFlip = TRUE, }, @@ -2545,10 +2545,10 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, - .ability1 = ABILITY_RUNAWAY, + .ability1 = ABILITY_FLAMEBODY, .ability2 = ABILITY_FLASHFIRE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_FLAMEBODY, + .hiddenAbility = ABILITY_RECKLESS, .noFlip = TRUE, }, @@ -2578,10 +2578,10 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, - .ability1 = ABILITY_RUNAWAY, + .ability1 = ABILITY_FLAMEBODY, .ability2 = ABILITY_FLASHFIRE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_FLAMEBODY, + .hiddenAbility = ABILITY_RECKLESS, .noFlip = TRUE, }, @@ -2743,7 +2743,7 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_FLYING, .eggGroup2 = EGG_GROUP_FIELD, - .ability1 = ABILITY_KEENEYE, + .ability1 = ABILITY_SCRAPPY, .ability2 = ABILITY_INNERFOCUS, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_DEFIANT, @@ -2776,10 +2776,10 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_FLYING, .eggGroup2 = EGG_GROUP_FLYING, - .ability1 = ABILITY_RUNAWAY, + .ability1 = ABILITY_TANGLEDFEET, .ability2 = ABILITY_EARLYBIRD, .safariZoneFleeRate = 50, - .hiddenAbility = ABILITY_TANGLEDFEET, + .hiddenAbility = ABILITY_RECKLESS, .noFlip = TRUE, }, @@ -2809,10 +2809,10 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_FLYING, .eggGroup2 = EGG_GROUP_FLYING, - .ability1 = ABILITY_RUNAWAY, + .ability1 = ABILITY_TANGLEDFEET, .ability2 = ABILITY_EARLYBIRD, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_TANGLEDFEET, + .hiddenAbility = ABILITY_RECKLESS, .noFlip = TRUE, }, @@ -2843,9 +2843,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_WATER_1, .eggGroup2 = EGG_GROUP_FIELD, .ability1 = ABILITY_THICKFAT, - .ability2 = ABILITY_HYDRATION, + .ability2 = ABILITY_ICEBODY, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_ICEBODY, + .hiddenAbility = ABILITY_ICESCALES, .noFlip = TRUE, }, @@ -2876,9 +2876,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_WATER_1, .eggGroup2 = EGG_GROUP_FIELD, .ability1 = ABILITY_THICKFAT, - .ability2 = ABILITY_HYDRATION, + .ability2 = ABILITY_ICEBODY, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_ICEBODY, + .hiddenAbility = ABILITY_ICESCALES, .noFlip = TRUE, }, @@ -2908,7 +2908,7 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_AMORPHOUS, .eggGroup2 = EGG_GROUP_AMORPHOUS, - .ability1 = ABILITY_STENCH, + .ability1 = ABILITY_GOOEY, .ability2 = ABILITY_STICKYHOLD, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_POISONTOUCH, @@ -2941,7 +2941,7 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_AMORPHOUS, .eggGroup2 = EGG_GROUP_AMORPHOUS, - .ability1 = ABILITY_STENCH, + .ability1 = ABILITY_GOOEY, .ability2 = ABILITY_STICKYHOLD, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_POISONTOUCH, @@ -3173,9 +3173,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_HUMAN_LIKE, .eggGroup2 = EGG_GROUP_HUMAN_LIKE, .ability1 = ABILITY_INSOMNIA, - .ability2 = ABILITY_FOREWARN, + .ability2 = ABILITY_INNERFOCUS, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_INNERFOCUS, + .hiddenAbility = ABILITY_FOREWARN, .noFlip = TRUE, }, @@ -3206,9 +3206,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_HUMAN_LIKE, .eggGroup2 = EGG_GROUP_HUMAN_LIKE, .ability1 = ABILITY_INSOMNIA, - .ability2 = ABILITY_FOREWARN, + .ability2 = ABILITY_INNERFOCUS, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_INNERFOCUS, + .hiddenAbility = ABILITY_PSYCHICSURGE, .noFlip = TRUE, }, @@ -3571,7 +3571,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_OWNTEMPO, .ability2 = ABILITY_OBLIVIOUS, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_CLOUDNINE, + .hiddenAbility = ABILITY_THICKFAT, .noFlip = TRUE, }, @@ -3604,7 +3604,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_LEVITATE, .ability2 = ABILITY_NEUTRALIZINGGAS, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_STENCH, .noFlip = TRUE, }, @@ -3637,7 +3637,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_LEVITATE, .ability2 = ABILITY_NEUTRALIZINGGAS, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_STENCH, .noFlip = TRUE, }, @@ -3964,7 +3964,7 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_SLOW, .eggGroup1 = EGG_GROUP_WATER_3, .eggGroup2 = EGG_GROUP_WATER_3, - .ability1 = ABILITY_ILLUMINATE, + .ability1 = ABILITY_VICTORYSTAR, .ability2 = ABILITY_NATURALCURE, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_ANALYTIC, @@ -3997,7 +3997,7 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_SLOW, .eggGroup1 = EGG_GROUP_WATER_3, .eggGroup2 = EGG_GROUP_WATER_3, - .ability1 = ABILITY_ILLUMINATE, + .ability1 = ABILITY_VICTORYSTAR, .ability2 = ABILITY_NATURALCURE, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_ANALYTIC, @@ -4097,9 +4097,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_HUMAN_LIKE, .eggGroup2 = EGG_GROUP_HUMAN_LIKE, .ability1 = ABILITY_OBLIVIOUS, - .ability2 = ABILITY_FOREWARN, + .ability2 = ABILITY_DRYSKIN, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_DRYSKIN, + .hiddenAbility = ABILITY_ICESCALES, .noFlip = TRUE, }, @@ -4759,7 +4759,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_PRESSURE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_SNOWCLOAK, + .hiddenAbility = ABILITY_COMPETITIVE, .noFlip = TRUE, }, @@ -4792,7 +4792,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_PRESSURE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_STATIC, + .hiddenAbility = ABILITY_DEFIANT, .noFlip = TRUE, }, @@ -4825,7 +4825,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_PRESSURE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_FLAMEBODY, + .hiddenAbility = ABILITY_BERSERK, .noFlip = TRUE, }, @@ -4990,7 +4990,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_SYNCHRONIZE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_MAGICGUARD, .noFlip = TRUE, }, @@ -5089,7 +5089,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_OVERGROW, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_LEAFGUARD, + .hiddenAbility = ABILITY_GRASSYSURGE, .noFlip = TRUE, }, @@ -5188,7 +5188,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_BLAZE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_FLASHFIRE, + .hiddenAbility = ABILITY_DROUGHT, .noFlip = TRUE, }, @@ -5317,10 +5317,10 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, - .ability1 = ABILITY_RUNAWAY, + .ability1 = ABILITY_FRISK, .ability2 = ABILITY_KEENEYE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_FRISK, + .hiddenAbility = ABILITY_HUSTLE, .noFlip = TRUE, }, @@ -5350,10 +5350,10 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, - .ability1 = ABILITY_RUNAWAY, + .ability1 = ABILITY_FRISK, .ability2 = ABILITY_KEENEYE, .safariZoneFleeRate = 90, - .hiddenAbility = ABILITY_FRISK, + .hiddenAbility = ABILITY_HUSTLE, .noFlip = TRUE, }, @@ -5450,9 +5450,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_BUG, .eggGroup2 = EGG_GROUP_BUG, .ability1 = ABILITY_SWARM, - .ability2 = ABILITY_EARLYBIRD, + .ability2 = ABILITY_RATTLED, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_RATTLED, + .hiddenAbility = ABILITY_HUGEPOWER, .noFlip = TRUE, }, @@ -5485,7 +5485,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_SWARM, .ability2 = ABILITY_EARLYBIRD, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_IRONFIST, + .hiddenAbility = ABILITY_HUGEPOWER, .noFlip = TRUE, }, @@ -5515,10 +5515,10 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_FAST, .eggGroup1 = EGG_GROUP_BUG, .eggGroup2 = EGG_GROUP_BUG, - .ability1 = ABILITY_SWARM, + .ability1 = ABILITY_SNIPER, .ability2 = ABILITY_INSOMNIA, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_SNIPER, + .hiddenAbility = ABILITY_MERCILESS, .noFlip = TRUE, }, @@ -5548,10 +5548,10 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_FAST, .eggGroup1 = EGG_GROUP_BUG, .eggGroup2 = EGG_GROUP_BUG, - .ability1 = ABILITY_SWARM, + .ability1 = ABILITY_SNIPER, .ability2 = ABILITY_INSOMNIA, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_SNIPER, + .hiddenAbility = ABILITY_MERCILESS, .noFlip = TRUE, }, @@ -5615,9 +5615,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_WATER_2, .eggGroup2 = EGG_GROUP_WATER_2, .ability1 = ABILITY_VOLTABSORB, - .ability2 = ABILITY_ILLUMINATE, + .ability2 = ABILITY_WATERABSORB, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_WATERABSORB, + .hiddenAbility = ABILITY_LIGHTNINGROD, .noFlip = TRUE, }, @@ -5648,9 +5648,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_WATER_2, .eggGroup2 = EGG_GROUP_WATER_2, .ability1 = ABILITY_VOLTABSORB, - .ability2 = ABILITY_ILLUMINATE, + .ability2 = ABILITY_WATERABSORB, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_WATERABSORB, + .hiddenAbility = ABILITY_LIGHTNINGROD, .noFlip = TRUE, }, @@ -5681,7 +5681,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_UNDISCOVERED, .eggGroup2 = EGG_GROUP_UNDISCOVERED, .ability1 = ABILITY_STATIC, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_STATIC, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_LIGHTNINGROD, .noFlip = TRUE, @@ -5914,7 +5914,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_STATIC, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_PLUS, + .hiddenAbility = ABILITY_LIGHTNINGROD, .noFlip = TRUE, }, @@ -5947,7 +5947,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_STATIC, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_PLUS, + .hiddenAbility = ABILITY_LIGHTNINGROD, .noFlip = TRUE, }, @@ -5980,7 +5980,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_STATIC, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_PLUS, + .hiddenAbility = ABILITY_LIGHTNINGROD, .noFlip = TRUE, }, @@ -6013,7 +6013,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_CHLOROPHYLL, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_HEALER, + .hiddenAbility = ABILITY_TRIAGE, .noFlip = TRUE, }, @@ -6112,7 +6112,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_STURDY, .ability2 = ABILITY_ROCKHEAD, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_RATTLED, + .hiddenAbility = ABILITY_SAPSIPPER, .noFlip = TRUE, }, @@ -6176,9 +6176,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FAIRY, .eggGroup2 = EGG_GROUP_GRASS, .ability1 = ABILITY_CHLOROPHYLL, - .ability2 = ABILITY_LEAFGUARD, + .ability2 = ABILITY_INFILTRATOR, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_INFILTRATOR, + .hiddenAbility = ABILITY_LEAFGUARD, .noFlip = TRUE, }, @@ -6209,9 +6209,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FAIRY, .eggGroup2 = EGG_GROUP_GRASS, .ability1 = ABILITY_CHLOROPHYLL, - .ability2 = ABILITY_LEAFGUARD, + .ability2 = ABILITY_INFILTRATOR, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_INFILTRATOR, + .hiddenAbility = ABILITY_LEAFGUARD, .noFlip = TRUE, }, @@ -6242,9 +6242,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FAIRY, .eggGroup2 = EGG_GROUP_GRASS, .ability1 = ABILITY_CHLOROPHYLL, - .ability2 = ABILITY_LEAFGUARD, + .ability2 = ABILITY_INFILTRATOR, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_INFILTRATOR, + .hiddenAbility = ABILITY_COTTONDOWN, .noFlip = TRUE, }, @@ -6607,7 +6607,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_LEVITATE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_MAGICIAN, .noFlip = TRUE, }, @@ -6640,7 +6640,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_LEVITATE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_ADAPTABILITY, .noFlip = TRUE, }, @@ -6704,9 +6704,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, .ability1 = ABILITY_INNERFOCUS, - .ability2 = ABILITY_EARLYBIRD, + .ability2 = ABILITY_SAPSIPPER, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_SAPSIPPER, + .hiddenAbility = ABILITY_SPEEDBOOST, .noFlip = TRUE, }, @@ -6904,7 +6904,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_INTIMIDATE, .ability2 = ABILITY_RUNAWAY, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_RATTLED, + .hiddenAbility = ABILITY_STRONGJAW, .noFlip = TRUE, }, @@ -6937,7 +6937,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_INTIMIDATE, .ability2 = ABILITY_QUICKFEET, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_RATTLED, + .hiddenAbility = ABILITY_STRONGJAW, .noFlip = TRUE, }, @@ -7088,9 +7088,9 @@ const struct BaseStats gBaseStats[] = .evYield_HP = 0, .evYield_Attack = 0, .evYield_Defense = 0, - .evYield_SpAttack = 1, + .evYield_SpAttack = 0, .evYield_SpDefense = 0, - .evYield_Speed = 2, + .evYield_Speed = 1, .item1 = ITEM_GRIP_CLAW, .item2 = ITEM_QUICK_CLAW, .genderRatio = PERCENT_FEMALE(50), @@ -7168,7 +7168,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_GUTS, .ability2 = ABILITY_QUICKFEET, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_UNNERVE, + .hiddenAbility = ABILITY_TOUGHCLAWS, .noFlip = TRUE, }, @@ -7250,7 +7250,7 @@ const struct BaseStats gBaseStats[] = .type2 = TYPE_GROUND, .catchRate = 225, .expYield = 78, - .evYield_HP = 1, + .evYield_HP = 0, .evYield_Attack = 1, .evYield_Defense = 0, .evYield_SpAttack = 0, @@ -7364,7 +7364,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_WATER_1, .eggGroup2 = EGG_GROUP_WATER_2, .ability1 = ABILITY_HUSTLE, - .ability2 = ABILITY_SNIPER, + .ability2 = ABILITY_SKILLLINK, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_MOODY, .noFlip = TRUE, @@ -7397,7 +7397,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_WATER_1, .eggGroup2 = EGG_GROUP_WATER_2, .ability1 = ABILITY_SUCTIONCUPS, - .ability2 = ABILITY_SNIPER, + .ability2 = ABILITY_SKILLLINK, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_MOODY, .noFlip = TRUE, @@ -7432,7 +7432,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_VITALSPIRIT, .ability2 = ABILITY_HUSTLE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_INSOMNIA, + .hiddenAbility = ABILITY_PRANKSTER, .noFlip = TRUE, }, @@ -7528,7 +7528,7 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_SLOW, .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, - .ability1 = ABILITY_EARLYBIRD, + .ability1 = ABILITY_MOXIE, .ability2 = ABILITY_FLASHFIRE, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_UNNERVE, @@ -7561,7 +7561,7 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_SLOW, .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, - .ability1 = ABILITY_EARLYBIRD, + .ability1 = ABILITY_MOXIE, .ability2 = ABILITY_FLASHFIRE, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_UNNERVE, @@ -7727,9 +7727,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, .ability1 = ABILITY_INTIMIDATE, - .ability2 = ABILITY_FRISK, + .ability2 = ABILITY_SAPSIPPER, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_SAPSIPPER, + .hiddenAbility = ABILITY_SCRAPPY, .noFlip = TRUE, }, @@ -7760,7 +7760,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, .ability1 = ABILITY_OWNTEMPO, - .ability2 = ABILITY_TECHNICIAN, + .ability2 = ABILITY_TRACE, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_MOODY, .noFlip = TRUE, @@ -7859,9 +7859,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_UNDISCOVERED, .eggGroup2 = EGG_GROUP_UNDISCOVERED, .ability1 = ABILITY_OBLIVIOUS, - .ability2 = ABILITY_FOREWARN, + .ability2 = ABILITY_HYDRATION, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_HYDRATION, + .hiddenAbility = ABILITY_ICESCALES, .noFlip = TRUE, }, @@ -8290,7 +8290,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_NATURALCURE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_REGENERATOR, .noFlip = TRUE, }, @@ -8623,9 +8623,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, .ability1 = ABILITY_RUNAWAY, - .ability2 = ABILITY_QUICKFEET, + .ability2 = ABILITY_STRONGJAW, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_RATTLED, + .hiddenAbility = ABILITY_QUICKFEET, .noFlip = TRUE, }, @@ -8656,7 +8656,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, .ability1 = ABILITY_INTIMIDATE, - .ability2 = ABILITY_QUICKFEET, + .ability2 = ABILITY_STRONGJAW, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_MOXIE, .noFlip = TRUE, @@ -8757,7 +8757,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_SHIELDDUST, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_RUNAWAY, + .hiddenAbility = ABILITY_TECHNICIAN, .noFlip = TRUE, }, @@ -8823,7 +8823,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_SWARM, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_RIVALRY, + .hiddenAbility = ABILITY_COMPOUNDEYES, .noFlip = TRUE, }, @@ -8889,7 +8889,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_SHIELDDUST, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_COMPOUNDEYES, + .hiddenAbility = ABILITY_TINTEDLENS, .noFlip = TRUE, }, @@ -9349,7 +9349,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_HUMAN_LIKE, .ability1 = ABILITY_OWNTEMPO, - .ability2 = ABILITY_TANGLEDFEET, + .ability2 = ABILITY_HUGEPOWER, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_CONTRARY, .noFlip = TRUE, @@ -9448,7 +9448,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_WATER_1, .eggGroup2 = EGG_GROUP_BUG, .ability1 = ABILITY_SWIFTSWIM, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_SWIFTSWIM, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_RAINDISH, .noFlip = TRUE, @@ -9481,7 +9481,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_WATER_1, .eggGroup2 = EGG_GROUP_BUG, .ability1 = ABILITY_INTIMIDATE, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_COMPOUNDEYES, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_UNNERVE, .noFlip = TRUE, @@ -9516,7 +9516,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_WATERVEIL, .ability2 = ABILITY_OBLIVIOUS, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_PRESSURE, + .hiddenAbility = ABILITY_REGENERATOR, .noFlip = TRUE, }, @@ -9549,7 +9549,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_WATERVEIL, .ability2 = ABILITY_OBLIVIOUS, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_PRESSURE, + .hiddenAbility = ABILITY_REGENERATOR, .noFlip = TRUE, }, @@ -9681,7 +9681,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_LEVITATE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_SHADOWSHIELD, .noFlip = TRUE, }, @@ -9714,7 +9714,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_LEVITATE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_SHADOWSHIELD, .noFlip = TRUE, }, @@ -9910,9 +9910,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_WATER_2, .eggGroup2 = EGG_GROUP_WATER_2, .ability1 = ABILITY_SWIFTSWIM, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_HYDRATION, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_HYDRATION, + .hiddenAbility = ABILITY_DRIZZLE, .noFlip = TRUE, }, @@ -10176,7 +10176,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_LEVITATE, .ability2 = ABILITY_LEVITATE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_PUNKROCK, .noFlip = TRUE, }, @@ -10209,7 +10209,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_LEVITATE, .ability2 = ABILITY_LEVITATE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_PUNKROCK, .noFlip = TRUE, }, @@ -10308,7 +10308,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_STATIC, .ability2 = ABILITY_LIGHTNINGROD, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_MINUS, + .hiddenAbility = ABILITY_FLAREBOOST, .noFlip = TRUE, }, @@ -10341,7 +10341,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_STATIC, .ability2 = ABILITY_LIGHTNINGROD, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_MINUS, + .hiddenAbility = ABILITY_FLAREBOOST, .noFlip = TRUE, }, @@ -10440,7 +10440,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_THICKFAT, .ability2 = ABILITY_ICEBODY, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_OBLIVIOUS, + .hiddenAbility = ABILITY_ICESCALES, .noFlip = TRUE, }, @@ -10473,7 +10473,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_THICKFAT, .ability2 = ABILITY_ICEBODY, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_OBLIVIOUS, + .hiddenAbility = ABILITY_ICESCALES, .noFlip = TRUE, }, @@ -10506,7 +10506,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_THICKFAT, .ability2 = ABILITY_ICEBODY, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_OBLIVIOUS, + .hiddenAbility = ABILITY_REGENERATOR, .noFlip = TRUE, }, @@ -10537,9 +10537,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_GRASS, .eggGroup2 = EGG_GROUP_HUMAN_LIKE, .ability1 = ABILITY_SANDVEIL, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_WATERABSORB, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_WATERABSORB, + .hiddenAbility = ABILITY_PRANKSTER, .noFlip = TRUE, }, @@ -10570,9 +10570,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_GRASS, .eggGroup2 = EGG_GROUP_HUMAN_LIKE, .ability1 = ABILITY_SANDVEIL, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_WATERABSORB, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_WATERABSORB, + .hiddenAbility = ABILITY_PRANKSTER, .noFlip = TRUE, }, @@ -10728,7 +10728,7 @@ const struct BaseStats gBaseStats[] = .evYield_Speed = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = PERCENT_FEMALE(75), + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 10, .friendship = 50, .growthRate = GROWTH_FAST, @@ -10770,7 +10770,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_THICKFAT, .ability2 = ABILITY_OWNTEMPO, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_GLUTTONY, + .hiddenAbility = ABILITY_MAGICBOUNCE, .noFlip = TRUE, }, @@ -10803,7 +10803,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_THICKFAT, .ability2 = ABILITY_OWNTEMPO, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_GLUTTONY, + .hiddenAbility = ABILITY_MAGICBOUNCE, .noFlip = TRUE, }, @@ -10834,9 +10834,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FAIRY, .eggGroup2 = EGG_GROUP_FAIRY, .ability1 = ABILITY_PLUS, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_LIGHTNINGROD, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_LIGHTNINGROD, + .hiddenAbility = ABILITY_ELECTRICSURGE, .noFlip = TRUE, }, @@ -10867,9 +10867,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FAIRY, .eggGroup2 = EGG_GROUP_FAIRY, .ability1 = ABILITY_MINUS, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_VOLTABSORB, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_VOLTABSORB, + .hiddenAbility = ABILITY_ELECTRICSURGE, .noFlip = TRUE, }, @@ -11295,7 +11295,7 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_FLUCTUATING, .eggGroup1 = EGG_GROUP_AMORPHOUS, .eggGroup2 = EGG_GROUP_AMORPHOUS, - .ability1 = ABILITY_LIQUIDOOZE, + .ability1 = ABILITY_GOOEY, .ability2 = ABILITY_STICKYHOLD, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_GLUTTONY, @@ -11328,7 +11328,7 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_FLUCTUATING, .eggGroup1 = EGG_GROUP_AMORPHOUS, .eggGroup2 = EGG_GROUP_AMORPHOUS, - .ability1 = ABILITY_LIQUIDOOZE, + .ability1 = ABILITY_GOOEY, .ability2 = ABILITY_STICKYHOLD, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_GLUTTONY, @@ -11362,7 +11362,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_MONSTER, .eggGroup2 = EGG_GROUP_GRASS, .ability1 = ABILITY_CHLOROPHYLL, - .ability2 = ABILITY_SOLARPOWER, + .ability2 = ABILITY_RIPEN, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_HARVEST, .noFlip = TRUE, @@ -11395,7 +11395,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_MONSTER, .eggGroup2 = EGG_GROUP_FIELD, .ability1 = ABILITY_SOUNDPROOF, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_PUNKROCK, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_RATTLED, .noFlip = TRUE, @@ -11428,7 +11428,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_MONSTER, .eggGroup2 = EGG_GROUP_FIELD, .ability1 = ABILITY_SOUNDPROOF, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_PUNKROCK, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_SCRAPPY, .noFlip = TRUE, @@ -11461,7 +11461,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_MONSTER, .eggGroup2 = EGG_GROUP_FIELD, .ability1 = ABILITY_SOUNDPROOF, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_PUNKROCK, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_SCRAPPY, .noFlip = TRUE, @@ -11692,9 +11692,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_DRAGON, .ability1 = ABILITY_SHEDSKIN, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_INFILTRATOR, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_INFILTRATOR, + .hiddenAbility = ABILITY_POISONTOUCH, .noFlip = TRUE, }, @@ -11725,9 +11725,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, .ability1 = ABILITY_IMMUNITY, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_TOXICBOOST, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_TOXICBOOST, + .hiddenAbility = ABILITY_TOUGHCLAWS, .noFlip = TRUE, }, @@ -11989,7 +11989,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_WATER_3, .eggGroup2 = EGG_GROUP_WATER_3, .ability1 = ABILITY_SUCTIONCUPS, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_SIMPLE, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_STORMDRAIN, .noFlip = TRUE, @@ -12022,7 +12022,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_WATER_3, .eggGroup2 = EGG_GROUP_WATER_3, .ability1 = ABILITY_SUCTIONCUPS, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_SIMPLE, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_STORMDRAIN, .noFlip = TRUE, @@ -12055,7 +12055,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_WATER_3, .eggGroup2 = EGG_GROUP_WATER_3, .ability1 = ABILITY_BATTLEARMOR, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_TOUGHCLAWS, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_SWIFTSWIM, .noFlip = TRUE, @@ -12088,7 +12088,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_WATER_3, .eggGroup2 = EGG_GROUP_WATER_3, .ability1 = ABILITY_BATTLEARMOR, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_TOUGHCLAWS, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_SWIFTSWIM, .noFlip = TRUE, @@ -12453,7 +12453,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_CLEARBODY, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_ICEBODY, + .hiddenAbility = ABILITY_FILTER, .noFlip = TRUE, }, @@ -12486,7 +12486,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_CLEARBODY, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_LIGHTMETAL, + .hiddenAbility = ABILITY_FILTER, .noFlip = TRUE, }, @@ -12519,7 +12519,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_DRIZZLE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_HYDRATION, .noFlip = TRUE, }, @@ -12552,7 +12552,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_DROUGHT, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_HEATPROOF, .noFlip = TRUE, }, @@ -12585,7 +12585,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_AIRLOCK, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_SHEDSKIN, .noFlip = TRUE, }, @@ -12618,7 +12618,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_LEVITATE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_SERENEGRACE, .noFlip = TRUE, }, @@ -12651,7 +12651,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_LEVITATE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_SERENEGRACE, .noFlip = TRUE, }, @@ -12684,7 +12684,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_SERENEGRACE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_TRACE, .noFlip = TRUE, }, @@ -12717,7 +12717,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_PRESSURE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_LIMBER, .noFlip = TRUE, }, @@ -12750,7 +12750,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_LEVITATE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_PSYCHICSURGE, .noFlip = TRUE, }, @@ -14169,7 +14169,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_SHEDSKIN, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_RUNAWAY, + .hiddenAbility = ABILITY_TECHNICIAN, .noFlip = TRUE, }, @@ -14398,7 +14398,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_MONSTER, .eggGroup2 = EGG_GROUP_MONSTER, .ability1 = ABILITY_MOLDBREAKER, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_RECKLESS, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_SHEERFORCE, .noFlip = TRUE, @@ -14431,7 +14431,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_MONSTER, .eggGroup2 = EGG_GROUP_MONSTER, .ability1 = ABILITY_MOLDBREAKER, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_RECKLESS, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_SHEERFORCE, .noFlip = TRUE, @@ -14464,9 +14464,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_MONSTER, .eggGroup2 = EGG_GROUP_MONSTER, .ability1 = ABILITY_STURDY, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_SOUNDPROOF, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_SOUNDPROOF, + .hiddenAbility = ABILITY_DAUNTLESSSHIELD, .noFlip = TRUE, }, @@ -14497,9 +14497,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_MONSTER, .eggGroup2 = EGG_GROUP_MONSTER, .ability1 = ABILITY_STURDY, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_SOUNDPROOF, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_SOUNDPROOF, + .hiddenAbility = ABILITY_DAUNTLESSSHIELD, .noFlip = TRUE, }, @@ -14562,7 +14562,7 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_BUG, .eggGroup2 = EGG_GROUP_BUG, - .ability1 = ABILITY_ANTICIPATION, + .ability1 = ABILITY_TECHNICIAN, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_OVERCOAT, @@ -14595,10 +14595,10 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_BUG, .eggGroup2 = EGG_GROUP_BUG, - .ability1 = ABILITY_SWARM, + .ability1 = ABILITY_COMPOUNDEYES, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_TINTEDLENS, + .hiddenAbility = ABILITY_ADAPTABILITY, .noFlip = TRUE, }, @@ -14664,7 +14664,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_PRESSURE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_UNNERVE, + .hiddenAbility = ABILITY_MULTISCALE, .noFlip = TRUE, }, @@ -14694,7 +14694,7 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FAIRY, - .ability1 = ABILITY_RUNAWAY, + .ability1 = ABILITY_SERENEGRACE, .ability2 = ABILITY_PICKUP, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_VOLTABSORB, @@ -14728,9 +14728,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_WATER_1, .eggGroup2 = EGG_GROUP_FIELD, .ability1 = ABILITY_SWIFTSWIM, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_WATERVEIL, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_WATERVEIL, + .hiddenAbility = ABILITY_TECHNICIAN, .noFlip = TRUE, }, @@ -14761,9 +14761,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_WATER_1, .eggGroup2 = EGG_GROUP_FIELD, .ability1 = ABILITY_SWIFTSWIM, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_WATERVEIL, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_WATERVEIL, + .hiddenAbility = ABILITY_TECHNICIAN, .noFlip = TRUE, }, @@ -15093,7 +15093,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_LEVITATE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_MAGICBOUNCE, .noFlip = TRUE, }, @@ -15120,7 +15120,7 @@ const struct BaseStats gBaseStats[] = .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, - .growthRate = GROWTH_MEDIUM_FAST, + .growthRate = GROWTH_MEDIUM_SLOW, .eggGroup1 = EGG_GROUP_FLYING, .eggGroup2 = EGG_GROUP_FLYING, .ability1 = ABILITY_INSOMNIA, @@ -15225,7 +15225,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_LEVITATE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_FOREWARN, .noFlip = TRUE, }, @@ -15390,7 +15390,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_STURDY, .ability2 = ABILITY_ROCKHEAD, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_RATTLED, + .hiddenAbility = ABILITY_SAPSIPPER, .noFlip = TRUE, }, @@ -15489,7 +15489,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_KEENEYE, .ability2 = ABILITY_TANGLEDFEET, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_BIGPECKS, + .hiddenAbility = ABILITY_PUNKROCK, .noFlip = TRUE, }, @@ -15520,9 +15520,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_AMORPHOUS, .eggGroup2 = EGG_GROUP_AMORPHOUS, .ability1 = ABILITY_PRESSURE, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_INFILTRATOR, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_INFILTRATOR, + .hiddenAbility = ABILITY_BADDREAMS, .noFlip = TRUE, }, @@ -15624,6 +15624,140 @@ const struct BaseStats gBaseStats[] = .hiddenAbility = ABILITY_ROUGHSKIN, .noFlip = TRUE, }, +/* + + [SPECIES_GIBLE_B] = + { + .baseHP = 58, + .baseAttack = 70, + .baseDefense = 45, + .baseSpAttack = 45, + .baseSpDefense = 45, + .baseSpeed = 42, + .type1 = TYPE_DRAGON, + .type2 = TYPE_FIRE, + .catchRate = 45, + .expYield = 67, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .evYield_Speed = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_HABAN_BERRY, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 40, + .friendship = 50, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_DRAGON, + .ability1 = ABILITY_FLASHFIRE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .hiddenAbility = ABILITY_ROUGHSKIN, + .noFlip = TRUE, + }, + + [SPECIES_GABITE_B] = + { + .baseHP = 68, + .baseAttack = 90, + .baseDefense = 65, + .baseSpAttack = 50, + .baseSpDefense = 55, + .baseSpeed = 82, + .type1 = TYPE_DRAGON, + .type2 = TYPE_FIRE, + .catchRate = 45, + .expYield = 144, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .evYield_Speed = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_HABAN_BERRY, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 40, + .friendship = 50, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_DRAGON, + .ability1 = ABILITY_FLASHFIRE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .hiddenAbility = ABILITY_ROUGHSKIN, + .noFlip = TRUE, + }, + + [SPECIES_GARCHOMP_B] = + { + .baseHP = 108, + .baseAttack = 130, + .baseDefense = 95, + .baseSpAttack = 80, + .baseSpDefense = 85, + .baseSpeed = 102, + .type1 = TYPE_DRAGON, + .type2 = TYPE_FIRE, + .catchRate = 45, + .expYield = 218, + .evYield_HP = 0, + .evYield_Attack = 3, + .evYield_Defense = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .evYield_Speed = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_HABAN_BERRY, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 40, + .friendship = 50, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_DRAGON, + .ability1 = ABILITY_FLASHFIRE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .hiddenAbility = ABILITY_ROUGHSKIN, + .noFlip = TRUE, + }, + + [SPECIES_GARCHOMP_B_MEGA] = + { + .baseHP = 108, + .baseAttack = 145, + .baseDefense = 115, + .baseSpAttack = 135, + .baseSpDefense = 95, + .baseSpeed = 102, + .type1 = TYPE_DRAGON, + .type2 = TYPE_FIRE, + .catchRate = 45, + .expYield = 218, + .evYield_HP = 0, + .evYield_Attack = 3, + .evYield_Defense = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .evYield_Speed = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 40, + .friendship = 50, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_DRAGON, + .eggGroup2 = EGG_GROUP_MONSTER, + .ability1 = ABILITY_SOLARPOWER, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .hiddenAbility = ABILITY_NONE, + .noFlip = TRUE, + }, +*/ [SPECIES_MUNCHLAX] = { @@ -15951,7 +16085,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_LEVITATE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_GRASSYSURGE, .noFlip = TRUE, }, @@ -15984,7 +16118,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_SWIFTSWIM, .ability2 = ABILITY_STORMDRAIN, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_WATERVEIL, + .hiddenAbility = ABILITY_WATERBUBBLE, .noFlip = TRUE, }, @@ -16017,7 +16151,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_SWIFTSWIM, .ability2 = ABILITY_STORMDRAIN, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_WATERVEIL, + .hiddenAbility = ABILITY_WATERBUBBLE, .noFlip = TRUE, }, @@ -16215,7 +16349,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_OWNTEMPO, .ability2 = ABILITY_OBLIVIOUS, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_CLOUDNINE, + .hiddenAbility = ABILITY_THICKFAT, .noFlip = TRUE, }, @@ -16347,7 +16481,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_FLAMEBODY, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_VITALSPIRIT, + .hiddenAbility = ABILITY_SHEERFORCE, .noFlip = TRUE, }, @@ -16443,8 +16577,8 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, - .ability1 = ABILITY_LEAFGUARD, - .ability2 = ABILITY_LEAFGUARD, + .ability1 = ABILITY_SAPSIPPER, + .ability2 = ABILITY_SAPSIPPER, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_CHLOROPHYLL, .noFlip = TRUE, @@ -16479,7 +16613,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_SNOWCLOAK, .ability2 = ABILITY_SNOWCLOAK, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_ICEBODY, + .hiddenAbility = ABILITY_ICESCALES, .noFlip = TRUE, }, @@ -16609,7 +16743,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_AMORPHOUS, .eggGroup2 = EGG_GROUP_HUMAN_LIKE, .ability1 = ABILITY_STEADFAST, - .ability2 = ABILITY_STEADFAST, + .ability2 = ABILITY_MOXIE, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_JUSTIFIED, .noFlip = TRUE, @@ -16644,7 +16778,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_STURDY, .ability2 = ABILITY_MAGNETPULL, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_SANDFORCE, + .hiddenAbility = ABILITY_ANALYTIC, .noFlip = TRUE, }, @@ -16677,7 +16811,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_PRESSURE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_FRISK, + .hiddenAbility = ABILITY_IRONFIST, .noFlip = TRUE, }, @@ -16708,9 +16842,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FAIRY, .eggGroup2 = EGG_GROUP_MINERAL, .ability1 = ABILITY_SNOWCLOAK, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_CURSEDBODY, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_CURSEDBODY, + .hiddenAbility = ABILITY_PERISH_BODY, .noFlip = TRUE, }, @@ -16776,7 +16910,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_LEVITATE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_COMATOSE, .noFlip = TRUE, }, @@ -16809,7 +16943,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_LEVITATE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_MAGICBOUNCE, .noFlip = TRUE, }, @@ -16842,7 +16976,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_LEVITATE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_INFILTRATOR, .noFlip = TRUE, }, @@ -17040,7 +17174,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_LEVITATE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_MAGICIAN, .noFlip = TRUE, }, @@ -17073,7 +17207,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_HYDRATION, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_DRIZZLE, .noFlip = TRUE, }, @@ -17106,7 +17240,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_HYDRATION, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_SOULHEART, .noFlip = TRUE, }, @@ -17139,7 +17273,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_BADDREAMS, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_INFILTRATOR, .noFlip = TRUE, }, @@ -17172,7 +17306,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_NATURALCURE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_FLOWERVEIL, .noFlip = TRUE, }, @@ -17238,7 +17372,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_VICTORYSTAR, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_SYNCHRONIZE, .noFlip = TRUE, }, @@ -17565,7 +17699,7 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, - .ability1 = ABILITY_RUNAWAY, + .ability1 = ABILITY_STAKEOUT, .ability2 = ABILITY_KEENEYE, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_ANALYTIC, @@ -17598,7 +17732,7 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, - .ability1 = ABILITY_ILLUMINATE, + .ability1 = ABILITY_STAKEOUT, .ability2 = ABILITY_KEENEYE, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_ANALYTIC, @@ -17789,7 +17923,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .evYield_Speed = 1, .item1 = ITEM_ORAN_BERRY, - .item2 = ITEM_OCCA_BERRY, + .item2 = ITEM_LEAF_STONE, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 50, @@ -17799,7 +17933,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_GLUTTONY, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_OVERGROW, + .hiddenAbility = ABILITY_ADAPTABILITY, .noFlip = TRUE, }, @@ -17822,7 +17956,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .evYield_Speed = 2, .item1 = ITEM_ORAN_BERRY, - .item2 = ITEM_OCCA_BERRY, + .item2 = ITEM_LEAF_STONE, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 50, @@ -17832,7 +17966,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_GLUTTONY, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_OVERGROW, + .hiddenAbility = ABILITY_ADAPTABILITY, .noFlip = TRUE, }, @@ -17855,7 +17989,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .evYield_Speed = 1, .item1 = ITEM_ORAN_BERRY, - .item2 = ITEM_PASSHO_BERRY, + .item2 = ITEM_FIRE_STONE, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 50, @@ -17865,7 +17999,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_GLUTTONY, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_BLAZE, + .hiddenAbility = ABILITY_ADAPTABILITY, .noFlip = TRUE, }, @@ -17888,7 +18022,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .evYield_Speed = 2, .item1 = ITEM_ORAN_BERRY, - .item2 = ITEM_PASSHO_BERRY, + .item2 = ITEM_FIRE_STONE, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 50, @@ -17898,7 +18032,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_GLUTTONY, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_BLAZE, + .hiddenAbility = ABILITY_ADAPTABILITY, .noFlip = TRUE, }, @@ -17921,7 +18055,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .evYield_Speed = 1, .item1 = ITEM_ORAN_BERRY, - .item2 = ITEM_RINDO_BERRY, + .item2 = ITEM_WATER_STONE, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 50, @@ -17931,7 +18065,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_GLUTTONY, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_TORRENT, + .hiddenAbility = ABILITY_ADAPTABILITY, .noFlip = TRUE, }, @@ -17954,7 +18088,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .evYield_Speed = 2, .item1 = ITEM_ORAN_BERRY, - .item2 = ITEM_RINDO_BERRY, + .item2 = ITEM_WATER_STONE, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 50, @@ -17964,7 +18098,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_GLUTTONY, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_TORRENT, + .hiddenAbility = ABILITY_ADAPTABILITY, .noFlip = TRUE, }, @@ -18027,7 +18161,7 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_FAST, .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, - .ability1 = ABILITY_FOREWARN, + .ability1 = ABILITY_MAGICGUARD, .ability2 = ABILITY_SYNCHRONIZE, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_TELEPATHY, @@ -18159,7 +18293,7 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, - .ability1 = ABILITY_LIGHTNINGROD, + .ability1 = ABILITY_MOXIE, .ability2 = ABILITY_MOTORDRIVE, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_SAPSIPPER, @@ -18192,7 +18326,7 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, - .ability1 = ABILITY_LIGHTNINGROD, + .ability1 = ABILITY_MOXIE, .ability2 = ABILITY_MOTORDRIVE, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_SAPSIPPER, @@ -18244,7 +18378,7 @@ const struct BaseStats gBaseStats[] = .type2 = TYPE_ROCK, .catchRate = 120, .expYield = 134, - .evYield_HP = 1, + .evYield_HP = 0, .evYield_Attack = 1, .evYield_Defense = 1, .evYield_SpAttack = 0, @@ -18954,7 +19088,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_PRANKSTER, .ability2 = ABILITY_INFILTRATOR, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_CHLOROPHYLL, + .hiddenAbility = ABILITY_COTTONDOWN, .noFlip = TRUE, }, @@ -18987,7 +19121,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_PRANKSTER, .ability2 = ABILITY_INFILTRATOR, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_CHLOROPHYLL, + .hiddenAbility = ABILITY_COTTONDOWN, .noFlip = TRUE, }, @@ -19020,7 +19154,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_CHLOROPHYLL, .ability2 = ABILITY_OWNTEMPO, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_LEAFGUARD, + .hiddenAbility = ABILITY_DANCER, .noFlip = TRUE, }, @@ -19053,7 +19187,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_CHLOROPHYLL, .ability2 = ABILITY_OWNTEMPO, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_LEAFGUARD, + .hiddenAbility = ABILITY_DANCER, .noFlip = TRUE, }, @@ -19083,10 +19217,10 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_WATER_2, .eggGroup2 = EGG_GROUP_WATER_2, - .ability1 = ABILITY_RECKLESS, + .ability1 = ABILITY_MOLDBREAKER, .ability2 = ABILITY_ADAPTABILITY, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_MOLDBREAKER, + .hiddenAbility = ABILITY_SPEEDBOOST, .noFlip = TRUE, }, @@ -20074,9 +20208,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_WATER_1, .eggGroup2 = EGG_GROUP_FLYING, .ability1 = ABILITY_KEENEYE, - .ability2 = ABILITY_BIGPECKS, + .ability2 = ABILITY_HYDRATION, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_HYDRATION, + .hiddenAbility = ABILITY_COMPETITIVE, .noFlip = TRUE, }, @@ -20107,9 +20241,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FLYING, .eggGroup2 = EGG_GROUP_WATER_1, .ability1 = ABILITY_KEENEYE, - .ability2 = ABILITY_BIGPECKS, + .ability2 = ABILITY_HYDRATION, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_HYDRATION, + .hiddenAbility = ABILITY_COMPETITIVE, .noFlip = TRUE, }, @@ -20305,9 +20439,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, .ability1 = ABILITY_STATIC, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_MOTORDRIVE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_MOTORDRIVE, + .hiddenAbility = ABILITY_ELECTRICSURGE, .noFlip = TRUE, }, @@ -20505,7 +20639,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_WATERABSORB, .ability2 = ABILITY_CURSEDBODY, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_DAMP, + .hiddenAbility = ABILITY_PERISH_BODY, .noFlip = TRUE, }, @@ -20700,10 +20834,10 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_SLOW, .eggGroup1 = EGG_GROUP_MINERAL, .eggGroup2 = EGG_GROUP_MINERAL, - .ability1 = ABILITY_PLUS, - .ability2 = ABILITY_MINUS, + .ability1 = ABILITY_CLEARBODY, + .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_CLEARBODY, + .hiddenAbility = ABILITY_MOTORDRIVE, .noFlip = TRUE, }, @@ -20733,10 +20867,10 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_SLOW, .eggGroup1 = EGG_GROUP_MINERAL, .eggGroup2 = EGG_GROUP_MINERAL, - .ability1 = ABILITY_PLUS, - .ability2 = ABILITY_MINUS, + .ability1 = ABILITY_CLEARBODY, + .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_CLEARBODY, + .hiddenAbility = ABILITY_MOTORDRIVE, .noFlip = TRUE, }, @@ -20766,10 +20900,10 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_SLOW, .eggGroup1 = EGG_GROUP_MINERAL, .eggGroup2 = EGG_GROUP_MINERAL, - .ability1 = ABILITY_PLUS, - .ability2 = ABILITY_MINUS, + .ability1 = ABILITY_CLEARBODY, + .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_CLEARBODY, + .hiddenAbility = ABILITY_MOTORDRIVE, .noFlip = TRUE, }, @@ -21148,7 +21282,7 @@ const struct BaseStats gBaseStats[] = .type2 = TYPE_ICE, .catchRate = 120, .expYield = 61, - .evYield_HP = 1, + .evYield_HP = 0, .evYield_Attack = 1, .evYield_Defense = 0, .evYield_SpAttack = 0, @@ -21231,7 +21365,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_LEVITATE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_FILTER, .noFlip = TRUE, }, @@ -21328,7 +21462,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_WATER_1, .eggGroup2 = EGG_GROUP_AMORPHOUS, .ability1 = ABILITY_STATIC, - .ability2 = ABILITY_LIMBER, + .ability2 = ABILITY_WATERABSORB, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_SANDVEIL, .noFlip = TRUE, @@ -21460,7 +21594,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_MINERAL, .eggGroup2 = EGG_GROUP_MINERAL, .ability1 = ABILITY_IRONFIST, - .ability2 = ABILITY_KLUTZ, + .ability2 = ABILITY_POWERSPOT, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_NOGUARD, .noFlip = TRUE, @@ -21493,7 +21627,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_MINERAL, .eggGroup2 = EGG_GROUP_MINERAL, .ability1 = ABILITY_IRONFIST, - .ability2 = ABILITY_KLUTZ, + .ability2 = ABILITY_POWERSPOT, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_NOGUARD, .noFlip = TRUE, @@ -21594,7 +21728,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_RECKLESS, .ability2 = ABILITY_SAPSIPPER, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_SOUNDPROOF, + .hiddenAbility = ABILITY_STAMINA, .noFlip = TRUE, }, @@ -21759,7 +21893,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_GLUTTONY, .ability2 = ABILITY_FLASHFIRE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_WHITESMOKE, + .hiddenAbility = ABILITY_BERSERK, .noFlip = TRUE, }, @@ -21990,7 +22124,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_JUSTIFIED, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_NOGUARD, .noFlip = TRUE, }, @@ -22023,7 +22157,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_JUSTIFIED, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_STEADFAST, .noFlip = TRUE, }, @@ -22056,7 +22190,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_JUSTIFIED, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_NOGUARD, .noFlip = TRUE, }, @@ -22155,7 +22289,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_TURBOBLAZE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_FLASHFIRE, .noFlip = TRUE, }, @@ -22188,7 +22322,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_TERAVOLT, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_LIGHTNINGROD, .noFlip = TRUE, }, @@ -22202,7 +22336,7 @@ const struct BaseStats gBaseStats[] = .baseSpeed = 101, .type1 = TYPE_GROUND, .type2 = TYPE_FLYING, - .catchRate = 3, + .catchRate = 6, .expYield = 255, .evYield_HP = 0, .evYield_Attack = 0, @@ -22254,7 +22388,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_PRESSURE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_REFRIGERATE, .noFlip = TRUE, }, @@ -22287,7 +22421,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_JUSTIFIED, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_INTREPIDSWORD, .noFlip = TRUE, }, @@ -22320,7 +22454,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_SERENEGRACE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_COMPETITIVE, .noFlip = TRUE, }, @@ -22353,7 +22487,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_DOWNLOAD, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_ANALYTIC, .noFlip = TRUE, }, @@ -22580,7 +22714,7 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_BUG, .eggGroup2 = EGG_GROUP_BUG, - .ability1 = ABILITY_ANTICIPATION, + .ability1 = ABILITY_TECHNICIAN, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_OVERCOAT, @@ -22613,7 +22747,7 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_BUG, .eggGroup2 = EGG_GROUP_BUG, - .ability1 = ABILITY_ANTICIPATION, + .ability1 = ABILITY_TECHNICIAN, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_OVERCOAT, @@ -22641,7 +22775,7 @@ const struct BaseStats gBaseStats[] = .item1 = ITEM_NONE, .item2 = ITEM_NONE, .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 255, + .eggCycles = 20, .friendship = 0, .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_WATER_1, @@ -22913,7 +23047,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_SERENEGRACE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_FLOWERVEIL, .noFlip = TRUE, }, @@ -23471,10 +23605,10 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_WATER_2, .eggGroup2 = EGG_GROUP_WATER_2, - .ability1 = ABILITY_ROCKHEAD, + .ability1 = ABILITY_MOLDBREAKER, .ability2 = ABILITY_ADAPTABILITY, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_MOLDBREAKER, + .hiddenAbility = ABILITY_SPEEDBOOST, .noFlip = TRUE, }, @@ -23804,7 +23938,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_SERENEGRACE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_DEFIANT, .noFlip = TRUE, }, @@ -23837,7 +23971,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_DOWNLOAD, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_ANALYTIC, .noFlip = TRUE, }, @@ -23870,7 +24004,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_DOWNLOAD, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_ANALYTIC, .noFlip = TRUE, }, @@ -23903,7 +24037,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_DOWNLOAD, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_ANALYTIC, .noFlip = TRUE, }, @@ -23936,7 +24070,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_DOWNLOAD, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_ANALYTIC, .noFlip = TRUE, }, @@ -24115,7 +24249,7 @@ const struct BaseStats gBaseStats[] = .baseSpeed = 91, .type1 = TYPE_GROUND, .type2 = TYPE_FLYING, - .catchRate = 3, + .catchRate = 6, .expYield = 255, .evYield_HP = 0, .evYield_Attack = 3, @@ -24167,7 +24301,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_JUSTIFIED, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_INTREPIDSWORD, .noFlip = TRUE, }, @@ -24365,7 +24499,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_BLAZE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_MAGICIAN, + .hiddenAbility = ABILITY_MAGICGUARD, .noFlip = TRUE, }, @@ -24488,7 +24622,7 @@ const struct BaseStats gBaseStats[] = .evYield_Speed = 1, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = PERCENT_FEMALE(12.5), + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 50, .growthRate = GROWTH_MEDIUM_FAST, @@ -24758,10 +24892,10 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_SLOW, .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, - .ability1 = ABILITY_RIVALRY, + .ability1 = ABILITY_SOLARPOWER, .ability2 = ABILITY_UNNERVE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_MOXIE, + .hiddenAbility = ABILITY_ADAPTABILITY, .noFlip = TRUE, }, @@ -24791,10 +24925,10 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_SLOW, .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, - .ability1 = ABILITY_RIVALRY, + .ability1 = ABILITY_SOLARPOWER, .ability2 = ABILITY_UNNERVE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_MOXIE, + .hiddenAbility = ABILITY_ADAPTABILITY, .noFlip = TRUE, }, @@ -24825,7 +24959,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FAIRY, .eggGroup2 = EGG_GROUP_FAIRY, .ability1 = ABILITY_FLOWERVEIL, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_AROMAVEIL, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_SYMBIOSIS, .noFlip = TRUE, @@ -24858,7 +24992,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FAIRY, .eggGroup2 = EGG_GROUP_FAIRY, .ability1 = ABILITY_FLOWERVEIL, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_AROMAVEIL, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_SYMBIOSIS, .noFlip = TRUE, @@ -24891,7 +25025,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FAIRY, .eggGroup2 = EGG_GROUP_FAIRY, .ability1 = ABILITY_FLOWERVEIL, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_AROMAVEIL, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_SYMBIOSIS, .noFlip = TRUE, @@ -24924,9 +25058,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, .ability1 = ABILITY_SAPSIPPER, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_GRASSPELT, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_GRASSPELT, + .hiddenAbility = ABILITY_RUNAWAY, .noFlip = TRUE, }, @@ -24957,9 +25091,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, .ability1 = ABILITY_SAPSIPPER, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_GRASSPELT, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_GRASSPELT, + .hiddenAbility = ABILITY_GRASSYSURGE, .noFlip = TRUE, }, @@ -25088,7 +25222,7 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, - .ability1 = ABILITY_KEENEYE, + .ability1 = ABILITY_COMPETITIVE, .ability2 = ABILITY_INFILTRATOR, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_OWNTEMPO, @@ -25121,10 +25255,10 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, - .ability1 = ABILITY_KEENEYE, + .ability1 = ABILITY_PRANKSTER, .ability2 = ABILITY_INFILTRATOR, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_PRANKSTER, + .hiddenAbility = ABILITY_PSYCHICSURGE, .noFlip = TRUE, }, @@ -25254,9 +25388,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FAIRY, .eggGroup2 = EGG_GROUP_FAIRY, .ability1 = ABILITY_HEALER, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_AROMAVEIL, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_AROMAVEIL, + .hiddenAbility = ABILITY_REGENERATOR, .noFlip = TRUE, }, @@ -25287,9 +25421,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FAIRY, .eggGroup2 = EGG_GROUP_FAIRY, .ability1 = ABILITY_HEALER, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_AROMAVEIL, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_AROMAVEIL, + .hiddenAbility = ABILITY_REGENERATOR, .noFlip = TRUE, }, @@ -25320,7 +25454,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FAIRY, .eggGroup2 = EGG_GROUP_FAIRY, .ability1 = ABILITY_SWEETVEIL, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_COMPETITIVE, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_UNBURDEN, .noFlip = TRUE, @@ -25353,7 +25487,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FAIRY, .eggGroup2 = EGG_GROUP_FAIRY, .ability1 = ABILITY_SWEETVEIL, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_COMPETITIVE, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_UNBURDEN, .noFlip = TRUE, @@ -25845,8 +25979,8 @@ const struct BaseStats gBaseStats[] = .eggCycles = 37, .friendship = 50, .growthRate = GROWTH_MEDIUM_FAST, - .eggGroup1 = EGG_GROUP_FAIRY, - .eggGroup2 = EGG_GROUP_FAIRY, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, .ability1 = ABILITY_CUTECHARM, .ability2 = ABILITY_CUTECHARM, .safariZoneFleeRate = 0, @@ -25916,7 +26050,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_CHEEKPOUCH, .ability2 = ABILITY_PICKUP, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_PLUS, + .hiddenAbility = ABILITY_MISTYSURGE, .noFlip = TRUE, }, @@ -25947,9 +26081,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FAIRY, .eggGroup2 = EGG_GROUP_MINERAL, .ability1 = ABILITY_CLEARBODY, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_STURDY, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_STURDY, + .hiddenAbility = ABILITY_MISTYSURGE, .noFlip = TRUE, }, @@ -26180,7 +26314,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_PICKUP, .ability2 = ABILITY_FRISK, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_INSOMNIA, + .hiddenAbility = ABILITY_HEATPROOF, .noFlip = TRUE, }, @@ -26213,7 +26347,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_PICKUP, .ability2 = ABILITY_FRISK, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_INSOMNIA, + .hiddenAbility = ABILITY_HEATPROOF, .noFlip = TRUE, }, @@ -26312,7 +26446,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_FRISK, .ability2 = ABILITY_INFILTRATOR, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_TELEPATHY, + .hiddenAbility = ABILITY_PUNKROCK, .noFlip = TRUE, }, @@ -26345,7 +26479,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_FRISK, .ability2 = ABILITY_INFILTRATOR, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_TELEPATHY, + .hiddenAbility = ABILITY_PUNKROCK, .noFlip = TRUE, }, @@ -26378,7 +26512,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_FAIRYAURA, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_PIXILATE, .noFlip = TRUE, }, @@ -26411,7 +26545,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_DARKAURA, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_AERILATE, .noFlip = TRUE, }, @@ -26477,7 +26611,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_CLEARBODY, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_ANALYTIC, .noFlip = TRUE, }, @@ -26510,7 +26644,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_MAGICIAN, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_PRANKSTER, .noFlip = TRUE, }, @@ -26557,7 +26691,7 @@ const struct BaseStats gBaseStats[] = .baseSpeed = 70, .type1 = TYPE_FIRE, .type2 = TYPE_WATER, - .catchRate = 3, + .catchRate = 6, .expYield = 255, .evYield_HP = 0, .evYield_Attack = 0, @@ -26576,7 +26710,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_WATERABSORB, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_STEAMENGINE, .noFlip = TRUE, }, @@ -26609,7 +26743,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_RIVALRY, .ability2 = ABILITY_UNNERVE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_MOXIE, + .hiddenAbility = ABILITY_ADAPTABILITY, .noFlip = TRUE, }, @@ -26639,10 +26773,10 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, - .ability1 = ABILITY_KEENEYE, + .ability1 = ABILITY_COMPETITIVE, .ability2 = ABILITY_INFILTRATOR, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_COMPETITIVE, + .hiddenAbility = ABILITY_PSYCHICSURGE, .noFlip = TRUE, }, @@ -26904,7 +27038,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FAIRY, .eggGroup2 = EGG_GROUP_FAIRY, .ability1 = ABILITY_FLOWERVEIL, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_AROMAVEIL, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_SYMBIOSIS, .noFlip = TRUE, @@ -26937,7 +27071,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FAIRY, .eggGroup2 = EGG_GROUP_FAIRY, .ability1 = ABILITY_FLOWERVEIL, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_AROMAVEIL, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_SYMBIOSIS, .noFlip = TRUE, @@ -26970,7 +27104,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FAIRY, .eggGroup2 = EGG_GROUP_FAIRY, .ability1 = ABILITY_FLOWERVEIL, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_AROMAVEIL, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_SYMBIOSIS, .noFlip = TRUE, @@ -27003,7 +27137,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FAIRY, .eggGroup2 = EGG_GROUP_FAIRY, .ability1 = ABILITY_FLOWERVEIL, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_AROMAVEIL, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_SYMBIOSIS, .noFlip = TRUE, @@ -27036,7 +27170,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FAIRY, .eggGroup2 = EGG_GROUP_FAIRY, .ability1 = ABILITY_FLOWERVEIL, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_AROMAVEIL, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_SYMBIOSIS, .noFlip = TRUE, @@ -27069,7 +27203,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FAIRY, .eggGroup2 = EGG_GROUP_FAIRY, .ability1 = ABILITY_FLOWERVEIL, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_AROMAVEIL, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_SYMBIOSIS, .noFlip = TRUE, @@ -27102,7 +27236,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FAIRY, .eggGroup2 = EGG_GROUP_FAIRY, .ability1 = ABILITY_FLOWERVEIL, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_AROMAVEIL, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_SYMBIOSIS, .noFlip = TRUE, @@ -27135,7 +27269,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FAIRY, .eggGroup2 = EGG_GROUP_FAIRY, .ability1 = ABILITY_FLOWERVEIL, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_AROMAVEIL, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_SYMBIOSIS, .noFlip = TRUE, @@ -27151,7 +27285,7 @@ const struct BaseStats gBaseStats[] = .baseSpeed = 92, .type1 = TYPE_FAIRY, .type2 = TYPE_FAIRY, - .catchRate = 120, + .catchRate = 3, .expYield = 130, .evYield_HP = 0, .evYield_Attack = 0, @@ -27168,7 +27302,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FAIRY, .eggGroup2 = EGG_GROUP_FAIRY, .ability1 = ABILITY_FLOWERVEIL, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_AROMAVEIL, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_SYMBIOSIS, .noFlip = TRUE, @@ -27201,7 +27335,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FAIRY, .eggGroup2 = EGG_GROUP_FAIRY, .ability1 = ABILITY_FLOWERVEIL, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_AROMAVEIL, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_SYMBIOSIS, .noFlip = TRUE, @@ -27234,7 +27368,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FAIRY, .eggGroup2 = EGG_GROUP_FAIRY, .ability1 = ABILITY_FLOWERVEIL, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_AROMAVEIL, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_SYMBIOSIS, .noFlip = TRUE, @@ -27267,7 +27401,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FAIRY, .eggGroup2 = EGG_GROUP_FAIRY, .ability1 = ABILITY_FLOWERVEIL, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_AROMAVEIL, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_SYMBIOSIS, .noFlip = TRUE, @@ -27300,7 +27434,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FAIRY, .eggGroup2 = EGG_GROUP_FAIRY, .ability1 = ABILITY_FLOWERVEIL, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_AROMAVEIL, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_SYMBIOSIS, .noFlip = TRUE, @@ -27335,7 +27469,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_PICKUP, .ability2 = ABILITY_FRISK, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_INSOMNIA, + .hiddenAbility = ABILITY_HEATPROOF, .noFlip = TRUE, }, @@ -27368,7 +27502,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_PICKUP, .ability2 = ABILITY_FRISK, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_INSOMNIA, + .hiddenAbility = ABILITY_HEATPROOF, .noFlip = TRUE, }, @@ -27401,7 +27535,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_PICKUP, .ability2 = ABILITY_FRISK, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_INSOMNIA, + .hiddenAbility = ABILITY_HEATPROOF, .noFlip = TRUE, }, @@ -27434,7 +27568,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_PICKUP, .ability2 = ABILITY_FRISK, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_INSOMNIA, + .hiddenAbility = ABILITY_HEATPROOF, .noFlip = TRUE, }, @@ -27467,7 +27601,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_PICKUP, .ability2 = ABILITY_FRISK, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_INSOMNIA, + .hiddenAbility = ABILITY_HEATPROOF, .noFlip = TRUE, }, @@ -27500,7 +27634,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_PICKUP, .ability2 = ABILITY_FRISK, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_INSOMNIA, + .hiddenAbility = ABILITY_HEATPROOF, .noFlip = TRUE, }, @@ -28671,7 +28805,7 @@ const struct BaseStats gBaseStats[] = .type2 = TYPE_GHOST, .catchRate = 45, .expYield = 98, - .evYield_HP = 1, + .evYield_HP = 0, .evYield_Attack = 1, .evYield_Defense = 1, .evYield_SpAttack = 0, @@ -28704,7 +28838,7 @@ const struct BaseStats gBaseStats[] = .type2 = TYPE_FAIRY, .catchRate = 45, .expYield = 98, - .evYield_HP = 1, + .evYield_HP = 0, .evYield_Attack = 1, .evYield_Defense = 1, .evYield_SpAttack = 0, @@ -28869,7 +29003,7 @@ const struct BaseStats gBaseStats[] = .type2 = TYPE_GROUND, .catchRate = 150, .expYield = 175, - .evYield_HP = 1, + .evYield_HP = 0, .evYield_Attack = 1, .evYield_Defense = 0, .evYield_SpAttack = 1, @@ -29444,8 +29578,8 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_FAST, .eggGroup1 = EGG_GROUP_FAIRY, .eggGroup2 = EGG_GROUP_FAIRY, - .ability1 = ABILITY_HEALER, - .ability2 = ABILITY_HEALER, + .ability1 = ABILITY_REGENERATOR, + .ability2 = ABILITY_REGENERATOR, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_NONE, .noFlip = TRUE, @@ -30362,7 +30496,7 @@ const struct BaseStats gBaseStats[] = .evYield_Speed = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = PERCENT_FEMALE(50), + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 15, .friendship = 50, .growthRate = GROWTH_MEDIUM_FAST, @@ -30635,7 +30769,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_LEVITATE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_COMPOUNDEYES, .noFlip = TRUE, }, @@ -30734,7 +30868,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_DANCER, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_SERENEGRACE, .noFlip = TRUE, }, @@ -30863,7 +30997,7 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, - .ability1 = ABILITY_KEENEYE, + .ability1 = ABILITY_TOUGHCLAWS, .ability2 = ABILITY_SANDRUSH, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_STEADFAST, @@ -31128,7 +31262,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_GRASS, .eggGroup2 = EGG_GROUP_GRASS, .ability1 = ABILITY_LEAFGUARD, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_CHLOROPHYLL, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_CONTRARY, .noFlip = TRUE, @@ -31161,7 +31295,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_GRASS, .eggGroup2 = EGG_GROUP_GRASS, .ability1 = ABILITY_LEAFGUARD, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_CHLOROPHYLL, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_CONTRARY, .noFlip = TRUE, @@ -31193,10 +31327,10 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_GRASS, .eggGroup2 = EGG_GROUP_GRASS, - .ability1 = ABILITY_ILLUMINATE, + .ability1 = ABILITY_RAINDISH, .ability2 = ABILITY_EFFECTSPORE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_RAINDISH, + .hiddenAbility = ABILITY_MAGICBOUNCE, .noFlip = TRUE, }, @@ -31220,16 +31354,16 @@ const struct BaseStats gBaseStats[] = .evYield_Speed = 0, .item1 = ITEM_BIG_MUSHROOM, .item2 = ITEM_TINY_MUSHROOM, - .genderRatio = PERCENT_FEMALE(100), + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 50, .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_GRASS, .eggGroup2 = EGG_GROUP_GRASS, - .ability1 = ABILITY_ILLUMINATE, + .ability1 = ABILITY_RAINDISH, .ability2 = ABILITY_EFFECTSPORE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_RAINDISH, + .hiddenAbility = ABILITY_MAGICBOUNCE, .noFlip = TRUE, }, @@ -31790,7 +31924,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_RKS_SYSTEM, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_SHEERFORCE, .noFlip = TRUE, }, @@ -31856,7 +31990,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_COMATOSE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_SCRAPPY, .noFlip = TRUE, }, @@ -31889,7 +32023,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_SHELLARMOR, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_WEAKARMOR, .noFlip = TRUE, }, @@ -32054,7 +32188,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_STEELWORKER, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_AFTERMATH, .noFlip = TRUE, }, @@ -32384,7 +32518,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_CLEARBODY, //ABILITY_FULLMETALBODY, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_BATTLEARMOR, .noFlip = TRUE, }, @@ -32417,7 +32551,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_SHADOWSHIELD, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_LEVITATE, .noFlip = TRUE, }, @@ -32464,7 +32598,7 @@ const struct BaseStats gBaseStats[] = .baseSpeed = 79, .type1 = TYPE_BUG, .type2 = TYPE_FIGHTING, - .catchRate = 25, + .catchRate = 45, .expYield = 210, .evYield_HP = 0, .evYield_Attack = 1, @@ -32497,7 +32631,7 @@ const struct BaseStats gBaseStats[] = .baseSpeed = 151, .type1 = TYPE_BUG, .type2 = TYPE_FIGHTING, - .catchRate = 255, + .catchRate = 45, .expYield = 210, .evYield_HP = 0, .evYield_Attack = 0, @@ -32530,7 +32664,7 @@ const struct BaseStats gBaseStats[] = .baseSpeed = 83, .type1 = TYPE_ELECTRIC, .type2 = TYPE_ELECTRIC, - .catchRate = 30, + .catchRate = 45, .expYield = 210, .evYield_HP = 0, .evYield_Attack = 0, @@ -32563,7 +32697,7 @@ const struct BaseStats gBaseStats[] = .baseSpeed = 61, .type1 = TYPE_STEEL, .type2 = TYPE_FLYING, - .catchRate = 25, + .catchRate = 45, .expYield = 210, .evYield_HP = 0, .evYield_Attack = 1, @@ -32596,7 +32730,7 @@ const struct BaseStats gBaseStats[] = .baseSpeed = 109, .type1 = TYPE_GRASS, .type2 = TYPE_STEEL, - .catchRate = 255, + .catchRate = 45, .expYield = 210, .evYield_HP = 0, .evYield_Attack = 3, @@ -32629,7 +32763,7 @@ const struct BaseStats gBaseStats[] = .baseSpeed = 43, .type1 = TYPE_DARK, .type2 = TYPE_DRAGON, - .catchRate = 15, + .catchRate = 45, .expYield = 210, .evYield_HP = 3, .evYield_Attack = 0, @@ -32681,7 +32815,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_PRISMARMOR, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_MIRRORARMOR, .noFlip = TRUE, }, @@ -32714,7 +32848,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_SOULHEART, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_ANALYTIC, .noFlip = TRUE, }, @@ -32747,7 +32881,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_TECHNICIAN, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_LONGREACH, .noFlip = TRUE, }, @@ -32877,7 +33011,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, .ability1 = ABILITY_SNOWCLOAK, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_ICEBODY, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_SLUSHRUSH, .noFlip = TRUE, @@ -32910,7 +33044,7 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, .ability1 = ABILITY_SNOWCLOAK, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_ICEBODY, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_SLUSHRUSH, .noFlip = TRUE, @@ -33008,10 +33142,10 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, - .ability1 = ABILITY_SANDVEIL, + .ability1 = ABILITY_SANDFORCE, .ability2 = ABILITY_TANGLINGHAIR, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_SANDFORCE, + .hiddenAbility = ABILITY_STEELY_SPIRIT, .noFlip = TRUE, }, @@ -33041,10 +33175,10 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, - .ability1 = ABILITY_SANDVEIL, + .ability1 = ABILITY_SANDFORCE, .ability2 = ABILITY_TANGLINGHAIR, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_SANDFORCE, + .hiddenAbility = ABILITY_STEELY_SPIRIT, .noFlip = TRUE, }, @@ -33440,7 +33574,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_PRESSURE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_LIMBER, .noFlip = TRUE, }, @@ -33473,7 +33607,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_PRESSURE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_LIMBER, .noFlip = TRUE, }, @@ -33506,7 +33640,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_PRESSURE, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_LIMBER, .noFlip = TRUE, }, @@ -33635,7 +33769,7 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD, - .ability1 = ABILITY_KEENEYE, + .ability1 = ABILITY_TOUGHCLAWS, .ability2 = ABILITY_VITALSPIRIT, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_NOGUARD, @@ -33704,7 +33838,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_RKS_SYSTEM, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_SHEERFORCE, .noFlip = TRUE, }, @@ -33737,7 +33871,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_RKS_SYSTEM, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_SHEERFORCE, .noFlip = TRUE, }, @@ -33770,7 +33904,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_RKS_SYSTEM, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_SHEERFORCE, .noFlip = TRUE, }, @@ -33803,7 +33937,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_RKS_SYSTEM, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_SHEERFORCE, .noFlip = TRUE, }, @@ -33836,7 +33970,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_RKS_SYSTEM, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_SHEERFORCE, .noFlip = TRUE, }, @@ -33869,7 +34003,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_RKS_SYSTEM, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_SHEERFORCE, .noFlip = TRUE, }, @@ -33902,7 +34036,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_RKS_SYSTEM, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_SHEERFORCE, .noFlip = TRUE, }, @@ -33935,7 +34069,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_RKS_SYSTEM, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_SHEERFORCE, .noFlip = TRUE, }, @@ -33968,7 +34102,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_RKS_SYSTEM, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_SHEERFORCE, .noFlip = TRUE, }, @@ -34001,7 +34135,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_RKS_SYSTEM, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_SHEERFORCE, .noFlip = TRUE, }, @@ -34034,7 +34168,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_RKS_SYSTEM, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_SHEERFORCE, .noFlip = TRUE, }, @@ -34067,7 +34201,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_RKS_SYSTEM, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_SHEERFORCE, .noFlip = TRUE, }, @@ -34100,7 +34234,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_RKS_SYSTEM, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_SHEERFORCE, .noFlip = TRUE, }, @@ -34133,7 +34267,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_RKS_SYSTEM, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_SHEERFORCE, .noFlip = TRUE, }, @@ -34166,7 +34300,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_RKS_SYSTEM, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_SHEERFORCE, .noFlip = TRUE, }, @@ -34199,7 +34333,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_RKS_SYSTEM, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_SHEERFORCE, .noFlip = TRUE, }, @@ -34232,7 +34366,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_RKS_SYSTEM, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_SHEERFORCE, .noFlip = TRUE, }, @@ -34694,7 +34828,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_VOLTABSORB, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_ANTICIPATION, .noFlip = TRUE, }, @@ -34859,7 +34993,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_MAGNETPULL, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_CLEARBODY, .noFlip = TRUE, }, @@ -34892,7 +35026,7 @@ const struct BaseStats gBaseStats[] = .ability1 = ABILITY_IRONFIST, .ability2 = ABILITY_NONE, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, + .hiddenAbility = ABILITY_CLEARBODY, .noFlip = TRUE, }, @@ -35535,8 +35669,8 @@ const struct BaseStats gBaseStats[] = .type2 = TYPE_GRASS, .catchRate = 45, .expYield = 210, - .evYield_HP = 3, - .evYield_Attack = 0, + .evYield_HP = 0, + .evYield_Attack = 3, .evYield_Defense = 0, .evYield_SpAttack = 0, .evYield_SpDefense = 0, diff --git a/src/Egg_Moves.c b/src/Egg_Moves.c index 2b41fc9..c378cfb 100644 --- a/src/Egg_Moves.c +++ b/src/Egg_Moves.c @@ -109,7 +109,8 @@ const u16 gEggMoves[] = MOVE_SWITCHEROO, MOVE_IRONTAIL, MOVE_SUCKERPUNCH, - MOVE_SNATCH), + MOVE_SNATCH, + MOVE_TOXICSPIKES), egg_moves(SANDSHREW, MOVE_FLAIL, @@ -293,7 +294,8 @@ const u16 gEggMoves[] = MOVE_FOCUSPUNCH, MOVE_SLEEPTALK, MOVE_NIGHTSLASH, - MOVE_POWERTRIP), + MOVE_POWERTRIP, + MOVE_THUNDEROUSKICK), egg_moves(GROWLITHE, MOVE_BODYSLAM, @@ -342,7 +344,6 @@ const u16 gEggMoves[] = MOVE_ENCORE, MOVE_SMELLINGSALTS, MOVE_COUNTER, - MOVE_CLOSECOMBAT, MOVE_FIREPUNCH, MOVE_THUNDERPUNCH, MOVE_ICEPUNCH, @@ -350,7 +351,8 @@ const u16 gEggMoves[] = MOVE_POWERTRICK, MOVE_HEAVYSLAM, MOVE_TICKLE, - MOVE_QUICKGUARD), + MOVE_QUICKGUARD, + MOVE_VITALTHROW), egg_moves(BELLSPROUT, MOVE_ENCORE, @@ -516,6 +518,7 @@ const u16 gEggMoves[] = MOVE_BLOCK, MOVE_DEFENSECURL, MOVE_ROLLOUT, + MOVE_ROCKTHROW, MOVE_ROCKBLAST, MOVE_ROCKCLIMB, MOVE_HEAVYSLAM, @@ -631,7 +634,8 @@ const u16 gEggMoves[] = MOVE_ROTOTILLER, MOVE_METALBURST, MOVE_GUARDSPLIT, - MOVE_ROCKPOLISH), + MOVE_ROCKPOLISH, + MOVE_HEADSMASH), egg_moves(CHANSEY, MOVE_PRESENT, @@ -936,7 +940,8 @@ const u16 gEggMoves[] = MOVE_ELECTROWEB, MOVE_RAGEPOWDER, MOVE_NIGHTSLASH, - MOVE_LUNGE), + MOVE_LUNGE, + MOVE_FIRSTIMPRESSION), egg_moves(CHINCHOU, MOVE_SCREECH, @@ -1015,7 +1020,7 @@ const u16 gEggMoves[] = MOVE_SECRETPOWER, MOVE_STOREDPOWER, MOVE_MORNINGSUN, - MOVE_AERIALACE, + MOVE_BESTOW, MOVE_SOFTBOILED), egg_moves(NATU, @@ -1111,7 +1116,8 @@ const u16 gEggMoves[] = MOVE_ENDURE, MOVE_BIDE, MOVE_MORNINGSUN, - MOVE_GRASSYTERRAIN), + MOVE_GRASSYTERRAIN, + MOVE_SEEDFLARE), egg_moves(YANMA, MOVE_WHIRLWIND, @@ -1253,7 +1259,8 @@ const u16 gEggMoves[] = MOVE_SIGNALBEAM, MOVE_AQUAJET, MOVE_WATERPULSE, - MOVE_ACIDSPRAY), + MOVE_ACIDSPRAY, + MOVE_ANCHORSHOT), egg_moves(SHUCKLE, MOVE_SWEETSCENT, @@ -1371,20 +1378,13 @@ const u16 gEggMoves[] = MOVE_ENTRAINMENT), egg_moves(DELIBIRD, - MOVE_AURORABEAM, MOVE_QUICKATTACK, MOVE_FUTURESIGHT, MOVE_SPLASH, MOVE_RAPIDSPIN, MOVE_ICEBALL, MOVE_ICESHARD, - MOVE_ICEPUNCH, - MOVE_FAKEOUT, - MOVE_BESTOW, - MOVE_ICYWIND, - MOVE_FREEZEDRY, MOVE_DESTINYBOND, - MOVE_SPIKES, MOVE_COUNTER, MOVE_AURORAVEIL, MOVE_MEMENTO), @@ -1418,15 +1418,16 @@ const u16 gEggMoves[] = egg_moves(HOUNDOUR, MOVE_FIRESPIN, MOVE_RAGE, - MOVE_PURSUIT, MOVE_COUNTER, MOVE_SPITE, MOVE_REVERSAL, MOVE_THUNDERFANG, - MOVE_PUNISHMENT, + MOVE_BEATUP, + MOVE_FEINTATTACK, MOVE_FEINT, MOVE_SUCKERPUNCH, - MOVE_DESTINYBOND), + MOVE_DESTINYBOND, + MOVE_ODORSLEUTH), egg_moves(PHANPY, MOVE_FOCUSENERGY, @@ -1859,7 +1860,8 @@ const u16 gEggMoves[] = MOVE_MUDSHOT, MOVE_ENDURE, MOVE_BUGBITE, - MOVE_SIGNALBEAM), + MOVE_SIGNALBEAM, + MOVE_FIRSTIMPRESSION), egg_moves(MAKUHITA, MOVE_FEINTATTACK, @@ -1867,14 +1869,14 @@ const u16 gEggMoves[] = MOVE_FORESIGHT, MOVE_HELPINGHAND, MOVE_CROSSCHOP, - MOVE_REVENGE, MOVE_DYNAMICPUNCH, MOVE_COUNTER, MOVE_BULLETPUNCH, MOVE_FEINT, - MOVE_WIDEGUARD, MOVE_FOCUSPUNCH, - MOVE_CHIPAWAY), + MOVE_CHIPAWAY, + MOVE_VITALTHROW, + MOVE_STORMTHROW), egg_moves(ELECTRIKE, MOVE_CRUNCH, @@ -1981,7 +1983,8 @@ const u16 gEggMoves[] = MOVE_WHIRLWIND, MOVE_LUCKYCHANT, MOVE_ENDURE, - MOVE_SIMPLEBEAM), + MOVE_SIMPLEBEAM, + MOVE_RECOVER), egg_moves(PLUSLE, MOVE_WISH, @@ -2238,7 +2241,8 @@ const u16 gEggMoves[] = MOVE_CAPTIVATE, MOVE_FAKETEARS, MOVE_CONFUSERAY, - MOVE_AROMATHERAPY), + MOVE_AROMATHERAPY, + MOVE_TAILGLOW), egg_moves(LILEEP, MOVE_BARRIER, @@ -2259,7 +2263,8 @@ const u16 gEggMoves[] = MOVE_CURSE, MOVE_IRONDEFENSE, MOVE_WATERPULSE, - MOVE_AQUAJET), + MOVE_AQUAJET, + MOVE_ACCELEROCK), egg_moves(RALTS, MOVE_DISABLE, @@ -2392,7 +2397,8 @@ const u16 gEggMoves[] = MOVE_SIGNALBEAM, MOVE_HELPINGHAND, MOVE_EERIEIMPULSE, - MOVE_FAKETEARS), + MOVE_FAKETEARS, + MOVE_DISCHARGE), egg_moves(BUDEW, MOVE_SPIKES, @@ -2454,7 +2460,9 @@ const u16 gEggMoves[] = MOVE_BABYDOLLEYES), egg_moves(BUIZEL, + MOVE_PURSUIT, MOVE_MUDSLAP, + MOVE_MUDSHOT, MOVE_HEADBUTT, MOVE_FURYSWIPES, MOVE_SLASH, @@ -2465,8 +2473,8 @@ const u16 gEggMoves[] = MOVE_AQUARING, MOVE_MEFIRST, MOVE_SWITCHEROO, - MOVE_TAILSLAP, MOVE_SOAK, + MOVE_WHIRLPOOL, MOVE_HELPINGHAND), egg_moves(CHERUBI, @@ -2803,7 +2811,8 @@ const u16 gEggMoves[] = MOVE_NIGHTSLASH, MOVE_TRUMPCARD, MOVE_SCREECH, - MOVE_SACREDSWORD), + MOVE_SACREDSWORD, + MOVE_SECRETSWORD), egg_moves(PATRAT, MOVE_FORESIGHT, @@ -2813,7 +2822,8 @@ const u16 gEggMoves[] = MOVE_REVENGE, MOVE_FLAIL, MOVE_TEARFULLOOK, - MOVE_BULLETSEED), + MOVE_BULLETSEED, + MOVE_BIDE), egg_moves(LILLIPUP, MOVE_HOWL, @@ -2842,7 +2852,8 @@ const u16 gEggMoves[] = MOVE_COVET, MOVE_COPYCAT, MOVE_DOUBLETEAM, - MOVE_QUICKATTACK), + MOVE_QUICKATTACK, + MOVE_NIGHTDAZE), egg_moves(PANSAGE, MOVE_COVET, @@ -3068,9 +3079,10 @@ const u16 gEggMoves[] = MOVE_COUNTER, MOVE_MEANLOOK, MOVE_MEFIRST, - MOVE_POWERTRIP, MOVE_AQUATAIL, - MOVE_SPITE), + MOVE_SPITE, + MOVE_ASSURANCE, + MOVE_MUDSLAP), egg_moves(DARUMAKA, MOVE_SLEEPTALK, @@ -3094,7 +3106,8 @@ const u16 gEggMoves[] = MOVE_WOODHAMMER, MOVE_SPIKES, MOVE_GRASSWHISTLE, - MOVE_GRASSYTERRAIN), + MOVE_GRASSYTERRAIN, + MOVE_TAILGLOW), egg_moves(DWEBBLE, MOVE_ENDURE, @@ -3107,22 +3120,25 @@ const u16 gEggMoves[] = MOVE_BLOCK, MOVE_WIDEGUARD, MOVE_ROTOTILLER, - MOVE_KNOCKOFF), + MOVE_KNOCKOFF, + MOVE_FIRSTIMPRESSION), egg_moves(SCRAGGY, MOVE_DRAINPUNCH, MOVE_COUNTER, MOVE_DRAGONDANCE, MOVE_DETECT, - MOVE_FAKEOUT, MOVE_FIREPUNCH, MOVE_ICEPUNCH, MOVE_THUNDERPUNCH, MOVE_AMNESIA, MOVE_ZENHEADBUTT, MOVE_QUICKGUARD, - MOVE_POWERUPPUNCH, - MOVE_ACIDSPRAY), + MOVE_ACIDSPRAY, + MOVE_FEINTATTACK, + MOVE_CHIPAWAY, + MOVE_BEATUP, + MOVE_FOCUSPUNCH), egg_moves(SIGILYPH, MOVE_STOREDPOWER, @@ -3141,7 +3157,8 @@ const u16 gEggMoves[] = MOVE_HEALBLOCK, MOVE_IMPRISON, MOVE_NIGHTMARE, - MOVE_TOXICSPIKES), + MOVE_TOXICSPIKES, + MOVE_OMINOUSWIND), egg_moves(TIRTOUGA, MOVE_WATERPULSE, @@ -3188,7 +3205,8 @@ const u16 gEggMoves[] = MOVE_EXTRASENSORY, MOVE_COUNTER, MOVE_COPYCAT, - MOVE_EMBARGO), + MOVE_EMBARGO, + MOVE_FEINTATTACK), egg_moves(MINCCINO, MOVE_IRONTAIL, @@ -3200,7 +3218,7 @@ const u16 gEggMoves[] = MOVE_SLEEPTALK, MOVE_ENDURE, MOVE_FLAIL, - MOVE_TRIPLEAXEL), + MOVE_BONERUSH), egg_moves(GOTHITA, MOVE_MIRRORCOAT, @@ -3258,7 +3276,8 @@ const u16 gEggMoves[] = MOVE_SLEEPTALK, MOVE_BATONPASS, MOVE_GRASSWHISTLE, - MOVE_HEADBUTT), + MOVE_HEADBUTT, + MOVE_TROPKICK), egg_moves(EMOLGA, MOVE_ROOST, @@ -3339,7 +3358,6 @@ const u16 gEggMoves[] = MOVE_KNOCKOFF), egg_moves(ELGYEM, - MOVE_TELEPORT, MOVE_DISABLE, MOVE_ASTONISH, MOVE_POWERSWAP, @@ -3370,6 +3388,7 @@ const u16 gEggMoves[] = MOVE_ENDEAVOR, MOVE_IRONTAIL, MOVE_HARDEN, + MOVE_BITE, MOVE_FIRSTIMPRESSION), egg_moves(CUBCHOO, @@ -3397,8 +3416,6 @@ const u16 gEggMoves[] = MOVE_TOXICSPIKES), egg_moves(STUNFISK, - MOVE_SHOCKWAVE, - MOVE_EARTHPOWER, MOVE_YAWN, MOVE_SLEEPTALK, MOVE_ASTONISH, @@ -3408,10 +3425,10 @@ const u16 gEggMoves[] = MOVE_PAINSPLIT, MOVE_EERIEIMPULSE, MOVE_REFLECTTYPE, - MOVE_MEFIRST), + MOVE_MEFIRST, + MOVE_SHOREUP), egg_moves(MIENFOO, - MOVE_ENDURE, MOVE_VITALTHROW, MOVE_BATONPASS, MOVE_SMELLINGSALTS, @@ -3425,7 +3442,7 @@ const u16 gEggMoves[] = egg_moves(DRUDDIGON, MOVE_FIREFANG, MOVE_THUNDERFANG, - MOVE_CRUSHCLAW, + MOVE_CHIPAWAY, MOVE_FEINTATTACK, MOVE_PURSUIT, MOVE_IRONTAIL, @@ -3436,14 +3453,14 @@ const u16 gEggMoves[] = MOVE_NIGHTSLASH), egg_moves(PAWNIARD, - MOVE_REVENGE, MOVE_SUCKERPUNCH, - MOVE_PURSUIT, MOVE_HEADBUTT, MOVE_STEALTHROCK, MOVE_PSYCHOCUT, MOVE_MEANLOOK, - MOVE_QUICKGUARD), + MOVE_QUICKGUARD, + MOVE_FEINTATTACK, + MOVE_EMBARGO), egg_moves(BOUFFALANT, MOVE_STOMP, @@ -3466,14 +3483,15 @@ const u16 gEggMoves[] = MOVE_KNOCKOFF, MOVE_FAKETEARS, MOVE_FOULPLAY, - MOVE_TOXIC), + MOVE_TOXIC, + MOVE_FEINTATTACK), egg_moves(HEATMOR, MOVE_PURSUIT, MOVE_WRAP, MOVE_NIGHTSLASH, MOVE_CURSE, - MOVE_BODYSLAM, + MOVE_BIND, MOVE_HEATWAVE, MOVE_FEINTATTACK, MOVE_SUCKERPUNCH, @@ -3615,10 +3633,12 @@ const u16 gEggMoves[] = MOVE_SNATCH, MOVE_QUICKGUARD, MOVE_FLAMECHARGE, - MOVE_DEFOG), + MOVE_DEFOG, + MOVE_RAZORWIND), egg_moves(LITLEO, MOVE_ENTRAINMENT, + MOVE_HEADBUTT, MOVE_YAWN, MOVE_SNATCH, MOVE_FIRESPIN, @@ -3642,7 +3662,9 @@ const u16 gEggMoves[] = MOVE_FOULPLAY, MOVE_STORMTHROW, MOVE_POWERTRIP, - MOVE_SEISMICTOSS), + MOVE_SEISMICTOSS, + MOVE_KARATECHOP, + MOVE_VITALTHROW), egg_moves(FURFROU, MOVE_ROLEPLAY, @@ -3734,7 +3756,8 @@ const u16 gEggMoves[] = MOVE_MIRRORCOAT, MOVE_MAGNETRISE, MOVE_DISCHARGE, - MOVE_TAKEDOWN), + MOVE_TAKEDOWN, + MOVE_REFLECTTYPE), egg_moves(HAWLUCHA, MOVE_AGILITY, @@ -3910,8 +3933,8 @@ const u16 gEggMoves[] = egg_moves(ROCKRUFF, MOVE_CRUSHCLAW, - MOVE_FIREFANG, MOVE_THUNDERFANG, + MOVE_FIREFANG, MOVE_SUCKERPUNCH, MOVE_THRASH, MOVE_ENDEAVOR, @@ -4034,7 +4057,8 @@ const u16 gEggMoves[] = MOVE_STOCKPILE, MOVE_SWALLOW, MOVE_SPITUP, - MOVE_CURSE), + MOVE_CURSE, + MOVE_STRENGTHSAP), egg_moves(PYUKUMUKU, MOVE_ENDURE, @@ -4166,7 +4190,8 @@ const u16 gEggMoves[] = MOVE_SNATCH, MOVE_COVET, MOVE_ASSURANCE, - MOVE_CAPTIVATE), + MOVE_CAPTIVATE, + MOVE_NIGHTDAZE), egg_moves(GEODUDE_A, MOVE_BLOCK, diff --git a/src/Enemy_Elevation_Table.c b/src/Enemy_Elevation_Table.c index 044d7b2..4ff47d1 100644 --- a/src/Enemy_Elevation_Table.c +++ b/src/Enemy_Elevation_Table.c @@ -648,7 +648,7 @@ const u8 gEnemyMonElevation[NUM_SPECIES] = [SPECIES_FOONGUS] = 0x0, [SPECIES_AMOONGUSS] = 0x0, [SPECIES_FRILLISH] = 0x0, - [SPECIES_JELLICENT] = 0x0, + [SPECIES_JELLICENT] = 0x8, [SPECIES_ALOMOMOLA] = 0x0, [SPECIES_JOLTIK] = 0x0, [SPECIES_GALVANTULA] = 0x0, @@ -707,7 +707,7 @@ const u8 gEnemyMonElevation[NUM_SPECIES] = [SPECIES_GENESECT] = 0x0, [SPECIES_UNFEZANT_F] = 0x0, [SPECIES_FRILLISH_F] = 0x0, - [SPECIES_JELLICENT_F] = 0x0, + [SPECIES_JELLICENT_F] = 0x8, [SPECIES_SHADOW_WARRIOR] = 0x0, [SPECIES_BURMY_SANDY] = 0x0, [SPECIES_BURMY_TRASH] = 0x0, @@ -1017,7 +1017,7 @@ const u8 gEnemyMonElevation[NUM_SPECIES] = [SPECIES_PHEROMOSA] = 0x0, [SPECIES_XURKITREE] = 0x0, [SPECIES_CELESTEELA] = 0x0, - [SPECIES_KARTANA] = 0x0, + [SPECIES_KARTANA] = 0x8, [SPECIES_GUZZLORD] = 0x0, [SPECIES_NECROZMA] = 0x0, [SPECIES_MAGEARNA] = 0x0, @@ -1188,10 +1188,11 @@ const u8 gEnemyMonElevation[NUM_SPECIES] = [SPECIES_KUBFU] = 0x0, [SPECIES_URSHIFU_SINGLE] = 0x0, [SPECIES_ZARUDE] = 0x0, - [SPECIES_UNKNOWN_MYTHICAL] = 0x0, - [SPECIES_CALYREX] = 0x0, [SPECIES_REGIELEKI] = 0x0, [SPECIES_REGIDRAGO] = 0x0, + [SPECIES_GLASTRIER] = 0x0, + [SPECIES_SPECTRIER] = 0x0, + [SPECIES_CALYREX] = 0x0, [SPECIES_CRAMORANT_GULPING] = 0x0, [SPECIES_CRAMORANT_GORGING] = 0x0, [SPECIES_TOXTRICITY_LOW_KEY] = 0x0, diff --git a/src/Evolution Table.c b/src/Evolution Table.c index cee0cb7..76a07ff 100644 --- a/src/Evolution Table.c +++ b/src/Evolution Table.c @@ -97,7 +97,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = {EVO_ITEM, ITEM_KINGS_ROCK, SPECIES_SLOWKING, 0}}, [SPECIES_SLOWBRO] = {{EVO_MEGA, ITEM_SLOWBRONITE, SPECIES_SLOWBRO_MEGA, MEGA_VARIANT_STANDARD}}, [SPECIES_MAGNEMITE] = {{EVO_LEVEL, 30, SPECIES_MAGNETON, 0}}, - [SPECIES_MAGNETON] = {{EVO_MAP, MAPSEC_THUNDERCAP_MOUNTAIN, SPECIES_MAGNEZONE, 0}}, + [SPECIES_MAGNETON] = {{EVO_MAP, MAPSEC_THUNDERCAP_MOUNTAIN, SPECIES_MAGNEZONE, 0}, + {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_MAGNEZONE, 0}}, [SPECIES_DODUO] = {{EVO_LEVEL, 31, SPECIES_DODRIO, 0}}, [SPECIES_SEEL] = {{EVO_LEVEL, 34, SPECIES_DEWGONG, 0}}, [SPECIES_GRIMER] = {{EVO_LEVEL, 38, SPECIES_MUK, 0}}, @@ -139,14 +140,14 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_MAGIKARP] = {{EVO_LEVEL, 20, SPECIES_GYARADOS, 0}}, [SPECIES_GYARADOS] = {{EVO_MEGA, ITEM_GYARADOSITE, SPECIES_GYARADOS_MEGA, MEGA_VARIANT_STANDARD}}, [SPECIES_LAPRAS] = {{EVO_GIGANTAMAX, TRUE, SPECIES_LAPRAS_GIGA, 0}}, - [SPECIES_EEVEE] = {{EVO_FRIENDSHIP_DAY, 0, SPECIES_ESPEON, 0}, + [SPECIES_EEVEE] = {{EVO_MOVE_TYPE, TYPE_FAIRY, SPECIES_SYLVEON, 0}, //Overriden by Espeon and Umbrean if need be + {EVO_FRIENDSHIP_DAY, 0, SPECIES_ESPEON, 0}, {EVO_FRIENDSHIP_NIGHT, 0, SPECIES_UMBREON, 0}, {EVO_ITEM, ITEM_FIRE_STONE, SPECIES_FLAREON, 0}, {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_JOLTEON, 0}, {EVO_ITEM, ITEM_WATER_STONE, SPECIES_VAPOREON, 0}, {EVO_ITEM, ITEM_LEAF_STONE, SPECIES_LEAFEON, 0}, {EVO_ITEM, ITEM_ICE_STONE, SPECIES_GLACEON, 0}, - {EVO_MOVE_TYPE, TYPE_FAIRY, SPECIES_SYLVEON, 0}, {EVO_GIGANTAMAX, TRUE, SPECIES_EEVEE_GIGA, 0}}, [SPECIES_PORYGON] = {{EVO_ITEM, ITEM_UP_GRADE, SPECIES_PORYGON2, 0}, {EVO_TRADE_ITEM, ITEM_UP_GRADE, SPECIES_PORYGON2, 0}}, @@ -241,11 +242,12 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_WAILMER] = {{EVO_LEVEL, 40, SPECIES_WAILORD, 0}}, [SPECIES_SKITTY] = {{EVO_ITEM, ITEM_MOON_STONE, SPECIES_DELCATTY, 0}}, [SPECIES_BALTOY] = {{EVO_LEVEL, 36, SPECIES_CLAYDOL, 0}}, - [SPECIES_NOSEPASS] = {{EVO_MAP, MAPSEC_THUNDERCAP_MOUNTAIN, SPECIES_PROBOPASS, 0}}, + [SPECIES_NOSEPASS] = {{EVO_MAP, MAPSEC_THUNDERCAP_MOUNTAIN, SPECIES_PROBOPASS, 0}, + {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_PROBOPASS, 0}}, [SPECIES_SABLEYE] = {{EVO_MEGA, ITEM_SABLENITE, SPECIES_SABLEYE_MEGA, MEGA_VARIANT_STANDARD}}, [SPECIES_BARBOACH] = {{EVO_LEVEL, 30, SPECIES_WHISCASH, 0}}, [SPECIES_CORPHISH] = {{EVO_LEVEL, 30, SPECIES_CRAWDAUNT, 0}}, - [SPECIES_FEEBAS] = {{EVO_BEAUTY, 0, SPECIES_MILOTIC, 0}, + [SPECIES_FEEBAS] = {/*{EVO_BEAUTY, 0, SPECIES_MILOTIC, 0},*/ {EVO_ITEM, ITEM_PRISM_SCALE, SPECIES_MILOTIC, 0}, {EVO_TRADE_ITEM, ITEM_PRISM_SCALE, SPECIES_MILOTIC, 0}}, [SPECIES_CARVANHA] = {{EVO_LEVEL, 30, SPECIES_SHARPEDO, 0}}, @@ -327,7 +329,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_COMBEE] = {{EVO_FEMALE_LEVEL, 21, SPECIES_VESPIQUEN, 0}}, [SPECIES_BUIZEL] = {{EVO_LEVEL, 26, SPECIES_FLOATZEL, 0}}, [SPECIES_CHERUBI] = {{EVO_LEVEL, 25, SPECIES_CHERRIM, 0}}, - [SPECIES_SHELLOS] = {{EVO_LEVEL, 32, SPECIES_GASTRODON, 0}}, + [SPECIES_SHELLOS] = {{EVO_LEVEL, 30, SPECIES_GASTRODON, 0}}, [SPECIES_DRIFLOON] = {{EVO_LEVEL, 28, SPECIES_DRIFBLIM, 0}}, [SPECIES_BUNEARY] = {{EVO_FRIENDSHIP, 0, SPECIES_LOPUNNY, 0}}, [SPECIES_LOPUNNY] = {{EVO_MEGA, ITEM_LOPUNNITE, SPECIES_LOPUNNY_MEGA, MEGA_VARIANT_STANDARD}}, @@ -437,7 +439,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = {EVO_MALE_LEVEL, 20, SPECIES_MOTHIM, 0}}, [SPECIES_BURMY_TRASH] = {{EVO_FEMALE_LEVEL, 20, SPECIES_WORMADAM_TRASH, 0}, {EVO_MALE_LEVEL, 20, SPECIES_MOTHIM, 0}}, - [SPECIES_SHELLOS_EAST] = {{EVO_LEVEL, 32, SPECIES_GASTRODON_EAST, 0}}, + [SPECIES_SHELLOS_EAST] = {{EVO_LEVEL, 30, SPECIES_GASTRODON_EAST, 0}}, [SPECIES_DEERLING_SUMMER] = {{EVO_LEVEL, 34, SPECIES_SAWSBUCK_SUMMER, 0}}, [SPECIES_DEERLING_AUTUMN] = {{EVO_LEVEL, 34, SPECIES_SAWSBUCK_AUTUMN, 0}}, [SPECIES_DEERLING_WINTER] = {{EVO_LEVEL, 34, SPECIES_SAWSBUCK_WINTER, 0}}, @@ -556,15 +558,17 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_TRUMBEAK] = {{EVO_LEVEL, 28, SPECIES_TOUCANNON, 0}}, [SPECIES_YUNGOOS] = {{EVO_LEVEL_DAY, 20, SPECIES_GUMSHOOS, 0}}, [SPECIES_GRUBBIN] = {{EVO_LEVEL, 20, SPECIES_CHARJABUG, 0}}, - [SPECIES_CHARJABUG] = {{EVO_MAP, MAPSEC_THUNDERCAP_MOUNTAIN, SPECIES_VIKAVOLT, 0}}, - [SPECIES_CRABRAWLER] = {{EVO_MAP, MAPSEC_FROST_MOUNTAIN, SPECIES_CRABOMINABLE, 0}, - {EVO_MAP, MAPSEC_ROUTE_8, SPECIES_NONE, 0}, - {EVO_MAP, MAPSEC_BLIZZARD_CITY, SPECIES_NONE, 0}, - {EVO_MAP, MAPSEC_FROZEN_FOREST, SPECIES_NONE, 0}}, + [SPECIES_CHARJABUG] = {{EVO_MAP, MAPSEC_THUNDERCAP_MOUNTAIN, SPECIES_VIKAVOLT, 0}, + {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_VIKAVOLT, 0}}, + [SPECIES_CRABRAWLER] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_CRABOMINABLE, 0}, + {EVO_MAP, MAPSEC_FROST_MOUNTAIN, SPECIES_CRABOMINABLE, 0}, + {EVO_MAP, MAPSEC_ROUTE_8, SPECIES_CRABOMINABLE, 0}, + {EVO_MAP, MAPSEC_BLIZZARD_CITY, SPECIES_CRABOMINABLE, 0}, + {EVO_MAP, MAPSEC_FROZEN_FOREST, SPECIES_CRABOMINABLE, 0}}, [SPECIES_CUTIEFLY] = {{EVO_LEVEL, 25, SPECIES_RIBOMBEE, 0}}, - [SPECIES_ROCKRUFF] = {{EVO_LEVEL_SPECIFIC_TIME_RANGE, 25, SPECIES_LYCANROC_DUSK, TIME_RANGE(17, 20)}, //5 PM - 7:59 PM - {EVO_LEVEL_DAY, 25, SPECIES_LYCANROC, 0}, - {EVO_LEVEL_NIGHT, 25, SPECIES_LYCANROC_N, 0}}, + [SPECIES_ROCKRUFF] = {{EVO_LEVEL_DAY, 25, SPECIES_LYCANROC, 0}, + {EVO_LEVEL_NIGHT, 25, SPECIES_LYCANROC_N, 0}, + {EVO_LEVEL_SPECIFIC_TIME_RANGE, 25, SPECIES_LYCANROC_DUSK, TIME_RANGE(17, 20)}}, //5 PM - 7:59 PM [SPECIES_MAREANIE] = {{EVO_LEVEL, 38, SPECIES_TOXAPEX, 0}}, [SPECIES_MUDBRAY] = {{EVO_LEVEL, 30, SPECIES_MUDSDALE, 0}}, [SPECIES_DEWPIDER] = {{EVO_LEVEL, 22, SPECIES_ARAQUANID, 0}}, diff --git a/src/Front_Pic_Coords_Table.c b/src/Front_Pic_Coords_Table.c index 4456a6e..2d78d56 100644 --- a/src/Front_Pic_Coords_Table.c +++ b/src/Front_Pic_Coords_Table.c @@ -3836,7 +3836,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES] = [SPECIES_GRENINJA] = { .size = 0x0, - .y_offset = 0x1, + .y_offset = 0x5, }, [SPECIES_BUNNELBY] = { @@ -4116,7 +4116,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES] = [SPECIES_NOIBAT] = { .size = 0x0, - .y_offset = 0x8, + .y_offset = 0x9, }, [SPECIES_NOIVERN] = { @@ -4191,7 +4191,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES] = [SPECIES_ZYGARDE_10] = { .size = 0x0, - .y_offset = 0x4, + .y_offset = 0x3, }, [SPECIES_ZYGARDE_COMPLETE] = { @@ -4201,7 +4201,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES] = [SPECIES_ASHGRENINJA] = { .size = 0x0, - .y_offset = 0x4, + .y_offset = 0x5, }, [SPECIES_FLABEBE_BLUE] = { @@ -5081,7 +5081,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES] = [SPECIES_KARTANA] = { .size = 0x0, - .y_offset = 0x3, + .y_offset = 0xB, }, [SPECIES_GUZZLORD] = { @@ -5116,12 +5116,12 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES] = [SPECIES_RAICHU_A] = { .size = 0x0, - .y_offset = 0x0, + .y_offset = 0x1, }, [SPECIES_SANDSHREW_A] = { .size = 0x0, - .y_offset = 0x7, + .y_offset = 13, }, [SPECIES_SANDSLASH_A] = { @@ -5933,7 +5933,22 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES] = .size = 0x0, .y_offset = 0x0, }, - [SPECIES_UNKNOWN_MYTHICAL] = + [SPECIES_REGIELEKI] = + { + .size = 0x0, + .y_offset = 0x0, + }, + [SPECIES_REGIDRAGO] = + { + .size = 0x0, + .y_offset = 0x0, + }, + [SPECIES_GLASTRIER] = + { + .size = 0x0, + .y_offset = 0x0, + }, + [SPECIES_SPECTRIER] = { .size = 0x0, .y_offset = 0x0, diff --git a/src/Icon_Palette_Table.c b/src/Icon_Palette_Table.c index f3de258..eedad29 100644 --- a/src/Icon_Palette_Table.c +++ b/src/Icon_Palette_Table.c @@ -1188,10 +1188,11 @@ const u8 gMonIconPaletteIndices[NUM_SPECIES] = [SPECIES_KUBFU] = 0x0, [SPECIES_URSHIFU_SINGLE] = 0x0, [SPECIES_ZARUDE] = 0x0, - [SPECIES_UNKNOWN_MYTHICAL] = 0x0, - [SPECIES_CALYREX] = 0x0, [SPECIES_REGIELEKI] = 0x0, [SPECIES_REGIDRAGO] = 0x0, + [SPECIES_SPECTRIER] = 0x0, + [SPECIES_GLASTRIER] = 0x0, + [SPECIES_CALYREX] = 0x0, [SPECIES_CRAMORANT_GULPING] = 0x0, [SPECIES_CRAMORANT_GORGING] = 0x0, [SPECIES_TOXTRICITY_LOW_KEY] = 0x0, diff --git a/src/Item_Animation_Table.c b/src/Item_Animation_Table.c index e89db7d..c878650 100644 --- a/src/Item_Animation_Table.c +++ b/src/Item_Animation_Table.c @@ -1197,10 +1197,11 @@ const struct ItemAnimation gItemAnimationTable[NUM_SPECIES] = [SPECIES_KUBFU] = {0x0, 0x0, 0x0, 0x0, 0x0}, [SPECIES_URSHIFU_SINGLE] = {0x0, 0x0, 0x0, 0x0, 0x0}, [SPECIES_ZARUDE] = {0x0, 0x0, 0x0, 0x0, 0x0}, - [SPECIES_UNKNOWN_MYTHICAL] = {0x0, 0x0, 0x0, 0x0, 0x0}, - [SPECIES_CALYREX] = {0x0, 0x0, 0x0, 0x0, 0x0}, [SPECIES_REGIELEKI] = {0x0, 0x0, 0x0, 0x0, 0x0}, [SPECIES_REGIDRAGO] = {0x0, 0x0, 0x0, 0x0, 0x0}, + [SPECIES_GLASTRIER] = {0x0, 0x0, 0x0, 0x0, 0x0}, + [SPECIES_SPECTRIER] = {0x0, 0x0, 0x0, 0x0, 0x0}, + [SPECIES_CALYREX] = {0x0, 0x0, 0x0, 0x0, 0x0}, [SPECIES_CRAMORANT_GULPING] = {0x0, 0x0, 0x0, 0x0, 0x0}, [SPECIES_CRAMORANT_GORGING] = {0x0, 0x0, 0x0, 0x0, 0x0}, [SPECIES_TOXTRICITY_LOW_KEY] = {0x0, 0x0, 0x0, 0x0, 0x0}, diff --git a/src/Learnsets.c b/src/Learnsets.c index 283a696..8297b0a 100644 --- a/src/Learnsets.c +++ b/src/Learnsets.c @@ -256,15 +256,16 @@ static const struct LevelUpMove sBeedrillLevelUpLearnset[] = { LEVEL_UP_MOVE(14, MOVE_RAGE), LEVEL_UP_MOVE(17, MOVE_PURSUIT), LEVEL_UP_MOVE(20, MOVE_FOCUSENERGY), - LEVEL_UP_MOVE(23, MOVE_VENOSHOCK), - LEVEL_UP_MOVE(26, MOVE_ASSURANCE), + LEVEL_UP_MOVE(22, MOVE_ASSURANCE), + LEVEL_UP_MOVE(25, MOVE_CROSSPOISON), LEVEL_UP_MOVE(29, MOVE_TOXICSPIKES), - LEVEL_UP_MOVE(32, MOVE_FELLSTINGER), - LEVEL_UP_MOVE(35, MOVE_ENDEAVOR), - LEVEL_UP_MOVE(38, MOVE_POISONJAB), - LEVEL_UP_MOVE(41, MOVE_PINMISSILE), - LEVEL_UP_MOVE(44, MOVE_AGILITY), - LEVEL_UP_MOVE(47, MOVE_OUTRAGE), + LEVEL_UP_MOVE(31, MOVE_NEEDLEARM), + LEVEL_UP_MOVE(34, MOVE_FELLSTINGER), + LEVEL_UP_MOVE(37, MOVE_ENDEAVOR), + LEVEL_UP_MOVE(40, MOVE_POISONJAB), + LEVEL_UP_MOVE(43, MOVE_PINMISSILE), + LEVEL_UP_MOVE(47, MOVE_AGILITY), + LEVEL_UP_MOVE(49, MOVE_OUTRAGE), LEVEL_UP_END }; @@ -401,6 +402,7 @@ static const struct LevelUpMove sFearowLevelUpLearnset[] = { LEVEL_UP_MOVE(34, MOVE_ROOST), LEVEL_UP_MOVE(39, MOVE_DRILLPECK), LEVEL_UP_MOVE(44, MOVE_DRILLRUN), + LEVEL_UP_MOVE(50, MOVE_BEAKBLAST), LEVEL_UP_END }; @@ -527,7 +529,7 @@ static const struct LevelUpMove sSandshrewLevelUpLearnset[] = { LEVEL_UP_MOVE(45, MOVE_EARTHQUAKE), LEVEL_UP_END }; - + static const struct LevelUpMove sSandslashLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_CRUSHCLAW), LEVEL_UP_MOVE( 1, MOVE_CRUSHCLAW), @@ -812,6 +814,31 @@ static const struct LevelUpMove sJigglypuffLevelUpLearnset[] = { }; static const struct LevelUpMove sWigglytuffLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_FLEURCANNON), + LEVEL_UP_MOVE( 1, MOVE_DISABLE), + LEVEL_UP_MOVE( 1, MOVE_CHARM), + LEVEL_UP_MOVE( 1, MOVE_POUND), + LEVEL_UP_MOVE( 1, MOVE_COPYCAT), + LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL), + LEVEL_UP_MOVE( 1, MOVE_ECHOEDVOICE), + LEVEL_UP_MOVE( 1, MOVE_COVET), + LEVEL_UP_MOVE( 1, MOVE_PLAYNICE), + LEVEL_UP_MOVE( 1, MOVE_STOCKPILE), + LEVEL_UP_MOVE( 1, MOVE_SWALLOW), + LEVEL_UP_MOVE( 1, MOVE_SPITUP), + LEVEL_UP_MOVE( 1, MOVE_DOUBLESLAP), + LEVEL_UP_MOVE( 1, MOVE_ROLLOUT), + LEVEL_UP_MOVE( 1, MOVE_ROUND), + LEVEL_UP_MOVE( 1, MOVE_WAKEUPSLAP), + LEVEL_UP_MOVE( 1, MOVE_REST), + LEVEL_UP_MOVE( 1, MOVE_MIMIC), + LEVEL_UP_MOVE( 1, MOVE_GYROBALL), + LEVEL_UP_MOVE( 1, MOVE_PLAYROUGH), + LEVEL_UP_MOVE( 1, MOVE_HYPERVOICE), + LEVEL_UP_MOVE( 1, MOVE_DOUBLEEDGE), + LEVEL_UP_MOVE( 1, MOVE_PLAYROUGH), + LEVEL_UP_MOVE( 1, MOVE_SING), + LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL), LEVEL_UP_MOVE( 1, MOVE_DISABLE), LEVEL_UP_MOVE( 1, MOVE_CHARM), LEVEL_UP_MOVE( 1, MOVE_POUND), @@ -1132,6 +1159,7 @@ static const struct LevelUpMove sPsyduckLevelUpLearnset[] = { }; static const struct LevelUpMove sGolduckLevelUpLearnset[] = { + LEVEL_UP_MOVE( 0, MOVE_POWERGEM), LEVEL_UP_MOVE( 1, MOVE_MEFIRST), LEVEL_UP_MOVE( 1, MOVE_AQUAJET), LEVEL_UP_MOVE( 1, MOVE_WATERSPORT), @@ -1148,6 +1176,7 @@ static const struct LevelUpMove sGolduckLevelUpLearnset[] = { LEVEL_UP_MOVE(25, MOVE_ZENHEADBUTT), LEVEL_UP_MOVE(28, MOVE_AQUATAIL), LEVEL_UP_MOVE(31, MOVE_SOAK), + LEVEL_UP_MOVE(32, MOVE_POWERGEM), LEVEL_UP_MOVE(36, MOVE_PSYCHUP), LEVEL_UP_MOVE(41, MOVE_PSYCHIC), LEVEL_UP_MOVE(46, MOVE_AMNESIA), @@ -1387,17 +1416,17 @@ static const struct LevelUpMove sMachopLevelUpLearnset[] = { LEVEL_UP_MOVE(12, MOVE_KNOCKOFF), LEVEL_UP_MOVE(16, MOVE_LOWSWEEP), LEVEL_UP_MOVE(20, MOVE_SCARYFACE), - LEVEL_UP_MOVE(24, MOVE_VITALTHROW), + LEVEL_UP_MOVE(23, MOVE_WAKEUPSLAP), LEVEL_UP_MOVE(27, MOVE_STRENGTH), - LEVEL_UP_MOVE(30, MOVE_WAKEUPSLAP), - LEVEL_UP_MOVE(32, MOVE_DUALCHOP), - LEVEL_UP_MOVE(34, MOVE_REVENGE), - LEVEL_UP_MOVE(37, MOVE_BULKUP), - LEVEL_UP_MOVE(40, MOVE_SUBMISSION), - LEVEL_UP_MOVE(44, MOVE_SEISMICTOSS), - LEVEL_UP_MOVE(48, MOVE_DYNAMICPUNCH), - LEVEL_UP_MOVE(52, MOVE_CROSSCHOP), - LEVEL_UP_MOVE(56, MOVE_DOUBLEEDGE), + LEVEL_UP_MOVE(31, MOVE_DUALCHOP), + LEVEL_UP_MOVE(35, MOVE_BULKUP), + LEVEL_UP_MOVE(38, MOVE_SUBMISSION), + LEVEL_UP_MOVE(42, MOVE_SEISMICTOSS), + LEVEL_UP_MOVE(46, MOVE_REVENGE), + LEVEL_UP_MOVE(50, MOVE_DOUBLEEDGE), + LEVEL_UP_MOVE(54, MOVE_CROSSCHOP), + LEVEL_UP_MOVE(58, MOVE_DYNAMICPUNCH), + LEVEL_UP_MOVE(62, MOVE_CLOSECOMBAT), LEVEL_UP_END }; @@ -1410,17 +1439,17 @@ static const struct LevelUpMove sMachokeLevelUpLearnset[] = { LEVEL_UP_MOVE(12, MOVE_KNOCKOFF), LEVEL_UP_MOVE(16, MOVE_LOWSWEEP), LEVEL_UP_MOVE(20, MOVE_SCARYFACE), - LEVEL_UP_MOVE(24, MOVE_VITALTHROW), + LEVEL_UP_MOVE(23, MOVE_WAKEUPSLAP), LEVEL_UP_MOVE(27, MOVE_STRENGTH), - LEVEL_UP_MOVE(32, MOVE_WAKEUPSLAP), - LEVEL_UP_MOVE(36, MOVE_DUALCHOP), - LEVEL_UP_MOVE(40, MOVE_REVENGE), - LEVEL_UP_MOVE(43, MOVE_BULKUP), - LEVEL_UP_MOVE(48, MOVE_SUBMISSION), - LEVEL_UP_MOVE(53, MOVE_SEISMICTOSS), - LEVEL_UP_MOVE(58, MOVE_DYNAMICPUNCH), - LEVEL_UP_MOVE(63, MOVE_CROSSCHOP), - LEVEL_UP_MOVE(68, MOVE_DOUBLEEDGE), + LEVEL_UP_MOVE(32, MOVE_DUALCHOP), + LEVEL_UP_MOVE(37, MOVE_BULKUP), + LEVEL_UP_MOVE(41, MOVE_SUBMISSION), + LEVEL_UP_MOVE(46, MOVE_SEISMICTOSS), + LEVEL_UP_MOVE(51, MOVE_REVENGE), + LEVEL_UP_MOVE(56, MOVE_DOUBLEEDGE), + LEVEL_UP_MOVE(61, MOVE_CROSSCHOP), + LEVEL_UP_MOVE(66, MOVE_DYNAMICPUNCH), + LEVEL_UP_MOVE(71, MOVE_CLOSECOMBAT), LEVEL_UP_END }; @@ -1434,17 +1463,17 @@ static const struct LevelUpMove sMachampLevelUpLearnset[] = { LEVEL_UP_MOVE(12, MOVE_KNOCKOFF), LEVEL_UP_MOVE(16, MOVE_LOWSWEEP), LEVEL_UP_MOVE(20, MOVE_SCARYFACE), - LEVEL_UP_MOVE(24, MOVE_VITALTHROW), + LEVEL_UP_MOVE(23, MOVE_WAKEUPSLAP), LEVEL_UP_MOVE(27, MOVE_STRENGTH), - LEVEL_UP_MOVE(32, MOVE_WAKEUPSLAP), - LEVEL_UP_MOVE(36, MOVE_DUALCHOP), - LEVEL_UP_MOVE(40, MOVE_REVENGE), - LEVEL_UP_MOVE(43, MOVE_BULKUP), - LEVEL_UP_MOVE(48, MOVE_SUBMISSION), - LEVEL_UP_MOVE(53, MOVE_SEISMICTOSS), - LEVEL_UP_MOVE(58, MOVE_DYNAMICPUNCH), - LEVEL_UP_MOVE(63, MOVE_CROSSCHOP), - LEVEL_UP_MOVE(68, MOVE_DOUBLEEDGE), + LEVEL_UP_MOVE(32, MOVE_DUALCHOP), + LEVEL_UP_MOVE(37, MOVE_BULKUP), + LEVEL_UP_MOVE(41, MOVE_SUBMISSION), + LEVEL_UP_MOVE(46, MOVE_SEISMICTOSS), + LEVEL_UP_MOVE(51, MOVE_REVENGE), + LEVEL_UP_MOVE(56, MOVE_DOUBLEEDGE), + LEVEL_UP_MOVE(61, MOVE_CROSSCHOP), + LEVEL_UP_MOVE(66, MOVE_DYNAMICPUNCH), + LEVEL_UP_MOVE(71, MOVE_CLOSECOMBAT), LEVEL_UP_END }; @@ -1480,9 +1509,10 @@ static const struct LevelUpMove sWeepinbellLevelUpLearnset[] = { LEVEL_UP_MOVE(30, MOVE_ACIDSPRAY), LEVEL_UP_MOVE(35, MOVE_SLAM), LEVEL_UP_MOVE(40, MOVE_GASTROACID), - LEVEL_UP_MOVE(44, MOVE_KNOCKOFF), + LEVEL_UP_MOVE(44, MOVE_GRAVAPPLE), LEVEL_UP_MOVE(49, MOVE_POISONJAB), - LEVEL_UP_MOVE(54, MOVE_WRINGOUT), + LEVEL_UP_MOVE(54, MOVE_KNOCKOFF), + LEVEL_UP_MOVE(59, MOVE_WRINGOUT), LEVEL_UP_END }; @@ -1497,10 +1527,22 @@ static const struct LevelUpMove sVictreebelLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_VINEWHIP), LEVEL_UP_MOVE( 1, MOVE_GROWTH), LEVEL_UP_MOVE( 1, MOVE_WRAP), + LEVEL_UP_MOVE( 1, MOVE_ACID), LEVEL_UP_MOVE( 1, MOVE_POISONPOWDER), LEVEL_UP_MOVE( 1, MOVE_STUNSPORE), LEVEL_UP_MOVE( 1, MOVE_RAZORLEAF), LEVEL_UP_MOVE( 1, MOVE_SWEETSCENT), + LEVEL_UP_MOVE( 1, MOVE_GASTROACID), + LEVEL_UP_MOVE( 1, MOVE_GRAVAPPLE), + LEVEL_UP_MOVE( 1, MOVE_POISONJAB), + LEVEL_UP_MOVE( 1, MOVE_KNOCKOFF), + LEVEL_UP_MOVE( 1, MOVE_WRINGOUT), + LEVEL_UP_MOVE( 1, MOVE_LEAFTORNADO), + LEVEL_UP_MOVE( 1, MOVE_ACIDSPRAY), + LEVEL_UP_MOVE( 1, MOVE_SLEEPPOWDER), + LEVEL_UP_MOVE( 1, MOVE_SWEETSCENT), + LEVEL_UP_MOVE( 1, MOVE_RAZORLEAF), + LEVEL_UP_MOVE( 1, MOVE_SWEETSCENT), LEVEL_UP_MOVE( 1, MOVE_ACIDSPRAY), LEVEL_UP_MOVE( 1, MOVE_GASTROACID), LEVEL_UP_MOVE( 1, MOVE_KNOCKOFF), @@ -1719,16 +1761,16 @@ static const struct LevelUpMove sMagnemiteLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 4, MOVE_SUPERSONIC), LEVEL_UP_MOVE( 8, MOVE_THUNDERWAVE), - LEVEL_UP_MOVE(11, MOVE_ELECTROBALL), - LEVEL_UP_MOVE(14, MOVE_MAGNETBOMB), + LEVEL_UP_MOVE(11, MOVE_MAGNETBOMB), + LEVEL_UP_MOVE(14, MOVE_SPARK), LEVEL_UP_MOVE(17, MOVE_SONICBOOM), - LEVEL_UP_MOVE(20, MOVE_SPARK), - LEVEL_UP_MOVE(23, MOVE_MIRRORSHOT), - LEVEL_UP_MOVE(27, MOVE_SCREECH), + LEVEL_UP_MOVE(20, MOVE_ELECTROBALL), + LEVEL_UP_MOVE(24, MOVE_SCREECH), + LEVEL_UP_MOVE(27, MOVE_MIRRORSHOT), LEVEL_UP_MOVE(31, MOVE_MAGNETRISE), - LEVEL_UP_MOVE(35, MOVE_FLASHCANNON), - LEVEL_UP_MOVE(39, MOVE_DISCHARGE), - LEVEL_UP_MOVE(44, MOVE_METALSOUND), + LEVEL_UP_MOVE(35, MOVE_DISCHARGE), + LEVEL_UP_MOVE(39, MOVE_METALSOUND), + LEVEL_UP_MOVE(43, MOVE_FLASHCANNON), LEVEL_UP_MOVE(48, MOVE_LIGHTSCREEN), LEVEL_UP_MOVE(52, MOVE_GYROBALL), LEVEL_UP_MOVE(56, MOVE_LOCKON), @@ -1743,21 +1785,21 @@ static const struct LevelUpMove sMagnetonLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_SUPERSONIC), LEVEL_UP_MOVE( 1, MOVE_THUNDERWAVE), - LEVEL_UP_MOVE(11, MOVE_ELECTROBALL), - LEVEL_UP_MOVE(14, MOVE_MAGNETBOMB), + LEVEL_UP_MOVE(11, MOVE_MAGNETBOMB), + LEVEL_UP_MOVE(14, MOVE_SPARK), LEVEL_UP_MOVE(17, MOVE_SONICBOOM), - LEVEL_UP_MOVE(20, MOVE_SPARK), - LEVEL_UP_MOVE(23, MOVE_MIRRORSHOT), - LEVEL_UP_MOVE(27, MOVE_SCREECH), + LEVEL_UP_MOVE(20, MOVE_ELECTROBALL), + LEVEL_UP_MOVE(24, MOVE_SCREECH), + LEVEL_UP_MOVE(27, MOVE_MIRRORSHOT), LEVEL_UP_MOVE(29, MOVE_TRIATTACK), LEVEL_UP_MOVE(34, MOVE_MAGNETRISE), - LEVEL_UP_MOVE(39, MOVE_FLASHCANNON), - LEVEL_UP_MOVE(44, MOVE_DISCHARGE), - LEVEL_UP_MOVE(49, MOVE_METALSOUND), - LEVEL_UP_MOVE(54, MOVE_LIGHTSCREEN), - LEVEL_UP_MOVE(59, MOVE_GYROBALL), - LEVEL_UP_MOVE(64, MOVE_LOCKON), - LEVEL_UP_MOVE(69, MOVE_ZAPCANNON), + LEVEL_UP_MOVE(39, MOVE_DISCHARGE), + LEVEL_UP_MOVE(44, MOVE_METALSOUND), + LEVEL_UP_MOVE(48, MOVE_FLASHCANNON), + LEVEL_UP_MOVE(53, MOVE_LIGHTSCREEN), + LEVEL_UP_MOVE(57, MOVE_GYROBALL), + LEVEL_UP_MOVE(62, MOVE_LOCKON), + LEVEL_UP_MOVE(66, MOVE_ZAPCANNON), LEVEL_UP_END }; @@ -2035,7 +2077,6 @@ static const struct LevelUpMove sOnixLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_HARDEN), LEVEL_UP_MOVE( 1, MOVE_BIND), - LEVEL_UP_MOVE( 1, MOVE_ROCKTHROW), LEVEL_UP_MOVE( 4, MOVE_SMACKDOWN), LEVEL_UP_MOVE( 8, MOVE_ROCKPOLISH), LEVEL_UP_MOVE(12, MOVE_DRAGONBREATH), @@ -2251,10 +2292,12 @@ static const struct LevelUpMove sCuboneLevelUpLearnset[] = { }; static const struct LevelUpMove sMarowakLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_DOUBLEEDGE), + LEVEL_UP_MOVE( 1, MOVE_SHADOWBONE), LEVEL_UP_MOVE( 1, MOVE_RAGE), LEVEL_UP_MOVE( 1, MOVE_MUDSLAP), LEVEL_UP_MOVE( 1, MOVE_GROWL), - LEVEL_UP_MOVE( 4, MOVE_TAILWHIP), + LEVEL_UP_MOVE( 1, MOVE_TAILWHIP), LEVEL_UP_MOVE( 7, MOVE_BONECLUB), LEVEL_UP_MOVE(10, MOVE_LEER), LEVEL_UP_MOVE(13, MOVE_FALSESWIPE), @@ -2267,7 +2310,7 @@ static const struct LevelUpMove sMarowakLevelUpLearnset[] = { LEVEL_UP_MOVE(42, MOVE_ENDEAVOR), LEVEL_UP_MOVE(48, MOVE_BONEMERANG), LEVEL_UP_MOVE(54, MOVE_THRASH), - LEVEL_UP_MOVE(60, MOVE_DOUBLEEDGE), + LEVEL_UP_MOVE(60, MOVE_HEADSMASH), LEVEL_UP_END }; @@ -2294,8 +2337,9 @@ static const struct LevelUpMove sHitmonleeLevelUpLearnset[] = { LEVEL_UP_MOVE(34, MOVE_MEGAKICK), LEVEL_UP_MOVE(39, MOVE_JUMPKICK), LEVEL_UP_MOVE(44, MOVE_REVERSAL), - LEVEL_UP_MOVE(49, MOVE_HIGHJUMPKICK), - LEVEL_UP_MOVE(54, MOVE_CLOSECOMBAT), + LEVEL_UP_MOVE(49, MOVE_THUNDEROUSKICK), + LEVEL_UP_MOVE(54, MOVE_HIGHJUMPKICK), + LEVEL_UP_MOVE(59, MOVE_CLOSECOMBAT), LEVEL_UP_END }; @@ -2371,6 +2415,7 @@ static const struct LevelUpMove sKoffingLevelUpLearnset[] = { static const struct LevelUpMove sWeezingLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DOUBLEHIT), LEVEL_UP_MOVE( 1, MOVE_HEATWAVE), + LEVEL_UP_MOVE( 1, MOVE_STRANGESTEAM), LEVEL_UP_MOVE( 1, MOVE_POISONGAS), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_SMOG), @@ -2637,6 +2682,7 @@ static const struct LevelUpMove sStarmieLevelUpLearnset[] = { static const struct LevelUpMove sMrMimeLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_BARRIER), + LEVEL_UP_MOVE( 1, MOVE_PSYCHICTERRAIN), LEVEL_UP_MOVE( 1, MOVE_MISTYTERRAIN), LEVEL_UP_MOVE( 1, MOVE_MAGICALLEAF), LEVEL_UP_MOVE( 1, MOVE_QUICKGUARD), @@ -2795,8 +2841,9 @@ static const struct LevelUpMove sTaurosLevelUpLearnset[] = { LEVEL_UP_MOVE(42, MOVE_REST), LEVEL_UP_MOVE(47, MOVE_SWAGGER), LEVEL_UP_MOVE(52, MOVE_THRASH), - LEVEL_UP_MOVE(58, MOVE_DOUBLEEDGE), - LEVEL_UP_MOVE(64, MOVE_GIGAIMPACT), + LEVEL_UP_MOVE(58, MOVE_HEADCHARGE), + LEVEL_UP_MOVE(64, MOVE_HEADSMASH), + LEVEL_UP_MOVE(70, MOVE_GIGAIMPACT), LEVEL_UP_END }; @@ -2963,8 +3010,9 @@ static const struct LevelUpMove sFlareonLevelUpLearnset[] = { LEVEL_UP_MOVE(35, MOVE_FIRESPIN), LEVEL_UP_MOVE(40, MOVE_LAVAPLUME), LEVEL_UP_MOVE(45, MOVE_SCARYFACE), - LEVEL_UP_MOVE(50, MOVE_FLAREBLITZ), + LEVEL_UP_MOVE(50, MOVE_SACREDFIRE), LEVEL_UP_MOVE(55, MOVE_LASTRESORT), + LEVEL_UP_MOVE(60, MOVE_FLAREBLITZ), LEVEL_UP_END }; @@ -3188,7 +3236,8 @@ static const struct LevelUpMove sMoltresLevelUpLearnset[] = { LEVEL_UP_MOVE(60, MOVE_ENDURE), LEVEL_UP_MOVE(65, MOVE_BURNUP), LEVEL_UP_MOVE(70, MOVE_SOLARBEAM), - LEVEL_UP_MOVE(75, MOVE_SKYATTACK), + LEVEL_UP_MOVE(75, MOVE_AEROBLAST), + LEVEL_UP_MOVE(80, MOVE_SKYATTACK), LEVEL_UP_END }; @@ -3286,6 +3335,7 @@ static const struct LevelUpMove sMewtwoLevelUpLearnset[] = { static const struct LevelUpMove sMewLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TELEPORT), LEVEL_UP_MOVE( 1, MOVE_SOFTBOILED), + LEVEL_UP_MOVE( 1, MOVE_FAKEOUT), LEVEL_UP_MOVE( 1, MOVE_POUND), LEVEL_UP_MOVE( 1, MOVE_MEFIRST), LEVEL_UP_MOVE( 1, MOVE_REFLECTTYPE), @@ -3791,13 +3841,14 @@ static const struct LevelUpMove sTogepiLevelUpLearnset[] = { LEVEL_UP_MOVE(40, MOVE_FOLLOWME), LEVEL_UP_MOVE(44, MOVE_BATONPASS), LEVEL_UP_MOVE(48, MOVE_LASTRESORT), - LEVEL_UP_MOVE(52, MOVE_WISH), + LEVEL_UP_MOVE(52, MOVE_WISH), LEVEL_UP_END }; static const struct LevelUpMove sTogeticLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_FAIRYWIND), LEVEL_UP_MOVE( 1, MOVE_MAGICALLEAF), + LEVEL_UP_MOVE( 1, MOVE_MYSTICALFIRE), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_POUND), LEVEL_UP_MOVE( 1, MOVE_SWEETKISS), @@ -3866,17 +3917,17 @@ static const struct LevelUpMove sMareepLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 4, MOVE_THUNDERWAVE), LEVEL_UP_MOVE( 8, MOVE_THUNDERSHOCK), - LEVEL_UP_MOVE(11, MOVE_COTTONSPORE), + LEVEL_UP_MOVE(12, MOVE_COTTONSPORE), LEVEL_UP_MOVE(15, MOVE_CHARGE), LEVEL_UP_MOVE(18, MOVE_TAKEDOWN), LEVEL_UP_MOVE(22, MOVE_ELECTROBALL), - LEVEL_UP_MOVE(25, MOVE_CONFUSERAY), + LEVEL_UP_MOVE(26, MOVE_CONFUSERAY), LEVEL_UP_MOVE(29, MOVE_POWERGEM), - LEVEL_UP_MOVE(32, MOVE_DISCHARGE), - LEVEL_UP_MOVE(36, MOVE_COTTONGUARD), - LEVEL_UP_MOVE(39, MOVE_SIGNALBEAM), - LEVEL_UP_MOVE(43, MOVE_LIGHTSCREEN), - LEVEL_UP_MOVE(46, MOVE_THUNDER), + LEVEL_UP_MOVE(33, MOVE_DISCHARGE), + LEVEL_UP_MOVE(37, MOVE_COTTONGUARD), + LEVEL_UP_MOVE(40, MOVE_SIGNALBEAM), + LEVEL_UP_MOVE(44, MOVE_LIGHTSCREEN), + LEVEL_UP_MOVE(47, MOVE_THUNDERCAGE), LEVEL_UP_END }; @@ -3885,17 +3936,17 @@ static const struct LevelUpMove sFlaaffyLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_THUNDERWAVE), LEVEL_UP_MOVE( 1, MOVE_THUNDERSHOCK), - LEVEL_UP_MOVE(11, MOVE_COTTONSPORE), - LEVEL_UP_MOVE(16, MOVE_CHARGE), - LEVEL_UP_MOVE(20, MOVE_TAKEDOWN), - LEVEL_UP_MOVE(25, MOVE_ELECTROBALL), + LEVEL_UP_MOVE(12, MOVE_COTTONSPORE), + LEVEL_UP_MOVE(15, MOVE_CHARGE), + LEVEL_UP_MOVE(19, MOVE_TAKEDOWN), + LEVEL_UP_MOVE(24, MOVE_ELECTROBALL), LEVEL_UP_MOVE(29, MOVE_CONFUSERAY), - LEVEL_UP_MOVE(34, MOVE_POWERGEM), + LEVEL_UP_MOVE(33, MOVE_POWERGEM), LEVEL_UP_MOVE(38, MOVE_DISCHARGE), LEVEL_UP_MOVE(43, MOVE_COTTONGUARD), LEVEL_UP_MOVE(47, MOVE_SIGNALBEAM), LEVEL_UP_MOVE(52, MOVE_LIGHTSCREEN), - LEVEL_UP_MOVE(56, MOVE_THUNDER), + LEVEL_UP_MOVE(57, MOVE_THUNDERCAGE), LEVEL_UP_END }; @@ -3904,25 +3955,24 @@ static const struct LevelUpMove sAmpharosLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_ZAPCANNON), LEVEL_UP_MOVE( 1, MOVE_MAGNETICFLUX), LEVEL_UP_MOVE( 1, MOVE_IONDELUGE), - LEVEL_UP_MOVE( 1, MOVE_DRAGONPULSE), LEVEL_UP_MOVE( 1, MOVE_FIREPUNCH), + LEVEL_UP_MOVE( 1, MOVE_DRAGONPULSE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_THUNDERWAVE), LEVEL_UP_MOVE( 1, MOVE_THUNDERSHOCK), - LEVEL_UP_MOVE(11, MOVE_COTTONSPORE), - LEVEL_UP_MOVE(16, MOVE_CHARGE), - LEVEL_UP_MOVE(20, MOVE_TAKEDOWN), - LEVEL_UP_MOVE(25, MOVE_ELECTROBALL), + LEVEL_UP_MOVE(12, MOVE_COTTONSPORE), + LEVEL_UP_MOVE(15, MOVE_CHARGE), + LEVEL_UP_MOVE(19, MOVE_TAKEDOWN), + LEVEL_UP_MOVE(24, MOVE_ELECTROBALL), LEVEL_UP_MOVE(29, MOVE_CONFUSERAY), LEVEL_UP_MOVE(29, MOVE_THUNDERPUNCH), LEVEL_UP_MOVE(35, MOVE_POWERGEM), - LEVEL_UP_MOVE(40, MOVE_DISCHARGE), - LEVEL_UP_MOVE(46, MOVE_COTTONGUARD), - LEVEL_UP_MOVE(51, MOVE_SIGNALBEAM), - LEVEL_UP_MOVE(57, MOVE_LIGHTSCREEN), - LEVEL_UP_MOVE(62, MOVE_DRAGONPULSE), - LEVEL_UP_MOVE(67, MOVE_THUNDER), + LEVEL_UP_MOVE(41, MOVE_DISCHARGE), + LEVEL_UP_MOVE(47, MOVE_COTTONGUARD), + LEVEL_UP_MOVE(52, MOVE_SIGNALBEAM), + LEVEL_UP_MOVE(58, MOVE_LIGHTSCREEN), + LEVEL_UP_MOVE(63, MOVE_THUNDERCAGE), LEVEL_UP_END }; @@ -3930,6 +3980,9 @@ static const struct LevelUpMove sBellossomLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_PETALBLIZZARD), LEVEL_UP_MOVE( 1, MOVE_LEAFSTORM), LEVEL_UP_MOVE( 1, MOVE_LEAFBLADE), + LEVEL_UP_MOVE( 1, MOVE_FLORALHEALING), + LEVEL_UP_MOVE( 1, MOVE_FIERYDANCE), + LEVEL_UP_MOVE( 1, MOVE_LUNARDANCE), LEVEL_UP_MOVE( 1, MOVE_MAGICALLEAF), LEVEL_UP_MOVE( 1, MOVE_QUIVERDANCE), LEVEL_UP_MOVE( 1, MOVE_ABSORB), @@ -3937,19 +3990,13 @@ static const struct LevelUpMove sBellossomLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_ACID), LEVEL_UP_MOVE( 1, MOVE_SWEETSCENT), LEVEL_UP_MOVE( 1, MOVE_MEGADRAIN), - LEVEL_UP_MOVE( 1, MOVE_POISONPOWDER), + LEVEL_UP_MOVE( 1, MOVE_SWEETSCENT), LEVEL_UP_MOVE( 1, MOVE_STUNSPORE), - LEVEL_UP_MOVE( 1, MOVE_GIGADRAIN), - LEVEL_UP_MOVE( 1, MOVE_TOXIC), - LEVEL_UP_MOVE( 1, MOVE_MOONBLAST), - LEVEL_UP_MOVE( 1, MOVE_APPLEACID), - LEVEL_UP_MOVE( 1, MOVE_GRASSYTERRAIN), - LEVEL_UP_MOVE( 1, MOVE_MOONLIGHT), - LEVEL_UP_MOVE( 1, MOVE_PETALDANCE), - LEVEL_UP_MOVE( 1, MOVE_PETALBLIZZARD), LEVEL_UP_MOVE( 1, MOVE_SUNNYDAY), - LEVEL_UP_MOVE( 1, MOVE_SLEEPPOWDER), - LEVEL_UP_MOVE( 1, MOVE_LUCKYCHANT), + LEVEL_UP_MOVE(39, MOVE_QUIVERDANCE), + LEVEL_UP_MOVE(49, MOVE_PETALBLIZZARD), + LEVEL_UP_MOVE(59, MOVE_PETALDANCE), + LEVEL_UP_MOVE(69, MOVE_LEAFSTORM), LEVEL_UP_END }; @@ -4198,10 +4245,10 @@ static const struct LevelUpMove sYanmaLevelUpLearnset[] = { LEVEL_UP_MOVE(27, MOVE_PURSUIT), LEVEL_UP_MOVE(30, MOVE_WINGATTACK), LEVEL_UP_MOVE(33, MOVE_ANCIENTPOWER), - LEVEL_UP_MOVE(37, MOVE_SCREECH), - LEVEL_UP_MOVE(41, MOVE_SILVERWIND), - LEVEL_UP_MOVE(45, MOVE_UPROAR), - LEVEL_UP_MOVE(49, MOVE_HYPNOSIS), + LEVEL_UP_MOVE(37, MOVE_SILVERWIND), + LEVEL_UP_MOVE(41, MOVE_SCREECH), + LEVEL_UP_MOVE(45, MOVE_HYPNOSIS), + LEVEL_UP_MOVE(49, MOVE_UPROAR), LEVEL_UP_MOVE(53, MOVE_AIRSLASH), LEVEL_UP_MOVE(57, MOVE_UTURN), LEVEL_UP_MOVE(63, MOVE_BUGBUZZ), @@ -4321,7 +4368,7 @@ static const struct LevelUpMove sMurkrowLevelUpLearnset[] = { LEVEL_UP_MOVE(48, MOVE_SUCKERPUNCH), LEVEL_UP_MOVE(53, MOVE_TAILWIND), LEVEL_UP_MOVE(57, MOVE_FOULPLAY), - LEVEL_UP_MOVE(62, MOVE_TORMENT), + LEVEL_UP_MOVE(62, MOVE_OBLIVIONWING), LEVEL_UP_MOVE(66, MOVE_QUASH), LEVEL_UP_END }; @@ -4513,7 +4560,6 @@ static const struct LevelUpMove sSteelixLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_HARDEN), LEVEL_UP_MOVE( 1, MOVE_BIND), - LEVEL_UP_MOVE( 1, MOVE_ROCKTHROW), LEVEL_UP_MOVE( 4, MOVE_SMACKDOWN), LEVEL_UP_MOVE( 8, MOVE_AUTOTOMIZE), LEVEL_UP_MOVE(12, MOVE_DRAGONBREATH), @@ -4717,7 +4763,7 @@ static const struct LevelUpMove sTeddiursaLevelUpLearnset[] = { }; static const struct LevelUpMove sUrsaringLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_HAMMERARM), + LEVEL_UP_MOVE( 1, MOVE_CRUSHGRIP), LEVEL_UP_MOVE( 1, MOVE_FLING), LEVEL_UP_MOVE( 1, MOVE_BABYDOLLEYES), LEVEL_UP_MOVE( 1, MOVE_CHARM), @@ -4747,17 +4793,18 @@ static const struct LevelUpMove sSlugmaLevelUpLearnset[] = { LEVEL_UP_MOVE( 8, MOVE_ROCKTHROW), LEVEL_UP_MOVE(13, MOVE_HARDEN), LEVEL_UP_MOVE(15, MOVE_INCINERATE), - LEVEL_UP_MOVE(20, MOVE_CLEARSMOG), - LEVEL_UP_MOVE(22, MOVE_ANCIENTPOWER), - LEVEL_UP_MOVE(25, MOVE_FLAMEBURST), - LEVEL_UP_MOVE(28, MOVE_SCORCHINGSANDS), - LEVEL_UP_MOVE(31, MOVE_ROCKSLIDE), - LEVEL_UP_MOVE(34, MOVE_LAVAPLUME), + LEVEL_UP_MOVE(18, MOVE_CLEARSMOG), + LEVEL_UP_MOVE(21, MOVE_ANCIENTPOWER), + LEVEL_UP_MOVE(24, MOVE_FLAMEBURST), + LEVEL_UP_MOVE(27, MOVE_SCORCHINGSANDS), + LEVEL_UP_MOVE(30, MOVE_ROCKSLIDE), + LEVEL_UP_MOVE(33, MOVE_LAVAPLUME), LEVEL_UP_MOVE(36, MOVE_AMNESIA), - LEVEL_UP_MOVE(41, MOVE_BODYSLAM), - LEVEL_UP_MOVE(43, MOVE_RECOVER), - LEVEL_UP_MOVE(48, MOVE_FLAMETHROWER), - LEVEL_UP_MOVE(50, MOVE_EARTHPOWER), + LEVEL_UP_MOVE(39, MOVE_BODYSLAM), + LEVEL_UP_MOVE(42, MOVE_RECOVER), + LEVEL_UP_MOVE(45, MOVE_FLAMETHROWER), + LEVEL_UP_MOVE(48, MOVE_EARTHPOWER), + LEVEL_UP_MOVE(51, MOVE_MAGMASTORM), LEVEL_UP_END }; @@ -4769,19 +4816,19 @@ static const struct LevelUpMove sMagcargoLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_ROCKTHROW), LEVEL_UP_MOVE(13, MOVE_HARDEN), LEVEL_UP_MOVE(15, MOVE_INCINERATE), - LEVEL_UP_MOVE(20, MOVE_CLEARSMOG), - LEVEL_UP_MOVE(22, MOVE_ANCIENTPOWER), - LEVEL_UP_MOVE(25, MOVE_FLAMEBURST), - LEVEL_UP_MOVE(28, MOVE_SCORCHINGSANDS), - LEVEL_UP_MOVE(31, MOVE_ROCKSLIDE), - LEVEL_UP_MOVE(34, MOVE_LAVAPLUME), + LEVEL_UP_MOVE(18, MOVE_CLEARSMOG), + LEVEL_UP_MOVE(21, MOVE_ANCIENTPOWER), + LEVEL_UP_MOVE(24, MOVE_FLAMEBURST), + LEVEL_UP_MOVE(27, MOVE_SCORCHINGSANDS), + LEVEL_UP_MOVE(30, MOVE_ROCKSLIDE), + LEVEL_UP_MOVE(33, MOVE_LAVAPLUME), LEVEL_UP_MOVE(36, MOVE_AMNESIA), LEVEL_UP_MOVE(37, MOVE_SHELLSMASH), - LEVEL_UP_MOVE(43, MOVE_BODYSLAM), - LEVEL_UP_MOVE(47, MOVE_RECOVER), - LEVEL_UP_MOVE(54, MOVE_FLAMETHROWER), - LEVEL_UP_MOVE(58, MOVE_EARTHPOWER), - LEVEL_UP_MOVE(63, MOVE_STONEEDGE), + LEVEL_UP_MOVE(42, MOVE_BODYSLAM), + LEVEL_UP_MOVE(46, MOVE_RECOVER), + LEVEL_UP_MOVE(50, MOVE_FLAMETHROWER), + LEVEL_UP_MOVE(54, MOVE_EARTHPOWER), + LEVEL_UP_MOVE(58, MOVE_MAGMASTORM), LEVEL_UP_END }; @@ -4898,7 +4945,18 @@ static const struct LevelUpMove sOctilleryLevelUpLearnset[] = { static const struct LevelUpMove sDelibirdLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_PRESENT), - LEVEL_UP_MOVE(25, MOVE_DRILLPECK), + LEVEL_UP_MOVE(10, MOVE_FAKEOUT), + LEVEL_UP_MOVE(13, MOVE_ICYWIND), + LEVEL_UP_MOVE(16, MOVE_PLUCK), + LEVEL_UP_MOVE(19, MOVE_AURORABEAM), + LEVEL_UP_MOVE(22, MOVE_BESTOW), + LEVEL_UP_MOVE(24, MOVE_DRILLPECK), + LEVEL_UP_MOVE(27, MOVE_AGILITY), + LEVEL_UP_MOVE(29, MOVE_FREEZEDRY), + LEVEL_UP_MOVE(32, MOVE_SPIKES), + LEVEL_UP_MOVE(34, MOVE_ICEPUNCH), + LEVEL_UP_MOVE(37, MOVE_DEFOG), + LEVEL_UP_MOVE(39, MOVE_BRAVEBIRD), LEVEL_UP_END }; @@ -4950,45 +5008,44 @@ static const struct LevelUpMove sHoundourLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 1, MOVE_EMBER), LEVEL_UP_MOVE( 4, MOVE_HOWL), - LEVEL_UP_MOVE( 8, MOVE_SMOG), - LEVEL_UP_MOVE(13, MOVE_ROAR), - LEVEL_UP_MOVE(16, MOVE_BITE), - LEVEL_UP_MOVE(19, MOVE_FIREFANG), - LEVEL_UP_MOVE(22, MOVE_ODORSLEUTH), - LEVEL_UP_MOVE(25, MOVE_BEATUP), + LEVEL_UP_MOVE( 7, MOVE_SMOG), + LEVEL_UP_MOVE(10, MOVE_PURSUIT), + LEVEL_UP_MOVE(13, MOVE_ODORSLEUTH), + LEVEL_UP_MOVE(16, MOVE_FIREFANG), + LEVEL_UP_MOVE(19, MOVE_BITE), + LEVEL_UP_MOVE(22, MOVE_ROAR), + LEVEL_UP_MOVE(25, MOVE_PUNISHMENT), LEVEL_UP_MOVE(28, MOVE_INCINERATE), - LEVEL_UP_MOVE(32, MOVE_FEINTATTACK), - LEVEL_UP_MOVE(37, MOVE_EMBARGO), - LEVEL_UP_MOVE(40, MOVE_FOULPLAY), - LEVEL_UP_MOVE(44, MOVE_FLAMETHROWER), - LEVEL_UP_MOVE(49, MOVE_CRUNCH), - LEVEL_UP_MOVE(52, MOVE_NASTYPLOT), - LEVEL_UP_MOVE(56, MOVE_DARKPULSE), - LEVEL_UP_MOVE(62, MOVE_INFERNO), + LEVEL_UP_MOVE(32, MOVE_CRUNCH), + LEVEL_UP_MOVE(36, MOVE_EMBARGO), + LEVEL_UP_MOVE(39, MOVE_FLAMETHROWER), + LEVEL_UP_MOVE(43, MOVE_FOULPLAY), + LEVEL_UP_MOVE(47, MOVE_NASTYPLOT), + LEVEL_UP_MOVE(50, MOVE_FIERYWRATH), + LEVEL_UP_MOVE(54, MOVE_INFERNO), LEVEL_UP_END }; static const struct LevelUpMove sHoundoomLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_NASTYPLOT), LEVEL_UP_MOVE( 1, MOVE_THUNDERFANG), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 1, MOVE_EMBER), LEVEL_UP_MOVE( 1, MOVE_HOWL), LEVEL_UP_MOVE( 1, MOVE_SMOG), - LEVEL_UP_MOVE(13, MOVE_ROAR), - LEVEL_UP_MOVE(16, MOVE_BITE), - LEVEL_UP_MOVE(19, MOVE_FIREFANG), - LEVEL_UP_MOVE(22, MOVE_ODORSLEUTH), - LEVEL_UP_MOVE(26, MOVE_BEATUP), + LEVEL_UP_MOVE(10, MOVE_PURSUIT), + LEVEL_UP_MOVE(13, MOVE_ODORSLEUTH), + LEVEL_UP_MOVE(16, MOVE_FIREFANG), + LEVEL_UP_MOVE(19, MOVE_BITE), + LEVEL_UP_MOVE(22, MOVE_ROAR), + LEVEL_UP_MOVE(26, MOVE_PUNISHMENT), LEVEL_UP_MOVE(30, MOVE_INCINERATE), - LEVEL_UP_MOVE(35, MOVE_FEINTATTACK), - LEVEL_UP_MOVE(41, MOVE_EMBARGO), - LEVEL_UP_MOVE(45, MOVE_FOULPLAY), - LEVEL_UP_MOVE(50, MOVE_FLAMETHROWER), - LEVEL_UP_MOVE(56, MOVE_CRUNCH), - LEVEL_UP_MOVE(60, MOVE_NASTYPLOT), - LEVEL_UP_MOVE(65, MOVE_DARKPULSE), - LEVEL_UP_MOVE(70, MOVE_INFERNO), + LEVEL_UP_MOVE(35, MOVE_CRUNCH), + LEVEL_UP_MOVE(40, MOVE_EMBARGO), + LEVEL_UP_MOVE(44, MOVE_FLAMETHROWER), + LEVEL_UP_MOVE(49, MOVE_FOULPLAY), + LEVEL_UP_MOVE(54, MOVE_NASTYPLOT), + LEVEL_UP_MOVE(58, MOVE_FIERYWRATH), + LEVEL_UP_MOVE(63, MOVE_INFERNO), LEVEL_UP_END }; @@ -5092,14 +5149,15 @@ static const struct LevelUpMove sStantlerLevelUpLearnset[] = { LEVEL_UP_MOVE(13, MOVE_STOMP), LEVEL_UP_MOVE(16, MOVE_SANDATTACK), LEVEL_UP_MOVE(21, MOVE_TAKEDOWN), - LEVEL_UP_MOVE(23, MOVE_CONFUSERAY), + LEVEL_UP_MOVE(24, MOVE_CONFUSERAY), LEVEL_UP_MOVE(27, MOVE_CALMMIND), - LEVEL_UP_MOVE(33, MOVE_ZENHEADBUTT), - LEVEL_UP_MOVE(39, MOVE_ROLEPLAY), - LEVEL_UP_MOVE(45, MOVE_JUMPKICK), - LEVEL_UP_MOVE(51, MOVE_IMPRISON), - LEVEL_UP_MOVE(57, MOVE_MEGAHORN), - LEVEL_UP_MOVE(63, MOVE_THRASH), + LEVEL_UP_MOVE(32, MOVE_ZENHEADBUTT), + LEVEL_UP_MOVE(38, MOVE_ROLEPLAY), + LEVEL_UP_MOVE(43, MOVE_IMPRISON), + LEVEL_UP_MOVE(48, MOVE_JUMPKICK), + LEVEL_UP_MOVE(54, MOVE_MEGAHORN), + LEVEL_UP_MOVE(60, MOVE_NORETREAT), + LEVEL_UP_MOVE(65, MOVE_THRASH), LEVEL_UP_END }; @@ -5264,6 +5322,7 @@ static const struct LevelUpMove sBlisseyLevelUpLearnset[] = { static const struct LevelUpMove sRaikouLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_EXTREMESPEED), + LEVEL_UP_MOVE( 1, MOVE_AURASPHERE), LEVEL_UP_MOVE( 1, MOVE_THUNDERSHOCK), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 1, MOVE_CHARGE), @@ -5679,10 +5738,10 @@ static const struct LevelUpMove sPoochyenaLevelUpLearnset[] = { LEVEL_UP_MOVE( 4, MOVE_HOWL), LEVEL_UP_MOVE( 7, MOVE_SANDATTACK), LEVEL_UP_MOVE( 9, MOVE_ODORSLEUTH), - LEVEL_UP_MOVE(12, MOVE_BITE), + LEVEL_UP_MOVE(12, MOVE_ASSURANCE), LEVEL_UP_MOVE(16, MOVE_SWAGGER), LEVEL_UP_MOVE(19, MOVE_ROAR), - LEVEL_UP_MOVE(22, MOVE_ASSURANCE), + LEVEL_UP_MOVE(22, MOVE_BITE), LEVEL_UP_MOVE(26, MOVE_SCARYFACE), LEVEL_UP_MOVE(29, MOVE_TAKEDOWN), LEVEL_UP_MOVE(33, MOVE_SUCKERPUNCH), @@ -5705,11 +5764,11 @@ static const struct LevelUpMove sMightyenaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_HOWL), LEVEL_UP_MOVE( 1, MOVE_SANDATTACK), LEVEL_UP_MOVE( 1, MOVE_ODORSLEUTH), - LEVEL_UP_MOVE(12, MOVE_BITE), + LEVEL_UP_MOVE(12, MOVE_ASSURANCE), LEVEL_UP_MOVE(16, MOVE_SWAGGER), LEVEL_UP_MOVE(17, MOVE_SNARL), LEVEL_UP_MOVE(20, MOVE_ROAR), - LEVEL_UP_MOVE(24, MOVE_ASSURANCE), + LEVEL_UP_MOVE(24, MOVE_BITE), LEVEL_UP_MOVE(29, MOVE_SCARYFACE), LEVEL_UP_MOVE(33, MOVE_TAKEDOWN), LEVEL_UP_MOVE(38, MOVE_SUCKERPUNCH), @@ -5786,6 +5845,7 @@ static const struct LevelUpMove sSilcoonLevelUpLearnset[] = { static const struct LevelUpMove sBeautiflyLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_GUST), + LEVEL_UP_MOVE( 1, MOVE_RAGE), LEVEL_UP_MOVE( 1, MOVE_HARDEN), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_STRINGSHOT), @@ -5803,7 +5863,7 @@ static const struct LevelUpMove sBeautiflyLevelUpLearnset[] = { LEVEL_UP_MOVE(36, MOVE_WHIRLWIND), LEVEL_UP_MOVE(39, MOVE_GIGADRAIN), LEVEL_UP_MOVE(42, MOVE_BUGBUZZ), - LEVEL_UP_MOVE(45, MOVE_RAGE), + LEVEL_UP_MOVE(45, MOVE_AIRSLASH), LEVEL_UP_MOVE(48, MOVE_QUIVERDANCE), LEVEL_UP_END }; @@ -5828,10 +5888,10 @@ static const struct LevelUpMove sDustoxLevelUpLearnset[] = { LEVEL_UP_MOVE(21, MOVE_MOONLIGHT), LEVEL_UP_MOVE(24, MOVE_VENOSHOCK), LEVEL_UP_MOVE(27, MOVE_PSYBEAM), - LEVEL_UP_MOVE(30, MOVE_SILVERWIND), + LEVEL_UP_MOVE(30, MOVE_LUNGE), LEVEL_UP_MOVE(33, MOVE_LIGHTSCREEN), LEVEL_UP_MOVE(36, MOVE_WHIRLWIND), - LEVEL_UP_MOVE(39, MOVE_TOXIC), + LEVEL_UP_MOVE(39, MOVE_TOXICTHREAD), LEVEL_UP_MOVE(42, MOVE_BUGBUZZ), LEVEL_UP_MOVE(45, MOVE_PROTECT), LEVEL_UP_MOVE(48, MOVE_QUIVERDANCE), @@ -6244,6 +6304,7 @@ static const struct LevelUpMove sMasquerainLevelUpLearnset[] = { LEVEL_UP_MOVE(42, MOVE_WHIRLWIND), LEVEL_UP_MOVE(48, MOVE_BUGBUZZ), LEVEL_UP_MOVE(52, MOVE_QUIVERDANCE), + LEVEL_UP_MOVE(56, MOVE_HURRICANE), LEVEL_UP_END }; @@ -6666,11 +6727,11 @@ static const struct LevelUpMove sSharpedoLevelUpLearnset[] = { static const struct LevelUpMove sTrapinchLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SANDATTACK), - LEVEL_UP_MOVE( 1, MOVE_FEINTATTACK), + LEVEL_UP_MOVE( 1, MOVE_ASTONISH), LEVEL_UP_MOVE( 1, MOVE_BIDE), LEVEL_UP_MOVE( 4, MOVE_LASERFOCUS), - LEVEL_UP_MOVE( 7, MOVE_BITE), - LEVEL_UP_MOVE(11, MOVE_MUDSLAP), + LEVEL_UP_MOVE( 7, MOVE_MUDSLAP), + LEVEL_UP_MOVE(11, MOVE_BITE), LEVEL_UP_MOVE(15, MOVE_SANDTOMB), LEVEL_UP_MOVE(19, MOVE_FEINT), LEVEL_UP_MOVE(23, MOVE_BULLDOZE), @@ -6688,6 +6749,7 @@ static const struct LevelUpMove sTrapinchLevelUpLearnset[] = { static const struct LevelUpMove sVibravaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DRAGONBREATH), + LEVEL_UP_MOVE( 1, MOVE_DRAGONRUSH), LEVEL_UP_MOVE( 1, MOVE_LASERFOCUS), LEVEL_UP_MOVE( 1, MOVE_BITE), LEVEL_UP_MOVE( 1, MOVE_FEINT), @@ -6697,11 +6759,11 @@ static const struct LevelUpMove sVibravaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_HYPERBEAM), LEVEL_UP_MOVE( 1, MOVE_FISSURE), LEVEL_UP_MOVE( 1, MOVE_SANDATTACK), - LEVEL_UP_MOVE( 1, MOVE_FEINTATTACK), + LEVEL_UP_MOVE( 1, MOVE_ASTONISH), LEVEL_UP_MOVE( 1, MOVE_BIDE), LEVEL_UP_MOVE( 4, MOVE_SUPERSONIC), - LEVEL_UP_MOVE( 7, MOVE_SONICBOOM), - LEVEL_UP_MOVE(11, MOVE_MUDSLAP), + LEVEL_UP_MOVE( 7, MOVE_MUDSLAP), + LEVEL_UP_MOVE(11, MOVE_SONICBOOM), LEVEL_UP_MOVE(15, MOVE_SANDTOMB), LEVEL_UP_MOVE(19, MOVE_DRAGONTAIL), LEVEL_UP_MOVE(23, MOVE_BULLDOZE), @@ -6709,17 +6771,18 @@ static const struct LevelUpMove sVibravaLevelUpLearnset[] = { LEVEL_UP_MOVE(31, MOVE_SCREECH), LEVEL_UP_MOVE(34, MOVE_DRAGONBREATH), LEVEL_UP_MOVE(35, MOVE_BUGBUZZ), - LEVEL_UP_MOVE(42, MOVE_EARTHPOWER), - LEVEL_UP_MOVE(47, MOVE_SANDSTORM), - LEVEL_UP_MOVE(51, MOVE_EARTHQUAKE), - LEVEL_UP_MOVE(56, MOVE_UPROAR), - LEVEL_UP_MOVE(61, MOVE_DRAGONRUSH), - LEVEL_UP_MOVE(66, MOVE_BOOMBURST), + LEVEL_UP_MOVE(40, MOVE_EARTHPOWER), + LEVEL_UP_MOVE(45, MOVE_UPROAR), + LEVEL_UP_MOVE(50, MOVE_EARTHQUAKE), + LEVEL_UP_MOVE(55, MOVE_SANDSTORM), + LEVEL_UP_MOVE(59, MOVE_CLANGINGSCALES), + LEVEL_UP_MOVE(64, MOVE_BOOMBURST), LEVEL_UP_END }; static const struct LevelUpMove sFlygonLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DRAGONCLAW), + LEVEL_UP_MOVE( 1, MOVE_DRAGONRUSH), LEVEL_UP_MOVE( 1, MOVE_DRAGONDANCE), LEVEL_UP_MOVE( 1, MOVE_LASERFOCUS), LEVEL_UP_MOVE( 1, MOVE_BITE), @@ -6730,11 +6793,11 @@ static const struct LevelUpMove sFlygonLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_HYPERBEAM), LEVEL_UP_MOVE( 1, MOVE_FISSURE), LEVEL_UP_MOVE( 1, MOVE_SANDATTACK), - LEVEL_UP_MOVE( 1, MOVE_FEINTATTACK), + LEVEL_UP_MOVE( 1, MOVE_ASTONISH), LEVEL_UP_MOVE( 1, MOVE_BIDE), LEVEL_UP_MOVE( 4, MOVE_SUPERSONIC), - LEVEL_UP_MOVE( 7, MOVE_SONICBOOM), - LEVEL_UP_MOVE(11, MOVE_MUDSLAP), + LEVEL_UP_MOVE( 7, MOVE_MUDSLAP), + LEVEL_UP_MOVE(11, MOVE_SONICBOOM), LEVEL_UP_MOVE(15, MOVE_SANDTOMB), LEVEL_UP_MOVE(19, MOVE_DRAGONTAIL), LEVEL_UP_MOVE(23, MOVE_BULLDOZE), @@ -6742,13 +6805,13 @@ static const struct LevelUpMove sFlygonLevelUpLearnset[] = { LEVEL_UP_MOVE(31, MOVE_SCREECH), LEVEL_UP_MOVE(34, MOVE_DRAGONBREATH), LEVEL_UP_MOVE(35, MOVE_BUGBUZZ), - LEVEL_UP_MOVE(42, MOVE_EARTHPOWER), + LEVEL_UP_MOVE(40, MOVE_EARTHPOWER), LEVEL_UP_MOVE(44, MOVE_DRAGONCLAW), - LEVEL_UP_MOVE(49, MOVE_SANDSTORM), - LEVEL_UP_MOVE(54, MOVE_EARTHQUAKE), - LEVEL_UP_MOVE(60, MOVE_UPROAR), - LEVEL_UP_MOVE(66, MOVE_DRAGONRUSH), - LEVEL_UP_MOVE(72, MOVE_BOOMBURST), + LEVEL_UP_MOVE(45, MOVE_UPROAR), + LEVEL_UP_MOVE(52, MOVE_EARTHQUAKE), + LEVEL_UP_MOVE(58, MOVE_SANDSTORM), + LEVEL_UP_MOVE(63, MOVE_CLANGINGSCALES), + LEVEL_UP_MOVE(69, MOVE_BOOMBURST), LEVEL_UP_END }; @@ -6759,22 +6822,23 @@ static const struct LevelUpMove sMakuhitaLevelUpLearnset[] = { LEVEL_UP_MOVE( 7, MOVE_ARMTHRUST), LEVEL_UP_MOVE(10, MOVE_FAKEOUT), LEVEL_UP_MOVE(13, MOVE_FORCEPALM), - LEVEL_UP_MOVE(16, MOVE_WHIRLWIND), - LEVEL_UP_MOVE(19, MOVE_KNOCKOFF), - LEVEL_UP_MOVE(22, MOVE_VITALTHROW), - LEVEL_UP_MOVE(25, MOVE_SMELLINGSALTS), - LEVEL_UP_MOVE(28, MOVE_SEISMICTOSS), - LEVEL_UP_MOVE(31, MOVE_WAKEUPSLAP), - LEVEL_UP_MOVE(34, MOVE_BELLYDRUM), - LEVEL_UP_MOVE(37, MOVE_ENDURE), - LEVEL_UP_MOVE(40, MOVE_REVERSAL), - LEVEL_UP_MOVE(43, MOVE_HEAVYSLAM), - LEVEL_UP_MOVE(46, MOVE_CLOSECOMBAT), + LEVEL_UP_MOVE(16, MOVE_KNOCKOFF), + LEVEL_UP_MOVE(19, MOVE_WIDEGUARD), + LEVEL_UP_MOVE(21, MOVE_WAKEUPSLAP), + LEVEL_UP_MOVE(24, MOVE_SMELLINGSALTS), + LEVEL_UP_MOVE(27, MOVE_WHIRLWIND), + LEVEL_UP_MOVE(29, MOVE_SEISMICTOSS), + LEVEL_UP_MOVE(32, MOVE_BELLYDRUM), + LEVEL_UP_MOVE(35, MOVE_REVENGE), + LEVEL_UP_MOVE(39, MOVE_ENDURE), + LEVEL_UP_MOVE(42, MOVE_REVERSAL), + LEVEL_UP_MOVE(46, MOVE_HEAVYSLAM), + LEVEL_UP_MOVE(50, MOVE_CLOSECOMBAT), LEVEL_UP_END }; static const struct LevelUpMove sHariyamaLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_BRINE), + LEVEL_UP_MOVE( 0, MOVE_BRINE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_FOCUSENERGY), LEVEL_UP_MOVE( 1, MOVE_SANDATTACK), @@ -6783,17 +6847,18 @@ static const struct LevelUpMove sHariyamaLevelUpLearnset[] = { LEVEL_UP_MOVE( 7, MOVE_ARMTHRUST), LEVEL_UP_MOVE(10, MOVE_FAKEOUT), LEVEL_UP_MOVE(13, MOVE_FORCEPALM), - LEVEL_UP_MOVE(16, MOVE_WHIRLWIND), - LEVEL_UP_MOVE(19, MOVE_KNOCKOFF), - LEVEL_UP_MOVE(22, MOVE_VITALTHROW), - LEVEL_UP_MOVE(26, MOVE_SMELLINGSALTS), - LEVEL_UP_MOVE(30, MOVE_SEISMICTOSS), - LEVEL_UP_MOVE(34, MOVE_WAKEUPSLAP), - LEVEL_UP_MOVE(38, MOVE_BELLYDRUM), - LEVEL_UP_MOVE(42, MOVE_ENDURE), - LEVEL_UP_MOVE(46, MOVE_REVERSAL), - LEVEL_UP_MOVE(50, MOVE_HEAVYSLAM), - LEVEL_UP_MOVE(54, MOVE_CLOSECOMBAT), + LEVEL_UP_MOVE(16, MOVE_KNOCKOFF), + LEVEL_UP_MOVE(19, MOVE_WIDEGUARD), + LEVEL_UP_MOVE(21, MOVE_WAKEUPSLAP), + LEVEL_UP_MOVE(24, MOVE_SMELLINGSALTS), + LEVEL_UP_MOVE(28, MOVE_WHIRLWIND), + LEVEL_UP_MOVE(31, MOVE_SEISMICTOSS), + LEVEL_UP_MOVE(35, MOVE_BELLYDRUM), + LEVEL_UP_MOVE(39, MOVE_REVENGE), + LEVEL_UP_MOVE(44, MOVE_ENDURE), + LEVEL_UP_MOVE(47, MOVE_REVERSAL), + LEVEL_UP_MOVE(52, MOVE_HEAVYSLAM), + LEVEL_UP_MOVE(57, MOVE_CLOSECOMBAT), LEVEL_UP_END }; @@ -7046,7 +7111,7 @@ static const struct LevelUpMove sLunatoneLevelUpLearnset[] = { LEVEL_UP_MOVE(17, MOVE_EMBARGO), LEVEL_UP_MOVE(21, MOVE_ROCKSLIDE), LEVEL_UP_MOVE(25, MOVE_COSMICPOWER), - LEVEL_UP_MOVE(29, MOVE_PSYSHOCK), + LEVEL_UP_MOVE(29, MOVE_EERIESPELL), LEVEL_UP_MOVE(33, MOVE_HEALBLOCK), LEVEL_UP_MOVE(37, MOVE_STONEEDGE), LEVEL_UP_MOVE(41, MOVE_PSYCHIC), @@ -7068,7 +7133,7 @@ static const struct LevelUpMove sSolrockLevelUpLearnset[] = { LEVEL_UP_MOVE(17, MOVE_EMBARGO), LEVEL_UP_MOVE(21, MOVE_ROCKSLIDE), LEVEL_UP_MOVE(25, MOVE_COSMICPOWER), - LEVEL_UP_MOVE(29, MOVE_PSYSHOCK), + LEVEL_UP_MOVE(29, MOVE_EERIESPELL), LEVEL_UP_MOVE(33, MOVE_HEALBLOCK), LEVEL_UP_MOVE(37, MOVE_STONEEDGE), LEVEL_UP_MOVE(41, MOVE_PSYCHIC), @@ -7936,9 +8001,9 @@ static const struct LevelUpMove sAnorithLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_HARDEN), LEVEL_UP_MOVE( 1, MOVE_MUDSPORT), LEVEL_UP_MOVE( 4, MOVE_WATERGUN), - LEVEL_UP_MOVE( 8, MOVE_SMACKDOWN), + LEVEL_UP_MOVE( 8, MOVE_ANCIENTPOWER), LEVEL_UP_MOVE(12, MOVE_METALCLAW), - LEVEL_UP_MOVE(16, MOVE_ANCIENTPOWER), + LEVEL_UP_MOVE(16, MOVE_SMACKDOWN), LEVEL_UP_MOVE(20, MOVE_BUGBITE), LEVEL_UP_MOVE(24, MOVE_BRINE), LEVEL_UP_MOVE(28, MOVE_SLASH), @@ -7956,9 +8021,9 @@ static const struct LevelUpMove sArmaldoLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_HARDEN), LEVEL_UP_MOVE( 1, MOVE_MUDSPORT), LEVEL_UP_MOVE( 1, MOVE_WATERGUN), - LEVEL_UP_MOVE( 8, MOVE_SMACKDOWN), + LEVEL_UP_MOVE( 8, MOVE_ANCIENTPOWER), LEVEL_UP_MOVE(12, MOVE_METALCLAW), - LEVEL_UP_MOVE(16, MOVE_ANCIENTPOWER), + LEVEL_UP_MOVE(16, MOVE_SMACKDOWN), LEVEL_UP_MOVE(20, MOVE_BUGBITE), LEVEL_UP_MOVE(24, MOVE_BRINE), LEVEL_UP_MOVE(28, MOVE_SLASH), @@ -8032,7 +8097,7 @@ static const struct LevelUpMove sGardevoirLevelUpLearnset[] = { LEVEL_UP_MOVE(18, MOVE_PSYBEAM), LEVEL_UP_MOVE(23, MOVE_LIFEDEW), LEVEL_UP_MOVE(28, MOVE_CHARM), - LEVEL_UP_MOVE(29, MOVE_SPIRITBREAK), + LEVEL_UP_MOVE(29, MOVE_DRAININGKISS), LEVEL_UP_MOVE(35, MOVE_CALMMIND), LEVEL_UP_MOVE(39, MOVE_STOREDPOWER), LEVEL_UP_MOVE(42, MOVE_IMPRISON), @@ -8258,7 +8323,6 @@ static const struct LevelUpMove sGroudonLevelUpLearnset[] = { static const struct LevelUpMove sRayquazaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_DRAGONASCENT), - LEVEL_UP_MOVE( 1, MOVE_VCREATE), LEVEL_UP_MOVE( 1, MOVE_TWISTER), LEVEL_UP_MOVE( 1, MOVE_ANCIENTPOWER), LEVEL_UP_MOVE( 1, MOVE_AIRSLASH), @@ -8273,6 +8337,7 @@ static const struct LevelUpMove sRayquazaLevelUpLearnset[] = { LEVEL_UP_MOVE(72, MOVE_HURRICANE), LEVEL_UP_MOVE(81, MOVE_OUTRAGE), LEVEL_UP_MOVE(90, MOVE_HYPERBEAM), + LEVEL_UP_MOVE(100, MOVE_VCREATE), LEVEL_UP_END }; @@ -8326,11 +8391,13 @@ static const struct LevelUpMove sLatiosLevelUpLearnset[] = { }; static const struct LevelUpMove sJirachiLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_HAPPYHOUR), LEVEL_UP_MOVE( 1, MOVE_CONFUSION), LEVEL_UP_MOVE( 1, MOVE_WISH), LEVEL_UP_MOVE( 7, MOVE_SWIFT), LEVEL_UP_MOVE(14, MOVE_HELPINGHAND), LEVEL_UP_MOVE(20, MOVE_LIFEDEW), + LEVEL_UP_MOVE(26, MOVE_MISTBALL), LEVEL_UP_MOVE(26, MOVE_ZENHEADBUTT), LEVEL_UP_MOVE(32, MOVE_REFRESH), LEVEL_UP_MOVE(32, MOVE_LUCKYCHANT), @@ -8637,6 +8704,7 @@ static const struct LevelUpMove sBidoofLevelUpLearnset[] = { static const struct LevelUpMove sBibarelLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_WATERGUN), + LEVEL_UP_MOVE( 1, MOVE_AMNESIA), LEVEL_UP_MOVE( 1, MOVE_AQUAJET), LEVEL_UP_MOVE( 1, MOVE_ROTOTILLER), LEVEL_UP_MOVE( 1, MOVE_TACKLE), @@ -8652,7 +8720,7 @@ static const struct LevelUpMove sBibarelLevelUpLearnset[] = { LEVEL_UP_MOVE(38, MOVE_TAKEDOWN), LEVEL_UP_MOVE(43, MOVE_SUPERFANG), LEVEL_UP_MOVE(48, MOVE_SWORDSDANCE), - LEVEL_UP_MOVE(53, MOVE_AMNESIA), + LEVEL_UP_MOVE(53, MOVE_TAILSLAP), LEVEL_UP_MOVE(58, MOVE_SUPERPOWER), LEVEL_UP_MOVE(63, MOVE_CURSE), LEVEL_UP_END @@ -8700,9 +8768,9 @@ static const struct LevelUpMove sShinxLevelUpLearnset[] = { LEVEL_UP_MOVE(30, MOVE_THUNDERWAVE), LEVEL_UP_MOVE(33, MOVE_THUNDERFANG), LEVEL_UP_MOVE(36, MOVE_CRUNCH), - LEVEL_UP_MOVE(40, MOVE_DISCHARGE), + LEVEL_UP_MOVE(40, MOVE_WILDCHARGE), LEVEL_UP_MOVE(43, MOVE_SWAGGER), - LEVEL_UP_MOVE(46, MOVE_WILDCHARGE), + LEVEL_UP_MOVE(46, MOVE_VOLTTACKLE), LEVEL_UP_END }; @@ -8720,9 +8788,9 @@ static const struct LevelUpMove sLuxioLevelUpLearnset[] = { LEVEL_UP_MOVE(34, MOVE_THUNDERWAVE), LEVEL_UP_MOVE(37, MOVE_THUNDERFANG), LEVEL_UP_MOVE(41, MOVE_CRUNCH), - LEVEL_UP_MOVE(45, MOVE_DISCHARGE), + LEVEL_UP_MOVE(45, MOVE_WILDCHARGE), LEVEL_UP_MOVE(49, MOVE_SWAGGER), - LEVEL_UP_MOVE(52, MOVE_WILDCHARGE), + LEVEL_UP_MOVE(52, MOVE_VOLTTACKLE), LEVEL_UP_END }; @@ -8742,9 +8810,9 @@ static const struct LevelUpMove sLuxrayLevelUpLearnset[] = { LEVEL_UP_MOVE(35, MOVE_THUNDERWAVE), LEVEL_UP_MOVE(39, MOVE_THUNDERFANG), LEVEL_UP_MOVE(44, MOVE_CRUNCH), - LEVEL_UP_MOVE(49, MOVE_DISCHARGE), + LEVEL_UP_MOVE(49, MOVE_WILDCHARGE), LEVEL_UP_MOVE(54, MOVE_SWAGGER), - LEVEL_UP_MOVE(58, MOVE_WILDCHARGE), + LEVEL_UP_MOVE(58, MOVE_VOLTTACKLE), LEVEL_UP_END }; @@ -8838,6 +8906,7 @@ static const struct LevelUpMove sShieldonLevelUpLearnset[] = { static const struct LevelUpMove sBastiodonLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_BLOCK), + LEVEL_UP_MOVE( 1, MOVE_BEHEMOTHBASH), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_PROTECT), LEVEL_UP_MOVE( 1, MOVE_TAUNT), @@ -8866,6 +8935,7 @@ static const struct LevelUpMove sBurmyLevelUpLearnset[] = { static const struct LevelUpMove sWormadamLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_QUIVERDANCE), + LEVEL_UP_MOVE( 1, MOVE_ANCIENTPOWER), LEVEL_UP_MOVE( 1, MOVE_SUCKERPUNCH), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_PROTECT), @@ -8906,6 +8976,7 @@ static const struct LevelUpMove sMothimLevelUpLearnset[] = { LEVEL_UP_MOVE(44, MOVE_PSYCHIC), LEVEL_UP_MOVE(47, MOVE_BUGBUZZ), LEVEL_UP_MOVE(50, MOVE_LUNGE), + LEVEL_UP_MOVE(53, MOVE_HURRICANE), LEVEL_UP_END }; @@ -8964,40 +9035,40 @@ static const struct LevelUpMove sPachirisuLevelUpLearnset[] = { }; static const struct LevelUpMove sBuizelLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK), + LEVEL_UP_MOVE( 1, MOVE_WATERGUN), LEVEL_UP_MOVE( 4, MOVE_GROWL), LEVEL_UP_MOVE( 7, MOVE_WATERSPORT), - LEVEL_UP_MOVE(11, MOVE_WATERGUN), - LEVEL_UP_MOVE(15, MOVE_PURSUIT), - LEVEL_UP_MOVE(18, MOVE_SONICBOOM), - LEVEL_UP_MOVE(21, MOVE_SWIFT), - LEVEL_UP_MOVE(24, MOVE_AQUAJET), + LEVEL_UP_MOVE(11, MOVE_QUICKATTACK), + LEVEL_UP_MOVE(15, MOVE_AQUAJET), + LEVEL_UP_MOVE(19, MOVE_SONICBOOM), + LEVEL_UP_MOVE(23, MOVE_SWIFT), LEVEL_UP_MOVE(27, MOVE_DOUBLEHIT), - LEVEL_UP_MOVE(31, MOVE_WHIRLPOOL), + LEVEL_UP_MOVE(31, MOVE_TAILSLAP), LEVEL_UP_MOVE(35, MOVE_AQUATAIL), - LEVEL_UP_MOVE(38, MOVE_RAZORWIND), - LEVEL_UP_MOVE(41, MOVE_AGILITY), - LEVEL_UP_MOVE(45, MOVE_HYDROPUMP), + LEVEL_UP_MOVE(39, MOVE_RAZORWIND), + LEVEL_UP_MOVE(43, MOVE_AGILITY), + LEVEL_UP_MOVE(46, MOVE_HYDROPUMP), LEVEL_UP_END }; static const struct LevelUpMove sFloatzelLevelUpLearnset[] = { + LEVEL_UP_MOVE( 0, MOVE_FLIPTURN), LEVEL_UP_MOVE( 1, MOVE_ICEFANG), - LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK), + LEVEL_UP_MOVE( 1, MOVE_TAILSLAP), + LEVEL_UP_MOVE( 1, MOVE_WATERGUN), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_WATERSPORT), - LEVEL_UP_MOVE( 1, MOVE_WATERGUN), - LEVEL_UP_MOVE(15, MOVE_PURSUIT), - LEVEL_UP_MOVE(18, MOVE_SONICBOOM), - LEVEL_UP_MOVE(21, MOVE_SWIFT), - LEVEL_UP_MOVE(24, MOVE_AQUAJET), - LEVEL_UP_MOVE(29, MOVE_DOUBLEHIT), + LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK), + LEVEL_UP_MOVE(15, MOVE_AQUAJET), + LEVEL_UP_MOVE(19, MOVE_SONICBOOM), + LEVEL_UP_MOVE(23, MOVE_SWIFT), + LEVEL_UP_MOVE(25, MOVE_FLIPTURN), + LEVEL_UP_MOVE(28, MOVE_DOUBLEHIT), LEVEL_UP_MOVE(33, MOVE_CRUNCH), - LEVEL_UP_MOVE(37, MOVE_WHIRLPOOL), - LEVEL_UP_MOVE(41, MOVE_AQUATAIL), - LEVEL_UP_MOVE(45, MOVE_RAZORWIND), - LEVEL_UP_MOVE(51, MOVE_AGILITY), - LEVEL_UP_MOVE(57, MOVE_HYDROPUMP), + LEVEL_UP_MOVE(38, MOVE_AQUATAIL), + LEVEL_UP_MOVE(43, MOVE_RAZORWIND), + LEVEL_UP_MOVE(48, MOVE_AGILITY), + LEVEL_UP_MOVE(52, MOVE_HYDROPUMP), LEVEL_UP_END }; @@ -9138,6 +9209,7 @@ static const struct LevelUpMove sDrifblimLevelUpLearnset[] = { LEVEL_UP_MOVE(47, MOVE_BATONPASS), LEVEL_UP_MOVE(51, MOVE_AMNESIA), LEVEL_UP_MOVE(55, MOVE_EXPLOSION), + LEVEL_UP_MOVE(59, MOVE_ASTRALBARRAGE), LEVEL_UP_END }; @@ -9197,12 +9269,12 @@ static const struct LevelUpMove sLopunnyLevelUpLearnset[] = { static const struct LevelUpMove sMismagiusLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_MYSTICALFIRE), LEVEL_UP_MOVE( 1, MOVE_PHANTOMFORCE), + LEVEL_UP_MOVE( 1, MOVE_MOONGEISTBEAM), LEVEL_UP_MOVE( 1, MOVE_MAGICALLEAF), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_PSYWAVE), LEVEL_UP_MOVE( 1, MOVE_SPITE), LEVEL_UP_MOVE( 1, MOVE_ASTONISH), - LEVEL_UP_MOVE( 1, MOVE_CONFUSERAY), LEVEL_UP_MOVE( 1, MOVE_MEANLOOK), LEVEL_UP_MOVE( 1, MOVE_PSYBEAM), LEVEL_UP_MOVE( 1, MOVE_PAINSPLIT), @@ -9238,7 +9310,7 @@ static const struct LevelUpMove sHonchkrowLevelUpLearnset[] = { LEVEL_UP_MOVE(48, MOVE_SUCKERPUNCH), LEVEL_UP_MOVE(53, MOVE_NASTYPLOT), LEVEL_UP_MOVE(57, MOVE_DARKPULSE), - LEVEL_UP_MOVE(62, MOVE_TORMENT), + LEVEL_UP_MOVE(62, MOVE_OBLIVIONWING), LEVEL_UP_MOVE(66, MOVE_QUASH), LEVEL_UP_MOVE(70, MOVE_BRAVEBIRD), LEVEL_UP_END @@ -9368,6 +9440,7 @@ static const struct LevelUpMove sBronzorLevelUpLearnset[] = { LEVEL_UP_MOVE(40, MOVE_IRONDEFENSE), LEVEL_UP_MOVE(44, MOVE_METALSOUND), LEVEL_UP_MOVE(48, MOVE_FUTURESIGHT), + LEVEL_UP_MOVE(52, MOVE_DOOMDESIRE), LEVEL_UP_END }; @@ -9394,6 +9467,7 @@ static const struct LevelUpMove sBronzongLevelUpLearnset[] = { LEVEL_UP_MOVE(44, MOVE_IRONDEFENSE), LEVEL_UP_MOVE(50, MOVE_METALSOUND), LEVEL_UP_MOVE(56, MOVE_FUTURESIGHT), + LEVEL_UP_MOVE(62, MOVE_DOOMDESIRE), LEVEL_UP_END }; @@ -9504,10 +9578,10 @@ static const struct LevelUpMove sGibleLevelUpLearnset[] = { LEVEL_UP_MOVE(15, MOVE_SANDTOMB), LEVEL_UP_MOVE(18, MOVE_METALCLAW), LEVEL_UP_MOVE(21, MOVE_BITE), - LEVEL_UP_MOVE(24, MOVE_TAKEDOWN), + LEVEL_UP_MOVE(24, MOVE_BULLDOZE), LEVEL_UP_MOVE(27, MOVE_SLASH), - LEVEL_UP_MOVE(30, MOVE_BULLDOZE), - LEVEL_UP_MOVE(33, MOVE_DRAGONRAGE), + LEVEL_UP_MOVE(30, MOVE_DRAGONRAGE), + LEVEL_UP_MOVE(33, MOVE_TAKEDOWN), LEVEL_UP_MOVE(36, MOVE_DIG), LEVEL_UP_MOVE(39, MOVE_DRAGONCLAW), LEVEL_UP_MOVE(42, MOVE_STOMPINGTANTRUM), @@ -9527,10 +9601,10 @@ static const struct LevelUpMove sGabiteLevelUpLearnset[] = { LEVEL_UP_MOVE(18, MOVE_METALCLAW), LEVEL_UP_MOVE(21, MOVE_BITE), LEVEL_UP_MOVE(23, MOVE_DUALCHOP), - LEVEL_UP_MOVE(24, MOVE_TAKEDOWN), + LEVEL_UP_MOVE(24, MOVE_BULLDOZE), LEVEL_UP_MOVE(29, MOVE_SLASH), - LEVEL_UP_MOVE(33, MOVE_BULLDOZE), - LEVEL_UP_MOVE(37, MOVE_DRAGONRAGE), + LEVEL_UP_MOVE(33, MOVE_DRAGONRAGE), + LEVEL_UP_MOVE(37, MOVE_TAKEDOWN), LEVEL_UP_MOVE(41, MOVE_DIG), LEVEL_UP_MOVE(44, MOVE_DRAGONCLAW), LEVEL_UP_MOVE(47, MOVE_STOMPINGTANTRUM), @@ -9550,10 +9624,10 @@ static const struct LevelUpMove sGarchompLevelUpLearnset[] = { LEVEL_UP_MOVE(18, MOVE_METALCLAW), LEVEL_UP_MOVE(21, MOVE_BITE), LEVEL_UP_MOVE(23, MOVE_DUALCHOP), - LEVEL_UP_MOVE(24, MOVE_TAKEDOWN), + LEVEL_UP_MOVE(24, MOVE_BULLDOZE), LEVEL_UP_MOVE(29, MOVE_SLASH), - LEVEL_UP_MOVE(33, MOVE_BULLDOZE), - LEVEL_UP_MOVE(37, MOVE_DRAGONRAGE), + LEVEL_UP_MOVE(33, MOVE_DRAGONRAGE), + LEVEL_UP_MOVE(37, MOVE_TAKEDOWN), LEVEL_UP_MOVE(41, MOVE_DIG), LEVEL_UP_MOVE(44, MOVE_DRAGONCLAW), LEVEL_UP_MOVE(47, MOVE_STOMPINGTANTRUM), @@ -9564,6 +9638,32 @@ static const struct LevelUpMove sGarchompLevelUpLearnset[] = { LEVEL_UP_END }; +/* +static const struct LevelUpMove sBGarchompLevelUpLearnset[] = { + LEVEL_UP_MOVE( 0, MOVE_CRUNCH), + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_MOVE( 1, MOVE_SANDATTACK), + LEVEL_UP_MOVE( 1, MOVE_FLAMEBURST), + LEVEL_UP_MOVE( 1, MOVE_SUNNYDAY), + LEVEL_UP_MOVE(15, MOVE_FLAMECHARGE), + LEVEL_UP_MOVE(18, MOVE_METALCLAW), + LEVEL_UP_MOVE(21, MOVE_BITE), + LEVEL_UP_MOVE(23, MOVE_DUALCHOP), + LEVEL_UP_MOVE(24, MOVE_TAKEDOWN), + LEVEL_UP_MOVE(29, MOVE_SLASH), + LEVEL_UP_MOVE(33, MOVE_FIREFANG), + LEVEL_UP_MOVE(37, MOVE_DRAGONRAGE), + LEVEL_UP_MOVE(41, MOVE_BLAZEKICK), + LEVEL_UP_MOVE(44, MOVE_DRAGONCLAW), + LEVEL_UP_MOVE(47, MOVE_SEARINGSHOT), + LEVEL_UP_MOVE(47, MOVE_CRUNCH), + LEVEL_UP_MOVE(57, MOVE_DRAGONRUSH), + LEVEL_UP_MOVE(63, MOVE_FLAREBLITZ), + LEVEL_UP_MOVE(69, MOVE_OUTRAGE), + LEVEL_UP_END +}; +*/ + static const struct LevelUpMove sMunchlaxLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_LICK), LEVEL_UP_MOVE( 1, MOVE_ODORSLEUTH), @@ -9920,7 +10020,6 @@ static const struct LevelUpMove sWeavileLevelUpLearnset[] = { static const struct LevelUpMove sMagnezoneLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_MAGNETICFLUX), - LEVEL_UP_MOVE( 1, MOVE_TRIATTACK), LEVEL_UP_MOVE( 1, MOVE_MIRRORCOAT), LEVEL_UP_MOVE( 1, MOVE_BARRIER), LEVEL_UP_MOVE( 1, MOVE_ELECTRICTERRAIN), @@ -9928,21 +10027,21 @@ static const struct LevelUpMove sMagnezoneLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_SUPERSONIC), LEVEL_UP_MOVE( 1, MOVE_THUNDERWAVE), - LEVEL_UP_MOVE(11, MOVE_ELECTROBALL), - LEVEL_UP_MOVE(14, MOVE_MAGNETBOMB), + LEVEL_UP_MOVE(11, MOVE_MAGNETBOMB), + LEVEL_UP_MOVE(14, MOVE_SPARK), LEVEL_UP_MOVE(17, MOVE_SONICBOOM), - LEVEL_UP_MOVE(20, MOVE_SPARK), - LEVEL_UP_MOVE(23, MOVE_MIRRORSHOT), - LEVEL_UP_MOVE(27, MOVE_SCREECH), + LEVEL_UP_MOVE(20, MOVE_ELECTROBALL), + LEVEL_UP_MOVE(24, MOVE_SCREECH), + LEVEL_UP_MOVE(27, MOVE_MIRRORSHOT), LEVEL_UP_MOVE(29, MOVE_TRIATTACK), LEVEL_UP_MOVE(34, MOVE_MAGNETRISE), - LEVEL_UP_MOVE(39, MOVE_FLASHCANNON), - LEVEL_UP_MOVE(44, MOVE_DISCHARGE), - LEVEL_UP_MOVE(49, MOVE_METALSOUND), - LEVEL_UP_MOVE(54, MOVE_LIGHTSCREEN), - LEVEL_UP_MOVE(59, MOVE_GYROBALL), - LEVEL_UP_MOVE(64, MOVE_LOCKON), - LEVEL_UP_MOVE(69, MOVE_ZAPCANNON), + LEVEL_UP_MOVE(39, MOVE_DISCHARGE), + LEVEL_UP_MOVE(44, MOVE_METALSOUND), + LEVEL_UP_MOVE(48, MOVE_FLASHCANNON), + LEVEL_UP_MOVE(53, MOVE_LIGHTSCREEN), + LEVEL_UP_MOVE(57, MOVE_GYROBALL), + LEVEL_UP_MOVE(62, MOVE_LOCKON), + LEVEL_UP_MOVE(66, MOVE_ZAPCANNON), LEVEL_UP_END }; @@ -10063,9 +10162,17 @@ static const struct LevelUpMove sTogekissLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_AIRSLASH), LEVEL_UP_MOVE( 1, MOVE_SKYATTACK), LEVEL_UP_MOVE( 1, MOVE_TRIATTACK), + LEVEL_UP_MOVE( 1, MOVE_MAGICALLEAF), + LEVEL_UP_MOVE( 1, MOVE_MYSTICALFIRE), + LEVEL_UP_MOVE( 1, MOVE_GROWL), + LEVEL_UP_MOVE( 1, MOVE_POUND), + LEVEL_UP_MOVE( 1, MOVE_SWEETKISS), + LEVEL_UP_MOVE( 1, MOVE_LIFEDEW), LEVEL_UP_MOVE( 1, MOVE_CHARM), + LEVEL_UP_MOVE( 1, MOVE_ENCORE), LEVEL_UP_MOVE( 1, MOVE_ANCIENTPOWER), LEVEL_UP_MOVE( 1, MOVE_YAWN), + LEVEL_UP_MOVE( 1, MOVE_BESTOW), LEVEL_UP_MOVE( 1, MOVE_METRONOME), LEVEL_UP_MOVE( 1, MOVE_AFTERYOU), LEVEL_UP_MOVE( 1, MOVE_DOUBLEEDGE), @@ -10074,10 +10181,6 @@ static const struct LevelUpMove sTogekissLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_BATONPASS), LEVEL_UP_MOVE( 1, MOVE_LASTRESORT), LEVEL_UP_MOVE( 1, MOVE_WISH), - LEVEL_UP_MOVE( 1, MOVE_GROWL), - LEVEL_UP_MOVE( 1, MOVE_POUND), - LEVEL_UP_MOVE( 1, MOVE_SWEETKISS), - LEVEL_UP_MOVE( 1, MOVE_LIFEDEW), LEVEL_UP_MOVE( 1, MOVE_FAIRYWIND), LEVEL_UP_MOVE( 1, MOVE_EXTREMESPEED), LEVEL_UP_MOVE( 1, MOVE_AURASPHERE), @@ -10100,11 +10203,12 @@ static const struct LevelUpMove sYanmegaLevelUpLearnset[] = { LEVEL_UP_MOVE(23, MOVE_DETECT), LEVEL_UP_MOVE(27, MOVE_PURSUIT), LEVEL_UP_MOVE(30, MOVE_SLASH), + LEVEL_UP_MOVE(32, MOVE_AIRCUTTER), LEVEL_UP_MOVE(33, MOVE_ANCIENTPOWER), - LEVEL_UP_MOVE(37, MOVE_SCREECH), - LEVEL_UP_MOVE(41, MOVE_SILVERWIND), - LEVEL_UP_MOVE(45, MOVE_UPROAR), - LEVEL_UP_MOVE(49, MOVE_NIGHTSLASH), + LEVEL_UP_MOVE(37, MOVE_SILVERWIND), + LEVEL_UP_MOVE(41, MOVE_SCREECH), + LEVEL_UP_MOVE(45, MOVE_NIGHTSLASH), + LEVEL_UP_MOVE(49, MOVE_UPROAR), LEVEL_UP_MOVE(53, MOVE_AIRSLASH), LEVEL_UP_MOVE(57, MOVE_UTURN), LEVEL_UP_MOVE(63, MOVE_BUGBUZZ), @@ -10137,8 +10241,9 @@ static const struct LevelUpMove sLeafeonLevelUpLearnset[] = { LEVEL_UP_MOVE(35, MOVE_SUNNYDAY), LEVEL_UP_MOVE(40, MOVE_GIGADRAIN), LEVEL_UP_MOVE(45, MOVE_SWORDSDANCE), - LEVEL_UP_MOVE(50, MOVE_LEAFBLADE), + LEVEL_UP_MOVE(50, MOVE_TROPKICK), LEVEL_UP_MOVE(55, MOVE_LASTRESORT), + LEVEL_UP_MOVE(60, MOVE_LEAFBLADE), LEVEL_UP_END }; @@ -10165,10 +10270,11 @@ static const struct LevelUpMove sGlaceonLevelUpLearnset[] = { LEVEL_UP_MOVE(25, MOVE_BITE), LEVEL_UP_MOVE(30, MOVE_ICEFANG), LEVEL_UP_MOVE(35, MOVE_HAIL), - LEVEL_UP_MOVE(40, MOVE_FREEZEDRY), + LEVEL_UP_MOVE(40, MOVE_GLACIATE), LEVEL_UP_MOVE(45, MOVE_MIRRORCOAT), - LEVEL_UP_MOVE(50, MOVE_BLIZZARD), + LEVEL_UP_MOVE(50, MOVE_FREEZEDRY), LEVEL_UP_MOVE(55, MOVE_LASTRESORT), + LEVEL_UP_MOVE(60, MOVE_BLIZZARD), LEVEL_UP_END }; @@ -10460,8 +10566,9 @@ static const struct LevelUpMove sDialgaLevelUpLearnset[] = { LEVEL_UP_MOVE(56, MOVE_POWERGEM), LEVEL_UP_MOVE(64, MOVE_METALBURST), LEVEL_UP_MOVE(72, MOVE_EARTHPOWER), - LEVEL_UP_MOVE(80, MOVE_IRONTAIL), - LEVEL_UP_MOVE(88, MOVE_ROAROFTIME), + LEVEL_UP_MOVE(80, MOVE_CLANGINGSCALES), + LEVEL_UP_MOVE(88, MOVE_IRONTAIL), + LEVEL_UP_MOVE(96, MOVE_ROAROFTIME), LEVEL_UP_END }; @@ -10479,6 +10586,7 @@ static const struct LevelUpMove sPalkiaLevelUpLearnset[] = { LEVEL_UP_MOVE(72, MOVE_EARTHPOWER), LEVEL_UP_MOVE(80, MOVE_SPACIALREND), LEVEL_UP_MOVE(88, MOVE_HYDROPUMP), + LEVEL_UP_MOVE(96, MOVE_ORIGINPULSE), LEVEL_UP_END }; @@ -10617,6 +10725,7 @@ static const struct LevelUpMove sDarkraiLevelUpLearnset[] = { static const struct LevelUpMove sShayminLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GROWTH), + LEVEL_UP_MOVE( 5, MOVE_FLORALHEALING), LEVEL_UP_MOVE(10, MOVE_MAGICALLEAF), LEVEL_UP_MOVE(19, MOVE_LEECHSEED), LEVEL_UP_MOVE(28, MOVE_SYNTHESIS), @@ -10864,49 +10973,46 @@ static const struct LevelUpMove sPatratLevelUpLearnset[] = { LEVEL_UP_MOVE( 3, MOVE_LEER), LEVEL_UP_MOVE( 6, MOVE_PURSUIT), LEVEL_UP_MOVE( 8, MOVE_SANDATTACK), - LEVEL_UP_MOVE(10, MOVE_BIDE), + LEVEL_UP_MOVE(10, MOVE_COVET), LEVEL_UP_MOVE(13, MOVE_DETECT), - LEVEL_UP_MOVE(15, MOVE_COVET), + LEVEL_UP_MOVE(15, MOVE_BITE), LEVEL_UP_MOVE(18, MOVE_HYPNOSIS), - LEVEL_UP_MOVE(20, MOVE_BITE), - LEVEL_UP_MOVE(23, MOVE_WORKUP), - LEVEL_UP_MOVE(25, MOVE_SLAM), - LEVEL_UP_MOVE(28, MOVE_FOCUSENERGY), - LEVEL_UP_MOVE(30, MOVE_CRUNCH), - LEVEL_UP_MOVE(33, MOVE_AFTERYOU), - LEVEL_UP_MOVE(35, MOVE_HYPERFANG), - LEVEL_UP_MOVE(38, MOVE_NASTYPLOT), - LEVEL_UP_MOVE(40, MOVE_MEANLOOK), - LEVEL_UP_MOVE(42, MOVE_BATONPASS), - LEVEL_UP_MOVE(44, MOVE_SUPERFANG), + 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_END }; static const struct LevelUpMove sWatchogLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_CONFUSERAY), LEVEL_UP_MOVE( 1, MOVE_ROTOTILLER), - LEVEL_UP_MOVE( 1, MOVE_LOWKICK), LEVEL_UP_MOVE( 1, MOVE_TACKLE), - LEVEL_UP_MOVE( 3, MOVE_LEER), - LEVEL_UP_MOVE( 6, MOVE_PURSUIT), + LEVEL_UP_MOVE( 1, MOVE_LEER), + LEVEL_UP_MOVE( 1, MOVE_PURSUIT), LEVEL_UP_MOVE( 8, MOVE_SANDATTACK), - LEVEL_UP_MOVE(10, MOVE_BIDE), + LEVEL_UP_MOVE(10, MOVE_COVET), LEVEL_UP_MOVE(13, MOVE_DETECT), - LEVEL_UP_MOVE(15, MOVE_COVET), + LEVEL_UP_MOVE(15, MOVE_BITE), LEVEL_UP_MOVE(18, MOVE_HYPNOSIS), + LEVEL_UP_MOVE(20, MOVE_SLAM), LEVEL_UP_MOVE(19, MOVE_CONFUSERAY), - LEVEL_UP_MOVE(20, MOVE_BITE), - LEVEL_UP_MOVE(24, MOVE_WORKUP), - LEVEL_UP_MOVE(28, MOVE_SLAM), - LEVEL_UP_MOVE(32, MOVE_FOCUSENERGY), - LEVEL_UP_MOVE(35, MOVE_CRUNCH), - LEVEL_UP_MOVE(39, MOVE_AFTERYOU), - LEVEL_UP_MOVE(42, MOVE_HYPERFANG), - LEVEL_UP_MOVE(46, MOVE_PSYCHUP), - LEVEL_UP_MOVE(49, MOVE_NASTYPLOT), - LEVEL_UP_MOVE(52, MOVE_MEANLOOK), - LEVEL_UP_MOVE(55, MOVE_BATONPASS), - LEVEL_UP_MOVE(58, MOVE_SUPERFANG), + 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_END }; @@ -11252,7 +11358,9 @@ static const struct LevelUpMove sBlitzleLevelUpLearnset[] = { LEVEL_UP_MOVE(32, MOVE_DISCHARGE), LEVEL_UP_MOVE(36, MOVE_AGILITY), LEVEL_UP_MOVE(39, MOVE_WILDCHARGE), - LEVEL_UP_MOVE(43, MOVE_THRASH), + LEVEL_UP_MOVE(43, MOVE_THUNDEROUSKICK), + LEVEL_UP_MOVE(47, MOVE_THRASH), + LEVEL_UP_MOVE(51, MOVE_VOLTTACKLE), LEVEL_UP_END }; @@ -11260,7 +11368,7 @@ static const struct LevelUpMove sZebstrikaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK), LEVEL_UP_MOVE( 1, MOVE_TAILWHIP), LEVEL_UP_MOVE( 1, MOVE_CHARGE), - LEVEL_UP_MOVE(11, MOVE_SHOCKWAVE), + LEVEL_UP_MOVE( 1, MOVE_SHOCKWAVE), LEVEL_UP_MOVE(15, MOVE_THUNDERWAVE), LEVEL_UP_MOVE(18, MOVE_FLAMECHARGE), LEVEL_UP_MOVE(22, MOVE_PURSUIT), @@ -11269,9 +11377,10 @@ static const struct LevelUpMove sZebstrikaLevelUpLearnset[] = { LEVEL_UP_MOVE(36, MOVE_DISCHARGE), LEVEL_UP_MOVE(42, MOVE_AGILITY), LEVEL_UP_MOVE(47, MOVE_WILDCHARGE), - LEVEL_UP_MOVE(53, MOVE_THRASH), - LEVEL_UP_MOVE(58, MOVE_IONDELUGE), + LEVEL_UP_MOVE(53, MOVE_THUNDEROUSKICK), + LEVEL_UP_MOVE(58, MOVE_THRASH), LEVEL_UP_MOVE(63, MOVE_FLAREBLITZ), + LEVEL_UP_MOVE(68, MOVE_VOLTTACKLE), LEVEL_UP_END }; @@ -11414,7 +11523,9 @@ static const struct LevelUpMove sExcadrillLevelUpLearnset[] = { }; static const struct LevelUpMove sAudinoLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_POUND), + LEVEL_UP_MOVE( 1, MOVE_LASTRESORT), + LEVEL_UP_MOVE( 1, MOVE_HYPERVOICE), + LEVEL_UP_MOVE( 1, MOVE_MISTYTERRAIN), LEVEL_UP_MOVE( 1, MOVE_PLAYNICE), LEVEL_UP_MOVE( 4, MOVE_DISARMINGVOICE), LEVEL_UP_MOVE( 9, MOVE_BABYDOLLEYES), @@ -11429,10 +11540,11 @@ static const struct LevelUpMove sAudinoLevelUpLearnset[] = { LEVEL_UP_MOVE(40, MOVE_SIMPLEBEAM), LEVEL_UP_MOVE(44, MOVE_HYPERVOICE), LEVEL_UP_MOVE(48, MOVE_HEALPULSE), - LEVEL_UP_MOVE(51, MOVE_DOUBLEEDGE), - LEVEL_UP_MOVE(55, MOVE_ENTRAINMENT), - LEVEL_UP_MOVE(58, MOVE_MISTYTERRAIN), - LEVEL_UP_MOVE(60, MOVE_LASTRESORT), + LEVEL_UP_MOVE(51, MOVE_DECORATE), + LEVEL_UP_MOVE(54, MOVE_DOUBLEEDGE), + LEVEL_UP_MOVE(58, MOVE_ENTRAINMENT), + LEVEL_UP_MOVE(61, MOVE_MISTYTERRAIN), + LEVEL_UP_MOVE(64, MOVE_LASTRESORT), LEVEL_UP_END }; @@ -11563,85 +11675,96 @@ static const struct LevelUpMove sSeismitoadLevelUpLearnset[] = { static const struct LevelUpMove sThrohLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_MATBLOCK), + LEVEL_UP_MOVE( 1, MOVE_RECOVER), + LEVEL_UP_MOVE( 1, MOVE_BIDE), LEVEL_UP_MOVE( 1, MOVE_BIND), LEVEL_UP_MOVE( 1, MOVE_LEER), - LEVEL_UP_MOVE( 1, MOVE_BIDE), - LEVEL_UP_MOVE( 5, MOVE_FOCUSENERGY), - LEVEL_UP_MOVE(10, MOVE_CIRCLETHROW), + LEVEL_UP_MOVE( 1, MOVE_FOCUSENERGY), + LEVEL_UP_MOVE( 9, MOVE_CIRCLETHROW), LEVEL_UP_MOVE(14, MOVE_WIDEGUARD), - LEVEL_UP_MOVE(17, MOVE_REVENGE), - LEVEL_UP_MOVE(20, MOVE_BODYSLAM), - LEVEL_UP_MOVE(25, MOVE_BULKUP), - LEVEL_UP_MOVE(30, MOVE_STORMTHROW), - LEVEL_UP_MOVE(35, MOVE_VITALTHROW), - LEVEL_UP_MOVE(40, MOVE_SEISMICTOSS), - LEVEL_UP_MOVE(45, MOVE_ENDURE), - LEVEL_UP_MOVE(50, MOVE_REVERSAL), - LEVEL_UP_MOVE(55, MOVE_SUPERPOWER), + LEVEL_UP_MOVE(18, MOVE_REVENGE), + LEVEL_UP_MOVE(23, MOVE_BULKUP), + LEVEL_UP_MOVE(27, MOVE_BODYSLAM), + LEVEL_UP_MOVE(32, MOVE_VITALTHROW), + LEVEL_UP_MOVE(37, MOVE_SEISMICTOSS), + LEVEL_UP_MOVE(42, MOVE_STORMTHROW), + LEVEL_UP_MOVE(47, MOVE_ENDURE), + LEVEL_UP_MOVE(51, MOVE_REVERSAL), + LEVEL_UP_MOVE(56, MOVE_SUPERPOWER), LEVEL_UP_END }; static const struct LevelUpMove sSawkLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_BIDE), LEVEL_UP_MOVE( 1, MOVE_ROCKSMASH), LEVEL_UP_MOVE( 1, MOVE_LEER), - LEVEL_UP_MOVE( 1, MOVE_BIDE), - LEVEL_UP_MOVE( 5, MOVE_FOCUSENERGY), - LEVEL_UP_MOVE(10, MOVE_DOUBLEKICK), + LEVEL_UP_MOVE( 1, MOVE_FOCUSENERGY), + LEVEL_UP_MOVE( 9, MOVE_KARATECHOP), LEVEL_UP_MOVE(14, MOVE_QUICKGUARD), - LEVEL_UP_MOVE(17, MOVE_KARATECHOP), - LEVEL_UP_MOVE(20, MOVE_LOWSWEEP), - LEVEL_UP_MOVE(25, MOVE_BULKUP), - LEVEL_UP_MOVE(30, MOVE_RETALIATE), - LEVEL_UP_MOVE(35, MOVE_BRICKBREAK), - LEVEL_UP_MOVE(40, MOVE_COUNTER), - LEVEL_UP_MOVE(45, MOVE_ENDURE), - LEVEL_UP_MOVE(50, MOVE_REVERSAL), - LEVEL_UP_MOVE(55, MOVE_CLOSECOMBAT), + LEVEL_UP_MOVE(18, MOVE_LOWSWEEP), + LEVEL_UP_MOVE(23, MOVE_BULKUP), + LEVEL_UP_MOVE(27, MOVE_RETALIATE), + LEVEL_UP_MOVE(32, MOVE_DOUBLEKICK), + LEVEL_UP_MOVE(37, MOVE_BRICKBREAK), + LEVEL_UP_MOVE(42, MOVE_COUNTER), + LEVEL_UP_MOVE(47, MOVE_ENDURE), + LEVEL_UP_MOVE(51, MOVE_REVERSAL), + LEVEL_UP_MOVE(56, MOVE_CLOSECOMBAT), LEVEL_UP_END }; static const struct LevelUpMove sSewaddleLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_STRINGSHOT), - LEVEL_UP_MOVE( 8, MOVE_BUGBITE), - LEVEL_UP_MOVE(15, MOVE_RAZORLEAF), - LEVEL_UP_MOVE(22, MOVE_STRUGGLEBUG), - LEVEL_UP_MOVE(29, MOVE_ENDURE), - LEVEL_UP_MOVE(31, MOVE_STICKYWEB), - LEVEL_UP_MOVE(36, MOVE_BUGBUZZ), - LEVEL_UP_MOVE(43, MOVE_FLAIL), + LEVEL_UP_MOVE( 8, MOVE_STRUGGLEBUG), + LEVEL_UP_MOVE(11, MOVE_RAZORLEAF), + LEVEL_UP_MOVE(14, MOVE_BUGBITE), + LEVEL_UP_MOVE(17, MOVE_STICKYWEB), + LEVEL_UP_MOVE(19, MOVE_ENDURE), + LEVEL_UP_MOVE(21, MOVE_FLAIL), + LEVEL_UP_MOVE(24, MOVE_BUGBUZZ), LEVEL_UP_END }; static const struct LevelUpMove sSwadloonLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_PROTECT), - LEVEL_UP_MOVE( 1, MOVE_GRASSWHISTLE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_STRINGSHOT), - LEVEL_UP_MOVE( 1, MOVE_BUGBITE), + LEVEL_UP_MOVE( 1, MOVE_STRUGGLEBUG), + LEVEL_UP_MOVE( 1, MOVE_STICKYWEB), + LEVEL_UP_MOVE( 1, MOVE_ENDURE), + LEVEL_UP_MOVE( 1, MOVE_FLAIL), + LEVEL_UP_MOVE( 1, MOVE_BUGBUZZ), + LEVEL_UP_MOVE( 1, MOVE_PROTECT), + LEVEL_UP_MOVE( 1, MOVE_GRASSWHISTLE), LEVEL_UP_MOVE( 1, MOVE_RAZORLEAF), - LEVEL_UP_MOVE(19, MOVE_PROTECT), + LEVEL_UP_MOVE( 1, MOVE_BUGBITE), LEVEL_UP_END }; static const struct LevelUpMove sLeavannyLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SLASH), LEVEL_UP_MOVE( 1, MOVE_FALSESWIPE), + LEVEL_UP_MOVE( 1, MOVE_LEAFSTORM), + LEVEL_UP_MOVE( 1, MOVE_STICKYWEB), + LEVEL_UP_MOVE( 1, MOVE_ENDURE), + LEVEL_UP_MOVE( 1, MOVE_FLAIL), + LEVEL_UP_MOVE( 1, MOVE_BUGBUZZ), + LEVEL_UP_MOVE( 1, MOVE_PROTECT), + LEVEL_UP_MOVE( 1, MOVE_GRASSWHISTLE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_STRINGSHOT), - LEVEL_UP_MOVE( 1, MOVE_BUGBITE), + LEVEL_UP_MOVE( 1, MOVE_STRUGGLEBUG), LEVEL_UP_MOVE( 1, MOVE_RAZORLEAF), - LEVEL_UP_MOVE( 8, MOVE_BUGBITE), - LEVEL_UP_MOVE(15, MOVE_RAZORLEAF), + LEVEL_UP_MOVE(14, MOVE_BUGBITE), LEVEL_UP_MOVE(20, MOVE_SLASH), - LEVEL_UP_MOVE(22, MOVE_STRUGGLEBUG), - LEVEL_UP_MOVE(29, MOVE_FELLSTINGER), - LEVEL_UP_MOVE(32, MOVE_HELPINGHAND), - LEVEL_UP_MOVE(36, MOVE_LEAFBLADE), - LEVEL_UP_MOVE(39, MOVE_XSCISSOR), - LEVEL_UP_MOVE(43, MOVE_ENTRAINMENT), + LEVEL_UP_MOVE(24, MOVE_FELLSTINGER), + LEVEL_UP_MOVE(28, MOVE_ENTRAINMENT), + LEVEL_UP_MOVE(31, MOVE_HELPINGHAND), + LEVEL_UP_MOVE(34, MOVE_LEAFBLADE), + LEVEL_UP_MOVE(38, MOVE_XSCISSOR), + LEVEL_UP_MOVE(42, MOVE_THROATCHOP), LEVEL_UP_MOVE(46, MOVE_SWORDSDANCE), - LEVEL_UP_MOVE(50, MOVE_LEAFSTORM), LEVEL_UP_END }; @@ -11653,14 +11776,15 @@ static const struct LevelUpMove sVenipedeLevelUpLearnset[] = { LEVEL_UP_MOVE( 8, MOVE_PROTECT), LEVEL_UP_MOVE(12, MOVE_POISONTAIL), LEVEL_UP_MOVE(16, MOVE_SCREECH), - LEVEL_UP_MOVE(20, MOVE_BUGBITE), - LEVEL_UP_MOVE(24, MOVE_VENOSHOCK), - LEVEL_UP_MOVE(28, MOVE_TAKEDOWN), - LEVEL_UP_MOVE(32, MOVE_STEAMROLLER), - LEVEL_UP_MOVE(36, MOVE_AGILITY), - LEVEL_UP_MOVE(40, MOVE_TOXIC), - LEVEL_UP_MOVE(44, MOVE_ROCKCLIMB), - LEVEL_UP_MOVE(48, MOVE_VENOMDRENCH), + LEVEL_UP_MOVE(19, MOVE_STEAMROLLER), + LEVEL_UP_MOVE(23, MOVE_VENOSHOCK), + LEVEL_UP_MOVE(27, MOVE_TAKEDOWN), + LEVEL_UP_MOVE(31, MOVE_BUGBITE), + LEVEL_UP_MOVE(35, MOVE_AGILITY), + LEVEL_UP_MOVE(38, MOVE_POISONJAB), + LEVEL_UP_MOVE(42, MOVE_TOXIC), + LEVEL_UP_MOVE(45, MOVE_ROCKCLIMB), + LEVEL_UP_MOVE(49, MOVE_VENOMDRENCH), LEVEL_UP_MOVE(52, MOVE_DOUBLEEDGE), LEVEL_UP_END }; @@ -11674,22 +11798,23 @@ static const struct LevelUpMove sWhirlipedeLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_PROTECT), LEVEL_UP_MOVE(12, MOVE_POISONTAIL), LEVEL_UP_MOVE(16, MOVE_SCREECH), - LEVEL_UP_MOVE(20, MOVE_BUGBITE), + LEVEL_UP_MOVE(19, MOVE_STEAMROLLER), LEVEL_UP_MOVE(21, MOVE_IRONDEFENSE), - LEVEL_UP_MOVE(26, MOVE_VENOSHOCK), - LEVEL_UP_MOVE(31, MOVE_TAKEDOWN), - LEVEL_UP_MOVE(36, MOVE_STEAMROLLER), - LEVEL_UP_MOVE(41, MOVE_AGILITY), - LEVEL_UP_MOVE(46, MOVE_TOXIC), - LEVEL_UP_MOVE(51, MOVE_ROCKCLIMB), - LEVEL_UP_MOVE(56, MOVE_VENOMDRENCH), - LEVEL_UP_MOVE(61, MOVE_DOUBLEEDGE), + LEVEL_UP_MOVE(25, MOVE_VENOSHOCK), + LEVEL_UP_MOVE(30, MOVE_TAKEDOWN), + LEVEL_UP_MOVE(35, MOVE_BUGBITE), + LEVEL_UP_MOVE(40, MOVE_AGILITY), + LEVEL_UP_MOVE(44, MOVE_POISONJAB), + LEVEL_UP_MOVE(49, MOVE_TOXIC), + LEVEL_UP_MOVE(53, MOVE_ROCKCLIMB), + LEVEL_UP_MOVE(58, MOVE_VENOMDRENCH), + LEVEL_UP_MOVE(62, MOVE_DOUBLEEDGE), LEVEL_UP_END }; static const struct LevelUpMove sScolipedeLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_BATONPASS), - LEVEL_UP_MOVE( 1, MOVE_IRONDEFENSE), + LEVEL_UP_MOVE( 1, MOVE_BUGBITE), LEVEL_UP_MOVE( 1, MOVE_POISONSTING), LEVEL_UP_MOVE( 1, MOVE_PURSUIT), LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL), @@ -11697,15 +11822,16 @@ static const struct LevelUpMove sScolipedeLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_PROTECT), LEVEL_UP_MOVE(12, MOVE_POISONTAIL), LEVEL_UP_MOVE(16, MOVE_SCREECH), - LEVEL_UP_MOVE(20, MOVE_BUGBITE), + LEVEL_UP_MOVE(20, MOVE_STEAMROLLER), LEVEL_UP_MOVE(21, MOVE_IRONDEFENSE), - LEVEL_UP_MOVE(26, MOVE_VENOSHOCK), + LEVEL_UP_MOVE(25, MOVE_VENOSHOCK), LEVEL_UP_MOVE(29, MOVE_BATONPASS), - LEVEL_UP_MOVE(34, MOVE_TAKEDOWN), - LEVEL_UP_MOVE(40, MOVE_STEAMROLLER), - LEVEL_UP_MOVE(46, MOVE_AGILITY), - LEVEL_UP_MOVE(52, MOVE_TOXIC), - LEVEL_UP_MOVE(58, MOVE_VENOMDRENCH), + LEVEL_UP_MOVE(30, MOVE_TAKEDOWN), + LEVEL_UP_MOVE(38, MOVE_XSCISSOR), + LEVEL_UP_MOVE(44, MOVE_AGILITY), + LEVEL_UP_MOVE(49, MOVE_POISONJAB), + LEVEL_UP_MOVE(54, MOVE_TOXIC), + LEVEL_UP_MOVE(59, MOVE_VENOMDRENCH), LEVEL_UP_MOVE(64, MOVE_ROCKCLIMB), LEVEL_UP_MOVE(70, MOVE_DOUBLEEDGE), LEVEL_UP_MOVE(76, MOVE_MEGAHORN), @@ -11734,12 +11860,12 @@ static const struct LevelUpMove sCottoneeLevelUpLearnset[] = { }; static const struct LevelUpMove sWhimsicottLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_HURRICANE), LEVEL_UP_MOVE( 1, MOVE_MEMENTO), LEVEL_UP_MOVE( 1, MOVE_MEGADRAIN), LEVEL_UP_MOVE( 1, MOVE_RAZORLEAF), LEVEL_UP_MOVE( 1, MOVE_GROWTH), LEVEL_UP_MOVE( 1, MOVE_POISONPOWDER), - LEVEL_UP_MOVE( 1, MOVE_GIGADRAIN), LEVEL_UP_MOVE( 1, MOVE_CHARM), LEVEL_UP_MOVE( 1, MOVE_LEECHSEED), LEVEL_UP_MOVE( 1, MOVE_COTTONSPORE), @@ -11755,7 +11881,7 @@ static const struct LevelUpMove sWhimsicottLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GUST), LEVEL_UP_MOVE( 1, MOVE_TAILWIND), LEVEL_UP_MOVE( 1, MOVE_MOONBLAST), - LEVEL_UP_MOVE( 1, MOVE_HURRICANE), + LEVEL_UP_MOVE( 1, MOVE_GIGADRAIN), LEVEL_UP_END }; @@ -11828,68 +11954,70 @@ static const struct LevelUpMove sBasculinLevelUpLearnset[] = { static const struct LevelUpMove sSandileLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_EMBARGO), LEVEL_UP_MOVE( 1, MOVE_RAGE), - LEVEL_UP_MOVE( 1, MOVE_BITE), + LEVEL_UP_MOVE( 1, MOVE_POWERTRIP), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 3, MOVE_SANDATTACK), - LEVEL_UP_MOVE( 5, MOVE_HONECLAWS), - LEVEL_UP_MOVE( 8, MOVE_MUDSLAP), - LEVEL_UP_MOVE(11, MOVE_SCARYFACE), - LEVEL_UP_MOVE(15, MOVE_ASSURANCE), - LEVEL_UP_MOVE(18, MOVE_SANDTOMB), - LEVEL_UP_MOVE(21, MOVE_TORMENT), - LEVEL_UP_MOVE(24, MOVE_DIG), - LEVEL_UP_MOVE(27, MOVE_SWAGGER), - LEVEL_UP_MOVE(30, MOVE_CRUNCH), - LEVEL_UP_MOVE(33, MOVE_SANDSTORM), - LEVEL_UP_MOVE(36, MOVE_FOULPLAY), - LEVEL_UP_MOVE(40, MOVE_EARTHQUAKE), - LEVEL_UP_MOVE(43, MOVE_THRASH), + LEVEL_UP_MOVE( 6, MOVE_HONECLAWS), + LEVEL_UP_MOVE( 9, MOVE_SANDTOMB), + LEVEL_UP_MOVE(12, MOVE_SCARYFACE), + LEVEL_UP_MOVE(15, MOVE_BITE), + LEVEL_UP_MOVE(18, MOVE_TORMENT), + LEVEL_UP_MOVE(20, MOVE_DIG), + LEVEL_UP_MOVE(23, MOVE_SWAGGER), + LEVEL_UP_MOVE(25, MOVE_FOULPLAY), + LEVEL_UP_MOVE(29, MOVE_BULLDOZE), + LEVEL_UP_MOVE(32, MOVE_CRUNCH), + LEVEL_UP_MOVE(35, MOVE_SANDSTORM), + LEVEL_UP_MOVE(37, MOVE_EARTHQUAKE), + LEVEL_UP_MOVE(40, MOVE_THRASH), LEVEL_UP_END }; static const struct LevelUpMove sKrokorokLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_BULLDOZE), LEVEL_UP_MOVE( 1, MOVE_EMBARGO), LEVEL_UP_MOVE( 1, MOVE_RAGE), - LEVEL_UP_MOVE( 1, MOVE_BITE), + LEVEL_UP_MOVE( 1, MOVE_POWERTRIP), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 1, MOVE_SANDATTACK), LEVEL_UP_MOVE( 1, MOVE_HONECLAWS), - LEVEL_UP_MOVE( 8, MOVE_MUDSLAP), - LEVEL_UP_MOVE(11, MOVE_SCARYFACE), - LEVEL_UP_MOVE(15, MOVE_ASSURANCE), - LEVEL_UP_MOVE(18, MOVE_SANDTOMB), - LEVEL_UP_MOVE(21, MOVE_TORMENT), - LEVEL_UP_MOVE(24, MOVE_DIG), - LEVEL_UP_MOVE(27, MOVE_SWAGGER), - LEVEL_UP_MOVE(30, MOVE_CRUNCH), - LEVEL_UP_MOVE(35, MOVE_SANDSTORM), - LEVEL_UP_MOVE(38, MOVE_FOULPLAY), - LEVEL_UP_MOVE(45, MOVE_EARTHQUAKE), - LEVEL_UP_MOVE(50, MOVE_THRASH), + LEVEL_UP_MOVE( 9, MOVE_SANDTOMB), + LEVEL_UP_MOVE(12, MOVE_SCARYFACE), + LEVEL_UP_MOVE(15, MOVE_BITE), + LEVEL_UP_MOVE(18, MOVE_TORMENT), + LEVEL_UP_MOVE(20, MOVE_DIG), + LEVEL_UP_MOVE(23, MOVE_SWAGGER), + LEVEL_UP_MOVE(25, MOVE_FOULPLAY), + LEVEL_UP_MOVE(29, MOVE_STOMPINGTANTRUM), + LEVEL_UP_MOVE(34, MOVE_CRUNCH), + LEVEL_UP_MOVE(39, MOVE_SANDSTORM), + LEVEL_UP_MOVE(43, MOVE_EARTHQUAKE), + LEVEL_UP_MOVE(48, MOVE_THRASH), LEVEL_UP_END }; static const struct LevelUpMove sKrookodileLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_BULLDOZE), LEVEL_UP_MOVE( 1, MOVE_EMBARGO), LEVEL_UP_MOVE( 1, MOVE_RAGE), - LEVEL_UP_MOVE( 1, MOVE_BITE), + LEVEL_UP_MOVE( 1, MOVE_POWERTRIP), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 1, MOVE_SANDATTACK), LEVEL_UP_MOVE( 1, MOVE_HONECLAWS), - LEVEL_UP_MOVE( 8, MOVE_MUDSLAP), - LEVEL_UP_MOVE(11, MOVE_SCARYFACE), - LEVEL_UP_MOVE(15, MOVE_ASSURANCE), - LEVEL_UP_MOVE(18, MOVE_SANDTOMB), - LEVEL_UP_MOVE(21, MOVE_TORMENT), - LEVEL_UP_MOVE(24, MOVE_DIG), - LEVEL_UP_MOVE(27, MOVE_SWAGGER), - LEVEL_UP_MOVE(30, MOVE_CRUNCH), - LEVEL_UP_MOVE(32, MOVE_SANDSTORM), - LEVEL_UP_MOVE(35, MOVE_FOULPLAY), - LEVEL_UP_MOVE(48, MOVE_EARTHQUAKE), - LEVEL_UP_MOVE(54, MOVE_THRASH), - LEVEL_UP_MOVE(61, MOVE_OUTRAGE), + LEVEL_UP_MOVE( 9, MOVE_SANDTOMB), + LEVEL_UP_MOVE(12, MOVE_SCARYFACE), + LEVEL_UP_MOVE(15, MOVE_BITE), + LEVEL_UP_MOVE(18, MOVE_TORMENT), + LEVEL_UP_MOVE(20, MOVE_DIG), + LEVEL_UP_MOVE(23, MOVE_SWAGGER), + LEVEL_UP_MOVE(25, MOVE_FOULPLAY), + LEVEL_UP_MOVE(29, MOVE_STOMPINGTANTRUM), + LEVEL_UP_MOVE(34, MOVE_CRUNCH), + LEVEL_UP_MOVE(39, MOVE_SANDSTORM), + LEVEL_UP_MOVE(46, MOVE_EARTHQUAKE), + LEVEL_UP_MOVE(52, MOVE_THRASH), + LEVEL_UP_MOVE(58, MOVE_OUTRAGE), LEVEL_UP_END }; @@ -11903,8 +12031,8 @@ static const struct LevelUpMove sDarumakaLevelUpLearnset[] = { LEVEL_UP_MOVE(16, MOVE_WORKUP), LEVEL_UP_MOVE(20, MOVE_FIREFANG), LEVEL_UP_MOVE(24, MOVE_HEADBUTT), - LEVEL_UP_MOVE(28, MOVE_FIREPUNCH), - LEVEL_UP_MOVE(32, MOVE_FACADE), + LEVEL_UP_MOVE(28, MOVE_FACADE), + LEVEL_UP_MOVE(32, MOVE_FIREPUNCH), LEVEL_UP_MOVE(36, MOVE_UPROAR), LEVEL_UP_MOVE(40, MOVE_BELLYDRUM), LEVEL_UP_MOVE(44, MOVE_FLAREBLITZ), @@ -11915,8 +12043,6 @@ static const struct LevelUpMove sDarumakaLevelUpLearnset[] = { static const struct LevelUpMove sDarmanitanLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_HAMMERARM), - LEVEL_UP_MOVE( 1, MOVE_OVERHEAT), - LEVEL_UP_MOVE( 1, MOVE_SWAGGER), LEVEL_UP_MOVE( 1, MOVE_EMBER), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAUNT), @@ -11925,8 +12051,8 @@ static const struct LevelUpMove sDarmanitanLevelUpLearnset[] = { LEVEL_UP_MOVE(16, MOVE_WORKUP), LEVEL_UP_MOVE(20, MOVE_FIREFANG), LEVEL_UP_MOVE(24, MOVE_HEADBUTT), - LEVEL_UP_MOVE(28, MOVE_FIREPUNCH), - LEVEL_UP_MOVE(32, MOVE_FACADE), + LEVEL_UP_MOVE(28, MOVE_FACADE), + LEVEL_UP_MOVE(32, MOVE_FIREPUNCH), LEVEL_UP_MOVE(34, MOVE_HAMMERARM), LEVEL_UP_MOVE(38, MOVE_UPROAR), LEVEL_UP_MOVE(44, MOVE_BELLYDRUM), @@ -11945,19 +12071,20 @@ static const struct LevelUpMove sMaractusLevelUpLearnset[] = { LEVEL_UP_MOVE( 4, MOVE_GROWTH), LEVEL_UP_MOVE( 8, MOVE_MEGADRAIN), LEVEL_UP_MOVE(12, MOVE_LEECHSEED), - LEVEL_UP_MOVE(16, MOVE_SUCKERPUNCH), - LEVEL_UP_MOVE(20, MOVE_NEEDLEARM), - LEVEL_UP_MOVE(24, MOVE_PINMISSILE), - LEVEL_UP_MOVE(28, MOVE_SWEETSCENT), - LEVEL_UP_MOVE(32, MOVE_GIGADRAIN), - LEVEL_UP_MOVE(36, MOVE_SYNTHESIS), + LEVEL_UP_MOVE(15, MOVE_SUCKERPUNCH), + LEVEL_UP_MOVE(19, MOVE_NEEDLEARM), + LEVEL_UP_MOVE(23, MOVE_PINMISSILE), + LEVEL_UP_MOVE(27, MOVE_SWEETSCENT), + LEVEL_UP_MOVE(30, MOVE_GIGADRAIN), + LEVEL_UP_MOVE(34, MOVE_SYNTHESIS), + LEVEL_UP_MOVE(37, MOVE_COTTONSPORE), LEVEL_UP_MOVE(40, MOVE_PETALBLIZZARD), - LEVEL_UP_MOVE(44, MOVE_COTTONSPORE), - LEVEL_UP_MOVE(48, MOVE_SUNNYDAY), - LEVEL_UP_MOVE(52, MOVE_SOLARBEAM), - LEVEL_UP_MOVE(56, MOVE_ACUPRESSURE), - LEVEL_UP_MOVE(60, MOVE_PETALDANCE), - LEVEL_UP_MOVE(64, MOVE_COTTONGUARD), + LEVEL_UP_MOVE(44, MOVE_COTTONGUARD), + LEVEL_UP_MOVE(47, MOVE_ACUPRESSURE), + LEVEL_UP_MOVE(50, MOVE_PETALDANCE), + LEVEL_UP_MOVE(54, MOVE_SUNNYDAY), + LEVEL_UP_MOVE(57, MOVE_SOLARBEAM), + LEVEL_UP_MOVE(61, MOVE_SEEDFLARE), LEVEL_UP_END }; @@ -11981,8 +12108,8 @@ static const struct LevelUpMove sDwebbleLevelUpLearnset[] = { }; static const struct LevelUpMove sCrustleLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_FURYCUTTER), - LEVEL_UP_MOVE( 1, MOVE_SANDATTACK), + LEVEL_UP_MOVE( 1, MOVE_SHELLSMASH), + LEVEL_UP_MOVE( 1, MOVE_ROCKBLAST), LEVEL_UP_MOVE( 1, MOVE_WITHDRAW), LEVEL_UP_MOVE( 1, MOVE_SMACKDOWN), LEVEL_UP_MOVE(12, MOVE_BUGBITE), @@ -11991,32 +12118,32 @@ static const struct LevelUpMove sCrustleLevelUpLearnset[] = { LEVEL_UP_MOVE(24, MOVE_ROCKSLIDE), LEVEL_UP_MOVE(28, MOVE_SLASH), LEVEL_UP_MOVE(32, MOVE_STEALTHROCK), - LEVEL_UP_MOVE(38, MOVE_ROCKBLAST), - LEVEL_UP_MOVE(44, MOVE_XSCISSOR), - LEVEL_UP_MOVE(50, MOVE_ROCKPOLISH), - LEVEL_UP_MOVE(56, MOVE_SHELLSMASH), - LEVEL_UP_MOVE(62, MOVE_ROCKWRECKER), + LEVEL_UP_MOVE(37, MOVE_ROCKBLAST), + LEVEL_UP_MOVE(42, MOVE_XSCISSOR), + LEVEL_UP_MOVE(47, MOVE_ROCKPOLISH), + LEVEL_UP_MOVE(52, MOVE_SHELLSMASH), + LEVEL_UP_MOVE(57, MOVE_ROCKWRECKER), LEVEL_UP_END }; static const struct LevelUpMove sScraggyLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_LOWKICK), LEVEL_UP_MOVE( 1, MOVE_LEER), + LEVEL_UP_MOVE( 1, MOVE_FAKEOUT), + LEVEL_UP_MOVE( 1, MOVE_LOWKICK), LEVEL_UP_MOVE( 4, MOVE_PAYBACK), LEVEL_UP_MOVE( 8, MOVE_HEADBUTT), LEVEL_UP_MOVE(12, MOVE_SANDATTACK), - LEVEL_UP_MOVE(14, MOVE_FEINTATTACK), - LEVEL_UP_MOVE(16, MOVE_FACADE), - LEVEL_UP_MOVE(20, MOVE_PROTECT), - LEVEL_UP_MOVE(24, MOVE_BEATUP), - LEVEL_UP_MOVE(26, MOVE_CHIPAWAY), - LEVEL_UP_MOVE(28, MOVE_SCARYFACE), - LEVEL_UP_MOVE(32, MOVE_BRICKBREAK), - LEVEL_UP_MOVE(36, MOVE_SWAGGER), - LEVEL_UP_MOVE(40, MOVE_CRUNCH), - LEVEL_UP_MOVE(44, MOVE_HIGHJUMPKICK), - LEVEL_UP_MOVE(46, MOVE_ROCKCLIMB), - LEVEL_UP_MOVE(48, MOVE_FOCUSPUNCH), + LEVEL_UP_MOVE(15, MOVE_FACADE), + LEVEL_UP_MOVE(19, MOVE_POWERUPPUNCH), + LEVEL_UP_MOVE(23, MOVE_PROTECT), + LEVEL_UP_MOVE(26, MOVE_SCARYFACE), + LEVEL_UP_MOVE(29, MOVE_BRICKBREAK), + LEVEL_UP_MOVE(33, MOVE_CRUNCH), + LEVEL_UP_MOVE(37, MOVE_SWAGGER), + LEVEL_UP_MOVE(40, MOVE_ROCKCLIMB), + LEVEL_UP_MOVE(44, MOVE_DUALCHOP), + LEVEL_UP_MOVE(48, MOVE_HIGHJUMPKICK), LEVEL_UP_MOVE(52, MOVE_HEADSMASH), LEVEL_UP_END }; @@ -12024,23 +12151,22 @@ static const struct LevelUpMove sScraggyLevelUpLearnset[] = { static const struct LevelUpMove sScraftyLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_LOWKICK), LEVEL_UP_MOVE( 1, MOVE_LEER), + LEVEL_UP_MOVE( 1, MOVE_FAKEOUT), + LEVEL_UP_MOVE( 1, MOVE_LOWKICK), LEVEL_UP_MOVE( 4, MOVE_PAYBACK), LEVEL_UP_MOVE( 8, MOVE_HEADBUTT), LEVEL_UP_MOVE(12, MOVE_SANDATTACK), - LEVEL_UP_MOVE(14, MOVE_FEINTATTACK), - LEVEL_UP_MOVE(16, MOVE_FACADE), - LEVEL_UP_MOVE(20, MOVE_PROTECT), - LEVEL_UP_MOVE(24, MOVE_BEATUP), - LEVEL_UP_MOVE(26, MOVE_CHIPAWAY), - LEVEL_UP_MOVE(28, MOVE_SCARYFACE), - LEVEL_UP_MOVE(32, MOVE_BRICKBREAK), - LEVEL_UP_MOVE(36, MOVE_SWAGGER), - LEVEL_UP_MOVE(42, MOVE_CRUNCH), - LEVEL_UP_MOVE(48, MOVE_HIGHJUMPKICK), - LEVEL_UP_MOVE(51, MOVE_ROCKCLIMB), - LEVEL_UP_MOVE(54, MOVE_FOCUSPUNCH), - LEVEL_UP_MOVE(60, MOVE_HEADSMASH), - LEVEL_UP_END + LEVEL_UP_MOVE(15, MOVE_FACADE), + LEVEL_UP_MOVE(19, MOVE_POWERUPPUNCH), + LEVEL_UP_MOVE(23, MOVE_PROTECT), + LEVEL_UP_MOVE(26, MOVE_SCARYFACE), + LEVEL_UP_MOVE(29, MOVE_BRICKBREAK), + LEVEL_UP_MOVE(33, MOVE_CRUNCH), + LEVEL_UP_MOVE(37, MOVE_SWAGGER), + LEVEL_UP_MOVE(42, MOVE_ROCKCLIMB), + LEVEL_UP_MOVE(48, MOVE_DUALCHOP), + LEVEL_UP_MOVE(54, MOVE_HIGHJUMPKICK), + LEVEL_UP_MOVE(58, MOVE_HEADSMASH), }; static const struct LevelUpMove sSigilyphLevelUpLearnset[] = { @@ -12050,18 +12176,18 @@ static const struct LevelUpMove sSigilyphLevelUpLearnset[] = { LEVEL_UP_MOVE( 5, MOVE_GRAVITY), LEVEL_UP_MOVE( 8, MOVE_PSYWAVE), LEVEL_UP_MOVE(11, MOVE_HYPNOSIS), - LEVEL_UP_MOVE(15, MOVE_AIRCUTTER), - LEVEL_UP_MOVE(20, MOVE_PSYBEAM), - LEVEL_UP_MOVE(25, MOVE_WHIRLWIND), - LEVEL_UP_MOVE(30, MOVE_COSMICPOWER), - LEVEL_UP_MOVE(35, MOVE_AIRSLASH), - LEVEL_UP_MOVE(40, MOVE_PSYCHIC), - LEVEL_UP_MOVE(45, MOVE_TAILWIND), - LEVEL_UP_MOVE(50, MOVE_LIGHTSCREEN), - LEVEL_UP_MOVE(50, MOVE_REFLECT), - LEVEL_UP_MOVE(53, MOVE_SYNCHRONOISE), + LEVEL_UP_MOVE(14, MOVE_AIRCUTTER), + LEVEL_UP_MOVE(18, MOVE_PSYBEAM), + LEVEL_UP_MOVE(22, MOVE_WHIRLWIND), + LEVEL_UP_MOVE(26, MOVE_COSMICPOWER), + LEVEL_UP_MOVE(30, MOVE_AIRSLASH), + LEVEL_UP_MOVE(35, MOVE_PSYCHIC), + LEVEL_UP_MOVE(39, MOVE_TAILWIND), + LEVEL_UP_MOVE(43, MOVE_LIGHTSCREEN), + LEVEL_UP_MOVE(43, MOVE_REFLECT), + LEVEL_UP_MOVE(47, MOVE_SYNCHRONOISE), + LEVEL_UP_MOVE(52, MOVE_SKILLSWAP), LEVEL_UP_MOVE(56, MOVE_SKYATTACK), - LEVEL_UP_MOVE(60, MOVE_SKILLSWAP), LEVEL_UP_END }; @@ -12072,10 +12198,9 @@ static const struct LevelUpMove sYamaskLevelUpLearnset[] = { LEVEL_UP_MOVE( 8, MOVE_NIGHTSHADE), LEVEL_UP_MOVE(12, MOVE_DISABLE), LEVEL_UP_MOVE(16, MOVE_WILLOWISP), - LEVEL_UP_MOVE(20, MOVE_HEX), - LEVEL_UP_MOVE(24, MOVE_CRAFTYSHIELD), - LEVEL_UP_MOVE(27, MOVE_OMINOUSWIND), - LEVEL_UP_MOVE(30, MOVE_MEANLOOK), + LEVEL_UP_MOVE(20, MOVE_CRAFTYSHIELD), + LEVEL_UP_MOVE(24, MOVE_HEX), + LEVEL_UP_MOVE(28, MOVE_MEANLOOK), LEVEL_UP_MOVE(32, MOVE_GRUDGE), LEVEL_UP_MOVE(36, MOVE_CURSE), LEVEL_UP_MOVE(40, MOVE_SHADOWBALL), @@ -12095,10 +12220,9 @@ static const struct LevelUpMove sCofagrigusLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_NIGHTSHADE), LEVEL_UP_MOVE(12, MOVE_DISABLE), LEVEL_UP_MOVE(16, MOVE_WILLOWISP), - LEVEL_UP_MOVE(20, MOVE_HEX), - LEVEL_UP_MOVE(24, MOVE_CRAFTYSHIELD), - LEVEL_UP_MOVE(27, MOVE_OMINOUSWIND), - LEVEL_UP_MOVE(30, MOVE_MEANLOOK), + LEVEL_UP_MOVE(20, MOVE_CRAFTYSHIELD), + LEVEL_UP_MOVE(24, MOVE_HEX), + LEVEL_UP_MOVE(28, MOVE_MEANLOOK), LEVEL_UP_MOVE(32, MOVE_GRUDGE), LEVEL_UP_MOVE(33, MOVE_SHADOWCLAW), LEVEL_UP_MOVE(38, MOVE_CURSE), @@ -12167,8 +12291,8 @@ static const struct LevelUpMove sArchenLevelUpLearnset[] = { LEVEL_UP_MOVE(27, MOVE_SCARYFACE), LEVEL_UP_MOVE(30, MOVE_CRUNCH), LEVEL_UP_MOVE(33, MOVE_AGILITY), - LEVEL_UP_MOVE(36, MOVE_ACROBATICS), - LEVEL_UP_MOVE(39, MOVE_TAILWIND), + LEVEL_UP_MOVE(36, MOVE_TAILWIND), + LEVEL_UP_MOVE(39, MOVE_ACROBATICS), LEVEL_UP_MOVE(42, MOVE_DRAGONCLAW), LEVEL_UP_MOVE(45, MOVE_THRASH), LEVEL_UP_MOVE(48, MOVE_ENDEAVOR), @@ -12176,6 +12300,7 @@ static const struct LevelUpMove sArchenLevelUpLearnset[] = { }; static const struct LevelUpMove sArcheopsLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_THRASH), LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 1, MOVE_ROCKTHROW), @@ -12189,10 +12314,10 @@ static const struct LevelUpMove sArcheopsLevelUpLearnset[] = { LEVEL_UP_MOVE(27, MOVE_SCARYFACE), LEVEL_UP_MOVE(30, MOVE_CRUNCH), LEVEL_UP_MOVE(33, MOVE_AGILITY), - LEVEL_UP_MOVE(36, MOVE_ACROBATICS), - LEVEL_UP_MOVE(39, MOVE_TAILWIND), + LEVEL_UP_MOVE(36, MOVE_TAILWIND), + LEVEL_UP_MOVE(39, MOVE_ACROBATICS), LEVEL_UP_MOVE(43, MOVE_DRAGONCLAW), - LEVEL_UP_MOVE(48, MOVE_THRASH), + LEVEL_UP_MOVE(48, MOVE_FLYINGPRESS), LEVEL_UP_MOVE(53, MOVE_ENDEAVOR), LEVEL_UP_END }; @@ -12246,21 +12371,20 @@ static const struct LevelUpMove sGarbodorLevelUpLearnset[] = { static const struct LevelUpMove sZoruaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_LEER), - LEVEL_UP_MOVE( 4, MOVE_TORMENT), + LEVEL_UP_MOVE( 3, MOVE_TORMENT), LEVEL_UP_MOVE( 6, MOVE_PURSUIT), LEVEL_UP_MOVE( 9, MOVE_HONECLAWS), LEVEL_UP_MOVE(12, MOVE_FURYSWIPES), - LEVEL_UP_MOVE(15, MOVE_SCARYFACE), - LEVEL_UP_MOVE(18, MOVE_FEINTATTACK), + LEVEL_UP_MOVE(15, MOVE_PUNISHMENT), + LEVEL_UP_MOVE(18, MOVE_SCARYFACE), LEVEL_UP_MOVE(20, MOVE_TAUNT), LEVEL_UP_MOVE(24, MOVE_KNOCKOFF), LEVEL_UP_MOVE(28, MOVE_FAKETEARS), LEVEL_UP_MOVE(32, MOVE_AGILITY), - LEVEL_UP_MOVE(36, MOVE_PUNISHMENT), - LEVEL_UP_MOVE(40, MOVE_IMPRISON), - LEVEL_UP_MOVE(44, MOVE_NIGHTDAZE), - LEVEL_UP_MOVE(48, MOVE_NASTYPLOT), - LEVEL_UP_MOVE(52, MOVE_FOULPLAY), + LEVEL_UP_MOVE(36, MOVE_IMPRISON), + LEVEL_UP_MOVE(40, MOVE_NIGHTDAZE), + LEVEL_UP_MOVE(44, MOVE_NASTYPLOT), + LEVEL_UP_MOVE(48, MOVE_FOULPLAY), LEVEL_UP_END }; @@ -12273,39 +12397,38 @@ static const struct LevelUpMove sZoroarkLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_PURSUIT), LEVEL_UP_MOVE( 1, MOVE_HONECLAWS), LEVEL_UP_MOVE(12, MOVE_FURYSWIPES), - LEVEL_UP_MOVE(16, MOVE_SCARYFACE), - LEVEL_UP_MOVE(18, MOVE_FEINTATTACK), + LEVEL_UP_MOVE(15, MOVE_PUNISHMENT), + LEVEL_UP_MOVE(18, MOVE_SCARYFACE), LEVEL_UP_MOVE(20, MOVE_TAUNT), LEVEL_UP_MOVE(24, MOVE_KNOCKOFF), LEVEL_UP_MOVE(28, MOVE_FAKETEARS), LEVEL_UP_MOVE(29, MOVE_NIGHTSLASH), LEVEL_UP_MOVE(34, MOVE_AGILITY), - LEVEL_UP_MOVE(40, MOVE_PUNISHMENT), - LEVEL_UP_MOVE(46, MOVE_IMPRISON), - LEVEL_UP_MOVE(52, MOVE_NIGHTDAZE), - LEVEL_UP_MOVE(58, MOVE_NASTYPLOT), - LEVEL_UP_MOVE(64, MOVE_FOULPLAY), + LEVEL_UP_MOVE(40, MOVE_IMPRISON), + LEVEL_UP_MOVE(46, MOVE_NIGHTDAZE), + LEVEL_UP_MOVE(52, MOVE_NASTYPLOT), + LEVEL_UP_MOVE(58, MOVE_FOULPLAY), LEVEL_UP_END }; static const struct LevelUpMove sMinccinoLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POUND), LEVEL_UP_MOVE( 1, MOVE_BABYDOLLEYES), - LEVEL_UP_MOVE( 4, MOVE_HELPINGHAND), - LEVEL_UP_MOVE( 8, MOVE_ECHOEDVOICE), - LEVEL_UP_MOVE(12, MOVE_SING), - LEVEL_UP_MOVE(14, MOVE_DOUBLESLAP), + LEVEL_UP_MOVE( 3, MOVE_HELPINGHAND), + LEVEL_UP_MOVE( 6, MOVE_ECHOEDVOICE), + LEVEL_UP_MOVE(10, MOVE_SING), + LEVEL_UP_MOVE(13, MOVE_DOUBLESLAP), LEVEL_UP_MOVE(17, MOVE_CHARM), LEVEL_UP_MOVE(20, MOVE_SWIFT), - LEVEL_UP_MOVE(23, MOVE_ENCORE), - LEVEL_UP_MOVE(26, MOVE_WAKEUPSLAP), - LEVEL_UP_MOVE(28, MOVE_AFTERYOU), - LEVEL_UP_MOVE(32, MOVE_TAILSLAP), - LEVEL_UP_MOVE(36, MOVE_CAPTIVATE), - LEVEL_UP_MOVE(36, MOVE_TICKLE), - LEVEL_UP_MOVE(40, MOVE_SLAM), - LEVEL_UP_MOVE(44, MOVE_HYPERVOICE), - LEVEL_UP_MOVE(48, MOVE_LASTRESORT), + LEVEL_UP_MOVE(24, MOVE_WAKEUPSLAP), + LEVEL_UP_MOVE(28, MOVE_ENCORE), + LEVEL_UP_MOVE(31, MOVE_TAILSLAP), + LEVEL_UP_MOVE(35, MOVE_AFTERYOU), + LEVEL_UP_MOVE(38, MOVE_CAPTIVATE), + LEVEL_UP_MOVE(41, MOVE_TICKLE), + LEVEL_UP_MOVE(44, MOVE_SLAM), + LEVEL_UP_MOVE(48, MOVE_HYPERVOICE), + LEVEL_UP_MOVE(52, MOVE_LASTRESORT), LEVEL_UP_END }; @@ -12943,95 +13066,105 @@ static const struct LevelUpMove sTynamoLevelUpLearnset[] = { static const struct LevelUpMove sEelektrikLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_CRUNCH), - LEVEL_UP_MOVE( 1, MOVE_CRUNCH), - LEVEL_UP_MOVE( 1, MOVE_HEADBUTT), + LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_THUNDERWAVE), LEVEL_UP_MOVE( 1, MOVE_SPARK), LEVEL_UP_MOVE( 1, MOVE_CHARGEBEAM), + LEVEL_UP_MOVE( 1, MOVE_HEADBUTT), LEVEL_UP_MOVE( 9, MOVE_BIND), LEVEL_UP_MOVE(19, MOVE_ACID), LEVEL_UP_MOVE(29, MOVE_DISCHARGE), - LEVEL_UP_MOVE(44, MOVE_THUNDERBOLT), - LEVEL_UP_MOVE(49, MOVE_ACIDSPRAY), - LEVEL_UP_MOVE(54, MOVE_COIL), - LEVEL_UP_MOVE(59, MOVE_WILDCHARGE), - LEVEL_UP_MOVE(64, MOVE_GASTROACID), - LEVEL_UP_MOVE(69, MOVE_ZAPCANNON), - LEVEL_UP_MOVE(74, MOVE_THRASH), + LEVEL_UP_MOVE(38, MOVE_CRUNCH), + LEVEL_UP_MOVE(42, MOVE_THUNDERBOLT), + LEVEL_UP_MOVE(46, MOVE_ACIDSPRAY), + LEVEL_UP_MOVE(50, MOVE_COIL), + LEVEL_UP_MOVE(54, MOVE_WILDCHARGE), + LEVEL_UP_MOVE(58, MOVE_GASTROACID), + LEVEL_UP_MOVE(62, MOVE_ZAPCANNON), + LEVEL_UP_MOVE(66, MOVE_THRASH), + LEVEL_UP_MOVE(70, MOVE_THUNDERCAGE), LEVEL_UP_END }; static const struct LevelUpMove sEelektrossLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_THRASH), - LEVEL_UP_MOVE( 1, MOVE_ZAPCANNON), - LEVEL_UP_MOVE( 1, MOVE_GASTROACID), + LEVEL_UP_MOVE( 0, MOVE_IONDELUGE), + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_MOVE( 1, MOVE_THUNDERWAVE), + LEVEL_UP_MOVE( 1, MOVE_SPARK), + LEVEL_UP_MOVE( 1, MOVE_CHARGEBEAM), + LEVEL_UP_MOVE( 1, MOVE_HEADBUTT), + LEVEL_UP_MOVE( 1, MOVE_BIND), + LEVEL_UP_MOVE( 1, MOVE_ACID), + LEVEL_UP_MOVE( 1, MOVE_THUNDERBOLT), + LEVEL_UP_MOVE( 1, MOVE_ACIDSPRAY), LEVEL_UP_MOVE( 1, MOVE_COIL), + LEVEL_UP_MOVE( 1, MOVE_WILDCHARGE), + LEVEL_UP_MOVE( 1, MOVE_GASTROACID), + LEVEL_UP_MOVE( 1, MOVE_ZAPCANNON), + LEVEL_UP_MOVE( 1, MOVE_THRASH), + LEVEL_UP_MOVE( 1, MOVE_THUNDERCAGE), LEVEL_UP_MOVE( 1, MOVE_IONDELUGE), LEVEL_UP_MOVE( 1, MOVE_CRUSHCLAW), - LEVEL_UP_MOVE( 1, MOVE_HEADBUTT), - LEVEL_UP_MOVE( 1, MOVE_ACID), LEVEL_UP_MOVE( 1, MOVE_DISCHARGE), - LEVEL_UP_MOVE(38, MOVE_CRUNCH), + LEVEL_UP_MOVE( 1, MOVE_CRUNCH), LEVEL_UP_END }; static const struct LevelUpMove sElgyemLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_CONFUSION), - LEVEL_UP_MOVE( 4, MOVE_GROWL), - LEVEL_UP_MOVE( 8, MOVE_HEALBLOCK), - LEVEL_UP_MOVE(11, MOVE_MIRACLEEYE), - LEVEL_UP_MOVE(15, MOVE_PSYBEAM), - LEVEL_UP_MOVE(18, MOVE_HEADBUTT), - LEVEL_UP_MOVE(22, MOVE_HIDDENPOWER), - LEVEL_UP_MOVE(25, MOVE_IMPRISON), - LEVEL_UP_MOVE(29, MOVE_SIMPLEBEAM), - LEVEL_UP_MOVE(32, MOVE_ZENHEADBUTT), - LEVEL_UP_MOVE(36, MOVE_PSYCHUP), - LEVEL_UP_MOVE(39, MOVE_PSYCHIC), - LEVEL_UP_MOVE(43, MOVE_CALMMIND), - LEVEL_UP_MOVE(46, MOVE_RECOVER), - LEVEL_UP_MOVE(50, MOVE_GUARDSPLIT), - LEVEL_UP_MOVE(50, MOVE_POWERSPLIT), - LEVEL_UP_MOVE(53, MOVE_SYNCHRONOISE), - LEVEL_UP_MOVE(56, MOVE_WONDERROOM), + LEVEL_UP_MOVE( 1, MOVE_GROWL), + LEVEL_UP_MOVE( 4, MOVE_IMPRISON), + LEVEL_UP_MOVE( 7, MOVE_MIRACLEEYE), + LEVEL_UP_MOVE(10, MOVE_HEADBUTT), + LEVEL_UP_MOVE(14, MOVE_TELEPORT), + LEVEL_UP_MOVE(17, MOVE_PSYBEAM), + LEVEL_UP_MOVE(21, MOVE_SIMPLEBEAM), + LEVEL_UP_MOVE(24, MOVE_HIDDENPOWER), + LEVEL_UP_MOVE(28, MOVE_POWERSPLIT), + LEVEL_UP_MOVE(28, MOVE_GUARDSPLIT), + LEVEL_UP_MOVE(31, MOVE_ZENHEADBUTT), + LEVEL_UP_MOVE(35, MOVE_RECOVER), + LEVEL_UP_MOVE(38, MOVE_HEALBLOCK), + LEVEL_UP_MOVE(41, MOVE_EXPANDINGFORCE), + LEVEL_UP_MOVE(45, MOVE_PSYCHUP), + LEVEL_UP_MOVE(48, MOVE_CALMMIND), + LEVEL_UP_MOVE(51, MOVE_PSYCHIC), + LEVEL_UP_MOVE(55, MOVE_WONDERROOM), + LEVEL_UP_MOVE(59, MOVE_SYNCHRONOISE), LEVEL_UP_END }; static const struct LevelUpMove sBeheeyemLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_PSYCHICTERRAIN), - LEVEL_UP_MOVE( 1, MOVE_WONDERROOM), - LEVEL_UP_MOVE( 1, MOVE_SYNCHRONOISE), LEVEL_UP_MOVE( 1, MOVE_CONFUSION), LEVEL_UP_MOVE( 1, MOVE_GROWL), - LEVEL_UP_MOVE( 1, MOVE_HEALBLOCK), + LEVEL_UP_MOVE( 1, MOVE_IMPRISON), LEVEL_UP_MOVE( 1, MOVE_MIRACLEEYE), - LEVEL_UP_MOVE( 4, MOVE_GROWL), - LEVEL_UP_MOVE( 8, MOVE_HEALBLOCK), - LEVEL_UP_MOVE(11, MOVE_MIRACLEEYE), - LEVEL_UP_MOVE(15, MOVE_PSYBEAM), - LEVEL_UP_MOVE(18, MOVE_HEADBUTT), - LEVEL_UP_MOVE(22, MOVE_HIDDENPOWER), - LEVEL_UP_MOVE(25, MOVE_IMPRISON), - LEVEL_UP_MOVE(29, MOVE_SIMPLEBEAM), - LEVEL_UP_MOVE(32, MOVE_ZENHEADBUTT), - LEVEL_UP_MOVE(36, MOVE_PSYCHUP), - LEVEL_UP_MOVE(39, MOVE_PSYCHIC), - LEVEL_UP_MOVE(45, MOVE_CALMMIND), - LEVEL_UP_MOVE(50, MOVE_RECOVER), - LEVEL_UP_MOVE(56, MOVE_GUARDSPLIT), - LEVEL_UP_MOVE(58, MOVE_POWERSPLIT), + LEVEL_UP_MOVE(10, MOVE_HEADBUTT), + LEVEL_UP_MOVE(14, MOVE_TELEPORT), + LEVEL_UP_MOVE(17, MOVE_PSYBEAM), + LEVEL_UP_MOVE(21, MOVE_SIMPLEBEAM), + LEVEL_UP_MOVE(24, MOVE_HIDDENPOWER), + LEVEL_UP_MOVE(28, MOVE_POWERSPLIT), + LEVEL_UP_MOVE(28, MOVE_GUARDSPLIT), + LEVEL_UP_MOVE(31, MOVE_ZENHEADBUTT), + LEVEL_UP_MOVE(35, MOVE_RECOVER), + LEVEL_UP_MOVE(38, MOVE_HEALBLOCK), + LEVEL_UP_MOVE(41, MOVE_EXPANDINGFORCE), + LEVEL_UP_MOVE(46, MOVE_PSYCHUP), + LEVEL_UP_MOVE(50, MOVE_CALMMIND), + LEVEL_UP_MOVE(54, MOVE_PSYCHIC), + LEVEL_UP_MOVE(59, MOVE_WONDERROOM), LEVEL_UP_MOVE(63, MOVE_SYNCHRONOISE), - LEVEL_UP_MOVE(68, MOVE_WONDERROOM), LEVEL_UP_END }; static const struct LevelUpMove sLitwickLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_ASTONISH), LEVEL_UP_MOVE( 1, MOVE_SMOG), - LEVEL_UP_MOVE( 1, MOVE_EMBER), LEVEL_UP_MOVE( 6, MOVE_MINIMIZE), LEVEL_UP_MOVE( 9, MOVE_FIRESPIN), - LEVEL_UP_MOVE(12, MOVE_CONFUSERAY), + LEVEL_UP_MOVE(13, MOVE_CONFUSERAY), LEVEL_UP_MOVE(16, MOVE_HEX), LEVEL_UP_MOVE(20, MOVE_WILLOWISP), LEVEL_UP_MOVE(24, MOVE_FLAMEBURST), @@ -13049,10 +13182,9 @@ static const struct LevelUpMove sLitwickLevelUpLearnset[] = { static const struct LevelUpMove sLampentLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_ASTONISH), LEVEL_UP_MOVE( 1, MOVE_SMOG), - LEVEL_UP_MOVE( 1, MOVE_EMBER), LEVEL_UP_MOVE( 1, MOVE_MINIMIZE), LEVEL_UP_MOVE( 9, MOVE_FIRESPIN), - LEVEL_UP_MOVE(12, MOVE_CONFUSERAY), + LEVEL_UP_MOVE(13, MOVE_CONFUSERAY), LEVEL_UP_MOVE(16, MOVE_HEX), LEVEL_UP_MOVE(20, MOVE_WILLOWISP), LEVEL_UP_MOVE(24, MOVE_FLAMEBURST), @@ -13068,8 +13200,18 @@ static const struct LevelUpMove sLampentLevelUpLearnset[] = { }; static const struct LevelUpMove sChandelureLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_EMBER), LEVEL_UP_MOVE( 1, MOVE_ASTONISH), LEVEL_UP_MOVE( 1, MOVE_SMOG), + LEVEL_UP_MOVE( 1, MOVE_MINIMIZE), + LEVEL_UP_MOVE( 1, MOVE_FIRESPIN), + LEVEL_UP_MOVE( 1, MOVE_NIGHTSHADE), + LEVEL_UP_MOVE( 1, MOVE_CURSE), + LEVEL_UP_MOVE( 1, MOVE_SHADOWBALL), + LEVEL_UP_MOVE( 1, MOVE_INFERNO), + LEVEL_UP_MOVE( 1, MOVE_IMPRISON), + LEVEL_UP_MOVE( 1, MOVE_PAINSPLIT), + LEVEL_UP_MOVE( 1, MOVE_SMOG), LEVEL_UP_MOVE( 1, MOVE_EMBER), LEVEL_UP_MOVE( 1, MOVE_MINIMIZE), LEVEL_UP_MOVE( 1, MOVE_FIRESPIN), @@ -13091,14 +13233,13 @@ static const struct LevelUpMove sChandelureLevelUpLearnset[] = { static const struct LevelUpMove sAxewLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_LEER), - LEVEL_UP_MOVE( 3, MOVE_BITE), - LEVEL_UP_MOVE( 6, MOVE_FALSESWIPE), - LEVEL_UP_MOVE( 9, MOVE_ASSURANCE), + LEVEL_UP_MOVE( 4, MOVE_FALSESWIPE), + LEVEL_UP_MOVE( 8, MOVE_ASSURANCE), LEVEL_UP_MOVE(12, MOVE_TAUNT), - LEVEL_UP_MOVE(15, MOVE_SLASH), - LEVEL_UP_MOVE(18, MOVE_DRAGONRAGE), + LEVEL_UP_MOVE(15, MOVE_DRAGONPULSE), + LEVEL_UP_MOVE(18, MOVE_SLASH), LEVEL_UP_MOVE(21, MOVE_SCARYFACE), - LEVEL_UP_MOVE(24, MOVE_DRAGONPULSE), + LEVEL_UP_MOVE(24, MOVE_DRAGONRAGE), LEVEL_UP_MOVE(27, MOVE_CRUNCH), LEVEL_UP_MOVE(30, MOVE_DRAGONDANCE), LEVEL_UP_MOVE(33, MOVE_DUALCHOP), @@ -13114,14 +13255,13 @@ static const struct LevelUpMove sAxewLevelUpLearnset[] = { static const struct LevelUpMove sFraxureLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_LEER), - LEVEL_UP_MOVE( 3, MOVE_BITE), - LEVEL_UP_MOVE( 6, MOVE_FALSESWIPE), - LEVEL_UP_MOVE( 9, MOVE_ASSURANCE), + LEVEL_UP_MOVE( 1, MOVE_FALSESWIPE), + LEVEL_UP_MOVE( 1, MOVE_ASSURANCE), LEVEL_UP_MOVE(12, MOVE_TAUNT), - LEVEL_UP_MOVE(15, MOVE_SLASH), - LEVEL_UP_MOVE(18, MOVE_DRAGONRAGE), + LEVEL_UP_MOVE(15, MOVE_DRAGONPULSE), + LEVEL_UP_MOVE(18, MOVE_SLASH), LEVEL_UP_MOVE(21, MOVE_SCARYFACE), - LEVEL_UP_MOVE(24, MOVE_DRAGONPULSE), + LEVEL_UP_MOVE(24, MOVE_DRAGONRAGE), LEVEL_UP_MOVE(27, MOVE_CRUNCH), LEVEL_UP_MOVE(30, MOVE_DRAGONDANCE), LEVEL_UP_MOVE(33, MOVE_DUALCHOP), @@ -13137,14 +13277,13 @@ static const struct LevelUpMove sFraxureLevelUpLearnset[] = { static const struct LevelUpMove sHaxorusLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_LEER), - LEVEL_UP_MOVE( 3, MOVE_BITE), - LEVEL_UP_MOVE( 6, MOVE_FALSESWIPE), - LEVEL_UP_MOVE( 9, MOVE_ASSURANCE), + LEVEL_UP_MOVE( 1, MOVE_FALSESWIPE), + LEVEL_UP_MOVE( 1, MOVE_ASSURANCE), LEVEL_UP_MOVE(12, MOVE_TAUNT), - LEVEL_UP_MOVE(15, MOVE_SLASH), - LEVEL_UP_MOVE(18, MOVE_DRAGONRAGE), + LEVEL_UP_MOVE(15, MOVE_DRAGONPULSE), + LEVEL_UP_MOVE(18, MOVE_SLASH), LEVEL_UP_MOVE(21, MOVE_SCARYFACE), - LEVEL_UP_MOVE(24, MOVE_DRAGONPULSE), + LEVEL_UP_MOVE(24, MOVE_DRAGONRAGE), LEVEL_UP_MOVE(27, MOVE_CRUNCH), LEVEL_UP_MOVE(30, MOVE_DRAGONDANCE), LEVEL_UP_MOVE(33, MOVE_DUALCHOP), @@ -13166,14 +13305,14 @@ static const struct LevelUpMove sCubchooLevelUpLearnset[] = { LEVEL_UP_MOVE( 9, MOVE_ICYWIND), LEVEL_UP_MOVE(12, MOVE_PLAYNICE), LEVEL_UP_MOVE(15, MOVE_BRINE), - LEVEL_UP_MOVE(18, MOVE_FROSTBREATH), - LEVEL_UP_MOVE(21, MOVE_SLASH), + LEVEL_UP_MOVE(18, MOVE_SLASH), + LEVEL_UP_MOVE(21, MOVE_FROSTBREATH), LEVEL_UP_MOVE(24, MOVE_FLAIL), LEVEL_UP_MOVE(27, MOVE_CHARM), LEVEL_UP_MOVE(30, MOVE_HAIL), LEVEL_UP_MOVE(34, MOVE_THRASH), LEVEL_UP_MOVE(38, MOVE_REST), - LEVEL_UP_MOVE(42, MOVE_BLIZZARD), + LEVEL_UP_MOVE(42, MOVE_ICEHAMMER), LEVEL_UP_MOVE(46, MOVE_SHEERCOLD), LEVEL_UP_END }; @@ -13181,24 +13320,21 @@ static const struct LevelUpMove sCubchooLevelUpLearnset[] = { static const struct LevelUpMove sBearticLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ICICLECRASH), LEVEL_UP_MOVE( 1, MOVE_AQUAJET), - LEVEL_UP_MOVE( 1, MOVE_CHARM), - LEVEL_UP_MOVE( 1, MOVE_BIDE), - LEVEL_UP_MOVE( 1, MOVE_POWDERSNOW), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_ENDURE), LEVEL_UP_MOVE( 1, MOVE_FURYSWIPES), LEVEL_UP_MOVE( 9, MOVE_ICYWIND), LEVEL_UP_MOVE(12, MOVE_PLAYNICE), LEVEL_UP_MOVE(15, MOVE_BRINE), - LEVEL_UP_MOVE(18, MOVE_FROSTBREATH), - LEVEL_UP_MOVE(21, MOVE_SLASH), + LEVEL_UP_MOVE(18, MOVE_SLASH), + LEVEL_UP_MOVE(21, MOVE_FROSTBREATH), LEVEL_UP_MOVE(24, MOVE_FLAIL), LEVEL_UP_MOVE(27, MOVE_SWAGGER), LEVEL_UP_MOVE(30, MOVE_HAIL), LEVEL_UP_MOVE(34, MOVE_THRASH), LEVEL_UP_MOVE(36, MOVE_ICICLECRASH), LEVEL_UP_MOVE(40, MOVE_REST), - LEVEL_UP_MOVE(46, MOVE_BLIZZARD), + LEVEL_UP_MOVE(46, MOVE_ICEHAMMER), LEVEL_UP_MOVE(52, MOVE_SHEERCOLD), LEVEL_UP_MOVE(58, MOVE_SUPERPOWER), LEVEL_UP_END @@ -13206,8 +13342,9 @@ static const struct LevelUpMove sBearticLevelUpLearnset[] = { static const struct LevelUpMove sCryogonalLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_BIND), - LEVEL_UP_MOVE( 1, MOVE_ICESHARD), + LEVEL_UP_MOVE( 1, MOVE_REFLECTTYPE), LEVEL_UP_MOVE( 1, MOVE_SHARPEN), + LEVEL_UP_MOVE( 1, MOVE_ICESHARD), LEVEL_UP_MOVE( 4, MOVE_CONFUSERAY), LEVEL_UP_MOVE( 8, MOVE_RAPIDSPIN), LEVEL_UP_MOVE(12, MOVE_LASERFOCUS), @@ -13249,7 +13386,7 @@ static const struct LevelUpMove sShelmetLevelUpLearnset[] = { }; static const struct LevelUpMove sAccelgorLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_WATERSHURIKEN), + LEVEL_UP_MOVE( 0, MOVE_WATERSHURIKEN), LEVEL_UP_MOVE( 1, MOVE_ACID), LEVEL_UP_MOVE( 1, MOVE_CURSE), LEVEL_UP_MOVE( 1, MOVE_YAWN), @@ -13259,6 +13396,8 @@ static const struct LevelUpMove sAccelgorLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_LEECHLIFE), LEVEL_UP_MOVE( 1, MOVE_DOUBLETEAM), LEVEL_UP_MOVE( 1, MOVE_ACIDSPRAY), + LEVEL_UP_MOVE( 1, MOVE_DOUBLETEAM), + LEVEL_UP_MOVE( 1, MOVE_ACIDSPRAY), LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK), LEVEL_UP_MOVE(12, MOVE_MEGADRAIN), LEVEL_UP_MOVE(16, MOVE_STRUGGLEBUG), @@ -13276,73 +13415,77 @@ static const struct LevelUpMove sAccelgorLevelUpLearnset[] = { }; static const struct LevelUpMove sStunfiskLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_SNAPTRAP), LEVEL_UP_MOVE( 1, MOVE_BIDE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_MUDSLAP), - LEVEL_UP_MOVE( 1, MOVE_WATERGUN), LEVEL_UP_MOVE( 1, MOVE_THUNDERSHOCK), - LEVEL_UP_MOVE( 3, MOVE_MUDSPORT), - LEVEL_UP_MOVE( 7, MOVE_ENDURE), + LEVEL_UP_MOVE( 1, MOVE_MUDSPORT), + LEVEL_UP_MOVE( 4, MOVE_WATERGUN), + LEVEL_UP_MOVE( 8, MOVE_ENDURE), LEVEL_UP_MOVE(11, MOVE_MUDSHOT), - LEVEL_UP_MOVE(14, MOVE_REVENGE), - LEVEL_UP_MOVE(18, MOVE_CHARGE), - LEVEL_UP_MOVE(22, MOVE_MUDBOMB), - LEVEL_UP_MOVE(26, MOVE_SUCKERPUNCH), - LEVEL_UP_MOVE(30, MOVE_CAMOUFLAGE), + LEVEL_UP_MOVE(15, MOVE_REVENGE), + LEVEL_UP_MOVE(19, MOVE_SHOCKWAVE), + LEVEL_UP_MOVE(23, MOVE_MUDBOMB), + LEVEL_UP_MOVE(27, MOVE_CHARGE), + LEVEL_UP_MOVE(30, MOVE_SUCKERPUNCH), LEVEL_UP_MOVE(34, MOVE_ELECTRICTERRAIN), - LEVEL_UP_MOVE(38, MOVE_BOUNCE), - LEVEL_UP_MOVE(42, MOVE_MUDDYWATER), - LEVEL_UP_MOVE(46, MOVE_DISCHARGE), - LEVEL_UP_MOVE(50, MOVE_FLAIL), - LEVEL_UP_MOVE(54, MOVE_FISSURE), + LEVEL_UP_MOVE(37, MOVE_DISCHARGE), + LEVEL_UP_MOVE(41, MOVE_EARTHPOWER), + LEVEL_UP_MOVE(45, MOVE_CAMOUFLAGE), + LEVEL_UP_MOVE(49, MOVE_BOUNCE), + LEVEL_UP_MOVE(53, MOVE_MUDDYWATER), + LEVEL_UP_MOVE(57, MOVE_FLAIL), + LEVEL_UP_MOVE(61, MOVE_FISSURE), LEVEL_UP_END }; static const struct LevelUpMove sMienfooLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POUND), - LEVEL_UP_MOVE( 1, MOVE_MEDITATE), LEVEL_UP_MOVE( 1, MOVE_DETECT), LEVEL_UP_MOVE( 5, MOVE_FAKEOUT), - LEVEL_UP_MOVE( 8, MOVE_REVERSAL), - LEVEL_UP_MOVE(12, MOVE_DOUBLESLAP), - LEVEL_UP_MOVE(16, MOVE_QUICKGUARD), - LEVEL_UP_MOVE(20, MOVE_SWIFT), - LEVEL_UP_MOVE(24, MOVE_FORCEPALM), - LEVEL_UP_MOVE(28, MOVE_UTURN), - LEVEL_UP_MOVE(32, MOVE_DRAINPUNCH), - LEVEL_UP_MOVE(36, MOVE_HONECLAWS), - LEVEL_UP_MOVE(40, MOVE_JUMPKICK), - LEVEL_UP_MOVE(44, MOVE_AURASPHERE), - LEVEL_UP_MOVE(48, MOVE_BOUNCE), - LEVEL_UP_MOVE(53, MOVE_CALMMIND), - LEVEL_UP_MOVE(58, MOVE_HIGHJUMPKICK), + LEVEL_UP_MOVE(10, MOVE_DOUBLESLAP), + LEVEL_UP_MOVE(14, MOVE_MEDITATE), + LEVEL_UP_MOVE(17, MOVE_FORCEPALM), + LEVEL_UP_MOVE(21, MOVE_SWIFT), + LEVEL_UP_MOVE(25, MOVE_QUICKGUARD), + LEVEL_UP_MOVE(28, MOVE_AURASPHERE), + LEVEL_UP_MOVE(32, MOVE_UTURN), + LEVEL_UP_MOVE(36, MOVE_DRAINPUNCH), + LEVEL_UP_MOVE(40, MOVE_CALMMIND), + LEVEL_UP_MOVE(43, MOVE_JUMPKICK), + LEVEL_UP_MOVE(47, MOVE_HONECLAWS), + LEVEL_UP_MOVE(50, MOVE_BOUNCE), + LEVEL_UP_MOVE(54, MOVE_ENDURE), + LEVEL_UP_MOVE(57, MOVE_REVERSAL), + LEVEL_UP_MOVE(61, MOVE_HIGHJUMPKICK), LEVEL_UP_END }; static const struct LevelUpMove sMienshaoLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_QUICKGUARD), LEVEL_UP_MOVE( 1, MOVE_POUND), - LEVEL_UP_MOVE( 1, MOVE_MEDITATE), LEVEL_UP_MOVE( 1, MOVE_DETECT), - LEVEL_UP_MOVE( 5, MOVE_FAKEOUT), - LEVEL_UP_MOVE( 8, MOVE_REVERSAL), - LEVEL_UP_MOVE(12, MOVE_DOUBLESLAP), - LEVEL_UP_MOVE(16, MOVE_WIDEGUARD), - LEVEL_UP_MOVE(20, MOVE_SWIFT), - LEVEL_UP_MOVE(24, MOVE_FORCEPALM), - LEVEL_UP_MOVE(28, MOVE_UTURN), - LEVEL_UP_MOVE(32, MOVE_DRAINPUNCH), - LEVEL_UP_MOVE(36, MOVE_HONECLAWS), - LEVEL_UP_MOVE(40, MOVE_JUMPKICK), - LEVEL_UP_MOVE(44, MOVE_AURASPHERE), - LEVEL_UP_MOVE(48, MOVE_BOUNCE), - LEVEL_UP_MOVE(57, MOVE_CALMMIND), - LEVEL_UP_MOVE(64, MOVE_HIGHJUMPKICK), + LEVEL_UP_MOVE( 1, MOVE_FAKEOUT), + LEVEL_UP_MOVE( 1, MOVE_DOUBLESLAP), + LEVEL_UP_MOVE(14, MOVE_MEDITATE), + LEVEL_UP_MOVE(17, MOVE_FORCEPALM), + LEVEL_UP_MOVE(21, MOVE_SWIFT), + LEVEL_UP_MOVE(25, MOVE_WIDEGUARD), + LEVEL_UP_MOVE(28, MOVE_AURASPHERE), + LEVEL_UP_MOVE(32, MOVE_UTURN), + LEVEL_UP_MOVE(36, MOVE_DRAINPUNCH), + LEVEL_UP_MOVE(40, MOVE_CALMMIND), + LEVEL_UP_MOVE(43, MOVE_JUMPKICK), + LEVEL_UP_MOVE(47, MOVE_HONECLAWS), + LEVEL_UP_MOVE(50, MOVE_BOUNCE), + LEVEL_UP_MOVE(56, MOVE_ENDURE), + LEVEL_UP_MOVE(61, MOVE_REVERSAL), + LEVEL_UP_MOVE(67, MOVE_HIGHJUMPKICK), LEVEL_UP_END }; static const struct LevelUpMove sDruddigonLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 4, MOVE_BITE), LEVEL_UP_MOVE( 8, MOVE_DRAGONTAIL), @@ -13351,14 +13494,15 @@ static const struct LevelUpMove sDruddigonLevelUpLearnset[] = { LEVEL_UP_MOVE(20, MOVE_SLASH), LEVEL_UP_MOVE(24, MOVE_DRAGONRAGE), LEVEL_UP_MOVE(28, MOVE_DRAGONCLAW), - LEVEL_UP_MOVE(32, MOVE_CHIPAWAY), + LEVEL_UP_MOVE(32, MOVE_CRUSHCLAW), LEVEL_UP_MOVE(36, MOVE_HONECLAWS), LEVEL_UP_MOVE(40, MOVE_REVENGE), LEVEL_UP_MOVE(45, MOVE_CRUNCH), - LEVEL_UP_MOVE(50, MOVE_ROCKCLIMB), - LEVEL_UP_MOVE(55, MOVE_IRONHEAD), - LEVEL_UP_MOVE(60, MOVE_OUTRAGE), + LEVEL_UP_MOVE(50, MOVE_DRAGONHAMMER), + LEVEL_UP_MOVE(55, MOVE_ROCKCLIMB), + LEVEL_UP_MOVE(60, MOVE_IRONHEAD), LEVEL_UP_MOVE(65, MOVE_SUPERPOWER), + LEVEL_UP_MOVE(70, MOVE_OUTRAGE), LEVEL_UP_END }; @@ -13413,47 +13557,44 @@ static const struct LevelUpMove sGolurkLevelUpLearnset[] = { static const struct LevelUpMove sPawniardLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SCRATCH), - LEVEL_UP_MOVE( 6, MOVE_LEER), - LEVEL_UP_MOVE( 9, MOVE_FURYCUTTER), - LEVEL_UP_MOVE(14, MOVE_TORMENT), - LEVEL_UP_MOVE(17, MOVE_FEINTATTACK), - LEVEL_UP_MOVE(22, MOVE_SCARYFACE), - LEVEL_UP_MOVE(25, MOVE_METALCLAW), - LEVEL_UP_MOVE(30, MOVE_SLASH), - LEVEL_UP_MOVE(33, MOVE_ASSURANCE), - LEVEL_UP_MOVE(38, MOVE_METALSOUND), - LEVEL_UP_MOVE(41, MOVE_EMBARGO), - LEVEL_UP_MOVE(46, MOVE_IRONDEFENSE), - LEVEL_UP_MOVE(49, MOVE_NIGHTSLASH), - LEVEL_UP_MOVE(54, MOVE_IRONHEAD), - LEVEL_UP_MOVE(57, MOVE_SWORDSDANCE), - LEVEL_UP_MOVE(62, MOVE_GUILLOTINE), + LEVEL_UP_MOVE( 1, MOVE_LEER), + LEVEL_UP_MOVE( 4, MOVE_FURYCUTTER), + LEVEL_UP_MOVE( 8, MOVE_PURSUIT), + LEVEL_UP_MOVE(12, MOVE_TORMENT), + LEVEL_UP_MOVE(15, MOVE_METALCLAW), + LEVEL_UP_MOVE(23, MOVE_SCARYFACE), + LEVEL_UP_MOVE(27, MOVE_SLASH), + LEVEL_UP_MOVE(32, MOVE_ASSURANCE), + LEVEL_UP_MOVE(37, MOVE_METALSOUND), + LEVEL_UP_MOVE(41, MOVE_REVENGE), + LEVEL_UP_MOVE(46, MOVE_LASERFOCUS), + LEVEL_UP_MOVE(50, MOVE_IRONDEFENSE), + LEVEL_UP_MOVE(54, MOVE_NIGHTSLASH), + LEVEL_UP_MOVE(59, MOVE_SWORDSDANCE), + LEVEL_UP_MOVE(63, MOVE_IRONHEAD), + LEVEL_UP_MOVE(68, MOVE_GUILLOTINE), LEVEL_UP_END }; static const struct LevelUpMove sBisharpLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_GUILLOTINE), - LEVEL_UP_MOVE( 1, MOVE_IRONHEAD), LEVEL_UP_MOVE( 1, MOVE_METALBURST), LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 1, MOVE_FURYCUTTER), - LEVEL_UP_MOVE( 1, MOVE_TORMENT), - LEVEL_UP_MOVE( 6, MOVE_LEER), - LEVEL_UP_MOVE( 9, MOVE_FURYCUTTER), - LEVEL_UP_MOVE(14, MOVE_TORMENT), - LEVEL_UP_MOVE(17, MOVE_FEINTATTACK), - LEVEL_UP_MOVE(22, MOVE_SCARYFACE), - LEVEL_UP_MOVE(25, MOVE_METALCLAW), - LEVEL_UP_MOVE(30, MOVE_SLASH), - LEVEL_UP_MOVE(33, MOVE_ASSURANCE), - LEVEL_UP_MOVE(38, MOVE_METALSOUND), - LEVEL_UP_MOVE(41, MOVE_EMBARGO), - LEVEL_UP_MOVE(46, MOVE_IRONDEFENSE), - LEVEL_UP_MOVE(49, MOVE_NIGHTSLASH), - LEVEL_UP_MOVE(57, MOVE_IRONHEAD), - LEVEL_UP_MOVE(63, MOVE_SWORDSDANCE), - LEVEL_UP_MOVE(71, MOVE_GUILLOTINE), + LEVEL_UP_MOVE( 1, MOVE_PURSUIT), + LEVEL_UP_MOVE(12, MOVE_TORMENT), + LEVEL_UP_MOVE(15, MOVE_METALCLAW), + LEVEL_UP_MOVE(23, MOVE_SCARYFACE), + LEVEL_UP_MOVE(27, MOVE_SLASH), + LEVEL_UP_MOVE(32, MOVE_ASSURANCE), + LEVEL_UP_MOVE(37, MOVE_METALSOUND), + LEVEL_UP_MOVE(41, MOVE_REVENGE), + LEVEL_UP_MOVE(46, MOVE_LASERFOCUS), + LEVEL_UP_MOVE(50, MOVE_IRONDEFENSE), + LEVEL_UP_MOVE(56, MOVE_NIGHTSLASH), + LEVEL_UP_MOVE(62, MOVE_SWORDSDANCE), + LEVEL_UP_MOVE(67, MOVE_IRONHEAD), + LEVEL_UP_MOVE(73, MOVE_GUILLOTINE), LEVEL_UP_END }; @@ -13463,139 +13604,126 @@ static const struct LevelUpMove sBouffalantLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_PURSUIT), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 5, MOVE_FOCUSENERGY), - LEVEL_UP_MOVE(10, MOVE_FURYATTACK), - LEVEL_UP_MOVE(15, MOVE_REVENGE), - LEVEL_UP_MOVE(20, MOVE_SCARYFACE), - LEVEL_UP_MOVE(25, MOVE_HORNATTACK), - LEVEL_UP_MOVE(30, MOVE_REVERSAL), - LEVEL_UP_MOVE(35, MOVE_THROATCHOP), - LEVEL_UP_MOVE(40, MOVE_HEADCHARGE), - LEVEL_UP_MOVE(46, MOVE_SWORDSDANCE), - LEVEL_UP_MOVE(52, MOVE_THRASH), - LEVEL_UP_MOVE(58, MOVE_MEGAHORN), - LEVEL_UP_MOVE(64, MOVE_GIGAIMPACT), + LEVEL_UP_MOVE( 9, MOVE_FURYATTACK), + LEVEL_UP_MOVE(14, MOVE_REVENGE), + LEVEL_UP_MOVE(19, MOVE_SCARYFACE), + LEVEL_UP_MOVE(23, MOVE_HORNATTACK), + LEVEL_UP_MOVE(28, MOVE_REVERSAL), + LEVEL_UP_MOVE(33, MOVE_THROATCHOP), + LEVEL_UP_MOVE(38, MOVE_HEADCHARGE), + LEVEL_UP_MOVE(43, MOVE_SWORDSDANCE), + LEVEL_UP_MOVE(47, MOVE_THRASH), + LEVEL_UP_MOVE(52, MOVE_MEGAHORN), + LEVEL_UP_MOVE(57, MOVE_GIGAIMPACT), LEVEL_UP_END }; static const struct LevelUpMove sRuffletLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_PECK), LEVEL_UP_MOVE( 1, MOVE_LEER), - LEVEL_UP_MOVE( 5, MOVE_FURYATTACK), + LEVEL_UP_MOVE( 6, MOVE_HONECLAWS), LEVEL_UP_MOVE(10, MOVE_WINGATTACK), - LEVEL_UP_MOVE(14, MOVE_HONECLAWS), - LEVEL_UP_MOVE(19, MOVE_SCARYFACE), - LEVEL_UP_MOVE(23, MOVE_AERIALACE), - LEVEL_UP_MOVE(28, MOVE_SLASH), - LEVEL_UP_MOVE(32, MOVE_DEFOG), - LEVEL_UP_MOVE(34, MOVE_DUALWINGBEAT), - LEVEL_UP_MOVE(37, MOVE_TAILWIND), - LEVEL_UP_MOVE(41, MOVE_AIRSLASH), - LEVEL_UP_MOVE(46, MOVE_CRUSHCLAW), - LEVEL_UP_MOVE(50, MOVE_SKYDROP), - LEVEL_UP_MOVE(55, MOVE_WHIRLWIND), - LEVEL_UP_MOVE(59, MOVE_BRAVEBIRD), - LEVEL_UP_MOVE(64, MOVE_THRASH), + LEVEL_UP_MOVE(15, MOVE_FURYATTACK), + LEVEL_UP_MOVE(20, MOVE_TAILWIND), + LEVEL_UP_MOVE(24, MOVE_AIRSLASH), + LEVEL_UP_MOVE(29, MOVE_SCARYFACE), + LEVEL_UP_MOVE(33, MOVE_SKYDROP), + LEVEL_UP_MOVE(38, MOVE_SLASH), + LEVEL_UP_MOVE(43, MOVE_WHIRLWIND), + LEVEL_UP_MOVE(47, MOVE_DUALWINGBEAT), + LEVEL_UP_MOVE(52, MOVE_CRUSHCLAW), + LEVEL_UP_MOVE(57, MOVE_DEFOG), + LEVEL_UP_MOVE(61, MOVE_THRASH), + LEVEL_UP_MOVE(66, MOVE_BRAVEBIRD), LEVEL_UP_END }; static const struct LevelUpMove sBraviaryLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SUPERPOWER), - LEVEL_UP_MOVE( 1, MOVE_THRASH), - LEVEL_UP_MOVE( 1, MOVE_BRAVEBIRD), - LEVEL_UP_MOVE( 1, MOVE_WHIRLWIND), + LEVEL_UP_MOVE( 1, MOVE_SKYATTACK), LEVEL_UP_MOVE( 1, MOVE_PECK), LEVEL_UP_MOVE( 1, MOVE_LEER), - LEVEL_UP_MOVE( 1, MOVE_FURYATTACK), - LEVEL_UP_MOVE( 1, MOVE_WINGATTACK), - LEVEL_UP_MOVE( 5, MOVE_FURYATTACK), + LEVEL_UP_MOVE( 6, MOVE_HONECLAWS), LEVEL_UP_MOVE(10, MOVE_WINGATTACK), - LEVEL_UP_MOVE(14, MOVE_HONECLAWS), - LEVEL_UP_MOVE(19, MOVE_SCARYFACE), - LEVEL_UP_MOVE(23, MOVE_AERIALACE), - LEVEL_UP_MOVE(28, MOVE_SLASH), - LEVEL_UP_MOVE(32, MOVE_DEFOG), - LEVEL_UP_MOVE(34, MOVE_DUALWINGBEAT), - LEVEL_UP_MOVE(37, MOVE_TAILWIND), - LEVEL_UP_MOVE(41, MOVE_AIRSLASH), - LEVEL_UP_MOVE(46, MOVE_CRUSHCLAW), - LEVEL_UP_MOVE(50, MOVE_SKYDROP), + LEVEL_UP_MOVE(15, MOVE_FURYATTACK), + LEVEL_UP_MOVE(20, MOVE_TAILWIND), + LEVEL_UP_MOVE(24, MOVE_AIRSLASH), + LEVEL_UP_MOVE(29, MOVE_SCARYFACE), + LEVEL_UP_MOVE(33, MOVE_SKYDROP), + LEVEL_UP_MOVE(38, MOVE_SLASH), + LEVEL_UP_MOVE(43, MOVE_WHIRLWIND), + LEVEL_UP_MOVE(47, MOVE_DUALWINGBEAT), + LEVEL_UP_MOVE(52, MOVE_CRUSHCLAW), LEVEL_UP_MOVE(53, MOVE_SUPERPOWER), - LEVEL_UP_MOVE(57, MOVE_WHIRLWIND), - LEVEL_UP_MOVE(63, MOVE_BRAVEBIRD), - LEVEL_UP_MOVE(70, MOVE_THRASH), + LEVEL_UP_MOVE(59, MOVE_DEFOG), + LEVEL_UP_MOVE(64, MOVE_THRASH), + LEVEL_UP_MOVE(70, MOVE_BRAVEBIRD), LEVEL_UP_END }; static const struct LevelUpMove sVullabyLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GUST), LEVEL_UP_MOVE( 1, MOVE_LEER), - LEVEL_UP_MOVE( 5, MOVE_FURYATTACK), + LEVEL_UP_MOVE( 6, MOVE_FLATTER), LEVEL_UP_MOVE(10, MOVE_PLUCK), - LEVEL_UP_MOVE(14, MOVE_NASTYPLOT), - LEVEL_UP_MOVE(19, MOVE_FLATTER), - LEVEL_UP_MOVE(23, MOVE_FEINTATTACK), - LEVEL_UP_MOVE(28, MOVE_PUNISHMENT), - LEVEL_UP_MOVE(30, MOVE_IRONDEFENSE), - LEVEL_UP_MOVE(32, MOVE_DEFOG), - LEVEL_UP_MOVE(37, MOVE_TAILWIND), - LEVEL_UP_MOVE(41, MOVE_AIRSLASH), - LEVEL_UP_MOVE(46, MOVE_DARKPULSE), - LEVEL_UP_MOVE(50, MOVE_EMBARGO), - LEVEL_UP_MOVE(55, MOVE_WHIRLWIND), - LEVEL_UP_MOVE(59, MOVE_BRAVEBIRD), - LEVEL_UP_MOVE(64, MOVE_MIRRORMOVE), + LEVEL_UP_MOVE(15, MOVE_FURYATTACK), + LEVEL_UP_MOVE(20, MOVE_TAILWIND), + LEVEL_UP_MOVE(24, MOVE_PUNISHMENT), + LEVEL_UP_MOVE(29, MOVE_IRONDEFENSE), + LEVEL_UP_MOVE(33, MOVE_AIRSLASH), + LEVEL_UP_MOVE(38, MOVE_KNOCKOFF), + LEVEL_UP_MOVE(43, MOVE_WHIRLWIND), + LEVEL_UP_MOVE(47, MOVE_NASTYPLOT), + LEVEL_UP_MOVE(51, MOVE_DARKPULSE), + LEVEL_UP_MOVE(56, MOVE_DEFOG), + LEVEL_UP_MOVE(60, MOVE_MIRRORMOVE), + LEVEL_UP_MOVE(64, MOVE_BRAVEBIRD), LEVEL_UP_END }; static const struct LevelUpMove sMandibuzzLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_BONERUSH), - LEVEL_UP_MOVE( 1, MOVE_MIRRORMOVE), - LEVEL_UP_MOVE( 1, MOVE_BRAVEBIRD), - LEVEL_UP_MOVE( 1, MOVE_WHIRLWIND), LEVEL_UP_MOVE( 1, MOVE_GUST), LEVEL_UP_MOVE( 1, MOVE_LEER), - LEVEL_UP_MOVE( 1, MOVE_FURYATTACK), - LEVEL_UP_MOVE( 1, MOVE_PLUCK), - LEVEL_UP_MOVE( 5, MOVE_FURYATTACK), + LEVEL_UP_MOVE( 6, MOVE_FLATTER), LEVEL_UP_MOVE(10, MOVE_PLUCK), - LEVEL_UP_MOVE(14, MOVE_NASTYPLOT), - LEVEL_UP_MOVE(19, MOVE_FLATTER), - LEVEL_UP_MOVE(23, MOVE_FEINTATTACK), - LEVEL_UP_MOVE(28, MOVE_PUNISHMENT), - LEVEL_UP_MOVE(30, MOVE_IRONDEFENSE), - LEVEL_UP_MOVE(32, MOVE_DEFOG), - LEVEL_UP_MOVE(37, MOVE_TAILWIND), - LEVEL_UP_MOVE(41, MOVE_AIRSLASH), - LEVEL_UP_MOVE(46, MOVE_DARKPULSE), - LEVEL_UP_MOVE(50, MOVE_EMBARGO), + LEVEL_UP_MOVE(15, MOVE_FURYATTACK), + LEVEL_UP_MOVE(20, MOVE_TAILWIND), + LEVEL_UP_MOVE(24, MOVE_PUNISHMENT), + LEVEL_UP_MOVE(29, MOVE_IRONDEFENSE), + LEVEL_UP_MOVE(33, MOVE_AIRSLASH), + LEVEL_UP_MOVE(38, MOVE_KNOCKOFF), + LEVEL_UP_MOVE(43, MOVE_WHIRLWIND), + LEVEL_UP_MOVE(47, MOVE_NASTYPLOT), + LEVEL_UP_MOVE(51, MOVE_DARKPULSE), LEVEL_UP_MOVE(53, MOVE_BONERUSH), - LEVEL_UP_MOVE(57, MOVE_WHIRLWIND), - LEVEL_UP_MOVE(63, MOVE_BRAVEBIRD), - LEVEL_UP_MOVE(70, MOVE_MIRRORMOVE), + LEVEL_UP_MOVE(58, MOVE_DEFOG), + LEVEL_UP_MOVE(63, MOVE_MIRRORMOVE), + LEVEL_UP_MOVE(68, MOVE_BRAVEBIRD), LEVEL_UP_END }; static const struct LevelUpMove sHeatmorLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_LICK), + LEVEL_UP_MOVE( 1, MOVE_HONECLAWS), LEVEL_UP_MOVE( 1, MOVE_TACKLE), - LEVEL_UP_MOVE( 3, MOVE_ODORSLEUTH), - LEVEL_UP_MOVE( 5, MOVE_FURYSWIPES), - LEVEL_UP_MOVE(10, MOVE_INCINERATE), + LEVEL_UP_MOVE( 4, MOVE_FIRESPIN), + LEVEL_UP_MOVE( 8, MOVE_ODORSLEUTH), + LEVEL_UP_MOVE(11, MOVE_FURYSWIPES), LEVEL_UP_MOVE(15, MOVE_BUGBITE), - LEVEL_UP_MOVE(20, MOVE_STOCKPILE), - LEVEL_UP_MOVE(20, MOVE_SWALLOW), - LEVEL_UP_MOVE(20, MOVE_SPITUP), - LEVEL_UP_MOVE(25, MOVE_FLAMEBURST), - LEVEL_UP_MOVE(28, MOVE_SLASH), - LEVEL_UP_MOVE(30, MOVE_BIND), + LEVEL_UP_MOVE(19, MOVE_INCINERATE), + LEVEL_UP_MOVE(23, MOVE_STOCKPILE), + LEVEL_UP_MOVE(23, MOVE_SWALLOW), + LEVEL_UP_MOVE(23, MOVE_SPITUP), + LEVEL_UP_MOVE(26, MOVE_SLASH), + LEVEL_UP_MOVE(30, MOVE_FLAMEBURST), LEVEL_UP_MOVE(34, MOVE_SNATCH), - LEVEL_UP_MOVE(36, MOVE_FIRELASH), - LEVEL_UP_MOVE(40, MOVE_HONECLAWS), - LEVEL_UP_MOVE(44, MOVE_AMNESIA), - LEVEL_UP_MOVE(48, MOVE_FLAMETHROWER), - LEVEL_UP_MOVE(50, MOVE_FIRESPIN), + LEVEL_UP_MOVE(37, MOVE_FIRELASH), + LEVEL_UP_MOVE(41, MOVE_HONECLAWS), + LEVEL_UP_MOVE(44, MOVE_BODYSLAM), + LEVEL_UP_MOVE(48, MOVE_AMNESIA), + LEVEL_UP_MOVE(51, MOVE_FLAMETHROWER), LEVEL_UP_MOVE(55, MOVE_INFERNO), - LEVEL_UP_MOVE(60, MOVE_FLAREBLITZ), + LEVEL_UP_MOVE(59, MOVE_FLAREBLITZ), LEVEL_UP_END }; @@ -13695,25 +13823,24 @@ static const struct LevelUpMove sHydreigonLevelUpLearnset[] = { static const struct LevelUpMove sLarvestaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_EMBER), LEVEL_UP_MOVE( 1, MOVE_STRINGSHOT), - LEVEL_UP_MOVE( 6, MOVE_FLAMECHARGE), - LEVEL_UP_MOVE(10, MOVE_LEECHLIFE), - LEVEL_UP_MOVE(12, MOVE_STRUGGLEBUG), - LEVEL_UP_MOVE(18, MOVE_FLAMEWHEEL), + LEVEL_UP_MOVE( 6, MOVE_LEECHLIFE), + LEVEL_UP_MOVE(10, MOVE_FLAMECHARGE), + LEVEL_UP_MOVE(15, MOVE_STRUGGLEBUG), + LEVEL_UP_MOVE(20, MOVE_SCREECH), LEVEL_UP_MOVE(24, MOVE_BUGBITE), - LEVEL_UP_MOVE(30, MOVE_SCREECH), - LEVEL_UP_MOVE(36, MOVE_LEECHFANG), - LEVEL_UP_MOVE(42, MOVE_BUGBUZZ), - LEVEL_UP_MOVE(48, MOVE_TAKEDOWN), - LEVEL_UP_MOVE(54, MOVE_AMNESIA), - LEVEL_UP_MOVE(60, MOVE_DOUBLEEDGE), - LEVEL_UP_MOVE(66, MOVE_FLAREBLITZ), - LEVEL_UP_MOVE(72, MOVE_THRASH), + LEVEL_UP_MOVE(29, MOVE_FLAMEWHEEL), + LEVEL_UP_MOVE(34, MOVE_LEECHFANG), + LEVEL_UP_MOVE(39, MOVE_TAKEDOWN), + LEVEL_UP_MOVE(44, MOVE_AMNESIA), + LEVEL_UP_MOVE(48, MOVE_DOUBLEEDGE), + LEVEL_UP_MOVE(53, MOVE_BUGBUZZ), + LEVEL_UP_MOVE(58, MOVE_FLAREBLITZ), + LEVEL_UP_MOVE(63, MOVE_THRASH), LEVEL_UP_END }; static const struct LevelUpMove sVolcaronaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_QUIVERDANCE), - LEVEL_UP_MOVE( 1, MOVE_FIERYDANCE), LEVEL_UP_MOVE( 1, MOVE_WHIRLWIND), LEVEL_UP_MOVE( 1, MOVE_EMBER), LEVEL_UP_MOVE( 1, MOVE_FLAMECHARGE), @@ -13723,21 +13850,22 @@ static const struct LevelUpMove sVolcaronaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_THRASH), LEVEL_UP_MOVE( 1, MOVE_FIRESPIN), LEVEL_UP_MOVE( 1, MOVE_STRINGSHOT), - LEVEL_UP_MOVE( 1, MOVE_GUST), LEVEL_UP_MOVE( 1, MOVE_LEECHLIFE), - LEVEL_UP_MOVE( 1, MOVE_STRUGGLEBUG), - LEVEL_UP_MOVE(18, MOVE_FLAMEWHEEL), + LEVEL_UP_MOVE( 1, MOVE_GUST), + LEVEL_UP_MOVE(15, MOVE_STRUGGLEBUG), + LEVEL_UP_MOVE(20, MOVE_SCREECH), LEVEL_UP_MOVE(24, MOVE_BUGBITE), - LEVEL_UP_MOVE(30, MOVE_SCREECH), - LEVEL_UP_MOVE(36, MOVE_LEECHFANG), - LEVEL_UP_MOVE(42, MOVE_BUGBUZZ), + LEVEL_UP_MOVE(29, MOVE_FLAMEWHEEL), + LEVEL_UP_MOVE(34, MOVE_LEECHFANG), + LEVEL_UP_MOVE(39, MOVE_SILVERWIND), + LEVEL_UP_MOVE(44, MOVE_AMNESIA), LEVEL_UP_MOVE(48, MOVE_HEATWAVE), - LEVEL_UP_MOVE(52, MOVE_SILVERWIND), - LEVEL_UP_MOVE(54, MOVE_AMNESIA), + LEVEL_UP_MOVE(53, MOVE_BUGBUZZ), + LEVEL_UP_MOVE(58, MOVE_FIREBLAST), LEVEL_UP_MOVE(58, MOVE_QUIVERDANCE), - LEVEL_UP_MOVE(62, MOVE_HURRICANE), - LEVEL_UP_MOVE(70, MOVE_FIREBLAST), - LEVEL_UP_MOVE(78, MOVE_RAGEPOWDER), + LEVEL_UP_MOVE(65, MOVE_HURRICANE), + LEVEL_UP_MOVE(72, MOVE_RAGEPOWDER), + LEVEL_UP_MOVE(79, MOVE_FIERYDANCE), LEVEL_UP_END }; @@ -13927,6 +14055,7 @@ static const struct LevelUpMove sKyuremLevelUpLearnset[] = { static const struct LevelUpMove sKeldeoLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SECRETSWORD), + LEVEL_UP_MOVE( 1, MOVE_AURORABEAM), LEVEL_UP_MOVE( 1, MOVE_AQUAJET), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 1, MOVE_HELPINGHAND), @@ -13959,11 +14088,12 @@ static const struct LevelUpMove sMeloettaLevelUpLearnset[] = { LEVEL_UP_MOVE(36, MOVE_ECHOEDVOICE), LEVEL_UP_MOVE(43, MOVE_UTURN), LEVEL_UP_MOVE(50, MOVE_WAKEUPSLAP), - LEVEL_UP_MOVE(57, MOVE_PSYCHIC), + LEVEL_UP_MOVE(57, MOVE_LUSTERPURGE), LEVEL_UP_MOVE(64, MOVE_HYPERVOICE), LEVEL_UP_MOVE(71, MOVE_ROLEPLAY), LEVEL_UP_MOVE(78, MOVE_CLOSECOMBAT), - LEVEL_UP_MOVE(85, MOVE_PERISHSONG), + LEVEL_UP_MOVE(85, MOVE_PSYCHIC), + LEVEL_UP_MOVE(92, MOVE_PERISHSONG), LEVEL_UP_END }; @@ -13995,17 +14125,18 @@ static const struct LevelUpMove sGenesectLevelUpLearnset[] = { static const struct LevelUpMove sShadowWarriorLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_INCINERATE), - LEVEL_UP_MOVE(30, MOVE_SHADOWCLAW), - LEVEL_UP_MOVE(30, MOVE_HONECLAWS), + LEVEL_UP_MOVE(30, MOVE_SLASH), LEVEL_UP_MOVE(30, MOVE_DRAGONCLAW), LEVEL_UP_MOVE(50, MOVE_FLAMETHROWER), - LEVEL_UP_MOVE(50, MOVE_PHANTOMFORCE), + LEVEL_UP_MOVE(50, MOVE_SHADOWBONE), LEVEL_UP_MOVE(60, MOVE_SWORDSDANCE), + LEVEL_UP_MOVE(60, MOVE_POISONJAB), LEVEL_UP_END }; static const struct LevelUpMove sWormadamSandyLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_QUIVERDANCE), + LEVEL_UP_MOVE( 1, MOVE_ANCIENTPOWER), LEVEL_UP_MOVE( 1, MOVE_SUCKERPUNCH), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_PROTECT), @@ -14029,6 +14160,7 @@ static const struct LevelUpMove sWormadamSandyLevelUpLearnset[] = { static const struct LevelUpMove sWormadamTrashLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_QUIVERDANCE), + LEVEL_UP_MOVE( 1, MOVE_ANCIENTPOWER), LEVEL_UP_MOVE( 1, MOVE_METALBURST), LEVEL_UP_MOVE( 1, MOVE_SUCKERPUNCH), LEVEL_UP_MOVE( 1, MOVE_TACKLE), @@ -14053,6 +14185,7 @@ static const struct LevelUpMove sWormadamTrashLevelUpLearnset[] = { static const struct LevelUpMove sShayminSkyLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GROWTH), + LEVEL_UP_MOVE( 5, MOVE_FLORALHEALING), LEVEL_UP_MOVE(10, MOVE_MAGICALLEAF), LEVEL_UP_MOVE(19, MOVE_LEECHSEED), LEVEL_UP_MOVE(28, MOVE_QUICKATTACK), @@ -14183,62 +14316,64 @@ static const struct LevelUpMove sFennekinLevelUpLearnset[] = { LEVEL_UP_MOVE(14, MOVE_FLAMECHARGE), LEVEL_UP_MOVE(17, MOVE_PSYBEAM), LEVEL_UP_MOVE(20, MOVE_FIRESPIN), - LEVEL_UP_MOVE(24, MOVE_LUCKYCHANT), - LEVEL_UP_MOVE(27, MOVE_LIGHTSCREEN), + LEVEL_UP_MOVE(23, MOVE_LUCKYCHANT), + LEVEL_UP_MOVE(25, MOVE_INCINERATE), + LEVEL_UP_MOVE(28, MOVE_LIGHTSCREEN), LEVEL_UP_MOVE(30, MOVE_PSYSHOCK), - LEVEL_UP_MOVE(34, MOVE_FLAMETHROWER), - LEVEL_UP_MOVE(38, MOVE_WILLOWISP), - LEVEL_UP_MOVE(41, MOVE_PSYCHIC), - LEVEL_UP_MOVE(45, MOVE_SUNNYDAY), - LEVEL_UP_MOVE(48, MOVE_MAGICROOM), - LEVEL_UP_MOVE(51, MOVE_FIREBLAST), + LEVEL_UP_MOVE(33, MOVE_WILLOWISP), + LEVEL_UP_MOVE(35, MOVE_FLAMETHROWER), + LEVEL_UP_MOVE(38, MOVE_MAGICROOM), + LEVEL_UP_MOVE(40, MOVE_PSYCHIC), + LEVEL_UP_MOVE(43, MOVE_SUNNYDAY), + LEVEL_UP_MOVE(45, MOVE_FIREBLAST), LEVEL_UP_END }; static const struct LevelUpMove sBraixenLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_TAILWHIP), - LEVEL_UP_MOVE( 1, MOVE_EMBER), - LEVEL_UP_MOVE( 1, MOVE_HOWL), + LEVEL_UP_MOVE( 5, MOVE_EMBER), + LEVEL_UP_MOVE(11, MOVE_HOWL), LEVEL_UP_MOVE(14, MOVE_FLAMECHARGE), LEVEL_UP_MOVE(18, MOVE_PSYBEAM), LEVEL_UP_MOVE(22, MOVE_FIRESPIN), - LEVEL_UP_MOVE(27, MOVE_LUCKYCHANT), - LEVEL_UP_MOVE(31, MOVE_LIGHTSCREEN), - LEVEL_UP_MOVE(35, MOVE_PSYSHOCK), - LEVEL_UP_MOVE(40, MOVE_FLAMETHROWER), - LEVEL_UP_MOVE(45, MOVE_WILLOWISP), - LEVEL_UP_MOVE(49, MOVE_PSYCHIC), + LEVEL_UP_MOVE(26, MOVE_LUCKYCHANT), + LEVEL_UP_MOVE(29, MOVE_INCINERATE), + LEVEL_UP_MOVE(33, MOVE_LIGHTSCREEN), + LEVEL_UP_MOVE(36, MOVE_PSYSHOCK), + LEVEL_UP_MOVE(40, MOVE_WILLOWISP), + LEVEL_UP_MOVE(43, MOVE_FLAMETHROWER), + LEVEL_UP_MOVE(47, MOVE_MAGICROOM), + LEVEL_UP_MOVE(50, MOVE_PSYCHIC), LEVEL_UP_MOVE(54, MOVE_SUNNYDAY), - LEVEL_UP_MOVE(58, MOVE_MAGICROOM), - LEVEL_UP_MOVE(62, MOVE_FIREBLAST), + LEVEL_UP_MOVE(57, MOVE_FIREBLAST), LEVEL_UP_END }; static const struct LevelUpMove sDelphoxLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_MYSTICALFIRE), - LEVEL_UP_MOVE( 1, MOVE_FUTURESIGHT), LEVEL_UP_MOVE( 1, MOVE_ROLEPLAY), LEVEL_UP_MOVE( 1, MOVE_SWITCHEROO), LEVEL_UP_MOVE( 1, MOVE_SHADOWBALL), LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_TAILWHIP), - LEVEL_UP_MOVE( 1, MOVE_EMBER), - LEVEL_UP_MOVE( 1, MOVE_HOWL), + LEVEL_UP_MOVE( 5, MOVE_EMBER), + LEVEL_UP_MOVE(11, MOVE_HOWL), LEVEL_UP_MOVE(14, MOVE_FLAMECHARGE), LEVEL_UP_MOVE(18, MOVE_PSYBEAM), LEVEL_UP_MOVE(22, MOVE_FIRESPIN), - LEVEL_UP_MOVE(27, MOVE_LUCKYCHANT), - LEVEL_UP_MOVE(31, MOVE_LIGHTSCREEN), + LEVEL_UP_MOVE(26, MOVE_LUCKYCHANT), + LEVEL_UP_MOVE(29, MOVE_INCINERATE), + LEVEL_UP_MOVE(33, MOVE_LIGHTSCREEN), LEVEL_UP_MOVE(35, MOVE_MYSTICALFIRE), - LEVEL_UP_MOVE(35, MOVE_PSYSHOCK), - LEVEL_UP_MOVE(42, MOVE_FLAMETHROWER), - LEVEL_UP_MOVE(48, MOVE_WILLOWISP), - LEVEL_UP_MOVE(53, MOVE_PSYCHIC), - LEVEL_UP_MOVE(59, MOVE_SUNNYDAY), - LEVEL_UP_MOVE(64, MOVE_MAGICROOM), - LEVEL_UP_MOVE(69, MOVE_FIREBLAST), - LEVEL_UP_MOVE(75, MOVE_FUTURESIGHT), + LEVEL_UP_MOVE(36, MOVE_PSYSHOCK), + LEVEL_UP_MOVE(42, MOVE_WILLOWISP), + LEVEL_UP_MOVE(46, MOVE_FLAMETHROWER), + LEVEL_UP_MOVE(51, MOVE_MAGICROOM), + LEVEL_UP_MOVE(55, MOVE_PSYCHIC), + LEVEL_UP_MOVE(60, MOVE_SUNNYDAY), + LEVEL_UP_MOVE(64, MOVE_FIREBLAST), + LEVEL_UP_MOVE(69, MOVE_FUTURESIGHT), LEVEL_UP_END }; @@ -14246,17 +14381,18 @@ static const struct LevelUpMove sFroakieLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POUND), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 5, MOVE_BUBBLE), - LEVEL_UP_MOVE( 8, MOVE_QUICKATTACK), - LEVEL_UP_MOVE(10, MOVE_LICK), + LEVEL_UP_MOVE( 8, MOVE_LICK), + LEVEL_UP_MOVE(11, MOVE_QUICKATTACK), LEVEL_UP_MOVE(14, MOVE_WATERPULSE), - LEVEL_UP_MOVE(18, MOVE_SMOKESCREEN), - LEVEL_UP_MOVE(21, MOVE_ROUND), - LEVEL_UP_MOVE(25, MOVE_FLING), - LEVEL_UP_MOVE(29, MOVE_SMACKDOWN), - LEVEL_UP_MOVE(33, MOVE_SUBSTITUTE), - LEVEL_UP_MOVE(36, MOVE_BOUNCE), - LEVEL_UP_MOVE(40, MOVE_DOUBLETEAM), - LEVEL_UP_MOVE(43, MOVE_HYDROPUMP), + LEVEL_UP_MOVE(17, MOVE_FLING), + LEVEL_UP_MOVE(20, MOVE_ROUND), + LEVEL_UP_MOVE(23, MOVE_SMOKESCREEN), + LEVEL_UP_MOVE(26, MOVE_SMACKDOWN), + LEVEL_UP_MOVE(29, MOVE_DOUBLETEAM), + LEVEL_UP_MOVE(32, MOVE_WATERFALL), + LEVEL_UP_MOVE(35, MOVE_SUBSTITUTE), + LEVEL_UP_MOVE(38, MOVE_BOUNCE), + LEVEL_UP_MOVE(41, MOVE_HYDROPUMP), LEVEL_UP_END }; @@ -14264,17 +14400,18 @@ static const struct LevelUpMove sFrogadierLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POUND), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_BUBBLE), - LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK), - LEVEL_UP_MOVE(10, MOVE_LICK), + LEVEL_UP_MOVE( 1, MOVE_LICK), + LEVEL_UP_MOVE(11, MOVE_QUICKATTACK), LEVEL_UP_MOVE(14, MOVE_WATERPULSE), - LEVEL_UP_MOVE(19, MOVE_SMOKESCREEN), - LEVEL_UP_MOVE(23, MOVE_ROUND), - LEVEL_UP_MOVE(28, MOVE_FLING), - LEVEL_UP_MOVE(33, MOVE_SMACKDOWN), - LEVEL_UP_MOVE(38, MOVE_SUBSTITUTE), - LEVEL_UP_MOVE(42, MOVE_BOUNCE), - LEVEL_UP_MOVE(47, MOVE_DOUBLETEAM), - LEVEL_UP_MOVE(51, MOVE_HYDROPUMP), + LEVEL_UP_MOVE(18, MOVE_FLING), + LEVEL_UP_MOVE(22, MOVE_ROUND), + LEVEL_UP_MOVE(26, MOVE_SMOKESCREEN), + LEVEL_UP_MOVE(30, MOVE_SMACKDOWN), + LEVEL_UP_MOVE(34, MOVE_DOUBLETEAM), + LEVEL_UP_MOVE(38, MOVE_WATERFALL), + LEVEL_UP_MOVE(42, MOVE_SUBSTITUTE), + LEVEL_UP_MOVE(46, MOVE_BOUNCE), + LEVEL_UP_MOVE(50, MOVE_HYDROPUMP), LEVEL_UP_END }; @@ -14282,76 +14419,77 @@ static const struct LevelUpMove sGreninjaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_WATERSHURIKEN), LEVEL_UP_MOVE( 1, MOVE_ROLEPLAY), LEVEL_UP_MOVE( 1, MOVE_MATBLOCK), - LEVEL_UP_MOVE( 1, MOVE_ROUND), LEVEL_UP_MOVE( 1, MOVE_FLING), + LEVEL_UP_MOVE( 1, MOVE_ROUND), LEVEL_UP_MOVE( 1, MOVE_SMACKDOWN), LEVEL_UP_MOVE( 1, MOVE_SUBSTITUTE), LEVEL_UP_MOVE( 1, MOVE_BOUNCE), LEVEL_UP_MOVE( 1, MOVE_POUND), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_BUBBLE), - LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK), - LEVEL_UP_MOVE(10, MOVE_LICK), + LEVEL_UP_MOVE( 1, MOVE_LICK), + LEVEL_UP_MOVE(11, MOVE_QUICKATTACK), LEVEL_UP_MOVE(14, MOVE_WATERPULSE), - LEVEL_UP_MOVE(19, MOVE_SMOKESCREEN), - LEVEL_UP_MOVE(23, MOVE_SHADOWSNEAK), - LEVEL_UP_MOVE(28, MOVE_SPIKES), - LEVEL_UP_MOVE(33, MOVE_FEINTATTACK), + LEVEL_UP_MOVE(18, MOVE_SHADOWSNEAK), + LEVEL_UP_MOVE(22, MOVE_FEINTATTACK), + LEVEL_UP_MOVE(26, MOVE_SMOKESCREEN), + LEVEL_UP_MOVE(30, MOVE_SPIKES), + LEVEL_UP_MOVE(34, MOVE_DOUBLETEAM), LEVEL_UP_MOVE(35, MOVE_WATERSHURIKEN), LEVEL_UP_MOVE(40, MOVE_NIGHTSLASH), - LEVEL_UP_MOVE(46, MOVE_EXTRASENSORY), - LEVEL_UP_MOVE(52, MOVE_DOUBLETEAM), - LEVEL_UP_MOVE(57, MOVE_HYDROPUMP), - LEVEL_UP_MOVE(63, MOVE_DARKPULSE), - LEVEL_UP_MOVE(69, MOVE_HAZE), + LEVEL_UP_MOVE(45, MOVE_WATERFALL), + LEVEL_UP_MOVE(50, MOVE_EXTRASENSORY), + LEVEL_UP_MOVE(55, MOVE_DARKPULSE), + LEVEL_UP_MOVE(60, MOVE_HAZE), + LEVEL_UP_MOVE(65, MOVE_HYDROPUMP), LEVEL_UP_END }; static const struct LevelUpMove sBunnelbyLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_ODORSLEUTH), LEVEL_UP_MOVE( 1, MOVE_MUDSLAP), - LEVEL_UP_MOVE( 1, MOVE_AGILITY), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 3, MOVE_TACKLE), LEVEL_UP_MOVE( 6, MOVE_LASERFOCUS), LEVEL_UP_MOVE( 9, MOVE_QUICKATTACK), - LEVEL_UP_MOVE(10, MOVE_DOUBLESLAP), LEVEL_UP_MOVE(12, MOVE_MUDSHOT), - LEVEL_UP_MOVE(15, MOVE_FLAIL), + LEVEL_UP_MOVE(15, MOVE_DOUBLESLAP), LEVEL_UP_MOVE(18, MOVE_DOUBLEKICK), LEVEL_UP_MOVE(21, MOVE_BULLDOZE), - LEVEL_UP_MOVE(24, MOVE_DIG), - LEVEL_UP_MOVE(25, MOVE_ODORSLEUTH), - LEVEL_UP_MOVE(27, MOVE_BOUNCE), - LEVEL_UP_MOVE(30, MOVE_TAKEDOWN), - LEVEL_UP_MOVE(33, MOVE_SWORDSDANCE), - LEVEL_UP_MOVE(36, MOVE_EARTHQUAKE), - LEVEL_UP_MOVE(39, MOVE_SUPERFANG), - LEVEL_UP_MOVE(42, MOVE_FACADE), + LEVEL_UP_MOVE(24, MOVE_FACADE), + LEVEL_UP_MOVE(27, MOVE_DIG), + LEVEL_UP_MOVE(30, MOVE_BOUNCE), + LEVEL_UP_MOVE(33, MOVE_AGILITY), + LEVEL_UP_MOVE(36, MOVE_TAKEDOWN), + LEVEL_UP_MOVE(39, MOVE_SWORDSDANCE), + LEVEL_UP_MOVE(42, MOVE_FLAIL), + LEVEL_UP_MOVE(45, MOVE_EARTHQUAKE), + LEVEL_UP_MOVE(48, MOVE_SUPERFANG), LEVEL_UP_END }; static const struct LevelUpMove sDiggersbyLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_ROTOTILLER), + LEVEL_UP_MOVE( 1, MOVE_FLAIL), + LEVEL_UP_MOVE( 1, MOVE_ODORSLEUTH), LEVEL_UP_MOVE( 1, MOVE_MUDSLAP), - LEVEL_UP_MOVE( 1, MOVE_AGILITY), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 3, MOVE_TACKLE), LEVEL_UP_MOVE( 6, MOVE_LASERFOCUS), LEVEL_UP_MOVE( 9, MOVE_QUICKATTACK), - LEVEL_UP_MOVE(10, MOVE_DOUBLESLAP), LEVEL_UP_MOVE(12, MOVE_MUDSHOT), - LEVEL_UP_MOVE(15, MOVE_FLAIL), + LEVEL_UP_MOVE(15, MOVE_DOUBLESLAP), LEVEL_UP_MOVE(18, MOVE_DOUBLEKICK), LEVEL_UP_MOVE(23, MOVE_BULLDOZE), - LEVEL_UP_MOVE(26, MOVE_ODORSLEUTH), - LEVEL_UP_MOVE(28, MOVE_DIG), - LEVEL_UP_MOVE(33, MOVE_BOUNCE), - LEVEL_UP_MOVE(38, MOVE_TAKEDOWN), - LEVEL_UP_MOVE(43, MOVE_SWORDSDANCE), - LEVEL_UP_MOVE(48, MOVE_EARTHQUAKE), - LEVEL_UP_MOVE(53, MOVE_SUPERFANG), - LEVEL_UP_MOVE(55, MOVE_FACADE), - LEVEL_UP_MOVE(58, MOVE_HAMMERARM), + LEVEL_UP_MOVE(27, MOVE_FACADE), + LEVEL_UP_MOVE(31, MOVE_DIG), + LEVEL_UP_MOVE(35, MOVE_BOUNCE), + LEVEL_UP_MOVE(39, MOVE_AGILITY), + LEVEL_UP_MOVE(43, MOVE_TAKEDOWN), + LEVEL_UP_MOVE(47, MOVE_SWORDSDANCE), + LEVEL_UP_MOVE(51, MOVE_HAMMERARM), + LEVEL_UP_MOVE(55, MOVE_EARTHQUAKE), + LEVEL_UP_MOVE(59, MOVE_SUPERFANG), LEVEL_UP_END }; @@ -14365,7 +14503,6 @@ static const struct LevelUpMove sFletchlingLevelUpLearnset[] = { LEVEL_UP_MOVE(16, MOVE_ACROBATICS), LEVEL_UP_MOVE(20, MOVE_AGILITY), LEVEL_UP_MOVE(24, MOVE_AERIALACE), - LEVEL_UP_MOVE(26, MOVE_RAZORWIND), LEVEL_UP_MOVE(28, MOVE_TAILWIND), LEVEL_UP_MOVE(30, MOVE_NATURALGIFT), LEVEL_UP_MOVE(32, MOVE_STEELWING), @@ -14388,7 +14525,6 @@ static const struct LevelUpMove sFletchinderLevelUpLearnset[] = { LEVEL_UP_MOVE(16, MOVE_FLAMECHARGE), LEVEL_UP_MOVE(22, MOVE_AGILITY), LEVEL_UP_MOVE(27, MOVE_AERIALACE), - LEVEL_UP_MOVE(30, MOVE_RAZORWIND), LEVEL_UP_MOVE(32, MOVE_TAILWIND), LEVEL_UP_MOVE(34, MOVE_NATURALGIFT), LEVEL_UP_MOVE(37, MOVE_STEELWING), @@ -14413,7 +14549,6 @@ static const struct LevelUpMove sTalonflameLevelUpLearnset[] = { LEVEL_UP_MOVE(16, MOVE_FLAMECHARGE), LEVEL_UP_MOVE(22, MOVE_AGILITY), LEVEL_UP_MOVE(27, MOVE_AERIALACE), - LEVEL_UP_MOVE(30, MOVE_RAZORWIND), LEVEL_UP_MOVE(32, MOVE_TAILWIND), LEVEL_UP_MOVE(34, MOVE_NATURALGIFT), LEVEL_UP_MOVE(34, MOVE_DUALWINGBEAT), @@ -14443,64 +14578,67 @@ static const struct LevelUpMove sSpewpaLevelUpLearnset[] = { static const struct LevelUpMove sVivillonLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_GUST), - LEVEL_UP_MOVE( 1, MOVE_POWDER), + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_MOVE( 1, MOVE_STRINGSHOT), + LEVEL_UP_MOVE( 1, MOVE_STUNSPORE), + LEVEL_UP_MOVE( 1, MOVE_BUGBITE), + LEVEL_UP_MOVE( 1, MOVE_HARDEN), + LEVEL_UP_MOVE( 1, MOVE_PROTECT), LEVEL_UP_MOVE( 1, MOVE_SLEEPPOWDER), LEVEL_UP_MOVE( 1, MOVE_POISONPOWDER), LEVEL_UP_MOVE( 1, MOVE_STUNSPORE), - LEVEL_UP_MOVE( 1, MOVE_STRUGGLEBUG), LEVEL_UP_MOVE(11, MOVE_GUST), - LEVEL_UP_MOVE(12, MOVE_LIGHTSCREEN), + LEVEL_UP_MOVE(13, MOVE_SUPERSONIC), LEVEL_UP_MOVE(17, MOVE_PSYBEAM), - LEVEL_UP_MOVE(21, MOVE_SUPERSONIC), - LEVEL_UP_MOVE(25, MOVE_DRAININGKISS), - LEVEL_UP_MOVE(31, MOVE_AROMATHERAPY), - LEVEL_UP_MOVE(35, MOVE_BUGBUZZ), - LEVEL_UP_MOVE(41, MOVE_SAFEGUARD), - LEVEL_UP_MOVE(45, MOVE_QUIVERDANCE), - LEVEL_UP_MOVE(50, MOVE_HURRICANE), - LEVEL_UP_MOVE(55, MOVE_POWDER), + LEVEL_UP_MOVE(21, MOVE_STRUGGLEBUG), + LEVEL_UP_MOVE(25, MOVE_SAFEGUARD), + LEVEL_UP_MOVE(29, MOVE_AROMATHERAPY), + LEVEL_UP_MOVE(33, MOVE_DRAININGKISS), + LEVEL_UP_MOVE(37, MOVE_LIGHTSCREEN), + LEVEL_UP_MOVE(41, MOVE_BUGBUZZ), + LEVEL_UP_MOVE(45, MOVE_POWDER), + LEVEL_UP_MOVE(49, MOVE_QUIVERDANCE), + LEVEL_UP_MOVE(53, MOVE_HURRICANE), LEVEL_UP_END }; static const struct LevelUpMove sLitleoLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_LEER), - LEVEL_UP_MOVE( 5, MOVE_EMBER), + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_MOVE( 1, MOVE_EMBER), + LEVEL_UP_MOVE( 4, MOVE_NOBLEROAR), LEVEL_UP_MOVE( 8, MOVE_WORKUP), - LEVEL_UP_MOVE(11, MOVE_HEADBUTT), - LEVEL_UP_MOVE(15, MOVE_NOBLEROAR), - LEVEL_UP_MOVE(20, MOVE_TAKEDOWN), - LEVEL_UP_MOVE(23, MOVE_FIREFANG), - LEVEL_UP_MOVE(28, MOVE_ENDEAVOR), - LEVEL_UP_MOVE(33, MOVE_ECHOEDVOICE), - LEVEL_UP_MOVE(36, MOVE_FLAMETHROWER), - LEVEL_UP_MOVE(39, MOVE_CRUNCH), - LEVEL_UP_MOVE(43, MOVE_HYPERVOICE), - LEVEL_UP_MOVE(46, MOVE_INCINERATE), - LEVEL_UP_MOVE(50, MOVE_OVERHEAT), + LEVEL_UP_MOVE(11, MOVE_FIREFANG), + LEVEL_UP_MOVE(15, MOVE_TAKEDOWN), + LEVEL_UP_MOVE(19, MOVE_INCINERATE), + LEVEL_UP_MOVE(23, MOVE_ENDEAVOR), + LEVEL_UP_MOVE(27, MOVE_ECHOEDVOICE), + LEVEL_UP_MOVE(31, MOVE_CRUNCH), + LEVEL_UP_MOVE(35, MOVE_SUNNYDAY), + LEVEL_UP_MOVE(38, MOVE_FLAMETHROWER), + LEVEL_UP_MOVE(42, MOVE_HYPERVOICE), + LEVEL_UP_MOVE(46, MOVE_OVERHEAT), LEVEL_UP_END }; static const struct LevelUpMove sPyroarLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_HYPERBEAM), - LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_LEER), + LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_EMBER), + LEVEL_UP_MOVE( 1, MOVE_NOBLEROAR), LEVEL_UP_MOVE( 1, MOVE_WORKUP), - LEVEL_UP_MOVE( 5, MOVE_EMBER), - LEVEL_UP_MOVE( 8, MOVE_WORKUP), - LEVEL_UP_MOVE(11, MOVE_HEADBUTT), - LEVEL_UP_MOVE(15, MOVE_NOBLEROAR), - LEVEL_UP_MOVE(20, MOVE_TAKEDOWN), - LEVEL_UP_MOVE(23, MOVE_FIREFANG), - LEVEL_UP_MOVE(28, MOVE_ENDEAVOR), - LEVEL_UP_MOVE(33, MOVE_ECHOEDVOICE), - LEVEL_UP_MOVE(38, MOVE_FLAMETHROWER), - LEVEL_UP_MOVE(42, MOVE_SCORCHINGSANDS), - LEVEL_UP_MOVE(45, MOVE_CRUNCH), - LEVEL_UP_MOVE(48, MOVE_HYPERVOICE), - LEVEL_UP_MOVE(51, MOVE_INCINERATE), - LEVEL_UP_MOVE(57, MOVE_OVERHEAT), + LEVEL_UP_MOVE(11, MOVE_FIREFANG), + LEVEL_UP_MOVE(15, MOVE_TAKEDOWN), + LEVEL_UP_MOVE(19, MOVE_INCINERATE), + LEVEL_UP_MOVE(23, MOVE_ENDEAVOR), + LEVEL_UP_MOVE(27, MOVE_ECHOEDVOICE), + LEVEL_UP_MOVE(31, MOVE_CRUNCH), + LEVEL_UP_MOVE(35, MOVE_SUNNYDAY), + LEVEL_UP_MOVE(40, MOVE_FLAMETHROWER), + LEVEL_UP_MOVE(45, MOVE_SCORCHINGSANDS), + LEVEL_UP_MOVE(50, MOVE_HYPERVOICE), + LEVEL_UP_MOVE(55, MOVE_OVERHEAT), + LEVEL_UP_MOVE(60, MOVE_HYPERBEAM), LEVEL_UP_END }; @@ -14590,8 +14728,8 @@ static const struct LevelUpMove sGogoatLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_EARTHQUAKE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_GROWTH), - LEVEL_UP_MOVE( 7, MOVE_VINEWHIP), - LEVEL_UP_MOVE(10, MOVE_TAILWHIP), + LEVEL_UP_MOVE( 1, MOVE_VINEWHIP), + LEVEL_UP_MOVE( 1, MOVE_TAILWHIP), LEVEL_UP_MOVE(12, MOVE_LEECHSEED), LEVEL_UP_MOVE(14, MOVE_RAZORLEAF), LEVEL_UP_MOVE(17, MOVE_WORRYSEED), @@ -14614,13 +14752,11 @@ static const struct LevelUpMove sPanchamLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 4, MOVE_ARMTHRUST), LEVEL_UP_MOVE( 8, MOVE_TAUNT), - LEVEL_UP_MOVE(10, MOVE_KARATECHOP), LEVEL_UP_MOVE(12, MOVE_CIRCLETHROW), - LEVEL_UP_MOVE(14, MOVE_COMETPUNCH), - LEVEL_UP_MOVE(16, MOVE_LOWSWEEP), + LEVEL_UP_MOVE(16, MOVE_COMETPUNCH), LEVEL_UP_MOVE(20, MOVE_WORKUP), LEVEL_UP_MOVE(24, MOVE_SLASH), - LEVEL_UP_MOVE(28, MOVE_VITALTHROW), + LEVEL_UP_MOVE(28, MOVE_LOWSWEEP), LEVEL_UP_MOVE(33, MOVE_CRUNCH), LEVEL_UP_MOVE(36, MOVE_BODYSLAM), LEVEL_UP_MOVE(40, MOVE_PARTINGSHOT), @@ -14635,15 +14771,13 @@ static const struct LevelUpMove sPangoroLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_NIGHTSLASH), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_LEER), - LEVEL_UP_MOVE( 4, MOVE_ARMTHRUST), - LEVEL_UP_MOVE( 8, MOVE_TAUNT), - LEVEL_UP_MOVE(10, MOVE_KARATECHOP), + LEVEL_UP_MOVE( 1, MOVE_ARMTHRUST), + LEVEL_UP_MOVE( 1, MOVE_TAUNT), LEVEL_UP_MOVE(12, MOVE_CIRCLETHROW), - LEVEL_UP_MOVE(14, MOVE_COMETPUNCH), - LEVEL_UP_MOVE(16, MOVE_LOWSWEEP), + LEVEL_UP_MOVE(16, MOVE_COMETPUNCH), LEVEL_UP_MOVE(20, MOVE_WORKUP), LEVEL_UP_MOVE(24, MOVE_SLASH), - LEVEL_UP_MOVE(28, MOVE_VITALTHROW), + LEVEL_UP_MOVE(28, MOVE_LOWSWEEP), LEVEL_UP_MOVE(31, MOVE_BULLETPUNCH), LEVEL_UP_MOVE(35, MOVE_CRUNCH), LEVEL_UP_MOVE(40, MOVE_BODYSLAM), @@ -14660,15 +14794,15 @@ static const struct LevelUpMove sFurfrouLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 5, MOVE_SANDATTACK), LEVEL_UP_MOVE( 9, MOVE_BABYDOLLEYES), - LEVEL_UP_MOVE(12, MOVE_HEADBUTT), - LEVEL_UP_MOVE(15, MOVE_TAILWHIP), + LEVEL_UP_MOVE(13, MOVE_HEADBUTT), + LEVEL_UP_MOVE(18, MOVE_TAILWHIP), LEVEL_UP_MOVE(22, MOVE_BITE), LEVEL_UP_MOVE(27, MOVE_ODORSLEUTH), - LEVEL_UP_MOVE(33, MOVE_RETALIATE), - LEVEL_UP_MOVE(35, MOVE_TAKEDOWN), - LEVEL_UP_MOVE(38, MOVE_CHARM), - LEVEL_UP_MOVE(42, MOVE_SUCKERPUNCH), - LEVEL_UP_MOVE(48, MOVE_COTTONGUARD), + LEVEL_UP_MOVE(31, MOVE_RETALIATE), + LEVEL_UP_MOVE(36, MOVE_SUCKERPUNCH), + LEVEL_UP_MOVE(41, MOVE_TAKEDOWN), + LEVEL_UP_MOVE(46, MOVE_CHARM), + LEVEL_UP_MOVE(50, MOVE_COTTONGUARD), LEVEL_UP_END }; @@ -14752,20 +14886,18 @@ static const struct LevelUpMove sAegislashLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_KINGSSHIELD), LEVEL_UP_MOVE( 1, MOVE_PURSUIT), LEVEL_UP_MOVE( 1, MOVE_HEADSMASH), - LEVEL_UP_MOVE( 1, MOVE_METALSOUND), - LEVEL_UP_MOVE( 1, MOVE_SLASH), - LEVEL_UP_MOVE( 1, MOVE_NIGHTSLASH), - LEVEL_UP_MOVE( 1, MOVE_RETALIATE), - LEVEL_UP_MOVE( 1, MOVE_IRONDEFENSE), - LEVEL_UP_MOVE( 1, MOVE_IRONHEAD), - LEVEL_UP_MOVE( 1, MOVE_POWERTRICK), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_FURYCUTTER), LEVEL_UP_MOVE( 1, MOVE_SHADOWSNEAK), LEVEL_UP_MOVE( 1, MOVE_AUTOTOMIZE), + LEVEL_UP_MOVE( 1, MOVE_PURSUIT), + LEVEL_UP_MOVE( 1, MOVE_METALSOUND), + LEVEL_UP_MOVE( 1, MOVE_SLASH), + LEVEL_UP_MOVE( 1, MOVE_NIGHTSLASH), + LEVEL_UP_MOVE( 1, MOVE_POWERTRICK), + LEVEL_UP_MOVE( 1, MOVE_KINGSSHIELD), LEVEL_UP_MOVE( 1, MOVE_SWORDSDANCE), LEVEL_UP_MOVE( 1, MOVE_AERIALACE), - LEVEL_UP_MOVE( 1, MOVE_KINGSSHIELD), LEVEL_UP_MOVE( 1, MOVE_SACREDSWORD), LEVEL_UP_END }; @@ -14904,14 +15036,14 @@ static const struct LevelUpMove sBinacleLevelUpLearnset[] = { LEVEL_UP_MOVE(12, MOVE_FURYCUTTER), LEVEL_UP_MOVE(16, MOVE_FURYSWIPES), LEVEL_UP_MOVE(20, MOVE_ANCIENTPOWER), - LEVEL_UP_MOVE(22, MOVE_CLAMP), + LEVEL_UP_MOVE(20, MOVE_CLAMP), LEVEL_UP_MOVE(24, MOVE_ROCKPOLISH), LEVEL_UP_MOVE(28, MOVE_SLASH), LEVEL_UP_MOVE(32, MOVE_HONECLAWS), LEVEL_UP_MOVE(36, MOVE_RAZORSHELL), LEVEL_UP_MOVE(40, MOVE_SHELLSMASH), - LEVEL_UP_MOVE(42, MOVE_NIGHTSLASH), - LEVEL_UP_MOVE(44, MOVE_CROSSCHOP), + LEVEL_UP_MOVE(44, MOVE_NIGHTSLASH), + LEVEL_UP_MOVE(48, MOVE_CROSSCHOP), LEVEL_UP_END }; @@ -14925,14 +15057,14 @@ static const struct LevelUpMove sBarbaracleLevelUpLearnset[] = { LEVEL_UP_MOVE(12, MOVE_FURYCUTTER), LEVEL_UP_MOVE(16, MOVE_FURYSWIPES), LEVEL_UP_MOVE(20, MOVE_ANCIENTPOWER), - LEVEL_UP_MOVE(22, MOVE_CLAMP), + LEVEL_UP_MOVE(20, MOVE_CLAMP), LEVEL_UP_MOVE(24, MOVE_ROCKPOLISH), LEVEL_UP_MOVE(28, MOVE_SLASH), LEVEL_UP_MOVE(32, MOVE_HONECLAWS), LEVEL_UP_MOVE(36, MOVE_RAZORSHELL), LEVEL_UP_MOVE(42, MOVE_SHELLSMASH), - LEVEL_UP_MOVE(44, MOVE_NIGHTSLASH), - LEVEL_UP_MOVE(48, MOVE_CROSSCHOP), + LEVEL_UP_MOVE(46, MOVE_NIGHTSLASH), + LEVEL_UP_MOVE(50, MOVE_CROSSCHOP), LEVEL_UP_MOVE(54, MOVE_STONEEDGE), LEVEL_UP_END }; @@ -15264,7 +15396,9 @@ static const struct LevelUpMove sGoomyLevelUpLearnset[] = { static const struct LevelUpMove sSliggooLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ACIDSPRAY), - LEVEL_UP_MOVE( 1, MOVE_ACIDSPRAY), + LEVEL_UP_MOVE( 1, MOVE_ABSORB), + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_MOVE( 1, MOVE_BUBBLE), LEVEL_UP_MOVE( 1, MOVE_ABSORB), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 5, MOVE_BUBBLE), @@ -15284,8 +15418,6 @@ static const struct LevelUpMove sSliggooLevelUpLearnset[] = { static const struct LevelUpMove sGoodraLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_AQUATAIL), - LEVEL_UP_MOVE( 1, MOVE_AQUATAIL), - LEVEL_UP_MOVE( 1, MOVE_ACIDSPRAY), LEVEL_UP_MOVE( 1, MOVE_POISONTAIL), LEVEL_UP_MOVE( 1, MOVE_TEARFULLOOK), LEVEL_UP_MOVE( 1, MOVE_FEINT), @@ -15395,7 +15527,7 @@ static const struct LevelUpMove sPumpkabooLevelUpLearnset[] = { }; static const struct LevelUpMove sGourgeistLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_EXPLOSION), + LEVEL_UP_MOVE( 0, MOVE_PHANTOMFORCE), LEVEL_UP_MOVE( 1, MOVE_MOONBLAST), LEVEL_UP_MOVE( 1, MOVE_TRICKORTREAT), LEVEL_UP_MOVE( 1, MOVE_ASTONISH), @@ -15412,7 +15544,7 @@ static const struct LevelUpMove sGourgeistLevelUpLearnset[] = { LEVEL_UP_MOVE(36, MOVE_TRICKORTREAT), LEVEL_UP_MOVE(36, MOVE_SHADOWBALL), LEVEL_UP_MOVE(40, MOVE_TRICK), - LEVEL_UP_MOVE(44, MOVE_PHANTOMFORCE), + LEVEL_UP_MOVE(44, MOVE_SPIRITSHACKLE), LEVEL_UP_MOVE(48, MOVE_PAINSPLIT), LEVEL_UP_MOVE(54, MOVE_POLTERGEIST), LEVEL_UP_MOVE(60, MOVE_EXPLOSION), @@ -15424,47 +15556,46 @@ static const struct LevelUpMove sBergmiteLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_HARDEN), LEVEL_UP_MOVE( 3, MOVE_TACKLE), LEVEL_UP_MOVE( 6, MOVE_POWDERSNOW), - LEVEL_UP_MOVE( 9, MOVE_CURSE), + LEVEL_UP_MOVE( 9, MOVE_SHARPEN), LEVEL_UP_MOVE(12, MOVE_ICYWIND), - LEVEL_UP_MOVE(15, MOVE_PROTECT), - LEVEL_UP_MOVE(18, MOVE_AVALANCHE), - LEVEL_UP_MOVE(20, MOVE_SHARPEN), - LEVEL_UP_MOVE(21, MOVE_BITE), - LEVEL_UP_MOVE(24, MOVE_ICEFANG), - LEVEL_UP_MOVE(27, MOVE_IRONDEFENSE), - LEVEL_UP_MOVE(29, MOVE_ICEBALL), - LEVEL_UP_MOVE(30, MOVE_RECOVER), - LEVEL_UP_MOVE(33, MOVE_CRUNCH), - LEVEL_UP_MOVE(36, MOVE_TAKEDOWN), - LEVEL_UP_MOVE(39, MOVE_BLIZZARD), + LEVEL_UP_MOVE(16, MOVE_PROTECT), + LEVEL_UP_MOVE(19, MOVE_ICEFANG), + LEVEL_UP_MOVE(23, MOVE_BITE), + LEVEL_UP_MOVE(27, MOVE_ICEBALL), + LEVEL_UP_MOVE(31, MOVE_TAKEDOWN), + LEVEL_UP_MOVE(35, MOVE_BLIZZARD), + LEVEL_UP_MOVE(39, MOVE_IRONDEFENSE), LEVEL_UP_MOVE(42, MOVE_DOUBLEEDGE), + LEVEL_UP_MOVE(46, MOVE_CRUNCH), + LEVEL_UP_MOVE(50, MOVE_AVALANCHE), + LEVEL_UP_MOVE(54, MOVE_CURSE), + LEVEL_UP_MOVE(57, MOVE_RECOVER), LEVEL_UP_END }; static const struct LevelUpMove sAvaluggLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_BODYSLAM), - LEVEL_UP_MOVE( 1, MOVE_BODYSLAM), LEVEL_UP_MOVE( 1, MOVE_WIDEGUARD), + LEVEL_UP_MOVE( 1, MOVE_SKULLBASH), LEVEL_UP_MOVE( 1, MOVE_RAPIDSPIN), LEVEL_UP_MOVE( 1, MOVE_HARDEN), - LEVEL_UP_MOVE( 1, MOVE_TACKLE), - LEVEL_UP_MOVE( 1, MOVE_POWDERSNOW), - LEVEL_UP_MOVE( 9, MOVE_CURSE), + LEVEL_UP_MOVE( 3, MOVE_TACKLE), + LEVEL_UP_MOVE( 6, MOVE_POWDERSNOW), + LEVEL_UP_MOVE( 9, MOVE_SHARPEN), LEVEL_UP_MOVE(12, MOVE_ICYWIND), - LEVEL_UP_MOVE(15, MOVE_PROTECT), - LEVEL_UP_MOVE(18, MOVE_AVALANCHE), - LEVEL_UP_MOVE(20, MOVE_SHARPEN), - LEVEL_UP_MOVE(21, MOVE_BITE), - LEVEL_UP_MOVE(24, MOVE_ICEFANG), - LEVEL_UP_MOVE(27, MOVE_IRONDEFENSE), - LEVEL_UP_MOVE(29, MOVE_ICEBALL), - LEVEL_UP_MOVE(30, MOVE_RECOVER), - LEVEL_UP_MOVE(33, MOVE_CRUNCH), - LEVEL_UP_MOVE(36, MOVE_TAKEDOWN), + LEVEL_UP_MOVE(16, MOVE_PROTECT), + LEVEL_UP_MOVE(19, MOVE_ICEFANG), + LEVEL_UP_MOVE(23, MOVE_BITE), + LEVEL_UP_MOVE(27, MOVE_ICEBALL), + LEVEL_UP_MOVE(31, MOVE_TAKEDOWN), + LEVEL_UP_MOVE(35, MOVE_BLIZZARD), LEVEL_UP_MOVE(36, MOVE_BODYSLAM), - LEVEL_UP_MOVE(41, MOVE_BLIZZARD), - LEVEL_UP_MOVE(46, MOVE_DOUBLEEDGE), - LEVEL_UP_MOVE(51, MOVE_SKULLBASH), + LEVEL_UP_MOVE(41, MOVE_IRONDEFENSE), + LEVEL_UP_MOVE(45, MOVE_DOUBLEEDGE), + LEVEL_UP_MOVE(50, MOVE_CRUNCH), + LEVEL_UP_MOVE(55, MOVE_AVALANCHE), + LEVEL_UP_MOVE(60, MOVE_CURSE), + LEVEL_UP_MOVE(64, MOVE_RECOVER), LEVEL_UP_END }; @@ -15491,7 +15622,7 @@ static const struct LevelUpMove sNoibatLevelUpLearnset[] = { static const struct LevelUpMove sNoivernLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DRAGONPULSE), - LEVEL_UP_MOVE( 1, MOVE_DRAGONPULSE), + LEVEL_UP_MOVE( 1, MOVE_AEROBLAST), LEVEL_UP_MOVE( 1, MOVE_MOONLIGHT), LEVEL_UP_MOVE( 1, MOVE_LEECHLIFE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), @@ -15565,19 +15696,22 @@ static const struct LevelUpMove sYveltalLevelUpLearnset[] = { }; static const struct LevelUpMove sZygardeLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_SANDSTORM), LEVEL_UP_MOVE( 1, MOVE_BIND), LEVEL_UP_MOVE( 1, MOVE_DRAGONBREATH), LEVEL_UP_MOVE( 1, MOVE_BULLDOZE), + LEVEL_UP_MOVE( 1, MOVE_DRAGONBREATH), + LEVEL_UP_MOVE( 1, MOVE_BULLDOZE), LEVEL_UP_MOVE( 1, MOVE_BITE), LEVEL_UP_MOVE( 8, MOVE_HAZE), LEVEL_UP_MOVE(16, MOVE_SAFEGUARD), LEVEL_UP_MOVE(24, MOVE_DIG), LEVEL_UP_MOVE(32, MOVE_CRUNCH), LEVEL_UP_MOVE(40, MOVE_CAMOUFLAGE), - LEVEL_UP_MOVE(48, MOVE_DRAGONPULSE), + LEVEL_UP_MOVE(48, MOVE_BREAKINGSWIPE), LEVEL_UP_MOVE(54, MOVE_LANDSWRATH), LEVEL_UP_MOVE(60, MOVE_GLARE), - LEVEL_UP_MOVE(68, MOVE_SANDSTORM), + LEVEL_UP_MOVE(68, MOVE_DRAGONPULSE), LEVEL_UP_MOVE(76, MOVE_COIL), LEVEL_UP_MOVE(84, MOVE_EARTHQUAKE), LEVEL_UP_MOVE(92, MOVE_OUTRAGE), @@ -15667,11 +15801,12 @@ static const struct LevelUpMove sVolcanionLevelUpLearnset[] = { LEVEL_UP_MOVE(54, MOVE_TAKEDOWN), LEVEL_UP_MOVE(60, MOVE_MIST), LEVEL_UP_MOVE(60, MOVE_HAZE), - LEVEL_UP_MOVE(66, MOVE_HYDROPUMP), - LEVEL_UP_MOVE(72, MOVE_STEAMERUPTION), + LEVEL_UP_MOVE(66, MOVE_STRANGESTEAM), + LEVEL_UP_MOVE(72, MOVE_HYDROPUMP), LEVEL_UP_MOVE(78, MOVE_FLAREBLITZ), - LEVEL_UP_MOVE(84, MOVE_OVERHEAT), - LEVEL_UP_MOVE(90, MOVE_EXPLOSION), + LEVEL_UP_MOVE(84, MOVE_STEAMERUPTION), + LEVEL_UP_MOVE(90, MOVE_OVERHEAT), + LEVEL_UP_MOVE(96, MOVE_EXPLOSION), LEVEL_UP_END }; @@ -15764,7 +15899,6 @@ static const struct LevelUpMove sDartrixLevelUpLearnset[] = { static const struct LevelUpMove sDecidueyeLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SPIRITSHACKLE), - LEVEL_UP_MOVE( 1, MOVE_SPIRITSHACKLE), LEVEL_UP_MOVE( 1, MOVE_PHANTOMFORCE), LEVEL_UP_MOVE( 1, MOVE_LEAFSTORM), LEVEL_UP_MOVE( 1, MOVE_UTURN), @@ -15822,7 +15956,7 @@ static const struct LevelUpMove sTorracatLevelUpLearnset[] = { LEVEL_UP_MOVE(20, MOVE_DOUBLEKICK), LEVEL_UP_MOVE(25, MOVE_FIREFANG), LEVEL_UP_MOVE(30, MOVE_SCARYFACE), - LEVEL_UP_MOVE(35, MOVE_SWAGGER), + LEVEL_UP_MOVE(32, MOVE_SWAGGER), LEVEL_UP_MOVE(40, MOVE_FLAMETHROWER), LEVEL_UP_MOVE(45, MOVE_THRASH), LEVEL_UP_MOVE(50, MOVE_FLAREBLITZ), @@ -15832,8 +15966,8 @@ static const struct LevelUpMove sTorracatLevelUpLearnset[] = { static const struct LevelUpMove sIncineroarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DARKESTLARIAT), - LEVEL_UP_MOVE( 1, MOVE_DARKESTLARIAT), - LEVEL_UP_MOVE( 1, MOVE_CROSSCHOP), + LEVEL_UP_MOVE( 1, MOVE_THROATCHOP), + LEVEL_UP_MOVE( 1, MOVE_BULKUP), LEVEL_UP_MOVE( 1, MOVE_THROATCHOP), LEVEL_UP_MOVE( 1, MOVE_BULKUP), LEVEL_UP_MOVE( 1, MOVE_SCRATCH), @@ -15849,11 +15983,12 @@ static const struct LevelUpMove sIncineroarLevelUpLearnset[] = { LEVEL_UP_MOVE(30, MOVE_SCARYFACE), LEVEL_UP_MOVE(32, MOVE_SWAGGER), LEVEL_UP_MOVE(33, MOVE_DARKESTLARIAT), - LEVEL_UP_MOVE(44, MOVE_FLAMETHROWER), - LEVEL_UP_MOVE(51, MOVE_THRASH), + LEVEL_UP_MOVE(37, MOVE_FIREPUNCH), + LEVEL_UP_MOVE(43, MOVE_FLAMETHROWER), + LEVEL_UP_MOVE(49, MOVE_THRASH), LEVEL_UP_MOVE(55, MOVE_FLAREBLITZ), - LEVEL_UP_MOVE(60, MOVE_OUTRAGE), - LEVEL_UP_MOVE(66, MOVE_CROSSCHOP), + LEVEL_UP_MOVE(61, MOVE_OUTRAGE), + LEVEL_UP_MOVE(67, MOVE_CROSSCHOP), LEVEL_UP_END }; @@ -15874,6 +16009,7 @@ static const struct LevelUpMove sPopplioLevelUpLearnset[] = { LEVEL_UP_MOVE(33, MOVE_MOONBLAST), LEVEL_UP_MOVE(36, MOVE_HYDROPUMP), LEVEL_UP_MOVE(39, MOVE_CAPTIVATE), + LEVEL_UP_MOVE(42, MOVE_RELICSONG), LEVEL_UP_END }; @@ -15894,12 +16030,12 @@ static const struct LevelUpMove sBrionneLevelUpLearnset[] = { LEVEL_UP_MOVE(45, MOVE_MOONBLAST), LEVEL_UP_MOVE(50, MOVE_HYDROPUMP), LEVEL_UP_MOVE(55, MOVE_CAPTIVATE), + LEVEL_UP_MOVE(60, MOVE_RELICSONG), LEVEL_UP_END }; static const struct LevelUpMove sPrimarinaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SPARKLINGARIA), - LEVEL_UP_MOVE( 1, MOVE_SPARKLINGARIA), LEVEL_UP_MOVE( 1, MOVE_POUND), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_WATERGUN), @@ -15916,7 +16052,8 @@ static const struct LevelUpMove sPrimarinaLevelUpLearnset[] = { LEVEL_UP_MOVE(44, MOVE_HYPERVOICE), LEVEL_UP_MOVE(51, MOVE_MOONBLAST), LEVEL_UP_MOVE(58, MOVE_HYDROPUMP), - LEVEL_UP_MOVE(60, MOVE_CAPTIVATE), + LEVEL_UP_MOVE(65, MOVE_CAPTIVATE), + LEVEL_UP_MOVE(72, MOVE_RELICSONG), LEVEL_UP_END }; @@ -16181,21 +16318,22 @@ static const struct LevelUpMove sRibombeeLevelUpLearnset[] = { static const struct LevelUpMove sRockruffLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_ODORSLEUTH), - LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_LEER), + LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 4, MOVE_SANDATTACK), LEVEL_UP_MOVE( 8, MOVE_DOUBLETEAM), LEVEL_UP_MOVE(12, MOVE_ROCKTHROW), LEVEL_UP_MOVE(16, MOVE_HOWL), - LEVEL_UP_MOVE(20, MOVE_BITE), - LEVEL_UP_MOVE(24, MOVE_ROCKTOMB), - LEVEL_UP_MOVE(28, MOVE_ROAR), - LEVEL_UP_MOVE(32, MOVE_ROCKSLIDE), - LEVEL_UP_MOVE(36, MOVE_CRUNCH), - LEVEL_UP_MOVE(40, MOVE_SCARYFACE), - LEVEL_UP_MOVE(44, MOVE_STEALTHROCK), - LEVEL_UP_MOVE(48, MOVE_ROCKCLIMB), - LEVEL_UP_MOVE(52, MOVE_STONEEDGE), + LEVEL_UP_MOVE(19, MOVE_BITE), + LEVEL_UP_MOVE(23, MOVE_ROCKTOMB), + LEVEL_UP_MOVE(27, MOVE_ROAR), + LEVEL_UP_MOVE(30, MOVE_CRUNCH), + LEVEL_UP_MOVE(34, MOVE_ROCKSLIDE), + LEVEL_UP_MOVE(38, MOVE_SCARYFACE), + LEVEL_UP_MOVE(41, MOVE_ROCKCLIMB), + LEVEL_UP_MOVE(45, MOVE_STEALTHROCK), + LEVEL_UP_MOVE(49, MOVE_PLAYROUGH), + LEVEL_UP_MOVE(53, MOVE_STONEEDGE), LEVEL_UP_END }; @@ -16205,22 +16343,24 @@ static const struct LevelUpMove sLycanrocLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_QUICKGUARD), LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK), LEVEL_UP_MOVE( 1, MOVE_ODORSLEUTH), - LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_LEER), + LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_SANDATTACK), LEVEL_UP_MOVE( 1, MOVE_DOUBLETEAM), LEVEL_UP_MOVE(12, MOVE_ROCKTHROW), LEVEL_UP_MOVE(16, MOVE_HOWL), - LEVEL_UP_MOVE(20, MOVE_BITE), - LEVEL_UP_MOVE(24, MOVE_ROCKTOMB), + LEVEL_UP_MOVE(19, MOVE_BITE), + LEVEL_UP_MOVE(23, MOVE_ROCKTOMB), LEVEL_UP_MOVE(24, MOVE_ACCELEROCK), - LEVEL_UP_MOVE(30, MOVE_ROAR), - LEVEL_UP_MOVE(36, MOVE_ROCKSLIDE), - LEVEL_UP_MOVE(42, MOVE_CRUNCH), - LEVEL_UP_MOVE(48, MOVE_SCARYFACE), - LEVEL_UP_MOVE(54, MOVE_ROCKCLIMB), - LEVEL_UP_MOVE(60, MOVE_STEALTHROCK), - LEVEL_UP_MOVE(66, MOVE_STONEEDGE), + LEVEL_UP_MOVE(29, MOVE_ROAR), + LEVEL_UP_MOVE(33, MOVE_CRUNCH), + LEVEL_UP_MOVE(38, MOVE_ROCKSLIDE), + LEVEL_UP_MOVE(43, MOVE_SCARYFACE), + LEVEL_UP_MOVE(47, MOVE_ROCKCLIMB), + LEVEL_UP_MOVE(52, MOVE_STEALTHROCK), + LEVEL_UP_MOVE(56, MOVE_PLAYROUGH), + LEVEL_UP_MOVE(61, MOVE_STONEEDGE), + LEVEL_UP_MOVE(66, MOVE_CLOSECOMBAT), LEVEL_UP_END }; @@ -16833,7 +16973,7 @@ static const struct LevelUpMove sTurtonatorLevelUpLearnset[] = { LEVEL_UP_MOVE(36, MOVE_FLAMETHROWER), LEVEL_UP_MOVE(40, MOVE_SHELLTRAP), LEVEL_UP_MOVE(44, MOVE_SHELLSMASH), - LEVEL_UP_MOVE(48, MOVE_OVERHEAT), + LEVEL_UP_MOVE(48, MOVE_SEARINGSHOT), LEVEL_UP_MOVE(52, MOVE_EXPLOSION), LEVEL_UP_END }; @@ -16909,6 +17049,7 @@ static const struct LevelUpMove sDrampaLevelUpLearnset[] = { LEVEL_UP_MOVE(48, MOVE_FLY), LEVEL_UP_MOVE(53, MOVE_HYPERVOICE), LEVEL_UP_MOVE(58, MOVE_OUTRAGE), + LEVEL_UP_MOVE(63, MOVE_DRAGONENERGY), LEVEL_UP_END }; @@ -16948,6 +17089,7 @@ static const struct LevelUpMove sJangmoOLevelUpLearnset[] = { LEVEL_UP_MOVE(36, MOVE_NOBLEROAR), LEVEL_UP_MOVE(40, MOVE_DRAGONDANCE), LEVEL_UP_MOVE(44, MOVE_OUTRAGE), + LEVEL_UP_MOVE(48, MOVE_CLANGINGSCALES), LEVEL_UP_END }; @@ -16969,12 +17111,11 @@ static const struct LevelUpMove sHakamoOLevelUpLearnset[] = { LEVEL_UP_MOVE(44, MOVE_DRAGONDANCE), LEVEL_UP_MOVE(50, MOVE_OUTRAGE), LEVEL_UP_MOVE(56, MOVE_CLOSECOMBAT), + LEVEL_UP_MOVE(62, MOVE_CLANGINGSCALES), LEVEL_UP_END }; static const struct LevelUpMove sKommoOLevelUpLearnset[] = { - LEVEL_UP_MOVE( 0, MOVE_CLANGINGSCALES), - LEVEL_UP_MOVE( 1, MOVE_CLANGINGSCALES), LEVEL_UP_MOVE( 1, MOVE_SKYUPPERCUT), LEVEL_UP_MOVE( 1, MOVE_BELLYDRUM), LEVEL_UP_MOVE( 1, MOVE_AUTOTOMIZE), @@ -16993,8 +17134,9 @@ static const struct LevelUpMove sKommoOLevelUpLearnset[] = { LEVEL_UP_MOVE(44, MOVE_DRAGONDANCE), LEVEL_UP_MOVE(52, MOVE_OUTRAGE), LEVEL_UP_MOVE(60, MOVE_CLOSECOMBAT), - LEVEL_UP_MOVE(68, MOVE_CLANGOROUSSOUL), - LEVEL_UP_MOVE(76, MOVE_BOOMBURST), + LEVEL_UP_MOVE(68, MOVE_CLANGINGSCALES), + LEVEL_UP_MOVE(76, MOVE_CLANGOROUSSOUL), + LEVEL_UP_MOVE(82, MOVE_BOOMBURST), LEVEL_UP_END }; @@ -17310,6 +17452,7 @@ static const struct LevelUpMove sGuzzlordLevelUpLearnset[] = { LEVEL_UP_MOVE(60, MOVE_BELCH), LEVEL_UP_MOVE(65, MOVE_THRASH), LEVEL_UP_MOVE(70, MOVE_GIGAIMPACT), + LEVEL_UP_MOVE(75, MOVE_COREENFORCER), LEVEL_UP_END }; @@ -17347,8 +17490,9 @@ static const struct LevelUpMove sMagearnaLevelUpLearnset[] = { LEVEL_UP_MOVE(20, MOVE_MIRRORSHOT), LEVEL_UP_MOVE(24, MOVE_GEARUP), LEVEL_UP_MOVE(30, MOVE_PSYBEAM), - LEVEL_UP_MOVE(36, MOVE_AURORABEAM), - LEVEL_UP_MOVE(42, MOVE_MINDREADER), + LEVEL_UP_MOVE(30, MOVE_AURORABEAM), + LEVEL_UP_MOVE(36, MOVE_MINDREADER), + LEVEL_UP_MOVE(42, MOVE_SPIRITBREAK), LEVEL_UP_MOVE(48, MOVE_SHIFTGEAR), LEVEL_UP_MOVE(54, MOVE_CRAFTYSHIELD), LEVEL_UP_MOVE(60, MOVE_IRONHEAD), @@ -17462,10 +17606,10 @@ static const struct LevelUpMove sSandshrewALevelUpLearnset[] = { LEVEL_UP_MOVE( 3, MOVE_MIST), LEVEL_UP_MOVE( 6, MOVE_POWDERSNOW), LEVEL_UP_MOVE( 9, MOVE_ROLLOUT), - LEVEL_UP_MOVE(12, MOVE_FURYSWIPES), - LEVEL_UP_MOVE(15, MOVE_METALCLAW), - LEVEL_UP_MOVE(18, MOVE_RAPIDSPIN), - LEVEL_UP_MOVE(21, MOVE_ICEBALL), + LEVEL_UP_MOVE(12, MOVE_METALCLAW), + LEVEL_UP_MOVE(15, MOVE_RAPIDSPIN), + LEVEL_UP_MOVE(18, MOVE_ICEBALL), + LEVEL_UP_MOVE(21, MOVE_FURYSWIPES), LEVEL_UP_MOVE(24, MOVE_FURYCUTTER), LEVEL_UP_MOVE(27, MOVE_SWIFT), LEVEL_UP_MOVE(30, MOVE_IRONDEFENSE), @@ -17480,15 +17624,15 @@ static const struct LevelUpMove sSandshrewALevelUpLearnset[] = { static const struct LevelUpMove sSandslashALevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ICICLESPEAR), - LEVEL_UP_MOVE( 1, MOVE_ICICLECRASH), + LEVEL_UP_MOVE( 1, MOVE_ICICLESPEAR), LEVEL_UP_MOVE( 1, MOVE_METALBURST), LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_MIST), LEVEL_UP_MOVE( 1, MOVE_POWDERSNOW), LEVEL_UP_MOVE( 1, MOVE_ROLLOUT), LEVEL_UP_MOVE( 1, MOVE_RAPIDSPIN), - LEVEL_UP_MOVE( 1, MOVE_FURYSWIPES), LEVEL_UP_MOVE( 1, MOVE_ICEBALL), + LEVEL_UP_MOVE( 1, MOVE_FURYSWIPES), LEVEL_UP_MOVE( 1, MOVE_FURYCUTTER), LEVEL_UP_MOVE( 1, MOVE_SWIFT), LEVEL_UP_MOVE( 1, MOVE_IRONDEFENSE), @@ -17858,26 +18002,29 @@ static const struct LevelUpMove sDeoxysSpeedLevelUpLearnset[] = { static const struct LevelUpMove sLycanrocNLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_COUNTER), + LEVEL_UP_MOVE( 1, MOVE_ACCELEROCK), LEVEL_UP_MOVE( 1, MOVE_ENDURE), LEVEL_UP_MOVE( 1, MOVE_REVERSAL), LEVEL_UP_MOVE( 1, MOVE_TAUNT), LEVEL_UP_MOVE( 1, MOVE_ODORSLEUTH), - LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_LEER), + LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_SANDATTACK), LEVEL_UP_MOVE( 1, MOVE_DOUBLETEAM), LEVEL_UP_MOVE(12, MOVE_ROCKTHROW), LEVEL_UP_MOVE(16, MOVE_HOWL), - LEVEL_UP_MOVE(20, MOVE_BITE), - LEVEL_UP_MOVE(24, MOVE_ROCKTOMB), + LEVEL_UP_MOVE(19, MOVE_BITE), + LEVEL_UP_MOVE(23, MOVE_ROCKTOMB), LEVEL_UP_MOVE(24, MOVE_COUNTER), - LEVEL_UP_MOVE(30, MOVE_ROAR), - LEVEL_UP_MOVE(36, MOVE_ROCKSLIDE), - LEVEL_UP_MOVE(42, MOVE_CRUNCH), - LEVEL_UP_MOVE(48, MOVE_SCARYFACE), - LEVEL_UP_MOVE(54, MOVE_ROCKCLIMB), - LEVEL_UP_MOVE(60, MOVE_STEALTHROCK), - LEVEL_UP_MOVE(66, MOVE_STONEEDGE), + LEVEL_UP_MOVE(29, MOVE_ROAR), + LEVEL_UP_MOVE(33, MOVE_CRUNCH), + LEVEL_UP_MOVE(38, MOVE_ROCKSLIDE), + LEVEL_UP_MOVE(43, MOVE_SCARYFACE), + LEVEL_UP_MOVE(47, MOVE_ROCKCLIMB), + LEVEL_UP_MOVE(52, MOVE_STEALTHROCK), + LEVEL_UP_MOVE(56, MOVE_PLAYROUGH), + LEVEL_UP_MOVE(61, MOVE_STONEEDGE), + LEVEL_UP_MOVE(66, MOVE_CLOSECOMBAT), LEVEL_UP_END }; @@ -17986,6 +18133,7 @@ static const struct LevelUpMove sZeraoraLevelUpLearnset[] = { static const struct LevelUpMove sLycanrocDuskLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_CRUSHCLAW), + LEVEL_UP_MOVE( 1, MOVE_THUNDERFANG), LEVEL_UP_MOVE( 1, MOVE_THRASH), LEVEL_UP_MOVE( 1, MOVE_SUCKERPUNCH), LEVEL_UP_MOVE( 1, MOVE_ACCELEROCK), @@ -17996,22 +18144,24 @@ static const struct LevelUpMove sLycanrocDuskLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_REVERSAL), LEVEL_UP_MOVE( 1, MOVE_TAUNT), LEVEL_UP_MOVE( 1, MOVE_ODORSLEUTH), - LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_LEER), + LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_SANDATTACK), LEVEL_UP_MOVE( 1, MOVE_DOUBLETEAM), LEVEL_UP_MOVE(12, MOVE_ROCKTHROW), LEVEL_UP_MOVE(16, MOVE_HOWL), - LEVEL_UP_MOVE(20, MOVE_BITE), - LEVEL_UP_MOVE(24, MOVE_ROCKTOMB), + LEVEL_UP_MOVE(19, MOVE_BITE), + LEVEL_UP_MOVE(23, MOVE_ROCKTOMB), LEVEL_UP_MOVE(24, MOVE_CRUSHCLAW), - LEVEL_UP_MOVE(30, MOVE_ROAR), - LEVEL_UP_MOVE(36, MOVE_ROCKSLIDE), - LEVEL_UP_MOVE(42, MOVE_CRUNCH), - LEVEL_UP_MOVE(48, MOVE_SCARYFACE), - LEVEL_UP_MOVE(54, MOVE_ROCKCLIMB), - LEVEL_UP_MOVE(60, MOVE_STEALTHROCK), - LEVEL_UP_MOVE(66, MOVE_STONEEDGE), + LEVEL_UP_MOVE(29, MOVE_ROAR), + LEVEL_UP_MOVE(33, MOVE_CRUNCH), + LEVEL_UP_MOVE(38, MOVE_ROCKSLIDE), + LEVEL_UP_MOVE(43, MOVE_SCARYFACE), + LEVEL_UP_MOVE(47, MOVE_ROCKCLIMB), + LEVEL_UP_MOVE(52, MOVE_STEALTHROCK), + LEVEL_UP_MOVE(56, MOVE_PLAYROUGH), + LEVEL_UP_MOVE(61, MOVE_STONEEDGE), + LEVEL_UP_MOVE(66, MOVE_CLOSECOMBAT), LEVEL_UP_END }; diff --git a/src/Pokedex_Orders.c b/src/Pokedex_Orders.c index 60fb4dd..5e4fd86 100644 --- a/src/Pokedex_Orders.c +++ b/src/Pokedex_Orders.c @@ -1044,6 +1044,7 @@ const u16 gPokedexOrder_Alphabetical[] = SPECIES_OMASTAR, SPECIES_ONIX, SPECIES_ORANGURU, + SPECIES_ORBEETLE, SPECIES_ORICORIO, SPECIES_OSHAWOTT, SPECIES_PACHIRISU, diff --git a/src/Species_To_Pokdex_Table.c b/src/Species_To_Pokdex_Table.c index 7e3a279..158d704 100644 --- a/src/Species_To_Pokdex_Table.c +++ b/src/Species_To_Pokdex_Table.c @@ -869,7 +869,7 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_FURFROU_MATRON - 1] = NATIONAL_DEX_FURFROU, [SPECIES_FURFROU_DANDY - 1] = NATIONAL_DEX_FURFROU, [SPECIES_FURFROU_DEBUTANTE - 1] = NATIONAL_DEX_FURFROU, - [SPECIES_VIVILLON_FANCY - 1] = NATIONAL_DEX_FURFROU, + [SPECIES_VIVILLON_FANCY - 1] = NATIONAL_DEX_VIVILLON, [SPECIES_VENUSAUR_MEGA - 1] = NATIONAL_DEX_VENUSAUR, [SPECIES_CHARIZARD_MEGA_X - 1] = NATIONAL_DEX_CHARIZARD, [SPECIES_CHARIZARD_MEGA_Y - 1] = NATIONAL_DEX_CHARIZARD, diff --git a/src/defines.h b/src/defines.h index 3070581..28b0b7f 100644 --- a/src/defines.h +++ b/src/defines.h @@ -20,4 +20,4 @@ //#define INCLUDE_FOOTPRINTS //If you uncomment this line, make sure to uncomment gMonFootprintTable in "repoints", and remove the footprint remover in "bytereplacement" #define NUM_TMSHMS 128 -#define NUM_MOVE_TUTOR_MOVES 128 \ No newline at end of file +#define NUM_MOVE_TUTOR_MOVES 146 diff --git a/src/tm_compatibility/102 - Dazzling Gleam.txt b/src/tm_compatibility/102 - Dazzling Gleam.txt index 6da0d52..b4dcdb5 100644 --- a/src/tm_compatibility/102 - Dazzling Gleam.txt +++ b/src/tm_compatibility/102 - Dazzling Gleam.txt @@ -113,6 +113,7 @@ AROMATISSE SWIRLIX SLURPUFF SYLVEON +DEDENNE CARBINK KLEFKI XERNEAS diff --git a/src/tm_compatibility/110 - Draining Kiss.txt b/src/tm_compatibility/110 - Draining Kiss.txt index 15f4cea..dbb4d4a 100644 --- a/src/tm_compatibility/110 - Draining Kiss.txt +++ b/src/tm_compatibility/110 - Draining Kiss.txt @@ -24,6 +24,7 @@ VULPIX_A NINETALES_A JIGGLYPUFF WIGGLYTUFF +MR_MIME JYNX MEW CLEFFA diff --git a/src/tm_compatibility/111 - Smack Down.txt b/src/tm_compatibility/111 - Smack Down.txt index 2c11e8f..774224a 100644 --- a/src/tm_compatibility/111 - Smack Down.txt +++ b/src/tm_compatibility/111 - Smack Down.txt @@ -113,6 +113,8 @@ PIKIPEK TRUMBEAK TOUCANNON TOXAPEX +MUDBRAY +MUDSDALE PASSIMIAN TURTONATOR BUZZWOLE @@ -120,4 +122,7 @@ CELESTEELA GUZZLORD MARSHADOW STAKATAKA -BLACEPHALON \ No newline at end of file +BLACEPHALON +ROLYCOLY +CARKOL +COALOSSAL diff --git a/src/tm_compatibility/118 - Aurora Veil.txt b/src/tm_compatibility/118 - Aurora Veil.txt index 9a7fce4..9adc847 100644 --- a/src/tm_compatibility/118 - Aurora Veil.txt +++ b/src/tm_compatibility/118 - Aurora Veil.txt @@ -9,11 +9,17 @@ MEW DELIBIRD SMOOCHUM REGICE +ABOMASNOW GLACEON FROSLASS VANILLITE VANILLISH VANILLUXE CRYOGONAL +AMAURA +AURORUS BERGMITE AVALUGG +FROSMOTH +EISCUE +ARCTOVISH diff --git a/src/tm_compatibility/128 - Rock Climb.txt b/src/tm_compatibility/128 - Rock Climb.txt index 56bf5cb..daab175 100644 --- a/src/tm_compatibility/128 - Rock Climb.txt +++ b/src/tm_compatibility/128 - Rock Climb.txt @@ -45,6 +45,7 @@ MEGANIUM TYPHLOSION FERALIGATR AMPHAROS +GLIGAR STEELIX GRANBULL URSARING @@ -56,6 +57,10 @@ TYRANITAR SCEPTILE BLAZIKEN SWAMPERT +ZIGZAGOON +ZIGZAGOON_G +LINOONE +LINOONE_G LUDICOLO VIGOROTH SLAKING @@ -64,6 +69,7 @@ MAKUHITA HARIYAMA AGGRON ZANGOOSE +METAGROSS REGIROCK REGICE REGISTEEL @@ -75,6 +81,7 @@ CHIMCHAR MONFERNO INFERNAPE EMPOLEON +BIDOOF BIBAREL CRANIDOS RAMPARDOS @@ -92,6 +99,7 @@ RHYPERIOR ELECTIVIRE MAGMORTAR MAMOSWINE +GLISCOR HEATRAN REGIGIGAS GIRATINA @@ -199,4 +207,5 @@ KOMMO_O BUZZWOLE PHEROMOSA GUZZLORD -MELMETAL \ No newline at end of file +MELMETAL +OBSTAGOON diff --git a/src/tm_compatibility/22 - Solarbeam.txt b/src/tm_compatibility/22 - Solarbeam.txt index 2460ece..181decd 100644 --- a/src/tm_compatibility/22 - Solarbeam.txt +++ b/src/tm_compatibility/22 - Solarbeam.txt @@ -8,6 +8,7 @@ BEEDRILL CLEFAIRY CLEFABLE NINETALES +NINETALES_A JIGGLYPUFF WIGGLYTUFF ODDISH @@ -219,6 +220,7 @@ DWEBBLE CRUSTLE SIGILYPH GARBODOR +EMOLGA DEERLING DEERLING_SUMMER DEERLING_AUTUMN @@ -294,6 +296,7 @@ FLORGES_YELLOW FLORGES_WHITE SKIDDO GOGOAT +HELIOLISK PHANTUMP TREVENANT PUMPKABOO @@ -342,4 +345,33 @@ NECROZMA_DAWN_WINGS NECROZMA_ULTRA MAGEARNA MAGEARNA_P -MELMETAL \ No newline at end of file +BLACEPHALON +MELMETAL +GROOKEY +THWACKEY +RILLABOOM +DOTTLER +ORBEETLE +GOSSIFLEUR +ELDEGOSS +COALOSSAL +FLAPPLE +APPLETUN +CENTISKORCH +MR_RIME +ALCREMIE_STRAWBERRY +ALCREMIE_BERRY +ALCREMIE_CLOVER +ALCREMIE_FLOWER +ALCREMIE_LOVE +ALCREMIE_RIBBON +ALCREMIE_STAR +DURALUDON +DRAGAPULT +ZAMAZENTA +ZAMAZENTA_CROWNED +ETERNATUS +ZARUDE +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tm_compatibility/30 - Shadow Ball.txt b/src/tm_compatibility/30 - Shadow Ball.txt index 39eeb60..a3890ae 100644 --- a/src/tm_compatibility/30 - Shadow Ball.txt +++ b/src/tm_compatibility/30 - Shadow Ball.txt @@ -33,6 +33,9 @@ HAUNTER GENGAR DROWZEE HYPNO +EXEGGCUTE +EXEGGCUTE_A +EXEGGUTOR MAROWAK_A LICKITUNG KOFFING diff --git a/src/tm_compatibility/33 - Reflect.txt b/src/tm_compatibility/33 - Reflect.txt index 64d7e3b..edb6879 100644 --- a/src/tm_compatibility/33 - Reflect.txt +++ b/src/tm_compatibility/33 - Reflect.txt @@ -97,6 +97,8 @@ LUNATONE SOLROCK BALTOY CLAYDOL +VOLBEAT +ILLUMISE CHIMECHO METANG METAGROSS diff --git a/src/tm_compatibility/43 - Secret Power.txt b/src/tm_compatibility/43 - Secret Power.txt index bce4d91..4d50d67 100644 --- a/src/tm_compatibility/43 - Secret Power.txt +++ b/src/tm_compatibility/43 - Secret Power.txt @@ -965,6 +965,5 @@ NECROZMA_DUSK_MANE NECROZMA_DAWN_WINGS NECROZMA_ULTRA LYCANROC_DUSK -PYUKUMUKU MELTAN MELMETAL \ No newline at end of file diff --git a/src/tm_compatibility/46 - Thief.txt b/src/tm_compatibility/46 - Thief.txt index 27270b1..b7bb4f2 100644 --- a/src/tm_compatibility/46 - Thief.txt +++ b/src/tm_compatibility/46 - Thief.txt @@ -216,6 +216,7 @@ STARAVIA STARAPTOR BIDOOF BIBAREL +KRICKETUNE SHINX LUXIO LUXRAY diff --git a/src/tm_compatibility/62 - Silver Wind.txt b/src/tm_compatibility/62 - Silver Wind.txt index 49b21a1..9527416 100644 --- a/src/tm_compatibility/62 - Silver Wind.txt +++ b/src/tm_compatibility/62 - Silver Wind.txt @@ -28,6 +28,9 @@ VIBRAVA FLYGON TROPIUS KRICKETUNE +WORMADAM +WORMADAM_SANDY +WORMADAM_TRASH MOTHIM VESPIQUEN DRIFLOON diff --git a/src/tm_compatibility/70 - Flash.txt b/src/tm_compatibility/70 - Flash.txt index 45e5988..ff2e1a2 100644 --- a/src/tm_compatibility/70 - Flash.txt +++ b/src/tm_compatibility/70 - Flash.txt @@ -22,6 +22,8 @@ PIKACHU_CAP_ALOLA PIKACHU_CAP_PARTNER RAICHU RAICHU_A +VULPIX_A +NINETALES_A CLEFAIRY CLEFABLE JIGGLYPUFF @@ -35,10 +37,14 @@ VENONAT VENOMOTH MEOWTH MEOWTH_A +MEOWTH_G PERSIAN PERSIAN_A +PERRSERKER PSYDUCK GOLDUCK +PONYTA_G +RAPIDASH_G ABRA KADABRA ALAKAZAM @@ -173,6 +179,7 @@ CHIMECHO ABSOL SNORUNT GLALIE +BELDUM METANG METAGROSS LATIAS @@ -441,3 +448,22 @@ NECROZMA_ULTRA MAGEARNA MAGEARNA_P ZERAORA +HATENNA +HATTREM +HATTERENE +IMPIDIMP +MORGREM +GRIMMSNARL +MR_RIME +MILCERY +ALCREMIE_STRAWBERRY +ALCREMIE_BERRY +ALCREMIE_CLOVER +ALCREMIE_FLOWER +ALCREMIE_LOVE +ALCREMIE_RIBBON +ALCREMIE_STAR +FROSMOTH +INDEEDEE +INDEEDEE_FEMALE +ZAMAZENTA diff --git a/src/tm_compatibility/99 - Wild Charge.txt b/src/tm_compatibility/99 - Wild Charge.txt index 4f0b490..ef38757 100644 --- a/src/tm_compatibility/99 - Wild Charge.txt +++ b/src/tm_compatibility/99 - Wild Charge.txt @@ -67,6 +67,8 @@ SPINDA SHINX LUXIO LUXRAY +CRANIDOS +RAMPARDOS MAGNEZONE ELECTIVIRE VICTINI diff --git a/src/tutor_compatibility/110 - High Horsepower.txt b/src/tutor_compatibility/110 - High Horsepower.txt index e80deba..c141f71 100644 --- a/src/tutor_compatibility/110 - High Horsepower.txt +++ b/src/tutor_compatibility/110 - High Horsepower.txt @@ -49,6 +49,16 @@ KROOKODILE GOLURK BOUFFALANT DIGGERSBY +FURFROU +FURFROU_HEART +FURFROU_DIAMOND +FURFROU_STAR +FURFROU_PHAROAH +FURFROU_KABUKI +FURFROU_LA_REINE +FURFROU_MATRON +FURFROU_DANDY +FURFROU_DEBUTANTE TYRANTRUM AVALUGG ZYGARDE diff --git a/src/tutor_compatibility/115 - Play Rough.txt b/src/tutor_compatibility/115 - Play Rough.txt index 74e3034..e67d114 100644 --- a/src/tutor_compatibility/115 - Play Rough.txt +++ b/src/tutor_compatibility/115 - Play Rough.txt @@ -88,6 +88,8 @@ MINCCINO CINCCINO CUBCHOO BEARTIC +RUFFLET +BRAVIARY ESPURR MEOWSTIC MEOWSTIC_FEMALE diff --git a/src/tutor_compatibility/117 - Power Gem.txt b/src/tutor_compatibility/117 - Power Gem.txt index b9f8590..e5ebafd 100644 --- a/src/tutor_compatibility/117 - Power Gem.txt +++ b/src/tutor_compatibility/117 - Power Gem.txt @@ -1,12 +1,14 @@ Tutor 117: Power Gem PERSIAN PERSIAN_A +GOLDUCK STARYU STARMIE MEW MAREEP FLAAFFY AMPHAROS +ESPEON SLOWKING MISDREAVUS CORSOLA diff --git a/src/tutor_compatibility/123 - Hurricane.txt b/src/tutor_compatibility/123 - Hurricane.txt index 94ff33c..f1c7ab3 100644 --- a/src/tutor_compatibility/123 - Hurricane.txt +++ b/src/tutor_compatibility/123 - Hurricane.txt @@ -19,13 +19,16 @@ MANTINE KINGDRA LUGIA SHIFTRY +BEAUTIFLY TAILLOW SWELLOW WINGULL PELIPPER +MASQUERAIN TROPIUS CASTFORM SALAMENCE +MOTHIM HONCHKROW UNFEZANT UNFEZANT_F diff --git a/src/tutor_compatibility/2 - Ice Punch.txt b/src/tutor_compatibility/2 - Ice Punch.txt index 20423b1..7a66453 100644 --- a/src/tutor_compatibility/2 - Ice Punch.txt +++ b/src/tutor_compatibility/2 - Ice Punch.txt @@ -22,6 +22,12 @@ ALAKAZAM MACHOP MACHOKE MACHAMP +GEODUDE +GEODUDE_A +GRAVELER +GRAVELER_A +GOLEM +GOLEM_A SLOWBRO GRIMER GRIMER_A diff --git a/src/tutor_compatibility/32 - Zen Headbutt.txt b/src/tutor_compatibility/32 - Zen Headbutt.txt index a56a8d4..ff82961 100644 --- a/src/tutor_compatibility/32 - Zen Headbutt.txt +++ b/src/tutor_compatibility/32 - Zen Headbutt.txt @@ -28,6 +28,7 @@ SLOWPOKE_G SLOWBRO DROWZEE HYPNO +ONIX EXEGGUTOR EXEGGUTOR_A LICKITUNG @@ -53,6 +54,7 @@ ESPEON SLOWKING GIRAFARIG DUNSPARCE +STEELIX PORYGON2 STANTLER SMOOCHUM diff --git a/src/tutor_compatibility/33 - Seed Bomb.txt b/src/tutor_compatibility/33 - Seed Bomb.txt index d93f42d..eac1885 100644 --- a/src/tutor_compatibility/33 - Seed Bomb.txt +++ b/src/tutor_compatibility/33 - Seed Bomb.txt @@ -68,6 +68,7 @@ CACNEA CACTURNE LILEEP CRADILY +KECLEON TROPIUS TURTWIG GROTLE diff --git a/src/tutor_compatibility/48 - Earth Power.txt b/src/tutor_compatibility/48 - Earth Power.txt index efb70ba..c99b916 100644 --- a/src/tutor_compatibility/48 - Earth Power.txt +++ b/src/tutor_compatibility/48 - Earth Power.txt @@ -27,6 +27,7 @@ KABUTO KABUTOPS AERODACTYL MEW +MEGANIUM SUDOWOODO SUNKERN SUNFLORA @@ -96,6 +97,7 @@ HIPPOPOTAS HIPPOPOTAS_F HIPPOWDON HIPPOWDON_F +CARNIVINE ABOMASNOW RHYPERIOR GLISCOR diff --git a/src/tutor_compatibility/52 - Hyper Voice.txt b/src/tutor_compatibility/52 - Hyper Voice.txt index b94cf55..6b74dbd 100644 --- a/src/tutor_compatibility/52 - Hyper Voice.txt +++ b/src/tutor_compatibility/52 - Hyper Voice.txt @@ -68,6 +68,7 @@ SPINDA SWABLU ALTARIA CHIMECHO +GLALIE BAGON SHELGON SALAMENCE diff --git a/src/tutor_compatibility/54 - Knock Off.txt b/src/tutor_compatibility/54 - Knock Off.txt index 9bff179..0c3e182 100644 --- a/src/tutor_compatibility/54 - Knock Off.txt +++ b/src/tutor_compatibility/54 - Knock Off.txt @@ -52,7 +52,9 @@ FARFETCHD FARFETCHD_G DODUO DODRIO +GRIMER GRIMER_A +MUK MUK_A GASTLY HAUNTER diff --git a/src/tutor_compatibility/74 - Toxic Spikes.txt b/src/tutor_compatibility/74 - Toxic Spikes.txt index 69a4176..a3d789e 100644 --- a/src/tutor_compatibility/74 - Toxic Spikes.txt +++ b/src/tutor_compatibility/74 - Toxic Spikes.txt @@ -1,5 +1,7 @@ Tutor 74: Toxic Spikes BEEDRILL +EKANS +ARBOK NIDORAN_F NIDORINA NIDOQUEEN diff --git a/src/tutor_compatibility/77 - Nasty Plot.txt b/src/tutor_compatibility/77 - Nasty Plot.txt index 0b60009..15059df 100644 --- a/src/tutor_compatibility/77 - Nasty Plot.txt +++ b/src/tutor_compatibility/77 - Nasty Plot.txt @@ -120,6 +120,8 @@ ZOROARK GOTHITA GOTHORITA GOTHITELLE +DUCKLETT +SWANNA ELGYEM BEHEEYEM VULLABY diff --git a/src/tutor_compatibility/89 - Thunder Fang.txt b/src/tutor_compatibility/89 - Thunder Fang.txt index 48e20c0..f6929a7 100644 --- a/src/tutor_compatibility/89 - Thunder Fang.txt +++ b/src/tutor_compatibility/89 - Thunder Fang.txt @@ -1,4 +1,6 @@ Tutor 89: Thunder Fang +RATTATA +RATICATE ARBOK ARCANINE RHYHORN diff --git a/src/tutor_compatibility/90 - Ice Fang.txt b/src/tutor_compatibility/90 - Ice Fang.txt index 6ca9b55..1868e7c 100644 --- a/src/tutor_compatibility/90 - Ice Fang.txt +++ b/src/tutor_compatibility/90 - Ice Fang.txt @@ -1,4 +1,6 @@ Tutor 90: Ice Fang +RATTATA +RATICATE ARBOK RHYHORN RHYDON @@ -26,6 +28,7 @@ SNORUNT GLALIE WALREIN HUNTAIL +BIBAREL SHINX LUXIO LUXRAY diff --git a/src/tutor_compatibility/91 - Fire Fang.txt b/src/tutor_compatibility/91 - Fire Fang.txt index 9105028..13a805d 100644 --- a/src/tutor_compatibility/91 - Fire Fang.txt +++ b/src/tutor_compatibility/91 - Fire Fang.txt @@ -2,6 +2,8 @@ Tutor 91: Fire Fang CHARMANDER CHARMELEON CHARIZARD +RATTATA +RATICATE ARBOK GROWLITHE ARCANINE diff --git a/src/tutor_compatibility/93 - Body Press.txt b/src/tutor_compatibility/93 - Body Press.txt index ecf7adc..bc58a6d 100644 --- a/src/tutor_compatibility/93 - Body Press.txt +++ b/src/tutor_compatibility/93 - Body Press.txt @@ -33,6 +33,7 @@ TORKOAL CLAYDOL WALREIN RELICANTH +METAGROSS REGIROCK REGISTEEL BRONZONG diff --git a/strings/Pokemon_Name_Table.string b/strings/Pokemon_Name_Table.string index 0a66aeb..3831751 100644 --- a/strings/Pokemon_Name_Table.string +++ b/strings/Pokemon_Name_Table.string @@ -3560,18 +3560,21 @@ Urshifu #org @NAME_ZARUDE Zarude -#org @NAME_UNKNOWN_MYTHICAL -?????? - -#org @NAME_CALYREX -Calyrex - #org @NAME_REGIELEKI Regieleki #org @NAME_REGIDRAGO Regidrago +#org @NAME_GLASTRIER +Glastrier + +#org @NAME_SPECTRIER +Spectrier + +#org @NAME_CALYREX +Calyrex + #org @NAME_CRAMORANT_GULPING Cramorant @@ -3626,6 +3629,12 @@ Eternatus #org @NAME_URSHIFU_RAPID Urshifu +#org @NAME_CALYREX_ICE +Calyrex + +#org @NAME_CALYREX_SHADOW +Calyrex + #org @NAME_MEOWTH_G Meowth