Skip to content

Commit 9bd4087

Browse files
notblisyjemarq04
andauthored
Add all RBY Trade Encounters (#1470)
* 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. --------- Co-authored-by: Justin Marquez <37006684+jemarq04@users.noreply.github.com>
1 parent 495822b commit 9bd4087

9 files changed

+92
-4
lines changed

data/v2/csv/encounter_condition_value_map.csv

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18170,3 +18170,28 @@ encounter_id,encounter_condition_value_id
1817018170
71190,142
1817118171
71191,143
1817218172
71192,144
18173+
71193,145
18174+
71194,146
18175+
71195,147
18176+
71196,148
18177+
71197,149
18178+
71198,150
18179+
71199,151
18180+
71200,152
18181+
71201,153
18182+
71202,145
18183+
71203,146
18184+
71204,147
18185+
71205,148
18186+
71206,149
18187+
71207,150
18188+
71208,151
18189+
71209,152
18190+
71210,153
18191+
71211,154
18192+
71212,155
18193+
71213,156
18194+
71214,157
18195+
71215,158
18196+
71216,159
18197+
71217,160

data/v2/csv/encounter_condition_value_prose.csv

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,10 +229,10 @@ encounter_condition_value_id,local_language_id,name
229229
104,5,Avoir Dialga et Palkia dans l'équipe
230230
105,9,Scan a specific QR Code
231231
105,5,Scanner un code QR spécifique
232-
109,9,Trade Danny the Purified Shadow Togepi or Togetic for an Elekid
233-
110,9,Trade Duking a Trapinch for a Meditite from a Pokespot
234-
111,9,Trade Duking a Surskit for a Shuckle from a Pokespot
235-
112,9,Trade Duking a Wooper for a Larvitar from a Pokespot
232+
109,9,Give Togepi or Togetic in a Trade
233+
110,9,Give Trapunch in a Trade
234+
111,9,Give Surskit in a Trade
235+
112,9,Give Wooper in a Trade
236236
113,9,Catch all 82 Shadow Pokemon and Mirror B will appear in Gateon with a Shadow Dragonite
237237
114,9,Complete Mt. Battle to receive a special prize Pokemon
238238
115,9,Have at least 180 coins in your Coin Case
@@ -265,3 +265,19 @@ encounter_condition_value_id,local_language_id,name
265265
142,9,Have at least 2880 coins in your Coin Case
266266
143,9,Have at least 5400 coins in your Coin Case
267267
144,9,Have at least 8300 coins in your Coin Case
268+
145,9,Give Abra in a Trade
269+
146,9,Give Nidoran-M in a Trade
270+
147,9,Give Nidorino in a Trade
271+
148,9,Give Slowbro in a Trade
272+
149,9,Give Poliwhirl in a Trade
273+
150,9,Give Spearow in a Trade
274+
151,9,Give Raichu in a Trade
275+
152,9,Give Venonat in a Trade
276+
153,9,Give Ponyta in a Trade
277+
154,9,Give Clefairy in a Trade
278+
155,9,Give Cubone in a Trade
279+
156,9,Give Lickitung in a Trade
280+
157,9,Give Tangela in a Trade
281+
158,9,Give Golduck in a Trade
282+
159,9,Give Growlithe in a Trade
283+
160,9,Give Kangaskhan in a Trade

data/v2/csv/encounter_condition_values.csv

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,3 +143,19 @@ id,encounter_condition_id,identifier,is_default
143143
142,16,coins-2880,1
144144
143,16,coins-5400,1
145145
144,16,coins-8300,1
146+
145,15,trade-abra,1
147+
146,15,trade-nidoran-m,1
148+
147,15,trade-nidorino,1
149+
148,15,trade-slowbro,1
150+
149,15,trade-poliwhirl,1
151+
150,15,trade-spearow,1
152+
151,15,trade-raichu,1
153+
152,15,trade-venonat,1
154+
153,15,trade-ponyta,1
155+
154,15,trade-clefairy,1
156+
155,15,trade-cubone,1
157+
156,15,trade-lickitung,1
158+
157,15,trade-tangela,1
159+
158,15,trade-golduck,1
160+
159,15,trade-growlithe,1
161+
160,15,trade-kangaskhan,1

data/v2/csv/encounter_slots.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1379,3 +1379,5 @@ id,version_group_id,encounter_method_id,slot,rarity
13791379
1378,10,18,,100
13801380
1379,28,18,,100
13811381
1380,29,18,,100
1382+
1381,1,36,,100
1383+
1382,2,36,,100

data/v2/csv/encounters.csv

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65631,3 +65631,28 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
6563165631
71190,46,1300,1380,36,24,24
6563265632
71191,46,1300,1380,148,30,30
6563365633
71192,46,1300,1380,137,22,22
65634+
71193,1,320,1381,122,8,100
65635+
71194,1,1302,1381,29,2,100
65636+
71195,1,305,1381,30,16,100
65637+
71196,1,311,1381,108,23,100
65638+
71197,1,281,1381,124,23,100
65639+
71198,1,282,1381,83,3,100
65640+
71199,1,833,1381,101,3,100
65641+
71200,1,833,1381,114,22,100
65642+
71201,1,833,1381,86,28,100
65643+
71202,2,320,1381,122,8,100
65644+
71203,2,1302,1381,29,2,100
65645+
71204,2,305,1381,30,16,100
65646+
71205,2,311,1381,108,23,100
65647+
71206,2,281,1381,124,23,100
65648+
71207,2,282,1381,83,3,100
65649+
71208,2,833,1381,101,3,100
65650+
71209,2,833,1381,114,22,100
65651+
71210,2,833,1381,86,28,100
65652+
71211,3,320,1382,122,9,100
65653+
71212,3,1302,1382,67,16,100
65654+
71213,3,305,1382,51,50,100
65655+
71214,3,311,1382,47,22,100
65656+
71215,3,833,1382,112,15,100
65657+
71216,3,833,1382,87,26,100
65658+
71217,3,833,1382,89,28,100

data/v2/csv/location_area_prose.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2356,3 +2356,4 @@ location_area_id,local_language_id,name
23562356
1299,9,Phenac City Stadium (Outside)
23572357
1300,9,Celadon City Prize Corner
23582358
1301,9,Goldenrod City Game Corner
2359+
1302,9,Kanto Underground Path

data/v2/csv/location_areas.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1190,3 +1190,4 @@ id,location_id,game_index,identifier
11901190
1299,1096,0,stadium-outside
11911191
1300,67,0,prize-corner
11921192
1301,229,0,game-corner
1193+
1302,1113,0,

data/v2/csv/location_names.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4956,3 +4956,4 @@ location_id,local_language_id,name,subtitle
49564956
1110,9,ONBS,
49574957
1111,9,Cipher Key Lair,
49584958
1112,9,Citadark Isle,
4959+
1113,9,Kanto Underground Path,

data/v2/csv/locations.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1094,3 +1094,4 @@ id,region_id,identifier
10941094
1110,11,onbs
10951095
1111,11,cipher-key-lair
10961096
1112,11,citadark-isle
1097+
1113,1,kanto-underground-path

0 commit comments

Comments
 (0)