diff --git a/pokedex/data/csv/encounter_condition_groups.csv b/pokedex/data/csv/encounter_condition_groups.csv
index 5a14790..ed34596 100644
--- a/pokedex/data/csv/encounter_condition_groups.csv
+++ b/pokedex/data/csv/encounter_condition_groups.csv
@@ -1,5 +1,5 @@
 id,name
-4,Gen 3 game in slot 2
-3,PokéRadar
-2,Time of day
 1,Swarm
+2,Time of day
+3,PokéRadar
+4,Gen 3 game in slot 2
diff --git a/pokedex/data/csv/encounter_conditions.csv b/pokedex/data/csv/encounter_conditions.csv
index 36efec9..c3c1215 100644
--- a/pokedex/data/csv/encounter_conditions.csv
+++ b/pokedex/data/csv/encounter_conditions.csv
@@ -1,11 +1,11 @@
 id,encounter_condition_group_id,name
 1,1,During a swarm
-10,4,Leaf Green
-9,4,Fire Red
-8,4,Emerald
-7,4,Sapphire
-6,4,Ruby
-5,3,Using PokéRadar
-4,2,Night
-3,2,Day
 2,2,Morning
+3,2,Day
+4,2,Night
+5,3,Using PokéRadar
+6,4,Ruby
+7,4,Sapphire
+8,4,Emerald
+9,4,Fire Red
+10,4,Leaf Green
diff --git a/pokedex/data/csv/encounter_type_slots.csv b/pokedex/data/csv/encounter_type_slots.csv
index 9af853d..6ead369 100644
--- a/pokedex/data/csv/encounter_type_slots.csv
+++ b/pokedex/data/csv/encounter_type_slots.csv
@@ -2,26 +2,26 @@ id,encounter_type_id,encounter_condition_group_id,rarity
 1,1,1,20
 2,1,2,10
 3,1,,10
+4,1,3,5
 5,1,4,4
 6,1,3,1
-4,1,3,5
-26,5,,1
-25,5,,4
-24,5,,5
-23,5,,30
-22,5,,60
-21,4,,1
-20,4,,4
-19,4,,5
-18,4,,30
-17,4,,60
-16,3,,1
-15,3,,4
-14,3,,5
-13,3,,30
-12,3,,60
-11,2,,1
-10,2,,4
-9,2,,5
-8,2,,30
 7,2,,60
+8,2,,30
+9,2,,5
+10,2,,4
+11,2,,1
+12,3,,60
+13,3,,30
+14,3,,5
+15,3,,4
+16,3,,1
+17,4,,60
+18,4,,30
+19,4,,5
+20,4,,4
+21,4,,1
+22,5,,60
+23,5,,30
+24,5,,5
+25,5,,4
+26,5,,1