diff --git a/pokedex/data/csv/evolution_chains.csv b/pokedex/data/csv/evolution_chains.csv
index 0c9aca7..2a3d55c 100644
--- a/pokedex/data/csv/evolution_chains.csv
+++ b/pokedex/data/csv/evolution_chains.csv
@@ -467,9 +467,3 @@ id,baby_trigger_item_id
 474,
 475,
 476,
-477,
-478,
-479,
-480,
-481,
-482,
diff --git a/pokedex/data/csv/evolution_trigger_prose.csv b/pokedex/data/csv/evolution_trigger_prose.csv
index c070dd3..d28318b 100644
--- a/pokedex/data/csv/evolution_trigger_prose.csv
+++ b/pokedex/data/csv/evolution_trigger_prose.csv
@@ -14,3 +14,5 @@ evolution_trigger_id,local_language_id,name
 5,9,Spin
 6,9,Train in the Tower of Darkness
 7,9,Train in the Tower of Waters
+8,9,Land three critical hits in a battle
+9,9,Go somewhere after taking damage
diff --git a/pokedex/data/csv/evolution_triggers.csv b/pokedex/data/csv/evolution_triggers.csv
index 8dc0eff..fca9842 100644
--- a/pokedex/data/csv/evolution_triggers.csv
+++ b/pokedex/data/csv/evolution_triggers.csv
@@ -6,3 +6,5 @@ id,identifier
 5,spin
 6,tower-of-darkness
 7,tower-of-waters
+8,three-critical-hits
+9,take-damage
diff --git a/pokedex/data/csv/pokemon_evolution.csv b/pokedex/data/csv/pokemon_evolution.csv
index a767414..479f2dd 100644
--- a/pokedex/data/csv/pokemon_evolution.csv
+++ b/pokedex/data/csv/pokemon_evolution.csv
@@ -444,3 +444,16 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_
 445,887,1,,60,,,,,,,,,,,,,,0,0
 446,892,6,,,,,,,,,,,,,,,,0,0
 447,892,7,,,,,,,,,,,,,,,,0,0
+448,28,3,885,,,,,,,,,,,,,,,0,0
+449,38,3,885,,,,,,,,,,,,,,,0,0
+450,53,1,,,,,,,,,160,,,,,,,0,0
+451,863,1,,28,,,,,,,,,,,,,,0,0
+452,80,3,1633,,,,,,,,,,,,,,,0,0
+453,199,3,1643,,,,,,,,,,,,,,,0,0
+454,865,8,,,,,,,,,,,,,,,,0,0
+455,866,1,,42,,,,,,,,,,,,,,0,0
+456,864,1,,38,,,,,,,,,,,,,,0,0
+457,862,1,,35,,,,night,,,,,,,,,,0,0
+458,555,3,885,,,,,,,,,,,,,,,0,0
+459,867,9,,,,,,,,,,,,,,,,0,0
+460,745,1,,25,,,,dusk,,,,,,,,,,0,0
diff --git a/pokedex/data/csv/pokemon_species.csv b/pokedex/data/csv/pokemon_species.csv
index d8ebe0a..7c97411 100644
--- a/pokedex/data/csv/pokemon_species.csv
+++ b/pokedex/data/csv/pokemon_species.csv
@@ -860,40 +860,40 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 859,impidimp,8,,451,6,,,0,255,50,0,20,0,2,0,0,0,859,
 860,morgrem,8,859,451,6,,,0,120,50,0,20,0,2,0,0,0,860,
 861,grimmsnarl,8,860,451,7,,,0,45,50,0,20,0,2,0,0,0,861,
-862,obstagoon,8,,452,4,,,4,45,50,0,15,0,2,0,0,0,862,
-863,perrserker,8,,453,3,,,4,90,50,0,20,0,2,0,0,0,863,
-864,cursola,8,,454,9,,,6,30,50,0,20,0,3,0,0,0,864,
-865,sirfetchd,8,,455,9,,,4,45,50,0,20,0,2,0,0,0,865,
-866,mr-rime,8,,456,7,,,4,45,50,0,25,0,2,0,0,0,866,
-867,runerigus,8,,457,4,,,4,90,50,0,25,0,2,0,0,0,867,
-868,milcery,8,,458,9,,,8,200,50,0,20,0,2,0,0,0,868,
-869,alcremie,8,868,458,9,,,8,100,50,0,20,0,2,0,0,0,869,
-870,falinks,8,,459,10,,,-1,45,50,0,25,0,2,0,0,0,870,
-871,pincurchin,8,,460,7,,,4,75,50,0,20,0,2,0,0,0,871,
-872,snom,8,,461,9,,,4,190,50,0,20,0,2,0,0,0,872,
-873,frosmoth,8,872,461,9,,,4,75,50,0,20,0,2,0,0,0,873,
-874,stonjourner,8,,462,4,,,4,60,50,0,25,0,1,0,0,0,874,
-875,eiscue,8,,463,2,,,4,60,50,0,25,0,1,0,0,0,875,
-876,indeedee,8,,464,7,,,0,30,140,0,40,0,3,0,0,0,876,
-877,morpeko,8,,465,10,,,4,180,50,0,10,0,2,0,0,0,877,
-878,cufant,8,,466,10,,,4,190,50,0,25,0,2,0,0,0,878,
-879,copperajah,8,878,466,5,,,4,90,50,0,25,0,2,0,0,0,879,
-880,dracozolt,8,,467,5,,,-1,45,50,0,35,0,1,0,0,0,880,
-881,arctozolt,8,,468,2,,,-1,45,50,0,35,0,1,0,0,0,881,
-882,dracovish,8,,469,5,,,-1,45,50,0,35,0,1,0,0,0,882,
-883,arctovish,8,,470,2,,,-1,45,50,0,35,0,1,0,0,0,883,
-884,duraludon,8,,471,9,,,4,45,50,0,30,0,2,0,0,0,884,
-885,dreepy,8,,472,5,,,4,45,50,0,40,0,1,0,0,0,885,
-886,drakloak,8,885,472,5,,,4,45,50,0,40,0,1,0,0,0,886,
-887,dragapult,8,886,472,5,,,4,45,50,0,40,0,1,0,0,0,887,
-888,zacian,8,,473,2,,,-1,10,0,0,120,0,1,0,1,0,888,
-889,zamazenta,8,,474,8,,,-1,10,0,0,120,0,1,0,1,0,889,
-890,eternatus,8,,475,7,,,-1,255,0,0,120,0,1,0,1,0,890,
-891,kubfu,8,,476,4,,,1,3,50,0,120,0,1,0,1,0,891,
-892,urshifu,8,891,476,4,,,1,3,50,0,120,0,1,0,1,0,892,
-893,zarude,8,,477,5,,,-1,3,0,0,120,0,1,0,0,1,893,
-894,regieleki,8,,478,10,,,-1,3,35,0,120,0,1,0,1,0,894,
-895,regidrago,8,,479,5,,,-1,3,35,0,120,0,1,0,1,0,895,
-896,glastrier,8,,480,9,,,-1,3,35,0,120,0,1,0,1,0,896,
-897,spectrier,8,,481,1,,,-1,3,35,0,120,0,1,0,1,0,897,
-898,calyrex,8,,482,5,,,-1,3,100,0,120,0,1,0,1,0,898,
+862,obstagoon,8,264,134,4,,,4,45,50,0,15,0,2,0,0,0,862,
+863,perrserker,8,52,22,3,,,4,90,50,0,20,0,2,0,0,0,863,
+864,cursola,8,222,113,9,,,6,30,50,0,20,0,3,0,0,0,864,
+865,sirfetchd,8,83,35,9,,,4,45,50,0,20,0,2,0,0,0,865,
+866,mr-rime,8,122,57,7,,,4,45,50,0,25,0,2,0,0,0,866,
+867,runerigus,8,562,287,4,,,4,90,50,0,25,0,2,0,0,0,867,
+868,milcery,8,,452,9,,,8,200,50,0,20,0,2,0,0,0,868,
+869,alcremie,8,868,452,9,,,8,100,50,0,20,0,2,0,0,0,869,
+870,falinks,8,,453,10,,,-1,45,50,0,25,0,2,0,0,0,870,
+871,pincurchin,8,,454,7,,,4,75,50,0,20,0,2,0,0,0,871,
+872,snom,8,,455,9,,,4,190,50,0,20,0,2,0,0,0,872,
+873,frosmoth,8,872,455,9,,,4,75,50,0,20,0,2,0,0,0,873,
+874,stonjourner,8,,456,4,,,4,60,50,0,25,0,1,0,0,0,874,
+875,eiscue,8,,457,2,,,4,60,50,0,25,0,1,0,0,0,875,
+876,indeedee,8,,458,7,,,0,30,140,0,40,0,3,0,0,0,876,
+877,morpeko,8,,459,10,,,4,180,50,0,10,0,2,0,0,0,877,
+878,cufant,8,,460,10,,,4,190,50,0,25,0,2,0,0,0,878,
+879,copperajah,8,878,460,5,,,4,90,50,0,25,0,2,0,0,0,879,
+880,dracozolt,8,,461,5,,,-1,45,50,0,35,0,1,0,0,0,880,
+881,arctozolt,8,,462,2,,,-1,45,50,0,35,0,1,0,0,0,881,
+882,dracovish,8,,463,5,,,-1,45,50,0,35,0,1,0,0,0,882,
+883,arctovish,8,,464,2,,,-1,45,50,0,35,0,1,0,0,0,883,
+884,duraludon,8,,465,9,,,4,45,50,0,30,0,2,0,0,0,884,
+885,dreepy,8,,466,5,,,4,45,50,0,40,0,1,0,0,0,885,
+886,drakloak,8,885,466,5,,,4,45,50,0,40,0,1,0,0,0,886,
+887,dragapult,8,886,466,5,,,4,45,50,0,40,0,1,0,0,0,887,
+888,zacian,8,,467,2,,,-1,10,0,0,120,0,1,0,1,0,888,
+889,zamazenta,8,,468,8,,,-1,10,0,0,120,0,1,0,1,0,889,
+890,eternatus,8,,469,7,,,-1,255,0,0,120,0,1,0,1,0,890,
+891,kubfu,8,,470,4,,,1,3,50,0,120,0,1,0,1,0,891,
+892,urshifu,8,891,470,4,,,1,3,50,0,120,0,1,0,1,0,892,
+893,zarude,8,,471,5,,,-1,3,0,0,120,0,1,0,0,1,893,
+894,regieleki,8,,472,10,,,-1,3,35,0,120,0,1,0,1,0,894,
+895,regidrago,8,,473,5,,,-1,3,35,0,120,0,1,0,1,0,895,
+896,glastrier,8,,474,9,,,-1,3,35,0,120,0,1,0,1,0,896,
+897,spectrier,8,,475,1,,,-1,3,35,0,120,0,1,0,1,0,897,
+898,calyrex,8,,476,5,,,-1,3,100,0,120,0,1,0,1,0,898,