From 94869bcd65cb605ebb59defd1f8eaf7a45bebb39 Mon Sep 17 00:00:00 2001
From: SimplyBLGDev <simplyblgdev@gmail.com>
Date: Sun, 7 Mar 2021 00:13:20 +0000
Subject: [PATCH] =?UTF-8?q?Add=20missing=20special=20encounters=20to=20GSC?=
 =?UTF-8?q?,=20RSE,=20FRLG,=20HGSS=20Added:=20-=20Encounter=20conditions?=
 =?UTF-8?q?=20for=20beat=20elite=20four,=20beat=20elite=20four=20round=202?=
 =?UTF-8?q?=20-=20Added=20locations=20and=20areas=20for=20roaming=20Pok?=
 =?UTF-8?q?=C3=A9mon=20(One=20for=20each=20region)=20-=20Added=20area=20fo?=
 =?UTF-8?q?r=20Bell=20Tower=20Roof=20-=20Added=20encounters=20for=20Lugia,?=
 =?UTF-8?q?=20Ho-Oh,=20Articuno,=20Zapdos,=20Moltres,=20Mewtwo,=20Raikou,?=
 =?UTF-8?q?=20Entei,=20Suicune,=20Latios=20and=20Latias=20to=20GSC,=20HGSS?=
 =?UTF-8?q?,=20FRLG=20and=20RSE=20where=20applicable.=20-=20Bound=20encoun?=
 =?UTF-8?q?ter=20conditions=20where=20applicable.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/v2/csv/encounter_condition_value_map.csv | 32 ++++++++++++++
 .../csv/encounter_condition_value_prose.csv   |  2 +
 data/v2/csv/encounter_condition_values.csv    |  2 +
 data/v2/csv/encounters.csv                    | 42 +++++++++++++++++--
 data/v2/csv/location_area_prose.csv           |  5 +++
 data/v2/csv/location_areas.csv                |  5 +++
 data/v2/csv/locations.csv                     |  4 ++
 7 files changed, 88 insertions(+), 4 deletions(-)

diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv
index d88a35a2..bcd9e971 100644
--- a/data/v2/csv/encounter_condition_value_map.csv
+++ b/data/v2/csv/encounter_condition_value_map.csv
@@ -16939,3 +16939,35 @@ encounter_id,encounter_condition_value_id
 57870,5
 57871,5
 57872,5
+58117,29
+58118,29
+58119,29
+58120,29
+58121,29
+58122,29
+58123,29
+58124,29
+58125,34
+58126,34
+58127,34
+58128,34
+58129,34
+58130,34
+58131,29
+58132,29
+58133,29
+58134,29
+58135,32
+58136,32
+58125,22
+58126,22
+58127,21
+58128,21
+58129,23
+58130,23
+58137,35
+58138,35
+58139,35
+58140,35
+58138,28
+58140,27
diff --git a/data/v2/csv/encounter_condition_value_prose.csv b/data/v2/csv/encounter_condition_value_prose.csv
index 0c30ce3b..81187657 100644
--- a/data/v2/csv/encounter_condition_value_prose.csv
+++ b/data/v2/csv/encounter_condition_value_prose.csv
@@ -52,3 +52,5 @@ encounter_condition_value_id,local_language_id,name
 31,9,Talked to Professor Oak at Eterna City
 32,9,Visited the Pokémon Fan Club with Copycat’s doll
 33,9,Met Tornadus or Thundurus in a cutscene
+34,9,Beat the Elite 4 for the second time
+35,9,Enter the Hall of Fame
diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv
index 00b19474..c59f2fd2 100644
--- a/data/v2/csv/encounter_condition_values.csv
+++ b/data/v2/csv/encounter_condition_values.csv
@@ -32,3 +32,5 @@ id,encounter_condition_id,identifier,is_default
 31,9,story-progress-oak-eterna-city,0
 32,9,story-progress-vermilion-copycat,0
 33,9,story-progress-met-tornadus-thundurus,0
+34,9,story-progress-beat-elite-four-round-two,0
+35,9,story-progress-hall-of-fame,0
diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
index 10cf2654..28fa6336 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -54390,7 +54390,41 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 58100,4,230,563,249,70,70
 58101,5,230,563,249,40,40
 58102,6,230,564,249,60,60
-58103,4,268,563,250,40,40
-58104,5,268,563,250,70,70
-58105,6,268,564,250,60,60
-58106,6,268,564,245,40,40
+58103,4,793,563,250,40,40
+58104,5,793,563,250,70,70
+58105,6,793,564,250,60,60
+58106,6,793,564,245,40,40
+58107,15,793,570,250,45,45
+58108,16,793,570,250,70,70
+58109,15,232,570,249,70,70
+58110,16,232,570,249,45,45
+58111,15,325,570,150,70,70
+58112,16,325,570,150,70,70
+58113,15,262,570,144,50,50
+58114,16,262,570,144,50,50
+58115,15,304,570,145,50,50
+58116,16,304,570,145,50,50
+58117,4,795,563,243,40,40
+58118,5,795,563,243,40,40
+58119,6,795,564,243,40,40
+58120,4,795,563,244,40,40
+58121,5,795,563,244,40,40
+58122,6,795,564,244,40,40
+58123,4,795,563,245,40,40
+58124,5,795,563,245,40,40
+58125,10,794,567,243,50,50
+58126,11,794,567,243,50,50
+58127,10,794,567,244,50,50
+58128,11,794,567,244,50,50
+58129,10,794,567,245,50,50
+58130,11,794,567,245,50,50
+58131,15,795,570,243,40,40
+58132,16,795,570,243,40,40
+58133,15,795,570,244,40,40
+58134,16,795,570,244,40,40
+58135,15,795,570,380,35,35
+58136,16,795,570,381,35,35
+58137,8,796,565,380,40,40
+58138,9,796,566,380,40,40
+58139,7,796,565,381,40,40
+58140,9,796,566,381,40,40
diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv
index 42223479..7b21554f 100644
--- a/data/v2/csv/location_area_prose.csv
+++ b/data/v2/csv/location_area_prose.csv
@@ -650,3 +650,8 @@ location_area_id,local_language_id,name
 790,9,Poke Mart
 791,9,Pokemon Center
 792,9,West Gate
+793,9,Bell Tower Roof
+794,9,Roaming Kanto
+795,9,Roaming Johto
+796,9,Roaming Hoenn
+797,9,Roaming Sinnoh
diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv
index 3ddc00d6..37b64f78 100644
--- a/data/v2/csv/location_areas.csv
+++ b/data/v2/csv/location_areas.csv
@@ -682,3 +682,8 @@ id,location_id,game_index,identifier
 790,153,0,poke-mart
 791,153,0,pokemon-center
 792,349,0,west-gate
+793,139,0,bell-tower-roof
+794,799,0,roaming-kanto-area
+795,800,0,roaming-johto-area
+796,801,0,roaming-hoenn-area
+797,802,0,roaming-sinnoh-area
diff --git a/data/v2/csv/locations.csv b/data/v2/csv/locations.csv
index e97060d5..3245851f 100644
--- a/data/v2/csv/locations.csv
+++ b/data/v2/csv/locations.csv
@@ -780,3 +780,7 @@ id,region_id,identifier
 796,7,aether-paradise
 797,7,ultra-space
 798,7,malie-city--outer-cape
+799,1,roaming-kanto
+800,2,roaming-johto
+801,3,roaming-hoenn
+802,4,roaming-sinnoh