changed charmap, changed weight and height info, and some dex things

4 files changed, 348 insertions, 346 deletions

diff --git a/charmap.asm b/charmap.asm
index c73989e7..95ed23c0 100644
--- a/charmap.asm
+++ b/charmap.asm
@@ -75,8 +75,9 @@
 ; Actual characters (from other graphics files)
 
 	; needed for ShowPokedexDataInternal (see engine/menus/pokedex.asm)
-	charmap "′",         $60 ; gfx/pokedex/pokedex.png
-	charmap "″",         $61 ; gfx/pokedex/pokedex.png
+	charmap "<m>",         $60 ; gfx/pokedex/pokedex.png
+	charmap "<k>",         $61 ; gfx/pokedex/pokedex.png
+	charmap "<g>",         $62 ; gfx/pokedex/pokedex.png
 
 	; needed for StatusScreen (see engine/pokemon/status_screen.asm)
 	charmap "<BOLD_P>",  $72 ; gfx/font/P.1bpp
diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm
index a7b87a05..f54b7616 100755
--- a/data/pokemon/dex_entries.asm
+++ b/data/pokemon/dex_entries.asm
@@ -191,1069 +191,1069 @@ PokedexEntryPointers:
 	dw VictreebelDexEntry
 
 ; string: species name
-; height in feet, inches
-; weight in pounds
+; height in dm
+; weight in cg
 ; text entry
 
 RhydonDexEntry:
 	db "TALADRO@"
-	db 6,3
-	dw 2650
+	db 19
+	dw 1200
 	text_far _RhydonDexEntry
 	text_end
 
 KangaskhanDexEntry:
 	db "PADRES@"
-	db 7,3
-	dw 1760
+	db 22
+	dw 800
 	text_far _KangaskhanDexEntry
 	text_end
 
 NidoranMDexEntry:
 	db "PIN VENENO@"
-	db 1,8
-	dw 200
+	db 5
+	dw 90
 	text_far _NidoranMDexEntry
 	text_end
 
 ClefairyDexEntry:
 	db "HADA@"
-	db 2,0
-	dw 170
+	db 6
+	dw 75
 	text_far _ClefairyDexEntry
 	text_end
 
 SpearowDexEntry:
 	db "PAJARITO@"
-	db 1,0
-	dw 40
+	db 3
+	dw 20
 	text_far _SpearowDexEntry
 	text_end
 
 VoltorbDexEntry:
 	db "BOLA@"
-	db 1,8
-	dw 230
+	db 5
+	dw 104
 	text_far _VoltorbDexEntry
 	text_end
 
 NidokingDexEntry:
 	db "TALADRO@"
-	db 4,7
-	dw 1370
+	db 14
+	dw 620
 	text_far _NidokingDexEntry
 	text_end
 
 SlowbroDexEntry:
 	db "ERMITAÑO@"
-	db 5,3
-	dw 1730
+	db 16
+	dw 785
 	text_far _SlowbroDexEntry
 	text_end
 
 IvysaurDexEntry:
 	db "SEMILLA@"
-	db 3,3
-	dw 290
+	db 10
+	dw 130
 	text_far _IvysaurDexEntry
 	text_end
 
 ExeggutorDexEntry:
 	db "COCO@"
-	db 6,7
-	dw 2650
+	db 20
+	dw 1200
 	text_far _ExeggutorDexEntry
 	text_end
 
 LickitungDexEntry:
 	db "LAMIENDO@"
-	db 3,11
-	dw 1440
+	db 12
+	dw 655
 	text_far _LickitungDexEntry
 	text_end
 
 ExeggcuteDexEntry:
 	db "HUEVO@"
-	db 1,4
-	dw 60
+	db 4
+	dw 25
 	text_far _ExeggcuteDexEntry
 	text_end
 
 GrimerDexEntry:
 	db "LODO@"
-	db 2,11
-	dw 660
+	db 9
+	dw 300
 	text_far _GrimerDexEntry
 	text_end
 
 GengarDexEntry:
 	db "SOMBRA@"
-	db 4,11
-	dw 890
+	db 15
+	dw 405
 	text_far _GengarDexEntry
 	text_end
 
 NidoranFDexEntry:
 	db "PIN VENENO@"
-	db 1,4
-	dw 150
+	db 4
+	dw 70
 	text_far _NidoranFDexEntry
 	text_end
 
 NidoqueenDexEntry:
 	db "TALADRO@"
-	db 4,3
-	dw 1320
+	db 13
+	dw 600
 	text_far _NidoqueenDexEntry
 	text_end
 
 CuboneDexEntry:
 	db "SOLITARIO@"
-	db 1,4
-	dw 140
+	db 4
+	dw 65
 	text_far _CuboneDexEntry
 	text_end
 
 RhyhornDexEntry:
 	db "CLAVOS@"
-	db 3,3
-	dw 2540
+	db 10
+	dw 1150
 	text_far _RhyhornDexEntry
 	text_end
 
 LaprasDexEntry:
 	db "TRANSPORTE@"
-	db 8,2
-	dw 4850
+	db 25
+	dw 2200
 	text_far _LaprasDexEntry
 	text_end
 
 ArcanineDexEntry:
 	db "LEGENDARIO@"
-	db 6,3
-	dw 3420
+	db 19
+	dw 1550
 	text_far _ArcanineDexEntry
 	text_end
 
 MewDexEntry:
 	db "N.ESPECIE@"
-	db 1,4
-	dw 90
+	db 4
+	dw 40
 	text_far _MewDexEntry
 	text_end
 
 GyaradosDexEntry:
 	db "ATROCIDAD@"
-	db 21,4
-	dw 5180
+	db 65
+	dw 2350
 	text_far _GyaradosDexEntry
 	text_end
 
 ShellderDexEntry:
 	db "BIVALVO@"
-	db 1,0
-	dw 90
+	db 3
+	dw 40
 	text_far _ShellderDexEntry
 	text_end
 
 TentacoolDexEntry:
 	db "MEDUSA@"
-	db 2,11
-	dw 1000
+	db 9
+	dw 455
 	text_far _TentacoolDexEntry
 	text_end
 
 GastlyDexEntry:
 	db "GAS@"
-	db 4,3
-	dw 2
+	db 13
+	dw 1
 	text_far _GastlyDexEntry
 	text_end
 
 ScytherDexEntry:
 	db "MANTIS@"
-	db 4,11
-	dw 1230
+	db 15
+	dw 560
 	text_far _ScytherDexEntry
 	text_end
 
 StaryuDexEntry:
 	db "ESTRELLADA@"
-	db 2,7
-	dw 760
+	db 8
+	dw 345
 	text_far _StaryuDexEntry
 	text_end
 
 BlastoiseDexEntry:
 	db "MARISCO@"
-	db 5,3
-	dw 1890
+	db 16
+	dw 855
 	text_far _BlastoiseDexEntry
 	text_end
 
 PinsirDexEntry:
 	db "ESCARABAJO@"
-	db 4,11
-	dw 1210
+	db 15
+	dw 550
 	text_far _PinsirDexEntry
 	text_end
 
 TangelaDexEntry:
 	db "ENREDADERA@"
-	db 3,3
-	dw 770
+	db 10
+	dw 350
 	text_far _TangelaDexEntry
 	text_end
 
 GrowlitheDexEntry:
 	db "PERRITO@"
-	db 2,4
-	dw 420
+	db 7
+	dw 190
 	text_far _GrowlitheDexEntry
 	text_end
 
 OnixDexEntry:
 	db "SERP.ROCA@"
-	db 28,10
-	dw 4630
+	db 88
+	dw 2100
 	text_far _OnixDexEntry
 	text_end
 
 FearowDexEntry:
 	db "PICO@"
-	db 3,11
-	dw 840
+	db 12
+	dw 380
 	text_far _FearowDexEntry
 	text_end
 
 PidgeyDexEntry:
 	db "PAJARITO@"
-	db 1,0
-	dw 40
+	db 3
+	dw 18
 	text_far _PidgeyDexEntry
 	text_end
 
 SlowpokeDexEntry:
 	db "ATONTADO@"
-	db 3,11
-	dw 790
+	db 12
+	dw 360
 	text_far _SlowpokeDexEntry
 	text_end
 
 KadabraDexEntry:
 	db "PSI@"
-	db 4,3
-	dw 1250
+	db 13
+	dw 565
 	text_far _KadabraDexEntry
 	text_end
 
 GravelerDexEntry:
 	db "ROCA@"
-	db 3,3
-	dw 2320
+	db 10
+	dw 1050
 	text_far _GravelerDexEntry
 	text_end
 
 ChanseyDexEntry:
 	db "HUEVO@"
-	db 3,7
-	dw 760
+	db 11
+	dw 346
 	text_far _ChanseyDexEntry
 	text_end
 
 MachokeDexEntry:
 	db "SUPERPODER@"
-	db 4,11
-	dw 1550
+	db 15
+	dw 705
 	text_far _MachokeDexEntry
 	text_end
 
 MrMimeDexEntry:
 	db "BARRERA@"
-	db 4,3
-	dw 1200
+	db 13
+	dw 545
 	text_far _MrMimeDexEntry
 	text_end
 
 HitmonleeDexEntry:
 	db "PATEANDO@"
-	db 4,11
-	dw 1100
+	db 15
+	dw 498
 	text_far _HitmonleeDexEntry
 	text_end
 
 HitmonchanDexEntry:
 	db "PEGANDO@"
-	db 4,7
-	dw 1110
+	db 14
+	dw 502
 	text_far _HitmonchanDexEntry
 	text_end
 
 ArbokDexEntry:
 	db "COBRA@"
-	db 11,6
-	dw 1430
+	db 35
+	dw 650
 	text_far _ArbokDexEntry
 	text_end
 
 ParasectDexEntry:
 	db "HONGO@"
-	db 3,3
-	dw 650
+	db 10
+	dw 295
 	text_far _ParasectDexEntry
 	text_end
 
 PsyduckDexEntry:
 	db "PATO@"
-	db 2,7
-	dw 430
+	db 8
+	dw 196
 	text_far _PsyduckDexEntry
 	text_end
 
 DrowzeeDexEntry:
 	db "HIPNOSIS@"
-	db 3,3
-	dw 710
+	db 10
+	dw 324
 	text_far _DrowzeeDexEntry
 	text_end
 
 GolemDexEntry:
 	db "MEGATÓN@"
-	db 4,7
-	dw 6620
+	db 14
+	dw 3000
 	text_far _GolemDexEntry
 	text_end
 
 MagmarDexEntry:
 	db "ESCUPFUEGO@"
-	db 4,3
-	dw 980
+	db 13
+	dw 445
 	text_far _MagmarDexEntry
 	text_end
 
 ElectabuzzDexEntry:
 	db "ELÉCTRICO@"
-	db 3,7
-	dw 660
+	db 11
+	dw 300
 	text_far _ElectabuzzDexEntry
 	text_end
 
 MagnetonDexEntry:
 	db "IMÁN@"
-	db 3,3
-	dw 1320
+	db 10
+	dw 600
 	text_far _MagnetonDexEntry
 	text_end
 
 KoffingDexEntry:
 	db "GAS VENENO@"
-	db 2,0
-	dw 20
+	db 6
+	dw 10
 	text_far _KoffingDexEntry
 	text_end
 
 MankeyDexEntry:
 	db "MONO CERDO@"
-	db 1,8
-	dw 620
+	db 5
+	dw 280
 	text_far _MankeyDexEntry
 	text_end
 
 SeelDexEntry:
 	db "LEÓN MAR.@"
-	db 3,7
-	dw 1980
+	db 11
+	dw 900
 	text_far _SeelDexEntry
 	text_end
 
 DiglettDexEntry:
 	db "TOPO@"
-	db 0,8
-	dw 20
+	db 2
+	dw 8
 	text_far _DiglettDexEntry
 	text_end
 
 TaurosDexEntry:
 	db "TORO BRAVO@"
-	db 4,7
-	dw 1950
+	db 14
+	dw 884
 	text_far _TaurosDexEntry
 	text_end
 
 FarfetchdDexEntry:
 	db "PATO SALV.@"
-	db 2,7
-	dw 330
+	db 8
+	dw 150
 	text_far _FarfetchdDexEntry
 	text_end
 
 VenonatDexEntry:
 	db "INSECTO@"
-	db 3,3
-	dw 660
+	db 10
+	dw 300
 	text_far _VenonatDexEntry
 	text_end
 
 DragoniteDexEntry:
 	db "DRAGÓN@"
-	db 7,3
-	dw 4630
+	db 22
+	dw 2100
 	text_far _DragoniteDexEntry
 	text_end
 
 DoduoDexEntry:
 	db "AVE GEMELA@"
-	db 4,7
-	dw 860
+	db 14
+	dw 392
 	text_far _DoduoDexEntry
 	text_end
 
 PoliwagDexEntry:
 	db "RENACUAJO@"
-	db 2,0
-	dw 270
+	db 6
+	dw 124
 	text_far _PoliwagDexEntry
 	text_end
 
 JynxDexEntry:
 	db "F. HUMANA@"
-	db 4,7
-	dw 900
+	db 14
+	dw 406
 	text_far _JynxDexEntry
 	text_end
 
 MoltresDexEntry:
 	db "LLAMA@"
-	db 6,7
-	dw 1320
+	db 20
+	dw 600
 	text_far _MoltresDexEntry
 	text_end
 
 ArticunoDexEntry:
 	db "CONGELAR@"
-	db 5,7
-	dw 1220
+	db 17
+	dw 554
 	text_far _ArticunoDexEntry
 	text_end
 
 ZapdosDexEntry:
 	db "ELÉCTRICO@"
-	db 5,3
-	dw 1160
+	db 16
+	dw 526
 	text_far _ZapdosDexEntry
 	text_end
 
 DittoDexEntry:
 	db "TRANSFORM.@"
-	db 1,0
-	dw 90
+	db 3
+	dw 40
 	text_far _DittoDexEntry
 	text_end
 
 MeowthDexEntry:
 	db "GATO ARAÑA@"
-	db 1,4
-	dw 90
+	db 4
+	dw 42
 	text_far _MeowthDexEntry
 	text_end
 
 KrabbyDexEntry:
 	db "CANGREJO@"
-	db 1,4
-	dw 140
+	db 4
+	dw 65
 	text_far _KrabbyDexEntry
 	text_end
 
 VulpixDexEntry:
 	db "ZORRO@"
-	db 2,0
-	dw 220
+	db 6
+	dw 99
 	text_far _VulpixDexEntry
 	text_end
 
 NinetalesDexEntry:
 	db "ZORRO@"
-	db 3,7
-	dw 440
+	db 11
+	dw 199
 	text_far _NinetalesDexEntry
 	text_end
 
 PikachuDexEntry:
 	db "RATAÓN@"
-	db 1,4
-	dw 130
+	db 4
+	dw 60
 	text_far _PikachuDexEntry
 	text_end
 
 RaichuDexEntry:
 	db "RATAÓN@"
-	db 2,7
-	dw 660
+	db 8
+	dw 300
 	text_far _RaichuDexEntry
 	text_end
 
 DratiniDexEntry:
 	db "DRAGÓN@"
-	db 5,11
-	dw 70
+	db 18
+	dw 33
 	text_far _DratiniDexEntry
 	text_end
 
 DragonairDexEntry:
 	db "DRAGÓN@"
-	db 13,1
-	dw 360
+	db 40
+	dw 165
 	text_far _DragonairDexEntry
 	text_end
 
 KabutoDexEntry:
 	db "MARISCO@"
-	db 1,8
-	dw 250
+	db 5
+	dw 115
 	text_far _KabutoDexEntry
 	text_end
 
 KabutopsDexEntry:
 	db "MARISCO@"
-	db 4,3
-	dw 890
+	db 13
+	dw 405
 	text_far _KabutopsDexEntry
 	text_end
 
 HorseaDexEntry:
 	db "DRAGÓN@"
-	db 1,4
-	dw 180
+	db 4
+	dw 80
 	text_far _HorseaDexEntry
 	text_end
 
 SeadraDexEntry:
 	db "DRAGÓN@"
-	db 3,11
-	dw 550
+	db 12
+	dw 250
 	text_far _SeadraDexEntry
 	text_end
 
 SandshrewDexEntry:
 	db "RATAÓN@"
-	db 2,0
-	dw 260
+	db 6
+	dw 120
 	text_far _SandshrewDexEntry
 	text_end
 
 SandslashDexEntry:
 	db "RATAÓN@"
-	db 3,3
-	dw 650
+	db 10
+	dw 295
 	text_far _SandslashDexEntry
 	text_end
 
 OmanyteDexEntry:
 	db "ESPIRAL@"
-	db 1,4
-	dw 170
+	db 4
+	dw 75
 	text_far _OmanyteDexEntry
 	text_end
 
 OmastarDexEntry:
 	db "ESPIRAL@"
-	db 3,3
-	dw 770
+	db 10
+	dw 350
 	text_far _OmastarDexEntry
 	text_end
 
 JigglypuffDexEntry:
 	db "GLOBO@"
-	db 1,8
-	dw 120
+	db 5
+	dw 55
 	text_far _JigglypuffDexEntry
 	text_end
 
 WigglytuffDexEntry:
 	db "GLOBO@"
-	db 3,3
-	dw 260
+	db 10
+	dw 120
 	text_far _WigglytuffDexEntry
 	text_end
 
 EeveeDexEntry:
 	db "EVOLUCIÓN@"
-	db 1,0
-	dw 140
+	db 3
+	dw 65
 	text_far _EeveeDexEntry
 	text_end
 
 FlareonDexEntry:
 	db "LLAMA@"
-	db 2,11
-	dw 550
+	db 9
+	dw 250
 	text_far _FlareonDexEntry
 	text_end
 
 JolteonDexEntry:
 	db "RELÁMPAGO@"
-	db 2,7
-	dw 540
+	db 8
+	dw 245
 	text_far _JolteonDexEntry
 	text_end
 
 VaporeonDexEntry:
 	db "BURBUJA@"
-	db 3,3
-	dw 640
+	db 10
+	dw 290
 	text_far _VaporeonDexEntry
 	text_end
 
 MachopDexEntry:
 	db "SUPERPODER@"
-	db 2,7
-	dw 430
+	db 8
+	dw 195
 	text_far _MachopDexEntry
 	text_end
 
 ZubatDexEntry:
 	db "MURCIÉLAGO@"
-	db 2,7
-	dw 170
+	db 8
+	dw 75
 	text_far _ZubatDexEntry
 	text_end
 
 EkansDexEntry:
 	db "SERPIENTE@"
-	db 6,7
-	dw 150
+	db 20
+	dw 69
 	text_far _EkansDexEntry
 	text_end
 
 ParasDexEntry:
 	db "HONGO@"
-	db 1,0
-	dw 120
+	db 3
+	dw 54
 	text_far _ParasDexEntry
 	text_end
 
 PoliwhirlDexEntry:
 	db "RENACUAJO@"
-	db 3,3
-	dw 440
+	db 10
+	dw 200
 	text_far _PoliwhirlDexEntry
 	text_end
 
 PoliwrathDexEntry:
 	db "RENACUAJO@"
-	db 4,3
-	dw 1190
+	db 13
+	dw 540
 	text_far _PoliwrathDexEntry
 	text_end
 
 WeedleDexEntry:
 	db "ORUGA@"
-	db 1,0
-	dw 70
+	db 3
+	dw 32
 	text_far _WeedleDexEntry
 	text_end
 
 KakunaDexEntry:
 	db "CAPULLO@"
-	db 2,0
-	dw 220
+	db 6
+	dw 100
 	text_far _KakunaDexEntry
 	text_end
 
 BeedrillDexEntry:
 	db "ABEJA VEN.@"
-	db 3,3
-	dw 650
+	db 10
+	dw 295
 	text_far _BeedrillDexEntry
 	text_end
 
 DodrioDexEntry:
 	db "AVE TRIPLE@"
-	db 5,11
-	dw 1880
+	db 18
+	dw 852
 	text_far _DodrioDexEntry
 	text_end
 
 PrimeapeDexEntry:
 	db "MONO CERDO@"
-	db 3,3
-	dw 710
+	db 10
+	dw 320
 	text_far _PrimeapeDexEntry
 	text_end
 
 DugtrioDexEntry:
 	db "TOPO@"
-	db 2,4
-	dw 730
+	db 7
+	dw 333
 	text_far _DugtrioDexEntry
 	text_end
 
 VenomothDexEntry:
 	db "MOPA VEN.@"
-	db 4,11
-	dw 280
+	db 15
+	dw 125
 	text_far _VenomothDexEntry
 	text_end
 
 DewgongDexEntry:
 	db "LEÓN MAR.@"
-	db 5,7
-	dw 2650
+	db 17
+	dw 1200
 	text_far _DewgongDexEntry
 	text_end
 
 CaterpieDexEntry:
 	db "GUSANO@"
-	db 1,0
-	dw 60
+	db 3
+	dw 29
 	text_far _CaterpieDexEntry
 	text_end
 
 MetapodDexEntry:
 	db "CAPULLO@"
-	db 2,4
-	dw 220
+	db 7
+	dw 99
 	text_far _MetapodDexEntry
 	text_end
 
 ButterfreeDexEntry:
 	db "MARIPOSA@"
-	db 3,7
-	dw 710
+	db 11
+	dw 320
 	text_far _ButterfreeDexEntry
 	text_end
 
 MachampDexEntry:
 	db "SUPERPODER@"
-	db 5,3
-	dw 2870
+	db 16
+	dw 1300
 	text_far _MachampDexEntry
 	text_end
 
 GolduckDexEntry:
 	db "PATO@"
-	db 5,7
-	dw 1690
+	db 17
+	dw 766
 	text_far _GolduckDexEntry
 	text_end
 
 HypnoDexEntry:
 	db "HIPNOSIS@"
-	db 5,3
-	dw 1670
+	db 16
+	dw 756
 	text_far _HypnoDexEntry
 	text_end
 
 GolbatDexEntry:
 	db "MURCIÉLAGO@"
-	db 5,3
-	dw 1210
+	db 16
+	dw 550
 	text_far _GolbatDexEntry
 	text_end
 
 MewtwoDexEntry:
 	db "GENÉTICO@"
-	db 6,7
-	dw 2690
+	db 20
+	dw 1220
 	text_far _MewtwoDexEntry
 	text_end
 
 SnorlaxDexEntry:
 	db "DORMIR@"
-	db 6,11
-	dw 10140
+	db 21
+	dw 4600
 	text_far _SnorlaxDexEntry
 	text_end
 
 MagikarpDexEntry:
 	db "PEZ@"
-	db 2,11
-	dw 220
+	db 9
+	dw 100
 	text_far _MagikarpDexEntry
 	text_end
 
 MukDexEntry:
 	db "LODO@"
-	db 3,11
-	dw 660
+	db 12
+	dw 300
 	text_far _MukDexEntry
 	text_end
 
 KinglerDexEntry:
 	db "TENAZA@"
-	db 4,3
-	dw 1320
+	db 13
+	dw 600
 	text_far _KinglerDexEntry
 	text_end
 
 CloysterDexEntry:
 	db "BIVALVO@"
-	db 4,11
-	dw 2920
+	db 15
+	dw 1325
 	text_far _CloysterDexEntry
 	text_end
 
 ElectrodeDexEntry:
 	db "BOLA@"
-	db 3,11
-	dw 1470
+	db 12
+	dw 666
 	text_far _ElectrodeDexEntry
 	text_end
 
 ClefableDexEntry:
 	db "HADA@"
-	db 4,3
-	dw 880
+	db 13
+	dw 400
 	text_far _ClefableDexEntry
 	text_end
 
 WeezingDexEntry:
 	db "GAS VENENO@"
-	db 3,11
-	dw 210
+	db 12
+	dw 95
 	text_far _WeezingDexEntry
 	text_end
 
 PersianDexEntry:
 	db "GATO FINO@"
-	db 3,3
-	dw 710
+	db 10
+	dw 320
 	text_far _PersianDexEntry
 	text_end
 
 MarowakDexEntry:
 	db "APILAHUESO@"
-	db 3,3
-	dw 990
+	db 10
+	dw 450
 	text_far _MarowakDexEntry
 	text_end
 
 HaunterDexEntry:
 	db "GAS@"
-	db 5,3
-	dw 2
+	db 16
+	dw 1
 	text_far _HaunterDexEntry
 	text_end
 
 AbraDexEntry:
 	db "PSI@"
-	db 2,11
-	dw 430
+	db 9
+	dw 195
 	text_far _AbraDexEntry
 	text_end
 
 AlakazamDexEntry:
 	db "PSI@"
-	db 4,11
-	dw 1060
+	db 15
+	dw 480
 	text_far _AlakazamDexEntry
 	text_end
 
 PidgeottoDexEntry:
 	db "PÁJARO@"
-	db 3,7
-	dw 660
+	db 11
+	dw 300
 	text_far _PidgeottoDexEntry
 	text_end
 
 PidgeotDexEntry:
 	db "PÁJARO@"
-	db 4,11
-	dw 870
+	db 15
+	dw 395
 	text_far _PidgeotDexEntry
 	text_end
 
 StarmieDexEntry:
 	db "MISTERIOSO@"
-	db 3,7
-	dw 1760
+	db 11
+	dw 800
 	text_far _StarmieDexEntry
 	text_end
 
 BulbasaurDexEntry:
 	db "SEMILLA@"
-	db 2,4
-	dw 150
+	db 7
+	dw 69
 	text_far _BulbasaurDexEntry
 	text_end
 
 VenusaurDexEntry:
 	db "SEMILLA@"
-	db 6,7
-	dw 2210
+	db 20
+	dw 1000
 	text_far _VenusaurDexEntry
 	text_end
 
 TentacruelDexEntry:
 	db "MEDUSA@"
-	db 5,3
-	dw 1210
+	db 16
+	dw 550
 	text_far _TentacruelDexEntry
 	text_end
 
 GoldeenDexEntry:
 	db "PEZ COLOR@"
-	db 2,0
-	dw 330
+	db 6
+	dw 150
 	text_far _GoldeenDexEntry
 	text_end
 
 SeakingDexEntry:
 	db "PEZ COLOR@"
-	db 4,3
-	dw 860
+	db 13
+	dw 390
 	text_far _SeakingDexEntry
 	text_end
 
 PonytaDexEntry:
 	db "CABALLO F.@"
-	db 3,3
-	dw 660
+	db 10
+	dw 300
 	text_far _PonytaDexEntry
 	text_end
 
 RapidashDexEntry:
 	db "CABALLO F.@"
-	db 5,7
-	dw 2090
+	db 17
+	dw 950
 	text_far _RapidashDexEntry
 	text_end
 
 RattataDexEntry:
 	db "RATA@"
-	db 1,0
-	dw 80
+	db 3
+	dw 35
 	text_far _RattataDexEntry
 	text_end
 
 RaticateDexEntry:
 	db "RATA@"
-	db 2,4
-	dw 410
+	db 7
+	dw 185
 	text_far _RaticateDexEntry
 	text_end
 
 NidorinoDexEntry:
 	db "PIN VENENO@"
-	db 2,11
-	dw 430
+	db 9
+	dw 195
 	text_far _NidorinoDexEntry
 	text_end
 
 NidorinaDexEntry:
 	db "PIN VENENO@"
-	db 2,7
-	dw 440
+	db 8
+	dw 200
 	text_far _NidorinaDexEntry
 	text_end
 
 GeodudeDexEntry:
 	db "ROCA@"
-	db 1,4
-	dw 440
+	db 4
+	dw 200
 	text_far _GeodudeDexEntry
 	text_end
 
 PorygonDexEntry:
 	db "VIRTUAL@"
-	db 2,7
-	dw 800
+	db 8
+	dw 365
 	text_far _PorygonDexEntry
 	text_end
 
 AerodactylDexEntry:
 	db "FÓSIL@"
-	db 5,11
-	dw 1300
+	db 18
+	dw 590
 	text_far _AerodactylDexEntry
 	text_end
 
 MagnemiteDexEntry:
 	db "IMÁN@"
-	db 1,0
-	dw 130
+	db 3
+	dw 60
 	text_far _MagnemiteDexEntry
 	text_end
 
 CharmanderDexEntry:
 	db "LAGARTIJA@"
-	db 2,0
-	dw 190
+	db 6
+	dw 85
 	text_far _CharmanderDexEntry
 	text_end
 
 SquirtleDexEntry:
 	db "TORTUGUITA@"
-	db 1,8
-	dw 200
+	db 5
+	dw 90
 	text_far _SquirtleDexEntry
 	text_end
 
 CharmeleonDexEntry:
 	db "LLAMA@"
-	db 3,7
-	dw 420
+	db 11
+	dw 190
 	text_far _CharmeleonDexEntry
 	text_end
 
 WartortleDexEntry:
 	db "TORTUGA@"
-	db 3,3
-	dw 500
+	db 10
+	dw 225
 	text_far _WartortleDexEntry
 	text_end
 
 CharizardDexEntry:
 	db "LLAMA@"
-	db 5,7
-	dw 2000
+	db 17
+	dw 905
 	text_far _CharizardDexEntry
 	text_end
 
 OddishDexEntry:
 	db "ALGAS@"
-	db 1,8
-	dw 120
+	db 5
+	dw 54
 	text_far _OddishDexEntry
 	text_end
 
 GloomDexEntry:
 	db "ALGAS@"
-	db 2,7
-	dw 190
+	db 8
+	dw 86
 	text_far _GloomDexEntry
 	text_end
 
 VileplumeDexEntry:
 	db "FLOR@"
-	db 3,11
-	dw 410
+	db 12
+	dw 186
 	text_far _VileplumeDexEntry
 	text_end
 
 BellsproutDexEntry:
 	db "FLOR@"
-	db 2,4
-	dw 90
+	db 7
+	dw 40
 	text_far _BellsproutDexEntry
 	text_end
 
 WeepinbellDexEntry:
 	db "MATAMOSCAS@"
-	db 3,3
-	dw 140
+	db 10
+	dw 64
 	text_far _WeepinbellDexEntry
 	text_end
 
 VictreebelDexEntry:
 	db "MATAMOSCAS@"
-	db 5,7
-	dw 340
+	db 17
+	dw 155
 	text_far _VictreebelDexEntry
 	text_end
 
 MissingNoDexEntry:
 	db "???@"
 	db 10 ; 1.0 m
-	dw 100 ; 10.0 kg
+	dw 100
 	db "コメント　さくせいちゅう@" ; コメント作成中 (Comment to be written)
diff --git a/engine/menus/pokedex.asm b/engine/menus/pokedex.asm
index 5660ecfb..81bf543b 100755
--- a/engine/menus/pokedex.asm
+++ b/engine/menus/pokedex.asm
@@ -360,19 +360,19 @@ DrawPokedexVerticalLine:
 	ret
 
 PokedexSeenText:
-	db "SEEN@"
+	db "VIST@"
 
 PokedexOwnText:
-	db "OWN@"
+	db "TIEN@"
 
 PokedexContentsText:
-	db "CONTENTS@"
+	db "CONTENIDO@"
 
 PokedexMenuItemsText:
-	db   "DATA"
-	next "CRY"
-	next "AREA"
-	next "QUIT@"
+	db   "INFO"
+	next "GRIT"
+	next "ÁREA"
+	next "SALE@"
 
 ; tests if a pokemon's bit is set in the seen or owned pokemon bit fields
 ; INPUT:
@@ -515,45 +515,46 @@ ShowPokedexDataInternal:
 	jp z, .waitForButtonPress ; if the pokemon has not been owned, don't print the height, weight, or description
 	inc de ; de = address of feet (height)
 	ld a, [de] ; reads feet, but a is overwritten without being used
-	hlcoord 12, 6
-	lb bc, 1, 2
+	push af
+	coord hl, 13, 6
+	lb bc, 1, 3
 	call PrintNumber ; print feet (height)
-	ld a, "′"
-	ld [hl], a
-	inc de
-	inc de ; de = address of inches (height)
-	hlcoord 15, 6
-	lb bc, LEADING_ZEROES | 1, 2
-	call PrintNumber ; print inches (height)
-	ld a, "″"
-	ld [hl], a
-; now print the weight (note that weight is stored in tenths of pounds internally)
+	ld hl, $C426
+	pop af
+	cp $a
+	jr nc, .func_43d7
+	ld [hl], "0"
+.func_43d7
+	inc hl
+	ld a, [hli]
+	ldd [hl], a
+	ld [hl], "<DOT>"
 	inc de
 	inc de
-	inc de ; de = address of upper byte of weight
+	inc de ; de = address of inches (height)
 	push de
 ; put weight in big-endian order at hDexWeight
-	ld hl, hDexWeight
-	ld a, [hl] ; save existing value of [hDexWeight]
+	ld hl,hDexWeight
+	ld a,[hl] ; save existing value of [hDexWeight]
 	push af
-	ld a, [de] ; a = upper byte of weight
-	ld [hli], a ; store upper byte of weight in [hDexWeight]
-	ld a, [hl] ; save existing value of [hDexWeight + 1]
+	ld a,[de] ; a = upper byte of weight
+	ld [hli],a ; store upper byte of weight in [hDexWeight]
+	ld a,[hl] ; save existing value of [hDexWeight + 1]
 	push af
 	dec de
-	ld a, [de] ; a = lower byte of weight
-	ld [hl], a ; store lower byte of weight in [hDexWeight + 1]
-	ld de, hDexWeight
-	hlcoord 11, 8
-	lb bc, 2, 5 ; 2 bytes, 5 digits
+	ld a,[de] ; a = lower byte of weight
+	ld [hl],a ; store lower byte of weight in [hDexWeight + 1]
+	ld de,hDexWeight
+	coord hl, 12, 8
+	lb bc, 2, 4 ; 2 bytes, 4 digits
 	call PrintNumber ; print weight
-	hlcoord 14, 8
-	ldh a, [hDexWeight + 1]
-	sub 10
-	ldh a, [hDexWeight]
-	sbc 0
-	jr nc, .next
-	ld [hl], "0" ; if the weight is less than 10, put a 0 before the decimal point
+	coord hl, 14, 8
+	ld a,[hDexWeight + 1]
+	sub a,10
+	ld a,[hDexWeight]
+	sbc a,0
+	jr nc,.next
+	ld [hl],"0" ; if the weight is less than 10, put a 0 before the decimal point
 .next
 	inc hl
 	ld a, [hli]
@@ -590,8 +591,8 @@ ShowPokedexDataInternal:
 	ret
 
 HeightWeightText:
-	db   "HT  ?′??″"
-	next "WT   ???lb@"
+	db   "AL   ???<m>"
+	next "PE   ???<k><g>@"
 
 ; XXX does anything point to this?
 PokeText:
diff --git a/gfx/pokedex/pokedex.png b/gfx/pokedex/pokedex.png
index 0a2c89ea..0e545a1c 100644
--- a/gfx/pokedex/pokedex.png
+++ b/gfx/pokedex/pokedex.png