From c93beb4d72fad46337e5c3bf47a622c509f27e35 Mon Sep 17 00:00:00 2001
From: Martha Schilling <harleyrayquaza@gmail.com>
Date: Thu, 7 Dec 2023 23:10:42 +0000
Subject: [PATCH] Improving movesets! (Improvesets?)

- Rhyhorn's evolution line get moves at earlier levels, and now learns Rock Slide and Earthquake by level up.

- Clefairy gets Body Slam by level up.

- Nidoking and Nidoqueen get Earthquake by level up. Nidoreign instead gets Rock Slide and Body Slam.

- Grimer and Muk get moves at earlier levels, and also Acid and Haze (from Smujj)

- Scyther gets Wing Attack much earlier. Scizor keeps Double Team as a level up move, instead getting Iron Head at Level 1.

- Tangela and Tangrowth get moves at earlier levels, and also Night Shade (from Burgela)

- Geodude's evolution line now get Rock Slide by level up.

- Paras and Parasect get Absorb (from Paraspor).

- Psyduck learns Tail Whip earlier.

- Magnemite's evolution line get moves at earlier levels.

- Koffing and Weezing get moves at earlier levels.

- Seel and Dewgong get moves at earlier levels, and also Powder Snow.

- All Tauros forms get a new move by level up (Body Slam, Low Kick, Flamethrower and Water Gun respectively) and learn Tail Whip much earlier.

- Trampel gets moves at earlier levels, plus Body Slam and Earthquake as level up moves.

- Gavillain gets ThunderShock, with a few moves pushed back to later levels.

- Sharpoon gets moves at earlier levels, plus Smart Strike.

- Bittybat's evolution line get moves at earlier levels, and Golbat evolves into Crobat slightly earlier.

- Doduo's evolution line get moves at earlier levels, plus Quick Attack (from Dodaerie)

- Jynx gets Powder Snow as a level up move.

- Meowth, Persian and Perrserker get moves at earlier levels.

- Vulpiii's evolution line get moves at earlier levels.

- Ribbito and Croakozuna get moves at earlier levels.

- Omanyte, Omastar, Kabuto, Kabutops  and Aerodactyl all learn Rock Throw by level up.

- Seadra gets Pin Missile.

- Ministare and Iguanarch get moves at later levels, and Ministare evolves slightly later to match Dragonair.

- Sandshrew and Kantonian Sandslash get Earthquake by level up.

- All 3 cocoon Pokemon their pre-evolution's moves as Level 1 moves, and try to learn Harden each level before evolving again.

- Beedrill gets Fury Attack slightly earlier.

- Pendraken gets moves at earlier levels.

- Weirduck gets moves at earlier levels, and evolves into Golduck slightly earlier to match vanilla.

- Golduck also gets moves at earlier levels.

- Guardia gets a few moves it was missing from prior evolutions.

- Orfry gets Fury Attack slightly later, but both Goldeen and Seaking get moves at earlier levels. Seaking also gets Swords Dance by level up.

- Ponyta and Rapidash get moves at earlier levels.

- Bellignan gets a few moves it was missing from prior evolutions.

- Hitmontop learns Focus Energy earlier.

- Wugtrio gets moves at later levels to match Dugtrio.

- Sirfetch'd learns Leer and Double Kick later, but all other moves earlier.

- Melmetal no longer gets Smart Strike.

- Alolan Dugtrio gets Sand-Attack and a slight moveset shuffle.

- Alolan Golem gets Defense Curl, Rock Slide by level up, and a slight moveset shuffle.

- Galarian Slowbro and Slowking learn moves at later levels, with Slowbro getting Withdraw and Sludge.

- Various evolved Pokemon getting L1 moveset additions to remain consistent.
---
 3DS Border/KEPBorder.png               | Bin 9770 -> 9768 bytes
 crysaudio/cry_headers.asm              |   2 +-
 data/credits/credits_text.asm          |   2 +-
 data/pokemon/base_stats/beedrill.asm   |   2 +-
 data/pokemon/base_stats/bellossom.asm  |   2 +-
 data/pokemon/base_stats/bittybat.asm   |   2 +-
 data/pokemon/base_stats/butterfree.asm |   2 +-
 data/pokemon/base_stats/carapthor.asm  |   2 +-
 data/pokemon/base_stats/croakozuna.asm |   2 +-
 data/pokemon/base_stats/crobat.asm     |   2 +-
 data/pokemon/base_stats/disturban.asm  |   2 +-
 data/pokemon/base_stats/doduo.asm      |   2 +-
 data/pokemon/base_stats/gaotora.asm    |   2 +-
 data/pokemon/base_stats/golbat.asm     |   2 +-
 data/pokemon/base_stats/golduck.asm    |   2 +-
 data/pokemon/base_stats/gorotora.asm   |   2 +-
 data/pokemon/base_stats/guardia.asm    |   2 +-
 data/pokemon/base_stats/hitmontop.asm  |   2 +-
 data/pokemon/base_stats/iguanarch.asm  |   2 +-
 data/pokemon/base_stats/jabetta.asm    |   2 +-
 data/pokemon/base_stats/kakuna.asm     |   2 +-
 data/pokemon/base_stats/kingdra.asm    |   2 +-
 data/pokemon/base_stats/kotora.asm     |   2 +-
 data/pokemon/base_stats/lickilicky.asm |   2 +-
 data/pokemon/base_stats/luxwan.asm     |   2 +-
 data/pokemon/base_stats/magnetite.asm  |   2 +-
 data/pokemon/base_stats/magneton.asm   |   2 +-
 data/pokemon/base_stats/magnezone.asm  |   2 +-
 data/pokemon/base_stats/melmetal.asm   |   2 +-
 data/pokemon/base_stats/metapod.asm    |   2 +-
 data/pokemon/base_stats/ministare.asm  |   2 +-
 data/pokemon/base_stats/mrrime.asm     |   2 +-
 data/pokemon/base_stats/nidoking.asm   |   2 +-
 data/pokemon/base_stats/nidoreign.asm  |   2 +-
 data/pokemon/base_stats/omastar.asm    |   2 +-
 data/pokemon/base_stats/pendraken.asm  |   2 +-
 data/pokemon/base_stats/perrserker.asm |   2 +-
 data/pokemon/base_stats/politoed.asm   |   2 +-
 data/pokemon/base_stats/ponyta.asm     |   2 +-
 data/pokemon/base_stats/pupal.asm      |   2 +-
 data/pokemon/base_stats/scizor.asm     |   2 +-
 data/pokemon/base_stats/sharpoon.asm   |   2 +-
 data/pokemon/base_stats/tangrowth.asm  |   2 +-
 data/pokemon/base_stats/tauros.asm     |   2 +-
 data/pokemon/base_stats/taurosp.asm    |   2 +-
 data/pokemon/base_stats/taurospa.asm   |   2 +-
 data/pokemon/base_stats/taurospb.asm   |   2 +-
 data/pokemon/base_stats/toedscruel.asm |   2 +-
 data/pokemon/base_stats/totartle.asm   |   2 +-
 data/pokemon/base_stats/trampel.asm    |   2 +-
 data/pokemon/base_stats/wugtrio.asm    |   2 +-
 data/pokemon/base_stats/zubat.asm      |   2 +-
 data/pokemon/evos_moves.asm            | 667 ++++++++++++++-----------
 data/wild/maps/DiglettsCave.asm        |   8 +-
 54 files changed, 424 insertions(+), 353 deletions(-)

diff --git a/3DS Border/KEPBorder.png b/3DS Border/KEPBorder.png
index 3f7643b2b8b6f8486d26357efda8f6a764b43108..d34ec1778662f6d2acb08e6b445e4624c07b899a 100644
GIT binary patch
delta 9056
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

delta 9033
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%0Dkea!)9xx<jq~9q-su^?9yR(Z`S58k#c?t~knoq-
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
Luc;NN-u3@~kSC_>

diff --git a/crysaudio/cry_headers.asm b/crysaudio/cry_headers.asm
index 8d458072..b0080372 100644
--- a/crysaudio/cry_headers.asm
+++ b/crysaudio/cry_headers.asm
@@ -239,7 +239,7 @@ PokemonCries::
 	mon_cry CRY_GRIMER,       85,  129 ; SNORLAX
 	mon_cry CRY_PIDGEY,      250,  256 ; SCREAM_TAIL
 	mon_cry CRY_METAPOD,      31,  349 ; SANDY_SHOCKS
-	mon_cry CRY_BULBASAUR,    99,  192 ; SQUEAMATA
+	mon_cry CRY_BULBASAUR,   100,  320 ; SQUEAMATA
 	mon_cry CRY_BULBASAUR,    64,  320 ; MINISTARE
 	mon_cry CRY_BULBASAUR,    32,  320 ; IGUANARCH
 	mon_cry CRY_BULBASAUR,    96,  192 ; DRATINI
diff --git a/data/credits/credits_text.asm b/data/credits/credits_text.asm
index f6377817..4ed3585a 100644
--- a/data/credits/credits_text.asm
+++ b/data/credits/credits_text.asm
@@ -285,6 +285,6 @@ CredEni:
 CredVort:
 	db -3, "VORTIENE@"
 CredPret:
-	db -4, "PRET ET AL@"
+	db -2, "PRET@"
 CredDrLava:
 	db -3, "DR.LAVA@"
diff --git a/data/pokemon/base_stats/beedrill.asm b/data/pokemon/base_stats/beedrill.asm
index 1335e22b..971fff25 100644
--- a/data/pokemon/base_stats/beedrill.asm
+++ b/data/pokemon/base_stats/beedrill.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/beedrill.pic", 0, 1 ; sprite dimensions
 	dw BeedrillPicFront, BeedrillPicBack
 
-	db FURY_ATTACK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
+	db FURY_ATTACK, POISON_STING, STRING_SHOT, HARDEN ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/bellossom.asm b/data/pokemon/base_stats/bellossom.asm
index 1f991445..c1a85ccc 100644
--- a/data/pokemon/base_stats/bellossom.asm
+++ b/data/pokemon/base_stats/bellossom.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/bellossom.pic", 0, 1 ; sprite dimensions
 	dw BellossomPicFront, BellossomPicBack
 
-	db ABSORB, STUN_SPORE, PETAL_DANCE, NO_MOVE ; level 1 learnset
+	db STUN_SPORE, SLEEP_POWDER, ABSORB, PETAL_DANCE ; level 1 learnset
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/bittybat.asm b/data/pokemon/base_stats/bittybat.asm
index 5aeb223d..c11c4e4e 100644
--- a/data/pokemon/base_stats/bittybat.asm
+++ b/data/pokemon/base_stats/bittybat.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/bittybat.pic", 0, 1 ; sprite dimensions
 	dw BittybatPicFront, BittybatPicBack
 
-	db LEECH_LIFE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
+	db LEECH_LIFE, TACKLE, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/butterfree.asm b/data/pokemon/base_stats/butterfree.asm
index b99f932b..462673b8 100644
--- a/data/pokemon/base_stats/butterfree.asm
+++ b/data/pokemon/base_stats/butterfree.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/butterfree.pic", 0, 1 ; sprite dimensions
 	dw ButterfreePicFront, ButterfreePicBack
 
-	db CONFUSION, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
+	db CONFUSION, TACKLE, STRING_SHOT, HARDEN ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/carapthor.asm b/data/pokemon/base_stats/carapthor.asm
index 4ed854f0..df189a51 100644
--- a/data/pokemon/base_stats/carapthor.asm
+++ b/data/pokemon/base_stats/carapthor.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/carapthor.pic", 0, 1 ; sprite dimensions
 	dw CarapthorPicFront, CarapthorPicBack
 
-	db COMET_PUNCH, UPPERCUT, NO_MOVE, NO_MOVE ; level 1 learnset
+	db UPPERCUT, LEECH_LIFE, STRING_SHOT, HARDEN ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/croakozuna.asm b/data/pokemon/base_stats/croakozuna.asm
index d302e842..ede1bac5 100644
--- a/data/pokemon/base_stats/croakozuna.asm
+++ b/data/pokemon/base_stats/croakozuna.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/croakozuna.pic", 0, 1 ; sprite dimensions
 	dw CroakozunaPicFront, CroakozunaPicBack
 
-	db DOUBLE_TEAM, DOUBLESLAP, BUBBLE, NO_MOVE ; level 1 learnset
+	db DOUBLE_TEAM, DOUBLESLAP, BUBBLE, MEDITATE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/crobat.asm b/data/pokemon/base_stats/crobat.asm
index f65c4228..9b037371 100644
--- a/data/pokemon/base_stats/crobat.asm
+++ b/data/pokemon/base_stats/crobat.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/crobat.pic", 0, 1 ; sprite dimensions
 	dw CrobatPicFront, CrobatPicBack
 
-	db LEECH_LIFE, SCREECH, BITE, NO_MOVE ; level 1 learnset
+	db LEECH_LIFE, TACKLE, BITE, SCREECH ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/disturban.asm b/data/pokemon/base_stats/disturban.asm
index d1e785f0..c003eb43 100644
--- a/data/pokemon/base_stats/disturban.asm
+++ b/data/pokemon/base_stats/disturban.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/disturban.pic", 0, 1 ; sprite dimensions
 	dw DisturbanPicFront, DisturbanPicBack
 
-	db TACKLE, WITHDRAW, BITE, WATER_GUN ; level 1 learnset
+	db WITHDRAW, SUPERSONIC, CLAMP, BITE ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/doduo.asm b/data/pokemon/base_stats/doduo.asm
index 5616ff69..62c0dc53 100644
--- a/data/pokemon/base_stats/doduo.asm
+++ b/data/pokemon/base_stats/doduo.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/doduo.pic", 0, 1 ; sprite dimensions
 	dw DoduoPicFront, DoduoPicBack
 
-	db PECK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
+	db PECK, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/gaotora.asm b/data/pokemon/base_stats/gaotora.asm
index 689dab60..392e7240 100644
--- a/data/pokemon/base_stats/gaotora.asm
+++ b/data/pokemon/base_stats/gaotora.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/gaotora.pic", 0, 1 ; sprite dimensions
 	dw GaotoraPicFront, GaotoraPicBack
 
-	db THUNDERSHOCK, LEER, NO_MOVE, NO_MOVE ; level 1 learnset
+	db THUNDERSHOCK, TACKLE, LEER, NO_MOVE ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/golbat.asm b/data/pokemon/base_stats/golbat.asm
index 90230067..ca2270ae 100644
--- a/data/pokemon/base_stats/golbat.asm
+++ b/data/pokemon/base_stats/golbat.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/golbat.pic", 0, 1 ; sprite dimensions
 	dw GolbatPicFront, GolbatPicBack
 
-	db LEECH_LIFE, SCREECH, BITE, NO_MOVE ; level 1 learnset
+	db LEECH_LIFE, TACKLE, BITE, SCREECH ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/golduck.asm b/data/pokemon/base_stats/golduck.asm
index 3314c452..48e167ec 100644
--- a/data/pokemon/base_stats/golduck.asm
+++ b/data/pokemon/base_stats/golduck.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/golduck.pic", 0, 1 ; sprite dimensions
 	dw GolduckPicFront, GolduckPicBack
 
-	db SCRATCH, TAIL_WHIP, DISABLE, NO_MOVE ; level 1 learnset
+	db SCRATCH, TAIL_WHIP, AMNESIA, DISABLE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/gorotora.asm b/data/pokemon/base_stats/gorotora.asm
index fb24cc29..d1cb3190 100644
--- a/data/pokemon/base_stats/gorotora.asm
+++ b/data/pokemon/base_stats/gorotora.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/gorotora.pic", 0, 1 ; sprite dimensions
 	dw GorotoraPicFront, GorotoraPicBack
 
-	db THUNDERSHOCK, LEER, NO_MOVE, NO_MOVE ; level 1 learnset
+	db THUNDERSHOCK, TACKLE, LEER, NO_MOVE ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/guardia.asm b/data/pokemon/base_stats/guardia.asm
index 43a63497..b1adbcee 100644
--- a/data/pokemon/base_stats/guardia.asm
+++ b/data/pokemon/base_stats/guardia.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/guardia.pic", 0, 1 ; sprite dimensions
 	dw GuardiaPicFront, GuardiaPicBack
 
-	db BONE_CLUB, TAIL_WHIP, GROWL, HEADBUTT ; level 1 learnset
+	db BONE_CLUB, GROWL, LEER, TAIL_WHIP ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/hitmontop.asm b/data/pokemon/base_stats/hitmontop.asm
index f1d9fc01..5f0aea28 100644
--- a/data/pokemon/base_stats/hitmontop.asm
+++ b/data/pokemon/base_stats/hitmontop.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/hitmontop.pic", 0, 1 ; sprite dimensions
 	dw HitmontopPicFront, HitmontopPicBack
 
-	db ROLLING_KICK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
+	db ROLLING_KICK, FOCUS_ENERGY, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/iguanarch.asm b/data/pokemon/base_stats/iguanarch.asm
index a3cc4ed4..b45a15ad 100644
--- a/data/pokemon/base_stats/iguanarch.asm
+++ b/data/pokemon/base_stats/iguanarch.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/iguanarch.pic", 0, 1 ; sprite dimensions
 	dw IguanarchPicFront, IguanarchPicBack
 
-	db SCRATCH, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
+	db SCRATCH, TAIL_WHIP, LEER, BITE ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/jabetta.asm b/data/pokemon/base_stats/jabetta.asm
index 15f42ff9..804fb04d 100644
--- a/data/pokemon/base_stats/jabetta.asm
+++ b/data/pokemon/base_stats/jabetta.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/jabetta.pic", 0, 1 ; sprite dimensions
 	dw JabettaPicFront, JabettaPicBack
 
-	db BUBBLE, PECK, NO_MOVE, NO_MOVE ; level 1 learnset
+	db BUBBLE, PECK, COUNTER, NO_MOVE ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/kakuna.asm b/data/pokemon/base_stats/kakuna.asm
index eb46ee62..298f8ef0 100644
--- a/data/pokemon/base_stats/kakuna.asm
+++ b/data/pokemon/base_stats/kakuna.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/kakuna.pic", 0, 1 ; sprite dimensions
 	dw KakunaPicFront, KakunaPicBack
 
-	db HARDEN, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
+	db POISON_STING, STRING_SHOT, HARDEN, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/kingdra.asm b/data/pokemon/base_stats/kingdra.asm
index a13e70cc..008e82be 100644
--- a/data/pokemon/base_stats/kingdra.asm
+++ b/data/pokemon/base_stats/kingdra.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/kingdra.pic", 0, 1 ; sprite dimensions
 	dw KingdraPicFront, KingdraPicBack
 
-	db BUBBLE, SMOKESCREEN, NO_MOVE, NO_MOVE ; level 1 learnset
+	db BUBBLE, SMOKESCREEN, LEER, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/kotora.asm b/data/pokemon/base_stats/kotora.asm
index 3f584eaf..ff4c2369 100644
--- a/data/pokemon/base_stats/kotora.asm
+++ b/data/pokemon/base_stats/kotora.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/kotora.pic", 0, 1 ; sprite dimensions
 	dw KotoraPicFront, KotoraPicBack
 
-	db THUNDERSHOCK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
+	db THUNDERSHOCK, TACKLE, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/lickilicky.asm b/data/pokemon/base_stats/lickilicky.asm
index 9360cd66..0a7a13a9 100644
--- a/data/pokemon/base_stats/lickilicky.asm
+++ b/data/pokemon/base_stats/lickilicky.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/lickilicky.pic", 0, 1 ; sprite dimensions
 	dw LickilickyPicFront, LickilickyPicBack
 
-	db WRAP, SUPERSONIC, NO_MOVE, NO_MOVE ; level 1 learnset
+	db WRAP, SUPERSONIC, STOMP, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/luxwan.asm b/data/pokemon/base_stats/luxwan.asm
index b77fd8c3..7b4e7520 100644
--- a/data/pokemon/base_stats/luxwan.asm
+++ b/data/pokemon/base_stats/luxwan.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/luxwan.pic", 0, 1 ; sprite dimensions
 	dw LuxwanPicFront, LuxwanPicBack
 
-	db PECK, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset
+	db PECK, SAND_ATTACK, LEER, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/magnetite.asm b/data/pokemon/base_stats/magnetite.asm
index a15e6512..f69a558b 100644
--- a/data/pokemon/base_stats/magnetite.asm
+++ b/data/pokemon/base_stats/magnetite.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/magnetite.pic", 0, 1 ; sprite dimensions
 	dw MagnetitePicFront, MagnetitePicBack
 
-	db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
+	db TACKLE, THUNDERSHOCK, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/magneton.asm b/data/pokemon/base_stats/magneton.asm
index 29a80d5f..db4cef9b 100644
--- a/data/pokemon/base_stats/magneton.asm
+++ b/data/pokemon/base_stats/magneton.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/magneton.pic", 0, 1 ; sprite dimensions
 	dw MagnetonPicFront, MagnetonPicBack
 
-	db TACKLE, SONICBOOM, THUNDERSHOCK, NO_MOVE ; level 1 learnset
+	db TACKLE, THUNDERSHOCK, SONICBOOM, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/magnezone.asm b/data/pokemon/base_stats/magnezone.asm
index 25435484..20bcd0fa 100644
--- a/data/pokemon/base_stats/magnezone.asm
+++ b/data/pokemon/base_stats/magnezone.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/magnezone.pic", 0, 1 ; sprite dimensions
 	dw MagnezonePicFront, MagnezonePicBack
 
-	db TACKLE, SONICBOOM, THUNDERSHOCK, NO_MOVE ; level 1 learnset
+	db TACKLE, THUNDERSHOCK, SONICBOOM, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/melmetal.asm b/data/pokemon/base_stats/melmetal.asm
index f009148b..7f54fe61 100644
--- a/data/pokemon/base_stats/melmetal.asm
+++ b/data/pokemon/base_stats/melmetal.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/melmetal.pic", 0, 1 ; sprite dimensions
 	dw MelmetalPicFront, MelmetalPicBack
 
-	db THUNDERSHOCK, HARDEN, THUNDER_WAVE, TAIL_WHIP ; level 1 learnset
+	db THUNDERSHOCK, HARDEN, TAIL_WHIP, HEADBUTT ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/metapod.asm b/data/pokemon/base_stats/metapod.asm
index 515d53d8..de51a72b 100644
--- a/data/pokemon/base_stats/metapod.asm
+++ b/data/pokemon/base_stats/metapod.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/metapod.pic", 0, 1 ; sprite dimensions
 	dw MetapodPicFront, MetapodPicBack
 
-	db HARDEN, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
+	db TACKLE, STRING_SHOT, HARDEN, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/ministare.asm b/data/pokemon/base_stats/ministare.asm
index 942422b4..5450b99e 100644
--- a/data/pokemon/base_stats/ministare.asm
+++ b/data/pokemon/base_stats/ministare.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/ministare.pic", 0, 1 ; sprite dimensions
 	dw MinistarePicFront, MinistarePicBack
 
-	db SCRATCH, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
+	db SCRATCH, TAIL_WHIP, LEER, NO_MOVE ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/mrrime.asm b/data/pokemon/base_stats/mrrime.asm
index b79420a8..dbbf1278 100644
--- a/data/pokemon/base_stats/mrrime.asm
+++ b/data/pokemon/base_stats/mrrime.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/mr.rime.pic", 0, 1 ; sprite dimensions
 	dw MrRimePicFront, MrRimePicBack
 
-	db CONFUSION, REFLECT, NO_MOVE, NO_MOVE ; level 1 learnset
+	db CONFUSION, BARRIER, REFLECT, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/nidoking.asm b/data/pokemon/base_stats/nidoking.asm
index e0094618..0799d962 100644
--- a/data/pokemon/base_stats/nidoking.asm
+++ b/data/pokemon/base_stats/nidoking.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/nidoking.pic", 0, 1 ; sprite dimensions
 	dw NidokingPicFront, NidokingPicBack
 
-	db TACKLE, HORN_ATTACK, POISON_STING, THRASH ; level 1 learnset
+	db TACKLE, HORN_ATTACK, FOCUS_ENERGY, THRASH ; level 1 learnset
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/nidoreign.asm b/data/pokemon/base_stats/nidoreign.asm
index a9c89110..c2520653 100644
--- a/data/pokemon/base_stats/nidoreign.asm
+++ b/data/pokemon/base_stats/nidoreign.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/nidoreign.pic", 0, 1 ; sprite dimensions
 	dw NidoreignPicFront, NidoreignPicBack
 
-	db TACKLE, SPIKE_CANNON, POISON_STING, THRASH ; level 1 learnset
+	db TACKLE, POISON_STING, DOUBLE_KICK, SPIKE_CANNON ; level 1 learnset
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/omastar.asm b/data/pokemon/base_stats/omastar.asm
index 13118b68..4382f8f7 100644
--- a/data/pokemon/base_stats/omastar.asm
+++ b/data/pokemon/base_stats/omastar.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/omastar.pic", 0, 1 ; sprite dimensions
 	dw OmastarPicFront, OmastarPicBack
 
-	db WATER_GUN, WITHDRAW, HORN_ATTACK, NO_MOVE ; level 1 learnset
+	db WATER_GUN, WITHDRAW, ROCK_THROW, HORN_ATTACK ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/pendraken.asm b/data/pokemon/base_stats/pendraken.asm
index 276a275a..7b257222 100644
--- a/data/pokemon/base_stats/pendraken.asm
+++ b/data/pokemon/base_stats/pendraken.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/pendraken.pic", 0, 1 ; sprite dimensions
 	dw PendrakenPicFront, PendrakenPicBack
 
-	db CONSTRICT, SMOKESCREEN, NO_MOVE, NO_MOVE ; level 1 learnset
+	db CONSTRICT, SMOKESCREEN, BUBBLE, WRAP ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/perrserker.asm b/data/pokemon/base_stats/perrserker.asm
index 7514c3a9..7efc1bb7 100644
--- a/data/pokemon/base_stats/perrserker.asm
+++ b/data/pokemon/base_stats/perrserker.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/perrserker.pic", 0, 1 ; sprite dimensions
 	dw PerrserkerPicFront, PerrserkerPicBack
 
-	db GROWL, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
+	db SCRATCH, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/politoed.asm b/data/pokemon/base_stats/politoed.asm
index 58592cbb..45f5d124 100644
--- a/data/pokemon/base_stats/politoed.asm
+++ b/data/pokemon/base_stats/politoed.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/politoed.pic", 0, 1 ; sprite dimensions
 	dw PolitoedPicFront, PolitoedPicBack
 
-	db HYPNOSIS, WATER_GUN, DOUBLESLAP, NO_MOVE ; level 1 learnset
+	db HYPNOSIS, WATER_GUN, DOUBLESLAP, BODY_SLAM ; level 1 learnset
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/ponyta.asm b/data/pokemon/base_stats/ponyta.asm
index a17fc6a3..3f42aae7 100644
--- a/data/pokemon/base_stats/ponyta.asm
+++ b/data/pokemon/base_stats/ponyta.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/ponyta.pic", 0, 1 ; sprite dimensions
 	dw PonytaPicFront, PonytaPicBack
 
-	db EMBER, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
+	db EMBER, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/pupal.asm b/data/pokemon/base_stats/pupal.asm
index 7393291a..ea88c64a 100644
--- a/data/pokemon/base_stats/pupal.asm
+++ b/data/pokemon/base_stats/pupal.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/pupal.pic", 0, 1 ; sprite dimensions
 	dw PupalPicFront, PupalPicBack
 
-	db HARDEN, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
+	db LEECH_LIFE, STRING_SHOT, HARDEN, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/scizor.asm b/data/pokemon/base_stats/scizor.asm
index f3c5eb16..5381e056 100644
--- a/data/pokemon/base_stats/scizor.asm
+++ b/data/pokemon/base_stats/scizor.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/scizor.pic", 0, 1 ; sprite dimensions
 	dw ScizorPicFront, ScizorPicBack
 
-	db QUICK_ATTACK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
+	db QUICK_ATTACK, IRON_HEAD, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/sharpoon.asm b/data/pokemon/base_stats/sharpoon.asm
index b0f71c29..3553f128 100644
--- a/data/pokemon/base_stats/sharpoon.asm
+++ b/data/pokemon/base_stats/sharpoon.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/sharpoon.pic", 0, 1 ; sprite dimensions
 	dw SharpoonPicFront, SharpoonPicBack
 
-	db BITE, LEER, NO_MOVE, NO_MOVE ; level 1 learnset
+	db BITE, LEER, WATER_GUN, NO_MOVE ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/tangrowth.asm b/data/pokemon/base_stats/tangrowth.asm
index c23add24..f842fa1b 100644
--- a/data/pokemon/base_stats/tangrowth.asm
+++ b/data/pokemon/base_stats/tangrowth.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/tangrowth.pic", 0, 1 ; sprite dimensions
 	dw TangrowthPicFront, TangrowthPicBack
 
-	db CONSTRICT, BIND, NO_MOVE, NO_MOVE ; level 1 learnset
+	db CONSTRICT, BIND, ABSORB, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/tauros.asm b/data/pokemon/base_stats/tauros.asm
index 15f7751e..d3ec7d98 100644
--- a/data/pokemon/base_stats/tauros.asm
+++ b/data/pokemon/base_stats/tauros.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/tauros.pic", 0, 1 ; sprite dimensions
 	dw TaurosPicFront, TaurosPicBack
 
-	db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
+	db TACKLE, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/taurosp.asm b/data/pokemon/base_stats/taurosp.asm
index 10627b46..a0fa1279 100644
--- a/data/pokemon/base_stats/taurosp.asm
+++ b/data/pokemon/base_stats/taurosp.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/taurospcombat.pic", 0, 1 ; sprite dimensions
 	dw TaurosPPicFront, TaurosPPicBack
 
-	db DOUBLE_KICK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
+	db DOUBLE_KICK, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/taurospa.asm b/data/pokemon/base_stats/taurospa.asm
index 52dabb4a..5afddeea 100644
--- a/data/pokemon/base_stats/taurospa.asm
+++ b/data/pokemon/base_stats/taurospa.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/taurospaqua.pic", 0, 1 ; sprite dimensions
 	dw TaurosPAPicFront, TaurosPAPicBack
 
-	db DOUBLE_KICK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
+	db DOUBLE_KICK, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/taurospb.asm b/data/pokemon/base_stats/taurospb.asm
index 77a60350..14df4bcd 100644
--- a/data/pokemon/base_stats/taurospb.asm
+++ b/data/pokemon/base_stats/taurospb.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/taurospblaze.pic", 0, 1 ; sprite dimensions
 	dw TaurosPBPicFront, TaurosPBPicBack
 
-	db DOUBLE_KICK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
+	db DOUBLE_KICK, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/toedscruel.asm b/data/pokemon/base_stats/toedscruel.asm
index e0a9395c..210af29d 100644
--- a/data/pokemon/base_stats/toedscruel.asm
+++ b/data/pokemon/base_stats/toedscruel.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/toedscruel.pic", 0, 1 ; sprite dimensions
 	dw ToedscruelPicFront, ToedscruelPicBack
 
-	db ABSORB, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
+	db ABSORB, SUPERSONIC, WRAP, NO_MOVE ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/totartle.asm b/data/pokemon/base_stats/totartle.asm
index 4da90085..6b88f9f6 100644
--- a/data/pokemon/base_stats/totartle.asm
+++ b/data/pokemon/base_stats/totartle.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/totartle.pic", 0, 1 ; sprite dimensions
 	dw TotartlePicFront, TotartlePicBack
 
-	db TACKLE, TAIL_WHIP, BUBBLE, NO_MOVE ; level 1 learnset
+	db TACKLE, TAIL_WHIP, BUBBLE, WATER_GUN ; level 1 learnset
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/trampel.asm b/data/pokemon/base_stats/trampel.asm
index 5596476c..9c999c0f 100644
--- a/data/pokemon/base_stats/trampel.asm
+++ b/data/pokemon/base_stats/trampel.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/trampel.pic", 0, 1 ; sprite dimensions
 	dw TrampelPicFront, TrampelPicBack
 
-	db TACKLE, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset
+	db TACKLE, GROWL, HORN_ATTACK, NO_MOVE ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/wugtrio.asm b/data/pokemon/base_stats/wugtrio.asm
index 1b935f81..4a20bd1d 100644
--- a/data/pokemon/base_stats/wugtrio.asm
+++ b/data/pokemon/base_stats/wugtrio.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/wugtrio.pic", 0, 1 ; sprite dimensions
 	dw WugtrioPicFront, WugtrioPicBack
 
-	db WATER_GUN, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
+	db WATER_GUN, SAND_ATTACK, WRAP, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/zubat.asm b/data/pokemon/base_stats/zubat.asm
index cc8fe9a2..79f4117e 100644
--- a/data/pokemon/base_stats/zubat.asm
+++ b/data/pokemon/base_stats/zubat.asm
@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/zubat.pic", 0, 1 ; sprite dimensions
 	dw ZubatPicFront, ZubatPicBack
 
-	db LEECH_LIFE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
+	db LEECH_LIFE, TACKLE, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm
index 5629a741..99f6e906 100644
--- a/data/pokemon/evos_moves.asm
+++ b/data/pokemon/evos_moves.asm
@@ -272,11 +272,13 @@ RhydonEvosMoves:
 	db EV_ITEM, PROTECTOR, 1, RHYPERIOR 
 	db 0
 ; Learnset
-	db 30, STOMP
-	db 35, TAIL_WHIP
-	db 40, FURY_ATTACK
-	db 48, HORN_DRILL
-	db 55, LEER
+	db 20, STOMP
+	db 25, TAIL_WHIP
+	db 30, FURY_ATTACK
+	db 35, ROCK_SLIDE
+	db 40, HORN_DRILL
+	db 48, LEER
+	db 55, EARTHQUAKE
 	db 64, TAKE_DOWN
 	db 0
 
@@ -313,6 +315,7 @@ ClefairyEvosMoves:
 	db 18, DOUBLESLAP
 	db 24, MINIMIZE
 	db 31, METRONOME
+	db 35, BODY_SLAM
 	db 39, DEFENSE_CURL
 	db 48, LIGHT_SCREEN
 	db 0
@@ -348,6 +351,7 @@ NidokingEvosMoves:
 	db 8, HORN_ATTACK
 	db 14, POISON_STING
 	db 23, THRASH
+	db 36, EARTHQUAKE
 	db 0
 
 SlowbroEvosMoves:
@@ -414,12 +418,14 @@ GrimerEvosMoves:
 	db EV_LEVEL, 38, MUK
 	db 0
 ; Learnset
-	db 30, POISON_GAS
-	db 33, MINIMIZE
-	db 37, SLUDGE
-	db 42, HARDEN
-	db 48, SCREECH
-	db 55, ACID_ARMOR
+	db 11, POISON_GAS
+	db 15, ACID
+	db 19, MINIMIZE
+	db 24, SLUDGE
+	db 29, HARDEN
+	db 35, SCREECH
+	db 41, ACID_ARMOR
+	db 47, HAZE
 	db 0
 
 GengarEvosMoves:
@@ -450,6 +456,7 @@ NidoqueenEvosMoves:
 	db 8, SCRATCH
 	db 14, POISON_STING
 	db 23, BODY_SLAM
+	db 36, EARTHQUAKE
 	db 0
 
 CuboneEvosMoves:
@@ -472,11 +479,13 @@ RhyhornEvosMoves:
 	db EV_LEVEL, 42, RHYDON
 	db 0
 ; Learnset
-	db 30, STOMP
-	db 35, TAIL_WHIP
-	db 40, FURY_ATTACK
-	db 45, HORN_DRILL
-	db 50, LEER
+	db 20, STOMP
+	db 25, TAIL_WHIP
+	db 30, FURY_ATTACK
+	db 35, ROCK_SLIDE
+	db 40, HORN_DRILL
+	db 45, LEER
+	db 50, EARTHQUAKE
 	db 55, TAKE_DOWN
 	db 0
 
@@ -567,9 +576,9 @@ ScytherEvosMoves:
 	db 20, FOCUS_ENERGY
 	db 24, DOUBLE_TEAM
 	db 29, SLASH
+	db 32, WING_ATTACK
 	db 35, SWORDS_DANCE
 	db 42, AGILITY
-	db 50, WING_ATTACK
 	db 0
 
 StaryuEvosMoves:
@@ -618,14 +627,15 @@ TangelaEvosMoves:
 	db EV_LEVEL, 44, TANGROWTH
 	db 0
 ; Learnset
-	db 24, BIND
-	db 27, ABSORB
-	db 29, VINE_WHIP
-	db 32, POISONPOWDER
-	db 36, STUN_SPORE
-	db 39, SLEEP_POWDER
-	db 45, SLAM
-	db 48, GROWTH
+	db 13, BIND
+	db 19, ABSORB
+	db 24, VINE_WHIP
+	db 28, POISONPOWDER
+	db 31, STUN_SPORE
+	db 34, SLEEP_POWDER
+	db 40, SLAM
+	db 46, GROWTH
+	db 52, NIGHT_SHADE
 	db 0
 
 GawarhedEvosMoves:
@@ -642,6 +652,8 @@ NidoreignEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
+	db 36, ROCK_SLIDE
+	db 43, BODY_SLAM
 	db 50, THRASH
 	db 0
 
@@ -732,6 +744,7 @@ GravelerEvosMoves:
 	db 29, HARDEN
 	db 36, EARTHQUAKE
 	db 43, EXPLOSION
+	db 50, ROCK_SLIDE
 	db 0
 
 ChanseyEvosMoves:
@@ -808,6 +821,7 @@ ParasectEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
+	db 6, ABSORB
 	db 13, STUN_SPORE
 	db 20, LEECH_LIFE
 	db 30, SPORE
@@ -820,7 +834,7 @@ PsyduckEvosMoves:
 	db EV_LEVEL, 22, WEIRDUCK
 	db 0
 ; Learnset
-	db 14, TAIL_WHIP
+	db 12, TAIL_WHIP
 	db 15, AMNESIA
 	db 18, DISABLE
 	db 26, CONFUSION
@@ -851,6 +865,7 @@ GolemEvosMoves:
 	db 29, HARDEN
 	db 36, EARTHQUAKE
 	db 43, EXPLOSION
+	db 50, ROCK_SLIDE
 	db 0
 
 BalumbaEvosMoves:
@@ -905,12 +920,12 @@ MagnetonEvosMoves:
 	db EV_ITEM, THUNDER_STONE, 1, MAGNEZONE
 	db 0
 ; Learnset
-	db 21, SONICBOOM
-	db 25, THUNDERSHOCK
-	db 29, SUPERSONIC
-	db 38, THUNDER_WAVE
-	db 46, SWIFT
-	db 54, SCREECH
+	db 6, THUNDERSHOCK
+	db 11, SONICBOOM
+	db 16, SUPERSONIC
+	db 24, THUNDER_WAVE
+	db 38, SWIFT
+	db 45, SCREECH
 	db 0
 
 KoffingEvosMoves:
@@ -918,11 +933,11 @@ KoffingEvosMoves:
 	db EV_LEVEL, 35, WEEZING
 	db 0
 ; Learnset
-	db 32, SLUDGE
-	db 37, SMOKESCREEN
-	db 40, SELFDESTRUCT
-	db 45, HAZE
-	db 48, EXPLOSION
+	db 17, SLUDGE
+	db 21, SMOKESCREEN
+	db 25, SELFDESTRUCT
+	db 33, HAZE
+	db 41, EXPLOSION
 	db 0
 
 RamooseEvosMoves:
@@ -960,11 +975,12 @@ SeelEvosMoves:
 	db EV_LEVEL, 34, DEWGONG
 	db 0
 ; Learnset
-	db 30, GROWL
-	db 35, AURORA_BEAM
-	db 40, REST
-	db 45, TAKE_DOWN
-	db 50, ICE_BEAM
+	db 15, POWDER_SNOW
+	db 20, GROWL
+	db 25, AURORA_BEAM
+	db 30, REST
+	db 35, TAKE_DOWN
+	db 40, ICE_BEAM
 	db 0
 
 DiglettEvosMoves:
@@ -984,8 +1000,8 @@ TaurosEvosMoves:
 	db 0
 ; Learnset
 	db 21, STOMP
-	db 28, TAIL_WHIP
-	db 35, LEER
+	db 28, LEER
+	db 35, BODY_SLAM
 	db 44, RAGE
 	db 51, TAKE_DOWN
 	db 0
@@ -994,12 +1010,13 @@ TrampelEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
-	db 10, HORN_ATTACK
-	db 23, STOMP
-	db 30, RAGE
-	db 38, FURY_ATTACK
+	db 16, STOMP
+	db 23, RAGE
+	db 30, FURY_ATTACK
+	db 38, BODY_SLAM
 	db 44, LEER
 	db 50, ROAR
+	db 56, EARTHQUAKE
 	db 0
 
 GavillainEvosMoves:
@@ -1008,10 +1025,11 @@ GavillainEvosMoves:
 ; Learnset
 	db 7, SUPERSONIC
 	db 12, BITE
-	db 20, DRAGON_RAGE
-	db 24, SLASH
-	db 30, SCREECH
-	db 38, GLARE
+	db 20, THUNDERSHOCK
+	db 24, DRAGON_RAGE
+	db 30, SLASH
+	db 35, SCREECH
+	db 41, GLARE
 	db 46, CONFUSE_RAY
 	db 0
 
@@ -1086,11 +1104,11 @@ SharpoonEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
-	db 15, WATER_GUN
-	db 24, SCREECH
-	db 29, HORN_ATTACK
-	db 34, FURY_ATTACK
-	db 38, BRUTAL_SWING
+	db 15, SCREECH
+	db 24, HORN_ATTACK
+	db 29, BRUTAL_SWING
+	db 34, SMART_STRIKE
+	db 38, FURY_ATTACK
 	db 42, IRON_HEAD
 	db 49, HYDRO_PUMP
 	db 55, HORN_DRILL
@@ -1102,10 +1120,9 @@ BittybatEvosMoves:
 	db 0
 ; Learnset
 	db 7, WING_ATTACK
-	db 14, GUST
-	db 18, CONFUSE_RAY
-	db 22, BITE
-	db 26, TACKLE
+	db 12, GUST
+	db 18, BITE
+	db 22, CONFUSE_RAY
 	db 30, DISABLE
 	db 34, HAZE
 	db 0
@@ -1115,12 +1132,12 @@ DoduoEvosMoves:
 	db EV_LEVEL, 31, DODRIO
 	db 0
 ; Learnset
-	db 20, GROWL
-	db 24, FURY_ATTACK
-	db 30, DRILL_PECK
-	db 36, RAGE
-	db 40, TRI_ATTACK
-	db 44, AGILITY
+	db 11, FURY_ATTACK
+	db 20, QUICK_ATTACK
+	db 24, RAGE
+	db 28, DRILL_PECK
+	db 33, TRI_ATTACK
+	db 38, AGILITY
 	db 0
 
 PoliwagEvosMoves:
@@ -1140,6 +1157,7 @@ JynxEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
+	db 13, POWDER_SNOW
 	db 18, LICK
 	db 23, DOUBLESLAP
 	db 31, ICE_PUNCH
@@ -1187,11 +1205,13 @@ MeowthEvosMoves:
 	db EV_LEVEL, 28, PERSIAN
 	db 0
 ; Learnset
-	db 12, BITE
-	db 17, PAY_DAY
-	db 24, SCREECH
-	db 33, FURY_SWIPES
-	db 44, SLASH
+	db 5, PAY_DAY
+	db 8, TAIL_WHIP
+	db 12, SAND_ATTACK
+	db 21, BITE
+	db 26, FURY_SWIPES
+	db 33, SCREECH
+	db 38, SLASH
 	db 0
 
 KrabbyEvosMoves:
@@ -1244,10 +1264,10 @@ VulpiiiEvosMoves:
 ; Learnset
 	db 7, QUICK_ATTACK
 	db 14, ROAR
-	db 21, DOUBLE_TEAM
-	db 28, CONFUSE_RAY
-	db 35, FLAMETHROWER
-	db 42, FIRE_SPIN
+	db 19, DOUBLE_TEAM
+	db 25, CONFUSE_RAY
+	db 31, FLAMETHROWER
+	db 38, FIRE_SPIN
 	db 0
 
 VulpixEvosMoves:
@@ -1255,8 +1275,9 @@ VulpixEvosMoves:
 	db EV_ITEM, FIRE_STONE, 1, NINETALES
 	db 0
 ; Learnset
-	db 16, QUICK_ATTACK
-	db 21, ROAR
+	db 7, QUICK_ATTACK
+	db 14, ROAR
+	db 21, DOUBLE_TEAM
 	db 28, CONFUSE_RAY
 	db 35, FLAMETHROWER
 	db 42, FIRE_SPIN
@@ -1301,22 +1322,23 @@ RibbitoEvosMoves:
 	db 19, WATER_GUN
 	db 24, FEINT_ATTACK
 	db 31, SUBSTITUTE
-	db 41, KOWTOW_CLEAVE
-	db 49, HYDRO_PUMP
-	db 53, NIGHT_SLASH
+	db 37, KOWTOW_CLEAVE
+	db 44, HYDRO_PUMP
+	db 50, NIGHT_SLASH
 	db 0
 
 CroakozunaEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
+	db 7, BUBBLE
 	db 13, MEDITATE
 	db 19, WATER_GUN
-	db 26, FEINT_ATTACK
-	db 31, SUBSTITUTE
-	db 45, KOWTOW_CLEAVE
-	db 53, HYDRO_PUMP
-	db 58, NIGHT_SLASH
+	db 24, FEINT_ATTACK
+	db 35, SUBSTITUTE
+	db 41, KOWTOW_CLEAVE
+	db 49, HYDRO_PUMP
+	db 53, NIGHT_SLASH
 	db 0
 
 DratiniEvosMoves:
@@ -1348,6 +1370,7 @@ KabutoEvosMoves:
 	db EV_LEVEL, 40, KABUTOPS
 	db 0
 ; Learnset
+	db 21, ROCK_THROW
 	db 34, ABSORB
 	db 39, SLASH
 	db 44, LEER
@@ -1358,6 +1381,7 @@ KabutopsEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
+	db 21, ROCK_THROW
 	db 34, ABSORB
 	db 39, SLASH
 	db 46, LEER
@@ -1384,20 +1408,21 @@ SeadraEvosMoves:
 	db 19, SMOKESCREEN
 	db 24, LEER
 	db 30, WATER_GUN
+	db 32, PIN_MISSILE
 	db 41, AGILITY
 	db 52, HYDRO_PUMP
 	db 0
 
 MinistareEvosMoves:
 ; Evolutions
-	db EV_LEVEL, 50, IGUANARCH
+	db EV_LEVEL, 55, IGUANARCH
 	db 0
 ; Learnset
 	db 10, LEER
 	db 20, BITE
-	db 30, GLARE
-	db 40, DRAGON_RAGE
-	db 50, SLASH
+	db 35, GLARE
+	db 45, DRAGON_RAGE
+	db 55, SLASH
 	db 0
 
 IguanarchEvosMoves:
@@ -1406,9 +1431,9 @@ IguanarchEvosMoves:
 ; Learnset
 	db 10, LEER
 	db 20, BITE
-	db 30, GLARE
-	db 40, DRAGON_RAGE
-	db 50, SLASH
+	db 35, GLARE
+	db 45, DRAGON_RAGE
+	db 60, SLASH
 	db 0
 
 SandshrewEvosMoves:
@@ -1420,6 +1445,7 @@ SandshrewEvosMoves:
 	db 17, SLASH
 	db 24, POISON_STING
 	db 31, SWIFT
+	db 35, EARTHQUAKE
 	db 38, FURY_SWIPES
 	db 0
 
@@ -1431,6 +1457,7 @@ SandslashEvosMoves:
 	db 17, SLASH
 	db 27, POISON_STING
 	db 36, SWIFT
+	db 42, EARTHQUAKE
 	db 47, FURY_SWIPES
 	db 0
 
@@ -1439,6 +1466,7 @@ OmanyteEvosMoves:
 	db EV_LEVEL, 40, OMASTAR
 	db 0
 ; Learnset
+	db 21, ROCK_THROW
 	db 34, HORN_ATTACK
 	db 39, LEER
 	db 46, SPIKE_CANNON
@@ -1449,6 +1477,7 @@ OmastarEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
+	db 21, ROCK_THROW
 	db 34, HORN_ATTACK
 	db 39, LEER
 	db 44, SPIKE_CANNON
@@ -1555,11 +1584,13 @@ ZubatEvosMoves:
 	db EV_LEVEL, 23, GOLBAT
 	db 0
 ; Learnset
-	db 10, SUPERSONIC
-	db 15, BITE
-	db 21, CONFUSE_RAY
-	db 28, WING_ATTACK
-	db 36, HAZE
+	db 7, WING_ATTACK
+	db 12, GUST
+	db 14, SUPERSONIC
+	db 20, BITE
+	db 24, CONFUSE_RAY
+	db 29, DISABLE
+	db 34, HAZE
 	db 0
 
 EkansEvosMoves:
@@ -1579,6 +1610,7 @@ ParasEvosMoves:
 	db EV_LEVEL, 24, PARASECT
 	db 0
 ; Learnset
+	db 6, ABSORB
 	db 13, STUN_SPORE
 	db 20, LEECH_LIFE
 	db 27, SPORE
@@ -1620,13 +1652,16 @@ KakunaEvosMoves:
 	db EV_LEVEL, 10, BEEDRILL
 	db 0
 ; Learnset
+	db 7, HARDEN
+	db 8, HARDEN
+	db 9, HARDEN
 	db 0
 
 BeedrillEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
-	db 12, FURY_ATTACK
+	db 10, FURY_ATTACK
 	db 16, FOCUS_ENERGY
 	db 20, TWINEEDLE
 	db 25, RAGE
@@ -1650,12 +1685,12 @@ DodrioEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
-	db 20, GROWL
-	db 24, FURY_ATTACK
-	db 30, DRILL_PECK
-	db 39, RAGE
-	db 45, TRI_ATTACK
-	db 51, AGILITY
+	db 11, FURY_ATTACK
+	db 20, QUICK_ATTACK
+	db 24, RAGE
+	db 28, DRILL_PECK
+	db 36, TRI_ATTACK
+	db 42, AGILITY
 	db 0
 
 PrimeapeEvosMoves:
@@ -1700,11 +1735,12 @@ DewgongEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
-	db 30, GROWL
-	db 35, AURORA_BEAM
-	db 44, REST
-	db 50, TAKE_DOWN
-	db 56, ICE_BEAM
+	db 15, POWDER_SNOW
+	db 20, GROWL
+	db 25, AURORA_BEAM
+	db 30, REST
+	db 39, TAKE_DOWN
+	db 45, ICE_BEAM
 	db 0
 
 TriculesEvosMoves:
@@ -1724,14 +1760,14 @@ PendrakenEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
-	db 10, BUBBLE
-	db 14, WRAP
-	db 24, FAIRY_WIND
-	db 29, HYPNOSIS
-	db 32, SUPERSONIC
-	db 44, DAZZLE_GLEAM
-	db 50, HAZE
-	db 54, HYDRO_PUMP
+	db 8, BUBBLE
+	db 13, WRAP
+	db 19, FAIRY_WIND
+	db 23, HYPNOSIS
+	db 27, SUPERSONIC
+	db 35, DAZZLE_GLEAM
+	db 42, HAZE
+	db 47, HYDRO_PUMP
 	db 0
 
 CaterpieEvosMoves:
@@ -1747,6 +1783,8 @@ MetapodEvosMoves:
 	db 0
 ; Learnset
 	db 7, HARDEN
+	db 8, HARDEN
+	db 9, HARDEN
 	db 0
 
 ButterfreeEvosMoves:
@@ -1776,27 +1814,33 @@ MachampEvosMoves:
 
 WeirduckEvosMoves:
 ; Evolutions
-	db EV_LEVEL, 35, GOLDUCK
+	db EV_LEVEL, 33, GOLDUCK
 	db 0
 ; Learnset
+	db 12, TAIL_WHIP
+	db 15, AMNESIA
 	db 22, SUPERSONIC
 	db 25, DISABLE
-	db 29, CONFUSION
-	db 34, GLARE
+	db 28, CONFUSION
+	db 32, GLARE
 	db 39, FURY_SWIPES
 	db 41, PSYBEAM
-	db 55, HYDRO_PUMP
+	db 46, HYDRO_PUMP
 	db 0
 
 GolduckEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
-	db 28, TAIL_WHIP
-	db 31, DISABLE
-	db 39, CONFUSION
-	db 48, FURY_SWIPES
-	db 59, HYDRO_PUMP
+	db 12, TAIL_WHIP
+	db 15, AMNESIA
+	db 22, SUPERSONIC
+	db 25, DISABLE
+	db 28, CONFUSION
+	db 32, GLARE
+	db 42, FURY_SWIPES
+	db 47, PSYBEAM
+	db 52, HYDRO_PUMP
 	db 0
 
 HypnoEvosMoves:
@@ -1813,14 +1857,17 @@ HypnoEvosMoves:
 
 GolbatEvosMoves:
 ; Evolutions
-	db EV_LEVEL, 44, CROBAT
+	db EV_LEVEL, 40, CROBAT
 	db 0
 ; Learnset
-	db 10, SUPERSONIC
-	db 15, BITE
-	db 21, CONFUSE_RAY
-	db 32, WING_ATTACK
-	db 43, HAZE
+	db 7, WING_ATTACK
+	db 12, GUST
+	db 14, SUPERSONIC
+	db 20, BITE
+	db 26, CONFUSE_RAY
+	db 32, DISABLE
+	db 38, SCREECH
+	db 42, HAZE
 	db 0
 
 MewtwoEvosMoves:
@@ -1879,12 +1926,14 @@ MukEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
-	db 30, POISON_GAS
-	db 33, MINIMIZE
-	db 37, SLUDGE
-	db 45, HARDEN
-	db 53, SCREECH
-	db 60, ACID_ARMOR
+	db 11, POISON_GAS
+	db 15, ACID
+	db 19, MINIMIZE
+	db 24, SLUDGE
+	db 29, HARDEN
+	db 35, SCREECH
+	db 46, ACID_ARMOR
+	db 53, HAZE
 	db 0
 
 DecillaEvosMoves:
@@ -1921,12 +1970,12 @@ MagnetiteEvosMoves:
 	db EV_LEVEL, 30, MAGNETON
 	db 0
 ; Learnset
-	db 21, SONICBOOM
-	db 25, THUNDERSHOCK
-	db 29, SUPERSONIC
-	db 35, THUNDER_WAVE
-	db 41, SWIFT
-	db 47, SCREECH
+	db 6, THUNDERSHOCK
+	db 11, SONICBOOM
+	db 16, SUPERSONIC
+	db 24, THUNDER_WAVE
+	db 36, SWIFT
+	db 42, SCREECH
 	db 0
 
 ElectrodeEvosMoves:
@@ -1950,22 +1999,24 @@ WeezingEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
-	db 32, SLUDGE
-	db 39, SMOKESCREEN
-	db 43, SELFDESTRUCT
-	db 49, HAZE
-	db 53, EXPLOSION
+	db 17, SLUDGE
+	db 21, SMOKESCREEN
+	db 25, SELFDESTRUCT
+	db 33, HAZE
+	db 46, EXPLOSION
 	db 0
 
 PersianEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
-	db 12, BITE
-	db 17, PAY_DAY
-	db 24, SCREECH
-	db 37, FURY_SWIPES
-	db 51, SLASH
+	db 5, PAY_DAY
+	db 8, TAIL_WHIP
+	db 12, SAND_ATTACK
+	db 21, BITE
+	db 26, FURY_SWIPES
+	db 35, SCREECH
+	db 40, SLASH
 	db 0
 
 MarowakEvosMoves:
@@ -1987,6 +2038,9 @@ GuardiaEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
+	db 10, BONE_CLUB
+	db 13, TAIL_WHIP
+	db 18, HEADBUTT
 	db 25, LEER
 	db 33, FOCUS_ENERGY
 	db 41, THRASH
@@ -2101,7 +2155,7 @@ OrfryEvosMoves:
 ; Learnset
 	db 7, SUPERSONIC
 	db 12, HORN_ATTACK
-	db 16, FURY_ATTACK
+	db 18, FURY_ATTACK
 	db 26, WATERFALL
 	db 30, HORN_DRILL
 	db 34, AGILITY
@@ -2112,24 +2166,25 @@ GoldeenEvosMoves:
 	db EV_LEVEL, 33, SEAKING
 	db 0
 ; Learnset
-	db 19, SUPERSONIC
-	db 24, HORN_ATTACK
-	db 30, FURY_ATTACK
-	db 37, WATERFALL
-	db 45, HORN_DRILL
-	db 54, AGILITY
+	db 7, SUPERSONIC
+	db 12, HORN_ATTACK
+	db 20, FURY_ATTACK
+	db 29, WATERFALL
+	db 34, HORN_DRILL
+	db 39, AGILITY
 	db 0
 
 SeakingEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
-	db 19, SUPERSONIC
-	db 24, HORN_ATTACK
-	db 30, FURY_ATTACK
-	db 39, WATERFALL
-	db 48, HORN_DRILL
-	db 54, AGILITY
+	db 7, SUPERSONIC
+	db 12, HORN_ATTACK
+	db 20, FURY_ATTACK
+	db 29, WATERFALL
+	db 37, HORN_DRILL
+	db 41, AGILITY
+	db 46, SWORDS_DANCE
 	db 0
 
 KotoraEvosMoves:
@@ -2188,24 +2243,26 @@ PonytaEvosMoves:
 	db EV_LEVEL, 40, RAPIDASH
 	db 0
 ; Learnset
-	db 30, TAIL_WHIP
-	db 32, STOMP
-	db 35, GROWL
-	db 39, FIRE_SPIN
-	db 43, TAKE_DOWN
-	db 48, AGILITY
+	db 7, QUICK_ATTACK
+	db 14, GROWL
+	db 24, STOMP
+	db 31, FLAMETHROWER
+	db 37, AGILITY
+	db 43, FIRE_SPIN
+	db 47, TAKE_DOWN
 	db 0
 
 RapidashEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
-	db 30, TAIL_WHIP
-	db 32, STOMP
-	db 35, GROWL
-	db 39, FIRE_SPIN
-	db 47, TAKE_DOWN
-	db 55, AGILITY
+	db 7, QUICK_ATTACK
+	db 14, GROWL
+	db 24, STOMP
+	db 31, FLAMETHROWER
+	db 37, AGILITY
+	db 46, FIRE_SPIN
+	db 52, TAKE_DOWN
 	db 0
 
 RattataEvosMoves:
@@ -2270,6 +2327,7 @@ GeodudeEvosMoves:
 	db 26, HARDEN
 	db 31, EARTHQUAKE
 	db 36, EXPLOSION
+	db 41, ROCK_SLIDE
 	db 0
 
 PorygonEvosMoves:
@@ -2287,6 +2345,7 @@ AerodactylEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
+	db 21, ROCK_THROW
 	db 33, SUPERSONIC
 	db 38, BITE
 	db 45, TAKE_DOWN
@@ -2311,12 +2370,12 @@ MagnemiteEvosMoves:
 	db EV_LEVEL, 20, MAGNETITE
 	db 0
 ; Learnset
-	db 21, SONICBOOM
-	db 25, THUNDERSHOCK
-	db 29, SUPERSONIC
-	db 35, THUNDER_WAVE
-	db 41, SWIFT
-	db 47, SCREECH
+	db 6, THUNDERSHOCK
+	db 11, SONICBOOM
+	db 16, SUPERSONIC
+	db 21, THUNDER_WAVE
+	db 33, SWIFT
+	db 39, SCREECH
 	db 0
 
 SqueamataEvosMoves:
@@ -2409,7 +2468,8 @@ TotartleEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
-	db 18, WATER_GUN
+	db 8, BUBBLE
+	db 15, WATER_GUN
 	db 24, BITE
 	db 31, WITHDRAW
 	db 42, SKULL_BASH
@@ -2540,7 +2600,7 @@ ScizorEvosMoves:
 ; Learnset
 	db 17, LEER
 	db 20, FOCUS_ENERGY
-	db 24, IRON_HEAD
+	db 24, DOUBLE_TEAM
 	db 29, SLASH
 	db 35, SWORDS_DANCE
 	db 42, AGILITY
@@ -2551,11 +2611,13 @@ RhyperiorEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
-	db 30, STOMP
-	db 35, TAIL_WHIP
-	db 40, FURY_ATTACK
-	db 48, HORN_DRILL
-	db 55, LEER
+	db 20, STOMP
+	db 25, TAIL_WHIP
+	db 30, FURY_ATTACK
+	db 35, ROCK_SLIDE
+	db 40, HORN_DRILL
+	db 48, LEER
+	db 55, EARTHQUAKE
 	db 64, TAKE_DOWN
 	db 0
 
@@ -2640,14 +2702,15 @@ TangrowthEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
-	db 24, BIND
-	db 27, ABSORB
-	db 29, VINE_WHIP
-	db 32, POISONPOWDER
-	db 36, STUN_SPORE
-	db 39, SLEEP_POWDER
-	db 45, SLAM
-	db 48, GROWTH
+	db 13, BIND
+	db 19, ABSORB
+	db 24, VINE_WHIP
+	db 28, POISONPOWDER
+	db 31, STUN_SPORE
+	db 34, SLEEP_POWDER
+	db 40, SLAM
+	db 50, GROWTH
+	db 56, NIGHT_SHADE
 	db 0
 
 KleavorEvosMoves:
@@ -2666,7 +2729,10 @@ KleavorEvosMoves:
 BellignanEvosMoves:
 ; Evolutions
 	db 0
-; Learnset 
+; Learnset
+	db 13, WRAP
+	db 15, POISONPOWDER
+	db 18, SLEEP_POWDER
 	db 40, LOVELY_KISS
 	db 48, SOLARBEAM
 	db 0
@@ -2701,7 +2767,6 @@ HitmontopEvosMoves:
 ; Evolutions
 	db 0 
 ; Learnset 
-	db 7, FOCUS_ENERGY
 	db 33, QUICK_ATTACK
 	db 38, COUNTER
 	db 43, AGILITY
@@ -2713,14 +2778,15 @@ CrobatEvosMoves:
 ; Evolutions
 	db 0 
 ; Learnset 
-	db 7, GUST
-	db 10, SUPERSONIC
-	db 15, BITE
-	db 17, QUICK_ATTACK
-	db 21, CONFUSE_RAY
-	db 26, SLUDGE
-	db 32, WING_ATTACK
-	db 43, HAZE
+	db 7, WING_ATTACK
+	db 12, GUST
+	db 14, SUPERSONIC
+	db 20, BITE
+	db 26, CONFUSE_RAY
+	db 32, DISABLE
+	db 38, SCREECH
+	db 42, SLUDGE
+	db 46, HAZE
 	db 50, AGILITY
 	db 0
 
@@ -2828,6 +2894,9 @@ PupalEvosMoves:
 	db EV_LEVEL, 10, CARAPTHOR
 	db 0
 ; Learnset
+	db 7, HARDEN
+	db 8, HARDEN
+	db 9, HARDEN
 	db 0
 
 CarapthorEvosMoves:
@@ -2911,8 +2980,8 @@ WugtrioEvosMoves:
 	db 15, SAND_ATTACK
 	db 19, WRAP
 	db 24, HEADBUTT
-	db 31, DIG
-	db 40, HYDRO_PUMP
+	db 35, DIG
+	db 47, HYDRO_PUMP
 	db 0
 
 ToedscoolEvosMoves:
@@ -2948,29 +3017,28 @@ PerrserkerEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
-	db 8, SCRATCH
-	db 12, PAY_DAY
-	db 17, BITE
-	db 25, SMART_STRIKE
-	db 29, FURY_SWIPES
-	db 32, SCREECH
-	db 36, SLASH
-	db 40, METAL_SOUND
-	db 45, IRON_HEAD
+	db 5, PAY_DAY
+	db 8, BITE
+	db 12, FURY_SWIPES
+	db 21, SMART_STRIKE
+	db 26, SCREECH
+	db 35, METAL_SOUND
+	db 40, SLASH
+	db 46, IRON_HEAD
 	db 0
 
 SirfetchdEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
-	db 7, LEER
-	db 15, DOUBLE_KICK
-	db 23, BRUTAL_SWING
-	db 31, LOW_KICK
-	db 39, SWORDS_DANCE
-	db 44, JUMP_KICK
-	db 49, ROLLING_KICK
-	db 55, HI_JUMP_KICK
+	db 13, LEER
+	db 17, DOUBLE_KICK
+	db 21, BRUTAL_SWING
+	db 25, SWORDS_DANCE
+	db 29, LOW_KICK
+	db 33, JUMP_KICK
+	db 41, ROLLING_KICK
+	db 45, HI_JUMP_KICK
 	db 0
 
 MrRimeEvosMoves:
@@ -3002,14 +3070,12 @@ MelmetalEvosMoves:
 	db 0
 ; Learnset
 	db 9, TAIL_WHIP
-	db 16, HEADBUTT
-	db 18, THUNDER_WAVE
-	db 20, THUNDERSHOCK
-	db 27, THUNDERPUNCH
-	db 36, ACID_ARMOR
-	db 45, MAGNET_BOMB
-	db 51, MEGA_PUNCH
-	db 63, SMART_STRIKE
+	db 18, HEADBUTT
+	db 27, THUNDER_WAVE
+	db 36, THUNDERPUNCH
+	db 45, ACID_ARMOR
+	db 54, MAGNET_BOMB
+	db 63, MEGA_PUNCH
 	db 72, IRON_HEAD
 	db 81, SUBMISSION
 	db 90, HYPER_BEAM
@@ -3098,90 +3164,94 @@ DugtrioAEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
-	db 6, GROWL
-	db 20, SLASH
-	db 31, DIG
-	db 35, IRON_HEAD
-	db 39, EARTHQUAKE
-	db 43, FISSURE
+	db 15, GROWL
+	db 19, DIG
+	db 24, SAND_ATTACK
+	db 30, IRON_HEAD
+	db 35, SLASH
+	db 43, EARTHQUAKE
+	db 47, FISSURE
 	db 0
 	
 PersianAEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
-	db 6, BITE
-	db 14, FURY_SWIPES
-	db 17, SCREECH
-	db 22, FEINT_ATTACK
-	db 30, PAY_DAY
-	db 33, SLASH
-	db 38, NASTY_PLOT
-	db 49, NIGHT_SLASH
+	db 5, PAY_DAY
+	db 8, BITE
+	db 12, FURY_SWIPES
+	db 21, FEINT_ATTACK
+	db 26, SCREECH
+	db 35, NASTY_PLOT
+	db 40, SLASH
+	db 46, NIGHT_SLASH
 	db 0
 	
 GolemAEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
+	db 11, DEFENSE_CURL
 	db 16, ROCK_THROW
-	db 22, THUNDERPUNCH
-	db 24, SELFDESTRUCT
-	db 36, EXPLOSION
-	db 40, DOUBLE_EDGE
+	db 21, SELFDESTRUCT
+	db 29, THUNDERPUNCH
+	db 36, DOUBLE_EDGE
+	db 43, EXPLOSION
+	db 50, ROCK_SLIDE
 	db 0
 	
 RapidashGEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
-	db 30, TAIL_WHIP
-	db 32, CONFUSION
-	db 35, FAIRY_WIND
-	db 39, AGILITY
-	db 42, PSYBEAM
-	db 46, STOMP
-	db 47, TAKE_DOWN
-	db 52, DAZZLE_GLEAM
-	db 55, PSYCHIC_M
+	db 7, QUICK_ATTACK
+	db 14, FAIRY_WIND
+	db 24, STOMP
+	db 31, PSYBEAM
+	db 37, AGILITY
+	db 46, DAZZLE_GLEAM
+	db 52, TAKE_DOWN
+	db 56, PSYCHIC_M
 	db 0
 	
 SlowbroGEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
-	db 8, ACID
-	db 14, CONFUSION
-	db 22, DISABLE
-	db 30, HEADBUTT
-	db 38, AMNESIA
-	db 42, PSYCHIC_M
+	db 18, DISABLE
+	db 22, HEADBUTT
+	db 27, GROWL
+	db 33, ACID
+	db 37, WITHDRAW
+	db 44, AMNESIA
+	db 49, SLUDGE
+	db 55, PSYCHIC_M
 	db 0
 
 SlowkingGEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
-	db 8, ACID
-	db 14, CONFUSION
-	db 22, DISABLE
-	db 30, HEADBUTT
-	db 38, AMNESIA
-	db 42, PSYCHIC_M
+	db 18, DISABLE
+	db 22, HEADBUTT
+	db 27, GROWL
+	db 33, ACID
+	db 44, AMNESIA
+	db 55, PSYCHIC_M
 	db 0
 
 MukAEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
-	db 6, HARDEN
-	db 12, MINIMIZE
-	db 18, DISABLE
+	db 11, POISON_GAS
+	db 15, MINIMIZE
+	db 19, SLUDGE
 	db 24, BRUTAL_SWING
-	db 30, SCREECH
-	db 36, NIGHT_SLASH
-	db 42, ACID_ARMOR
-	db 48, SLUDGE
+	db 29, HARDEN
+	db 35, SCREECH
+	db 46, NIGHT_SLASH
+	db 53, ACID_ARMOR
 	db 0
 
 ExeggutorAEvosMoves:
@@ -3204,7 +3274,7 @@ MarowakAEvosMoves:
 	db 25, LEER
 	db 33, EMBER
 	db 41, THRASH
-	db 46, BONEMERANG
+	db 48, BONEMERANG
 	db 55, FLAMETHROWER
 	db 0
 	
@@ -3212,21 +3282,22 @@ WeezingGEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
-	db 32, SLUDGE
-	db 37, SMOKESCREEN
-	db 40, SELFDESTRUCT
-	db 43, DAZZLE_GLEAM
-	db 49, HAZE
-	db 53, EXPLOSION
+	db 9, FAIRY_WIND
+	db 17, SLUDGE
+	db 21, SMOKESCREEN
+	db 25, SELFDESTRUCT
+	db 33, HAZE
+	db 39, DAZZLE_GLEAM
+	db 46, EXPLOSION
 	db 0
 
 TaurosPEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
-	db 21, ROLLING_KICK
-	db 28, TAIL_WHIP
-	db 35, LEER
+	db 21, LOW_KICK
+	db 28, LEER
+	db 35, ROLLING_KICK
 	db 44, RAGE
 	db 51, JUMP_KICK
 	db 0
@@ -3236,8 +3307,8 @@ TaurosPAEvosMoves:
 	db 0
 ; Learnset
 	db 21, LOW_KICK
-	db 28, TAIL_WHIP
-	db 35, LEER
+	db 28, LEER
+	db 35, WATER_GUN
 	db 44, RAGE
 	db 51, HYDRO_PUMP
 	db 0
@@ -3247,8 +3318,8 @@ TaurosPBEvosMoves:
 	db 0
 ; Learnset
 	db 21, LOW_KICK
-	db 28, TAIL_WHIP
-	db 35, LEER
+	db 28, LEER
+	db 35, FLAMETHROWER
 	db 44, RAGE
 	db 51, FIRE_SPIN
 	db 0
diff --git a/data/wild/maps/DiglettsCave.asm b/data/wild/maps/DiglettsCave.asm
index 16d3dbe8..7aa6600a 100644
--- a/data/wild/maps/DiglettsCave.asm
+++ b/data/wild/maps/DiglettsCave.asm
@@ -8,8 +8,8 @@ DiglettsCaveWildMons:
 	db 16, DIGLETT
 	db 21, DIGLETT
 	db 22, DIGLETT
-	db 29, DUGTRIO
-	db 31, DUGTRIO
+	db 28, DUGTRIO
+	db 30, DUGTRIO
 	end_grass_wildmons
 
 	def_water_wildmons 5 ; encounter rate
@@ -21,6 +21,6 @@ DiglettsCaveWildMons:
 	db 15, WIGLETT
 	db 21, WIGLETT
 	db 22, WIGLETT
-	db 29, WUGTRIO
-	db 31, WUGTRIO
+	db 28, WUGTRIO
+	db 30, WUGTRIO
 	end_water_wildmons