From c6619f17584488bdaa102076028efb31ceefe6a7 Mon Sep 17 00:00:00 2001
From: notblisy <50887637+notblisy@users.noreply.github.com>
Date: Sun, 5 Apr 2026 11:08:32 -0400
Subject: [PATCH 1/3] Add GSC Trades

This pull request seeks to add all NPC trades from Pokemon Gold, Silver, and Crystal.

To support the trades I had to:

- Rename power plant to Kanto Power Plant (there's a Kalos Power Plant, so this seemed appropriate with the naming convention)

- Add 2 new location areas for a house in violet city, and the goldenrrod department store.

- Add encounters and encounter slots

- Add encounter condition values and relevant prose for all new tradeable Pokemon, except abra, who is a repeat condition from RBY.
---
 data/v2/csv/encounter_condition_prose.csv     |  2 +-
 data/v2/csv/encounter_condition_value_map.csv | 19 +++++++++++++++++++
 .../csv/encounter_condition_value_prose.csv   |  8 ++++++++
 data/v2/csv/encounter_condition_values.csv    |  8 ++++++++
 data/v2/csv/encounter_slots.csv               |  2 ++
 data/v2/csv/encounters.csv                    | 19 +++++++++++++++++++
 data/v2/csv/location_area_prose.csv           |  2 ++
 data/v2/csv/location_areas.csv                |  2 ++
 data/v2/csv/location_names.csv                |  2 +-
 data/v2/csv/locations.csv                     |  2 +-
 10 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/data/v2/csv/encounter_condition_prose.csv b/data/v2/csv/encounter_condition_prose.csv
index 3841ebefa..e49100703 100644
--- a/data/v2/csv/encounter_condition_prose.csv
+++ b/data/v2/csv/encounter_condition_prose.csv
@@ -33,5 +33,5 @@ encounter_condition_id,local_language_id,name
 13,9,First party Pokemon
 14,5,Rencontre spéciale
 14,9,Special encounter
-15,9,Trade a specific Pokemon to an NPC!
+15,9,Trade a specific Pokemon to an NPC
 16,9,Redeem Coins for a Pokemon at the Prize Corner or Game Corner
diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv
index 3c25cfe4f..eba6c4d93 100644
--- a/data/v2/csv/encounter_condition_value_map.csv
+++ b/data/v2/csv/encounter_condition_value_map.csv
@@ -18195,3 +18195,22 @@ encounter_id,encounter_condition_value_id
 71215,158
 71216,159
 71217,160
+71218,161
+71219,162
+71220,163
+71221,164
+71222,165
+71223,166
+71224,161
+71225,162
+71226,163
+71227,164
+71228,165
+71229,166
+71230,161
+71231,145
+71232,163
+71233,164
+71234,165
+71235,167
+71236,168
diff --git a/data/v2/csv/encounter_condition_value_prose.csv b/data/v2/csv/encounter_condition_value_prose.csv
index ef14ab0e0..106a58a0e 100644
--- a/data/v2/csv/encounter_condition_value_prose.csv
+++ b/data/v2/csv/encounter_condition_value_prose.csv
@@ -281,3 +281,11 @@ encounter_condition_value_id,local_language_id,name
 158,9,Give Golduck in a Trade
 159,9,Give Growlithe in a Trade
 160,9,Give Kangaskhan in a Trade
+161,9,Give Bellsprout in a Trade
+162,9,Give Drowzee in a Trade
+163,9,Give Krabby in a Trade
+164,9,Give Dragonair in a Trade
+165,9,Give Chansey in a Trade
+166,9,Give Gloom in a Trade
+167,9,Give Haunter in a Trade
+168,9,Give Dugtrio in a Trade
diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv
index 969bdaecf..dac456229 100644
--- a/data/v2/csv/encounter_condition_values.csv
+++ b/data/v2/csv/encounter_condition_values.csv
@@ -159,3 +159,11 @@ id,encounter_condition_id,identifier,is_default
 158,15,trade-golduck,1
 159,15,trade-growlithe,1
 160,15,trade-kangaskhan,1
+161,15,trade-bellsprout,1
+162,15,trade-drowzee,1
+163,15,trade-krabby,1
+164,15,trade-dragonair,1
+165,15,trade-chansey,1
+166,15,trade-gloom,1
+167,15,trade-haunter,1
+168,15,trade-dugtrio,1
diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv
index 3feceb3a8..9120ce6e3 100644
--- a/data/v2/csv/encounter_slots.csv
+++ b/data/v2/csv/encounter_slots.csv
@@ -1381,3 +1381,5 @@ id,version_group_id,encounter_method_id,slot,rarity
 1380,29,18,,100
 1381,1,36,,100
 1382,2,36,,100
+1383,3,36,,100
+1384,4,36,,100
\ No newline at end of file
diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
index 89c85a328..dfb8cf996 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -65656,3 +65656,22 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 71215,3,833,1382,112,15,100
 71216,3,833,1382,87,26,100
 71217,3,833,1382,89,28,100
+71218,3,1303,1383,95,3,100
+71219,3,1304,1383,66,5,100
+71220,3,224,1383,100,5,100
+71221,3,249,1383,112,30,100
+71222,3,307,1383,142,5,100
+71223,3,1200,1383,78,15,100
+71224,4,1303,1383,95,3,100
+71225,4,1304,1383,66,5,100
+71226,4,224,1383,100,5,100
+71227,4,249,1383,112,30,100
+71228,4,307,1383,142,5,100
+71229,4,1200,1383,78,15,100
+71230,5,1303,1384,95,5,100
+71231,5,1304,1384,66,5,100
+71232,5,224,1384,100,5,100
+71233,5,249,1384,85,30,100
+71234,5,307,1384,142,5,100
+71235,5,1200,1384,178,15,100
+71236,5,330,1384,82,16,100
diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv
index c8023cd69..3b4ebfc58 100644
--- a/data/v2/csv/location_area_prose.csv
+++ b/data/v2/csv/location_area_prose.csv
@@ -2357,3 +2357,5 @@ location_area_id,local_language_id,name
 1300,9,Celadon City Prize Corner
 1301,9,Goldenrod City Game Corner
 1302,9,Kanto Underground Path
+1303,9,Violet City Southwest House
+1304,9,Goldenrod City Department Store 5F
diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv
index 5ea7d8a9d..762f6f189 100644
--- a/data/v2/csv/location_areas.csv
+++ b/data/v2/csv/location_areas.csv
@@ -1191,3 +1191,5 @@ id,location_id,game_index,identifier
 1300,67,0,prize-corner
 1301,229,0,game-corner
 1302,1113,0,
+1303,153,0,southwest-house
+1304,229,0,department-store-5f
diff --git a/data/v2/csv/location_names.csv b/data/v2/csv/location_names.csv
index a86a333db..4c729e1e8 100644
--- a/data/v2/csv/location_names.csv
+++ b/data/v2/csv/location_names.csv
@@ -454,7 +454,7 @@ location_id,local_language_id,name,subtitle
 157,9,Route 23,
 158,5,Centrale,
 158,6,Kraftwerk,
-158,9,Power Plant,
+158,9,Kanto Power Plant,
 159,5,Route Victoire,
 159,6,Siegesstraße,
 159,9,Victory Road,
diff --git a/data/v2/csv/locations.csv b/data/v2/csv/locations.csv
index fe44bae25..cc9012d4a 100644
--- a/data/v2/csv/locations.csv
+++ b/data/v2/csv/locations.csv
@@ -150,7 +150,7 @@ id,region_id,identifier
 155,1,viridian-forest
 156,2,whirl-islands
 157,1,kanto-route-23
-158,1,power-plant
+158,1,kanto-power-plant
 159,1,kanto-victory-road-2
 160,1,pokemon-tower
 161,1,pokemon-mansion

From d815d5c1ec1b2c51ba6434d14b40350dbcfa89c0 Mon Sep 17 00:00:00 2001
From: notblisy <50887637+notblisy@users.noreply.github.com>
Date: Sun, 5 Apr 2026 21:14:21 -0400
Subject: [PATCH 2/3] increment encounters from YGS to GSC

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

diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
index dfb8cf996..cd31ca370 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -65656,22 +65656,22 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 71215,3,833,1382,112,15,100
 71216,3,833,1382,87,26,100
 71217,3,833,1382,89,28,100
-71218,3,1303,1383,95,3,100
-71219,3,1304,1383,66,5,100
-71220,3,224,1383,100,5,100
-71221,3,249,1383,112,30,100
-71222,3,307,1383,142,5,100
-71223,3,1200,1383,78,15,100
-71224,4,1303,1383,95,3,100
-71225,4,1304,1383,66,5,100
-71226,4,224,1383,100,5,100
-71227,4,249,1383,112,30,100
-71228,4,307,1383,142,5,100
-71229,4,1200,1383,78,15,100
-71230,5,1303,1384,95,5,100
-71231,5,1304,1384,66,5,100
-71232,5,224,1384,100,5,100
-71233,5,249,1384,85,30,100
-71234,5,307,1384,142,5,100
-71235,5,1200,1384,178,15,100
-71236,5,330,1384,82,16,100
+71218,4,1303,1383,95,3,100
+71219,4,1304,1383,66,5,100
+71220,4,224,1383,100,5,100
+71221,4,249,1383,112,30,100
+71222,4,307,1383,142,5,100
+71223,4,1200,1383,78,15,100
+71224,5,1303,1383,95,3,100
+71225,5,1304,1383,66,5,100
+71226,5,224,1383,100,5,100
+71227,5,249,1383,112,30,100
+71228,5,307,1383,142,5,100
+71229,5,1200,1383,78,15,100
+71230,6,1303,1384,95,5,100
+71231,6,1304,1384,66,5,100
+71232,6,224,1384,100,5,100
+71233,6,249,1384,85,30,100
+71234,6,307,1384,142,5,100
+71235,6,1200,1384,178,15,100
+71236,6,330,1384,82,16,100

From 3c1974d396829d37e4c171f9a77a0dec402dbe37 Mon Sep 17 00:00:00 2001
From: notblisy <50887637+notblisy@users.noreply.github.com>
Date: Mon, 6 Apr 2026 10:13:01 -0400
Subject: [PATCH 3/3] Update data/v2/csv/location_area_prose.csv

update to have house in brackets

Co-authored-by: Justin Marquez <37006684+jemarq04@users.noreply.github.com>
---
 data/v2/csv/location_area_prose.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv
index 3b4ebfc58..463a3f923 100644
--- a/data/v2/csv/location_area_prose.csv
+++ b/data/v2/csv/location_area_prose.csv
@@ -2357,5 +2357,5 @@ location_area_id,local_language_id,name
 1300,9,Celadon City Prize Corner
 1301,9,Goldenrod City Game Corner
 1302,9,Kanto Underground Path
-1303,9,Violet City Southwest House
+1303,9,Violet City (Southwest House)
 1304,9,Goldenrod City Department Store 5F