Merge branch 'temp' into Unbound

2026-09-07 17:45:33 -05:00 · 2021-04-26 14:54:03 -04:00
parent e6d551f324 528b84cedf
commit 71ae99d483
69 changed files with 2358 additions and 1873 deletions
--- a/graphics/backspr/gBackShinySprite015Beedrill.png
+++ b/graphics/backspr/gBackShinySprite015Beedrill.png
--- a/graphics/backspr/gBackShinySprite1015Kartana.png
+++ b/graphics/backspr/gBackShinySprite1015Kartana.png
--- a/graphics/backspr/gBackShinySprite1023SandshrewA.png
+++ b/graphics/backspr/gBackShinySprite1023SandshrewA.png
--- a/graphics/backspr/gBackShinySprite392Ralts.png
+++ b/graphics/backspr/gBackShinySprite392Ralts.png
--- a/graphics/backspr/gBackShinySprite766Greninja.png
+++ b/graphics/backspr/gBackShinySprite766Greninja.png
--- a/graphics/backspr/gBackShinySprite769Fletchling.png
+++ b/graphics/backspr/gBackShinySprite769Fletchling.png
--- a/graphics/backspr/gBackShinySprite821Avalugg.png
+++ b/graphics/backspr/gBackShinySprite821Avalugg.png
--- a/graphics/backspr/gBackShinySprite822Noibat.png
+++ b/graphics/backspr/gBackShinySprite822Noibat.png
--- a/graphics/backspr/gBackShinySprite826Zygarde.png
+++ b/graphics/backspr/gBackShinySprite826Zygarde.png
--- a/graphics/backspr/gBackShinySprite837Zygarde10.png
+++ b/graphics/backspr/gBackShinySprite837Zygarde10.png
--- a/graphics/backspr/gBackShinySprite838ZygardeComplete.png
+++ b/graphics/backspr/gBackShinySprite838ZygardeComplete.png
--- a/graphics/backspr/gBackShinySprite873BeedrillMega.png
+++ b/graphics/backspr/gBackShinySprite873BeedrillMega.png
--- a/graphics/frontspr/gFrontSprite1001KommoO.png
+++ b/graphics/frontspr/gFrontSprite1001KommoO.png
--- a/graphics/frontspr/gFrontSprite1015Kartana.png
+++ b/graphics/frontspr/gFrontSprite1015Kartana.png
--- a/graphics/frontspr/gFrontSprite1022RaichuA.png
+++ b/graphics/frontspr/gFrontSprite1022RaichuA.png
--- a/graphics/frontspr/gFrontSprite1023SandshrewA.png
+++ b/graphics/frontspr/gFrontSprite1023SandshrewA.png
--- a/graphics/frontspr/gFrontSprite766Greninja.png
+++ b/graphics/frontspr/gFrontSprite766Greninja.png
--- a/graphics/frontspr/gFrontSprite821Avalugg.png
+++ b/graphics/frontspr/gFrontSprite821Avalugg.png
--- a/graphics/frontspr/gFrontSprite822Noibat.png
+++ b/graphics/frontspr/gFrontSprite822Noibat.png
--- a/graphics/frontspr/gFrontSprite837Zygarde10.png
+++ b/graphics/frontspr/gFrontSprite837Zygarde10.png
--- a/graphics/frontspr/gFrontSprite838ZygardeComplete.png
+++ b/graphics/frontspr/gFrontSprite838ZygardeComplete.png
--- a/graphics/frontspr/gFrontSprite839Ashgreninja.png
+++ b/graphics/frontspr/gFrontSprite839Ashgreninja.png
--- a/graphics/frontspr/gSpriteShadowWarrior.png
+++ b/graphics/frontspr/gSpriteShadowWarrior.png
--- a/graphics/pokeicon/gIconSprite1040DeoxysAttack.png
+++ b/graphics/pokeicon/gIconSprite1040DeoxysAttack.png
--- a/graphics/pokeicon/gIconSprite991MiniorShield.png
+++ b/graphics/pokeicon/gIconSprite991MiniorShield.png
--- 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)
--- 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)
--- 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,
--- a/src/Base_Stats.c
+++ b/src/Base_Stats.c
--- 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,
--- 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,
--- a/src/Evolution
+++ b/src/Evolution
@@ -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}},
--- 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,
--- 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,
--- 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},
--- a/src/Learnsets.c
+++ b/src/Learnsets.c
--- 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,
--- 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,
--- 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
+#define NUM_MOVE_TUTOR_MOVES 146
--- a/src/tm_compatibility/102
+++ b/src/tm_compatibility/102
@@ -113,6 +113,7 @@ AROMATISSE
 SWIRLIX
 SLURPUFF
 SYLVEON
+DEDENNE
 CARBINK
 KLEFKI
 XERNEAS
--- a/src/tm_compatibility/110
+++ b/src/tm_compatibility/110
@@ -24,6 +24,7 @@ VULPIX_A
 NINETALES_A
 JIGGLYPUFF
 WIGGLYTUFF
+MR_MIME
 JYNX
 MEW
 CLEFFA
--- a/src/tm_compatibility/111
+++ b/src/tm_compatibility/111
@@ -113,6 +113,8 @@ PIKIPEK
 TRUMBEAK
 TOUCANNON
 TOXAPEX
+MUDBRAY
+MUDSDALE
 PASSIMIAN
 TURTONATOR
 BUZZWOLE
@@ -120,4 +122,7 @@ CELESTEELA
 GUZZLORD
 MARSHADOW
 STAKATAKA
-BLACEPHALON 
+BLACEPHALON
+ROLYCOLY
+CARKOL
+COALOSSAL
--- a/src/tm_compatibility/118
+++ b/src/tm_compatibility/118
@@ -9,11 +9,17 @@ MEW
 DELIBIRD
 SMOOCHUM
 REGICE
+ABOMASNOW
 GLACEON
 FROSLASS
 VANILLITE
 VANILLISH
 VANILLUXE
 CRYOGONAL
+AMAURA
+AURORUS
 BERGMITE
 AVALUGG
+FROSMOTH
+EISCUE
+ARCTOVISH
--- a/src/tm_compatibility/128
+++ b/src/tm_compatibility/128
@@ -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
+MELMETAL
+OBSTAGOON
--- a/src/tm_compatibility/22
+++ b/src/tm_compatibility/22
@@ -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
+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
--- a/src/tm_compatibility/30
+++ b/src/tm_compatibility/30
@@ -33,6 +33,9 @@ HAUNTER
 GENGAR
 DROWZEE
 HYPNO
+EXEGGCUTE
+EXEGGCUTE_A
+EXEGGUTOR
 MAROWAK_A
 LICKITUNG
 KOFFING
--- a/src/tm_compatibility/33
+++ b/src/tm_compatibility/33
@@ -97,6 +97,8 @@ LUNATONE
 SOLROCK
 BALTOY
 CLAYDOL
+VOLBEAT
+ILLUMISE
 CHIMECHO
 METANG
 METAGROSS
--- a/src/tm_compatibility/43
+++ b/src/tm_compatibility/43
@@ -965,6 +965,5 @@ NECROZMA_DUSK_MANE
 NECROZMA_DAWN_WINGS
 NECROZMA_ULTRA
 LYCANROC_DUSK
-PYUKUMUKU
 MELTAN
 MELMETAL
--- a/src/tm_compatibility/46
+++ b/src/tm_compatibility/46
@@ -216,6 +216,7 @@ STARAVIA
 STARAPTOR
 BIDOOF
 BIBAREL
+KRICKETUNE
 SHINX
 LUXIO
 LUXRAY
--- a/src/tm_compatibility/62
+++ b/src/tm_compatibility/62
@@ -28,6 +28,9 @@ VIBRAVA
 FLYGON
 TROPIUS
 KRICKETUNE
+WORMADAM
+WORMADAM_SANDY
+WORMADAM_TRASH
 MOTHIM
 VESPIQUEN
 DRIFLOON
--- a/src/tm_compatibility/70
+++ b/src/tm_compatibility/70
@@ -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
--- a/src/tm_compatibility/99
+++ b/src/tm_compatibility/99
@@ -67,6 +67,8 @@ SPINDA
 SHINX
 LUXIO
 LUXRAY
+CRANIDOS
+RAMPARDOS
 MAGNEZONE
 ELECTIVIRE
 VICTINI
--- a/src/tutor_compatibility/110
+++ b/src/tutor_compatibility/110
@@ -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
--- a/src/tutor_compatibility/115
+++ b/src/tutor_compatibility/115
@@ -88,6 +88,8 @@ MINCCINO
 CINCCINO
 CUBCHOO
 BEARTIC
+RUFFLET
+BRAVIARY
 ESPURR
 MEOWSTIC
 MEOWSTIC_FEMALE
--- a/src/tutor_compatibility/117
+++ b/src/tutor_compatibility/117
@@ -1,12 +1,14 @@
 Tutor 117: Power Gem
 PERSIAN
 PERSIAN_A
+GOLDUCK
 STARYU
 STARMIE
 MEW
 MAREEP
 FLAAFFY
 AMPHAROS
+ESPEON
 SLOWKING
 MISDREAVUS
 CORSOLA
--- a/src/tutor_compatibility/123
+++ b/src/tutor_compatibility/123
@@ -19,13 +19,16 @@ MANTINE
 KINGDRA
 LUGIA
 SHIFTRY
+BEAUTIFLY
 TAILLOW
 SWELLOW
 WINGULL
 PELIPPER
+MASQUERAIN
 TROPIUS
 CASTFORM
 SALAMENCE
+MOTHIM
 HONCHKROW
 UNFEZANT
 UNFEZANT_F
--- a/src/tutor_compatibility/2
+++ b/src/tutor_compatibility/2
@@ -22,6 +22,12 @@ ALAKAZAM
 MACHOP
 MACHOKE
 MACHAMP
+GEODUDE
+GEODUDE_A
+GRAVELER
+GRAVELER_A
+GOLEM
+GOLEM_A
 SLOWBRO
 GRIMER
 GRIMER_A
--- a/src/tutor_compatibility/32
+++ b/src/tutor_compatibility/32
@@ -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
--- a/src/tutor_compatibility/33
+++ b/src/tutor_compatibility/33
@@ -68,6 +68,7 @@ CACNEA
 CACTURNE
 LILEEP
 CRADILY
+KECLEON
 TROPIUS
 TURTWIG
 GROTLE
--- a/src/tutor_compatibility/48
+++ b/src/tutor_compatibility/48
@@ -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
--- a/src/tutor_compatibility/52
+++ b/src/tutor_compatibility/52
@@ -68,6 +68,7 @@ SPINDA
 SWABLU
 ALTARIA
 CHIMECHO
+GLALIE
 BAGON
 SHELGON
 SALAMENCE
--- a/src/tutor_compatibility/54
+++ b/src/tutor_compatibility/54
@@ -52,7 +52,9 @@ FARFETCHD
 FARFETCHD_G
 DODUO
 DODRIO
+GRIMER
 GRIMER_A
+MUK
 MUK_A
 GASTLY
 HAUNTER
--- a/src/tutor_compatibility/74
+++ b/src/tutor_compatibility/74
@@ -1,5 +1,7 @@
 Tutor 74: Toxic Spikes
 BEEDRILL
+EKANS
+ARBOK
 NIDORAN_F
 NIDORINA
 NIDOQUEEN
--- a/src/tutor_compatibility/77
+++ b/src/tutor_compatibility/77
@@ -120,6 +120,8 @@ ZOROARK
 GOTHITA
 GOTHORITA
 GOTHITELLE
+DUCKLETT
+SWANNA
 ELGYEM
 BEHEEYEM
 VULLABY
--- a/src/tutor_compatibility/89
+++ b/src/tutor_compatibility/89
@@ -1,4 +1,6 @@
 Tutor 89: Thunder Fang
+RATTATA
+RATICATE
 ARBOK
 ARCANINE
 RHYHORN
--- a/src/tutor_compatibility/90
+++ b/src/tutor_compatibility/90
@@ -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
--- a/src/tutor_compatibility/91
+++ b/src/tutor_compatibility/91
@@ -2,6 +2,8 @@ Tutor 91: Fire Fang
 CHARMANDER
 CHARMELEON
 CHARIZARD
+RATTATA
+RATICATE
 ARBOK
 GROWLITHE
 ARCANINE
--- a/src/tutor_compatibility/93
+++ b/src/tutor_compatibility/93
@@ -33,6 +33,7 @@ TORKOAL
 CLAYDOL
 WALREIN
 RELICANTH
+METAGROSS
 REGIROCK
 REGISTEEL
 BRONZONG
--- 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