diff --git a/pokeData/abomasnow b/pokeData/abomasnow
index e58dfdc..94dbccc 100644
--- a/pokeData/abomasnow
+++ b/pokeData/abomasnow
@@ -1,15 +1,23 @@
+abomasnow	A grass type Pokémon
 
-Name:  Abomasnow
-Pokedex Number:  460
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Snow Warning - Soundproof (Hidden Ability)
+Il apparaît quand les fleurs des
+terres enneigées fleurissent et
+se retire quand elles se fanent.
 
-Base Stats
-----------------------
-Total: 494
-Hp:  90
-Attack:  132
-Defence:  105
-Special Attack:  132
-Special Defence:  105
-Speed:  30
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:         92
+        defense:         75
+ special-attack:         92
+special-defense:         85
+          speed:         60
+
+Pokedex ID: 460	Capture Rate: 60
+Base Exp: 173	Happiness: 50
+Height: 22	Weight: 1355
+
+Genus: Frost Tree Pokémon
+Location Areas:
+mt-coronet-exterior-snowfall
+mt-coronet-exterior-blizzard
+kalos-route-17-area
diff --git a/pokeData/abra b/pokeData/abra
index 84d29a6..0041b0c 100644
--- a/pokeData/abra
+++ b/pokeData/abra
@@ -1,15 +1,38 @@
+abra	A psychic type Pokémon
 
-Name:  Abra
-Pokedex Number:  063
-Gender Ratio:   ♂:75% ♀:25%
-Abilities: Synchronize - Inner Focus - Magic Guard (Hidden Ability)
+ABRA needs to sleep for eighteen hours
+a day. If it doesn’t, this POKéMON loses
+its ability to use telekinetic powers.If it is attacked, ABRA escapes using
+TELEPORT while it is still sleeping.
 
-Base Stats
-----------------------
-Total: 310
-Hp:  25
-Attack:  20
-Defence:  15
-Special Attack:  105
-Special Defence:  55
-Speed:  90
+   ↞--------| STATS |--------↠ 
+             hp:         25
+         attack:         20
+        defense:         15
+ special-attack:        105
+special-defense:         55
+          speed:         90
+
+Pokedex ID: 63	Capture Rate: 200
+Base Exp: 62	Happiness: 50
+Height: 9	Weight: 195
+
+Genus: Psi Pokémon
+Location Areas:
+sinnoh-route-203-area
+sinnoh-route-215-area
+johto-route-34-area
+johto-route-35-area
+kanto-route-5-area
+kanto-route-6-area
+kanto-route-7-area
+kanto-route-8-area
+kanto-route-24-area
+kanto-route-25-area
+granite-cave-1f
+granite-cave-b1f
+granite-cave-b2f
+granite-cave-1fsmall-room
+hoenn-route-116-area
+kalos-route-5-area
+johto-safari-zone-zone-plains
diff --git a/pokeData/absol b/pokeData/absol
index 352621a..88bf4be 100644
--- a/pokeData/absol
+++ b/pokeData/absol
@@ -1,15 +1,72 @@
+absol	A dark type Pokémon
 
-Name:  Absol
-Pokedex Number:  359
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Pressure - Super Luck - Justified (Hidden Ability)
+Rumored to sense disasters with its
+horn, it became a target. It fled
+deep into the mountains.
 
-Base Stats
-----------------------
-Total: 465
-Hp:  65
-Attack:  150
-Defence:  60
-Special Attack:  115
-Special Defence:  60
-Speed:  115
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:        130
+        defense:         60
+ special-attack:         75
+special-defense:         60
+          speed:         75
+
+Pokedex ID: 359	Capture Rate: 30
+Base Exp: 163	Happiness: 35
+Height: 12	Weight: 470
+
+Genus: Disaster Pokémon
+Location Areas:
+mt-coronet-exterior-snowfall
+mt-coronet-exterior-blizzard
+sinnoh-route-213-area
+union-cave-1f
+union-cave-b1f
+union-cave-b2f
+slowpoke-well-1f
+slowpoke-well-b1f
+whirl-islands-1f
+whirl-islands-b1f
+whirl-islands-b2f
+whirl-islands-b3f
+mt-mortar-1f
+mt-mortar-lower-cave
+mt-mortar-upper-cave
+mt-mortar-b1f
+ice-path-1f
+ice-path-b1f
+ice-path-b2f
+ice-path-b3f
+dark-cave-violet-city-entrance
+dark-cave-blackthorn-city-entrance
+seafoam-islands-1f
+seafoam-islands-b1f
+seafoam-islands-b2f
+seafoam-islands-b3f
+seafoam-islands-b4f
+mt-silver-2f
+mt-silver-1f-top
+mt-silver-4f
+johto-route-47-inside-cave
+mt-silver-1f
+mt-silver-mountainside
+mt-silver-3f
+mt-silver-top
+mt-moon-1f
+mt-moon-2f
+rock-tunnel-1f
+rock-tunnel-b1f
+kanto-victory-road-1-1f
+tohjo-falls-area
+digletts-cave-area
+kanto-victory-road-1-2f
+kanto-victory-road-1-3f
+cerulean-cave-1f
+cerulean-cave-2f
+cerulean-cave-b1f
+hoenn-route-120-area
+giant-chasm-outside
+unova-route-13-area
+unova-route-14-area
+kalos-route-8-area
diff --git a/pokeData/accelgor b/pokeData/accelgor
index 8126259..e41f68b 100644
--- a/pokeData/accelgor
+++ b/pokeData/accelgor
@@ -1,15 +1,21 @@
+accelgor	A bug type Pokémon
 
-Name:  Accelgor
-Pokedex Number:  617
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Hydration - Sticky Hold - Unburden (Hidden Ability)
+무거운 껍데기를 벗었기 때문에
+몸이 가벼워졌다. 마치 닌자 같은
+몸놀림으로 싸운다.
+
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:         70
+        defense:         40
+ special-attack:        100
+special-defense:         60
+          speed:        145
+
+Pokedex ID: 617	Capture Rate: 75
+Base Exp: 173	Happiness: 50
+Height: 8	Weight: 253
+
+Genus: Shell Out Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 495
-Hp:  80
-Attack:  70
-Defence:  40
-Special Attack:  100
-Special Defence:  60
-Speed:  145
diff --git a/pokeData/aegislash b/pokeData/aegislash
index c4e2319..7b22104 100644
--- a/pokeData/aegislash
+++ b/pokeData/aegislash
@@ -1,15 +1,15 @@
+	A  type Pokémon
 
-Name:  Aegislash
-Pokedex Number:  681
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Stance Change
+歴代の　王が　連れていた。
+霊力で　人や　ポケモンの
+心を　操り　従わせる。
+
+   ↞--------| STATS |--------↠ 
+
+Pokedex ID: 	Capture Rate: 45
+Base Exp: 	Happiness: 50
+Height: 	Weight: 
+
+Genus: Royal Sword Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 520
-Hp:  60
-Attack:  150
-Defence:  50
-Special Attack:  150
-Special Defence:  50
-Speed:  60
diff --git a/pokeData/aerodactyl b/pokeData/aerodactyl
index c6fba83..8073e6d 100644
--- a/pokeData/aerodactyl
+++ b/pokeData/aerodactyl
@@ -1,15 +1,22 @@
+aerodactyl	A rock type Pokémon
 
-Name:  Aerodactyl
-Pokedex Number:  142
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Rock Head - Pressure - Unnerve (Hidden Ability)
+AERODACTYL is a POKéMON from the age
+of dinosaurs. It was regenerated from
+genetic material extracted from amber.It is imagined to have been the king of
+the skies in ancient times.
 
-Base Stats
-----------------------
-Total: 515
-Hp:  80
-Attack:  135
-Defence:  85
-Special Attack:  70
-Special Defence:  95
-Speed:  150
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:        105
+        defense:         65
+ special-attack:         60
+special-defense:         75
+          speed:        130
+
+Pokedex ID: 142	Capture Rate: 45
+Base Exp: 180	Happiness: 50
+Height: 18	Weight: 590
+
+Genus: Fossil Pokémon
+Location Areas:
+cinnabar-island-cinnabar-lab
diff --git a/pokeData/aggron b/pokeData/aggron
index 1e509f1..9003d66 100644
--- a/pokeData/aggron
+++ b/pokeData/aggron
@@ -1,15 +1,21 @@
+aggron	A steel type Pokémon
 
-Name:  Aggron
-Pokedex Number:  306
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Sturdy - Rock Head - Heavy Metal (Hidden Ability)
+While seeking iron for food, it
+digs tunnels by breaking through
+bedrock with its steel horns.
+
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:        110
+        defense:        180
+ special-attack:         60
+special-defense:         60
+          speed:         50
+
+Pokedex ID: 306	Capture Rate: 45
+Base Exp: 265	Happiness: 35
+Height: 21	Weight: 3600
+
+Genus: Iron Armor Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 530
-Hp:  70
-Attack:  140
-Defence:  230
-Special Attack:  60
-Special Defence:  80
-Speed:  50
diff --git a/pokeData/aipom b/pokeData/aipom
index faad8f4..e3b068c 100644
--- a/pokeData/aipom
+++ b/pokeData/aipom
@@ -1,15 +1,35 @@
+aipom	A normal type Pokémon
 
-Name:  Aipom
-Pokedex Number:  190
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Run Away - Pickup - Skill Link (Hidden Ability)
+It lives atop tall trees. When leaping
+from branch to branch, it deftly uses its
+tail for balance.
 
-Base Stats
-----------------------
-Total: 360
-Hp:  55
-Attack:  70
-Defence:  55
-Special Attack:  40
-Special Defence:  55
-Speed:  85
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         70
+        defense:         55
+ special-attack:         40
+special-defense:         55
+          speed:         85
+
+Pokedex ID: 190	Capture Rate: 45
+Base Exp: 72	Happiness: 70
+Height: 8	Weight: 115
+
+Genus: Long Tail Pokémon
+Location Areas:
+johto-route-29-area
+johto-route-30-area
+johto-route-31-area
+johto-route-32-area
+johto-route-33-area
+johto-route-42-area
+johto-route-43-area
+johto-route-44-area
+johto-route-45-area
+johto-route-46-area
+hoenn-safari-zone-expansion-south
+hoenn-safari-zone-expansion-north
+hoenn-altering-cave-f
+kanto-altering-cave-f
+azalea-town-area
diff --git a/pokeData/alakazam b/pokeData/alakazam
index 849eb0b..be572f0 100644
--- a/pokeData/alakazam
+++ b/pokeData/alakazam
@@ -1,15 +1,23 @@
+alakazam	A psychic type Pokémon
 
-Name:  Alakazam
-Pokedex Number:  065
-Gender Ratio:   ♂:75% ♀:25%
-Abilities: Synchronize - Inner Focus - Magic Guard (Hidden Ability)
+ALAKAZAM’s brain continually grows,
+infinitely multiplying brain cells.
+This amazing brain gives this POKéMONan astoundingly high IQ of 5,000.
+It has a thorough memory of everything
+that has occurred in the world.
+
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         50
+        defense:         45
+ special-attack:        135
+special-defense:         95
+          speed:        120
+
+Pokedex ID: 65	Capture Rate: 50
+Base Exp: 250	Happiness: 50
+Height: 15	Weight: 480
+
+Genus: Psi Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 500
-Hp:  55
-Attack:  50
-Defence:  65
-Special Attack:  175
-Special Defence:  95
-Speed:  150
diff --git a/pokeData/alcremie b/pokeData/alcremie
index 2f33d9c..c6b035e 100644
--- a/pokeData/alcremie
+++ b/pokeData/alcremie
@@ -1,15 +1,20 @@
+alcremie	A fairy type Pokémon
 
-Name:  Alcremie
-Pokedex Number:  869
-Gender Ratio:   ♂:0% ♀:100%
-Abilities: Sweet Veil - Aroma Veil (Hidden Ability)
+When it trusts a Trainer, it will treat them to
+berries it’s decorated with cream.
+
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         60
+        defense:         75
+ special-attack:        110
+special-defense:        121
+          speed:         64
+
+Pokedex ID: 869	Capture Rate: 100
+Base Exp: 173	Happiness: 50
+Height: 3	Weight: 5
+
+Genus: Cream Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 495
-Hp:  110
-Attack:  121
-Defence:  64
-Special Attack:  Max Stats<b
-Special Defence:  Lv. 50
-Speed:  125 - 172
diff --git a/pokeData/alomomola b/pokeData/alomomola
index 60a90c9..f053172 100644
--- a/pokeData/alomomola
+++ b/pokeData/alomomola
@@ -1,15 +1,30 @@
+alomomola	A water type Pokémon
 
-Name:  Alomomola
-Pokedex Number:  594
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Healer - Hydration - Regenerator (Hidden Ability)
+넓은 바다를 떠돌아다니며 산다.
+상처 입은 포켓몬을 발견하면
+안고서 물가까지 옮긴다.
 
-Base Stats
-----------------------
-Total: 470
-Hp:  165
-Attack:  75
-Defence:  80
-Special Attack:  40
-Special Defence:  45
-Speed:  65
+   ↞--------| STATS |--------↠ 
+             hp:        165
+         attack:         75
+        defense:         80
+ special-attack:         40
+special-defense:         45
+          speed:         65
+
+Pokedex ID: 594	Capture Rate: 75
+Base Exp: 165	Happiness: 70
+Height: 12	Weight: 316
+
+Genus: Caring Pokémon
+Location Areas:
+driftveil-city-area
+p2-laboratory-area
+unova-route-4-area
+unova-route-18-area
+unova-route-17-area
+virbank-city-area
+virbank-complex-outer
+unova-route-21-area
+shalour-city-area
+azure-bay-area
diff --git a/pokeData/altaria b/pokeData/altaria
index ef89acb..652cbb6 100644
--- a/pokeData/altaria
+++ b/pokeData/altaria
@@ -1,15 +1,27 @@
+altaria	A dragon type Pokémon
 
-Name:  Altaria
-Pokedex Number:  334
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Natural Cure - Cloud Nine (Hidden Ability)
+It looks like a fluffy cloud when
+it is in flight. It hums with its
+soprano voice.
 
-Base Stats
-----------------------
-Total: 490
-Hp:  75
-Attack:  110
-Defence:  110
-Special Attack:  110
-Special Defence:  105
-Speed:  80
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:         70
+        defense:         90
+ special-attack:         70
+special-defense:        105
+          speed:         80
+
+Pokedex ID: 334	Capture Rate: 45
+Base Exp: 172	Happiness: 50
+Height: 11	Weight: 206
+
+Genus: Humming Pokémon
+Location Areas:
+sky-pillar-5f
+unova-route-14-area
+abundant-shrine-area
+unova-victory-road-2-unknown-area-73
+unova-victory-road-2-unknown-area-79
+nature-sanctuary-area
+kalos-route-21-area
diff --git a/pokeData/amaura b/pokeData/amaura
index 95b3a7b..7bb2335 100644
--- a/pokeData/amaura
+++ b/pokeData/amaura
@@ -1,15 +1,21 @@
+amaura	A rock type Pokémon
 
-Name:  Amaura
-Pokedex Number:  698
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Refrigerate - Snow Warning (Hidden Ability)
+１億年前から　氷漬けに　なっていた
+体の　一部から　復活した
+古代の　ポケモン。
 
-Base Stats
-----------------------
-Total: 362
-Hp:  77
-Attack:  59
-Defence:  50
-Special Attack:  67
-Special Defence:  63
-Speed:  46
+   ↞--------| STATS |--------↠ 
+             hp:         77
+         attack:         59
+        defense:         50
+ special-attack:         67
+special-defense:         63
+          speed:         46
+
+Pokedex ID: 698	Capture Rate: 45
+Base Exp: 72	Happiness: 50
+Height: 13	Weight: 252
+
+Genus: Tundra Pokémon
+Location Areas:
+glittering-cave-unknown-area-303
diff --git a/pokeData/ambipom b/pokeData/ambipom
index 64d5d66..104a32b 100644
--- a/pokeData/ambipom
+++ b/pokeData/ambipom
@@ -1,15 +1,21 @@
+ambipom	A normal type Pokémon
 
-Name:  Ambipom
-Pokedex Number:  424
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Technician - Pickup - Skill Link (Hidden Ability)
+Ses queues jumelles sont si agiles
+et efficaces qu’il ne se sert que
+très rarement de ses bras.
+
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:        100
+        defense:         66
+ special-attack:         60
+special-defense:         66
+          speed:        115
+
+Pokedex ID: 424	Capture Rate: 45
+Base Exp: 169	Happiness: 100
+Height: 12	Weight: 203
+
+Genus: Long Tail Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 482
-Hp:  75
-Attack:  100
-Defence:  66
-Special Attack:  60
-Special Defence:  66
-Speed:  115
diff --git a/pokeData/amoonguss b/pokeData/amoonguss
index 8d8a17f..59a54a4 100644
--- a/pokeData/amoonguss
+++ b/pokeData/amoonguss
@@ -1,15 +1,27 @@
+amoonguss	A grass type Pokémon
 
-Name:  Amoonguss
-Pokedex Number:  591
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Effect Spore - Regenerator (Hidden Ability)
+몬스터볼 무늬의 삿갓을 보여주며
+먹이를 유인하려 하지만
+속아 넘어가는 포켓몬은 드물다.
 
-Base Stats
-----------------------
-Total: 464
-Hp:  114
-Attack:  85
-Defence:  70
-Special Attack:  85
-Special Defence:  80
-Speed:  30
+   ↞--------| STATS |--------↠ 
+             hp:        114
+         attack:         85
+        defense:         70
+ special-attack:         85
+special-defense:         80
+          speed:         30
+
+Pokedex ID: 591	Capture Rate: 75
+Base Exp: 162	Happiness: 50
+Height: 6	Weight: 105
+
+Genus: Mushroom Pokémon
+Location Areas:
+unova-route-10-area
+unova-route-10-victory-road-gate
+unova-route-11-area
+unova-route-22-area
+unova-route-23-area
+kalos-route-20-area
+pokemon-village-area
diff --git a/pokeData/ampharos b/pokeData/ampharos
index d31589c..1810431 100644
--- a/pokeData/ampharos
+++ b/pokeData/ampharos
@@ -1,15 +1,21 @@
+ampharos	A electric type Pokémon
 
-Name:  Ampharos
-Pokedex Number:  181
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Static - Plus (Hidden Ability)
+The tail’s tip shines brightly and can be
+seen from far away. It acts as a beacon
+for lost people.
+
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:         75
+        defense:         85
+ special-attack:        115
+special-defense:         90
+          speed:         55
+
+Pokedex ID: 181	Capture Rate: 45
+Base Exp: 230	Happiness: 70
+Height: 14	Weight: 615
+
+Genus: Light Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 510
-Hp:  90
-Attack:  95
-Defence:  105
-Special Attack:  165
-Special Defence:  110
-Speed:  45
diff --git a/pokeData/anorith b/pokeData/anorith
index 748cac7..e49885b 100644
--- a/pokeData/anorith
+++ b/pokeData/anorith
@@ -1,15 +1,21 @@
+anorith	A rock type Pokémon
 
-Name:  Anorith
-Pokedex Number:  347
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Battle Armor - Swift Swim (Hidden Ability)
+A Pokémon ancestor that was
+reanimated from a fossil. It lived
+in the sea and hunted with claws.
 
-Base Stats
-----------------------
-Total: 355
-Hp:  45
-Attack:  95
-Defence:  50
-Special Attack:  40
-Special Defence:  50
-Speed:  75
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         95
+        defense:         50
+ special-attack:         40
+special-defense:         50
+          speed:         75
+
+Pokedex ID: 347	Capture Rate: 45
+Base Exp: 71	Happiness: 50
+Height: 7	Weight: 125
+
+Genus: Old Shrimp Pokémon
+Location Areas:
+rustboro-city-area
diff --git a/pokeData/appletun b/pokeData/appletun
index 5b860a0..800a72e 100644
--- a/pokeData/appletun
+++ b/pokeData/appletun
@@ -1,15 +1,21 @@
+appletun	A grass type Pokémon
 
-Name:  Appletun
-Pokedex Number:  842
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Ripen - Gluttony - Thick Fat (Hidden Ability)
+Eating a sweet apple caused its evolution.
+A nectarous scent wafts from its body, luring in
+the bug Pokémon it preys on.
+
+   ↞--------| STATS |--------↠ 
+             hp:        110
+         attack:         85
+        defense:         80
+ special-attack:        100
+special-defense:         80
+          speed:         30
+
+Pokedex ID: 842	Capture Rate: 45
+Base Exp: 170	Happiness: 50
+Height: 4	Weight: 130
+
+Genus: Apple Nectar Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 485
-Hp:  110
-Attack:  85
-Defence:  80
-Special Attack:  100
-Special Defence:  80
-Speed:  30
diff --git a/pokeData/applin b/pokeData/applin
index 2ae7b85..5fc44f8 100644
--- a/pokeData/applin
+++ b/pokeData/applin
@@ -1,15 +1,21 @@
+applin	A grass type Pokémon
 
-Name:  Applin
-Pokedex Number:  840
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Ripen - Gluttony - Bulletproof (Hidden Ability)
+It spends its entire life inside an apple. It hides
+from its natural enemies, bird Pokémon, by
+pretending it’s just an apple and nothing more.
+
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         40
+        defense:         80
+ special-attack:         40
+special-defense:         40
+          speed:         20
+
+Pokedex ID: 840	Capture Rate: 255
+Base Exp: 52	Happiness: 50
+Height: 2	Weight: 5
+
+Genus: Apple Core Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 260
-Hp:  40
-Attack:  40
-Defence:  80
-Special Attack:  40
-Special Defence:  40
-Speed:  20
diff --git a/pokeData/araquanid b/pokeData/araquanid
index 9964d33..830caee 100644
--- a/pokeData/araquanid
+++ b/pokeData/araquanid
@@ -1,15 +1,21 @@
+araquanid	A water type Pokémon
 
-Name:  Araquanid
-Pokedex Number:  752
-Gender Ratio:   ♂:50.2% ♀:49.8% 
-Abilities: Water Bubble - Water Absorb (Hidden Ability)
+It delivers headbutts with the water bubble
+on its head. Small Pokémon get sucked into
+the bubble, where they drown.
+
+   ↞--------| STATS |--------↠ 
+             hp:         68
+         attack:         70
+        defense:         92
+ special-attack:         50
+special-defense:        132
+          speed:         42
+
+Pokedex ID: 752	Capture Rate: 100
+Base Exp: 159	Happiness: 50
+Height: 18	Weight: 820
+
+Genus: Water Bubble Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 454
-Hp:  68
-Attack:  70
-Defence:  92
-Special Attack:  50
-Special Defence:  132
-Speed:  42
diff --git a/pokeData/arbok b/pokeData/arbok
index f72d849..b29b2f5 100644
--- a/pokeData/arbok
+++ b/pokeData/arbok
@@ -1,15 +1,42 @@
+arbok	A poison type Pokémon
 
-Name:  Arbok
-Pokedex Number:  024
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Intimidate - Shed Skin - Unnerve (Hidden Ability)
+This POKéMON is terrifically strong in
+order to constrict things with its body.
+It can even flatten steel oil drums.Once ARBOK wraps its body around its
+foe, escaping its crunching embrace is
+impossible.
 
-Base Stats
-----------------------
-Total: 438
-Hp:  60
-Attack:  85
-Defence:  69
-Special Attack:  65
-Special Defence:  79
-Speed:  80
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         95
+        defense:         69
+ special-attack:         65
+special-defense:         79
+          speed:         80
+
+Pokedex ID: 24	Capture Rate: 90
+Base Exp: 157	Happiness: 70
+Height: 35	Weight: 650
+
+Genus: Cobra Pokémon
+Location Areas:
+great-marsh-area-1
+great-marsh-area-2
+great-marsh-area-3
+great-marsh-area-4
+great-marsh-area-5
+great-marsh-area-6
+johto-route-42-area
+mt-silver-outside
+kanto-route-26-area
+kanto-route-27-area
+kanto-route-28-area
+kanto-route-3-area
+kanto-route-4-area
+cerulean-cave-1f
+cerulean-cave-b1f
+kanto-route-23-area
+kanto-victory-road-2-1f
+kanto-victory-road-2-2f
+kanto-victory-road-2-3f
+johto-safari-zone-zone-marshland
diff --git a/pokeData/arcanine b/pokeData/arcanine
index f7bd231..e7d57ca 100644
--- a/pokeData/arcanine
+++ b/pokeData/arcanine
@@ -1,15 +1,22 @@
+arcanine	A fire type Pokémon
 
-Name:  Arcanine
-Pokedex Number:  059
-Gender Ratio:   ♂:75% ♀:25%
-Abilities: Intimidate - Flash Fire - Justified (Hidden Ability)
+ARCANINE is known for its high speed.
+It is said to be capable of running over
+6,200 miles in a single day and night.The fire that blazes wildly within this
+POKéMON’s body is its source of power.
+
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:        110
+        defense:         80
+ special-attack:        100
+special-defense:         80
+          speed:         95
+
+Pokedex ID: 59	Capture Rate: 75
+Base Exp: 194	Happiness: 50
+Height: 19	Weight: 1550
+
+Genus: Legendary Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 555
-Hp:  90
-Attack:  110
-Defence:  80
-Special Attack:  100
-Special Defence:  80
-Speed:  95
diff --git a/pokeData/arceus b/pokeData/arceus
index e69de29..66c7730 100644
--- a/pokeData/arceus
+++ b/pokeData/arceus
@@ -0,0 +1,21 @@
+arceus	A normal type Pokémon
+
+On dit que son œuf a éclos dans
+le néant et qu’il est à l’origine
+de la création du monde.
+
+   ↞--------| STATS |--------↠ 
+             hp:        120
+         attack:        120
+        defense:        120
+ special-attack:        120
+special-defense:        120
+          speed:        120
+
+Pokedex ID: 493	Capture Rate: 3
+Base Exp: 324	Happiness: 0
+Height: 32	Weight: 3200
+
+Genus: Alpha Pokémon
+Location Areas:
+sinnoh-hall-of-origin-1-area
diff --git a/pokeData/archen b/pokeData/archen
index 4bf8015..af477cd 100644
--- a/pokeData/archen
+++ b/pokeData/archen
@@ -1,15 +1,21 @@
+archen	A rock type Pokémon
 
-Name:  Archen
-Pokedex Number:  566
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Defeatist
+화석에서 부활한 포켓몬이다.
+모든 새포켓몬의 조상이라
+여겨지고 있다.
+
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:        112
+        defense:         45
+ special-attack:         74
+special-defense:         45
+          speed:         70
+
+Pokedex ID: 566	Capture Rate: 45
+Base Exp: 71	Happiness: 50
+Height: 5	Weight: 95
+
+Genus: First Bird Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 401
-Hp:  55
-Attack:  112
-Defence:  45
-Special Attack:  74
-Special Defence:  45
-Speed:  70
diff --git a/pokeData/archeops b/pokeData/archeops
index 1ffeb11..ae4cdbc 100644
--- a/pokeData/archeops
+++ b/pokeData/archeops
@@ -1,15 +1,21 @@
+archeops	A rock type Pokémon
 
-Name:  Archeops
-Pokedex Number:  567
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Defeatist
+지상에서 도움닫기를 하여
+날아오른다. 동료와 협력하여
+먹이를 잡는 지능을 가졌다.
+
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:        140
+        defense:         65
+ special-attack:        112
+special-defense:         65
+          speed:        110
+
+Pokedex ID: 567	Capture Rate: 45
+Base Exp: 177	Happiness: 50
+Height: 14	Weight: 320
+
+Genus: First Bird Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 567
-Hp:  75
-Attack:  140
-Defence:  65
-Special Attack:  112
-Special Defence:  65
-Speed:  110
diff --git a/pokeData/arctovish b/pokeData/arctovish
index 1a7ac39..e76baf9 100644
--- a/pokeData/arctovish
+++ b/pokeData/arctovish
@@ -1,15 +1,21 @@
+arctovish	A water type Pokémon
 
-Name:  Arctovish
-Pokedex Number:  883
-Gender Ratio:  Genderless
-Abilities: Water Absorb - Ice Body - Slush Rush (Hidden Ability)
+Though it’s able to capture prey by freezing its
+surroundings, it has trouble eating the prey
+afterward because its mouth is on top of its head.
+
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:         90
+        defense:        100
+ special-attack:         80
+special-defense:         90
+          speed:         55
+
+Pokedex ID: 883	Capture Rate: 45
+Base Exp: 177	Happiness: 50
+Height: 20	Weight: 1750
+
+Genus: Fossil Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 505
-Hp:  90
-Attack:  90
-Defence:  100
-Special Attack:  80
-Special Defence:  90
-Speed:  55
diff --git a/pokeData/arctozolt b/pokeData/arctozolt
index b8061f7..0eb8818 100644
--- a/pokeData/arctozolt
+++ b/pokeData/arctozolt
@@ -1,15 +1,21 @@
+arctozolt	A electric type Pokémon
 
-Name:  Arctozolt
-Pokedex Number:  881
-Gender Ratio:  Genderless
-Abilities: Volt Absorb - Static - Slush Rush (Hidden Ability)
+The shaking of its freezing upper half is what
+generates its electricity. It has a hard time
+walking around.
+
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:        100
+        defense:         90
+ special-attack:         90
+special-defense:         80
+          speed:         55
+
+Pokedex ID: 881	Capture Rate: 45
+Base Exp: 177	Happiness: 50
+Height: 23	Weight: 1500
+
+Genus: Fossil Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 505
-Hp:  90
-Attack:  100
-Defence:  90
-Special Attack:  90
-Special Defence:  80
-Speed:  55
diff --git a/pokeData/ariados b/pokeData/ariados
index 205166d..53f2a67 100644
--- a/pokeData/ariados
+++ b/pokeData/ariados
@@ -1,15 +1,26 @@
+ariados	A bug type Pokémon
 
-Name:  Ariados
-Pokedex Number:  168
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Swarm - Insomnia - Sniper (Hidden Ability)
+A single strand of a special string is
+endlessly spun out of its rear. The string
+leads back to its nest.
 
-Base Stats
-----------------------
-Total: 390
-Hp:  70
-Attack:  90
-Defence:  70
-Special Attack:  60
-Special Defence:  60
-Speed:  40
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         90
+        defense:         70
+ special-attack:         60
+special-defense:         70
+          speed:         40
+
+Pokedex ID: 168	Capture Rate: 90
+Base Exp: 140	Happiness: 70
+Height: 11	Weight: 335
+
+Genus: Long Leg Pokémon
+Location Areas:
+sinnoh-route-229-area
+johto-route-37-area
+kanto-route-2-south-towards-viridian-city
+kanto-route-2-north-towards-pewter-city
+dreamyard-area
+dreamyard-b1f
diff --git a/pokeData/armaldo b/pokeData/armaldo
index 117bccf..f9b3980 100644
--- a/pokeData/armaldo
+++ b/pokeData/armaldo
@@ -1,15 +1,21 @@
+armaldo	A rock type Pokémon
 
-Name:  Armaldo
-Pokedex Number:  348
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Battle Armor - Swift Swim (Hidden Ability)
+It went ashore after evolving.
+Its entire body is clad in a sturdy
+armor.
+
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:        125
+        defense:        100
+ special-attack:         70
+special-defense:         80
+          speed:         45
+
+Pokedex ID: 348	Capture Rate: 45
+Base Exp: 173	Happiness: 50
+Height: 15	Weight: 682
+
+Genus: Plate Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 495
-Hp:  75
-Attack:  125
-Defence:  100
-Special Attack:  70
-Special Defence:  80
-Speed:  45
diff --git a/pokeData/aromatisse b/pokeData/aromatisse
index 4433f26..b2ec469 100644
--- a/pokeData/aromatisse
+++ b/pokeData/aromatisse
@@ -1,15 +1,21 @@
+aromatisse	A fairy type Pokémon
 
-Name:  Aromatisse
-Pokedex Number:  683
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Healer - Aroma Veil (Hidden Ability)
+さまざまな　においを　作り出す。
+相手の　嫌がる　においを　出して
+戦いを　有利に　進めるのだ。
+
+   ↞--------| STATS |--------↠ 
+             hp:        101
+         attack:         72
+        defense:         72
+ special-attack:         99
+special-defense:         89
+          speed:         29
+
+Pokedex ID: 683	Capture Rate: 140
+Base Exp: 162	Happiness: 50
+Height: 8	Weight: 155
+
+Genus: Fragrance Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 462
-Hp:  101
-Attack:  72
-Defence:  72
-Special Attack:  99
-Special Defence:  89
-Speed:  29
diff --git a/pokeData/aron b/pokeData/aron
index 0b80ab4..5b8d8d9 100644
--- a/pokeData/aron
+++ b/pokeData/aron
@@ -1,15 +1,27 @@
+aron	A steel type Pokémon
 
-Name:  Aron
-Pokedex Number:  304
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Sturdy - Rock Head - Heavy Metal (Hidden Ability)
+It usually lives deep in mountains.
+However, hunger may drive it to
+eat railroad tracks and cars.
 
-Base Stats
-----------------------
-Total: 330
-Hp:  50
-Attack:  70
-Defence:  100
-Special Attack:  40
-Special Defence:  40
-Speed:  30
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         70
+        defense:        100
+ special-attack:         40
+special-defense:         40
+          speed:         30
+
+Pokedex ID: 304	Capture Rate: 180
+Base Exp: 66	Happiness: 35
+Height: 4	Weight: 600
+
+Genus: Iron Armor Pokémon
+Location Areas:
+fuego-ironworks-area
+granite-cave-b1f
+granite-cave-b2f
+granite-cave-1fsmall-room
+hoenn-victory-road-1f
+mistralton-cave-area
+guidance-chamber-area
diff --git a/pokeData/arrokuda b/pokeData/arrokuda
index 12da1a3..58f31f5 100644
--- a/pokeData/arrokuda
+++ b/pokeData/arrokuda
@@ -1,15 +1,21 @@
+arrokuda	A water type Pokémon
 
-Name:  Arrokuda
-Pokedex Number:  846
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Swift Swim - Propeller Tail (Hidden Ability)
+If it sees any movement around it, this Pokémon
+charges for it straightaway, leading with its
+sharply pointed jaw. It’s very proud of that jaw.
+
+   ↞--------| STATS |--------↠ 
+             hp:         41
+         attack:         63
+        defense:         40
+ special-attack:         40
+special-defense:         30
+          speed:         66
+
+Pokedex ID: 846	Capture Rate: 255
+Base Exp: 56	Happiness: 50
+Height: 5	Weight: 10
+
+Genus: Rush Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 280
-Hp:  41
-Attack:  63
-Defence:  40
-Special Attack:  40
-Special Defence:  30
-Speed:  66
diff --git a/pokeData/articuno b/pokeData/articuno
index 0e0a004..d6ef436 100644
--- a/pokeData/articuno
+++ b/pokeData/articuno
@@ -1,15 +1,23 @@
+articuno	A ice type Pokémon
 
-Name:  Articuno
-Pokedex Number:  144
-Gender Ratio:  Genderless
-Abilities: Pressure - Snow Cloak (Hidden Ability)
+ARTICUNO is a legendary bird POKéMON
+that can control ice.
+The flapping of its wings chills the air.As a result, it is said that when this
+POKéMON flies, snow will fall.
 
-Base Stats
-----------------------
-Total: 580
-Hp:  90
-Attack:  85
-Defence:  100
-Special Attack:  95
-Special Defence:  125
-Speed:  85
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:         85
+        defense:        100
+ special-attack:         95
+special-defense:        125
+          speed:         85
+
+Pokedex ID: 144	Capture Rate: 3
+Base Exp: 290	Happiness: 35
+Height: 17	Weight: 554
+
+Genus: Freeze Pokémon
+Location Areas:
+seafoam-islands-b4f
+roaming-sinnoh-area
diff --git a/pokeData/audino b/pokeData/audino
index 0b69559..925b74d 100644
--- a/pokeData/audino
+++ b/pokeData/audino
@@ -1,15 +1,62 @@
+audino	A normal type Pokémon
 
-Name:  Audino
-Pokedex Number:  531
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Healer - Regenerator - Klutz (Hidden Ability)
+귀의 더듬이로 상대의
+컨디션이나 알에서 포켓몬이
+언제 나올지도 알 수 있다.
 
-Base Stats
-----------------------
-Total: 445
-Hp:  103
-Attack:  60
-Defence:  126
-Special Attack:  80
-Special Defence:  126
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:        103
+         attack:         60
+        defense:         86
+ special-attack:         60
+special-defense:         86
+          speed:         50
+
+Pokedex ID: 531	Capture Rate: 255
+Base Exp: 390	Happiness: 50
+Height: 11	Weight: 310
+
+Genus: Hearing Pokémon
+Location Areas:
+dreamyard-area
+pinwheel-forest-outside
+pinwheel-forest-inside
+cold-storage-area
+dragonspiral-tower-entrance
+dragonspiral-tower-outside
+giant-chasm-outside
+giant-chasm-forest
+giant-chasm-forest-cave
+p2-laboratory-area
+village-bridge-area
+unova-route-1-area
+unova-route-2-area
+unova-route-3-area
+unova-route-5-area
+unova-route-6-area
+unova-route-7-area
+unova-route-9-area
+unova-route-10-area
+unova-route-10-victory-road-gate
+unova-route-11-area
+unova-route-12-area
+unova-route-13-area
+unova-route-14-area
+abundant-shrine-area
+unova-route-15-area
+unova-route-16-area
+lostlorn-forest-area
+unova-route-18-area
+castelia-city-area
+unova-victory-road-2-unknown-area-72
+unova-victory-road-2-unknown-area-73
+unova-victory-road-2-unknown-area-76
+unova-victory-road-2-unknown-area-79
+floccesy-ranch-inner
+virbank-complex-outer
+virbank-complex-inner
+reversal-mountain-unknown-area-48
+nature-sanctuary-area
+unova-route-20-area
+unova-route-22-area
+unova-route-23-area
diff --git a/pokeData/aurorus b/pokeData/aurorus
index 99f5485..4f73265 100644
--- a/pokeData/aurorus
+++ b/pokeData/aurorus
@@ -1,15 +1,21 @@
+aurorus	A rock type Pokémon
 
-Name:  Aurorus
-Pokedex Number:  699
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Refrigerate - Snow Warning (Hidden Ability)
+マイナス１５０度の　冷気を
+ひし形の　結晶から　出して
+敵を　包み　氷漬けにする。
+
+   ↞--------| STATS |--------↠ 
+             hp:        123
+         attack:         77
+        defense:         72
+ special-attack:         99
+special-defense:         92
+          speed:         58
+
+Pokedex ID: 699	Capture Rate: 45
+Base Exp: 104	Happiness: 50
+Height: 27	Weight: 2250
+
+Genus: Tundra Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 521
-Hp:  123
-Attack:  77
-Defence:  72
-Special Attack:  99
-Special Defence:  92
-Speed:  58
diff --git a/pokeData/avalugg b/pokeData/avalugg
index e3a5b6b..3cabb0f 100644
--- a/pokeData/avalugg
+++ b/pokeData/avalugg
@@ -1,15 +1,21 @@
+avalugg	A ice type Pokémon
 
-Name:  Avalugg
-Pokedex Number:  713
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Own Tempo - Ice Body - Sturdy (Hidden Ability)
+凍りついた　体は　鋼鉄のように
+硬い。立ちふさがる　ものを
+巨体で　押しつぶし　移動する。
+
+   ↞--------| STATS |--------↠ 
+             hp:         95
+         attack:        117
+        defense:        184
+ special-attack:         44
+special-defense:         46
+          speed:         28
+
+Pokedex ID: 713	Capture Rate: 55
+Base Exp: 180	Happiness: 50
+Height: 20	Weight: 5050
+
+Genus: Iceberg Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 514
-Hp:  95
-Attack:  117
-Defence:  184
-Special Attack:  44
-Special Defence:  46
-Speed:  28
diff --git a/pokeData/axew b/pokeData/axew
index b26f65b..3033b9b 100644
--- a/pokeData/axew
+++ b/pokeData/axew
@@ -1,15 +1,23 @@
+axew	A dragon type Pokémon
 
-Name:  Axew
-Pokedex Number:  610
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Rivalry - Mold Breaker - Unnerve (Hidden Ability)
+나무열매를 이빨로 깨물어 먹는다.
+이빨이 몇 차례에 걸쳐 새로 나면
+강하고 날카로워진다
 
-Base Stats
-----------------------
-Total: 320
-Hp:  46
-Attack:  87
-Defence:  60
-Special Attack:  30
-Special Defence:  40
-Speed:  57
+   ↞--------| STATS |--------↠ 
+             hp:         46
+         attack:         87
+        defense:         60
+ special-attack:         30
+special-defense:         40
+          speed:         57
+
+Pokedex ID: 610	Capture Rate: 75
+Base Exp: 64	Happiness: 35
+Height: 6	Weight: 180
+
+Genus: Tusk Pokémon
+Location Areas:
+mistralton-cave-area
+guidance-chamber-area
+connecting-cave-area
diff --git a/pokeData/azelf b/pokeData/azelf
index b539c4b..db02864 100644
--- a/pokeData/azelf
+++ b/pokeData/azelf
@@ -1,15 +1,22 @@
+azelf	A psychic type Pokémon
 
-Name:  Azelf
-Pokedex Number:  482
-Gender Ratio:  Genderless
-Abilities: Levitate
+Quand il prit son envol, les hommes
+acquirent la détermination.
+La volonté était née.
 
-Base Stats
-----------------------
-Total: 580
-Hp:  75
-Attack:  125
-Defence:  70
-Special Attack:  125
-Special Defence:  70
-Speed:  115
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:        125
+        defense:         70
+ special-attack:        125
+special-defense:         70
+          speed:        115
+
+Pokedex ID: 482	Capture Rate: 3
+Base Exp: 290	Happiness: 140
+Height: 3	Weight: 3
+
+Genus: Willpower Pokémon
+Location Areas:
+lake-valor-cavern
+sinjoh-ruins-area
diff --git a/pokeData/azumarill b/pokeData/azumarill
index 5daae2b..a16da6d 100644
--- a/pokeData/azumarill
+++ b/pokeData/azumarill
@@ -1,15 +1,36 @@
+azumarill	A water type Pokémon
 
-Name:  Azumarill
-Pokedex Number:  184
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Thick Fat - Huge Power - Sap Sipper (Hidden Ability)
+By keeping still and listening intently, it
+can even tell what is in wild, fast-moving
+rivers.
 
-Base Stats
-----------------------
-Total: 420
-Hp:  100
-Attack:  50
-Defence:  80
-Special Attack:  60
-Special Defence:  80
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:        100
+         attack:         50
+        defense:         80
+ special-attack:         60
+special-defense:         80
+          speed:         50
+
+Pokedex ID: 184	Capture Rate: 75
+Base Exp: 210	Happiness: 50
+Height: 8	Weight: 285
+
+Genus: Aqua Rabbit Pokémon
+Location Areas:
+sinnoh-victory-road-b1f
+sinnoh-victory-road-inside-b1f
+pinwheel-forest-inside
+village-bridge-area
+unova-route-6-area
+unova-route-11-area
+abundant-shrine-area
+unova-victory-road-2-unknown-area-71
+unova-victory-road-2-unknown-area-75
+unova-victory-road-2-unknown-area-78
+floccesy-ranch-outer
+floccesy-ranch-inner
+relic-passage-relic-castle-entrance
+unova-route-20-area
+unova-route-22-area
+kalos-route-22-area
diff --git a/pokeData/azurill b/pokeData/azurill
index 4853d07..2f1106a 100644
--- a/pokeData/azurill
+++ b/pokeData/azurill
@@ -1,15 +1,31 @@
+azurill	A normal type Pokémon
 
-Name:  Azurill
-Pokedex Number:  298
-Gender Ratio:   ♂:25% ♀:75% 
-Abilities: Thick Fat - Huge Power - Sap Sipper (Hidden Ability)
+Its tail bounces like a rubber ball.
+It flings that tail around to fight
+opponents bigger than itself.
 
-Base Stats
-----------------------
-Total: 190
-Hp:  50
-Attack:  20
-Defence:  40
-Special Attack:  20
-Special Defence:  40
-Speed:  20
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         20
+        defense:         40
+ special-attack:         20
+special-defense:         40
+          speed:         20
+
+Pokedex ID: 298	Capture Rate: 150
+Base Exp: 38	Happiness: 50
+Height: 2	Weight: 20
+
+Genus: Polka Dot Pokémon
+Location Areas:
+great-marsh-area-1
+great-marsh-area-2
+great-marsh-area-3
+great-marsh-area-4
+great-marsh-area-5
+great-marsh-area-6
+floccesy-ranch-outer
+floccesy-ranch-inner
+unova-route-20-area
+kalos-route-3-area
+kalos-route-22-area
diff --git a/pokeData/bagon b/pokeData/bagon
index 9d2473a..7fd1398 100644
--- a/pokeData/bagon
+++ b/pokeData/bagon
@@ -1,15 +1,23 @@
+bagon	A dragon type Pokémon
 
-Name:  Bagon
-Pokedex Number:  371
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Rock Head - Sheer Force (Hidden Ability)
+Dreaming of one day flying, it
+practices by leaping off cliffs
+every day.
 
-Base Stats
-----------------------
-Total: 300
-Hp:  45
-Attack:  75
-Defence:  60
-Special Attack:  40
-Special Defence:  30
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         75
+        defense:         60
+ special-attack:         40
+special-defense:         30
+          speed:         50
+
+Pokedex ID: 371	Capture Rate: 45
+Base Exp: 60	Happiness: 35
+Height: 6	Weight: 421
+
+Genus: Rock Head Pokémon
+Location Areas:
+sinnoh-route-210-west-towards-celestic-town
+meteor-falls-backsmall-room
+kalos-route-8-area
diff --git a/pokeData/baltoy b/pokeData/baltoy
index 752a0b0..7f3b7a3 100644
--- a/pokeData/baltoy
+++ b/pokeData/baltoy
@@ -1,15 +1,24 @@
+baltoy	A ground type Pokémon
 
-Name:  Baltoy
-Pokedex Number:  343
-Gender Ratio:  Genderless
-Abilities: Levitate
+It moves by spinning on its foot.
+It is a rare Pokémon that was
+discovered in ancient ruins.
 
-Base Stats
-----------------------
-Total: 300
-Hp:  40
-Attack:  40
-Defence:  55
-Special Attack:  40
-Special Defence:  70
-Speed:  55
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         40
+        defense:         55
+ special-attack:         40
+special-defense:         70
+          speed:         55
+
+Pokedex ID: 343	Capture Rate: 255
+Base Exp: 60	Happiness: 50
+Height: 5	Weight: 215
+
+Genus: Clay Doll Pokémon
+Location Areas:
+sinnoh-route-206-area
+kanto-route-3-area
+hoenn-route-111-area
+relic-castle-d
diff --git a/pokeData/banette b/pokeData/banette
index ccadec8..1933b15 100644
--- a/pokeData/banette
+++ b/pokeData/banette
@@ -1,15 +1,31 @@
+banette	A ghost type Pokémon
 
-Name:  Banette
-Pokedex Number:  354
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Insomnia - Frisk - Cursed Body (Hidden Ability)
+A doll that became a Pokémon over
+its grudge from being junked. It
+seeks the child that disowned it.
 
-Base Stats
-----------------------
-Total: 455
-Hp:  64
-Attack:  165
-Defence:  75
-Special Attack:  93
-Special Defence:  83
-Speed:  75
+   ↞--------| STATS |--------↠ 
+             hp:         64
+         attack:        115
+        defense:         65
+ special-attack:         83
+special-defense:         63
+          speed:         65
+
+Pokedex ID: 354	Capture Rate: 45
+Base Exp: 159	Happiness: 35
+Height: 11	Weight: 125
+
+Genus: Marionette Pokémon
+Location Areas:
+stark-mountain-area
+sinnoh-route-225-area
+sinnoh-route-227-area
+sinnoh-sea-route-226-area
+sky-pillar-1f
+sky-pillar-3f
+sky-pillar-5f
+unova-victory-road-2-unknown-area-71
+unova-victory-road-2-unknown-area-78
+strange-house-1f
+strange-house-b1f
diff --git a/pokeData/barbaracle b/pokeData/barbaracle
index 60e6f8d..fd7b4cf 100644
--- a/pokeData/barbaracle
+++ b/pokeData/barbaracle
@@ -1,15 +1,21 @@
+barbaracle	A rock type Pokémon
 
-Name:  Barbaracle
-Pokedex Number:  689
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Tough Claws - Sniper - Pickpocket (Hidden Ability)
+進化のとき　２匹の　カメテテが
+７匹に　分裂した　ポケモン。
+７匹分の　パワーで　戦う。
+
+   ↞--------| STATS |--------↠ 
+             hp:         72
+         attack:        105
+        defense:        115
+ special-attack:         54
+special-defense:         86
+          speed:         68
+
+Pokedex ID: 689	Capture Rate: 45
+Base Exp: 175	Happiness: 50
+Height: 13	Weight: 960
+
+Genus: Collective Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 500
-Hp:  72
-Attack:  105
-Defence:  115
-Special Attack:  54
-Special Defence:  86
-Speed:  68
diff --git a/pokeData/barboach b/pokeData/barboach
index f5595ae..e655ce5 100644
--- a/pokeData/barboach
+++ b/pokeData/barboach
@@ -1,15 +1,53 @@
+barboach	A water type Pokémon
 
-Name:  Barboach
-Pokedex Number:  339
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Oblivious - Anticipation - Hydration (Hidden Ability)
+Its slimy body is hard to grasp. In
+one region, it is said to have been
+born from hardened mud.
 
-Base Stats
-----------------------
-Total: 288
-Hp:  50
-Attack:  48
-Defence:  43
-Special Attack:  46
-Special Defence:  41
-Speed:  60
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         48
+        defense:         43
+ special-attack:         46
+special-defense:         41
+          speed:         60
+
+Pokedex ID: 339	Capture Rate: 190
+Base Exp: 58	Happiness: 50
+Height: 4	Weight: 19
+
+Genus: Whiskers Pokémon
+Location Areas:
+eterna-city-area
+mt-coronet-1f-route-207
+mt-coronet-4f
+mt-coronet-b1f
+great-marsh-area-1
+great-marsh-area-2
+great-marsh-area-3
+great-marsh-area-4
+great-marsh-area-5
+great-marsh-area-6
+ravaged-path-area
+oreburgh-gate-b1f
+sinnoh-route-205-east-towards-eterna-city
+sinnoh-route-208-area
+sinnoh-route-210-west-towards-celestic-town
+sinnoh-route-212-east-towards-pastoria-city
+sinnoh-route-225-area
+sinnoh-route-227-area
+sinnoh-route-228-area
+celestic-town-area
+meteor-falls-area
+meteor-falls-back
+meteor-falls-b1f
+meteor-falls-backsmall-room
+hoenn-victory-road-b2f
+hoenn-route-111-area
+hoenn-route-114-area
+hoenn-route-120-area
+icirrus-city-area
+unova-route-8-area
+moor-of-icirrus-area
+kalos-route-14-area
+kalos-route-19-area
diff --git a/pokeData/barraskewda b/pokeData/barraskewda
index abfa183..4120ef7 100644
--- a/pokeData/barraskewda
+++ b/pokeData/barraskewda
@@ -1,15 +1,21 @@
+barraskewda	A water type Pokémon
 
-Name:  Barraskewda
-Pokedex Number:  847
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Swift Swim - Propeller Tail (Hidden Ability)
+This Pokémon has a jaw that’s as sharp as a spear
+and as strong as steel. Apparently Barraskewda’s
+flesh is surprisingly tasty, too.
+
+   ↞--------| STATS |--------↠ 
+             hp:         61
+         attack:        123
+        defense:         60
+ special-attack:         60
+special-defense:         50
+          speed:        136
+
+Pokedex ID: 847	Capture Rate: 60
+Base Exp: 172	Happiness: 50
+Height: 13	Weight: 300
+
+Genus: Skewer Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 490
-Hp:  61
-Attack:  123
-Defence:  60
-Special Attack:  60
-Special Defence:  50
-Speed:  136
diff --git a/pokeData/basculegion b/pokeData/basculegion
index 2a9cd06..3b299ef 100644
--- a/pokeData/basculegion
+++ b/pokeData/basculegion
@@ -1,15 +1,13 @@
+	A  type Pokémon
 
-Name:  Basculegion
-Pokedex Number:  902
-Gender Ratio:   ♂:100% ♀:0% 
-Abilities: Swift Swim - Adaptability - Mold Breaker (Hidden Ability)
+                null
+
+   ↞--------| STATS |--------↠ 
+
+Pokedex ID: 	Capture Rate: 135
+Base Exp: 	Happiness: null
+Height: 	Weight: 
+
+Genus: null
+Location Areas:
 
-Base Stats
-----------------------
-Total: 530
-Hp:  120
-Attack:  92
-Defence:  65
-Special Attack:  100
-Special Defence:  75
-Speed:  78
diff --git a/pokeData/basculin b/pokeData/basculin
index 005468a..573f3b5 100644
--- a/pokeData/basculin
+++ b/pokeData/basculin
@@ -1,15 +1,15 @@
+	A  type Pokémon
 
-Name:  Basculin
-Pokedex Number:  550
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Reckless (Red-Striped Form BWB2W2 & Blue-Striped Form BW) - Rock Head (Blue-Striped Form - B2W2) - Adaptability - Mold Breaker (Dream World)
+아주 난폭하고 항상 빨강과
+파랑의 배쓰나이는 다투고 있다.
+먹으면 의외로 맛있다고 한다.
+
+   ↞--------| STATS |--------↠ 
+
+Pokedex ID: 	Capture Rate: 25
+Base Exp: 	Happiness: 50
+Height: 	Weight: 
+
+Genus: Hostile Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 460
-Hp:  70
-Attack:  92
-Defence:  65
-Special Attack:  80
-Special Defence:  55
-Speed:  98
diff --git a/pokeData/bastiodon b/pokeData/bastiodon
index 9c56944..c79faa8 100644
--- a/pokeData/bastiodon
+++ b/pokeData/bastiodon
@@ -1,15 +1,21 @@
+bastiodon	A rock type Pokémon
 
-Name:  Bastiodon
-Pokedex Number:  411
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Sturdy - Soundproof (Hidden Ability)
+En groupe, ils protègent leurs
+petits en formant autour d’eux
+une impénétrable muraille.
+
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         52
+        defense:        168
+ special-attack:         47
+special-defense:        138
+          speed:         30
+
+Pokedex ID: 411	Capture Rate: 45
+Base Exp: 173	Happiness: 70
+Height: 13	Weight: 1495
+
+Genus: Shield Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 495
-Hp:  60
-Attack:  52
-Defence:  168
-Special Attack:  47
-Special Defence:  138
-Speed:  30
diff --git a/pokeData/bayleef b/pokeData/bayleef
index 3830474..994789b 100644
--- a/pokeData/bayleef
+++ b/pokeData/bayleef
@@ -1,15 +1,21 @@
+bayleef	A grass type Pokémon
 
-Name:  Bayleef
-Pokedex Number:  153
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Overgrow - Leaf Guard (Hidden Ability)
+The scent of spices comes from around
+its neck. Somehow, sniffing it makes you
+want to fight.
+
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         62
+        defense:         80
+ special-attack:         63
+special-defense:         80
+          speed:         60
+
+Pokedex ID: 153	Capture Rate: 45
+Base Exp: 142	Happiness: 70
+Height: 12	Weight: 158
+
+Genus: Leaf Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 405
-Hp:  60
-Attack:  62
-Defence:  80
-Special Attack:  63
-Special Defence:  80
-Speed:  60
diff --git a/pokeData/beartic b/pokeData/beartic
index 35d497b..6ac4ee5 100644
--- a/pokeData/beartic
+++ b/pokeData/beartic
@@ -1,15 +1,27 @@
+beartic	A ice type Pokémon
 
-Name:  Beartic
-Pokedex Number:  614
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Snow Cloak - Swift Swim (Hidden Ability)
+북쪽의 차가운 바다를 좋아한다.
+입에서 내뿜는 숨을 얼려
+바다 위에 길을 만들어 걷는다.
 
-Base Stats
-----------------------
-Total: 485
-Hp:  95
-Attack:  110
-Defence:  80
-Special Attack:  70
-Special Defence:  80
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:         95
+         attack:        130
+        defense:         80
+ special-attack:         70
+special-defense:         80
+          speed:         50
+
+Pokedex ID: 614	Capture Rate: 60
+Base Exp: 177	Happiness: 50
+Height: 26	Weight: 2600
+
+Genus: Freezing Pokémon
+Location Areas:
+twist-mountain-area
+dragonspiral-tower-entrance
+dragonspiral-tower-outside
+frost-cavern-unknown-area-314
+frost-cavern-unknown-area-315
+frost-cavern-unknown-area-316
+frost-cavern-unknown-area-317
diff --git a/pokeData/beautifly b/pokeData/beautifly
index d8846a0..b908855 100644
--- a/pokeData/beautifly
+++ b/pokeData/beautifly
@@ -1,15 +1,25 @@
+beautifly	A bug type Pokémon
 
-Name:  Beautifly
-Pokedex Number:  267
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Swarm - Rivalry (Hidden Ability)
+Despite its looks, it is aggressive.
+It jabs with its long, thin mouth if
+disturbed while collecting pollen.
 
-Base Stats
-----------------------
-Total: 395
-Hp:  60
-Attack:  70
-Defence:  50
-Special Attack:  100
-Special Defence:  50
-Speed:  65
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         70
+        defense:         50
+ special-attack:        100
+special-defense:         50
+          speed:         65
+
+Pokedex ID: 267	Capture Rate: 45
+Base Exp: 178	Happiness: 70
+Height: 10	Weight: 284
+
+Genus: Butterfly Pokémon
+Location Areas:
+eterna-forest-area
+sinnoh-route-205-east-towards-eterna-city
+sinnoh-route-224-area
+sinnoh-route-229-area
+sinnoh-sea-route-230-area
diff --git a/pokeData/beedrill b/pokeData/beedrill
index e3cfbb5..b642914 100644
--- a/pokeData/beedrill
+++ b/pokeData/beedrill
@@ -1,15 +1,36 @@
+beedrill	A bug type Pokémon
 
-Name:  Beedrill
-Pokedex Number:  015
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Swarm - Sniper (Hidden Ability)
+BEEDRILL is extremely territorial.
+No one should ever approach its nest -
+this is for their own safety.If angered, they will attack in a furious
+swarm.
 
-Base Stats
-----------------------
-Total: 395
-Hp:  65
-Attack:  150
-Defence:  40
-Special Attack:  15
-Special Defence:  80
-Speed:  145
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         90
+        defense:         40
+ special-attack:         45
+special-defense:         80
+          speed:         75
+
+Pokedex ID: 15	Capture Rate: 45
+Base Exp: 178	Happiness: 70
+Height: 10	Weight: 295
+
+Genus: Poison Bee Pokémon
+Location Areas:
+ilex-forest-area
+johto-route-34-area
+johto-route-35-area
+johto-route-36-area
+johto-route-37-area
+johto-route-38-area
+johto-route-39-area
+lake-of-rage-area
+kanto-route-26-area
+kanto-route-27-area
+kanto-route-2-south-towards-viridian-city
+kanto-route-2-north-towards-pewter-city
+viridian-forest-area
+unova-route-12-area
+azalea-town-area
diff --git a/pokeData/beheeyem b/pokeData/beheeyem
index 15376e9..8116a6d 100644
--- a/pokeData/beheeyem
+++ b/pokeData/beheeyem
@@ -1,15 +1,21 @@
+beheeyem	A psychic type Pokémon
 
-Name:  Beheeyem
-Pokedex Number:  606
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Telepathy - Synchronize - Analytic (Hidden Ability)
+ゆびさきを　てんめつ　させて
+かいわするらしいが　その　パターンは
+まだ　かいどく　できていない。
 
-Base Stats
-----------------------
-Total: 485
-Hp:  75
-Attack:  75
-Defence:  75
-Special Attack:  125
-Special Defence:  95
-Speed:  40
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:         75
+        defense:         75
+ special-attack:        125
+special-defense:         95
+          speed:         40
+
+Pokedex ID: 606	Capture Rate: 90
+Base Exp: 170	Happiness: 50
+Height: 10	Weight: 345
+
+Genus: Cerebral Pokémon
+Location Areas:
+unova-route-14-area
diff --git a/pokeData/beldum b/pokeData/beldum
index 255609e..1318781 100644
--- a/pokeData/beldum
+++ b/pokeData/beldum
@@ -1,15 +1,22 @@
+beldum	A steel type Pokémon
 
-Name:  Beldum
-Pokedex Number:  374
-Gender Ratio:  Genderless
-Abilities: Clear Body - Light Metal (Hidden Ability)
+It converses with others by using
+magnetic pulses. In a swarm, they
+move in perfect unison.
 
-Base Stats
-----------------------
-Total: 300
-Hp:  40
-Attack:  55
-Defence:  80
-Special Attack:  35
-Special Defence:  60
-Speed:  30
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         55
+        defense:         80
+ special-attack:         35
+special-defense:         60
+          speed:         30
+
+Pokedex ID: 374	Capture Rate: 3
+Base Exp: 60	Happiness: 35
+Height: 6	Weight: 952
+
+Genus: Iron Ball Pokémon
+Location Areas:
+sinnoh-route-228-area
+mossdeep-city-stevens-house
diff --git a/pokeData/bellossom b/pokeData/bellossom
index 5d59a06..33d5a9b 100644
--- a/pokeData/bellossom
+++ b/pokeData/bellossom
@@ -1,15 +1,21 @@
+bellossom	A grass type Pokémon
 
-Name:  Bellossom
-Pokedex Number:  182
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Chlorophyll - Healer (Hidden Ability)
+Plentiful in the tropics. When it dances,
+its petals rub together and make a
+pleasant ringing sound.
+
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:         80
+        defense:         95
+ special-attack:         90
+special-defense:        100
+          speed:         50
+
+Pokedex ID: 182	Capture Rate: 45
+Base Exp: 245	Happiness: 50
+Height: 4	Weight: 58
+
+Genus: Flower Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 490
-Hp:  75
-Attack:  80
-Defence:  95
-Special Attack:  90
-Special Defence:  100
-Speed:  50
diff --git a/pokeData/bellsprout b/pokeData/bellsprout
index 23bca12..d1aa2bf 100644
--- a/pokeData/bellsprout
+++ b/pokeData/bellsprout
@@ -1,15 +1,42 @@
+bellsprout	A grass type Pokémon
 
-Name:  Bellsprout
-Pokedex Number:  069
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Chlorophyll - Gluttony (Hidden Ability)
+BELLSPROUT’s thin and flexible body
+lets it bend and sway to avoid any
+attack, however strong it may be.From its mouth, this POKéMON spits a
+corrosive fluid that melts even iron.
 
-Base Stats
-----------------------
-Total: 300
-Hp:  50
-Attack:  75
-Defence:  35
-Special Attack:  70
-Special Defence:  30
-Speed:  40
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         75
+        defense:         35
+ special-attack:         70
+special-defense:         30
+          speed:         40
+
+Pokedex ID: 69	Capture Rate: 255
+Base Exp: 60	Happiness: 70
+Height: 7	Weight: 40
+
+Genus: Flower Pokémon
+Location Areas:
+sinnoh-route-224-area
+sinnoh-route-229-area
+sinnoh-sea-route-230-area
+johto-route-31-area
+johto-route-32-area
+johto-route-36-area
+johto-route-44-area
+kanto-route-12-area
+kanto-route-5-area
+kanto-route-6-area
+kanto-route-7-area
+kanto-route-13-area
+kanto-route-14-area
+kanto-route-15-area
+kanto-route-24-area
+kanto-route-25-area
+berry-forest-area
+cape-brink-area
+bond-bridge-area
+water-path-area
+johto-safari-zone-zone-forest
diff --git a/pokeData/bergmite b/pokeData/bergmite
index bd2817c..48057a8 100644
--- a/pokeData/bergmite
+++ b/pokeData/bergmite
@@ -1,15 +1,24 @@
+bergmite	A ice type Pokémon
 
-Name:  Bergmite
-Pokedex Number:  712
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Own Tempo - Ice Body - Sturdy (Hidden Ability)
+体を　覆う　氷が
+敵の　攻撃を　防ぐ。割られても
+冷気で　すぐに　氷を　張る。
 
-Base Stats
-----------------------
-Total: 304
-Hp:  55
-Attack:  69
-Defence:  85
-Special Attack:  32
-Special Defence:  35
-Speed:  28
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         69
+        defense:         85
+ special-attack:         32
+special-defense:         35
+          speed:         28
+
+Pokedex ID: 712	Capture Rate: 190
+Base Exp: 61	Happiness: 50
+Height: 10	Weight: 995
+
+Genus: Ice Chunk Pokémon
+Location Areas:
+frost-cavern-unknown-area-314
+frost-cavern-unknown-area-315
+frost-cavern-unknown-area-316
+frost-cavern-unknown-area-317
diff --git a/pokeData/bewear b/pokeData/bewear
index 91488da..e643168 100644
--- a/pokeData/bewear
+++ b/pokeData/bewear
@@ -1,15 +1,21 @@
+bewear	A normal type Pokémon
 
-Name:  Bewear
-Pokedex Number:  760
-Gender Ratio:   ♂:50.2% ♀:49.8% 
-Abilities: Fluffy - Klutz - Unnerve (Hidden Ability)
+This immensely dangerous Pokémon
+possesses overwhelming physical strength.
+Its habitat is generally off-limits.
+
+   ↞--------| STATS |--------↠ 
+             hp:        120
+         attack:        125
+        defense:         80
+ special-attack:         55
+special-defense:         60
+          speed:         60
+
+Pokedex ID: 760	Capture Rate: 70
+Base Exp: 175	Happiness: 50
+Height: 21	Weight: 1350
+
+Genus: Strong Arm Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 500
-Hp:  120
-Attack:  125
-Defence:  80
-Special Attack:  55
-Special Defence:  60
-Speed:  60
diff --git a/pokeData/bibarel b/pokeData/bibarel
index af735e5..1a5c245 100644
--- a/pokeData/bibarel
+++ b/pokeData/bibarel
@@ -1,15 +1,38 @@
+bibarel	A normal type Pokémon
 
-Name:  Bibarel
-Pokedex Number:  400
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Simple - Unaware - Moody (Hidden Ability)
+Les digues insubmersibles qu’il
+construit font le bonheur des
+habitants proches.
 
-Base Stats
-----------------------
-Total: 410
-Hp:  79
-Attack:  85
-Defence:  60
-Special Attack:  55
-Special Defence:  60
-Speed:  71
+   ↞--------| STATS |--------↠ 
+             hp:         79
+         attack:         85
+        defense:         60
+ special-attack:         55
+special-defense:         60
+          speed:         71
+
+Pokedex ID: 400	Capture Rate: 127
+Base Exp: 144	Happiness: 70
+Height: 10	Weight: 315
+
+Genus: Beaver Pokémon
+Location Areas:
+great-marsh-area-1
+great-marsh-area-2
+great-marsh-area-3
+great-marsh-area-4
+great-marsh-area-5
+great-marsh-area-6
+sendoff-spring-area
+lake-verity-before-galactic-intervention
+lake-verity-after-galactic-intervention
+lake-valor-area
+lake-acuity-area
+valor-lakefront-area
+sinnoh-route-208-area
+sinnoh-route-209-area
+sinnoh-route-210-west-towards-celestic-town
+sinnoh-route-212-east-towards-pastoria-city
+village-bridge-area
+kalos-route-22-area
diff --git a/pokeData/bidoof b/pokeData/bidoof
index f5206ba..cbf24c8 100644
--- a/pokeData/bidoof
+++ b/pokeData/bidoof
@@ -1,15 +1,66 @@
+bidoof	A normal type Pokémon
 
-Name:  Bidoof
-Pokedex Number:  399
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Simple - Unaware - Moody (Hidden Ability)
+Une étude a montré que les dents
+du Keunotor poussaient aussi
+vite que celles du Rattata.
 
-Base Stats
-----------------------
-Total: 250
-Hp:  59
-Attack:  45
-Defence:  40
-Special Attack:  35
-Special Defence:  40
-Speed:  31
+   ↞--------| STATS |--------↠ 
+             hp:         59
+         attack:         45
+        defense:         40
+ special-attack:         35
+special-defense:         40
+          speed:         31
+
+Pokedex ID: 399	Capture Rate: 255
+Base Exp: 50	Happiness: 70
+Height: 5	Weight: 200
+
+Genus: Plump Mouse Pokémon
+Location Areas:
+valley-windworks-area
+eterna-forest-area
+great-marsh-area-1
+great-marsh-area-2
+great-marsh-area-3
+great-marsh-area-4
+great-marsh-area-5
+great-marsh-area-6
+lake-verity-before-galactic-intervention
+lake-verity-after-galactic-intervention
+sinnoh-route-201-area
+sinnoh-route-202-area
+sinnoh-route-203-area
+sinnoh-route-204-south-towards-jubilife-city
+sinnoh-route-204-north-towards-floaroma-town
+sinnoh-route-205-south-towards-floaroma-town
+sinnoh-route-205-east-towards-eterna-city
+sinnoh-route-208-area
+sinnoh-route-211-west-towards-eterna-city
+johto-route-30-area
+johto-route-31-area
+johto-route-32-area
+ruins-of-alph-outside
+johto-route-34-area
+johto-route-35-area
+johto-route-42-area
+johto-route-43-area
+johto-route-44-area
+johto-route-45-area
+johto-route-47-area
+mt-silver-outside
+unknown-all-rattata-area
+kanto-route-26-area
+kanto-route-27-area
+kanto-route-28-area
+kanto-route-4-area
+kanto-route-6-area
+kanto-route-9-area
+kanto-route-10-area
+kanto-route-13-area
+kanto-sea-route-21-area
+kanto-route-22-area
+kanto-route-24-area
+kanto-route-25-area
+kalos-route-3-area
+kalos-route-22-area
diff --git a/pokeData/binacle b/pokeData/binacle
index 8c5e2d0..86d5119 100644
--- a/pokeData/binacle
+++ b/pokeData/binacle
@@ -1,15 +1,25 @@
+binacle	A rock type Pokémon
 
-Name:  Binacle
-Pokedex Number:  688
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Tough Claws - Sniper - Pickpocket (Hidden Ability)
+２匹の　カメテテが　ひとつの　岩で
+暮らす。ケンカすると　どちらかが
+他の　岩に　移る。
 
-Base Stats
-----------------------
-Total: 306
-Hp:  42
-Attack:  52
-Defence:  67
-Special Attack:  39
-Special Defence:  56
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:         42
+         attack:         52
+        defense:         67
+ special-attack:         39
+special-defense:         56
+          speed:         50
+
+Pokedex ID: 688	Capture Rate: 120
+Base Exp: 61	Happiness: 50
+Height: 5	Weight: 310
+
+Genus: Two-Handed Pokémon
+Location Areas:
+ambrette-town-area
+cyllage-city-area
+kalos-route-8-area
+kalos-route-12-area
+azure-bay-area
diff --git a/pokeData/bisharp b/pokeData/bisharp
index 8216200..d9eea87 100644
--- a/pokeData/bisharp
+++ b/pokeData/bisharp
@@ -1,15 +1,21 @@
+bisharp	A dark type Pokémon
 
-Name:  Bisharp
-Pokedex Number:  625
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Defiant - Inner Focus - Pressure (Hidden Ability)
+몇 마리의 자망칼과 싸우게 해서
+상처 입고 움직일 수 없게 된 먹이를
+두 동강 내버리는 무서운 포켓몬.
 
-Base Stats
-----------------------
-Total: 490
-Hp:  65
-Attack:  125
-Defence:  100
-Special Attack:  60
-Special Defence:  70
-Speed:  70
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:        125
+        defense:        100
+ special-attack:         60
+special-defense:         70
+          speed:         70
+
+Pokedex ID: 625	Capture Rate: 45
+Base Exp: 172	Happiness: 35
+Height: 16	Weight: 700
+
+Genus: Sword Blade Pokémon
+Location Areas:
+unova-route-11-area
diff --git a/pokeData/blacephalon b/pokeData/blacephalon
index 3afcd2c..b85148a 100644
--- a/pokeData/blacephalon
+++ b/pokeData/blacephalon
@@ -1,15 +1,21 @@
+blacephalon	A fire type Pokémon
 
-Name:  Blacephalon
-Pokedex Number:  806
-Gender Ratio:  Genderless
-Abilities: Beast Boost
+It slithers toward people. Then, without warning,
+it triggers the explosion of its own head.
+It’s apparently one kind of Ultra Beast.
+
+   ↞--------| STATS |--------↠ 
+             hp:         53
+         attack:        127
+        defense:         53
+ special-attack:        151
+special-defense:         79
+          speed:        107
+
+Pokedex ID: 806	Capture Rate: 30
+Base Exp: 285	Happiness: 0
+Height: 18	Weight: 130
+
+Genus: Fireworks Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 570
-Hp:  53
-Attack:  127
-Defence:  53
-Special Attack:  151
-Special Defence:  79
-Speed:  107
diff --git a/pokeData/blastoise b/pokeData/blastoise
index 463f3e2..cb1653d 100644
--- a/pokeData/blastoise
+++ b/pokeData/blastoise
@@ -1,15 +1,23 @@
+blastoise	A water type Pokémon
 
-Name:  Blastoise
-Pokedex Number:  009
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Torrent - Rain Dish (Hidden Ability)
+BLASTOISE has water spouts that
+protrude from its shell. The water
+spouts are very accurate.They can shoot bullets of water with
+enough accuracy to strike empty cans
+from a distance of over 160 feet.
+
+   ↞--------| STATS |--------↠ 
+             hp:         79
+         attack:         83
+        defense:        100
+ special-attack:         85
+special-defense:        105
+          speed:         78
+
+Pokedex ID: 9	Capture Rate: 45
+Base Exp: 265	Happiness: 50
+Height: 16	Weight: 855
+
+Genus: Shellfish Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 530
-Hp:  79
-Attack:  103
-Defence:  120
-Special Attack:  135
-Special Defence:  115
-Speed:  78
diff --git a/pokeData/blaziken b/pokeData/blaziken
index e228602..9cfc849 100644
--- a/pokeData/blaziken
+++ b/pokeData/blaziken
@@ -1,15 +1,21 @@
+blaziken	A fire type Pokémon
 
-Name:  Blaziken
-Pokedex Number:  257
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Blaze - Speed Boost (Hidden Ability)
+Flames spout from its wrists,
+enveloping its knuckles. Its
+punches scorch its foes.
+
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:        120
+        defense:         70
+ special-attack:        110
+special-defense:         70
+          speed:         80
+
+Pokedex ID: 257	Capture Rate: 45
+Base Exp: 265	Happiness: 50
+Height: 19	Weight: 520
+
+Genus: Blaze Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 530
-Hp:  80
-Attack:  160
-Defence:  80
-Special Attack:  130
-Special Defence:  80
-Speed:  100
diff --git a/pokeData/blipbug b/pokeData/blipbug
index b683a6c..19824db 100644
--- a/pokeData/blipbug
+++ b/pokeData/blipbug
@@ -1,15 +1,20 @@
+blipbug	A bug type Pokémon
 
-Name:  Blipbug
-Pokedex Number:  824
-Gender Ratio:   ♂:50.2% ♀:49.8%
-Abilities: Swarm - Compoundeyes - Telepathy (Hidden Ability)
+A constant collector of information, this Pokémon
+is very smart. Very strong is what it isn’t.
+
+   ↞--------| STATS |--------↠ 
+             hp:         25
+         attack:         20
+        defense:         20
+ special-attack:         25
+special-defense:         45
+          speed:         45
+
+Pokedex ID: 824	Capture Rate: 255
+Base Exp: 36	Happiness: 50
+Height: 4	Weight: 80
+
+Genus: Larva Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 180
-Hp:  25
-Attack:  20
-Defence:  20
-Special Attack:  25
-Special Defence:  45
-Speed:  45
diff --git a/pokeData/blissey b/pokeData/blissey
index f62e641..24aba44 100644
--- a/pokeData/blissey
+++ b/pokeData/blissey
@@ -1,15 +1,21 @@
+blissey	A normal type Pokémon
 
-Name:  Blissey
-Pokedex Number:  242
-Gender Ratio:   ♂:0% ♀:100%
-Abilities: Natural Cure - Serene Grace - Healer (Hidden Ability)
+Anyone who takes even one bite of
+BLISSEY’s egg becomes unfailingly caring
+and pleasant to everyone.
+
+   ↞--------| STATS |--------↠ 
+             hp:        255
+         attack:         10
+        defense:         10
+ special-attack:         75
+special-defense:        135
+          speed:         55
+
+Pokedex ID: 242	Capture Rate: 30
+Base Exp: 635	Happiness: 140
+Height: 15	Weight: 468
+
+Genus: Happiness Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 540
-Hp:  255
-Attack:  10
-Defence:  10
-Special Attack:  75
-Special Defence:  135
-Speed:  55
diff --git a/pokeData/blitzle b/pokeData/blitzle
index 3163540..62c2964 100644
--- a/pokeData/blitzle
+++ b/pokeData/blitzle
@@ -1,15 +1,21 @@
+blitzle	A electric type Pokémon
 
-Name:  Blitzle
-Pokedex Number:  522
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Lightningrod - Motor Drive - Sap Sipper (Hidden Ability)
+かみなりぐもで　そらが　おおわれると
+あらわれる。たてがみで　カミナリを
+キャッチして　でんきを　ためる。
 
-Base Stats
-----------------------
-Total: 295
-Hp:  45
-Attack:  60
-Defence:  32
-Special Attack:  50
-Special Defence:  32
-Speed:  76
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         60
+        defense:         32
+ special-attack:         50
+special-defense:         32
+          speed:         76
+
+Pokedex ID: 522	Capture Rate: 190
+Base Exp: 59	Happiness: 70
+Height: 8	Weight: 298
+
+Genus: Electrified Pokémon
+Location Areas:
+unova-route-3-area
diff --git a/pokeData/boldore b/pokeData/boldore
index 393f533..fe1bc85 100644
--- a/pokeData/boldore
+++ b/pokeData/boldore
@@ -1,15 +1,71 @@
+boldore	A rock type Pokémon
 
-Name:  Boldore
-Pokedex Number:  525
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Sturdy - Sand Force (Hidden Ability)
+체내에서 처리되지 못하고
+빠져나온 에너지가 덩어리져서
+주황색 결정이 되었다.
 
-Base Stats
-----------------------
-Total: 390
-Hp:  70
-Attack:  105
-Defence:  105
-Special Attack:  50
-Special Defence:  40
-Speed:  20
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:        105
+        defense:        105
+ special-attack:         50
+special-defense:         40
+          speed:         20
+
+Pokedex ID: 525	Capture Rate: 120
+Base Exp: 137	Happiness: 50
+Height: 9	Weight: 1020
+
+Genus: Ore Pokémon
+Location Areas:
+chargestone-cave-1f
+chargestone-cave-b1f
+chargestone-cave-b2f
+twist-mountain-area
+unova-victory-road-unknown-area-53
+unova-victory-road-unknown-area-54
+unova-victory-road-unknown-area-55
+unova-victory-road-unknown-area-56
+unova-victory-road-unknown-area-57
+unova-victory-road-unknown-area-58
+unova-victory-road-unknown-area-59
+unova-victory-road-unknown-area-60
+unova-victory-road-unknown-area-61
+unova-victory-road-unknown-area-62
+unova-victory-road-unknown-area-63
+unova-victory-road-unknown-area-64
+unova-victory-road-unknown-area-65
+unova-victory-road-unknown-area-66
+trial-chamber-area
+giant-chasm-area
+giant-chasm-forest-cave
+wellspring-cave-area
+mistralton-cave-area
+guidance-chamber-area
+challengers-cave-1f
+challengers-cave-b1f
+challengers-cave-b2f
+unova-victory-road-7f
+unova-victory-road-2-unknown-area-74
+unova-victory-road-2-unknown-area-75
+reversal-mountain-unknown-area-49
+reversal-mountain-unknown-area-50
+reversal-mountain-unknown-area-51
+reversal-mountain-unknown-area-52
+reversal-mountain-unknown-area-53
+reversal-mountain-unknown-area-54
+reversal-mountain-unknown-area-55
+reversal-mountain-unknown-area-56
+reversal-mountain-unknown-area-57
+reversal-mountain-unknown-area-58
+reversal-mountain-unknown-area-59
+reversal-mountain-unknown-area-60
+relic-passage-relic-castle-entrance
+relic-passage-pwt-entrance
+clay-tunnel-area
+underground-ruins-area
+rocky-mountain-room-area
+glacier-room-area
+iron-room-area
+seaside-cave-1f
+seaside-cave-b1f
diff --git a/pokeData/boltund b/pokeData/boltund
index 3b7ee28..c86f30c 100644
--- a/pokeData/boltund
+++ b/pokeData/boltund
@@ -1,15 +1,21 @@
+boltund	A electric type Pokémon
 
-Name:  Boltund
-Pokedex Number:  836
-Gender Ratio:   ♂:50.2% ♀:49.8%
-Abilities: Strong Jaw - Competitive (Hidden Ability)
+This Pokémon generates electricity and channels
+it into its legs to keep them going strong.
+Boltund can run nonstop for three full days.
+
+   ↞--------| STATS |--------↠ 
+             hp:         69
+         attack:         90
+        defense:         60
+ special-attack:         90
+special-defense:         60
+          speed:        121
+
+Pokedex ID: 836	Capture Rate: 45
+Base Exp: 172	Happiness: 50
+Height: 10	Weight: 340
+
+Genus: Dog Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 490
-Hp:  69
-Attack:  90
-Defence:  60
-Special Attack:  90
-Special Defence:  60
-Speed:  121
diff --git a/pokeData/bonsly b/pokeData/bonsly
index 07f5dcc..6502705 100644
--- a/pokeData/bonsly
+++ b/pokeData/bonsly
@@ -1,15 +1,22 @@
+bonsly	A rock type Pokémon
 
-Name:  Bonsly
-Pokedex Number:  438
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Sturdy - Rock Head - Rattled (Hidden Ability)
+Adepte des climats secs, il régule
+son humidité en laissant couler ce
+qui ressemble à des larmes.
 
-Base Stats
-----------------------
-Total: 290
-Hp:  50
-Attack:  80
-Defence:  95
-Special Attack:  10
-Special Defence:  45
-Speed:  10
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         80
+        defense:         95
+ special-attack:         10
+special-defense:         45
+          speed:         10
+
+Pokedex ID: 438	Capture Rate: 255
+Base Exp: 58	Happiness: 50
+Height: 5	Weight: 150
+
+Genus: Bonsai Pokémon
+Location Areas:
+sinnoh-route-209-area
+sinnoh-route-210-south-towards-solaceon-town
diff --git a/pokeData/bouffalant b/pokeData/bouffalant
index 8d17347..5f91efd 100644
--- a/pokeData/bouffalant
+++ b/pokeData/bouffalant
@@ -1,15 +1,23 @@
+bouffalant	A normal type Pokémon
 
-Name:  Bouffalant
-Pokedex Number:  626
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Reckless - Sap Sipper - Soundproof (Hidden Ability)
+무작정 돌진하여 박치기를
+한다. 달리고 있는 열차를
+탈선시킬 정도의 파괴력이다.
 
-Base Stats
-----------------------
-Total: 490
-Hp:  95
-Attack:  110
-Defence:  95
-Special Attack:  40
-Special Defence:  95
-Speed:  55
+   ↞--------| STATS |--------↠ 
+             hp:         95
+         attack:        110
+        defense:         95
+ special-attack:         40
+special-defense:         95
+          speed:         55
+
+Pokedex ID: 626	Capture Rate: 45
+Base Exp: 172	Happiness: 50
+Height: 16	Weight: 946
+
+Genus: Bash Buffalo Pokémon
+Location Areas:
+unova-route-10-area
+unova-route-10-victory-road-gate
+unova-route-23-area
diff --git a/pokeData/bounsweet b/pokeData/bounsweet
index 5086f45..84c6991 100644
--- a/pokeData/bounsweet
+++ b/pokeData/bounsweet
@@ -1,15 +1,21 @@
+bounsweet	A grass type Pokémon
 
-Name:  Bounsweet
-Pokedex Number:  761
-Gender Ratio:   ♂:0% ♀:100%
-Abilities: Leaf Guard - Oblivious - Sweet Veil (Hidden Ability)
+A delectable aroma pours from its body.
+They are often swallowed whole by Toucannon
+lured by that wafting deliciousness.
+
+   ↞--------| STATS |--------↠ 
+             hp:         42
+         attack:         30
+        defense:         38
+ special-attack:         30
+special-defense:         38
+          speed:         32
+
+Pokedex ID: 761	Capture Rate: 235
+Base Exp: 42	Happiness: 50
+Height: 3	Weight: 32
+
+Genus: Fruit Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 210
-Hp:  42
-Attack:  30
-Defence:  38
-Special Attack:  30
-Special Defence:  38
-Speed:  32
diff --git a/pokeData/braixen b/pokeData/braixen
index 7931a89..2c4891b 100644
--- a/pokeData/braixen
+++ b/pokeData/braixen
@@ -1,15 +1,21 @@
+braixen	A fire type Pokémon
 
-Name:  Braixen
-Pokedex Number:  654
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Blaze - Magician (Hidden Ability)
+木の枝を　尻尾に　挿している。
+尻尾の　毛の　摩擦熱で
+枝に　火をつけて　戦う。
+
+   ↞--------| STATS |--------↠ 
+             hp:         59
+         attack:         59
+        defense:         58
+ special-attack:         90
+special-defense:         70
+          speed:         73
+
+Pokedex ID: 654	Capture Rate: 45
+Base Exp: 143	Happiness: 70
+Height: 10	Weight: 145
+
+Genus: Fox Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 409
-Hp:  59
-Attack:  59
-Defence:  58
-Special Attack:  90
-Special Defence:  70
-Speed:  73
diff --git a/pokeData/braviary b/pokeData/braviary
index ff16994..37bdf24 100644
--- a/pokeData/braviary
+++ b/pokeData/braviary
@@ -1,15 +1,22 @@
+braviary	A normal type Pokémon
 
-Name:  Braviary
-Pokedex Number:  628
-Gender Ratio:   ♂:100% ♀:0% 
-Abilities: Keen Eye - Sheer Force - Defiant (Hidden Ability)
+동료를 위해서라면 아무리
+상처를 입더라도 싸움을 관두지 않는
+용감한 넓은 하늘의 전사.
 
-Base Stats
-----------------------
-Total: 510
-Hp:  100
-Attack:  123
-Defence:  75
-Special Attack:  57
-Special Defence:  75
-Speed:  80
+   ↞--------| STATS |--------↠ 
+             hp:        100
+         attack:        123
+        defense:         75
+ special-attack:         57
+special-defense:         75
+          speed:         80
+
+Pokedex ID: 628	Capture Rate: 60
+Base Exp: 179	Happiness: 50
+Height: 15	Weight: 410
+
+Genus: Valiant Pokémon
+Location Areas:
+village-bridge-area
+unova-route-11-area
diff --git a/pokeData/breloom b/pokeData/breloom
index a16fa2a..e5339a6 100644
--- a/pokeData/breloom
+++ b/pokeData/breloom
@@ -1,15 +1,21 @@
+breloom	A grass type Pokémon
 
-Name:  Breloom
-Pokedex Number:  286
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Effect Spore - Poison Heal - Technician (Hidden Ability)
+Its short arms stretch when it
+throws punches. Its technique is
+equal to that of pro boxers.
+
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:        130
+        defense:         80
+ special-attack:         60
+special-defense:         60
+          speed:         70
+
+Pokedex ID: 286	Capture Rate: 90
+Base Exp: 161	Happiness: 70
+Height: 12	Weight: 392
+
+Genus: Mushroom Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 460
-Hp:  60
-Attack:  130
-Defence:  80
-Special Attack:  60
-Special Defence:  60
-Speed:  70
diff --git a/pokeData/brionne b/pokeData/brionne
index 9a024de..1b7204c 100644
--- a/pokeData/brionne
+++ b/pokeData/brionne
@@ -1,15 +1,21 @@
+brionne	A water type Pokémon
 
-Name:  Brionne
-Pokedex Number:  729
-Gender Ratio:   ♂:88.14% ♀:11.86%
-Abilities: Torrent - Liquid Voice (Hidden Ability)
+A skillful dancer, it creates a sequence of water
+balloons as it dances, and briskly bombards
+its enemies.
+
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         69
+        defense:         69
+ special-attack:         91
+special-defense:         81
+          speed:         50
+
+Pokedex ID: 729	Capture Rate: 45
+Base Exp: 147	Happiness: 50
+Height: 6	Weight: 175
+
+Genus: Pop Star Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 420
-Hp:  60
-Attack:  69
-Defence:  69
-Special Attack:  91
-Special Defence:  81
-Speed:  50
diff --git a/pokeData/bronzong b/pokeData/bronzong
index 14c2f1e..e571d15 100644
--- a/pokeData/bronzong
+++ b/pokeData/bronzong
@@ -1,15 +1,37 @@
+bronzong	A steel type Pokémon
 
-Name:  Bronzong
-Pokedex Number:  437
-Gender Ratio:  Genderless
-Abilities: Levitate - Heatproof - Heavy Metal (Hidden Ability)
+Il apportait la pluie en créant un
+portail vers une autre dimension.
+Il était synonyme de bonne récolte.
 
-Base Stats
-----------------------
-Total: 500
-Hp:  67
-Attack:  89
-Defence:  116
-Special Attack:  79
-Special Defence:  116
-Speed:  33
+   ↞--------| STATS |--------↠ 
+             hp:         67
+         attack:         89
+        defense:        116
+ special-attack:         79
+special-defense:        116
+          speed:         33
+
+Pokedex ID: 437	Capture Rate: 90
+Base Exp: 175	Happiness: 50
+Height: 13	Weight: 1870
+
+Genus: Bronze Bell Pokémon
+Location Areas:
+mt-coronet-2f
+mt-coronet-3f
+mt-coronet-exterior-snowfall
+mt-coronet-exterior-blizzard
+mt-coronet-4f
+mt-coronet-4f-small-room
+mt-coronet-5f
+mt-coronet-6f
+mt-coronet-1f-from-exterior
+turnback-cave-pillar-1
+turnback-cave-pillar-2
+turnback-cave-pillar-3
+turnback-cave-before-pillar-1
+turnback-cave-between-pillars-1-and-2
+turnback-cave-between-pillars-2-and-3
+turnback-cave-after-pillar-3
+abundant-shrine-area
diff --git a/pokeData/bronzor b/pokeData/bronzor
index 2f3ecc5..085e979 100644
--- a/pokeData/bronzor
+++ b/pokeData/bronzor
@@ -1,15 +1,83 @@
+bronzor	A steel type Pokémon
 
-Name:  Bronzor
-Pokedex Number:  436
-Gender Ratio:  Genderless
-Abilities: Levitate - Heatproof - Heavy Metal (Hidden Ability)
+There are researchers who believe
+this Pokémon reflected like a mirror
+in the distant past.
 
-Base Stats
-----------------------
-Total: 300
-Hp:  57
-Attack:  24
-Defence:  86
-Special Attack:  24
-Special Defence:  86
-Speed:  23
+   ↞--------| STATS |--------↠ 
+             hp:         57
+         attack:         24
+        defense:         86
+ special-attack:         24
+special-defense:         86
+          speed:         23
+
+Pokedex ID: 436	Capture Rate: 255
+Base Exp: 60	Happiness: 50
+Height: 5	Weight: 605
+
+Genus: Bronze Pokémon
+Location Areas:
+mt-coronet-1f-route-207
+mt-coronet-2f
+mt-coronet-3f
+mt-coronet-1f-route-216
+mt-coronet-1f-route-211
+mt-coronet-b1f
+turnback-cave-pillar-1
+turnback-cave-pillar-2
+turnback-cave-pillar-3
+turnback-cave-before-pillar-1
+turnback-cave-between-pillars-1-and-2
+turnback-cave-between-pillars-2-and-3
+turnback-cave-after-pillar-3
+wayward-cave-1f
+wayward-cave-b1f
+sinnoh-route-206-area
+sinnoh-route-211-west-towards-eterna-city
+sinnoh-route-211-east-towards-celestic-town
+union-cave-1f
+union-cave-b1f
+union-cave-b2f
+slowpoke-well-1f
+slowpoke-well-b1f
+whirl-islands-1f
+whirl-islands-b1f
+whirl-islands-b2f
+whirl-islands-b3f
+mt-mortar-1f
+mt-mortar-lower-cave
+mt-mortar-upper-cave
+mt-mortar-b1f
+ice-path-1f
+ice-path-b1f
+ice-path-b2f
+ice-path-b3f
+dark-cave-violet-city-entrance
+dark-cave-blackthorn-city-entrance
+seafoam-islands-1f
+seafoam-islands-b1f
+seafoam-islands-b2f
+seafoam-islands-b3f
+seafoam-islands-b4f
+mt-silver-2f
+mt-silver-1f-top
+mt-silver-4f
+johto-route-47-inside-cave
+mt-silver-1f
+mt-silver-mountainside
+mt-silver-3f
+mt-silver-top
+mt-moon-1f
+mt-moon-2f
+rock-tunnel-1f
+rock-tunnel-b1f
+kanto-victory-road-1-1f
+tohjo-falls-area
+digletts-cave-area
+kanto-victory-road-1-2f
+kanto-victory-road-1-3f
+cerulean-cave-1f
+cerulean-cave-2f
+cerulean-cave-b1f
+abundant-shrine-area
diff --git a/pokeData/bruxish b/pokeData/bruxish
index 14f12c2..b416b09 100644
--- a/pokeData/bruxish
+++ b/pokeData/bruxish
@@ -1,15 +1,21 @@
+bruxish	A water type Pokémon
 
-Name:  Bruxish
-Pokedex Number:  779
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Dazzling - Strong Jaw - Wonder Skin  (Hidden Ability)
+When it unleashes its psychic power from the
+protuberance on its head, the grating sound
+of grinding teeth echoes through the area.
+
+   ↞--------| STATS |--------↠ 
+             hp:         68
+         attack:        105
+        defense:         70
+ special-attack:         70
+special-defense:         70
+          speed:         92
+
+Pokedex ID: 779	Capture Rate: 80
+Base Exp: 166	Happiness: 70
+Height: 9	Weight: 190
+
+Genus: Gnash Teeth Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 475
-Hp:  68
-Attack:  105
-Defence:  70
-Special Attack:  70
-Special Defence:  70
-Speed:  92
diff --git a/pokeData/budew b/pokeData/budew
index 78e6280..2c320e3 100644
--- a/pokeData/budew
+++ b/pokeData/budew
@@ -1,15 +1,35 @@
+budew	A grass type Pokémon
 
-Name:  Budew
-Pokedex Number:  406
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Natural Cure - Poison Point - Leaf Guard (Hidden Ability)
+Il est sensible aux variations de
+température et on dit qu’il fleurit
+quand il sent la chaleur du soleil.
 
-Base Stats
-----------------------
-Total: 280
-Hp:  40
-Attack:  30
-Defence:  35
-Special Attack:  50
-Special Defence:  70
-Speed:  55
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         30
+        defense:         35
+ special-attack:         50
+special-defense:         70
+          speed:         55
+
+Pokedex ID: 406	Capture Rate: 255
+Base Exp: 56	Happiness: 50
+Height: 2	Weight: 12
+
+Genus: Bud Pokémon
+Location Areas:
+eterna-forest-area
+great-marsh-area-1
+great-marsh-area-2
+great-marsh-area-3
+great-marsh-area-4
+great-marsh-area-5
+great-marsh-area-6
+sinnoh-route-204-south-towards-jubilife-city
+sinnoh-route-204-north-towards-floaroma-town
+sinnoh-route-205-east-towards-eterna-city
+sinnoh-route-208-area
+sinnoh-route-212-north-towards-hearthome-city
+ilex-forest-area
+viridian-forest-area
+kalos-route-4-area
diff --git a/pokeData/buizel b/pokeData/buizel
index fafa1b6..6b805bc 100644
--- a/pokeData/buizel
+++ b/pokeData/buizel
@@ -1,15 +1,57 @@
+buizel	A water type Pokémon
 
-Name:  Buizel
-Pokedex Number:  418
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Swift Swim - Water Veil (Hidden Ability)
+Il utilise ses deux queues comme
+une hélice pour se propulser sous
+l’eau et trancher les algues.
 
-Base Stats
-----------------------
-Total: 330
-Hp:  55
-Attack:  65
-Defence:  35
-Special Attack:  60
-Special Defence:  30
-Speed:  85
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         65
+        defense:         35
+ special-attack:         60
+special-defense:         30
+          speed:         85
+
+Pokedex ID: 418	Capture Rate: 190
+Base Exp: 66	Happiness: 70
+Height: 7	Weight: 295
+
+Genus: Sea Weasel Pokémon
+Location Areas:
+valley-windworks-area
+sinnoh-route-205-south-towards-floaroma-town
+sinnoh-route-205-east-towards-eterna-city
+sinnoh-route-212-east-towards-pastoria-city
+sinnoh-route-213-area
+sinnoh-route-224-area
+johto-route-30-area
+johto-route-31-area
+johto-route-32-area
+ruins-of-alph-outside
+johto-route-34-area
+johto-route-35-area
+johto-route-42-area
+johto-route-43-area
+johto-route-44-area
+johto-route-45-area
+johto-route-47-area
+mt-silver-outside
+kanto-route-26-area
+kanto-route-27-area
+kanto-route-28-area
+kanto-route-4-area
+kanto-route-6-area
+kanto-route-9-area
+kanto-route-10-area
+kanto-route-13-area
+kanto-sea-route-21-area
+kanto-route-22-area
+kanto-route-24-area
+kanto-route-25-area
+unova-route-11-area
+unova-route-14-area
+lostlorn-forest-area
+unova-victory-road-2-unknown-area-73
+unova-victory-road-2-unknown-area-79
+nature-sanctuary-area
+unova-route-23-area
diff --git a/pokeData/bulbasaur b/pokeData/bulbasaur
index a28dbd2..30d0a6b 100644
--- a/pokeData/bulbasaur
+++ b/pokeData/bulbasaur
@@ -1,15 +1,24 @@
+bulbasaur	A grass type Pokémon
 
-Name:  Bulbasaur
-Pokedex Number:  001
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Overgrow - Chlorophyll (Hidden Ability)
+BULBASAUR can be seen napping in
+bright sunlight.
+There is a seed on its back.By soaking up the sun’s rays, the seed
+grows progressively larger.
 
-Base Stats
-----------------------
-Total: 318
-Hp:  45
-Attack:  49
-Defence:  49
-Special Attack:  65
-Special Defence:  65
-Speed:  45
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         49
+        defense:         49
+ special-attack:         65
+special-defense:         65
+          speed:         45
+
+Pokedex ID: 1	Capture Rate: 45
+Base Exp: 64	Happiness: 50
+Height: 7	Weight: 69
+
+Genus: Seed Pokémon
+Location Areas:
+cerulean-city-area
+pallet-town-area
+lumiose-city-area
diff --git a/pokeData/buneary b/pokeData/buneary
index 663d895..d314db5 100644
--- a/pokeData/buneary
+++ b/pokeData/buneary
@@ -1,15 +1,23 @@
+buneary	A normal type Pokémon
 
-Name:  Buneary
-Pokedex Number:  427
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Run Away - Klutz - Limber (Hidden Ability)
+Ses oreilles repliées se déroulent
+avec une force capable de briser
+un gros rocher.
 
-Base Stats
-----------------------
-Total: 350
-Hp:  55
-Attack:  66
-Defence:  44
-Special Attack:  44
-Special Defence:  56
-Speed:  85
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         66
+        defense:         44
+ special-attack:         44
+special-defense:         56
+          speed:         85
+
+Pokedex ID: 427	Capture Rate: 190
+Base Exp: 70	Happiness: 0
+Height: 4	Weight: 55
+
+Genus: Rabbit Pokémon
+Location Areas:
+eterna-forest-area
+kanto-route-25-area
+castelia-city-area
diff --git a/pokeData/bunnelby b/pokeData/bunnelby
index 3dfe1c2..3dc7cc5 100644
--- a/pokeData/bunnelby
+++ b/pokeData/bunnelby
@@ -1,15 +1,24 @@
+bunnelby	A normal type Pokémon
 
-Name:  Bunnelby
-Pokedex Number:  659
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Pickup - Cheek Pouch - Huge Power (Hidden Ability)
+大きな　耳で　地面を　掘って
+巣穴を　作る。
+一晩中　休まずに　掘り続けられる。
 
-Base Stats
-----------------------
-Total: 237
-Hp:  38
-Attack:  36
-Defence:  38
-Special Attack:  32
-Special Defence:  36
-Speed:  57
+   ↞--------| STATS |--------↠ 
+             hp:         38
+         attack:         36
+        defense:         38
+ special-attack:         32
+special-defense:         36
+          speed:         57
+
+Pokedex ID: 659	Capture Rate: 255
+Base Exp: 47	Happiness: 50
+Height: 4	Weight: 50
+
+Genus: Digging Pokémon
+Location Areas:
+kalos-route-2-area
+kalos-route-3-area
+kalos-route-5-area
+kalos-route-22-area
diff --git a/pokeData/burmy b/pokeData/burmy
index ff0650d..3b99593 100644
--- a/pokeData/burmy
+++ b/pokeData/burmy
@@ -1,15 +1,21 @@
+burmy	A bug type Pokémon
 
-Name:  Burmy
-Pokedex Number:  412
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Shed Skin - Overcoat (Hidden Ability)
+Nul ne sait comment il y parvient,
+mais il arrive toujours à se former
+une cape, où qu’il soit.
 
-Base Stats
-----------------------
-Total: 224
-Hp:  40
-Attack:  29
-Defence:  45
-Special Attack:  29
-Special Defence:  45
-Speed:  36
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         29
+        defense:         45
+ special-attack:         29
+special-defense:         45
+          speed:         36
+
+Pokedex ID: 412	Capture Rate: 120
+Base Exp: 45	Happiness: 70
+Height: 2	Weight: 34
+
+Genus: Bagworm Pokémon
+Location Areas:
+kalos-route-3-area
diff --git a/pokeData/butterfree b/pokeData/butterfree
index f92d8c1..519c468 100644
--- a/pokeData/butterfree
+++ b/pokeData/butterfree
@@ -1,15 +1,39 @@
+butterfree	A bug type Pokémon
 
-Name:  Butterfree
-Pokedex Number:  012
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Compoundeyes - Tinted Lens (Hidden Ability)
+BUTTERFREE has a superior ability to
+search for delicious honey from
+flowers.It can even search out, extract, and
+carry honey from flowers that are
+blooming over six miles from its nest.
 
-Base Stats
-----------------------
-Total: 395
-Hp:  60
-Attack:  45
-Defence:  50
-Special Attack:  90
-Special Defence:  80
-Speed:  70
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         45
+        defense:         50
+ special-attack:         90
+special-defense:         80
+          speed:         70
+
+Pokedex ID: 12	Capture Rate: 45
+Base Exp: 198	Happiness: 50
+Height: 11	Weight: 320
+
+Genus: Butterfly Pokémon
+Location Areas:
+ilex-forest-area
+johto-route-34-area
+johto-route-35-area
+johto-route-36-area
+johto-route-37-area
+johto-route-38-area
+johto-route-39-area
+lake-of-rage-area
+kanto-route-26-area
+kanto-route-27-area
+kanto-route-2-south-towards-viridian-city
+kanto-route-24-area
+kanto-route-25-area
+kanto-route-2-north-towards-pewter-city
+viridian-forest-area
+unova-route-12-area
+azalea-town-area
diff --git a/pokeData/buzzwole b/pokeData/buzzwole
index 1c71383..436eac1 100644
--- a/pokeData/buzzwole
+++ b/pokeData/buzzwole
@@ -1,15 +1,21 @@
+buzzwole	A bug type Pokémon
 
-Name:  Buzzwole
-Pokedex Number:  794
-Gender Ratio:  Genderless
-Abilities: Beast Boost
+This Ultra Beast appeared from another world.
+It shows off its body, but whether that display
+is a boast or a threat remains unclear.
+
+   ↞--------| STATS |--------↠ 
+             hp:        107
+         attack:        139
+        defense:        139
+ special-attack:         53
+special-defense:         53
+          speed:         79
+
+Pokedex ID: 794	Capture Rate: 45
+Base Exp: 285	Happiness: 0
+Height: 24	Weight: 3336
+
+Genus: Swollen Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 570
-Hp:  107
-Attack:  139
-Defence:  139
-Special Attack:  53
-Special Defence:  53
-Speed:  79
diff --git a/pokeData/cacnea b/pokeData/cacnea
index d273ce8..7f5ed33 100644
--- a/pokeData/cacnea
+++ b/pokeData/cacnea
@@ -1,15 +1,22 @@
+cacnea	A grass type Pokémon
 
-Name:  Cacnea
-Pokedex Number:  331
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Sand Veil - Water Absorb (Hidden Ability)
+By storing water in its body, this
+desert dweller can survive for 30
+days without water.
 
-Base Stats
-----------------------
-Total: 335
-Hp:  50
-Attack:  85
-Defence:  40
-Special Attack:  85
-Special Defence:  40
-Speed:  35
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         85
+        defense:         40
+ special-attack:         85
+special-defense:         40
+          speed:         35
+
+Pokedex ID: 331	Capture Rate: 190
+Base Exp: 67	Happiness: 35
+Height: 4	Weight: 513
+
+Genus: Cactus Pokémon
+Location Areas:
+sinnoh-route-228-area
+hoenn-route-111-area
diff --git a/pokeData/cacturne b/pokeData/cacturne
index 6cd5bbb..e9c894d 100644
--- a/pokeData/cacturne
+++ b/pokeData/cacturne
@@ -1,15 +1,21 @@
+cacturne	A grass type Pokémon
 
-Name:  Cacturne
-Pokedex Number:  332
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Sand Veil - Water Absorb (Hidden Ability)
+It becomes active at night,
+seeking prey that is exhausted
+from the day’s desert heat.
 
-Base Stats
-----------------------
-Total: 475
-Hp:  70
-Attack:  115
-Defence:  60
-Special Attack:  115
-Special Defence:  60
-Speed:  55
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:        115
+        defense:         60
+ special-attack:        115
+special-defense:         60
+          speed:         55
+
+Pokedex ID: 332	Capture Rate: 60
+Base Exp: 166	Happiness: 35
+Height: 13	Weight: 774
+
+Genus: Scarecrow Pokémon
+Location Areas:
+sinnoh-route-228-area
diff --git a/pokeData/calyrex b/pokeData/calyrex
index ffdbc23..c69480b 100644
--- a/pokeData/calyrex
+++ b/pokeData/calyrex
@@ -1,15 +1,21 @@
+calyrex	A psychic type Pokémon
 
-Name:  Calyrex
-Pokedex Number:  898
-Gender Ratio:  Genderless
-Abilities: Unnerve (Standard) - As One - Unnerve Chilling Neigh (Ice Rider) - As One - Unnerve Grim Neigh (Shadow Rider
+Calyrex is a merciful Pokémon, capable of
+providing healing and blessings. It reigned over
+the Galar region in times of yore.
+
+   ↞--------| STATS |--------↠ 
+             hp:        100
+         attack:         80
+        defense:         80
+ special-attack:         80
+special-defense:         80
+          speed:         80
+
+Pokedex ID: 898	Capture Rate: 3
+Base Exp: 250	Happiness: 100
+Height: 11	Weight: 77
+
+Genus: King Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 500
-Hp:  100
-Attack:  85
-Defence:  80
-Special Attack:  165
-Special Defence:  100
-Speed:  150
diff --git a/pokeData/camerupt b/pokeData/camerupt
index 050e845..f5b3b9b 100644
--- a/pokeData/camerupt
+++ b/pokeData/camerupt
@@ -1,15 +1,38 @@
+camerupt	A fire type Pokémon
 
-Name:  Camerupt
-Pokedex Number:  323
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Magma Armor - Solid Rock - Anger Point (Hidden Ability)
+It has volcanoes on its back. If
+magma builds up in its body, it
+shudders, then erupts violently.
 
-Base Stats
-----------------------
-Total: 460
-Hp:  70
-Attack:  120
-Defence:  100
-Special Attack:  145
-Special Defence:  105
-Speed:  20
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:        100
+        defense:         70
+ special-attack:        105
+special-defense:         75
+          speed:         40
+
+Pokedex ID: 323	Capture Rate: 150
+Base Exp: 161	Happiness: 70
+Height: 19	Weight: 2200
+
+Genus: Eruption Pokémon
+Location Areas:
+stark-mountain-area
+stark-mountain-entrance
+stark-mountain-inside
+sinnoh-route-227-area
+reversal-mountain-unknown-area-48
+reversal-mountain-unknown-area-49
+reversal-mountain-unknown-area-50
+reversal-mountain-unknown-area-51
+reversal-mountain-unknown-area-52
+reversal-mountain-unknown-area-53
+reversal-mountain-unknown-area-54
+reversal-mountain-unknown-area-55
+reversal-mountain-unknown-area-56
+reversal-mountain-unknown-area-57
+reversal-mountain-unknown-area-58
+reversal-mountain-unknown-area-59
+reversal-mountain-unknown-area-60
+battle-resort-area
diff --git a/pokeData/carbink b/pokeData/carbink
index b9fd37e..3fa239b 100644
--- a/pokeData/carbink
+++ b/pokeData/carbink
@@ -1,15 +1,24 @@
+carbink	A rock type Pokémon
 
-Name:  Carbink
-Pokedex Number:  703
-Gender Ratio:  Genderless
-Abilities: Clear Body - Sturdy (Hidden Ability)
+地下深くの　高温　高圧な
+環境で　生まれた。
+頭の　石から　エネルギーを　放つ。
 
-Base Stats
-----------------------
-Total: 500
-Hp:  50
-Attack:  50
-Defence:  150
-Special Attack:  50
-Special Defence:  150
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         50
+        defense:        150
+ special-attack:         50
+special-defense:        150
+          speed:         50
+
+Pokedex ID: 703	Capture Rate: 60
+Base Exp: 100	Happiness: 50
+Height: 3	Weight: 57
+
+Genus: Jewel Pokémon
+Location Areas:
+reflection-cave-unknown-area-305
+reflection-cave-unknown-area-306
+reflection-cave-unknown-area-307
+reflection-cave-unknown-area-308
diff --git a/pokeData/carkol b/pokeData/carkol
index c9e1845..3165aae 100644
--- a/pokeData/carkol
+++ b/pokeData/carkol
@@ -1,15 +1,21 @@
+carkol	A rock type Pokémon
 
-Name:  Carkol
-Pokedex Number:  838
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Steam Engine - Flame Body - Flash Fire (Hidden Ability)
+It forms coal inside its body. Coal dropped by
+this Pokémon once helped fuel the lives of
+people in the Galar region.
+
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:         60
+        defense:         90
+ special-attack:         60
+special-defense:         70
+          speed:         50
+
+Pokedex ID: 838	Capture Rate: 120
+Base Exp: 144	Happiness: 50
+Height: 11	Weight: 780
+
+Genus: Coal Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 410
-Hp:  80
-Attack:  60
-Defence:  90
-Special Attack:  60
-Special Defence:  70
-Speed:  50
diff --git a/pokeData/carnivine b/pokeData/carnivine
index d772aaa..46cd83c 100644
--- a/pokeData/carnivine
+++ b/pokeData/carnivine
@@ -1,15 +1,25 @@
+carnivine	A grass type Pokémon
 
-Name:  Carnivine
-Pokedex Number:  455
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Levitate
+Il s’accroche aux arbres des
+marais et attire ses proies avec
+sa salive à l’odeur enivrante.
 
-Base Stats
-----------------------
-Total: 454
-Hp:  74
-Attack:  100
-Defence:  72
-Special Attack:  90
-Special Defence:  72
-Speed:  46
+   ↞--------| STATS |--------↠ 
+             hp:         74
+         attack:        100
+        defense:         72
+ special-attack:         90
+special-defense:         72
+          speed:         46
+
+Pokedex ID: 455	Capture Rate: 200
+Base Exp: 159	Happiness: 70
+Height: 14	Weight: 270
+
+Genus: Bug Catcher Pokémon
+Location Areas:
+ilex-forest-area
+viridian-forest-area
+unova-route-18-area
+kalos-route-14-area
+kalos-route-19-area
diff --git a/pokeData/carracosta b/pokeData/carracosta
index 7bf8936..854e6b1 100644
--- a/pokeData/carracosta
+++ b/pokeData/carracosta
@@ -1,15 +1,21 @@
+carracosta	A water type Pokémon
 
-Name:  Carracosta
-Pokedex Number:  565
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Solid Rock - Sturdy - Swift Swim (Hidden Ability)
+바다와 육지에서 생활한다.
+손바닥으로 쳐서 배 밑바닥에
+구멍을 내는 파워의 소유자다.
+
+   ↞--------| STATS |--------↠ 
+             hp:         74
+         attack:        108
+        defense:        133
+ special-attack:         83
+special-defense:         65
+          speed:         32
+
+Pokedex ID: 565	Capture Rate: 45
+Base Exp: 173	Happiness: 50
+Height: 12	Weight: 810
+
+Genus: Prototurtle Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 495
-Hp:  74
-Attack:  108
-Defence:  133
-Special Attack:  83
-Special Defence:  65
-Speed:  32
diff --git a/pokeData/carvanha b/pokeData/carvanha
index 8b63cfb..7f41095 100644
--- a/pokeData/carvanha
+++ b/pokeData/carvanha
@@ -1,15 +1,30 @@
+carvanha	A water type Pokémon
 
-Name:  Carvanha
-Pokedex Number:  318
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Rough Skin - Speed Boost (Hidden Ability)
+They swarm any foe that invades
+their territory. Their sharp fangs
+can tear out boat hulls.
 
-Base Stats
-----------------------
-Total: 305
-Hp:  45
-Attack:  90
-Defence:  20
-Special Attack:  65
-Special Defence:  20
-Speed:  65
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         90
+        defense:         20
+ special-attack:         65
+special-defense:         20
+          speed:         65
+
+Pokedex ID: 318	Capture Rate: 225
+Base Exp: 61	Happiness: 35
+Height: 8	Weight: 208
+
+Genus: Savage Pokémon
+Location Areas:
+great-marsh-area-1
+great-marsh-area-2
+great-marsh-area-3
+great-marsh-area-4
+great-marsh-area-5
+great-marsh-area-6
+hoenn-route-118-area
+hoenn-route-119-area
+village-bridge-area
+kalos-route-22-area
diff --git a/pokeData/cascoon b/pokeData/cascoon
index 5dcb728..4008535 100644
--- a/pokeData/cascoon
+++ b/pokeData/cascoon
@@ -1,15 +1,23 @@
+cascoon	A bug type Pokémon
 
-Name:  Cascoon
-Pokedex Number:  268
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Shed Skin
+It never forgets any attack it
+endured while in the cocoon.
+After evolution, it seeks payback.
 
-Base Stats
-----------------------
-Total: 205
-Hp:  50
-Attack:  35
-Defence:  55
-Special Attack:  25
-Special Defence:  25
-Speed:  15
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         35
+        defense:         55
+ special-attack:         25
+special-defense:         25
+          speed:         15
+
+Pokedex ID: 268	Capture Rate: 120
+Base Exp: 72	Happiness: 70
+Height: 7	Weight: 115
+
+Genus: Cocoon Pokémon
+Location Areas:
+eterna-forest-area
+sinnoh-route-205-east-towards-eterna-city
+petalburg-woods-area
diff --git a/pokeData/castform b/pokeData/castform
index 5a94493..a87cbab 100644
--- a/pokeData/castform
+++ b/pokeData/castform
@@ -1,15 +1,22 @@
+castform	A normal type Pokémon
 
-Name:  Castform
-Pokedex Number:  351
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Forecast
+Its appearance changes with the
+weather. Recently, its molecules
+were found to be just like water.
 
-Base Stats
-----------------------
-Total: 420
-Hp:  70
-Attack:  70
-Defence:  70
-Special Attack:  70
-Special Defence:  70
-Speed:  70
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         70
+        defense:         70
+ special-attack:         70
+special-defense:         70
+          speed:         70
+
+Pokedex ID: 351	Capture Rate: 45
+Base Exp: 147	Happiness: 70
+Height: 3	Weight: 8
+
+Genus: Weather Pokémon
+Location Areas:
+unova-route-6-area
+hoenn-route-119-weather-institute
diff --git a/pokeData/caterpie b/pokeData/caterpie
index 85ce796..5d56406 100644
--- a/pokeData/caterpie
+++ b/pokeData/caterpie
@@ -1,15 +1,48 @@
+caterpie	A bug type Pokémon
 
-Name:  Caterpie
-Pokedex Number:  010
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Shield Dust - Run Away (Hidden Ability)
+It crawls into
+foliage where it
+camouflages itselfamong leaves that
+are the same color
+as its body.
 
-Base Stats
-----------------------
-Total: 195
-Hp:  45
-Attack:  30
-Defence:  35
-Special Attack:  20
-Special Defence:  20
-Speed:  45
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         30
+        defense:         35
+ special-attack:         20
+special-defense:         20
+          speed:         45
+
+Pokedex ID: 10	Capture Rate: 255
+Base Exp: 39	Happiness: 50
+Height: 3	Weight: 29
+
+Genus: Worm Pokémon
+Location Areas:
+eterna-forest-area
+sinnoh-route-204-south-towards-jubilife-city
+sinnoh-route-204-north-towards-floaroma-town
+johto-route-30-area
+johto-route-31-area
+ilex-forest-area
+johto-route-34-area
+johto-route-35-area
+national-park-area
+unknown-all-bugs-area
+johto-route-36-area
+johto-route-37-area
+johto-route-38-area
+johto-route-39-area
+lake-of-rage-area
+kanto-route-26-area
+kanto-route-27-area
+kanto-route-2-south-towards-viridian-city
+kanto-route-24-area
+kanto-route-25-area
+kanto-route-2-north-towards-pewter-city
+viridian-forest-area
+pattern-bush-area
+kalos-route-2-area
+santalune-forest-area
+azalea-town-area
diff --git a/pokeData/celebi b/pokeData/celebi
index f3c90b7..61c2586 100644
--- a/pokeData/celebi
+++ b/pokeData/celebi
@@ -1,15 +1,21 @@
+celebi	A psychic type Pokémon
 
-Name:  Celebi
-Pokedex Number:  251
-Gender Ratio:  Genderless
-Abilities: Natural Cure
+This POKéMON wanders across time.
+Grass and trees flourish in the forests in
+which it has appeared.
 
-Base Stats
-----------------------
-Total: 600
-Hp:  100
-Attack:  100
-Defence:  100
-Special Attack:  100
-Special Defence:  100
-Speed:  100
+   ↞--------| STATS |--------↠ 
+             hp:        100
+         attack:        100
+        defense:        100
+ special-attack:        100
+special-defense:        100
+          speed:        100
+
+Pokedex ID: 251	Capture Rate: 45
+Base Exp: 300	Happiness: 100
+Height: 6	Weight: 50
+
+Genus: Time Travel Pokémon
+Location Areas:
+ilex-forest-area
diff --git a/pokeData/celesteela b/pokeData/celesteela
index ca0ecb3..1f7aa33 100644
--- a/pokeData/celesteela
+++ b/pokeData/celesteela
@@ -1,15 +1,20 @@
+celesteela	A steel type Pokémon
 
-Name:  Celesteela
-Pokedex Number:  797
-Gender Ratio:  Genderless
-Abilities: Beast Boost
+It appeared from the Ultra Wormhole. Witnesses
+observed it flying across the sky at high speed.
+
+   ↞--------| STATS |--------↠ 
+             hp:         97
+         attack:        101
+        defense:        103
+ special-attack:        107
+special-defense:        101
+          speed:         61
+
+Pokedex ID: 797	Capture Rate: 45
+Base Exp: 285	Happiness: 0
+Height: 92	Weight: 9999
+
+Genus: Launch Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 570
-Hp:  97
-Attack:  101
-Defence:  103
-Special Attack:  107
-Special Defence:  101
-Speed:  61
diff --git a/pokeData/centiskorch b/pokeData/centiskorch
index 0d31879..75afa01 100644
--- a/pokeData/centiskorch
+++ b/pokeData/centiskorch
@@ -1,15 +1,21 @@
+centiskorch	A fire type Pokémon
 
-Name:  Centiskorch
-Pokedex Number:  851
-Gender Ratio:   ♂:50.2% ♀:49.8% 
-Abilities: Flash Fire - White Smoke - Flame Body (Hidden Ability)
+When it heats up, its body temperature reaches
+about 1,500 degrees Fahrenheit. It lashes its
+body like a whip and launches itself at enemies.
+
+   ↞--------| STATS |--------↠ 
+             hp:        100
+         attack:        115
+        defense:         65
+ special-attack:         90
+special-defense:         90
+          speed:         65
+
+Pokedex ID: 851	Capture Rate: 75
+Base Exp: 184	Happiness: 50
+Height: 30	Weight: 1200
+
+Genus: Radiator Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 525
-Hp:  90
-Attack:  90
-Defence:  65
-Special Attack:  Max Stats<b
-Special Defence:  Lv. 50
-Speed:  160 - 207
diff --git a/pokeData/chandelure b/pokeData/chandelure
index bda5577..aae68a9 100644
--- a/pokeData/chandelure
+++ b/pokeData/chandelure
@@ -1,15 +1,21 @@
+chandelure	A ghost type Pokémon
 
-Name:  Chandelure
-Pokedex Number:  609
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Flash Fire - Flame Body - Infiltrator (Hidden Ability)
+샹델라의 불꽃에 둘러싸이면
+영혼이 빨려가 불타버린다.
+빈 껍데기인 몸만 남는다.
+
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         55
+        defense:         90
+ special-attack:        145
+special-defense:         90
+          speed:         80
+
+Pokedex ID: 609	Capture Rate: 45
+Base Exp: 260	Happiness: 50
+Height: 10	Weight: 343
+
+Genus: Luring Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 520
-Hp:  60
-Attack:  55
-Defence:  90
-Special Attack:  145
-Special Defence:  90
-Speed:  80
diff --git a/pokeData/chansey b/pokeData/chansey
index 3b9dfd1..3389dc1 100644
--- a/pokeData/chansey
+++ b/pokeData/chansey
@@ -1,15 +1,32 @@
+chansey	A normal type Pokémon
 
-Name:  Chansey
-Pokedex Number:  113
-Gender Ratio:   ♂:0% ♀:100%
-Abilities: Natural Cure - Serene Grace - Healer (Hidden Ability)
+CHANSEY lays nutritionally excellent
+eggs on an everyday basis.
+The eggs are so delicious, they areeasily and eagerly devoured by even
+those people who have lost their
+appetite.
 
-Base Stats
-----------------------
-Total: 450
-Hp:  250
-Attack:  5
-Defence:  5
-Special Attack:  35
-Special Defence:  105
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:        250
+         attack:          5
+        defense:          5
+ special-attack:         35
+special-defense:        105
+          speed:         50
+
+Pokedex ID: 113	Capture Rate: 30
+Base Exp: 395	Happiness: 140
+Height: 11	Weight: 346
+
+Genus: Egg Pokémon
+Location Areas:
+sinnoh-route-209-area
+sinnoh-route-210-south-towards-solaceon-town
+kanto-route-13-area
+kanto-route-14-area
+kanto-route-15-area
+cerulean-cave-2f
+cerulean-cave-b1f
+kanto-safari-zone-middle
+kanto-safari-zone-area-1-east
+kanto-safari-zone-area-2-north
diff --git a/pokeData/charizard b/pokeData/charizard
index 4e2794d..fefe787 100644
--- a/pokeData/charizard
+++ b/pokeData/charizard
@@ -1,15 +1,23 @@
+charizard	A fire type Pokémon
 
-Name:  Charizard
-Pokedex Number:  006
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Blaze - Solar Power (Hidden Ability)
+CHARIZARD flies around the sky in
+search of powerful opponents.
+It breathes fire of such great heatthat it melts anything. However, it
+never turns its fiery breath on any
+opponent weaker than itself.
+
+   ↞--------| STATS |--------↠ 
+             hp:         78
+         attack:         84
+        defense:         78
+ special-attack:        109
+special-defense:         85
+          speed:        100
+
+Pokedex ID: 6	Capture Rate: 45
+Base Exp: 267	Happiness: 50
+Height: 17	Weight: 905
+
+Genus: Flame Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 534
-Hp:  78
-Attack:  104
-Defence:  78
-Special Attack:  159
-Special Defence:  115
-Speed:  100
diff --git a/pokeData/charjabug b/pokeData/charjabug
index 723b1a3..0c4160b 100644
--- a/pokeData/charjabug
+++ b/pokeData/charjabug
@@ -1,15 +1,21 @@
+charjabug	A bug type Pokémon
 
-Name:  Charjabug
-Pokedex Number:  737
-Gender Ratio:   ♂:50.2% ♀:49.8% 
-Abilities: Battery
+Its body is capable of storing electricity. On
+camping trips, people are grateful to have
+one around.
+
+   ↞--------| STATS |--------↠ 
+             hp:         57
+         attack:         82
+        defense:         95
+ special-attack:         55
+special-defense:         75
+          speed:         36
+
+Pokedex ID: 737	Capture Rate: 120
+Base Exp: 140	Happiness: 50
+Height: 5	Weight: 105
+
+Genus: Battery Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 400
-Hp:  57
-Attack:  82
-Defence:  95
-Special Attack:  55
-Special Defence:  75
-Speed:  36
diff --git a/pokeData/charmander b/pokeData/charmander
index 581af9b..79ded29 100644
--- a/pokeData/charmander
+++ b/pokeData/charmander
@@ -1,15 +1,24 @@
+charmander	A fire type Pokémon
 
-Name:  Charmander
-Pokedex Number:  004
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Blaze - Solar Power (Hidden Ability)
+The flame that burns at the tip of its
+tail is an indication of its emotions.
+The flame wavers when CHARMANDER isenjoying itself. If the POKéMON becomes
+enraged, the flame burns fiercely.
 
-Base Stats
-----------------------
-Total: 309
-Hp:  39
-Attack:  52
-Defence:  43
-Special Attack:  60
-Special Defence:  50
-Speed:  65
+   ↞--------| STATS |--------↠ 
+             hp:         39
+         attack:         52
+        defense:         43
+ special-attack:         60
+special-defense:         50
+          speed:         65
+
+Pokedex ID: 4	Capture Rate: 45
+Base Exp: 62	Happiness: 50
+Height: 6	Weight: 85
+
+Genus: Lizard Pokémon
+Location Areas:
+pallet-town-area
+kanto-route-24-area
+lumiose-city-area
diff --git a/pokeData/charmeleon b/pokeData/charmeleon
index fec28d2..08f2658 100644
--- a/pokeData/charmeleon
+++ b/pokeData/charmeleon
@@ -1,15 +1,23 @@
+charmeleon	A fire type Pokémon
 
-Name:  Charmeleon
-Pokedex Number:  005
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Blaze - Solar Power (Hidden Ability)
+CHARMELEON mercilessly destroys its
+foes using its sharp claws.
+If it encounters a strong foe, it turnsaggressive. In this excited state, the
+flame at the tip of its tail flares with a
+bluish white color.
+
+   ↞--------| STATS |--------↠ 
+             hp:         58
+         attack:         64
+        defense:         58
+ special-attack:         80
+special-defense:         65
+          speed:         80
+
+Pokedex ID: 5	Capture Rate: 45
+Base Exp: 142	Happiness: 50
+Height: 11	Weight: 190
+
+Genus: Flame Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 405
-Hp:  58
-Attack:  64
-Defence:  58
-Special Attack:  80
-Special Defence:  65
-Speed:  80
diff --git a/pokeData/chatot b/pokeData/chatot
index 9c1add0..6917ae5 100644
--- a/pokeData/chatot
+++ b/pokeData/chatot
@@ -1,15 +1,39 @@
+chatot	A normal type Pokémon
 
-Name:  Chatot
-Pokedex Number:  441
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Keen Eye - Tangled Feet - Big Pecks (Hidden Ability)
+Sa langue comparable à celle
+de l’homme lui permet d’imiter
+habilement le langage humain.
 
-Base Stats
-----------------------
-Total: 411
-Hp:  76
-Attack:  65
-Defence:  45
-Special Attack:  92
-Special Defence:  42
-Speed:  91
+   ↞--------| STATS |--------↠ 
+             hp:         76
+         attack:         65
+        defense:         45
+ special-attack:         92
+special-defense:         42
+          speed:         91
+
+Pokedex ID: 441	Capture Rate: 30
+Base Exp: 144	Happiness: 35
+Height: 5	Weight: 19
+
+Genus: Music Note Pokémon
+Location Areas:
+sinnoh-route-213-area
+sinnoh-route-218-area
+sinnoh-route-222-area
+sinnoh-route-224-area
+sprout-tower-2f
+sprout-tower-3f
+burned-tower-1f
+burned-tower-b1f
+bell-tower-2f
+bell-tower-3f
+bell-tower-4f
+bell-tower-5f
+bell-tower-6f
+bell-tower-7f
+bell-tower-8f
+bell-tower-9f
+bell-tower-10f
+kalos-route-12-area
+azure-bay-area
diff --git a/pokeData/cherrim b/pokeData/cherrim
index cb14d5a..f654617 100644
--- a/pokeData/cherrim
+++ b/pokeData/cherrim
@@ -1,15 +1,21 @@
+cherrim	A grass type Pokémon
 
-Name:  Cherrim
-Pokedex Number:  421
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Flower Gift
+Sous un grand soleil, il ouvre
+ses pétales pour en absorber
+les rayons.
 
-Base Stats
-----------------------
-Total: 450
-Hp:  70
-Attack:  60
-Defence:  70
-Special Attack:  87
-Special Defence:  78
-Speed:  85
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         60
+        defense:         70
+ special-attack:         87
+special-defense:         78
+          speed:         85
+
+Pokedex ID: 421	Capture Rate: 75
+Base Exp: 158	Happiness: 50
+Height: 5	Weight: 93
+
+Genus: Blossom Pokémon
+Location Areas:
+unova-route-12-area
diff --git a/pokeData/cherubi b/pokeData/cherubi
index 65230c1..8537358 100644
--- a/pokeData/cherubi
+++ b/pokeData/cherubi
@@ -1,15 +1,21 @@
+cherubi	A grass type Pokémon
 
-Name:  Cherubi
-Pokedex Number:  420
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Chlorophyll
+The small ball is not only filled with
+nutrients, it is also tasty. Starly
+try to peck it off.
+
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         35
+        defense:         45
+ special-attack:         62
+special-defense:         53
+          speed:         35
+
+Pokedex ID: 420	Capture Rate: 190
+Base Exp: 55	Happiness: 50
+Height: 4	Weight: 33
+
+Genus: Cherry Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 275
-Hp:  45
-Attack:  35
-Defence:  45
-Special Attack:  62
-Special Defence:  53
-Speed:  35
diff --git a/pokeData/chesnaught b/pokeData/chesnaught
index 2ca7904..e06562f 100644
--- a/pokeData/chesnaught
+++ b/pokeData/chesnaught
@@ -1,15 +1,21 @@
+chesnaught	A grass type Pokémon
 
-Name:  Chesnaught
-Pokedex Number:  652
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Overgrow - Bulletproof (Hidden Ability)
+体当たりで　５０トンの　戦車を
+ひっくり返す　パワー。
+自分が　盾となって　仲間を　守る。
+
+   ↞--------| STATS |--------↠ 
+             hp:         88
+         attack:        107
+        defense:        122
+ special-attack:         74
+special-defense:         75
+          speed:         64
+
+Pokedex ID: 652	Capture Rate: 45
+Base Exp: 239	Happiness: 70
+Height: 16	Weight: 900
+
+Genus: Spiny Armor Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 530
-Hp:  88
-Attack:  107
-Defence:  122
-Special Attack:  74
-Special Defence:  75
-Speed:  64
diff --git a/pokeData/chespin b/pokeData/chespin
index 7c8c24c..0145191 100644
--- a/pokeData/chespin
+++ b/pokeData/chespin
@@ -1,15 +1,21 @@
+chespin	A grass type Pokémon
 
-Name:  Chespin
-Pokedex Number:  650
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Overgrow - Bulletproof (Hidden Ability)
+普段　やわらかい　頭の　トゲは
+力を　こめると　鋭く　とがり
+岩をも　つらぬくほど　硬くなる。
 
-Base Stats
-----------------------
-Total: 313
-Hp:  56
-Attack:  61
-Defence:  65
-Special Attack:  48
-Special Defence:  45
-Speed:  38
+   ↞--------| STATS |--------↠ 
+             hp:         56
+         attack:         61
+        defense:         65
+ special-attack:         48
+special-defense:         45
+          speed:         38
+
+Pokedex ID: 650	Capture Rate: 45
+Base Exp: 63	Happiness: 70
+Height: 4	Weight: 90
+
+Genus: Spiny Nut Pokémon
+Location Areas:
+aquacorde-town-area
diff --git a/pokeData/chewtle b/pokeData/chewtle
index 43f147e..ce364e4 100644
--- a/pokeData/chewtle
+++ b/pokeData/chewtle
@@ -1,15 +1,20 @@
+chewtle	A water type Pokémon
 
-Name:  Chewtle
-Pokedex Number:  833
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Strong Jaw - Shell Armor - Swift Swim (Hidden Ability)
+Apparently the itch of its teething impels it to
+snap its jaws at anything in front of it.
+
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         64
+        defense:         50
+ special-attack:         38
+special-defense:         38
+          speed:         44
+
+Pokedex ID: 833	Capture Rate: 255
+Base Exp: 57	Happiness: 50
+Height: 3	Weight: 85
+
+Genus: Snapping Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 284
-Hp:  50
-Attack:  64
-Defence:  50
-Special Attack:  38
-Special Defence:  38
-Speed:  44
diff --git a/pokeData/chikorita b/pokeData/chikorita
index 1651fc9..883ca70 100644
--- a/pokeData/chikorita
+++ b/pokeData/chikorita
@@ -1,15 +1,23 @@
+chikorita	A grass type Pokémon
 
-Name:  Chikorita
-Pokedex Number:  152
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Overgrow - Leaf Guard (Hidden Ability)
+A sweet aroma gently wafts from the leaf
+on its head. It is docile and loves to
+soak up the sun’s rays.
 
-Base Stats
-----------------------
-Total: 318
-Hp:  45
-Attack:  49
-Defence:  65
-Special Attack:  49
-Special Defence:  65
-Speed:  45
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         49
+        defense:         65
+ special-attack:         49
+special-defense:         65
+          speed:         45
+
+Pokedex ID: 152	Capture Rate: 45
+Base Exp: 64	Happiness: 70
+Height: 9	Weight: 64
+
+Genus: Leaf Pokémon
+Location Areas:
+new-bark-town-area
+hoenn-route-101-area
+littleroot-town-area
diff --git a/pokeData/chimchar b/pokeData/chimchar
index 375abe6..54799c8 100644
--- a/pokeData/chimchar
+++ b/pokeData/chimchar
@@ -1,15 +1,23 @@
+chimchar	A fire type Pokémon
 
-Name:  Chimchar
-Pokedex Number:  390
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Blaze - Iron Fist (Hidden Ability)
+Il est très agile. Il fait toujours
+attention d’éteindre la flamme de
+sa queue avant de se coucher.
 
-Base Stats
-----------------------
-Total: 309
-Hp:  44
-Attack:  58
-Defence:  44
-Special Attack:  58
-Special Defence:  44
-Speed:  61
+   ↞--------| STATS |--------↠ 
+             hp:         44
+         attack:         58
+        defense:         44
+ special-attack:         58
+special-defense:         44
+          speed:         61
+
+Pokedex ID: 390	Capture Rate: 45
+Base Exp: 62	Happiness: 70
+Height: 5	Weight: 62
+
+Genus: Chimp Pokémon
+Location Areas:
+lake-verity-before-galactic-intervention
+sinnoh-route-201-area
+hoenn-route-101-area
diff --git a/pokeData/chimecho b/pokeData/chimecho
index 60ffd7f..7c2568f 100644
--- a/pokeData/chimecho
+++ b/pokeData/chimecho
@@ -1,15 +1,31 @@
+chimecho	A psychic type Pokémon
 
-Name:  Chimecho
-Pokedex Number:  358
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Levitate
+Its cries echo inside its hollow
+body to emerge as beautiful notes
+for startling and repelling foes.
 
-Base Stats
-----------------------
-Total: 425
-Hp:  65
-Attack:  50
-Defence:  70
-Special Attack:  95
-Special Defence:  80
-Speed:  65
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:         50
+        defense:         80
+ special-attack:         95
+special-defense:         90
+          speed:         65
+
+Pokedex ID: 358	Capture Rate: 45
+Base Exp: 159	Happiness: 70
+Height: 6	Weight: 10
+
+Genus: Wind Chime Pokémon
+Location Areas:
+mt-coronet-4f-small-room
+mt-coronet-5f
+mt-coronet-6f
+sendoff-spring-area
+turnback-cave-pillar-2
+turnback-cave-pillar-3
+turnback-cave-between-pillars-1-and-2
+turnback-cave-between-pillars-2-and-3
+turnback-cave-after-pillar-3
+mt-pyre-summit
+abundant-shrine-area
diff --git a/pokeData/chinchou b/pokeData/chinchou
index 55d8ba3..58bbcde 100644
--- a/pokeData/chinchou
+++ b/pokeData/chinchou
@@ -1,15 +1,39 @@
+chinchou	A water type Pokémon
 
-Name:  Chinchou
-Pokedex Number:  170
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Volt Absorb - Illuminate - Water Absorb (Hidden Ability)
+On the dark ocean floor, its only means
+of communication is its constantly
+flashing lights.
 
-Base Stats
-----------------------
-Total: 330
-Hp:  75
-Attack:  38
-Defence:  38
-Special Attack:  56
-Special Defence:  56
-Speed:  67
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:         38
+        defense:         38
+ special-attack:         56
+special-defense:         56
+          speed:         67
+
+Pokedex ID: 170	Capture Rate: 190
+Base Exp: 66	Happiness: 50
+Height: 5	Weight: 120
+
+Genus: Angler Pokémon
+Location Areas:
+sinnoh-sea-route-220-area
+new-bark-town-area
+johto-sea-route-41-area
+johto-route-47-area
+kanto-sea-route-20-area
+cinnabar-island-area
+vermilion-city-area
+pallet-town-area
+kanto-route-26-area
+kanto-route-27-area
+kanto-sea-route-21-area
+vermilion-city-ss-anne-dock
+hoenn-route-124-underwater
+hoenn-route-126-underwater
+driftveil-city-area
+undella-bay-area
+unova-route-18-area
+shalour-city-area
+azure-bay-area
diff --git a/pokeData/chingling b/pokeData/chingling
index 0918a48..7f532b2 100644
--- a/pokeData/chingling
+++ b/pokeData/chingling
@@ -1,15 +1,89 @@
+chingling	A psychic type Pokémon
 
-Name:  Chingling
-Pokedex Number:  433
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Levitate
+Quand il sautille, l’orbe qu’il a
+dans la bouche s’agite et tinte
+comme une cloche.
 
-Base Stats
-----------------------
-Total: 285
-Hp:  45
-Attack:  30
-Defence:  50
-Special Attack:  65
-Special Defence:  50
-Speed:  45
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         30
+        defense:         50
+ special-attack:         65
+special-defense:         50
+          speed:         45
+
+Pokedex ID: 433	Capture Rate: 120
+Base Exp: 57	Happiness: 70
+Height: 2	Weight: 6
+
+Genus: Bell Pokémon
+Location Areas:
+mt-coronet-1f-route-207
+mt-coronet-2f
+mt-coronet-3f
+mt-coronet-exterior-snowfall
+mt-coronet-exterior-blizzard
+mt-coronet-4f
+mt-coronet-4f-small-room
+mt-coronet-5f
+mt-coronet-1f-from-exterior
+mt-coronet-1f-route-216
+mt-coronet-1f-route-211
+mt-coronet-b1f
+sendoff-spring-area
+turnback-cave-pillar-1
+turnback-cave-before-pillar-1
+turnback-cave-between-pillars-1-and-2
+lake-valor-area
+lake-acuity-area
+sinnoh-route-211-west-towards-eterna-city
+sinnoh-route-211-east-towards-celestic-town
+union-cave-1f
+union-cave-b1f
+union-cave-b2f
+slowpoke-well-1f
+slowpoke-well-b1f
+whirl-islands-1f
+whirl-islands-b1f
+whirl-islands-b2f
+whirl-islands-b3f
+mt-mortar-1f
+mt-mortar-lower-cave
+mt-mortar-upper-cave
+mt-mortar-b1f
+ice-path-1f
+ice-path-b1f
+ice-path-b2f
+ice-path-b3f
+dark-cave-violet-city-entrance
+dark-cave-blackthorn-city-entrance
+seafoam-islands-1f
+seafoam-islands-b1f
+seafoam-islands-b2f
+seafoam-islands-b3f
+seafoam-islands-b4f
+mt-silver-2f
+mt-silver-1f-top
+mt-silver-4f
+johto-route-47-inside-cave
+mt-silver-1f
+mt-silver-mountainside
+mt-silver-3f
+mt-silver-top
+mt-moon-1f
+mt-moon-2f
+rock-tunnel-1f
+rock-tunnel-b1f
+kanto-victory-road-1-1f
+tohjo-falls-area
+digletts-cave-area
+kanto-victory-road-1-2f
+kanto-victory-road-1-3f
+cerulean-cave-1f
+cerulean-cave-2f
+cerulean-cave-b1f
+kalos-route-11-area
+reflection-cave-unknown-area-305
+reflection-cave-unknown-area-306
+reflection-cave-unknown-area-307
+reflection-cave-unknown-area-308
diff --git a/pokeData/cinccino b/pokeData/cinccino
index d8de9ec..65053f8 100644
--- a/pokeData/cinccino
+++ b/pokeData/cinccino
@@ -1,15 +1,24 @@
+cinccino	A normal type Pokémon
 
-Name:  Cinccino
-Pokedex Number:  573
-Gender Ratio:   ♂:25% ♀:75%
-Abilities: Cute Charm - Technician - Skill Link (Hidden Ability)
+하얀 털은 감촉이 정말 좋다.
+먼지나 정전기가
+전혀 생기지 않는다.
 
-Base Stats
-----------------------
-Total: 470
-Hp:  75
-Attack:  95
-Defence:  60
-Special Attack:  65
-Special Defence:  60
-Speed:  115
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:         95
+        defense:         60
+ special-attack:         65
+special-defense:         60
+          speed:        115
+
+Pokedex ID: 573	Capture Rate: 60
+Base Exp: 165	Happiness: 50
+Height: 5	Weight: 75
+
+Genus: Scarf Pokémon
+Location Areas:
+cold-storage-area
+unova-route-5-area
+unova-route-9-area
+unova-route-16-area
diff --git a/pokeData/cinderace b/pokeData/cinderace
index 0ad18db..24a37b3 100644
--- a/pokeData/cinderace
+++ b/pokeData/cinderace
@@ -1,15 +1,21 @@
+cinderace	A fire type Pokémon
 
-Name:  Cinderace
-Pokedex Number:  815
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Blaze - Libero (Hidden Ability)
+It juggles a pebble with its feet, turning it into a
+burning soccer ball. Its shots strike opponents
+hard and leave them scorched.
+
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:        116
+        defense:         75
+ special-attack:         65
+special-defense:         75
+          speed:        119
+
+Pokedex ID: 815	Capture Rate: 45
+Base Exp: 265	Happiness: 50
+Height: 14	Weight: 330
+
+Genus: Striker Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 530
-Hp:  80
-Attack:  116
-Defence:  75
-Special Attack:  65
-Special Defence:  75
-Speed:  119
diff --git a/pokeData/clamperl b/pokeData/clamperl
index 05a9b71..a3ff868 100644
--- a/pokeData/clamperl
+++ b/pokeData/clamperl
@@ -1,15 +1,27 @@
+clamperl	A water type Pokémon
 
-Name:  Clamperl
-Pokedex Number:  366
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Shell Armor - Rattled (Hidden Ability)
+It makes a single pearl during
+its lifetime. The pearl is said
+to amplify psychic power.
 
-Base Stats
-----------------------
-Total: 345
-Hp:  35
-Attack:  64
-Defence:  85
-Special Attack:  74
-Special Defence:  55
-Speed:  32
+   ↞--------| STATS |--------↠ 
+             hp:         35
+         attack:         64
+        defense:         85
+ special-attack:         74
+special-defense:         55
+          speed:         32
+
+Pokedex ID: 366	Capture Rate: 255
+Base Exp: 69	Happiness: 70
+Height: 4	Weight: 525
+
+Genus: Bivalve Pokémon
+Location Areas:
+sinnoh-route-219-area
+sinnoh-route-221-area
+kanto-sea-route-19-area
+hoenn-route-124-underwater
+hoenn-route-126-underwater
+unova-route-4-area
+kalos-route-12-area
diff --git a/pokeData/clauncher b/pokeData/clauncher
index b30a8e5..2c3a2b3 100644
--- a/pokeData/clauncher
+++ b/pokeData/clauncher
@@ -1,15 +1,23 @@
+clauncher	A water type Pokémon
 
-Name:  Clauncher
-Pokedex Number:  692
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Mega Launcher
+大きな　ハサミから　圧縮した　水を
+ピストルのように　撃ち出し
+飛んでいる　獲物を　撃ち落とす。
 
-Base Stats
-----------------------
-Total: 330
-Hp:  50
-Attack:  53
-Defence:  62
-Special Attack:  58
-Special Defence:  63
-Speed:  44
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         53
+        defense:         62
+ special-attack:         58
+special-defense:         63
+          speed:         44
+
+Pokedex ID: 692	Capture Rate: 225
+Base Exp: 66	Happiness: 50
+Height: 5	Weight: 83
+
+Genus: Water Gun Pokémon
+Location Areas:
+ambrette-town-area
+cyllage-city-area
+kalos-route-8-area
diff --git a/pokeData/clawitzer b/pokeData/clawitzer
index 425ae9b..851a5cb 100644
--- a/pokeData/clawitzer
+++ b/pokeData/clawitzer
@@ -1,15 +1,23 @@
+clawitzer	A water type Pokémon
 
-Name:  Clawitzer
-Pokedex Number:  693
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Mega Launcher
+水の　砲弾を　発射する
+巨大な　腕を　持つ。
+タンカーの　船体を　撃ち抜くぞ。
 
-Base Stats
-----------------------
-Total: 500
-Hp:  71
-Attack:  73
-Defence:  88
-Special Attack:  120
-Special Defence:  89
-Speed:  59
+   ↞--------| STATS |--------↠ 
+             hp:         71
+         attack:         73
+        defense:         88
+ special-attack:        120
+special-defense:         89
+          speed:         59
+
+Pokedex ID: 693	Capture Rate: 55
+Base Exp: 100	Happiness: 50
+Height: 13	Weight: 353
+
+Genus: Howitzer Pokémon
+Location Areas:
+ambrette-town-area
+cyllage-city-area
+kalos-route-8-area
diff --git a/pokeData/claydol b/pokeData/claydol
index 6bbc459..55818a6 100644
--- a/pokeData/claydol
+++ b/pokeData/claydol
@@ -1,15 +1,24 @@
+claydol	A ground type Pokémon
 
-Name:  Claydol
-Pokedex Number:  344
-Gender Ratio:  Genderless
-Abilities: Levitate
+An ancient clay figurine that came
+to life as a Pokémon from exposure
+to a mysterious ray of light.
 
-Base Stats
-----------------------
-Total: 500
-Hp:  60
-Attack:  70
-Defence:  105
-Special Attack:  70
-Special Defence:  120
-Speed:  75
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         70
+        defense:        105
+ special-attack:         70
+special-defense:        120
+          speed:         75
+
+Pokedex ID: 344	Capture Rate: 90
+Base Exp: 175	Happiness: 50
+Height: 15	Weight: 1080
+
+Genus: Clay Doll Pokémon
+Location Areas:
+sky-pillar-1f
+sky-pillar-3f
+sky-pillar-5f
+relic-castle-d
diff --git a/pokeData/clefable b/pokeData/clefable
index c5642e4..e76fdc0 100644
--- a/pokeData/clefable
+++ b/pokeData/clefable
@@ -1,15 +1,24 @@
+clefable	A fairy type Pokémon
 
-Name:  Clefable
-Pokedex Number:  036
-Gender Ratio:   ♂:25% ♀:75%
-Abilities: Cute Charm - Magic Guard - Unaware (Hidden Ability)
+CLEFABLE moves by skipping lightly as if
+it were flying using its wings. Its
+bouncy step lets it even walk on water.It is known to take strolls on lakes on
+quiet, moonlit nights.
 
-Base Stats
-----------------------
-Total: 483
-Hp:  95
-Attack:  70
-Defence:  73
-Special Attack:  95
-Special Defence:  90
-Speed:  60
+   ↞--------| STATS |--------↠ 
+             hp:         95
+         attack:         70
+        defense:         73
+ special-attack:         95
+special-defense:         90
+          speed:         60
+
+Pokedex ID: 36	Capture Rate: 25
+Base Exp: 242	Happiness: 140
+Height: 13	Weight: 400
+
+Genus: Fairy Pokémon
+Location Areas:
+giant-chasm-outside
+giant-chasm-forest
+giant-chasm-forest-cave
diff --git a/pokeData/clefairy b/pokeData/clefairy
index 22b3d53..f4c683c 100644
--- a/pokeData/clefairy
+++ b/pokeData/clefairy
@@ -1,15 +1,45 @@
+clefairy	A fairy type Pokémon
 
-Name:  Clefairy
-Pokedex Number:  035
-Gender Ratio:   ♂:25% ♀:75%
-Abilities: Cute Charm - Magic Guard - Friend Guard (Hidden Ability)
+On every night of a full moon, groups of
+this POKéMON come out to play.
+When dawn arrives, the tired CLEFAIRYreturn to their quiet mountain retreats
+and go to sleep nestled up against each
+other.
 
-Base Stats
-----------------------
-Total: 323
-Hp:  70
-Attack:  45
-Defence:  48
-Special Attack:  60
-Special Defence:  65
-Speed:  35
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         45
+        defense:         48
+ special-attack:         60
+special-defense:         65
+          speed:         35
+
+Pokedex ID: 35	Capture Rate: 150
+Base Exp: 113	Happiness: 140
+Height: 6	Weight: 75
+
+Genus: Fairy Pokémon
+Location Areas:
+mt-coronet-1f-route-207
+mt-coronet-2f
+mt-coronet-3f
+mt-coronet-exterior-snowfall
+mt-coronet-exterior-blizzard
+mt-coronet-4f
+mt-coronet-4f-small-room
+mt-coronet-5f
+mt-coronet-6f
+mt-coronet-1f-from-exterior
+mt-coronet-1f-route-216
+mt-coronet-b1f
+mt-moon-1f
+mt-moon-2f
+kanto-route-3-area
+kanto-route-4-area
+mt-moon-b1f
+mt-moon-b2f
+giant-chasm-outside
+giant-chasm-area
+giant-chasm-forest
+giant-chasm-forest-cave
+johto-safari-zone-zone-meadow
diff --git a/pokeData/cleffa b/pokeData/cleffa
index f0c67cc..c2385a3 100644
--- a/pokeData/cleffa
+++ b/pokeData/cleffa
@@ -1,15 +1,23 @@
+cleffa	A fairy type Pokémon
 
-Name:  Cleffa
-Pokedex Number:  173
-Gender Ratio:   ♂:25% ♀:75%
-Abilities: Cute Charm - Magic Guard - Friend Guard (Hidden Ability)
+Because of its unusual, starlike
+silhouette, people believe that it came
+here on a meteor.
 
-Base Stats
-----------------------
-Total: 218
-Hp:  50
-Attack:  25
-Defence:  28
-Special Attack:  45
-Special Defence:  55
-Speed:  15
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         25
+        defense:         28
+ special-attack:         45
+special-defense:         55
+          speed:         15
+
+Pokedex ID: 173	Capture Rate: 150
+Base Exp: 44	Happiness: 140
+Height: 3	Weight: 30
+
+Genus: Star Shape Pokémon
+Location Areas:
+mt-coronet-1f-route-207
+mt-coronet-1f-route-211
+johto-route-34-area
diff --git a/pokeData/clobbopus b/pokeData/clobbopus
index 3ce03e4..d61559c 100644
--- a/pokeData/clobbopus
+++ b/pokeData/clobbopus
@@ -1,15 +1,21 @@
+clobbopus	A fighting type Pokémon
 
-Name:  Clobbopus
-Pokedex Number:  852
-Gender Ratio:   ♂:50.2% ♀:49.8%
-Abilities: Limber - Technician (Hidden Ability)
+It’s very curious, but its means of investigating
+things is to try to punch them with its tentacles.
+The search for food is what brings it onto land.
+
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         68
+        defense:         60
+ special-attack:         50
+special-defense:         50
+          speed:         32
+
+Pokedex ID: 852	Capture Rate: 180
+Base Exp: 62	Happiness: 50
+Height: 6	Weight: 40
+
+Genus: Tantrum Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 310
-Hp:  50
-Attack:  68
-Defence:  60
-Special Attack:  50
-Special Defence:  50
-Speed:  32
diff --git a/pokeData/cloyster b/pokeData/cloyster
index 58806dd..e8ca7b0 100644
--- a/pokeData/cloyster
+++ b/pokeData/cloyster
@@ -1,15 +1,27 @@
+cloyster	A water type Pokémon
 
-Name:  Cloyster
-Pokedex Number:  091
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Shell Armor - Skill Link - Overcoat (Hidden Ability)
+CLOYSTER is capable of swimming in the
+sea. It does so by swallowing water,
+then jetting it out toward the rear.This POKéMON shoots spikes from its
+shell using the same system.
 
-Base Stats
-----------------------
-Total: 525
-Hp:  50
-Attack:  95
-Defence:  180
-Special Attack:  85
-Special Defence:  45
-Speed:  70
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         95
+        defense:        180
+ special-attack:         85
+special-defense:         45
+          speed:         70
+
+Pokedex ID: 91	Capture Rate: 60
+Base Exp: 184	Happiness: 50
+Height: 15	Weight: 1325
+
+Genus: Bivalve Pokémon
+Location Areas:
+undella-bay-area
+unova-route-13-area
+undella-town-area
+humilau-city-area
+seaside-cave-1f
+kalos-route-8-area
diff --git a/pokeData/coalossal b/pokeData/coalossal
index 1b3db3f..1c0e847 100644
--- a/pokeData/coalossal
+++ b/pokeData/coalossal
@@ -1,15 +1,21 @@
+coalossal	A rock type Pokémon
 
-Name:  Coalossal
-Pokedex Number:  839
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Steam Engine - Flame Body - Flash Fire (Hidden Ability)
+Di solito è tranquillo, ma se gli esseri umani
+danneggiano la sua miniera va su tutte le furie e
+brucia tutto emettendo fiamme a 1.500 ºC.
+
+   ↞--------| STATS |--------↠ 
+             hp:        110
+         attack:         80
+        defense:        120
+ special-attack:         80
+special-defense:         90
+          speed:         30
+
+Pokedex ID: 839	Capture Rate: 45
+Base Exp: 255	Happiness: 50
+Height: 28	Weight: 3105
+
+Genus: Coal Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 510
-Hp:  110
-Attack:  80
-Defence:  120
-Special Attack:  80
-Special Defence:  90
-Speed:  30
diff --git a/pokeData/cobalion b/pokeData/cobalion
index ed990fa..55091b6 100644
--- a/pokeData/cobalion
+++ b/pokeData/cobalion
@@ -1,15 +1,21 @@
+cobalion	A steel type Pokémon
 
-Name:  Cobalion
-Pokedex Number:  638
-Gender Ratio:  Genderless
-Abilities: Justified
+강철의 몸과 마음을 지녔다.
+째려보기만 해도 난폭한
+포켓몬마저도 따르게 된다.
+
+   ↞--------| STATS |--------↠ 
+             hp:         91
+         attack:         90
+        defense:        129
+ special-attack:         90
+special-defense:         72
+          speed:        108
+
+Pokedex ID: 638	Capture Rate: 3
+Base Exp: 290	Happiness: 35
+Height: 21	Weight: 2500
+
+Genus: Iron Will Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 580
-Hp:  91
-Attack:  90
-Defence:  129
-Special Attack:  90
-Special Defence:  72
-Speed:  108
diff --git a/pokeData/cofagrigus b/pokeData/cofagrigus
index c199ff7..db6366f 100644
--- a/pokeData/cofagrigus
+++ b/pokeData/cofagrigus
@@ -1,15 +1,22 @@
+cofagrigus	A ghost type Pokémon
 
-Name:  Cofagrigus
-Pokedex Number:  563
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Mummy
+ちかづいた　にんげんを　のみこんで
+ミイラに　してしまうという　うわさ。
+きんかいを　このんで　たべる。
 
-Base Stats
-----------------------
-Total: 483
-Hp:  58
-Attack:  50
-Defence:  145
-Special Attack:  95
-Special Defence:  105
-Speed:  30
+   ↞--------| STATS |--------↠ 
+             hp:         58
+         attack:         50
+        defense:        145
+ special-attack:         95
+special-defense:        105
+          speed:         30
+
+Pokedex ID: 563	Capture Rate: 90
+Base Exp: 169	Happiness: 50
+Height: 17	Weight: 765
+
+Genus: Coffin Pokémon
+Location Areas:
+relic-castle-b
+relic-castle-c
diff --git a/pokeData/combee b/pokeData/combee
index 78d71dd..e729c3b 100644
--- a/pokeData/combee
+++ b/pokeData/combee
@@ -1,15 +1,23 @@
+combee	A bug type Pokémon
 
-Name:  Combee
-Pokedex Number:  415
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Honey Gather - Hustle (Hidden Ability)
+Ce trio inséparable depuis la
+naissance récolte du miel
+pour satisfaire Apireine.
 
-Base Stats
-----------------------
-Total: 244
-Hp:  30
-Attack:  30
-Defence:  42
-Special Attack:  30
-Special Defence:  42
-Speed:  70
+   ↞--------| STATS |--------↠ 
+             hp:         30
+         attack:         30
+        defense:         42
+ special-attack:         30
+special-defense:         42
+          speed:         70
+
+Pokedex ID: 415	Capture Rate: 120
+Base Exp: 49	Happiness: 50
+Height: 3	Weight: 55
+
+Genus: Tiny Bee Pokémon
+Location Areas:
+unova-route-12-area
+lostlorn-forest-area
+kalos-route-4-area
diff --git a/pokeData/combusken b/pokeData/combusken
index aaa5902..24030ca 100644
--- a/pokeData/combusken
+++ b/pokeData/combusken
@@ -1,15 +1,21 @@
+combusken	A fire type Pokémon
 
-Name:  Combusken
-Pokedex Number:  256
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Blaze - Speed Boost (Hidden Ability)
+Its kicking mastery lets it loose
+10 kicks per second. It emits
+sharp cries to intimidate foes.
+
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         85
+        defense:         60
+ special-attack:         85
+special-defense:         60
+          speed:         55
+
+Pokedex ID: 256	Capture Rate: 45
+Base Exp: 142	Happiness: 50
+Height: 9	Weight: 195
+
+Genus: Young Fowl Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 405
-Hp:  60
-Attack:  85
-Defence:  60
-Special Attack:  85
-Special Defence:  60
-Speed:  55
diff --git a/pokeData/comfey b/pokeData/comfey
index e68b0cc..3878ed4 100644
--- a/pokeData/comfey
+++ b/pokeData/comfey
@@ -1,15 +1,21 @@
+comfey	A fairy type Pokémon
 
-Name:  Comfey
-Pokedex Number:  764
-Gender Ratio:   ♂:24.9% ♀:75.1%
-Abilities: Flower Veil - Triage - Natural Cure (Hidden Ability)
+It attaches flowers to its highly nutritious vine.
+This revitalizes the flowers, and they give off
+an aromatic scent.
+
+   ↞--------| STATS |--------↠ 
+             hp:         51
+         attack:         52
+        defense:         90
+ special-attack:         82
+special-defense:        110
+          speed:        100
+
+Pokedex ID: 764	Capture Rate: 60
+Base Exp: 170	Happiness: 50
+Height: 1	Weight: 3
+
+Genus: Posy Picker Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 485
-Hp:  51
-Attack:  52
-Defence:  90
-Special Attack:  82
-Special Defence:  110
-Speed:  100
diff --git a/pokeData/conkeldurr b/pokeData/conkeldurr
index 1c4ea4b..16cdcbe 100644
--- a/pokeData/conkeldurr
+++ b/pokeData/conkeldurr
@@ -1,15 +1,21 @@
+conkeldurr	A fighting type Pokémon
 
-Name:  Conkeldurr
-Pokedex Number:  534
-Gender Ratio:   ♂:75% ♀:25%
-Abilities: Guts - Sheer Force - Iron Fist (Hidden Ability)
+콘크리트를 만드는 기술은
+2000년 전에 노보청에게
+배운 것이라고 여겨지고 있다.
+
+   ↞--------| STATS |--------↠ 
+             hp:        105
+         attack:        140
+        defense:         95
+ special-attack:         55
+special-defense:         65
+          speed:         45
+
+Pokedex ID: 534	Capture Rate: 45
+Base Exp: 253	Happiness: 50
+Height: 14	Weight: 870
+
+Genus: Muscular Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 505
-Hp:  105
-Attack:  140
-Defence:  95
-Special Attack:  55
-Special Defence:  65
-Speed:  45
diff --git a/pokeData/copperajah b/pokeData/copperajah
index ef1e1c0..a36aa28 100644
--- a/pokeData/copperajah
+++ b/pokeData/copperajah
@@ -1,15 +1,21 @@
+copperajah	A steel type Pokémon
 
-Name:  Copperajah
-Pokedex Number:  879
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Sheer Force - Heavy Metal (Hidden Ability)
+They came over from another region long
+ago and worked together with humans.
+Their green skin is resistant to water.
+
+   ↞--------| STATS |--------↠ 
+             hp:        122
+         attack:        130
+        defense:         69
+ special-attack:         80
+special-defense:         69
+          speed:         30
+
+Pokedex ID: 879	Capture Rate: 90
+Base Exp: 175	Happiness: 50
+Height: 30	Weight: 6500
+
+Genus: Copperderm Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 500
-Hp:  122
-Attack:  130
-Defence:  69
-Special Attack:  80
-Special Defence:  69
-Speed:  30
diff --git a/pokeData/corphish b/pokeData/corphish
index 3ad6928..73181d0 100644
--- a/pokeData/corphish
+++ b/pokeData/corphish
@@ -1,15 +1,28 @@
+corphish	A water type Pokémon
 
-Name:  Corphish
-Pokedex Number:  341
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Hyper Cutter - Shell Armor - Adaptability (Hidden Ability)
+Its hardy vitality enables it to
+adapt to any environment. Its
+pincers will never release prey.
 
-Base Stats
-----------------------
-Total: 308
-Hp:  43
-Attack:  80
-Defence:  65
-Special Attack:  50
-Special Defence:  35
-Speed:  35
+   ↞--------| STATS |--------↠ 
+             hp:         43
+         attack:         80
+        defense:         65
+ special-attack:         50
+special-defense:         35
+          speed:         35
+
+Pokedex ID: 341	Capture Rate: 205
+Base Exp: 62	Happiness: 50
+Height: 6	Weight: 115
+
+Genus: Ruffian Pokémon
+Location Areas:
+celestic-town-area
+petalburg-city-area
+hoenn-route-102-area
+hoenn-route-117-area
+striaton-city-area
+unova-route-3-area
+kalos-route-3-area
+parfum-palace-area
diff --git a/pokeData/corsola b/pokeData/corsola
index 5fbca68..56fe940 100644
--- a/pokeData/corsola
+++ b/pokeData/corsola
@@ -1,15 +1,35 @@
+corsola	A water type Pokémon
 
-Name:  Corsola
-Pokedex Number:  222
-Gender Ratio:   ♂:25% ♀:75% 
-Abilities: Hustle - Natural Cure - Regenerator (Hidden Ability)
+In a south sea nation, the people live in
+communities that are built on groups of
+these POKéMON.
 
-Base Stats
-----------------------
-Total: 380
-Hp:  55
-Attack:  55
-Defence:  85
-Special Attack:  65
-Special Defence:  85
-Speed:  35
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         55
+        defense:         95
+ special-attack:         65
+special-defense:         95
+          speed:         35
+
+Pokedex ID: 222	Capture Rate: 60
+Base Exp: 144	Happiness: 50
+Height: 6	Weight: 50
+
+Genus: Coral Pokémon
+Location Areas:
+sinnoh-sea-route-230-area
+cherrygrove-city-area
+union-cave-b2f
+johto-route-34-area
+olivine-city-area
+johto-sea-route-40-area
+cianwood-city-area
+kanto-sea-route-19-area
+ever-grande-city-area
+hoenn-route-128-area
+unova-route-13-area
+unova-route-18-area
+undella-town-area
+humilau-city-area
+kalos-route-12-area
diff --git a/pokeData/corviknight b/pokeData/corviknight
index dbb63ac..f6b8491 100644
--- a/pokeData/corviknight
+++ b/pokeData/corviknight
@@ -1,15 +1,21 @@
+corviknight	A flying type Pokémon
 
-Name:  Corviknight
-Pokedex Number:  823
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Pressure - Unnerve - Mirror Armor (Hidden Ability)
+This Pokémon reigns supreme in the skies of the
+Galar region. The black luster of its steel body
+could drive terror into the heart of any foe.
+
+   ↞--------| STATS |--------↠ 
+             hp:         98
+         attack:         87
+        defense:        105
+ special-attack:         53
+special-defense:         85
+          speed:         67
+
+Pokedex ID: 823	Capture Rate: 45
+Base Exp: 248	Happiness: 50
+Height: 22	Weight: 750
+
+Genus: Raven Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 495
-Hp:  98
-Attack:  87
-Defence:  105
-Special Attack:  53
-Special Defence:  85
-Speed:  67
diff --git a/pokeData/corvisquire b/pokeData/corvisquire
index 5eab91b..40070ae 100644
--- a/pokeData/corvisquire
+++ b/pokeData/corvisquire
@@ -1,15 +1,21 @@
+corvisquire	A flying type Pokémon
 
-Name:  Corvisquire
-Pokedex Number:  822
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Keen Eye - Unnerve - Big Pecks (Hidden Ability)
+Smart enough to use tools in battle, these
+Pokémon have been seen picking up rocks and
+flinging them or using ropes to wrap up enemies.
+
+   ↞--------| STATS |--------↠ 
+             hp:         68
+         attack:         67
+        defense:         55
+ special-attack:         43
+special-defense:         55
+          speed:         77
+
+Pokedex ID: 822	Capture Rate: 120
+Base Exp: 128	Happiness: 50
+Height: 8	Weight: 160
+
+Genus: Raven Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 365
-Hp:  68
-Attack:  67
-Defence:  55
-Special Attack:  43
-Special Defence:  55
-Speed:  77
diff --git a/pokeData/cosmoem b/pokeData/cosmoem
index eafea5f..dc94355 100644
--- a/pokeData/cosmoem
+++ b/pokeData/cosmoem
@@ -1,15 +1,21 @@
+cosmoem	A psychic type Pokémon
 
-Name:  Cosmoem
-Pokedex Number:  790
-Gender Ratio:  Genderless
-Abilities: Sturdy
+Motionless as if dead, its body is faintly warm to
+the touch. In the distant past, it was called the
+cocoon of the stars.
+
+   ↞--------| STATS |--------↠ 
+             hp:         43
+         attack:         29
+        defense:        131
+ special-attack:         29
+special-defense:        131
+          speed:         37
+
+Pokedex ID: 790	Capture Rate: 45
+Base Exp: 140	Happiness: 0
+Height: 1	Weight: 9999
+
+Genus: Protostar Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 400
-Hp:  43
-Attack:  29
-Defence:  131
-Special Attack:  29
-Special Defence:  131
-Speed:  37
diff --git a/pokeData/cosmog b/pokeData/cosmog
index f165dbd..f3cd232 100644
--- a/pokeData/cosmog
+++ b/pokeData/cosmog
@@ -1,15 +1,20 @@
+cosmog	A psychic type Pokémon
 
-Name:  Cosmog
-Pokedex Number:  789
-Gender Ratio:  Genderless
-Abilities: Unaware
+Its body is gaseous and frail. It slowly grows as
+it collects dust from the atmosphere.
+
+   ↞--------| STATS |--------↠ 
+             hp:         43
+         attack:         29
+        defense:         31
+ special-attack:         29
+special-defense:         31
+          speed:         37
+
+Pokedex ID: 789	Capture Rate: 45
+Base Exp: 40	Happiness: 0
+Height: 2	Weight: 1
+
+Genus: Nebula Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 200
-Hp:  43
-Attack:  29
-Defence:  31
-Special Attack:  29
-Special Defence:  31
-Speed:  37
diff --git a/pokeData/cottonee b/pokeData/cottonee
index c951b1e..b499267 100644
--- a/pokeData/cottonee
+++ b/pokeData/cottonee
@@ -1,15 +1,25 @@
+cottonee	A grass type Pokémon
 
-Name:  Cottonee
-Pokedex Number:  546
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Prankster - Infiltrator - Chlorophyll (Hidden Ability)
+공격당하면 몸에서 솜을
+날린다. 상대가 솜을 소미안으로
+착각하고 있는 동안 도망친다.
 
-Base Stats
-----------------------
-Total: 280
-Hp:  40
-Attack:  27
-Defence:  60
-Special Attack:  37
-Special Defence:  50
-Speed:  66
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         27
+        defense:         60
+ special-attack:         37
+special-defense:         50
+          speed:         66
+
+Pokedex ID: 546	Capture Rate: 190
+Base Exp: 56	Happiness: 50
+Height: 3	Weight: 6
+
+Genus: Cotton Puff Pokémon
+Location Areas:
+pinwheel-forest-inside
+abundant-shrine-area
+lostlorn-forest-area
+castelia-city-area
+unova-victory-road-2-unknown-area-72
diff --git a/pokeData/crabominable b/pokeData/crabominable
index f226867..e1c2d1a 100644
--- a/pokeData/crabominable
+++ b/pokeData/crabominable
@@ -1,15 +1,21 @@
+crabominable	A fighting type Pokémon
 
-Name:  Crabominable
-Pokedex Number:  740
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Hyper Cutter - Iron Fist - Anger Point (Hidden Ability)
+It aimed for the top but got lost and ended up
+on a snowy mountain. Being forced to endure
+the cold, this Pokémon evolved and grew fur.
+
+   ↞--------| STATS |--------↠ 
+             hp:         97
+         attack:        132
+        defense:         77
+ special-attack:         62
+special-defense:         67
+          speed:         43
+
+Pokedex ID: 740	Capture Rate: 60
+Base Exp: 167	Happiness: 70
+Height: 17	Weight: 1800
+
+Genus: Woolly Crab Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 478
-Hp:  97
-Attack:  132
-Defence:  77
-Special Attack:  62
-Special Defence:  67
-Speed:  43
diff --git a/pokeData/crabrawler b/pokeData/crabrawler
index a7a1758..3651357 100644
--- a/pokeData/crabrawler
+++ b/pokeData/crabrawler
@@ -1,15 +1,21 @@
+crabrawler	A fighting type Pokémon
 
-Name:  Crabrawler
-Pokedex Number:  739
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Hyper Cutter - Iron Fist - Anger Point (Hidden Ability)
+While guarding its weak points with its pincers,
+it looks for an opening and unleashes punches.
+When it loses, it foams at the mouth and faints.
+
+   ↞--------| STATS |--------↠ 
+             hp:         47
+         attack:         82
+        defense:         57
+ special-attack:         42
+special-defense:         47
+          speed:         63
+
+Pokedex ID: 739	Capture Rate: 225
+Base Exp: 68	Happiness: 70
+Height: 6	Weight: 70
+
+Genus: Boxing Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 338
-Hp:  47
-Attack:  82
-Defence:  57
-Special Attack:  42
-Special Defence:  47
-Speed:  63
diff --git a/pokeData/cradily b/pokeData/cradily
index 15d0f9b..4c13ec4 100644
--- a/pokeData/cradily
+++ b/pokeData/cradily
@@ -1,15 +1,21 @@
+cradily	A rock type Pokémon
 
-Name:  Cradily
-Pokedex Number:  346
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Suction Cups - Storm Drain (Hidden Ability)
+It lives in the shallows of warm
+seas. When the tide goes out, it
+digs up prey from beaches.
+
+   ↞--------| STATS |--------↠ 
+             hp:         86
+         attack:         81
+        defense:         97
+ special-attack:         81
+special-defense:        107
+          speed:         43
+
+Pokedex ID: 346	Capture Rate: 45
+Base Exp: 173	Happiness: 50
+Height: 15	Weight: 604
+
+Genus: Barnacle Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 495
-Hp:  86
-Attack:  81
-Defence:  97
-Special Attack:  81
-Special Defence:  107
-Speed:  43
diff --git a/pokeData/cramorant b/pokeData/cramorant
index 00f0317..5077eff 100644
--- a/pokeData/cramorant
+++ b/pokeData/cramorant
@@ -1,15 +1,21 @@
+cramorant	A flying type Pokémon
 
-Name:  Cramorant
-Pokedex Number:  845
-Gender Ratio:   ♂:50.2% ♀:49.8% 
-Abilities: Gulp Missile
+It’s so strong that it can knock out some
+opponents in a single hit, but it also may
+forget what it’s battling midfight.
+
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         85
+        defense:         55
+ special-attack:         85
+special-defense:         95
+          speed:         85
+
+Pokedex ID: 845	Capture Rate: 45
+Base Exp: 166	Happiness: 50
+Height: 8	Weight: 180
+
+Genus: Gulp Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 475
-Hp:  70
-Attack:  85
-Defence:  55
-Special Attack:  85
-Special Defence:  95
-Speed:  85
diff --git a/pokeData/cranidos b/pokeData/cranidos
index a3224ce..3122bfd 100644
--- a/pokeData/cranidos
+++ b/pokeData/cranidos
@@ -1,15 +1,21 @@
+cranidos	A rock type Pokémon
 
-Name:  Cranidos
-Pokedex Number:  408
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Mold Breaker - Sheer Force (Hidden Ability)
+Il vivait dans la jungle il y a
+100 millions d’années. Il abat
+un arbre d’un coup de tête.
+
+   ↞--------| STATS |--------↠ 
+             hp:         67
+         attack:        125
+        defense:         40
+ special-attack:         30
+special-defense:         30
+          speed:         58
+
+Pokedex ID: 408	Capture Rate: 45
+Base Exp: 70	Happiness: 70
+Height: 9	Weight: 315
+
+Genus: Head Butt Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 350
-Hp:  67
-Attack:  125
-Defence:  40
-Special Attack:  30
-Special Defence:  30
-Speed:  58
diff --git a/pokeData/crawdaunt b/pokeData/crawdaunt
index 2412a16..c015c05 100644
--- a/pokeData/crawdaunt
+++ b/pokeData/crawdaunt
@@ -1,15 +1,25 @@
+crawdaunt	A water type Pokémon
 
-Name:  Crawdaunt
-Pokedex Number:  342
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Hyper Cutter - Shell Armor - Adaptability (Hidden Ability)
+It is a ruffian that uses its
+pincers to pick up and toss out
+other Pokémon from its pond.
 
-Base Stats
-----------------------
-Total: 468
-Hp:  63
-Attack:  120
-Defence:  85
-Special Attack:  90
-Special Defence:  55
-Speed:  55
+   ↞--------| STATS |--------↠ 
+             hp:         63
+         attack:        120
+        defense:         85
+ special-attack:         90
+special-defense:         55
+          speed:         55
+
+Pokedex ID: 342	Capture Rate: 155
+Base Exp: 164	Happiness: 50
+Height: 11	Weight: 328
+
+Genus: Rogue Pokémon
+Location Areas:
+celestic-town-area
+striaton-city-area
+unova-route-3-area
+kalos-route-3-area
+parfum-palace-area
diff --git a/pokeData/cresselia b/pokeData/cresselia
index 443c071..8675ade 100644
--- a/pokeData/cresselia
+++ b/pokeData/cresselia
@@ -1,15 +1,21 @@
+cresselia	A psychic type Pokémon
 
-Name:  Cresselia
-Pokedex Number:  488
-Gender Ratio:   ♂:0% ♀:100%
-Abilities: Levitate
+Les nuits où le premier croissant
+de lune est visible, l’arc de sa
+queue se déploie de façon superbe.
 
-Base Stats
-----------------------
-Total: 600
-Hp:  120
-Attack:  70
-Defence:  120
-Special Attack:  75
-Special Defence:  130
-Speed:  85
+   ↞--------| STATS |--------↠ 
+             hp:        120
+         attack:         70
+        defense:        120
+ special-attack:         75
+special-defense:        130
+          speed:         85
+
+Pokedex ID: 488	Capture Rate: 3
+Base Exp: 300	Happiness: 100
+Height: 15	Weight: 856
+
+Genus: Lunar Pokémon
+Location Areas:
+roaming-sinnoh-area
diff --git a/pokeData/croagunk b/pokeData/croagunk
index c24bd3d..55e91d8 100644
--- a/pokeData/croagunk
+++ b/pokeData/croagunk
@@ -1,15 +1,25 @@
+croagunk	A poison type Pokémon
 
-Name:  Croagunk
-Pokedex Number:  453
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Anticipation - Dry Skin - Poison Touch (Hidden Ability)
+Son instinct de survie le pousse à
+ne pas se battre dans les règles.
+C’est une mascotte populaire.
 
-Base Stats
-----------------------
-Total: 300
-Hp:  48
-Attack:  61
-Defence:  40
-Special Attack:  61
-Special Defence:  40
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:         48
+         attack:         61
+        defense:         40
+ special-attack:         61
+special-defense:         40
+          speed:         50
+
+Pokedex ID: 453	Capture Rate: 140
+Base Exp: 60	Happiness: 100
+Height: 7	Weight: 230
+
+Genus: Toxic Mouth Pokémon
+Location Areas:
+sinnoh-route-212-east-towards-pastoria-city
+icirrus-city-area
+unova-route-8-area
+moor-of-icirrus-area
+kalos-route-7-area
diff --git a/pokeData/crobat b/pokeData/crobat
index 6fc4f79..eae5f58 100644
--- a/pokeData/crobat
+++ b/pokeData/crobat
@@ -1,15 +1,23 @@
+crobat	A poison type Pokémon
 
-Name:  Crobat
-Pokedex Number:  169
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Inner Focus - Infiltrator (Hidden Ability)
+It flies so silently through the dark on
+its four wings that it may not be noticed
+even when nearby.
 
-Base Stats
-----------------------
-Total: 535
-Hp:  85
-Attack:  90
-Defence:  80
-Special Attack:  70
-Special Defence:  80
-Speed:  130
+   ↞--------| STATS |--------↠ 
+             hp:         85
+         attack:         90
+        defense:         80
+ special-attack:         70
+special-defense:         80
+          speed:        130
+
+Pokedex ID: 169	Capture Rate: 90
+Base Exp: 268	Happiness: 50
+Height: 18	Weight: 750
+
+Genus: Bat Pokémon
+Location Areas:
+dreamyard-area
+giant-chasm-outside
+unova-route-13-area
diff --git a/pokeData/croconaw b/pokeData/croconaw
index b27701f..5fa6b25 100644
--- a/pokeData/croconaw
+++ b/pokeData/croconaw
@@ -1,15 +1,21 @@
+croconaw	A water type Pokémon
 
-Name:  Croconaw
-Pokedex Number:  159
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Torrent - Sheer Force (Hidden Ability)
+If it loses a fang, a new one grows back
+in its place. There are always 48 fangs
+lining its mouth.
+
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         80
+        defense:         80
+ special-attack:         59
+special-defense:         63
+          speed:         58
+
+Pokedex ID: 159	Capture Rate: 45
+Base Exp: 142	Happiness: 70
+Height: 11	Weight: 250
+
+Genus: Big Jaw Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 405
-Hp:  65
-Attack:  80
-Defence:  80
-Special Attack:  59
-Special Defence:  63
-Speed:  58
diff --git a/pokeData/crustle b/pokeData/crustle
index da5157d..9f13493 100644
--- a/pokeData/crustle
+++ b/pokeData/crustle
@@ -1,15 +1,21 @@
+crustle	A bug type Pokémon
 
-Name:  Crustle
-Pokedex Number:  558
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Sturdy - Shell Armor - Weak Armor (Hidden Ability)
+무거운 바위를 등에 지고
+며칠이고 건조한 땅을
+이동할 수 있는 다릿심을 가지고 있다.
 
-Base Stats
-----------------------
-Total: 475
-Hp:  70
-Attack:  95
-Defence:  125
-Special Attack:  65
-Special Defence:  75
-Speed:  45
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:        105
+        defense:        125
+ special-attack:         65
+special-defense:         75
+          speed:         45
+
+Pokedex ID: 558	Capture Rate: 75
+Base Exp: 170	Happiness: 50
+Height: 14	Weight: 2000
+
+Genus: Stone Home Pokémon
+Location Areas:
+unova-route-18-area
diff --git a/pokeData/cryogonal b/pokeData/cryogonal
index 848ecda..6048cdb 100644
--- a/pokeData/cryogonal
+++ b/pokeData/cryogonal
@@ -1,15 +1,25 @@
+cryogonal	A ice type Pokémon
 
-Name:  Cryogonal
-Pokedex Number:  615
-Gender Ratio:  Genderless
-Abilities: Levitate
+ゆきぐもの　なかで　うまれた。
+こおりの　けっしょうで　できた
+くさりで　えものを　つかまえる。
 
-Base Stats
-----------------------
-Total: 485
-Hp:  70
-Attack:  50
-Defence:  30
-Special Attack:  95
-Special Defence:  135
-Speed:  105
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:         50
+        defense:         50
+ special-attack:         95
+special-defense:        135
+          speed:        105
+
+Pokedex ID: 615	Capture Rate: 25
+Base Exp: 180	Happiness: 50
+Height: 11	Weight: 1480
+
+Genus: Crystallizing Pokémon
+Location Areas:
+twist-mountain-area
+frost-cavern-unknown-area-314
+frost-cavern-unknown-area-315
+frost-cavern-unknown-area-316
+frost-cavern-unknown-area-317
diff --git a/pokeData/cubchoo b/pokeData/cubchoo
index 2ecc54a..44e556b 100644
--- a/pokeData/cubchoo
+++ b/pokeData/cubchoo
@@ -1,15 +1,24 @@
+cubchoo	A ice type Pokémon
 
-Name:  Cubchoo
-Pokedex Number:  613
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Snow Cloak - Rattled (Hidden Ability)
+언제나 콧물을 달고 다닌다.
+콧물을 훌쩍거려 기술을 사용한다.
+콧물이 기술의 재료인 셈이다.
 
-Base Stats
-----------------------
-Total: 305
-Hp:  55
-Attack:  70
-Defence:  40
-Special Attack:  60
-Special Defence:  40
-Speed:  40
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         70
+        defense:         40
+ special-attack:         60
+special-defense:         40
+          speed:         40
+
+Pokedex ID: 613	Capture Rate: 120
+Base Exp: 61	Happiness: 50
+Height: 5	Weight: 85
+
+Genus: Chill Pokémon
+Location Areas:
+twist-mountain-area
+dragonspiral-tower-entrance
+dragonspiral-tower-outside
+unova-route-7-area
diff --git a/pokeData/cubone b/pokeData/cubone
index 7123fe0..e5402c3 100644
--- a/pokeData/cubone
+++ b/pokeData/cubone
@@ -1,15 +1,35 @@
+cubone	A ground type Pokémon
 
-Name:  Cubone
-Pokedex Number:  104
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Rock Head - Lightningrod - Battle Armor (Hidden Ability)
+CUBONE pines for the mother it will
+never see again. Seeing a likeness of
+its mother in the full moon, it cries.The stains on the skull the POKéMON
+wears are made by the tears it sheds.
 
-Base Stats
-----------------------
-Total: 320
-Hp:  50
-Attack:  50
-Defence:  95
-Special Attack:  40
-Special Defence:  50
-Speed:  35
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         50
+        defense:         95
+ special-attack:         40
+special-defense:         50
+          speed:         35
+
+Pokedex ID: 104	Capture Rate: 190
+Base Exp: 64	Happiness: 50
+Height: 4	Weight: 65
+
+Genus: Lonely Pokémon
+Location Areas:
+sinnoh-route-203-area
+rock-tunnel-1f
+rock-tunnel-b1f
+pokemon-tower-3f
+pokemon-tower-4f
+pokemon-tower-5f
+pokemon-tower-6f
+pokemon-tower-7f
+kanto-safari-zone-area-1-east
+kanto-safari-zone-area-2-north
+kanto-safari-zone-area-3-west
+sevault-canyon-area
+glittering-cave-unknown-area-303
+johto-safari-zone-zone-desert
diff --git a/pokeData/cufant b/pokeData/cufant
index e3cbbf8..c2e4856 100644
--- a/pokeData/cufant
+++ b/pokeData/cufant
@@ -1,15 +1,21 @@
+cufant	A steel type Pokémon
 
-Name:  Cufant
-Pokedex Number:  878
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Sheer Force - Heavy Metal (Hidden Ability)
+It digs up the ground with its trunk. It’s also very
+strong, being able to carry loads of over
+five tons without any problem at all.
+
+   ↞--------| STATS |--------↠ 
+             hp:         72
+         attack:         80
+        defense:         49
+ special-attack:         40
+special-defense:         49
+          speed:         40
+
+Pokedex ID: 878	Capture Rate: 190
+Base Exp: 66	Happiness: 50
+Height: 12	Weight: 1000
+
+Genus: Copperderm Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 330
-Hp:  72
-Attack:  80
-Defence:  49
-Special Attack:  40
-Special Defence:  49
-Speed:  40
diff --git a/pokeData/cursola b/pokeData/cursola
index c91c181..8fc4edf 100644
--- a/pokeData/cursola
+++ b/pokeData/cursola
@@ -1,15 +1,21 @@
+cursola	A ghost type Pokémon
 
-Name:  Cursola
-Pokedex Number:  864
-Gender Ratio:   ♂:24.9% ♀:75.1%
-Abilities: Weak Armor - Perish Body (Hidden Ability)
+Its shell is overflowing with its heightened
+otherworldly energy. The ectoplasm serves as
+protection for this Pokémon’s core spirit.
+
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         95
+        defense:         50
+ special-attack:        145
+special-defense:        130
+          speed:         30
+
+Pokedex ID: 864	Capture Rate: 30
+Base Exp: 179	Happiness: 50
+Height: 10	Weight: 4
+
+Genus: Coral Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 510
-Hp:  60
-Attack:  95
-Defence:  50
-Special Attack:  145
-Special Defence:  130
-Speed:  30
diff --git a/pokeData/cutiefly b/pokeData/cutiefly
index edee165..4306318 100644
--- a/pokeData/cutiefly
+++ b/pokeData/cutiefly
@@ -1,15 +1,21 @@
+cutiefly	A bug type Pokémon
 
-Name:  Cutiefly
-Pokedex Number:  742
-Gender Ratio:   ♂:50.2% ♀:49.8% 
-Abilities: Honey Gather - Shield Dust - Sweet Veil (Hidden Ability)
+It feeds on the nectar and pollen of flowers.
+Because it’s able to sense auras, it can identify
+which flowers are about to bloom.
+
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         45
+        defense:         40
+ special-attack:         55
+special-defense:         40
+          speed:         84
+
+Pokedex ID: 742	Capture Rate: 190
+Base Exp: 61	Happiness: 50
+Height: 1	Weight: 2
+
+Genus: Bee Fly Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 304
-Hp:  40
-Attack:  45
-Defence:  40
-Special Attack:  55
-Special Defence:  40
-Speed:  84
diff --git a/pokeData/cyndaquil b/pokeData/cyndaquil
index a6a8a33..1623bc0 100644
--- a/pokeData/cyndaquil
+++ b/pokeData/cyndaquil
@@ -1,15 +1,25 @@
+cyndaquil	A fire type Pokémon
 
-Name:  Cyndaquil
-Pokedex Number:  155
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Blaze - Flash Fire (Hidden Ability)
+CYNDAQUIL protects itself by flaring up
+the flames on its back.
+The flames are vigorous if the POKéMONis angry. However, if it is tired, the
+flames splutter fitfully with incomplete
+combustion.
 
-Base Stats
-----------------------
-Total: 309
-Hp:  39
-Attack:  52
-Defence:  43
-Special Attack:  60
-Special Defence:  50
-Speed:  65
+   ↞--------| STATS |--------↠ 
+             hp:         39
+         attack:         52
+        defense:         43
+ special-attack:         60
+special-defense:         50
+          speed:         65
+
+Pokedex ID: 155	Capture Rate: 45
+Base Exp: 62	Happiness: 70
+Height: 5	Weight: 79
+
+Genus: Fire Mouse Pokémon
+Location Areas:
+new-bark-town-area
+hoenn-route-101-area
+littleroot-town-area
diff --git a/pokeData/darkrai b/pokeData/darkrai
index aed56da..2b6b723 100644
--- a/pokeData/darkrai
+++ b/pokeData/darkrai
@@ -1,15 +1,21 @@
+darkrai	A dark type Pokémon
 
-Name:  Darkrai
-Pokedex Number:  491
-Gender Ratio:  Genderless
-Abilities: Bad Dreams
+Menacé, ce Pokémon se protège
+en créant des cauchemars dans
+l’esprit de ses ennemis.
 
-Base Stats
-----------------------
-Total: 600
-Hp:  70
-Attack:  90
-Defence:  90
-Special Attack:  135
-Special Defence:  90
-Speed:  125
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         90
+        defense:         90
+ special-attack:        135
+special-defense:         90
+          speed:        125
+
+Pokedex ID: 491	Capture Rate: 3
+Base Exp: 270	Happiness: 0
+Height: 15	Weight: 505
+
+Genus: Pitch-Black Pokémon
+Location Areas:
+newmoon-island-area
diff --git a/pokeData/darmanitan b/pokeData/darmanitan
index 08a957b..cdddeaa 100644
--- a/pokeData/darmanitan
+++ b/pokeData/darmanitan
@@ -1,15 +1,15 @@
+	A  type Pokémon
 
-Name:  Darmanitan
-Pokedex Number:  555
-Gender Ratio:  
-Abilities: Sheer Force - Zen Mode (Hidden Ability)
+격렬한 싸움으로 상처 입으면
+바위처럼 굳어져 묵상하며
+마음을 연마한다.
+
+   ↞--------| STATS |--------↠ 
+
+Pokedex ID: 	Capture Rate: 60
+Base Exp: 	Happiness: 50
+Height: 	Weight: 
+
+Genus: Blazing Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 480
-Hp:  105
-Attack:  30
-Defence:  105
-Special Attack:  140
-Special Defence:  105
-Speed:  55
diff --git a/pokeData/dartrix b/pokeData/dartrix
index 0fbfaa8..7037cd8 100644
--- a/pokeData/dartrix
+++ b/pokeData/dartrix
@@ -1,15 +1,21 @@
+dartrix	A grass type Pokémon
 
-Name:  Dartrix
-Pokedex Number:  723
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Overgrow - Long Reach (Hidden Ability)
+A bit of a dandy, it spends its free time
+preening its wings. Its preoccupation with any
+dirt on its plumage can leave it unable to battle.
+
+   ↞--------| STATS |--------↠ 
+             hp:         78
+         attack:         75
+        defense:         75
+ special-attack:         70
+special-defense:         70
+          speed:         52
+
+Pokedex ID: 723	Capture Rate: 45
+Base Exp: 147	Happiness: 50
+Height: 7	Weight: 160
+
+Genus: Blade Quill Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 420
-Hp:  78
-Attack:  75
-Defence:  75
-Special Attack:  70
-Special Defence:  70
-Speed:  52
diff --git a/pokeData/darumaka b/pokeData/darumaka
index 857c2ea..a1febab 100644
--- a/pokeData/darumaka
+++ b/pokeData/darumaka
@@ -1,15 +1,23 @@
+darumaka	A fire type Pokémon
 
-Name:  Darumaka
-Pokedex Number:  554
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Hustle - Inner Focus (Hidden Ability)
+달막화의 배설물은 뜨거워서
+옛날 사람은 품에 넣고
+몸을 따뜻하게 하는 데 사용했다.
 
-Base Stats
-----------------------
-Total: 315
-Hp:  70
-Attack:  90
-Defence:  45
-Special Attack:  15
-Special Defence:  45
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         90
+        defense:         45
+ special-attack:         15
+special-defense:         45
+          speed:         50
+
+Pokedex ID: 554	Capture Rate: 120
+Base Exp: 63	Happiness: 50
+Height: 6	Weight: 375
+
+Genus: Zen Charm Pokémon
+Location Areas:
+desert-resort-entrance
+desert-resort-area
+unova-route-4-area
diff --git a/pokeData/decidueye b/pokeData/decidueye
index f286a77..4981803 100644
--- a/pokeData/decidueye
+++ b/pokeData/decidueye
@@ -1,15 +1,21 @@
+decidueye	A grass type Pokémon
 
-Name:  Decidueye
-Pokedex Number:  724
-Gender Ratio:  
-Abilities: Overgrow - Long Reach (Hidden) (Normal Forme) - Overgrow- Scrappy (Hidden)  (Hisuian Form
+It fires arrow quills from its wings with such
+precision, they can pierce a pebble at distances
+over a hundred yards.
+
+   ↞--------| STATS |--------↠ 
+             hp:         78
+         attack:        107
+        defense:         75
+ special-attack:        100
+special-defense:        100
+          speed:         70
+
+Pokedex ID: 724	Capture Rate: 45
+Base Exp: 265	Happiness: 50
+Height: 16	Weight: 366
+
+Genus: Arrow Quill Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 530
-Hp:  88
-Attack:  112
-Defence:  80
-Special Attack:  95
-Special Defence:  95
-Speed:  60
diff --git a/pokeData/dedenne b/pokeData/dedenne
index ccb21b4..7a35f41 100644
--- a/pokeData/dedenne
+++ b/pokeData/dedenne
@@ -1,15 +1,21 @@
+dedenne	A electric type Pokémon
 
-Name:  Dedenne
-Pokedex Number:  702
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Cheek Pouch - Pickup - Plus (Hidden Ability)
+Its whiskers serve as antennas. By sending and
+receiving electrical waves, it can communicate
+with others over vast distances.
 
-Base Stats
-----------------------
-Total: 431
-Hp:  67
-Attack:  58
-Defence:  57
-Special Attack:  81
-Special Defence:  67
-Speed:  101
+   ↞--------| STATS |--------↠ 
+             hp:         67
+         attack:         58
+        defense:         57
+ special-attack:         81
+special-defense:         67
+          speed:        101
+
+Pokedex ID: 702	Capture Rate: 180
+Base Exp: 151	Happiness: 50
+Height: 2	Weight: 22
+
+Genus: Antenna Pokémon
+Location Areas:
+kalos-route-11-area
diff --git a/pokeData/deerling b/pokeData/deerling
index 403f359..73ddfa1 100644
--- a/pokeData/deerling
+++ b/pokeData/deerling
@@ -1,15 +1,25 @@
+deerling	A normal type Pokémon
 
-Name:  Deerling
-Pokedex Number:  585
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Chlorophyll - Sap Sipper - Serene Grace (Hidden Ability)
+계절이 바뀌었을 때뿐 아니라
+기온이나 습도에 따라서도
+몸의 색깔은 조금 변한다.
 
-Base Stats
-----------------------
-Total: 335
-Hp:  60
-Attack:  60
-Defence:  50
-Special Attack:  40
-Special Defence:  50
-Speed:  75
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         60
+        defense:         50
+ special-attack:         40
+special-defense:         50
+          speed:         75
+
+Pokedex ID: 585	Capture Rate: 190
+Base Exp: 67	Happiness: 70
+Height: 6	Weight: 195
+
+Genus: Season Pokémon
+Location Areas:
+dragonspiral-tower-entrance
+dragonspiral-tower-outside
+unova-route-6-area
+unova-route-7-area
+unova-route-6-weather-institute
diff --git a/pokeData/deino b/pokeData/deino
index 2e28af5..2e7c63b 100644
--- a/pokeData/deino
+++ b/pokeData/deino
@@ -1,15 +1,22 @@
+deino	A dark type Pokémon
 
-Name:  Deino
-Pokedex Number:  633
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Hustle
+눈이 보이지 않아서 몸통박치기나
+물기로 주변을 살핀다.
+몸에 상처가 끊이지 않는다.
 
-Base Stats
-----------------------
-Total: 300
-Hp:  52
-Attack:  65
-Defence:  50
-Special Attack:  45
-Special Defence:  50
-Speed:  38
+   ↞--------| STATS |--------↠ 
+             hp:         52
+         attack:         65
+        defense:         50
+ special-attack:         45
+special-defense:         50
+          speed:         38
+
+Pokedex ID: 633	Capture Rate: 45
+Base Exp: 60	Happiness: 35
+Height: 8	Weight: 173
+
+Genus: Irate Pokémon
+Location Areas:
+unova-victory-road-unknown-area-53
+unova-victory-road-unknown-area-58
diff --git a/pokeData/delcatty b/pokeData/delcatty
index ef489e9..3f256b7 100644
--- a/pokeData/delcatty
+++ b/pokeData/delcatty
@@ -1,15 +1,21 @@
+delcatty	A normal type Pokémon
 
-Name:  Delcatty
-Pokedex Number:  301
-Gender Ratio:   ♂:25% ♀:75%
-Abilities: Cute Charm - Normalize - Wonder Skin  (Hidden Ability)
+It is highly popular among female
+Trainers for its sublime fur.
+It does not keep a nest.
 
-Base Stats
-----------------------
-Total: 380
-Hp:  70
-Attack:  65
-Defence:  65
-Special Attack:  55
-Special Defence:  55
-Speed:  70
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         65
+        defense:         65
+ special-attack:         55
+special-defense:         55
+          speed:         90
+
+Pokedex ID: 301	Capture Rate: 60
+Base Exp: 140	Happiness: 70
+Height: 11	Weight: 326
+
+Genus: Prim Pokémon
+Location Areas:
+castelia-city-area
diff --git a/pokeData/delibird b/pokeData/delibird
index deb4081..c5fdfd2 100644
--- a/pokeData/delibird
+++ b/pokeData/delibird
@@ -1,15 +1,34 @@
+delibird	A ice type Pokémon
 
-Name:  Delibird
-Pokedex Number:  225
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Vital Spirit - Hustle - Insomnia (Hidden Ability)
+It carries food all day long. There are
+tales about lost people who were saved
+by the food it had.
 
-Base Stats
-----------------------
-Total: 330
-Hp:  45
-Attack:  55
-Defence:  45
-Special Attack:  65
-Special Defence:  45
-Speed:  75
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         55
+        defense:         45
+ special-attack:         65
+special-defense:         45
+          speed:         75
+
+Pokedex ID: 225	Capture Rate: 45
+Base Exp: 116	Happiness: 50
+Height: 9	Weight: 160
+
+Genus: Delivery Pokémon
+Location Areas:
+sinnoh-route-216-area
+sinnoh-route-217-area
+ice-path-1f
+ice-path-b1f
+ice-path-b2f
+ice-path-b3f
+icefall-cave-1f
+icefall-cave-b1f
+giant-chasm-outside
+giant-chasm-area
+giant-chasm-forest
+giant-chasm-forest-cave
+unova-route-22-area
+kalos-route-17-area
diff --git a/pokeData/delphox b/pokeData/delphox
index 9bb899c..1e602f1 100644
--- a/pokeData/delphox
+++ b/pokeData/delphox
@@ -1,15 +1,21 @@
+delphox	A fire type Pokémon
 
-Name:  Delphox
-Pokedex Number:  655
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Blaze - Magician (Hidden Ability)
+杖の　先端で　燃える　炎を　見つめて
+精神統一すると
+未来の　出来事を　見通せる。
+
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:         69
+        defense:         72
+ special-attack:        114
+special-defense:        100
+          speed:        104
+
+Pokedex ID: 655	Capture Rate: 45
+Base Exp: 240	Happiness: 70
+Height: 15	Weight: 390
+
+Genus: Fox Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 534
-Hp:  75
-Attack:  69
-Defence:  72
-Special Attack:  114
-Special Defence:  100
-Speed:  104
diff --git a/pokeData/deoxys b/pokeData/deoxys
index 8e66967..93652cc 100644
--- a/pokeData/deoxys
+++ b/pokeData/deoxys
@@ -1,15 +1,15 @@
+	A  type Pokémon
 
-Name:  Deoxys
-Pokedex Number:  386
-Gender Ratio:  Genderless
-Abilities: Pressure
+An alien virus that fell to earth
+on a meteor underwent a DNA
+mutation to become this Pokémon.
+
+   ↞--------| STATS |--------↠ 
+
+Pokedex ID: 	Capture Rate: 3
+Base Exp: 	Happiness: 0
+Height: 	Weight: 
+
+Genus: DNA Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 600
-Hp:  50
-Attack:  95
-Defence:  90
-Special Attack:  95
-Special Defence:  90
-Speed:  180
diff --git a/pokeData/dewgong b/pokeData/dewgong
index 9001796..53bdc12 100644
--- a/pokeData/dewgong
+++ b/pokeData/dewgong
@@ -1,15 +1,32 @@
+dewgong	A water type Pokémon
 
-Name:  Dewgong
-Pokedex Number:  087
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Thick Fat - Hydration - Ice Body (Hidden Ability)
+DEWGONG loves to snooze on bitterly
+cold ice.
+The sight of this POKéMON sleeping ona glacier was mistakenly thought to be
+a mermaid by a mariner long ago.
 
-Base Stats
-----------------------
-Total: 475
-Hp:  90
-Attack:  70
-Defence:  80
-Special Attack:  70
-Special Defence:  95
-Speed:  70
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:         70
+        defense:         80
+ special-attack:         70
+special-defense:         95
+          speed:         70
+
+Pokedex ID: 87	Capture Rate: 75
+Base Exp: 166	Happiness: 70
+Height: 17	Weight: 1200
+
+Genus: Sea Lion Pokémon
+Location Areas:
+sinnoh-victory-road-inside-b1f
+sinnoh-sea-route-226-area
+sinnoh-sea-route-230-area
+seafoam-islands-b1f
+seafoam-islands-b3f
+seafoam-islands-b4f
+icefall-cave-entrance
+icefall-cave-waterfall
+giant-chasm-area
+giant-chasm-forest-cave
+seaside-cave-1f
diff --git a/pokeData/dewott b/pokeData/dewott
index faf3fd5..e1ebedf 100644
--- a/pokeData/dewott
+++ b/pokeData/dewott
@@ -1,15 +1,21 @@
+dewott	A water type Pokémon
 
-Name:  Dewott
-Pokedex Number:  502
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Torrent - Shell Armor (Hidden Ability)
+물 흐르는 듯한 칼솜씨로
+2개의 가리비칼을 사용하는 기술은
+엄격한 수련을 통해 익힌 것이다.
+
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:         75
+        defense:         60
+ special-attack:         83
+special-defense:         60
+          speed:         60
+
+Pokedex ID: 502	Capture Rate: 45
+Base Exp: 145	Happiness: 70
+Height: 8	Weight: 245
+
+Genus: Discipline Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 413
-Hp:  75
-Attack:  75
-Defence:  60
-Special Attack:  83
-Special Defence:  60
-Speed:  60
diff --git a/pokeData/dewpider b/pokeData/dewpider
index dc2fb3c..b85a6b5 100644
--- a/pokeData/dewpider
+++ b/pokeData/dewpider
@@ -1,15 +1,21 @@
+dewpider	A water type Pokémon
 
-Name:  Dewpider
-Pokedex Number:  751
-Gender Ratio:   ♂:50.2% ♀:49.8% 
-Abilities: Water Bubble - Water Absorb (Hidden Ability)
+It crawls onto the land in search of food.
+Its water bubble allows it to breathe and
+protects its soft head.
+
+   ↞--------| STATS |--------↠ 
+             hp:         38
+         attack:         40
+        defense:         52
+ special-attack:         40
+special-defense:         72
+          speed:         27
+
+Pokedex ID: 751	Capture Rate: 200
+Base Exp: 54	Happiness: 50
+Height: 3	Weight: 40
+
+Genus: Water Bubble Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 269
-Hp:  38
-Attack:  40
-Defence:  52
-Special Attack:  40
-Special Defence:  72
-Speed:  27
diff --git a/pokeData/dhelmise b/pokeData/dhelmise
index 46989bd..81b910f 100644
--- a/pokeData/dhelmise
+++ b/pokeData/dhelmise
@@ -1,15 +1,21 @@
+dhelmise	A ghost type Pokémon
 
-Name:  Dhelmise
-Pokedex Number:  781
-Gender Ratio:  Genderless
-Abilities: Steelworker
+Swinging its massive anchor, it can KO Wailord
+in a single blow. What appears to be green
+seaweed is actually its body.
+
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:        131
+        defense:        100
+ special-attack:         86
+special-defense:         90
+          speed:         40
+
+Pokedex ID: 781	Capture Rate: 25
+Base Exp: 181	Happiness: 50
+Height: 39	Weight: 2100
+
+Genus: Sea Creeper Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 517
-Hp:  70
-Attack:  131
-Defence:  100
-Special Attack:  86
-Special Defence:  90
-Speed:  40
diff --git a/pokeData/dialga b/pokeData/dialga
index 80e4b79..e0dd5d6 100644
--- a/pokeData/dialga
+++ b/pokeData/dialga
@@ -1,15 +1,22 @@
+dialga	A steel type Pokémon
 
-Name:  Dialga
-Pokedex Number:  483
-Gender Ratio:  Genderless
-Abilities: Pressure - Telepathy (Hidden Ability)
+On dit que le temps s’écoule au
+rythme des battements de cœur de
+ce Pokémon légendaire de Sinnoh.
 
-Base Stats
-----------------------
-Total: 680
-Hp:  100
-Attack:  120
-Defence:  120
-Special Attack:  150
-Special Defence:  100
-Speed:  90
+   ↞--------| STATS |--------↠ 
+             hp:        100
+         attack:        120
+        defense:        120
+ special-attack:        150
+special-defense:        100
+          speed:         90
+
+Pokedex ID: 483	Capture Rate: 3
+Base Exp: 340	Happiness: 0
+Height: 54	Weight: 6830
+
+Genus: Temporal Pokémon
+Location Areas:
+spear-pillar-area
+sinjoh-ruins-area
diff --git a/pokeData/diancie b/pokeData/diancie
index a5c864b..e7ca2de 100644
--- a/pokeData/diancie
+++ b/pokeData/diancie
@@ -1,15 +1,21 @@
+diancie	A rock type Pokémon
 
-Name:  Diancie
-Pokedex Number:  719
-Gender Ratio:  Genderless
-Abilities: Clear Body
+メレシーの　突然変異。
+ピンク色に　輝く　体は
+世界一　美しいと　言われる。
+
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:        100
+        defense:        150
+ special-attack:        100
+special-defense:        150
+          speed:         50
+
+Pokedex ID: 719	Capture Rate: 3
+Base Exp: 300	Happiness: 50
+Height: 7	Weight: 88
+
+Genus: Jewel Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 600
-Hp:  50
-Attack:  160
-Defence:  110
-Special Attack:  160
-Special Defence:  110
-Speed:  110
diff --git a/pokeData/diggersby b/pokeData/diggersby
index 70cbbed..5eeb105 100644
--- a/pokeData/diggersby
+++ b/pokeData/diggersby
@@ -1,15 +1,21 @@
+diggersby	A normal type Pokémon
 
-Name:  Diggersby
-Pokedex Number:  660
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Pickup - Cheek Pouch - Huge Power (Hidden Ability)
+大きな　耳は　１トンを　超える 岩を
+楽に　持ち上げる　パワー。
+工事現場で　大活躍する。
 
-Base Stats
-----------------------
-Total: 423
-Hp:  85
-Attack:  56
-Defence:  77
-Special Attack:  50
-Special Defence:  77
-Speed:  78
+   ↞--------| STATS |--------↠ 
+             hp:         85
+         attack:         56
+        defense:         77
+ special-attack:         50
+special-defense:         77
+          speed:         78
+
+Pokedex ID: 660	Capture Rate: 127
+Base Exp: 148	Happiness: 50
+Height: 10	Weight: 424
+
+Genus: Digging Pokémon
+Location Areas:
+kalos-route-22-area
diff --git a/pokeData/diglett b/pokeData/diglett
index b1954b7..a065df6 100644
--- a/pokeData/diglett
+++ b/pokeData/diglett
@@ -1,15 +1,26 @@
+diglett	A ground type Pokémon
 
-Name:  Diglett
-Pokedex Number:  050
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Sand Veil - Arena Trap - Sand Force (Hidden Ability)
+DIGLETT are raised in most farms.
+The reason is simple - wherever this
+POKéMON burrows, the soil is leftperfectly tilled for planting crops.
+This soil is made ideal for growing
+delicious vegetables.
 
-Base Stats
-----------------------
-Total: 265
-Hp:  10
-Attack:  55
-Defence:  25
-Special Attack:  35
-Special Defence:  45
-Speed:  95
+   ↞--------| STATS |--------↠ 
+             hp:         10
+         attack:         55
+        defense:         25
+ special-attack:         35
+special-defense:         45
+          speed:         95
+
+Pokedex ID: 50	Capture Rate: 255
+Base Exp: 53	Happiness: 50
+Height: 2	Weight: 8
+
+Genus: Mole Pokémon
+Location Areas:
+sinnoh-route-228-area
+vermilion-city-area
+johto-route-48-area
+digletts-cave-area
diff --git a/pokeData/ditto b/pokeData/ditto
index 6c754bd..60bb43f 100644
--- a/pokeData/ditto
+++ b/pokeData/ditto
@@ -1,15 +1,39 @@
+ditto	A normal type Pokémon
 
-Name:  Ditto
-Pokedex Number:  132
-Gender Ratio:  Genderless
-Abilities: Limber - Imposter (Hidden Ability)
+DITTO rearranges its cell structure to
+transform itself into other shapes.
+However, if it tries to transform itselfinto something by relying on its memory,
+this POKéMON manages to get details
+wrong.
 
-Base Stats
-----------------------
-Total: 288
-Hp:  48
-Attack:  48
-Defence:  48
-Special Attack:  48
-Special Defence:  48
-Speed:  48
+   ↞--------| STATS |--------↠ 
+             hp:         48
+         attack:         48
+        defense:         48
+ special-attack:         48
+special-defense:         48
+          speed:         48
+
+Pokedex ID: 132	Capture Rate: 35
+Base Exp: 101	Happiness: 50
+Height: 3	Weight: 40
+
+Genus: Transform Pokémon
+Location Areas:
+sinnoh-route-218-area
+johto-route-34-area
+johto-route-35-area
+johto-route-47-area
+kanto-route-13-area
+kanto-route-14-area
+kanto-route-15-area
+cerulean-cave-1f
+cerulean-cave-2f
+cerulean-cave-b1f
+kanto-route-23-area
+pokemon-mansion-b1f
+desert-underpass-area
+giant-chasm-forest
+giant-chasm-forest-cave
+pokemon-village-area
+johto-safari-zone-zone-wetland
diff --git a/pokeData/dodrio b/pokeData/dodrio
index 58f72a5..7f3f04f 100644
--- a/pokeData/dodrio
+++ b/pokeData/dodrio
@@ -1,15 +1,29 @@
+dodrio	A normal type Pokémon
 
-Name:  Dodrio
-Pokedex Number:  085
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Run Away - Early Bird - Tangled Feet (Hidden Ability)
+Watch out if DODRIO’s three heads are
+looking in three separate directions.
+It’s a sure sign that it is on its guard.Don’t go near this POKéMON if it’s being
+wary - it may decide to peck you.
 
-Base Stats
-----------------------
-Total: 460
-Hp:  60
-Attack:  110
-Defence:  70
-Special Attack:  60
-Special Defence:  60
-Speed:  100
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:        110
+        defense:         70
+ special-attack:         60
+special-defense:         60
+          speed:        110
+
+Pokedex ID: 85	Capture Rate: 45
+Base Exp: 165	Happiness: 70
+Height: 18	Weight: 852
+
+Genus: Triple Bird Pokémon
+Location Areas:
+mt-silver-outside
+kanto-route-26-area
+kanto-route-27-area
+kanto-route-28-area
+kanto-route-17-area
+cerulean-cave-1f
+cerulean-cave-2f
+hoenn-safari-zone-nwmach-bike-area
diff --git a/pokeData/doduo b/pokeData/doduo
index e6ce335..8c09302 100644
--- a/pokeData/doduo
+++ b/pokeData/doduo
@@ -1,15 +1,38 @@
+doduo	A normal type Pokémon
 
-Name:  Doduo
-Pokedex Number:  084
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Run Away - Early Bird - Tangled Feet (Hidden Ability)
+DODUO’s two heads contain completely
+identical brains.
+A scientific study reported that onrare occasions, there will be examples
+of this POKéMON possessing different
+sets of brains.
 
-Base Stats
-----------------------
-Total: 310
-Hp:  35
-Attack:  85
-Defence:  45
-Special Attack:  35
-Special Defence:  35
-Speed:  75
+   ↞--------| STATS |--------↠ 
+             hp:         35
+         attack:         85
+        defense:         45
+ special-attack:         35
+special-defense:         35
+          speed:         75
+
+Pokedex ID: 84	Capture Rate: 190
+Base Exp: 62	Happiness: 70
+Height: 14	Weight: 392
+
+Genus: Twin Bird Pokémon
+Location Areas:
+sinnoh-route-201-area
+mt-silver-outside
+kanto-route-26-area
+kanto-route-27-area
+kanto-route-28-area
+kanto-route-16-area
+kanto-route-17-area
+kanto-route-18-area
+kanto-route-22-area
+kanto-safari-zone-area-1-east
+kanto-safari-zone-area-3-west
+hoenn-safari-zone-nwmach-bike-area
+hoenn-safari-zone-sw
+hoenn-safari-zone-se
+kalos-route-5-area
+johto-safari-zone-zone-rocky-beach
diff --git a/pokeData/donphan b/pokeData/donphan
index c77f0ad..68a3147 100644
--- a/pokeData/donphan
+++ b/pokeData/donphan
@@ -1,15 +1,33 @@
+donphan	A ground type Pokémon
 
-Name:  Donphan
-Pokedex Number:  232
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Sturdy - Sand Veil (Hidden Ability)
+It has sharp, hard tusks and a rugged
+hide. Its TACKLE is strong enough to
+knock down a house.
 
-Base Stats
-----------------------
-Total: 500
-Hp:  90
-Attack:  120
-Defence:  120
-Special Attack:  60
-Special Defence:  60
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:        120
+        defense:        120
+ special-attack:         60
+special-defense:         60
+          speed:         50
+
+Pokedex ID: 232	Capture Rate: 60
+Base Exp: 175	Happiness: 70
+Height: 11	Weight: 1200
+
+Genus: Armor Pokémon
+Location Areas:
+johto-route-45-area
+mt-silver-2f
+mt-silver-1f-top
+mt-silver-4f
+mt-silver-outside
+mt-silver-1f
+mt-silver-mountainside
+mt-silver-3f
+mt-silver-top
+kanto-route-28-area
+kanto-victory-road-1-1f
+kanto-victory-road-1-2f
+kanto-victory-road-1-3f
diff --git a/pokeData/dottler b/pokeData/dottler
index 773da94..9e1ebee 100644
--- a/pokeData/dottler
+++ b/pokeData/dottler
@@ -1,15 +1,21 @@
+dottler	A bug type Pokémon
 
-Name:  Dottler
-Pokedex Number:  825
-Gender Ratio:   ♂:50.2% ♀:49.8% 
-Abilities: Swarm - Compoundeyes - Telepathy (Hidden Ability)
+It barely moves, but it’s still alive. Hiding in its
+shell without food or water seems to have
+awakened its psychic powers.
+
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         35
+        defense:         80
+ special-attack:         50
+special-defense:         90
+          speed:         30
+
+Pokedex ID: 825	Capture Rate: 120
+Base Exp: 117	Happiness: 50
+Height: 4	Weight: 195
+
+Genus: Radome Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 335
-Hp:  50
-Attack:  35
-Defence:  80
-Special Attack:  50
-Special Defence:  90
-Speed:  30
diff --git a/pokeData/doublade b/pokeData/doublade
index 9b1db54..b40df11 100644
--- a/pokeData/doublade
+++ b/pokeData/doublade
@@ -1,15 +1,21 @@
+doublade	A steel type Pokémon
 
-Name:  Doublade
-Pokedex Number:  680
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: No Guard
+進化して　２本に　分裂した。
+テレパシーで　会話して
+連係攻撃で　敵を　切り刻む。
+
+   ↞--------| STATS |--------↠ 
+             hp:         59
+         attack:        110
+        defense:        150
+ special-attack:         45
+special-defense:         49
+          speed:         35
+
+Pokedex ID: 680	Capture Rate: 90
+Base Exp: 157	Happiness: 50
+Height: 8	Weight: 45
+
+Genus: Sword Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 448
-Hp:  59
-Attack:  110
-Defence:  150
-Special Attack:  45
-Special Defence:  49
-Speed:  35
diff --git a/pokeData/dracovish b/pokeData/dracovish
index db61aaf..488df24 100644
--- a/pokeData/dracovish
+++ b/pokeData/dracovish
@@ -1,15 +1,21 @@
+dracovish	A water type Pokémon
 
-Name:  Dracovish
-Pokedex Number:  882
-Gender Ratio:  Genderless
-Abilities: Water Absorb - Strong Jaw - Sand Rush (Hidden Ability)
+Powerful legs and jaws made it the apex predator
+of its time. Its own overhunting of its prey was
+what drove it to extinction.
+
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:         90
+        defense:        100
+ special-attack:         70
+special-defense:         80
+          speed:         75
+
+Pokedex ID: 882	Capture Rate: 45
+Base Exp: 177	Happiness: 50
+Height: 23	Weight: 2150
+
+Genus: Fossil Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 505
-Hp:  90
-Attack:  90
-Defence:  100
-Special Attack:  70
-Special Defence:  80
-Speed:  75
diff --git a/pokeData/dracozolt b/pokeData/dracozolt
index 30f9f91..ef7c2c8 100644
--- a/pokeData/dracozolt
+++ b/pokeData/dracozolt
@@ -1,15 +1,21 @@
+dracozolt	A electric type Pokémon
 
-Name:  Dracozolt
-Pokedex Number:  880
-Gender Ratio:  Genderless
-Abilities: Volt Absorb - Hustle - Sand Rush (Hidden Ability)
+In ancient times, it was unbeatable thanks to its
+powerful lower body, but it went extinct anyway
+after it depleted all its plant-based food sources.
+
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:        100
+        defense:         90
+ special-attack:         80
+special-defense:         70
+          speed:         75
+
+Pokedex ID: 880	Capture Rate: 45
+Base Exp: 177	Happiness: 50
+Height: 18	Weight: 1900
+
+Genus: Fossil Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 505
-Hp:  90
-Attack:  100
-Defence:  90
-Special Attack:  80
-Special Defence:  70
-Speed:  75
diff --git a/pokeData/dragalge b/pokeData/dragalge
index 26dfbaa..38f2907 100644
--- a/pokeData/dragalge
+++ b/pokeData/dragalge
@@ -1,15 +1,23 @@
+dragalge	A poison type Pokémon
 
-Name:  Dragalge
-Pokedex Number:  691
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Poison Point - Poison Touch - Adaptability (Hidden Ability)
+タンカーの　船体を　腐らせる　猛毒を
+縄張りに　入りこんだ　ものに
+見境なく　吐きかける。
 
-Base Stats
-----------------------
-Total: 494
-Hp:  65
-Attack:  75
-Defence:  90
-Special Attack:  97
-Special Defence:  123
-Speed:  44
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         75
+        defense:         90
+ special-attack:         97
+special-defense:        123
+          speed:         44
+
+Pokedex ID: 691	Capture Rate: 55
+Base Exp: 173	Happiness: 50
+Height: 18	Weight: 815
+
+Genus: Mock Kelp Pokémon
+Location Areas:
+ambrette-town-area
+cyllage-city-area
+kalos-route-8-area
diff --git a/pokeData/dragapult b/pokeData/dragapult
index b1dedd3..206bbd1 100644
--- a/pokeData/dragapult
+++ b/pokeData/dragapult
@@ -1,15 +1,21 @@
+dragapult	A dragon type Pokémon
 
-Name:  Dragapult
-Pokedex Number:  887
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Clear Body - Infiltrator - Cursed Body (Hidden Ability)
+When it isn’t battling, it keeps Dreepy in the
+holes on its horns. Once a fight starts, it launches
+the Dreepy like supersonic missiles.
+
+   ↞--------| STATS |--------↠ 
+             hp:         88
+         attack:        120
+        defense:         75
+ special-attack:        100
+special-defense:         75
+          speed:        142
+
+Pokedex ID: 887	Capture Rate: 45
+Base Exp: 300	Happiness: 50
+Height: 30	Weight: 500
+
+Genus: Stealth Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 600
-Hp:  88
-Attack:  120
-Defence:  75
-Special Attack:  100
-Special Defence:  75
-Speed:  142
diff --git a/pokeData/dragonair b/pokeData/dragonair
index 2243b86..21e8ba7 100644
--- a/pokeData/dragonair
+++ b/pokeData/dragonair
@@ -1,15 +1,30 @@
+dragonair	A dragon type Pokémon
 
-Name:  Dragonair
-Pokedex Number:  148
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Shed Skin - Marvel Scale (Hidden Ability)
+DRAGONAIR stores an enormous amount
+of energy inside its body.
+It is said to alter weather conditionsin its vicinity by discharging energy
+from the crystals on its neck and tail.
 
-Base Stats
-----------------------
-Total: 420
-Hp:  61
-Attack:  84
-Defence:  65
-Special Attack:  70
-Special Defence:  70
-Speed:  70
+   ↞--------| STATS |--------↠ 
+             hp:         61
+         attack:         84
+        defense:         65
+ special-attack:         70
+special-defense:         70
+          speed:         70
+
+Pokedex ID: 148	Capture Rate: 45
+Base Exp: 147	Happiness: 35
+Height: 40	Weight: 165
+
+Genus: Dragon Pokémon
+Location Areas:
+mt-coronet-4f
+dragons-den-area
+johto-route-45-area
+kanto-safari-zone-middle
+kanto-safari-zone-area-1-east
+kanto-safari-zone-area-2-north
+kanto-safari-zone-area-3-west
+dragonspiral-tower-outside
+kalos-route-21-area
diff --git a/pokeData/dragonite b/pokeData/dragonite
index 29d7cd4..2d7f541 100644
--- a/pokeData/dragonite
+++ b/pokeData/dragonite
@@ -1,15 +1,22 @@
+dragonite	A dragon type Pokémon
 
-Name:  Dragonite
-Pokedex Number:  149
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Inner Focus - Multiscale (Hidden Ability)
+DRAGONITE is capable of circling the
+globe in just sixteen hours.
+It is a kindhearted POKéMON that leadslost and foundering ships in a storm to
+the safety of land.
 
-Base Stats
-----------------------
-Total: 600
-Hp:  91
-Attack:  134
-Defence:  95
-Special Attack:  100
-Special Defence:  100
-Speed:  80
+   ↞--------| STATS |--------↠ 
+             hp:         91
+         attack:        134
+        defense:         95
+ special-attack:        100
+special-defense:        100
+          speed:         80
+
+Pokedex ID: 149	Capture Rate: 45
+Base Exp: 300	Happiness: 35
+Height: 22	Weight: 2100
+
+Genus: Dragon Pokémon
+Location Areas:
+dragonspiral-tower-outside
diff --git a/pokeData/drakloak b/pokeData/drakloak
index 64fbb92..1c9511f 100644
--- a/pokeData/drakloak
+++ b/pokeData/drakloak
@@ -1,15 +1,21 @@
+drakloak	A dragon type Pokémon
 
-Name:  Drakloak
-Pokedex Number:  886
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Clear Body - Infiltrator - Cursed Body (Hidden Ability)
+It’s capable of flying faster than 120 mph.
+It battles alongside Dreepy and
+dotes on them until they successfully evolve.
+
+   ↞--------| STATS |--------↠ 
+             hp:         68
+         attack:         80
+        defense:         50
+ special-attack:         60
+special-defense:         50
+          speed:        102
+
+Pokedex ID: 886	Capture Rate: 45
+Base Exp: 144	Happiness: 50
+Height: 14	Weight: 110
+
+Genus: Caretaker Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 410
-Hp:  68
-Attack:  80
-Defence:  50
-Special Attack:  60
-Special Defence:  50
-Speed:  102
diff --git a/pokeData/drampa b/pokeData/drampa
index 2f7690a..d511edf 100644
--- a/pokeData/drampa
+++ b/pokeData/drampa
@@ -1,15 +1,21 @@
+drampa	A normal type Pokémon
 
-Name:  Drampa
-Pokedex Number:  780
-Gender Ratio:   ♂:50.2% ♀:49.8% 
-Abilities: Berserk - Sap Sipper - Cloud Nine (Hidden Ability)
+It has a compassionate personality, but if it is
+angered, it completely destroys its surroundings
+with its intense breath.
+
+   ↞--------| STATS |--------↠ 
+             hp:         78
+         attack:         60
+        defense:         85
+ special-attack:        135
+special-defense:         91
+          speed:         36
+
+Pokedex ID: 780	Capture Rate: 70
+Base Exp: 170	Happiness: 50
+Height: 30	Weight: 1850
+
+Genus: Placid Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 485
-Hp:  78
-Attack:  60
-Defence:  85
-Special Attack:  135
-Special Defence:  91
-Speed:  36
diff --git a/pokeData/drapion b/pokeData/drapion
index 02d0482..abe486d 100644
--- a/pokeData/drapion
+++ b/pokeData/drapion
@@ -1,15 +1,21 @@
+drapion	A poison type Pokémon
 
-Name:  Drapion
-Pokedex Number:  452
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Battle Armor - Sniper - Keen Eye (Hidden Ability)
+Fier et robuste, il met un point
+d’honneur à battre ses adversaires
+sans utiliser de poison.
 
-Base Stats
-----------------------
-Total: 500
-Hp:  70
-Attack:  90
-Defence:  110
-Special Attack:  60
-Special Defence:  75
-Speed:  95
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         90
+        defense:        110
+ special-attack:         60
+special-defense:         75
+          speed:         95
+
+Pokedex ID: 452	Capture Rate: 45
+Base Exp: 175	Happiness: 50
+Height: 13	Weight: 615
+
+Genus: Ogre Scorpion Pokémon
+Location Areas:
+kalos-route-19-area
diff --git a/pokeData/dratini b/pokeData/dratini
index 3244cd1..40a1c27 100644
--- a/pokeData/dratini
+++ b/pokeData/dratini
@@ -1,15 +1,32 @@
+dratini	A dragon type Pokémon
 
-Name:  Dratini
-Pokedex Number:  147
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Shed Skin - Marvel Scale (Hidden Ability)
+DRATINI continually molts and sloughs
+off its old skin.
+It does so because the life energywithin its body steadily builds to reach
+uncontrollable levels.
 
-Base Stats
-----------------------
-Total: 300
-Hp:  41
-Attack:  64
-Defence:  45
-Special Attack:  50
-Special Defence:  50
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:         41
+         attack:         64
+        defense:         45
+ special-attack:         50
+special-defense:         50
+          speed:         50
+
+Pokedex ID: 147	Capture Rate: 45
+Base Exp: 60	Happiness: 35
+Height: 18	Weight: 33
+
+Genus: Dragon Pokémon
+Location Areas:
+mt-coronet-4f
+dragons-den-area
+johto-route-45-area
+kanto-safari-zone-middle
+kanto-safari-zone-area-1-east
+kanto-safari-zone-area-2-north
+kanto-safari-zone-area-3-west
+dragonspiral-tower-outside
+kalos-route-21-area
+floccesy-town-area
+johto-safari-zone-zone-swamp
diff --git a/pokeData/drednaw b/pokeData/drednaw
index 45a0cc0..e0b308f 100644
--- a/pokeData/drednaw
+++ b/pokeData/drednaw
@@ -1,15 +1,21 @@
+drednaw	A water type Pokémon
 
-Name:  Drednaw
-Pokedex Number:  834
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Strong Jaw - Shell Armor - Swift Swim (Hidden Ability)
+With jaws that can shear through steel rods,
+this highly aggressive Pokémon chomps down
+on its unfortunate prey.
+
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:        115
+        defense:         90
+ special-attack:         48
+special-defense:         68
+          speed:         74
+
+Pokedex ID: 834	Capture Rate: 75
+Base Exp: 170	Happiness: 50
+Height: 10	Weight: 1155
+
+Genus: Bite Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 485
-Hp:  90
-Attack:  115
-Defence:  90
-Special Attack:  48
-Special Defence:  68
-Speed:  74
diff --git a/pokeData/dreepy b/pokeData/dreepy
index ec6865f..0deafb0 100644
--- a/pokeData/dreepy
+++ b/pokeData/dreepy
@@ -1,15 +1,21 @@
+dreepy	A dragon type Pokémon
 
-Name:  Dreepy
-Pokedex Number:  885
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Clear Body - Infiltrator - Cursed Body (Hidden Ability)
+After being reborn as a ghost Pokémon,
+Dreepy wanders the areas it used to inhabit
+back when it was alive in prehistoric seas.
+
+   ↞--------| STATS |--------↠ 
+             hp:         28
+         attack:         60
+        defense:         30
+ special-attack:         40
+special-defense:         30
+          speed:         82
+
+Pokedex ID: 885	Capture Rate: 45
+Base Exp: 54	Happiness: 50
+Height: 5	Weight: 20
+
+Genus: Lingering Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 270
-Hp:  28
-Attack:  60
-Defence:  30
-Special Attack:  40
-Special Defence:  30
-Speed:  82
diff --git a/pokeData/drifblim b/pokeData/drifblim
index e71ce59..55d6475 100644
--- a/pokeData/drifblim
+++ b/pokeData/drifblim
@@ -1,15 +1,24 @@
+drifblim	A ghost type Pokémon
 
-Name:  Drifblim
-Pokedex Number:  426
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Aftermath - Unburden - Flare Boost (Hidden Ability)
+Des nuées de Grodrive dérivent
+dans le ciel au crépuscule. Ils
+disparaissent dès qu’on les voit.
 
-Base Stats
-----------------------
-Total: 498
-Hp:  150
-Attack:  80
-Defence:  44
-Special Attack:  90
-Special Defence:  54
-Speed:  80
+   ↞--------| STATS |--------↠ 
+             hp:        150
+         attack:         80
+        defense:         44
+ special-attack:         90
+special-defense:         54
+          speed:         80
+
+Pokedex ID: 426	Capture Rate: 60
+Base Exp: 174	Happiness: 50
+Height: 12	Weight: 150
+
+Genus: Blimp Pokémon
+Location Areas:
+giant-chasm-outside
+unova-route-13-area
+unova-route-14-area
+reversal-mountain-unknown-area-48
diff --git a/pokeData/drifloon b/pokeData/drifloon
index e7e23d3..56ca5d8 100644
--- a/pokeData/drifloon
+++ b/pokeData/drifloon
@@ -1,15 +1,22 @@
+drifloon	A ghost type Pokémon
 
-Name:  Drifloon
-Pokedex Number:  425
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Aftermath - Unburden - Flare Boost (Hidden Ability)
+Sa façon de flotter sans but au
+gré du vent lui a valu le surnom
+de “bouée des esprits égarés”.
 
-Base Stats
-----------------------
-Total: 348
-Hp:  90
-Attack:  50
-Defence:  34
-Special Attack:  60
-Special Defence:  44
-Speed:  70
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:         50
+        defense:         34
+ special-attack:         60
+special-defense:         44
+          speed:         70
+
+Pokedex ID: 425	Capture Rate: 125
+Base Exp: 70	Happiness: 50
+Height: 4	Weight: 12
+
+Genus: Balloon Pokémon
+Location Areas:
+valley-windworks-area
+kalos-route-8-area
diff --git a/pokeData/drilbur b/pokeData/drilbur
index c9c68ed..106fb52 100644
--- a/pokeData/drilbur
+++ b/pokeData/drilbur
@@ -1,15 +1,30 @@
+drilbur	A ground type Pokémon
 
-Name:  Drilbur
-Pokedex Number:  529
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Sand Rush - Sand Force - Mold Breaker (Hidden Ability)
+양손의 손톱을 서로 겹치고
+몸을 고속 회전시키면서
+맹렬한 속도로 땅속을 헤쳐나간다.
 
-Base Stats
-----------------------
-Total: 328
-Hp:  60
-Attack:  85
-Defence:  40
-Special Attack:  30
-Special Defence:  45
-Speed:  68
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         85
+        defense:         40
+ special-attack:         30
+special-defense:         45
+          speed:         68
+
+Pokedex ID: 529	Capture Rate: 120
+Base Exp: 66	Happiness: 50
+Height: 3	Weight: 85
+
+Genus: Mole Pokémon
+Location Areas:
+chargestone-cave-1f
+chargestone-cave-b1f
+chargestone-cave-b2f
+twist-mountain-area
+wellspring-cave-area
+mistralton-cave-area
+guidance-chamber-area
+relic-passage-castelia-sewers-entrance
+relic-passage-relic-castle-entrance
+relic-passage-pwt-entrance
diff --git a/pokeData/drizzile b/pokeData/drizzile
index 1a19ae6..ab65029 100644
--- a/pokeData/drizzile
+++ b/pokeData/drizzile
@@ -1,15 +1,21 @@
+drizzile	A water type Pokémon
 
-Name:  Drizzile
-Pokedex Number:  817
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Torrent - Sniper (Hidden Ability)
+A clever combatant, this Pokémon battles using
+water balloons created with moisture secreted
+from its palms.
+
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         60
+        defense:         55
+ special-attack:         95
+special-defense:         55
+          speed:         90
+
+Pokedex ID: 817	Capture Rate: 45
+Base Exp: 147	Happiness: 50
+Height: 7	Weight: 115
+
+Genus: Water Lizard Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 420
-Hp:  65
-Attack:  60
-Defence:  55
-Special Attack:  95
-Special Defence:  55
-Speed:  90
diff --git a/pokeData/drowzee b/pokeData/drowzee
index cf1589d..c4cf00d 100644
--- a/pokeData/drowzee
+++ b/pokeData/drowzee
@@ -1,15 +1,28 @@
+drowzee	A psychic type Pokémon
 
-Name:  Drowzee
-Pokedex Number:  096
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Insomnia - Forewarn - Inner Focus (Hidden Ability)
+If your nose becomes itchy while you
+are sleeping, it’s a sure sign that one
+of these POKéMON is standing aboveyour pillow and trying to eat your dream
+through your nostrils.
 
-Base Stats
-----------------------
-Total: 328
-Hp:  60
-Attack:  48
-Defence:  45
-Special Attack:  43
-Special Defence:  90
-Speed:  42
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         48
+        defense:         45
+ special-attack:         43
+special-defense:         90
+          speed:         42
+
+Pokedex ID: 96	Capture Rate: 190
+Base Exp: 66	Happiness: 70
+Height: 10	Weight: 324
+
+Genus: Hypnosis Pokémon
+Location Areas:
+sinnoh-route-215-area
+johto-route-34-area
+johto-route-35-area
+kanto-route-6-area
+kanto-route-11-area
+berry-forest-area
+johto-safari-zone-zone-swamp
diff --git a/pokeData/druddigon b/pokeData/druddigon
index e2404c4..4c924bc 100644
--- a/pokeData/druddigon
+++ b/pokeData/druddigon
@@ -1,15 +1,29 @@
+druddigon	A dragon type Pokémon
 
-Name:  Druddigon
-Pokedex Number:  621
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Rough Skin - Sheer Force - Mold Breaker (Hidden Ability)
+좁은 동굴을 뛰어다니며
+날카로운 손톱으로 먹이를 잡는다.
+얼굴 피부는 바위보다 단단하다.
 
-Base Stats
-----------------------
-Total: 485
-Hp:  77
-Attack:  120
-Defence:  90
-Special Attack:  60
-Special Defence:  90
-Speed:  48
+   ↞--------| STATS |--------↠ 
+             hp:         77
+         attack:        120
+        defense:         90
+ special-attack:         60
+special-defense:         90
+          speed:         48
+
+Pokedex ID: 621	Capture Rate: 45
+Base Exp: 170	Happiness: 50
+Height: 16	Weight: 1390
+
+Genus: Cave Pokémon
+Location Areas:
+dragonspiral-tower-entrance
+dragonspiral-tower-outside
+dragonspiral-tower-1f
+unova-victory-road-2-unknown-area-77
+unova-victory-road-2-unknown-area-80
+kalos-victory-road-unknown-area-322
+kalos-victory-road-unknown-area-324
+kalos-victory-road-unknown-area-326
+kalos-victory-road-unknown-area-328
diff --git a/pokeData/dubwool b/pokeData/dubwool
index 8cf346d..b35dc49 100644
--- a/pokeData/dubwool
+++ b/pokeData/dubwool
@@ -1,15 +1,21 @@
+dubwool	A normal type Pokémon
 
-Name:  Dubwool
-Pokedex Number:  832
-Gender Ratio:   ♂:50.2% ♀:49.8%
-Abilities: Fluffy - Steadfast - Bulletproof (Hidden Ability)
+Weave a carpet from its springy wool, and you end
+up with something closer to a trampoline. You’ll
+start to bounce the moment you set foot on it.
+
+   ↞--------| STATS |--------↠ 
+             hp:         72
+         attack:         80
+        defense:        100
+ special-attack:         60
+special-defense:         90
+          speed:         88
+
+Pokedex ID: 832	Capture Rate: 127
+Base Exp: 172	Happiness: 50
+Height: 13	Weight: 430
+
+Genus: Sheep Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 490
-Hp:  72
-Attack:  80
-Defence:  100
-Special Attack:  60
-Special Defence:  90
-Speed:  88
diff --git a/pokeData/ducklett b/pokeData/ducklett
index 971ce1e..c7de7fd 100644
--- a/pokeData/ducklett
+++ b/pokeData/ducklett
@@ -1,15 +1,22 @@
+ducklett	A water type Pokémon
 
-Name:  Ducklett
-Pokedex Number:  580
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Keen Eye - Big Pecks - Hydration (Hidden Ability)
+상대에게 공격당하면 전신의
+깃털에서 물보라를 내뿜는다.
+물안개에 숨어들어 도망친다.
 
-Base Stats
-----------------------
-Total: 305
-Hp:  62
-Attack:  44
-Defence:  50
-Special Attack:  44
-Special Defence:  50
-Speed:  55
+   ↞--------| STATS |--------↠ 
+             hp:         62
+         attack:         44
+        defense:         50
+ special-attack:         44
+special-defense:         50
+          speed:         55
+
+Pokedex ID: 580	Capture Rate: 190
+Base Exp: 61	Happiness: 70
+Height: 5	Weight: 55
+
+Genus: Water Bird Pokémon
+Location Areas:
+driftveil-drawbridge-area
+kalos-route-7-area
diff --git a/pokeData/dugtrio b/pokeData/dugtrio
index 6bd3599..6d0ebb6 100644
--- a/pokeData/dugtrio
+++ b/pokeData/dugtrio
@@ -1,15 +1,25 @@
+dugtrio	A ground type Pokémon
 
-Name:  Dugtrio
-Pokedex Number:  051
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Sand Veil - Arena Trap - Sand Force (Hidden Ability)
+DUGTRIO are actually triplets that
+emerged from one body. As a result,
+each triplet thinks exactly like theother two triplets.
+They work cooperatively to burrow
+endlessly.
 
-Base Stats
-----------------------
-Total: 405
-Hp:  35
-Attack:  80
-Defence:  50
-Special Attack:  50
-Special Defence:  70
-Speed:  120
+   ↞--------| STATS |--------↠ 
+             hp:         35
+         attack:        100
+        defense:         50
+ special-attack:         50
+special-defense:         70
+          speed:        120
+
+Pokedex ID: 51	Capture Rate: 50
+Base Exp: 149	Happiness: 50
+Height: 7	Weight: 333
+
+Genus: Mole Pokémon
+Location Areas:
+sinnoh-route-228-area
+digletts-cave-area
+kalos-route-13-area
diff --git a/pokeData/dunsparce b/pokeData/dunsparce
index 9979d4f..62dfe56 100644
--- a/pokeData/dunsparce
+++ b/pokeData/dunsparce
@@ -1,15 +1,38 @@
+dunsparce	A normal type Pokémon
 
-Name:  Dunsparce
-Pokedex Number:  206
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Serene Grace - Run Away - Rattled (Hidden Ability)
+When spotted, this POKéMON escapes
+backward by furiously boring into the
+ground with its tail.
 
-Base Stats
-----------------------
-Total: 415
-Hp:  100
-Attack:  70
-Defence:  70
-Special Attack:  65
-Special Defence:  65
-Speed:  45
+   ↞--------| STATS |--------↠ 
+             hp:        100
+         attack:         70
+        defense:         70
+ special-attack:         65
+special-defense:         65
+          speed:         45
+
+Pokedex ID: 206	Capture Rate: 190
+Base Exp: 145	Happiness: 50
+Height: 15	Weight: 140
+
+Genus: Land Snake Pokémon
+Location Areas:
+sinnoh-route-208-area
+dark-cave-violet-city-entrance
+three-isle-port-area
+dreamyard-area
+village-bridge-area
+unova-route-1-area
+unova-route-2-area
+unova-route-6-area
+unova-route-12-area
+unova-route-18-area
+unova-victory-road-2-unknown-area-72
+unova-victory-road-2-unknown-area-73
+unova-victory-road-2-unknown-area-79
+floccesy-ranch-inner
+nature-sanctuary-area
+unova-route-20-area
+kalos-route-3-area
+kalos-route-22-area
diff --git a/pokeData/duosion b/pokeData/duosion
index 443ebd4..733d44c 100644
--- a/pokeData/duosion
+++ b/pokeData/duosion
@@ -1,15 +1,23 @@
+duosion	A psychic type Pokémon
 
-Name:  Duosion
-Pokedex Number:  578
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Overcoat - Magic Guard - Regenerator (Hidden Ability)
+２つに　ぶんれつした　のうみそを
+もっているため　いきなり　ちがう
+こうどうを　とることが　あるのだ。
 
-Base Stats
-----------------------
-Total: 370
-Hp:  65
-Attack:  40
-Defence:  50
-Special Attack:  125
-Special Defence:  60
-Speed:  30
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         40
+        defense:         50
+ special-attack:        125
+special-defense:         60
+          speed:         30
+
+Pokedex ID: 578	Capture Rate: 100
+Base Exp: 130	Happiness: 50
+Height: 6	Weight: 80
+
+Genus: Mitosis Pokémon
+Location Areas:
+unova-route-9-area
+strange-house-1f
+strange-house-b1f
diff --git a/pokeData/duraludon b/pokeData/duraludon
index cc309f1..83b9983 100644
--- a/pokeData/duraludon
+++ b/pokeData/duraludon
@@ -1,15 +1,21 @@
+duraludon	A steel type Pokémon
 
-Name:  Duraludon
-Pokedex Number:  884
-Gender Ratio:   ♂:50.2% ♀:49.8% 
-Abilities: Light Metal - Heavy Metal - Stalwart (Hidden Ability)
+Its body resembles polished metal, and it’s both
+lightweight and strong. The only drawback is that
+it rusts easily.
+
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         95
+        defense:        115
+ special-attack:        120
+special-defense:         50
+          speed:         85
+
+Pokedex ID: 884	Capture Rate: 45
+Base Exp: 187	Happiness: 50
+Height: 18	Weight: 400
+
+Genus: Alloy Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 535
-Hp:  120
-Attack:  50
-Defence:  85
-Special Attack:  Max Stats<b
-Special Defence:  Lv. 50
-Speed:  130 - 177
diff --git a/pokeData/durant b/pokeData/durant
index faa874e..295789d 100644
--- a/pokeData/durant
+++ b/pokeData/durant
@@ -1,15 +1,47 @@
+durant	A bug type Pokémon
 
-Name:  Durant
-Pokedex Number:  632
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Swarm - Hustle - Truant (Hidden Ability)
+천적인 앤티골에 대해서
+모두와 역할 분담을 하면서
+반격해 둥지에서 쫓아낸다.
 
-Base Stats
-----------------------
-Total: 484
-Hp:  58
-Attack:  109
-Defence:  112
-Special Attack:  48
-Special Defence:  48
-Speed:  109
+   ↞--------| STATS |--------↠ 
+             hp:         58
+         attack:        109
+        defense:        112
+ special-attack:         48
+special-defense:         48
+          speed:        109
+
+Pokedex ID: 632	Capture Rate: 90
+Base Exp: 169	Happiness: 50
+Height: 3	Weight: 330
+
+Genus: Iron Ant Pokémon
+Location Areas:
+twist-mountain-area
+unova-victory-road-unknown-area-53
+unova-victory-road-unknown-area-54
+unova-victory-road-unknown-area-55
+unova-victory-road-unknown-area-56
+unova-victory-road-unknown-area-57
+unova-victory-road-unknown-area-58
+unova-victory-road-unknown-area-59
+unova-victory-road-unknown-area-60
+unova-victory-road-unknown-area-61
+unova-victory-road-unknown-area-62
+unova-victory-road-unknown-area-63
+unova-victory-road-unknown-area-64
+unova-victory-road-unknown-area-65
+unova-victory-road-unknown-area-66
+trial-chamber-area
+clay-tunnel-area
+underground-ruins-area
+rocky-mountain-room-area
+glacier-room-area
+iron-room-area
+kalos-route-18-area
+terminus-cave-unknown-area-343
+terminus-cave-unknown-area-344
+terminus-cave-unknown-area-345
+terminus-cave-unknown-area-347
+terminus-cave-unknown-area-348
diff --git a/pokeData/dusclops b/pokeData/dusclops
index c5b9a1b..0194cc4 100644
--- a/pokeData/dusclops
+++ b/pokeData/dusclops
@@ -1,15 +1,32 @@
+dusclops	A ghost type Pokémon
 
-Name:  Dusclops
-Pokedex Number:  356
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Pressure - Frisk (Hidden Ability)
+It seeks drifting will-o’-the-wisps
+and sucks them into its empty body.
+What happens inside is a mystery.
 
-Base Stats
-----------------------
-Total: 455
-Hp:  40
-Attack:  70
-Defence:  130
-Special Attack:  60
-Special Defence:  130
-Speed:  25
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         70
+        defense:        130
+ special-attack:         60
+special-defense:        130
+          speed:         25
+
+Pokedex ID: 356	Capture Rate: 90
+Base Exp: 159	Happiness: 35
+Height: 16	Weight: 306
+
+Genus: Beckon Pokémon
+Location Areas:
+sendoff-spring-area
+turnback-cave-pillar-1
+turnback-cave-pillar-2
+turnback-cave-pillar-3
+turnback-cave-before-pillar-1
+turnback-cave-between-pillars-1-and-2
+turnback-cave-between-pillars-2-and-3
+turnback-cave-after-pillar-3
+sinnoh-route-224-area
+sky-pillar-1f
+sky-pillar-3f
+sky-pillar-5f
diff --git a/pokeData/dusknoir b/pokeData/dusknoir
index d850771..6c868d6 100644
--- a/pokeData/dusknoir
+++ b/pokeData/dusknoir
@@ -1,15 +1,21 @@
+dusknoir	A ghost type Pokémon
 
-Name:  Dusknoir
-Pokedex Number:  477
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Pressure - Frisk (Hidden Ability)
+It is said to take lost spirits
+into its pliant body and guide
+them home.
+
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:        100
+        defense:        135
+ special-attack:         65
+special-defense:        135
+          speed:         45
+
+Pokedex ID: 477	Capture Rate: 45
+Base Exp: 263	Happiness: 35
+Height: 22	Weight: 1066
+
+Genus: Gripper Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 525
-Hp:  45
-Attack:  100
-Defence:  135
-Special Attack:  65
-Special Defence:  135
-Speed:  45
diff --git a/pokeData/duskull b/pokeData/duskull
index 97d2bb6..36c860a 100644
--- a/pokeData/duskull
+++ b/pokeData/duskull
@@ -1,15 +1,40 @@
+duskull	A ghost type Pokémon
 
-Name:  Duskull
-Pokedex Number:  355
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Levitate - Frisk (Hidden Ability)
+It loves the crying of children. It
+startles bad kids by passing
+through walls and making them cry.
 
-Base Stats
-----------------------
-Total: 295
-Hp:  20
-Attack:  40
-Defence:  90
-Special Attack:  30
-Special Defence:  90
-Speed:  25
+   ↞--------| STATS |--------↠ 
+             hp:         20
+         attack:         40
+        defense:         90
+ special-attack:         30
+special-defense:         90
+          speed:         25
+
+Pokedex ID: 355	Capture Rate: 190
+Base Exp: 59	Happiness: 35
+Height: 8	Weight: 150
+
+Genus: Requiem Pokémon
+Location Areas:
+turnback-cave-pillar-1
+turnback-cave-before-pillar-1
+turnback-cave-between-pillars-1-and-2
+sinnoh-route-209-area
+lost-tower-1f
+lost-tower-2f
+lost-tower-3f
+lost-tower-4f
+lost-tower-5f
+sinnoh-route-224-area
+mt-pyre-1f
+mt-pyre-2f
+mt-pyre-3f
+mt-pyre-4f
+mt-pyre-5f
+mt-pyre-6f
+mt-pyre-outside
+mt-pyre-summit
+hoenn-route-121-area
+hoenn-route-123-area
diff --git a/pokeData/dustox b/pokeData/dustox
index 2890cfb..b76c86d 100644
--- a/pokeData/dustox
+++ b/pokeData/dustox
@@ -1,15 +1,25 @@
+dustox	A bug type Pokémon
 
-Name:  Dustox
-Pokedex Number:  269
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Shield Dust - Compoundeyes (Hidden Ability)
+Toxic powder is scattered with each
+flap. At night, it is known to strip
+leaves off trees lining boulevards.
 
-Base Stats
-----------------------
-Total: 385
-Hp:  60
-Attack:  50
-Defence:  70
-Special Attack:  50
-Special Defence:  90
-Speed:  65
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         50
+        defense:         70
+ special-attack:         50
+special-defense:         90
+          speed:         65
+
+Pokedex ID: 269	Capture Rate: 45
+Base Exp: 173	Happiness: 70
+Height: 12	Weight: 316
+
+Genus: Poison Moth Pokémon
+Location Areas:
+eterna-forest-area
+sinnoh-route-205-east-towards-eterna-city
+sinnoh-route-224-area
+sinnoh-route-229-area
+sinnoh-sea-route-230-area
diff --git a/pokeData/dwebble b/pokeData/dwebble
index 8a9cca8..1ab9791 100644
--- a/pokeData/dwebble
+++ b/pokeData/dwebble
@@ -1,15 +1,29 @@
+dwebble	A bug type Pokémon
 
-Name:  Dwebble
-Pokedex Number:  557
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Sturdy - Shell Armor - Weak Armor (Hidden Ability)
+적당한 돌을 찾아 구멍을 뚫어
+살 곳을 만든다. 부서지면 대신할
+돌을 찾을 때까지 불안해한다.
 
-Base Stats
-----------------------
-Total: 325
-Hp:  50
-Attack:  65
-Defence:  85
-Special Attack:  35
-Special Defence:  35
-Speed:  55
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         65
+        defense:         85
+ special-attack:         35
+special-defense:         35
+          speed:         55
+
+Pokedex ID: 557	Capture Rate: 190
+Base Exp: 65	Happiness: 50
+Height: 3	Weight: 145
+
+Genus: Rock Inn Pokémon
+Location Areas:
+desert-resort-entrance
+desert-resort-area
+unova-route-18-area
+ambrette-town-area
+cyllage-city-area
+kalos-route-8-area
+kalos-route-12-area
+glittering-cave-unknown-area-304
+azure-bay-area
diff --git a/pokeData/eelektrik b/pokeData/eelektrik
index b382972..cbe4eb4 100644
--- a/pokeData/eelektrik
+++ b/pokeData/eelektrik
@@ -1,15 +1,21 @@
+eelektrik	A electric type Pokémon
 
-Name:  Eelektrik
-Pokedex Number:  603
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Levitate
+상대를 휘감고 동그란
+반점에서 전기를 흘려보내
+마비시킨 뒤 통째로 문다.
 
-Base Stats
-----------------------
-Total: 405
-Hp:  65
-Attack:  85
-Defence:  70
-Special Attack:  75
-Special Defence:  70
-Speed:  40
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         85
+        defense:         70
+ special-attack:         75
+special-defense:         70
+          speed:         40
+
+Pokedex ID: 603	Capture Rate: 60
+Base Exp: 142	Happiness: 70
+Height: 12	Weight: 220
+
+Genus: EleFish Pokémon
+Location Areas:
+seaside-cave-b1f
diff --git a/pokeData/eelektross b/pokeData/eelektross
index 9dcbe23..cf372ce 100644
--- a/pokeData/eelektross
+++ b/pokeData/eelektross
@@ -1,15 +1,21 @@
+eelektross	A electric type Pokémon
 
-Name:  Eelektross
-Pokedex Number:  604
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Levitate
+흡반 같은 입으로 먹이에
+달라붙은 후 박아 넣은 이빨을
+통해 전기를 흘려 감전시킨다.
+
+   ↞--------| STATS |--------↠ 
+             hp:         85
+         attack:        115
+        defense:         80
+ special-attack:        105
+special-defense:         80
+          speed:         50
+
+Pokedex ID: 604	Capture Rate: 30
+Base Exp: 232	Happiness: 70
+Height: 21	Weight: 805
+
+Genus: EleFish Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 515
-Hp:  85
-Attack:  115
-Defence:  80
-Special Attack:  105
-Special Defence:  80
-Speed:  50
diff --git a/pokeData/eevee b/pokeData/eevee
index 069cf6d..641b23b 100644
--- a/pokeData/eevee
+++ b/pokeData/eevee
@@ -1 +1,26 @@
-	Stats currently unavailable :( 
+eevee	A normal type Pokémon
+
+EEVEE has an unstable genetic makeup
+that suddenly mutates due to the
+environment in which it lives.Radiation from various STONES causes
+this POKéMON to evolve.
+
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         55
+        defense:         50
+ special-attack:         45
+special-defense:         65
+          speed:         55
+
+Pokedex ID: 133	Capture Rate: 45
+Base Exp: 65	Happiness: 50
+Height: 3	Weight: 65
+
+Genus: Evolution Pokémon
+Location Areas:
+castelia-city-area
+kalos-route-10-area
+celadon-city-celadon-mansion
+goldenrod-city-bills-house
+hearthome-city-area
diff --git a/pokeData/eiscue b/pokeData/eiscue
index 4e51ac1..c2d9063 100644
--- a/pokeData/eiscue
+++ b/pokeData/eiscue
@@ -1,15 +1,15 @@
+	A  type Pokémon
 
-Name:  Eiscue
-Pokedex Number:  875
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Ice Face
+It drifted in on the flow of ocean waters from a
+frigid place. It keeps its head iced constantly to
+make sure it stays nice and cold.
+
+   ↞--------| STATS |--------↠ 
+
+Pokedex ID: 	Capture Rate: 60
+Base Exp: 	Happiness: 50
+Height: 	Weight: 
+
+Genus: Penguin Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 470
-Hp:  75
-Attack:  80
-Defence:  70
-Special Attack:  65
-Special Defence:  50
-Speed:  130
diff --git a/pokeData/ekans b/pokeData/ekans
index ee9932b..79d661c 100644
--- a/pokeData/ekans
+++ b/pokeData/ekans
@@ -1,15 +1,37 @@
+ekans	A poison type Pokémon
 
-Name:  Ekans
-Pokedex Number:  023
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Intimidate - Shed Skin - Unnerve (Hidden Ability)
+EKANS curls itself up in a spiral while
+it rests.
+Assuming this position allows it toquickly respond to a threat from any
+direction with a glare from its upraised
+head.
 
-Base Stats
-----------------------
-Total: 288
-Hp:  35
-Attack:  60
-Defence:  44
-Special Attack:  40
-Special Defence:  54
-Speed:  55
+   ↞--------| STATS |--------↠ 
+             hp:         35
+         attack:         60
+        defense:         44
+ special-attack:         40
+special-defense:         54
+          speed:         55
+
+Pokedex ID: 23	Capture Rate: 255
+Base Exp: 58	Happiness: 70
+Height: 20	Weight: 69
+
+Genus: Snake Pokémon
+Location Areas:
+sinnoh-route-212-east-towards-pastoria-city
+johto-route-32-area
+johto-route-33-area
+johto-route-42-area
+kanto-route-26-area
+kanto-route-27-area
+kanto-route-3-area
+kanto-route-4-area
+kanto-route-8-area
+kanto-route-9-area
+kanto-route-10-area
+kanto-route-11-area
+kanto-route-23-area
+azalea-town-area
+johto-safari-zone-zone-marshland
diff --git a/pokeData/eldegoss b/pokeData/eldegoss
index 33d8daf..5755543 100644
--- a/pokeData/eldegoss
+++ b/pokeData/eldegoss
@@ -1,15 +1,21 @@
+eldegoss	A grass type Pokémon
 
-Name:  Eldegoss
-Pokedex Number:  830
-Gender Ratio:   ♂:50.2% ♀:49.8%
-Abilities: Cotton Down - Regenerator - Effect Spore (Hidden Ability)
+The seeds attached to its cotton fluff are full of
+nutrients. It spreads them on the wind so that
+plants and other Pokémon can benefit from them.
+
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         50
+        defense:         90
+ special-attack:         80
+special-defense:        120
+          speed:         60
+
+Pokedex ID: 830	Capture Rate: 75
+Base Exp: 161	Happiness: 50
+Height: 5	Weight: 25
+
+Genus: Cotton Bloom Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 460
-Hp:  60
-Attack:  50
-Defence:  90
-Special Attack:  80
-Special Defence:  120
-Speed:  60
diff --git a/pokeData/electabuzz b/pokeData/electabuzz
index c5d8c1c..658535b 100644
--- a/pokeData/electabuzz
+++ b/pokeData/electabuzz
@@ -1,15 +1,25 @@
+electabuzz	A electric type Pokémon
 
-Name:  Electabuzz
-Pokedex Number:  125
-Gender Ratio:   ♂:75% ♀:25%
-Abilities: Static - Vital Spirit (Hidden Ability)
+When a storm arrives, gangs of this
+POKéMON compete with each other to
+scale heights that are likely to bestricken by lightning bolts.
+Some towns use ELECTABUZZ in place of
+lightning rods.
 
-Base Stats
-----------------------
-Total: 490
-Hp:  65
-Attack:  83
-Defence:  57
-Special Attack:  95
-Special Defence:  85
-Speed:  105
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         83
+        defense:         57
+ special-attack:         95
+special-defense:         85
+          speed:        105
+
+Pokedex ID: 125	Capture Rate: 45
+Base Exp: 172	Happiness: 50
+Height: 11	Weight: 300
+
+Genus: Electric Pokémon
+Location Areas:
+sinnoh-route-222-area
+kanto-route-10-area
+power-plant-area
diff --git a/pokeData/electivire b/pokeData/electivire
index b440e36..5b77b64 100644
--- a/pokeData/electivire
+++ b/pokeData/electivire
@@ -1,15 +1,21 @@
+electivire	A electric type Pokémon
 
-Name:  Electivire
-Pokedex Number:  466
-Gender Ratio:   ♂:75% ♀:25%
-Abilities: Motor Drive - Vital Spirit (Hidden Ability)
+Encaissant les attaques, il vient
+toucher l’ennemi de ses queues
+et lui inflige une forte décharge.
+
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:        123
+        defense:         67
+ special-attack:         95
+special-defense:         85
+          speed:         95
+
+Pokedex ID: 466	Capture Rate: 30
+Base Exp: 270	Happiness: 50
+Height: 18	Weight: 1386
+
+Genus: Thunderbolt Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 540
-Hp:  75
-Attack:  123
-Defence:  67
-Special Attack:  95
-Special Defence:  85
-Speed:  95
diff --git a/pokeData/electrike b/pokeData/electrike
index 213206c..90027e7 100644
--- a/pokeData/electrike
+++ b/pokeData/electrike
@@ -1,15 +1,24 @@
+electrike	A electric type Pokémon
 
-Name:  Electrike
-Pokedex Number:  309
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Static - Lightningrod - Minus (Hidden Ability)
+Using electricity stored in its fur,
+it stimulates its muscles to
+heighten its reaction speed.
 
-Base Stats
-----------------------
-Total: 295
-Hp:  40
-Attack:  45
-Defence:  40
-Special Attack:  65
-Special Defence:  40
-Speed:  65
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         45
+        defense:         40
+ special-attack:         65
+special-defense:         40
+          speed:         65
+
+Pokedex ID: 309	Capture Rate: 120
+Base Exp: 59	Happiness: 50
+Height: 6	Weight: 152
+
+Genus: Lightning Pokémon
+Location Areas:
+valley-windworks-area
+hoenn-route-110-area
+hoenn-route-118-area
+kalos-route-10-area
diff --git a/pokeData/electrode b/pokeData/electrode
index 73ad91d..f6d8fdb 100644
--- a/pokeData/electrode
+++ b/pokeData/electrode
@@ -1,15 +1,29 @@
+electrode	A electric type Pokémon
 
-Name:  Electrode
-Pokedex Number:  101
-Gender Ratio:  Genderless
-Abilities: Soundproof - Static - Aftermath (Hidden Ability)
+One of ELECTRODE’s characteristics is
+its attraction to electricity.
+It is a problematical POKéMON thatcongregates mostly at electrical
+power plants to feed on electricity
+that has just been generated.
 
-Base Stats
-----------------------
-Total: 480
-Hp:  60
-Attack:  50
-Defence:  70
-Special Attack:  80
-Special Defence:  80
-Speed:  140
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         50
+        defense:         70
+ special-attack:         80
+special-defense:         80
+          speed:        150
+
+Pokedex ID: 101	Capture Rate: 60
+Base Exp: 172	Happiness: 70
+Height: 12	Weight: 666
+
+Genus: Ball Pokémon
+Location Areas:
+cerulean-cave-1f
+cerulean-cave-2f
+cerulean-cave-b1f
+power-plant-area
+new-mauville-area
+lost-hotel-area
+team-rocket-hq-area
diff --git a/pokeData/elekid b/pokeData/elekid
index b324a34..1f2e7ab 100644
--- a/pokeData/elekid
+++ b/pokeData/elekid
@@ -1,15 +1,25 @@
+elekid	A electric type Pokémon
 
-Name:  Elekid
-Pokedex Number:  239
-Gender Ratio:   ♂:75% ♀:25%
-Abilities: Static - Vital Spirit (Hidden Ability)
+Even in the most vicious storm, this
+POKéMON plays happily if thunder rumbles
+in the sky.
 
-Base Stats
-----------------------
-Total: 360
-Hp:  45
-Attack:  63
-Defence:  37
-Special Attack:  65
-Special Defence:  55
-Speed:  95
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         63
+        defense:         37
+ special-attack:         65
+special-defense:         55
+          speed:         95
+
+Pokedex ID: 239	Capture Rate: 45
+Base Exp: 72	Happiness: 50
+Height: 6	Weight: 235
+
+Genus: Electric Pokémon
+Location Areas:
+valley-windworks-area
+sinnoh-route-205-south-towards-floaroma-town
+johto-route-34-area
+virbank-complex-outer
+virbank-complex-inner
diff --git a/pokeData/elgyem b/pokeData/elgyem
index 01180e1..0a77642 100644
--- a/pokeData/elgyem
+++ b/pokeData/elgyem
@@ -1,15 +1,23 @@
+elgyem	A psychic type Pokémon
 
-Name:  Elgyem
-Pokedex Number:  605
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Telepathy - Synchronize - Analytic (Hidden Ability)
+강력한 사이코 파워를 다룬다.
+사이코 파워로 상대의 뇌를
+조여서 두통을 일으킨다.
 
-Base Stats
-----------------------
-Total: 335
-Hp:  55
-Attack:  55
-Defence:  55
-Special Attack:  85
-Special Defence:  55
-Speed:  30
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         55
+        defense:         55
+ special-attack:         85
+special-defense:         55
+          speed:         30
+
+Pokedex ID: 605	Capture Rate: 255
+Base Exp: 67	Happiness: 50
+Height: 5	Weight: 90
+
+Genus: Cerebral Pokémon
+Location Areas:
+celestial-tower-3f
+celestial-tower-4f
+celestial-tower-5f
diff --git a/pokeData/emboar b/pokeData/emboar
index bd52ece..fdf48b1 100644
--- a/pokeData/emboar
+++ b/pokeData/emboar
@@ -1,15 +1,21 @@
+emboar	A fire type Pokémon
 
-Name:  Emboar
-Pokedex Number:  500
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Blaze - Reckless (Hidden Ability)
+턱의 화염으로 주먹을 불태워
+불꽃펀치를 날린다.
+동료애가 깊은 포켓몬이다.
+
+   ↞--------| STATS |--------↠ 
+             hp:        110
+         attack:        123
+        defense:         65
+ special-attack:        100
+special-defense:         65
+          speed:         65
+
+Pokedex ID: 500	Capture Rate: 45
+Base Exp: 238	Happiness: 70
+Height: 16	Weight: 1500
+
+Genus: Mega Fire Pig Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 528
-Hp:  110
-Attack:  123
-Defence:  65
-Special Attack:  100
-Special Defence:  65
-Speed:  65
diff --git a/pokeData/emolga b/pokeData/emolga
index f7cdc2b..aadbad6 100644
--- a/pokeData/emolga
+++ b/pokeData/emolga
@@ -1,15 +1,41 @@
+emolga	A electric type Pokémon
 
-Name:  Emolga
-Pokedex Number:  587
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Static - Motor Drive (Hidden Ability)
+숲의 나무 위에 산다.
+망토 같은 막의 안쪽을
+방전시키며 활공한다.
 
-Base Stats
-----------------------
-Total: 428
-Hp:  55
-Attack:  75
-Defence:  60
-Special Attack:  75
-Special Defence:  60
-Speed:  103
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         75
+        defense:         60
+ special-attack:         75
+special-defense:         60
+          speed:        103
+
+Pokedex ID: 587	Capture Rate: 200
+Base Exp: 150	Happiness: 50
+Height: 4	Weight: 50
+
+Genus: Sky Squirrel Pokémon
+Location Areas:
+dragonspiral-tower-entrance
+dragonspiral-tower-outside
+giant-chasm-outside
+village-bridge-area
+unova-route-5-area
+unova-route-6-area
+unova-route-7-area
+unova-route-9-area
+unova-route-10-area
+unova-route-10-victory-road-gate
+unova-route-11-area
+unova-route-12-area
+unova-route-13-area
+unova-route-14-area
+abundant-shrine-area
+unova-route-15-area
+unova-route-16-area
+lostlorn-forest-area
+unova-route-22-area
+unova-route-23-area
+kalos-route-10-area
diff --git a/pokeData/empoleon b/pokeData/empoleon
index 22ce59b..6c0b15e 100644
--- a/pokeData/empoleon
+++ b/pokeData/empoleon
@@ -1,15 +1,21 @@
+empoleon	A water type Pokémon
 
-Name:  Empoleon
-Pokedex Number:  395
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Torrent - Defiant (Hidden Ability)
+S’il voit son honneur bafoué, il
+est capable de faire des ravages
+avec ses ailes tranchantes.
+
+   ↞--------| STATS |--------↠ 
+             hp:         84
+         attack:         86
+        defense:         88
+ special-attack:        111
+special-defense:        101
+          speed:         60
+
+Pokedex ID: 395	Capture Rate: 45
+Base Exp: 239	Happiness: 70
+Height: 17	Weight: 845
+
+Genus: Emperor Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 530
-Hp:  84
-Attack:  86
-Defence:  88
-Special Attack:  111
-Special Defence:  101
-Speed:  60
diff --git a/pokeData/enamorus b/pokeData/enamorus
index 5f39163..a1b7143 100644
--- a/pokeData/enamorus
+++ b/pokeData/enamorus
@@ -1,15 +1,13 @@
+	A  type Pokémon
 
-Name:  Enamorus
-Pokedex Number:  905
-Gender Ratio:   ♂:0% ♀:100% 
-Abilities: Cute Charm - Contrary (Hidden) (Incarnate Forme) - Overcoat (Therian Forme
+                null
+
+   ↞--------| STATS |--------↠ 
+
+Pokedex ID: 	Capture Rate: 3
+Base Exp: 	Happiness: null
+Height: 	Weight: 
+
+Genus: null
+Location Areas:
 
-Base Stats
-----------------------
-Total: 580
-Hp:  74
-Attack:  115
-Defence:  110
-Special Attack:  135
-Special Defence:  100
-Speed:  46
diff --git a/pokeData/entei b/pokeData/entei
index 0e2b22b..16dffd8 100644
--- a/pokeData/entei
+++ b/pokeData/entei
@@ -1,15 +1,22 @@
+entei	A fire type Pokémon
 
-Name:  Entei
-Pokedex Number:  244
-Gender Ratio:  Genderless
-Abilities: Pressure - Flash Fire (Hidden Ability)
+Volcanoes erupt when it barks. Unable to
+restrain its extreme power, it races
+headlong around the land.
 
-Base Stats
-----------------------
-Total: 580
-Hp:  115
-Attack:  115
-Defence:  85
-Special Attack:  90
-Special Defence:  75
-Speed:  100
+   ↞--------| STATS |--------↠ 
+             hp:        115
+         attack:        115
+        defense:         85
+ special-attack:         90
+special-defense:         75
+          speed:        100
+
+Pokedex ID: 244	Capture Rate: 3
+Base Exp: 290	Happiness: 35
+Height: 21	Weight: 1980
+
+Genus: Volcano Pokémon
+Location Areas:
+roaming-kanto-area
+roaming-johto-area
diff --git a/pokeData/escavalier b/pokeData/escavalier
index e8d97b9..6131585 100644
--- a/pokeData/escavalier
+++ b/pokeData/escavalier
@@ -1,15 +1,21 @@
+escavalier	A bug type Pokémon
 
-Name:  Escavalier
-Pokedex Number:  589
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Swarm - Shell Armor - Overcoat (Hidden Ability)
+チョボマキから　うばった　カラで
+からだを　おおい　ガードしながら
+２ほんの　ヤリで　つついてくる。
+
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:        135
+        defense:        105
+ special-attack:         60
+special-defense:        105
+          speed:         20
+
+Pokedex ID: 589	Capture Rate: 75
+Base Exp: 173	Happiness: 50
+Height: 10	Weight: 330
+
+Genus: Cavalry Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 495
-Hp:  70
-Attack:  135
-Defence:  105
-Special Attack:  60
-Special Defence:  105
-Speed:  20
diff --git a/pokeData/espeon b/pokeData/espeon
index 2ce66e1..a35cb5c 100644
--- a/pokeData/espeon
+++ b/pokeData/espeon
@@ -1,15 +1,21 @@
+espeon	A psychic type Pokémon
 
-Name:  Espeon
-Pokedex Number:  196
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Synchronize - Magic Bounce (Hidden Ability)
+It uses the fine hair that covers its body
+to sense air currents and predict its
+enemy’s actions.
+
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         65
+        defense:         60
+ special-attack:        130
+special-defense:         95
+          speed:        110
+
+Pokedex ID: 196	Capture Rate: 45
+Base Exp: 184	Happiness: 50
+Height: 9	Weight: 265
+
+Genus: Sun Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 525
-Hp:  65
-Attack:  65
-Defence:  60
-Special Attack:  130
-Special Defence:  95
-Speed:  110
diff --git a/pokeData/espurr b/pokeData/espurr
index 09207d2..3664792 100644
--- a/pokeData/espurr
+++ b/pokeData/espurr
@@ -1,15 +1,21 @@
+espurr	A psychic type Pokémon
 
-Name:  Espurr
-Pokedex Number:  677
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Keen Eye - Infiltrator - Own Tempo (Hidden Ability)
+強力な　サイコパワーが
+漏れ出さないように　放出する　器官を
+耳で　ふさいでいるのだ。
 
-Base Stats
-----------------------
-Total: 355
-Hp:  62
-Attack:  48
-Defence:  54
-Special Attack:  63
-Special Defence:  60
-Speed:  68
+   ↞--------| STATS |--------↠ 
+             hp:         62
+         attack:         48
+        defense:         54
+ special-attack:         63
+special-defense:         60
+          speed:         68
+
+Pokedex ID: 677	Capture Rate: 190
+Base Exp: 71	Happiness: 50
+Height: 3	Weight: 35
+
+Genus: Restraint Pokémon
+Location Areas:
+kalos-route-6-area
diff --git a/pokeData/eternatus b/pokeData/eternatus
index d341c46..b0f9d2c 100644
--- a/pokeData/eternatus
+++ b/pokeData/eternatus
@@ -1,15 +1,21 @@
+eternatus	A poison type Pokémon
 
-Name:  Eternatus
-Pokedex Number:  890
-Gender Ratio:  Genderless
-Abilities: Pressure
+The core on its chest absorbs energy emanating
+from the lands of the Galar region. This energy is
+what allows Eternatus to stay active.
+
+   ↞--------| STATS |--------↠ 
+             hp:        140
+         attack:         85
+        defense:         95
+ special-attack:        145
+special-defense:         95
+          speed:        130
+
+Pokedex ID: 890	Capture Rate: 255
+Base Exp: 345	Happiness: 0
+Height: 200	Weight: 9500
+
+Genus: Gigantic Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 690
-Hp:  140
-Attack:  85
-Defence:  95
-Special Attack:  145
-Special Defence:  95
-Speed:  130
diff --git a/pokeData/excadrill b/pokeData/excadrill
index 9889960..97bb2b9 100644
--- a/pokeData/excadrill
+++ b/pokeData/excadrill
@@ -1,15 +1,66 @@
+excadrill	A ground type Pokémon
 
-Name:  Excadrill
-Pokedex Number:  530
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Sand Rush - Sand Force - Mold Breaker (Hidden Ability)
+강철로 진화한 드릴은
+철판을 뚫는 파괴력을 가졌다.
+터널 공사에서 크게 활약한다.
 
-Base Stats
-----------------------
-Total: 508
-Hp:  110
-Attack:  135
-Defence:  60
-Special Attack:  50
-Special Defence:  65
-Speed:  88
+   ↞--------| STATS |--------↠ 
+             hp:        110
+         attack:        135
+        defense:         60
+ special-attack:         50
+special-defense:         65
+          speed:         88
+
+Pokedex ID: 530	Capture Rate: 60
+Base Exp: 178	Happiness: 50
+Height: 7	Weight: 404
+
+Genus: Subterrene Pokémon
+Location Areas:
+twist-mountain-area
+unova-victory-road-unknown-area-53
+unova-victory-road-unknown-area-54
+unova-victory-road-unknown-area-55
+unova-victory-road-unknown-area-56
+unova-victory-road-unknown-area-57
+unova-victory-road-unknown-area-58
+unova-victory-road-unknown-area-59
+unova-victory-road-unknown-area-60
+unova-victory-road-unknown-area-61
+unova-victory-road-unknown-area-62
+unova-victory-road-unknown-area-63
+unova-victory-road-unknown-area-64
+unova-victory-road-unknown-area-65
+unova-victory-road-unknown-area-66
+trial-chamber-area
+giant-chasm-area
+giant-chasm-forest-cave
+wellspring-cave-area
+challengers-cave-1f
+challengers-cave-b1f
+challengers-cave-b2f
+unova-victory-road-7f
+unova-victory-road-2-unknown-area-74
+unova-victory-road-2-unknown-area-75
+unova-victory-road-2-unknown-area-77
+unova-victory-road-2-unknown-area-80
+reversal-mountain-unknown-area-49
+reversal-mountain-unknown-area-50
+reversal-mountain-unknown-area-51
+reversal-mountain-unknown-area-52
+reversal-mountain-unknown-area-53
+reversal-mountain-unknown-area-54
+reversal-mountain-unknown-area-55
+reversal-mountain-unknown-area-56
+reversal-mountain-unknown-area-57
+reversal-mountain-unknown-area-58
+reversal-mountain-unknown-area-59
+reversal-mountain-unknown-area-60
+clay-tunnel-area
+underground-ruins-area
+rocky-mountain-room-area
+glacier-room-area
+iron-room-area
+seaside-cave-1f
+seaside-cave-b1f
diff --git a/pokeData/exeggcute b/pokeData/exeggcute
index 6519e78..52a7d90 100644
--- a/pokeData/exeggcute
+++ b/pokeData/exeggcute
@@ -1,15 +1,44 @@
+exeggcute	A grass type Pokémon
 
-Name:  Exeggcute
-Pokedex Number:  102
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Chlorophyll - Harvest (Hidden Ability)
+This POKéMON consists of six eggs that
+form a closely knit cluster. The six eggs
+attract each other and spin around.When cracks increasingly appear on the
+eggs, EXEGGCUTE is close to evolution.
 
-Base Stats
-----------------------
-Total: 325
-Hp:  60
-Attack:  40
-Defence:  80
-Special Attack:  60
-Special Defence:  45
-Speed:  40
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         40
+        defense:         80
+ special-attack:         60
+special-defense:         45
+          speed:         40
+
+Pokedex ID: 102	Capture Rate: 90
+Base Exp: 65	Happiness: 50
+Height: 4	Weight: 25
+
+Genus: Egg Pokémon
+Location Areas:
+johto-route-29-area
+johto-route-30-area
+johto-route-31-area
+johto-route-32-area
+ilex-forest-area
+johto-route-34-area
+johto-route-35-area
+johto-route-36-area
+johto-route-37-area
+johto-route-38-area
+johto-route-39-area
+johto-route-43-area
+lake-of-rage-area
+kanto-route-26-area
+kanto-route-27-area
+kanto-safari-zone-middle
+kanto-safari-zone-area-1-east
+kanto-safari-zone-area-2-north
+kanto-safari-zone-area-3-west
+berry-forest-area
+kalos-route-12-area
+azure-bay-area
+azalea-town-area
diff --git a/pokeData/exeggutor b/pokeData/exeggutor
index 53755ab..78ac235 100644
--- a/pokeData/exeggutor
+++ b/pokeData/exeggutor
@@ -1,15 +1,22 @@
+exeggutor	A grass type Pokémon
 
-Name:  Exeggutor
-Pokedex Number:  103
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Chlorophyll - Harvest (Hidden Ability)
+EXEGGUTOR originally came from the
+tropics. Its heads steadily grow larger
+from exposure to strong sunlight.It is said that when the heads fall off,
+they group together to form EXEGGCUTE.
+
+   ↞--------| STATS |--------↠ 
+             hp:         95
+         attack:         95
+        defense:         85
+ special-attack:        125
+special-defense:         75
+          speed:         55
+
+Pokedex ID: 103	Capture Rate: 45
+Base Exp: 186	Happiness: 50
+Height: 20	Weight: 1200
+
+Genus: Coconut Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 520
-Hp:  95
-Attack:  95
-Defence:  85
-Special Attack:  125
-Special Defence:  65
-Speed:  55
diff --git a/pokeData/exploud b/pokeData/exploud
index 3d771a9..d67e15d 100644
--- a/pokeData/exploud
+++ b/pokeData/exploud
@@ -1,15 +1,21 @@
+exploud	A normal type Pokémon
 
-Name:  Exploud
-Pokedex Number:  295
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Soundproof - Scrappy (Hidden Ability)
+Its howls can be heard over six
+miles away. It emits all sorts of
+noises from the ports on its body.
+
+   ↞--------| STATS |--------↠ 
+             hp:        104
+         attack:         91
+        defense:         63
+ special-attack:         91
+special-defense:         73
+          speed:         68
+
+Pokedex ID: 295	Capture Rate: 45
+Base Exp: 245	Happiness: 50
+Height: 15	Weight: 840
+
+Genus: Loud Noise Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 490
-Hp:  104
-Attack:  91
-Defence:  63
-Special Attack:  91
-Special Defence:  73
-Speed:  68
diff --git a/pokeData/falinks b/pokeData/falinks
index 2d444af..d969c4b 100644
--- a/pokeData/falinks
+++ b/pokeData/falinks
@@ -1,15 +1,20 @@
+falinks	A fighting type Pokémon
 
-Name:  Falinks
-Pokedex Number:  870
-Gender Ratio:  Genderless
-Abilities: Battle Armor - Defiant (Hidden Ability)
+Five of them are troopers, and one is the brass.
+The brass’s orders are absolute.
+
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:        100
+        defense:        100
+ special-attack:         70
+special-defense:         60
+          speed:         75
+
+Pokedex ID: 870	Capture Rate: 45
+Base Exp: 165	Happiness: 50
+Height: 30	Weight: 620
+
+Genus: Formation Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 470
-Hp:  65
-Attack:  100
-Defence:  100
-Special Attack:  70
-Special Defence:  60
-Speed:  75
diff --git a/pokeData/farfetchd b/pokeData/farfetchd
index befedc4..8525629 100644
--- a/pokeData/farfetchd
+++ b/pokeData/farfetchd
@@ -1 +1,31 @@
-You didn't enter a valid pokemon!
+farfetchd	A normal type Pokémon
+
+FARFETCH’D is always seen with a stick
+from a plant of some sort. Apparently,
+there are good sticks and bad sticks.This POKéMON has been known to fight
+with others over sticks.
+
+   ↞--------| STATS |--------↠ 
+             hp:         52
+         attack:         90
+        defense:         55
+ special-attack:         58
+special-defense:         62
+          speed:         60
+
+Pokedex ID: 83	Capture Rate: 45
+Base Exp: 132	Happiness: 50
+Height: 8	Weight: 150
+
+Genus: Wild Duck Pokémon
+Location Areas:
+sinnoh-route-221-area
+johto-route-38-area
+johto-route-39-area
+johto-route-43-area
+johto-route-47-area
+kanto-route-12-area
+johto-route-48-area
+kanto-route-13-area
+kalos-route-22-area
+johto-safari-zone-zone-wetland
diff --git a/pokeData/fearow b/pokeData/fearow
index 4a1bf22..5094fb1 100644
--- a/pokeData/fearow
+++ b/pokeData/fearow
@@ -1,15 +1,47 @@
+fearow	A normal type Pokémon
 
-Name:  Fearow
-Pokedex Number:  022
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Keen Eye - Sniper (Hidden Ability)
+FEAROW is recognized by its long neck
+and elongated beak.
+They are conveniently shaped forcatching prey in soil or water.
+It deftly moves its long and skinny
+beak to pluck prey.
 
-Base Stats
-----------------------
-Total: 442
-Hp:  65
-Attack:  90
-Defence:  65
-Special Attack:  61
-Special Defence:  61
-Speed:  100
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         90
+        defense:         65
+ special-attack:         61
+special-defense:         61
+          speed:        100
+
+Pokedex ID: 22	Capture Rate: 90
+Base Exp: 155	Happiness: 70
+Height: 12	Weight: 380
+
+Genus: Beak Pokémon
+Location Areas:
+stark-mountain-area
+sinnoh-route-225-area
+sinnoh-route-227-area
+sinnoh-sea-route-226-area
+johto-route-42-area
+johto-route-47-area
+johto-route-48-area
+kanto-route-9-area
+kanto-route-10-area
+kanto-route-16-area
+kanto-route-17-area
+kanto-route-18-area
+kanto-route-22-area
+kanto-route-23-area
+mt-ember-area
+kindle-road-area
+treasure-beach-area
+cape-brink-area
+water-path-area
+ruin-valley-area
+canyon-entrance-area
+sevault-canyon-area
+unova-route-15-area
+johto-safari-zone-zone-desert
+johto-safari-zone-zone-wasteland
diff --git a/pokeData/feebas b/pokeData/feebas
index 1998772..2b781ce 100644
--- a/pokeData/feebas
+++ b/pokeData/feebas
@@ -1,15 +1,22 @@
+feebas	A water type Pokémon
 
-Name:  Feebas
-Pokedex Number:  349
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Swift Swim - Oblivious - Adaptability (Hidden Ability)
+It is a shabby and ugly Pokémon.
+However, it is very hardy and
+can survive on little water.
 
-Base Stats
-----------------------
-Total: 200
-Hp:  20
-Attack:  15
-Defence:  20
-Special Attack:  10
-Special Defence:  55
-Speed:  80
+   ↞--------| STATS |--------↠ 
+             hp:         20
+         attack:         15
+        defense:         20
+ special-attack:         10
+special-defense:         55
+          speed:         80
+
+Pokedex ID: 349	Capture Rate: 255
+Base Exp: 40	Happiness: 50
+Height: 6	Weight: 74
+
+Genus: Fish Pokémon
+Location Areas:
+hoenn-route-119-area
+unova-route-1-area
diff --git a/pokeData/fennekin b/pokeData/fennekin
index 0e9c06b..90f7e1c 100644
--- a/pokeData/fennekin
+++ b/pokeData/fennekin
@@ -1,15 +1,21 @@
+fennekin	A fire type Pokémon
 
-Name:  Fennekin
-Pokedex Number:  653
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Blaze - Magician (Hidden Ability)
+小枝を　食べると　元気になって
+摂氏２００度を　超える　熱気を
+大きな　耳から　噴き出す。
 
-Base Stats
-----------------------
-Total: 307
-Hp:  40
-Attack:  45
-Defence:  40
-Special Attack:  62
-Special Defence:  60
-Speed:  60
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         45
+        defense:         40
+ special-attack:         62
+special-defense:         60
+          speed:         60
+
+Pokedex ID: 653	Capture Rate: 45
+Base Exp: 61	Happiness: 70
+Height: 4	Weight: 94
+
+Genus: Fox Pokémon
+Location Areas:
+aquacorde-town-area
diff --git a/pokeData/feraligatr b/pokeData/feraligatr
index 0d74c43..4a5c3a5 100644
--- a/pokeData/feraligatr
+++ b/pokeData/feraligatr
@@ -1,15 +1,21 @@
+feraligatr	A water type Pokémon
 
-Name:  Feraligatr
-Pokedex Number:  160
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Torrent - Sheer Force (Hidden Ability)
+When it bites with its massive and
+powerful jaws, it shakes its head and
+savagely tears up its victim.
+
+   ↞--------| STATS |--------↠ 
+             hp:         85
+         attack:        105
+        defense:        100
+ special-attack:         79
+special-defense:         83
+          speed:         78
+
+Pokedex ID: 160	Capture Rate: 45
+Base Exp: 239	Happiness: 70
+Height: 23	Weight: 888
+
+Genus: Big Jaw Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 530
-Hp:  85
-Attack:  105
-Defence:  100
-Special Attack:  79
-Special Defence:  83
-Speed:  78
diff --git a/pokeData/ferroseed b/pokeData/ferroseed
index c0fb9b0..bcd6992 100644
--- a/pokeData/ferroseed
+++ b/pokeData/ferroseed
@@ -1,15 +1,23 @@
+ferroseed	A grass type Pokémon
 
-Name:  Ferroseed
-Pokedex Number:  597
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Iron Barbs
+위험을 감지하면 가시를
+일제히 발사하여 반격한다.
+그 틈에 몸을 굴려 도망간다.
 
-Base Stats
-----------------------
-Total: 305
-Hp:  44
-Attack:  50
-Defence:  91
-Special Attack:  24
-Special Defence:  86
-Speed:  10
+   ↞--------| STATS |--------↠ 
+             hp:         44
+         attack:         50
+        defense:         91
+ special-attack:         24
+special-defense:         86
+          speed:         10
+
+Pokedex ID: 597	Capture Rate: 255
+Base Exp: 61	Happiness: 50
+Height: 6	Weight: 188
+
+Genus: Thorn Seed Pokémon
+Location Areas:
+chargestone-cave-1f
+chargestone-cave-b1f
+chargestone-cave-b2f
diff --git a/pokeData/ferrothorn b/pokeData/ferrothorn
index 474b74d..b62af7c 100644
--- a/pokeData/ferrothorn
+++ b/pokeData/ferrothorn
@@ -1,15 +1,21 @@
+ferrothorn	A grass type Pokémon
 
-Name:  Ferrothorn
-Pokedex Number:  598
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Iron Barbs - Anticipation (Hidden Ability)
+3개의 촉수를 세게 내리치고
+거기에 가시를 날려 상대를
+흔적도 없이 분쇄한다.
+
+   ↞--------| STATS |--------↠ 
+             hp:         74
+         attack:         94
+        defense:        131
+ special-attack:         54
+special-defense:        116
+          speed:         20
+
+Pokedex ID: 598	Capture Rate: 90
+Base Exp: 171	Happiness: 50
+Height: 10	Weight: 1100
+
+Genus: Thorn Pod Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 489
-Hp:  74
-Attack:  94
-Defence:  131
-Special Attack:  54
-Special Defence:  116
-Speed:  20
diff --git a/pokeData/finneon b/pokeData/finneon
index cbd000a..d30030c 100644
--- a/pokeData/finneon
+++ b/pokeData/finneon
@@ -1,15 +1,35 @@
+finneon	A water type Pokémon
 
-Name:  Finneon
-Pokedex Number:  456
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Swift Swim - Storm Drain - Water Veil (Hidden Ability)
+The line running down its side can
+store sunlight. It shines vividly at
+night.
 
-Base Stats
-----------------------
-Total: 330
-Hp:  49
-Attack:  49
-Defence:  56
-Special Attack:  49
-Special Defence:  61
-Speed:  66
+   ↞--------| STATS |--------↠ 
+             hp:         49
+         attack:         49
+        defense:         56
+ special-attack:         49
+special-defense:         61
+          speed:         66
+
+Pokedex ID: 456	Capture Rate: 190
+Base Exp: 66	Happiness: 70
+Height: 4	Weight: 70
+
+Genus: Wing Fish Pokémon
+Location Areas:
+canalave-city-area
+valley-windworks-area
+fuego-ironworks-area
+iron-island-area
+sinnoh-route-205-south-towards-floaroma-town
+sinnoh-route-218-area
+sinnoh-route-219-area
+sinnoh-route-221-area
+sinnoh-sea-route-220-area
+p2-laboratory-area
+unova-route-4-area
+unova-route-18-area
+unova-route-17-area
+virbank-city-area
+virbank-complex-outer
diff --git a/pokeData/flaaffy b/pokeData/flaaffy
index 24e374b..0b7de77 100644
--- a/pokeData/flaaffy
+++ b/pokeData/flaaffy
@@ -1,15 +1,23 @@
+flaaffy	A electric type Pokémon
 
-Name:  Flaaffy
-Pokedex Number:  180
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Static - Plus (Hidden Ability)
+Its fluffy fleece easily stores
+electricity. Its rubbery hide keeps it
+from being electrocuted.
 
-Base Stats
-----------------------
-Total: 365
-Hp:  70
-Attack:  55
-Defence:  55
-Special Attack:  80
-Special Defence:  60
-Speed:  45
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         55
+        defense:         55
+ special-attack:         80
+special-defense:         60
+          speed:         45
+
+Pokedex ID: 180	Capture Rate: 120
+Base Exp: 128	Happiness: 70
+Height: 8	Weight: 133
+
+Genus: Wool Pokémon
+Location Areas:
+sinnoh-route-222-area
+johto-route-42-area
+johto-route-43-area
diff --git a/pokeData/flabebe b/pokeData/flabebe
index befedc4..8718b81 100644
--- a/pokeData/flabebe
+++ b/pokeData/flabebe
@@ -1 +1,22 @@
-You didn't enter a valid pokemon!
+flabebe	A fairy type Pokémon
+
+Puede controlar el poder oculto de las flores. La flor
+que lleva consigo es como si formara parte de su
+cuerpo.
+
+   ↞--------| STATS |--------↠ 
+             hp:         44
+         attack:         38
+        defense:         39
+ special-attack:         61
+special-defense:         79
+          speed:         42
+
+Pokedex ID: 669	Capture Rate: 225
+Base Exp: 61	Happiness: 70
+Height: 1	Weight: 1
+
+Genus: Single Bloom Pokémon
+Location Areas:
+kalos-route-4-area
+kalos-route-7-area
diff --git a/pokeData/flapple b/pokeData/flapple
index 3318aa7..c4dd276 100644
--- a/pokeData/flapple
+++ b/pokeData/flapple
@@ -1,15 +1,21 @@
+flapple	A grass type Pokémon
 
-Name:  Flapple
-Pokedex Number:  841
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Ripen - Gluttony - Hustle (Hidden Ability)
+It ate a sour apple, and that induced its
+evolution. In its cheeks, it stores an acid
+capable of causing chemical burns.
+
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:        110
+        defense:         80
+ special-attack:         95
+special-defense:         60
+          speed:         70
+
+Pokedex ID: 841	Capture Rate: 45
+Base Exp: 170	Happiness: 50
+Height: 3	Weight: 10
+
+Genus: Apple Wing Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 485
-Hp:  70
-Attack:  110
-Defence:  80
-Special Attack:  95
-Special Defence:  60
-Speed:  70
diff --git a/pokeData/flareon b/pokeData/flareon
index e645b6c..d82f134 100644
--- a/pokeData/flareon
+++ b/pokeData/flareon
@@ -1,15 +1,23 @@
+flareon	A fire type Pokémon
 
-Name:  Flareon
-Pokedex Number:  136
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Flash Fire - Guts (Hidden Ability)
+FLAREON’s fluffy fur has a functional
+purpose - it releases heat into the air
+so that its body does not getexcessively hot.
+This POKéMON’s body temperature can
+rise to a maximum of 1,650 degrees F.
+
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:        130
+        defense:         60
+ special-attack:         95
+special-defense:        110
+          speed:         65
+
+Pokedex ID: 136	Capture Rate: 45
+Base Exp: 184	Happiness: 50
+Height: 9	Weight: 250
+
+Genus: Flame Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 525
-Hp:  65
-Attack:  130
-Defence:  60
-Special Attack:  95
-Special Defence:  110
-Speed:  65
diff --git a/pokeData/fletchinder b/pokeData/fletchinder
index c327d23..b903494 100644
--- a/pokeData/fletchinder
+++ b/pokeData/fletchinder
@@ -1,15 +1,21 @@
+fletchinder	A fire type Pokémon
 
-Name:  Fletchinder
-Pokedex Number:  662
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Flame Body - Gale Wings (Hidden Ability)
+火の粉を　クチバシから　飛ばして
+草むらを　焦がし　驚いて
+飛び出した　獲物を　捕まえる。
+
+   ↞--------| STATS |--------↠ 
+             hp:         62
+         attack:         73
+        defense:         55
+ special-attack:         56
+special-defense:         52
+          speed:         84
+
+Pokedex ID: 662	Capture Rate: 120
+Base Exp: 134	Happiness: 50
+Height: 7	Weight: 160
+
+Genus: Ember Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 382
-Hp:  62
-Attack:  73
-Defence:  55
-Special Attack:  56
-Special Defence:  52
-Speed:  84
diff --git a/pokeData/fletchling b/pokeData/fletchling
index 415ced8..5070a30 100644
--- a/pokeData/fletchling
+++ b/pokeData/fletchling
@@ -1,15 +1,23 @@
+fletchling	A normal type Pokémon
 
-Name:  Fletchling
-Pokedex Number:  661
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Big Pecks - Gale Wings (Hidden Ability)
+人懐っこい　性格。美しい　さえずりと
+尾羽を　振る　動きで
+仲間に　合図を　送る。
 
-Base Stats
-----------------------
-Total: 278
-Hp:  45
-Attack:  50
-Defence:  43
-Special Attack:  40
-Special Defence:  38
-Speed:  62
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         50
+        defense:         43
+ special-attack:         40
+special-defense:         38
+          speed:         62
+
+Pokedex ID: 661	Capture Rate: 255
+Base Exp: 56	Happiness: 50
+Height: 3	Weight: 17
+
+Genus: Tiny Robin Pokémon
+Location Areas:
+kalos-route-2-area
+kalos-route-3-area
+santalune-forest-area
diff --git a/pokeData/floatzel b/pokeData/floatzel
index 81a8059..01c73ec 100644
--- a/pokeData/floatzel
+++ b/pokeData/floatzel
@@ -1,15 +1,47 @@
+floatzel	A water type Pokémon
 
-Name:  Floatzel
-Pokedex Number:  419
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Swift Swim - Water Veil (Hidden Ability)
+Il chasse souvent près des ports
+de pêche où il sauve parfois les
+gens tombés à la mer.
 
-Base Stats
-----------------------
-Total: 495
-Hp:  85
-Attack:  105
-Defence:  55
-Special Attack:  85
-Special Defence:  50
-Speed:  115
+   ↞--------| STATS |--------↠ 
+             hp:         85
+         attack:        105
+        defense:         55
+ special-attack:         85
+special-defense:         50
+          speed:        115
+
+Pokedex ID: 419	Capture Rate: 75
+Base Exp: 173	Happiness: 70
+Height: 11	Weight: 335
+
+Genus: Sea Weasel Pokémon
+Location Areas:
+fuego-ironworks-area
+sinnoh-victory-road-b1f
+sinnoh-victory-road-inside-b1f
+sinnoh-victory-road-inside
+sinnoh-victory-road-inside-exit
+sinnoh-route-213-area
+sinnoh-route-218-area
+sinnoh-route-221-area
+sinnoh-route-222-area
+sinnoh-route-224-area
+sinnoh-sea-route-230-area
+unova-route-11-area
+unova-route-14-area
+lostlorn-forest-area
+unova-victory-road-2-unknown-area-73
+unova-victory-road-2-unknown-area-79
+nature-sanctuary-area
+unova-route-23-area
+couriway-town-area
+kalos-route-15-area
+kalos-route-16-area
+kalos-route-21-area
+frost-cavern-unknown-area-313
+frost-cavern-unknown-area-315
+kalos-victory-road-unknown-area-322
+kalos-victory-road-unknown-area-327
+kalos-victory-road-unknown-area-328
diff --git a/pokeData/floette b/pokeData/floette
index db4bca4..61c67c5 100644
--- a/pokeData/floette
+++ b/pokeData/floette
@@ -1,15 +1,21 @@
+floette	A fairy type Pokémon
 
-Name:  Floette
-Pokedex Number:  670
-Gender Ratio:   ♂:0% ♀:100%
-Abilities: Flower Veil - Symbiosis (Hidden Ability)
+花畑を　飛び回り　枯れかけた　花を
+世話する。花の　秘められた　力を
+引き出して　戦う。
+
+   ↞--------| STATS |--------↠ 
+             hp:         54
+         attack:         45
+        defense:         47
+ special-attack:         75
+special-defense:         98
+          speed:         52
+
+Pokedex ID: 670	Capture Rate: 120
+Base Exp: 130	Happiness: 70
+Height: 2	Weight: 9
+
+Genus: Single Bloom Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 371
-Hp:  74
-Attack:  65
-Defence:  67
-Special Attack:  125
-Special Defence:  128
-Speed:  92
diff --git a/pokeData/florges b/pokeData/florges
index 4b67c45..6a34532 100644
--- a/pokeData/florges
+++ b/pokeData/florges
@@ -1,15 +1,21 @@
+florges	A fairy type Pokémon
 
-Name:  Florges
-Pokedex Number:  671
-Gender Ratio:   ♂:0% ♀:100%
-Abilities: Flower Veil - Symbiosis (Hidden Ability)
+テリトリーは　見事な　花園。
+草花の　放つ　エネルギーを　浴びて
+自分の　パワーにするのだ。
+
+   ↞--------| STATS |--------↠ 
+             hp:         78
+         attack:         65
+        defense:         68
+ special-attack:        112
+special-defense:        154
+          speed:         75
+
+Pokedex ID: 671	Capture Rate: 45
+Base Exp: 248	Happiness: 70
+Height: 11	Weight: 100
+
+Genus: Garden Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 552
-Hp:  78
-Attack:  65
-Defence:  68
-Special Attack:  112
-Special Defence:  154
-Speed:  75
diff --git a/pokeData/flygon b/pokeData/flygon
index 67ee64d..b69a34f 100644
--- a/pokeData/flygon
+++ b/pokeData/flygon
@@ -1,15 +1,21 @@
+flygon	A ground type Pokémon
 
-Name:  Flygon
-Pokedex Number:  330
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Levitate
+It whips up sandstorms with
+powerful flaps of its wings. It is
+known as “The Desert Spirit.”
+
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:        100
+        defense:         80
+ special-attack:         80
+special-defense:         80
+          speed:        100
+
+Pokedex ID: 330	Capture Rate: 45
+Base Exp: 260	Happiness: 50
+Height: 20	Weight: 820
+
+Genus: Mystic Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 520
-Hp:  80
-Attack:  100
-Defence:  80
-Special Attack:  80
-Special Defence:  80
-Speed:  100
diff --git a/pokeData/fomantis b/pokeData/fomantis
index 75d3975..2d115ef 100644
--- a/pokeData/fomantis
+++ b/pokeData/fomantis
@@ -1,15 +1,21 @@
+fomantis	A grass type Pokémon
 
-Name:  Fomantis
-Pokedex Number:  753
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Leaf Guard - Contrary (Hidden Ability)
+During the day, it sleeps and soaks up light.
+When night falls, it walks around looking
+for a safer place to sleep.
+
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         55
+        defense:         35
+ special-attack:         50
+special-defense:         35
+          speed:         35
+
+Pokedex ID: 753	Capture Rate: 190
+Base Exp: 50	Happiness: 50
+Height: 3	Weight: 15
+
+Genus: Sickle Grass Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 250
-Hp:  40
-Attack:  55
-Defence:  35
-Special Attack:  50
-Special Defence:  35
-Speed:  35
diff --git a/pokeData/foongus b/pokeData/foongus
index 3212beb..ba2c688 100644
--- a/pokeData/foongus
+++ b/pokeData/foongus
@@ -1,15 +1,26 @@
+foongus	A grass type Pokémon
 
-Name:  Foongus
-Pokedex Number:  590
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Effect Spore - Regenerator (Hidden Ability)
+몬스터볼을 닮은 무늬로
+유인한 후 독 포자를 뿌려댄다.
+왜 닮았는지는 불가사의다.
 
-Base Stats
-----------------------
-Total: 294
-Hp:  69
-Attack:  55
-Defence:  45
-Special Attack:  55
-Special Defence:  55
-Speed:  15
+   ↞--------| STATS |--------↠ 
+             hp:         69
+         attack:         55
+        defense:         45
+ special-attack:         55
+special-defense:         55
+          speed:         15
+
+Pokedex ID: 590	Capture Rate: 190
+Base Exp: 59	Happiness: 50
+Height: 2	Weight: 10
+
+Genus: Mushroom Pokémon
+Location Areas:
+unova-route-6-area
+unova-route-7-area
+unova-route-10-area
+unova-route-10-victory-road-gate
+kalos-route-15-area
+kalos-route-16-area
diff --git a/pokeData/forretress b/pokeData/forretress
index d9afdeb..a2be2bb 100644
--- a/pokeData/forretress
+++ b/pokeData/forretress
@@ -1,15 +1,21 @@
+forretress	A bug type Pokémon
 
-Name:  Forretress
-Pokedex Number:  205
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Sturdy - Overcoat (Hidden Ability)
+Its entire body is shielded by a steel-
+hard shell. What lurks inside the armor is
+a total mystery.
+
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:         90
+        defense:        140
+ special-attack:         60
+special-defense:         60
+          speed:         40
+
+Pokedex ID: 205	Capture Rate: 75
+Base Exp: 163	Happiness: 70
+Height: 12	Weight: 1258
+
+Genus: Bagworm Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 465
-Hp:  75
-Attack:  90
-Defence:  140
-Special Attack:  60
-Special Defence:  60
-Speed:  40
diff --git a/pokeData/fraxure b/pokeData/fraxure
index 7d7e901..2ea702c 100644
--- a/pokeData/fraxure
+++ b/pokeData/fraxure
@@ -1,15 +1,22 @@
+fraxure	A dragon type Pokémon
 
-Name:  Fraxure
-Pokedex Number:  611
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Rivalry - Mold Breaker - Unnerve (Hidden Ability)
+큰 바위를 부수는 이빨을 가지고 있다.
+액슨도들의 영역 싸움은
+매우 격렬하다.
 
-Base Stats
-----------------------
-Total: 410
-Hp:  66
-Attack:  117
-Defence:  70
-Special Attack:  40
-Special Defence:  50
-Speed:  67
+   ↞--------| STATS |--------↠ 
+             hp:         66
+         attack:        117
+        defense:         70
+ special-attack:         40
+special-defense:         50
+          speed:         67
+
+Pokedex ID: 611	Capture Rate: 60
+Base Exp: 144	Happiness: 35
+Height: 10	Weight: 360
+
+Genus: Axe Jaw Pokémon
+Location Areas:
+unova-victory-road-outside
+nature-sanctuary-area
diff --git a/pokeData/frillish b/pokeData/frillish
index 2e38eb0..b96bc38 100644
--- a/pokeData/frillish
+++ b/pokeData/frillish
@@ -1,15 +1,33 @@
+frillish	A water type Pokémon
 
-Name:  Frillish
-Pokedex Number:  592
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Water Absorb - Cursed Body - Damp (Hidden Ability)
+먹이를 독으로 마비시켜
+8000m 심해에
+있다는 거처로 데려간다.
 
-Base Stats
-----------------------
-Total: 335
-Hp:  55
-Attack:  40
-Defence:  50
-Special Attack:  65
-Special Defence:  85
-Speed:  40
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         40
+        defense:         50
+ special-attack:         65
+special-defense:         85
+          speed:         40
+
+Pokedex ID: 592	Capture Rate: 190
+Base Exp: 67	Happiness: 50
+Height: 12	Weight: 330
+
+Genus: Floating Pokémon
+Location Areas:
+driftveil-city-area
+p2-laboratory-area
+undella-bay-area
+unova-route-4-area
+unova-route-13-area
+unova-route-18-area
+undella-town-area
+unova-route-17-area
+virbank-city-area
+humilau-city-area
+virbank-complex-outer
+seaside-cave-1f
+unova-route-21-area
diff --git a/pokeData/froakie b/pokeData/froakie
index 0f5b0ea..b9374e7 100644
--- a/pokeData/froakie
+++ b/pokeData/froakie
@@ -1,15 +1,21 @@
+froakie	A water type Pokémon
 
-Name:  Froakie
-Pokedex Number:  656
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Torrent - Protean (Hidden Ability)
+胸と　背中から　泡を　出す。
+弾力のある　泡で　攻撃を　受け止めて
+ダメージを　減らす。
 
-Base Stats
-----------------------
-Total: 314
-Hp:  41
-Attack:  56
-Defence:  40
-Special Attack:  62
-Special Defence:  44
-Speed:  71
+   ↞--------| STATS |--------↠ 
+             hp:         41
+         attack:         56
+        defense:         40
+ special-attack:         62
+special-defense:         44
+          speed:         71
+
+Pokedex ID: 656	Capture Rate: 45
+Base Exp: 63	Happiness: 70
+Height: 3	Weight: 70
+
+Genus: Bubble Frog Pokémon
+Location Areas:
+aquacorde-town-area
diff --git a/pokeData/frogadier b/pokeData/frogadier
index aa1dd13..59f9a53 100644
--- a/pokeData/frogadier
+++ b/pokeData/frogadier
@@ -1,15 +1,21 @@
+frogadier	A water type Pokémon
 
-Name:  Frogadier
-Pokedex Number:  657
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Torrent - Protean (Hidden Ability)
+泡で　包んだ　小石を　投げる
+技を　使う。３０メートル　先の
+空き缶に　当てる　コントロール。
+
+   ↞--------| STATS |--------↠ 
+             hp:         54
+         attack:         63
+        defense:         52
+ special-attack:         83
+special-defense:         56
+          speed:         97
+
+Pokedex ID: 657	Capture Rate: 45
+Base Exp: 142	Happiness: 70
+Height: 6	Weight: 109
+
+Genus: Bubble Frog Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 405
-Hp:  54
-Attack:  63
-Defence:  52
-Special Attack:  83
-Special Defence:  56
-Speed:  97
diff --git a/pokeData/froslass b/pokeData/froslass
index 137e3a8..5989b11 100644
--- a/pokeData/froslass
+++ b/pokeData/froslass
@@ -1,15 +1,21 @@
+froslass	A ice type Pokémon
 
-Name:  Froslass
-Pokedex Number:  478
-Gender Ratio:   ♂:0% ♀:100% 
-Abilities: Snow Cloak - Cursed Body (Hidden Ability)
+On dit que Momartik gèle ses proies
+grâce à son souffle à -50 °C avant
+de les exposer dans sa tanière.
+
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         80
+        defense:         70
+ special-attack:         80
+special-defense:         70
+          speed:        110
+
+Pokedex ID: 478	Capture Rate: 75
+Base Exp: 168	Happiness: 50
+Height: 13	Weight: 266
+
+Genus: Snow Land Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 480
-Hp:  70
-Attack:  80
-Defence:  70
-Special Attack:  80
-Special Defence:  70
-Speed:  110
diff --git a/pokeData/frosmoth b/pokeData/frosmoth
index 5a7f9df..6a2293d 100644
--- a/pokeData/frosmoth
+++ b/pokeData/frosmoth
@@ -1,15 +1,21 @@
+frosmoth	A ice type Pokémon
 
-Name:  Frosmoth
-Pokedex Number:  873
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Shield Dust - Ice Scales (Hidden Ability)
+Icy scales fall from its wings like snow as it flies
+over fields and mountains. The temperature of its
+wings is less than −290 degrees Fahrenheit.
+
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         65
+        defense:         60
+ special-attack:        125
+special-defense:         90
+          speed:         65
+
+Pokedex ID: 873	Capture Rate: 75
+Base Exp: 166	Happiness: 50
+Height: 13	Weight: 420
+
+Genus: Frost Moth Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 475
-Hp:  70
-Attack:  65
-Defence:  60
-Special Attack:  125
-Special Defence:  90
-Speed:  65
diff --git a/pokeData/furfrou b/pokeData/furfrou
index dee677d..c5c17d9 100644
--- a/pokeData/furfrou
+++ b/pokeData/furfrou
@@ -1,15 +1,21 @@
+furfrou	A normal type Pokémon
 
-Name:  Furfrou
-Pokedex Number:  676
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Fur Coat
+ボサボサの　体毛を　刈りこむと
+姿が　美しくなる　だけでなく
+身体の　キレが　良くなるのだ。
 
-Base Stats
-----------------------
-Total: 472
-Hp:  75
-Attack:  80
-Defence:  60
-Special Attack:  65
-Special Defence:  90
-Speed:  102
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:         80
+        defense:         60
+ special-attack:         65
+special-defense:         90
+          speed:        102
+
+Pokedex ID: 676	Capture Rate: 160
+Base Exp: 165	Happiness: 70
+Height: 12	Weight: 280
+
+Genus: Poodle Pokémon
+Location Areas:
+kalos-route-5-area
diff --git a/pokeData/furret b/pokeData/furret
index 4941637..0d49c7a 100644
--- a/pokeData/furret
+++ b/pokeData/furret
@@ -1,15 +1,22 @@
+furret	A normal type Pokémon
 
-Name:  Furret
-Pokedex Number:  162
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Run Away - Keen Eye - Frisk (Hidden Ability)
+It makes a nest to suit its long and skinny
+body. The nest is impossible for other
+POKéMON to enter.
 
-Base Stats
-----------------------
-Total: 415
-Hp:  85
-Attack:  76
-Defence:  64
-Special Attack:  45
-Special Defence:  55
-Speed:  90
+   ↞--------| STATS |--------↠ 
+             hp:         85
+         attack:         76
+        defense:         64
+ special-attack:         45
+special-defense:         55
+          speed:         90
+
+Pokedex ID: 162	Capture Rate: 90
+Base Exp: 145	Happiness: 70
+Height: 18	Weight: 325
+
+Genus: Long Body Pokémon
+Location Areas:
+johto-route-43-area
+kanto-route-1-area
diff --git a/pokeData/gabite b/pokeData/gabite
index 3fe2884..730c250 100644
--- a/pokeData/gabite
+++ b/pokeData/gabite
@@ -1,15 +1,26 @@
+gabite	A dragon type Pokémon
 
-Name:  Gabite
-Pokedex Number:  444
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Sand Veil - Rough Skin (Hidden Ability)
+Toujours à la recherche d’objets
+brillants, il arpente les grottes
+pour constituer son butin.
 
-Base Stats
-----------------------
-Total: 410
-Hp:  68
-Attack:  90
-Defence:  65
-Special Attack:  50
-Special Defence:  55
-Speed:  82
+   ↞--------| STATS |--------↠ 
+             hp:         68
+         attack:         90
+        defense:         65
+ special-attack:         50
+special-defense:         55
+          speed:         82
+
+Pokedex ID: 444	Capture Rate: 45
+Base Exp: 144	Happiness: 50
+Height: 14	Weight: 560
+
+Genus: Cave Pokémon
+Location Areas:
+sinnoh-victory-road-1f
+sinnoh-victory-road-2f
+sinnoh-victory-road-b1f
+sinnoh-victory-road-inside-b1f
+sinnoh-victory-road-inside
+sinnoh-victory-road-inside-exit
diff --git a/pokeData/gallade b/pokeData/gallade
index 35507e5..5d88588 100644
--- a/pokeData/gallade
+++ b/pokeData/gallade
@@ -1,15 +1,21 @@
+gallade	A psychic type Pokémon
 
-Name:  Gallade
-Pokedex Number:  475
-Gender Ratio:   ♂:100% ♀:0% 
-Abilities: Steadfast - Justified (Hidden Ability)
+Toujours prêt à protéger son prochain,
+il se bat férocement avec ses coudes
+en forme d’épées.
+
+   ↞--------| STATS |--------↠ 
+             hp:         68
+         attack:        125
+        defense:         65
+ special-attack:         65
+special-defense:        115
+          speed:         80
+
+Pokedex ID: 475	Capture Rate: 45
+Base Exp: 259	Happiness: 35
+Height: 16	Weight: 520
+
+Genus: Blade Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 518
-Hp:  68
-Attack:  165
-Defence:  95
-Special Attack:  65
-Special Defence:  115
-Speed:  110
diff --git a/pokeData/galvantula b/pokeData/galvantula
index 0831406..4255ed2 100644
--- a/pokeData/galvantula
+++ b/pokeData/galvantula
@@ -1,15 +1,21 @@
+galvantula	A bug type Pokémon
 
-Name:  Galvantula
-Pokedex Number:  596
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Compoundeyes - Unnerve - Swarm (Hidden Ability)
+전기를 띤 실로 함정을 설치한다.
+감전돼서 움직이지 못하는
+먹이를 천천히 먹어치운다.
+
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         77
+        defense:         60
+ special-attack:         97
+special-defense:         60
+          speed:        108
+
+Pokedex ID: 596	Capture Rate: 75
+Base Exp: 165	Happiness: 50
+Height: 8	Weight: 143
+
+Genus: EleSpider Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 472
-Hp:  70
-Attack:  77
-Defence:  60
-Special Attack:  97
-Special Defence:  60
-Speed:  108
diff --git a/pokeData/garbodor b/pokeData/garbodor
index b3fc009..03c4200 100644
--- a/pokeData/garbodor
+++ b/pokeData/garbodor
@@ -1,15 +1,21 @@
+garbodor	A poison type Pokémon
 
-Name:  Garbodor
-Pokedex Number:  569
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Stench - Weak Armor - Aftermath (Hidden Ability)
+왼팔로 상대를 꼭 붙들고
+입에서 악취가 나는 독가스를
+토해내서 마무리한다.
 
-Base Stats
-----------------------
-Total: 474
-Hp:  80
-Attack:  95
-Defence:  82
-Special Attack:  60
-Special Defence:  82
-Speed:  75
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:         95
+        defense:         82
+ special-attack:         60
+special-defense:         82
+          speed:         75
+
+Pokedex ID: 569	Capture Rate: 60
+Base Exp: 166	Happiness: 50
+Height: 19	Weight: 1073
+
+Genus: Trash Heap Pokémon
+Location Areas:
+unova-route-9-area
diff --git a/pokeData/garchomp b/pokeData/garchomp
index 632ffdc..af675e6 100644
--- a/pokeData/garchomp
+++ b/pokeData/garchomp
@@ -1,15 +1,21 @@
+garchomp	A dragon type Pokémon
 
-Name:  Garchomp
-Pokedex Number:  445
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Sand Veil - Rough Skin (Hidden Ability)
+On dit que lancé à pleine vitesse,
+il crée des lames de vent avec ses
+ailes pouvant trancher un arbre.
+
+   ↞--------| STATS |--------↠ 
+             hp:        108
+         attack:        130
+        defense:         95
+ special-attack:         80
+special-defense:         85
+          speed:        102
+
+Pokedex ID: 445	Capture Rate: 45
+Base Exp: 300	Happiness: 50
+Height: 19	Weight: 950
+
+Genus: Mach Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 600
-Hp:  108
-Attack:  170
-Defence:  115
-Special Attack:  120
-Special Defence:  95
-Speed:  92
diff --git a/pokeData/gardevoir b/pokeData/gardevoir
index b4c4e1f..d6db78b 100644
--- a/pokeData/gardevoir
+++ b/pokeData/gardevoir
@@ -1,15 +1,21 @@
+gardevoir	A psychic type Pokémon
 
-Name:  Gardevoir
-Pokedex Number:  282
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Synchronize - Trace - Telepathy (Hidden Ability)
+To protect its Trainer, it will
+expend all its psychic power
+to create a small black hole.
+
+   ↞--------| STATS |--------↠ 
+             hp:         68
+         attack:         65
+        defense:         65
+ special-attack:        125
+special-defense:        115
+          speed:         80
+
+Pokedex ID: 282	Capture Rate: 45
+Base Exp: 259	Happiness: 35
+Height: 16	Weight: 484
+
+Genus: Embrace Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 518
-Hp:  68
-Attack:  85
-Defence:  65
-Special Attack:  165
-Special Defence:  135
-Speed:  100
diff --git a/pokeData/gastly b/pokeData/gastly
index 6ac404e..00ab53f 100644
--- a/pokeData/gastly
+++ b/pokeData/gastly
@@ -1,15 +1,71 @@
+gastly	A ghost type Pokémon
 
-Name:  Gastly
-Pokedex Number:  092
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Levitate
+GASTLY is largely composed of gaseous
+matter. When exposed to a strong wind,
+the gaseous body quickly dwindles away.Groups of this POKéMON cluster under
+the eaves of houses to escape the
+ravages of wind.
 
-Base Stats
-----------------------
-Total: 310
-Hp:  30
-Attack:  35
-Defence:  30
-Special Attack:  100
-Special Defence:  35
-Speed:  80
+   ↞--------| STATS |--------↠ 
+             hp:         30
+         attack:         35
+        defense:         30
+ special-attack:        100
+special-defense:         35
+          speed:         80
+
+Pokedex ID: 92	Capture Rate: 190
+Base Exp: 62	Happiness: 50
+Height: 13	Weight: 1
+
+Genus: Gas Pokémon
+Location Areas:
+eterna-forest-area
+turnback-cave-pillar-1
+turnback-cave-before-pillar-1
+old-chateau-entrance
+old-chateau-dining-room
+old-chateau-2f-private-room
+old-chateau-2f
+old-chateau-2f-leftmost-room
+old-chateau-2f-left-room
+old-chateau-2f-middle-room
+old-chateau-2f-right-room
+old-chateau-2f-rightmost-room
+sinnoh-route-209-area
+lost-tower-1f
+lost-tower-2f
+lost-tower-3f
+lost-tower-4f
+lost-tower-5f
+johto-route-31-area
+sprout-tower-2f
+sprout-tower-3f
+johto-route-32-area
+johto-route-36-area
+bell-tower-2f
+bell-tower-3f
+bell-tower-4f
+bell-tower-5f
+bell-tower-6f
+bell-tower-7f
+bell-tower-8f
+bell-tower-9f
+bell-tower-10f
+pokemon-tower-3f
+pokemon-tower-4f
+pokemon-tower-5f
+pokemon-tower-6f
+pokemon-tower-7f
+lost-cave-room-1
+lost-cave-room-2
+lost-cave-room-3
+lost-cave-room-4
+lost-cave-room-5
+lost-cave-room-6
+lost-cave-room-7
+lost-cave-room-8
+lost-cave-room-9
+lost-cave-room-10
+lost-cave-item-rooms
+johto-safari-zone-zone-forest
diff --git a/pokeData/gastrodon b/pokeData/gastrodon
index b37d3e7..1393a50 100644
--- a/pokeData/gastrodon
+++ b/pokeData/gastrodon
@@ -1,15 +1,32 @@
+gastrodon	A water type Pokémon
 
-Name:  Gastrodon
-Pokedex Number:  423
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Sticky Hold - Storm Drain - Sand Force (Hidden Ability)
+Long ago, its entire back was
+shielded with a sturdy shell. There
+are traces of it left in its cells.
 
-Base Stats
-----------------------
-Total: 475
-Hp:  111
-Attack:  83
-Defence:  68
-Special Attack:  92
-Special Defence:  82
-Speed:  39
+   ↞--------| STATS |--------↠ 
+             hp:        111
+         attack:         83
+        defense:         68
+ special-attack:         92
+special-defense:         82
+          speed:         39
+
+Pokedex ID: 423	Capture Rate: 75
+Base Exp: 166	Happiness: 50
+Height: 9	Weight: 299
+
+Genus: Sea Slug Pokémon
+Location Areas:
+canalave-city-area
+pastoria-city-area
+valley-windworks-area
+fuego-ironworks-area
+sinnoh-route-205-south-towards-floaroma-town
+sinnoh-route-212-east-towards-pastoria-city
+sinnoh-route-213-area
+sinnoh-route-218-area
+sinnoh-route-221-area
+sinnoh-route-222-area
+sinnoh-route-224-area
+sinnoh-sea-route-230-area
diff --git a/pokeData/genesect b/pokeData/genesect
index 38343e8..ee0e426 100644
--- a/pokeData/genesect
+++ b/pokeData/genesect
@@ -1,15 +1,21 @@
+genesect	A bug type Pokémon
 
-Name:  Genesect
-Pokedex Number:  649
-Gender Ratio:  Genderless
-Abilities: Download
+플라스마단에게 개조당한
+고대의 벌레포켓몬이다.
+등에 있는 대포의 파워가 올라갔다.
+
+   ↞--------| STATS |--------↠ 
+             hp:         71
+         attack:        120
+        defense:         95
+ special-attack:        120
+special-defense:         95
+          speed:         99
+
+Pokedex ID: 649	Capture Rate: 3
+Base Exp: 300	Happiness: 0
+Height: 15	Weight: 825
+
+Genus: Paleozoic Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 600
-Hp:  71
-Attack:  120
-Defence:  95
-Special Attack:  120
-Special Defence:  95
-Speed:  99
diff --git a/pokeData/gengar b/pokeData/gengar
index 685484d..7b413a4 100644
--- a/pokeData/gengar
+++ b/pokeData/gengar
@@ -1,15 +1,22 @@
+gengar	A ghost type Pokémon
 
-Name:  Gengar
-Pokedex Number:  094
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Levitate
+Sometimes, on a dark night, your shadow
+thrown by a streetlight will suddenly
+and startlingly overtake you.It is actually a GENGAR running past
+you, pretending to be your shadow.
 
-Base Stats
-----------------------
-Total: 500
-Hp:  60
-Attack:  65
-Defence:  80
-Special Attack:  170
-Special Defence:  95
-Speed:  130
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         65
+        defense:         60
+ special-attack:        130
+special-defense:         75
+          speed:        110
+
+Pokedex ID: 94	Capture Rate: 45
+Base Exp: 250	Happiness: 50
+Height: 15	Weight: 405
+
+Genus: Shadow Pokémon
+Location Areas:
+old-chateau-2f-right-room
diff --git a/pokeData/geodude b/pokeData/geodude
index b57b47d..7c1c3df 100644
--- a/pokeData/geodude
+++ b/pokeData/geodude
@@ -1,15 +1,95 @@
+geodude	A rock type Pokémon
 
-Name:  Geodude
-Pokedex Number:  074
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Rock Head - Sturdy - Sand Veil (Hidden Ability)
+When GEODUDE sleeps deeply, it buries
+itself halfway into the ground.
+It will not awaken even if hikers stepon it unwittingly.
+In the morning, this POKéMON rolls
+downhill in search of food.
 
-Base Stats
-----------------------
-Total: 300
-Hp:  40
-Attack:  80
-Defence:  100
-Special Attack:  30
-Special Defence:  30
-Speed:  20
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         80
+        defense:        100
+ special-attack:         30
+special-defense:         30
+          speed:         20
+
+Pokedex ID: 74	Capture Rate: 255
+Base Exp: 60	Happiness: 70
+Height: 4	Weight: 200
+
+Genus: Rock Pokémon
+Location Areas:
+oreburgh-mine-1f
+oreburgh-mine-b1f
+mt-coronet-1f-route-207
+mt-coronet-1f-route-211
+ravaged-path-area
+oreburgh-gate-1f
+oreburgh-gate-b1f
+stark-mountain-entrance
+stark-mountain-inside
+wayward-cave-1f
+wayward-cave-b1f
+ruin-maniac-cave-0-9-different-unown-caught
+ruin-maniac-cave-10-25-different-unown-caught
+maniac-tunnel-26-plus-different-unown-caught
+iron-island-1f
+iron-island-b1f-left
+iron-island-b1f-right
+iron-island-b2f-right
+iron-island-b2f-left
+iron-island-b3f
+valor-lakefront-area
+sinnoh-route-206-area
+sinnoh-route-207-area
+sinnoh-route-210-south-towards-solaceon-town
+sinnoh-route-211-west-towards-eterna-city
+sinnoh-route-214-area
+sinnoh-route-215-area
+ruins-of-alph-outside
+union-cave-1f
+union-cave-b1f
+union-cave-b2f
+johto-route-33-area
+mt-mortar-1f
+mt-mortar-lower-cave
+mt-mortar-upper-cave
+mt-mortar-b1f
+johto-route-45-area
+johto-route-46-area
+dark-cave-violet-city-entrance
+dark-cave-blackthorn-city-entrance
+johto-route-47-inside-cave
+mt-moon-1f
+mt-moon-2f
+rock-tunnel-1f
+rock-tunnel-b1f
+kanto-victory-road-1-3f
+cerulean-cave-1f
+cerulean-cave-2f
+cerulean-cave-b1f
+mt-moon-b1f
+mt-moon-b2f
+rock-tunnel-b2f
+kanto-victory-road-2-1f
+kanto-victory-road-2-2f
+kanto-victory-road-2-3f
+granite-cave-1f
+granite-cave-b2f
+hoenn-victory-road-b1f
+hoenn-route-111-area
+hoenn-route-114-area
+hoenn-safari-zone-neacro-bike-area
+magma-hideout-area
+mt-ember-area
+mt-ember-cave
+mt-ember-inside
+mt-ember-1f-cave-behind-team-rocket
+mt-ember-b1f
+mt-ember-b2f
+kindle-road-area
+sevault-canyon-area
+johto-safari-zone-zone-peak
+mt-ember-summit
+team-rocket-hq-area
diff --git a/pokeData/gible b/pokeData/gible
index 1d42a6d..1717e85 100644
--- a/pokeData/gible
+++ b/pokeData/gible
@@ -1,15 +1,23 @@
+gible	A dragon type Pokémon
 
-Name:  Gible
-Pokedex Number:  443
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Sand Veil - Rough Skin (Hidden Ability)
+Malgré sa maladresse, son énorme
+gueule lui permet de lancer des
+attaques puissantes.
 
-Base Stats
-----------------------
-Total: 300
-Hp:  58
-Attack:  70
-Defence:  45
-Special Attack:  40
-Special Defence:  45
-Speed:  42
+   ↞--------| STATS |--------↠ 
+             hp:         58
+         attack:         70
+        defense:         45
+ special-attack:         40
+special-defense:         45
+          speed:         42
+
+Pokedex ID: 443	Capture Rate: 45
+Base Exp: 60	Happiness: 50
+Height: 7	Weight: 205
+
+Genus: Land Shark Pokémon
+Location Areas:
+wayward-cave-b1f
+kalos-route-13-area
+floccesy-town-area
diff --git a/pokeData/gigalith b/pokeData/gigalith
index 9aa0803..a763db7 100644
--- a/pokeData/gigalith
+++ b/pokeData/gigalith
@@ -1,15 +1,21 @@
+gigalith	A rock type Pokémon
 
-Name:  Gigalith
-Pokedex Number:  526
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Sturdy - Sand Force (Hidden Ability)
+거두어들인 태양광선을
+에너지 코어로 반응시켜
+빛의 구슬로 쏘아낸다.
+
+   ↞--------| STATS |--------↠ 
+             hp:         85
+         attack:        135
+        defense:        130
+ special-attack:         60
+special-defense:         80
+          speed:         25
+
+Pokedex ID: 526	Capture Rate: 45
+Base Exp: 258	Happiness: 50
+Height: 17	Weight: 2600
+
+Genus: Compressed Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 515
-Hp:  85
-Attack:  135
-Defence:  130
-Special Attack:  60
-Special Defence:  80
-Speed:  25
diff --git a/pokeData/girafarig b/pokeData/girafarig
index 0e15043..d330661 100644
--- a/pokeData/girafarig
+++ b/pokeData/girafarig
@@ -1,15 +1,29 @@
+girafarig	A normal type Pokémon
 
-Name:  Girafarig
-Pokedex Number:  203
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Inner Focus - Early Bird - Sap Sipper (Hidden Ability)
+Its tail has a small brain of its own.
+Beware! If you get close, it may react
+to your scent and bite.
 
-Base Stats
-----------------------
-Total: 455
-Hp:  70
-Attack:  80
-Defence:  65
-Special Attack:  90
-Special Defence:  65
-Speed:  85
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         80
+        defense:         65
+ special-attack:         90
+special-defense:         65
+          speed:         85
+
+Pokedex ID: 203	Capture Rate: 60
+Base Exp: 159	Happiness: 70
+Height: 15	Weight: 415
+
+Genus: Long Neck Pokémon
+Location Areas:
+valor-lakefront-area
+sinnoh-route-214-area
+sinnoh-route-221-area
+johto-route-43-area
+johto-route-48-area
+hoenn-safari-zone-sw
+hoenn-safari-zone-se
+nature-sanctuary-area
+johto-safari-zone-zone-plains
diff --git a/pokeData/giratina b/pokeData/giratina
index 8ba139e..cc3ffdf 100644
--- a/pokeData/giratina
+++ b/pokeData/giratina
@@ -1,15 +1,15 @@
+	A  type Pokémon
 
-Name:  Giratina
-Pokedex Number:  487
-Gender Ratio:  Genderless
-Abilities: Pressure - Telepathy (Hidden) (Altered Forme) - Levitate (Origin Forme
+Sa grande violence lui a valu d’être
+banni. Il observe les hommes en
+silence depuis le Monde Distorsion.
+
+   ↞--------| STATS |--------↠ 
+
+Pokedex ID: 	Capture Rate: 3
+Base Exp: 	Happiness: 0
+Height: 	Weight: 
+
+Genus: Renegade Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 680
-Hp:  150
-Attack:  120
-Defence:  100
-Special Attack:  120
-Special Defence:  100
-Speed:  90
diff --git a/pokeData/glaceon b/pokeData/glaceon
index 8fdea77..779a408 100644
--- a/pokeData/glaceon
+++ b/pokeData/glaceon
@@ -1,15 +1,21 @@
+glaceon	A ice type Pokémon
 
-Name:  Glaceon
-Pokedex Number:  471
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Snow Cloak - Ice Body (Hidden Ability)
+Il ajuste la température de son
+corps pour créer un vent de glace
+en gelant l’air qui l’entoure.
+
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         60
+        defense:        110
+ special-attack:        130
+special-defense:         95
+          speed:         65
+
+Pokedex ID: 471	Capture Rate: 45
+Base Exp: 184	Happiness: 35
+Height: 8	Weight: 259
+
+Genus: Fresh Snow Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 525
-Hp:  65
-Attack:  60
-Defence:  110
-Special Attack:  130
-Special Defence:  95
-Speed:  65
diff --git a/pokeData/glalie b/pokeData/glalie
index 5a0e6fb..1707e5a 100644
--- a/pokeData/glalie
+++ b/pokeData/glalie
@@ -1,15 +1,21 @@
+glalie	A ice type Pokémon
 
-Name:  Glalie
-Pokedex Number:  362
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Inner Focus - Ice Body - Moody (Hidden Ability)
+It prevents prey from escaping by
+instantaneously freezing moisture
+in the air.
+
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:         80
+        defense:         80
+ special-attack:         80
+special-defense:         80
+          speed:         80
+
+Pokedex ID: 362	Capture Rate: 75
+Base Exp: 168	Happiness: 50
+Height: 15	Weight: 2565
+
+Genus: Face Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 480
-Hp:  80
-Attack:  120
-Defence:  80
-Special Attack:  120
-Special Defence:  80
-Speed:  100
diff --git a/pokeData/glameow b/pokeData/glameow
index b5d617c..71f33f3 100644
--- a/pokeData/glameow
+++ b/pokeData/glameow
@@ -1,15 +1,22 @@
+glameow	A normal type Pokémon
 
-Name:  Glameow
-Pokedex Number:  431
-Gender Ratio:   ♂:25% ♀:75%
-Abilities: Limber - Own Tempo - Keen Eye (Hidden Ability)
+Il a tendance à planter ses griffes
+dans le nez de son Dresseur s’il
+n’a pas été nourri à temps.
 
-Base Stats
-----------------------
-Total: 310
-Hp:  49
-Attack:  55
-Defence:  42
-Special Attack:  42
-Special Defence:  37
-Speed:  85
+   ↞--------| STATS |--------↠ 
+             hp:         49
+         attack:         55
+        defense:         42
+ special-attack:         42
+special-defense:         37
+          speed:         85
+
+Pokedex ID: 431	Capture Rate: 190
+Base Exp: 62	Happiness: 70
+Height: 5	Weight: 39
+
+Genus: Catty Pokémon
+Location Areas:
+sinnoh-route-218-area
+sinnoh-route-222-area
diff --git a/pokeData/glastrier b/pokeData/glastrier
index ec0ffbd..f55b760 100644
--- a/pokeData/glastrier
+++ b/pokeData/glastrier
@@ -1,15 +1,21 @@
+glastrier	A ice type Pokémon
 
-Name:  Glastrier
-Pokedex Number:  896
-Gender Ratio:  Genderless
-Abilities: Chilling Neigh
+Glastrier emits intense cold from its hooves.
+It’s also a belligerent Pokémon—anything it
+wants, it takes by force.
+
+   ↞--------| STATS |--------↠ 
+             hp:        100
+         attack:        145
+        defense:        130
+ special-attack:         65
+special-defense:        110
+          speed:         30
+
+Pokedex ID: 896	Capture Rate: 3
+Base Exp: 290	Happiness: 35
+Height: 22	Weight: 8000
+
+Genus: Wild Horse Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 580
-Hp:  100
-Attack:  145
-Defence:  130
-Special Attack:  65
-Special Defence:  110
-Speed:  30
diff --git a/pokeData/gligar b/pokeData/gligar
index a052f25..b7a1648 100644
--- a/pokeData/gligar
+++ b/pokeData/gligar
@@ -1,15 +1,31 @@
+gligar	A ground type Pokémon
 
-Name:  Gligar
-Pokedex Number:  207
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Hyper Cutter - Sand Veil - Immunity (Hidden Ability)
+It flies straight at its target’s face,
+then clamps down on the startled
+victim to inject poison.
 
-Base Stats
-----------------------
-Total: 430
-Hp:  65
-Attack:  75
-Defence:  105
-Special Attack:  35
-Special Defence:  65
-Speed:  85
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         75
+        defense:        105
+ special-attack:         35
+special-defense:         65
+          speed:         85
+
+Pokedex ID: 207	Capture Rate: 60
+Base Exp: 86	Happiness: 70
+Height: 11	Weight: 648
+
+Genus: Fly Scorpion Pokémon
+Location Areas:
+stark-mountain-area
+sinnoh-route-206-area
+sinnoh-route-207-area
+sinnoh-route-214-area
+sinnoh-route-215-area
+sinnoh-route-227-area
+johto-route-45-area
+hoenn-safari-zone-expansion-south
+unova-route-11-area
+unova-route-15-area
+unova-route-23-area
diff --git a/pokeData/gliscor b/pokeData/gliscor
index 5805208..c78ec3d 100644
--- a/pokeData/gliscor
+++ b/pokeData/gliscor
@@ -1,15 +1,23 @@
+gliscor	A ground type Pokémon
 
-Name:  Gliscor
-Pokedex Number:  472
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Hyper Cutter - Sand Veil - Poison Heal (Hidden Ability)
+Le plus petit courant d’air peut lui
+donner assez d’élan pour faire le
+tour du monde sans un coup d’aile.
 
-Base Stats
-----------------------
-Total: 510
-Hp:  75
-Attack:  95
-Defence:  125
-Special Attack:  45
-Special Defence:  75
-Speed:  95
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:         95
+        defense:        125
+ special-attack:         45
+special-defense:         75
+          speed:         95
+
+Pokedex ID: 472	Capture Rate: 30
+Base Exp: 179	Happiness: 70
+Height: 20	Weight: 425
+
+Genus: Fang Scorpion Pokémon
+Location Areas:
+unova-route-11-area
+unova-route-15-area
+unova-route-23-area
diff --git a/pokeData/gloom b/pokeData/gloom
index d6480ca..9bcb888 100644
--- a/pokeData/gloom
+++ b/pokeData/gloom
@@ -1,15 +1,45 @@
+gloom	A grass type Pokémon
 
-Name:  Gloom
-Pokedex Number:  044
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Chlorophyll - Stench (Hidden Ability)
+From its mouth GLOOM drips honey that
+smells absolutely horrible.
+Apparently, it loves the horrid stench.It sniffs the noxious fumes and then 
+drools even more of its honey.
 
-Base Stats
-----------------------
-Total: 395
-Hp:  60
-Attack:  65
-Defence:  70
-Special Attack:  85
-Special Defence:  75
-Speed:  40
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         65
+        defense:         70
+ special-attack:         85
+special-defense:         75
+          speed:         40
+
+Pokedex ID: 44	Capture Rate: 120
+Base Exp: 138	Happiness: 50
+Height: 8	Weight: 86
+
+Genus: Weed Pokémon
+Location Areas:
+sinnoh-route-224-area
+sinnoh-route-229-area
+sinnoh-sea-route-230-area
+johto-route-47-area
+kanto-route-12-area
+johto-route-48-area
+kanto-route-5-area
+kanto-route-13-area
+kanto-route-14-area
+kanto-route-15-area
+kanto-route-24-area
+cerulean-cave-1f
+cerulean-cave-2f
+hoenn-route-121-area
+hoenn-route-123-area
+hoenn-safari-zone-nwmach-bike-area
+hoenn-safari-zone-neacro-bike-area
+hoenn-safari-zone-sw
+hoenn-safari-zone-se
+berry-forest-area
+cape-brink-area
+bond-bridge-area
+water-path-area
+johto-safari-zone-zone-marshland
diff --git a/pokeData/gogoat b/pokeData/gogoat
index 9556cff..7265215 100644
--- a/pokeData/gogoat
+++ b/pokeData/gogoat
@@ -1,15 +1,21 @@
+gogoat	A grass type Pokémon
 
-Name:  Gogoat
-Pokedex Number:  673
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Sap Sipper - Grass Pelt (Hidden Ability)
+ツノを　握る　わずかな　違いから
+トレーナーの　気持ちを　読み取るので
+一体となって　走れるのだ。
+
+   ↞--------| STATS |--------↠ 
+             hp:        123
+         attack:        100
+        defense:         62
+ special-attack:         97
+special-defense:         81
+          speed:         68
+
+Pokedex ID: 673	Capture Rate: 45
+Base Exp: 186	Happiness: 70
+Height: 17	Weight: 910
+
+Genus: Mount Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 531
-Hp:  123
-Attack:  100
-Defence:  62
-Special Attack:  97
-Special Defence:  81
-Speed:  68
diff --git a/pokeData/golbat b/pokeData/golbat
index e6b2ba9..f8f8af5 100644
--- a/pokeData/golbat
+++ b/pokeData/golbat
@@ -1,15 +1,155 @@
+golbat	A poison type Pokémon
 
-Name:  Golbat
-Pokedex Number:  042
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Inner Focus - Infiltrator (Hidden Ability)
+GOLBAT bites down on prey with its four
+fangs and drinks the victim’s blood.
+It becomes active on inky darkmoonless nights, flying around to
+attack people and POKéMON.
 
-Base Stats
-----------------------
-Total: 455
-Hp:  75
-Attack:  80
-Defence:  70
-Special Attack:  65
-Special Defence:  75
-Speed:  90
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:         80
+        defense:         70
+ special-attack:         65
+special-defense:         75
+          speed:         90
+
+Pokedex ID: 42	Capture Rate: 90
+Base Exp: 159	Happiness: 50
+Height: 16	Weight: 550
+
+Genus: Bat Pokémon
+Location Areas:
+mt-coronet-1f-route-207
+mt-coronet-2f
+mt-coronet-3f
+mt-coronet-exterior-snowfall
+mt-coronet-exterior-blizzard
+mt-coronet-4f
+mt-coronet-4f-small-room
+mt-coronet-5f
+mt-coronet-6f
+mt-coronet-1f-from-exterior
+mt-coronet-1f-route-216
+mt-coronet-b1f
+sinnoh-victory-road-1f
+sinnoh-victory-road-2f
+sinnoh-victory-road-b1f
+sinnoh-victory-road-inside-b1f
+sinnoh-victory-road-inside
+sinnoh-victory-road-inside-exit
+ravaged-path-area
+oreburgh-gate-b1f
+stark-mountain-area
+stark-mountain-entrance
+stark-mountain-inside
+sendoff-spring-area
+turnback-cave-pillar-1
+turnback-cave-pillar-2
+turnback-cave-pillar-3
+turnback-cave-before-pillar-1
+turnback-cave-between-pillars-1-and-2
+turnback-cave-between-pillars-2-and-3
+turnback-cave-after-pillar-3
+snowpoint-temple-1f
+snowpoint-temple-b1f
+snowpoint-temple-b2f
+snowpoint-temple-b3f
+snowpoint-temple-b4f
+snowpoint-temple-b5f
+iron-island-1f
+iron-island-b1f-left
+iron-island-b1f-right
+iron-island-b2f-right
+iron-island-b2f-left
+iron-island-b3f
+lost-tower-3f
+lost-tower-4f
+lost-tower-5f
+sinnoh-route-227-area
+union-cave-b2f
+slowpoke-well-b1f
+whirl-islands-1f
+whirl-islands-b1f
+whirl-islands-b2f
+whirl-islands-b3f
+johto-route-42-area
+mt-mortar-1f
+mt-mortar-lower-cave
+mt-mortar-upper-cave
+mt-mortar-b1f
+ice-path-1f
+ice-path-b1f
+ice-path-b2f
+ice-path-b3f
+dark-cave-blackthorn-city-entrance
+seafoam-islands-1f
+seafoam-islands-b1f
+seafoam-islands-b2f
+seafoam-islands-b3f
+seafoam-islands-b4f
+mt-silver-2f
+mt-silver-1f-top
+mt-silver-4f
+johto-route-47-inside-cave
+mt-silver-outside
+mt-silver-1f
+mt-silver-mountainside
+mt-silver-3f
+mt-silver-top
+kanto-route-28-area
+rock-tunnel-b1f
+kanto-victory-road-1-1f
+tohjo-falls-area
+kanto-victory-road-1-2f
+kanto-victory-road-1-3f
+cerulean-cave-1f
+cerulean-cave-2f
+cerulean-cave-b1f
+kanto-victory-road-2-1f
+kanto-victory-road-2-2f
+kanto-victory-road-2-3f
+meteor-falls-back
+meteor-falls-b1f
+meteor-falls-backsmall-room
+seafloor-cavern-area
+cave-of-origin-entrance
+cave-of-origin-1f
+cave-of-origin-b1f
+cave-of-origin-b2f
+cave-of-origin-b3f
+hoenn-victory-road-1f
+hoenn-victory-road-b1f
+hoenn-victory-road-b2f
+shoal-cave-area
+shoal-cave-b1f
+sky-pillar-1f
+sky-pillar-3f
+sky-pillar-5f
+icefall-cave-entrance
+icefall-cave-1f
+icefall-cave-b1f
+icefall-cave-waterfall
+lost-cave-room-1
+lost-cave-room-2
+lost-cave-room-3
+lost-cave-room-4
+lost-cave-room-5
+lost-cave-room-6
+lost-cave-room-7
+lost-cave-room-8
+lost-cave-room-9
+lost-cave-room-10
+lost-cave-item-rooms
+dreamyard-area
+dreamyard-b1f
+giant-chasm-outside
+giant-chasm-area
+giant-chasm-forest-cave
+celestial-tower-3f
+celestial-tower-4f
+celestial-tower-5f
+unova-route-13-area
+strange-house-1f
+strange-house-b1f
+johto-safari-zone-zone-mountain
+johto-safari-zone-zone-savannah
diff --git a/pokeData/goldeen b/pokeData/goldeen
index 219c9da..b8bc2bc 100644
--- a/pokeData/goldeen
+++ b/pokeData/goldeen
@@ -1,15 +1,121 @@
+goldeen	A water type Pokémon
 
-Name:  Goldeen
-Pokedex Number:  118
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Swift Swim - Water Veil - Lightningrod (Hidden Ability)
+GOLDEEN loves swimming wild and free
+in rivers and ponds.
+If one of these POKéMON is placed in anaquarium, it will shatter even the
+thickest glass with one ram of its horn
+and make its escape.
 
-Base Stats
-----------------------
-Total: 320
-Hp:  45
-Attack:  67
-Defence:  60
-Special Attack:  35
-Special Defence:  50
-Speed:  63
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         67
+        defense:         60
+ special-attack:         35
+special-defense:         50
+          speed:         63
+
+Pokedex ID: 118	Capture Rate: 225
+Base Exp: 64	Happiness: 50
+Height: 6	Weight: 150
+
+Genus: Goldfish Pokémon
+Location Areas:
+sendoff-spring-area
+lake-verity-before-galactic-intervention
+lake-verity-after-galactic-intervention
+lake-valor-area
+lake-acuity-area
+sinnoh-route-203-area
+sinnoh-route-204-south-towards-jubilife-city
+sinnoh-route-204-north-towards-floaroma-town
+sinnoh-route-208-area
+sinnoh-route-209-area
+sinnoh-route-212-north-towards-hearthome-city
+sinnoh-route-214-area
+sinnoh-route-229-area
+twinleaf-town-area
+celestic-town-area
+resort-area-area
+union-cave-1f
+union-cave-b1f
+slowpoke-well-1f
+slowpoke-well-b1f
+johto-route-42-area
+mt-mortar-1f
+mt-mortar-upper-cave
+mt-mortar-b1f
+dark-cave-violet-city-entrance
+dark-cave-blackthorn-city-entrance
+seafoam-islands-b3f
+seafoam-islands-b4f
+mt-silver-2f
+mt-silver-1f-top
+mt-silver-4f
+mt-silver-1f
+mt-silver-top
+unknown-all-rattata-area
+kanto-route-12-area
+kanto-sea-route-19-area
+kanto-sea-route-20-area
+cinnabar-island-area
+viridian-city-area
+cerulean-city-area
+vermilion-city-area
+celadon-city-area
+fuchsia-city-area
+pallet-town-area
+kanto-route-4-area
+kanto-route-6-area
+kanto-route-9-area
+kanto-route-10-area
+kanto-route-11-area
+kanto-route-13-area
+kanto-route-17-area
+kanto-route-18-area
+kanto-sea-route-21-area
+kanto-route-22-area
+kanto-route-24-area
+kanto-route-25-area
+tohjo-falls-area
+cerulean-cave-1f
+cerulean-cave-2f
+cerulean-cave-b1f
+kanto-route-23-area
+kanto-safari-zone-middle
+kanto-safari-zone-area-1-east
+kanto-safari-zone-area-2-north
+kanto-safari-zone-area-3-west
+vermilion-city-ss-anne-dock
+petalburg-city-area
+meteor-falls-area
+meteor-falls-back
+meteor-falls-b1f
+meteor-falls-backsmall-room
+hoenn-victory-road-b2f
+hoenn-route-102-area
+hoenn-route-111-area
+hoenn-route-114-area
+hoenn-route-117-area
+hoenn-route-120-area
+hoenn-safari-zone-nwmach-bike-area
+hoenn-safari-zone-sw
+hoenn-safari-zone-expansion-south
+berry-forest-area
+icefall-cave-entrance
+cape-brink-area
+ruin-valley-area
+four-island-area
+striaton-city-area
+pinwheel-forest-inside
+unova-route-3-area
+unova-route-11-area
+unova-route-14-area
+abundant-shrine-area
+lostlorn-forest-area
+aspertia-city-area
+unova-route-22-area
+kalos-route-3-area
+kalos-route-22-area
+parfum-palace-area
+johto-safari-zone-zone-swamp
+johto-safari-zone-zone-rocky-beach
diff --git a/pokeData/golduck b/pokeData/golduck
index 7c08bae..06871e7 100644
--- a/pokeData/golduck
+++ b/pokeData/golduck
@@ -1,15 +1,73 @@
+golduck	A water type Pokémon
 
-Name:  Golduck
-Pokedex Number:  055
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Damp - Cloud Nine - Swift Swim (Hidden Ability)
+An seinen langen, dünnen Gliedmaßen befinden
+sich Schwimmflossen. Mit diesen kann es
+anmutig durch Seen schwimmen.
 
-Base Stats
-----------------------
-Total: 500
-Hp:  80
-Attack:  82
-Defence:  78
-Special Attack:  95
-Special Defence:  80
-Speed:  85
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:         82
+        defense:         78
+ special-attack:         95
+special-defense:         80
+          speed:         85
+
+Pokedex ID: 55	Capture Rate: 75
+Base Exp: 175	Happiness: 50
+Height: 17	Weight: 766
+
+Genus: Duck Pokémon
+Location Areas:
+eterna-city-area
+ravaged-path-area
+oreburgh-gate-b1f
+sendoff-spring-area
+lake-verity-before-galactic-intervention
+lake-verity-after-galactic-intervention
+lake-valor-area
+lake-acuity-area
+sinnoh-route-203-area
+sinnoh-route-204-south-towards-jubilife-city
+sinnoh-route-204-north-towards-floaroma-town
+sinnoh-route-205-east-towards-eterna-city
+sinnoh-route-208-area
+sinnoh-route-209-area
+sinnoh-route-210-west-towards-celestic-town
+sinnoh-route-212-north-towards-hearthome-city
+sinnoh-route-214-area
+sinnoh-route-225-area
+twinleaf-town-area
+celestic-town-area
+resort-area-area
+sinnoh-sea-route-226-area
+sinnoh-sea-route-230-area
+ilex-forest-area
+johto-route-35-area
+seafoam-islands-1f
+seafoam-islands-b1f
+seafoam-islands-b2f
+seafoam-islands-b3f
+seafoam-islands-b4f
+mt-silver-2f
+mt-silver-1f-top
+mt-silver-4f
+mt-silver-mountainside
+mt-silver-3f
+mt-silver-top
+kanto-route-6-area
+cerulean-cave-1f
+cerulean-cave-2f
+cerulean-cave-b1f
+hoenn-safari-zone-nwmach-bike-area
+berry-forest-area
+cape-brink-area
+village-bridge-area
+unova-route-11-area
+unova-route-14-area
+abundant-shrine-area
+seaside-cave-1f
+seaside-cave-b1f
+nature-sanctuary-area
+unova-route-22-area
+unova-route-23-area
+johto-safari-zone-zone-wetland
diff --git a/pokeData/golem b/pokeData/golem
index 9c6bfda..43d11a1 100644
--- a/pokeData/golem
+++ b/pokeData/golem
@@ -1,15 +1,23 @@
+golem	A rock type Pokémon
 
-Name:  Golem
-Pokedex Number:  076
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Rock Head - Sturdy - Sand Veil (Hidden Ability)
+GOLEM is known for rolling down from
+mountains. To prevent them from rolling
+into the homes of people downhill,grooves have been dug into the sides of
+mountains to serve as guideways for
+diverting this POKéMON’s course.
 
-Base Stats
-----------------------
-Total: 495
-Hp:  80
-Attack:  120
-Defence:  130
-Special Attack:  55
-Special Defence:  65
-Speed:  45
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:        120
+        defense:        130
+ special-attack:         55
+special-defense:         65
+          speed:         45
+
+Pokedex ID: 76	Capture Rate: 45
+Base Exp: 223	Happiness: 70
+Height: 14	Weight: 3000
+
+Genus: Megaton Pokémon
+Location Areas:
+johto-safari-zone-zone-peak
diff --git a/pokeData/golett b/pokeData/golett
index ed1cea1..ad48ded 100644
--- a/pokeData/golett
+++ b/pokeData/golett
@@ -1,15 +1,23 @@
+golett	A ground type Pokémon
 
-Name:  Golett
-Pokedex Number:  622
-Gender Ratio:  Genderless
-Abilities: Iron Fist - Klutz - No Guard (Hidden Ability)
+체내에서 불타는 에너지로
+인해 활동하고 있지만 어떤
+에너지인지는 불명이다.
 
-Base Stats
-----------------------
-Total: 303
-Hp:  59
-Attack:  74
-Defence:  50
-Special Attack:  35
-Special Defence:  50
-Speed:  35
+   ↞--------| STATS |--------↠ 
+             hp:         59
+         attack:         74
+        defense:         50
+ special-attack:         35
+special-defense:         50
+          speed:         35
+
+Pokedex ID: 622	Capture Rate: 190
+Base Exp: 61	Happiness: 50
+Height: 10	Weight: 920
+
+Genus: Automaton Pokémon
+Location Areas:
+dragonspiral-tower-1f
+dragonspiral-tower-2f
+kalos-route-10-area
diff --git a/pokeData/golisopod b/pokeData/golisopod
index 5bea5ab..10143e0 100644
--- a/pokeData/golisopod
+++ b/pokeData/golisopod
@@ -1,15 +1,20 @@
+golisopod	A bug type Pokémon
 
-Name:  Golisopod
-Pokedex Number:  768
-Gender Ratio:   ♂:50.2% ♀:49.8% 
-Abilities: Emergency Exit
+With a flashing slash of its giant sharp claws,
+it cleaves seawater—or even air—right in two.
+
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:        125
+        defense:        140
+ special-attack:         60
+special-defense:         90
+          speed:         40
+
+Pokedex ID: 768	Capture Rate: 45
+Base Exp: 186	Happiness: 50
+Height: 20	Weight: 1080
+
+Genus: Hard Scale Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 530
-Hp:  75
-Attack:  125
-Defence:  140
-Special Attack:  60
-Special Defence:  90
-Speed:  40
diff --git a/pokeData/golurk b/pokeData/golurk
index e35869b..30b114d 100644
--- a/pokeData/golurk
+++ b/pokeData/golurk
@@ -1,15 +1,24 @@
+golurk	A ground type Pokémon
 
-Name:  Golurk
-Pokedex Number:  623
-Gender Ratio:  Genderless
-Abilities: Iron Fist - Klutz - No Guard (Hidden Ability)
+골루그를 만든 고대인에게
+사람과 포켓몬을 지키도록
+명령받았다고 전해진다.
 
-Base Stats
-----------------------
-Total: 483
-Hp:  89
-Attack:  124
-Defence:  80
-Special Attack:  55
-Special Defence:  80
-Speed:  55
+   ↞--------| STATS |--------↠ 
+             hp:         89
+         attack:        124
+        defense:         80
+ special-attack:         55
+special-defense:         80
+          speed:         55
+
+Pokedex ID: 623	Capture Rate: 90
+Base Exp: 169	Happiness: 50
+Height: 28	Weight: 3300
+
+Genus: Automaton Pokémon
+Location Areas:
+dragonspiral-tower-1f
+dragonspiral-tower-2f
+unova-victory-road-2-unknown-area-71
+unova-victory-road-2-unknown-area-78
diff --git a/pokeData/goodra b/pokeData/goodra
index 7b2897b..46fd3a9 100644
--- a/pokeData/goodra
+++ b/pokeData/goodra
@@ -1,15 +1,21 @@
+goodra	A dragon type Pokémon
 
-Name:  Goodra
-Pokedex Number:  706
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Sap Sipper - Hydration - Gooey (Hidden Ability)
+人懐っこい　ドラゴンポケモン。
+大好きな　トレーナーに　抱き着いて
+粘液で　ヌルヌルにしてしまう。
+
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:        100
+        defense:         70
+ special-attack:        110
+special-defense:        150
+          speed:         80
+
+Pokedex ID: 706	Capture Rate: 45
+Base Exp: 300	Happiness: 35
+Height: 20	Weight: 1505
+
+Genus: Dragon Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 600
-Hp:  90
-Attack:  100
-Defence:  70
-Special Attack:  110
-Special Defence:  150
-Speed:  80
diff --git a/pokeData/goomy b/pokeData/goomy
index c6e0e10..732bd5f 100644
--- a/pokeData/goomy
+++ b/pokeData/goomy
@@ -1,15 +1,21 @@
+goomy	A dragon type Pokémon
 
-Name:  Goomy
-Pokedex Number:  704
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Sap Sipper - Hydration - Gooey (Hidden Ability)
+The weakest Dragon-type Pokémon,
+it lives in damp, shady places, so its
+body doesn’t dry out.
 
-Base Stats
-----------------------
-Total: 300
-Hp:  45
-Attack:  50
-Defence:  35
-Special Attack:  55
-Special Defence:  75
-Speed:  40
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         50
+        defense:         35
+ special-attack:         55
+special-defense:         75
+          speed:         40
+
+Pokedex ID: 704	Capture Rate: 45
+Base Exp: 60	Happiness: 35
+Height: 3	Weight: 28
+
+Genus: Soft Tissue Pokémon
+Location Areas:
+kalos-route-14-area
diff --git a/pokeData/gorebyss b/pokeData/gorebyss
index bd7dd70..fe5ff09 100644
--- a/pokeData/gorebyss
+++ b/pokeData/gorebyss
@@ -1,15 +1,22 @@
+gorebyss	A water type Pokémon
 
-Name:  Gorebyss
-Pokedex Number:  368
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Swift Swim - Hydration (Hidden Ability)
+It lives at the bottom of the sea.
+In the springtime, its pink body
+turns more vivid for some reason.
 
-Base Stats
-----------------------
-Total: 485
-Hp:  55
-Attack:  84
-Defence:  105
-Special Attack:  114
-Special Defence:  75
-Speed:  52
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         84
+        defense:        105
+ special-attack:        114
+special-defense:         75
+          speed:         52
+
+Pokedex ID: 368	Capture Rate: 60
+Base Exp: 170	Happiness: 70
+Height: 18	Weight: 226
+
+Genus: South Sea Pokémon
+Location Areas:
+unova-route-4-area
+kalos-route-12-area
diff --git a/pokeData/gossifleur b/pokeData/gossifleur
index 3441ab3..67b15eb 100644
--- a/pokeData/gossifleur
+++ b/pokeData/gossifleur
@@ -1,15 +1,21 @@
+gossifleur	A grass type Pokémon
 
-Name:  Gossifleur
-Pokedex Number:  829
-Gender Ratio:   ♂:50.2% ♀:49.8%
-Abilities: Cotton Down - Regenerator - Effect Spore (Hidden Ability)
+It anchors itself in the ground with its single leg,
+then basks in the sun. After absorbing enough
+sunlight, its petals spread as it blooms brilliantly.
+
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         40
+        defense:         60
+ special-attack:         40
+special-defense:         60
+          speed:         10
+
+Pokedex ID: 829	Capture Rate: 190
+Base Exp: 50	Happiness: 50
+Height: 4	Weight: 22
+
+Genus: Flowering Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 250
-Hp:  40
-Attack:  40
-Defence:  60
-Special Attack:  40
-Special Defence:  60
-Speed:  10
diff --git a/pokeData/gothita b/pokeData/gothita
index a465fc5..99444d9 100644
--- a/pokeData/gothita
+++ b/pokeData/gothita
@@ -1,15 +1,24 @@
+gothita	A psychic type Pokémon
 
-Name:  Gothita
-Pokedex Number:  574
-Gender Ratio:   ♂:25% ♀:75%
-Abilities: Frisk - Competitive - Shadow Tag (Hidden Ability)
+리본 모양의 더듬이로
+사이코 파워를 증폭시킨다.
+무언가를 가만히 바라보고 있다.
 
-Base Stats
-----------------------
-Total: 290
-Hp:  45
-Attack:  30
-Defence:  50
-Special Attack:  55
-Special Defence:  65
-Speed:  45
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         30
+        defense:         50
+ special-attack:         55
+special-defense:         65
+          speed:         45
+
+Pokedex ID: 574	Capture Rate: 200
+Base Exp: 58	Happiness: 50
+Height: 4	Weight: 58
+
+Genus: Fixation Pokémon
+Location Areas:
+unova-route-5-area
+unova-route-16-area
+strange-house-1f
+strange-house-b1f
diff --git a/pokeData/gothitelle b/pokeData/gothitelle
index 3314abb..70e0511 100644
--- a/pokeData/gothitelle
+++ b/pokeData/gothitelle
@@ -1,15 +1,21 @@
+gothitelle	A psychic type Pokémon
 
-Name:  Gothitelle
-Pokedex Number:  576
-Gender Ratio:   ♂:25% ♀:75%
-Abilities: Frisk - Competitive - Shadow Tag (Hidden Ability)
+강력한 사이코 파워의 영향으로
+고디모아젤 주변 공간이 비틀어져
+몇만 광년이나 떨어진 하늘의 별이 비친다.
 
-Base Stats
-----------------------
-Total: 490
-Hp:  70
-Attack:  55
-Defence:  95
-Special Attack:  95
-Special Defence:  110
-Speed:  65
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         55
+        defense:         95
+ special-attack:         95
+special-defense:        110
+          speed:         65
+
+Pokedex ID: 576	Capture Rate: 50
+Base Exp: 245	Happiness: 50
+Height: 15	Weight: 440
+
+Genus: Astral Body Pokémon
+Location Areas:
+unova-route-9-area
diff --git a/pokeData/gothorita b/pokeData/gothorita
index bd950cb..51dcec7 100644
--- a/pokeData/gothorita
+++ b/pokeData/gothorita
@@ -1,15 +1,25 @@
+gothorita	A psychic type Pokémon
 
-Name:  Gothorita
-Pokedex Number:  575
-Gender Ratio:   ♂:25% ♀:75%
-Abilities: Frisk - Competitive - Shadow Tag (Hidden Ability)
+별빛이 힘의 원천이다.
+밤이 되면 사이코 파워로 돌을
+띄워 별의 배치를 표시한다.
 
-Base Stats
-----------------------
-Total: 390
-Hp:  60
-Attack:  45
-Defence:  70
-Special Attack:  75
-Special Defence:  85
-Speed:  55
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         45
+        defense:         70
+ special-attack:         75
+special-defense:         85
+          speed:         55
+
+Pokedex ID: 575	Capture Rate: 100
+Base Exp: 137	Happiness: 50
+Height: 7	Weight: 180
+
+Genus: Manipulate Pokémon
+Location Areas:
+unova-route-9-area
+strange-house-1f
+strange-house-b1f
+kalos-route-20-area
+pokemon-village-area
diff --git a/pokeData/gourgeist b/pokeData/gourgeist
index 4b8d4c6..0d43d1e 100644
--- a/pokeData/gourgeist
+++ b/pokeData/gourgeist
@@ -1,15 +1,15 @@
+	A  type Pokémon
 
-Name:  Gourgeist
-Pokedex Number:  711
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Pickup - Frisk - Insomnia (Hidden Ability)
+新月の　夜に　不気味な　声で
+歌いながら　街中を　さまよう。
+その歌を　聞くと　のろわれる。
+
+   ↞--------| STATS |--------↠ 
+
+Pokedex ID: 	Capture Rate: 60
+Base Exp: 	Happiness: 50
+Height: 	Weight: 
+
+Genus: Pumpkin Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 494
-Hp:  85
-Attack:  100
-Defence:  122
-Special Attack:  58
-Special Defence:  75
-Speed:  54
diff --git a/pokeData/granbull b/pokeData/granbull
index d6953c4..b343191 100644
--- a/pokeData/granbull
+++ b/pokeData/granbull
@@ -1,15 +1,21 @@
+granbull	A fairy type Pokémon
 
-Name:  Granbull
-Pokedex Number:  210
-Gender Ratio:   ♂:25% ♀:75%
-Abilities: Intimidate - Quick Feet - Rattled (Hidden Ability)
+It is actually timid and easily spooked.
+If attacked, it flails about to fend off
+its attacker.
 
-Base Stats
-----------------------
-Total: 450
-Hp:  90
-Attack:  120
-Defence:  75
-Special Attack:  60
-Special Defence:  60
-Speed:  45
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:        120
+        defense:         75
+ special-attack:         60
+special-defense:         60
+          speed:         45
+
+Pokedex ID: 210	Capture Rate: 75
+Base Exp: 158	Happiness: 70
+Height: 14	Weight: 487
+
+Genus: Fairy Pokémon
+Location Areas:
+kanto-route-6-area
diff --git a/pokeData/grapploct b/pokeData/grapploct
index 5b9c42f..69a112c 100644
--- a/pokeData/grapploct
+++ b/pokeData/grapploct
@@ -1,15 +1,21 @@
+grapploct	A fighting type Pokémon
 
-Name:  Grapploct
-Pokedex Number:  853
-Gender Ratio:   ♂:50.2% ♀:49.8%
-Abilities: Limber - Technician (Hidden Ability)
+A body made up of nothing but muscle makes
+the grappling moves this Pokémon performs with
+its tentacles tremendously powerful.
+
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:        118
+        defense:         90
+ special-attack:         70
+special-defense:         80
+          speed:         42
+
+Pokedex ID: 853	Capture Rate: 45
+Base Exp: 168	Happiness: 50
+Height: 16	Weight: 390
+
+Genus: Jujitsu Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 480
-Hp:  80
-Attack:  118
-Defence:  90
-Special Attack:  70
-Special Defence:  80
-Speed:  42
diff --git a/pokeData/graveler b/pokeData/graveler
index 12b2bb4..0c7ac95 100644
--- a/pokeData/graveler
+++ b/pokeData/graveler
@@ -1,15 +1,99 @@
+graveler	A rock type Pokémon
 
-Name:  Graveler
-Pokedex Number:  075
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Rock Head - Sturdy - Sand Veil (Hidden Ability)
+GRAVELER grows by feeding on rocks.
+Apparently, it prefers to eat rocks
+that are covered in moss.This POKéMON eats its way through
+a ton of rocks on a daily basis.
 
-Base Stats
-----------------------
-Total: 390
-Hp:  55
-Attack:  95
-Defence:  115
-Special Attack:  45
-Special Defence:  45
-Speed:  35
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         95
+        defense:        115
+ special-attack:         45
+special-defense:         45
+          speed:         35
+
+Pokedex ID: 75	Capture Rate: 120
+Base Exp: 137	Happiness: 70
+Height: 10	Weight: 1050
+
+Genus: Rock Pokémon
+Location Areas:
+mt-coronet-2f
+mt-coronet-3f
+mt-coronet-4f
+mt-coronet-4f-small-room
+mt-coronet-5f
+mt-coronet-6f
+mt-coronet-1f-from-exterior
+mt-coronet-1f-route-216
+mt-coronet-b1f
+sinnoh-victory-road-1f
+sinnoh-victory-road-2f
+sinnoh-victory-road-b1f
+sinnoh-victory-road-inside-b1f
+sinnoh-victory-road-inside
+sinnoh-victory-road-inside-exit
+stark-mountain-area
+stark-mountain-entrance
+stark-mountain-inside
+sendoff-spring-area
+snowpoint-temple-1f
+snowpoint-temple-b1f
+snowpoint-temple-b2f
+snowpoint-temple-b3f
+snowpoint-temple-b4f
+snowpoint-temple-b5f
+iron-island-1f
+iron-island-b1f-left
+iron-island-b1f-right
+iron-island-b2f-right
+iron-island-b2f-left
+iron-island-b3f
+valor-lakefront-area
+sinnoh-route-211-east-towards-celestic-town
+sinnoh-route-214-area
+sinnoh-route-216-area
+sinnoh-route-225-area
+sinnoh-route-227-area
+sinnoh-sea-route-226-area
+mt-mortar-upper-cave
+johto-route-45-area
+dark-cave-blackthorn-city-entrance
+johto-route-47-inside-cave
+mt-silver-1f
+mt-silver-top
+rock-tunnel-b1f
+kanto-victory-road-1-1f
+kanto-victory-road-1-2f
+kanto-victory-road-1-3f
+cerulean-cave-1f
+cerulean-cave-2f
+cerulean-cave-b1f
+kanto-victory-road-2-1f
+kanto-victory-road-2-2f
+kanto-victory-road-2-3f
+hoenn-victory-road-b1f
+magma-hideout-area
+mt-ember-area
+mt-ember-inside
+mt-ember-1f-cave-behind-team-rocket
+mt-ember-b1f
+mt-ember-b2f
+kindle-road-area
+sevault-canyon-area
+challengers-cave-1f
+challengers-cave-b1f
+challengers-cave-b2f
+kalos-route-13-area
+kalos-route-18-area
+kalos-victory-road-unknown-area-322
+kalos-victory-road-unknown-area-324
+kalos-victory-road-unknown-area-326
+kalos-victory-road-unknown-area-328
+terminus-cave-unknown-area-343
+terminus-cave-unknown-area-344
+terminus-cave-unknown-area-345
+terminus-cave-unknown-area-347
+terminus-cave-unknown-area-348
+mt-ember-summit
diff --git a/pokeData/greedent b/pokeData/greedent
index 4ba52bd..e0aabe2 100644
--- a/pokeData/greedent
+++ b/pokeData/greedent
@@ -1,15 +1,21 @@
+greedent	A normal type Pokémon
 
-Name:  Greedent
-Pokedex Number:  820
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Cheek Pouch - Gluttony (Hidden Ability)
+Conserva talmente tante bacche nella coda
+che le perde una dopo l’altra, ma non essendo
+molto perspicace non se ne rende conto.
+
+   ↞--------| STATS |--------↠ 
+             hp:        120
+         attack:         95
+        defense:         95
+ special-attack:         55
+special-defense:         75
+          speed:         20
+
+Pokedex ID: 820	Capture Rate: 90
+Base Exp: 161	Happiness: 50
+Height: 6	Weight: 60
+
+Genus: Greedy Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 460
-Hp:  120
-Attack:  95
-Defence:  95
-Special Attack:  55
-Special Defence:  75
-Speed:  20
diff --git a/pokeData/greninja b/pokeData/greninja
index 91b68e3..7dae6dd 100644
--- a/pokeData/greninja
+++ b/pokeData/greninja
@@ -1,15 +1,21 @@
+greninja	A water type Pokémon
 
-Name:  Greninja
-Pokedex Number:  658
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Torrent - Protean (Hidden Ability)
+水を　圧縮して　手裏剣を　作り出す。
+高速回転させて　飛ばすと
+金属も　真っ二つ。
+
+   ↞--------| STATS |--------↠ 
+             hp:         72
+         attack:         95
+        defense:         67
+ special-attack:        103
+special-defense:         71
+          speed:        122
+
+Pokedex ID: 658	Capture Rate: 45
+Base Exp: 239	Happiness: 70
+Height: 15	Weight: 400
+
+Genus: Ninja Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 530
-Hp:  72
-Attack:  95
-Defence:  67
-Special Attack:  103
-Special Defence:  71
-Speed:  122
diff --git a/pokeData/grimer b/pokeData/grimer
index 71ee098..2478cc9 100644
--- a/pokeData/grimer
+++ b/pokeData/grimer
@@ -1,15 +1,35 @@
+grimer	A poison type Pokémon
 
-Name:  Grimer
-Pokedex Number:  088
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Stench - Sticky Hold - Poison Touch (Hidden Ability)
+GRIMER emerged from the sludge that
+settled on a polluted seabed.
+This POKéMON loves anything filthy.It constantly leaks a horribly germ-
+infested fluid from all over its body.
 
-Base Stats
-----------------------
-Total: 325
-Hp:  80
-Attack:  80
-Defence:  50
-Special Attack:  40
-Special Defence:  50
-Speed:  25
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:         80
+        defense:         50
+ special-attack:         40
+special-defense:         50
+          speed:         25
+
+Pokedex ID: 88	Capture Rate: 190
+Base Exp: 65	Happiness: 70
+Height: 9	Weight: 300
+
+Genus: Sludge Pokémon
+Location Areas:
+sinnoh-route-212-east-towards-pastoria-city
+celadon-city-area
+kanto-route-16-area
+kanto-route-17-area
+kanto-route-18-area
+power-plant-area
+pokemon-mansion-1f
+pokemon-mansion-2f
+pokemon-mansion-3f
+pokemon-mansion-b1f
+fiery-path-area
+castelia-sewers-area
+castelia-sewers-unknown-area-38
+johto-safari-zone-zone-marshland
diff --git a/pokeData/grimmsnarl b/pokeData/grimmsnarl
index 8bb4b0f..e17e44d 100644
--- a/pokeData/grimmsnarl
+++ b/pokeData/grimmsnarl
@@ -1,15 +1,21 @@
+grimmsnarl	A dark type Pokémon
 
-Name:  Grimmsnarl
-Pokedex Number:  861
-Gender Ratio:   ♂:100% ♀:0% 
-Abilities: Prankster - Frisk - Pickpocket (Hidden Ability)
+With the hair wrapped around its body helping to
+enhance its muscles, this Pokémon can overwhelm
+even Machamp.
+
+   ↞--------| STATS |--------↠ 
+             hp:         95
+         attack:        120
+        defense:         65
+ special-attack:         95
+special-defense:         75
+          speed:         60
+
+Pokedex ID: 861	Capture Rate: 45
+Base Exp: 255	Happiness: 50
+Height: 15	Weight: 610
+
+Genus: Bulk Up Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 510
-Hp:  95
-Attack:  120
-Defence:  65
-Special Attack:  95
-Special Defence:  75
-Speed:  60
diff --git a/pokeData/grookey b/pokeData/grookey
index 5884ac2..868149f 100644
--- a/pokeData/grookey
+++ b/pokeData/grookey
@@ -1,15 +1,21 @@
+grookey	A grass type Pokémon
 
-Name:  Grookey
-Pokedex Number:  810
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Overgrow - Grassy Surge (Hidden Ability)
+When it uses its special stick to strike up a beat,
+the sound waves produced carry revitalizing
+energy to the plants and flowers in the area.
+
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         65
+        defense:         50
+ special-attack:         40
+special-defense:         40
+          speed:         65
+
+Pokedex ID: 810	Capture Rate: 45
+Base Exp: 62	Happiness: 50
+Height: 3	Weight: 50
+
+Genus: Chimp Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 310
-Hp:  50
-Attack:  65
-Defence:  50
-Special Attack:  40
-Special Defence:  40
-Speed:  65
diff --git a/pokeData/grotle b/pokeData/grotle
index 7201ac9..31d52fc 100644
--- a/pokeData/grotle
+++ b/pokeData/grotle
@@ -1,15 +1,21 @@
+grotle	A grass type Pokémon
 
-Name:  Grotle
-Pokedex Number:  388
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Overgrow - Shell Armor (Hidden Ability)
+Il sait d’instinct où trouver une
+source d’eau pure. Il y transporte
+d’autres Pokémon sur son dos.
+
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:         89
+        defense:         85
+ special-attack:         55
+special-defense:         65
+          speed:         36
+
+Pokedex ID: 388	Capture Rate: 45
+Base Exp: 142	Happiness: 70
+Height: 11	Weight: 970
+
+Genus: Grove Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 405
-Hp:  75
-Attack:  89
-Defence:  85
-Special Attack:  55
-Special Defence:  65
-Speed:  36
diff --git a/pokeData/groudon b/pokeData/groudon
index 232413f..9e439c0 100644
--- a/pokeData/groudon
+++ b/pokeData/groudon
@@ -1,15 +1,23 @@
+groudon	A ground type Pokémon
 
-Name:  Groudon
-Pokedex Number:  383
-Gender Ratio:  Genderless
-Abilities: Drought
+It had been asleep in underground
+magma ever since it fiercely
+fought KYOGRE long ago.
 
-Base Stats
-----------------------
-Total: 670
-Hp:  100
-Attack:  180
-Defence:  160
-Special Attack:  150
-Special Defence:  90
-Speed:  90
+   ↞--------| STATS |--------↠ 
+             hp:        100
+         attack:        150
+        defense:        140
+ special-attack:        100
+special-defense:         90
+          speed:         90
+
+Pokedex ID: 383	Capture Rate: 3
+Base Exp: 335	Happiness: 0
+Height: 35	Weight: 9500
+
+Genus: Continent Pokémon
+Location Areas:
+cave-of-origin-b4f
+terra-cave-area
+embedded-tower-groundon-room
diff --git a/pokeData/grovyle b/pokeData/grovyle
index 7337f65..019c384 100644
--- a/pokeData/grovyle
+++ b/pokeData/grovyle
@@ -1,15 +1,21 @@
+grovyle	A grass type Pokémon
 
-Name:  Grovyle
-Pokedex Number:  253
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Overgrow - Unburden (Hidden Ability)
+It lives in dense jungles. While 
+closing in on its prey, it leaps
+from branch to branch.
+
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         65
+        defense:         45
+ special-attack:         85
+special-defense:         65
+          speed:         95
+
+Pokedex ID: 253	Capture Rate: 45
+Base Exp: 142	Happiness: 50
+Height: 9	Weight: 216
+
+Genus: Wood Gecko Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 405
-Hp:  50
-Attack:  65
-Defence:  45
-Special Attack:  85
-Special Defence:  65
-Speed:  95
diff --git a/pokeData/growlithe b/pokeData/growlithe
index c9a4ebf..c8b7a09 100644
--- a/pokeData/growlithe
+++ b/pokeData/growlithe
@@ -1,15 +1,35 @@
+growlithe	A fire type Pokémon
 
-Name:  Growlithe
-Pokedex Number:  058
-Gender Ratio:   ♂:75% ♀:25%
-Abilities: Intimidate - Flash Fire - Justified (Hidden Ability)
+GROWLITHE has a superb sense of smell.
+Once it smells anything, this POKéMON
+won’t forget the scent, no matter what.It uses its advanced olfactory sense
+to determine the emotions of other
+living things.
 
-Base Stats
-----------------------
-Total: 350
-Hp:  55
-Attack:  70
-Defence:  45
-Special Attack:  70
-Special Defence:  50
-Speed:  60
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         70
+        defense:         45
+ special-attack:         70
+special-defense:         50
+          speed:         60
+
+Pokedex ID: 58	Capture Rate: 190
+Base Exp: 70	Happiness: 50
+Height: 7	Weight: 190
+
+Genus: Puppy Pokémon
+Location Areas:
+sinnoh-route-201-area
+sinnoh-route-202-area
+johto-route-35-area
+johto-route-36-area
+johto-route-37-area
+johto-route-48-area
+kanto-route-7-area
+kanto-route-8-area
+pokemon-mansion-1f
+pokemon-mansion-2f
+pokemon-mansion-3f
+pokemon-mansion-b1f
+virbank-complex-inner
diff --git a/pokeData/grubbin b/pokeData/grubbin
index ce02ced..ac8245c 100644
--- a/pokeData/grubbin
+++ b/pokeData/grubbin
@@ -1,15 +1,20 @@
+grubbin	A bug type Pokémon
 
-Name:  Grubbin
-Pokedex Number:  736
-Gender Ratio:   ♂:50.2% ♀:49.8%
-Abilities: Swarm
+Its strong jaw enables it to scrape trees and
+slurp out the sap. It normally lives underground.
+
+   ↞--------| STATS |--------↠ 
+             hp:         47
+         attack:         62
+        defense:         45
+ special-attack:         55
+special-defense:         45
+          speed:         46
+
+Pokedex ID: 736	Capture Rate: 255
+Base Exp: 60	Happiness: 50
+Height: 4	Weight: 44
+
+Genus: Larva Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 300
-Hp:  47
-Attack:  62
-Defence:  45
-Special Attack:  55
-Special Defence:  45
-Speed:  46
diff --git a/pokeData/grumpig b/pokeData/grumpig
index cd04cae..fecaacd 100644
--- a/pokeData/grumpig
+++ b/pokeData/grumpig
@@ -1,15 +1,33 @@
+grumpig	A psychic type Pokémon
 
-Name:  Grumpig
-Pokedex Number:  326
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Thick Fat - Own Tempo - Gluttony (Hidden Ability)
+It uses black pearls to amplify its
+psycho-power. It does an odd
+dance to gain control over foes.
 
-Base Stats
-----------------------
-Total: 470
-Hp:  80
-Attack:  45
-Defence:  65
-Special Attack:  90
-Special Defence:  110
-Speed:  80
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:         45
+        defense:         65
+ special-attack:         90
+special-defense:        110
+          speed:         80
+
+Pokedex ID: 326	Capture Rate: 60
+Base Exp: 165	Happiness: 70
+Height: 9	Weight: 715
+
+Genus: Manipulate Pokémon
+Location Areas:
+reversal-mountain-unknown-area-48
+reversal-mountain-unknown-area-49
+reversal-mountain-unknown-area-50
+reversal-mountain-unknown-area-51
+reversal-mountain-unknown-area-52
+reversal-mountain-unknown-area-53
+reversal-mountain-unknown-area-54
+reversal-mountain-unknown-area-55
+reversal-mountain-unknown-area-56
+reversal-mountain-unknown-area-57
+reversal-mountain-unknown-area-58
+reversal-mountain-unknown-area-59
+reversal-mountain-unknown-area-60
diff --git a/pokeData/gulpin b/pokeData/gulpin
index 13d6267..1da4a26 100644
--- a/pokeData/gulpin
+++ b/pokeData/gulpin
@@ -1,15 +1,23 @@
+gulpin	A poison type Pokémon
 
-Name:  Gulpin
-Pokedex Number:  316
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Liquid Ooze - Sticky Hold - Gluttony (Hidden Ability)
+Almost all its body is its stomach.
+Its harsh digestive juices quickly
+dissolve anything it swallows.
 
-Base Stats
-----------------------
-Total: 302
-Hp:  70
-Attack:  43
-Defence:  53
-Special Attack:  43
-Special Defence:  53
-Speed:  40
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         43
+        defense:         53
+ special-attack:         43
+special-defense:         53
+          speed:         40
+
+Pokedex ID: 316	Capture Rate: 225
+Base Exp: 60	Happiness: 70
+Height: 4	Weight: 103
+
+Genus: Stomach Pokémon
+Location Areas:
+kanto-route-3-area
+hoenn-route-110-area
+kalos-route-5-area
diff --git a/pokeData/gumshoos b/pokeData/gumshoos
index 0d1a6e7..f3044c3 100644
--- a/pokeData/gumshoos
+++ b/pokeData/gumshoos
@@ -1,15 +1,21 @@
+gumshoos	A normal type Pokémon
 
-Name:  Gumshoos
-Pokedex Number:  735
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Stakeout - Strong Jaw - Adaptability (Hidden Ability)
+When it finds a trace of its prey, it patiently
+stakes out the location...but it’s always snoozing
+by nightfall.
+
+   ↞--------| STATS |--------↠ 
+             hp:         88
+         attack:        110
+        defense:         60
+ special-attack:         55
+special-defense:         60
+          speed:         45
+
+Pokedex ID: 735	Capture Rate: 127
+Base Exp: 146	Happiness: 70
+Height: 7	Weight: 142
+
+Genus: Stakeout Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 418
-Hp:  88
-Attack:  110
-Defence:  60
-Special Attack:  55
-Special Defence:  60
-Speed:  45
diff --git a/pokeData/gurdurr b/pokeData/gurdurr
index 8404e8d..d7e0b52 100644
--- a/pokeData/gurdurr
+++ b/pokeData/gurdurr
@@ -1,15 +1,30 @@
+gurdurr	A fighting type Pokémon
 
-Name:  Gurdurr
-Pokedex Number:  533
-Gender Ratio:   ♂:75% ♀:25%
-Abilities: Guts - Sheer Force - Iron Fist (Hidden Ability)
+단련된 근육의 소유자.
+철골을 능숙하게 조종하여
+집을 해체해준다.
 
-Base Stats
-----------------------
-Total: 405
-Hp:  85
-Attack:  105
-Defence:  85
-Special Attack:  40
-Special Defence:  50
-Speed:  40
+   ↞--------| STATS |--------↠ 
+             hp:         85
+         attack:        105
+        defense:         85
+ special-attack:         40
+special-defense:         50
+          speed:         40
+
+Pokedex ID: 533	Capture Rate: 90
+Base Exp: 142	Happiness: 50
+Height: 12	Weight: 400
+
+Genus: Muscular Pokémon
+Location Areas:
+pinwheel-forest-outside
+twist-mountain-area
+unova-victory-road-2-unknown-area-76
+relic-passage-relic-castle-entrance
+relic-passage-pwt-entrance
+kalos-route-18-area
+kalos-victory-road-unknown-area-322
+kalos-victory-road-unknown-area-324
+kalos-victory-road-unknown-area-326
+kalos-victory-road-unknown-area-328
diff --git a/pokeData/guzzlord b/pokeData/guzzlord
index 1eab16c..c666b7e 100644
--- a/pokeData/guzzlord
+++ b/pokeData/guzzlord
@@ -1,15 +1,21 @@
+guzzlord	A dark type Pokémon
 
-Name:  Guzzlord
-Pokedex Number:  799
-Gender Ratio:  Genderless
-Abilities: Beast Boost
+It has gobbled mountains and swallowed whole
+buildings, according to reports. It’s one of the
+Ultra Beasts.
+
+   ↞--------| STATS |--------↠ 
+             hp:        223
+         attack:        101
+        defense:         53
+ special-attack:         97
+special-defense:         53
+          speed:         43
+
+Pokedex ID: 799	Capture Rate: 45
+Base Exp: 285	Happiness: 0
+Height: 55	Weight: 8880
+
+Genus: Junkivore Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 570
-Hp:  223
-Attack:  101
-Defence:  53
-Special Attack:  97
-Special Defence:  53
-Speed:  43
diff --git a/pokeData/gyarados b/pokeData/gyarados
index 87c4797..64c9c54 100644
--- a/pokeData/gyarados
+++ b/pokeData/gyarados
@@ -1,15 +1,129 @@
+gyarados	A water type Pokémon
 
-Name:  Gyarados
-Pokedex Number:  130
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Intimidate - Moxie (Hidden Ability)
+It appears when­
+ever there is
+world conflict,burning down any
+place it travels
+through.
 
-Base Stats
-----------------------
-Total: 540
-Hp:  95
-Attack:  155
-Defence:  109
-Special Attack:  70
-Special Defence:  130
-Speed:  81
+   ↞--------| STATS |--------↠ 
+             hp:         95
+         attack:        125
+        defense:         79
+ special-attack:         60
+special-defense:        100
+          speed:         81
+
+Pokedex ID: 130	Capture Rate: 45
+Base Exp: 189	Happiness: 50
+Height: 65	Weight: 2350
+
+Genus: Atrocious Pokémon
+Location Areas:
+canalave-city-area
+eterna-city-area
+pastoria-city-area
+sunyshore-city-area
+sinnoh-pokemon-league-area
+valley-windworks-area
+fuego-ironworks-area
+mt-coronet-1f-route-207
+mt-coronet-4f
+mt-coronet-b1f
+great-marsh-area-1
+great-marsh-area-2
+great-marsh-area-3
+great-marsh-area-4
+great-marsh-area-5
+great-marsh-area-6
+sinnoh-victory-road-b1f
+sinnoh-victory-road-inside-b1f
+ravaged-path-area
+oreburgh-gate-b1f
+sendoff-spring-area
+iron-island-area
+lake-verity-before-galactic-intervention
+lake-verity-after-galactic-intervention
+lake-valor-area
+lake-acuity-area
+sinnoh-route-203-area
+sinnoh-route-204-south-towards-jubilife-city
+sinnoh-route-204-north-towards-floaroma-town
+sinnoh-route-205-south-towards-floaroma-town
+sinnoh-route-205-east-towards-eterna-city
+sinnoh-route-208-area
+sinnoh-route-209-area
+sinnoh-route-210-west-towards-celestic-town
+sinnoh-route-212-north-towards-hearthome-city
+sinnoh-route-212-east-towards-pastoria-city
+sinnoh-route-213-area
+sinnoh-route-214-area
+sinnoh-route-218-area
+sinnoh-route-219-area
+sinnoh-route-221-area
+sinnoh-route-222-area
+sinnoh-route-224-area
+sinnoh-route-225-area
+sinnoh-route-227-area
+sinnoh-route-228-area
+sinnoh-route-229-area
+twinleaf-town-area
+celestic-town-area
+resort-area-area
+sinnoh-sea-route-220-area
+sinnoh-sea-route-223-area
+sinnoh-sea-route-226-area
+sinnoh-sea-route-230-area
+lake-of-rage-area
+seafoam-islands-b3f
+seafoam-islands-b4f
+mt-silver-1f
+kanto-route-12-area
+kanto-sea-route-19-area
+kanto-sea-route-20-area
+cinnabar-island-area
+viridian-city-area
+cerulean-city-area
+vermilion-city-area
+fuchsia-city-area
+pallet-town-area
+kanto-route-4-area
+kanto-route-6-area
+kanto-route-10-area
+kanto-route-11-area
+kanto-route-13-area
+kanto-sea-route-21-area
+kanto-route-22-area
+kanto-route-24-area
+kanto-route-25-area
+cerulean-cave-1f
+cerulean-cave-2f
+cerulean-cave-b1f
+kanto-route-23-area
+sootopolis-city-area
+ss-anne-area
+berry-forest-area
+icefall-cave-entrance
+icefall-cave-waterfall
+kindle-road-area
+treasure-beach-area
+cape-brink-area
+bond-bridge-area
+resort-gorgeous-area
+water-labyrinth-area
+five-isle-meadow-area
+memorial-pillar-area
+outcast-island-area
+green-path-area
+water-path-area
+ruin-valley-area
+trainer-tower-area
+tanoby-ruins-area
+one-island-area
+four-island-area
+five-island-area
+nature-sanctuary-area
+kalos-route-3-area
+kalos-route-22-area
+parfum-palace-area
+johto-safari-zone-zone-marshland
diff --git a/pokeData/hakamo-o b/pokeData/hakamo-o
index befedc4..eaeb81e 100644
--- a/pokeData/hakamo-o
+++ b/pokeData/hakamo-o
@@ -1 +1,20 @@
-You didn't enter a valid pokemon!
+hakamo-o	A dragon type Pokémon
+
+It leaps at its prey with a courageous shout.
+Its scaly punches tear its opponents to shreds.
+
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         75
+        defense:         90
+ special-attack:         65
+special-defense:         70
+          speed:         65
+
+Pokedex ID: 783	Capture Rate: 45
+Base Exp: 147	Happiness: 50
+Height: 12	Weight: 470
+
+Genus: Scaly Pokémon
+Location Areas:
+
diff --git a/pokeData/happiny b/pokeData/happiny
index 7e7bbd5..a1fad28 100644
--- a/pokeData/happiny
+++ b/pokeData/happiny
@@ -1,15 +1,22 @@
+happiny	A normal type Pokémon
 
-Name:  Happiny
-Pokedex Number:  440
-Gender Ratio:   ♂:0% ♀:100%
-Abilities: Natural Cure - Serene Grace - Friend Guard (Hidden Ability)
+Ce Pokémon ne se sépare jamais de
+son petit caillou et a tendance à
+traîner dans les pieds des gens.
 
-Base Stats
-----------------------
-Total: 220
-Hp:  100
-Attack:  5
-Defence:  5
-Special Attack:  15
-Special Defence:  65
-Speed:  30
+   ↞--------| STATS |--------↠ 
+             hp:        100
+         attack:          5
+        defense:          5
+ special-attack:         15
+special-defense:         65
+          speed:         30
+
+Pokedex ID: 440	Capture Rate: 130
+Base Exp: 110	Happiness: 140
+Height: 6	Weight: 244
+
+Genus: Playhouse Pokémon
+Location Areas:
+hearthome-city-west-gate
+nacrene-city-west-gate
diff --git a/pokeData/hariyama b/pokeData/hariyama
index 36a169b..867db04 100644
--- a/pokeData/hariyama
+++ b/pokeData/hariyama
@@ -1,15 +1,23 @@
+hariyama	A fighting type Pokémon
 
-Name:  Hariyama
-Pokedex Number:  297
-Gender Ratio:   ♂:75% ♀:25%
-Abilities: Thick Fat - Guts - Sheer Force (Hidden Ability)
+It loves to match power with
+big-bodied Pokémon. It can knock a
+truck flying with its arm thrusts.
 
-Base Stats
-----------------------
-Total: 474
-Hp:  144
-Attack:  120
-Defence:  60
-Special Attack:  40
-Special Defence:  60
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:        144
+         attack:        120
+        defense:         60
+ special-attack:         40
+special-defense:         60
+          speed:         50
+
+Pokedex ID: 297	Capture Rate: 200
+Base Exp: 166	Happiness: 70
+Height: 23	Weight: 2538
+
+Genus: Arm Thrust Pokémon
+Location Areas:
+hoenn-victory-road-1f
+hoenn-victory-road-b1f
+kalos-route-11-area
diff --git a/pokeData/hatenna b/pokeData/hatenna
index c3abb6e..1798c24 100644
--- a/pokeData/hatenna
+++ b/pokeData/hatenna
@@ -1,15 +1,21 @@
+hatenna	A psychic type Pokémon
 
-Name:  Hatenna
-Pokedex Number:  856
-Gender Ratio:   ♂:0% ♀:100%
-Abilities: Healer - Anticipation - Magic Bounce (Hidden Ability)
+Via the protrusion on its head, it senses other
+creatures’ emotions. If you don’t have a calm
+disposition, it will never warm up to you.
+
+   ↞--------| STATS |--------↠ 
+             hp:         42
+         attack:         30
+        defense:         45
+ special-attack:         56
+special-defense:         53
+          speed:         39
+
+Pokedex ID: 856	Capture Rate: 235
+Base Exp: 53	Happiness: 50
+Height: 4	Weight: 34
+
+Genus: Calm Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 265
-Hp:  42
-Attack:  30
-Defence:  45
-Special Attack:  56
-Special Defence:  53
-Speed:  39
diff --git a/pokeData/hatterene b/pokeData/hatterene
index 1314ea0..4d7f862 100644
--- a/pokeData/hatterene
+++ b/pokeData/hatterene
@@ -1,15 +1,21 @@
+hatterene	A psychic type Pokémon
 
-Name:  Hatterene
-Pokedex Number:  858
-Gender Ratio:   ♂:0% ♀:100% 
-Abilities: Healer - Anticipation - Magic Bounce (Hidden Ability)
+It emits psychic power strong enough to cause
+headaches as a deterrent to the approach
+of others.
+
+   ↞--------| STATS |--------↠ 
+             hp:         57
+         attack:         90
+        defense:         95
+ special-attack:        136
+special-defense:        103
+          speed:         29
+
+Pokedex ID: 858	Capture Rate: 45
+Base Exp: 255	Happiness: 50
+Height: 21	Weight: 51
+
+Genus: Silent Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 510
-Hp:  57
-Attack:  90
-Defence:  95
-Special Attack:  136
-Special Defence:  103
-Speed:  29
diff --git a/pokeData/hattrem b/pokeData/hattrem
index 3b83fee..4c2a56d 100644
--- a/pokeData/hattrem
+++ b/pokeData/hattrem
@@ -1,15 +1,21 @@
+hattrem	A psychic type Pokémon
 
-Name:  Hattrem
-Pokedex Number:  857
-Gender Ratio:   ♂:0% ♀:100%
-Abilities: Healer - Anticipation - Magic Bounce (Hidden Ability)
+No matter who you are, if you bring strong
+emotions near this Pokémon, it will silence
+you violently.
+
+   ↞--------| STATS |--------↠ 
+             hp:         57
+         attack:         40
+        defense:         65
+ special-attack:         86
+special-defense:         73
+          speed:         49
+
+Pokedex ID: 857	Capture Rate: 120
+Base Exp: 130	Happiness: 50
+Height: 6	Weight: 48
+
+Genus: Serene Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 370
-Hp:  57
-Attack:  40
-Defence:  65
-Special Attack:  86
-Special Defence:  73
-Speed:  49
diff --git a/pokeData/haunter b/pokeData/haunter
index 0473b5a..81cfe51 100644
--- a/pokeData/haunter
+++ b/pokeData/haunter
@@ -1,15 +1,67 @@
+haunter	A ghost type Pokémon
 
-Name:  Haunter
-Pokedex Number:  093
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Levitate
+HAUNTER is a dangerous POKéMON.
+If one beckons you while floating in
+darkness, you must never approach it.This POKéMON will try to lick you with its
+tongue and steal your life away.
 
-Base Stats
-----------------------
-Total: 405
-Hp:  45
-Attack:  50
-Defence:  45
-Special Attack:  115
-Special Defence:  55
-Speed:  95
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         50
+        defense:         45
+ special-attack:        115
+special-defense:         55
+          speed:         95
+
+Pokedex ID: 93	Capture Rate: 90
+Base Exp: 142	Happiness: 50
+Height: 16	Weight: 1
+
+Genus: Gas Pokémon
+Location Areas:
+turnback-cave-pillar-1
+turnback-cave-pillar-2
+turnback-cave-pillar-3
+turnback-cave-before-pillar-1
+turnback-cave-between-pillars-1-and-2
+turnback-cave-between-pillars-2-and-3
+turnback-cave-after-pillar-3
+old-chateau-entrance
+old-chateau-dining-room
+old-chateau-2f-private-room
+old-chateau-2f
+old-chateau-2f-leftmost-room
+old-chateau-2f-left-room
+old-chateau-2f-middle-room
+old-chateau-2f-right-room
+old-chateau-2f-rightmost-room
+rock-tunnel-1f
+rock-tunnel-b1f
+kanto-route-8-area
+pokemon-tower-3f
+pokemon-tower-4f
+pokemon-tower-5f
+pokemon-tower-6f
+pokemon-tower-7f
+lost-cave-room-1
+lost-cave-room-2
+lost-cave-room-3
+lost-cave-room-4
+lost-cave-room-5
+lost-cave-room-6
+lost-cave-room-7
+lost-cave-room-8
+lost-cave-room-9
+lost-cave-room-10
+lost-cave-item-rooms
+kalos-route-14-area
+kalos-route-19-area
+frost-cavern-unknown-area-314
+frost-cavern-unknown-area-315
+frost-cavern-unknown-area-316
+frost-cavern-unknown-area-317
+kalos-victory-road-unknown-area-322
+kalos-victory-road-unknown-area-324
+kalos-victory-road-unknown-area-326
+kalos-victory-road-unknown-area-328
+johto-safari-zone-zone-forest
diff --git a/pokeData/hawlucha b/pokeData/hawlucha
index ce3fcaf..cb0ceae 100644
--- a/pokeData/hawlucha
+++ b/pokeData/hawlucha
@@ -1,15 +1,21 @@
+hawlucha	A fighting type Pokémon
 
-Name:  Hawlucha
-Pokedex Number:  701
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Limber - Unburden - Mold Breaker (Hidden Ability)
+体格は　小柄だが　カイリキーや
+ハリテヤマなど　大きな　ポケモンと
+互角に　戦う　テクニシャン。
 
-Base Stats
-----------------------
-Total: 500
-Hp:  78
-Attack:  92
-Defence:  75
-Special Attack:  74
-Special Defence:  63
-Speed:  118
+   ↞--------| STATS |--------↠ 
+             hp:         78
+         attack:         92
+        defense:         75
+ special-attack:         74
+special-defense:         63
+          speed:        118
+
+Pokedex ID: 701	Capture Rate: 100
+Base Exp: 175	Happiness: 50
+Height: 8	Weight: 215
+
+Genus: Wrestling Pokémon
+Location Areas:
+kalos-route-10-area
diff --git a/pokeData/haxorus b/pokeData/haxorus
index 54b348a..6ec6e7a 100644
--- a/pokeData/haxorus
+++ b/pokeData/haxorus
@@ -1,15 +1,21 @@
+haxorus	A dragon type Pokémon
 
-Name:  Haxorus
-Pokedex Number:  612
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Rivalry - Mold Breaker - Unnerve (Hidden Ability)
+상냥한 성격이지만 영역을
+어지럽히는 자는 용서하지 않는다.
+철을 자르는 이빨로 덤벼든다.
+
+   ↞--------| STATS |--------↠ 
+             hp:         76
+         attack:        147
+        defense:         90
+ special-attack:         60
+special-defense:         70
+          speed:         97
+
+Pokedex ID: 612	Capture Rate: 45
+Base Exp: 270	Happiness: 35
+Height: 18	Weight: 1055
+
+Genus: Axe Jaw Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 540
-Hp:  76
-Attack:  147
-Defence:  90
-Special Attack:  60
-Special Defence:  70
-Speed:  97
diff --git a/pokeData/heatmor b/pokeData/heatmor
index cc9f1a0..95dde3c 100644
--- a/pokeData/heatmor
+++ b/pokeData/heatmor
@@ -1,15 +1,23 @@
+heatmor	A fire type Pokémon
 
-Name:  Heatmor
-Pokedex Number:  631
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Gluttony - Flash Fire - White Smoke (Hidden Ability)
+뜨겁게 타오르는 불꽃의 혀로
+아이앤트의 강철 몸을
+녹여서 알맹이를 먹어치운다.
 
-Base Stats
-----------------------
-Total: 484
-Hp:  85
-Attack:  97
-Defence:  66
-Special Attack:  105
-Special Defence:  66
-Speed:  65
+   ↞--------| STATS |--------↠ 
+             hp:         85
+         attack:         97
+        defense:         66
+ special-attack:        105
+special-defense:         66
+          speed:         65
+
+Pokedex ID: 631	Capture Rate: 90
+Base Exp: 169	Happiness: 50
+Height: 14	Weight: 580
+
+Genus: Anteater Pokémon
+Location Areas:
+twist-mountain-area
+unova-victory-road-outside
+kalos-route-18-area
diff --git a/pokeData/heatran b/pokeData/heatran
index 64dbecb..69affc3 100644
--- a/pokeData/heatran
+++ b/pokeData/heatran
@@ -1,15 +1,21 @@
+heatran	A fire type Pokémon
 
-Name:  Heatran
-Pokedex Number:  485
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Flash Fire - Flame Body (Hidden Ability)
+Son corps est composé d’acier brut
+dont certaines parties ont fondu
+à cause de sa propre chaleur.
 
-Base Stats
-----------------------
-Total: 600
-Hp:  91
-Attack:  90
-Defence:  106
-Special Attack:  130
-Special Defence:  106
-Speed:  77
+   ↞--------| STATS |--------↠ 
+             hp:         91
+         attack:         90
+        defense:        106
+ special-attack:        130
+special-defense:        106
+          speed:         77
+
+Pokedex ID: 485	Capture Rate: 3
+Base Exp: 300	Happiness: 100
+Height: 17	Weight: 4300
+
+Genus: Lava Dome Pokémon
+Location Areas:
+stark-mountain-heatran-chamber
diff --git a/pokeData/heliolisk b/pokeData/heliolisk
index 457bb7c..ec90817 100644
--- a/pokeData/heliolisk
+++ b/pokeData/heliolisk
@@ -1,15 +1,21 @@
+heliolisk	A electric type Pokémon
 
-Name:  Heliolisk
-Pokedex Number:  695
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Dry Skin - Sand Veil - Solar Power (Hidden Ability)
+エリマキを　広げて　発電する。
+エレザード　１匹で　高層ビルで
+必要な　電気を　作れるのだ。
+
+   ↞--------| STATS |--------↠ 
+             hp:         62
+         attack:         55
+        defense:         52
+ special-attack:        109
+special-defense:         94
+          speed:        109
+
+Pokedex ID: 695	Capture Rate: 75
+Base Exp: 168	Happiness: 50
+Height: 10	Weight: 210
+
+Genus: Generator Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 481
-Hp:  62
-Attack:  55
-Defence:  52
-Special Attack:  109
-Special Defence:  94
-Speed:  109
diff --git a/pokeData/helioptile b/pokeData/helioptile
index 408b03d..4d86e12 100644
--- a/pokeData/helioptile
+++ b/pokeData/helioptile
@@ -1,15 +1,21 @@
+helioptile	A electric type Pokémon
 
-Name:  Helioptile
-Pokedex Number:  694
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Dry Skin - Sand Veil - Solar Power (Hidden Ability)
+砂漠で　生活する。
+太陽の　光を　浴びて　発電すれば
+エサを　食べなくても　平気なのだ。
 
-Base Stats
-----------------------
-Total: 289
-Hp:  44
-Attack:  38
-Defence:  33
-Special Attack:  61
-Special Defence:  43
-Speed:  70
+   ↞--------| STATS |--------↠ 
+             hp:         44
+         attack:         38
+        defense:         33
+ special-attack:         61
+special-defense:         43
+          speed:         70
+
+Pokedex ID: 694	Capture Rate: 190
+Base Exp: 58	Happiness: 50
+Height: 5	Weight: 60
+
+Genus: Generator Pokémon
+Location Areas:
+kalos-route-9-area
diff --git a/pokeData/heracross b/pokeData/heracross
index ede93b0..3ff6921 100644
--- a/pokeData/heracross
+++ b/pokeData/heracross
@@ -1,15 +1,36 @@
+heracross	A bug type Pokémon
 
-Name:  Heracross
-Pokedex Number:  214
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Swarm - Guts - Moxie (Hidden Ability)
+Usually docile, but if disturbed while
+sipping honey, it chases off the intruder
+with its horn.
 
-Base Stats
-----------------------
-Total: 500
-Hp:  80
-Attack:  185
-Defence:  115
-Special Attack:  40
-Special Defence:  105
-Speed:  75
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:        125
+        defense:         75
+ special-attack:         40
+special-defense:         95
+          speed:         85
+
+Pokedex ID: 214	Capture Rate: 45
+Base Exp: 175	Happiness: 50
+Height: 15	Weight: 540
+
+Genus: Single Horn Pokémon
+Location Areas:
+johto-route-29-area
+johto-route-30-area
+johto-route-31-area
+johto-route-32-area
+johto-route-33-area
+johto-route-42-area
+johto-route-43-area
+johto-route-44-area
+johto-route-45-area
+johto-route-46-area
+hoenn-safari-zone-neacro-bike-area
+pattern-bush-area
+unova-route-12-area
+lostlorn-forest-area
+kalos-route-12-area
+azalea-town-area
diff --git a/pokeData/herdier b/pokeData/herdier
index 3e42469..0412efa 100644
--- a/pokeData/herdier
+++ b/pokeData/herdier
@@ -1,15 +1,27 @@
+herdier	A normal type Pokémon
 
-Name:  Herdier
-Pokedex Number:  507
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Intimidate - Sand Rush - Scrappy (Hidden Ability)
+트레이너를 도와주면서
+다른 포켓몬을 돌보기도 하는
+매우 충실한 포켓몬.
 
-Base Stats
-----------------------
-Total: 370
-Hp:  65
-Attack:  80
-Defence:  65
-Special Attack:  35
-Special Defence:  65
-Speed:  60
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         80
+        defense:         65
+ special-attack:         35
+special-defense:         65
+          speed:         60
+
+Pokedex ID: 507	Capture Rate: 120
+Base Exp: 130	Happiness: 50
+Height: 9	Weight: 147
+
+Genus: Loyal Dog Pokémon
+Location Areas:
+cold-storage-area
+p2-laboratory-area
+unova-route-1-area
+unova-route-2-area
+unova-route-3-area
+unova-route-10-area
+unova-route-10-victory-road-gate
diff --git a/pokeData/hippopotas b/pokeData/hippopotas
index 74e2e17..647d9d2 100644
--- a/pokeData/hippopotas
+++ b/pokeData/hippopotas
@@ -1,15 +1,24 @@
+hippopotas	A ground type Pokémon
 
-Name:  Hippopotas
-Pokedex Number:  449
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Sand Stream - Sand Force (Hidden Ability)
+Il peut obturer ses narines et
+traverser le sable comme un ver.
+Il vit en colonies de 10 individus.
 
-Base Stats
-----------------------
-Total: 330
-Hp:  68
-Attack:  72
-Defence:  78
-Special Attack:  38
-Special Defence:  42
-Speed:  32
+   ↞--------| STATS |--------↠ 
+             hp:         68
+         attack:         72
+        defense:         78
+ special-attack:         38
+special-defense:         42
+          speed:         32
+
+Pokedex ID: 449	Capture Rate: 140
+Base Exp: 66	Happiness: 50
+Height: 8	Weight: 495
+
+Genus: Hippo Pokémon
+Location Areas:
+ruin-maniac-cave-0-9-different-unown-caught
+ruin-maniac-cave-10-25-different-unown-caught
+maniac-tunnel-26-plus-different-unown-caught
+kalos-route-9-area
diff --git a/pokeData/hippowdon b/pokeData/hippowdon
index 06252fe..3dff09e 100644
--- a/pokeData/hippowdon
+++ b/pokeData/hippowdon
@@ -1,15 +1,21 @@
+hippowdon	A ground type Pokémon
 
-Name:  Hippowdon
-Pokedex Number:  450
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Sand Stream - Sand Force (Hidden Ability)
+Facilement irritable, il ouvre ses
+mâchoires au maximum pour intimider
+ses adversaires.
 
-Base Stats
-----------------------
-Total: 525
-Hp:  108
-Attack:  112
-Defence:  118
-Special Attack:  68
-Special Defence:  72
-Speed:  47
+   ↞--------| STATS |--------↠ 
+             hp:        108
+         attack:        112
+        defense:        118
+ special-attack:         68
+special-defense:         72
+          speed:         47
+
+Pokedex ID: 450	Capture Rate: 60
+Base Exp: 184	Happiness: 50
+Height: 20	Weight: 3000
+
+Genus: Heavyweight Pokémon
+Location Areas:
+sinnoh-route-228-area
diff --git a/pokeData/hitmonchan b/pokeData/hitmonchan
index 7bb1bf7..4402dc5 100644
--- a/pokeData/hitmonchan
+++ b/pokeData/hitmonchan
@@ -1,15 +1,23 @@
+hitmonchan	A fighting type Pokémon
 
-Name:  Hitmonchan
-Pokedex Number:  107
-Gender Ratio:   ♂:100% ♀:0%
-Abilities: Keen Eye - Iron Fist - Inner Focus (Hidden Ability)
+HITMONCHAN is said to possess the
+spirit of a boxer who had been working
+towards a world championship.This POKéMON has an indomitable spirit
+and will never give up in the face of
+adversity.
 
-Base Stats
-----------------------
-Total: 455
-Hp:  50
-Attack:  105
-Defence:  79
-Special Attack:  35
-Special Defence:  110
-Speed:  76
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:        105
+        defense:         79
+ special-attack:         35
+special-defense:        110
+          speed:         76
+
+Pokedex ID: 107	Capture Rate: 45
+Base Exp: 159	Happiness: 50
+Height: 14	Weight: 502
+
+Genus: Punching Pokémon
+Location Areas:
+saffron-city-fighting-dojo
diff --git a/pokeData/hitmonlee b/pokeData/hitmonlee
index b63d40e..51890cb 100644
--- a/pokeData/hitmonlee
+++ b/pokeData/hitmonlee
@@ -1,15 +1,23 @@
+hitmonlee	A fighting type Pokémon
 
-Name:  Hitmonlee
-Pokedex Number:  106
-Gender Ratio:   ♂:100% ♀:0%
-Abilities: Limber - Reckless - Unburden (Hidden Ability)
+HITMONLEE’s legs freely contract and
+stretch. Using these springlike legs, it
+bowls over foes with devastating kicks.After battle, it rubs down its legs and
+loosens the muscles to overcome
+fatigue.
 
-Base Stats
-----------------------
-Total: 455
-Hp:  50
-Attack:  120
-Defence:  53
-Special Attack:  35
-Special Defence:  110
-Speed:  87
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:        120
+        defense:         53
+ special-attack:         35
+special-defense:        110
+          speed:         87
+
+Pokedex ID: 106	Capture Rate: 45
+Base Exp: 159	Happiness: 50
+Height: 15	Weight: 498
+
+Genus: Kicking Pokémon
+Location Areas:
+saffron-city-fighting-dojo
diff --git a/pokeData/hitmontop b/pokeData/hitmontop
index 313c6f9..e4ae0d4 100644
--- a/pokeData/hitmontop
+++ b/pokeData/hitmontop
@@ -1,15 +1,21 @@
+hitmontop	A fighting type Pokémon
 
-Name:  Hitmontop
-Pokedex Number:  237
-Gender Ratio:   ♂:100% ♀:0%
-Abilities: Intimidate - Technician - Steadfast (Hidden Ability)
+If you become enchanted by its smooth,
+elegant, dance-like kicks, you may get
+drilled hard.
+
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         95
+        defense:         95
+ special-attack:         35
+special-defense:        110
+          speed:         70
+
+Pokedex ID: 237	Capture Rate: 45
+Base Exp: 159	Happiness: 50
+Height: 14	Weight: 480
+
+Genus: Handstand Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 455
-Hp:  50
-Attack:  95
-Defence:  95
-Special Attack:  35
-Special Defence:  110
-Speed:  70
diff --git a/pokeData/ho-oh b/pokeData/ho-oh
index 069cf6d..982eb8b 100644
--- a/pokeData/ho-oh
+++ b/pokeData/ho-oh
@@ -1 +1,22 @@
-	Stats currently unavailable :( 
+ho-oh	A fire type Pokémon
+
+Legends claim this POKéMON flies the
+world’s skies continuously on its
+magnificent seven-colored wings.
+
+   ↞--------| STATS |--------↠ 
+             hp:        106
+         attack:        130
+        defense:         90
+ special-attack:        110
+special-defense:        154
+          speed:         90
+
+Pokedex ID: 250	Capture Rate: 3
+Base Exp: 340	Happiness: 0
+Height: 38	Weight: 1990
+
+Genus: Rainbow Pokémon
+Location Areas:
+bell-tower-roof
+navel-rock-area
diff --git a/pokeData/honchkrow b/pokeData/honchkrow
index ef4a6af..a5fe877 100644
--- a/pokeData/honchkrow
+++ b/pokeData/honchkrow
@@ -1,15 +1,21 @@
+honchkrow	A dark type Pokémon
 
-Name:  Honchkrow
-Pokedex Number:  430
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Insomnia - Super Luck - Moxie (Hidden Ability)
+Son cri profond peut invoquer une
+meute de Cornèbre. On l’appelle
+“le crieur de mauvais augure”.
 
-Base Stats
-----------------------
-Total: 505
-Hp:  100
-Attack:  125
-Defence:  52
-Special Attack:  105
-Special Defence:  52
-Speed:  71
+   ↞--------| STATS |--------↠ 
+             hp:        100
+         attack:        125
+        defense:         52
+ special-attack:        105
+special-defense:         52
+          speed:         71
+
+Pokedex ID: 430	Capture Rate: 30
+Base Exp: 177	Happiness: 35
+Height: 9	Weight: 273
+
+Genus: Big Boss Pokémon
+Location Areas:
+abundant-shrine-area
diff --git a/pokeData/honedge b/pokeData/honedge
index bec4510..451e1c0 100644
--- a/pokeData/honedge
+++ b/pokeData/honedge
@@ -1,15 +1,21 @@
+honedge	A steel type Pokémon
 
-Name:  Honedge
-Pokedex Number:  679
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: No Guard
+死者の　魂が　古代の　剣に
+宿って　生まれたらしい。
+人に　とりつき　命を　吸う。
 
-Base Stats
-----------------------
-Total: 325
-Hp:  45
-Attack:  80
-Defence:  100
-Special Attack:  35
-Special Defence:  37
-Speed:  28
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         80
+        defense:        100
+ special-attack:         35
+special-defense:         37
+          speed:         28
+
+Pokedex ID: 679	Capture Rate: 180
+Base Exp: 65	Happiness: 50
+Height: 8	Weight: 20
+
+Genus: Sword Pokémon
+Location Areas:
+kalos-route-6-area
diff --git a/pokeData/hoopa b/pokeData/hoopa
index a3826ad..7b02d05 100644
--- a/pokeData/hoopa
+++ b/pokeData/hoopa
@@ -1,15 +1,21 @@
+hoopa	A psychic type Pokémon
 
-Name:  Hoopa
-Pokedex Number:  720
-Gender Ratio:  
-Abilities: Magician
+空間を　ゆがめる　リングで
+あらゆる　ものを　離れた　場所へ
+飛ばしてしまう　トラブルメーカー。
+
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:        110
+        defense:         60
+ special-attack:        150
+special-defense:        130
+          speed:         70
+
+Pokedex ID: 720	Capture Rate: 3
+Base Exp: 270	Happiness: 100
+Height: 5	Weight: 90
+
+Genus: Mischief Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 600
-Hp:  80
-Attack:  160
-Defence:  60
-Special Attack:  170
-Special Defence:  130
-Speed:  80
diff --git a/pokeData/hoothoot b/pokeData/hoothoot
index 1ef49c8..05f46a8 100644
--- a/pokeData/hoothoot
+++ b/pokeData/hoothoot
@@ -1,15 +1,55 @@
+hoothoot	A normal type Pokémon
 
-Name:  Hoothoot
-Pokedex Number:  163
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Insomnia - Keen Eye - Tinted Lens (Hidden Ability)
+It always stands on one foot. It changes
+feet so fast, the movement can rarely be
+seen.
 
-Base Stats
-----------------------
-Total: 262
-Hp:  60
-Attack:  30
-Defence:  30
-Special Attack:  36
-Special Defence:  56
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         30
+        defense:         30
+ special-attack:         36
+special-defense:         56
+          speed:         50
+
+Pokedex ID: 163	Capture Rate: 255
+Base Exp: 52	Happiness: 50
+Height: 7	Weight: 212
+
+Genus: Owl Pokémon
+Location Areas:
+eterna-forest-area
+great-marsh-area-1
+great-marsh-area-2
+great-marsh-area-3
+great-marsh-area-4
+great-marsh-area-5
+great-marsh-area-6
+sinnoh-route-205-east-towards-eterna-city
+sinnoh-route-210-south-towards-solaceon-town
+sinnoh-route-210-west-towards-celestic-town
+sinnoh-route-211-west-towards-eterna-city
+johto-route-29-area
+johto-route-30-area
+johto-route-31-area
+johto-route-32-area
+ilex-forest-area
+johto-route-34-area
+johto-route-35-area
+national-park-area
+johto-route-36-area
+johto-route-37-area
+johto-route-38-area
+johto-route-39-area
+johto-route-43-area
+lake-of-rage-area
+kanto-route-26-area
+kanto-route-27-area
+kanto-route-1-area
+kanto-route-2-south-towards-viridian-city
+kanto-route-5-area
+kanto-route-25-area
+kanto-route-2-north-towards-pewter-city
+viridian-forest-area
+hoenn-safari-zone-expansion-south
+hoenn-safari-zone-expansion-north
diff --git a/pokeData/hoppip b/pokeData/hoppip
index 004241c..b144ecf 100644
--- a/pokeData/hoppip
+++ b/pokeData/hoppip
@@ -1,15 +1,39 @@
+hoppip	A grass type Pokémon
 
-Name:  Hoppip
-Pokedex Number:  187
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Chlorophyll - Leaf Guard - Infiltrator (Hidden Ability)
+To keep from being blown away by the
+wind, they gather in clusters. They do
+enjoy gentle breezes, though.
 
-Base Stats
-----------------------
-Total: 250
-Hp:  35
-Attack:  35
-Defence:  40
-Special Attack:  35
-Special Defence:  55
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:         35
+         attack:         35
+        defense:         40
+ special-attack:         35
+special-defense:         55
+          speed:         50
+
+Pokedex ID: 187	Capture Rate: 255
+Base Exp: 50	Happiness: 70
+Height: 4	Weight: 5
+
+Genus: Cottonweed Pokémon
+Location Areas:
+fuego-ironworks-area
+sinnoh-route-205-south-towards-floaroma-town
+sinnoh-route-205-east-towards-eterna-city
+johto-route-29-area
+johto-route-30-area
+johto-route-31-area
+johto-route-32-area
+johto-route-33-area
+johto-route-48-area
+kanto-route-11-area
+kanto-route-13-area
+kanto-route-14-area
+kanto-route-15-area
+resort-gorgeous-area
+water-labyrinth-area
+five-isle-meadow-area
+memorial-pillar-area
+five-island-area
+johto-safari-zone-zone-meadow
diff --git a/pokeData/horsea b/pokeData/horsea
index 393f143..c28ea2b 100644
--- a/pokeData/horsea
+++ b/pokeData/horsea
@@ -1,15 +1,67 @@
+horsea	A water type Pokémon
 
-Name:  Horsea
-Pokedex Number:  116
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Swift Swim - Sniper - Damp (Hidden Ability)
+If HORSEA senses danger, it will
+reflexively spray a dense black ink
+from its mouth and try to escape.This POKéMON swims by cleverly flapping
+the fins on its back.
 
-Base Stats
-----------------------
-Total: 295
-Hp:  30
-Attack:  40
-Defence:  70
-Special Attack:  70
-Special Defence:  25
-Speed:  60
+   ↞--------| STATS |--------↠ 
+             hp:         30
+         attack:         40
+        defense:         70
+ special-attack:         70
+special-defense:         25
+          speed:         60
+
+Pokedex ID: 116	Capture Rate: 225
+Base Exp: 59	Happiness: 50
+Height: 4	Weight: 80
+
+Genus: Dragon Pokémon
+Location Areas:
+sinnoh-sea-route-226-area
+whirl-islands-1f
+whirl-islands-b2f
+whirl-islands-b3f
+seafoam-islands-1f
+seafoam-islands-b1f
+seafoam-islands-b2f
+seafoam-islands-b3f
+seafoam-islands-b4f
+kanto-route-12-area
+kanto-sea-route-19-area
+kanto-sea-route-20-area
+cinnabar-island-area
+cerulean-city-area
+vermilion-city-area
+pallet-town-area
+kanto-route-4-area
+kanto-route-10-area
+kanto-route-11-area
+kanto-route-13-area
+kanto-sea-route-21-area
+kanto-route-24-area
+hoenn-route-132-area
+hoenn-route-133-area
+hoenn-route-134-area
+ss-anne-area
+icefall-cave-waterfall
+kindle-road-area
+treasure-beach-area
+bond-bridge-area
+resort-gorgeous-area
+water-labyrinth-area
+five-isle-meadow-area
+memorial-pillar-area
+outcast-island-area
+green-path-area
+water-path-area
+trainer-tower-area
+tanoby-ruins-area
+one-island-area
+five-island-area
+p2-laboratory-area
+unova-route-18-area
+unova-route-17-area
+ambrette-town-area
+cyllage-city-area
diff --git a/pokeData/houndoom b/pokeData/houndoom
index 4a0984b..112214a 100644
--- a/pokeData/houndoom
+++ b/pokeData/houndoom
@@ -1,15 +1,22 @@
+houndoom	A dark type Pokémon
 
-Name:  Houndoom
-Pokedex Number:  229
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Early Bird - Flash Fire - Unnerve (Hidden Ability)
+If you are burned by the flames it shoots
+from its mouth, the pain will never go
+away.
 
-Base Stats
-----------------------
-Total: 500
-Hp:  75
-Attack:  90
-Defence:  90
-Special Attack:  140
-Special Defence:  90
-Speed:  115
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:         90
+        defense:         50
+ special-attack:        110
+special-defense:         80
+          speed:         95
+
+Pokedex ID: 229	Capture Rate: 45
+Base Exp: 175	Happiness: 35
+Height: 14	Weight: 350
+
+Genus: Dark Pokémon
+Location Areas:
+sinnoh-route-214-area
+sinnoh-route-215-area
diff --git a/pokeData/houndour b/pokeData/houndour
index d769750..5f04852 100644
--- a/pokeData/houndour
+++ b/pokeData/houndour
@@ -1,15 +1,27 @@
+houndour	A dark type Pokémon
 
-Name:  Houndour
-Pokedex Number:  228
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Early Bird - Flash Fire - Unnerve (Hidden Ability)
+It uses different kinds of cries for
+communicating with others of its kind and
+for pursuing prey.
 
-Base Stats
-----------------------
-Total: 330
-Hp:  45
-Attack:  60
-Defence:  30
-Special Attack:  80
-Special Defence:  50
-Speed:  65
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         60
+        defense:         30
+ special-attack:         80
+special-defense:         50
+          speed:         65
+
+Pokedex ID: 228	Capture Rate: 120
+Base Exp: 66	Happiness: 35
+Height: 6	Weight: 108
+
+Genus: Dark Pokémon
+Location Areas:
+valor-lakefront-area
+sinnoh-route-214-area
+kanto-route-7-area
+hoenn-safari-zone-expansion-north
+hoenn-altering-cave-d
+kanto-altering-cave-d
+kalos-route-10-area
diff --git a/pokeData/huntail b/pokeData/huntail
index e4ba584..c2a15c3 100644
--- a/pokeData/huntail
+++ b/pokeData/huntail
@@ -1,15 +1,22 @@
+huntail	A water type Pokémon
 
-Name:  Huntail
-Pokedex Number:  367
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Swift Swim - Water Veil (Hidden Ability)
+It lives deep in the sea. With a
+tail shaped like a small fish, it
+attracts unsuspecting prey.
 
-Base Stats
-----------------------
-Total: 485
-Hp:  55
-Attack:  104
-Defence:  105
-Special Attack:  94
-Special Defence:  75
-Speed:  52
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:        104
+        defense:        105
+ special-attack:         94
+special-defense:         75
+          speed:         52
+
+Pokedex ID: 367	Capture Rate: 60
+Base Exp: 170	Happiness: 70
+Height: 17	Weight: 270
+
+Genus: Deep Sea Pokémon
+Location Areas:
+unova-route-4-area
+kalos-route-12-area
diff --git a/pokeData/hydreigon b/pokeData/hydreigon
index 82879de..df5f471 100644
--- a/pokeData/hydreigon
+++ b/pokeData/hydreigon
@@ -1,15 +1,21 @@
+hydreigon	A dark type Pokémon
 
-Name:  Hydreigon
-Pokedex Number:  635
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Levitate
+양팔에 있는 머리에는 뇌가
+없다. 3개의 머리로 모든 것을
+먹어치워 파괴해 버린다.
+
+   ↞--------| STATS |--------↠ 
+             hp:         92
+         attack:        105
+        defense:         90
+ special-attack:        125
+special-defense:         90
+          speed:         98
+
+Pokedex ID: 635	Capture Rate: 45
+Base Exp: 300	Happiness: 35
+Height: 18	Weight: 1600
+
+Genus: Brutal Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 600
-Hp:  92
-Attack:  105
-Defence:  90
-Special Attack:  125
-Special Defence:  90
-Speed:  98
diff --git a/pokeData/hypno b/pokeData/hypno
index 88fe1b4..80775dc 100644
--- a/pokeData/hypno
+++ b/pokeData/hypno
@@ -1,15 +1,26 @@
+hypno	A psychic type Pokémon
 
-Name:  Hypno
-Pokedex Number:  097
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Insomnia - Forewarn - Inner Focus (Hidden Ability)
+HYPNO holds a pendulum in its hand.
+The arcing movement and glitter of the
+pendulum lull the foe into a deep stateof hypnosis.
+While this POKéMON searches for prey,
+it polishes the pendulum.
 
-Base Stats
-----------------------
-Total: 483
-Hp:  85
-Attack:  73
-Defence:  70
-Special Attack:  73
-Special Defence:  115
-Speed:  67
+   ↞--------| STATS |--------↠ 
+             hp:         85
+         attack:         73
+        defense:         70
+ special-attack:         73
+special-defense:        115
+          speed:         67
+
+Pokedex ID: 97	Capture Rate: 75
+Base Exp: 169	Happiness: 70
+Height: 16	Weight: 756
+
+Genus: Hypnosis Pokémon
+Location Areas:
+kanto-route-11-area
+cerulean-cave-1f
+berry-forest-area
+johto-safari-zone-zone-swamp
diff --git a/pokeData/igglybuff b/pokeData/igglybuff
index c4bcd2b..2b05e06 100644
--- a/pokeData/igglybuff
+++ b/pokeData/igglybuff
@@ -1,15 +1,21 @@
+igglybuff	A normal type Pokémon
 
-Name:  Igglybuff
-Pokedex Number:  174
-Gender Ratio:   ♂:25% ♀:75% 
-Abilities: Cute Charm - Competitive - Friend Guard (Hidden Ability)
+It has a very soft body. If it starts to
+roll, it will bounce all over and be
+impossible to stop.
 
-Base Stats
-----------------------
-Total: 210
-Hp:  90
-Attack:  30
-Defence:  15
-Special Attack:  40
-Special Defence:  20
-Speed:  15
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:         30
+        defense:         15
+ special-attack:         40
+special-defense:         20
+          speed:         15
+
+Pokedex ID: 174	Capture Rate: 170
+Base Exp: 42	Happiness: 50
+Height: 3	Weight: 10
+
+Genus: Balloon Pokémon
+Location Areas:
+johto-route-34-area
diff --git a/pokeData/illumise b/pokeData/illumise
index 1688618..958dad4 100644
--- a/pokeData/illumise
+++ b/pokeData/illumise
@@ -1,15 +1,23 @@
+illumise	A bug type Pokémon
 
-Name:  Illumise
-Pokedex Number:  314
-Gender Ratio:   ♂:0% ♀:100%
-Abilities: Oblivious - Tinted Lens - Prankster (Hidden Ability)
+With its sweet aroma, it guides
+VOLBEAT to draw signs with light in
+the night sky.
 
-Base Stats
-----------------------
-Total: 400
-Hp:  65
-Attack:  47
-Defence:  55
-Special Attack:  73
-Special Defence:  75
-Speed:  85
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         47
+        defense:         75
+ special-attack:         73
+special-defense:         85
+          speed:         85
+
+Pokedex ID: 314	Capture Rate: 150
+Base Exp: 151	Happiness: 70
+Height: 6	Weight: 177
+
+Genus: Firefly Pokémon
+Location Areas:
+sinnoh-route-229-area
+hoenn-route-117-area
+kalos-route-7-area
diff --git a/pokeData/impidimp b/pokeData/impidimp
index a9782e5..c1d1d43 100644
--- a/pokeData/impidimp
+++ b/pokeData/impidimp
@@ -1,15 +1,21 @@
+impidimp	A dark type Pokémon
 
-Name:  Impidimp
-Pokedex Number:  859
-Gender Ratio:   ♂:100% ♀:0% 
-Abilities: Prankster - Frisk - Pickpocket (Hidden Ability)
+Through its nose, it sucks in the emanations
+produced by people and Pokémon when they
+feel annoyed. It thrives off this negative energy.
+
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         45
+        defense:         30
+ special-attack:         55
+special-defense:         40
+          speed:         50
+
+Pokedex ID: 859	Capture Rate: 255
+Base Exp: 53	Happiness: 50
+Height: 4	Weight: 55
+
+Genus: Wily Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 265
-Hp:  45
-Attack:  45
-Defence:  30
-Special Attack:  55
-Special Defence:  40
-Speed:  50
diff --git a/pokeData/incineroar b/pokeData/incineroar
index 9e2959c..f55b67b 100644
--- a/pokeData/incineroar
+++ b/pokeData/incineroar
@@ -1,15 +1,21 @@
+incineroar	A fire type Pokémon
 
-Name:  Incineroar
-Pokedex Number:  727
-Gender Ratio:   ♂:88.14% ♀:11.86% 
-Abilities: Blaze - Intimidate (Hidden Ability)
+Posee un carácter rudo y egoísta. Si un
+Entrenador no le cae en gracia, ignora sus
+órdenes con total impasibilidad.
+
+   ↞--------| STATS |--------↠ 
+             hp:         95
+         attack:        115
+        defense:         90
+ special-attack:         80
+special-defense:         90
+          speed:         60
+
+Pokedex ID: 727	Capture Rate: 45
+Base Exp: 265	Happiness: 50
+Height: 18	Weight: 830
+
+Genus: Heel Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 530
-Hp:  95
-Attack:  115
-Defence:  90
-Special Attack:  80
-Special Defence:  90
-Speed:  60
diff --git a/pokeData/indeedee b/pokeData/indeedee
index b11e99e..4ce9480 100644
--- a/pokeData/indeedee
+++ b/pokeData/indeedee
@@ -1,15 +1,15 @@
+	A  type Pokémon
 
-Name:  Indeedee
-Pokedex Number:  876
-Gender Ratio:   ♂:100% ♀:0% 
-Abilities: Inner Focus - Synchronize - Psychic Surge (Hidden) (Male) - Own Tempo- Synchronize - Psychic Surge (Hidden)  (Female
+It uses the horns on its head to sense the
+emotions of others. Males will act as valets for
+those they serve, looking after their every need.
+
+   ↞--------| STATS |--------↠ 
+
+Pokedex ID: 	Capture Rate: 30
+Base Exp: 	Happiness: 140
+Height: 	Weight: 
+
+Genus: Emotion Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 475
-Hp:  70
-Attack:  55
-Defence:  65
-Special Attack:  95
-Special Defence:  105
-Speed:  85
diff --git a/pokeData/infernape b/pokeData/infernape
index 3e2090a..f61f41c 100644
--- a/pokeData/infernape
+++ b/pokeData/infernape
@@ -1,15 +1,21 @@
+infernape	A fire type Pokémon
 
-Name:  Infernape
-Pokedex Number:  392
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Blaze - Iron Fist (Hidden Ability)
+Ses techniques de combat inédites
+à base de pieds et poings enflammés
+sont redoutables.
+
+   ↞--------| STATS |--------↠ 
+             hp:         76
+         attack:        104
+        defense:         71
+ special-attack:        104
+special-defense:         71
+          speed:        108
+
+Pokedex ID: 392	Capture Rate: 45
+Base Exp: 240	Happiness: 70
+Height: 12	Weight: 550
+
+Genus: Flame Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 534
-Hp:  76
-Attack:  104
-Defence:  71
-Special Attack:  104
-Special Defence:  71
-Speed:  108
diff --git a/pokeData/inkay b/pokeData/inkay
index 4771a09..2b41d4c 100644
--- a/pokeData/inkay
+++ b/pokeData/inkay
@@ -1,15 +1,22 @@
+inkay	A dark type Pokémon
 
-Name:  Inkay
-Pokedex Number:  686
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Contrary - Suction Cups - Infiltrator (Hidden Ability)
+発光体の　点滅を　見つめた　相手は
+目が　くらみ　戦う　気持ちが
+なくなってしまうのだ。
 
-Base Stats
-----------------------
-Total: 288
-Hp:  53
-Attack:  54
-Defence:  53
-Special Attack:  37
-Special Defence:  46
-Speed:  45
+   ↞--------| STATS |--------↠ 
+             hp:         53
+         attack:         54
+        defense:         53
+ special-attack:         37
+special-defense:         46
+          speed:         45
+
+Pokedex ID: 686	Capture Rate: 190
+Base Exp: 58	Happiness: 50
+Height: 4	Weight: 35
+
+Genus: Revolving Pokémon
+Location Areas:
+kalos-route-8-area
+azure-bay-area
diff --git a/pokeData/inteleon b/pokeData/inteleon
index 34dc84c..d950c1e 100644
--- a/pokeData/inteleon
+++ b/pokeData/inteleon
@@ -1,15 +1,21 @@
+inteleon	A water type Pokémon
 
-Name:  Inteleon
-Pokedex Number:  818
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Torrent - Sniper (Hidden Ability)
+It has many hidden capabilities, such as fingertips
+that can shoot water and a membrane on its back
+that it can use to glide through the air.
+
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         85
+        defense:         65
+ special-attack:        125
+special-defense:         65
+          speed:        120
+
+Pokedex ID: 818	Capture Rate: 45
+Base Exp: 265	Happiness: 50
+Height: 19	Weight: 452
+
+Genus: Secret Agent Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 530
-Hp:  70
-Attack:  85
-Defence:  65
-Special Attack:  125
-Special Defence:  65
-Speed:  120
diff --git a/pokeData/ivysaur b/pokeData/ivysaur
index 59bf909..a54c8a5 100644
--- a/pokeData/ivysaur
+++ b/pokeData/ivysaur
@@ -1,15 +1,23 @@
+ivysaur	A grass type Pokémon
 
-Name:  Ivysaur
-Pokedex Number:  002
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Overgrow - Chlorophyll (Hidden Ability)
+There is a bud on this POKéMON’s back.
+To support its weight, IVYSAUR’s legs
+and trunk grow thick and strong.If it starts spending more time lying
+in the sunlight, it’s a sign that the
+bud will bloom into a large flower soon.
+
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         62
+        defense:         63
+ special-attack:         80
+special-defense:         80
+          speed:         60
+
+Pokedex ID: 2	Capture Rate: 45
+Base Exp: 142	Happiness: 50
+Height: 10	Weight: 130
+
+Genus: Seed Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 405
-Hp:  60
-Attack:  62
-Defence:  63
-Special Attack:  80
-Special Defence:  80
-Speed:  60
diff --git a/pokeData/jangmo-o b/pokeData/jangmo-o
index befedc4..d45603b 100644
--- a/pokeData/jangmo-o
+++ b/pokeData/jangmo-o
@@ -1 +1,21 @@
-You didn't enter a valid pokemon!
+jangmo-o	A dragon type Pokémon
+
+It expresses its feelings by smacking
+its scales. Metallic sounds echo through
+the tall mountains where Jangmo-o lives.
+
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         55
+        defense:         65
+ special-attack:         45
+special-defense:         45
+          speed:         45
+
+Pokedex ID: 782	Capture Rate: 45
+Base Exp: 60	Happiness: 50
+Height: 6	Weight: 297
+
+Genus: Scaly Pokémon
+Location Areas:
+
diff --git a/pokeData/jellicent b/pokeData/jellicent
index c34df40..7edbe09 100644
--- a/pokeData/jellicent
+++ b/pokeData/jellicent
@@ -1,15 +1,33 @@
+jellicent	A water type Pokémon
 
-Name:  Jellicent
-Pokedex Number:  593
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Water Absorb - Cursed Body - Damp (Hidden Ability)
+몸 대부분이 해수다.
+해저에는 탱탱겔이 가라앉힌
+배로 만들어진 성이 있다고 한다.
 
-Base Stats
-----------------------
-Total: 480
-Hp:  100
-Attack:  60
-Defence:  70
-Special Attack:  85
-Special Defence:  105
-Speed:  60
+   ↞--------| STATS |--------↠ 
+             hp:        100
+         attack:         60
+        defense:         70
+ special-attack:         85
+special-defense:        105
+          speed:         60
+
+Pokedex ID: 593	Capture Rate: 60
+Base Exp: 168	Happiness: 50
+Height: 22	Weight: 1350
+
+Genus: Floating Pokémon
+Location Areas:
+driftveil-city-area
+p2-laboratory-area
+undella-bay-area
+unova-route-4-area
+unova-route-13-area
+unova-route-18-area
+undella-town-area
+unova-route-17-area
+virbank-city-area
+humilau-city-area
+virbank-complex-outer
+seaside-cave-1f
+unova-route-21-area
diff --git a/pokeData/jigglypuff b/pokeData/jigglypuff
index 6a4f55a..ec64605 100644
--- a/pokeData/jigglypuff
+++ b/pokeData/jigglypuff
@@ -1,15 +1,40 @@
+jigglypuff	A normal type Pokémon
 
-Name:  Jigglypuff
-Pokedex Number:  039
-Gender Ratio:   ♂:25% ♀:75% 
-Abilities: Cute Charm - Competitive - Friend Guard (Hidden Ability)
+When this POKéMON sings, it never
+pauses to breathe. If it is in a battle
+against an opponent that does noteasily fall asleep, JIGGLYPUFF cannot
+breathe, endangering its life.
 
-Base Stats
-----------------------
-Total: 270
-Hp:  115
-Attack:  45
-Defence:  20
-Special Attack:  45
-Special Defence:  25
-Speed:  20
+   ↞--------| STATS |--------↠ 
+             hp:        115
+         attack:         45
+        defense:         20
+ special-attack:         45
+special-defense:         25
+          speed:         20
+
+Pokedex ID: 39	Capture Rate: 170
+Base Exp: 95	Happiness: 50
+Height: 5	Weight: 55
+
+Genus: Balloon Pokémon
+Location Areas:
+johto-route-34-area
+johto-route-35-area
+johto-route-46-area
+kanto-route-3-area
+kanto-route-4-area
+kanto-route-5-area
+kanto-route-6-area
+kanto-route-7-area
+kanto-route-8-area
+hoenn-route-115-area
+dreamyard-area
+dreamyard-b1f
+unova-route-1-area
+unova-route-2-area
+unova-route-14-area
+kalos-route-20-area
+pokemon-village-area
+johto-safari-zone-zone-meadow
+johto-safari-zone-zone-swamp
diff --git a/pokeData/jirachi b/pokeData/jirachi
index d1d240a..105107d 100644
--- a/pokeData/jirachi
+++ b/pokeData/jirachi
@@ -1,15 +1,21 @@
+jirachi	A steel type Pokémon
 
-Name:  Jirachi
-Pokedex Number:  385
-Gender Ratio:  Genderless
-Abilities: Serene Grace
+It is said to have the ability to
+grant any wish for just one week
+every thousand years.
+
+   ↞--------| STATS |--------↠ 
+             hp:        100
+         attack:        100
+        defense:        100
+ special-attack:        100
+special-defense:        100
+          speed:        100
+
+Pokedex ID: 385	Capture Rate: 3
+Base Exp: 300	Happiness: 100
+Height: 3	Weight: 11
+
+Genus: Wish Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 600
-Hp:  100
-Attack:  100
-Defence:  100
-Special Attack:  100
-Special Defence:  100
-Speed:  100
diff --git a/pokeData/jolteon b/pokeData/jolteon
index 57b28a8..23fd089 100644
--- a/pokeData/jolteon
+++ b/pokeData/jolteon
@@ -1,15 +1,23 @@
+jolteon	A electric type Pokémon
 
-Name:  Jolteon
-Pokedex Number:  135
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Volt Absorb - Quick Feet (Hidden Ability)
+JOLTEON’s cells generate a low level of
+electricity. This power is amplified by
+the static electricity of its fur,enabling the POKéMON to drop
+thunderbolts. The bristling fur is made
+of electrically charged needles.
+
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         65
+        defense:         60
+ special-attack:        110
+special-defense:         95
+          speed:        130
+
+Pokedex ID: 135	Capture Rate: 45
+Base Exp: 184	Happiness: 50
+Height: 8	Weight: 245
+
+Genus: Lightning Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 525
-Hp:  65
-Attack:  65
-Defence:  60
-Special Attack:  110
-Special Defence:  95
-Speed:  130
diff --git a/pokeData/joltik b/pokeData/joltik
index 735fd22..55207d6 100644
--- a/pokeData/joltik
+++ b/pokeData/joltik
@@ -1,15 +1,23 @@
+joltik	A bug type Pokémon
 
-Name:  Joltik
-Pokedex Number:  595
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Compoundeyes - Unnerve - Swarm (Hidden Ability)
+스스로 전기를 만들 수 없어
+다른 큰 포켓몬에
+달라붙어 정전기를 흡수한다.
 
-Base Stats
-----------------------
-Total: 319
-Hp:  50
-Attack:  47
-Defence:  50
-Special Attack:  57
-Special Defence:  50
-Speed:  65
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         47
+        defense:         50
+ special-attack:         57
+special-defense:         50
+          speed:         65
+
+Pokedex ID: 595	Capture Rate: 190
+Base Exp: 64	Happiness: 50
+Height: 1	Weight: 6
+
+Genus: Attaching Pokémon
+Location Areas:
+chargestone-cave-1f
+chargestone-cave-b1f
+chargestone-cave-b2f
diff --git a/pokeData/jumpluff b/pokeData/jumpluff
index 07a3dfd..ead7e5a 100644
--- a/pokeData/jumpluff
+++ b/pokeData/jumpluff
@@ -1,15 +1,21 @@
+jumpluff	A grass type Pokémon
 
-Name:  Jumpluff
-Pokedex Number:  189
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Chlorophyll - Leaf Guard - Infiltrator (Hidden Ability)
+Once it catches the wind, it deftly
+controls its cotton-puff spores to float,
+even around the world.
+
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:         55
+        defense:         70
+ special-attack:         55
+special-defense:         95
+          speed:        110
+
+Pokedex ID: 189	Capture Rate: 45
+Base Exp: 207	Happiness: 70
+Height: 8	Weight: 30
+
+Genus: Cottonweed Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 460
-Hp:  75
-Attack:  55
-Defence:  70
-Special Attack:  55
-Special Defence:  95
-Speed:  110
diff --git a/pokeData/jynx b/pokeData/jynx
index acf20b2..d574549 100644
--- a/pokeData/jynx
+++ b/pokeData/jynx
@@ -1,15 +1,38 @@
+jynx	A ice type Pokémon
 
-Name:  Jynx
-Pokedex Number:  124
-Gender Ratio:   ♂:0% ♀:100% 
-Abilities: Oblivious - Forewarn - Dry Skin (Hidden Ability)
+JYNX walks rhythmically, swaying and
+shaking its hips as if it were dancing.
+Its motions are so bouncingly alluring,people seeing it are compelled to shake
+their hips without giving any thought
+to what they are doing.
 
-Base Stats
-----------------------
-Total: 455
-Hp:  65
-Attack:  50
-Defence:  35
-Special Attack:  115
-Special Defence:  95
-Speed:  95
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         50
+        defense:         35
+ special-attack:        115
+special-defense:         95
+          speed:         95
+
+Pokedex ID: 124	Capture Rate: 45
+Base Exp: 159	Happiness: 50
+Height: 14	Weight: 406
+
+Genus: Human Shape Pokémon
+Location Areas:
+snowpoint-temple-b1f
+snowpoint-temple-b2f
+snowpoint-temple-b3f
+snowpoint-temple-b4f
+snowpoint-temple-b5f
+ice-path-1f
+ice-path-b1f
+ice-path-b2f
+ice-path-b3f
+seafoam-islands-b4f
+giant-chasm-area
+giant-chasm-forest-cave
+frost-cavern-unknown-area-314
+frost-cavern-unknown-area-315
+frost-cavern-unknown-area-316
+frost-cavern-unknown-area-317
diff --git a/pokeData/kabuto b/pokeData/kabuto
index 183b4bb..7f69148 100644
--- a/pokeData/kabuto
+++ b/pokeData/kabuto
@@ -1,15 +1,23 @@
+kabuto	A rock type Pokémon
 
-Name:  Kabuto
-Pokedex Number:  140
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Swift Swim - Battle Armor - Weak Armor (Hidden Ability)
+KABUTO is a POKéMON that has been
+regenerated from a fossil. However, in
+extremely rare cases, living exampleshave been discovered.
+The POKéMON has not changed at all for
+300 million years.
 
-Base Stats
-----------------------
-Total: 355
-Hp:  30
-Attack:  80
-Defence:  90
-Special Attack:  55
-Special Defence:  45
-Speed:  55
+   ↞--------| STATS |--------↠ 
+             hp:         30
+         attack:         80
+        defense:         90
+ special-attack:         55
+special-defense:         45
+          speed:         55
+
+Pokedex ID: 140	Capture Rate: 45
+Base Exp: 71	Happiness: 50
+Height: 5	Weight: 115
+
+Genus: Shellfish Pokémon
+Location Areas:
+cinnabar-island-cinnabar-lab
diff --git a/pokeData/kabutops b/pokeData/kabutops
index d034ca9..7cefc48 100644
--- a/pokeData/kabutops
+++ b/pokeData/kabutops
@@ -1,15 +1,23 @@
+kabutops	A rock type Pokémon
 
-Name:  Kabutops
-Pokedex Number:  141
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Swift Swim - Battle Armor - Weak Armor (Hidden Ability)
+KABUTOPS swam underwater to hunt for
+its prey in ancient times.
+The POKéMON was apparently evolvingfrom being a water-dweller to living on
+land as evident from the beginnings of
+change in its gills and legs.
+
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:        115
+        defense:        105
+ special-attack:         65
+special-defense:         70
+          speed:         80
+
+Pokedex ID: 141	Capture Rate: 45
+Base Exp: 173	Happiness: 50
+Height: 13	Weight: 405
+
+Genus: Shellfish Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 495
-Hp:  60
-Attack:  115
-Defence:  105
-Special Attack:  65
-Special Defence:  70
-Speed:  80
diff --git a/pokeData/kadabra b/pokeData/kadabra
index 979d939..6549a13 100644
--- a/pokeData/kadabra
+++ b/pokeData/kadabra
@@ -1,15 +1,26 @@
+kadabra	A psychic type Pokémon
 
-Name:  Kadabra
-Pokedex Number:  064
-Gender Ratio:   ♂:75% ♀:25%
-Abilities: Synchronize - Inner Focus - Magic Guard (Hidden Ability)
+Viele seltsame Dinge passieren, wenn ein
+Kadabra in der Nähe ist. Uhren laufen zum
+Beispiel rückwärts.
 
-Base Stats
-----------------------
-Total: 400
-Hp:  40
-Attack:  35
-Defence:  30
-Special Attack:  120
-Special Defence:  70
-Speed:  105
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         35
+        defense:         30
+ special-attack:        120
+special-defense:         70
+          speed:        105
+
+Pokedex ID: 64	Capture Rate: 100
+Base Exp: 140	Happiness: 50
+Height: 13	Weight: 565
+
+Genus: Psi Pokémon
+Location Areas:
+sinnoh-victory-road-2f
+sinnoh-route-215-area
+kanto-route-8-area
+cerulean-cave-1f
+cerulean-cave-2f
+cerulean-cave-b1f
diff --git a/pokeData/kakuna b/pokeData/kakuna
index e27f2ab..7d1deb1 100644
--- a/pokeData/kakuna
+++ b/pokeData/kakuna
@@ -1,15 +1,45 @@
+kakuna	A bug type Pokémon
 
-Name:  Kakuna
-Pokedex Number:  014
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Shed Skin
+KAKUNA remains virtually immobile as it
+clings to a tree. However, on the
+inside, it is extremely busy as itprepares for its coming evolution.
+This is evident from how hot the shell
+becomes to the touch.
 
-Base Stats
-----------------------
-Total: 205
-Hp:  45
-Attack:  25
-Defence:  50
-Special Attack:  25
-Special Defence:  25
-Speed:  35
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         25
+        defense:         50
+ special-attack:         25
+special-defense:         25
+          speed:         35
+
+Pokedex ID: 14	Capture Rate: 120
+Base Exp: 72	Happiness: 70
+Height: 6	Weight: 100
+
+Genus: Cocoon Pokémon
+Location Areas:
+eterna-forest-area
+johto-route-30-area
+johto-route-31-area
+ilex-forest-area
+johto-route-34-area
+johto-route-35-area
+national-park-area
+johto-route-36-area
+johto-route-37-area
+johto-route-38-area
+johto-route-39-area
+lake-of-rage-area
+kanto-route-26-area
+kanto-route-27-area
+kanto-route-2-south-towards-viridian-city
+kanto-route-24-area
+kanto-route-25-area
+kanto-route-2-north-towards-pewter-city
+viridian-forest-area
+pattern-bush-area
+unova-route-12-area
+santalune-forest-area
+azalea-town-area
diff --git a/pokeData/kangaskhan b/pokeData/kangaskhan
index e5d325e..6b6880f 100644
--- a/pokeData/kangaskhan
+++ b/pokeData/kangaskhan
@@ -1,15 +1,29 @@
+kangaskhan	A normal type Pokémon
 
-Name:  Kangaskhan
-Pokedex Number:  115
-Gender Ratio:   ♂:0% ♀:100%
-Abilities: Early Bird - Scrappy - Inner Focus (Hidden Ability)
+If you come across a young KANGASKHAN
+playing by itself, you must never
+disturb it or attempt to catch it.The baby POKéMON’s parent is sure to
+be in the area, and it will become
+violently enraged at you.
 
-Base Stats
-----------------------
-Total: 490
-Hp:  105
-Attack:  125
-Defence:  100
-Special Attack:  60
-Special Defence:  100
-Speed:  100
+   ↞--------| STATS |--------↠ 
+             hp:        105
+         attack:         95
+        defense:         80
+ special-attack:         40
+special-defense:         80
+          speed:         90
+
+Pokedex ID: 115	Capture Rate: 45
+Base Exp: 172	Happiness: 50
+Height: 22	Weight: 800
+
+Genus: Parent Pokémon
+Location Areas:
+rock-tunnel-b1f
+kanto-safari-zone-area-1-east
+kanto-safari-zone-area-2-north
+kanto-safari-zone-area-3-west
+unova-route-15-area
+glittering-cave-unknown-area-303
+johto-safari-zone-zone-wasteland
diff --git a/pokeData/karrablast b/pokeData/karrablast
index ed46733..e5cccc5 100644
--- a/pokeData/karrablast
+++ b/pokeData/karrablast
@@ -1,15 +1,27 @@
+karrablast	A bug type Pokémon
 
-Name:  Karrablast
-Pokedex Number:  588
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Swarm - Shed Skin - No Guard (Hidden Ability)
+쪼마리와 함께 있을 때
+전기적인 자극을 받으면
+진화하는 이상한 포켓몬이다.
 
-Base Stats
-----------------------
-Total: 315
-Hp:  50
-Attack:  75
-Defence:  45
-Special Attack:  40
-Special Defence:  45
-Speed:  60
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         75
+        defense:         45
+ special-attack:         40
+special-defense:         45
+          speed:         60
+
+Pokedex ID: 588	Capture Rate: 200
+Base Exp: 63	Happiness: 50
+Height: 5	Weight: 59
+
+Genus: Clamping Pokémon
+Location Areas:
+icirrus-city-area
+unova-route-6-area
+unova-route-8-area
+moor-of-icirrus-area
+unova-route-11-area
+kalos-route-14-area
+kalos-route-19-area
diff --git a/pokeData/kartana b/pokeData/kartana
index 7cf26f5..253c354 100644
--- a/pokeData/kartana
+++ b/pokeData/kartana
@@ -1,15 +1,21 @@
+kartana	A grass type Pokémon
 
-Name:  Kartana
-Pokedex Number:  798
-Gender Ratio:  Genderless
-Abilities: Beast Boost
+This Ultra Beast came from the Ultra Wormhole.
+It seems not to attack enemies on its own, but
+its sharp body is a dangerous weapon in itself.
+
+   ↞--------| STATS |--------↠ 
+             hp:         59
+         attack:        181
+        defense:        131
+ special-attack:         59
+special-defense:         31
+          speed:        109
+
+Pokedex ID: 798	Capture Rate: 45
+Base Exp: 285	Happiness: 0
+Height: 3	Weight: 1
+
+Genus: Drawn Sword Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 570
-Hp:  59
-Attack:  181
-Defence:  131
-Special Attack:  59
-Special Defence:  31
-Speed:  109
diff --git a/pokeData/kecleon b/pokeData/kecleon
index c6fa991..73c27be 100644
--- a/pokeData/kecleon
+++ b/pokeData/kecleon
@@ -1,15 +1,28 @@
+kecleon	A normal type Pokémon
 
-Name:  Kecleon
-Pokedex Number:  352
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Color Change - Protean (Hidden Ability)
+It can freely change its body’s
+color. The zigzag pattern on its
+belly doesn’t change, however.
 
-Base Stats
-----------------------
-Total: 440
-Hp:  60
-Attack:  90
-Defence:  70
-Special Attack:  60
-Special Defence:  120
-Speed:  40
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         90
+        defense:         70
+ special-attack:         60
+special-defense:        120
+          speed:         40
+
+Pokedex ID: 352	Capture Rate: 200
+Base Exp: 154	Happiness: 70
+Height: 10	Weight: 220
+
+Genus: Color Swap Pokémon
+Location Areas:
+sinnoh-route-210-west-towards-celestic-town
+hoenn-route-118-area
+hoenn-route-119-area
+hoenn-route-120-area
+hoenn-route-121-area
+hoenn-route-123-area
+nature-sanctuary-area
+kalos-route-6-area
diff --git a/pokeData/keldeo b/pokeData/keldeo
index 30a6328..d6a987f 100644
--- a/pokeData/keldeo
+++ b/pokeData/keldeo
@@ -1,15 +1,15 @@
+	A  type Pokémon
 
-Name:  Keldeo
-Pokedex Number:  647
-Gender Ratio:  Genderless
-Abilities: Justified
+바다나 강 등의 수면을 달려
+세계 곳곳을 뛰어다닌다.
+아름다운 물가에 나타난다.
+
+   ↞--------| STATS |--------↠ 
+
+Pokedex ID: 	Capture Rate: 3
+Base Exp: 	Happiness: 35
+Height: 	Weight: 
+
+Genus: Colt Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 580
-Hp:  91
-Attack:  72
-Defence:  90
-Special Attack:  129
-Special Defence:  90
-Speed:  108
diff --git a/pokeData/kingdra b/pokeData/kingdra
index 6c864bd..efc4647 100644
--- a/pokeData/kingdra
+++ b/pokeData/kingdra
@@ -1,15 +1,23 @@
+kingdra	A water type Pokémon
 
-Name:  Kingdra
-Pokedex Number:  230
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Swift Swim - Sniper - Damp (Hidden Ability)
+It is said that it usually hides in
+underwater caves. It can create
+whirlpools by yawning.
 
-Base Stats
-----------------------
-Total: 540
-Hp:  75
-Attack:  95
-Defence:  95
-Special Attack:  95
-Special Defence:  95
-Speed:  85
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:         95
+        defense:         95
+ special-attack:         95
+special-defense:         95
+          speed:         85
+
+Pokedex ID: 230	Capture Rate: 45
+Base Exp: 270	Happiness: 50
+Height: 18	Weight: 1520
+
+Genus: Dragon Pokémon
+Location Areas:
+p2-laboratory-area
+unova-route-18-area
+unova-route-17-area
diff --git a/pokeData/kingler b/pokeData/kingler
index b92ff50..cc3b9f1 100644
--- a/pokeData/kingler
+++ b/pokeData/kingler
@@ -1,15 +1,65 @@
+kingler	A water type Pokémon
 
-Name:  Kingler
-Pokedex Number:  099
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Hyper Cutter - Shell Armor - Sheer Force (Hidden Ability)
+KINGLER has an enormous, oversized
+claw. It waves this huge claw in the
+air to communicate with others.However, because the claw is so heavy,
+the POKéMON quickly tires.
 
-Base Stats
-----------------------
-Total: 475
-Hp:  55
-Attack:  130
-Defence:  115
-Special Attack:  50
-Special Defence:  50
-Speed:  75
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:        130
+        defense:        115
+ special-attack:         50
+special-defense:         50
+          speed:         75
+
+Pokedex ID: 99	Capture Rate: 60
+Base Exp: 166	Happiness: 50
+Height: 13	Weight: 600
+
+Genus: Pincer Pokémon
+Location Areas:
+cherrygrove-city-area
+union-cave-b2f
+johto-route-34-area
+olivine-city-area
+johto-sea-route-40-area
+whirl-islands-1f
+whirl-islands-b2f
+whirl-islands-b3f
+cianwood-city-area
+seafoam-islands-b1f
+seafoam-islands-b2f
+seafoam-islands-b3f
+seafoam-islands-b4f
+johto-route-47-inside-cave
+kanto-sea-route-19-area
+kanto-sea-route-20-area
+pallet-town-area
+kanto-route-10-area
+kanto-sea-route-21-area
+kanto-route-25-area
+cerulean-cave-1f
+cerulean-cave-b1f
+kanto-route-23-area
+icefall-cave-waterfall
+kindle-road-area
+treasure-beach-area
+bond-bridge-area
+resort-gorgeous-area
+water-labyrinth-area
+five-isle-meadow-area
+memorial-pillar-area
+outcast-island-area
+green-path-area
+water-path-area
+trainer-tower-area
+tanoby-ruins-area
+one-island-area
+five-island-area
+driftveil-city-area
+unova-route-4-area
+unova-route-13-area
+virbank-city-area
+virbank-complex-outer
+johto-safari-zone-zone-rocky-beach
diff --git a/pokeData/kirlia b/pokeData/kirlia
index fcef04e..bbfb940 100644
--- a/pokeData/kirlia
+++ b/pokeData/kirlia
@@ -1,15 +1,24 @@
+kirlia	A psychic type Pokémon
 
-Name:  Kirlia
-Pokedex Number:  281
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Synchronize - Trace - Telepathy (Hidden Ability)
+If its Trainer becomes happy, it
+overflows with energy, dancing
+joyously while spinning about.
 
-Base Stats
-----------------------
-Total: 278
-Hp:  38
-Attack:  35
-Defence:  35
-Special Attack:  65
-Special Defence:  55
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:         38
+         attack:         35
+        defense:         35
+ special-attack:         65
+special-defense:         55
+          speed:         50
+
+Pokedex ID: 281	Capture Rate: 120
+Base Exp: 97	Happiness: 35
+Height: 8	Weight: 202
+
+Genus: Emotion Pokémon
+Location Areas:
+sinnoh-route-203-area
+sinnoh-route-204-south-towards-jubilife-city
+sinnoh-route-209-area
+sinnoh-route-212-north-towards-hearthome-city
diff --git a/pokeData/klang b/pokeData/klang
index e9d8ac3..a5b98da 100644
--- a/pokeData/klang
+++ b/pokeData/klang
@@ -1,15 +1,21 @@
+klang	A steel type Pokémon
 
-Name:  Klang
-Pokedex Number:  600
-Gender Ratio:  Genderless
-Abilities: Plus - Minus - Clear Body (Hidden Ability)
+회전 방향을 바꿔서
+동료에게 감정을 전한다.
+화가 나면 회전이 빨라진다.
 
-Base Stats
-----------------------
-Total: 440
-Hp:  60
-Attack:  80
-Defence:  95
-Special Attack:  70
-Special Defence:  85
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         80
+        defense:         95
+ special-attack:         70
+special-defense:         85
+          speed:         50
+
+Pokedex ID: 600	Capture Rate: 60
+Base Exp: 154	Happiness: 50
+Height: 6	Weight: 510
+
+Genus: Gear Pokémon
+Location Areas:
+p2-laboratory-area
diff --git a/pokeData/kleavor b/pokeData/kleavor
index cbe59bb..86147dc 100644
--- a/pokeData/kleavor
+++ b/pokeData/kleavor
@@ -1,15 +1,19 @@
+kleavor	A bug type Pokémon
 
-Name:  Kleavor
-Pokedex Number:  900
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Swarm - Sheer Force - Sharpness (Hidden Ability)
+                null
+
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:        135
+        defense:         95
+ special-attack:         45
+special-defense:         70
+          speed:         85
+
+Pokedex ID: 900	Capture Rate: 115
+Base Exp: null	Happiness: null
+Height: 18	Weight: 890
+
+Genus: null
+Location Areas:
 
-Base Stats
-----------------------
-Total: 500
-Hp:  70
-Attack:  135
-Defence:  95
-Special Attack:  45
-Special Defence:  70
-Speed:  85
diff --git a/pokeData/klefki b/pokeData/klefki
index 0e1b87c..19be150 100644
--- a/pokeData/klefki
+++ b/pokeData/klefki
@@ -1,15 +1,23 @@
+klefki	A steel type Pokémon
 
-Name:  Klefki
-Pokedex Number:  707
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Prankster - Magician (Hidden Ability)
+カギを　集める　習性。
+敵に　襲われると　ジャラジャラと
+カギを　打ち鳴らして　威嚇する。
 
-Base Stats
-----------------------
-Total: 470
-Hp:  57
-Attack:  80
-Defence:  91
-Special Attack:  80
-Special Defence:  87
-Speed:  75
+   ↞--------| STATS |--------↠ 
+             hp:         57
+         attack:         80
+        defense:         91
+ special-attack:         80
+special-defense:         87
+          speed:         75
+
+Pokedex ID: 707	Capture Rate: 75
+Base Exp: 165	Happiness: 50
+Height: 2	Weight: 30
+
+Genus: Key Ring Pokémon
+Location Areas:
+kalos-route-15-area
+kalos-route-16-area
+lost-hotel-area
diff --git a/pokeData/klink b/pokeData/klink
index 7f7b1dd..9da9bf3 100644
--- a/pokeData/klink
+++ b/pokeData/klink
@@ -1,15 +1,24 @@
+klink	A steel type Pokémon
 
-Name:  Klink
-Pokedex Number:  599
-Gender Ratio:  Genderless
-Abilities: Plus - Minus - Clear Body (Hidden Ability)
+두 개의 몸을 맞물려
+회전시켜서 살아가기 위한
+에너지를 만들고 있다.
 
-Base Stats
-----------------------
-Total: 300
-Hp:  40
-Attack:  55
-Defence:  70
-Special Attack:  45
-Special Defence:  60
-Speed:  30
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         55
+        defense:         70
+ special-attack:         45
+special-defense:         60
+          speed:         30
+
+Pokedex ID: 599	Capture Rate: 130
+Base Exp: 60	Happiness: 50
+Height: 3	Weight: 210
+
+Genus: Gear Pokémon
+Location Areas:
+chargestone-cave-1f
+chargestone-cave-b1f
+chargestone-cave-b2f
+p2-laboratory-area
diff --git a/pokeData/klinklang b/pokeData/klinklang
index e9e37b4..7a491bd 100644
--- a/pokeData/klinklang
+++ b/pokeData/klinklang
@@ -1,15 +1,21 @@
+klinklang	A steel type Pokémon
 
-Name:  Klinklang
-Pokedex Number:  601
-Gender Ratio:  Genderless
-Abilities: Plus - Minus - Clear Body (Hidden Ability)
+빨간 코어가 달린 기어를
+고속 회전시켜서 에너지를
+급속 충전한다.
 
-Base Stats
-----------------------
-Total: 520
-Hp:  60
-Attack:  100
-Defence:  115
-Special Attack:  70
-Special Defence:  85
-Speed:  90
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:        100
+        defense:        115
+ special-attack:         70
+special-defense:         85
+          speed:         90
+
+Pokedex ID: 601	Capture Rate: 30
+Base Exp: 260	Happiness: 50
+Height: 6	Weight: 810
+
+Genus: Gear Pokémon
+Location Areas:
+p2-laboratory-area
diff --git a/pokeData/koffing b/pokeData/koffing
index f608459..c66caba 100644
--- a/pokeData/koffing
+++ b/pokeData/koffing
@@ -1,15 +1,34 @@
+koffing	A poison type Pokémon
 
-Name:  Koffing
-Pokedex Number:  109
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Levitate
+KOFFING embodies toxic substances.
+It mixes the toxins with raw garbage to
+set off a chemical reaction thatresults in a terribly powerful poison
+gas. The higher the temperature, the
+more gas is concocted by this POKéMON.
 
-Base Stats
-----------------------
-Total: 340
-Hp:  40
-Attack:  65
-Defence:  95
-Special Attack:  60
-Special Defence:  45
-Speed:  35
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         65
+        defense:         95
+ special-attack:         60
+special-defense:         45
+          speed:         35
+
+Pokedex ID: 109	Capture Rate: 190
+Base Exp: 68	Happiness: 50
+Height: 6	Weight: 10
+
+Genus: Poison Gas Pokémon
+Location Areas:
+stark-mountain-inside
+burned-tower-1f
+burned-tower-b1f
+celadon-city-area
+pokemon-mansion-1f
+pokemon-mansion-2f
+pokemon-mansion-3f
+pokemon-mansion-b1f
+fiery-path-area
+virbank-complex-inner
+johto-safari-zone-zone-marshland
+team-rocket-hq-area
diff --git a/pokeData/komala b/pokeData/komala
index 53ad39a..6b17a73 100644
--- a/pokeData/komala
+++ b/pokeData/komala
@@ -1,15 +1,21 @@
+komala	A normal type Pokémon
 
-Name:  Komala
-Pokedex Number:  775
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Comatose
+It is born asleep, and it dies asleep. All its
+movements are apparently no more than the
+results of it tossing and turning in its dreams.
+
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:        115
+        defense:         65
+ special-attack:         75
+special-defense:         95
+          speed:         65
+
+Pokedex ID: 775	Capture Rate: 45
+Base Exp: 168	Happiness: 70
+Height: 4	Weight: 199
+
+Genus: Drowsing Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 480
-Hp:  65
-Attack:  115
-Defence:  65
-Special Attack:  75
-Special Defence:  95
-Speed:  65
diff --git a/pokeData/kommo-o b/pokeData/kommo-o
index befedc4..fab6511 100644
--- a/pokeData/kommo-o
+++ b/pokeData/kommo-o
@@ -1 +1,21 @@
-You didn't enter a valid pokemon!
+kommo-o	A dragon type Pokémon
+
+Intimorisce gli avversari con il rumore prodotto
+dalla vibrazione delle scaglie che ha sulla coda.
+Sentendolo, i nemici più deboli si danno alla fuga.
+
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:        110
+        defense:        125
+ special-attack:        100
+special-defense:        105
+          speed:         85
+
+Pokedex ID: 784	Capture Rate: 45
+Base Exp: 300	Happiness: 50
+Height: 16	Weight: 782
+
+Genus: Scaly Pokémon
+Location Areas:
+
diff --git a/pokeData/krabby b/pokeData/krabby
index cc9113f..e7af736 100644
--- a/pokeData/krabby
+++ b/pokeData/krabby
@@ -1,15 +1,86 @@
+krabby	A water type Pokémon
 
-Name:  Krabby
-Pokedex Number:  098
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Hyper Cutter - Shell Armor - Sheer Force (Hidden Ability)
+KRABBY live on beaches, burrowed inside
+holes dug into the sand.
+On sandy beaches with little in the wayof food, these POKéMON can be seen
+squabbling with each other over
+territory.
 
-Base Stats
-----------------------
-Total: 325
-Hp:  30
-Attack:  105
-Defence:  90
-Special Attack:  25
-Special Defence:  25
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:         30
+         attack:        105
+        defense:         90
+ special-attack:         25
+special-defense:         25
+          speed:         50
+
+Pokedex ID: 98	Capture Rate: 225
+Base Exp: 65	Happiness: 50
+Height: 4	Weight: 65
+
+Genus: River Crab Pokémon
+Location Areas:
+sinnoh-sea-route-226-area
+cherrygrove-city-area
+union-cave-b2f
+johto-route-34-area
+olivine-city-area
+johto-sea-route-40-area
+whirl-islands-1f
+whirl-islands-b1f
+whirl-islands-b2f
+whirl-islands-b3f
+cianwood-city-area
+dark-cave-violet-city-entrance
+seafoam-islands-1f
+seafoam-islands-b1f
+seafoam-islands-b2f
+seafoam-islands-b3f
+seafoam-islands-b4f
+johto-route-47-inside-cave
+kanto-route-12-area
+kanto-sea-route-19-area
+kanto-sea-route-20-area
+cinnabar-island-area
+cerulean-city-area
+vermilion-city-area
+fuchsia-city-area
+pallet-town-area
+kanto-route-4-area
+kanto-route-6-area
+kanto-route-10-area
+kanto-route-11-area
+kanto-route-13-area
+kanto-route-17-area
+kanto-route-18-area
+kanto-sea-route-21-area
+kanto-route-24-area
+kanto-route-25-area
+kanto-safari-zone-middle
+kanto-safari-zone-area-1-east
+kanto-safari-zone-area-2-north
+kanto-safari-zone-area-3-west
+vermilion-city-ss-anne-dock
+ss-anne-area
+icefall-cave-waterfall
+kindle-road-area
+treasure-beach-area
+bond-bridge-area
+resort-gorgeous-area
+water-labyrinth-area
+five-isle-meadow-area
+memorial-pillar-area
+outcast-island-area
+green-path-area
+water-path-area
+trainer-tower-area
+tanoby-ruins-area
+one-island-area
+five-island-area
+driftveil-city-area
+unova-route-4-area
+unova-route-13-area
+virbank-city-area
+virbank-complex-outer
+johto-safari-zone-zone-mountain
+johto-safari-zone-zone-rocky-beach
diff --git a/pokeData/kricketot b/pokeData/kricketot
index 53868a3..39fdd23 100644
--- a/pokeData/kricketot
+++ b/pokeData/kricketot
@@ -1,15 +1,30 @@
+kricketot	A bug type Pokémon
 
-Name:  Kricketot
-Pokedex Number:  401
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Shed Skin - Run Away (Hidden Ability)
+Quand il tombe du haut de ses
+petites pattes, ses antennes
+font un bruit de xylophone.
 
-Base Stats
-----------------------
-Total: 194
-Hp:  37
-Attack:  25
-Defence:  41
-Special Attack:  25
-Special Defence:  41
-Speed:  25
+   ↞--------| STATS |--------↠ 
+             hp:         37
+         attack:         25
+        defense:         41
+ special-attack:         25
+special-defense:         41
+          speed:         25
+
+Pokedex ID: 401	Capture Rate: 255
+Base Exp: 39	Happiness: 70
+Height: 3	Weight: 22
+
+Genus: Cricket Pokémon
+Location Areas:
+eterna-forest-area
+sinnoh-route-201-area
+sinnoh-route-202-area
+sinnoh-route-203-area
+sinnoh-route-204-south-towards-jubilife-city
+sinnoh-route-204-north-towards-floaroma-town
+sinnoh-route-205-east-towards-eterna-city
+sinnoh-route-206-area
+sinnoh-route-207-area
+viridian-forest-area
diff --git a/pokeData/kricketune b/pokeData/kricketune
index 6df55c3..fe0e5d9 100644
--- a/pokeData/kricketune
+++ b/pokeData/kricketune
@@ -1,15 +1,30 @@
+kricketune	A bug type Pokémon
 
-Name:  Kricketune
-Pokedex Number:  402
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Swarm - Technician (Hidden Ability)
+Ses cris sont tellement variés qu’il
+existe un village où on organise
+des concours en leur honneur.
 
-Base Stats
-----------------------
-Total: 384
-Hp:  77
-Attack:  85
-Defence:  51
-Special Attack:  55
-Special Defence:  51
-Speed:  65
+   ↞--------| STATS |--------↠ 
+             hp:         77
+         attack:         85
+        defense:         51
+ special-attack:         55
+special-defense:         51
+          speed:         65
+
+Pokedex ID: 402	Capture Rate: 45
+Base Exp: 134	Happiness: 70
+Height: 10	Weight: 255
+
+Genus: Cricket Pokémon
+Location Areas:
+trophy-garden-area
+valor-lakefront-area
+sinnoh-route-206-area
+sinnoh-route-210-south-towards-solaceon-town
+sinnoh-route-212-north-towards-hearthome-city
+sinnoh-route-212-east-towards-pastoria-city
+sinnoh-route-214-area
+sinnoh-route-215-area
+dreamyard-area
+dreamyard-b1f
diff --git a/pokeData/krokorok b/pokeData/krokorok
index 690e0e7..6ff76e0 100644
--- a/pokeData/krokorok
+++ b/pokeData/krokorok
@@ -1,15 +1,22 @@
+krokorok	A ground type Pokémon
 
-Name:  Krokorok
-Pokedex Number:  552
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Intimidate - Moxie - Anger Point (Hidden Ability)
+여러 마리가 무리를 짓는다.
+안구를 감싼 막이
+모래 폭풍으로부터 눈을 지켜준다.
 
-Base Stats
-----------------------
-Total: 351
-Hp:  60
-Attack:  82
-Defence:  45
-Special Attack:  45
-Special Defence:  45
-Speed:  74
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         82
+        defense:         45
+ special-attack:         45
+special-defense:         45
+          speed:         74
+
+Pokedex ID: 552	Capture Rate: 90
+Base Exp: 123	Happiness: 50
+Height: 10	Weight: 334
+
+Genus: Desert Croc Pokémon
+Location Areas:
+relic-castle-b
+relic-castle-c
diff --git a/pokeData/krookodile b/pokeData/krookodile
index b2bcbc6..9ab17c6 100644
--- a/pokeData/krookodile
+++ b/pokeData/krookodile
@@ -1,15 +1,21 @@
+krookodile	A ground type Pokémon
 
-Name:  Krookodile
-Pokedex Number:  553
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Intimidate - Moxie - Anger Point (Hidden Ability)
+아주 난폭한 포켓몬.
+눈앞에서 움직이는 것은 모두
+덮쳐서 깨물어 부수려고 한다.
+
+   ↞--------| STATS |--------↠ 
+             hp:         95
+         attack:        117
+        defense:         80
+ special-attack:         65
+special-defense:         70
+          speed:         92
+
+Pokedex ID: 553	Capture Rate: 45
+Base Exp: 260	Happiness: 50
+Height: 15	Weight: 963
+
+Genus: Intimidation Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 519
-Hp:  95
-Attack:  117
-Defence:  80
-Special Attack:  65
-Special Defence:  70
-Speed:  92
diff --git a/pokeData/kubfu b/pokeData/kubfu
index 71ce6ab..356f6ca 100644
--- a/pokeData/kubfu
+++ b/pokeData/kubfu
@@ -1,15 +1,21 @@
+kubfu	A fighting type Pokémon
 
-Name:  Kubfu
-Pokedex Number:  891
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Inner Focus
+Kubfu trains hard to perfect its moves. The moves
+it masters will determine which form it takes when
+it evolves.
+
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         90
+        defense:         60
+ special-attack:         53
+special-defense:         50
+          speed:         72
+
+Pokedex ID: 891	Capture Rate: 3
+Base Exp: 77	Happiness: 50
+Height: 6	Weight: 120
+
+Genus: Wushu Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 385
-Hp:  60
-Attack:  90
-Defence:  60
-Special Attack:  53
-Special Defence:  50
-Speed:  72
diff --git a/pokeData/kyogre b/pokeData/kyogre
index f9387aa..5c19759 100644
--- a/pokeData/kyogre
+++ b/pokeData/kyogre
@@ -1,15 +1,23 @@
+kyogre	A water type Pokémon
 
-Name:  Kyogre
-Pokedex Number:  382
-Gender Ratio:  Genderless
-Abilities: Drizzle
+It is said to have widened the
+seas by causing downpours. It had
+been asleep in a marine trench.
 
-Base Stats
-----------------------
-Total: 670
-Hp:  100
-Attack:  150
-Defence:  90
-Special Attack:  180
-Special Defence:  160
-Speed:  90
+   ↞--------| STATS |--------↠ 
+             hp:        100
+         attack:        100
+        defense:         90
+ special-attack:        150
+special-defense:        140
+          speed:         90
+
+Pokedex ID: 382	Capture Rate: 3
+Base Exp: 335	Happiness: 0
+Height: 45	Weight: 3520
+
+Genus: Sea Basin Pokémon
+Location Areas:
+cave-of-origin-b4f
+marine-cave-area
+embedded-tower-kyogre-room
diff --git a/pokeData/kyurem b/pokeData/kyurem
index 68d0dd5..1017d04 100644
--- a/pokeData/kyurem
+++ b/pokeData/kyurem
@@ -1,15 +1,21 @@
+kyurem	A dragon type Pokémon
 
-Name:  Kyurem
-Pokedex Number:  646
-Gender Ratio:  Genderless
-Abilities: Pressure (Standard) - Teravolt (Black Kyurem) - Turboblaze (White Kyurem
+うしなった　からだを　しんじつと
+りそうで　うめてくれる　えいゆうを
+まつ　こおりの　でんせつポケモン。
+
+   ↞--------| STATS |--------↠ 
+             hp:        125
+         attack:        130
+        defense:         90
+ special-attack:        130
+special-defense:         90
+          speed:         95
+
+Pokedex ID: 646	Capture Rate: 3
+Base Exp: 330	Happiness: 0
+Height: 30	Weight: 3250
+
+Genus: Boundary Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 660
-Hp:  125
-Attack:  120
-Defence:  90
-Special Attack:  170
-Special Defence:  100
-Speed:  95
diff --git a/pokeData/lairon b/pokeData/lairon
index aaab52f..03d4203 100644
--- a/pokeData/lairon
+++ b/pokeData/lairon
@@ -1,15 +1,34 @@
+lairon	A steel type Pokémon
 
-Name:  Lairon
-Pokedex Number:  305
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Sturdy - Rock Head - Heavy Metal (Hidden Ability)
+For food, it digs up iron ore. It
+smashes its steely body against
+others to fight over territory.
 
-Base Stats
-----------------------
-Total: 430
-Hp:  60
-Attack:  90
-Defence:  140
-Special Attack:  50
-Special Defence:  50
-Speed:  40
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         90
+        defense:        140
+ special-attack:         50
+special-defense:         50
+          speed:         40
+
+Pokedex ID: 305	Capture Rate: 90
+Base Exp: 151	Happiness: 35
+Height: 9	Weight: 1200
+
+Genus: Iron Armor Pokémon
+Location Areas:
+hoenn-victory-road-1f
+hoenn-victory-road-b1f
+hoenn-victory-road-b2f
+clay-tunnel-area
+underground-ruins-area
+rocky-mountain-room-area
+glacier-room-area
+iron-room-area
+kalos-route-18-area
+terminus-cave-unknown-area-343
+terminus-cave-unknown-area-344
+terminus-cave-unknown-area-345
+terminus-cave-unknown-area-347
+terminus-cave-unknown-area-348
diff --git a/pokeData/lampent b/pokeData/lampent
index 230b836..5b83670 100644
--- a/pokeData/lampent
+++ b/pokeData/lampent
@@ -1,15 +1,21 @@
+lampent	A ghost type Pokémon
 
-Name:  Lampent
-Pokedex Number:  608
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Flash Fire - Flame Body - Infiltrator (Hidden Ability)
+영혼을 빨아들여 불을 밝힌다.
+사람이 죽는 것을 기다리기 위해
+병원을 서성거리게 되었다.
+
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         40
+        defense:         60
+ special-attack:         95
+special-defense:         60
+          speed:         55
+
+Pokedex ID: 608	Capture Rate: 90
+Base Exp: 130	Happiness: 50
+Height: 6	Weight: 130
+
+Genus: Lamp Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 370
-Hp:  60
-Attack:  40
-Defence:  60
-Special Attack:  95
-Special Defence:  60
-Speed:  55
diff --git a/pokeData/landorus b/pokeData/landorus
index abee103..a9e9032 100644
--- a/pokeData/landorus
+++ b/pokeData/landorus
@@ -1,15 +1,15 @@
+	A  type Pokémon
 
-Name:  Landorus
-Pokedex Number:  645
-Gender Ratio:   ♂:100% ♀:0% 
-Abilities: Sand Force - Sheer Force (Hidden) (Incarnate Forme) - Intimidate (Therian Forme
+랜드로스가 찾아온 땅에는
+작물에 열매가 많이 열리기 때문에
+농지의 신이라고 전해진다.
+
+   ↞--------| STATS |--------↠ 
+
+Pokedex ID: 	Capture Rate: 3
+Base Exp: 	Happiness: 90
+Height: 	Weight: 
+
+Genus: Abundance Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 600
-Hp:  89
-Attack:  145
-Defence:  90
-Special Attack:  105
-Special Defence:  80
-Speed:  91
diff --git a/pokeData/lanturn b/pokeData/lanturn
index e964f05..52e16fc 100644
--- a/pokeData/lanturn
+++ b/pokeData/lanturn
@@ -1,15 +1,36 @@
+lanturn	A water type Pokémon
 
-Name:  Lanturn
-Pokedex Number:  171
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Volt Absorb - Illuminate - Water Absorb (Hidden Ability)
+The light it emits is so bright that it can
+illuminate the sea’s surface from a depth
+of over three miles.
 
-Base Stats
-----------------------
-Total: 460
-Hp:  125
-Attack:  58
-Defence:  58
-Special Attack:  76
-Special Defence:  76
-Speed:  67
+   ↞--------| STATS |--------↠ 
+             hp:        125
+         attack:         58
+        defense:         58
+ special-attack:         76
+special-defense:         76
+          speed:         67
+
+Pokedex ID: 171	Capture Rate: 75
+Base Exp: 161	Happiness: 50
+Height: 12	Weight: 225
+
+Genus: Light Pokémon
+Location Areas:
+sinnoh-sea-route-220-area
+new-bark-town-area
+johto-sea-route-41-area
+johto-route-47-area
+kanto-sea-route-20-area
+cinnabar-island-area
+vermilion-city-area
+pallet-town-area
+kanto-route-26-area
+kanto-route-27-area
+kanto-sea-route-21-area
+vermilion-city-ss-anne-dock
+driftveil-city-area
+undella-bay-area
+shalour-city-area
+azure-bay-area
diff --git a/pokeData/lapras b/pokeData/lapras
index 5162153..aec15b0 100644
--- a/pokeData/lapras
+++ b/pokeData/lapras
@@ -1,15 +1,29 @@
+lapras	A water type Pokémon
 
-Name:  Lapras
-Pokedex Number:  131
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Water Absorb - Shell Armor - Hydration (Hidden Ability)
+People have driven LAPRAS almost to the
+point of extinction. In the evenings,
+this POKéMON is said to sing plaintivelyas it seeks what few others of its kind
+still remain.
 
-Base Stats
-----------------------
-Total: 535
-Hp:  130
-Attack:  85
-Defence:  80
-Special Attack:  85
-Special Defence:  95
-Speed:  60
+   ↞--------| STATS |--------↠ 
+             hp:        130
+         attack:         85
+        defense:         80
+ special-attack:         85
+special-defense:         95
+          speed:         60
+
+Pokedex ID: 131	Capture Rate: 45
+Base Exp: 187	Happiness: 50
+Height: 25	Weight: 2200
+
+Genus: Transport Pokémon
+Location Areas:
+sinnoh-victory-road-inside-b1f
+union-cave-b2f
+icefall-cave-waterfall
+village-bridge-area
+kalos-route-12-area
+azure-bay-area
+saffron-city-silph-co-7f
+johto-safari-zone-zone-rocky-beach
diff --git a/pokeData/larvesta b/pokeData/larvesta
index 3c3334d..0902bf7 100644
--- a/pokeData/larvesta
+++ b/pokeData/larvesta
@@ -1,15 +1,21 @@
+larvesta	A bug type Pokémon
 
-Name:  Larvesta
-Pokedex Number:  636
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Flame Body - Swarm (Hidden Ability)
+태양에서 태어났다고 전해진다.
+진화할 때 뿔에서 뿜어져 나온
+불꽃으로 전신을 감싼다.
 
-Base Stats
-----------------------
-Total: 360
-Hp:  55
-Attack:  85
-Defence:  55
-Special Attack:  50
-Special Defence:  55
-Speed:  60
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         85
+        defense:         55
+ special-attack:         50
+special-defense:         55
+          speed:         60
+
+Pokedex ID: 636	Capture Rate: 45
+Base Exp: 72	Happiness: 50
+Height: 11	Weight: 288
+
+Genus: Torch Pokémon
+Location Areas:
+unova-route-18-area
diff --git a/pokeData/larvitar b/pokeData/larvitar
index eff88c9..2f4b185 100644
--- a/pokeData/larvitar
+++ b/pokeData/larvitar
@@ -1,15 +1,31 @@
+larvitar	A rock type Pokémon
 
-Name:  Larvitar
-Pokedex Number:  246
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Guts - Sand Veil (Hidden Ability)
+It feeds on soil. After it has eaten a
+large mountain, it will fall asleep so it
+can grow.
 
-Base Stats
-----------------------
-Total: 300
-Hp:  50
-Attack:  64
-Defence:  50
-Special Attack:  45
-Special Defence:  50
-Speed:  41
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         64
+        defense:         50
+ special-attack:         45
+special-defense:         50
+          speed:         41
+
+Pokedex ID: 246	Capture Rate: 45
+Base Exp: 60	Happiness: 35
+Height: 6	Weight: 720
+
+Genus: Rock Skin Pokémon
+Location Areas:
+sinnoh-route-206-area
+sinnoh-route-207-area
+mt-silver-2f
+mt-silver-1f-top
+mt-silver-4f
+mt-silver-1f
+mt-silver-mountainside
+mt-silver-3f
+mt-silver-top
+sevault-canyon-area
+johto-safari-zone-zone-mountain
diff --git a/pokeData/latias b/pokeData/latias
index 19189ef..49908bd 100644
--- a/pokeData/latias
+++ b/pokeData/latias
@@ -1,15 +1,23 @@
+latias	A dragon type Pokémon
 
-Name:  Latias
-Pokedex Number:  380
-Gender Ratio:   ♂:0% ♀:100% 
-Abilities: Levitate
+Its body is covered with a down
+that can refract light in such a
+way that it becomes invisible.
 
-Base Stats
-----------------------
-Total: 600
-Hp:  80
-Attack:  100
-Defence:  120
-Special Attack:  140
-Special Defence:  150
-Speed:  110
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:         80
+        defense:         90
+ special-attack:        110
+special-defense:        130
+          speed:        110
+
+Pokedex ID: 380	Capture Rate: 3
+Base Exp: 300	Happiness: 90
+Height: 14	Weight: 400
+
+Genus: Eon Pokémon
+Location Areas:
+southern-island-area
+roaming-johto-area
+roaming-hoenn-area
diff --git a/pokeData/latios b/pokeData/latios
index c302190..d2abbb5 100644
--- a/pokeData/latios
+++ b/pokeData/latios
@@ -1,15 +1,23 @@
+latios	A dragon type Pokémon
 
-Name:  Latios
-Pokedex Number:  381
-Gender Ratio:   ♂:100% ♀:0% 
-Abilities: Levitate
+A highly intelligent Pokémon.
+By folding back its wings in flight,
+it can overtake jet planes.
 
-Base Stats
-----------------------
-Total: 600
-Hp:  80
-Attack:  130
-Defence:  100
-Special Attack:  160
-Special Defence:  120
-Speed:  110
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:         90
+        defense:         80
+ special-attack:        130
+special-defense:        110
+          speed:        110
+
+Pokedex ID: 381	Capture Rate: 3
+Base Exp: 300	Happiness: 90
+Height: 20	Weight: 600
+
+Genus: Eon Pokémon
+Location Areas:
+southern-island-area
+roaming-johto-area
+roaming-hoenn-area
diff --git a/pokeData/leafeon b/pokeData/leafeon
index 3f67336..2dfb754 100644
--- a/pokeData/leafeon
+++ b/pokeData/leafeon
@@ -1,15 +1,21 @@
+leafeon	A grass type Pokémon
 
-Name:  Leafeon
-Pokedex Number:  470
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Leaf Guard - Chlorophyll (Hidden Ability)
+Il utilise la photosynthèse comme
+une plante et a aussi tendance à
+éviter le combat à tout prix.
+
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:        110
+        defense:        130
+ special-attack:         60
+special-defense:         65
+          speed:         95
+
+Pokedex ID: 470	Capture Rate: 45
+Base Exp: 184	Happiness: 35
+Height: 10	Weight: 255
+
+Genus: Verdant Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 525
-Hp:  65
-Attack:  110
-Defence:  130
-Special Attack:  60
-Special Defence:  65
-Speed:  95
diff --git a/pokeData/leavanny b/pokeData/leavanny
index d35a15f..567a941 100644
--- a/pokeData/leavanny
+++ b/pokeData/leavanny
@@ -1,15 +1,23 @@
+leavanny	A bug type Pokémon
 
-Name:  Leavanny
-Pokedex Number:  542
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Swarm - Chlorophyll - Overcoat (Hidden Ability)
+어린 포켓몬을 보면
+입에서 내뿜는 점착실로
+잎사귀의 옷을 지어 준다.
 
-Base Stats
-----------------------
-Total: 500
-Hp:  75
-Attack:  103
-Defence:  80
-Special Attack:  70
-Special Defence:  80
-Speed:  92
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:        103
+        defense:         80
+ special-attack:         70
+special-defense:         80
+          speed:         92
+
+Pokedex ID: 542	Capture Rate: 45
+Base Exp: 225	Happiness: 70
+Height: 12	Weight: 205
+
+Genus: Nurturing Pokémon
+Location Areas:
+unova-route-6-area
+unova-route-12-area
+lostlorn-forest-area
diff --git a/pokeData/ledian b/pokeData/ledian
index d2af3e8..2fda6bf 100644
--- a/pokeData/ledian
+++ b/pokeData/ledian
@@ -1,15 +1,25 @@
+ledian	A bug type Pokémon
 
-Name:  Ledian
-Pokedex Number:  166
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Swarm - Early Bird - Iron Fist (Hidden Ability)
+When the stars flicker in the night sky, it
+flutters about, scattering a glowing
+powder.
 
-Base Stats
-----------------------
-Total: 390
-Hp:  55
-Attack:  35
-Defence:  50
-Special Attack:  55
-Special Defence:  110
-Speed:  85
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         35
+        defense:         50
+ special-attack:         55
+special-defense:        110
+          speed:         85
+
+Pokedex ID: 166	Capture Rate: 90
+Base Exp: 137	Happiness: 70
+Height: 14	Weight: 356
+
+Genus: Five Star Pokémon
+Location Areas:
+sinnoh-route-229-area
+kanto-route-2-south-towards-viridian-city
+kanto-route-2-north-towards-pewter-city
+dreamyard-area
+dreamyard-b1f
diff --git a/pokeData/ledyba b/pokeData/ledyba
index 9240aab..7ce9f38 100644
--- a/pokeData/ledyba
+++ b/pokeData/ledyba
@@ -1,15 +1,35 @@
+ledyba	A bug type Pokémon
 
-Name:  Ledyba
-Pokedex Number:  165
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Swarm - Early Bird - Rattled (Hidden Ability)
+It is very timid. It will be afraid to
+move if it is alone. But it will be active
+if it is in a group.
 
-Base Stats
-----------------------
-Total: 265
-Hp:  40
-Attack:  20
-Defence:  30
-Special Attack:  40
-Special Defence:  80
-Speed:  55
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         20
+        defense:         30
+ special-attack:         40
+special-defense:         80
+          speed:         55
+
+Pokedex ID: 165	Capture Rate: 255
+Base Exp: 53	Happiness: 70
+Height: 10	Weight: 108
+
+Genus: Five Star Pokémon
+Location Areas:
+johto-route-29-area
+johto-route-30-area
+johto-route-31-area
+johto-route-34-area
+johto-route-35-area
+national-park-area
+johto-route-36-area
+johto-route-37-area
+johto-route-38-area
+johto-route-39-area
+kanto-route-2-south-towards-viridian-city
+kanto-route-2-north-towards-pewter-city
+hoenn-safari-zone-expansion-north
+pattern-bush-area
+kalos-route-4-area
diff --git a/pokeData/lickilicky b/pokeData/lickilicky
index 860f165..376c385 100644
--- a/pokeData/lickilicky
+++ b/pokeData/lickilicky
@@ -1,15 +1,21 @@
+lickilicky	A normal type Pokémon
 
-Name:  Lickilicky
-Pokedex Number:  463
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Own Tempo - Oblivious - Cloud Nine (Hidden Ability)
+The long tongue is always soggy
+with slobber. The saliva contains
+a solvent that causes numbness.
 
-Base Stats
-----------------------
-Total: 515
-Hp:  110
-Attack:  85
-Defence:  95
-Special Attack:  80
-Special Defence:  95
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:        110
+         attack:         85
+        defense:         95
+ special-attack:         80
+special-defense:         95
+          speed:         50
+
+Pokedex ID: 463	Capture Rate: 30
+Base Exp: 180	Happiness: 50
+Height: 17	Weight: 1400
+
+Genus: Licking Pokémon
+Location Areas:
+unova-route-2-area
diff --git a/pokeData/lickitung b/pokeData/lickitung
index fe8c5a6..5bb8d57 100644
--- a/pokeData/lickitung
+++ b/pokeData/lickitung
@@ -1,15 +1,34 @@
+lickitung	A normal type Pokémon
 
-Name:  Lickitung
-Pokedex Number:  108
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Own Tempo - Oblivious - Cloud Nine (Hidden Ability)
+Whenever LICKITUNG comes across
+something new, it will unfailingly give it
+a lick. It does so because it memorizesthings by texture and by taste.
+It is somewhat put off by sour things.
 
-Base Stats
-----------------------
-Total: 385
-Hp:  90
-Attack:  55
-Defence:  75
-Special Attack:  60
-Special Defence:  75
-Speed:  30
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:         55
+        defense:         75
+ special-attack:         60
+special-defense:         75
+          speed:         30
+
+Pokedex ID: 108	Capture Rate: 45
+Base Exp: 77	Happiness: 50
+Height: 12	Weight: 655
+
+Genus: Licking Pokémon
+Location Areas:
+lake-valor-area
+sinnoh-route-215-area
+johto-route-44-area
+cerulean-cave-b1f
+unova-route-2-area
+challengers-cave-1f
+challengers-cave-b1f
+challengers-cave-b2f
+kalos-victory-road-unknown-area-322
+kalos-victory-road-unknown-area-324
+kalos-victory-road-unknown-area-326
+kalos-victory-road-unknown-area-328
+johto-safari-zone-zone-mountain
diff --git a/pokeData/liepard b/pokeData/liepard
index 449e54c..f163b5d 100644
--- a/pokeData/liepard
+++ b/pokeData/liepard
@@ -1,15 +1,27 @@
+liepard	A dark type Pokémon
 
-Name:  Liepard
-Pokedex Number:  510
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Limber - Unburden - Prankster (Hidden Ability)
+아름다운 스타일은 전신의
+발달한 근육 덕분이다.
+소리도 내지 않고 밤을 달린다.
 
-Base Stats
-----------------------
-Total: 446
-Hp:  64
-Attack:  88
-Defence:  50
-Special Attack:  88
-Special Defence:  50
-Speed:  106
+   ↞--------| STATS |--------↠ 
+             hp:         64
+         attack:         88
+        defense:         50
+ special-attack:         88
+special-defense:         50
+          speed:        106
+
+Pokedex ID: 510	Capture Rate: 90
+Base Exp: 156	Happiness: 50
+Height: 11	Weight: 375
+
+Genus: Cruel Pokémon
+Location Areas:
+dreamyard-area
+dreamyard-b1f
+unova-route-2-area
+unova-route-5-area
+unova-route-9-area
+unova-route-16-area
+kalos-route-15-area
diff --git a/pokeData/lileep b/pokeData/lileep
index 35f5345..519057a 100644
--- a/pokeData/lileep
+++ b/pokeData/lileep
@@ -1,15 +1,21 @@
+lileep	A rock type Pokémon
 
-Name:  Lileep
-Pokedex Number:  345
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Suction Cups - Storm Drain (Hidden Ability)
+It lived on the seafloor 100
+million years ago and was
+reanimated scientifically.
 
-Base Stats
-----------------------
-Total: 355
-Hp:  66
-Attack:  41
-Defence:  77
-Special Attack:  61
-Special Defence:  87
-Speed:  23
+   ↞--------| STATS |--------↠ 
+             hp:         66
+         attack:         41
+        defense:         77
+ special-attack:         61
+special-defense:         87
+          speed:         23
+
+Pokedex ID: 345	Capture Rate: 45
+Base Exp: 71	Happiness: 50
+Height: 10	Weight: 238
+
+Genus: Sea Lily Pokémon
+Location Areas:
+rustboro-city-area
diff --git a/pokeData/lilligant b/pokeData/lilligant
index 020f4a4..08a0fca 100644
--- a/pokeData/lilligant
+++ b/pokeData/lilligant
@@ -1,15 +1,25 @@
+lilligant	A grass type Pokémon
 
-Name:  Lilligant
-Pokedex Number:  549
-Gender Ratio:   ♂:0% ♀:100%
-Abilities: Chlorophyll - Own Tempo - Leaf Guard (Hidden Ability)
+머리에 있는 꽃 장식의 향기에는
+긴장을 풀어 주는 효과가 있다.
+자주 손질하지 않으면 시들어 버린다.
 
-Base Stats
-----------------------
-Total: 480
-Hp:  70
-Attack:  60
-Defence:  75
-Special Attack:  110
-Special Defence:  75
-Speed:  90
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         60
+        defense:         75
+ special-attack:        110
+special-defense:         75
+          speed:         90
+
+Pokedex ID: 549	Capture Rate: 75
+Base Exp: 168	Happiness: 50
+Height: 11	Weight: 163
+
+Genus: Flowering Pokémon
+Location Areas:
+pinwheel-forest-inside
+abundant-shrine-area
+lostlorn-forest-area
+castelia-city-area
+unova-victory-road-2-unknown-area-72
diff --git a/pokeData/lillipup b/pokeData/lillipup
index a8a9c60..3b4cd21 100644
--- a/pokeData/lillipup
+++ b/pokeData/lillipup
@@ -1,15 +1,24 @@
+lillipup	A normal type Pokémon
 
-Name:  Lillipup
-Pokedex Number:  506
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Vital Spirit - Pickup - Run Away (Hidden Ability)
+얼굴을 둘러싼 긴 털은
+우수한 레이더다. 주위
+상황을 민감히 살핀다.
 
-Base Stats
-----------------------
-Total: 275
-Hp:  45
-Attack:  60
-Defence:  45
-Special Attack:  25
-Special Defence:  45
-Speed:  55
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         60
+        defense:         45
+ special-attack:         25
+special-defense:         45
+          speed:         55
+
+Pokedex ID: 506	Capture Rate: 255
+Base Exp: 55	Happiness: 50
+Height: 4	Weight: 41
+
+Genus: Puppy Pokémon
+Location Areas:
+unova-route-1-area
+unova-route-2-area
+unova-route-3-area
+floccesy-ranch-inner
diff --git a/pokeData/linoone b/pokeData/linoone
index c06fbac..7c9fd90 100644
--- a/pokeData/linoone
+++ b/pokeData/linoone
@@ -1,15 +1,49 @@
+linoone	A normal type Pokémon
 
-Name:  Linoone
-Pokedex Number:  264
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Pickup - Gluttony - Quick Feet (Hidden Ability)
+It charges prey at speeds over
+60 mph. However, because it can
+only run straight, it often fails.
 
-Base Stats
-----------------------
-Total: 420
-Hp:  78
-Attack:  70
-Defence:  61
-Special Attack:  50
-Special Defence:  61
-Speed:  100
+   ↞--------| STATS |--------↠ 
+             hp:         78
+         attack:         70
+        defense:         61
+ special-attack:         50
+special-defense:         61
+          speed:        100
+
+Pokedex ID: 264	Capture Rate: 90
+Base Exp: 147	Happiness: 50
+Height: 5	Weight: 325
+
+Genus: Rushing Pokémon
+Location Areas:
+johto-route-30-area
+johto-route-31-area
+johto-route-32-area
+ruins-of-alph-outside
+johto-route-34-area
+johto-route-35-area
+johto-route-42-area
+johto-route-43-area
+johto-route-44-area
+johto-route-45-area
+johto-route-47-area
+mt-silver-outside
+kanto-route-26-area
+kanto-route-27-area
+kanto-route-28-area
+kanto-route-4-area
+kanto-route-6-area
+kanto-route-9-area
+kanto-route-10-area
+kanto-route-13-area
+kanto-sea-route-21-area
+kanto-route-22-area
+kanto-route-24-area
+kanto-route-25-area
+hoenn-route-118-area
+hoenn-route-119-area
+hoenn-route-120-area
+hoenn-route-121-area
+hoenn-route-123-area
diff --git a/pokeData/litleo b/pokeData/litleo
index 1495448..81b96e1 100644
--- a/pokeData/litleo
+++ b/pokeData/litleo
@@ -1,15 +1,21 @@
+litleo	A fire type Pokémon
 
-Name:  Litleo
-Pokedex Number:  667
-Gender Ratio:   ♂:25% ♀:75% 
-Abilities: Rivalry - Unnerve - Moxie (Hidden Ability)
+強い　相手に　立ち向かうときほど
+たてがみが　高温になり
+全身に　力が　みなぎるのだ。
 
-Base Stats
-----------------------
-Total: 369
-Hp:  62
-Attack:  50
-Defence:  58
-Special Attack:  73
-Special Defence:  54
-Speed:  72
+   ↞--------| STATS |--------↠ 
+             hp:         62
+         attack:         50
+        defense:         58
+ special-attack:         73
+special-defense:         54
+          speed:         72
+
+Pokedex ID: 667	Capture Rate: 220
+Base Exp: 74	Happiness: 70
+Height: 6	Weight: 135
+
+Genus: Lion Cub Pokémon
+Location Areas:
+kalos-route-22-area
diff --git a/pokeData/litten b/pokeData/litten
index a0e4f4c..ac9b2d1 100644
--- a/pokeData/litten
+++ b/pokeData/litten
@@ -1,15 +1,21 @@
+litten	A fire type Pokémon
 
-Name:  Litten
-Pokedex Number:  725
-Gender Ratio:   ♂:88.14% ♀:11.86%
-Abilities: Blaze - Intimidate (Hidden Ability)
+While grooming itself, it builds up fur inside its
+stomach. It sets the fur alight and spews fiery
+attacks, which change based on how it coughs.
+
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         65
+        defense:         40
+ special-attack:         60
+special-defense:         40
+          speed:         70
+
+Pokedex ID: 725	Capture Rate: 45
+Base Exp: 64	Happiness: 50
+Height: 4	Weight: 43
+
+Genus: Fire Cat Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 320
-Hp:  45
-Attack:  65
-Defence:  40
-Special Attack:  60
-Special Defence:  40
-Speed:  70
diff --git a/pokeData/litwick b/pokeData/litwick
index 066d501..25c4a49 100644
--- a/pokeData/litwick
+++ b/pokeData/litwick
@@ -1,15 +1,27 @@
+litwick	A ghost type Pokémon
 
-Name:  Litwick
-Pokedex Number:  607
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Flash Fire - Flame Body - Infiltrator (Hidden Ability)
+빛을 밝혀 길 안내를
+하는 것처럼 가장하여
+생명력을 빨아들이고 있다.
 
-Base Stats
-----------------------
-Total: 275
-Hp:  50
-Attack:  30
-Defence:  55
-Special Attack:  65
-Special Defence:  55
-Speed:  20
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         30
+        defense:         55
+ special-attack:         65
+special-defense:         55
+          speed:         20
+
+Pokedex ID: 607	Capture Rate: 190
+Base Exp: 55	Happiness: 50
+Height: 3	Weight: 31
+
+Genus: Candle Pokémon
+Location Areas:
+celestial-tower-2f
+celestial-tower-3f
+celestial-tower-4f
+celestial-tower-5f
+strange-house-1f
+strange-house-b1f
+lost-hotel-area
diff --git a/pokeData/lombre b/pokeData/lombre
index e47e451..c4fdac0 100644
--- a/pokeData/lombre
+++ b/pokeData/lombre
@@ -1,15 +1,29 @@
+lombre	A water type Pokémon
 
-Name:  Lombre
-Pokedex Number:  271
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Swift Swim - Rain Dish - Own Tempo (Hidden Ability)
+It has a mischievous spirit. If it
+spots an angler, it will tug on the
+fishing line to interfere.
 
-Base Stats
-----------------------
-Total: 340
-Hp:  60
-Attack:  50
-Defence:  50
-Special Attack:  60
-Special Defence:  70
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         50
+        defense:         50
+ special-attack:         60
+special-defense:         70
+          speed:         50
+
+Pokedex ID: 271	Capture Rate: 120
+Base Exp: 119	Happiness: 50
+Height: 12	Weight: 325
+
+Genus: Jolly Pokémon
+Location Areas:
+sinnoh-route-212-east-towards-pastoria-city
+sinnoh-route-229-area
+hoenn-route-114-area
+couriway-town-area
+kalos-route-15-area
+kalos-route-16-area
+kalos-route-21-area
+pokemon-village-area
+kalos-victory-road-unknown-area-327
diff --git a/pokeData/lopunny b/pokeData/lopunny
index 5a66ef3..dd27067 100644
--- a/pokeData/lopunny
+++ b/pokeData/lopunny
@@ -1,15 +1,21 @@
+lopunny	A normal type Pokémon
 
-Name:  Lopunny
-Pokedex Number:  428
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Cute Charm - Klutz - Limber (Hidden Ability)
+Il est capable de décocher de
+puissants coups de pied si on
+touche à ses délicates oreilles.
 
-Base Stats
-----------------------
-Total: 480
-Hp:  65
-Attack:  136
-Defence:  94
-Special Attack:  54
-Special Defence:  96
-Speed:  135
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         76
+        defense:         84
+ special-attack:         54
+special-defense:         96
+          speed:        105
+
+Pokedex ID: 428	Capture Rate: 60
+Base Exp: 168	Happiness: 140
+Height: 12	Weight: 333
+
+Genus: Rabbit Pokémon
+Location Areas:
+castelia-city-area
diff --git a/pokeData/lotad b/pokeData/lotad
index a2d4920..9fb32a7 100644
--- a/pokeData/lotad
+++ b/pokeData/lotad
@@ -1,15 +1,27 @@
+lotad	A water type Pokémon
 
-Name:  Lotad
-Pokedex Number:  270
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Swift Swim - Rain Dish - Own Tempo (Hidden Ability)
+It looks like an aquatic plant and
+serves as a ferry to Pokémon
+that can’t swim.
 
-Base Stats
-----------------------
-Total: 220
-Hp:  40
-Attack:  30
-Defence:  30
-Special Attack:  40
-Special Defence:  50
-Speed:  30
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         30
+        defense:         30
+ special-attack:         40
+special-defense:         50
+          speed:         30
+
+Pokedex ID: 270	Capture Rate: 255
+Base Exp: 44	Happiness: 50
+Height: 5	Weight: 26
+
+Genus: Water Weed Pokémon
+Location Areas:
+sinnoh-route-203-area
+sinnoh-route-204-south-towards-jubilife-city
+sinnoh-route-204-north-towards-floaroma-town
+sinnoh-route-205-east-towards-eterna-city
+sinnoh-route-212-east-towards-pastoria-city
+hoenn-route-102-area
+hoenn-route-114-area
diff --git a/pokeData/loudred b/pokeData/loudred
index d0c6b0e..bf9ff3f 100644
--- a/pokeData/loudred
+++ b/pokeData/loudred
@@ -1,15 +1,24 @@
+loudred	A normal type Pokémon
 
-Name:  Loudred
-Pokedex Number:  294
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Soundproof - Scrappy (Hidden Ability)
+The shock waves from its cries can
+tip over trucks. It stamps its
+feet to power up.
 
-Base Stats
-----------------------
-Total: 360
-Hp:  84
-Attack:  71
-Defence:  43
-Special Attack:  71
-Special Defence:  43
-Speed:  48
+   ↞--------| STATS |--------↠ 
+             hp:         84
+         attack:         71
+        defense:         43
+ special-attack:         71
+special-defense:         43
+          speed:         48
+
+Pokedex ID: 294	Capture Rate: 120
+Base Exp: 126	Happiness: 50
+Height: 10	Weight: 405
+
+Genus: Big Voice Pokémon
+Location Areas:
+mt-coronet-exterior-snowfall
+mt-coronet-exterior-blizzard
+hoenn-victory-road-1f
+desert-underpass-area
diff --git a/pokeData/lucario b/pokeData/lucario
index 402cdb6..ece184e 100644
--- a/pokeData/lucario
+++ b/pokeData/lucario
@@ -1,15 +1,21 @@
+lucario	A fighting type Pokémon
 
-Name:  Lucario
-Pokedex Number:  448
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Steadfast - Inner Focus - Justified (Hidden Ability)
+Un spécimen bien entraîné peut
+sentir et identifier les émotions de
+quelqu’un à plus d’un kilomètre.
 
-Base Stats
-----------------------
-Total: 525
-Hp:  70
-Attack:  145
-Defence:  88
-Special Attack:  140
-Special Defence:  70
-Speed:  112
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:        110
+        defense:         70
+ special-attack:        115
+special-defense:         70
+          speed:         90
+
+Pokedex ID: 448	Capture Rate: 45
+Base Exp: 184	Happiness: 50
+Height: 12	Weight: 540
+
+Genus: Aura Pokémon
+Location Areas:
+tower-of-mastery-area
diff --git a/pokeData/ludicolo b/pokeData/ludicolo
index 11c4652..926a71c 100644
--- a/pokeData/ludicolo
+++ b/pokeData/ludicolo
@@ -1,15 +1,21 @@
+ludicolo	A water type Pokémon
 
-Name:  Ludicolo
-Pokedex Number:  272
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Swift Swim - Rain Dish - Own Tempo (Hidden Ability)
+If it hears festive music, all its
+muscles fill with energy. It can’t
+help breaking out into a dance.
+
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:         70
+        defense:         70
+ special-attack:         90
+special-defense:        100
+          speed:         70
+
+Pokedex ID: 272	Capture Rate: 45
+Base Exp: 240	Happiness: 50
+Height: 15	Weight: 550
+
+Genus: Carefree Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 480
-Hp:  80
-Attack:  70
-Defence:  70
-Special Attack:  90
-Special Defence:  100
-Speed:  70
diff --git a/pokeData/lugia b/pokeData/lugia
index dec3899..1f8ea4d 100644
--- a/pokeData/lugia
+++ b/pokeData/lugia
@@ -1,15 +1,23 @@
+lugia	A psychic type Pokémon
 
-Name:  Lugia
-Pokedex Number:  249
-Gender Ratio:  Genderless
-Abilities: Pressure - Multiscale (Hidden Ability)
+It is said that it quietly spends its time
+deep at the bottom of the sea because
+its powers are too strong.
 
-Base Stats
-----------------------
-Total: 680
-Hp:  106
-Attack:  90
-Defence:  130
-Special Attack:  90
-Special Defence:  154
-Speed:  110
+   ↞--------| STATS |--------↠ 
+             hp:        106
+         attack:         90
+        defense:        130
+ special-attack:         90
+special-defense:        154
+          speed:        110
+
+Pokedex ID: 249	Capture Rate: 3
+Base Exp: 340	Happiness: 0
+Height: 52	Weight: 2160
+
+Genus: Diving Pokémon
+Location Areas:
+whirl-islands-b2f
+whirl-islands-b3f
+navel-rock-area
diff --git a/pokeData/lumineon b/pokeData/lumineon
index b52f9d8..6759a4c 100644
--- a/pokeData/lumineon
+++ b/pokeData/lumineon
@@ -1,15 +1,35 @@
+lumineon	A water type Pokémon
 
-Name:  Lumineon
-Pokedex Number:  457
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Swift Swim - Storm Drain - Water Veil (Hidden Ability)
+It crawls along the seafloor using
+its long front fins like legs. It
+competes for food with Lanturn.
 
-Base Stats
-----------------------
-Total: 460
-Hp:  69
-Attack:  69
-Defence:  76
-Special Attack:  69
-Special Defence:  86
-Speed:  91
+   ↞--------| STATS |--------↠ 
+             hp:         69
+         attack:         69
+        defense:         76
+ special-attack:         69
+special-defense:         86
+          speed:         91
+
+Pokedex ID: 457	Capture Rate: 75
+Base Exp: 161	Happiness: 70
+Height: 12	Weight: 240
+
+Genus: Neon Pokémon
+Location Areas:
+canalave-city-area
+valley-windworks-area
+fuego-ironworks-area
+iron-island-area
+sinnoh-route-205-south-towards-floaroma-town
+sinnoh-route-218-area
+sinnoh-route-219-area
+sinnoh-route-221-area
+sinnoh-sea-route-220-area
+p2-laboratory-area
+unova-route-4-area
+unova-route-18-area
+unova-route-17-area
+virbank-city-area
+virbank-complex-outer
diff --git a/pokeData/lunala b/pokeData/lunala
index 8a835a1..cc650b1 100644
--- a/pokeData/lunala
+++ b/pokeData/lunala
@@ -1,15 +1,21 @@
+lunala	A psychic type Pokémon
 
-Name:  Lunala
-Pokedex Number:  792
-Gender Ratio:  Genderless
-Abilities: Shadow Shield
+Si dice che sia l’evoluzione femminile di Cosmog.
+Quando il suo terzo occhio si manifesta, significa
+che sta volando verso un altro mondo.
+
+   ↞--------| STATS |--------↠ 
+             hp:        137
+         attack:        113
+        defense:         89
+ special-attack:        137
+special-defense:        107
+          speed:         97
+
+Pokedex ID: 792	Capture Rate: 45
+Base Exp: 340	Happiness: 0
+Height: 40	Weight: 1200
+
+Genus: Moone Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 680
-Hp:  137
-Attack:  113
-Defence:  89
-Special Attack:  137
-Special Defence:  107
-Speed:  97
diff --git a/pokeData/lunatone b/pokeData/lunatone
index 48520a2..49517c7 100644
--- a/pokeData/lunatone
+++ b/pokeData/lunatone
@@ -1,15 +1,52 @@
+lunatone	A rock type Pokémon
 
-Name:  Lunatone
-Pokedex Number:  337
-Gender Ratio:  Genderless
-Abilities: Levitate
+Because it turns active on nights
+of the full moon, it is said to have
+some link to the lunar phases.
 
-Base Stats
-----------------------
-Total: 440
-Hp:  70
-Attack:  55
-Defence:  65
-Special Attack:  95
-Special Defence:  85
-Speed:  70
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:         55
+        defense:         65
+ special-attack:         95
+special-defense:         85
+          speed:         70
+
+Pokedex ID: 337	Capture Rate: 45
+Base Exp: 161	Happiness: 50
+Height: 10	Weight: 1680
+
+Genus: Meteorite Pokémon
+Location Areas:
+mt-coronet-2f
+mt-coronet-3f
+mt-coronet-exterior-snowfall
+mt-coronet-exterior-blizzard
+mt-coronet-4f
+mt-coronet-4f-small-room
+mt-coronet-5f
+mt-coronet-6f
+mt-coronet-1f-from-exterior
+sendoff-spring-area
+turnback-cave-pillar-1
+turnback-cave-pillar-2
+turnback-cave-pillar-3
+turnback-cave-before-pillar-1
+turnback-cave-between-pillars-1-and-2
+turnback-cave-between-pillars-2-and-3
+turnback-cave-after-pillar-3
+lake-verity-before-galactic-intervention
+lake-verity-after-galactic-intervention
+lake-valor-area
+lake-acuity-area
+meteor-falls-area
+meteor-falls-back
+meteor-falls-b1f
+meteor-falls-backsmall-room
+giant-chasm-outside
+giant-chasm-area
+giant-chasm-forest
+giant-chasm-forest-cave
+unova-route-13-area
+unova-route-22-area
+glittering-cave-unknown-area-303
diff --git a/pokeData/lurantis b/pokeData/lurantis
index dfcd7c5..5d75902 100644
--- a/pokeData/lurantis
+++ b/pokeData/lurantis
@@ -1,15 +1,21 @@
+lurantis	A grass type Pokémon
 
-Name:  Lurantis
-Pokedex Number:  754
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Leaf Guard - Contrary (Hidden Ability)
+It requires a lot of effort to maintain Lurantis’s
+vivid coloring, but some collectors enjoy this
+work and treat it as their hobby.
+
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:        105
+        defense:         90
+ special-attack:         80
+special-defense:         90
+          speed:         45
+
+Pokedex ID: 754	Capture Rate: 75
+Base Exp: 168	Happiness: 50
+Height: 9	Weight: 185
+
+Genus: Bloom Sickle Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 480
-Hp:  70
-Attack:  105
-Defence:  90
-Special Attack:  80
-Special Defence:  90
-Speed:  45
diff --git a/pokeData/luvdisc b/pokeData/luvdisc
index 9960b89..acdb9e0 100644
--- a/pokeData/luvdisc
+++ b/pokeData/luvdisc
@@ -1,15 +1,39 @@
+luvdisc	A water type Pokémon
 
-Name:  Luvdisc
-Pokedex Number:  370
-Gender Ratio:   ♂:25% ♀:75%
-Abilities: Swift Swim - Hydration (Hidden Ability)
+It lives in warm seas. It is said
+that a couple finding this Pokémon
+will be blessed with eternal love.
 
-Base Stats
-----------------------
-Total: 330
-Hp:  43
-Attack:  30
-Defence:  55
-Special Attack:  40
-Special Defence:  65
-Speed:  97
+   ↞--------| STATS |--------↠ 
+             hp:         43
+         attack:         30
+        defense:         55
+ special-attack:         40
+special-defense:         65
+          speed:         97
+
+Pokedex ID: 370	Capture Rate: 225
+Base Exp: 116	Happiness: 70
+Height: 6	Weight: 87
+
+Genus: Rendezvous Pokémon
+Location Areas:
+sinnoh-pokemon-league-area
+sinnoh-route-224-area
+kanto-route-27-area
+ever-grande-city-area
+hoenn-route-128-area
+driftveil-city-area
+undella-bay-area
+unova-route-4-area
+unova-route-13-area
+undella-town-area
+humilau-city-area
+seaside-cave-1f
+unova-route-21-area
+ambrette-town-area
+cyllage-city-area
+shalour-city-area
+kalos-route-8-area
+kalos-route-12-area
+azure-bay-area
diff --git a/pokeData/luxio b/pokeData/luxio
index 245908f..da3b456 100644
--- a/pokeData/luxio
+++ b/pokeData/luxio
@@ -1,15 +1,22 @@
+luxio	A electric type Pokémon
 
-Name:  Luxio
-Pokedex Number:  404
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Rivalry - Intimidate - Guts (Hidden Ability)
+Strong electricity courses through
+the tips of its sharp claws. A light
+scratch causes fainting in foes.
 
-Base Stats
-----------------------
-Total: 363
-Hp:  60
-Attack:  85
-Defence:  49
-Special Attack:  60
-Special Defence:  49
-Speed:  60
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         85
+        defense:         49
+ special-attack:         60
+special-defense:         49
+          speed:         60
+
+Pokedex ID: 404	Capture Rate: 120
+Base Exp: 127	Happiness: 100
+Height: 9	Weight: 305
+
+Genus: Spark Pokémon
+Location Areas:
+fuego-ironworks-area
+sinnoh-route-222-area
diff --git a/pokeData/luxray b/pokeData/luxray
index 358d5e5..e834fcd 100644
--- a/pokeData/luxray
+++ b/pokeData/luxray
@@ -1,15 +1,21 @@
+luxray	A electric type Pokémon
 
-Name:  Luxray
-Pokedex Number:  405
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Rivalry - Intimidate - Guts (Hidden Ability)
+Il est capable de voir à travers
+les murs pour chasser des proies
+ou retrouver ses petits égarés.
+
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:        120
+        defense:         79
+ special-attack:         95
+special-defense:         79
+          speed:         70
+
+Pokedex ID: 405	Capture Rate: 45
+Base Exp: 262	Happiness: 50
+Height: 14	Weight: 420
+
+Genus: Gleam Eyes Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 523
-Hp:  80
-Attack:  120
-Defence:  79
-Special Attack:  95
-Special Defence:  79
-Speed:  70
diff --git a/pokeData/lycanroc b/pokeData/lycanroc
index 9945699..ae89294 100644
--- a/pokeData/lycanroc
+++ b/pokeData/lycanroc
@@ -1,15 +1,15 @@
+	A  type Pokémon
 
-Name:  Lycanroc
-Pokedex Number:  745
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Keen Eye - Sand Rush - Steadfast (Hidden) (Midday Form) - Keen Eye- Vital Spirit - No Guard (Hidden)  (Midnight Form) - Tough Claws (Dusk Form
+Its quick movements confuse its enemies.
+Well equipped with claws and fangs, it also uses
+the sharp rocks in its mane as weapons.
+
+   ↞--------| STATS |--------↠ 
+
+Pokedex ID: 	Capture Rate: 90
+Base Exp: 	Happiness: 50
+Height: 	Weight: 
+
+Genus: Wolf Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 487
-Hp:  75
-Attack:  117
-Defence:  65
-Special Attack:  55
-Special Defence:  65
-Speed:  110
diff --git a/pokeData/machamp b/pokeData/machamp
index bc53f12..90c043d 100644
--- a/pokeData/machamp
+++ b/pokeData/machamp
@@ -1,15 +1,23 @@
+machamp	A fighting type Pokémon
 
-Name:  Machamp
-Pokedex Number:  068
-Gender Ratio:   ♂:75% ♀:25%
-Abilities: Guts - No Guard - Steadfast (Hidden Ability)
+MACHAMP is known as the POKéMON that
+has mastered every kind of martial arts.
+If it grabs hold of the foe with its fourarms, the battle is all but over.
+The hapless foe is thrown far over the
+horizon.
+
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:        130
+        defense:         80
+ special-attack:         65
+special-defense:         85
+          speed:         55
+
+Pokedex ID: 68	Capture Rate: 45
+Base Exp: 253	Happiness: 50
+Height: 16	Weight: 1300
+
+Genus: Superpower Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 505
-Hp:  90
-Attack:  130
-Defence:  80
-Special Attack:  65
-Special Defence:  85
-Speed:  55
diff --git a/pokeData/machoke b/pokeData/machoke
index 03e0076..1d510aa 100644
--- a/pokeData/machoke
+++ b/pokeData/machoke
@@ -1,15 +1,60 @@
+machoke	A fighting type Pokémon
 
-Name:  Machoke
-Pokedex Number:  067
-Gender Ratio:   ♂:75% ♀:25%
-Abilities: Guts - No Guard - Steadfast (Hidden Ability)
+MACHOKE undertakes bodybuilding every
+day even as it helps people with tough,
+physically demanding labor.On its days off, this POKéMON heads to
+the fields and mountains to exercise
+and train.
 
-Base Stats
-----------------------
-Total: 405
-Hp:  80
-Attack:  100
-Defence:  70
-Special Attack:  50
-Special Defence:  60
-Speed:  45
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:        100
+        defense:         70
+ special-attack:         50
+special-defense:         60
+          speed:         45
+
+Pokedex ID: 67	Capture Rate: 90
+Base Exp: 142	Happiness: 50
+Height: 15	Weight: 705
+
+Genus: Superpower Pokémon
+Location Areas:
+mt-coronet-2f
+mt-coronet-3f
+mt-coronet-exterior-snowfall
+mt-coronet-exterior-blizzard
+mt-coronet-4f
+mt-coronet-4f-small-room
+mt-coronet-5f
+mt-coronet-6f
+mt-coronet-1f-from-exterior
+mt-coronet-1f-route-216
+mt-coronet-b1f
+sinnoh-victory-road-1f
+sinnoh-victory-road-b1f
+sinnoh-victory-road-inside-b1f
+sinnoh-victory-road-inside
+sinnoh-victory-road-inside-exit
+stark-mountain-entrance
+stark-mountain-inside
+acuity-lakefront-area
+sinnoh-route-210-west-towards-celestic-town
+sinnoh-route-211-east-towards-celestic-town
+sinnoh-route-216-area
+sinnoh-route-217-area
+sinnoh-route-225-area
+sinnoh-sea-route-226-area
+mt-mortar-upper-cave
+mt-silver-2f
+johto-route-47-inside-cave
+rock-tunnel-1f
+cerulean-cave-1f
+cerulean-cave-2f
+cerulean-cave-b1f
+kanto-victory-road-2-1f
+kanto-victory-road-2-2f
+kanto-victory-road-2-3f
+mt-ember-inside
+mt-ember-1f-cave-behind-team-rocket
+johto-safari-zone-zone-wasteland
diff --git a/pokeData/machop b/pokeData/machop
index 8e7063c..313ec4a 100644
--- a/pokeData/machop
+++ b/pokeData/machop
@@ -1,15 +1,49 @@
+machop	A fighting type Pokémon
 
-Name:  Machop
-Pokedex Number:  066
-Gender Ratio:   ♂:75% ♀:25%
-Abilities: Guts - No Guard - Steadfast (Hidden Ability)
+MACHOP’s muscles are special - they
+never get sore no matter how much they
+are used in exercise.This POKéMON has sufficient power to
+hurl a hundred adult humans.
 
-Base Stats
-----------------------
-Total: 305
-Hp:  70
-Attack:  80
-Defence:  50
-Special Attack:  35
-Special Defence:  35
-Speed:  35
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         80
+        defense:         50
+ special-attack:         35
+special-defense:         35
+          speed:         35
+
+Pokedex ID: 66	Capture Rate: 180
+Base Exp: 61	Happiness: 50
+Height: 8	Weight: 195
+
+Genus: Superpower Pokémon
+Location Areas:
+mt-coronet-1f-route-207
+mt-coronet-1f-route-211
+sinnoh-route-206-area
+sinnoh-route-207-area
+sinnoh-route-208-area
+sinnoh-route-210-west-towards-celestic-town
+sinnoh-route-211-west-towards-eterna-city
+mt-mortar-1f
+mt-mortar-lower-cave
+mt-mortar-upper-cave
+mt-mortar-b1f
+johto-route-47-inside-cave
+rock-tunnel-1f
+rock-tunnel-b1f
+kanto-route-10-area
+rock-tunnel-b2f
+kanto-victory-road-2-1f
+kanto-victory-road-2-2f
+kanto-victory-road-2-3f
+jagged-pass-area
+fiery-path-area
+hoenn-route-112-area
+mt-ember-area
+mt-ember-cave
+mt-ember-inside
+mt-ember-1f-cave-behind-team-rocket
+glittering-cave-unknown-area-303
+johto-safari-zone-zone-wasteland
diff --git a/pokeData/magby b/pokeData/magby
index af68756..0fee74e 100644
--- a/pokeData/magby
+++ b/pokeData/magby
@@ -1,15 +1,27 @@
+magby	A fire type Pokémon
 
-Name:  Magby
-Pokedex Number:  240
-Gender Ratio:   ♂:75% ♀:25%
-Abilities: Flame Body - Vital Spirit (Hidden Ability)
+Each and every time it inhales and
+exhales, hot embers dribble out of its
+mouth and nostrils.
 
-Base Stats
-----------------------
-Total: 365
-Hp:  45
-Attack:  75
-Defence:  37
-Special Attack:  70
-Special Defence:  55
-Speed:  83
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         75
+        defense:         37
+ special-attack:         70
+special-defense:         55
+          speed:         83
+
+Pokedex ID: 240	Capture Rate: 45
+Base Exp: 73	Happiness: 50
+Height: 7	Weight: 214
+
+Genus: Live Coal Pokémon
+Location Areas:
+stark-mountain-area
+stark-mountain-entrance
+stark-mountain-inside
+sinnoh-route-227-area
+johto-route-34-area
+virbank-complex-outer
+virbank-complex-inner
diff --git a/pokeData/magcargo b/pokeData/magcargo
index d571fbd..18a464f 100644
--- a/pokeData/magcargo
+++ b/pokeData/magcargo
@@ -1,15 +1,23 @@
+magcargo	A fire type Pokémon
 
-Name:  Magcargo
-Pokedex Number:  219
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Magma Armor - Flame Body - Weak Armor (Hidden Ability)
+The shell on its back is just skin that
+has cooled and hardened. It breaks easily
+with a slight touch.
 
-Base Stats
-----------------------
-Total: 410
-Hp:  50
-Attack:  50
-Defence:  120
-Special Attack:  80
-Special Defence:  80
-Speed:  30
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         50
+        defense:        120
+ special-attack:         90
+special-defense:         80
+          speed:         30
+
+Pokedex ID: 219	Capture Rate: 75
+Base Exp: 151	Happiness: 70
+Height: 8	Weight: 550
+
+Genus: Lava Pokémon
+Location Areas:
+stark-mountain-entrance
+stark-mountain-inside
+mt-ember-b3f
diff --git a/pokeData/magearna b/pokeData/magearna
index f0459d2..5e0de6f 100644
--- a/pokeData/magearna
+++ b/pokeData/magearna
@@ -1,15 +1,21 @@
+magearna	A steel type Pokémon
 
-Name:  Magearna
-Pokedex Number:  801
-Gender Ratio:  Genderless
-Abilities: Soul-Heart
+This artificial Pokémon, constructed more than
+500 years ago, can understand human speech
+but cannot itself speak.
+
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:         95
+        defense:        115
+ special-attack:        130
+special-defense:        115
+          speed:         65
+
+Pokedex ID: 801	Capture Rate: 3
+Base Exp: 300	Happiness: 0
+Height: 10	Weight: 805
+
+Genus: Artificial Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 600
-Hp:  80
-Attack:  95
-Defence:  115
-Special Attack:  130
-Special Defence:  115
-Speed:  65
diff --git a/pokeData/magikarp b/pokeData/magikarp
index ccf4282..dbc9c76 100644
--- a/pokeData/magikarp
+++ b/pokeData/magikarp
@@ -1,15 +1,241 @@
+magikarp	A water type Pokémon
 
-Name:  Magikarp
-Pokedex Number:  129
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Swift Swim - Rattled (Hidden Ability)
+MAGIKARP is virtually useless in battle
+as it can only splash around.
+As a result, it is considered to be weak.However, it is actually a very hardy
+POKéMON that can survive in any body of
+water no matter how polluted it is.
 
-Base Stats
-----------------------
-Total: 200
-Hp:  20
-Attack:  10
-Defence:  55
-Special Attack:  15
-Special Defence:  20
-Speed:  80
+   ↞--------| STATS |--------↠ 
+             hp:         20
+         attack:         10
+        defense:         55
+ special-attack:         15
+special-defense:         20
+          speed:         80
+
+Pokedex ID: 129	Capture Rate: 255
+Base Exp: 40	Happiness: 50
+Height: 9	Weight: 100
+
+Genus: Fish Pokémon
+Location Areas:
+canalave-city-area
+eterna-city-area
+pastoria-city-area
+sunyshore-city-area
+sinnoh-pokemon-league-area
+valley-windworks-area
+fuego-ironworks-area
+mt-coronet-1f-route-207
+mt-coronet-4f
+mt-coronet-b1f
+great-marsh-area-1
+great-marsh-area-2
+great-marsh-area-3
+great-marsh-area-4
+great-marsh-area-5
+great-marsh-area-6
+sinnoh-victory-road-b1f
+sinnoh-victory-road-inside-b1f
+ravaged-path-area
+oreburgh-gate-b1f
+sendoff-spring-area
+iron-island-area
+lake-verity-before-galactic-intervention
+lake-verity-after-galactic-intervention
+lake-valor-area
+lake-acuity-area
+sinnoh-route-203-area
+sinnoh-route-204-south-towards-jubilife-city
+sinnoh-route-204-north-towards-floaroma-town
+sinnoh-route-205-south-towards-floaroma-town
+sinnoh-route-205-east-towards-eterna-city
+sinnoh-route-208-area
+sinnoh-route-209-area
+sinnoh-route-210-west-towards-celestic-town
+sinnoh-route-212-north-towards-hearthome-city
+sinnoh-route-212-east-towards-pastoria-city
+sinnoh-route-213-area
+sinnoh-route-214-area
+sinnoh-route-218-area
+sinnoh-route-219-area
+sinnoh-route-221-area
+sinnoh-route-222-area
+sinnoh-route-224-area
+sinnoh-route-225-area
+sinnoh-route-227-area
+sinnoh-route-228-area
+sinnoh-route-229-area
+twinleaf-town-area
+celestic-town-area
+resort-area-area
+sinnoh-sea-route-220-area
+sinnoh-sea-route-223-area
+sinnoh-sea-route-226-area
+sinnoh-sea-route-230-area
+new-bark-town-area
+cherrygrove-city-area
+johto-route-30-area
+johto-route-31-area
+violet-city-area
+johto-route-32-area
+ruins-of-alph-outside
+union-cave-1f
+union-cave-b1f
+union-cave-b2f
+slowpoke-well-1f
+slowpoke-well-b1f
+ilex-forest-area
+johto-route-34-area
+johto-route-35-area
+ecruteak-city-area
+olivine-city-area
+johto-sea-route-40-area
+johto-sea-route-41-area
+whirl-islands-1f
+whirl-islands-b2f
+whirl-islands-b3f
+cianwood-city-area
+johto-route-42-area
+mt-mortar-1f
+mt-mortar-upper-cave
+mt-mortar-b1f
+johto-route-43-area
+lake-of-rage-area
+johto-route-44-area
+blackthorn-city-area
+dragons-den-area
+johto-route-45-area
+dark-cave-violet-city-entrance
+dark-cave-blackthorn-city-entrance
+johto-route-47-area
+mt-moon-mt-moon-square
+unknown-all-poliwag-area
+seafoam-islands-b3f
+seafoam-islands-b4f
+mt-silver-2f
+mt-silver-1f-top
+mt-silver-4f
+johto-route-47-cave-gate
+mt-silver-outside
+mt-silver-1f
+mt-silver-top
+unknown-all-rattata-area
+kanto-route-12-area
+kanto-sea-route-19-area
+kanto-sea-route-20-area
+cinnabar-island-area
+viridian-city-area
+cerulean-city-area
+vermilion-city-area
+celadon-city-area
+fuchsia-city-area
+pallet-town-area
+kanto-route-26-area
+kanto-route-27-area
+kanto-route-28-area
+kanto-route-4-area
+kanto-route-6-area
+kanto-route-9-area
+kanto-route-10-area
+kanto-route-11-area
+kanto-route-13-area
+kanto-route-17-area
+kanto-route-18-area
+kanto-sea-route-21-area
+kanto-route-22-area
+kanto-route-24-area
+kanto-route-25-area
+tohjo-falls-area
+cerulean-cave-1f
+cerulean-cave-2f
+cerulean-cave-b1f
+kanto-route-23-area
+kanto-safari-zone-middle
+kanto-safari-zone-area-1-east
+kanto-safari-zone-area-2-north
+kanto-safari-zone-area-3-west
+vermilion-city-ss-anne-dock
+petalburg-city-area
+slateport-city-area
+lilycove-city-area
+mossdeep-city-area
+sootopolis-city-area
+ever-grande-city-area
+meteor-falls-area
+meteor-falls-back
+meteor-falls-b1f
+meteor-falls-backsmall-room
+seafloor-cavern-area
+hoenn-victory-road-b2f
+shoal-cave-area
+abandoned-ship-area
+hoenn-route-102-area
+hoenn-route-103-area
+hoenn-route-104-area
+hoenn-route-105-area
+hoenn-route-106-area
+hoenn-route-107-area
+hoenn-route-108-area
+hoenn-route-109-area
+hoenn-route-110-area
+hoenn-route-111-area
+hoenn-route-114-area
+hoenn-route-115-area
+hoenn-route-117-area
+hoenn-route-118-area
+hoenn-route-119-area
+hoenn-route-120-area
+hoenn-route-121-area
+hoenn-route-122-area
+hoenn-route-123-area
+hoenn-route-124-area
+hoenn-route-125-area
+hoenn-route-126-area
+hoenn-route-127-area
+hoenn-route-128-area
+hoenn-route-129-area
+hoenn-route-130-area
+hoenn-route-131-area
+hoenn-route-132-area
+hoenn-route-133-area
+hoenn-route-134-area
+hoenn-safari-zone-nwmach-bike-area
+hoenn-safari-zone-sw
+dewford-town-area
+pacifidlog-town-area
+hoenn-safari-zone-expansion-south
+ss-anne-area
+berry-forest-area
+icefall-cave-entrance
+icefall-cave-waterfall
+kindle-road-area
+treasure-beach-area
+cape-brink-area
+bond-bridge-area
+resort-gorgeous-area
+water-labyrinth-area
+five-isle-meadow-area
+memorial-pillar-area
+outcast-island-area
+green-path-area
+water-path-area
+ruin-valley-area
+trainer-tower-area
+tanoby-ruins-area
+one-island-area
+four-island-area
+five-island-area
+marvelous-bridge-area
+nature-sanctuary-area
+kalos-route-3-area
+kalos-route-22-area
+parfum-palace-area
+kanto-route-4-pokemon-center
+johto-safari-zone-zone-meadow
+johto-safari-zone-zone-swamp
+johto-safari-zone-zone-marshland
+johto-safari-zone-zone-rocky-beach
+johto-safari-zone-zone-wetland
+kanto-route-3-pokemon-center
diff --git a/pokeData/magmar b/pokeData/magmar
index fe55039..85ff15b 100644
--- a/pokeData/magmar
+++ b/pokeData/magmar
@@ -1,15 +1,29 @@
+magmar	A fire type Pokémon
 
-Name:  Magmar
-Pokedex Number:  126
-Gender Ratio:   ♂:75% ♀:25%
-Abilities: Flame Body - Vital Spirit (Hidden Ability)
+In battle, MAGMAR blows out intensely
+hot flames from all over its body to
+intimidate its opponent.This POKéMON’s fiery bursts create
+heat waves that ignite grass and trees
+in its surroundings.
 
-Base Stats
-----------------------
-Total: 495
-Hp:  65
-Attack:  95
-Defence:  57
-Special Attack:  100
-Special Defence:  85
-Speed:  93
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         95
+        defense:         57
+ special-attack:        100
+special-defense:         85
+          speed:         93
+
+Pokedex ID: 126	Capture Rate: 45
+Base Exp: 173	Happiness: 50
+Height: 13	Weight: 445
+
+Genus: Spitfire Pokémon
+Location Areas:
+fuego-ironworks-area
+burned-tower-b1f
+mt-silver-1f
+pokemon-mansion-3f
+pokemon-mansion-b1f
+mt-ember-area
+johto-safari-zone-zone-peak
diff --git a/pokeData/magmortar b/pokeData/magmortar
index f1e9db9..6b00b72 100644
--- a/pokeData/magmortar
+++ b/pokeData/magmortar
@@ -1,15 +1,21 @@
+magmortar	A fire type Pokémon
 
-Name:  Magmortar
-Pokedex Number:  467
-Gender Ratio:   ♂:75% ♀:25%
-Abilities: Flame Body - Vital Spirit (Hidden Ability)
+Quand il lance des boules de feu
+à plus de 2 000 °C, son corps
+est comme chauffé à blanc.
+
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:         95
+        defense:         67
+ special-attack:        125
+special-defense:         95
+          speed:         83
+
+Pokedex ID: 467	Capture Rate: 30
+Base Exp: 270	Happiness: 50
+Height: 16	Weight: 680
+
+Genus: Blast Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 540
-Hp:  75
-Attack:  95
-Defence:  67
-Special Attack:  125
-Special Defence:  95
-Speed:  83
diff --git a/pokeData/magnemite b/pokeData/magnemite
index 5188e79..f815575 100644
--- a/pokeData/magnemite
+++ b/pokeData/magnemite
@@ -1,15 +1,36 @@
+magnemite	A electric type Pokémon
 
-Name:  Magnemite
-Pokedex Number:  081
-Gender Ratio:  Genderless
-Abilities: Magnet Pull - Sturdy - Analytic (Hidden Ability)
+MAGNEMITE floats in the air by emitting
+electromagnetic waves from the units
+at its sides. These waves block gravity.This POKéMON becomes incapable of
+flight if its internal electrical supply
+is depleted.
 
-Base Stats
-----------------------
-Total: 325
-Hp:  25
-Attack:  35
-Defence:  70
-Special Attack:  95
-Special Defence:  55
-Speed:  45
+   ↞--------| STATS |--------↠ 
+             hp:         25
+         attack:         35
+        defense:         70
+ special-attack:         95
+special-defense:         55
+          speed:         45
+
+Pokedex ID: 81	Capture Rate: 190
+Base Exp: 65	Happiness: 50
+Height: 3	Weight: 60
+
+Genus: Magnet Pokémon
+Location Areas:
+fuego-ironworks-area
+sinnoh-route-222-area
+johto-route-38-area
+johto-route-39-area
+kanto-route-6-area
+kanto-route-10-area
+kanto-route-11-area
+power-plant-area
+new-mauville-entrance
+new-mauville-area
+virbank-complex-outer
+virbank-complex-inner
+johto-safari-zone-zone-peak
+johto-safari-zone-zone-wasteland
diff --git a/pokeData/magneton b/pokeData/magneton
index 78ec982..d592ba4 100644
--- a/pokeData/magneton
+++ b/pokeData/magneton
@@ -1,15 +1,33 @@
+magneton	A electric type Pokémon
 
-Name:  Magneton
-Pokedex Number:  082
-Gender Ratio:  Genderless
-Abilities: Magnet Pull - Sturdy - Analytic (Hidden Ability)
+MAGNETON emits a powerful magnetic
+force that is fatal to electronics and
+precision instruments. Because ofthis, it is said that some towns warn
+people to keep this POKéMON inside
+a POKé BALL.
 
-Base Stats
-----------------------
-Total: 465
-Hp:  50
-Attack:  60
-Defence:  95
-Special Attack:  120
-Special Defence:  70
-Speed:  70
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         60
+        defense:         95
+ special-attack:        120
+special-defense:         70
+          speed:         70
+
+Pokedex ID: 82	Capture Rate: 60
+Base Exp: 163	Happiness: 50
+Height: 10	Weight: 600
+
+Genus: Magnet Pokémon
+Location Areas:
+sinnoh-victory-road-2f
+sinnoh-route-222-area
+cerulean-cave-1f
+cerulean-cave-2f
+cerulean-cave-b1f
+power-plant-area
+new-mauville-area
+p2-laboratory-area
+lost-hotel-area
+johto-safari-zone-zone-peak
+johto-safari-zone-zone-mountain
diff --git a/pokeData/magnezone b/pokeData/magnezone
index 09d985b..0009d41 100644
--- a/pokeData/magnezone
+++ b/pokeData/magnezone
@@ -1,15 +1,21 @@
+magnezone	A electric type Pokémon
 
-Name:  Magnezone
-Pokedex Number:  462
-Gender Ratio:  Genderless
-Abilities: Magnet Pull - Sturdy - Analytic (Hidden Ability)
+Des scientifiques ont essayé de
+faire évoluer un Magnézone en
+laboratoire, mais ce fut un échec.
 
-Base Stats
-----------------------
-Total: 535
-Hp:  70
-Attack:  70
-Defence:  115
-Special Attack:  130
-Special Defence:  90
-Speed:  60
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         70
+        defense:        115
+ special-attack:        130
+special-defense:         90
+          speed:         60
+
+Pokedex ID: 462	Capture Rate: 30
+Base Exp: 268	Happiness: 50
+Height: 12	Weight: 1800
+
+Genus: Magnet Area Pokémon
+Location Areas:
+p2-laboratory-area
diff --git a/pokeData/makuhita b/pokeData/makuhita
index f0a520f..d43921a 100644
--- a/pokeData/makuhita
+++ b/pokeData/makuhita
@@ -1,15 +1,69 @@
+makuhita	A fighting type Pokémon
 
-Name:  Makuhita
-Pokedex Number:  296
-Gender Ratio:   ♂:75% ♀:25%
-Abilities: Thick Fat - Guts - Sheer Force (Hidden Ability)
+It toughens its body by slamming
+into thick trees. Many snapped
+trees can be found near its nest.
 
-Base Stats
-----------------------
-Total: 237
-Hp:  72
-Attack:  60
-Defence:  30
-Special Attack:  20
-Special Defence:  30
-Speed:  25
+   ↞--------| STATS |--------↠ 
+             hp:         72
+         attack:         60
+        defense:         30
+ special-attack:         20
+special-defense:         30
+          speed:         25
+
+Pokedex ID: 296	Capture Rate: 180
+Base Exp: 47	Happiness: 70
+Height: 10	Weight: 864
+
+Genus: Guts Pokémon
+Location Areas:
+sinnoh-route-225-area
+union-cave-1f
+union-cave-b1f
+union-cave-b2f
+slowpoke-well-1f
+slowpoke-well-b1f
+whirl-islands-1f
+whirl-islands-b1f
+whirl-islands-b2f
+whirl-islands-b3f
+mt-mortar-1f
+mt-mortar-lower-cave
+mt-mortar-upper-cave
+mt-mortar-b1f
+ice-path-1f
+ice-path-b1f
+ice-path-b2f
+ice-path-b3f
+dark-cave-violet-city-entrance
+dark-cave-blackthorn-city-entrance
+seafoam-islands-1f
+seafoam-islands-b1f
+seafoam-islands-b2f
+seafoam-islands-b3f
+seafoam-islands-b4f
+mt-silver-2f
+mt-silver-1f-top
+mt-silver-4f
+johto-route-47-inside-cave
+mt-silver-1f
+mt-silver-mountainside
+mt-silver-3f
+mt-silver-top
+mt-moon-1f
+mt-moon-2f
+rock-tunnel-1f
+rock-tunnel-b1f
+kanto-victory-road-1-1f
+tohjo-falls-area
+digletts-cave-area
+kanto-victory-road-1-2f
+kanto-victory-road-1-3f
+cerulean-cave-1f
+cerulean-cave-2f
+cerulean-cave-b1f
+granite-cave-1f
+granite-cave-b1f
+granite-cave-1fsmall-room
+hoenn-victory-road-1f
diff --git a/pokeData/malamar b/pokeData/malamar
index 49510e2..f22b9c8 100644
--- a/pokeData/malamar
+++ b/pokeData/malamar
@@ -1,15 +1,21 @@
+malamar	A dark type Pokémon
 
-Name:  Malamar
-Pokedex Number:  687
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Contrary - Suction Cups - Infiltrator (Hidden Ability)
+ポケモンで　一番　強力な
+催眠術を　使う。相手を　意のままに
+操ってしまうのだ。
+
+   ↞--------| STATS |--------↠ 
+             hp:         86
+         attack:         92
+        defense:         88
+ special-attack:         68
+special-defense:         75
+          speed:         73
+
+Pokedex ID: 687	Capture Rate: 80
+Base Exp: 169	Happiness: 50
+Height: 15	Weight: 470
+
+Genus: Overturning Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 482
-Hp:  86
-Attack:  92
-Defence:  88
-Special Attack:  68
-Special Defence:  75
-Speed:  73
diff --git a/pokeData/mamoswine b/pokeData/mamoswine
index 72d434c..1c5aee0 100644
--- a/pokeData/mamoswine
+++ b/pokeData/mamoswine
@@ -1,15 +1,22 @@
+mamoswine	A ice type Pokémon
 
-Name:  Mamoswine
-Pokedex Number:  473
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Oblivious - Snow Cloak - Thick Fat (Hidden Ability)
+On a libéré un spécimen de sa prison
+glacée au bout de 10 000 ans.
+Il n’en revenait pas.
 
-Base Stats
-----------------------
-Total: 530
-Hp:  110
-Attack:  130
-Defence:  80
-Special Attack:  70
-Special Defence:  60
-Speed:  80
+   ↞--------| STATS |--------↠ 
+             hp:        110
+         attack:        130
+        defense:         80
+ special-attack:         70
+special-defense:         60
+          speed:         80
+
+Pokedex ID: 473	Capture Rate: 50
+Base Exp: 265	Happiness: 50
+Height: 25	Weight: 2910
+
+Genus: Twin Tusk Pokémon
+Location Areas:
+giant-chasm-forest
+giant-chasm-forest-cave
diff --git a/pokeData/manaphy b/pokeData/manaphy
index b9ef987..20f2235 100644
--- a/pokeData/manaphy
+++ b/pokeData/manaphy
@@ -1,15 +1,21 @@
+manaphy	A water type Pokémon
 
-Name:  Manaphy
-Pokedex Number:  490
-Gender Ratio:  Genderless
-Abilities: Hydration
+Il est né avec le pouvoir incroyable
+de créer des liens avec n’importe
+quel Pokémon.
+
+   ↞--------| STATS |--------↠ 
+             hp:        100
+         attack:        100
+        defense:        100
+ special-attack:        100
+special-defense:        100
+          speed:        100
+
+Pokedex ID: 490	Capture Rate: 3
+Base Exp: 270	Happiness: 70
+Height: 3	Weight: 14
+
+Genus: Seafaring Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 600
-Hp:  100
-Attack:  100
-Defence:  100
-Special Attack:  100
-Special Defence:  100
-Speed:  100
diff --git a/pokeData/mandibuzz b/pokeData/mandibuzz
index 5f69c85..ea6e8b6 100644
--- a/pokeData/mandibuzz
+++ b/pokeData/mandibuzz
@@ -1,15 +1,22 @@
+mandibuzz	A dark type Pokémon
 
-Name:  Mandibuzz
-Pokedex Number:  630
-Gender Ratio:   ♂:0% ♀:100% 
-Abilities: Big Pecks - Overcoat - Weak Armor (Hidden Ability)
+넓은 하늘에서 원을 그리며 날고
+먹이를 발견하면 덮쳐서
+둥지까지 가뿐히 나른다.
 
-Base Stats
-----------------------
-Total: 510
-Hp:  110
-Attack:  65
-Defence:  105
-Special Attack:  55
-Special Defence:  95
-Speed:  80
+   ↞--------| STATS |--------↠ 
+             hp:        110
+         attack:         65
+        defense:        105
+ special-attack:         55
+special-defense:         95
+          speed:         80
+
+Pokedex ID: 630	Capture Rate: 60
+Base Exp: 179	Happiness: 35
+Height: 12	Weight: 395
+
+Genus: Bone Vulture Pokémon
+Location Areas:
+village-bridge-area
+unova-route-11-area
diff --git a/pokeData/manectric b/pokeData/manectric
index 5a635a6..22ffc77 100644
--- a/pokeData/manectric
+++ b/pokeData/manectric
@@ -1,15 +1,21 @@
+manectric	A electric type Pokémon
 
-Name:  Manectric
-Pokedex Number:  310
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Static - Lightningrod - Minus (Hidden Ability)
+It discharges electricity from its
+mane. It creates a thundercloud
+overhead to drop lightning bolts.
 
-Base Stats
-----------------------
-Total: 475
-Hp:  70
-Attack:  75
-Defence:  80
-Special Attack:  135
-Special Defence:  80
-Speed:  135
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         75
+        defense:         60
+ special-attack:        105
+special-defense:         60
+          speed:        105
+
+Pokedex ID: 310	Capture Rate: 45
+Base Exp: 166	Happiness: 50
+Height: 15	Weight: 402
+
+Genus: Discharge Pokémon
+Location Areas:
+hoenn-route-118-area
diff --git a/pokeData/mankey b/pokeData/mankey
index fa2bfaf..b13483e 100644
--- a/pokeData/mankey
+++ b/pokeData/mankey
@@ -1,15 +1,36 @@
+mankey	A fighting type Pokémon
 
-Name:  Mankey
-Pokedex Number:  056
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Vital Spirit - Anger Point - Defiant (Hidden Ability)
+When MANKEY starts shaking and its
+nasal breathing turns rough, it’s a sure
+sign that it is becoming angry.However, because it goes into a
+towering rage almost instantly, it is
+impossible for anyone to flee its wrath.
 
-Base Stats
-----------------------
-Total: 305
-Hp:  40
-Attack:  80
-Defence:  35
-Special Attack:  35
-Special Defence:  45
-Speed:  70
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         80
+        defense:         35
+ special-attack:         35
+special-defense:         45
+          speed:         70
+
+Pokedex ID: 56	Capture Rate: 190
+Base Exp: 61	Happiness: 70
+Height: 5	Weight: 280
+
+Genus: Pig Monkey Pokémon
+Location Areas:
+sinnoh-route-225-area
+sinnoh-sea-route-226-area
+johto-route-42-area
+rock-tunnel-1f
+rock-tunnel-b1f
+kanto-route-3-area
+kanto-route-4-area
+kanto-route-5-area
+kanto-route-6-area
+kanto-route-7-area
+kanto-route-8-area
+kanto-route-9-area
+kanto-route-22-area
+kanto-route-23-area
diff --git a/pokeData/mantine b/pokeData/mantine
index 467567b..179d78f 100644
--- a/pokeData/mantine
+++ b/pokeData/mantine
@@ -1,15 +1,26 @@
+mantine	A water type Pokémon
 
-Name:  Mantine
-Pokedex Number:  226
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Swift Swim - Water Absorb - Water Veil (Hidden Ability)
+As it majestically swims, it doesn’t care
+if REMORAID attach to it to scavenge
+for its leftovers.
 
-Base Stats
-----------------------
-Total: 465
-Hp:  65
-Attack:  40
-Defence:  70
-Special Attack:  80
-Special Defence:  140
-Speed:  70
+   ↞--------| STATS |--------↠ 
+             hp:         85
+         attack:         40
+        defense:         70
+ special-attack:         80
+special-defense:        140
+          speed:         70
+
+Pokedex ID: 226	Capture Rate: 25
+Base Exp: 170	Happiness: 50
+Height: 21	Weight: 2200
+
+Genus: Kite Pokémon
+Location Areas:
+johto-sea-route-41-area
+trainer-tower-area
+tanoby-ruins-area
+undella-bay-area
+undella-town-area
+unova-route-21-area
diff --git a/pokeData/mantyke b/pokeData/mantyke
index 8129607..6ef2b80 100644
--- a/pokeData/mantyke
+++ b/pokeData/mantyke
@@ -1,15 +1,28 @@
+mantyke	A water type Pokémon
 
-Name:  Mantyke
-Pokedex Number:  458
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Swift Swim - Water Absorb - Water Veil (Hidden Ability)
+On organise des excursions pour le
+voir surfer sur les vagues au côté
+des Rémoraid.
 
-Base Stats
-----------------------
-Total: 345
-Hp:  45
-Attack:  20
-Defence:  50
-Special Attack:  60
-Special Defence:  120
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         20
+        defense:         50
+ special-attack:         60
+special-defense:        120
+          speed:         50
+
+Pokedex ID: 458	Capture Rate: 25
+Base Exp: 69	Happiness: 50
+Height: 10	Weight: 650
+
+Genus: Kite Pokémon
+Location Areas:
+sunyshore-city-area
+sinnoh-sea-route-223-area
+undella-bay-area
+undella-town-area
+unova-route-21-area
+shalour-city-area
+kalos-route-12-area
+azure-bay-area
diff --git a/pokeData/maractus b/pokeData/maractus
index ada88d7..fe54cd8 100644
--- a/pokeData/maractus
+++ b/pokeData/maractus
@@ -1,15 +1,22 @@
+maractus	A grass type Pokémon
 
-Name:  Maractus
-Pokedex Number:  556
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Water Absorb - Chlorophyll - Storm Drain (Hidden Ability)
+템포가 빠른 춤과 소리로
+꽃씨를 노리는 천적인
+새포켓몬을 쫓아버린다.
 
-Base Stats
-----------------------
-Total: 461
-Hp:  75
-Attack:  86
-Defence:  67
-Special Attack:  106
-Special Defence:  67
-Speed:  60
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:         86
+        defense:         67
+ special-attack:        106
+special-defense:         67
+          speed:         60
+
+Pokedex ID: 556	Capture Rate: 255
+Base Exp: 161	Happiness: 50
+Height: 10	Weight: 280
+
+Genus: Cactus Pokémon
+Location Areas:
+desert-resort-entrance
+desert-resort-area
diff --git a/pokeData/mareanie b/pokeData/mareanie
index 0a44357..891242f 100644
--- a/pokeData/mareanie
+++ b/pokeData/mareanie
@@ -1,15 +1,21 @@
+mareanie	A poison type Pokémon
 
-Name:  Mareanie
-Pokedex Number:  747
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Merciless - Limber - Regenerator (Hidden Ability)
+It plunges the poison spike on its head into its
+prey. When the prey has weakened, Mareanie
+deals the finishing blow with its 10 tentacles.
+
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         53
+        defense:         62
+ special-attack:         43
+special-defense:         52
+          speed:         45
+
+Pokedex ID: 747	Capture Rate: 190
+Base Exp: 61	Happiness: 50
+Height: 4	Weight: 80
+
+Genus: Brutal Star Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 305
-Hp:  50
-Attack:  53
-Defence:  62
-Special Attack:  43
-Special Defence:  52
-Speed:  45
diff --git a/pokeData/mareep b/pokeData/mareep
index 0430b3a..b691222 100644
--- a/pokeData/mareep
+++ b/pokeData/mareep
@@ -1,15 +1,29 @@
+mareep	A electric type Pokémon
 
-Name:  Mareep
-Pokedex Number:  179
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Static - Plus (Hidden Ability)
+If static electricity builds in its body,
+its fleece doubles in volume. Touching
+it will shock you.
 
-Base Stats
-----------------------
-Total: 280
-Hp:  55
-Attack:  40
-Defence:  40
-Special Attack:  65
-Special Defence:  45
-Speed:  35
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         40
+        defense:         40
+ special-attack:         65
+special-defense:         45
+          speed:         35
+
+Pokedex ID: 179	Capture Rate: 235
+Base Exp: 56	Happiness: 70
+Height: 6	Weight: 78
+
+Genus: Wool Pokémon
+Location Areas:
+valley-windworks-area
+johto-route-32-area
+johto-route-42-area
+johto-route-43-area
+hoenn-safari-zone-expansion-south
+hoenn-altering-cave-b
+kanto-altering-cave-b
+floccesy-ranch-inner
+violet-city-pokemon-center
diff --git a/pokeData/marill b/pokeData/marill
index 3300828..5e41831 100644
--- a/pokeData/marill
+++ b/pokeData/marill
@@ -1,15 +1,60 @@
+marill	A water type Pokémon
 
-Name:  Marill
-Pokedex Number:  183
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Thick Fat - Huge Power - Sap Sipper (Hidden Ability)
+The tip of its tail, which contains oil
+that is lighter than water, lets it swim
+without drowning.
 
-Base Stats
-----------------------
-Total: 250
-Hp:  70
-Attack:  20
-Defence:  50
-Special Attack:  20
-Special Defence:  50
-Speed:  40
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         20
+        defense:         50
+ special-attack:         20
+special-defense:         50
+          speed:         40
+
+Pokedex ID: 183	Capture Rate: 190
+Base Exp: 88	Happiness: 50
+Height: 4	Weight: 85
+
+Genus: Aqua Mouse Pokémon
+Location Areas:
+great-marsh-area-1
+great-marsh-area-2
+great-marsh-area-3
+great-marsh-area-4
+great-marsh-area-5
+great-marsh-area-6
+sinnoh-route-212-north-towards-hearthome-city
+sinnoh-route-215-area
+johto-route-42-area
+mt-mortar-1f
+mt-mortar-lower-cave
+mt-mortar-upper-cave
+mt-mortar-b1f
+petalburg-city-area
+hoenn-route-102-area
+hoenn-route-104-area
+hoenn-route-111-area
+hoenn-route-112-area
+hoenn-route-114-area
+hoenn-route-117-area
+hoenn-route-120-area
+hoenn-safari-zone-expansion-south
+icefall-cave-entrance
+ruin-valley-area
+four-island-area
+pinwheel-forest-inside
+village-bridge-area
+unova-route-6-area
+unova-route-11-area
+abundant-shrine-area
+unova-victory-road-2-unknown-area-71
+unova-victory-road-2-unknown-area-75
+unova-victory-road-2-unknown-area-78
+floccesy-ranch-outer
+floccesy-ranch-inner
+relic-passage-relic-castle-entrance
+unova-route-20-area
+unova-route-22-area
+kalos-route-3-area
+johto-safari-zone-zone-meadow
diff --git a/pokeData/marowak b/pokeData/marowak
index c7b4c3e..4972fc6 100644
--- a/pokeData/marowak
+++ b/pokeData/marowak
@@ -1,15 +1,35 @@
+marowak	A ground type Pokémon
 
-Name:  Marowak
-Pokedex Number:  105
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Rock Head - Lightningrod - Battle Armor (Hidden Ability)
+MAROWAK is the evolved form of a CUBONE
+that has overcome its sadness at the
+loss of its mother and grown tough.This POKéMON’s tempered and hardened
+spirit is not easily broken.
 
-Base Stats
-----------------------
-Total: 425
-Hp:  60
-Attack:  80
-Defence:  110
-Special Attack:  50
-Special Defence:  80
-Speed:  45
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         80
+        defense:        110
+ special-attack:         50
+special-defense:         80
+          speed:         45
+
+Pokedex ID: 105	Capture Rate: 75
+Base Exp: 149	Happiness: 50
+Height: 10	Weight: 450
+
+Genus: Bone Keeper Pokémon
+Location Areas:
+rock-tunnel-1f
+rock-tunnel-b1f
+kanto-route-9-area
+kanto-route-10-area
+cerulean-cave-2f
+cerulean-cave-b1f
+kanto-victory-road-2-1f
+kanto-victory-road-2-2f
+kanto-victory-road-2-3f
+kanto-safari-zone-area-1-east
+kanto-safari-zone-area-3-west
+sevault-canyon-area
+unova-route-15-area
+johto-safari-zone-zone-desert
diff --git a/pokeData/marshadow b/pokeData/marshadow
index 89b9d06..039a01e 100644
--- a/pokeData/marshadow
+++ b/pokeData/marshadow
@@ -1,15 +1,21 @@
+marshadow	A fighting type Pokémon
 
-Name:  Marshadow
-Pokedex Number:  802
-Gender Ratio:  Genderless
-Abilities: Technician
+Able to conceal itself in shadows, it never
+appears before humans, so its very existence
+was the stuff of myth.
+
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:        125
+        defense:         80
+ special-attack:         90
+special-defense:         90
+          speed:        125
+
+Pokedex ID: 802	Capture Rate: 3
+Base Exp: 300	Happiness: 0
+Height: 7	Weight: 222
+
+Genus: Gloomdweller Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 600
-Hp:  90
-Attack:  125
-Defence:  80
-Special Attack:  90
-Special Defence:  90
-Speed:  125
diff --git a/pokeData/marshtomp b/pokeData/marshtomp
index 33318b1..35af21d 100644
--- a/pokeData/marshtomp
+++ b/pokeData/marshtomp
@@ -1,15 +1,21 @@
+marshtomp	A water type Pokémon
 
-Name:  Marshtomp
-Pokedex Number:  259
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Torrent - Damp (Hidden Ability)
+Its sturdy legs give it sure
+footing, even in mud. It
+burrows into dirt to sleep.
+
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         85
+        defense:         70
+ special-attack:         60
+special-defense:         70
+          speed:         50
+
+Pokedex ID: 259	Capture Rate: 45
+Base Exp: 142	Happiness: 50
+Height: 7	Weight: 280
+
+Genus: Mud Fish Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 405
-Hp:  70
-Attack:  85
-Defence:  70
-Special Attack:  60
-Special Defence:  70
-Speed:  50
diff --git a/pokeData/masquerain b/pokeData/masquerain
index 8c7171c..ce95268 100644
--- a/pokeData/masquerain
+++ b/pokeData/masquerain
@@ -1,15 +1,22 @@
+masquerain	A bug type Pokémon
 
-Name:  Masquerain
-Pokedex Number:  284
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Intimidate - Unnerve (Hidden Ability)
+Its antennae have eye patterns
+on them. Its four wings enable it
+to hover and fly in any direction.
 
-Base Stats
-----------------------
-Total: 414
-Hp:  70
-Attack:  60
-Defence:  62
-Special Attack:  80
-Special Defence:  82
-Speed:  60
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         60
+        defense:         62
+ special-attack:        100
+special-defense:         82
+          speed:         80
+
+Pokedex ID: 284	Capture Rate: 75
+Base Exp: 159	Happiness: 70
+Height: 8	Weight: 36
+
+Genus: Eyeball Pokémon
+Location Areas:
+sinnoh-route-229-area
+kalos-route-3-area
diff --git a/pokeData/mawile b/pokeData/mawile
index 5fbbeba..1fccc1b 100644
--- a/pokeData/mawile
+++ b/pokeData/mawile
@@ -1,15 +1,41 @@
+mawile	A steel type Pokémon
 
-Name:  Mawile
-Pokedex Number:  303
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Hyper Cutter - Intimidate - Sheer Force (Hidden Ability)
+Attached to its head is a huge
+set of jaws formed by horns.
+It can chew through iron beams.
 
-Base Stats
-----------------------
-Total: 380
-Hp:  50
-Attack:  105
-Defence:  125
-Special Attack:  55
-Special Defence:  95
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         85
+        defense:         85
+ special-attack:         55
+special-defense:         55
+          speed:         50
+
+Pokedex ID: 303	Capture Rate: 45
+Base Exp: 133	Happiness: 50
+Height: 6	Weight: 115
+
+Genus: Deceiver Pokémon
+Location Areas:
+iron-island-b1f-left
+iron-island-b1f-right
+iron-island-b2f-right
+iron-island-b2f-left
+iron-island-b3f
+kanto-route-9-area
+granite-cave-b1f
+granite-cave-b2f
+cave-of-origin-1f
+cave-of-origin-b1f
+cave-of-origin-b2f
+cave-of-origin-b3f
+hoenn-victory-road-b1f
+hoenn-victory-road-b2f
+sky-pillar-1f
+sky-pillar-3f
+sky-pillar-5f
+challengers-cave-1f
+challengers-cave-b1f
+challengers-cave-b2f
+glittering-cave-unknown-area-303
diff --git a/pokeData/medicham b/pokeData/medicham
index c41a7e7..986ebe3 100644
--- a/pokeData/medicham
+++ b/pokeData/medicham
@@ -1,15 +1,39 @@
+medicham	A fighting type Pokémon
 
-Name:  Medicham
-Pokedex Number:  308
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Pure Power - Telepathy (Hidden Ability)
+It gains the ability to see the aura
+of its opponents by honing its mind
+through starvation.
 
-Base Stats
-----------------------
-Total: 410
-Hp:  60
-Attack:  100
-Defence:  85
-Special Attack:  80
-Special Defence:  85
-Speed:  100
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         60
+        defense:         75
+ special-attack:         60
+special-defense:         75
+          speed:         80
+
+Pokedex ID: 308	Capture Rate: 90
+Base Exp: 144	Happiness: 70
+Height: 13	Weight: 315
+
+Genus: Meditate Pokémon
+Location Areas:
+mt-coronet-2f
+mt-coronet-3f
+mt-coronet-exterior-snowfall
+mt-coronet-exterior-blizzard
+mt-coronet-4f
+mt-coronet-4f-small-room
+mt-coronet-5f
+mt-coronet-6f
+mt-coronet-1f-from-exterior
+sinnoh-victory-road-1f
+sinnoh-victory-road-2f
+sinnoh-victory-road-b1f
+sinnoh-victory-road-inside-b1f
+sinnoh-victory-road-inside
+sinnoh-victory-road-inside-exit
+acuity-lakefront-area
+sinnoh-route-217-area
+hoenn-victory-road-b1f
+hoenn-victory-road-b2f
diff --git a/pokeData/meditite b/pokeData/meditite
index 74def5d..7d5ac9c 100644
--- a/pokeData/meditite
+++ b/pokeData/meditite
@@ -1,15 +1,47 @@
+meditite	A fighting type Pokémon
 
-Name:  Meditite
-Pokedex Number:  307
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Pure Power - Telepathy (Hidden Ability)
+It never misses its daily yoga
+workouts, and it heightens its
+spiritual power through meditation.
 
-Base Stats
-----------------------
-Total: 280
-Hp:  30
-Attack:  40
-Defence:  55
-Special Attack:  40
-Special Defence:  55
-Speed:  60
+   ↞--------| STATS |--------↠ 
+             hp:         30
+         attack:         40
+        defense:         55
+ special-attack:         40
+special-defense:         55
+          speed:         60
+
+Pokedex ID: 307	Capture Rate: 180
+Base Exp: 56	Happiness: 70
+Height: 6	Weight: 112
+
+Genus: Meditate Pokémon
+Location Areas:
+mt-coronet-1f-route-207
+mt-coronet-1f-route-216
+mt-coronet-1f-route-211
+mt-coronet-b1f
+acuity-lakefront-area
+sinnoh-route-208-area
+sinnoh-route-210-west-towards-celestic-town
+sinnoh-route-211-west-towards-eterna-city
+sinnoh-route-211-east-towards-celestic-town
+sinnoh-route-216-area
+sinnoh-route-217-area
+sprout-tower-2f
+sprout-tower-3f
+burned-tower-1f
+burned-tower-b1f
+bell-tower-2f
+bell-tower-3f
+bell-tower-4f
+bell-tower-5f
+bell-tower-6f
+bell-tower-7f
+bell-tower-8f
+bell-tower-9f
+bell-tower-10f
+mt-pyre-outside
+hoenn-victory-road-b1f
+connecting-cave-area
diff --git a/pokeData/meganium b/pokeData/meganium
index a5ad240..8e226ca 100644
--- a/pokeData/meganium
+++ b/pokeData/meganium
@@ -1,15 +1,21 @@
+meganium	A grass type Pokémon
 
-Name:  Meganium
-Pokedex Number:  154
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Overgrow - Leaf Guard (Hidden Ability)
+The aroma that rises from its petals
+contains a substance that calms aggressive
+feelings.
+
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:         82
+        defense:        100
+ special-attack:         83
+special-defense:        100
+          speed:         80
+
+Pokedex ID: 154	Capture Rate: 45
+Base Exp: 236	Happiness: 70
+Height: 18	Weight: 1005
+
+Genus: Herb Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 525
-Hp:  80
-Attack:  82
-Defence:  100
-Special Attack:  83
-Special Defence:  100
-Speed:  80
diff --git a/pokeData/melmetal b/pokeData/melmetal
index f9527e0..272c223 100644
--- a/pokeData/melmetal
+++ b/pokeData/melmetal
@@ -1,15 +1,21 @@
+melmetal	A steel type Pokémon
 
-Name:  Melmetal
-Pokedex Number:  809
-Gender Ratio:  Genderless
-Abilities: Iron Fist
+Revered long ago for its capacity to create iron
+from nothing, for some reason it has come back
+to life after 3,000 years.
+
+   ↞--------| STATS |--------↠ 
+             hp:        135
+         attack:        143
+        defense:        143
+ special-attack:         80
+special-defense:         65
+          speed:         34
+
+Pokedex ID: 809	Capture Rate: 3
+Base Exp: 300	Happiness: 0
+Height: 25	Weight: 8000
+
+Genus: Hex Nut Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 600
-Hp:  80
-Attack:  65
-Defence:  34
-Special Attack:  Max Stats<b
-Special Defence:  Lv. 50
-Speed:  195 - 242
diff --git a/pokeData/meloetta b/pokeData/meloetta
index 3db0755..55399ba 100644
--- a/pokeData/meloetta
+++ b/pokeData/meloetta
@@ -1,15 +1,15 @@
+	A  type Pokémon
 
-Name:  Meloetta
-Pokedex Number:  648
-Gender Ratio:  
-Abilities: Serene Grace
+メロエッタの　かなでる　せんりつは
+まわりの　ポケモンを　よろこばせたり
+かなしませるほどの　パワーがある。
+
+   ↞--------| STATS |--------↠ 
+
+Pokedex ID: 	Capture Rate: 3
+Base Exp: 	Happiness: 100
+Height: 	Weight: 
+
+Genus: Melody Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 600
-Hp:  100
-Attack:  128
-Defence:  90
-Special Attack:  77
-Special Defence:  77
-Speed:  128
diff --git a/pokeData/meltan b/pokeData/meltan
index f50c20a..234edd2 100644
--- a/pokeData/meltan
+++ b/pokeData/meltan
@@ -1,15 +1,21 @@
+meltan	A steel type Pokémon
 
-Name:  Meltan
-Pokedex Number:  808
-Gender Ratio:  Genderless
-Abilities: Magnet Pull
+It melts particles of iron and other metals found
+in the subsoil, so it can absorb them into its
+body of molten steel.
+
+   ↞--------| STATS |--------↠ 
+             hp:         46
+         attack:         65
+        defense:         65
+ special-attack:         55
+special-defense:         35
+          speed:         34
+
+Pokedex ID: 808	Capture Rate: 3
+Base Exp: 150	Happiness: 0
+Height: 2	Weight: 80
+
+Genus: Hex Nut Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 300
-Hp:  46
-Attack:  65
-Defence:  65
-Special Attack:  55
-Special Defence:  35
-Speed:  34
diff --git a/pokeData/meowstic b/pokeData/meowstic
index 8421fc8..0bc1ab4 100644
--- a/pokeData/meowstic
+++ b/pokeData/meowstic
@@ -1,15 +1,15 @@
+	A  type Pokémon
 
-Name:  Meowstic
-Pokedex Number:  678
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Keen Eye - Infiltrator - Prankster (Male Hidden Ability) - Competitive (Female Hidden Ability)
+危険が　迫ると　耳を　持ち上げ
+１０トン　トラックを　ひねりつぶす
+サイコパワーを　解放する。
+
+   ↞--------| STATS |--------↠ 
+
+Pokedex ID: 	Capture Rate: 75
+Base Exp: 	Happiness: 50
+Height: 	Weight: 
+
+Genus: Constraint Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 466
-Hp:  74
-Attack:  48
-Defence:  76
-Special Attack:  83
-Special Defence:  81
-Speed:  104
diff --git a/pokeData/meowth b/pokeData/meowth
index 69412f4..a48f26f 100644
--- a/pokeData/meowth
+++ b/pokeData/meowth
@@ -1,15 +1,38 @@
+meowth	A normal type Pokémon
 
-Name:  Meowth
-Pokedex Number:  052
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Pickup - Technician - Unnerve (Hidden Ability)
+MEOWTH withdraws its sharp claws into
+its paws to slinkily sneak about without
+making any incriminating footsteps.For some reason, this POKéMON loves
+shiny coins that glitter with light.
 
-Base Stats
-----------------------
-Total: 290
-Hp:  40
-Attack:  45
-Defence:  35
-Special Attack:  40
-Special Defence:  40
-Speed:  90
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         45
+        defense:         35
+ special-attack:         40
+special-defense:         40
+          speed:         90
+
+Pokedex ID: 52	Capture Rate: 255
+Base Exp: 58	Happiness: 50
+Height: 4	Weight: 42
+
+Genus: Scratch Cat Pokémon
+Location Areas:
+johto-route-35-area
+johto-route-38-area
+johto-route-39-area
+kanto-route-5-area
+kanto-route-6-area
+kanto-route-7-area
+kanto-route-8-area
+kanto-route-11-area
+kindle-road-area
+treasure-beach-area
+cape-brink-area
+bond-bridge-area
+five-isle-meadow-area
+water-path-area
+ruin-valley-area
+canyon-entrance-area
+sevault-canyon-area
diff --git a/pokeData/mesprit b/pokeData/mesprit
index 8b62767..61d043c 100644
--- a/pokeData/mesprit
+++ b/pokeData/mesprit
@@ -1,15 +1,21 @@
+mesprit	A psychic type Pokémon
 
-Name:  Mesprit
-Pokedex Number:  481
-Gender Ratio:  Genderless
-Abilities: Levitate
+Quand il prit son envol, les hommes
+apprirent à ressentir la joie et la
+peine. L’émotion était née.
 
-Base Stats
-----------------------
-Total: 580
-Hp:  80
-Attack:  105
-Defence:  105
-Special Attack:  105
-Special Defence:  105
-Speed:  80
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:        105
+        defense:        105
+ special-attack:        105
+special-defense:        105
+          speed:         80
+
+Pokedex ID: 481	Capture Rate: 3
+Base Exp: 290	Happiness: 140
+Height: 3	Weight: 3
+
+Genus: Emotion Pokémon
+Location Areas:
+roaming-sinnoh-area
diff --git a/pokeData/metagross b/pokeData/metagross
index 466ff8b..dc52998 100644
--- a/pokeData/metagross
+++ b/pokeData/metagross
@@ -1,15 +1,22 @@
+metagross	A steel type Pokémon
 
-Name:  Metagross
-Pokedex Number:  376
-Gender Ratio:  Genderless
-Abilities: Clear Body - Light Metal (Hidden Ability)
+METANG combined to form it.
+With four brains, it has the
+intelligence of a supercomputer.
 
-Base Stats
-----------------------
-Total: 600
-Hp:  80
-Attack:  145
-Defence:  150
-Special Attack:  105
-Special Defence:  110
-Speed:  110
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:        135
+        defense:        130
+ special-attack:         95
+special-defense:         90
+          speed:         70
+
+Pokedex ID: 376	Capture Rate: 3
+Base Exp: 300	Happiness: 35
+Height: 16	Weight: 5500
+
+Genus: Iron Leg Pokémon
+Location Areas:
+giant-chasm-forest
+giant-chasm-forest-cave
diff --git a/pokeData/metang b/pokeData/metang
index 03c397d..f203742 100644
--- a/pokeData/metang
+++ b/pokeData/metang
@@ -1,15 +1,22 @@
+metang	A steel type Pokémon
 
-Name:  Metang
-Pokedex Number:  375
-Gender Ratio:  Genderless
-Abilities: Clear Body - Light Metal (Hidden Ability)
+It is formed by two BELDUM joining
+together. Its steel body won’t be
+scratched if it collides with a jet.
 
-Base Stats
-----------------------
-Total: 420
-Hp:  60
-Attack:  75
-Defence:  100
-Special Attack:  55
-Special Defence:  80
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         75
+        defense:        100
+ special-attack:         55
+special-defense:         80
+          speed:         50
+
+Pokedex ID: 375	Capture Rate: 3
+Base Exp: 147	Happiness: 35
+Height: 12	Weight: 2025
+
+Genus: Iron Claw Pokémon
+Location Areas:
+giant-chasm-forest
+giant-chasm-forest-cave
diff --git a/pokeData/metapod b/pokeData/metapod
index 705518b..7593d94 100644
--- a/pokeData/metapod
+++ b/pokeData/metapod
@@ -1,15 +1,45 @@
+metapod	A bug type Pokémon
 
-Name:  Metapod
-Pokedex Number:  011
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Shed Skin
+The shell covering this POKéMON’s body
+is as hard as an iron slab.
+METAPOD does not move very much.It stays still because it is preparing
+its soft innards for evolution inside
+the hard shell.
 
-Base Stats
-----------------------
-Total: 205
-Hp:  50
-Attack:  20
-Defence:  55
-Special Attack:  25
-Special Defence:  25
-Speed:  30
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         20
+        defense:         55
+ special-attack:         25
+special-defense:         25
+          speed:         30
+
+Pokedex ID: 11	Capture Rate: 120
+Base Exp: 72	Happiness: 50
+Height: 7	Weight: 99
+
+Genus: Cocoon Pokémon
+Location Areas:
+eterna-forest-area
+johto-route-30-area
+johto-route-31-area
+ilex-forest-area
+johto-route-34-area
+johto-route-35-area
+national-park-area
+johto-route-36-area
+johto-route-37-area
+johto-route-38-area
+johto-route-39-area
+lake-of-rage-area
+kanto-route-26-area
+kanto-route-27-area
+kanto-route-2-south-towards-viridian-city
+kanto-route-24-area
+kanto-route-25-area
+kanto-route-2-north-towards-pewter-city
+viridian-forest-area
+pattern-bush-area
+unova-route-12-area
+santalune-forest-area
+azalea-town-area
diff --git a/pokeData/mew b/pokeData/mew
index a220a3e..95b90d8 100644
--- a/pokeData/mew
+++ b/pokeData/mew
@@ -1,15 +1,22 @@
+mew	A psychic type Pokémon
 
-Name:  Mew
-Pokedex Number:  150
-Gender Ratio:  Genderless
-Abilities: Pressure - Unnerve (Hidden Ability)
+MEW is said to possess the genetic
+composition of all POKéMON.
+It is capable of making itself invisibleat will, so it entirely avoids notice even
+if it approaches people.
 
-Base Stats
-----------------------
-Total: 680
-Hp:  106
-Attack:  150
-Defence:  70
-Special Attack:  194
-Special Defence:  120
-Speed:  140
+   ↞--------| STATS |--------↠ 
+             hp:        100
+         attack:        100
+        defense:        100
+ special-attack:        100
+special-defense:        100
+          speed:        100
+
+Pokedex ID: 151	Capture Rate: 45
+Base Exp: 300	Happiness: 100
+Height: 4	Weight: 40
+
+Genus: New Species Pokémon
+Location Areas:
+faraway-island-area
diff --git a/pokeData/mewtwo b/pokeData/mewtwo
index 332ca9c..aafb070 100644
--- a/pokeData/mewtwo
+++ b/pokeData/mewtwo
@@ -1,15 +1,23 @@
+mewtwo	A psychic type Pokémon
 
-Name:  Mewtwo
-Pokedex Number:  150
-Gender Ratio:  Genderless
-Abilities: Pressure - Unnerve (Hidden Ability)
+MEWTWO is a POKéMON that was created
+by genetic manipulation.
+However, even though the scientificpower of humans created this POKéMON’s
+body, they failed to endow MEWTWO with
+a compassionate heart.
 
-Base Stats
-----------------------
-Total: 680
-Hp:  106
-Attack:  150
-Defence:  70
-Special Attack:  194
-Special Defence:  120
-Speed:  140
+   ↞--------| STATS |--------↠ 
+             hp:        106
+         attack:        110
+        defense:         90
+ special-attack:        154
+special-defense:         90
+          speed:        130
+
+Pokedex ID: 150	Capture Rate: 3
+Base Exp: 340	Happiness: 0
+Height: 20	Weight: 1220
+
+Genus: Genetic Pokémon
+Location Areas:
+cerulean-cave-b1f
diff --git a/pokeData/mienfoo b/pokeData/mienfoo
index 0c4e512..0763292 100644
--- a/pokeData/mienfoo
+++ b/pokeData/mienfoo
@@ -1,15 +1,43 @@
+mienfoo	A fighting type Pokémon
 
-Name:  Mienfoo
-Pokedex Number:  619
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Inner Focus - Regenerator - Reckless (Hidden Ability)
+기술을 내보내는 스피드가 자랑이다.
+설령 파워는 낮더라도
+많은 공격 횟수로 커버한다.
 
-Base Stats
-----------------------
-Total: 350
-Hp:  45
-Attack:  85
-Defence:  50
-Special Attack:  55
-Special Defence:  50
-Speed:  65
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         85
+        defense:         50
+ special-attack:         55
+special-defense:         50
+          speed:         65
+
+Pokedex ID: 619	Capture Rate: 180
+Base Exp: 70	Happiness: 50
+Height: 9	Weight: 200
+
+Genus: Martial Arts Pokémon
+Location Areas:
+dragonspiral-tower-entrance
+dragonspiral-tower-outside
+dragonspiral-tower-1f
+unova-victory-road-outside
+unova-victory-road-unknown-area-53
+unova-victory-road-unknown-area-54
+unova-victory-road-unknown-area-55
+unova-victory-road-unknown-area-56
+unova-victory-road-unknown-area-57
+unova-victory-road-unknown-area-58
+unova-victory-road-unknown-area-59
+unova-victory-road-unknown-area-60
+unova-victory-road-unknown-area-61
+unova-victory-road-unknown-area-62
+unova-victory-road-unknown-area-63
+unova-victory-road-unknown-area-64
+unova-victory-road-unknown-area-65
+unova-victory-road-unknown-area-66
+trial-chamber-area
+unova-route-14-area
+unova-route-22-area
+unova-route-23-area
+kalos-route-8-area
diff --git a/pokeData/mienshao b/pokeData/mienshao
index 1a50193..b1d5e95 100644
--- a/pokeData/mienshao
+++ b/pokeData/mienshao
@@ -1,15 +1,25 @@
+mienshao	A fighting type Pokémon
 
-Name:  Mienshao
-Pokedex Number:  620
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Inner Focus - Regenerator - Reckless (Hidden Ability)
+Using the long fur on its arms like whips,
+it launches into combo attacks that,
+once started, no one can stop.
 
-Base Stats
-----------------------
-Total: 510
-Hp:  65
-Attack:  125
-Defence:  60
-Special Attack:  95
-Special Defence:  60
-Speed:  105
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:        125
+        defense:         60
+ special-attack:         95
+special-defense:         60
+          speed:        105
+
+Pokedex ID: 620	Capture Rate: 45
+Base Exp: 179	Happiness: 50
+Height: 14	Weight: 355
+
+Genus: Martial Arts Pokémon
+Location Areas:
+dragonspiral-tower-entrance
+dragonspiral-tower-outside
+dragonspiral-tower-1f
+unova-route-14-area
+unova-route-23-area
diff --git a/pokeData/mightyena b/pokeData/mightyena
index 911771d..0503938 100644
--- a/pokeData/mightyena
+++ b/pokeData/mightyena
@@ -1,15 +1,26 @@
+mightyena	A dark type Pokémon
 
-Name:  Mightyena
-Pokedex Number:  262
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Intimidate - Quick Feet - Moxie (Hidden Ability)
+It chases down prey in a pack.
+It will never disobey the commands
+of a skilled Trainer.
 
-Base Stats
-----------------------
-Total: 420
-Hp:  70
-Attack:  90
-Defence:  70
-Special Attack:  60
-Special Defence:  60
-Speed:  70
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         90
+        defense:         70
+ special-attack:         60
+special-defense:         60
+          speed:         70
+
+Pokedex ID: 262	Capture Rate: 127
+Base Exp: 147	Happiness: 70
+Height: 10	Weight: 370
+
+Genus: Bite Pokémon
+Location Areas:
+sinnoh-route-214-area
+sinnoh-route-215-area
+hoenn-route-120-area
+hoenn-route-121-area
+hoenn-route-123-area
+kalos-route-15-area
diff --git a/pokeData/milcery b/pokeData/milcery
index 8101db4..7f5a99a 100644
--- a/pokeData/milcery
+++ b/pokeData/milcery
@@ -1,15 +1,20 @@
+milcery	A fairy type Pokémon
 
-Name:  Milcery
-Pokedex Number:  868
-Gender Ratio:   ♂:0% ♀:100%
-Abilities: Sweet Veil - Aroma Veil (Hidden Ability)
+This Pokémon was born from sweet-smelling
+particles in the air. Its body is made of cream.
+
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         40
+        defense:         40
+ special-attack:         50
+special-defense:         61
+          speed:         34
+
+Pokedex ID: 868	Capture Rate: 200
+Base Exp: 54	Happiness: 50
+Height: 2	Weight: 3
+
+Genus: Cream Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 270
-Hp:  45
-Attack:  40
-Defence:  40
-Special Attack:  50
-Special Defence:  61
-Speed:  34
diff --git a/pokeData/milotic b/pokeData/milotic
index a9538f0..09909e0 100644
--- a/pokeData/milotic
+++ b/pokeData/milotic
@@ -1,15 +1,21 @@
+milotic	A water type Pokémon
 
-Name:  Milotic
-Pokedex Number:  350
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Marvel Scale - Competitive - Cute Charm (Hidden Ability)
+MILOTIC is breathtakingly beautiful.
+Those that see it are said to forget their
+combative spirits.
 
-Base Stats
-----------------------
-Total: 540
-Hp:  95
-Attack:  60
-Defence:  79
-Special Attack:  100
-Special Defence:  125
-Speed:  81
+   ↞--------| STATS |--------↠ 
+             hp:         95
+         attack:         60
+        defense:         79
+ special-attack:        100
+special-defense:        125
+          speed:         81
+
+Pokedex ID: 350	Capture Rate: 60
+Base Exp: 189	Happiness: 50
+Height: 62	Weight: 1620
+
+Genus: Tender Pokémon
+Location Areas:
+unova-route-1-area
diff --git a/pokeData/miltank b/pokeData/miltank
index 9d46d18..bc682d2 100644
--- a/pokeData/miltank
+++ b/pokeData/miltank
@@ -1,15 +1,27 @@
+miltank	A normal type Pokémon
 
-Name:  Miltank
-Pokedex Number:  241
-Gender Ratio:   ♂:0% ♀:100%
-Abilities: Thick Fat - Scrappy - Sap Sipper (Hidden Ability)
+If it has just had a baby, the milk it
+produces contains much more nutrition than
+usual.
 
-Base Stats
-----------------------
-Total: 490
-Hp:  95
-Attack:  80
-Defence:  105
-Special Attack:  40
-Special Defence:  70
-Speed:  100
+   ↞--------| STATS |--------↠ 
+             hp:         95
+         attack:         80
+        defense:        105
+ special-attack:         40
+special-defense:         70
+          speed:        100
+
+Pokedex ID: 241	Capture Rate: 45
+Base Exp: 172	Happiness: 50
+Height: 12	Weight: 755
+
+Genus: Milk Cow Pokémon
+Location Areas:
+sinnoh-route-209-area
+sinnoh-route-210-south-towards-solaceon-town
+johto-route-38-area
+johto-route-39-area
+johto-route-47-area
+hoenn-safari-zone-expansion-north
+kalos-route-12-area
diff --git a/pokeData/mime-jr b/pokeData/mime-jr
index befedc4..cab78d9 100644
--- a/pokeData/mime-jr
+++ b/pokeData/mime-jr
@@ -1 +1,22 @@
-You didn't enter a valid pokemon!
+mime-jr	A psychic type Pokémon
+
+Il imite les mouvements et les
+expressions des autres pour
+comprendre leurs sentiments.
+
+   ↞--------| STATS |--------↠ 
+             hp:         20
+         attack:         25
+        defense:         45
+ special-attack:         70
+special-defense:         90
+          speed:         60
+
+Pokedex ID: 439	Capture Rate: 145
+Base Exp: 62	Happiness: 50
+Height: 6	Weight: 130
+
+Genus: Mime Pokémon
+Location Areas:
+sinnoh-route-209-area
+sinnoh-route-210-south-towards-solaceon-town
diff --git a/pokeData/mimikyu b/pokeData/mimikyu
index 24bc36e..3fc75e4 100644
--- a/pokeData/mimikyu
+++ b/pokeData/mimikyu
@@ -1,15 +1,15 @@
+	A  type Pokémon
 
-Name:  Mimikyu
-Pokedex Number:  778
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Disguise
+Its actual appearance is unknown. A scholar
+who saw what was under its rag was
+overwhelmed by terror and died from the shock.
+
+   ↞--------| STATS |--------↠ 
+
+Pokedex ID: 	Capture Rate: 45
+Base Exp: 	Happiness: 50
+Height: 	Weight: 
+
+Genus: Disguise Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 476
-Hp:  55
-Attack:  90
-Defence:  80
-Special Attack:  50
-Special Defence:  105
-Speed:  96
diff --git a/pokeData/minccino b/pokeData/minccino
index d9c9ddb..320d6d3 100644
--- a/pokeData/minccino
+++ b/pokeData/minccino
@@ -1,15 +1,25 @@
+minccino	A normal type Pokémon
 
-Name:  Minccino
-Pokedex Number:  572
-Gender Ratio:   ♂:25% ♀:75%
-Abilities: Cute Charm - Technician - Skill Link (Hidden Ability)
+서로의 꼬리로 상대를
+철저히 깨끗하게 만드는 것이
+치라미끼리의 인사다.
 
-Base Stats
-----------------------
-Total: 300
-Hp:  55
-Attack:  50
-Defence:  40
-Special Attack:  40
-Special Defence:  40
-Speed:  75
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         50
+        defense:         40
+ special-attack:         40
+special-defense:         40
+          speed:         75
+
+Pokedex ID: 572	Capture Rate: 255
+Base Exp: 60	Happiness: 50
+Height: 4	Weight: 58
+
+Genus: Chinchilla Pokémon
+Location Areas:
+cold-storage-area
+unova-route-4-area
+unova-route-5-area
+unova-route-9-area
+unova-route-16-area
diff --git a/pokeData/minior b/pokeData/minior
index 069cf6d..72b550e 100644
--- a/pokeData/minior
+++ b/pokeData/minior
@@ -1 +1,15 @@
-	Stats currently unavailable :( 
+	A  type Pokémon
+
+Originally making its home in the ozone layer,
+it hurtles to the ground when the shell enclosing
+its body grows too heavy.
+
+   ↞--------| STATS |--------↠ 
+
+Pokedex ID: 	Capture Rate: 30
+Base Exp: 	Happiness: 70
+Height: 	Weight: 
+
+Genus: Meteor Pokémon
+Location Areas:
+
diff --git a/pokeData/minun b/pokeData/minun
index f422088..d89d60c 100644
--- a/pokeData/minun
+++ b/pokeData/minun
@@ -1,15 +1,44 @@
+minun	A electric type Pokémon
 
-Name:  Minun
-Pokedex Number:  312
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Minus - Volt Absorb (Hidden Ability)
+It cheers on friends. If its
+friends are losing, its body lets
+off more and more sparks.
 
-Base Stats
-----------------------
-Total: 405
-Hp:  60
-Attack:  40
-Defence:  50
-Special Attack:  75
-Special Defence:  85
-Speed:  95
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         40
+        defense:         50
+ special-attack:         75
+special-defense:         85
+          speed:         95
+
+Pokedex ID: 312	Capture Rate: 200
+Base Exp: 142	Happiness: 70
+Height: 4	Weight: 42
+
+Genus: Cheering Pokémon
+Location Areas:
+johto-route-29-area
+johto-route-33-area
+national-park-area
+johto-route-36-area
+johto-route-37-area
+johto-route-38-area
+johto-route-39-area
+johto-route-46-area
+johto-route-48-area
+kanto-route-1-area
+kanto-route-2-south-towards-viridian-city
+kanto-route-3-area
+kanto-route-5-area
+kanto-route-7-area
+kanto-route-8-area
+kanto-route-11-area
+kanto-route-14-area
+kanto-route-15-area
+kanto-route-16-area
+kanto-route-17-area
+kanto-route-18-area
+kanto-route-2-north-towards-pewter-city
+hoenn-route-110-area
+kalos-route-5-area
diff --git a/pokeData/misdreavus b/pokeData/misdreavus
index 1583fbb..dfd80b1 100644
--- a/pokeData/misdreavus
+++ b/pokeData/misdreavus
@@ -1,15 +1,45 @@
+misdreavus	A ghost type Pokémon
 
-Name:  Misdreavus
-Pokedex Number:  200
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Levitate
+It likes playing mischievous tricks such as
+screaming and wailing to startle people at
+night. 
 
-Base Stats
-----------------------
-Total: 435
-Hp:  60
-Attack:  60
-Defence:  60
-Special Attack:  85
-Special Defence:  85
-Speed:  85
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         60
+        defense:         60
+ special-attack:         85
+special-defense:         85
+          speed:         85
+
+Pokedex ID: 200	Capture Rate: 45
+Base Exp: 87	Happiness: 35
+Height: 7	Weight: 10
+
+Genus: Screech Pokémon
+Location Areas:
+eterna-forest-area
+lost-tower-1f
+lost-tower-2f
+lost-tower-3f
+lost-tower-4f
+lost-tower-5f
+mt-silver-2f
+mt-silver-1f-top
+mt-silver-4f
+johto-route-47-inside-cave
+mt-silver-3f
+mt-silver-top
+lost-cave-room-1
+lost-cave-room-2
+lost-cave-room-3
+lost-cave-room-4
+lost-cave-room-5
+lost-cave-room-6
+lost-cave-room-7
+lost-cave-room-8
+lost-cave-room-9
+lost-cave-room-10
+lost-cave-item-rooms
+abundant-shrine-area
+johto-safari-zone-zone-forest
diff --git a/pokeData/mismagius b/pokeData/mismagius
index 3290211..fcc63c4 100644
--- a/pokeData/mismagius
+++ b/pokeData/mismagius
@@ -1,15 +1,21 @@
+mismagius	A ghost type Pokémon
 
-Name:  Mismagius
-Pokedex Number:  429
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Levitate
+Pareil à une incantation magique,
+son cri n’est que très rarement
+source de joie.
 
-Base Stats
-----------------------
-Total: 495
-Hp:  60
-Attack:  60
-Defence:  60
-Special Attack:  105
-Special Defence:  105
-Speed:  105
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         60
+        defense:         60
+ special-attack:        105
+special-defense:        105
+          speed:        105
+
+Pokedex ID: 429	Capture Rate: 45
+Base Exp: 173	Happiness: 35
+Height: 9	Weight: 44
+
+Genus: Magical Pokémon
+Location Areas:
+abundant-shrine-area
diff --git a/pokeData/moltres b/pokeData/moltres
index 4af3ba0..c49f9ee 100644
--- a/pokeData/moltres
+++ b/pokeData/moltres
@@ -1,15 +1,25 @@
+moltres	A fire type Pokémon
 
-Name:  Moltres
-Pokedex Number:  146
-Gender Ratio:  Genderless
-Abilities: Pressure - Flame Body (Hidden Ability)
+MOLTRES is a legendary bird POKéMON
+that has the ability to control fire.
+If this POKéMON is injured, it is said todip its body in the molten magma of a
+volcano to burn and heal itself.
 
-Base Stats
-----------------------
-Total: 580
-Hp:  90
-Attack:  100
-Defence:  90
-Special Attack:  125
-Special Defence:  85
-Speed:  90
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:        100
+        defense:         90
+ special-attack:        125
+special-defense:         85
+          speed:         90
+
+Pokedex ID: 146	Capture Rate: 3
+Base Exp: 290	Happiness: 35
+Height: 20	Weight: 600
+
+Genus: Flame Pokémon
+Location Areas:
+mt-silver-top
+kanto-victory-road-2-2f
+roaming-sinnoh-area
+mt-ember-summit
diff --git a/pokeData/monferno b/pokeData/monferno
index 14dbff7..0c8cdcc 100644
--- a/pokeData/monferno
+++ b/pokeData/monferno
@@ -1,15 +1,21 @@
+monferno	A fire type Pokémon
 
-Name:  Monferno
-Pokedex Number:  391
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Blaze - Iron Fist (Hidden Ability)
+Il contrôle habilement l’intensité
+de la flamme de sa queue pour tenir
+ses adversaires à distance.
+
+   ↞--------| STATS |--------↠ 
+             hp:         64
+         attack:         78
+        defense:         52
+ special-attack:         78
+special-defense:         52
+          speed:         81
+
+Pokedex ID: 391	Capture Rate: 45
+Base Exp: 142	Happiness: 70
+Height: 9	Weight: 220
+
+Genus: Playful Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 405
-Hp:  64
-Attack:  78
-Defence:  52
-Special Attack:  78
-Special Defence:  52
-Speed:  81
diff --git a/pokeData/morelull b/pokeData/morelull
index e9a82d2..045759f 100644
--- a/pokeData/morelull
+++ b/pokeData/morelull
@@ -1,15 +1,20 @@
+morelull	A grass type Pokémon
 
-Name:  Morelull
-Pokedex Number:  755
-Gender Ratio:   ♂:50.2% ♀:49.8% 
-Abilities: Illuminate - Effect Spore - Rain Dish (Hidden Ability)
+It scatters spores that flicker and glow. Anyone
+seeing these lights falls into a deep slumber.
+
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         35
+        defense:         55
+ special-attack:         65
+special-defense:         75
+          speed:         15
+
+Pokedex ID: 755	Capture Rate: 190
+Base Exp: 57	Happiness: 50
+Height: 2	Weight: 15
+
+Genus: Illuminating Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 285
-Hp:  40
-Attack:  35
-Defence:  55
-Special Attack:  65
-Special Defence:  75
-Speed:  15
diff --git a/pokeData/morgrem b/pokeData/morgrem
index 5eb1f43..875ca9f 100644
--- a/pokeData/morgrem
+++ b/pokeData/morgrem
@@ -1,15 +1,21 @@
+morgrem	A dark type Pokémon
 
-Name:  Morgrem
-Pokedex Number:  860
-Gender Ratio:   ♂:100% ♀:0% 
-Abilities: Prankster - Frisk - Pickpocket (Hidden Ability)
+When it gets down on all fours as if to beg for
+forgiveness, it’s trying to lure opponents in so
+that it can stab them with its spear-like hair.
+
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         60
+        defense:         45
+ special-attack:         75
+special-defense:         55
+          speed:         70
+
+Pokedex ID: 860	Capture Rate: 120
+Base Exp: 130	Happiness: 50
+Height: 8	Weight: 125
+
+Genus: Devious Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 370
-Hp:  65
-Attack:  60
-Defence:  45
-Special Attack:  75
-Special Defence:  55
-Speed:  70
diff --git a/pokeData/morpeko b/pokeData/morpeko
index 7dc24d6..13f2315 100644
--- a/pokeData/morpeko
+++ b/pokeData/morpeko
@@ -1,15 +1,15 @@
+	A  type Pokémon
 
-Name:  Morpeko
-Pokedex Number:  877
-Gender Ratio:   ♂:50.2% ♀:49.8% 
-Abilities: Hunger Switch
+As it eats the seeds stored up in its pocket-like
+pouches, this Pokémon is not just satisfying its
+constant hunger. It’s also generating electricity.
+
+   ↞--------| STATS |--------↠ 
+
+Pokedex ID: 	Capture Rate: 180
+Base Exp: 	Happiness: 50
+Height: 	Weight: 
+
+Genus: Two-Sided Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 436
-Hp:  58
-Attack:  95
-Defence:  58
-Special Attack:  70
-Special Defence:  58
-Speed:  97
diff --git a/pokeData/mothim b/pokeData/mothim
index 0d9506e..7a6475f 100644
--- a/pokeData/mothim
+++ b/pokeData/mothim
@@ -1,15 +1,21 @@
+mothim	A bug type Pokémon
 
-Name:  Mothim
-Pokedex Number:  414
-Gender Ratio:   ♂:100% ♀:0% 
-Abilities: Swarm - Tinted Lens (Hidden Ability)
+Il adore le nectar des fleurs mais
+n’en récolte pas lui-même.
+Il préfère en voler à un Apitrini.
+
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         94
+        defense:         50
+ special-attack:         94
+special-defense:         50
+          speed:         66
+
+Pokedex ID: 414	Capture Rate: 45
+Base Exp: 148	Happiness: 70
+Height: 9	Weight: 233
+
+Genus: Moth Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 424
-Hp:  70
-Attack:  94
-Defence:  50
-Special Attack:  94
-Special Defence:  50
-Speed:  66
diff --git a/pokeData/mr-mime b/pokeData/mr-mime
index befedc4..1e40e92 100644
--- a/pokeData/mr-mime
+++ b/pokeData/mr-mime
@@ -1 +1,29 @@
-You didn't enter a valid pokemon!
+mr-mime	A psychic type Pokémon
+
+MR. MIME is a master of pantomime.
+Its gestures and motions convince
+watchers that something unseeableactually exists. Once it is believed,
+it will exist as if it were a real thing.
+
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         45
+        defense:         65
+ special-attack:        100
+special-defense:        120
+          speed:         90
+
+Pokedex ID: 122	Capture Rate: 45
+Base Exp: 161	Happiness: 50
+Height: 13	Weight: 545
+
+Genus: Barrier Pokémon
+Location Areas:
+sinnoh-route-218-area
+sinnoh-route-222-area
+kanto-sea-route-21-area
+reflection-cave-unknown-area-305
+reflection-cave-unknown-area-306
+reflection-cave-unknown-area-307
+reflection-cave-unknown-area-308
+johto-safari-zone-zone-forest
diff --git a/pokeData/mr-rime b/pokeData/mr-rime
index befedc4..eb2fa24 100644
--- a/pokeData/mr-rime
+++ b/pokeData/mr-rime
@@ -1 +1,20 @@
-You didn't enter a valid pokemon!
+mr-rime	A ice type Pokémon
+
+It’s highly skilled at tap-dancing. It waves its cane
+of ice in time with its graceful movements.
+
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:         85
+        defense:         75
+ special-attack:        110
+special-defense:        100
+          speed:         70
+
+Pokedex ID: 866	Capture Rate: 45
+Base Exp: 182	Happiness: 50
+Height: 15	Weight: 582
+
+Genus: Comedian Pokémon
+Location Areas:
+
diff --git a/pokeData/mudbray b/pokeData/mudbray
index a501473..21116ec 100644
--- a/pokeData/mudbray
+++ b/pokeData/mudbray
@@ -1,15 +1,21 @@
+mudbray	A ground type Pokémon
 
-Name:  Mudbray
-Pokedex Number:  749
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Own Tempo - Stamina - Inner Focus (Hidden Ability)
+Il fango attaccato alle zampe gli dà un’aderenza
+tale da permettergli di lanciarsi in una potente
+corsa senza rischio di scivolare.
+
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:        100
+        defense:         70
+ special-attack:         45
+special-defense:         55
+          speed:         45
+
+Pokedex ID: 749	Capture Rate: 190
+Base Exp: 77	Happiness: 50
+Height: 10	Weight: 1100
+
+Genus: Donkey Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 385
-Hp:  70
-Attack:  100
-Defence:  70
-Special Attack:  45
-Special Defence:  55
-Speed:  45
diff --git a/pokeData/mudkip b/pokeData/mudkip
index 9845b3f..aac3586 100644
--- a/pokeData/mudkip
+++ b/pokeData/mudkip
@@ -1,15 +1,22 @@
+mudkip	A water type Pokémon
 
-Name:  Mudkip
-Pokedex Number:  258
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Torrent - Damp (Hidden Ability)
+To alert it, the fin on its head
+senses the flow of water. It has
+the strength to heft boulders.
 
-Base Stats
-----------------------
-Total: 310
-Hp:  50
-Attack:  70
-Defence:  50
-Special Attack:  50
-Special Defence:  50
-Speed:  40
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         70
+        defense:         50
+ special-attack:         50
+special-defense:         50
+          speed:         40
+
+Pokedex ID: 258	Capture Rate: 45
+Base Exp: 62	Happiness: 50
+Height: 4	Weight: 76
+
+Genus: Mud Fish Pokémon
+Location Areas:
+hoenn-route-101-area
+saffron-city-silph-co
diff --git a/pokeData/mudsdale b/pokeData/mudsdale
index 4be8863..41397c5 100644
--- a/pokeData/mudsdale
+++ b/pokeData/mudsdale
@@ -1,15 +1,21 @@
+mudsdale	A ground type Pokémon
 
-Name:  Mudsdale
-Pokedex Number:  750
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Own Tempo - Stamina - Inner Focus (Hidden Ability)
+Una volta essiccato, il fango che produce
+dalla bocca resiste alla pioggia e al vento, tanto
+che un tempo vi si rivestivano i muri delle case.
+
+   ↞--------| STATS |--------↠ 
+             hp:        100
+         attack:        125
+        defense:        100
+ special-attack:         55
+special-defense:         85
+          speed:         35
+
+Pokedex ID: 750	Capture Rate: 60
+Base Exp: 175	Happiness: 50
+Height: 25	Weight: 9200
+
+Genus: Draft Horse Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 500
-Hp:  100
-Attack:  125
-Defence:  100
-Special Attack:  55
-Special Defence:  85
-Speed:  35
diff --git a/pokeData/muk b/pokeData/muk
index 4a402f9..59d57c0 100644
--- a/pokeData/muk
+++ b/pokeData/muk
@@ -1,15 +1,33 @@
+muk	A poison type Pokémon
 
-Name:  Muk
-Pokedex Number:  089
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Stench - Sticky Hold - Poison Touch (Hidden Ability)
+This POKéMON’s favorite food is
+anything that is repugnantly filthy.
+In dirty towns where people thinknothing of throwing away litter on the
+streets, MUK are certain to gather.
 
-Base Stats
-----------------------
-Total: 500
-Hp:  105
-Attack:  105
-Defence:  75
-Special Attack:  65
-Special Defence:  100
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:        105
+         attack:        105
+        defense:         75
+ special-attack:         65
+special-defense:        100
+          speed:         50
+
+Pokedex ID: 89	Capture Rate: 75
+Base Exp: 175	Happiness: 70
+Height: 12	Weight: 300
+
+Genus: Sludge Pokémon
+Location Areas:
+celadon-city-area
+kanto-route-16-area
+kanto-route-17-area
+kanto-route-18-area
+power-plant-area
+pokemon-mansion-1f
+pokemon-mansion-2f
+pokemon-mansion-3f
+pokemon-mansion-b1f
+unova-route-9-area
+castelia-sewers-area
+castelia-sewers-unknown-area-38
diff --git a/pokeData/munchlax b/pokeData/munchlax
index 9c34542..901479a 100644
--- a/pokeData/munchlax
+++ b/pokeData/munchlax
@@ -1,15 +1,21 @@
+munchlax	A normal type Pokémon
 
-Name:  Munchlax
-Pokedex Number:  446
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Pickup - Thick Fat - Gluttony (Hidden Ability)
+Obnubilé par sa quête incessante
+de nourriture, il oublie parfois
+qu’il en a caché dans sa fourrure.
+
+   ↞--------| STATS |--------↠ 
+             hp:        135
+         attack:         85
+        defense:         40
+ special-attack:         40
+special-defense:         85
+          speed:          5
+
+Pokedex ID: 446	Capture Rate: 50
+Base Exp: 78	Happiness: 50
+Height: 6	Weight: 1050
+
+Genus: Big Eater Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 390
-Hp:  135
-Attack:  85
-Defence:  40
-Special Attack:  40
-Special Defence:  85
-Speed:  5
diff --git a/pokeData/munna b/pokeData/munna
index c7dcb6b..869a501 100644
--- a/pokeData/munna
+++ b/pokeData/munna
@@ -1,15 +1,22 @@
+munna	A psychic type Pokémon
 
-Name:  Munna
-Pokedex Number:  517
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Forewarn - Synchronize - Telepathy (Hidden Ability)
+나쁜 꿈에 시달리고 있는
+포켓몬이나 사람 앞에 나타나
+그 꿈을 먹어버리는 포켓몬.
 
-Base Stats
-----------------------
-Total: 292
-Hp:  76
-Attack:  25
-Defence:  45
-Special Attack:  67
-Special Defence:  55
-Speed:  24
+   ↞--------| STATS |--------↠ 
+             hp:         76
+         attack:         25
+        defense:         45
+ special-attack:         67
+special-defense:         55
+          speed:         24
+
+Pokedex ID: 517	Capture Rate: 190
+Base Exp: 58	Happiness: 50
+Height: 6	Weight: 233
+
+Genus: Dream Eater Pokémon
+Location Areas:
+dreamyard-area
+dreamyard-b1f
diff --git a/pokeData/murkrow b/pokeData/murkrow
index 537c792..71dbc30 100644
--- a/pokeData/murkrow
+++ b/pokeData/murkrow
@@ -1,15 +1,42 @@
+murkrow	A dark type Pokémon
 
-Name:  Murkrow
-Pokedex Number:  198
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Insomnia - Super Luck - Prankster (Hidden Ability)
+Feared and loathed by many, it is
+believed to bring misfortune to all those
+who see it at night.
 
-Base Stats
-----------------------
-Total: 405
-Hp:  60
-Attack:  85
-Defence:  42
-Special Attack:  85
-Special Defence:  42
-Speed:  91
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         85
+        defense:         42
+ special-attack:         85
+special-defense:         42
+          speed:         91
+
+Pokedex ID: 198	Capture Rate: 30
+Base Exp: 81	Happiness: 35
+Height: 5	Weight: 21
+
+Genus: Darkness Pokémon
+Location Areas:
+eterna-forest-area
+lost-tower-1f
+lost-tower-2f
+lost-tower-3f
+lost-tower-4f
+lost-tower-5f
+kanto-route-7-area
+kanto-route-16-area
+kanto-route-18-area
+lost-cave-room-1
+lost-cave-room-2
+lost-cave-room-3
+lost-cave-room-4
+lost-cave-room-5
+lost-cave-room-6
+lost-cave-room-7
+lost-cave-room-8
+lost-cave-room-9
+lost-cave-room-10
+lost-cave-item-rooms
+abundant-shrine-area
+johto-safari-zone-zone-swamp
diff --git a/pokeData/musharna b/pokeData/musharna
index 1b377a7..b5f3e92 100644
--- a/pokeData/musharna
+++ b/pokeData/musharna
@@ -1,15 +1,21 @@
+musharna	A psychic type Pokémon
 
-Name:  Musharna
-Pokedex Number:  518
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Forewarn - Synchronize - Telepathy (Hidden Ability)
+이마에서 나오는 연기 속에는
+사람이나 포켓몬이 꾼
+꿈이 많이 모여 있다.
 
-Base Stats
-----------------------
-Total: 487
-Hp:  116
-Attack:  55
-Defence:  85
-Special Attack:  107
-Special Defence:  95
-Speed:  29
+   ↞--------| STATS |--------↠ 
+             hp:        116
+         attack:         55
+        defense:         85
+ special-attack:        107
+special-defense:         95
+          speed:         29
+
+Pokedex ID: 518	Capture Rate: 75
+Base Exp: 170	Happiness: 50
+Height: 11	Weight: 605
+
+Genus: Drowsing Pokémon
+Location Areas:
+dreamyard-area
diff --git a/pokeData/naganadel b/pokeData/naganadel
index f93f62e..6bce9b5 100644
--- a/pokeData/naganadel
+++ b/pokeData/naganadel
@@ -1,15 +1,21 @@
+naganadel	A poison type Pokémon
 
-Name:  Naganadel
-Pokedex Number:  804
-Gender Ratio:  Genderless
-Abilities: Beast Boost
+It stores hundreds of liters of poisonous liquid
+inside its body. It is one of the organisms known
+as UBs.
+
+   ↞--------| STATS |--------↠ 
+             hp:         73
+         attack:         73
+        defense:         73
+ special-attack:        127
+special-defense:         73
+          speed:        121
+
+Pokedex ID: 804	Capture Rate: 45
+Base Exp: 270	Happiness: 0
+Height: 36	Weight: 1500
+
+Genus: Poison Pin Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 540
-Hp:  73
-Attack:  73
-Defence:  73
-Special Attack:  127
-Special Defence:  73
-Speed:  121
diff --git a/pokeData/natu b/pokeData/natu
index d8a616d..707e9fa 100644
--- a/pokeData/natu
+++ b/pokeData/natu
@@ -1,15 +1,26 @@
+natu	A psychic type Pokémon
 
-Name:  Natu
-Pokedex Number:  177
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Synchronize - Early Bird - Magic Bounce (Hidden Ability)
+Because its wings aren’t yet fully grown,
+it has to hop to get around. It is always
+staring at something.
 
-Base Stats
-----------------------
-Total: 320
-Hp:  40
-Attack:  50
-Defence:  45
-Special Attack:  70
-Special Defence:  45
-Speed:  70
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         50
+        defense:         45
+ special-attack:         70
+special-defense:         45
+          speed:         70
+
+Pokedex ID: 177	Capture Rate: 190
+Base Exp: 64	Happiness: 50
+Height: 2	Weight: 20
+
+Genus: Tiny Bird Pokémon
+Location Areas:
+sinnoh-route-224-area
+ruins-of-alph-outside
+hoenn-safari-zone-neacro-bike-area
+hoenn-safari-zone-sw
+hoenn-safari-zone-se
+ruin-valley-area
diff --git a/pokeData/necrozma b/pokeData/necrozma
index e5fe139..b399f39 100644
--- a/pokeData/necrozma
+++ b/pokeData/necrozma
@@ -1,15 +1,21 @@
+necrozma	A psychic type Pokémon
 
-Name:  Necrozma
-Pokedex Number:  800
-Gender Ratio:  Genderless
-Abilities: Prism Armor
+Pare che questo essere simile a un’Ultracreatura
+sia giunto da un altro mondo in tempi antichi e
+sia rimasto a lungo dormiente sottoterra.
+
+   ↞--------| STATS |--------↠ 
+             hp:         97
+         attack:        107
+        defense:        101
+ special-attack:        127
+special-defense:         89
+          speed:         79
+
+Pokedex ID: 800	Capture Rate: 255
+Base Exp: 300	Happiness: 0
+Height: 24	Weight: 2300
+
+Genus: Prism Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 600
-Hp:  97
-Attack:  113
-Defence:  109
-Special Attack:  157
-Special Defence:  127
-Speed:  77
diff --git a/pokeData/nickit b/pokeData/nickit
index 49eef02..e6d46bb 100644
--- a/pokeData/nickit
+++ b/pokeData/nickit
@@ -1,15 +1,21 @@
+nickit	A dark type Pokémon
 
-Name:  Nickit
-Pokedex Number:  827
-Gender Ratio:   ♂:50.2% ♀:49.8%
-Abilities: Run Away - Unburden - Stakeout (Hidden Ability)
+Aided by the soft pads on its feet, it silently raids
+the food stores of other Pokémon. It survives off
+its ill-gotten gains.
+
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         28
+        defense:         28
+ special-attack:         47
+special-defense:         52
+          speed:         50
+
+Pokedex ID: 827	Capture Rate: 255
+Base Exp: 49	Happiness: 50
+Height: 6	Weight: 89
+
+Genus: Fox Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 245
-Hp:  40
-Attack:  28
-Defence:  28
-Special Attack:  47
-Special Defence:  52
-Speed:  50
diff --git a/pokeData/nidoking b/pokeData/nidoking
index bfc0273..99305ea 100644
--- a/pokeData/nidoking
+++ b/pokeData/nidoking
@@ -1,15 +1,22 @@
+nidoking	A poison type Pokémon
 
-Name:  Nidoking
-Pokedex Number:  034
-Gender Ratio:   ♂:100% ♀:0% 
-Abilities: Poison Point - Rivalry - Sheer Force (Hidden Ability)
+NIDOKING’s thick tail packs enormously
+destructive power. With one swing, it
+can topple a metal transmission tower.Once this POKéMON goes on a rampage,
+there is no stopping it.
+
+   ↞--------| STATS |--------↠ 
+             hp:         81
+         attack:        102
+        defense:         77
+ special-attack:         85
+special-defense:         75
+          speed:         85
+
+Pokedex ID: 34	Capture Rate: 45
+Base Exp: 253	Happiness: 50
+Height: 14	Weight: 620
+
+Genus: Drill Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 505
-Hp:  81
-Attack:  102
-Defence:  77
-Special Attack:  85
-Special Defence:  75
-Speed:  85
diff --git a/pokeData/nidoqueen b/pokeData/nidoqueen
index 5f9b37a..29dddd6 100644
--- a/pokeData/nidoqueen
+++ b/pokeData/nidoqueen
@@ -1,15 +1,22 @@
+nidoqueen	A poison type Pokémon
 
-Name:  Nidoqueen
-Pokedex Number:  031
-Gender Ratio:   ♂:0% ♀:100% 
-Abilities: Poison Point - Rivalry - Sheer Force (Hidden Ability)
+NIDOQUEEN’s body is encased in
+extremely hard scales. It is adept at
+sending foes flying with harsh tackles.This POKéMON is at its strongest when
+it is defending its young.
+
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:         92
+        defense:         87
+ special-attack:         75
+special-defense:         85
+          speed:         76
+
+Pokedex ID: 31	Capture Rate: 45
+Base Exp: 253	Happiness: 50
+Height: 13	Weight: 600
+
+Genus: Drill Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 505
-Hp:  90
-Attack:  92
-Defence:  87
-Special Attack:  75
-Special Defence:  85
-Speed:  76
diff --git a/pokeData/nidoran-f b/pokeData/nidoran-f
index 57d6f83..73da5f3 100644
--- a/pokeData/nidoran-f
+++ b/pokeData/nidoran-f
@@ -1,15 +1,36 @@
+nidoran-f	A poison type Pokémon
 
-Name:  Nidoran-F
-Pokedex Number:  029
-Gender Ratio:   ♂:0% ♀:100%
-Abilities: Poison Point - Rivalry - Hustle (Hidden Ability)
+NIDORAN has barbs that secrete a
+powerful poison. They are thought to
+have developed as protection for thissmall-bodied POKéMON.
+When enraged, it releases a horrible
+toxin from its horn.
 
-Base Stats
-----------------------
-Total: 275
-Hp:  55
-Attack:  47
-Defence:  52
-Special Attack:  40
-Special Defence:  40
-Speed:  41
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         47
+        defense:         52
+ special-attack:         40
+special-defense:         40
+          speed:         41
+
+Pokedex ID: 29	Capture Rate: 235
+Base Exp: 55	Happiness: 50
+Height: 4	Weight: 70
+
+Genus: Poison Pin Pokémon
+Location Areas:
+sinnoh-route-201-area
+johto-route-35-area
+national-park-area
+johto-route-36-area
+kanto-route-2-south-towards-viridian-city
+kanto-route-3-area
+kanto-route-9-area
+kanto-route-10-area
+kanto-route-22-area
+kanto-safari-zone-middle
+kanto-safari-zone-area-1-east
+kanto-safari-zone-area-2-north
+kanto-safari-zone-area-3-west
+johto-safari-zone-zone-savannah
diff --git a/pokeData/nidoran-m b/pokeData/nidoran-m
index c8f722b..83b7bd3 100644
--- a/pokeData/nidoran-m
+++ b/pokeData/nidoran-m
@@ -1,15 +1,34 @@
+nidoran-m	A poison type Pokémon
 
-Name:  Nidoran-M
-Pokedex Number:  032
-Gender Ratio:   ♂:100% ♀:0%
-Abilities: Poison Point - Rivalry - Hustle (Hidden Ability)
+The male NIDORAN has developed
+muscles for moving its ears. Thanks to
+them, the ears can be freely moved inany direction. Even the slightest sound
+does not escape this POKéMON’s notice.
 
-Base Stats
-----------------------
-Total: 273
-Hp:  46
-Attack:  57
-Defence:  40
-Special Attack:  40
-Special Defence:  40
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:         46
+         attack:         57
+        defense:         40
+ special-attack:         40
+special-defense:         40
+          speed:         50
+
+Pokedex ID: 32	Capture Rate: 235
+Base Exp: 55	Happiness: 50
+Height: 5	Weight: 90
+
+Genus: Poison Pin Pokémon
+Location Areas:
+sinnoh-route-201-area
+johto-route-35-area
+national-park-area
+johto-route-36-area
+kanto-route-2-south-towards-viridian-city
+kanto-route-3-area
+kanto-route-9-area
+kanto-route-10-area
+kanto-route-22-area
+kanto-safari-zone-middle
+kanto-safari-zone-area-1-east
+kanto-safari-zone-area-2-north
+kanto-safari-zone-area-3-west
diff --git a/pokeData/nidorina b/pokeData/nidorina
index 49e8ba9..ae7f575 100644
--- a/pokeData/nidorina
+++ b/pokeData/nidorina
@@ -1,15 +1,34 @@
+nidorina	A poison type Pokémon
 
-Name:  Nidorina
-Pokedex Number:  030
-Gender Ratio:   ♂:0% ♀:100%
-Abilities: Poison Point - Rivalry - Hustle (Hidden Ability)
+When NIDORINA are with their friends or
+family, they keep their barbs tucked
+away to prevent hurting each other.This POKéMON appears to become
+nervous if separated from the others.
 
-Base Stats
-----------------------
-Total: 365
-Hp:  70
-Attack:  62
-Defence:  67
-Special Attack:  55
-Special Defence:  55
-Speed:  56
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         62
+        defense:         67
+ special-attack:         55
+special-defense:         55
+          speed:         56
+
+Pokedex ID: 30	Capture Rate: 120
+Base Exp: 128	Happiness: 50
+Height: 8	Weight: 200
+
+Genus: Poison Pin Pokémon
+Location Areas:
+valor-lakefront-area
+sinnoh-route-221-area
+kanto-route-9-area
+kanto-route-13-area
+kanto-route-14-area
+kanto-route-15-area
+kanto-route-23-area
+kanto-safari-zone-middle
+kanto-safari-zone-area-1-east
+kanto-safari-zone-area-2-north
+kanto-safari-zone-area-3-west
+kalos-route-11-area
+johto-safari-zone-zone-savannah
diff --git a/pokeData/nidorino b/pokeData/nidorino
index 95cc6a9..bae759e 100644
--- a/pokeData/nidorino
+++ b/pokeData/nidorino
@@ -1,15 +1,35 @@
+nidorino	A poison type Pokémon
 
-Name:  Nidorino
-Pokedex Number:  033
-Gender Ratio:   ♂:100% ♀:0%
-Abilities: Poison Point - Rivalry - Hustle (Hidden Ability)
+It is easily
+agitated and uses
+its horn foroffense as soon as
+it notices an
+attacker.
 
-Base Stats
-----------------------
-Total: 365
-Hp:  61
-Attack:  72
-Defence:  57
-Special Attack:  55
-Special Defence:  55
-Speed:  65
+   ↞--------| STATS |--------↠ 
+             hp:         61
+         attack:         72
+        defense:         57
+ special-attack:         55
+special-defense:         55
+          speed:         65
+
+Pokedex ID: 33	Capture Rate: 120
+Base Exp: 128	Happiness: 50
+Height: 9	Weight: 195
+
+Genus: Poison Pin Pokémon
+Location Areas:
+valor-lakefront-area
+sinnoh-route-221-area
+kanto-route-9-area
+kanto-route-13-area
+kanto-route-14-area
+kanto-route-15-area
+kanto-route-23-area
+kanto-safari-zone-middle
+kanto-safari-zone-area-1-east
+kanto-safari-zone-area-2-north
+kanto-safari-zone-area-3-west
+kalos-route-11-area
+johto-safari-zone-zone-savannah
diff --git a/pokeData/nihilego b/pokeData/nihilego
index e026c5a..e22f242 100644
--- a/pokeData/nihilego
+++ b/pokeData/nihilego
@@ -1,15 +1,21 @@
+nihilego	A rock type Pokémon
 
-Name:  Nihilego
-Pokedex Number:  793
-Gender Ratio:  Genderless
-Abilities: Beast Boost
+One of several mysterious Ultra Beasts. People
+on the street report observing those infested
+by it suddenly becoming violent.
+
+   ↞--------| STATS |--------↠ 
+             hp:        109
+         attack:         53
+        defense:         47
+ special-attack:        127
+special-defense:        131
+          speed:        103
+
+Pokedex ID: 793	Capture Rate: 45
+Base Exp: 285	Happiness: 0
+Height: 12	Weight: 555
+
+Genus: Parasite Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 570
-Hp:  109
-Attack:  53
-Defence:  47
-Special Attack:  127
-Special Defence:  131
-Speed:  103
diff --git a/pokeData/nincada b/pokeData/nincada
index 27ad712..123bf05 100644
--- a/pokeData/nincada
+++ b/pokeData/nincada
@@ -1,15 +1,23 @@
+nincada	A bug type Pokémon
 
-Name:  Nincada
-Pokedex Number:  290
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Compoundeyes - Run Away (Hidden Ability)
+It grows underground, sensing
+its surroundings using antennae
+instead of its virtually blind eyes.
 
-Base Stats
-----------------------
-Total: 266
-Hp:  31
-Attack:  45
-Defence:  90
-Special Attack:  30
-Special Defence:  30
-Speed:  40
+   ↞--------| STATS |--------↠ 
+             hp:         31
+         attack:         45
+        defense:         90
+ special-attack:         30
+special-defense:         30
+          speed:         40
+
+Pokedex ID: 290	Capture Rate: 255
+Base Exp: 53	Happiness: 50
+Height: 5	Weight: 55
+
+Genus: Trainee Pokémon
+Location Areas:
+eterna-forest-area
+hoenn-route-116-area
+kalos-route-6-area
diff --git a/pokeData/ninetales b/pokeData/ninetales
index 659bd9a..694ab4f 100644
--- a/pokeData/ninetales
+++ b/pokeData/ninetales
@@ -1,15 +1,22 @@
+ninetales	A fire type Pokémon
 
-Name:  Ninetales
-Pokedex Number:  038
-Gender Ratio:   ♂:25% ♀:75%
-Abilities: Flash Fire - Drought (Hidden Ability)
+Legend has it that NINETALES came into
+being when nine wizards possessing
+sacred powers merged into one.This POKéMON is highly intelligent - it
+can understand human speech.
 
-Base Stats
-----------------------
-Total: 505
-Hp:  73
-Attack:  76
-Defence:  75
-Special Attack:  81
-Special Defence:  100
-Speed:  100
+   ↞--------| STATS |--------↠ 
+             hp:         73
+         attack:         76
+        defense:         75
+ special-attack:         81
+special-defense:        100
+          speed:        100
+
+Pokedex ID: 38	Capture Rate: 75
+Base Exp: 177	Happiness: 50
+Height: 11	Weight: 199
+
+Genus: Fox Pokémon
+Location Areas:
+abundant-shrine-area
diff --git a/pokeData/ninjask b/pokeData/ninjask
index 0f9f088..8eb6004 100644
--- a/pokeData/ninjask
+++ b/pokeData/ninjask
@@ -1,15 +1,21 @@
+ninjask	A bug type Pokémon
 
-Name:  Ninjask
-Pokedex Number:  291
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Speed Boost - Infiltrator (Hidden Ability)
+Because it moves so quickly, it
+sometimes becomes unseeable. It
+congregates around tree sap.
+
+   ↞--------| STATS |--------↠ 
+             hp:         61
+         attack:         90
+        defense:         45
+ special-attack:         50
+special-defense:         50
+          speed:        160
+
+Pokedex ID: 291	Capture Rate: 120
+Base Exp: 160	Happiness: 50
+Height: 8	Weight: 120
+
+Genus: Ninja Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 456
-Hp:  61
-Attack:  90
-Defence:  45
-Special Attack:  50
-Special Defence:  50
-Speed:  160
diff --git a/pokeData/noctowl b/pokeData/noctowl
index bfb94a8..84cdbe4 100644
--- a/pokeData/noctowl
+++ b/pokeData/noctowl
@@ -1,15 +1,57 @@
+noctowl	A normal type Pokémon
 
-Name:  Noctowl
-Pokedex Number:  164
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Insomnia - Keen Eye - Tinted Lens (Hidden Ability)
+Its eyes are specially adapted. They
+concentrate even faint light and enable it
+to see in the dark.
 
-Base Stats
-----------------------
-Total: 442
-Hp:  100
-Attack:  50
-Defence:  50
-Special Attack:  76
-Special Defence:  96
-Speed:  70
+   ↞--------| STATS |--------↠ 
+             hp:        100
+         attack:         50
+        defense:         50
+ special-attack:         86
+special-defense:         96
+          speed:         70
+
+Pokedex ID: 164	Capture Rate: 90
+Base Exp: 158	Happiness: 50
+Height: 16	Weight: 408
+
+Genus: Owl Pokémon
+Location Areas:
+mt-coronet-exterior-snowfall
+mt-coronet-exterior-blizzard
+great-marsh-area-1
+great-marsh-area-2
+great-marsh-area-3
+great-marsh-area-4
+sendoff-spring-area
+lake-valor-area
+lake-acuity-area
+acuity-lakefront-area
+sinnoh-route-210-south-towards-solaceon-town
+sinnoh-route-210-west-towards-celestic-town
+sinnoh-route-211-east-towards-celestic-town
+sinnoh-route-216-area
+sinnoh-route-217-area
+ilex-forest-area
+johto-route-37-area
+johto-route-38-area
+johto-route-39-area
+johto-route-43-area
+johto-route-47-area
+kanto-route-26-area
+kanto-route-27-area
+kanto-route-2-south-towards-viridian-city
+kanto-route-5-area
+kanto-route-8-area
+kanto-route-11-area
+kanto-route-13-area
+kanto-route-14-area
+kanto-route-15-area
+kanto-route-25-area
+kanto-route-2-north-towards-pewter-city
+viridian-forest-area
+abundant-shrine-area
+nature-sanctuary-area
+kalos-route-20-area
+pokemon-village-area
diff --git a/pokeData/noibat b/pokeData/noibat
index 61d25c2..90b1406 100644
--- a/pokeData/noibat
+++ b/pokeData/noibat
@@ -1,15 +1,21 @@
+noibat	A flying type Pokémon
 
-Name:  Noibat
-Pokedex Number:  714
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Frisk - Infiltrator - Telepathy (Hidden Ability)
+真っ暗な　洞窟で　暮らす。
+２０万ヘルツの　超音波を
+大きな　耳から　発射する。
+
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         30
+        defense:         35
+ special-attack:         45
+special-defense:         40
+          speed:         55
+
+Pokedex ID: 714	Capture Rate: 190
+Base Exp: 49	Happiness: 50
+Height: 5	Weight: 80
+
+Genus: Sound Wave Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 245
-Hp:  40
-Attack:  30
-Defence:  35
-Special Attack:  45
-Special Defence:  40
-Speed:  55
diff --git a/pokeData/noivern b/pokeData/noivern
index ebcc940..24b7c90 100644
--- a/pokeData/noivern
+++ b/pokeData/noivern
@@ -1,15 +1,21 @@
+noivern	A flying type Pokémon
 
-Name:  Noivern
-Pokedex Number:  715
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Frisk - Infiltrator - Telepathy (Hidden Ability)
+月明かりすら　ない　闇夜を　飛び
+油断している　獲物を　襲う。
+暗闇の　戦いでは　無敵だ。
+
+   ↞--------| STATS |--------↠ 
+             hp:         85
+         attack:         70
+        defense:         80
+ special-attack:         97
+special-defense:         80
+          speed:        123
+
+Pokedex ID: 715	Capture Rate: 45
+Base Exp: 187	Happiness: 50
+Height: 15	Weight: 850
+
+Genus: Sound Wave Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 535
-Hp:  85
-Attack:  70
-Defence:  80
-Special Attack:  97
-Special Defence:  80
-Speed:  123
diff --git a/pokeData/nosepass b/pokeData/nosepass
index 4039b17..de7c0f7 100644
--- a/pokeData/nosepass
+++ b/pokeData/nosepass
@@ -1,15 +1,43 @@
+nosepass	A rock type Pokémon
 
-Name:  Nosepass
-Pokedex Number:  299
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Sturdy - Magnet Pull - Sand Force (Hidden Ability)
+When endangered, it may protect
+itself by raising its magnetism and
+drawing iron objects to its body.
 
-Base Stats
-----------------------
-Total: 375
-Hp:  30
-Attack:  45
-Defence:  135
-Special Attack:  45
-Special Defence:  90
-Speed:  30
+   ↞--------| STATS |--------↠ 
+             hp:         30
+         attack:         45
+        defense:        135
+ special-attack:         45
+special-defense:         90
+          speed:         30
+
+Pokedex ID: 299	Capture Rate: 255
+Base Exp: 75	Happiness: 70
+Height: 10	Weight: 970
+
+Genus: Compass Pokémon
+Location Areas:
+mt-coronet-1f-route-207
+mt-coronet-2f
+mt-coronet-3f
+mt-coronet-exterior-snowfall
+mt-coronet-exterior-blizzard
+mt-coronet-4f
+mt-coronet-4f-small-room
+mt-coronet-5f
+mt-coronet-6f
+mt-coronet-1f-from-exterior
+mt-coronet-1f-route-216
+mt-coronet-1f-route-211
+mt-coronet-b1f
+sinnoh-route-206-area
+granite-cave-b2f
+chargestone-cave-1f
+chargestone-cave-b1f
+chargestone-cave-b2f
+clay-tunnel-area
+underground-ruins-area
+rocky-mountain-room-area
+glacier-room-area
+iron-room-area
diff --git a/pokeData/numel b/pokeData/numel
index 3c5a310..c40ce57 100644
--- a/pokeData/numel
+++ b/pokeData/numel
@@ -1,15 +1,40 @@
+numel	A fire type Pokémon
 
-Name:  Numel
-Pokedex Number:  322
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Oblivious - Simple - Own Tempo (Hidden Ability)
+Its humped back stores intensely
+hot magma. In rain, the magma
+cools, slowing its movement.
 
-Base Stats
-----------------------
-Total: 305
-Hp:  60
-Attack:  60
-Defence:  40
-Special Attack:  65
-Special Defence:  45
-Speed:  35
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         60
+        defense:         40
+ special-attack:         65
+special-defense:         45
+          speed:         35
+
+Pokedex ID: 322	Capture Rate: 255
+Base Exp: 61	Happiness: 70
+Height: 7	Weight: 240
+
+Genus: Numb Pokémon
+Location Areas:
+stark-mountain-area
+sinnoh-route-227-area
+ilex-forest-area
+viridian-forest-area
+jagged-pass-area
+fiery-path-area
+hoenn-route-112-area
+reversal-mountain-unknown-area-48
+reversal-mountain-unknown-area-49
+reversal-mountain-unknown-area-50
+reversal-mountain-unknown-area-51
+reversal-mountain-unknown-area-52
+reversal-mountain-unknown-area-53
+reversal-mountain-unknown-area-54
+reversal-mountain-unknown-area-55
+reversal-mountain-unknown-area-56
+reversal-mountain-unknown-area-57
+reversal-mountain-unknown-area-58
+reversal-mountain-unknown-area-59
+reversal-mountain-unknown-area-60
diff --git a/pokeData/nuzleaf b/pokeData/nuzleaf
index c1ec61e..b89e965 100644
--- a/pokeData/nuzleaf
+++ b/pokeData/nuzleaf
@@ -1,15 +1,24 @@
+nuzleaf	A grass type Pokémon
 
-Name:  Nuzleaf
-Pokedex Number:  274
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Chlorophyll - Early Bird - Pickpocket (Hidden Ability)
+The sound of its grass flute makes
+its listeners uneasy. It lives deep
+in forests.
 
-Base Stats
-----------------------
-Total: 340
-Hp:  70
-Attack:  70
-Defence:  40
-Special Attack:  60
-Special Defence:  40
-Speed:  60
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         70
+        defense:         40
+ special-attack:         60
+special-defense:         40
+          speed:         60
+
+Pokedex ID: 274	Capture Rate: 120
+Base Exp: 119	Happiness: 50
+Height: 10	Weight: 280
+
+Genus: Wily Pokémon
+Location Areas:
+sinnoh-route-210-south-towards-solaceon-town
+sinnoh-route-229-area
+hoenn-route-114-area
+nature-sanctuary-area
diff --git a/pokeData/obstagoon b/pokeData/obstagoon
index b13c40d..7b4e349 100644
--- a/pokeData/obstagoon
+++ b/pokeData/obstagoon
@@ -1,15 +1,21 @@
+obstagoon	A dark type Pokémon
 
-Name:  Obstagoon
-Pokedex Number:  862
-Gender Ratio:   ♂:50.2% ♀:49.8% 
-Abilities: Reckless - Guts - Defiant (Hidden Ability)
+Its voice is staggering in volume. Obstagoon
+has a tendency to take on a threatening posture
+and shout—this move is known as Obstruct.
+
+   ↞--------| STATS |--------↠ 
+             hp:         93
+         attack:         90
+        defense:        101
+ special-attack:         60
+special-defense:         81
+          speed:         95
+
+Pokedex ID: 862	Capture Rate: 45
+Base Exp: 260	Happiness: 50
+Height: 16	Weight: 460
+
+Genus: Blocking Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 520
-Hp:  93
-Attack:  90
-Defence:  101
-Special Attack:  60
-Special Defence:  81
-Speed:  95
diff --git a/pokeData/octillery b/pokeData/octillery
index b8d9fe8..0799dc5 100644
--- a/pokeData/octillery
+++ b/pokeData/octillery
@@ -1,15 +1,36 @@
+octillery	A water type Pokémon
 
-Name:  Octillery
-Pokedex Number:  224
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Suction Cups - Sniper - Moody (Hidden Ability)
+It traps enemies with its suction-cupped
+tentacles, then smashes them with its
+rock-hard head.
 
-Base Stats
-----------------------
-Total: 480
-Hp:  75
-Attack:  105
-Defence:  75
-Special Attack:  105
-Special Defence:  75
-Speed:  45
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:        105
+        defense:         75
+ special-attack:        105
+special-defense:         75
+          speed:         45
+
+Pokedex ID: 224	Capture Rate: 75
+Base Exp: 168	Happiness: 50
+Height: 9	Weight: 285
+
+Genus: Jet Pokémon
+Location Areas:
+pastoria-city-area
+sunyshore-city-area
+sinnoh-pokemon-league-area
+sinnoh-route-212-east-towards-pastoria-city
+sinnoh-route-213-area
+sinnoh-route-222-area
+sinnoh-route-224-area
+sinnoh-sea-route-223-area
+sinnoh-sea-route-230-area
+hoenn-safari-zone-expansion-south
+undella-bay-area
+undella-town-area
+unova-route-21-area
+shalour-city-area
+kalos-route-12-area
+azure-bay-area
diff --git a/pokeData/oddish b/pokeData/oddish
index 262fb1b..92705d3 100644
--- a/pokeData/oddish
+++ b/pokeData/oddish
@@ -1,15 +1,51 @@
+oddish	A grass type Pokémon
 
-Name:  Oddish
-Pokedex Number:  043
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Chlorophyll - Run Away (Hidden Ability)
+ODDISH searches for fertile, nutrient-
+rich soil, then plants itself.
+During the daytime, while it is planted,this POKéMON’s feet are thought to
+change shape and become similar to
+the roots of trees.
 
-Base Stats
-----------------------
-Total: 320
-Hp:  45
-Attack:  50
-Defence:  55
-Special Attack:  75
-Special Defence:  65
-Speed:  30
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         50
+        defense:         55
+ special-attack:         75
+special-defense:         65
+          speed:         30
+
+Pokedex ID: 43	Capture Rate: 255
+Base Exp: 64	Happiness: 50
+Height: 5	Weight: 54
+
+Genus: Weed Pokémon
+Location Areas:
+sinnoh-route-224-area
+sinnoh-route-229-area
+sinnoh-sea-route-230-area
+ilex-forest-area
+kanto-route-12-area
+kanto-route-5-area
+kanto-route-6-area
+kanto-route-7-area
+kanto-route-13-area
+kanto-route-14-area
+kanto-route-15-area
+kanto-route-24-area
+kanto-route-25-area
+hoenn-route-110-area
+hoenn-route-117-area
+hoenn-route-119-area
+hoenn-route-120-area
+hoenn-route-121-area
+hoenn-route-123-area
+hoenn-safari-zone-nwmach-bike-area
+hoenn-safari-zone-neacro-bike-area
+hoenn-safari-zone-sw
+hoenn-safari-zone-se
+berry-forest-area
+cape-brink-area
+bond-bridge-area
+water-path-area
+kalos-route-6-area
+johto-safari-zone-zone-marshland
diff --git a/pokeData/omanyte b/pokeData/omanyte
index c0abaad..507d26f 100644
--- a/pokeData/omanyte
+++ b/pokeData/omanyte
@@ -1,15 +1,22 @@
+omanyte	A rock type Pokémon
 
-Name:  Omanyte
-Pokedex Number:  138
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Swift Swim - Shell Armor - Weak Armor (Hidden Ability)
+OMANYTE is one of the ancient and long-
+since-extinct POKéMON that have been
+regenerated from fossils by people.If attacked by an enemy, it withdraws
+itself inside its hard shell.
 
-Base Stats
-----------------------
-Total: 355
-Hp:  35
-Attack:  40
-Defence:  100
-Special Attack:  90
-Special Defence:  55
-Speed:  35
+   ↞--------| STATS |--------↠ 
+             hp:         35
+         attack:         40
+        defense:        100
+ special-attack:         90
+special-defense:         55
+          speed:         35
+
+Pokedex ID: 138	Capture Rate: 45
+Base Exp: 71	Happiness: 50
+Height: 4	Weight: 75
+
+Genus: Spiral Pokémon
+Location Areas:
+cinnabar-island-cinnabar-lab
diff --git a/pokeData/omastar b/pokeData/omastar
index 13127d5..a178e93 100644
--- a/pokeData/omastar
+++ b/pokeData/omastar
@@ -1,15 +1,22 @@
+omastar	A rock type Pokémon
 
-Name:  Omastar
-Pokedex Number:  139
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Swift Swim - Shell Armor - Weak Armor (Hidden Ability)
+OMASTAR uses its tentacles to capture
+its prey. It is believed to have become
+extinct because its shell grew too largeand heavy, causing its movements to
+become too slow and ponderous.
+
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         60
+        defense:        125
+ special-attack:        115
+special-defense:         70
+          speed:         55
+
+Pokedex ID: 139	Capture Rate: 45
+Base Exp: 173	Happiness: 50
+Height: 10	Weight: 350
+
+Genus: Spiral Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 495
-Hp:  70
-Attack:  60
-Defence:  125
-Special Attack:  115
-Special Defence:  70
-Speed:  55
diff --git a/pokeData/onix b/pokeData/onix
index 13a9447..6ce3c1c 100644
--- a/pokeData/onix
+++ b/pokeData/onix
@@ -1,15 +1,77 @@
+onix	A rock type Pokémon
 
-Name:  Onix
-Pokedex Number:  095
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Rock Head - Sturdy - Weak Armor (Hidden Ability)
+ONIX has a magnet in its brain. It acts
+as a compass so that this POKéMON does
+not lose direction while it is tunneling.As it grows older, its body becomes
+increasingly rounder and smoother.
 
-Base Stats
-----------------------
-Total: 385
-Hp:  35
-Attack:  45
-Defence:  160
-Special Attack:  30
-Special Defence:  45
-Speed:  70
+   ↞--------| STATS |--------↠ 
+             hp:         35
+         attack:         45
+        defense:        160
+ special-attack:         30
+special-defense:         45
+          speed:         70
+
+Pokedex ID: 95	Capture Rate: 45
+Base Exp: 77	Happiness: 50
+Height: 88	Weight: 2100
+
+Genus: Rock Snake Pokémon
+Location Areas:
+oreburgh-mine-1f
+oreburgh-mine-b1f
+sinnoh-victory-road-1f
+sinnoh-victory-road-2f
+sinnoh-victory-road-b1f
+sinnoh-victory-road-inside
+sinnoh-victory-road-inside-exit
+stark-mountain-entrance
+stark-mountain-inside
+snowpoint-temple-1f
+snowpoint-temple-b1f
+snowpoint-temple-b2f
+snowpoint-temple-b3f
+wayward-cave-1f
+wayward-cave-b1f
+iron-island-1f
+iron-island-b1f-left
+iron-island-b1f-right
+iron-island-b2f-right
+iron-island-b2f-left
+iron-island-b3f
+union-cave-1f
+union-cave-b1f
+union-cave-b2f
+johto-route-47-inside-cave
+mt-silver-1f
+mt-silver-mountainside
+mt-silver-top
+rock-tunnel-1f
+rock-tunnel-b1f
+kanto-victory-road-1-1f
+kanto-victory-road-1-2f
+kanto-victory-road-1-3f
+rock-tunnel-b2f
+kanto-victory-road-2-1f
+kanto-victory-road-2-2f
+kanto-victory-road-2-3f
+sevault-canyon-area
+relic-castle-c
+twist-mountain-area
+unova-victory-road-2-unknown-area-74
+unova-victory-road-2-unknown-area-75
+unova-victory-road-2-unknown-area-77
+unova-victory-road-2-unknown-area-80
+relic-passage-castelia-sewers-entrance
+relic-passage-relic-castle-entrance
+relic-passage-pwt-entrance
+clay-tunnel-area
+underground-ruins-area
+rocky-mountain-room-area
+glacier-room-area
+iron-room-area
+cyllage-city-area
+glittering-cave-unknown-area-303
+glittering-cave-unknown-area-304
+johto-safari-zone-zone-wasteland
diff --git a/pokeData/oranguru b/pokeData/oranguru
index ec67ac3..6c0a309 100644
--- a/pokeData/oranguru
+++ b/pokeData/oranguru
@@ -1,15 +1,21 @@
+oranguru	A normal type Pokémon
 
-Name:  Oranguru
-Pokedex Number:  765
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Inner Focus - Telepathy - Symbiosis (Hidden Ability)
+Known for its extreme intelligence, this Pokémon
+will look down on inexperienced Trainers, so it’s
+best suited to veteran Trainers.
+
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:         60
+        defense:         80
+ special-attack:         90
+special-defense:        110
+          speed:         60
+
+Pokedex ID: 765	Capture Rate: 45
+Base Exp: 172	Happiness: 50
+Height: 15	Weight: 760
+
+Genus: Sage Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 490
-Hp:  90
-Attack:  60
-Defence:  80
-Special Attack:  90
-Special Defence:  110
-Speed:  60
diff --git a/pokeData/orbeetle b/pokeData/orbeetle
index b98d108..d7c38fa 100644
--- a/pokeData/orbeetle
+++ b/pokeData/orbeetle
@@ -1,15 +1,21 @@
+orbeetle	A bug type Pokémon
 
-Name:  Orbeetle
-Pokedex Number:  826
-Gender Ratio:   ♂:50.2% ♀:49.8% 
-Abilities: Swarm - Frisk - Telepathy (Hidden Ability)
+It’s famous for its high level of intelligence, and
+the large size of its brain is proof that it also
+possesses immense psychic power.
+
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         45
+        defense:        110
+ special-attack:         80
+special-defense:        120
+          speed:         90
+
+Pokedex ID: 826	Capture Rate: 45
+Base Exp: 253	Happiness: 50
+Height: 4	Weight: 408
+
+Genus: Seven Spot Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 505
-Hp:  80
-Attack:  120
-Defence:  90
-Special Attack:  Max Stats<b
-Special Defence:  Lv. 50
-Speed:  120 - 167
diff --git a/pokeData/oricorio b/pokeData/oricorio
index 529f052..dc35955 100644
--- a/pokeData/oricorio
+++ b/pokeData/oricorio
@@ -1,15 +1,15 @@
+	A  type Pokémon
 
-Name:  Oricorio
-Pokedex Number:  741
-Gender Ratio:   ♂:25% ♀:75% 
-Abilities: Dancer
+It beats its wings together to create fire.
+As it moves in the steps of its beautiful dance,
+it bathes opponents in intense flames.
+
+   ↞--------| STATS |--------↠ 
+
+Pokedex ID: 	Capture Rate: 45
+Base Exp: 	Happiness: 70
+Height: 	Weight: 
+
+Genus: Dancing Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 476
-Hp:  75
-Attack:  70
-Defence:  70
-Special Attack:  98
-Special Defence:  70
-Speed:  93
diff --git a/pokeData/oshawott b/pokeData/oshawott
index 225630a..124a1a9 100644
--- a/pokeData/oshawott
+++ b/pokeData/oshawott
@@ -1,15 +1,23 @@
+oshawott	A water type Pokémon
 
-Name:  Oshawott
-Pokedex Number:  501
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Torrent - Shell Armor (Hidden Ability)
+배에 생기는 가리비칼은
+싸울 때뿐 아니라 딱딱한
+나무열매를 쪼갤 때도 사용한다.
 
-Base Stats
-----------------------
-Total: 308
-Hp:  55
-Attack:  55
-Defence:  45
-Special Attack:  63
-Special Defence:  45
-Speed:  45
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         55
+        defense:         45
+ special-attack:         63
+special-defense:         45
+          speed:         45
+
+Pokedex ID: 501	Capture Rate: 45
+Base Exp: 62	Happiness: 70
+Height: 5	Weight: 59
+
+Genus: Sea Otter Pokémon
+Location Areas:
+hoenn-route-101-area
+aspertia-city-area
+nuvema-town-area
diff --git a/pokeData/overqwil b/pokeData/overqwil
index 486e824..b4d56c0 100644
--- a/pokeData/overqwil
+++ b/pokeData/overqwil
@@ -1,15 +1,19 @@
+overqwil	A dark type Pokémon
 
-Name:  Overqwil
-Pokedex Number:  904
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Poison Point - Swift Swim - Intimidate (Hidden Ability)
+                null
+
+   ↞--------| STATS |--------↠ 
+             hp:         85
+         attack:        115
+        defense:         95
+ special-attack:         65
+special-defense:         65
+          speed:         85
+
+Pokedex ID: 904	Capture Rate: 135
+Base Exp: null	Happiness: null
+Height: 25	Weight: 605
+
+Genus: null
+Location Areas:
 
-Base Stats
-----------------------
-Total: 510
-Hp:  85
-Attack:  115
-Defence:  95
-Special Attack:  65
-Special Defence:  65
-Speed:  85
diff --git a/pokeData/pachirisu b/pokeData/pachirisu
index d5adaed..d8dde25 100644
--- a/pokeData/pachirisu
+++ b/pokeData/pachirisu
@@ -1,15 +1,25 @@
+pachirisu	A electric type Pokémon
 
-Name:  Pachirisu
-Pokedex Number:  417
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Run Away - Pickup - Volt Absorb (Hidden Ability)
+Il arrive que deux Pachirisu se
+frottent les joues pour partager
+l’électricité qu’ils ont accumulée.
 
-Base Stats
-----------------------
-Total: 405
-Hp:  60
-Attack:  45
-Defence:  70
-Special Attack:  45
-Special Defence:  90
-Speed:  95
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         45
+        defense:         70
+ special-attack:         45
+special-defense:         90
+          speed:         95
+
+Pokedex ID: 417	Capture Rate: 200
+Base Exp: 142	Happiness: 100
+Height: 4	Weight: 39
+
+Genus: EleSquirrel Pokémon
+Location Areas:
+valley-windworks-area
+fuego-ironworks-area
+sinnoh-route-205-south-towards-floaroma-town
+sinnoh-route-205-east-towards-eterna-city
+kalos-route-12-area
diff --git a/pokeData/palkia b/pokeData/palkia
index 9b76568..1bb7ac2 100644
--- a/pokeData/palkia
+++ b/pokeData/palkia
@@ -1,15 +1,21 @@
+palkia	A water type Pokémon
 
-Name:  Palkia
-Pokedex Number:  484
-Gender Ratio:  Genderless
-Abilities: Pressure - Telepathy (Hidden Ability)
+On dit que la stabilité de l’espace
+est maintenue par le souffle de ce
+Pokémon légendaire de Sinnoh.
 
-Base Stats
-----------------------
-Total: 680
-Hp:  90
-Attack:  120
-Defence:  100
-Special Attack:  150
-Special Defence:  120
-Speed:  100
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:        120
+        defense:        100
+ special-attack:        150
+special-defense:        120
+          speed:        100
+
+Pokedex ID: 484	Capture Rate: 3
+Base Exp: 340	Happiness: 0
+Height: 42	Weight: 3360
+
+Genus: Spatial Pokémon
+Location Areas:
+spear-pillar-area
diff --git a/pokeData/palossand b/pokeData/palossand
index a103bee..4de9128 100644
--- a/pokeData/palossand
+++ b/pokeData/palossand
@@ -1,15 +1,21 @@
+palossand	A ghost type Pokémon
 
-Name:  Palossand
-Pokedex Number:  770
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Water Compaction - Sand Veil (Hidden Ability)
+Possessed people controlled by this Pokémon
+transformed its sand mound into a castle. As it
+evolved, its power to curse grew ever stronger.
+
+   ↞--------| STATS |--------↠ 
+             hp:         85
+         attack:         75
+        defense:        110
+ special-attack:        100
+special-defense:         75
+          speed:         35
+
+Pokedex ID: 770	Capture Rate: 60
+Base Exp: 168	Happiness: 50
+Height: 13	Weight: 2500
+
+Genus: Sand Castle Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 480
-Hp:  85
-Attack:  75
-Defence:  110
-Special Attack:  100
-Special Defence:  75
-Speed:  35
diff --git a/pokeData/palpitoad b/pokeData/palpitoad
index 8f8757b..851dacf 100644
--- a/pokeData/palpitoad
+++ b/pokeData/palpitoad
@@ -1,15 +1,24 @@
+palpitoad	A water type Pokémon
 
-Name:  Palpitoad
-Pokedex Number:  536
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Swift Swim - Hydration - Water Absorb (Hidden Ability)
+머리의 혹을 진동시키면
+물속에 파동이 일어나며
+땅마저 지진처럼 흔들린다.
 
-Base Stats
-----------------------
-Total: 384
-Hp:  75
-Attack:  65
-Defence:  55
-Special Attack:  65
-Special Defence:  55
-Speed:  69
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:         65
+        defense:         55
+ special-attack:         65
+special-defense:         55
+          speed:         69
+
+Pokedex ID: 536	Capture Rate: 120
+Base Exp: 134	Happiness: 50
+Height: 8	Weight: 170
+
+Genus: Vibration Pokémon
+Location Areas:
+icirrus-city-area
+pinwheel-forest-outside
+unova-route-8-area
+moor-of-icirrus-area
diff --git a/pokeData/pancham b/pokeData/pancham
index 3752678..409ee39 100644
--- a/pokeData/pancham
+++ b/pokeData/pancham
@@ -1,15 +1,21 @@
+pancham	A fighting type Pokémon
 
-Name:  Pancham
-Pokedex Number:  674
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Iron Fist - Mold Breaker - Scrappy (Hidden Ability)
+It does its best to be taken seriously by its enemies,
+but its glare is not sufficiently intimidating.
+Chewing on a leaf is its trademark.
 
-Base Stats
-----------------------
-Total: 348
-Hp:  67
-Attack:  82
-Defence:  62
-Special Attack:  46
-Special Defence:  48
-Speed:  43
+   ↞--------| STATS |--------↠ 
+             hp:         67
+         attack:         82
+        defense:         62
+ special-attack:         46
+special-defense:         48
+          speed:         43
+
+Pokedex ID: 674	Capture Rate: 220
+Base Exp: 70	Happiness: 50
+Height: 6	Weight: 80
+
+Genus: Playful Pokémon
+Location Areas:
+kalos-route-5-area
diff --git a/pokeData/pangoro b/pokeData/pangoro
index 4340533..38c24ef 100644
--- a/pokeData/pangoro
+++ b/pokeData/pangoro
@@ -1,15 +1,21 @@
+pangoro	A fighting type Pokémon
 
-Name:  Pangoro
-Pokedex Number:  675
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Iron Fist - Mold Breaker - Scrappy (Hidden Ability)
+気性が　荒く　ケンカっ早いが
+弱いものいじめは　許さない。
+葉っぱで　敵の　動きを　読む。
+
+   ↞--------| STATS |--------↠ 
+             hp:         95
+         attack:        124
+        defense:         78
+ special-attack:         69
+special-defense:         71
+          speed:         58
+
+Pokedex ID: 675	Capture Rate: 65
+Base Exp: 173	Happiness: 50
+Height: 21	Weight: 1360
+
+Genus: Daunting Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 495
-Hp:  95
-Attack:  124
-Defence:  78
-Special Attack:  69
-Special Defence:  71
-Speed:  58
diff --git a/pokeData/panpour b/pokeData/panpour
index 16954ac..09bd9ab 100644
--- a/pokeData/panpour
+++ b/pokeData/panpour
@@ -1,15 +1,24 @@
+panpour	A water type Pokémon
 
-Name:  Panpour
-Pokedex Number:  515
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Gluttony - Torrent (Hidden Ability)
+머리 송아리에 모은 물은
+영양 듬뿍. 꼬리를 사용해서
+그 물을 초목에 뿌린다.
 
-Base Stats
-----------------------
-Total: 316
-Hp:  50
-Attack:  53
-Defence:  48
-Special Attack:  53
-Special Defence:  48
-Speed:  64
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         53
+        defense:         48
+ special-attack:         53
+special-defense:         48
+          speed:         64
+
+Pokedex ID: 515	Capture Rate: 190
+Base Exp: 63	Happiness: 70
+Height: 6	Weight: 135
+
+Genus: Spray Pokémon
+Location Areas:
+dreamyard-area
+pinwheel-forest-inside
+lostlorn-forest-area
+santalune-forest-area
diff --git a/pokeData/pansage b/pokeData/pansage
index c2b5d6d..24abfd2 100644
--- a/pokeData/pansage
+++ b/pokeData/pansage
@@ -1,15 +1,24 @@
+pansage	A grass type Pokémon
 
-Name:  Pansage
-Pokedex Number:  511
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Gluttony - Overgrow (Hidden Ability)
+기운이 없는 포켓몬에게
+머리의 잎사귀를 나눠준다.
+피로를 풀어주는 효과가 있다.
 
-Base Stats
-----------------------
-Total: 316
-Hp:  50
-Attack:  53
-Defence:  48
-Special Attack:  53
-Special Defence:  48
-Speed:  64
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         53
+        defense:         48
+ special-attack:         53
+special-defense:         48
+          speed:         64
+
+Pokedex ID: 511	Capture Rate: 190
+Base Exp: 63	Happiness: 70
+Height: 6	Weight: 105
+
+Genus: Grass Monkey Pokémon
+Location Areas:
+dreamyard-area
+pinwheel-forest-inside
+lostlorn-forest-area
+santalune-forest-area
diff --git a/pokeData/pansear b/pokeData/pansear
index d4409cb..013cae0 100644
--- a/pokeData/pansear
+++ b/pokeData/pansear
@@ -1,15 +1,24 @@
+pansear	A fire type Pokémon
 
-Name:  Pansear
-Pokedex Number:  513
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Gluttony - Blaze (Hidden Ability)
+지능이 높고 나무열매는
+구운 뒤 먹는 습성이 있다.
+사람 도와주기를 좋아한다.
 
-Base Stats
-----------------------
-Total: 316
-Hp:  50
-Attack:  53
-Defence:  48
-Special Attack:  53
-Special Defence:  48
-Speed:  64
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         53
+        defense:         48
+ special-attack:         53
+special-defense:         48
+          speed:         64
+
+Pokedex ID: 513	Capture Rate: 190
+Base Exp: 63	Happiness: 70
+Height: 6	Weight: 110
+
+Genus: High Temp Pokémon
+Location Areas:
+dreamyard-area
+pinwheel-forest-inside
+lostlorn-forest-area
+santalune-forest-area
diff --git a/pokeData/paras b/pokeData/paras
index 30defe7..e62da4d 100644
--- a/pokeData/paras
+++ b/pokeData/paras
@@ -1,15 +1,30 @@
+paras	A bug type Pokémon
 
-Name:  Paras
-Pokedex Number:  046
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Effect Spore - Dry Skin - Damp (Hidden Ability)
+PARAS has parasitic mushrooms growing
+on its back called tochukaso. They grow
+large by drawing nutrients from thisBUG POKéMON host. They are highly
+valued as a medicine for extending life.
 
-Base Stats
-----------------------
-Total: 285
-Hp:  35
-Attack:  70
-Defence:  55
-Special Attack:  45
-Special Defence:  55
-Speed:  25
+   ↞--------| STATS |--------↠ 
+             hp:         35
+         attack:         70
+        defense:         55
+ special-attack:         45
+special-defense:         55
+          speed:         25
+
+Pokedex ID: 46	Capture Rate: 190
+Base Exp: 57	Happiness: 70
+Height: 3	Weight: 54
+
+Genus: Mushroom Pokémon
+Location Areas:
+ilex-forest-area
+mt-moon-1f
+mt-moon-2f
+mt-moon-b1f
+mt-moon-b2f
+kanto-safari-zone-middle
+kanto-safari-zone-area-1-east
+kanto-safari-zone-area-2-north
+johto-safari-zone-zone-swamp
diff --git a/pokeData/parasect b/pokeData/parasect
index 85e38d6..589dc1b 100644
--- a/pokeData/parasect
+++ b/pokeData/parasect
@@ -1,15 +1,27 @@
+parasect	A bug type Pokémon
 
-Name:  Parasect
-Pokedex Number:  047
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Effect Spore - Dry Skin - Damp (Hidden Ability)
+PARASECT is known to infest large trees
+en masse and drain nutrients from the
+lower trunk and roots.When an infested tree dies, they move
+onto another tree all at once.
 
-Base Stats
-----------------------
-Total: 405
-Hp:  60
-Attack:  95
-Defence:  80
-Special Attack:  60
-Special Defence:  80
-Speed:  30
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         95
+        defense:         80
+ special-attack:         60
+special-defense:         80
+          speed:         30
+
+Pokedex ID: 47	Capture Rate: 75
+Base Exp: 142	Happiness: 70
+Height: 10	Weight: 295
+
+Genus: Mushroom Pokémon
+Location Areas:
+mt-silver-2f
+cerulean-cave-1f
+cerulean-cave-2f
+cerulean-cave-b1f
+kanto-safari-zone-middle
+kanto-safari-zone-area-1-east
diff --git a/pokeData/passimian b/pokeData/passimian
index 542f3b3..d185f32 100644
--- a/pokeData/passimian
+++ b/pokeData/passimian
@@ -1,15 +1,21 @@
+passimian	A fighting type Pokémon
 
-Name:  Passimian
-Pokedex Number:  766
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Receiver - Defiant (Hidden Ability)
+They form groups of roughly 20 individuals.
+Their mutual bond is remarkable—they will never
+let down a comrade.
+
+   ↞--------| STATS |--------↠ 
+             hp:        100
+         attack:        120
+        defense:         90
+ special-attack:         40
+special-defense:         60
+          speed:         80
+
+Pokedex ID: 766	Capture Rate: 45
+Base Exp: 172	Happiness: 50
+Height: 20	Weight: 828
+
+Genus: Teamwork Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 490
-Hp:  100
-Attack:  120
-Defence:  90
-Special Attack:  40
-Special Defence:  60
-Speed:  80
diff --git a/pokeData/patrat b/pokeData/patrat
index d4069eb..4d53f57 100644
--- a/pokeData/patrat
+++ b/pokeData/patrat
@@ -1,15 +1,29 @@
+patrat	A normal type Pokémon
 
-Name:  Patrat
-Pokedex Number:  504
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Run Away - Keen Eye - Analytic (Hidden Ability)
+볼의 주머니에 먹이를 모아두고
+며칠이고 망보기를 계속한다.
+꼬리로 동료에게 신호한다.
 
-Base Stats
-----------------------
-Total: 255
-Hp:  45
-Attack:  55
-Defence:  39
-Special Attack:  35
-Special Defence:  39
-Speed:  42
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         55
+        defense:         39
+ special-attack:         35
+special-defense:         39
+          speed:         42
+
+Pokedex ID: 504	Capture Rate: 255
+Base Exp: 51	Happiness: 70
+Height: 5	Weight: 116
+
+Genus: Scout Pokémon
+Location Areas:
+dreamyard-area
+unova-route-1-area
+unova-route-2-area
+unova-route-3-area
+floccesy-ranch-inner
+virbank-complex-outer
+virbank-complex-inner
+unova-route-19-area
+unova-route-20-area
diff --git a/pokeData/pawniard b/pokeData/pawniard
index 89941e1..9b85626 100644
--- a/pokeData/pawniard
+++ b/pokeData/pawniard
@@ -1,15 +1,24 @@
+pawniard	A dark type Pokémon
 
-Name:  Pawniard
-Pokedex Number:  624
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Defiant - Inner Focus - Pressure (Hidden Ability)
+전신이 칼날인 포켓몬이다.
+싸움에서 칼의 이가 빠지면
+강가의 돌로 칼을 간다.
 
-Base Stats
-----------------------
-Total: 340
-Hp:  45
-Attack:  85
-Defence:  70
-Special Attack:  40
-Special Defence:  40
-Speed:  60
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         85
+        defense:         70
+ special-attack:         40
+special-defense:         40
+          speed:         60
+
+Pokedex ID: 624	Capture Rate: 120
+Base Exp: 68	Happiness: 35
+Height: 5	Weight: 102
+
+Genus: Sharp Blade Pokémon
+Location Areas:
+unova-route-9-area
+unova-route-11-area
+kalos-route-15-area
+lost-hotel-area
diff --git a/pokeData/pelipper b/pokeData/pelipper
index f340d79..5c5904b 100644
--- a/pokeData/pelipper
+++ b/pokeData/pelipper
@@ -1,15 +1,75 @@
+pelipper	A water type Pokémon
 
-Name:  Pelipper
-Pokedex Number:  279
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Keen Eye - Rain Dish (Hidden Ability)
+It dips its large bill in the sea,
+then scoops up numerous prey
+along with water.
 
-Base Stats
-----------------------
-Total: 430
-Hp:  60
-Attack:  50
-Defence:  100
-Special Attack:  85
-Special Defence:  70
-Speed:  65
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         50
+        defense:        100
+ special-attack:         95
+special-defense:         70
+          speed:         65
+
+Pokedex ID: 279	Capture Rate: 45
+Base Exp: 154	Happiness: 50
+Height: 12	Weight: 280
+
+Genus: Water Bird Pokémon
+Location Areas:
+canalave-city-area
+pastoria-city-area
+sunyshore-city-area
+sinnoh-pokemon-league-area
+valley-windworks-area
+fuego-ironworks-area
+iron-island-area
+sinnoh-route-205-south-towards-floaroma-town
+sinnoh-route-213-area
+sinnoh-route-218-area
+sinnoh-route-219-area
+sinnoh-route-221-area
+sinnoh-route-222-area
+sinnoh-route-224-area
+sinnoh-route-229-area
+sinnoh-sea-route-220-area
+sinnoh-sea-route-223-area
+sinnoh-sea-route-226-area
+sinnoh-sea-route-230-area
+slateport-city-area
+lilycove-city-area
+mossdeep-city-area
+ever-grande-city-area
+hoenn-route-103-area
+hoenn-route-104-area
+hoenn-route-105-area
+hoenn-route-106-area
+hoenn-route-107-area
+hoenn-route-108-area
+hoenn-route-109-area
+hoenn-route-110-area
+hoenn-route-115-area
+hoenn-route-118-area
+hoenn-route-119-area
+hoenn-route-121-area
+hoenn-route-122-area
+hoenn-route-123-area
+hoenn-route-124-area
+hoenn-route-125-area
+hoenn-route-126-area
+hoenn-route-127-area
+hoenn-route-128-area
+hoenn-route-129-area
+hoenn-route-130-area
+hoenn-route-131-area
+hoenn-route-132-area
+hoenn-route-133-area
+hoenn-route-134-area
+dewford-town-area
+pacifidlog-town-area
+giant-chasm-outside
+undella-bay-area
+unova-route-13-area
+undella-town-area
+unova-route-22-area
diff --git a/pokeData/perrserker b/pokeData/perrserker
index 31e5efd..d1d6923 100644
--- a/pokeData/perrserker
+++ b/pokeData/perrserker
@@ -1,15 +1,21 @@
+perrserker	A steel type Pokémon
 
-Name:  Perrserker
-Pokedex Number:  863
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Battle Armor - Tough Claws - Steely Spirit (Hidden Ability)
+What appears to be an iron helmet is actually
+hardened hair. This Pokémon lives for the thrill
+of battle.
+
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:        110
+        defense:        100
+ special-attack:         50
+special-defense:         60
+          speed:         50
+
+Pokedex ID: 863	Capture Rate: 90
+Base Exp: 154	Happiness: 50
+Height: 8	Weight: 280
+
+Genus: Viking Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 440
-Hp:  70
-Attack:  110
-Defence:  100
-Special Attack:  50
-Special Defence:  60
-Speed:  50
diff --git a/pokeData/persian b/pokeData/persian
index 70ce68a..af81321 100644
--- a/pokeData/persian
+++ b/pokeData/persian
@@ -1,15 +1,33 @@
+persian	A normal type Pokémon
 
-Name:  Persian
-Pokedex Number:  053
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Limber - Technician - Unnerve (Hidden Ability)
+PERSIAN has six bold whiskers that give
+it a look of toughness. The whiskers  
+sense air movements to determine whatis in the POKéMON’s surrounding
+vicinity. It becomes docile if grabbed
+by the whiskers.
 
-Base Stats
-----------------------
-Total: 440
-Hp:  65
-Attack:  70
-Defence:  60
-Special Attack:  65
-Special Defence:  65
-Speed:  115
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         70
+        defense:         60
+ special-attack:         65
+special-defense:         65
+          speed:        115
+
+Pokedex ID: 53	Capture Rate: 90
+Base Exp: 154	Happiness: 50
+Height: 10	Weight: 320
+
+Genus: Classy Cat Pokémon
+Location Areas:
+kanto-route-7-area
+cerulean-cave-1f
+kindle-road-area
+treasure-beach-area
+cape-brink-area
+bond-bridge-area
+five-isle-meadow-area
+water-path-area
+ruin-valley-area
+canyon-entrance-area
+sevault-canyon-area
diff --git a/pokeData/petilil b/pokeData/petilil
index 913b79d..f165d33 100644
--- a/pokeData/petilil
+++ b/pokeData/petilil
@@ -1,15 +1,25 @@
+petilil	A grass type Pokémon
 
-Name:  Petilil
-Pokedex Number:  548
-Gender Ratio:   ♂:0% ♀:100%
-Abilities: Chlorophyll - Own Tempo - Leaf Guard (Hidden Ability)
+머리의 잎사귀를 갉아먹으면
+매우 쓰지만 지친 몸을
+회복시켜주는 효과가 있다.
 
-Base Stats
-----------------------
-Total: 280
-Hp:  45
-Attack:  35
-Defence:  50
-Special Attack:  70
-Special Defence:  50
-Speed:  30
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         35
+        defense:         50
+ special-attack:         70
+special-defense:         50
+          speed:         30
+
+Pokedex ID: 548	Capture Rate: 190
+Base Exp: 56	Happiness: 50
+Height: 5	Weight: 66
+
+Genus: Bulb Pokémon
+Location Areas:
+pinwheel-forest-inside
+abundant-shrine-area
+lostlorn-forest-area
+castelia-city-area
+unova-victory-road-2-unknown-area-72
diff --git a/pokeData/phanpy b/pokeData/phanpy
index 6d7b7b2..c5d5070 100644
--- a/pokeData/phanpy
+++ b/pokeData/phanpy
@@ -1,15 +1,30 @@
+phanpy	A ground type Pokémon
 
-Name:  Phanpy
-Pokedex Number:  231
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Pickup - Sand Veil (Hidden Ability)
+It swings its long snout around playfully,
+but because it is so strong, this can be
+dangerous.
 
-Base Stats
-----------------------
-Total: 330
-Hp:  90
-Attack:  60
-Defence:  60
-Special Attack:  40
-Special Defence:  40
-Speed:  40
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:         60
+        defense:         60
+ special-attack:         40
+special-defense:         40
+          speed:         40
+
+Pokedex ID: 231	Capture Rate: 120
+Base Exp: 66	Happiness: 70
+Height: 5	Weight: 335
+
+Genus: Long Nose Pokémon
+Location Areas:
+sinnoh-route-207-area
+johto-route-45-area
+johto-route-46-area
+mt-silver-1f-top
+mt-silver-1f
+mt-silver-mountainside
+mt-silver-3f
+hoenn-safari-zone-neacro-bike-area
+canyon-entrance-area
+sevault-canyon-area
diff --git a/pokeData/phantump b/pokeData/phantump
index 8e23b05..ad53066 100644
--- a/pokeData/phantump
+++ b/pokeData/phantump
@@ -1,15 +1,21 @@
+phantump	A ghost type Pokémon
 
-Name:  Phantump
-Pokedex Number:  708
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Natural Cure - Frisk - Harvest (Hidden Ability)
+腐った　切り株に　魂が　宿り
+ポケモンに　なった。
+人の　寄りつかない　森に　住む。
 
-Base Stats
-----------------------
-Total: 309
-Hp:  43
-Attack:  70
-Defence:  48
-Special Attack:  50
-Special Defence:  60
-Speed:  38
+   ↞--------| STATS |--------↠ 
+             hp:         43
+         attack:         70
+        defense:         48
+ special-attack:         50
+special-defense:         60
+          speed:         38
+
+Pokedex ID: 708	Capture Rate: 120
+Base Exp: 62	Happiness: 50
+Height: 4	Weight: 70
+
+Genus: Stump Pokémon
+Location Areas:
+kalos-route-16-area
diff --git a/pokeData/pheromosa b/pokeData/pheromosa
index 30f1bc0..ddf7299 100644
--- a/pokeData/pheromosa
+++ b/pokeData/pheromosa
@@ -1,15 +1,21 @@
+pheromosa	A bug type Pokémon
 
-Name:  Pheromosa
-Pokedex Number:  795
-Gender Ratio:  Genderless
-Abilities: Beast Boost
+One of the dangerous Ultra Beasts, it has been
+spotted running across the land at
+terrific speeds.
+
+   ↞--------| STATS |--------↠ 
+             hp:         71
+         attack:        137
+        defense:         37
+ special-attack:        137
+special-defense:         37
+          speed:        151
+
+Pokedex ID: 795	Capture Rate: 45
+Base Exp: 285	Happiness: 0
+Height: 18	Weight: 250
+
+Genus: Lissome Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 570
-Hp:  71
-Attack:  137
-Defence:  37
-Special Attack:  137
-Special Defence:  37
-Speed:  151
diff --git a/pokeData/phione b/pokeData/phione
index e415154..4e1a4f4 100644
--- a/pokeData/phione
+++ b/pokeData/phione
@@ -1,15 +1,21 @@
+phione	A water type Pokémon
 
-Name:  Phione
-Pokedex Number:  489
-Gender Ratio:  Genderless
-Abilities: Hydration
+Ce Pokémon des mers chaudes
+revient toujours à son lieu de
+naissance, peu importe la distance.
+
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:         80
+        defense:         80
+ special-attack:         80
+special-defense:         80
+          speed:         80
+
+Pokedex ID: 489	Capture Rate: 30
+Base Exp: 216	Happiness: 70
+Height: 4	Weight: 31
+
+Genus: Sea Drifter Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 480
-Hp:  80
-Attack:  80
-Defence:  80
-Special Attack:  80
-Special Defence:  80
-Speed:  80
diff --git a/pokeData/pichu b/pokeData/pichu
index 069cf6d..99e643d 100644
--- a/pokeData/pichu
+++ b/pokeData/pichu
@@ -1 +1,22 @@
-	Stats currently unavailable :( 
+pichu	A electric type Pokémon
+
+It is not yet skilled at storing
+electricity. It may send out a jolt if
+amused or startled.
+
+   ↞--------| STATS |--------↠ 
+             hp:         20
+         attack:         40
+        defense:         15
+ special-attack:         35
+special-defense:         35
+          speed:         60
+
+Pokedex ID: 172	Capture Rate: 190
+Base Exp: 41	Happiness: 50
+Height: 3	Weight: 20
+
+Genus: Tiny Mouse Pokémon
+Location Areas:
+trophy-garden-area
+johto-route-34-area
diff --git a/pokeData/pidgeot b/pokeData/pidgeot
index eff6b03..977a40c 100644
--- a/pokeData/pidgeot
+++ b/pokeData/pidgeot
@@ -1,15 +1,23 @@
+pidgeot	A normal type Pokémon
 
-Name:  Pidgeot
-Pokedex Number:  017
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Keen Eye - Tangled Feet - Big Pecks (Hidden Ability)
+This POKéMON has a dazzling plumage of
+beautifully glossy feathers.
+Many TRAINERS are captivated by thestriking beauty of the feathers on its
+head, compelling them to choose PIDGEOT
+as their POKéMON.
+
+   ↞--------| STATS |--------↠ 
+             hp:         83
+         attack:         80
+        defense:         75
+ special-attack:         70
+special-defense:         70
+          speed:        101
+
+Pokedex ID: 18	Capture Rate: 45
+Base Exp: 216	Happiness: 70
+Height: 15	Weight: 395
+
+Genus: Bird Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 349
-Hp:  63
-Attack:  60
-Defence:  55
-Special Attack:  50
-Special Defence:  50
-Speed:  71
diff --git a/pokeData/pidgeotto b/pokeData/pidgeotto
index 81671fd..e576983 100644
--- a/pokeData/pidgeotto
+++ b/pokeData/pidgeotto
@@ -1,15 +1,46 @@
+pidgeotto	A normal type Pokémon
 
-Name:  Pidgeotto
-Pokedex Number:  017
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Keen Eye - Tangled Feet - Big Pecks (Hidden Ability)
+PIDGEOTTO claims a large area as its
+own territory. This POKéMON flies
+around, patrolling its living space.If its territory is violated, it shows
+no mercy in thoroughly punishing the
+foe with its sharp claws.
 
-Base Stats
-----------------------
-Total: 349
-Hp:  63
-Attack:  60
-Defence:  55
-Special Attack:  50
-Special Defence:  50
-Speed:  71
+   ↞--------| STATS |--------↠ 
+             hp:         63
+         attack:         60
+        defense:         55
+ special-attack:         50
+special-defense:         50
+          speed:         71
+
+Pokedex ID: 17	Capture Rate: 120
+Base Exp: 122	Happiness: 70
+Height: 11	Weight: 300
+
+Genus: Bird Pokémon
+Location Areas:
+johto-route-37-area
+johto-route-38-area
+johto-route-39-area
+johto-route-43-area
+kanto-route-12-area
+kanto-route-2-south-towards-viridian-city
+kanto-route-5-area
+kanto-route-6-area
+kanto-route-7-area
+kanto-route-8-area
+kanto-route-11-area
+kanto-route-13-area
+kanto-route-14-area
+kanto-route-15-area
+kanto-sea-route-21-area
+kanto-route-24-area
+kanto-route-25-area
+kanto-route-2-north-towards-pewter-city
+viridian-forest-area
+berry-forest-area
+bond-bridge-area
+five-isle-meadow-area
+johto-safari-zone-zone-plains
+johto-safari-zone-zone-mountain
diff --git a/pokeData/pidgey b/pokeData/pidgey
index 5a494c1..9e7ac61 100644
--- a/pokeData/pidgey
+++ b/pokeData/pidgey
@@ -1,15 +1,55 @@
+pidgey	A normal type Pokémon
 
-Name:  Pidgey
-Pokedex Number:  016
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Keen Eye - Tangled Feet - Big Pecks (Hidden Ability)
+PIDGEY has an extremely sharp sense
+of direction.
+It is capable of unerringly returninghome to its nest, however far it may be
+removed from its familiar surroundings.
 
-Base Stats
-----------------------
-Total: 251
-Hp:  40
-Attack:  45
-Defence:  40
-Special Attack:  35
-Special Defence:  35
-Speed:  56
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         45
+        defense:         40
+ special-attack:         35
+special-defense:         35
+          speed:         56
+
+Pokedex ID: 16	Capture Rate: 255
+Base Exp: 50	Happiness: 70
+Height: 3	Weight: 18
+
+Genus: Tiny Bird Pokémon
+Location Areas:
+sinnoh-route-229-area
+johto-route-29-area
+johto-route-30-area
+johto-route-31-area
+johto-route-32-area
+ilex-forest-area
+johto-route-34-area
+johto-route-35-area
+national-park-area
+johto-route-36-area
+johto-route-37-area
+kanto-route-12-area
+kanto-route-1-area
+kanto-route-2-south-towards-viridian-city
+kanto-route-3-area
+kanto-route-5-area
+kanto-route-6-area
+kanto-route-7-area
+kanto-route-8-area
+kanto-route-11-area
+kanto-route-13-area
+kanto-route-14-area
+kanto-route-15-area
+kanto-sea-route-21-area
+kanto-route-24-area
+kanto-route-25-area
+kanto-route-2-north-towards-pewter-city
+viridian-forest-area
+berry-forest-area
+bond-bridge-area
+five-isle-meadow-area
+kalos-route-2-area
+kalos-route-3-area
+johto-safari-zone-zone-forest
diff --git a/pokeData/pidove b/pokeData/pidove
index a5a2fb6..e0413d7 100644
--- a/pokeData/pidove
+++ b/pokeData/pidove
@@ -1,15 +1,27 @@
+pidove	A normal type Pokémon
 
-Name:  Pidove
-Pokedex Number:  519
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Big Pecks - Super Luck - Rivalry (Hidden Ability)
+매우 건망증이 심한 포켓몬으로
+트레이너에게 명령을 받았어도
+새로운 명령을 기다리고 있다.
 
-Base Stats
-----------------------
-Total: 264
-Hp:  50
-Attack:  55
-Defence:  50
-Special Attack:  36
-Special Defence:  30
-Speed:  43
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         55
+        defense:         50
+ special-attack:         36
+special-defense:         30
+          speed:         43
+
+Pokedex ID: 519	Capture Rate: 255
+Base Exp: 53	Happiness: 50
+Height: 3	Weight: 21
+
+Genus: Tiny Pigeon Pokémon
+Location Areas:
+pinwheel-forest-outside
+pinwheel-forest-inside
+unova-route-3-area
+castelia-city-area
+floccesy-ranch-inner
+virbank-complex-outer
+unova-route-20-area
diff --git a/pokeData/pignite b/pokeData/pignite
index a94e2db..23400c4 100644
--- a/pokeData/pignite
+++ b/pokeData/pignite
@@ -1,15 +1,21 @@
+pignite	A fire type Pokémon
 
-Name:  Pignite
-Pokedex Number:  499
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Blaze - Thick Fat (Hidden Ability)
+먹을수록 태울 것이 많아져
+위 속의 불꽃이 강해지고
+파워도 점점 넘치게 된다.
+
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:         93
+        defense:         55
+ special-attack:         70
+special-defense:         55
+          speed:         55
+
+Pokedex ID: 499	Capture Rate: 45
+Base Exp: 146	Happiness: 70
+Height: 10	Weight: 555
+
+Genus: Fire Pig Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 418
-Hp:  90
-Attack:  93
-Defence:  55
-Special Attack:  70
-Special Defence:  55
-Speed:  55
diff --git a/pokeData/pikachu b/pokeData/pikachu
index 069cf6d..6396db7 100644
--- a/pokeData/pikachu
+++ b/pokeData/pikachu
@@ -1 +1,35 @@
-	Stats currently unavailable :( 
+pikachu	A electric type Pokémon
+
+This POKéMON has electricity-storing
+pouches on its cheeks. These appear to
+become electrically charged during thenight while PIKACHU sleeps.
+It occasionally discharges electricity
+when it is dozy after waking up.
+
+   ↞--------| STATS |--------↠ 
+             hp:         35
+         attack:         55
+        defense:         40
+ special-attack:         50
+special-defense:         50
+          speed:         90
+
+Pokedex ID: 25	Capture Rate: 190
+Base Exp: 112	Happiness: 50
+Height: 4	Weight: 60
+
+Genus: Mouse Pokémon
+Location Areas:
+trophy-garden-area
+pallet-town-area
+kanto-route-2-south-towards-viridian-city
+viridian-forest-area
+power-plant-area
+hoenn-safari-zone-sw
+hoenn-safari-zone-se
+kalos-route-3-area
+santalune-forest-area
+slateport-city-contest-hall
+verdanturf-town-contest-hall
+fallarbor-town-contest-hall
+lilycove-city-contest-hall
diff --git a/pokeData/pikipek b/pokeData/pikipek
index 069cf6d..e502cf0 100644
--- a/pokeData/pikipek
+++ b/pokeData/pikipek
@@ -1 +1,21 @@
-	Stats currently unavailable :( 
+pikipek	A normal type Pokémon
+
+It can peck at a rate of 16 times a second to
+drill holes in trees. It uses the holes for food
+storage and for nesting.
+
+   ↞--------| STATS |--------↠ 
+             hp:         35
+         attack:         75
+        defense:         30
+ special-attack:         30
+special-defense:         30
+          speed:         65
+
+Pokedex ID: 731	Capture Rate: 255
+Base Exp: 53	Happiness: 70
+Height: 3	Weight: 12
+
+Genus: Woodpecker Pokémon
+Location Areas:
+
diff --git a/pokeData/piloswine b/pokeData/piloswine
index 84239d9..0d6b69a 100644
--- a/pokeData/piloswine
+++ b/pokeData/piloswine
@@ -1,15 +1,28 @@
+piloswine	A ice type Pokémon
 
-Name:  Piloswine
-Pokedex Number:  221
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Oblivious - Snow Cloak - Thick Fat (Hidden Ability)
+Because the long hair all over its body
+obscures its sight, it just keeps charging
+repeatedly.
 
-Base Stats
-----------------------
-Total: 450
-Hp:  100
-Attack:  100
-Defence:  80
-Special Attack:  60
-Special Defence:  60
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:        100
+         attack:        100
+        defense:         80
+ special-attack:         60
+special-defense:         60
+          speed:         50
+
+Pokedex ID: 221	Capture Rate: 75
+Base Exp: 158	Happiness: 50
+Height: 11	Weight: 558
+
+Genus: Swine Pokémon
+Location Areas:
+sinnoh-route-217-area
+giant-chasm-area
+giant-chasm-forest
+giant-chasm-forest-cave
+frost-cavern-unknown-area-314
+frost-cavern-unknown-area-315
+frost-cavern-unknown-area-316
+frost-cavern-unknown-area-317
diff --git a/pokeData/pincurchin b/pokeData/pincurchin
index 5a48258..d9ee281 100644
--- a/pokeData/pincurchin
+++ b/pokeData/pincurchin
@@ -1,15 +1,21 @@
+pincurchin	A electric type Pokémon
 
-Name:  Pincurchin
-Pokedex Number:  871
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Lightning Rod - Electric Surge (Hidden Ability)
+It feeds on seaweed, using its teeth to scrape it
+off rocks. Electric current flows from the tips of
+its spines.
+
+   ↞--------| STATS |--------↠ 
+             hp:         48
+         attack:        101
+        defense:         95
+ special-attack:         91
+special-defense:         85
+          speed:         15
+
+Pokedex ID: 871	Capture Rate: 75
+Base Exp: 152	Happiness: 50
+Height: 3	Weight: 10
+
+Genus: Sea Urchin Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 435
-Hp:  48
-Attack:  101
-Defence:  95
-Special Attack:  91
-Special Defence:  85
-Speed:  15
diff --git a/pokeData/pineco b/pokeData/pineco
index 8bfc481..4c31189 100644
--- a/pokeData/pineco
+++ b/pokeData/pineco
@@ -1,15 +1,45 @@
+pineco	A bug type Pokémon
 
-Name:  Pineco
-Pokedex Number:  204
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Sturdy - Overcoat (Hidden Ability)
+It likes to make its shell thicker by
+adding layers of tree bark. The extra
+weight doesn’t bother it.
 
-Base Stats
-----------------------
-Total: 290
-Hp:  50
-Attack:  65
-Defence:  90
-Special Attack:  35
-Special Defence:  35
-Speed:  15
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         65
+        defense:         90
+ special-attack:         35
+special-defense:         35
+          speed:         15
+
+Pokedex ID: 204	Capture Rate: 190
+Base Exp: 58	Happiness: 70
+Height: 6	Weight: 72
+
+Genus: Bagworm Pokémon
+Location Areas:
+eterna-forest-area
+sinnoh-route-203-area
+sinnoh-route-204-south-towards-jubilife-city
+sinnoh-route-204-north-towards-floaroma-town
+sinnoh-route-210-south-towards-solaceon-town
+sinnoh-route-229-area
+johto-route-29-area
+johto-route-30-area
+johto-route-31-area
+johto-route-32-area
+ilex-forest-area
+johto-route-34-area
+johto-route-35-area
+johto-route-36-area
+johto-route-37-area
+johto-route-38-area
+johto-route-39-area
+johto-route-43-area
+lake-of-rage-area
+kanto-route-26-area
+kanto-route-27-area
+hoenn-safari-zone-expansion-north
+hoenn-altering-cave-c
+kanto-altering-cave-c
+azalea-town-area
diff --git a/pokeData/pinsir b/pokeData/pinsir
index f5e6ee5..ccce595 100644
--- a/pokeData/pinsir
+++ b/pokeData/pinsir
@@ -1,15 +1,31 @@
+pinsir	A bug type Pokémon
 
-Name:  Pinsir
-Pokedex Number:  127
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Hyper Cutter - Mold Breaker - Moxie (Hidden Ability)
+PINSIR has a pair of massive horns 
+Protruding from the surface of these
+horns are thorns.These thorns are driven deeply into the
+foe’s body when the pincer closes,
+making it tough for the foe to escape.
 
-Base Stats
-----------------------
-Total: 500
-Hp:  65
-Attack:  155
-Defence:  120
-Special Attack:  65
-Special Defence:  90
-Speed:  105
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:        125
+        defense:        100
+ special-attack:         55
+special-defense:         70
+          speed:         85
+
+Pokedex ID: 127	Capture Rate: 45
+Base Exp: 175	Happiness: 50
+Height: 15	Weight: 550
+
+Genus: Stag Beetle Pokémon
+Location Areas:
+sinnoh-route-229-area
+kanto-safari-zone-middle
+kanto-safari-zone-area-1-east
+kanto-safari-zone-area-2-north
+kanto-safari-zone-area-3-west
+hoenn-safari-zone-nwmach-bike-area
+unova-route-12-area
+lostlorn-forest-area
+kalos-route-12-area
diff --git a/pokeData/piplup b/pokeData/piplup
index 4f9a3a4..74cd1e3 100644
--- a/pokeData/piplup
+++ b/pokeData/piplup
@@ -1,15 +1,23 @@
+piplup	A water type Pokémon
 
-Name:  Piplup
-Pokedex Number:  393
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Torrent - Defiant (Hidden Ability)
+Malgré sa démarche maladroite et
+ses pertes d’équilibre, il bombe
+toujours fièrement le torse.
 
-Base Stats
-----------------------
-Total: 314
-Hp:  53
-Attack:  51
-Defence:  53
-Special Attack:  61
-Special Defence:  56
-Speed:  40
+   ↞--------| STATS |--------↠ 
+             hp:         53
+         attack:         51
+        defense:         53
+ special-attack:         61
+special-defense:         56
+          speed:         40
+
+Pokedex ID: 393	Capture Rate: 45
+Base Exp: 63	Happiness: 70
+Height: 4	Weight: 52
+
+Genus: Penguin Pokémon
+Location Areas:
+lake-verity-before-galactic-intervention
+sinnoh-route-201-area
+hoenn-route-101-area
diff --git a/pokeData/plusle b/pokeData/plusle
index 25eed38..1a2ebf3 100644
--- a/pokeData/plusle
+++ b/pokeData/plusle
@@ -1,15 +1,44 @@
+plusle	A electric type Pokémon
 
-Name:  Plusle
-Pokedex Number:  311
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Plus - Lightningrod (Hidden Ability)
+It cheers on friends with pom-poms
+made of sparks. It drains power
+from telephone poles.
 
-Base Stats
-----------------------
-Total: 405
-Hp:  60
-Attack:  50
-Defence:  40
-Special Attack:  85
-Special Defence:  75
-Speed:  95
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         50
+        defense:         40
+ special-attack:         85
+special-defense:         75
+          speed:         95
+
+Pokedex ID: 311	Capture Rate: 200
+Base Exp: 142	Happiness: 70
+Height: 4	Weight: 42
+
+Genus: Cheering Pokémon
+Location Areas:
+johto-route-29-area
+johto-route-33-area
+national-park-area
+johto-route-36-area
+johto-route-37-area
+johto-route-38-area
+johto-route-39-area
+johto-route-46-area
+johto-route-48-area
+kanto-route-1-area
+kanto-route-2-south-towards-viridian-city
+kanto-route-3-area
+kanto-route-5-area
+kanto-route-7-area
+kanto-route-8-area
+kanto-route-11-area
+kanto-route-14-area
+kanto-route-15-area
+kanto-route-16-area
+kanto-route-17-area
+kanto-route-18-area
+kanto-route-2-north-towards-pewter-city
+hoenn-route-110-area
+kalos-route-5-area
diff --git a/pokeData/poipole b/pokeData/poipole
index 41ee88e..4f1ea78 100644
--- a/pokeData/poipole
+++ b/pokeData/poipole
@@ -1,15 +1,20 @@
+poipole	A poison type Pokémon
 
-Name:  Poipole
-Pokedex Number:  803
-Gender Ratio:  Genderless
-Abilities: Beast Boost
+This Ultra Beast is well enough liked to be
+chosen as a first partner in its own world.
+
+   ↞--------| STATS |--------↠ 
+             hp:         67
+         attack:         73
+        defense:         67
+ special-attack:         73
+special-defense:         67
+          speed:         73
+
+Pokedex ID: 803	Capture Rate: 45
+Base Exp: 210	Happiness: 0
+Height: 6	Weight: 18
+
+Genus: Poison Pin Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 420
-Hp:  67
-Attack:  73
-Defence:  67
-Special Attack:  73
-Special Defence:  67
-Speed:  73
diff --git a/pokeData/politoed b/pokeData/politoed
index c87412f..2361293 100644
--- a/pokeData/politoed
+++ b/pokeData/politoed
@@ -1,15 +1,29 @@
+politoed	A water type Pokémon
 
-Name:  Politoed
-Pokedex Number:  186
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Water Absorb - Damp - Drizzle (Hidden Ability)
+If POLIWAG and POLIWHIRL hear its
+echoing cry, they respond by gathering
+from far and wide.
 
-Base Stats
-----------------------
-Total: 500
-Hp:  90
-Attack:  75
-Defence:  75
-Special Attack:  90
-Special Defence:  100
-Speed:  70
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:         75
+        defense:         75
+ special-attack:         90
+special-defense:        100
+          speed:         70
+
+Pokedex ID: 186	Capture Rate: 45
+Base Exp: 250	Happiness: 50
+Height: 11	Weight: 339
+
+Genus: Frog Pokémon
+Location Areas:
+unova-route-6-area
+lostlorn-forest-area
+unova-victory-road-2-unknown-area-73
+unova-victory-road-2-unknown-area-79
+floccesy-ranch-outer
+floccesy-ranch-inner
+unova-route-19-area
+unova-route-20-area
+kalos-route-19-area
diff --git a/pokeData/poliwag b/pokeData/poliwag
index 2372a49..2e5cdba 100644
--- a/pokeData/poliwag
+++ b/pokeData/poliwag
@@ -1,15 +1,114 @@
+poliwag	A water type Pokémon
 
-Name:  Poliwag
-Pokedex Number:  060
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Water Absorb - Damp - Swift Swim (Hidden Ability)
+POLIWAG has a very thin skin. It is
+possible to see the POKéMON’s spiral
+innards right through the skin.Despite its thinness, however, the skin
+is also very flexible. Even sharp fangs
+bounce right off it.
 
-Base Stats
-----------------------
-Total: 300
-Hp:  40
-Attack:  50
-Defence:  40
-Special Attack:  40
-Special Defence:  40
-Speed:  90
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         50
+        defense:         40
+ special-attack:         40
+special-defense:         40
+          speed:         90
+
+Pokedex ID: 60	Capture Rate: 255
+Base Exp: 60	Happiness: 50
+Height: 6	Weight: 124
+
+Genus: Tadpole Pokémon
+Location Areas:
+sinnoh-route-225-area
+sinnoh-route-227-area
+sinnoh-route-228-area
+johto-route-30-area
+johto-route-31-area
+violet-city-area
+ruins-of-alph-outside
+ilex-forest-area
+johto-route-35-area
+ecruteak-city-area
+johto-route-43-area
+johto-route-44-area
+blackthorn-city-area
+johto-route-45-area
+mt-moon-mt-moon-square
+unknown-all-poliwag-area
+seafoam-islands-b3f
+seafoam-islands-b4f
+johto-route-47-cave-gate
+mt-silver-outside
+kanto-route-12-area
+kanto-sea-route-19-area
+kanto-sea-route-20-area
+cinnabar-island-area
+viridian-city-area
+cerulean-city-area
+vermilion-city-area
+celadon-city-area
+fuchsia-city-area
+pallet-town-area
+kanto-route-28-area
+kanto-route-6-area
+kanto-route-10-area
+kanto-route-11-area
+kanto-route-13-area
+kanto-route-17-area
+kanto-route-18-area
+kanto-sea-route-21-area
+kanto-route-22-area
+kanto-route-24-area
+kanto-route-25-area
+cerulean-cave-1f
+cerulean-cave-2f
+cerulean-cave-b1f
+kanto-route-23-area
+kanto-safari-zone-middle
+kanto-safari-zone-area-1-east
+kanto-safari-zone-area-2-north
+kanto-safari-zone-area-3-west
+vermilion-city-ss-anne-dock
+berry-forest-area
+icefall-cave-entrance
+cape-brink-area
+ruin-valley-area
+four-island-area
+unova-victory-road-unknown-area-53
+unova-victory-road-unknown-area-58
+giant-chasm-area
+giant-chasm-forest-cave
+wellspring-cave-area
+unova-route-6-area
+challengers-cave-b2f
+lostlorn-forest-area
+unova-victory-road-2-unknown-area-71
+unova-victory-road-2-unknown-area-73
+unova-victory-road-2-unknown-area-75
+unova-victory-road-2-unknown-area-78
+unova-victory-road-2-unknown-area-79
+floccesy-ranch-outer
+floccesy-ranch-inner
+relic-passage-relic-castle-entrance
+clay-tunnel-area
+unova-route-19-area
+unova-route-20-area
+unova-route-23-area
+couriway-town-area
+laverre-city-area
+kalos-route-14-area
+kalos-route-15-area
+kalos-route-16-area
+kalos-route-19-area
+kalos-route-21-area
+frost-cavern-unknown-area-313
+frost-cavern-unknown-area-315
+pokemon-village-area
+kalos-victory-road-unknown-area-322
+kalos-victory-road-unknown-area-327
+kalos-victory-road-unknown-area-328
+johto-safari-zone-zone-meadow
+johto-safari-zone-zone-marshland
+johto-safari-zone-zone-rocky-beach
+johto-safari-zone-zone-wetland
diff --git a/pokeData/poliwhirl b/pokeData/poliwhirl
index 0050b8e..c9a36c7 100644
--- a/pokeData/poliwhirl
+++ b/pokeData/poliwhirl
@@ -1,15 +1,82 @@
+poliwhirl	A water type Pokémon
 
-Name:  Poliwhirl
-Pokedex Number:  061
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Water Absorb - Damp - Swift Swim (Hidden Ability)
+The surface of POLIWHIRL’s body is
+always wet and slick with an oily fluid.
+Because of this greasy covering, it caneasily slip and slide out of the clutches
+of any enemy in battle.
 
-Base Stats
-----------------------
-Total: 385
-Hp:  65
-Attack:  65
-Defence:  65
-Special Attack:  50
-Special Defence:  50
-Speed:  90
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         65
+        defense:         65
+ special-attack:         50
+special-defense:         50
+          speed:         90
+
+Pokedex ID: 61	Capture Rate: 120
+Base Exp: 135	Happiness: 50
+Height: 10	Weight: 200
+
+Genus: Tadpole Pokémon
+Location Areas:
+sinnoh-route-225-area
+sinnoh-route-227-area
+sinnoh-route-228-area
+johto-route-30-area
+johto-route-31-area
+violet-city-area
+ecruteak-city-area
+johto-route-44-area
+mt-silver-outside
+viridian-city-area
+celadon-city-area
+kanto-route-28-area
+kanto-route-6-area
+kanto-route-10-area
+kanto-route-22-area
+kanto-route-25-area
+cerulean-cave-1f
+cerulean-cave-2f
+cerulean-cave-b1f
+kanto-route-23-area
+icefall-cave-entrance
+cape-brink-area
+ruin-valley-area
+four-island-area
+unova-victory-road-unknown-area-53
+unova-victory-road-unknown-area-58
+giant-chasm-area
+giant-chasm-forest-cave
+wellspring-cave-area
+unova-route-6-area
+challengers-cave-b2f
+lostlorn-forest-area
+unova-victory-road-2-unknown-area-71
+unova-victory-road-2-unknown-area-73
+unova-victory-road-2-unknown-area-75
+unova-victory-road-2-unknown-area-78
+unova-victory-road-2-unknown-area-79
+floccesy-ranch-outer
+floccesy-ranch-inner
+relic-passage-relic-castle-entrance
+clay-tunnel-area
+unova-route-19-area
+unova-route-20-area
+unova-route-23-area
+couriway-town-area
+laverre-city-area
+kalos-route-14-area
+kalos-route-15-area
+kalos-route-16-area
+kalos-route-19-area
+kalos-route-21-area
+frost-cavern-unknown-area-313
+frost-cavern-unknown-area-315
+pokemon-village-area
+kalos-victory-road-unknown-area-322
+kalos-victory-road-unknown-area-327
+kalos-victory-road-unknown-area-328
+johto-safari-zone-zone-meadow
+johto-safari-zone-zone-marshland
+johto-safari-zone-zone-rocky-beach
+johto-safari-zone-zone-wetland
diff --git a/pokeData/poliwrath b/pokeData/poliwrath
index f5aa14c..352f1ce 100644
--- a/pokeData/poliwrath
+++ b/pokeData/poliwrath
@@ -1,15 +1,35 @@
+poliwrath	A water type Pokémon
 
-Name:  Poliwrath
-Pokedex Number:  062
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Water Absorb - Damp - Swift Swim (Hidden Ability)
+POLIWRATH’s highly developed, brawny
+muscles never grow fatigued, however
+much it exercises.It is so tirelessly strong, this POKéMON
+can swim back and forth across the
+Pacific Ocean without effort.
 
-Base Stats
-----------------------
-Total: 510
-Hp:  90
-Attack:  95
-Defence:  95
-Special Attack:  70
-Special Defence:  90
-Speed:  70
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:         95
+        defense:         95
+ special-attack:         70
+special-defense:         90
+          speed:         70
+
+Pokedex ID: 62	Capture Rate: 45
+Base Exp: 255	Happiness: 50
+Height: 13	Weight: 540
+
+Genus: Tadpole Pokémon
+Location Areas:
+unova-victory-road-unknown-area-53
+unova-victory-road-unknown-area-58
+giant-chasm-area
+giant-chasm-forest-cave
+wellspring-cave-area
+challengers-cave-b2f
+unova-victory-road-2-unknown-area-71
+unova-victory-road-2-unknown-area-75
+unova-victory-road-2-unknown-area-78
+relic-passage-relic-castle-entrance
+clay-tunnel-area
+unova-route-23-area
+kalos-victory-road-unknown-area-328
diff --git a/pokeData/polteageist b/pokeData/polteageist
index 900ed6a..b74c9d6 100644
--- a/pokeData/polteageist
+++ b/pokeData/polteageist
@@ -1,15 +1,21 @@
+polteageist	A ghost type Pokémon
 
-Name:  Polteageist
-Pokedex Number:  855
-Gender Ratio:  Genderless
-Abilities: Weak Armor - Cursed Body (Hidden Ability)
+This species lives in antique teapots.
+Most pots are forgeries, but on rare occasions,
+an authentic work is found.
+
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         65
+        defense:         65
+ special-attack:        134
+special-defense:        114
+          speed:         70
+
+Pokedex ID: 855	Capture Rate: 60
+Base Exp: 178	Happiness: 50
+Height: 2	Weight: 4
+
+Genus: Black Tea Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 508
-Hp:  60
-Attack:  65
-Defence:  65
-Special Attack:  134
-Special Defence:  114
-Speed:  70
diff --git a/pokeData/ponyta b/pokeData/ponyta
index b590bc2..356316c 100644
--- a/pokeData/ponyta
+++ b/pokeData/ponyta
@@ -1,15 +1,40 @@
+ponyta	A fire type Pokémon
 
-Name:  Ponyta
-Pokedex Number:  077
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Run Away - Flash Fire - Flame Body (Hidden Ability)
+PONYTA is very weak at birth.
+It can barely stand up.
+This POKéMON becomes stronger bystumbling and falling to keep up with
+its parent.
 
-Base Stats
-----------------------
-Total: 410
-Hp:  50
-Attack:  85
-Defence:  55
-Special Attack:  65
-Special Defence:  65
-Speed:  90
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         85
+        defense:         55
+ special-attack:         65
+special-defense:         65
+          speed:         90
+
+Pokedex ID: 77	Capture Rate: 190
+Base Exp: 82	Happiness: 50
+Height: 10	Weight: 300
+
+Genus: Fire Horse Pokémon
+Location Areas:
+sinnoh-route-206-area
+sinnoh-route-207-area
+sinnoh-route-210-south-towards-solaceon-town
+sinnoh-route-211-west-towards-eterna-city
+sinnoh-route-211-east-towards-celestic-town
+sinnoh-route-214-area
+sinnoh-route-215-area
+mt-silver-outside
+kanto-route-26-area
+kanto-route-27-area
+kanto-route-28-area
+kanto-route-17-area
+kanto-route-22-area
+pokemon-mansion-1f
+pokemon-mansion-2f
+pokemon-mansion-3f
+pokemon-mansion-b1f
+mt-ember-area
+kindle-road-area
diff --git a/pokeData/poochyena b/pokeData/poochyena
index 4891d82..14d478c 100644
--- a/pokeData/poochyena
+++ b/pokeData/poochyena
@@ -1,15 +1,33 @@
+poochyena	A dark type Pokémon
 
-Name:  Poochyena
-Pokedex Number:  261
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Run Away - Quick Feet - Rattled (Hidden Ability)
+A Pokémon with a persistent
+nature, it chases its chosen prey
+until the prey becomes exhausted.
 
-Base Stats
-----------------------
-Total: 220
-Hp:  35
-Attack:  55
-Defence:  35
-Special Attack:  30
-Special Defence:  30
-Speed:  35
+   ↞--------| STATS |--------↠ 
+             hp:         35
+         attack:         55
+        defense:         35
+ special-attack:         30
+special-defense:         30
+          speed:         35
+
+Pokedex ID: 261	Capture Rate: 255
+Base Exp: 56	Happiness: 70
+Height: 5	Weight: 136
+
+Genus: Bite Pokémon
+Location Areas:
+sinnoh-route-214-area
+kanto-route-1-area
+petalburg-woods-area
+hoenn-route-101-area
+hoenn-route-102-area
+hoenn-route-103-area
+hoenn-route-104-area
+hoenn-route-110-area
+hoenn-route-116-area
+hoenn-route-117-area
+hoenn-route-120-area
+hoenn-route-121-area
+hoenn-route-123-area
diff --git a/pokeData/popplio b/pokeData/popplio
index 8713cc1..adca230 100644
--- a/pokeData/popplio
+++ b/pokeData/popplio
@@ -1,15 +1,21 @@
+popplio	A water type Pokémon
 
-Name:  Popplio
-Pokedex Number:  728
-Gender Ratio:   ♂:88.14% ♀:11.86%
-Abilities: Torrent - Liquid Voice (Hidden Ability)
+This Pokémon snorts body fluids from its nose,
+blowing balloons to smash into its foes.
+It’s famous for being a hard worker.
+
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         54
+        defense:         54
+ special-attack:         66
+special-defense:         56
+          speed:         40
+
+Pokedex ID: 728	Capture Rate: 45
+Base Exp: 64	Happiness: 50
+Height: 4	Weight: 75
+
+Genus: Sea Lion Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 320
-Hp:  50
-Attack:  54
-Defence:  54
-Special Attack:  66
-Special Defence:  56
-Speed:  40
diff --git a/pokeData/porygon b/pokeData/porygon
index ad8e603..35cbaf7 100644
--- a/pokeData/porygon
+++ b/pokeData/porygon
@@ -1,15 +1,22 @@
+porygon	A normal type Pokémon
 
-Name:  Porygon
-Pokedex Number:  137
-Gender Ratio:  Genderless
-Abilities: Trace - Download - Analytic (Hidden Ability)
+PORYGON is capable of reverting itself
+entirely back to program data and
+entering cyberspace.This POKéMON is copy-protected so it
+cannot be duplicated by copying.
 
-Base Stats
-----------------------
-Total: 395
-Hp:  65
-Attack:  60
-Defence:  70
-Special Attack:  85
-Special Defence:  75
-Speed:  40
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         60
+        defense:         70
+ special-attack:         85
+special-defense:         75
+          speed:         40
+
+Pokedex ID: 137	Capture Rate: 45
+Base Exp: 79	Happiness: 50
+Height: 8	Weight: 365
+
+Genus: Virtual Pokémon
+Location Areas:
+veilstone-city-area
diff --git a/pokeData/porygon-z b/pokeData/porygon-z
index 8774e8c..663c3d8 100644
--- a/pokeData/porygon-z
+++ b/pokeData/porygon-z
@@ -1,15 +1,21 @@
+porygon-z	A normal type Pokémon
 
-Name:  Porygon-Z
-Pokedex Number:  474
-Gender Ratio:  Genderless
-Abilities: Adaptability - Download - Analytic (Hidden Ability)
+Il a été modifié pour être capable
+de travailler dans des dimensions
+parallèles, mais c’est un échec.
+
+   ↞--------| STATS |--------↠ 
+             hp:         85
+         attack:         80
+        defense:         70
+ special-attack:        135
+special-defense:         75
+          speed:         90
+
+Pokedex ID: 474	Capture Rate: 30
+Base Exp: 268	Happiness: 50
+Height: 9	Weight: 340
+
+Genus: Virtual Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 535
-Hp:  85
-Attack:  80
-Defence:  70
-Special Attack:  135
-Special Defence:  75
-Speed:  90
diff --git a/pokeData/porygon2 b/pokeData/porygon2
index 069cf6d..ac8abd4 100644
--- a/pokeData/porygon2
+++ b/pokeData/porygon2
@@ -1 +1,21 @@
-	Stats currently unavailable :( 
+porygon2	A normal type Pokémon
+
+This upgraded version of PORYGON is
+designed for space exploration. However,
+it can’t even fly.
+
+   ↞--------| STATS |--------↠ 
+             hp:         85
+         attack:         80
+        defense:         90
+ special-attack:        105
+special-defense:         95
+          speed:         60
+
+Pokedex ID: 233	Capture Rate: 45
+Base Exp: 180	Happiness: 50
+Height: 6	Weight: 325
+
+Genus: Virtual Pokémon
+Location Areas:
+
diff --git a/pokeData/primarina b/pokeData/primarina
index 9b73de7..538af6c 100644
--- a/pokeData/primarina
+++ b/pokeData/primarina
@@ -1,15 +1,21 @@
+primarina	A water type Pokémon
 
-Name:  Primarina
-Pokedex Number:  730
-Gender Ratio:   ♂:88.14% ♀:11.86% 
-Abilities: Torrent - Liquid Voice (Hidden Ability)
+It controls its water balloons with song. The
+melody is learned from others of its kind and is
+passed down from one generation to the next.
+
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:         74
+        defense:         74
+ special-attack:        126
+special-defense:        116
+          speed:         60
+
+Pokedex ID: 730	Capture Rate: 45
+Base Exp: 265	Happiness: 50
+Height: 18	Weight: 440
+
+Genus: Soloist Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 530
-Hp:  80
-Attack:  74
-Defence:  74
-Special Attack:  126
-Special Defence:  116
-Speed:  60
diff --git a/pokeData/primeape b/pokeData/primeape
index f7d3e08..d437e7f 100644
--- a/pokeData/primeape
+++ b/pokeData/primeape
@@ -1,15 +1,27 @@
+primeape	A fighting type Pokémon
 
-Name:  Primeape
-Pokedex Number:  057
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Vital Spirit - Anger Point - Defiant (Hidden Ability)
+When PRIMEAPE becomes furious, its
+blood circulation is boosted. In turn,
+its muscles are made even stronger.However, it also becomes much less
+intelligent at the same time.
 
-Base Stats
-----------------------
-Total: 455
-Hp:  65
-Attack:  105
-Defence:  60
-Special Attack:  60
-Special Defence:  70
-Speed:  95
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:        105
+        defense:         60
+ special-attack:         60
+special-defense:         70
+          speed:         95
+
+Pokedex ID: 57	Capture Rate: 75
+Base Exp: 159	Happiness: 70
+Height: 10	Weight: 320
+
+Genus: Pig Monkey Pokémon
+Location Areas:
+sinnoh-route-225-area
+sinnoh-sea-route-226-area
+kanto-route-9-area
+cerulean-cave-1f
+kanto-route-23-area
+kanto-victory-road-2-2f
diff --git a/pokeData/prinplup b/pokeData/prinplup
index 0ef86b7..753cece 100644
--- a/pokeData/prinplup
+++ b/pokeData/prinplup
@@ -1,15 +1,21 @@
+prinplup	A water type Pokémon
 
-Name:  Prinplup
-Pokedex Number:  394
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Torrent - Defiant (Hidden Ability)
+La fierté du Prinplouf est si
+grande qu’il lui est impossible
+de vivre en groupe.
+
+   ↞--------| STATS |--------↠ 
+             hp:         64
+         attack:         66
+        defense:         68
+ special-attack:         81
+special-defense:         76
+          speed:         50
+
+Pokedex ID: 394	Capture Rate: 45
+Base Exp: 142	Happiness: 70
+Height: 8	Weight: 230
+
+Genus: Penguin Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 405
-Hp:  64
-Attack:  66
-Defence:  68
-Special Attack:  81
-Special Defence:  76
-Speed:  50
diff --git a/pokeData/probopass b/pokeData/probopass
index 7d6bd0a..770c661 100644
--- a/pokeData/probopass
+++ b/pokeData/probopass
@@ -1,15 +1,21 @@
+probopass	A rock type Pokémon
 
-Name:  Probopass
-Pokedex Number:  476
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Sturdy - Magnet Pull - Sand Force (Hidden Ability)
+Il utilise sa force magnétique pour
+diriger trois petites unités
+appelées Mini-nez.
+
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         55
+        defense:        145
+ special-attack:         75
+special-defense:        150
+          speed:         40
+
+Pokedex ID: 476	Capture Rate: 60
+Base Exp: 184	Happiness: 70
+Height: 14	Weight: 3400
+
+Genus: Compass Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 525
-Hp:  60
-Attack:  55
-Defence:  145
-Special Attack:  75
-Special Defence:  150
-Speed:  40
diff --git a/pokeData/psyduck b/pokeData/psyduck
index ea959c5..8d6e383 100644
--- a/pokeData/psyduck
+++ b/pokeData/psyduck
@@ -1,15 +1,110 @@
+psyduck	A water type Pokémon
 
-Name:  Psyduck
-Pokedex Number:  054
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Damp - Cloud Nine - Swift Swim (Hidden Ability)
+If it uses its mysterious power,
+PSYDUCK can’t remember having done so.
+It apparently can’t form a memory ofsuch an event because it goes into
+an altered state that is much like
+deep sleep.
 
-Base Stats
-----------------------
-Total: 320
-Hp:  50
-Attack:  52
-Defence:  48
-Special Attack:  65
-Special Defence:  50
-Speed:  55
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         52
+        defense:         48
+ special-attack:         65
+special-defense:         50
+          speed:         55
+
+Pokedex ID: 54	Capture Rate: 190
+Base Exp: 64	Happiness: 50
+Height: 8	Weight: 196
+
+Genus: Duck Pokémon
+Location Areas:
+eterna-city-area
+great-marsh-area-1
+great-marsh-area-2
+great-marsh-area-3
+great-marsh-area-4
+great-marsh-area-6
+ravaged-path-area
+oreburgh-gate-1f
+oreburgh-gate-b1f
+lake-verity-before-galactic-intervention
+lake-verity-after-galactic-intervention
+lake-valor-area
+lake-acuity-area
+sinnoh-route-203-area
+sinnoh-route-204-south-towards-jubilife-city
+sinnoh-route-204-north-towards-floaroma-town
+sinnoh-route-205-east-towards-eterna-city
+sinnoh-route-208-area
+sinnoh-route-209-area
+sinnoh-route-210-west-towards-celestic-town
+sinnoh-route-212-north-towards-hearthome-city
+sinnoh-route-214-area
+sinnoh-route-225-area
+twinleaf-town-area
+celestic-town-area
+resort-area-area
+ilex-forest-area
+johto-route-35-area
+national-park-area
+seafoam-islands-1f
+seafoam-islands-b1f
+seafoam-islands-b2f
+seafoam-islands-b3f
+seafoam-islands-b4f
+kanto-route-12-area
+kanto-sea-route-19-area
+kanto-sea-route-20-area
+cinnabar-island-area
+viridian-city-area
+cerulean-city-area
+vermilion-city-area
+celadon-city-area
+fuchsia-city-area
+pallet-town-area
+kanto-route-4-area
+kanto-route-6-area
+kanto-route-10-area
+kanto-route-11-area
+kanto-route-13-area
+kanto-sea-route-21-area
+kanto-route-22-area
+kanto-route-24-area
+kanto-route-25-area
+cerulean-cave-1f
+cerulean-cave-2f
+cerulean-cave-b1f
+kanto-route-23-area
+kanto-safari-zone-middle
+kanto-safari-zone-area-1-east
+kanto-safari-zone-area-2-north
+kanto-safari-zone-area-3-west
+hoenn-safari-zone-nwmach-bike-area
+hoenn-safari-zone-sw
+ss-anne-area
+berry-forest-area
+icefall-cave-entrance
+icefall-cave-waterfall
+kindle-road-area
+treasure-beach-area
+cape-brink-area
+bond-bridge-area
+resort-gorgeous-area
+water-labyrinth-area
+five-isle-meadow-area
+memorial-pillar-area
+outcast-island-area
+green-path-area
+water-path-area
+ruin-valley-area
+trainer-tower-area
+canyon-entrance-area
+tanoby-ruins-area
+one-island-area
+four-island-area
+five-island-area
+floccesy-ranch-inner
+kalos-route-22-area
+johto-safari-zone-zone-wetland
diff --git a/pokeData/pumpkaboo b/pokeData/pumpkaboo
index 10e44f4..952e9a2 100644
--- a/pokeData/pumpkaboo
+++ b/pokeData/pumpkaboo
@@ -1,15 +1,15 @@
+	A  type Pokémon
 
-Name:  Pumpkaboo
-Pokedex Number:  710
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Pickup - Frisk - Insomnia (Hidden Ability)
+成仏できない　魂を
+カボチャの　体に　入れている。
+日暮れと　ともに　動きはじめる。
+
+   ↞--------| STATS |--------↠ 
+
+Pokedex ID: 	Capture Rate: 120
+Base Exp: 	Happiness: 50
+Height: 	Weight: 
+
+Genus: Pumpkin Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 335
-Hp:  59
-Attack:  66
-Defence:  70
-Special Attack:  44
-Special Defence:  55
-Speed:  41
diff --git a/pokeData/pupitar b/pokeData/pupitar
index 6f1192b..ff68842 100644
--- a/pokeData/pupitar
+++ b/pokeData/pupitar
@@ -1,15 +1,29 @@
+pupitar	A rock type Pokémon
 
-Name:  Pupitar
-Pokedex Number:  247
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Shed Skin
+Its shell is as hard as sheet rock, and it
+is also very strong. Its THRASHING can
+topple a mountain.
 
-Base Stats
-----------------------
-Total: 410
-Hp:  70
-Attack:  84
-Defence:  70
-Special Attack:  65
-Special Defence:  70
-Speed:  51
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         84
+        defense:         70
+ special-attack:         65
+special-defense:         70
+          speed:         51
+
+Pokedex ID: 247	Capture Rate: 45
+Base Exp: 144	Happiness: 35
+Height: 12	Weight: 1520
+
+Genus: Hard Shell Pokémon
+Location Areas:
+mt-silver-3f
+mt-silver-top
+unova-route-15-area
+kalos-route-18-area
+terminus-cave-unknown-area-343
+terminus-cave-unknown-area-344
+terminus-cave-unknown-area-345
+terminus-cave-unknown-area-347
+terminus-cave-unknown-area-348
diff --git a/pokeData/purrloin b/pokeData/purrloin
index cadbd8e..56a4edd 100644
--- a/pokeData/purrloin
+++ b/pokeData/purrloin
@@ -1,15 +1,25 @@
+purrloin	A dark type Pokémon
 
-Name:  Purrloin
-Pokedex Number:  509
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Limber - Unburden - Prankster (Hidden Ability)
+귀여운 행동으로 방심하게 한 후
+그 틈에 지닌 물건을 빼앗아 간다.
+화가 나면 손톱을 세워서 반격한다.
 
-Base Stats
-----------------------
-Total: 281
-Hp:  41
-Attack:  50
-Defence:  37
-Special Attack:  50
-Special Defence:  37
-Speed:  66
+   ↞--------| STATS |--------↠ 
+             hp:         41
+         attack:         50
+        defense:         37
+ special-attack:         50
+special-defense:         37
+          speed:         66
+
+Pokedex ID: 509	Capture Rate: 255
+Base Exp: 56	Happiness: 50
+Height: 4	Weight: 101
+
+Genus: Devious Pokémon
+Location Areas:
+dreamyard-area
+unova-route-2-area
+unova-route-3-area
+unova-route-19-area
+unova-route-20-area
diff --git a/pokeData/purugly b/pokeData/purugly
index 43751b1..8065beb 100644
--- a/pokeData/purugly
+++ b/pokeData/purugly
@@ -1,15 +1,22 @@
+purugly	A normal type Pokémon
 
-Name:  Purugly
-Pokedex Number:  432
-Gender Ratio:   ♂:25% ♀:75%
-Abilities: Thick Fat - Own Tempo - Defiant (Hidden Ability)
+Il plaque ses queues contre son
+dos pour paraître plus grand.
+Il soutient un regard des heures.
 
-Base Stats
-----------------------
-Total: 452
-Hp:  71
-Attack:  82
-Defence:  64
-Special Attack:  64
-Special Defence:  59
-Speed:  112
+   ↞--------| STATS |--------↠ 
+             hp:         71
+         attack:         82
+        defense:         64
+ special-attack:         64
+special-defense:         59
+          speed:        112
+
+Pokedex ID: 432	Capture Rate: 75
+Base Exp: 158	Happiness: 70
+Height: 10	Weight: 438
+
+Genus: Tiger Cat Pokémon
+Location Areas:
+sinnoh-route-222-area
+sinnoh-route-229-area
diff --git a/pokeData/pyroar b/pokeData/pyroar
index 3fd5903..5903e2e 100644
--- a/pokeData/pyroar
+++ b/pokeData/pyroar
@@ -1,15 +1,21 @@
+pyroar	A fire type Pokémon
 
-Name:  Pyroar
-Pokedex Number:  668
-Gender Ratio:   ♂:25% ♀:75% 
-Abilities: Rivalry - Unnerve - Moxie (Hidden Ability)
+群れの　中で　一番　大きな　炎の
+たてがみを　持つ　オスが
+リーダーとして　仲間を　率いる。
+
+   ↞--------| STATS |--------↠ 
+             hp:         86
+         attack:         68
+        defense:         72
+ special-attack:        109
+special-defense:         66
+          speed:        106
+
+Pokedex ID: 668	Capture Rate: 65
+Base Exp: 177	Happiness: 70
+Height: 15	Weight: 815
+
+Genus: Royal Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 507
-Hp:  86
-Attack:  68
-Defence:  72
-Special Attack:  109
-Special Defence:  66
-Speed:  106
diff --git a/pokeData/pyukumuku b/pokeData/pyukumuku
index 156f9ba..827ddbc 100644
--- a/pokeData/pyukumuku
+++ b/pokeData/pyukumuku
@@ -1,15 +1,21 @@
+pyukumuku	A water type Pokémon
 
-Name:  Pyukumuku
-Pokedex Number:  771
-Gender Ratio:   ♂:50.2% ♀:49.8%
-Abilities: Innards Out - Unaware (Hidden Ability)
+Vive nei pressi delle spiagge e in acque
+poco profonde. Espelle gli organi interni per
+catturare le prede e attaccare i nemici.
+
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         60
+        defense:        130
+ special-attack:         30
+special-defense:        130
+          speed:          5
+
+Pokedex ID: 771	Capture Rate: 60
+Base Exp: 144	Happiness: 50
+Height: 3	Weight: 12
+
+Genus: Sea Cucumber Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 410
-Hp:  55
-Attack:  60
-Defence:  130
-Special Attack:  30
-Special Defence:  130
-Speed:  5
diff --git a/pokeData/quagsire b/pokeData/quagsire
index 2cd7443..9197f1f 100644
--- a/pokeData/quagsire
+++ b/pokeData/quagsire
@@ -1,15 +1,50 @@
+quagsire	A water type Pokémon
 
-Name:  Quagsire
-Pokedex Number:  195
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Damp - Water Absorb - Unaware (Hidden Ability)
+This carefree POKéMON has an easygoing
+nature. While swimming, it always bumps
+into boat hulls.
 
-Base Stats
-----------------------
-Total: 430
-Hp:  95
-Attack:  85
-Defence:  85
-Special Attack:  65
-Special Defence:  65
-Speed:  35
+   ↞--------| STATS |--------↠ 
+             hp:         95
+         attack:         85
+        defense:         85
+ special-attack:         65
+special-defense:         65
+          speed:         35
+
+Pokedex ID: 195	Capture Rate: 90
+Base Exp: 151	Happiness: 50
+Height: 14	Weight: 750
+
+Genus: Water Fish Pokémon
+Location Areas:
+great-marsh-area-1
+great-marsh-area-2
+great-marsh-area-3
+great-marsh-area-4
+great-marsh-area-5
+great-marsh-area-6
+sinnoh-route-212-east-towards-pastoria-city
+johto-route-32-area
+ruins-of-alph-outside
+union-cave-1f
+union-cave-b1f
+union-cave-b2f
+mt-silver-2f
+mt-silver-1f-top
+mt-silver-4f
+johto-route-47-cave-gate
+johto-route-47-inside-cave
+mt-silver-3f
+mt-silver-top
+kanto-route-12-area
+kanto-route-26-area
+kanto-route-27-area
+kanto-route-10-area
+kanto-route-13-area
+kanto-route-14-area
+kanto-route-15-area
+hoenn-safari-zone-expansion-south
+kalos-route-14-area
+kalos-route-19-area
+johto-safari-zone-zone-wetland
diff --git a/pokeData/quilava b/pokeData/quilava
index a530249..4c0bacf 100644
--- a/pokeData/quilava
+++ b/pokeData/quilava
@@ -1,15 +1,21 @@
+quilava	A fire type Pokémon
 
-Name:  Quilava
-Pokedex Number:  156
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Blaze - Flash Fire (Hidden Ability)
+Be careful if it turns its back during
+battle. It means that it will attack with
+the fire on its back.
+
+   ↞--------| STATS |--------↠ 
+             hp:         58
+         attack:         64
+        defense:         58
+ special-attack:         80
+special-defense:         65
+          speed:         80
+
+Pokedex ID: 156	Capture Rate: 45
+Base Exp: 142	Happiness: 70
+Height: 9	Weight: 190
+
+Genus: Volcano Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 405
-Hp:  58
-Attack:  64
-Defence:  58
-Special Attack:  80
-Special Defence:  65
-Speed:  80
diff --git a/pokeData/quilladin b/pokeData/quilladin
index d41fb01..92a2b6e 100644
--- a/pokeData/quilladin
+++ b/pokeData/quilladin
@@ -1,15 +1,21 @@
+quilladin	A grass type Pokémon
 
-Name:  Quilladin
-Pokedex Number:  651
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Overgrow - Bulletproof (Hidden Ability)
+体を　覆う　頑丈な　殻が
+敵の　攻撃を　弾き返し
+鋭い　トゲで　反撃する。
+
+   ↞--------| STATS |--------↠ 
+             hp:         61
+         attack:         78
+        defense:         95
+ special-attack:         56
+special-defense:         58
+          speed:         57
+
+Pokedex ID: 651	Capture Rate: 45
+Base Exp: 142	Happiness: 70
+Height: 7	Weight: 290
+
+Genus: Spiny Armor Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 405
-Hp:  61
-Attack:  78
-Defence:  95
-Special Attack:  56
-Special Defence:  58
-Speed:  57
diff --git a/pokeData/qwilfish b/pokeData/qwilfish
index 50a90fa..d737b2c 100644
--- a/pokeData/qwilfish
+++ b/pokeData/qwilfish
@@ -1,15 +1,40 @@
+qwilfish	A water type Pokémon
 
-Name:  Qwilfish
-Pokedex Number:  211
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Poison Point - Swift Swim - Intimidate (Hidden Ability)
+To fire its poison spikes, it must inflate
+its body by drinking over 2.6 gallons of 
+water all at once.
 
-Base Stats
-----------------------
-Total: 430
-Hp:  65
-Attack:  95
-Defence:  75
-Special Attack:  55
-Special Defence:  55
-Speed:  85
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         95
+        defense:         85
+ special-attack:         55
+special-defense:         55
+          speed:         85
+
+Pokedex ID: 211	Capture Rate: 45
+Base Exp: 88	Happiness: 50
+Height: 5	Weight: 39
+
+Genus: Balloon Pokémon
+Location Areas:
+iron-island-area
+johto-route-32-area
+kanto-route-12-area
+kanto-route-13-area
+resort-gorgeous-area
+water-labyrinth-area
+five-isle-meadow-area
+memorial-pillar-area
+outcast-island-area
+green-path-area
+water-path-area
+trainer-tower-area
+tanoby-ruins-area
+p2-laboratory-area
+unova-route-4-area
+unova-route-18-area
+unova-route-17-area
+virbank-city-area
+virbank-complex-outer
+kalos-route-8-area
diff --git a/pokeData/raboot b/pokeData/raboot
index a895329..aac6a55 100644
--- a/pokeData/raboot
+++ b/pokeData/raboot
@@ -1,15 +1,20 @@
+raboot	A fire type Pokémon
 
-Name:  Raboot
-Pokedex Number:  814
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Blaze - Libero (Hidden Ability)
+Its thick and fluffy fur protects it from the cold
+and enables it to use hotter fire moves.
+
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         86
+        defense:         60
+ special-attack:         55
+special-defense:         60
+          speed:         94
+
+Pokedex ID: 814	Capture Rate: 45
+Base Exp: 147	Happiness: 50
+Height: 6	Weight: 90
+
+Genus: Rabbit Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 420
-Hp:  65
-Attack:  86
-Defence:  60
-Special Attack:  55
-Special Defence:  60
-Speed:  94
diff --git a/pokeData/raichu b/pokeData/raichu
index 4cb93b8..ac0b09c 100644
--- a/pokeData/raichu
+++ b/pokeData/raichu
@@ -1,15 +1,24 @@
+raichu	A electric type Pokémon
 
-Name:  Raichu
-Pokedex Number:  026
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Static - Lightningrod (Hidden Ability)
+If the electrical sacks become
+excessively charged, RAICHU plants its
+tail in the ground and discharges.Scorched patches of ground will be
+found near this POKéMON’s nest.
 
-Base Stats
-----------------------
-Total: 485
-Hp:  60
-Attack:  90
-Defence:  55
-Special Attack:  90
-Special Defence:  80
-Speed:  110
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         90
+        defense:         55
+ special-attack:         90
+special-defense:         80
+          speed:        110
+
+Pokedex ID: 26	Capture Rate: 75
+Base Exp: 243	Happiness: 50
+Height: 8	Weight: 300
+
+Genus: Mouse Pokémon
+Location Areas:
+cerulean-cave-1f
+cerulean-cave-b1f
+power-plant-area
diff --git a/pokeData/raikou b/pokeData/raikou
index e2f94b6..3a5f3af 100644
--- a/pokeData/raikou
+++ b/pokeData/raikou
@@ -1,15 +1,22 @@
+raikou	A electric type Pokémon
 
-Name:  Raikou
-Pokedex Number:  243
-Gender Ratio:  Genderless
-Abilities: Pressure - Volt Absorb (Hidden Ability)
+The rain clouds it carries let it fire
+thunderbolts at will. They say that it
+descended with lightning.
 
-Base Stats
-----------------------
-Total: 580
-Hp:  90
-Attack:  85
-Defence:  75
-Special Attack:  115
-Special Defence:  100
-Speed:  115
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:         85
+        defense:         75
+ special-attack:        115
+special-defense:        100
+          speed:        115
+
+Pokedex ID: 243	Capture Rate: 3
+Base Exp: 290	Happiness: 35
+Height: 19	Weight: 1780
+
+Genus: Thunder Pokémon
+Location Areas:
+roaming-kanto-area
+roaming-johto-area
diff --git a/pokeData/ralts b/pokeData/ralts
index d3df0f1..d7c6dda 100644
--- a/pokeData/ralts
+++ b/pokeData/ralts
@@ -1,15 +1,28 @@
+ralts	A psychic type Pokémon
 
-Name:  Ralts
-Pokedex Number:  280
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Synchronize - Trace - Telepathy (Hidden Ability)
+If its horns capture the warm
+feelings of people or Pokémon,
+its body warms up slightly.
 
-Base Stats
-----------------------
-Total: 198
-Hp:  28
-Attack:  25
-Defence:  25
-Special Attack:  45
-Special Defence:  35
-Speed:  40
+   ↞--------| STATS |--------↠ 
+             hp:         28
+         attack:         25
+        defense:         25
+ special-attack:         45
+special-defense:         35
+          speed:         40
+
+Pokedex ID: 280	Capture Rate: 235
+Base Exp: 40	Happiness: 35
+Height: 4	Weight: 66
+
+Genus: Feeling Pokémon
+Location Areas:
+sinnoh-route-203-area
+sinnoh-route-204-south-towards-jubilife-city
+sinnoh-route-208-area
+sinnoh-route-209-area
+sinnoh-route-212-north-towards-hearthome-city
+johto-route-34-area
+hoenn-route-102-area
+kalos-route-4-area
diff --git a/pokeData/rampardos b/pokeData/rampardos
index 6c3d8c3..7048d4e 100644
--- a/pokeData/rampardos
+++ b/pokeData/rampardos
@@ -1,15 +1,21 @@
+rampardos	A rock type Pokémon
 
-Name:  Rampardos
-Pokedex Number:  409
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Mold Breaker - Sheer Force (Hidden Ability)
+Quand deux Charkos se rentrent
+dedans, leur crâne extrêmement
+épais les empêche de s’assommer.
+
+   ↞--------| STATS |--------↠ 
+             hp:         97
+         attack:        165
+        defense:         60
+ special-attack:         65
+special-defense:         50
+          speed:         58
+
+Pokedex ID: 409	Capture Rate: 45
+Base Exp: 173	Happiness: 70
+Height: 16	Weight: 1025
+
+Genus: Head Butt Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 495
-Hp:  97
-Attack:  165
-Defence:  60
-Special Attack:  65
-Special Defence:  50
-Speed:  58
diff --git a/pokeData/rapidash b/pokeData/rapidash
index d24e3ba..d74517d 100644
--- a/pokeData/rapidash
+++ b/pokeData/rapidash
@@ -1,15 +1,26 @@
+rapidash	A fire type Pokémon
 
-Name:  Rapidash
-Pokedex Number:  078
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Run Away - Flash Fire - Flame Body (Hidden Ability)
+RAPIDASH usually can be seen casually
+cantering in the fields and plains.
+However, when this POKéMON turnsserious, its fiery manes flare and blaze
+as it gallops its way up to 150 mph.
 
-Base Stats
-----------------------
-Total: 500
-Hp:  65
-Attack:  100
-Defence:  70
-Special Attack:  80
-Special Defence:  80
-Speed:  105
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:        100
+        defense:         70
+ special-attack:         80
+special-defense:         80
+          speed:        105
+
+Pokedex ID: 78	Capture Rate: 60
+Base Exp: 175	Happiness: 50
+Height: 17	Weight: 950
+
+Genus: Fire Horse Pokémon
+Location Areas:
+mt-silver-outside
+kanto-route-28-area
+mt-ember-area
+kindle-road-area
+unova-route-12-area
diff --git a/pokeData/raticate b/pokeData/raticate
index 2a0ff41..55fdb2d 100644
--- a/pokeData/raticate
+++ b/pokeData/raticate
@@ -1,15 +1,60 @@
+raticate	A normal type Pokémon
 
-Name:  Raticate
-Pokedex Number:  020
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Run Away - Guts - Hustle (Hidden Ability)
+RATICATE’s sturdy fangs grow steadily.
+To keep them ground down, it gnaws
+on rocks and logs.It may even chew on the walls of
+houses.
 
-Base Stats
-----------------------
-Total: 413
-Hp:  55
-Attack:  81
-Defence:  60
-Special Attack:  50
-Special Defence:  70
-Speed:  97
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         81
+        defense:         60
+ special-attack:         50
+special-defense:         70
+          speed:         97
+
+Pokedex ID: 20	Capture Rate: 127
+Base Exp: 145	Happiness: 70
+Height: 7	Weight: 185
+
+Genus: Mouse Pokémon
+Location Areas:
+sinnoh-route-225-area
+sinnoh-sea-route-226-area
+union-cave-b2f
+burned-tower-1f
+johto-route-38-area
+johto-route-39-area
+johto-route-42-area
+mt-mortar-1f
+mt-mortar-lower-cave
+mt-mortar-upper-cave
+mt-mortar-b1f
+johto-route-43-area
+johto-route-47-area
+kanto-route-26-area
+kanto-route-27-area
+kanto-route-1-area
+kanto-route-3-area
+kanto-route-4-area
+kanto-route-6-area
+kanto-route-7-area
+kanto-route-9-area
+kanto-route-10-area
+kanto-route-11-area
+kanto-route-16-area
+kanto-route-17-area
+kanto-route-18-area
+kanto-sea-route-21-area
+tohjo-falls-area
+pokemon-mansion-1f
+pokemon-mansion-2f
+pokemon-mansion-3f
+pokemon-mansion-b1f
+dreamyard-area
+dreamyard-b1f
+strange-house-1f
+strange-house-b1f
+relic-passage-relic-castle-entrance
+johto-safari-zone-zone-plains
+johto-safari-zone-zone-mountain
diff --git a/pokeData/rattata b/pokeData/rattata
index db2a03d..1f7ef61 100644
--- a/pokeData/rattata
+++ b/pokeData/rattata
@@ -1,15 +1,78 @@
+rattata	A normal type Pokémon
 
-Name:  Rattata
-Pokedex Number:  019
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Run Away - Guts - Hustle (Hidden Ability)
+RATTATA is cautious in the extreme.
+Even while it is asleep, it constantly
+listens by moving its ears around.It is not picky about where it lives -
+it will make its nest anywhere.
 
-Base Stats
-----------------------
-Total: 253
-Hp:  30
-Attack:  56
-Defence:  35
-Special Attack:  25
-Special Defence:  35
-Speed:  72
+   ↞--------| STATS |--------↠ 
+             hp:         30
+         attack:         56
+        defense:         35
+ special-attack:         25
+special-defense:         35
+          speed:         72
+
+Pokedex ID: 19	Capture Rate: 255
+Base Exp: 51	Happiness: 70
+Height: 3	Weight: 35
+
+Genus: Mouse Pokémon
+Location Areas:
+sinnoh-route-225-area
+sinnoh-sea-route-226-area
+johto-route-29-area
+johto-route-30-area
+johto-route-31-area
+sprout-tower-2f
+sprout-tower-3f
+johto-route-32-area
+union-cave-1f
+union-cave-b1f
+union-cave-b2f
+johto-route-33-area
+johto-route-34-area
+burned-tower-1f
+burned-tower-b1f
+bell-tower-2f
+bell-tower-3f
+bell-tower-4f
+bell-tower-5f
+bell-tower-6f
+bell-tower-7f
+bell-tower-8f
+bell-tower-9f
+johto-route-38-area
+johto-route-39-area
+johto-route-42-area
+mt-mortar-1f
+mt-mortar-lower-cave
+mt-mortar-b1f
+johto-route-46-area
+bell-tower-10f
+unknown-all-rattata-area
+kanto-route-1-area
+kanto-route-2-south-towards-viridian-city
+kanto-route-3-area
+kanto-route-4-area
+kanto-route-5-area
+kanto-route-6-area
+kanto-route-7-area
+kanto-route-8-area
+kanto-route-9-area
+kanto-route-10-area
+kanto-route-11-area
+kanto-route-16-area
+kanto-route-17-area
+kanto-route-18-area
+kanto-sea-route-21-area
+kanto-route-22-area
+tohjo-falls-area
+pokemon-mansion-1f
+pokemon-mansion-2f
+pokemon-mansion-3f
+pokemon-mansion-b1f
+castelia-city-area
+castelia-sewers-area
+castelia-sewers-unknown-area-38
+relic-passage-castelia-sewers-entrance
diff --git a/pokeData/rayquaza b/pokeData/rayquaza
index 800891f..c3efa29 100644
--- a/pokeData/rayquaza
+++ b/pokeData/rayquaza
@@ -1,15 +1,22 @@
+rayquaza	A dragon type Pokémon
 
-Name:  Rayquaza
-Pokedex Number:  384
-Gender Ratio:  Genderless
-Abilities: Air Lock
+It lives in the ozone layer far
+above the clouds and cannot be
+seen from the ground.
 
-Base Stats
-----------------------
-Total: 680
-Hp:  105
-Attack:  180
-Defence:  100
-Special Attack:  180
-Special Defence:  100
-Speed:  115
+   ↞--------| STATS |--------↠ 
+             hp:        105
+         attack:        150
+        defense:         90
+ special-attack:        150
+special-defense:         90
+          speed:         95
+
+Pokedex ID: 384	Capture Rate: 45
+Base Exp: 340	Happiness: 0
+Height: 70	Weight: 2065
+
+Genus: Sky High Pokémon
+Location Areas:
+sky-pillar-apex
+embedded-tower-rayquaza-room
diff --git a/pokeData/regice b/pokeData/regice
index 5cdf603..6f5b609 100644
--- a/pokeData/regice
+++ b/pokeData/regice
@@ -1,15 +1,21 @@
+regice	A ice type Pokémon
 
-Name:  Regice
-Pokedex Number:  378
-Gender Ratio:  Genderless
-Abilities: Clear Body - Ice Body (Hidden Ability)
+Its body is made of ice from the
+ice age. It controls frigid air of
+-328 degrees Fahrenheit.
 
-Base Stats
-----------------------
-Total: 580
-Hp:  80
-Attack:  50
-Defence:  100
-Special Attack:  100
-Special Defence:  200
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:         50
+        defense:        100
+ special-attack:        100
+special-defense:        200
+          speed:         50
+
+Pokedex ID: 378	Capture Rate: 3
+Base Exp: 290	Happiness: 35
+Height: 18	Weight: 1750
+
+Genus: Iceberg Pokémon
+Location Areas:
+island-cave-area
diff --git a/pokeData/regidrago b/pokeData/regidrago
index 45b0351..e13d7c9 100644
--- a/pokeData/regidrago
+++ b/pokeData/regidrago
@@ -1,15 +1,21 @@
+regidrago	A dragon type Pokémon
 
-Name:  Regidrago
-Pokedex Number:  895
-Gender Ratio:  Genderless
-Abilities: Dragon's Maw
+An academic theory proposes that Regidrago’s
+arms were once the head of an ancient dragon
+Pokémon. The theory remains unproven.
+
+   ↞--------| STATS |--------↠ 
+             hp:        200
+         attack:        100
+        defense:         50
+ special-attack:        100
+special-defense:         50
+          speed:         80
+
+Pokedex ID: 895	Capture Rate: 3
+Base Exp: 290	Happiness: 35
+Height: 21	Weight: 2000
+
+Genus: Dragon Orb Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 580
-Hp:  200
-Attack:  100
-Defence:  50
-Special Attack:  100
-Special Defence:  50
-Speed:  80
diff --git a/pokeData/regieleki b/pokeData/regieleki
index f0f1864..a974427 100644
--- a/pokeData/regieleki
+++ b/pokeData/regieleki
@@ -1,15 +1,21 @@
+regieleki	A electric type Pokémon
 
-Name:  Regieleki
-Pokedex Number:  894
-Gender Ratio:  Genderless
-Abilities: Transistor
+This Pokémon is a cluster of electrical energy.
+It’s said that removing the rings on Regieleki’s
+body will unleash the Pokémon’s latent power.
+
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:        100
+        defense:         50
+ special-attack:        100
+special-defense:         50
+          speed:        200
+
+Pokedex ID: 894	Capture Rate: 3
+Base Exp: 290	Happiness: 35
+Height: 12	Weight: 1450
+
+Genus: Electron Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 580
-Hp:  80
-Attack:  100
-Defence:  50
-Special Attack:  100
-Special Defence:  50
-Speed:  200
diff --git a/pokeData/regigigas b/pokeData/regigigas
index 72291ff..47ead75 100644
--- a/pokeData/regigigas
+++ b/pokeData/regigigas
@@ -1,15 +1,21 @@
+regigigas	A normal type Pokémon
 
-Name:  Regigigas
-Pokedex Number:  486
-Gender Ratio:  Genderless
-Abilities: Slow Start
+On dit qu’il a créé des Pokémon
+à son image à partir de glace,
+de roche et de magma.
 
-Base Stats
-----------------------
-Total: 670
-Hp:  110
-Attack:  160
-Defence:  110
-Special Attack:  80
-Special Defence:  110
-Speed:  100
+   ↞--------| STATS |--------↠ 
+             hp:        110
+         attack:        160
+        defense:        110
+ special-attack:         80
+special-defense:        110
+          speed:        100
+
+Pokedex ID: 486	Capture Rate: 3
+Base Exp: 335	Happiness: 0
+Height: 37	Weight: 4200
+
+Genus: Colossal Pokémon
+Location Areas:
+snowpoint-temple-b5f
diff --git a/pokeData/regirock b/pokeData/regirock
index 69cd883..14a97b4 100644
--- a/pokeData/regirock
+++ b/pokeData/regirock
@@ -1,15 +1,21 @@
+regirock	A rock type Pokémon
 
-Name:  Regirock
-Pokedex Number:  377
-Gender Ratio:  Genderless
-Abilities: Clear Body - Sturdy (Hidden Ability)
+Its entire body is made of rock.
+If any part chips off in battle, it
+attaches rocks to repair itself.
 
-Base Stats
-----------------------
-Total: 580
-Hp:  80
-Attack:  100
-Defence:  200
-Special Attack:  50
-Special Defence:  100
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:        100
+        defense:        200
+ special-attack:         50
+special-defense:        100
+          speed:         50
+
+Pokedex ID: 377	Capture Rate: 3
+Base Exp: 290	Happiness: 35
+Height: 17	Weight: 2300
+
+Genus: Rock Peak Pokémon
+Location Areas:
+desert-ruins-area
diff --git a/pokeData/registeel b/pokeData/registeel
index de93dd7..019571d 100644
--- a/pokeData/registeel
+++ b/pokeData/registeel
@@ -1,15 +1,21 @@
+registeel	A steel type Pokémon
 
-Name:  Registeel
-Pokedex Number:  379
-Gender Ratio:  Genderless
-Abilities: Clear Body - Light Metal (Hidden Ability)
+Tempered by pressure underground
+over tens of thousands of years,
+its body cannot be scratched.
 
-Base Stats
-----------------------
-Total: 580
-Hp:  80
-Attack:  75
-Defence:  150
-Special Attack:  75
-Special Defence:  150
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:         75
+        defense:        150
+ special-attack:         75
+special-defense:        150
+          speed:         50
+
+Pokedex ID: 379	Capture Rate: 3
+Base Exp: 290	Happiness: 35
+Height: 19	Weight: 2050
+
+Genus: Iron Pokémon
+Location Areas:
+ancient-tomb-area
diff --git a/pokeData/relicanth b/pokeData/relicanth
index a163284..9e29c7b 100644
--- a/pokeData/relicanth
+++ b/pokeData/relicanth
@@ -1,15 +1,27 @@
+relicanth	A water type Pokémon
 
-Name:  Relicanth
-Pokedex Number:  369
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Swift Swim - Rock Head - Sturdy (Hidden Ability)
+A rare Pokémon discovered during
+a deep-sea exploration. It has not
+changed in over 100 million years.
 
-Base Stats
-----------------------
-Total: 485
-Hp:  100
-Attack:  90
-Defence:  130
-Special Attack:  45
-Special Defence:  65
-Speed:  55
+   ↞--------| STATS |--------↠ 
+             hp:        100
+         attack:         90
+        defense:        130
+ special-attack:         45
+special-defense:         65
+          speed:         55
+
+Pokedex ID: 369	Capture Rate: 25
+Base Exp: 170	Happiness: 50
+Height: 10	Weight: 234
+
+Genus: Longevity Pokémon
+Location Areas:
+sinnoh-sea-route-226-area
+kanto-route-12-area
+hoenn-route-124-underwater
+hoenn-route-126-underwater
+unova-route-4-area
+ambrette-town-area
+cyllage-city-area
diff --git a/pokeData/remoraid b/pokeData/remoraid
index 035c65f..fcdeda2 100644
--- a/pokeData/remoraid
+++ b/pokeData/remoraid
@@ -1,15 +1,46 @@
+remoraid	A water type Pokémon
 
-Name:  Remoraid
-Pokedex Number:  223
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Hustle - Sniper - Moody (Hidden Ability)
+It has superb accuracy. The water it
+shoots out can strike even moving prey
+from more than 100 yards.
 
-Base Stats
-----------------------
-Total: 300
-Hp:  35
-Attack:  65
-Defence:  35
-Special Attack:  65
-Special Defence:  35
-Speed:  65
+   ↞--------| STATS |--------↠ 
+             hp:         35
+         attack:         65
+        defense:         35
+ special-attack:         65
+special-defense:         35
+          speed:         65
+
+Pokedex ID: 223	Capture Rate: 190
+Base Exp: 60	Happiness: 50
+Height: 6	Weight: 120
+
+Genus: Jet Pokémon
+Location Areas:
+pastoria-city-area
+sunyshore-city-area
+sinnoh-pokemon-league-area
+sinnoh-route-212-east-towards-pastoria-city
+sinnoh-route-213-area
+sinnoh-route-222-area
+sinnoh-route-224-area
+sinnoh-sea-route-223-area
+sinnoh-sea-route-230-area
+johto-route-44-area
+hoenn-safari-zone-expansion-south
+resort-gorgeous-area
+water-labyrinth-area
+five-isle-meadow-area
+memorial-pillar-area
+outcast-island-area
+green-path-area
+water-path-area
+trainer-tower-area
+tanoby-ruins-area
+undella-bay-area
+undella-town-area
+unova-route-21-area
+shalour-city-area
+kalos-route-12-area
+azure-bay-area
diff --git a/pokeData/reshiram b/pokeData/reshiram
index c46b348..88c6758 100644
--- a/pokeData/reshiram
+++ b/pokeData/reshiram
@@ -1,15 +1,21 @@
+reshiram	A dragon type Pokémon
 
-Name:  Reshiram
-Pokedex Number:  643
-Gender Ratio:  Genderless
-Abilities: Turboblaze
+불꽃으로 세상을 태워버릴 수 있는
+전설의 포켓몬. 진실의 세계를
+구축하는 사람을 도와준다.
+
+   ↞--------| STATS |--------↠ 
+             hp:        100
+         attack:        120
+        defense:        100
+ special-attack:        150
+special-defense:        120
+          speed:         90
+
+Pokedex ID: 643	Capture Rate: 3
+Base Exp: 340	Happiness: 0
+Height: 32	Weight: 3300
+
+Genus: Vast White Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 680
-Hp:  100
-Attack:  120
-Defence:  100
-Special Attack:  150
-Special Defence:  120
-Speed:  90
diff --git a/pokeData/reuniclus b/pokeData/reuniclus
index 8f9f040..5861730 100644
--- a/pokeData/reuniclus
+++ b/pokeData/reuniclus
@@ -1,15 +1,21 @@
+reuniclus	A psychic type Pokémon
 
-Name:  Reuniclus
-Pokedex Number:  579
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Overcoat - Magic Guard - Regenerator (Hidden Ability)
+발휘한 사이코 파워를 사용해
+특수한 액체로 만들어진
+팔을 조종해서 바위를 부순다.
 
-Base Stats
-----------------------
-Total: 490
-Hp:  110
-Attack:  65
-Defence:  75
-Special Attack:  125
-Special Defence:  85
-Speed:  30
+   ↞--------| STATS |--------↠ 
+             hp:        110
+         attack:         65
+        defense:         75
+ special-attack:        125
+special-defense:         85
+          speed:         30
+
+Pokedex ID: 579	Capture Rate: 50
+Base Exp: 245	Happiness: 50
+Height: 10	Weight: 201
+
+Genus: Multiplying Pokémon
+Location Areas:
+unova-route-9-area
diff --git a/pokeData/rhydon b/pokeData/rhydon
index c9abe60..ba66044 100644
--- a/pokeData/rhydon
+++ b/pokeData/rhydon
@@ -1,15 +1,33 @@
+rhydon	A ground type Pokémon
 
-Name:  Rhydon
-Pokedex Number:  112
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Lightningrod - Rock Head - Reckless (Hidden Ability)
+RHYDON has a horn that serves as a
+drill. It is used for destroying rocks
+and boulders.This POKéMON occasionally rams into
+streams of magma, but the armor-like
+hide prevents it from feeling the heat.
 
-Base Stats
-----------------------
-Total: 485
-Hp:  105
-Attack:  130
-Defence:  120
-Special Attack:  45
-Special Defence:  45
-Speed:  40
+   ↞--------| STATS |--------↠ 
+             hp:        105
+         attack:        130
+        defense:        120
+ special-attack:         45
+special-defense:         45
+          speed:         40
+
+Pokedex ID: 112	Capture Rate: 60
+Base Exp: 170	Happiness: 50
+Height: 19	Weight: 1200
+
+Genus: Drill Pokémon
+Location Areas:
+sinnoh-victory-road-1f
+stark-mountain-area
+stark-mountain-entrance
+stark-mountain-inside
+sinnoh-route-227-area
+sinnoh-route-228-area
+kanto-victory-road-1-1f
+kanto-victory-road-1-2f
+kanto-victory-road-1-3f
+cerulean-cave-2f
+cerulean-cave-b1f
diff --git a/pokeData/rhyhorn b/pokeData/rhyhorn
index 475dc15..cfd2e5d 100644
--- a/pokeData/rhyhorn
+++ b/pokeData/rhyhorn
@@ -1,15 +1,36 @@
+rhyhorn	A ground type Pokémon
 
-Name:  Rhyhorn
-Pokedex Number:  111
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Lightningrod - Rock Head - Reckless (Hidden Ability)
+RHYHORN’s brain is very small. It is so
+dense, while on a run it forgets why it
+started running in the first place.It apparently remembers sometimes if it
+demolishes something.
 
-Base Stats
-----------------------
-Total: 345
-Hp:  80
-Attack:  85
-Defence:  95
-Special Attack:  30
-Special Defence:  30
-Speed:  25
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:         85
+        defense:         95
+ special-attack:         30
+special-defense:         30
+          speed:         25
+
+Pokedex ID: 111	Capture Rate: 120
+Base Exp: 69	Happiness: 50
+Height: 10	Weight: 1150
+
+Genus: Spikes Pokémon
+Location Areas:
+sinnoh-victory-road-1f
+stark-mountain-area
+stark-mountain-entrance
+sinnoh-route-214-area
+sinnoh-route-227-area
+kanto-victory-road-1-1f
+kanto-victory-road-1-2f
+kanto-victory-road-1-3f
+cerulean-cave-2f
+cerulean-cave-b1f
+kanto-safari-zone-middle
+kanto-safari-zone-area-2-north
+hoenn-safari-zone-nwmach-bike-area
+glittering-cave-unknown-area-303
+johto-safari-zone-zone-savannah
diff --git a/pokeData/rhyperior b/pokeData/rhyperior
index 030282a..39742dc 100644
--- a/pokeData/rhyperior
+++ b/pokeData/rhyperior
@@ -1,15 +1,21 @@
+rhyperior	A ground type Pokémon
 
-Name:  Rhyperior
-Pokedex Number:  464
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Lightningrod - Solid Rock - Reckless (Hidden Ability)
+Il peut lancer des pierres à une
+vitesse saisissante en bandant et
+relâchant ses muscles en un éclair.
+
+   ↞--------| STATS |--------↠ 
+             hp:        115
+         attack:        140
+        defense:        130
+ special-attack:         55
+special-defense:         55
+          speed:         40
+
+Pokedex ID: 464	Capture Rate: 30
+Base Exp: 268	Happiness: 50
+Height: 24	Weight: 2828
+
+Genus: Drill Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 535
-Hp:  115
-Attack:  140
-Defence:  130
-Special Attack:  55
-Special Defence:  55
-Speed:  40
diff --git a/pokeData/ribombee b/pokeData/ribombee
index a7873cd..0440abc 100644
--- a/pokeData/ribombee
+++ b/pokeData/ribombee
@@ -1,15 +1,21 @@
+ribombee	A bug type Pokémon
 
-Name:  Ribombee
-Pokedex Number:  743
-Gender Ratio:   ♂:50.2% ♀:49.8% 
-Abilities: Honey Gather - Shield Dust - Sweet Veil (Hidden Ability)
+It rolls up pollen into puffs. It makes many
+different varieties, some used as food and
+others used in battle.
+
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         55
+        defense:         60
+ special-attack:         95
+special-defense:         70
+          speed:        124
+
+Pokedex ID: 743	Capture Rate: 75
+Base Exp: 162	Happiness: 50
+Height: 2	Weight: 5
+
+Genus: Bee Fly Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 464
-Hp:  60
-Attack:  55
-Defence:  60
-Special Attack:  95
-Special Defence:  70
-Speed:  124
diff --git a/pokeData/rillaboom b/pokeData/rillaboom
index ee3c17b..00c5cf5 100644
--- a/pokeData/rillaboom
+++ b/pokeData/rillaboom
@@ -1,15 +1,21 @@
+rillaboom	A grass type Pokémon
 
-Name:  Rillaboom
-Pokedex Number:  812
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Overgrow - Grassy Surge (Hidden Ability)
+By drumming, it taps into the power of its special
+tree stump. The roots of the stump follow its
+direction in battle.
+
+   ↞--------| STATS |--------↠ 
+             hp:        100
+         attack:        125
+        defense:         90
+ special-attack:         60
+special-defense:         70
+          speed:         85
+
+Pokedex ID: 812	Capture Rate: 45
+Base Exp: 265	Happiness: 50
+Height: 21	Weight: 900
+
+Genus: Drummer Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 530
-Hp:  100
-Attack:  125
-Defence:  90
-Special Attack:  60
-Special Defence:  70
-Speed:  85
diff --git a/pokeData/riolu b/pokeData/riolu
index 3df9a22..db9586c 100644
--- a/pokeData/riolu
+++ b/pokeData/riolu
@@ -1,15 +1,25 @@
+riolu	A fighting type Pokémon
 
-Name:  Riolu
-Pokedex Number:  447
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Steadfast - Inner Focus - Prankster (Hidden Ability)
+Il a la faculté unique de visualiser
+les émotions telles que la joie ou
+la colère sous forme d’ondes.
 
-Base Stats
-----------------------
-Total: 285
-Hp:  40
-Attack:  70
-Defence:  40
-Special Attack:  35
-Special Defence:  40
-Speed:  60
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         70
+        defense:         40
+ special-attack:         35
+special-defense:         40
+          speed:         60
+
+Pokedex ID: 447	Capture Rate: 75
+Base Exp: 57	Happiness: 50
+Height: 7	Weight: 202
+
+Genus: Emanation Pokémon
+Location Areas:
+iron-island-b2f-left
+challengers-cave-b1f
+challengers-cave-b2f
+floccesy-ranch-inner
+kalos-route-22-area
diff --git a/pokeData/rockruff b/pokeData/rockruff
index bce9213..82b1f88 100644
--- a/pokeData/rockruff
+++ b/pokeData/rockruff
@@ -1,15 +1,21 @@
+rockruff	A rock type Pokémon
 
-Name:  Rockruff
-Pokedex Number:  744
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Keen Eye - Vital Spirit - Steadfast (Hidden Ability) (Standard) - Own Tempo (Alternate Rockruff Only
+It’s considered to be a good Pokémon for
+beginners because of its friendliness, but its
+disposition grows rougher as it grows up.
+
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         65
+        defense:         40
+ special-attack:         30
+special-defense:         40
+          speed:         60
+
+Pokedex ID: 744	Capture Rate: 190
+Base Exp: 56	Happiness: 50
+Height: 5	Weight: 92
+
+Genus: Puppy Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 280
-Hp:  45
-Attack:  65
-Defence:  40
-Special Attack:  30
-Special Defence:  40
-Speed:  60
diff --git a/pokeData/roggenrola b/pokeData/roggenrola
index c05265b..1c8dd56 100644
--- a/pokeData/roggenrola
+++ b/pokeData/roggenrola
@@ -1,15 +1,26 @@
+roggenrola	A rock type Pokémon
 
-Name:  Roggenrola
-Pokedex Number:  524
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Sturdy - Sand Force (Hidden Ability)
+육각형 귀를 가지고 있다.
+땅속 깊은 곳에서 압축된 몸은
+철 못지않게 단단하다.
 
-Base Stats
-----------------------
-Total: 280
-Hp:  55
-Attack:  75
-Defence:  85
-Special Attack:  25
-Special Defence:  25
-Speed:  15
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         75
+        defense:         85
+ special-attack:         25
+special-defense:         25
+          speed:         15
+
+Pokedex ID: 524	Capture Rate: 255
+Base Exp: 56	Happiness: 50
+Height: 4	Weight: 180
+
+Genus: Mantle Pokémon
+Location Areas:
+wellspring-cave-area
+relic-passage-castelia-sewers-entrance
+reflection-cave-unknown-area-305
+reflection-cave-unknown-area-306
+reflection-cave-unknown-area-307
+reflection-cave-unknown-area-308
diff --git a/pokeData/rolycoly b/pokeData/rolycoly
index 0664a70..aa2c691 100644
--- a/pokeData/rolycoly
+++ b/pokeData/rolycoly
@@ -1,15 +1,21 @@
+rolycoly	A rock type Pokémon
 
-Name:  Rolycoly
-Pokedex Number:  837
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Steam Engine - Heatproof - Flash Fire (Hidden Ability)
+Most of its body has the same composition as
+coal. Fittingly, this Pokémon was first discovered
+in coal mines about 400 years ago.
+
+   ↞--------| STATS |--------↠ 
+             hp:         30
+         attack:         40
+        defense:         50
+ special-attack:         40
+special-defense:         50
+          speed:         30
+
+Pokedex ID: 837	Capture Rate: 255
+Base Exp: 48	Happiness: 50
+Height: 3	Weight: 120
+
+Genus: Coal Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 240
-Hp:  30
-Attack:  40
-Defence:  50
-Special Attack:  40
-Special Defence:  50
-Speed:  30
diff --git a/pokeData/rookidee b/pokeData/rookidee
index 052f85c..e9411c5 100644
--- a/pokeData/rookidee
+++ b/pokeData/rookidee
@@ -1,15 +1,21 @@
+rookidee	A flying type Pokémon
 
-Name:  Rookidee
-Pokedex Number:  821
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Keen Eye - Unnerve - Big Pecks (Hidden Ability)
+It will bravely challenge any opponent, no matter
+how powerful. This Pokémon benefits from every
+battle—even a defeat increases its strength a bit.
+
+   ↞--------| STATS |--------↠ 
+             hp:         38
+         attack:         47
+        defense:         35
+ special-attack:         33
+special-defense:         35
+          speed:         57
+
+Pokedex ID: 821	Capture Rate: 255
+Base Exp: 49	Happiness: 50
+Height: 2	Weight: 18
+
+Genus: Tiny Bird Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 245
-Hp:  38
-Attack:  47
-Defence:  35
-Special Attack:  33
-Special Defence:  35
-Speed:  57
diff --git a/pokeData/roselia b/pokeData/roselia
index 74a0525..954a003 100644
--- a/pokeData/roselia
+++ b/pokeData/roselia
@@ -1,15 +1,36 @@
+roselia	A grass type Pokémon
 
-Name:  Roselia
-Pokedex Number:  315
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Natural Cure - Poison Point - Leaf Guard (Hidden Ability)
+The more healthy the ROSELIA, the
+more pleasant its flowers’ aroma.
+Its scent deeply relaxes people.
 
-Base Stats
-----------------------
-Total: 400
-Hp:  50
-Attack:  60
-Defence:  45
-Special Attack:  100
-Special Defence:  80
-Speed:  65
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         60
+        defense:         45
+ special-attack:        100
+special-defense:         80
+          speed:         65
+
+Pokedex ID: 315	Capture Rate: 150
+Base Exp: 140	Happiness: 50
+Height: 3	Weight: 20
+
+Genus: Thorn Pokémon
+Location Areas:
+trophy-garden-area
+sinnoh-route-208-area
+sinnoh-route-209-area
+sinnoh-route-210-south-towards-solaceon-town
+sinnoh-route-212-north-towards-hearthome-city
+sinnoh-route-212-east-towards-pastoria-city
+sinnoh-route-221-area
+sinnoh-route-224-area
+sinnoh-route-225-area
+sinnoh-route-229-area
+sinnoh-sea-route-230-area
+hoenn-route-117-area
+unova-route-12-area
+lostlorn-forest-area
+unova-victory-road-2-unknown-area-72
+kalos-route-7-area
diff --git a/pokeData/roserade b/pokeData/roserade
index 5126314..d7c2c52 100644
--- a/pokeData/roserade
+++ b/pokeData/roserade
@@ -1,15 +1,23 @@
+roserade	A grass type Pokémon
 
-Name:  Roserade
-Pokedex Number:  407
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Natural Cure - Poison Point - Technician (Hidden Ability)
+Each of its hands contains
+different toxins, but both hands
+can jab with near-fatal power.
 
-Base Stats
-----------------------
-Total: 515
-Hp:  60
-Attack:  70
-Defence:  65
-Special Attack:  125
-Special Defence:  105
-Speed:  90
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         70
+        defense:         65
+ special-attack:        125
+special-defense:        105
+          speed:         90
+
+Pokedex ID: 407	Capture Rate: 75
+Base Exp: 258	Happiness: 50
+Height: 9	Weight: 145
+
+Genus: Bouquet Pokémon
+Location Areas:
+unova-route-12-area
+lostlorn-forest-area
+unova-victory-road-2-unknown-area-72
diff --git a/pokeData/rotom b/pokeData/rotom
index 1abb4e3..08b7d96 100644
--- a/pokeData/rotom
+++ b/pokeData/rotom
@@ -1,15 +1,21 @@
+rotom	A electric type Pokémon
 
-Name:  Rotom
-Pokedex Number:  479
-Gender Ratio:  
-Abilities: Levitate
+Its electric-like body can enter
+some kinds of machines and take
+control in order to make mischief.
 
-Base Stats
-----------------------
-Total: 440
-Hp:  50
-Attack:  65
-Defence:  107
-Special Attack:  105
-Special Defence:  107
-Speed:  86
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         50
+        defense:         77
+ special-attack:         95
+special-defense:         77
+          speed:         91
+
+Pokedex ID: 479	Capture Rate: 45
+Base Exp: 154	Happiness: 50
+Height: 3	Weight: 3
+
+Genus: Plasma Pokémon
+Location Areas:
+old-chateau-2f-left-room
diff --git a/pokeData/rowlet b/pokeData/rowlet
index 0ac5c81..423e307 100644
--- a/pokeData/rowlet
+++ b/pokeData/rowlet
@@ -1,15 +1,21 @@
+rowlet	A grass type Pokémon
 
-Name:  Rowlet
-Pokedex Number:  722
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Overgrow - Long Reach (Hidden Ability)
+This wary Pokémon uses photosynthesis to
+store up energy during the day, while becoming
+active at night.
+
+   ↞--------| STATS |--------↠ 
+             hp:         68
+         attack:         55
+        defense:         55
+ special-attack:         50
+special-defense:         50
+          speed:         42
+
+Pokedex ID: 722	Capture Rate: 45
+Base Exp: 64	Happiness: 50
+Height: 3	Weight: 15
+
+Genus: Grass Quill Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 320
-Hp:  68
-Attack:  55
-Defence:  55
-Special Attack:  50
-Special Defence:  50
-Speed:  42
diff --git a/pokeData/rufflet b/pokeData/rufflet
index d4fbde7..1423068 100644
--- a/pokeData/rufflet
+++ b/pokeData/rufflet
@@ -1,15 +1,26 @@
+rufflet	A normal type Pokémon
 
-Name:  Rufflet
-Pokedex Number:  627
-Gender Ratio:   ♂:100% ♀:0% 
-Abilities: Keen Eye - Sheer Force - Hustle (Hidden Ability)
+きゃくりょくで　きのみを　くだく。
+どんなに　つよい　あいてでも
+ゆうかんに　たちむかう　しゅうせい。
 
-Base Stats
-----------------------
-Total: 350
-Hp:  70
-Attack:  83
-Defence:  50
-Special Attack:  37
-Special Defence:  50
-Speed:  60
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         83
+        defense:         50
+ special-attack:         37
+special-defense:         50
+          speed:         60
+
+Pokedex ID: 627	Capture Rate: 190
+Base Exp: 70	Happiness: 50
+Height: 5	Weight: 105
+
+Genus: Eaglet Pokémon
+Location Areas:
+unova-victory-road-outside
+village-bridge-area
+unova-route-10-area
+unova-route-10-victory-road-gate
+unova-route-11-area
+unova-route-23-area
diff --git a/pokeData/runerigus b/pokeData/runerigus
index edb24ed..98f33bb 100644
--- a/pokeData/runerigus
+++ b/pokeData/runerigus
@@ -1,15 +1,21 @@
+runerigus	A ground type Pokémon
 
-Name:  Runerigus
-Pokedex Number:  867
-Gender Ratio:   ♂:50.2% ♀:49.8% 
-Abilities: Wandering Spirit
+A powerful curse was woven into an ancient
+painting. After absorbing the spirit of a Yamask,
+the painting began to move.
+
+   ↞--------| STATS |--------↠ 
+             hp:         58
+         attack:         95
+        defense:        145
+ special-attack:         50
+special-defense:        105
+          speed:         30
+
+Pokedex ID: 867	Capture Rate: 90
+Base Exp: 169	Happiness: 50
+Height: 16	Weight: 666
+
+Genus: Grudge Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 483
-Hp:  58
-Attack:  95
-Defence:  145
-Special Attack:  50
-Special Defence:  105
-Speed:  30
diff --git a/pokeData/sableye b/pokeData/sableye
index 55f11df..5fc1cfa 100644
--- a/pokeData/sableye
+++ b/pokeData/sableye
@@ -1,15 +1,43 @@
+sableye	A dark type Pokémon
 
-Name:  Sableye
-Pokedex Number:  302
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Keen Eye - Stall - Prankster (Hidden Ability)
+It hides in the darkness of caves.
+Its diet of gems has transformed
+its eyes into gemstones.
 
-Base Stats
-----------------------
-Total: 380
-Hp:  50
-Attack:  85
-Defence:  125
-Special Attack:  85
-Special Defence:  115
-Speed:  20
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         75
+        defense:         75
+ special-attack:         65
+special-defense:         65
+          speed:         50
+
+Pokedex ID: 302	Capture Rate: 45
+Base Exp: 133	Happiness: 35
+Height: 5	Weight: 110
+
+Genus: Darkness Pokémon
+Location Areas:
+iron-island-b1f-left
+iron-island-b1f-right
+iron-island-b2f-right
+iron-island-b2f-left
+iron-island-b3f
+kanto-route-9-area
+granite-cave-b1f
+granite-cave-b2f
+cave-of-origin-1f
+cave-of-origin-b1f
+cave-of-origin-b2f
+cave-of-origin-b3f
+hoenn-victory-road-b2f
+sky-pillar-1f
+sky-pillar-3f
+sky-pillar-5f
+challengers-cave-1f
+challengers-cave-b1f
+challengers-cave-b2f
+reflection-cave-unknown-area-305
+reflection-cave-unknown-area-306
+reflection-cave-unknown-area-307
+reflection-cave-unknown-area-308
diff --git a/pokeData/salamence b/pokeData/salamence
index 3138e74..fc2e3a8 100644
--- a/pokeData/salamence
+++ b/pokeData/salamence
@@ -1,15 +1,21 @@
+salamence	A dragon type Pokémon
 
-Name:  Salamence
-Pokedex Number:  373
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Intimidate - Moxie (Hidden Ability)
+As a result of its long-held dream
+of flying, its cellular structure
+changed, and wings grew out.
+
+   ↞--------| STATS |--------↠ 
+             hp:         95
+         attack:        135
+        defense:         80
+ special-attack:        110
+special-defense:         80
+          speed:        100
+
+Pokedex ID: 373	Capture Rate: 45
+Base Exp: 300	Happiness: 35
+Height: 15	Weight: 1026
+
+Genus: Dragon Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 600
-Hp:  95
-Attack:  145
-Defence:  130
-Special Attack:  120
-Special Defence:  90
-Speed:  120
diff --git a/pokeData/salandit b/pokeData/salandit
index d0e851c..217adec 100644
--- a/pokeData/salandit
+++ b/pokeData/salandit
@@ -1,15 +1,21 @@
+salandit	A poison type Pokémon
 
-Name:  Salandit
-Pokedex Number:  757
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Corrosion - Oblivious (Hidden Ability)
+It burns its bodily fluids to create a poisonous
+gas. When its enemies become disoriented from
+inhaling the gas, it attacks them.
+
+   ↞--------| STATS |--------↠ 
+             hp:         48
+         attack:         44
+        defense:         40
+ special-attack:         71
+special-defense:         40
+          speed:         77
+
+Pokedex ID: 757	Capture Rate: 120
+Base Exp: 64	Happiness: 50
+Height: 6	Weight: 48
+
+Genus: Toxic Lizard Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 320
-Hp:  48
-Attack:  44
-Defence:  40
-Special Attack:  71
-Special Defence:  40
-Speed:  77
diff --git a/pokeData/salazzle b/pokeData/salazzle
index d9a1409..0faa722 100644
--- a/pokeData/salazzle
+++ b/pokeData/salazzle
@@ -1,15 +1,21 @@
+salazzle	A poison type Pokémon
 
-Name:  Salazzle
-Pokedex Number:  758
-Gender Ratio:   ♂:0% ♀:100% 
-Abilities: Corrosion - Oblivious (Hidden Ability)
+For some reason, only females have been found.
+It creates a reverse harem of male Salandit that
+it lives with.
+
+   ↞--------| STATS |--------↠ 
+             hp:         68
+         attack:         64
+        defense:         60
+ special-attack:        111
+special-defense:         60
+          speed:        117
+
+Pokedex ID: 758	Capture Rate: 45
+Base Exp: 168	Happiness: 50
+Height: 12	Weight: 222
+
+Genus: Toxic Lizard Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 480
-Hp:  68
-Attack:  64
-Defence:  60
-Special Attack:  111
-Special Defence:  60
-Speed:  117
diff --git a/pokeData/samurott b/pokeData/samurott
index 3d1c579..9528f65 100644
--- a/pokeData/samurott
+++ b/pokeData/samurott
@@ -1,15 +1,21 @@
+samurott	A water type Pokémon
 
-Name:  Samurott
-Pokedex Number:  503
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Torrent - Shell Armor (Hidden Ability)
+상대가 눈을 깜빡이는 동안에
+앞다리에 붙어 있는 각검으로
+상대를 베고 원래대로 되돌린다.
+
+   ↞--------| STATS |--------↠ 
+             hp:         95
+         attack:        100
+        defense:         85
+ special-attack:        108
+special-defense:         70
+          speed:         70
+
+Pokedex ID: 503	Capture Rate: 45
+Base Exp: 238	Happiness: 70
+Height: 15	Weight: 946
+
+Genus: Formidable Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 528
-Hp:  95
-Attack:  100
-Defence:  85
-Special Attack:  108
-Special Defence:  70
-Speed:  70
diff --git a/pokeData/sandaconda b/pokeData/sandaconda
index 3e0c1ea..894453e 100644
--- a/pokeData/sandaconda
+++ b/pokeData/sandaconda
@@ -1,15 +1,21 @@
+sandaconda	A ground type Pokémon
 
-Name:  Sandaconda
-Pokedex Number:  844
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Sand Spit - Shed Skin - Sand Veil (Hidden Ability)
+When it contracts its body, over 220 pounds of
+sand sprays from its nose. If it ever runs out of
+sand, it becomes disheartened.
+
+   ↞--------| STATS |--------↠ 
+             hp:         72
+         attack:        107
+        defense:        125
+ special-attack:         65
+special-defense:         70
+          speed:         71
+
+Pokedex ID: 844	Capture Rate: 120
+Base Exp: 179	Happiness: 50
+Height: 38	Weight: 655
+
+Genus: Sand Snake Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 510
-Hp:  72
-Attack:  107
-Defence:  125
-Special Attack:  65
-Special Defence:  70
-Speed:  71
diff --git a/pokeData/sandile b/pokeData/sandile
index 71c2ca5..bc22b44 100644
--- a/pokeData/sandile
+++ b/pokeData/sandile
@@ -1,15 +1,26 @@
+sandile	A ground type Pokémon
 
-Name:  Sandile
-Pokedex Number:  551
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Intimidate - Moxie - Anger Point (Hidden Ability)
+모래 속에 파고들어 눈과 코를
+밖에 내놓고 이동한다.
+검은 막이 눈을 보호한다.
 
-Base Stats
-----------------------
-Total: 292
-Hp:  50
-Attack:  72
-Defence:  35
-Special Attack:  35
-Special Defence:  35
-Speed:  65
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         72
+        defense:         35
+ special-attack:         35
+special-defense:         35
+          speed:         65
+
+Pokedex ID: 551	Capture Rate: 180
+Base Exp: 58	Happiness: 50
+Height: 7	Weight: 152
+
+Genus: Desert Croc Pokémon
+Location Areas:
+desert-resort-entrance
+desert-resort-area
+relic-castle-a
+relic-castle-c
+unova-route-4-area
+kalos-route-9-area
diff --git a/pokeData/sandshrew b/pokeData/sandshrew
index 7359bf9..a714b5a 100644
--- a/pokeData/sandshrew
+++ b/pokeData/sandshrew
@@ -1,15 +1,41 @@
+sandshrew	A ground type Pokémon
 
-Name:  Sandshrew
-Pokedex Number:  027
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Sand Veil - Sand Rush (Hidden Ability)
+SANDSHREW has a very dry hide that is
+extremely tough. The POKéMON can roll
+into a ball that repels any attack.At night, it burrows into the desert
+sand to sleep.
 
-Base Stats
-----------------------
-Total: 300
-Hp:  50
-Attack:  75
-Defence:  85
-Special Attack:  20
-Special Defence:  30
-Speed:  40
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         75
+        defense:         85
+ special-attack:         20
+special-defense:         30
+          speed:         40
+
+Pokedex ID: 27	Capture Rate: 255
+Base Exp: 60	Happiness: 50
+Height: 6	Weight: 120
+
+Genus: Mouse Pokémon
+Location Areas:
+wayward-cave-1f
+wayward-cave-b1f
+union-cave-1f
+union-cave-b1f
+mt-moon-1f
+mt-moon-2f
+kanto-route-3-area
+kanto-route-4-area
+kanto-route-8-area
+kanto-route-9-area
+kanto-route-10-area
+kanto-route-11-area
+kanto-route-23-area
+hoenn-route-111-area
+hoenn-route-113-area
+mirage-tower-area
+desert-resort-entrance
+desert-resort-area
+relic-castle-a
+johto-safari-zone-zone-desert
diff --git a/pokeData/sandslash b/pokeData/sandslash
index 4bf448a..a16a2d8 100644
--- a/pokeData/sandslash
+++ b/pokeData/sandslash
@@ -1,15 +1,46 @@
+sandslash	A ground type Pokémon
 
-Name:  Sandslash
-Pokedex Number:  028
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Sand Veil - Sand Rush (Hidden Ability)
+SANDSLASH can roll up its body as if it
+were a ball covered with large spikes.
+In battle, this POKéMON will try to makethe foe flinch by jabbing it with its
+spines. It then leaps at the stunned
+foe to tear wildly with its sharp claws.
 
-Base Stats
-----------------------
-Total: 450
-Hp:  75
-Attack:  100
-Defence:  110
-Special Attack:  45
-Special Defence:  55
-Speed:  65
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:        100
+        defense:        110
+ special-attack:         45
+special-defense:         55
+          speed:         65
+
+Pokedex ID: 28	Capture Rate: 90
+Base Exp: 158	Happiness: 50
+Height: 10	Weight: 295
+
+Genus: Mouse Pokémon
+Location Areas:
+sinnoh-route-228-area
+kanto-route-26-area
+kanto-route-27-area
+mt-moon-1f
+mt-moon-2f
+kanto-victory-road-1-1f
+kanto-victory-road-1-2f
+kanto-victory-road-1-3f
+cerulean-cave-1f
+cerulean-cave-2f
+cerulean-cave-b1f
+kanto-route-23-area
+kanto-victory-road-2-1f
+kanto-victory-road-2-2f
+kanto-victory-road-2-3f
+relic-castle-c
+unova-route-15-area
+kalos-route-18-area
+terminus-cave-unknown-area-343
+terminus-cave-unknown-area-344
+terminus-cave-unknown-area-345
+terminus-cave-unknown-area-347
+terminus-cave-unknown-area-348
+johto-safari-zone-zone-desert
diff --git a/pokeData/sandygast b/pokeData/sandygast
index 12a9689..a3db7ea 100644
--- a/pokeData/sandygast
+++ b/pokeData/sandygast
@@ -1,15 +1,21 @@
+sandygast	A ghost type Pokémon
 
-Name:  Sandygast
-Pokedex Number:  769
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Water Compaction - Sand Veil (Hidden Ability)
+Born from a sand mound playfully built by a
+child, this Pokémon embodies the grudges of
+the departed.
+
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         55
+        defense:         80
+ special-attack:         70
+special-defense:         45
+          speed:         15
+
+Pokedex ID: 769	Capture Rate: 140
+Base Exp: 64	Happiness: 50
+Height: 5	Weight: 700
+
+Genus: Sand Heap Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 320
-Hp:  55
-Attack:  55
-Defence:  80
-Special Attack:  70
-Special Defence:  45
-Speed:  15
diff --git a/pokeData/sawk b/pokeData/sawk
index b28626a..fb5f2cb 100644
--- a/pokeData/sawk
+++ b/pokeData/sawk
@@ -1,15 +1,28 @@
+sawk	A fighting type Pokémon
 
-Name:  Sawk
-Pokedex Number:  539
-Gender Ratio:   ♂:100% ♀:0%
-Abilities: Sturdy - Inner Focus - Mold Breaker (Hidden Ability)
+さいきょうの　からてチョップを
+もとめて　やまおくに　こもって
+ねむることなく　しゅぎょうする。
 
-Base Stats
-----------------------
-Total: 465
-Hp:  75
-Attack:  125
-Defence:  75
-Special Attack:  30
-Special Defence:  75
-Speed:  85
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:        125
+        defense:         75
+ special-attack:         30
+special-defense:         75
+          speed:         85
+
+Pokedex ID: 539	Capture Rate: 45
+Base Exp: 163	Happiness: 50
+Height: 14	Weight: 510
+
+Genus: Karate Pokémon
+Location Areas:
+pinwheel-forest-outside
+unova-route-10-area
+unova-route-10-victory-road-gate
+unova-route-15-area
+unova-route-18-area
+unova-victory-road-2-unknown-area-76
+unova-route-23-area
+kalos-route-11-area
diff --git a/pokeData/sawsbuck b/pokeData/sawsbuck
index 37c7f68..f23f10c 100644
--- a/pokeData/sawsbuck
+++ b/pokeData/sawsbuck
@@ -1,15 +1,22 @@
+sawsbuck	A normal type Pokémon
 
-Name:  Sawsbuck
-Pokedex Number:  586
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Chlorophyll - Sap Sipper - Serene Grace (Hidden Ability)
+계절에 따라 거처를 바꾼다.
+사람들은 바라철록의 뿔에서
+계절의 변화를 느낀다.
 
-Base Stats
-----------------------
-Total: 475
-Hp:  80
-Attack:  100
-Defence:  70
-Special Attack:  60
-Special Defence:  70
-Speed:  95
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:        100
+        defense:         70
+ special-attack:         60
+special-defense:         70
+          speed:         95
+
+Pokedex ID: 586	Capture Rate: 75
+Base Exp: 166	Happiness: 70
+Height: 19	Weight: 925
+
+Genus: Season Pokémon
+Location Areas:
+dragonspiral-tower-entrance
+dragonspiral-tower-outside
diff --git a/pokeData/scatterbug b/pokeData/scatterbug
index 1472043..3f83658 100644
--- a/pokeData/scatterbug
+++ b/pokeData/scatterbug
@@ -1,15 +1,22 @@
+scatterbug	A bug type Pokémon
 
-Name:  Scatterbug
-Pokedex Number:  664
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Shield Dust - Compoundeyes - Friend Guard (Hidden Ability)
+とりポケモンに　襲われると
+黒い　粉を　まき散らす。
+触れると　マヒする　毒の粉だ。
 
-Base Stats
-----------------------
-Total: 200
-Hp:  38
-Attack:  35
-Defence:  40
-Special Attack:  27
-Special Defence:  25
-Speed:  35
+   ↞--------| STATS |--------↠ 
+             hp:         38
+         attack:         35
+        defense:         40
+ special-attack:         27
+special-defense:         25
+          speed:         35
+
+Pokedex ID: 664	Capture Rate: 255
+Base Exp: 40	Happiness: 70
+Height: 3	Weight: 25
+
+Genus: Scatterdust Pokémon
+Location Areas:
+kalos-route-2-area
+santalune-forest-area
diff --git a/pokeData/sceptile b/pokeData/sceptile
index 5fde861..da08210 100644
--- a/pokeData/sceptile
+++ b/pokeData/sceptile
@@ -1,15 +1,21 @@
+sceptile	A grass type Pokémon
 
-Name:  Sceptile
-Pokedex Number:  254
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Overgrow - Unburden (Hidden Ability)
+The leaves that grow on its arms
+can slice down thick trees. It is
+without peer in jungle combat.
+
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         85
+        defense:         65
+ special-attack:        105
+special-defense:         85
+          speed:        120
+
+Pokedex ID: 254	Capture Rate: 45
+Base Exp: 265	Happiness: 50
+Height: 17	Weight: 522
+
+Genus: Forest Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 530
-Hp:  70
-Attack:  110
-Defence:  75
-Special Attack:  145
-Special Defence:  85
-Speed:  145
diff --git a/pokeData/scizor b/pokeData/scizor
index e0f5f73..58dcd74 100644
--- a/pokeData/scizor
+++ b/pokeData/scizor
@@ -1,15 +1,21 @@
+scizor	A bug type Pokémon
 
-Name:  Scizor
-Pokedex Number:  212
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Swarm - Technician - Light Metal (Hidden Ability)
+Its wings are not used for flying.
+They are flapped at high speed to adjust
+its body temperature.
+
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:        130
+        defense:        100
+ special-attack:         55
+special-defense:         80
+          speed:         65
+
+Pokedex ID: 212	Capture Rate: 25
+Base Exp: 175	Happiness: 50
+Height: 18	Weight: 1180
+
+Genus: Pincer Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 500
-Hp:  70
-Attack:  150
-Defence:  140
-Special Attack:  65
-Special Defence:  100
-Speed:  75
diff --git a/pokeData/scolipede b/pokeData/scolipede
index c17ea70..78e1724 100644
--- a/pokeData/scolipede
+++ b/pokeData/scolipede
@@ -1,15 +1,21 @@
+scolipede	A bug type Pokémon
 
-Name:  Scolipede
-Pokedex Number:  545
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Poison Point - Swarm - Speed Boost (Hidden Ability)
+먹이를 목의 가시에 끼워 넣어
+움직이지 못하게 한 후
+맹독을 퍼뜨려 마무리한다.
 
-Base Stats
-----------------------
-Total: 485
-Hp:  60
-Attack:  100
-Defence:  89
-Special Attack:  55
-Special Defence:  69
-Speed:  112
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:        100
+        defense:         89
+ special-attack:         55
+special-defense:         69
+          speed:        112
+
+Pokedex ID: 545	Capture Rate: 45
+Base Exp: 243	Happiness: 50
+Height: 25	Weight: 2005
+
+Genus: Megapede Pokémon
+Location Areas:
+pinwheel-forest-inside
diff --git a/pokeData/scorbunny b/pokeData/scorbunny
index 486627d..38ace64 100644
--- a/pokeData/scorbunny
+++ b/pokeData/scorbunny
@@ -1,15 +1,21 @@
+scorbunny	A fire type Pokémon
 
-Name:  Scorbunny
-Pokedex Number:  813
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Blaze - Libero (Hidden Ability)
+A warm-up of running around gets fire energy
+coursing through this Pokémon’s body. Once that
+happens, it’s ready to fight at full power.
+
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         71
+        defense:         40
+ special-attack:         40
+special-defense:         40
+          speed:         69
+
+Pokedex ID: 813	Capture Rate: 45
+Base Exp: 62	Happiness: 50
+Height: 3	Weight: 45
+
+Genus: Rabbit Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 310
-Hp:  50
-Attack:  71
-Defence:  40
-Special Attack:  40
-Special Defence:  40
-Speed:  69
diff --git a/pokeData/scrafty b/pokeData/scrafty
index 6cfac15..38e1428 100644
--- a/pokeData/scrafty
+++ b/pokeData/scrafty
@@ -1,15 +1,24 @@
+scrafty	A dark type Pokémon
 
-Name:  Scrafty
-Pokedex Number:  560
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Shed Skin - Moxie - Intimidate (Hidden Ability)
+탈피한 가죽을 끌어 올려
+데미지를 줄이면서 킥!
+볏이 클수록 거만하다.
 
-Base Stats
-----------------------
-Total: 488
-Hp:  65
-Attack:  90
-Defence:  115
-Special Attack:  45
-Special Defence:  115
-Speed:  58
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         90
+        defense:        115
+ special-attack:         45
+special-defense:        115
+          speed:         58
+
+Pokedex ID: 560	Capture Rate: 90
+Base Exp: 171	Happiness: 50
+Height: 11	Weight: 300
+
+Genus: Hoodlum Pokémon
+Location Areas:
+p2-laboratory-area
+unova-route-1-area
+unova-route-15-area
+unova-route-18-area
diff --git a/pokeData/scraggy b/pokeData/scraggy
index 0b3c1d3..fd9476f 100644
--- a/pokeData/scraggy
+++ b/pokeData/scraggy
@@ -1,15 +1,25 @@
+scraggy	A dark type Pokémon
 
-Name:  Scraggy
-Pokedex Number:  559
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Shed Skin - Moxie - Intimidate (Hidden Ability)
+가죽을 목까지 늘려서
+방어 자세를 취한다. 고무 같은
+탄력을 이용해 데미지를 줄인다.
 
-Base Stats
-----------------------
-Total: 348
-Hp:  50
-Attack:  75
-Defence:  70
-Special Attack:  35
-Special Defence:  70
-Speed:  48
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         75
+        defense:         70
+ special-attack:         35
+special-defense:         70
+          speed:         48
+
+Pokedex ID: 559	Capture Rate: 180
+Base Exp: 70	Happiness: 35
+Height: 6	Weight: 118
+
+Genus: Shedding Pokémon
+Location Areas:
+desert-resort-entrance
+p2-laboratory-area
+unova-route-1-area
+unova-route-4-area
+unova-route-18-area
diff --git a/pokeData/scyther b/pokeData/scyther
index cb4da57..3fb50c1 100644
--- a/pokeData/scyther
+++ b/pokeData/scyther
@@ -1,15 +1,30 @@
+scyther	A bug type Pokémon
 
-Name:  Scyther
-Pokedex Number:  123
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Swarm - Technician - Steadfast (Hidden Ability)
+SCYTHER is blindingly fast. Its blazing
+speed enhances the effectiveness of
+the twin scythes on its forearms.This POKéMON’s scythes are so
+effective, they can slice through thick
+logs in one wicked stroke.
 
-Base Stats
-----------------------
-Total: 500
-Hp:  70
-Attack:  110
-Defence:  80
-Special Attack:  55
-Special Defence:  80
-Speed:  105
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:        110
+        defense:         80
+ special-attack:         55
+special-defense:         80
+          speed:        105
+
+Pokedex ID: 123	Capture Rate: 45
+Base Exp: 100	Happiness: 50
+Height: 15	Weight: 560
+
+Genus: Mantis Pokémon
+Location Areas:
+sinnoh-route-210-south-towards-solaceon-town
+sinnoh-route-210-west-towards-celestic-town
+sinnoh-route-215-area
+sinnoh-route-229-area
+kanto-safari-zone-middle
+kanto-safari-zone-area-1-east
+kanto-safari-zone-area-2-north
+kalos-route-21-area
diff --git a/pokeData/seadra b/pokeData/seadra
index 7e1bc9d..fdf53d7 100644
--- a/pokeData/seadra
+++ b/pokeData/seadra
@@ -1,15 +1,58 @@
+seadra	A water type Pokémon
 
-Name:  Seadra
-Pokedex Number:  117
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Poison Point - Sniper - Damp (Hidden Ability)
+SEADRA generates whirlpools by spinning
+its body. The whirlpools are strong
+enough to swallow even fishing boats.This POKéMON weakens prey with these
+currents, then swallows it whole.
 
-Base Stats
-----------------------
-Total: 440
-Hp:  55
-Attack:  65
-Defence:  95
-Special Attack:  95
-Special Defence:  45
-Speed:  85
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         65
+        defense:         95
+ special-attack:         95
+special-defense:         45
+          speed:         85
+
+Pokedex ID: 117	Capture Rate: 75
+Base Exp: 154	Happiness: 50
+Height: 12	Weight: 250
+
+Genus: Dragon Pokémon
+Location Areas:
+sinnoh-sea-route-226-area
+whirl-islands-1f
+whirl-islands-b2f
+whirl-islands-b3f
+seafoam-islands-b1f
+seafoam-islands-b3f
+seafoam-islands-b4f
+kanto-route-12-area
+kanto-sea-route-19-area
+kanto-sea-route-20-area
+cinnabar-island-area
+pallet-town-area
+kanto-route-13-area
+kanto-sea-route-21-area
+cerulean-cave-1f
+cerulean-cave-b1f
+kanto-route-23-area
+icefall-cave-waterfall
+kindle-road-area
+treasure-beach-area
+bond-bridge-area
+resort-gorgeous-area
+water-labyrinth-area
+five-isle-meadow-area
+memorial-pillar-area
+outcast-island-area
+green-path-area
+water-path-area
+trainer-tower-area
+tanoby-ruins-area
+one-island-area
+five-island-area
+p2-laboratory-area
+unova-route-18-area
+unova-route-17-area
+ambrette-town-area
+cyllage-city-area
diff --git a/pokeData/seaking b/pokeData/seaking
index a9e8537..64f7a6b 100644
--- a/pokeData/seaking
+++ b/pokeData/seaking
@@ -1,15 +1,83 @@
+seaking	A water type Pokémon
 
-Name:  Seaking
-Pokedex Number:  119
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Swift Swim - Water Veil - Lightningrod (Hidden Ability)
+In the autumn, SEAKING males can be
+seen performing courtship dances in
+riverbeds to woo females.During this season, this POKéMON’s body
+coloration is at its most beautiful.
 
-Base Stats
-----------------------
-Total: 450
-Hp:  80
-Attack:  92
-Defence:  65
-Special Attack:  65
-Special Defence:  80
-Speed:  68
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:         92
+        defense:         65
+ special-attack:         65
+special-defense:         80
+          speed:         68
+
+Pokedex ID: 119	Capture Rate: 60
+Base Exp: 158	Happiness: 50
+Height: 13	Weight: 390
+
+Genus: Goldfish Pokémon
+Location Areas:
+sendoff-spring-area
+lake-verity-before-galactic-intervention
+lake-verity-after-galactic-intervention
+lake-valor-area
+lake-acuity-area
+sinnoh-route-203-area
+sinnoh-route-204-south-towards-jubilife-city
+sinnoh-route-204-north-towards-floaroma-town
+sinnoh-route-208-area
+sinnoh-route-209-area
+sinnoh-route-212-north-towards-hearthome-city
+sinnoh-route-214-area
+sinnoh-route-229-area
+twinleaf-town-area
+celestic-town-area
+resort-area-area
+union-cave-1f
+union-cave-b1f
+slowpoke-well-1f
+slowpoke-well-b1f
+johto-route-42-area
+mt-mortar-1f
+mt-mortar-upper-cave
+mt-mortar-b1f
+dark-cave-violet-city-entrance
+dark-cave-blackthorn-city-entrance
+mt-silver-2f
+mt-silver-1f-top
+mt-silver-4f
+mt-silver-1f
+mt-silver-top
+cerulean-city-area
+fuchsia-city-area
+kanto-route-4-area
+kanto-route-9-area
+kanto-route-10-area
+kanto-route-24-area
+kanto-route-25-area
+tohjo-falls-area
+cerulean-cave-1f
+cerulean-cave-b1f
+kanto-route-23-area
+kanto-safari-zone-middle
+kanto-safari-zone-area-1-east
+kanto-safari-zone-area-2-north
+kanto-safari-zone-area-3-west
+hoenn-safari-zone-nwmach-bike-area
+hoenn-safari-zone-sw
+berry-forest-area
+striaton-city-area
+pinwheel-forest-inside
+unova-route-3-area
+unova-route-11-area
+unova-route-14-area
+abundant-shrine-area
+aspertia-city-area
+unova-route-22-area
+kalos-route-3-area
+kalos-route-22-area
+parfum-palace-area
+johto-safari-zone-zone-swamp
+johto-safari-zone-zone-rocky-beach
diff --git a/pokeData/sealeo b/pokeData/sealeo
index 3cfc879..82e76f6 100644
--- a/pokeData/sealeo
+++ b/pokeData/sealeo
@@ -1,15 +1,24 @@
+sealeo	A ice type Pokémon
 
-Name:  Sealeo
-Pokedex Number:  364
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Thick Fat - Ice Body - Oblivious (Hidden Ability)
+It habitually spins things on its
+nose. By doing so, it learns
+textures and odors.
 
-Base Stats
-----------------------
-Total: 410
-Hp:  90
-Attack:  60
-Defence:  70
-Special Attack:  75
-Special Defence:  70
-Speed:  45
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:         60
+        defense:         70
+ special-attack:         75
+special-defense:         70
+          speed:         45
+
+Pokedex ID: 364	Capture Rate: 120
+Base Exp: 144	Happiness: 50
+Height: 11	Weight: 876
+
+Genus: Ball Roll Pokémon
+Location Areas:
+sinnoh-sea-route-226-area
+sinnoh-sea-route-230-area
+undella-bay-area
+johto-safari-zone-zone-mountain
diff --git a/pokeData/seedot b/pokeData/seedot
index 5bf32bf..1ba60d1 100644
--- a/pokeData/seedot
+++ b/pokeData/seedot
@@ -1,15 +1,29 @@
+seedot	A grass type Pokémon
 
-Name:  Seedot
-Pokedex Number:  273
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Chlorophyll - Early Bird - Pickpocket (Hidden Ability)
+When it dangles from a tree
+branch, it looks just like an acorn.
+It enjoys scaring other Pokémon.
 
-Base Stats
-----------------------
-Total: 220
-Hp:  40
-Attack:  40
-Defence:  50
-Special Attack:  30
-Special Defence:  30
-Speed:  30
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         40
+        defense:         50
+ special-attack:         30
+special-defense:         30
+          speed:         30
+
+Pokedex ID: 273	Capture Rate: 255
+Base Exp: 44	Happiness: 50
+Height: 5	Weight: 40
+
+Genus: Acorn Pokémon
+Location Areas:
+eterna-forest-area
+sinnoh-route-203-area
+sinnoh-route-204-south-towards-jubilife-city
+sinnoh-route-204-north-towards-floaroma-town
+sinnoh-route-210-south-towards-solaceon-town
+hoenn-route-102-area
+hoenn-route-114-area
+hoenn-route-117-area
+hoenn-route-120-area
diff --git a/pokeData/seel b/pokeData/seel
index d8f767e..cbd71d9 100644
--- a/pokeData/seel
+++ b/pokeData/seel
@@ -1,15 +1,40 @@
+seel	A water type Pokémon
 
-Name:  Seel
-Pokedex Number:  086
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Thick Fat - Hydration - Ice Body (Hidden Ability)
+SEEL hunts for prey in the frigid sea
+underneath sheets of ice.
+When it needs to breathe, it punchesa hole through the ice with the
+sharply protruding section of its head.
 
-Base Stats
-----------------------
-Total: 325
-Hp:  65
-Attack:  45
-Defence:  55
-Special Attack:  45
-Special Defence:  70
-Speed:  45
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         45
+        defense:         55
+ special-attack:         45
+special-defense:         70
+          speed:         45
+
+Pokedex ID: 86	Capture Rate: 190
+Base Exp: 65	Happiness: 70
+Height: 11	Weight: 900
+
+Genus: Sea Lion Pokémon
+Location Areas:
+sinnoh-sea-route-226-area
+sinnoh-sea-route-230-area
+whirl-islands-1f
+whirl-islands-b1f
+whirl-islands-b2f
+whirl-islands-b3f
+johto-route-47-area
+seafoam-islands-1f
+seafoam-islands-b1f
+seafoam-islands-b2f
+seafoam-islands-b3f
+seafoam-islands-b4f
+icefall-cave-entrance
+icefall-cave-1f
+icefall-cave-b1f
+icefall-cave-waterfall
+giant-chasm-area
+giant-chasm-forest-cave
+seaside-cave-1f
diff --git a/pokeData/seismitoad b/pokeData/seismitoad
index 1efb386..f8df82c 100644
--- a/pokeData/seismitoad
+++ b/pokeData/seismitoad
@@ -1,15 +1,24 @@
+seismitoad	A water type Pokémon
 
-Name:  Seismitoad
-Pokedex Number:  537
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Swift Swim - Poison Touch - Water Absorb (Hidden Ability)
+주먹의 혹을 진동시켜
+펀치의 위력을 배가시킨다.
+일격에 큰 바위를 부스러뜨린다.
 
-Base Stats
-----------------------
-Total: 509
-Hp:  105
-Attack:  95
-Defence:  75
-Special Attack:  85
-Special Defence:  75
-Speed:  74
+   ↞--------| STATS |--------↠ 
+             hp:        105
+         attack:         95
+        defense:         75
+ special-attack:         85
+special-defense:         75
+          speed:         74
+
+Pokedex ID: 537	Capture Rate: 45
+Base Exp: 255	Happiness: 50
+Height: 15	Weight: 620
+
+Genus: Vibration Pokémon
+Location Areas:
+icirrus-city-area
+pinwheel-forest-outside
+unova-route-8-area
+moor-of-icirrus-area
diff --git a/pokeData/sentret b/pokeData/sentret
index fd2962e..c1408a2 100644
--- a/pokeData/sentret
+++ b/pokeData/sentret
@@ -1,15 +1,30 @@
+sentret	A normal type Pokémon
 
-Name:  Sentret
-Pokedex Number:  161
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Run Away - Keen Eye - Frisk (Hidden Ability)
+A very cautious POKéMON, it raises itself
+up using its tail to get a better view of
+its surroundings.
 
-Base Stats
-----------------------
-Total: 215
-Hp:  35
-Attack:  46
-Defence:  34
-Special Attack:  35
-Special Defence:  45
-Speed:  20
+   ↞--------| STATS |--------↠ 
+             hp:         35
+         attack:         46
+        defense:         34
+ special-attack:         35
+special-defense:         45
+          speed:         20
+
+Pokedex ID: 161	Capture Rate: 255
+Base Exp: 43	Happiness: 70
+Height: 8	Weight: 60
+
+Genus: Scout Pokémon
+Location Areas:
+sinnoh-route-202-area
+johto-route-29-area
+johto-route-43-area
+kanto-route-1-area
+five-isle-meadow-area
+water-path-area
+canyon-entrance-area
+kalos-route-6-area
+johto-safari-zone-zone-swamp
+johto-safari-zone-zone-wetland
diff --git a/pokeData/serperior b/pokeData/serperior
index 1577f5b..84746fd 100644
--- a/pokeData/serperior
+++ b/pokeData/serperior
@@ -1,15 +1,21 @@
+serperior	A grass type Pokémon
 
-Name:  Serperior
-Pokedex Number:  497
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Overgrow - Contrary (Hidden Ability)
+샤로다의 고상한 눈동자로
+쏘아보아도 태연할 정도로 강한
+상대에게만 진정한 실력을 발휘한다.
+
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:         75
+        defense:         95
+ special-attack:         75
+special-defense:         95
+          speed:        113
+
+Pokedex ID: 497	Capture Rate: 45
+Base Exp: 238	Happiness: 70
+Height: 33	Weight: 630
+
+Genus: Regal Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 528
-Hp:  75
-Attack:  75
-Defence:  95
-Special Attack:  75
-Special Defence:  95
-Speed:  113
diff --git a/pokeData/servine b/pokeData/servine
index 1449473..3f20d3d 100644
--- a/pokeData/servine
+++ b/pokeData/servine
@@ -1,15 +1,21 @@
+servine	A grass type Pokémon
 
-Name:  Servine
-Pokedex Number:  496
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Overgrow - Contrary (Hidden Ability)
+땅을 미끄러지듯 달린다.
+빠른 움직임으로 상대를 혼란시키고
+덩굴채찍으로 꼼짝 못하게 한다.
+
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         60
+        defense:         75
+ special-attack:         60
+special-defense:         75
+          speed:         83
+
+Pokedex ID: 496	Capture Rate: 45
+Base Exp: 145	Happiness: 70
+Height: 8	Weight: 160
+
+Genus: Grass Snake Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 413
-Hp:  60
-Attack:  60
-Defence:  75
-Special Attack:  60
-Special Defence:  75
-Speed:  83
diff --git a/pokeData/seviper b/pokeData/seviper
index 28a2880..42510cc 100644
--- a/pokeData/seviper
+++ b/pokeData/seviper
@@ -1,15 +1,27 @@
+seviper	A poison type Pokémon
 
-Name:  Seviper
-Pokedex Number:  336
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Shed Skin - Infiltrator (Hidden Ability)
+For many generations, it has
+feuded with ZANGOOSE. It whets its
+bladed tail on rocks for battle.
 
-Base Stats
-----------------------
-Total: 458
-Hp:  73
-Attack:  100
-Defence:  60
-Special Attack:  100
-Special Defence:  60
-Speed:  65
+   ↞--------| STATS |--------↠ 
+             hp:         73
+         attack:        100
+        defense:         60
+ special-attack:        100
+special-defense:         60
+          speed:         65
+
+Pokedex ID: 336	Capture Rate: 90
+Base Exp: 160	Happiness: 70
+Height: 27	Weight: 525
+
+Genus: Fang Snake Pokémon
+Location Areas:
+sinnoh-route-208-area
+sinnoh-route-210-west-towards-celestic-town
+hoenn-route-114-area
+village-bridge-area
+unova-route-7-area
+unova-route-11-area
+kalos-route-8-area
diff --git a/pokeData/sewaddle b/pokeData/sewaddle
index fae0db5..3adaf07 100644
--- a/pokeData/sewaddle
+++ b/pokeData/sewaddle
@@ -1,15 +1,23 @@
+sewaddle	A bug type Pokémon
 
-Name:  Sewaddle
-Pokedex Number:  540
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Swarm - Chlorophyll - Overcoat (Hidden Ability)
+잎사귀를 물어뜯어
+입에서 뱉어낸 점착실로 꿰맨다.
+스스로 옷을 만드는 포켓몬이다.
 
-Base Stats
-----------------------
-Total: 310
-Hp:  45
-Attack:  53
-Defence:  70
-Special Attack:  40
-Special Defence:  60
-Speed:  42
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         53
+        defense:         70
+ special-attack:         40
+special-defense:         60
+          speed:         42
+
+Pokedex ID: 540	Capture Rate: 255
+Base Exp: 62	Happiness: 70
+Height: 3	Weight: 25
+
+Genus: Sewing Pokémon
+Location Areas:
+pinwheel-forest-inside
+unova-route-12-area
+unova-route-20-area
diff --git a/pokeData/sharpedo b/pokeData/sharpedo
index 3b481ca..0e598c2 100644
--- a/pokeData/sharpedo
+++ b/pokeData/sharpedo
@@ -1,15 +1,40 @@
+sharpedo	A water type Pokémon
 
-Name:  Sharpedo
-Pokedex Number:  319
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Rough Skin - Speed Boost (Hidden Ability)
+Its fangs rip through sheet iron.
+It swims at 75 mph and is known as
+“The Bully of the Sea.”
 
-Base Stats
-----------------------
-Total: 460
-Hp:  70
-Attack:  140
-Defence:  70
-Special Attack:  110
-Special Defence:  65
-Speed:  105
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:        120
+        defense:         40
+ special-attack:         95
+special-defense:         40
+          speed:         95
+
+Pokedex ID: 319	Capture Rate: 60
+Base Exp: 161	Happiness: 35
+Height: 18	Weight: 888
+
+Genus: Brutal Pokémon
+Location Areas:
+sinnoh-route-213-area
+sinnoh-route-222-area
+mossdeep-city-area
+hoenn-route-103-area
+hoenn-route-118-area
+hoenn-route-122-area
+hoenn-route-124-area
+hoenn-route-125-area
+hoenn-route-126-area
+hoenn-route-127-area
+hoenn-route-129-area
+hoenn-route-130-area
+hoenn-route-131-area
+hoenn-route-132-area
+hoenn-route-133-area
+hoenn-route-134-area
+pacifidlog-town-area
+village-bridge-area
+kalos-route-22-area
+battle-resort-area
diff --git a/pokeData/shaymin b/pokeData/shaymin
index 4064508..3435f28 100644
--- a/pokeData/shaymin
+++ b/pokeData/shaymin
@@ -1,15 +1,15 @@
+	A  type Pokémon
 
-Name:  Shaymin
-Pokedex Number:  492
-Gender Ratio:  
-Abilities: Natural Cure (Land Forme) - Serene Grace (Sky Forme
+The flowers all over its body burst
+into bloom if it is lovingly hugged
+and senses gratitude.
+
+   ↞--------| STATS |--------↠ 
+
+Pokedex ID: 	Capture Rate: 45
+Base Exp: 	Happiness: 100
+Height: 	Weight: 
+
+Genus: Gratitude Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 600
-Hp:  100
-Attack:  103
-Defence:  75
-Special Attack:  120
-Special Defence:  75
-Speed:  127
diff --git a/pokeData/shedinja b/pokeData/shedinja
index 2adfe63..bb42a96 100644
--- a/pokeData/shedinja
+++ b/pokeData/shedinja
@@ -1,15 +1,21 @@
+shedinja	A bug type Pokémon
 
-Name:  Shedinja
-Pokedex Number:  292
-Gender Ratio:  Genderless
-Abilities: Wonder Guard
+A discarded bug shell that came to
+life. Peering into the crack on its
+back is said to steal one’s spirit.
+
+   ↞--------| STATS |--------↠ 
+             hp:          1
+         attack:         90
+        defense:         45
+ special-attack:         30
+special-defense:         30
+          speed:         40
+
+Pokedex ID: 292	Capture Rate: 45
+Base Exp: 83	Happiness: 50
+Height: 8	Weight: 12
+
+Genus: Shed Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 236
-Hp:  1
-Attack:  90
-Defence:  45
-Special Attack:  30
-Special Defence:  30
-Speed:  40
diff --git a/pokeData/shelgon b/pokeData/shelgon
index b87ba30..32a9d25 100644
--- a/pokeData/shelgon
+++ b/pokeData/shelgon
@@ -1,15 +1,21 @@
+shelgon	A dragon type Pokémon
 
-Name:  Shelgon
-Pokedex Number:  372
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Rock Head - Overcoat (Hidden Ability)
+Within its rugged shell, its cells
+have begun changing. The shell
+peels off the instant it evolves.
+
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         95
+        defense:        100
+ special-attack:         60
+special-defense:         50
+          speed:         50
+
+Pokedex ID: 372	Capture Rate: 45
+Base Exp: 147	Happiness: 35
+Height: 11	Weight: 1105
+
+Genus: Endurance Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 420
-Hp:  65
-Attack:  95
-Defence:  100
-Special Attack:  60
-Special Defence:  50
-Speed:  50
diff --git a/pokeData/shellder b/pokeData/shellder
index 1a77f9d..dca978a 100644
--- a/pokeData/shellder
+++ b/pokeData/shellder
@@ -1,15 +1,56 @@
+shellder	A water type Pokémon
 
-Name:  Shellder
-Pokedex Number:  090
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Shell Armor - Skill Link - Overcoat (Hidden Ability)
+At night, this POKéMON uses its broad
+tongue to burrow a hole in the seafloor
+sand and then sleep in it.While it is sleeping, SHELLDER closes its
+shell, but leaves its tongue hanging
+out.
 
-Base Stats
-----------------------
-Total: 305
-Hp:  30
-Attack:  65
-Defence:  100
-Special Attack:  45
-Special Defence:  25
-Speed:  40
+   ↞--------| STATS |--------↠ 
+             hp:         30
+         attack:         65
+        defense:        100
+ special-attack:         45
+special-defense:         25
+          speed:         40
+
+Pokedex ID: 90	Capture Rate: 190
+Base Exp: 61	Happiness: 50
+Height: 3	Weight: 40
+
+Genus: Bivalve Pokémon
+Location Areas:
+valley-windworks-area
+fuego-ironworks-area
+sinnoh-route-205-south-towards-floaroma-town
+new-bark-town-area
+johto-sea-route-41-area
+johto-route-47-area
+seafoam-islands-1f
+seafoam-islands-b1f
+seafoam-islands-b2f
+seafoam-islands-b3f
+seafoam-islands-b4f
+kanto-sea-route-19-area
+kanto-sea-route-20-area
+cinnabar-island-area
+vermilion-city-area
+pallet-town-area
+kanto-route-26-area
+kanto-route-27-area
+kanto-route-6-area
+kanto-route-11-area
+kanto-route-17-area
+kanto-route-18-area
+kanto-sea-route-21-area
+vermilion-city-ss-anne-dock
+ss-anne-area
+icefall-cave-waterfall
+one-island-area
+five-island-area
+undella-bay-area
+unova-route-13-area
+undella-town-area
+humilau-city-area
+seaside-cave-1f
+kalos-route-8-area
diff --git a/pokeData/shellos b/pokeData/shellos
index beb2196..b2a6dc0 100644
--- a/pokeData/shellos
+++ b/pokeData/shellos
@@ -1,15 +1,31 @@
+shellos	A water type Pokémon
 
-Name:  Shellos
-Pokedex Number:  422
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Sticky Hold - Storm Drain - Sand Force (Hidden Ability)
+Un étrange liquide mauve s’échappe
+de son corps, ne lui appuyez pas
+dessus.
 
-Base Stats
-----------------------
-Total: 325
-Hp:  76
-Attack:  48
-Defence:  48
-Special Attack:  57
-Special Defence:  62
-Speed:  34
+   ↞--------| STATS |--------↠ 
+             hp:         76
+         attack:         48
+        defense:         48
+ special-attack:         57
+special-defense:         62
+          speed:         34
+
+Pokedex ID: 422	Capture Rate: 190
+Base Exp: 65	Happiness: 50
+Height: 3	Weight: 63
+
+Genus: Sea Slug Pokémon
+Location Areas:
+canalave-city-area
+pastoria-city-area
+valley-windworks-area
+fuego-ironworks-area
+sinnoh-route-205-south-towards-floaroma-town
+sinnoh-route-205-east-towards-eterna-city
+sinnoh-route-212-east-towards-pastoria-city
+sinnoh-route-213-area
+sinnoh-route-218-area
+sinnoh-route-221-area
+sinnoh-route-224-area
diff --git a/pokeData/shelmet b/pokeData/shelmet
index bbad9ca..9fb0d3f 100644
--- a/pokeData/shelmet
+++ b/pokeData/shelmet
@@ -1,15 +1,27 @@
+shelmet	A bug type Pokémon
 
-Name:  Shelmet
-Pokedex Number:  616
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Hydration - Shell Armor - Overcoat (Hidden Ability)
+딱정곤과 함께 있을 때
+전기적인 자극을 받으면
+서로의 몸이 진화한다.
 
-Base Stats
-----------------------
-Total: 305
-Hp:  50
-Attack:  40
-Defence:  85
-Special Attack:  40
-Special Defence:  65
-Speed:  25
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         40
+        defense:         85
+ special-attack:         40
+special-defense:         65
+          speed:         25
+
+Pokedex ID: 616	Capture Rate: 200
+Base Exp: 61	Happiness: 50
+Height: 4	Weight: 77
+
+Genus: Snail Pokémon
+Location Areas:
+icirrus-city-area
+unova-route-6-area
+unova-route-8-area
+moor-of-icirrus-area
+unova-route-11-area
+kalos-route-14-area
+kalos-route-19-area
diff --git a/pokeData/shieldon b/pokeData/shieldon
index 7acc6f9..082489f 100644
--- a/pokeData/shieldon
+++ b/pokeData/shieldon
@@ -1,15 +1,21 @@
+shieldon	A rock type Pokémon
 
-Name:  Shieldon
-Pokedex Number:  410
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Sturdy - Soundproof (Hidden Ability)
+Il est si bien protégé qu’il peut
+déguster Baies et herbe fraîche
+sans craindre de prédateurs.
+
+   ↞--------| STATS |--------↠ 
+             hp:         30
+         attack:         42
+        defense:        118
+ special-attack:         42
+special-defense:         88
+          speed:         30
+
+Pokedex ID: 410	Capture Rate: 45
+Base Exp: 70	Happiness: 70
+Height: 5	Weight: 570
+
+Genus: Shield Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 350
-Hp:  30
-Attack:  42
-Defence:  118
-Special Attack:  42
-Special Defence:  88
-Speed:  30
diff --git a/pokeData/shiftry b/pokeData/shiftry
index 6cafec5..177fb3b 100644
--- a/pokeData/shiftry
+++ b/pokeData/shiftry
@@ -1,15 +1,21 @@
+shiftry	A grass type Pokémon
 
-Name:  Shiftry
-Pokedex Number:  275
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Chlorophyll - Early Bird - Pickpocket (Hidden Ability)
+By flapping its leafy fan, it can
+whip up gusts of 100 ft/second
+that can level houses.
 
-Base Stats
-----------------------
-Total: 480
-Hp:  90
-Attack:  100
-Defence:  60
-Special Attack:  90
-Special Defence:  60
-Speed:  80
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:        100
+        defense:         60
+ special-attack:         90
+special-defense:         60
+          speed:         80
+
+Pokedex ID: 275	Capture Rate: 45
+Base Exp: 240	Happiness: 50
+Height: 13	Weight: 596
+
+Genus: Wicked Pokémon
+Location Areas:
+nature-sanctuary-area
diff --git a/pokeData/shiinotic b/pokeData/shiinotic
index 76d35b9..3fc62b0 100644
--- a/pokeData/shiinotic
+++ b/pokeData/shiinotic
@@ -1,15 +1,21 @@
+shiinotic	A grass type Pokémon
 
-Name:  Shiinotic
-Pokedex Number:  756
-Gender Ratio:   ♂:50.2% ♀:49.8% 
-Abilities: Illuminate - Effect Spore - Rain Dish (Hidden Ability)
+Forests where Shiinotic live are treacherous to
+enter at night. People confused by its strange
+lights can never find their way home again.
+
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         45
+        defense:         80
+ special-attack:         90
+special-defense:        100
+          speed:         30
+
+Pokedex ID: 756	Capture Rate: 75
+Base Exp: 142	Happiness: 50
+Height: 10	Weight: 115
+
+Genus: Illuminating Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 405
-Hp:  60
-Attack:  45
-Defence:  80
-Special Attack:  90
-Special Defence:  100
-Speed:  30
diff --git a/pokeData/shinx b/pokeData/shinx
index f54d559..8661ede 100644
--- a/pokeData/shinx
+++ b/pokeData/shinx
@@ -1,15 +1,48 @@
+shinx	A electric type Pokémon
 
-Name:  Shinx
-Pokedex Number:  403
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Rivalry - Intimidate - Guts (Hidden Ability)
+Ses muscles génèrent un courant
+électrique lorsqu’ils travaillent.
+Il s’illumine en cas de danger.
 
-Base Stats
-----------------------
-Total: 263
-Hp:  45
-Attack:  65
-Defence:  34
-Special Attack:  40
-Special Defence:  34
-Speed:  45
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         65
+        defense:         34
+ special-attack:         40
+special-defense:         34
+          speed:         45
+
+Pokedex ID: 403	Capture Rate: 235
+Base Exp: 53	Happiness: 50
+Height: 5	Weight: 95
+
+Genus: Flash Pokémon
+Location Areas:
+valley-windworks-area
+fuego-ironworks-area
+sinnoh-route-202-area
+sinnoh-route-203-area
+sinnoh-route-204-south-towards-jubilife-city
+sinnoh-route-204-north-towards-floaroma-town
+johto-route-29-area
+johto-route-33-area
+national-park-area
+johto-route-36-area
+johto-route-37-area
+johto-route-38-area
+johto-route-39-area
+johto-route-46-area
+johto-route-48-area
+kanto-route-1-area
+kanto-route-2-south-towards-viridian-city
+kanto-route-3-area
+kanto-route-5-area
+kanto-route-7-area
+kanto-route-8-area
+kanto-route-11-area
+kanto-route-14-area
+kanto-route-15-area
+kanto-route-16-area
+kanto-route-17-area
+kanto-route-18-area
+kanto-route-2-north-towards-pewter-city
diff --git a/pokeData/shroomish b/pokeData/shroomish
index 3182440..9269322 100644
--- a/pokeData/shroomish
+++ b/pokeData/shroomish
@@ -1,15 +1,21 @@
+shroomish	A grass type Pokémon
 
-Name:  Shroomish
-Pokedex Number:  285
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Effect Spore - Poison Heal - Quick Feet (Hidden Ability)
+It spouts poison spores from the
+top of its head. These spores
+cause pain all over if inhaled.
 
-Base Stats
-----------------------
-Total: 295
-Hp:  60
-Attack:  40
-Defence:  60
-Special Attack:  40
-Special Defence:  60
-Speed:  35
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         40
+        defense:         60
+ special-attack:         40
+special-defense:         60
+          speed:         35
+
+Pokedex ID: 285	Capture Rate: 255
+Base Exp: 59	Happiness: 70
+Height: 4	Weight: 45
+
+Genus: Mushroom Pokémon
+Location Areas:
+petalburg-woods-area
diff --git a/pokeData/shuckle b/pokeData/shuckle
index 97d0ea8..dc02c3f 100644
--- a/pokeData/shuckle
+++ b/pokeData/shuckle
@@ -1,15 +1,38 @@
+shuckle	A bug type Pokémon
 
-Name:  Shuckle
-Pokedex Number:  213
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Sturdy - Gluttony - Contrary (Hidden Ability)
+The BERRIES it stores in its vaselike
+shell decompose and become a gooey
+liquid.
 
-Base Stats
-----------------------
-Total: 505
-Hp:  20
-Attack:  10
-Defence:  230
-Special Attack:  10
-Special Defence:  230
-Speed:  5
+   ↞--------| STATS |--------↠ 
+             hp:         20
+         attack:         10
+        defense:        230
+ special-attack:         10
+special-defense:        230
+          speed:          5
+
+Pokedex ID: 213	Capture Rate: 190
+Base Exp: 177	Happiness: 50
+Height: 6	Weight: 205
+
+Genus: Mold Pokémon
+Location Areas:
+sinnoh-route-224-area
+johto-sea-route-40-area
+cianwood-city-area
+dark-cave-violet-city-entrance
+vermilion-city-area
+hoenn-safari-zone-expansion-north
+hoenn-altering-cave-g
+kanto-altering-cave-g
+unova-route-14-area
+seaside-cave-b1f
+kalos-route-18-area
+kalos-victory-road-unknown-area-322
+kalos-victory-road-unknown-area-324
+terminus-cave-unknown-area-343
+terminus-cave-unknown-area-344
+terminus-cave-unknown-area-345
+cianwood-city-manias-house
+cianwood-city-kirks-house
diff --git a/pokeData/shuppet b/pokeData/shuppet
index 1ce3a2a..a464e56 100644
--- a/pokeData/shuppet
+++ b/pokeData/shuppet
@@ -1,15 +1,30 @@
+shuppet	A ghost type Pokémon
 
-Name:  Shuppet
-Pokedex Number:  353
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Insomnia - Frisk - Cursed Body (Hidden Ability)
+It loves vengeful emotions and
+hangs in rows under the eaves of
+houses where vengeful people live.
 
-Base Stats
-----------------------
-Total: 295
-Hp:  44
-Attack:  75
-Defence:  35
-Special Attack:  63
-Special Defence:  33
-Speed:  45
+   ↞--------| STATS |--------↠ 
+             hp:         44
+         attack:         75
+        defense:         35
+ special-attack:         63
+special-defense:         33
+          speed:         45
+
+Pokedex ID: 353	Capture Rate: 225
+Base Exp: 59	Happiness: 35
+Height: 6	Weight: 23
+
+Genus: Puppet Pokémon
+Location Areas:
+mt-pyre-1f
+mt-pyre-2f
+mt-pyre-3f
+mt-pyre-4f
+mt-pyre-5f
+mt-pyre-6f
+mt-pyre-outside
+mt-pyre-summit
+hoenn-route-121-area
+hoenn-route-123-area
diff --git a/pokeData/sigilyph b/pokeData/sigilyph
index e58c19e..b544417 100644
--- a/pokeData/sigilyph
+++ b/pokeData/sigilyph
@@ -1,15 +1,22 @@
+sigilyph	A psychic type Pokémon
 
-Name:  Sigilyph
-Pokedex Number:  561
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Wonder Skin  - Magic Guard - Tinted Lens (Hidden Ability)
+고대 도시의 수호신이었다.
+자기 영역을 침범한 상대를
+사이코 파워로 공격한다.
 
-Base Stats
-----------------------
-Total: 490
-Hp:  72
-Attack:  58
-Defence:  80
-Special Attack:  103
-Special Defence:  80
-Speed:  97
+   ↞--------| STATS |--------↠ 
+             hp:         72
+         attack:         58
+        defense:         80
+ special-attack:        103
+special-defense:         80
+          speed:         97
+
+Pokedex ID: 561	Capture Rate: 45
+Base Exp: 172	Happiness: 50
+Height: 14	Weight: 140
+
+Genus: Avianoid Pokémon
+Location Areas:
+desert-resort-area
+kalos-route-10-area
diff --git a/pokeData/silcoon b/pokeData/silcoon
index 166aa47..913d65e 100644
--- a/pokeData/silcoon
+++ b/pokeData/silcoon
@@ -1,15 +1,23 @@
+silcoon	A bug type Pokémon
 
-Name:  Silcoon
-Pokedex Number:  266
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Shed Skin
+It wraps silk around the branches
+of a tree. It drinks rainwater on
+its silk while awaiting evolution.
 
-Base Stats
-----------------------
-Total: 205
-Hp:  50
-Attack:  35
-Defence:  55
-Special Attack:  25
-Special Defence:  25
-Speed:  15
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         35
+        defense:         55
+ special-attack:         25
+special-defense:         25
+          speed:         15
+
+Pokedex ID: 266	Capture Rate: 120
+Base Exp: 72	Happiness: 70
+Height: 6	Weight: 100
+
+Genus: Cocoon Pokémon
+Location Areas:
+eterna-forest-area
+sinnoh-route-205-east-towards-eterna-city
+petalburg-woods-area
diff --git a/pokeData/silicobra b/pokeData/silicobra
index 8aa9e70..139562b 100644
--- a/pokeData/silicobra
+++ b/pokeData/silicobra
@@ -1,15 +1,21 @@
+silicobra	A ground type Pokémon
 
-Name:  Silicobra
-Pokedex Number:  843
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Sand Spit - Shed Skin - Sand Veil (Hidden Ability)
+As it digs, it swallows sand and stores it in its
+neck pouch. The pouch can hold more than
+17 pounds of sand.
+
+   ↞--------| STATS |--------↠ 
+             hp:         52
+         attack:         57
+        defense:         75
+ special-attack:         35
+special-defense:         50
+          speed:         46
+
+Pokedex ID: 843	Capture Rate: 255
+Base Exp: 63	Happiness: 50
+Height: 22	Weight: 76
+
+Genus: Sand Snake Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 315
-Hp:  52
-Attack:  57
-Defence:  75
-Special Attack:  35
-Special Defence:  50
-Speed:  46
diff --git a/pokeData/silvally b/pokeData/silvally
index 64f5e61..ea8d008 100644
--- a/pokeData/silvally
+++ b/pokeData/silvally
@@ -1,15 +1,21 @@
+silvally	A normal type Pokémon
 
-Name:  Silvally
-Pokedex Number:  773
-Gender Ratio:  Genderless
-Abilities: RKS System
+Its trust in its partner is what awakens it.
+This Pokémon is capable of changing its type,
+a flexibility that is well displayed in battle.
+
+   ↞--------| STATS |--------↠ 
+             hp:         95
+         attack:         95
+        defense:         95
+ special-attack:         95
+special-defense:         95
+          speed:         95
+
+Pokedex ID: 773	Capture Rate: 3
+Base Exp: 285	Happiness: 0
+Height: 23	Weight: 1005
+
+Genus: Synthetic Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 570
-Hp:  95
-Attack:  95
-Defence:  95
-Special Attack:  95
-Special Defence:  95
-Speed:  95
diff --git a/pokeData/simipour b/pokeData/simipour
index f382ea5..83e99c7 100644
--- a/pokeData/simipour
+++ b/pokeData/simipour
@@ -1,15 +1,21 @@
+simipour	A water type Pokémon
 
-Name:  Simipour
-Pokedex Number:  516
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Gluttony - Torrent (Hidden Ability)
+꼬리에서 발사하는 고압의 물은
+콘크리트 벽도 파괴할 수 있는
+위력을 지녔다.
+
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:         98
+        defense:         63
+ special-attack:         98
+special-defense:         63
+          speed:        101
+
+Pokedex ID: 516	Capture Rate: 75
+Base Exp: 174	Happiness: 70
+Height: 10	Weight: 290
+
+Genus: Geyser Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 498
-Hp:  75
-Attack:  98
-Defence:  63
-Special Attack:  98
-Special Defence:  63
-Speed:  101
diff --git a/pokeData/simisage b/pokeData/simisage
index 7f3194b..cb9f87b 100644
--- a/pokeData/simisage
+++ b/pokeData/simisage
@@ -1,15 +1,21 @@
+simisage	A grass type Pokémon
 
-Name:  Simisage
-Pokedex Number:  512
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Gluttony - Overgrow (Hidden Ability)
+가시가 잔뜩 박힌 꼬리를
+상대에게 힘껏 쳐서 공격한다.
+기질이 격한 포켓몬이다.
+
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:         98
+        defense:         63
+ special-attack:         98
+special-defense:         63
+          speed:        101
+
+Pokedex ID: 512	Capture Rate: 75
+Base Exp: 174	Happiness: 70
+Height: 11	Weight: 305
+
+Genus: Thorn Monkey Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 498
-Hp:  75
-Attack:  98
-Defence:  63
-Special Attack:  98
-Special Defence:  63
-Speed:  101
diff --git a/pokeData/simisear b/pokeData/simisear
index 2567ad5..3bc369f 100644
--- a/pokeData/simisear
+++ b/pokeData/simisear
@@ -1,15 +1,21 @@
+simisear	A fire type Pokémon
 
-Name:  Simisear
-Pokedex Number:  514
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Gluttony - Blaze (Hidden Ability)
+몸속에서 태운 불꽃을
+머리나 꼬리로 흩뿌려서
+상대를 태운다.
+
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:         98
+        defense:         63
+ special-attack:         98
+special-defense:         63
+          speed:        101
+
+Pokedex ID: 514	Capture Rate: 75
+Base Exp: 174	Happiness: 70
+Height: 10	Weight: 280
+
+Genus: Ember Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 498
-Hp:  75
-Attack:  98
-Defence:  63
-Special Attack:  98
-Special Defence:  63
-Speed:  101
diff --git a/pokeData/sinistea b/pokeData/sinistea
index 7435824..867d776 100644
--- a/pokeData/sinistea
+++ b/pokeData/sinistea
@@ -1,15 +1,21 @@
+sinistea	A ghost type Pokémon
 
-Name:  Sinistea
-Pokedex Number:  854
-Gender Ratio:  Genderless
-Abilities: Weak Armor - Cursed Body (Hidden Ability)
+This Pokémon is said to have been born when
+a lonely spirit possessed a cold, leftover cup
+of tea.
+
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         45
+        defense:         45
+ special-attack:         74
+special-defense:         54
+          speed:         50
+
+Pokedex ID: 854	Capture Rate: 120
+Base Exp: 62	Happiness: 50
+Height: 1	Weight: 2
+
+Genus: Black Tea Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 308
-Hp:  40
-Attack:  45
-Defence:  45
-Special Attack:  74
-Special Defence:  54
-Speed:  50
diff --git a/pokeData/sirfetchd b/pokeData/sirfetchd
index befedc4..5f72842 100644
--- a/pokeData/sirfetchd
+++ b/pokeData/sirfetchd
@@ -1 +1,21 @@
-You didn't enter a valid pokemon!
+sirfetchd	A fighting type Pokémon
+
+Only Farfetch’d that have survived many battles
+can attain this evolution. When this Pokémon’s
+leek withers, it will retire from combat.
+
+   ↞--------| STATS |--------↠ 
+             hp:         62
+         attack:        135
+        defense:         95
+ special-attack:         68
+special-defense:         82
+          speed:         65
+
+Pokedex ID: 865	Capture Rate: 45
+Base Exp: 177	Happiness: 50
+Height: 8	Weight: 1170
+
+Genus: Wild Duck Pokémon
+Location Areas:
+
diff --git a/pokeData/sizzlipede b/pokeData/sizzlipede
index 77418ce..17be791 100644
--- a/pokeData/sizzlipede
+++ b/pokeData/sizzlipede
@@ -1,15 +1,21 @@
+sizzlipede	A fire type Pokémon
 
-Name:  Sizzlipede
-Pokedex Number:  850
-Gender Ratio:   ♂:50.2% ♀:49.8% 
-Abilities: Flash Fire - White Smoke - Flame Body (Hidden Ability)
+It stores flammable gas in its body and uses it to
+generate heat. The yellow sections on its belly
+get particularly hot.
+
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         65
+        defense:         45
+ special-attack:         50
+special-defense:         50
+          speed:         45
+
+Pokedex ID: 850	Capture Rate: 190
+Base Exp: 61	Happiness: 50
+Height: 7	Weight: 10
+
+Genus: Radiator Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 305
-Hp:  50
-Attack:  65
-Defence:  45
-Special Attack:  50
-Special Defence:  50
-Speed:  45
diff --git a/pokeData/skarmory b/pokeData/skarmory
index 10bc67d..46487d8 100644
--- a/pokeData/skarmory
+++ b/pokeData/skarmory
@@ -1,15 +1,26 @@
+skarmory	A steel type Pokémon
 
-Name:  Skarmory
-Pokedex Number:  227
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Keen Eye - Sturdy - Weak Armor (Hidden Ability)
+Its sturdy wings look heavy, but its bones
+are hollow and light, allowing it to fly
+freely in the sky.
 
-Base Stats
-----------------------
-Total: 465
-Hp:  65
-Attack:  80
-Defence:  140
-Special Attack:  40
-Special Defence:  70
-Speed:  70
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         80
+        defense:        140
+ special-attack:         40
+special-defense:         70
+          speed:         70
+
+Pokedex ID: 227	Capture Rate: 25
+Base Exp: 163	Happiness: 50
+Height: 17	Weight: 505
+
+Genus: Armor Bird Pokémon
+Location Areas:
+stark-mountain-area
+sinnoh-route-227-area
+johto-route-45-area
+hoenn-route-113-area
+sevault-canyon-area
+reversal-mountain-unknown-area-48
diff --git a/pokeData/skiddo b/pokeData/skiddo
index 596afc1..b63431a 100644
--- a/pokeData/skiddo
+++ b/pokeData/skiddo
@@ -1,15 +1,21 @@
+skiddo	A grass type Pokémon
 
-Name:  Skiddo
-Pokedex Number:  672
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Sap Sipper - Grass Pelt (Hidden Ability)
+人と　暮らすようになった
+最初の　ポケモンと　言われる。
+穏やかな　性格の　ポケモン。
 
-Base Stats
-----------------------
-Total: 350
-Hp:  66
-Attack:  65
-Defence:  48
-Special Attack:  62
-Special Defence:  57
-Speed:  52
+   ↞--------| STATS |--------↠ 
+             hp:         66
+         attack:         65
+        defense:         48
+ special-attack:         62
+special-defense:         57
+          speed:         52
+
+Pokedex ID: 672	Capture Rate: 200
+Base Exp: 70	Happiness: 70
+Height: 9	Weight: 310
+
+Genus: Mount Pokémon
+Location Areas:
+kalos-route-5-area
diff --git a/pokeData/skiploom b/pokeData/skiploom
index 71a194f..550be0a 100644
--- a/pokeData/skiploom
+++ b/pokeData/skiploom
@@ -1,15 +1,24 @@
+skiploom	A grass type Pokémon
 
-Name:  Skiploom
-Pokedex Number:  188
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Chlorophyll - Leaf Guard - Infiltrator (Hidden Ability)
+The bloom on top of its head opens and
+closes as the temperature fluctuates up
+and down.
 
-Base Stats
-----------------------
-Total: 340
-Hp:  55
-Attack:  45
-Defence:  50
-Special Attack:  45
-Special Defence:  65
-Speed:  80
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         45
+        defense:         50
+ special-attack:         45
+special-defense:         65
+          speed:         80
+
+Pokedex ID: 188	Capture Rate: 120
+Base Exp: 119	Happiness: 70
+Height: 6	Weight: 10
+
+Genus: Cottonweed Pokémon
+Location Areas:
+fuego-ironworks-area
+sinnoh-route-205-east-towards-eterna-city
+kanto-route-14-area
+johto-safari-zone-zone-meadow
diff --git a/pokeData/skitty b/pokeData/skitty
index 4347ee5..58b274e 100644
--- a/pokeData/skitty
+++ b/pokeData/skitty
@@ -1,15 +1,24 @@
+skitty	A normal type Pokémon
 
-Name:  Skitty
-Pokedex Number:  300
-Gender Ratio:   ♂:25% ♀:75%
-Abilities: Cute Charm - Normalize - Wonder Skin  (Hidden Ability)
+It can’t stop itself from chasing
+moving things, and it runs in a
+circle, chasing its own tail.
 
-Base Stats
-----------------------
-Total: 260
-Hp:  50
-Attack:  45
-Defence:  45
-Special Attack:  35
-Special Defence:  35
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         45
+        defense:         45
+ special-attack:         35
+special-defense:         35
+          speed:         50
+
+Pokedex ID: 300	Capture Rate: 255
+Base Exp: 52	Happiness: 70
+Height: 6	Weight: 110
+
+Genus: Kitten Pokémon
+Location Areas:
+sinnoh-route-222-area
+hoenn-route-116-area
+castelia-city-area
+kalos-route-4-area
diff --git a/pokeData/skorupi b/pokeData/skorupi
index eab6da3..58cd502 100644
--- a/pokeData/skorupi
+++ b/pokeData/skorupi
@@ -1,15 +1,36 @@
+skorupi	A poison type Pokémon
 
-Name:  Skorupi
-Pokedex Number:  451
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Battle Armor - Sniper - Keen Eye (Hidden Ability)
+Il saisit sa proie avec les pinces de
+sa queue et lui injecte un poison.
+Il peut survivre un an sans manger.
 
-Base Stats
-----------------------
-Total: 330
-Hp:  40
-Attack:  50
-Defence:  90
-Special Attack:  30
-Special Defence:  55
-Speed:  65
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         50
+        defense:         90
+ special-attack:         30
+special-defense:         55
+          speed:         65
+
+Pokedex ID: 451	Capture Rate: 120
+Base Exp: 66	Happiness: 50
+Height: 8	Weight: 120
+
+Genus: Scorpion Pokémon
+Location Areas:
+reversal-mountain-unknown-area-48
+reversal-mountain-unknown-area-49
+reversal-mountain-unknown-area-50
+reversal-mountain-unknown-area-51
+reversal-mountain-unknown-area-52
+reversal-mountain-unknown-area-53
+reversal-mountain-unknown-area-54
+reversal-mountain-unknown-area-55
+reversal-mountain-unknown-area-56
+reversal-mountain-unknown-area-57
+reversal-mountain-unknown-area-58
+reversal-mountain-unknown-area-59
+reversal-mountain-unknown-area-60
+kalos-route-14-area
+kalos-route-15-area
+kalos-route-16-area
diff --git a/pokeData/skrelp b/pokeData/skrelp
index 4db7e01..f6a9453 100644
--- a/pokeData/skrelp
+++ b/pokeData/skrelp
@@ -1,15 +1,23 @@
+skrelp	A poison type Pokémon
 
-Name:  Skrelp
-Pokedex Number:  690
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Poison Point - Poison Touch - Adaptability (Hidden Ability)
+腐った　海藻に　擬態する。
+気づかずに　近寄ってきた　獲物に
+毒液を　浴びせて　しとめる。
 
-Base Stats
-----------------------
-Total: 320
-Hp:  50
-Attack:  60
-Defence:  60
-Special Attack:  60
-Special Defence:  60
-Speed:  30
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         60
+        defense:         60
+ special-attack:         60
+special-defense:         60
+          speed:         30
+
+Pokedex ID: 690	Capture Rate: 225
+Base Exp: 64	Happiness: 50
+Height: 5	Weight: 73
+
+Genus: Mock Kelp Pokémon
+Location Areas:
+ambrette-town-area
+cyllage-city-area
+kalos-route-8-area
diff --git a/pokeData/skuntank b/pokeData/skuntank
index 24dcb62..ebdbc11 100644
--- a/pokeData/skuntank
+++ b/pokeData/skuntank
@@ -1,15 +1,22 @@
+skuntank	A poison type Pokémon
 
-Name:  Skuntank
-Pokedex Number:  435
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Stench - Aftermath - Keen Eye (Hidden Ability)
+Il attaque en projetant un liquide
+fétide du bout de sa queue. Mieux
+vaut l’attaquer par les airs.
 
-Base Stats
-----------------------
-Total: 479
-Hp:  103
-Attack:  93
-Defence:  67
-Special Attack:  71
-Special Defence:  61
-Speed:  84
+   ↞--------| STATS |--------↠ 
+             hp:        103
+         attack:         93
+        defense:         67
+ special-attack:         71
+special-defense:         61
+          speed:         84
+
+Pokedex ID: 435	Capture Rate: 60
+Base Exp: 168	Happiness: 50
+Height: 10	Weight: 380
+
+Genus: Skunk Pokémon
+Location Areas:
+sinnoh-route-221-area
+sinnoh-route-225-area
diff --git a/pokeData/skwovet b/pokeData/skwovet
index fd809d0..9c7cb02 100644
--- a/pokeData/skwovet
+++ b/pokeData/skwovet
@@ -1,15 +1,21 @@
+skwovet	A normal type Pokémon
 
-Name:  Skwovet
-Pokedex Number:  819
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Cheek Pouch - Gluttony (Hidden Ability)
+Found throughout the Galar region, this Pokémon
+becomes uneasy if its cheeks are ever completely
+empty of berries.
+
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         55
+        defense:         55
+ special-attack:         35
+special-defense:         35
+          speed:         25
+
+Pokedex ID: 819	Capture Rate: 255
+Base Exp: 55	Happiness: 50
+Height: 3	Weight: 25
+
+Genus: Cheeky Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 275
-Hp:  70
-Attack:  55
-Defence:  55
-Special Attack:  35
-Special Defence:  35
-Speed:  25
diff --git a/pokeData/slaking b/pokeData/slaking
index 258ea5a..a943568 100644
--- a/pokeData/slaking
+++ b/pokeData/slaking
@@ -1,15 +1,21 @@
+slaking	A normal type Pokémon
 
-Name:  Slaking
-Pokedex Number:  289
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Truant
+The world’s laziest Pokémon. When
+it is lounging, it is actually saving
+energy for striking back.
 
-Base Stats
-----------------------
-Total: 670
-Hp:  150
-Attack:  160
-Defence:  100
-Special Attack:  95
-Special Defence:  65
-Speed:  100
+   ↞--------| STATS |--------↠ 
+             hp:        150
+         attack:        160
+        defense:        100
+ special-attack:         95
+special-defense:         65
+          speed:        100
+
+Pokedex ID: 289	Capture Rate: 45
+Base Exp: 252	Happiness: 70
+Height: 20	Weight: 1305
+
+Genus: Lazy Pokémon
+Location Areas:
+pinwheel-forest-inside
diff --git a/pokeData/slakoth b/pokeData/slakoth
index 9ab4900..05545d3 100644
--- a/pokeData/slakoth
+++ b/pokeData/slakoth
@@ -1,15 +1,22 @@
+slakoth	A normal type Pokémon
 
-Name:  Slakoth
-Pokedex Number:  287
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Truant
+It spends nearly all its time in a
+day sprawled out. Just seeing it
+makes one drowsy.
 
-Base Stats
-----------------------
-Total: 280
-Hp:  60
-Attack:  60
-Defence:  60
-Special Attack:  35
-Special Defence:  35
-Speed:  30
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         60
+        defense:         60
+ special-attack:         35
+special-defense:         35
+          speed:         30
+
+Pokedex ID: 287	Capture Rate: 255
+Base Exp: 56	Happiness: 70
+Height: 8	Weight: 240
+
+Genus: Slacker Pokémon
+Location Areas:
+eterna-forest-area
+petalburg-woods-area
diff --git a/pokeData/sliggoo b/pokeData/sliggoo
index 39c9065..80c6e15 100644
--- a/pokeData/sliggoo
+++ b/pokeData/sliggoo
@@ -1,15 +1,21 @@
+sliggoo	A dragon type Pokémon
 
-Name:  Sliggoo
-Pokedex Number:  705
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Sap Sipper - Hydration - Gooey (Hidden Ability)
+なんでも　溶かしてしまう　粘液を
+分泌して　敵を　撃退する。
+目玉は　退化して　見えていない。
 
-Base Stats
-----------------------
-Total: 452
-Hp:  68
-Attack:  75
-Defence:  53
-Special Attack:  83
-Special Defence:  113
-Speed:  60
+   ↞--------| STATS |--------↠ 
+             hp:         68
+         attack:         75
+        defense:         53
+ special-attack:         83
+special-defense:        113
+          speed:         60
+
+Pokedex ID: 705	Capture Rate: 45
+Base Exp: 158	Happiness: 35
+Height: 8	Weight: 175
+
+Genus: Soft Tissue Pokémon
+Location Areas:
+kalos-route-19-area
diff --git a/pokeData/slowbro b/pokeData/slowbro
index 05476ca..2c437c9 100644
--- a/pokeData/slowbro
+++ b/pokeData/slowbro
@@ -1,15 +1,37 @@
+slowbro	A water type Pokémon
 
-Name:  Slowbro
-Pokedex Number:  080
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Oblivious - Own Tempo - Regenerator (Hidden Ability)
+SLOWBRO’s tail has a SHELLDER firmly
+attached with a bite. As a result, the
+tail can’t be used for fishing anymore.This causes SLOWBRO to grudgingly swim
+and catch prey instead.
 
-Base Stats
-----------------------
-Total: 490
-Hp:  95
-Attack:  75
-Defence:  180
-Special Attack:  130
-Special Defence:  80
-Speed:  30
+   ↞--------| STATS |--------↠ 
+             hp:         95
+         attack:         75
+        defense:        110
+ special-attack:        100
+special-defense:         80
+          speed:         30
+
+Pokedex ID: 80	Capture Rate: 75
+Base Exp: 172	Happiness: 50
+Height: 16	Weight: 785
+
+Genus: Hermit Crab Pokémon
+Location Areas:
+slowpoke-well-b1f
+seafoam-islands-1f
+seafoam-islands-b1f
+seafoam-islands-b2f
+seafoam-islands-b3f
+seafoam-islands-b4f
+kanto-route-12-area
+cinnabar-island-area
+kanto-route-13-area
+cerulean-cave-1f
+cerulean-cave-b1f
+kanto-route-23-area
+berry-forest-area
+cape-brink-area
+abundant-shrine-area
+johto-safari-zone-zone-rocky-beach
diff --git a/pokeData/slowking b/pokeData/slowking
index 3b5551d..d3bb3bd 100644
--- a/pokeData/slowking
+++ b/pokeData/slowking
@@ -1,15 +1,21 @@
+slowking	A water type Pokémon
 
-Name:  Slowking
-Pokedex Number:  199
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Oblivious - Own Tempo - Regenerator (Hidden Ability)
+It has incredible intellect and intuition.
+Whatever the situation, it remains calm
+and collected.
 
-Base Stats
-----------------------
-Total: 490
-Hp:  95
-Attack:  75
-Defence:  80
-Special Attack:  100
-Special Defence:  110
-Speed:  30
+   ↞--------| STATS |--------↠ 
+             hp:         95
+         attack:         75
+        defense:         80
+ special-attack:        100
+special-defense:        110
+          speed:         30
+
+Pokedex ID: 199	Capture Rate: 70
+Base Exp: 172	Happiness: 50
+Height: 20	Weight: 795
+
+Genus: Royal Pokémon
+Location Areas:
+abundant-shrine-area
diff --git a/pokeData/slowpoke b/pokeData/slowpoke
index 7e8651f..b82d75f 100644
--- a/pokeData/slowpoke
+++ b/pokeData/slowpoke
@@ -1,15 +1,83 @@
+slowpoke	A water type Pokémon
 
-Name:  Slowpoke
-Pokedex Number:  079
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Oblivious - Own Tempo - Regenerator (Hidden Ability)
+It is always so
+absent-minded that
+it won't react,even if its
+flavorful tail is
+bitten.
 
-Base Stats
-----------------------
-Total: 315
-Hp:  90
-Attack:  65
-Defence:  65
-Special Attack:  40
-Special Defence:  40
-Speed:  15
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:         65
+        defense:         65
+ special-attack:         40
+special-defense:         40
+          speed:         15
+
+Pokedex ID: 79	Capture Rate: 190
+Base Exp: 63	Happiness: 50
+Height: 12	Weight: 360
+
+Genus: Dopey Pokémon
+Location Areas:
+sinnoh-route-205-east-towards-eterna-city
+slowpoke-well-1f
+slowpoke-well-b1f
+seafoam-islands-1f
+seafoam-islands-b1f
+seafoam-islands-b2f
+seafoam-islands-b3f
+seafoam-islands-b4f
+kanto-route-12-area
+kanto-sea-route-19-area
+kanto-sea-route-20-area
+cinnabar-island-area
+viridian-city-area
+cerulean-city-area
+vermilion-city-area
+celadon-city-area
+fuchsia-city-area
+pallet-town-area
+kanto-route-4-area
+kanto-route-6-area
+kanto-route-10-area
+kanto-route-11-area
+kanto-route-13-area
+kanto-sea-route-21-area
+kanto-route-22-area
+kanto-route-24-area
+kanto-route-25-area
+tohjo-falls-area
+cerulean-cave-1f
+cerulean-cave-b1f
+kanto-route-23-area
+kanto-safari-zone-middle
+kanto-safari-zone-area-1-east
+kanto-safari-zone-area-2-north
+kanto-safari-zone-area-3-west
+ss-anne-area
+berry-forest-area
+icefall-cave-entrance
+icefall-cave-waterfall
+kindle-road-area
+treasure-beach-area
+cape-brink-area
+bond-bridge-area
+resort-gorgeous-area
+water-labyrinth-area
+five-isle-meadow-area
+memorial-pillar-area
+outcast-island-area
+green-path-area
+water-path-area
+ruin-valley-area
+trainer-tower-area
+canyon-entrance-area
+tanoby-ruins-area
+one-island-area
+four-island-area
+five-island-area
+abundant-shrine-area
+kalos-route-12-area
+azure-bay-area
+johto-safari-zone-zone-rocky-beach
diff --git a/pokeData/slugma b/pokeData/slugma
index 5edb433..c1954e9 100644
--- a/pokeData/slugma
+++ b/pokeData/slugma
@@ -1,15 +1,32 @@
+slugma	A fire type Pokémon
 
-Name:  Slugma
-Pokedex Number:  218
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Magma Armor - Flame Body - Weak Armor (Hidden Ability)
+A common sight in volcanic areas, it
+slowly slithers around in a constant
+search for warm places.
 
-Base Stats
-----------------------
-Total: 250
-Hp:  40
-Attack:  40
-Defence:  40
-Special Attack:  70
-Special Defence:  40
-Speed:  20
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         40
+        defense:         40
+ special-attack:         70
+special-defense:         40
+          speed:         20
+
+Pokedex ID: 218	Capture Rate: 190
+Base Exp: 50	Happiness: 70
+Height: 7	Weight: 350
+
+Genus: Lava Pokémon
+Location Areas:
+stark-mountain-entrance
+stark-mountain-inside
+kanto-route-16-area
+kanto-route-17-area
+kanto-route-18-area
+fiery-path-area
+hoenn-route-113-area
+mt-ember-b1f
+mt-ember-b2f
+mt-ember-b3f
+kalos-route-13-area
+violet-city-pokemon-center
diff --git a/pokeData/slurpuff b/pokeData/slurpuff
index b3b4771..503b2a8 100644
--- a/pokeData/slurpuff
+++ b/pokeData/slurpuff
@@ -1,15 +1,21 @@
+slurpuff	A fairy type Pokémon
 
-Name:  Slurpuff
-Pokedex Number:  685
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Sweet Veil - Unburden (Hidden Ability)
+It can distinguish the faintest of scents.
+It puts its sensitive sense of smell to use
+by helping pastry chefs in their work.
+
+   ↞--------| STATS |--------↠ 
+             hp:         82
+         attack:         80
+        defense:         86
+ special-attack:         85
+special-defense:         75
+          speed:         72
+
+Pokedex ID: 685	Capture Rate: 140
+Base Exp: 168	Happiness: 50
+Height: 8	Weight: 50
+
+Genus: Meringue Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 480
-Hp:  82
-Attack:  80
-Defence:  86
-Special Attack:  85
-Special Defence:  75
-Speed:  72
diff --git a/pokeData/smeargle b/pokeData/smeargle
index 1f3489a..03591d6 100644
--- a/pokeData/smeargle
+++ b/pokeData/smeargle
@@ -1,15 +1,28 @@
+smeargle	A normal type Pokémon
 
-Name:  Smeargle
-Pokedex Number:  235
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Own Tempo - Technician - Moody (Hidden Ability)
+A special fluid oozes from the tip of its
+tail. It paints the fluid everywhere to
+mark its territory.
 
-Base Stats
-----------------------
-Total: 250
-Hp:  55
-Attack:  20
-Defence:  35
-Special Attack:  20
-Special Defence:  45
-Speed:  75
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         20
+        defense:         35
+ special-attack:         20
+special-defense:         45
+          speed:         75
+
+Pokedex ID: 235	Capture Rate: 45
+Base Exp: 88	Happiness: 70
+Height: 12	Weight: 580
+
+Genus: Painter Pokémon
+Location Areas:
+sinnoh-route-208-area
+sinnoh-route-212-north-towards-hearthome-city
+ruins-of-alph-outside
+artisan-cave-area
+hoenn-altering-cave-i
+kanto-altering-cave-i
+kalos-route-7-area
+johto-safari-zone-zone-plains
diff --git a/pokeData/smoochum b/pokeData/smoochum
index 97e16f0..de63e08 100644
--- a/pokeData/smoochum
+++ b/pokeData/smoochum
@@ -1,15 +1,23 @@
+smoochum	A ice type Pokémon
 
-Name:  Smoochum
-Pokedex Number:  238
-Gender Ratio:   ♂:0% ♀:100% 
-Abilities: Oblivious - Forewarn - Hydration (Hidden Ability)
+Its lips are the most sensitive parts on
+its body. It always uses its lips first to
+examine things.
 
-Base Stats
-----------------------
-Total: 305
-Hp:  45
-Attack:  30
-Defence:  15
-Special Attack:  85
-Special Defence:  65
-Speed:  65
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         30
+        defense:         15
+ special-attack:         85
+special-defense:         65
+          speed:         65
+
+Pokedex ID: 238	Capture Rate: 45
+Base Exp: 61	Happiness: 50
+Height: 4	Weight: 60
+
+Genus: Kiss Pokémon
+Location Areas:
+snowpoint-temple-1f
+lake-acuity-area
+johto-route-34-area
diff --git a/pokeData/sneasel b/pokeData/sneasel
index edc0546..be5a14c 100644
--- a/pokeData/sneasel
+++ b/pokeData/sneasel
@@ -1,15 +1,43 @@
+sneasel	A dark type Pokémon
 
-Name:  Sneasel
-Pokedex Number:  215
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Inner Focus - Keen Eye - Pickpocket (Hidden Ability)
+Vicious in nature, it drives PIDGEY from
+their nests and feasts on the eggs that
+are left behind.
 
-Base Stats
-----------------------
-Total: 430
-Hp:  55
-Attack:  95
-Defence:  55
-Special Attack:  35
-Special Defence:  75
-Speed:  115
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         95
+        defense:         55
+ special-attack:         35
+special-defense:         75
+          speed:        115
+
+Pokedex ID: 215	Capture Rate: 60
+Base Exp: 86	Happiness: 35
+Height: 9	Weight: 280
+
+Genus: Sharp Claw Pokémon
+Location Areas:
+snowpoint-temple-1f
+snowpoint-temple-b1f
+snowpoint-temple-b2f
+snowpoint-temple-b3f
+snowpoint-temple-b4f
+snowpoint-temple-b5f
+lake-acuity-area
+acuity-lakefront-area
+sinnoh-route-216-area
+sinnoh-route-217-area
+ice-path-b1f
+ice-path-b2f
+ice-path-b3f
+mt-silver-1f-top
+mt-silver-4f
+mt-silver-outside
+mt-silver-top
+kanto-route-28-area
+icefall-cave-1f
+icefall-cave-b1f
+giant-chasm-area
+giant-chasm-forest-cave
+kalos-route-17-area
diff --git a/pokeData/sneasler b/pokeData/sneasler
index 2998a62..78ccb59 100644
--- a/pokeData/sneasler
+++ b/pokeData/sneasler
@@ -1,15 +1,19 @@
+sneasler	A fighting type Pokémon
 
-Name:  Sneasler
-Pokedex Number:  903
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Pressure - Unburden - Poison Touch (Hidden Ability)
+                null
+
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:        130
+        defense:         60
+ special-attack:         40
+special-defense:         80
+          speed:        120
+
+Pokedex ID: 903	Capture Rate: 135
+Base Exp: null	Happiness: null
+Height: 13	Weight: 430
+
+Genus: null
+Location Areas:
 
-Base Stats
-----------------------
-Total: 510
-Hp:  80
-Attack:  130
-Defence:  60
-Special Attack:  40
-Special Defence:  80
-Speed:  120
diff --git a/pokeData/snivy b/pokeData/snivy
index 93834d2..db498a5 100644
--- a/pokeData/snivy
+++ b/pokeData/snivy
@@ -1,15 +1,23 @@
+snivy	A grass type Pokémon
 
-Name:  Snivy
-Pokedex Number:  495
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Overgrow - Contrary (Hidden Ability)
+태양의 빛을 받으면
+평소보다 빨리 움직일 수 있다.
+손보다 덩굴을 잘 사용한다.
 
-Base Stats
-----------------------
-Total: 308
-Hp:  45
-Attack:  45
-Defence:  55
-Special Attack:  45
-Special Defence:  55
-Speed:  63
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         45
+        defense:         55
+ special-attack:         45
+special-defense:         55
+          speed:         63
+
+Pokedex ID: 495	Capture Rate: 45
+Base Exp: 62	Happiness: 70
+Height: 6	Weight: 81
+
+Genus: Grass Snake Pokémon
+Location Areas:
+hoenn-route-101-area
+aspertia-city-area
+nuvema-town-area
diff --git a/pokeData/snom b/pokeData/snom
index be2663f..d0469aa 100644
--- a/pokeData/snom
+++ b/pokeData/snom
@@ -1,15 +1,21 @@
+snom	A ice type Pokémon
 
-Name:  Snom
-Pokedex Number:  872
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Shield Dust - Ice Scales (Hidden Ability)
+It spits out thread imbued with a frigid sort of
+energy and uses it to tie its body to branches,
+disguising itself as an icicle while it sleeps.
+
+   ↞--------| STATS |--------↠ 
+             hp:         30
+         attack:         25
+        defense:         35
+ special-attack:         45
+special-defense:         30
+          speed:         20
+
+Pokedex ID: 872	Capture Rate: 190
+Base Exp: 37	Happiness: 50
+Height: 3	Weight: 38
+
+Genus: Worm Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 185
-Hp:  30
-Attack:  25
-Defence:  35
-Special Attack:  45
-Special Defence:  30
-Speed:  20
diff --git a/pokeData/snorlax b/pokeData/snorlax
index cdfd612..a2dd385 100644
--- a/pokeData/snorlax
+++ b/pokeData/snorlax
@@ -1,15 +1,25 @@
+snorlax	A normal type Pokémon
 
-Name:  Snorlax
-Pokedex Number:  143
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Immunity - Thick Fat - Gluttony (Hidden Ability)
+SNORLAX’s typical day consists of
+nothing more than eating and sleeping.
+It is such a docile POKéMON that thereare children who use its expansive belly
+as a place to play.
 
-Base Stats
-----------------------
-Total: 540
-Hp:  160
-Attack:  110
-Defence:  65
-Special Attack:  65
-Special Defence:  110
-Speed:  30
+   ↞--------| STATS |--------↠ 
+             hp:        160
+         attack:        110
+        defense:         65
+ special-attack:         65
+special-defense:        110
+          speed:         30
+
+Pokedex ID: 143	Capture Rate: 25
+Base Exp: 189	Happiness: 50
+Height: 21	Weight: 4600
+
+Genus: Sleeping Pokémon
+Location Areas:
+kanto-route-12-area
+vermilion-city-area
+kanto-route-11-area
+kanto-route-16-area
diff --git a/pokeData/snorunt b/pokeData/snorunt
index c69821a..96fe525 100644
--- a/pokeData/snorunt
+++ b/pokeData/snorunt
@@ -1,15 +1,25 @@
+snorunt	A ice type Pokémon
 
-Name:  Snorunt
-Pokedex Number:  361
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Inner Focus - Ice Body - Moody (Hidden Ability)
+It is said that several SNORUNT
+gather under giant leaves and
+live together in harmony.
 
-Base Stats
-----------------------
-Total: 300
-Hp:  50
-Attack:  50
-Defence:  50
-Special Attack:  50
-Special Defence:  50
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         50
+        defense:         50
+ special-attack:         50
+special-defense:         50
+          speed:         50
+
+Pokedex ID: 361	Capture Rate: 190
+Base Exp: 60	Happiness: 50
+Height: 7	Weight: 168
+
+Genus: Snow Hat Pokémon
+Location Areas:
+lake-acuity-area
+acuity-lakefront-area
+sinnoh-route-216-area
+sinnoh-route-217-area
+shoal-cave-b1f
diff --git a/pokeData/snover b/pokeData/snover
index 1ae70e4..47f479d 100644
--- a/pokeData/snover
+++ b/pokeData/snover
@@ -1,15 +1,27 @@
+snover	A grass type Pokémon
 
-Name:  Snover
-Pokedex Number:  459
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Snow Warning - Soundproof (Hidden Ability)
+Curieux de rencontrer des gens, ils
+se rassemblent autour des traces
+de pas trouvées dans la montagne.
 
-Base Stats
-----------------------
-Total: 334
-Hp:  60
-Attack:  62
-Defence:  50
-Special Attack:  62
-Special Defence:  60
-Speed:  40
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         62
+        defense:         50
+ special-attack:         62
+special-defense:         60
+          speed:         40
+
+Pokedex ID: 459	Capture Rate: 120
+Base Exp: 67	Happiness: 50
+Height: 10	Weight: 505
+
+Genus: Frost Tree Pokémon
+Location Areas:
+mt-coronet-exterior-snowfall
+mt-coronet-exterior-blizzard
+lake-acuity-area
+acuity-lakefront-area
+sinnoh-route-216-area
+sinnoh-route-217-area
+kalos-route-17-area
diff --git a/pokeData/snubbull b/pokeData/snubbull
index 72b1de0..064a1ba 100644
--- a/pokeData/snubbull
+++ b/pokeData/snubbull
@@ -1,15 +1,30 @@
+snubbull	A fairy type Pokémon
 
-Name:  Snubbull
-Pokedex Number:  209
-Gender Ratio:   ♂:25% ♀:75%
-Abilities: Intimidate - Run Away - Rattled (Hidden Ability)
+Although it looks frightening, it is
+actually kind and affectionate. It is very
+popular among women.
 
-Base Stats
-----------------------
-Total: 300
-Hp:  60
-Attack:  80
-Defence:  50
-Special Attack:  40
-Special Defence:  40
-Speed:  30
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         80
+        defense:         50
+ special-attack:         40
+special-defense:         40
+          speed:         30
+
+Pokedex ID: 209	Capture Rate: 190
+Base Exp: 60	Happiness: 70
+Height: 6	Weight: 78
+
+Genus: Fairy Pokémon
+Location Areas:
+sinnoh-route-209-area
+johto-route-34-area
+johto-route-35-area
+johto-route-38-area
+kanto-route-5-area
+kanto-route-6-area
+kanto-route-7-area
+kanto-route-8-area
+hoenn-safari-zone-expansion-south
+kalos-route-10-area
diff --git a/pokeData/sobble b/pokeData/sobble
index 4f510e4..c941f77 100644
--- a/pokeData/sobble
+++ b/pokeData/sobble
@@ -1,15 +1,21 @@
+sobble	A water type Pokémon
 
-Name:  Sobble
-Pokedex Number:  816
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Torrent - Sniper (Hidden Ability)
+When scared, this Pokémon cries. Its tears pack
+the chemical punch of 100 onions, and attackers
+won’t be able to resist weeping.
+
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         40
+        defense:         40
+ special-attack:         70
+special-defense:         40
+          speed:         70
+
+Pokedex ID: 816	Capture Rate: 45
+Base Exp: 62	Happiness: 50
+Height: 3	Weight: 40
+
+Genus: Water Lizard Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 310
-Hp:  50
-Attack:  40
-Defence:  40
-Special Attack:  70
-Special Defence:  40
-Speed:  70
diff --git a/pokeData/solgaleo b/pokeData/solgaleo
index 94365f0..7de4024 100644
--- a/pokeData/solgaleo
+++ b/pokeData/solgaleo
@@ -1,15 +1,21 @@
+solgaleo	A psychic type Pokémon
 
-Name:  Solgaleo
-Pokedex Number:  791
-Gender Ratio:  Genderless
-Abilities: Full Metal Body
+It is said to live in another world. The intense
+light it radiates from the surface of its body can
+make the darkest of nights light up like midday.
+
+   ↞--------| STATS |--------↠ 
+             hp:        137
+         attack:        137
+        defense:        107
+ special-attack:        113
+special-defense:         89
+          speed:         97
+
+Pokedex ID: 791	Capture Rate: 45
+Base Exp: 340	Happiness: 0
+Height: 34	Weight: 2300
+
+Genus: Sunne Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 680
-Hp:  137
-Attack:  137
-Defence:  107
-Special Attack:  113
-Special Defence:  89
-Speed:  97
diff --git a/pokeData/solosis b/pokeData/solosis
index e537484..578a941 100644
--- a/pokeData/solosis
+++ b/pokeData/solosis
@@ -1,15 +1,28 @@
+solosis	A psychic type Pokémon
 
-Name:  Solosis
-Pokedex Number:  577
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Overcoat - Magic Guard - Regenerator (Hidden Ability)
+몸이 특수한 액체로
+둘러싸여 있어 어떤 곤란한
+상황이라도 문제없다.
 
-Base Stats
-----------------------
-Total: 290
-Hp:  45
-Attack:  30
-Defence:  40
-Special Attack:  105
-Special Defence:  50
-Speed:  20
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         30
+        defense:         40
+ special-attack:        105
+special-defense:         50
+          speed:         20
+
+Pokedex ID: 577	Capture Rate: 200
+Base Exp: 58	Happiness: 50
+Height: 3	Weight: 10
+
+Genus: Cell Pokémon
+Location Areas:
+unova-route-5-area
+unova-route-16-area
+strange-house-1f
+strange-house-b1f
+reflection-cave-unknown-area-305
+reflection-cave-unknown-area-306
+reflection-cave-unknown-area-307
+reflection-cave-unknown-area-308
diff --git a/pokeData/solrock b/pokeData/solrock
index e7d5ce3..6ca12f7 100644
--- a/pokeData/solrock
+++ b/pokeData/solrock
@@ -1,15 +1,52 @@
+solrock	A rock type Pokémon
 
-Name:  Solrock
-Pokedex Number:  338
-Gender Ratio:  Genderless
-Abilities: Levitate
+A new Pokémon species, rumored
+to be from the sun. It gives off
+light while spinning.
 
-Base Stats
-----------------------
-Total: 440
-Hp:  70
-Attack:  95
-Defence:  85
-Special Attack:  55
-Special Defence:  65
-Speed:  70
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:         95
+        defense:         85
+ special-attack:         55
+special-defense:         65
+          speed:         70
+
+Pokedex ID: 338	Capture Rate: 45
+Base Exp: 161	Happiness: 50
+Height: 12	Weight: 1540
+
+Genus: Meteorite Pokémon
+Location Areas:
+mt-coronet-2f
+mt-coronet-3f
+mt-coronet-exterior-snowfall
+mt-coronet-exterior-blizzard
+mt-coronet-4f
+mt-coronet-4f-small-room
+mt-coronet-5f
+mt-coronet-6f
+mt-coronet-1f-from-exterior
+sendoff-spring-area
+turnback-cave-pillar-1
+turnback-cave-pillar-2
+turnback-cave-pillar-3
+turnback-cave-before-pillar-1
+turnback-cave-between-pillars-1-and-2
+turnback-cave-between-pillars-2-and-3
+turnback-cave-after-pillar-3
+lake-verity-before-galactic-intervention
+lake-verity-after-galactic-intervention
+lake-valor-area
+lake-acuity-area
+meteor-falls-area
+meteor-falls-back
+meteor-falls-b1f
+meteor-falls-backsmall-room
+giant-chasm-outside
+giant-chasm-area
+giant-chasm-forest
+giant-chasm-forest-cave
+unova-route-13-area
+unova-route-22-area
+glittering-cave-unknown-area-303
diff --git a/pokeData/spearow b/pokeData/spearow
index 3845081..1750620 100644
--- a/pokeData/spearow
+++ b/pokeData/spearow
@@ -1,15 +1,55 @@
+spearow	A normal type Pokémon
 
-Name:  Spearow
-Pokedex Number:  021
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Keen Eye - Sniper (Hidden Ability)
+SPEAROW has a very loud cry that can
+be heard over half a mile away.
+If its high, keening cry is heardechoing all around, it is a sign that
+they are warning each other of danger.
 
-Base Stats
-----------------------
-Total: 262
-Hp:  40
-Attack:  60
-Defence:  30
-Special Attack:  31
-Special Defence:  31
-Speed:  70
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         60
+        defense:         30
+ special-attack:         31
+special-defense:         31
+          speed:         70
+
+Pokedex ID: 21	Capture Rate: 255
+Base Exp: 52	Happiness: 70
+Height: 3	Weight: 20
+
+Genus: Tiny Bird Pokémon
+Location Areas:
+sinnoh-route-225-area
+sinnoh-sea-route-226-area
+johto-route-29-area
+johto-route-30-area
+johto-route-31-area
+johto-route-32-area
+johto-route-33-area
+johto-route-42-area
+johto-route-43-area
+johto-route-44-area
+johto-route-45-area
+johto-route-46-area
+johto-route-47-area
+kanto-route-3-area
+kanto-route-4-area
+kanto-route-7-area
+kanto-route-9-area
+kanto-route-10-area
+kanto-route-11-area
+kanto-route-16-area
+kanto-route-17-area
+kanto-route-18-area
+kanto-route-22-area
+kanto-route-23-area
+mt-ember-area
+kindle-road-area
+treasure-beach-area
+cape-brink-area
+water-path-area
+ruin-valley-area
+canyon-entrance-area
+goldenrod-city-north-gate
+azalea-town-area
+johto-safari-zone-zone-wetland
diff --git a/pokeData/spectrier b/pokeData/spectrier
index 2ce1d23..c638e84 100644
--- a/pokeData/spectrier
+++ b/pokeData/spectrier
@@ -1,15 +1,21 @@
+spectrier	A ghost type Pokémon
 
-Name:  Spectrier
-Pokedex Number:  897
-Gender Ratio:  Genderless
-Abilities: Grim Neigh
+It probes its surroundings with all its senses save
+one—it doesn’t use its sense of sight. Spectrier’s
+kicks are said to separate soul from body.
+
+   ↞--------| STATS |--------↠ 
+             hp:        100
+         attack:         65
+        defense:         60
+ special-attack:        145
+special-defense:         80
+          speed:        130
+
+Pokedex ID: 897	Capture Rate: 3
+Base Exp: 290	Happiness: 35
+Height: 20	Weight: 445
+
+Genus: Swift Horse Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 580
-Hp:  100
-Attack:  65
-Defence:  60
-Special Attack:  145
-Special Defence:  80
-Speed:  130
diff --git a/pokeData/spewpa b/pokeData/spewpa
index 79b0b65..9514075 100644
--- a/pokeData/spewpa
+++ b/pokeData/spewpa
@@ -1,15 +1,21 @@
+spewpa	A bug type Pokémon
 
-Name:  Spewpa
-Pokedex Number:  665
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Shed Skin - Friend Guard (Hidden Ability)
+しげみの　陰に　隠れて　暮らす。
+敵に　襲われると　体の　毛を
+鋭く　逆立てて　威嚇する。
+
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         22
+        defense:         60
+ special-attack:         27
+special-defense:         30
+          speed:         29
+
+Pokedex ID: 665	Capture Rate: 120
+Base Exp: 75	Happiness: 70
+Height: 3	Weight: 84
+
+Genus: Scatterdust Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 213
-Hp:  45
-Attack:  22
-Defence:  60
-Special Attack:  27
-Special Defence:  30
-Speed:  29
diff --git a/pokeData/spheal b/pokeData/spheal
index 3b4c283..da7c04f 100644
--- a/pokeData/spheal
+++ b/pokeData/spheal
@@ -1,15 +1,25 @@
+spheal	A ice type Pokémon
 
-Name:  Spheal
-Pokedex Number:  363
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Thick Fat - Ice Body - Oblivious (Hidden Ability)
+It rolls across ice floes to reach
+shore because its body is poorly
+shaped for swimming.
 
-Base Stats
-----------------------
-Total: 290
-Hp:  70
-Attack:  40
-Defence:  50
-Special Attack:  55
-Special Defence:  50
-Speed:  25
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         40
+        defense:         50
+ special-attack:         55
+special-defense:         50
+          speed:         25
+
+Pokedex ID: 363	Capture Rate: 255
+Base Exp: 58	Happiness: 50
+Height: 8	Weight: 395
+
+Genus: Clap Pokémon
+Location Areas:
+sinnoh-sea-route-226-area
+sinnoh-sea-route-230-area
+shoal-cave-area
+shoal-cave-b1f
+undella-bay-area
diff --git a/pokeData/spinarak b/pokeData/spinarak
index 96ae526..acdfc90 100644
--- a/pokeData/spinarak
+++ b/pokeData/spinarak
@@ -1,15 +1,34 @@
+spinarak	A bug type Pokémon
 
-Name:  Spinarak
-Pokedex Number:  167
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Swarm - Insomnia - Sniper (Hidden Ability)
+It lies still in the same pose for days
+in its web, waiting for its unsuspecting
+prey to wander close.
 
-Base Stats
-----------------------
-Total: 250
-Hp:  40
-Attack:  60
-Defence:  40
-Special Attack:  40
-Special Defence:  40
-Speed:  30
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         60
+        defense:         40
+ special-attack:         40
+special-defense:         40
+          speed:         30
+
+Pokedex ID: 167	Capture Rate: 255
+Base Exp: 50	Happiness: 70
+Height: 5	Weight: 85
+
+Genus: String Spit Pokémon
+Location Areas:
+johto-route-29-area
+johto-route-30-area
+johto-route-31-area
+johto-route-34-area
+johto-route-35-area
+national-park-area
+johto-route-36-area
+johto-route-37-area
+johto-route-38-area
+johto-route-39-area
+kanto-route-2-south-towards-viridian-city
+kanto-route-2-north-towards-pewter-city
+hoenn-safari-zone-expansion-south
+pattern-bush-area
diff --git a/pokeData/spinda b/pokeData/spinda
index 11b3c0c..f286142 100644
--- a/pokeData/spinda
+++ b/pokeData/spinda
@@ -1,15 +1,36 @@
+spinda	A normal type Pokémon
 
-Name:  Spinda
-Pokedex Number:  327
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Own Tempo - Tangled Feet - Contrary (Hidden Ability)
+No two SPINDA have the same
+pattern of spots. Its tottering
+step fouls the aim of foes.
 
-Base Stats
-----------------------
-Total: 360
-Hp:  60
-Attack:  60
-Defence:  60
-Special Attack:  60
-Special Defence:  60
-Speed:  60
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         60
+        defense:         60
+ special-attack:         60
+special-defense:         60
+          speed:         60
+
+Pokedex ID: 327	Capture Rate: 255
+Base Exp: 126	Happiness: 70
+Height: 11	Weight: 50
+
+Genus: Spot Panda Pokémon
+Location Areas:
+sinnoh-route-227-area
+sprout-tower-2f
+sprout-tower-3f
+burned-tower-1f
+burned-tower-b1f
+bell-tower-2f
+bell-tower-3f
+bell-tower-4f
+bell-tower-5f
+bell-tower-6f
+bell-tower-7f
+bell-tower-8f
+bell-tower-9f
+bell-tower-10f
+hoenn-route-113-area
+kalos-route-21-area
diff --git a/pokeData/spiritomb b/pokeData/spiritomb
index 8eece8c..2f6fa2b 100644
--- a/pokeData/spiritomb
+++ b/pokeData/spiritomb
@@ -1,15 +1,21 @@
+spiritomb	A ghost type Pokémon
 
-Name:  Spiritomb
-Pokedex Number:  442
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Pressure - Infiltrator (Hidden Ability)
+Son mauvais comportement lui a valu
+d’être enchaîné à une Clé de Voûte
+par un mystérieux sortilège.
 
-Base Stats
-----------------------
-Total: 485
-Hp:  50
-Attack:  92
-Defence:  108
-Special Attack:  92
-Special Defence:  108
-Speed:  35
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         92
+        defense:        108
+ special-attack:         92
+special-defense:        108
+          speed:         35
+
+Pokedex ID: 442	Capture Rate: 100
+Base Exp: 170	Happiness: 50
+Height: 10	Weight: 1080
+
+Genus: Forbidden Pokémon
+Location Areas:
+sinnoh-route-209-area
diff --git a/pokeData/spoink b/pokeData/spoink
index a62155d..5e68e62 100644
--- a/pokeData/spoink
+++ b/pokeData/spoink
@@ -1,15 +1,38 @@
+spoink	A psychic type Pokémon
 
-Name:  Spoink
-Pokedex Number:  325
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Thick Fat - Own Tempo - Gluttony (Hidden Ability)
+It bounces constantly, using its
+tail like a spring. The shock of
+bouncing keeps its heart beating.
 
-Base Stats
-----------------------
-Total: 330
-Hp:  60
-Attack:  25
-Defence:  35
-Special Attack:  70
-Special Defence:  80
-Speed:  60
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         25
+        defense:         35
+ special-attack:         70
+special-defense:         80
+          speed:         60
+
+Pokedex ID: 325	Capture Rate: 255
+Base Exp: 66	Happiness: 70
+Height: 7	Weight: 306
+
+Genus: Bounce Pokémon
+Location Areas:
+sinnoh-route-214-area
+ilex-forest-area
+viridian-forest-area
+jagged-pass-area
+reversal-mountain-unknown-area-48
+reversal-mountain-unknown-area-49
+reversal-mountain-unknown-area-50
+reversal-mountain-unknown-area-51
+reversal-mountain-unknown-area-52
+reversal-mountain-unknown-area-53
+reversal-mountain-unknown-area-54
+reversal-mountain-unknown-area-55
+reversal-mountain-unknown-area-56
+reversal-mountain-unknown-area-57
+reversal-mountain-unknown-area-58
+reversal-mountain-unknown-area-59
+reversal-mountain-unknown-area-60
+kalos-route-8-area
diff --git a/pokeData/spritzee b/pokeData/spritzee
index 8c1d209..6d57f3e 100644
--- a/pokeData/spritzee
+++ b/pokeData/spritzee
@@ -1,15 +1,21 @@
+spritzee	A fairy type Pokémon
 
-Name:  Spritzee
-Pokedex Number:  682
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Healer - Aroma Veil (Hidden Ability)
+かいだ　者を　うっとりさせる
+香りを　体から　漂わせる。
+食べた　もので　香りが　変わる。
 
-Base Stats
-----------------------
-Total: 341
-Hp:  78
-Attack:  52
-Defence:  60
-Special Attack:  63
-Special Defence:  65
-Speed:  23
+   ↞--------| STATS |--------↠ 
+             hp:         78
+         attack:         52
+        defense:         60
+ special-attack:         63
+special-defense:         65
+          speed:         23
+
+Pokedex ID: 682	Capture Rate: 200
+Base Exp: 68	Happiness: 50
+Height: 2	Weight: 5
+
+Genus: Perfume Pokémon
+Location Areas:
+kalos-route-7-area
diff --git a/pokeData/squirtle b/pokeData/squirtle
index 6b0cd0d..77345d4 100644
--- a/pokeData/squirtle
+++ b/pokeData/squirtle
@@ -1,15 +1,25 @@
+squirtle	A water type Pokémon
 
-Name:  Squirtle
-Pokedex Number:  007
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Torrent - Rain Dish (Hidden Ability)
+SQUIRTLE’s shell is not merely used
+for protection.
+The shell’s rounded shape and thegrooves on its surface help minimize
+resistance in water, enabling this
+POKéMON to swim at high speeds.
 
-Base Stats
-----------------------
-Total: 314
-Hp:  44
-Attack:  48
-Defence:  65
-Special Attack:  50
-Special Defence:  64
-Speed:  43
+   ↞--------| STATS |--------↠ 
+             hp:         44
+         attack:         48
+        defense:         65
+ special-attack:         50
+special-defense:         64
+          speed:         43
+
+Pokedex ID: 7	Capture Rate: 45
+Base Exp: 63	Happiness: 50
+Height: 5	Weight: 90
+
+Genus: Tiny Turtle Pokémon
+Location Areas:
+vermilion-city-area
+pallet-town-area
+lumiose-city-area
diff --git a/pokeData/stakataka b/pokeData/stakataka
index c951625..5f3937a 100644
--- a/pokeData/stakataka
+++ b/pokeData/stakataka
@@ -1,15 +1,21 @@
+stakataka	A rock type Pokémon
 
-Name:  Stakataka
-Pokedex Number:  805
-Gender Ratio:  Genderless
-Abilities: Beast Boost
+It appeared from an Ultra Wormhole. Each one
+appears to be made up of many life-forms
+stacked one on top of each other.
+
+   ↞--------| STATS |--------↠ 
+             hp:         61
+         attack:        131
+        defense:        211
+ special-attack:         53
+special-defense:        101
+          speed:         13
+
+Pokedex ID: 805	Capture Rate: 30
+Base Exp: 285	Happiness: 0
+Height: 55	Weight: 8200
+
+Genus: Rampart Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 570
-Hp:  61
-Attack:  131
-Defence:  211
-Special Attack:  53
-Special Defence:  101
-Speed:  13
diff --git a/pokeData/stantler b/pokeData/stantler
index 3de322b..c964dde 100644
--- a/pokeData/stantler
+++ b/pokeData/stantler
@@ -1,15 +1,28 @@
+stantler	A normal type Pokémon
 
-Name:  Stantler
-Pokedex Number:  234
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Intimidate - Frisk - Sap Sipper (Hidden Ability)
+Its curved antlers subtly change the flow
+of air to create a strange space where
+reality is distorted.
 
-Base Stats
-----------------------
-Total: 465
-Hp:  73
-Attack:  95
-Defence:  62
-Special Attack:  85
-Special Defence:  65
-Speed:  85
+   ↞--------| STATS |--------↠ 
+             hp:         73
+         attack:         95
+        defense:         62
+ special-attack:         85
+special-defense:         65
+          speed:         85
+
+Pokedex ID: 234	Capture Rate: 45
+Base Exp: 163	Happiness: 70
+Height: 14	Weight: 712
+
+Genus: Big Horn Pokémon
+Location Areas:
+sinnoh-route-207-area
+johto-route-36-area
+johto-route-37-area
+hoenn-safari-zone-expansion-south
+hoenn-altering-cave-h
+kanto-altering-cave-h
+abundant-shrine-area
+johto-safari-zone-zone-plains
diff --git a/pokeData/staraptor b/pokeData/staraptor
index f09df73..930f118 100644
--- a/pokeData/staraptor
+++ b/pokeData/staraptor
@@ -1,15 +1,21 @@
+staraptor	A normal type Pokémon
 
-Name:  Staraptor
-Pokedex Number:  398
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Intimidate - Reckless (Hidden Ability)
+Il combattra sans relâche, même
+blessé. Il prend grand soin de sa
+mèche.
+
+   ↞--------| STATS |--------↠ 
+             hp:         85
+         attack:        120
+        defense:         70
+ special-attack:         50
+special-defense:         60
+          speed:        100
+
+Pokedex ID: 398	Capture Rate: 45
+Base Exp: 218	Happiness: 70
+Height: 12	Weight: 249
+
+Genus: Predator Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 485
-Hp:  85
-Attack:  120
-Defence:  70
-Special Attack:  50
-Special Defence:  60
-Speed:  100
diff --git a/pokeData/staravia b/pokeData/staravia
index a9e4135..e44f14e 100644
--- a/pokeData/staravia
+++ b/pokeData/staravia
@@ -1,15 +1,31 @@
+staravia	A normal type Pokémon
 
-Name:  Staravia
-Pokedex Number:  397
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Intimidate - Reckless (Hidden Ability)
+Conscient de sa propre faiblesse,
+il vit toujours en groupe, piaillant
+bruyamment quand il est seul.
 
-Base Stats
-----------------------
-Total: 340
-Hp:  55
-Attack:  75
-Defence:  50
-Special Attack:  40
-Special Defence:  40
-Speed:  80
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         75
+        defense:         50
+ special-attack:         40
+special-defense:         40
+          speed:         80
+
+Pokedex ID: 397	Capture Rate: 120
+Base Exp: 119	Happiness: 70
+Height: 6	Weight: 155
+
+Genus: Starling Pokémon
+Location Areas:
+sendoff-spring-area
+trophy-garden-area
+lake-verity-before-galactic-intervention
+lake-verity-after-galactic-intervention
+lake-valor-area
+valor-lakefront-area
+sinnoh-route-209-area
+sinnoh-route-210-south-towards-solaceon-town
+sinnoh-route-212-north-towards-hearthome-city
+sinnoh-route-215-area
+kalos-route-11-area
diff --git a/pokeData/starly b/pokeData/starly
index 72f3bf9..fb20e3b 100644
--- a/pokeData/starly
+++ b/pokeData/starly
@@ -1,15 +1,35 @@
+starly	A normal type Pokémon
 
-Name:  Starly
-Pokedex Number:  396
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Keen Eye - Reckless (Hidden Ability)
+La faiblesse des Étourmi les force
+à vivre en groupe, mais ils se
+chamaillent souvent.
 
-Base Stats
-----------------------
-Total: 245
-Hp:  40
-Attack:  55
-Defence:  30
-Special Attack:  30
-Special Defence:  30
-Speed:  60
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         55
+        defense:         30
+ special-attack:         30
+special-defense:         30
+          speed:         60
+
+Pokedex ID: 396	Capture Rate: 255
+Base Exp: 49	Happiness: 70
+Height: 3	Weight: 20
+
+Genus: Starling Pokémon
+Location Areas:
+great-marsh-area-1
+great-marsh-area-2
+great-marsh-area-3
+great-marsh-area-4
+great-marsh-area-5
+great-marsh-area-6
+lake-verity-before-galactic-intervention
+lake-verity-after-galactic-intervention
+sinnoh-route-201-area
+sinnoh-route-202-area
+sinnoh-route-203-area
+sinnoh-route-204-south-towards-jubilife-city
+sinnoh-route-204-north-towards-floaroma-town
+sinnoh-route-209-area
+sinnoh-route-212-north-towards-hearthome-city
diff --git a/pokeData/starmie b/pokeData/starmie
index 1ef9359..c7da13c 100644
--- a/pokeData/starmie
+++ b/pokeData/starmie
@@ -1,15 +1,25 @@
+starmie	A water type Pokémon
 
-Name:  Starmie
-Pokedex Number:  121
-Gender Ratio:  Genderless
-Abilities: Illuminate - Natural Cure - Analytic (Hidden Ability)
+STARMIE swims through water by
+spinning its star-shaped body as if it
+were a propeller on a ship.The core at the center of this
+POKéMON’s body glows in seven colors.
 
-Base Stats
-----------------------
-Total: 520
-Hp:  60
-Attack:  75
-Defence:  85
-Special Attack:  100
-Special Defence:  85
-Speed:  115
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         75
+        defense:         85
+ special-attack:        100
+special-defense:         85
+          speed:        115
+
+Pokedex ID: 121	Capture Rate: 60
+Base Exp: 182	Happiness: 50
+Height: 11	Weight: 800
+
+Genus: Mysterious Pokémon
+Location Areas:
+unova-route-13-area
+undella-town-area
+humilau-city-area
+kalos-route-8-area
diff --git a/pokeData/staryu b/pokeData/staryu
index d5133ea..ff35bf1 100644
--- a/pokeData/staryu
+++ b/pokeData/staryu
@@ -1,15 +1,52 @@
+staryu	A water type Pokémon
 
-Name:  Staryu
-Pokedex Number:  120
-Gender Ratio:  Genderless
-Abilities: Illuminate - Natural Cure - Analytic (Hidden Ability)
+STARYU’s center section has an organ
+called the core that shines bright red.
+If you go to a beach toward theend of summer, the glowing cores of
+these POKéMON look like the stars
+in the sky.
 
-Base Stats
-----------------------
-Total: 340
-Hp:  30
-Attack:  45
-Defence:  55
-Special Attack:  70
-Special Defence:  55
-Speed:  85
+   ↞--------| STATS |--------↠ 
+             hp:         30
+         attack:         45
+        defense:         55
+ special-attack:         70
+special-defense:         55
+          speed:         85
+
+Pokedex ID: 120	Capture Rate: 225
+Base Exp: 68	Happiness: 50
+Height: 8	Weight: 345
+
+Genus: Star Shape Pokémon
+Location Areas:
+canalave-city-area
+sunyshore-city-area
+cherrygrove-city-area
+union-cave-b2f
+johto-route-34-area
+olivine-city-area
+johto-sea-route-40-area
+cianwood-city-area
+johto-route-47-area
+seafoam-islands-1f
+seafoam-islands-b1f
+seafoam-islands-b2f
+seafoam-islands-b3f
+seafoam-islands-b4f
+kanto-sea-route-19-area
+kanto-sea-route-20-area
+cinnabar-island-area
+vermilion-city-area
+pallet-town-area
+kanto-sea-route-21-area
+vermilion-city-ss-anne-dock
+lilycove-city-area
+ss-anne-area
+icefall-cave-waterfall
+one-island-area
+five-island-area
+unova-route-13-area
+undella-town-area
+humilau-city-area
+kalos-route-8-area
diff --git a/pokeData/steelix b/pokeData/steelix
index eb2e182..f9cba8b 100644
--- a/pokeData/steelix
+++ b/pokeData/steelix
@@ -1,15 +1,43 @@
+steelix	A steel type Pokémon
 
-Name:  Steelix
-Pokedex Number:  208
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Rock Head - Sturdy - Sheer Force (Hidden Ability)
+It is said that if an ONIX lives for over
+100 years, its composition changes to
+become diamond-like.
 
-Base Stats
-----------------------
-Total: 510
-Hp:  75
-Attack:  125
-Defence:  230
-Special Attack:  55
-Special Defence:  95
-Speed:  30
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:         85
+        defense:        200
+ special-attack:         55
+special-defense:         65
+          speed:         30
+
+Pokedex ID: 208	Capture Rate: 25
+Base Exp: 179	Happiness: 50
+Height: 92	Weight: 4000
+
+Genus: Iron Snake Pokémon
+Location Areas:
+sinnoh-victory-road-1f
+sinnoh-victory-road-2f
+sinnoh-victory-road-b1f
+sinnoh-victory-road-inside-b1f
+sinnoh-victory-road-inside
+sinnoh-victory-road-inside-exit
+snowpoint-temple-1f
+snowpoint-temple-b1f
+snowpoint-temple-b2f
+snowpoint-temple-b3f
+snowpoint-temple-b4f
+snowpoint-temple-b5f
+iron-island-b2f-right
+iron-island-b2f-left
+iron-island-b3f
+mt-silver-2f
+johto-route-47-inside-cave
+twist-mountain-area
+clay-tunnel-area
+underground-ruins-area
+rocky-mountain-room-area
+glacier-room-area
+iron-room-area
diff --git a/pokeData/steenee b/pokeData/steenee
index de42296..e6f0e39 100644
--- a/pokeData/steenee
+++ b/pokeData/steenee
@@ -1,15 +1,21 @@
+steenee	A grass type Pokémon
 
-Name:  Steenee
-Pokedex Number:  762
-Gender Ratio:   ♂:0% ♀:100%
-Abilities: Leaf Guard - Oblivious - Sweet Veil (Hidden Ability)
+The sepals on its head developed to protect its
+body. These are quite hard, so even if pecked
+by bird Pokémon, this Pokémon is totally fine.
+
+   ↞--------| STATS |--------↠ 
+             hp:         52
+         attack:         40
+        defense:         48
+ special-attack:         40
+special-defense:         48
+          speed:         62
+
+Pokedex ID: 762	Capture Rate: 120
+Base Exp: 102	Happiness: 50
+Height: 7	Weight: 82
+
+Genus: Fruit Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 290
-Hp:  52
-Attack:  40
-Defence:  48
-Special Attack:  40
-Special Defence:  48
-Speed:  62
diff --git a/pokeData/stonjourner b/pokeData/stonjourner
index 3b6c61b..042edb6 100644
--- a/pokeData/stonjourner
+++ b/pokeData/stonjourner
@@ -1,15 +1,21 @@
+stonjourner	A rock type Pokémon
 
-Name:  Stonjourner
-Pokedex Number:  874
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Power Spot
+It stands in grasslands, watching the sun’s descent
+from zenith to horizon. This Pokémon has a talent
+for delivering dynamic kicks.
+
+   ↞--------| STATS |--------↠ 
+             hp:        100
+         attack:        125
+        defense:        135
+ special-attack:         20
+special-defense:         20
+          speed:         70
+
+Pokedex ID: 874	Capture Rate: 60
+Base Exp: 165	Happiness: 50
+Height: 25	Weight: 5200
+
+Genus: Big Rock Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 470
-Hp:  100
-Attack:  125
-Defence:  135
-Special Attack:  20
-Special Defence:  20
-Speed:  70
diff --git a/pokeData/stoutland b/pokeData/stoutland
index 8a23c57..0006cf9 100644
--- a/pokeData/stoutland
+++ b/pokeData/stoutland
@@ -1,15 +1,27 @@
+stoutland	A normal type Pokémon
 
-Name:  Stoutland
-Pokedex Number:  508
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Intimidate - Sand Rush - Scrappy (Hidden Ability)
+눈보라로 길이 막힌 산에 들어가
+조난된 사람을 구해준다.
+긴 털이 추위를 막는다.
 
-Base Stats
-----------------------
-Total: 500
-Hp:  85
-Attack:  110
-Defence:  90
-Special Attack:  45
-Special Defence:  90
-Speed:  80
+   ↞--------| STATS |--------↠ 
+             hp:         85
+         attack:        110
+        defense:         90
+ special-attack:         45
+special-defense:         90
+          speed:         80
+
+Pokedex ID: 508	Capture Rate: 45
+Base Exp: 250	Happiness: 50
+Height: 12	Weight: 610
+
+Genus: Big-Hearted Pokémon
+Location Areas:
+cold-storage-area
+p2-laboratory-area
+unova-route-1-area
+unova-route-2-area
+unova-route-3-area
+unova-route-10-area
+unova-route-10-victory-road-gate
diff --git a/pokeData/stufful b/pokeData/stufful
index ef7f2b7..bc7f3cb 100644
--- a/pokeData/stufful
+++ b/pokeData/stufful
@@ -1,15 +1,21 @@
+stufful	A normal type Pokémon
 
-Name:  Stufful
-Pokedex Number:  759
-Gender Ratio:   ♂:50.2% ♀:49.8% 
-Abilities: Fluffy - Klutz - Cute Charm (Hidden Ability)
+Despite its adorable appearance, when it gets
+angry and flails about, its arms and legs could
+knock a pro wrestler sprawling.
+
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         75
+        defense:         50
+ special-attack:         45
+special-defense:         50
+          speed:         50
+
+Pokedex ID: 759	Capture Rate: 140
+Base Exp: 68	Happiness: 50
+Height: 5	Weight: 68
+
+Genus: Flailing Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 340
-Hp:  70
-Attack:  75
-Defence:  50
-Special Attack:  45
-Special Defence:  50
-Speed:  50
diff --git a/pokeData/stunfisk b/pokeData/stunfisk
index 8648a6d..ff3cb1d 100644
--- a/pokeData/stunfisk
+++ b/pokeData/stunfisk
@@ -1,15 +1,25 @@
+stunfisk	A ground type Pokémon
 
-Name:  Stunfisk
-Pokedex Number:  618
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Static - Limber - Sand Veil (Hidden Ability)
+피부가 단단해서 씨름꾼에게
+밟혀도 아무렇지 않다. 전기를
+흘려보낼 때 웃는 얼굴이 된다.
 
-Base Stats
-----------------------
-Total: 471
-Hp:  109
-Attack:  66
-Defence:  84
-Special Attack:  81
-Special Defence:  99
-Speed:  32
+   ↞--------| STATS |--------↠ 
+             hp:        109
+         attack:         66
+        defense:         84
+ special-attack:         81
+special-defense:         99
+          speed:         32
+
+Pokedex ID: 618	Capture Rate: 75
+Base Exp: 165	Happiness: 70
+Height: 7	Weight: 110
+
+Genus: Trap Pokémon
+Location Areas:
+icirrus-city-area
+unova-route-8-area
+moor-of-icirrus-area
+kalos-route-14-area
+kalos-route-19-area
diff --git a/pokeData/stunky b/pokeData/stunky
index 3416b5a..1790118 100644
--- a/pokeData/stunky
+++ b/pokeData/stunky
@@ -1,15 +1,24 @@
+stunky	A poison type Pokémon
 
-Name:  Stunky
-Pokedex Number:  434
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Stench - Aftermath - Keen Eye (Hidden Ability)
+Son derrière propulse un fluide
+nauséabond qui peut faire fuir les
+Pokémon dans un rayon de 2 km.
 
-Base Stats
-----------------------
-Total: 329
-Hp:  63
-Attack:  63
-Defence:  47
-Special Attack:  41
-Special Defence:  41
-Speed:  74
+   ↞--------| STATS |--------↠ 
+             hp:         63
+         attack:         63
+        defense:         47
+ special-attack:         41
+special-defense:         41
+          speed:         74
+
+Pokedex ID: 434	Capture Rate: 225
+Base Exp: 66	Happiness: 50
+Height: 4	Weight: 192
+
+Genus: Skunk Pokémon
+Location Areas:
+sinnoh-route-206-area
+sinnoh-route-214-area
+sinnoh-route-221-area
+kalos-route-11-area
diff --git a/pokeData/sudowoodo b/pokeData/sudowoodo
index 332aa25..32b863f 100644
--- a/pokeData/sudowoodo
+++ b/pokeData/sudowoodo
@@ -1,15 +1,24 @@
+sudowoodo	A rock type Pokémon
 
-Name:  Sudowoodo
-Pokedex Number:  185
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Sturdy - Rock Head - Rattled (Hidden Ability)
+Although it always pretends to be a tree,
+its composition appears to be closer to a
+rock than a plant.
 
-Base Stats
-----------------------
-Total: 410
-Hp:  70
-Attack:  100
-Defence:  115
-Special Attack:  30
-Special Defence:  65
-Speed:  30
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:        100
+        defense:        115
+ special-attack:         30
+special-defense:         65
+          speed:         30
+
+Pokedex ID: 185	Capture Rate: 65
+Base Exp: 144	Happiness: 50
+Height: 12	Weight: 380
+
+Genus: Imitation Pokémon
+Location Areas:
+sinnoh-route-214-area
+sinnoh-route-221-area
+johto-route-36-area
+hoenn-battle-frontier-area
diff --git a/pokeData/suicune b/pokeData/suicune
index 5c30d29..38a320a 100644
--- a/pokeData/suicune
+++ b/pokeData/suicune
@@ -1,15 +1,25 @@
+suicune	A water type Pokémon
 
-Name:  Suicune
-Pokedex Number:  245
-Gender Ratio:  Genderless
-Abilities: Pressure - Water Absorb (Hidden Ability)
+SUICUNE embodies the compassion of
+a pure spring of water. It runs across
+the land with gliding elegance. It has the
+power to purify dirty water.
 
-Base Stats
-----------------------
-Total: 580
-Hp:  100
-Attack:  75
-Defence:  115
-Special Attack:  90
-Special Defence:  115
-Speed:  85
+   ↞--------| STATS |--------↠ 
+             hp:        100
+         attack:         75
+        defense:        115
+ special-attack:         90
+special-defense:        115
+          speed:         85
+
+Pokedex ID: 245	Capture Rate: 3
+Base Exp: 290	Happiness: 35
+Height: 20	Weight: 1870
+
+Genus: Aurora Pokémon
+Location Areas:
+kanto-route-25-area
+roaming-kanto-area
+roaming-johto-area
+bell-tower-1f
diff --git a/pokeData/sunflora b/pokeData/sunflora
index e069980..89ac888 100644
--- a/pokeData/sunflora
+++ b/pokeData/sunflora
@@ -1,15 +1,21 @@
+sunflora	A grass type Pokémon
 
-Name:  Sunflora
-Pokedex Number:  192
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Chlorophyll - Solar Power - Early Bird (Hidden Ability)
+It converts sunlight into energy. In the
+darkness after sunset, it closes its petals
+and becomes still.
 
-Base Stats
-----------------------
-Total: 425
-Hp:  75
-Attack:  75
-Defence:  55
-Special Attack:  105
-Special Defence:  85
-Speed:  30
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:         75
+        defense:         55
+ special-attack:        105
+special-defense:         85
+          speed:         30
+
+Pokedex ID: 192	Capture Rate: 120
+Base Exp: 149	Happiness: 70
+Height: 8	Weight: 85
+
+Genus: Sun Pokémon
+Location Areas:
+unova-route-12-area
diff --git a/pokeData/sunkern b/pokeData/sunkern
index 730258d..93caa1f 100644
--- a/pokeData/sunkern
+++ b/pokeData/sunkern
@@ -1,15 +1,28 @@
+sunkern	A grass type Pokémon
 
-Name:  Sunkern
-Pokedex Number:  191
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Chlorophyll - Solar Power - Early Bird (Hidden Ability)
+It may drop out of the sky suddenly.
+If attacked by a SPEAROW, it will
+violently shake its leaves.
 
-Base Stats
-----------------------
-Total: 180
-Hp:  30
-Attack:  30
-Defence:  30
-Special Attack:  30
-Special Defence:  30
-Speed:  30
+   ↞--------| STATS |--------↠ 
+             hp:         30
+         attack:         30
+        defense:         30
+ special-attack:         30
+special-defense:         30
+          speed:         30
+
+Pokedex ID: 191	Capture Rate: 235
+Base Exp: 36	Happiness: 70
+Height: 3	Weight: 18
+
+Genus: Seed Pokémon
+Location Areas:
+sinnoh-route-204-north-towards-floaroma-town
+national-park-area
+kanto-route-24-area
+hoenn-safari-zone-expansion-south
+hoenn-safari-zone-expansion-north
+unova-route-12-area
+unova-route-20-area
+johto-safari-zone-zone-meadow
diff --git a/pokeData/surskit b/pokeData/surskit
index 806b702..346fc3f 100644
--- a/pokeData/surskit
+++ b/pokeData/surskit
@@ -1,15 +1,28 @@
+surskit	A bug type Pokémon
 
-Name:  Surskit
-Pokedex Number:  283
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Swift Swim - Rain Dish (Hidden Ability)
+It appears as if it is skating on
+water. It draws prey with a sweet
+scent from the tip of its head.
 
-Base Stats
-----------------------
-Total: 269
-Hp:  40
-Attack:  30
-Defence:  32
-Special Attack:  50
-Special Defence:  52
-Speed:  65
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         30
+        defense:         32
+ special-attack:         50
+special-defense:         52
+          speed:         65
+
+Pokedex ID: 283	Capture Rate: 200
+Base Exp: 54	Happiness: 70
+Height: 5	Weight: 17
+
+Genus: Pond Skater Pokémon
+Location Areas:
+lake-verity-before-galactic-intervention
+lake-verity-after-galactic-intervention
+sinnoh-route-229-area
+hoenn-route-102-area
+hoenn-route-111-area
+hoenn-route-114-area
+hoenn-route-117-area
+hoenn-route-120-area
diff --git a/pokeData/swablu b/pokeData/swablu
index baf4db8..4e90e56 100644
--- a/pokeData/swablu
+++ b/pokeData/swablu
@@ -1,15 +1,27 @@
+swablu	A normal type Pokémon
 
-Name:  Swablu
-Pokedex Number:  333
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Natural Cure - Cloud Nine (Hidden Ability)
+It can’t relax if it or its
+surroundings are not clean.
+It wipes off dirt with its wings.
 
-Base Stats
-----------------------
-Total: 310
-Hp:  45
-Attack:  40
-Defence:  60
-Special Attack:  40
-Special Defence:  75
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         40
+        defense:         60
+ special-attack:         40
+special-defense:         75
+          speed:         50
+
+Pokedex ID: 333	Capture Rate: 255
+Base Exp: 62	Happiness: 50
+Height: 4	Weight: 12
+
+Genus: Cotton Bird Pokémon
+Location Areas:
+sinnoh-route-210-west-towards-celestic-town
+sinnoh-route-211-east-towards-celestic-town
+johto-route-45-area
+hoenn-route-114-area
+hoenn-route-115-area
+unova-route-14-area
+abundant-shrine-area
diff --git a/pokeData/swadloon b/pokeData/swadloon
index 1fb3a05..b7cfd43 100644
--- a/pokeData/swadloon
+++ b/pokeData/swadloon
@@ -1,15 +1,23 @@
+swadloon	A bug type Pokémon
 
-Name:  Swadloon
-Pokedex Number:  541
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Leaf Guard - Chlorophyll - Overcoat (Hidden Ability)
+두르쿤이 사는 숲은 초목이
+잘 자란다. 두르쿤이 낙엽을
+영양분으로 바꾸기 때문이다.
 
-Base Stats
-----------------------
-Total: 380
-Hp:  55
-Attack:  63
-Defence:  90
-Special Attack:  50
-Special Defence:  80
-Speed:  42
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         63
+        defense:         90
+ special-attack:         50
+special-defense:         80
+          speed:         42
+
+Pokedex ID: 541	Capture Rate: 120
+Base Exp: 133	Happiness: 70
+Height: 5	Weight: 73
+
+Genus: Leaf-Wrapped Pokémon
+Location Areas:
+pinwheel-forest-inside
+unova-route-6-area
+lostlorn-forest-area
diff --git a/pokeData/swalot b/pokeData/swalot
index a82b631..f85b9cc 100644
--- a/pokeData/swalot
+++ b/pokeData/swalot
@@ -1,15 +1,21 @@
+swalot	A poison type Pokémon
 
-Name:  Swalot
-Pokedex Number:  317
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Liquid Ooze - Sticky Hold - Gluttony (Hidden Ability)
+It swallows anything whole.
+It sweats toxic fluids from its
+follicles to douse foes.
+
+   ↞--------| STATS |--------↠ 
+             hp:        100
+         attack:         73
+        defense:         83
+ special-attack:         73
+special-defense:         83
+          speed:         55
+
+Pokedex ID: 317	Capture Rate: 75
+Base Exp: 163	Happiness: 70
+Height: 17	Weight: 800
+
+Genus: Poison Bag Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 467
-Hp:  100
-Attack:  73
-Defence:  83
-Special Attack:  73
-Special Defence:  83
-Speed:  55
diff --git a/pokeData/swampert b/pokeData/swampert
index 0ecd57e..44baa5d 100644
--- a/pokeData/swampert
+++ b/pokeData/swampert
@@ -1,15 +1,21 @@
+swampert	A water type Pokémon
 
-Name:  Swampert
-Pokedex Number:  260
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Torrent - Damp (Hidden Ability)
+It can swim while towing a large
+ship. It bashes down foes with a
+swing of its thick arms.
+
+   ↞--------| STATS |--------↠ 
+             hp:        100
+         attack:        110
+        defense:         90
+ special-attack:         85
+special-defense:         90
+          speed:         60
+
+Pokedex ID: 260	Capture Rate: 45
+Base Exp: 268	Happiness: 50
+Height: 15	Weight: 819
+
+Genus: Mud Fish Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 535
-Hp:  100
-Attack:  150
-Defence:  110
-Special Attack:  95
-Special Defence:  110
-Speed:  70
diff --git a/pokeData/swanna b/pokeData/swanna
index 164d775..50b3148 100644
--- a/pokeData/swanna
+++ b/pokeData/swanna
@@ -1,15 +1,21 @@
+swanna	A water type Pokémon
 
-Name:  Swanna
-Pokedex Number:  581
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Keen Eye - Big Pecks - Hydration (Hidden Ability)
+우아한 외모와 다르게
+날개로 힘차게 날개 치며
+수천 km를 계속 날 수 있다.
 
-Base Stats
-----------------------
-Total: 473
-Hp:  75
-Attack:  87
-Defence:  63
-Special Attack:  87
-Special Defence:  63
-Speed:  98
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:         87
+        defense:         63
+ special-attack:         87
+special-defense:         63
+          speed:         98
+
+Pokedex ID: 581	Capture Rate: 45
+Base Exp: 166	Happiness: 70
+Height: 13	Weight: 242
+
+Genus: White Bird Pokémon
+Location Areas:
+marvelous-bridge-area
diff --git a/pokeData/swellow b/pokeData/swellow
index fb994b6..49c2559 100644
--- a/pokeData/swellow
+++ b/pokeData/swellow
@@ -1,15 +1,24 @@
+swellow	A normal type Pokémon
 
-Name:  Swellow
-Pokedex Number:  277
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Guts - Scrappy (Hidden Ability)
+It circles the sky in search of
+prey. When it spots one, it dives
+steeply to catch the prey.
 
-Base Stats
-----------------------
-Total: 430
-Hp:  60
-Attack:  85
-Defence:  60
-Special Attack:  50
-Special Defence:  50
-Speed:  125
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         85
+        defense:         60
+ special-attack:         75
+special-defense:         50
+          speed:        125
+
+Pokedex ID: 277	Capture Rate: 45
+Base Exp: 159	Happiness: 70
+Height: 7	Weight: 198
+
+Genus: Swallow Pokémon
+Location Areas:
+sinnoh-route-213-area
+hoenn-route-115-area
+giant-chasm-outside
+unova-route-13-area
diff --git a/pokeData/swinub b/pokeData/swinub
index 9ff9285..d7a1fb8 100644
--- a/pokeData/swinub
+++ b/pokeData/swinub
@@ -1,15 +1,28 @@
+swinub	A ice type Pokémon
 
-Name:  Swinub
-Pokedex Number:  220
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Oblivious - Snow Cloak - Thick Fat (Hidden Ability)
+It rubs its snout on the ground to find
+and dig up food. It sometimes discovers
+hot springs.
 
-Base Stats
-----------------------
-Total: 250
-Hp:  50
-Attack:  50
-Defence:  40
-Special Attack:  30
-Special Defence:  30
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         50
+        defense:         40
+ special-attack:         30
+special-defense:         30
+          speed:         50
+
+Pokedex ID: 220	Capture Rate: 225
+Base Exp: 50	Happiness: 50
+Height: 4	Weight: 65
+
+Genus: Pig Pokémon
+Location Areas:
+acuity-lakefront-area
+sinnoh-route-217-area
+ice-path-1f
+ice-path-b1f
+ice-path-b2f
+ice-path-b3f
+icefall-cave-1f
+icefall-cave-b1f
diff --git a/pokeData/swirlix b/pokeData/swirlix
index 6db5c1d..a51193d 100644
--- a/pokeData/swirlix
+++ b/pokeData/swirlix
@@ -1,15 +1,21 @@
+swirlix	A fairy type Pokémon
 
-Name:  Swirlix
-Pokedex Number:  684
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Sweet Veil - Unburden (Hidden Ability)
+わたあめのような　甘くて　ベタつく
+白い　糸を　出して
+相手を　絡め取り　動きを　封じる。
 
-Base Stats
-----------------------
-Total: 341
-Hp:  62
-Attack:  48
-Defence:  66
-Special Attack:  59
-Special Defence:  57
-Speed:  49
+   ↞--------| STATS |--------↠ 
+             hp:         62
+         attack:         48
+        defense:         66
+ special-attack:         59
+special-defense:         57
+          speed:         49
+
+Pokedex ID: 684	Capture Rate: 200
+Base Exp: 68	Happiness: 50
+Height: 4	Weight: 35
+
+Genus: Cotton Candy Pokémon
+Location Areas:
+kalos-route-7-area
diff --git a/pokeData/swoobat b/pokeData/swoobat
index d7e4ae3..81018d1 100644
--- a/pokeData/swoobat
+++ b/pokeData/swoobat
@@ -1,15 +1,21 @@
+swoobat	A psychic type Pokémon
 
-Name:  Swoobat
-Pokedex Number:  528
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Unaware - Klutz - Simple (Hidden Ability)
+コンクリートも　こわせるほどの
+つよい　ちょうおんぱを　だすとき
+しっぽが　はげしく　ふるえる。
+
+   ↞--------| STATS |--------↠ 
+             hp:         67
+         attack:         57
+        defense:         55
+ special-attack:         77
+special-defense:         55
+          speed:        114
+
+Pokedex ID: 528	Capture Rate: 45
+Base Exp: 149	Happiness: 50
+Height: 9	Weight: 105
+
+Genus: Courting Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 425
-Hp:  67
-Attack:  57
-Defence:  55
-Special Attack:  77
-Special Defence:  55
-Speed:  114
diff --git a/pokeData/sylveon b/pokeData/sylveon
index bd9fd6d..9c68160 100644
--- a/pokeData/sylveon
+++ b/pokeData/sylveon
@@ -1,15 +1,21 @@
+sylveon	A fairy type Pokémon
 
-Name:  Sylveon
-Pokedex Number:  700
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Cute Charm - Pixilate (Hidden Ability)
+リボンのような　触覚から
+気持ちを　和らげる　波動を　送りこみ
+戦いを　やめさせる。
+
+   ↞--------| STATS |--------↠ 
+             hp:         95
+         attack:         65
+        defense:         65
+ special-attack:        110
+special-defense:        130
+          speed:         60
+
+Pokedex ID: 700	Capture Rate: 45
+Base Exp: 184	Happiness: 50
+Height: 10	Weight: 235
+
+Genus: Intertwining Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 525
-Hp:  95
-Attack:  65
-Defence:  65
-Special Attack:  110
-Special Defence:  130
-Speed:  60
diff --git a/pokeData/taillow b/pokeData/taillow
index c26c8ff..6898a54 100644
--- a/pokeData/taillow
+++ b/pokeData/taillow
@@ -1,15 +1,24 @@
+taillow	A normal type Pokémon
 
-Name:  Taillow
-Pokedex Number:  276
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Guts - Scrappy (Hidden Ability)
+It has a gutsy spirit that makes
+it bravely take on tough foes. It
+flies in search of warm climates.
 
-Base Stats
-----------------------
-Total: 270
-Hp:  40
-Attack:  55
-Defence:  30
-Special Attack:  30
-Special Defence:  30
-Speed:  85
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         55
+        defense:         30
+ special-attack:         30
+special-defense:         30
+          speed:         85
+
+Pokedex ID: 276	Capture Rate: 200
+Base Exp: 54	Happiness: 70
+Height: 3	Weight: 23
+
+Genus: Tiny Swallow Pokémon
+Location Areas:
+petalburg-woods-area
+hoenn-route-104-area
+hoenn-route-115-area
+hoenn-route-116-area
diff --git a/pokeData/talonflame b/pokeData/talonflame
index ed78a7a..c86ce99 100644
--- a/pokeData/talonflame
+++ b/pokeData/talonflame
@@ -1,15 +1,21 @@
+talonflame	A fire type Pokémon
 
-Name:  Talonflame
-Pokedex Number:  663
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Flame Body - Gale Wings (Hidden Ability)
+In the fever of an exciting battle, it
+showers embers from the gaps between
+its feathers and takes to the air.
+
+   ↞--------| STATS |--------↠ 
+             hp:         78
+         attack:         81
+        defense:         71
+ special-attack:         74
+special-defense:         69
+          speed:        126
+
+Pokedex ID: 663	Capture Rate: 45
+Base Exp: 175	Happiness: 50
+Height: 12	Weight: 245
+
+Genus: Scorching Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 499
-Hp:  78
-Attack:  81
-Defence:  71
-Special Attack:  74
-Special Defence:  69
-Speed:  126
diff --git a/pokeData/tangela b/pokeData/tangela
index 877ee9d..ff6157e 100644
--- a/pokeData/tangela
+++ b/pokeData/tangela
@@ -1,15 +1,36 @@
+tangela	A grass type Pokémon
 
-Name:  Tangela
-Pokedex Number:  114
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Chlorophyll - Leaf Guard - Regenerator (Hidden Ability)
+TANGELA’s vines snap off easily if they
+are grabbed. This happens without pain,
+allowing it to make a quick getaway.The lost vines are replaced by newly
+grown vines the very next day.
 
-Base Stats
-----------------------
-Total: 435
-Hp:  65
-Attack:  55
-Defence:  115
-Special Attack:  100
-Special Defence:  40
-Speed:  60
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         55
+        defense:        115
+ special-attack:        100
+special-defense:         40
+          speed:         60
+
+Pokedex ID: 114	Capture Rate: 45
+Base Exp: 87	Happiness: 50
+Height: 10	Weight: 350
+
+Genus: Vine Pokémon
+Location Areas:
+great-marsh-area-1
+great-marsh-area-2
+great-marsh-area-3
+great-marsh-area-4
+great-marsh-area-5
+great-marsh-area-6
+johto-route-44-area
+mt-silver-outside
+kanto-route-28-area
+kanto-sea-route-21-area
+kanto-safari-zone-middle
+kanto-safari-zone-area-3-west
+treasure-beach-area
+giant-chasm-outside
+unova-route-13-area
diff --git a/pokeData/tangrowth b/pokeData/tangrowth
index c2042c2..9b93454 100644
--- a/pokeData/tangrowth
+++ b/pokeData/tangrowth
@@ -1,15 +1,22 @@
+tangrowth	A grass type Pokémon
 
-Name:  Tangrowth
-Pokedex Number:  465
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Chlorophyll - Leaf Guard - Regenerator (Hidden Ability)
+Ses bras sont en fait des plantes
+qui s’attachent à tout ce qu’elles
+touchent et peuvent repousser.
 
-Base Stats
-----------------------
-Total: 535
-Hp:  100
-Attack:  100
-Defence:  125
-Special Attack:  110
-Special Defence:  50
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:        100
+         attack:        100
+        defense:        125
+ special-attack:        110
+special-defense:         50
+          speed:         50
+
+Pokedex ID: 465	Capture Rate: 30
+Base Exp: 187	Happiness: 50
+Height: 20	Weight: 1286
+
+Genus: Vine Pokémon
+Location Areas:
+giant-chasm-outside
+unova-route-13-area
diff --git a/pokeData/tapu-bulu b/pokeData/tapu-bulu
index befedc4..d19bfd9 100644
--- a/pokeData/tapu-bulu
+++ b/pokeData/tapu-bulu
@@ -1 +1,21 @@
-You didn't enter a valid pokemon!
+tapu-bulu	A grass type Pokémon
+
+It pulls large trees up by the roots and swings
+them around. It causes vegetation to grow,
+and then it absorbs energy from the growth.
+
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:        130
+        defense:        115
+ special-attack:         85
+special-defense:         95
+          speed:         75
+
+Pokedex ID: 787	Capture Rate: 3
+Base Exp: 285	Happiness: 50
+Height: 19	Weight: 455
+
+Genus: Land Spirit Pokémon
+Location Areas:
+
diff --git a/pokeData/tapu-fini b/pokeData/tapu-fini
index befedc4..8ebfe1c 100644
--- a/pokeData/tapu-fini
+++ b/pokeData/tapu-fini
@@ -1 +1,21 @@
-You didn't enter a valid pokemon!
+tapu-fini	A water type Pokémon
+
+The dense fog it creates brings the downfall
+and destruction of its confused enemies.
+Ocean currents are the source of its energy.
+
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         75
+        defense:        115
+ special-attack:         95
+special-defense:        130
+          speed:         85
+
+Pokedex ID: 788	Capture Rate: 3
+Base Exp: 285	Happiness: 50
+Height: 13	Weight: 212
+
+Genus: Land Spirit Pokémon
+Location Areas:
+
diff --git a/pokeData/tapu-koko b/pokeData/tapu-koko
index befedc4..cd006cd 100644
--- a/pokeData/tapu-koko
+++ b/pokeData/tapu-koko
@@ -1 +1,21 @@
-You didn't enter a valid pokemon!
+tapu-koko	A electric type Pokémon
+
+This guardian deity of Melemele is brimming with
+curiosity. It summons thunderclouds and stores
+their lightning inside its body.
+
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:        115
+        defense:         85
+ special-attack:         95
+special-defense:         75
+          speed:        130
+
+Pokedex ID: 785	Capture Rate: 3
+Base Exp: 285	Happiness: 50
+Height: 18	Weight: 205
+
+Genus: Land Spirit Pokémon
+Location Areas:
+
diff --git a/pokeData/tapu-lele b/pokeData/tapu-lele
index befedc4..94936fa 100644
--- a/pokeData/tapu-lele
+++ b/pokeData/tapu-lele
@@ -1 +1,21 @@
-You didn't enter a valid pokemon!
+tapu-lele	A psychic type Pokémon
+
+This guardian deity of Akala is guilelessly cruel.
+The fragrant aroma of flowers is the source of
+its energy.
+
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         85
+        defense:         75
+ special-attack:        130
+special-defense:        115
+          speed:         95
+
+Pokedex ID: 786	Capture Rate: 3
+Base Exp: 285	Happiness: 50
+Height: 12	Weight: 186
+
+Genus: Land Spirit Pokémon
+Location Areas:
+
diff --git a/pokeData/tauros b/pokeData/tauros
index f7ed0cd..145aaf3 100644
--- a/pokeData/tauros
+++ b/pokeData/tauros
@@ -1,15 +1,31 @@
+tauros	A normal type Pokémon
 
-Name:  Tauros
-Pokedex Number:  128
-Gender Ratio:   ♂:100% ♀:0%
-Abilities: Intimidate - Anger Point - Sheer Force (Hidden Ability)
+This POKéMON is not satisfied unless
+it is rampaging at all times.
+If there is no opponent for TAUROS tobattle, it will charge at thick trees and
+knock them down to calm itself.
 
-Base Stats
-----------------------
-Total: 490
-Hp:  75
-Attack:  100
-Defence:  95
-Special Attack:  40
-Special Defence:  70
-Speed:  110
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:        100
+        defense:         95
+ special-attack:         40
+special-defense:         70
+          speed:        110
+
+Pokedex ID: 128	Capture Rate: 45
+Base Exp: 172	Happiness: 50
+Height: 14	Weight: 884
+
+Genus: Wild Bull Pokémon
+Location Areas:
+sinnoh-route-209-area
+sinnoh-route-210-south-towards-solaceon-town
+johto-route-38-area
+johto-route-39-area
+johto-route-48-area
+kanto-safari-zone-area-1-east
+kanto-safari-zone-area-2-north
+kanto-safari-zone-area-3-west
+kalos-route-12-area
+johto-safari-zone-zone-savannah
diff --git a/pokeData/teddiursa b/pokeData/teddiursa
index 80a1239..570140a 100644
--- a/pokeData/teddiursa
+++ b/pokeData/teddiursa
@@ -1,15 +1,34 @@
+teddiursa	A normal type Pokémon
 
-Name:  Teddiursa
-Pokedex Number:  216
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Pickup - Quick Feet - Honey Gather (Hidden Ability)
+If it finds honey, its crescent mark glows.
+It always licks its paws because they are
+soaked with honey.
 
-Base Stats
-----------------------
-Total: 330
-Hp:  60
-Attack:  80
-Defence:  50
-Special Attack:  50
-Special Defence:  50
-Speed:  40
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         80
+        defense:         50
+ special-attack:         50
+special-defense:         50
+          speed:         40
+
+Pokedex ID: 216	Capture Rate: 120
+Base Exp: 66	Happiness: 70
+Height: 6	Weight: 88
+
+Genus: Little Bear Pokémon
+Location Areas:
+lake-acuity-area
+acuity-lakefront-area
+sinnoh-route-211-west-towards-eterna-city
+sinnoh-route-211-east-towards-celestic-town
+johto-route-45-area
+dark-cave-violet-city-entrance
+dark-cave-blackthorn-city-entrance
+mt-silver-1f-top
+mt-silver-1f
+mt-silver-mountainside
+mt-silver-3f
+hoenn-safari-zone-expansion-north
+hoenn-altering-cave-e
+kanto-altering-cave-e
diff --git a/pokeData/tentacool b/pokeData/tentacool
index 00f0002..3400b30 100644
--- a/pokeData/tentacool
+++ b/pokeData/tentacool
@@ -1,15 +1,124 @@
+tentacool	A water type Pokémon
 
-Name:  Tentacool
-Pokedex Number:  072
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Clear Body - Liquid Ooze - Rain Dish (Hidden Ability)
+TENTACOOL absorbs sunlight and
+refracts it using water inside its body
+to convert it into beam energy.This POKéMON shoots beams from its
+crystal-like eyes.
 
-Base Stats
-----------------------
-Total: 335
-Hp:  40
-Attack:  40
-Defence:  35
-Special Attack:  50
-Special Defence:  100
-Speed:  70
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         40
+        defense:         35
+ special-attack:         50
+special-defense:        100
+          speed:         70
+
+Pokedex ID: 72	Capture Rate: 190
+Base Exp: 67	Happiness: 50
+Height: 9	Weight: 455
+
+Genus: Jellyfish Pokémon
+Location Areas:
+canalave-city-area
+pastoria-city-area
+sunyshore-city-area
+valley-windworks-area
+fuego-ironworks-area
+iron-island-area
+sinnoh-route-205-south-towards-floaroma-town
+sinnoh-route-212-east-towards-pastoria-city
+sinnoh-route-213-area
+sinnoh-route-218-area
+sinnoh-route-219-area
+sinnoh-route-221-area
+sinnoh-route-222-area
+sinnoh-sea-route-220-area
+new-bark-town-area
+cherrygrove-city-area
+johto-route-32-area
+union-cave-b2f
+johto-route-34-area
+olivine-city-area
+johto-sea-route-40-area
+johto-sea-route-41-area
+whirl-islands-1f
+cianwood-city-area
+johto-route-47-area
+seafoam-islands-b3f
+seafoam-islands-b4f
+kanto-route-12-area
+kanto-sea-route-19-area
+kanto-sea-route-20-area
+cinnabar-island-area
+viridian-city-area
+cerulean-city-area
+vermilion-city-area
+pallet-town-area
+kanto-route-26-area
+kanto-route-27-area
+kanto-route-4-area
+kanto-route-10-area
+kanto-route-11-area
+kanto-route-13-area
+kanto-route-17-area
+kanto-route-18-area
+kanto-sea-route-21-area
+kanto-route-24-area
+vermilion-city-ss-anne-dock
+slateport-city-area
+lilycove-city-area
+mossdeep-city-area
+sootopolis-city-area
+ever-grande-city-area
+seafloor-cavern-area
+shoal-cave-area
+abandoned-ship-area
+hoenn-route-103-area
+hoenn-route-105-area
+hoenn-route-106-area
+hoenn-route-107-area
+hoenn-route-108-area
+hoenn-route-109-area
+hoenn-route-110-area
+hoenn-route-115-area
+hoenn-route-118-area
+hoenn-route-119-area
+hoenn-route-121-area
+hoenn-route-122-area
+hoenn-route-123-area
+hoenn-route-124-area
+hoenn-route-125-area
+hoenn-route-126-area
+hoenn-route-127-area
+hoenn-route-128-area
+hoenn-route-129-area
+hoenn-route-130-area
+hoenn-route-131-area
+hoenn-route-132-area
+hoenn-route-133-area
+hoenn-route-134-area
+dewford-town-area
+pacifidlog-town-area
+ss-anne-area
+icefall-cave-waterfall
+kindle-road-area
+treasure-beach-area
+bond-bridge-area
+resort-gorgeous-area
+water-labyrinth-area
+five-isle-meadow-area
+memorial-pillar-area
+outcast-island-area
+green-path-area
+water-path-area
+trainer-tower-area
+tanoby-ruins-area
+one-island-area
+five-island-area
+ambrette-town-area
+cyllage-city-area
+shalour-city-area
+kalos-route-8-area
+kalos-route-12-area
+azure-bay-area
+cianwood-city-pokemon-center
diff --git a/pokeData/tentacruel b/pokeData/tentacruel
index 732f776..f7c03e4 100644
--- a/pokeData/tentacruel
+++ b/pokeData/tentacruel
@@ -1,15 +1,81 @@
+tentacruel	A water type Pokémon
 
-Name:  Tentacruel
-Pokedex Number:  073
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Clear Body - Liquid Ooze - Rain Dish (Hidden Ability)
+TENTACRUEL has tentacles that can be
+freely elongated and shortened at will.
+It ensnares prey with its tentacles andweakens the prey by dosing it with a
+harsh toxin. It can catch up to 80
+prey at the same time.
 
-Base Stats
-----------------------
-Total: 515
-Hp:  80
-Attack:  70
-Defence:  65
-Special Attack:  80
-Special Defence:  120
-Speed:  100
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:         70
+        defense:         65
+ special-attack:         80
+special-defense:        120
+          speed:        100
+
+Pokedex ID: 73	Capture Rate: 60
+Base Exp: 180	Happiness: 50
+Height: 16	Weight: 550
+
+Genus: Jellyfish Pokémon
+Location Areas:
+canalave-city-area
+pastoria-city-area
+sunyshore-city-area
+sinnoh-pokemon-league-area
+valley-windworks-area
+fuego-ironworks-area
+iron-island-area
+sinnoh-route-205-south-towards-floaroma-town
+sinnoh-route-212-east-towards-pastoria-city
+sinnoh-route-213-area
+sinnoh-route-218-area
+sinnoh-route-219-area
+sinnoh-route-221-area
+sinnoh-route-222-area
+sinnoh-route-224-area
+sinnoh-sea-route-220-area
+sinnoh-sea-route-223-area
+sinnoh-sea-route-226-area
+sinnoh-sea-route-230-area
+new-bark-town-area
+cherrygrove-city-area
+johto-route-32-area
+union-cave-b2f
+johto-route-34-area
+olivine-city-area
+johto-sea-route-40-area
+johto-sea-route-41-area
+whirl-islands-1f
+whirl-islands-b2f
+whirl-islands-b3f
+cianwood-city-area
+johto-route-47-area
+kanto-route-12-area
+kanto-sea-route-19-area
+kanto-sea-route-20-area
+cinnabar-island-area
+vermilion-city-area
+pallet-town-area
+kanto-route-26-area
+kanto-route-27-area
+kanto-route-13-area
+kanto-sea-route-21-area
+vermilion-city-ss-anne-dock
+abandoned-ship-area
+icefall-cave-waterfall
+kindle-road-area
+treasure-beach-area
+bond-bridge-area
+resort-gorgeous-area
+water-labyrinth-area
+five-isle-meadow-area
+memorial-pillar-area
+outcast-island-area
+green-path-area
+water-path-area
+trainer-tower-area
+tanoby-ruins-area
+one-island-area
+five-island-area
diff --git a/pokeData/tepig b/pokeData/tepig
index cc35292..479bc34 100644
--- a/pokeData/tepig
+++ b/pokeData/tepig
@@ -1,15 +1,23 @@
+tepig	A fire type Pokémon
 
-Name:  Tepig
-Pokedex Number:  498
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Blaze - Thick Fat (Hidden Ability)
+적의 공격을 가볍게 피하고
+코로 불구슬을 쏘아댄다.
+불꽃으로 나무열매를 구워 먹는다.
 
-Base Stats
-----------------------
-Total: 308
-Hp:  65
-Attack:  63
-Defence:  45
-Special Attack:  45
-Special Defence:  45
-Speed:  45
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         63
+        defense:         45
+ special-attack:         45
+special-defense:         45
+          speed:         45
+
+Pokedex ID: 498	Capture Rate: 45
+Base Exp: 62	Happiness: 70
+Height: 5	Weight: 99
+
+Genus: Fire Pig Pokémon
+Location Areas:
+hoenn-route-101-area
+aspertia-city-area
+nuvema-town-area
diff --git a/pokeData/terrakion b/pokeData/terrakion
index 01013ff..e7c8726 100644
--- a/pokeData/terrakion
+++ b/pokeData/terrakion
@@ -1,15 +1,21 @@
+terrakion	A rock type Pokémon
 
-Name:  Terrakion
-Pokedex Number:  639
-Gender Ratio:  Genderless
-Abilities: Justified
+거대한 성벽을 일격에
+돌파할 만한 돌진력을 가졌다.
+전설로 전해지는 포켓몬이다.
+
+   ↞--------| STATS |--------↠ 
+             hp:         91
+         attack:        129
+        defense:         90
+ special-attack:         72
+special-defense:         90
+          speed:        108
+
+Pokedex ID: 639	Capture Rate: 3
+Base Exp: 290	Happiness: 35
+Height: 19	Weight: 2600
+
+Genus: Cavern Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 580
-Hp:  91
-Attack:  129
-Defence:  90
-Special Attack:  72
-Special Defence:  90
-Speed:  108
diff --git a/pokeData/thievul b/pokeData/thievul
index 5daa637..0beff24 100644
--- a/pokeData/thievul
+++ b/pokeData/thievul
@@ -1,15 +1,21 @@
+thievul	A dark type Pokémon
 
-Name:  Thievul
-Pokedex Number:  828
-Gender Ratio:   ♂:50.2% ♀:49.8%
-Abilities: Run Away - Unburden - Stakeout (Hidden Ability)
+It secretly marks potential targets with a scent.
+By following the scent, it stalks its targets
+and steals from them when they least expect it.
+
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         58
+        defense:         58
+ special-attack:         87
+special-defense:         92
+          speed:         90
+
+Pokedex ID: 828	Capture Rate: 127
+Base Exp: 159	Happiness: 50
+Height: 12	Weight: 199
+
+Genus: Fox Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 455
-Hp:  70
-Attack:  58
-Defence:  58
-Special Attack:  87
-Special Defence:  92
-Speed:  90
diff --git a/pokeData/throh b/pokeData/throh
index e93cdd5..edb5502 100644
--- a/pokeData/throh
+++ b/pokeData/throh
@@ -1,15 +1,28 @@
+throh	A fighting type Pokémon
 
-Name:  Throh
-Pokedex Number:  538
-Gender Ratio:   ♂:100% ♀:0%
-Abilities: Guts - Inner Focus - Mold Breaker (Hidden Ability)
+끈을 매면 파워가 올라간다.
+야생 던지미는 덩굴풀을 엮어
+자신의 띠를 만든다.
 
-Base Stats
-----------------------
-Total: 465
-Hp:  120
-Attack:  100
-Defence:  85
-Special Attack:  30
-Special Defence:  85
-Speed:  45
+   ↞--------| STATS |--------↠ 
+             hp:        120
+         attack:        100
+        defense:         85
+ special-attack:         30
+special-defense:         85
+          speed:         45
+
+Pokedex ID: 538	Capture Rate: 45
+Base Exp: 163	Happiness: 50
+Height: 13	Weight: 555
+
+Genus: Judo Pokémon
+Location Areas:
+pinwheel-forest-outside
+unova-route-10-area
+unova-route-10-victory-road-gate
+unova-route-15-area
+unova-route-18-area
+unova-victory-road-2-unknown-area-76
+unova-route-23-area
+kalos-route-11-area
diff --git a/pokeData/thundurus b/pokeData/thundurus
index a134b3a..73aa5cd 100644
--- a/pokeData/thundurus
+++ b/pokeData/thundurus
@@ -1,15 +1,15 @@
+	A  type Pokémon
 
-Name:  Thundurus
-Pokedex Number:  642
-Gender Ratio:   ♂:100% ♀:0% 
-Abilities: Prankster - Defiant (Hidden) (Incarnate Forme) - Volt Absorb (Therian Forme
+꼬리의 가시에서 전격을
+날린다. 하나지방의 하늘을
+날아다니며 번개를 내리친다.
+
+   ↞--------| STATS |--------↠ 
+
+Pokedex ID: 	Capture Rate: 3
+Base Exp: 	Happiness: 90
+Height: 	Weight: 
+
+Genus: Bolt Strike Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 580
-Hp:  79
-Attack:  105
-Defence:  70
-Special Attack:  145
-Special Defence:  80
-Speed:  101
diff --git a/pokeData/thwackey b/pokeData/thwackey
index d800d52..d345ede 100644
--- a/pokeData/thwackey
+++ b/pokeData/thwackey
@@ -1,15 +1,21 @@
+thwackey	A grass type Pokémon
 
-Name:  Thwackey
-Pokedex Number:  811
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Overgrow - Grassy Surge (Hidden Ability)
+The faster a Thwackey can beat out a rhythm
+with its two sticks, the more respect it wins from
+its peers.
+
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         85
+        defense:         70
+ special-attack:         55
+special-defense:         60
+          speed:         80
+
+Pokedex ID: 811	Capture Rate: 45
+Base Exp: 147	Happiness: 50
+Height: 7	Weight: 140
+
+Genus: Beat Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 420
-Hp:  70
-Attack:  85
-Defence:  70
-Special Attack:  55
-Special Defence:  60
-Speed:  80
diff --git a/pokeData/timburr b/pokeData/timburr
index a478c62..17f1e41 100644
--- a/pokeData/timburr
+++ b/pokeData/timburr
@@ -1,15 +1,23 @@
+timburr	A fighting type Pokémon
 
-Name:  Timburr
-Pokedex Number:  532
-Gender Ratio:   ♂:75% ♀:25%
-Abilities: Guts - Sheer Force - Iron Fist (Hidden Ability)
+항상 각목을 끼고 있다.
+건설 현장에 나타나
+공사를 도와주는 포켓몬이다.
 
-Base Stats
-----------------------
-Total: 305
-Hp:  75
-Attack:  80
-Defence:  55
-Special Attack:  25
-Special Defence:  35
-Speed:  35
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:         80
+        defense:         55
+ special-attack:         25
+special-defense:         35
+          speed:         35
+
+Pokedex ID: 532	Capture Rate: 180
+Base Exp: 61	Happiness: 70
+Height: 6	Weight: 125
+
+Genus: Muscular Pokémon
+Location Areas:
+pinwheel-forest-outside
+cold-storage-area
+relic-passage-castelia-sewers-entrance
diff --git a/pokeData/tirtouga b/pokeData/tirtouga
index 4cfeab3..5342cbd 100644
--- a/pokeData/tirtouga
+++ b/pokeData/tirtouga
@@ -1,15 +1,21 @@
+tirtouga	A water type Pokémon
 
-Name:  Tirtouga
-Pokedex Number:  564
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Solid Rock - Sturdy - Swift Swim (Hidden Ability)
+약 1억 년 전 바다를
+헤엄쳐 다녔다. 육지에 올라
+먹이를 덮치는 일도 있다.
+
+   ↞--------| STATS |--------↠ 
+             hp:         54
+         attack:         78
+        defense:        103
+ special-attack:         53
+special-defense:         45
+          speed:         22
+
+Pokedex ID: 564	Capture Rate: 45
+Base Exp: 71	Happiness: 50
+Height: 7	Weight: 165
+
+Genus: Prototurtle Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 355
-Hp:  54
-Attack:  78
-Defence:  103
-Special Attack:  53
-Special Defence:  45
-Speed:  22
diff --git a/pokeData/togedemaru b/pokeData/togedemaru
index c10972c..2128962 100644
--- a/pokeData/togedemaru
+++ b/pokeData/togedemaru
@@ -1,15 +1,21 @@
+togedemaru	A electric type Pokémon
 
-Name:  Togedemaru
-Pokedex Number:  777
-Gender Ratio:   ♂:50.2% ♀:49.8% 
-Abilities: Iron Barbs - Lightning Rod - Sturdy (Hidden Ability)
+The spiny fur on its back is normally at rest.
+When this Pokémon becomes agitated, its fur
+stands on end and stabs into its attackers.
+
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         98
+        defense:         63
+ special-attack:         40
+special-defense:         73
+          speed:         96
+
+Pokedex ID: 777	Capture Rate: 180
+Base Exp: 152	Happiness: 50
+Height: 3	Weight: 33
+
+Genus: Roly-Poly Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 435
-Hp:  65
-Attack:  98
-Defence:  63
-Special Attack:  40
-Special Defence:  73
-Speed:  96
diff --git a/pokeData/togekiss b/pokeData/togekiss
index bec8926..fc536b7 100644
--- a/pokeData/togekiss
+++ b/pokeData/togekiss
@@ -1,15 +1,21 @@
+togekiss	A fairy type Pokémon
 
-Name:  Togekiss
-Pokedex Number:  468
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Hustle - Serene Grace - Super Luck (Hidden Ability)
+It shares many blessings with
+people who respect one another’s
+rights and avoid needless strife.
+
+   ↞--------| STATS |--------↠ 
+             hp:         85
+         attack:         50
+        defense:         95
+ special-attack:        120
+special-defense:        115
+          speed:         80
+
+Pokedex ID: 468	Capture Rate: 30
+Base Exp: 273	Happiness: 50
+Height: 15	Weight: 380
+
+Genus: Jubilee Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 545
-Hp:  85
-Attack:  50
-Defence:  95
-Special Attack:  120
-Special Defence:  115
-Speed:  80
diff --git a/pokeData/togepi b/pokeData/togepi
index 420735c..b9e145d 100644
--- a/pokeData/togepi
+++ b/pokeData/togepi
@@ -1,15 +1,26 @@
+togepi	A fairy type Pokémon
 
-Name:  Togepi
-Pokedex Number:  175
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Hustle - Serene Grace - Super Luck (Hidden Ability)
+The shell seems to be filled with joy.
+It is said that it will share good luck
+when treated kindly.
 
-Base Stats
-----------------------
-Total: 245
-Hp:  35
-Attack:  20
-Defence:  65
-Special Attack:  40
-Special Defence:  65
-Speed:  20
+   ↞--------| STATS |--------↠ 
+             hp:         35
+         attack:         20
+        defense:         65
+ special-attack:         40
+special-defense:         65
+          speed:         20
+
+Pokedex ID: 175	Capture Rate: 190
+Base Exp: 49	Happiness: 50
+Height: 3	Weight: 15
+
+Genus: Spike Ball Pokémon
+Location Areas:
+sinnoh-sea-route-230-area
+violet-city-area
+water-labyrinth-area
+lavaridge-town-area
+eterna-city-west-gate
+violet-city-poke-mart
diff --git a/pokeData/togetic b/pokeData/togetic
index 766c4b5..fbda0a2 100644
--- a/pokeData/togetic
+++ b/pokeData/togetic
@@ -1,15 +1,21 @@
+togetic	A fairy type Pokémon
 
-Name:  Togetic
-Pokedex Number:  176
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Hustle - Serene Grace - Super Luck (Hidden Ability)
+They say that it will appear before
+kindhearted, caring people and shower
+them with happiness.
+
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         40
+        defense:         85
+ special-attack:         80
+special-defense:        105
+          speed:         40
+
+Pokedex ID: 176	Capture Rate: 75
+Base Exp: 142	Happiness: 50
+Height: 6	Weight: 32
+
+Genus: Happiness Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 405
-Hp:  55
-Attack:  40
-Defence:  85
-Special Attack:  80
-Special Defence:  105
-Speed:  40
diff --git a/pokeData/torchic b/pokeData/torchic
index 9a09ae8..8d39023 100644
--- a/pokeData/torchic
+++ b/pokeData/torchic
@@ -1,15 +1,22 @@
+torchic	A fire type Pokémon
 
-Name:  Torchic
-Pokedex Number:  255
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Blaze - Speed Boost (Hidden Ability)
+A fire burns inside, so it feels
+very warm to hug. It launches
+fireballs of 1,800 degrees F.
 
-Base Stats
-----------------------
-Total: 310
-Hp:  45
-Attack:  60
-Defence:  40
-Special Attack:  70
-Special Defence:  50
-Speed:  45
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         60
+        defense:         40
+ special-attack:         70
+special-defense:         50
+          speed:         45
+
+Pokedex ID: 255	Capture Rate: 45
+Base Exp: 62	Happiness: 50
+Height: 4	Weight: 25
+
+Genus: Chick Pokémon
+Location Areas:
+hoenn-route-101-area
+saffron-city-silph-co
diff --git a/pokeData/torkoal b/pokeData/torkoal
index b25bc07..f92d7f2 100644
--- a/pokeData/torkoal
+++ b/pokeData/torkoal
@@ -1,15 +1,25 @@
+torkoal	A fire type Pokémon
 
-Name:  Torkoal
-Pokedex Number:  324
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: White Smoke - Shell Armor (Hidden Ability)
+It burns coal inside its shell for
+energy. It blows out black soot if
+it is endangered.
 
-Base Stats
-----------------------
-Total: 470
-Hp:  70
-Attack:  85
-Defence:  140
-Special Attack:  85
-Special Defence:  70
-Speed:  20
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         85
+        defense:        140
+ special-attack:         85
+special-defense:         70
+          speed:         20
+
+Pokedex ID: 324	Capture Rate: 90
+Base Exp: 165	Happiness: 50
+Height: 5	Weight: 804
+
+Genus: Coal Pokémon
+Location Areas:
+stark-mountain-area
+sinnoh-route-227-area
+fiery-path-area
+magma-hideout-area
+kalos-route-18-area
diff --git a/pokeData/tornadus b/pokeData/tornadus
index ce22c12..e9ef9f3 100644
--- a/pokeData/tornadus
+++ b/pokeData/tornadus
@@ -1,15 +1,15 @@
+	A  type Pokémon
 
-Name:  Tornadus
-Pokedex Number:  641
-Gender Ratio:   ♂:100% ♀:0%
-Abilities: Prankster - Defiant (Hidden) (Incarnate Forme) - Regenerator (Therian Forme
+구름처럼 생긴 에너지체에
+하반신이 둘러싸여 있다.
+시속 300km로 하늘을 난다.
+
+   ↞--------| STATS |--------↠ 
+
+Pokedex ID: 	Capture Rate: 3
+Base Exp: 	Happiness: 90
+Height: 	Weight: 
+
+Genus: Cyclone Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 580
-Hp:  79
-Attack:  100
-Defence:  80
-Special Attack:  110
-Special Defence:  90
-Speed:  121
diff --git a/pokeData/torracat b/pokeData/torracat
index 821e0e2..c018c18 100644
--- a/pokeData/torracat
+++ b/pokeData/torracat
@@ -1,15 +1,20 @@
+torracat	A fire type Pokémon
 
-Name:  Torracat
-Pokedex Number:  726
-Gender Ratio:   ♂:88.14% ♀:11.86%
-Abilities: Blaze - Intimidate (Hidden Ability)
+At its throat, it bears a bell of fire. The bell rings
+brightly whenever this Pokémon spits fire.
+
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         85
+        defense:         50
+ special-attack:         80
+special-defense:         50
+          speed:         90
+
+Pokedex ID: 726	Capture Rate: 45
+Base Exp: 147	Happiness: 50
+Height: 7	Weight: 250
+
+Genus: Fire Cat Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 420
-Hp:  65
-Attack:  85
-Defence:  50
-Special Attack:  80
-Special Defence:  50
-Speed:  90
diff --git a/pokeData/torterra b/pokeData/torterra
index 91231b8..1266006 100644
--- a/pokeData/torterra
+++ b/pokeData/torterra
@@ -1,15 +1,21 @@
+torterra	A grass type Pokémon
 
-Name:  Torterra
-Pokedex Number:  389
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Overgrow - Shell Armor (Hidden Ability)
+Certains petits Pokémon peuvent
+naître sur son dos et y passer
+toute leur vie.
+
+   ↞--------| STATS |--------↠ 
+             hp:         95
+         attack:        109
+        defense:        105
+ special-attack:         75
+special-defense:         85
+          speed:         56
+
+Pokedex ID: 389	Capture Rate: 45
+Base Exp: 236	Happiness: 70
+Height: 22	Weight: 3100
+
+Genus: Continent Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 525
-Hp:  95
-Attack:  109
-Defence:  105
-Special Attack:  75
-Special Defence:  85
-Speed:  56
diff --git a/pokeData/totodile b/pokeData/totodile
index 65ff59c..d1ffec7 100644
--- a/pokeData/totodile
+++ b/pokeData/totodile
@@ -1,15 +1,23 @@
+totodile	A water type Pokémon
 
-Name:  Totodile
-Pokedex Number:  158
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Torrent - Sheer Force (Hidden Ability)
+Its well-developed jaws are powerful and
+capable of crushing anything. Even its
+TRAINER must be careful.
 
-Base Stats
-----------------------
-Total: 314
-Hp:  50
-Attack:  65
-Defence:  64
-Special Attack:  44
-Special Defence:  48
-Speed:  43
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         65
+        defense:         64
+ special-attack:         44
+special-defense:         48
+          speed:         43
+
+Pokedex ID: 158	Capture Rate: 45
+Base Exp: 63	Happiness: 70
+Height: 6	Weight: 95
+
+Genus: Big Jaw Pokémon
+Location Areas:
+new-bark-town-area
+hoenn-route-101-area
+littleroot-town-area
diff --git a/pokeData/toucannon b/pokeData/toucannon
index 069cf6d..9cfd308 100644
--- a/pokeData/toucannon
+++ b/pokeData/toucannon
@@ -1 +1,21 @@
-	Stats currently unavailable :( 
+toucannon	A normal type Pokémon
+
+When it battles, its beak heats up. The
+temperature can easily exceed 212 degrees
+Fahrenheit, causing severe burns when it hits.
+
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:        120
+        defense:         75
+ special-attack:         75
+special-defense:         75
+          speed:         60
+
+Pokedex ID: 733	Capture Rate: 45
+Base Exp: 218	Happiness: 70
+Height: 11	Weight: 260
+
+Genus: Cannon Pokémon
+Location Areas:
+
diff --git a/pokeData/toxapex b/pokeData/toxapex
index be94450..709333e 100644
--- a/pokeData/toxapex
+++ b/pokeData/toxapex
@@ -1,15 +1,21 @@
+toxapex	A poison type Pokémon
 
-Name:  Toxapex
-Pokedex Number:  748
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Merciless - Limber - Regenerator (Hidden Ability)
+Toxapex crawls along the ocean floor on its
+12 legs. It leaves a trail of Corsola bits
+scattered in its wake.
+
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         63
+        defense:        152
+ special-attack:         53
+special-defense:        142
+          speed:         35
+
+Pokedex ID: 748	Capture Rate: 75
+Base Exp: 173	Happiness: 50
+Height: 7	Weight: 145
+
+Genus: Brutal Star Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 495
-Hp:  50
-Attack:  63
-Defence:  152
-Special Attack:  53
-Special Defence:  142
-Speed:  35
diff --git a/pokeData/toxel b/pokeData/toxel
index ef03b1f..212b824 100644
--- a/pokeData/toxel
+++ b/pokeData/toxel
@@ -1,15 +1,21 @@
+toxel	A electric type Pokémon
 
-Name:  Toxel
-Pokedex Number:  848
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Rattled - Static - Klutz (Hidden Ability)
+It stores poison in an internal poison sac and
+secretes that poison through its skin. If you touch
+this Pokémon, a tingling sensation follows.
+
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         38
+        defense:         35
+ special-attack:         54
+special-defense:         35
+          speed:         40
+
+Pokedex ID: 848	Capture Rate: 75
+Base Exp: 48	Happiness: 50
+Height: 4	Weight: 110
+
+Genus: Baby Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 242
-Hp:  40
-Attack:  38
-Defence:  35
-Special Attack:  54
-Special Defence:  35
-Speed:  40
diff --git a/pokeData/toxicroak b/pokeData/toxicroak
index f21a95e..5e785ff 100644
--- a/pokeData/toxicroak
+++ b/pokeData/toxicroak
@@ -1,15 +1,21 @@
+toxicroak	A poison type Pokémon
 
-Name:  Toxicroak
-Pokedex Number:  454
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Anticipation - Dry Skin - Poison Touch (Hidden Ability)
+Quand il coasse, le poison stocké
+sous sa gorge est secoué, le
+rendant ainsi plus efficace.
 
-Base Stats
-----------------------
-Total: 490
-Hp:  83
-Attack:  106
-Defence:  65
-Special Attack:  86
-Special Defence:  65
-Speed:  85
+   ↞--------| STATS |--------↠ 
+             hp:         83
+         attack:        106
+        defense:         65
+ special-attack:         86
+special-defense:         65
+          speed:         85
+
+Pokedex ID: 454	Capture Rate: 75
+Base Exp: 172	Happiness: 50
+Height: 13	Weight: 444
+
+Genus: Toxic Mouth Pokémon
+Location Areas:
+pinwheel-forest-outside
diff --git a/pokeData/toxtricity b/pokeData/toxtricity
index 56b8965..46dee2b 100644
--- a/pokeData/toxtricity
+++ b/pokeData/toxtricity
@@ -1,15 +1,15 @@
+	A  type Pokémon
 
-Name:  Toxtricity
-Pokedex Number:  849
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Punk Rock - Plus - Technician (Hidden) (Amped Form) - Punk Rock- Minus - Technician (Hidden)  (Low Key Form
+When this Pokémon sounds as if it’s strumming a
+guitar, it’s actually clawing at the protrusions on
+its chest to generate electricity.
+
+   ↞--------| STATS |--------↠ 
+
+Pokedex ID: 	Capture Rate: 45
+Base Exp: 	Happiness: 50
+Height: 	Weight: 
+
+Genus: Punk Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 502
-Hp:  75
-Attack:  98
-Defence:  70
-Special Attack:  114
-Special Defence:  70
-Speed:  75
diff --git a/pokeData/tranquill b/pokeData/tranquill
index 052f919..c0eebb2 100644
--- a/pokeData/tranquill
+++ b/pokeData/tranquill
@@ -1,15 +1,30 @@
+tranquill	A normal type Pokémon
 
-Name:  Tranquill
-Pokedex Number:  520
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Big Pecks - Super Luck - Rivalry (Hidden Ability)
+유토브가 사는 숲 속에는
+싸움이 없는 평화로운 나라가
+있다고 믿어진다.
 
-Base Stats
-----------------------
-Total: 358
-Hp:  62
-Attack:  77
-Defence:  62
-Special Attack:  50
-Special Defence:  42
-Speed:  65
+   ↞--------| STATS |--------↠ 
+             hp:         62
+         attack:         77
+        defense:         62
+ special-attack:         50
+special-defense:         42
+          speed:         65
+
+Pokedex ID: 520	Capture Rate: 120
+Base Exp: 125	Happiness: 50
+Height: 6	Weight: 150
+
+Genus: Wild Pigeon Pokémon
+Location Areas:
+pinwheel-forest-inside
+dragonspiral-tower-entrance
+dragonspiral-tower-outside
+unova-route-3-area
+unova-route-6-area
+unova-route-7-area
+unova-route-12-area
+lostlorn-forest-area
+unova-victory-road-2-unknown-area-73
+unova-victory-road-2-unknown-area-79
diff --git a/pokeData/trapinch b/pokeData/trapinch
index ee59ee1..a7238ae 100644
--- a/pokeData/trapinch
+++ b/pokeData/trapinch
@@ -1,15 +1,26 @@
+trapinch	A ground type Pokémon
 
-Name:  Trapinch
-Pokedex Number:  328
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Hyper Cutter - Arena Trap - Sheer Force (Hidden Ability)
+It makes a conical pit in desert
+sand and lies in wait at the bottom
+for prey to come tumbling down.
 
-Base Stats
-----------------------
-Total: 290
-Hp:  45
-Attack:  100
-Defence:  45
-Special Attack:  45
-Special Defence:  45
-Speed:  10
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:        100
+        defense:         45
+ special-attack:         45
+special-defense:         45
+          speed:         10
+
+Pokedex ID: 328	Capture Rate: 255
+Base Exp: 58	Happiness: 50
+Height: 7	Weight: 150
+
+Genus: Ant Pit Pokémon
+Location Areas:
+sinnoh-route-228-area
+hoenn-route-111-area
+mirage-tower-area
+desert-resort-area
+reversal-mountain-unknown-area-48
+kalos-route-13-area
diff --git a/pokeData/treecko b/pokeData/treecko
index 757305f..079c330 100644
--- a/pokeData/treecko
+++ b/pokeData/treecko
@@ -1,15 +1,22 @@
+treecko	A grass type Pokémon
 
-Name:  Treecko
-Pokedex Number:  252
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Overgrow - Unburden (Hidden Ability)
+The soles of its feet are covered
+by countless tiny spikes, enabling
+it to walk on walls and ceilings.
 
-Base Stats
-----------------------
-Total: 310
-Hp:  40
-Attack:  45
-Defence:  35
-Special Attack:  65
-Special Defence:  55
-Speed:  70
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         45
+        defense:         35
+ special-attack:         65
+special-defense:         55
+          speed:         70
+
+Pokedex ID: 252	Capture Rate: 45
+Base Exp: 62	Happiness: 50
+Height: 5	Weight: 50
+
+Genus: Wood Gecko Pokémon
+Location Areas:
+hoenn-route-101-area
+saffron-city-silph-co
diff --git a/pokeData/trevenant b/pokeData/trevenant
index 5c746d8..55cffe0 100644
--- a/pokeData/trevenant
+++ b/pokeData/trevenant
@@ -1,15 +1,21 @@
+trevenant	A ghost type Pokémon
 
-Name:  Trevenant
-Pokedex Number:  709
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Natural Cure - Frisk - Harvest (Hidden Ability)
+ほかの　木々を　自在に　操る。
+森を　荒らす　人間は　死ぬまで
+森から　出られないようにするのだ。
 
-Base Stats
-----------------------
-Total: 474
-Hp:  85
-Attack:  110
-Defence:  76
-Special Attack:  65
-Special Defence:  82
-Speed:  56
+   ↞--------| STATS |--------↠ 
+             hp:         85
+         attack:        110
+        defense:         76
+ special-attack:         65
+special-defense:         82
+          speed:         56
+
+Pokedex ID: 709	Capture Rate: 60
+Base Exp: 166	Happiness: 50
+Height: 15	Weight: 710
+
+Genus: Elder Tree Pokémon
+Location Areas:
+kalos-route-20-area
diff --git a/pokeData/tropius b/pokeData/tropius
index 476f09d..78e3264 100644
--- a/pokeData/tropius
+++ b/pokeData/tropius
@@ -1,15 +1,25 @@
+tropius	A grass type Pokémon
 
-Name:  Tropius
-Pokedex Number:  357
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Chlorophyll - Solar Power - Harvest (Hidden Ability)
+Because it continually ate only
+its favorite fruit, the fruit
+started growing around its neck.
 
-Base Stats
-----------------------
-Total: 460
-Hp:  99
-Attack:  68
-Defence:  83
-Special Attack:  72
-Special Defence:  87
-Speed:  51
+   ↞--------| STATS |--------↠ 
+             hp:         99
+         attack:         68
+        defense:         83
+ special-attack:         72
+special-defense:         87
+          speed:         51
+
+Pokedex ID: 357	Capture Rate: 200
+Base Exp: 161	Happiness: 70
+Height: 20	Weight: 1000
+
+Genus: Fruit Pokémon
+Location Areas:
+great-marsh-area-1
+great-marsh-area-2
+hoenn-route-119-area
+unova-route-14-area
+unova-route-18-area
diff --git a/pokeData/trubbish b/pokeData/trubbish
index 0bdacb1..d551f4f 100644
--- a/pokeData/trubbish
+++ b/pokeData/trubbish
@@ -1,15 +1,23 @@
+trubbish	A poison type Pokémon
 
-Name:  Trubbish
-Pokedex Number:  568
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Stench - Sticky Hold - Aftermath (Hidden Ability)
+쓰레기 봉지가 산업 폐기물과
+화학적 변화를 일으켜서
+포켓몬으로 다시 태어났다.
 
-Base Stats
-----------------------
-Total: 329
-Hp:  50
-Attack:  50
-Defence:  62
-Special Attack:  40
-Special Defence:  62
-Speed:  65
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         50
+        defense:         62
+ special-attack:         40
+special-defense:         62
+          speed:         65
+
+Pokedex ID: 568	Capture Rate: 190
+Base Exp: 66	Happiness: 50
+Height: 6	Weight: 310
+
+Genus: Trash Bag Pokémon
+Location Areas:
+unova-route-4-area
+unova-route-5-area
+unova-route-16-area
diff --git a/pokeData/trumbeak b/pokeData/trumbeak
index 069cf6d..3036cab 100644
--- a/pokeData/trumbeak
+++ b/pokeData/trumbeak
@@ -1 +1,21 @@
-	Stats currently unavailable :( 
+trumbeak	A normal type Pokémon
+
+It eats berries and stores their seeds in its
+beak. When it encounters enemies or prey,
+it fires off all the seeds in a burst.
+
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         85
+        defense:         50
+ special-attack:         40
+special-defense:         50
+          speed:         75
+
+Pokedex ID: 732	Capture Rate: 120
+Base Exp: 124	Happiness: 70
+Height: 6	Weight: 148
+
+Genus: Bugle Beak Pokémon
+Location Areas:
+
diff --git a/pokeData/tsareena b/pokeData/tsareena
index e20030f..90b199f 100644
--- a/pokeData/tsareena
+++ b/pokeData/tsareena
@@ -1,15 +1,21 @@
+tsareena	A grass type Pokémon
 
-Name:  Tsareena
-Pokedex Number:  763
-Gender Ratio:   ♂:0% ♀:100%
-Abilities: Leaf Guard - Queenly Majesty - Sweet Veil (Hidden Ability)
+Its long, striking legs aren’t just for show but to
+be used to kick with skill. In victory, it shows off
+by kicking the defeated, laughing boisterously.
+
+   ↞--------| STATS |--------↠ 
+             hp:         72
+         attack:        120
+        defense:         98
+ special-attack:         50
+special-defense:         98
+          speed:         72
+
+Pokedex ID: 763	Capture Rate: 45
+Base Exp: 255	Happiness: 50
+Height: 12	Weight: 214
+
+Genus: Fruit Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 510
-Hp:  72
-Attack:  120
-Defence:  98
-Special Attack:  50
-Special Defence:  98
-Speed:  72
diff --git a/pokeData/turtonator b/pokeData/turtonator
index b91b76a..3ef3f0e 100644
--- a/pokeData/turtonator
+++ b/pokeData/turtonator
@@ -1,15 +1,21 @@
+turtonator	A fire type Pokémon
 
-Name:  Turtonator
-Pokedex Number:  776
-Gender Ratio:   ♂:50.2% ♀:49.8% 
-Abilities: Shell Armor
+The shell on its back is chemically unstable
+and explodes violently if struck. The hole in its
+stomach is its weak point.
+
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         78
+        defense:        135
+ special-attack:         91
+special-defense:         85
+          speed:         36
+
+Pokedex ID: 776	Capture Rate: 70
+Base Exp: 170	Happiness: 50
+Height: 20	Weight: 2120
+
+Genus: Blast Turtle Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 485
-Hp:  60
-Attack:  78
-Defence:  135
-Special Attack:  91
-Special Defence:  85
-Speed:  36
diff --git a/pokeData/turtwig b/pokeData/turtwig
index abf21d7..0569ab4 100644
--- a/pokeData/turtwig
+++ b/pokeData/turtwig
@@ -1,15 +1,23 @@
+turtwig	A grass type Pokémon
 
-Name:  Turtwig
-Pokedex Number:  387
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Overgrow - Shell Armor (Hidden Ability)
+La coquille sur son dos est faite de
+terre. Plus il est en bonne santé,
+plus elle est humide.
 
-Base Stats
-----------------------
-Total: 318
-Hp:  55
-Attack:  68
-Defence:  64
-Special Attack:  45
-Special Defence:  55
-Speed:  31
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         68
+        defense:         64
+ special-attack:         45
+special-defense:         55
+          speed:         31
+
+Pokedex ID: 387	Capture Rate: 45
+Base Exp: 64	Happiness: 70
+Height: 4	Weight: 102
+
+Genus: Tiny Leaf Pokémon
+Location Areas:
+lake-verity-before-galactic-intervention
+sinnoh-route-201-area
+hoenn-route-101-area
diff --git a/pokeData/tympole b/pokeData/tympole
index 6fcf7c4..e2e9fa5 100644
--- a/pokeData/tympole
+++ b/pokeData/tympole
@@ -1,15 +1,21 @@
+tympole	A water type Pokémon
 
-Name:  Tympole
-Pokedex Number:  535
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Swift Swim - Hydration - Water Absorb (Hidden Ability)
+볼의 진동막을 떨어
+사람에게는 들리지 않는 음파를 내어
+동료에게 위험을 전달한다.
 
-Base Stats
-----------------------
-Total: 294
-Hp:  50
-Attack:  50
-Defence:  40
-Special Attack:  50
-Special Defence:  40
-Speed:  64
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         50
+        defense:         40
+ special-attack:         50
+special-defense:         40
+          speed:         64
+
+Pokedex ID: 535	Capture Rate: 255
+Base Exp: 59	Happiness: 50
+Height: 5	Weight: 45
+
+Genus: Tadpole Pokémon
+Location Areas:
+pinwheel-forest-outside
diff --git a/pokeData/tynamo b/pokeData/tynamo
index d8e2e15..3a4b750 100644
--- a/pokeData/tynamo
+++ b/pokeData/tynamo
@@ -1,15 +1,24 @@
+tynamo	A electric type Pokémon
 
-Name:  Tynamo
-Pokedex Number:  602
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Levitate
+한 마리의 전력은 적지만
+많은 저리어가 연결되면
+번개와 같은 위력이 된다.
 
-Base Stats
-----------------------
-Total: 275
-Hp:  35
-Attack:  55
-Defence:  40
-Special Attack:  45
-Special Defence:  40
-Speed:  60
+   ↞--------| STATS |--------↠ 
+             hp:         35
+         attack:         55
+        defense:         40
+ special-attack:         45
+special-defense:         40
+          speed:         60
+
+Pokedex ID: 602	Capture Rate: 190
+Base Exp: 55	Happiness: 70
+Height: 2	Weight: 3
+
+Genus: EleFish Pokémon
+Location Areas:
+chargestone-cave-1f
+chargestone-cave-b1f
+chargestone-cave-b2f
+seaside-cave-1f
diff --git a/pokeData/type-null b/pokeData/type-null
index befedc4..cb5cf2f 100644
--- a/pokeData/type-null
+++ b/pokeData/type-null
@@ -1 +1,21 @@
-You didn't enter a valid pokemon!
+type-null	A normal type Pokémon
+
+The heavy control mask it wears suppresses its
+intrinsic capabilities. This Pokémon has some
+hidden special power.
+
+   ↞--------| STATS |--------↠ 
+             hp:         95
+         attack:         95
+        defense:         95
+ special-attack:         95
+special-defense:         95
+          speed:         59
+
+Pokedex ID: 772	Capture Rate: 3
+Base Exp: 107	Happiness: 0
+Height: 19	Weight: 1205
+
+Genus: Synthetic Pokémon
+Location Areas:
+
diff --git a/pokeData/typhlosion b/pokeData/typhlosion
index 0e56d93..2147d24 100644
--- a/pokeData/typhlosion
+++ b/pokeData/typhlosion
@@ -1,15 +1,21 @@
+typhlosion	A fire type Pokémon
 
-Name:  Typhlosion
-Pokedex Number:  157
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Blaze - Flash Fire (Hidden Ability)
+If its rage peaks, it becomes so hot that
+anything that touches it will instantly go
+up in flames.
+
+   ↞--------| STATS |--------↠ 
+             hp:         78
+         attack:         84
+        defense:         78
+ special-attack:        109
+special-defense:         85
+          speed:        100
+
+Pokedex ID: 157	Capture Rate: 45
+Base Exp: 240	Happiness: 70
+Height: 17	Weight: 795
+
+Genus: Volcano Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 534
-Hp:  78
-Attack:  84
-Defence:  78
-Special Attack:  109
-Special Defence:  85
-Speed:  100
diff --git a/pokeData/tyranitar b/pokeData/tyranitar
index 4214848..438b9b6 100644
--- a/pokeData/tyranitar
+++ b/pokeData/tyranitar
@@ -1,15 +1,21 @@
+tyranitar	A rock type Pokémon
 
-Name:  Tyranitar
-Pokedex Number:  248
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Sand Stream - Unnerve (Hidden Ability)
+Its body can’t be harmed by any sort of
+attack, so it is very eager to make
+challenges against enemies.
 
-Base Stats
-----------------------
-Total: 600
-Hp:  100
-Attack:  164
-Defence:  150
-Special Attack:  95
-Special Defence:  120
-Speed:  71
+   ↞--------| STATS |--------↠ 
+             hp:        100
+         attack:        134
+        defense:        110
+ special-attack:         95
+special-defense:        100
+          speed:         61
+
+Pokedex ID: 248	Capture Rate: 45
+Base Exp: 300	Happiness: 35
+Height: 20	Weight: 2020
+
+Genus: Armor Pokémon
+Location Areas:
+unova-route-15-area
diff --git a/pokeData/tyrantrum b/pokeData/tyrantrum
index 17390b5..f0d3758 100644
--- a/pokeData/tyrantrum
+++ b/pokeData/tyrantrum
@@ -1,15 +1,21 @@
+tyrantrum	A rock type Pokémon
 
-Name:  Tyrantrum
-Pokedex Number:  697
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Strong Jaw - Rock Head (Hidden Ability)
+分厚い　鉄板を　紙のように
+かみちぎる　おおあごで　古代の
+世界では　無敵を　誇った。
+
+   ↞--------| STATS |--------↠ 
+             hp:         82
+         attack:        121
+        defense:        119
+ special-attack:         69
+special-defense:         59
+          speed:         71
+
+Pokedex ID: 697	Capture Rate: 45
+Base Exp: 182	Happiness: 50
+Height: 25	Weight: 2700
+
+Genus: Despot Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 521
-Hp:  82
-Attack:  121
-Defence:  119
-Special Attack:  69
-Special Defence:  59
-Speed:  71
diff --git a/pokeData/tyrogue b/pokeData/tyrogue
index 198ddaa..82055a5 100644
--- a/pokeData/tyrogue
+++ b/pokeData/tyrogue
@@ -1,15 +1,24 @@
+tyrogue	A fighting type Pokémon
 
-Name:  Tyrogue
-Pokedex Number:  236
-Gender Ratio:   ♂:100% ♀:0%
-Abilities: Guts - Steadfast - Vital Spirit (Hidden Ability)
+It is always bursting with energy. To make
+itself stronger, it keeps on fighting even
+if it loses.
 
-Base Stats
-----------------------
-Total: 210
-Hp:  35
-Attack:  35
-Defence:  35
-Special Attack:  35
-Special Defence:  35
-Speed:  35
+   ↞--------| STATS |--------↠ 
+             hp:         35
+         attack:         35
+        defense:         35
+ special-attack:         35
+special-defense:         35
+          speed:         35
+
+Pokedex ID: 236	Capture Rate: 75
+Base Exp: 42	Happiness: 50
+Height: 7	Weight: 210
+
+Genus: Scuffle Pokémon
+Location Areas:
+sinnoh-route-208-area
+sinnoh-route-211-west-towards-eterna-city
+johto-route-34-area
+mt-mortar-b1f
diff --git a/pokeData/tyrunt b/pokeData/tyrunt
index 8547bfc..fb7b2c0 100644
--- a/pokeData/tyrunt
+++ b/pokeData/tyrunt
@@ -1,15 +1,21 @@
+tyrunt	A rock type Pokémon
 
-Name:  Tyrunt
-Pokedex Number:  696
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Strong Jaw - Sturdy (Hidden Ability)
+化石から　復活した　ポケモン。
+気に入らない　ことが　あると
+かんしゃくを　起こして　大暴れ。
 
-Base Stats
-----------------------
-Total: 362
-Hp:  58
-Attack:  89
-Defence:  77
-Special Attack:  45
-Special Defence:  45
-Speed:  48
+   ↞--------| STATS |--------↠ 
+             hp:         58
+         attack:         89
+        defense:         77
+ special-attack:         45
+special-defense:         45
+          speed:         48
+
+Pokedex ID: 696	Capture Rate: 45
+Base Exp: 72	Happiness: 50
+Height: 8	Weight: 260
+
+Genus: Royal Heir Pokémon
+Location Areas:
+glittering-cave-unknown-area-303
diff --git a/pokeData/umbreon b/pokeData/umbreon
index 5828e13..8129772 100644
--- a/pokeData/umbreon
+++ b/pokeData/umbreon
@@ -1,15 +1,21 @@
+umbreon	A dark type Pokémon
 
-Name:  Umbreon
-Pokedex Number:  197
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Synchronize - Inner Focus (Hidden Ability)
+When agitated, this POKéMON protects
+itself by spraying poisonous sweat from its
+pores.
+
+   ↞--------| STATS |--------↠ 
+             hp:         95
+         attack:         65
+        defense:        110
+ special-attack:         60
+special-defense:        130
+          speed:         65
+
+Pokedex ID: 197	Capture Rate: 45
+Base Exp: 184	Happiness: 35
+Height: 10	Weight: 270
+
+Genus: Moonlight Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 525
-Hp:  95
-Attack:  65
-Defence:  110
-Special Attack:  60
-Special Defence:  130
-Speed:  65
diff --git a/pokeData/unfezant b/pokeData/unfezant
index cbf57e3..d60d4f1 100644
--- a/pokeData/unfezant
+++ b/pokeData/unfezant
@@ -1,15 +1,29 @@
+unfezant	A normal type Pokémon
 
-Name:  Unfezant
-Pokedex Number:  521
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Big Pecks - Super Luck - Rivalry (Hidden Ability)
+수컷은 머리의 장식을 흔들어서
+상대를 위협한다. 암컷의 비행
+능력은 수컷을 뛰어넘는다.
 
-Base Stats
-----------------------
-Total: 488
-Hp:  80
-Attack:  115
-Defence:  80
-Special Attack:  65
-Special Defence:  55
-Speed:  93
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:        115
+        defense:         80
+ special-attack:         65
+special-defense:         55
+          speed:         93
+
+Pokedex ID: 521	Capture Rate: 45
+Base Exp: 244	Happiness: 50
+Height: 12	Weight: 290
+
+Genus: Proud Pokémon
+Location Areas:
+dragonspiral-tower-entrance
+dragonspiral-tower-outside
+unova-route-3-area
+unova-route-6-area
+unova-route-7-area
+unova-route-12-area
+lostlorn-forest-area
+unova-victory-road-2-unknown-area-73
+unova-victory-road-2-unknown-area-79
diff --git a/pokeData/unown b/pokeData/unown
index 576b2e4..ff88b29 100644
--- a/pokeData/unown
+++ b/pokeData/unown
@@ -1,15 +1,49 @@
+unown	A psychic type Pokémon
 
-Name:  Unown
-Pokedex Number:  201
-Gender Ratio:  Genderless
-Abilities: Levitate
+Their shapes look like hieroglyphs on
+ancient tablets. It is said that the two
+are somehow related.
 
-Base Stats
-----------------------
-Total: 336
-Hp:  48
-Attack:  72
-Defence:  48
-Special Attack:  72
-Special Defence:  48
-Speed:  48
+   ↞--------| STATS |--------↠ 
+             hp:         48
+         attack:         72
+        defense:         48
+ special-attack:         72
+special-defense:         48
+          speed:         48
+
+Pokedex ID: 201	Capture Rate: 225
+Base Exp: 118	Happiness: 70
+Height: 5	Weight: 50
+
+Genus: Symbol Pokémon
+Location Areas:
+solaceon-ruins-2f
+solaceon-ruins-1f
+solaceon-ruins-b1f-a
+solaceon-ruins-b1f-b
+solaceon-ruins-b1f-c
+solaceon-ruins-b2f-a
+solaceon-ruins-b2f-b
+solaceon-ruins-b2f-c
+solaceon-ruins-b3f-a
+solaceon-ruins-b3f-b
+solaceon-ruins-b3f-c
+solaceon-ruins-b3f-d
+solaceon-ruins-b3f-e
+solaceon-ruins-b4f-a
+solaceon-ruins-b4f-b
+solaceon-ruins-b4f-c
+solaceon-ruins-b4f-d
+solaceon-ruins-b5f
+ruins-of-alph-interior-a
+ruins-of-alph-interior-b
+ruins-of-alph-interior-c
+ruins-of-alph-interior-d
+monean-chamber-area
+liptoo-chamber-area
+weepth-chamber-area
+dilford-chamber-area
+scufib-chamber-area
+rixy-chamber-area
+viapos-chamber-area
diff --git a/pokeData/ursaluna b/pokeData/ursaluna
index 4b0d19b..4cb666f 100644
--- a/pokeData/ursaluna
+++ b/pokeData/ursaluna
@@ -1,15 +1,19 @@
+ursaluna	A ground type Pokémon
 
-Name:  Ursaluna
-Pokedex Number:  901
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Guts - Bulletproof - Unnerve (Hidden Ability)
+                null
+
+   ↞--------| STATS |--------↠ 
+             hp:        130
+         attack:        140
+        defense:        105
+ special-attack:         45
+special-defense:         80
+          speed:         50
+
+Pokedex ID: 901	Capture Rate: 75
+Base Exp: null	Happiness: null
+Height: 24	Weight: 2900
+
+Genus: null
+Location Areas:
 
-Base Stats
-----------------------
-Total: 550
-Hp:  130
-Attack:  140
-Defence:  105
-Special Attack:  45
-Special Defence:  80
-Speed:  50
diff --git a/pokeData/ursaring b/pokeData/ursaring
index 63ce21f..43bd119 100644
--- a/pokeData/ursaring
+++ b/pokeData/ursaring
@@ -1,15 +1,38 @@
+ursaring	A normal type Pokémon
 
-Name:  Ursaring
-Pokedex Number:  217
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Guts - Quick Feet - Unnerve (Hidden Ability)
+Although it is a good climber, it prefers
+to snap stout trees with its forelegs and
+eat fallen BERRIES.
 
-Base Stats
-----------------------
-Total: 500
-Hp:  90
-Attack:  130
-Defence:  75
-Special Attack:  75
-Special Defence:  75
-Speed:  55
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:        130
+        defense:         75
+ special-attack:         75
+special-defense:         75
+          speed:         55
+
+Pokedex ID: 217	Capture Rate: 60
+Base Exp: 175	Happiness: 70
+Height: 18	Weight: 1258
+
+Genus: Hibernator Pokémon
+Location Areas:
+lake-acuity-area
+acuity-lakefront-area
+sinnoh-route-216-area
+sinnoh-route-217-area
+dark-cave-blackthorn-city-entrance
+mt-silver-2f
+mt-silver-1f-top
+mt-silver-4f
+mt-silver-outside
+mt-silver-1f
+mt-silver-mountainside
+mt-silver-3f
+mt-silver-top
+kanto-route-28-area
+kanto-victory-road-1-1f
+kanto-victory-road-1-2f
+kanto-victory-road-1-3f
+kalos-route-21-area
diff --git a/pokeData/urshifu b/pokeData/urshifu
index 203b45f..8a7830e 100644
--- a/pokeData/urshifu
+++ b/pokeData/urshifu
@@ -1,15 +1,15 @@
+	A  type Pokémon
 
-Name:  Urshifu
-Pokedex Number:  892
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Unseen Fist
+This form of Urshifu is a strong believer in the
+one-hit KO. Its strategy is to leap in close to foes
+and land a devastating blow with a hardened fist.
+
+   ↞--------| STATS |--------↠ 
+
+Pokedex ID: 	Capture Rate: 3
+Base Exp: 	Happiness: 50
+Height: 	Weight: 
+
+Genus: Wushu Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 550
-Hp:  100
-Attack:  130
-Defence:  100
-Special Attack:  63
-Special Defence:  60
-Speed:  97
diff --git a/pokeData/uxie b/pokeData/uxie
index ebeb794..0079e26 100644
--- a/pokeData/uxie
+++ b/pokeData/uxie
@@ -1,15 +1,21 @@
+uxie	A psychic type Pokémon
 
-Name:  Uxie
-Pokedex Number:  480
-Gender Ratio:  Genderless
-Abilities: Levitate
+Quand il prit son envol, les hommes
+apprirent à résoudre les problèmes.
+Le savoir était né.
 
-Base Stats
-----------------------
-Total: 580
-Hp:  75
-Attack:  75
-Defence:  130
-Special Attack:  75
-Special Defence:  130
-Speed:  95
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:         75
+        defense:        130
+ special-attack:         75
+special-defense:        130
+          speed:         95
+
+Pokedex ID: 480	Capture Rate: 3
+Base Exp: 290	Happiness: 140
+Height: 3	Weight: 3
+
+Genus: Knowledge Pokémon
+Location Areas:
+lake-acuity-cavern
diff --git a/pokeData/vanillish b/pokeData/vanillish
index ed01610..33477d5 100644
--- a/pokeData/vanillish
+++ b/pokeData/vanillish
@@ -1,15 +1,24 @@
+vanillish	A ice type Pokémon
 
-Name:  Vanillish
-Pokedex Number:  583
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Ice Body - Weak Armor (Hidden Ability)
+주변 공기를 차갑게 해서
+얼음 알갱이를 발생시켜서
+상대의 몸을 얼려버린다.
 
-Base Stats
-----------------------
-Total: 395
-Hp:  51
-Attack:  65
-Defence:  65
-Special Attack:  80
-Special Defence:  75
-Speed:  59
+   ↞--------| STATS |--------↠ 
+             hp:         51
+         attack:         65
+        defense:         65
+ special-attack:         80
+special-defense:         75
+          speed:         59
+
+Pokedex ID: 583	Capture Rate: 120
+Base Exp: 138	Happiness: 50
+Height: 11	Weight: 410
+
+Genus: Icy Snow Pokémon
+Location Areas:
+dragonspiral-tower-entrance
+dragonspiral-tower-outside
+giant-chasm-outside
+giant-chasm-area
diff --git a/pokeData/vanillite b/pokeData/vanillite
index a8e94f3..4f68557 100644
--- a/pokeData/vanillite
+++ b/pokeData/vanillite
@@ -1,15 +1,24 @@
+vanillite	A ice type Pokémon
 
-Name:  Vanillite
-Pokedex Number:  582
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Ice Body - Weak Armor (Hidden Ability)
+마이너스 50도의 숨결을 내뱉는다.
+눈 결정을 만들어
+주변에 눈이 내리게 한다.
 
-Base Stats
-----------------------
-Total: 305
-Hp:  36
-Attack:  50
-Defence:  50
-Special Attack:  65
-Special Defence:  60
-Speed:  44
+   ↞--------| STATS |--------↠ 
+             hp:         36
+         attack:         50
+        defense:         50
+ special-attack:         65
+special-defense:         60
+          speed:         44
+
+Pokedex ID: 582	Capture Rate: 255
+Base Exp: 61	Happiness: 50
+Height: 4	Weight: 57
+
+Genus: Fresh Snow Pokémon
+Location Areas:
+cold-storage-area
+dragonspiral-tower-entrance
+dragonspiral-tower-outside
+unova-route-6-area
diff --git a/pokeData/vanilluxe b/pokeData/vanilluxe
index 6e9b9a5..7222744 100644
--- a/pokeData/vanilluxe
+++ b/pokeData/vanilluxe
@@ -1,15 +1,23 @@
+vanilluxe	A ice type Pokémon
 
-Name:  Vanilluxe
-Pokedex Number:  584
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Ice Body - Weak Armor (Hidden Ability)
+두 개의 머리가 동시에 화를 내면
+뿔에서 강한 눈보라가 뿜어져 나온다.
+주변을 많은 눈으로 묻어 버린다.
 
-Base Stats
-----------------------
-Total: 535
-Hp:  71
-Attack:  95
-Defence:  85
-Special Attack:  110
-Special Defence:  95
-Speed:  79
+   ↞--------| STATS |--------↠ 
+             hp:         71
+         attack:         95
+        defense:         85
+ special-attack:        110
+special-defense:         95
+          speed:         79
+
+Pokedex ID: 584	Capture Rate: 45
+Base Exp: 268	Happiness: 50
+Height: 13	Weight: 575
+
+Genus: Snowstorm Pokémon
+Location Areas:
+dragonspiral-tower-entrance
+dragonspiral-tower-outside
+giant-chasm-outside
diff --git a/pokeData/vaporeon b/pokeData/vaporeon
index 047bd55..cd59184 100644
--- a/pokeData/vaporeon
+++ b/pokeData/vaporeon
@@ -1,15 +1,22 @@
+vaporeon	A water type Pokémon
 
-Name:  Vaporeon
-Pokedex Number:  134
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Water Absorb - Hydration (Hidden Ability)
+VAPOREON underwent a spontaneous
+mutation and grew fins and gills that
+allow it to live underwater.This POKéMON has the ability to freely
+control water.
+
+   ↞--------| STATS |--------↠ 
+             hp:        130
+         attack:         65
+        defense:         60
+ special-attack:        110
+special-defense:         95
+          speed:         65
+
+Pokedex ID: 134	Capture Rate: 45
+Base Exp: 184	Happiness: 50
+Height: 10	Weight: 290
+
+Genus: Bubble Jet Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 525
-Hp:  130
-Attack:  65
-Defence:  60
-Special Attack:  110
-Special Defence:  95
-Speed:  65
diff --git a/pokeData/venipede b/pokeData/venipede
index d128cb3..bb25774 100644
--- a/pokeData/venipede
+++ b/pokeData/venipede
@@ -1,15 +1,23 @@
+venipede	A bug type Pokémon
 
-Name:  Venipede
-Pokedex Number:  543
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Poison Point - Swarm - Speed Boost (Hidden Ability)
+머리와 꼬리의 더듬이로
+주변 상황을 살핀다.
+성격이 매우 난폭하다.
 
-Base Stats
-----------------------
-Total: 260
-Hp:  30
-Attack:  45
-Defence:  59
-Special Attack:  30
-Special Defence:  39
-Speed:  57
+   ↞--------| STATS |--------↠ 
+             hp:         30
+         attack:         45
+        defense:         59
+ special-attack:         30
+special-defense:         39
+          speed:         57
+
+Pokedex ID: 543	Capture Rate: 255
+Base Exp: 52	Happiness: 50
+Height: 4	Weight: 53
+
+Genus: Centipede Pokémon
+Location Areas:
+pinwheel-forest-inside
+lostlorn-forest-area
+unova-route-20-area
diff --git a/pokeData/venomoth b/pokeData/venomoth
index 7c668d0..e147b5b 100644
--- a/pokeData/venomoth
+++ b/pokeData/venomoth
@@ -1,15 +1,37 @@
+venomoth	A bug type Pokémon
 
-Name:  Venomoth
-Pokedex Number:  049
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Shield Dust - Tinted Lens - Wonder Skin  (Hidden Ability)
+VENOMOTH is nocturnal - it is a POKéMON
+that only becomes active at night.
+Its favorite prey are small insectsthat gather around streetlights,
+attracted by the light in the darkness.
 
-Base Stats
-----------------------
-Total: 450
-Hp:  70
-Attack:  65
-Defence:  60
-Special Attack:  90
-Special Defence:  75
-Speed:  90
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         65
+        defense:         60
+ special-attack:         90
+special-defense:         75
+          speed:         90
+
+Pokedex ID: 49	Capture Rate: 75
+Base Exp: 158	Happiness: 70
+Height: 15	Weight: 125
+
+Genus: Poison Moth Pokémon
+Location Areas:
+sinnoh-route-229-area
+johto-route-43-area
+kanto-route-9-area
+kanto-route-10-area
+kanto-route-13-area
+kanto-route-14-area
+kanto-route-15-area
+kanto-route-24-area
+kanto-route-25-area
+cerulean-cave-1f
+cerulean-cave-2f
+kanto-victory-road-2-3f
+kanto-safari-zone-area-2-north
+kanto-safari-zone-area-3-west
+berry-forest-area
+dreamyard-area
diff --git a/pokeData/venonat b/pokeData/venonat
index 5012284..65e9f4e 100644
--- a/pokeData/venonat
+++ b/pokeData/venonat
@@ -1,15 +1,38 @@
+venonat	A bug type Pokémon
 
-Name:  Venonat
-Pokedex Number:  048
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Compoundeyes - Tinted Lens - Run Away (Hidden Ability)
+VENONAT is said to have evolved with
+a coat of thin, stiff hair that covers
+its entire body for protection.It possesses large eyes that never fail
+to spot even miniscule prey.
 
-Base Stats
-----------------------
-Total: 305
-Hp:  60
-Attack:  55
-Defence:  50
-Special Attack:  40
-Special Defence:  55
-Speed:  45
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         55
+        defense:         50
+ special-attack:         40
+special-defense:         55
+          speed:         45
+
+Pokedex ID: 48	Capture Rate: 190
+Base Exp: 61	Happiness: 70
+Height: 10	Weight: 300
+
+Genus: Insect Pokémon
+Location Areas:
+sinnoh-route-229-area
+ilex-forest-area
+national-park-area
+johto-route-43-area
+lake-of-rage-area
+kanto-route-12-area
+kanto-route-9-area
+kanto-route-10-area
+kanto-route-13-area
+kanto-route-14-area
+kanto-route-15-area
+kanto-route-24-area
+kanto-route-25-area
+kanto-safari-zone-middle
+kanto-safari-zone-area-3-west
+berry-forest-area
+bond-bridge-area
diff --git a/pokeData/venusaur b/pokeData/venusaur
index 3ec0ceb..283cb1b 100644
--- a/pokeData/venusaur
+++ b/pokeData/venusaur
@@ -1,15 +1,22 @@
+venusaur	A grass type Pokémon
 
-Name:  Venusaur
-Pokedex Number:  003
-Gender Ratio:   ♂:87.5% ♀:12.5% 
-Abilities: Overgrow - Chlorophyll (Hidden Ability)
+There is a large flower on VENUSAUR’s
+back. The flower is said to take on vivid
+colors if it gets plenty of nutritionand sunlight. The flower’s aroma
+soothes the emotions of people.
+
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:         82
+        defense:         83
+ special-attack:        100
+special-defense:        100
+          speed:         80
+
+Pokedex ID: 3	Capture Rate: 45
+Base Exp: 263	Happiness: 50
+Height: 20	Weight: 1000
+
+Genus: Seed Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 525
-Hp:  80
-Attack:  100
-Defence:  123
-Special Attack:  122
-Special Defence:  120
-Speed:  80
diff --git a/pokeData/vespiquen b/pokeData/vespiquen
index 82f98aa..7fc23ce 100644
--- a/pokeData/vespiquen
+++ b/pokeData/vespiquen
@@ -1,15 +1,22 @@
+vespiquen	A bug type Pokémon
 
-Name:  Vespiquen
-Pokedex Number:  416
-Gender Ratio:   ♂:0% ♀:100% 
-Abilities: Pressure - Unnerve (Hidden Ability)
+Ce Pokémon utilise des phéromones
+pour donner des ordres de combat
+aux larves dans son abdomen.
 
-Base Stats
-----------------------
-Total: 474
-Hp:  70
-Attack:  80
-Defence:  102
-Special Attack:  80
-Special Defence:  102
-Speed:  40
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         80
+        defense:        102
+ special-attack:         80
+special-defense:        102
+          speed:         40
+
+Pokedex ID: 416	Capture Rate: 45
+Base Exp: 166	Happiness: 50
+Height: 12	Weight: 385
+
+Genus: Beehive Pokémon
+Location Areas:
+unova-route-12-area
+lostlorn-forest-area
diff --git a/pokeData/vibrava b/pokeData/vibrava
index f17d54f..8785736 100644
--- a/pokeData/vibrava
+++ b/pokeData/vibrava
@@ -1,15 +1,22 @@
+vibrava	A ground type Pokémon
 
-Name:  Vibrava
-Pokedex Number:  329
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Levitate
+It violently shudders its wings,
+generating ultrasonic waves to
+induce headaches in people.
 
-Base Stats
-----------------------
-Total: 340
-Hp:  50
-Attack:  70
-Defence:  50
-Special Attack:  50
-Special Defence:  50
-Speed:  70
+   ↞--------| STATS |--------↠ 
+             hp:         50
+         attack:         70
+        defense:         50
+ special-attack:         50
+special-defense:         50
+          speed:         70
+
+Pokedex ID: 329	Capture Rate: 120
+Base Exp: 119	Happiness: 50
+Height: 11	Weight: 153
+
+Genus: Vibration Pokémon
+Location Areas:
+sinnoh-route-228-area
+reversal-mountain-unknown-area-48
diff --git a/pokeData/victini b/pokeData/victini
index b66a824..3279660 100644
--- a/pokeData/victini
+++ b/pokeData/victini
@@ -1,15 +1,21 @@
+victini	A psychic type Pokémon
 
-Name:  Victini
-Pokedex Number:  494
-Gender Ratio:  Genderless
-Abilities: Victory Star
+승리를 부르는 포켓몬이다.
+비크티니와 함께하는 트레이너는
+그 어떤 승부에서도 승리한다고 한다.
+
+   ↞--------| STATS |--------↠ 
+             hp:        100
+         attack:        100
+        defense:        100
+ special-attack:        100
+special-defense:        100
+          speed:        100
+
+Pokedex ID: 494	Capture Rate: 3
+Base Exp: 300	Happiness: 100
+Height: 4	Weight: 40
+
+Genus: Victory Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 600
-Hp:  100
-Attack:  100
-Defence:  100
-Special Attack:  100
-Special Defence:  100
-Speed:  100
diff --git a/pokeData/victreebel b/pokeData/victreebel
index 4ba775b..938497e 100644
--- a/pokeData/victreebel
+++ b/pokeData/victreebel
@@ -1,15 +1,23 @@
+victreebel	A grass type Pokémon
 
-Name:  Victreebel
-Pokedex Number:  071
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Chlorophyll - Gluttony (Hidden Ability)
+Once ingested into
+this POKéMON's
+body, even thehardest object
+will melt into
+nothing.
+
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:        105
+        defense:         65
+ special-attack:        100
+special-defense:         70
+          speed:         70
+
+Pokedex ID: 71	Capture Rate: 45
+Base Exp: 221	Happiness: 70
+Height: 17	Weight: 155
+
+Genus: Flycatcher Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 490
-Hp:  80
-Attack:  105
-Defence:  65
-Special Attack:  100
-Special Defence:  70
-Speed:  70
diff --git a/pokeData/vigoroth b/pokeData/vigoroth
index 60aff38..1ee1fb2 100644
--- a/pokeData/vigoroth
+++ b/pokeData/vigoroth
@@ -1,15 +1,21 @@
+vigoroth	A normal type Pokémon
 
-Name:  Vigoroth
-Pokedex Number:  288
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Vital Spirit
+Its heart beats at a tenfold
+tempo, so it cannot sit still for
+even a moment.
 
-Base Stats
-----------------------
-Total: 440
-Hp:  80
-Attack:  80
-Defence:  80
-Special Attack:  55
-Special Defence:  55
-Speed:  90
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:         80
+        defense:         80
+ special-attack:         55
+special-defense:         55
+          speed:         90
+
+Pokedex ID: 288	Capture Rate: 120
+Base Exp: 154	Happiness: 70
+Height: 14	Weight: 465
+
+Genus: Wild Monkey Pokémon
+Location Areas:
+pinwheel-forest-inside
diff --git a/pokeData/vikavolt b/pokeData/vikavolt
index e03a7f3..461bb04 100644
--- a/pokeData/vikavolt
+++ b/pokeData/vikavolt
@@ -1,15 +1,21 @@
+vikavolt	A bug type Pokémon
 
-Name:  Vikavolt
-Pokedex Number:  738
-Gender Ratio:   ♂:50.2% ♀:49.8% 
-Abilities: Levitate
+Sobrevuela un área en busca de presas. Puede
+concentrar una potente carga eléctrica entre
+sus mandíbulas para atacar a sus rivales.
+
+   ↞--------| STATS |--------↠ 
+             hp:         77
+         attack:         70
+        defense:         90
+ special-attack:        145
+special-defense:         75
+          speed:         43
+
+Pokedex ID: 738	Capture Rate: 45
+Base Exp: 250	Happiness: 50
+Height: 15	Weight: 450
+
+Genus: Stag Beetle Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 500
-Hp:  77
-Attack:  70
-Defence:  90
-Special Attack:  145
-Special Defence:  75
-Speed:  43
diff --git a/pokeData/vileplume b/pokeData/vileplume
index 60a18d4..7e80a41 100644
--- a/pokeData/vileplume
+++ b/pokeData/vileplume
@@ -1,15 +1,23 @@
+vileplume	A grass type Pokémon
 
-Name:  Vileplume
-Pokedex Number:  045
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Chlorophyll - Effect Spore (Hidden Ability)
+By shaking its big
+petals, it scat­
+ters toxic polleninto the air,
+turning the air
+yellow.
+
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:         80
+        defense:         85
+ special-attack:        110
+special-defense:         90
+          speed:         50
+
+Pokedex ID: 45	Capture Rate: 45
+Base Exp: 245	Happiness: 50
+Height: 12	Weight: 186
+
+Genus: Flower Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 490
-Hp:  75
-Attack:  80
-Defence:  85
-Special Attack:  110
-Special Defence:  90
-Speed:  50
diff --git a/pokeData/virizion b/pokeData/virizion
index 0185dfa..7891e36 100644
--- a/pokeData/virizion
+++ b/pokeData/virizion
@@ -1,15 +1,21 @@
+virizion	A grass type Pokémon
 
-Name:  Virizion
-Pokedex Number:  640
-Gender Ratio:  Genderless
-Abilities: Justified
+머리의 뿔은 날카로운 칼날이다.
+회오리바람과 같은 움직임으로
+상대를 농락하여 재빠르게 벤다.
+
+   ↞--------| STATS |--------↠ 
+             hp:         91
+         attack:         90
+        defense:         72
+ special-attack:         90
+special-defense:        129
+          speed:        108
+
+Pokedex ID: 640	Capture Rate: 3
+Base Exp: 290	Happiness: 35
+Height: 20	Weight: 2000
+
+Genus: Grassland Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 580
-Hp:  91
-Attack:  90
-Defence:  72
-Special Attack:  90
-Special Defence:  129
-Speed:  108
diff --git a/pokeData/vivillon b/pokeData/vivillon
index 41b990a..937c77b 100644
--- a/pokeData/vivillon
+++ b/pokeData/vivillon
@@ -1,15 +1,21 @@
+vivillon	A bug type Pokémon
 
-Name:  Vivillon
-Pokedex Number:  666
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Shield Dust - Compoundeyes - Friend Guard (Hidden Ability)
+世界には　さまざまな　羽模様の
+ビビヨンがいる。住んでいる　土地の
+気候が　影響しているようだ。
+
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:         52
+        defense:         50
+ special-attack:         90
+special-defense:         50
+          speed:         89
+
+Pokedex ID: 666	Capture Rate: 45
+Base Exp: 185	Happiness: 70
+Height: 12	Weight: 170
+
+Genus: Scale Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 411
-Hp:  80
-Attack:  52
-Defence:  50
-Special Attack:  90
-Special Defence:  50
-Speed:  89
diff --git a/pokeData/volbeat b/pokeData/volbeat
index f911fe5..365327d 100644
--- a/pokeData/volbeat
+++ b/pokeData/volbeat
@@ -1,15 +1,23 @@
+volbeat	A bug type Pokémon
 
-Name:  Volbeat
-Pokedex Number:  313
-Gender Ratio:   ♂:100% ♀:0%
-Abilities: Illuminate - Swarm - Prankster (Hidden Ability)
+It communicates with others by
+lighting up its rear at night. It
+loves ILLUMISE’s sweet aroma.
 
-Base Stats
-----------------------
-Total: 400
-Hp:  65
-Attack:  73
-Defence:  55
-Special Attack:  47
-Special Defence:  75
-Speed:  85
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         73
+        defense:         75
+ special-attack:         47
+special-defense:         85
+          speed:         85
+
+Pokedex ID: 313	Capture Rate: 150
+Base Exp: 151	Happiness: 70
+Height: 7	Weight: 177
+
+Genus: Firefly Pokémon
+Location Areas:
+sinnoh-route-229-area
+hoenn-route-117-area
+kalos-route-7-area
diff --git a/pokeData/volcanion b/pokeData/volcanion
index ac30318..0f8aa36 100644
--- a/pokeData/volcanion
+++ b/pokeData/volcanion
@@ -1,15 +1,21 @@
+volcanion	A fire type Pokémon
 
-Name:  Volcanion
-Pokedex Number:  721
-Gender Ratio:  Genderless
-Abilities: Water Absorb
+It lets out billows of steam and disappears into
+the dense fog. It’s said to live in mountains
+where humans do not tread.
+
+   ↞--------| STATS |--------↠ 
+             hp:         80
+         attack:        110
+        defense:        120
+ special-attack:        130
+special-defense:         90
+          speed:         70
+
+Pokedex ID: 721	Capture Rate: 3
+Base Exp: 300	Happiness: 100
+Height: 17	Weight: 1950
+
+Genus: Steam Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 600
-Hp:  80
-Attack:  110
-Defence:  120
-Special Attack:  130
-Special Defence:  90
-Speed:  70
diff --git a/pokeData/volcarona b/pokeData/volcarona
index bb81a77..3f6ae7a 100644
--- a/pokeData/volcarona
+++ b/pokeData/volcarona
@@ -1,15 +1,21 @@
+volcarona	A bug type Pokémon
 
-Name:  Volcarona
-Pokedex Number:  637
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Flame Body - Swarm (Hidden Ability)
+싸울 때는 6개의 날개에서
+불꽃 가루를 흩뿌려서
+주변 일대를 불바다로 만든다.
+
+   ↞--------| STATS |--------↠ 
+             hp:         85
+         attack:         60
+        defense:         65
+ special-attack:        135
+special-defense:        105
+          speed:        100
+
+Pokedex ID: 637	Capture Rate: 15
+Base Exp: 275	Happiness: 50
+Height: 16	Weight: 460
+
+Genus: Sun Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 550
-Hp:  85
-Attack:  60
-Defence:  65
-Special Attack:  135
-Special Defence:  105
-Speed:  100
diff --git a/pokeData/voltorb b/pokeData/voltorb
index 32d6259..410945c 100644
--- a/pokeData/voltorb
+++ b/pokeData/voltorb
@@ -1,15 +1,27 @@
+voltorb	A electric type Pokémon
 
-Name:  Voltorb
-Pokedex Number:  100
-Gender Ratio:  Genderless
-Abilities: Soundproof - Static - Aftermath (Hidden Ability)
+VOLTORB is extremely sensitive - it
+explodes at the slightest of shocks.
+It is rumored that it was first createdwhen a POKé BALL was exposed to a
+powerful pulse of energy.
 
-Base Stats
-----------------------
-Total: 330
-Hp:  40
-Attack:  30
-Defence:  50
-Special Attack:  55
-Special Defence:  55
-Speed:  100
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         30
+        defense:         50
+ special-attack:         55
+special-defense:         55
+          speed:        100
+
+Pokedex ID: 100	Capture Rate: 190
+Base Exp: 66	Happiness: 70
+Height: 5	Weight: 104
+
+Genus: Ball Pokémon
+Location Areas:
+sinnoh-route-218-area
+kanto-route-10-area
+power-plant-area
+new-mauville-entrance
+new-mauville-area
+team-rocket-hq-area
diff --git a/pokeData/vullaby b/pokeData/vullaby
index 4a06cc1..09bb13b 100644
--- a/pokeData/vullaby
+++ b/pokeData/vullaby
@@ -1,15 +1,26 @@
+vullaby	A dark type Pokémon
 
-Name:  Vullaby
-Pokedex Number:  629
-Gender Ratio:   ♂:0% ♀:100% 
-Abilities: Big Pecks - Overcoat - Weak Armor (Hidden Ability)
+つばさが　ちいさいため　とべない。
+しんかの　ときが　ちかづくと
+じぶんから　ガイコツを　ぬぎすてる。
 
-Base Stats
-----------------------
-Total: 370
-Hp:  70
-Attack:  55
-Defence:  75
-Special Attack:  45
-Special Defence:  65
-Speed:  60
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:         55
+        defense:         75
+ special-attack:         45
+special-defense:         65
+          speed:         60
+
+Pokedex ID: 629	Capture Rate: 190
+Base Exp: 74	Happiness: 35
+Height: 5	Weight: 90
+
+Genus: Diapered Pokémon
+Location Areas:
+unova-victory-road-outside
+village-bridge-area
+unova-route-10-area
+unova-route-10-victory-road-gate
+unova-route-11-area
+unova-route-23-area
diff --git a/pokeData/vulpix b/pokeData/vulpix
index 1c28cd7..bb54123 100644
--- a/pokeData/vulpix
+++ b/pokeData/vulpix
@@ -1,15 +1,35 @@
+vulpix	A fire type Pokémon
 
-Name:  Vulpix
-Pokedex Number:  037
-Gender Ratio:   ♂:25% ♀:75%
-Abilities: Flash Fire - Drought (Hidden Ability)
+Inside VULPIX’s body burns a flame that
+never goes out. During the daytime,
+when the temperatures rise, thisPOKéMON releases flames from its mouth
+to prevent its body from growing too
+hot.
 
-Base Stats
-----------------------
-Total: 299
-Hp:  38
-Attack:  41
-Defence:  40
-Special Attack:  50
-Special Defence:  65
-Speed:  65
+   ↞--------| STATS |--------↠ 
+             hp:         38
+         attack:         41
+        defense:         40
+ special-attack:         50
+special-defense:         65
+          speed:         65
+
+Pokedex ID: 37	Capture Rate: 190
+Base Exp: 60	Happiness: 50
+Height: 6	Weight: 99
+
+Genus: Fox Pokémon
+Location Areas:
+sinnoh-route-209-area
+sinnoh-route-214-area
+johto-route-36-area
+johto-route-37-area
+johto-route-48-area
+kanto-route-7-area
+kanto-route-8-area
+pokemon-mansion-1f
+pokemon-mansion-2f
+pokemon-mansion-3f
+pokemon-mansion-b1f
+mt-pyre-outside
+abundant-shrine-area
diff --git a/pokeData/wailmer b/pokeData/wailmer
index ae5b1fb..f04b864 100644
--- a/pokeData/wailmer
+++ b/pokeData/wailmer
@@ -1,15 +1,57 @@
+wailmer	A water type Pokémon
 
-Name:  Wailmer
-Pokedex Number:  320
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Water Veil - Oblivious - Pressure (Hidden Ability)
+On sunny days, it lands on beaches
+to bounce like a ball and play.
+It spouts water from its nose.
 
-Base Stats
-----------------------
-Total: 400
-Hp:  130
-Attack:  70
-Defence:  35
-Special Attack:  70
-Special Defence:  35
-Speed:  60
+   ↞--------| STATS |--------↠ 
+             hp:        130
+         attack:         70
+        defense:         35
+ special-attack:         70
+special-defense:         35
+          speed:         60
+
+Pokedex ID: 320	Capture Rate: 125
+Base Exp: 80	Happiness: 50
+Height: 20	Weight: 1300
+
+Genus: Ball Whale Pokémon
+Location Areas:
+sinnoh-sea-route-223-area
+sinnoh-sea-route-230-area
+slateport-city-area
+lilycove-city-area
+mossdeep-city-area
+ever-grande-city-area
+seafloor-cavern-area
+shoal-cave-area
+hoenn-route-103-area
+hoenn-route-105-area
+hoenn-route-106-area
+hoenn-route-107-area
+hoenn-route-108-area
+hoenn-route-109-area
+hoenn-route-110-area
+hoenn-route-115-area
+hoenn-route-121-area
+hoenn-route-122-area
+hoenn-route-123-area
+hoenn-route-124-area
+hoenn-route-125-area
+hoenn-route-126-area
+hoenn-route-127-area
+hoenn-route-128-area
+hoenn-route-129-area
+hoenn-route-130-area
+hoenn-route-131-area
+hoenn-route-132-area
+hoenn-route-133-area
+hoenn-route-134-area
+dewford-town-area
+pacifidlog-town-area
+undella-bay-area
+undella-town-area
+ambrette-town-area
+cyllage-city-area
+kalos-route-8-area
diff --git a/pokeData/wailord b/pokeData/wailord
index bf9b213..8ee0bc2 100644
--- a/pokeData/wailord
+++ b/pokeData/wailord
@@ -1,15 +1,24 @@
+wailord	A water type Pokémon
 
-Name:  Wailord
-Pokedex Number:  321
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Water Veil - Oblivious - Pressure (Hidden Ability)
+The biggest of all Pokémon.
+It can dive to a depth of almost
+10,000 feet on only one breath.
 
-Base Stats
-----------------------
-Total: 500
-Hp:  170
-Attack:  90
-Defence:  45
-Special Attack:  90
-Special Defence:  45
-Speed:  60
+   ↞--------| STATS |--------↠ 
+             hp:        170
+         attack:         90
+        defense:         45
+ special-attack:         90
+special-defense:         45
+          speed:         60
+
+Pokedex ID: 321	Capture Rate: 60
+Base Exp: 175	Happiness: 50
+Height: 145	Weight: 3980
+
+Genus: Float Whale Pokémon
+Location Areas:
+sinnoh-sea-route-223-area
+sinnoh-sea-route-230-area
+hoenn-route-129-area
+undella-bay-area
diff --git a/pokeData/walrein b/pokeData/walrein
index 798b145..cfe4475 100644
--- a/pokeData/walrein
+++ b/pokeData/walrein
@@ -1,15 +1,21 @@
+walrein	A ice type Pokémon
 
-Name:  Walrein
-Pokedex Number:  365
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Thick Fat - Ice Body - Oblivious (Hidden Ability)
+It shatters ice with its big tusks.
+Its thick blubber repels not only
+the cold, but also enemy attacks.
 
-Base Stats
-----------------------
-Total: 530
-Hp:  110
-Attack:  80
-Defence:  90
-Special Attack:  95
-Special Defence:  90
-Speed:  65
+   ↞--------| STATS |--------↠ 
+             hp:        110
+         attack:         80
+        defense:         90
+ special-attack:         95
+special-defense:         90
+          speed:         65
+
+Pokedex ID: 365	Capture Rate: 45
+Base Exp: 265	Happiness: 50
+Height: 14	Weight: 1506
+
+Genus: Ice Break Pokémon
+Location Areas:
+undella-bay-area
diff --git a/pokeData/wartortle b/pokeData/wartortle
index 9188c31..eccac81 100644
--- a/pokeData/wartortle
+++ b/pokeData/wartortle
@@ -1,15 +1,23 @@
+wartortle	A water type Pokémon
 
-Name:  Wartortle
-Pokedex Number:  008
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Torrent - Rain Dish (Hidden Ability)
+Its tail is large and covered with a rich,
+thick fur. The tail becomes increasingly
+deeper in color as WARTORTLE ages.The scratches on its shell are evidence
+of this POKéMON’s toughness as a
+battler.
+
+   ↞--------| STATS |--------↠ 
+             hp:         59
+         attack:         63
+        defense:         80
+ special-attack:         65
+special-defense:         80
+          speed:         58
+
+Pokedex ID: 8	Capture Rate: 45
+Base Exp: 142	Happiness: 50
+Height: 10	Weight: 225
+
+Genus: Turtle Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 405
-Hp:  59
-Attack:  63
-Defence:  80
-Special Attack:  65
-Special Defence:  80
-Speed:  58
diff --git a/pokeData/watchog b/pokeData/watchog
index 39b02f5..4b4bf66 100644
--- a/pokeData/watchog
+++ b/pokeData/watchog
@@ -1,15 +1,30 @@
+watchog	A normal type Pokémon
 
-Name:  Watchog
-Pokedex Number:  505
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Illuminate - Keen Eye - Analytic (Hidden Ability)
+체내의 발광물질로
+눈이나 몸을 빛나게 하여
+습격해 온 상대를 풀이 죽게 만든다.
 
-Base Stats
-----------------------
-Total: 420
-Hp:  60
-Attack:  85
-Defence:  69
-Special Attack:  60
-Special Defence:  69
-Speed:  77
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         85
+        defense:         69
+ special-attack:         60
+special-defense:         69
+          speed:         77
+
+Pokedex ID: 505	Capture Rate: 255
+Base Exp: 147	Happiness: 70
+Height: 11	Weight: 270
+
+Genus: Lookout Pokémon
+Location Areas:
+dreamyard-area
+dreamyard-b1f
+p2-laboratory-area
+unova-route-1-area
+unova-route-2-area
+unova-route-3-area
+unova-route-7-area
+unova-route-15-area
+unova-route-18-area
+kalos-route-15-area
diff --git a/pokeData/weavile b/pokeData/weavile
index 872c431..736f415 100644
--- a/pokeData/weavile
+++ b/pokeData/weavile
@@ -1,15 +1,21 @@
+weavile	A dark type Pokémon
 
-Name:  Weavile
-Pokedex Number:  461
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Pressure - Pickpocket (Hidden Ability)
+L’évolution l’a rendu encore plus
+retors. Il communique en griffant
+des signes dans les pierres.
+
+   ↞--------| STATS |--------↠ 
+             hp:         70
+         attack:        120
+        defense:         65
+ special-attack:         45
+special-defense:         85
+          speed:        125
+
+Pokedex ID: 461	Capture Rate: 45
+Base Exp: 179	Happiness: 35
+Height: 11	Weight: 340
+
+Genus: Sharp Claw Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 510
-Hp:  70
-Attack:  120
-Defence:  65
-Special Attack:  45
-Special Defence:  85
-Speed:  125
diff --git a/pokeData/weedle b/pokeData/weedle
index 58a58ae..1dd79d5 100644
--- a/pokeData/weedle
+++ b/pokeData/weedle
@@ -1,15 +1,48 @@
+weedle	A bug type Pokémon
 
-Name:  Weedle
-Pokedex Number:  013
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Shield Dust - Run Away (Hidden Ability)
+WEEDLE has an extremely acute sense
+of smell.
+It is capable of distinguishing itsfavorite kinds of leaves from those it
+dislikes just by sniffing with its big
+red proboscis (nose).
 
-Base Stats
-----------------------
-Total: 195
-Hp:  40
-Attack:  35
-Defence:  30
-Special Attack:  20
-Special Defence:  20
-Speed:  50
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         35
+        defense:         30
+ special-attack:         20
+special-defense:         20
+          speed:         50
+
+Pokedex ID: 13	Capture Rate: 255
+Base Exp: 39	Happiness: 70
+Height: 3	Weight: 32
+
+Genus: Hairy Bug Pokémon
+Location Areas:
+eterna-forest-area
+sinnoh-route-204-south-towards-jubilife-city
+sinnoh-route-204-north-towards-floaroma-town
+johto-route-30-area
+johto-route-31-area
+ilex-forest-area
+johto-route-34-area
+johto-route-35-area
+national-park-area
+unknown-all-bugs-area
+johto-route-36-area
+johto-route-37-area
+johto-route-38-area
+johto-route-39-area
+lake-of-rage-area
+kanto-route-26-area
+kanto-route-27-area
+kanto-route-2-south-towards-viridian-city
+kanto-route-24-area
+kanto-route-25-area
+kanto-route-2-north-towards-pewter-city
+viridian-forest-area
+pattern-bush-area
+kalos-route-2-area
+santalune-forest-area
+azalea-town-area
diff --git a/pokeData/weepinbell b/pokeData/weepinbell
index 258ea2b..4460e62 100644
--- a/pokeData/weepinbell
+++ b/pokeData/weepinbell
@@ -1,15 +1,40 @@
+weepinbell	A grass type Pokémon
 
-Name:  Weepinbell
-Pokedex Number:  070
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Chlorophyll - Gluttony (Hidden Ability)
+WEEPINBELL has a large hook on its rear
+end. At night, the POKéMON hooks on to
+a tree branch and goes to sleep.If it moves around in its sleep, it may
+wake up to find itself on the ground.
 
-Base Stats
-----------------------
-Total: 390
-Hp:  65
-Attack:  90
-Defence:  50
-Special Attack:  85
-Special Defence:  45
-Speed:  55
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         90
+        defense:         50
+ special-attack:         85
+special-defense:         45
+          speed:         55
+
+Pokedex ID: 70	Capture Rate: 120
+Base Exp: 137	Happiness: 70
+Height: 10	Weight: 64
+
+Genus: Flycatcher Pokémon
+Location Areas:
+sinnoh-route-224-area
+sinnoh-route-229-area
+sinnoh-sea-route-230-area
+johto-route-44-area
+kanto-route-12-area
+kanto-route-13-area
+kanto-route-14-area
+kanto-route-15-area
+kanto-route-24-area
+kanto-route-25-area
+cerulean-cave-1f
+cerulean-cave-2f
+berry-forest-area
+cape-brink-area
+bond-bridge-area
+water-path-area
+kalos-route-14-area
+kalos-route-16-area
+kalos-route-19-area
diff --git a/pokeData/weezing b/pokeData/weezing
index 8003e6b..14b4cde 100644
--- a/pokeData/weezing
+++ b/pokeData/weezing
@@ -1,15 +1,33 @@
+weezing	A poison type Pokémon
 
-Name:  Weezing
-Pokedex Number:  110
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Levitate
+WEEZING alternately shrinks and
+inflates its twin bodies to mix together
+toxic gases inside.The more the gases are mixed, the more
+powerful the toxins become. The
+POKéMON also becomes more putrid.
 
-Base Stats
-----------------------
-Total: 490
-Hp:  65
-Attack:  90
-Defence:  120
-Special Attack:  85
-Special Defence:  70
-Speed:  60
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         90
+        defense:        120
+ special-attack:         85
+special-defense:         70
+          speed:         60
+
+Pokedex ID: 110	Capture Rate: 60
+Base Exp: 172	Happiness: 50
+Height: 12	Weight: 95
+
+Genus: Poison Gas Pokémon
+Location Areas:
+stark-mountain-area
+stark-mountain-entrance
+stark-mountain-inside
+sinnoh-route-227-area
+burned-tower-b1f
+pokemon-mansion-1f
+pokemon-mansion-2f
+pokemon-mansion-3f
+pokemon-mansion-b1f
+p2-laboratory-area
+johto-safari-zone-zone-marshland
diff --git a/pokeData/whimsicott b/pokeData/whimsicott
index ea0a274..750a9d2 100644
--- a/pokeData/whimsicott
+++ b/pokeData/whimsicott
@@ -1,15 +1,25 @@
+whimsicott	A grass type Pokémon
 
-Name:  Whimsicott
-Pokedex Number:  547
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Prankster - Infiltrator - Chlorophyll (Hidden Ability)
+つむじかぜと　ともに　あらわれて
+いえのなかの　かぐを　うごかしたり
+わたを　のこす　いたずらをする。
 
-Base Stats
-----------------------
-Total: 480
-Hp:  60
-Attack:  67
-Defence:  85
-Special Attack:  77
-Special Defence:  75
-Speed:  116
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:         67
+        defense:         85
+ special-attack:         77
+special-defense:         75
+          speed:        116
+
+Pokedex ID: 547	Capture Rate: 75
+Base Exp: 168	Happiness: 50
+Height: 7	Weight: 66
+
+Genus: Windveiled Pokémon
+Location Areas:
+pinwheel-forest-inside
+abundant-shrine-area
+lostlorn-forest-area
+castelia-city-area
+unova-victory-road-2-unknown-area-72
diff --git a/pokeData/whirlipede b/pokeData/whirlipede
index 7e55bd3..5d8b828 100644
--- a/pokeData/whirlipede
+++ b/pokeData/whirlipede
@@ -1,15 +1,22 @@
+whirlipede	A bug type Pokémon
 
-Name:  Whirlipede
-Pokedex Number:  544
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Poison Point - Swarm - Speed Boost (Hidden Ability)
+단단한 껍질로 보호되고 있다.
+타이어처럼 회전하여 상대에게
+격렬히 몸통박치기를 날린다.
 
-Base Stats
-----------------------
-Total: 360
-Hp:  40
-Attack:  55
-Defence:  99
-Special Attack:  40
-Special Defence:  79
-Speed:  47
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         55
+        defense:         99
+ special-attack:         40
+special-defense:         79
+          speed:         47
+
+Pokedex ID: 544	Capture Rate: 120
+Base Exp: 126	Happiness: 50
+Height: 12	Weight: 585
+
+Genus: Curlipede Pokémon
+Location Areas:
+pinwheel-forest-inside
+lostlorn-forest-area
diff --git a/pokeData/whiscash b/pokeData/whiscash
index 2e6f2a0..2f5f93e 100644
--- a/pokeData/whiscash
+++ b/pokeData/whiscash
@@ -1,15 +1,50 @@
+whiscash	A water type Pokémon
 
-Name:  Whiscash
-Pokedex Number:  340
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Oblivious - Anticipation - Hydration (Hidden Ability)
+It is extremely protective of its
+territory. If any foe approaches,
+it attacks using vicious tremors.
 
-Base Stats
-----------------------
-Total: 468
-Hp:  110
-Attack:  78
-Defence:  73
-Special Attack:  76
-Special Defence:  71
-Speed:  60
+   ↞--------| STATS |--------↠ 
+             hp:        110
+         attack:         78
+        defense:         73
+ special-attack:         76
+special-defense:         71
+          speed:         60
+
+Pokedex ID: 340	Capture Rate: 75
+Base Exp: 164	Happiness: 50
+Height: 9	Weight: 236
+
+Genus: Whiskers Pokémon
+Location Areas:
+eterna-city-area
+mt-coronet-1f-route-207
+mt-coronet-4f
+mt-coronet-b1f
+great-marsh-area-1
+great-marsh-area-2
+great-marsh-area-3
+great-marsh-area-4
+great-marsh-area-5
+great-marsh-area-6
+ravaged-path-area
+oreburgh-gate-b1f
+sinnoh-route-205-east-towards-eterna-city
+sinnoh-route-208-area
+sinnoh-route-210-west-towards-celestic-town
+sinnoh-route-212-east-towards-pastoria-city
+sinnoh-route-225-area
+sinnoh-route-227-area
+sinnoh-route-228-area
+celestic-town-area
+violet-city-area
+meteor-falls-back
+meteor-falls-b1f
+meteor-falls-backsmall-room
+hoenn-victory-road-b2f
+icirrus-city-area
+unova-route-8-area
+moor-of-icirrus-area
+kalos-route-14-area
+kalos-route-19-area
diff --git a/pokeData/whismur b/pokeData/whismur
index 81e1e17..ded05a1 100644
--- a/pokeData/whismur
+++ b/pokeData/whismur
@@ -1,15 +1,49 @@
+whismur	A normal type Pokémon
 
-Name:  Whismur
-Pokedex Number:  293
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Soundproof - Rattled (Hidden Ability)
+Usually, its cries are like quiet
+murmurs. If frightened, it shrieks
+at the same volume as a jet plane.
 
-Base Stats
-----------------------
-Total: 240
-Hp:  64
-Attack:  51
-Defence:  23
-Special Attack:  51
-Special Defence:  23
-Speed:  28
+   ↞--------| STATS |--------↠ 
+             hp:         64
+         attack:         51
+        defense:         23
+ special-attack:         51
+special-defense:         23
+          speed:         28
+
+Pokedex ID: 293	Capture Rate: 190
+Base Exp: 48	Happiness: 50
+Height: 6	Weight: 163
+
+Genus: Whisper Pokémon
+Location Areas:
+johto-route-30-area
+johto-route-31-area
+johto-route-32-area
+ruins-of-alph-outside
+johto-route-34-area
+johto-route-35-area
+johto-route-42-area
+johto-route-43-area
+johto-route-44-area
+johto-route-45-area
+johto-route-47-area
+mt-silver-outside
+kanto-route-26-area
+kanto-route-27-area
+kanto-route-28-area
+kanto-route-4-area
+kanto-route-6-area
+kanto-route-9-area
+kanto-route-10-area
+kanto-route-13-area
+kanto-sea-route-21-area
+kanto-route-22-area
+kanto-route-24-area
+kanto-route-25-area
+rusturf-tunnel-area
+hoenn-victory-road-1f
+hoenn-route-116-area
+desert-underpass-area
+connecting-cave-area
diff --git a/pokeData/wigglytuff b/pokeData/wigglytuff
index 3fecb91..09f5155 100644
--- a/pokeData/wigglytuff
+++ b/pokeData/wigglytuff
@@ -1,15 +1,26 @@
+wigglytuff	A normal type Pokémon
 
-Name:  Wigglytuff
-Pokedex Number:  040
-Gender Ratio:   ♂:25% ♀:75% 
-Abilities: Cute Charm - Competitive - Frisk (Hidden Ability)
+WIGGLYTUFF’s body is very flexible.
+By inhaling deeply, this POKéMON can
+inflate itself seemingly without end.Once inflated, WIGGLYTUFF bounces
+along lightly like a balloon.
 
-Base Stats
-----------------------
-Total: 435
-Hp:  140
-Attack:  70
-Defence:  45
-Special Attack:  85
-Special Defence:  50
-Speed:  45
+   ↞--------| STATS |--------↠ 
+             hp:        140
+         attack:         70
+        defense:         45
+ special-attack:         85
+special-defense:         50
+          speed:         45
+
+Pokedex ID: 40	Capture Rate: 50
+Base Exp: 218	Happiness: 50
+Height: 10	Weight: 120
+
+Genus: Balloon Pokémon
+Location Areas:
+cerulean-cave-2f
+dreamyard-area
+unova-route-1-area
+unova-route-2-area
+unova-route-14-area
diff --git a/pokeData/wimpod b/pokeData/wimpod
index ee50880..2cc8099 100644
--- a/pokeData/wimpod
+++ b/pokeData/wimpod
@@ -1,15 +1,21 @@
+wimpod	A bug type Pokémon
 
-Name:  Wimpod
-Pokedex Number:  767
-Gender Ratio:   ♂:50.2% ♀:49.8% 
-Abilities: Wimp Out
+This Pokémon is a coward. As it desperately
+dashes off, the flailing of its many legs leaves a
+sparkling clean path in its wake.
+
+   ↞--------| STATS |--------↠ 
+             hp:         25
+         attack:         35
+        defense:         40
+ special-attack:         20
+special-defense:         30
+          speed:         80
+
+Pokedex ID: 767	Capture Rate: 90
+Base Exp: 46	Happiness: 50
+Height: 5	Weight: 120
+
+Genus: Turn Tail Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 230
-Hp:  25
-Attack:  35
-Defence:  40
-Special Attack:  20
-Special Defence:  30
-Speed:  80
diff --git a/pokeData/wingull b/pokeData/wingull
index 5dd7bf2..38b989a 100644
--- a/pokeData/wingull
+++ b/pokeData/wingull
@@ -1,15 +1,74 @@
+wingull	A water type Pokémon
 
-Name:  Wingull
-Pokedex Number:  278
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Keen Eye - Rain Dish (Hidden Ability)
+It soars high in the sky, riding on
+updrafts like a glider. It carries
+food tucked in its bill.
 
-Base Stats
-----------------------
-Total: 270
-Hp:  40
-Attack:  30
-Defence:  30
-Special Attack:  55
-Special Defence:  30
-Speed:  85
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         30
+        defense:         30
+ special-attack:         55
+special-defense:         30
+          speed:         85
+
+Pokedex ID: 278	Capture Rate: 190
+Base Exp: 54	Happiness: 50
+Height: 6	Weight: 95
+
+Genus: Seagull Pokémon
+Location Areas:
+canalave-city-area
+pastoria-city-area
+sunyshore-city-area
+sinnoh-pokemon-league-area
+valley-windworks-area
+fuego-ironworks-area
+iron-island-area
+sinnoh-route-205-south-towards-floaroma-town
+sinnoh-route-213-area
+sinnoh-route-218-area
+sinnoh-route-219-area
+sinnoh-route-221-area
+sinnoh-route-222-area
+sinnoh-route-229-area
+sinnoh-sea-route-220-area
+sinnoh-sea-route-226-area
+sinnoh-sea-route-230-area
+vermilion-city-area
+vermilion-city-ss-anne-dock
+slateport-city-area
+lilycove-city-area
+mossdeep-city-area
+ever-grande-city-area
+mt-pyre-outside
+hoenn-route-103-area
+hoenn-route-104-area
+hoenn-route-105-area
+hoenn-route-106-area
+hoenn-route-107-area
+hoenn-route-108-area
+hoenn-route-109-area
+hoenn-route-110-area
+hoenn-route-115-area
+hoenn-route-118-area
+hoenn-route-119-area
+hoenn-route-121-area
+hoenn-route-122-area
+hoenn-route-123-area
+hoenn-route-124-area
+hoenn-route-125-area
+hoenn-route-126-area
+hoenn-route-127-area
+hoenn-route-128-area
+hoenn-route-129-area
+hoenn-route-130-area
+hoenn-route-131-area
+hoenn-route-132-area
+hoenn-route-133-area
+hoenn-route-134-area
+dewford-town-area
+pacifidlog-town-area
+undella-bay-area
+unova-route-13-area
+undella-town-area
diff --git a/pokeData/wishiwashi b/pokeData/wishiwashi
index a41eb1b..58e4583 100644
--- a/pokeData/wishiwashi
+++ b/pokeData/wishiwashi
@@ -1,15 +1,15 @@
+	A  type Pokémon
 
-Name:  Wishiwashi
-Pokedex Number:  746
-Gender Ratio:   ♂:50.2% ♀:49.8%
-Abilities: Schooling
+When it’s in trouble, its eyes moisten and begin
+to shine. The shining light attracts its comrades,
+and they stand together against their enemies.
+
+   ↞--------| STATS |--------↠ 
+
+Pokedex ID: 	Capture Rate: 60
+Base Exp: 	Happiness: 50
+Height: 	Weight: 
+
+Genus: Small Fry Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 175
-Hp:  45
-Attack:  140
-Defence:  130
-Special Attack:  140
-Special Defence:  135
-Speed:  30
diff --git a/pokeData/wobbuffet b/pokeData/wobbuffet
index f70a161..c372f7f 100644
--- a/pokeData/wobbuffet
+++ b/pokeData/wobbuffet
@@ -1,15 +1,36 @@
+wobbuffet	A psychic type Pokémon
 
-Name:  Wobbuffet
-Pokedex Number:  202
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Shadow Tag - Telepathy (Hidden Ability)
+To keep its pitch-black tail hidden, it
+lives quietly in the darkness. It is never
+first to attack.
 
-Base Stats
-----------------------
-Total: 405
-Hp:  190
-Attack:  33
-Defence:  58
-Special Attack:  33
-Special Defence:  58
-Speed:  33
+   ↞--------| STATS |--------↠ 
+             hp:        190
+         attack:         33
+        defense:         58
+ special-attack:         33
+special-defense:         58
+          speed:         33
+
+Pokedex ID: 202	Capture Rate: 45
+Base Exp: 142	Happiness: 50
+Height: 13	Weight: 285
+
+Genus: Patient Pokémon
+Location Areas:
+lake-verity-before-galactic-intervention
+lake-verity-after-galactic-intervention
+lake-valor-area
+lake-acuity-area
+dark-cave-blackthorn-city-entrance
+cerulean-cave-1f
+cerulean-cave-2f
+cerulean-cave-b1f
+hoenn-safari-zone-sw
+hoenn-safari-zone-se
+ruin-valley-area
+reflection-cave-unknown-area-305
+reflection-cave-unknown-area-306
+reflection-cave-unknown-area-307
+reflection-cave-unknown-area-308
+johto-safari-zone-zone-peak
diff --git a/pokeData/woobat b/pokeData/woobat
index 6a0c54a..50aec4c 100644
--- a/pokeData/woobat
+++ b/pokeData/woobat
@@ -1,15 +1,64 @@
+woobat	A psychic type Pokémon
 
-Name:  Woobat
-Pokedex Number:  527
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Unaware - Klutz - Simple (Hidden Ability)
+어두운 숲이나 동굴에서 산다.
+콧구멍에서 초음파를 쏘아
+주변의 모습을 살핀다.
 
-Base Stats
-----------------------
-Total: 313
-Hp:  55
-Attack:  45
-Defence:  43
-Special Attack:  55
-Special Defence:  43
-Speed:  72
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         45
+        defense:         43
+ special-attack:         55
+special-defense:         43
+          speed:         72
+
+Pokedex ID: 527	Capture Rate: 190
+Base Exp: 65	Happiness: 50
+Height: 4	Weight: 21
+
+Genus: Bat Pokémon
+Location Areas:
+twist-mountain-area
+unova-victory-road-unknown-area-53
+unova-victory-road-unknown-area-54
+unova-victory-road-unknown-area-55
+unova-victory-road-unknown-area-56
+unova-victory-road-unknown-area-57
+unova-victory-road-unknown-area-58
+unova-victory-road-unknown-area-59
+unova-victory-road-unknown-area-60
+unova-victory-road-unknown-area-61
+unova-victory-road-unknown-area-62
+unova-victory-road-unknown-area-63
+unova-victory-road-unknown-area-64
+unova-victory-road-unknown-area-65
+unova-victory-road-unknown-area-66
+trial-chamber-area
+wellspring-cave-area
+mistralton-cave-area
+guidance-chamber-area
+challengers-cave-1f
+challengers-cave-b1f
+challengers-cave-b2f
+reversal-mountain-unknown-area-49
+reversal-mountain-unknown-area-50
+reversal-mountain-unknown-area-51
+reversal-mountain-unknown-area-52
+reversal-mountain-unknown-area-53
+reversal-mountain-unknown-area-54
+reversal-mountain-unknown-area-55
+reversal-mountain-unknown-area-56
+reversal-mountain-unknown-area-57
+reversal-mountain-unknown-area-58
+reversal-mountain-unknown-area-59
+reversal-mountain-unknown-area-60
+relic-passage-castelia-sewers-entrance
+relic-passage-relic-castle-entrance
+relic-passage-pwt-entrance
+clay-tunnel-area
+underground-ruins-area
+rocky-mountain-room-area
+glacier-room-area
+iron-room-area
+seaside-cave-1f
+seaside-cave-b1f
diff --git a/pokeData/wooloo b/pokeData/wooloo
index 14d0d4b..c5844c5 100644
--- a/pokeData/wooloo
+++ b/pokeData/wooloo
@@ -1,15 +1,21 @@
+wooloo	A normal type Pokémon
 
-Name:  Wooloo
-Pokedex Number:  831
-Gender Ratio:   ♂:50.2% ♀:49.8%
-Abilities: Fluffy - Run Away - Bulletproof (Hidden Ability)
+Its curly fleece is such an effective cushion that
+this Pokémon could fall off a cliff and stand right
+back up at the bottom, unharmed.
+
+   ↞--------| STATS |--------↠ 
+             hp:         42
+         attack:         40
+        defense:         55
+ special-attack:         40
+special-defense:         45
+          speed:         48
+
+Pokedex ID: 831	Capture Rate: 255
+Base Exp: 122	Happiness: 50
+Height: 6	Weight: 60
+
+Genus: Sheep Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 270
-Hp:  42
-Attack:  40
-Defence:  55
-Special Attack:  40
-Special Defence:  45
-Speed:  48
diff --git a/pokeData/wooper b/pokeData/wooper
index d3ae1eb..278da5f 100644
--- a/pokeData/wooper
+++ b/pokeData/wooper
@@ -1,15 +1,41 @@
+wooper	A water type Pokémon
 
-Name:  Wooper
-Pokedex Number:  194
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Damp - Water Absorb - Unaware (Hidden Ability)
+This POKéMON lives in cold water. It will
+leave the water to search for food when
+it gets cold outside.
 
-Base Stats
-----------------------
-Total: 210
-Hp:  55
-Attack:  45
-Defence:  45
-Special Attack:  25
-Special Defence:  25
-Speed:  15
+   ↞--------| STATS |--------↠ 
+             hp:         55
+         attack:         45
+        defense:         45
+ special-attack:         25
+special-defense:         25
+          speed:         15
+
+Pokedex ID: 194	Capture Rate: 255
+Base Exp: 42	Happiness: 50
+Height: 4	Weight: 85
+
+Genus: Water Fish Pokémon
+Location Areas:
+great-marsh-area-1
+great-marsh-area-2
+great-marsh-area-3
+great-marsh-area-4
+great-marsh-area-5
+great-marsh-area-6
+sinnoh-route-212-east-towards-pastoria-city
+johto-route-32-area
+ruins-of-alph-outside
+union-cave-1f
+union-cave-b1f
+johto-route-47-cave-gate
+johto-route-47-inside-cave
+hoenn-safari-zone-expansion-south
+icefall-cave-entrance
+ruin-valley-area
+four-island-area
+violet-city-pokemon-center
+johto-safari-zone-zone-meadow
+johto-safari-zone-zone-marshland
+johto-safari-zone-zone-wetland
diff --git a/pokeData/wormadam b/pokeData/wormadam
index 3e0d2f2..4bea176 100644
--- a/pokeData/wormadam
+++ b/pokeData/wormadam
@@ -1,15 +1,15 @@
+	A  type Pokémon
 
-Name:  Wormadam
-Pokedex Number:  413
-Gender Ratio:  
-Abilities: Anticipation - Overcoat (Hidden Ability)
+À l’évolution, son corps absorbe
+les matériaux à proximité et peut
+ainsi présenter divers aspects.
+
+   ↞--------| STATS |--------↠ 
+
+Pokedex ID: 	Capture Rate: 45
+Base Exp: 	Happiness: 70
+Height: 	Weight: 
+
+Genus: Bagworm Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 424
-Hp:  60
-Attack:  69
-Defence:  95
-Special Attack:  69
-Special Defence:  95
-Speed:  36
diff --git a/pokeData/wurmple b/pokeData/wurmple
index 658630c..861aad9 100644
--- a/pokeData/wurmple
+++ b/pokeData/wurmple
@@ -1,15 +1,28 @@
+wurmple	A bug type Pokémon
 
-Name:  Wurmple
-Pokedex Number:  265
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Shield Dust - Run Away (Hidden Ability)
+It loves to eat leaves. If it is
+attacked by a STARLY, it will defend
+itself with its spiked rear.
 
-Base Stats
-----------------------
-Total: 195
-Hp:  45
-Attack:  45
-Defence:  35
-Special Attack:  20
-Special Defence:  30
-Speed:  20
+   ↞--------| STATS |--------↠ 
+             hp:         45
+         attack:         45
+        defense:         35
+ special-attack:         20
+special-defense:         30
+          speed:         20
+
+Pokedex ID: 265	Capture Rate: 255
+Base Exp: 56	Happiness: 70
+Height: 3	Weight: 36
+
+Genus: Worm Pokémon
+Location Areas:
+eterna-forest-area
+sinnoh-route-204-south-towards-jubilife-city
+sinnoh-route-204-north-towards-floaroma-town
+sinnoh-route-205-east-towards-eterna-city
+petalburg-woods-area
+hoenn-route-101-area
+hoenn-route-102-area
+hoenn-route-104-area
diff --git a/pokeData/wynaut b/pokeData/wynaut
index 121bafb..77070c8 100644
--- a/pokeData/wynaut
+++ b/pokeData/wynaut
@@ -1,15 +1,22 @@
+wynaut	A psychic type Pokémon
 
-Name:  Wynaut
-Pokedex Number:  360
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Shadow Tag - Telepathy (Hidden Ability)
+It grows strong by pushing up
+against others en masse.
+It loves eating sweet fruit.
 
-Base Stats
-----------------------
-Total: 260
-Hp:  95
-Attack:  23
-Defence:  48
-Special Attack:  23
-Special Defence:  48
-Speed:  23
+   ↞--------| STATS |--------↠ 
+             hp:         95
+         attack:         23
+        defense:         48
+ special-attack:         23
+special-defense:         48
+          speed:         23
+
+Pokedex ID: 360	Capture Rate: 125
+Base Exp: 52	Happiness: 50
+Height: 6	Weight: 140
+
+Genus: Bright Pokémon
+Location Areas:
+hoenn-route-130-area
+lavaridge-town-area
diff --git a/pokeData/wyrdeer b/pokeData/wyrdeer
index d10388f..3809231 100644
--- a/pokeData/wyrdeer
+++ b/pokeData/wyrdeer
@@ -1,15 +1,19 @@
+wyrdeer	A normal type Pokémon
 
-Name:  Wyrdeer
-Pokedex Number:  899
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Intimidate - Frisk - Sap Sipper (Hidden Ability)
+                null
+
+   ↞--------| STATS |--------↠ 
+             hp:        103
+         attack:        105
+        defense:         72
+ special-attack:        105
+special-defense:         75
+          speed:         65
+
+Pokedex ID: 899	Capture Rate: 135
+Base Exp: null	Happiness: null
+Height: 18	Weight: 951
+
+Genus: null
+Location Areas:
 
-Base Stats
-----------------------
-Total: 525
-Hp:  103
-Attack:  105
-Defence:  72
-Special Attack:  105
-Special Defence:  75
-Speed:  65
diff --git a/pokeData/xatu b/pokeData/xatu
index 7957841..7df9ed8 100644
--- a/pokeData/xatu
+++ b/pokeData/xatu
@@ -1,15 +1,21 @@
+xatu	A psychic type Pokémon
 
-Name:  Xatu
-Pokedex Number:  178
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Synchronize - Early Bird - Magic Bounce (Hidden Ability)
+They say that it stays still and quiet
+because it is seeing both the past and
+future at the same time.
 
-Base Stats
-----------------------
-Total: 470
-Hp:  65
-Attack:  75
-Defence:  70
-Special Attack:  95
-Special Defence:  70
-Speed:  95
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         75
+        defense:         70
+ special-attack:         95
+special-defense:         70
+          speed:         95
+
+Pokedex ID: 178	Capture Rate: 75
+Base Exp: 165	Happiness: 50
+Height: 15	Weight: 150
+
+Genus: Mystic Pokémon
+Location Areas:
+hoenn-safari-zone-neacro-bike-area
diff --git a/pokeData/xerneas b/pokeData/xerneas
index b885b92..dc44e65 100644
--- a/pokeData/xerneas
+++ b/pokeData/xerneas
@@ -1,15 +1,21 @@
+xerneas	A fairy type Pokémon
 
-Name:  Xerneas
-Pokedex Number:  716
-Gender Ratio:  Genderless
-Abilities: Fairy Aura
+永遠の　命を　分け与えると
+言われている。樹木の　姿で
+１０００年　眠り　復活する。
+
+   ↞--------| STATS |--------↠ 
+             hp:        126
+         attack:        131
+        defense:         95
+ special-attack:        131
+special-defense:         98
+          speed:         99
+
+Pokedex ID: 716	Capture Rate: 45
+Base Exp: 340	Happiness: 0
+Height: 30	Weight: 2150
+
+Genus: Life Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 680
-Hp:  126
-Attack:  131
-Defence:  95
-Special Attack:  131
-Special Defence:  98
-Speed:  99
diff --git a/pokeData/xurkitree b/pokeData/xurkitree
index 68af825..14843a0 100644
--- a/pokeData/xurkitree
+++ b/pokeData/xurkitree
@@ -1,15 +1,21 @@
+xurkitree	A electric type Pokémon
 
-Name:  Xurkitree
-Pokedex Number:  796
-Gender Ratio:  Genderless
-Abilities: Beast Boost
+One of the mysterious life-forms known as Ultra
+Beasts. Astonishing electric shocks emanate
+from its entire body, according to witnesses.
+
+   ↞--------| STATS |--------↠ 
+             hp:         83
+         attack:         89
+        defense:         71
+ special-attack:        173
+special-defense:         71
+          speed:         83
+
+Pokedex ID: 796	Capture Rate: 45
+Base Exp: 285	Happiness: 0
+Height: 38	Weight: 1000
+
+Genus: Glowing Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 570
-Hp:  83
-Attack:  89
-Defence:  71
-Special Attack:  173
-Special Defence:  71
-Speed:  83
diff --git a/pokeData/yamask b/pokeData/yamask
index 7663ce8..a96be77 100644
--- a/pokeData/yamask
+++ b/pokeData/yamask
@@ -1,15 +1,22 @@
+yamask	A ghost type Pokémon
 
-Name:  Yamask
-Pokedex Number:  562
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Mummy
+무덤에 매장된 사람의
+영혼이 포켓몬으로 변했다.
+죽기 전 기억이 남아 있다.
 
-Base Stats
-----------------------
-Total: 303
-Hp:  38
-Attack:  30
-Defence:  85
-Special Attack:  55
-Special Defence:  65
-Speed:  30
+   ↞--------| STATS |--------↠ 
+             hp:         38
+         attack:         30
+        defense:         85
+ special-attack:         55
+special-defense:         65
+          speed:         30
+
+Pokedex ID: 562	Capture Rate: 190
+Base Exp: 61	Happiness: 50
+Height: 5	Weight: 15
+
+Genus: Spirit Pokémon
+Location Areas:
+relic-castle-a
+relic-castle-c
diff --git a/pokeData/yamper b/pokeData/yamper
index 429fbc9..1d4c087 100644
--- a/pokeData/yamper
+++ b/pokeData/yamper
@@ -1,15 +1,21 @@
+yamper	A electric type Pokémon
 
-Name:  Yamper
-Pokedex Number:  835
-Gender Ratio:   ♂:50.2% ♀:49.8%
-Abilities: Ball Fetch - Rattled (Hidden Ability)
+This Pokémon is very popular as a herding dog
+in the Galar region. As it runs, it generates
+electricity from the base of its tail.
+
+   ↞--------| STATS |--------↠ 
+             hp:         59
+         attack:         45
+        defense:         50
+ special-attack:         40
+special-defense:         50
+          speed:         26
+
+Pokedex ID: 835	Capture Rate: 255
+Base Exp: 54	Happiness: 50
+Height: 3	Weight: 135
+
+Genus: Puppy Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 270
-Hp:  59
-Attack:  45
-Defence:  50
-Special Attack:  40
-Special Defence:  50
-Speed:  26
diff --git a/pokeData/yanma b/pokeData/yanma
index 4236b60..94a4ddf 100644
--- a/pokeData/yanma
+++ b/pokeData/yanma
@@ -1,15 +1,30 @@
+yanma	A bug type Pokémon
 
-Name:  Yanma
-Pokedex Number:  193
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Speed Boost - Compoundeyes - Frisk (Hidden Ability)
+If it flaps its wings really fast, it can
+generate shock waves that will shatter
+windows in the area.
 
-Base Stats
-----------------------
-Total: 390
-Hp:  65
-Attack:  65
-Defence:  45
-Special Attack:  75
-Special Defence:  45
-Speed:  95
+   ↞--------| STATS |--------↠ 
+             hp:         65
+         attack:         65
+        defense:         45
+ special-attack:         75
+special-defense:         45
+          speed:         95
+
+Pokedex ID: 193	Capture Rate: 75
+Base Exp: 78	Happiness: 70
+Height: 12	Weight: 380
+
+Genus: Clear Wing Pokémon
+Location Areas:
+great-marsh-area-1
+great-marsh-area-2
+great-marsh-area-3
+great-marsh-area-4
+great-marsh-area-5
+great-marsh-area-6
+johto-route-35-area
+ruin-valley-area
+pinwheel-forest-outside
+unova-route-3-area
diff --git a/pokeData/yanmega b/pokeData/yanmega
index 2e7d58a..e41618a 100644
--- a/pokeData/yanmega
+++ b/pokeData/yanmega
@@ -1,15 +1,22 @@
+yanmega	A bug type Pokémon
 
-Name:  Yanmega
-Pokedex Number:  469
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Speed Boost - Tinted Lens - Frisk (Hidden Ability)
+Doté de mandibules à la force
+colossale, il excelle pour mordre
+ses ennemis en plein vol.
 
-Base Stats
-----------------------
-Total: 515
-Hp:  86
-Attack:  76
-Defence:  86
-Special Attack:  116
-Special Defence:  56
-Speed:  95
+   ↞--------| STATS |--------↠ 
+             hp:         86
+         attack:         76
+        defense:         86
+ special-attack:        116
+special-defense:         56
+          speed:         95
+
+Pokedex ID: 469	Capture Rate: 30
+Base Exp: 180	Happiness: 70
+Height: 19	Weight: 515
+
+Genus: Ogre Darner Pokémon
+Location Areas:
+pinwheel-forest-outside
+unova-route-3-area
diff --git a/pokeData/yungoos b/pokeData/yungoos
index 4a43c81..edfb2e9 100644
--- a/pokeData/yungoos
+++ b/pokeData/yungoos
@@ -1,15 +1,21 @@
+yungoos	A normal type Pokémon
 
-Name:  Yungoos
-Pokedex Number:  734
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Stakeout - Strong Jaw - Adaptability (Hidden Ability)
+Addenta qualsiasi cosa con le sue zanne
+aguzze. È stato introdotto ad Alola tempo fa
+da un’altra regione.
+
+   ↞--------| STATS |--------↠ 
+             hp:         48
+         attack:         70
+        defense:         30
+ special-attack:         30
+special-defense:         30
+          speed:         45
+
+Pokedex ID: 734	Capture Rate: 255
+Base Exp: 51	Happiness: 70
+Height: 4	Weight: 60
+
+Genus: Loitering Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 253
-Hp:  48
-Attack:  70
-Defence:  30
-Special Attack:  30
-Special Defence:  30
-Speed:  45
diff --git a/pokeData/yveltal b/pokeData/yveltal
index fb3f3d4..3f2af6e 100644
--- a/pokeData/yveltal
+++ b/pokeData/yveltal
@@ -1,15 +1,21 @@
+yveltal	A dark type Pokémon
 
-Name:  Yveltal
-Pokedex Number:  717
-Gender Ratio:  Genderless
-Abilities: Dark Aura
+翼と　尾羽を　広げて　赤く　輝くとき
+生き物の　命を　吸い取る
+伝説の　ポケモン。
+
+   ↞--------| STATS |--------↠ 
+             hp:        126
+         attack:        131
+        defense:         95
+ special-attack:        131
+special-defense:         98
+          speed:         99
+
+Pokedex ID: 717	Capture Rate: 45
+Base Exp: 340	Happiness: 0
+Height: 58	Weight: 2030
+
+Genus: Destruction Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 680
-Hp:  126
-Attack:  131
-Defence:  95
-Special Attack:  131
-Special Defence:  98
-Speed:  99
diff --git a/pokeData/zacian b/pokeData/zacian
index eee7de9..6aeeb72 100644
--- a/pokeData/zacian
+++ b/pokeData/zacian
@@ -1,15 +1,21 @@
+zacian	A fairy type Pokémon
 
-Name:  Zacian
-Pokedex Number:  888
-Gender Ratio:  Genderless
-Abilities: Intrepid Sword
+Known as a legendary hero, this Pokémon
+absorbs metal particles, transforming them
+into a weapon it uses to battle.
+
+   ↞--------| STATS |--------↠ 
+             hp:         92
+         attack:        130
+        defense:        115
+ special-attack:         80
+special-defense:        115
+          speed:        138
+
+Pokedex ID: 888	Capture Rate: 10
+Base Exp: 335	Happiness: 0
+Height: 28	Weight: 1100
+
+Genus: Warrior Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 660
-Hp:  92
-Attack:  150
-Defence:  115
-Special Attack:  80
-Special Defence:  115
-Speed:  148
diff --git a/pokeData/zamazenta b/pokeData/zamazenta
index 5b721d9..538fd88 100644
--- a/pokeData/zamazenta
+++ b/pokeData/zamazenta
@@ -1,15 +1,21 @@
+zamazenta	A fighting type Pokémon
 
-Name:  Zamazenta
-Pokedex Number:  889
-Gender Ratio:  Genderless
-Abilities: Dauntless Shield
+In times past, it worked together with a king of
+the people to save the Galar region. It absorbs
+metal that it then uses in battle.
+
+   ↞--------| STATS |--------↠ 
+             hp:         92
+         attack:        130
+        defense:        115
+ special-attack:         80
+special-defense:        115
+          speed:        138
+
+Pokedex ID: 889	Capture Rate: 10
+Base Exp: 335	Happiness: 0
+Height: 29	Weight: 2100
+
+Genus: Warrior Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 660
-Hp:  92
-Attack:  120
-Defence:  140
-Special Attack:  80
-Special Defence:  140
-Speed:  128
diff --git a/pokeData/zangoose b/pokeData/zangoose
index b71c8f1..5a5fd5f 100644
--- a/pokeData/zangoose
+++ b/pokeData/zangoose
@@ -1,15 +1,27 @@
+zangoose	A normal type Pokémon
 
-Name:  Zangoose
-Pokedex Number:  335
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Immunity - Toxic Boost (Hidden Ability)
+It has feuded with SEVIPER for
+many generations. Its sharp claws
+are its biggest weapons.
 
-Base Stats
-----------------------
-Total: 458
-Hp:  73
-Attack:  115
-Defence:  60
-Special Attack:  60
-Special Defence:  60
-Speed:  90
+   ↞--------| STATS |--------↠ 
+             hp:         73
+         attack:        115
+        defense:         60
+ special-attack:         60
+special-defense:         60
+          speed:         90
+
+Pokedex ID: 335	Capture Rate: 90
+Base Exp: 160	Happiness: 70
+Height: 13	Weight: 403
+
+Genus: Cat Ferret Pokémon
+Location Areas:
+sinnoh-route-208-area
+sinnoh-route-210-west-towards-celestic-town
+hoenn-route-114-area
+village-bridge-area
+unova-route-7-area
+unova-route-11-area
+kalos-route-8-area
diff --git a/pokeData/zapdos b/pokeData/zapdos
index 358fd24..68500c6 100644
--- a/pokeData/zapdos
+++ b/pokeData/zapdos
@@ -1,15 +1,24 @@
+zapdos	A electric type Pokémon
 
-Name:  Zapdos
-Pokedex Number:  145
-Gender Ratio:  Genderless
-Abilities: Pressure - Static (Hidden Ability)
+ZAPDOS is a legendary bird POKéMON that
+has the ability to control electricity.
+It usually lives in thunderclouds.The POKéMON gains power if it is
+stricken by lightning bolts.
 
-Base Stats
-----------------------
-Total: 580
-Hp:  90
-Attack:  90
-Defence:  85
-Special Attack:  125
-Special Defence:  90
-Speed:  100
+   ↞--------| STATS |--------↠ 
+             hp:         90
+         attack:         90
+        defense:         85
+ special-attack:        125
+special-defense:         90
+          speed:        100
+
+Pokedex ID: 145	Capture Rate: 3
+Base Exp: 290	Happiness: 35
+Height: 16	Weight: 526
+
+Genus: Electric Pokémon
+Location Areas:
+kanto-route-10-area
+power-plant-area
+roaming-sinnoh-area
diff --git a/pokeData/zarude b/pokeData/zarude
index b2bd43f..bcba345 100644
--- a/pokeData/zarude
+++ b/pokeData/zarude
@@ -1,15 +1,21 @@
+zarude	A dark type Pokémon
 
-Name:  Zarude
-Pokedex Number:  893
-Gender Ratio:  Genderless
-Abilities: Leaf Guard
+Within dense forests, this Pokémon lives in a pack
+with others of its kind. It’s incredibly aggressive,
+and the other Pokémon of the forest fear it.
+
+   ↞--------| STATS |--------↠ 
+             hp:        105
+         attack:        120
+        defense:        105
+ special-attack:         70
+special-defense:         95
+          speed:        105
+
+Pokedex ID: 893	Capture Rate: 3
+Base Exp: 300	Happiness: 0
+Height: 18	Weight: 700
+
+Genus: Rogue Monkey Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 600
-Hp:  105
-Attack:  120
-Defence:  105
-Special Attack:  70
-Special Defence:  95
-Speed:  105
diff --git a/pokeData/zebstrika b/pokeData/zebstrika
index e8ede8f..0d4863e 100644
--- a/pokeData/zebstrika
+++ b/pokeData/zebstrika
@@ -1,15 +1,22 @@
+zebstrika	A electric type Pokémon
 
-Name:  Zebstrika
-Pokedex Number:  523
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Lightningrod - Motor Drive - Sap Sipper (Hidden Ability)
+격렬한 기질의 소유자.
+날뛰면 갈기에서 번개를
+사방팔방으로 방전한다.
 
-Base Stats
-----------------------
-Total: 497
-Hp:  75
-Attack:  100
-Defence:  63
-Special Attack:  80
-Special Defence:  63
-Speed:  116
+   ↞--------| STATS |--------↠ 
+             hp:         75
+         attack:        100
+        defense:         63
+ special-attack:         80
+special-defense:         63
+          speed:        116
+
+Pokedex ID: 523	Capture Rate: 75
+Base Exp: 174	Happiness: 70
+Height: 16	Weight: 795
+
+Genus: Thunderbolt Pokémon
+Location Areas:
+unova-route-3-area
+unova-route-7-area
diff --git a/pokeData/zekrom b/pokeData/zekrom
index de912cf..fc43c8e 100644
--- a/pokeData/zekrom
+++ b/pokeData/zekrom
@@ -1,15 +1,21 @@
+zekrom	A dragon type Pokémon
 
-Name:  Zekrom
-Pokedex Number:  644
-Gender Ratio:  Genderless
-Abilities: Teravolt
+번개로 세상을 태워버릴 수 있는
+전설의 포켓몬. 이상의 세계를
+구축하는 사람을 보좌한다.
+
+   ↞--------| STATS |--------↠ 
+             hp:        100
+         attack:        150
+        defense:        120
+ special-attack:        120
+special-defense:        100
+          speed:         90
+
+Pokedex ID: 644	Capture Rate: 3
+Base Exp: 340	Happiness: 0
+Height: 29	Weight: 3450
+
+Genus: Deep Black Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 680
-Hp:  100
-Attack:  150
-Defence:  120
-Special Attack:  120
-Special Defence:  100
-Speed:  90
diff --git a/pokeData/zeraora b/pokeData/zeraora
index 6355944..178cd6c 100644
--- a/pokeData/zeraora
+++ b/pokeData/zeraora
@@ -1,15 +1,21 @@
+zeraora	A electric type Pokémon
 
-Name:  Zeraora
-Pokedex Number:  807
-Gender Ratio:  Genderless
-Abilities: Volt Absorb
+It electrifies its claws and tears its opponents
+apart with them. Even if they dodge its attack,
+they’ll be electrocuted by the flying sparks.
+
+   ↞--------| STATS |--------↠ 
+             hp:         88
+         attack:        112
+        defense:         75
+ special-attack:        102
+special-defense:         80
+          speed:        143
+
+Pokedex ID: 807	Capture Rate: 3
+Base Exp: 300	Happiness: 0
+Height: 15	Weight: 445
+
+Genus: Thunderclap Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 600
-Hp:  88
-Attack:  112
-Defence:  75
-Special Attack:  102
-Special Defence:  80
-Speed:  143
diff --git a/pokeData/zigzagoon b/pokeData/zigzagoon
index 1c52a42..faa46e0 100644
--- a/pokeData/zigzagoon
+++ b/pokeData/zigzagoon
@@ -1,15 +1,49 @@
+zigzagoon	A normal type Pokémon
 
-Name:  Zigzagoon
-Pokedex Number:  263
-Gender Ratio:   ♂:50% ♀:50%
-Abilities: Pickup - Gluttony - Quick Feet (Hidden Ability)
+It walks in zigzag fashion. It is
+good at finding items in the
+grass and even in the ground.
 
-Base Stats
-----------------------
-Total: 240
-Hp:  38
-Attack:  30
-Defence:  41
-Special Attack:  30
-Special Defence:  41
-Speed:  60
+   ↞--------| STATS |--------↠ 
+             hp:         38
+         attack:         30
+        defense:         41
+ special-attack:         30
+special-defense:         41
+          speed:         60
+
+Pokedex ID: 263	Capture Rate: 255
+Base Exp: 56	Happiness: 50
+Height: 4	Weight: 175
+
+Genus: Tiny Raccoon Pokémon
+Location Areas:
+sinnoh-route-202-area
+sprout-tower-2f
+sprout-tower-3f
+burned-tower-1f
+burned-tower-b1f
+bell-tower-2f
+bell-tower-3f
+bell-tower-4f
+bell-tower-5f
+bell-tower-6f
+bell-tower-7f
+bell-tower-8f
+bell-tower-9f
+bell-tower-10f
+unknown-all-rattata-area
+petalburg-woods-area
+hoenn-route-101-area
+hoenn-route-102-area
+hoenn-route-103-area
+hoenn-route-104-area
+hoenn-route-110-area
+hoenn-route-116-area
+hoenn-route-117-area
+hoenn-route-118-area
+hoenn-route-119-area
+hoenn-route-120-area
+hoenn-route-121-area
+hoenn-route-123-area
+kalos-route-2-area
diff --git a/pokeData/zoroark b/pokeData/zoroark
index 42e2b71..c0c1dbf 100644
--- a/pokeData/zoroark
+++ b/pokeData/zoroark
@@ -1,15 +1,22 @@
+zoroark	A dark type Pokémon
 
-Name:  Zoroark
-Pokedex Number:  571
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Illusion
+한 번에 많은 사람을
+속이는 힘을 가졌다. 환영의
+경치를 보여줘 거처를 지킨다.
 
-Base Stats
-----------------------
-Total: 510
-Hp:  60
-Attack:  105
-Defence:  60
-Special Attack:  120
-Special Defence:  60
-Speed:  105
+   ↞--------| STATS |--------↠ 
+             hp:         60
+         attack:        105
+        defense:         60
+ special-attack:        120
+special-defense:         60
+          speed:        105
+
+Pokedex ID: 571	Capture Rate: 45
+Base Exp: 179	Happiness: 50
+Height: 16	Weight: 811
+
+Genus: Illusion Fox Pokémon
+Location Areas:
+kalos-route-20-area
+pokemon-village-area
diff --git a/pokeData/zorua b/pokeData/zorua
index ffedb9f..bae9538 100644
--- a/pokeData/zorua
+++ b/pokeData/zorua
@@ -1,15 +1,22 @@
+zorua	A dark type Pokémon
 
-Name:  Zorua
-Pokedex Number:  570
-Gender Ratio:   ♂:87.5% ♀:12.5%
-Abilities: Illusion
+상대와 똑 닮게 둔갑한 것처럼
+보이게 하여 속이거나 놀라게 해서
+그 틈에 도망가는 일이 많다.
 
-Base Stats
-----------------------
-Total: 330
-Hp:  40
-Attack:  65
-Defence:  40
-Special Attack:  80
-Special Defence:  40
-Speed:  65
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         65
+        defense:         40
+ special-attack:         80
+special-defense:         40
+          speed:         65
+
+Pokedex ID: 570	Capture Rate: 75
+Base Exp: 66	Happiness: 50
+Height: 7	Weight: 125
+
+Genus: Tricky Fox Pokémon
+Location Areas:
+driftveil-city-area
+castelia-city-game-freak-hq-1f
diff --git a/pokeData/zubat b/pokeData/zubat
index 0a05ff7..ec808c2 100644
--- a/pokeData/zubat
+++ b/pokeData/zubat
@@ -1,15 +1,136 @@
+zubat	A poison type Pokémon
 
-Name:  Zubat
-Pokedex Number:  041
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Inner Focus - Infiltrator (Hidden Ability)
+During the day, it
+gathers with
+others and hangsfrom the ceilings
+of old buildings
+and caves.
 
-Base Stats
-----------------------
-Total: 245
-Hp:  40
-Attack:  45
-Defence:  35
-Special Attack:  30
-Special Defence:  40
-Speed:  55
+   ↞--------| STATS |--------↠ 
+             hp:         40
+         attack:         45
+        defense:         35
+ special-attack:         30
+special-defense:         40
+          speed:         55
+
+Pokedex ID: 41	Capture Rate: 255
+Base Exp: 49	Happiness: 50
+Height: 8	Weight: 75
+
+Genus: Bat Pokémon
+Location Areas:
+oreburgh-mine-1f
+oreburgh-mine-b1f
+mt-coronet-1f-route-207
+mt-coronet-4f
+mt-coronet-1f-route-211
+mt-coronet-b1f
+ravaged-path-area
+oreburgh-gate-1f
+oreburgh-gate-b1f
+wayward-cave-1f
+wayward-cave-b1f
+iron-island-1f
+acuity-lakefront-area
+sinnoh-route-203-area
+sinnoh-route-204-south-towards-jubilife-city
+sinnoh-route-204-north-towards-floaroma-town
+sinnoh-route-206-area
+sinnoh-route-207-area
+sinnoh-route-208-area
+sinnoh-route-209-area
+lost-tower-1f
+lost-tower-2f
+lost-tower-3f
+lost-tower-4f
+lost-tower-5f
+sinnoh-route-211-west-towards-eterna-city
+sinnoh-route-211-east-towards-celestic-town
+sinnoh-route-214-area
+sinnoh-route-216-area
+sinnoh-route-217-area
+johto-route-30-area
+johto-route-31-area
+johto-route-32-area
+union-cave-1f
+union-cave-b1f
+union-cave-b2f
+johto-route-33-area
+slowpoke-well-1f
+slowpoke-well-b1f
+ilex-forest-area
+burned-tower-1f
+burned-tower-b1f
+whirl-islands-1f
+whirl-islands-b1f
+whirl-islands-b2f
+whirl-islands-b3f
+johto-route-42-area
+mt-mortar-1f
+mt-mortar-lower-cave
+mt-mortar-b1f
+ice-path-1f
+ice-path-b1f
+ice-path-b2f
+ice-path-b3f
+dark-cave-violet-city-entrance
+dark-cave-blackthorn-city-entrance
+seafoam-islands-1f
+seafoam-islands-b1f
+seafoam-islands-b2f
+seafoam-islands-b3f
+seafoam-islands-b4f
+johto-route-47-inside-cave
+mt-moon-1f
+mt-moon-2f
+rock-tunnel-1f
+rock-tunnel-b1f
+kanto-route-3-area
+kanto-route-4-area
+kanto-route-9-area
+kanto-route-10-area
+tohjo-falls-area
+mt-moon-b1f
+mt-moon-b2f
+rock-tunnel-b2f
+kanto-victory-road-2-1f
+kanto-victory-road-2-2f
+kanto-victory-road-2-3f
+meteor-falls-area
+granite-cave-1f
+granite-cave-b1f
+granite-cave-b2f
+granite-cave-1fsmall-room
+seafloor-cavern-area
+cave-of-origin-entrance
+cave-of-origin-1f
+cave-of-origin-b1f
+cave-of-origin-b2f
+cave-of-origin-b3f
+hoenn-victory-road-1f
+shoal-cave-area
+shoal-cave-b1f
+hoenn-altering-cave-a
+icefall-cave-entrance
+icefall-cave-1f
+icefall-cave-b1f
+icefall-cave-waterfall
+lost-cave-room-1
+lost-cave-room-2
+lost-cave-room-3
+lost-cave-room-4
+lost-cave-room-5
+lost-cave-room-6
+lost-cave-room-7
+lost-cave-room-8
+lost-cave-room-9
+lost-cave-room-10
+lost-cave-item-rooms
+kanto-altering-cave-a
+castelia-sewers-area
+castelia-sewers-unknown-area-38
+connecting-cave-area
+johto-safari-zone-zone-mountain
+johto-safari-zone-zone-rocky-beach
+johto-safari-zone-zone-savannah
diff --git a/pokeData/zweilous b/pokeData/zweilous
index 0391d7d..6eb3605 100644
--- a/pokeData/zweilous
+++ b/pokeData/zweilous
@@ -1,15 +1,26 @@
+zweilous	A dark type Pokémon
 
-Name:  Zweilous
-Pokedex Number:  634
-Gender Ratio:   ♂:50% ♀:50% 
-Abilities: Hustle
+２つの　あたまは　なかが　わるく
+あいてより　おおく　たべることで
+しゅどうけんを　にぎろうと　する。
 
-Base Stats
-----------------------
-Total: 420
-Hp:  72
-Attack:  85
-Defence:  70
-Special Attack:  65
-Special Defence:  70
-Speed:  58
+   ↞--------| STATS |--------↠ 
+             hp:         72
+         attack:         85
+        defense:         70
+ special-attack:         65
+special-defense:         70
+          speed:         58
+
+Pokedex ID: 634	Capture Rate: 45
+Base Exp: 147	Happiness: 35
+Height: 14	Weight: 500
+
+Genus: Hostile Pokémon
+Location Areas:
+unova-victory-road-2-unknown-area-77
+unova-victory-road-2-unknown-area-80
+kalos-victory-road-unknown-area-322
+kalos-victory-road-unknown-area-324
+kalos-victory-road-unknown-area-326
+kalos-victory-road-unknown-area-328
diff --git a/pokeData/zygarde b/pokeData/zygarde
index 1aab59c..2ebea26 100644
--- a/pokeData/zygarde
+++ b/pokeData/zygarde
@@ -1,15 +1,15 @@
+	A  type Pokémon
 
-Name:  Zygarde
-Pokedex Number:  718
-Gender Ratio:  Genderless
-Abilities: Aura Break
+カロス地方の　生態系が　崩れると
+姿を　現して
+秘めた　力を　発揮するらしい。
+
+   ↞--------| STATS |--------↠ 
+
+Pokedex ID: 	Capture Rate: 3
+Base Exp: 	Happiness: 0
+Height: 	Weight: 
+
+Genus: Order Pokémon
+Location Areas:
 
-Base Stats
-----------------------
-Total: 600
-Hp:  108
-Attack:  100
-Defence:  121
-Special Attack:  81
-Special Defence:  95
-Speed:  95
diff --git a/pokeInfo b/pokeInfo
index 735fb44..750a885 100755
--- a/pokeInfo
+++ b/pokeInfo
@@ -73,6 +73,7 @@ if page_not_found:
 ######## Get Stats ########
 base_total = soup2.find(string=re.compile("Base Stats - Total:"))
 # Only want everything after Total
+base_total = str("Total Unavailable")
 base_total = base_total[base_total.find("Total"):]
 base_stats = soup2.find_all(class_="fooinfo")
 
diff --git a/pokedex b/pokedex
index 8dfe0f5..d4513e1 100755
--- a/pokedex
+++ b/pokedex
@@ -1,27 +1,19 @@
 #!/bin/bash
 
-### Overhad preparation
-KBINDS="/usr/share/fuzzy-pokedex/keybindings-preview"
-POKEDATA="/usr/share/fuzzy-pokedex/pokeData"
-
 ### Help 
 help() {
-    printf "\n%s\n%s\n\n" "Use fzf to search Pokemon stats" "Can optionally search by name"
-	printf "%s\n\t%s\n\n" "EXAMPLE" "pokedex [pokemon name]"
-	printf "%s\n" "OPTIONS"
-	printf "%-25s\t%s\n" "  -q, --quick [pokemon]" "Prints single pokedex entry to terminal" \
-		"  -u, --update [N/+N/-N/N%]" "Scrape web for updated Pokemon stats" "" "  WARNING: update function is resource heavy" "" "  See Parallel job control (-j) for options" "" "  Default is 200%" \
-		"  -h, --help" "Print this help screen"
-	printf "\n%s\n" "KEYBINDS"
-	printf "%-15s\t%s\n" "  space" "Reads the Pokedex entry" \
-		"  ctrl-space" "Stops reading the Pokedex entry" \
-		"  ctrl-n" "Shows small sprite version" \
-		"  ctrl-b" "Shows large sprite version" \
-		"  ctrl-s" "Shows shiny sprite version" \
-		"  ctrl-h" "Shows this help screen in preview window"
-	printf "\n"
+    echo -e "\nUse fzf to search Pokemon stats\n"
+    echo -e "Can optionally search by name"
+	echo -e "EXAMPLE\n\tpokedex [pokemon name]\n"
+	echo -e "OPTIONS"
+	echo -e "\t-u, --update [N/+N/-N/N%]\n\t\tScrape web for updated Pokemon stats\n\t\tWARNING: update function is resource heavy\n\t\tSee Parallel job control (-j) for options\n\t\tDefault is 200%\n\t-h, --help\n\t\tPrint this help screen"
+	echo -e "KEYBINDS"
+	echo -e "\tctrl-n\tShows small sprite version\n\tctrl-b\tShows large sprite version\n\tctrl-s\tShows shiny sprite version\n\tctrl-h\tShows this help screen in preview window\n"
 }
 
+### Set pokeData location
+POKEDATA="./pokeData/"
+
 ### Pokedex viewer using pokemon-colorscripts and fzf
 pokedex() {
 	pokemon-colorscripts -l |
@@ -34,54 +26,47 @@ pokedex() {
 	--border-label="╢ Fuzzy-Pokedex ╟" \
 	--margin=4% \
 	--padding=4% \
-	--header="$(echo -e '  Choose a Pokemon to view info\n\t     ctrl+h to for help')" \
+	--header="$(echo -e 'Choose a Pokemon to view\n  ctrl+h to for help')" \
 	--info=inline:'  󰨉 ' \
   	--color='fg+:15,fg:42,preview-fg:15,label:9,preview-label:15,hl+:134,hl:123,query:134,gutter:0,border:9,prompt:15,pointer:15,marker:15' \
 	--tiebreak=begin,chunk,length \
-	--preview="printf '\n\t\t\t\t\t%s\n\t\t\t\t\t    %s\n' 'Press space to hear entry' 'ctrl+space to stop'; pokemon-colorscripts -n {1} --no-title; cat $POKEDATA/{1}" \
+	--preview="printf '\n\t\t\t\t\t%s\n\t\t\t\t\t   %s\n' 'Press space to hear entry' 'ctrl+space to stop'; pokemon-colorscripts -n {1} --no-title; cat $POKEDATA{1}" \
 	--preview-window=68%:wrap:border-rounded \
 	--bind=focus:transform-preview-label:'echo [ {1} ] ' \
-	--bind=ctrl-h:preview:"cat $KBINDS" \
-	--bind=space:preview:"printf '\n\t\t\t\t %s\n\t\t\t\t\t   %s\n' 'Select another Pokemon to stop audio' 'Or press ctrl+space'; pokemon-colorscripts -n {1} --no-title; cat $POKEDATA/{1}; espeak-ng -f $POKEDATA/{1} -g 4 -p 50 -s 145 -l 250 -ven+m3 &" \
-	--bind=ctrl-space:preview:"printf '\n\t\t\t\t\t%s\n\t\t\t\t\t   %s\n' 'Press space to hear entry' 'ctrl+space to stop'; pokemon-colorscripts -n {1} --no-title; cat $POKEDATA/{1};" \
-	--bind=ctrl-b:preview:"echo; pokemon-colorscripts -b -n {1} --no-title; cat $POKEDATA/{1};" \
-	--bind=ctrl-s:preview:"echo; pokemon-colorscripts -s -n {1} --no-title; cat $POKEDATA/{1};" \
-	--bind=ctrl-n:preview:"printf '\n\t\t\t\t\t%s\n\t\t\t\t\t   %s\n' 'Press space to hear entry' 'ctrl+space to stop'; pokemon-colorscripts -n {1} --no-title; cat $POKEDATA/{1};" |
-	parallel pokemon-colorscripts --no-title -n {} "&&" cat "$POKEDATA/{}" 
-}
-
-### Quick view returns single Pokemon stat instead of opening pokedex 
-quick_view() {
-	parallel pokemon-colorscripts --no-title -n {} "&&" cat "$POKEDATA/{}" <<<"$1"
+	--bind=ctrl-h:preview:"echo; pokedex -h;" \
+	--bind=space:preview:"echo; pokemon-colorscripts -n {1} --no-title; cat $POKEDATA/{1}; espeak-ng -f $POKEDATA/{1} -g 4 -p 50 -s 145 -l 250 -ven+m3 &" \
+	--bind=ctrl-space:preview:"echo; pokemon-colorscripts -n {1} --no-title; cat $POKEDATA/{1};" \
+	--bind=ctrl-b:preview:"echo; pokemon-colorscripts -b -n {1} --no-title; cat $POKEDATA{1};" \
+	--bind=ctrl-s:preview:"echo; pokemon-colorscripts -s -n {1} --no-title; cat $POKEDATA{1};" \
+	--bind=ctrl-n:preview:"echo; pokemon-colorscripts -n {1} --no-title; cat $POKEDATA{1};" |
+	parallel pokemon-colorscripts --no-title -n {} "&&" cat "$POKEDATA"{} 
 }
 
 ### Update Pokemon stats file set
 update_pokeData() {
-	printf "\n\t\t%s\n\t%s\n\n" "WARNING!!!" "This WILL take a long time"
-	pokemon-colorscripts -l | sort | parallel --progress --bar --color --retry-failed -j "${1:-200%}" pokeInfo {} ">" "$POKEDATA/{}" 2>&1
+	echo -e "\n\t\tWARNING!!!\n\tThis WILL take a long time\n"
+	if [[ -n "$1" ]]; then
+		pokemon-colorscripts -l | sort | parallel --bar --color --retry-failed -j "$1" pokeInfo {} ">" "$POKEDATA"{}
+	else
+		pokemon-colorscripts -l | sort | parallel --bar --color --retry-failed -j 200% pokeInfo {} ">" "$POKEDATA"{}
+	fi
 }
 
-### Arg parsing loop
 if [[ ! "$1" =~ ^- ]]; then
 	pokedex "$1"
 else
-	while (( $# )); do
-    	arg=$1
-		shift
-    	case "$arg" in
-			-q|--quick)
-				quick_view "$1"
-				;;
+	for opt in "$@"; do
+		case $opt in
     		-u|--update)
-				update_pokeData "$1"
+				update_pokeData "$2"
 				;;
     		-h|--help)
-    			help
-   				;;       			
+       			help
+       			;;       			
     		-*) 
-    			echo "Invalid Usage"
-   				help
-   				;;
+       			echo "Invalid Usage"
+       			help
+       			;;
     	esac
 	done
 fi