From cbb83b0e75632a2712ea9e3737f2df98dfcb0ac0 Mon Sep 17 00:00:00 2001
From: notblisy <50887637+notblisy@users.noreply.github.com>
Date: Fri, 14 Aug 2026 12:02:22 -0400
Subject: [PATCH 1/5] Add FRLG Trade Encounters

---
 data/v2/csv/encounter_condition_value_map.csv  | 18 ++++++++++++++++++
 .../v2/csv/encounter_condition_value_prose.csv |  2 ++
 data/v2/csv/encounter_condition_values.csv     |  2 ++
 data/v2/csv/encounter_slots.csv                |  1 +
 data/v2/csv/encounters.csv                     | 18 ++++++++++++++++++
 5 files changed, 41 insertions(+)

diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv
index c8e1c66d1..1c566ebe5 100644
--- a/data/v2/csv/encounter_condition_value_map.csv
+++ b/data/v2/csv/encounter_condition_value_map.csv
@@ -111980,3 +111980,21 @@ encounter_id,encounter_condition_value_id
 122979,342
 122980,337
 122980,342
+122981,145
+122982,146
+122983,147
+122984,158
+122985,149
+122986,150
+122987,151
+122988,152
+122989,153
+122990,145
+122991,353
+122992,354
+122993,148
+122994,149
+122995,150
+122996,151
+122997,152
+122998,153
diff --git a/data/v2/csv/encounter_condition_value_prose.csv b/data/v2/csv/encounter_condition_value_prose.csv
index 733f72336..0723ad3c6 100644
--- a/data/v2/csv/encounter_condition_value_prose.csv
+++ b/data/v2/csv/encounter_condition_value_prose.csv
@@ -473,3 +473,5 @@ encounter_condition_value_id,local_language_id,name
 350,9,Interact with a Shaking Trash Can (Daily)
 351,9,Interact with a Shaking Trash Can (Tuesday)
 352,9,Interact with a Shaking Trash Can (Thursday)
+353,9,Give Nidoran-F in a Trade
+354,9,Give Nidorina in a Trade
diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv
index f881e8618..7d17745f7 100644
--- a/data/v2/csv/encounter_condition_values.csv
+++ b/data/v2/csv/encounter_condition_values.csv
@@ -351,3 +351,5 @@ id,encounter_condition_id,identifier,is_default
 350,30,trash-can-type-daily,1
 351,30,trash-can-type-tuesday,1
 352,30,trash-can-type-thursday,1
+353,15,trade-nidoran-f,1
+354,15,trade-nidorina,1
diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv
index 12f7ac16c..84a0e18bf 100644
--- a/data/v2/csv/encounter_slots.csv
+++ b/data/v2/csv/encounter_slots.csv
@@ -3804,3 +3804,4 @@ id,version_group_id,encounter_method_id,slot,rarity
 3803,22,61,9,5
 3804,22,61,10,4
 3805,22,61,11,3
+3806,7,36,,100
diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
index de0d37c7d..c5c265c8b 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -117076,3 +117076,21 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 122978,51,1659,3682,697,55,60
 122979,51,1659,3683,10225,55,60
 122980,51,1659,3684,225,55,60
+122981,7,320,3806,122,5,100
+122982,7,1302,3806,29,5,100
+122983,7,304,3806,30,16,100
+122984,7,311,3806,108,33,100
+122985,7,281,3806,124,20,100
+122986,7,282,3806,83,5,100
+122987,7,1303,3806,101,3,100
+122988,7,1303,3806,114,5,100
+122989,7,1303,3806,86,5,100
+122990,8,320,3806,122,5,100
+122991,8,1302,3806,32,5,100
+122992,8,304,3806,33,16,100
+122993,8,311,3806,108,25,100
+122994,8,281,3806,124,20,100
+122995,8,282,3806,83,5,100
+122996,8,1303,3806,101,3,100
+122997,8,1303,3806,114,22,100
+122998,8,1303,3806,86,28,100

From 6edaefdbbaf5b07275115b5a45b0aab38e52878b Mon Sep 17 00:00:00 2001
From: notblisy <50887637+notblisy@users.noreply.github.com>
Date: Fri, 14 Aug 2026 12:40:39 -0400
Subject: [PATCH 2/5] fix version ids to be correct

had encounters.csv using group ids, not version ids.
---
 data/v2/csv/encounters.csv | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
index c5c265c8b..8495a7005 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -117076,21 +117076,21 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 122978,51,1659,3682,697,55,60
 122979,51,1659,3683,10225,55,60
 122980,51,1659,3684,225,55,60
-122981,7,320,3806,122,5,100
-122982,7,1302,3806,29,5,100
-122983,7,304,3806,30,16,100
-122984,7,311,3806,108,33,100
-122985,7,281,3806,124,20,100
-122986,7,282,3806,83,5,100
-122987,7,1303,3806,101,3,100
-122988,7,1303,3806,114,5,100
-122989,7,1303,3806,86,5,100
-122990,8,320,3806,122,5,100
-122991,8,1302,3806,32,5,100
-122992,8,304,3806,33,16,100
-122993,8,311,3806,108,25,100
-122994,8,281,3806,124,20,100
-122995,8,282,3806,83,5,100
-122996,8,1303,3806,101,3,100
-122997,8,1303,3806,114,22,100
-122998,8,1303,3806,86,28,100
+122981,10,320,3806,122,5,100
+122982,10,1302,3806,29,5,100
+122983,10,304,3806,30,16,100
+122984,10,311,3806,108,33,100
+122985,10,281,3806,124,20,100
+122986,10,282,3806,83,5,100
+122987,10,1303,3806,101,3,100
+122988,10,1303,3806,114,5,100
+122989,10,1303,3806,86,5,100
+122990,11,320,3806,122,5,100
+122991,11,1302,3806,32,5,100
+122992,11,304,3806,33,16,100
+122993,11,311,3806,108,25,100
+122994,11,281,3806,124,20,100
+122995,11,282,3806,83,5,100
+122996,11,1303,3806,101,3,100
+122997,11,1303,3806,114,22,100
+122998,11,1303,3806,86,28,100

From 7cf58524e379387d4ab4415238cc4a828640e240 Mon Sep 17 00:00:00 2001
From: notblisy <50887637+notblisy@users.noreply.github.com>
Date: Mon, 17 Aug 2026 19:49:52 -0400
Subject: [PATCH 3/5] update suggestions from jemarq.

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

diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
index 8495a7005..cf5f9ea25 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -117078,19 +117078,19 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 122980,51,1659,3684,225,55,60
 122981,10,320,3806,122,5,100
 122982,10,1302,3806,29,5,100
-122983,10,304,3806,30,16,100
+122983,10,305,3806,30,16,100
 122984,10,311,3806,108,33,100
 122985,10,281,3806,124,20,100
 122986,10,282,3806,83,5,100
-122987,10,1303,3806,101,3,100
-122988,10,1303,3806,114,5,100
-122989,10,1303,3806,86,5,100
+122987,10,833,3806,101,3,100
+122988,10,833,3806,114,5,100
+122989,10,833,3806,86,5,100
 122990,11,320,3806,122,5,100
 122991,11,1302,3806,32,5,100
-122992,11,304,3806,33,16,100
+122992,11,305,3806,33,16,100
 122993,11,311,3806,108,25,100
 122994,11,281,3806,124,20,100
 122995,11,282,3806,83,5,100
-122996,11,1303,3806,101,3,100
-122997,11,1303,3806,114,22,100
-122998,11,1303,3806,86,28,100
+122996,11,833,3806,101,3,100
+122997,11,833,3806,114,22,100
+122998,11,833,3806,86,28,100

From b873576839b450bea1e6291fe2dc60450df2cf14 Mon Sep 17 00:00:00 2001
From: notblisy <50887637+notblisy@users.noreply.github.com>
Date: Mon, 17 Aug 2026 19:52:47 -0400
Subject: [PATCH 4/5] Fix levels for Seel and Tangela to be 5.

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

diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
index cf5f9ea25..4825b8427 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -117092,5 +117092,5 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 122994,11,281,3806,124,20,100
 122995,11,282,3806,83,5,100
 122996,11,833,3806,101,3,100
-122997,11,833,3806,114,22,100
-122998,11,833,3806,86,28,100
+122997,11,833,3806,114,5,100
+122998,11,833,3806,86,5,100

From aa99b5967735edb83d782c7a6f8993b50589a2c5 Mon Sep 17 00:00:00 2001
From: notblisy <50887637+notblisy@users.noreply.github.com>
Date: Sat, 10 Oct 2026 15:01:48 -0400
Subject: [PATCH 5/5] Add BW-1 Trades

---
 data/v2/csv/encounter_condition_value_map.csv   | 12 ++++++++++++
 data/v2/csv/encounter_condition_value_prose.csv |  2 ++
 data/v2/csv/encounter_condition_values.csv      |  2 ++
 data/v2/csv/encounter_slots.csv                 |  1 +
 data/v2/csv/encounters.csv                      | 10 ++++++++++
 data/v2/csv/location_area_prose.csv             |  1 +
 data/v2/csv/location_areas.csv                  |  1 +
 7 files changed, 29 insertions(+)

diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv
index 4c49051e7..9a044dc4f 100644
--- a/data/v2/csv/encounter_condition_value_map.csv
+++ b/data/v2/csv/encounter_condition_value_map.csv
@@ -112030,3 +112030,15 @@ encounter_id,encounter_condition_value_id
 123028,359
 123029,360
 123030,361
+123031,195
+123032,230
+123033,163
+123034,199
+123035,363
+123036,18
+123036,196
+123037,230
+123038,163
+123039,199
+123040,363
+123039,18
diff --git a/data/v2/csv/encounter_condition_value_prose.csv b/data/v2/csv/encounter_condition_value_prose.csv
index fbd56a6d5..3dfb50d46 100644
--- a/data/v2/csv/encounter_condition_value_prose.csv
+++ b/data/v2/csv/encounter_condition_value_prose.csv
@@ -482,3 +482,5 @@ encounter_condition_value_id,local_language_id,name
 359,9,Give Forretress in a Trade
 360,9,Give Bonsly in a Trade
 361,9,Give any Pokemon in a Trade
+362,9,Give Boldore in a Trade
+363,9,Give Cinccino in a Trade
diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv
index dbfe72c4c..16687e0dc 100644
--- a/data/v2/csv/encounter_condition_values.csv
+++ b/data/v2/csv/encounter_condition_values.csv
@@ -360,3 +360,5 @@ id,encounter_condition_id,identifier,is_default
 359,15,trade-forretress,1
 360,15,trade-bonsly,1
 361,15,trade-any-pokemon,1
+362,15,trade-boldore,1
+363,15,trade-cinccino,1
diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv
index 7b06ee1b4..db7997a5d 100644
--- a/data/v2/csv/encounter_slots.csv
+++ b/data/v2/csv/encounter_slots.csv
@@ -3808,3 +3808,4 @@ id,version_group_id,encounter_method_id,slot,rarity
 3807,8,36,,100
 3808,9,36,,100
 3809,10,36,,100
+3810,11,36,,100
diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
index 4cde976a7..f86277e21 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -117126,3 +117126,13 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 123028,16,835,3809,374,31,100
 123029,16,317,3809,111,1,100
 123030,16,1665,3809,208,1,100
+123031,17,1666,3810,548,15,15
+123032,17,577,3810,550,25,25
+123033,17,632,3810,587,30,30
+123034,17,650,3810,479,60,60
+123035,17,654,3810,446,60,60
+123036,18,1666,3810,546,15,15
+123037,18,577,3810,10016,25,25
+123038,18,632,3810,587,30,30
+123039,18,650,3810,479,60,60
+123040,18,654,3810,446,60,60
diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv
index 0dde94389..c12d4aba7 100644
--- a/data/v2/csv/location_area_prose.csv
+++ b/data/v2/csv/location_area_prose.csv
@@ -3209,3 +3209,4 @@ location_area_id,local_language_id,name
 1664,5,Gare de Safrania
 1665,9,Olivine City Gym
 1665,5,Arène d'Oliville
+1665,9,Nacrene City(Dyes House)
diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv
index 02d912613..e7c7b4786 100644
--- a/data/v2/csv/location_areas.csv
+++ b/data/v2/csv/location_areas.csv
@@ -1538,3 +1538,4 @@ id,location_id,game_index,identifier
 1663,63,0,island-house
 1664,234,0,magnet-train-station
 1665,85,0,gym
+1666,349,0,dyes-house