From 0019a0982d7183461a6c59016dcedcd01005156d Mon Sep 17 00:00:00 2001
From: SimplyBLGDev <61010688+SimplyBLGDev@users.noreply.github.com>
Date: Mon, 13 Jan 2025 01:54:09 -0300
Subject: [PATCH 1/4] Add missing special encounters gens 3-5

Added missing special encounters (mostly static overworld pokemon) along with corresponding missing location, location areas, and encounter conditions to support them.
Two entries have been added to the pokemon table to support the female version of jellicent and frillish, since this alternative form wasn't in that table yet for some reason.
---
 data/v2/csv/encounter_condition_value_map.csv |  34 +++++
 .../csv/encounter_condition_value_prose.csv   |  10 ++
 data/v2/csv/encounter_condition_values.csv    |  10 ++
 data/v2/csv/encounter_conditions.csv          |   1 +
 data/v2/csv/encounters.csv                    | 131 ++++++++++++++++++
 data/v2/csv/location_area_prose.csv           |   4 +-
 data/v2/csv/location_areas.csv                |  17 ++-
 data/v2/csv/locations.csv                     |   3 +-
 data/v2/csv/pokemon.csv                       |   2 +
 9 files changed, 206 insertions(+), 6 deletions(-)

diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv
index 583a3efbf..904f53019 100644
--- a/data/v2/csv/encounter_condition_value_map.csv
+++ b/data/v2/csv/encounter_condition_value_map.csv
@@ -17808,3 +17808,37 @@ encounter_id,encounter_condition_value_id
 62493,71
 62494,71
 62495,71
+66651,72
+66652,72
+66659,73
+66660,73
+66661,74
+66662,74
+66665,75
+66666,75
+66667,75
+66668,75
+66669,75
+66670,75
+66673,58
+66674,58
+66675,76
+66676,76
+66709,77
+66710,77
+66711,72
+66712,72
+66715,72
+66716,72
+66719,72
+66720,72
+66723,72
+66724,72
+66725,78
+66726,79
+66727,80
+66728,80
+66729,64
+66729,81
+66730,64
+66730,81
diff --git a/data/v2/csv/encounter_condition_value_prose.csv b/data/v2/csv/encounter_condition_value_prose.csv
index 39f9ad0dc..bdbeebd87 100644
--- a/data/v2/csv/encounter_condition_value_prose.csv
+++ b/data/v2/csv/encounter_condition_value_prose.csv
@@ -161,3 +161,13 @@ encounter_condition_value_id,local_language_id,name
 70,5,Après avoir rapporté la pièce de machine à la centrale
 71,9,Have an Event Arceus in the party
 71,5,En ayant un Arceus événementiel dans l’équipe
+72,9,This special Pokémon couldn't be captured in previous encounters (either fainted or ran from battle)
+73,9,Have Ice Key in bag
+74,9,Have Iron Key in bag
+75,9,Spoke to Professor Juniper in the Cave of Being
+76,9,Have Lunar Wing in bag
+77,9,Obtained Quake Badge
+78,9,Have Light Stone in bag
+79,9,Have Dark Stone in bag
+80,9,Captured Reshiram or Zekrom previously
+81,9,Defeated Ghetsis
diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv
index 2af4873ca..20bebfe64 100644
--- a/data/v2/csv/encounter_condition_values.csv
+++ b/data/v2/csv/encounter_condition_values.csv
@@ -70,3 +70,13 @@ id,encounter_condition_id,identifier,is_default
 69,10,other-talked-to-32-people-underground,0
 70,9,story-progress-returned-machine-part,0
 71,10,other-event-arceus-in-party,0
+72,14,special-encounter-couldnt-capture-before,0
+73,11,item-ice-key,0
+74,11,item-iron-key,0
+75,9,story-progress-juniper-cave-of-being,0
+76,11,item-lunar-wing,0
+77,9,story-progress-quake-badge,0
+78,11,item-light-stone
+79,11,item-dark-stone
+80,10,other-captured-reshiram-or-zekrom
+81,9,defeated-ghetsis
diff --git a/data/v2/csv/encounter_conditions.csv b/data/v2/csv/encounter_conditions.csv
index 5540279d3..d297a4937 100644
--- a/data/v2/csv/encounter_conditions.csv
+++ b/data/v2/csv/encounter_conditions.csv
@@ -12,3 +12,4 @@ id,identifier
 11,item
 12,weekday
 13,first-party-pokemon
+14,special-encounter
diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
index 0965f74b8..3f1d54a67 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -61124,3 +61124,134 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 66603,29,1156,1139,104,16,19
 66604,29,1156,875,240,16,19
 66605,29,1156,845,115,16,19
+66606,7,388,565,100,25,25
+66607,8,388,565,100,25,25
+66608,9,388,566,100,25,25
+66609,7,388,565,100,25,25
+66610,8,388,565,100,25,25
+66611,9,388,566,100,25,25
+66612,7,388,565,100,25,25
+66613,8,388,565,100,25,25
+66614,9,388,566,100,25,25
+66615,8,1166,565,101,30,30
+66616,9,1166,566,101,30,30
+66617,8,1166,565,101,30,30
+66618,9,1166,566,101,30,30
+66619,7,1167,565,101,30,30
+66620,7,1167,565,101,30,30
+66615,8,1165,565,101,30,30
+66616,9,1165,566,101,30,30
+66617,8,1165,565,101,30,30
+66618,9,1165,566,101,30,30
+66619,7,1166,565,101,30,30
+66620,7,1166,565,101,30,30
+66621,17,1167,571,494,15,15
+66622,18,1167,571,494,15,15
+66623,17,580,571,518,50,50
+66624,18,580,571,518,50,50
+66625,17,652,571,571,25,25
+66626,18,652,571,571,25,25
+66627,17,629,571,590,20,20
+66628,18,629,571,590,20,20
+66629,17,629,571,590,20,20
+66630,18,629,571,590,20,20
+66631,17,643,571,590,30,30
+66632,18,643,571,590,30,30
+66633,17,643,571,590,30,30
+66634,18,643,571,590,30,30
+66635,17,643,571,591,40,40
+66636,18,643,571,591,40,40
+66637,17,643,571,591,40,40
+66638,18,643,571,591,40,40
+66639,17,588,571,637,70,70
+66640,18,588,571,637,70,70
+66641,17,630,571,638,42,42
+66642,18,630,571,638,42,42
+66643,17,602,571,639,42,42
+66644,18,602,571,639,42,42
+66645,17,1168,571,640,42,42
+66646,18,1168,571,640,42,42
+66647,17,1176,571,641,40,40
+66648,18,1176,571,642,40,40
+66649,17,1170,571,643,50,50
+66650,18,1170,571,644,50,50
+66651,17,1171,571,643,50,50
+66652,18,1171,571,644,50,50
+66653,17,649,571,645,70,70
+66654,18,649,571,645,70,70
+66655,17,617,571,646,75,75
+66656,18,617,571,646,75,75
+66657,21,696,572,377,65,65
+66658,22,696,572,377,65,65
+66659,21,696,572,378,65,65
+66660,22,696,572,378,65,65
+66661,21,696,572,379,65,65
+66662,22,696,572,379,65,65
+66663,22,579,572,380,68,68
+66664,21,579,572,381,68,68
+66665,21,792,572,480,65,65
+66666,22,792,572,480,65,65
+66667,21,636,572,481,65,65
+66668,22,636,572,481,65,65
+66669,21,706,572,482,65,65
+66670,22,706,572,482,65,65
+66671,21,1172,572,485,68,68
+66672,22,1172,572,485,68,68
+66673,21,1173,572,486,68,68
+66674,22,1173,572,486,68,68
+66675,21,622,572,488,68,68
+66676,22,622,572,488,68,68
+66677,21,700,572,558,42,42
+66678,22,700,572,558,42,42
+66679,21,629,572,590,29,29
+66680,22,629,572,590,29,29
+66681,21,629,572,590,29,29
+66682,22,629,572,590,29,29
+66683,21,629,572,590,29,29
+66684,22,629,572,590,29,29
+66685,21,632,572,590,36,36
+66686,22,632,572,590,36,36
+66687,21,632,572,590,36,36
+66688,22,632,572,590,36,36
+66689,21,645,572,591,47,47
+66690,22,645,572,591,47,47
+66691,21,645,572,591,47,47
+66692,22,645,572,591,47,47
+66693,21,705,572,591,47,47
+66694,22,705,572,591,47,47
+66695,21,705,572,591,47,47
+66696,22,705,572,591,47,47
+66697,21,706,572,591,56,56
+66698,22,706,572,591,56,56
+66699,21,706,572,591,56,56
+66700,22,706,572,591,56,56
+66701,21,706,572,591,56,56
+66702,22,706,572,591,56,56
+66703,21,619,572,593,40,40
+66704,22,619,572,10279,40,40
+66705,21,702,572,612,60,60
+66706,22,702,572,612,60,60
+66707,22,627,572,628,25,25
+66708,21,627,572,630,25,25
+66709,21,588,572,637,35,35
+66710,22,588,572,637,35,35
+66711,21,588,572,637,65,65
+66712,22,588,572,637,65,65
+66713,21,647,572,638,45,45
+66714,22,647,572,638,45,45
+66715,21,647,572,638,65,65
+66716,22,647,572,638,65,65
+66717,21,705,572,639,45,45
+66718,22,705,572,639,45,45
+66719,21,705,572,639,65,65
+66720,22,705,572,639,65,65
+66721,21,645,572,640,45,45
+66722,22,645,572,640,45,45
+66723,21,645,572,640,65,65
+66724,22,645,572,640,65,65
+66725,22,1171,572,643,70,70
+66726,21,1171,572,644,70,70
+66727,21,617,572,646,70,70
+66728,22,617,572,646,70,70
+66729,17,579,571,518,50,50
+66730,18,579,571,518,50,50
diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv
index 1d6af7e7a..55ea07d9e 100644
--- a/data/v2/csv/location_area_prose.csv
+++ b/data/v2/csv/location_area_prose.csv
@@ -983,7 +983,7 @@ location_area_id,local_language_id,name
 600,5,Route Victoire (zone inconnue 54)
 601,9,Victory Road (unknown area 55)
 601,5,Route Victoire (zone inconnue 55)
-602,9,Victory Road (unknown area 56)
+602,9,Victory Road (4f Middle Room)
 602,5,Route Victoire (zone inconnue 56)
 603,9,Victory Road (unknown area 57)
 603,5,Route Victoire (zone inconnue 57)
@@ -1463,3 +1463,5 @@ location_area_id,local_language_id,name
 841,5,Repaire Rocket d'Acajou
 842,9,Sinjoy Ruins
 842,5,Ruines Sinjoh
+1167,9,Ligthouse Basement
+1169,9,Rumination Field
\ No newline at end of file
diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv
index 53b1c85d8..e285195d4 100644
--- a/data/v2/csv/location_areas.csv
+++ b/data/v2/csv/location_areas.csv
@@ -482,7 +482,7 @@ id,location_id,game_index,identifier
 590,379,41,1f
 591,379,42,b1f
 592,379,43,b2f
-593,380,44,
+593,380,44,b1f-3f
 594,381,48,entrance
 595,381,49,outside
 596,381,50,1f
@@ -491,9 +491,9 @@ id,location_id,game_index,identifier
 599,382,53,unknown-area-53
 600,382,54,unknown-area-54
 601,382,55,unknown-area-55
-602,382,56,unknown-area-56
+602,382,56,4f-middle-room
 603,382,57,unknown-area-57
-604,382,58,unknown-area-58
+604,382,58,1f-unknown-room
 605,382,59,unknown-area-59
 606,382,60,unknown-area-60
 607,382,61,unknown-area-61
@@ -1052,4 +1052,13 @@ id,location_id,game_index,identifier
 1161,1053,0,
 1162,1050,0,
 1163,750,0,all-areas
-1164,762,0,all-areas
\ No newline at end of file
+1164,762,0,all-areas
+1165,692,0,
+1166,694,0,
+1167,404,0,lighthouse-basement
+1168,375,0,rumination-field
+1169,1054,0,
+1170,387,0,throne-room
+1171,381,0,7f
+1172,546,0,b1f
+1173,380,0,b4f
diff --git a/data/v2/csv/locations.csv b/data/v2/csv/locations.csv
index 7fe842659..9eda9cab8 100644
--- a/data/v2/csv/locations.csv
+++ b/data/v2/csv/locations.csv
@@ -1034,4 +1034,5 @@ id,region_id,identifier
 1050,7,ultra-megalopolis
 1051,7,ultra-space-wilds
 1052,7,poke-pelago
-1053,7,team-rockets-castle
\ No newline at end of file
+1053,7,team-rockets-castle
+1054,5,roaming-unova
diff --git a/data/v2/csv/pokemon.csv b/data/v2/csv/pokemon.csv
index a23bac0c7..3dd82b8ba 100644
--- a/data/v2/csv/pokemon.csv
+++ b/data/v2/csv/pokemon.csv
@@ -1301,3 +1301,5 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
 10275,ogerpon-cornerstone-mask,1017,12,398,275,,0
 10276,terapagos-terastal,1024,3,160,90,,0
 10277,terapagos-stellar,1024,17,770,90,,0
+10278,frillish-female,592,12,330,67,,0
+10279,jellicent-female,593,22,1350,168,,0

From 5d57944a86174430852939e25aae98df54b2a46b Mon Sep 17 00:00:00 2001
From: SimplyBLGDev <61010688+SimplyBLGDev@users.noreply.github.com>
Date: Mon, 13 Jan 2025 10:04:28 -0300
Subject: [PATCH 2/4] Add missing column to some entries in encounter
 conditions values

---
 data/v2/csv/encounter_condition_values.csv | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv
index 20bebfe64..12f434a49 100644
--- a/data/v2/csv/encounter_condition_values.csv
+++ b/data/v2/csv/encounter_condition_values.csv
@@ -76,7 +76,7 @@ id,encounter_condition_id,identifier,is_default
 75,9,story-progress-juniper-cave-of-being,0
 76,11,item-lunar-wing,0
 77,9,story-progress-quake-badge,0
-78,11,item-light-stone
-79,11,item-dark-stone
-80,10,other-captured-reshiram-or-zekrom
-81,9,defeated-ghetsis
+78,11,item-light-stone,0
+79,11,item-dark-stone,0
+80,10,other-captured-reshiram-or-zekrom,0
+81,9,defeated-ghetsis,0

From a5bda9950bb999be42ce81f062269dd5c95d6ba2 Mon Sep 17 00:00:00 2001
From: SimplyBLGDev <61010688+SimplyBLGDev@users.noreply.github.com>
Date: Mon, 13 Jan 2025 10:12:23 -0300
Subject: [PATCH 3/4] Move duplicated IDs in ecnounters

---
 data/v2/csv/encounter_condition_value_map.csv |  68 ++---
 data/v2/csv/encounters.csv                    | 232 +++++++++---------
 2 files changed, 150 insertions(+), 150 deletions(-)

diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv
index 904f53019..c97967df7 100644
--- a/data/v2/csv/encounter_condition_value_map.csv
+++ b/data/v2/csv/encounter_condition_value_map.csv
@@ -17808,37 +17808,37 @@ encounter_id,encounter_condition_value_id
 62493,71
 62494,71
 62495,71
-66651,72
-66652,72
-66659,73
-66660,73
-66661,74
-66662,74
-66665,75
-66666,75
-66667,75
-66668,75
-66669,75
-66670,75
-66673,58
-66674,58
-66675,76
-66676,76
-66709,77
-66710,77
-66711,72
-66712,72
-66715,72
-66716,72
-66719,72
-66720,72
-66723,72
-66724,72
-66725,78
-66726,79
-66727,80
-66728,80
-66729,64
-66729,81
-66730,64
-66730,81
+66657,72
+66659,72
+66665,73
+66666,73
+66667,74
+66668,74
+66671,75
+66672,75
+66673,75
+66674,75
+66675,75
+66676,75
+66679,58
+66680,58
+66681,76
+66682,76
+66715,77
+66716,77
+66717,72
+66718,72
+66721,72
+66722,72
+66725,72
+66726,72
+66729,72
+66730,72
+66731,78
+66732,79
+66733,80
+66734,80
+66735,64
+66735,81
+66736,64
+66736,81
diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
index 3f1d54a67..424259236 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -61139,119 +61139,119 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 66618,9,1166,566,101,30,30
 66619,7,1167,565,101,30,30
 66620,7,1167,565,101,30,30
-66615,8,1165,565,101,30,30
-66616,9,1165,566,101,30,30
-66617,8,1165,565,101,30,30
-66618,9,1165,566,101,30,30
-66619,7,1166,565,101,30,30
-66620,7,1166,565,101,30,30
-66621,17,1167,571,494,15,15
-66622,18,1167,571,494,15,15
-66623,17,580,571,518,50,50
-66624,18,580,571,518,50,50
-66625,17,652,571,571,25,25
-66626,18,652,571,571,25,25
-66627,17,629,571,590,20,20
-66628,18,629,571,590,20,20
-66629,17,629,571,590,20,20
-66630,18,629,571,590,20,20
-66631,17,643,571,590,30,30
-66632,18,643,571,590,30,30
-66633,17,643,571,590,30,30
-66634,18,643,571,590,30,30
-66635,17,643,571,591,40,40
-66636,18,643,571,591,40,40
-66637,17,643,571,591,40,40
-66638,18,643,571,591,40,40
-66639,17,588,571,637,70,70
-66640,18,588,571,637,70,70
-66641,17,630,571,638,42,42
-66642,18,630,571,638,42,42
-66643,17,602,571,639,42,42
-66644,18,602,571,639,42,42
-66645,17,1168,571,640,42,42
-66646,18,1168,571,640,42,42
-66647,17,1176,571,641,40,40
-66648,18,1176,571,642,40,40
-66649,17,1170,571,643,50,50
-66650,18,1170,571,644,50,50
-66651,17,1171,571,643,50,50
-66652,18,1171,571,644,50,50
-66653,17,649,571,645,70,70
-66654,18,649,571,645,70,70
-66655,17,617,571,646,75,75
-66656,18,617,571,646,75,75
-66657,21,696,572,377,65,65
-66658,22,696,572,377,65,65
-66659,21,696,572,378,65,65
-66660,22,696,572,378,65,65
-66661,21,696,572,379,65,65
-66662,22,696,572,379,65,65
-66663,22,579,572,380,68,68
-66664,21,579,572,381,68,68
-66665,21,792,572,480,65,65
-66666,22,792,572,480,65,65
-66667,21,636,572,481,65,65
-66668,22,636,572,481,65,65
-66669,21,706,572,482,65,65
-66670,22,706,572,482,65,65
-66671,21,1172,572,485,68,68
-66672,22,1172,572,485,68,68
-66673,21,1173,572,486,68,68
-66674,22,1173,572,486,68,68
-66675,21,622,572,488,68,68
-66676,22,622,572,488,68,68
-66677,21,700,572,558,42,42
-66678,22,700,572,558,42,42
-66679,21,629,572,590,29,29
-66680,22,629,572,590,29,29
-66681,21,629,572,590,29,29
-66682,22,629,572,590,29,29
-66683,21,629,572,590,29,29
-66684,22,629,572,590,29,29
-66685,21,632,572,590,36,36
-66686,22,632,572,590,36,36
-66687,21,632,572,590,36,36
-66688,22,632,572,590,36,36
-66689,21,645,572,591,47,47
-66690,22,645,572,591,47,47
-66691,21,645,572,591,47,47
-66692,22,645,572,591,47,47
-66693,21,705,572,591,47,47
-66694,22,705,572,591,47,47
-66695,21,705,572,591,47,47
-66696,22,705,572,591,47,47
-66697,21,706,572,591,56,56
-66698,22,706,572,591,56,56
-66699,21,706,572,591,56,56
-66700,22,706,572,591,56,56
-66701,21,706,572,591,56,56
-66702,22,706,572,591,56,56
-66703,21,619,572,593,40,40
-66704,22,619,572,10279,40,40
-66705,21,702,572,612,60,60
-66706,22,702,572,612,60,60
-66707,22,627,572,628,25,25
-66708,21,627,572,630,25,25
-66709,21,588,572,637,35,35
-66710,22,588,572,637,35,35
-66711,21,588,572,637,65,65
-66712,22,588,572,637,65,65
-66713,21,647,572,638,45,45
-66714,22,647,572,638,45,45
-66715,21,647,572,638,65,65
-66716,22,647,572,638,65,65
-66717,21,705,572,639,45,45
-66718,22,705,572,639,45,45
-66719,21,705,572,639,65,65
-66720,22,705,572,639,65,65
-66721,21,645,572,640,45,45
-66722,22,645,572,640,45,45
-66723,21,645,572,640,65,65
-66724,22,645,572,640,65,65
-66725,22,1171,572,643,70,70
-66726,21,1171,572,644,70,70
-66727,21,617,572,646,70,70
-66728,22,617,572,646,70,70
-66729,17,579,571,518,50,50
-66730,18,579,571,518,50,50
+66621,8,1165,565,101,30,30
+66622,9,1165,566,101,30,30
+66623,8,1165,565,101,30,30
+66624,9,1165,566,101,30,30
+66625,7,1166,565,101,30,30
+66626,7,1166,565,101,30,30
+66627,17,1167,571,494,15,15
+66628,18,1167,571,494,15,15
+66629,17,580,571,518,50,50
+66630,18,580,571,518,50,50
+66631,17,652,571,571,25,25
+66632,18,652,571,571,25,25
+66633,17,629,571,590,20,20
+66634,18,629,571,590,20,20
+66635,17,629,571,590,20,20
+66636,18,629,571,590,20,20
+66637,17,643,571,590,30,30
+66638,18,643,571,590,30,30
+66639,17,643,571,590,30,30
+66640,18,643,571,590,30,30
+66641,17,643,571,591,40,40
+66642,18,643,571,591,40,40
+66643,17,643,571,591,40,40
+66644,18,643,571,591,40,40
+66645,17,588,571,637,70,70
+66646,18,588,571,637,70,70
+66647,17,630,571,638,42,42
+66648,18,630,571,638,42,42
+66649,17,602,571,639,42,42
+66650,18,602,571,639,42,42
+66651,17,1168,571,640,42,42
+66652,18,1168,571,640,42,42
+66653,17,1176,571,641,40,40
+66654,18,1176,571,642,40,40
+66655,17,1170,571,643,50,50
+66656,18,1170,571,644,50,50
+66657,17,1171,571,643,50,50
+66658,18,1171,571,644,50,50
+66659,17,649,571,645,70,70
+66660,18,649,571,645,70,70
+66661,17,617,571,646,75,75
+66662,18,617,571,646,75,75
+66663,21,696,572,377,65,65
+66664,22,696,572,377,65,65
+66665,21,696,572,378,65,65
+66666,22,696,572,378,65,65
+66667,21,696,572,379,65,65
+66668,22,696,572,379,65,65
+66669,22,579,572,380,68,68
+66670,21,579,572,381,68,68
+66671,21,792,572,480,65,65
+66672,22,792,572,480,65,65
+66673,21,636,572,481,65,65
+66674,22,636,572,481,65,65
+66675,21,706,572,482,65,65
+66676,22,706,572,482,65,65
+66677,21,1172,572,485,68,68
+66678,22,1172,572,485,68,68
+66679,21,1173,572,486,68,68
+66680,22,1173,572,486,68,68
+66681,21,622,572,488,68,68
+66682,22,622,572,488,68,68
+66683,21,700,572,558,42,42
+66684,22,700,572,558,42,42
+66685,21,629,572,590,29,29
+66686,22,629,572,590,29,29
+66687,21,629,572,590,29,29
+66688,22,629,572,590,29,29
+66689,21,629,572,590,29,29
+66690,22,629,572,590,29,29
+66691,21,632,572,590,36,36
+66692,22,632,572,590,36,36
+66693,21,632,572,590,36,36
+66694,22,632,572,590,36,36
+66695,21,645,572,591,47,47
+66696,22,645,572,591,47,47
+66697,21,645,572,591,47,47
+66698,22,645,572,591,47,47
+66699,21,705,572,591,47,47
+66700,22,705,572,591,47,47
+66701,21,705,572,591,47,47
+66702,22,705,572,591,47,47
+66703,21,706,572,591,56,56
+66704,22,706,572,591,56,56
+66705,21,706,572,591,56,56
+66706,22,706,572,591,56,56
+66707,21,706,572,591,56,56
+66708,22,706,572,591,56,56
+66709,21,619,572,593,40,40
+66710,22,619,572,10279,40,40
+66711,21,702,572,612,60,60
+66712,22,702,572,612,60,60
+66713,22,627,572,628,25,25
+66714,21,627,572,630,25,25
+66715,21,588,572,637,35,35
+66716,22,588,572,637,35,35
+66717,21,588,572,637,65,65
+66718,22,588,572,637,65,65
+66719,21,647,572,638,45,45
+66720,22,647,572,638,45,45
+66721,21,647,572,638,65,65
+66722,22,647,572,638,65,65
+66723,21,705,572,639,45,45
+66724,22,705,572,639,45,45
+66725,21,705,572,639,65,65
+66726,22,705,572,639,65,65
+66727,21,645,572,640,45,45
+66728,22,645,572,640,45,45
+66729,21,645,572,640,65,65
+66730,22,645,572,640,65,65
+66731,22,1171,572,643,70,70
+66732,21,1171,572,644,70,70
+66733,21,617,572,646,70,70
+66734,22,617,572,646,70,70
+66735,17,579,571,518,50,50
+66736,18,579,571,518,50,50

From 8553d46a17054aa5c794bc5ff7d8c2a4ed0eeb71 Mon Sep 17 00:00:00 2001
From: SimplyBLGDev <61010688+SimplyBLGDev@users.noreply.github.com>
Date: Mon, 13 Jan 2025 21:31:52 -0300
Subject: [PATCH 4/4] Add special encounters for gens 5-7

Added Special encounters for gens 5-7 along with necessary additional encounter conditions and location areas. Also a new encounter slot for OR AS Devon Scope
---
 data/v2/csv/encounter_condition_value_map.csv |  92 ++++++
 .../csv/encounter_condition_value_prose.csv   |  24 ++
 data/v2/csv/encounter_condition_values.csv    |  24 ++
 data/v2/csv/encounter_slots.csv               |   1 +
 data/v2/csv/encounters.csv                    | 263 ++++++++++++++++++
 data/v2/csv/location_area_prose.csv           |  28 +-
 data/v2/csv/location_areas.csv                |  36 ++-
 data/v2/csv/locations.csv                     |   2 +
 8 files changed, 464 insertions(+), 6 deletions(-)

diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv
index c97967df7..70c3452f3 100644
--- a/data/v2/csv/encounter_condition_value_map.csv
+++ b/data/v2/csv/encounter_condition_value_map.csv
@@ -17842,3 +17842,95 @@ encounter_id,encounter_condition_value_id
 66735,81
 66736,64
 66736,81
+66846,24
+66847,24
+66848,25
+66849,25
+66850,26
+66851,26
+66852,24
+66853,24
+66854,25
+66855,25
+66856,26
+66857,26
+66852,82
+66853,82
+66854,82
+66855,82
+66856,82
+66857,82
+66858,35
+66859,35
+66860,35
+66861,35
+66862,83
+66863,83
+66864,84
+66865,84
+66866,85
+66867,85
+66868,89
+66869,90
+66870,91
+66871,91
+66872,86
+66873,86
+66874,87
+66875,87
+66876,88
+66877,88
+66878,92
+66879,92
+66880,91
+66881,91
+66882,37
+66883,37
+66882,93
+66883,93
+66884,94
+66885,94
+66884,59
+66885,59
+66888,62
+66889,62
+66890,64
+66891,64
+66892,61
+66893,61
+66894,65
+66895,65
+66896,60
+66897,60
+66898,63
+66899,63
+66900,95
+66901,95
+66902,96
+66903,96
+66904,97
+66905,97
+66906,98
+66907,98
+66910,99
+66911,99
+66910,100
+66911,100
+66912,101
+66913,101
+66946,102
+66947,102
+66960,103
+66961,103
+66972,104
+66973,104
+66986,97
+66987,97
+66988,98
+66989,98
+66996,101
+66997,101
+66998,35
+66999,35
+66998,105
+66999,105
diff --git a/data/v2/csv/encounter_condition_value_prose.csv b/data/v2/csv/encounter_condition_value_prose.csv
index bdbeebd87..9ae4f3838 100644
--- a/data/v2/csv/encounter_condition_value_prose.csv
+++ b/data/v2/csv/encounter_condition_value_prose.csv
@@ -171,3 +171,27 @@ encounter_condition_value_id,local_language_id,name
 79,9,Have Dark Stone in bag
 80,9,Captured Reshiram or Zekrom previously
 81,9,Defeated Ghetsis
+82,9,Has been unsuccesfully battled 11 times before
+83,9,The current minute is between 00 and 19
+84,9,The current minute is between 20 and 39
+85,9,The current minute is between 40 and 59
+86,9,The current time is between 04:00 and 19:59
+87,9,The current time is between 20:00 and 21:59
+88,9,The current time is between 22:00 and 03:59
+89,9,Have Tidal Bell in bag
+90,9,Have Clear Bell in bag
+91,9,Defeated or captured Groudon or Kyogre
+92,9,"Have Uxie, Mesprit, and Azelf in the party"
+93,9,"After capturing the three regis in the game, have a nicknamed Regice holding a cold-based item, plus Regirock and Registeel in the party"
+94,9,Have Dialga or Palkia in the party
+95,9,Have Castform in party
+96,9,Have a Level 100 Pokémon in party
+97,9,Have Tornadus and Thundurus in party
+98,9,Have Reshiram and Zekrom in party
+99,9,Captured all Ultra Beasts
+100,9,Finished Looker's Sidequest
+101,9,After finishing Olivia's trial
+102,9,Have Raikou and Entei in party
+103,9,Have Groudon and Kyogre in party
+104,9,Have Dialga and Palkia in party
+105,9,Scan a specific QR Code
diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv
index 12f434a49..4564dbf70 100644
--- a/data/v2/csv/encounter_condition_values.csv
+++ b/data/v2/csv/encounter_condition_values.csv
@@ -80,3 +80,27 @@ id,encounter_condition_id,identifier,is_default
 79,11,item-dark-stone,0
 80,10,other-captured-reshiram-or-zekrom,0
 81,9,defeated-ghetsis,0
+82,10,other-found-11-times-roaming,0
+83,2,time-minute-00-to-19,0
+84,2,time-minute-20-to-39,0
+85,2,time-minute-40-to-59,0
+86,2,time-04-00-to-19-59,0
+87,2,time-20-00-to-21-59,0
+88,2,time-21-00-to-03-59,0
+89,11,item-tidal-bell,0
+90,11,item-clear-bell,0
+91,9,story-progress-defeated-groudon-or-kyogre,0
+92,10,other-uxie-mesprit-azelf-in-party,0
+93,10,other-nicknamed-cold-item-regice-regirock-registeel3,0
+94,10,other-dialga-or-palkia-in-party,0
+95,10,other-castform-in-party,0
+96,10,other-level-100-pokemon-in-party,0
+97,10,other-tornadus-thundurus-in-party,0
+98,10,other-reshiram-zekrom-in-party,0
+99,10,other-captured-all-ultra-beasts,0
+100,9,story-progress-finished-looker-sidequest,0
+101,9,story-progress-beat-olivias-trial,0
+102,10,other-raikou-entei-in-party,0
+103,10,other-groudon-kyogre-in-party,0
+104,10,other-dialga-palkia-in-party,0
+105,10,other-scan-qr-code,0
diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv
index 8e9d4e586..b1bdd0a6c 100644
--- a/data/v2/csv/encounter_slots.csv
+++ b/data/v2/csv/encounter_slots.csv
@@ -1138,3 +1138,4 @@ id,version_group_id,encounter_method_id,slot,rarity
 1137,17,1,3,24
 1138,17,1,5,1
 1139,18,1,3,24
+1140,16,30,1,100
diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
index 424259236..de7914bde 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -61255,3 +61255,266 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 66734,22,617,572,646,70,70
 66735,17,579,571,518,50,50
 66736,18,579,571,518,50,50
+66737,23,718,573,143,15,15
+66738,24,718,573,143,15,15
+66739,23,1176,573,716,50,50
+66740,24,1176,573,716,50,50
+66741,23,1176,573,717,50,50
+66742,24,1176,573,717,50,50
+66743,25,388,574,100,25,25
+66744,26,388,574,100,25,25
+66745,25,388,574,100,25,25
+66746,26,388,574,100,25,25
+66747,25,388,574,100,25,25
+66748,26,388,574,100,25,25
+66749,25,388,574,100,25,25
+66750,26,388,574,100,25,25
+66751,26,1165,574,101,40,40
+66752,26,1165,574,101,40,40
+66753,25,1166,574,101,40,40
+66754,25,1166,574,101,40,40
+66755,25,810,574,377,40,40
+66756,26,810,574,377,40,40
+66757,25,811,574,378,40,40
+66758,26,811,574,378,40,40
+66759,25,812,574,379,40,40
+66760,26,812,574,379,40,40
+66761,25,785,574,380,30,30
+66762,26,785,574,380,30,30
+66763,25,785,574,381,30,30
+66764,26,785,574,381,30,30
+66765,26,801,574,382,45,45
+66766,25,801,574,383,45,45
+66767,25,804,574,384,70,70
+66768,26,804,574,384,70,70
+66769,25,804,574,386,80,80
+66770,26,804,574,386,80,80
+66771,25,1180,574,442,50,50
+66772,26,1180,574,442,50,50
+66773,25,1189,574,488,50,50
+66774,26,1189,574,488,50,50
+66775,27,1126,869,785,60,60
+66776,28,1126,869,785,60,60
+66777,27,1128,869,786,60,60
+66778,28,1128,869,786,60,60
+66779,27,1125,869,787,60,60
+66780,28,1125,869,787,60,60
+66781,27,1127,869,788,60,60
+66782,28,1127,869,788,60,60
+66783,27,1070,869,791,55,55
+66784,28,1069,869,792,55,55
+66785,27,1078,869,793,55,55
+66786,28,1078,869,793,55,55
+66787,27,1156,869,793,55,55
+66788,28,1156,869,793,55,55
+66789,27,1102,869,794,65,65
+66790,27,1102,869,794,65,65
+66791,28,1193,869,795,60,60
+66792,28,1193,869,795,60,60
+66793,28,1193,869,795,60,60
+66794,28,1193,869,795,60,60
+66795,27,1163,869,796,65,65
+66796,28,1163,869,796,65,65
+66797,27,1104,869,796,65,65
+66798,28,1104,869,796,65,65
+66799,28,1081,869,797,65,65
+66800,28,1101,869,797,65,65
+66801,27,1164,869,798,60,60
+66802,27,1101,869,798,60,60
+66803,27,1123,869,799,70,70
+66804,28,1123,869,799,70,70
+66805,29,1194,1133,92,19,19
+66806,30,1194,1133,92,19,19
+66807,30,1060,1133,769,30,30
+66808,29,1126,1133,785,60,60
+66809,30,1126,1133,785,60,60
+66810,29,1128,1133,786,60,60
+66811,30,1128,1133,786,60,60
+66812,29,1125,1133,787,60,60
+66813,30,1125,1133,787,60,60
+66814,29,1127,1133,788,60,60
+66815,30,1127,1133,788,60,60
+66816,29,1098,1133,791,60,60
+66817,30,1098,1133,792,60,60
+66818,29,1141,1133,793,60,60
+66819,30,1141,1133,793,60,60
+66820,29,1144,1133,794,60,60
+66821,30,1142,1133,795,60,60
+66822,29,1145,1133,796,60,60
+66823,30,1145,1133,796,60,60
+66824,30,1140,1133,797,60,60
+66825,29,1143,1133,798,60,60
+66826,29,1146,1133,799,60,60
+66827,30,1146,1133,799,60,60
+66828,29,1199,1133,800,65,65
+66829,30,1199,1133,800,65,65
+66830,30,1116,1133,805,65,65
+66831,30,1116,1133,805,65,65
+66832,29,1116,1133,806,65,65
+66833,29,1116,1133,806,65,65
+66834,25,411,1140,352,30,30
+66835,26,411,1140,352,30,30
+66836,25,412,1140,352,30,30
+66837,26,412,1140,352,30,30
+66838,25,412,1140,352,30,30
+66839,26,412,1140,352,30,30
+66840,25,412,1140,352,30,30
+66841,26,412,1140,352,30,30
+66842,25,787,1140,352,40,40
+66843,26,787,1140,352,40,40
+66844,25,1181,1140,352,45,45
+66845,26,1181,1140,352,45,45
+66846,23,1182,573,144,70,70
+66847,24,1182,573,144,70,70
+66848,23,1182,573,145,70,70
+66849,24,1182,573,145,70,70
+66850,23,1182,573,146,70,70
+66851,24,1182,573,146,70,70
+66852,23,1174,573,144,70,70
+66853,24,1174,573,144,70,70
+66854,23,1174,573,145,70,70
+66855,24,1174,573,145,70,70
+66856,23,1174,573,146,70,70
+66857,24,1174,573,146,70,70
+66858,23,1175,573,150,70,70
+66859,24,1175,573,150,70,70
+66860,23,758,573,718,70,70
+66861,24,758,573,718,70,70
+66862,25,1177,574,243,50,50
+66863,26,1177,574,243,50,50
+66864,25,1177,574,244,50,50
+66865,26,1177,574,244,50,50
+66866,25,1177,574,245,50,50
+66867,26,1177,574,245,50,50
+66868,26,1180,574,249,50,50
+66869,25,1180,574,250,50,50
+66870,25,1180,574,442,50,50
+66871,26,1180,574,442,50,50
+66872,25,1183,574,480,50,50
+66873,26,1183,574,480,50,50
+66874,25,1183,574,481,50,50
+66875,26,1183,574,481,50,50
+66876,25,1183,574,482,50,50
+66877,26,1183,574,482,50,50
+66878,26,1184,574,483,50,50
+66879,25,1184,574,484,50,50
+66880,25,1188,574,485,50,50
+66881,26,1188,574,485,50,50
+66882,25,811,574,486,50,50
+66883,26,811,574,486,50,50
+66884,25,1184,574,487,50,50
+66885,26,1184,574,487,50,50
+66886,25,1190,574,638,50,50
+66887,26,1190,574,638,50,50
+66888,25,1190,574,638,50,50
+66889,26,1190,574,638,50,50
+66890,25,1190,574,638,50,50
+66891,26,1190,574,638,50,50
+66892,25,1190,574,639,50,50
+66893,26,1190,574,639,50,50
+66894,25,1190,574,639,50,50
+66895,26,1190,574,639,50,50
+66896,25,1190,574,640,50,50
+66897,26,1190,574,640,50,50
+66898,25,1190,574,640,50,50
+66899,26,1190,574,640,50,50
+66900,25,1184,574,641,50,50
+66901,26,1184,574,642,50,50
+66902,25,1191,574,643,50,50
+66903,26,1191,574,644,50,50
+66904,25,1184,574,645,50,50
+66905,26,1184,574,645,50,50
+66906,25,1192,574,646,50,50
+66907,26,1192,574,646,50,50
+66908,27,1080,869,10114,40,40
+66909,28,1080,869,10114,40,40
+66910,27,723,869,800,75,75
+66911,28,723,869,800,75,75
+66912,29,1084,1133,97,29,29
+66913,30,1084,1133,97,29,29
+66914,29,1161,1133,101,60,60
+66915,30,1161,1133,101,60,60
+66916,29,1080,1133,127,42,42
+66917,30,1080,1133,127,42,42
+66918,29,1080,1133,127,42,42
+66919,30,1080,1133,127,42,42
+66920,29,1080,1133,127,43,43
+66921,30,1080,1133,127,43,43
+66922,29,1053,1133,132,29,29
+66923,30,1053,1133,132,29,29
+66924,29,1053,1133,132,29,29
+66925,30,1053,1133,132,29,29
+66926,29,1091,1133,132,29,29
+66927,30,1091,1133,132,29,29
+66928,29,1091,1133,132,29,29
+66929,30,1091,1133,132,29,29
+66930,29,1091,1133,132,29,29
+66931,30,1091,1133,132,29,29
+66932,29,1091,1133,132,29,29
+66933,30,1091,1133,132,29,29
+66934,29,1194,1133,425,19,19
+66935,30,1194,1133,425,19,19
+66936,29,1195,1133,144,60,60
+66937,30,1195,1133,144,60,60
+66938,29,1195,1133,145,60,60
+66939,30,1195,1133,145,60,60
+66940,29,1195,1133,146,60,60
+66941,30,1195,1133,146,60,60
+66942,29,1197,1133,150,60,60
+66943,30,1197,1133,150,60,60
+66944,29,1197,1133,243,60,60
+66945,30,1197,1133,244,60,60
+66946,29,1196,1133,245,60,60
+66947,30,1196,1133,245,60,60
+66948,30,1196,1133,249,60,60
+66949,29,1195,1133,250,60,60
+66950,29,1198,1133,377,60,60
+66951,30,1198,1133,377,60,60
+66952,29,1198,1133,378,60,60
+66953,30,1198,1133,378,60,60
+66954,29,1198,1133,379,60,60
+66955,30,1198,1133,379,60,60
+66956,30,1196,1133,380,60,60
+66957,29,1196,1133,381,60,60
+66958,30,1196,1133,382,60,60
+66959,29,1198,1133,383,60,60
+66960,29,1195,1133,384,60,60
+66961,30,1195,1133,384,60,60
+66962,29,1196,1133,480,60,60
+66963,30,1196,1133,480,60,60
+66964,29,1196,1133,481,60,60
+66965,30,1196,1133,481,60,60
+66966,29,1196,1133,482,60,60
+66967,30,1196,1133,482,60,60
+66968,29,1197,1133,483,60,60
+66969,30,1198,1133,484,60,60
+66970,29,1198,1133,485,60,60
+66971,30,1198,1133,486,60,60
+66972,29,1198,1133,487,60,60
+66973,30,1198,1133,487,60,60
+66974,29,1195,1133,488,60,60
+66975,30,1195,1133,488,60,60
+66976,29,1197,1133,638,60,60
+66977,30,1197,1133,638,60,60
+66978,29,1197,1133,639,60,60
+66979,30,1197,1133,639,60,60
+66980,29,1197,1133,640,60,60
+66981,30,1197,1133,640,60,60
+66982,29,1195,1133,641,60,60
+66983,30,1195,1133,642,60,60
+66984,29,1197,1133,643,60,60
+66985,30,1197,1133,644,60,60
+66986,29,1195,1133,645,60,60
+66987,30,1195,1133,645,60,60
+66988,29,1196,1133,646,60,60
+66989,30,1196,1133,646,60,60
+66990,29,1197,1133,716,60,60
+66991,30,1195,1133,717,60,60
+66992,29,1059,1133,10278,34,34
+66993,30,1059,1133,10278,34,34
+66994,29,1123,1133,718,60,60
+66995,30,1123,1133,718,60,60
+66996,29,1084,1133,760,28,28
+66997,30,1084,1133,760,28,28
+66998,29,1084,1133,801,50,50
+66999,30,1084,1133,801,50,50
diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv
index 55ea07d9e..d040d95b1 100644
--- a/data/v2/csv/location_area_prose.csv
+++ b/data/v2/csv/location_area_prose.csv
@@ -1464,4 +1464,30 @@ location_area_id,local_language_id,name
 842,9,Sinjoy Ruins
 842,5,Ruines Sinjoh
 1167,9,Ligthouse Basement
-1169,9,Rumination Field
\ No newline at end of file
+1169,9,Rumination Field
+754,9,Terminus Cave (1F)
+755,9,Terminus Cave (B1F left)
+756,9,Terminus Cave (B1F right)
+757,9,Terminus Cave (B2F)
+758,9,Terminus Cave (Zygarde's Chamber)
+1179,9,Sea Mauville (Outside)
+1180,9,Sea Mauville (Inside)
+1181,9,Mauville Space Center
+1182,9,Roaming Kalos
+1169,9,Roaming Unova
+1183,9,Nameless Cavern
+1184,9,Soaring in the Sky
+1185,9,Scorched Slab (1F)
+1186,9,Scorched Slab (B1F)
+1187,9,Scorched Slab (B2F)
+1188,9,Scorched Slab (B3F)
+1189,9,Crescent Isle
+1190,9,Pathless Plain
+1191,9,Fabled Cave
+1192,9,Gnarled Den
+1194,9,Trainers' School
+1195,9,Ultra Space Wilds Cliff World
+1196,9,Ultra Space Wilds Water World
+1197,9,Ultra Space Wilds Rocky World
+1198,9,Ultra Space Wilds Cave World
+1199,9,Mount Lanakila Peak
diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv
index e285195d4..232b38492 100644
--- a/data/v2/csv/location_areas.csv
+++ b/data/v2/csv/location_areas.csv
@@ -643,11 +643,11 @@ id,location_id,game_index,identifier
 751,657,0,unknown-area-327
 752,657,0,unknown-area-328
 753,672,0,
-754,676,0,unknown-area-343
-755,676,0,unknown-area-344
-756,676,0,unknown-area-345
-757,676,0,unknown-area-347
-758,676,0,unknown-area-348
+754,676,0,1f
+755,676,0,b1f-left
+756,676,0,b1f-right
+757,676,0,b2f
+758,676,0,zygardes-chamber
 759,677,0,
 760,661,0,
 761,120,0,pokemon-center
@@ -1062,3 +1062,29 @@ id,location_id,game_index,identifier
 1171,381,0,7f
 1172,546,0,b1f
 1173,380,0,b4f
+1174,679,0,
+1175,690,0,
+1176,675,0,
+1177,700,0,
+1178,693,0,
+1179,693,0,outside
+1180,693,0,inside
+1181,1055,0,
+1182,1056,0,
+1183,702,0,
+1184,707,0,
+1185,580,0,1f
+1186,580,0,b1f
+1187,580,0,b2f
+1188,580,0,b3f
+1189,705,0,
+1190,701,0,
+1191,703,0,
+1192,704,0,
+1193,729,0,
+1194,196,0,
+1195,797,0,ultra-space-wilds-cliff
+1196,797,0,ultra-space-wilds-water
+1197,797,0,ultra-space-wilds-rocky
+1198,797,0,ultra-space-wilds-cave
+1199,775,0,peak
diff --git a/data/v2/csv/locations.csv b/data/v2/csv/locations.csv
index 9eda9cab8..35d361019 100644
--- a/data/v2/csv/locations.csv
+++ b/data/v2/csv/locations.csv
@@ -1036,3 +1036,5 @@ id,region_id,identifier
 1052,7,poke-pelago
 1053,7,team-rockets-castle
 1054,5,roaming-unova
+1055,3,mauville-space-center
+1056,6,roaming-kalos