1 files changed, 444 insertions, 444 deletions

diff --git a/data/pokedex_entries.asm b/data/pokedex_entries.asm
index 3fb2d3c6..0ac69e5e 100755
--- a/data/pokedex_entries.asm
+++ b/data/pokedex_entries.asm
@@ -191,1064 +191,1064 @@ PokedexEntryPointers:
 	dw VictreebelDexEntry
 
 ; string: species name
-; height in feet, inches
-; weight in pounds
+; height in decimetres
+; weight in centigrams
 ; text entry
 
 RhydonDexEntry:
-	db "DRILL@"
-	db 6,3
-	dw 2650
+	db "PERCEUR@"
+	db 19
+	dw 1200
 	TX_FAR _RhydonDexEntry
 	db "@"
 
 KangaskhanDexEntry:
-	db "PARENT@"
-	db 7,3
-	dw 1760
+	db "MATERNEL@"
+	db 22
+	dw 800
 	TX_FAR _KangaskhanDexEntry
 	db "@"
 
 NidoranMDexEntry:
-	db "POISON PIN@"
-	db 1,8
-	dw 200
+	db "VENEPIC@"
+	db 5
+	dw 90
 	TX_FAR _NidoranMDexEntry
 	db "@"
 
 ClefairyDexEntry:
-	db "FAIRY@"
-	db 2,0
-	dw 170
+	db "FEE@"
+	db 6
+	dw 75
 	TX_FAR _ClefairyDexEntry
 	db "@"
 
 SpearowDexEntry:
-	db "TINY BIRD@"
-	db 1,0
-	dw 40
+	db "MINOISEAU@"
+	db 3
+	dw 20
 	TX_FAR _SpearowDexEntry
 	db "@"
 
 VoltorbDexEntry:
-	db "BALL@"
-	db 1,8
-	dw 230
+	db "BALLE@"
+	db 5
+	dw 104
 	TX_FAR _VoltorbDexEntry
 	db "@"
 
 NidokingDexEntry:
-	db "DRILL@"
-	db 4,7
-	dw 1370
+	db "PERCEUR@"
+	db 14
+	dw 620
 	TX_FAR _NidokingDexEntry
 	db "@"
 
 SlowbroDexEntry:
-	db "HERMITCRAB@"
-	db 5,3
-	dw 1730
+	db "SYMBIOSE@"
+	db 16
+	dw 785
 	TX_FAR _SlowbroDexEntry
 	db "@"
 
 IvysaurDexEntry:
-	db "SEED@"
-	db 3,3
-	dw 290
+	db "GRAINE@"
+	db 10
+	dw 130
 	TX_FAR _IvysaurDexEntry
 	db "@"
 
 ExeggutorDexEntry:
-	db "COCONUT@"
-	db 6,7
-	dw 2650
+	db "FRUITPALME@"
+	db 20
+	dw 1200
 	TX_FAR _ExeggutorDexEntry
 	db "@"
 
 LickitungDexEntry:
-	db "LICKING@"
-	db 3,11
-	dw 1440
+	db "LECHEUR@"
+	db 12
+	dw 655
 	TX_FAR _LickitungDexEntry
 	db "@"
 
 ExeggcuteDexEntry:
-	db "EGG@"
-	db 1,4
-	dw 60
+	db "OEUF@"
+	db 4
+	dw 25
 	TX_FAR _ExeggcuteDexEntry
 	db "@"
 
 GrimerDexEntry:
-	db "SLUDGE@"
-	db 2,11
-	dw 660
+	db "DEGUEU@"
+	db 9
+	dw 300
 	TX_FAR _GrimerDexEntry
 	db "@"
 
 GengarDexEntry:
-	db "SHADOW@"
-	db 4,11
-	dw 890
+	db "OMBRE@"
+	db 15
+	dw 405
 	TX_FAR _GengarDexEntry
 	db "@"
 
 NidoranFDexEntry:
-	db "POISON PIN@"
-	db 1,4
-	dw 150
+	db "VENEPIC@"
+	db 4
+	dw 70
 	TX_FAR _NidoranFDexEntry
 	db "@"
 
 NidoqueenDexEntry:
-	db "DRILL@"
-	db 4,3
-	dw 1320
+	db "PERCEUR@"
+	db 13
+	dw 600
 	TX_FAR _NidoqueenDexEntry
 	db "@"
 
 CuboneDexEntry:
-	db "LONELY@"
-	db 1,4
-	dw 140
+	db "SOLITAIRE@"
+	db 4
+	dw 65
 	TX_FAR _CuboneDexEntry
 	db "@"
 
 RhyhornDexEntry:
-	db "SPIKES@"
-	db 3,3
-	dw 2540
+	db "PIQUANT@"
+	db 10
+	dw 1150
 	TX_FAR _RhyhornDexEntry
 	db "@"
 
 LaprasDexEntry:
 	db "TRANSPORT@"
-	db 8,2
-	dw 4850
+	db 25
+	dw 2200
 	TX_FAR _LaprasDexEntry
 	db "@"
 
 ArcanineDexEntry:
-	db "LEGENDARY@"
-	db 6,3
-	dw 3420
+	db "LEGENDAIRE@"
+	db 19
+	dw 1550
 	TX_FAR _ArcanineDexEntry
 	db "@"
 
 MewDexEntry:
-	db "NEW SPECIE@"
-	db 1,4
-	dw 90
+	db "NOUVEAU@"
+	db 4
+	dw 40
 	TX_FAR _MewDexEntry
 	db "@"
 
 GyaradosDexEntry:
-	db "ATROCIOUS@"
-	db 21,4
-	dw 5180
+	db "TERRIFIANT@"
+	db 65
+	dw 2350
 	TX_FAR _GyaradosDexEntry
 	db "@"
 
 ShellderDexEntry:
 	db "BIVALVE@"
-	db 1,0
-	dw 90
+	db 3
+	dw 40
 	TX_FAR _ShellderDexEntry
 	db "@"
 
 TentacoolDexEntry:
-	db "JELLYFISH@"
-	db 2,11
-	dw 1000
+	db "MOLLUSQUE@"
+	db 9
+	dw 455
 	TX_FAR _TentacoolDexEntry
 	db "@"
 
 GastlyDexEntry:
-	db "GAS@"
-	db 4,3
-	dw 2
+	db "GAZ@"
+	db 13
+	dw 1
 	TX_FAR _GastlyDexEntry
 	db "@"
 
 ScytherDexEntry:
-	db "MANTIS@"
-	db 4,11
-	dw 1230
+	db "MANTE@"
+	db 15
+	dw 560
 	TX_FAR _ScytherDexEntry
 	db "@"
 
 StaryuDexEntry:
-	db "STARSHAPE@"
-	db 2,7
-	dw 760
+	db "ETOILE@"
+	db 8
+	dw 345
 	TX_FAR _StaryuDexEntry
 	db "@"
 
 BlastoiseDexEntry:
-	db "SHELLFISH@"
-	db 5,3
-	dw 1890
+	db "CARAPACE@"
+	db 16
+	dw 855
 	TX_FAR _BlastoiseDexEntry
 	db "@"
 
 PinsirDexEntry:
-	db "STAGBEETLE@"
-	db 4,11
-	dw 1210
+	db "SCARABEE@"
+	db 15
+	dw 550
 	TX_FAR _PinsirDexEntry
 	db "@"
 
 TangelaDexEntry:
-	db "VINE@"
-	db 3,3
-	dw 770
+	db "VIGNE@"
+	db 10
+	dw 350
 	TX_FAR _TangelaDexEntry
 	db "@"
 
 GrowlitheDexEntry:
-	db "PUPPY@"
-	db 2,4
-	dw 420
+	db "CHIOT@"
+	db 7
+	dw 190
 	TX_FAR _GrowlitheDexEntry
 	db "@"
 
 OnixDexEntry:
-	db "ROCK SNAKE@"
-	db 28,10
-	dw 4630
+	db "SERPENROC@"
+	db 88
+	dw 2100
 	TX_FAR _OnixDexEntry
 	db "@"
 
 FearowDexEntry:
-	db "BEAK@"
-	db 3,11
-	dw 840
+	db "BEC-OISEAU@"
+	db 12
+	dw 380
 	TX_FAR _FearowDexEntry
 	db "@"
 
 PidgeyDexEntry:
-	db "TINY BIRD@"
-	db 1,0
-	dw 40
+	db "MINOISEAU@"
+	db 3
+	dw 18
 	TX_FAR _PidgeyDexEntry
 	db "@"
 
 SlowpokeDexEntry:
-	db "DOPEY@"
-	db 3,11
-	dw 790
+	db "CRETIN@"
+	db 12
+	dw 360
 	TX_FAR _SlowpokeDexEntry
 	db "@"
 
 KadabraDexEntry:
-	db "PSI@"
-	db 4,3
-	dw 1250
+	db "PSY@"
+	db 13
+	dw 565
 	TX_FAR _KadabraDexEntry
 	db "@"
 
 GravelerDexEntry:
-	db "ROCK@"
-	db 3,3
-	dw 2320
+	db "ROCHE@"
+	db 10
+	dw 1050
 	TX_FAR _GravelerDexEntry
 	db "@"
 
 ChanseyDexEntry:
-	db "EGG@"
-	db 3,7
-	dw 760
+	db "OEUF@"
+	db 11
+	dw 346
 	TX_FAR _ChanseyDexEntry
 	db "@"
 
 MachokeDexEntry:
-	db "SUPERPOWER@"
-	db 4,11
-	dw 1550
+	db "COLOSSE@"
+	db 15
+	dw 705
 	TX_FAR _MachokeDexEntry
 	db "@"
 
 MrMimeDexEntry:
-	db "BARRIER@"
-	db 4,3
-	dw 1200
+	db "BLOQUEUR@"
+	db 13
+	dw 545
 	TX_FAR _MrMimeDexEntry
 	db "@"
 
 HitmonleeDexEntry:
-	db "KICKING@"
-	db 4,11
-	dw 1100
+	db "LATTEUR@"
+	db 15
+	dw 498
 	TX_FAR _HitmonleeDexEntry
 	db "@"
 
 HitmonchanDexEntry:
-	db "PUNCHING@"
-	db 4,7
-	dw 1110
+	db "PUNCHEUR@"
+	db 14
+	dw 502
 	TX_FAR _HitmonchanDexEntry
 	db "@"
 
 ArbokDexEntry:
 	db "COBRA@"
-	db 11,6
-	dw 1430
+	db 35
+	dw 650
 	TX_FAR _ArbokDexEntry
 	db "@"
 
 ParasectDexEntry:
-	db "MUSHROOM@"
-	db 3,3
-	dw 650
+	db "CHAMPIGNON@"
+	db 10
+	dw 295
 	TX_FAR _ParasectDexEntry
 	db "@"
 
 PsyduckDexEntry:
-	db "DUCK@"
-	db 2,7
-	dw 430
+	db "CANARD@"
+	db 8
+	dw 196
 	TX_FAR _PsyduckDexEntry
 	db "@"
 
 DrowzeeDexEntry:
-	db "HYPNOSIS@"
-	db 3,3
-	dw 710
+	db "HYPNOSE@"
+	db 10
+	dw 324
 	TX_FAR _DrowzeeDexEntry
 	db "@"
 
 GolemDexEntry:
-	db "MEGATON@"
-	db 4,7
-	dw 6620
+	db "TITANESQUE@"
+	db 14
+	dw 3000
 	TX_FAR _GolemDexEntry
 	db "@"
 
 MagmarDexEntry:
-	db "SPITFIRE@"
-	db 4,3
-	dw 980
+	db "CRACHE-FEU@"
+	db 13
+	dw 445
 	TX_FAR _MagmarDexEntry
 	db "@"
 
 ElectabuzzDexEntry:
-	db "ELECTRIC@"
-	db 3,7
-	dw 660
+	db "ELECTRIQUE@"
+	db 11
+	dw 300
 	TX_FAR _ElectabuzzDexEntry
 	db "@"
 
 MagnetonDexEntry:
-	db "MAGNET@"
-	db 3,3
-	dw 1320
+	db "MAGNETIQUE@"
+	db 10
+	dw 600
 	TX_FAR _MagnetonDexEntry
 	db "@"
 
 KoffingDexEntry:
-	db "POISON GAS@"
-	db 2,0
-	dw 20
+	db "GAZ MORTEL@"
+	db 6
+	dw 10
 	TX_FAR _KoffingDexEntry
 	db "@"
 
 MankeyDexEntry:
-	db "PIG MONKEY@"
-	db 1,8
-	dw 620
+	db "PORSINGE@"
+	db 5
+	dw 280
 	TX_FAR _MankeyDexEntry
 	db "@"
 
 SeelDexEntry:
-	db "SEA LION@"
-	db 3,7
-	dw 1980
+	db "OTARIE@"
+	db 11
+	dw 900
 	TX_FAR _SeelDexEntry
 	db "@"
 
 DiglettDexEntry:
-	db "MOLE@"
-	db 0,8
-	dw 20
+	db "TAUPE@"
+	db 2
+	dw 8
 	TX_FAR _DiglettDexEntry
 	db "@"
 
 TaurosDexEntry:
-	db "WILD BULL@"
-	db 4,7
-	dw 1950
+	db "BUFFLE@"
+	db 14
+	dw 884
 	TX_FAR _TaurosDexEntry
 	db "@"
 
 FarfetchdDexEntry:
-	db "WILD DUCK@"
-	db 2,7
-	dw 330
+	db "CANARD FOU@"
+	db 8
+	dw 150
 	TX_FAR _FarfetchdDexEntry
 	db "@"
 
 VenonatDexEntry:
-	db "INSECT@"
-	db 3,3
-	dw 660
+	db "VERMINE@"
+	db 10
+	dw 300
 	TX_FAR _VenonatDexEntry
 	db "@"
 
 DragoniteDexEntry:
 	db "DRAGON@"
-	db 7,3
-	dw 4630
+	db 22
+	dw 2100
 	TX_FAR _DragoniteDexEntry
 	db "@"
 
 DoduoDexEntry:
-	db "TWIN BIRD@"
-	db 4,7
-	dw 860
+	db "DUOISEAU@"
+	db 14
+	dw 392
 	TX_FAR _DoduoDexEntry
 	db "@"
 
 PoliwagDexEntry:
-	db "TADPOLE@"
-	db 2,0
-	dw 270
+	db "TETARD@"
+	db 6
+	dw 124
 	TX_FAR _PoliwagDexEntry
 	db "@"
 
 JynxDexEntry:
-	db "HUMANSHAPE@"
-	db 4,7
-	dw 900
+	db "HUMANOIDE@"
+	db 14
+	dw 406
 	TX_FAR _JynxDexEntry
 	db "@"
 
 MoltresDexEntry:
-	db "FLAME@"
-	db 6,7
-	dw 1320
+	db "FLAMME@"
+	db 20
+	dw 600
 	TX_FAR _MoltresDexEntry
 	db "@"
 
 ArticunoDexEntry:
-	db "FREEZE@"
-	db 5,7
-	dw 1220
+	db "GLACIAIRE@"
+	db 17
+	dw 554
 	TX_FAR _ArticunoDexEntry
 	db "@"
 
 ZapdosDexEntry:
-	db "ELECTRIC@"
-	db 5,3
-	dw 1160
+	db "ELECTRIQUE@"
+	db 16
+	dw 526
 	TX_FAR _ZapdosDexEntry
 	db "@"
 
 DittoDexEntry:
-	db "TRANSFORM@"
-	db 1,0
-	dw 90
+	db "MORPHING@"
+	db 3
+	dw 40
 	TX_FAR _DittoDexEntry
 	db "@"
 
 MeowthDexEntry:
-	db "SCRATCHCAT@"
-	db 1,4
-	dw 90
+	db "CHADEGOUT@"
+	db 4
+	dw 42
 	TX_FAR _MeowthDexEntry
 	db "@"
 
 KrabbyDexEntry:
-	db "RIVER CRAB@"
-	db 1,4
-	dw 140
+	db "DOUX CRABE@"
+	db 4
+	dw 65
 	TX_FAR _KrabbyDexEntry
 	db "@"
 
 VulpixDexEntry:
-	db "FOX@"
-	db 2,0
-	dw 220
+	db "RENARD@"
+	db 6
+	dw 99
 	TX_FAR _VulpixDexEntry
 	db "@"
 
 NinetalesDexEntry:
-	db "FOX@"
-	db 3,7
-	dw 440
+	db "RENARD@"
+	db 11
+	dw 199
 	TX_FAR _NinetalesDexEntry
 	db "@"
 
 PikachuDexEntry:
-	db "MOUSE@"
-	db 1,4
-	dw 130
+	db "SOURIS@"
+	db 4
+	dw 60
 	TX_FAR _PikachuDexEntry
 	db "@"
 
 RaichuDexEntry:
-	db "MOUSE@"
-	db 2,7
-	dw 660
+	db "SOURIS@"
+	db 8
+	dw 300
 	TX_FAR _RaichuDexEntry
 	db "@"
 
 DratiniDexEntry:
 	db "DRAGON@"
-	db 5,11
-	dw 70
+	db 18
+	dw 33
 	TX_FAR _DratiniDexEntry
 	db "@"
 
 DragonairDexEntry:
 	db "DRAGON@"
-	db 13,1
-	dw 360
+	db 40
+	dw 165
 	TX_FAR _DragonairDexEntry
 	db "@"
 
 KabutoDexEntry:
-	db "SHELLFISH@"
-	db 1,8
-	dw 250
+	db "CARAPACE@"
+	db 5
+	dw 115
 	TX_FAR _KabutoDexEntry
 	db "@"
 
 KabutopsDexEntry:
-	db "SHELLFISH@"
-	db 4,3
-	dw 890
+	db "CARAPACE@"
+	db 13
+	dw 405
 	TX_FAR _KabutopsDexEntry
 	db "@"
 
 HorseaDexEntry:
 	db "DRAGON@"
-	db 1,4
-	dw 180
+	db 4
+	dw 80
 	TX_FAR _HorseaDexEntry
 	db "@"
 
 SeadraDexEntry:
 	db "DRAGON@"
-	db 3,11
-	dw 550
+	db 12
+	dw 250
 	TX_FAR _SeadraDexEntry
 	db "@"
 
 SandshrewDexEntry:
-	db "MOUSE@"
-	db 2,0
-	dw 260
+	db "SOURIS@"
+	db 6
+	dw 120
 	TX_FAR _SandshrewDexEntry
 	db "@"
 
 SandslashDexEntry:
-	db "MOUSE@"
-	db 3,3
-	dw 650
+	db "SOURIS@"
+	db 10
+	dw 295
 	TX_FAR _SandslashDexEntry
 	db "@"
 
 OmanyteDexEntry:
-	db "SPIRAL@"
-	db 1,4
-	dw 170
+	db "SPIRALE@"
+	db 4
+	dw 75
 	TX_FAR _OmanyteDexEntry
 	db "@"
 
 OmastarDexEntry:
-	db "SPIRAL@"
-	db 3,3
-	dw 770
+	db "SPIRALE@"
+	db 10
+	dw 350
 	TX_FAR _OmastarDexEntry
 	db "@"
 
 JigglypuffDexEntry:
-	db "BALLOON@"
-	db 1,8
-	dw 120
+	db "BOUBOULE@"
+	db 5
+	dw 55
 	TX_FAR _JigglypuffDexEntry
 	db "@"
 
 WigglytuffDexEntry:
-	db "BALLOON@"
-	db 3,3
-	dw 260
+	db "BOUBOULE@"
+	db 10
+	dw 120
 	TX_FAR _WigglytuffDexEntry
 	db "@"
 
 EeveeDexEntry:
-	db "EVOLUTION@"
-	db 1,0
-	dw 140
+	db "EVOLUTIF@"
+	db 3
+	dw 65
 	TX_FAR _EeveeDexEntry
 	db "@"
 
 FlareonDexEntry:
-	db "FLAME@"
-	db 2,11
-	dw 550
+	db "FLAMME@"
+	db 9
+	dw 250
 	TX_FAR _FlareonDexEntry
 	db "@"
 
 JolteonDexEntry:
-	db "LIGHTNING@"
-	db 2,7
-	dw 540
+	db "FOUDRE@"
+	db 8
+	dw 245
 	TX_FAR _JolteonDexEntry
 	db "@"
 
 VaporeonDexEntry:
-	db "BUBBLE JET@"
-	db 3,3
-	dw 640
+	db "BULLEUR@"
+	db 10
+	dw 290
 	TX_FAR _VaporeonDexEntry
 	db "@"
 
 MachopDexEntry:
-	db "SUPERPOWER@"
-	db 2,7
-	dw 430
+	db "COLOSSE@"
+	db 8
+	dw 195
 	TX_FAR _MachopDexEntry
 	db "@"
 
 ZubatDexEntry:
-	db "BAT@"
-	db 2,7
-	dw 170
+	db "CHOVSOURIS@"
+	db 8
+	dw 75
 	TX_FAR _ZubatDexEntry
 	db "@"
 
 EkansDexEntry:
-	db "SNAKE@"
-	db 6,7
-	dw 150
+	db "SERPENT@"
+	db 20
+	dw 69
 	TX_FAR _EkansDexEntry
 	db "@"
 
 ParasDexEntry:
-	db "MUSHROOM@"
-	db 1,0
-	dw 120
+	db "CHAMPIGNON@"
+	db 3
+	dw 54
 	TX_FAR _ParasDexEntry
 	db "@"
 
 PoliwhirlDexEntry:
-	db "TADPOLE@"
-	db 3,3
-	dw 440
+	db "TETARD@"
+	db 10
+	dw 200
 	TX_FAR _PoliwhirlDexEntry
 	db "@"
 
 PoliwrathDexEntry:
-	db "TADPOLE@"
-	db 4,3
-	dw 1190
+	db "TETARD@"
+	db 13
+	dw 540
 	TX_FAR _PoliwrathDexEntry
 	db "@"
 
 WeedleDexEntry:
-	db "HAIRY BUG@"
-	db 1,0
-	dw 70
+	db "INSECTOPIC@"
+	db 3
+	dw 32
 	TX_FAR _WeedleDexEntry
 	db "@"
 
 KakunaDexEntry:
-	db "COCOON@"
-	db 2,0
-	dw 220
+	db "COCON@"
+	db 6
+	dw 100
 	TX_FAR _KakunaDexEntry
 	db "@"
 
 BeedrillDexEntry:
-	db "POISON BEE@"
-	db 3,3
-	dw 650
+	db "GUEPOISON@"
+	db 10
+	dw 295
 	TX_FAR _BeedrillDexEntry
 	db "@"
 
 DodrioDexEntry:
-	db "TRIPLEBIRD@"
-	db 5,11
-	dw 1880
+	db "TROISEAU@"
+	db 18
+	dw 852
 	TX_FAR _DodrioDexEntry
 	db "@"
 
 PrimeapeDexEntry:
-	db "PIG MONKEY@"
-	db 3,3
-	dw 710
+	db "PORSINGE@"
+	db 10
+	dw 320
 	TX_FAR _PrimeapeDexEntry
 	db "@"
 
 DugtrioDexEntry:
-	db "MOLE@"
-	db 2,4
-	dw 730
+	db "TAUPE@"
+	db 7
+	dw 333
 	TX_FAR _DugtrioDexEntry
 	db "@"
 
 VenomothDexEntry:
-	db "POISONMOTH@"
-	db 4,11
-	dw 280
+	db "MITE@"
+	db 15
+	dw 125
 	TX_FAR _VenomothDexEntry
 	db "@"
 
 DewgongDexEntry:
-	db "SEA LION@"
-	db 5,7
-	dw 2650
+	db "OTARIE@"
+	db 17
+	dw 1200
 	TX_FAR _DewgongDexEntry
 	db "@"
 
 CaterpieDexEntry:
-	db "WORM@"
-	db 1,0
-	dw 60
+	db "VER@"
+	db 3
+	dw 29
 	TX_FAR _CaterpieDexEntry
 	db "@"
 
 MetapodDexEntry:
-	db "COCOON@"
-	db 2,4
-	dw 220
+	db "COCON@"
+	db 7
+	dw 99
 	TX_FAR _MetapodDexEntry
 	db "@"
 
 ButterfreeDexEntry:
-	db "BUTTERFLY@"
-	db 3,7
-	dw 710
+	db "PAPILLON@"
+	db 11
+	dw 320
 	TX_FAR _ButterfreeDexEntry
 	db "@"
 
 MachampDexEntry:
-	db "SUPERPOWER@"
-	db 5,3
-	dw 2870
+	db "COLOSSE@"
+	db 16
+	dw 1300
 	TX_FAR _MachampDexEntry
 	db "@"
 
 GolduckDexEntry:
-	db "DUCK@"
-	db 5,7
-	dw 1690
+	db "CANARD@"
+	db 17
+	dw 766
 	TX_FAR _GolduckDexEntry
 	db "@"
 
 HypnoDexEntry:
-	db "HYPNOSIS@"
-	db 5,3
-	dw 1670
+	db "HYPNOSE@"
+	db 16
+	dw 756
 	TX_FAR _HypnoDexEntry
 	db "@"
 
 GolbatDexEntry:
-	db "BAT@"
-	db 5,3
-	dw 1210
+	db "CHOVSOURIS@"
+	db 16
+	dw 550
 	TX_FAR _GolbatDexEntry
 	db "@"
 
 MewtwoDexEntry:
-	db "GENETIC@"
-	db 6,7
-	dw 2690
+	db "GENETIQUE@"
+	db 20
+	dw 1220
 	TX_FAR _MewtwoDexEntry
 	db "@"
 
 SnorlaxDexEntry:
-	db "SLEEPING@"
-	db 6,11
-	dw 10140
+	db "PIONCEUR@"
+	db 21
+	dw 4600
 	TX_FAR _SnorlaxDexEntry
 	db "@"
 
 MagikarpDexEntry:
-	db "FISH@"
-	db 2,11
-	dw 220
+	db "POISSON@"
+	db 9
+	dw 100
 	TX_FAR _MagikarpDexEntry
 	db "@"
 
 MukDexEntry:
-	db "SLUDGE@"
-	db 3,11
-	dw 660
+	db "DEGUEU@"
+	db 12
+	dw 300
 	TX_FAR _MukDexEntry
 	db "@"
 
 KinglerDexEntry:
-	db "PINCER@"
-	db 4,3
-	dw 1320
+	db "POIGNEUR@"
+	db 13
+	dw 600
 	TX_FAR _KinglerDexEntry
 	db "@"
 
 CloysterDexEntry:
 	db "BIVALVE@"
-	db 4,11
-	dw 2920
+	db 15
+	dw 1325
 	TX_FAR _CloysterDexEntry
 	db "@"
 
 ElectrodeDexEntry:
-	db "BALL@"
-	db 3,11
-	dw 1470
+	db "BALLE@"
+	db 12
+	dw 666
 	TX_FAR _ElectrodeDexEntry
 	db "@"
 
 ClefableDexEntry:
-	db "FAIRY@"
-	db 4,3
-	dw 880
+	db "FEE@"
+	db 13
+	dw 400
 	TX_FAR _ClefableDexEntry
 	db "@"
 
 WeezingDexEntry:
-	db "POISON GAS@"
-	db 3,11
-	dw 210
+	db "GAZ MORTEL@"
+	db 12
+	dw 95
 	TX_FAR _WeezingDexEntry
 	db "@"
 
 PersianDexEntry:
-	db "CLASSY CAT@"
-	db 3,3
-	dw 710
+	db "CHADEVILLE@"
+	db 10
+	dw 320
 	TX_FAR _PersianDexEntry
 	db "@"
 
 MarowakDexEntry:
-	db "BONEKEEPER@"
-	db 3,3
-	dw 990
+	db "GARD'OS@"
+	db 10
+	dw 450
 	TX_FAR _MarowakDexEntry
 	db "@"
 
 HaunterDexEntry:
-	db "GAS@"
-	db 5,3
-	dw 2
+	db "GAZ@"
+	db 16
+	dw 1
 	TX_FAR _HaunterDexEntry
 	db "@"
 
 AbraDexEntry:
-	db "PSI@"
-	db 2,11
-	dw 430
+	db "PSY@"
+	db 9
+	dw 195
 	TX_FAR _AbraDexEntry
 	db "@"
 
 AlakazamDexEntry:
-	db "PSI@"
-	db 4,11
-	dw 1060
+	db "PSY@"
+	db 15
+	dw 480
 	TX_FAR _AlakazamDexEntry
 	db "@"
 
 PidgeottoDexEntry:
-	db "BIRD@"
-	db 3,7
-	dw 660
+	db "OISEAU@"
+	db 11
+	dw 300
 	TX_FAR _PidgeottoDexEntry
 	db "@"
 
 PidgeotDexEntry:
-	db "BIRD@"
-	db 4,11
-	dw 870
+	db "OISEAU@"
+	db 15
+	dw 395
 	TX_FAR _PidgeotDexEntry
 	db "@"
 
 StarmieDexEntry:
-	db "MYSTERIOUS@"
-	db 3,7
-	dw 1760
+	db "MYSTERIEUX@"
+	db 11
+	dw 800
 	TX_FAR _StarmieDexEntry
 	db "@"
 
 BulbasaurDexEntry:
-	db "SEED@"
-	db 2,4
-	dw 150
+	db "GRAINE@"
+	db 7
+	dw 69
 	TX_FAR _BulbasaurDexEntry
 	db "@"
 
 VenusaurDexEntry:
-	db "SEED@"
-	db 6,7
-	dw 2210
+	db "GRAINE@"
+	db 20
+	dw 1000
 	TX_FAR _VenusaurDexEntry
 	db "@"
 
 TentacruelDexEntry:
-	db "JELLYFISH@"
-	db 5,3
-	dw 1210
+	db "MOLLUSQUE@"
+	db 16
+	dw 550
 	TX_FAR _TentacruelDexEntry
 	db "@"
 
 GoldeenDexEntry:
-	db "GOLDFISH@"
-	db 2,0
-	dw 330
+	db "POISSON@"
+	db 6
+	dw 150
 	TX_FAR _GoldeenDexEntry
 	db "@"
 
 SeakingDexEntry:
-	db "GOLDFISH@"
-	db 4,3
-	dw 860
+	db "POISSON@"
+	db 13
+	dw 390
 	TX_FAR _SeakingDexEntry
 	db "@"
 
 PonytaDexEntry:
-	db "FIRE HORSE@"
-	db 3,3
-	dw 660
+	db "CHEVAL FEU@"
+	db 10
+	dw 300
 	TX_FAR _PonytaDexEntry
 	db "@"
 
 RapidashDexEntry:
-	db "FIRE HORSE@"
-	db 5,7
-	dw 2090
+	db "CHEVAL FEU@"
+	db 17
+	dw 950
 	TX_FAR _RapidashDexEntry
 	db "@"
 
 RattataDexEntry:
 	db "RAT@"
-	db 1,0
-	dw 80
+	db 3
+	dw 35
 	TX_FAR _RattataDexEntry
 	db "@"
 
 RaticateDexEntry:
 	db "RAT@"
-	db 2,4
-	dw 410
+	db 7
+	dw 185
 	TX_FAR _RaticateDexEntry
 	db "@"
 
 NidorinoDexEntry:
-	db "POISON PIN@"
-	db 2,11
-	dw 430
+	db "VENEPIC@"
+	db 9
+	dw 195
 	TX_FAR _NidorinoDexEntry
 	db "@"
 
 NidorinaDexEntry:
-	db "POISON PIN@"
-	db 2,7
-	dw 440
+	db "VENEPIC@"
+	db 8
+	dw 200
 	TX_FAR _NidorinaDexEntry
 	db "@"
 
 GeodudeDexEntry:
-	db "ROCK@"
-	db 1,4
-	dw 440
+	db "ROCHE@"
+	db 4
+	dw 200
 	TX_FAR _GeodudeDexEntry
 	db "@"
 
 PorygonDexEntry:
-	db "VIRTUAL@"
-	db 2,7
-	dw 800
+	db "VIRTUEL@"
+	db 8
+	dw 365
 	TX_FAR _PorygonDexEntry
 	db "@"
 
 AerodactylDexEntry:
-	db "FOSSIL@"
-	db 5,11
-	dw 1300
+	db "FOSSILE@"
+	db 18
+	dw 590
 	TX_FAR _AerodactylDexEntry
 	db "@"
 
 MagnemiteDexEntry:
-	db "MAGNET@"
-	db 1,0
-	dw 130
+	db "MAGNETIQUE@"
+	db 3
+	dw 60
 	TX_FAR _MagnemiteDexEntry
 	db "@"
 
 CharmanderDexEntry:
-	db "LIZARD@"
-	db 2,0
-	dw 190
+	db "LEZARD@"
+	db 6
+	dw 85
 	TX_FAR _CharmanderDexEntry
 	db "@"
 
 SquirtleDexEntry:
-	db "TINYTURTLE@"
-	db 1,8
-	dw 200
+	db "MINITORTUE@"
+	db 5
+	dw 90
 	TX_FAR _SquirtleDexEntry
 	db "@"
 
 CharmeleonDexEntry:
-	db "FLAME@"
-	db 3,7
-	dw 420
+	db "FLAMME@"
+	db 11
+	dw 190
 	TX_FAR _CharmeleonDexEntry
 	db "@"
 
 WartortleDexEntry:
-	db "TURTLE@"
-	db 3,3
-	dw 500
+	db "TORTUE@"
+	db 10
+	dw 225
 	TX_FAR _WartortleDexEntry
 	db "@"
 
 CharizardDexEntry:
-	db "FLAME@"
-	db 5,7
-	dw 2000
+	db "FLAMME@"
+	db 17
+	dw 905
 	TX_FAR _CharizardDexEntry
 	db "@"
 
 OddishDexEntry:
-	db "WEED@"
-	db 1,8
-	dw 120
+	db "RACINE@"
+	db 5
+	dw 54
 	TX_FAR _OddishDexEntry
 	db "@"
 
 GloomDexEntry:
-	db "WEED@"
-	db 2,7
-	dw 190
+	db "RACINE@"
+	db 8
+	dw 86
 	TX_FAR _GloomDexEntry
 	db "@"
 
 VileplumeDexEntry:
-	db "FLOWER@"
-	db 3,11
-	dw 410
+	db "FLEUR@"
+	db 12
+	dw 186
 	TX_FAR _VileplumeDexEntry
 	db "@"
 
 BellsproutDexEntry:
-	db "FLOWER@"
-	db 2,4
-	dw 90
+	db "FLEUR@"
+	db 7
+	dw 40
 	TX_FAR _BellsproutDexEntry
 	db "@"
 
 WeepinbellDexEntry:
-	db "FLYCATCHER@"
-	db 3,3
-	dw 140
+	db "CARNIVORE@"
+	db 10
+	dw 64
 	TX_FAR _WeepinbellDexEntry
 	db "@"
 
 VictreebelDexEntry:
-	db "FLYCATCHER@"
-	db 5,7
-	dw 340
+	db "CARNIVORE@"
+	db 17
+	dw 155
 	TX_FAR _VictreebelDexEntry
 	db "@"