1 files changed, 735 insertions, 730 deletions

diff --git a/data/pokedex_entries.asm b/data/pokedex_entries.asm
index 97700cbb..3635ddff 100755
--- a/data/pokedex_entries.asm
+++ b/data/pokedex_entries.asm
@@ -195,1066 +195,1071 @@ PokedexEntryPointers: ; 4050b (10:450b)
 ; weight in pounds
 ; text entry
 
-RhydonDexEntry: ; 405fa (10:45fa)
-	db "DRILL@"
-	db 6,3
-	dw 2650
-	TX_FAR _RhydonDexEntry
-	db "@"
-
-KangaskhanDexEntry: ; 40609 (10:4609)
-	db "PARENT@"
-	db 7,3
-	dw 1760
-	TX_FAR _KangaskhanDexEntry
-	db "@"
-
-NidoranMDexEntry: ; 40619 (10:4619)
-	db "POISON PIN@"
-	db 1,8
-	dw 200
-	TX_FAR _NidoranMDexEntry
-	db "@"
-
-ClefairyDexEntry: ; 4062d (10:462d)
-	db "FAIRY@"
-	db 2,0
-	dw 170
-	TX_FAR _ClefairyDexEntry
-	db "@"
-
-SpearowDexEntry: ; 4063c (10:463c)
-	db "TINY BIRD@"
-	db 1,0
-	dw 40
-	TX_FAR _SpearowDexEntry
-	db "@"
-
-VoltorbDexEntry: ; 4064f (10:464f)
-	db "BALL@"
-	db 1,8
-	dw 230
-	TX_FAR _VoltorbDexEntry
-	db "@"
-
-NidokingDexEntry: ; 4065d (10:465d)
-	db "DRILL@"
-	db 4,7
-	dw 1370
-	TX_FAR _NidokingDexEntry
-	db "@"
-
-SlowbroDexEntry: ; 4066c (10:466c)
-	db "HERMITCRAB@"
-	db 5,3
-	dw 1730
-	TX_FAR _SlowbroDexEntry
+BulbasaurDexEntry: ; 40687 (10:4687)
+	db "SEED@"
+	db 2,4
+	dw 150
+	TX_FAR _BulbasaurDexEntry
 	db "@"
 
-IvysaurDexEntry: ; 40680 (10:4680)
+IvysaurDexEntry: ; 40695 (10:4695)
 	db "SEED@"
 	db 3,3
 	dw 290
 	TX_FAR _IvysaurDexEntry
 	db "@"
 
-ExeggutorDexEntry: ; 4068e (10:468e)
-	db "COCONUT@"
+VenusaurDexEntry: ; 406a3 (10:46a3)
+	db "SEED@"
 	db 6,7
-	dw 2650
-	TX_FAR _ExeggutorDexEntry
-	db "@"
-
-LickitungDexEntry: ; 4069f (10:469f)
-	db "LICKING@"
-	db 3,11
-	dw 1440
-	TX_FAR _LickitungDexEntry
-	db "@"
-
-ExeggcuteDexEntry: ; 406b0 (10:46b0)
-	db "EGG@"
-	db 1,4
-	dw 60
-	TX_FAR _ExeggcuteDexEntry
-	db "@"
-
-GrimerDexEntry: ; 406bd (10:46bd)
-	db "SLUDGE@"
-	db 2,11
-	dw 660
-	TX_FAR _GrimerDexEntry
+	dw 2210
+	TX_FAR _VenusaurDexEntry
 	db "@"
 
-GengarDexEntry: ; 406cd (10:46cd)
-	db "SHADOW@"
-	db 4,11
-	dw 890
-	TX_FAR _GengarDexEntry
+CharmanderDexEntry: ; 406b1 (10:46b1)
+	db "LIZARD@"
+	db 2,
+	dw 190
+	TX_FAR _CharmanderDexEntry
 	db "@"
 
-NidoranFDexEntry: ; 406dd (10:46dd)
-	db "POISON PIN@"
-	db 1,4
-	dw 150
-	TX_FAR _NidoranFDexEntry
+CharmeleonDexEntry: ; 406c1 (10:46c1)
+	db "FLAME@"
+	db 3,7
+	dw 420
+	TX_FAR _CharmeleonDexEntry
 	db "@"
 
-NidoqueenDexEntry: ; 406f1 (10:46f1)
-	db "DRILL@"
-	db 4,3
-	dw 1320
-	TX_FAR _NidoqueenDexEntry
+CharizardDexEntry: ; 406d0 (10:46d0)
+	db "FLAME@"
+	db 5,7
+	dw 2000
+	TX_FAR _CharizardDexEntry
 	db "@"
 
-CuboneDexEntry: ; 40700 (10:4700)
-	db "LONELY@"
-	db 1,4
-	dw 140
-	TX_FAR _CuboneDexEntry
+SquirtleDexEntry: ; 406df (10:46df)
+	db "TINYTURTLE@"
+	db 1,8
+	dw 200
+	TX_FAR _SquirtleDexEntry
 	db "@"
 
-RhyhornDexEntry: ; 40710 (10:4710)
-	db "SPIKES@"
+WartortleDexEntry: ; 406f3 (10:46f3)
+	db "TURTLE@"
 	db 3,3
-	dw 2540
-	TX_FAR _RhyhornDexEntry
-	db "@"
-
-LaprasDexEntry: ; 40720 (10:4720)
-	db "TRANSPORT@"
-	db 8,2
-	dw 4850
-	TX_FAR _LaprasDexEntry
+	dw 500
+	TX_FAR _WartortleDexEntry
 	db "@"
 
-ArcanineDexEntry: ; 40733 (10:4733)
-	db "LEGENDARY@"
-	db 6,3
-	dw 3420
-	TX_FAR _ArcanineDexEntry
+BlastoiseDexEntry: ; 40703 (10:4703)
+	db "SHELLFISH@"
+	db 5,3
+	dw 1890
+	TX_FAR _BlastoiseDexEntry
 	db "@"
 
-MewDexEntry: ; 40746 (10:4746)
-	db "NEW SPECIE@"
-	db 1,4
-	dw 90
-	TX_FAR _MewDexEntry
+CaterpieDexEntry: ; 40716 (10:4716)
+	db "WORM@"
+	db 1,
+	dw 60
+	TX_FAR _CaterpieDexEntry
 	db "@"
 
-GyaradosDexEntry: ; 4075a (10:475a)
-	db "ATROCIOUS@"
-	db 21,4
-	dw 5180
-	TX_FAR _GyaradosDexEntry
+MetapodDexEntry: ; 40724 (10:4724)
+	db "COCOON@"
+	db 2,4
+	dw 220
+	TX_FAR _MetapodDexEntry
 	db "@"
 
-ShellderDexEntry: ; 4076d (10:476d)
-	db "BIVALVE@"
-	db 1,0
-	dw 90
-	TX_FAR _ShellderDexEntry
+ButterfreeDexEntry: ; 40734 (10:4734)
+	db "BUTTERFLY@"
+	db 3,7
+	dw 710
+	TX_FAR _ButterfreeDexEntry
 	db "@"
 
-TentacoolDexEntry: ; 4077e (10:477e)
-	db "JELLYFISH@"
-	db 2,11
-	dw 1000
-	TX_FAR _TentacoolDexEntry
+WeedleDexEntry: ; 40747 (10:4747)
+	db "HAIRY BUG@"
+	db 1,
+	dw 70
+	TX_FAR _WeedleDexEntry
 	db "@"
 
-GastlyDexEntry: ; 40791 (10:4791)
-	db "GAS@"
-	db 4,3
-	dw 2
-	TX_FAR _GastlyDexEntry
+KakunaDexEntry: ; 4075a (10:475a)
+	db "COCOON@"
+	db 2,
+	dw 220
+	TX_FAR _KakunaDexEntry
 	db "@"
 
-ScytherDexEntry: ; 4079e (10:479e)
-	db "MANTIS@"
-	db 4,11
-	dw 1230
-	TX_FAR _ScytherDexEntry
+BeedrillDexEntry: ; 4076a (10:476a)
+	db "POISON BEE@"
+	db 3,3
+	dw 650
+	TX_FAR _BeedrillDexEntry
 	db "@"
 
-StaryuDexEntry: ; 407ae (10:47ae)
-	db "STARSHAPE@"
-	db 2,7
-	dw 760
-	TX_FAR _StaryuDexEntry
+PidgeyDexEntry: ; 4077e (10:477e)
+	db "TINY BIRD@"
+	db 1,
+	dw 40
+	TX_FAR _PidgeyDexEntry
 	db "@"
 
-BlastoiseDexEntry: ; 407c1 (10:47c1)
-	db "SHELLFISH@"
-	db 5,3
-	dw 1890
-	TX_FAR _BlastoiseDexEntry
+PidgeottoDexEntry: ; 40791 (10:4791)
+	db "BIRD@"
+	db 3,7
+	dw 660
+	TX_FAR _PidgeottoDexEntry
 	db "@"
 
-PinsirDexEntry: ; 407d4 (10:47d4)
-	db "STAGBEETLE@"
+PidgeotDexEntry: ; 4079f (10:479f)
+	db "BIRD@"
 	db 4,11
-	dw 1210
-	TX_FAR _PinsirDexEntry
+	dw 870
+	TX_FAR _PidgeotDexEntry
 	db "@"
 
-TangelaDexEntry: ; 407e8 (10:47e8)
-	db "VINE@"
-	db 3,3
-	dw 770
-	TX_FAR _TangelaDexEntry
+RattataDexEntry: ; 407ad (10:47ad)
+	db "RAT@"
+	db 1,
+	dw 80
+	TX_FAR _RattataDexEntry
 	db "@"
 
-GrowlitheDexEntry: ; 407f6 (10:47f6)
-	db "PUPPY@"
+RaticateDexEntry: ; 407ba (10:47ba)
+	db "RAT@"
 	db 2,4
-	dw 420
-	TX_FAR _GrowlitheDexEntry
+	dw 410
+	TX_FAR _RaticateDexEntry
 	db "@"
 
-OnixDexEntry: ; 40805 (10:4805)
-	db "ROCK SNAKE@"
-	db 28,10
-	dw 4630
-	TX_FAR _OnixDexEntry
+SpearowDexEntry: ; 407c7 (10:47c7)
+	db "TINY BIRD@"
+	db 1,
+	dw 40
+	TX_FAR _SpearowDexEntry
 	db "@"
 
-FearowDexEntry: ; 40819 (10:4819)
+FearowDexEntry: ; 407da (10:47da)
 	db "BEAK@"
 	db 3,11
 	dw 840
 	TX_FAR _FearowDexEntry
 	db "@"
 
-PidgeyDexEntry: ; 40827 (10:4827)
-	db "TINY BIRD@"
-	db 1,0
-	dw 40
-	TX_FAR _PidgeyDexEntry
-	db "@"
-
-SlowpokeDexEntry: ; 4083a (10:483a)
-	db "DOPEY@"
-	db 3,11
-	dw 790
-	TX_FAR _SlowpokeDexEntry
+EkansDexEntry: ; 407e8 (10:47e8)
+	db "SNAKE@"
+	db 6,7
+	dw 150
+	TX_FAR _EkansDexEntry
 	db "@"
 
-KadabraDexEntry: ; 40849 (10:4849)
-	db "PSI@"
-	db 4,3
-	dw 1250
-	TX_FAR _KadabraDexEntry
+ArbokDexEntry: ; 407f7 (10:47f7)
+	db "COBRA@"
+	db 11,6
+	dw 1430
+	TX_FAR _ArbokDexEntry
 	db "@"
 
-GravelerDexEntry: ; 40856 (10:4856)
-	db "ROCK@"
-	db 3,3
-	dw 2320
-	TX_FAR _GravelerDexEntry
+PikachuDexEntry: ; 40806 (10:4806)
+	db "MOUSE@"
+	db 1,4
+	dw 130
+	TX_FAR _PikachuDexEntry
 	db "@"
 
-ChanseyDexEntry: ; 40864 (10:4864)
-	db "EGG@"
-	db 3,7
-	dw 760
-	TX_FAR _ChanseyDexEntry
+RaichuDexEntry: ; 40815 (10:4815)
+	db "MOUSE@"
+	db 2,7
+	dw 660
+	TX_FAR _RaichuDexEntry
 	db "@"
 
-MachokeDexEntry: ; 40871 (10:4871)
-	db "SUPERPOWER@"
-	db 4,11
-	dw 1550
-	TX_FAR _MachokeDexEntry
+SandshrewDexEntry: ; 40824 (10:4824)
+	db "MOUSE@"
+	db 2,
+	dw 260
+	TX_FAR _SandshrewDexEntry
 	db "@"
 
-MrMimeDexEntry: ; 40885 (10:4885)
-	db "BARRIER@"
-	db 4,3
-	dw 1200
-	TX_FAR _MrMimeDexEntry
+SandslashDexEntry: ; 40833 (10:4833)
+	db "MOUSE@"
+	db 3,3
+	dw 650
+	TX_FAR _SandslashDexEntry
 	db "@"
 
-HitmonleeDexEntry: ; 40896 (10:4896)
-	db "KICKING@"
-	db 4,11
-	dw 1100
-	TX_FAR _HitmonleeDexEntry
+NidoranFDexEntry: ; 40842 (10:4842)
+	db "POISON PIN@"
+	db 1,4
+	dw 150
+	TX_FAR _NidoranFDexEntry
 	db "@"
 
-HitmonchanDexEntry: ; 408a7 (10:48a7)
-	db "PUNCHING@"
-	db 4,7
-	dw 1110
-	TX_FAR _HitmonchanDexEntry
+NidorinaDexEntry: ; 40856 (10:4856)
+	db "POISON PIN@"
+	db 2,7
+	dw 440
+	TX_FAR _NidorinaDexEntry
 	db "@"
 
-ArbokDexEntry: ; 408b9 (10:48b9)
-	db "COBRA@"
-	db 11,6
-	dw 1430
-	TX_FAR _ArbokDexEntry
+NidoqueenDexEntry: ; 4086a (10:486a)
+	db "DRILL@"
+	db 4,3
+	dw 1320
+	TX_FAR _NidoqueenDexEntry
 	db "@"
 
-ParasectDexEntry: ; 408c8 (10:48c8)
-	db "MUSHROOM@"
-	db 3,3
-	dw 650
-	TX_FAR _ParasectDexEntry
+NidoranMDexEntry: ; 40879 (10:4879)
+	db "POISON PIN@"
+	db 1,8
+	dw 200
+	TX_FAR _NidoranMDexEntry
 	db "@"
 
-PsyduckDexEntry: ; 408da (10:48da)
-	db "DUCK@"
-	db 2,7
+NidorinoDexEntry: ; 4088d (10:488d)
+	db "POISON PIN@"
+	db 2,11
 	dw 430
-	TX_FAR _PsyduckDexEntry
-	db "@"
-
-DrowzeeDexEntry: ; 408e8 (10:48e8)
-	db "HYPNOSIS@"
-	db 3,3
-	dw 710
-	TX_FAR _DrowzeeDexEntry
+	TX_FAR _NidorinoDexEntry
 	db "@"
 
-GolemDexEntry: ; 408fa (10:48fa)
-	db "MEGATON@"
+NidokingDexEntry: ; 408a1 (10:48a1)
+	db "DRILL@"
 	db 4,7
-	dw 6620
-	TX_FAR _GolemDexEntry
+	dw 1370
+	TX_FAR _NidokingDexEntry
 	db "@"
 
-MagmarDexEntry: ; 4090b (10:490b)
-	db "SPITFIRE@"
-	db 4,3
-	dw 980
-	TX_FAR _MagmarDexEntry
+ClefairyDexEntry: ; 408b0 (10:48b0)
+	db "FAIRY@"
+	db 2,
+	dw 170
+	TX_FAR _ClefairyDexEntry
 	db "@"
 
-ElectabuzzDexEntry: ; 4091d (10:491d)
-	db "ELECTRIC@"
-	db 3,7
-	dw 660
-	TX_FAR _ElectabuzzDexEntry
+ClefableDexEntry: ; 408bf (10:48bf)
+	db "FAIRY@"
+	db 4,3
+	dw 880
+	TX_FAR _ClefableDexEntry
 	db "@"
 
-MagnetonDexEntry: ; 4092f (10:492f)
-	db "MAGNET@"
-	db 3,3
-	dw 1320
-	TX_FAR _MagnetonDexEntry
+VulpixDexEntry: ; 408ce (10:48ce)
+	db "FOX@"
+	db 2,
+	dw 220
+	TX_FAR _VulpixDexEntry
 	db "@"
 
-KoffingDexEntry: ; 4093f (10:493f)
-	db "POISON GAS@"
-	db 2,0
-	dw 20
-	TX_FAR _KoffingDexEntry
+NinetalesDexEntry: ; 408db (10:48db)
+	db "FOX@"
+	db 3,7
+	dw 440
+	TX_FAR _NinetalesDexEntry
 	db "@"
 
-MankeyDexEntry: ; 40953 (10:4953)
-	db "PIG MONKEY@"
+JigglypuffDexEntry: ; 408e8 (10:48e8)
+	db "BALLOON@"
 	db 1,8
-	dw 620
-	TX_FAR _MankeyDexEntry
-	db "@"
-
-SeelDexEntry: ; 40967 (10:4967)
-	db "SEA LION@"
-	db 3,7
-	dw 1980
-	TX_FAR _SeelDexEntry
+	dw 120
+	TX_FAR _JigglypuffDexEntry
 	db "@"
 
-DiglettDexEntry: ; 40979 (10:4979)
-	db "MOLE@"
-	db 0,8
-	dw 20
-	TX_FAR _DiglettDexEntry
+WigglytuffDexEntry: ; 408f9 (10:48f9)
+	db "BALLOON@"
+	db 3,3
+	dw 260
+	TX_FAR _WigglytuffDexEntry
 	db "@"
 
-TaurosDexEntry: ; 40987 (10:4987)
-	db "WILD BULL@"
-	db 4,7
-	dw 1950
-	TX_FAR _TaurosDexEntry
+ZubatDexEntry: ; 4090a (10:490a)
+	db "BAT@"
+	db 2,7
+	dw 170
+	TX_FAR _ZubatDexEntry
 	db "@"
 
-FarfetchdDexEntry: ; 4099a (10:499a)
-	db "WILD DUCK@"
-	db 2,7
-	dw 330
-	TX_FAR _FarfetchdDexEntry
+GolbatDexEntry: ; 40917 (10:4917)
+	db "BAT@"
+	db 5,3
+	dw 1210
+	TX_FAR _GolbatDexEntry
 	db "@"
 
-VenonatDexEntry: ; 409ad (10:49ad)
-	db "INSECT@"
-	db 3,3
-	dw 660
-	TX_FAR _VenonatDexEntry
+OddishDexEntry: ; 40924 (10:4924)
+	db "WEED@"
+	db 1,8
+	dw 120
+	TX_FAR _OddishDexEntry
 	db "@"
 
-DragoniteDexEntry: ; 409bd (10:49bd)
-	db "DRAGON@"
-	db 7,3
-	dw 4630
-	TX_FAR _DragoniteDexEntry
+GloomDexEntry: ; 40932 (10:4932)
+	db "WEED@"
+	db 2,7
+	dw 190
+	TX_FAR _GloomDexEntry
 	db "@"
 
-DoduoDexEntry: ; 409cd (10:49cd)
-	db "TWIN BIRD@"
-	db 4,7
-	dw 860
-	TX_FAR _DoduoDexEntry
+VileplumeDexEntry: ; 40940 (10:4940)
+	db "FLOWER@"
+	db 3,11
+	dw 410
+	TX_FAR _VileplumeDexEntry
 	db "@"
 
-PoliwagDexEntry: ; 409e0 (10:49e0)
-	db "TADPOLE@"
-	db 2,0
-	dw 270
-	TX_FAR _PoliwagDexEntry
+ParasDexEntry: ; 40950 (10:4950)
+	db "MUSHROOM@"
+	db 1,
+	dw 120
+	TX_FAR _ParasDexEntry
 	db "@"
 
-JynxDexEntry: ; 409f1 (10:49f1)
-	db "HUMANSHAPE@"
-	db 4,7
-	dw 900
-	TX_FAR _JynxDexEntry
+ParasectDexEntry: ; 40962 (10:4962)
+	db "MUSHROOM@"
+	db 3,3
+	dw 650
+	TX_FAR _ParasectDexEntry
 	db "@"
 
-MoltresDexEntry: ; 40a05 (10:4a05)
-	db "FLAME@"
-	db 6,7
-	dw 1320
-	TX_FAR _MoltresDexEntry
+VenonatDexEntry: ; 40974 (10:4974)
+	db "INSECT@"
+	db 3,3
+	dw 660
+	TX_FAR _VenonatDexEntry
 	db "@"
 
-ArticunoDexEntry: ; 40a14 (10:4a14)
-	db "FREEZE@"
-	db 5,7
-	dw 1220
-	TX_FAR _ArticunoDexEntry
+VenomothDexEntry: ; 40984 (10:4984)
+	db "POISONMOTH@"
+	db 4,11
+	dw 280
+	TX_FAR _VenomothDexEntry
 	db "@"
 
-ZapdosDexEntry: ; 40a24 (10:4a24)
-	db "ELECTRIC@"
-	db 5,3
-	dw 1160
-	TX_FAR _ZapdosDexEntry
+DiglettDexEntry: ; 40998 (10:4998)
+	db "MOLE@"
+	db ,8
+	dw 20
+	TX_FAR _DiglettDexEntry
 	db "@"
 
-DittoDexEntry: ; 40a36 (10:4a36)
-	db "TRANSFORM@"
-	db 1,0
-	dw 90
-	TX_FAR _DittoDexEntry
+DugtrioDexEntry: ; 409a6 (10:49a6)
+	db "MOLE@"
+	db 2,4
+	dw 730
+	TX_FAR _DugtrioDexEntry
 	db "@"
 
-MeowthDexEntry: ; 40a49 (10:4a49)
+MeowthDexEntry: ; 409b4 (10:49b4)
 	db "SCRATCHCAT@"
 	db 1,4
 	dw 90
 	TX_FAR _MeowthDexEntry
 	db "@"
 
-KrabbyDexEntry: ; 40a5d (10:4a5d)
-	db "RIVER CRAB@"
-	db 1,4
-	dw 140
-	TX_FAR _KrabbyDexEntry
+PersianDexEntry: ; 409c8 (10:49c8)
+	db "CLASSY CAT@"
+	db 3,3
+	dw 710
+	TX_FAR _PersianDexEntry
 	db "@"
 
-VulpixDexEntry: ; 40a71 (10:4a71)
-	db "FOX@"
-	db 2,0
-	dw 220
-	TX_FAR _VulpixDexEntry
+PsyduckDexEntry: ; 409dc (10:49dc)
+	db "DUCK@"
+	db 2,7
+	dw 430
+	TX_FAR _PsyduckDexEntry
 	db "@"
 
-NinetalesDexEntry: ; 40a7e (10:4a7e)
-	db "FOX@"
-	db 3,7
-	dw 440
-	TX_FAR _NinetalesDexEntry
+GolduckDexEntry: ; 409ea (10:49ea)
+	db "DUCK@"
+	db 5,7
+	dw 1690
+	TX_FAR _GolduckDexEntry
 	db "@"
 
-PikachuDexEntry: ; 40a8b (10:4a8b)
-	db "MOUSE@"
-	db 1,4
-	dw 130
-	TX_FAR _PikachuDexEntry
+MankeyDexEntry: ; 409f8 (10:49f8)
+	db "PIG MONKEY@"
+	db 1,8
+	dw 620
+	TX_FAR _MankeyDexEntry
 	db "@"
 
-RaichuDexEntry: ; 40a9a (10:4a9a)
-	db "MOUSE@"
-	db 2,7
-	dw 660
-	TX_FAR _RaichuDexEntry
+PrimeapeDexEntry: ; 40a0c (10:4a0c)
+	db "PIG MONKEY@"
+	db 3,3
+	dw 710
+	TX_FAR _PrimeapeDexEntry
 	db "@"
 
-DratiniDexEntry: ; 40aa9 (10:4aa9)
-	db "DRAGON@"
-	db 5,11
-	dw 70
-	TX_FAR _DratiniDexEntry
+GrowlitheDexEntry: ; 40a20 (10:4a20)
+	db "PUPPY@"
+	db 2,4
+	dw 420
+	TX_FAR _GrowlitheDexEntry
 	db "@"
 
-DragonairDexEntry: ; 40ab9 (10:4ab9)
-	db "DRAGON@"
-	db 13,1
-	dw 360
-	TX_FAR _DragonairDexEntry
+ArcanineDexEntry: ; 40a2f (10:4a2f)
+	db "LEGENDARY@"
+	db 6,3
+	dw 3420
+	TX_FAR _ArcanineDexEntry
 	db "@"
 
-KabutoDexEntry: ; 40ac9 (10:4ac9)
-	db "SHELLFISH@"
-	db 1,8
-	dw 250
-	TX_FAR _KabutoDexEntry
+PoliwagDexEntry: ; 40a42 (10:4a42)
+	db "TADPOLE@"
+	db 2,
+	dw 270
+	TX_FAR _PoliwagDexEntry
 	db "@"
 
-KabutopsDexEntry: ; 40adc (10:4adc)
-	db "SHELLFISH@"
+PoliwhirlDexEntry: ; 40a53 (10:4a53)
+	db "TADPOLE@"
+	db 3,3
+	dw 440
+	TX_FAR _PoliwhirlDexEntry
+	db "@"
+
+PoliwrathDexEntry: ; 40a64 (10:4a64)
+	db "TADPOLE@"
 	db 4,3
-	dw 890
-	TX_FAR _KabutopsDexEntry
+	dw 1190
+	TX_FAR _PoliwrathDexEntry
 	db "@"
 
-HorseaDexEntry: ; 40aef (10:4aef)
-	db "DRAGON@"
-	db 1,4
-	dw 180
-	TX_FAR _HorseaDexEntry
+AbraDexEntry: ; 40a75 (10:4a75)
+	db "PSI@"
+	db 2,11
+	dw 430
+	TX_FAR _AbraDexEntry
 	db "@"
 
-SeadraDexEntry: ; 40aff (10:4aff)
-	db "DRAGON@"
-	db 3,11
-	dw 550
-	TX_FAR _SeadraDexEntry
+KadabraDexEntry: ; 40a82 (10:4a82)
+	db "PSI@"
+	db 4,3
+	dw 1250
+	TX_FAR _KadabraDexEntry
 	db "@"
 
-SandshrewDexEntry: ; 40b0f (10:4b0f)
-	db "MOUSE@"
-	db 2,0
-	dw 260
-	TX_FAR _SandshrewDexEntry
+AlakazamDexEntry: ; 40a8f (10:4a8f)
+	db "PSI@"
+	db 4,11
+	dw 1060
+	TX_FAR _AlakazamDexEntry
 	db "@"
 
-SandslashDexEntry: ; 40b1e (10:4b1e)
-	db "MOUSE@"
-	db 3,3
-	dw 650
-	TX_FAR _SandslashDexEntry
+MachopDexEntry: ; 40a9c (10:4a9c)
+	db "SUPERPOWER@"
+	db 2,7
+	dw 430
+	TX_FAR _MachopDexEntry
 	db "@"
 
-OmanyteDexEntry: ; 40b2d (10:4b2d)
-	db "SPIRAL@"
-	db 1,4
-	dw 170
-	TX_FAR _OmanyteDexEntry
+MachokeDexEntry: ; 40ab0 (10:4ab0)
+	db "SUPERPOWER@"
+	db 4,11
+	dw 1550
+	TX_FAR _MachokeDexEntry
 	db "@"
 
-OmastarDexEntry: ; 40b3d (10:4b3d)
-	db "SPIRAL@"
-	db 3,3
-	dw 770
-	TX_FAR _OmastarDexEntry
+MachampDexEntry: ; 40ac4 (10:4ac4)
+	db "SUPERPOWER@"
+	db 5,3
+	dw 2870
+	TX_FAR _MachampDexEntry
 	db "@"
 
-JigglypuffDexEntry: ; 40b4d (10:4b4d)
-	db "BALLOON@"
-	db 1,8
-	dw 120
-	TX_FAR _JigglypuffDexEntry
+BellsproutDexEntry: ; 40ad8 (10:4ad8)
+	db "FLOWER@"
+	db 2,4
+	dw 90
+	TX_FAR _BellsproutDexEntry
 	db "@"
 
-WigglytuffDexEntry: ; 40b5e (10:4b5e)
-	db "BALLOON@"
+WeepinbellDexEntry: ; 40ae8 (10:4ae8)
+	db "FLYCATCHER@"
 	db 3,3
-	dw 260
-	TX_FAR _WigglytuffDexEntry
+	dw 140
+	TX_FAR _WeepinbellDexEntry
 	db "@"
 
-EeveeDexEntry: ; 40b6f (10:4b6f)
-	db "EVOLUTION@"
-	db 1,0
-	dw 140
-	TX_FAR _EeveeDexEntry
+VictreebelDexEntry: ; 40afc (10:4afc)
+	db "FLYCATCHER@"
+	db 5,7
+	dw 340
+	TX_FAR _VictreebelDexEntry
 	db "@"
 
-FlareonDexEntry: ; 40b82 (10:4b82)
-	db "FLAME@"
+TentacoolDexEntry: ; 40b10 (10:4b10)
+	db "JELLYFISH@"
 	db 2,11
-	dw 550
-	TX_FAR _FlareonDexEntry
+	dw 1000
+	TX_FAR _TentacoolDexEntry
 	db "@"
 
-JolteonDexEntry: ; 40b91 (10:4b91)
-	db "LIGHTNING@"
-	db 2,7
-	dw 540
-	TX_FAR _JolteonDexEntry
+TentacruelDexEntry: ; 40b23 (10:4b23)
+	db "JELLYFISH@"
+	db 5,3
+	dw 1210
+	TX_FAR _TentacruelDexEntry
 	db "@"
 
-VaporeonDexEntry: ; 40ba4 (10:4ba4)
-	db "BUBBLE JET@"
+GeodudeDexEntry: ; 40b36 (10:4b36)
+	db "ROCK@"
+	db 1,4
+	dw 440
+	TX_FAR _GeodudeDexEntry
+	db "@"
+
+GravelerDexEntry: ; 40b44 (10:4b44)
+	db "ROCK@"
 	db 3,3
-	dw 640
-	TX_FAR _VaporeonDexEntry
+	dw 2320
+	TX_FAR _GravelerDexEntry
 	db "@"
 
-MachopDexEntry: ; 40bb8 (10:4bb8)
-	db "SUPERPOWER@"
-	db 2,7
-	dw 430
-	TX_FAR _MachopDexEntry
+GolemDexEntry: ; 40b52 (10:4b52)
+	db "MEGATON@"
+	db 4,7
+	dw 6620
+	TX_FAR _GolemDexEntry
 	db "@"
 
-ZubatDexEntry: ; 40bcc (10:4bcc)
-	db "BAT@"
-	db 2,7
-	dw 170
-	TX_FAR _ZubatDexEntry
+PonytaDexEntry: ; 40b63 (10:4b63)
+	db "FIRE HORSE@"
+	db 3,3
+	dw 660
+	TX_FAR _PonytaDexEntry
 	db "@"
 
-EkansDexEntry: ; 40bd9 (10:4bd9)
-	db "SNAKE@"
-	db 6,7
-	dw 150
-	TX_FAR _EkansDexEntry
+RapidashDexEntry: ; 40b77 (10:4b77)
+	db "FIRE HORSE@"
+	db 5,7
+	dw 2090
+	TX_FAR _RapidashDexEntry
 	db "@"
 
-ParasDexEntry: ; 40be8 (10:4be8)
-	db "MUSHROOM@"
-	db 1,0
-	dw 120
-	TX_FAR _ParasDexEntry
+SlowpokeDexEntry: ; 40b8b (10:4b8b)
+	db "DOPEY@"
+	db 3,11
+	dw 790
+	TX_FAR _SlowpokeDexEntry
 	db "@"
 
-PoliwhirlDexEntry: ; 40bfa (10:4bfa)
-	db "TADPOLE@"
-	db 3,3
-	dw 440
-	TX_FAR _PoliwhirlDexEntry
+SlowbroDexEntry: ; 40b9a (10:4b9a)
+	db "HERMITCRAB@"
+	db 5,3
+	dw 1730
+	TX_FAR _SlowbroDexEntry
 	db "@"
 
-PoliwrathDexEntry: ; 40c0b (10:4c0b)
-	db "TADPOLE@"
-	db 4,3
-	dw 1190
-	TX_FAR _PoliwrathDexEntry
+MagnemiteDexEntry: ; 40bae (10:4bae)
+	db "MAGNET@"
+	db 1,
+	dw 130
+	TX_FAR _MagnemiteDexEntry
 	db "@"
 
-WeedleDexEntry: ; 40c1c (10:4c1c)
-	db "HAIRY BUG@"
-	db 1,0
-	dw 70
-	TX_FAR _WeedleDexEntry
+MagnetonDexEntry: ; 40bbe (10:4bbe)
+	db "MAGNET@"
+	db 3,3
+	dw 1320
+	TX_FAR _MagnetonDexEntry
 	db "@"
 
-KakunaDexEntry: ; 40c2f (10:4c2f)
-	db "COCOON@"
-	db 2,0
-	dw 220
-	TX_FAR _KakunaDexEntry
+FarfetchdDexEntry: ; 40bce (10:4bce)
+	db "WILD DUCK@"
+	db 2,7
+	dw 330
+	TX_FAR _FarfetchdDexEntry
 	db "@"
 
-BeedrillDexEntry: ; 40c3f (10:4c3f)
-	db "POISON BEE@"
-	db 3,3
-	dw 650
-	TX_FAR _BeedrillDexEntry
+DoduoDexEntry: ; 40be1 (10:4be1)
+	db "TWIN BIRD@"
+	db 4,7
+	dw 860
+	TX_FAR _DoduoDexEntry
 	db "@"
 
-DodrioDexEntry: ; 40c53 (10:4c53)
+DodrioDexEntry: ; 40bf4 (10:4bf4)
 	db "TRIPLEBIRD@"
 	db 5,11
 	dw 1880
 	TX_FAR _DodrioDexEntry
 	db "@"
 
-PrimeapeDexEntry: ; 40c67 (10:4c67)
-	db "PIG MONKEY@"
-	db 3,3
-	dw 710
-	TX_FAR _PrimeapeDexEntry
-	db "@"
-
-DugtrioDexEntry: ; 40c7b (10:4c7b)
-	db "MOLE@"
-	db 2,4
-	dw 730
-	TX_FAR _DugtrioDexEntry
-	db "@"
-
-VenomothDexEntry: ; 40c89 (10:4c89)
-	db "POISONMOTH@"
-	db 4,11
-	dw 280
-	TX_FAR _VenomothDexEntry
+SeelDexEntry: ; 40c08 (10:4c08)
+	db "SEA LION@"
+	db 3,7
+	dw 1980
+	TX_FAR _SeelDexEntry
 	db "@"
 
-DewgongDexEntry: ; 40c9d (10:4c9d)
+DewgongDexEntry: ; 40c1a (10:4c1a)
 	db "SEA LION@"
 	db 5,7
 	dw 2650
 	TX_FAR _DewgongDexEntry
 	db "@"
 
-CaterpieDexEntry: ; 40caf (10:4caf)
-	db "WORM@"
-	db 1,0
-	dw 60
-	TX_FAR _CaterpieDexEntry
+GrimerDexEntry: ; 40c2c (10:4c2c)
+	db "SLUDGE@"
+	db 2,11
+	dw 660
+	TX_FAR _GrimerDexEntry
 	db "@"
 
-MetapodDexEntry: ; 40cbd (10:4cbd)
-	db "COCOON@"
-	db 2,4
-	dw 220
-	TX_FAR _MetapodDexEntry
+MukDexEntry: ; 40c3c (10:4c3c)
+	db "SLUDGE@"
+	db 3,11
+	dw 660
+	TX_FAR _MukDexEntry
 	db "@"
 
-ButterfreeDexEntry: ; 40ccd (10:4ccd)
-	db "BUTTERFLY@"
-	db 3,7
-	dw 710
-	TX_FAR _ButterfreeDexEntry
+ShellderDexEntry: ; 40c4c (10:4c4c)
+	db "BIVALVE@"
+	db 1,
+	dw 90
+	TX_FAR _ShellderDexEntry
 	db "@"
 
-MachampDexEntry: ; 40ce0 (10:4ce0)
-	db "SUPERPOWER@"
-	db 5,3
-	dw 2870
-	TX_FAR _MachampDexEntry
+CloysterDexEntry: ; 40c5d (10:4c5d)
+	db "BIVALVE@"
+	db 4,11
+	dw 2920
+	TX_FAR _CloysterDexEntry
 	db "@"
 
-GolduckDexEntry: ; 40cf4 (10:4cf4)
-	db "DUCK@"
-	db 5,7
-	dw 1690
-	TX_FAR _GolduckDexEntry
+GastlyDexEntry: ; 40c6e (10:4c6e)
+	db "GAS@"
+	db 4,3
+	dw 2
+	TX_FAR _GastlyDexEntry
 	db "@"
 
-HypnoDexEntry: ; 40d02 (10:4d02)
-	db "HYPNOSIS@"
+HaunterDexEntry: ; 40c7b (10:4c7b)
+	db "GAS@"
 	db 5,3
-	dw 1670
-	TX_FAR _HypnoDexEntry
+	dw 2
+	TX_FAR _HaunterDexEntry
 	db "@"
 
-GolbatDexEntry: ; 40d14 (10:4d14)
-	db "BAT@"
-	db 5,3
-	dw 1210
-	TX_FAR _GolbatDexEntry
+GengarDexEntry: ; 40c88 (10:4c88)
+	db "SHADOW@"
+	db 4,11
+	dw 890
+	TX_FAR _GengarDexEntry
 	db "@"
 
-MewtwoDexEntry: ; 40d21 (10:4d21)
-	db "GENETIC@"
-	db 6,7
-	dw 2690
-	TX_FAR _MewtwoDexEntry
+OnixDexEntry: ; 40c98 (10:4c98)
+	db "ROCK SNAKE@"
+	db 28,10
+	dw 4630
+	TX_FAR _OnixDexEntry
 	db "@"
 
-SnorlaxDexEntry: ; 40d32 (10:4d32)
-	db "SLEEPING@"
-	db 6,11
-	dw 10140
-	TX_FAR _SnorlaxDexEntry
+DrowzeeDexEntry: ; 40cac (10:4cac)
+	db "HYPNOSIS@"
+	db 3,3
+	dw 710
+	TX_FAR _DrowzeeDexEntry
 	db "@"
 
-MagikarpDexEntry: ; 40d44 (10:4d44)
-	db "FISH@"
-	db 2,11
-	dw 220
-	TX_FAR _MagikarpDexEntry
+HypnoDexEntry: ; 40cbe (10:4cbe)
+	db "HYPNOSIS@"
+	db 5,3
+	dw 1670
+	TX_FAR _HypnoDexEntry
 	db "@"
 
-MukDexEntry: ; 40d52 (10:4d52)
-	db "SLUDGE@"
-	db 3,11
-	dw 660
-	TX_FAR _MukDexEntry
+KrabbyDexEntry: ; 40cd0 (10:4cd0)
+	db "RIVER CRAB@"
+	db 1,4
+	dw 140
+	TX_FAR _KrabbyDexEntry
 	db "@"
 
-KinglerDexEntry: ; 40d62 (10:4d62)
+KinglerDexEntry: ; 40ce4 (10:4ce4)
 	db "PINCER@"
 	db 4,3
 	dw 1320
 	TX_FAR _KinglerDexEntry
 	db "@"
 
-CloysterDexEntry: ; 40d72 (10:4d72)
-	db "BIVALVE@"
-	db 4,11
-	dw 2920
-	TX_FAR _CloysterDexEntry
+VoltorbDexEntry: ; 40cf4 (10:4cf4)
+	db "BALL@"
+	db 1,8
+	dw 230
+	TX_FAR _VoltorbDexEntry
 	db "@"
 
-ElectrodeDexEntry: ; 40d83 (10:4d83)
+ElectrodeDexEntry: ; 40d02 (10:4d02)
 	db "BALL@"
 	db 3,11
 	dw 1470
 	TX_FAR _ElectrodeDexEntry
 	db "@"
 
-ClefableDexEntry: ; 40d91 (10:4d91)
-	db "FAIRY@"
-	db 4,3
-	dw 880
-	TX_FAR _ClefableDexEntry
+ExeggcuteDexEntry: ; 40d10 (10:4d10)
+	db "EGG@"
+	db 1,4
+	dw 60
+	TX_FAR _ExeggcuteDexEntry
 	db "@"
 
-WeezingDexEntry: ; 40da0 (10:4da0)
-	db "POISON GAS@"
-	db 3,11
-	dw 210
-	TX_FAR _WeezingDexEntry
+ExeggutorDexEntry: ; 40d1d (10:4d1d)
+	db "COCONUT@"
+	db 6,7
+	dw 2650
+	TX_FAR _ExeggutorDexEntry
 	db "@"
 
-PersianDexEntry: ; 40db4 (10:4db4)
-	db "CLASSY CAT@"
-	db 3,3
-	dw 710
-	TX_FAR _PersianDexEntry
+CuboneDexEntry: ; 40d2e (10:4d2e)
+	db "LONELY@"
+	db 1,4
+	dw 140
+	TX_FAR _CuboneDexEntry
 	db "@"
 
-MarowakDexEntry: ; 40dc8 (10:4dc8)
+MarowakDexEntry: ; 40d3e (10:4d3e)
 	db "BONEKEEPER@"
 	db 3,3
 	dw 990
 	TX_FAR _MarowakDexEntry
 	db "@"
 
-HaunterDexEntry: ; 40ddc (10:4ddc)
-	db "GAS@"
-	db 5,3
-	dw 2
-	TX_FAR _HaunterDexEntry
+HitmonleeDexEntry: ; 40d52 (10:4d52)
+	db "KICKING@"
+	db 4,11
+	dw 1100
+	TX_FAR _HitmonleeDexEntry
 	db "@"
 
-AbraDexEntry: ; 40de9 (10:4de9)
-	db "PSI@"
-	db 2,11
-	dw 430
-	TX_FAR _AbraDexEntry
+HitmonchanDexEntry: ; 40d63 (10:4d63)
+	db "PUNCHING@"
+	db 4,7
+	dw 1110
+	TX_FAR _HitmonchanDexEntry
 	db "@"
 
-AlakazamDexEntry: ; 40df6 (10:4df6)
-	db "PSI@"
-	db 4,11
-	dw 1060
-	TX_FAR _AlakazamDexEntry
+LickitungDexEntry: ; 40d75 (10:4d75)
+	db "LICKING@"
+	db 3,11
+	dw 1440
+	TX_FAR _LickitungDexEntry
 	db "@"
 
-PidgeottoDexEntry: ; 40e03 (10:4e03)
-	db "BIRD@"
-	db 3,7
-	dw 660
-	TX_FAR _PidgeottoDexEntry
+KoffingDexEntry: ; 40d86 (10:4d86)
+	db "POISON GAS@"
+	db 2,
+	dw 20
+	TX_FAR _KoffingDexEntry
 	db "@"
 
-PidgeotDexEntry: ; 40e11 (10:4e11)
-	db "BIRD@"
-	db 4,11
-	dw 870
-	TX_FAR _PidgeotDexEntry
+WeezingDexEntry: ; 40d9a (10:4d9a)
+	db "POISON GAS@"
+	db 3,11
+	dw 210
+	TX_FAR _WeezingDexEntry
 	db "@"
 
-StarmieDexEntry: ; 40e1f (10:4e1f)
-	db "MYSTERIOUS@"
+RhyhornDexEntry: ; 40dae (10:4dae)
+	db "SPIKES@"
+	db 3,3
+	dw 2540
+	TX_FAR _RhyhornDexEntry
+	db "@"
+
+RhydonDexEntry: ; 40dbe (10:4dbe)
+	db "DRILL@"
+	db 6,3
+	dw 2650
+	TX_FAR _RhydonDexEntry
+	db "@"
+
+ChanseyDexEntry: ; 40dcd (10:4dcd)
+	db "EGG@"
 	db 3,7
-	dw 1760
-	TX_FAR _StarmieDexEntry
+	dw 760
+	TX_FAR _ChanseyDexEntry
 	db "@"
 
-BulbasaurDexEntry: ; 40e33 (10:4e33)
-	db "SEED@"
-	db 2,4
-	dw 150
-	TX_FAR _BulbasaurDexEntry
+TangelaDexEntry: ; 40dda (10:4dda)
+	db "VINE@"
+	db 3,3
+	dw 770
+	TX_FAR _TangelaDexEntry
 	db "@"
 
-VenusaurDexEntry: ; 40e41 (10:4e41)
-	db "SEED@"
-	db 6,7
-	dw 2210
-	TX_FAR _VenusaurDexEntry
+KangaskhanDexEntry: ; 40de8 (10:4de8)
+	db "PARENT@"
+	db 7,3
+	dw 1760
+	TX_FAR _KangaskhanDexEntry
 	db "@"
 
-TentacruelDexEntry: ; 40e4f (10:4e4f)
-	db "JELLYFISH@"
-	db 5,3
-	dw 1210
-	TX_FAR _TentacruelDexEntry
+HorseaDexEntry: ; 40df8 (10:4df8)
+	db "DRAGON@"
+	db 1,4
+	dw 180
+	TX_FAR _HorseaDexEntry
 	db "@"
 
-GoldeenDexEntry: ; 40e62 (10:4e62)
+SeadraDexEntry: ; 40e08 (10:4e08)
+	db "DRAGON@"
+	db 3,11
+	dw 550
+	TX_FAR _SeadraDexEntry
+	db "@"
+
+GoldeenDexEntry: ; 40e18 (10:4e18)
 	db "GOLDFISH@"
-	db 2,0
+	db 2,
 	dw 330
 	TX_FAR _GoldeenDexEntry
 	db "@"
 
-SeakingDexEntry: ; 40e74 (10:4e74)
+SeakingDexEntry: ; 40e2a (10:4e2a)
 	db "GOLDFISH@"
 	db 4,3
 	dw 860
 	TX_FAR _SeakingDexEntry
 	db "@"
 
-PonytaDexEntry: ; 40e86 (10:4e86)
-	db "FIRE HORSE@"
-	db 3,3
+StaryuDexEntry: ; 40e3c (10:4e3c)
+	db "STARSHAPE@"
+	db 2,7
+	dw 760
+	TX_FAR _StaryuDexEntry
+	db "@"
+
+StarmieDexEntry: ; 40e4f (10:4e4f)
+	db "MYSTERIOUS@"
+	db 3,7
+	dw 1760
+	TX_FAR _StarmieDexEntry
+	db "@"
+
+MrMimeDexEntry: ; 40e63 (10:4e63)
+	db "BARRIER@"
+	db 4,3
+	dw 1200
+	TX_FAR _MrMimeDexEntry
+	db "@"
+
+ScytherDexEntry: ; 40e74 (10:4e74)
+	db "MANTIS@"
+	db 4,11
+	dw 1230
+	TX_FAR _ScytherDexEntry
+	db "@"
+
+JynxDexEntry: ; 40e84 (10:4e84)
+	db "HUMANSHAPE@"
+	db 4,7
+	dw 900
+	TX_FAR _JynxDexEntry
+	db "@"
+
+ElectabuzzDexEntry: ; 40e98 (10:4e98)
+	db "ELECTRIC@"
+	db 3,7
 	dw 660
-	TX_FAR _PonytaDexEntry
+	TX_FAR _ElectabuzzDexEntry
 	db "@"
 
-RapidashDexEntry: ; 40e9a (10:4e9a)
-	db "FIRE HORSE@"
-	db 5,7
-	dw 2090
-	TX_FAR _RapidashDexEntry
+MagmarDexEntry: ; 40eaa (10:4eaa)
+	db "SPITFIRE@"
+	db 4,3
+	dw 980
+	TX_FAR _MagmarDexEntry
 	db "@"
 
-RattataDexEntry: ; 40eae (10:4eae)
-	db "RAT@"
-	db 1,0
-	dw 80
-	TX_FAR _RattataDexEntry
+PinsirDexEntry: ; 40ebc (10:4ebc)
+	db "STAGBEETLE@"
+	db 4,11
+	dw 1210
+	TX_FAR _PinsirDexEntry
 	db "@"
 
-RaticateDexEntry: ; 40ebb (10:4ebb)
-	db "RAT@"
-	db 2,4
-	dw 410
-	TX_FAR _RaticateDexEntry
+TaurosDexEntry: ; 40ed0 (10:4ed0)
+	db "WILD BULL@"
+	db 4,7
+	dw 1950
+	TX_FAR _TaurosDexEntry
 	db "@"
 
-NidorinoDexEntry: ; 40ec8 (10:4ec8)
-	db "POISON PIN@"
+MagikarpDexEntry: ; 40ee3 (10:4ee3)
+	db "FISH@"
 	db 2,11
-	dw 430
-	TX_FAR _NidorinoDexEntry
+	dw 220
+	TX_FAR _MagikarpDexEntry
 	db "@"
 
-NidorinaDexEntry: ; 40edc (10:4edc)
-	db "POISON PIN@"
+GyaradosDexEntry: ; 40ef1 (10:4ef1)
+	db "ATROCIOUS@"
+	db 21,4
+	dw 5180
+	TX_FAR _GyaradosDexEntry
+	db "@"
+
+LaprasDexEntry: ; 40f04 (10:4f04)
+	db "TRANSPORT@"
+	db 8,2
+	dw 4850
+	TX_FAR _LaprasDexEntry
+	db "@"
+
+DittoDexEntry: ; 40f17 (10:4f17)
+	db "TRANSFORM@"
+	db 1,
+	dw 90
+	TX_FAR _DittoDexEntry
+	db "@"
+
+EeveeDexEntry: ; 40f2a (10:4f2a)
+	db "EVOLUTION@"
+	db 1,
+	dw 140
+	TX_FAR _EeveeDexEntry
+	db "@"
+
+VaporeonDexEntry: ; 40f3d (10:4f3d)
+	db "BUBBLE JET@"
+	db 3,3
+	dw 640
+	TX_FAR _VaporeonDexEntry
+	db "@"
+
+JolteonDexEntry: ; 40f51 (10:4f51)
+	db "LIGHTNING@"
 	db 2,7
-	dw 440
-	TX_FAR _NidorinaDexEntry
+	dw 540
+	TX_FAR _JolteonDexEntry
 	db "@"
 
-GeodudeDexEntry: ; 40ef0 (10:4ef0)
-	db "ROCK@"
-	db 1,4
-	dw 440
-	TX_FAR _GeodudeDexEntry
+FlareonDexEntry: ; 40f64 (10:4f64)
+	db "FLAME@"
+	db 2,11
+	dw 550
+	TX_FAR _FlareonDexEntry
 	db "@"
 
-PorygonDexEntry: ; 40efe (10:4efe)
+PorygonDexEntry: ; 40f73 (10:4f73)
 	db "VIRTUAL@"
 	db 2,7
 	dw 800
 	TX_FAR _PorygonDexEntry
 	db "@"
 
-AerodactylDexEntry: ; 40f0f (10:4f0f)
-	db "FOSSIL@"
-	db 5,11
-	dw 1300
-	TX_FAR _AerodactylDexEntry
+OmanyteDexEntry: ; 40f84 (10:4f84)
+	db "SPIRAL@"
+	db 1,4
+	dw 170
+	TX_FAR _OmanyteDexEntry
 	db "@"
 
-MagnemiteDexEntry: ; 40f1f (10:4f1f)
-	db "MAGNET@"
-	db 1,0
-	dw 130
-	TX_FAR _MagnemiteDexEntry
+OmastarDexEntry: ; 40f94 (10:4f94)
+	db "SPIRAL@"
+	db 3,3
+	dw 770
+	TX_FAR _OmastarDexEntry
 	db "@"
 
-CharmanderDexEntry: ; 40f2f (10:4f2f)
-	db "LIZARD@"
-	db 2,0
-	dw 190
-	TX_FAR _CharmanderDexEntry
+KabutoDexEntry: ; 40fa4 (10:4fa4)
+	db "SHELLFISH@"
+	db 1,8
+	dw 250
+	TX_FAR _KabutoDexEntry
 	db "@"
 
-SquirtleDexEntry: ; 40f3f (10:4f3f)
-	db "TINYTURTLE@"
-	db 1,8
-	dw 200
-	TX_FAR _SquirtleDexEntry
+KabutopsDexEntry: ; 40fb7 (10:4fb7)
+	db "SHELLFISH@"
+	db 4,3
+	dw 890
+	TX_FAR _KabutopsDexEntry
 	db "@"
 
-CharmeleonDexEntry: ; 40f53 (10:4f53)
-	db "FLAME@"
-	db 3,7
-	dw 420
-	TX_FAR _CharmeleonDexEntry
+AerodactylDexEntry: ; 40fca (10:4fca)
+	db "FOSSIL@"
+	db 5,11
+	dw 1300
+	TX_FAR _AerodactylDexEntry
 	db "@"
 
-WartortleDexEntry: ; 40f62 (10:4f62)
-	db "TURTLE@"
-	db 3,3
-	dw 500
-	TX_FAR _WartortleDexEntry
+SnorlaxDexEntry: ; 40fda (10:4fda)
+	db "SLEEPING@"
+	db 6,11
+	dw 10140
+	TX_FAR _SnorlaxDexEntry
 	db "@"
 
-CharizardDexEntry: ; 40f72 (10:4f72)
-	db "FLAME@"
+ArticunoDexEntry: ; 40fec (10:4fec)
+	db "FREEZE@"
 	db 5,7
-	dw 2000
-	TX_FAR _CharizardDexEntry
+	dw 1220
+	TX_FAR _ArticunoDexEntry
 	db "@"
 
-OddishDexEntry: ; 40f81 (10:4f81)
-	db "WEED@"
-	db 1,8
-	dw 120
-	TX_FAR _OddishDexEntry
+ZapdosDexEntry: ; 40ffc (10:4ffc)
+	db "ELECTRIC@"
+	db 5,3
+	dw 1160
+	TX_FAR _ZapdosDexEntry
 	db "@"
 
-GloomDexEntry: ; 40f8f (10:4f8f)
-	db "WEED@"
-	db 2,7
-	dw 190
-	TX_FAR _GloomDexEntry
+MoltresDexEntry: ; 4100e (10:500e)
+	db "FLAME@"
+	db 6,7
+	dw 1320
+	TX_FAR _MoltresDexEntry
 	db "@"
 
-VileplumeDexEntry: ; 40f9d (10:4f9d)
-	db "FLOWER@"
-	db 3,11
-	dw 410
-	TX_FAR _VileplumeDexEntry
+DratiniDexEntry: ; 4101d (10:501d)
+	db "DRAGON@"
+	db 5,11
+	dw 70
+	TX_FAR _DratiniDexEntry
 	db "@"
 
-BellsproutDexEntry: ; 40fad (10:4fad)
-	db "FLOWER@"
-	db 2,4
-	dw 90
-	TX_FAR _BellsproutDexEntry
+DragonairDexEntry: ; 4102d (10:502d)
+	db "DRAGON@"
+	db 13,1
+	dw 360
+	TX_FAR _DragonairDexEntry
 	db "@"
 
-WeepinbellDexEntry: ; 40fbd (10:4fbd)
-	db "FLYCATCHER@"
-	db 3,3
-	dw 140
-	TX_FAR _WeepinbellDexEntry
+DragoniteDexEntry: ; 4103d (10:503d)
+	db "DRAGON@"
+	db 7,3
+	dw 4630
+	TX_FAR _DragoniteDexEntry
 	db "@"
 
-VictreebelDexEntry: ; 40fd1 (10:4fd1)
-	db "FLYCATCHER@"
-	db 5,7
-	dw 340
-	TX_FAR _VictreebelDexEntry
+MewtwoDexEntry: ; 4104d (10:504d)
+	db "GENETIC@"
+	db 6,7
+	dw 2690
+	TX_FAR _MewtwoDexEntry
+	db "@"
+
+MewDexEntry: ; 4105e (10:505e)
+	db "NEW SPECIE@"
+	db 1,4
+	dw 90
+	TX_FAR _MewDexEntry
 	db "@"
 
-MissingNoDexEntry: ; 40fe5 (10:4fe5)
+MissingNoDexEntry: ; 41072 (10:5072)
 	db "???@"
 	db 10 ; 1.0 m
 	db 100 ; 10.0 kg
-	text "コメント さくせいちゅう" ; コメント作成中 (Comment to be written)
-	db "@"
\ No newline at end of file
+	text "コメント さくせいちゅう@" ; コメント作成中 (Comment to be written)
+
+; what the game sees
+;	db "???@"
+;	db 10,100 ; 10 feet 100 inches
+;	dw 41097 ; dw "コメ"
+;	db "ント さくせいちゅう@" ; a whole bunch of sound effects
\ No newline at end of file