Skip to content

Commit 8d631c1

Browse files
notblisyjemarq04
andauthored
Add GSC Trades (#1473)
* 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. --------- Co-authored-by: Justin Marquez <37006684+jemarq04@users.noreply.github.com>
1 parent 9bd4087 commit 8d631c1

10 files changed

+63
-3
lines changed

data/v2/csv/encounter_condition_prose.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ encounter_condition_id,local_language_id,name
3333
13,9,First party Pokemon
3434
14,5,Rencontre spéciale
3535
14,9,Special encounter
36-
15,9,Trade a specific Pokemon to an NPC!
36+
15,9,Trade a specific Pokemon to an NPC
3737
16,9,Redeem Coins for a Pokemon at the Prize Corner or Game Corner

data/v2/csv/encounter_condition_value_map.csv

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18195,3 +18195,22 @@ encounter_id,encounter_condition_value_id
1819518195
71215,158
1819618196
71216,159
1819718197
71217,160
18198+
71218,161
18199+
71219,162
18200+
71220,163
18201+
71221,164
18202+
71222,165
18203+
71223,166
18204+
71224,161
18205+
71225,162
18206+
71226,163
18207+
71227,164
18208+
71228,165
18209+
71229,166
18210+
71230,161
18211+
71231,145
18212+
71232,163
18213+
71233,164
18214+
71234,165
18215+
71235,167
18216+
71236,168

data/v2/csv/encounter_condition_value_prose.csv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,3 +281,11 @@ encounter_condition_value_id,local_language_id,name
281281
158,9,Give Golduck in a Trade
282282
159,9,Give Growlithe in a Trade
283283
160,9,Give Kangaskhan in a Trade
284+
161,9,Give Bellsprout in a Trade
285+
162,9,Give Drowzee in a Trade
286+
163,9,Give Krabby in a Trade
287+
164,9,Give Dragonair in a Trade
288+
165,9,Give Chansey in a Trade
289+
166,9,Give Gloom in a Trade
290+
167,9,Give Haunter in a Trade
291+
168,9,Give Dugtrio in a Trade

data/v2/csv/encounter_condition_values.csv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,3 +159,11 @@ id,encounter_condition_id,identifier,is_default
159159
158,15,trade-golduck,1
160160
159,15,trade-growlithe,1
161161
160,15,trade-kangaskhan,1
162+
161,15,trade-bellsprout,1
163+
162,15,trade-drowzee,1
164+
163,15,trade-krabby,1
165+
164,15,trade-dragonair,1
166+
165,15,trade-chansey,1
167+
166,15,trade-gloom,1
168+
167,15,trade-haunter,1
169+
168,15,trade-dugtrio,1

data/v2/csv/encounter_slots.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1381,3 +1381,5 @@ id,version_group_id,encounter_method_id,slot,rarity
13811381
1380,29,18,,100
13821382
1381,1,36,,100
13831383
1382,2,36,,100
1384+
1383,3,36,,100
1385+
1384,4,36,,100

data/v2/csv/encounters.csv

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65656,3 +65656,22 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
6565665656
71215,3,833,1382,112,15,100
6565765657
71216,3,833,1382,87,26,100
6565865658
71217,3,833,1382,89,28,100
65659+
71218,4,1303,1383,95,3,100
65660+
71219,4,1304,1383,66,5,100
65661+
71220,4,224,1383,100,5,100
65662+
71221,4,249,1383,112,30,100
65663+
71222,4,307,1383,142,5,100
65664+
71223,4,1200,1383,78,15,100
65665+
71224,5,1303,1383,95,3,100
65666+
71225,5,1304,1383,66,5,100
65667+
71226,5,224,1383,100,5,100
65668+
71227,5,249,1383,112,30,100
65669+
71228,5,307,1383,142,5,100
65670+
71229,5,1200,1383,78,15,100
65671+
71230,6,1303,1384,95,5,100
65672+
71231,6,1304,1384,66,5,100
65673+
71232,6,224,1384,100,5,100
65674+
71233,6,249,1384,85,30,100
65675+
71234,6,307,1384,142,5,100
65676+
71235,6,1200,1384,178,15,100
65677+
71236,6,330,1384,82,16,100

data/v2/csv/location_area_prose.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2357,3 +2357,5 @@ location_area_id,local_language_id,name
23572357
1300,9,Celadon City Prize Corner
23582358
1301,9,Goldenrod City Game Corner
23592359
1302,9,Kanto Underground Path
2360+
1303,9,Violet City (Southwest House)
2361+
1304,9,Goldenrod City Department Store 5F

data/v2/csv/location_areas.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1191,3 +1191,5 @@ id,location_id,game_index,identifier
11911191
1300,67,0,prize-corner
11921192
1301,229,0,game-corner
11931193
1302,1113,0,
1194+
1303,153,0,southwest-house
1195+
1304,229,0,department-store-5f

data/v2/csv/location_names.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ location_id,local_language_id,name,subtitle
454454
157,9,Route 23,
455455
158,5,Centrale,
456456
158,6,Kraftwerk,
457-
158,9,Power Plant,
457+
158,9,Kanto Power Plant,
458458
159,5,Route Victoire,
459459
159,6,Siegesstraße,
460460
159,9,Victory Road,

data/v2/csv/locations.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ id,region_id,identifier
150150
155,1,viridian-forest
151151
156,2,whirl-islands
152152
157,1,kanto-route-23
153-
158,1,power-plant
153+
158,1,kanto-power-plant
154154
159,1,kanto-victory-road-2
155155
160,1,pokemon-tower
156156
161,1,pokemon-mansion

0 commit comments

Comments
 (0)