From 1cd2cd9258d79091ac24a515b90ac65aa491d7e3 Mon Sep 17 00:00:00 2001
From: notblisy <50887637+notblisy@users.noreply.github.com>
Date: Sat, 4 Apr 2026 10:47:55 -0400
Subject: [PATCH 1/4] Add all RBY Trades

The goal of this PR is to add every trade encounter in the non Japanese versions of Red, Blue, and Yellow.

It adds:

- 1 New location (kanto underground path)

- 1 New location area (cinnabar island lab)

- requisite encounter slots, encounters, encounter conditions for the trades.

I used this bulbapedia article as a source:

https://bulbapedia.bulbagarden.net/wiki/In-game_trade#Generation_I

I am not including Japanese RBG in this, I intend for it to be a separate PR.

I did not include any of the unused trades.

Lastly, for the level ranges, in these games the Pokemon you receive from the NPC are at whatever level the Pokemon you sent them were at. So I looked for the lowest level encounter in that game version and set it at the minimum level, and the max I set to 100.

In future games where breeding is possible, this range will be 5-100, or 1-100 post gen 4.
---
 data/v2/csv/encounter_condition_value_map.csv | 25 +++++++++++++++++++
 .../csv/encounter_condition_value_prose.csv   | 16 ++++++++++++
 data/v2/csv/encounter_condition_values.csv    | 16 ++++++++++++
 data/v2/csv/encounter_slots.csv               |  2 ++
 data/v2/csv/encounters.csv                    | 25 +++++++++++++++++++
 data/v2/csv/location_area_prose.csv           |  2 ++
 data/v2/csv/location_areas.csv                |  2 ++
 data/v2/csv/location_names.csv                |  1 +
 data/v2/csv/locations.csv                     |  1 +
 9 files changed, 90 insertions(+)

diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv
index f9b55fbd4..3c25cfe4f 100644
--- a/data/v2/csv/encounter_condition_value_map.csv
+++ b/data/v2/csv/encounter_condition_value_map.csv
@@ -18170,3 +18170,28 @@ encounter_id,encounter_condition_value_id
 71190,142
 71191,143
 71192,144
+71193,145
+71194,146
+71195,147
+71196,148
+71197,149
+71198,150
+71199,151
+71200,152
+71201,153
+71202,145
+71203,146
+71204,147
+71205,148
+71206,149
+71207,150
+71208,151
+71209,152
+71210,153
+71211,154
+71212,155
+71213,156
+71214,157
+71215,158
+71216,159
+71217,160
diff --git a/data/v2/csv/encounter_condition_value_prose.csv b/data/v2/csv/encounter_condition_value_prose.csv
index 9d59b943e..e29a59e3f 100644
--- a/data/v2/csv/encounter_condition_value_prose.csv
+++ b/data/v2/csv/encounter_condition_value_prose.csv
@@ -265,3 +265,19 @@ encounter_condition_value_id,local_language_id,name
 142,9,Have at least 2880 coins in your Coin Case
 143,9,Have at least 5400 coins in your Coin Case
 144,9,Have at least 8300 coins in your Coin Case
+145,9,Trade Abra for a Mr. Mime
+146,9,Trade Nidoran♂ for a Nidoran♀
+147,9,Trade Nidorino for a Nidorina
+148,9,Trade Slowbro for a Lickitung
+149,9,Trade Poliwhirl for a Jinx
+150,9,Trade Spearow for a Farfech'd
+151,9,Trade Raichu for an Electrode
+152,9,Trade Venonat for a Tangela
+153,9,Trade Ponyta for a Seel
+154,9,Trade Clefairy for a Mr. Mime
+155,9,Trade Cubone for a Machoke
+156,9,Trade Lickitung for a Dugtrio
+157,9,Trade Tangela for a Parasect
+158,9,Trade Golduck for a Rhydon
+159,9,Trade Growlithe for a Dewgong
+160,9,Trade Kangaskhan for a Muk
diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv
index 0b44e160f..c9dca90d2 100644
--- a/data/v2/csv/encounter_condition_values.csv
+++ b/data/v2/csv/encounter_condition_values.csv
@@ -143,3 +143,19 @@ id,encounter_condition_id,identifier,is_default
 142,16,coins-2880,1
 143,16,coins-5400,1
 144,16,coins-8300,1
+145,15,trade-abra,1
+146,15,trade-nidoran♂,1
+147,15,trade-nidorino,1
+148,15,trade-slowbro,1
+149,15,trade-poliwhirl,1
+150,15,trade-spearow,1
+151,15,trade-raichu,1
+152,15,trade-venonat,1
+153,15,trade-ponyta,1
+154,15,trade-clefairy,1
+155,15,trade-cubone,1
+156,15,trade-lickitung,1
+157,15,trade-tangela,1
+158,15,trade-golduck,1
+159,15,trade-growlithe,1
+160,15,trade-kangaskhan,1
diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv
index c82a6028c..3feceb3a8 100644
--- a/data/v2/csv/encounter_slots.csv
+++ b/data/v2/csv/encounter_slots.csv
@@ -1379,3 +1379,5 @@ id,version_group_id,encounter_method_id,slot,rarity
 1378,10,18,,100
 1379,28,18,,100
 1380,29,18,,100
+1381,1,36,,100
+1382,2,36,,100
diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
index 72a13aa5f..36e0120f3 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -65631,3 +65631,28 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 71190,46,1300,1380,36,24,24
 71191,46,1300,1380,148,30,30
 71192,46,1300,1380,137,22,22
+71193,1,320,1381,122,8,100
+71194,1,1302,1381,29,2,100
+71195,1,304,1381,30,16,100
+71196,1,311,1381,108,23,100
+71197,1,281,1381,124,23,100
+71198,1,282,1381,83,3,100
+71199,1,1303,1381,101,3,100
+71200,1,1303,1381,114,22,100
+71201,1,1303,1381,86,28,100
+71202,2,320,1381,122,8,100
+71203,2,1302,1381,29,2,100
+71204,2,304,1381,30,16,100
+71205,2,311,1381,108,23,100
+71206,2,281,1381,124,23,100
+71207,2,282,1381,83,3,100
+71208,2,1303,1381,101,3,100
+71209,2,1303,1381,114,22,100
+71210,2,1303,1381,86,28,100
+71211,3,320,1382,122,9,100
+71212,3,1302,1382,67,16,100
+71213,3,304,1382,51,50,100
+71214,3,311,1382,47,22,100
+71215,3,1303,1382,122,15,100
+71216,3,1303,1382,87,26,100
+71217,3,1303,1382,89,28,100
diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv
index 1642b24db..363b3b453 100644
--- a/data/v2/csv/location_area_prose.csv
+++ b/data/v2/csv/location_area_prose.csv
@@ -2356,3 +2356,5 @@ location_area_id,local_language_id,name
 1299,9,Phenac City Stadium (Outside)
 1300,9,Celadon City Prize Corner
 1301,9,Goldenrod City Game Corner
+1302,9,Kanto Underground Path
+1303,9,Cinnabar Island Lab
diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv
index 99c23d550..7475d4f28 100644
--- a/data/v2/csv/location_areas.csv
+++ b/data/v2/csv/location_areas.csv
@@ -1190,3 +1190,5 @@ id,location_id,game_index,identifier
 1299,1096,0,stadium-outside
 1300,67,0,prize-corner
 1301,229,0,game-corner
+1302,1113,0,
+1303,71,0,lab
diff --git a/data/v2/csv/location_names.csv b/data/v2/csv/location_names.csv
index a68caae82..73edd7035 100644
--- a/data/v2/csv/location_names.csv
+++ b/data/v2/csv/location_names.csv
@@ -4956,3 +4956,4 @@ location_id,local_language_id,name,subtitle
 1110,9,ONBS,
 1111,9,Cipher Key Lair,
 1112,9,Citadark Isle,
+1113,9,Kanto Underground Path
diff --git a/data/v2/csv/locations.csv b/data/v2/csv/locations.csv
index ac27f2083..fe44bae25 100644
--- a/data/v2/csv/locations.csv
+++ b/data/v2/csv/locations.csv
@@ -1094,3 +1094,4 @@ id,region_id,identifier
 1110,11,onbs
 1111,11,cipher-key-lair
 1112,11,citadark-isle
+1113,1,kanto-underground-path

From fa11fc5220595ffd86db33a3355b4d461ab22521 Mon Sep 17 00:00:00 2001
From: notblisy <50887637+notblisy@users.noreply.github.com>
Date: Sat, 4 Apr 2026 10:51:33 -0400
Subject: [PATCH 2/4] Forgot comma

---
 data/v2/csv/location_names.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/v2/csv/location_names.csv b/data/v2/csv/location_names.csv
index 73edd7035..a86a333db 100644
--- a/data/v2/csv/location_names.csv
+++ b/data/v2/csv/location_names.csv
@@ -4956,4 +4956,4 @@ location_id,local_language_id,name,subtitle
 1110,9,ONBS,
 1111,9,Cipher Key Lair,
 1112,9,Citadark Isle,
-1113,9,Kanto Underground Path
+1113,9,Kanto Underground Path,

From 8a3fa8719caea742ed57af09a3c44372631ce0d3 Mon Sep 17 00:00:00 2001
From: notblisy <50887637+notblisy@users.noreply.github.com>
Date: Sat, 4 Apr 2026 20:15:53 -0400
Subject: [PATCH 3/4] Update data/v2/csv/encounter_condition_values.csv

Ah, I didn't know. Thanks

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

diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv
index c9dca90d2..969bdaecf 100644
--- a/data/v2/csv/encounter_condition_values.csv
+++ b/data/v2/csv/encounter_condition_values.csv
@@ -144,7 +144,7 @@ id,encounter_condition_id,identifier,is_default
 143,16,coins-5400,1
 144,16,coins-8300,1
 145,15,trade-abra,1
-146,15,trade-nidoran♂,1
+146,15,trade-nidoran-m,1
 147,15,trade-nidorino,1
 148,15,trade-slowbro,1
 149,15,trade-poliwhirl,1

From 0fce41106eddf059b04b13e7dc9e83f35356f1f9 Mon Sep 17 00:00:00 2001
From: notblisy <50887637+notblisy@users.noreply.github.com>
Date: Sat, 4 Apr 2026 20:25:22 -0400
Subject: [PATCH 4/4] Fixes from Jemarq

---
 .../csv/encounter_condition_value_prose.csv   | 40 +++++++++----------
 data/v2/csv/encounters.csv                    | 24 +++++------
 data/v2/csv/location_area_prose.csv           |  1 -
 data/v2/csv/location_areas.csv                |  1 -
 4 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/data/v2/csv/encounter_condition_value_prose.csv b/data/v2/csv/encounter_condition_value_prose.csv
index e29a59e3f..ef14ab0e0 100644
--- a/data/v2/csv/encounter_condition_value_prose.csv
+++ b/data/v2/csv/encounter_condition_value_prose.csv
@@ -229,10 +229,10 @@ encounter_condition_value_id,local_language_id,name
 104,5,Avoir Dialga et Palkia dans l'équipe
 105,9,Scan a specific QR Code
 105,5,Scanner un code QR spécifique
-109,9,Trade Danny the Purified Shadow Togepi or Togetic for an Elekid
-110,9,Trade Duking a Trapinch for a Meditite from a Pokespot
-111,9,Trade Duking a Surskit for a Shuckle from a Pokespot
-112,9,Trade Duking a Wooper for a Larvitar from a Pokespot
+109,9,Give Togepi or Togetic in a Trade
+110,9,Give Trapunch in a Trade
+111,9,Give Surskit in a Trade
+112,9,Give Wooper in a Trade
 113,9,Catch all 82 Shadow Pokemon and Mirror B will appear in Gateon with a Shadow Dragonite
 114,9,Complete Mt. Battle to receive a special prize Pokemon
 115,9,Have at least 180 coins in your Coin Case
@@ -265,19 +265,19 @@ encounter_condition_value_id,local_language_id,name
 142,9,Have at least 2880 coins in your Coin Case
 143,9,Have at least 5400 coins in your Coin Case
 144,9,Have at least 8300 coins in your Coin Case
-145,9,Trade Abra for a Mr. Mime
-146,9,Trade Nidoran♂ for a Nidoran♀
-147,9,Trade Nidorino for a Nidorina
-148,9,Trade Slowbro for a Lickitung
-149,9,Trade Poliwhirl for a Jinx
-150,9,Trade Spearow for a Farfech'd
-151,9,Trade Raichu for an Electrode
-152,9,Trade Venonat for a Tangela
-153,9,Trade Ponyta for a Seel
-154,9,Trade Clefairy for a Mr. Mime
-155,9,Trade Cubone for a Machoke
-156,9,Trade Lickitung for a Dugtrio
-157,9,Trade Tangela for a Parasect
-158,9,Trade Golduck for a Rhydon
-159,9,Trade Growlithe for a Dewgong
-160,9,Trade Kangaskhan for a Muk
+145,9,Give Abra in a Trade
+146,9,Give Nidoran-M in a Trade
+147,9,Give Nidorino in a Trade
+148,9,Give Slowbro in a Trade
+149,9,Give Poliwhirl in a Trade
+150,9,Give Spearow in a Trade
+151,9,Give Raichu in a Trade
+152,9,Give Venonat in a Trade
+153,9,Give Ponyta in a Trade
+154,9,Give Clefairy in a Trade
+155,9,Give Cubone in a Trade
+156,9,Give Lickitung in a Trade
+157,9,Give Tangela in a Trade
+158,9,Give Golduck in a Trade
+159,9,Give Growlithe in a Trade
+160,9,Give Kangaskhan in a Trade
diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
index 36e0120f3..89c85a328 100644
--- a/data/v2/csv/encounters.csv
+++ b/data/v2/csv/encounters.csv
@@ -65633,26 +65633,26 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 71192,46,1300,1380,137,22,22
 71193,1,320,1381,122,8,100
 71194,1,1302,1381,29,2,100
-71195,1,304,1381,30,16,100
+71195,1,305,1381,30,16,100
 71196,1,311,1381,108,23,100
 71197,1,281,1381,124,23,100
 71198,1,282,1381,83,3,100
-71199,1,1303,1381,101,3,100
-71200,1,1303,1381,114,22,100
-71201,1,1303,1381,86,28,100
+71199,1,833,1381,101,3,100
+71200,1,833,1381,114,22,100
+71201,1,833,1381,86,28,100
 71202,2,320,1381,122,8,100
 71203,2,1302,1381,29,2,100
-71204,2,304,1381,30,16,100
+71204,2,305,1381,30,16,100
 71205,2,311,1381,108,23,100
 71206,2,281,1381,124,23,100
 71207,2,282,1381,83,3,100
-71208,2,1303,1381,101,3,100
-71209,2,1303,1381,114,22,100
-71210,2,1303,1381,86,28,100
+71208,2,833,1381,101,3,100
+71209,2,833,1381,114,22,100
+71210,2,833,1381,86,28,100
 71211,3,320,1382,122,9,100
 71212,3,1302,1382,67,16,100
-71213,3,304,1382,51,50,100
+71213,3,305,1382,51,50,100
 71214,3,311,1382,47,22,100
-71215,3,1303,1382,122,15,100
-71216,3,1303,1382,87,26,100
-71217,3,1303,1382,89,28,100
+71215,3,833,1382,112,15,100
+71216,3,833,1382,87,26,100
+71217,3,833,1382,89,28,100
diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv
index 363b3b453..c8023cd69 100644
--- a/data/v2/csv/location_area_prose.csv
+++ b/data/v2/csv/location_area_prose.csv
@@ -2357,4 +2357,3 @@ 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,Cinnabar Island Lab
diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv
index 7475d4f28..5ea7d8a9d 100644
--- a/data/v2/csv/location_areas.csv
+++ b/data/v2/csv/location_areas.csv
@@ -1191,4 +1191,3 @@ id,location_id,game_index,identifier
 1300,67,0,prize-corner
 1301,229,0,game-corner
 1302,1113,0,
-1303,71,0,lab