The Big One.

Whoa, this one's been in the making for a while now. This one has been my attempt to fix as much as I could within a little over a month. Here's what I've got for you. - Fixed a bug in Silph Gauntlet where the trainers would not see you unless you spoke to them - Removed the unnecessary Gawarhed and Wugtrio static encounters. In what was once Gawarhed's place is a Rare Candy. - Implemented a working ferry system (huge thanks to Red++) that allows travelling to Faraway Island and Citrine City with the right tickets. Currently both maps use a copy of the SS Anne, which may be revised later. - Bittybat, Magnetite and Burgela have been removed to fix a Pokedex bug where entries wouldn't display correctly if the total number wasn't a multiple of 8. - Fixed a bug where fishing up a Wiglett and Wugtrio would play the trainer battle and Champion battle themes respectively - Restructured the Pokedex a little. Don't worry, Lickitung's still number 108! - All references to betamon in the disassembly have had their names updated to match the new Ogasawara ones - Removed Blastyke as a Game Corner prize, replacing it with Squeamata. - Garnet Cavern is now properly listed as a dungeon map - Fixed an issue where trying to leave Bill's House after entering the garden would put you back in the garden - Moved Silph Gauntlet's Beauty down 1 floor to make the number of trainers on each floor more consistent - Finished Gauntlet 6F except for the trainer text (PvK please help) - Gavillain's stats updated to match KEP 1.4 on the Showdown server. It's now a Dragon/Electric type with less Ice coverage. - Fixed Clefable's and Wigglytuff's starting movesets from an earlier commit - Fixed an ABSOLUTELY HORRIBLE, EGREGIOUSLY FRUSTRATING BUG that caused the Pokedex's seen counter to rarely update. This is what caused this commit to be delayed for so long. No joke. - New sprites, courtesy of Albatross, for Sylveon's back sprite, Alolan Marowak, Alolan Muk, Galarian Weezing and Magnezone! - Fixed a bug preventing the trade for Haunter from being accessed.
2026-04-15 22:53:21 +12:00 · 2023-09-19 23:34:25 +01:00 · 2023-09-19 23:34:25 +01:00 · 508a4e790e
commit 508a4e790e
parent 57186bb2a0
246 changed files with 2446 additions and 2384 deletions
--- a/data/pokemon/base_stats.asm
+++ b/data/pokemon/base_stats.asm
@ -28,7 +28,7 @@ INCLUDE "data/pokemon/base_stats/raticatea.asm"
 INCLUDE "data/pokemon/base_stats/pidgey.asm"
 INCLUDE "data/pokemon/base_stats/pidgeotto.asm"
 INCLUDE "data/pokemon/base_stats/pidgeot.asm"
-INCLUDE "data/pokemon/base_stats/konya.asm"
+INCLUDE "data/pokemon/base_stats/coinpur.asm"
 INCLUDE "data/pokemon/base_stats/meowth.asm"
 INCLUDE "data/pokemon/base_stats/persian.asm"
 INCLUDE "data/pokemon/base_stats/persiana.asm"
@ -40,15 +40,13 @@ INCLUDE "data/pokemon/base_stats/weedle.asm"
 INCLUDE "data/pokemon/base_stats/kakuna.asm"
 INCLUDE "data/pokemon/base_stats/beedrill.asm"
 INCLUDE "data/pokemon/base_stats/kokana.asm"
-INCLUDE "data/pokemon/base_stats/kasanagi.asm"
+INCLUDE "data/pokemon/base_stats/pupal.asm"
 INCLUDE "data/pokemon/base_stats/carapthor.asm"
+INCLUDE "data/pokemon/base_stats/kotora.asm"
+INCLUDE "data/pokemon/base_stats/gaotora.asm"
+INCLUDE "data/pokemon/base_stats/gorotora.asm"
 INCLUDE "data/pokemon/base_stats/spearow.asm"
 INCLUDE "data/pokemon/base_stats/fearow.asm"
-INCLUDE "data/pokemon/base_stats/ekans.asm"
-INCLUDE "data/pokemon/base_stats/arbok.asm"
-INCLUDE "data/pokemon/base_stats/sandshrew.asm"
-INCLUDE "data/pokemon/base_stats/sandslash.asm"
-INCLUDE "data/pokemon/base_stats/sandslasha.asm"
 INCLUDE "data/pokemon/base_stats/nidoranf.asm"
 INCLUDE "data/pokemon/base_stats/nidorina.asm"
 INCLUDE "data/pokemon/base_stats/nidoqueen.asm"
@ -56,7 +54,6 @@ INCLUDE "data/pokemon/base_stats/nidoranm.asm"
 INCLUDE "data/pokemon/base_stats/nidorino.asm"
 INCLUDE "data/pokemon/base_stats/nidoking.asm"
 INCLUDE "data/pokemon/base_stats/nidoreign.asm"
-INCLUDE "data/pokemon/base_stats/bittybat.asm"
 INCLUDE "data/pokemon/base_stats/zubat.asm"
 INCLUDE "data/pokemon/base_stats/golbat.asm"
 INCLUDE "data/pokemon/base_stats/crobat.asm"
@ -70,13 +67,15 @@ INCLUDE "data/pokemon/base_stats/clefairy.asm"
 INCLUDE "data/pokemon/base_stats/clefable.asm"
 INCLUDE "data/pokemon/base_stats/jigglypuff.asm"
 INCLUDE "data/pokemon/base_stats/wigglytuff.asm"
-INCLUDE "data/pokemon/base_stats/mikon.asm"
+INCLUDE "data/pokemon/base_stats/sandshrew.asm"
+INCLUDE "data/pokemon/base_stats/sandslash.asm"
+INCLUDE "data/pokemon/base_stats/sandslasha.asm"
+INCLUDE "data/pokemon/base_stats/ekans.asm"
+INCLUDE "data/pokemon/base_stats/arbok.asm"
+INCLUDE "data/pokemon/base_stats/vulpiii.asm"
 INCLUDE "data/pokemon/base_stats/vulpix.asm"
 INCLUDE "data/pokemon/base_stats/ninetales.asm"
 INCLUDE "data/pokemon/base_stats/ninetalesa.asm"
-INCLUDE "data/pokemon/base_stats/growlithe.asm"
-INCLUDE "data/pokemon/base_stats/arcanine.asm"
-INCLUDE "data/pokemon/base_stats/arcanineh.asm"
 INCLUDE "data/pokemon/base_stats/mankey.asm"
 INCLUDE "data/pokemon/base_stats/primeape.asm"
 INCLUDE "data/pokemon/base_stats/annihilape.asm"
@ -87,16 +86,14 @@ INCLUDE "data/pokemon/base_stats/bellossom.asm"
 INCLUDE "data/pokemon/base_stats/bellsprout.asm"
 INCLUDE "data/pokemon/base_stats/weepinbell.asm"
 INCLUDE "data/pokemon/base_stats/victreebel.asm"
-INCLUDE "data/pokemon/base_stats/tsubomitto.asm"
+INCLUDE "data/pokemon/base_stats/bellignan.asm"
 INCLUDE "data/pokemon/base_stats/magikarp.asm"
 INCLUDE "data/pokemon/base_stats/gyarados.asm"
-INCLUDE "data/pokemon/base_stats/gyopin.asm"
+INCLUDE "data/pokemon/base_stats/orfry.asm"
 INCLUDE "data/pokemon/base_stats/goldeen.asm"
 INCLUDE "data/pokemon/base_stats/seaking.asm"
 INCLUDE "data/pokemon/base_stats/venonat.asm"
 INCLUDE "data/pokemon/base_stats/venomoth.asm"
-INCLUDE "data/pokemon/base_stats/cheep.asm"
-INCLUDE "data/pokemon/base_stats/jabetta.asm"
 INCLUDE "data/pokemon/base_stats/psyduck.asm"
 INCLUDE "data/pokemon/base_stats/weirduck.asm"
 INCLUDE "data/pokemon/base_stats/golduck.asm"
@ -107,8 +104,14 @@ INCLUDE "data/pokemon/base_stats/politoed.asm"
 INCLUDE "data/pokemon/base_stats/abra.asm"
 INCLUDE "data/pokemon/base_stats/kadabra.asm"
 INCLUDE "data/pokemon/base_stats/alakazam.asm"
+INCLUDE "data/pokemon/base_stats/growlithe.asm"
+INCLUDE "data/pokemon/base_stats/arcanine.asm"
+INCLUDE "data/pokemon/base_stats/arcanineh.asm"
 INCLUDE "data/pokemon/base_stats/lickitung.asm"
 INCLUDE "data/pokemon/base_stats/lickilicky.asm"
+INCLUDE "data/pokemon/base_stats/farfetchd.asm"
+INCLUDE "data/pokemon/base_stats/luxwan.asm"
+INCLUDE "data/pokemon/base_stats/sirfetchd.asm"
 INCLUDE "data/pokemon/base_stats/drowzee.asm"
 INCLUDE "data/pokemon/base_stats/hypno.asm"
 INCLUDE "data/pokemon/base_stats/diglett.asm"
@ -118,9 +121,6 @@ INCLUDE "data/pokemon/base_stats/wiglett.asm"
 INCLUDE "data/pokemon/base_stats/wugtrio.asm"
 INCLUDE "data/pokemon/base_stats/onix.asm"
 INCLUDE "data/pokemon/base_stats/steelix.asm"
-INCLUDE "data/pokemon/base_stats/kotora.asm"
-INCLUDE "data/pokemon/base_stats/gaotora.asm"
-INCLUDE "data/pokemon/base_stats/gorotora.asm"
 INCLUDE "data/pokemon/base_stats/voltorb.asm"
 INCLUDE "data/pokemon/base_stats/electrode.asm"
 INCLUDE "data/pokemon/base_stats/electrodeh.asm"
@ -130,16 +130,16 @@ INCLUDE "data/pokemon/base_stats/toedscool.asm"
 INCLUDE "data/pokemon/base_stats/toedscruel.asm"
 INCLUDE "data/pokemon/base_stats/blottle.asm"
 INCLUDE "data/pokemon/base_stats/pendraken.asm"
-INCLUDE "data/pokemon/base_stats/ribbito.asm"
-INCLUDE "data/pokemon/base_stats/croakozuna.asm"
 INCLUDE "data/pokemon/base_stats/magnemite.asm"
-INCLUDE "data/pokemon/base_stats/magnetite.asm"
 INCLUDE "data/pokemon/base_stats/magneton.asm"
 INCLUDE "data/pokemon/base_stats/magnezone.asm"
+INCLUDE "data/pokemon/base_stats/cheep.asm"
+INCLUDE "data/pokemon/base_stats/jabetta.asm"
+INCLUDE "data/pokemon/base_stats/ribbito.asm"
+INCLUDE "data/pokemon/base_stats/croakozuna.asm"
 INCLUDE "data/pokemon/base_stats/machop.asm"
 INCLUDE "data/pokemon/base_stats/machoke.asm"
 INCLUDE "data/pokemon/base_stats/machamp.asm"
-INCLUDE "data/pokemon/base_stats/crocky.asm"
 INCLUDE "data/pokemon/base_stats/krabby.asm"
 INCLUDE "data/pokemon/base_stats/kingler.asm"
 INCLUDE "data/pokemon/base_stats/slowpoke.asm"
@ -147,15 +147,12 @@ INCLUDE "data/pokemon/base_stats/slowbro.asm"
 INCLUDE "data/pokemon/base_stats/slowbrog.asm"
 INCLUDE "data/pokemon/base_stats/slowking.asm"
 INCLUDE "data/pokemon/base_stats/slowkingg.asm"
-INCLUDE "data/pokemon/base_stats/puchikoon.asm"
+INCLUDE "data/pokemon/base_stats/gavillain.asm"
+INCLUDE "data/pokemon/base_stats/kolta.asm"
 INCLUDE "data/pokemon/base_stats/ponyta.asm"
 INCLUDE "data/pokemon/base_stats/rapidash.asm"
 INCLUDE "data/pokemon/base_stats/rapidashg.asm"
-INCLUDE "data/pokemon/base_stats/deer.asm"
-INCLUDE "data/pokemon/base_stats/monja.asm"
-INCLUDE "data/pokemon/base_stats/tangela.asm"
-INCLUDE "data/pokemon/base_stats/tangrowth.asm"
-INCLUDE "data/pokemon/base_stats/barunda.asm"
+INCLUDE "data/pokemon/base_stats/balumba.asm"
 INCLUDE "data/pokemon/base_stats/gastly.asm"
 INCLUDE "data/pokemon/base_stats/haunter.asm"
 INCLUDE "data/pokemon/base_stats/gengar.asm"
@ -163,9 +160,6 @@ INCLUDE "data/pokemon/base_stats/cubone.asm"
 INCLUDE "data/pokemon/base_stats/marowak.asm"
 INCLUDE "data/pokemon/base_stats/marowaka.asm"
 INCLUDE "data/pokemon/base_stats/guardia.asm"
-INCLUDE "data/pokemon/base_stats/farfetchd.asm"
-INCLUDE "data/pokemon/base_stats/madaamu.asm"
-INCLUDE "data/pokemon/base_stats/sirfetchd.asm"
 INCLUDE "data/pokemon/base_stats/doduo.asm"
 INCLUDE "data/pokemon/base_stats/dodrio.asm"
 INCLUDE "data/pokemon/base_stats/grimer.asm"
@ -174,27 +168,25 @@ INCLUDE "data/pokemon/base_stats/muka.asm"
 INCLUDE "data/pokemon/base_stats/koffing.asm"
 INCLUDE "data/pokemon/base_stats/weezing.asm"
 INCLUDE "data/pokemon/base_stats/weezingg.asm"
-INCLUDE "data/pokemon/base_stats/ditto.asm"
-INCLUDE "data/pokemon/base_stats/animon.asm"
-INCLUDE "data/pokemon/base_stats/mrmime.asm"
-INCLUDE "data/pokemon/base_stats/mrrime.asm"
-INCLUDE "data/pokemon/base_stats/cactus.asm"
+INCLUDE "data/pokemon/base_stats/tangela.asm"
+INCLUDE "data/pokemon/base_stats/tangrowth.asm"
+INCLUDE "data/pokemon/base_stats/ramoose.asm"
 INCLUDE "data/pokemon/base_stats/hitmonlee.asm"
 INCLUDE "data/pokemon/base_stats/hitmonchan.asm"
 INCLUDE "data/pokemon/base_stats/hitmontop.asm"
 INCLUDE "data/pokemon/base_stats/shellder.asm"
 INCLUDE "data/pokemon/base_stats/cloyster.asm"
-INCLUDE "data/pokemon/base_stats/taaban.asm"
+INCLUDE "data/pokemon/base_stats/disturban.asm"
 INCLUDE "data/pokemon/base_stats/staryu.asm"
 INCLUDE "data/pokemon/base_stats/starmie.asm"
 INCLUDE "data/pokemon/base_stats/seel.asm"
 INCLUDE "data/pokemon/base_stats/dewgong.asm"
-INCLUDE "data/pokemon/base_stats/blastyke.asm"
-INCLUDE "data/pokemon/base_stats/blastoise.asm"
 INCLUDE "data/pokemon/base_stats/horsea.asm"
 INCLUDE "data/pokemon/base_stats/seadra.asm"
 INCLUDE "data/pokemon/base_stats/kingdra.asm"
-INCLUDE "data/pokemon/base_stats/jagg.asm"
+INCLUDE "data/pokemon/base_stats/blastyke.asm"
+INCLUDE "data/pokemon/base_stats/blastoise.asm"
+INCLUDE "data/pokemon/base_stats/sharpoon.asm"
 INCLUDE "data/pokemon/base_stats/exeggcute.asm"
 INCLUDE "data/pokemon/base_stats/exeggutor.asm"
 INCLUDE "data/pokemon/base_stats/exeggutora.asm"
@ -205,18 +197,18 @@ INCLUDE "data/pokemon/base_stats/scyther.asm"
 INCLUDE "data/pokemon/base_stats/scizor.asm"
 INCLUDE "data/pokemon/base_stats/kleavor.asm"
 INCLUDE "data/pokemon/base_stats/pinsir.asm"
-INCLUDE "data/pokemon/base_stats/purakkusu.asm"
+INCLUDE "data/pokemon/base_stats/tricules.asm"
 INCLUDE "data/pokemon/base_stats/kangaskhan.asm"
 INCLUDE "data/pokemon/base_stats/trampel.asm"
 INCLUDE "data/pokemon/base_stats/tauros.asm"
 INCLUDE "data/pokemon/base_stats/taurosp.asm"
-INCLUDE "data/pokemon/base_stats/taurospa.asm"
 INCLUDE "data/pokemon/base_stats/taurospb.asm"
+INCLUDE "data/pokemon/base_stats/taurospa.asm"
 INCLUDE "data/pokemon/base_stats/chansey.asm"
 INCLUDE "data/pokemon/base_stats/blissey.asm"
-INCLUDE "data/pokemon/base_stats/skimper.asm"
-INCLUDE "data/pokemon/base_stats/bawligua.asm"
-INCLUDE "data/pokemon/base_stats/cryithan.asm"
+INCLUDE "data/pokemon/base_stats/cactormus.asm"
+INCLUDE "data/pokemon/base_stats/mrmime.asm"
+INCLUDE "data/pokemon/base_stats/mrrime.asm"
 INCLUDE "data/pokemon/base_stats/jynx.asm"
 INCLUDE "data/pokemon/base_stats/buu.asm"
 INCLUDE "data/pokemon/base_stats/electabuzz.asm"
@ -224,6 +216,8 @@ INCLUDE "data/pokemon/base_stats/electivire.asm"
 INCLUDE "data/pokemon/base_stats/magmar.asm"
 INCLUDE "data/pokemon/base_stats/magmortar.asm"
 INCLUDE "data/pokemon/base_stats/lapras.asm"
+INCLUDE "data/pokemon/base_stats/ditto.asm"
+INCLUDE "data/pokemon/base_stats/mimmeo.asm"
 INCLUDE "data/pokemon/base_stats/porygon.asm"
 INCLUDE "data/pokemon/base_stats/porygon2.asm"
 INCLUDE "data/pokemon/base_stats/porygonz.asm"
@ -233,11 +227,14 @@ INCLUDE "data/pokemon/base_stats/kabuto.asm"
 INCLUDE "data/pokemon/base_stats/kabutops.asm"
 INCLUDE "data/pokemon/base_stats/aerodactyl.asm"
 INCLUDE "data/pokemon/base_stats/decilla.asm"
-INCLUDE "data/pokemon/base_stats/gyaoon.asm"
-INCLUDE "data/pokemon/base_stats/omega.asm"
+INCLUDE "data/pokemon/base_stats/gawarhed.asm"
+INCLUDE "data/pokemon/base_stats/omegadge.asm"
 INCLUDE "data/pokemon/base_stats/snorlax.asm"
 INCLUDE "data/pokemon/base_stats/screamtail.asm"
 INCLUDE "data/pokemon/base_stats/sandyshocks.asm"
+INCLUDE "data/pokemon/base_stats/squeamata.asm"
+INCLUDE "data/pokemon/base_stats/ministare.asm"
+INCLUDE "data/pokemon/base_stats/iguanarch.asm"
 INCLUDE "data/pokemon/base_stats/dratini.asm"
 INCLUDE "data/pokemon/base_stats/dragonair.asm"
 INCLUDE "data/pokemon/base_stats/dragonite.asm"
--- a/data/pokemon/base_stats/balumba.asm
+++ b/data/pokemon/base_stats/balumba.asm
@ -1,4 +1,4 @@
-	db DEX_BARUNDA ; pokedex id
+	db DEX_BALUMBA ; pokedex id

 	db  90,  50,  30, 125, 100
 	;   hp  atk  def  spd  spc
@ -7,8 +7,8 @@
 	db 45 ; catch rate
 	db 137 ; base exp

-	INCBIN "gfx/pokemon/front/barunda.pic", 0, 1 ; sprite dimensions
-	dw BarundaPicFront, BarundaPicBack
+	INCBIN "gfx/pokemon/front/balumba.pic", 0, 1 ; sprite dimensions
+	dw BalumbaPicFront, BalumbaPicBack

 	db FAIRY_WIND, GROWL, DRAININGKISS, NO_MOVE ; level 1 learnset
 	db GROWTH_FAST ; growth rate
@ -22,5 +22,5 @@
 	     FLASH
 	; end

-	db BANK(BarundaPicFront)
-	assert BANK(BarundaPicFront) == BANK(BarundaPicBack)
+	db BANK(BalumbaPicFront)
+	assert BANK(BalumbaPicFront) == BANK(BalumbaPicBack)
--- a/data/pokemon/base_stats/tsubomitto.asm
+++ b/data/pokemon/base_stats/tsubomitto.asm
@ -1,4 +1,4 @@
-	db DEX_TSUBOMITTO ; pokedex id
+	db DEX_BELLIGNAN ; pokedex id

 	db  80, 120,  65,  70,  85
 	;   hp  atk  def  spd  spc
@ -7,8 +7,8 @@
 	db 45 ; catch rate
 	db 191 ; base exp

-	INCBIN "gfx/pokemon/front/tsubomitto.pic", 0, 1 ; sprite dimensions
-	dw TsubomittoPicFront, TsubomittoPicBack
+	INCBIN "gfx/pokemon/front/bellignan.pic", 0, 1 ; sprite dimensions
+	dw BellignanPicFront, BellignanPicBack

 	db SLEEP_POWDER, RAZOR_LEAF, LOVELY_KISS, ACID ; level 1 learnset
 	db GROWTH_MEDIUM_SLOW ; growth rate
@ -20,5 +20,5 @@
 	     CUT
 	; end

-	db BANK(TsubomittoPicFront)
-	assert BANK(TsubomittoPicFront) == BANK(TsubomittoPicBack)
+	db BANK(BellignanPicFront)
+	assert BANK(BellignanPicFront) == BANK(BellignanPicBack)
--- a/data/pokemon/base_stats/cactormus.asm
+++ b/data/pokemon/base_stats/cactormus.asm
@ -1,4 +1,4 @@
-	db DEX_CACTUS ; pokedex id
+	db DEX_CACTORMUS ; pokedex id

 	db  60,  95, 100,  90,  75
 	;   hp  atk  def  spd  spc
@ -7,8 +7,8 @@
 	db 45 ; catch rate
 	db 177 ; base exp

-	INCBIN "gfx/pokemon/front/cactus.pic", 0, 1 ; sprite dimensions
-	dw CactusPicFront, CactusPicBack
+	INCBIN "gfx/pokemon/front/cactormus.pic", 0, 1 ; sprite dimensions
+	dw CactormusPicFront, CactormusPicBack

 	db BARRAGE, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
@ -21,5 +21,5 @@
 	     TRI_ATTACK,   SUBSTITUTE
 	; end

-	db BANK(CactusPicFront)
-	assert BANK(CactusPicFront) == BANK(CactusPicBack)
+	db BANK(CactormusPicFront)
+	assert BANK(CactormusPicFront) == BANK(CactormusPicBack)
--- a/data/pokemon/base_stats/clefable.asm
+++ b/data/pokemon/base_stats/clefable.asm
@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/clefable.pic", 0, 1 ; sprite dimensions
 	dw ClefablePicFront, ClefablePicBack

-	db THUNDER_WAVE, BODY_SLAM, BLIZZARD, THUNDERBOLT ; level 1 learnset - used for trainers
+	db SING, DOUBLESLAP, MINIMIZE, METRONOME ; level 1 learnset
 	db GROWTH_FAST ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/base_stats/coinpur.asm
+++ b/data/pokemon/base_stats/coinpur.asm
@ -1,4 +1,4 @@
-	db DEX_KONYA ; pokedex id
+	db DEX_COINPUR ; pokedex id

 	db  35,  40,  30,  85,  35
 	;   hp  atk  def  spd  spc
@ -7,8 +7,8 @@
 	db 255 ; catch rate
 	db 53 ; base exp

-	INCBIN "gfx/pokemon/front/konya.pic", 0, 1 ; sprite dimensions
-	dw KonyaPicFront, KonyaPicBack
+	INCBIN "gfx/pokemon/front/coinpur.pic", 0, 1 ; sprite dimensions
+	dw CoinpurPicFront, CoinpurPicBack

 	db SCRATCH, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
@ -20,5 +20,5 @@
 	     REST,         SUBSTITUTE
 	; end

-	db BANK(KonyaPicFront)
-	assert BANK(KonyaPicFront) == BANK(KonyaPicBack)
+	db BANK(CoinpurPicFront)
+	assert BANK(CoinpurPicFront) == BANK(CoinpurPicBack)
--- a/data/pokemon/base_stats/disturban.asm
+++ b/data/pokemon/base_stats/disturban.asm
@ -1,4 +1,4 @@
-	db DEX_TAABAN ; pokedex id
+	db DEX_DISTURBAN ; pokedex id

 	db  70, 125, 145,  50,  70
 	;   hp  atk  def  spd  spc
@ -7,8 +7,8 @@
 	db 60 ; catch rate
 	db 203 ; base exp

-	INCBIN "gfx/pokemon/front/taaban.pic", 0, 1 ; sprite dimensions
-	dw TaabanPicFront, TaabanPicBack
+	INCBIN "gfx/pokemon/front/disturban.pic", 0, 1 ; sprite dimensions
+	dw DisturbanPicFront, DisturbanPicBack

 	db TACKLE, WITHDRAW, BITE, WATER_GUN ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
@ -21,5 +21,5 @@
 	     EXPLOSION,    TRI_ATTACK,   SUBSTITUTE,   SURF, 	     STRENGTH
 	; end

-	db BANK(TaabanPicFront)
-	assert BANK(TaabanPicFront) == BANK(TaabanPicBack)
+	db BANK(DisturbanPicFront)
+	assert BANK(DisturbanPicFront) == BANK(DisturbanPicBack)
--- a/data/pokemon/base_stats/gavillain.asm
+++ b/data/pokemon/base_stats/gavillain.asm
@ -1,26 +1,26 @@
-	db DEX_CROCKY ; pokedex id
+	db DEX_GAVILLAIN ; pokedex id

-	db  80,  90,  75,  95,  80
+	db  80,  80,  75,  95,  90
 	;   hp  atk  def  spd  spc

-	db DRAGON, DRAGON ; type
+	db DRAGON, ELECTRIC ; type
 	db 45 ; catch rate
 	db 167 ; base exp

-	INCBIN "gfx/pokemon/front/crocky.pic", 0, 1 ; sprite dimensions
-	dw CrockyPicFront, CrockyPicBack
+	INCBIN "gfx/pokemon/front/gavillain.pic", 0, 1 ; sprite dimensions
+	dw GavillainPicFront, GavillainPicBack

 	db SCRATCH, LEER, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_FAST ; growth rate

 	; tm/hm learnset
 	tmhm TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  BUBBLEBEAM,   \
-	     WATER_GUN,    ICE_BEAM,     BLIZZARD,     HYPER_BEAM,   SUBMISSION,   \
-	     COUNTER,      SEISMIC_TOSS, RAGE,         DRAGON_RAGE,  EARTHQUAKE,   \
+	     WATER_GUN,    HYPER_BEAM,   SUBMISSION,   COUNTER,      SEISMIC_TOSS, \
+	     RAGE,         DRAGON_RAGE,  THUNDERBOLT,  THUNDER,      EARTHQUAKE,   \
 	     FISSURE,      DIG,          MIMIC,        DOUBLE_TEAM,  BIDE,         \
 	     FIRE_BLAST,   SWIFT,        SKULL_BASH,   REST,         ROCK_SLIDE,   \
 	     SUBSTITUTE,   CUT,          FLASH
 	; end

-	db BANK(CrockyPicFront)
-	assert BANK(CrockyPicFront) == BANK(CrockyPicBack)
+	db BANK(GavillainPicFront)
+	assert BANK(GavillainPicFront) == BANK(GavillainPicBack)
--- a/data/pokemon/base_stats/gawarhed.asm
+++ b/data/pokemon/base_stats/gawarhed.asm
@ -1,4 +1,4 @@
-	db DEX_GYAOON ; pokedex id
+	db DEX_GAWARHED ; pokedex id

 	db 101, 124, 100,  30,  95
 	;   hp  atk  def  spd  spc
@ -7,8 +7,8 @@
 	db 45 ; catch rate
 	db 204 ; base exp

-	INCBIN "gfx/pokemon/front/gyaoon.pic", 0, 1 ; sprite dimensions
-	dw GyaoonPicFront, GyaoonPicBack
+	INCBIN "gfx/pokemon/front/gawarhed.pic", 0, 1 ; sprite dimensions
+	dw GawarhedPicFront, GawarhedPicBack

 	db SUBSTITUTE, GROWL, TACKLE, NO_MOVE ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
@ -22,5 +22,5 @@
 		 ROCK_SLIDE,   SUBSTITUTE,   SURF,         STRENGTH
 	; end

-	db BANK(GyaoonPicFront)
-	assert BANK(GyaoonPicFront) == BANK(GyaoonPicBack)
+	db BANK(GawarhedPicFront)
+	assert BANK(GawarhedPicFront) == BANK(GawarhedPicBack)
--- a/data/pokemon/base_stats/iguanarch.asm
+++ b/data/pokemon/base_stats/iguanarch.asm
@ -1,16 +1,16 @@
-	db DEX_CRYITHAN ; pokedex id
+	db DEX_IGUANARCH ; pokedex id

-	db  92,  93,  76, 108, 121
+	db 102,  93,  76, 108, 121
 	;   hp  atk  def  spd  spc

 	db DRAGON, DRAGON ; type
 	db 9 ; catch rate
 	db 210 ; base exp

-	INCBIN "gfx/pokemon/front/cryithan.pic", 0, 1 ; sprite dimensions
-	dw CryithanPicFront, CryithanPicBack
+	INCBIN "gfx/pokemon/front/iguanarch.pic", 0, 1 ; sprite dimensions
+	dw IguanarchPicFront, IguanarchPicBack

-	db SCRATCH, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset
+	db SCRATCH, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_SLOW ; growth rate

 	; tm/hm learnset
@ -21,5 +21,5 @@
 	     CUT,          SURF,         STRENGTH
 	; end

-	db BANK(CryithanPicFront)
-	assert BANK(CryithanPicFront) == BANK(CryithanPicBack)
+	db BANK(IguanarchPicFront)
+	assert BANK(IguanarchPicFront) == BANK(IguanarchPicBack)
--- a/data/pokemon/base_stats/puchikoon.asm
+++ b/data/pokemon/base_stats/puchikoon.asm
@ -1,4 +1,4 @@
-	db DEX_PUCHIKOON ; pokedex id
+	db DEX_KOLTA ; pokedex id

 	db  30,  65,  35,  70,  45
 	;   hp  atk  def  spd  spc
@ -7,8 +7,8 @@
 	db 255 ; catch rate
 	db 88 ; base exp

-	INCBIN "gfx/pokemon/front/puchikoon.pic", 0, 1 ; sprite dimensions
-	dw PuchikoonPicFront, PuchikoonPicBack
+	INCBIN "gfx/pokemon/front/kolta.pic", 0, 1 ; sprite dimensions
+	dw KoltaPicFront, KoltaPicBack

 	db EMBER, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
@ -19,5 +19,5 @@
 	     FIRE_BLAST,   SWIFT,        SKULL_BASH,   REST,         SUBSTITUTE
 	; end

-	db BANK(PuchikoonPicFront)
-	assert BANK(PuchikoonPicFront) == BANK(PuchikoonPicBack)
+	db BANK(KoltaPicFront)
+	assert BANK(KoltaPicFront) == BANK(KoltaPicBack)
--- a/data/pokemon/base_stats/madaamu.asm
+++ b/data/pokemon/base_stats/madaamu.asm
@ -1,4 +1,4 @@
-	db DEX_MADAAMU ; pokedex id
+	db DEX_LUXWAN ; pokedex id

 	db  72, 105,  75,  70,  63
 	;   hp  atk  def  spd  spc
@ -7,8 +7,8 @@
 	db 25 ; catch rate
 	db 196 ; base exp

-	INCBIN "gfx/pokemon/front/madaamu.pic", 0, 1 ; sprite dimensions
-	dw MadaamuPicFront, MadaamuPicBack
+	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 GROWTH_MEDIUM_FAST ; growth rate
@ -21,5 +21,5 @@
 	     FLY
 	; end

-	db BANK(MadaamuPicFront)
-	assert BANK(MadaamuPicFront) == BANK(MadaamuPicBack)
+	db BANK(LuxwanPicFront)
+	assert BANK(LuxwanPicFront) == BANK(LuxwanPicBack)
--- a/data/pokemon/base_stats/mimmeo.asm
+++ b/data/pokemon/base_stats/mimmeo.asm
@ -1,4 +1,4 @@
-	db DEX_ANIMON ; pokedex id
+	db DEX_MIMMEO ; pokedex id

 	db 100,  55,  50,  150,  50
 	;   hp  atk  def  spd  spc
@ -7,8 +7,8 @@
 	db 35 ; catch rate
 	db 161 ; base exp

-	INCBIN "gfx/pokemon/front/animon.pic", 0, 1 ; sprite dimensions
-	dw AnimonPicFront, AnimonPicBack
+	INCBIN "gfx/pokemon/front/mimmeo.pic", 0, 1 ; sprite dimensions
+	dw MimmeoPicFront, MimmeoPicBack

 	db TRANSFORM, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
@ -17,5 +17,5 @@
 	tmhm
 	; end

-	db BANK(AnimonPicFront)
-	assert BANK(AnimonPicFront) == BANK(AnimonPicBack)
+	db BANK(MimmeoPicFront)
+	assert BANK(MimmeoPicFront) == BANK(MimmeoPicBack)
--- a/data/pokemon/base_stats/ministare.asm
+++ b/data/pokemon/base_stats/ministare.asm
@ -1,4 +1,4 @@
-	db DEX_BAWLIGUA ; pokedex id
+	db DEX_MINISTARE ; pokedex id

 	db  72,  53,  46,  98,  81
 	;   hp  atk  def  spd  spc
@ -7,10 +7,10 @@
 	db 45 ; catch rate
 	db 144 ; base exp

-	INCBIN "gfx/pokemon/front/bawligua.pic", 0, 1 ; sprite dimensions
-	dw BawliguaPicFront, BawliguaPicBack
+	INCBIN "gfx/pokemon/front/ministare.pic", 0, 1 ; sprite dimensions
+	dw MinistarePicFront, MinistarePicBack

-	db SCRATCH, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset
+	db SCRATCH, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_SLOW ; growth rate

 	; tm/hm learnset
@ -21,5 +21,5 @@
 	     SURF,         STRENGTH
 	; end

-	db BANK(BawliguaPicFront)
-	assert BANK(BawliguaPicFront) == BANK(BawliguaPicBack)
+	db BANK(MinistarePicFront)
+	assert BANK(MinistarePicFront) == BANK(MinistarePicBack)
--- a/data/pokemon/base_stats/omegadge.asm
+++ b/data/pokemon/base_stats/omegadge.asm
@ -1,4 +1,4 @@
-	db DEX_OMEGA ; pokedex id
+	db DEX_OMEGADGE ; pokedex id

 	db 101, 106, 120,  25,  95
 	;   hp  atk  def  spd  spc
@ -7,8 +7,8 @@
 	db 25 ; catch rate
 	db 204 ; base exp

-	INCBIN "gfx/pokemon/front/omega.pic", 0, 1 ; sprite dimensions
-	dw OmegaPicFront, OmegaPicBack
+	INCBIN "gfx/pokemon/front/omegadge.pic", 0, 1 ; sprite dimensions
+	dw OmegadgePicFront, OmegadgePicBack

 	db SUPERSONIC, METAL_SOUND, TACKLE, MAGNET_BOMB ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
@ -22,5 +22,5 @@
           TRI_ATTACK,   SUBSTITUTE,   STRENGTH,     FLASH
 	; end

-	db BANK(OmegaPicFront)
-	assert BANK(OmegaPicFront) == BANK(OmegaPicBack)
+	db BANK(OmegadgePicFront)
+	assert BANK(OmegadgePicFront) == BANK(OmegadgePicBack)
--- a/data/pokemon/base_stats/gyopin.asm
+++ b/data/pokemon/base_stats/gyopin.asm
@ -1,4 +1,4 @@
-	db DEX_GYOPIN ; pokedex id
+	db DEX_ORFRY ; pokedex id

 	db  35,  57,  50,  53,  40
 	;   hp  atk  def  spd  spc
@ -7,8 +7,8 @@
 	db 255 ; catch rate
 	db 57 ; base exp

-	INCBIN "gfx/pokemon/front/gyopin.pic", 0, 1 ; sprite dimensions
-	dw GyopinPicFront, GyopinPicBack
+	INCBIN "gfx/pokemon/front/orfry.pic", 0, 1 ; sprite dimensions
+	dw OrfryPicFront, OrfryPicBack

 	db PECK, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
@ -20,5 +20,5 @@
 	     SUBSTITUTE,   SURF
 	; end

-	db BANK(GyopinPicFront)
-	assert BANK(GyopinPicFront) == BANK(GyopinPicBack)
+	db BANK(OrfryPicFront)
+	assert BANK(OrfryPicFront) == BANK(OrfryPicBack)
--- a/data/pokemon/base_stats/kasanagi.asm
+++ b/data/pokemon/base_stats/kasanagi.asm
@ -1,4 +1,4 @@
-	db DEX_KASANAGI ; pokedex id
+	db DEX_PUPAL ; pokedex id

 	db  45,  20,  50,  40,  30
 	;   hp  atk  def  spd  spc
@ -7,8 +7,8 @@
 	db 120 ; catch rate
 	db 73 ; base exp

-	INCBIN "gfx/pokemon/front/kasanagi.pic", 0, 1 ; sprite dimensions
-	dw KasanagiPicFront, KasanagiPicBack
+	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 GROWTH_MEDIUM_FAST ; growth rate
@ -17,5 +17,5 @@
 	tmhm
 	; end

-	db BANK(KasanagiPicFront)
-	assert BANK(KasanagiPicFront) == BANK(KasanagiPicBack)
+	db BANK(PupalPicFront)
+	assert BANK(PupalPicFront) == BANK(PupalPicBack)
--- a/data/pokemon/base_stats/ramoose.asm
+++ b/data/pokemon/base_stats/ramoose.asm
@ -1,4 +1,4 @@
-	db DEX_DEER ; pokedex id
+	db DEX_RAMOOSE ; pokedex id

 	db  85, 110,  85,  60,  90
 	;   hp  atk  def  spd  spc
@ -7,8 +7,8 @@
 	db 45 ; catch rate
 	db 165 ; base exp

-	INCBIN "gfx/pokemon/front/deer.pic", 0, 1 ; sprite dimensions
-	dw DeerPicFront, DeerPicBack
+	INCBIN "gfx/pokemon/front/ramoose.pic", 0, 1 ; sprite dimensions
+	dw RamoosePicFront, RamoosePicBack

 	db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
@ -21,5 +21,5 @@
 	     FLASH
 	; end

-	db BANK(DeerPicFront)
-	assert BANK(DeerPicFront) == BANK(DeerPicBack)
+	db BANK(RamoosePicFront)
+	assert BANK(RamoosePicFront) == BANK(RamoosePicBack)
--- a/data/pokemon/base_stats/sharpoon.asm
+++ b/data/pokemon/base_stats/sharpoon.asm
@ -1,4 +1,4 @@
-	db DEX_JAGG ; pokedex id
+	db DEX_SHARPOON ; pokedex id

 	db  80, 115, 100,  60,  85
 	;   hp  atk  def  spd  spc
@ -7,8 +7,8 @@
 	db 45 ; catch rate
 	db 204 ; base exp

-	INCBIN "gfx/pokemon/front/jagg.pic", 0, 1 ; sprite dimensions
-	dw JaggPicFront, JaggPicBack
+	INCBIN "gfx/pokemon/front/sharpoon.pic", 0, 1 ; sprite dimensions
+	dw SharpoonPicFront, SharpoonPicBack

 	db BITE, LEER, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
@ -20,5 +20,5 @@
 	     BIDE,         SKULL_BASH,   REST,         SUBSTITUTE,   SURF
 	; end

-	db BANK(JaggPicFront)
-	assert BANK(JaggPicFront) == BANK(JaggPicBack)
+	db BANK(SharpoonPicFront)
+	assert BANK(SharpoonPicFront) == BANK(SharpoonPicBack)
--- a/data/pokemon/base_stats/squeamata.asm
+++ b/data/pokemon/base_stats/squeamata.asm
@ -1,4 +1,4 @@
-	db DEX_SKIMPER ; pokedex id
+	db DEX_SQUEAMATA ; pokedex id

 	db  62,  43,  36,  88,  71
 	;   hp  atk  def  spd  spc
@ -7,10 +7,10 @@
 	db 60 ; catch rate
 	db 67 ; base exp

-	INCBIN "gfx/pokemon/front/skimper.pic", 0, 1 ; sprite dimensions
-	dw SkimperPicFront, SkimperPicBack
+	INCBIN "gfx/pokemon/front/squeamata.pic", 0, 1 ; sprite dimensions
+	dw SqueamataPicFront, SqueamataPicBack

-	db SCRATCH, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset
+	db SCRATCH, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_SLOW ; growth rate

 	; tm/hm learnset
@ -21,5 +21,5 @@
 	     SURF
 	; end

-	db BANK(SkimperPicFront)
-	assert BANK(SkimperPicFront) == BANK(SkimperPicBack)
+	db BANK(SqueamataPicFront)
+	assert BANK(SqueamataPicFront) == BANK(SqueamataPicBack)
--- a/data/pokemon/base_stats/purakkusu.asm
+++ b/data/pokemon/base_stats/purakkusu.asm
@ -1,4 +1,4 @@
-	db DEX_PURAKKUSU ; pokedex id
+	db DEX_TRICULES ; pokedex id

 	db  65, 125, 140,  85,  55
 	;   hp  atk  def  spd  spc
@ -7,8 +7,8 @@
 	db 25 ; catch rate
 	db 209 ; base exp

-	INCBIN "gfx/pokemon/front/purakkusu.pic", 0, 1 ; sprite dimensions
-	dw PurakkusuPicFront, PurakkusuPicBack
+	INCBIN "gfx/pokemon/front/tricules.pic", 0, 1 ; sprite dimensions
+	dw TriculesPicFront, TriculesPicBack

 	db VICEGRIP, HARDEN, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
@ -20,5 +20,5 @@
 	     REST,         SUBSTITUTE,   CUT,          STRENGTH
 	; end

-	db BANK(PurakkusuPicFront)
-	assert BANK(PurakkusuPicFront) == BANK(PurakkusuPicBack)
+	db BANK(TriculesPicFront)
+	assert BANK(TriculesPicFront) == BANK(TriculesPicBack)
--- a/data/pokemon/base_stats/unused/betobebii.asm
+++ b/data/pokemon/base_stats/unused/betobebii.asm
--- a/data/pokemon/base_stats/unused/bittybat.asm
+++ b/data/pokemon/base_stats/unused/bittybat.asm
--- a/data/pokemon/base_stats/unused/hinaazu.asm
+++ b/data/pokemon/base_stats/unused/hinaazu.asm
--- a/data/pokemon/base_stats/unused/magnetite.asm
+++ b/data/pokemon/base_stats/unused/magnetite.asm
--- a/data/pokemon/base_stats/unused/monja.asm
+++ b/data/pokemon/base_stats/unused/monja.asm
--- a/data/pokemon/base_stats/unused/pudi.asm
+++ b/data/pokemon/base_stats/unused/pudi.asm
--- a/data/pokemon/base_stats/vulpiii.asm
+++ b/data/pokemon/base_stats/vulpiii.asm
@ -1,4 +1,4 @@
-	db DEX_MIKON ; pokedex id
+	db DEX_VULPIII ; pokedex id

 	db  28,  31,  30,  60,  60
 	;   hp  atk  def  spd  spc
@ -7,8 +7,8 @@
 	db 255 ; catch rate
 	db 53 ; base exp

-	INCBIN "gfx/pokemon/front/mikon.pic", 0, 1 ; sprite dimensions
-	dw MikonPicFront, MikonPicBack
+	INCBIN "gfx/pokemon/front/vulpiii.pic", 0, 1 ; sprite dimensions
+	dw VulpiiiPicFront, VulpiiiPicBack

 	db EMBER, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
@ -19,5 +19,5 @@
 	     FIRE_BLAST,   SWIFT,        SKULL_BASH,   REST,         SUBSTITUTE
 	; end

-	db BANK(MikonPicFront)
-	assert BANK(MikonPicFront) == BANK(MikonPicBack)
+	db BANK(VulpiiiPicFront)
+	assert BANK(VulpiiiPicFront) == BANK(VulpiiiPicBack)
--- a/data/pokemon/base_stats/wigglytuff.asm
+++ b/data/pokemon/base_stats/wigglytuff.asm
@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/wigglytuff.pic", 0, 1 ; sprite dimensions
 	dw WigglytuffPicFront, WigglytuffPicBack

-	db SING, BODY_SLAM, HYPER_BEAM, BUBBLEBEAM ; level 1 learnset - used for trainers
+	db SING, DISABLE, DEFENSE_CURL, DOUBLESLAP ; level 1 learnset
 	db GROWTH_FAST ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/cries.asm
+++ b/data/pokemon/cries.asm
@ -4,6 +4,8 @@ MACRO mon_cry
 	db \2, \3
 ENDM

+; THIS FILE IS NOW UNUSED DUE TO THE CRYSAUDIO PATCH USING A DIFFERENT SYSTEM
+
 CryData::
 	table_width 3, CryData
 	; base cry, pitch, length
@ -197,7 +199,7 @@ CryData::
 	mon_cry SFX_CRY_21, $55, $01 ; Bellsprout
 	mon_cry SFX_CRY_25, $44, $20 ; Weepinbell
 	mon_cry SFX_CRY_25, $66, $CC ; Victreebel
-	mon_cry SFX_CRY_12, $93, $00 ; Monja
+	; mon_cry SFX_CRY_12, $93, $00 ; Monja
 	mon_cry SFX_CRY_1F, $40, $01 ; Pudi
 	mon_cry SFX_CRY_00, $00, $00 ; Scizor
 	mon_cry SFX_CRY_00, $00, $00 ; Rhyperior
@ -231,8 +233,6 @@ CryData::
 	mon_cry SFX_CRY_20, $00, $1C ; Annihilape
 	mon_cry SFX_CRY_0E, $FA, $80 ; Scream Tail
 	mon_cry SFX_CRY_1C, $1F, $DD ; Sandy Shocks
-	mon_cry SFX_CRY_00, $00, $00 ; Wiglett
-	mon_cry SFX_CRY_00, $00, $00 ; Wugtrio
 	mon_cry SFX_CRY_00, $00, $00 ; Toedscool
 	mon_cry SFX_CRY_00, $00, $00 ; Toedscruel
 	mon_cry SFX_CRY_19, $1A, $40 ; Perrserker
--- a/data/pokemon/dex_entries.asm
+++ b/data/pokemon/dex_entries.asm
@ -30,7 +30,7 @@ PokedexEntryPointers:
 	dw BlastoiseDexEntry
 	dw PinsirDexEntry
 	dw TangelaDexEntry
-	dw GyaoonDexEntry
+	dw GawarhedDexEntry
 	dw NidoreignDexEntry
 	dw GrowlitheDexEntry
 	dw OnixDexEntry
@ -49,26 +49,26 @@ PokedexEntryPointers:
 	dw PsyduckDexEntry
 	dw DrowzeeDexEntry
 	dw GolemDexEntry
-	dw BarundaDexEntry
+	dw BalumbaDexEntry
 	dw MagmarDexEntry
 	dw BuuDexEntry
 	dw ElectabuzzDexEntry
 	dw MagnetonDexEntry
 	dw KoffingDexEntry
-	dw DeerDexEntry
+	dw RamooseDexEntry
 	dw MankeyDexEntry
 	dw SeelDexEntry
 	dw DiglettDexEntry
 	dw TaurosDexEntry
 	dw TrampelDexEntry
-	dw CrockyDexEntry
+	dw GavillainDexEntry
 	dw BlottleDexEntry
 	dw FarfetchdDexEntry
 	dw VenonatDexEntry
 	dw DragoniteDexEntry
-	dw CactusDexEntry
-	dw JaggDexEntry
-	dw BittybatDexEntry
+	dw CactormusDexEntry
+	dw SharpoonDexEntry
+	dw WiglettDexEntry
 	dw DoduoDexEntry
 	dw PoliwagDexEntry
 	dw JynxDexEntry
@ -80,7 +80,7 @@ PokedexEntryPointers:
 	dw KrabbyDexEntry
 	dw CheepDexEntry
 	dw JabettaDexEntry
-	dw MikonDexEntry
+	dw VulpiiiDexEntry
 	dw VulpixDexEntry
 	dw NinetalesDexEntry
 	dw PikachuDexEntry
@ -93,8 +93,8 @@ PokedexEntryPointers:
 	dw KabutopsDexEntry
 	dw HorseaDexEntry
 	dw SeadraDexEntry
-	dw BawliguaDexEntry
-	dw CryithanDexEntry
+	dw MinistareDexEntry
+	dw IguanarchDexEntry
 	dw SandshrewDexEntry
 	dw SandslashDexEntry
 	dw OmanyteDexEntry
@ -114,13 +114,13 @@ PokedexEntryPointers:
 	dw WeedleDexEntry
 	dw KakunaDexEntry
 	dw BeedrillDexEntry
-	dw MadaamuDexEntry
+	dw LuxwanDexEntry
 	dw DodrioDexEntry
 	dw PrimeapeDexEntry
 	dw DugtrioDexEntry
 	dw VenomothDexEntry
 	dw DewgongDexEntry
-	dw PurakkusuDexEntry
+	dw TriculesDexEntry
 	dw PendrakenDexEntry
 	dw CaterpieDexEntry
 	dw MetapodDexEntry
@ -133,13 +133,13 @@ PokedexEntryPointers:
 	dw MewtwoDexEntry
 	dw SnorlaxDexEntry
 	dw MagikarpDexEntry
-	dw KonyaDexEntry
-	dw OmegaDexEntry
+	dw CoinpurDexEntry
+	dw OmegadgeDexEntry
 	dw MukDexEntry
 	dw DecillaDexEntry
 	dw KinglerDexEntry
 	dw CloysterDexEntry
-	dw MagnetiteDexEntry
+	dw WugtrioDexEntry
 	dw ElectrodeDexEntry
 	dw ClefableDexEntry
 	dw WeezingDexEntry
@ -155,13 +155,13 @@ PokedexEntryPointers:
 	dw BulbasaurDexEntry
 	dw VenusaurDexEntry
 	dw TentacruelDexEntry
-	dw GyopinDexEntry
+	dw OrfryDexEntry
 	dw GoldeenDexEntry
 	dw SeakingDexEntry
 	dw KotoraDexEntry
 	dw GaotoraDexEntry
 	dw GorotoraDexEntry
-	dw PuchikoonDexEntry
+	dw KoltaDexEntry
 	dw PonytaDexEntry
 	dw RapidashDexEntry
 	dw RattataDexEntry
@ -173,7 +173,7 @@ PokedexEntryPointers:
 	dw AerodactylDexEntry
 	dw BlastykeDexEntry
 	dw MagnemiteDexEntry
-	dw SkimperDexEntry
+	dw SqueamataDexEntry
 	dw GorochuDexEntry
 	dw CharmanderDexEntry
 	dw SquirtleDexEntry
@ -190,7 +190,6 @@ PokedexEntryPointers:
 	dw BellsproutDexEntry
 	dw WeepinbellDexEntry
 	dw VictreebelDexEntry
-	dw MonjaDexEntry
 	dw ScizorDexEntry
 	dw RhyperiorDexEntry
 	dw EspeonDexEntry
@ -201,12 +200,12 @@ PokedexEntryPointers:
 	dw LickilickyDexEntry
 	dw TangrowthDexEntry
 	dw KleavorDexEntry
-	dw TsubomittoDexEntry
+	dw BellignanDexEntry
 	dw SteelixDexEntry
 	dw BlisseyDexEntry
 	dw HitmontopDexEntry
 	dw CrobatDexEntry
-	dw AnimonDexEntry
+	dw MimmeoDexEntry
 	dw BellossomDexEntry
 	dw Porygon2DexEntry
 	dw KingdraDexEntry
@ -214,17 +213,15 @@ PokedexEntryPointers:
 	dw SlowkingDexEntry
 	dw ElectivireDexEntry
 	dw MagmortarDexEntry
-	dw TaabanDexEntry
+	dw DisturbanDexEntry
 	dw KokanaDexEntry
-	dw KasanagiDexEntry
+	dw PupalDexEntry
 	dw CarapthorDexEntry
 	dw MagnezoneDexEntry
 	dw PorygonZDexEntry
 	dw AnnihilapeDexEntry
 	dw ScreamTailDexEntry
 	dw SandyShocksDexEntry
-	dw WiglettDexEntry
-	dw WugtrioDexEntry
 	dw ToedscoolDexEntry
 	dw ToedscruelDexEntry
 	dw PerrserkerDexEntry
@ -1325,11 +1322,11 @@ MissingNoDexEntry:
 	text_far _MissingNoDexEntry
 	text_end

-GyaoonDexEntry:
+GawarhedDexEntry:
 	db "CALAMITY@"
 	db 8,2
 	dw 6900
-	text_far _GyaoonDexEntry
+	text_far _GawarhedDexEntry
 	text_end

 GuardiaDexEntry:
@ -1339,18 +1336,18 @@ GuardiaDexEntry:
 	text_far _GuardiaDexEntry
 	text_end

-DeerDexEntry:
+RamooseDexEntry:
 	db "BIG HORN@"
 	db 4,11
 	dw 1230
-	text_far _DeerDexEntry
+	text_far _RamooseDexEntry
 	text_end

-MadaamuDexEntry:
-	db "WILD DUCK@"
+LuxwanDexEntry:
+	db "MASQUERADE@"	; changed from Wild Duck since it's more closely based on a mute swan
 	db 3,11
 	dw 590
-	text_far _MadaamuDexEntry
+	text_far _LuxwanDexEntry
 	text_end

 DecillaDexEntry:
@ -1374,11 +1371,11 @@ KotoraDexEntry:
 	text_far _KotoraDexEntry
 	text_end

-JaggDexEntry:
+SharpoonDexEntry:
 	db "IRON HORN@"
 	db 11,2
 	dw 4220
-	text_far _JaggDexEntry
+	text_far _SharpoonDexEntry
 	text_end

 JabettaDexEntry:
@ -1395,26 +1392,26 @@ GaotoraDexEntry:
 	text_far _GaotoraDexEntry
 	text_end

-CactusDexEntry:
+CactormusDexEntry:
 	db "NEEDLE@"
 	db 2,11
 	dw 520
-	text_far _CactusDexEntry
+	text_far _CactormusDexEntry
 	text_end

-KonyaDexEntry:
+CoinpurDexEntry:
 	db "KITTEN@"
 	db 1,0
 	dw 60
-	text_far _KonyaDexEntry
+	text_far _CoinpurDexEntry
 	text_end

-BittybatDexEntry:
-	db "TINY BAT@"
-	db 1,0
-	dw 80
-	text_far _BittybatDexEntry
-	text_end
+;BittybatDexEntry:
+;	db "TINY BAT@"
+;	db 1,0
+;	dw 80
+;	text_far _BittybatDexEntry
+;	text_end

 RibbitoDexEntry:
 	db "SUMO@"
@ -1423,11 +1420,11 @@ RibbitoDexEntry:
 	text_far _RibbitoDexEntry
 	text_end

-CryithanDexEntry:
-	db "WEEPING@"
-	db 7,3
+IguanarchDexEntry:
+	db "HOSTILE@"
+	db 8,6
 	dw 3130
-	text_far _CryithanDexEntry
+	text_far _IguanarchDexEntry
 	text_end

 BlastykeDexEntry:
@ -1444,32 +1441,32 @@ BuuDexEntry:
 	text_far _BuuDexEntry
 	text_end

-SkimperDexEntry:
-	db "TIMID@"
-	db 1,4
-	dw 90
-	text_far _SkimperDexEntry
+SqueamataDexEntry:
+	db "IGUANA@"
+	db 2,0
+	dw 120
+	text_far _SqueamataDexEntry
 	text_end

-BawliguaDexEntry:
-	db "TIMID@"
-	db 3,7
+MinistareDexEntry:
+	db "IGUANA@"
+	db 4,7
 	dw 550
-	text_far _BawliguaDexEntry
+	text_far _MinistareDexEntry
 	text_end

-PuchikoonDexEntry:
+KoltaDexEntry:
 	db "FIRE HORSE@"
 	db 1,4
 	dw 280
-	text_far _PuchikoonDexEntry
+	text_far _KoltaDexEntry
 	text_end

-GyopinDexEntry:
+OrfryDexEntry:
 	db "GOLDFISH@"
 	db 0,8
 	dw 50
-	text_far _GyopinDexEntry
+	text_far _OrfryDexEntry
 	text_end

 GorochuDexEntry:
@ -1479,11 +1476,11 @@ GorochuDexEntry:
 	text_far _GorochuDexEntry
 	text_end

-MikonDexEntry:
+VulpiiiDexEntry:
 	db "FOX@"
 	db 1,4
 	dw 120
-	text_far _MikonDexEntry
+	text_far _VulpiiiDexEntry
 	text_end

 CheepDexEntry:
@ -1521,11 +1518,11 @@ GorotoraDexEntry:
 	text_far _GorotoraDexEntry
 	text_end

-OmegaDexEntry:
+OmegadgeDexEntry:
 	db "ARTIFICIAL@"
 	db 8,6
 	dw 8260
-	text_far _OmegaDexEntry
+	text_far _OmegadgeDexEntry
 	text_end

 NidoreignDexEntry:
@ -1542,11 +1539,11 @@ TrampelDexEntry:
 	text_far _TrampelDexEntry
 	text_end

-CrockyDexEntry:
+GavillainDexEntry:
 	db "GLARING@"
 	db 2,11
 	dw 520
-	text_far _CrockyDexEntry
+	text_far _GavillainDexEntry
 	text_end

 PendrakenDexEntry:
@ -1556,39 +1553,39 @@ PendrakenDexEntry:
 	text_far _PendrakenDexEntry
 	text_end

-MagnetiteDexEntry:
-	db "MAGNET@"
-	db 2,4
-	dw 400
-	text_far _MagnetiteDexEntry
-	text_end
+;MagnetiteDexEntry:
+;	db "MAGNET@"
+;	db 2,4
+;	dw 400
+;	text_far _MagnetiteDexEntry
+;	text_end

-PurakkusuDexEntry:
+TriculesDexEntry:
 	db "BIG HORN@"
 	db 5,11
 	dw 2540
-	text_far _PurakkusuDexEntry
+	text_far _TriculesDexEntry
 	text_end

-BarundaDexEntry:
+BalumbaDexEntry:
 	db "BALLOON@"
 	db 1,4
 	dw 10
-	text_far _BarundaDexEntry
+	text_far _BalumbaDexEntry
 	text_end

-TsubomittoDexEntry:
+BellignanDexEntry:
 	db "SPROUT@"
 	db 4,3
 	dw 160
-	text_far _TsubomittoDexEntry
+	text_far _BellignanDexEntry
 	text_end

-AnimonDexEntry:
+MimmeoDexEntry:
 	db "TRANSFORM@"
 	db 2,0
 	dw 360
-	text_far _AnimonDexEntry
+	text_far _MimmeoDexEntry
 	text_end

 BellossomDexEntry:
@ -1668,12 +1665,12 @@ KleavorDexEntry:
 	text_far _KleavorDexEntry
 	text_end

-MonjaDexEntry:
-    db "VINE@"
-	db 1,4
-	dw 330
-	text_far _MonjaDexEntry
-	text_end
+;MonjaDexEntry:
+;    db "VINE@"
+;	db 1,4
+;	dw 330
+;	text_far _MonjaDexEntry
+;	text_end
 	
 SteelixDexEntry:
    db "IRON SNAKE@"
@ -1745,11 +1742,11 @@ MagmortarDexEntry:
 	text_far _MagmortarDexEntry
 	text_end
 	
-TaabanDexEntry:
+DisturbanDexEntry:
    db "SPIRAL@"
 	db 4,3
 	dw 1530
-	text_far _TaabanDexEntry
+	text_far _DisturbanDexEntry
 	text_end
 	
 KokanaDexEntry:
@ -1759,11 +1756,11 @@ KokanaDexEntry:
 	text_far _KokanaDexEntry
 	text_end

-KasanagiDexEntry:
+PupalDexEntry:
 	db "PUPA@"
 	db 2,7
 	dw 220
-	text_far _KasanagiDexEntry
+	text_far _PupalDexEntry
 	text_end

 CarapthorDexEntry:
--- a/data/pokemon/dex_order.asm
+++ b/data/pokemon/dex_order.asm
@ -30,7 +30,7 @@ PokedexOrder:
 	db DEX_BLASTOISE
 	db DEX_PINSIR
 	db DEX_TANGELA
-	db DEX_GYAOON
+	db DEX_GAWARHED
 	db DEX_NIDOREIGN
 	db DEX_GROWLITHE
 	db DEX_ONIX
@ -49,26 +49,26 @@ PokedexOrder:
 	db DEX_PSYDUCK
 	db DEX_DROWZEE
 	db DEX_GOLEM
-	db DEX_BARUNDA
+	db DEX_BALUMBA
 	db DEX_MAGMAR
 	db DEX_BUU
 	db DEX_ELECTABUZZ
 	db DEX_MAGNETON
 	db DEX_KOFFING
-	db DEX_DEER
+	db DEX_RAMOOSE
 	db DEX_MANKEY
 	db DEX_SEEL
 	db DEX_DIGLETT
 	db DEX_TAUROS
 	db DEX_TRAMPEL
-	db DEX_CROCKY
+	db DEX_GAVILLAIN
 	db DEX_BLOTTLE
 	db DEX_FARFETCHD
 	db DEX_VENONAT
 	db DEX_DRAGONITE
-	db DEX_CACTUS
-	db DEX_JAGG
-	db DEX_BITTYBAT
+	db DEX_CACTORMUS
+	db DEX_SHARPOON
+	db DEX_WIGLETT
 	db DEX_DODUO
 	db DEX_POLIWAG
 	db DEX_JYNX
@ -80,7 +80,7 @@ PokedexOrder:
 	db DEX_KRABBY
 	db DEX_CHEEP
 	db DEX_JABETTA
-	db DEX_MIKON
+	db DEX_VULPIII
 	db DEX_VULPIX
 	db DEX_NINETALES
 	db DEX_PIKACHU
@ -93,8 +93,8 @@ PokedexOrder:
 	db DEX_KABUTOPS
 	db DEX_HORSEA
 	db DEX_SEADRA
-	db DEX_BAWLIGUA
-	db DEX_CRYITHAN
+	db DEX_MINISTARE
+	db DEX_IGUANARCH
 	db DEX_SANDSHREW
 	db DEX_SANDSLASH
 	db DEX_OMANYTE
@ -114,13 +114,13 @@ PokedexOrder:
 	db DEX_WEEDLE
 	db DEX_KAKUNA
 	db DEX_BEEDRILL
-	db DEX_MADAAMU
+	db DEX_LUXWAN
 	db DEX_DODRIO
 	db DEX_PRIMEAPE
 	db DEX_DUGTRIO
 	db DEX_VENOMOTH
 	db DEX_DEWGONG
-	db DEX_PURAKKUSU
+	db DEX_TRICULES
 	db DEX_PENDRAKEN
 	db DEX_CATERPIE
 	db DEX_METAPOD
@ -133,13 +133,13 @@ PokedexOrder:
 	db DEX_MEWTWO
 	db DEX_SNORLAX
 	db DEX_MAGIKARP
-	db DEX_KONYA
-	db DEX_OMEGA
+	db DEX_COINPUR
+	db DEX_OMEGADGE
 	db DEX_MUK
 	db DEX_DECILLA
 	db DEX_KINGLER
 	db DEX_CLOYSTER
-	db DEX_MAGNETITE
+	db DEX_WUGTRIO
 	db DEX_ELECTRODE
 	db DEX_CLEFABLE
 	db DEX_WEEZING
@ -155,13 +155,13 @@ PokedexOrder:
 	db DEX_BULBASAUR
 	db DEX_VENUSAUR
 	db DEX_TENTACRUEL
-	db DEX_GYOPIN
+	db DEX_ORFRY
 	db DEX_GOLDEEN
 	db DEX_SEAKING
 	db DEX_KOTORA
 	db DEX_GAOTORA
 	db DEX_GOROTORA
-	db DEX_PUCHIKOON
+	db DEX_KOLTA
 	db DEX_PONYTA
 	db DEX_RAPIDASH
 	db DEX_RATTATA
@ -173,7 +173,7 @@ PokedexOrder:
 	db DEX_AERODACTYL
 	db DEX_BLASTYKE
 	db DEX_MAGNEMITE
-	db DEX_SKIMPER
+	db DEX_SQUEAMATA
 	db DEX_GOROCHU
 	db DEX_CHARMANDER
 	db DEX_SQUIRTLE
@ -190,7 +190,6 @@ PokedexOrder:
 	db DEX_BELLSPROUT
 	db DEX_WEEPINBELL
 	db DEX_VICTREEBEL
-	db DEX_MONJA
 	db DEX_SCIZOR
 	db DEX_RHYPERIOR
 	db DEX_ESPEON
@ -201,12 +200,12 @@ PokedexOrder:
 	db DEX_LICKILICKY
 	db DEX_TANGROWTH
 	db DEX_KLEAVOR
-	db DEX_TSUBOMITTO
+	db DEX_BELLIGNAN
 	db DEX_STEELIX
 	db DEX_BLISSEY
 	db DEX_HITMONTOP
 	db DEX_CROBAT
-	db DEX_ANIMON
+	db DEX_MIMMEO
 	db DEX_BELLOSSOM
 	db DEX_PORYGON2
 	db DEX_KINGDRA
@ -214,17 +213,15 @@ PokedexOrder:
 	db DEX_SLOWKING
 	db DEX_ELECTIVIRE
 	db DEX_MAGMORTAR
-	db DEX_TAABAN
+	db DEX_DISTURBAN
 	db DEX_KOKANA
-	db DEX_KASANAGI
+	db DEX_PUPAL
 	db DEX_CARAPTHOR
 	db DEX_MAGNEZONE
 	db DEX_PORYGONZ
 	db DEX_ANNIHILAPE
 	db DEX_SCREAM_TAIL
 	db DEX_SANDY_SHOCKS
-	db DEX_WIGLETT
-	db DEX_WUGTRIO
 	db DEX_TOEDSCOOL
 	db DEX_TOEDSCRUEL
 	db DEX_PERRSERKER
--- a/data/pokemon/evos_moves.asm
+++ b/data/pokemon/evos_moves.asm
@ -42,7 +42,7 @@ EvosMovesPointerTable:
 	dw BlastoiseEvosMoves
 	dw PinsirEvosMoves
 	dw TangelaEvosMoves
-	dw GyaoonEvosMoves
+	dw GawarhedEvosMoves
 	dw NidoreignEvosMoves
 	dw GrowlitheEvosMoves
 	dw OnixEvosMoves
@ -61,26 +61,26 @@ EvosMovesPointerTable:
 	dw PsyduckEvosMoves
 	dw DrowzeeEvosMoves
 	dw GolemEvosMoves
-	dw BarundaEvosMoves
+	dw BalumbaEvosMoves
 	dw MagmarEvosMoves
 	dw BuuEvosMoves
 	dw ElectabuzzEvosMoves
 	dw MagnetonEvosMoves
 	dw KoffingEvosMoves
-	dw DeerEvosMoves
+	dw RamooseEvosMoves
 	dw MankeyEvosMoves
 	dw SeelEvosMoves
 	dw DiglettEvosMoves
 	dw TaurosEvosMoves
 	dw TrampelEvosMoves
-	dw CrockyEvosMoves
+	dw GavillainEvosMoves
 	dw BlottleEvosMoves
 	dw FarfetchdEvosMoves
 	dw VenonatEvosMoves
 	dw DragoniteEvosMoves
-	dw CactusEvosMoves
-	dw JaggEvosMoves
-	dw BittybatEvosMoves
+	dw CactormusEvosMoves
+	dw SharpoonEvosMoves
+	dw WiglettEvosMoves
 	dw DoduoEvosMoves
 	dw PoliwagEvosMoves
 	dw JynxEvosMoves
@ -92,7 +92,7 @@ EvosMovesPointerTable:
 	dw KrabbyEvosMoves
 	dw CheepEvosMoves
 	dw JabettaEvosMoves
-	dw MikonEvosMoves
+	dw VulpiiiEvosMoves
 	dw VulpixEvosMoves
 	dw NinetalesEvosMoves
 	dw PikachuEvosMoves
@ -105,8 +105,8 @@ EvosMovesPointerTable:
 	dw KabutopsEvosMoves
 	dw HorseaEvosMoves
 	dw SeadraEvosMoves
-	dw BawliguaEvosMoves
-	dw CryithanEvosMoves
+	dw MinistareEvosMoves
+	dw IguanarchEvosMoves
 	dw SandshrewEvosMoves
 	dw SandslashEvosMoves
 	dw OmanyteEvosMoves
@ -126,13 +126,13 @@ EvosMovesPointerTable:
 	dw WeedleEvosMoves
 	dw KakunaEvosMoves
 	dw BeedrillEvosMoves
-	dw MadaamuEvosMoves
+	dw LuxwanEvosMoves
 	dw DodrioEvosMoves
 	dw PrimeapeEvosMoves
 	dw DugtrioEvosMoves
 	dw VenomothEvosMoves
 	dw DewgongEvosMoves
-	dw PurakkusuEvosMoves
+	dw TriculesEvosMoves
 	dw PendrakenEvosMoves
 	dw CaterpieEvosMoves
 	dw MetapodEvosMoves
@ -145,13 +145,13 @@ EvosMovesPointerTable:
 	dw MewtwoEvosMoves
 	dw SnorlaxEvosMoves
 	dw MagikarpEvosMoves
-	dw KonyaEvosMoves
-	dw OmegaEvosMoves
+	dw CoinpurEvosMoves
+	dw OmegadgeEvosMoves
 	dw MukEvosMoves
 	dw DecillaEvosMoves
 	dw KinglerEvosMoves
 	dw CloysterEvosMoves
-	dw MagnetiteEvosMoves
+	dw WugtrioEvosMoves
 	dw ElectrodeEvosMoves
 	dw ClefableEvosMoves
 	dw WeezingEvosMoves
@ -167,13 +167,13 @@ EvosMovesPointerTable:
 	dw BulbasaurEvosMoves
 	dw VenusaurEvosMoves
 	dw TentacruelEvosMoves
-	dw GyopinEvosMoves
+	dw OrfryEvosMoves
 	dw GoldeenEvosMoves
 	dw SeakingEvosMoves
 	dw KotoraEvosMoves
 	dw GaotoraEvosMoves
 	dw GorotoraEvosMoves
-	dw PuchikoonEvosMoves
+	dw KoltaEvosMoves
 	dw PonytaEvosMoves
 	dw RapidashEvosMoves
 	dw RattataEvosMoves
@ -185,7 +185,7 @@ EvosMovesPointerTable:
 	dw AerodactylEvosMoves
 	dw BlastykeEvosMoves
 	dw MagnemiteEvosMoves
-	dw SkimperEvosMoves
+	dw SqueamataEvosMoves
 	dw GorochuEvosMoves
 	dw CharmanderEvosMoves
 	dw SquirtleEvosMoves
@ -202,7 +202,6 @@ EvosMovesPointerTable:
 	dw BellsproutEvosMoves
 	dw WeepinbellEvosMoves
 	dw VictreebelEvosMoves
-	dw MonjaEvosMoves
 	dw ScizorEvosMoves
 	dw RhyperiorEvosMoves
 	dw EspeonEvosMoves
@ -213,12 +212,12 @@ EvosMovesPointerTable:
 	dw LickilickyEvosMoves
 	dw TangrowthEvosMoves
 	dw KleavorEvosMoves
-	dw TsubomittoEvosMoves
+	dw BellignanEvosMoves
 	dw SteelixEvosMoves
 	dw BlisseyEvosMoves
 	dw HitmontopEvosMoves
 	dw CrobatEvosMoves
-	dw AnimonEvosMoves
+	dw MimmeoEvosMoves
 	dw BellossomEvosMoves
 	dw Porygon2EvosMoves
 	dw KingdraEvosMoves
@ -226,17 +225,15 @@ EvosMovesPointerTable:
 	dw SlowkingEvosMoves
 	dw ElectivireEvosMoves
 	dw MagmortarEvosMoves
-	dw TaabanEvosMoves
+	dw DisturbanEvosMoves
 	dw KokanaEvosMoves
-	dw KasanagiEvosMoves
+	dw PupalEvosMoves
 	dw CarapthorEvosMoves
 	dw MagnezoneEvosMoves
 	dw PorygonZEvosMoves
 	dw AnnihilapeEvosMoves
 	dw ScreamTailEvosMoves
-	dw SandyShocksEvosMoves
-	dw WiglettEvosMoves
-	dw WugtrioEvosMoves	
+	dw SandyShocksEvosMoves	
 	dw ToedscoolEvosMoves
 	dw ToedscruelEvosMoves
 	dw PerrserkerEvosMoves
@ -522,7 +519,7 @@ GyaradosEvosMoves:

 ShellderEvosMoves:
 ; Evolutions
-	db EV_ITEM, WATER_STONE, 1, TAABAN
+	db EV_ITEM, WATER_STONE, 1, DISTURBAN
 	db EV_ITEM, ICE_STONE, 1, CLOYSTER
 	db 0
 ; Learnset
@ -601,8 +598,8 @@ BlastoiseEvosMoves:

 PinsirEvosMoves:
 ; Evolutions
-	db EV_ITEM, METAL_COAT, 1, PURAKKUSU
-	db EV_LEVEL, 42, PURAKKUSU
+	db EV_ITEM, METAL_COAT, 1, TRICULES
+	db EV_LEVEL, 42, TRICULES
 	db 0
 ; Learnset
 	db 21, BIND
@ -629,7 +626,7 @@ TangelaEvosMoves:
 	db 48, GROWTH
 	db 0

-GyaoonEvosMoves:
+GawarhedEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
@ -854,7 +851,7 @@ GolemEvosMoves:
 	db 43, EXPLOSION
 	db 0

-BarundaEvosMoves:
+BalumbaEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
@ -926,7 +923,7 @@ KoffingEvosMoves:
 	db 48, EXPLOSION
 	db 0

-DeerEvosMoves:
+RamooseEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
@ -1003,7 +1000,7 @@ TrampelEvosMoves:
 	db 50, ROAR
 	db 0

-CrockyEvosMoves:
+GavillainEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
@ -1033,8 +1030,7 @@ BlottleEvosMoves:

 FarfetchdEvosMoves:
 ; Evolutions
-	db EV_LEVEL, 24, MADAAMU
-	;db EV_ITEM, HEART_STONE, 1, SIRFETCHD
+	db EV_LEVEL, 24, LUXWAN
 	db 0
 ; Learnset
 	db 7, LEER
@ -1070,7 +1066,7 @@ DragoniteEvosMoves:
 	db 60, HYPER_BEAM
 	db 0

-CactusEvosMoves:
+CactormusEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
@ -1084,7 +1080,7 @@ CactusEvosMoves:
 	db 50, EXPLOSION
 	db 0

-JaggEvosMoves:
+SharpoonEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
@ -1098,19 +1094,19 @@ JaggEvosMoves:
 	db 55, HORN_DRILL
 	db 0

-BittybatEvosMoves:
+;BittybatEvosMoves:
 ; Evolutions
-	db EV_LEVEL, 15, ZUBAT
-	db 0
+;	db EV_LEVEL, 15, ZUBAT
+;	db 0
 ; Learnset
-	db 7, WING_ATTACK
-	db 14, GUST
-	db 18, CONFUSE_RAY
-	db 22, BITE
-	db 26, TACKLE
-	db 30, DISABLE
-	db 34, HAZE
-	db 0
+;	db 7, WING_ATTACK
+;	db 14, GUST
+;	db 18, CONFUSE_RAY
+;	db 22, BITE
+;	db 26, TACKLE
+;	db 30, DISABLE
+;	db 34, HAZE
+;	db 0

 DoduoEvosMoves:
 ; Evolutions
@ -1179,7 +1175,7 @@ ZapdosEvosMoves:

 DittoEvosMoves:
 ; Evolutions
-	db EV_ITEM, METAL_COAT, 1, ANIMON
+	db EV_ITEM, METAL_COAT, 1, MIMMEO
 	db 0
 ; Learnset
 	db 0
@ -1237,7 +1233,7 @@ JabettaEvosMoves:
 	db 48, HYDRO_PUMP
 	db 0

-MikonEvosMoves:
+VulpiiiEvosMoves:
 ; Evolutions
 	db EV_LEVEL, 15, VULPIX
 	db 0
@ -1388,27 +1384,27 @@ SeadraEvosMoves:
 	db 52, HYDRO_PUMP
 	db 0

-BawliguaEvosMoves:
+MinistareEvosMoves:
 ; Evolutions
-	db EV_LEVEL, 50, CRYITHAN
+	db EV_LEVEL, 50, IGUANARCH
 	db 0
 ; Learnset
-	db 10, GLARE
-	db 20, WATER_GUN
-	db 30, SLASH
+	db 10, LEER
+	db 20, BITE
+	db 30, GLARE
 	db 40, DRAGON_RAGE
-	db 50, HYDRO_PUMP
+	db 50, SLASH
 	db 0

-CryithanEvosMoves:
+IguanarchEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
-	db 10, GLARE
-	db 20, WATER_GUN
-	db 30, SLASH
+	db 10, LEER
+	db 20, BITE
+	db 30, GLARE
 	db 40, DRAGON_RAGE
-	db 50, HYDRO_PUMP
+	db 50, SLASH
 	db 0

 SandshrewEvosMoves:
@ -1634,7 +1630,7 @@ BeedrillEvosMoves:
 	db 35, AGILITY
 	db 0

-MadaamuEvosMoves:
+LuxwanEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
@ -1669,8 +1665,8 @@ PrimeapeEvosMoves:
 	db 27, FOCUS_ENERGY
 	db 28, RAGE
 	db 37, SEISMIC_TOSS
-	db 46, THRASH
 	db 45, SCREECH
+	db 46, THRASH
 	db 0

 DugtrioEvosMoves:
@ -1707,7 +1703,7 @@ DewgongEvosMoves:
 	db 56, ICE_BEAM
 	db 0

-PurakkusuEvosMoves:
+TriculesEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
@ -1852,7 +1848,7 @@ MagikarpEvosMoves:
 	db 15, TACKLE
 	db 0

-KonyaEvosMoves:
+CoinpurEvosMoves:
 ; Evolutions
 	db EV_LEVEL, 14, MEOWTH
 	db 0
@ -1866,7 +1862,7 @@ KonyaEvosMoves:
 	db 35, SLASH
 	db 0

-OmegaEvosMoves:
+OmegadgeEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
@ -1889,7 +1885,7 @@ MukEvosMoves:

 DecillaEvosMoves:
 ; Evolutions
-	db EV_LEVEL, 40, GYAOON
+	db EV_LEVEL, 40, GAWARHED
 	db 0
 ; Learnset
 	db 35, SCREECH
@ -1916,18 +1912,18 @@ CloysterEvosMoves:
 	db 50, SPIKE_CANNON
 	db 0

-MagnetiteEvosMoves:
+;MagnetiteEvosMoves:
 ; Evolutions
-	db EV_LEVEL, 30, MAGNETON
-	db 0
+;	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 0
+;	db 21, SONICBOOM
+;	db 25, THUNDERSHOCK
+;	db 29, SUPERSONIC
+;	db 35, THUNDER_WAVE
+;	db 41, SWIFT
+;	db 47, SCREECH
+;	db 0

 ElectrodeEvosMoves:
 ; Evolutions
@ -2094,7 +2090,7 @@ TentacruelEvosMoves:
 	db 50, HYDRO_PUMP
 	db 0

-GyopinEvosMoves:
+OrfryEvosMoves:
 ; Evolutions
 	db EV_LEVEL, 16, GOLDEEN
 	db 0
@ -2150,6 +2146,7 @@ GaotoraEvosMoves:
 	db EV_LEVEL, 36, GOROTORA
 	db 0
 ; Learnset
+	db 9, LEER
 	db 14, ROAR
 	db 23, QUICK_ATTACK
 	db 30, BITE
@ -2161,13 +2158,15 @@ GorotoraEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
+	db 16, LEER
+	db 21, ROAR
 	db 30, QUICK_ATTACK
 	db 34, BITE
 	db 40, THUNDER
 	db 48, AGILITY
 	db 0

-PuchikoonEvosMoves:
+KoltaEvosMoves:
 ; Evolutions
 	db EV_LEVEL, 20, PONYTA
 	db 0
@ -2305,7 +2304,7 @@ BlastykeEvosMoves:

 MagnemiteEvosMoves:
 ; Evolutions
-	db EV_LEVEL, 20, MAGNETITE
+	db EV_LEVEL, 30, MAGNETON
 	db 0
 ; Learnset
 	db 21, SONICBOOM
@ -2316,16 +2315,16 @@ MagnemiteEvosMoves:
 	db 47, SCREECH
 	db 0

-SkimperEvosMoves:
+SqueamataEvosMoves:
 ; Evolutions
-	db EV_LEVEL, 30, BAWLIGUA
+	db EV_LEVEL, 30, MINISTARE
 	db 0
 ; Learnset
-	db 10, GLARE
-	db 20, WATER_GUN
-	db 30, SLASH
+	db 10, LEER
+	db 20, BITE
+	db 30, GLARE
 	db 40, DRAGON_RAGE
-	db 50, HYDRO_PUMP
+	db 50, SLASH
 	db 0

 GorochuEvosMoves:
@ -2510,7 +2509,7 @@ BellsproutEvosMoves:
 WeepinbellEvosMoves:
 ; Evolutions
 	db EV_ITEM, LEAF_STONE, 1, VICTREEBEL
-	db EV_ITEM, POISON_STONE, 1, TSUBOMITTO
+	db EV_ITEM, POISON_STONE, 1, BELLIGNAN
 	db 0
 ; Learnset
 	db 13, WRAP
@ -2531,21 +2530,21 @@ VictreebelEvosMoves:
 	db 18, SLEEP_POWDER
 	db 0

-MonjaEvosMoves:
+;MonjaEvosMoves:
 ; Evolutions
-	db EV_LEVEL, 22, TANGELA
-	db 0
+;	db EV_LEVEL, 22, TANGELA
+;	db 0
 ; Learnset
-	db 5, BIND
-	db 9, ABSORB
-	db 13, VINE_WHIP
-	db 19, POISONPOWDER
-	db 22, STUN_SPORE
-	db 25, SLEEP_POWDER
-	db 29, SLAM
-	db 35, GROWTH
-	db 40, NIGHT_SHADE
-	db 0
+;	db 5, BIND
+;	db 9, ABSORB
+;	db 13, VINE_WHIP
+;	db 19, POISONPOWDER
+;	db 22, STUN_SPORE
+;	db 25, SLEEP_POWDER
+;	db 29, SLAM
+;	db 35, GROWTH
+;	db 40, NIGHT_SHADE
+;	db 0

 ;PudiEvosMoves:
 ; Evolutions
@ -2688,7 +2687,7 @@ KleavorEvosMoves:
 	db 50, ROCK_SLIDE
 	db 0

-TsubomittoEvosMoves:
+BellignanEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset 
@ -2749,7 +2748,7 @@ CrobatEvosMoves:
 	db 50, AGILITY
 	db 0

-AnimonEvosMoves:
+MimmeoEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
@ -2834,7 +2833,7 @@ MagmortarEvosMoves:
 	db 55, FLAMETHROWER
 	db 0
 	
-TaabanEvosMoves:
+DisturbanEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
@ -2843,12 +2842,12 @@ TaabanEvosMoves:
 	
 KokanaEvosMoves:
 ; Evolutions
-	db EV_LEVEL, 7, KASANAGI
+	db EV_LEVEL, 7, PUPAL
 	db 0
 ; Learnset
 	db 0

-KasanagiEvosMoves:
+PupalEvosMoves:
 ; Evolutions
 	db EV_LEVEL, 10, CARAPTHOR
 	db 0
--- a/data/pokemon/menu_icons.asm
+++ b/data/pokemon/menu_icons.asm
@ -13,22 +13,22 @@ MonPartyData:
 	nybble ICON_PIKACHU   ; Raichu
 	nybble ICON_PIKACHU   ; Raichu-A
 	nybble ICON_PIKACHU   ; Gorochu
-	nybble ICON_QUADRUPED ; Eevee
-	nybble ICON_QUADRUPED ; Vaporeon
-	nybble ICON_QUADRUPED ; Jolteon
-	nybble ICON_QUADRUPED ; Flareon
-	nybble ICON_QUADRUPED ; Espeon
-	nybble ICON_QUADRUPED ; Umbreon
-	nybble ICON_QUADRUPED ; Leafeon
-	nybble ICON_QUADRUPED ; Glaceon
-	nybble ICON_QUADRUPED ; Sylveon
+	nybble ICON_CAT       ; Eevee - The Eeveelutions were designed to have vulpine, canine and feline traits, so I think the cat icon makes the most sense.
+	nybble ICON_CAT       ; Vaporeon
+	nybble ICON_CAT       ; Jolteon
+	nybble ICON_CAT       ; Flareon
+	nybble ICON_CAT       ; Espeon
+	nybble ICON_CAT       ; Umbreon
+	nybble ICON_CAT       ; Leafeon
+	nybble ICON_CAT       ; Glaceon
+	nybble ICON_CAT       ; Sylveon
 	nybble ICON_QUADRUPED ; Rattata
 	nybble ICON_QUADRUPED ; Raticate
 	nybble ICON_QUADRUPED ; Raticate-A
 	nybble ICON_SMALL_BIRD ; Pidgey
 	nybble ICON_SMALL_BIRD ; Pidgeotto
 	nybble ICON_BIRD      ; Pidgeot
-	nybble ICON_CAT       ; Konya
+	nybble ICON_CAT       ; Coinpur
 	nybble ICON_CAT       ; Meowth
 	nybble ICON_CAT       ; Persian
 	nybble ICON_CAT       ; Persian-A
@ -40,15 +40,13 @@ MonPartyData:
 	nybble ICON_BUG       ; Kakuna
 	nybble ICON_BUG       ; Beedrill
 	nybble ICON_BUG       ; Kokana
-	nybble ICON_BUG       ; Kasanagi
+	nybble ICON_BUG       ; Pupal
 	nybble ICON_BUG       ; Carapthor
+	nybble ICON_CAT 	  ; Kotora
+	nybble ICON_CAT 	  ; Gaotora
+	nybble ICON_CAT 	  ; Gorotora
 	nybble ICON_SMALL_BIRD ; Spearow
 	nybble ICON_BIRD      ; Fearow
-	nybble ICON_SNAKE     ; Ekans
-	nybble ICON_SNAKE     ; Arbok
-	nybble ICON_MON       ; Sandshrew
-	nybble ICON_MON       ; Sandslash
-	nybble ICON_MON       ; Sandslash-A
 	nybble ICON_MON       ; NidoranF
 	nybble ICON_MON       ; Nidorina
 	nybble ICON_MON       ; Nidoqueen
@ -56,7 +54,6 @@ MonPartyData:
 	nybble ICON_MON       ; Nidorino
 	nybble ICON_MON       ; Nidoking
 	nybble ICON_MON       ; Nidoreign
-	nybble ICON_MON       ; Bittybat
 	nybble ICON_MON       ; Zubat
 	nybble ICON_MON       ; Golbat
 	nybble ICON_MON       ; Crobat
@ -70,13 +67,15 @@ MonPartyData:
 	nybble ICON_FAIRY     ; Clefable
 	nybble ICON_FAIRY     ; Jigglypuff
 	nybble ICON_FAIRY     ; Wigglytuff
-	nybble ICON_QUADRUPED ; Mikon
+	nybble ICON_MON       ; Sandshrew
+	nybble ICON_MON       ; Sandslash
+	nybble ICON_MON       ; Sandslash-A
+	nybble ICON_SNAKE     ; Ekans
+	nybble ICON_SNAKE     ; Arbok
+	nybble ICON_QUADRUPED ; Vulpiii
 	nybble ICON_QUADRUPED ; Vulpix
 	nybble ICON_QUADRUPED ; Ninetales
 	nybble ICON_QUADRUPED ; Ninetales-A
-	nybble ICON_QUADRUPED ; Growlithe
-	nybble ICON_QUADRUPED ; Arcanine
-	nybble ICON_QUADRUPED ; Arcanine-H
 	nybble ICON_MON       ; Mankey
 	nybble ICON_MON       ; Primeape
 	nybble ICON_MON       ; Annihilape
@ -87,16 +86,14 @@ MonPartyData:
 	nybble ICON_GRASS     ; Bellsprout
 	nybble ICON_GRASS     ; Weepinbell
 	nybble ICON_GRASS     ; Victreebel
-	nybble ICON_GRASS     ; Tsubomitto
+	nybble ICON_GRASS     ; Bellignan
 	nybble ICON_WATER     ; Magikarp
 	nybble ICON_SNAKE     ; Gyarados
-	nybble ICON_WATER     ; Gyopin
+	nybble ICON_WATER     ; Orfry
 	nybble ICON_WATER     ; Goldeen
 	nybble ICON_WATER     ; Seaking
 	nybble ICON_BUG       ; Venonat
 	nybble ICON_BUG       ; Venomoth
-	nybble ICON_WATER     ; Cheep
-	nybble ICON_WATER     ; Jabetta
 	nybble ICON_MON       ; Psyduck
 	nybble ICON_MON       ; Weirduck
 	nybble ICON_MON       ; Golduck
@ -107,8 +104,14 @@ MonPartyData:
 	nybble ICON_MON       ; Abra
 	nybble ICON_MON       ; Kadabra
 	nybble ICON_MON       ; Alakazam
+	nybble ICON_QUADRUPED ; Growlithe
+	nybble ICON_QUADRUPED ; Arcanine
+	nybble ICON_QUADRUPED ; Arcanine-H
 	nybble ICON_MON       ; Lickitung
 	nybble ICON_MON       ; Lickilicky
+	nybble ICON_SMALL_BIRD ; Farfetch'd
+	nybble ICON_BIRD	  ; Madaamu
+	nybble ICON_SMALL_BIRD ; Sirfetch'd
 	nybble ICON_MON       ; Drowzee
 	nybble ICON_MON       ; Hypno
 	nybble ICON_MON       ; Diglett
@ -118,9 +121,6 @@ MonPartyData:
 	nybble ICON_WATER     ; Wugtrio
 	nybble ICON_SNAKE     ; Onix
 	nybble ICON_SNAKE     ; Steelix
-	nybble ICON_CAT 	  ; Kotora
-	nybble ICON_CAT 	  ; Gaotora
-	nybble ICON_CAT 	  ; Gorotora - unsure about how fitting this is but they ARE tigers, so...
 	nybble ICON_BALL      ; Voltorb
 	nybble ICON_BALL      ; Electrode
 	nybble ICON_BALL      ; Electrode-H
@ -130,16 +130,16 @@ MonPartyData:
 	nybble ICON_GRASS     ; Toedscruel
 	nybble ICON_WATER     ; Blottle
 	nybble ICON_WATER     ; Pendraken
-	nybble ICON_MON       ; Ribbito
-	nybble ICON_MON       ; Croakozuna
 	nybble ICON_BALL      ; Magnemite
-	nybble ICON_BALL      ; Magnetite
 	nybble ICON_BALL      ; Magneton
 	nybble ICON_BALL      ; Magnezone
+	nybble ICON_WATER     ; Cheep
+	nybble ICON_WATER     ; Jabetta
+	nybble ICON_MON       ; Ribbito
+	nybble ICON_MON       ; Croakozuna
 	nybble ICON_MON       ; Machop
 	nybble ICON_MON       ; Machoke
 	nybble ICON_MON       ; Machamp
-	nybble ICON_MON	      ; Crocky
 	nybble ICON_WATER     ; Krabby
 	nybble ICON_WATER     ; Kingler
 	nybble ICON_QUADRUPED ; Slowpoke
@ -147,15 +147,12 @@ MonPartyData:
 	nybble ICON_MON       ; Slowbro-G
 	nybble ICON_MON       ; Slowking
 	nybble ICON_MON       ; Slowking-G
-	nybble ICON_QUADRUPED ; Puchikoon
+	nybble ICON_MON	      ; Gavillain
+	nybble ICON_QUADRUPED ; Kolta
 	nybble ICON_QUADRUPED ; Ponyta
 	nybble ICON_QUADRUPED ; Rapidash
 	nybble ICON_QUADRUPED ; Rapidash-G
-	nybble ICON_QUADRUPED ; Deer
-	nybble ICON_GRASS     ; Monja
-	nybble ICON_GRASS     ; Tangela
-	nybble ICON_GRASS     ; Tangrowth
-	nybble ICON_BALL      ; Barunda
+	nybble ICON_BALL      ; Balumba
 	nybble ICON_MON       ; Gastly
 	nybble ICON_MON       ; Haunter
 	nybble ICON_MON       ; Gengar
@ -163,10 +160,7 @@ MonPartyData:
 	nybble ICON_MON       ; Marowak
 	nybble ICON_MON       ; Marowak-A
 	nybble ICON_MON	      ; Guardia
-	nybble ICON_SMALL_BIRD ; Farfetch'd
-	nybble ICON_BIRD	  ; Madaamu
-	nybble ICON_BIRD      ; Sirfetch'd
-	nybble ICON_BIRD      ; Doduo - it's flightless, so the current sprite fits better.
+	nybble ICON_SMALL_BIRD ; Doduo
 	nybble ICON_BIRD      ; Dodrio
 	nybble ICON_MON       ; Grimer
 	nybble ICON_MON       ; Muk
@ -174,27 +168,25 @@ MonPartyData:
 	nybble ICON_MON       ; Koffing
 	nybble ICON_MON       ; Weezing
 	nybble ICON_MON       ; Weezing-G
-	nybble ICON_MON       ; Ditto
-	nybble ICON_MON       ; Animon
-	nybble ICON_MON       ; Mr.Mime
-	nybble ICON_MON       ; Mr.Rime
-	nybble ICON_GRASS	  ; Cactus
+	nybble ICON_GRASS     ; Tangela
+	nybble ICON_GRASS     ; Tangrowth
+	nybble ICON_QUADRUPED ; Ramoose
 	nybble ICON_MON       ; Hitmonlee
 	nybble ICON_MON       ; Hitmonchan
 	nybble ICON_MON       ; Hitmontop
 	nybble ICON_HELIX     ; Shellder
 	nybble ICON_HELIX     ; Cloyster
-	nybble ICON_HELIX     ; Taaban
+	nybble ICON_HELIX     ; Disturban
 	nybble ICON_HELIX     ; Staryu
 	nybble ICON_HELIX     ; Starmie
 	nybble ICON_WATER     ; Seel
 	nybble ICON_WATER     ; Dewgong
-	nybble ICON_WATER     ; Blastyke
-	nybble ICON_WATER     ; Blastoise
 	nybble ICON_WATER     ; Horsea
 	nybble ICON_WATER     ; Seadra
 	nybble ICON_WATER     ; Kingdra
-	nybble ICON_WATER	  ; Jagg
+	nybble ICON_WATER     ; Blastyke
+	nybble ICON_WATER     ; Blastoise
+	nybble ICON_WATER	  ; Sharpoon
 	nybble ICON_GRASS     ; Exeggcute
 	nybble ICON_GRASS     ; Exeggutor
 	nybble ICON_GRASS     ; Exeggutor-A
@ -205,18 +197,18 @@ MonPartyData:
 	nybble ICON_BUG       ; Scizor
 	nybble ICON_BUG       ; Kleavor
 	nybble ICON_BUG       ; Pinsir
-	nybble ICON_BUG       ; Purakkusu
+	nybble ICON_BUG       ; Tricules
 	nybble ICON_MON	      ; Kangaskhan
 	nybble ICON_MON       ; Trampel
 	nybble ICON_QUADRUPED ; Tauros
 	nybble ICON_QUADRUPED ; Tauros-P
-	nybble ICON_QUADRUPED ; Tauros-PA
 	nybble ICON_QUADRUPED ; Tauros-PB
+	nybble ICON_QUADRUPED ; Tauros-PA
 	nybble ICON_FAIRY     ; Chansey
 	nybble ICON_FAIRY     ; Blissey
-	nybble ICON_MON	      ; Skimper
-	nybble ICON_MON	      ; Bawligua
-	nybble ICON_MON	      ; Cryithan
+	nybble ICON_GRASS	  ; Cactormus
+	nybble ICON_MON       ; Mr.Mime
+	nybble ICON_MON       ; Mr.Rime
 	nybble ICON_MON       ; Jynx
 	nybble ICON_MON       ; Buu
 	nybble ICON_MON       ; Electabuzz
@ -224,6 +216,8 @@ MonPartyData:
 	nybble ICON_MON       ; Magmar
 	nybble ICON_MON       ; Magmortar
 	nybble ICON_WATER     ; Lapras
+	nybble ICON_MON       ; Ditto
+	nybble ICON_MON       ; Mimmeo
 	nybble ICON_BALL      ; Porygon
 	nybble ICON_BALL      ; Porygon2
 	nybble ICON_BALL      ; Porygon-Z
@ -233,11 +227,14 @@ MonPartyData:
 	nybble ICON_HELIX     ; Kabutops
 	nybble ICON_BIRD      ; Aerodactyl
 	nybble ICON_MON	      ; Decilla
-	nybble ICON_MON	      ; Gyaoon
-	nybble ICON_MON	      ; Omega
+	nybble ICON_MON	      ; Gawarhed
+	nybble ICON_MON	      ; Omegadge
 	nybble ICON_MON       ; Snorlax
 	nybble ICON_FAIRY     ; Scream Tail
 	nybble ICON_BALL      ; Sandy Shocks
+	nybble ICON_MON	      ; Squeamata
+	nybble ICON_MON	      ; Ministare
+	nybble ICON_MON	      ; Iguanarch
 	nybble ICON_SNAKE     ; Dratini
 	nybble ICON_SNAKE     ; Dragonair
 	nybble ICON_SNAKE     ; Dragonite
--- a/data/pokemon/names.asm
+++ b/data/pokemon/names.asm
@ -68,7 +68,7 @@ MonsterNames::
 	db "DRAGONITE@"
 	db "CACTORMUS@"
 	db "SHARPOON@@"
-	db "BITTYBAT@@"
+	db "WIGLETT@@@"
 	db "DODUO@@@@@"
 	db "POLIWAG@@@"
 	db "JYNX@@@@@@"
@ -139,7 +139,7 @@ MonsterNames::
 	db "DECILLA@@@"
 	db "KINGLER@@@"
 	db "CLOYSTER@@"
-	db "MAGNETITE@"
+	db "WUGTRIO@@@"
 	db "ELECTRODE@"
 	db "CLEFABLE@@"
 	db "WEEZING@@@"
@ -190,7 +190,6 @@ MonsterNames::
 	db "BELLSPROUT"
 	db "WEEPINBELL"
 	db "VICTREEBEL"
-	db "BURGELA@@@" ; changing Monja's even though it's on the chopping block anyway
 	db "SCIZOR@@@@"
 	db "RHYPERIOR@"
 	db "ESPEON@@@@"
@ -223,8 +222,6 @@ MonsterNames::
 	db "ANNIHILAPE"
 	db "SCREAMTAIL"
 	db "SANDY SHOX"
-	db "WIGLETT@@@"
-	db "WUGTRIO@@@"
 	db "TOEDSCOOL@"
 	db "TOEDSCRUEL"
 	db "PERRSERKER"
--- a/data/pokemon/new_dex_text.asm
+++ b/data/pokemon/new_dex_text.asm
@ -1,4 +1,4 @@
-_GyaoonDexEntry::			; Changed to past tense to be more consistent with other fossil entries
+_GawarhedDexEntry::			; Changed to past tense to be more consistent with other fossil entries
 	text "Very dangerous"
 	next "and frequently"
 	next "rampaged wildly."
@ -18,7 +18,7 @@ _GuardiaDexEntry::			; Cubone gets a happy ending!
 	next "ready to evolve"
 	dex

-_DeerDexEntry::
+_RamooseDexEntry::
 	text "It wildly swings"
 	next "its huge antlers"
 	next "to deter threats."
@ -28,7 +28,7 @@ _DeerDexEntry::
 	next "prized by hunters"
 	dex

-_MadaamuDexEntry::			; Official entry from GS beta, reworded
+_LuxwanDexEntry::			; Official entry from GS beta, reworded
 	text "A species that is"
 	next "rarely seen. It"
 	next "always holds a"
@ -68,7 +68,7 @@ _KotoraDexEntry::
 	next "pet regardless"
 	dex

-_JaggDexEntry::
+_SharpoonDexEntry::
 	text "Also known as the"
 	next "Sailor's Scourge,"
 	next "SHARPOON rams its"
@ -98,7 +98,7 @@ _GaotoraDexEntry::			; references real tiger hunting
 	next "tough fangs"
 	dex

-_CactusDexEntry::
+_CactormusDexEntry::
 	text "Found in arid"
 	next "regions. Its legs"
 	next "are adapted for"
@ -108,7 +108,7 @@ _CactusDexEntry::
 	next "rocky terrain"
 	dex

-_KonyaDexEntry::
+_CoinpurDexEntry::
 	text "Its eyesight is"
 	next "still developing,"
 	next "so it cannot see"
@ -118,7 +118,7 @@ _KonyaDexEntry::
 	next "hoard small coins"
 	dex

-_BittybatDexEntry::	
+_BittybatDexEntry::			; unused
 	text "Flits about in"
 	next "dark caves. A"
 	next "swarm of BITTYBAT"
@ -138,7 +138,7 @@ _RibbitoDexEntry::
 	next "appear larger"
 	dex

-_CryithanDexEntry::
+_IguanarchDexEntry::
 	text "Highly aggressive,"
 	next "it drives other"
 	next "#MON away with"
@ -168,7 +168,7 @@ _BuuDexEntry::
 	next "in the tundra"
 	dex

-_SkimperDexEntry::
+_SqueamataDexEntry::
 	text "Incredibly timid,"
 	next "it flees at the"
 	next "smallest sign of"
@ -178,7 +178,7 @@ _SkimperDexEntry::
 	next "difficult task"
 	dex

-_BawliguaDexEntry::
+_MinistareDexEntry::
 	text "Often climbs atop"
 	next "branches to feast"
 	next "on foliage. When"
@ -188,7 +188,7 @@ _BawliguaDexEntry::
 	next "unnerving GLARE"
 	dex

-_PuchikoonDexEntry::		; referenced from various Ponyta entries. Funny how both Vulpix and Ponyta do this...
+_KoltaDexEntry::		; referenced from various Ponyta entries. Funny how both Vulpix and Ponyta do this...
 	text "A weak runner that"
 	next "gradually becomes"
 	next "faster by chasing"
@ -198,7 +198,7 @@ _PuchikoonDexEntry::		; referenced from various Ponyta entries. Funny how both V
 	next "hot to touch"
 	dex

-_GyopinDexEntry::			; reworked, thank you Ness :3  ~M
+_OrfryDexEntry::				; reworked, thank you Ness :3  ~Martha
 	text "Its tiny fins make"
 	next "it an unskilled"
 	next "swimmer. It fends"
@ -218,7 +218,7 @@ _GorochuDexEntry::
 	next "physical strength"
 	dex

-_MikonDexEntry::
+_VulpiiiDexEntry::
 	text "While young, it"
 	next "has three soft,"
 	next "gorgeous tails."
@ -278,7 +278,7 @@ _GorotoraDexEntry::
 	next "#MON trainers"
 	dex

-_OmegaDexEntry::
+_OmegadgeDexEntry::
 	text "A recent creation"
 	next "by SILPH CO."
 	next "Modeled after the"
@ -288,7 +288,7 @@ _OmegaDexEntry::
 	next "devastating power"
 	dex

-_PurakkusuDexEntry::		; Official entry from GS beta, reworded
+_TriculesDexEntry::		; Official entry from GS beta, reworded
 	text "Withstands foes'"
 	next "attacks with its"
 	next "sturdy body, then"
@ -308,7 +308,7 @@ _TrampelDexEntry::
 	next "using its trunk"
 	dex

-_CrockyDexEntry::
+_GavillainDexEntry::
 	text "Its huge eyes can"
 	next "glow to brighten"
 	next "its surroundings."
@ -328,7 +328,7 @@ _PendrakenDexEntry::
 	next "before attacking"
 	dex

-_MagnetiteDexEntry::
+_MagnetiteDexEntry::		; unused
 	text "Occasionally, it"
 	next "attracts so much"
 	next "metal to itself"
@ -348,7 +348,7 @@ _NidoreignDexEntry::
 	next "and NIDORINO"
 	dex

-_BarundaDexEntry::
+_BalumbaDexEntry::
 	text "Often mistaken"
 	next "for an ordinary"
 	next "balloon. If its"
@ -358,7 +358,7 @@ _BarundaDexEntry::
 	next "shrill screech"
 	dex

-_TsubomittoDexEntry::		; references Sprout Tower in Johto
+_BellignanDexEntry::		; references Sprout Tower in Johto
 	text "A plant #MON"
 	next "that's revered in"
 	next "another region."
@ -368,7 +368,7 @@ _TsubomittoDexEntry::		; references Sprout Tower in Johto
 	next "found in soil"
 	dex

-_AnimonDexEntry::
+_MimmeoDexEntry::
 	text "A sudden mutation"
 	next "of DITTO, its"
 	next "mimicry skills"
@ -378,7 +378,7 @@ _AnimonDexEntry::
 	next "in an instant"
 	dex

-_MonjaDexEntry::
+_MonjaDexEntry::			; unused
 	text "As it runs about,"
 	next "the vines on its"
 	next "head may obscure"
@ -388,7 +388,7 @@ _MonjaDexEntry::
 	next "trip and fall"
 	dex

-_TaabanDexEntry::
+_DisturbanDexEntry::
 	text "It evolved after"
 	next "biting a SLOWPOKE."
 	next "While draining its"
@ -408,7 +408,7 @@ _KokanaDexEntry::
 	next "their roots"
 	dex

-_KasanagiDexEntry::
+_PupalDexEntry::
 	text "While awaiting"
 	next "evolution, it"
 	next "barely moves. If"
@ -419,8 +419,8 @@ _KasanagiDexEntry::
 	dex

 _CarapthorDexEntry::
-	text "Often called the"
-	next "Forest Gent,"
+	text "It's often called"
+	next "the Forest Gent."
 	next "CARAPTHOR strolls"

 	page "around forests"
@ -434,7 +434,7 @@ _ScizorDexEntry::
 	next "objects with ease."

 	page "Battles between it"
-	next "and PURAKKUSU are"
+	next "and TRICULES are"
 	next "a sight to behold"
 	dex

@ -649,23 +649,23 @@ _PorygonZDexEntry::
 	dex
 	
 _KleavorDexEntry::
-	text "The axes on its"
-	next "forearms are not"
-	next "only tough, but"
+	text "Capable of cutting"
+	next "down a fully-grown"
+	next "tree in one slice,"

-	page "sharp enough to"
-	next "fall huge trees"
-	next "in a single slice"
+	page "thanks to the two"
+	next "sharp stone axes"
+	next "that it wields"
 	dex

 _AnnihilapeDexEntry::
 	text "Fuelled by a new,"
 	next "spirit-like power,"
-	next "ANNIHILAPE's blows"
+	next "its punches have"

-	page "break the minds"
-	next "and bones of its"
-	next "opponents"
+	page "enough power to"
+	next "shatter both minds"
+	next "and bones alike"
 	dex
 	
 _WiglettDexEntry::
@ -689,13 +689,13 @@ _WugtrioDexEntry::
 	dex
 	
 _ToedscoolDexEntry::
-	text "Looks similar to"
-	next "TENTACOOL, but it"
-	next "is a completely"
+	text "It scatters spores"
+	next "as it runs around."
+	next "The flaps that can"

-	page "different species."
-	next "It scatters spores"
-	next "as it runs around"
+	page "fall from its body"
+	next "are chewy, and are"
+	next "used in recipes"
 	dex
 	
 _ToedscruelDexEntry::
@ -709,23 +709,23 @@ _ToedscruelDexEntry::
 	dex
 	
 _ScreamTailDexEntry::
-	text "It matches the"
-	next "description of"
-	next "an ancient"
+	text "It resembles a"
+	next "creature depicted"
+	next "in a strange book,"

-	page "JIGGLYPUFF that"
-	next "was found in a"
-	next "strange book"
+	page "believed to be a"
+	next "JIGGLYPUFF from"
+	next "ancient times"
 	dex
 	
 _SandyShocksDexEntry::
-	text "Greatly resembles"
-	next "MAGNETON. Some"
-	next "speculate that"
+	text "Shares many traits"
+	next "with an ancient"
+	next "MAGNETON described"

-	page "MAGNETON looked"
-	next "like this over"
-	next "10,000 years ago"
+	page "in a mysterious"
+	next "book, but little"
+	next "else is known"
 	dex

 _MeltanDexEntry::
@ -815,7 +815,7 @@ _ArcanineHDexEntry::
 	
 	page "its foe before"
 	next "biting it in a"
-	next "vicious rage" ; reference to Raging Fury, its signature move.
+	next "vicious rage" ; reference to Raging Fury
 	dex

 _ElectrodeHDexEntry::
@ -868,7 +868,7 @@ _NinetalesADexEntry::
 	next "from its home"
 	dex

-_DugtrioADexEntry::		; revised to add more info
+_DugtrioADexEntry::
 	text "The metal whiskers"
 	next "on its heads help"
 	next "protect it from"
@ -946,7 +946,7 @@ _ExeggutorADexEntry::
 	page "However, as a"
 	next "result, its PSI"
 	next "has weakened"
-	dex ; consider revising
+	dex

 _MarowakADexEntry::
 	text "While dancing in"
@ -969,33 +969,33 @@ _WeezingGDexEntry::
 	dex

 _TaurosPDexEntry::
-	text "Known as the"
-	next "Combat Breed,"
-	next "this TAUROS uses"
+	text "The Combat Breed"
+	next "of this variant of"
+	next "TAUROS uses its"
 	
-	page "its short horns to"
+	page "short horns to"
 	next "target its foe's"
 	next "weak points"
 	dex

 _TaurosPBDexEntry::
-	text "Known as the"
-	next "Blaze Breed,"
-	next "this TAUROS can"
+	text "People often call"
+	next "this TAUROS the"
+	next "Blaze Breed, due"
 	
-	page "expel hot air from"
-	next "its nostrils and"
+	page "to its ability to"
 	next "heat up its horns"
+	next "and expel hot air"
 	dex

 _TaurosPADexEntry::
-	text "Known as the"
-	next "Aqua Breed,"
-	next "this TAUROS can"
+	text "Known as the Aqua"
+	next "Breed, this form"
+	next "of TAUROS shoots"
 	
-	page "shoot water at"
-	next "high pressure from"
-	next "its horns"
+	page "high-pressure jets"
+	next "of water from the"
+	next "tips of its horns"
 	dex

 _MissingNoDexEntry::
--- a/data/pokemon/palettes.asm
+++ b/data/pokemon/palettes.asm
@ -29,7 +29,7 @@ MonsterPalettes:
 	db PAL_BROWNMON  ; PIDGEY
 	db PAL_BROWNMON  ; PIDGEOTTO
 	db PAL_BROWNMON  ; PIDGEOT
-	db PAL_YELLOWMON ; KONYA
+	db PAL_YELLOWMON ; COINPUR
 	db PAL_YELLOWMON ; MEOWTH
 	db PAL_YELLOWMON ; PERSIAN
 	db PAL_CYANMON   ; PERSIAN_A
@ -41,15 +41,13 @@ MonsterPalettes:
 	db PAL_YELLOWMON ; KAKUNA
 	db PAL_YELLOWMON ; BEEDRILL
 	db PAL_YELLOWMON ; KOKANA
-	db PAL_YELLOWMON ; KASANAGI
+	db PAL_YELLOWMON ; PUPAL
 	db PAL_YELLOWMON ; CARAPTHOR
+	db PAL_YELLOWMON ; KOTORA
+	db PAL_YELLOWMON ; GAOTORA
+	db PAL_YELLOWMON ; GOROTORA
 	db PAL_BROWNMON  ; SPEAROW
 	db PAL_BROWNMON  ; FEAROW
-	db PAL_PURPLEMON ; EKANS
-	db PAL_PURPLEMON ; ARBOK
-	db PAL_BROWNMON  ; SANDSHREW
-	db PAL_BROWNMON  ; SANDSLASH
-	db PAL_CYANMON   ; SANDSLASH_A
 	db PAL_BLUEMON   ; NIDORAN_F
 	db PAL_BLUEMON   ; NIDORINA
 	db PAL_BLUEMON   ; NIDOQUEEN
@ -57,7 +55,6 @@ MonsterPalettes:
 	db PAL_PURPLEMON ; NIDORINO
 	db PAL_PURPLEMON ; NIDOKING
 	db PAL_GREYMON   ; NIDOREIGN
-	db PAL_BLUEMON   ; BITTYBAT
 	db PAL_BLUEMON   ; ZUBAT
 	db PAL_BLUEMON   ; GOLBAT
 	db PAL_PURPLEMON ; CROBAT
@ -71,13 +68,15 @@ MonsterPalettes:
 	db PAL_PINKMON   ; CLEFABLE
 	db PAL_PINKMON   ; JIGGLYPUFF
 	db PAL_PINKMON   ; WIGGLYTUFF
-	db PAL_REDMON    ; MIKON
+	db PAL_BROWNMON  ; SANDSHREW
+	db PAL_BROWNMON  ; SANDSLASH
+	db PAL_CYANMON   ; SANDSLASH_A
+	db PAL_PURPLEMON ; EKANS
+	db PAL_PURPLEMON ; ARBOK
+	db PAL_REDMON    ; VULPIII
 	db PAL_REDMON    ; VULPIX
 	db PAL_YELLOWMON ; NINETALES
 	db PAL_CYANMON   ; NINETALES_A
-	db PAL_REDMON    ; GROWLITHE
-	db PAL_REDMON    ; ARCANINE
-	db PAL_REDMON    ; ARCANINE_A
 	db PAL_BROWNMON  ; MANKEY
 	db PAL_BROWNMON  ; PRIMEAPE
 	db PAL_GREYMON   ; ANNIHILAPE
@ -88,16 +87,14 @@ MonsterPalettes:
 	db PAL_GREENMON  ; BELLSPROUT
 	db PAL_GREENMON  ; WEEPINBELL
 	db PAL_GREENMON  ; VICTREEBEL
-	db PAL_GREENMON  ; TSUBOMITTO
+	db PAL_GREENMON  ; BELLIGNAN
 	db PAL_REDMON    ; MAGIKARP
 	db PAL_BLUEMON   ; GYARADOS
-	db PAL_REDMON    ; GYOPIN
+	db PAL_REDMON    ; ORFRY
 	db PAL_REDMON    ; GOLDEEN
 	db PAL_REDMON    ; SEAKING
 	db PAL_PURPLEMON ; VENONAT
 	db PAL_PURPLEMON ; VENOMOTH
-	db PAL_PURPLEMON ; CHEEP
-	db PAL_PURPLEMON ; JABETTA
 	db PAL_YELLOWMON ; PSYDUCK
 	db PAL_GREENMON  ; WEIRDUCK
 	db PAL_CYANMON   ; GOLDUCK
@ -108,8 +105,14 @@ MonsterPalettes:
 	db PAL_YELLOWMON ; ABRA
 	db PAL_YELLOWMON ; KADABRA
 	db PAL_YELLOWMON ; ALAKAZAM
+	db PAL_REDMON    ; GROWLITHE
+	db PAL_REDMON    ; ARCANINE
+	db PAL_REDMON    ; ARCANINE_H
 	db PAL_PINKMON   ; LICKITUNG
 	db PAL_PINKMON   ; LICKILICKY
+	db PAL_BROWNMON  ; FARFETCHD
+	db PAL_BROWNMON  ; LUXWAN
+	db PAL_BROWNMON  ; SIRFETCHD
 	db PAL_YELLOWMON ; DROWZEE
 	db PAL_YELLOWMON ; HYPNO
 	db PAL_BROWNMON  ; DIGLETT
@ -119,9 +122,6 @@ MonsterPalettes:
 	db PAL_PINKMON   ; WUGTRIO
 	db PAL_GREYMON   ; ONIX
 	db PAL_GREYMON   ; STEELIX
-	db PAL_YELLOWMON ; KOTORA
-	db PAL_YELLOWMON ; GAOTORA
-	db PAL_YELLOWMON ; GOROTORA
 	db PAL_REDMON    ; VOLTORB
 	db PAL_REDMON    ; ELECTRODE
 	db PAL_REDMON    ; ELECTRODE_H
@ -131,16 +131,16 @@ MonsterPalettes:
 	db PAL_YELLOWMON ; TOEDSCRUEL
 	db PAL_MEWMON    ; BLOTTLE
 	db PAL_MEWMON    ; PENDRAKEN
-	db PAL_GREENMON  ; RIBBITO
-	db PAL_GREENMON  ; CROAKOZUNA
 	db PAL_GREYMON   ; MAGNEMITE
-	db PAL_GREYMON   ; MAGNETITE
 	db PAL_GREYMON   ; MAGNETON
 	db PAL_GREYMON   ; MAGNEZONE
+	db PAL_PURPLEMON ; CHEEP
+	db PAL_PURPLEMON ; JABETTA
+	db PAL_GREENMON  ; RIBBITO
+	db PAL_GREENMON  ; CROAKOZUNA
 	db PAL_GREYMON   ; MACHOP
 	db PAL_GREYMON   ; MACHOKE
 	db PAL_GREYMON   ; MACHAMP
-	db PAL_GREENMON  ; CROCKY
 	db PAL_REDMON    ; KRABBY
 	db PAL_REDMON    ; KINGLER
 	db PAL_PINKMON   ; SLOWPOKE
@ -148,15 +148,12 @@ MonsterPalettes:
 	db PAL_PURPLEMON ; SLOWBRO_G
 	db PAL_PINKMON   ; SLOWKING
 	db PAL_PURPLEMON ; SLOWKING_G
-	db PAL_REDMON    ; PUCHIKOON
+	db PAL_GREENMON  ; GAVILLAIN
+	db PAL_REDMON    ; KOLTA
 	db PAL_REDMON    ; PONYTA
 	db PAL_REDMON    ; RAPIDASH
 	db PAL_PURPLEMON ; RAPIDASH_G
-	db PAL_BROWNMON  ; DEER
-	db PAL_BLUEMON   ; MONJA
-	db PAL_BLUEMON   ; TANGELA
-	db PAL_CYANMON   ; TANGROWTH
-	db PAL_PINKMON   ; BARUNDA
+	db PAL_PINKMON   ; BALUMBA
 	db PAL_PURPLEMON ; GASTLY
 	db PAL_PURPLEMON ; HAUNTER
 	db PAL_PURPLEMON ; GENGAR
@ -164,9 +161,6 @@ MonsterPalettes:
 	db PAL_BROWNMON  ; MAROWAK
 	db PAL_PURPLEMON ; MAROWAK_A
 	db PAL_BROWNMON  ; GUARDIA
-	db PAL_BROWNMON  ; FARFETCHD
-	db PAL_BROWNMON  ; MADAAMU
-	db PAL_BROWNMON  ; SIRFETCHD
 	db PAL_BROWNMON  ; DODUO
 	db PAL_BROWNMON  ; DODRIO
 	db PAL_PURPLEMON ; GRIMER
@ -175,27 +169,25 @@ MonsterPalettes:
 	db PAL_PURPLEMON ; KOFFING
 	db PAL_PURPLEMON ; WEEZING
 	db PAL_GREYMON   ; WEEZING_G
-	db PAL_PURPLEMON ; DITTO
-	db PAL_PURPLEMON ; ANIMON
-	db PAL_PINKMON   ; MR_MIME
-	db PAL_CYANMON   ; MR_RIME
-	db PAL_GREENMON  ; CACTUS
+	db PAL_BLUEMON   ; TANGELA
+	db PAL_CYANMON   ; TANGROWTH
+	db PAL_BROWNMON  ; RAMOOSE
 	db PAL_BROWNMON  ; HITMONLEE
 	db PAL_BROWNMON  ; HITMONCHAN
 	db PAL_BROWNMON  ; HITMONTOP
 	db PAL_PURPLEMON ; SHELLDER
 	db PAL_PURPLEMON ; CLOYSTER
-	db PAL_GREYMON   ; TAABAN
+	db PAL_GREYMON   ; DISTURBAN
 	db PAL_REDMON    ; STARYU
 	db PAL_PURPLEMON ; STARMIE
 	db PAL_BLUEMON   ; SEEL
 	db PAL_BLUEMON   ; DEWGONG
-	db PAL_CYANMON   ; BLASTYKE
-	db PAL_CYANMON   ; BLASTOISE
 	db PAL_CYANMON   ; HORSEA
 	db PAL_CYANMON   ; SEADRA
 	db PAL_CYANMON   ; KINGDRA
-	db PAL_BLUEMON   ; JAGG
+	db PAL_CYANMON   ; BLASTYKE
+	db PAL_CYANMON   ; BLASTOISE
+	db PAL_BLUEMON   ; SHARPOON
 	db PAL_PINKMON   ; EXEGGCUTE
 	db PAL_GREENMON  ; EXEGGUTOR
 	db PAL_GREENMON  ; EXEGGUTOR_A
@ -206,18 +198,18 @@ MonsterPalettes:
 	db PAL_REDMON    ; SCIZOR
 	db PAL_BROWNMON  ; KLEAVOR
 	db PAL_BROWNMON  ; PINSIR
-	db PAL_BROWNMON  ; PURAKKUSU
+	db PAL_BROWNMON  ; TRICULES
 	db PAL_BROWNMON  ; KANGASKHAN
 	db PAL_GREYMON   ; TRAMPEL
 	db PAL_BROWNMON  ; TAUROS
 	db PAL_GREYMON   ; TAUROS_P
-	db PAL_CYANMON   ; TAUROS_PA
 	db PAL_REDMON    ; TAUROS_PB
+	db PAL_CYANMON   ; TAUROS_PA
 	db PAL_PINKMON   ; CHANSEY
 	db PAL_PINKMON   ; BLISSEY
-	db PAL_GREENMON  ; SKIMPER
-	db PAL_GREENMON  ; BAWLIGUA
-	db PAL_GREENMON  ; CRYITHAN
+	db PAL_GREENMON  ; CACTORMUS
+	db PAL_PINKMON   ; MR_MIME
+	db PAL_CYANMON   ; MR_RIME
 	db PAL_REDBAR    ; JYNX
 	db PAL_BLUEMON   ; BUU
 	db PAL_YELLOWMON ; ELECTABUZZ
@ -225,6 +217,8 @@ MonsterPalettes:
 	db PAL_REDMON    ; MAGMAR
 	db PAL_REDMON    ; MAGMORTAR
 	db PAL_CYANMON   ; LAPRAS
+	db PAL_PURPLEMON ; DITTO
+	db PAL_PURPLEMON ; MIMMEO
 	db PAL_MEWMON    ; PORYGON
 	db PAL_MEWMON    ; PORYGON2
 	db PAL_MEWMON    ; PORYGONZ
@ -234,11 +228,14 @@ MonsterPalettes:
 	db PAL_BROWNMON  ; KABUTOPS
 	db PAL_GREYMON   ; AERODACTYL
 	db PAL_GREENMON  ; DECILLA
-	db PAL_GREENMON  ; GYAOON
-	db PAL_GREYMON   ; OMEGA
+	db PAL_GREENMON  ; GAWARHED
+	db PAL_GREYMON   ; OMEGADGE
 	db PAL_MEWMON    ; SNORLAX
 	db PAL_PINKMON   ; SCREAM_TAIL
 	db PAL_GREYMON   ; SANDY_SHOCKS
+	db PAL_GREENMON  ; SQUEAMATA
+	db PAL_GREENMON  ; MINISTARE
+	db PAL_GREENMON  ; IGUANARCH
 	db PAL_BLUEMON   ; DRATINI
 	db PAL_BLUEMON   ; DRAGONAIR
 	db PAL_BROWNMON  ; DRAGONITE
--- a/data/pokemon/title_mons.asm
+++ b/data/pokemon/title_mons.asm
@ -3,11 +3,11 @@ TitleMons:
 	db TOTARTLE     ; New Starters
 	db GOROCHU
 	db SYLVEON
-	db CROCKY       ; RG Betas
-	db JAGG
-	db GYAOON
-	db TSUBOMITTO	; GS Betas
-	db MADAAMU
+	db GAVILLAIN       ; RG Betas
+	db SHARPOON
+	db GAWARHED
+	db BELLIGNAN	; GS Betas
+	db LUXWAN
 	db PORYGON2     ; Post-Gen 1 Evos
 	db MAGNEZONE
 	db ANNIHILAPE
@ -15,4 +15,4 @@ TitleMons:
 	db WUGTRIO
 	db MELTAN
 	db EXEGGUTOR_A  ; Regional Variants
-	db TAUROS_PA
+	db TAUROS_PB
--- a/data/pokemon/tradeback_moves.asm
+++ b/data/pokemon/tradeback_moves.asm
@ -35,7 +35,7 @@ TradebackMovesPointerTable:
 	dw BlastoiseTradebackMoves
 	dw PinsirTradebackMoves
 	dw TangelaTradebackMoves
-	dw GyaoonTradebackMoves
+	dw GawarhedTradebackMoves
 	dw NidoreignTradebackMoves
 	dw GrowlitheTradebackMoves
 	dw OnixTradebackMoves
@ -54,26 +54,26 @@ TradebackMovesPointerTable:
 	dw PsyduckTradebackMoves
 	dw DrowzeeTradebackMoves
 	dw GolemTradebackMoves
-	dw BarundaTradebackMoves
+	dw BalumbaTradebackMoves
 	dw MagmarTradebackMoves
 	dw BuuTradebackMoves
 	dw ElectabuzzTradebackMoves
 	dw MagnetonTradebackMoves
 	dw KoffingTradebackMoves
-	dw DeerTradebackMoves
+	dw RamooseTradebackMoves
 	dw MankeyTradebackMoves
 	dw SeelTradebackMoves
 	dw DiglettTradebackMoves
 	dw TaurosTradebackMoves
 	dw TrampelTradebackMoves
-	dw CrockyTradebackMoves
+	dw GavillainTradebackMoves
 	dw BlottleTradebackMoves
 	dw FarfetchdTradebackMoves
 	dw VenonatTradebackMoves
 	dw DragoniteTradebackMoves
-	dw CactusTradebackMoves
-	dw JaggTradebackMoves
-	dw BittybatTradebackMoves
+	dw CactormusTradebackMoves
+	dw SharpoonTradebackMoves
+	dw WiglettTradebackMoves
 	dw DoduoTradebackMoves
 	dw PoliwagTradebackMoves
 	dw JynxTradebackMoves
@ -85,7 +85,7 @@ TradebackMovesPointerTable:
 	dw KrabbyTradebackMoves
 	dw CheepTradebackMoves
 	dw JabettaTradebackMoves
-	dw MikonTradebackMoves
+	dw VulpiiiTradebackMoves
 	dw VulpixTradebackMoves
 	dw NinetalesTradebackMoves
 	dw PikachuTradebackMoves
@ -98,8 +98,8 @@ TradebackMovesPointerTable:
 	dw KabutopsTradebackMoves
 	dw HorseaTradebackMoves
 	dw SeadraTradebackMoves
-	dw BawliguaTradebackMoves
-	dw CryithanTradebackMoves
+	dw MinistareTradebackMoves
+	dw IguanarchTradebackMoves
 	dw SandshrewTradebackMoves
 	dw SandslashTradebackMoves
 	dw OmanyteTradebackMoves
@ -119,13 +119,13 @@ TradebackMovesPointerTable:
 	dw WeedleTradebackMoves
 	dw KakunaTradebackMoves
 	dw BeedrillTradebackMoves
-	dw MadaamuTradebackMoves
+	dw LuxwanTradebackMoves
 	dw DodrioTradebackMoves
 	dw PrimeapeTradebackMoves
 	dw DugtrioTradebackMoves
 	dw VenomothTradebackMoves
 	dw DewgongTradebackMoves
-	dw PurakkusuTradebackMoves
+	dw TriculesTradebackMoves
 	dw PendrakenTradebackMoves
 	dw CaterpieTradebackMoves
 	dw MetapodTradebackMoves
@ -138,13 +138,13 @@ TradebackMovesPointerTable:
 	dw MewtwoTradebackMoves
 	dw SnorlaxTradebackMoves
 	dw MagikarpTradebackMoves
-	dw KonyaTradebackMoves
-	dw OmegaTradebackMoves
+	dw CoinpurTradebackMoves
+	dw OmegadgeTradebackMoves
 	dw MukTradebackMoves
 	dw DecillaTradebackMoves
 	dw KinglerTradebackMoves
 	dw CloysterTradebackMoves
-	dw MagnetiteTradebackMoves
+	dw WugtrioTradebackMoves
 	dw ElectrodeTradebackMoves
 	dw ClefableTradebackMoves
 	dw WeezingTradebackMoves
@ -160,13 +160,13 @@ TradebackMovesPointerTable:
 	dw BulbasaurTradebackMoves
 	dw VenusaurTradebackMoves
 	dw TentacruelTradebackMoves
-	dw GyopinTradebackMoves
+	dw OrfryTradebackMoves
 	dw GoldeenTradebackMoves
 	dw SeakingTradebackMoves
 	dw KotoraTradebackMoves
 	dw GaotoraTradebackMoves
 	dw GorotoraTradebackMoves
-	dw PuchikoonTradebackMoves
+	dw KoltaTradebackMoves
 	dw PonytaTradebackMoves
 	dw RapidashTradebackMoves
 	dw RattataTradebackMoves
@ -178,7 +178,7 @@ TradebackMovesPointerTable:
 	dw AerodactylTradebackMoves
 	dw BlastykeTradebackMoves
 	dw MagnemiteTradebackMoves
-	dw SkimperTradebackMoves
+	dw SqueamataTradebackMoves
 	dw GorochuTradebackMoves
 	dw CharmanderTradebackMoves
 	dw SquirtleTradebackMoves
@ -195,7 +195,6 @@ TradebackMovesPointerTable:
 	dw BellsproutTradebackMoves
 	dw WeepinbellTradebackMoves
 	dw VictreebelTradebackMoves
-	dw MonjaTradebackMoves
 	dw ScizorTradebackMoves
 	dw RhyperiorTradebackMoves
 	dw EspeonTradebackMoves
@ -206,7 +205,7 @@ TradebackMovesPointerTable:
 	dw LickilickyTradebackMoves
 	dw TangrowthTradebackMoves
 	dw KleavorTradebackMoves
-	dw TsubomittoTradebackMoves
+	dw BellignanTradebackMoves
 	dw SteelixTradebackMoves
 	dw BlisseyTradebackMoves
 	dw HitmontopTradebackMoves
@ -219,17 +218,15 @@ TradebackMovesPointerTable:
 	dw SlowkingTradebackMoves
 	dw ElectivireTradebackMoves
 	dw MagmortarTradebackMoves
-	dw TaabanTradebackMoves
+	dw DisturbanTradebackMoves
 	dw KokanaTradebackMoves
-	dw KasanagiTradebackMoves
+	dw PupalTradebackMoves
 	dw CarapthorTradebackMoves
 	dw MagnezoneTradebackMoves
 	dw PorygonZTradebackMoves
 	dw AnnihilapeTradebackMoves
 	dw ScreamTailTradebackMoves
-	dw SandyShocksTradebackMoves
-	dw WiglettTradebackMoves
-	dw WugtrioTradebackMoves	
+	dw SandyShocksTradebackMoves	
 	dw ToedscoolTradebackMoves
 	dw ToedscruelTradebackMoves
 	dw PerrserkerTradebackMoves
@ -523,7 +520,7 @@ TangelaTradebackMoves:
 	db 1, REFLECT
 	db 0

-GyaoonTradebackMoves:
+GawarhedTradebackMoves:
 	db 1, HEADBUTT ; TM
 	db 1, DEFENSE_CURL ; TM
 	db 1, ICE_PUNCH ; TM
@ -678,7 +675,7 @@ GolemTradebackMoves:
 	db 1, FLAMETHROWER
 	db 0

-BarundaTradebackMoves:
+BalumbaTradebackMoves:
 	db 1, HEADBUTT ; TM
 	db 1, DEFENSE_CURL ; TM
 	db 1, PSYBEAM ; Egg Move from Psychic-types.
@ -729,7 +726,7 @@ KoffingTradebackMoves:
 	db 1, SCREECH
 	db 0

-DeerTradebackMoves:
+RamooseTradebackMoves:
 	db 1, HEADBUTT ; TM, oh boy
 	db 1, ROAR ; TM
 	db 1, QUICK_ATTACK ; Egg Move
@ -775,7 +772,7 @@ TrampelTradebackMoves:
 	db 1, THRASH ; Egg Move
 	db 0

-CrockyTradebackMoves:
+GavillainTradebackMoves:
 	db 1, HEADBUTT ; TM
 	db 1, GROWL ; New Level-Up Move
 	db 1, FIRE_PUNCH ; TM
@ -819,14 +816,14 @@ DragoniteTradebackMoves:
 	db 1, HYDRO_PUMP
 	db 0

-CactusTradebackMoves:
+CactormusTradebackMoves:
 	db 1, HEADBUTT ; TM
 	db 1, DEFENSE_CURL ; TM
 	db 1, SWORDS_DANCE ; Egg Move
 	db 1, LEECH_SEED ; Egg Move
 	db 0

-JaggTradebackMoves:
+SharpoonTradebackMoves:
 	db 1, HEADBUTT ; TM
 	db 1, ROAR ; TM
 	db 1, SHARPEN ; NYPC-like Event
@ -834,9 +831,9 @@ JaggTradebackMoves:
 	db 1, AGILITY ; Egg Move
 	db 0

-BittybatTradebackMoves:
-	db 1, QUICK_ATTACK
-	db 0
+;BittybatTradebackMoves:
+;	db 1, QUICK_ATTACK
+;	db 0

 DoduoTradebackMoves:
 	db 1, SWIFT
@ -885,7 +882,6 @@ ZapdosTradebackMoves:
 	db 0

 DittoTradebackMoves:
-	
 	db 0

 MeowthTradebackMoves:
@ -908,6 +904,8 @@ CheepTradebackMoves:
 	db 1, WATERFALL ; HM
 	db 1, DOUBLE_KICK ; Egg Move
 	db 1, WING_ATTACK ; Egg Move (from Sato?)
+	db 1, AURORA_BEAM ; Egg Move
+	db 1, AGILITY ; Egg Move
 	db 0

 JabettaTradebackMoves:
@ -921,7 +919,7 @@ JabettaTradebackMoves:
 	db 1, AGILITY ; Egg Move
 	db 0

-MikonTradebackMoves:
+VulpiiiTradebackMoves:
 	db 1, HEADBUTT
 	db 1, DISABLE
 	db 1, HYPNOSIS
@ -1036,19 +1034,19 @@ SeadraTradebackMoves:
 	db 1, HAZE
 	db 0

-BawliguaTradebackMoves:
+MinistareTradebackMoves:
 	db 1, HEADBUTT ; TM
 	db 1, THRASH ; Egg Move from Totodile
 	db 1, MIST ; Egg Move from Squirtle, interesting but not good Gen 1 applications, being a screen and all. Also, a pun on "misting" terrariums.
 	db 1, QUICK_ATTACK ; Egg Move, but will need to figure out a route in the Monster Egg Group; alternatively, Monster/Field, so Ponyta could pass it down.
 	db 0

-CryithanTradebackMoves:
+IguanarchTradebackMoves:
 	db 1, HEADBUTT ; TM
 	db 1, ROAR ; TM
 	db 1, THRASH ; Egg Move from Totodile
-	db 1, MIST ; Egg Move from Squirtle, interesting but not good Gen 1 applications, being a screen and all. Also, a pun on "misting" terrariums.
-	db 1, QUICK_ATTACK ; Egg Move, but will need to figure out a route in the Monster Egg Group; alternatively, Monster/Field, so Ponyta could pass it down.
+	db 1, MIST ; Egg Move from Squirtle
+	db 1, QUICK_ATTACK ; Egg Move
 	db 0

 SandshrewTradebackMoves:
@ -1188,18 +1186,15 @@ PoliwrathTradebackMoves:
 	db 0

 WeedleTradebackMoves:
-	
 	db 0

 KakunaTradebackMoves:
-	
 	db 0

 BeedrillTradebackMoves:
-	
 	db 0

-MadaamuTradebackMoves:
+LuxwanTradebackMoves:
 	db 1, HEADBUTT
 	db 1, GUST
 	db 1, MIRROR_MOVE
@ -1242,7 +1237,7 @@ DewgongTradebackMoves:
 	db 1, SLAM
 	db 0

-PurakkusuTradebackMoves:
+TriculesTradebackMoves:
 	db 1, HEADBUTT
 	db 1, FURY_ATTACK
 	db 1, ROCK_THROW
@ -1257,15 +1252,12 @@ PendrakenTradebackMoves:
 	db 0

 CaterpieTradebackMoves:
-	
 	db 0

 MetapodTradebackMoves:
-	
 	db 0

 ButterfreeTradebackMoves:
-	
 	db 0

 MachampTradebackMoves:
@ -1350,7 +1342,7 @@ MagikarpTradebackMoves:
 	db 1, BUBBLE
 	db 0

-KonyaTradebackMoves:
+CoinpurTradebackMoves:
 	db 1, DEFENSE_CURL
 	db 1, DREAM_EATER
 	db 1, HEADBUTT
@ -1358,8 +1350,8 @@ KonyaTradebackMoves:
 	db 1, HYPNOSIS
 	db 0

-; Omegedge will be unable to breed.
-OmegaTradebackMoves:
+; Omegadge will be unable to breed.
+OmegadgeTradebackMoves:
 	db 1, HEADBUTT ; TM
 	db 1, ROAR ; TM
 	db 1, THUNDERPUNCH ; TM
@ -1401,9 +1393,9 @@ CloysterTradebackMoves:
 	db 1, SCREECH
 	db 0

-MagnetiteTradebackMoves:
-	db 1, AGILITY
-	db 0
+;MagnetiteTradebackMoves:
+;	db 1, AGILITY
+;	db 0

 ElectrodeTradebackMoves:
 	db 1, HEADBUTT
@ -1523,7 +1515,7 @@ TentacruelTradebackMoves:
 	db 1, CONFUSE_RAY
 	db 0

-GyopinTradebackMoves:
+OrfryTradebackMoves:
 	db 1, HAZE
 	db 1, HYDRO_PUMP
 	db 1, PSYBEAM
@ -1556,7 +1548,7 @@ KotoraTradebackMoves:
 GaotoraTradebackMoves:
 	db 1, HEADBUTT ; TM
 	db 1, DEFENSE_CURL ; TM
-	db 1, SCREECH ; Egg Move, likely from Persian.
+	db 1, SCREECH ; Egg Move
 	db 1, CHARM ; Egg Move
 	db 1, THRASH ; Egg Move
 	db 0
@ -1564,12 +1556,12 @@ GaotoraTradebackMoves:
 GorotoraTradebackMoves:
 	db 1, HEADBUTT ; TM
 	db 1, DEFENSE_CURL ; TM
-	db 1, SCREECH ; Egg Move, likely from Persian.
+	db 1, SCREECH ; Egg Move
 	db 1, CHARM ; Egg Move
 	db 1, THRASH ; Egg Move
 	db 0

-PuchikoonTradebackMoves:
+KoltaTradebackMoves:
 	db 1, TACKLE
 	db 1, HEADBUTT
 	db 1, FLAMETHROWER
@ -1679,11 +1671,11 @@ MagnemiteTradebackMoves:
 	db 1, AGILITY
 	db 0

-SkimperTradebackMoves:
+SqueamataTradebackMoves:
 	db 1, HEADBUTT ; TM
 	db 1, THRASH ; Egg Move from Totodile
-	db 1, MIST ; Egg Move from Squirtle, interesting but not good Gen 1 applications, being a screen and all. Also, a pun on "misting" terrariums.
-	db 1, QUICK_ATTACK ; Egg Move, but will need to figure out a route in the Monster Egg Group; alternatively, Monster/Field, so Ponyta could pass it down.
+	db 1, MIST ; Egg Move from Squirtle
+	db 1, QUICK_ATTACK ; Egg Move
 	db 0

 GorochuTradebackMoves:
@ -1805,13 +1797,13 @@ VictreebelTradebackMoves:
 	db 1, LEECH_LIFE
 	db 0

-MonjaTradebackMoves:
-	db 1, FLASH
-	db 1, HEADBUTT
-	db 1, AMNESIA
-	db 1, CONFUSION
-	db 1, REFLECT
-	db 0
+;MonjaTradebackMoves:
+;	db 1, FLASH
+;	db 1, HEADBUTT
+;	db 1, AMNESIA
+;	db 1, CONFUSION
+;	db 1, REFLECT
+;	db 0

 ScizorTradebackMoves:
 	db 1, HEADBUTT
@ -1887,7 +1879,7 @@ KleavorTradebackMoves:
 	db 1, SONICBOOM
 	db 0

-TsubomittoTradebackMoves:
+BellignanTradebackMoves:
 	db 1, FLASH
 	db 1, LEECH_LIFE
 	db 0
@ -1917,7 +1909,6 @@ CrobatTradebackMoves:
 	db 0

 AnimonTradebackMoves:
-	
 	db 0
 	
 BellossomTradebackMoves:
@ -1981,22 +1972,19 @@ MagmortarTradebackMoves:
 	db 1, SCREECH
 	db 0
 	
-TaabanTradebackMoves:
+DisturbanTradebackMoves:
 	db 1, BARRIER
 	db 1, SCREECH
 	db 0
 	
 KokanaTradebackMoves:
-	
 	db 0

-KasanagiTradebackMoves:
-	
+PupalTradebackMoves:
 	db 0

 CarapthorTradebackMoves:
 	db 1, HEADBUTT ; TM
-	db 1, ABSORB ; Egg Move from Parasect
 	db 0
 	
 MagnezoneTradebackMoves:
@ -2237,13 +2225,10 @@ TaurosPBTradebackMoves:
 	db 0
 	
 FossilKabutopsTradebackMoves:
-	
 	db 0

 FossilAerodactylTradebackMoves:
-	
 	db 0

 MonGhostTradebackMoves:
-	
 	db 0